From c619b8d981393bed9958179ea5d2f0a557d41087 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 8 Dec 2011 03:10:17 +0000
Subject: TOON: Replace usage of 'goto'.

---
 engines/toon/path.cpp |  9 ++++-----
 engines/toon/toon.cpp | 12 +++---------
 2 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/toon/path.cpp b/engines/toon/path.cpp
index 60ca007930..2dd5fc45e2 100644
--- a/engines/toon/path.cpp
+++ b/engines/toon/path.cpp
@@ -322,9 +322,10 @@ int32 PathFinding::findPath(int32 x, int32 y, int32 destx, int32 desty) {
 		int32 endY = MIN<int32>(curY + 1, _height - 1);
 		int32 startX = MAX<int32>(curX - 1, 0);
 		int32 startY = MAX<int32>(curY - 1, 0);
+		bool next = false;
 
-		for (int32 px = startX; px <= endX; px++) {
-			for (int py = startY; py <= endY; py++) {
+		for (int32 px = startX; px <= endX && !next; px++) {
+			for (int py = startY; py <= endY && !next; py++) {
 				if (px != curX || py != curY) {
 					wei = ((abs(px - curX) + abs(py - curY)));
 
@@ -336,7 +337,7 @@ int32 PathFinding::findPath(int32 x, int32 y, int32 destx, int32 desty) {
 							sq[curPNode] = sum;
 							_heap->push(px, py, sq[curPNode] + newWeight);
 							if (!newWeight)
-								goto next; // we found it !
+								next = true; // we found it !
 						}
 					}
 				}
@@ -344,8 +345,6 @@ int32 PathFinding::findPath(int32 x, int32 y, int32 destx, int32 desty) {
 		}
 	}
 
-next:
-
 	// let's see if we found a result !
 	if (!_gridTemp[destx + desty * _width]) {
 		// didn't find anything
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 13f702e3dd..99932362af 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -2297,8 +2297,7 @@ void ToonEngine::processConversationClick(Conversation *conv, int32 status) {
 	if (v8 == -1) {
 		_gameState->_mouseHidden = false;
 	} else {
-retry:
-		while (1) {
+		while (v8 != -1) {
 			v7 += 1;
 			int16 *v14 = (int16 *)((char *)_conversationData + v8);
 
@@ -2315,15 +2314,10 @@ retry:
 					v8 = READ_LE_INT16(v7);
 					if (v8 == -1)
 						return;
-
-					goto retry;
+					else
+						break; // restarts while loop;
 				}
 			}
-
-			if (v8 != -1)
-				continue;
-
-			break;
 		}
 	}
 }
-- 
cgit v1.2.3


From d3a187c298decc7b8e0125a3cdc46162f65ea3bb Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 8 Dec 2011 03:31:29 +0000
Subject: DRACI: Replace usage of 'goto'.

---
 engines/draci/walking.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/draci/walking.cpp b/engines/draci/walking.cpp
index 9a66c6163a..f1ae769d80 100644
--- a/engines/draci/walking.cpp
+++ b/engines/draci/walking.cpp
@@ -729,20 +729,18 @@ Movement WalkingState::transitionBetweenAnimations(Movement previous, Movement n
 
 Movement WalkingState::animationForSightDirection(SightDirection dir, const Common::Point &hero, const Common::Point &mouse, const WalkingPath &path, Movement startingDirection) {
 	switch (dir) {
+	case kDirectionLeft:
+		return kStopLeft;
+	case kDirectionRight:
+		return kStopRight;
 	case kDirectionMouse:
 		if (mouse.x < hero.x) {
 			return kStopLeft;
 		} else if (mouse.x > hero.x) {
 			return kStopRight;
-		} else {
-			goto defaultCase;
 		}
-	case kDirectionLeft:
-		return kStopLeft;
-	case kDirectionRight:
-		return kStopRight;
+		// fall-through here intentional
 	default: {
-defaultCase:
 		// Find the last horizontal direction on the path.
 		int i = path.size() - 1;
 		while (i >= 0 && path[i].x == hero.x) {
-- 
cgit v1.2.3


From 111f5806766a322de7f18da89dd0e72aa7cdc609 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 8 Dec 2011 14:27:28 +0000
Subject: TINSEL: Replace usage of 'goto'.

---
 engines/tinsel/saveload.cpp | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp
index a0801d8247..8664cd5f15 100644
--- a/engines/tinsel/saveload.cpp
+++ b/engines/tinsel/saveload.cpp
@@ -486,6 +486,16 @@ static bool DoRestore() {
 	return !failed;
 }
 
+static void SaveFailure(Common::OutSaveFile *f) {
+	if (f) {
+		delete f;
+		_vm->getSaveFileMan()->removeSavefile(SaveSceneName);
+		SaveSceneName = NULL;	// Invalidate save name
+	}
+	GUI::MessageDialog dialog(_("Failed to save game state to file."));
+	dialog.runModal();
+}
+
 /**
  * DoSave
  */
@@ -524,8 +534,10 @@ static void DoSave() {
 	f = _vm->getSaveFileMan()->openForSaving(SaveSceneName);
 	Common::Serializer s(0, f);
 
-	if (f == NULL)
-		goto save_failure;
+	if (f == NULL) {
+		SaveFailure(f);
+		return;
+	}
 
 	// Write out a savegame header
 	SaveGameHeader hdr;
@@ -536,29 +548,22 @@ static void DoSave() {
 	hdr.desc[SG_DESC_LEN - 1] = 0;
 	g_system->getTimeAndDate(hdr.dateTime);
 	if (!syncSaveGameHeader(s, hdr) || f->err()) {
-		goto save_failure;
+		SaveFailure(f);
+		return;
 	}
 
 	DoSync(s);
 
 	// Write out the special Id for Discworld savegames
 	f->writeUint32LE(0xFEEDFACE);
-	if (f->err())
-		goto save_failure;
+	if (f->err()) {
+		SaveFailure(f);
+		return;
+	}
 
 	f->finalize();
 	delete f;
 	SaveSceneName = NULL;	// Invalidate save name
-	return;
-
-save_failure:
-	if (f) {
-		delete f;
-		_vm->getSaveFileMan()->removeSavefile(SaveSceneName);
-		SaveSceneName = NULL;	// Invalidate save name
-	}
-	GUI::MessageDialog dialog(_("Failed to save game state to file."));
-	dialog.runModal();
 }
 
 /**
-- 
cgit v1.2.3


From 4a59c954fd07c62c779759f44d2212e1ef459d7e Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 8 Dec 2011 14:54:18 +0000
Subject: DRASCULA: Replace usage of 'goto'.

---
 engines/drascula/animation.cpp | 49 ++++++++++++++++++++++++++----------------
 engines/drascula/drascula.h    |  1 +
 2 files changed, 31 insertions(+), 19 deletions(-)

(limited to 'engines')

diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index c4a8d3eb01..43799f7944 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -748,6 +748,19 @@ void DrasculaEngine::animation_14_2() {
 	loadPic(99, backSurface);
 }
 
+void DrasculaEngine::asco() {
+	loadPic(roomDisk, drawSurface3);
+	loadPic(roomNumber, bgSurface, HALF_PAL);
+	black();
+	updateRoom();
+	updateScreen();
+	fadeFromBlack(0);
+	if (roomMusic != 0)
+		playMusic(roomMusic);
+	else
+		stopMusic();
+}
+
 // The drunk tells us about Von Braun
 void DrasculaEngine::animation_16_2() {
 	debug(4, "animation_16_2()");
@@ -763,8 +776,10 @@ void DrasculaEngine::animation_16_2() {
 	else
 		playMusic(32);
 
-	if (getScan() != 0)
-		goto asco;
+	if (getScan() != 0) {
+		asco();
+		return;
+	}
 
 	color_abc(kColorDarkGreen);
 
@@ -778,16 +793,20 @@ void DrasculaEngine::animation_16_2() {
 		centerText(_texthis[i], 180, 180);
 		updateScreen();
 
-		if (getScan() != 0)
-			goto asco;
+		if (getScan() != 0) {
+			asco();
+			return;
+		}
 
 		delay(3000);
 
 		if (i < 4) {
 			fadeToBlack(1);
 
-			if (getScan() != 0)
-				goto asco;
+			if (getScan() != 0) {
+				asco();
+				return;
+			}
 
 			clearRoom();
 		}
@@ -800,25 +819,17 @@ void DrasculaEngine::animation_16_2() {
 		copyBackground(0, 0, 0, l, 320, 200 - l, drawSurface3, screenSurface);
 		copyBackground(0, 200 - l, 0, 0, 320, l, bgSurface, screenSurface);
 		updateScreen();
-		if (getScan() != 0)
-			goto asco;
+		if (getScan() != 0) {
+			asco();
+			return;
+		}
 	}
 
 	pause(5);
 	fadeToBlack(2);
 	clearRoom();
 
-asco:
-	loadPic(roomDisk, drawSurface3);
-	loadPic(roomNumber, bgSurface, HALF_PAL);
-	black();
-	updateRoom();
-	updateScreen();
-	fadeFromBlack(0);
-	if (roomMusic != 0)
-		playMusic(roomMusic);
-	else
-		stopMusic();
+	asco();
 }
 
 void DrasculaEngine::animation_20_2() {
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 6f98c50fdc..2d1954e3ca 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -664,6 +664,7 @@ public:
 	void animation_12_2();
 	void animation_13_2();
 	void animation_14_2();
+	void asco();
 	void animation_16_2();
 	void animation_20_2();
 	void animation_23_2();
-- 
cgit v1.2.3


From 7a0aabccbe9dc9cb7db60a113867a103320ea501 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 8 Dec 2011 19:24:42 +0000
Subject: SWORD25: Reduce usage of 'goto'.

Have refrained from changing the usage of 'goto' in the embedded LUA
interpreter code for the time being, as this is still in flux due to
the savegame issues.
---
 engines/sword25/gfx/image/art.cpp | 136 +++++++++++++++++---------------------
 1 file changed, 61 insertions(+), 75 deletions(-)

(limited to 'engines')

diff --git a/engines/sword25/gfx/image/art.cpp b/engines/sword25/gfx/image/art.cpp
index 2ba102e779..3944a207c8 100644
--- a/engines/sword25/gfx/image/art.cpp
+++ b/engines/sword25/gfx/image/art.cpp
@@ -328,18 +328,6 @@ static void art_vpath_render_bez(ArtVpath **p_vpath, int *pn, int *pn_max,
                      double x2, double y2,
                      double x3, double y3,
                      double flatness) {
-	double x3_0, y3_0;
-	double z3_0_dot;
-	double z1_dot, z2_dot;
-	double z1_perp, z2_perp;
-	double max_perp_sq;
-
-	double x_m, y_m;
-	double xa1, ya1;
-	double xa2, ya2;
-	double xb1, yb1;
-	double xb2, yb2;
-
 	/* It's possible to optimize this routine a fair amount.
 
 	   First, once the _dot conditions are met, they will also be met in
@@ -363,11 +351,13 @@ static void art_vpath_render_bez(ArtVpath **p_vpath, int *pn, int *pn_max,
 
 	*/
 
-	x3_0 = x3 - x0;
-	y3_0 = y3 - y0;
+	bool subDivide = false;
+
+	double x3_0 = x3 - x0;
+	double y3_0 = y3 - y0;
 
-	/* z3_0_dot is dist z0-z3 squared */
-	z3_0_dot = x3_0 * x3_0 + y3_0 * y3_0;
+	// z3_0_dot is dist z0-z3 squared
+	double z3_0_dot = x3_0 * x3_0 + y3_0 * y3_0;
 
 	if (z3_0_dot < 0.001) {
 		/* if start and end point are almost identical, the flatness tests
@@ -375,72 +365,68 @@ static void art_vpath_render_bez(ArtVpath **p_vpath, int *pn, int *pn_max,
 		 * the other two control points are the same as the start point,
 		 * too.
 		 */
-		if (hypot(x1 - x0, y1 - y0) < 0.001
-		        && hypot(x2 - x0, y2 - y0) < 0.001)
-			goto nosubdivide;
-		else
-			goto subdivide;
-	}
-
-	/* we can avoid subdivision if:
-
-	   z1 has distance no more than flatness from the z0-z3 line
-
-	   z1 is no more z0'ward than flatness past z0-z3
-
-	   z1 is more z0'ward than z3'ward on the line traversing z0-z3
-
-	   and correspondingly for z2 */
-
-	/* perp is distance from line, multiplied by dist z0-z3 */
-	max_perp_sq = flatness * flatness * z3_0_dot;
-
-	z1_perp = (y1 - y0) * x3_0 - (x1 - x0) * y3_0;
-	if (z1_perp * z1_perp > max_perp_sq)
-		goto subdivide;
+		if (!(hypot(x1 - x0, y1 - y0) < 0.001
+		        && hypot(x2 - x0, y2 - y0) < 0.001))
+			subDivide = true;
+	} else {
+		/* we can avoid subdivision if:
 
-	z2_perp = (y3 - y2) * x3_0 - (x3 - x2) * y3_0;
-	if (z2_perp * z2_perp > max_perp_sq)
-		goto subdivide;
+			 z1 has distance no more than flatness from the z0-z3 line
 
-	z1_dot = (x1 - x0) * x3_0 + (y1 - y0) * y3_0;
-	if (z1_dot < 0 && z1_dot * z1_dot > max_perp_sq)
-		goto subdivide;
+			 z1 is no more z0'ward than flatness past z0-z3
 
-	z2_dot = (x3 - x2) * x3_0 + (y3 - y2) * y3_0;
-	if (z2_dot < 0 && z2_dot * z2_dot > max_perp_sq)
-		goto subdivide;
+			 z1 is more z0'ward than z3'ward on the line traversing z0-z3
 
-	if (z1_dot + z1_dot > z3_0_dot)
-		goto subdivide;
+			 and correspondingly for z2 */
 
-	if (z2_dot + z2_dot > z3_0_dot)
-		goto subdivide;
+		// perp is distance from line, multiplied by dist z0-z3
+		double max_perp_sq = flatness * flatness * z3_0_dot;
 
+		double z1_perp = (y1 - y0) * x3_0 - (x1 - x0) * y3_0;
+		if (z1_perp * z1_perp > max_perp_sq) {
+			subDivide = true;
+		} else {
+			double z2_perp = (y3 - y2) * x3_0 - (x3 - x2) * y3_0;
+			if (z2_perp * z2_perp > max_perp_sq) {
+				subDivide = true;
+			} else {
+				double z1_dot = (x1 - x0) * x3_0 + (y1 - y0) * y3_0;
+				if (z1_dot < 0 && z1_dot * z1_dot > max_perp_sq) {
+					subDivide = true;
+				} else {
+					double z2_dot = (x3 - x2) * x3_0 + (y3 - y2) * y3_0;
+					if (z2_dot < 0 && z2_dot * z2_dot > max_perp_sq)
+						subDivide = true;
+					else if (z1_dot + z1_dot > z3_0_dot)
+						subDivide = true;
+					else if (z2_dot + z2_dot > z3_0_dot)
+						subDivide = true;
+				}
+			}
+		}
+	}
 
-nosubdivide:
-	/* don't subdivide */
-	art_vpath_add_point(p_vpath, pn, pn_max,
-	                    ART_LINETO, x3, y3);
-	return;
-
-subdivide:
-
-	xa1 = (x0 + x1) * 0.5;
-	ya1 = (y0 + y1) * 0.5;
-	xa2 = (x0 + 2 * x1 + x2) * 0.25;
-	ya2 = (y0 + 2 * y1 + y2) * 0.25;
-	xb1 = (x1 + 2 * x2 + x3) * 0.25;
-	yb1 = (y1 + 2 * y2 + y3) * 0.25;
-	xb2 = (x2 + x3) * 0.5;
-	yb2 = (y2 + y3) * 0.5;
-	x_m = (xa2 + xb1) * 0.5;
-	y_m = (ya2 + yb1) * 0.5;
-
-	art_vpath_render_bez(p_vpath, pn, pn_max,
-	                     x0, y0, xa1, ya1, xa2, ya2, x_m, y_m, flatness);
-	art_vpath_render_bez(p_vpath, pn, pn_max,
-	                     x_m, y_m, xb1, yb1, xb2, yb2, x3, y3, flatness);
+	if (subDivide) {
+		double xa1 = (x0 + x1) * 0.5;
+		double ya1 = (y0 + y1) * 0.5;
+		double xa2 = (x0 + 2 * x1 + x2) * 0.25;
+		double ya2 = (y0 + 2 * y1 + y2) * 0.25;
+		double xb1 = (x1 + 2 * x2 + x3) * 0.25;
+		double yb1 = (y1 + 2 * y2 + y3) * 0.25;
+		double xb2 = (x2 + x3) * 0.5;
+		double yb2 = (y2 + y3) * 0.5;
+		double x_m = (xa2 + xb1) * 0.5;
+		double y_m = (ya2 + yb1) * 0.5;
+
+		art_vpath_render_bez(p_vpath, pn, pn_max,
+		                     x0, y0, xa1, ya1, xa2, ya2, x_m, y_m, flatness);
+		art_vpath_render_bez(p_vpath, pn, pn_max,
+		                     x_m, y_m, xb1, yb1, xb2, yb2, x3, y3, flatness);
+	} else {
+		// don't subdivide
+		art_vpath_add_point(p_vpath, pn, pn_max,
+	           	         ART_LINETO, x3, y3);
+	}
 }
 
 /**
-- 
cgit v1.2.3


From e5d6801c99b5ef2307e3f2924e8427ba32145d53 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 8 Dec 2011 20:36:16 +0000
Subject: SKY: Replace usage of 'goto'.

---
 engines/sky/logic.cpp | 340 +++++++++++++++++++++++++-------------------------
 1 file changed, 173 insertions(+), 167 deletions(-)

(limited to 'engines')

diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp
index a69ba793f2..86c8828e5a 100644
--- a/engines/sky/logic.cpp
+++ b/engines/sky/logic.cpp
@@ -1232,191 +1232,197 @@ uint16 Logic::mouseScript(uint32 scrNum, Compact *scriptComp) {
  * @return 0 if script finished. Else offset where to continue.
  */
 uint16 Logic::script(uint16 scriptNo, uint16 offset) {
-script:
-	/// process a script
-	/// low level interface to interpreter
+	bool restartScript;
 
-	uint16 moduleNo = scriptNo >> 12;
-	uint16 *scriptData = _moduleList[moduleNo]; // get module address
+	do {
+		restartScript = false;
 
-	if (!scriptData) { // We need to load the script module
-		_moduleList[moduleNo] = _skyDisk->loadScriptFile(moduleNo + F_MODULE_0);
-		 scriptData = _moduleList[moduleNo]; // module has been loaded
-	}
+		/// process a script
+		/// low level interface to interpreter
 
-	uint16 *moduleStart = scriptData;
+		uint16 moduleNo = scriptNo >> 12;
+		uint16 *scriptData = _moduleList[moduleNo]; // get module address
 
-	debug(3, "Doing Script: %d:%d:%x", moduleNo, scriptNo & 0xFFF, offset ? (offset - moduleStart[scriptNo & 0xFFF]) : 0);
+		if (!scriptData) { // We need to load the script module
+			_moduleList[moduleNo] = _skyDisk->loadScriptFile(moduleNo + F_MODULE_0);
+			 scriptData = _moduleList[moduleNo]; // module has been loaded
+		}
 
-	// WORKAROUND for bug #3149412: "Invalid Mode when giving shades to travel agent"
-	// Using the dark glasses on Trevor (travel agent) multiple times in succession would
-	// wreck the trevor compact's mode, as the script in question doesn't account for using
-	// this item at this point in the game (you will only have it here if you play the game
-	// in an unusual way) and thus would loop indefinitely / never drop out.
-	// To prevent this, we trigger the generic response by pretending we're using an item
-	// which the script /does/ handle.
-	if (scriptNo == TREVOR_SPEECH && _scriptVariables[OBJECT_HELD] == IDO_SHADES)
-		_scriptVariables[OBJECT_HELD] = IDO_GLASS;
+		uint16 *moduleStart = scriptData;
 
+		debug(3, "Doing Script: %d:%d:%x", moduleNo, scriptNo & 0xFFF, offset ? (offset - moduleStart[scriptNo & 0xFFF]) : 0);
 
-	// Check whether we have an offset or what
-	if (offset)
-		scriptData = moduleStart + offset;
-	else
-		scriptData += scriptData[scriptNo & 0x0FFF];
+		// WORKAROUND for bug #3149412: "Invalid Mode when giving shades to travel agent"
+		// Using the dark glasses on Trevor (travel agent) multiple times in succession would
+		// wreck the trevor compact's mode, as the script in question doesn't account for using
+		// this item at this point in the game (you will only have it here if you play the game
+		// in an unusual way) and thus would loop indefinitely / never drop out.
+		// To prevent this, we trigger the generic response by pretending we're using an item
+		// which the script /does/ handle.
+		if (scriptNo == TREVOR_SPEECH && _scriptVariables[OBJECT_HELD] == IDO_SHADES)
+			_scriptVariables[OBJECT_HELD] = IDO_GLASS;
 
-	uint32 a = 0, b = 0, c = 0;
-	uint16 command, s;
 
-	for (;;) {
-		command = *scriptData++; // get a command
-		Debug::script(command, scriptData);
-
-		switch (command) {
-		case 0: // push_variable
-			push( _scriptVariables[*scriptData++ / 4] );
-			break;
-		case 1: // less_than
-			a = pop();
-			b = pop();
-			if (a > b)
-				push(1);
-			else
-				push(0);
-			break;
-		case 2: // push_number
-			push(*scriptData++);
-			break;
-		case 3: // not_equal
-			a = pop();
-			b = pop();
-			if (a != b)
-				push(1);
-			else
-				push(0);
-			break;
-		case 4: // if_and
-			a = pop();
-			b = pop();
-			if (a && b)
-				push(1);
-			else
-				push(0);
-			break;
-		case 5: // skip_zero
-			s = *scriptData++;
-
-			a = pop();
-			if (!a)
-				scriptData += s / 2;
-			break;
-		case 6: // pop_var
-			b = _scriptVariables[*scriptData++ / 4] = pop();
-			break;
-		case 7: // minus
-			a = pop();
-			b = pop();
-			push(b-a);
-			break;
-		case 8: // plus
-			a = pop();
-			b = pop();
-			push(b+a);
-			break;
-		case 9: // skip_always
-			s = *scriptData++;
-			scriptData += s / 2;
-			break;
-		case 10: // if_or
-			a = pop();
-			b = pop();
-			if (a || b)
-				push(1);
-			else
-				push(0);
-			break;
-		case 11: // call_mcode
-			{
-				a = *scriptData++;
-				assert(a <= 3);
-				// No, I did not forget the "break"s
-				switch (a) {
-				case 3:
-					c = pop();
-				case 2:
-					b = pop();
-				case 1:
-					a = pop();
-				}
-
-				uint16 mcode = *scriptData++ / 4; // get mcode number
-				Debug::mcode(mcode, a, b, c);
+		// Check whether we have an offset or what
+		if (offset)
+			scriptData = moduleStart + offset;
+		else
+			scriptData += scriptData[scriptNo & 0x0FFF];
 
-				Compact *saveCpt = _compact;
-				bool ret = (this->*_mcodeTable[mcode]) (a, b, c);
-				_compact = saveCpt;
+		uint32 a = 0, b = 0, c = 0;
+		uint16 command, s;
 
-				if (!ret)
-					return (scriptData - moduleStart);
-			}
-			break;
-		case 12: // more_than
-			a = pop();
-			b = pop();
-			if (a < b)
-				push(1);
-			else
-				push(0);
-			break;
-		case 14: // switch
-			c = s = *scriptData++; // get number of cases
+		while(!restartScript) {
+			command = *scriptData++; // get a command
+			Debug::script(command, scriptData);
 
-			a = pop(); // and value to switch on
+			switch (command) {
+			case 0: // push_variable
+				push( _scriptVariables[*scriptData++ / 4] );
+				break;
+			case 1: // less_than
+				a = pop();
+				b = pop();
+				if (a > b)
+					push(1);
+				else
+					push(0);
+				break;
+			case 2: // push_number
+				push(*scriptData++);
+				break;
+			case 3: // not_equal
+				a = pop();
+				b = pop();
+				if (a != b)
+					push(1);
+				else
+					push(0);
+				break;
+			case 4: // if_and
+				a = pop();
+				b = pop();
+				if (a && b)
+					push(1);
+				else
+					push(0);
+				break;
+			case 5: // skip_zero
+				s = *scriptData++;
 
-			do {
-				if (a == *scriptData) {
-					scriptData += scriptData[1] / 2;
-					scriptData++;
-					break;
+				a = pop();
+				if (!a)
+					scriptData += s / 2;
+				break;
+			case 6: // pop_var
+				b = _scriptVariables[*scriptData++ / 4] = pop();
+				break;
+			case 7: // minus
+				a = pop();
+				b = pop();
+				push(b-a);
+				break;
+			case 8: // plus
+				a = pop();
+				b = pop();
+				push(b+a);
+				break;
+			case 9: // skip_always
+				s = *scriptData++;
+				scriptData += s / 2;
+				break;
+			case 10: // if_or
+				a = pop();
+				b = pop();
+				if (a || b)
+					push(1);
+				else
+					push(0);
+				break;
+			case 11: // call_mcode
+				{
+					a = *scriptData++;
+					assert(a <= 3);
+					// No, I did not forget the "break"s
+					switch (a) {
+					case 3:
+						c = pop();
+					case 2:
+						b = pop();
+					case 1:
+						a = pop();
+					}
+
+					uint16 mcode = *scriptData++ / 4; // get mcode number
+					Debug::mcode(mcode, a, b, c);
+
+					Compact *saveCpt = _compact;
+					bool ret = (this->*_mcodeTable[mcode]) (a, b, c);
+					_compact = saveCpt;
+
+					if (!ret)
+						return (scriptData - moduleStart);
 				}
-				scriptData += 2;
-			} while (--s);
-
-			if (s == 0)
-				scriptData += *scriptData / 2; // use the default
-			break;
-		case 15: // push_offset
-			push( *(uint16 *)_skyCompact->getCompactElem(_compact, *scriptData++) );
-			break;
-		case 16: // pop_offset
-			// pop a value into a compact
-			*(uint16 *)_skyCompact->getCompactElem(_compact, *scriptData++) = (uint16)pop();
-			break;
-		case 17: // is_equal
-			a = pop();
-			b = pop();
-			if (a == b)
-				push(1);
-			else
-				push(0);
-			break;
-		case 18: { // skip_nz
-				int16 t = *scriptData++;
+				break;
+			case 12: // more_than
+				a = pop();
+				b = pop();
+				if (a < b)
+					push(1);
+				else
+					push(0);
+				break;
+			case 14: // switch
+				c = s = *scriptData++; // get number of cases
+
+				a = pop(); // and value to switch on
+
+				do {
+					if (a == *scriptData) {
+						scriptData += scriptData[1] / 2;
+						scriptData++;
+						break;
+					}
+					scriptData += 2;
+				} while (--s);
+
+				if (s == 0)
+					scriptData += *scriptData / 2; // use the default
+				break;
+			case 15: // push_offset
+				push( *(uint16 *)_skyCompact->getCompactElem(_compact, *scriptData++) );
+				break;
+			case 16: // pop_offset
+				// pop a value into a compact
+				*(uint16 *)_skyCompact->getCompactElem(_compact, *scriptData++) = (uint16)pop();
+				break;
+			case 17: // is_equal
 				a = pop();
-				if (a)
-					scriptData += t / 2;
+				b = pop();
+				if (a == b)
+					push(1);
+				else
+					push(0);
+				break;
+			case 18: { // skip_nz
+					int16 t = *scriptData++;
+					a = pop();
+					if (a)
+						scriptData += t / 2;
+					break;
+				}
+			case 13:
+			case 19: // script_exit
+				return 0;
+			case 20: // restart_script
+				offset = 0;
+				restartScript = true;
 				break;
+			default:
+				error("Unknown script command: %d", command);
 			}
-		case 13:
-		case 19: // script_exit
-			return 0;
-		case 20: // restart_script
-			offset = 0;
-			goto script;
-		default:
-			error("Unknown script command: %d", command);
 		}
-	}
+	} while (restartScript);
 }
 
 bool Logic::fnCacheChip(uint32 a, uint32 b, uint32 c) {
-- 
cgit v1.2.3


From 1cb4af9c4c16c37f5fb9b65d2076e17602ffee84 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 8 Dec 2011 23:21:40 +0000
Subject: LURE: Reduce usage of 'goto'.

Have refrained from changing the usage of 'goto' in the PictureDecoder
class (decode.cpp) for the time being, as this class is using these in
pseudo-x86 code which is complex and should be replaced anyway.
---
 engines/lure/hotspots.cpp | 295 +++++++++++++++++++++++-----------------------
 engines/lure/menu.cpp     |  63 +++++-----
 2 files changed, 185 insertions(+), 173 deletions(-)

(limited to 'engines')

diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index 207c125a0c..2f6d0f23aa 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -4164,6 +4164,7 @@ PathFinderResult PathFinder::process() {
 	bool altFlag;
 	uint16 *pCurrent;
 	PathFinderResult result = PF_UNFINISHED;
+	bool skipToFinalStep = false;
 
 	if (!_inProgress) {
 		// Following code only done during first call to method
@@ -4186,188 +4187,190 @@ PathFinderResult PathFinder::process() {
 
 			_inProgress = false;
 			result = PF_OK;
-			goto final_step;
-		}
-
-		// Path finding
+			skipToFinalStep = true;
+		} else {
+			// Path finding
 
-		_destX >>= 3;
-		_destY >>= 3;
-		_pSrc = &_layer[(_yCurrent + 1) * DECODED_PATHS_WIDTH + 1 + _xCurrent];
-		_pDest = &_layer[(_yDestCurrent + 1) * DECODED_PATHS_WIDTH + 1 + _xDestCurrent];
+			_destX >>= 3;
+			_destY >>= 3;
+			_pSrc = &_layer[(_yCurrent + 1) * DECODED_PATHS_WIDTH + 1 + _xCurrent];
+			_pDest = &_layer[(_yDestCurrent + 1) * DECODED_PATHS_WIDTH + 1 + _xDestCurrent];
 
-		// Flag starting/ending cells
-		*_pSrc = 1;
-		_destOccupied = *_pDest != 0;
-		result = _destOccupied ? PF_DEST_OCCUPIED : PF_OK;
-		*_pDest = 0;
+			// Flag starting/ending cells
+			*_pSrc = 1;
+			_destOccupied = *_pDest != 0;
+			result = _destOccupied ? PF_DEST_OCCUPIED : PF_OK;
+			*_pDest = 0;
 
-		// Set up the current pointer, adjusting away from edges if necessary
+			// Set up the current pointer, adjusting away from edges if necessary
 
-		if (_xCurrent >= _xDestCurrent) {
-			_xChangeInc = -1;
-			_xChangeStart = ROOM_PATHS_WIDTH;
-		} else {
-			_xChangeInc = 1;
-			_xChangeStart = 1;
-		}
+			if (_xCurrent >= _xDestCurrent) {
+				_xChangeInc = -1;
+				_xChangeStart = ROOM_PATHS_WIDTH;
+			} else {
+				_xChangeInc = 1;
+				_xChangeStart = 1;
+			}
 
-		if (_yCurrent >= _yDestCurrent) {
-			_yChangeInc = -1;
-			_yChangeStart = ROOM_PATHS_HEIGHT;
-		} else {
-			_yChangeInc = 1;
-			_yChangeStart = 1;
+			if (_yCurrent >= _yDestCurrent) {
+				_yChangeInc = -1;
+				_yChangeStart = ROOM_PATHS_HEIGHT;
+			} else {
+				_yChangeInc = 1;
+				_yChangeStart = 1;
+			}
 		}
 	}
 
-	// Major loop to populate data
-	_cellPopulated = false;
-
-	while (1) {
-		// Loop through to process cells in the given area
-		if (!returnFlag) _yCtr = 0;
-		while (returnFlag || (_yCtr < ROOM_PATHS_HEIGHT)) {
-			if (!returnFlag) _xCtr = 0;
+	if (!skipToFinalStep) {
+		// Major loop to populate data
+		_cellPopulated = false;
 
-			while (returnFlag || (_xCtr < ROOM_PATHS_WIDTH)) {
-				if (!returnFlag) {
-					processCell(&_layer[(_yChangeStart + _yCtr * _yChangeInc) * DECODED_PATHS_WIDTH +
-						(_xChangeStart + _xCtr * _xChangeInc)]);
-					if (breakFlag && (_countdownCtr <= 0)) return PF_UNFINISHED;
-				} else {
-					returnFlag = false;
+		while (1) {
+			// Loop through to process cells in the given area
+			if (!returnFlag) _yCtr = 0;
+			while (returnFlag || (_yCtr < ROOM_PATHS_HEIGHT)) {
+				if (!returnFlag) _xCtr = 0;
+
+				while (returnFlag || (_xCtr < ROOM_PATHS_WIDTH)) {
+					if (!returnFlag) {
+						processCell(&_layer[(_yChangeStart + _yCtr * _yChangeInc) * DECODED_PATHS_WIDTH +
+							(_xChangeStart + _xCtr * _xChangeInc)]);
+						if (breakFlag && (_countdownCtr <= 0)) return PF_UNFINISHED;
+					} else {
+						returnFlag = false;
+					}
+					++_xCtr;
 				}
-				++_xCtr;
+				++_yCtr;
 			}
-			++_yCtr;
-		}
 
-		// If the destination cell has been filled in, then break out of loop
-		if (*_pDest != 0) break;
+			// If the destination cell has been filled in, then break out of loop
+			if (*_pDest != 0) break;
 
-		if (_cellPopulated) {
-			// At least one cell populated, so go repeat loop
-			_cellPopulated = false;
-		} else {
-			result = PF_PART_PATH;
-			scanFlag = true;
-			break;
+			if (_cellPopulated) {
+				// At least one cell populated, so go repeat loop
+				_cellPopulated = false;
+			} else {
+				result = PF_PART_PATH;
+				scanFlag = true;
+				break;
+			}
 		}
-	}
-	_inProgress = false;
+		_inProgress = false;
 
-	if (scanFlag || _destOccupied) {
-		// Adjust the end point if necessary to stop character walking into occupied area
+		if (scanFlag || _destOccupied) {
+			// Adjust the end point if necessary to stop character walking into occupied area
 
-		// Restore destination's occupied state if necessary
-		if (_destOccupied) {
-			*_pDest = 0xffff;
-			_destOccupied = false;
-		}
+			// Restore destination's occupied state if necessary
+			if (_destOccupied) {
+				*_pDest = 0xffff;
+				_destOccupied = false;
+			}
 
-		// Scan through lines
-		v = 0xff;
-		pTemp = _pDest;
-		scanLine(_destX, -1, pTemp, v);
-		scanLine(ROOM_PATHS_WIDTH - _destX, 1, pTemp, v);
-		scanLine(_destY, -DECODED_PATHS_WIDTH, pTemp, v);
-		scanLine(ROOM_PATHS_HEIGHT - _destY, DECODED_PATHS_WIDTH, pTemp, v);
+			// Scan through lines
+			v = 0xff;
+			pTemp = _pDest;
+			scanLine(_destX, -1, pTemp, v);
+			scanLine(ROOM_PATHS_WIDTH - _destX, 1, pTemp, v);
+			scanLine(_destY, -DECODED_PATHS_WIDTH, pTemp, v);
+			scanLine(ROOM_PATHS_HEIGHT - _destY, DECODED_PATHS_WIDTH, pTemp, v);
+
+			if (pTemp == _pDest) {
+				clear();
+				return PF_NO_WALK;
+			}
 
-		if (pTemp == _pDest) {
-			clear();
-			return PF_NO_WALK;
+			_pDest = pTemp;
 		}
 
-		_pDest = pTemp;
-	}
+		// ****DEBUG****
+		if (_hotspot->hotspotId() == PLAYER_ID) {
+			for (int ctr = 0; ctr < DECODED_PATHS_WIDTH * DECODED_PATHS_HEIGHT; ++ctr)
+				Room::getReference().tempLayer[ctr] = _layer[ctr];
+		}
 
-	// ****DEBUG****
-	if (_hotspot->hotspotId() == PLAYER_ID) {
-		for (int ctr = 0; ctr < DECODED_PATHS_WIDTH * DECODED_PATHS_HEIGHT; ++ctr)
-			Room::getReference().tempLayer[ctr] = _layer[ctr];
-	}
+		// Determine the walk path by working backwards from the destination, adding in the
+		// walking steps in reverse order until source is reached
+		int stageCtr;
+		for (stageCtr = 0; stageCtr < 3; ++stageCtr) {
+			// Clear out any previously determined directions
+			clear();
 
-	// Determine the walk path by working backwards from the destination, adding in the
-	// walking steps in reverse order until source is reached
-	int stageCtr;
-	for (stageCtr = 0; stageCtr < 3; ++stageCtr) {
-		// Clear out any previously determined directions
-		clear();
+			altFlag = stageCtr == 1;
+			pCurrent = _pDest;
+
+			numSteps = 0;
+			currDirection = NO_DIRECTION;
+			while (1) {
+				v = *pCurrent - 1;
+				if (v == 0) break;
+
+				newDirection = NO_DIRECTION;
+				if (!altFlag && (currDirection != LEFT) && (currDirection != RIGHT)) {
+					// Standard order direction checking
+					if (*(pCurrent - DECODED_PATHS_WIDTH) == v) newDirection = DOWN;
+					else if (*(pCurrent + DECODED_PATHS_WIDTH) == v) newDirection = UP;
+					else if (*(pCurrent + 1) == v) newDirection = LEFT;
+					else if (*(pCurrent - 1) == v) newDirection = RIGHT;
+				} else {
+					// Alternate order direction checking
+					if (*(pCurrent + 1) == v) newDirection = LEFT;
+					else if (*(pCurrent - 1) == v) newDirection = RIGHT;
+					else if (*(pCurrent - DECODED_PATHS_WIDTH) == v) newDirection = DOWN;
+					else if (*(pCurrent + DECODED_PATHS_WIDTH) == v) newDirection = UP;
+				}
+				if (newDirection == NO_DIRECTION)
+					error("Path finding process failed");
 
-		altFlag = stageCtr == 1;
-		pCurrent = _pDest;
+				// Process for the specified direction
+				if (newDirection != currDirection) add(newDirection, 0);
 
-		numSteps = 0;
-		currDirection = NO_DIRECTION;
-		while (1) {
-			v = *pCurrent - 1;
-			if (v == 0) break;
-
-			newDirection = NO_DIRECTION;
-			if (!altFlag && (currDirection != LEFT) && (currDirection != RIGHT)) {
-				// Standard order direction checking
-				if (*(pCurrent - DECODED_PATHS_WIDTH) == v) newDirection = DOWN;
-				else if (*(pCurrent + DECODED_PATHS_WIDTH) == v) newDirection = UP;
-				else if (*(pCurrent + 1) == v) newDirection = LEFT;
-				else if (*(pCurrent - 1) == v) newDirection = RIGHT;
-			} else {
-				// Alternate order direction checking
-				if (*(pCurrent + 1) == v) newDirection = LEFT;
-				else if (*(pCurrent - 1) == v) newDirection = RIGHT;
-				else if (*(pCurrent - DECODED_PATHS_WIDTH) == v) newDirection = DOWN;
-				else if (*(pCurrent + DECODED_PATHS_WIDTH) == v) newDirection = UP;
-			}
-			if (newDirection == NO_DIRECTION)
-				error("Path finding process failed");
-
-			// Process for the specified direction
-			if (newDirection != currDirection) add(newDirection, 0);
+				switch (newDirection) {
+				case UP:
+					pCurrent += DECODED_PATHS_WIDTH;
+					break;
 
-			switch (newDirection) {
-			case UP:
-				pCurrent += DECODED_PATHS_WIDTH;
-				break;
+				case DOWN:
+					pCurrent -= DECODED_PATHS_WIDTH;
+					break;
 
-			case DOWN:
-				pCurrent -= DECODED_PATHS_WIDTH;
-				break;
+				case LEFT:
+					++pCurrent;
+					break;
 
-			case LEFT:
-				++pCurrent;
-				break;
+				case RIGHT:
+					--pCurrent;
+					break;
 
-			case RIGHT:
-				--pCurrent;
-				break;
+				default:
+					break;
+				}
 
-			default:
-				break;
+				++numSteps;
+				top().rawSteps() += 8;
+				currDirection = newDirection;
 			}
 
-			++numSteps;
-			top().rawSteps() += 8;
-			currDirection = newDirection;
+			if (stageCtr == 0)
+				// Save the number of steps needed
+				savedSteps = numSteps;
+			if ((stageCtr == 1) && (numSteps <= savedSteps))
+				// Less steps were needed, so break out
+				break;
 		}
 
-		if (stageCtr == 0)
-			// Save the number of steps needed
-			savedSteps = numSteps;
-		if ((stageCtr == 1) && (numSteps <= savedSteps))
-			// Less steps were needed, so break out
-			break;
-	}
-
-	// Add final movement if necessary
+		// Add final movement if necessary
 
-	if (result == PF_OK) {
-		if (_xDestPos < 0)
-			addBack(LEFT, -_xDestPos);
-		else if (_xDestPos > 0)
-			addBack(RIGHT, _xDestPos);
+		if (result == PF_OK) {
+			if (_xDestPos < 0)
+				addBack(LEFT, -_xDestPos);
+			else if (_xDestPos > 0)
+				addBack(RIGHT, _xDestPos);
+		}
 	}
 
-final_step:
+	// Final Step
 	if (_xPos < 0) add(RIGHT, -_xPos);
 	else if (_xPos > 0) add(LEFT, _xPos);
 
diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp
index 9919471c76..61de2bf165 100644
--- a/engines/lure/menu.cpp
+++ b/engines/lure/menu.cpp
@@ -515,7 +515,9 @@ uint16 PopupMenu::Show(int numEntries, const char *actions[]) {
 	r.top = Surface::textY();
 	r.bottom = s->height() - Surface::textY() + 1;
 
-	for (;;) {
+	bool bailOut = false;
+
+	while (!bailOut) {
 		if (refreshFlag) {
 			// Set up the contents of the menu
 			s->fillRect(r, bgColor);
@@ -546,8 +548,8 @@ uint16 PopupMenu::Show(int numEntries, const char *actions[]) {
 		while (e.pollEvent()) {
 			if (engine.shouldQuit()) {
 				selectedIndex = 0xffff;
-				goto bail_out;
-
+				bailOut = true;
+				break;
 			} else if (e.type() == Common::EVENT_WHEELUP) {
 				// Scroll upwards
 				if (selectedIndex > 0) {
@@ -571,10 +573,12 @@ uint16 PopupMenu::Show(int numEntries, const char *actions[]) {
 					++selectedIndex;
 					refreshFlag = true;
 				} else if ((keycode == Common::KEYCODE_RETURN) || (keycode == Common::KEYCODE_KP_ENTER)) {
-					goto bail_out;
+					bailOut = true;
+					break;
 				} else if (keycode == Common::KEYCODE_ESCAPE) {
 					selectedIndex = 0xffff;
-					goto bail_out;
+					bailOut = true;
+					break;
 				}
 
 #ifdef LURE_CLICKABLE_MENUS
@@ -586,46 +590,51 @@ uint16 PopupMenu::Show(int numEntries, const char *actions[]) {
 				if (r.contains(x, y)) {
 					selectedIndex = (y - r.top) / FONT_HEIGHT;
 					if (e.type() == Common::EVENT_LBUTTONDOWN)
-						goto bail_out;
+						bailOut = true;
+						break;
 				}
 #else
 			} else if ((e.type() == Common::EVENT_LBUTTONDOWN) ||
 					(e.type() == Common::EVENT_MBUTTONDOWN)) {
 				//mouse.waitForRelease();
-				goto bail_out;
+				bailOut = true;
+				break;
 #endif
 			} else if (e.type() == Common::EVENT_RBUTTONDOWN) {
 				mouse.waitForRelease();
 				selectedIndex = 0xffff;
-				goto bail_out;
+				bailOut = true;
+				break;
 			}
 		}
 
+		if (!bailOut) {
 #ifndef LURE_CLICKABLE_MENUS
-		// Warping the mouse to "neutral" even if the top/bottom menu
-		// entry has been reached has both pros and cons. It makes the
-		// menu behave a bit more sensibly, but it also makes it harder
-		// to move the mouse pointer out of the ScummVM window.
-
-		if (mouse.y() < yMiddle - POPMENU_CHANGE_SENSITIVITY) {
-			if (selectedIndex > 0) {
-				--selectedIndex;
-				refreshFlag = true;
-			}
-			mouse.setPosition(FULL_SCREEN_WIDTH / 2, yMiddle);
-		} else if (mouse.y() > yMiddle + POPMENU_CHANGE_SENSITIVITY) {
-			if (selectedIndex < numEntries - 1) {
-				++selectedIndex;
-				refreshFlag = true;
+			// Warping the mouse to "neutral" even if the top/bottom menu
+			// entry has been reached has both pros and cons. It makes the
+			// menu behave a bit more sensibly, but it also makes it harder
+			// to move the mouse pointer out of the ScummVM window.
+
+			if (mouse.y() < yMiddle - POPMENU_CHANGE_SENSITIVITY) {
+				if (selectedIndex > 0) {
+					--selectedIndex;
+					refreshFlag = true;
+				}
+				mouse.setPosition(FULL_SCREEN_WIDTH / 2, yMiddle);
+			} else if (mouse.y() > yMiddle + POPMENU_CHANGE_SENSITIVITY) {
+				if (selectedIndex < numEntries - 1) {
+					++selectedIndex;
+					refreshFlag = true;
+				}
+				mouse.setPosition(FULL_SCREEN_WIDTH / 2, yMiddle);
 			}
-			mouse.setPosition(FULL_SCREEN_WIDTH / 2, yMiddle);
-		}
 #endif
 
-		system.delayMillis(20);
+			system.delayMillis(20);
+		}
 	}
 
-bail_out:
+	// bailOut
 	delete s;
 
 #ifndef LURE_CLICKABLE_MENUS
-- 
cgit v1.2.3


From f722542ceea557e906699c60b10b3ace1f41c238 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Sat, 10 Dec 2011 20:12:35 +0000
Subject: AGI: Replace usage of 'goto'.

---
 engines/agi/cycle.cpp         |  75 +++++++++--------
 engines/agi/menu.cpp          | 129 ++++++++++++++--------------
 engines/agi/preagi_winnie.cpp |  61 ++++++++------
 engines/agi/predictive.cpp    |  34 ++++----
 engines/agi/saveload.cpp      | 189 +++++++++++++++++++++---------------------
 engines/agi/text.cpp          |  22 +++--
 6 files changed, 265 insertions(+), 245 deletions(-)

(limited to 'engines')

diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp
index 99649fb437..5daadbd1df 100644
--- a/engines/agi/cycle.cpp
+++ b/engines/agi/cycle.cpp
@@ -248,44 +248,47 @@ int AgiEngine::mainCycle() {
 	if (kascii)
 		setvar(vKey, kascii);
 
-process_key:
-
-	switch (_game.inputMode) {
-	case INPUT_NORMAL:
-		if (!handleController(key)) {
-			if (key == 0 || !_game.inputEnabled)
-				break;
-			handleKeys(key);
-
-			// if ESC pressed, activate menu before
-			// accept.input from the interpreter cycle
-			// sets the input mode to normal again
-			// (closes: #540856)
-			if (key == KEY_ESCAPE) {
-				key = 0;
-				goto process_key;
+	bool restartProcessKey;
+	do {
+		restartProcessKey = false;
+
+		switch (_game.inputMode) {
+		case INPUT_NORMAL:
+			if (!handleController(key)) {
+				if (key == 0 || !_game.inputEnabled)
+					break;
+				handleKeys(key);
+
+				// if ESC pressed, activate menu before
+				// accept.input from the interpreter cycle
+				// sets the input mode to normal again
+				// (closes: #540856)
+				if (key == KEY_ESCAPE) {
+					key = 0;
+					restartProcessKey = true;
+				}
+
+				// commented out to close Sarien bug #438872
+				//if (key)
+				//	_game.keypress = key;
 			}
-
-			// commented out to close Sarien bug #438872
-			//if (key)
-			//	_game.keypress = key;
+			break;
+		case INPUT_GETSTRING:
+			handleController(key);
+			handleGetstring(key);
+			setvar(vKey, 0);	// clear ENTER key
+			break;
+		case INPUT_MENU:
+			_menu->keyhandler(key);
+			_gfx->doUpdate();
+			return false;
+		case INPUT_NONE:
+			handleController(key);
+			if (key)
+				_game.keypress = key;
+			break;
 		}
-		break;
-	case INPUT_GETSTRING:
-		handleController(key);
-		handleGetstring(key);
-		setvar(vKey, 0);	// clear ENTER key
-		break;
-	case INPUT_MENU:
-		_menu->keyhandler(key);
-		_gfx->doUpdate();
-		return false;
-	case INPUT_NONE:
-		handleController(key);
-		if (key)
-			_game.keypress = key;
-		break;
-	}
+	} while (restartProcessKey);
 	_gfx->doUpdate();
 
 	if (_game.msgBoxTicks > 0)
diff --git a/engines/agi/menu.cpp b/engines/agi/menu.cpp
index b504cd3e30..cac1701596 100644
--- a/engines/agi/menu.cpp
+++ b/engines/agi/menu.cpp
@@ -279,6 +279,7 @@ bool Menu::keyhandler(int key) {
 	static int clockVal;
 	static int menuActive = false;
 	static int buttonUsed = 0;
+	bool exitMenu = false;
 
 	if (!_vm->getflag(fMenusWork) && !(_vm->getFeatures() & GF_MENUS))
 		return false;
@@ -288,9 +289,8 @@ bool Menu::keyhandler(int key) {
 		_vm->_game.clockEnabled = false;
 		drawMenuBar();
 	}
-	//
+	
 	// Mouse handling
-	//
 	if (_vm->_mouse.button) {
 		int hmenu, vmenu;
 
@@ -372,83 +372,84 @@ bool Menu::keyhandler(int key) {
 						debugC(6, kDebugLevelMenu | kDebugLevelInput, "event %d registered", d->event);
 						_vm->_game.controllerOccured[d->event] = true;
 						_vm->_menuSelected = true;
-
-						goto exit_menu;
+						break;
 					}
 				}
 			}
-			goto exit_menu;
+			exitMenu = true;
 		}
 	}
 
-	if (!menuActive) {
-		if (_hCurMenu >= 0) {
-			drawMenuHilite(_hCurMenu);
-			drawMenuOption(_hCurMenu);
-			if (!buttonUsed && _vCurMenu >= 0)
-				drawMenuOptionHilite(_hCurMenu, _vCurMenu);
+	if (!exitMenu) {
+		if (!menuActive) {
+			if (_hCurMenu >= 0) {
+				drawMenuHilite(_hCurMenu);
+				drawMenuOption(_hCurMenu);
+				if (!buttonUsed && _vCurMenu >= 0)
+					drawMenuOptionHilite(_hCurMenu, _vCurMenu);
+			}
+			menuActive = true;
 		}
-		menuActive = true;
-	}
 
-	switch (key) {
-	case KEY_ESCAPE:
-		debugC(6, kDebugLevelMenu | kDebugLevelInput, "KEY_ESCAPE");
-		goto exit_menu;
-	case KEY_ENTER:
-	{
-		debugC(6, kDebugLevelMenu | kDebugLevelInput, "KEY_ENTER");
-		AgiMenuOption* d = getMenuOption(_hCurMenu, _vCurMenu);
-
-		if (d->enabled) {
-			debugC(6, kDebugLevelMenu | kDebugLevelInput, "event %d registered", d->event);
-			_vm->_game.controllerOccured[d->event] = true;
-			_vm->_menuSelected = true;
-			goto exit_menu;
+		switch (key) {
+		case KEY_ESCAPE:
+			debugC(6, kDebugLevelMenu | kDebugLevelInput, "KEY_ESCAPE");
+			exitMenu = true;
+			break;
+		case KEY_ENTER:
+		{
+			debugC(6, kDebugLevelMenu | kDebugLevelInput, "KEY_ENTER");
+			AgiMenuOption* d = getMenuOption(_hCurMenu, _vCurMenu);
+
+			if (d->enabled) {
+				debugC(6, kDebugLevelMenu | kDebugLevelInput, "event %d registered", d->event);
+				_vm->_game.controllerOccured[d->event] = true;
+				_vm->_menuSelected = true;
+				exitMenu = true;
+			}
+			break;
 		}
-		break;
-	}
-	case KEY_DOWN:
-	case KEY_UP:
-		_vCurMenu += key == KEY_DOWN ? 1 : -1;
+		case KEY_DOWN:
+		case KEY_UP:
+			_vCurMenu += key == KEY_DOWN ? 1 : -1;
 
-		if (_vCurMenu < 0)
-			_vCurMenu = _vMaxMenu[_hCurMenu];
-		if (_vCurMenu > _vMaxMenu[_hCurMenu])
-			_vCurMenu = 0;
+			if (_vCurMenu < 0)
+				_vCurMenu = _vMaxMenu[_hCurMenu];
+			if (_vCurMenu > _vMaxMenu[_hCurMenu])
+				_vCurMenu = 0;
 
-		drawMenuOption(_hCurMenu);
-		drawMenuOptionHilite(_hCurMenu, _vCurMenu);
-		break;
-	case KEY_RIGHT:
-	case KEY_LEFT:
-		_hCurMenu += key == KEY_RIGHT ? 1 : -1;
-
-		if (_hCurMenu < 0)
-			_hCurMenu = _hMaxMenu;
-		if (_hCurMenu > _hMaxMenu)
-			_hCurMenu = 0;
-
-		_vCurMenu = 0;
-		newMenuSelected(_hCurMenu);
-		drawMenuOptionHilite(_hCurMenu, _vCurMenu);
-		break;
-	}
+			drawMenuOption(_hCurMenu);
+			drawMenuOptionHilite(_hCurMenu, _vCurMenu);
+			break;
+		case KEY_RIGHT:
+		case KEY_LEFT:
+			_hCurMenu += key == KEY_RIGHT ? 1 : -1;
 
-	return true;
+			if (_hCurMenu < 0)
+				_hCurMenu = _hMaxMenu;
+			if (_hCurMenu > _hMaxMenu)
+				_hCurMenu = 0;
 
-exit_menu:
-	buttonUsed = 0;
-	_picture->showPic();
-	_vm->writeStatus();
+			_vCurMenu = 0;
+			newMenuSelected(_hCurMenu);
+			drawMenuOptionHilite(_hCurMenu, _vCurMenu);
+			break;
+		}
+	}
 
-	_vm->setvar(vKey, 0);
-	_vm->_game.keypress = 0;
-	_vm->_game.clockEnabled = clockVal;
-	_vm->oldInputMode();
+	if (exitMenu) {
+		buttonUsed = 0;
+		_picture->showPic();
+		_vm->writeStatus();
 
-	debugC(3, kDebugLevelMenu, "exit_menu: input mode reset to %d", _vm->_game.inputMode);
-	menuActive = false;
+		_vm->setvar(vKey, 0);
+		_vm->_game.keypress = 0;
+		_vm->_game.clockEnabled = clockVal;
+		_vm->oldInputMode();
+
+		debugC(3, kDebugLevelMenu, "exit_menu: input mode reset to %d", _vm->_game.inputMode);
+		menuActive = false;
+	}
 
 	return true;
 }
diff --git a/engines/agi/preagi_winnie.cpp b/engines/agi/preagi_winnie.cpp
index cc5c2470ae..53863a8c7e 100644
--- a/engines/agi/preagi_winnie.cpp
+++ b/engines/agi/preagi_winnie.cpp
@@ -1006,36 +1006,47 @@ void WinnieEngine::gameLoop() {
 	WTP_ROOM_HDR hdr;
 	uint8 *roomdata = (uint8 *)malloc(4096);
 	int iBlock;
+	uint8 decodePhase = 0;
 
-phase0:
-	if (!_gameStateWinnie.nObjMiss && (_room == IDI_WTP_ROOM_PICNIC))
-		_room = IDI_WTP_ROOM_PARTY;
+	while (!shouldQuit()) {
+		if (decodePhase == 0) {
+			if (!_gameStateWinnie.nObjMiss && (_room == IDI_WTP_ROOM_PICNIC))
+				_room = IDI_WTP_ROOM_PARTY;
 
-	readRoom(_room, roomdata, hdr);
-	drawRoomPic();
-	_gfx->doUpdate();
+			readRoom(_room, roomdata, hdr);
+			drawRoomPic();
+			_gfx->doUpdate();
+			decodePhase = 1;
+		}
 
-phase1:
-	if (getObjInRoom(_room)) {
-		printObjStr(getObjInRoom(_room), IDI_WTP_OBJ_DESC);
-		getSelection(kSelAnyKey);
-	}
+		if (decodePhase == 1) {
+			if (getObjInRoom(_room)) {
+				printObjStr(getObjInRoom(_room), IDI_WTP_OBJ_DESC);
+				getSelection(kSelAnyKey);
+			}
+			decodePhase = 2;
+		}
 
-phase2:
-	for (iBlock = 0; iBlock < IDI_WTP_MAX_BLOCK; iBlock++) {
-		if (parser(hdr.ofsDesc[iBlock] - _roomOffset, iBlock, roomdata) == IDI_WTP_PAR_BACK)
-			goto phase1;
-	}
+		if (decodePhase == 2) {
+			for (iBlock = 0; iBlock < IDI_WTP_MAX_BLOCK; iBlock++) {
+				if (parser(hdr.ofsDesc[iBlock] - _roomOffset, iBlock, roomdata) == IDI_WTP_PAR_BACK) {
+					decodePhase = 1;
+					break;
+				}
+			}
+			if (decodePhase == 2)
+				decodePhase = 3;
+		}
 
-	while (!shouldQuit()) {
-		for (iBlock = 0; iBlock < IDI_WTP_MAX_BLOCK; iBlock++) {
-			switch (parser(hdr.ofsBlock[iBlock] - _roomOffset, iBlock, roomdata)) {
-			case IDI_WTP_PAR_GOTO:
-				goto phase0;
-				break;
-			case IDI_WTP_PAR_BACK:
-				goto phase2;
-				break;
+		if (decodePhase == 3) {
+			for (iBlock = 0; iBlock < IDI_WTP_MAX_BLOCK; iBlock++) {
+				if (parser(hdr.ofsBlock[iBlock] - _roomOffset, iBlock, roomdata) == IDI_WTP_PAR_GOTO) {
+					decodePhase = 0;
+					break;
+				} else if (parser(hdr.ofsBlock[iBlock] - _roomOffset, iBlock, roomdata) == IDI_WTP_PAR_BACK) {
+					decodePhase = 2;
+					break;
+				}
 			}
 		}
 	}
diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp
index edfe83b1cb..3290068d5a 100644
--- a/engines/agi/predictive.cpp
+++ b/engines/agi/predictive.cpp
@@ -96,8 +96,6 @@ void bringWordtoTop(char *str, int wordnum) {
 }
 
 bool AgiEngine::predictiveDialog() {
-	int key = 0, active = -1, lastactive = 0;
-	bool rc = false;
 	uint8 x;
 	int y;
 	int bx[17], by[17];
@@ -105,7 +103,6 @@ bool AgiEngine::predictiveDialog() {
 	char temp[MAXWORDLEN + 1], repeatcount[MAXWORDLEN];
 	AgiBlock tmpwindow;
 	bool navigationwithkeys = false;
-	bool processkey;
 
 	const char *buttonStr[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", "0" };
 	const char *buttons[] = {
@@ -189,8 +186,11 @@ bool AgiEngine::predictiveDialog() {
 	int mode = kModePre;
 
 	bool needRefresh = true;
-
-	while (!shouldQuit()) {
+	int active = -1, lastactive = 0;
+	bool rc = false;
+	bool closeDialog = false;
+	bool enterPredictiveResult = false;
+	while (!closeDialog && !shouldQuit()) {
 		if (needRefresh) {
 			for (int i = 0; buttons[i]; i++) {
 				int color1 = colors[i * 2];
@@ -234,9 +234,10 @@ bool AgiEngine::predictiveDialog() {
 			_gfx->doUpdate();
 		}
 
+		bool processkey = false;
+
 		pollTimer();
-		key = doPollKeyboard();
-		processkey = false;
+		int key = doPollKeyboard();
 		switch (key) {
 		case KEY_ENTER:
 			if (navigationwithkeys) {
@@ -251,7 +252,8 @@ bool AgiEngine::predictiveDialog() {
 			break;
 		case KEY_ESCAPE:
 			rc = false;
-			goto getout;
+			closeDialog = true;
+			break;
 		case BUTTON_LEFT:
 			navigationwithkeys = false;
 			for (int i = 0; buttons[i]; i++) {
@@ -361,7 +363,7 @@ bool AgiEngine::predictiveDialog() {
 			break;
 		}
 
-		if (processkey) {
+		if (processkey && !closeDialog) {
 			if (active >= 0) {
 				needRefresh = true;
 				lastactive = active;
@@ -442,7 +444,8 @@ bool AgiEngine::predictiveDialog() {
 					if (mode == kModePre && _predictiveDictActLine && numMatchingWords > 1 && _wordNumber != 0)
 						bringWordtoTop(_predictiveDictActLine, _wordNumber);
 					rc = true;
-					goto press;
+					enterPredictiveResult = true;
+					closeDialog = true;
 				} else if (active == 14) { // Mode
 					mode++;
 					if (mode > kModeAbc)
@@ -456,17 +459,18 @@ bool AgiEngine::predictiveDialog() {
 					_currentWord.clear();
 					memset(repeatcount, 0, sizeof(repeatcount));
 				} else {
-					goto press;
+					enterPredictiveResult = true;
+					closeDialog = true;
 				}
 			}
 		}
 	}
 
- press:
-	Common::strlcpy(_predictiveResult, prefix.c_str(), sizeof(_predictiveResult));
-	Common::strlcat(_predictiveResult, _currentWord.c_str(), sizeof(_predictiveResult));
+	if (enterPredictiveResult) {
+		Common::strlcpy(_predictiveResult, prefix.c_str(), sizeof(_predictiveResult));
+		Common::strlcat(_predictiveResult, _currentWord.c_str(), sizeof(_predictiveResult));
+	}
 
- getout:
 	// if another window was shown, bring it up again
 	if (!tmpwindow.active)
 		closeWindow();
diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index 1bcabd507f..00d6a1c8dd 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -609,8 +609,8 @@ int AgiEngine::selectSlot() {
 	AllowSyntheticEvents on(this);
 	int oldFirstSlot = _firstSlot + 1;
 	int oldActive = active + 1;
-
-	while (!(shouldQuit() || _restartGame)) {
+	bool exitSelectSlot = false;
+	while (!exitSelectSlot && !(shouldQuit() || _restartGame)) {
 		int sbPos = 0;
 
 		// Use the extreme scrollbar positions only if the extreme
@@ -661,119 +661,122 @@ int AgiEngine::selectSlot() {
 		// out of the dead loop
 		if (getflag(fRestoreJustRan)) {
 			rc = -2;
-			goto getout;
+			exitSelectSlot = true;
 		}
 
-		switch (key) {
-		case KEY_ENTER:
-			rc = active;
-			strncpy(_game.strings[MAX_STRINGS], desc[i], MAX_STRINGLEN);
-			goto press;
-		case KEY_ESCAPE:
-			rc = -1;
-			goto getout;
-		case BUTTON_LEFT:
-			if (_gfx->testButton(buttonX[0], buttonY, buttonText[0])) {
+		if (!exitSelectSlot) {
+			switch (key) {
+			case KEY_ENTER:
 				rc = active;
 				strncpy(_game.strings[MAX_STRINGS], desc[i], MAX_STRINGLEN);
-				goto press;
-			}
-			if (_gfx->testButton(buttonX[1], buttonY, buttonText[1])) {
+				debugC(8, kDebugLevelMain | kDebugLevelInput, "Button pressed: %d", rc);
+				exitSelectSlot = true;
+				break;
+			case KEY_ESCAPE:
 				rc = -1;
-				goto getout;
-			}
-			slotClicked = ((int)_mouse.y - 1) / CHAR_COLS - (vm + 4);
-			xmin = (hm + 1) * CHAR_COLS;
-			xmax = xmin + CHAR_COLS * 34;
-			if ((int)_mouse.x >= xmin && (int)_mouse.x <= xmax) {
-				if (slotClicked >= 0 && slotClicked < NUM_VISIBLE_SLOTS)
-					active = slotClicked;
-			}
-			xmin = (hm + 36) * CHAR_COLS;
-			xmax = xmin + CHAR_COLS;
-			if ((int)_mouse.x >= xmin && (int)_mouse.x <= xmax) {
-				if (slotClicked >= 0 && slotClicked < NUM_VISIBLE_SLOTS) {
-					if (slotClicked == 0)
-						keyEnqueue(KEY_UP);
-					else if (slotClicked == NUM_VISIBLE_SLOTS - 1)
-						keyEnqueue(KEY_DOWN);
-					else if (slotClicked < sbPos)
-						keyEnqueue(KEY_UP_RIGHT);
-					else if (slotClicked > sbPos)
-						keyEnqueue(KEY_DOWN_RIGHT);
+				exitSelectSlot = true;
+				break;
+			case BUTTON_LEFT:
+				if (_gfx->testButton(buttonX[0], buttonY, buttonText[0])) {
+					rc = active;
+					strncpy(_game.strings[MAX_STRINGS], desc[i], MAX_STRINGLEN);
+					debugC(8, kDebugLevelMain | kDebugLevelInput, "Button pressed: %d", rc);
+					exitSelectSlot = true;
+				} else if (_gfx->testButton(buttonX[1], buttonY, buttonText[1])) {
+					rc = -1;
+					exitSelectSlot = true;
+				} else {
+					slotClicked = ((int)_mouse.y - 1) / CHAR_COLS - (vm + 4);
+					xmin = (hm + 1) * CHAR_COLS;
+					xmax = xmin + CHAR_COLS * 34;
+					if ((int)_mouse.x >= xmin && (int)_mouse.x <= xmax) {
+						if (slotClicked >= 0 && slotClicked < NUM_VISIBLE_SLOTS)
+							active = slotClicked;
+					}
+					xmin = (hm + 36) * CHAR_COLS;
+					xmax = xmin + CHAR_COLS;
+					if ((int)_mouse.x >= xmin && (int)_mouse.x <= xmax) {
+						if (slotClicked >= 0 && slotClicked < NUM_VISIBLE_SLOTS) {
+							if (slotClicked == 0)
+								keyEnqueue(KEY_UP);
+							else if (slotClicked == NUM_VISIBLE_SLOTS - 1)
+								keyEnqueue(KEY_DOWN);
+							else if (slotClicked < sbPos)
+								keyEnqueue(KEY_UP_RIGHT);
+							else if (slotClicked > sbPos)
+								keyEnqueue(KEY_DOWN_RIGHT);
+						}
+					}
 				}
-			}
-			break;
-		case KEY_DOWN:
-			active++;
-			if (active >= NUM_VISIBLE_SLOTS) {
-				if (_firstSlot + NUM_VISIBLE_SLOTS < NUM_SLOTS) {
+				break;
+
+			case KEY_DOWN:
+				active++;
+				if (active >= NUM_VISIBLE_SLOTS) {
+					if (_firstSlot + NUM_VISIBLE_SLOTS < NUM_SLOTS) {
+						_firstSlot++;
+						for (i = 1; i < NUM_VISIBLE_SLOTS; i++)
+							memcpy(desc[i - 1], desc[i], sizeof(desc[0]));
+						getSavegameDescription(_firstSlot + NUM_VISIBLE_SLOTS - 1, desc[NUM_VISIBLE_SLOTS - 1]);
+					}
+					active = NUM_VISIBLE_SLOTS - 1;
+				}
+				break;
+			case KEY_UP:
+				active--;
+				if (active < 0) {
+					active = 0;
+					if (_firstSlot > 0) {
+						_firstSlot--;
+						for (i = NUM_VISIBLE_SLOTS - 1; i > 0; i--)
+							memcpy(desc[i], desc[i - 1], sizeof(desc[0]));
+						getSavegameDescription(_firstSlot, desc[0]);
+					}
+				}
+				break;
+
+			// Page Up/Down and mouse wheel scrolling all leave 'active'
+			// unchanged so that a visible slot will remain selected.
+
+			case WHEEL_DOWN:
+				if (_firstSlot < NUM_SLOTS - NUM_VISIBLE_SLOTS) {
 					_firstSlot++;
 					for (i = 1; i < NUM_VISIBLE_SLOTS; i++)
 						memcpy(desc[i - 1], desc[i], sizeof(desc[0]));
 					getSavegameDescription(_firstSlot + NUM_VISIBLE_SLOTS - 1, desc[NUM_VISIBLE_SLOTS - 1]);
 				}
-				active = NUM_VISIBLE_SLOTS - 1;
-			}
-			break;
-		case KEY_UP:
-			active--;
-			if (active < 0) {
-				active = 0;
+				break;
+			case WHEEL_UP:
 				if (_firstSlot > 0) {
 					_firstSlot--;
 					for (i = NUM_VISIBLE_SLOTS - 1; i > 0; i--)
 						memcpy(desc[i], desc[i - 1], sizeof(desc[0]));
 					getSavegameDescription(_firstSlot, desc[0]);
 				}
+				break;
+			case KEY_DOWN_RIGHT:
+				// This is probably triggered by Page Down.
+				_firstSlot += NUM_VISIBLE_SLOTS;
+				if (_firstSlot > NUM_SLOTS - NUM_VISIBLE_SLOTS) {
+					_firstSlot = NUM_SLOTS - NUM_VISIBLE_SLOTS;
+				}
+				for (i = 0; i < NUM_VISIBLE_SLOTS; i++)
+					getSavegameDescription(_firstSlot + i, desc[i]);
+				break;
+			case KEY_UP_RIGHT:
+				// This is probably triggered by Page Up.
+				_firstSlot -= NUM_VISIBLE_SLOTS;
+				if (_firstSlot < 0) {
+					_firstSlot = 0;
+				}
+				for (i = 0; i < NUM_VISIBLE_SLOTS; i++)
+					getSavegameDescription(_firstSlot + i, desc[i]);
+				break;
 			}
-			break;
-
-		// Page Up/Down and mouse wheel scrolling all leave 'active'
-		// unchanged so that a visible slot will remain selected.
-
-		case WHEEL_DOWN:
-			if (_firstSlot < NUM_SLOTS - NUM_VISIBLE_SLOTS) {
-				_firstSlot++;
-				for (i = 1; i < NUM_VISIBLE_SLOTS; i++)
-					memcpy(desc[i - 1], desc[i], sizeof(desc[0]));
-				getSavegameDescription(_firstSlot + NUM_VISIBLE_SLOTS - 1, desc[NUM_VISIBLE_SLOTS - 1]);
-			}
-			break;
-		case WHEEL_UP:
-			if (_firstSlot > 0) {
-				_firstSlot--;
-				for (i = NUM_VISIBLE_SLOTS - 1; i > 0; i--)
-					memcpy(desc[i], desc[i - 1], sizeof(desc[0]));
-				getSavegameDescription(_firstSlot, desc[0]);
-			}
-			break;
-		case KEY_DOWN_RIGHT:
-			// This is probably triggered by Page Down.
-			_firstSlot += NUM_VISIBLE_SLOTS;
-			if (_firstSlot > NUM_SLOTS - NUM_VISIBLE_SLOTS) {
-				_firstSlot = NUM_SLOTS - NUM_VISIBLE_SLOTS;
-			}
-			for (i = 0; i < NUM_VISIBLE_SLOTS; i++)
-				getSavegameDescription(_firstSlot + i, desc[i]);
-			break;
-		case KEY_UP_RIGHT:
-			// This is probably triggered by Page Up.
-			_firstSlot -= NUM_VISIBLE_SLOTS;
-			if (_firstSlot < 0) {
-				_firstSlot = 0;
-			}
-			for (i = 0; i < NUM_VISIBLE_SLOTS; i++)
-				getSavegameDescription(_firstSlot + i, desc[i]);
-			break;
 		}
 		_gfx->doUpdate();
 	}
 
-press:
-	debugC(8, kDebugLevelMain | kDebugLevelInput, "Button pressed: %d", rc);
-
-getout:
 	closeWindow();
 
 	_noSaveLoadAllowed = false;
diff --git a/engines/agi/text.cpp b/engines/agi/text.cpp
index 3247862e32..1886a74ab1 100644
--- a/engines/agi/text.cpp
+++ b/engines/agi/text.cpp
@@ -340,8 +340,6 @@ int AgiEngine::messageBox(const char *s) {
 int AgiEngine::selectionBox(const char *m, const char **b) {
 	int numButtons = 0;
 	int x, y, i, s;
-	int key, active = 0;
-	int rc = -1;
 	int bx[5], by[5];
 
 	_noSaveLoadAllowed = true;
@@ -380,7 +378,9 @@ int AgiEngine::selectionBox(const char *m, const char **b) {
 	AllowSyntheticEvents on(this);
 
 	debugC(4, kDebugLevelText, "selectionBox(): waiting...");
-	while (!(shouldQuit() || _restartGame)) {
+	int key, active = 0;
+	int rc = -1;
+	while (rc == -1 && !(shouldQuit() || _restartGame)) {
 		for (i = 0; b[i]; i++)
 			_gfx->drawCurrentStyleButton(bx[i], by[i], b[i], i == active, false, i == 0);
 
@@ -389,10 +389,8 @@ int AgiEngine::selectionBox(const char *m, const char **b) {
 		switch (key) {
 		case KEY_ENTER:
 			rc = active;
-			goto press;
-		case KEY_ESCAPE:
-			rc = -1;
-			goto getout;
+			debugC(4, kDebugLevelText, "selectionBox(): Button pressed: %d", rc);
+			break;
 		case KEY_RIGHT:
 			active++;
 			if (active >= numButtons)
@@ -407,7 +405,8 @@ int AgiEngine::selectionBox(const char *m, const char **b) {
 			for (i = 0; b[i]; i++) {
 				if (_gfx->testButton(bx[i], by[i], b[i])) {
 					rc = active = i;
-					goto press;
+					debugC(4, kDebugLevelText, "selectionBox(): Button pressed: %d", rc);
+					break;
 				}
 			}
 			break;
@@ -418,12 +417,11 @@ int AgiEngine::selectionBox(const char *m, const char **b) {
 			break;
 		}
 		_gfx->doUpdate();
-	}
 
-press:
-	debugC(4, kDebugLevelText, "selectionBox(): Button pressed: %d", rc);
+		if (key == KEY_ESCAPE)
+			break;
+	}
 
-getout:
 	closeWindow();
 	debugC(2, kDebugLevelText, "selectionBox(): Result = %d", rc);
 
-- 
cgit v1.2.3


From 1f96dc550c554e5481496b729434e0b36fa2eaa7 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 12 Dec 2011 16:17:15 +0100
Subject: TSAGE: Remove unused method

---
 engines/tsage/core.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index cbd3d9f77c..060ffee121 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -421,7 +421,6 @@ public:
 	virtual void destroy() {}
 	virtual bool startAction(CursorType action, Event &event);
 	virtual void doAction(int action);
-	virtual bool performAction(CursorType action, Event &event) { return startAction(action, event); }
 
 	bool contains(const Common::Point &pt);
 	void setBounds(const Rect &newBounds) { _bounds = newBounds; }
-- 
cgit v1.2.3


From 30909b1ae455a7cb615720d5a65616925c3172a3 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 12 Dec 2011 16:17:30 +0100
Subject: TSAGE: Fix warning about hidden remove() method from parent class

---
 engines/tsage/blue_force/blueforce_logic.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h
index d0d0e0ee40..f5a3938f2b 100644
--- a/engines/tsage/blue_force/blueforce_logic.h
+++ b/engines/tsage/blue_force/blueforce_logic.h
@@ -65,6 +65,9 @@ public:
 
 	void add(EventHandler *obj);
 	void remove(EventHandler *obj);
+	// The following line prevents compiler warnings about hiding the remove()
+	// method from the parent class.
+	virtual void remove() { EventHandler::remove(); }
 };
 
 class Timer: public EventHandler {
-- 
cgit v1.2.3


From f485450758ffa37c789beb6bd038782dec8d97ad Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 12 Dec 2011 16:22:55 +0100
Subject: HUGO: Fix warning about hidden pause() method from parent class

---
 engines/hugo/sound.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'engines')

diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h
index 1e504fbdea..cb6d4e3168 100644
--- a/engines/hugo/sound.h
+++ b/engines/hugo/sound.h
@@ -43,6 +43,12 @@ public:
 	void pause(bool p);
 	void play(uint8 *stream, uint16 size);
 
+	// The following line prevents compiler warnings about hiding the pause()
+	// method from the parent class.
+	// FIXME: Maybe the pause(bool p) method should be removed and the
+	// pause/resume methods of the parent class be used instead?
+	virtual void pause() { Audio::MidiPlayer::pause(); }
+
 	uint32 getBaseTempo();
 
 	// Overload Audio::MidiPlayer method
-- 
cgit v1.2.3


From 6310cce74e224818dab3d714afd08a6cf6789874 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 12 Dec 2011 17:17:45 +0100
Subject: AGI: Remove two unused pure virtual methods

This avoid warnings, as these methods were being hidden by methods in subclasses
with differing signatures.
---
 engines/agi/agi.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'engines')

diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 6bb3beec78..e9923aba2e 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -809,8 +809,6 @@ public:
 	virtual void replayImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,
 		int16 p4, int16 p5, int16 p6, int16 p7) = 0;
 	virtual void releaseImageStack() = 0;
-	virtual	int saveGame(const Common::String &fileName, const Common::String &saveName) = 0;
-	virtual int loadGame(const Common::String &fileName, bool checkId = true) = 0;
 
 	int _soundemu;
 
-- 
cgit v1.2.3


From 00e6ab43f8db3b79486f324dfb11febbd4ad8c6b Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 12 Dec 2011 17:24:06 +0100
Subject: AGI: Add FIXME to cmdCallV1

---
 engines/agi/op_cmd.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp
index 41d9cc3ac9..7e04328a67 100644
--- a/engines/agi/op_cmd.cpp
+++ b/engines/agi/op_cmd.cpp
@@ -1702,6 +1702,9 @@ void cmdSetItemView(AgiGame *state, uint8 *p) {
 
 void cmdCallV1(AgiGame *state, uint8 *p) {
 	state->_vm->agiLoadResource(rLOGIC, p0);
+	// FIXME: The following instruction looks incomplete.
+	// Maybe something is meant to be assigned to, or read from,
+	// the logic_list entry?
 	state->logic_list[++state->max_logics];
 	_v[13] = 1;
 }
-- 
cgit v1.2.3


From 30b2c37e53852fba8ee73f692492f489b4d86e5a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 12 Dec 2011 20:00:45 +0200
Subject: DREAMWEB: Convert 'setuptimeduse', 'entrytexts' to C++ and move
 priestText() to DreamBase

---
 engines/dreamweb/dreambase.h  |   3 ++
 engines/dreamweb/dreamgen.cpp | 101 ------------------------------------------
 engines/dreamweb/dreamgen.h   |   2 -
 engines/dreamweb/people.cpp   |  13 +-----
 engines/dreamweb/stubs.cpp    |  46 +++++++++++++++++++
 engines/dreamweb/stubs.h      |   2 +-
 6 files changed, 52 insertions(+), 115 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 3d5c9ce88b..7ef6a9219e 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -115,6 +115,7 @@ public:
 	const Frame *getReelFrameAX(uint16 frame);
 	void soundOnReels(uint16 reelPointer);
 	void rollEndCredits();
+	void priestText(ReelRoutine &routine);
 
 	// from stubs.cpp
 	void crosshair();
@@ -154,6 +155,7 @@ public:
 	// from use.cpp
 	void placeFreeObject(uint8 index);
 	void removeFreeObject(uint8 index);
+	void setupTimedUse(uint16 offset, uint16 countToTimed, uint16 timeCount, byte x, byte y);
 
 	// from vgafades.cpp
 	uint8 *mainPalette();
@@ -209,6 +211,7 @@ public:
 	void createPanel();
 	void createPanel2();
 	void showPanel();
+	void entryTexts();
 };
 
 
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 6d3da6d0f2..76fbf92d83 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -4531,28 +4531,6 @@ void DreamGenContext::removeFreeObject() {
 	es = pop();
 }
 
-void DreamGenContext::setupTimedUse() {
-	STACK_CHECK;
-	_cmp(data.word(kTimecount), 0);
-	if (!flags.z())
-		return /* (cantsetup) */;
-	data.byte(kTimedy) = bh;
-	data.byte(kTimedx) = bl;
-	data.word(kCounttotimed) = cx;
-	_add(dx, cx);
-	data.word(kTimecount) = dx;
-	bl = al;
-	bh = 0;
-	_add(bx, bx);
-	es = data.word(kPuzzletext);
-	cx = (66*2);
-	ax = es.word(bx);
-	_add(ax, cx);
-	bx = ax;
-	data.word(kTimedseg) = es;
-	data.word(kTimedoffset) = bx;
-}
-
 void DreamGenContext::useGun() {
 	STACK_CHECK;
 	_cmp(data.byte(kObjecttype), 4);
@@ -5051,85 +5029,6 @@ nomatchslot:
 		goto slotloop;
 }
 
-void DreamGenContext::entryTexts() {
-	STACK_CHECK;
-	_cmp(data.byte(kLocation), 21);
-	if (!flags.z())
-		goto notloc15;
-	al = 28;
-	cx = 60;
-	dx = 11;
-	bl = 68;
-	bh = 64;
-	setupTimedUse();
-	return;
-notloc15:
-	_cmp(data.byte(kLocation), 30);
-	if (!flags.z())
-		goto notloc43;
-	al = 27;
-	cx = 60;
-	dx = 11;
-	bl = 68;
-	bh = 64;
-	setupTimedUse();
-	return;
-notloc43:
-	_cmp(data.byte(kLocation), 23);
-	if (!flags.z())
-		goto notloc23;
-	al = 29;
-	cx = 60;
-	dx = 11;
-	bl = 68;
-	bh = 64;
-	setupTimedUse();
-	return;
-notloc23:
-	_cmp(data.byte(kLocation), 31);
-	if (!flags.z())
-		goto notloc44;
-	al = 30;
-	cx = 60;
-	dx = 11;
-	bl = 68;
-	bh = 64;
-	setupTimedUse();
-	return;
-notloc44:
-	_cmp(data.byte(kLocation), 20);
-	if (!flags.z())
-		goto notsarters2;
-	al = 31;
-	cx = 60;
-	dx = 11;
-	bl = 68;
-	bh = 64;
-	setupTimedUse();
-	return;
-notsarters2:
-	_cmp(data.byte(kLocation), 24);
-	if (!flags.z())
-		goto notedenlob;
-	al = 32;
-	cx = 60;
-	dx = 3;
-	bl = 68;
-	bh = 64;
-	setupTimedUse();
-	return;
-notedenlob:
-	_cmp(data.byte(kLocation), 34);
-	if (!flags.z())
-		return /* (noteden2) */;
-	al = 33;
-	cx = 60;
-	dx = 3;
-	bl = 68;
-	bh = 64;
-	setupTimedUse();
-}
-
 void DreamGenContext::entryAnims() {
 	STACK_CHECK;
 	data.word(kReeltowatch) = -1;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index ae9bf3bb06..c0c7407f3f 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -491,7 +491,6 @@ public:
 	void useOpenBox();
 	void clearBuffers();
 	void getObTextStart();
-	void entryTexts();
 	void putUnderCentre();
 	void checkObjectSize();
 	void findText1();
@@ -580,7 +579,6 @@ public:
 	void checkInside();
 	void findPathOfPoint();
 	void getDestInfo();
-	void setupTimedUse();
 	void makeCaps();
 	void read();
 	void additionalText();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 889a430a22..efb9a028b6 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -629,25 +629,16 @@ void DreamGenContext::priest(ReelRoutine &routine) {
 
 	if (checkSpeed(routine)) {
 		routine.incReelPointer();
-		push(es);
-		push(bx);
 		priestText(routine);
-		bx = pop();
-		es = pop();
 	}
 }
 
-void DreamGenContext::priestText(ReelRoutine &routine) {
+void DreamBase::priestText(ReelRoutine &routine) {
 	uint16 reel = routine.reelPointer();
 	if (reel < 2 || reel >= 7 || (reel & 1))
 		return; // nopriesttext
 
-	al = ((reel & 0xFF) >> 1) + 50;
-	bl = 72;
-	bh = 80;
-	cx = 54;
-	dx = 1;
-	setupTimedUse();
+	setupTimedUse((reel >> 1) + 50, 54, 1, 72, 80);
 }
 
 void DreamGenContext::monkAndRyan(ReelRoutine &routine) {
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 162152ccda..e4c9a7514d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4317,4 +4317,50 @@ void DreamGenContext::quitKey() {
 		data.byte(kGetback) = 1;
 }
 
+void DreamGenContext::setupTimedUse() {
+	DreamBase::setupTimedUse(al, cx, dx, bl, bh);
+}
+
+void DreamBase::setupTimedUse(uint16 textIndex, uint16 countToTimed, uint16 timeCount, byte x, byte y) {
+	if (data.word(kTimecount) != 0)
+		return; // can't setup
+
+	data.byte(kTimedy) = y;
+	data.byte(kTimedx) = x;
+	data.word(kCounttotimed) = countToTimed;
+	data.word(kTimecount) = timeCount + countToTimed;
+	data.word(kTimedseg) = data.word(kPuzzletext);
+	data.word(kTimedoffset) = kTextstart + getSegment(data.word(kPuzzletext)).word(textIndex * 2);
+	const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(data.word(kTimedoffset), 0);
+	debug(1, "setupTimedUse: %d => '%s'", textIndex, string);
+}
+
+void DreamBase::entryTexts() {
+	switch (data.byte(kLocation)) {
+	case 21:
+		setupTimedUse(28, 60, 11, 68, 64);
+		break;
+	case 30:
+		setupTimedUse(27, 60, 11, 68, 64);
+		break;
+	case 23:
+		setupTimedUse(29, 60, 11, 68, 64);
+		break;
+	case 31:
+		setupTimedUse(30, 60, 11, 68, 64);
+		break;
+	case 20:
+		setupTimedUse(31, 60, 11, 68, 64);
+		break;
+	case 24:
+		setupTimedUse(32, 60, 3, 68, 64);
+		break;
+	case 34:
+		setupTimedUse(33, 60, 3, 68, 64);
+		break;
+	default:
+		break;
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 4308bd54ea..661eba3633 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -408,7 +408,6 @@
 	void louisChair(ReelRoutine &routine);
 	void bossMan(ReelRoutine &routine);
 	void priest(ReelRoutine &routine);
-	void priestText(ReelRoutine &routine);
 	void monkAndRyan(ReelRoutine &routine);
 	void copper(ReelRoutine &routine);
 	void introMonks1(ReelRoutine &routine);
@@ -568,5 +567,6 @@
 	void useButtonA();
 	void autoAppear();
 	void quitKey();
+	void setupTimedUse();
 
 #endif
-- 
cgit v1.2.3


From b04af6dc314969e4a0ae824dbe39fb385536594b Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Mon, 12 Dec 2011 19:28:18 +0100
Subject: MOHAWK: Display the weight up after resetting the clock puzzle in
 Myst ME

---
 engines/mohawk/myst_stacks/myst.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index b6c0a3212f..b3222e0322 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -2978,15 +2978,17 @@ void Myst::clockReset() {
 }
 
 void Myst::clockResetWeight() {
-	// Set video bounds, weight going up
+	_clockWeightVideo = _vm->_video->playMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0);
+
 	if (!(_vm->getFeatures() & GF_ME)) {
-		_clockWeightVideo = _vm->_video->playMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0);
+		// Set video bounds, weight going up
 		_vm->_video->setVideoBounds(_clockWeightVideo,
 				Audio::Timestamp(0, 2214 * 2 - _clockWeightPosition, 600),
 				Audio::Timestamp(0, 2214 * 2, 600));
 	} else {
-		//FIXME: Needs QT backwards playing
+		//FIXME: Needs QT backwards playing, for now just display the weight up
 		warning("Weight going back up not implemented");
+		_vm->_video->drawVideoFrame(_clockWeightVideo, Audio::Timestamp(0, 0, 600));
 	}
 
 	// Reset position
-- 
cgit v1.2.3


From 6507853b87023ef4b5bab2519b5764fa2ac57bca Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 12 Dec 2011 21:51:25 +0200
Subject: DREAMWEB: Port 'entryanims' to C++

---
 engines/dreamweb/dreamgen.cpp | 131 ------------------------------------------
 engines/dreamweb/dreamgen.h   |   1 -
 engines/dreamweb/stubs.cpp    |  84 ++++++++++++++++++++++++++-
 engines/dreamweb/stubs.h      |   1 +
 4 files changed, 82 insertions(+), 135 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 76fbf92d83..f449b8f38e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -5029,137 +5029,6 @@ nomatchslot:
 		goto slotloop;
 }
 
-void DreamGenContext::entryAnims() {
-	STACK_CHECK;
-	data.word(kReeltowatch) = -1;
-	data.byte(kWatchmode) = -1;
-	_cmp(data.byte(kLocation), 33);
-	if (!flags.z())
-		goto notinthebeach;
-	switchRyanOff();
-	data.word(kWatchingtime) = 76*2;
-	data.word(kReeltowatch) = 0;
-	data.word(kEndwatchreel) = 76;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	return;
-notinthebeach:
-	_cmp(data.byte(kLocation), 44);
-	if (!flags.z())
-		goto notsparkys;
-	al = 8;
-	resetLocation();
-	data.word(kWatchingtime) = 50*2;
-	data.word(kReeltowatch) = 247;
-	data.word(kEndwatchreel) = 297;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	switchRyanOff();
-	return;
-notsparkys:
-	_cmp(data.byte(kLocation), 22);
-	if (!flags.z())
-		goto notinthelift;
-	data.word(kWatchingtime) = 31*2;
-	data.word(kReeltowatch) = 0;
-	data.word(kEndwatchreel) = 30;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	switchRyanOff();
-	return;
-notinthelift:
-	_cmp(data.byte(kLocation), 26);
-	if (!flags.z())
-		goto notunderchurch;
-	data.byte(kSymboltopnum) = 2;
-	data.byte(kSymbolbotnum) = 1;
-	return;
-notunderchurch:
-	_cmp(data.byte(kLocation), 45);
-	if (!flags.z())
-		goto notenterdream;
-	data.byte(kKeeperflag) = 0;
-	data.word(kWatchingtime) = 296;
-	data.word(kReeltowatch) = 45;
-	data.word(kEndwatchreel) = 198;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	switchRyanOff();
-	return;
-notenterdream:
-	_cmp(data.byte(kReallocation), 46);
-	if (!flags.z())
-		goto notcrystal;
-	_cmp(data.byte(kSartaindead), 1);
-	if (!flags.z())
-		goto notcrystal;
-	al = 0;
-	removeFreeObject();
-	return;
-notcrystal:
-	_cmp(data.byte(kLocation), 9);
-	if (!flags.z())
-		goto nottopchurch;
-	al = 2;
-	checkIfPathIsOn();
-	if (flags.z())
-		goto nottopchurch;
-	_cmp(data.byte(kAidedead), 0);
-	if (flags.z())
-		goto nottopchurch;
-	al = 3;
-	checkIfPathIsOn();
-	if (!flags.z())
-		goto makedoorsopen;
-	al = 2;
-	turnPathOn();
-makedoorsopen:
-	al = 4;
-	removeSetObject();
-	al = 5;
-	placeSetObject();
-	return;
-nottopchurch:
-	_cmp(data.byte(kLocation), 47);
-	if (!flags.z())
-		goto notdreamcentre;
-	al = 4;
-	placeSetObject();
-	al = 5;
-	placeSetObject();
-	return;
-notdreamcentre:
-	_cmp(data.byte(kLocation), 38);
-	if (!flags.z())
-		goto notcarpark;
-	data.word(kWatchingtime) = 57*2;
-	data.word(kReeltowatch) = 4;
-	data.word(kEndwatchreel) = 57;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	switchRyanOff();
-	return;
-notcarpark:
-	_cmp(data.byte(kLocation), 32);
-	if (!flags.z())
-		goto notalley;
-	data.word(kWatchingtime) = 66*2;
-	data.word(kReeltowatch) = 0;
-	data.word(kEndwatchreel) = 66;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	switchRyanOff();
-	return;
-notalley:
-	_cmp(data.byte(kLocation), 24);
-	if (!flags.z())
-		return /* (notedensagain) */;
-	al = 2;
-	ah = data.byte(kRoomnum);
-	_dec(ah);
-	turnAnyPathOn();
-}
-
 void DreamGenContext::clearBuffers() {
 	STACK_CHECK;
 	es = data.word(kBuffers);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index c0c7407f3f..337a33152c 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -522,7 +522,6 @@ public:
 	void inToInv();
 	void adjustLeft();
 	void deleteExText();
-	void entryAnims();
 	void getFreeAd();
 	void removeObFromInv();
 	void heavy();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index e4c9a7514d..20d2b64268 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4349,13 +4349,13 @@ void DreamBase::entryTexts() {
 	case 31:
 		setupTimedUse(30, 60, 11, 68, 64);
 		break;
-	case 20:
+	case 20:	// Sarter's 2
 		setupTimedUse(31, 60, 11, 68, 64);
 		break;
-	case 24:
+	case 24:	// Eden's lobby
 		setupTimedUse(32, 60, 3, 68, 64);
 		break;
-	case 34:
+	case 34:	// Eden 2
 		setupTimedUse(33, 60, 3, 68, 64);
 		break;
 	default:
@@ -4363,4 +4363,82 @@ void DreamBase::entryTexts() {
 	}
 }
 
+void DreamGenContext::entryAnims() {
+	data.word(kReeltowatch) = 0xFFFF;
+	data.byte(kWatchmode) = (byte)-1;
+
+	switch (data.byte(kLocation)) {
+	case 33:	// beach
+		switchRyanOff();
+		data.word(kWatchingtime) = 76 * 2;
+		data.word(kReeltowatch) = 0;
+		data.word(kEndwatchreel) = 76;
+		data.byte(kWatchspeed) = 1;
+		data.byte(kSpeedcount) = 1;
+		break;
+	case 44:	// Sparky's
+		al = 8;
+		resetLocation();
+		data.word(kWatchingtime) = 50*2;
+		data.word(kReeltowatch) = 247;
+		data.word(kEndwatchreel) = 297;
+		data.byte(kWatchspeed) = 1;
+		data.byte(kSpeedcount) = 1;
+		switchRyanOff();
+		break;
+	case 22:	// lift
+		data.word(kWatchingtime) = 31 * 2;
+		data.word(kReeltowatch) = 0;
+		data.word(kEndwatchreel) = 30;
+		data.byte(kWatchspeed) = 1;
+		data.byte(kSpeedcount) = 1;
+		switchRyanOff();
+		break;
+	case 26:	// under church
+		data.byte(kSymboltopnum) = 2;
+		data.byte(kSymbolbotnum) = 1;
+		break;
+	case 45:	// entered Dreamweb
+		data.byte(kKeeperflag) = 0;
+		data.word(kWatchingtime) = 296;
+		data.word(kReeltowatch) = 45;
+		data.word(kEndwatchreel) = 198;
+		data.byte(kWatchspeed) = 1;
+		data.byte(kSpeedcount) = 1;
+		switchRyanOff();
+		break;
+	default:
+		if (data.byte(kReallocation) == 46 && data.byte(kSartaindead) == 1) {	// Crystal
+			removeFreeObject(0);
+		} else if (data.byte(kLocation) == 9 && checkIfPathIsOn(2) && data.byte(kAidedead) == 0) {
+			// Top of church
+			if (checkIfPathIsOn(3))
+				turnPathOn(2);
+
+			// Make doors open
+			removeSetObject(4);
+			placeSetObject(5);
+		} else if (data.byte(kLocation) == 47) {	// Dream centre
+			placeSetObject(4);
+			placeSetObject(5);
+		} else if (data.byte(kLocation) == 38) {	// Car park
+			data.word(kWatchingtime) = 57 * 2;
+			data.word(kReeltowatch) = 4;
+			data.word(kEndwatchreel) = 57;
+			data.byte(kWatchspeed) = 1;
+			data.byte(kSpeedcount) = 1;
+			switchRyanOff();
+		} else if (data.byte(kLocation) == 32) {	// Alley
+			data.word(kWatchingtime) = 66 * 2;
+			data.word(kReeltowatch) = 0;
+			data.word(kEndwatchreel) = 66;
+			data.byte(kWatchspeed) = 1;
+			data.byte(kSpeedcount) = 1;
+			switchRyanOff();
+		} else if (data.byte(kLocation) == 24) {	// Eden's again
+			turnAnyPathOn(2, data.byte(kRoomnum) - 1);
+		}
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 661eba3633..ca1b68f219 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -568,5 +568,6 @@
 	void autoAppear();
 	void quitKey();
 	void setupTimedUse();
+	void entryAnims();
 
 #endif
-- 
cgit v1.2.3


From fc9a1b840707086064692992c5b02e17d7da065d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 12 Dec 2011 22:43:03 +0200
Subject: DREAMWEB: Port 'getundercentre', 'processtrigger', 'putundercentre',
 'triggermessage' to C++

---
 engines/dreamweb/dreamgen.cpp | 84 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  4 ---
 engines/dreamweb/stubs.cpp    | 39 ++++++++++++++++++++
 engines/dreamweb/stubs.h      |  4 +++
 4 files changed, 43 insertions(+), 88 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index f449b8f38e..d98b238797 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2821,28 +2821,6 @@ _tmp2:
 	workToScreenM();
 }
 
-void DreamGenContext::getUnderCentre() {
-	STACK_CHECK;
-	di = 58;
-	bx = 72;
-	ds = data.word(kMapstore);
-	si = 0;
-	cl = 254;
-	ch = 110;
-	multiGet();
-}
-
-void DreamGenContext::putUnderCentre() {
-	STACK_CHECK;
-	di = 58;
-	bx = 72;
-	ds = data.word(kMapstore);
-	si = 0;
-	cl = 254;
-	ch = 110;
-	multiPut();
-}
-
 void DreamGenContext::locationPic() {
 	STACK_CHECK;
 	getDestInfo();
@@ -3544,68 +3522,6 @@ finishpars:
 	di = offset_operand1;
 }
 
-void DreamGenContext::processTrigger() {
-	STACK_CHECK;
-	_cmp(data.byte(kLasttrigger), '1');
-	if (!flags.z())
-		goto notfirsttrigger;
-	al = 8;
-	setLocation();
-	al = 45;
-	triggerMessage();
-	return;
-notfirsttrigger:
-	_cmp(data.byte(kLasttrigger), '2');
-	if (!flags.z())
-		goto notsecondtrigger;
-	al = 9;
-	setLocation();
-	al = 55;
-	triggerMessage();
-	return;
-notsecondtrigger:
-	_cmp(data.byte(kLasttrigger), '3');
-	if (!flags.z())
-		return /* (notthirdtrigger) */;
-	al = 2;
-	setLocation();
-	al = 59;
-	triggerMessage();
-}
-
-void DreamGenContext::triggerMessage() {
-	STACK_CHECK;
-	push(ax);
-	di = 174;
-	bx = 153;
-	cl = 200;
-	ch = 63;
-	ds = data.word(kMapstore);
-	si = 0;
-	multiGet();
-	ax = pop();
-	findPuzText();
-	di = 174;
-	bx = 156;
-	dl = 141;
-	ah = 16;
-	printDirect();
-	cx = 140;
-	hangOn();
-	workToScreen();
-	cx = 340;
-	hangOn();
-	di = 174;
-	bx = 153;
-	cl = 200;
-	ch = 63;
-	ds = data.word(kMapstore);
-	si = 0;
-	multiPut();
-	workToScreen();
-	data.byte(kLasttrigger) = 0;
-}
-
 void DreamGenContext::runTap() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 337a33152c..746f306b3d 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -491,7 +491,6 @@ public:
 	void useOpenBox();
 	void clearBuffers();
 	void getObTextStart();
-	void putUnderCentre();
 	void checkObjectSize();
 	void findText1();
 	void isRyanHolding();
@@ -544,7 +543,6 @@ public:
 	void purgeALocation();
 	void notHeldError();
 	void getSetAd();
-	void getUnderCentre();
 	void showKeys();
 	void printmessage2();
 	void findOpenPos();
@@ -572,7 +570,6 @@ public:
 	void useOpened();
 	void signOn();
 	void locationPic();
-	void triggerMessage();
 	void swapWithOpen();
 	void dreamweb();
 	void checkInside();
@@ -603,7 +600,6 @@ public:
 	void getPersonText();
 	void parser();
 	void emergencyPurge();
-	void processTrigger();
 	void transferConToEx();
 	void adjustDown();
 	void withWhat();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 20d2b64268..1521dddfe8 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -862,6 +862,45 @@ void DreamGenContext::putUnderTimed() {
 	multiPut(ds.ptr(si, 0), data.byte(kTimedx), y, 240, kUndertimedysize);
 }
 
+void DreamGenContext::getUnderCentre() {
+	ds = data.word(kMapstore);
+	si = 0;
+	multiGet(ds.ptr(si, 0), 58, 72, 254, 110);
+}
+
+void DreamGenContext::putUnderCentre() {
+	ds = data.word(kMapstore);
+	si = 0;
+	multiPut(ds.ptr(si, 0), 58, 72, 254, 110);
+}
+
+void DreamGenContext::triggerMessage(uint16 index) {
+	multiGet(mapStore(), 174, 153, 200, 63);
+	uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(index * 2);
+	const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
+	uint16 y = 156;
+	printDirect(&string, 174, &y, 141, true);
+	hangOn(140);
+	workToScreenCPP();
+	hangOn(340);
+	multiPut(mapStore(), 174, 153, 200, 63);
+	workToScreenCPP();
+	data.byte(kLasttrigger) = 0;
+}
+
+void DreamGenContext::processTrigger() {
+	if (data.byte(kLasttrigger) == '1') {
+		setLocation(8);
+		triggerMessage(45);
+	} else if (data.byte(kLasttrigger) == '2') {
+		setLocation(9);
+		triggerMessage(55);
+	} else if (data.byte(kLasttrigger) == '3') {
+		setLocation(2);
+		triggerMessage(59);
+	}
+}
+
 void DreamGenContext::useTimedText() {
 	if (data.word(kTimecount) == 0)
 		return;
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index ca1b68f219..5cf0466560 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -569,5 +569,9 @@
 	void quitKey();
 	void setupTimedUse();
 	void entryAnims();
+	void getUnderCentre();
+	void putUnderCentre();
+	void triggerMessage(uint16 index);
+	void processTrigger();
 
 #endif
-- 
cgit v1.2.3


From d41c89124f035f4922615ea02e9e8e74f6e3ddf6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 12 Dec 2011 22:43:56 +0200
Subject: DREAMWEB: Fix regression in entryAnims()

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

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 1521dddfe8..4a870fa42c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4449,7 +4449,7 @@ void DreamGenContext::entryAnims() {
 	default:
 		if (data.byte(kReallocation) == 46 && data.byte(kSartaindead) == 1) {	// Crystal
 			removeFreeObject(0);
-		} else if (data.byte(kLocation) == 9 && checkIfPathIsOn(2) && data.byte(kAidedead) == 0) {
+		} else if (data.byte(kLocation) == 9 && !checkIfPathIsOn(2) && data.byte(kAidedead) != 0) {
 			// Top of church
 			if (checkIfPathIsOn(3))
 				turnPathOn(2);
-- 
cgit v1.2.3


From a682734bce80f45dba5e9309cf71a00be9fe50d0 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 12 Dec 2011 22:46:28 +0200
Subject: DREAMWEB: Set volumeDirection as a negative integer, where this is
 used, instead of 0xFF

---
 engines/dreamweb/sprite.cpp |  2 +-
 engines/dreamweb/stubs.cpp  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index e93a77f3ff..aca935cde9 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -763,7 +763,7 @@ void DreamBase::rollEndCredits() {
 	playChannel0(16, 255);
 	data.byte(kVolume) = 7;
 	data.byte(kVolumeto) = 0;
-	data.byte(kVolumedirection) = 0xFF;
+	data.byte(kVolumedirection) = (byte)-1;
 
 	multiGet(mapStore(), 75, 20, 160, 160);
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 4a870fa42c..4f0661e499 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -576,7 +576,7 @@ void DreamGenContext::dreamweb() {
 			data.byte(kLastflag) = 32;
 			startup1();
 			data.byte(kVolumeto) = 0;
-			data.byte(kVolumedirection) = (uint8)-1;
+			data.byte(kVolumedirection) = (byte)-1;
 			data.byte(kCommandtype) = 255;
 
 		}
@@ -3070,7 +3070,7 @@ void DreamGenContext::intro() {
 	clearPalette();
 	loadIntroRoom();
 	data.byte(kVolume) = 7;
-	data.byte(kVolumedirection) = (uint8)-1;
+	data.byte(kVolumedirection) = (byte)-1;
 	data.byte(kVolumeto) = 4;
 	playChannel0(12, 255);
 	fadeScreenUps();
@@ -3286,7 +3286,7 @@ void DreamGenContext::gettingShot() {
 	loadIntroRoom();
 	fadeScreenUps();
 	data.byte(kVolumeto) = 0;
-	data.byte(kVolumedirection) = 0xFF;
+	data.byte(kVolumedirection) = (byte)-1;
 	runEndSeq();
 	clearBeforeLoad();
 }
@@ -3935,7 +3935,7 @@ void DreamGenContext::talk() {
 	workToScreenM();
 	if (data.byte(kSpeechloaded) == 1) {
 		cancelCh1();
-		data.byte(kVolumedirection) = 0xFF;
+		data.byte(kVolumedirection) = (byte)-1;
 		data.byte(kVolumeto) = 0;
 	}
 }
@@ -4258,7 +4258,7 @@ void DreamGenContext::monkSpeaking() {
 	showFrame(tempGraphics(), 160, 72, 0, 128);	// show monk
 	workToScreen();
 	data.byte(kVolume) = 7;
-	data.byte(kVolumedirection) = 0xFF;
+	data.byte(kVolumedirection) = (byte)-1;
 	data.byte(kVolumeto) = 5;
 	playChannel0(12, 255);
 	fadeScreenUps();
-- 
cgit v1.2.3


From e685a171d337e13123f48789780b7f8869b2eb7c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 12 Dec 2011 22:55:29 +0200
Subject: DREAMWEB: Simplify getUnderCentre(), putUnderCentre() and move some
 functions to DreamBase

---
 engines/dreamweb/dreambase.h |  4 ++++
 engines/dreamweb/people.cpp  |  2 +-
 engines/dreamweb/stubs.cpp   | 42 +++++++++++++++++++-----------------------
 engines/dreamweb/stubs.h     |  4 ----
 4 files changed, 24 insertions(+), 28 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 7ef6a9219e..c7e9546069 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -184,6 +184,10 @@ public:
 	inline uint8 *workspace() { return _workspace; }
 	void clearWork();
 
+	uint8 getLocation(uint8 index);
+	void setLocation(uint8 index);
+	void getUnderCentre();
+	void putUnderCentre();
 	uint8 *mapStore();
 	void panelToMap();
 	void mapToPanel();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index efb9a028b6..84f6543a19 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -321,7 +321,7 @@ void DreamGenContext::madmansTelly(ReelRoutine &routine) {
 void DreamGenContext::smokeBloke(ReelRoutine &routine) {
 	if (data.byte(kRockstardead) == 0) {
 		if (routine.b7 & 128)
-			setLocation(5);
+			DreamBase::setLocation(5);
 	}
 	if (checkSpeed(routine)) {
 		if (routine.reelPointer() == 100) {
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 4f0661e499..e52ccf03f3 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -862,16 +862,12 @@ void DreamGenContext::putUnderTimed() {
 	multiPut(ds.ptr(si, 0), data.byte(kTimedx), y, 240, kUndertimedysize);
 }
 
-void DreamGenContext::getUnderCentre() {
-	ds = data.word(kMapstore);
-	si = 0;
-	multiGet(ds.ptr(si, 0), 58, 72, 254, 110);
+void DreamBase::getUnderCentre() {
+	multiGet(mapStore(), 58, 72, 254, 110);
 }
 
-void DreamGenContext::putUnderCentre() {
-	ds = data.word(kMapstore);
-	si = 0;
-	multiPut(ds.ptr(si, 0), 58, 72, 254, 110);
+void DreamBase::putUnderCentre() {
+	multiPut(mapStore(), 58, 72, 254, 110);
 }
 
 void DreamGenContext::triggerMessage(uint16 index) {
@@ -890,13 +886,13 @@ void DreamGenContext::triggerMessage(uint16 index) {
 
 void DreamGenContext::processTrigger() {
 	if (data.byte(kLasttrigger) == '1') {
-		setLocation(8);
+		DreamBase::setLocation(8);
 		triggerMessage(45);
 	} else if (data.byte(kLasttrigger) == '2') {
-		setLocation(9);
+		DreamBase::setLocation(9);
 		triggerMessage(55);
 	} else if (data.byte(kLasttrigger) == '3') {
-		setLocation(2);
+		DreamBase::setLocation(2);
 		triggerMessage(59);
 	}
 }
@@ -2505,20 +2501,20 @@ void DreamGenContext::examIcon() {
 	showFrame(engine->icons2(), 254, 5, 3, 0);
 }
 
-uint8 DreamGenContext::getLocation(uint8 index) {
+uint8 DreamBase::getLocation(uint8 index) {
 	return data.byte(kRoomscango + index);
 }
 
 void DreamGenContext::getLocation() {
-	al = getLocation(al);
+	al = DreamBase::getLocation(al);
 }
 
-void DreamGenContext::setLocation(uint8 index) {
+void DreamBase::setLocation(uint8 index) {
 	data.byte(kRoomscango + index) = 1;
 }
 
 void DreamGenContext::setLocation() {
-	setLocation(al);
+	DreamBase::setLocation(al);
 }
 
 const uint8 *DreamBase::getTextInFile1(uint16 index) {
@@ -2581,8 +2577,8 @@ void DreamGenContext::lastFolder() {
 
 void DreamGenContext::folderHints() {
 	if (data.byte(kFolderpage) == 5) {
-		if ((data.byte(kAidedead) != 1) && (getLocation(13) != 1)) {
-			setLocation(13);
+		if ((data.byte(kAidedead) != 1) && (DreamBase::getLocation(13) != 1)) {
+			DreamBase::setLocation(13);
 			showFolder();
 			const uint8 *string = getTextInFile1(30);
 			printDirect(string, 0, 86, 141, true);
@@ -2590,8 +2586,8 @@ void DreamGenContext::folderHints() {
 			hangOnP(200);
 		}
 	} else if (data.byte(kFolderpage) == 9) {
-		if (getLocation(7) != 1) {
-			setLocation(7);
+		if (DreamBase::getLocation(7) != 1) {
+			DreamBase::setLocation(7);
 			showFolder();
 			const uint8 *string = getTextInFile1(31);
 			printDirect(string, 0, 86, 141, true);
@@ -3353,8 +3349,8 @@ void DreamGenContext::obsThatDoThings() {
 	if (!compare(data.byte(kCommand), data.byte(kObjecttype), id))
 		return; // notlouiscard
 
-	if (getLocation(4) != 1) {
-		setLocation(4);
+	if (DreamBase::getLocation(4) != 1) {
+		DreamBase::setLocation(4);
 		lookAtCard();
 	}
 }
@@ -4306,7 +4302,7 @@ void DreamGenContext::autoAppear() {
 		// In alley
 		al = 5;
 		resetLocation();
-		setLocation(10);
+		DreamBase::setLocation(10);
 		data.byte(kDestpos) = 10;
 		return;
 	}
@@ -4337,7 +4333,7 @@ void DreamGenContext::autoAppear() {
 			data.byte(kNewsitem) = 3;
 			al = 6;
 			resetLocation();
-			setLocation(11);
+			DreamBase::setLocation(11);
 			data.byte(kDestpos) = 11;
 		} else {
 			if (data.byte(kReallocation) == 2 && data.byte(kRockstardead) != 0)
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 5cf0466560..7142bec373 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -362,9 +362,7 @@
 	void lastFolder();
 	void folderHints();
 	void folderExit();
-	uint8 getLocation(uint8 index);
 	void getLocation();
-	void setLocation(uint8 index);
 	void setLocation();
 	void loadTempText();
 	void loadTempText(const char *fileName);
@@ -569,8 +567,6 @@
 	void quitKey();
 	void setupTimedUse();
 	void entryAnims();
-	void getUnderCentre();
-	void putUnderCentre();
 	void triggerMessage(uint16 index);
 	void processTrigger();
 
-- 
cgit v1.2.3


From 47c4b2b7dee13ade60c7810e0d4f216a5ee69e3a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 12 Dec 2011 23:30:08 +0200
Subject: DREAMWEB: Port 'usecontrol' to C++

---
 engines/dreamweb/dreamgen.cpp | 96 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.h      |  1 +
 engines/dreamweb/use.cpp      | 57 +++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 97 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index d98b238797..3cc0c4e862 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3955,102 +3955,6 @@ numberpoke3:
 	cs.byte(bx) = al;
 }
 
-void DreamGenContext::useControl() {
-	STACK_CHECK;
-	_cmp(data.byte(kWithobject), 255);
-	if (!flags.z())
-		goto gotcontrolwith;
-	withWhat();
-	return;
-gotcontrolwith:
-	al = data.byte(kWithobject);
-	ah = data.byte(kWithtype);
-	cl = 'K';
-	ch = 'E';
-	dl = 'Y';
-	dh = 'A';
-	compare();
-	if (flags.z())
-		goto rightkey;
-	_cmp(data.byte(kReallocation), 21);
-	if (!flags.z())
-		goto balls;
-	al = data.byte(kWithobject);
-	ah = data.byte(kWithtype);
-	cl = 'K';
-	ch = 'N';
-	dl = 'F';
-	dh = 'E';
-	compare();
-	if (flags.z())
-		goto jimmycontrols;
-	al = data.byte(kWithobject);
-	ah = data.byte(kWithtype);
-	cl = 'A';
-	ch = 'X';
-	dl = 'E';
-	dh = 'D';
-	compare();
-	if (flags.z())
-		goto axeoncontrols;
-balls:
-	showFirstUse();
-	putBackObStuff();
-	return;
-rightkey:
-	al = 16;
-	playChannel1();
-	_cmp(data.byte(kLocation), 21);
-	if (flags.z())
-		goto goingdown;
-	cx = 300;
-	al = 0;
-	showPuzText();
-	data.byte(kNewlocation) = 21;
-	data.byte(kCounttoclose) = 8;
-	data.byte(kCounttoopen) = 0;
-	data.word(kWatchingtime) = 80;
-	data.byte(kGetback) = 1;
-	return;
-goingdown:
-	cx = 300;
-	al = 3;
-	showPuzText();
-	data.byte(kNewlocation) = 30;
-	data.byte(kCounttoclose) = 8;
-	data.byte(kCounttoopen) = 0;
-	data.word(kWatchingtime) = 80;
-	data.byte(kGetback) = 1;
-	return;
-jimmycontrols:
-	al = 50;
-	placeSetObject();
-	al = 51;
-	placeSetObject();
-	al = 26;
-	placeSetObject();
-	al = 30;
-	placeSetObject();
-	al = 16;
-	removeSetObject();
-	al = 17;
-	removeSetObject();
-	al = 14;
-	playChannel1();
-	cx = 300;
-	al = 10;
-	showPuzText();
-	_inc(data.byte(kProgresspoints));
-	data.byte(kGetback) = 1;
-	return;
-axeoncontrols:
-	cx = 300;
-	al = 16;
-	showPuzText();
-	_inc(data.byte(kProgresspoints));
-	putBackObStuff();
-}
-
 void DreamGenContext::useHandle() {
 	STACK_CHECK;
 	al = 'C';
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 746f306b3d..b87d9c64de 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -593,7 +593,6 @@ public:
 	void updateSymbolBot();
 	void findPuzText();
 	void swapWithInv();
-	void useControl();
 	void adjustRight();
 	void transferToEx();
 	void updateSymbolTop();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 7142bec373..a6e29f2192 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -349,6 +349,7 @@
 	void usePoolReader();
 	void useCooker();
 	void useWire();
+	void useControl();
 	bool defaultUseHandler(const char *id);
 	void openTVDoor();
 	void wearWatch();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 0990e5ba5e..eb3281150d 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1224,4 +1224,61 @@ void DreamGenContext::useDiary() {
 	workToScreenM();
 }
 
+void DreamGenContext::useControl() {
+	if (data.byte(kWithobject) == 255) {
+		withWhat();
+		return;
+	}
+
+	char key[4] = { 'K', 'E', 'Y', 'A' };	// TODO: convert to string with trailing zero
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), key)) {	// Right key
+		playChannel1(16);
+		if (data.byte(kLocation) == 21) {	// Going down
+			showPuzText(3, 300);
+			data.byte(kNewlocation) = 30;
+		} else {
+			showPuzText(0, 300);
+			data.byte(kNewlocation) = 21;
+		}
+
+		data.byte(kCounttoclose) = 8;
+		data.byte(kCounttoopen) = 0;
+		data.word(kWatchingtime) = 80;
+		data.byte(kGetback) = 1;
+		return;
+	}
+
+	if (data.byte(kReallocation) == 21) {
+		char knife[4] = { 'K', 'N', 'F', 'E' };	// TODO: convert to string with trailing zero
+		char   axe[4] = { 'A', 'X', 'E', 'D' };	// TODO: convert to string with trailing zero
+
+		if (compare(data.byte(kWithobject), data.byte(kWithtype), knife)) {
+			// Jimmy controls
+			placeSetObject(50);
+			placeSetObject(51);
+			placeSetObject(26);
+			placeSetObject(30);
+			removeSetObject(16);
+			removeSetObject(17);
+			playChannel1(14);
+			showPuzText(10, 300);
+			data.byte(kProgresspoints)++;
+			data.byte(kGetback) = 1;
+		} else if (compare(data.byte(kWithobject), data.byte(kWithtype), axe)) {
+			// Axe on controls
+			showPuzText(16, 300);
+			data.byte(kProgresspoints)++;
+			putBackObStuff();
+		} else {
+			// Balls
+			showFirstUse();
+			putBackObStuff();
+		}
+	} else {
+		// Balls
+		showFirstUse();
+		putBackObStuff();
+	}
+}
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 27f5661dfc5d49571499501e68db96fe30d272de Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 12 Dec 2011 23:39:29 +0200
Subject: DREAMWEB: Port 'useslab' to C++

---
 engines/dreamweb/dreamgen.cpp | 50 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.h      |  1 +
 engines/dreamweb/use.cpp      | 33 ++++++++++++++++++++++++++++
 4 files changed, 34 insertions(+), 51 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 3cc0c4e862..a2d8c2c70f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3637,56 +3637,6 @@ alreadyfull:
 	putBackObStuff();
 }
 
-void DreamGenContext::useSLab() {
-	STACK_CHECK;
-	_cmp(data.byte(kWithobject), 255);
-	if (!flags.z())
-		goto slabwith;
-	withWhat();
-	return;
-slabwith:
-	al = data.byte(kWithobject);
-	ah = data.byte(kWithtype);
-	cl = 'J';
-	ch = 'E';
-	dl = 'W';
-	dh = 'L';
-	compare();
-	if (flags.z())
-		goto nextslab;
-	cx = 300;
-	al = 14;
-	showPuzText();
-	putBackObStuff();
-	return;
-nextslab:
-	al = data.byte(kWithobject);
-	getExAd();
-	es.byte(bx+2) = 0;
-	al = data.byte(kCommand);
-	push(ax);
-	removeSetObject();
-	ax = pop();
-	_inc(al);
-	push(ax);
-	placeSetObject();
-	ax = pop();
-	_cmp(al, 54);
-	if (!flags.z())
-		goto notlastslab;
-	al = 0;
-	turnPathOn();
-	data.word(kWatchingtime) = 22;
-	data.word(kReeltowatch) = 35;
-	data.word(kEndwatchreel) = 48;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-notlastslab:
-	_inc(data.byte(kProgresspoints));
-	showFirstUse();
-	data.byte(kGetback) = 1;
-}
-
 void DreamGenContext::useOpenBox() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index b87d9c64de..6e8400b58e 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -508,7 +508,6 @@ public:
 	void dirCom();
 	void endGameSeq();
 	void findFirstPath();
-	void useSLab();
 	void useAltar();
 	void startTalk();
 	void getAnyAd();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index a6e29f2192..ff7c1106a6 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -331,6 +331,7 @@
 	void useWindow();
 	void useHatch();
 	void useLighter();
+	void useSLab();
 	void wheelSound();
 	void callHotelLift();
 	void useShield();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index eb3281150d..f6d6b2f494 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1281,4 +1281,37 @@ void DreamGenContext::useControl() {
 	}
 }
 
+void DreamGenContext::useSLab() {
+	if (data.byte(kWithobject) == 255) {
+		withWhat();
+		return;
+	}
+
+	char id[4] = { 'J', 'E', 'W', 'L' };	// TODO: convert to string with trailing zero
+	if (!compare(data.byte(kWithobject), data.byte(kWithtype), id)) {
+		showPuzText(14, 300);
+		putBackObStuff();
+		return;
+	}
+
+	DynObject *exObject = getExAd(data.byte(kWithobject));
+	exObject->mapad[0] = 0;
+
+	removeSetObject(data.byte(kCommand));
+	placeSetObject(data.byte(kCommand) + 1);
+	if (data.byte(kCommand) + 1 == 54) {
+		// Last slab
+		turnPathOn(0);
+		data.word(kWatchingtime) = 22;
+		data.word(kReeltowatch) = 35;
+		data.word(kEndwatchreel) = 48;
+		data.byte(kWatchspeed) = 1;
+		data.byte(kSpeedcount) = 1;
+	}
+
+	data.byte(kProgresspoints)++;
+	showFirstUse();
+	data.byte(kGetback) = 1;
+}
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From ef94b2d15a543493a7d11ed208c74c5c2c37214c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 12 Dec 2011 23:51:40 +0200
Subject: DREAMWEB: Port 'usepipe' to C++

---
 engines/dreamweb/dreamgen.cpp | 47 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.h      |  1 +
 engines/dreamweb/use.cpp      | 27 +++++++++++++++++++++++++
 4 files changed, 28 insertions(+), 48 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index a2d8c2c70f..0a0aa7a91c 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3590,53 +3590,6 @@ void DreamGenContext::notHeldError() {
 	putBackObStuff();
 }
 
-void DreamGenContext::usePipe() {
-	STACK_CHECK;
-	_cmp(data.byte(kWithobject), 255);
-	if (!flags.z())
-		goto pipewith;
-	withWhat();
-	return;
-pipewith:
-	al = data.byte(kWithobject);
-	ah = data.byte(kWithtype);
-	cl = 'C';
-	ch = 'U';
-	dl = 'P';
-	dh = 'E';
-	compare();
-	if (flags.z())
-		goto fillcup;
-	al = data.byte(kWithobject);
-	ah = data.byte(kWithtype);
-	cl = 'C';
-	ch = 'U';
-	dl = 'P';
-	dh = 'F';
-	compare();
-	if (flags.z())
-		goto alreadyfull;
-	cx = 300;
-	al = 14;
-	showPuzText();
-	putBackObStuff();
-	return;
-fillcup:
-	cx = 300;
-	al = 36;
-	showPuzText();
-	putBackObStuff();
-	al = data.byte(kWithobject);
-	getExAd();
-	es.byte(bx+15) = 'F'-'A';
-	return;
-alreadyfull:
-	cx = 300;
-	al = 35;
-	showPuzText();
-	putBackObStuff();
-}
-
 void DreamGenContext::useOpenBox() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 6e8400b58e..bbdd70e455 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -511,7 +511,6 @@ public:
 	void useAltar();
 	void startTalk();
 	void getAnyAd();
-	void usePipe();
 	void reminders();
 	void runTap();
 	void dumpDiaryKeys();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index ff7c1106a6..2946327699 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -332,6 +332,7 @@
 	void useHatch();
 	void useLighter();
 	void useSLab();
+	void usePipe();
 	void wheelSound();
 	void callHotelLift();
 	void useShield();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index f6d6b2f494..b8d7b7ca75 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1314,4 +1314,31 @@ void DreamGenContext::useSLab() {
 	data.byte(kGetback) = 1;
 }
 
+void DreamGenContext::usePipe() {
+	if (data.byte(kWithobject) == 255) {
+		withWhat();
+		return;
+	}
+
+	char cupEmpty[4] = { 'C', 'U', 'P', 'E' };	// TODO: convert to string with trailing zero
+	char  cupFull[4] = { 'C', 'U', 'P', 'F' };	// TODO: convert to string with trailing zero
+
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), cupEmpty)) {
+		// Fill cup
+		showPuzText(36, 300);
+		putBackObStuff();
+		DynObject *exObject = getExAd(data.byte(kWithobject));
+		exObject->id[3] = 'F'-'A';	// CUPE (empty cup) -> CUPF (full cup)
+		return;
+	} else if (compare(data.byte(kWithobject), data.byte(kWithtype), cupFull)) {
+		// Already full
+		showPuzText(14, 300);
+		showPuzText();
+		putBackObStuff();
+	} else {
+		showPuzText(35, 300);
+		putBackObStuff();
+	}
+}
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 9480b21840cd0e5e0d40ab8a88e0f7b5dac9be03 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 12 Dec 2011 23:58:20 +0200
Subject: DREAMWEB: Port 'useopenbox' to C++

---
 engines/dreamweb/dreamgen.cpp | 52 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.h      |  1 +
 engines/dreamweb/use.cpp      | 35 +++++++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 53 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 0a0aa7a91c..851cca77fe 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3590,58 +3590,6 @@ void DreamGenContext::notHeldError() {
 	putBackObStuff();
 }
 
-void DreamGenContext::useOpenBox() {
-	STACK_CHECK;
-	_cmp(data.byte(kWithobject), 255);
-	if (!flags.z())
-		goto openboxwith;
-	withWhat();
-	return;
-openboxwith:
-	al = data.byte(kWithobject);
-	ah = data.byte(kWithtype);
-	cl = 'C';
-	ch = 'U';
-	dl = 'P';
-	dh = 'F';
-	compare();
-	if (flags.z())
-		goto destoryopenbox;
-	al = data.byte(kWithobject);
-	ah = data.byte(kWithtype);
-	cl = 'C';
-	ch = 'U';
-	dl = 'P';
-	dh = 'E';
-	compare();
-	if (flags.z())
-		goto openboxwrong;
-	showFirstUse();
-	return;
-destoryopenbox:
-	_inc(data.byte(kProgresspoints));
-	cx = 300;
-	al = 37;
-	showPuzText();
-	al = data.byte(kWithobject);
-	getExAd();
-	es.byte(bx+15) = 'E'-'A';
-	data.word(kWatchingtime) = 140;
-	data.word(kReeltowatch) = 105;
-	data.word(kEndwatchreel) = 181;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	al = 4;
-	turnPathOn();
-	data.byte(kGetback) = 1;
-	return;
-openboxwrong:
-	cx = 300;
-	al = 38;
-	showPuzText();
-	putBackObStuff();
-}
-
 void DreamGenContext::useAltar() {
 	STACK_CHECK;
 	al = 'C';
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index bbdd70e455..7be848813e 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -488,7 +488,6 @@ public:
 
 	void identifyOb();
 	void runEndSeq();
-	void useOpenBox();
 	void clearBuffers();
 	void getObTextStart();
 	void checkObjectSize();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 2946327699..18d90ff499 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -333,6 +333,7 @@
 	void useLighter();
 	void useSLab();
 	void usePipe();
+	void useOpenBox();
 	void wheelSound();
 	void callHotelLift();
 	void useShield();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index b8d7b7ca75..0ede2f485a 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1341,4 +1341,39 @@ void DreamGenContext::usePipe() {
 	}
 }
 
+void DreamGenContext::useOpenBox() {
+	if (data.byte(kWithobject) == 255) {
+		withWhat();
+		return;
+	}
+
+	char cupEmpty[4] = { 'C', 'U', 'P', 'E' };	// TODO: convert to string with trailing zero
+	char  cupFull[4] = { 'C', 'U', 'P', 'F' };	// TODO: convert to string with trailing zero
+
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), cupFull)) {
+		// Destroy open box
+		data.byte(kProgresspoints)++;
+		showPuzText(37, 300);
+		DynObject *exObject = getExAd(data.byte(kWithobject));
+		exObject->id[3] = 'E'-'A';	// CUPF (full cup) -> CUPE (empty cup)
+		data.word(kWatchingtime) = 140;
+		data.word(kReeltowatch) = 105;
+		data.word(kEndwatchreel) = 181;
+		data.byte(kWatchspeed) = 1;
+		data.byte(kSpeedcount) = 1;
+		turnPathOn(4);
+		data.byte(kGetback) = 1;
+		return;
+	}
+
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), cupEmpty)) {
+		// Open box wrong
+		showPuzText(38, 300);
+		putBackObStuff();
+		return;
+	}
+
+	showFirstUse();
+}
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 90c1793d4771a71af737d10dad8a2761c4696794 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 13 Dec 2011 00:11:05 +0200
Subject: DREAMWEB: Port 'useaxe', 'usekey' to C++

---
 engines/dreamweb/dreamgen.cpp | 83 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  2 --
 engines/dreamweb/stubs.h      |  2 ++
 engines/dreamweb/use.cpp      | 63 ++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 85 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 851cca77fe..b917f58e87 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3830,58 +3830,6 @@ havecutwire:
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useKey() {
-	STACK_CHECK;
-	_cmp(data.byte(kLocation), 5);
-	if (flags.z())
-		goto usekey1;
-	_cmp(data.byte(kLocation), 30);
-	if (flags.z())
-		goto usekey1;
-	_cmp(data.byte(kLocation), 21);
-	if (flags.z())
-		goto usekey2;
-	cx = 200;
-	al = 1;
-	showPuzText();
-	putBackObStuff();
-	return;
-usekey1:
-	_cmp(data.byte(kMapx), 22);
-	if (!flags.z())
-		goto wrongroom1;
-	_cmp(data.byte(kMapy), 10);
-	if (!flags.z())
-		goto wrongroom1;
-	cx = 300;
-	al = 0;
-	showPuzText();
-	data.byte(kCounttoclose) = 100;
-	data.byte(kGetback) = 1;
-	return;
-usekey2:
-	_cmp(data.byte(kMapx), 11);
-	if (!flags.z())
-		goto wrongroom1;
-	_cmp(data.byte(kMapy), 10);
-	if (!flags.z())
-		goto wrongroom1;
-	cx = 300;
-	al = 3;
-	showPuzText();
-	data.byte(kNewlocation) = 30;
-	al = 2;
-	fadeScreenDown();
-	showFirstUse();
-	putBackObStuff();
-	return;
-wrongroom1:
-	cx = 200;
-	al = 2;
-	showPuzText();
-	putBackObStuff();
-}
-
 void DreamGenContext::useStereo() {
 	STACK_CHECK;
 	_cmp(data.byte(kLocation), 0);
@@ -3944,37 +3892,6 @@ stereoon:
 	putBackObStuff();
 }
 
-void DreamGenContext::useAxe() {
-	STACK_CHECK;
-	_cmp(data.byte(kReallocation), 22);
-	if (!flags.z())
-		goto notinpool;
-	_cmp(data.byte(kMapy), 10);
-	if (flags.z())
-		goto axeondoor;
-	showSecondUse();
-	_inc(data.byte(kProgresspoints));
-	data.byte(kLastweapon) = 2;
-	data.byte(kGetback) = 1;
-	removeObFromInv();
-	return;
-notinpool:
-	showFirstUse();
-	return;
-/*continuing to unbounded code: axeondoor from useelvdoor:19-30*/
-axeondoor:
-	al = 15;
-	cx = 300;
-	showPuzText();
-	_inc(data.byte(kProgresspoints));
-	data.word(kWatchingtime) = 46*2;
-	data.word(kReeltowatch) = 31;
-	data.word(kEndwatchreel) = 77;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
-}
-
 void DreamGenContext::withWhat() {
 	STACK_CHECK;
 	createPanel();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7be848813e..f146649b61 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -521,7 +521,6 @@ public:
 	void getFreeAd();
 	void removeObFromInv();
 	void heavy();
-	void useKey();
 	void dirFile();
 	void pickupConts();
 	void nextColon();
@@ -549,7 +548,6 @@ public:
 	void rollEm();
 	void poolGuard();
 	void lookAtPlace();
-	void useAxe();
 	void findAllOpen();
 	void fillOpen();
 	void findSetObject();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 18d90ff499..4376f5b42d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -334,6 +334,8 @@
 	void useSLab();
 	void usePipe();
 	void useOpenBox();
+	void useAxe();
+	void useKey();
 	void wheelSound();
 	void callHotelLift();
 	void useShield();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 0ede2f485a..531f465010 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1376,4 +1376,67 @@ void DreamGenContext::useOpenBox() {
 	showFirstUse();
 }
 
+void DreamGenContext::useAxe() {
+	if (data.byte(kReallocation) != 22) {
+		// Not in pool
+		showFirstUse();
+		return;
+	}
+
+	if (data.byte(kMapy) == 10) {
+		// Axe on door
+		al = 15;
+		cx = 300;
+		showPuzText(15, 300);
+		data.byte(kProgresspoints)++;
+		data.word(kWatchingtime) = 46*2;
+		data.word(kReeltowatch) = 31;
+		data.word(kEndwatchreel) = 77;
+		data.byte(kWatchspeed) = 1;
+		data.byte(kSpeedcount) = 1;
+		data.byte(kGetback) = 1;
+		return;
+	}
+
+	showSecondUse();
+	data.byte(kProgresspoints)++;
+	data.byte(kLastweapon) = 2;
+	data.byte(kGetback) = 1;
+	removeObFromInv();
+}
+
+void DreamGenContext::useKey() {
+	switch(data.byte(kLocation)) {
+	case 5:
+	case 30:
+		if (data.byte(kMapx) == 22 && data.byte(kMapy) == 10) {
+			showPuzText(0, 300);
+			data.byte(kCounttoclose) = 100;
+			data.byte(kGetback) = 1;
+		} else {
+			// Wrong room
+			showPuzText(2, 200);
+			putBackObStuff();
+		}
+		break;
+	case 21:
+		if (data.byte(kMapx) == 11 && data.byte(kMapy) == 10) {
+			showPuzText(3, 300);
+			data.byte(kNewlocation) = 30;
+			al = 2;
+			fadeScreenDown();
+			showFirstUse();
+			putBackObStuff();
+		} else {
+			// Wrong room
+			showPuzText(2, 200);
+			putBackObStuff();
+		}
+	default:
+		showPuzText(1, 200);
+		putBackObStuff();
+		break;
+	}
+}
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From d5b69f0c0218bd83f8e246541e2094b807435852 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 12 Dec 2011 23:47:46 +0100
Subject: TSAGE: R2R - Implement scene 2525

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +
 engines/tsage/ringworld2/ringworld2_scenes2.cpp | 140 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes2.h   |  31 ++++++
 3 files changed, 173 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index dca3dcead5..8f85bbdea3 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -128,6 +128,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Maze: Large Cave
 		return new Scene2500();
 	case 2525:
+		// Maze: Furnace room
+		return new Scene2525();
 	case 2530:
 	case 2535:
 	case 2600:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 18fd6e6bde..d15763fb29 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -2503,5 +2503,145 @@ void Scene2500::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 2525 - Furnace room
+ *
+ *--------------------------------------------------------------------------*/
+bool Scene2525::Item5::startAction(CursorType action, Event &event) {
+	Scene2525 *scene = (Scene2525 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action == R2_20) && (!R2_GLOBALS.getFlag(74))) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 2526;
+		scene->setAction(&scene->_sequenceManager, scene, 2526, &R2_GLOBALS._player, NULL);
+		return true;
+	}
+
+	return SceneItem::startAction(action, event);
+}
+
+bool Scene2525::Actor3::startAction(CursorType action, Event &event) {
+	Scene2525 *scene = (Scene2525 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	if (R2_GLOBALS._player._characterIndex == 2) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 2525;
+		scene->setAction(&scene->_sequenceManager, scene, 2525, &R2_GLOBALS._player, &scene->_actor3, NULL);
+	} else {
+		SceneItem::display(2530, 33, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+	}
+	return true;
+}
+
+void Scene2525::Exit1::changeScene() {
+	Scene2525 *scene = (Scene2525 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._events.setCursor(CURSOR_ARROW);
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 11;
+
+	Common::Point pt(R2_GLOBALS._player._position.x, 200);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene2525::postInit(SceneObjectList *OwnerList) {
+	loadScene(2525);
+	SceneExt::postInit();
+	R2_GLOBALS._sound1.play(200);
+	R2_GLOBALS._sound2.play(207);
+
+	_exit1.setDetails(Rect(86, 155, 228, 168), EXITCURSOR_S, 2000);
+
+	if (R2_INVENTORY.getObjectScene(29) == 2525) {
+		_actor3.postInit();
+		_actor3.setup(2435, 1, 2);
+		_actor3.setPosition(Common::Point(78, 155));
+		_actor3.fixPriority(155);
+		_actor3.setDetails(2525, 27, -1, -1, 1, NULL);
+	}
+
+	_actor2.postInit();
+	_actor2.setup(2525, 1, 1);
+	_actor2.setPosition(Common::Point(183, 114));
+	_actor2.setDetails(2525, 15, -1, -1, 1, NULL);
+	_actor2.animate(ANIM_MODE_2, NULL);
+	_actor2._numFrames = 3;
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	if (R2_GLOBALS._player._characterIndex == 1) {
+		R2_GLOBALS._player.setup(2008, 3, 1);
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+	} else {
+		R2_GLOBALS._player.setup(20, 3, 1);
+		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+	}
+
+	if (R2_GLOBALS._player._characterScene[1] == R2_GLOBALS._player._characterScene[2]) {
+		_actor1.postInit();
+		if (R2_GLOBALS._player._characterIndex == 1) {
+			_actor1.setup(20, 5, 1);
+			_actor1.setDetails(9002, 0, 4, 3, 1, NULL);
+		} else {
+			_actor1.setup(2008, 5, 1);
+			_actor1.setDetails(9001, 0, 5, 3, 1, NULL);
+		}
+		_actor1.setPosition(Common::Point(209, 162));
+
+		R2_GLOBALS._walkRegions.enableRegion(4);
+	}
+
+	_item5.setDetails(Rect(125, 73, 140, 86), 2525, 6, -1, -1, 1, NULL);
+	_item3.setDetails(Rect(137, 11, 163, 72), 2525, 12, -1, -1, 1, NULL);
+	_item4.setDetails(Rect(204, 20, 234, 78), 2525, 12, -1, -1, 1, NULL);
+	_item2.setDetails(Rect(102, 62, 230, 134), 2525, 0, -1, -1, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 320, 200), 2525, 24, -1, -1, 1, NULL);
+
+	R2_GLOBALS._player.disableControl();
+
+	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 2000) {
+		R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 2525;
+		R2_GLOBALS._player.setPosition(Common::Point(160, 200));
+		Common::Point pt(160, 150);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+	} else {
+		R2_GLOBALS._player.setPosition(Common::Point(160, 150));
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.enableControl();
+	}
+}
+
+void Scene2525::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	R2_GLOBALS._sound2.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene2525::signal() {
+	switch (_sceneMode) {
+	case 11:
+		g_globals->_sceneManager.changeScene(2000);
+		break;
+	case 2525:
+		_actor3.remove();
+		R2_INVENTORY.setObjectScene(29, 2);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 2526:
+		R2_GLOBALS.setFlag(74);
+		R2_GLOBALS._player.enableControl();
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index 82898a45dd..b906921842 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -383,6 +383,37 @@ public:
 	virtual void signal();
 };
 
+class Scene2525 : public SceneExt {
+	class Item5 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor3 : public SceneActor {
+	public:
+		bool startAction(CursorType action, Event &event);
+	};
+
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+public:
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	NamedHotspot _item3;
+	NamedHotspot _item4;
+	Item5 _item5;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	Actor3 _actor3;
+	Exit1 _exit1;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 6d2723400662c2b7d75bf6317807770b4d370caf Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 12 Dec 2011 23:41:45 +0100
Subject: DREAMWEB: Fix regression in usePipe

---
 engines/dreamweb/use.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 531f465010..f62daf9c9a 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1332,11 +1332,11 @@ void DreamGenContext::usePipe() {
 		return;
 	} else if (compare(data.byte(kWithobject), data.byte(kWithtype), cupFull)) {
 		// Already full
-		showPuzText(14, 300);
-		showPuzText();
+		showPuzText(35, 300);
 		putBackObStuff();
 	} else {
-		showPuzText(35, 300);
+		showPuzText(14, 300);
+		showPuzText();
 		putBackObStuff();
 	}
 }
@@ -1385,8 +1385,6 @@ void DreamGenContext::useAxe() {
 
 	if (data.byte(kMapy) == 10) {
 		// Axe on door
-		al = 15;
-		cx = 300;
 		showPuzText(15, 300);
 		data.byte(kProgresspoints)++;
 		data.word(kWatchingtime) = 46*2;
-- 
cgit v1.2.3


From c452bf9c1268155bd896b2f42c003c8eda110e84 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 13 Dec 2011 00:53:36 +0200
Subject: DREAMWEB: Port 'selectslot' to C++

---
 engines/dreamweb/dreamgen.cpp | 52 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.cpp    | 35 +++++++++++++++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 36 insertions(+), 53 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index b917f58e87..7ab361b264 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -4532,58 +4532,6 @@ void DreamGenContext::findText1() {
 	si = ax;
 }
 
-void DreamGenContext::selectSlot() {
-	STACK_CHECK;
-	_cmp(data.byte(kCommandtype), 244);
-	if (flags.z())
-		goto alreadysel;
-	data.byte(kCommandtype) = 244;
-	al = 45;
-	commandOnly();
-alreadysel:
-	ax = data.word(kMousebutton);
-	_cmp(ax, 1);
-	if (!flags.z())
-		return /* (noselslot) */;
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (noselslot) */;
-	_cmp(data.byte(kLoadingorsave), 3);
-	if (!flags.z())
-		goto notnocurs;
-	_dec(data.byte(kLoadingorsave));
-notnocurs:
-	oldToNames();
-	ax = data.word(kMousey);
-	_sub(ax, (52)+4);
-	cl = -1;
-getslotnum:
-	_inc(cl);
-	_sub(ax, 11);
-	if (!flags.c())
-		goto getslotnum;
-	data.byte(kCurrentslot) = cl;
-	delPointer();
-	showOpBox();
-	showSlots();
-	showNames();
-	_cmp(data.byte(kLoadingorsave), 1);
-	if (flags.z())
-		goto isloadmode;
-	showSaveOps();
-	readMouse();
-	showPointer();
-	workToScreen();
-	delPointer();
-	return;
-isloadmode:
-	showLoadOps();
-	readMouse();
-	showPointer();
-	workToScreen();
-	delPointer();
-}
-
 void DreamGenContext::showSlots() {
 	STACK_CHECK;
 	di = (60)+7;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f146649b61..3bb554e8f7 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -528,7 +528,6 @@ public:
 	void getKeyAndLogo();
 	void selectOb();
 	void receptionist();
-	void selectSlot();
 	void fadeUpMon();
 	void showDiaryPage();
 	void reExFromInv();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index e52ccf03f3..97dad08298 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4476,4 +4476,39 @@ void DreamGenContext::entryAnims() {
 	}
 }
 
+void DreamGenContext::selectSlot() {
+	if (data.byte(kCommandtype) != 244) {
+		data.byte(kCommandtype) = 244;
+		commandOnly(45);
+	}
+
+	if (data.word(kMousebutton) != 1 || data.word(kMousebutton) == data.word(kOldbutton))
+		return; // noselslot
+	if (data.byte(kLoadingorsave) == 3)
+		data.byte(kLoadingorsave)--;
+
+	oldToNames();
+	uint16 y = data.word(kMousey) - (kOpsy + 4);
+	byte currentSlot = (byte)-1;
+
+	do {
+		currentSlot++;
+		y -= 11;
+	} while (y >= 11);
+
+	data.byte(kCurrentslot) = currentSlot;
+	delPointer();
+	showOpBox();
+	showSlots();
+	showNames();
+	if (data.byte(kLoadingorsave) == 1)
+		showLoadOps();
+	else
+		showSaveOps();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 4376f5b42d..b32f5460ec 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -476,6 +476,7 @@
 	void afterIntroRoom();
 	void gettingShot();
 	void redrawMainScrn();
+	void selectSlot();
 	void selectSlot2();
 	void blank();
 	void allPointer();
-- 
cgit v1.2.3


From b27a6e72ad63441c561866682bdebb0059db56a3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 13 Dec 2011 01:02:41 +0200
Subject: DREAMWEB: Port 'runtap' to C++

---
 engines/dreamweb/dreamgen.cpp | 49 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.h      |  1 +
 engines/dreamweb/use.cpp      | 30 ++++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 50 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 7ab361b264..09ea14583d 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3522,55 +3522,6 @@ finishpars:
 	di = offset_operand1;
 }
 
-void DreamGenContext::runTap() {
-	STACK_CHECK;
-	_cmp(data.byte(kWithobject), 255);
-	if (!flags.z())
-		goto tapwith;
-	withWhat();
-	return;
-tapwith:
-	al = data.byte(kWithobject);
-	ah = data.byte(kWithtype);
-	cl = 'C';
-	ch = 'U';
-	dl = 'P';
-	dh = 'E';
-	compare();
-	if (flags.z())
-		goto fillcupfromtap;
-	al = data.byte(kWithobject);
-	ah = data.byte(kWithtype);
-	cl = 'C';
-	ch = 'U';
-	dl = 'P';
-	dh = 'F';
-	compare();
-	if (flags.z())
-		goto cupfromtapfull;
-	cx = 300;
-	al = 56;
-	showPuzText();
-	putBackObStuff();
-	return;
-fillcupfromtap:
-	al = data.byte(kWithobject);
-	getExAd();
-	es.byte(bx+15) = 'F'-'A';
-	al = 8;
-	playChannel1();
-	cx = 300;
-	al = 57;
-	showPuzText();
-	putBackObStuff();
-	return;
-cupfromtapfull:
-	cx = 300;
-	al = 58;
-	showPuzText();
-	putBackObStuff();
-}
-
 void DreamGenContext::notHeldError() {
 	STACK_CHECK;
 	createPanel();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 3bb554e8f7..92c6f82e12 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -511,7 +511,6 @@ public:
 	void startTalk();
 	void getAnyAd();
 	void reminders();
-	void runTap();
 	void dumpDiaryKeys();
 	void checkForExit();
 	void lookInInterface();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index b32f5460ec..ed45e40b8d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -492,6 +492,7 @@
 	void useCart();
 	void useTrainer();
 	void useHole();
+	void runTap();
 	void chewy();
 	void sLabDoorA();
 	void sLabDoorB();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index f62daf9c9a..c591eca826 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1376,6 +1376,36 @@ void DreamGenContext::useOpenBox() {
 	showFirstUse();
 }
 
+void DreamGenContext::runTap() {
+	if (data.byte(kWithobject) == 255) {
+		withWhat();
+		return;
+	}
+
+	char cupEmpty[4] = { 'C', 'U', 'P', 'E' };	// TODO: convert to string with trailing zero
+	char  cupFull[4] = { 'C', 'U', 'P', 'F' };	// TODO: convert to string with trailing zero
+
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), cupEmpty)) {
+		// Fill cup from tap
+		DynObject *exObject = getExAd(data.byte(kWithobject));
+		exObject->id[3] = 'F'-'A';	// CUPE (empty cup) -> CUPF (full cup)
+		playChannel1(8);
+		showPuzText(57, 300);
+		putBackObStuff();
+		return;
+	}
+
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), cupFull)) {
+		// Cup from tap full
+		showPuzText(58, 300);
+		putBackObStuff();
+		return;
+	}
+
+	showPuzText(56, 300);
+	putBackObStuff();
+}
+
 void DreamGenContext::useAxe() {
 	if (data.byte(kReallocation) != 22) {
 		// Not in pool
-- 
cgit v1.2.3


From 1994bf73ce382057b166b49db203f19d5ac25cb6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 13 Dec 2011 01:14:26 +0200
Subject: DREAMWEB: 'lineroutine', 'increment1', 'increment2' are only used
 inside bresenhams()

---
 engines/dreamweb/dreamgen.cpp | 230 +++++++++++++++++++++---------------------
 engines/dreamweb/dreamgen.h   |  71 +++++++------
 engines/dreamweb/pathfind.cpp |  20 ++--
 3 files changed, 160 insertions(+), 161 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 09ea14583d..681bb79085 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2876,14 +2876,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 1249;
+	si = 1244;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 1265;
+	si = 1260;
 	_add(si, ax);
 	ax = pop();
 }
@@ -2935,7 +2935,7 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 1249);
+	_add(bx, 1244);
 	es.byte(bx) = 0;
 }
 
@@ -2971,7 +2971,7 @@ void DreamGenContext::execCommand() {
 	es = cs;
 	bx = offset_comlist;
 	ds = cs;
-	si = 1283;
+	si = 1278;
 	al = ds.byte(si);
 	_cmp(al, 0);
 	if (!flags.z())
@@ -3064,7 +3064,7 @@ dirroot:
 	si = offset_rootdir;
 	_inc(si);
 	es = cs;
-	di = 1125;
+	di = 1120;
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
@@ -3166,7 +3166,7 @@ notyetassigned:
 	push(bx);
 	_add(bx, 2);
 	ds = cs;
-	si = 1283;
+	si = 1278;
 checkpass:
 	_lodsw();
 	ah = es.byte(bx);
@@ -3237,7 +3237,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 1125;
+	di = 1120;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -3367,7 +3367,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 1125+1;
+	di = 1120+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -3494,7 +3494,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 1283;
+	si = 1278;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -4519,7 +4519,7 @@ nomatchslot:
 void DreamGenContext::clearBuffers() {
 	STACK_CHECK;
 	es = data.word(kBuffers);
-	cx = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+916-459+68-0)/2;
+	cx = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+911-454+68-0)/2;
 	ax = 0;
 	di = 0;
 	_stosw(cx, true);
@@ -4531,11 +4531,11 @@ void DreamGenContext::clearBuffers() {
 	es = data.word(kBuffers);
 	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
 	ds = cs;
-	si = 459;
-	cx = (916-459);
+	si = 454;
+	cx = (911-454);
 	_movsb(cx, true);
 	es = data.word(kBuffers);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+916-459);
+	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+911-454);
 	ds = cs;
 	si = 0;
 	cx = (68-0);
@@ -4553,11 +4553,11 @@ void DreamGenContext::clearChanges() {
 	ds = data.word(kBuffers);
 	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
 	es = cs;
-	di = 459;
-	cx = (916-459);
+	di = 454;
+	cx = (911-454);
 	_movsb(cx, true);
 	ds = data.word(kBuffers);
-	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+916-459);
+	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+911-454);
 	es = cs;
 	di = 0;
 	cx = (68-0);
@@ -4571,7 +4571,7 @@ void DreamGenContext::clearChanges() {
 	di = 0;
 	_stosw(cx, true);
 	es = cs;
-	di = 1249;
+	di = 1244;
 	al = 1;
 	_stosb(2);
 	al = 0;
@@ -4818,111 +4818,111 @@ void DreamGenContext::__start() {
 		//0x0190: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x01a0: .... .... .... ....
-		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, 0xff, 
 		//0x01b0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x01, 0x2c, 0x00, 0x14, 0x00, 
-		//0x01c0: .... .... .... ,...
-		0x02, 0x00, 0x01, 0x01, 0x37, 0x00, 0x00, 0x00, 0x32, 0x14, 0x00, 0x18, 0x16, 0x00, 0x4a, 0x00, 
-		//0x01d0: .... 7... 2... ..J.
-		0x01, 0x00, 0x00, 0x18, 0x21, 0x0a, 0x4b, 0x00, 0x01, 0x00, 0x01, 0x01, 0x2c, 0x00, 0x1b, 0x00, 
-		//0x01e0: .... !.K. .... ,...
-		0x02, 0x00, 0x02, 0x01, 0x2c, 0x00, 0x60, 0x00, 0x03, 0x00, 0x04, 0x01, 0x2c, 0x00, 0x76, 0x00, 
-		//0x01f0: .... ,.`. .... ,.v.
-		0x02, 0x00, 0x05, 0x01, 0x2c, 0x0a, 0x00, 0x00, 0x02, 0x00, 0x00, 0x05, 0x16, 0x14, 0x35, 0x00, 
-		//0x0200: .... ,... .... ..5.
-		0x03, 0x00, 0x00, 0x05, 0x16, 0x14, 0x28, 0x00, 0x01, 0x00, 0x02, 0x05, 0x16, 0x14, 0x32, 0x00, 
-		//0x0210: .... ..(. .... ..2.
-		0x01, 0x00, 0x03, 0x02, 0x0b, 0x0a, 0xc0, 0x00, 0x01, 0x00, 0x00, 0x02, 0x0b, 0x0a, 0xb6, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x01, 0x2c, 0x00, 0x14, 0x00, 0x02, 0x00, 0x01, 0x01, 0x37, 
+		//0x01c0: .... ..., .... ...7
+		0x00, 0x00, 0x00, 0x32, 0x14, 0x00, 0x18, 0x16, 0x00, 0x4a, 0x00, 0x01, 0x00, 0x00, 0x18, 0x21, 
+		//0x01d0: ...2 .... .J.. ...!
+		0x0a, 0x4b, 0x00, 0x01, 0x00, 0x01, 0x01, 0x2c, 0x00, 0x1b, 0x00, 0x02, 0x00, 0x02, 0x01, 0x2c, 
+		//0x01e0: .K.. ..., .... ...,
+		0x00, 0x60, 0x00, 0x03, 0x00, 0x04, 0x01, 0x2c, 0x00, 0x76, 0x00, 0x02, 0x00, 0x05, 0x01, 0x2c, 
+		//0x01f0: .`.. ..., .v.. ...,
+		0x0a, 0x00, 0x00, 0x02, 0x00, 0x00, 0x05, 0x16, 0x14, 0x35, 0x00, 0x03, 0x00, 0x00, 0x05, 0x16, 
+		//0x0200: .... .... .5.. ....
+		0x14, 0x28, 0x00, 0x01, 0x00, 0x02, 0x05, 0x16, 0x14, 0x32, 0x00, 0x01, 0x00, 0x03, 0x02, 0x0b, 
+		//0x0210: .(.. .... .2.. ....
+		0x0a, 0xc0, 0x00, 0x01, 0x00, 0x00, 0x02, 0x0b, 0x0a, 0xb6, 0x00, 0x02, 0x00, 0x01, 0x08, 0x0b, 
 		//0x0220: .... .... .... ....
-		0x02, 0x00, 0x01, 0x08, 0x0b, 0x0a, 0x00, 0x00, 0x02, 0x00, 0x01, 0x17, 0x00, 0x32, 0x00, 0x00, 
-		//0x0230: .... .... .... .2..
-		0x03, 0x00, 0x00, 0x1c, 0x0b, 0x14, 0xfa, 0x00, 0x04, 0x00, 0x00, 0x17, 0x00, 0x32, 0x2b, 0x00, 
-		//0x0240: .... .... .... .2+.
-		0x02, 0x00, 0x08, 0x17, 0x0b, 0x28, 0x82, 0x00, 0x02, 0x00, 0x01, 0x17, 0x16, 0x28, 0x7a, 0x00, 
-		//0x0250: .... .(.. .... .(z.
-		0x02, 0x00, 0x02, 0x17, 0x16, 0x28, 0x69, 0x00, 0x02, 0x00, 0x03, 0x17, 0x16, 0x28, 0x51, 0x00, 
-		//0x0260: .... .(i. .... .(Q.
-		0x02, 0x00, 0x04, 0x17, 0x0b, 0x28, 0x87, 0x00, 0x02, 0x00, 0x05, 0x17, 0x16, 0x28, 0x91, 0x00, 
-		//0x0270: .... .(.. .... .(..
-		0x02, 0x00, 0x06, 0x04, 0x16, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0xc8, 0x00, 
-		//0x0280: .... .... ...- ....
-		0x00, 0x00, 0x14, 0x2d, 0x16, 0x1e, 0x27, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0x19, 0x00, 
-		//0x0290: ...- ..'. ...- ....
-		0x02, 0x00, 0x00, 0x08, 0x16, 0x28, 0x20, 0x00, 0x02, 0x00, 0x00, 0x07, 0x0b, 0x14, 0x40, 0x00, 
-		//0x02a0: .... .( . .... ..@.
-		0x02, 0x00, 0x00, 0x16, 0x16, 0x14, 0x52, 0x00, 0x02, 0x00, 0x00, 0x1b, 0x0b, 0x1e, 0x00, 0x00, 
-		//0x02b0: .... ..R. .... ....
-		0x02, 0x00, 0x00, 0x14, 0x00, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x21, 0x28, 0x15, 0x00, 
-		//0x02c0: .... .... .... !(..
-		0x01, 0x00, 0x00, 0x1d, 0x0b, 0x0a, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x16, 0x00, 0x02, 0x00, 
+		0x0a, 0x00, 0x00, 0x02, 0x00, 0x01, 0x17, 0x00, 0x32, 0x00, 0x00, 0x03, 0x00, 0x00, 0x1c, 0x0b, 
+		//0x0230: .... .... 2... ....
+		0x14, 0xfa, 0x00, 0x04, 0x00, 0x00, 0x17, 0x00, 0x32, 0x2b, 0x00, 0x02, 0x00, 0x08, 0x17, 0x0b, 
+		//0x0240: .... .... 2+.. ....
+		0x28, 0x82, 0x00, 0x02, 0x00, 0x01, 0x17, 0x16, 0x28, 0x7a, 0x00, 0x02, 0x00, 0x02, 0x17, 0x16, 
+		//0x0250: (... .... (z.. ....
+		0x28, 0x69, 0x00, 0x02, 0x00, 0x03, 0x17, 0x16, 0x28, 0x51, 0x00, 0x02, 0x00, 0x04, 0x17, 0x0b, 
+		//0x0260: (i.. .... (Q.. ....
+		0x28, 0x87, 0x00, 0x02, 0x00, 0x05, 0x17, 0x16, 0x28, 0x91, 0x00, 0x02, 0x00, 0x06, 0x04, 0x16, 
+		//0x0270: (... .... (... ....
+		0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0xc8, 0x00, 0x00, 0x00, 0x14, 0x2d, 0x16, 
+		//0x0280: .... ..-. .... ..-.
+		0x1e, 0x27, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0x19, 0x00, 0x02, 0x00, 0x00, 0x08, 0x16, 
+		//0x0290: .'.. ..-. .... ....
+		0x28, 0x20, 0x00, 0x02, 0x00, 0x00, 0x07, 0x0b, 0x14, 0x40, 0x00, 0x02, 0x00, 0x00, 0x16, 0x16, 
+		//0x02a0: ( .. .... .@.. ....
+		0x14, 0x52, 0x00, 0x02, 0x00, 0x00, 0x1b, 0x0b, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x14, 0x00, 
+		//0x02b0: .R.. .... .... ....
+		0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x21, 0x28, 0x15, 0x00, 0x01, 0x00, 0x00, 0x1d, 0x0b, 
+		//0x02c0: .... ...! (... ....
+		0x0a, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x16, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x19, 0x00, 
 		//0x02d0: .... .... .... ....
-		0x02, 0x00, 0x00, 0x19, 0x00, 0x32, 0x04, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x1e, 0x79, 0x00, 
-		//0x02e0: .... .2.. ...2 ..y.
-		0x02, 0x00, 0x00, 0x32, 0x16, 0x1e, 0x00, 0x00, 0x14, 0x00, 0x00, 0x34, 0x16, 0x1e, 0xc0, 0x00, 
-		//0x02f0: ...2 .... ...4 ....
-		0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0xe9, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x68, 0x00, 
-		//0x0300: ...4 .... ...2 .(h.
-		0x37, 0x00, 0x00, 0x35, 0x21, 0x00, 0x63, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x00, 0x00, 
-		//0x0310: 7..5 !.c. ...2 .(..
-		0x03, 0x00, 0x00, 0x32, 0x16, 0x1e, 0xa2, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0x39, 0x00, 
-		//0x0320: ...2 .... ...4 ..9.
-		0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x36, 0x00, 0x00, 0x48, 0x00, 
-		//0x0330: ...4 .... ...6 ..H.
-		0x03, 0x00, 0x00, 0x37, 0x2c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 
-		//0x0340: ...7 ,... .... ....
-		0x1c, 0x00, 0x00, 0x0e, 0x16, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x16, 0x00, 0x2c, 0x01, 
-		//0x0350: .... .... .... ..,.
-		0x01, 0x00, 0x00, 0x0a, 0x16, 0x1e, 0xae, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x16, 0x14, 0x00, 0x00, 
+		0x32, 0x04, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x1e, 0x79, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 
+		//0x02e0: 2... ..2. .y.. ..2.
+		0x1e, 0x00, 0x00, 0x14, 0x00, 0x00, 0x34, 0x16, 0x1e, 0xc0, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 
+		//0x02f0: .... ..4. .... ..4.
+		0x1e, 0xe9, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x68, 0x00, 0x37, 0x00, 0x00, 0x35, 0x21, 
+		//0x0300: .... ..2. (h.7 ..5!
+		0x00, 0x63, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x00, 0x00, 0x03, 0x00, 0x00, 0x32, 0x16, 
+		//0x0310: .c.. ..2. (... ..2.
+		0x1e, 0xa2, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0x39, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 
+		//0x0320: .... ..4. .9.. ..4.
+		0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x36, 0x00, 0x00, 0x48, 0x00, 0x03, 0x00, 0x00, 0x37, 0x2c, 
+		//0x0330: .... ..6. .H.. ..7,
+		0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x0e, 0x16, 
+		//0x0340: .... .... .... ....
+		0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x16, 0x00, 0x2c, 0x01, 0x01, 0x00, 0x00, 0x0a, 0x16, 
+		//0x0350: .... .... .,.. ....
+		0x1e, 0xae, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x16, 0x14, 0x00, 0x00, 0x01, 0x00, 0x00, 0x0b, 0x0b, 
 		//0x0360: .... .... .... ....
-		0x01, 0x00, 0x00, 0x0b, 0x0b, 0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x0b, 0x1e, 0x00, 0x00, 
-		//0x0370: .... .... 2... ....
-		0x32, 0x14, 0x00, 0x0b, 0x16, 0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0e, 0x21, 0x28, 0x00, 0x00, 
-		//0x0380: 2... .... 2... !(..
-		0x32, 0x14, 0x00, 0xff, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 
-		//0x0390: 2... DREA MWEB .V99
-		0x00, 0x00, 0x01, 0x45, 0x58, 0x49, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x48, 0x45, 0x4c, 
-		//0x03a0: ...E XIT        HEL
-		0x50, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x49, 0x53, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x03b0: P       L IST      
-		0x20, 0x52, 0x45, 0x41, 0x44, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x47, 0x4f, 0x4e, 
-		//0x03c0:  REA D       L OGON
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x4b, 0x45, 0x59, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x01, 
-		//0x03d0:       KEY S       .
-		0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 
-		//0x03e0: .PUB LIC        PUB
-		0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 
-		//0x03f0: LIC       ...B LACK
-		0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0400: DRAG ON R YAN      
-		0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 
-		//0x0410:   .. .HEN DRIX     
-		0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 
-		//0x0420:  LOU IS        ...S
-		0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 
-		//0x0430: EPTI MUS     B ECKE
-		0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0440: TT     .. .        
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 
-		//0x0450:        ." ROOT     
-		0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0460:      ."            
-		0x20, 0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 
-		//0x0470:   .0 000. 00.. ...$
-		0x4f, 0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 
-		//0x0480: OBJE CT N AME  ONE 
+		0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x0b, 0x1e, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x16, 
+		//0x0370: ...2 .... ...2 ....
+		0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0e, 0x21, 0x28, 0x00, 0x00, 0x32, 0x14, 0x00, 0xff, 0x44, 
+		//0x0380: ...2 ...! (..2 ...D
+		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x00, 0x01, 0x45, 0x58, 
+		//0x0390: REAM WEB. V99. ..EX
+		0x49, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x48, 0x45, 0x4c, 0x50, 0x20, 0x20, 0x20, 0x20, 
+		//0x03a0: IT        HELP     
+		0x20, 0x20, 0x4c, 0x49, 0x53, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x52, 0x45, 0x41, 0x44, 
+		//0x03b0:   LI ST        READ
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x47, 0x4f, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x03c0:        LO GON      
+		0x4b, 0x45, 0x59, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 
+		//0x03d0: KEYS        .. PUBL
+		0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 
+		//0x03e0: IC        PUBL IC  
+		0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 
+		//0x03f0:    . ..BL ACKD RAGO
+		0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 
+		//0x0400: N RY AN         ...
+		0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 
+		//0x0410: HEND RIX       LOUI
+		0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 
+		//0x0420: S       . ..SE PTIM
+		0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 
+		//0x0430: US     BE CKET T   
+		0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0440:  ...               
+		0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
+		//0x0450:  ."R OOT          .
+		0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 
+		//0x0460: "               .00
+		0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x4f, 0x42, 0x4a, 0x45, 0x43, 
+		//0x0470: 00.0 0... ..$O BJEC
+		0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0480: T NA ME O NE       
 		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
 		//0x0490:                    
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 
-		//0x04a0:           .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-		//0x04b0: .... .... .... ....
-		0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x04c0: .D:. .... .... ....
+		0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 
+		//0x04a0:    . .... .... ....
+		0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 
+		//0x04b0: .... .... .... D:..
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x04c0: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
 		//0x04d0: .... .... .... ....
-		0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 
 		//0x04e0: .... .... .... ....
-		0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 
+		0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04f0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0500: .... .... .... ....
@@ -4938,9 +4938,9 @@ void DreamGenContext::__start() {
 		//0x0550: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0560: .... .... .... ....
-		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, 0xff, 0xff, 
 		//0x0570: .... .... .... ....
-		0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
+		0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 92c6f82e12..3b9c2cf034 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,14 +32,14 @@
 
 namespace DreamGen {
 
-static const uint16 offset_rootdir = 0x0457;
-static const uint16 offset_money2poke = 0x0478;
-static const uint16 offset_keys = 0x03df;
-static const uint16 offset_money1poke = 0x0473;
-static const uint16 offset_comlist = 0x03a3;
-static const uint16 offset_openchangesize = 0x03a1;
-static const uint16 offset_commandline = 0x0480;
-static const uint16 offset_operand1 = 0x0449;
+static const uint16 offset_money1poke = 0x046e;
+static const uint16 offset_operand1 = 0x0444;
+static const uint16 offset_comlist = 0x039e;
+static const uint16 offset_commandline = 0x047b;
+static const uint16 offset_rootdir = 0x0452;
+static const uint16 offset_money2poke = 0x0473;
+static const uint16 offset_openchangesize = 0x039c;
+static const uint16 offset_keys = 0x03da;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -359,32 +359,29 @@ static const uint16 kLinestartx = 431;
 static const uint16 kLinestarty = 433;
 static const uint16 kLineendx = 435;
 static const uint16 kLineendy = 437;
-static const uint16 kIncrement1 = 439;
-static const uint16 kIncrement2 = 441;
-static const uint16 kLineroutine = 443;
-static const uint16 kLinepointer = 444;
-static const uint16 kLinedirection = 445;
-static const uint16 kLinelength = 446;
-static const uint16 kLiftsoundcount = 447;
-static const uint16 kCh0blockstocopy = 448;
-static const uint16 kCh0playing = 450;
-static const uint16 kCh0repeat = 451;
-static const uint16 kCh1playing = 452;
-static const uint16 kCh1blockstocopy = 453;
-static const uint16 kSoundbufferwrite = 455;
-static const uint16 kCurrentsample = 457;
-static const uint16 kRoomssample = 458;
-static const uint16 kReelroutines = 459;
-static const uint16 kBasicsample = 916;
-static const uint16 kCurrentfile = 1125;
-static const uint16 kRoomscango = 1249;
-static const uint16 kRoompics = 1265;
-static const uint16 kOplist = 1280;
-static const uint16 kInputline = 1283;
-static const uint16 kPresslist = 1411;
-static const uint16 kQuitrequested = 1417;
-static const uint16 kSubtitles = 1418;
-static const uint16 kForeignrelease = 1419;
+static const uint16 kLinepointer = 439;
+static const uint16 kLinedirection = 440;
+static const uint16 kLinelength = 441;
+static const uint16 kLiftsoundcount = 442;
+static const uint16 kCh0blockstocopy = 443;
+static const uint16 kCh0playing = 445;
+static const uint16 kCh0repeat = 446;
+static const uint16 kCh1playing = 447;
+static const uint16 kCh1blockstocopy = 448;
+static const uint16 kSoundbufferwrite = 450;
+static const uint16 kCurrentsample = 452;
+static const uint16 kRoomssample = 453;
+static const uint16 kReelroutines = 454;
+static const uint16 kBasicsample = 911;
+static const uint16 kCurrentfile = 1120;
+static const uint16 kRoomscango = 1244;
+static const uint16 kRoompics = 1260;
+static const uint16 kOplist = 1275;
+static const uint16 kInputline = 1278;
+static const uint16 kPresslist = 1406;
+static const uint16 kQuitrequested = 1412;
+static const uint16 kSubtitles = 1413;
+static const uint16 kForeignrelease = 1414;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -423,8 +420,8 @@ static const uint16 kListofchanges = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768
 static const uint16 kUndertimedtext = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4));
 static const uint16 kRainlist = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30));
 static const uint16 kInitialreelrouts = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
-static const uint16 kInitialvars = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+916-459);
-static const uint16 kLengthofbuffer = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+916-459+68-0);
+static const uint16 kInitialvars = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+911-454);
+static const uint16 kLengthofbuffer = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+911-454+68-0);
 static const uint16 kReellist = (0+(36*144));
 static const uint16 kIntext = (0+(38*2));
 static const uint16 kLengthofmap = (0+(66*60));
@@ -475,7 +472,7 @@ static const uint16 kKeypady = (72);
 static const uint16 kZoomx = (8);
 static const uint16 kInventx = (80);
 static const uint16 kMenux = (80+40);
-static const uint16 kLenofreelrouts = (916-459);
+static const uint16 kLenofreelrouts = (911-454);
 static const uint16 kHeaderlen = (96);
 
 
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index f6591d4666..212d61e6e2 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -230,33 +230,35 @@ void DreamBase::bresenhams() {
 	}
 
 	uint16 delta1, delta2;
+	byte lineRoutine;
+
 	if (deltaY > deltaX) {
-		data.byte(kLineroutine) = 1;
+		lineRoutine = 1;
 		delta1 = deltaY;
 		delta2 = deltaX;
 	} else {
-		data.byte(kLineroutine) = 0;
+		lineRoutine = 0;
 		delta1 = deltaX;
 		delta2 = deltaY;
 	}
 
-	data.word(kIncrement1) = delta2 * 2;
+	uint16 increment1 = delta2 * 2;
+	uint16 increment2 = delta2 * 2 - delta1 * 2;
 	int16 remainder = delta2 * 2 - delta1;
-	data.word(kIncrement2) = delta2 * 2 - delta1 * 2;
 	++delta1;
 	int8 x = (int8)startX;
 	int8 y = (int8)startY;
 	data.byte(kLinelength) = delta1;
-	if (data.byte(kLineroutine) != 1) {
+	if (lineRoutine != 1) {
 		for (; delta1; --delta1) {
 			lineData->x = x;
 			lineData->y = y;
 			++lineData;
 			++x;
 			if (remainder < 0) {
-				remainder += data.word(kIncrement1);
+				remainder += increment1;
 			} else {
-				remainder += data.word(kIncrement2);
+				remainder += increment2;
 				y += increment;
 			}
 		}
@@ -267,9 +269,9 @@ void DreamBase::bresenhams() {
 			++lineData;
 			y += increment;
 			if (remainder < 0) {
-				remainder += data.word(kIncrement1);
+				remainder += increment1;
 			} else {
-				remainder += data.word(kIncrement2);
+				remainder += increment2;
 				++x;
 			}
 		}
-- 
cgit v1.2.3


From 8a9eaa58dfc163da4e1588dcf45faae5f1e62f15 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 13 Dec 2011 01:29:05 +0100
Subject: TSAGE: R2R - Implement scene 2530

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +
 engines/tsage/ringworld2/ringworld2_scenes2.cpp | 157 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes2.h   |  30 +++++
 3 files changed, 189 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 8f85bbdea3..296da52da5 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -131,6 +131,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Maze: Furnace room
 		return new Scene2525();
 	case 2530:
+		// Maze: Well
+		return new Scene2530();
 	case 2535:
 	case 2600:
 	case 2700:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index d15763fb29..cbb6dbc42e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -2643,5 +2643,162 @@ void Scene2525::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 2530 - Maze: Well
+ *
+ *--------------------------------------------------------------------------*/
+bool Scene2530::Actor2::startAction(CursorType action, Event &event) {
+	Scene2530 *scene = (Scene2530 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	if (R2_GLOBALS._player._characterIndex == 2) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 2530;
+		scene->setAction(&scene->_sequenceManager, scene, 2530, &R2_GLOBALS._player, &scene->_actor2, NULL);
+	} else {
+		SceneItem::display(2530, 33, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+	}
+
+	return true;
+}
+
+bool Scene2530::Actor3::startAction(CursorType action, Event &event) {
+	Scene2530 *scene = (Scene2530 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS.getFlag(73))
+			SceneItem::display(2530, 35, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		else {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 2532;
+			scene->setAction(&scene->_sequenceManager, scene, 2532, &R2_GLOBALS._player, &scene->_actor3, NULL);
+		}
+	} else {
+		if (R2_GLOBALS.getFlag(73)) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 2533;
+			scene->setAction(&scene->_sequenceManager, scene, 2533, &R2_GLOBALS._player, &scene->_actor3, NULL);
+		} else {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 2531;
+			scene->setAction(&scene->_sequenceManager, scene, 2531, &R2_GLOBALS._player, &scene->_actor3, NULL);
+		}
+	}
+
+	return true;
+}
+
+void Scene2530::Exit1::changeScene() {
+	Scene2530 *scene = (Scene2530 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._events.setCursor(CURSOR_ARROW);
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 11;
+
+	Common::Point pt(108, 200);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene2530::postInit(SceneObjectList *OwnerList) {
+	loadScene(2530);
+	SceneExt::postInit();
+
+	_exit1.setDetails(Rect(68, 155, 147, 168), EXITCURSOR_S, 2000);
+	_exit1.setDest(Common::Point(108, 160));
+
+	if (R2_INVENTORY.getObjectScene(33) == 2530) {
+		_actor2.postInit();
+		_actor2.setup(2435, 1, 3);
+		_actor2.setPosition(Common::Point(299, 80));
+		_actor2.fixPriority(80);
+		_actor2.setDetails(2530, 28, -1, -1, 1, NULL);
+	}
+
+	_actor3.postInit();
+	if (R2_GLOBALS.getFlag(73)) {
+		_actor3.setup(2531, 4, 2);
+		_actor3.setPosition(Common::Point(154, 130));
+	} else {
+		_actor3.setup(2531, 4, 1);
+		_actor3.setPosition(Common::Point(173, 131));
+	}
+	_actor3.setDetails(2530, 22, -1, -1, 1, NULL);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+
+	if (R2_GLOBALS._player._characterIndex == 1) {
+		R2_GLOBALS._player.setVisage(2008);
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+	} else {
+		R2_GLOBALS._player.setVisage(20);
+		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+	}
+	R2_GLOBALS._player.setPosition(Common::Point(100, 200));
+
+	if (R2_GLOBALS._player._characterScene[1] == R2_GLOBALS._player._characterScene[2]) {
+		_actor1.postInit();
+		if (R2_GLOBALS._player._characterIndex == 1) {
+			_actor1.setup(20, 5, 1);
+			_actor1.setDetails(9002, 0, 4, 3, 1, NULL);
+		} else {
+			_actor1.setup(2008, 5, 1);
+			_actor1.setDetails(9001, 0, 5, 3, 1, NULL);
+		}
+		_actor1.setPosition(Common::Point(20, 130));
+		R2_GLOBALS._walkRegions.enableRegion(1);
+	}
+
+	_item2.setDetails(Rect(108, 90, 135, 205), 2530, 22, -1, -1, 1, NULL);
+	_item5.setDetails(Rect(115, 112, 206, 130), 2530, 25, -1, 27, 1, NULL);
+	_item3.setDetails(Rect(256, 64, 311, 85), 2530, 31, -1, 33, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 320, 200), 2530, 0, 1, -1, 1, NULL);
+
+	R2_GLOBALS._player.disableControl();
+
+	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 2000) {
+		R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 2530;
+		Common::Point pt(108, 150);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+	} else {
+		R2_GLOBALS._player.setPosition(Common::Point(105, 145));
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.enableControl();
+	}
+}
+
+void Scene2530::signal() {
+	switch (_sceneMode) {
+	case 11:
+		g_globals->_sceneManager.changeScene(2000);
+		break;
+	case 2530:
+		R2_INVENTORY.setObjectScene(33, 2);
+		_actor2.remove();
+		break;
+	case 2531:
+	// No break on purpose
+	case 2532:
+		R2_GLOBALS.setFlag(73);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 2533:
+		R2_GLOBALS.clearFlag(73);
+		R2_GLOBALS._player.enableControl();
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index b906921842..bef1fc9ea8 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -414,6 +414,36 @@ public:
 	virtual void remove();
 	virtual void signal();
 };
+
+class Scene2530 : public SceneExt {
+	class Actor2 : public SceneActor {
+	public:
+		bool startAction(CursorType action, Event &event);
+	};
+	class Actor3 : public SceneActor {
+	public:
+		bool startAction(CursorType action, Event &event);
+	};
+
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+public:
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	NamedHotspot _item3;
+	NamedHotspot _item4;
+	NamedHotspot _item5;
+	SceneActor _actor1;
+	Actor2 _actor2;
+	Actor3 _actor3;
+	Exit1 _exit1;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 22d3118aff380aa301443275953fb1af7624d136 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 13 Dec 2011 00:38:57 +0000
Subject: AGI: Fix bug #3095169: AGI inventory items

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

(limited to 'engines')

diff --git a/engines/agi/objects.cpp b/engines/agi/objects.cpp
index 94eef92579..447cff2a3f 100644
--- a/engines/agi/objects.cpp
+++ b/engines/agi/objects.cpp
@@ -52,7 +52,7 @@ int AgiEngine::decodeObjects(uint8 *mem, uint32 flen) {
 
 	// alloc memory for object list
 	// byte 3 = number of animated objects. this is ignored.. ??
-	if (READ_LE_UINT16(mem) / padsize >= 256) {
+	if (READ_LE_UINT16(mem) / padsize > 256) {
 		// die with no error! AGDS game needs not to die to work!! :(
 		return errOK;
 	}
-- 
cgit v1.2.3


From 38ff68e4492df227f49f3932f16d7b3a5a5c9231 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Mon, 12 Dec 2011 20:16:09 -0600
Subject: KYRA: Use Common::KeyActionEntry table for LoL game keymap

This is for the keymapper keymap
---
 engines/kyra/lol.cpp | 54 +++++++++++++++++++---------------------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 538e88aa90..7d73526411 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -568,41 +568,27 @@ void LoLEngine::initKeymap() {
 	Common::Action *act;
 	Common::Keymap *engineKeyMap = new Common::Keymap(kKeymapName);
 
-	act = new Common::Action(engineKeyMap, "AT1", _("Attack 1"), Common::kGenericActionType, Common::kActionKeyType);
-	act->addKeyEvent(Common::KeyState(Common::KEYCODE_F1, Common::ASCII_F1 , 0));
-
-	act = new Common::Action(engineKeyMap, "AT2", _("Attack 2"), Common::kGenericActionType, Common::kActionKeyType);
-	act->addKeyEvent(Common::KeyState(Common::KEYCODE_F2, Common::ASCII_F2 , 0));
-
-	act = new Common::Action(engineKeyMap, "AT3", _("Attack 3"), Common::kGenericActionType, Common::kActionKeyType);
-	act->addKeyEvent(Common::KeyState(Common::KEYCODE_F3, Common::ASCII_F3 , 0));
-
-	act = new Common::Action(engineKeyMap, "MVF", _("Move Forward"), Common::kGenericActionType, Common::kActionKeyType);
-	act->addKeyEvent(Common::KeyState(Common::KEYCODE_UP));
-
-	act = new Common::Action(engineKeyMap, "MVB", _("Move Back"), Common::kGenericActionType, Common::kActionKeyType);
-	act->addKeyEvent(Common::KeyState(Common::KEYCODE_DOWN));
-
-	act = new Common::Action(engineKeyMap, "SLL", _("Slide Left"), Common::kGenericActionType, Common::kActionKeyType);
-	act->addKeyEvent(Common::KeyState(Common::KEYCODE_LEFT));
-
-	act = new Common::Action(engineKeyMap, "SLR", _("Slide Right"), Common::kGenericActionType, Common::kActionKeyType);
-	act->addKeyEvent(Common::KeyState(Common::KEYCODE_RIGHT));
-
-	act = new Common::Action(engineKeyMap, "TL", _("Turn Left"), Common::kGenericActionType, Common::kActionKeyType);
-	act->addKeyEvent(Common::KeyState(Common::KEYCODE_HOME));
-
-	act = new Common::Action(engineKeyMap, "TR", _("Turn Right"), Common::kGenericActionType, Common::kActionKeyType);
-	act->addKeyEvent(Common::KeyState(Common::KEYCODE_PAGEUP));
-
-	act = new Common::Action(engineKeyMap, "RST", _("Rest"), Common::kGenericActionType, Common::kActionKeyType);
-	act->addKeyEvent(Common::KeyState(Common::KEYCODE_r));
-
-	act = new Common::Action(engineKeyMap, "OPT", _("Options"), Common::kGenericActionType, Common::kActionKeyType);
-	act->addKeyEvent(Common::KeyState(Common::KEYCODE_o));
+	const Common::KeyActionEntry keyActionEntries[] = {
+		{Common::KeyState(Common::KEYCODE_F1, Common::ASCII_F1 , 0), "AT1", _("Attack 1")},
+		{Common::KeyState(Common::KEYCODE_F2, Common::ASCII_F2 , 0), "AT2", _("Attack 2")},
+		{Common::KeyState(Common::KEYCODE_F3, Common::ASCII_F2 , 0), "AT3", _("Attack 3")},
+		{Common::KeyState(Common::KEYCODE_UP), "MVF", _("Move Forward")},
+		{Common::KeyState(Common::KEYCODE_DOWN), "MVB", _("Move Back")},
+		{Common::KeyState(Common::KEYCODE_LEFT), "SLL", _("Slide Left")},
+		{Common::KeyState(Common::KEYCODE_RIGHT), "SLR", _("Slide Right")},
+		{Common::KeyState(Common::KEYCODE_HOME), "TL", _("Turn Left")},
+		{Common::KeyState(Common::KEYCODE_PAGEUP), "TR", _("Turn Right")},
+		{Common::KeyState(Common::KEYCODE_r), "RST", _("Rest")},
+		{Common::KeyState(Common::KEYCODE_o), "OPT", _("Options")},
+		{Common::KeyState(Common::KEYCODE_SLASH), "SPL", _("Choose Spell")},
+		{Common::KeyState(), 0, 0}
+	};
 
-	act = new Common::Action(engineKeyMap, "SPL", _("Choose Spell"), Common::kGenericActionType, Common::kActionKeyType);
-	act->addKeyEvent(Common::KeyState(Common::KEYCODE_SLASH));
+	const Common::KeyActionEntry *entry;
+	for (entry = keyActionEntries; entry->id; ++entry) {
+		act = new Common::Action(engineKeyMap, entry->id, Common::String(entry->description), Common::kGenericActionType, Common::kActionKeyType);
+		act->addKeyEvent(Common::KeyState(entry->ks));
+	}
 
 	mapper->addGameKeymap(engineKeyMap);
 
-- 
cgit v1.2.3


From 1305c5ab315c6468076eac07ac8b78c24d695eac Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Mon, 12 Dec 2011 22:37:36 -0600
Subject: KYRA: Fix whitespace

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

(limited to 'engines')

diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 7d73526411..120900537b 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -569,9 +569,9 @@ void LoLEngine::initKeymap() {
 	Common::Keymap *engineKeyMap = new Common::Keymap(kKeymapName);
 
 	const Common::KeyActionEntry keyActionEntries[] = {
-		{Common::KeyState(Common::KEYCODE_F1, Common::ASCII_F1 , 0), "AT1", _("Attack 1")},
-		{Common::KeyState(Common::KEYCODE_F2, Common::ASCII_F2 , 0), "AT2", _("Attack 2")},
-		{Common::KeyState(Common::KEYCODE_F3, Common::ASCII_F2 , 0), "AT3", _("Attack 3")},
+		{Common::KeyState(Common::KEYCODE_F1, Common::ASCII_F1, 0), "AT1", _("Attack 1")},
+		{Common::KeyState(Common::KEYCODE_F2, Common::ASCII_F2, 0), "AT2", _("Attack 2")},
+		{Common::KeyState(Common::KEYCODE_F3, Common::ASCII_F2, 0), "AT3", _("Attack 3")},
 		{Common::KeyState(Common::KEYCODE_UP), "MVF", _("Move Forward")},
 		{Common::KeyState(Common::KEYCODE_DOWN), "MVB", _("Move Back")},
 		{Common::KeyState(Common::KEYCODE_LEFT), "SLL", _("Slide Left")},
-- 
cgit v1.2.3


From 25e42e1baa04013755593db4b46e368e7ff051eb Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 13 Dec 2011 10:21:19 +0200
Subject: DREAMWEB: 'removefreeobject' is unused. Port 'updatesymboltop',
 'updatesymbolbot' to C++

---
 engines/dreamweb/dreamgen.cpp | 98 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  3 --
 engines/dreamweb/stubs.cpp    | 74 ++++++++++++++++++++++++++++++++
 engines/dreamweb/stubs.h      |  2 +
 4 files changed, 76 insertions(+), 101 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 681bb79085..63942575bf 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -4060,16 +4060,6 @@ void DreamGenContext::findPuzText() {
 	si = ax;
 }
 
-void DreamGenContext::removeFreeObject() {
-	STACK_CHECK;
-	push(es);
-	push(bx);
-	getFreeAd();
-	es.byte(bx+2) = 255;
-	bx = pop();
-	es = pop();
-}
-
 void DreamGenContext::useGun() {
 	STACK_CHECK;
 	_cmp(data.byte(kObjecttype), 4);
@@ -4247,94 +4237,6 @@ nottvsoldier:
 	putBackObStuff();
 }
 
-void DreamGenContext::updateSymbolTop() {
-	STACK_CHECK;
-	_cmp(data.byte(kSymboltopdir), 0);
-	if (flags.z())
-		return /* (topfinished) */;
-	_cmp(data.byte(kSymboltopdir), -1);
-	if (flags.z())
-		goto backwards;
-	_inc(data.byte(kSymboltopx));
-	_cmp(data.byte(kSymboltopx), 49);
-	if (!flags.z())
-		goto notwrapfor;
-	data.byte(kSymboltopx) = 0;
-	_dec(data.byte(kSymboltopnum));
-	_cmp(data.byte(kSymboltopnum), -1);
-	if (!flags.z())
-		return /* (topfinished) */;
-	data.byte(kSymboltopnum) = 5;
-	return;
-notwrapfor:
-	_cmp(data.byte(kSymboltopx), 24);
-	if (!flags.z())
-		return /* (topfinished) */;
-	data.byte(kSymboltopdir) = 0;
-	return;
-backwards:
-	_dec(data.byte(kSymboltopx));
-	_cmp(data.byte(kSymboltopx), -1);
-	if (!flags.z())
-		goto notwrapback;
-	data.byte(kSymboltopx) = 48;
-	_inc(data.byte(kSymboltopnum));
-	_cmp(data.byte(kSymboltopnum), 6);
-	if (!flags.z())
-		return /* (topfinished) */;
-	data.byte(kSymboltopnum) = 0;
-	return;
-notwrapback:
-	_cmp(data.byte(kSymboltopx), 24);
-	if (!flags.z())
-		return /* (topfinished) */;
-	data.byte(kSymboltopdir) = 0;
-}
-
-void DreamGenContext::updateSymbolBot() {
-	STACK_CHECK;
-	_cmp(data.byte(kSymbolbotdir), 0);
-	if (flags.z())
-		return /* (botfinished) */;
-	_cmp(data.byte(kSymbolbotdir), -1);
-	if (flags.z())
-		goto backwardsbot;
-	_inc(data.byte(kSymbolbotx));
-	_cmp(data.byte(kSymbolbotx), 49);
-	if (!flags.z())
-		goto notwrapforb;
-	data.byte(kSymbolbotx) = 0;
-	_dec(data.byte(kSymbolbotnum));
-	_cmp(data.byte(kSymbolbotnum), -1);
-	if (!flags.z())
-		return /* (botfinished) */;
-	data.byte(kSymbolbotnum) = 5;
-	return;
-notwrapforb:
-	_cmp(data.byte(kSymbolbotx), 24);
-	if (!flags.z())
-		return /* (botfinished) */;
-	data.byte(kSymbolbotdir) = 0;
-	return;
-backwardsbot:
-	_dec(data.byte(kSymbolbotx));
-	_cmp(data.byte(kSymbolbotx), -1);
-	if (!flags.z())
-		goto notwrapbackb;
-	data.byte(kSymbolbotx) = 48;
-	_inc(data.byte(kSymbolbotnum));
-	_cmp(data.byte(kSymbolbotnum), 6);
-	if (!flags.z())
-		return /* (botfinished) */;
-	data.byte(kSymbolbotnum) = 0;
-	return;
-notwrapbackb:
-	_cmp(data.byte(kSymbolbotx), 24);
-	if (!flags.z())
-		return /* (botfinished) */;
-	data.byte(kSymbolbotdir) = 0;
-}
-
 void DreamGenContext::showDiaryKeys() {
 	STACK_CHECK;
 	_cmp(data.byte(kPresscount), 0);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 3b9c2cf034..b7fb2495c5 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -547,7 +547,6 @@ public:
 	void fillOpen();
 	void findSetObject();
 	void deleteExObject();
-	void removeFreeObject();
 	void lookAtCard();
 	void helicopter();
 	void getEitherAd();
@@ -580,12 +579,10 @@ public:
 	void getExAd();
 	void initialMonCols();
 	void execCommand();
-	void updateSymbolBot();
 	void findPuzText();
 	void swapWithInv();
 	void adjustRight();
 	void transferToEx();
-	void updateSymbolTop();
 	void getPersonText();
 	void parser();
 	void emergencyPurge();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 97dad08298..6dc74b7309 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4511,4 +4511,78 @@ void DreamGenContext::selectSlot() {
 	delPointer();
 }
 
+void DreamGenContext::updateSymbolTop() {
+	if (!data.byte(kSymboltopdir))
+		return; // topfinished
+
+	if (data.byte(kSymboltopdir) == (byte)-1) {
+		// Backward
+		data.byte(kSymboltopx)--;
+		if (data.byte(kSymboltopx) != (byte)-1) {
+			// Not wrapping
+			if (data.byte(kSymboltopx) != 24)
+				return; // topfinished
+			data.byte(kSymboltopdir) = 0;
+		} else {
+			data.byte(kSymboltopx) = 48;
+			data.byte(kSymboltopnum)++;
+			if (data.byte(kSymboltopnum) != 6)
+				return; // topfinished
+			data.byte(kSymboltopnum) = 0;
+		}
+	} else {
+		// Forward
+		data.byte(kSymboltopx)++;
+		if (data.byte(kSymboltopx) != 49) {
+			// Not wrapping
+			if (data.byte(kSymboltopx) != 24)
+				return; // topfinished
+			data.byte(kSymboltopdir) = 0;
+		} else {
+			data.byte(kSymboltopx) = 0;
+			data.byte(kSymboltopnum)--;
+			if (data.byte(kSymboltopnum) != (byte)-1)
+				return; // topfinished
+			data.byte(kSymboltopnum) = 5;
+		}
+	}
+}
+
+void DreamGenContext::updateSymbolBot() {
+	if (!data.byte(kSymbolbotdir))
+		return; // botfinished
+
+	if (data.byte(kSymbolbotdir) == (byte)-1) {
+		// Backward
+		data.byte(kSymbolbotx)--;
+		if (data.byte(kSymbolbotx) != (byte)-1) {
+			// Not wrapping
+			if (data.byte(kSymbolbotx) != 24)
+				return; // botfinished
+			data.byte(kSymbolbotdir) = 0;
+		} else {
+			data.byte(kSymbolbotx) = 48;
+			data.byte(kSymbolbotnum)++;
+			if (data.byte(kSymbolbotnum) != 6)
+				return; // botfinished
+			data.byte(kSymbolbotnum) = 0;
+		}
+	} else {
+		// Forward
+		data.byte(kSymbolbotx)++;
+		if (data.byte(kSymbolbotx) != 49) {
+			// Not wrapping
+			if (data.byte(kSymbolbotx) != 24)
+				return; // botfinished
+			data.byte(kSymbolbotdir) = 0;
+		} else {
+			data.byte(kSymbolbotx) = 0;
+			data.byte(kSymbolbotnum)--;
+			if (data.byte(kSymbolbotnum) != (byte)-1)
+				return; // botfinished
+			data.byte(kSymbolbotnum) = 5;
+		}
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index ed45e40b8d..6a8445b991 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -577,5 +577,7 @@
 	void entryAnims();
 	void triggerMessage(uint16 index);
 	void processTrigger();
+	void updateSymbolTop();
+	void updateSymbolBot();
 
 #endif
-- 
cgit v1.2.3


From d124e25cfe6b022c7030842493065fa91c616bd5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 13 Dec 2011 20:33:45 +1100
Subject: TSAGE: Bugfix to show R2R conversations in front of other on-screen
 objects

---
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 9 +++++++--
 engines/tsage/ringworld2/ringworld2_speakers.h   | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 8c8bd7171a..cff7334090 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -128,7 +128,7 @@ void VisualSpeaker::setText(const Common::String &msg) {
 	//_sceneText.clone();
 
 	_sceneText.setPosition(_textPos);
-	_sceneText.setPriority(0x100);
+	_sceneText.fixPriority(256);
 
 	// If subtitles are turned off, don't show the text
 	if (!(R2_GLOBALS._speechSubtitles & SPEECH_TEXT)) {
@@ -148,7 +148,7 @@ void VisualSpeaker::setText(const Common::String &msg) {
 			++numWords;
 
 		_numFrames = numWords * 30 + 120;
-		setFrame(_numFrames);
+		setDelay(_numFrames);
 	} else {
 		_numFrames = 1;
 	}
@@ -185,6 +185,11 @@ void VisualSpeaker::setFrame(int numFrames) {
 	_frameNumber = R2_GLOBALS._events.getFrameNumber();
 }
 
+void VisualSpeaker::setDelay(int delay) {
+	_delayAmount = delay;
+	_frameNumber = R2_GLOBALS._events.getFrameNumber();
+}
+
 /*--------------------------------------------------------------------------*/
 
 SpeakerMiranda300::SpeakerMiranda300(): VisualSpeaker() {
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index e6a805f31b..b8ad17886a 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -59,6 +59,8 @@ public:
 	virtual void setText(const Common::String &msg);
 	virtual void proc15() {}
 	virtual void proc16();
+
+	void setDelay(int delay);
 };
 
 class SpeakerMiranda300 : public VisualSpeaker {
-- 
cgit v1.2.3


From fb66ae3698f75ccfd7ac541b85e1646596fca968 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 13 Dec 2011 10:36:50 +0100
Subject: DREAMWEB: Fix regression in selecSlot

---
 engines/dreamweb/stubs.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 6dc74b7309..a7d65845e1 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4488,15 +4488,12 @@ void DreamGenContext::selectSlot() {
 		data.byte(kLoadingorsave)--;
 
 	oldToNames();
-	uint16 y = data.word(kMousey) - (kOpsy + 4);
-	byte currentSlot = (byte)-1;
-
-	do {
-		currentSlot++;
-		y -= 11;
-	} while (y >= 11);
+	int y = data.word(kMousey) - (kOpsy + 4);
+	if (y < 11)
+		data.byte(kCurrentslot) = 0;
+	else
+		data.byte(kCurrentslot) = y / 11;
 
-	data.byte(kCurrentslot) = currentSlot;
 	delPointer();
 	showOpBox();
 	showSlots();
-- 
cgit v1.2.3


From a1dfacb4c9df35928372db4472dba117e72e2590 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 13 Dec 2011 20:49:42 +1100
Subject: TSAGE: Implement missing doorway code in R2R scene 300

---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 20 +++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  7 ++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 214853ce86..4a0443e798 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1707,6 +1707,25 @@ bool Scene300::Quinn::startAction(CursorType action, Event &event) {
 	}
 }
 
+bool Scene300::Doorway::startAction(CursorType action, Event &event) {
+	Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action == CURSOR_USE) {
+		if ((R2_GLOBALS._player._characterIndex == R2_QUINN) && 
+				(!R2_GLOBALS.getFlag(44) || R2_GLOBALS._player._characterScene[R2_MIRANDA] == 500)) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 301;
+			scene->setAction(&scene->_sequenceManager1, scene, 301, &R2_GLOBALS._player, this, NULL);
+		} else {
+			SceneItem::display2(300, 45);
+		}
+		
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
 /*--------------------------------------------------------------------------*/
 
 Scene300::Scene300(): SceneExt() {
@@ -1769,7 +1788,6 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 	_object4.postInit();
 	_object4.setup(300, 5, 1);
 	_object4.setPosition(Common::Point(236, 48));
-
 	_object4.animate(ANIM_MODE_2, NULL);
 
 	_protocolDisplay.postInit();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 834b91c01c..be07a4064b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -240,6 +240,10 @@ class Scene300: public SceneExt {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
+	class Doorway: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
 public:
 	SequenceManager _sequenceManager1, _sequenceManager2, _sequenceManager3, _sequenceManager4;
 	ASoundExt _sound1;
@@ -258,7 +262,8 @@ public:
 	MirandaWorkstation _mirandaWorkstation1, _mirandaWorkstation2;
 	SceneActor _object1, _object2, _object3, _object4, _protocolDisplay;
 	SceneActor _object6, _object7, _object8, _object9;
-	SceneActor _teal, _soldier, _object12, _doorway;
+	SceneActor _teal, _soldier, _object12;
+	Doorway _doorway;
 	Miranda _miranda;
 	Seeker _seeker;
 	Quinn _quinn;
-- 
cgit v1.2.3


From a4f74ddf8a98a1a6c37ea415ab7d19f12cd8d3d5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 13 Dec 2011 21:46:24 +1100
Subject: TSAGE: Clarified some hotspot names in R2R Scene 100, and created
 derived Scene 150

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   4 +-
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 149 +++++++++++++++++++-----
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  17 ++-
 3 files changed, 136 insertions(+), 34 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 296da52da5..f86bab3a87 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -42,8 +42,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 100: return new Scene100();
 	// Computer console
 	case 125: return new Scene125();
-	//
-	case 150:
+	// Empty Bedroom
+	case 150: return new Scene150();
 	case 160:
 	case 175:
 	case 180:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 4a0443e798..661a52d601 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -94,11 +94,11 @@ bool Scene100::Door::startAction(CursorType action, Event &event) {
 		if (_state) {
 			SceneItem::display2(100, 26);
 			_state = 0;
-			scene->_object10.setFrame(1);
+			scene->_doorDisplay.setFrame(1);
 		} else {
 			SceneItem::display2(100, 27);
 			_state = 1;
-			scene->_object10.setFrame(2);
+			scene->_doorDisplay.setFrame(2);
 		}
 		return true;
 	default:
@@ -176,7 +176,7 @@ bool Scene100::StasisNegator::startAction(CursorType action, Event &event) {
 	}
 }
 
-bool Scene100::Object10::startAction(CursorType action, Event &event) {
+bool Scene100::DoorDisplay::startAction(CursorType action, Event &event) {
 	Scene100 *scene = (Scene100 *)R2_GLOBALS._sceneManager._scene;
 
 	switch (action) {
@@ -242,34 +242,35 @@ void Scene100::postInit(SceneObjectList *OwnerList) {
 	_door.setPosition(Common::Point(160, 84));
 	_door.setDetails(100, 3, 4, 5, 1, NULL);
 
-	_object10.postInit();
-	_object10.setup(100, 2, 1);
-	_object10.setDetails(100, -1, -1, -1, 1, NULL);
+	_doorDisplay.postInit();
+	_doorDisplay.setup(100, 2, 1);
+	_doorDisplay.setPosition(Common::Point(202, 53));
+	_doorDisplay.setDetails(100, -1, -1, -1, 1, NULL);
 
 	_table.postInit();
 	_table.setup(100, 2, 3);
 	_table.setPosition(Common::Point(175, 157));
 	_table.setDetails(100, 17, 18, 20, 1, NULL);
 
-	_object1.postInit();
-	_object1.setup(100, 3, 1);
-	_object1.setPosition(Common::Point(89, 79));
-	_object1.fixPriority(250);
-	_object1.animate(ANIM_MODE_2, NULL);
-	_object1._numFrames = 3;
-
-	_object2.postInit();
-	_object2.setup(100, 3, 1);
-	_object2.setPosition(Common::Point(89, 147));
-	_object2.fixPriority(250);
-	_object2.animate(ANIM_MODE_7, 0, NULL); 
-	_object2._numFrames = 3;
-
-	_object6.postInit();
-	_object6.setVisage(101);
-	_object6.setPosition(Common::Point(231, 126));
-	_object6.fixPriority(10);
-	_object6.setDetails(100, 37, -1, 39, 1, NULL);
+	_bedLights1.postInit();
+	_bedLights1.setup(100, 3, 1);
+	_bedLights1.setPosition(Common::Point(89, 79));
+	_bedLights1.fixPriority(250);
+	_bedLights1.animate(ANIM_MODE_2, NULL);
+	_bedLights1._numFrames = 3;
+
+	_bedLights2.postInit();
+	_bedLights2.setup(100, 3, 1);
+	_bedLights2.setPosition(Common::Point(89, 147));
+	_bedLights2.fixPriority(250);
+	_bedLights2.animate(ANIM_MODE_7, 0, NULL); 
+	_bedLights2._numFrames = 3;
+
+	_wardrobe.postInit();
+	_wardrobe.setVisage(101);
+	_wardrobe.setPosition(Common::Point(231, 126));
+	_wardrobe.fixPriority(10);
+	_wardrobe.setDetails(100, 37, -1, 39, 1, NULL);
 
 	if (R2_INVENTORY.getObjectScene(R2_STEPPING_DISKS) == 100) {
 		_steppingDisks.postInit();
@@ -296,7 +297,7 @@ void Scene100::postInit(SceneObjectList *OwnerList) {
 		_object5.postInit();
 		_object4.postInit();
 		_sceneMode = 104;
-		setAction(&_sequenceManager1, this, 104, &R2_GLOBALS._player, &_object6, &_object4, &_object5, NULL);
+		setAction(&_sequenceManager1, this, 104, &R2_GLOBALS._player, &_wardrobe, &_object4, &_object5, NULL);
 		break;
 	case 125:
 		_sceneMode = 100;
@@ -356,10 +357,10 @@ void Scene100::signal() {
 	case 110:
 		if (_door._state) {
 			_door._state = 0;
-			_object10.setFrame(1);
+			_doorDisplay.setFrame(1);
 		} else {
 			_door._state = 1;
-			_object10.setFrame(2);
+			_doorDisplay.setFrame(2);
 		}
 		R2_GLOBALS._player.enableControl();
 		break;
@@ -1198,6 +1199,98 @@ Common::String Scene125::parseMessage(const Common::String &msg) {
 	return Common::String(msgP);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 150 - Empty Bedroom
+ *
+ *--------------------------------------------------------------------------*/
+
+/*--------------------------------------------------------------------------*/
+
+void Scene150::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(100);
+
+	_door.postInit();
+	_door._state = 0;
+	_door.setVisage(100);
+	_door.setPosition(Common::Point(160, 84));
+	_door.setDetails(100, 3, -1, -1, 1, NULL);
+
+	_doorDisplay.postInit();
+	_doorDisplay.setup(100, 2, 1);
+	_doorDisplay.setPosition(Common::Point(202, 53));
+	_doorDisplay.setDetails(100, -1, -1, -1, 1, NULL);
+
+	_emptyRoomTable.postInit();
+	_emptyRoomTable.setVisage(100);
+	_emptyRoomTable.setStrip(4);
+	_emptyRoomTable.setFrame(1);
+	_emptyRoomTable.setPosition(Common::Point(175, 157));
+	_emptyRoomTable.setDetails(150, 3, 4, 5, 1, NULL);
+
+	_wardrobe.postInit();
+	_wardrobe.setVisage(101);
+	_wardrobe.setPosition(Common::Point(231, 126));
+	_wardrobe.fixPriority(10);
+	_wardrobe.setDetails(100, 37, -1, 39, 1, NULL);
+
+	_terminal.setDetails(11, 100, 14, 15, 16);
+	_desk.setDetails(12, 100, 11, -1, 13);
+	_bed.setDetails(13, 100, 8, 9, 10);
+	_duct.setDetails(14, 100, 34, -1, 36);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setVisage(10);
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.disableControl();
+	
+	_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 150, 0, 1, -1, 1, NULL);
+	_sceneMode = 100;
+
+	switch (R2_GLOBALS._sceneManager._previousScene) {
+	case 100:
+		setAction(&_sequenceManager1, this, 106, &R2_GLOBALS._player, NULL);
+		break;
+	case 200:
+		setAction(&_sequenceManager1, this, 100, &R2_GLOBALS._player, &_door, NULL);
+		break;
+	default:
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.setPosition(Common::Point(180, 100));
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
+void Scene150::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene150::signal() {
+	switch (_sceneMode) {
+	case 101:
+		R2_GLOBALS._sceneManager.changeScene(200);
+		break;
+	case 105:
+		R2_GLOBALS._sceneManager.changeScene(125);
+		break;
+	case 110:
+		if (_door._state) {
+			_door._state = 0;
+			_doorDisplay.setFrame(1);
+		} else {
+			_door._state = 1;
+			_doorDisplay.setFrame(2);
+		}
+		R2_GLOBALS._player.enableControl();
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 /*--------------------------------------------------------------------------
  * Scene 200 - Ship Corridor
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index be07a4064b..5b3123b37f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -67,7 +67,7 @@ class Scene100: public SceneExt {
 	public:
 		bool startAction(CursorType action, Event &event);
 	};
-	class Object10: public SceneActorExt {
+	class DoorDisplay: public SceneActorExt {
 	public:
 		bool startAction(CursorType action, Event &event);
 	};
@@ -85,12 +85,12 @@ class Scene100: public SceneExt {
 public:
 	NamedHotspot _background, _duct, _bed, _desk;
 	Terminal _terminal;
-	SceneActor _object1, _object2, _object3, _object4, _object5;
-	SceneActor _object6;
+	SceneActor _bedLights1, _bedLights2, _object3, _object4, _object5;
+	SceneActor _wardrobe;
 	Door _door;
 	Table _table;
 	StasisNegator _stasisNegator;
-	Object10 _object10;
+	DoorDisplay _doorDisplay;
 	SteppingDisks _steppingDisks;
 	SequenceManager _sequenceManager1, _sequenceManager2;
 
@@ -157,6 +157,15 @@ public:
 	Common::String parseMessage(const Common::String &msg);
 };
 
+class Scene150: public Scene100 {
+public:
+	SceneActor _emptyRoomTable;
+public:
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+};
+
 class Scene200: public SceneExt {
 	/* Objects */
 	class NorthDoor: public SceneActor {
-- 
cgit v1.2.3


From efa52cb79c35a78e624f42e4ab919c6016bdadcf Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 13 Dec 2011 16:15:04 +0100
Subject: KYRA: Fix for bug #3459000 "KYRA1CD: Accented characters overdrawn in
 introduction".

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

(limited to 'engines')

diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp
index 531d864293..1bdcde5177 100644
--- a/engines/kyra/seqplayer.cpp
+++ b/engines/kyra/seqplayer.cpp
@@ -624,7 +624,7 @@ bool SeqPlayer::playSequence(const uint8 *seqData, bool skipSeq) {
 				if (_vm->gameFlags().lang == Common::JA_JPN)
 					charStr[1] = _vm->seqTextsTable()[_seqDisplayedText][++_seqDisplayedChar];
 				_screen->printText(charStr, _seqDisplayedTextX, 180, 0xF, 0xC);
-				_seqDisplayedTextX += _screen->getCharWidth(charStr[0]);
+				_seqDisplayedTextX += _screen->getCharWidth((uint8)charStr[0]);
 				++_seqDisplayedChar;
 
 				if (_vm->seqTextsTable()[_seqDisplayedText][_seqDisplayedChar] == '\0')
-- 
cgit v1.2.3


From 77959acd51982d9fedec94ac07241b1702681c6a Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 13 Dec 2011 16:17:06 +0100
Subject: KYRA: Cast char to uint8 before passing it to getCharWidth.

This assures getCharWidth really gets the character number and now sign
extended version of it in case char is signed.
---
 engines/kyra/sequences_hof.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index 50b5db78fc..b27f0df137 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -2622,7 +2622,7 @@ void KyraEngine_HoF::seq_displayScrollText(uint8 *data, const ScreenDim *d, int
 						while (*str2) {
 							cChar[0] = *str2;
 							_screen->printText(cChar, x, y, col1++, 0);
-							x += _screen->getCharWidth(*str2++);
+							x += _screen->getCharWidth((uint8)*str2++);
 						}
 						palCycle = true;
 					} else if (!strcmp(str, specialData[1])) {
@@ -2631,7 +2631,7 @@ void KyraEngine_HoF::seq_displayScrollText(uint8 *data, const ScreenDim *d, int
 						while (*str2) {
 							cChar[0] = *str2;
 							_screen->printText(cChar, x, y, col1--, 0);
-							x += _screen->getCharWidth(*str2++);
+							x += _screen->getCharWidth((uint8)*str2++);
 						}
 						palCycle = true;
 					} else {
-- 
cgit v1.2.3


From a6ec4f70da120a1ce406ed4dd9e149e081542f59 Mon Sep 17 00:00:00 2001
From: Andrea Corna
Date: Tue, 13 Dec 2011 17:20:25 +0100
Subject: COMMON: Make more members of Archive constant.

---
 engines/agos/installshield_cab.cpp   | 12 ++++++------
 engines/kyra/resource_intern.cpp     | 18 +++++++++---------
 engines/kyra/resource_intern.h       | 18 +++++++++---------
 engines/lastexpress/data/archive.cpp |  6 +++---
 engines/lastexpress/data/archive.h   |  6 +++---
 engines/lastexpress/resource.cpp     | 10 +++++-----
 engines/lastexpress/resource.h       |  6 +++---
 engines/mohawk/installer_archive.cpp |  6 +++---
 engines/mohawk/installer_archive.h   |  6 +++---
 engines/parallaction/disk_ns.cpp     | 14 +++++++-------
 10 files changed, 51 insertions(+), 51 deletions(-)

(limited to 'engines')

diff --git a/engines/agos/installshield_cab.cpp b/engines/agos/installshield_cab.cpp
index ac4e40d1d1..d4e636f7b3 100644
--- a/engines/agos/installshield_cab.cpp
+++ b/engines/agos/installshield_cab.cpp
@@ -60,9 +60,9 @@ public:
 	~InstallShieldCabinet();
 
 	// Common::Archive API implementation
-	bool hasFile(const Common::String &name);
-	int listMembers(Common::ArchiveMemberList &list);
-	Common::ArchiveMemberPtr getMember(const Common::String &name);
+	bool hasFile(const Common::String &name) const;
+	int listMembers(Common::ArchiveMemberList &list) const;
+	const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
 	Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
 
 private:
@@ -161,18 +161,18 @@ InstallShieldCabinet::InstallShieldCabinet(const Common::String &filename) : _in
 	delete[] fileTableOffsets;
 }
 
-bool InstallShieldCabinet::hasFile(const Common::String &name) {
+bool InstallShieldCabinet::hasFile(const Common::String &name) const {
 	return _map.contains(name);
 }
 
-int InstallShieldCabinet::listMembers(Common::ArchiveMemberList &list) {
+int InstallShieldCabinet::listMembers(Common::ArchiveMemberList &list) const {
 	for (FileMap::const_iterator it = _map.begin(); it != _map.end(); it++)
 		list.push_back(getMember(it->_key));
 
 	return _map.size();
 }
 
-Common::ArchiveMemberPtr InstallShieldCabinet::getMember(const Common::String &name) {
+const Common::ArchiveMemberPtr InstallShieldCabinet::getMember(const Common::String &name) const {
 	return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, this));
 }
 
diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp
index 482bd1a5d6..f9aae2c550 100644
--- a/engines/kyra/resource_intern.cpp
+++ b/engines/kyra/resource_intern.cpp
@@ -37,11 +37,11 @@ PlainArchive::PlainArchive(Common::ArchiveMemberPtr file)
 	: _file(file), _files() {
 }
 
-bool PlainArchive::hasFile(const Common::String &name) {
+bool PlainArchive::hasFile(const Common::String &name) const {
 	return (_files.find(name) != _files.end());
 }
 
-int PlainArchive::listMembers(Common::ArchiveMemberList &list) {
+int PlainArchive::listMembers(Common::ArchiveMemberList &list) const {
 	int count = 0;
 
 	for (FileMap::const_iterator i = _files.begin(); i != _files.end(); ++i) {
@@ -52,7 +52,7 @@ int PlainArchive::listMembers(Common::ArchiveMemberList &list) {
 	return count;
 }
 
-Common::ArchiveMemberPtr PlainArchive::getMember(const Common::String &name) {
+const Common::ArchiveMemberPtr PlainArchive::getMember(const Common::String &name) const {
 	if (!hasFile(name))
 		return Common::ArchiveMemberPtr();
 
@@ -92,11 +92,11 @@ TlkArchive::~TlkArchive() {
 	delete[] _fileEntries;
 }
 
-bool TlkArchive::hasFile(const Common::String &name) {
+bool TlkArchive::hasFile(const Common::String &name) const {
 	return (findFile(name) != 0);
 }
 
-int TlkArchive::listMembers(Common::ArchiveMemberList &list) {
+int TlkArchive::listMembers(Common::ArchiveMemberList &list) const {
 	uint count = 0;
 
 	for (; count < _entryCount; ++count) {
@@ -107,7 +107,7 @@ int TlkArchive::listMembers(Common::ArchiveMemberList &list) {
 	return count;
 }
 
-Common::ArchiveMemberPtr TlkArchive::getMember(const Common::String &name) {
+const Common::ArchiveMemberPtr TlkArchive::getMember(const Common::String &name) const {
 	if (!hasFile(name))
 		return Common::ArchiveMemberPtr();
 
@@ -186,11 +186,11 @@ CachedArchive::~CachedArchive() {
 	_files.clear();
 }
 
-bool CachedArchive::hasFile(const Common::String &name) {
+bool CachedArchive::hasFile(const Common::String &name) const {
 	return (_files.find(name) != _files.end());
 }
 
-int CachedArchive::listMembers(Common::ArchiveMemberList &list) {
+int CachedArchive::listMembers(Common::ArchiveMemberList &list) const {
 	int count = 0;
 
 	for (FileMap::const_iterator i = _files.begin(); i != _files.end(); ++i) {
@@ -201,7 +201,7 @@ int CachedArchive::listMembers(Common::ArchiveMemberList &list) {
 	return count;
 }
 
-Common::ArchiveMemberPtr CachedArchive::getMember(const Common::String &name) {
+const Common::ArchiveMemberPtr CachedArchive::getMember(const Common::String &name) const {
 	if (!hasFile(name))
 		return Common::ArchiveMemberPtr();
 
diff --git a/engines/kyra/resource_intern.h b/engines/kyra/resource_intern.h
index 03c9d871e8..9d9574d823 100644
--- a/engines/kyra/resource_intern.h
+++ b/engines/kyra/resource_intern.h
@@ -49,9 +49,9 @@ public:
 	Entry getFileEntry(const Common::String &name) const;
 
 	// Common::Archive API implementation
-	bool hasFile(const Common::String &name);
-	int listMembers(Common::ArchiveMemberList &list);
-	Common::ArchiveMemberPtr getMember(const Common::String &name);
+	bool hasFile(const Common::String &name) const;
+	int listMembers(Common::ArchiveMemberList &list) const;
+	const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
 	Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
 private:
 	typedef Common::HashMap<Common::String, Entry, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> FileMap;
@@ -65,9 +65,9 @@ public:
 	TlkArchive(Common::ArchiveMemberPtr file, uint16 entryCount, const uint32 *fileEntries);
 	~TlkArchive();
 
-	bool hasFile(const Common::String &name);
-	int listMembers(Common::ArchiveMemberList &list);
-	Common::ArchiveMemberPtr getMember(const Common::String &name);
+	bool hasFile(const Common::String &name) const;
+	int listMembers(Common::ArchiveMemberList &list) const;
+	const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
 	Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
 private:
 	Common::ArchiveMemberPtr _file;
@@ -92,9 +92,9 @@ public:
 	CachedArchive(const FileInputList &files);
 	~CachedArchive();
 
-	bool hasFile(const Common::String &name);
-	int listMembers(Common::ArchiveMemberList &list);
-	Common::ArchiveMemberPtr getMember(const Common::String &name);
+	bool hasFile(const Common::String &name) const;
+	int listMembers(Common::ArchiveMemberList &list) const;
+	const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
 	Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
 private:
 	struct Entry {
diff --git a/engines/lastexpress/data/archive.cpp b/engines/lastexpress/data/archive.cpp
index 3aa5584ca4..908d58254a 100644
--- a/engines/lastexpress/data/archive.cpp
+++ b/engines/lastexpress/data/archive.cpp
@@ -74,11 +74,11 @@ HPFArchive::HPFArchive(const Common::String &path) {
 	delete archive;
 }
 
-bool HPFArchive::hasFile(const Common::String &name) {
+bool HPFArchive::hasFile(const Common::String &name) const {
 	return (_files.find(name) != _files.end());
 }
 
-int HPFArchive::listMembers(Common::ArchiveMemberList &list) {
+int HPFArchive::listMembers(Common::ArchiveMemberList &list) const {
 	int numMembers = 0;
 
 	for (FileMap::const_iterator i = _files.begin(); i != _files.end(); ++i) {
@@ -89,7 +89,7 @@ int HPFArchive::listMembers(Common::ArchiveMemberList &list) {
 	return numMembers;
 }
 
-Common::ArchiveMemberPtr HPFArchive::getMember(const Common::String &name) {
+const Common::ArchiveMemberPtr HPFArchive::getMember(const Common::String &name) const {
 	if (!hasFile(name))
 		return Common::ArchiveMemberPtr();
 
diff --git a/engines/lastexpress/data/archive.h b/engines/lastexpress/data/archive.h
index 8e0c46f183..011c830668 100644
--- a/engines/lastexpress/data/archive.h
+++ b/engines/lastexpress/data/archive.h
@@ -46,9 +46,9 @@ class HPFArchive : public Common::Archive {
 public:
 	HPFArchive(const Common::String &path);
 
-	bool hasFile(const Common::String &name);
-	int listMembers(Common::ArchiveMemberList &list);
-	Common::ArchiveMemberPtr getMember(const Common::String &name);
+	bool hasFile(const Common::String &name) const;
+	int listMembers(Common::ArchiveMemberList &list) const;
+	const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
 	Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
 
 	int count() { return _files.size(); }
diff --git a/engines/lastexpress/resource.cpp b/engines/lastexpress/resource.cpp
index 3910aaa010..ee4885e34e 100644
--- a/engines/lastexpress/resource.cpp
+++ b/engines/lastexpress/resource.cpp
@@ -148,8 +148,8 @@ Common::SeekableReadStream *ResourceManager::getFileStream(const Common::String
 //////////////////////////////////////////////////////////////////////////
 // Archive functions
 //////////////////////////////////////////////////////////////////////////
-bool ResourceManager::hasFile(const Common::String &name) {
-	for (Common::Array<HPFArchive *>::iterator it = _archives.begin(); it != _archives.end(); ++it) {
+bool ResourceManager::hasFile(const Common::String &name) const {
+	for (Common::Array<HPFArchive *>::const_iterator it = _archives.begin(); it != _archives.end(); ++it) {
 		if ((*it)->hasFile(name))
 			return true;
 	}
@@ -157,10 +157,10 @@ bool ResourceManager::hasFile(const Common::String &name) {
 	return false;
 }
 
-int ResourceManager::listMembers(Common::ArchiveMemberList &list) {
+int ResourceManager::listMembers(Common::ArchiveMemberList &list) const {
 	int count = 0;
 
-	for (Common::Array<HPFArchive *>::iterator it = _archives.begin(); it != _archives.end(); ++it) {
+	for (Common::Array<HPFArchive *>::const_iterator it = _archives.begin(); it != _archives.end(); ++it) {
 
 		Common::ArchiveMemberList members;
 		count += (*it)->listMembers(members);
@@ -171,7 +171,7 @@ int ResourceManager::listMembers(Common::ArchiveMemberList &list) {
 	return count;
 }
 
-Common::ArchiveMemberPtr ResourceManager::getMember(const Common::String &name) {
+const Common::ArchiveMemberPtr ResourceManager::getMember(const Common::String &name) const {
 	if (!hasFile(name))
 		return Common::ArchiveMemberPtr();
 
diff --git a/engines/lastexpress/resource.h b/engines/lastexpress/resource.h
index 9e05a90399..f2f5d63bce 100644
--- a/engines/lastexpress/resource.h
+++ b/engines/lastexpress/resource.h
@@ -45,9 +45,9 @@ public:
 	Common::SeekableReadStream *getFileStream(const Common::String &name);
 
 	// Archive functions
-	bool hasFile(const Common::String &name);
-	int listMembers(Common::ArchiveMemberList &list);
-	Common::ArchiveMemberPtr getMember(const Common::String &name);
+	bool hasFile(const Common::String &name) const;
+	int listMembers(Common::ArchiveMemberList &list) const;
+	const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
 	Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
 
 	// Resource loading
diff --git a/engines/mohawk/installer_archive.cpp b/engines/mohawk/installer_archive.cpp
index 83796158a6..636b7ae476 100644
--- a/engines/mohawk/installer_archive.cpp
+++ b/engines/mohawk/installer_archive.cpp
@@ -107,18 +107,18 @@ void InstallerArchive::close() {
 	_map.clear();
 }
 
-bool InstallerArchive::hasFile(const Common::String &name) {
+bool InstallerArchive::hasFile(const Common::String &name) const {
 	return _map.contains(name);
 }
 
-int InstallerArchive::listMembers(Common::ArchiveMemberList &list) {
+int InstallerArchive::listMembers(Common::ArchiveMemberList &list) const {
 	for (FileMap::const_iterator it = _map.begin(); it != _map.end(); it++)
 		list.push_back(getMember(it->_key));
 
 	return _map.size();
 }
 
-Common::ArchiveMemberPtr InstallerArchive::getMember(const Common::String &name) {
+const Common::ArchiveMemberPtr InstallerArchive::getMember(const Common::String &name) const {
 	return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, this));
 }
 
diff --git a/engines/mohawk/installer_archive.h b/engines/mohawk/installer_archive.h
index 27877d69f9..89d2d85f8d 100644
--- a/engines/mohawk/installer_archive.h
+++ b/engines/mohawk/installer_archive.h
@@ -43,9 +43,9 @@ public:
 	bool isOpen() const { return _stream != 0; }
 
 	// Common::Archive API implementation
-	bool hasFile(const Common::String &name);
-	int listMembers(Common::ArchiveMemberList &list);
-	Common::ArchiveMemberPtr getMember(const Common::String &name);
+	bool hasFile(const Common::String &name) const;
+	int listMembers(Common::ArchiveMemberList &list) const;
+	const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
 	Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
 
 private:
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index 05ea60f510..e145743f09 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -73,9 +73,9 @@ public:
 	~NSArchive();
 
 	Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
-	bool hasFile(const Common::String &name);
-	int listMembers(Common::ArchiveMemberList &list);
-	Common::ArchiveMemberPtr getMember(const Common::String &name);
+	bool hasFile(const Common::String &name) const;
+	int listMembers(Common::ArchiveMemberList &list) const;
+	const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
 };
 
 
@@ -137,23 +137,23 @@ Common::SeekableReadStream *NSArchive::createReadStreamForMember(const Common::S
 	return new Common::SeekableSubReadStream(_stream, offset, endOffset, DisposeAfterUse::NO);
 }
 
-bool NSArchive::hasFile(const Common::String &name) {
+bool NSArchive::hasFile(const Common::String &name) const {
 	if (name.empty())
 		return false;
 	return lookup(name.c_str()) != _numFiles;
 }
 
-int NSArchive::listMembers(Common::ArchiveMemberList &list) {
+int NSArchive::listMembers(Common::ArchiveMemberList &list) const {
 	for (uint32 i = 0; i < _numFiles; i++) {
 		list.push_back(Common::SharedPtr<Common::GenericArchiveMember>(new Common::GenericArchiveMember(_archiveDir[i], this)));
 	}
 	return _numFiles;
 }
 
-Common::ArchiveMemberPtr NSArchive::getMember(const Common::String &name) {
+const Common::ArchiveMemberPtr NSArchive::getMember(const Common::String &name) const {
 	uint32 index = lookup(name.c_str());
 
-	char *item = 0;
+	const char *item = 0;
 	if (index < _numFiles) {
 		item = _archiveDir[index];
 	}
-- 
cgit v1.2.3


From f9419db947a8d1cb42ee389b377c7ec6030ad9dd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 13 Dec 2011 22:39:34 +0200
Subject: DREAMWEB: Port 'bartender' and 'receptionist' to C++

---
 engines/dreamweb/dreamgen.cpp | 81 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  2 --
 engines/dreamweb/people.cpp   | 66 ++++++++++++++++++++++++++++++++---
 engines/dreamweb/stubs.h      |  2 ++
 4 files changed, 64 insertions(+), 87 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 63942575bf..83b86f9d51 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -26,87 +26,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::receptionist() {
-	STACK_CHECK;
-	checkSpeed();
-	if (!flags.z())
-		goto gotrecep;
-	_cmp(data.byte(kCardpassflag), 1);
-	if (!flags.z())
-		goto notsetcard;
-	_inc(data.byte(kCardpassflag));
-	es.byte(bx+7) = 1;
-	es.word(bx+3) = 64;
-notsetcard:
-	_cmp(es.word(bx+3), 58);
-	if (!flags.z())
-		goto notdes1;
-	randomNumber();
-	_cmp(al, 30);
-	if (flags.c())
-		goto notdes2;
-	es.word(bx+3) = 55;
-	goto gotrecep;
-notdes1:
-	_cmp(es.word(bx+3), 60);
-	if (!flags.z())
-		goto notdes2;
-	randomNumber();
-	_cmp(al, 240);
-	if (flags.c())
-		goto gotrecep;
-	es.word(bx+3) = 53;
-	goto gotrecep;
-notdes2:
-	_cmp(es.word(bx+3), 88);
-	if (!flags.z())
-		goto notendcard;
-	es.word(bx+3) = 53;
-	goto gotrecep;
-notendcard:
-	_inc(es.word(bx+3));
-gotrecep:
-	showGameReel();
-	addToPeopleList();
-	al = es.byte(bx+7);
-	_and(al, 128);
-	if (flags.z())
-		return /* (nottalkedrecep) */;
-	data.byte(kTalkedtorecep) = 1;
-}
-
-void DreamGenContext::bartender() {
-	STACK_CHECK;
-	checkSpeed();
-	if (!flags.z())
-		goto gotsmoket;
-	_cmp(es.word(bx+3), 86);
-	if (!flags.z())
-		goto notsmoket1;
-	randomNumber();
-	_cmp(al, 18);
-	if (flags.c())
-		goto notsmoket2;
-	es.word(bx+3) = 81;
-	goto gotsmoket;
-notsmoket1:
-	_cmp(es.word(bx+3), 103);
-	if (!flags.z())
-		goto notsmoket2;
-	es.word(bx+3) = 81;
-	goto gotsmoket;
-notsmoket2:
-	_inc(es.word(bx+3));
-gotsmoket:
-	showGameReel();
-	_cmp(data.byte(kGunpassflag), 1);
-	if (!flags.z())
-		goto notgotgun;
-	es.byte(bx+7) = 9;
-notgotgun:
-	addToPeopleList();
-}
-
 void DreamGenContext::helicopter() {
 	STACK_CHECK;
 	ax = es.word(bx+3);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index b7fb2495c5..a8e8a610fd 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -499,7 +499,6 @@ public:
 	void adjustUp();
 	void fadeScreenDownHalf();
 	void fadeDownMon();
-	void bartender();
 	void outOfOpen();
 	void dirCom();
 	void endGameSeq();
@@ -523,7 +522,6 @@ public:
 	void findInvPos();
 	void getKeyAndLogo();
 	void selectOb();
-	void receptionist();
 	void fadeUpMon();
 	void showDiaryPage();
 	void reExFromInv();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 84f6543a19..caaea26d0d 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -29,13 +29,13 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
-	&DreamGenContext::receptionist, NULL,
+	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
 	&DreamGenContext::heavy, NULL,
 	NULL, NULL,
-	&DreamGenContext::bartender, NULL,
+	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
@@ -61,13 +61,13 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
 	&DreamGenContext::eden, &DreamGenContext::edenInBath,
 	&DreamGenContext::sparky, &DreamGenContext::smokeBloke,
 	&DreamGenContext::manAsleep, &DreamGenContext::drunk,
-	/*&DreamGenContext::receptionist*/NULL, &DreamGenContext::genericPerson /*maleFan*/,
+	&DreamGenContext::receptionist, &DreamGenContext::genericPerson /*maleFan*/,
 	&DreamGenContext::genericPerson /*femaleFan*/, &DreamGenContext::louis,
 	&DreamGenContext::louisChair, &DreamGenContext::soldier1,
 	&DreamGenContext::bossMan, &DreamGenContext::interviewer,
 	/*&DreamGenContext::heavy*/NULL, &DreamGenContext::manAsleep /*manAsleep2*/,
 	&DreamGenContext::genericPerson /*manSatStill*/, &DreamGenContext::drinker,
-	/*&DreamGenContext::bartender*/NULL, &DreamGenContext::genericPerson /*otherSmoker*/,
+	&DreamGenContext::bartender, &DreamGenContext::genericPerson /*otherSmoker*/,
 	&DreamGenContext::genericPerson /*tattooMan*/, &DreamGenContext::attendant,
 	&DreamGenContext::keeper, &DreamGenContext::candles1,
 	&DreamGenContext::smallCandle, &DreamGenContext::security,
@@ -777,4 +777,62 @@ void DreamGenContext::soldier1(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
+void DreamGenContext::receptionist(ReelRoutine &routine) {
+	if (checkSpeed(routine)) {
+		if (data.byte(kCardpassflag) == 1) {
+			// Set card
+			data.byte(kCardpassflag)++;
+			routine.b7 = 1;
+			routine.b3 = 64;
+		}
+
+		if (routine.b3 != 58) {
+			// notdes1
+			if (routine.b3 != 60) {
+				// notdes2
+				if (routine.b3 != 88)
+					routine.b3++;	// not end card
+				else
+					routine.b3 = 53;
+			} else if (engine->randomNumber() >= 240) {
+				routine.b3 = 53;
+			}
+		} else if (engine->randomNumber() >= 30) {
+			routine.b3 = 55;
+		} else {
+			// notdes2
+			if (routine.b3 != 88)
+				routine.b3++;	// not end card
+			else
+				routine.b3 = 53;
+		}
+	}
+
+	showGameReel(&routine);
+	addToPeopleList(&routine);
+	if (routine.b7 & 128)
+		data.byte(kTalkedtorecep) = 1;
+}
+
+void DreamGenContext::bartender(ReelRoutine &routine) {
+	if (checkSpeed(routine)) {
+		if (routine.b3 == 86) {
+			if (engine->randomNumber() >= 18)
+				routine.b3 = 81;
+			else
+				routine.b3++;	// notsmoket2
+		} else if (routine.b3 == 103) {
+			routine.b3 = 81;	// notsmoket1
+		} else {
+			routine.b3++;	// notsmoket2
+		}
+	}
+
+	showGameReel(&routine);
+	if (data.byte(kGunpassflag) == 1)
+		routine.b7 = 9;	// got gun
+
+	addToPeopleList(&routine);
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 6a8445b991..5256111cc1 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -417,6 +417,8 @@
 	void introMonks1(ReelRoutine &routine);
 	void introMonks2(ReelRoutine &routine);
 	void soldier1(ReelRoutine &routine);
+	void receptionist(ReelRoutine &routine);
+	void bartender(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void loadSaveBox();
 	void loadKeypad();
-- 
cgit v1.2.3


From 9042f85ef3da49893f0c595476abf4602c794fdf Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 13 Dec 2011 23:04:26 +0200
Subject: DREAMWEB: Fix regression in bartender() and receptionist()

---
 engines/dreamweb/people.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index caaea26d0d..99e382f325 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -783,28 +783,28 @@ void DreamGenContext::receptionist(ReelRoutine &routine) {
 			// Set card
 			data.byte(kCardpassflag)++;
 			routine.b7 = 1;
-			routine.b3 = 64;
+			routine.setReelPointer(64);
 		}
 
-		if (routine.b3 != 58) {
+		if (routine.reelPointer() != 58) {
 			// notdes1
-			if (routine.b3 != 60) {
+			if (routine.reelPointer() != 60) {
 				// notdes2
-				if (routine.b3 != 88)
-					routine.b3++;	// not end card
+				if (routine.reelPointer() != 88)
+					routine.incReelPointer();	// not end card
 				else
-					routine.b3 = 53;
+					routine.setReelPointer(53);
 			} else if (engine->randomNumber() >= 240) {
-				routine.b3 = 53;
+				routine.setReelPointer(53);
 			}
 		} else if (engine->randomNumber() >= 30) {
-			routine.b3 = 55;
+			routine.setReelPointer(55);
 		} else {
 			// notdes2
-			if (routine.b3 != 88)
-				routine.b3++;	// not end card
+			if (routine.reelPointer() != 88)
+				routine.incReelPointer();	// not end card
 			else
-				routine.b3 = 53;
+				routine.setReelPointer(53);
 		}
 	}
 
@@ -816,15 +816,15 @@ void DreamGenContext::receptionist(ReelRoutine &routine) {
 
 void DreamGenContext::bartender(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
-		if (routine.b3 == 86) {
+		if (routine.reelPointer() == 86) {
 			if (engine->randomNumber() >= 18)
-				routine.b3 = 81;
+				routine.setReelPointer(81);
 			else
-				routine.b3++;	// notsmoket2
-		} else if (routine.b3 == 103) {
-			routine.b3 = 81;	// notsmoket1
+				routine.incReelPointer();	// notsmoket2
+		} else if (routine.reelPointer() == 103) {
+			routine.setReelPointer(81);	// notsmoket1
 		} else {
-			routine.b3++;	// notsmoket2
+			routine.incReelPointer();	// notsmoket2
 		}
 	}
 
-- 
cgit v1.2.3


From c98803817418c39ca94994e7946419645ab729dd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 14 Dec 2011 00:47:29 +0200
Subject: DREAMWEB: Port 'showdiarypage' to C++

---
 engines/dreamweb/dreamgen.cpp | 33 ---------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.cpp    | 17 +++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 18 insertions(+), 34 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 83b86f9d51..725e682a14 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -4260,39 +4260,6 @@ notdumpdiary:
 	multiDump();
 }
 
-void DreamGenContext::showDiaryPage() {
-	STACK_CHECK;
-	al = 0;
-	ah = 0;
-	di = (68+24);
-	bx = (48+12);
-	ds = data.word(kTempgraphics);
-	showFrame();
-	al = data.byte(kDiarypage);
-	findText1();
-	data.byte(kKerning) = 1;
-	useTempCharset();
-	di = (68+24)+48;
-	bx = (48+12)+16;
-	dl = 240;
-	ah = 16;
-	data.word(kCharshift) = 91+91;
-	printDirect();
-	di = (68+24)+129;
-	bx = (48+12)+16;
-	dl = 240;
-	ah = 16;
-	printDirect();
-	di = (68+24)+48;
-	bx = (48+12)+23;
-	dl = 240;
-	ah = 16;
-	printDirect();
-	data.byte(kKerning) = 0;
-	data.word(kCharshift) = 0;
-	useCharset1();
-}
-
 void DreamGenContext::findText1() {
 	STACK_CHECK;
 	ah = 0;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index a8e8a610fd..f5c333be36 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -523,7 +523,6 @@ public:
 	void getKeyAndLogo();
 	void selectOb();
 	void fadeUpMon();
-	void showDiaryPage();
 	void reExFromInv();
 	void businessMan();
 	void outOfInv();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a7d65845e1..4fc46ad3aa 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4582,4 +4582,21 @@ void DreamGenContext::updateSymbolBot() {
 	}
 }
 
+void DreamGenContext::showDiaryPage() {
+	showFrame(tempGraphics(), kDiaryx, kDiaryy, 0, 0);
+	data.byte(kKerning) = 1;
+	useTempCharset();
+	data.word(kCharshift) = 91+91;
+	uint16 offset = kTextstart + getSegment(data.word(kTextfile1)).word(data.byte(kDiarypage) * 2);
+	const uint8 *string = getSegment(data.word(kTextfile1)).ptr(offset, 0);
+	uint16 y = kDiaryy + 16;
+	printDirect(&string, kDiaryx + 48, &y, 240, 240 & 1);
+	printDirect(&string, kDiaryx + 129, &y, 240, 240 & 1);
+	y = kDiaryy + 23;
+	printDirect(&string, kDiaryx + 48, &y, 240, 240 & 1);
+	data.byte(kKerning) = 0;
+	data.word(kCharshift) = 0;
+	useCharset1();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 5256111cc1..da01c9b26c 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -581,5 +581,6 @@
 	void processTrigger();
 	void updateSymbolTop();
 	void updateSymbolBot();
+	void showDiaryPage();
 
 #endif
-- 
cgit v1.2.3


From c95bdeb20ca16927fbac990c9633cb0db9e1fc3e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 14 Dec 2011 01:03:57 +0200
Subject: DREAMWEB: Port 'dumpdiarykeys' to C++ and remove the now unused
 'findtext1'

---
 engines/dreamweb/dreamgen.cpp | 69 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  2 --
 engines/dreamweb/stubs.cpp    | 28 ++++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 29 insertions(+), 71 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 725e682a14..e2b5530b2e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -4202,75 +4202,6 @@ gotkeyp:
 	showDiaryPage();
 }
 
-void DreamGenContext::dumpDiaryKeys() {
-	STACK_CHECK;
-	_cmp(data.byte(kPresscount), 1);
-	if (!flags.z())
-		goto notdumpdiary;
-	_cmp(data.byte(kSartaindead), 1);
-	if (flags.z())
-		goto notsartadd;
-	_cmp(data.byte(kDiarypage), 5);
-	if (!flags.z())
-		goto notsartadd;
-	_cmp(data.byte(kDiarypage), 5);
-	if (!flags.z())
-		goto notsartadd;
-	al = 6;
-	getLocation();
-	_cmp(al, 1);
-	if (flags.z())
-		goto notsartadd;
-	al = 6;
-	setLocation();
-	delPointer();
-	al = 12;
-	findText1();
-	di = 70;
-	bx = 106;
-	dl = 241;
-	ah = 16;
-	printDirect();
-	workToScreenM();
-	cx = 200;
-	hangOnP();
-	createPanel();
-	showIcon();
-	showDiary();
-	showDiaryPage();
-	workToScreenM();
-	showPointer();
-	return;
-notsartadd:
-	di = (68+24)+48;
-	bx = (48+12)+15;
-	cl = 200;
-	ch = 16;
-	multiDump();
-notdumpdiary:
-	di = (68+24)+94;
-	bx = (48+12)+97;
-	cl = 16;
-	ch = 16;
-	multiDump();
-	di = (68+24)+151;
-	bx = (48+12)+71;
-	cl = 16;
-	ch = 16;
-	multiDump();
-}
-
-void DreamGenContext::findText1() {
-	STACK_CHECK;
-	ah = 0;
-	si = ax;
-	_add(si, si);
-	es = data.word(kTextfile1);
-	ax = es.word(si);
-	_add(ax, (66*2));
-	si = ax;
-}
-
 void DreamGenContext::showSlots() {
 	STACK_CHECK;
 	di = (60)+7;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f5c333be36..48b40feb37 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -488,7 +488,6 @@ public:
 	void clearBuffers();
 	void getObTextStart();
 	void checkObjectSize();
-	void findText1();
 	void isRyanHolding();
 	void showSlots();
 	void useCashCard();
@@ -507,7 +506,6 @@ public:
 	void startTalk();
 	void getAnyAd();
 	void reminders();
-	void dumpDiaryKeys();
 	void checkForExit();
 	void lookInInterface();
 	void inToInv();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 4fc46ad3aa..e753efd72a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4599,4 +4599,32 @@ void DreamGenContext::showDiaryPage() {
 	useCharset1();
 }
 
+void DreamGenContext::dumpDiaryKeys() {
+	if (data.byte(kPresscount) == 1) {
+		if (data.byte(kSartaindead) != 1 && data.byte(kDiarypage) == 5 && DreamBase::getLocation(6) != 1) {
+			// Add Sartain Industries note
+			DreamBase::setLocation(6);
+			delPointer();
+			uint16 offset = kTextstart + getSegment(data.word(kTextfile1)).word(12 * 2);
+			const uint8 *string = getSegment(data.word(kTextfile1)).ptr(offset, 0);
+			uint16 y = 106;
+			printDirect(&string, 70, &y, 241, 241 & 1);
+			workToScreenM();
+			hangOnP(200);
+			createPanel();
+			showIcon();
+			showDiary();
+			showDiaryPage();
+			workToScreenM();
+			showPointer();
+			return;
+		} else {
+			multiDump(kDiaryx + 48, kDiaryy + 15, 200, 16);
+		}
+	}
+
+	multiDump(kDiaryx + 94, kDiaryy + 97, 16, 16);
+	multiDump(kDiaryx + 151, kDiaryy + 71, 16, 16);
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index da01c9b26c..50a8faaf34 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -582,5 +582,6 @@
 	void updateSymbolTop();
 	void updateSymbolBot();
 	void showDiaryPage();
+	void dumpDiaryKeys();
 
 #endif
-- 
cgit v1.2.3


From d4124e116ac8a9aaf52dcfe727cd600e27555154 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 14 Dec 2011 01:52:13 +0200
Subject: DREAMWEB: Port 'heavy' to C++

---
 engines/dreamweb/dreamgen.cpp | 42 ------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/people.cpp   | 28 ++++++++++++++++++++++++++--
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 27 insertions(+), 45 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index e2b5530b2e..1593ae78d3 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -360,48 +360,6 @@ combatover2:
 	data.byte(kMandead) = 2;
 }
 
-void DreamGenContext::heavy() {
-	STACK_CHECK;
-	al = es.byte(bx+7);
-	_and(al, 127);
-	es.byte(bx+7) = al;
-	_cmp(es.word(bx+3), 43);
-	if (flags.z())
-		goto heavywait;
-	data.word(kWatchingtime) = 10;
-	_cmp(es.word(bx+3), 70);
-	if (!flags.z())
-		goto notafterhshot;
-	_inc(data.byte(kCombatcount));
-	_cmp(data.byte(kCombatcount), 80);
-	if (!flags.z())
-		goto gotheavyframe;
-	data.byte(kMandead) = 2;
-	goto gotheavyframe;
-notafterhshot:
-	checkSpeed();
-	if (!flags.z())
-		goto gotheavyframe;
-	_inc(es.word(bx+3));
-	goto gotheavyframe;
-heavywait:
-	_cmp(data.byte(kLastweapon), 1);
-	if (!flags.z())
-		goto gotheavyframe;
-	_cmp(data.byte(kManspath), 5);
-	if (!flags.z())
-		goto gotheavyframe;
-	_cmp(data.byte(kFacing), 4);
-	if (!flags.z())
-		goto gotheavyframe;
-	data.byte(kLastweapon) = -1;
-	_inc(es.word(bx+3));
-	data.byte(kCombatcount) = 0;
-gotheavyframe:
-	showGameReel();
-	addToPeopleList();
-}
-
 void DreamGenContext::endGameSeq() {
 	STACK_CHECK;
 	checkSpeed();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 48b40feb37..bde91490af 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -513,7 +513,6 @@ public:
 	void deleteExText();
 	void getFreeAd();
 	void removeObFromInv();
-	void heavy();
 	void dirFile();
 	void pickupConts();
 	void nextColon();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 99e382f325..99a83f44d3 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -33,7 +33,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
-	&DreamGenContext::heavy, NULL,
+	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
@@ -65,7 +65,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
 	&DreamGenContext::genericPerson /*femaleFan*/, &DreamGenContext::louis,
 	&DreamGenContext::louisChair, &DreamGenContext::soldier1,
 	&DreamGenContext::bossMan, &DreamGenContext::interviewer,
-	/*&DreamGenContext::heavy*/NULL, &DreamGenContext::manAsleep /*manAsleep2*/,
+	&DreamGenContext::heavy, &DreamGenContext::manAsleep /*manAsleep2*/,
 	&DreamGenContext::genericPerson /*manSatStill*/, &DreamGenContext::drinker,
 	&DreamGenContext::bartender, &DreamGenContext::genericPerson /*otherSmoker*/,
 	&DreamGenContext::genericPerson /*tattooMan*/, &DreamGenContext::attendant,
@@ -835,4 +835,28 @@ void DreamGenContext::bartender(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
+void DreamGenContext::heavy(ReelRoutine &routine) {
+	routine.b7 &= 127;
+	if (routine.reelPointer() != 43) {
+		data.word(kWatchingtime) = 10;
+		if (routine.reelPointer() == 70) {
+			// After shot
+			data.byte(kCombatcount)++;
+			if (data.byte(kCombatcount) == 80)
+				data.byte(kMandead) = 2;
+		} else {
+			if (checkSpeed(routine))
+				routine.incReelPointer();
+		}
+	} else if (data.byte(kLastweapon) == 1 && data.byte(kManspath) == 5 && data.byte(kFacing) == 4) {
+		// Heavy wait
+		data.byte(kLastweapon) = (byte)-1;
+		routine.incReelPointer();
+		data.byte(kCombatcount) = 0;
+	}
+
+	showGameReel(&routine);
+	addToPeopleList(&routine);
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 50a8faaf34..f7d8086a64 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -419,6 +419,7 @@
 	void soldier1(ReelRoutine &routine);
 	void receptionist(ReelRoutine &routine);
 	void bartender(ReelRoutine &routine);
+	void heavy(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void loadSaveBox();
 	void loadKeypad();
-- 
cgit v1.2.3


From a97a359ea3825f6fdef40a57e3c3b6e96b4afda3 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 14 Dec 2011 00:58:10 +0100
Subject: TSAGE: R2R - Implement scene 2535

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +
 engines/tsage/ringworld2/ringworld2_scenes2.cpp | 183 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes2.h   |  34 +++++
 3 files changed, 219 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index f86bab3a87..e2e0c71a03 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -134,6 +134,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Maze: Well
 		return new Scene2530();
 	case 2535:
+		// Maze: Tannery
+		return new Scene2535();
 	case 2600:
 	case 2700:
 	case 2750:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index cbb6dbc42e..4b4f9b8375 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -2800,5 +2800,188 @@ void Scene2530::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 2535 - Maze: Tannery
+ *
+ *--------------------------------------------------------------------------*/
+
+bool Scene2535::Actor3::startAction(CursorType action, Event &event) {
+	Scene2535 *scene = (Scene2535 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	if (R2_GLOBALS._player._characterIndex == 1) {
+		R2_GLOBALS._player.disableControl();
+		if (R2_INVENTORY.getObjectScene(20) == 2535) {
+			scene->_sceneMode = 2536;
+			scene->setAction(&scene->_sequenceManager, scene, 2536, &R2_GLOBALS._player, &scene->_actor3, NULL);
+		} else {
+			scene->_sceneMode = 2537;
+			scene->setAction(&scene->_sequenceManager, scene, 2537, &R2_GLOBALS._player, &scene->_actor3, NULL);
+		}
+	} else {
+		SceneItem::display(2530, 33, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+	}
+
+	return true;
+}
+
+bool Scene2535::Actor4::startAction(CursorType action, Event &event) {
+	Scene2535 *scene = (Scene2535 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	if (R2_GLOBALS._player._characterIndex == 2) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 2535;
+		scene->setAction(&scene->_sequenceManager, scene, 2535, &R2_GLOBALS._player, &scene->_actor4, NULL);
+	} else {
+		SceneItem::display(2530, 33, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+	}
+
+	return true;
+}
+
+void Scene2535::Exit1::changeScene() {
+	Scene2535 *scene = (Scene2535 *)R2_GLOBALS._sceneManager._scene;
+	_enabled = false;
+	R2_GLOBALS._events.setCursor(CURSOR_ARROW);
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 11;
+	Common::Point pt(210, 200);
+	PlayerMover *mover = new PlayerMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene2535::postInit(SceneObjectList *OwnerList) {
+	loadScene(2535);
+	SceneExt::postInit();
+	if (R2_GLOBALS._sceneManager._previousScene == -1) {
+		R2_GLOBALS.setFlag(73);
+		R2_INVENTORY.setObjectScene(20, 2535);
+	}
+	_exit1.setDetails(Rect(172, 155, 250, 167), EXITCURSOR_S, 2000);
+	_exit1.setDest(Common::Point(210, 160));
+
+	if (R2_INVENTORY.getObjectScene(32) == 2535) {
+		_actor4.postInit();
+		_actor4.setup(2435, 1, 4);
+		_actor4.setPosition(Common::Point(47, 74));
+		_actor4.fixPriority(74);
+		_actor4.setDetails(2535, 21, -1, -1, 1, NULL);
+	}
+
+	if (R2_INVENTORY.getObjectScene(20) == 2535) {
+		_actor3.postInit();
+		_actor3.setup(2535, 3, 1);
+		_actor3.setPosition(Common::Point(203, 131));
+		_actor3.setDetails(3, 20, -1, -1, 1, NULL);
+		R2_GLOBALS._walkRegions.enableRegion(6);
+	}
+
+	if ((R2_INVENTORY.getObjectScene(20) == 0) && (R2_GLOBALS.getFlag(73))) {
+		_actor3.postInit();
+		_actor3.setup(2536, 1, 2);
+		_actor3.setPosition(Common::Point(164, 133));
+		_actor3.setDetails(3, 20, -1, -1, 1, NULL);
+	}
+
+	if (R2_GLOBALS.getFlag(73)) {
+		_actor2.postInit();
+		_actor2.setup(2536, 1, 1);
+		_actor2.setPosition(Common::Point(160, 130));
+		_actor2.fixPriority(122);
+		_actor2.setDetails(2535, 37, -1, -1, 1, NULL);
+	}
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	if (R2_GLOBALS._player._characterIndex == 1) {
+		R2_GLOBALS._player.setVisage(2008);
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+	} else {
+		R2_GLOBALS._player.setVisage(20);
+		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+	}
+	R2_GLOBALS._player.setPosition(Common::Point(210, 200));
+
+	if (R2_GLOBALS._player._characterScene[1] == R2_GLOBALS._player._characterScene[2]) {
+		_actor1.postInit();
+		if (R2_GLOBALS._player._characterIndex == 1) {
+			_actor1.setup(20, 5, 1);
+			_actor1.setDetails(9002, 0, 4, 3, 1, NULL);
+		} else {
+			_actor1.setup(2008, 5, 1);
+			_actor1.setDetails(9001, 0, 5, 3, 1, NULL);
+		}
+		_actor1.setPosition(Common::Point(245, 115));
+		R2_GLOBALS._walkRegions.enableRegion(2);
+	}
+
+	_item2.setDetails(Rect(96, 3, 215, 33), 2535, 3, 6, 5, 1, NULL);
+	_item3.setDetails(Rect(4, 43, 40, 101), 2535, 6, 7, 8, 1, NULL);
+	_item4.setDetails(Rect(55, 13, 140, 89), 2535, 6, 7, 8, 1, NULL);
+	_item5.setDetails(Rect(144, 23, 216, 76), 2535, 6, 7, 8, 1, NULL);
+	_item6.setDetails(Rect(227, 8, 307, 99), 2535, 6, 7, 8, 1, NULL);
+	_item7.setDetails(Rect(116, 111, 201, 132), 2535, 18, 19, 20, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 320, 200), 2535, 0, 1, -1, 1, NULL);
+	R2_GLOBALS._player.disableControl();
+
+	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 2000) {
+		R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 2535;
+		Common::Point pt(210, 150);
+		PlayerMover *mover = new PlayerMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+	} else {
+		R2_GLOBALS._player.setPosition(Common::Point(210, 150));
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.enableControl();
+	}
+}
+
+void Scene2535::signal() {
+	switch (_sceneMode) {
+	case 11:
+		g_globals->_sceneManager.changeScene(2000);
+		break;
+	case 2535:
+		R2_INVENTORY.setObjectScene(32, 2);
+		_actor4.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 2536:
+		R2_INVENTORY.setObjectScene(20, 0);
+		R2_GLOBALS._walkRegions.disableRegion(6);
+		if (!R2_GLOBALS.getFlag(73)) {
+			_actor3.remove();
+			R2_GLOBALS._player.enableControl();
+		} else {
+			_sceneMode = 20;
+			_actor3.show();
+			_actor3.setup(2536, 1, 2);
+			_actor3.setDetails(3, 20, -1, -1, 3, NULL);
+			_actor3.setPosition(Common::Point(164, 150));
+			_actor3.fixPriority(130);
+			_actor3._moveDiff.y = 1;
+			Common::Point pt(164, 133);
+			PlayerMover *mover = new PlayerMover();
+			_actor3.addMover(mover, &pt, this);
+		}
+		break;
+	case 2537:
+		_actor3.remove();
+		R2_INVENTORY.setObjectScene(20, 1);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 20:
+	// No break on purpose
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index bef1fc9ea8..e655d1e8a8 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -444,6 +444,40 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 };
+
+class Scene2535 : public SceneExt {
+	class Actor3 : public SceneActor {
+	public:
+		bool startAction(CursorType action, Event &event);
+	};
+	class Actor4 : public SceneActor {
+	public:
+		bool startAction(CursorType action, Event &event);
+	};
+
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+public:
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	NamedHotspot _item3;
+	NamedHotspot _item4;
+	NamedHotspot _item5;
+	NamedHotspot _item6;
+	NamedHotspot _item7;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	Actor3 _actor3;
+	Actor4 _actor4;
+	Exit1 _exit1;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From a22266d8713eaa2400c99bc8e751e9babcf468ab Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 14 Dec 2011 02:03:57 +0200
Subject: DREAMWEB: Port 'runendseq' to C++ and remove the unused 'drawitall'
 function

---
 engines/dreamweb/dreamgen.cpp | 30 ------------------------------
 engines/dreamweb/dreamgen.h   |  4 +---
 engines/dreamweb/stubs.cpp    | 20 ++++++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 22 insertions(+), 33 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 1593ae78d3..d3e3ace249 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -864,28 +864,6 @@ void DreamGenContext::initialMonCols() {
 	showGroup();
 }
 
-void DreamGenContext::runEndSeq() {
-	STACK_CHECK;
-	atmospheres();
-	data.byte(kGetback) = 0;
-moreendseq:
-	vSync();
-	spriteUpdate();
-	vSync();
-	delEverything();
-	printSprites();
-	reelsOnScreen();
-	afterIntroRoom();
-	useTimedText();
-	vSync();
-	dumpMap();
-	dumpTimedText();
-	vSync();
-	_cmp(data.byte(kGetback), 1);
-	if (!flags.z())
-		goto moreendseq;
-}
-
 void DreamGenContext::fillOpen() {
 	STACK_CHECK;
 	delTextLine();
@@ -3475,14 +3453,6 @@ lookcolon:
 		goto lookcolon;
 }
 
-void DreamGenContext::drawItAll() {
-	STACK_CHECK;
-	createPanel();
-	drawFloor();
-	printSprites();
-	showIcon();
-}
-
 void DreamGenContext::useCashCard() {
 	STACK_CHECK;
 	getRidOfReels();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index bde91490af..ddddf7955a 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -483,8 +483,8 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
+	void fadeDownMon();
 	void identifyOb();
-	void runEndSeq();
 	void clearBuffers();
 	void getObTextStart();
 	void checkObjectSize();
@@ -497,7 +497,6 @@ public:
 	void getOpenedSize();
 	void adjustUp();
 	void fadeScreenDownHalf();
-	void fadeDownMon();
 	void outOfOpen();
 	void dirCom();
 	void endGameSeq();
@@ -547,7 +546,6 @@ public:
 	void setPickup();
 	void dropObject();
 	void openOb();
-	void drawItAll();
 	void useStereo();
 	void showDiaryKeys();
 	void useOpened();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index e753efd72a..51884ace1f 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4627,4 +4627,24 @@ void DreamGenContext::dumpDiaryKeys() {
 	multiDump(kDiaryx + 151, kDiaryy + 71, 16, 16);
 }
 
+void DreamGenContext::runEndSeq() {
+	atmospheres();
+	data.byte(kGetback) = 0;
+
+	do {
+		vSync();
+		spriteUpdate();
+		vSync();
+		delEverything();
+		printSprites();
+		reelsOnScreen();
+		afterIntroRoom();
+		useTimedText();
+		vSync();
+		dumpMap();
+		dumpTimedText();
+		vSync();
+	} while (data.byte(kGetback) != 1);
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index f7d8086a64..24f92a947b 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -584,5 +584,6 @@
 	void updateSymbolBot();
 	void showDiaryPage();
 	void dumpDiaryKeys();
+	void runEndSeq();
 
 #endif
-- 
cgit v1.2.3


From f1a099d4f8ba4cd2efc58c24f7075f77c7459016 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 14 Dec 2011 02:17:53 +0200
Subject: DREAMWEB: Port 'lookatcard' to C++

---
 engines/dreamweb/dreamgen.cpp | 51 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  5 ++---
 engines/dreamweb/stubs.cpp    | 30 +++++++++++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 33 insertions(+), 54 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index d3e3ace249..e8e577e51b 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3510,57 +3510,6 @@ _tmp1:
 	putBackObStuff();
 }
 
-void DreamGenContext::lookAtCard() {
-	STACK_CHECK;
-	data.byte(kManisoffscreen) = 1;
-	getRidOfReels();
-	loadKeypad();
-	createPanel2();
-	di = 160;
-	bx = 80;
-	ds = data.word(kTempgraphics);
-	al = 42;
-	ah = 128;
-	showFrame();
-	getObTextStart();
-	findNextColon();
-	findNextColon();
-	findNextColon();
-	di = 36;
-	bx = 124;
-	dl = 241;
-	al = 0;
-	ah = 0;
-	printDirect();
-	push(es);
-	push(si);
-	workToScreenM();
-	cx = 280;
-	hangOnW();
-	createPanel2();
-	di = 160;
-	bx = 80;
-	ds = data.word(kTempgraphics);
-	al = 42;
-	ah = 128;
-	showFrame();
-	si = pop();
-	es = pop();
-	di = 36;
-	bx = 130;
-	dl = 241;
-	al = 0;
-	ah = 0;
-	printDirect();
-	workToScreenM();
-	cx = 200;
-	hangOnW();
-	data.byte(kManisoffscreen) = 0;
-	getRidOfTemp();
-	restoreReels();
-	putBackObStuff();
-}
-
 void DreamGenContext::moneyPoke() {
 	STACK_CHECK;
 	bx = offset_money1poke;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index ddddf7955a..43f93ee238 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -489,7 +489,7 @@ public:
 	void getObTextStart();
 	void checkObjectSize();
 	void isRyanHolding();
-	void showSlots();
+	void fillOpen();
 	void useCashCard();
 	void moneyPoke();
 	void doSomeTalk();
@@ -537,10 +537,9 @@ public:
 	void poolGuard();
 	void lookAtPlace();
 	void findAllOpen();
-	void fillOpen();
+	void showSlots();
 	void findSetObject();
 	void deleteExObject();
-	void lookAtCard();
 	void helicopter();
 	void getEitherAd();
 	void setPickup();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 51884ace1f..127724f7db 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4647,4 +4647,34 @@ void DreamGenContext::runEndSeq() {
 	} while (data.byte(kGetback) != 1);
 }
 
+void DreamGenContext::lookAtCard() {
+	//showFrame((Frame *)ds.ptr(0, 0), di, bx, ax & 0x1ff, ah & 0xfe, &width, &height);
+	//al = DreamBase::printDirect(&string, di, &y, dl, (bool)(dl & 1));
+	data.byte(kManisoffscreen) = 1;
+	getRidOfReels();
+	loadKeypad();
+	createPanel2();
+	showFrame(tempGraphics(), 160, 80, 42, 128);
+	uint8 *obText = getObTextStartCPP();
+	findNextColon(&obText);
+	findNextColon(&obText);
+	findNextColon(&obText);
+	printDirect(obText, 36, 124, 241, 241 & 1);
+	push(es);
+	push(si);
+	workToScreenM();
+	hangOnW(280);
+	createPanel2();
+	showFrame(tempGraphics(), 160, 80, 42, 128);
+	si = pop();
+	es = pop();
+	printDirect(obText, 36, 130, 241, 241 & 1);
+	workToScreenM();
+	hangOnW(200);
+	data.byte(kManisoffscreen) = 0;
+	getRidOfTemp();
+	restoreReels();
+	putBackObStuff();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 24f92a947b..e60a5698eb 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -585,5 +585,6 @@
 	void showDiaryPage();
 	void dumpDiaryKeys();
 	void runEndSeq();
+	void lookAtCard();
 
 #endif
-- 
cgit v1.2.3


From 907e9bc0cc4d1601c34d57edb3c4ce7233cb786e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 14 Dec 2011 21:36:37 +1100
Subject: TSAGE: Implemented R2R Scene 400 - Science Lab

---
 engines/tsage/events.h                          |   3 +-
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   9 +-
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 242 +++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  46 +++++
 engines/tsage/ringworld2/ringworld2_scenes2.cpp |  12 +-
 5 files changed, 296 insertions(+), 16 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index 1942c98901..ecc710ed99 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -83,7 +83,8 @@ enum CursorType {
 	INV_CARAVAN_KEY = 67, BF_LAST_INVENT = 68,
 
 	// Ringworld 2 objects
-	R2_OPTO_DISK = 1, R2_2 = 2, R2_NEGATOR_GUN = 3, R2_STEPPING_DISKS = 4, R2_5 = 5, R2_6 = 6, 
+	R2_OPTO_DISK = 1, R2_READER = 2, R2_NEGATOR_GUN = 3, R2_STEPPING_DISKS = 4, 
+	R2_ATTRACTOR_UNIT = 5, R2_SENSOR_PROBE = 6, 
 	R2_7 = 7, R2_8 = 8, R2_9 = 9, R2_10 = 10, R2_11 = 11, R2_12 = 12, R2_13 = 13, R2_14 = 14,
 	R2_15 = 15, R2_16 = 16, R2_17 = 17, R2_18 = 18, R2_19 = 19, R2_20 = 20, R2_21 = 21,
 	R2_22 = 22, R2_23 = 23, R2_24 = 24, R2_25 = 25, R2_26 = 26, R2_27 = 27, R2_28 = 28,
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index e2e0c71a03..c6ad92bd91 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -57,7 +57,10 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 300:
 		return new Scene300();
 	case 325:
+		error("Missing scene %d from group 0", sceneNumber);
 	case 400:
+		// Science Lab
+		return new Scene400();
 	case 500:
 	case 525:
 	case 600:
@@ -576,11 +579,11 @@ void Ringworld2InvObjectList::reset() {
 
 	// Set up default inventory
 	setObjectScene(R2_OPTO_DISK, 800);
-	setObjectScene(R2_2, 400);
+	setObjectScene(R2_READER, 400);
 	setObjectScene(R2_NEGATOR_GUN, 100);
 	setObjectScene(R2_STEPPING_DISKS, 100);
-	setObjectScene(R2_5, 400);
-	setObjectScene(R2_6, 400);
+	setObjectScene(R2_ATTRACTOR_UNIT, 400);
+	setObjectScene(R2_SENSOR_PROBE, 400);
 	setObjectScene(R2_7, 500);
 	setObjectScene(R2_8, 700);
 	setObjectScene(R2_9, 800);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 661a52d601..c3f97f1eef 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -64,7 +64,7 @@ void Scene50::process(Event &event) {
 		event.handled = true;
 		warning("TODO: incomplete Scene50::process()");
 		// CursorType _oldCursorId = _cursorId;
-		g_globals->_events.setCursor(R2_2);
+		g_globals->_events.setCursor(CURSOR_ARROW);
 		// _cursorManager.sub_1D474(2, 0);
 		// sub_5566A(1);
 		// _cursorManager._fieldE = _oldCursorId;
@@ -1204,8 +1204,6 @@ Common::String Scene125::parseMessage(const Common::String &msg) {
  *
  *--------------------------------------------------------------------------*/
 
-/*--------------------------------------------------------------------------*/
-
 void Scene150::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 	loadScene(100);
@@ -1675,7 +1673,7 @@ bool Scene300::Miranda::startAction(CursorType action, Event &event) {
 		SceneItem::display2(300, 54);
 		return true;
 
-	case R2_2:
+	case R2_READER:
 		if (!R2_GLOBALS.getFlag(2) || !R2_GLOBALS.getFlag(3) || (R2_INVENTORY.getObjectScene(R2_OPTO_DISK) == 1))
 			SceneItem::display2(300, 55);
 		else {
@@ -1749,7 +1747,7 @@ bool Scene300::Seeker::startAction(CursorType action, Event &event) {
 		scene->setAction(&scene->_sequenceManager1, scene, 310, &R2_GLOBALS._player, NULL);
 		return true;
 
-	case R2_2:
+	case R2_READER:
 		if (!R2_GLOBALS.getFlag(2) || !R2_GLOBALS.getFlag(3) || (R2_INVENTORY.getObjectScene(R2_OPTO_DISK) == 1))
 			break;
 
@@ -2325,7 +2323,7 @@ void Scene300::signal() {
 
 void Scene300::signal309() {
 	if (R2_GLOBALS.getFlag(2))
-		R2_GLOBALS._stripManager_lookupList[0] = (R2_INVENTORY.getObjectScene(R2_2) == 1) ? 3 : 2;
+		R2_GLOBALS._stripManager_lookupList[0] = (R2_INVENTORY.getObjectScene(R2_READER) == 1) ? 3 : 2;
 
 	if (R2_GLOBALS.getFlag(4))
 		R2_GLOBALS._stripManager_lookupList[0] = 4;
@@ -2362,6 +2360,238 @@ void Scene300::signal309() {
 		R2_GLOBALS._stripManager_lookupList[4] = 3;
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 400 - Science Lab
+ *
+ *--------------------------------------------------------------------------*/
+
+bool Scene400::Terminal::startAction(CursorType action, Event &event) {
+	Scene400 *scene = (Scene400 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action == CURSOR_USE) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 402;
+		scene->setAction(&scene->_sequenceManager1, scene, 402, &R2_GLOBALS._player, this, NULL);
+
+		return true;
+	} else {
+		return NamedHotspot::startAction(action, event);
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+bool Scene400::Door::startAction(CursorType action, Event &event) {
+	Scene400 *scene = (Scene400 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action == CURSOR_USE) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 401;
+		scene->setAction(&scene->_sequenceManager1, scene, 401, &R2_GLOBALS._player, this, NULL);
+
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene400::Reader::startAction(CursorType action, Event &event) {
+	Scene400 *scene = (Scene400 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action == CURSOR_USE) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 405;
+		scene->setAction(&scene->_sequenceManager1, scene, 405, &R2_GLOBALS._player, this, NULL);
+
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene400::SensorProbe::startAction(CursorType action, Event &event) {
+	Scene400 *scene = (Scene400 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action == CURSOR_USE) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 404;
+		scene->setAction(&scene->_sequenceManager1, scene, 404, &R2_GLOBALS._player, this, NULL);
+
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene400::AttractorUnit::startAction(CursorType action, Event &event) {
+	Scene400 *scene = (Scene400 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action == CURSOR_USE) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 406;
+		scene->setAction(&scene->_sequenceManager1, scene, 406, &R2_GLOBALS._player, this, NULL);
+
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+void Scene400::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(400);
+	_sound1.play(20);
+
+	_door.postInit();
+	_door.setVisage(100);
+	_door.setPosition(Common::Point(123, 84));
+	_door.setDetails(400, 24, -1, 26, 1, NULL);
+
+	_consoleDisplay.postInit();
+	_consoleDisplay.setup(400, 4, 1);
+	_consoleDisplay.setPosition(Common::Point(236, 92));
+	_consoleDisplay.fixPriority(120);
+	_consoleDisplay.animate(ANIM_MODE_2, NULL);
+	_consoleDisplay._numFrames = 5;
+
+	_testerDisplay.postInit();
+	_testerDisplay.setup(400, 2, 1);
+	_testerDisplay.setPosition(Common::Point(198, 83));
+	_testerDisplay.animate(ANIM_MODE_2, NULL);
+	_testerDisplay._numFrames = 20;
+
+	if (R2_INVENTORY.getObjectScene(R2_READER) == 400) {
+		_reader.postInit();
+		_reader.setup(400, 5, 2);
+		_reader.setPosition(Common::Point(301, 95));
+		_reader.setDetails(400, 54, -1, 56, 1, NULL);
+	}
+
+	if (R2_INVENTORY.getObjectScene(R2_SENSOR_PROBE) == 400) {
+		_sensorProbe.postInit();
+		_sensorProbe.setup(400, 5, 1);
+		_sensorProbe.setPosition(Common::Point(251, 104));
+		_sensorProbe.fixPriority(121);
+		_sensorProbe.setDetails(400, 57, -1, 59, 1, NULL);
+	}
+
+	if (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_UNIT) == 400) {
+		_attractorUnit.postInit();
+		_attractorUnit.setup(400, 5, 3);
+		_attractorUnit.setPosition(Common::Point(265, 129));
+		_attractorUnit.setDetails(400, 60, -1, 62, 1, NULL);
+	}
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setVisage(10);
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.disableControl();
+
+	_equipment1.setDetails(11, 400, 3, -1, -1);
+	_equipment2.setDetails(24, 400, 3, -1, -1);
+	_equipment3.setDetails(25, 400, 3, -1, -1);
+	_equipment4.setDetails(26, 400, 3, -1, -1);
+	_equipment5.setDetails(28, 400, 3, -1, -1);
+	_equipment6.setDetails(29, 400, 3, -1, -1);
+	_desk.setDetails(12, 400, 6, -1, -1);
+	_desk2.setDetails(27, 400, 6, -1, -1);
+	_terminal.setDetails(13, 400, 6, -1, 11);
+	_duct.setDetails(14, 400, 12, -1, -1);
+	_console.setDetails(15, 400, 15, -1, 17);
+	_equalizer.setDetails(Rect(284, 99, 308, 108), 400, 36, -1, 38, 1, NULL);
+	_transducer.setDetails(Rect(295, 67, 314, 79), 400, 39, -1, 41, 1, NULL);
+	_optimizer.setDetails(Rect(308, 106, 315, 113), 400, 42, -1, 44, 1, NULL);
+	_soundModule.setDetails(Rect(291, 118, 315, 131), 400, 45, -1, 47, 1, NULL);
+	_tester.setDetails(Rect(179, 62, 217, 92), 400, 30, -1, 32, 1, NULL);
+	_helmet.setDetails(Rect(181, 53, 197, 65), 400, 48, -1, 50, 1, NULL);
+	_nullifier.setDetails(Rect(201, 56, 212, 65), 400, 51, -1, 50, 1, NULL);
+	_shelves.setDetails(16, 400, 18, -1, 20);
+	_cabinet.setDetails(17, 400, 21, -1, -1);
+	_doorDisplay.setDetails(Rect(161, 43, 166, 52), 400, 27, -1, -1, 1, NULL);
+	_lights.setDetails(Rect(113, 3, 168, 14), 400, 33, -1, -1, 1, NULL);
+	_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 400, 0, 1, -1, 1, NULL);
+
+	_sceneMode = 400;
+	switch (R2_GLOBALS._sceneManager._previousScene) {
+	case 125:
+		setAction(&_sequenceManager1, this, 403, &R2_GLOBALS._player, NULL);
+		break;
+	case 200:
+		setAction(&_sequenceManager1, this, 400, &R2_GLOBALS._player, &_door, NULL);
+		break;
+	default:
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.setPosition(Common::Point(180, 100));
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
+void Scene400::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene400::signal() {
+	switch (_sceneMode) {
+	case 400:
+	case 403:
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 401:
+		R2_GLOBALS._sceneManager.changeScene(200);
+		break;
+	case 402:
+		R2_GLOBALS._sceneManager.changeScene(125);
+		break;
+	case 404:
+		// Getting the sensor probe
+		R2_INVENTORY.setObjectScene(R2_SENSOR_PROBE, 1);
+		_sensorProbe.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 405:
+		// Getting the reader
+		R2_INVENTORY.setObjectScene(R2_READER, 1);
+		_reader.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 406:
+		R2_INVENTORY.setObjectScene(R2_ATTRACTOR_UNIT, 1);
+		_attractorUnit.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene400::dispatch() {
+	switch (R2_GLOBALS._player.getRegionIndex() - 15) {
+	case 0:
+	case 11:
+	case 12:
+		R2_GLOBALS._player._shade = 2;
+		break;
+	case 9:
+		R2_GLOBALS._player._shade = 0;
+		break;
+	case 10:
+		R2_GLOBALS._player._shade = 1;
+		break;
+	case 13:
+		R2_GLOBALS._player._shade = 3;
+		break;
+	case 14:
+		R2_GLOBALS._player._shade = 4;
+		break;
+	default:
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 5b3123b37f..646d23286a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -292,6 +292,52 @@ public:
 	virtual void signal();
 };
 
+class Scene400: public SceneExt {
+	/* Items */
+	class Terminal: public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	/* Objects */
+	class Door: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Reader: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class SensorProbe: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class AttractorUnit: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+	NamedHotspot _background, _equipment1, _equipment2, _equipment3;
+	NamedHotspot _equipment4, _equipment5, _equipment6;
+	NamedHotspot _desk, _desk2, _console;
+	NamedHotspot _duct, _shelves, _cabinet, _doorDisplay, _lights;
+	NamedHotspot _equalizer, _transducer, _optimizer, _soundModule, _tester;
+	NamedHotspot _helmet, _nullifier;
+	Terminal _terminal;
+	SceneActor _consoleDisplay, _testerDisplay;
+	Door _door;
+	Reader _reader;
+	SensorProbe _sensorProbe;
+	AttractorUnit _attractorUnit;
+	SequenceManager _sequenceManager1;
+	ASoundExt _sound1;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void dispatch();
+};
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 4b4f9b8375..d820784c45 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -1047,7 +1047,7 @@ void Scene2000::synchronize(Serializer &s) {
  *
  *--------------------------------------------------------------------------*/
 bool Scene2350::Actor2::startAction(CursorType action, Event &event) {
-	if (action != R2_6)
+	if (action != R2_SENSOR_PROBE)
 		return(SceneActor::startAction(action, event));
 	return true;
 }
@@ -1651,13 +1651,13 @@ bool Scene2435::Actor2::startAction(CursorType action, Event &event) {
 	switch (action) {
 	case R2_34:
 		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._events.setCursor(R2_2);
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		R2_GLOBALS.setFlag(82);
 		scene->_stripManager.start(603, scene);
 		return true;
 	case R2_35:
 		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._events.setCursor(R2_2);
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		R2_GLOBALS.setFlag(82);
 		scene->_stripManager.start(602, scene);
 		R2_INVENTORY.setObjectScene(R2_35, 2000);
@@ -1665,7 +1665,7 @@ bool Scene2435::Actor2::startAction(CursorType action, Event &event) {
 	case CURSOR_TALK:
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 20;
-		R2_GLOBALS._events.setCursor(R2_2);
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		if ((R2_GLOBALS._player._characterIndex == 1) || (R2_GLOBALS.getFlag(82))) {
 			scene->_stripManager.start(605, scene);
 			return true;
@@ -1765,7 +1765,7 @@ void Scene2435::signal() {
 		g_globals->_sceneManager.changeScene(2000);
 		break;
 	case 20:
-		R2_GLOBALS._player.enableControl(R2_6);
+		R2_GLOBALS._player.enableControl(CURSOR_TALK);
 		break;
 	case 30:
 		R2_GLOBALS._player._characterScene[1] = 2435;
@@ -1787,7 +1787,7 @@ void Scene2435::signal() {
 	case 2436:
 		R2_GLOBALS._walkRegions.enableRegion(2);
 		_sceneMode = 20;
-		R2_GLOBALS._events.setCursor(R2_2);
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		_stripManager.start(709, this);
 	default:
 		R2_GLOBALS._player.enableControl();
-- 
cgit v1.2.3


From 991bcb680607853e79dcf2d5caa9cfe225d300a3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 14 Dec 2011 21:44:45 +1100
Subject: TSAGE: Return to R2R scene 175 - Empty Bedroom #2

---
 engines/tsage/ringworld2/ringworld2_logic.cpp | 8 ++++++--
 engines/tsage/ringworld2/ringworld2_scenes0.h | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index c6ad92bd91..8abe44a766 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -42,10 +42,14 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 100: return new Scene100();
 	// Computer console
 	case 125: return new Scene125();
-	// Empty Bedroom
-	case 150: return new Scene150();
+	case 150: 
+		// Empty Bedroom #1
+		return new Scene150();
 	case 160:
+		error("Missing scene %d from group 0", sceneNumber);
 	case 175:
+		// Empty Bedroom #2
+		return new Scene175();
 	case 180:
 		error("Missing scene %d from group 0", sceneNumber);
 	case 200:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 646d23286a..16133e81a0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -166,6 +166,9 @@ public:
 	virtual void signal();
 };
 
+class Scene175: public Scene150 {
+};
+
 class Scene200: public SceneExt {
 	/* Objects */
 	class NorthDoor: public SceneActor {
-- 
cgit v1.2.3


From bd45f291d5f11ba4884b22d22341baf9e43e2b2b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 14 Dec 2011 21:48:38 +1100
Subject: TSAGE: Bugfix for using terminal in R2R scene 400

---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index c3f97f1eef..61e3f8e00b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -2569,6 +2569,8 @@ void Scene400::signal() {
 }
 
 void Scene400::dispatch() {
+	SceneExt::dispatch();
+
 	switch (R2_GLOBALS._player.getRegionIndex() - 15) {
 	case 0:
 	case 11:
-- 
cgit v1.2.3


From 8d804a855307ba8d16854ab12a1d5a1a576a6475 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 14 Dec 2011 21:50:46 +1100
Subject: TSAGE: Clean up comments in R2R scene factory method

---
 engines/tsage/ringworld2/ringworld2_logic.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 8abe44a766..ef1cb76c91 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -36,12 +36,15 @@ namespace Ringworld2 {
 Scene *Ringworld2Game::createScene(int sceneNumber) {
 	switch (sceneNumber) {
 	/* Scene group #0 */
-	//
-	case 50: return new Scene50();
-	// Quinn's room
-	case 100: return new Scene100();
-	// Computer console
-	case 125: return new Scene125();
+	case 50: 
+		// Waking up cutscene
+		return new Scene50();
+	case 100: 
+		// Quinn's room
+		return new Scene100();
+	case 125: 
+		// Computer console
+		return new Scene125();
 	case 150: 
 		// Empty Bedroom #1
 		return new Scene150();
-- 
cgit v1.2.3


From 5af0deba87afaac279db04da52241b6ad1c6d723 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 14 Dec 2011 12:17:32 +0100
Subject: DREAMWEB: Cleanup

---
 engines/dreamweb/dreambase.h |  1 +
 engines/dreamweb/stubs.cpp   | 14 +++++++-------
 engines/dreamweb/stubs.h     |  6 ++++--
 engines/dreamweb/use.cpp     |  6 +++---
 4 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index c7e9546069..2048f39e3b 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -151,6 +151,7 @@ public:
 	SetObject *getSetAd(uint8 index);
 	void *getAnyAd(uint8 *value1, uint8 *value2);
 	const uint8 *getTextInFile1(uint16 index);
+	uint8 findNextColon(const uint8 **string);
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 127724f7db..d931789746 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1917,13 +1917,13 @@ void DreamGenContext::hangOnP(uint16 count) {
 }
 
 void DreamGenContext::findNextColon() {
-	uint8 *initialString = es.ptr(si, 0);
-	uint8 *string = initialString;
+	const uint8 *initialString = es.ptr(si, 0);
+	const uint8 *string = initialString;
 	al = findNextColon(&string);
 	si += (string - initialString);
 }
 
-uint8 DreamGenContext::findNextColon(uint8 **string) {
+uint8 DreamBase::findNextColon(const uint8 **string) {
 	uint8 c;
 	do {
 		c = **string;
@@ -1932,11 +1932,11 @@ uint8 DreamGenContext::findNextColon(uint8 **string) {
 	return c;
 }
 
-uint8 *DreamGenContext::getObTextStartCPP() {
+const uint8 *DreamGenContext::getObTextStartCPP() {
 	push(es);
 	push(si);
 	getObTextStart();
-	uint8 *result = es.ptr(si, 0);
+	const uint8 *result = es.ptr(si, 0);
 	si = pop();
 	es = pop();
 	return result;
@@ -2246,7 +2246,7 @@ void DreamGenContext::doLook() {
 	dumpTextLine();
 	uint8 index = data.byte(kRoomnum) & 31;
 	uint16 offset = getSegment(data.word(kRoomdesc)).word(kIntextdat + index * 2);
-	uint8 *string = getSegment(data.word(kRoomdesc)).ptr(kIntext, 0) + offset;
+	const uint8 *string = getSegment(data.word(kRoomdesc)).ptr(kIntext, 0) + offset;
 	findNextColon(&string);
 	uint16 x;
 	if (data.byte(kReallocation) < 50)
@@ -4655,7 +4655,7 @@ void DreamGenContext::lookAtCard() {
 	loadKeypad();
 	createPanel2();
 	showFrame(tempGraphics(), 160, 80, 42, 128);
-	uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStartCPP();
 	findNextColon(&obText);
 	findNextColon(&obText);
 	findNextColon(&obText);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index e60a5698eb..06033b50d0 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -227,9 +227,11 @@
 	void hangOnP();
 	void hangOnP(uint16 count);
 	void showIcon();
-	uint8 findNextColon(uint8 **string);
+	uint8 findNextColon(const uint8 **string) {
+		return DreamBase::findNextColon(string);
+	}
 	void findNextColon();
-	uint8 *getObTextStartCPP();
+	const uint8 *getObTextStartCPP();
 	void useText(const uint8 *string);
 	void useText();
 	void getBlockOfPixel();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index c591eca826..a144f850b6 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -139,7 +139,7 @@ void DreamGenContext::useRoutine() {
 	}
 
 	delPointer();
-	uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStartCPP();
 	if (findNextColon(&obText) != 0) {
 		if (findNextColon(&obText) != 0) {
 			if (*obText != 0) {
@@ -178,7 +178,7 @@ void DreamGenContext::useText(const uint8 *string) {
 }
 
 void DreamGenContext::showFirstUse() {
-	uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStartCPP();
 	findNextColon(&obText);
 	findNextColon(&obText);
 	useText(obText);
@@ -186,7 +186,7 @@ void DreamGenContext::showFirstUse() {
 }
 
 void DreamGenContext::showSecondUse() {
-	uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStartCPP();
 	findNextColon(&obText);
 	findNextColon(&obText);
 	findNextColon(&obText);
-- 
cgit v1.2.3


From a489430bc33268d1120442bfd2e4c455cd358ec0 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 14 Dec 2011 12:02:59 +0100
Subject: DREAMWEB: Fix regression in showDiaryPage and lookAtCard

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

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index d931789746..0c22ffc2f5 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4591,6 +4591,7 @@ void DreamGenContext::showDiaryPage() {
 	const uint8 *string = getSegment(data.word(kTextfile1)).ptr(offset, 0);
 	uint16 y = kDiaryy + 16;
 	printDirect(&string, kDiaryx + 48, &y, 240, 240 & 1);
+	y = kDiaryy + 16;
 	printDirect(&string, kDiaryx + 129, &y, 240, 240 & 1);
 	y = kDiaryy + 23;
 	printDirect(&string, kDiaryx + 48, &y, 240, 240 & 1);
@@ -4659,7 +4660,8 @@ void DreamGenContext::lookAtCard() {
 	findNextColon(&obText);
 	findNextColon(&obText);
 	findNextColon(&obText);
-	printDirect(obText, 36, 124, 241, 241 & 1);
+	uint16 y = 124;
+	printDirect(&obText, 36, &y, 241, 241 & 1);
 	push(es);
 	push(si);
 	workToScreenM();
-- 
cgit v1.2.3


From ee5c9678c318ae844a1642445f1aefc3eaeaa320 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 14 Dec 2011 12:08:20 +0100
Subject: DREAMWEB: Cleanup

---
 engines/dreamweb/stubs.cpp | 19 +++++--------------
 engines/dreamweb/stubs.h   |  6 ++++++
 2 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 0c22ffc2f5..c365ee48d3 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4587,8 +4587,7 @@ void DreamGenContext::showDiaryPage() {
 	data.byte(kKerning) = 1;
 	useTempCharset();
 	data.word(kCharshift) = 91+91;
-	uint16 offset = kTextstart + getSegment(data.word(kTextfile1)).word(data.byte(kDiarypage) * 2);
-	const uint8 *string = getSegment(data.word(kTextfile1)).ptr(offset, 0);
+	const uint8 *string = getTextInFile1(data.byte(kDiarypage));
 	uint16 y = kDiaryy + 16;
 	printDirect(&string, kDiaryx + 48, &y, 240, 240 & 1);
 	y = kDiaryy + 16;
@@ -4602,14 +4601,12 @@ void DreamGenContext::showDiaryPage() {
 
 void DreamGenContext::dumpDiaryKeys() {
 	if (data.byte(kPresscount) == 1) {
-		if (data.byte(kSartaindead) != 1 && data.byte(kDiarypage) == 5 && DreamBase::getLocation(6) != 1) {
+		if (data.byte(kSartaindead) != 1 && data.byte(kDiarypage) == 5 && getLocation(6) != 1) {
 			// Add Sartain Industries note
-			DreamBase::setLocation(6);
+			setLocation(6);
 			delPointer();
-			uint16 offset = kTextstart + getSegment(data.word(kTextfile1)).word(12 * 2);
-			const uint8 *string = getSegment(data.word(kTextfile1)).ptr(offset, 0);
-			uint16 y = 106;
-			printDirect(&string, 70, &y, 241, 241 & 1);
+			const uint8 *string = getTextInFile1(12);
+			printDirect(string, 70, 106, 241, 241 & 1);
 			workToScreenM();
 			hangOnP(200);
 			createPanel();
@@ -4649,8 +4646,6 @@ void DreamGenContext::runEndSeq() {
 }
 
 void DreamGenContext::lookAtCard() {
-	//showFrame((Frame *)ds.ptr(0, 0), di, bx, ax & 0x1ff, ah & 0xfe, &width, &height);
-	//al = DreamBase::printDirect(&string, di, &y, dl, (bool)(dl & 1));
 	data.byte(kManisoffscreen) = 1;
 	getRidOfReels();
 	loadKeypad();
@@ -4662,14 +4657,10 @@ void DreamGenContext::lookAtCard() {
 	findNextColon(&obText);
 	uint16 y = 124;
 	printDirect(&obText, 36, &y, 241, 241 & 1);
-	push(es);
-	push(si);
 	workToScreenM();
 	hangOnW(280);
 	createPanel2();
 	showFrame(tempGraphics(), 160, 80, 42, 128);
-	si = pop();
-	es = pop();
 	printDirect(obText, 36, 130, 241, 241 & 1);
 	workToScreenM();
 	hangOnW(200);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 06033b50d0..a287d57bad 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -371,7 +371,13 @@
 	void folderHints();
 	void folderExit();
 	void getLocation();
+	uint8 getLocation(uint8 index) {
+		return DreamBase::getLocation(index);
+	}
 	void setLocation();
+	void setLocation(uint8 index) {
+		DreamBase::setLocation(index);
+	}
 	void loadTempText();
 	void loadTempText(const char *fileName);
 	void loadTravelText();
-- 
cgit v1.2.3


From 5948b5a9e3b587fa257d7dea0ec32633060bbc38 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 14 Dec 2011 12:32:18 +0100
Subject: DREAMWEB: Allow quit from diary

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

(limited to 'engines')

diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index a144f850b6..599cdf7334 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1213,7 +1213,8 @@ void DreamGenContext::useDiary() {
 		dumpDiaryKeys();
 		dumpTextLine();
 		checkCoords(diaryList);
-	} while (!data.byte(kGetback));
+	} while (!data.byte(kGetback) && !quitRequested());
+
 
 	getRidOfTemp();
 	getRidOfTempText();
-- 
cgit v1.2.3


From a87a63c1bd45c925cc4d85458ccd78c82557cd18 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 13 Dec 2011 13:45:47 +0100
Subject: DREAMWEB: Convert execCommand to C++, remove comlist from data blob

---
 engines/dreamweb/dreamgen.cpp | 190 +++++++++++-------------------------------
 engines/dreamweb/dreamgen.h   |  32 ++++---
 engines/dreamweb/monitor.cpp  |  72 +++++++++++++++-
 engines/dreamweb/stubs.h      |   1 +
 4 files changed, 136 insertions(+), 159 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index e8e577e51b..ef96461d17 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2731,14 +2731,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 1244;
+	si = 1184;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 1260;
+	si = 1200;
 	_add(si, ax);
 	ax = pop();
 }
@@ -2790,7 +2790,7 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 1244);
+	_add(bx, 1184);
 	es.byte(bx) = 0;
 }
 
@@ -2821,88 +2821,6 @@ void DreamGenContext::makeCaps() {
 	_sub(al, 32);
 }
 
-void DreamGenContext::execCommand() {
-	STACK_CHECK;
-	es = cs;
-	bx = offset_comlist;
-	ds = cs;
-	si = 1278;
-	al = ds.byte(si);
-	_cmp(al, 0);
-	if (!flags.z())
-		goto notblankinp;
-	scrollMonitor();
-	return;
-notblankinp:
-	cl = 0;
-comloop:
-	push(bx);
-	push(si);
-comloop2:
-	al = ds.byte(si);
-	_add(si, 2);
-	ah = es.byte(bx);
-	_inc(bx);
-	_cmp(ah, 32);
-	if (flags.z())
-		goto foundcom;
-	_cmp(al, ah);
-	if (flags.z())
-		goto comloop2;
-	si = pop();
-	bx = pop();
-	_add(bx, 10);
-	_inc(cl);
-	_cmp(cl, 6);
-	if (!flags.z())
-		goto comloop;
-	netError();
-	al = 0;
-	return;
-foundcom:
-	si = pop();
-	bx = pop();
-	_cmp(cl, 1);
-	if (flags.z())
-		goto testcom;
-	_cmp(cl, 2);
-	if (flags.z())
-		goto directory;
-	_cmp(cl, 3);
-	if (flags.z())
-		goto accesscom;
-	_cmp(cl, 4);
-	if (flags.z())
-		goto signoncom;
-	_cmp(cl, 5);
-	if (flags.z())
-		goto keyscom;
-	goto quitcom;
-directory:
-	dirCom();
-	al = 0;
-	return;
-signoncom:
-	signOn();
-	al = 0;
-	return;
-accesscom:
-	read();
-	al = 0;
-	return;
-keyscom:
-	showKeys();
-	al = 0;
-	return;
-testcom:
-	al = 6;
-	monMessage();
-	al = 0;
-	return;
-quitcom:
-	al = 1;
-}
-
 void DreamGenContext::dirCom() {
 	STACK_CHECK;
 	cx = 30;
@@ -2919,7 +2837,7 @@ dirroot:
 	si = offset_rootdir;
 	_inc(si);
 	es = cs;
-	di = 1120;
+	di = 1060;
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
@@ -3021,7 +2939,7 @@ notyetassigned:
 	push(bx);
 	_add(bx, 2);
 	ds = cs;
-	si = 1278;
+	si = 1218;
 checkpass:
 	_lodsw();
 	ah = es.byte(bx);
@@ -3092,7 +3010,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 1120;
+	di = 1060;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -3222,7 +3140,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 1120+1;
+	di = 1060+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -3349,7 +3267,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 1278;
+	si = 1218;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -4167,7 +4085,7 @@ void DreamGenContext::clearChanges() {
 	di = 0;
 	_stosw(cx, true);
 	es = cs;
-	di = 1244;
+	di = 1184;
 	al = 1;
 	_stosb(2);
 	al = 0;
@@ -4474,51 +4392,51 @@ void DreamGenContext::__start() {
 		//0x0370: ...2 .... ...2 ....
 		0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0e, 0x21, 0x28, 0x00, 0x00, 0x32, 0x14, 0x00, 0xff, 0x44, 
 		//0x0380: ...2 ...! (..2 ...D
-		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x00, 0x01, 0x45, 0x58, 
-		//0x0390: REAM WEB. V99. ..EX
-		0x49, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x48, 0x45, 0x4c, 0x50, 0x20, 0x20, 0x20, 0x20, 
-		//0x03a0: IT        HELP     
-		0x20, 0x20, 0x4c, 0x49, 0x53, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x52, 0x45, 0x41, 0x44, 
-		//0x03b0:   LI ST        READ
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x47, 0x4f, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x03c0:        LO GON      
-		0x4b, 0x45, 0x59, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 
-		//0x03d0: KEYS        .. PUBL
-		0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 
-		//0x03e0: IC        PUBL IC  
-		0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 
-		//0x03f0:    . ..BL ACKD RAGO
-		0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 
-		//0x0400: N RY AN         ...
-		0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 
-		//0x0410: HEND RIX       LOUI
-		0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 
-		//0x0420: S       . ..SE PTIM
-		0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 
-		//0x0430: US     BE CKET T   
-		0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0440:  ...               
-		0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
-		//0x0450:  ."R OOT          .
-		0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 
-		//0x0460: "               .00
-		0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x4f, 0x42, 0x4a, 0x45, 0x43, 
-		//0x0470: 00.0 0... ..$O BJEC
-		0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0480: T NA ME O NE       
+		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x00, 0x01, 0x01, 0x00, 
+		//0x0390: REAM WEB. V99. ....
+		0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 
+		//0x03a0: PUBL IC        PUBL
+		0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 
+		//0x03b0: IC      . ..BL ACKD
+		0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x03c0: RAGO N RY AN       
+		0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x03d0:  ... HEND RIX      
+		0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 
+		//0x03e0: LOUI S       . ..SE
+		0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 
+		//0x03f0: PTIM US     BE CKET
+		0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0400: T     ...          
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0410:       ."R OOT      
+		0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0420:    . "             
+		0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x4f, 
+		//0x0430:  .00 00.0 0... ..$O
+		0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 
+		//0x0440: BJEC T NA ME O NE  
 		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0490:                    
-		0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 
-		//0x04a0:    . .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 
-		//0x04b0: .... .... .... D:..
+		//0x0450:                    
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 
+		//0x0460:         . .... ....
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+		//0x0470: .... .... .... ....
+		0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0480: D:.. .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0490: .... .... .... ....
+		0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x04a0: .... .... .... ....
+		0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 
+		//0x04b0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04c0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04d0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04e0: .... .... .... ....
-		0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04f0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0500: .... .... .... ....
@@ -4528,15 +4446,7 @@ void DreamGenContext::__start() {
 		//0x0520: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0530: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0540: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0550: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0560: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 
-		//0x0570: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
+		0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 43f93ee238..dc06f1f9e5 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,14 +32,13 @@
 
 namespace DreamGen {
 
-static const uint16 offset_money1poke = 0x046e;
-static const uint16 offset_operand1 = 0x0444;
-static const uint16 offset_comlist = 0x039e;
-static const uint16 offset_commandline = 0x047b;
-static const uint16 offset_rootdir = 0x0452;
-static const uint16 offset_money2poke = 0x0473;
+static const uint16 offset_commandline = 0x043f;
+static const uint16 offset_rootdir = 0x0416;
+static const uint16 offset_money2poke = 0x0437;
+static const uint16 offset_operand1 = 0x0408;
+static const uint16 offset_keys = 0x039e;
+static const uint16 offset_money1poke = 0x0432;
 static const uint16 offset_openchangesize = 0x039c;
-static const uint16 offset_keys = 0x03da;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -373,15 +372,15 @@ static const uint16 kCurrentsample = 452;
 static const uint16 kRoomssample = 453;
 static const uint16 kReelroutines = 454;
 static const uint16 kBasicsample = 911;
-static const uint16 kCurrentfile = 1120;
-static const uint16 kRoomscango = 1244;
-static const uint16 kRoompics = 1260;
-static const uint16 kOplist = 1275;
-static const uint16 kInputline = 1278;
-static const uint16 kPresslist = 1406;
-static const uint16 kQuitrequested = 1412;
-static const uint16 kSubtitles = 1413;
-static const uint16 kForeignrelease = 1414;
+static const uint16 kCurrentfile = 1060;
+static const uint16 kRoomscango = 1184;
+static const uint16 kRoompics = 1200;
+static const uint16 kOplist = 1215;
+static const uint16 kInputline = 1218;
+static const uint16 kPresslist = 1346;
+static const uint16 kQuitrequested = 1352;
+static const uint16 kSubtitles = 1353;
+static const uint16 kForeignrelease = 1354;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -569,7 +568,6 @@ public:
 	void searchForFiles();
 	void getExAd();
 	void initialMonCols();
-	void execCommand();
 	void findPuzText();
 	void swapWithInv();
 	void adjustRight();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index f01664632a..dba0d56c31 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -70,6 +70,7 @@ void DreamGenContext::useMon() {
 	scrollMonitor();
 	data.word(kBufferin) = 0;
 	data.word(kBufferout) = 0;
+	bool stop = false;
 	do {
 		di = data.word(kMonadx);
 		bx = data.word(kMonady);
@@ -80,10 +81,10 @@ void DreamGenContext::useMon() {
 		di = pop();
 		data.word(kMonadx) = di;
 		data.word(kMonady) = bx;
-		execCommand();
+		stop = execCommand();
 		if (quitRequested()) //TODO : Check why it crashes when put before the execcommand
 			break;
-	} while (al == 0);
+	} while (!stop);
 	getRidOfTemp();
 	getRidOfTempCharset();
 	deallocateMem(data.word(kTextfile1));
@@ -97,6 +98,73 @@ void DreamGenContext::useMon() {
 	workToScreenM();
 }
 
+bool DreamGenContext::execCommand() {
+	static const char *comlist[] = {
+		"EXIT",
+		"HELP",
+		"LIST",
+		"READ",
+		"LOGON",
+		"KEYS"
+	};
+
+	const char *inputLine = (const char *)data.ptr(kInputline, 64);
+	if (*inputLine == 0) {
+		// No input
+		scrollMonitor();
+		return false;
+	}
+
+	int cmd;
+	bool done = false;
+	// Loop over all commands in the list and see if we get a match
+	for (cmd = 0; cmd < ARRAYSIZE(comlist); ++cmd) {
+		const char *cmdStr = comlist[cmd];
+		const char *inputStr = inputLine;
+		// Compare the command, char by char, to see if we get a match.
+		// We only care about the prefix matching, though.
+		char inputChar, cmdChar;
+		do {
+			inputChar = *inputStr; inputStr += 2;
+			cmdChar = *cmdStr++;
+			if (cmdChar == 0) {
+				done = true;
+				break;
+			}
+		} while (inputChar == cmdChar);
+
+		if (done)
+			break;
+	}
+
+	// Execute the selected command
+	switch (cmd) {
+	case 0:
+		return true;
+	case 1:
+		monMessage(6);
+		break;
+	case 2:
+		dirCom();
+		break;
+	case 3:
+		read();
+		break;
+	case 4:
+		signOn();
+		break;
+	case 5:
+		showKeys();
+		break;
+	default:
+		netError();
+		break;
+	}
+	return false;
+}
+
+
+
 void DreamGenContext::monitorLogo() {
 	if (data.byte(kLogonum) != data.byte(kOldlogonum)) {
 		data.byte(kOldlogonum) = data.byte(kLogonum);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index a287d57bad..b3b974a43d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -594,5 +594,6 @@
 	void dumpDiaryKeys();
 	void runEndSeq();
 	void lookAtCard();
+	bool execCommand();
 
 #endif
-- 
cgit v1.2.3


From e44a79fdd49e746947cbb88e3982dc8c89e2ae44 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 13 Dec 2011 14:04:10 +0100
Subject: DREAMWEB: Convert makeCaps to C++, fix bug in delChar

---
 engines/dreamweb/dreambase.h  |  3 +++
 engines/dreamweb/dreamgen.cpp |  8 --------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/monitor.cpp  | 21 +++++++++++++++------
 engines/dreamweb/stubs.h      |  6 ++++--
 5 files changed, 22 insertions(+), 17 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 2048f39e3b..a451704c6a 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -52,6 +52,9 @@ public:
 
 public:
 	// from monitor.cpp
+	void input();
+	byte makeCaps(byte c);
+	void delChar();
 	void printOuterMon();
 	void showCurrentFile();
 	void accessLightOn();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index ef96461d17..3831f386db 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2813,14 +2813,6 @@ emptyinterface:
 	al = 0;
 }
 
-void DreamGenContext::makeCaps() {
-	STACK_CHECK;
-	_cmp(al, 'a');
-	if (flags.c())
-		return /* (notupperc) */;
-	_sub(al, 32);
-}
-
 void DreamGenContext::dirCom() {
 	STACK_CHECK;
 	cx = 30;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index dc06f1f9e5..8d23f9768e 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -554,7 +554,6 @@ public:
 	void checkInside();
 	void findPathOfPoint();
 	void getDestInfo();
-	void makeCaps();
 	void read();
 	void additionalText();
 	void mugger();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index dba0d56c31..5d0987b29e 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -185,7 +185,7 @@ void DreamBase::printLogo() {
 	showCurrentFile();
 }
 
-void DreamGenContext::input() {
+void DreamBase::input() {
 	char *inputLine = (char *)data.ptr(kInputline, 64);
 	memset(inputLine, 0, 64);
 	data.word(kCurpos) = 0;
@@ -215,9 +215,7 @@ void DreamGenContext::input() {
 			continue;
 		if ((currentKey == 32) && (data.word(kCurpos) == 0))
 			continue;
-		al = currentKey;
-		makeCaps();
-		currentKey = al;
+		currentKey = makeCaps(currentKey);
 		inputLine[data.word(kCurpos) * 2 + 0] = currentKey;
 		if (currentKey > 'Z')
 			continue;
@@ -231,7 +229,18 @@ void DreamGenContext::input() {
 	}
 }
 
-void DreamGenContext::delChar() {
+void DreamGenContext::makeCaps() {
+	al = makeCaps(al);
+}
+
+byte DreamBase::makeCaps(byte c) {
+	// TODO: Replace calls to this by toupper() ?
+	if (c >= 'a')
+		c -= 'a' - 'A'; // = 32
+	return c;
+}
+
+void DreamBase::delChar() {
 	char *inputLine = (char *)data.ptr(kInputline, 0);
 	--data.word(kCurpos);
 	inputLine[data.word(kCurpos) * 2] = 0;
@@ -241,7 +250,7 @@ void DreamGenContext::delChar() {
 	uint16 offset = data.word(kCurpos);
 	offset = ((offset & 0x00ff) << 8) | ((offset & 0xff00) >> 8);
 	multiPut(mapStore() + offset, data.word(kMonadx), data.word(kMonady), 8, 8);
-	multiDump(data.word(kMonadx), data.word(kMonady), al, 8);
+	multiDump(data.word(kMonadx), data.word(kMonady), 8, 8);
 }
 
 void DreamBase::printCurs() {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index b3b974a43d..481e784e4a 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -38,7 +38,6 @@
 	void loadTempCharset();
 	void loadTempCharset(const char *fileName);
 	void saveLoad();
-	void delChar();
 	void hangOnCurs(uint16 frameCount);
 	void hangOnCurs();
 	void workToScreen();
@@ -267,7 +266,10 @@
 	void dumpMenu();
 	void useMenu();
 	void useMon();
-	void input();
+	void makeCaps();
+	byte makeCaps(byte c) {
+		return DreamBase::makeCaps(c);
+	}
 	void monPrint();
 	const char *monPrint(const char *string) {
 		return DreamBase::monPrint(string);
-- 
cgit v1.2.3


From b466575d9e36d1c36e64e2d3cccadfd44e2e6940 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 13 Dec 2011 14:21:21 +0100
Subject: DREAMWEB: Move more stuff to DreamBase

---
 engines/dreamweb/dreambase.h | 19 +++++++++++++++++
 engines/dreamweb/monitor.cpp | 12 ++++-------
 engines/dreamweb/stubs.cpp   | 49 ++++++++++++++++++++++----------------------
 engines/dreamweb/stubs.h     | 27 ++++++------------------
 4 files changed, 53 insertions(+), 54 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index a451704c6a..1a730ac541 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -55,6 +55,10 @@ public:
 	void input();
 	byte makeCaps(byte c);
 	void delChar();
+	void monMessage(uint8 index);
+	void netError();
+	void monitorLogo();
+	void randomAccess(uint16 count);
 	void printOuterMon();
 	void showCurrentFile();
 	void accessLightOn();
@@ -155,6 +159,21 @@ public:
 	void *getAnyAd(uint8 *value1, uint8 *value2);
 	const uint8 *getTextInFile1(uint16 index);
 	uint8 findNextColon(const uint8 **string);
+	uint16 allocateMem(uint16 paragraphs);
+	void deallocateMem(uint16 segment);
+	uint16 allocateAndLoad(unsigned int size);
+	uint16 standardLoad(const char *fileName, uint16 *outSizeInBytes = NULL); // Returns a segment handle which needs to be freed with deallocatemem for symmetry
+	void *standardLoadCPP(const char *fileName, uint16 *outSizeInBytes = NULL); // And this one should be 'free'd
+	void loadIntoTemp(const char *fileName);
+	void loadIntoTemp2(const char *fileName);
+	void loadIntoTemp3(const char *fileName);
+	void loadTempCharset(const char *fileName);
+	void clearAndLoad(uint8 *buf, uint8 c, unsigned int size, unsigned int maxSize);
+	void clearAndLoad(uint16 seg, uint8 c, unsigned int size, unsigned int maxSize);
+	void sortOutMap();
+	void loadRoomData(const Room &room, bool skipDat);
+	void useTempCharset();
+	void useCharset1();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 5d0987b29e..30ba9b88e0 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -165,7 +165,7 @@ bool DreamGenContext::execCommand() {
 
 
 
-void DreamGenContext::monitorLogo() {
+void DreamBase::monitorLogo() {
 	if (data.byte(kLogonum) != data.byte(kOldlogonum)) {
 		data.byte(kOldlogonum) = data.byte(kLogonum);
 		printLogo();
@@ -283,10 +283,6 @@ void DreamBase::delCurs() {
 	multiDump(x, y, width, height);
 }
 
-void DreamGenContext::hangOnCurs() {
-	hangOnCurs(cx);
-}
-
 void DreamBase::scrollMonitor() {
 	printLogo();
 	printUnderMon();
@@ -318,7 +314,7 @@ void DreamGenContext::randomAccess() {
 	randomAccess(cx);
 }
 
-void DreamGenContext::randomAccess(uint16 count) {
+void DreamBase::randomAccess(uint16 count) {
 	for (uint16 i = 0; i < count; ++i) {
 		vSync();
 		vSync();
@@ -335,7 +331,7 @@ void DreamGenContext::monMessage() {
 	monMessage(al);
 }
 
-void DreamGenContext::monMessage(uint8 index) {
+void DreamBase::monMessage(uint8 index) {
 	assert(index > 0);
 	const char *string = (const char *)getSegment(data.word(kTextfile1)).ptr(kTextstart, 0);
 	for (uint8 i = 0; i < index; ++i) {
@@ -345,7 +341,7 @@ void DreamGenContext::monMessage(uint8 index) {
 	monPrint(string);
 }
 
-void DreamGenContext::netError() {
+void DreamBase::netError() {
 	monMessage(5);
 	scrollMonitor();
 }
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index c365ee48d3..55e7916fc0 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -744,7 +744,7 @@ uint8 *DreamBase::textUnder() {
 	return getSegment(data.word(kBuffers)).ptr(kTextunder, 0);
 }
 
-uint16 DreamGenContext::standardLoad(const char *fileName, uint16 *outSizeInBytes) {
+uint16 DreamBase::standardLoad(const char *fileName, uint16 *outSizeInBytes) {
 	FileHeader header;
 
 	Common::File file;
@@ -758,7 +758,7 @@ uint16 DreamGenContext::standardLoad(const char *fileName, uint16 *outSizeInByte
 	return result;
 }
 
-void *DreamGenContext::standardLoadCPP(const char *fileName, uint16 *outSizeInBytes) {
+void *DreamBase::standardLoadCPP(const char *fileName, uint16 *outSizeInBytes) {
 	uint16 sizeInBytes;
 	uint16 seg = standardLoad(fileName, &sizeInBytes);
 	void *buffer = malloc(sizeInBytes);
@@ -769,28 +769,24 @@ void *DreamGenContext::standardLoadCPP(const char *fileName, uint16 *outSizeInBy
 	return buffer;
 }
 
-void DreamGenContext::loadIntoTemp() {
-	loadIntoTemp((const char *)data.ptr(dx, 0));
-}
-
-void DreamGenContext::loadIntoTemp(const char *fileName) {
+void DreamBase::loadIntoTemp(const char *fileName) {
 	data.word(kTempgraphics) = standardLoad(fileName);
 }
 
-void DreamGenContext::loadIntoTemp2(const char *fileName) {
+void DreamBase::loadIntoTemp2(const char *fileName) {
 	data.word(kTempgraphics2) = standardLoad(fileName);
 }
 
-void DreamGenContext::loadIntoTemp3(const char *fileName) {
+void DreamBase::loadIntoTemp3(const char *fileName) {
 	data.word(kTempgraphics3) = standardLoad(fileName);
 }
 
-void DreamGenContext::loadTempCharset() {
-	loadTempCharset((const char *)data.ptr(dx, 0));
+void DreamBase::loadTempCharset(const char *fileName) {
+	engine->setTempCharset(standardLoadCPP(fileName));
 }
 
-void DreamGenContext::loadTempCharset(const char *fileName) {
-	engine->setTempCharset(standardLoadCPP(fileName));
+void DreamGenContext::hangOnCurs() {
+	hangOnCurs(cx);
 }
 
 void DreamGenContext::hangOnCurs(uint16 frameCount) {
@@ -970,22 +966,25 @@ void DreamGenContext::getTime() {
 	data.byte(kHourcount) = ch;
 }
 
-uint16 DreamGenContext::allocateMem(uint16 paragraphs) {
+uint16 DreamBase::allocateMem(uint16 paragraphs) {
 	uint size = (paragraphs + 2) * 16;
 	debug(1, "allocate mem, %u bytes", size);
-	flags._c = false;
 	SegmentRef seg = allocateSegment(size);
 	uint16 result = (uint16)seg;
 	debug(1, "\tsegment address -> %04x", result);
 	return result;
 }
 
-void DreamGenContext::deallocateMem(uint16 segment) {
+void DreamBase::deallocateMem(uint16 segment) {
 	debug(1, "deallocating segment %04x", segment);
 	deallocateSegment(segment);
 
-	//fixing invalid entries in the sprite table
-	es = data;
+
+	// FIXME: The following line used to be enabled with the comment: "fixing
+	// invalid entries in the sprite table"
+	// So if there are regressions with sprites, we may want to investigate this
+	// closer.
+//	es = data;
 	uint tsize = 16 * 32;
 	uint16 bseg = data.word(kBuffers);
 	if (!bseg)
@@ -1075,21 +1074,21 @@ void DreamGenContext::makeBackOb(SetObject *objData) {
 	sprite->animFrame = 0;
 }
 
-uint16 DreamGenContext::allocateAndLoad(unsigned int size) {
+uint16 DreamBase::allocateAndLoad(unsigned int size) {
 	// allocatemem adds 32 bytes, so it doesn't matter that size/16 rounds down
 	uint16 result = allocateMem(size / 16);
 	engine->readFromFile(getSegment(result).ptr(0, size), size);
 	return result;
 }
 
-void DreamGenContext::clearAndLoad(uint8 *buf, uint8 c,
+void DreamBase::clearAndLoad(uint8 *buf, uint8 c,
                                    unsigned int size, unsigned int maxSize) {
 	assert(size <= maxSize);
 	memset(buf, c, maxSize);
 	engine->readFromFile(buf, size);
 }
 
-void DreamGenContext::clearAndLoad(uint16 seg, uint8 c,
+void DreamBase::clearAndLoad(uint16 seg, uint8 c,
                                    unsigned int size, unsigned int maxSize) {
 	assert(size <= maxSize);
 	uint8 *buf = getSegment(seg).ptr(0, maxSize);
@@ -2027,7 +2026,7 @@ void DreamGenContext::zoomOnOff() {
 	workToScreenM();
 }
 
-void DreamGenContext::sortOutMap() {
+void DreamBase::sortOutMap() {
 	const uint8 *src = workspace();
 	uint8 *dst = (uint8 *)getSegment(data.word(kMapdata)).ptr(0, 0);
 	for (uint16 y = 0; y < kMaplength; ++y) {
@@ -2262,11 +2261,11 @@ void DreamGenContext::doLook() {
 	workToScreenM();
 }
 
-void DreamGenContext::useCharset1() {
+void DreamBase::useCharset1() {
 	engine->setCurrentCharset((Frame *)getSegment(data.word(kCharset1)).ptr(0, 0));
 }
 
-void DreamGenContext::useTempCharset() {
+void DreamBase::useTempCharset() {
 	engine->setCurrentCharset(engine->tempCharset());
 }
 
@@ -2310,7 +2309,7 @@ void DreamGenContext::getRidOfAll() {
 }
 
 // if skipDat, skip clearing and loading Setdat and Freedat
-void DreamGenContext::loadRoomData(const Room &room, bool skipDat) {
+void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	engine->openFile(room.name);
 
 	FileHeader header;
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 481e784e4a..089272bb0b 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -27,16 +27,6 @@
 	void startup1();
 	void switchRyanOn();
 	void switchRyanOff();
-	uint16 allocateMem(uint16 paragraphs);
-	void deallocateMem(uint16 segment);
-	uint16 standardLoad(const char *fileName, uint16 *outSizeInBytes = NULL); // Returns a segment handle which needs to be freed with deallocatemem for symmetry
-	void *standardLoadCPP(const char *fileName, uint16 *outSizeInBytes = NULL); // And this one should be 'free'd
-	void loadIntoTemp();
-	void loadIntoTemp(const char *fileName);
-	void loadIntoTemp2(const char *fileName);
-	void loadIntoTemp3(const char *fileName);
-	void loadTempCharset();
-	void loadTempCharset(const char *fileName);
 	void saveLoad();
 	void hangOnCurs(uint16 frameCount);
 	void hangOnCurs();
@@ -236,7 +226,6 @@
 	void getBlockOfPixel();
 	uint8 getBlockOfPixel(uint8 x, uint8 y);
 	void examineObText();
-	void sortOutMap();
 	void showCity();
 	uint16 getPersFrame(uint8 index);
 	void convIcons();
@@ -274,11 +263,14 @@
 	const char *monPrint(const char *string) {
 		return DreamBase::monPrint(string);
 	}
-	void randomAccess(uint16 count);
 	void randomAccess();
-	void monMessage(uint8 index);
+	void randomAccess(uint16 count) {
+		DreamBase::randomAccess(count);
+	}
 	void monMessage();
-	void netError();
+	void monMessage(uint8 index) {
+		DreamBase::monMessage(index);
+	}
 	void playChannel1();
 	void playChannel1(uint8 index) {
 		DreamBase::playChannel1(index);
@@ -291,8 +283,6 @@
 	void look();
 	void autoLook();
 	void doLook();
-	void useTempCharset();
-	void useCharset1();
 	void getBackFromOb();
 	void getRidOfAll();
 	void getRidOfTemp();
@@ -307,10 +297,6 @@
 	void actualLoad();
 	void loadPosition(unsigned int slot);
 	void savePosition(unsigned int slot, const char *descbuf);
-	uint16 allocateAndLoad(unsigned int size);
-	void clearAndLoad(uint8 *buf, uint8 c, unsigned int size, unsigned int maxSize);
-	void clearAndLoad(uint16 seg, uint8 c, unsigned int size, unsigned int maxSize);
-	void loadRoomData(const Room &room, bool skipDat);
 	void restoreAll();
 	void restoreReels();
 	void enterSymbol();
@@ -570,7 +556,6 @@
 	void hangOnPQ();
 	void showGun();
 	void endGame();
-	void monitorLogo();
 	void quitSymbol();
 	void diaryKeyP();
 	void diaryKeyN();
-- 
cgit v1.2.3


From cf77cc922d8efdb95c9f0f8e20bc3773d0788206 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 14 Dec 2011 18:08:46 +0100
Subject: TSAGE: R2R - Implement scene 2600

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |  2 ++
 engines/tsage/ringworld2/ringworld2_scenes2.cpp | 41 +++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes2.h   | 12 ++++++++
 3 files changed, 55 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index ef1cb76c91..b93e9c202a 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -147,6 +147,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Maze: Tannery
 		return new Scene2535();
 	case 2600:
+		// Maze: Exit
+		return new Scene2600();
 	case 2700:
 	case 2750:
 	case 2800:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index d820784c45..b2e7b46420 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -2983,5 +2983,46 @@ void Scene2535::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 2600 - Maze: Exit
+ *
+ *--------------------------------------------------------------------------*/
+Scene2600::Scene2600(): SceneExt() {
+	_rotation = NULL;
+}
+
+void Scene2600::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	SYNC_POINTER(_rotation);
+}
+
+void Scene2600::postInit(SceneObjectList *OwnerList) {
+	loadScene(2600);
+	R2_GLOBALS._v58CE2 = 0;
+	SceneExt::postInit();
+	R2_GLOBALS._sound1.fadeSound(214);
+	R2_GLOBALS._sound2.play(215);
+	_rotation = R2_GLOBALS._scenePalette.addRotation(176, 191, 1);
+	_rotation->setDelay(3);
+	_rotation->_countdown = 1;
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.disableControl();
+	_sceneMode = 2600;
+	R2_GLOBALS._player.setAction(&_sequenceManager, this, 2600, &R2_GLOBALS._player, NULL);
+}
+
+void Scene2600::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	R2_GLOBALS._sound2.fadeOut2(NULL);
+//	_rotation->remove();
+	SceneExt::remove();
+}
+
+void Scene2600::signal() {
+	if (_sceneMode == 2600)
+		g_globals->_sceneManager.changeScene(3800);
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index e655d1e8a8..8684078860 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -478,6 +478,18 @@ public:
 	virtual void signal();
 };
 
+class Scene2600 : public SceneExt {
+public:
+	SequenceManager _sequenceManager;
+	PaletteRotation *_rotation;
+
+	Scene2600();
+	virtual void synchronize(Serializer &s);
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From ea8b6c8c6dd43ed0c645927966e4150cc987b5c6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 15 Dec 2011 00:11:12 +0200
Subject: DREAMWEB: Port 'findsetobject' and 'findexobject' to C++ and simplify
 compare()

---
 engines/dreamweb/dreamgen.cpp | 66 ------------------------------
 engines/dreamweb/dreamgen.h   |  2 -
 engines/dreamweb/stubs.cpp    | 62 +++++++++++++++++++++++-----
 engines/dreamweb/stubs.h      |  4 ++
 engines/dreamweb/use.cpp      | 94 ++++++++++++++-----------------------------
 5 files changed, 87 insertions(+), 141 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 3831f386db..fb232ceabc 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3630,72 +3630,6 @@ doselob:
 	useRoutine();
 }
 
-void DreamGenContext::findSetObject() {
-	STACK_CHECK;
-	_sub(al, 'A');
-	_sub(ah, 'A');
-	_sub(cl, 'A');
-	_sub(ch, 'A');
-	es = data.word(kSetdat);
-	bx = 0;
-	dl = 0;
-findsetloop:
-	_cmp(al, es.byte(bx+12));
-	if (!flags.z())
-		goto nofind;
-	_cmp(ah, es.byte(bx+13));
-	if (!flags.z())
-		goto nofind;
-	_cmp(cl, es.byte(bx+14));
-	if (!flags.z())
-		goto nofind;
-	_cmp(ch, es.byte(bx+15));
-	if (!flags.z())
-		goto nofind;
-	al = dl;
-	return;
-nofind:
-	_add(bx, 64);
-	_inc(dl);
-	_cmp(dl, 128);
-	if (!flags.z())
-		goto findsetloop;
-	al = dl;
-}
-
-void DreamGenContext::findExObject() {
-	STACK_CHECK;
-	_sub(al, 'A');
-	_sub(ah, 'A');
-	_sub(cl, 'A');
-	_sub(ch, 'A');
-	es = data.word(kExtras);
-	bx = (0+2080+30000);
-	dl = 0;
-findexloop:
-	_cmp(al, es.byte(bx+12));
-	if (!flags.z())
-		goto nofindex;
-	_cmp(ah, es.byte(bx+13));
-	if (!flags.z())
-		goto nofindex;
-	_cmp(cl, es.byte(bx+14));
-	if (!flags.z())
-		goto nofindex;
-	_cmp(ch, es.byte(bx+15));
-	if (!flags.z())
-		goto nofindex;
-	al = dl;
-	return;
-nofindex:
-	_add(bx, 16);
-	_inc(dl);
-	_cmp(dl, (114));
-	if (!flags.z())
-		goto findexloop;
-	al = dl;
-}
-
 void DreamGenContext::isRyanHolding() {
 	STACK_CHECK;
 	_sub(al, 'A');
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 8d23f9768e..2a8a6c613e 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -537,7 +537,6 @@ public:
 	void lookAtPlace();
 	void findAllOpen();
 	void showSlots();
-	void findSetObject();
 	void deleteExObject();
 	void helicopter();
 	void getEitherAd();
@@ -562,7 +561,6 @@ public:
 	void useGun();
 	void useHandle();
 	void incRyanPage();
-	void findExObject();
 	void clearChanges();
 	void searchForFiles();
 	void getExAd();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 55e7916fc0..21173f8e3b 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1755,19 +1755,64 @@ void DreamGenContext::printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWid
 	printDirect(&string, x, &y, maxWidth, centered);
 }
 
+bool objectMatches(void *object, const char *id) {
+	const char *objId = (const char *)(((const uint8 *)object) + 12); // whether it is a DynObject or a SetObject
+	for (size_t i = 0; i < 4; ++i) {
+		if (id[i] != objId[i] + 'A')
+			return false;
+	}
+	return true;
+}
+
 void DreamGenContext::compare() {
 	char id[4] = { cl, ch, dl, dh };
 	flags._z = compare(al, ah, id);
 }
 
 bool DreamGenContext::compare(uint8 index, uint8 flag, const char id[4]) {
-	void *ptr = getAnyAdDir(index, flag);
-	const char *objId = (const char *)(((const uint8 *)ptr) + 12); // whether it is a DynObject or a SetObject
-	for (size_t i = 0; i < 4; ++i) {
-		if (id[i] != objId[i] + 'A')
-			return false;
-	}
-	return true;
+	return objectMatches(getAnyAdDir(index, flag), id);
+}
+
+void DreamGenContext::findSetObject() {
+	char id[5];
+	id[0] = al;
+	id[1] = ah;
+	id[2] = cl;
+	id[3] = ch;
+	id[4] = '\0';
+	al = findSetObject(id);
+}
+
+uint16 DreamGenContext::findSetObject(const char *id) {
+	uint16 index = 0;
+
+	do {
+		if (objectMatches(getSetAd(index), id))
+			return index;
+	} while (index++ < 128);
+
+	return index;	// 128, not found
+}
+
+void DreamGenContext::findExObject() {
+	char id[5];
+	id[0] = al;
+	id[1] = ah;
+	id[2] = cl;
+	id[3] = ch;
+	id[4] = '\0';
+	al = findExObject(id);
+}
+
+uint16 DreamGenContext::findExObject(const char *id) {
+	uint16 index = 0;
+
+	do {
+		if (objectMatches(getExAd(index), id))
+			return index;
+	} while (index++ < 114);
+
+	return index;	// 114, not found
 }
 
 bool DreamGenContext::isItDescribed(const ObjPos *pos) {
@@ -3344,8 +3389,7 @@ void DreamGenContext::openInv() {
 }
 
 void DreamGenContext::obsThatDoThings() {
-	char id[4] = { 'M', 'E', 'M', 'B' };	// TODO: convert to string with trailing zero
-	if (!compare(data.byte(kCommand), data.byte(kObjecttype), id))
+	if (!compare(data.byte(kCommand), data.byte(kObjecttype), "MEMB"))
 		return; // notlouiscard
 
 	if (DreamBase::getLocation(4) != 1) {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 089272bb0b..6764c18beb 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -582,5 +582,9 @@
 	void runEndSeq();
 	void lookAtCard();
 	bool execCommand();
+	void findSetObject();
+	uint16 findSetObject(const char *id);
+	void findExObject();
+	uint16 findExObject(const char *id);
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 599cdf7334..f5d631aed5 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -747,8 +747,7 @@ bool DreamGenContext::defaultUseHandler(const char *id) {
 }
 
 void DreamGenContext::useChurchGate() {
-	char id[4] = { 'C', 'U', 'T', 'T' };	// TODO: convert to string with trailing zero
-	if (defaultUseHandler(id))
+	if (defaultUseHandler("CUTT"))
 		return;
 
 	// Cut gate
@@ -784,8 +783,7 @@ void DreamGenContext::useFullCart() {
 }
 
 void DreamGenContext::useClearBox() {
-	char id[4] = { 'R', 'A', 'I', 'L' };	// TODO: convert to string with trailing zero
-	if (defaultUseHandler(id))
+	if (defaultUseHandler("RAIL"))
 		return;
 
 	// Open box
@@ -800,8 +798,7 @@ void DreamGenContext::useClearBox() {
 }
 
 void DreamGenContext::openTVDoor() {
-	char id[4] = { 'U', 'L', 'O', 'K' };	// TODO: convert to string with trailing zero
-	if (defaultUseHandler(id))
+	if (defaultUseHandler("ULOK"))
 		return;
 
 	// Key on TV
@@ -816,9 +813,7 @@ void DreamGenContext::usePlate() {
 		return;
 	}
 
-	char screw[4] = { 'S', 'C', 'R', 'W' };	// TODO: convert to string with trailing zero
-	char knife[4] = { 'K', 'N', 'F', 'E' };	// TODO: convert to string with trailing zero
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), screw)) {
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), "SCRW")) {
 		// Unscrew plate
 		playChannel1(20);
 		showFirstUse();
@@ -828,7 +823,7 @@ void DreamGenContext::usePlate() {
 		placeFreeObject(0);
 		data.byte(kProgresspoints)++;
 		data.byte(kGetback) = 1;
-	} else if (compare(data.byte(kWithobject), data.byte(kWithtype), knife)) {
+	} else if (compare(data.byte(kWithobject), data.byte(kWithtype), "KNFE")) {
 		// Tried knife
 		showPuzText(54, 300);
 		putBackObStuff();
@@ -845,8 +840,7 @@ void DreamGenContext::usePlinth() {
 		return;
 	}
 
-	char id[4] = { 'D', 'K', 'E', 'Y' };	// TODO: convert to string with trailing zero
-	if (!compare(data.byte(kWithobject), data.byte(kWithtype), id)) {
+	if (!compare(data.byte(kWithobject), data.byte(kWithtype), "DKEY")) {
 		// Wrong key
 		showFirstUse();
 		putBackObStuff();
@@ -864,8 +858,7 @@ void DreamGenContext::usePlinth() {
 }
 
 void DreamGenContext::useElvDoor() {
-	char id[4] = { 'A', 'X', 'E', 'D' };	// TODO: convert to string with trailing zero
-	if (defaultUseHandler(id))
+	if (defaultUseHandler("AXED"))
 		return;
 
 	// Axe on door
@@ -899,8 +892,7 @@ void DreamGenContext::useWinch() {
 	ah = 1;
 	checkInside();
 
-	char id[4] = { 'F', 'U', 'S', 'E' };	// TODO: convert to string with trailing zero
-	if (cl == kNumexobjects || !compare(cl, 4, id)) {
+	if (cl == kNumexobjects || !compare(cl, 4, "FUSE")) {
 		// No winch
 		showFirstUse();
 		putBackObStuff();
@@ -923,8 +915,7 @@ void DreamGenContext::useWinch() {
 }
 
 void DreamGenContext::useCart() {
-	char id[4] = { 'R', 'O', 'C', 'K' };	// TODO: convert to string with trailing zero
-	if (defaultUseHandler(id))
+	if (defaultUseHandler("ROCK"))
 		return;
 
 	DynObject *exObject = getExAd(data.byte(kWithobject));
@@ -959,8 +950,7 @@ void DreamGenContext::chewy() {
 }
 
 void DreamGenContext::useHole() {
-	char id[4] = { 'H', 'N', 'D', 'A' };	// TODO: convert to string with trailing zero
-	if (defaultUseHandler(id))
+	if (defaultUseHandler("HNDA"))
 		return;
 
 	showFirstUse();
@@ -972,8 +962,7 @@ void DreamGenContext::useHole() {
 }
 
 void DreamGenContext::openHotelDoor() {
-	char id[4] = { 'K', 'E', 'Y', 'A' };	// TODO: convert to string with trailing zero
-	if (defaultUseHandler(id))
+	if (defaultUseHandler("KEYA"))
 		return;
 
 	playChannel1(16);
@@ -983,8 +972,7 @@ void DreamGenContext::openHotelDoor() {
 }
 
 void DreamGenContext::openHotelDoor2() {
-	char id[4] = { 'K', 'E', 'Y', 'A' };	// TODO: convert to string with trailing zero
-	if (defaultUseHandler(id))
+	if (defaultUseHandler("KEYA"))
 		return;
 
 	playChannel1(16);
@@ -993,8 +981,7 @@ void DreamGenContext::openHotelDoor2() {
 }
 
 void DreamGenContext::grafittiDoor() {
-	char id[4] = { 'A', 'P', 'E', 'N' };	// TODO: convert to string with trailing zero
-	if (defaultUseHandler(id))
+	if (defaultUseHandler("APEN"))
 		return;
 
 	showFirstUse();
@@ -1002,8 +989,7 @@ void DreamGenContext::grafittiDoor() {
 }
 
 void DreamGenContext::usePoolReader() {
-	char id[4] = { 'M', 'E', 'M', 'B' };	// TODO: convert to string with trailing zero
-	if (defaultUseHandler(id))
+	if (defaultUseHandler("MEMB"))
 		return;
 
 	if (data.byte(kTalkedtoattendant) != 1) {
@@ -1019,8 +1005,7 @@ void DreamGenContext::usePoolReader() {
 }
 
 void DreamGenContext::useCardReader1() {
-	char id[4] = { 'C', 'S', 'H', 'R' };	// TODO: convert to string with trailing zero
-	if (defaultUseHandler(id))
+	if (defaultUseHandler("CSHR"))
 		return;
 
 	if (data.byte(kTalkedtosparky) == 0) {
@@ -1042,8 +1027,7 @@ void DreamGenContext::useCardReader1() {
 }
 
 void DreamGenContext::useCardReader2() {
-	char id[4] = { 'C', 'S', 'H', 'R' };	// TODO: convert to string with trailing zero
-	if (defaultUseHandler(id))
+	if (defaultUseHandler("CSHR"))
 		return;
 
 	if (data.byte(kTalkedtoboss) == 0) {
@@ -1070,8 +1054,7 @@ void DreamGenContext::useCardReader2() {
 }
 
 void DreamGenContext::useCardReader3() {
-	char id[4] = { 'C', 'S', 'H', 'R' };	// TODO: convert to string with trailing zero
-	if (defaultUseHandler(id))
+	if (defaultUseHandler("CSHR"))
 		return;
 
 	if (data.byte(kTalkedtorecep) == 0) {
@@ -1098,8 +1081,7 @@ void DreamGenContext::useLighter() {
 		return;
 	}
 
-	char id[4] = { 'S', 'M', 'K', 'E' };	// TODO: convert to string with trailing zero
-	if (!compare(data.byte(kWithobject), data.byte(kWithtype), id)) {
+	if (!compare(data.byte(kWithobject), data.byte(kWithtype), "SMKE")) {
 		showFirstUse();
 		putBackObStuff();
 	} else {
@@ -1116,8 +1098,7 @@ void DreamGenContext::useWire() {
 		return;
 	}
 
-	char knife[4] = { 'K', 'N', 'F', 'E' };	// TODO: convert to string with trailing zero
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), knife)) {
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), "KNFE")) {
 		removeSetObject(51);
 		placeSetObject(52);
 		showPuzText(11, 300);
@@ -1126,8 +1107,7 @@ void DreamGenContext::useWire() {
 		return;
 	}
 
-	char axe[4] = { 'A', 'X', 'E', 'D' };	// TODO: convert to string with trailing zero
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), axe)) {
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), "AXED")) {
 		showPuzText(16, 300);
 		putBackObStuff();
 		return;
@@ -1231,8 +1211,7 @@ void DreamGenContext::useControl() {
 		return;
 	}
 
-	char key[4] = { 'K', 'E', 'Y', 'A' };	// TODO: convert to string with trailing zero
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), key)) {	// Right key
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), "KEYA")) {	// Right key
 		playChannel1(16);
 		if (data.byte(kLocation) == 21) {	// Going down
 			showPuzText(3, 300);
@@ -1250,10 +1229,7 @@ void DreamGenContext::useControl() {
 	}
 
 	if (data.byte(kReallocation) == 21) {
-		char knife[4] = { 'K', 'N', 'F', 'E' };	// TODO: convert to string with trailing zero
-		char   axe[4] = { 'A', 'X', 'E', 'D' };	// TODO: convert to string with trailing zero
-
-		if (compare(data.byte(kWithobject), data.byte(kWithtype), knife)) {
+		if (compare(data.byte(kWithobject), data.byte(kWithtype), "KNFE")) {
 			// Jimmy controls
 			placeSetObject(50);
 			placeSetObject(51);
@@ -1265,7 +1241,7 @@ void DreamGenContext::useControl() {
 			showPuzText(10, 300);
 			data.byte(kProgresspoints)++;
 			data.byte(kGetback) = 1;
-		} else if (compare(data.byte(kWithobject), data.byte(kWithtype), axe)) {
+		} else if (compare(data.byte(kWithobject), data.byte(kWithtype), "AXED")) {
 			// Axe on controls
 			showPuzText(16, 300);
 			data.byte(kProgresspoints)++;
@@ -1288,8 +1264,7 @@ void DreamGenContext::useSLab() {
 		return;
 	}
 
-	char id[4] = { 'J', 'E', 'W', 'L' };	// TODO: convert to string with trailing zero
-	if (!compare(data.byte(kWithobject), data.byte(kWithtype), id)) {
+	if (!compare(data.byte(kWithobject), data.byte(kWithtype), "JEWL")) {
 		showPuzText(14, 300);
 		putBackObStuff();
 		return;
@@ -1321,17 +1296,14 @@ void DreamGenContext::usePipe() {
 		return;
 	}
 
-	char cupEmpty[4] = { 'C', 'U', 'P', 'E' };	// TODO: convert to string with trailing zero
-	char  cupFull[4] = { 'C', 'U', 'P', 'F' };	// TODO: convert to string with trailing zero
-
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), cupEmpty)) {
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), "CUPE")) {
 		// Fill cup
 		showPuzText(36, 300);
 		putBackObStuff();
 		DynObject *exObject = getExAd(data.byte(kWithobject));
 		exObject->id[3] = 'F'-'A';	// CUPE (empty cup) -> CUPF (full cup)
 		return;
-	} else if (compare(data.byte(kWithobject), data.byte(kWithtype), cupFull)) {
+	} else if (compare(data.byte(kWithobject), data.byte(kWithtype), "CUPF")) {
 		// Already full
 		showPuzText(35, 300);
 		putBackObStuff();
@@ -1348,10 +1320,7 @@ void DreamGenContext::useOpenBox() {
 		return;
 	}
 
-	char cupEmpty[4] = { 'C', 'U', 'P', 'E' };	// TODO: convert to string with trailing zero
-	char  cupFull[4] = { 'C', 'U', 'P', 'F' };	// TODO: convert to string with trailing zero
-
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), cupFull)) {
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), "CUPF")) {
 		// Destroy open box
 		data.byte(kProgresspoints)++;
 		showPuzText(37, 300);
@@ -1367,7 +1336,7 @@ void DreamGenContext::useOpenBox() {
 		return;
 	}
 
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), cupEmpty)) {
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), "CUPE")) {
 		// Open box wrong
 		showPuzText(38, 300);
 		putBackObStuff();
@@ -1383,10 +1352,7 @@ void DreamGenContext::runTap() {
 		return;
 	}
 
-	char cupEmpty[4] = { 'C', 'U', 'P', 'E' };	// TODO: convert to string with trailing zero
-	char  cupFull[4] = { 'C', 'U', 'P', 'F' };	// TODO: convert to string with trailing zero
-
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), cupEmpty)) {
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), "CUPE")) {
 		// Fill cup from tap
 		DynObject *exObject = getExAd(data.byte(kWithobject));
 		exObject->id[3] = 'F'-'A';	// CUPE (empty cup) -> CUPF (full cup)
@@ -1396,7 +1362,7 @@ void DreamGenContext::runTap() {
 		return;
 	}
 
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), cupFull)) {
+	if (compare(data.byte(kWithobject), data.byte(kWithtype), "CUPF")) {
 		// Cup from tap full
 		showPuzText(58, 300);
 		putBackObStuff();
-- 
cgit v1.2.3


From f0b0f25bd6165becd995aedd09cf46de6db3bbba Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 15 Dec 2011 00:18:27 +0200
Subject: DREAMWEB: Properly set bx in findSetObject() and findExObject()

---
 engines/dreamweb/stubs.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 21173f8e3b..a3acfe8e37 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1781,6 +1781,7 @@ void DreamGenContext::findSetObject() {
 	id[3] = ch;
 	id[4] = '\0';
 	al = findSetObject(id);
+	bx = al * 64;
 }
 
 uint16 DreamGenContext::findSetObject(const char *id) {
@@ -1802,6 +1803,7 @@ void DreamGenContext::findExObject() {
 	id[3] = ch;
 	id[4] = '\0';
 	al = findExObject(id);
+	bx = al * 16;
 }
 
 uint16 DreamGenContext::findExObject(const char *id) {
-- 
cgit v1.2.3


From 509755a010967cc685001762b11996cc73891015 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 15 Dec 2011 00:30:31 +0200
Subject: DREAMWEB: Further simplification of findSetObject() and
 findExObject() (thanks wjp)

---
 engines/dreamweb/stubs.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a3acfe8e37..01169a81df 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1785,14 +1785,12 @@ void DreamGenContext::findSetObject() {
 }
 
 uint16 DreamGenContext::findSetObject(const char *id) {
-	uint16 index = 0;
-
-	do {
+	for (uint16 index = 0; index < 128; index++) {
 		if (objectMatches(getSetAd(index), id))
 			return index;
-	} while (index++ < 128);
+	}
 
-	return index;	// 128, not found
+	return 128;
 }
 
 void DreamGenContext::findExObject() {
@@ -1807,14 +1805,12 @@ void DreamGenContext::findExObject() {
 }
 
 uint16 DreamGenContext::findExObject(const char *id) {
-	uint16 index = 0;
-
-	do {
+	for (uint16 index = 0; index < kNumexobjects; index++) {
 		if (objectMatches(getExAd(index), id))
 			return index;
-	} while (index++ < 114);
+	}
 
-	return index;	// 114, not found
+	return kNumexobjects;
 }
 
 bool DreamGenContext::isItDescribed(const ObjPos *pos) {
-- 
cgit v1.2.3


From dd8304dd75e051460b96414ab3abac865a5af6e2 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 15 Dec 2011 00:43:08 +0200
Subject: DREAMWEB: Port 'usehandle', 'usealtar' to C++

---
 engines/dreamweb/dreamgen.cpp | 71 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  2 --
 engines/dreamweb/stubs.h      |  2 ++
 engines/dreamweb/use.cpp      | 39 ++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 73 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index fb232ceabc..a33f5a27fc 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3306,53 +3306,6 @@ void DreamGenContext::notHeldError() {
 	putBackObStuff();
 }
 
-void DreamGenContext::useAltar() {
-	STACK_CHECK;
-	al = 'C';
-	ah = 'N';
-	cl = 'D';
-	ch = 'A';
-	findExObject();
-	_cmp(al, (114));
-	if (flags.z())
-		goto thingsonaltar;
-	al = 'C';
-	ah = 'N';
-	cl = 'D';
-	ch = 'B';
-	findExObject();
-	_cmp(al, (114));
-	if (flags.z())
-		goto thingsonaltar;
-	_cmp(data.byte(kCanmovealtar), 1);
-	if (flags.z())
-		goto movealtar;
-	cx = 300;
-	al = 23;
-	showPuzText();
-	data.byte(kGetback) = 1;
-	return;
-movealtar:
-	_inc(data.byte(kProgresspoints));
-	showSecondUse();
-	data.word(kWatchingtime) = 160;
-	data.word(kReeltowatch) = 81;
-	data.word(kEndwatchreel) = 174;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	al = 47;
-	bl = 52;
-	bh = 76;
-	cx = 32;
-	dx = 98;
-	setupTimedUse();
-	data.byte(kGetback) = 1;
-	return;
-thingsonaltar:
-	showFirstUse();
-	data.byte(kGetback) = 1;
-}
-
 void DreamGenContext::nextColon() {
 	STACK_CHECK;
 lookcolon:
@@ -3463,30 +3416,6 @@ numberpoke3:
 	cs.byte(bx) = al;
 }
 
-void DreamGenContext::useHandle() {
-	STACK_CHECK;
-	al = 'C';
-	ah = 'U';
-	cl = 'T';
-	ch = 'W';
-	findSetObject();
-	al = es.byte(bx+58);
-	_cmp(al, 255);
-	if (!flags.z())
-		goto havecutwire;
-	cx = 300;
-	al = 12;
-	showPuzText();
-	data.byte(kGetback) = 1;
-	return;
-havecutwire:
-	cx = 300;
-	al = 13;
-	showPuzText();
-	data.byte(kNewlocation) = 22;
-	data.byte(kGetback) = 1;
-}
-
 void DreamGenContext::useStereo() {
 	STACK_CHECK;
 	_cmp(data.byte(kLocation), 0);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 2a8a6c613e..c1829ec4c2 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -500,7 +500,6 @@ public:
 	void dirCom();
 	void endGameSeq();
 	void findFirstPath();
-	void useAltar();
 	void startTalk();
 	void getAnyAd();
 	void reminders();
@@ -559,7 +558,6 @@ public:
 	void searchForString();
 	void selectOpenOb();
 	void useGun();
-	void useHandle();
 	void incRyanPage();
 	void clearChanges();
 	void searchForFiles();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 6764c18beb..16d7e67d5c 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -345,6 +345,8 @@
 	void useCooker();
 	void useWire();
 	void useControl();
+	void useHandle();
+	void useAltar();
 	bool defaultUseHandler(const char *id);
 	void openTVDoor();
 	void wearWatch();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index f5d631aed5..5306522c13 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1434,4 +1434,43 @@ void DreamGenContext::useKey() {
 	}
 }
 
+void DreamGenContext::useHandle() {
+	SetObject *object = getSetAd(findSetObject("CUTW"));
+	if (object->mapad[0] == 255) {
+		// Wire not cut
+		showPuzText(12, 300);
+	} else {
+		// Wire has been cut
+		showPuzText(13, 300);
+		data.byte(kNewlocation) = 22;
+	}
+
+	data.byte(kGetback) = 1;
+}
+
+void DreamGenContext::useAltar() {
+	if (findExObject("CNDA") == 114 || findExObject("CNDB") == 114) {
+		// Things on altar
+		showFirstUse();
+		data.byte(kGetback) = 1;
+		return;
+	}
+
+	if (data.byte(kCanmovealtar) == 1) {
+		// Move altar
+		data.byte(kProgresspoints)++;
+		showSecondUse();
+		data.word(kWatchingtime) = 160;
+		data.word(kReeltowatch) = 81;
+		data.word(kEndwatchreel) = 174;
+		data.byte(kWatchspeed) = 1;
+		data.byte(kSpeedcount) = 1;
+		DreamBase::setupTimedUse(47, 32, 98, 52, 76);
+		data.byte(kGetback) = 1;
+	} else {
+		showPuzText(23, 300);
+		data.byte(kGetback) = 1;
+	}
+}
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 45794d1b829c1015f1d79205f2a4b28a811a036a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 15 Dec 2011 02:09:17 +0200
Subject: DREAMWEB: Port 'describeob', 'additionaltext' to C++

---
 engines/dreamweb/dreamgen.cpp | 80 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  2 --
 engines/dreamweb/stubs.cpp    | 28 ++++++++++++++-
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 28 insertions(+), 83 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index a33f5a27fc..b882f9f1ea 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -1046,86 +1046,6 @@ void DreamGenContext::openOb() {
 	cs.word(bx) = ax;
 }
 
-void DreamGenContext::describeOb() {
-	STACK_CHECK;
-	getObTextStart();
-	di = 33;
-	bx = 92;
-	_cmp(data.byte(kForeignrelease),  0);
-	if (flags.z())
-		goto notsetd;
-	_cmp(data.byte(kObjecttype), 1);
-	if (!flags.z())
-		goto notsetd;
-	bx = 82;
-notsetd:
-	dl = 241;
-	ah = 16;
-	data.word(kCharshift) = 91+91;
-	printDirect();
-	data.word(kCharshift) = 0;
-	di = 36;
-	bx = 104;
-	_cmp(data.byte(kForeignrelease),  0);
-	if (flags.z())
-		goto notsetd2;
-	_cmp(data.byte(kObjecttype), 1);
-	if (!flags.z())
-		goto notsetd2;
-	bx = 94;
-notsetd2:
-	dl = 241;
-	ah = 0;
-	printDirect();
-	push(bx);
-	obsThatDoThings();
-	bx = pop();
-	additionalText();
-}
-
-void DreamGenContext::additionalText() {
-	STACK_CHECK;
-	_add(bx, 10);
-	push(bx);
-	al = data.byte(kCommand);
-	ah = data.byte(kObjecttype);
-	cl = 'C';
-	ch = 'U';
-	dl = 'P';
-	dh = 'E';
-	compare();
-	if (flags.z())
-		goto emptycup;
-	al = data.byte(kCommand);
-	ah = data.byte(kObjecttype);
-	cl = 'C';
-	ch = 'U';
-	dl = 'P';
-	dh = 'F';
-	compare();
-	if (flags.z())
-		goto fullcup;
-	bx = pop();
-	return;
-emptycup:
-	al = 40;
-	findPuzText();
-	bx = pop();
-	di = 36;
-	dl = 241;
-	ah = 0;
-	printDirect();
-	return;
-fullcup:
-	al = 39;
-	findPuzText();
-	bx = pop();
-	di = 36;
-	dl = 241;
-	ah = 0;
-	printDirect();
-}
-
 void DreamGenContext::getObTextStart() {
 	STACK_CHECK;
 	es = data.word(kFreedesc);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index c1829ec4c2..d1a9471f4f 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -528,7 +528,6 @@ public:
 	void showKeys();
 	void printmessage2();
 	void findOpenPos();
-	void describeOb();
 	void deleteExFrame();
 	void searchForSame();
 	void rollEm();
@@ -553,7 +552,6 @@ public:
 	void findPathOfPoint();
 	void getDestInfo();
 	void read();
-	void additionalText();
 	void mugger();
 	void searchForString();
 	void selectOpenOb();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 01169a81df..e721d482db 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3396,6 +3396,33 @@ void DreamGenContext::obsThatDoThings() {
 	}
 }
 
+void DreamGenContext::describeOb() {
+	const uint8 *obText = getObTextStartCPP();
+	uint16 y = 92;
+	if (data.byte(kForeignrelease) && data.byte(kObjecttype) == 1)
+		y = 82;
+	data.word(kCharshift) = 91 + 91;
+	printDirect(obText, 33, y, 241, 241 & 1);
+	data.word(kCharshift) = 0;
+	if (data.byte(kForeignrelease) && data.byte(kObjecttype) == 1)
+		y = 94;
+	printDirect(obText, 36, y, 241, 241 & 1);
+	obsThatDoThings();
+
+	// Additional text
+	if (compare(data.byte(kCommand), data.byte(kObjecttype), "CUPE")) {
+		// Empty cup
+		uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(40 * 2);
+		const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
+		printDirect(string, 36, y + 10, 241, 241 & 1);
+	} else if (compare(data.byte(kCommand), data.byte(kObjecttype), "CUPF")) {
+		// Full cup
+		uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(39 * 2);
+		const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
+		printDirect(string, 36, y + 10, 241, 241 & 1);
+	}
+}
+
 void DreamGenContext::delEverything() {
 	if (data.byte(kMapysize) + data.word(kMapoffsety) < 182) {
 		mapToPanel();
@@ -4272,7 +4299,6 @@ void DreamGenContext::showPuzText() {
 }
 
 void DreamGenContext::showPuzText(uint16 command, uint16 count) {
-	findPuzText(); // FIXME: Unnecessary? (Input: al, Output: es:si)
 	createPanel();
 	showPanel();
 	showMan();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 16d7e67d5c..3413c5eef0 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -588,5 +588,6 @@
 	uint16 findSetObject(const char *id);
 	void findExObject();
 	uint16 findExObject(const char *id);
+	void describeOb();
 
 #endif
-- 
cgit v1.2.3


From f87227dcd329baade142c89df859d434b174655f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 15 Dec 2011 02:14:21 +0200
Subject: DREAMWEB: 'keypadax', 'keypadcx' are no longer needed

---
 engines/dreamweb/dreamgen.cpp | 218 ++++++++++++++++-----------------
 engines/dreamweb/dreamgen.h   | 276 +++++++++++++++++++++---------------------
 2 files changed, 246 insertions(+), 248 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index b882f9f1ea..6f8cff0ff1 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2651,14 +2651,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 1184;
+	si = 1180;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 1200;
+	si = 1196;
 	_add(si, ax);
 	ax = pop();
 }
@@ -2710,7 +2710,7 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 1184);
+	_add(bx, 1180);
 	es.byte(bx) = 0;
 }
 
@@ -2749,7 +2749,7 @@ dirroot:
 	si = offset_rootdir;
 	_inc(si);
 	es = cs;
-	di = 1060;
+	di = 1056;
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
@@ -2851,7 +2851,7 @@ notyetassigned:
 	push(bx);
 	_add(bx, 2);
 	ds = cs;
-	si = 1218;
+	si = 1214;
 checkpass:
 	_lodsw();
 	ah = es.byte(bx);
@@ -2922,7 +2922,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 1060;
+	di = 1056;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -3052,7 +3052,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 1060+1;
+	di = 1056+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -3179,7 +3179,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 1218;
+	si = 1214;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -3808,7 +3808,7 @@ nomatchslot:
 void DreamGenContext::clearBuffers() {
 	STACK_CHECK;
 	es = data.word(kBuffers);
-	cx = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+911-454+68-0)/2;
+	cx = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+907-450+68-0)/2;
 	ax = 0;
 	di = 0;
 	_stosw(cx, true);
@@ -3820,11 +3820,11 @@ void DreamGenContext::clearBuffers() {
 	es = data.word(kBuffers);
 	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
 	ds = cs;
-	si = 454;
-	cx = (911-454);
+	si = 450;
+	cx = (907-450);
 	_movsb(cx, true);
 	es = data.word(kBuffers);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+911-454);
+	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+907-450);
 	ds = cs;
 	si = 0;
 	cx = (68-0);
@@ -3842,11 +3842,11 @@ void DreamGenContext::clearChanges() {
 	ds = data.word(kBuffers);
 	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
 	es = cs;
-	di = 454;
-	cx = (911-454);
+	di = 450;
+	cx = (907-450);
 	_movsb(cx, true);
 	ds = data.word(kBuffers);
-	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+911-454);
+	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+907-450);
 	es = cs;
 	di = 0;
 	cx = (68-0);
@@ -3860,7 +3860,7 @@ void DreamGenContext::clearChanges() {
 	di = 0;
 	_stosw(cx, true);
 	es = cs;
-	di = 1184;
+	di = 1180;
 	al = 1;
 	_stosb(2);
 	al = 0;
@@ -4099,111 +4099,111 @@ void DreamGenContext::__start() {
 		//0x0150: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0170: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0180: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0190: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x01a0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 
 		//0x01b0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x01, 0x2c, 0x00, 0x14, 0x00, 0x02, 0x00, 0x01, 0x01, 0x37, 
-		//0x01c0: .... ..., .... ...7
-		0x00, 0x00, 0x00, 0x32, 0x14, 0x00, 0x18, 0x16, 0x00, 0x4a, 0x00, 0x01, 0x00, 0x00, 0x18, 0x21, 
-		//0x01d0: ...2 .... .J.. ...!
-		0x0a, 0x4b, 0x00, 0x01, 0x00, 0x01, 0x01, 0x2c, 0x00, 0x1b, 0x00, 0x02, 0x00, 0x02, 0x01, 0x2c, 
-		//0x01e0: .K.. ..., .... ...,
-		0x00, 0x60, 0x00, 0x03, 0x00, 0x04, 0x01, 0x2c, 0x00, 0x76, 0x00, 0x02, 0x00, 0x05, 0x01, 0x2c, 
-		//0x01f0: .`.. ..., .v.. ...,
-		0x0a, 0x00, 0x00, 0x02, 0x00, 0x00, 0x05, 0x16, 0x14, 0x35, 0x00, 0x03, 0x00, 0x00, 0x05, 0x16, 
-		//0x0200: .... .... .5.. ....
-		0x14, 0x28, 0x00, 0x01, 0x00, 0x02, 0x05, 0x16, 0x14, 0x32, 0x00, 0x01, 0x00, 0x03, 0x02, 0x0b, 
-		//0x0210: .(.. .... .2.. ....
-		0x0a, 0xc0, 0x00, 0x01, 0x00, 0x00, 0x02, 0x0b, 0x0a, 0xb6, 0x00, 0x02, 0x00, 0x01, 0x08, 0x0b, 
+		0xff, 0x00, 0x01, 0x2c, 0x00, 0x14, 0x00, 0x02, 0x00, 0x01, 0x01, 0x37, 0x00, 0x00, 0x00, 0x32, 
+		//0x01c0: ..., .... ...7 ...2
+		0x14, 0x00, 0x18, 0x16, 0x00, 0x4a, 0x00, 0x01, 0x00, 0x00, 0x18, 0x21, 0x0a, 0x4b, 0x00, 0x01, 
+		//0x01d0: .... .J.. ...! .K..
+		0x00, 0x01, 0x01, 0x2c, 0x00, 0x1b, 0x00, 0x02, 0x00, 0x02, 0x01, 0x2c, 0x00, 0x60, 0x00, 0x03, 
+		//0x01e0: ..., .... ..., .`..
+		0x00, 0x04, 0x01, 0x2c, 0x00, 0x76, 0x00, 0x02, 0x00, 0x05, 0x01, 0x2c, 0x0a, 0x00, 0x00, 0x02, 
+		//0x01f0: ..., .v.. ..., ....
+		0x00, 0x00, 0x05, 0x16, 0x14, 0x35, 0x00, 0x03, 0x00, 0x00, 0x05, 0x16, 0x14, 0x28, 0x00, 0x01, 
+		//0x0200: .... .5.. .... .(..
+		0x00, 0x02, 0x05, 0x16, 0x14, 0x32, 0x00, 0x01, 0x00, 0x03, 0x02, 0x0b, 0x0a, 0xc0, 0x00, 0x01, 
+		//0x0210: .... .2.. .... ....
+		0x00, 0x00, 0x02, 0x0b, 0x0a, 0xb6, 0x00, 0x02, 0x00, 0x01, 0x08, 0x0b, 0x0a, 0x00, 0x00, 0x02, 
 		//0x0220: .... .... .... ....
-		0x0a, 0x00, 0x00, 0x02, 0x00, 0x01, 0x17, 0x00, 0x32, 0x00, 0x00, 0x03, 0x00, 0x00, 0x1c, 0x0b, 
-		//0x0230: .... .... 2... ....
-		0x14, 0xfa, 0x00, 0x04, 0x00, 0x00, 0x17, 0x00, 0x32, 0x2b, 0x00, 0x02, 0x00, 0x08, 0x17, 0x0b, 
-		//0x0240: .... .... 2+.. ....
-		0x28, 0x82, 0x00, 0x02, 0x00, 0x01, 0x17, 0x16, 0x28, 0x7a, 0x00, 0x02, 0x00, 0x02, 0x17, 0x16, 
-		//0x0250: (... .... (z.. ....
-		0x28, 0x69, 0x00, 0x02, 0x00, 0x03, 0x17, 0x16, 0x28, 0x51, 0x00, 0x02, 0x00, 0x04, 0x17, 0x0b, 
-		//0x0260: (i.. .... (Q.. ....
-		0x28, 0x87, 0x00, 0x02, 0x00, 0x05, 0x17, 0x16, 0x28, 0x91, 0x00, 0x02, 0x00, 0x06, 0x04, 0x16, 
-		//0x0270: (... .... (... ....
-		0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0xc8, 0x00, 0x00, 0x00, 0x14, 0x2d, 0x16, 
-		//0x0280: .... ..-. .... ..-.
-		0x1e, 0x27, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0x19, 0x00, 0x02, 0x00, 0x00, 0x08, 0x16, 
-		//0x0290: .'.. ..-. .... ....
-		0x28, 0x20, 0x00, 0x02, 0x00, 0x00, 0x07, 0x0b, 0x14, 0x40, 0x00, 0x02, 0x00, 0x00, 0x16, 0x16, 
-		//0x02a0: ( .. .... .@.. ....
-		0x14, 0x52, 0x00, 0x02, 0x00, 0x00, 0x1b, 0x0b, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x14, 0x00, 
-		//0x02b0: .R.. .... .... ....
-		0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x21, 0x28, 0x15, 0x00, 0x01, 0x00, 0x00, 0x1d, 0x0b, 
-		//0x02c0: .... ...! (... ....
-		0x0a, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x16, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x19, 0x00, 
-		//0x02d0: .... .... .... ....
-		0x32, 0x04, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x1e, 0x79, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 
-		//0x02e0: 2... ..2. .y.. ..2.
-		0x1e, 0x00, 0x00, 0x14, 0x00, 0x00, 0x34, 0x16, 0x1e, 0xc0, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 
-		//0x02f0: .... ..4. .... ..4.
-		0x1e, 0xe9, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x68, 0x00, 0x37, 0x00, 0x00, 0x35, 0x21, 
-		//0x0300: .... ..2. (h.7 ..5!
-		0x00, 0x63, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x00, 0x00, 0x03, 0x00, 0x00, 0x32, 0x16, 
-		//0x0310: .c.. ..2. (... ..2.
-		0x1e, 0xa2, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0x39, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 
-		//0x0320: .... ..4. .9.. ..4.
-		0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x36, 0x00, 0x00, 0x48, 0x00, 0x03, 0x00, 0x00, 0x37, 0x2c, 
-		//0x0330: .... ..6. .H.. ..7,
-		0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x0e, 0x16, 
+		0x00, 0x01, 0x17, 0x00, 0x32, 0x00, 0x00, 0x03, 0x00, 0x00, 0x1c, 0x0b, 0x14, 0xfa, 0x00, 0x04, 
+		//0x0230: .... 2... .... ....
+		0x00, 0x00, 0x17, 0x00, 0x32, 0x2b, 0x00, 0x02, 0x00, 0x08, 0x17, 0x0b, 0x28, 0x82, 0x00, 0x02, 
+		//0x0240: .... 2+.. .... (...
+		0x00, 0x01, 0x17, 0x16, 0x28, 0x7a, 0x00, 0x02, 0x00, 0x02, 0x17, 0x16, 0x28, 0x69, 0x00, 0x02, 
+		//0x0250: .... (z.. .... (i..
+		0x00, 0x03, 0x17, 0x16, 0x28, 0x51, 0x00, 0x02, 0x00, 0x04, 0x17, 0x0b, 0x28, 0x87, 0x00, 0x02, 
+		//0x0260: .... (Q.. .... (...
+		0x00, 0x05, 0x17, 0x16, 0x28, 0x91, 0x00, 0x02, 0x00, 0x06, 0x04, 0x16, 0x1e, 0x00, 0x00, 0x02, 
+		//0x0270: .... (... .... ....
+		0x00, 0x00, 0x2d, 0x16, 0x1e, 0xc8, 0x00, 0x00, 0x00, 0x14, 0x2d, 0x16, 0x1e, 0x27, 0x00, 0x02, 
+		//0x0280: ..-. .... ..-. .'..
+		0x00, 0x00, 0x2d, 0x16, 0x1e, 0x19, 0x00, 0x02, 0x00, 0x00, 0x08, 0x16, 0x28, 0x20, 0x00, 0x02, 
+		//0x0290: ..-. .... .... ( ..
+		0x00, 0x00, 0x07, 0x0b, 0x14, 0x40, 0x00, 0x02, 0x00, 0x00, 0x16, 0x16, 0x14, 0x52, 0x00, 0x02, 
+		//0x02a0: .... .@.. .... .R..
+		0x00, 0x00, 0x1b, 0x0b, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x14, 0x00, 0x1e, 0x00, 0x00, 0x02, 
+		//0x02b0: .... .... .... ....
+		0x00, 0x00, 0x0e, 0x21, 0x28, 0x15, 0x00, 0x01, 0x00, 0x00, 0x1d, 0x0b, 0x0a, 0x00, 0x00, 0x01, 
+		//0x02c0: ...! (... .... ....
+		0x00, 0x00, 0x02, 0x16, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x19, 0x00, 0x32, 0x04, 0x00, 0x02, 
+		//0x02d0: .... .... .... 2...
+		0x00, 0x00, 0x32, 0x16, 0x1e, 0x79, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x1e, 0x00, 0x00, 0x14, 
+		//0x02e0: ..2. .y.. ..2. ....
+		0x00, 0x00, 0x34, 0x16, 0x1e, 0xc0, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0xe9, 0x00, 0x02, 
+		//0x02f0: ..4. .... ..4. ....
+		0x00, 0x00, 0x32, 0x16, 0x28, 0x68, 0x00, 0x37, 0x00, 0x00, 0x35, 0x21, 0x00, 0x63, 0x00, 0x02, 
+		//0x0300: ..2. (h.7 ..5! .c..
+		0x00, 0x00, 0x32, 0x16, 0x28, 0x00, 0x00, 0x03, 0x00, 0x00, 0x32, 0x16, 0x1e, 0xa2, 0x00, 0x02, 
+		//0x0310: ..2. (... ..2. ....
+		0x00, 0x00, 0x34, 0x16, 0x1e, 0x39, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0x00, 0x00, 0x02, 
+		//0x0320: ..4. .9.. ..4. ....
+		0x00, 0x00, 0x36, 0x00, 0x00, 0x48, 0x00, 0x03, 0x00, 0x00, 0x37, 0x2c, 0x00, 0x00, 0x00, 0x02, 
+		//0x0330: ..6. .H.. ..7, ....
+		0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x0e, 0x16, 0x00, 0x02, 0x00, 0x02, 
 		//0x0340: .... .... .... ....
-		0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x16, 0x00, 0x2c, 0x01, 0x01, 0x00, 0x00, 0x0a, 0x16, 
-		//0x0350: .... .... .,.. ....
-		0x1e, 0xae, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x16, 0x14, 0x00, 0x00, 0x01, 0x00, 0x00, 0x0b, 0x0b, 
-		//0x0360: .... .... .... ....
-		0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x0b, 0x1e, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x16, 
-		//0x0370: ...2 .... ...2 ....
-		0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0e, 0x21, 0x28, 0x00, 0x00, 0x32, 0x14, 0x00, 0xff, 0x44, 
-		//0x0380: ...2 ...! (..2 ...D
-		0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x00, 0x01, 0x01, 0x00, 
-		//0x0390: REAM WEB. V99. ....
-		0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 
-		//0x03a0: PUBL IC        PUBL
-		0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 
-		//0x03b0: IC      . ..BL ACKD
-		0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x03c0: RAGO N RY AN       
-		0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x03d0:  ... HEND RIX      
-		0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 
-		//0x03e0: LOUI S       . ..SE
-		0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 
-		//0x03f0: PTIM US     BE CKET
-		0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0400: T     ...          
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0410:       ."R OOT      
-		0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0420:    . "             
-		0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x4f, 
-		//0x0430:  .00 00.0 0... ..$O
-		0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 
-		//0x0440: BJEC T NA ME O NE  
+		0x00, 0x00, 0x0e, 0x16, 0x00, 0x2c, 0x01, 0x01, 0x00, 0x00, 0x0a, 0x16, 0x1e, 0xae, 0x00, 0x00, 
+		//0x0350: .... .,.. .... ....
+		0x00, 0x00, 0x0c, 0x16, 0x14, 0x00, 0x00, 0x01, 0x00, 0x00, 0x0b, 0x0b, 0x14, 0x00, 0x00, 0x32, 
+		//0x0360: .... .... .... ...2
+		0x14, 0x00, 0x0b, 0x0b, 0x1e, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x16, 0x14, 0x00, 0x00, 0x32, 
+		//0x0370: .... ...2 .... ...2
+		0x14, 0x00, 0x0e, 0x21, 0x28, 0x00, 0x00, 0x32, 0x14, 0x00, 0xff, 0x44, 0x52, 0x45, 0x41, 0x4d, 
+		//0x0380: ...! (..2 ...D REAM
+		0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x00, 0x01, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 
+		//0x0390: WEB. V99. .... PUBL
+		0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 
+		//0x03a0: IC        PUBL IC  
+		0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 
+		//0x03b0:    . ..BL ACKD RAGO
+		0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 
+		//0x03c0: N RY AN         ...
+		0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 
+		//0x03d0: HEND RIX       LOUI
+		0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 
+		//0x03e0: S       . ..SE PTIM
+		0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 
+		//0x03f0: US     BE CKET T   
+		0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0400:  ...               
+		0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
+		//0x0410:  ."R OOT          .
+		0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 
+		//0x0420: "               .00
+		0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x4f, 0x42, 0x4a, 0x45, 0x43, 
+		//0x0430: 00.0 0... ..$O BJEC
+		0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0440: T NA ME O NE       
 		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
 		//0x0450:                    
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 
-		//0x0460:         . .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-		//0x0470: .... .... .... ....
-		0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0480: D:.. .... .... ....
+		0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 
+		//0x0460:    . .... .... ....
+		0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 
+		//0x0470: .... .... .... D:..
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0480: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
 		//0x0490: .... .... .... ....
-		0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 
 		//0x04a0: .... .... .... ....
-		0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 
+		0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04b0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04c0: .... .... .... ....
@@ -4219,9 +4219,9 @@ void DreamGenContext::__start() {
 		//0x0510: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0520: .... .... .... ....
-		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, 0xff, 0xff, 
 		//0x0530: .... .... .... ....
-		0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
+		0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d1a9471f4f..b565b4e13a 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,13 +32,13 @@
 
 namespace DreamGen {
 
-static const uint16 offset_commandline = 0x043f;
-static const uint16 offset_rootdir = 0x0416;
-static const uint16 offset_money2poke = 0x0437;
-static const uint16 offset_operand1 = 0x0408;
-static const uint16 offset_keys = 0x039e;
-static const uint16 offset_money1poke = 0x0432;
-static const uint16 offset_openchangesize = 0x039c;
+static const uint16 offset_money1poke = 0x042e;
+static const uint16 offset_operand1 = 0x0404;
+static const uint16 offset_openchangesize = 0x0398;
+static const uint16 offset_commandline = 0x043b;
+static const uint16 offset_rootdir = 0x0412;
+static const uint16 offset_money2poke = 0x0433;
+static const uint16 offset_keys = 0x039a;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -252,135 +252,133 @@ static const uint16 kPressed = 269;
 static const uint16 kPresspointer = 270;
 static const uint16 kGraphicpress = 272;
 static const uint16 kPresscount = 273;
-static const uint16 kKeypadax = 274;
-static const uint16 kKeypadcx = 276;
-static const uint16 kLightcount = 278;
-static const uint16 kFolderpage = 279;
-static const uint16 kDiarypage = 280;
-static const uint16 kMenucount = 281;
-static const uint16 kSymboltopx = 282;
-static const uint16 kSymboltopnum = 283;
-static const uint16 kSymboltopdir = 284;
-static const uint16 kSymbolbotx = 285;
-static const uint16 kSymbolbotnum = 286;
-static const uint16 kSymbolbotdir = 287;
-static const uint16 kSymboltolight = 288;
-static const uint16 kSymbol1 = 289;
-static const uint16 kSymbol2 = 290;
-static const uint16 kSymbol3 = 291;
-static const uint16 kSymbolnum = 292;
-static const uint16 kDumpx = 293;
-static const uint16 kDumpy = 295;
-static const uint16 kWalkandexam = 297;
-static const uint16 kWalkexamtype = 298;
-static const uint16 kWalkexamnum = 299;
-static const uint16 kCursloc = 300;
-static const uint16 kCurslocx = 302;
-static const uint16 kCurslocy = 304;
-static const uint16 kCurpos = 306;
-static const uint16 kMonadx = 308;
-static const uint16 kMonady = 310;
-static const uint16 kGotfrom = 312;
-static const uint16 kMonsource = 314;
-static const uint16 kNumtodo = 316;
-static const uint16 kTimecount = 318;
-static const uint16 kCounttotimed = 320;
-static const uint16 kTimedseg = 322;
-static const uint16 kTimedoffset = 324;
-static const uint16 kTimedy = 326;
-static const uint16 kTimedx = 327;
-static const uint16 kNeedtodumptimed = 328;
-static const uint16 kLoadingorsave = 329;
-static const uint16 kCurrentslot = 330;
-static const uint16 kCursorpos = 331;
-static const uint16 kColourpos = 332;
-static const uint16 kFadedirection = 333;
-static const uint16 kNumtofade = 334;
-static const uint16 kFadecount = 335;
-static const uint16 kAddtogreen = 336;
-static const uint16 kAddtored = 337;
-static const uint16 kAddtoblue = 338;
-static const uint16 kLastsoundreel = 339;
-static const uint16 kSpeechloaded = 341;
-static const uint16 kSpeechlength = 342;
-static const uint16 kVolume = 344;
-static const uint16 kVolumeto = 345;
-static const uint16 kVolumedirection = 346;
-static const uint16 kVolumecount = 347;
-static const uint16 kPlayblock = 348;
-static const uint16 kWongame = 349;
-static const uint16 kLasthardkey = 350;
-static const uint16 kBufferin = 351;
-static const uint16 kBufferout = 353;
-static const uint16 kExtras = 355;
-static const uint16 kWorkspace = 357;
-static const uint16 kMapstore = 359;
-static const uint16 kCharset1 = 361;
-static const uint16 kBuffers = 363;
-static const uint16 kMainsprites = 365;
-static const uint16 kBackdrop = 367;
-static const uint16 kMapdata = 369;
-static const uint16 kSounddata = 371;
-static const uint16 kSounddata2 = 373;
-static const uint16 kRecordspace = 375;
-static const uint16 kFreedat = 377;
-static const uint16 kSetdat = 379;
-static const uint16 kReel1 = 381;
-static const uint16 kReel2 = 383;
-static const uint16 kReel3 = 385;
-static const uint16 kRoomdesc = 387;
-static const uint16 kFreedesc = 389;
-static const uint16 kSetdesc = 391;
-static const uint16 kBlockdesc = 393;
-static const uint16 kSetframes = 395;
-static const uint16 kFreeframes = 397;
-static const uint16 kPeople = 399;
-static const uint16 kReels = 401;
-static const uint16 kCommandtext = 403;
-static const uint16 kPuzzletext = 405;
-static const uint16 kTraveltext = 407;
-static const uint16 kTempgraphics = 409;
-static const uint16 kTempgraphics2 = 411;
-static const uint16 kTempgraphics3 = 413;
-static const uint16 kTempsprites = 415;
-static const uint16 kTextfile1 = 417;
-static const uint16 kTextfile2 = 419;
-static const uint16 kTextfile3 = 421;
-static const uint16 kBlinkframe = 423;
-static const uint16 kBlinkcount = 424;
-static const uint16 kReasseschanges = 425;
-static const uint16 kPointerspath = 426;
-static const uint16 kManspath = 427;
-static const uint16 kPointerfirstpath = 428;
-static const uint16 kFinaldest = 429;
-static const uint16 kDestination = 430;
-static const uint16 kLinestartx = 431;
-static const uint16 kLinestarty = 433;
-static const uint16 kLineendx = 435;
-static const uint16 kLineendy = 437;
-static const uint16 kLinepointer = 439;
-static const uint16 kLinedirection = 440;
-static const uint16 kLinelength = 441;
-static const uint16 kLiftsoundcount = 442;
-static const uint16 kCh0blockstocopy = 443;
-static const uint16 kCh0playing = 445;
-static const uint16 kCh0repeat = 446;
-static const uint16 kCh1playing = 447;
-static const uint16 kCh1blockstocopy = 448;
-static const uint16 kSoundbufferwrite = 450;
-static const uint16 kCurrentsample = 452;
-static const uint16 kRoomssample = 453;
-static const uint16 kReelroutines = 454;
-static const uint16 kBasicsample = 911;
-static const uint16 kCurrentfile = 1060;
-static const uint16 kRoomscango = 1184;
-static const uint16 kRoompics = 1200;
-static const uint16 kOplist = 1215;
-static const uint16 kInputline = 1218;
-static const uint16 kPresslist = 1346;
-static const uint16 kQuitrequested = 1352;
-static const uint16 kSubtitles = 1353;
-static const uint16 kForeignrelease = 1354;
+static const uint16 kLightcount = 274;
+static const uint16 kFolderpage = 275;
+static const uint16 kDiarypage = 276;
+static const uint16 kMenucount = 277;
+static const uint16 kSymboltopx = 278;
+static const uint16 kSymboltopnum = 279;
+static const uint16 kSymboltopdir = 280;
+static const uint16 kSymbolbotx = 281;
+static const uint16 kSymbolbotnum = 282;
+static const uint16 kSymbolbotdir = 283;
+static const uint16 kSymboltolight = 284;
+static const uint16 kSymbol1 = 285;
+static const uint16 kSymbol2 = 286;
+static const uint16 kSymbol3 = 287;
+static const uint16 kSymbolnum = 288;
+static const uint16 kDumpx = 289;
+static const uint16 kDumpy = 291;
+static const uint16 kWalkandexam = 293;
+static const uint16 kWalkexamtype = 294;
+static const uint16 kWalkexamnum = 295;
+static const uint16 kCursloc = 296;
+static const uint16 kCurslocx = 298;
+static const uint16 kCurslocy = 300;
+static const uint16 kCurpos = 302;
+static const uint16 kMonadx = 304;
+static const uint16 kMonady = 306;
+static const uint16 kGotfrom = 308;
+static const uint16 kMonsource = 310;
+static const uint16 kNumtodo = 312;
+static const uint16 kTimecount = 314;
+static const uint16 kCounttotimed = 316;
+static const uint16 kTimedseg = 318;
+static const uint16 kTimedoffset = 320;
+static const uint16 kTimedy = 322;
+static const uint16 kTimedx = 323;
+static const uint16 kNeedtodumptimed = 324;
+static const uint16 kLoadingorsave = 325;
+static const uint16 kCurrentslot = 326;
+static const uint16 kCursorpos = 327;
+static const uint16 kColourpos = 328;
+static const uint16 kFadedirection = 329;
+static const uint16 kNumtofade = 330;
+static const uint16 kFadecount = 331;
+static const uint16 kAddtogreen = 332;
+static const uint16 kAddtored = 333;
+static const uint16 kAddtoblue = 334;
+static const uint16 kLastsoundreel = 335;
+static const uint16 kSpeechloaded = 337;
+static const uint16 kSpeechlength = 338;
+static const uint16 kVolume = 340;
+static const uint16 kVolumeto = 341;
+static const uint16 kVolumedirection = 342;
+static const uint16 kVolumecount = 343;
+static const uint16 kPlayblock = 344;
+static const uint16 kWongame = 345;
+static const uint16 kLasthardkey = 346;
+static const uint16 kBufferin = 347;
+static const uint16 kBufferout = 349;
+static const uint16 kExtras = 351;
+static const uint16 kWorkspace = 353;
+static const uint16 kMapstore = 355;
+static const uint16 kCharset1 = 357;
+static const uint16 kBuffers = 359;
+static const uint16 kMainsprites = 361;
+static const uint16 kBackdrop = 363;
+static const uint16 kMapdata = 365;
+static const uint16 kSounddata = 367;
+static const uint16 kSounddata2 = 369;
+static const uint16 kRecordspace = 371;
+static const uint16 kFreedat = 373;
+static const uint16 kSetdat = 375;
+static const uint16 kReel1 = 377;
+static const uint16 kReel2 = 379;
+static const uint16 kReel3 = 381;
+static const uint16 kRoomdesc = 383;
+static const uint16 kFreedesc = 385;
+static const uint16 kSetdesc = 387;
+static const uint16 kBlockdesc = 389;
+static const uint16 kSetframes = 391;
+static const uint16 kFreeframes = 393;
+static const uint16 kPeople = 395;
+static const uint16 kReels = 397;
+static const uint16 kCommandtext = 399;
+static const uint16 kPuzzletext = 401;
+static const uint16 kTraveltext = 403;
+static const uint16 kTempgraphics = 405;
+static const uint16 kTempgraphics2 = 407;
+static const uint16 kTempgraphics3 = 409;
+static const uint16 kTempsprites = 411;
+static const uint16 kTextfile1 = 413;
+static const uint16 kTextfile2 = 415;
+static const uint16 kTextfile3 = 417;
+static const uint16 kBlinkframe = 419;
+static const uint16 kBlinkcount = 420;
+static const uint16 kReasseschanges = 421;
+static const uint16 kPointerspath = 422;
+static const uint16 kManspath = 423;
+static const uint16 kPointerfirstpath = 424;
+static const uint16 kFinaldest = 425;
+static const uint16 kDestination = 426;
+static const uint16 kLinestartx = 427;
+static const uint16 kLinestarty = 429;
+static const uint16 kLineendx = 431;
+static const uint16 kLineendy = 433;
+static const uint16 kLinepointer = 435;
+static const uint16 kLinedirection = 436;
+static const uint16 kLinelength = 437;
+static const uint16 kLiftsoundcount = 438;
+static const uint16 kCh0blockstocopy = 439;
+static const uint16 kCh0playing = 441;
+static const uint16 kCh0repeat = 442;
+static const uint16 kCh1playing = 443;
+static const uint16 kCh1blockstocopy = 444;
+static const uint16 kSoundbufferwrite = 446;
+static const uint16 kCurrentsample = 448;
+static const uint16 kRoomssample = 449;
+static const uint16 kReelroutines = 450;
+static const uint16 kBasicsample = 907;
+static const uint16 kCurrentfile = 1056;
+static const uint16 kRoomscango = 1180;
+static const uint16 kRoompics = 1196;
+static const uint16 kOplist = 1211;
+static const uint16 kInputline = 1214;
+static const uint16 kPresslist = 1342;
+static const uint16 kQuitrequested = 1348;
+static const uint16 kSubtitles = 1349;
+static const uint16 kForeignrelease = 1350;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -419,8 +417,8 @@ static const uint16 kListofchanges = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768
 static const uint16 kUndertimedtext = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4));
 static const uint16 kRainlist = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30));
 static const uint16 kInitialreelrouts = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
-static const uint16 kInitialvars = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+911-454);
-static const uint16 kLengthofbuffer = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+911-454+68-0);
+static const uint16 kInitialvars = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+907-450);
+static const uint16 kLengthofbuffer = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+907-450+68-0);
 static const uint16 kReellist = (0+(36*144));
 static const uint16 kIntext = (0+(38*2));
 static const uint16 kLengthofmap = (0+(66*60));
@@ -471,7 +469,7 @@ static const uint16 kKeypady = (72);
 static const uint16 kZoomx = (8);
 static const uint16 kInventx = (80);
 static const uint16 kMenux = (80+40);
-static const uint16 kLenofreelrouts = (911-454);
+static const uint16 kLenofreelrouts = (907-450);
 static const uint16 kHeaderlen = (96);
 
 
-- 
cgit v1.2.3


From faab2d761d103de3c019dc1c979d3940191abc96 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 15 Dec 2011 11:30:47 +0200
Subject: DREAMWEB: Remove some unused global variables from the data blob

---
 engines/dreamweb/dreamgen.cpp | 228 ++++++++++++++++++++---------------------
 engines/dreamweb/dreamgen.h   | 230 +++++++++++++++++++++---------------------
 2 files changed, 227 insertions(+), 231 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 6f8cff0ff1..dfeda18d6c 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2651,14 +2651,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 1180;
+	si = 1174;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 1196;
+	si = 1190;
 	_add(si, ax);
 	ax = pop();
 }
@@ -2710,7 +2710,7 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 1180);
+	_add(bx, 1174);
 	es.byte(bx) = 0;
 }
 
@@ -2749,7 +2749,7 @@ dirroot:
 	si = offset_rootdir;
 	_inc(si);
 	es = cs;
-	di = 1056;
+	di = 1050;
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
@@ -2851,7 +2851,7 @@ notyetassigned:
 	push(bx);
 	_add(bx, 2);
 	ds = cs;
-	si = 1214;
+	si = 1208;
 checkpass:
 	_lodsw();
 	ah = es.byte(bx);
@@ -2922,7 +2922,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 1056;
+	di = 1050;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -3052,7 +3052,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 1056+1;
+	di = 1050+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -3179,7 +3179,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 1214;
+	si = 1208;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -3808,7 +3808,7 @@ nomatchslot:
 void DreamGenContext::clearBuffers() {
 	STACK_CHECK;
 	es = data.word(kBuffers);
-	cx = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+907-450+68-0)/2;
+	cx = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+901-444+68-0)/2;
 	ax = 0;
 	di = 0;
 	_stosw(cx, true);
@@ -3820,11 +3820,11 @@ void DreamGenContext::clearBuffers() {
 	es = data.word(kBuffers);
 	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
 	ds = cs;
-	si = 450;
-	cx = (907-450);
+	si = 444;
+	cx = (901-444);
 	_movsb(cx, true);
 	es = data.word(kBuffers);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+907-450);
+	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+901-444);
 	ds = cs;
 	si = 0;
 	cx = (68-0);
@@ -3842,11 +3842,11 @@ void DreamGenContext::clearChanges() {
 	ds = data.word(kBuffers);
 	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
 	es = cs;
-	di = 450;
-	cx = (907-450);
+	di = 444;
+	cx = (901-444);
 	_movsb(cx, true);
 	ds = data.word(kBuffers);
-	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+907-450);
+	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+901-444);
 	es = cs;
 	di = 0;
 	cx = (68-0);
@@ -3860,7 +3860,7 @@ void DreamGenContext::clearChanges() {
 	di = 0;
 	_stosw(cx, true);
 	es = cs;
-	di = 1180;
+	di = 1174;
 	al = 1;
 	_stosb(2);
 	al = 0;
@@ -4099,111 +4099,111 @@ void DreamGenContext::__start() {
 		//0x0150: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0170: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0180: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 
 		//0x0190: .... .... .... ....
-		0xff, 0xff, 0xff, 0x17, 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, 
 		//0x01a0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 
-		//0x01b0: .... .... .... ....
-		0xff, 0x00, 0x01, 0x2c, 0x00, 0x14, 0x00, 0x02, 0x00, 0x01, 0x01, 0x37, 0x00, 0x00, 0x00, 0x32, 
-		//0x01c0: ..., .... ...7 ...2
-		0x14, 0x00, 0x18, 0x16, 0x00, 0x4a, 0x00, 0x01, 0x00, 0x00, 0x18, 0x21, 0x0a, 0x4b, 0x00, 0x01, 
-		//0x01d0: .... .J.. ...! .K..
-		0x00, 0x01, 0x01, 0x2c, 0x00, 0x1b, 0x00, 0x02, 0x00, 0x02, 0x01, 0x2c, 0x00, 0x60, 0x00, 0x03, 
-		//0x01e0: ..., .... ..., .`..
-		0x00, 0x04, 0x01, 0x2c, 0x00, 0x76, 0x00, 0x02, 0x00, 0x05, 0x01, 0x2c, 0x0a, 0x00, 0x00, 0x02, 
-		//0x01f0: ..., .v.. ..., ....
-		0x00, 0x00, 0x05, 0x16, 0x14, 0x35, 0x00, 0x03, 0x00, 0x00, 0x05, 0x16, 0x14, 0x28, 0x00, 0x01, 
-		//0x0200: .... .5.. .... .(..
-		0x00, 0x02, 0x05, 0x16, 0x14, 0x32, 0x00, 0x01, 0x00, 0x03, 0x02, 0x0b, 0x0a, 0xc0, 0x00, 0x01, 
-		//0x0210: .... .2.. .... ....
-		0x00, 0x00, 0x02, 0x0b, 0x0a, 0xb6, 0x00, 0x02, 0x00, 0x01, 0x08, 0x0b, 0x0a, 0x00, 0x00, 0x02, 
-		//0x0220: .... .... .... ....
-		0x00, 0x01, 0x17, 0x00, 0x32, 0x00, 0x00, 0x03, 0x00, 0x00, 0x1c, 0x0b, 0x14, 0xfa, 0x00, 0x04, 
-		//0x0230: .... 2... .... ....
-		0x00, 0x00, 0x17, 0x00, 0x32, 0x2b, 0x00, 0x02, 0x00, 0x08, 0x17, 0x0b, 0x28, 0x82, 0x00, 0x02, 
-		//0x0240: .... 2+.. .... (...
-		0x00, 0x01, 0x17, 0x16, 0x28, 0x7a, 0x00, 0x02, 0x00, 0x02, 0x17, 0x16, 0x28, 0x69, 0x00, 0x02, 
-		//0x0250: .... (z.. .... (i..
-		0x00, 0x03, 0x17, 0x16, 0x28, 0x51, 0x00, 0x02, 0x00, 0x04, 0x17, 0x0b, 0x28, 0x87, 0x00, 0x02, 
-		//0x0260: .... (Q.. .... (...
-		0x00, 0x05, 0x17, 0x16, 0x28, 0x91, 0x00, 0x02, 0x00, 0x06, 0x04, 0x16, 0x1e, 0x00, 0x00, 0x02, 
-		//0x0270: .... (... .... ....
-		0x00, 0x00, 0x2d, 0x16, 0x1e, 0xc8, 0x00, 0x00, 0x00, 0x14, 0x2d, 0x16, 0x1e, 0x27, 0x00, 0x02, 
-		//0x0280: ..-. .... ..-. .'..
-		0x00, 0x00, 0x2d, 0x16, 0x1e, 0x19, 0x00, 0x02, 0x00, 0x00, 0x08, 0x16, 0x28, 0x20, 0x00, 0x02, 
-		//0x0290: ..-. .... .... ( ..
-		0x00, 0x00, 0x07, 0x0b, 0x14, 0x40, 0x00, 0x02, 0x00, 0x00, 0x16, 0x16, 0x14, 0x52, 0x00, 0x02, 
-		//0x02a0: .... .@.. .... .R..
-		0x00, 0x00, 0x1b, 0x0b, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x14, 0x00, 0x1e, 0x00, 0x00, 0x02, 
-		//0x02b0: .... .... .... ....
-		0x00, 0x00, 0x0e, 0x21, 0x28, 0x15, 0x00, 0x01, 0x00, 0x00, 0x1d, 0x0b, 0x0a, 0x00, 0x00, 0x01, 
-		//0x02c0: ...! (... .... ....
-		0x00, 0x00, 0x02, 0x16, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x19, 0x00, 0x32, 0x04, 0x00, 0x02, 
-		//0x02d0: .... .... .... 2...
-		0x00, 0x00, 0x32, 0x16, 0x1e, 0x79, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x1e, 0x00, 0x00, 0x14, 
-		//0x02e0: ..2. .y.. ..2. ....
-		0x00, 0x00, 0x34, 0x16, 0x1e, 0xc0, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0xe9, 0x00, 0x02, 
-		//0x02f0: ..4. .... ..4. ....
-		0x00, 0x00, 0x32, 0x16, 0x28, 0x68, 0x00, 0x37, 0x00, 0x00, 0x35, 0x21, 0x00, 0x63, 0x00, 0x02, 
-		//0x0300: ..2. (h.7 ..5! .c..
-		0x00, 0x00, 0x32, 0x16, 0x28, 0x00, 0x00, 0x03, 0x00, 0x00, 0x32, 0x16, 0x1e, 0xa2, 0x00, 0x02, 
-		//0x0310: ..2. (... ..2. ....
-		0x00, 0x00, 0x34, 0x16, 0x1e, 0x39, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0x00, 0x00, 0x02, 
-		//0x0320: ..4. .9.. ..4. ....
-		0x00, 0x00, 0x36, 0x00, 0x00, 0x48, 0x00, 0x03, 0x00, 0x00, 0x37, 0x2c, 0x00, 0x00, 0x00, 0x02, 
-		//0x0330: ..6. .H.. ..7, ....
-		0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x0e, 0x16, 0x00, 0x02, 0x00, 0x02, 
-		//0x0340: .... .... .... ....
-		0x00, 0x00, 0x0e, 0x16, 0x00, 0x2c, 0x01, 0x01, 0x00, 0x00, 0x0a, 0x16, 0x1e, 0xae, 0x00, 0x00, 
-		//0x0350: .... .,.. .... ....
-		0x00, 0x00, 0x0c, 0x16, 0x14, 0x00, 0x00, 0x01, 0x00, 0x00, 0x0b, 0x0b, 0x14, 0x00, 0x00, 0x32, 
-		//0x0360: .... .... .... ...2
-		0x14, 0x00, 0x0b, 0x0b, 0x1e, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x16, 0x14, 0x00, 0x00, 0x32, 
-		//0x0370: .... ...2 .... ...2
-		0x14, 0x00, 0x0e, 0x21, 0x28, 0x00, 0x00, 0x32, 0x14, 0x00, 0xff, 0x44, 0x52, 0x45, 0x41, 0x4d, 
-		//0x0380: ...! (..2 ...D REAM
-		0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x00, 0x01, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 
-		//0x0390: WEB. V99. .... PUBL
-		0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 
-		//0x03a0: IC        PUBL IC  
-		0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 
-		//0x03b0:    . ..BL ACKD RAGO
-		0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 
-		//0x03c0: N RY AN         ...
-		0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 
-		//0x03d0: HEND RIX       LOUI
-		0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 
-		//0x03e0: S       . ..SE PTIM
-		0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 
-		//0x03f0: US     BE CKET T   
-		0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0400:  ...               
-		0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
-		//0x0410:  ."R OOT          .
-		0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 
-		//0x0420: "               .00
-		0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x4f, 0x42, 0x4a, 0x45, 0x43, 
-		//0x0430: 00.0 0... ..$O BJEC
-		0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0440: T NA ME O NE       
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0450:                    
-		0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 
-		//0x0460:    . .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 
-		//0x0470: .... .... .... D:..
+		0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x01, 0x2c, 0x00, 0x14, 
+		//0x01b0: .... .... .... .,..
+		0x00, 0x02, 0x00, 0x01, 0x01, 0x37, 0x00, 0x00, 0x00, 0x32, 0x14, 0x00, 0x18, 0x16, 0x00, 0x4a, 
+		//0x01c0: .... .7.. .2.. ...J
+		0x00, 0x01, 0x00, 0x00, 0x18, 0x21, 0x0a, 0x4b, 0x00, 0x01, 0x00, 0x01, 0x01, 0x2c, 0x00, 0x1b, 
+		//0x01d0: .... .!.K .... .,..
+		0x00, 0x02, 0x00, 0x02, 0x01, 0x2c, 0x00, 0x60, 0x00, 0x03, 0x00, 0x04, 0x01, 0x2c, 0x00, 0x76, 
+		//0x01e0: .... .,.` .... .,.v
+		0x00, 0x02, 0x00, 0x05, 0x01, 0x2c, 0x0a, 0x00, 0x00, 0x02, 0x00, 0x00, 0x05, 0x16, 0x14, 0x35, 
+		//0x01f0: .... .,.. .... ...5
+		0x00, 0x03, 0x00, 0x00, 0x05, 0x16, 0x14, 0x28, 0x00, 0x01, 0x00, 0x02, 0x05, 0x16, 0x14, 0x32, 
+		//0x0200: .... ...( .... ...2
+		0x00, 0x01, 0x00, 0x03, 0x02, 0x0b, 0x0a, 0xc0, 0x00, 0x01, 0x00, 0x00, 0x02, 0x0b, 0x0a, 0xb6, 
+		//0x0210: .... .... .... ....
+		0x00, 0x02, 0x00, 0x01, 0x08, 0x0b, 0x0a, 0x00, 0x00, 0x02, 0x00, 0x01, 0x17, 0x00, 0x32, 0x00, 
+		//0x0220: .... .... .... ..2.
+		0x00, 0x03, 0x00, 0x00, 0x1c, 0x0b, 0x14, 0xfa, 0x00, 0x04, 0x00, 0x00, 0x17, 0x00, 0x32, 0x2b, 
+		//0x0230: .... .... .... ..2+
+		0x00, 0x02, 0x00, 0x08, 0x17, 0x0b, 0x28, 0x82, 0x00, 0x02, 0x00, 0x01, 0x17, 0x16, 0x28, 0x7a, 
+		//0x0240: .... ..(. .... ..(z
+		0x00, 0x02, 0x00, 0x02, 0x17, 0x16, 0x28, 0x69, 0x00, 0x02, 0x00, 0x03, 0x17, 0x16, 0x28, 0x51, 
+		//0x0250: .... ..(i .... ..(Q
+		0x00, 0x02, 0x00, 0x04, 0x17, 0x0b, 0x28, 0x87, 0x00, 0x02, 0x00, 0x05, 0x17, 0x16, 0x28, 0x91, 
+		//0x0260: .... ..(. .... ..(.
+		0x00, 0x02, 0x00, 0x06, 0x04, 0x16, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0xc8, 
+		//0x0270: .... .... .... -...
+		0x00, 0x00, 0x00, 0x14, 0x2d, 0x16, 0x1e, 0x27, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0x19, 
+		//0x0280: .... -..' .... -...
+		0x00, 0x02, 0x00, 0x00, 0x08, 0x16, 0x28, 0x20, 0x00, 0x02, 0x00, 0x00, 0x07, 0x0b, 0x14, 0x40, 
+		//0x0290: .... ..(  .... ...@
+		0x00, 0x02, 0x00, 0x00, 0x16, 0x16, 0x14, 0x52, 0x00, 0x02, 0x00, 0x00, 0x1b, 0x0b, 0x1e, 0x00, 
+		//0x02a0: .... ...R .... ....
+		0x00, 0x02, 0x00, 0x00, 0x14, 0x00, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x21, 0x28, 0x15, 
+		//0x02b0: .... .... .... .!(.
+		0x00, 0x01, 0x00, 0x00, 0x1d, 0x0b, 0x0a, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x16, 0x00, 0x02, 
+		//0x02c0: .... .... .... ....
+		0x00, 0x02, 0x00, 0x00, 0x19, 0x00, 0x32, 0x04, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x1e, 0x79, 
+		//0x02d0: .... ..2. .... 2..y
+		0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x1e, 0x00, 0x00, 0x14, 0x00, 0x00, 0x34, 0x16, 0x1e, 0xc0, 
+		//0x02e0: .... 2... .... 4...
+		0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0xe9, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x68, 
+		//0x02f0: .... 4... .... 2.(h
+		0x00, 0x37, 0x00, 0x00, 0x35, 0x21, 0x00, 0x63, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x00, 
+		//0x0300: .7.. 5!.c .... 2.(.
+		0x00, 0x03, 0x00, 0x00, 0x32, 0x16, 0x1e, 0xa2, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0x39, 
+		//0x0310: .... 2... .... 4..9
+		0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x36, 0x00, 0x00, 0x48, 
+		//0x0320: .... 4... .... 6..H
+		0x00, 0x03, 0x00, 0x00, 0x37, 0x2c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 
+		//0x0330: .... 7,.. .... ....
+		0x00, 0x1c, 0x00, 0x00, 0x0e, 0x16, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x16, 0x00, 0x2c, 
+		//0x0340: .... .... .... ...,
+		0x01, 0x01, 0x00, 0x00, 0x0a, 0x16, 0x1e, 0xae, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x16, 0x14, 0x00, 
+		//0x0350: .... .... .... ....
+		0x00, 0x01, 0x00, 0x00, 0x0b, 0x0b, 0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x0b, 0x1e, 0x00, 
+		//0x0360: .... .... .2.. ....
+		0x00, 0x32, 0x14, 0x00, 0x0b, 0x16, 0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0e, 0x21, 0x28, 0x00, 
+		//0x0370: .2.. .... .2.. .!(.
+		0x00, 0x32, 0x14, 0x00, 0xff, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 
+		//0x0380: .2.. .DRE AMWE B.V9
+		0x39, 0x00, 0x00, 0x01, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 
+		//0x0390: 9... ..PU BLIC     
+		0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 
+		//0x03a0:   PU BLIC       ...
+		0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 
+		//0x03b0: BLAC KDRA GON  RYAN
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 
+		//0x03c0:         . ..HE NDRI
+		0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x03d0: X      LO UIS      
+		0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 
+		//0x03e0:  ... SEPT IMUS     
+		0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 
+		//0x03f0: BECK ETT     . ..  
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 
+		//0x0400:              . "ROO
+		0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0410: T          ."      
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 
+		//0x0420:         . 0000 .00.
+		0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x4f, 0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 
+		//0x0430: .... $OBJ ECT  NAME
+		0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0440:  ONE               
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 
+		//0x0450:                 ...
+		0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 
+		//0x0460: .... .... .... ....
+		0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0470: .... ..D: .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0480: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0490: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 
 		//0x04a0: .... .... .... ....
-		0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04b0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04c0: .... .... .... ....
@@ -4219,9 +4219,9 @@ void DreamGenContext::__start() {
 		//0x0510: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0520: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
 		//0x0530: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
+		0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index b565b4e13a..e530a3b968 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,13 +32,13 @@
 
 namespace DreamGen {
 
-static const uint16 offset_money1poke = 0x042e;
-static const uint16 offset_operand1 = 0x0404;
-static const uint16 offset_openchangesize = 0x0398;
-static const uint16 offset_commandline = 0x043b;
-static const uint16 offset_rootdir = 0x0412;
-static const uint16 offset_money2poke = 0x0433;
-static const uint16 offset_keys = 0x039a;
+static const uint16 offset_money2poke = 0x042d;
+static const uint16 offset_rootdir = 0x040c;
+static const uint16 offset_openchangesize = 0x0392;
+static const uint16 offset_keys = 0x0394;
+static const uint16 offset_commandline = 0x0435;
+static const uint16 offset_money1poke = 0x0428;
+static const uint16 offset_operand1 = 0x03fe;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -272,113 +272,109 @@ static const uint16 kDumpy = 291;
 static const uint16 kWalkandexam = 293;
 static const uint16 kWalkexamtype = 294;
 static const uint16 kWalkexamnum = 295;
-static const uint16 kCursloc = 296;
-static const uint16 kCurslocx = 298;
-static const uint16 kCurslocy = 300;
-static const uint16 kCurpos = 302;
-static const uint16 kMonadx = 304;
-static const uint16 kMonady = 306;
-static const uint16 kGotfrom = 308;
-static const uint16 kMonsource = 310;
-static const uint16 kNumtodo = 312;
-static const uint16 kTimecount = 314;
-static const uint16 kCounttotimed = 316;
-static const uint16 kTimedseg = 318;
-static const uint16 kTimedoffset = 320;
-static const uint16 kTimedy = 322;
-static const uint16 kTimedx = 323;
-static const uint16 kNeedtodumptimed = 324;
-static const uint16 kLoadingorsave = 325;
-static const uint16 kCurrentslot = 326;
-static const uint16 kCursorpos = 327;
-static const uint16 kColourpos = 328;
-static const uint16 kFadedirection = 329;
-static const uint16 kNumtofade = 330;
-static const uint16 kFadecount = 331;
-static const uint16 kAddtogreen = 332;
-static const uint16 kAddtored = 333;
-static const uint16 kAddtoblue = 334;
-static const uint16 kLastsoundreel = 335;
-static const uint16 kSpeechloaded = 337;
-static const uint16 kSpeechlength = 338;
-static const uint16 kVolume = 340;
-static const uint16 kVolumeto = 341;
-static const uint16 kVolumedirection = 342;
-static const uint16 kVolumecount = 343;
-static const uint16 kPlayblock = 344;
-static const uint16 kWongame = 345;
-static const uint16 kLasthardkey = 346;
-static const uint16 kBufferin = 347;
-static const uint16 kBufferout = 349;
-static const uint16 kExtras = 351;
-static const uint16 kWorkspace = 353;
-static const uint16 kMapstore = 355;
-static const uint16 kCharset1 = 357;
-static const uint16 kBuffers = 359;
-static const uint16 kMainsprites = 361;
-static const uint16 kBackdrop = 363;
-static const uint16 kMapdata = 365;
-static const uint16 kSounddata = 367;
-static const uint16 kSounddata2 = 369;
-static const uint16 kRecordspace = 371;
-static const uint16 kFreedat = 373;
-static const uint16 kSetdat = 375;
-static const uint16 kReel1 = 377;
-static const uint16 kReel2 = 379;
-static const uint16 kReel3 = 381;
-static const uint16 kRoomdesc = 383;
-static const uint16 kFreedesc = 385;
-static const uint16 kSetdesc = 387;
-static const uint16 kBlockdesc = 389;
-static const uint16 kSetframes = 391;
-static const uint16 kFreeframes = 393;
-static const uint16 kPeople = 395;
-static const uint16 kReels = 397;
-static const uint16 kCommandtext = 399;
-static const uint16 kPuzzletext = 401;
-static const uint16 kTraveltext = 403;
-static const uint16 kTempgraphics = 405;
-static const uint16 kTempgraphics2 = 407;
-static const uint16 kTempgraphics3 = 409;
-static const uint16 kTempsprites = 411;
-static const uint16 kTextfile1 = 413;
-static const uint16 kTextfile2 = 415;
-static const uint16 kTextfile3 = 417;
-static const uint16 kBlinkframe = 419;
-static const uint16 kBlinkcount = 420;
-static const uint16 kReasseschanges = 421;
-static const uint16 kPointerspath = 422;
-static const uint16 kManspath = 423;
-static const uint16 kPointerfirstpath = 424;
-static const uint16 kFinaldest = 425;
-static const uint16 kDestination = 426;
-static const uint16 kLinestartx = 427;
-static const uint16 kLinestarty = 429;
-static const uint16 kLineendx = 431;
-static const uint16 kLineendy = 433;
-static const uint16 kLinepointer = 435;
-static const uint16 kLinedirection = 436;
-static const uint16 kLinelength = 437;
-static const uint16 kLiftsoundcount = 438;
-static const uint16 kCh0blockstocopy = 439;
-static const uint16 kCh0playing = 441;
-static const uint16 kCh0repeat = 442;
-static const uint16 kCh1playing = 443;
-static const uint16 kCh1blockstocopy = 444;
-static const uint16 kSoundbufferwrite = 446;
-static const uint16 kCurrentsample = 448;
-static const uint16 kRoomssample = 449;
-static const uint16 kReelroutines = 450;
-static const uint16 kBasicsample = 907;
-static const uint16 kCurrentfile = 1056;
-static const uint16 kRoomscango = 1180;
-static const uint16 kRoompics = 1196;
-static const uint16 kOplist = 1211;
-static const uint16 kInputline = 1214;
-static const uint16 kPresslist = 1342;
-static const uint16 kQuitrequested = 1348;
-static const uint16 kSubtitles = 1349;
-static const uint16 kForeignrelease = 1350;
+static const uint16 kCurslocx = 296;
+static const uint16 kCurslocy = 298;
+static const uint16 kCurpos = 300;
+static const uint16 kMonadx = 302;
+static const uint16 kMonady = 304;
+static const uint16 kMonsource = 306;
+static const uint16 kNumtodo = 308;
+static const uint16 kTimecount = 310;
+static const uint16 kCounttotimed = 312;
+static const uint16 kTimedseg = 314;
+static const uint16 kTimedoffset = 316;
+static const uint16 kTimedy = 318;
+static const uint16 kTimedx = 319;
+static const uint16 kNeedtodumptimed = 320;
+static const uint16 kLoadingorsave = 321;
+static const uint16 kCurrentslot = 322;
+static const uint16 kCursorpos = 323;
+static const uint16 kColourpos = 324;
+static const uint16 kFadedirection = 325;
+static const uint16 kNumtofade = 326;
+static const uint16 kFadecount = 327;
+static const uint16 kAddtogreen = 328;
+static const uint16 kAddtored = 329;
+static const uint16 kAddtoblue = 330;
+static const uint16 kLastsoundreel = 331;
+static const uint16 kSpeechloaded = 333;
+static const uint16 kSpeechlength = 334;
+static const uint16 kVolume = 336;
+static const uint16 kVolumeto = 337;
+static const uint16 kVolumedirection = 338;
+static const uint16 kVolumecount = 339;
+static const uint16 kWongame = 340;
+static const uint16 kLasthardkey = 341;
+static const uint16 kBufferin = 342;
+static const uint16 kBufferout = 344;
+static const uint16 kExtras = 346;
+static const uint16 kWorkspace = 348;
+static const uint16 kMapstore = 350;
+static const uint16 kCharset1 = 352;
+static const uint16 kBuffers = 354;
+static const uint16 kMainsprites = 356;
+static const uint16 kBackdrop = 358;
+static const uint16 kMapdata = 360;
+static const uint16 kSounddata = 362;
+static const uint16 kSounddata2 = 364;
+static const uint16 kRecordspace = 366;
+static const uint16 kFreedat = 368;
+static const uint16 kSetdat = 370;
+static const uint16 kReel1 = 372;
+static const uint16 kReel2 = 374;
+static const uint16 kReel3 = 376;
+static const uint16 kRoomdesc = 378;
+static const uint16 kFreedesc = 380;
+static const uint16 kSetdesc = 382;
+static const uint16 kBlockdesc = 384;
+static const uint16 kSetframes = 386;
+static const uint16 kFreeframes = 388;
+static const uint16 kPeople = 390;
+static const uint16 kReels = 392;
+static const uint16 kCommandtext = 394;
+static const uint16 kPuzzletext = 396;
+static const uint16 kTraveltext = 398;
+static const uint16 kTempgraphics = 400;
+static const uint16 kTempgraphics2 = 402;
+static const uint16 kTempgraphics3 = 404;
+static const uint16 kTempsprites = 406;
+static const uint16 kTextfile1 = 408;
+static const uint16 kTextfile2 = 410;
+static const uint16 kTextfile3 = 412;
+static const uint16 kBlinkframe = 414;
+static const uint16 kBlinkcount = 415;
+static const uint16 kReasseschanges = 416;
+static const uint16 kPointerspath = 417;
+static const uint16 kManspath = 418;
+static const uint16 kPointerfirstpath = 419;
+static const uint16 kFinaldest = 420;
+static const uint16 kDestination = 421;
+static const uint16 kLinestartx = 422;
+static const uint16 kLinestarty = 424;
+static const uint16 kLineendx = 426;
+static const uint16 kLineendy = 428;
+static const uint16 kLinepointer = 430;
+static const uint16 kLinedirection = 431;
+static const uint16 kLinelength = 432;
+static const uint16 kCh0blockstocopy = 433;
+static const uint16 kCh0playing = 435;
+static const uint16 kCh0repeat = 436;
+static const uint16 kCh1playing = 437;
+static const uint16 kCh1blockstocopy = 438;
+static const uint16 kSoundbufferwrite = 440;
+static const uint16 kCurrentsample = 442;
+static const uint16 kRoomssample = 443;
+static const uint16 kReelroutines = 444;
+static const uint16 kBasicsample = 901;
+static const uint16 kCurrentfile = 1050;
+static const uint16 kRoomscango = 1174;
+static const uint16 kRoompics = 1190;
+static const uint16 kOplist = 1205;
+static const uint16 kInputline = 1208;
+static const uint16 kPresslist = 1336;
+static const uint16 kQuitrequested = 1342;
+static const uint16 kSubtitles = 1343;
+static const uint16 kForeignrelease = 1344;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -417,8 +413,8 @@ static const uint16 kListofchanges = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768
 static const uint16 kUndertimedtext = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4));
 static const uint16 kRainlist = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30));
 static const uint16 kInitialreelrouts = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
-static const uint16 kInitialvars = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+907-450);
-static const uint16 kLengthofbuffer = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+907-450+68-0);
+static const uint16 kInitialvars = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+901-444);
+static const uint16 kLengthofbuffer = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+901-444+68-0);
 static const uint16 kReellist = (0+(36*144));
 static const uint16 kIntext = (0+(38*2));
 static const uint16 kLengthofmap = (0+(66*60));
@@ -469,7 +465,7 @@ static const uint16 kKeypady = (72);
 static const uint16 kZoomx = (8);
 static const uint16 kInventx = (80);
 static const uint16 kMenux = (80+40);
-static const uint16 kLenofreelrouts = (907-450);
+static const uint16 kLenofreelrouts = (901-444);
 static const uint16 kHeaderlen = (96);
 
 
-- 
cgit v1.2.3


From 93bf275f4c9ef168ceab23a07a1219d2c78b65ec Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 15 Dec 2011 12:15:22 +0200
Subject: DREAMWEB: Port 'helicopter' to C++

---
 engines/dreamweb/dreamgen.cpp | 65 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/people.cpp   | 52 ++++++++++++++++++++++++++++++++--
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 51 insertions(+), 68 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index dfeda18d6c..2ee3d512cd 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -26,71 +26,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::helicopter() {
-	STACK_CHECK;
-	ax = es.word(bx+3);
-	_cmp(ax, 203);
-	if (flags.z())
-		goto heliwon;
-	checkSpeed();
-	if (!flags.z())
-		goto helispeed;
-	ax = es.word(bx+3);
-	_inc(ax);
-	_cmp(ax, 53);
-	if (!flags.z())
-		goto notbeforehdead;
-	_inc(data.byte(kCombatcount));
-	_cmp(data.byte(kCombatcount), 8);
-	if (flags.c())
-		goto waitabit;
-	data.byte(kMandead) = 2;
-waitabit:
-	ax = 49;
-	goto gotheliframe;
-notbeforehdead:
-	_cmp(ax, 9);
-	if (!flags.z())
-		goto gotheliframe;
-	_dec(ax);
-	_cmp(data.byte(kLastweapon), 1);
-	if (!flags.z())
-		goto notgunonheli;
-	data.byte(kLastweapon) = -1;
-	ax = 55;
-	goto gotheliframe;
-notgunonheli:
-	ax = 5;
-	_inc(data.byte(kCombatcount));
-	_cmp(data.byte(kCombatcount), 20);
-	if (!flags.z())
-		goto gotheliframe;
-	data.byte(kCombatcount) = 0;
-	ax = 9;
-gotheliframe:
-	es.word(bx+3) = ax;
-helispeed:
-	showGameReel();
-	al = data.byte(kMapx);
-	es.byte(bx+1) = al;
-	ax = es.word(bx+3);
-	_cmp(ax, 9);
-	if (!flags.c())
-		goto notwaitingheli;
-	_cmp(data.byte(kCombatcount), 7);
-	if (flags.c())
-		goto notwaitingheli;
-	data.byte(kPointermode) = 2;
-	data.word(kWatchingtime) = 0;
-	return;
-notwaitingheli:
-	data.byte(kPointermode) = 0;
-	data.word(kWatchingtime) = 2;
-	return;
-heliwon:
-	data.byte(kPointermode) = 0;
-}
-
 void DreamGenContext::mugger() {
 	STACK_CHECK;
 	ax = es.word(bx+3);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index e530a3b968..582caa712f 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -530,7 +530,6 @@ public:
 	void findAllOpen();
 	void showSlots();
 	void deleteExObject();
-	void helicopter();
 	void getEitherAd();
 	void setPickup();
 	void dropObject();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 99a83f44d3..e060df9fcc 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -42,7 +42,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
 	NULL, &DreamGenContext::poolGuard,
 	NULL, &DreamGenContext::businessMan,
 	NULL, NULL,
-	&DreamGenContext::mugger, &DreamGenContext::helicopter,
+	&DreamGenContext::mugger, NULL,
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
@@ -74,7 +74,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
 	&DreamGenContext::copper, /*&DreamGenContext::poolGuard*/NULL,
 	&DreamGenContext::rockstar, /*&DreamGenContext::businessMan*/NULL,
 	&DreamGenContext::train, &DreamGenContext::genericPerson /*aide*/,
-	/*&DreamGenContext::mugger*/NULL, /*&DreamGenContext::helicopter*/NULL,
+	/*&DreamGenContext::mugger*/NULL, &DreamGenContext::helicopter,
 	&DreamGenContext::introMagic1, &DreamGenContext::introMusic,
 	&DreamGenContext::introMagic2, &DreamGenContext::candles2,
 	&DreamGenContext::gates, &DreamGenContext::introMagic3,
@@ -859,4 +859,52 @@ void DreamGenContext::heavy(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
+void DreamGenContext::helicopter(ReelRoutine &routine) {
+	if (routine.reelPointer() == 203) {
+		// Won helicopter
+		data.byte(kPointermode) = 0;
+		return;
+	}
+
+	if (checkSpeed(routine)) {
+		uint16 nextReelPointer = routine.reelPointer() + 1;
+		if (nextReelPointer == 53) {
+			// Before killing helicopter
+			data.byte(kCombatcount)++;
+			if (data.byte(kCombatcount) != 8)
+				data.byte(kMandead) = 2;
+			nextReelPointer = 49;
+		} else if (nextReelPointer == 9) {
+			nextReelPointer--;
+			if (data.byte(kLastweapon) == 1) {
+				data.byte(kLastweapon) = (byte)-1;
+				nextReelPointer = 55;
+			} else {
+				nextReelPointer = 5;
+				data.byte(kCombatcount)++;
+				if (data.byte(kCombatcount) == 20) {
+					data.byte(kCombatcount) = 0;
+					nextReelPointer = 9;
+				}
+			}
+		} else {
+			// Not waiting helicopter
+			data.byte(kPointermode) = 0;
+			data.word(kWatchingtime) = 2;
+		}
+
+		routine.setReelPointer(nextReelPointer);
+	}
+
+	showGameReel(&routine);
+	routine.mapX = data.byte(kMapx);
+	if (routine.reelPointer() == 9 && data.byte(kCombatcount) != 7) {
+		data.byte(kPointermode) = 2;
+		data.word(kWatchingtime) = 0;
+	} else {
+		data.byte(kPointermode) = 0;
+		data.word(kWatchingtime) = 2;
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 3413c5eef0..8218a1ac0f 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -418,6 +418,7 @@
 	void receptionist(ReelRoutine &routine);
 	void bartender(ReelRoutine &routine);
 	void heavy(ReelRoutine &routine);
+	void helicopter(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void loadSaveBox();
 	void loadKeypad();
-- 
cgit v1.2.3


From 1f348745b00bb2f3fc3bc37d30221ab2f229b28d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 15 Dec 2011 12:24:48 +0200
Subject: DREAMWEB: Fix regression in describeOb()

---
 engines/dreamweb/stubs.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index e721d482db..0c57d0d767 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3402,11 +3402,12 @@ void DreamGenContext::describeOb() {
 	if (data.byte(kForeignrelease) && data.byte(kObjecttype) == 1)
 		y = 82;
 	data.word(kCharshift) = 91 + 91;
-	printDirect(obText, 33, y, 241, 241 & 1);
+	printDirect(&obText, 33, &y, 241, 241 & 1);
 	data.word(kCharshift) = 0;
+	y = 104;
 	if (data.byte(kForeignrelease) && data.byte(kObjecttype) == 1)
 		y = 94;
-	printDirect(obText, 36, y, 241, 241 & 1);
+	printDirect(&obText, 36, &y, 241, 241 & 1);
 	obsThatDoThings();
 
 	// Additional text
-- 
cgit v1.2.3


From d97d8b1d06e4ca0d6fdc5ff7a2c8f6f44d361585 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 15 Dec 2011 21:28:01 +1100
Subject: TSAGE: Implemented R2R Scene 250 - Lift

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   7 +-
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 306 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  29 +++
 3 files changed, 340 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index b93e9c202a..b3cbd86412 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -56,12 +56,15 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 180:
 		error("Missing scene %d from group 0", sceneNumber);
 	case 200:
-		// Ship Corridor
+		// Deck #2 - By Lift
 		return new Scene200();
 	case 205:
-	case 250:
 		error("Missing scene %d from group 0", sceneNumber);
+	case 250:
+		// Lift
+		return new Scene250();
 	case 300:
+		// Bridge
 		return new Scene300();
 	case 325:
 		error("Missing scene %d from group 0", sceneNumber);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 61e3f8e00b..1c25c896a6 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1443,6 +1443,312 @@ void Scene200::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 250 - Lift
+ *
+ *--------------------------------------------------------------------------*/
+
+Scene250::Button::Button(): SceneActor() {
+	_floorNumber = _v2 = 0;
+}
+
+void Scene250::Button::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+
+	s.syncAsSint16LE(_floorNumber);
+	s.syncAsSint16LE(_v2);
+}
+
+bool Scene250::Button::startAction(CursorType action, Event &event) {
+	Scene250 *scene = (Scene250 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (scene->_field414) {
+			SceneItem::display2(250, 15);
+		} else {
+			switch (_floorNumber) {
+			case 1:
+			case 2:
+			case 5:
+			case 9:
+				scene->_sound1.play(14);
+				scene->changeFloor(_floorNumber);
+				break;
+			case 10:
+				// Current Floor
+				scene->_sound1.play(14);
+				R2_GLOBALS._sceneManager.changeScene(R2_GLOBALS._sceneManager._previousScene);
+				break;
+			default:
+				SceneItem::display2(250, 16);
+				break;
+			}
+		}
+		return true;
+
+	case CURSOR_LOOK:
+		switch (_floorNumber) {
+		case 1:
+		case 2:
+		case 5:
+		case 9:
+			SceneItem::display2(250, 12);
+			break;
+		case 10:
+			SceneItem::display2(250, 13);
+			break;
+		case 11:
+			SceneItem::display2(250, 14);
+			break;
+		default:
+			SceneItem::display2(250, 16);
+			break;
+		}
+		return true;
+
+	default:
+		return SceneActor::startAction(action, event);
+	}
+}
+
+void Scene250::Button::setFloor(int floorNumber) {
+	SceneActor::postInit();
+	_floorNumber = floorNumber;
+	_v2 = 0;
+
+	if (_floorNumber <= 9) {
+		SceneObject::setup(250, 1, 4);
+
+		switch (_floorNumber) {
+		case 1:
+		case 2:
+		case 5:
+		case 9:
+			setFrame(6);
+			break;
+		default:
+			break;
+		}
+
+		setPosition(Common::Point(111, (_floorNumber - 1) * 12 + 43));
+		fixPriority(10);
+		setDetails(250, -1, -1, -1, 1, NULL);
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+Scene250::Scene250(): SceneExt() {
+	_field412 = _field414 = _field416 = _field418 = _field41A = 0;
+}
+
+void Scene250::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_field414);
+	s.syncAsSint16LE(_field416);
+	s.syncAsSint16LE(_field418);
+	s.syncAsSint16LE(_field41A);
+}
+
+void Scene250::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(250);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setVisage(10);
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.enableControl();
+	R2_GLOBALS._player._canWalk = false;
+
+	_currentFloor.setFloor(10);
+	_currentFloor.setup(250, 1, 5);
+	_currentFloor.setDetails(250, 13, -1, -1, 1, NULL);
+
+	_button1.setFloor(11);
+	_button1.setup(250, 1, 3);
+	_button1.setPosition(Common::Point(400, 100));
+	_button1.setDetails(250, 14, -1, -1, 1, NULL);
+	_button1.fixPriority(190);
+	_button1.hide();
+
+	_floor1.setFloor(1);
+	_floor2.setFloor(2);
+	_floor3.setFloor(3);
+	_floor4.setFloor(4);
+	_floor5.setFloor(5);
+	_floor6.setFloor(6);
+	_floor7.setFloor(7);
+	_floor8.setFloor(8);
+	_floor9.setFloor(9);
+
+	_item2.setDetails(Rect(0, 0, 73, SCREEN_HEIGHT), 250, 9, -1, 9, 1, NULL);
+	_item4.setDetails(Rect(239, 16, 283, 164), 250, 6, -1, -1, 1, NULL);
+	_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 250, 0, 1, -1, 1, NULL);
+
+	R2_GLOBALS._events.setCursor(CURSOR_USE);
+
+	switch (R2_GLOBALS._sceneManager._previousScene) {
+	case 200:
+		_field412 = 55;
+		break;
+	case 300:
+		_field412 = 43;
+		break;
+	case 700:
+		_field412 = 139;
+		break;
+	case 850:
+		_field412 = 91;
+		break;
+	default:
+		R2_GLOBALS._sceneManager._previousScene = 200;
+		_field412 = 55;
+		break;
+	}
+
+	_currentFloor.setPosition(Common::Point(111, _field412));
+}
+
+void Scene250::signal() {
+	if (_field41A)
+		_sceneMode = 20;
+
+	switch (_sceneMode) {
+	case 1:
+		_sound1.play(22);
+		R2_GLOBALS._player.show();
+		R2_GLOBALS._player.setup(250, 1, 2);
+		R2_GLOBALS._player.setPosition(Common::Point(261, 185));
+		ADD_MOVER(R2_GLOBALS._player, 261, 15);
+
+		_field416 = 0;
+		_sceneMode = 2;
+		break;
+	case 2:
+		_sceneMode = ((_field414 - 12) == _field412) ? 4 : 3;
+		signal();
+		break;
+	case 3:
+		_currentFloor.setPosition(Common::Point(111, _currentFloor._position.y + 12));
+		_field412 += 12;
+		R2_GLOBALS._player.setPosition(Common::Point(261, 185));
+		ADD_MOVER(R2_GLOBALS._player, 261, 15);
+		
+		if ((_field414 - 12) == _field412)
+			_sceneMode = 4;
+		break;
+	case 4:
+		_sound1.play(21);
+		
+		_currentFloor.setPosition(Common::Point(111, _currentFloor._position.y + 12));
+		R2_GLOBALS._player.setPosition(Common::Point(261, 185));
+		ADD_MOVER(R2_GLOBALS._player, 261, 15);
+		_sceneMode = 5;
+		break;
+	case 5:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 20;
+		signal();
+		break;
+	case 6:
+		_sound1.play(22);
+		R2_GLOBALS._player.show();
+		R2_GLOBALS._player.setup(250, 1, 2);
+		R2_GLOBALS._player.setPosition(Common::Point(261, 15));
+		ADD_MOVER(R2_GLOBALS._player, 261, 185);
+		_field416 = 0;
+		_sceneMode = 7;
+		break;
+	case 7:
+		_field418 = 1;
+		if ((_field414 + 12) == _field412)
+			_sceneMode = 8;
+		signal();
+		break;
+	case 8:
+		_currentFloor.setPosition(Common::Point(111, _currentFloor._position.y - 12));
+		_field412 -= 12;
+		R2_GLOBALS._player.setPosition(Common::Point(261, 15));
+		ADD_MOVER(R2_GLOBALS._player, 261, 185);
+
+		if ((_field414 + 12) == _field412)
+			_sceneMode = 9;
+		break;
+	case 9:
+		_sound1.play(21);
+		_currentFloor.setPosition(Common::Point(111, _currentFloor._position.y - 12));
+		R2_GLOBALS._player.setPosition(Common::Point(261, 15));
+		ADD_MOVER(R2_GLOBALS._player, 261, 185);
+		_sceneMode = 10;
+		break;
+	case 10:
+		_sceneMode = 20;
+		signal();
+		break;
+	case 20:
+		// Handle changing scene
+		switch (_field414) {
+		case 55:
+			R2_GLOBALS._sceneManager.changeScene(200);
+			break;
+		case 43:
+			R2_GLOBALS._sceneManager.changeScene(300);
+			break;
+		case 139:
+			R2_GLOBALS._sceneManager.changeScene(139);
+			break;
+		case 91:
+			R2_GLOBALS._sceneManager.changeScene(91);
+			break;
+		default:
+			break;
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene250::changeFloor(int floorNumber) {
+	_field414 = (floorNumber - 1) * 12 + 43;
+	_button1.setPosition(Common::Point(111, _field414));
+	_button1.show();
+
+	_sceneMode = (_field412 >= _field414) ? 6 : 1;
+	if (_field414 == _field412)
+		_sceneMode = 20;
+
+	signal();
+}
+
+void Scene250::process(Event &event) {
+	if (!event.handled) {
+		if (((event.eventType == EVENT_KEYPRESS) || (event.btnState != 0)) && _field418) {
+			_field41A = 1;
+			event.handled = true;
+		}
+
+		SceneExt::process(event);
+	}
+}
+
+void Scene250::dispatch() {
+	SceneExt::dispatch();
+
+	if (((_sceneMode == 2) || (_sceneMode == 7)) && (_field416 < 100)) {
+		++_field416;
+		R2_GLOBALS._player._moveDiff.y = _field416 / 5;
+	}
+
+	if (((_sceneMode == 5) || (_sceneMode == 10)) && (R2_GLOBALS._player._moveDiff.y > 4)) {
+		--_field416;
+		R2_GLOBALS._player._moveDiff.y = _field416 / 7 + 3;
+	}
+}
+
 /*--------------------------------------------------------------------------
  * Scene 300 - Bridge
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 16133e81a0..a0c3f92668 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -206,6 +206,35 @@ public:
 	virtual void signal();
 };
 
+class Scene250: public SceneExt {
+	class Button: public SceneActor {
+	public:
+		int _floorNumber, _v2;
+		Button();
+		void setFloor(int floorNumber);
+
+		virtual void synchronize(Serializer &s);
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+	int _field412, _field414, _field416, _field418, _field41A;
+	NamedHotspot _background, _item2, _item3, _item4;
+	Button _button1, _currentFloor;
+	Button _floor1, _floor2, _floor3, _floor4, _floor5;
+	Button _floor6, _floor7, _floor8, _floor9;
+	ASoundExt _sound1;
+	SequenceManager _sequenceManager1;
+public:
+	Scene250();
+	void changeFloor(int floorNumber);
+
+	virtual void synchronize(Serializer &s);
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void process(Event &event);
+	virtual void dispatch();
+};
+
 class Scene300: public SceneExt {
 	/* Actions */
 	class Action1: public Action {
-- 
cgit v1.2.3


From ee43bfed74f313115fc9cb537f614f26fa3d6fa2 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 15 Dec 2011 13:09:43 +0100
Subject: TSAGE: R2R - Implement Scene 2700

---
 engines/tsage/ringworld2/ringworld2_logic.cpp    |  32 +-
 engines/tsage/ringworld2/ringworld2_scenes2.cpp  | 708 ++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes2.h    |  57 ++
 engines/tsage/ringworld2/ringworld2_speakers.cpp |  90 +++
 engines/tsage/ringworld2/ringworld2_speakers.h   |  16 +
 5 files changed, 875 insertions(+), 28 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index b3cbd86412..3e0d36be8d 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -108,51 +108,53 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	/* Scene group #2 */
 	//
 	case 2000:
-		// Maze
+		// Ice Maze
 		return new Scene2000();
 	case 2350:
-		// Maze: Balloon Launch Platform
+		// Ice Maze: Balloon Launch Platform
 		return new Scene2350();
 	case 2400:
-		// Maze: Large empty room
+		// Ice Maze: Large empty room
 		return new Scene2400();
 	case 2425:
-		// Maze: 
+		// Ice Maze: 
 		return new Scene2425();
 	case 2430:
-		// Maze: Bedroom
+		// Ice Maze: Bedroom
 		return new Scene2430();
 	case 2435:
-		// Maze: Throne room
+		// Ice Maze: Throne room
 		return new Scene2435();
 	case 2440:
-		// Maze: Another bedroom
+		// Ice Maze: Another bedroom
 		return new Scene2440();
 	case 2445:
-		// Maze:
+		// Ice Maze:
 		return new Scene2445();
 	case 2450:
-		// Maze: Another bedroom
+		// Ice Maze: Another bedroom
 		return new Scene2450();
 	case 2455:
-		// Maze: Inside crevasse
+		// Ice Maze: Inside crevasse
 		return new Scene2455();
 	case 2500:
-		// Maze: Large Cave
+		// Ice Maze: Large Cave
 		return new Scene2500();
 	case 2525:
-		// Maze: Furnace room
+		// Ice Maze: Furnace room
 		return new Scene2525();
 	case 2530:
-		// Maze: Well
+		// Ice Maze: Well
 		return new Scene2530();
 	case 2535:
-		// Maze: Tannery
+		// Ice Maze: Tannery
 		return new Scene2535();
 	case 2600:
-		// Maze: Exit
+		// Ice Maze: Exit
 		return new Scene2600();
 	case 2700:
+		// Forest Maze
+		return new Scene2700();
 	case 2750:
 	case 2800:
 	case 2900:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index b2e7b46420..a81aee41de 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -30,7 +30,7 @@ namespace TsAGE {
 namespace Ringworld2 {
 
 /*--------------------------------------------------------------------------
- * Scene 2000 - Maze
+ * Scene 2000 - Ice Maze
  *
  *--------------------------------------------------------------------------*/
 void Scene2000::initPlayer() {
@@ -1222,7 +1222,7 @@ void Scene2350::process(Event &event) {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 2400 - Maze: Large empty room
+ * Scene 2400 - Ice Maze: Large empty room
  *
  *--------------------------------------------------------------------------*/
 void Scene2400::Exit1::changeScene() {
@@ -1284,7 +1284,7 @@ void Scene2400::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 2425 - Maze:
+ * Scene 2425 - Ice Maze:
  *
  *--------------------------------------------------------------------------*/
 
@@ -1499,7 +1499,7 @@ void Scene2425::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 2430 - Maze: Bedroom
+ * Scene 2430 - Ice Maze: Bedroom
  *
  *--------------------------------------------------------------------------*/
 
@@ -1638,7 +1638,7 @@ void Scene2430::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 2435 - Maze: Throne room
+ * Scene 2435 - Ice Maze: Throne room
  *
  *--------------------------------------------------------------------------*/
 bool Scene2435::Actor1::startAction(CursorType action, Event &event) {
@@ -1796,7 +1796,7 @@ void Scene2435::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 2440 - Maze: Another bedroom
+ * Scene 2440 - Ice Maze: Another bedroom
  *
  *--------------------------------------------------------------------------*/
 
@@ -1909,7 +1909,7 @@ void Scene2440::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 2445 - Maze:
+ * Scene 2445 - Ice Maze:
  *
  *--------------------------------------------------------------------------*/
 void Scene2445::postInit(SceneObjectList *OwnerList) {
@@ -1927,7 +1927,7 @@ void Scene2445::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 2450 - Maze: Another bedroom
+ * Scene 2450 - Ice Maze: Another bedroom
  *
  *--------------------------------------------------------------------------*/
 
@@ -2219,7 +2219,7 @@ void Scene2450::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 2455 - Maze: Inside crevasse
+ * Scene 2455 - Ice Maze: Inside crevasse
  *
  *--------------------------------------------------------------------------*/
 
@@ -2399,7 +2399,7 @@ void Scene2455::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 2500 - Maze: Large Cave
+ * Scene 2500 - Ice Maze: Large Cave
  *
  *--------------------------------------------------------------------------*/
 
@@ -2644,7 +2644,7 @@ void Scene2525::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 2530 - Maze: Well
+ * Scene 2530 - Ice Maze: Well
  *
  *--------------------------------------------------------------------------*/
 bool Scene2530::Actor2::startAction(CursorType action, Event &event) {
@@ -2801,7 +2801,7 @@ void Scene2530::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 2535 - Maze: Tannery
+ * Scene 2535 - Ice Maze: Tannery
  *
  *--------------------------------------------------------------------------*/
 
@@ -2846,6 +2846,7 @@ bool Scene2535::Actor4::startAction(CursorType action, Event &event) {
 
 void Scene2535::Exit1::changeScene() {
 	Scene2535 *scene = (Scene2535 *)R2_GLOBALS._sceneManager._scene;
+
 	_enabled = false;
 	R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 	R2_GLOBALS._player.disableControl();
@@ -2984,7 +2985,7 @@ void Scene2535::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 2600 - Maze: Exit
+ * Scene 2600 - Ice Maze: Exit
  *
  *--------------------------------------------------------------------------*/
 Scene2600::Scene2600(): SceneExt() {
@@ -3024,5 +3025,686 @@ void Scene2600::signal() {
 		g_globals->_sceneManager.changeScene(3800);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 2700 - Forest Maze
+ *
+ *--------------------------------------------------------------------------*/
+Scene2700::Scene2700(): SceneExt() {
+	_field412 = _field414 = _field416 = 0;
+}
+
+void Scene2700::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_field414);
+	s.syncAsSint16LE(_field416);
+}
+
+void Scene2700::Action1::signal() {
+	Scene2700 *scene = (Scene2700 *)R2_GLOBALS._sceneManager._scene;
+
+	setDelay(600 + R2_GLOBALS._randomSource.getRandomNumber(300));
+	scene->_actor2.animate(ANIM_MODE_5, NULL);
+}
+
+void Scene2700::Action2::signal() {
+	Scene2700 *scene = (Scene2700 *)R2_GLOBALS._sceneManager._scene;
+
+	setDelay(300 + R2_GLOBALS._randomSource.getRandomNumber(300));
+	scene->_actor3.animate(ANIM_MODE_5, NULL);
+}
+
+void Scene2700::Action3::signal() {
+	Scene2700 *scene = (Scene2700 *)R2_GLOBALS._sceneManager._scene;
+
+	setDelay(450 + R2_GLOBALS._randomSource.getRandomNumber(450));
+	scene->_actor4.animate(ANIM_MODE_8, 1, NULL);
+}
+
+void Scene2700::Action4::signal() {
+	Scene2700 *scene = (Scene2700 *)R2_GLOBALS._sceneManager._scene;
+
+	setDelay(300 + R2_GLOBALS._randomSource.getRandomNumber(300));
+	scene->_actor5.animate(ANIM_MODE_8, 1, NULL);
+}
+
+void Scene2700::Area1::process(Event &event) {
+	SceneArea::process(event);
+	if ((event.eventType == 1) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos.x, event.mousePos.y))) {
+		Scene2700 *scene = (Scene2700 *)R2_GLOBALS._sceneManager._scene;
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 10;
+		scene->_field414 = 2703;
+		switch (scene->_field412) {
+		case 0:
+		// No break on purpose
+		case 6:
+			scene->_sceneMode = 2703;
+			scene->setAction(&scene->_sequenceManager, scene, 2703, &R2_GLOBALS._player, NULL);
+			break;
+		case 1:	{
+			Common::Point pt(80, 137);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		case 2:	{
+			Common::Point pt(155, 137);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		case 3:	{
+			Common::Point pt(140, 162);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		case 4:	{
+			Common::Point pt(155, 137);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		case 5:	{
+			Common::Point pt(235, 132);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		default:
+			break;
+		}
+	}
+}
+
+void Scene2700::Area2::process(Event &event) {
+	SceneArea::process(event);
+	if ((event.eventType == 1) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos.x, event.mousePos.y))) {
+		Scene2700 *scene = (Scene2700 *)R2_GLOBALS._sceneManager._scene;
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 10;
+		scene->_field414 = 2704;
+		switch (scene->_field412) {
+		case 0:	{
+			Common::Point pt(140, 162);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		case 1:	{
+			Common::Point pt(80, 137);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		case 2:	{
+			Common::Point pt(155, 137);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		case 3:	{
+			Common::Point pt(155, 137);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		case 4:	{
+			Common::Point pt(235, 132);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		case 5:
+			scene->_sceneMode = 2704;
+			scene->setAction(&scene->_sequenceManager, scene, 2704, &R2_GLOBALS._player, NULL);
+			break;
+		case 6:	{
+			Common::Point pt(140, 162);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		default:
+			break;
+		}
+	}
+}
+
+void Scene2700::postInit(SceneObjectList *OwnerList) {
+	loadScene(2700);
+	SceneExt::postInit();
+	R2_GLOBALS._sound1.stop();
+	R2_GLOBALS._sound2.stop();
+
+	_area1.setDetails(Rect(135, 160, 185, 168), SHADECURSOR_DOWN);
+	_area2.setDetails(Rect(300, 90, 320, 135), EXITCURSOR_E);
+	_rect1.set(70, 122, 90, 132);
+	_rect2.set(150, 122, 160, 132);
+	_rect3.set(90, 142, 130, 157);
+	_rect4.set(175, 137, 200, 147);
+	_rect5.set(280, 127, 300, 137);
+	_rect6.set(240, 157, 265, 167);
+
+	_actor2.postInit();
+	_actor2.setup(2700, 1, 1);
+	_actor2.setPosition(Common::Point(140, 29));
+	_actor2.setAction(&_action1);
+
+	_actor3.postInit();
+	_actor3.setup(2700, 2, 1);
+	_actor3.setPosition(Common::Point(213, 32));
+	_actor3.setAction(&_action2);
+
+	_actor4.postInit();
+	_actor4.setup(2700, 3, 1);
+	_actor4.setPosition(Common::Point(17, 39));
+	_actor4.setAction(&_action3);
+
+	_actor5.postInit();
+	_actor5.setup(2700, 5, 1);
+	_actor5.setPosition(Common::Point(17, 71));
+	_actor5.setAction(&_action4);
+
+	_item2.setDetails(Rect(52, 38, 68, 60), 2700, 4, -1, 6, 1, NULL);
+	_item3.setDetails(Rect(113, 22, 127, 33), 2700, 4, -1, 6, 1, NULL);
+	_item4.setDetails(Rect(161, 44, 170, 52), 2700, 4, -1, 6, 1, NULL);
+	_item5.setDetails(Rect(221, 19, 233, 31), 2700, 4, -1, 6, 1, NULL);
+	_item6.setDetails(Rect(235, 59, 250, 75), 2700, 4, -1, 6, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 320, 200), 2700, 4, -1, 6, 1, NULL);
+
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_nejSpeaker);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setVisage(19);
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player._moveDiff = Common::Point(2, 2);
+	R2_GLOBALS._player.disableControl();
+
+	if (R2_INVENTORY.getObjectScene(36) == 0)
+		R2_GLOBALS._sound1.changeSound(234);
+
+	if (R2_GLOBALS._sceneManager._previousScene == 2750) {
+		_sceneMode = 2702;
+		_field412 = 5;
+		setAction(&_sequenceManager, this, 2702, &R2_GLOBALS._player, NULL);
+	} else {
+		_field412 = 0;
+		if (R2_GLOBALS._sceneManager._previousScene == 3900) {
+			_sceneMode = 2701;
+			setAction(&_sequenceManager, this, 2701, &R2_GLOBALS._player, NULL);
+		} else {
+			R2_GLOBALS._player.setStrip(3);
+			R2_GLOBALS._player.setPosition(Common::Point(164, 160));
+			R2_GLOBALS._player.enableControl();
+		}
+	}
+}
+
+void Scene2700::signal() {
+	switch (_sceneMode) {
+	case 10:
+		switch (_field414) {
+		case 1:
+			switch (_field412) {
+			case 0:
+			case 2:
+			case 4:
+			case 6:
+				_field412 = 3;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2705, &R2_GLOBALS._player, NULL);
+				break;
+			case 3: {
+				_sceneMode = _field414;
+				_field412 = 1;
+				Common::Point pt(80, 127);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				break;
+				}
+			case 5:
+				_field412 = 4;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2708, &R2_GLOBALS._player, NULL);
+				break;
+			default: // includes case 1
+				break;
+			}
+			break;
+		case 2:
+			switch (_field412) {
+			case 0:
+			case 1:
+			case 6:
+				_field412 = 3;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2706, &R2_GLOBALS._player, NULL);
+				break;
+			case 3:
+			case 4: {
+				_sceneMode = _field414;
+				_field412 = 2;
+				Common::Point pt(155, 127);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				break;
+				}
+			case 5:
+				_field412 = 4;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2708, &R2_GLOBALS._player, NULL);
+				break;
+			default: // includes case 2
+				break;
+			}
+			break;
+		case 3:
+			switch (_field412) {
+			case 0:
+			case 1:
+			case 2:
+			case 4:
+			case 6: {
+				_sceneMode = _field414;
+				_field412 = 3;
+				Common::Point pt(115, 152);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				break;
+				}
+			case 5:
+				_field412 = 4;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2708, &R2_GLOBALS._player, NULL);
+				break;
+			default: // includes case 3
+				break;
+			}
+			break;
+		case 4:
+			switch (_field412) {
+			case 0:
+			case 1:
+			case 6:
+				_field412 = 3;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2706, &R2_GLOBALS._player, NULL);
+				break;
+			case 2:
+			case 3:
+				_field412 = 4;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2709, &R2_GLOBALS._player, NULL);
+				break;
+			case 4:
+			case 5:
+				_sceneMode = _field414;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2704, &R2_GLOBALS._player, NULL);
+				break;
+			default:
+				break;
+			}
+			break;
+		case 5:
+			switch (_field412) {
+			case 0:
+			case 1:
+			case 6:
+				_field412 = 3;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2706, &R2_GLOBALS._player, NULL);
+				break;
+			case 2:
+			case 3:
+				_field412 = 4;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2709, &R2_GLOBALS._player, NULL);
+				break;
+			case 4: {
+				_sceneMode = _field414;
+				_field412 = 5;
+				Common::Point pt(285, 132);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				break;
+				}
+			default: // includes case 5
+				break;
+			}
+			break;
+		case 6:
+			switch (_field412) {
+			case 0:
+			case 3: {
+				_sceneMode = _field414;
+				_field412 = 6;
+				Common::Point pt(250, 162);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				break;
+				}
+			case 1:
+			case 2:
+			case 4:
+				_field412 = 3;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2707, &R2_GLOBALS._player, NULL);
+				break;
+			case 5:
+				_field412 = 4;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2708, &R2_GLOBALS._player, NULL);
+				break;
+			default:
+				break;
+			}
+			break;
+		case 2703:
+			switch (_field412) {
+			case 0:
+			case 3:
+			case 6:
+				_sceneMode = _field414;
+				setAction(&_sequenceManager, this, 2703, &R2_GLOBALS._player, NULL);
+				break;
+			case 1:
+			case 2:
+			case 4:
+				_field412 = 3;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2707, &R2_GLOBALS._player, NULL);
+				break;
+			case 5:
+				_field412 = 4;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2708, &R2_GLOBALS._player, NULL);
+				break;
+			default:
+				break;
+			}
+			break;
+		case 2704:
+			switch (_field412) {
+			case 0:
+			case 1:
+			case 6:
+				_field412 = 3;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2706, &R2_GLOBALS._player, NULL);
+				break;
+			case 2:
+			case 3:
+				_field412 = 4;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2709, &R2_GLOBALS._player, NULL);
+				break;
+			case 4:
+			case 5:
+				_sceneMode = _field414;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2704, &R2_GLOBALS._player, NULL);
+				break;
+			default:
+				break;
+			}
+			break;
+		case 2710:
+			switch (_field412) {
+			case 0:
+			case 1:
+			case 3:
+				_field412 = 3;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2707, &R2_GLOBALS._player, NULL);
+				break;
+			case 2:
+			case 5: {
+				_sceneMode = _field414;
+				Common::Point pt(164, 160);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				break;
+				}
+			case 4:
+				_field412 = 4;
+				R2_GLOBALS._player.setAction(&_sequenceManager, this, 2708, &R2_GLOBALS._player, NULL);
+				break;
+			default:
+				break;
+			}
+			break;
+		default:
+			break;
+		}
+		break;
+	case 11:
+		R2_INVENTORY.setObjectScene(36, 0);
+		R2_GLOBALS._player.disableControl();
+		_field412 = 0;
+		_sceneMode = 2700;
+		setAction(&_sequenceManager, this, 2700, &_actor1, NULL);
+		break;
+	case 12:
+		R2_GLOBALS._sound1.play(234);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_sceneMode = 2711;
+		_stripManager.start(_field416, this);
+		break;
+	case 13:
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_sceneMode = 2712;
+		_stripManager.start(_field416, this);
+		break;
+	case 14:
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_sceneMode = 2713;
+		_stripManager.start(_field416, this);
+		break;
+	case 15:
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_sceneMode = 11;
+		_stripManager.start(_field416, this);
+		break;
+	case 2700:
+		_actor1.remove();
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	case 2703:
+		g_globals->_sceneManager.changeScene(3900);
+		break;
+	case 2704:
+		g_globals->_sceneManager.changeScene(2750);
+		break;
+	case 2710:
+		_field416 = 1200;
+		_sceneMode = 12;
+		_actor1.postInit();
+		setAction(&_sequenceManager, this, 2710, &R2_GLOBALS._player, &_actor1, NULL);
+		break;
+	case 2711:
+		R2_GLOBALS._player.disableControl();
+		_field416 = 1201;
+		_sceneMode = 13;
+		setAction(&_sequenceManager, this, 2711, &R2_GLOBALS._player, &_actor1, NULL);
+		break;
+	case 2712:
+		R2_GLOBALS._player.disableControl();
+		_field416 = 1202;
+		_sceneMode = 14;
+		setAction(&_sequenceManager, this, 2712, &R2_GLOBALS._player, &_actor1, NULL);
+		break;
+	case 2713:
+		R2_GLOBALS._player.disableControl();
+		_field416 = 1203;
+		_sceneMode = 14;
+		setAction(&_sequenceManager, this, 2713, &R2_GLOBALS._player, &_actor1, NULL);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	}
+}
+void Scene2700::process(Event &event) {
+	if ((R2_GLOBALS._player._canWalk) && (event.eventType == EVENT_BUTTON_DOWN)) {
+		if (R2_GLOBALS._events.getCursor() == R2_36) {
+			if (R2_GLOBALS._player._bounds.contains(event.mousePos.x, event.mousePos.y)) {
+				_sceneMode = 10;
+				_field414 = 2710;
+				R2_GLOBALS._player.disableControl();
+				R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+				switch (_field412) {
+				case 0: {
+					_sceneMode = 2710;
+					Common::Point pt(164, 160);
+					NpcMover *mover = new NpcMover();
+					R2_GLOBALS._player.addMover(mover, &pt, this);
+					break;
+					}
+				case 1: {
+					Common::Point pt(80, 137);
+					NpcMover *mover = new NpcMover();
+					R2_GLOBALS._player.addMover(mover, &pt, this);
+					break;
+					}
+				case 2: {
+					Common::Point pt(155, 137);
+					NpcMover *mover = new NpcMover();
+					R2_GLOBALS._player.addMover(mover, &pt, this);
+					break;
+					}
+				case 3: {
+					Common::Point pt(140, 162);
+					NpcMover *mover = new NpcMover();
+					R2_GLOBALS._player.addMover(mover, &pt, this);
+					break;
+					}
+				case 4: {
+					Common::Point pt(155, 137);
+					NpcMover *mover = new NpcMover();
+					R2_GLOBALS._player.addMover(mover, &pt, this);
+					break;
+					}
+				case 5: {
+					Common::Point pt(235, 132);
+					NpcMover *mover = new NpcMover();
+					R2_GLOBALS._player.addMover(mover, &pt, this);
+					break;
+					}
+				case 6: {
+					Common::Point pt(205, 162);
+					NpcMover *mover = new NpcMover();
+					R2_GLOBALS._player.addMover(mover, &pt, this);
+					break;
+					}
+				default:
+					break;
+				}
+				event.handled = true;
+			} else {
+				SceneItem::display(2700, 3, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+			}
+		} else if (R2_GLOBALS._events.getCursor() == R2_NEGATOR_GUN) {
+			if (_rect1.contains(event.mousePos.x, event.mousePos.y)) {
+				if (!_rect1.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+					event.handled = true;
+					_sceneMode = 10;
+					_field414 = 1;
+				}
+			} else if (_rect2.contains(event.mousePos.x, event.mousePos.y)) {
+				if (!_rect2.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+					event.handled = true;
+					_sceneMode = 10;
+					_field414 = 2;
+				}
+			} else if (_rect3.contains(event.mousePos.x, event.mousePos.y)) {
+				if (!_rect3.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+					event.handled = true;
+					_sceneMode = 10;
+					_field414 = 3;
+				}
+			} else if (_rect4.contains(event.mousePos.x, event.mousePos.y)) {
+				if (!_rect4.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+					event.handled = true;
+					_sceneMode = 10;
+					_field414 = 4;
+				}
+			} else if (_rect5.contains(event.mousePos.x, event.mousePos.y)) {
+				if (!_rect5.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+					event.handled = true;
+					_sceneMode = 10;
+					_field414 = 5;
+				}
+			} else if (_rect6.contains(event.mousePos.x, event.mousePos.y)) {
+				if (!_rect6.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+					event.handled = true;
+					_sceneMode = 10;
+					_field414 = 6;
+				}
+			} else {
+				event.handled = true;
+				R2_GLOBALS._player.updateAngle(Common::Point(event.mousePos.x, event.mousePos.y));
+			}
+			if (_sceneMode = 10) {
+				R2_GLOBALS._player.disableControl();
+				switch (_field412) {
+				case 0:
+					if (_field414 >= 6) {
+						Common::Point pt(205, 162);
+						NpcMover *mover = new NpcMover();
+						R2_GLOBALS._player.addMover(mover, &pt, this);
+					} else {
+						Common::Point pt(140, 162);
+						NpcMover *mover = new NpcMover();
+						R2_GLOBALS._player.addMover(mover, &pt, this);
+					}
+					break;
+				case 1: {
+					Common::Point pt(80, 137);
+					NpcMover *mover = new NpcMover();
+					R2_GLOBALS._player.addMover(mover, &pt, this);
+					break;
+					}
+				case 2: {
+					Common::Point pt(155, 137);
+					NpcMover *mover = new NpcMover();
+					R2_GLOBALS._player.addMover(mover, &pt, this);
+					break;
+					}
+				case 3:
+					if (_field414 == 1) {
+						Common::Point pt(80, 137);
+						NpcMover *mover = new NpcMover();
+						R2_GLOBALS._player.addMover(mover, &pt, this);
+					} else if (_field414 == 6) {
+						Common::Point pt(140, 162);
+						NpcMover *mover = new NpcMover();
+						R2_GLOBALS._player.addMover(mover, &pt, this);
+					} else {
+						Common::Point pt(155, 137);
+						NpcMover *mover = new NpcMover();
+						R2_GLOBALS._player.addMover(mover, &pt, this);
+					}
+					break;
+				case 4:
+					if (_field414 == 5) {
+						Common::Point pt(235, 132);
+						NpcMover *mover = new NpcMover();
+						R2_GLOBALS._player.addMover(mover, &pt, this);
+					} else {
+						Common::Point pt(155, 137);
+						NpcMover *mover = new NpcMover();
+						R2_GLOBALS._player.addMover(mover, &pt, this);
+					}
+					break;
+				case 5: {
+					Common::Point pt(235, 132);
+					NpcMover *mover = new NpcMover();
+					R2_GLOBALS._player.addMover(mover, &pt, this);
+					break;
+					}
+				case 6: {
+					Common::Point pt(140, 162);
+					NpcMover *mover = new NpcMover();
+					R2_GLOBALS._player.addMover(mover, &pt, this);
+					break;
+					}
+				default:
+					break;
+				}
+			}
+		} 
+	}
+	Scene::process(event);
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index 8684078860..83fb7b3cfb 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -490,6 +490,63 @@ public:
 	virtual void signal();
 };
 
+class Scene2700 : public SceneExt {
+	class Action1: public Action {
+	public:
+		void signal();
+	};
+	class Action2: public Action {
+	public:
+		void signal();
+	};
+	class Action3: public Action {
+	public:
+		void signal();
+	};
+	class Action4: public Action {
+	public:
+		void signal();
+	};
+
+	class Area1: public SceneArea {
+	public:
+		void process(Event &event);
+	};
+	class Area2: public SceneArea {
+	public:
+		void process(Event &event);
+	};
+public:
+	VisualSpeaker _quinnSpeaker;
+	VisualSpeaker _nejSpeaker;
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	NamedHotspot _item3;
+	NamedHotspot _item4;
+	NamedHotspot _item5;
+	NamedHotspot _item6;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	Action1 _action1;
+	Action2 _action2;
+	Action3 _action3;
+	Action4 _action4;
+	Area1 _area1;
+	Area2 _area2;
+	Rect _rect1, _rect2, _rect3, _rect4, _rect5, _rect6;
+	SequenceManager _sequenceManager;
+	int _field412, _field414, _field416;
+
+	Scene2700();
+	virtual void synchronize(Serializer &s);
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void process(Event &event);
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index cff7334090..b3120f8af6 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -739,5 +739,95 @@ SpeakerWebbster2500::SpeakerWebbster2500() {
 	_numFrames = 0;
 }
 
+SpeakerQuinn2700::SpeakerQuinn2700() {
+	_speakerName = "QUINN";
+	_color1 = 60;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerQuinn2700::proc15() {
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &R2_GLOBALS._player;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		switch (_object2->_visage) {
+		case 19:
+			_object1.setup(4022, 5, 1);
+			break;
+		case 2701:
+			_object1.setup(4022, 1, 1);
+			break;
+		default:
+			break;
+		}
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+SpeakerNej2700::SpeakerNej2700() {
+	_speakerName = "NEJ";
+	_color1 = 171;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerNej2700::proc15() {
+	int v = _fieldF6;
+	Scene2700 *scene = (Scene2700 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor1;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		switch (_object2->_visage) {
+		case 2701:
+			_object1.setup(4022, 3, 1);
+			_object1.setPosition(Common::Point(164, 163));
+			_object2->setPosition(Common::Point(-10, -10));
+			break;
+		case 2705:
+			_object1.setup(4022, 7, 1);
+			_object1.fixPriority(162);
+			break;
+		default:
+			break;
+		}
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index b8ad17886a..7ffd24e6e7 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -205,6 +205,22 @@ public:
 
 	virtual Common::String getClassName() { return "SpeakerWebbster2500"; }
 };
+
+class SpeakerQuinn2700 : public VisualSpeaker {
+public:
+	SpeakerQuinn2700();
+
+	virtual Common::String getClassName() { return "SpeakerQuinn2700"; }
+	virtual void proc15();
+};
+
+class SpeakerNej2700 : public VisualSpeaker {
+public:
+	SpeakerNej2700();
+
+	virtual Common::String getClassName() { return "SpeakerNej2700"; }
+	virtual void proc15();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 719f3ec1789005186c4cb86b10effa9ceee93866 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 15 Dec 2011 10:54:28 +0100
Subject: DREAMWEB: Convert a bunch of stuff to C++

Specifically, I started with openOb() and withWhat() which allowed to
remove offset_commandline and offset_openchangesize. A clean conversion of
these required a conversion of printMessage2 and getOpenedSize.
---
 engines/dreamweb/dreambase.h  |  10 +-
 engines/dreamweb/dreamgen.cpp | 221 +++++++++---------------------------------
 engines/dreamweb/dreamgen.h   |  38 +++-----
 engines/dreamweb/dreamweb.cpp |  10 ++
 engines/dreamweb/object.cpp   |  35 ++++++-
 engines/dreamweb/stubs.cpp    |  17 +++-
 engines/dreamweb/stubs.h      |   9 +-
 engines/dreamweb/use.cpp      |  23 +++++
 8 files changed, 156 insertions(+), 207 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 1a730ac541..5f2d3d5e70 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -47,8 +47,14 @@ class DreamBase : public SegmentManager {
 protected:
 	DreamWeb::DreamWebEngine *engine;
 
+	// from object.cpp
+	uint16 _openChangeSize;
+
+	// from pathfind.cpp
+	Common::Point _lineData[200];		// Output of Bresenham
+
 public:
-	DreamBase(DreamWeb::DreamWebEngine *en) : engine(en) { }
+	DreamBase(DreamWeb::DreamWebEngine *en);
 
 public:
 	// from monitor.cpp
@@ -76,7 +82,6 @@ public:
 	void obIcons();
 
 	// from pathfind.cpp
-	Common::Point _lineData[200];		// Output of Bresenham
 	void checkDest(const RoomPaths *roomsPaths);
 	RoomPaths *getRoomsPaths();
 	void faceRightWay();
@@ -126,6 +131,7 @@ public:
 
 	// from stubs.cpp
 	void crosshair();
+	void delTextLine();
 	void showBlink();
 	void dumpBlink();
 	void dumpPointer();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 2ee3d512cd..afb537f387 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -950,37 +950,6 @@ findnewpage:
 	delPointer();
 }
 
-void DreamGenContext::openOb() {
-	STACK_CHECK;
-	al = data.byte(kOpenedob);
-	ah = data.byte(kOpenedtype);
-	di = offset_commandline;
-	copyName();
-	di = (80);
-	bx = (58)+86;
-	al = 62;
-	dl = 240;
-	printMessage();
-	di = data.word(kLastxpos);
-	_add(di, 5);
-	bx = (58)+86;
-	es = cs;
-	si = offset_commandline;
-	dl = 220;
-	al = 0;
-	ah = 0;
-	printDirect();
-	fillOpen();
-	getOpenedSize();
-	al = ah;
-	ah = 0;
-	cx = (44);
-	_mul(cx);
-	_add(ax, (80));
-	bx = offset_openchangesize;
-	cs.word(bx) = ax;
-}
-
 void DreamGenContext::getObTextStart() {
 	STACK_CHECK;
 	es = data.word(kFreedesc);
@@ -1475,29 +1444,6 @@ isex:
 	ax = es.word(bx+7);
 }
 
-void DreamGenContext::getOpenedSize() {
-	STACK_CHECK;
-	_cmp(data.byte(kOpenedtype), 4);
-	if (flags.z())
-		goto isex2;
-	_cmp(data.byte(kOpenedtype), 2);
-	if (flags.z())
-		goto isfree2;
-	al = data.byte(kOpenedob);
-	getSetAd();
-	ax = es.word(bx+3);
-	return;
-isfree2:
-	al = data.byte(kOpenedob);
-	getFreeAd();
-	ax = es.word(bx+7);
-	return;
-isex2:
-	al = data.byte(kOpenedob);
-	getExAd();
-	ax = es.word(bx+7);
-}
-
 void DreamGenContext::getSetAd() {
 	STACK_CHECK;
 	ah = 0;
@@ -2586,14 +2532,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 1174;
+	si = 1131;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 1190;
+	si = 1147;
 	_add(si, ax);
 	ax = pop();
 }
@@ -2645,7 +2591,7 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 1174);
+	_add(bx, 1131);
 	es.byte(bx) = 0;
 }
 
@@ -2684,7 +2630,7 @@ dirroot:
 	si = offset_rootdir;
 	_inc(si);
 	es = cs;
-	di = 1050;
+	di = 1048;
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
@@ -2786,7 +2732,7 @@ notyetassigned:
 	push(bx);
 	_add(bx, 2);
 	ds = cs;
-	si = 1208;
+	si = 1165;
 checkpass:
 	_lodsw();
 	ah = es.byte(bx);
@@ -2857,7 +2803,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 1050;
+	di = 1048;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -2987,7 +2933,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 1050+1;
+	di = 1048+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -3114,7 +3060,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 1208;
+	si = 1165;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -3154,7 +3100,7 @@ void DreamGenContext::notHeldError() {
 	al = 63;
 	ah = 1;
 	dl = 201;
-	printmessage2();
+	printMessage2();
 	workToScreenM();
 	cx = 50;
 	hangOnP();
@@ -3333,48 +3279,6 @@ stereoon:
 	putBackObStuff();
 }
 
-void DreamGenContext::withWhat() {
-	STACK_CHECK;
-	createPanel();
-	showPanel();
-	showMan();
-	showExit();
-	al = data.byte(kCommand);
-	ah = data.byte(kObjecttype);
-	es = cs;
-	di = offset_commandline;
-	copyName();
-	di = 100;
-	bx = 21;
-	dl = 200;
-	al = 63;
-	ah = 2;
-	printmessage2();
-	di = data.word(kLastxpos);
-	_add(di, 5);
-	bx = 21;
-	es = cs;
-	si = offset_commandline;
-	dl = 220;
-	al = 0;
-	ah = 0;
-	printDirect();
-	di = data.word(kLastxpos);
-	_add(di, 5);
-	bx = 21;
-	dl = 200;
-	al = 63;
-	ah = 3;
-	printmessage2();
-	fillRyan();
-	data.byte(kCommandtype) = 255;
-	readMouse();
-	showPointer();
-	workToScreen();
-	delPointer();
-	data.byte(kInvopen) = 2;
-}
-
 void DreamGenContext::selectOb() {
 	STACK_CHECK;
 	findInvPos();
@@ -3795,7 +3699,7 @@ void DreamGenContext::clearChanges() {
 	di = 0;
 	_stosw(cx, true);
 	es = cs;
-	di = 1174;
+	di = 1131;
 	al = 1;
 	_stosb(2);
 	al = 0;
@@ -3957,35 +3861,6 @@ gotfirst:
 	al = es.byte(bx+6);
 }
 
-void DreamGenContext::printmessage2() {
-	STACK_CHECK;
-	push(dx);
-	push(bx);
-	push(di);
-	push(ax);
-	ah = 0;
-	_add(ax, ax);
-	bx = ax;
-	es = data.word(kCommandtext);
-	ax = es.word(bx);
-	_add(ax, (66*2));
-	si = ax;
-	ax = pop();
-searchmess:
-	push(ax);
-	findNextColon();
-	ax = pop();
-	_dec(ah);
-	if (!flags.z())
-		goto searchmess;
-	di = pop();
-	bx = pop();
-	dx = pop();
-	al = 0;
-	ah = 0;
-	printDirect();
-}
-
 void DreamGenContext::__start() { 
 	static const uint8 src[] = {
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x13, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -4102,43 +3977,43 @@ void DreamGenContext::__start() {
 		//0x0370: .2.. .... .2.. .!(.
 		0x00, 0x32, 0x14, 0x00, 0xff, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 
 		//0x0380: .2.. .DRE AMWE B.V9
-		0x39, 0x00, 0x00, 0x01, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 
-		//0x0390: 9... ..PU BLIC     
-		0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 
-		//0x03a0:   PU BLIC       ...
-		0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 
-		//0x03b0: BLAC KDRA GON  RYAN
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 
-		//0x03c0:         . ..HE NDRI
-		0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x03d0: X      LO UIS      
-		0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 
-		//0x03e0:  ... SEPT IMUS     
-		0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 
-		//0x03f0: BECK ETT     . ..  
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 
-		//0x0400:              . "ROO
-		0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0410: T          ."      
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 
-		//0x0420:         . 0000 .00.
-		0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x4f, 0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 
-		//0x0430: .... $OBJ ECT  NAME
-		0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0440:  ONE               
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 
-		//0x0450:                 ...
-		0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 
-		//0x0460: .... .... .... ....
-		0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0470: .... ..D: .... ....
+		0x39, 0x00, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0390: 9... PUBL IC       
+		0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 
+		//0x03a0: PUBL IC      . ..BL
+		0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 
+		//0x03b0: ACKD RAGO N RY AN  
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 
+		//0x03c0:       ... HEND RIX 
+		0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
+		//0x03d0:      LOUI S       .
+		0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 
+		//0x03e0: ..SE PTIM US     BE
+		0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 
+		//0x03f0: CKET T     ...     
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 
+		//0x0400:            ."R OOT 
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0410:         . "        
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0x0d, 0x0a, 
+		//0x0420:       .00 00.0 0...
+		0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+		//0x0430: ..$. .... .... ....
+		0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 
+		//0x0440: .... .... ...D :...
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0450: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 
+		//0x0460: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 
+		//0x0470: .... .... .... ....
+		0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0480: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0490: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04a0: .... .... .... ....
-		0x0b, 0x04, 0x07, 0x07, 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, 
 		//0x04b0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04c0: .... .... .... ....
@@ -4148,15 +4023,9 @@ void DreamGenContext::__start() {
 		//0x04e0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04f0: .... .... .... ....
-		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, 0xff, 0xff, 0xff, 
 		//0x0500: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0510: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0520: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 
-		//0x0530: .... .... .... ....
-		0x00, };
+		0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 582caa712f..16a42d2e25 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,13 +32,11 @@
 
 namespace DreamGen {
 
-static const uint16 offset_money2poke = 0x042d;
-static const uint16 offset_rootdir = 0x040c;
-static const uint16 offset_openchangesize = 0x0392;
-static const uint16 offset_keys = 0x0394;
-static const uint16 offset_commandline = 0x0435;
-static const uint16 offset_money1poke = 0x0428;
-static const uint16 offset_operand1 = 0x03fe;
+static const uint16 offset_money1poke = 0x0426;
+static const uint16 offset_operand1 = 0x03fc;
+static const uint16 offset_rootdir = 0x040a;
+static const uint16 offset_keys = 0x0392;
+static const uint16 offset_money2poke = 0x042b;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -366,15 +364,15 @@ static const uint16 kCurrentsample = 442;
 static const uint16 kRoomssample = 443;
 static const uint16 kReelroutines = 444;
 static const uint16 kBasicsample = 901;
-static const uint16 kCurrentfile = 1050;
-static const uint16 kRoomscango = 1174;
-static const uint16 kRoompics = 1190;
-static const uint16 kOplist = 1205;
-static const uint16 kInputline = 1208;
-static const uint16 kPresslist = 1336;
-static const uint16 kQuitrequested = 1342;
-static const uint16 kSubtitles = 1343;
-static const uint16 kForeignrelease = 1344;
+static const uint16 kCurrentfile = 1048;
+static const uint16 kRoomscango = 1131;
+static const uint16 kRoompics = 1147;
+static const uint16 kOplist = 1162;
+static const uint16 kInputline = 1165;
+static const uint16 kPresslist = 1293;
+static const uint16 kQuitrequested = 1299;
+static const uint16 kSubtitles = 1300;
+static const uint16 kForeignrelease = 1301;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -478,6 +476,7 @@ public:
 
 	void fadeDownMon();
 	void identifyOb();
+	void getPersonText();
 	void clearBuffers();
 	void getObTextStart();
 	void checkObjectSize();
@@ -487,7 +486,6 @@ public:
 	void moneyPoke();
 	void doSomeTalk();
 	void resetLocation();
-	void getOpenedSize();
 	void adjustUp();
 	void fadeScreenDownHalf();
 	void outOfOpen();
@@ -506,7 +504,6 @@ public:
 	void removeObFromInv();
 	void dirFile();
 	void pickupConts();
-	void nextColon();
 	void findInvPos();
 	void getKeyAndLogo();
 	void selectOb();
@@ -520,7 +517,7 @@ public:
 	void notHeldError();
 	void getSetAd();
 	void showKeys();
-	void printmessage2();
+	void nextColon();
 	void findOpenPos();
 	void deleteExFrame();
 	void searchForSame();
@@ -533,7 +530,6 @@ public:
 	void getEitherAd();
 	void setPickup();
 	void dropObject();
-	void openOb();
 	void useStereo();
 	void showDiaryKeys();
 	void useOpened();
@@ -558,12 +554,10 @@ public:
 	void swapWithInv();
 	void adjustRight();
 	void transferToEx();
-	void getPersonText();
 	void parser();
 	void emergencyPurge();
 	void transferConToEx();
 	void adjustDown();
-	void withWhat();
 };
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index b4fc1b7b77..082b7d8ce7 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -410,3 +410,13 @@ uint8 DreamWebEngine::modifyChar(uint8 c) const {
 }
 
 } // End of namespace DreamWeb
+
+
+namespace DreamGen {
+
+// FIXME/TODO: Move this to a better place.
+DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) : engine(en) {
+	_openChangeSize = kInventx+(4*kItempicsize);
+}
+
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 53d834e74c..8e5da2c90e 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -162,13 +162,13 @@ void DreamGenContext::examineOb(bool examineAgain) {
 			break;
 		}
 		case 1: {
-			// NB: This table contains the non-constant openChangeSize!
+			// Note: This table contains the non-constant _openChangeSize!
 			RectWithCallback invList1[] = {
 				{ 273,320,157,198,&DreamGenContext::getBackFromOb },
 				{ 255,294,0,24,&DreamGenContext::dropObject },
 				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage },
-				{ kInventx, data.word(offset_openchangesize),kInventy+100,kInventy+100+kItempicsize,&DreamGenContext::useOpened },
-				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamGenContext::inToInv },
+				{ kInventx,_openChangeSize,kInventy+100,kInventy+100+kItempicsize,&DreamGenContext::useOpened },
+				{ kInventx,kInventx+(5*kItempicsize),kInventy,kInventy+(2*kItempicsize),&DreamGenContext::inToInv },
 				{ 0,320,0,200,&DreamGenContext::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
@@ -263,4 +263,33 @@ void DreamGenContext::getBackFromOb() {
 		blank();
 }
 
+void DreamGenContext::getOpenedSize() {
+	ax = getOpenedSizeCPP();
+}
+
+byte DreamGenContext::getOpenedSizeCPP() {
+	byte obj = data.byte(kOpenedob);
+	switch (data.byte(kOpenedtype)) {
+	case 4:
+		return getExAd(obj)->b7;
+	case 2:
+		return getFreeAd(obj)->b7;
+	default:
+		return getSetAd(obj)->b3;
+	}
+}
+
+void DreamGenContext::openOb() {
+	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
+
+	copyName(data.byte(kOpenedtype), data.byte(kOpenedob), commandLine);
+
+	printMessage(kInventx, kInventy+86, 62, 240, false);
+
+	al = printDirect(commandLine, data.word(kLastxpos) + 5, kInventy+86, 220, false);
+
+	fillOpen();
+	_openChangeSize = getOpenedSizeCPP() * kItempicsize + kInventx;
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 0c57d0d767..1c66ac7681 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1191,7 +1191,7 @@ void DreamBase::crosshair() {
 	showFrame(engine->icons1(), kZoomx + 24, kZoomy + 19, frame, 0);
 }
 
-void DreamGenContext::delTextLine() {
+void DreamBase::delTextLine() {
 	uint16 x = data.word(kTextaddressx);
 	uint16 y = data.word(kTextaddressy);
 	if (data.byte(kForeignrelease) != 0)
@@ -1752,7 +1752,20 @@ void DreamGenContext::printMessage() {
 void DreamGenContext::printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered) {
 	uint16 offset = kTextstart + getSegment(data.word(kCommandtext)).word(index * 2);
 	const uint8 *string = getSegment(data.word(kCommandtext)).ptr(offset, 0);
-	printDirect(&string, x, &y, maxWidth, centered);
+	printDirect(string, x, y, maxWidth, centered);
+}
+
+void DreamGenContext::printMessage2() {
+	printMessage2(di, bx, al, dl, (bool)(dl & 1), ah);
+}
+
+void DreamGenContext::printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count) {
+	uint16 offset = kTextstart + getSegment(data.word(kCommandtext)).word(index * 2);
+	const uint8 *string = getSegment(data.word(kCommandtext)).ptr(offset, 0);
+	while (count--) {
+		findNextColon(&string);
+	}
+	printDirect(string, x, y, maxWidth, centered);
 }
 
 bool objectMatches(void *object, const char *id) {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 8218a1ac0f..b7e477804c 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -58,8 +58,10 @@
 	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 		return DreamBase::printDirect(string, x, y, maxWidth, centered);
 	}
-	void printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered);
 	void printMessage();
+	void printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered);
+	void printMessage2();
+	void printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count);
 	void useTimedText();
 	void dumpTimedText();
 	void setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
@@ -111,7 +113,6 @@
 	void dealWithSpecial(uint8 firstParam, uint8 secondParam);
 	void zoom();
 	void showRain();
-	void delTextLine();
 	void commandOnly();
 	void commandOnly(uint8 command);
 	void doBlocks();
@@ -590,5 +591,9 @@
 	void findExObject();
 	uint16 findExObject(const char *id);
 	void describeOb();
+	void getOpenedSize();
+	byte getOpenedSizeCPP();
+	void openOb();
+	void withWhat();
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 5306522c13..87b3640e03 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1473,4 +1473,27 @@ void DreamGenContext::useAltar() {
 	}
 }
 
+void DreamGenContext::withWhat() {
+	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
+
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+
+	copyName(data.byte(kObjecttype), data.byte(kCommand), commandLine);
+	printMessage2(100, 21, 63, 200, false, 2);
+	printDirect(commandLine, data.word(kLastxpos) + 5, 21, 220, false);
+	printMessage2(data.word(kLastxpos) + 5, 21, 63, 200, false, 3);
+
+	fillRyan();
+	data.byte(kCommandtype) = 255;
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
+	data.byte(kInvopen) = 2;
+}
+
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 9972fc613adf7a9f751163724a08ac9bcd5ef7b0 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 15 Dec 2011 12:23:00 +0100
Subject: DREAMWEB: Move more methods to DreamBase

---
 engines/dreamweb/backdrop.cpp |  2 +-
 engines/dreamweb/dreambase.h  | 38 ++++++++++++++++++++++++++++++++++
 engines/dreamweb/keypad.cpp   | 48 +++++++++++++++++++++----------------------
 engines/dreamweb/stubs.cpp    | 22 ++++++++++----------
 engines/dreamweb/stubs.h      | 42 ++++++++-----------------------------
 5 files changed, 83 insertions(+), 69 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 3e005fdec9..15a226a5ac 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -274,7 +274,7 @@ void DreamGenContext::showAllFree() {
 	}
 }
 
-void DreamGenContext::drawFlags() {
+void DreamBase::drawFlags() {
 	uint8 *mapFlags = getSegment(data.word(kBuffers)).ptr(kMapflags, 0);
 	const uint8 *mapData = getSegment(data.word(kMapdata)).ptr(kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx), 0);
 	const uint8 *backdropFlags = getSegment(data.word(kBackdrop)).ptr(kFlags, 0);
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 5f2d3d5e70..2e3c530853 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -57,6 +57,35 @@ public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
 
 public:
+	// from backdrop.cpp
+	void drawFlags();
+
+	// from keypad.cpp
+	void getUnderMenu();
+	void putUnderMenu();
+	void singleKey(uint8 key, uint16 x, uint16 y);
+	void loadKeypad();
+	void showKeypad();
+	bool isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
+	void addToPressList();
+	void buttonOne();
+	void buttonTwo();
+	void buttonThree();
+	void buttonFour();
+	void buttonFive();
+	void buttonSix();
+	void buttonSeven();
+	void buttonEight();
+	void buttonNine();
+	void buttonNought();
+	void buttonEnter();
+	void buttonPress(uint8 buttonId);
+	void showOuterPad();
+	void dumpKeypad();
+	void dumpSymbol();
+	void dumpSymBox();
+	void quitSymbol();
+
 	// from monitor.cpp
 	void input();
 	byte makeCaps(byte c);
@@ -180,6 +209,15 @@ public:
 	void loadRoomData(const Room &room, bool skipDat);
 	void useTempCharset();
 	void useCharset1();
+	void printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered);
+	void printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count);
+	bool isItDescribed(const ObjPos *objPos);
+	void zoomIcon();
+	void roomName();
+	void showIcon();
+	void eraseOldObs();
+	void commandOnly(uint8 command);
+	void blank();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 09bdcb837b..795f5b053e 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -24,15 +24,15 @@
 
 namespace DreamGen {
 
-void DreamGenContext::getUnderMenu() {
+void DreamBase::getUnderMenu() {
 	multiGet(getSegment(data.word(kBuffers)).ptr(kUndertimedtext, 0), kMenux, kMenuy, 48, 48);
 }
 
-void DreamGenContext::putUnderMenu() {
+void DreamBase::putUnderMenu() {
 	multiPut(getSegment(data.word(kBuffers)).ptr(kUndertimedtext, 0), kMenux, kMenuy, 48, 48);
 }
 
-void DreamGenContext::singleKey(uint8 key, uint16 x, uint16 y) {
+void DreamBase::singleKey(uint8 key, uint16 x, uint16 y) {
 	if (key == data.byte(kGraphicpress)) {
 		key += 11;
 		if (data.byte(kPresscount) < 8)
@@ -42,11 +42,11 @@ void DreamGenContext::singleKey(uint8 key, uint16 x, uint16 y) {
 	showFrame(tempGraphics(), x, y, key, 0);
 }
 
-void DreamGenContext::loadKeypad() {
+void DreamBase::loadKeypad() {
 	loadIntoTemp("DREAMWEB.G02");
 }
 
-void DreamGenContext::showKeypad() {
+void DreamBase::showKeypad() {
 	singleKey(22, kKeypadx+9,  kKeypady+5);
 	singleKey(23, kKeypadx+31, kKeypady+5);
 	singleKey(24, kKeypadx+53, kKeypady+5);
@@ -75,13 +75,13 @@ void DreamGenContext::showKeypad() {
 	}
 }
 
-bool DreamGenContext::isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
+bool DreamBase::isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
 	
 	return digit0 == data.byte(kPresslist+0) && digit1 == data.byte(kPresslist+1)
 		&& digit2 == data.byte(kPresslist+2) && digit3 == data.byte(kPresslist+3);
 }
 
-void DreamGenContext::addToPressList() {
+void DreamBase::addToPressList() {
 	if (data.word(kPresspointer) == 5)
 		return;
 	uint8 pressed = data.byte(kPressed);
@@ -164,51 +164,51 @@ void DreamGenContext::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8
 	workToScreenM();
 }
 
-void DreamGenContext::buttonOne() {
+void DreamBase::buttonOne() {
 	buttonPress(1);
 }
 
-void DreamGenContext::buttonTwo() {
+void DreamBase::buttonTwo() {
 	buttonPress(2);
 }
 
-void DreamGenContext::buttonThree() {
+void DreamBase::buttonThree() {
 	buttonPress(3);
 }
 
-void DreamGenContext::buttonFour() {
+void DreamBase::buttonFour() {
 	buttonPress(4);
 }
 
-void DreamGenContext::buttonFive() {
+void DreamBase::buttonFive() {
 	buttonPress(5);
 }
 
-void DreamGenContext::buttonSix() {
+void DreamBase::buttonSix() {
 	buttonPress(6);
 }
 
-void DreamGenContext::buttonSeven() {
+void DreamBase::buttonSeven() {
 	buttonPress(7);
 }
 
-void DreamGenContext::buttonEight() {
+void DreamBase::buttonEight() {
 	buttonPress(8);
 }
 
-void DreamGenContext::buttonNine() {
+void DreamBase::buttonNine() {
 	buttonPress(9);
 }
 
-void DreamGenContext::buttonNought() {
+void DreamBase::buttonNought() {
 	buttonPress(10);
 }
 
-void DreamGenContext::buttonEnter() {
+void DreamBase::buttonEnter() {
 	buttonPress(11);
 }
 
-void DreamGenContext::buttonPress(uint8 buttonId) {
+void DreamBase::buttonPress(uint8 buttonId) {
 	uint8 commandType = 100 + buttonId;
 	if (data.byte(kCommandtype) != commandType) {
 		data.byte(kCommandtype) = commandType;
@@ -223,28 +223,28 @@ void DreamGenContext::buttonPress(uint8 buttonId) {
 	}
 }
 
-void DreamGenContext::showOuterPad() {
+void DreamBase::showOuterPad() {
 	showFrame(tempGraphics(), kKeypadx-3, kKeypady-4, 1, 0);
 	showFrame(tempGraphics(), kKeypadx+74, kKeypady+76, 37, 0);
 }
 
-void DreamGenContext::dumpKeypad() {
+void DreamBase::dumpKeypad() {
 	multiDump(kKeypadx - 3, kKeypady - 4, 120, 90);
 }
 
-void DreamGenContext::dumpSymbol() {
+void DreamBase::dumpSymbol() {
 	data.byte(kNewtextline) = 0;
 	multiDump(kSymbolx, kSymboly + 20, 104, 60);
 }
 
-void DreamGenContext::dumpSymBox() {
+void DreamBase::dumpSymBox() {
 	if (data.word(kDumpx) != 0xFFFF) {
 		multiDump(data.word(kDumpx), data.word(kDumpy), 30, 77);
 		data.word(kDumpx) = 0xFFFF;
 	}
 }
 
-void DreamGenContext::quitSymbol() {
+void DreamBase::quitSymbol() {
 	if (data.byte(kSymboltopx) != 24 || data.byte(kSymbolbotx) != 24) {
 		blank();
 		return;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 1c66ac7681..014e3143d9 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1015,7 +1015,7 @@ void DreamGenContext::DOSReturn() {
 void DreamGenContext::set16ColPalette() {
 }
 
-void DreamGenContext::eraseOldObs() {
+void DreamBase::eraseOldObs() {
 	if (data.byte(kNewobs) == 0)
 		return;
 
@@ -1200,10 +1200,10 @@ void DreamBase::delTextLine() {
 }
 
 void DreamGenContext::commandOnly() {
-	commandOnly(al);	
+	commandOnly(al);
 }
 
-void DreamGenContext::commandOnly(uint8 command) {
+void DreamBase::commandOnly(uint8 command) {
 	delTextLine();
 	uint16 index = command * 2;
 	uint16 offset = kTextstart + getSegment(data.word(kCommandtext)).word(index);
@@ -1749,7 +1749,7 @@ void DreamGenContext::printMessage() {
 	printMessage(di, bx, al, dl, (bool)(dl & 1));
 }
 
-void DreamGenContext::printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered) {
+void DreamBase::printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered) {
 	uint16 offset = kTextstart + getSegment(data.word(kCommandtext)).word(index * 2);
 	const uint8 *string = getSegment(data.word(kCommandtext)).ptr(offset, 0);
 	printDirect(string, x, y, maxWidth, centered);
@@ -1759,7 +1759,7 @@ void DreamGenContext::printMessage2() {
 	printMessage2(di, bx, al, dl, (bool)(dl & 1), ah);
 }
 
-void DreamGenContext::printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count) {
+void DreamBase::printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count) {
 	uint16 offset = kTextstart + getSegment(data.word(kCommandtext)).word(index * 2);
 	const uint8 *string = getSegment(data.word(kCommandtext)).ptr(offset, 0);
 	while (count--) {
@@ -1768,7 +1768,7 @@ void DreamGenContext::printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWi
 	printDirect(string, x, y, maxWidth, centered);
 }
 
-bool objectMatches(void *object, const char *id) {
+static bool objectMatches(void *object, const char *id) {
 	const char *objId = (const char *)(((const uint8 *)object) + 12); // whether it is a DynObject or a SetObject
 	for (size_t i = 0; i < 4; ++i) {
 		if (id[i] != objId[i] + 'A')
@@ -1826,7 +1826,7 @@ uint16 DreamGenContext::findExObject(const char *id) {
 	return kNumexobjects;
 }
 
-bool DreamGenContext::isItDescribed(const ObjPos *pos) {
+bool DreamBase::isItDescribed(const ObjPos *pos) {
 	uint16 offset = getSegment(data.word(kSetdesc)).word(kSettextdat + pos->index * 2);
 	uint8 result = getSegment(data.word(kSetdesc)).byte(kSettext + offset);
 	return result != 0;
@@ -1840,7 +1840,7 @@ bool DreamGenContext::isCD() {
 	return (data.byte(kSpeechloaded) == 1);
 }
 
-void DreamGenContext::showIcon() {
+void DreamBase::showIcon() {
 	if (data.byte(kReallocation) < 50) {
 		showPanel();
 		showMan();
@@ -2188,7 +2188,7 @@ void DreamGenContext::watchCount() {
 	}
 }
 
-void DreamGenContext::roomName() {
+void DreamBase::roomName() {
 	printMessage(88, 18, 53, 240, false);
 	uint16 textIndex = data.byte(kRoomnum);
 	if (textIndex >= 32)
@@ -2202,7 +2202,7 @@ void DreamGenContext::roomName() {
 	useCharset1();
 }
 
-void DreamGenContext::zoomIcon() {
+void DreamBase::zoomIcon() {
 	if (data.byte(kZoomon) == 0)
 		return;
 	showFrame(engine->icons1(), kZoomx, kZoomy-1, 8, 0);
@@ -3362,7 +3362,7 @@ void DreamGenContext::selectSlot2() {
 	selectSlot();
 }
 
-void DreamGenContext::blank() {
+void DreamBase::blank() {
 	if (data.byte(kCommandtype) != 199) {
 		data.byte(kCommandtype) = 199;
 		commandOnly(0);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index b7e477804c..c028c6851b 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -59,9 +59,13 @@
 		return DreamBase::printDirect(string, x, y, maxWidth, centered);
 	}
 	void printMessage();
-	void printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered);
+	void printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered) {
+		DreamBase::printMessage(x, y, index, maxWidth, centered);
+	}
 	void printMessage2();
-	void printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count);
+	void printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count) {
+		DreamBase::printMessage2(x, y, index, maxWidth, centered, count);
+	}
 	void useTimedText();
 	void dumpTimedText();
 	void setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
@@ -80,7 +84,6 @@
 	}
 	void printASprite(const Sprite *sprite);
 	void width160();
-	void eraseOldObs();
 	void clearSprites();
 	Sprite *makeSprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi);
 	void spriteUpdate();
@@ -114,7 +117,9 @@
 	void zoom();
 	void showRain();
 	void commandOnly();
-	void commandOnly(uint8 command);
+	void commandOnly(uint8 command) {
+		DreamBase::commandOnly(command);
+	}
 	void doBlocks();
 	void checkIfPerson();
 	bool checkIfPerson(uint8 x, uint8 y);
@@ -184,7 +189,6 @@
 	void obName(uint8 command, uint8 commandType);
 	void animPointer();
 	void checkCoords(const RectWithCallback *rectWithCallbacks);
-	void drawFlags();
 	void addToPeopleList();
 	void addToPeopleList(ReelRoutine *routine);
 	void getExPos();
@@ -192,7 +196,6 @@
 	void compare();
 	bool compare(uint8 index, uint8 flag, const char id[4]);
 	bool pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y);
-	bool isItDescribed(const ObjPos *objPos);
 	void checkIfSet();
 	bool checkIfSet(uint8 x, uint8 y);
 	void checkIfPathIsOn();
@@ -216,7 +219,6 @@
 	void hangOnW(uint16 frameCount);
 	void hangOnP();
 	void hangOnP(uint16 count);
-	void showIcon();
 	uint8 findNextColon(const uint8 **string) {
 		return DreamBase::findNextColon(string);
 	}
@@ -232,15 +234,11 @@
 	void convIcons();
 	void examineOb(bool examineAgain = true);
 	void dumpWatch();
-	void roomName();
 	void transferText();
 	void initRain();
 	Rain *splitIntoLines(uint8 x, uint8 y, Rain *rain);
 	void watchCount();
-	void zoomIcon();
 	void loadRoom();
-	void getUnderMenu();
-	void putUnderMenu();
 	void textForMonk();
 	void textForMonkHelper(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
 	void textForEnd();
@@ -422,26 +420,9 @@
 	void helicopter(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void loadSaveBox();
-	void loadKeypad();
-	void showKeypad();
-	void showOuterPad();
 	uint8 nextSymbol(uint8 symbol);
 	void showSymbol();
 	void examIcon();
-	void buttonOne();
-	void buttonTwo();
-	void buttonThree();
-	void buttonFour();
-	void buttonFive();
-	void buttonSix();
-	void buttonSeven();
-	void buttonEight();
-	void buttonNine();
-	void buttonNought();
-	void buttonEnter();
-	void buttonPress(uint8 buttonId);
-	void addToPressList();
-	bool isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
 	void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
 	unsigned int scanForNames();
 	void doLoad(int slot);
@@ -481,7 +462,6 @@
 	void redrawMainScrn();
 	void selectSlot();
 	void selectSlot2();
-	void blank();
 	void allPointer();
 	void openYourNeighbour();
 	void openRyan();
@@ -525,9 +505,6 @@
 	void redes();
 	void isSetObOnMap();
 	bool isSetObOnMap(uint8 index);
-	void dumpKeypad();
-	void dumpSymbol();
-	void dumpSymBox();
 	void dumpZoom();
 	void selectLocation();
 	void showGroup();
@@ -560,7 +537,6 @@
 	void hangOnPQ();
 	void showGun();
 	void endGame();
-	void quitSymbol();
 	void diaryKeyP();
 	void diaryKeyN();
 	void checkInput();
-- 
cgit v1.2.3


From 9ebcaa33e7080098e686c02ec03dff65a0a55174 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 15 Dec 2011 13:41:30 +0100
Subject: DREAMWEB: Move even more stuff to DreamBase

---
 engines/dreamweb/dreambase.h  |  44 ++++++-
 engines/dreamweb/keypad.cpp   |  24 ++--
 engines/dreamweb/object.cpp   |  36 ++++--
 engines/dreamweb/saveload.cpp | 113 +++++++++++++++++-
 engines/dreamweb/sprite.cpp   |   2 +-
 engines/dreamweb/stubs.cpp    | 270 ++++++++++--------------------------------
 engines/dreamweb/stubs.h      |  58 ++-------
 7 files changed, 264 insertions(+), 283 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 2e3c530853..de7bada943 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -53,6 +53,10 @@ protected:
 	// from pathfind.cpp
 	Common::Point _lineData[200];		// Output of Bresenham
 
+	// from saveload.cpp
+	char _saveNames[17*7];
+	char _saveNamesOld[17*7];
+
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
 
@@ -109,6 +113,9 @@ public:
 
 	// from object.cpp
 	void obIcons();
+	void fillRyan();
+	void findAllRyan(uint8 *inv);
+	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y);
 
 	// from pathfind.cpp
 	void checkDest(const RoomPaths *roomsPaths);
@@ -135,8 +142,10 @@ public:
 	void delCurs();
 
 	// from saveload.cpp
-	char _saveNames[17*7];
-	char _saveNamesOld[17*7];
+	void oldToNames();
+	void namesToOld();
+	void showMainOps();
+	void showDiscOps();
 	void showNames();
 
 	// from sound.cpp
@@ -157,6 +166,7 @@ public:
 	void soundOnReels(uint16 reelPointer);
 	void rollEndCredits();
 	void priestText(ReelRoutine &routine);
+	void checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY);
 
 	// from stubs.cpp
 	void crosshair();
@@ -185,6 +195,7 @@ public:
 	DynObject *getFreeAd(uint8 index);
 	DynObject *getExAd(uint8 index);
 	DynObject *getEitherAdCPP();
+	void *getAnyAdDir(uint8 index, uint8 flag);
 	void showWatch();
 	void showTime();
 	void showExit();
@@ -203,6 +214,8 @@ public:
 	void loadIntoTemp2(const char *fileName);
 	void loadIntoTemp3(const char *fileName);
 	void loadTempCharset(const char *fileName);
+	void loadTravelText();
+	void loadTempText(const char *fileName);
 	void clearAndLoad(uint8 *buf, uint8 c, unsigned int size, unsigned int maxSize);
 	void clearAndLoad(uint16 seg, uint8 c, unsigned int size, unsigned int maxSize);
 	void sortOutMap();
@@ -218,6 +231,33 @@ public:
 	void eraseOldObs();
 	void commandOnly(uint8 command);
 	void blank();
+	void setTopLeft();
+	void setTopRight();
+	void setBotLeft();
+	void setBotRight();
+	void examIcon();
+	void animPointer();
+	void getFlagUnderP(uint8 *flag, uint8 *flagEx);
+	void workToScreenM();
+	void quitKey();
+	void loadFolder();
+	void folderHints();
+	void folderExit();
+	void showFolder();
+	void showLeftPage();
+	void showRightPage();
+	void underTextLine();
+	void hangOnP(uint16 count);
+	void getUnderZoom();
+	void putUnderZoom();
+	void examineInventory();
+	void openInv();
+	void getBack1();
+	void getBackFromOb();
+	void getBackFromOps();
+	void getBackToOps();
+	void DOSReturn();
+	bool isItWorn(const DynObject *object);
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 795f5b053e..032f01873e 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -94,18 +94,18 @@ void DreamBase::addToPressList() {
 
 void DreamGenContext::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
 	RectWithCallback keypadList[] = {
-		{ kKeypadx+9,kKeypadx+30,kKeypady+9,kKeypady+22,&DreamGenContext::buttonOne },
-		{ kKeypadx+31,kKeypadx+52,kKeypady+9,kKeypady+22,&DreamGenContext::buttonTwo },
-		{ kKeypadx+53,kKeypadx+74,kKeypady+9,kKeypady+22,&DreamGenContext::buttonThree },
-		{ kKeypadx+9,kKeypadx+30,kKeypady+23,kKeypady+40,&DreamGenContext::buttonFour },
-		{ kKeypadx+31,kKeypadx+52,kKeypady+23,kKeypady+40,&DreamGenContext::buttonFive },
-		{ kKeypadx+53,kKeypadx+74,kKeypady+23,kKeypady+40,&DreamGenContext::buttonSix },
-		{ kKeypadx+9,kKeypadx+30,kKeypady+41,kKeypady+58,&DreamGenContext::buttonSeven },
-		{ kKeypadx+31,kKeypadx+52,kKeypady+41,kKeypady+58,&DreamGenContext::buttonEight },
-		{ kKeypadx+53,kKeypadx+74,kKeypady+41,kKeypady+58,&DreamGenContext::buttonNine },
-		{ kKeypadx+9,kKeypadx+30,kKeypady+59,kKeypady+73,&DreamGenContext::buttonNought },
-		{ kKeypadx+31,kKeypadx+74,kKeypady+59,kKeypady+73,&DreamGenContext::buttonEnter },
-		{ kKeypadx+72,kKeypadx+86,kKeypady+80,kKeypady+94,&DreamGenContext::quitKey },
+		{ kKeypadx+9,kKeypadx+30,kKeypady+9,kKeypady+22,&DreamBase::buttonOne },
+		{ kKeypadx+31,kKeypadx+52,kKeypady+9,kKeypady+22,&DreamBase::buttonTwo },
+		{ kKeypadx+53,kKeypadx+74,kKeypady+9,kKeypady+22,&DreamBase::buttonThree },
+		{ kKeypadx+9,kKeypadx+30,kKeypady+23,kKeypady+40,&DreamBase::buttonFour },
+		{ kKeypadx+31,kKeypadx+52,kKeypady+23,kKeypady+40,&DreamBase::buttonFive },
+		{ kKeypadx+53,kKeypadx+74,kKeypady+23,kKeypady+40,&DreamBase::buttonSix },
+		{ kKeypadx+9,kKeypadx+30,kKeypady+41,kKeypady+58,&DreamBase::buttonSeven },
+		{ kKeypadx+31,kKeypadx+52,kKeypady+41,kKeypady+58,&DreamBase::buttonEight },
+		{ kKeypadx+53,kKeypadx+74,kKeypady+41,kKeypady+58,&DreamBase::buttonNine },
+		{ kKeypadx+9,kKeypadx+30,kKeypady+59,kKeypady+73,&DreamBase::buttonNought },
+		{ kKeypadx+31,kKeypadx+74,kKeypady+59,kKeypady+73,&DreamBase::buttonEnter },
+		{ kKeypadx+72,kKeypadx+86,kKeypady+80,kKeypady+94,&DreamBase::quitKey },
 		{ 0,320,0,200,&DreamGenContext::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 8e5da2c90e..b430183cee 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -24,7 +24,27 @@
 
 namespace DreamGen {
 
-void DreamGenContext::fillRyan() {
+void DreamBase::showRyanPage() {
+	showFrame(engine->icons1(), kInventx + 167, kInventy - 12, 12, 0);
+	showFrame(engine->icons1(), kInventx + 167 + 18 * data.byte(kRyanpage), kInventy - 12, 13 + data.byte(kRyanpage), 0);
+}
+
+void DreamBase::findAllRyan(uint8 *inv) {
+	memset(inv, 0xff, 60);
+	for (size_t i = 0; i < kNumexobjects; ++i) {
+		DynObject *extra = getExAd(i);
+		if (extra->mapad[0] != 4)
+			continue;
+		if (extra->mapad[1] != 0xff)
+			continue;
+		uint8 slot = extra->mapad[2];
+		assert(slot < 30);
+		inv[2 * slot + 0] = i;
+		inv[2 * slot + 1] = 4;
+	}
+}
+
+void DreamBase::fillRyan() {
 	uint8 *inv = getSegment(data.word(kBuffers)).ptr(kRyaninvlist, 60);
 	findAllRyan(inv);
 	inv += data.byte(kRyanpage) * 2 * 10;
@@ -42,7 +62,7 @@ void DreamGenContext::isItWorn() {
 	flags._z = isItWorn((const DynObject *)es.ptr(bx, sizeof(DynObject)));
 }
 
-bool DreamGenContext::isItWorn(const DynObject *object) {
+bool DreamBase::isItWorn(const DynObject *object) {
 	return (object->id[0] == 'W'-'A') && (object->id[1] == 'E'-'A');
 }
 
@@ -72,7 +92,7 @@ void DreamGenContext::obToInv() {
 	obToInv(al, ah, di, bx);
 }
 
-void DreamGenContext::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
+void DreamBase::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 	showFrame(engine->icons1(), x - 2, y - 1, 10, 0);
 	if (index == 0xff)
 		return;
@@ -154,8 +174,8 @@ void DreamGenContext::examineOb(bool examineAgain) {
 				{ 260,300,0,44,&DreamGenContext::useObject },
 				{ 210,254,0,44,&DreamGenContext::selectOpenOb },
 				{ 144,176,64,96,&DreamGenContext::setPickup },
-				{ 0,50,50,200,&DreamGenContext::examineInventory },
-				{ 0,320,0,200,&DreamGenContext::blank },
+				{ 0,50,50,200,&DreamBase::examineInventory },
+				{ 0,320,0,200,&DreamBase::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
 			checkCoords(examList);
@@ -169,7 +189,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage },
 				{ kInventx,_openChangeSize,kInventy+100,kInventy+100+kItempicsize,&DreamGenContext::useOpened },
 				{ kInventx,kInventx+(5*kItempicsize),kInventy,kInventy+(2*kItempicsize),&DreamGenContext::inToInv },
-				{ 0,320,0,200,&DreamGenContext::blank },
+				{ 0,320,0,200,&DreamBase::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
 			checkCoords(invList1);
@@ -180,7 +200,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 				{ 273,320,157,198,&DreamGenContext::getBackFromOb },
 				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage },
 				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamGenContext::selectOb },
-				{ 0,320,0,200,&DreamGenContext::blank },
+				{ 0,320,0,200,&DreamBase::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
 			checkCoords(withList1);
@@ -256,7 +276,7 @@ void DreamGenContext::transferText() {
 	data.word(kExtextpos) += len + 1;
 }
 
-void DreamGenContext::getBackFromOb() {
+void DreamBase::getBackFromOb() {
 	if (data.byte(kPickup) != 1)
 		getBack1();
 	else
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index f0fd477ec1..2945874e1a 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -71,7 +71,7 @@ void DreamGenContext::doLoad(int savegameId) {
 				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamGenContext::getBackToOps },
 				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamGenContext::actualLoad },
 				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamGenContext::selectSlot },
-				{ 0,320,0,200,&DreamGenContext::blank },
+				{ 0,320,0,200,&DreamBase::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
 			checkCoords(loadlist);
@@ -167,7 +167,7 @@ void DreamGenContext::saveGame() {
 				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamGenContext::getBackToOps },
 				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamGenContext::actualSave },
 				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamGenContext::selectSlot },
-				{ 0,320,0,200,&DreamGenContext::blank },
+				{ 0,320,0,200,&DreamBase::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
 			checkCoords(savelist);
@@ -216,11 +216,11 @@ void DreamGenContext::saveGame() {
 	}
 }
 
-void DreamGenContext::namesToOld() {
+void DreamBase::namesToOld() {
 	memcpy(_saveNamesOld, _saveNames, 17*7);
 }
 
-void DreamGenContext::oldToNames() {
+void DreamBase::oldToNames() {
 	memcpy(_saveNames, _saveNamesOld, 17*7);
 }
 
@@ -237,13 +237,77 @@ void DreamGenContext::saveLoad() {
 		doSaveLoad();
 }
 
-void DreamGenContext::showMainOps() {
+void DreamGenContext::doSaveLoad() {
+	data.byte(kPointerframe) = 0;
+	data.word(kTextaddressx) = 70;
+	data.word(kTextaddressy) = 182-8;
+	data.byte(kTextlen) = 181;
+	data.byte(kManisoffscreen) = 1;
+	clearWork();
+	createPanel2();
+	underTextLine();
+	getRidOfAll();
+	loadSaveBox();
+	showOpBox();
+	showMainOps();
+	workToScreenCPP();
+
+	RectWithCallback opsList[] = {
+		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::getBackFromOps },
+		{ kOpsx+10,kOpsx+77,kOpsy+10,kOpsy+59,&DreamBase::DOSReturn },
+		{ kOpsx+128,kOpsx+190,kOpsy+16,kOpsy+100,&DreamGenContext::discOps },
+		{ 0,320,0,200,&DreamBase::blank },
+		{ 0xFFFF,0,0,0,0 }
+	};
+
+	bool firstOps = true;
+
+	do {	// restart ops
+		if (firstOps) {
+			firstOps = false;
+		} else {
+			showOpBox();
+			showMainOps();
+			workToScreenM();
+		}
+		data.byte(kGetback) = 0;
+
+		do {	// wait ops
+			if (data.byte(kQuitrequested)) {
+				data.byte(kManisoffscreen) = 0;
+				return;
+			}
+
+			readMouse();
+			showPointer();
+			vSync();
+			dumpPointer();
+			dumpTextLine();
+			delPointer();
+			checkCoords(opsList);
+		} while (!data.byte(kGetback));
+	} while (data.byte(kGetback) == 2);
+
+	data.word(kTextaddressx) = 13;
+	data.word(kTextaddressy) = 182;
+	data.byte(kTextlen) = 240;
+	if (data.byte(kGetback) != 4) {
+		getRidOfTemp();
+		restoreAll();
+		redrawMainScrn();
+		workToScreenM();
+		data.byte(kCommandtype) = 200;
+	}
+	data.byte(kManisoffscreen) = 0;
+}
+
+void DreamBase::showMainOps() {
 	showFrame(tempGraphics(), kOpsx+10, kOpsy+10, 8, 0);
 	showFrame(tempGraphics(), kOpsx+59, kOpsy+30, 7, 0);
 	showFrame(tempGraphics(), kOpsx+128+4, kOpsy+12, 1, 0);
 }
 
-void DreamGenContext::showDiscOps() {
+void DreamBase::showDiscOps() {
 	showFrame(tempGraphics(), kOpsx+128+4, kOpsy+12, 1, 0);
 	showFrame(tempGraphics(), kOpsx+10, kOpsy+10, 9, 0);
 	showFrame(tempGraphics(), kOpsx+59, kOpsy+30, 10, 0);
@@ -522,5 +586,42 @@ void DreamGenContext::checkInput() {
 	workToScreenM();
 }
 
+void DreamGenContext::selectSlot() {
+	if (data.byte(kCommandtype) != 244) {
+		data.byte(kCommandtype) = 244;
+		commandOnly(45);
+	}
+
+	if (data.word(kMousebutton) != 1 || data.word(kMousebutton) == data.word(kOldbutton))
+		return; // noselslot
+	if (data.byte(kLoadingorsave) == 3)
+		data.byte(kLoadingorsave)--;
+
+	oldToNames();
+	int y = data.word(kMousey) - (kOpsy + 4);
+	if (y < 11)
+		data.byte(kCurrentslot) = 0;
+	else
+		data.byte(kCurrentslot) = y / 11;
+
+	delPointer();
+	showOpBox();
+	showSlots();
+	showNames();
+	if (data.byte(kLoadingorsave) == 1)
+		showLoadOps();
+	else
+		showSaveOps();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
+}
+
+void DreamGenContext::selectSlot2() {
+	if (data.word(kMousebutton))
+		data.byte(kLoadingorsave) = 2;
+	selectSlot();
+}
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index aca935cde9..1a341ce8d3 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -581,7 +581,7 @@ void DreamGenContext::checkOne() {
 	al = type;
 }
 
-void DreamGenContext::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY) {
+void DreamBase::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY) {
 	*flagX = x / 16;
 	*flagY = y / 16;
 	const uint8 *tileData = getSegment(data.word(kBuffers)).ptr(kMapflags + (*flagY * 11 + *flagX) * 3, 3);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 014e3143d9..d53c1a1346 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -882,13 +882,13 @@ void DreamGenContext::triggerMessage(uint16 index) {
 
 void DreamGenContext::processTrigger() {
 	if (data.byte(kLasttrigger) == '1') {
-		DreamBase::setLocation(8);
+		setLocation(8);
 		triggerMessage(45);
 	} else if (data.byte(kLasttrigger) == '2') {
-		DreamBase::setLocation(9);
+		setLocation(9);
 		triggerMessage(55);
 	} else if (data.byte(kLasttrigger) == '3') {
-		DreamBase::setLocation(2);
+		setLocation(2);
 		triggerMessage(59);
 	}
 }
@@ -1000,7 +1000,7 @@ void DreamBase::deallocateMem(uint16 segment) {
 	}
 }
 
-void DreamGenContext::DOSReturn() {
+void DreamBase::DOSReturn() {
 	if (data.byte(kCommandtype) != 250) {
 		data.byte(kCommandtype) = 250;
 		commandOnly(46);
@@ -1409,7 +1409,7 @@ void *DreamBase::getAnyAd(uint8 *value1, uint8 *value2) {
 	}
 }
 
-void *DreamGenContext::getAnyAdDir(uint8 index, uint8 flag) {
+void *DreamBase::getAnyAdDir(uint8 index, uint8 flag) {
 	if (flag == 4)
 		return getExAd(index);
 	else if (flag == 2)
@@ -1488,18 +1488,11 @@ bool DreamGenContext::finishedWalkingCPP() {
 	return (data.byte(kLinepointer) == 254) && (data.byte(kFacing) == data.byte(kTurntoface));
 }
 
-void DreamGenContext::getFlagUnderP() {
-	uint8 flag, flagEx;
-	getFlagUnderP(&flag, &flagEx);
-	cl = flag;
-	ch = flagEx;
-}
-
-void DreamGenContext::getFlagUnderP(uint8 *flag, uint8 *flagEx) {
+void DreamBase::getFlagUnderP(uint8 *flag, uint8 *flagEx) {
 	uint8 type, flagX, flagY;
 	checkOne(data.word(kMousex) - data.word(kMapadx), data.word(kMousey) - data.word(kMapady), flag, flagEx, &type, &flagX, &flagY);
-	cl = data.byte(kLastflag) = *flag;
-	ch = data.byte(kLastflagex) = *flagEx;
+	data.byte(kLastflag) = *flag;
+	data.byte(kLastflagex) = *flagEx;
 }
 
 void DreamGenContext::walkAndExamine() {
@@ -1574,7 +1567,8 @@ void DreamGenContext::obName(uint8 command, uint8 commandType) {
 		}
 	}
 
-	getFlagUnderP();
+	uint8 flag, flagEx;
+	getFlagUnderP(&flag, &flagEx);
 	if (data.byte(kLastflag) < 2) {
 		blockNameText();
 		return;
@@ -1691,7 +1685,7 @@ void DreamBase::showPointer() {
 	}
 }
 
-void DreamGenContext::animPointer() {
+void DreamBase::animPointer() {
 
 	if (data.byte(kPointermode) == 2) {
 		data.byte(kPointerframe) = 0;
@@ -1879,30 +1873,6 @@ bool DreamGenContext::checkIfSet(uint8 x, uint8 y) {
 	return false;
 }
 
-void DreamBase::showRyanPage() {
-	showFrame(engine->icons1(), kInventx + 167, kInventy - 12, 12, 0);
-	showFrame(engine->icons1(), kInventx + 167 + 18 * data.byte(kRyanpage), kInventy - 12, 13 + data.byte(kRyanpage), 0);
-}
-
-void DreamGenContext::findAllRyan() {
-	findAllRyan(es.ptr(di, 60));
-}
-
-void DreamGenContext::findAllRyan(uint8 *inv) {
-	memset(inv, 0xff, 60);
-	for (size_t i = 0; i < kNumexobjects; ++i) {
-		DynObject *extra = getExAd(i);
-		if (extra->mapad[0] != 4)
-			continue;
-		if (extra->mapad[1] != 0xff)
-			continue;
-		uint8 slot = extra->mapad[2];
-		assert(slot < 30);
-		inv[2 * slot + 0] = i;
-		inv[2 * slot + 1] = 4;
-	}
-}
-
 void DreamGenContext::hangOn() {
 	hangOn(cx);
 }
@@ -1938,7 +1908,7 @@ void DreamGenContext::hangOnP() {
 	hangOnP(cx);
 }
 
-void DreamGenContext::hangOnP(uint16 count) {
+void DreamBase::hangOnP(uint16 count) {
 	data.word(kMaintimer) = 0;
 	uint8 pointerFrame = data.byte(kPointerframe);
 	uint8 pickup = data.byte(kPickup);
@@ -2022,12 +1992,12 @@ void DreamGenContext::enterSymbol() {
 		dumpTextLine();
 		dumpSymbol();
 		RectWithCallback symbolList[] = {
-			{ kSymbolx+40,kSymbolx+64,kSymboly+2,kSymboly+16,&DreamGenContext::quitSymbol },
-			{ kSymbolx,kSymbolx+52,kSymboly+20,kSymboly+50,&DreamGenContext::setTopLeft },
-			{ kSymbolx+52,kSymbolx+104,kSymboly+20,kSymboly+50,&DreamGenContext::setTopRight },
-			{ kSymbolx,kSymbolx+52,kSymboly+50,kSymboly+80,&DreamGenContext::setBotLeft },
-			{ kSymbolx+52,kSymbolx+104,kSymboly+50,kSymboly+80,&DreamGenContext::setBotRight },
-			{ 0,320,0,200,&DreamGenContext::blank },
+			{ kSymbolx+40,kSymbolx+64,kSymboly+2,kSymboly+16,&DreamBase::quitSymbol },
+			{ kSymbolx,kSymbolx+52,kSymboly+20,kSymboly+50,&DreamBase::setTopLeft },
+			{ kSymbolx+52,kSymbolx+104,kSymboly+20,kSymboly+50,&DreamBase::setTopRight },
+			{ kSymbolx,kSymbolx+52,kSymboly+50,kSymboly+80,&DreamBase::setBotLeft },
+			{ kSymbolx+52,kSymbolx+104,kSymboly+50,kSymboly+80,&DreamBase::setBotRight },
+			{ 0,320,0,200,&DreamBase::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(symbolList);
@@ -2438,7 +2408,7 @@ void DreamGenContext::restoreReels() {
 	engine->closeFile();
 }
 
-void DreamGenContext::loadFolder() {
+void DreamBase::loadFolder() {
 	loadIntoTemp("DREAMWEB.G09"); // folder graphics 1
 	loadIntoTemp2("DREAMWEB.G10"); // folder graphics 2
 	loadIntoTemp3("DREAMWEB.G11"); // folder graphics 3
@@ -2446,7 +2416,7 @@ void DreamGenContext::loadFolder() {
 	loadTempText("DREAMWEB.T50"); // folder text
 }
 
-void DreamGenContext::showFolder() {
+void DreamBase::showFolder() {
 	data.byte(kCommandtype) = 255;
 	if (data.byte(kFolderpage)) {
 		useTempCharset();
@@ -2471,7 +2441,7 @@ void DreamGenContext::showFolder() {
 	}
 }
 
-void DreamGenContext::showLeftPage() {
+void DreamBase::showLeftPage() {
 	showFrame(tempGraphics2(), 0, 12, 3, 0);
 	uint16 y = 12+5;
 	for (size_t i = 0; i < 9; ++i) {
@@ -2504,7 +2474,7 @@ void DreamGenContext::showLeftPage() {
 	}
 }
 
-void DreamGenContext::showRightPage() {
+void DreamBase::showRightPage() {
 	showFrame(tempGraphics2(), 143, 12, 0, 0);
 	uint16 y = 12+37;
 	for (size_t i = 0; i < 7; ++i) {
@@ -2552,7 +2522,7 @@ void DreamBase::panelIcons1() {
 	showWatch();
 }
 
-void DreamGenContext::examIcon() {
+void DreamBase::examIcon() {
 	showFrame(engine->icons2(), 254, 5, 3, 0);
 }
 
@@ -2560,10 +2530,6 @@ uint8 DreamBase::getLocation(uint8 index) {
 	return data.byte(kRoomscango + index);
 }
 
-void DreamGenContext::getLocation() {
-	al = DreamBase::getLocation(al);
-}
-
 void DreamBase::setLocation(uint8 index) {
 	data.byte(kRoomscango + index) = 1;
 }
@@ -2581,10 +2547,10 @@ const uint8 *DreamBase::getTextInFile1(uint16 index) {
 
 void DreamGenContext::checkFolderCoords() {
 	RectWithCallback folderList[] = {
-		{ 280,320,160,200, &DreamGenContext::quitKey },
+		{ 280,320,160,200, &DreamBase::quitKey },
 		{ 143,300,6,194, &DreamGenContext::nextFolder },
 		{ 0,143,6,194, &DreamGenContext::lastFolder },
-		{ 0,320,0,200, &DreamGenContext::blank },
+		{ 0,320,0,200, &DreamBase::blank },
 		{ 0xFFFF,0,0,0, 0 }
 	};
 	checkCoords(folderList);
@@ -2630,10 +2596,10 @@ void DreamGenContext::lastFolder() {
 	}
 }
 
-void DreamGenContext::folderHints() {
+void DreamBase::folderHints() {
 	if (data.byte(kFolderpage) == 5) {
-		if ((data.byte(kAidedead) != 1) && (DreamBase::getLocation(13) != 1)) {
-			DreamBase::setLocation(13);
+		if ((data.byte(kAidedead) != 1) && (getLocation(13) != 1)) {
+			setLocation(13);
 			showFolder();
 			const uint8 *string = getTextInFile1(30);
 			printDirect(string, 0, 86, 141, true);
@@ -2641,8 +2607,8 @@ void DreamGenContext::folderHints() {
 			hangOnP(200);
 		}
 	} else if (data.byte(kFolderpage) == 9) {
-		if (DreamBase::getLocation(7) != 1) {
-			DreamBase::setLocation(7);
+		if (getLocation(7) != 1) {
+			setLocation(7);
 			showFolder();
 			const uint8 *string = getTextInFile1(31);
 			printDirect(string, 0, 86, 141, true);
@@ -2652,19 +2618,15 @@ void DreamGenContext::folderHints() {
 	}
 }
 
-void DreamGenContext::folderExit() {
+void DreamBase::folderExit() {
 	showFrame(tempGraphics2(), 296, 178, 6, 0);
 }
 
-void DreamGenContext::loadTravelText() {
+void DreamBase::loadTravelText() {
 	data.word(kTraveltext) = standardLoad("DREAMWEB.T81"); // location descs
 }
 
-void DreamGenContext::loadTempText() {
-	loadTempText((const char *)data.ptr(dx, 0));
-}
-
-void DreamGenContext::loadTempText(const char *fileName) {
+void DreamBase::loadTempText(const char *fileName) {
 	data.word(kTextfile1) = standardLoad(fileName);
 }
 
@@ -2692,7 +2654,7 @@ void DreamGenContext::allocateBuffers() {
 	data.word(kSounddata2) = allocateMem(2048/16);
 }
 
-void DreamGenContext::workToScreenM() {
+void DreamBase::workToScreenM() {
 	animPointer();
 	readMouse();
 	showPointer();
@@ -2742,8 +2704,8 @@ void DreamGenContext::useMenu() {
 		dumpMenu();
 		dumpTextLine();
 		RectWithCallback menuList[] = {
-			{ kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamGenContext::quitKey },
-			{ 0,320,0,200,&DreamGenContext::blank },
+			{ kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamBase::quitKey },
+			{ 0,320,0,200,&DreamBase::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(menuList);
@@ -3169,7 +3131,7 @@ void DreamGenContext::intro() {
 	data.byte(kLasthardkey) =  0;
 }
 
-void DreamGenContext::setTopLeft() {
+void DreamBase::setTopLeft() {
 	if (data.byte(kSymboltopdir) != 0) {
 		blank();
 		return;
@@ -3184,7 +3146,7 @@ void DreamGenContext::setTopLeft() {
 		data.byte(kSymboltopdir) = 0xFF;
 }
 
-void DreamGenContext::setTopRight() {
+void DreamBase::setTopRight() {
 	if (data.byte(kSymboltopdir) != 0) {
 		blank();
 		return;
@@ -3199,7 +3161,7 @@ void DreamGenContext::setTopRight() {
 		data.byte(kSymboltopdir) = 1;
 }
 
-void DreamGenContext::setBotLeft() {
+void DreamBase::setBotLeft() {
 	if (data.byte(kSymbolbotdir) != 0) {
 		blank();
 		return;
@@ -3214,7 +3176,7 @@ void DreamGenContext::setBotLeft() {
 		data.byte(kSymbolbotdir) = 0xFF;
 }
 
-void DreamGenContext::setBotRight() {
+void DreamBase::setBotRight() {
 	if (data.byte(kSymbolbotdir) != 0) {
 		blank();
 		return;
@@ -3239,14 +3201,14 @@ void DreamGenContext::newGame() {
 		data.byte(kGetback) = 3;
 }
 
-void DreamGenContext::getBackFromOps() {
+void DreamBase::getBackFromOps() {
 	if (data.byte(kMandead) == 2)
 		blank();
 	else
 		getBack1();
 }
 
-void DreamGenContext::getBackToOps() {
+void DreamBase::getBackToOps() {
 	if (data.byte(kCommandtype) != 201) {
 		data.byte(kCommandtype) = 201;
 		commandOnly(42);
@@ -3356,12 +3318,6 @@ void DreamGenContext::redrawMainScrn() {
 	data.byte(kCommandtype) = 255;
 }
 
-void DreamGenContext::selectSlot2() {
-	if (data.word(kMousebutton))
-		data.byte(kLoadingorsave) = 2;
-	selectSlot();
-}
-
 void DreamBase::blank() {
 	if (data.byte(kCommandtype) != 199) {
 		data.byte(kCommandtype) = 199;
@@ -3392,7 +3348,7 @@ void DreamGenContext::makeMainScreen() {
 	data.byte(kManisoffscreen) = 0;
 }
 
-void DreamGenContext::openInv() {
+void DreamBase::openInv() {
 	data.byte(kInvopen) = 1;
 	printMessage(80, 58 - 10, 61, 240, (240 & 1));
 	fillRyan();
@@ -3403,8 +3359,8 @@ void DreamGenContext::obsThatDoThings() {
 	if (!compare(data.byte(kCommand), data.byte(kObjecttype), "MEMB"))
 		return; // notlouiscard
 
-	if (DreamBase::getLocation(4) != 1) {
-		DreamBase::setLocation(4);
+	if (getLocation(4) != 1) {
+		setLocation(4);
 		lookAtCard();
 	}
 }
@@ -3704,7 +3660,7 @@ void DreamGenContext::selectLocation() {
 			{ 280,308,4,44,&DreamGenContext::lookAtPlace },
 			{ 104,216,138,192,&DreamGenContext::destSelect },
 			{ 273,320,157,198,&DreamGenContext::getBack1 },
-			{ 0,320,0,200,&DreamGenContext::blank },
+			{ 0,320,0,200,&DreamBase::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(destList);
@@ -3722,7 +3678,7 @@ void DreamGenContext::selectLocation() {
 }
 
 
-void DreamGenContext::examineInventory() {
+void DreamBase::examineInventory() {
 	if (data.byte(kCommandtype) != 249) {
 		data.byte(kCommandtype) = 249;
 		commandOnly(32);
@@ -3781,13 +3737,11 @@ void DreamBase::showDiary() {
 	showFrame(tempGraphics(), kDiaryx + 176, kDiaryy + 108, 2, 0);
 }
 
-void DreamGenContext::underTextLine() {
+void DreamBase::underTextLine() {
 	uint16 y = data.word(kTextaddressy);
 	if (data.byte(kForeignrelease))
 		y -= 3;
-	ds = data.word(kBuffers);
-	si = kTextunder;
-	multiGet(ds.ptr(si, 0), data.byte(kTextaddressx), y, kUndertextsizex, kUndertextsizey);
+	multiGet(textUnder(), data.byte(kTextaddressx), y, kUndertextsizex, kUndertextsizey);
 }
 
 void DreamGenContext::showDecisions() {
@@ -3797,16 +3751,12 @@ void DreamGenContext::showDecisions() {
 	underTextLine();
 }
 
-void DreamGenContext::getUnderZoom() {
-	ds = data.word(kBuffers);
-	si = kZoomspace;
-	multiGet(ds.ptr(si, 0), kZoomx + 5, kZoomy + 4, 46, 40);
+void DreamBase::getUnderZoom() {
+	multiGet(getSegment(data.word(kBuffers)).ptr(kZoomspace, 0), kZoomx + 5, kZoomy + 4, 46, 40);
 }
 
-void DreamGenContext::putUnderZoom() {
-	ds = data.word(kBuffers);
-	si = kZoomspace;
-	multiPut(ds.ptr(si, 0), kZoomx + 5, kZoomy + 4, 46, 40);
+void DreamBase::putUnderZoom() {
+	multiPut(getSegment(data.word(kBuffers)).ptr(kZoomspace, 0), kZoomx + 5, kZoomy + 4, 46, 40);
 }
 
 void DreamGenContext::showWatchReel() {
@@ -3939,9 +3889,9 @@ void DreamGenContext::decide() {
 
 	RectWithCallback decideList[] = {
 		{ kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamGenContext::newGame },
-		{ kOpsx+20,kOpsx+87,kOpsy+10,kOpsy+59,&DreamGenContext::DOSReturn },
+		{ kOpsx+20,kOpsx+87,kOpsy+10,kOpsy+59,&DreamBase::DOSReturn },
 		{ kOpsx+123,kOpsx+190,kOpsy+10,kOpsy+59,&DreamGenContext::loadOld },
-		{ 0,320,0,200,&DreamGenContext::blank },
+		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
 
@@ -3985,7 +3935,7 @@ void DreamGenContext::talk() {
 	RectWithCallback talkList[] = {
 		{ 273,320,157,198,&DreamGenContext::getBack1 },
 		{ 240,290,2,44,&DreamGenContext::moreTalk },
-		{ 0,320,0,200,&DreamGenContext::blank },
+		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
 
@@ -4040,7 +3990,7 @@ void DreamGenContext::discOps() {
 		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::loadGame },
 		{ kOpsx+10,kOpsx+79,kOpsy+10,kOpsy+59,&DreamGenContext::saveGame },
 		{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamGenContext::getBackToOps },
-		{ 0,320,0,200,&DreamGenContext::blank },
+		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
 
@@ -4058,76 +4008,12 @@ void DreamGenContext::discOps() {
 	} while (!data.byte(kGetback));
 }
 
-void DreamGenContext::doSaveLoad() {
-	data.byte(kPointerframe) = 0;
-	data.word(kTextaddressx) = 70;
-	data.word(kTextaddressy) = 182-8;
-	data.byte(kTextlen) = 181;
-	data.byte(kManisoffscreen) = 1;
-	clearWork();
-	createPanel2();
-	underTextLine();
-	getRidOfAll();
-	loadSaveBox();
-	showOpBox();
-	showMainOps();
-	workToScreenCPP();
-
-	RectWithCallback opsList[] = {
-		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::getBackFromOps },
-		{ kOpsx+10,kOpsx+77,kOpsy+10,kOpsy+59,&DreamGenContext::DOSReturn },
-		{ kOpsx+128,kOpsx+190,kOpsy+16,kOpsy+100,&DreamGenContext::discOps },
-		{ 0,320,0,200,&DreamGenContext::blank },
-		{ 0xFFFF,0,0,0,0 }
-	};
-
-	bool firstOps = true;
-
-	do {	// restart ops
-		if (firstOps) {
-			firstOps = false;
-		} else {
-			showOpBox();
-			showMainOps();
-			workToScreenM();
-		}
-		data.byte(kGetback) = 0;
-
-		do {	// wait ops
-			if (data.byte(kQuitrequested)) {
-				data.byte(kManisoffscreen) = 0;
-				return;
-			}
-
-			readMouse();
-			showPointer();
-			vSync();
-			dumpPointer();
-			dumpTextLine();
-			delPointer();
-			checkCoords(opsList);
-		} while (!data.byte(kGetback));
-	} while (data.byte(kGetback) == 2);
-
-	data.word(kTextaddressx) = 13;
-	data.word(kTextaddressy) = 182;
-	data.byte(kTextlen) = 240;
-	if (data.byte(kGetback) != 4) {
-		getRidOfTemp();
-		restoreAll();
-		redrawMainScrn();
-		workToScreenM();
-		data.byte(kCommandtype) = 200;
-	}
-	data.byte(kManisoffscreen) = 0;
-}
-
 void DreamGenContext::hangOnPQ() {
 	data.byte(kGetback) = 0;
 
 	RectWithCallback quitList[] = {
 		{ 273,320,157,198,&DreamGenContext::getBack1 },
-		{ 0,320,0,200,&DreamGenContext::blank },
+		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
 
@@ -4276,7 +4162,7 @@ void DreamGenContext::cantDrop() {
 	workToScreenM();
 }
 
-void DreamGenContext::getBack1() {
+void DreamBase::getBack1() {
 	if (data.byte(kPickup) != 0) {
 		blank();
 		return;
@@ -4383,7 +4269,7 @@ void DreamGenContext::autoAppear() {
 		// In alley
 		al = 5;
 		resetLocation();
-		DreamBase::setLocation(10);
+		setLocation(10);
 		data.byte(kDestpos) = 10;
 		return;
 	}
@@ -4414,7 +4300,7 @@ void DreamGenContext::autoAppear() {
 			data.byte(kNewsitem) = 3;
 			al = 6;
 			resetLocation();
-			DreamBase::setLocation(11);
+			setLocation(11);
 			data.byte(kDestpos) = 11;
 		} else {
 			if (data.byte(kReallocation) == 2 && data.byte(kRockstardead) != 0)
@@ -4423,7 +4309,7 @@ void DreamGenContext::autoAppear() {
 	}
 }
 
-void DreamGenContext::quitKey() {
+void DreamBase::quitKey() {
 	if (data.byte(kCommandtype) != 222) {
 		data.byte(kCommandtype) = 222;
 		commandOnly(4);
@@ -4557,38 +4443,6 @@ void DreamGenContext::entryAnims() {
 	}
 }
 
-void DreamGenContext::selectSlot() {
-	if (data.byte(kCommandtype) != 244) {
-		data.byte(kCommandtype) = 244;
-		commandOnly(45);
-	}
-
-	if (data.word(kMousebutton) != 1 || data.word(kMousebutton) == data.word(kOldbutton))
-		return; // noselslot
-	if (data.byte(kLoadingorsave) == 3)
-		data.byte(kLoadingorsave)--;
-
-	oldToNames();
-	int y = data.word(kMousey) - (kOpsy + 4);
-	if (y < 11)
-		data.byte(kCurrentslot) = 0;
-	else
-		data.byte(kCurrentslot) = y / 11;
-
-	delPointer();
-	showOpBox();
-	showSlots();
-	showNames();
-	if (data.byte(kLoadingorsave) == 1)
-		showLoadOps();
-	else
-		showSaveOps();
-	readMouse();
-	showPointer();
-	workToScreen();
-	delPointer();
-}
-
 void DreamGenContext::updateSymbolTop() {
 	if (!data.byte(kSymboltopdir))
 		return; // topfinished
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index c028c6851b..0e407415e8 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -72,8 +72,6 @@
 	void getUnderTimed();
 	void putUnderTimed();
 	void dumpTextLine();
-	void oldToNames();
-	void namesToOld();
 	void startLoading(const Room &room);
 	void showFrame();
 	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
@@ -160,14 +158,12 @@
 	DynObject *getExAd(uint8 index) {
 		return DreamBase::getExAd(index);
 	}
-	DynObject *getEitherAdCPP();
 	void *getAnyAd(uint8 *value1, uint8 *value2) {
 		return DreamBase::getAnyAd(value1, value2);
 	}
 	SetObject *getSetAd(uint8 index) {
 		return DreamBase::getSetAd(index);
 	}
-	void *getAnyAdDir(uint8 index, uint8 flag);
 	void setAllChanges();
 	void doChange(uint8 index, uint8 value, uint8 type);
 	void deleteTaken();
@@ -181,13 +177,12 @@
 	bool finishedWalkingCPP();
 	void finishedWalking();
 	void checkOne();
-	void checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY);
-	void getFlagUnderP();
-	void getFlagUnderP(uint8 *flag, uint8 *flagEx);
+	void checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY) {
+		DreamBase::checkOne(x, y, flag, flagEx, type, flagX, flagY);
+	}
 	void walkAndExamine();
 	void obName();
 	void obName(uint8 command, uint8 commandType);
-	void animPointer();
 	void checkCoords(const RectWithCallback *rectWithCallbacks);
 	void addToPeopleList();
 	void addToPeopleList(ReelRoutine *routine);
@@ -201,15 +196,16 @@
 	void checkIfPathIsOn();
 	bool checkIfPathIsOn(uint8 index);
 	void isItWorn();
-	bool isItWorn(const DynObject *object);
+	bool isItWorn(const DynObject *object) {
+		return DreamBase::isItWorn(object);
+	}
 	void wornError();
 	void makeWorn();
 	void makeWorn(DynObject *object);
 	void obToInv();
-	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y);
-	void findAllRyan();
-	void findAllRyan(uint8 *inv);
-	void fillRyan();
+	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
+		DreamBase::obToInv(index, flag, x, y);
+	}
 	void useRoutine();
 	void hangOn();
 	void hangOn(uint16 frameCount) {
@@ -218,7 +214,9 @@
 	void hangOnW();
 	void hangOnW(uint16 frameCount);
 	void hangOnP();
-	void hangOnP(uint16 count);
+	void hangOnP(uint16 count) {
+		DreamBase::hangOnP(count);
+	}
 	uint8 findNextColon(const uint8 **string) {
 		return DreamBase::findNextColon(string);
 	}
@@ -274,15 +272,12 @@
 	void playChannel1(uint8 index) {
 		DreamBase::playChannel1(index);
 	}
-	void showMainOps();
-	void showDiscOps();
 	void findRoomInLoc();
 	void reelsOnScreen();
 	void reconstruct();
 	void look();
 	void autoLook();
 	void doLook();
-	void getBackFromOb();
 	void getRidOfAll();
 	void getRidOfTemp();
 	void getRidOfTempText();
@@ -351,28 +346,14 @@
 	void wearWatch();
 	void wearShades();
 	void checkFolderCoords();
-	void loadFolder();
-	void showFolder();
-	void showLeftPage();
-	void showRightPage();
 	void nextFolder();
 	void lastFolder();
-	void folderHints();
-	void folderExit();
-	void getLocation();
-	uint8 getLocation(uint8 index) {
-		return DreamBase::getLocation(index);
-	}
 	void setLocation();
 	void setLocation(uint8 index) {
 		DreamBase::setLocation(index);
 	}
-	void loadTempText();
-	void loadTempText(const char *fileName);
-	void loadTravelText();
 	void drawFloor();
 	void allocateBuffers();
-	void workToScreenM();
 	bool checkSpeed(ReelRoutine &routine);
 	void checkSpeed();
 	void sparkyDrip(ReelRoutine &routine);
@@ -422,7 +403,6 @@
 	void loadSaveBox();
 	uint8 nextSymbol(uint8 symbol);
 	void showSymbol();
-	void examIcon();
 	void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
 	unsigned int scanForNames();
 	void doLoad(int slot);
@@ -446,13 +426,7 @@
 	void clearReels();
 	void getRidOfReels();
 	void liftNoise(uint8 index);
-	void setTopLeft();
-	void setTopRight();
-	void setBotLeft();
-	void setBotRight();
 	void newGame();
-	void getBackFromOps();
-	void getBackToOps();
 	void pickupOb(uint8 command, uint8 pos);
 	void initialInv();
 	void walkIntoRoom();
@@ -469,7 +443,6 @@
 	void openEden();
 	void openSarters();
 	void openLouis();
-	void DOSReturn();
 	void useLadder();
 	void useLadderB();
 	void useCart();
@@ -490,7 +463,6 @@
 	void hotelControl();
 	void obsThatDoThings();
 	void makeMainScreen();
-	void openInv();
 	void delEverything();
 	void clearPalette();
 	void errorMessage1();
@@ -514,7 +486,6 @@
 	}
 	void getTime();
 	void set16ColPalette();
-	void examineInventory();
 	void showSaveOps();
 	void showLoadOps();
 	void watchReel();
@@ -526,9 +497,6 @@
 	void afterNewRoom();
 	void madmanRun();
 	void showDecisions();
-	void underTextLine();
-	void getUnderZoom();
-	void putUnderZoom();
 	void decide();
 	void talk();
 	void discOps();
@@ -542,7 +510,6 @@
 	void checkInput();
 	void dropError();
 	void cantDrop();
-	void getBack1();
 	void newPlace();
 	void showPuzText(uint16 command, uint16 count);
 	void showPuzText();
@@ -550,7 +517,6 @@
 	void rollEndCredits2();
 	void useButtonA();
 	void autoAppear();
-	void quitKey();
 	void setupTimedUse();
 	void entryAnims();
 	void triggerMessage(uint16 index);
-- 
cgit v1.2.3


From e7a436545d24298d5da82a011eac1fdcdb35be25 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 15 Dec 2011 13:52:20 +0100
Subject: TSAGE: R2R - Fix bug in scene 2700, thanks to fingolfin

---
 engines/tsage/ringworld2/ringworld2_scenes2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index a81aee41de..9c6b65658c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -3633,7 +3633,7 @@ void Scene2700::process(Event &event) {
 				event.handled = true;
 				R2_GLOBALS._player.updateAngle(Common::Point(event.mousePos.x, event.mousePos.y));
 			}
-			if (_sceneMode = 10) {
+			if (_sceneMode == 10) {
 				R2_GLOBALS._player.disableControl();
 				switch (_field412) {
 				case 0:
-- 
cgit v1.2.3


From d1ed87beceb68a2b33db9989e6a480bbda6a73d1 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 15 Dec 2011 14:09:53 +0100
Subject: DREAMWEB: Convert notHeldError to C++, move stuff to DreamBase

---
 engines/dreamweb/dreambase.h  | 17 ++++++++++++++++-
 engines/dreamweb/dreamgen.cpp | 19 -------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/object.cpp   |  2 +-
 engines/dreamweb/sprite.cpp   |  8 ++++----
 engines/dreamweb/stubs.cpp    | 32 ++++++++++----------------------
 engines/dreamweb/stubs.h      | 28 ++++------------------------
 engines/dreamweb/use.cpp      | 11 +++++++++++
 8 files changed, 46 insertions(+), 72 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index de7bada943..727a81ce8b 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -116,6 +116,7 @@ public:
 	void fillRyan();
 	void findAllRyan(uint8 *inv);
 	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y);
+	void obPicture();
 
 	// from pathfind.cpp
 	void checkDest(const RoomPaths *roomsPaths);
@@ -163,10 +164,14 @@ public:
 	const Frame *findSource(uint16 &frame);
 	void showReelFrame(Reel *reel);
 	const Frame *getReelFrameAX(uint16 frame);
-	void soundOnReels(uint16 reelPointer);
 	void rollEndCredits();
 	void priestText(ReelRoutine &routine);
 	void checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY);
+	void soundOnReels(uint16 reelPointer);
+	void clearBeforeLoad();
+	void clearReels();
+	void getRidOfReels();
+	void liftNoise(uint8 index);
 
 	// from stubs.cpp
 	void crosshair();
@@ -240,6 +245,7 @@ public:
 	void getFlagUnderP(uint8 *flag, uint8 *flagEx);
 	void workToScreenM();
 	void quitKey();
+	void restoreReels();
 	void loadFolder();
 	void folderHints();
 	void folderExit();
@@ -258,6 +264,15 @@ public:
 	void getBackToOps();
 	void DOSReturn();
 	bool isItWorn(const DynObject *object);
+	bool compare(uint8 index, uint8 flag, const char id[4]);
+	void hangOnW(uint16 frameCount);
+	void getRidOfTemp();
+	void getRidOfTempText();
+	void getRidOfTemp2();
+	void getRidOfTemp3();
+	void getRidOfTempCharset();
+	void getRidOfTempsP();
+	void getRidOfAll();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index afb537f387..92bb062aab 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3088,25 +3088,6 @@ finishpars:
 	di = offset_operand1;
 }
 
-void DreamGenContext::notHeldError() {
-	STACK_CHECK;
-	createPanel();
-	showPanel();
-	showMan();
-	showExit();
-	obIcons();
-	di = 64;
-	bx = 100;
-	al = 63;
-	ah = 1;
-	dl = 201;
-	printMessage2();
-	workToScreenM();
-	cx = 50;
-	hangOnP();
-	putBackObStuff();
-}
-
 void DreamGenContext::nextColon() {
 	STACK_CHECK;
 lookcolon:
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 16a42d2e25..fbefd91099 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -514,7 +514,6 @@ public:
 	void transferMap();
 	void purgeAnItem();
 	void purgeALocation();
-	void notHeldError();
 	void getSetAd();
 	void showKeys();
 	void nextColon();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index b430183cee..5f326a5a03 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -107,7 +107,7 @@ void DreamBase::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 		showFrame(engine->icons1(), x - 3, y - 2, 7, 0);
 }
 
-void DreamGenContext::obPicture() {
+void DreamBase::obPicture() {
 	if (data.byte(kObjecttype) == 1)
 		return;
 	Frame *frames;
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 1a341ce8d3..c69ac2a3f5 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -1191,7 +1191,7 @@ void DreamBase::soundOnReels(uint16 reelPointer) {
 		data.word(kLastsoundreel) = (uint16)-1;
 }
 
-void DreamGenContext::clearBeforeLoad() {
+void DreamBase::clearBeforeLoad() {
 	if (data.byte(kRoomloaded) != 1)
 		return /* (noclear) */;
 
@@ -1213,13 +1213,13 @@ void DreamGenContext::clearBeforeLoad() {
 	data.byte(kRoomloaded) = 0;
 }
 
-void DreamGenContext::clearReels() {
+void DreamBase::clearReels() {
 	deallocateMem(data.word(kReel1));
 	deallocateMem(data.word(kReel2));
 	deallocateMem(data.word(kReel3));
 }
 
-void DreamGenContext::getRidOfReels() {
+void DreamBase::getRidOfReels() {
 	if (data.byte(kRoomloaded) == 0)
 		return /* (dontgetrid) */;
 
@@ -1228,7 +1228,7 @@ void DreamGenContext::getRidOfReels() {
 	deallocateMem(data.word(kReel3));
 }
 
-void DreamGenContext::liftNoise(uint8 index) {
+void DreamBase::liftNoise(uint8 index) {
 	if (data.byte(kReallocation) == 5 || data.byte(kReallocation) == 21)
 		playChannel1(13);	// hiss noise
 	else
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index d53c1a1346..c353948abb 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1739,20 +1739,12 @@ void DreamBase::animPointer() {
 	data.byte(kPointerframe) = 8;
 }
 
-void DreamGenContext::printMessage() {
-	printMessage(di, bx, al, dl, (bool)(dl & 1));
-}
-
 void DreamBase::printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered) {
 	uint16 offset = kTextstart + getSegment(data.word(kCommandtext)).word(index * 2);
 	const uint8 *string = getSegment(data.word(kCommandtext)).ptr(offset, 0);
 	printDirect(string, x, y, maxWidth, centered);
 }
 
-void DreamGenContext::printMessage2() {
-	printMessage2(di, bx, al, dl, (bool)(dl & 1), ah);
-}
-
 void DreamBase::printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count) {
 	uint16 offset = kTextstart + getSegment(data.word(kCommandtext)).word(index * 2);
 	const uint8 *string = getSegment(data.word(kCommandtext)).ptr(offset, 0);
@@ -1776,7 +1768,7 @@ void DreamGenContext::compare() {
 	flags._z = compare(al, ah, id);
 }
 
-bool DreamGenContext::compare(uint8 index, uint8 flag, const char id[4]) {
+bool DreamBase::compare(uint8 index, uint8 flag, const char id[4]) {
 	return objectMatches(getAnyAdDir(index, flag), id);
 }
 
@@ -1886,11 +1878,7 @@ void DreamBase::hangOn(uint16 frameCount) {
 	}
 }
 
-void DreamGenContext::hangOnW() {
-	hangOnW(cx);
-}
-
-void DreamGenContext::hangOnW(uint16 frameCount) {
+void DreamBase::hangOnW(uint16 frameCount) {
 	while (frameCount) {
 		delPointer();
 		readMouse();
@@ -2295,31 +2283,31 @@ void DreamBase::useTempCharset() {
 	engine->setCurrentCharset(engine->tempCharset());
 }
 
-void DreamGenContext::getRidOfTemp() {
+void DreamBase::getRidOfTemp() {
 	deallocateMem(data.word(kTempgraphics));
 }
 
-void DreamGenContext::getRidOfTempText() {
+void DreamBase::getRidOfTempText() {
 	deallocateMem(data.word(kTextfile1));
 }
 
-void DreamGenContext::getRidOfTemp2() {
+void DreamBase::getRidOfTemp2() {
 	deallocateMem(data.word(kTempgraphics2));
 }
 
-void DreamGenContext::getRidOfTemp3() {
+void DreamBase::getRidOfTemp3() {
 	deallocateMem(data.word(kTempgraphics3));
 }
 
-void DreamGenContext::getRidOfTempCharset() {
+void DreamBase::getRidOfTempCharset() {
 	engine->freeTempCharset();
 }
 
-void DreamGenContext::getRidOfTempsP() {
+void DreamBase::getRidOfTempsP() {
 	deallocateMem(data.word(kTempsprites));
 }
 
-void DreamGenContext::getRidOfAll() {
+void DreamBase::getRidOfAll() {
 	deallocateMem(data.word(kBackdrop));
 	deallocateMem(data.word(kSetframes));
 	deallocateMem(data.word(kReel1));
@@ -2381,7 +2369,7 @@ void DreamGenContext::restoreAll() {
 	setAllChanges();
 }
 
-void DreamGenContext::restoreReels() {
+void DreamBase::restoreReels() {
 	if (data.byte(kRoomloaded) == 0)
 		return;
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 0e407415e8..0f5a5ca115 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -58,14 +58,6 @@
 	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 		return DreamBase::printDirect(string, x, y, maxWidth, centered);
 	}
-	void printMessage();
-	void printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered) {
-		DreamBase::printMessage(x, y, index, maxWidth, centered);
-	}
-	void printMessage2();
-	void printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count) {
-		DreamBase::printMessage2(x, y, index, maxWidth, centered, count);
-	}
 	void useTimedText();
 	void dumpTimedText();
 	void setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
@@ -187,9 +179,10 @@
 	void addToPeopleList();
 	void addToPeopleList(ReelRoutine *routine);
 	void getExPos();
-	void obPicture();
 	void compare();
-	bool compare(uint8 index, uint8 flag, const char id[4]);
+	bool compare(uint8 index, uint8 flag, const char id[4]) {
+		return DreamBase::compare(index, flag, id);
+	}
 	bool pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y);
 	void checkIfSet();
 	bool checkIfSet(uint8 x, uint8 y);
@@ -211,8 +204,6 @@
 	void hangOn(uint16 frameCount) {
 		DreamBase::hangOn(frameCount);
 	}
-	void hangOnW();
-	void hangOnW(uint16 frameCount);
 	void hangOnP();
 	void hangOnP(uint16 count) {
 		DreamBase::hangOnP(count);
@@ -278,13 +269,6 @@
 	void look();
 	void autoLook();
 	void doLook();
-	void getRidOfAll();
-	void getRidOfTemp();
-	void getRidOfTempText();
-	void getRidOfTemp2();
-	void getRidOfTemp3();
-	void getRidOfTempCharset();
-	void getRidOfTempsP();
 	void showFirstUse();
 	void showSecondUse();
 	void actualSave();
@@ -292,7 +276,6 @@
 	void loadPosition(unsigned int slot);
 	void savePosition(unsigned int slot, const char *descbuf);
 	void restoreAll();
-	void restoreReels();
 	void enterSymbol();
 	void viewFolder();
 	void edensCDPlayer();
@@ -422,10 +405,6 @@
 	void realCredits();
 	void runIntroSeq();
 	void intro();
-	void clearBeforeLoad();
-	void clearReels();
-	void getRidOfReels();
-	void liftNoise(uint8 index);
 	void newGame();
 	void pickupOb(uint8 command, uint8 pos);
 	void initialInv();
@@ -537,5 +516,6 @@
 	byte getOpenedSizeCPP();
 	void openOb();
 	void withWhat();
+	void notHeldError();
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 87b3640e03..08b96cf33a 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1495,5 +1495,16 @@ void DreamGenContext::withWhat() {
 	data.byte(kInvopen) = 2;
 }
 
+void DreamGenContext::notHeldError() {
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	obIcons();
+	printMessage2(64, 100, 63, 200 + 1, true, 1);
+	workToScreenM();
+	hangOnP(50);
+	putBackObStuff();
+}
 
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From f0d47faaba13b13de95e8a3d70607d8bbefc022d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 15 Dec 2011 16:59:45 +0100
Subject: TSAGE: R2R - Implement scene 2750, fix bug in scene 2700

---
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   2 +
 engines/tsage/ringworld2/ringworld2_scenes2.cpp  | 456 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes2.h    |  81 +++-
 engines/tsage/ringworld2/ringworld2_speakers.cpp |  86 +++++
 engines/tsage/ringworld2/ringworld2_speakers.h   |  16 +
 5 files changed, 639 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 3e0d36be8d..a33a9a5e9e 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -156,6 +156,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Forest Maze
 		return new Scene2700();
 	case 2750:
+		// Forest Maze
+		return new Scene2750();
 	case 2800:
 	case 2900:
 		error("Missing scene %d from group 2", sceneNumber);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 9c6b65658c..abcf16405b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -3706,5 +3706,461 @@ void Scene2700::process(Event &event) {
 	Scene::process(event);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 2750 - Forest Maze
+ *
+ *--------------------------------------------------------------------------*/
+Scene2750::Scene2750(): SceneExt() {
+	_field412 = _field414 = _field416 = 0;
+}
+
+void Scene2750::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_field414);
+	s.syncAsSint16LE(_field416);
+}
+
+void Scene2750::Action1::signal() {
+	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex) {
+	case 1:
+		setDelay(60 + R2_GLOBALS._randomSource.getRandomNumber(240));
+		_actionIndex = 2;
+		scene->_actor5.show();
+		scene->_actor5.animate(ANIM_MODE_8, 1, NULL);
+		break;
+	case 2:
+		setDelay(600 + R2_GLOBALS._randomSource.getRandomNumber(600));
+		_actionIndex = 0;
+		scene->_actor5.show();
+		scene->_actor3.animate(ANIM_MODE_2, NULL);
+		break;
+	default:
+		setDelay(30);
+		_actionIndex = 1;
+		scene->_actor3.animate(ANIM_MODE_6, NULL);
+		scene->_actor4.animate(ANIM_MODE_8, 1, NULL);
+		break;
+	}
+}
+
+void Scene2750::Action2::signal() {
+	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
+
+	setDelay(600 + R2_GLOBALS._randomSource.getRandomNumber(300));
+	scene->_actor6.animate(ANIM_MODE_8, 1, NULL);
+}
+
+void Scene2750::Action3::signal() {
+	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
+
+	if (scene->_actor7._position.x <= 320) {
+		setDelay(1800 + R2_GLOBALS._randomSource.getRandomNumber(600));
+	} else {
+		setDelay(60);
+		scene->_actor7.setPosition(Common::Point(-10, 25));
+		Common::Point pt(330, 45);
+		NpcMover *mover = new NpcMover();
+		scene->_actor7.addMover(mover, &pt, NULL);
+	}
+}
+
+void Scene2750::Action4::signal() {
+	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
+
+	setDelay(600 + R2_GLOBALS._randomSource.getRandomNumber(300));
+	scene->_actor8.animate(ANIM_MODE_8, 1, NULL);
+}
+
+void Scene2750::Action5::signal() {
+	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
+
+	setDelay(600 + R2_GLOBALS._randomSource.getRandomNumber(300));
+	scene->_actor9.animate(ANIM_MODE_8, 1, NULL);
+}
+
+void Scene2750::Action6::signal() {
+	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
+
+	setDelay(600 + R2_GLOBALS._randomSource.getRandomNumber(300));
+	scene->_actor10.animate(ANIM_MODE_8, 1, NULL);
+}
+
+void Scene2750::Action7::signal() {
+	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
+
+	setDelay(600 + R2_GLOBALS._randomSource.getRandomNumber(300));
+	scene->_actor11.animate(ANIM_MODE_8, 1, NULL);
+}
+
+void Scene2750::Area1::process(Event &event) {
+	SceneArea::process(event);
+	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos.x, event.mousePos.y))) {
+		Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 10;
+		scene->_field414 = 2752;
+		switch (scene->_field412) {
+		case 1:	{
+			scene->_sceneMode = 2752;
+			scene->setAction(&scene->_sequenceManager, scene, 2752, &R2_GLOBALS._player, NULL);
+			break;
+			}
+		case 2:	{
+			Common::Point pt(140, 142);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		case 3:	{
+			Common::Point pt(210, 142);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		default:
+			break;
+		}
+	}
+}
+
+void Scene2750::Area2::process(Event &event) {
+	SceneArea::process(event);
+	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos.x, event.mousePos.y))) {
+		Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 10;
+		scene->_field414 = 2753;
+		switch (scene->_field412) {
+		case 1:	{
+			Common::Point pt(140, 142);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		case 2:	{
+			Common::Point pt(210, 142);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			break;
+			}
+		case 3:	{
+			scene->_sceneMode = 2753;
+			scene->setAction(&scene->_sequenceManager, scene, 2753, &R2_GLOBALS._player, NULL);
+			break;
+			}
+		default:
+			break;
+		}
+	}
+}
+
+void Scene2750::postInit(SceneObjectList *OwnerList) {
+	loadScene(2750);
+	R2_GLOBALS._sound2.stop();
+	SceneExt::postInit();
+	_area1.setDetails(Rect(0, 90, 20, 135), EXITCURSOR_W);
+	_area2.setDetails(Rect(300, 90, 320, 135), EXITCURSOR_E);
+
+	_rect1.set(30, 127, 155, 147);
+	_rect2.set(130, 142, 210, 167);
+	_rect3.set(-1, 137, 290, 147);
+
+	if (R2_INVENTORY.getObjectScene(36) == 0) {
+		R2_GLOBALS._sound1.changeSound(235);
+		_actor2.postInit();
+		_actor2.setup(2751, 1, 1);
+		_actor2.setPosition(Common::Point(104, 158));
+		_actor2.animate(ANIM_MODE_2, NULL);
+	}
+
+	_actor3.postInit();
+	_actor3.setup(2750, 1, 1);
+	_actor3.setPosition(Common::Point(188, 34));
+	_actor3.animate(ANIM_MODE_2, NULL);
+	_actor3._numFrames = 16;
+
+	_actor4.postInit();
+	_actor4.setup(2700, 4, 1);
+	_actor4.setPosition(Common::Point(188, 37));
+	_actor4.fixPriority(26);
+
+	_actor5.postInit();
+	_actor5.setup(2750, 2, 1);
+	_actor5.setPosition(Common::Point(188, 34));
+	_actor5.hide();
+
+	_actor3.setAction(&_action1);
+
+	_actor6.postInit();
+	_actor6.setup(2750, 3, 1);
+	_actor6.setPosition(Common::Point(9, 167));
+	_actor6.fixPriority(252);
+	_actor6.setAction(&_action2);
+
+	_actor7.postInit();
+	_actor7.setup(2750, 4, 1);
+	_actor7.setPosition(Common::Point(-10, 25));
+	_actor7.animate(ANIM_MODE_1, NULL);
+	_actor7.setStrip2(4);
+	_actor7._moveRate = 20;
+	_actor7.setAction(&_action3);
+
+	_actor8.postInit();
+	_actor8.fixPriority(26);
+	_actor8.setup(2750, 5, 1);
+	_actor8.setPosition(Common::Point(258, 33));
+	_actor8.setAction(&_action4);
+
+	_actor9.postInit();
+	_actor9.fixPriority(26);
+	_actor9.setup(2750, 6, 1);
+	_actor9.setPosition(Common::Point(61, 38));
+	_actor9.setAction(&_action5);
+
+	_actor10.postInit();
+	_actor10.fixPriority(26);
+	_actor10.setup(2750, 7, 1);
+	_actor10.setPosition(Common::Point(69, 37));
+	_actor10.setAction(&_action6);
+
+	_actor11.postInit();
+	_actor11.fixPriority(26);
+	_actor11.setup(2750, 8, 1);
+	_actor11.setPosition(Common::Point(80, 35));
+	_actor11.setAction(&_action7);
+
+	_item2.setDetails(Rect(29, 50, 35, 56), 2750, 3, -1, 5, 1, NULL);
+	_item3.setDetails(Rect(47, 36, 54, 42), 2750, 3, -1, 5, 1, NULL);
+	_item4.setDetails(Rect(193, 21, 206, 34), 2750, 3, -1, 5, 1, NULL);
+	_item5.setDetails(Rect(301, 18, 315, 32), 2750, 3, -1, 5, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 320, 200), 2700, 0, -1, 2, 1, NULL);
+
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_nejSpeaker);
+
+	if (R2_INVENTORY.getObjectScene(36) == 0) {
+		_actor1.postInit();
+		_actor1.setup(2752, 5, 1);
+		_actor1.animate(ANIM_MODE_NONE, NULL);
+		_actor1.setPosition(Common::Point(101, 148));
+	}
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setVisage(19);
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player._moveDiff = Common::Point(2, 2);
+	R2_GLOBALS._player.disableControl();
+
+	if (R2_GLOBALS._sceneManager._previousScene == 2700) {
+		if (R2_INVENTORY.getObjectScene(36) == 0) {
+			R2_GLOBALS._player.setVisage(2752);
+			R2_GLOBALS._player.setStrip(6);
+			R2_GLOBALS._player.animate(ANIM_MODE_NONE, NULL);
+			R2_GLOBALS._player.setPosition(Common::Point(81, 165));
+			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+			_field416 = 1204;
+			_sceneMode = 11;
+			_stripManager.start(_field416, this);
+		} else {
+			_sceneMode = 2750;
+			_field412 = 1;
+			R2_GLOBALS._player.setAction(&_sequenceManager, this, 2750, &R2_GLOBALS._player, NULL);
+		}
+	} else if (R2_GLOBALS._sceneManager._previousScene == 2800) {
+		_sceneMode = 2751;
+		_field412 = 3;
+		R2_GLOBALS._player.setAction(&_sequenceManager, this, 2751, &R2_GLOBALS._player, NULL);
+	} else {
+		_field412 = 1;
+		R2_GLOBALS._player.setPosition(Common::Point(90, 137));
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.enableControl();
+	}
+}
+void Scene2750::signal() {
+	switch (_sceneMode) {
+	case 10:
+		switch (_field414) {
+		case 1:
+			switch (_field412) {
+			case 2: {
+				_sceneMode = _field414;
+				_field412 = 1;
+				Common::Point pt(90, 137);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			case 3: {
+				_field412 = 2;
+				Common::Point pt(140, 142);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			default:
+				break;
+			}
+			break;
+		case 2: {
+			_sceneMode = _field414;
+			_field412 = 2;
+			Common::Point pt(170, 162);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+			}
+			break;
+		case 3:
+			switch (_field412) {
+			case 1: {
+				_field412 = 2;
+				Common::Point pt(210, 142);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			case 2: {
+				_sceneMode = _field414;
+				_field412 = 3;
+				Common::Point pt(270, 142);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			default:
+				break;
+			}
+			break;
+		case 2752:
+			switch (_field412) {
+			case 1:
+				_sceneMode = _field414;
+				setAction(&_sequenceManager, this, 2752, &R2_GLOBALS._player, NULL);
+				break;
+			case 2: {
+				_field412 = 1;
+				Common::Point pt(20, 132);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			case 3: {
+				_field412 = 2;
+				Common::Point pt(140, 142);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			default:
+				break;
+			}
+			break;
+		case 2753:
+			switch (_field412) {
+			case 1: {
+				_field412 = 2;
+				Common::Point pt(210, 142);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			case 2: {
+				_field412 = 3;
+				Common::Point pt(300, 132);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			case 3:
+				_sceneMode = _field414;
+				setAction(&_sequenceManager, this, 2753, &R2_GLOBALS._player, NULL);
+				break;
+			default:
+				break;
+			}
+			break;
+		default:
+			break;
+		}
+		break;
+	case 11:
+	// No break on purpose
+	case 2753:
+		g_globals->_sceneManager.changeScene(2800);
+		break;
+	case 2752:
+		g_globals->_sceneManager.changeScene(2700);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl(R2_NEGATOR_GUN);
+		break;
+	}
+}
+
+void Scene2750::process(Event &event) {
+	if ((R2_GLOBALS._player._canWalk) && (event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == R2_NEGATOR_GUN)) {
+		if (_rect1.contains(event.mousePos.x, event.mousePos.y)) {
+			if (!_rect1.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+				event.handled = true;
+				_sceneMode = 10;
+				_field414 = 1;
+			}
+		} else if (_rect2.contains(event.mousePos.x, event.mousePos.y)) {
+			if (!_rect2.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+				event.handled = true;
+				_sceneMode = 10;
+				_field414 = 2;
+			}
+		} else if (_rect3.contains(event.mousePos.x, event.mousePos.y)) {
+			if (!_rect3.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+				event.handled = true;
+				_sceneMode = 10;
+				_field414 = 3;
+			}
+		} else {
+			event.handled = true;
+			R2_GLOBALS._player.updateAngle(Common::Point(event.mousePos.x, event.mousePos.y));
+		}
+
+		if (_sceneMode == 10) {
+			R2_GLOBALS._player.disableControl();
+			switch (_field412) {
+			case 1: {
+				Common::Point pt(140, 142);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			case 2:
+				if (_field414 == 1) {
+					Common::Point pt(140, 142);
+					NpcMover *mover = new NpcMover();
+					R2_GLOBALS._player.addMover(mover, &pt, this);
+				} else {
+					Common::Point pt(210, 142);
+					NpcMover *mover = new NpcMover();
+					R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			case 3: {
+				Common::Point pt(210, 142);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			default:
+				break;
+			}
+		}
+	}
+	Scene::process(event);
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index 83fb7b3cfb..9b2a8685fc 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -517,8 +517,8 @@ class Scene2700 : public SceneExt {
 		void process(Event &event);
 	};
 public:
-	VisualSpeaker _quinnSpeaker;
-	VisualSpeaker _nejSpeaker;
+	SpeakerQuinn2700 _quinnSpeaker;
+	SpeakerNej2700 _nejSpeaker;
 	NamedHotspot _item1;
 	NamedHotspot _item2;
 	NamedHotspot _item3;
@@ -547,6 +547,83 @@ public:
 	virtual void process(Event &event);
 };
 
+class Scene2750 : public SceneExt {
+	class Action1: public Action {
+	public:
+		void signal();
+	};
+	class Action2: public Action {
+	public:
+		void signal();
+	};
+	class Action3: public Action {
+	public:
+		void signal();
+	};
+	class Action4: public Action {
+	public:
+		void signal();
+	};
+	class Action5: public Action {
+	public:
+		void signal();
+	};
+	class Action6: public Action {
+	public:
+		void signal();
+	};
+	class Action7: public Action {
+	public:
+		void signal();
+	};
+
+	class Area1: public SceneArea {
+	public:
+		void process(Event &event);
+	};
+	class Area2: public SceneArea {
+	public:
+		void process(Event &event);
+	};
+public:
+	SpeakerQuinn2750 _quinnSpeaker;
+	SpeakerNej2750 _nejSpeaker;
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	NamedHotspot _item3;
+	NamedHotspot _item4;
+	NamedHotspot _item5;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	SceneActor _actor6;
+	SceneActor _actor7;
+	SceneActor _actor8;
+	SceneActor _actor9;
+	SceneActor _actor10;
+	SceneActor _actor11;
+	Action1 _action1;
+	Action2 _action2;
+	Action3 _action3;
+	Action4 _action4;
+	Action5 _action5;
+	Action6 _action6;
+	Action7 _action7;
+	Area1 _area1;
+	Area2 _area2;
+	Rect _rect1, _rect2, _rect3;
+	SequenceManager _sequenceManager;
+	int _field412, _field414, _field416;
+
+	Scene2750();
+	virtual void synchronize(Serializer &s);
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void process(Event &event);
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index b3120f8af6..7a3871f9ac 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -829,5 +829,91 @@ void SpeakerNej2700::proc15() {
 	}
 }
 
+SpeakerQuinn2750::SpeakerQuinn2750() {
+	_speakerName = "QUINN";
+	_color1 = 60;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerQuinn2750::proc15() {
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &R2_GLOBALS._player;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		switch (_object2->_visage) {
+		case 19:
+			_object1.setup(4022, 5, 1);
+			break;
+		case 2752:
+			_object1.setup(2752, 1, 1);
+			break;
+		default:
+			break;
+		}
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+SpeakerNej2750::SpeakerNej2750() {
+	_speakerName = "NEJ";
+	_color1 = 171;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerNej2750::proc15() {
+	int v = _fieldF6;
+	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor1;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		switch (_object2->_visage) {
+		case 2705:
+			_object1.setup(4022, 7, 1);
+			break;
+		case 2752:
+			_object1.setup(2752, 1, 1);
+			break;
+		default:
+			break;
+		}
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 7ffd24e6e7..115ad580ce 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -221,6 +221,22 @@ public:
 	virtual Common::String getClassName() { return "SpeakerNej2700"; }
 	virtual void proc15();
 };
+
+class SpeakerQuinn2750 : public VisualSpeaker {
+public:
+	SpeakerQuinn2750();
+
+	virtual Common::String getClassName() { return "SpeakerQuinn2750"; }
+	virtual void proc15();
+};
+
+class SpeakerNej2750 : public VisualSpeaker {
+public:
+	SpeakerNej2750();
+
+	virtual Common::String getClassName() { return "SpeakerNej2750"; }
+	virtual void proc15();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 2ce198575fbf2d06140c5ff3d610b782220f5e28 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 15 Dec 2011 17:09:45 +0100
Subject: TSAGE: R2R - Cleanup

---
 engines/tsage/ringworld2/ringworld2_scenes2.cpp | 46 ++++++++++++-------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index abcf16405b..107d7bad04 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -3071,7 +3071,7 @@ void Scene2700::Action4::signal() {
 
 void Scene2700::Area1::process(Event &event) {
 	SceneArea::process(event);
-	if ((event.eventType == 1) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos.x, event.mousePos.y))) {
+	if ((event.eventType == 1) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos))) {
 		Scene2700 *scene = (Scene2700 *)R2_GLOBALS._sceneManager._scene;
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 10;
@@ -3121,7 +3121,7 @@ void Scene2700::Area1::process(Event &event) {
 
 void Scene2700::Area2::process(Event &event) {
 	SceneArea::process(event);
-	if ((event.eventType == 1) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos.x, event.mousePos.y))) {
+	if ((event.eventType == 1) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos))) {
 		Scene2700 *scene = (Scene2700 *)R2_GLOBALS._sceneManager._scene;
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 10;
@@ -3536,7 +3536,7 @@ void Scene2700::signal() {
 void Scene2700::process(Event &event) {
 	if ((R2_GLOBALS._player._canWalk) && (event.eventType == EVENT_BUTTON_DOWN)) {
 		if (R2_GLOBALS._events.getCursor() == R2_36) {
-			if (R2_GLOBALS._player._bounds.contains(event.mousePos.x, event.mousePos.y)) {
+			if (R2_GLOBALS._player._bounds.contains(event.mousePos)) {
 				_sceneMode = 10;
 				_field414 = 2710;
 				R2_GLOBALS._player.disableControl();
@@ -3593,38 +3593,38 @@ void Scene2700::process(Event &event) {
 				SceneItem::display(2700, 3, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 			}
 		} else if (R2_GLOBALS._events.getCursor() == R2_NEGATOR_GUN) {
-			if (_rect1.contains(event.mousePos.x, event.mousePos.y)) {
-				if (!_rect1.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+			if (_rect1.contains(event.mousePos)) {
+				if (!_rect1.contains(R2_GLOBALS._player._position)) {
 					event.handled = true;
 					_sceneMode = 10;
 					_field414 = 1;
 				}
-			} else if (_rect2.contains(event.mousePos.x, event.mousePos.y)) {
-				if (!_rect2.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+			} else if (_rect2.contains(event.mousePos)) {
+				if (!_rect2.contains(R2_GLOBALS._player._position)) {
 					event.handled = true;
 					_sceneMode = 10;
 					_field414 = 2;
 				}
-			} else if (_rect3.contains(event.mousePos.x, event.mousePos.y)) {
-				if (!_rect3.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+			} else if (_rect3.contains(event.mousePos)) {
+				if (!_rect3.contains(R2_GLOBALS._player._position)) {
 					event.handled = true;
 					_sceneMode = 10;
 					_field414 = 3;
 				}
-			} else if (_rect4.contains(event.mousePos.x, event.mousePos.y)) {
-				if (!_rect4.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+			} else if (_rect4.contains(event.mousePos)) {
+				if (!_rect4.contains(R2_GLOBALS._player._position)) {
 					event.handled = true;
 					_sceneMode = 10;
 					_field414 = 4;
 				}
-			} else if (_rect5.contains(event.mousePos.x, event.mousePos.y)) {
-				if (!_rect5.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+			} else if (_rect5.contains(event.mousePos)) {
+				if (!_rect5.contains(R2_GLOBALS._player._position)) {
 					event.handled = true;
 					_sceneMode = 10;
 					_field414 = 5;
 				}
-			} else if (_rect6.contains(event.mousePos.x, event.mousePos.y)) {
-				if (!_rect6.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+			} else if (_rect6.contains(event.mousePos)) {
+				if (!_rect6.contains(R2_GLOBALS._player._position)) {
 					event.handled = true;
 					_sceneMode = 10;
 					_field414 = 6;
@@ -3798,7 +3798,7 @@ void Scene2750::Action7::signal() {
 
 void Scene2750::Area1::process(Event &event) {
 	SceneArea::process(event);
-	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos.x, event.mousePos.y))) {
+	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos))) {
 		Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 10;
@@ -3829,7 +3829,7 @@ void Scene2750::Area1::process(Event &event) {
 
 void Scene2750::Area2::process(Event &event) {
 	SceneArea::process(event);
-	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos.x, event.mousePos.y))) {
+	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._player._canWalk) && (_bounds.contains(event.mousePos))) {
 		Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 10;
@@ -4105,20 +4105,20 @@ void Scene2750::signal() {
 
 void Scene2750::process(Event &event) {
 	if ((R2_GLOBALS._player._canWalk) && (event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == R2_NEGATOR_GUN)) {
-		if (_rect1.contains(event.mousePos.x, event.mousePos.y)) {
-			if (!_rect1.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+		if (_rect1.contains(event.mousePos)) {
+			if (!_rect1.contains(R2_GLOBALS._player._position)) {
 				event.handled = true;
 				_sceneMode = 10;
 				_field414 = 1;
 			}
-		} else if (_rect2.contains(event.mousePos.x, event.mousePos.y)) {
-			if (!_rect2.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+		} else if (_rect2.contains(event.mousePos)) {
+			if (!_rect2.contains(R2_GLOBALS._player._position)) {
 				event.handled = true;
 				_sceneMode = 10;
 				_field414 = 2;
 			}
-		} else if (_rect3.contains(event.mousePos.x, event.mousePos.y)) {
-			if (!_rect3.contains(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y)) {
+		} else if (_rect3.contains(event.mousePos)) {
+			if (!_rect3.contains(R2_GLOBALS._player._position)) {
 				event.handled = true;
 				_sceneMode = 10;
 				_field414 = 3;
-- 
cgit v1.2.3


From 2a96ee48d466e4404ebd8feb8a3bf608a19121ce Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 15 Dec 2011 23:21:22 +0200
Subject: DREAMWEB: Fix regression in helicopter()

---
 engines/dreamweb/people.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index e060df9fcc..8b68c52d3e 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -871,7 +871,7 @@ void DreamGenContext::helicopter(ReelRoutine &routine) {
 		if (nextReelPointer == 53) {
 			// Before killing helicopter
 			data.byte(kCombatcount)++;
-			if (data.byte(kCombatcount) != 8)
+			if (data.byte(kCombatcount) >= 8)
 				data.byte(kMandead) = 2;
 			nextReelPointer = 49;
 		} else if (nextReelPointer == 9) {
@@ -898,10 +898,11 @@ void DreamGenContext::helicopter(ReelRoutine &routine) {
 
 	showGameReel(&routine);
 	routine.mapX = data.byte(kMapx);
-	if (routine.reelPointer() == 9 && data.byte(kCombatcount) != 7) {
+	if (routine.reelPointer() < 9 && data.byte(kCombatcount) >= 7) {
 		data.byte(kPointermode) = 2;
 		data.word(kWatchingtime) = 0;
 	} else {
+		// Not waiting helicopter
 		data.byte(kPointermode) = 0;
 		data.word(kWatchingtime) = 2;
 	}
-- 
cgit v1.2.3


From 60f9b91ced244fd7bdb822cc4471a937d38d6179 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 15 Dec 2011 23:45:09 +0200
Subject: DREAMWEB: Port 'mugger' to C++, remove the unused 'findpuztext'
 function and fix tasm-recover

---
 engines/dreamweb/dreamgen.cpp | 86 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  2 -
 engines/dreamweb/people.cpp   | 44 +++++++++++++++++++++-
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 43 insertions(+), 90 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 92bb062aab..8892c84b2d 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -26,81 +26,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::mugger() {
-	STACK_CHECK;
-	ax = es.word(bx+3);
-	_cmp(ax, 138);
-	if (flags.z())
-		goto endmugger1;
-	_cmp(ax, 176);
-	if (flags.z())
-		return /* (endmugger2) */;
-	_cmp(ax, 2);
-	if (!flags.z())
-		goto havesetwatch;
-	data.word(kWatchingtime) = 175*2;
-havesetwatch:
-	checkSpeed();
-	if (!flags.z())
-		goto notmugger;
-	_inc(es.word(bx+3));
-notmugger:
-	showGameReel();
-	al = data.byte(kMapx);
-	es.byte(bx+1) = al;
-	return;
-endmugger1:
-	push(es);
-	push(bx);
-	createPanel2();
-	showIcon();
-	al = 41;
-	findPuzText();
-	di = 33+20;
-	bx = 104;
-	dl = 241;
-	ah = 0;
-	printDirect();
-	workToScreen();
-	cx = 300;
-	hangOn();
-	bx = pop();
-	es = pop();
-	push(es);
-	push(bx);
-	es.word(bx+3) = 140;
-	data.byte(kManspath) = 2;
-	data.byte(kFinaldest) = 2;
-	findXYFromPath();
-	data.byte(kResetmanxy) = 1;
-	al = 'W';
-	ah = 'E';
-	cl = 'T';
-	ch = 'A';
-	findExObject();
-	data.byte(kCommand) = al;
-	data.byte(kObjecttype) = 4;
-	removeObFromInv();
-	al = 'W';
-	ah = 'E';
-	cl = 'T';
-	ch = 'B';
-	findExObject();
-	data.byte(kCommand) = al;
-	data.byte(kObjecttype) = 4;
-	removeObFromInv();
-	makeMainScreen();
-	al = 48;
-	bl = 68-32;
-	bh = 54+64;
-	cx = 70;
-	dx = 10;
-	setupTimedUse();
-	data.byte(kBeenmugged) = 1;
-	bx = pop();
-	es = pop();
-}
-
 void DreamGenContext::businessMan() {
 	STACK_CHECK;
 	data.byte(kPointermode) = 0;
@@ -3358,17 +3283,6 @@ notfoundinside:
 		goto insideloop;
 }
 
-void DreamGenContext::findPuzText() {
-	STACK_CHECK;
-	ah = 0;
-	si = ax;
-	_add(si, si);
-	es = data.word(kPuzzletext);
-	ax = es.word(si);
-	_add(ax, (66*2));
-	si = ax;
-}
-
 void DreamGenContext::useGun() {
 	STACK_CHECK;
 	_cmp(data.byte(kObjecttype), 4);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index fbefd91099..5a61fcb33e 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -540,7 +540,6 @@ public:
 	void findPathOfPoint();
 	void getDestInfo();
 	void read();
-	void mugger();
 	void searchForString();
 	void selectOpenOb();
 	void useGun();
@@ -549,7 +548,6 @@ public:
 	void searchForFiles();
 	void getExAd();
 	void initialMonCols();
-	void findPuzText();
 	void swapWithInv();
 	void adjustRight();
 	void transferToEx();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 8b68c52d3e..e4e368211e 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -42,7 +42,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
 	NULL, &DreamGenContext::poolGuard,
 	NULL, &DreamGenContext::businessMan,
 	NULL, NULL,
-	&DreamGenContext::mugger, NULL,
+	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
@@ -74,7 +74,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
 	&DreamGenContext::copper, /*&DreamGenContext::poolGuard*/NULL,
 	&DreamGenContext::rockstar, /*&DreamGenContext::businessMan*/NULL,
 	&DreamGenContext::train, &DreamGenContext::genericPerson /*aide*/,
-	/*&DreamGenContext::mugger*/NULL, &DreamGenContext::helicopter,
+	&DreamGenContext::mugger, &DreamGenContext::helicopter,
 	&DreamGenContext::introMagic1, &DreamGenContext::introMusic,
 	&DreamGenContext::introMagic2, &DreamGenContext::candles2,
 	&DreamGenContext::gates, &DreamGenContext::introMagic3,
@@ -908,4 +908,44 @@ void DreamGenContext::helicopter(ReelRoutine &routine) {
 	}
 }
 
+void DreamGenContext::mugger(ReelRoutine &routine) {
+	if (routine.reelPointer() != 138) {
+		if (routine.reelPointer() == 176)
+			return; // endmugger2
+
+		if (routine.reelPointer() == 2)
+			data.word(kWatchingtime) = 175 * 2;	// set watch
+
+		if (checkSpeed(routine))
+			routine.incReelPointer();
+
+		showGameReel(&routine);
+		routine.mapX = data.byte(kMapx);
+	} else {
+		createPanel2();
+		showIcon();
+
+		uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(41 * 2);
+		const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
+		uint16 y = 104;
+		printDirect(&string, 33 + 20, &y, 241, 241 & 1);
+		workToScreenCPP();
+		hangOn(300);
+		routine.setReelPointer(140);
+		data.byte(kManspath) = 2;
+		data.byte(kFinaldest) = 2;
+		findXYFromPath();
+		data.byte(kResetmanxy) = 1;
+		data.byte(kCommand) = findExObject("WETA");
+		data.byte(kObjecttype) = 4;
+		removeObFromInv();
+		data.byte(kCommand) = findExObject("WETB");
+		data.byte(kObjecttype) = 4;
+		removeObFromInv();
+		makeMainScreen();
+		DreamBase::setupTimedUse(48, 70, 10, 68 - 32, 54 + 64);
+		data.byte(kBeenmugged) = 1;
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 0f5a5ca115..33e43eba32 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -382,6 +382,7 @@
 	void bartender(ReelRoutine &routine);
 	void heavy(ReelRoutine &routine);
 	void helicopter(ReelRoutine &routine);
+	void mugger(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void loadSaveBox();
 	uint8 nextSymbol(uint8 symbol);
-- 
cgit v1.2.3


From 6792fa2fb650d4ac225b4b4352b41fd17323c4c4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 16 Dec 2011 00:02:57 +0200
Subject: DREAMWEB: Port 'businessman' to C++

---
 engines/dreamweb/dreamgen.cpp | 97 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/people.cpp   | 68 +++++++++++++++++++++++++++++-
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 67 insertions(+), 100 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 8892c84b2d..e4a5411ed7 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -26,103 +26,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::businessMan() {
-	STACK_CHECK;
-	data.byte(kPointermode) = 0;
-	data.word(kWatchingtime) = 2;
-	ax = es.word(bx+3);
-	_cmp(ax, 2);
-	if (!flags.z())
-		goto notfirstbiz;
-	push(ax);
-	push(bx);
-	push(es);
-	al = 49;
-	cx = 30;
-	dx = 1;
-	bl = 68;
-	bh = 174;
-	setupTimedUse();
-	es = pop();
-	bx = pop();
-	ax = pop();
-notfirstbiz:
-	_cmp(ax, 95);
-	if (flags.z())
-		goto buscombatwonend;
-	_cmp(ax, 49);
-	if (flags.z())
-		return /* (buscombatend) */;
-	checkSpeed();
-	if (!flags.z())
-		goto busspeed;
-	ax = es.word(bx+3);
-	_inc(ax);
-	_cmp(ax, 48);
-	if (!flags.z())
-		goto notbeforedeadb;
-	data.byte(kMandead) = 2;
-	goto gotbusframe;
-notbeforedeadb:
-	_cmp(ax, 15);
-	if (!flags.z())
-		goto buscombatwon;
-	_dec(ax);
-	_cmp(data.byte(kLastweapon), 3);
-	if (!flags.z())
-		goto notshieldonbus;
-	data.byte(kLastweapon) = -1;
-	data.byte(kCombatcount) = 0;
-	ax = 51;
-	goto gotbusframe;
-notshieldonbus:
-	_inc(data.byte(kCombatcount));
-	_cmp(data.byte(kCombatcount), 20);
-	if (!flags.z())
-		goto gotbusframe;
-	data.byte(kCombatcount) = 0;
-	ax = 15;
-	goto gotbusframe;
-buscombatwon:
-	_cmp(ax, 91);
-	if (!flags.z())
-		goto gotbusframe;
-	push(bx);
-	push(es);
-	al = 0;
-	turnPathOn();
-	al = 1;
-	turnPathOn();
-	al = 2;
-	turnPathOn();
-	al = 3;
-	turnPathOff();
-	data.byte(kManspath) = 5;
-	data.byte(kFinaldest) = 5;
-	findXYFromPath();
-	data.byte(kResetmanxy) = 1;
-	es = pop();
-	bx = pop();
-	ax = 92;
-	goto gotbusframe;
-gotbusframe:
-	es.word(bx+3) = ax;
-busspeed:
-	showGameReel();
-	al = data.byte(kMapy);
-	es.byte(bx+2) = al;
-	ax = es.word(bx+3);
-	_cmp(ax, 14);
-	if (!flags.z())
-		return /* (buscombatend) */;
-	data.word(kWatchingtime) = 0;
-	data.byte(kPointermode) = 2;
-	return;
-buscombatwonend:
-	data.byte(kPointermode) = 0;
-	data.word(kWatchingtime) = 0;
-}
-
 void DreamGenContext::poolGuard() {
 	STACK_CHECK;
 	ax = es.word(bx+3);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 5a61fcb33e..87b769f79e 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -509,7 +509,6 @@ public:
 	void selectOb();
 	void fadeUpMon();
 	void reExFromInv();
-	void businessMan();
 	void outOfInv();
 	void transferMap();
 	void purgeAnItem();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index e4e368211e..003921b163 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -40,7 +40,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
 	NULL, NULL,
 	NULL, NULL,
 	NULL, &DreamGenContext::poolGuard,
-	NULL, &DreamGenContext::businessMan,
+	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
@@ -72,7 +72,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
 	&DreamGenContext::keeper, &DreamGenContext::candles1,
 	&DreamGenContext::smallCandle, &DreamGenContext::security,
 	&DreamGenContext::copper, /*&DreamGenContext::poolGuard*/NULL,
-	&DreamGenContext::rockstar, /*&DreamGenContext::businessMan*/NULL,
+	&DreamGenContext::rockstar, &DreamGenContext::businessMan,
 	&DreamGenContext::train, &DreamGenContext::genericPerson /*aide*/,
 	&DreamGenContext::mugger, &DreamGenContext::helicopter,
 	&DreamGenContext::introMagic1, &DreamGenContext::introMusic,
@@ -948,4 +948,68 @@ void DreamGenContext::mugger(ReelRoutine &routine) {
 	}
 }
 
+void DreamGenContext::businessMan(ReelRoutine &routine) {
+	data.byte(kPointermode) = 0;
+	data.word(kWatchingtime) = 2;
+	if (routine.reelPointer() == 2) {
+		// First
+		DreamBase::setupTimedUse(49, 30, 1, 68, 174);
+		return;
+	}
+
+	if (routine.reelPointer() == 95) {
+		// Bus combat won - end
+		data.byte(kPointermode) = 0;
+		data.word(kWatchingtime) = 0;
+		return;
+	}
+
+	if (routine.reelPointer() == 49)
+		return; // buscombatend
+
+	if (checkSpeed(routine)) {
+		uint16 nextReelPointer = routine.reelPointer() + 1;
+		if (nextReelPointer == 48) {
+			data.byte(kMandead) = 2;	// before dead body
+		} else if (nextReelPointer == 15) {
+			nextReelPointer--;
+			if (data.byte(kLastweapon) == 3) {
+				// Shield bonus
+				data.byte(kLastweapon) = (byte)-1;
+				data.byte(kCombatcount) = 0;
+				nextReelPointer = 51;
+			} else {
+				// No shield bonus
+				data.byte(kCombatcount)++;
+				if (data.byte(kCombatcount) == 20) {
+					data.byte(kCombatcount) = 0;
+					nextReelPointer = 15;
+				}
+			}
+		} else {
+			// Bus combat won
+			if (nextReelPointer == 91) {
+				turnPathOn(0);
+				turnPathOn(1);
+				turnPathOn(2);
+				turnPathOff(3);
+				data.byte(kManspath) = 5;
+				data.byte(kFinaldest) = 5;
+				findXYFromPath();
+				data.byte(kResetmanxy) = 1;
+				nextReelPointer = 92;
+			}
+		}
+		
+		routine.setReelPointer(nextReelPointer);
+	}
+
+	showGameReel(&routine);
+	routine.mapY = data.byte(kMapy);
+	if (routine.reelPointer() == 14) {
+		data.word(kWatchingtime) = 0;
+		data.byte(kPointermode) = 2;
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 33e43eba32..5b012d580e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -383,6 +383,7 @@
 	void heavy(ReelRoutine &routine);
 	void helicopter(ReelRoutine &routine);
 	void mugger(ReelRoutine &routine);
+	void businessMan(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void loadSaveBox();
 	uint8 nextSymbol(uint8 symbol);
-- 
cgit v1.2.3


From 66618f4e0245bb1f90cd08a1261d57483e73aaae Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 16 Dec 2011 00:15:04 +0200
Subject: DREAMWEB: Port 'endgameseq' to C++

---
 engines/dreamweb/dreamgen.cpp | 63 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/people.cpp   | 41 ++++++++++++++++++++++++++--
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 40 insertions(+), 66 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index e4a5411ed7..804896de5f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -123,69 +123,6 @@ combatover2:
 	data.byte(kMandead) = 2;
 }
 
-void DreamGenContext::endGameSeq() {
-	STACK_CHECK;
-	checkSpeed();
-	if (!flags.z())
-		goto notendseq;
-	ax = es.word(bx+3);
-	_inc(ax);
-	_cmp(ax, 51);
-	if (!flags.z())
-		goto gotendseq;
-	_cmp(data.byte(kIntrocount), 140);
-	if (flags.z())
-		goto gotendseq;
-	_inc(data.byte(kIntrocount));
-	push(es);
-	push(bx);
-	textForEnd();
-	bx = pop();
-	es = pop();
-	ax = 50;
-gotendseq:
-	es.word(bx+3) = ax;
-	_cmp(ax, 134);
-	if (!flags.z())
-		goto notfadedown;
-	push(es);
-	push(bx);
-	push(ax);
-	fadeScreenDownHalf();
-	ax = pop();
-	bx = pop();
-	es = pop();
-	goto notendseq;
-notfadedown:
-	_cmp(ax, 324);
-	if (!flags.z())
-		goto notfadeend;
-	push(es);
-	push(bx);
-	push(ax);
-	fadeScreenDowns();
-	data.byte(kVolumeto) = 7;
-	data.byte(kVolumedirection) = 1;
-	ax = pop();
-	bx = pop();
-	es = pop();
-notfadeend:
-	_cmp(ax, 340);
-	if (!flags.z())
-		goto notendseq;
-	data.byte(kGetback) = 1;
-notendseq:
-	showGameReel();
-	al = data.byte(kMapy);
-	es.byte(bx+2) = al;
-	ax = es.word(bx+3);
-	_cmp(ax, 145);
-	if (!flags.z())
-		return /* (notendcreds) */;
-	es.word(bx+3) = 146;
-	rollEndCredits();
-}
-
 void DreamGenContext::checkForExit() {
 	STACK_CHECK;
 	cl = data.byte(kRyanx);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 87b769f79e..c47be2f748 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -490,7 +490,6 @@ public:
 	void fadeScreenDownHalf();
 	void outOfOpen();
 	void dirCom();
-	void endGameSeq();
 	void findFirstPath();
 	void startTalk();
 	void getAnyAd();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 003921b163..96c9ae89c9 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -48,7 +48,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
-	NULL, &DreamGenContext::endGameSeq,
+	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
 	NULL, NULL,
@@ -80,7 +80,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
 	&DreamGenContext::gates, &DreamGenContext::introMagic3,
 	&DreamGenContext::introMonks1, &DreamGenContext::candles,
 	&DreamGenContext::introMonks2, &DreamGenContext::handClap,
-	&DreamGenContext::monkAndRyan, /*&DreamGenContext::endGameSeq*/NULL,
+	&DreamGenContext::monkAndRyan, &DreamGenContext::endGameSeq,
 	&DreamGenContext::priest, &DreamGenContext::madman,
 	&DreamGenContext::madmansTelly, &DreamGenContext::alleyBarkSound,
 	&DreamGenContext::foghornSound, &DreamGenContext::carParkDrip,
@@ -1012,4 +1012,41 @@ void DreamGenContext::businessMan(ReelRoutine &routine) {
 	}
 }
 
+void DreamGenContext::endGameSeq(ReelRoutine &routine) {
+	if (checkSpeed(routine)) {
+		uint16 nextReelPointer = routine.reelPointer() + 1;
+		if (nextReelPointer == 51 && data.byte(kIntrocount) != 140) {
+			data.byte(kIntrocount)++;
+			textForEnd();
+			nextReelPointer = 50;
+		}
+
+		routine.setReelPointer(nextReelPointer);
+		if (nextReelPointer == 134) {
+			push(es);
+			push(bx);
+			push(ax);
+			fadeScreenDownHalf();
+			ax = pop();
+			bx = pop();
+			es = pop();
+		} else if (nextReelPointer == 324) {
+			fadeScreenDowns();
+			data.byte(kVolumeto) = 7;
+			data.byte(kVolumedirection) = 1;
+		}
+
+		if (nextReelPointer == 340)
+			data.byte(kGetback) = 1;
+	}
+
+	showGameReel(&routine);
+	routine.mapY = data.byte(kMapy);
+	
+	if (routine.reelPointer() == 145) {
+		routine.setReelPointer(146);
+		rollEndCredits();
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 5b012d580e..0ee4171470 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -384,6 +384,7 @@
 	void helicopter(ReelRoutine &routine);
 	void mugger(ReelRoutine &routine);
 	void businessMan(ReelRoutine &routine);
+	void endGameSeq(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void loadSaveBox();
 	uint8 nextSymbol(uint8 symbol);
-- 
cgit v1.2.3


From 30b4037ffbc0dc5faa2ccb0e4d069a33b0dcd1fd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 16 Dec 2011 00:41:27 +0200
Subject: DREAMWEB: Port 'poolguard' to C++

This is the last of the people-related functions, so the assembly-like
wrappers of addToPeopleList() and showGameReel() have been removed. Also,
madManText() has been simplified
---
 engines/dreamweb/dreamgen.cpp |  97 ------------------------------
 engines/dreamweb/dreamgen.h   |   1 -
 engines/dreamweb/people.cpp   | 135 +++++++++++++++++++++++++-----------------
 engines/dreamweb/sprite.cpp   |   4 --
 engines/dreamweb/stubs.h      |   3 +-
 5 files changed, 83 insertions(+), 157 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 804896de5f..9106dc0425 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -26,103 +26,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::poolGuard() {
-	STACK_CHECK;
-	ax = es.word(bx+3);
-	_cmp(ax, 214);
-	if (flags.z())
-		goto combatover2;
-	_cmp(ax, 258);
-	if (flags.z())
-		goto combatover2;
-	_cmp(ax, 185);
-	if (flags.z())
-		goto combatover1;
-	_cmp(ax, 0);
-	if (!flags.z())
-		goto notfirstpool;
-	al = 0;
-	turnPathOn();
-notfirstpool:
-	checkSpeed();
-	if (!flags.z())
-		goto guardspeed;
-	ax = es.word(bx+3);
-	_inc(ax);
-	_cmp(ax, 122);
-	if (!flags.z())
-		goto notendguard1;
-	_dec(ax);
-	_cmp(data.byte(kLastweapon), 2);
-	if (!flags.z())
-		goto notaxeonpool;
-	data.byte(kLastweapon) = -1;
-	ax = 122;
-	goto gotguardframe;
-notaxeonpool:
-	_inc(data.byte(kCombatcount));
-	_cmp(data.byte(kCombatcount), 40);
-	if (!flags.z())
-		goto gotguardframe;
-	data.byte(kCombatcount) = 0;
-	ax = 195;
-	goto gotguardframe;
-notendguard1:
-	_cmp(ax, 147);
-	if (!flags.z())
-		goto gotguardframe;
-	_dec(ax);
-	_cmp(data.byte(kLastweapon), 1);
-	if (!flags.z())
-		goto notgunonpool;
-	data.byte(kLastweapon) = -1;
-	ax = 147;
-	goto gotguardframe;
-notgunonpool:
-	_inc(data.byte(kCombatcount));
-	_cmp(data.byte(kCombatcount), 40);
-	if (!flags.z())
-		goto gotguardframe;
-	data.byte(kCombatcount) = 0;
-	ax = 220;
-gotguardframe:
-	es.word(bx+3) = ax;
-guardspeed:
-	showGameReel();
-	ax = es.word(bx+3);
-	_cmp(ax, 121);
-	if (flags.z())
-		goto iswaitingpool;
-	_cmp(ax, 146);
-	if (flags.z())
-		goto iswaitingpool;
-	data.byte(kPointermode) = 0;
-	data.word(kWatchingtime) = 2;
-	return;
-iswaitingpool:
-	data.byte(kPointermode) = 2;
-	data.word(kWatchingtime) = 0;
-	return;
-combatover1:
-	data.word(kWatchingtime) = 0;
-	data.byte(kPointermode) = 0;
-	al = 0;
-	turnPathOn();
-	al = 1;
-	turnPathOff();
-	return;
-combatover2:
-	showGameReel();
-	data.word(kWatchingtime) = 2;
-	data.byte(kPointermode) = 0;
-	_inc(data.byte(kCombatcount));
-	_cmp(data.byte(kCombatcount), 100);
-	if (flags.c())
-		return /* (doneover2) */;
-	data.word(kWatchingtime) = 0;
-	data.byte(kMandead) = 2;
-}
-
 void DreamGenContext::checkForExit() {
 	STACK_CHECK;
 	cl = data.byte(kRyanx);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index c47be2f748..945e8ad10f 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -519,7 +519,6 @@ public:
 	void deleteExFrame();
 	void searchForSame();
 	void rollEm();
-	void poolGuard();
 	void lookAtPlace();
 	void findAllOpen();
 	void showSlots();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 96c9ae89c9..d8ebca648d 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -24,38 +24,6 @@
 
 namespace DreamGen {
 
-static void (DreamGenContext::*reelCallbacks[57])() = {
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, &DreamGenContext::poolGuard,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-	NULL
-};
-
 static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
 	&DreamGenContext::gamer, &DreamGenContext::sparkyDrip,
 	&DreamGenContext::eden, &DreamGenContext::edenInBath,
@@ -93,10 +61,6 @@ void DreamGenContext::updatePeople() {
 	memset(getSegment(data.word(kBuffers)).ptr(kPeoplelist, 12 * sizeof(People)), 0xff, 12 * sizeof(People));
 	++data.word(kMaintimer);
 
-	// The original callbacks are called with es:bx pointing to their reelRoutine entry.
-	// The new callbacks take a mutable ReelRoutine parameter.
-
-	es = data;
 	ReelRoutine *r = (ReelRoutine *)data.ptr(kReelroutines, 0);
 
 	for (int i = 0; r[i].reallocation != 255; ++i) {
@@ -104,35 +68,30 @@ void DreamGenContext::updatePeople() {
 		if (r[i].reallocation == data.byte(kReallocation) &&
 		        r[i].mapX == data.byte(kMapx) &&
 		        r[i].mapY == data.byte(kMapy)) {
-			if (reelCallbacks[i]) {
-				assert(!reelCallbacksCPP[i]);
-				(this->*(reelCallbacks[i]))();
-			} else {
-				assert(reelCallbacksCPP[i]);
-				(this->*(reelCallbacksCPP[i]))(r[i]);
-			}
+			assert(reelCallbacksCPP[i]);
+			(this->*(reelCallbacksCPP[i]))(r[i]);
 		}
 	}
 }
 
 void DreamGenContext::madmanText() {
+	byte origCount;
+
 	if (isCD()) {
 		if (data.byte(kSpeechcount) >= 63)
 			return;
 		if (data.byte(kCh1playing) != 255)
 			return;
-		al = data.byte(kSpeechcount);
+		origCount = data.byte(kSpeechcount);
 		++data.byte(kSpeechcount);
 	} else {
 		if (data.byte(kCombatcount) >= 61)
 			return;
-		al = data.byte(kCombatcount);
-		_and(al, 3);
-		if (!flags.z())
+		if (data.byte(kCombatcount) & 3)
 			return;
-		al = data.byte(kCombatcount) / 4;
+		origCount = data.byte(kCombatcount) / 4;
 	}
-	setupTimedTemp(47 + al, 82, 72, 80, 90, 1);
+	setupTimedTemp(47 + origCount, 82, 72, 80, 90, 1);
 }
 
 void DreamGenContext::madman(ReelRoutine &routine) {
@@ -191,10 +150,6 @@ void DreamGenContext::madMode() {
 	data.byte(kPointermode) = 2;
 }
 
-void DreamGenContext::addToPeopleList() {
-	addToPeopleList((ReelRoutine *)es.ptr(bx, sizeof(ReelRoutine)));
-}
-
 void DreamGenContext::addToPeopleList(ReelRoutine *routine) {
 	uint16 routinePointer = (const uint8 *)routine - data.ptr(0, 0);
 
@@ -1049,4 +1004,78 @@ void DreamGenContext::endGameSeq(ReelRoutine &routine) {
 	}
 }
 
+void DreamGenContext::poolGuard(ReelRoutine &routine) {
+	if (routine.reelPointer() == 214 || routine.reelPointer() == 258) {
+		// Combat over 2
+		showGameReel(&routine);
+		data.word(kWatchingtime) = 2;
+		data.byte(kPointermode) = 0;
+		data.byte(kCombatcount)++;
+		if (data.byte(kCombatcount) < 100)
+			return; // doneover2
+		data.word(kWatchingtime) = 0;
+		data.byte(kMandead) = 2;
+		return;
+	} else if (routine.reelPointer() == 185) {
+		// Combat over 1
+		data.word(kWatchingtime) = 0;
+		data.byte(kPointermode) = 0;
+		turnPathOn(0);
+		turnPathOff(1);
+		return;
+	}
+
+	if (routine.reelPointer() == 0)
+		turnPathOn(0);	// first pool
+
+	if (checkSpeed(routine)) {
+		uint16 nextReelPointer = routine.reelPointer() + 1;
+		
+		if (nextReelPointer != 122) {
+			// Not end guard 1
+			if (nextReelPointer == 147) {
+				nextReelPointer--;
+				if (data.byte(kLastweapon) == 1) {
+					// Gun on pool
+					data.byte(kLastweapon) = (byte)-1;
+					nextReelPointer = 147;
+				} else {
+					// Gun not on pool
+					data.byte(kCombatcount)++;
+					if (data.byte(kCombatcount) == 40) {
+						data.byte(kCombatcount) = 0;
+						nextReelPointer = 220;
+					}
+				}
+			}
+		}
+
+		nextReelPointer--;
+
+		if (data.byte(kLastweapon) == 2) {
+			// Axe on pool
+			data.byte(kLastweapon) = (byte)-1;
+			nextReelPointer = 122;
+		} else {
+			data.byte(kCombatcount)++;
+			if (data.byte(kCombatcount) == 40) {
+				data.byte(kCombatcount) = 0;
+				nextReelPointer = 195;
+			}
+		}
+		
+		routine.setReelPointer(nextReelPointer);
+	}
+
+	showGameReel(&routine);
+	
+	if (routine.reelPointer() != 121 && routine.reelPointer() != 146) {
+		data.byte(kPointermode) = 0;
+		data.word(kWatchingtime) = 2;
+	} else {
+		data.byte(kPointermode) = 2;
+		data.word(kWatchingtime) = 0;
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index c69ac2a3f5..d82d0f19fc 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -486,10 +486,6 @@ void DreamBase::showReelFrame(Reel *reel) {
 	showFrame(base, x, y, frame, 8);
 }
 
-void DreamGenContext::showGameReel() {
-	showGameReel((ReelRoutine *)es.ptr(bx, sizeof(ReelRoutine)));
-}
-
 void DreamGenContext::showGameReel(ReelRoutine *routine) {
 	uint16 reelPointer = routine->reelPointer();
 	if (reelPointer >= 512)
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 0ee4171470..b50b1bccd7 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -92,7 +92,6 @@
 	void wideDoor(Sprite *sprite, SetObject *objData);
 	void lockedDoorway(Sprite *sprite, SetObject *objData);
 	void liftSprite(Sprite *sprite, SetObject *objData);
-	void showGameReel();
 	void showGameReel(ReelRoutine *routine);
 	void turnPathOn(uint8 param);
 	void turnPathOff(uint8 param);
@@ -176,7 +175,6 @@
 	void obName();
 	void obName(uint8 command, uint8 commandType);
 	void checkCoords(const RectWithCallback *rectWithCallbacks);
-	void addToPeopleList();
 	void addToPeopleList(ReelRoutine *routine);
 	void getExPos();
 	void compare();
@@ -385,6 +383,7 @@
 	void mugger(ReelRoutine &routine);
 	void businessMan(ReelRoutine &routine);
 	void endGameSeq(ReelRoutine &routine);
+	void poolGuard(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void loadSaveBox();
 	uint8 nextSymbol(uint8 symbol);
-- 
cgit v1.2.3


From a6b2b9c7ff19075a159fd53f966d2c66e8ea33cd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 16 Dec 2011 00:42:25 +0200
Subject: DREAMWEB: Enable the C++ callback of poolGuard()

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

(limited to 'engines')

diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index d8ebca648d..a96af8babd 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -39,7 +39,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
 	&DreamGenContext::genericPerson /*tattooMan*/, &DreamGenContext::attendant,
 	&DreamGenContext::keeper, &DreamGenContext::candles1,
 	&DreamGenContext::smallCandle, &DreamGenContext::security,
-	&DreamGenContext::copper, /*&DreamGenContext::poolGuard*/NULL,
+	&DreamGenContext::copper, &DreamGenContext::poolGuard,
 	&DreamGenContext::rockstar, &DreamGenContext::businessMan,
 	&DreamGenContext::train, &DreamGenContext::genericPerson /*aide*/,
 	&DreamGenContext::mugger, &DreamGenContext::helicopter,
-- 
cgit v1.2.3


From 84be5b04465fa241b1982f943df3d17a1a1ced1a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 16 Dec 2011 00:46:05 +0200
Subject: DREAMWEB: Rename 'reelCallbacksCPP' to reelCallbacks'

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

(limited to 'engines')

diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index a96af8babd..fd408b772c 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -24,7 +24,7 @@
 
 namespace DreamGen {
 
-static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
+static void (DreamGenContext::*reelCallbacks[57])(ReelRoutine &) = {
 	&DreamGenContext::gamer, &DreamGenContext::sparkyDrip,
 	&DreamGenContext::eden, &DreamGenContext::edenInBath,
 	&DreamGenContext::sparky, &DreamGenContext::smokeBloke,
@@ -68,8 +68,8 @@ void DreamGenContext::updatePeople() {
 		if (r[i].reallocation == data.byte(kReallocation) &&
 		        r[i].mapX == data.byte(kMapx) &&
 		        r[i].mapY == data.byte(kMapy)) {
-			assert(reelCallbacksCPP[i]);
-			(this->*(reelCallbacksCPP[i]))(r[i]);
+			assert(reelCallbacks[i]);
+			(this->*(reelCallbacks[i]))(r[i]);
 		}
 	}
 }
-- 
cgit v1.2.3


From 86c3c8b4620f3841ba587790bdad9f262d1ed339 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 16 Dec 2011 10:36:07 +0100
Subject: DREAMWEB: Fix regressions in helicopter and poolGuard

---
 engines/dreamweb/people.cpp | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index fd408b772c..aeb0b5db22 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -842,11 +842,7 @@ void DreamGenContext::helicopter(ReelRoutine &routine) {
 					nextReelPointer = 9;
 				}
 			}
-		} else {
-			// Not waiting helicopter
-			data.byte(kPointermode) = 0;
-			data.word(kWatchingtime) = 2;
-		}
+		} 
 
 		routine.setReelPointer(nextReelPointer);
 	}
@@ -929,12 +925,12 @@ void DreamGenContext::businessMan(ReelRoutine &routine) {
 		} else if (nextReelPointer == 15) {
 			nextReelPointer--;
 			if (data.byte(kLastweapon) == 3) {
-				// Shield bonus
+				// Shield on bus
 				data.byte(kLastweapon) = (byte)-1;
 				data.byte(kCombatcount) = 0;
 				nextReelPointer = 51;
 			} else {
-				// No shield bonus
+				// No shield on bus
 				data.byte(kCombatcount)++;
 				if (data.byte(kCombatcount) == 20) {
 					data.byte(kCombatcount) = 0;
@@ -1048,19 +1044,19 @@ void DreamGenContext::poolGuard(ReelRoutine &routine) {
 					}
 				}
 			}
-		}
-
-		nextReelPointer--;
-
-		if (data.byte(kLastweapon) == 2) {
-			// Axe on pool
-			data.byte(kLastweapon) = (byte)-1;
-			nextReelPointer = 122;
 		} else {
-			data.byte(kCombatcount)++;
-			if (data.byte(kCombatcount) == 40) {
-				data.byte(kCombatcount) = 0;
-				nextReelPointer = 195;
+			nextReelPointer--;
+
+			if (data.byte(kLastweapon) == 2) {
+				// Axe on pool
+				data.byte(kLastweapon) = (byte)-1;
+				nextReelPointer = 122;
+			} else {
+				data.byte(kCombatcount)++;
+				if (data.byte(kCombatcount) == 40) {
+					data.byte(kCombatcount) = 0;
+					nextReelPointer = 195;
+				}
 			}
 		}
 		
-- 
cgit v1.2.3


From f878f0453a88ee5b11cfc0c755c2bfcd2a9ad6f9 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 16 Dec 2011 16:24:41 +0100
Subject: DREAMWEB: Convert useGun to C++

---
 engines/dreamweb/dreamgen.cpp | 177 ------------------------------------------
 engines/dreamweb/dreamgen.h   |   1 -
 engines/dreamweb/stubs.h      |   1 +
 engines/dreamweb/use.cpp      | 112 ++++++++++++++++++++++++++
 4 files changed, 113 insertions(+), 178 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 9106dc0425..906ce3adc3 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3026,183 +3026,6 @@ notfoundinside:
 		goto insideloop;
 }
 
-void DreamGenContext::useGun() {
-	STACK_CHECK;
-	_cmp(data.byte(kObjecttype), 4);
-	if (flags.z())
-		goto istakengun;
-	showSecondUse();
-	putBackObStuff();
-	return;
-istakengun:
-	_cmp(data.byte(kReallocation), 22);
-	if (!flags.z())
-		goto notinpoolroom;
-	cx = 300;
-	al = 34;
-	showPuzText();
-	data.byte(kLastweapon) = 1;
-	data.byte(kCombatcount) = 39;
-	data.byte(kGetback) = 1;
-	_inc(data.byte(kProgresspoints));
-	return;
-notinpoolroom:
-	_cmp(data.byte(kReallocation), 25);
-	if (!flags.z())
-		goto nothelicopter;
-	cx = 300;
-	al = 34;
-	showPuzText();
-	data.byte(kLastweapon) = 1;
-	data.byte(kCombatcount) = 19;
-	data.byte(kGetback) = 1;
-	data.byte(kDreamnumber) = 2;
-	data.byte(kRoomafterdream) = 38;
-	data.byte(kSartaindead) = 1;
-	_inc(data.byte(kProgresspoints));
-	return;
-nothelicopter:
-	_cmp(data.byte(kReallocation), 27);
-	if (!flags.z())
-		goto notinrockroom;
-	cx = 300;
-	al = 46;
-	showPuzText();
-	data.byte(kPointermode) = 2;
-	data.byte(kRockstardead) = 1;
-	data.byte(kLastweapon) = 1;
-	data.byte(kNewsitem) = 1;
-	data.byte(kGetback) = 1;
-	data.byte(kRoomafterdream) = 32;
-	data.byte(kDreamnumber) = 0;
-	_inc(data.byte(kProgresspoints));
-	return;
-notinrockroom:
-	_cmp(data.byte(kReallocation), 8);
-	if (!flags.z())
-		goto notbystudio;
-	_cmp(data.byte(kMapx), 22);
-	if (!flags.z())
-		goto notbystudio;
-	_cmp(data.byte(kMapy), 40);
-	if (!flags.z())
-		goto notbystudio;
-	al = 92;
-	isSetObOnMap();
-	if (flags.z())
-		goto notbystudio;
-	_cmp(data.byte(kManspath), 9);
-	if (flags.z())
-		goto notbystudio;
-	data.byte(kDestination) = 9;
-	data.byte(kFinaldest) = 9;
-	autoSetWalk();
-	data.byte(kLastweapon) = 1;
-	data.byte(kGetback) = 1;
-	_inc(data.byte(kProgresspoints));
-	return;
-notbystudio:
-	_cmp(data.byte(kReallocation), 6);
-	if (!flags.z())
-		goto notsarters;
-	_cmp(data.byte(kMapx), 11);
-	if (!flags.z())
-		goto notsarters;
-	_cmp(data.byte(kMapy), 20);
-	if (!flags.z())
-		goto notsarters;
-	al = 5;
-	isSetObOnMap();
-	if (!flags.z())
-		goto notsarters;
-	data.byte(kDestination) = 1;
-	data.byte(kFinaldest) = 1;
-	autoSetWalk();
-	al = 5;
-	removeSetObject();
-	al = 6;
-	placeSetObject();
-	al = 1;
-	ah = data.byte(kRoomnum);
-	_dec(ah);
-	turnAnyPathOn();
-	data.byte(kLiftflag) = 1;
-	data.word(kWatchingtime) = 40*2;
-	data.word(kReeltowatch) = 4;
-	data.word(kEndwatchreel) = 43;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
-	_inc(data.byte(kProgresspoints));
-	return;
-notsarters:
-	_cmp(data.byte(kReallocation), 29);
-	if (!flags.z())
-		goto notaide;
-	data.byte(kGetback) = 1;
-	al = 13;
-	resetLocation();
-	al = 12;
-	setLocation();
-	data.byte(kDestpos) = 12;
-	data.byte(kDestination) = 2;
-	data.byte(kFinaldest) = 2;
-	autoSetWalk();
-	data.word(kWatchingtime) = 164*2;
-	data.word(kReeltowatch) = 3;
-	data.word(kEndwatchreel) = 164;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.byte(kAidedead) = 1;
-	data.byte(kDreamnumber) = 3;
-	data.byte(kRoomafterdream) = 33;
-	_inc(data.byte(kProgresspoints));
-	return;
-notaide:
-	_cmp(data.byte(kReallocation), 23);
-	if (!flags.z())
-		goto notwithboss;
-	_cmp(data.byte(kMapx), 0);
-	if (!flags.z())
-		goto notwithboss;
-	_cmp(data.byte(kMapy), 50);
-	if (!flags.z())
-		goto notwithboss;
-	_cmp(data.byte(kManspath), 5);
-	if (flags.z())
-		goto pathokboss;
-	data.byte(kDestination) = 5;
-	data.byte(kFinaldest) = 5;
-	autoSetWalk();
-pathokboss:
-	data.byte(kLastweapon) = 1;
-	data.byte(kGetback) = 1;
-	return;
-notwithboss:
-	_cmp(data.byte(kReallocation), 8);
-	if (!flags.z())
-		goto nottvsoldier;
-	_cmp(data.byte(kMapx), 11);
-	if (!flags.z())
-		goto nottvsoldier;
-	_cmp(data.byte(kMapy), 10);
-	if (!flags.z())
-		goto nottvsoldier;
-	_cmp(data.byte(kManspath), 2);
-	if (flags.z())
-		goto pathoktv;
-	data.byte(kDestination) = 2;
-	data.byte(kFinaldest) = 2;
-	autoSetWalk();
-pathoktv:
-	data.byte(kLastweapon) = 1;
-	data.byte(kGetback) = 1;
-	return;
-nottvsoldier:
-	showFirstUse();
-	putBackObStuff();
-}
-
 void DreamGenContext::showDiaryKeys() {
 	STACK_CHECK;
 	_cmp(data.byte(kPresscount), 0);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 945e8ad10f..ddccd5eaad 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -539,7 +539,6 @@ public:
 	void read();
 	void searchForString();
 	void selectOpenOb();
-	void useGun();
 	void incRyanPage();
 	void clearChanges();
 	void searchForFiles();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index b50b1bccd7..3330f6f019 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -519,5 +519,6 @@
 	void openOb();
 	void withWhat();
 	void notHeldError();
+	void useGun();
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 08b96cf33a..b0666bab33 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -764,6 +764,118 @@ void DreamGenContext::useChurchGate() {
 		turnPathOn(2);	// Open church
 }
 
+void DreamGenContext::useGun() {
+
+	if (data.byte(kObjecttype) != 4) {
+		// gun is not taken
+		showSecondUse();
+		putBackObStuff();
+
+	} else if (data.byte(kReallocation) == 22) {
+		// in pool room
+		showPuzText(34, 300);
+		data.byte(kLastweapon) = 1;
+		data.byte(kCombatcount) = 39;
+		data.byte(kGetback) = 1;
+		data.byte(kProgresspoints)++;
+
+	} else if (data.byte(kReallocation) == 25) {
+		// helicopter
+		showPuzText(34, 300);
+		data.byte(kLastweapon) = 1;
+		data.byte(kCombatcount) = 19;
+		data.byte(kGetback) = 1;
+		data.byte(kDreamnumber) = 2;
+		data.byte(kRoomafterdream) = 38;
+		data.byte(kSartaindead) = 1;
+		data.byte(kProgresspoints)++;
+
+	} else if (data.byte(kReallocation) == 27) {
+		// in rock room
+		showPuzText(46, 300);
+		data.byte(kPointermode) = 2;
+		data.byte(kRockstardead) = 1;
+		data.byte(kLastweapon) = 1;
+		data.byte(kNewsitem) = 1;
+		data.byte(kGetback) = 1;
+		data.byte(kRoomafterdream) = 32;
+		data.byte(kDreamnumber) = 0;
+		data.byte(kProgresspoints)++;
+
+	} else if (data.byte(kReallocation) == 8 && data.byte(kMapx) == 22 && data.byte(kMapy) == 40
+	    && !isSetObOnMap(92) && data.byte(kManspath) != 9) {
+		// by studio
+		data.byte(kDestination) = 9;
+		data.byte(kFinaldest) = 9;
+		autoSetWalk();
+		data.byte(kLastweapon) = 1;
+		data.byte(kGetback) = 1;
+		data.byte(kProgresspoints)++;
+
+	} else if (data.byte(kReallocation) == 6 && data.byte(kMapx) == 11 && data.byte(kMapy) == 20
+	    && isSetObOnMap(5)) {
+		// sarters
+		data.byte(kDestination) = 1;
+		data.byte(kFinaldest) = 1;
+		autoSetWalk();
+		removeSetObject(5);
+		placeSetObject(6);
+		turnAnyPathOn(1, data.byte(kRoomnum) - 1);
+		data.byte(kLiftflag) = 1;
+		data.word(kWatchingtime) = 40*2;
+		data.word(kReeltowatch) = 4;
+		data.word(kEndwatchreel) = 43;
+		data.byte(kWatchspeed) = 1;
+		data.byte(kSpeedcount) = 1;
+		data.byte(kGetback) = 1;
+		data.byte(kProgresspoints)++;
+
+	} else if (data.byte(kReallocation) == 29) {
+		// aide
+		data.byte(kGetback) = 1;
+		al = 13;
+		resetLocation();
+		setLocation(12);
+		data.byte(kDestpos) = 12;
+		data.byte(kDestination) = 2;
+		data.byte(kFinaldest) = 2;
+		autoSetWalk();
+		data.word(kWatchingtime) = 164*2;
+		data.word(kReeltowatch) = 3;
+		data.word(kEndwatchreel) = 164;
+		data.byte(kWatchspeed) = 1;
+		data.byte(kSpeedcount) = 1;
+		data.byte(kAidedead) = 1;
+		data.byte(kDreamnumber) = 3;
+		data.byte(kRoomafterdream) = 33;
+		data.byte(kProgresspoints)++;
+
+	} else if (data.byte(kReallocation) == 23 && data.byte(kMapx) == 0 && data.byte(kMapy) == 50) {
+		// with boss
+		if (data.byte(kManspath) != 5) {
+			data.byte(kDestination) = 5;
+			data.byte(kFinaldest) = 5;
+			autoSetWalk();
+		}
+		data.byte(kLastweapon) = 1;
+		data.byte(kGetback) = 1;
+
+	} else if (data.byte(kReallocation) == 8 && data.byte(kMapx) == 11 && data.byte(kMapy) == 10) {
+		// tv soldier
+		if (data.byte(kManspath) != 2) {
+			data.byte(kDestination) = 2;
+			data.byte(kFinaldest) = 2;
+			autoSetWalk();
+		}
+		data.byte(kLastweapon) = 1;
+		data.byte(kGetback) = 1;
+
+	} else {
+		showFirstUse();
+		putBackObStuff();
+	}
+}
+
 void DreamGenContext::useFullCart() {
 	data.byte(kProgresspoints)++;
 	turnAnyPathOn(2, data.byte(kRoomnum) + 6);
-- 
cgit v1.2.3


From 027249ec30bafcf7229a25d1dbd565f0b18cbe54 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 16 Dec 2011 16:37:06 +0100
Subject: DREAMWEB: Remove some dead code

---
 engines/dreamweb/dreambase.h  | 11 ++++++++++-
 engines/dreamweb/pathfind.cpp | 30 +++++-------------------------
 engines/dreamweb/stubs.cpp    | 24 ++++--------------------
 engines/dreamweb/stubs.h      | 21 ---------------------
 4 files changed, 19 insertions(+), 67 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 727a81ce8b..6ecf94d513 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -119,12 +119,17 @@ public:
 	void obPicture();
 
 	// from pathfind.cpp
-	void checkDest(const RoomPaths *roomsPaths);
+	void turnPathOn(uint8 param);
+	void turnPathOff(uint8 param);
+	void turnAnyPathOn(uint8 param, uint8 room);
+	void turnAnyPathOff(uint8 param, uint8 room);
 	RoomPaths *getRoomsPaths();
 	void faceRightWay();
 	void setWalk();
 	void autoSetWalk();
+	void checkDest(const RoomPaths *roomsPaths);
 	void findXYFromPath();
+	bool checkIfPathIsOn(uint8 index);
 	void bresenhams();
 	void workoutFrames();
 
@@ -273,6 +278,10 @@ public:
 	void getRidOfTempCharset();
 	void getRidOfTempsP();
 	void getRidOfAll();
+	void placeSetObject(uint8 index);
+	void removeSetObject(uint8 index);
+	bool isSetObOnMap(uint8 index);
+	void dumpZoom();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index 212d61e6e2..8d9d9a95bb 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -24,11 +24,7 @@
 
 namespace DreamGen {
 
-void DreamGenContext::turnPathOn() {
-	turnPathOn(al);
-}
-
-void DreamGenContext::turnPathOn(uint8 param) {
+void DreamBase::turnPathOn(uint8 param) {
 	findOrMake(param, 0xff, data.byte(kRoomnum) + 100);
 	PathNode *roomsPaths = getRoomsPaths()->nodes;
 	if (param == 0xff)
@@ -36,11 +32,7 @@ void DreamGenContext::turnPathOn(uint8 param) {
 	roomsPaths[param].on = 0xff;
 }
 
-void DreamGenContext::turnPathOff() {
-	turnPathOff(al);
-}
-
-void DreamGenContext::turnPathOff(uint8 param) {
+void DreamBase::turnPathOff(uint8 param) {
 	findOrMake(param, 0x00, data.byte(kRoomnum) + 100);
 	PathNode *roomsPaths = getRoomsPaths()->nodes;
 	if (param == 0xff)
@@ -48,26 +40,18 @@ void DreamGenContext::turnPathOff(uint8 param) {
 	roomsPaths[param].on = 0x00;
 }
 
-void DreamGenContext::turnAnyPathOn(uint8 param, uint8 room) {
+void DreamBase::turnAnyPathOn(uint8 param, uint8 room) {
 	findOrMake(param, 0xff, room + 100);
 	PathNode *paths = (PathNode *)getSegment(data.word(kReels)).ptr(kPathdata + 144 * room, 0);
 	paths[param].on = 0xff;
 }
 
-void DreamGenContext::turnAnyPathOn() {
-	turnAnyPathOn(al, ah);
-}
-
-void DreamGenContext::turnAnyPathOff(uint8 param, uint8 room) {
+void DreamBase::turnAnyPathOff(uint8 param, uint8 room) {
 	findOrMake(param, 0x00, room + 100);
 	PathNode *paths = (PathNode *)getSegment(data.word(kReels)).ptr(kPathdata + 144 * room, 0);
 	paths[param].on = 0x00;
 }
 
-void DreamGenContext::turnAnyPathOff() {
-	turnAnyPathOff(al, ah);
-}
-
 RoomPaths *DreamBase::getRoomsPaths() {
 	void *result = getSegment(data.word(kReels)).ptr(data.byte(kRoomnum) * 144, 144);
 	return (RoomPaths *)result;
@@ -150,11 +134,7 @@ void DreamBase::findXYFromPath() {
 	data.byte(kRyany) = roomsPaths[data.byte(kManspath)].y - 12;
 }
 
-void DreamGenContext::checkIfPathIsOn() {
-	flags._z = checkIfPathIsOn(al);
-}
-
-bool DreamGenContext::checkIfPathIsOn(uint8 index) {
+bool DreamBase::checkIfPathIsOn(uint8 index) {
 	RoomPaths *roomsPaths = getRoomsPaths();
 	uint8 pathOn = roomsPaths->nodes[index].on;
 	return pathOn == 0xff;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index c353948abb..1c2b70c882 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1462,20 +1462,12 @@ void DreamGenContext::getExPos() {
 	di = kExdata + kNumexobjects * sizeof(DynObject);
 }
 
-void DreamGenContext::placeSetObject() {
-	placeSetObject(al);
-}
-
-void DreamGenContext::placeSetObject(uint8 index) {
+void DreamBase::placeSetObject(uint8 index) {
 	findOrMake(index, 0, 0);
 	getSetAd(index)->mapad[0] = 0;
 }
 
-void DreamGenContext::removeSetObject() {
-	removeSetObject(al);
-}
-
-void DreamGenContext::removeSetObject(uint8 index) {
+void DreamBase::removeSetObject(uint8 index) {
 	findOrMake(index, 0xff, 0);
 	getSetAd(index)->mapad[0] = 0xff;
 }
@@ -2522,10 +2514,6 @@ void DreamBase::setLocation(uint8 index) {
 	data.byte(kRoomscango + index) = 1;
 }
 
-void DreamGenContext::setLocation() {
-	DreamBase::setLocation(al);
-}
-
 const uint8 *DreamBase::getTextInFile1(uint16 index) {
 	SegmentRef text = getSegment(data.word(kTextfile1));
 	uint16 offset = text.word(index * 2) + kTextstart;
@@ -3591,15 +3579,11 @@ void DreamGenContext::moreTalk() {
 	doSomeTalk();
 }
 
-bool DreamGenContext::isSetObOnMap(uint8 index) {
+bool DreamBase::isSetObOnMap(uint8 index) {
 	return (getSetAd(index)->mapad[0] == 0);
 }
 
-void DreamGenContext::isSetObOnMap() {
-	flags._z = isSetObOnMap(al);
-}
-
-void DreamGenContext::dumpZoom() {
+void DreamBase::dumpZoom() {
 	if (data.byte(kZoomon) == 1)
 		multiDump(kZoomx + 5, kZoomy + 4, 46, 40);
 }
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 3330f6f019..bed8cec87d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -93,14 +93,6 @@
 	void lockedDoorway(Sprite *sprite, SetObject *objData);
 	void liftSprite(Sprite *sprite, SetObject *objData);
 	void showGameReel(ReelRoutine *routine);
-	void turnPathOn(uint8 param);
-	void turnPathOff(uint8 param);
-	void turnPathOn();
-	void turnPathOff();
-	void turnAnyPathOn(uint8 param, uint8 room);
-	void turnAnyPathOff(uint8 param, uint8 room);
-	void turnAnyPathOn();
-	void turnAnyPathOff();
 	void makeBackOb(SetObject *objData);
 	void dealWithSpecial(uint8 firstParam, uint8 secondParam);
 	void zoom();
@@ -159,10 +151,6 @@
 	void doChange(uint8 index, uint8 value, uint8 type);
 	void deleteTaken();
 	bool isCD();
-	void placeSetObject();
-	void placeSetObject(uint8 index);
-	void removeSetObject();
-	void removeSetObject(uint8 index);
 	void showAllFree();
 	void showAllEx();
 	bool finishedWalkingCPP();
@@ -184,8 +172,6 @@
 	bool pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y);
 	void checkIfSet();
 	bool checkIfSet(uint8 x, uint8 y);
-	void checkIfPathIsOn();
-	bool checkIfPathIsOn(uint8 index);
 	void isItWorn();
 	bool isItWorn(const DynObject *object) {
 		return DreamBase::isItWorn(object);
@@ -329,10 +315,6 @@
 	void checkFolderCoords();
 	void nextFolder();
 	void lastFolder();
-	void setLocation();
-	void setLocation(uint8 index) {
-		DreamBase::setLocation(index);
-	}
 	void drawFloor();
 	void allocateBuffers();
 	bool checkSpeed(ReelRoutine &routine);
@@ -456,9 +438,6 @@
 	void putBackObStuff();
 	void moreTalk();
 	void redes();
-	void isSetObOnMap();
-	bool isSetObOnMap(uint8 index);
-	void dumpZoom();
 	void selectLocation();
 	void showGroup();
 	void loadSpeech();
-- 
cgit v1.2.3


From 202f9d18f142544339ecd70c13e30243b5325682 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 16 Dec 2011 16:38:21 +0100
Subject: DREAMWEB: Move more things to DreamBase; cleanup some code

---
 engines/dreamweb/dreambase.h | 43 ++++++++++++++++++++++++++-
 engines/dreamweb/keypad.cpp  |  2 +-
 engines/dreamweb/sprite.cpp  | 70 +++++++++++++++++---------------------------
 engines/dreamweb/stubs.cpp   | 35 ++++++++++------------
 engines/dreamweb/stubs.h     | 44 ----------------------------
 engines/dreamweb/use.cpp     | 10 +++----
 6 files changed, 91 insertions(+), 113 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 6ecf94d513..4856ae0487 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -165,13 +165,41 @@ public:
 
 	// from sprite.cpp
 	Sprite *spriteTable();
+	void printSprites();
+	void printASprite(const Sprite *sprite);
+	void clearSprites();
+	Sprite *makeSprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi);
+	void initMan();
+	void walking(Sprite *sprite);
+	void aboutTurn(Sprite *sprite);
+	void backObject(Sprite *sprite);
+	void constant(Sprite *sprite, SetObject *objData);
+	void randomSprite(Sprite *sprite, SetObject *objData);
+	void doorway(Sprite *sprite, SetObject *objData);
+	void wideDoor(Sprite *sprite, SetObject *objData);
+	void doDoor(Sprite *sprite, SetObject *objData, Common::Rect check);
+	void steady(Sprite *sprite, SetObject *objData);
+	void lockedDoorway(Sprite *sprite, SetObject *objData);
+	void liftSprite(Sprite *sprite, SetObject *objData);
+
 	Reel *getReelStart(uint16 reelPointer);
 	const Frame *findSource(uint16 &frame);
 	void showReelFrame(Reel *reel);
+	void showGameReel(ReelRoutine *routine);
 	const Frame *getReelFrameAX(uint16 frame);
+	void moveMap(uint8 param);
+	void checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY);
+
+	uint8 getBlockOfPixel(uint8 x, uint8 y);
+	Rain *splitIntoLines(uint8 x, uint8 y, Rain *rain);
+	void initRain();
+
 	void rollEndCredits();
+	void monks2text();
+	void textForEnd();
+	void textForMonkHelper(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
+	void textForMonk();
 	void priestText(ReelRoutine &routine);
-	void checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY);
 	void soundOnReels(uint16 reelPointer);
 	void clearBeforeLoad();
 	void clearReels();
@@ -179,6 +207,7 @@ public:
 	void liftNoise(uint8 index);
 
 	// from stubs.cpp
+	bool isCD();
 	void crosshair();
 	void delTextLine();
 	void showBlink();
@@ -187,6 +216,8 @@ public:
 	void showPointer();
 	void delPointer();
 	void showRyanPage();
+	void switchRyanOn();
+	void switchRyanOff();
 	Frame *tempGraphics();
 	Frame *tempGraphics2();
 	Frame *tempGraphics3();
@@ -215,6 +246,7 @@ public:
 	void *getAnyAd(uint8 *value1, uint8 *value2);
 	const uint8 *getTextInFile1(uint16 index);
 	uint8 findNextColon(const uint8 **string);
+	void allocateBuffers();
 	uint16 allocateMem(uint16 paragraphs);
 	void deallocateMem(uint16 segment);
 	uint16 allocateAndLoad(unsigned int size);
@@ -282,6 +314,15 @@ public:
 	void removeSetObject(uint8 index);
 	bool isSetObOnMap(uint8 index);
 	void dumpZoom();
+	void diaryKeyP();
+	void diaryKeyN();
+	void findRoomInLoc();
+	void loadMenu();
+	void showMenu();
+	void dumpMenu();
+	void dealWithSpecial(uint8 firstParam, uint8 secondParam);
+	void plotReel(uint16 &reelPointer);
+	void setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 032f01873e..43f6749cad 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -106,7 +106,7 @@ void DreamGenContext::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8
 		{ kKeypadx+9,kKeypadx+30,kKeypady+59,kKeypady+73,&DreamBase::buttonNought },
 		{ kKeypadx+31,kKeypadx+74,kKeypady+59,kKeypady+73,&DreamBase::buttonEnter },
 		{ kKeypadx+72,kKeypadx+86,kKeypady+80,kKeypady+94,&DreamBase::quitKey },
-		{ 0,320,0,200,&DreamGenContext::blank },
+		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
 
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index d82d0f19fc..99b12d1bc8 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -29,7 +29,7 @@ Sprite *DreamBase::spriteTable() {
 	return sprite;
 }
 
-void DreamGenContext::printSprites() {
+void DreamBase::printSprites() {
 	for (size_t priority = 0; priority < 7; ++priority) {
 		Sprite *sprites = spriteTable();
 		for (size_t j = 0; j < 16; ++j) {
@@ -45,7 +45,7 @@ void DreamGenContext::printSprites() {
 	}
 }
 
-void DreamGenContext::printASprite(const Sprite *sprite) {
+void DreamBase::printASprite(const Sprite *sprite) {
 	uint16 x, y;
 	if (sprite->y >= 220) {
 		y = data.word(kMapady) - (256 - sprite->y);
@@ -67,11 +67,11 @@ void DreamGenContext::printASprite(const Sprite *sprite) {
 	showFrame((const Frame *)getSegment(sprite->frameData()).ptr(0, 0), x, y, sprite->frameNumber, c);
 }
 
-void DreamGenContext::clearSprites() {
+void DreamBase::clearSprites() {
 	memset(spriteTable(), 0xff, sizeof(Sprite) * 16);
 }
 
-Sprite *DreamGenContext::makeSprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi) {
+Sprite *DreamBase::makeSprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi) {
 	Sprite *sprite = spriteTable();
 	while (sprite->frameNumber != 0xff) { // NB: No boundchecking in the original code either
 		++sprite;
@@ -111,17 +111,13 @@ void DreamGenContext::spriteUpdate() {
 	}
 }
 
-void DreamGenContext::initMan() {
+void DreamBase::initMan() {
 	Sprite *sprite = makeSprite(data.byte(kRyanx), data.byte(kRyany), addr_mainman, data.word(kMainsprites), 0);
 	sprite->priority = 4;
 	sprite->speed = 0;
 	sprite->walkFrame = 0;
 }
 
-void DreamGenContext::mainMan() {
-	assert(false);
-}
-
 void DreamGenContext::mainMan(Sprite *sprite) {
 	push(es);
 	push(ds);
@@ -186,7 +182,7 @@ void DreamGenContext::mainMan(Sprite *sprite) {
 	es = pop();
 }
 
-void DreamGenContext::walking(Sprite *sprite) {
+void DreamBase::walking(Sprite *sprite) {
 	uint8 comp;
 	if (data.byte(kLinedirection) != 0) {
 		--data.byte(kLinepointer);
@@ -208,14 +204,10 @@ void DreamGenContext::walking(Sprite *sprite) {
 		return;
 	}
 	data.byte(kDestination) = data.byte(kFinaldest);
-	push(es);
-	push(bx);
 	autoSetWalk();
-	bx = pop();
-	es = pop();
 }
 
-void DreamGenContext::aboutTurn(Sprite *sprite) {
+void DreamBase::aboutTurn(Sprite *sprite) {
 	bool incdir = true;
 
 	if (data.byte(kTurndirection) == 1)
@@ -249,11 +241,7 @@ void DreamGenContext::aboutTurn(Sprite *sprite) {
 	}
 }
 
-void DreamGenContext::backObject() {
-	assert(false);
-}
-
-void DreamGenContext::backObject(Sprite *sprite) {
+void DreamBase::backObject(Sprite *sprite) {
 	SetObject *objData = (SetObject *)getSegment(data.word(kSetdat)).ptr(sprite->objData(), 0);
 
 	if (sprite->delay != 0) {
@@ -278,7 +266,7 @@ void DreamGenContext::backObject(Sprite *sprite) {
 		steady(sprite, objData);
 }
 
-void DreamGenContext::constant(Sprite *sprite, SetObject *objData) {
+void DreamBase::constant(Sprite *sprite, SetObject *objData) {
 	++sprite->animFrame;
 	if (objData->frames[sprite->animFrame] == 255) {
 		sprite->animFrame = 0;
@@ -288,22 +276,22 @@ void DreamGenContext::constant(Sprite *sprite, SetObject *objData) {
 	sprite->frameNumber = frame;
 }
 
-void DreamGenContext::randomSprite(Sprite *sprite, SetObject *objData) {
+void DreamBase::randomSprite(Sprite *sprite, SetObject *objData) {
 	uint8 r = engine->randomNumber();
 	sprite->frameNumber = objData->frames[r&7];
 }
 
-void DreamGenContext::doorway(Sprite *sprite, SetObject *objData) {
+void DreamBase::doorway(Sprite *sprite, SetObject *objData) {
 	Common::Rect check(-24, -30, 10, 10);
 	doDoor(sprite, objData, check);
 }
 
-void DreamGenContext::wideDoor(Sprite *sprite, SetObject *objData) {
+void DreamBase::wideDoor(Sprite *sprite, SetObject *objData) {
 	Common::Rect check(-24, -30, 24, 24);
 	doDoor(sprite, objData, check);
 }
 
-void DreamGenContext::doDoor(Sprite *sprite, SetObject *objData, Common::Rect check) {
+void DreamBase::doDoor(Sprite *sprite, SetObject *objData, Common::Rect check) {
 	int ryanx = data.byte(kRyanx);
 	int ryany = data.byte(kRyany);
 
@@ -352,13 +340,13 @@ void DreamGenContext::doDoor(Sprite *sprite, SetObject *objData, Common::Rect ch
 	}
 }
 
-void DreamGenContext::steady(Sprite *sprite, SetObject *objData) {
+void DreamBase::steady(Sprite *sprite, SetObject *objData) {
 	uint8 frame = objData->frames[0];
 	objData->index = frame;
 	sprite->frameNumber = frame;
 }
 
-void DreamGenContext::lockedDoorway(Sprite *sprite, SetObject *objData) {
+void DreamBase::lockedDoorway(Sprite *sprite, SetObject *objData) {
 	int ryanx = data.byte(kRyanx);
 	int ryany = data.byte(kRyany);
 
@@ -409,13 +397,13 @@ void DreamGenContext::lockedDoorway(Sprite *sprite, SetObject *objData) {
 	}
 }
 
-void DreamGenContext::liftSprite(Sprite *sprite, SetObject *objData) {
+void DreamBase::liftSprite(Sprite *sprite, SetObject *objData) {
 	uint8 liftFlag = data.byte(kLiftflag);
 	if (liftFlag == 0) { //liftclosed
 		turnPathOff(data.byte(kLiftpath));
 
 		if (data.byte(kCounttoopen) != 0) {
-			_dec(data.byte(kCounttoopen));
+			data.byte(kCounttoopen)--;
 			if (data.byte(kCounttoopen) == 0)
 				data.byte(kLiftflag) = 3;
 		}
@@ -426,7 +414,7 @@ void DreamGenContext::liftSprite(Sprite *sprite, SetObject *objData) {
 		turnPathOn(data.byte(kLiftpath));
 
 		if (data.byte(kCounttoclose) != 0) {
-			_dec(data.byte(kCounttoclose));
+			data.byte(kCounttoclose)--;
 			if (data.byte(kCounttoclose) == 0)
 				data.byte(kLiftflag) = 2;
 		}
@@ -486,7 +474,7 @@ void DreamBase::showReelFrame(Reel *reel) {
 	showFrame(base, x, y, frame, 8);
 }
 
-void DreamGenContext::showGameReel(ReelRoutine *routine) {
+void DreamBase::showGameReel(ReelRoutine *routine) {
 	uint16 reelPointer = routine->reelPointer();
 	if (reelPointer >= 512)
 		return;
@@ -545,7 +533,7 @@ void DreamGenContext::showRain() {
 	playChannel1(soundIndex);
 }
 
-void DreamGenContext::moveMap(uint8 param) {
+void DreamBase::moveMap(uint8 param) {
 	switch (param) {
 	case 32:
 		data.byte(kMapy) -= 20;
@@ -586,11 +574,7 @@ void DreamBase::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *ty
 	*type = tileData[2];
 }
 
-void DreamGenContext::getBlockOfPixel() {
-	al = getBlockOfPixel(cl, ch);
-}
-
-uint8 DreamGenContext::getBlockOfPixel(uint8 x, uint8 y) {
+uint8 DreamBase::getBlockOfPixel(uint8 x, uint8 y) {
 	uint8 flag, flagEx, type, flagX, flagY;
 	checkOne(x + data.word(kMapxstart), y + data.word(kMapystart), &flag, &flagEx, &type, &flagX, &flagY);
 	if (flag & 1)
@@ -599,7 +583,7 @@ uint8 DreamGenContext::getBlockOfPixel(uint8 x, uint8 y) {
 		return type;
 }
 
-Rain *DreamGenContext::splitIntoLines(uint8 x, uint8 y, Rain *rain) {
+Rain *DreamBase::splitIntoLines(uint8 x, uint8 y, Rain *rain) {
 	do {
 		// Look for line start
 		while (!getBlockOfPixel(x, y)) {
@@ -670,7 +654,7 @@ static const RainLocation rainLocationList[] = {
 	{ 255,0,0,0 }
 };
 
-void DreamGenContext::initRain() {
+void DreamBase::initRain() {
 	const RainLocation *r = rainLocationList;
 	Rain *rainList = (Rain *)getSegment(data.word(kBuffers)).ptr(kRainlist, 0);
 	Rain *rain = rainList;
@@ -799,7 +783,7 @@ void DreamBase::rollEndCredits() {
 }
 
 
-void DreamGenContext::monks2text() {
+void DreamBase::monks2text() {
 	bool isGermanCD = isCD() && engine->getLanguage() == Common::DE_DEU;
 
 	if (data.byte(kIntrocount) == 1)
@@ -836,7 +820,7 @@ void DreamGenContext::monks2text() {
 		setupTimedTemp(18, 82, 36, 160, 120, 1);
 }
 
-void DreamGenContext::textForEnd() {
+void DreamBase::textForEnd() {
 	if (data.byte(kIntrocount) == 20)
 		setupTimedTemp(0, 83, 34, 20, 60, 1);
 	else if (data.byte(kIntrocount) == (isCD() ? 50 : 65))
@@ -845,14 +829,14 @@ void DreamGenContext::textForEnd() {
 		setupTimedTemp(2, 83, 34, 20, 60, 1);
 }
 
-void DreamGenContext::textForMonkHelper(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
+void DreamBase::textForMonkHelper(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
 	if (isCD() && data.byte(kCh1playing) != 255)
 		data.byte(kIntrocount)--;
 	else
 		setupTimedTemp(textIndex, voiceIndex, x, y, countToTimed, timeCount);
 }
 
-void DreamGenContext::textForMonk() {
+void DreamBase::textForMonk() {
 	if (data.byte(kIntrocount) == 1)
 		textForMonkHelper(19, 82, 68, 154, 120, 1);
 	else if (data.byte(kIntrocount) == 5)
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 1c2b70c882..352dec334d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -732,11 +732,11 @@ void DreamGenContext::startup1() {
 	fadeScreenUp();
 }
 
-void DreamGenContext::switchRyanOn() {
+void DreamBase::switchRyanOn() {
 	data.byte(kRyanon) = 255;
 }
 
-void DreamGenContext::switchRyanOff() {
+void DreamBase::switchRyanOff() {
 	data.byte(kRyanon) = 1;
 }
 
@@ -916,7 +916,7 @@ void DreamGenContext::useTimedText() {
 	data.byte(kNeedtodumptimed) = 1;
 }
 
-void DreamGenContext::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
+void DreamBase::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
 #if 1 // if cd
 	if (voiceIndex != 0) {
 		if (loadSpeech('T', voiceIndex, 'T', textIndex)) {
@@ -1110,7 +1110,6 @@ void DreamGenContext::startLoading(const Room &room) {
 	data.byte(kLiftpath) = room.liftPath;
 	data.byte(kDoorpath) = room.doorPath;
 	data.byte(kLastweapon) = (uint8)-1;
-	ah = data.byte(kReallocation);
 	data.byte(kReallocation) = room.realLocation;
 
 	loadRoomData(room, false);
@@ -1131,14 +1130,12 @@ void DreamGenContext::startLoading(const Room &room) {
 	data.byte(kLinepointer) = 254;
 	if (room.b27 != 255) {
 		data.byte(kManspath) = room.b27;
-		push(bx);
 		autoSetWalk();
-		bx = pop();
 	}
 	findXYFromPath();
 }
 
-void DreamGenContext::dealWithSpecial(uint8 firstParam, uint8 secondParam) {
+void DreamBase::dealWithSpecial(uint8 firstParam, uint8 secondParam) {
 	uint8 type = firstParam - 220;
 	if (type == 0) {
 		placeSetObject(secondParam);
@@ -1165,7 +1162,7 @@ void DreamGenContext::dealWithSpecial(uint8 firstParam, uint8 secondParam) {
 	}
 }
 
-void DreamGenContext::plotReel(uint16 &reelPointer) {
+void DreamBase::plotReel(uint16 &reelPointer) {
 	Reel *reel = getReelStart(reelPointer);
 	while (reel->x >= 220 && reel->x != 255) {
 		dealWithSpecial(reel->x, reel->y);
@@ -1810,7 +1807,7 @@ bool DreamBase::isItDescribed(const ObjPos *pos) {
 	return result != 0;
 }
 
-bool DreamGenContext::isCD() {
+bool DreamBase::isCD() {
 	// The original sources has two codepaths depending if the game is 'if cd' or not
 	// This is a hack to guess which version to use with the assumption that if we have a cd version
 	// we managed to load the speech. At least it is isolated in this function and can be changed.
@@ -2208,7 +2205,7 @@ Frame * DreamBase::tempGraphics3() {
 	return (Frame *)getSegment(data.word(kTempgraphics3)).ptr(0, 0);
 }
 
-void DreamGenContext::findRoomInLoc() {
+void DreamBase::findRoomInLoc() {
 	uint8 x = data.byte(kMapx) / 11;
 	uint8 y = data.byte(kMapy) / 10;
 	uint8 roomNum = y * 6 + x;
@@ -2619,7 +2616,7 @@ void DreamGenContext::drawFloor() {
 	data.byte(kNewobs) = 0;
 }
 
-void DreamGenContext::allocateBuffers() {
+void DreamBase::allocateBuffers() {
 	data.word(kExtras) = allocateMem(kLengthofextra/16);
 	data.word(kMapdata) = allocateMem(kLengthofmap/16);
 	data.word(kBuffers) = allocateMem(kLengthofbuffer/16);
@@ -2639,19 +2636,19 @@ void DreamBase::workToScreenM() {
 	delPointer();
 }
 
-void DreamGenContext::loadMenu() {
+void DreamBase::loadMenu() {
 	loadIntoTemp("DREAMWEB.S02"); // sprite name 3
 	loadIntoTemp2("DREAMWEB.G07"); // mon. graphics 2
 }
 
-void DreamGenContext::showMenu() {
+void DreamBase::showMenu() {
 	++data.byte(kMenucount);
 	if (data.byte(kMenucount) == 37*2)
 		data.byte(kMenucount) = 0;
 	showFrame(tempGraphics(), kMenux, kMenuy, data.byte(kMenucount) / 2, 0);
 }
 
-void DreamGenContext::dumpMenu() {
+void DreamBase::dumpMenu() {
 	multiDump(kMenux, kMenuy, 48, 48);
 }
 
@@ -3631,7 +3628,7 @@ void DreamGenContext::selectLocation() {
 			{ 104,124,4,44,&DreamGenContext::lastDest },
 			{ 280,308,4,44,&DreamGenContext::lookAtPlace },
 			{ 104,216,138,192,&DreamGenContext::destSelect },
-			{ 273,320,157,198,&DreamGenContext::getBack1 },
+			{ 273,320,157,198,&DreamBase::getBack1 },
 			{ 0,320,0,200,&DreamBase::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
@@ -3905,7 +3902,7 @@ void DreamGenContext::talk() {
 	workToScreenCPP();
 
 	RectWithCallback talkList[] = {
-		{ 273,320,157,198,&DreamGenContext::getBack1 },
+		{ 273,320,157,198,&DreamBase::getBack1 },
 		{ 240,290,2,44,&DreamGenContext::moreTalk },
 		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
@@ -3984,7 +3981,7 @@ void DreamGenContext::hangOnPQ() {
 	data.byte(kGetback) = 0;
 
 	RectWithCallback quitList[] = {
-		{ 273,320,157,198,&DreamGenContext::getBack1 },
+		{ 273,320,157,198,&DreamBase::getBack1 },
 		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
@@ -4068,7 +4065,7 @@ void DreamGenContext::showGun() {
 	getRidOfTempText();
 }
 
-void DreamGenContext::diaryKeyP() {
+void DreamBase::diaryKeyP() {
 	if (data.byte(kCommandtype) != 214) {
 		data.byte(kCommandtype) = 214;
 		commandOnly(23);
@@ -4088,7 +4085,7 @@ void DreamGenContext::diaryKeyP() {
 		data.byte(kDiarypage) = 11;
 }
 
-void DreamGenContext::diaryKeyN() {
+void DreamBase::diaryKeyN() {
 	if (data.byte(kCommandtype) != 213) {
 		data.byte(kCommandtype) = 213;
 		commandOnly(23);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index bed8cec87d..765b689251 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -25,8 +25,6 @@
 	void screenUpdate();
 	void startup();
 	void startup1();
-	void switchRyanOn();
-	void switchRyanOff();
 	void saveLoad();
 	void hangOnCurs(uint16 frameCount);
 	void hangOnCurs();
@@ -43,7 +41,6 @@
 	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
 		DreamBase::multiDump(x, y, width, height);
 	}
-	void printSprites();
 	void quickQuit();
 	void readOneBlock();
 	void readCityPic();
@@ -60,7 +57,6 @@
 	}
 	void useTimedText();
 	void dumpTimedText();
-	void setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
 	void getUnderTimed();
 	void putUnderTimed();
 	void dumpTextLine();
@@ -72,29 +68,10 @@
 	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag) {
 		DreamBase::showFrame(frameData, x, y, frameNumber, effectsFlag);
 	}
-	void printASprite(const Sprite *sprite);
 	void width160();
-	void clearSprites();
-	Sprite *makeSprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi);
 	void spriteUpdate();
-	void initMan();
 	void mainMan(Sprite *sprite);
-	void mainMan();
-	void walking(Sprite *sprite);
-	void aboutTurn(Sprite *sprite);
-	void backObject(Sprite *sprite);
-	void backObject();
-	void constant(Sprite *sprite, SetObject *objData);
-	void steady(Sprite *sprite, SetObject *objData);
-	void randomSprite(Sprite *sprite, SetObject *objData);
-	void doDoor(Sprite *sprite, SetObject *objData, Common::Rect check);
-	void doorway(Sprite *sprite, SetObject *objData);
-	void wideDoor(Sprite *sprite, SetObject *objData);
-	void lockedDoorway(Sprite *sprite, SetObject *objData);
-	void liftSprite(Sprite *sprite, SetObject *objData);
-	void showGameReel(ReelRoutine *routine);
 	void makeBackOb(SetObject *objData);
-	void dealWithSpecial(uint8 firstParam, uint8 secondParam);
 	void zoom();
 	void showRain();
 	void commandOnly();
@@ -117,7 +94,6 @@
 	void madman(ReelRoutine &routine);
 	void madmanText();
 	void madMode();
-	void moveMap(uint8 param);
 	bool addAlong(const uint8 *mapFlags);
 	bool addLength(const uint8 *mapFlags);
 	void getDimension();
@@ -150,7 +126,6 @@
 	void setAllChanges();
 	void doChange(uint8 index, uint8 value, uint8 type);
 	void deleteTaken();
-	bool isCD();
 	void showAllFree();
 	void showAllEx();
 	bool finishedWalkingCPP();
@@ -199,8 +174,6 @@
 	const uint8 *getObTextStartCPP();
 	void useText(const uint8 *string);
 	void useText();
-	void getBlockOfPixel();
-	uint8 getBlockOfPixel(uint8 x, uint8 y);
 	void examineObText();
 	void showCity();
 	uint16 getPersFrame(uint8 index);
@@ -208,23 +181,14 @@
 	void examineOb(bool examineAgain = true);
 	void dumpWatch();
 	void transferText();
-	void initRain();
-	Rain *splitIntoLines(uint8 x, uint8 y, Rain *rain);
 	void watchCount();
 	void loadRoom();
-	void textForMonk();
-	void textForMonkHelper(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
-	void textForEnd();
-	void monks2text();
 	void intro1Text();
 	void intro2Text();
 	void intro3Text();
 	void readSetData();
 	void fadeupYellows();
 	void fadeupMonFirst();
-	void loadMenu();
-	void showMenu();
-	void dumpMenu();
 	void useMenu();
 	void useMon();
 	void makeCaps();
@@ -247,7 +211,6 @@
 	void playChannel1(uint8 index) {
 		DreamBase::playChannel1(index);
 	}
-	void findRoomInLoc();
 	void reelsOnScreen();
 	void reconstruct();
 	void look();
@@ -316,7 +279,6 @@
 	void nextFolder();
 	void lastFolder();
 	void drawFloor();
-	void allocateBuffers();
 	bool checkSpeed(ReelRoutine &routine);
 	void checkSpeed();
 	void sparkyDrip(ReelRoutine &routine);
@@ -450,10 +412,6 @@
 	void showLoadOps();
 	void watchReel();
 	void showWatchReel();
-	void plotReel(uint16 &reelPointer);
-	void removeFreeObject(uint8 index) {
-		DreamBase::removeFreeObject(index);
-	}
 	void afterNewRoom();
 	void madmanRun();
 	void showDecisions();
@@ -465,8 +423,6 @@
 	void hangOnPQ();
 	void showGun();
 	void endGame();
-	void diaryKeyP();
-	void diaryKeyN();
 	void checkInput();
 	void dropError();
 	void cantDrop();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index b0666bab33..4e956cd016 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -975,7 +975,7 @@ void DreamGenContext::useElvDoor() {
 
 	// Axe on door
 	showPuzText(15, 300);
-	_inc(data.byte(kProgresspoints));
+	data.byte(kProgresspoints)++;
 	data.word(kWatchingtime) = 46 * 2;
 	data.word(kReeltowatch) = 31;
 	data.word(kEndwatchreel) = 77;
@@ -1288,10 +1288,10 @@ void DreamGenContext::useDiary() {
 	data.byte(kGetback) = 0;
 
 	RectWithCallback diaryList[] = {
-		{ kDiaryx+94,kDiaryx+110,kDiaryy+97,kDiaryy+113,&DreamGenContext::diaryKeyN },
-		{ kDiaryx+151,kDiaryx+167,kDiaryy+71,kDiaryy+87,&DreamGenContext::diaryKeyP },
-		{ kDiaryx+176,kDiaryx+192,kDiaryy+108,kDiaryy+124,&DreamGenContext::quitKey },
-		{ 0,320,0,200,&DreamGenContext::blank },
+		{ kDiaryx+94,kDiaryx+110,kDiaryy+97,kDiaryy+113,&DreamBase::diaryKeyN },
+		{ kDiaryx+151,kDiaryx+167,kDiaryy+71,kDiaryy+87,&DreamBase::diaryKeyP },
+		{ kDiaryx+176,kDiaryx+192,kDiaryy+108,kDiaryy+124,&DreamBase::quitKey },
+		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
 	
-- 
cgit v1.2.3


From 010714ce5bf401f3d91e8d410c447b866646c85f Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 16 Dec 2011 17:05:15 +0100
Subject: DREAMWEB: Move more to DreamBase; fix regression in introMonks1()

---
 engines/dreamweb/dreambase.h |  9 +++++++++
 engines/dreamweb/people.cpp  | 28 +++++-----------------------
 engines/dreamweb/sprite.cpp  | 14 +++++++-------
 engines/dreamweb/stubs.h     |  7 -------
 4 files changed, 21 insertions(+), 37 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 4856ae0487..d6b94e013b 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -133,6 +133,11 @@ public:
 	void bresenhams();
 	void workoutFrames();
 
+	// from people.cpp
+	void madMode();
+	void addToPeopleList(ReelRoutine *routine);
+	bool checkSpeed(ReelRoutine &routine);
+
 	// from print.cpp
 	uint8 getNextWord(const Frame *charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount);
 	void printChar(const Frame* charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
@@ -194,6 +199,10 @@ public:
 	Rain *splitIntoLines(uint8 x, uint8 y, Rain *rain);
 	void initRain();
 
+	void intro1Text();
+	void intro2Text(uint16 nextReelPointer);
+	void intro3Text(uint16 nextReelPointer);
+
 	void rollEndCredits();
 	void monks2text();
 	void textForEnd();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index aeb0b5db22..c4f950cbab 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -140,7 +140,7 @@ void DreamGenContext::madman(ReelRoutine &routine) {
 	madMode();
 }
 
-void DreamGenContext::madMode() {
+void DreamBase::madMode() {
 	data.word(kWatchingtime) = 2;
 	data.byte(kPointermode) = 0;
 	if (data.byte(kCombatcount) < (isCD() ? 65 : 63))
@@ -150,7 +150,7 @@ void DreamGenContext::madMode() {
 	data.byte(kPointermode) = 2;
 }
 
-void DreamGenContext::addToPeopleList(ReelRoutine *routine) {
+void DreamBase::addToPeopleList(ReelRoutine *routine) {
 	uint16 routinePointer = (const uint8 *)routine - data.ptr(0, 0);
 
 	People *people = (People *)getSegment(data.word(kBuffers)).ptr(data.word(kListpos), sizeof(People));
@@ -160,12 +160,7 @@ void DreamGenContext::addToPeopleList(ReelRoutine *routine) {
 	data.word(kListpos) += sizeof(People);
 }
 
-void DreamGenContext::checkSpeed() {
-	ReelRoutine *routine = (ReelRoutine *)es.ptr(bx, sizeof(ReelRoutine));
-	flags._z = checkSpeed(*routine);
-}
-
-bool DreamGenContext::checkSpeed(ReelRoutine &routine) {
+bool DreamBase::checkSpeed(ReelRoutine &routine) {
 	if (data.byte(kLastweapon) != (uint8)-1)
 		return true;
 	++routine.counter;
@@ -372,11 +367,7 @@ void DreamGenContext::introMagic1(ReelRoutine &routine) {
 		routine.setReelPointer(nextReelPointer);
 		if (nextReelPointer == 121) {
 			++data.byte(kIntrocount);
-			push(es);
-			push(bx);
 			intro1Text();
-			bx = pop();
-			es = pop();
 			if (data.byte(kIntrocount) == 8) {
 				data.byte(kMapy) += 10;
 				data.byte(kNowinnewroom) = 1;
@@ -462,12 +453,7 @@ void DreamGenContext::gates(ReelRoutine &routine) {
 			nextReelPointer = 119;
 		}
 		routine.setReelPointer(nextReelPointer);
-		push(es);
-		push(bx);
-		ax = nextReelPointer;
-		intro3Text();
-		bx = pop();
-		es = pop();
+		intro3Text(nextReelPointer);
 	}
 	showGameReel(&routine);
 }
@@ -655,11 +641,7 @@ void DreamGenContext::introMonks1(ReelRoutine &routine) {
 			nextReelPointer == 25 || nextReelPointer == 61 ||
 			nextReelPointer == 71) {
 			// Wait step
-			push(es);
-			push(bx);
-			intro2Text();
-			bx = pop();
-			es = pop();
+			intro2Text(nextReelPointer);
 			routine.counter = (uint8)-20;
 		}
 	}
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 99b12d1bc8..cfa204ec23 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -709,7 +709,7 @@ void DreamBase::initRain() {
 	rain->x = 0xff;
 }
 
-void DreamGenContext::intro1Text() {
+void DreamBase::intro1Text() {
 	if (data.byte(kIntrocount) != 2 && data.byte(kIntrocount) != 4 && data.byte(kIntrocount) != 6)
 		return;
 
@@ -725,17 +725,17 @@ void DreamGenContext::intro1Text() {
 	}
 }
 
-void DreamGenContext::intro2Text() {
-	if (ax == 5)
+void DreamBase::intro2Text(uint16 nextReelPointer) {
+	if (nextReelPointer == 5)
 		setupTimedTemp(43, 82, 34, 40, 90, 1);
-	else if (ax == 15)
+	else if (nextReelPointer == 15)
 		setupTimedTemp(44, 82, 34, 40, 90, 1);
 }
 
-void DreamGenContext::intro3Text() {
-	if (ax == 107)
+void DreamBase::intro3Text(uint16 nextReelPointer) {
+	if (nextReelPointer == 107)
 		setupTimedTemp(45, 82, 36, 56, 100, 1);
-	else if (ax == (isCD() ? 108 : 109))
+	else if (nextReelPointer == (isCD() ? 108 : 109))
 		setupTimedTemp(46, 82, 36, 56, 100, 1);
 }
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 765b689251..df55f0579c 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -93,7 +93,6 @@
 	void updatePeople();
 	void madman(ReelRoutine &routine);
 	void madmanText();
-	void madMode();
 	bool addAlong(const uint8 *mapFlags);
 	bool addLength(const uint8 *mapFlags);
 	void getDimension();
@@ -138,7 +137,6 @@
 	void obName();
 	void obName(uint8 command, uint8 commandType);
 	void checkCoords(const RectWithCallback *rectWithCallbacks);
-	void addToPeopleList(ReelRoutine *routine);
 	void getExPos();
 	void compare();
 	bool compare(uint8 index, uint8 flag, const char id[4]) {
@@ -183,9 +181,6 @@
 	void transferText();
 	void watchCount();
 	void loadRoom();
-	void intro1Text();
-	void intro2Text();
-	void intro3Text();
 	void readSetData();
 	void fadeupYellows();
 	void fadeupMonFirst();
@@ -279,8 +274,6 @@
 	void nextFolder();
 	void lastFolder();
 	void drawFloor();
-	bool checkSpeed(ReelRoutine &routine);
-	void checkSpeed();
 	void sparkyDrip(ReelRoutine &routine);
 	void genericPerson(ReelRoutine &routine);
 	void gamer(ReelRoutine &routine);
-- 
cgit v1.2.3


From 8cb92c2367da5a16f4d7ffb68adea9f1bdfd13e8 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 16 Dec 2011 17:20:53 +0100
Subject: DREAMWEB: Convert fadeScreenDownHalf to C++

---
 engines/dreamweb/dreambase.h  |  2 ++
 engines/dreamweb/dreamgen.cpp | 30 ------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.h      |  1 -
 engines/dreamweb/vgafades.cpp | 23 ++++++++++++++++++++++-
 5 files changed, 24 insertions(+), 33 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index d6b94e013b..a6c1abc9cd 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -356,6 +356,8 @@ public:
 	void fadeScreenUpHalf();
 	void fadeScreenDown();
 	void fadeScreenDowns();
+	void fadeScreenDownHalf();
+	void clearPalette();
 	void greyscaleSum();
 	void allPalette();
 	void dumpCurrent();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 906ce3adc3..ea731fcb21 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -285,36 +285,6 @@ void DreamGenContext::transferMap() {
 	_add(data.word(kExframepos), cx);
 }
 
-void DreamGenContext::fadeScreenDownHalf() {
-	STACK_CHECK;
-	palToStartPal();
-	palToEndPal();
-	cx = 768;
-	es = data.word(kBuffers);
-	bx = (0+(228*13)+32+60+(32*32)+(11*10*3)+768);
-halfend:
-	al = es.byte(bx);
-	_shr(al, 1);
-	es.byte(bx) = al;
-	_inc(bx);
-	if (--cx)
-		goto halfend;
-	ds = data.word(kBuffers);
-	es = data.word(kBuffers);
-	si = (0+(228*13)+32+60+(32*32)+(11*10*3))+(56*3);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768)+(56*3);
-	cx = 3*5;
-	_movsb(cx, true);
-	si = (0+(228*13)+32+60+(32*32)+(11*10*3))+(77*3);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768)+(77*3);
-	cx = 3*2;
-	_movsb(cx, true);
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 31;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 32;
-}
-
 void DreamGenContext::rollEm() {
 	STACK_CHECK;
 	cl = 160;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index ddccd5eaad..f22461ef0f 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -487,7 +487,6 @@ public:
 	void doSomeTalk();
 	void resetLocation();
 	void adjustUp();
-	void fadeScreenDownHalf();
 	void outOfOpen();
 	void dirCom();
 	void findFirstPath();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index df55f0579c..79b2244e9c 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -382,7 +382,6 @@
 	void obsThatDoThings();
 	void makeMainScreen();
 	void delEverything();
-	void clearPalette();
 	void errorMessage1();
 	void errorMessage2();
 	void errorMessage3();
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index ca63b7308c..6766d56424 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -184,7 +184,28 @@ void DreamBase::fadeScreenDowns() {
 	data.byte(kNumtofade) = 64;
 }
 
-void DreamGenContext::clearPalette() {
+void DreamBase::fadeScreenDownHalf() {
+	palToStartPal();
+	palToEndPal();
+
+	const uint8 *startPal = startPalette();
+	uint8 *endPal = endPalette();
+	for (int i = 0; i < 256 * 3; ++i) {
+		*endPal >>= 1;
+		endPal++;
+	}
+
+	memcpy(endPal + (56*3), startPal + (56*3), 3*5);
+	memcpy(endPal + (77*3), startPal + (77*3), 3*2);
+
+	data.byte(kFadedirection) = 1;
+	data.byte(kFadecount) = 31;
+	data.byte(kColourpos) = 0;
+	data.byte(kNumtofade) = 32;
+}
+
+
+void DreamBase::clearPalette() {
 	data.byte(kFadedirection) = 0;
 	clearStartPal();
 	dumpCurrent();
-- 
cgit v1.2.3


From 2f0c6712566b757b6527a37bdaf35519a7d42c3e Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 16 Dec 2011 17:11:46 +0100
Subject: DREAMWEB: Move most of people.cpp to DreamBase

---
 engines/dreamweb/dreambase.h |  49 +++++++++++++
 engines/dreamweb/people.cpp  | 168 ++++++++++++++++++++-----------------------
 engines/dreamweb/stubs.h     |  48 -------------
 3 files changed, 126 insertions(+), 139 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index a6c1abc9cd..e64a41d75e 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -134,9 +134,58 @@ public:
 	void workoutFrames();
 
 	// from people.cpp
+	void madmanText();
+	void madman(ReelRoutine &routine);
 	void madMode();
 	void addToPeopleList(ReelRoutine *routine);
 	bool checkSpeed(ReelRoutine &routine);
+	void sparkyDrip(ReelRoutine &routine);
+	void genericPerson(ReelRoutine &routine);
+	void gamer(ReelRoutine &routine);
+	void eden(ReelRoutine &routine);
+	void sparky(ReelRoutine &routine);
+	void rockstar(ReelRoutine &routine);
+	void madmansTelly(ReelRoutine &routine);
+	void smokeBloke(ReelRoutine &routine);
+	void manAsleep(ReelRoutine &routine);
+	void drunk(ReelRoutine &routine);
+	void introMagic1(ReelRoutine &routine);
+	void introMagic2(ReelRoutine &routine);
+	void introMagic3(ReelRoutine &routine);
+	void introMusic(ReelRoutine &routine);
+	void candles(ReelRoutine &routine);
+	void candles1(ReelRoutine &routine);
+	void candles2(ReelRoutine &routine);
+	void smallCandle(ReelRoutine &routine);
+	void gates(ReelRoutine &routine);
+	void security(ReelRoutine &routine);
+	void edenInBath(ReelRoutine &routine);
+	void louis(ReelRoutine &routine);
+	void handClap(ReelRoutine &routine);
+	void carParkDrip(ReelRoutine &routine);
+	void foghornSound(ReelRoutine &routine);
+	void train(ReelRoutine &routine);
+	void attendant(ReelRoutine &routine);
+	void keeper(ReelRoutine &routine);
+	void interviewer(ReelRoutine &routine);
+	void drinker(ReelRoutine &routine);
+	void alleyBarkSound(ReelRoutine &routine);
+	void louisChair(ReelRoutine &routine);
+	void bossMan(ReelRoutine &routine);
+	void priest(ReelRoutine &routine);
+	void monkAndRyan(ReelRoutine &routine);
+	void copper(ReelRoutine &routine);
+	void introMonks1(ReelRoutine &routine);
+	void introMonks2(ReelRoutine &routine);
+	void soldier1(ReelRoutine &routine);
+	void receptionist(ReelRoutine &routine);
+	void bartender(ReelRoutine &routine);
+	void heavy(ReelRoutine &routine);
+	void helicopter(ReelRoutine &routine);
+	//void mugger(ReelRoutine &routine);
+	void businessMan(ReelRoutine &routine);
+	void endGameSeq(ReelRoutine &routine);
+	void poolGuard(ReelRoutine &routine);
 
 	// from print.cpp
 	uint8 getNextWord(const Frame *charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount);
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index c4f950cbab..887a4452ad 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -25,35 +25,35 @@
 namespace DreamGen {
 
 static void (DreamGenContext::*reelCallbacks[57])(ReelRoutine &) = {
-	&DreamGenContext::gamer, &DreamGenContext::sparkyDrip,
-	&DreamGenContext::eden, &DreamGenContext::edenInBath,
-	&DreamGenContext::sparky, &DreamGenContext::smokeBloke,
-	&DreamGenContext::manAsleep, &DreamGenContext::drunk,
-	&DreamGenContext::receptionist, &DreamGenContext::genericPerson /*maleFan*/,
-	&DreamGenContext::genericPerson /*femaleFan*/, &DreamGenContext::louis,
-	&DreamGenContext::louisChair, &DreamGenContext::soldier1,
-	&DreamGenContext::bossMan, &DreamGenContext::interviewer,
-	&DreamGenContext::heavy, &DreamGenContext::manAsleep /*manAsleep2*/,
-	&DreamGenContext::genericPerson /*manSatStill*/, &DreamGenContext::drinker,
-	&DreamGenContext::bartender, &DreamGenContext::genericPerson /*otherSmoker*/,
-	&DreamGenContext::genericPerson /*tattooMan*/, &DreamGenContext::attendant,
-	&DreamGenContext::keeper, &DreamGenContext::candles1,
-	&DreamGenContext::smallCandle, &DreamGenContext::security,
-	&DreamGenContext::copper, &DreamGenContext::poolGuard,
-	&DreamGenContext::rockstar, &DreamGenContext::businessMan,
-	&DreamGenContext::train, &DreamGenContext::genericPerson /*aide*/,
-	&DreamGenContext::mugger, &DreamGenContext::helicopter,
-	&DreamGenContext::introMagic1, &DreamGenContext::introMusic,
-	&DreamGenContext::introMagic2, &DreamGenContext::candles2,
-	&DreamGenContext::gates, &DreamGenContext::introMagic3,
-	&DreamGenContext::introMonks1, &DreamGenContext::candles,
-	&DreamGenContext::introMonks2, &DreamGenContext::handClap,
-	&DreamGenContext::monkAndRyan, &DreamGenContext::endGameSeq,
-	&DreamGenContext::priest, &DreamGenContext::madman,
-	&DreamGenContext::madmansTelly, &DreamGenContext::alleyBarkSound,
-	&DreamGenContext::foghornSound, &DreamGenContext::carParkDrip,
-	&DreamGenContext::carParkDrip, &DreamGenContext::carParkDrip,
-	&DreamGenContext::carParkDrip
+	&DreamBase::gamer, &DreamBase::sparkyDrip,
+	&DreamBase::eden, &DreamBase::edenInBath,
+	&DreamBase::sparky, &DreamBase::smokeBloke,
+	&DreamBase::manAsleep, &DreamBase::drunk,
+	&DreamBase::receptionist, &DreamBase::genericPerson /*maleFan*/,
+	&DreamBase::genericPerson /*femaleFan*/, &DreamBase::louis,
+	&DreamBase::louisChair, &DreamBase::soldier1,
+	&DreamBase::bossMan, &DreamBase::interviewer,
+	&DreamBase::heavy, &DreamBase::manAsleep /*manAsleep2*/,
+	&DreamBase::genericPerson /*manSatStill*/, &DreamBase::drinker,
+	&DreamBase::bartender, &DreamBase::genericPerson /*otherSmoker*/,
+	&DreamBase::genericPerson /*tattooMan*/, &DreamBase::attendant,
+	&DreamBase::keeper, &DreamBase::candles1,
+	&DreamBase::smallCandle, &DreamBase::security,
+	&DreamBase::copper, &DreamBase::poolGuard,
+	&DreamBase::rockstar, &DreamBase::businessMan,
+	&DreamBase::train, &DreamBase::genericPerson /*aide*/,
+	&DreamGenContext::mugger, &DreamBase::helicopter,
+	&DreamBase::introMagic1, &DreamBase::introMusic,
+	&DreamBase::introMagic2, &DreamBase::candles2,
+	&DreamBase::gates, &DreamBase::introMagic3,
+	&DreamBase::introMonks1, &DreamBase::candles,
+	&DreamBase::introMonks2, &DreamBase::handClap,
+	&DreamBase::monkAndRyan, &DreamGenContext::endGameSeq,
+	&DreamBase::priest, &DreamBase::madman,
+	&DreamBase::madmansTelly, &DreamBase::alleyBarkSound,
+	&DreamBase::foghornSound, &DreamBase::carParkDrip,
+	&DreamBase::carParkDrip, &DreamBase::carParkDrip,
+	&DreamBase::carParkDrip
 };
 
 void DreamGenContext::updatePeople() {
@@ -74,7 +74,7 @@ void DreamGenContext::updatePeople() {
 	}
 }
 
-void DreamGenContext::madmanText() {
+void DreamBase::madmanText() {
 	byte origCount;
 
 	if (isCD()) {
@@ -94,7 +94,7 @@ void DreamGenContext::madmanText() {
 	setupTimedTemp(47 + origCount, 82, 72, 80, 90, 1);
 }
 
-void DreamGenContext::madman(ReelRoutine &routine) {
+void DreamBase::madman(ReelRoutine &routine) {
 	data.word(kWatchingtime) = 2;
 	if (checkSpeed(routine)) {
 		uint16 newReelPointer = routine.reelPointer();
@@ -170,17 +170,17 @@ bool DreamBase::checkSpeed(ReelRoutine &routine) {
 	return true;
 }
 
-void DreamGenContext::sparkyDrip(ReelRoutine &routine) {
+void DreamBase::sparkyDrip(ReelRoutine &routine) {
 	if (checkSpeed(routine))
 		playChannel0(14, 0);
 }
 
-void DreamGenContext::genericPerson(ReelRoutine &routine) {
+void DreamBase::genericPerson(ReelRoutine &routine) {
 	showGameReel(&routine);
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::gamer(ReelRoutine &routine) {
+void DreamBase::gamer(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint8 v;
 		do {
@@ -193,14 +193,14 @@ void DreamGenContext::gamer(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::eden(ReelRoutine &routine) {
+void DreamBase::eden(ReelRoutine &routine) {
 	if (data.byte(kGeneraldead))
 		return;
 	showGameReel(&routine);
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::sparky(ReelRoutine &routine) {
+void DreamBase::sparky(ReelRoutine &routine) {
 	if (data.word(kCard1money))
 		routine.b7 = 3;
 	if (checkSpeed(routine)) {
@@ -222,7 +222,7 @@ void DreamGenContext::sparky(ReelRoutine &routine) {
 		data.byte(kTalkedtosparky) = 1;
 }
 
-void DreamGenContext::rockstar(ReelRoutine &routine) {
+void DreamBase::rockstar(ReelRoutine &routine) {
 	if ((routine.reelPointer() == 303) || (routine.reelPointer() == 118)) {
 		data.byte(kNewlocation) = 45;
 		showGameReel(&routine);
@@ -259,7 +259,7 @@ void DreamGenContext::rockstar(ReelRoutine &routine) {
 	}
 }
 
-void DreamGenContext::madmansTelly(ReelRoutine &routine) {
+void DreamBase::madmansTelly(ReelRoutine &routine) {
 	uint16 nextReelPointer = routine.reelPointer() + 1;
 	if (nextReelPointer == 307)
 		nextReelPointer = 300;
@@ -268,7 +268,7 @@ void DreamGenContext::madmansTelly(ReelRoutine &routine) {
 }
 
 
-void DreamGenContext::smokeBloke(ReelRoutine &routine) {
+void DreamBase::smokeBloke(ReelRoutine &routine) {
 	if (data.byte(kRockstardead) == 0) {
 		if (routine.b7 & 128)
 			DreamBase::setLocation(5);
@@ -288,20 +288,20 @@ void DreamGenContext::smokeBloke(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::manAsleep(ReelRoutine &routine) {
+void DreamBase::manAsleep(ReelRoutine &routine) {
 	routine.b7 &= 127;
 	showGameReel(&routine);
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::attendant(ReelRoutine &routine) {
+void DreamBase::attendant(ReelRoutine &routine) {
 	showGameReel(&routine);
 	addToPeopleList(&routine);
 	if (routine.b7 & 128)
 		data.byte(kTalkedtoattendant) = 1;
 }
 
-void DreamGenContext::keeper(ReelRoutine &routine) {
+void DreamBase::keeper(ReelRoutine &routine) {
 	if (data.byte(kKeeperflag) != 0) {
 		// Not waiting
 		addToPeopleList(&routine);
@@ -318,7 +318,7 @@ void DreamGenContext::keeper(ReelRoutine &routine) {
 		routine.b7 = data.byte(kDreamnumber);
 }
 
-void DreamGenContext::drunk(ReelRoutine &routine) {
+void DreamBase::drunk(ReelRoutine &routine) {
 	if (data.byte(kGeneraldead))
 		return;
 	routine.b7 &= 127;
@@ -326,7 +326,7 @@ void DreamGenContext::drunk(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::interviewer(ReelRoutine &routine) {
+void DreamBase::interviewer(ReelRoutine &routine) {
 	if (data.word(kReeltowatch) == 68)
 		routine.incReelPointer();
 
@@ -336,7 +336,7 @@ void DreamGenContext::interviewer(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamGenContext::drinker(ReelRoutine &routine) {
+void DreamBase::drinker(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		routine.incReelPointer();
 
@@ -349,7 +349,7 @@ void DreamGenContext::drinker(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::alleyBarkSound(ReelRoutine &routine) {
+void DreamBase::alleyBarkSound(ReelRoutine &routine) {
 	uint16 prevReelPointer = routine.reelPointer() - 1;
 	if (prevReelPointer == 0) {
 		playChannel1(14);
@@ -359,7 +359,7 @@ void DreamGenContext::alleyBarkSound(ReelRoutine &routine) {
 	}
 }
 
-void DreamGenContext::introMagic1(ReelRoutine &routine) {
+void DreamBase::introMagic1(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 145)
@@ -377,7 +377,7 @@ void DreamGenContext::introMagic1(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamGenContext::introMagic2(ReelRoutine &routine) {
+void DreamBase::introMagic2(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 216)
@@ -387,7 +387,7 @@ void DreamGenContext::introMagic2(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamGenContext::introMagic3(ReelRoutine &routine) {
+void DreamBase::introMagic3(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 218)
@@ -398,7 +398,7 @@ void DreamGenContext::introMagic3(ReelRoutine &routine) {
 	routine.mapX = data.byte(kMapx);
 }
 
-void DreamGenContext::candles1(ReelRoutine &routine) {
+void DreamBase::candles1(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 44)
@@ -408,7 +408,7 @@ void DreamGenContext::candles1(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamGenContext::candles2(ReelRoutine &routine) {
+void DreamBase::candles2(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 238)
@@ -418,7 +418,7 @@ void DreamGenContext::candles2(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamGenContext::smallCandle(ReelRoutine &routine) {
+void DreamBase::smallCandle(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 37)
@@ -428,10 +428,10 @@ void DreamGenContext::smallCandle(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamGenContext::introMusic(ReelRoutine &routine) {
+void DreamBase::introMusic(ReelRoutine &routine) {
 }
 
-void DreamGenContext::candles(ReelRoutine &routine) {
+void DreamBase::candles(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 167)
@@ -441,7 +441,7 @@ void DreamGenContext::candles(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamGenContext::gates(ReelRoutine &routine) {
+void DreamBase::gates(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 116)
@@ -458,7 +458,7 @@ void DreamGenContext::gates(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamGenContext::security(ReelRoutine &routine) {
+void DreamBase::security(ReelRoutine &routine) {
 	if (routine.reelPointer() == 32) {
 		if (data.byte(kLastweapon) == 1) {
 			data.word(kWatchingtime) = 10;
@@ -478,7 +478,7 @@ void DreamGenContext::security(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::edenInBath(ReelRoutine &routine) {
+void DreamBase::edenInBath(ReelRoutine &routine) {
 	if (data.byte(kGeneraldead) == 0 || data.byte(kSartaindead) != 0)
 		return;
 
@@ -486,7 +486,7 @@ void DreamGenContext::edenInBath(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::louis(ReelRoutine &routine) {
+void DreamBase::louis(ReelRoutine &routine) {
 	if (data.byte(kRockstardead) != 0)
 		return;
 
@@ -494,26 +494,26 @@ void DreamGenContext::louis(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::handClap(ReelRoutine &routine) {
+void DreamBase::handClap(ReelRoutine &routine) {
 }
 
-void DreamGenContext::carParkDrip(ReelRoutine &routine) {
+void DreamBase::carParkDrip(ReelRoutine &routine) {
 	if (!checkSpeed(routine))
 		return; // cantdrip2
 
 	playChannel1(14);
 }
 
-void DreamGenContext::foghornSound(ReelRoutine &routine) {
+void DreamBase::foghornSound(ReelRoutine &routine) {
 	if (engine->randomNumber() == 198)
 		playChannel1(13);
 }
 
-void DreamGenContext::train(ReelRoutine &routine) {
+void DreamBase::train(ReelRoutine &routine) {
 	// The original code has logic for this, but it is disabled
 }
 
-void DreamGenContext::louisChair(ReelRoutine &routine) {
+void DreamBase::louisChair(ReelRoutine &routine) {
 	if (data.byte(kRockstardead) == 0)
 		return; // notlouis2
 
@@ -535,7 +535,7 @@ void DreamGenContext::louisChair(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::bossMan(ReelRoutine &routine) {
+void DreamBase::bossMan(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 
@@ -561,7 +561,7 @@ void DreamGenContext::bossMan(ReelRoutine &routine) {
 		data.byte(kTalkedtoboss) = 1;
 }
 
-void DreamGenContext::priest(ReelRoutine &routine) {
+void DreamBase::priest(ReelRoutine &routine) {
 	if (routine.reelPointer() == 8)
 		return; // priestspoken
 
@@ -582,7 +582,7 @@ void DreamBase::priestText(ReelRoutine &routine) {
 	setupTimedUse((reel >> 1) + 50, 54, 1, 72, 80);
 }
 
-void DreamGenContext::monkAndRyan(ReelRoutine &routine) {
+void DreamBase::monkAndRyan(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 83) {
@@ -602,7 +602,7 @@ void DreamGenContext::monkAndRyan(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamGenContext::copper(ReelRoutine &routine) {
+void DreamBase::copper(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 94) {
@@ -620,7 +620,7 @@ void DreamGenContext::copper(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::introMonks1(ReelRoutine &routine) {
+void DreamBase::introMonks1(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 
@@ -650,16 +650,12 @@ void DreamGenContext::introMonks1(ReelRoutine &routine) {
 	routine.mapY = data.byte(kMapy);
 }
 
-void DreamGenContext::introMonks2(ReelRoutine &routine) {
+void DreamBase::introMonks2(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 87) {
 			data.byte(kIntrocount)++;
-			push(es);
-			push(bx);
 			monks2text();
-			bx = pop();
-			es = pop();
 
 			if (data.byte(kIntrocount), 19)
 				nextReelPointer = 87;
@@ -669,11 +665,7 @@ void DreamGenContext::introMonks2(ReelRoutine &routine) {
 
 		if (nextReelPointer == 110) {
 			data.byte(kIntrocount)++;
-			push(es);
-			push(bx);
 			monks2text();
-			bx = pop();
-			es = pop();
 		
 			if (data.byte(kIntrocount) == 35)
 				nextReelPointer = 111;
@@ -691,7 +683,7 @@ void DreamGenContext::introMonks2(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamGenContext::soldier1(ReelRoutine &routine) {
+void DreamBase::soldier1(ReelRoutine &routine) {
 	if (routine.reelPointer() != 0) {
 		data.word(kWatchingtime) = 10;
 		if (routine.reelPointer() == 30) {
@@ -714,7 +706,7 @@ void DreamGenContext::soldier1(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::receptionist(ReelRoutine &routine) {
+void DreamBase::receptionist(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		if (data.byte(kCardpassflag) == 1) {
 			// Set card
@@ -751,7 +743,7 @@ void DreamGenContext::receptionist(ReelRoutine &routine) {
 		data.byte(kTalkedtorecep) = 1;
 }
 
-void DreamGenContext::bartender(ReelRoutine &routine) {
+void DreamBase::bartender(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		if (routine.reelPointer() == 86) {
 			if (engine->randomNumber() >= 18)
@@ -772,7 +764,7 @@ void DreamGenContext::bartender(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::heavy(ReelRoutine &routine) {
+void DreamBase::heavy(ReelRoutine &routine) {
 	routine.b7 &= 127;
 	if (routine.reelPointer() != 43) {
 		data.word(kWatchingtime) = 10;
@@ -796,7 +788,7 @@ void DreamGenContext::heavy(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamGenContext::helicopter(ReelRoutine &routine) {
+void DreamBase::helicopter(ReelRoutine &routine) {
 	if (routine.reelPointer() == 203) {
 		// Won helicopter
 		data.byte(kPointermode) = 0;
@@ -881,7 +873,7 @@ void DreamGenContext::mugger(ReelRoutine &routine) {
 	}
 }
 
-void DreamGenContext::businessMan(ReelRoutine &routine) {
+void DreamBase::businessMan(ReelRoutine &routine) {
 	data.byte(kPointermode) = 0;
 	data.word(kWatchingtime) = 2;
 	if (routine.reelPointer() == 2) {
@@ -945,7 +937,7 @@ void DreamGenContext::businessMan(ReelRoutine &routine) {
 	}
 }
 
-void DreamGenContext::endGameSeq(ReelRoutine &routine) {
+void DreamBase::endGameSeq(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 51 && data.byte(kIntrocount) != 140) {
@@ -956,13 +948,7 @@ void DreamGenContext::endGameSeq(ReelRoutine &routine) {
 
 		routine.setReelPointer(nextReelPointer);
 		if (nextReelPointer == 134) {
-			push(es);
-			push(bx);
-			push(ax);
 			fadeScreenDownHalf();
-			ax = pop();
-			bx = pop();
-			es = pop();
 		} else if (nextReelPointer == 324) {
 			fadeScreenDowns();
 			data.byte(kVolumeto) = 7;
@@ -982,7 +968,7 @@ void DreamGenContext::endGameSeq(ReelRoutine &routine) {
 	}
 }
 
-void DreamGenContext::poolGuard(ReelRoutine &routine) {
+void DreamBase::poolGuard(ReelRoutine &routine) {
 	if (routine.reelPointer() == 214 || routine.reelPointer() == 258) {
 		// Combat over 2
 		showGameReel(&routine);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 79b2244e9c..c3d72a6d02 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -91,8 +91,6 @@
 	void commandWithOb();
 	void commandWithOb(uint8 command, uint8 type, uint8 index);
 	void updatePeople();
-	void madman(ReelRoutine &routine);
-	void madmanText();
 	bool addAlong(const uint8 *mapFlags);
 	bool addLength(const uint8 *mapFlags);
 	void getDimension();
@@ -274,53 +272,7 @@
 	void nextFolder();
 	void lastFolder();
 	void drawFloor();
-	void sparkyDrip(ReelRoutine &routine);
-	void genericPerson(ReelRoutine &routine);
-	void gamer(ReelRoutine &routine);
-	void eden(ReelRoutine &routine);
-	void sparky(ReelRoutine &routine);
-	void rockstar(ReelRoutine &routine);
-	void madmansTelly(ReelRoutine &routine);
-	void smokeBloke(ReelRoutine &routine);
-	void manAsleep(ReelRoutine &routine);
-	void drunk(ReelRoutine &routine);
-	void introMagic1(ReelRoutine &routine);
-	void introMagic2(ReelRoutine &routine);
-	void introMagic3(ReelRoutine &routine);
-	void introMusic(ReelRoutine &routine);
-	void candles(ReelRoutine &routine);
-	void candles1(ReelRoutine &routine);
-	void candles2(ReelRoutine &routine);
-	void smallCandle(ReelRoutine &routine);
-	void gates(ReelRoutine &routine);
-	void security(ReelRoutine &routine);
-	void edenInBath(ReelRoutine &routine);
-	void louis(ReelRoutine &routine);
-	void handClap(ReelRoutine &routine);
-	void carParkDrip(ReelRoutine &routine);
-	void foghornSound(ReelRoutine &routine);
-	void train(ReelRoutine &routine);
-	void attendant(ReelRoutine &routine);
-	void keeper(ReelRoutine &routine);
-	void interviewer(ReelRoutine &routine);
-	void drinker(ReelRoutine &routine);
-	void alleyBarkSound(ReelRoutine &routine);
-	void louisChair(ReelRoutine &routine);
-	void bossMan(ReelRoutine &routine);
-	void priest(ReelRoutine &routine);
-	void monkAndRyan(ReelRoutine &routine);
-	void copper(ReelRoutine &routine);
-	void introMonks1(ReelRoutine &routine);
-	void introMonks2(ReelRoutine &routine);
-	void soldier1(ReelRoutine &routine);
-	void receptionist(ReelRoutine &routine);
-	void bartender(ReelRoutine &routine);
-	void heavy(ReelRoutine &routine);
-	void helicopter(ReelRoutine &routine);
 	void mugger(ReelRoutine &routine);
-	void businessMan(ReelRoutine &routine);
-	void endGameSeq(ReelRoutine &routine);
-	void poolGuard(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void loadSaveBox();
 	uint8 nextSymbol(uint8 symbol);
-- 
cgit v1.2.3


From 1d09f7c12a79416349cb33a7de88792c85ada5c1 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 16 Dec 2011 18:10:27 +0100
Subject: DREAMWEB: Some more cleanup

---
 engines/dreamweb/dreambase.h |  7 +++++
 engines/dreamweb/stubs.cpp   | 64 ++++++++++++--------------------------------
 engines/dreamweb/stubs.h     |  9 -------
 3 files changed, 24 insertions(+), 56 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index e64a41d75e..20cafcb203 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -381,6 +381,13 @@ public:
 	void dealWithSpecial(uint8 firstParam, uint8 secondParam);
 	void plotReel(uint16 &reelPointer);
 	void setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
+	void getUnderTimed();
+	void putUnderTimed();
+	void dumpTextLine();
+	void useTimedText();
+	void dumpTimedText();
+	void getTime();
+	void doChange(uint8 index, uint8 value, uint8 type);
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 352dec334d..3a9785e586 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -801,10 +801,6 @@ void DreamGenContext::seeCommandTail() {
 	data.byte(kBrightness) = 1;
 }
 
-void DreamGenContext::randomNumber() {
-	al = engine->randomNumber();
-}
-
 void DreamGenContext::quickQuit() {
 	engine->quit();
 }
@@ -829,7 +825,7 @@ uint16 DreamBase::readMouseState() {
 	return state;
 }
 
-void DreamGenContext::dumpTextLine() {
+void DreamBase::dumpTextLine() {
 	if (data.byte(kNewtextline) != 1)
 		return;
 	data.byte(kNewtextline) = 0;
@@ -840,22 +836,18 @@ void DreamGenContext::dumpTextLine() {
 	multiDump(x, y, 228, 13);
 }
 
-void DreamGenContext::getUnderTimed() {
+void DreamBase::getUnderTimed() {
 	uint16 y = data.byte(kTimedy);
 	if (data.byte(kForeignrelease))
 		y -= 3;
-	ds = data.word(kBuffers);
-	si = kUndertimedtext;
-	multiGet(ds.ptr(si, 0), data.byte(kTimedx), y, 240, kUndertimedysize);
+	multiGet(getSegment(data.word(kBuffers)).ptr(kUndertimedtext, 0), data.byte(kTimedx), y, 240, kUndertimedysize);
 }
 
-void DreamGenContext::putUnderTimed() {
+void DreamBase::putUnderTimed() {
 	uint16 y = data.byte(kTimedy);
 	if (data.byte(kForeignrelease))
 		y -= 3;
-	ds = data.word(kBuffers);
-	si = kUndertimedtext;
-	multiPut(ds.ptr(si, 0), data.byte(kTimedx), y, 240, kUndertimedysize);
+	multiPut(getSegment(data.word(kBuffers)).ptr(kUndertimedtext, 0), data.byte(kTimedx), y, 240, kUndertimedysize);
 }
 
 void DreamBase::getUnderCentre() {
@@ -893,7 +885,7 @@ void DreamGenContext::processTrigger() {
 	}
 }
 
-void DreamGenContext::useTimedText() {
+void DreamBase::useTimedText() {
 	if (data.word(kTimecount) == 0)
 		return;
 	--data.word(kTimecount);
@@ -908,9 +900,7 @@ void DreamGenContext::useTimedText() {
 	else if (data.word(kTimecount) > data.word(kCounttotimed))
 		return;
 
-	es = data.word(kTimedseg);
-	si = data.word(kTimedoffset);
-	const uint8 *string = es.ptr(si, 0);
+	const uint8 *string = getSegment(data.word(kTimedseg)).ptr(data.word(kTimedoffset), 0);
 	uint16 y = data.byte(kTimedy);
 	printDirect(&string, data.byte(kTimedx), &y, 237, true);
 	data.byte(kNeedtodumptimed) = 1;
@@ -943,7 +933,7 @@ void DreamBase::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8
 	debug(1, "setupTimedTemp: (%d, %d) => '%s'", textIndex, voiceIndex, string);
 }
 
-void DreamGenContext::dumpTimedText() {
+void DreamBase::dumpTimedText() {
 	if (data.byte(kNeedtodumptimed) != 1)
 		return;
 	uint8 y = data.byte(kTimedy);
@@ -954,16 +944,13 @@ void DreamGenContext::dumpTimedText() {
 	data.byte(kNeedtodumptimed) = 0;
 }
 
-void DreamGenContext::getTime() {
+void DreamBase::getTime() {
 	TimeDate t;
 	g_system->getTimeAndDate(t);
 	debug(1, "\tgettime: %02d:%02d:%02d", t.tm_hour, t.tm_min, t.tm_sec);
-	ch = t.tm_hour;
-	cl = t.tm_min;
-	dh = t.tm_sec;
-	data.byte(kSecondcount) = dh;
-	data.byte(kMinutecount) = cl;
-	data.byte(kHourcount) = ch;
+	data.byte(kSecondcount) = t.tm_sec;
+	data.byte(kMinutecount) = t.tm_min;
+	data.byte(kHourcount) = t.tm_hour;
 }
 
 uint16 DreamBase::allocateMem(uint16 paragraphs) {
@@ -979,12 +966,6 @@ void DreamBase::deallocateMem(uint16 segment) {
 	debug(1, "deallocating segment %04x", segment);
 	deallocateSegment(segment);
 
-
-	// FIXME: The following line used to be enabled with the comment: "fixing
-	// invalid entries in the sprite table"
-	// So if there are regressions with sprites, we may want to investigate this
-	// closer.
-//	es = data;
 	uint tsize = 16 * 32;
 	uint16 bseg = data.word(kBuffers);
 	if (!bseg)
@@ -1119,10 +1100,6 @@ void DreamGenContext::startLoading(const Room &room) {
 	setAllChanges();
 	autoAppear();
 //	const Room &newRoom = g_roomData[data.byte(kNewlocation)];
-	bx = 0x7fff; // TODO: bx used to be set to the offset of newRoom
-	             // It seems to be unused (like newRoom itself), but set it
-	             // to an invalid value to catch any missed use of it.
-	             // (The push/pop of bx below is likely also unnecessary)
 	data.byte(kLastweapon) = (uint8)-1;
 	data.byte(kMandead) = 0;
 	data.word(kLookcounter) = 160;
@@ -1295,10 +1272,6 @@ const uint8 *DreamGenContext::findObName(uint8 type, uint8 index) {
 	}
 }
 
-void DreamGenContext::copyName() {
-	copyName(ah, al, data.ptr(di, 0));
-}
-
 void DreamGenContext::copyName(uint8 type, uint8 index, uint8 *dst) {
 	const uint8 *src = findObName(type, index);
 	size_t i;
@@ -1419,7 +1392,7 @@ SetObject *DreamBase::getSetAd(uint8 index) {
 	return (SetObject *)getSegment(data.word(kSetdat)).ptr(0, 0) + index;
 }
 
-void DreamGenContext::doChange(uint8 index, uint8 value, uint8 type) {
+void DreamBase::doChange(uint8 index, uint8 value, uint8 type) {
 	if (type == 0) { //object
 		getSetAd(index)->mapad[0] = value;
 	} else if (type == 1) { //freeObject
@@ -1427,9 +1400,9 @@ void DreamGenContext::doChange(uint8 index, uint8 value, uint8 type) {
 		if (freeObject->mapad[0] == 0xff)
 			freeObject->mapad[0] = value;
 	} else { //path
-		bx = kPathdata + (type - 100) * 144 + index * 8;
-		es = data.word(kReels);
-		es.byte(bx+6) = value;
+//		getSegment(data.word(kReels)).byte(kPathdata + (type - 100) * 144 + index * 8 + 6) = value;
+		PathNode *paths = (PathNode *)getSegment(data.word(kReels)).ptr(kPathdata + 144 * (type - 100), 0);
+		paths[index].on = value;
 	}
 }
 
@@ -3922,11 +3895,8 @@ void DreamGenContext::talk() {
 			break;
 	} while (!data.byte(kGetback));
 
-	bx = data.word(kPersondata);
-	es = cs;
-
 	if (data.byte(kTalkpos) >= 4)
-		es.byte(bx+7) |= 128;
+		data.byte(data.word(kPersondata)+7) |= 128;
 
 	redrawMainScrn();
 	workToScreenM();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index c3d72a6d02..ddaa66fa47 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -46,7 +46,6 @@
 	void readCityPic();
 	void readDestIcon();
 	void seeCommandTail();
-	void randomNumber();
 	void quickQuit2();
 	void printDirect();
 	uint8 printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered) {
@@ -55,11 +54,6 @@
 	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 		return DreamBase::printDirect(string, x, y, maxWidth, centered);
 	}
-	void useTimedText();
-	void dumpTimedText();
-	void getUnderTimed();
-	void putUnderTimed();
-	void dumpTextLine();
 	void startLoading(const Room &room);
 	void showFrame();
 	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
@@ -86,7 +80,6 @@
 	void checkIfEx();
 	bool checkIfEx(uint8 x, uint8 y);
 	const uint8 *findObName(uint8 type, uint8 index);
-	void copyName();
 	void copyName(uint8 type, uint8 index, uint8 *dst);
 	void commandWithOb();
 	void commandWithOb(uint8 command, uint8 type, uint8 index);
@@ -121,7 +114,6 @@
 		return DreamBase::getSetAd(index);
 	}
 	void setAllChanges();
-	void doChange(uint8 index, uint8 value, uint8 type);
 	void deleteTaken();
 	void showAllFree();
 	void showAllEx();
@@ -350,7 +342,6 @@
 	bool loadSpeech(byte type1, int idx1, byte type2, int idx2) {
 		return DreamBase::loadSpeech(type1, idx1, type2, idx2);
 	}
-	void getTime();
 	void set16ColPalette();
 	void showSaveOps();
 	void showLoadOps();
-- 
cgit v1.2.3


From 12cac260c9acb16180ab4414fecd5748d77886f3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 16 Dec 2011 22:04:47 +0200
Subject: DREAMWEB: Port 'isryanholding' to C++

---
 engines/dreamweb/dreamgen.cpp | 38 --------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.cpp    | 20 ++++++++++++++++++++
 engines/dreamweb/stubs.h      |  2 ++
 engines/dreamweb/use.cpp      |  8 +-------
 5 files changed, 23 insertions(+), 46 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index ea731fcb21..0938efca37 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2937,44 +2937,6 @@ doselob:
 	useRoutine();
 }
 
-void DreamGenContext::isRyanHolding() {
-	STACK_CHECK;
-	_sub(al, 'A');
-	_sub(ah, 'A');
-	_sub(cl, 'A');
-	_sub(ch, 'A');
-	es = data.word(kExtras);
-	bx = (0+2080+30000);
-	dl = 0;
-searchinv:
-	_cmp(es.byte(bx+2), 4);
-	if (!flags.z())
-		goto nofindininv;
-	_cmp(al, es.byte(bx+12));
-	if (!flags.z())
-		goto nofindininv;
-	_cmp(ah, es.byte(bx+13));
-	if (!flags.z())
-		goto nofindininv;
-	_cmp(cl, es.byte(bx+14));
-	if (!flags.z())
-		goto nofindininv;
-	_cmp(ch, es.byte(bx+15));
-	if (!flags.z())
-		goto nofindininv;
-	al = dl;
-	_cmp(al, (114));
-	return;
-nofindininv:
-	_add(bx, 16);
-	_inc(dl);
-	_cmp(dl, (114));
-	if (!flags.z())
-		goto searchinv;
-	al = dl;
-	_cmp(al, (114));
-}
-
 void DreamGenContext::checkInside() {
 	STACK_CHECK;
 	es = data.word(kExtras);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f22461ef0f..f3cedd890d 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -480,7 +480,6 @@ public:
 	void clearBuffers();
 	void getObTextStart();
 	void checkObjectSize();
-	void isRyanHolding();
 	void fillOpen();
 	void useCashCard();
 	void moneyPoke();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 3a9785e586..2279d9ffbe 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1774,6 +1774,26 @@ uint16 DreamGenContext::findExObject(const char *id) {
 	return kNumexobjects;
 }
 
+void DreamGenContext::isRyanHolding() {
+	char id[5];
+	id[0] = al;
+	id[1] = ah;
+	id[2] = cl;
+	id[3] = ch;
+	id[4] = '\0';
+	flags._z = isRyanHolding(id);
+}
+
+bool DreamGenContext::isRyanHolding(const char *id) {
+	for (uint16 index = 0; index < kNumexobjects; index++) {
+		DynObject *object = getExAd(index);
+		if (object->mapad[0] == 4 && objectMatches(object, id))
+			return (index == kNumexobjects);
+	}
+
+	return false;
+}
+
 bool DreamBase::isItDescribed(const ObjPos *pos) {
 	uint16 offset = getSegment(data.word(kSetdesc)).word(kSettextdat + pos->index * 2);
 	uint8 result = getSegment(data.word(kSetdesc)).byte(kSettext + offset);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index ddaa66fa47..d3f656db45 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -383,6 +383,8 @@
 	uint16 findSetObject(const char *id);
 	void findExObject();
 	uint16 findExObject(const char *id);
+	void isRyanHolding();
+	bool isRyanHolding(const char *id);
 	void describeOb();
 	void getOpenedSize();
 	byte getOpenedSizeCPP();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 4e956cd016..385bfbb101 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -625,13 +625,7 @@ void DreamGenContext::sLabDoorB() {
 		data.byte(kWatchspeed) = 1;
 		data.byte(kSpeedcount) = 1;
 	} else {
-		al = 'S';
-		ah = 'H';
-		cl = 'L';
-		ch = 'D';
-		isRyanHolding();
-
-		if (flags.z()) {
+		if (isRyanHolding("SHLD")) {
 			// No crystal
 			showPuzText(44, 200);
 			putBackObStuff();
-- 
cgit v1.2.3


From 984010faae5d7cac0cef8f74229f9761cf7dd934 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 16 Dec 2011 22:29:41 +0200
Subject: DREAMWEB: Port 'identifyob' to C++

---
 engines/dreamweb/dreamgen.cpp | 63 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  5 ++--
 engines/dreamweb/object.cpp   | 38 ++++++++++++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 41 insertions(+), 66 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 0938efca37..ddc599f7e8 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3104,69 +3104,6 @@ void DreamGenContext::clearChanges() {
 	_stosw(cx, true);
 }
 
-void DreamGenContext::identifyOb() {
-	STACK_CHECK;
-	_cmp(data.word(kWatchingtime), 0);
-	if (!flags.z())
-		{ blank(); return; };
-	ax = data.word(kMousex);
-	_sub(ax, data.word(kMapadx));
-	_cmp(ax, 22*8);
-	if (flags.c())
-		goto notover1;
-	blank();
-	return;
-notover1:
-	bx = data.word(kMousey);
-	_sub(bx, data.word(kMapady));
-	_cmp(bx, 20*8);
-	if (flags.c())
-		goto notover2;
-	blank();
-	return;
-notover2:
-	data.byte(kInmaparea) = 1;
-	ah = bl;
-	push(ax);
-	findPathOfPoint();
-	data.byte(kPointerspath) = dl;
-	ax = pop();
-	push(ax);
-	findFirstPath();
-	data.byte(kPointerfirstpath) = al;
-	ax = pop();
-	checkIfEx();
-	if (!flags.z())
-		return /* (finishidentify) */;
-	checkIfFree();
-	if (!flags.z())
-		return /* (finishidentify) */;
-	checkIfPerson();
-	if (!flags.z())
-		return /* (finishidentify) */;
-	checkIfSet();
-	if (!flags.z())
-		return /* (finishidentify) */;
-	ax = data.word(kMousex);
-	_sub(ax, data.word(kMapadx));
-	cl = al;
-	ax = data.word(kMousey);
-	_sub(ax, data.word(kMapady));
-	ch = al;
-	checkOne();
-	_cmp(al, 0);
-	if (flags.z())
-		goto nothingund;
-	_cmp(data.byte(kMandead), 1);
-	if (flags.z())
-		goto nothingund;
-	ah = 3;
-	obName();
-	return;
-nothingund:
-	blank();
-}
-
 void DreamGenContext::findPathOfPoint() {
 	STACK_CHECK;
 	push(ax);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f3cedd890d..5273270ce5 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -475,12 +475,11 @@ public:
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
 	void fadeDownMon();
-	void identifyOb();
 	void getPersonText();
 	void clearBuffers();
 	void getObTextStart();
 	void checkObjectSize();
-	void fillOpen();
+	void showSlots();
 	void useCashCard();
 	void moneyPoke();
 	void doSomeTalk();
@@ -519,7 +518,7 @@ public:
 	void rollEm();
 	void lookAtPlace();
 	void findAllOpen();
-	void showSlots();
+	void fillOpen();
 	void deleteExObject();
 	void getEitherAd();
 	void setPickup();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 5f326a5a03..64f70ada98 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -312,4 +312,42 @@ void DreamGenContext::openOb() {
 	_openChangeSize = getOpenedSizeCPP() * kItempicsize + kInventx;
 }
 
+void DreamGenContext::identifyOb() {
+	if (data.word(kWatchingtime) != 0 ||
+		data.word(kMousex) - data.word(kMapadx) >= 22 * 8 ||
+		data.word(kMousey) - data.word(kMapady) >= 20 * 8) {
+		blank();
+		return;
+	}
+
+	data.byte(kInmaparea) = 1;
+	ah = bl;
+	push(ax);
+	findPathOfPoint();
+	data.byte(kPointerspath) = dl;
+	ax = pop();
+	push(ax);
+	findFirstPath();
+	data.byte(kPointerfirstpath) = al;
+	ax = pop();
+
+	byte x = al;
+	byte y = ah;
+
+	if (checkIfEx(x, y) || checkIfFree(x, y) ||
+		checkIfPerson(x, y) || checkIfSet(x, y))
+		return; // finishidentify
+
+	x = (data.word(kMousex) - data.word(kMapadx)) & 0xFF;
+	y = (data.word(kMousey) - data.word(kMapady)) & 0xFF;
+	byte flag, flagEx, type, flagX, flagY;
+
+	checkOne(x, y, &flag, &flagEx, &type, &flagX, &flagY);
+
+	if (type != 0 && data.byte(kMandead) != 1)
+		obName(type, 3);
+	else
+		blank();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index d3f656db45..6140f3d0d4 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -392,5 +392,6 @@
 	void withWhat();
 	void notHeldError();
 	void useGun();
+	void identifyOb();
 
 #endif
-- 
cgit v1.2.3


From 2887686d56544e6edfaf401c0aab5203be3c1ccc Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 16 Dec 2011 22:47:33 +0200
Subject: DREAMWEB: Port 'showslots' to C++

---
 engines/dreamweb/dreamgen.cpp | 33 ---------------------------------
 engines/dreamweb/dreamgen.h   |  3 +--
 engines/dreamweb/stubs.cpp    | 14 +++++++++++++-
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 15 insertions(+), 36 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index ddc599f7e8..b756c39bbf 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3004,39 +3004,6 @@ gotkeyp:
 	showDiaryPage();
 }
 
-void DreamGenContext::showSlots() {
-	STACK_CHECK;
-	di = (60)+7;
-	bx = (52)+8;
-	al = 2;
-	ds = data.word(kTempgraphics);
-	ah = 0;
-	showFrame();
-	di = (60)+10;
-	bx = (52)+11;
-	cl = 0;
-slotloop:
-	push(cx);
-	push(di);
-	push(bx);
-	_cmp(cl, data.byte(kCurrentslot));
-	if (!flags.z())
-		goto nomatchslot;
-	al = 3;
-	ds = data.word(kTempgraphics);
-	ah = 0;
-	showFrame();
-nomatchslot:
-	bx = pop();
-	di = pop();
-	cx = pop();
-	_add(bx, 10);
-	_inc(cl);
-	_cmp(cl, 7);
-	if (!flags.z())
-		goto slotloop;
-}
-
 void DreamGenContext::clearBuffers() {
 	STACK_CHECK;
 	es = data.word(kBuffers);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 5273270ce5..05e7c856df 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -479,7 +479,7 @@ public:
 	void clearBuffers();
 	void getObTextStart();
 	void checkObjectSize();
-	void showSlots();
+	void fillOpen();
 	void useCashCard();
 	void moneyPoke();
 	void doSomeTalk();
@@ -518,7 +518,6 @@ public:
 	void rollEm();
 	void lookAtPlace();
 	void findAllOpen();
-	void fillOpen();
 	void deleteExObject();
 	void getEitherAd();
 	void setPickup();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 2279d9ffbe..fb5fba8d9c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3927,7 +3927,6 @@ void DreamGenContext::talk() {
 	}
 }
 
-
 void DreamGenContext::discOps() {
 	if (data.byte(kCommandtype) != 249) {
 		data.byte(kCommandtype) = 249;
@@ -4564,4 +4563,17 @@ void DreamGenContext::lookAtCard() {
 	putBackObStuff();
 }
 
+void DreamGenContext::showSlots() {
+	showFrame(tempGraphics(), kOpsx + 7, kOpsy + 8, 2, 0);
+
+	uint16 y = kOpsy + 11;
+
+	for (int slot = 0; slot < 7; slot++) {
+		if (slot == data.byte(kCurrentslot))
+			showFrame(tempGraphics(), kOpsx + 10, y, 3, 0);
+
+		y += 10;
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 6140f3d0d4..741abd807f 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -393,5 +393,6 @@
 	void notHeldError();
 	void useGun();
 	void identifyOb();
+	void showSlots();
 
 #endif
-- 
cgit v1.2.3


From 654a60a90cfec631893598325dbfc5ab8adbfa35 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 00:01:45 +0200
Subject: DREAMWEB: Rewrote useCashCard() in C++ and got rid of moneyPoke() and
 its associated offsets in the data blob

---
 engines/dreamweb/dreamgen.cpp | 134 +++++-------------------------------------
 engines/dreamweb/dreamgen.h   |  22 +++----
 engines/dreamweb/stubs.h      |   1 +
 engines/dreamweb/use.cpp      |  29 +++++++++
 4 files changed, 55 insertions(+), 131 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index b756c39bbf..47b01d3785 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2170,14 +2170,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 1131;
+	si = 1123;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 1147;
+	si = 1139;
 	_add(si, ax);
 	ax = pop();
 }
@@ -2229,7 +2229,7 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 1131);
+	_add(bx, 1123);
 	es.byte(bx) = 0;
 }
 
@@ -2370,7 +2370,7 @@ notyetassigned:
 	push(bx);
 	_add(bx, 2);
 	ds = cs;
-	si = 1165;
+	si = 1157;
 checkpass:
 	_lodsw();
 	ah = es.byte(bx);
@@ -2698,7 +2698,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 1165;
+	si = 1157;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -2736,106 +2736,6 @@ lookcolon:
 		goto lookcolon;
 }
 
-void DreamGenContext::useCashCard() {
-	STACK_CHECK;
-	getRidOfReels();
-	loadKeypad();
-	createPanel();
-	showPanel();
-	showExit();
-	showMan();
-	di = 114;
-	bx = 120;
-	_cmp(data.byte(kForeignrelease),  0);
-	if (flags.z())
-		goto _tmp1;
-	bx = 120-3;
-_tmp1:
-	ds = data.word(kTempgraphics);
-	al = 39;
-	ah = 0;
-	showFrame();
-	ax = data.word(kCard1money);
-	moneyPoke();
-	getObTextStart();
-	nextColon();
-	nextColon();
-	di = 36;
-	bx = 98;
-	dl = 241;
-	al = 0;
-	ah = 0;
-	printDirect();
-	di = 160;
-	bx = 155;
-	es = cs;
-	si = offset_money1poke;
-	data.word(kCharshift) = 91*2+75;
-	al = 0;
-	ah = 0;
-	dl = 240;
-	printDirect();
-	di = 187;
-	bx = 155;
-	es = cs;
-	si = offset_money2poke;
-	data.word(kCharshift) = 91*2+85;
-	al = 0;
-	ah = 0;
-	dl = 240;
-	printDirect();
-	data.word(kCharshift) = 0;
-	workToScreenM();
-	cx = 400;
-	hangOnP();
-	getRidOfTemp();
-	restoreReels();
-	putBackObStuff();
-}
-
-void DreamGenContext::moneyPoke() {
-	STACK_CHECK;
-	bx = offset_money1poke;
-	cl = 48-1;
-numberpoke0:
-	_inc(cl);
-	_sub(ax, 10000);
-	if (!flags.c())
-		goto numberpoke0;
-	_add(ax, 10000);
-	cs.byte(bx) = cl;
-	_inc(bx);
-	cl = 48-1;
-numberpoke1:
-	_inc(cl);
-	_sub(ax, 1000);
-	if (!flags.c())
-		goto numberpoke1;
-	_add(ax, 1000);
-	cs.byte(bx) = cl;
-	_inc(bx);
-	cl = 48-1;
-numberpoke2:
-	_inc(cl);
-	_sub(ax, 100);
-	if (!flags.c())
-		goto numberpoke2;
-	_add(ax, 100);
-	cs.byte(bx) = cl;
-	_inc(bx);
-	cl = 48-1;
-numberpoke3:
-	_inc(cl);
-	_sub(ax, 10);
-	if (!flags.c())
-		goto numberpoke3;
-	_add(ax, 10);
-	cs.byte(bx) = cl;
-	bx = offset_money2poke;
-	_add(al, 48);
-	cs.byte(bx) = al;
-}
-
 void DreamGenContext::useStereo() {
 	STACK_CHECK;
 	_cmp(data.byte(kLocation), 0);
@@ -3059,7 +2959,7 @@ void DreamGenContext::clearChanges() {
 	di = 0;
 	_stosw(cx, true);
 	es = cs;
-	di = 1131;
+	di = 1123;
 	al = 1;
 	_stosb(2);
 	al = 0;
@@ -3292,19 +3192,19 @@ void DreamGenContext::__start() {
 		//0x0400:            ."R OOT 
 		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
 		//0x0410:         . "        
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0x0d, 0x0a, 
-		//0x0420:       .00 00.0 0...
-		0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-		//0x0430: ..$. .... .... ....
-		0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 
-		//0x0440: .... .... ...D :...
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 
+		//0x0420:       ... ..$. ....
+		0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 
+		//0x0430: .... .... .... ....
+		0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0440: ...D :... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0450: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 
+		0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0460: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 
+		0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 
 		//0x0470: .... .... .... ....
-		0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0480: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0490: .... .... .... ....
@@ -3320,9 +3220,7 @@ void DreamGenContext::__start() {
 		//0x04e0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04f0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-		//0x0500: .... .... .... ....
-		0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 05e7c856df..94826e8433 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,11 +32,9 @@
 
 namespace DreamGen {
 
-static const uint16 offset_money1poke = 0x0426;
 static const uint16 offset_operand1 = 0x03fc;
-static const uint16 offset_rootdir = 0x040a;
 static const uint16 offset_keys = 0x0392;
-static const uint16 offset_money2poke = 0x042b;
+static const uint16 offset_rootdir = 0x040a;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -365,14 +363,14 @@ static const uint16 kRoomssample = 443;
 static const uint16 kReelroutines = 444;
 static const uint16 kBasicsample = 901;
 static const uint16 kCurrentfile = 1048;
-static const uint16 kRoomscango = 1131;
-static const uint16 kRoompics = 1147;
-static const uint16 kOplist = 1162;
-static const uint16 kInputline = 1165;
-static const uint16 kPresslist = 1293;
-static const uint16 kQuitrequested = 1299;
-static const uint16 kSubtitles = 1300;
-static const uint16 kForeignrelease = 1301;
+static const uint16 kRoomscango = 1123;
+static const uint16 kRoompics = 1139;
+static const uint16 kOplist = 1154;
+static const uint16 kInputline = 1157;
+static const uint16 kPresslist = 1285;
+static const uint16 kQuitrequested = 1291;
+static const uint16 kSubtitles = 1292;
+static const uint16 kForeignrelease = 1293;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -480,8 +478,6 @@ public:
 	void getObTextStart();
 	void checkObjectSize();
 	void fillOpen();
-	void useCashCard();
-	void moneyPoke();
 	void doSomeTalk();
 	void resetLocation();
 	void adjustUp();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 741abd807f..ab09fd3ace 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -394,5 +394,6 @@
 	void useGun();
 	void identifyOb();
 	void showSlots();
+	void useCashCard();
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 385bfbb101..6b59faf401 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1613,4 +1613,33 @@ void DreamGenContext::notHeldError() {
 	putBackObStuff();
 }
 
+void DreamGenContext::useCashCard() {
+	getRidOfReels();
+	loadKeypad();
+	createPanel();
+	showPanel();
+	showExit();
+	showMan();
+	uint16 y = (!data.byte(kForeignrelease)) ? 120 : 120 - 3;
+	showFrame(tempGraphics(), 114, y, 39, 0);
+	const uint8 *obText = getObTextStartCPP();
+	findNextColon(&obText);
+	findNextColon(&obText);
+	y = 98;
+	printDirect(&obText, 36, &y, 36, 36 & 1);
+	char amountStr[10];
+	sprintf(amountStr, "%04d", data.word(kCard1money) / 10);
+	data.word(kCharshift) = 91 * 2 + 75;
+	printDirect((const uint8 *)amountStr, 160, 155, 240, 240 & 1);
+	sprintf(amountStr, "%02d", (data.word(kCard1money) % 10) * 10);
+	data.word(kCharshift) = 91 * 2 + 85;
+	printDirect((const uint8 *)amountStr, 187, 155, 240, 240 & 1);
+	data.word(kCharshift) = 0;
+	workToScreenM();
+	hangOnP(400);
+	getRidOfTemp();
+	restoreReels();
+	putBackObStuff();
+}
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 29a20ed7dddb178eecfbcc4b7db11364c2c30606 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 17 Dec 2011 09:05:09 +1100
Subject: TSAGE: Implemented R2R Scene 850 - Deck #5 By Lift

---
 engines/tsage/events.h                          |   4 +-
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   7 +-
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 176 +++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  39 ++++++
 4 files changed, 221 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index ecc710ed99..303c2201ea 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -85,8 +85,8 @@ enum CursorType {
 	// Ringworld 2 objects
 	R2_OPTO_DISK = 1, R2_READER = 2, R2_NEGATOR_GUN = 3, R2_STEPPING_DISKS = 4, 
 	R2_ATTRACTOR_UNIT = 5, R2_SENSOR_PROBE = 6, 
-	R2_7 = 7, R2_8 = 8, R2_9 = 9, R2_10 = 10, R2_11 = 11, R2_12 = 12, R2_13 = 13, R2_14 = 14,
-	R2_15 = 15, R2_16 = 16, R2_17 = 17, R2_18 = 18, R2_19 = 19, R2_20 = 20, R2_21 = 21,
+	R2_7 = 7, R2_8 = 8, R2_9 = 9, R2_10 = 10, R2_11 = 11, R2_12 = 12, R2_13 = 13, R2_OPTICAL_FIBRE = 14,
+	R2_CLAMP = 15, R2_16 = 16, R2_17 = 17, R2_18 = 18, R2_19 = 19, R2_20 = 20, R2_21 = 21,
 	R2_22 = 22, R2_23 = 23, R2_24 = 24, R2_25 = 25, R2_26 = 26, R2_27 = 27, R2_28 = 28,
 	R2_29 = 29, R2_30 = 30, R2_31 = 31, R2_32 = 32, R2_33 = 33, R2_34 = 34, R2_35 = 35,
 	R2_36 = 36, R2_37 = 37, R2_38 = 38, R2_39 = 39, R2_40 = 40, R2_41 = 41, R2_42 = 42,
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index a33a9a5e9e..201b44eeef 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -77,7 +77,10 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 700:
 	case 800:
 	case 825:
+		error("Missing scene %d from group 0", sceneNumber);
 	case 850:
+		// Deck #5 - By Lift
+		return new Scene850();
 	case 900:
 		error("Missing scene %d from group 0", sceneNumber);
 	/* Scene group #1 */
@@ -607,8 +610,8 @@ void Ringworld2InvObjectList::reset() {
 	setObjectScene(R2_11, 400);
 	setObjectScene(R2_12, 500);
 	setObjectScene(R2_13, 1550);
-	setObjectScene(R2_14, 850);
-	setObjectScene(R2_15, 850);
+	setObjectScene(R2_OPTICAL_FIBRE, 850);
+	setObjectScene(R2_CLAMP, 850);
 	setObjectScene(R2_16, 0);
 	setObjectScene(R2_17, 1550);
 	setObjectScene(R2_18, 1550);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 1c25c896a6..7a3b0cdd78 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1701,7 +1701,7 @@ void Scene250::signal() {
 			R2_GLOBALS._sceneManager.changeScene(139);
 			break;
 		case 91:
-			R2_GLOBALS._sceneManager.changeScene(91);
+			R2_GLOBALS._sceneManager.changeScene(850);
 			break;
 		default:
 			break;
@@ -2900,6 +2900,180 @@ void Scene400::dispatch() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 850 - Deck #5 - By Lift
+ *
+ *--------------------------------------------------------------------------*/
+
+bool Scene850::Indicator::startAction(CursorType action, Event &event) {
+	Scene850 *scene = (Scene850 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action != CURSOR_USE) || (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) != 850))
+		return NamedHotspot::startAction(action, event);
+	else {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 851;
+		scene->setAction(&scene->_sequenceManager1, scene, 851, &R2_GLOBALS._player, &scene->_fibre, NULL);
+		return true;
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+bool Scene850::LiftDoor::startAction(CursorType action, Event &event) {
+	Scene850 *scene = (Scene850 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+	else {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 202;
+		scene->setAction(&scene->_sequenceManager1, scene, 202, &R2_GLOBALS._player, this, NULL);
+		return true;
+	}
+}
+
+bool Scene850::SickBayDoor::startAction(CursorType action, Event &event) {
+	Scene850 *scene = (Scene850 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+	else {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 204;
+		scene->setAction(&scene->_sequenceManager1, scene, 204, &R2_GLOBALS._player, this, NULL);
+		return true;
+	}
+}
+
+bool Scene850::Clamp::startAction(CursorType action, Event &event) {
+	Scene850 *scene = (Scene850 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!R2_GLOBALS.getFlag(7))
+		return false;
+	else if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+	else {
+		R2_GLOBALS._player.disableControl();
+		scene->_object1.postInit();
+		scene->_sceneMode = 850;
+		scene->setAction(&scene->_sequenceManager1, scene, 850, &R2_GLOBALS._player, this, &scene->_object1, NULL);
+		return true;
+	}
+}
+
+bool Scene850::Panel::startAction(CursorType action, Event &event) {
+	Scene850 *scene = (Scene850 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action != CURSOR_USE) || R2_GLOBALS.getFlag(7))
+		return SceneActor::startAction(action, event);
+	else {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 852;
+		scene->setAction(&scene->_sequenceManager1, scene, 852, &R2_GLOBALS._player, this, &scene->_object1, NULL);
+		return true;
+	}		
+}
+
+/*--------------------------------------------------------------------------*/
+
+void Scene850::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(850);
+
+	_liftDoor.postInit();
+	_liftDoor.setup(850, 2, 1);
+	_liftDoor.setPosition(Common::Point(188, 79));
+	_liftDoor.setDetails(850, 3, -1, -1, 1, NULL);
+
+	_sickBayDoor.postInit();
+	_sickBayDoor.setup(850, 3, 1);
+	_sickBayDoor.setPosition(Common::Point(62, 84));
+	_sickBayDoor.setDetails(850, 9, -1, -1, 1, NULL);
+
+	if (R2_INVENTORY.getObjectScene(R2_CLAMP) == 850) {
+		_clamp.postInit();
+		_clamp.setup(850, 5, 1);
+		_clamp.setPosition(Common::Point(242, 93));
+		_clamp.fixPriority(81);
+		_clamp.animate(ANIM_MODE_2, NULL);
+		_clamp.setDetails(850, 27, -1, -1, 1, NULL);
+	}
+
+	_panel.postInit();
+	_panel.setVisage(850);
+
+	if (R2_GLOBALS.getFlag(7))
+		_panel.setFrame(7);
+
+	_panel.setPosition(Common::Point(232, 119));
+	_panel.fixPriority(82);
+	_panel.setDetails(850, 24, -1, -1, 1, NULL);
+
+	if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 850) {
+		_fibre.postInit();
+		_fibre.setup(850, 6, 1);
+		_fibre.setPosition(Common::Point(280, 87));
+	}
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setVisage(10);
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.disableControl();
+
+	_eastDoor.setDetails(Rect(289, 53, 315, 125), 850, 6, -1, 8, 1, NULL);
+	_indicator.setDetails(Rect(275, 67, 286, 79), 850, 18, -1, 20, 1, NULL);
+	_sickBayIndicator.setDetails(Rect(41, 51, 48, 61), 850, 15, -1, -1, 1, NULL);
+	_liftControls.setDetails(Rect(156, 32, 166, 44), 850, 21, -1, -1, 1, NULL);
+	_compartment.setDetails(Rect(4, 88, 153, 167), 850, 12, -1, -1, 1, NULL);
+	_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 850, 0, -1, -1, 1, NULL);
+
+	switch (R2_GLOBALS._sceneManager._previousScene) {
+	case 250:
+		_sceneMode = 203;
+		setAction(&_sequenceManager1, this, 203, &R2_GLOBALS._player, &_liftDoor, NULL);
+		break;
+	case 800:
+		_sceneMode = 205;
+		setAction(&_sequenceManager1, this, 205, &R2_GLOBALS._player, &_sickBayDoor, NULL);
+		break;
+	default:
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.setPosition(Common::Point(215, 115));
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
+void Scene850::signal() {
+	switch (_sceneMode) {
+	case 202:
+		R2_GLOBALS._sceneManager.changeScene(250);
+		break;
+	case 204:
+		R2_GLOBALS._sceneManager.changeScene(800);
+		break;
+	case 850:
+		R2_INVENTORY.setObjectScene(R2_CLAMP, 1);
+		_clamp.remove();
+		_object1.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 851:
+		R2_INVENTORY.setObjectScene(R2_OPTICAL_FIBRE, 1);
+		_fibre.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 852:
+		R2_GLOBALS.setFlag(7);
+		R2_GLOBALS._player.enableControl();
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index a0c3f92668..5f2d768f90 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -370,6 +370,45 @@ public:
 	virtual void dispatch();
 };
 
+class Scene850: public SceneExt {
+	/* Items */
+	class Indicator: public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	/* Objects */
+	class LiftDoor: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class SickBayDoor: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Clamp: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Panel: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+	NamedHotspot _background, _eastDoor, _compartment, _sickBayIndicator;
+	NamedHotspot _liftControls;
+	Indicator _indicator;
+	SceneActor _object1, _fibre;
+	LiftDoor _liftDoor;
+	SickBayDoor _sickBayDoor;
+	Clamp _clamp;
+	Panel _panel;
+	SequenceManager _sequenceManager1;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
-- 
cgit v1.2.3


From b371c46af9d5dd7e1282a9e227a853e0d2054fb2 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 00:41:30 +0200
Subject: DREAMWEB: Port 'checkinside' to C++

---
 engines/dreamweb/dreamgen.cpp | 21 ---------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.cpp    | 14 ++++++++++++++
 engines/dreamweb/stubs.h      |  2 ++
 engines/dreamweb/use.cpp      | 12 ++----------
 5 files changed, 18 insertions(+), 32 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 47b01d3785..0a891cb1cf 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2837,27 +2837,6 @@ doselob:
 	useRoutine();
 }
 
-void DreamGenContext::checkInside() {
-	STACK_CHECK;
-	es = data.word(kExtras);
-	bx = (0+2080+30000);
-	cl = 0;
-insideloop:
-	_cmp(al, es.byte(bx+3));
-	if (!flags.z())
-		goto notfoundinside;
-	_cmp(ah, es.byte(bx+2));
-	if (!flags.z())
-		goto notfoundinside;
-	return;
-notfoundinside:
-	_add(bx, 16);
-	_inc(cl);
-	_cmp(cl, (114));
-	if (!flags.z())
-		goto insideloop;
-}
-
 void DreamGenContext::showDiaryKeys() {
 	STACK_CHECK;
 	_cmp(data.byte(kPresscount), 0);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 94826e8433..86768e6cca 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -525,7 +525,6 @@ public:
 	void locationPic();
 	void swapWithOpen();
 	void dreamweb();
-	void checkInside();
 	void findPathOfPoint();
 	void getDestInfo();
 	void read();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index fb5fba8d9c..376a681604 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1794,6 +1794,20 @@ bool DreamGenContext::isRyanHolding(const char *id) {
 	return false;
 }
 
+void DreamGenContext::checkInside() {
+	cl = checkInside(al, ah);
+}
+
+uint16 DreamGenContext::checkInside(uint16 command, uint16 type) {
+	for (uint16 index = 0; index < kNumexobjects; index++) {
+		DynObject *object = getExAd(index);
+		if (object->mapad[1] == command && object->mapad[0] == type)
+			return index;
+	}
+
+	return kNumexobjects;
+}
+
 bool DreamBase::isItDescribed(const ObjPos *pos) {
 	uint16 offset = getSegment(data.word(kSetdesc)).word(kSettextdat + pos->index * 2);
 	uint8 result = getSegment(data.word(kSetdesc)).byte(kSettext + offset);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index ab09fd3ace..27a5cee9c5 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -395,5 +395,7 @@
 	void identifyOb();
 	void showSlots();
 	void useCashCard();
+	void checkInside();
+	uint16 checkInside(uint16 command, uint16 type);
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 6b59faf401..b4e7efdb4f 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -994,11 +994,7 @@ void DreamGenContext::useObject() {
 }
 
 void DreamGenContext::useWinch() {
-	al = 40;
-	ah = 1;
-	checkInside();
-
-	if (cl == kNumexobjects || !compare(cl, 4, "FUSE")) {
+	if (checkInside(40, 1) == kNumexobjects || !compare(cl, 4, "FUSE")) {
 		// No winch
 		showFirstUse();
 		putBackObStuff();
@@ -1244,11 +1240,7 @@ void DreamGenContext::hotelControl() {
 }
 
 void DreamGenContext::useCooker() {
-	al = data.byte(kCommand);
-	ah = data.byte(kObjecttype);
-	checkInside();
-
-	if (cl == 114)
+	if (checkInside(data.byte(kCommand), data.byte(kObjecttype)) == kNumexobjects)
 		showFirstUse();
 	else
 		showSecondUse();	// Food inside
-- 
cgit v1.2.3


From b289533e4d972c68391bd3d84c3b87ad20f08c52 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 01:39:29 +0200
Subject: DREAMWEB: Fix regression in identifyOb

---
 engines/dreamweb/object.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 64f70ada98..747b7934b4 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -313,9 +313,15 @@ void DreamGenContext::openOb() {
 }
 
 void DreamGenContext::identifyOb() {
-	if (data.word(kWatchingtime) != 0 ||
-		data.word(kMousex) - data.word(kMapadx) >= 22 * 8 ||
-		data.word(kMousey) - data.word(kMapady) >= 20 * 8) {
+	if (data.word(kWatchingtime) != 0) {
+		blank();
+		return;
+	}
+
+	ax = data.word(kMousex) - data.word(kMapadx);
+	bx = data.word(kMousey) - data.word(kMapady);
+
+	if (ax >= 22 * 8 || bx >= 20 * 8) {
 		blank();
 		return;
 	}
@@ -325,8 +331,6 @@ void DreamGenContext::identifyOb() {
 	push(ax);
 	findPathOfPoint();
 	data.byte(kPointerspath) = dl;
-	ax = pop();
-	push(ax);
 	findFirstPath();
 	data.byte(kPointerfirstpath) = al;
 	ax = pop();
-- 
cgit v1.2.3


From f9d4886e50dc87535c34ec7c12c1e53fed3a3910 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 02:04:31 +0200
Subject: DREAMWEB: Port 'usestereo' to C++

---
 engines/dreamweb/dreamgen.cpp | 62 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.h      |  1 +
 engines/dreamweb/use.cpp      | 30 +++++++++++++++++++++
 4 files changed, 31 insertions(+), 63 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 0a891cb1cf..939e8c0127 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2736,68 +2736,6 @@ lookcolon:
 		goto lookcolon;
 }
 
-void DreamGenContext::useStereo() {
-	STACK_CHECK;
-	_cmp(data.byte(kLocation), 0);
-	if (flags.z())
-		goto stereook;
-	cx = 400;
-	al = 4;
-	showPuzText();
-	putBackObStuff();
-	return;
-stereook:
-	_cmp(data.byte(kMapx), 11);
-	if (!flags.z())
-		goto stereonotok;
-	_cmp(data.byte(kMapy), 0);
-	if (flags.z())
-		goto stereook2;
-stereonotok:
-	cx = 400;
-	al = 5;
-	showPuzText();
-	putBackObStuff();
-	return;
-stereook2:
-	al = 'C';
-	ah = 'D';
-	cl = 'P';
-	ch = 'L';
-	findSetObject();
-	ah = 1;
-	checkInside();
-	_cmp(cl, (114));
-	if (!flags.z())
-		goto cdinside;
-	al = 6;
-	cx = 400;
-	showPuzText();
-	putBackObStuff();
-	getAnyAd();
-	al = 255;
-	es.byte(bx+10) = al;
-	return;
-cdinside:
-	getAnyAd();
-	al = es.byte(bx+10);
-	_xor(al, 1);
-	es.byte(bx+10) = al;
-	_cmp(al, 255);
-	if (flags.z())
-		goto stereoon;
-	al = 7;
-	cx = 400;
-	showPuzText();
-	putBackObStuff();
-	return;
-stereoon:
-	al = 8;
-	cx = 400;
-	showPuzText();
-	putBackObStuff();
-}
-
 void DreamGenContext::selectOb() {
 	STACK_CHECK;
 	findInvPos();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 86768e6cca..28711bb1ba 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -518,7 +518,6 @@ public:
 	void getEitherAd();
 	void setPickup();
 	void dropObject();
-	void useStereo();
 	void showDiaryKeys();
 	void useOpened();
 	void signOn();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 27a5cee9c5..b2417e767b 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -395,6 +395,7 @@
 	void identifyOb();
 	void showSlots();
 	void useCashCard();
+	void useStereo();
 	void checkInside();
 	uint16 checkInside(uint16 command, uint16 type);
 
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index b4e7efdb4f..4be3c7a6b3 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1634,4 +1634,34 @@ void DreamGenContext::useCashCard() {
 	putBackObStuff();
 }
 
+void DreamGenContext::useStereo() {
+	if (data.byte(kLocation) != 0) {
+		showPuzText(4, 400);
+		putBackObStuff();
+	} else if (data.byte(kMapx) != 11) {
+		showPuzText(5, 400);
+		putBackObStuff();
+	} else if (checkInside(findSetObject("CDPL"), 1) == kNumexobjects) {
+		// No CD inside
+		showPuzText(6, 400);
+		putBackObStuff();
+		// TODO: Use the C++ version of getAnyAd()
+		getAnyAd();
+		es.byte(bx + 10) = 255;
+	} else {
+		// CD inside
+		getAnyAd();
+		es.byte(bx + 10) ^= 1;
+		if (es.byte(bx + 10) != 255) {
+			// Stereo off
+			showPuzText(7, 400);
+		} else {
+			// Stereo on
+			showPuzText(8, 400);
+		}
+
+		putBackObStuff();
+	}
+}
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 114e857d78536d5a19d2b37855d67522d5b00e6e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 17 Dec 2011 02:03:36 +0100
Subject: TSAGE: R2R - Implement scene 2800

---
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   2 +
 engines/tsage/ringworld2/ringworld2_scenes2.cpp  | 383 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes2.h    |  41 +++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 124 ++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   |  24 ++
 5 files changed, 574 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 201b44eeef..3854a37384 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -162,6 +162,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Forest Maze
 		return new Scene2750();
 	case 2800:
+		// Exiting Forest
+		return new Scene2800();
 	case 2900:
 		error("Missing scene %d from group 2", sceneNumber);
 	/* Scene group #3 */
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 107d7bad04..a61ff6ac9a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -4162,5 +4162,388 @@ void Scene2750::process(Event &event) {
 	Scene::process(event);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 2800 - Exiting forest
+ *
+ *--------------------------------------------------------------------------*/
+Scene2800::Scene2800(): SceneExt() {
+	_field412 = 0;
+}
+
+void Scene2800::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+}
+
+bool Scene2800::Item2::startAction(CursorType action, Event &event) {
+	Scene2800 *scene = (Scene2800 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action == CURSOR_USE) && (R2_GLOBALS.getFlag(47))) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 2805;
+		scene->setAction(&scene->_sequenceManager, scene, 2805, &R2_GLOBALS._player, NULL);
+		return true;
+	} else
+		return SceneHotspot::startAction(action, event);
+}
+
+bool Scene2800::Actor1::startAction(CursorType action, Event &event) {
+	Scene2800 *scene = (Scene2800 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action == CURSOR_TALK) {
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		R2_GLOBALS.setFlag(47);
+		scene->_field412 = 1205;
+		scene->_sceneMode = 2803;
+		scene->_stripManager.start(scene->_field412, scene);
+		return true;
+	} else if (action == R2_7) {
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS.setFlag(47);
+		scene->_sceneMode = 10;
+		scene->setAction(&scene->_sequenceManager, scene, 2802, &R2_GLOBALS._player, &scene->_actor2, &scene->_actor1, NULL);
+		return true;
+	} else 
+		return SceneActor::startAction(action, event);
+}
+
+void Scene2800::Action1::signal() {
+	Scene2800 *scene = (Scene2800 *)R2_GLOBALS._sceneManager._scene;
+
+	if (R2_GLOBALS._player._position.x <= 320) {
+		setDelay(120);
+		Common::Point pt(330, 25);
+		NpcMover *mover = new NpcMover();
+		scene->_object1.addMover(mover, &pt, NULL);
+	} else {
+		setDelay(1800 + R2_GLOBALS._randomSource.getRandomNumber(600));
+		scene->_object1.setPosition(Common::Point(-10, 45));
+	}
+}
+
+void Scene2800::Action2::signal() {
+	Scene2800 *scene = (Scene2800 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0:
+		setDelay(240);
+		R2_GLOBALS._sound1.changeSound(240);
+		R2_GLOBALS._sound2.stop();
+		break;
+	case 1:
+		scene->_object2.postInit();
+		scene->_object2.setVisage(2800);
+		scene->_object2.setStrip(1);
+		scene->_object2._numFrames = 8;
+		scene->_object2._moveRate = 8;
+		scene->_object2.changeZoom(100);
+		scene->_object2.setPosition(Common::Point(1, 1));
+		scene->_object2.show();
+		scene->_object2.animate(ANIM_MODE_5, this);
+		break;
+	case 2:
+		R2_GLOBALS._sound2.play(130);
+		scene->_object2.setVisage(2800);
+		scene->_object2.setStrip(7);
+
+		scene->_object3.postInit();
+		scene->_object3.setVisage(2800);
+		scene->_object3.setStrip(3);
+		scene->_object3._numFrames = 8;
+		scene->_object3._moveRate = 8;
+		scene->_object3.changeZoom(100);
+		scene->_object3.setPosition(Common::Point(300, 104));
+		scene->_object3.show();
+		scene->_object3.animate(ANIM_MODE_5, this);
+		break;
+	case 3:
+		R2_GLOBALS._sound1.play(241);
+		scene->_object4.postInit();
+		scene->_object4.setVisage(2800);
+		scene->_object4.setStrip(2);
+		scene->_object4._numFrames = 4;
+		scene->_object4._moveRate = 4;
+		scene->_object4.changeZoom(100);
+		scene->_object4.setPosition(Common::Point(300, 104));
+		scene->_object4.fixPriority(105);
+		scene->_object4.show();
+		scene->_object4.animate(ANIM_MODE_5, this);
+		break;
+	case 4:
+		setDelay(18);
+		scene->_object4.setStrip(4);
+		scene->_actor1.setVisage(2800);
+		scene->_actor1.setStrip(5);
+		scene->_actor1.setFrame(1);
+		scene->_actor1._numFrames = 5;
+		scene->_actor1._moveRate = 5;
+		scene->_actor1.setPosition(Common::Point(300, 104));
+		scene->_actor1.fixPriority(110);
+		scene->_actor1.changeZoom(100);
+		scene->_actor1.show();
+		break;
+	case 5:
+		scene->_actor1.animate(ANIM_MODE_5, this);
+		break;
+	case 6: {
+		scene->_actor1.changeZoom(-1);
+		scene->_actor1.setVisage(3107);
+		scene->_actor1.animate(ANIM_MODE_1, NULL);
+		scene->_actor1.setStrip(3);
+		scene->_actor1.setPosition(Common::Point(297, 140));
+		scene->_actor1._numFrames = 10;
+		scene->_actor1._moveRate = 10;
+		scene->_actor1._moveDiff = Common::Point(3, 2);
+
+		Common::Point pt(297, 160);
+		NpcMover *mover = new NpcMover();
+		scene->_actor1.addMover(mover, &pt, this);
+		break;
+		}
+	case 7: {
+		scene->_actor1.changeZoom(75);
+		scene->_actor1.updateAngle(R2_GLOBALS._player._position);
+
+		Common::Point pt(105, 82);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		break;
+		}
+	case 8: {
+		R2_GLOBALS._player._numFrames = 8;
+		R2_GLOBALS._player._moveRate = 8;
+		R2_GLOBALS._player.animate(ANIM_MODE_2, NULL);
+		R2_GLOBALS._player.setObjectWrapper(NULL);
+		R2_GLOBALS._player.setStrip(2);
+		R2_GLOBALS._player.changeZoom(-1);
+
+		Common::Point pt(79, 100);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		break;
+		}
+	case 9: {
+		R2_GLOBALS._player._numFrames = 10;
+		R2_GLOBALS._player._moveRate = 10;
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper());
+
+		Common::Point pt(100, 64);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		break;
+		}
+	case 10: {
+		R2_GLOBALS._player.fixPriority(124);
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+
+		Common::Point pt(160, 124);
+		PlayerMover *mover = new PlayerMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		break;
+		}
+	case 11: {
+		R2_GLOBALS._player.fixPriority(-1);
+
+		Common::Point pt(160, 160);
+		PlayerMover *mover = new PlayerMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		break;
+		}
+	case 12: {
+		Common::Point pt(270, 160);
+		PlayerMover *mover = new PlayerMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		break;
+		}
+	case 13:
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		scene->_field412 = 1207;
+		scene->_stripManager.start(scene->_field412, this);
+		break;
+	case 14: {
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._player.fixPriority(110);
+
+		Common::Point pt(288, 140);
+		PlayerMover *mover = new PlayerMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		break;
+		}
+	case 15:
+		setDelay(18);
+		scene->_actor1.updateAngle(R2_GLOBALS._player._position);
+		R2_GLOBALS._player.setVisage(2800);
+		R2_GLOBALS._player.setStrip(6);
+		R2_GLOBALS._player.setFrame(1);
+		R2_GLOBALS._player.changeZoom(100);
+		R2_GLOBALS._player.setPosition(Common::Point(300, 104));
+		R2_GLOBALS._player._numFrames = 5;
+		R2_GLOBALS._player._moveRate = 5;
+		break;
+	case 16:
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 17:
+		setDelay(6);
+		scene->_object4.setStrip(2);
+		scene->_object4.setFrame(11);
+		R2_GLOBALS._player.hide();
+	// No break on purpose
+	case 18:
+		R2_GLOBALS._sound1.play(241);
+		scene->_object4.animate(ANIM_MODE_6, this);
+		break;
+	case 19:
+		scene->_object4.remove();
+		scene->_object3.animate(ANIM_MODE_6, this);
+		break;
+	case 20:
+		setDelay(6);
+		scene->_object3.remove();
+		scene->_object2.setStrip(1);
+		scene->_object2.setFrame(19);
+		break;
+	case 21:
+		setDelay(150);
+		R2_GLOBALS._sound1.play(269);
+		R2_GLOBALS._sound2.stop();
+		break;
+	case 22:
+		scene->_sceneMode = 12;
+		scene->_object2.animate(ANIM_MODE_6, scene);
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene2800::postInit(SceneObjectList *OwnerList) {
+	loadScene(2800);
+	setZoomPercents(100, 50, 124, 75);
+	R2_GLOBALS._sound1.stop();
+	R2_GLOBALS._sound2.stop();
+	SceneExt::postInit();
+
+	_object1.postInit();
+	_object1.setup(2750, 4, 1);
+	_object1.setPosition(Common::Point(-10, 25));
+	_object1.animate(ANIM_MODE_1, NULL);
+	_object1.setStrip2(4);
+	_object1._moveRate = 20;
+	_object1.setAction(&_action1);
+
+	_actor3.postInit();
+	_actor3.setup(2802, 1, 1);
+	_actor3.setPosition(Common::Point(116, 80));
+	_actor3.fixPriority(111);
+	_actor3.animate(ANIM_MODE_2, NULL);
+	_actor3._numFrames = 6;
+
+	if (!R2_GLOBALS.getFlag(47)) {
+		_actor1.postInit();
+		_actor1.setVisage(3105);
+		_actor1.setStrip(3);
+		_actor1.setFrame(1);
+		_actor1.setZoom(50);
+		_actor1._moveDiff = Common::Point(2, 1);
+		_actor1.setPosition(Common::Point(122, 82));
+		_actor1.animate(ANIM_MODE_NONE, NULL);
+		_actor1.setDetails(2800, -1, -1, -1, 1, NULL);
+	}
+	
+	_item1.setDetails(Rect(0, 0, 320, 200), 2800, -1, -1, -1, 1, NULL);
+
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_nejSpeaker);
+	_stripManager.addSpeaker(&_guardSpeaker);
+
+	if (R2_INVENTORY.getObjectScene(36) == 0) {
+		R2_GLOBALS._sound1.fadeSound(237);
+		if (R2_GLOBALS.getFlag(47)) {
+			_item2.setDetails(Rect(76, 45, 155, 90), 2800, 3, -1, -1, 2, NULL);
+		} else {
+			_actor2.postInit();
+			_actor2.setup(2752, 5, 1);
+			_actor2.animate(ANIM_MODE_NONE, NULL);
+			_actor2.changeZoom(100);
+			_actor2._moveDiff = Common::Point(2, 1);
+			_actor2.setPosition(Common::Point(101, 148));
+		}
+	}
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setVisage(19);
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.changeZoom(100);
+	R2_GLOBALS._player._moveDiff = Common::Point(2, 2);
+	R2_GLOBALS._player.disableControl();
+
+	if (R2_INVENTORY.getObjectScene(36) == 0) {
+		R2_GLOBALS._player.setAction(&_sequenceManager, this, 2800, &R2_GLOBALS._player, NULL);
+	} else if (R2_GLOBALS.getFlag(47)) {
+		R2_GLOBALS._player.setVisage(3110);
+		R2_GLOBALS._player.changeZoom(-1);
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+		R2_GLOBALS._player.setPosition(Common::Point(160, 124));
+		R2_GLOBALS._player.enableControl();
+	} else {
+		_sceneMode = 2801;
+		R2_GLOBALS._player.setAction(&_sequenceManager, this, 2801, &R2_GLOBALS._player, &_actor2, &_actor1, NULL);
+	}
+}
+
+void Scene2800::signal() {
+	switch (_sceneMode) {
+	case 10:
+		R2_GLOBALS._sound1.play(238);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_field412 = 1206;
+		_sceneMode = 2804;
+		_stripManager.start(_field412, this);
+		break;
+	case 11:
+		_actor2.remove();
+		_object1.setAction(NULL);
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+		_item2.setDetails(Rect(76, 45, 155, 90), 2800, 3, -1, -1, 2, NULL);
+		break;
+	case 12:
+		R2_GLOBALS._sound1.fadeOut2(NULL);
+		R2_GLOBALS._sound2.fadeOut2(NULL);
+		g_globals->_sceneManager.changeScene(1000);
+		break;
+	case 2800:
+		g_globals->_sceneManager.changeScene(2750);
+		break;
+	case 2801:
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._player._canWalk = false;
+		break;
+	case 2803:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 10;
+		setAction(&_sequenceManager, this, 2803, &R2_GLOBALS._player, &_actor2, &_actor1, NULL);
+		break;
+	case 2804:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 11;
+		setAction(&_sequenceManager, this, 2804, &R2_GLOBALS._player, &_actor2, NULL);
+		break;
+	case 2805:
+		_object1.remove();
+		setAction(&_action2);
+		break;
+	default:
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index 9b2a8685fc..2097465a48 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -624,6 +624,47 @@ public:
 	virtual void process(Event &event);
 };
 
+class Scene2800 : public SceneExt {
+	class Item2 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor1 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Action1: public Action {
+	public:
+		void signal();
+	};
+	class Action2: public Action {
+	public:
+		void signal();
+	};
+public:
+	SpeakerQuinn2800 _quinnSpeaker;
+	SpeakerNej2800 _nejSpeaker;
+	SpeakerGuard2800 _guardSpeaker;
+	NamedHotspot _item1;
+	Item2 _item2;
+	Actor1 _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneObject _object1;
+	Action1 _action1;
+	Action2 _action2;
+	SceneObject _object2;
+	SceneObject _object3;
+	SceneObject _object4;
+	SequenceManager _sequenceManager;
+	int _field412;
+
+	Scene2800();
+	virtual void synchronize(Serializer &s);
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 7a3871f9ac..35de45d8e6 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -915,5 +915,129 @@ void SpeakerNej2750::proc15() {
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
+
+SpeakerQuinn2800::SpeakerQuinn2800() {
+	_speakerName = "QUINN";
+	_color1 = 60;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerQuinn2800::proc15() {
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &R2_GLOBALS._player;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		switch (_object2->_visage) {
+		case 16:
+			_object1.setZoom(75);
+			_object1.setup(4023, 5, 1);
+			break;
+		case 19:
+			_object1.setup(4023, 1, 1);
+			break;
+		case 3110:
+			_object1.setZoom(75);
+			if (_object2->_strip == 1)
+				_object1.setup(4061	, 1, 1);
+			else
+				_object1.setup(4061	, 3, 1);
+			break;
+		default:
+			break;
+		}
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+SpeakerNej2800::SpeakerNej2800() {
+	_speakerName = "NEJ";
+	_color1 = 171;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerNej2800::proc15() {
+	int v = _fieldF6;
+	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor2;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4023, 3, 1);
+		if (_object2->_visage == 2801)
+			_object1.setPosition(Common::Point(R2_GLOBALS._player._position.x - 12, R2_GLOBALS._player._position.y));
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+SpeakerGuard2800::SpeakerGuard2800() {
+	_speakerName = "GUARD";
+	_color1 = 5;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerGuard2800::proc15() {
+	int v = _fieldF6;
+	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor1;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setZoom(75);
+		_object1.setup(4060, 3, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 115ad580ce..31eda2431c 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -237,6 +237,30 @@ public:
 	virtual Common::String getClassName() { return "SpeakerNej2750"; }
 	virtual void proc15();
 };
+
+class SpeakerQuinn2800 : public VisualSpeaker {
+public:
+	SpeakerQuinn2800();
+
+	virtual Common::String getClassName() { return "SpeakerQuinn2800"; }
+	virtual void proc15();
+};
+
+class SpeakerNej2800 : public VisualSpeaker {
+public:
+	SpeakerNej2800();
+
+	virtual Common::String getClassName() { return "SpeakerNej2800"; }
+	virtual void proc15();
+};
+
+class SpeakerGuard2800 : public VisualSpeaker {
+public:
+	SpeakerGuard2800();
+
+	virtual Common::String getClassName() { return "SpeakerGuard2800"; }
+	virtual void proc15();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 24740b30bd9d6cfd5ce420951a53b87a156ffbbf Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 17 Dec 2011 13:13:44 +1100
Subject: TSAGE: Disallow saving and loading via the GMM when a dialog is
 active

---
 engines/tsage/blue_force/blueforce_logic.cpp  | 6 ++++--
 engines/tsage/ringworld/ringworld_logic.cpp   | 7 +++++--
 engines/tsage/ringworld2/ringworld2_logic.cpp | 6 ++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 22299c1bf1..9888f4dd91 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -255,14 +255,16 @@ Scene *BlueForceGame::createScene(int sceneNumber) {
  * Returns true if it is currently okay to restore a game
  */
 bool BlueForceGame::canLoadGameStateCurrently() {
-	return true;
+	// Don't allow a game to be loaded if a dialog is active
+	return g_globals->_gfxManagers.size() == 1;
 }
 
 /**
  * Returns true if it is currently okay to save the game
  */
 bool BlueForceGame::canSaveGameStateCurrently() {
-	return true;
+	// Don't allow a game to be saved if a dialog is active
+	return g_globals->_gfxManagers.size() == 1;
 }
 
 void BlueForceGame::rightClick() {
diff --git a/engines/tsage/ringworld/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index ad67b66f69..c87b95e0b8 100644
--- a/engines/tsage/ringworld/ringworld_logic.cpp
+++ b/engines/tsage/ringworld/ringworld_logic.cpp
@@ -196,14 +196,17 @@ Scene *RingworldGame::createScene(int sceneNumber) {
  * Returns true if it is currently okay to restore a game
  */
 bool RingworldGame::canLoadGameStateCurrently() {
-	return !g_globals->getFlag(50);
+	// Don't allow a game to be loaded if a dialog is active
+	return !g_globals->getFlag(50) && (g_globals->_gfxManagers.size() == 1);
+
 }
 
 /**
  * Returns true if it is currently okay to save the game
  */
 bool RingworldGame::canSaveGameStateCurrently() {
-	return !g_globals->getFlag(50);
+	// Don't allow a game to be saved if a dialog is active
+	return !g_globals->getFlag(50) && (g_globals->_gfxManagers.size() == 1);
 }
 
 /*--------------------------------------------------------------------------*/
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 3854a37384..ccedb3a18a 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -203,14 +203,16 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
  * Returns true if it is currently okay to restore a game
  */
 bool Ringworld2Game::canLoadGameStateCurrently() {
-	return true;
+	// Don't allow a game to be loaded if a dialog is active
+	return g_globals->_gfxManagers.size() == 1;
 }
 
 /**
  * Returns true if it is currently okay to save the game
  */
 bool Ringworld2Game::canSaveGameStateCurrently() {
-	return true;
+	// Don't allow a game to be saved if a dialog is active
+	return g_globals->_gfxManagers.size() == 1;
 }
 
 /*--------------------------------------------------------------------------*/
-- 
cgit v1.2.3


From 3e6e5bc0ce1d384d96b464377319ecae0a36222e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 17 Dec 2011 13:28:12 +1100
Subject: TSAGE: Bugfix to allow loading savegames in Blue Force directly from
 the launcher

---
 engines/tsage/blue_force/blueforce_logic.cpp | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 9888f4dd91..91cba43e1d 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "common/config-manager.h"
 #include "tsage/blue_force/blueforce_logic.h"
 #include "tsage/blue_force/blueforce_dialogs.h"
 #include "tsage/blue_force/blueforce_scenes0.h"
@@ -42,8 +43,25 @@ namespace TsAGE {
 namespace BlueForce {
 
 void BlueForceGame::start() {
-	// Start the game
-	g_globals->_sceneManager.changeScene(20);
+	int slot = -1;
+
+	// Check for a savegame to load straight from the launcher
+	if (ConfMan.hasKey("save_slot")) {
+		slot = ConfMan.getInt("save_slot");
+		Common::String file = g_vm->generateSaveName(slot);
+		Common::InSaveFile *in = g_vm->_system->getSavefileManager()->openForLoading(file);
+		if (in)
+			delete in;
+		else
+			slot = -1;
+	}
+
+	if (slot >= 0)
+		// Set the savegame slot to load in the main loop
+		g_globals->_sceneHandler->_loadGameSlot = slot;
+	else
+		// Switch to the title screen
+		g_globals->_sceneManager.setNewScene(20);
 }
 
 Scene *BlueForceGame::createScene(int sceneNumber) {
-- 
cgit v1.2.3


From 8dec805d852cff58d3ff52c4d8051ac0a33f93be Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 17 Dec 2011 15:38:29 +1100
Subject: TSAGE: Bugfix for #3460485 - Animation running too slowly

---
 engines/tsage/events.cpp | 2 +-
 engines/tsage/events.h   | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/events.cpp b/engines/tsage/events.cpp
index ac08997563..152570b187 100644
--- a/engines/tsage/events.cpp
+++ b/engines/tsage/events.cpp
@@ -386,7 +386,7 @@ bool EventsClass::isCursorVisible() const {
  */
 void EventsClass::delay(int numFrames) {
 	while (_frameNumber < (_prevDelayFrame + numFrames)) {
-		uint32 delayAmount = CLIP(_priorFrameTime + GAME_FRAME_TIME - g_system->getMillis(),
+		uint32 delayAmount = CLIP(_priorFrameTime + GAME_SCRIPT_TIME - g_system->getMillis(),
 			(uint32)0, (uint32)GAME_FRAME_TIME);
 		if (delayAmount > 0)
 			g_system->delayMillis(delayAmount);
diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index 303c2201ea..fe4d3ecde6 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -36,9 +36,12 @@ enum EventType {EVENT_NONE = 0, EVENT_BUTTON_DOWN = 1, EVENT_BUTTON_UP = 2, EVEN
 
 enum ButtonShiftFlags {BTNSHIFT_LEFT = 0, BTNSHIFT_RIGHT = 3, BTNSHIFT_MIDDLE = 4};
 
-// Intrinisc game delay between execution frames. This runs at 60Hz
-#define GAME_FRAME_RATE 60
-#define GAME_FRAME_TIME (1000 / 60)
+// Intrinisc game delay between execution frames
+#define GAME_FRAME_RATE 50
+#define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
+
+#define GAME_SCRIPT_RATE 80
+#define GAME_SCRIPT_TIME (1000 / GAME_SCRIPT_RATE)
 
 class GfxManager;
 
-- 
cgit v1.2.3


From 05c5e224b45f910d9db50e6c9ce451ede31452f2 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 13:47:42 +0200
Subject: DREAMWEB: Port 'findinvpos', 'selectob' to C++ and fix a regression
 in identifyOb()

---
 engines/dreamweb/dreamgen.cpp | 69 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  2 --
 engines/dreamweb/object.cpp   | 41 +++++++++++++++++++++++++
 engines/dreamweb/stubs.h      |  3 ++
 4 files changed, 44 insertions(+), 71 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 939e8c0127..ff91eb678f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -1091,36 +1091,6 @@ void DreamGenContext::getSetAd() {
 	es = data.word(kSetdat);
 }
 
-void DreamGenContext::findInvPos() {
-	STACK_CHECK;
-	cx = data.word(kMousex);
-	_sub(cx, (80));
-	bx = -1;
-findinv1:
-	_inc(bx);
-	_sub(cx, (44));
-	if (!flags.c())
-		goto findinv1;
-	cx = data.word(kMousey);
-	_sub(cx, (58));
-	_sub(bx, 5);
-findinv2:
-	_add(bx, 5);
-	_sub(cx, (44));
-	if (!flags.c())
-		goto findinv2;
-	al = data.byte(kRyanpage);
-	ah = 0;
-	cx = 10;
-	_mul(cx);
-	_add(bx, ax);
-	al = bl;
-	data.byte(kLastinvpos) = al;
-	_add(bx, bx);
-	es = data.word(kBuffers);
-	_add(bx, (0+(228*13)+32));
-}
-
 void DreamGenContext::findOpenPos() {
 	STACK_CHECK;
 	cx = data.word(kMousex);
@@ -2736,45 +2706,6 @@ lookcolon:
 		goto lookcolon;
 }
 
-void DreamGenContext::selectOb() {
-	STACK_CHECK;
-	findInvPos();
-	ax = es.word(bx);
-	_cmp(al, 255);
-	if (!flags.z())
-		goto canselectob;
-	blank();
-	return;
-canselectob:
-	data.byte(kWithobject) = al;
-	data.byte(kWithtype) = ah;
-	_cmp(ax, data.word(kOldsubject));
-	if (!flags.z())
-		goto diffsub3;
-	_cmp(data.byte(kCommandtype), 221);
-	if (flags.z())
-		goto alreadyselob;
-	data.byte(kCommandtype) = 221;
-diffsub3:
-	data.word(kOldsubject) = ax;
-	bx = ax;
-	al = 0;
-	commandWithOb();
-alreadyselob:
-	ax = data.word(kMousebutton);
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (notselob) */;
-	_and(ax, 1);
-	if (!flags.z())
-		goto doselob;
-	return;
-doselob:
-	delPointer();
-	data.byte(kInvopen) = 0;
-	useRoutine();
-}
-
 void DreamGenContext::showDiaryKeys() {
 	STACK_CHECK;
 	_cmp(data.byte(kPresscount), 0);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 28711bb1ba..139253cdb8 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -496,9 +496,7 @@ public:
 	void removeObFromInv();
 	void dirFile();
 	void pickupConts();
-	void findInvPos();
 	void getKeyAndLogo();
-	void selectOb();
 	void fadeUpMon();
 	void reExFromInv();
 	void outOfInv();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 747b7934b4..283e44b583 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -331,6 +331,8 @@ void DreamGenContext::identifyOb() {
 	push(ax);
 	findPathOfPoint();
 	data.byte(kPointerspath) = dl;
+	ax = pop();
+	push(ax);
 	findFirstPath();
 	data.byte(kPointerfirstpath) = al;
 	ax = pop();
@@ -354,4 +356,43 @@ void DreamGenContext::identifyOb() {
 		blank();
 }
 
+uint16 DreamGenContext::findInvPosCPP() {
+	uint16 x = data.word(kMousex) - kInventx;
+	uint16 y = data.word(kMousey) - kInventy;
+	uint16 pos = (x / kItempicsize) + (y / kItempicsize) * 5;
+	uint16 invPos = data.byte(kRyanpage) * 10 + pos;
+	data.byte(kLastinvpos) = invPos & 0xFF;
+	return invPos * 2 + kRyaninvlist;
+}
+
+void DreamGenContext::findInvPos() {
+	bx = findInvPosCPP();
+	es = data.word(kBuffers);
+}
+
+void DreamGenContext::selectOb() {
+	es = data.word(kBuffers);
+
+	uint16 objectId = es.word(findInvPosCPP());
+	if ((objectId & 0xFF) == 255) {
+		blank();
+		return;
+	}
+
+	data.byte(kWithobject) = objectId & 0x00FF;
+	data.byte(kWithtype)   = objectId & 0xFF00;
+
+	if (objectId == data.word(kOldsubject) && data.byte(kCommandtype) != 221)
+		data.byte(kCommandtype) = 221;
+
+	data.word(kOldsubject) = objectId;
+	commandWithOb(0, data.byte(kWithtype), data.byte(kWithobject));
+
+	if (data.word(kMousebutton) != data.word(kOldbutton) && (data.word(kMousebutton) & 1)) {
+		delPointer();
+		data.byte(kInvopen) = 0;
+		useRoutine();
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index b2417e767b..d9823fb2c0 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -398,5 +398,8 @@
 	void useStereo();
 	void checkInside();
 	uint16 checkInside(uint16 command, uint16 type);
+	void selectOb();
+	void findInvPos();
+	uint16 findInvPosCPP();
 
 #endif
-- 
cgit v1.2.3


From 710072c55bcdac525bea401a4c9fa260a95d79c5 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 14:33:17 +0200
Subject: DREAMWEB: Fix regression in getOpenedSize()

---
 engines/dreamweb/object.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 283e44b583..d376f915e5 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -284,7 +284,26 @@ void DreamBase::getBackFromOb() {
 }
 
 void DreamGenContext::getOpenedSize() {
-	ax = getOpenedSizeCPP();
+	//ax = getOpenedSizeCPP();
+
+	// We need to call the ASM-style versions of get*Ad, as these also set
+	// bx and es
+
+	al = data.byte(kOpenedob);
+
+	switch (data.byte(kOpenedtype)) {
+	case 4:
+		getExAd();
+		break;
+	case 2:
+		getFreeAd();
+		break;
+	default:
+		getSetAd();
+		break;
+	}
+
+	ax = es.word(bx+7);
 }
 
 byte DreamGenContext::getOpenedSizeCPP() {
-- 
cgit v1.2.3


From 127795805358493d92f82fae2768c1559a8bcaf0 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 15:23:06 +0200
Subject: DREAMWEB: Fix regression in isRyanHolding()

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

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 376a681604..8ee5158773 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1781,7 +1781,7 @@ void DreamGenContext::isRyanHolding() {
 	id[2] = cl;
 	id[3] = ch;
 	id[4] = '\0';
-	flags._z = isRyanHolding(id);
+	flags._z = !isRyanHolding(id);
 }
 
 bool DreamGenContext::isRyanHolding(const char *id) {
-- 
cgit v1.2.3


From 7d38ba5619fbca6850c0d67eb9a2b43938654cf1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 15:25:56 +0200
Subject: DREAMWEB: Fix another regression in isRyanHolding() (thanks wjp)

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

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 8ee5158773..a1d08b35d1 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1788,7 +1788,7 @@ bool DreamGenContext::isRyanHolding(const char *id) {
 	for (uint16 index = 0; index < kNumexobjects; index++) {
 		DynObject *object = getExAd(index);
 		if (object->mapad[0] == 4 && objectMatches(object, id))
-			return (index == kNumexobjects);
+			return true;
 	}
 
 	return false;
-- 
cgit v1.2.3


From b1edf2446251a0141fae38ad0bff42d2a639a1bf Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 15:43:10 +0200
Subject: DREAMWEB: Fix a regression in businessMan(), and updated its comments

---
 engines/dreamweb/people.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 887a4452ad..e8446f0445 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -873,24 +873,23 @@ void DreamGenContext::mugger(ReelRoutine &routine) {
 	}
 }
 
+// Exiting the elevator of Sartain's industries, Sartain (the businessman) and
+// two bodyguards are expecting Ryan.
 void DreamBase::businessMan(ReelRoutine &routine) {
 	data.byte(kPointermode) = 0;
 	data.word(kWatchingtime) = 2;
-	if (routine.reelPointer() == 2) {
-		// First
-		DreamBase::setupTimedUse(49, 30, 1, 68, 174);
-		return;
-	}
+	if (routine.reelPointer() == 2)
+		DreamBase::setupTimedUse(49, 30, 1, 68, 174);	// First
 
 	if (routine.reelPointer() == 95) {
-		// Bus combat won - end
+		// Businessman combat won - end
 		data.byte(kPointermode) = 0;
 		data.word(kWatchingtime) = 0;
 		return;
 	}
 
 	if (routine.reelPointer() == 49)
-		return; // buscombatend
+		return; // Businessman combat end
 
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
@@ -904,7 +903,7 @@ void DreamBase::businessMan(ReelRoutine &routine) {
 				data.byte(kCombatcount) = 0;
 				nextReelPointer = 51;
 			} else {
-				// No shield on bus
+				// No shield on businessman
 				data.byte(kCombatcount)++;
 				if (data.byte(kCombatcount) == 20) {
 					data.byte(kCombatcount) = 0;
@@ -912,7 +911,7 @@ void DreamBase::businessMan(ReelRoutine &routine) {
 				}
 			}
 		} else {
-			// Bus combat won
+			// Businessman combat won
 			if (nextReelPointer == 91) {
 				turnPathOn(0);
 				turnPathOn(1);
-- 
cgit v1.2.3


From 956abddc5ce30bf29bb7df84f3eb3f74076d57e0 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 15:50:48 +0200
Subject: DREAMWEB: Fix regression in selectOb() (thanks wjp)

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

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index d376f915e5..3cea2a5c2f 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -399,7 +399,7 @@ void DreamGenContext::selectOb() {
 	}
 
 	data.byte(kWithobject) = objectId & 0x00FF;
-	data.byte(kWithtype)   = objectId & 0xFF00;
+	data.byte(kWithtype)   = objectId >> 8;
 
 	if (objectId == data.word(kOldsubject) && data.byte(kCommandtype) != 221)
 		data.byte(kCommandtype) = 221;
-- 
cgit v1.2.3


From 400bda78d2ad98c7671c384e58cb6d74ba7579fd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 16:21:32 +0200
Subject: DREAMWEB: Fix another regression in selectOb() (thanks wjp)

---
 engines/dreamweb/object.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 3cea2a5c2f..dbae7e2ba5 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -401,8 +401,19 @@ void DreamGenContext::selectOb() {
 	data.byte(kWithobject) = objectId & 0x00FF;
 	data.byte(kWithtype)   = objectId >> 8;
 
-	if (objectId == data.word(kOldsubject) && data.byte(kCommandtype) != 221)
-		data.byte(kCommandtype) = 221;
+	if (objectId == data.word(kOldsubject)) {
+		if (data.byte(kCommandtype) == 221) {
+			// Object already selected
+			if (data.word(kMousebutton) != data.word(kOldbutton) && (data.word(kMousebutton) & 1)) {
+				delPointer();
+				data.byte(kInvopen) = 0;
+				useRoutine();
+			}
+			return;
+		} else {
+			data.byte(kCommandtype) = 221;
+		}
+	}
 
 	data.word(kOldsubject) = objectId;
 	commandWithOb(0, data.byte(kWithtype), data.byte(kWithobject));
-- 
cgit v1.2.3


From 9fdb38d39510d81de43c887e95bae5b6e6a91156 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 16:32:12 +0200
Subject: DREAMWEB: Fix another regression in the ASM-style version of
 getOpenedSize()

---
 engines/dreamweb/object.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index dbae7e2ba5..29e6d52ba7 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -294,16 +294,17 @@ void DreamGenContext::getOpenedSize() {
 	switch (data.byte(kOpenedtype)) {
 	case 4:
 		getExAd();
+		ax = es.word(bx+7);
 		break;
 	case 2:
 		getFreeAd();
+		ax = es.word(bx+7);
 		break;
 	default:
 		getSetAd();
+		ax = es.word(bx+3);
 		break;
 	}
-
-	ax = es.word(bx+7);
 }
 
 byte DreamGenContext::getOpenedSizeCPP() {
-- 
cgit v1.2.3


From 3185dac25e2f1984ccf92e7c33eee12caa6cd676 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 17 Dec 2011 16:39:01 +0100
Subject: DREAMWEB: Work around runtime limitation

The WordRef accessor writes back its value too late. Example: in the
call printDirect(data.word(kLastxpos), .....)
the destructor isn't called until after printDirect returns.
This destroys the modifications to lastXPos that printDirect makes.
---
 engines/dreamweb/segment.h | 5 +++++
 engines/dreamweb/use.cpp   | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/dreamweb/segment.h b/engines/dreamweb/segment.h
index 9464015478..65bc2335ea 100644
--- a/engines/dreamweb/segment.h
+++ b/engines/dreamweb/segment.h
@@ -56,6 +56,11 @@ public:
 	}
 
 	inline ~WordRef() {
+		// FIXME: This is _too late_ to write back the
+		// value. Example: in the call
+		// printDirect(data.word(kLastxpos), .....)
+		// the destructor isn't called until after printDirect returns. This
+		// destroys the modifications to lastXPos that printDirect makes.
 		_data[0] = _value & 0xff;
 		_data[1] = _value >> 8;
 		_value = _data[0] | (_data[1] << 8);
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 4be3c7a6b3..ba1e8e4952 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1581,7 +1581,8 @@ void DreamGenContext::withWhat() {
 
 	copyName(data.byte(kObjecttype), data.byte(kCommand), commandLine);
 	printMessage2(100, 21, 63, 200, false, 2);
-	printDirect(commandLine, data.word(kLastxpos) + 5, 21, 220, false);
+	uint16 x = data.word(kLastxpos) + 5;
+	printDirect(commandLine, x, 21, 220, false);
 	printMessage2(data.word(kLastxpos) + 5, 21, 63, 200, false, 3);
 
 	fillRyan();
-- 
cgit v1.2.3


From 0731bcb5acb9a591eac843904e725de98b19fa73 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 19:28:04 +0200
Subject: DREAMWEB: Implement removeSaveState()

---
 engines/dreamweb/detection.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines')

diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index ba7152beb5..db2155fc4c 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -116,6 +116,8 @@ SaveStateList DreamWebMetaEngine::listSaves(const char *target) const {
 int DreamWebMetaEngine::getMaximumSaveSlot() const { return 99; }
 
 void DreamWebMetaEngine::removeSaveState(const char *target, int slot) const {
+	Common::String fileName = Common::String::format("DREAMWEB.D%02d", slot);
+	g_system->getSavefileManager()->removeSavefile(fileName);
 }
 
 #if PLUGIN_ENABLED_DYNAMIC(DREAMWEB)
-- 
cgit v1.2.3


From af1c8d774d4d15b848876c915165cf4b2632ebae Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 19:30:06 +0200
Subject: DREAMWEB: Fix two off-by-one errors in saveGame(), rewrite
 scanForNames() to use listSavefiles() and use Common::strlcopy instead of
 strncpy

---
 engines/dreamweb/saveload.cpp | 63 +++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 33 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 2945874e1a..574036c045 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -191,16 +191,16 @@ void DreamGenContext::saveGame() {
 		}
 
 		char descbuf[17] = { 2, 0 };
-		strncpy((char*)descbuf+1, game_description.c_str(), 16);
+		Common::strlcpy((char*)descbuf+1, game_description.c_str(), 16);
 		unsigned int desclen = game_description.size();
 		if (desclen > 15)
 			desclen = 15;
 		// zero terminate, and pad with ones
 		descbuf[++desclen] = 0;
-		while (desclen < 17)
+		while (desclen < 16)
 			descbuf[++desclen] = 1;
 		if (savegameId < 7)
-			memcpy(&_saveNames[17*savegameId], descbuf, 17);
+			Common::strlcpy(&_saveNames[17 * savegameId + 1], descbuf, 16);	// the first character is unused
 
 		savePosition(savegameId, descbuf);
 
@@ -464,42 +464,39 @@ void DreamGenContext::loadPosition(unsigned int slot) {
 
 // Count number of save files, and load their descriptions into _saveNames
 unsigned int DreamGenContext::scanForNames() {
-	unsigned int count = 0;
-
-	FileHeader header;
-
-	// TODO: Change this to use SaveFileManager::listSavefiles()
+	// Initialize the first 7 slots (like the original code expects)
 	for (unsigned int slot = 0; slot < 7; ++slot) {
-		_saveNames[17*slot+0] = 2;
-		_saveNames[17*slot+1] = 0;
+		_saveNames[17 * slot + 0] = 2;
+		_saveNames[17 * slot + 1] = 0;
 		for (int i = 2; i < 17; ++i)
-			_saveNames[17*slot+i] = 1;
-
-		// Try opening savegame with the given slot id
-		Common::String filename = engine->getSavegameFilename(slot);
-		Common::InSaveFile *inSaveFile = engine->getSaveFileManager()->openForLoading(filename);
-		if (!inSaveFile)
-			continue;
-
-		++count;
-
-		inSaveFile->read((uint8 *)&header, sizeof(FileHeader));
-
-		if (header.len(0) != 17) {
-			::warning("Error loading save: description buffer isn't 17 bytes");
-			delete inSaveFile;
-			continue;
-		}
-
-		// NB: Only possible if slot < 7
-		inSaveFile->read(&_saveNames[17*slot], 17);
+			_saveNames[17 * slot + i] = 1;	// initialize with 1's
+	}
 
-		delete inSaveFile;
+	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
+	Common::StringArray files = saveFileMan->listSavefiles("DREAMWEB.D??");
+	Common::sort(files.begin(), files.end());
+
+	SaveStateList saveList;
+	for (uint i = 0; i < files.size(); ++i) {
+		const Common::String &file = files[i];
+		Common::InSaveFile *stream = saveFileMan->openForLoading(file);
+		if (!stream)
+			error("cannot open save file %s", file.c_str());
+		char name[17] = {};
+		stream->seek(0x61);
+		stream->read(name, sizeof(name) - 1);
+		delete stream;
+
+		int slotNum = atoi(file.c_str() + file.size() - 2);
+		SaveStateDescriptor sd(slotNum, name);
+		saveList.push_back(sd);
+		if (slotNum < 7)
+			Common::strlcpy(&_saveNames[17 * slotNum + 1], name, 16);	// the first character is unused
 	}
 
-	al = (uint8)count;
+	al = saveList.size() <= 7 ? (uint8)saveList.size() : 7;
 
-	return count;
+	return saveList.size();
 }
 
 void DreamGenContext::loadOld() {
-- 
cgit v1.2.3


From 855b5320b3249e138eeb07a2414ce2ecb862387a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 19:30:48 +0200
Subject: DREAMWEB: Use ScummVM's save/load dialogs by default

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

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 082b7d8ce7..0af3f00d5c 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -209,7 +209,7 @@ Common::Error DreamWebEngine::run() {
 	syncSoundSettings();
 	_console = new DreamWebConsole(this);
 
-	ConfMan.registerDefault("dreamweb_originalsaveload", "true");
+	ConfMan.registerDefault("dreamweb_originalsaveload", "false");
 
 	_timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync");
 	_context.__start();
-- 
cgit v1.2.3


From f8bfe84c44edd9969cad6c9e011c43f92127a23d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 17 Dec 2011 20:06:55 +0200
Subject: DREAMWEB: Remove dead code

---
 engines/dreamweb/saveload.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 574036c045..c77c419148 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -191,7 +191,7 @@ void DreamGenContext::saveGame() {
 		}
 
 		char descbuf[17] = { 2, 0 };
-		Common::strlcpy((char*)descbuf+1, game_description.c_str(), 16);
+		Common::strlcpy((char*)descbuf + 1, game_description.c_str(), 16);
 		unsigned int desclen = game_description.size();
 		if (desclen > 15)
 			desclen = 15;
@@ -199,9 +199,6 @@ void DreamGenContext::saveGame() {
 		descbuf[++desclen] = 0;
 		while (desclen < 16)
 			descbuf[++desclen] = 1;
-		if (savegameId < 7)
-			Common::strlcpy(&_saveNames[17 * savegameId + 1], descbuf, 16);	// the first character is unused
-
 		savePosition(savegameId, descbuf);
 
 		// TODO: The below is copied from actualsave
-- 
cgit v1.2.3


From 6dd09b8935495d211c51a45652fc59b4da1b0442 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 14 Dec 2011 17:19:14 +0100
Subject: DREAMWEB: Convert checkForExit

---
 engines/dreamweb/dreambase.h  |   2 +
 engines/dreamweb/dreamgen.cpp | 371 ++++++++++-------------------------
 engines/dreamweb/dreamgen.h   | 442 +++++++++++++++++++++---------------------
 engines/dreamweb/sprite.cpp   |  61 +++++-
 engines/dreamweb/stubs.cpp    |   3 +-
 engines/dreamweb/stubs.h      |   4 +-
 6 files changed, 388 insertions(+), 495 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 20cafcb203..7c86696568 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -263,6 +263,7 @@ public:
 	void clearReels();
 	void getRidOfReels();
 	void liftNoise(uint8 index);
+	void checkForExit(Sprite *sprite);
 
 	// from stubs.cpp
 	bool isCD();
@@ -388,6 +389,7 @@ public:
 	void dumpTimedText();
 	void getTime();
 	void doChange(uint8 index, uint8 value, uint8 type);
+	bool isRyanHolding(const char *id);
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index ff91eb678f..ea4d8e5b05 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -26,165 +26,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::checkForExit() {
-	STACK_CHECK;
-	cl = data.byte(kRyanx);
-	_add(cl, 12);
-	ch = data.byte(kRyany);
-	_add(ch, 12);
-	checkOne();
-	data.byte(kLastflag) = cl;
-	data.byte(kLastflagex) = ch;
-	data.byte(kFlagx) = dl;
-	data.byte(kFlagy) = dh;
-	al = data.byte(kLastflag);
-	_test(al, 64);
-	if (flags.z())
-		goto notnewdirect;
-	al = data.byte(kLastflagex);
-	data.byte(kAutolocation) = al;
-	return;
-notnewdirect:
-	_test(al, 32);
-	if (flags.z())
-		goto notleave;
-	push(es);
-	push(bx);
-	_cmp(data.byte(kReallocation), 2);
-	if (!flags.z())
-		goto notlouis;
-	bl = 0;
-	push(bx);
-	al = 'W';
-	ah = 'E';
-	cl = 'T';
-	ch = 'A';
-	isRyanHolding();
-	bx = pop();
-	if (flags.z())
-		goto noshoe1;
-	_inc(bl);
-noshoe1:
-	push(bx);
-	al = 'W';
-	ah = 'E';
-	cl = 'T';
-	ch = 'B';
-	isRyanHolding();
-	bx = pop();
-	if (flags.z())
-		goto noshoe2;
-	_inc(bl);
-noshoe2:
-	_cmp(bl, 2);
-	if (flags.z())
-		goto notlouis;
-	al = 42;
-	_cmp(bl, 0);
-	if (flags.z())
-		goto notravmessage;
-	_inc(al);
-notravmessage:
-	cx = 80;
-	dx = 10;
-	bl = 68;
-	bh = 64;
-	setupTimedUse();
-	al = data.byte(kFacing);
-	_add(al, 4);
-	_and(al, 7);
-	data.byte(kTurntoface) = al;
-	bx = pop();
-	es = pop();
-	return;
-notlouis:
-	bx = pop();
-	es = pop();
-	data.byte(kNeedtotravel) = 1;
-	return;
-notleave:
-	_test(al, 4);
-	if (flags.z())
-		goto notaleft;
-	adjustLeft();
-	return;
-notaleft:
-	_test(al, 2);
-	if (flags.z())
-		goto notaright;
-	adjustRight();
-	return;
-notaright:
-	_test(al, 8);
-	if (flags.z())
-		goto notadown;
-	adjustDown();
-	return;
-notadown:
-	_test(al, 16);
-	if (flags.z())
-		return /* (notanup) */;
-	adjustUp();
-}
-
-void DreamGenContext::adjustDown() {
-	STACK_CHECK;
-	push(es);
-	push(bx);
-	_add(data.byte(kMapy), 10);
-	al = data.byte(kLastflagex);
-	cl = 16;
-	_mul(cl);
-	es.byte(bx+11) = al;
-	data.byte(kNowinnewroom) = 1;
-	bx = pop();
-	es = pop();
-}
-
-void DreamGenContext::adjustUp() {
-	STACK_CHECK;
-	push(es);
-	push(bx);
-	_sub(data.byte(kMapy), 10);
-	al = data.byte(kLastflagex);
-	cl = 16;
-	_mul(cl);
-	es.byte(bx+11) = al;
-	data.byte(kNowinnewroom) = 1;
-	bx = pop();
-	es = pop();
-}
-
-void DreamGenContext::adjustLeft() {
-	STACK_CHECK;
-	push(es);
-	push(bx);
-	data.byte(kLastflag) = 0;
-	_sub(data.byte(kMapx), 11);
-	al = data.byte(kLastflagex);
-	cl = 16;
-	_mul(cl);
-	es.byte(bx+10) = al;
-	data.byte(kNowinnewroom) = 1;
-	bx = pop();
-	es = pop();
-}
-
-void DreamGenContext::adjustRight() {
-	STACK_CHECK;
-	push(es);
-	push(bx);
-	_add(data.byte(kMapx), 11);
-	al = data.byte(kLastflagex);
-	cl = 16;
-	_mul(cl);
-	_sub(al, 2);
-	es.byte(bx+10) = al;
-	data.byte(kNowinnewroom) = 1;
-	bx = pop();
-	es = pop();
-}
-
 void DreamGenContext::reminders() {
 	STACK_CHECK;
 	_cmp(data.byte(kReallocation), 24);
@@ -2140,14 +1981,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 1123;
+	si = 1120;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 1139;
+	si = 1136;
 	_add(si, ax);
 	ax = pop();
 }
@@ -2199,7 +2040,7 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 1123);
+	_add(bx, 1120);
 	es.byte(bx) = 0;
 }
 
@@ -2238,7 +2079,7 @@ dirroot:
 	si = offset_rootdir;
 	_inc(si);
 	es = cs;
-	di = 1048;
+	di = 1045;
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
@@ -2340,7 +2181,7 @@ notyetassigned:
 	push(bx);
 	_add(bx, 2);
 	ds = cs;
-	si = 1157;
+	si = 1154;
 checkpass:
 	_lodsw();
 	ah = es.byte(bx);
@@ -2411,7 +2252,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 1048;
+	di = 1045;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -2541,7 +2382,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 1048+1;
+	di = 1045+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -2668,7 +2509,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 1157;
+	si = 1154;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -2755,7 +2596,7 @@ gotkeyp:
 void DreamGenContext::clearBuffers() {
 	STACK_CHECK;
 	es = data.word(kBuffers);
-	cx = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+901-444+68-0)/2;
+	cx = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+898-441+68-0)/2;
 	ax = 0;
 	di = 0;
 	_stosw(cx, true);
@@ -2767,11 +2608,11 @@ void DreamGenContext::clearBuffers() {
 	es = data.word(kBuffers);
 	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
 	ds = cs;
-	si = 444;
-	cx = (901-444);
+	si = 441;
+	cx = (898-441);
 	_movsb(cx, true);
 	es = data.word(kBuffers);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+901-444);
+	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+898-441);
 	ds = cs;
 	si = 0;
 	cx = (68-0);
@@ -2789,11 +2630,11 @@ void DreamGenContext::clearChanges() {
 	ds = data.word(kBuffers);
 	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
 	es = cs;
-	di = 444;
-	cx = (901-444);
+	di = 441;
+	cx = (898-441);
 	_movsb(cx, true);
 	ds = data.word(kBuffers);
-	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+901-444);
+	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+898-441);
 	es = cs;
 	di = 0;
 	cx = (68-0);
@@ -2807,7 +2648,7 @@ void DreamGenContext::clearChanges() {
 	di = 0;
 	_stosw(cx, true);
 	es = cs;
-	di = 1123;
+	di = 1120;
 	al = 1;
 	_stosb(2);
 	al = 0;
@@ -2930,14 +2771,14 @@ void DreamGenContext::__start() {
 		//0x0090: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00a0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00b0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00c0: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 
+		//0x00d0: .... .... .... .  .
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x00d0: .... .... .... ....
-		0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x00e0:   .. .... .... ....
+		//0x00e0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00f0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -2954,105 +2795,105 @@ void DreamGenContext::__start() {
 		//0x0150: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0170: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0180: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 
 		//0x0190: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x01a0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x01, 0x2c, 0x00, 0x14, 
-		//0x01b0: .... .... .... .,..
-		0x00, 0x02, 0x00, 0x01, 0x01, 0x37, 0x00, 0x00, 0x00, 0x32, 0x14, 0x00, 0x18, 0x16, 0x00, 0x4a, 
-		//0x01c0: .... .7.. .2.. ...J
-		0x00, 0x01, 0x00, 0x00, 0x18, 0x21, 0x0a, 0x4b, 0x00, 0x01, 0x00, 0x01, 0x01, 0x2c, 0x00, 0x1b, 
-		//0x01d0: .... .!.K .... .,..
-		0x00, 0x02, 0x00, 0x02, 0x01, 0x2c, 0x00, 0x60, 0x00, 0x03, 0x00, 0x04, 0x01, 0x2c, 0x00, 0x76, 
-		//0x01e0: .... .,.` .... .,.v
-		0x00, 0x02, 0x00, 0x05, 0x01, 0x2c, 0x0a, 0x00, 0x00, 0x02, 0x00, 0x00, 0x05, 0x16, 0x14, 0x35, 
-		//0x01f0: .... .,.. .... ...5
-		0x00, 0x03, 0x00, 0x00, 0x05, 0x16, 0x14, 0x28, 0x00, 0x01, 0x00, 0x02, 0x05, 0x16, 0x14, 0x32, 
-		//0x0200: .... ...( .... ...2
-		0x00, 0x01, 0x00, 0x03, 0x02, 0x0b, 0x0a, 0xc0, 0x00, 0x01, 0x00, 0x00, 0x02, 0x0b, 0x0a, 0xb6, 
+		0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x01, 0x2c, 0x00, 0x14, 0x00, 0x02, 0x00, 
+		//0x01b0: .... .... ..,. ....
+		0x01, 0x01, 0x37, 0x00, 0x00, 0x00, 0x32, 0x14, 0x00, 0x18, 0x16, 0x00, 0x4a, 0x00, 0x01, 0x00, 
+		//0x01c0: ..7. ..2. .... J...
+		0x00, 0x18, 0x21, 0x0a, 0x4b, 0x00, 0x01, 0x00, 0x01, 0x01, 0x2c, 0x00, 0x1b, 0x00, 0x02, 0x00, 
+		//0x01d0: ..!. K... ..,. ....
+		0x02, 0x01, 0x2c, 0x00, 0x60, 0x00, 0x03, 0x00, 0x04, 0x01, 0x2c, 0x00, 0x76, 0x00, 0x02, 0x00, 
+		//0x01e0: ..,. `... ..,. v...
+		0x05, 0x01, 0x2c, 0x0a, 0x00, 0x00, 0x02, 0x00, 0x00, 0x05, 0x16, 0x14, 0x35, 0x00, 0x03, 0x00, 
+		//0x01f0: ..,. .... .... 5...
+		0x00, 0x05, 0x16, 0x14, 0x28, 0x00, 0x01, 0x00, 0x02, 0x05, 0x16, 0x14, 0x32, 0x00, 0x01, 0x00, 
+		//0x0200: .... (... .... 2...
+		0x03, 0x02, 0x0b, 0x0a, 0xc0, 0x00, 0x01, 0x00, 0x00, 0x02, 0x0b, 0x0a, 0xb6, 0x00, 0x02, 0x00, 
 		//0x0210: .... .... .... ....
-		0x00, 0x02, 0x00, 0x01, 0x08, 0x0b, 0x0a, 0x00, 0x00, 0x02, 0x00, 0x01, 0x17, 0x00, 0x32, 0x00, 
-		//0x0220: .... .... .... ..2.
-		0x00, 0x03, 0x00, 0x00, 0x1c, 0x0b, 0x14, 0xfa, 0x00, 0x04, 0x00, 0x00, 0x17, 0x00, 0x32, 0x2b, 
-		//0x0230: .... .... .... ..2+
-		0x00, 0x02, 0x00, 0x08, 0x17, 0x0b, 0x28, 0x82, 0x00, 0x02, 0x00, 0x01, 0x17, 0x16, 0x28, 0x7a, 
-		//0x0240: .... ..(. .... ..(z
-		0x00, 0x02, 0x00, 0x02, 0x17, 0x16, 0x28, 0x69, 0x00, 0x02, 0x00, 0x03, 0x17, 0x16, 0x28, 0x51, 
-		//0x0250: .... ..(i .... ..(Q
-		0x00, 0x02, 0x00, 0x04, 0x17, 0x0b, 0x28, 0x87, 0x00, 0x02, 0x00, 0x05, 0x17, 0x16, 0x28, 0x91, 
-		//0x0260: .... ..(. .... ..(.
-		0x00, 0x02, 0x00, 0x06, 0x04, 0x16, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0xc8, 
-		//0x0270: .... .... .... -...
-		0x00, 0x00, 0x00, 0x14, 0x2d, 0x16, 0x1e, 0x27, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0x19, 
-		//0x0280: .... -..' .... -...
-		0x00, 0x02, 0x00, 0x00, 0x08, 0x16, 0x28, 0x20, 0x00, 0x02, 0x00, 0x00, 0x07, 0x0b, 0x14, 0x40, 
-		//0x0290: .... ..(  .... ...@
-		0x00, 0x02, 0x00, 0x00, 0x16, 0x16, 0x14, 0x52, 0x00, 0x02, 0x00, 0x00, 0x1b, 0x0b, 0x1e, 0x00, 
-		//0x02a0: .... ...R .... ....
-		0x00, 0x02, 0x00, 0x00, 0x14, 0x00, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x21, 0x28, 0x15, 
-		//0x02b0: .... .... .... .!(.
-		0x00, 0x01, 0x00, 0x00, 0x1d, 0x0b, 0x0a, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x16, 0x00, 0x02, 
+		0x01, 0x08, 0x0b, 0x0a, 0x00, 0x00, 0x02, 0x00, 0x01, 0x17, 0x00, 0x32, 0x00, 0x00, 0x03, 0x00, 
+		//0x0220: .... .... ...2 ....
+		0x00, 0x1c, 0x0b, 0x14, 0xfa, 0x00, 0x04, 0x00, 0x00, 0x17, 0x00, 0x32, 0x2b, 0x00, 0x02, 0x00, 
+		//0x0230: .... .... ...2 +...
+		0x08, 0x17, 0x0b, 0x28, 0x82, 0x00, 0x02, 0x00, 0x01, 0x17, 0x16, 0x28, 0x7a, 0x00, 0x02, 0x00, 
+		//0x0240: ...( .... ...( z...
+		0x02, 0x17, 0x16, 0x28, 0x69, 0x00, 0x02, 0x00, 0x03, 0x17, 0x16, 0x28, 0x51, 0x00, 0x02, 0x00, 
+		//0x0250: ...( i... ...( Q...
+		0x04, 0x17, 0x0b, 0x28, 0x87, 0x00, 0x02, 0x00, 0x05, 0x17, 0x16, 0x28, 0x91, 0x00, 0x02, 0x00, 
+		//0x0260: ...( .... ...( ....
+		0x06, 0x04, 0x16, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0xc8, 0x00, 0x00, 0x00, 
+		//0x0270: .... .... .-.. ....
+		0x14, 0x2d, 0x16, 0x1e, 0x27, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0x19, 0x00, 0x02, 0x00, 
+		//0x0280: .-.. '... .-.. ....
+		0x00, 0x08, 0x16, 0x28, 0x20, 0x00, 0x02, 0x00, 0x00, 0x07, 0x0b, 0x14, 0x40, 0x00, 0x02, 0x00, 
+		//0x0290: ...(  ... .... @...
+		0x00, 0x16, 0x16, 0x14, 0x52, 0x00, 0x02, 0x00, 0x00, 0x1b, 0x0b, 0x1e, 0x00, 0x00, 0x02, 0x00, 
+		//0x02a0: .... R... .... ....
+		0x00, 0x14, 0x00, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x21, 0x28, 0x15, 0x00, 0x01, 0x00, 
+		//0x02b0: .... .... ..!( ....
+		0x00, 0x1d, 0x0b, 0x0a, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x16, 0x00, 0x02, 0x00, 0x02, 0x00, 
 		//0x02c0: .... .... .... ....
-		0x00, 0x02, 0x00, 0x00, 0x19, 0x00, 0x32, 0x04, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x1e, 0x79, 
-		//0x02d0: .... ..2. .... 2..y
-		0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x1e, 0x00, 0x00, 0x14, 0x00, 0x00, 0x34, 0x16, 0x1e, 0xc0, 
-		//0x02e0: .... 2... .... 4...
-		0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0xe9, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x68, 
-		//0x02f0: .... 4... .... 2.(h
-		0x00, 0x37, 0x00, 0x00, 0x35, 0x21, 0x00, 0x63, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x00, 
-		//0x0300: .7.. 5!.c .... 2.(.
-		0x00, 0x03, 0x00, 0x00, 0x32, 0x16, 0x1e, 0xa2, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0x39, 
-		//0x0310: .... 2... .... 4..9
-		0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x36, 0x00, 0x00, 0x48, 
-		//0x0320: .... 4... .... 6..H
-		0x00, 0x03, 0x00, 0x00, 0x37, 0x2c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 
-		//0x0330: .... 7,.. .... ....
-		0x00, 0x1c, 0x00, 0x00, 0x0e, 0x16, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x16, 0x00, 0x2c, 
-		//0x0340: .... .... .... ...,
-		0x01, 0x01, 0x00, 0x00, 0x0a, 0x16, 0x1e, 0xae, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x16, 0x14, 0x00, 
+		0x00, 0x19, 0x00, 0x32, 0x04, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x1e, 0x79, 0x00, 0x02, 0x00, 
+		//0x02d0: ...2 .... .2.. y...
+		0x00, 0x32, 0x16, 0x1e, 0x00, 0x00, 0x14, 0x00, 0x00, 0x34, 0x16, 0x1e, 0xc0, 0x00, 0x02, 0x00, 
+		//0x02e0: .2.. .... .4.. ....
+		0x00, 0x34, 0x16, 0x1e, 0xe9, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x68, 0x00, 0x37, 0x00, 
+		//0x02f0: .4.. .... .2.( h.7.
+		0x00, 0x35, 0x21, 0x00, 0x63, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x00, 0x00, 0x03, 0x00, 
+		//0x0300: .5!. c... .2.( ....
+		0x00, 0x32, 0x16, 0x1e, 0xa2, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0x39, 0x00, 0x02, 0x00, 
+		//0x0310: .2.. .... .4.. 9...
+		0x00, 0x34, 0x16, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x36, 0x00, 0x00, 0x48, 0x00, 0x03, 0x00, 
+		//0x0320: .4.. .... .6.. H...
+		0x00, 0x37, 0x2c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+		//0x0330: .7,. .... .... ....
+		0x00, 0x0e, 0x16, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x16, 0x00, 0x2c, 0x01, 0x01, 0x00, 
+		//0x0340: .... .... .... ,...
+		0x00, 0x0a, 0x16, 0x1e, 0xae, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x16, 0x14, 0x00, 0x00, 0x01, 0x00, 
 		//0x0350: .... .... .... ....
-		0x00, 0x01, 0x00, 0x00, 0x0b, 0x0b, 0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x0b, 0x1e, 0x00, 
-		//0x0360: .... .... .2.. ....
-		0x00, 0x32, 0x14, 0x00, 0x0b, 0x16, 0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0e, 0x21, 0x28, 0x00, 
-		//0x0370: .2.. .... .2.. .!(.
-		0x00, 0x32, 0x14, 0x00, 0xff, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 
-		//0x0380: .2.. .DRE AMWE B.V9
-		0x39, 0x00, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0390: 9... PUBL IC       
-		0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 
-		//0x03a0: PUBL IC      . ..BL
-		0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 
-		//0x03b0: ACKD RAGO N RY AN  
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 
-		//0x03c0:       ... HEND RIX 
-		0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
-		//0x03d0:      LOUI S       .
-		0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 
-		//0x03e0: ..SE PTIM US     BE
-		0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 
-		//0x03f0: CKET T     ...     
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 
-		//0x0400:            ."R OOT 
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0410:         . "        
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 
-		//0x0420:       ... ..$. ....
-		0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 
+		0x00, 0x0b, 0x0b, 0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x0b, 0x1e, 0x00, 0x00, 0x32, 0x14, 
+		//0x0360: .... ..2. .... ..2.
+		0x00, 0x0b, 0x16, 0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0e, 0x21, 0x28, 0x00, 0x00, 0x32, 0x14, 
+		//0x0370: .... ..2. ..!( ..2.
+		0x00, 0xff, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x01, 
+		//0x0380: ..DR EAMW EB.V 99..
+		0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 
+		//0x0390: .PUB LIC        PUB
+		0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 
+		//0x03a0: LIC       ...B LACK
+		0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x03b0: DRAG ON R YAN      
+		0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 
+		//0x03c0:   .. .HEN DRIX     
+		0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 
+		//0x03d0:  LOU IS        ...S
+		0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 
+		//0x03e0: EPTI MUS     B ECKE
+		0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x03f0: TT     .. .        
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 
+		//0x0400:        ." ROOT     
+		0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0410:      ."            
+		0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 
+		//0x0420:   .. ...$ .... ....
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
 		//0x0430: .... .... .... ....
-		0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0440: ...D :... .... ....
+		0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0440: D:.. .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0450: .... .... .... ....
-		0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0460: .... .... .... ....
-		0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 
+		0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 
 		//0x0470: .... .... .... ....
-		0x07, 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, 
 		//0x0480: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0490: .... .... .... ....
@@ -3068,7 +2909,7 @@ void DreamGenContext::__start() {
 		//0x04e0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x04f0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
+		0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 139253cdb8..f6100557c1 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,9 +32,9 @@
 
 namespace DreamGen {
 
-static const uint16 offset_operand1 = 0x03fc;
-static const uint16 offset_keys = 0x0392;
-static const uint16 offset_rootdir = 0x040a;
+static const uint16 offset_rootdir = 0x0407;
+static const uint16 offset_operand1 = 0x03f9;
+static const uint16 offset_keys = 0x038f;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -157,220 +157,217 @@ static const uint16 kNewscreen = 149;
 static const uint16 kRyanx = 150;
 static const uint16 kRyany = 151;
 static const uint16 kLastflag = 152;
-static const uint16 kLastflagex = 153;
-static const uint16 kFlagx = 154;
-static const uint16 kFlagy = 155;
-static const uint16 kCurrentex = 156;
-static const uint16 kCurrentfree = 157;
-static const uint16 kFramesad = 158;
-static const uint16 kDataad = 160;
-static const uint16 kFrsegment = 162;
-static const uint16 kObjectx = 164;
-static const uint16 kObjecty = 166;
-static const uint16 kOffsetx = 168;
-static const uint16 kOffsety = 170;
-static const uint16 kSavesize = 172;
-static const uint16 kSavesource = 174;
-static const uint16 kSavex = 176;
-static const uint16 kSavey = 177;
-static const uint16 kCurrentob = 178;
-static const uint16 kPrioritydep = 179;
-static const uint16 kDestpos = 180;
-static const uint16 kReallocation = 181;
-static const uint16 kRoomnum = 182;
-static const uint16 kNowinnewroom = 183;
-static const uint16 kResetmanxy = 184;
-static const uint16 kNewlocation = 185;
-static const uint16 kAutolocation = 186;
-static const uint16 kMustload = 187;
-static const uint16 kAnswered = 188;
-static const uint16 kSaidno = 189;
-static const uint16 kDoorcheck1 = 190;
-static const uint16 kDoorcheck2 = 191;
-static const uint16 kDoorcheck3 = 192;
-static const uint16 kDoorcheck4 = 193;
-static const uint16 kMousex = 194;
-static const uint16 kMousey = 196;
-static const uint16 kMousebutton = 198;
-static const uint16 kMousebutton1 = 200;
-static const uint16 kMousebutton2 = 202;
-static const uint16 kMousebutton3 = 204;
-static const uint16 kMousebutton4 = 206;
-static const uint16 kOldbutton = 208;
-static const uint16 kOldx = 210;
-static const uint16 kOldy = 212;
-static const uint16 kLastbutton = 214;
-static const uint16 kOldpointerx = 216;
-static const uint16 kOldpointery = 218;
-static const uint16 kDelherex = 220;
-static const uint16 kDelherey = 222;
-static const uint16 kPointerxs = 224;
-static const uint16 kPointerys = 225;
-static const uint16 kDelxs = 226;
-static const uint16 kDelys = 227;
-static const uint16 kPointerframe = 228;
-static const uint16 kPointerpower = 229;
-static const uint16 kAuxpointerframe = 230;
-static const uint16 kPointermode = 231;
-static const uint16 kPointerspeed = 232;
-static const uint16 kPointercount = 233;
-static const uint16 kInmaparea = 234;
-static const uint16 kSlotdata = 235;
-static const uint16 kThisslot = 236;
-static const uint16 kSlotflags = 237;
-static const uint16 kTalkmode = 238;
-static const uint16 kTalkpos = 239;
-static const uint16 kCharacter = 240;
-static const uint16 kPersondata = 241;
-static const uint16 kTalknum = 243;
-static const uint16 kNumberinroom = 244;
-static const uint16 kCurrentcel = 245;
-static const uint16 kOldselection = 246;
-static const uint16 kStopwalking = 247;
-static const uint16 kMouseon = 248;
-static const uint16 kPlayed = 249;
-static const uint16 kTimer1 = 251;
-static const uint16 kTimer2 = 252;
-static const uint16 kTimer3 = 253;
-static const uint16 kWholetimer = 254;
-static const uint16 kTimer1to = 256;
-static const uint16 kTimer2to = 257;
-static const uint16 kTimer3to = 258;
-static const uint16 kWatchdump = 259;
-static const uint16 kLogonum = 260;
-static const uint16 kOldlogonum = 261;
-static const uint16 kNewlogonum = 262;
-static const uint16 kNetseg = 263;
-static const uint16 kNetpoint = 265;
-static const uint16 kKeynum = 267;
-static const uint16 kCursorstate = 268;
-static const uint16 kPressed = 269;
-static const uint16 kPresspointer = 270;
-static const uint16 kGraphicpress = 272;
-static const uint16 kPresscount = 273;
-static const uint16 kLightcount = 274;
-static const uint16 kFolderpage = 275;
-static const uint16 kDiarypage = 276;
-static const uint16 kMenucount = 277;
-static const uint16 kSymboltopx = 278;
-static const uint16 kSymboltopnum = 279;
-static const uint16 kSymboltopdir = 280;
-static const uint16 kSymbolbotx = 281;
-static const uint16 kSymbolbotnum = 282;
-static const uint16 kSymbolbotdir = 283;
-static const uint16 kSymboltolight = 284;
-static const uint16 kSymbol1 = 285;
-static const uint16 kSymbol2 = 286;
-static const uint16 kSymbol3 = 287;
-static const uint16 kSymbolnum = 288;
-static const uint16 kDumpx = 289;
-static const uint16 kDumpy = 291;
-static const uint16 kWalkandexam = 293;
-static const uint16 kWalkexamtype = 294;
-static const uint16 kWalkexamnum = 295;
-static const uint16 kCurslocx = 296;
-static const uint16 kCurslocy = 298;
-static const uint16 kCurpos = 300;
-static const uint16 kMonadx = 302;
-static const uint16 kMonady = 304;
-static const uint16 kMonsource = 306;
-static const uint16 kNumtodo = 308;
-static const uint16 kTimecount = 310;
-static const uint16 kCounttotimed = 312;
-static const uint16 kTimedseg = 314;
-static const uint16 kTimedoffset = 316;
-static const uint16 kTimedy = 318;
-static const uint16 kTimedx = 319;
-static const uint16 kNeedtodumptimed = 320;
-static const uint16 kLoadingorsave = 321;
-static const uint16 kCurrentslot = 322;
-static const uint16 kCursorpos = 323;
-static const uint16 kColourpos = 324;
-static const uint16 kFadedirection = 325;
-static const uint16 kNumtofade = 326;
-static const uint16 kFadecount = 327;
-static const uint16 kAddtogreen = 328;
-static const uint16 kAddtored = 329;
-static const uint16 kAddtoblue = 330;
-static const uint16 kLastsoundreel = 331;
-static const uint16 kSpeechloaded = 333;
-static const uint16 kSpeechlength = 334;
-static const uint16 kVolume = 336;
-static const uint16 kVolumeto = 337;
-static const uint16 kVolumedirection = 338;
-static const uint16 kVolumecount = 339;
-static const uint16 kWongame = 340;
-static const uint16 kLasthardkey = 341;
-static const uint16 kBufferin = 342;
-static const uint16 kBufferout = 344;
-static const uint16 kExtras = 346;
-static const uint16 kWorkspace = 348;
-static const uint16 kMapstore = 350;
-static const uint16 kCharset1 = 352;
-static const uint16 kBuffers = 354;
-static const uint16 kMainsprites = 356;
-static const uint16 kBackdrop = 358;
-static const uint16 kMapdata = 360;
-static const uint16 kSounddata = 362;
-static const uint16 kSounddata2 = 364;
-static const uint16 kRecordspace = 366;
-static const uint16 kFreedat = 368;
-static const uint16 kSetdat = 370;
-static const uint16 kReel1 = 372;
-static const uint16 kReel2 = 374;
-static const uint16 kReel3 = 376;
-static const uint16 kRoomdesc = 378;
-static const uint16 kFreedesc = 380;
-static const uint16 kSetdesc = 382;
-static const uint16 kBlockdesc = 384;
-static const uint16 kSetframes = 386;
-static const uint16 kFreeframes = 388;
-static const uint16 kPeople = 390;
-static const uint16 kReels = 392;
-static const uint16 kCommandtext = 394;
-static const uint16 kPuzzletext = 396;
-static const uint16 kTraveltext = 398;
-static const uint16 kTempgraphics = 400;
-static const uint16 kTempgraphics2 = 402;
-static const uint16 kTempgraphics3 = 404;
-static const uint16 kTempsprites = 406;
-static const uint16 kTextfile1 = 408;
-static const uint16 kTextfile2 = 410;
-static const uint16 kTextfile3 = 412;
-static const uint16 kBlinkframe = 414;
-static const uint16 kBlinkcount = 415;
-static const uint16 kReasseschanges = 416;
-static const uint16 kPointerspath = 417;
-static const uint16 kManspath = 418;
-static const uint16 kPointerfirstpath = 419;
-static const uint16 kFinaldest = 420;
-static const uint16 kDestination = 421;
-static const uint16 kLinestartx = 422;
-static const uint16 kLinestarty = 424;
-static const uint16 kLineendx = 426;
-static const uint16 kLineendy = 428;
-static const uint16 kLinepointer = 430;
-static const uint16 kLinedirection = 431;
-static const uint16 kLinelength = 432;
-static const uint16 kCh0blockstocopy = 433;
-static const uint16 kCh0playing = 435;
-static const uint16 kCh0repeat = 436;
-static const uint16 kCh1playing = 437;
-static const uint16 kCh1blockstocopy = 438;
-static const uint16 kSoundbufferwrite = 440;
-static const uint16 kCurrentsample = 442;
-static const uint16 kRoomssample = 443;
-static const uint16 kReelroutines = 444;
-static const uint16 kBasicsample = 901;
-static const uint16 kCurrentfile = 1048;
-static const uint16 kRoomscango = 1123;
-static const uint16 kRoompics = 1139;
-static const uint16 kOplist = 1154;
-static const uint16 kInputline = 1157;
-static const uint16 kPresslist = 1285;
-static const uint16 kQuitrequested = 1291;
-static const uint16 kSubtitles = 1292;
-static const uint16 kForeignrelease = 1293;
+static const uint16 kCurrentex = 153;
+static const uint16 kCurrentfree = 154;
+static const uint16 kFramesad = 155;
+static const uint16 kDataad = 157;
+static const uint16 kFrsegment = 159;
+static const uint16 kObjectx = 161;
+static const uint16 kObjecty = 163;
+static const uint16 kOffsetx = 165;
+static const uint16 kOffsety = 167;
+static const uint16 kSavesize = 169;
+static const uint16 kSavesource = 171;
+static const uint16 kSavex = 173;
+static const uint16 kSavey = 174;
+static const uint16 kCurrentob = 175;
+static const uint16 kPrioritydep = 176;
+static const uint16 kDestpos = 177;
+static const uint16 kReallocation = 178;
+static const uint16 kRoomnum = 179;
+static const uint16 kNowinnewroom = 180;
+static const uint16 kResetmanxy = 181;
+static const uint16 kNewlocation = 182;
+static const uint16 kAutolocation = 183;
+static const uint16 kMustload = 184;
+static const uint16 kAnswered = 185;
+static const uint16 kSaidno = 186;
+static const uint16 kDoorcheck1 = 187;
+static const uint16 kDoorcheck2 = 188;
+static const uint16 kDoorcheck3 = 189;
+static const uint16 kDoorcheck4 = 190;
+static const uint16 kMousex = 191;
+static const uint16 kMousey = 193;
+static const uint16 kMousebutton = 195;
+static const uint16 kMousebutton1 = 197;
+static const uint16 kMousebutton2 = 199;
+static const uint16 kMousebutton3 = 201;
+static const uint16 kMousebutton4 = 203;
+static const uint16 kOldbutton = 205;
+static const uint16 kOldx = 207;
+static const uint16 kOldy = 209;
+static const uint16 kLastbutton = 211;
+static const uint16 kOldpointerx = 213;
+static const uint16 kOldpointery = 215;
+static const uint16 kDelherex = 217;
+static const uint16 kDelherey = 219;
+static const uint16 kPointerxs = 221;
+static const uint16 kPointerys = 222;
+static const uint16 kDelxs = 223;
+static const uint16 kDelys = 224;
+static const uint16 kPointerframe = 225;
+static const uint16 kPointerpower = 226;
+static const uint16 kAuxpointerframe = 227;
+static const uint16 kPointermode = 228;
+static const uint16 kPointerspeed = 229;
+static const uint16 kPointercount = 230;
+static const uint16 kInmaparea = 231;
+static const uint16 kSlotdata = 232;
+static const uint16 kThisslot = 233;
+static const uint16 kSlotflags = 234;
+static const uint16 kTalkmode = 235;
+static const uint16 kTalkpos = 236;
+static const uint16 kCharacter = 237;
+static const uint16 kPersondata = 238;
+static const uint16 kTalknum = 240;
+static const uint16 kNumberinroom = 241;
+static const uint16 kCurrentcel = 242;
+static const uint16 kOldselection = 243;
+static const uint16 kStopwalking = 244;
+static const uint16 kMouseon = 245;
+static const uint16 kPlayed = 246;
+static const uint16 kTimer1 = 248;
+static const uint16 kTimer2 = 249;
+static const uint16 kTimer3 = 250;
+static const uint16 kWholetimer = 251;
+static const uint16 kTimer1to = 253;
+static const uint16 kTimer2to = 254;
+static const uint16 kTimer3to = 255;
+static const uint16 kWatchdump = 256;
+static const uint16 kLogonum = 257;
+static const uint16 kOldlogonum = 258;
+static const uint16 kNewlogonum = 259;
+static const uint16 kNetseg = 260;
+static const uint16 kNetpoint = 262;
+static const uint16 kKeynum = 264;
+static const uint16 kCursorstate = 265;
+static const uint16 kPressed = 266;
+static const uint16 kPresspointer = 267;
+static const uint16 kGraphicpress = 269;
+static const uint16 kPresscount = 270;
+static const uint16 kLightcount = 271;
+static const uint16 kFolderpage = 272;
+static const uint16 kDiarypage = 273;
+static const uint16 kMenucount = 274;
+static const uint16 kSymboltopx = 275;
+static const uint16 kSymboltopnum = 276;
+static const uint16 kSymboltopdir = 277;
+static const uint16 kSymbolbotx = 278;
+static const uint16 kSymbolbotnum = 279;
+static const uint16 kSymbolbotdir = 280;
+static const uint16 kSymboltolight = 281;
+static const uint16 kSymbol1 = 282;
+static const uint16 kSymbol2 = 283;
+static const uint16 kSymbol3 = 284;
+static const uint16 kSymbolnum = 285;
+static const uint16 kDumpx = 286;
+static const uint16 kDumpy = 288;
+static const uint16 kWalkandexam = 290;
+static const uint16 kWalkexamtype = 291;
+static const uint16 kWalkexamnum = 292;
+static const uint16 kCurslocx = 293;
+static const uint16 kCurslocy = 295;
+static const uint16 kCurpos = 297;
+static const uint16 kMonadx = 299;
+static const uint16 kMonady = 301;
+static const uint16 kMonsource = 303;
+static const uint16 kNumtodo = 305;
+static const uint16 kTimecount = 307;
+static const uint16 kCounttotimed = 309;
+static const uint16 kTimedseg = 311;
+static const uint16 kTimedoffset = 313;
+static const uint16 kTimedy = 315;
+static const uint16 kTimedx = 316;
+static const uint16 kNeedtodumptimed = 317;
+static const uint16 kLoadingorsave = 318;
+static const uint16 kCurrentslot = 319;
+static const uint16 kCursorpos = 320;
+static const uint16 kColourpos = 321;
+static const uint16 kFadedirection = 322;
+static const uint16 kNumtofade = 323;
+static const uint16 kFadecount = 324;
+static const uint16 kAddtogreen = 325;
+static const uint16 kAddtored = 326;
+static const uint16 kAddtoblue = 327;
+static const uint16 kLastsoundreel = 328;
+static const uint16 kSpeechloaded = 330;
+static const uint16 kSpeechlength = 331;
+static const uint16 kVolume = 333;
+static const uint16 kVolumeto = 334;
+static const uint16 kVolumedirection = 335;
+static const uint16 kVolumecount = 336;
+static const uint16 kWongame = 337;
+static const uint16 kLasthardkey = 338;
+static const uint16 kBufferin = 339;
+static const uint16 kBufferout = 341;
+static const uint16 kExtras = 343;
+static const uint16 kWorkspace = 345;
+static const uint16 kMapstore = 347;
+static const uint16 kCharset1 = 349;
+static const uint16 kBuffers = 351;
+static const uint16 kMainsprites = 353;
+static const uint16 kBackdrop = 355;
+static const uint16 kMapdata = 357;
+static const uint16 kSounddata = 359;
+static const uint16 kSounddata2 = 361;
+static const uint16 kRecordspace = 363;
+static const uint16 kFreedat = 365;
+static const uint16 kSetdat = 367;
+static const uint16 kReel1 = 369;
+static const uint16 kReel2 = 371;
+static const uint16 kReel3 = 373;
+static const uint16 kRoomdesc = 375;
+static const uint16 kFreedesc = 377;
+static const uint16 kSetdesc = 379;
+static const uint16 kBlockdesc = 381;
+static const uint16 kSetframes = 383;
+static const uint16 kFreeframes = 385;
+static const uint16 kPeople = 387;
+static const uint16 kReels = 389;
+static const uint16 kCommandtext = 391;
+static const uint16 kPuzzletext = 393;
+static const uint16 kTraveltext = 395;
+static const uint16 kTempgraphics = 397;
+static const uint16 kTempgraphics2 = 399;
+static const uint16 kTempgraphics3 = 401;
+static const uint16 kTempsprites = 403;
+static const uint16 kTextfile1 = 405;
+static const uint16 kTextfile2 = 407;
+static const uint16 kTextfile3 = 409;
+static const uint16 kBlinkframe = 411;
+static const uint16 kBlinkcount = 412;
+static const uint16 kReasseschanges = 413;
+static const uint16 kPointerspath = 414;
+static const uint16 kManspath = 415;
+static const uint16 kPointerfirstpath = 416;
+static const uint16 kFinaldest = 417;
+static const uint16 kDestination = 418;
+static const uint16 kLinestartx = 419;
+static const uint16 kLinestarty = 421;
+static const uint16 kLineendx = 423;
+static const uint16 kLineendy = 425;
+static const uint16 kLinepointer = 427;
+static const uint16 kLinedirection = 428;
+static const uint16 kLinelength = 429;
+static const uint16 kCh0blockstocopy = 430;
+static const uint16 kCh0playing = 432;
+static const uint16 kCh0repeat = 433;
+static const uint16 kCh1playing = 434;
+static const uint16 kCh1blockstocopy = 435;
+static const uint16 kSoundbufferwrite = 437;
+static const uint16 kCurrentsample = 439;
+static const uint16 kRoomssample = 440;
+static const uint16 kReelroutines = 441;
+static const uint16 kBasicsample = 898;
+static const uint16 kCurrentfile = 1045;
+static const uint16 kRoomscango = 1120;
+static const uint16 kRoompics = 1136;
+static const uint16 kOplist = 1151;
+static const uint16 kInputline = 1154;
+static const uint16 kPresslist = 1282;
+static const uint16 kQuitrequested = 1288;
+static const uint16 kSubtitles = 1289;
+static const uint16 kForeignrelease = 1290;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -409,8 +406,8 @@ static const uint16 kListofchanges = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768
 static const uint16 kUndertimedtext = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4));
 static const uint16 kRainlist = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30));
 static const uint16 kInitialreelrouts = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
-static const uint16 kInitialvars = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+901-444);
-static const uint16 kLengthofbuffer = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+901-444+68-0);
+static const uint16 kInitialvars = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+898-441);
+static const uint16 kLengthofbuffer = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+898-441+68-0);
 static const uint16 kReellist = (0+(36*144));
 static const uint16 kIntext = (0+(38*2));
 static const uint16 kLengthofmap = (0+(66*60));
@@ -461,7 +458,7 @@ static const uint16 kKeypady = (72);
 static const uint16 kZoomx = (8);
 static const uint16 kInventx = (80);
 static const uint16 kMenux = (80+40);
-static const uint16 kLenofreelrouts = (901-444);
+static const uint16 kLenofreelrouts = (898-441);
 static const uint16 kHeaderlen = (96);
 
 
@@ -480,17 +477,14 @@ public:
 	void fillOpen();
 	void doSomeTalk();
 	void resetLocation();
-	void adjustUp();
 	void outOfOpen();
 	void dirCom();
 	void findFirstPath();
 	void startTalk();
 	void getAnyAd();
 	void reminders();
-	void checkForExit();
 	void lookInInterface();
 	void inToInv();
-	void adjustLeft();
 	void deleteExText();
 	void getFreeAd();
 	void removeObFromInv();
@@ -533,12 +527,10 @@ public:
 	void getExAd();
 	void initialMonCols();
 	void swapWithInv();
-	void adjustRight();
 	void transferToEx();
 	void parser();
 	void emergencyPurge();
 	void transferConToEx();
-	void adjustDown();
 };
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index cfa204ec23..1e980de015 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -148,7 +148,7 @@ void DreamGenContext::mainMan(Sprite *sprite) {
 		if ((data.byte(kTurndirection) != 0) && (data.byte(kLinepointer) == 254)) {
 			data.byte(kReasseschanges) = 1;
 			if (data.byte(kFacing) == data.byte(kLeavedirection))
-				checkForExit();
+				checkForExit(sprite);
 		}
 		data.byte(kTurndirection) = 0;
 		if (data.byte(kLinepointer) == 254) {
@@ -168,7 +168,7 @@ void DreamGenContext::mainMan(Sprite *sprite) {
 				if (data.byte(kTurntoface) == data.byte(kFacing)) {
 					data.byte(kReasseschanges) = 1;
 					if (data.byte(kFacing) == data.byte(kLeavedirection))
-						checkForExit();
+						checkForExit(sprite);
 				}
 			}
 		}
@@ -1215,4 +1215,61 @@ void DreamBase::liftNoise(uint8 index) {
 		playChannel1(index);
 }
 
+void DreamBase::checkForExit(Sprite *sprite) {
+	uint8 flag, flagEx, type, flagX, flagY;
+	checkOne(data.byte(kRyanx) + 12, data.byte(kRyany) + 12, &flag, &flagEx, &type, &flagX, &flagY);
+	data.byte(kLastflag) = flag;
+
+	if (flag & 64) {
+		data.byte(kAutolocation) = flagEx;
+		return;
+	}
+
+	if (!(flag & 32)) {
+		if (flag & 4) {
+			// adjust left
+			data.byte(kLastflag) = 0;
+			data.byte(kMapx) -= 11;
+			sprite->x = 16 * flagEx;
+			data.byte(kNowinnewroom) = 1;
+		} else if (flag & 2) {
+			// adjust right
+			data.byte(kMapx) += 11;
+			sprite->x = 16 * flagEx - 2;
+			data.byte(kNowinnewroom) = 1;
+		} else if (flag & 8) {
+			// adjust down
+			data.byte(kMapy) += 10;
+			sprite->y = 16 * flagEx;
+			data.byte(kNowinnewroom) = 1;
+		} else if (flag & 16) {
+			// adjust up
+			data.byte(kMapy) -= 10;
+			sprite->y = 16 * flagEx;
+			data.byte(kNowinnewroom) = 1;
+		}
+
+		return;
+	}
+
+	if (data.byte(kReallocation) == 2) {
+		// Can't leave Louis' until you found shoes
+
+		int shoeCount = 0;
+		if (isRyanHolding("WETA")) shoeCount++;
+		if (isRyanHolding("WETB")) shoeCount++;
+
+		if (shoeCount < 2) {
+			uint8 text = shoeCount ? 43 : 42;
+			setupTimedUse(text, 80, 10, 68, 64);
+
+			data.byte(kTurntoface) = (data.byte(kFacing) + 4) & 7;
+			return;
+		}
+
+	}
+
+	data.byte(kNeedtotravel) = 1;
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a1d08b35d1..21d1038f3c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1454,7 +1454,6 @@ void DreamBase::getFlagUnderP(uint8 *flag, uint8 *flagEx) {
 	uint8 type, flagX, flagY;
 	checkOne(data.word(kMousex) - data.word(kMapadx), data.word(kMousey) - data.word(kMapady), flag, flagEx, &type, &flagX, &flagY);
 	data.byte(kLastflag) = *flag;
-	data.byte(kLastflagex) = *flagEx;
 }
 
 void DreamGenContext::walkAndExamine() {
@@ -1784,7 +1783,7 @@ void DreamGenContext::isRyanHolding() {
 	flags._z = !isRyanHolding(id);
 }
 
-bool DreamGenContext::isRyanHolding(const char *id) {
+bool DreamBase::isRyanHolding(const char *id) {
 	for (uint16 index = 0; index < kNumexobjects; index++) {
 		DynObject *object = getExAd(index);
 		if (object->mapad[0] == 4 && objectMatches(object, id))
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index d9823fb2c0..2305b93d53 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -384,7 +384,9 @@
 	void findExObject();
 	uint16 findExObject(const char *id);
 	void isRyanHolding();
-	bool isRyanHolding(const char *id);
+	bool isRyanHolding(const char *id) {
+		return DreamBase::isRyanHolding(id);
+	}
 	void describeOb();
 	void getOpenedSize();
 	byte getOpenedSizeCPP();
-- 
cgit v1.2.3


From b8ab0e62177916f82131b884d118a23e1afb3407 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 17 Dec 2011 19:18:57 +0100
Subject: DREAMWEB: Fix regression in getOpenedSize

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

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 29e6d52ba7..5bdfc07496 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -311,11 +311,11 @@ byte DreamGenContext::getOpenedSizeCPP() {
 	byte obj = data.byte(kOpenedob);
 	switch (data.byte(kOpenedtype)) {
 	case 4:
-		return getExAd(obj)->b7;
+		return getExAd(obj)->b8;
 	case 2:
-		return getFreeAd(obj)->b7;
+		return getFreeAd(obj)->b8;
 	default:
-		return getSetAd(obj)->b3;
+		return getSetAd(obj)->b4;
 	}
 }
 
-- 
cgit v1.2.3


From 5958d2d29af136a7adcbc4dc2abbb8ee5e0fcbba Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 17 Dec 2011 21:02:31 +0100
Subject: DREAMWEB: Name some DynObject/SetObject fields

Also change getAnyAd() behaviour to be consistent between Free/Ex and
Set objects, diverging from the original.
---
 engines/dreamweb/object.cpp |  6 +++---
 engines/dreamweb/structs.h  |  8 ++++----
 engines/dreamweb/stubs.cpp  | 16 ++++++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 5bdfc07496..e4abac14f2 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -311,11 +311,11 @@ byte DreamGenContext::getOpenedSizeCPP() {
 	byte obj = data.byte(kOpenedob);
 	switch (data.byte(kOpenedtype)) {
 	case 4:
-		return getExAd(obj)->b8;
+		return getExAd(obj)->slotCount;
 	case 2:
-		return getFreeAd(obj)->b8;
+		return getFreeAd(obj)->slotCount;
 	default:
-		return getSetAd(obj)->b4;
+		return getSetAd(obj)->slotCount;
 	}
 }
 
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 30962a272c..28c462ef7d 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -76,8 +76,8 @@ struct SetObject {
 	uint8 b0;
 	uint8 b1;
 	uint8 b2;
-	uint8 b3;
-	uint8 b4;
+	uint8 slotSize;
+	uint8 slotCount;
 	uint8 priority;
 	uint8 b6;
 	uint8 delay;
@@ -125,8 +125,8 @@ struct DynObject {
 	uint8 currentLocation;
 	uint8 index;
 	uint8 mapad[5];
-	uint8 b7;
-	uint8 b8;
+	uint8 slotSize;
+	uint8 slotCount;
 	uint8 b9;
 	uint8 b10;
 	uint8 initialLocation;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 21d1038f3c..1ba88405bc 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1363,18 +1363,22 @@ DynObject *DreamBase::getEitherAdCPP() {
 void *DreamBase::getAnyAd(uint8 *value1, uint8 *value2) {
 	if (data.byte(kObjecttype) == 4) {
 		DynObject *exObject = getExAd(data.byte(kCommand));
-		*value1 = exObject->b7;
-		*value2 = exObject->b8;
+		*value1 = exObject->slotSize;
+		*value2 = exObject->slotCount;
 		return exObject;
 	} else if (data.byte(kObjecttype) == 2) {
 		DynObject *freeObject = getFreeAd(data.byte(kCommand));
-		*value1 = freeObject->b7;
-		*value2 = freeObject->b8;
+		*value1 = freeObject->slotSize;
+		*value2 = freeObject->slotCount;
 		return freeObject;
 	} else {
 		SetObject *setObject = getSetAd(data.byte(kCommand));
-		*value1 = setObject->b4;
-		*value2 = setObject->priority;
+		// Note: the original returned slotCount/priority (bytes 4 and 5)
+		// instead of slotSize/slotCount (bytes 3 and 4).
+		// Changed this for consistency with the Ex/Free cases, and also
+		// with getOpenedSize()
+		*value1 = setObject->slotSize;
+		*value2 = setObject->slotCount;
 		return setObject;
 	}
 }
-- 
cgit v1.2.3


From b0a42f115eb8333cb6f25eb713324ef778822bce Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 17 Dec 2011 21:30:54 +0100
Subject: DREAMWEB: Use serializer for ReelRoutines

---
 engines/dreamweb/saveload.cpp | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index c77c419148..a47afdea63 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -25,12 +25,25 @@
 #include "gui/saveload.h"
 #include "common/config-manager.h"
 #include "common/translation.h"
+#include "common/serializer.h"
 
 namespace DreamGen {
 
 // Temporary storage for loading the room from a savegame
 Room g_madeUpRoomDat;
 
+
+void syncReelRoutine(Common::Serializer &s, ReelRoutine *reel) {
+	s.syncAsByte(reel->reallocation);
+	s.syncAsByte(reel->mapX);
+	s.syncAsByte(reel->mapY);
+	s.syncAsByte(reel->b3);
+	s.syncAsByte(reel->b4);
+	s.syncAsByte(reel->period);
+	s.syncAsByte(reel->counter);
+	s.syncAsByte(reel->b7);
+}
+
 void DreamGenContext::loadGame() {
 	if (data.byte(kCommandtype) != 246) {
 		data.byte(kCommandtype) = 246;
@@ -405,6 +418,11 @@ void DreamGenContext::savePosition(unsigned int slot, const char *descbuf) {
 	outSaveFile->write((const uint8 *)&madeUpRoom, sizeof(Room));
 	outSaveFile->write(data.ptr(kRoomscango, 16), 16);
 
+	// TODO: Convert more to serializer?
+	Common::Serializer s(0, outSaveFile);
+	for (unsigned int i = 0; 8*i < kLenofreelrouts; ++i) {
+		syncReelRoutine(s, (ReelRoutine*)data.ptr(kReelroutines + 8*i, 8));
+	}
 	outSaveFile->write(data.ptr(kReelroutines, len[5]), len[5]);
 
 	outSaveFile->finalize();
@@ -454,7 +472,11 @@ void DreamGenContext::loadPosition(unsigned int slot) {
 	inSaveFile->read((uint8 *)&g_madeUpRoomDat, sizeof(Room));
 	inSaveFile->read(data.ptr(kRoomscango, 16), 16);
 
-	inSaveFile->read(data.ptr(kReelroutines, len[5]), len[5]);
+	// TODO: Use serializer for more
+	Common::Serializer s(inSaveFile, 0);
+	for (unsigned int i = 0; 8*i < kLenofreelrouts; ++i) {
+		syncReelRoutine(s, (ReelRoutine*)data.ptr(kReelroutines + 8*i, 8));
+	}
 
 	delete inSaveFile;
 }
-- 
cgit v1.2.3


From 46caa771640a37339a0b2e1ed7774d9f894fdc68 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 17 Dec 2011 22:26:17 +0100
Subject: DREAMWEB: Add disabled reelRoutine conversion work

---
 engines/dreamweb/people.cpp   | 79 +++++++++++++++++++++++++++++++++++++++++++
 engines/dreamweb/saveload.cpp |  4 +++
 engines/dreamweb/structs.h    |  7 ++++
 3 files changed, 90 insertions(+)

(limited to 'engines')

diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index e8446f0445..af92d07439 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -56,6 +56,85 @@ static void (DreamGenContext::*reelCallbacks[57])(ReelRoutine &) = {
 	&DreamBase::carParkDrip
 };
 
+#if 0
+// TODO: Enable this when the ReelRoutine list has been moved out of the
+// data segment, all ReelCallbacks are in DreamBase, and the
+// ReelRoutine::reelPointer field is a real member.
+// See also struct ReelRoutine, clearBuffers, clearChanges, syncReelRoutine
+
+static const ReelRoutine g_initialReelRoutines[] = {
+// Room number and x,y
+// reel pointer
+// speed,speed count,convers. no.
+	{ 1,44,0, 20, 2,0,1 },
+	{ 1,55,0, 0, 50,20,0 },
+	{ 24,22,0, 74, 1,0,0 },
+	{ 24,33,10, 75, 1,0,1 },
+	{ 1,44,0, 27, 2,0,2 },
+	{ 1,44,0, 96, 3,0,4 },
+	{ 1,44,0, 118, 2,0,5 },
+	{ 1,44,10, 0, 2,0,0 },
+	{ 5,22,20, 53, 3,0,0 },
+	{ 5,22,20, 40, 1,0,2 },
+	{ 5,22,20, 50, 1,0,3 },
+	{ 2,11,10, 192, 1,0,0 },
+	{ 2,11,10, 182, 2,0,1 },
+	{ 8,11,10, 0, 2,0,1 },
+	{ 23,0,50, 0, 3,0,0 },
+	{ 28,11,20, 250, 4,0,0 },
+	{ 23,0,50, 43, 2,0,8 },
+	{ 23,11,40, 130, 2,0,1 },
+	{ 23,22,40, 122, 2,0,2 },
+	{ 23,22,40, 105, 2,0,3 },
+	{ 23,22,40, 81, 2,0,4 },
+	{ 23,11,40, 135, 2,0,5 },
+	{ 23,22,40, 145, 2,0,6 },
+	{ 4,22,30, 0, 2,0,0 },
+	{ 45,22,30, 200, 0,0,20 },
+	{ 45,22,30, 39, 2,0,0 },
+	{ 45,22,30, 25, 2,0,0 },
+	{ 8,22,40, 32, 2,0,0 },
+	{ 7,11,20, 64, 2,0,0 },
+	{ 22,22,20, 82, 2,0,0 },
+	{ 27,11,30, 0, 2,0,0 },
+	{ 20,0,30, 0, 2,0,0 },
+	{ 14,33,40, 21, 1,0,0 },
+	{ 29,11,10, 0, 1,0,0 },
+	{ 2,22,0, 2, 2,0,0 },
+	{ 25,0,50, 4, 2,0,0 },
+	{ 50,22,30, 121, 2,0,0 },
+	{ 50,22,30, 0, 20,0,0 },
+	{ 52,22,30, 192, 2,0,0 },
+	{ 52,22,30, 233, 2,0,0 },
+	{ 50,22,40, 104, 55,0,0 }, // ...., 65,0,0 for German CD
+	{ 53,33,0, 99, 2,0,0 },
+	{ 50,22,40, 0, 3,0,0 },
+	{ 50,22,30, 162, 2,0,0 },
+	{ 52,22,30, 57, 2,0,0 },
+	{ 52,22,30, 0, 2,0,0 },
+	{ 54,0,0, 72, 3,0,0 },
+	{ 55,44,0, 0, 2,0,0 },
+	{ 19,0,0, 0, 28,0,0 },
+	{ 14,22,0, 2, 2,0,0 },
+	{ 14,22,0, 300, 1,0,0 },
+	{ 10,22,30, 174, 0,0,0 },
+	{ 12,22,20, 0, 1,0,0 },
+	{ 11,11,20, 0, 50,20,0 },
+	{ 11,11,30, 0, 50,20,0 },
+	{ 11,22,20, 0, 50,20,0 },
+	{ 14,33,40, 0, 50,20,0 },
+	{ 255,0,0, 0, 0,0,0 }
+};
+
+void DreamBase::setupInitialReelRoutines(ReelRoutine *dest) {
+	for (unsigned int i = 0; i < ARRAYSIZE(g_initialReelRoutines); ++i) {
+		dest[i] = g_initialReelRoutines[i];
+		if (dest[i].period == 55 && isCD() && engine->getLanguage() == Common::DE_DEU)
+			dest[i].period = 65;
+	}
+}
+#endif
+
 void DreamGenContext::updatePeople() {
 	data.word(kListpos) = kPeoplelist;
 	memset(getSegment(data.word(kBuffers)).ptr(kPeoplelist, 12 * sizeof(People)), 0xff, 12 * sizeof(People));
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index a47afdea63..9cf3ea2c63 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -37,8 +37,12 @@ void syncReelRoutine(Common::Serializer &s, ReelRoutine *reel) {
 	s.syncAsByte(reel->reallocation);
 	s.syncAsByte(reel->mapX);
 	s.syncAsByte(reel->mapY);
+#if 1
 	s.syncAsByte(reel->b3);
 	s.syncAsByte(reel->b4);
+#else
+	s.syncAsUint16LE(reel->_reelPointer);
+#endif
 	s.syncAsByte(reel->period);
 	s.syncAsByte(reel->counter);
 	s.syncAsByte(reel->b7);
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 28c462ef7d..709a3d2a8e 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -168,11 +168,18 @@ struct ReelRoutine {
 	uint8 reallocation;
 	uint8 mapX;
 	uint8 mapY;
+#if 0
+	uint16 _reelPointer;
+	uint16 reelPointer() const { return _reelPointer; }
+	void setReelPointer(uint16 v) { _reelPointer = v; }
+	void incReelPointer() { _reelPointer++; }
+#else
 	uint8 b3;
 	uint8 b4;
 	uint16 reelPointer() const { return READ_LE_UINT16(&b3); }
 	void setReelPointer(uint16 v) { WRITE_LE_UINT16(&b3, v); }
 	void incReelPointer() { setReelPointer(reelPointer() + 1); }
+#endif
 	uint8 period;
 	uint8 counter;
 	uint8 b7;
-- 
cgit v1.2.3


From 30089ec31504c862d4ad4317075af600d38a79a8 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 17 Dec 2011 22:20:32 +0100
Subject: DREAMWEB: Convert clearBuffers, clearChanges

---
 engines/dreamweb/dreambase.h  |  2 ++
 engines/dreamweb/dreamgen.cpp | 67 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  2 --
 engines/dreamweb/stubs.cpp    | 35 ++++++++++++++++++++++
 4 files changed, 37 insertions(+), 69 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 7c86696568..06936ca72d 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -390,6 +390,8 @@ public:
 	void getTime();
 	void doChange(uint8 index, uint8 value, uint8 type);
 	bool isRyanHolding(const char *id);
+	void clearBuffers();
+	void clearChanges();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index ea4d8e5b05..3c3abe9ca4 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2593,73 +2593,6 @@ gotkeyp:
 	showDiaryPage();
 }
 
-void DreamGenContext::clearBuffers() {
-	STACK_CHECK;
-	es = data.word(kBuffers);
-	cx = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+898-441+68-0)/2;
-	ax = 0;
-	di = 0;
-	_stosw(cx, true);
-	es = data.word(kExtras);
-	cx = (0+2080+30000+(16*114)+((114+2)*2)+18000)/2;
-	ax = 0x0ffff;
-	di = 0;
-	_stosw(cx, true);
-	es = data.word(kBuffers);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
-	ds = cs;
-	si = 441;
-	cx = (898-441);
-	_movsb(cx, true);
-	es = data.word(kBuffers);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+898-441);
-	ds = cs;
-	si = 0;
-	cx = (68-0);
-	_movsb(cx, true);
-	clearChanges();
-}
-
-void DreamGenContext::clearChanges() {
-	STACK_CHECK;
-	es = data.word(kBuffers);
-	cx = (250)*2;
-	ax = 0x0ffff;
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80));
-	_stosw(cx, true);
-	ds = data.word(kBuffers);
-	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
-	es = cs;
-	di = 441;
-	cx = (898-441);
-	_movsb(cx, true);
-	ds = data.word(kBuffers);
-	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+898-441);
-	es = cs;
-	di = 0;
-	cx = (68-0);
-	_movsb(cx, true);
-	data.byte(kExpos) = 0;
-	data.word(kExframepos) = 0;
-	data.word(kExtextpos) = 0;
-	es = data.word(kExtras);
-	cx = (0+2080+30000+(16*114)+((114+2)*2)+18000)/2;
-	ax = 0x0ffff;
-	di = 0;
-	_stosw(cx, true);
-	es = cs;
-	di = 1120;
-	al = 1;
-	_stosb(2);
-	al = 0;
-	_stosb();
-	al = 1;
-	_stosb();
-	ax = 0;
-	cx = 6;
-	_stosw(cx, true);
-}
-
 void DreamGenContext::findPathOfPoint() {
 	STACK_CHECK;
 	push(ax);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f6100557c1..98bab1bd0e 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -471,7 +471,6 @@ public:
 
 	void fadeDownMon();
 	void getPersonText();
-	void clearBuffers();
 	void getObTextStart();
 	void checkObjectSize();
 	void fillOpen();
@@ -522,7 +521,6 @@ public:
 	void searchForString();
 	void selectOpenOb();
 	void incRyanPage();
-	void clearChanges();
 	void searchForFiles();
 	void getExAd();
 	void initialMonCols();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 1ba88405bc..eea38eb196 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4593,4 +4593,39 @@ void DreamGenContext::showSlots() {
 	}
 }
 
+void DreamBase::clearBuffers() {
+	memset(getSegment(data.word(kBuffers)).ptr(0, kLengthofbuffer), 0, kLengthofbuffer);
+
+	memset(getSegment(data.word(kExtras)).ptr(0, kLengthofextra), 0xFF, kLengthofextra);
+
+	// TODO: Remove this line 
+	// (once the ReelRoutines are no longer in the data segment)
+	memcpy(getSegment(data.word(kBuffers)).ptr(kInitialreelrouts, kLenofreelrouts), data.ptr(kReelroutines, kLenofreelrouts), kLenofreelrouts);
+
+	memcpy(getSegment(data.word(kBuffers)).ptr(kInitialvars, kLengthofvars), data.ptr(kStartvars, kLengthofvars), kLengthofvars);
+
+	clearChanges();
+}
+
+void DreamBase::clearChanges() {
+	memset(getSegment(data.word(kBuffers)).ptr(kListofchanges, 4*kNumchanges), 0xFF, 4*kNumchanges);
+
+	// TODO: Call setupInitialReelRoutines instead
+	// (once the ReelRoutines are no longer in the data segment)
+	memcpy(data.ptr(kReelroutines, kLenofreelrouts), getSegment(data.word(kBuffers)).ptr(kInitialreelrouts, kLenofreelrouts), kLenofreelrouts);
+
+	memcpy(data.ptr(kStartvars, kLengthofvars), getSegment(data.word(kBuffers)).ptr(kInitialvars, kLengthofvars), kLengthofvars);
+
+	data.byte(kExpos) = 0;
+	data.word(kExframepos) = 0;
+	data.word(kExtextpos) = 0;
+
+	memset(getSegment(data.word(kExtras)).ptr(0, kLengthofextra), 0xFF, kLengthofextra);
+
+	const uint8 initialRoomsCanGo[] = { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+
+	memcpy(data.ptr(kRoomscango, 16), initialRoomsCanGo, 16);
+}
+
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 10e163761223b919533ad8ff71d05f90001d6fb8 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 17 Dec 2011 23:16:36 +0100
Subject: DREAMWEB: Fix regressions in findExObject, findSetObject

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

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index eea38eb196..7f1824d2bb 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1745,6 +1745,7 @@ void DreamGenContext::findSetObject() {
 	id[3] = ch;
 	id[4] = '\0';
 	al = findSetObject(id);
+	es = data.word(kSetdat);
 	bx = al * 64;
 }
 
@@ -1765,7 +1766,8 @@ void DreamGenContext::findExObject() {
 	id[3] = ch;
 	id[4] = '\0';
 	al = findExObject(id);
-	bx = al * 16;
+	es = data.word(kExtras);
+	bx = kExdata + al * 16;
 }
 
 uint16 DreamGenContext::findExObject(const char *id) {
-- 
cgit v1.2.3


From 656409c72bd4142781fc369a496b026edb2cb87c Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 17 Dec 2011 23:28:26 +0100
Subject: DREAMWEB: Fix regression in slabdoorb

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

(limited to 'engines')

diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index ba1e8e4952..5b6e3f8dff 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -625,7 +625,7 @@ void DreamGenContext::sLabDoorB() {
 		data.byte(kWatchspeed) = 1;
 		data.byte(kSpeedcount) = 1;
 	} else {
-		if (isRyanHolding("SHLD")) {
+		if (!isRyanHolding("SHLD")) {
 			// No crystal
 			showPuzText(44, 200);
 			putBackObStuff();
-- 
cgit v1.2.3


From 2e8490448e4add482d622fe2e83b5125372aa67d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 18 Dec 2011 00:37:01 +0100
Subject: TSAGE: R2R - Scene 2800: Move several objects from scene to action2

---
 engines/tsage/ringworld2/ringworld2_scenes2.cpp | 82 ++++++++++++-------------
 engines/tsage/ringworld2/ringworld2_scenes2.h   |  6 +-
 2 files changed, 44 insertions(+), 44 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index a61ff6ac9a..b851ed4e22 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -4234,47 +4234,47 @@ void Scene2800::Action2::signal() {
 		R2_GLOBALS._sound2.stop();
 		break;
 	case 1:
-		scene->_object2.postInit();
-		scene->_object2.setVisage(2800);
-		scene->_object2.setStrip(1);
-		scene->_object2._numFrames = 8;
-		scene->_object2._moveRate = 8;
-		scene->_object2.changeZoom(100);
-		scene->_object2.setPosition(Common::Point(1, 1));
-		scene->_object2.show();
-		scene->_object2.animate(ANIM_MODE_5, this);
+		_object2.postInit();
+		_object2.setVisage(2800);
+		_object2.setStrip(1);
+		_object2._numFrames = 8;
+		_object2._moveRate = 8;
+		_object2.changeZoom(100);
+		_object2.setPosition(Common::Point(1, 1));
+		_object2.show();
+		_object2.animate(ANIM_MODE_5, this);
 		break;
 	case 2:
 		R2_GLOBALS._sound2.play(130);
-		scene->_object2.setVisage(2800);
-		scene->_object2.setStrip(7);
-
-		scene->_object3.postInit();
-		scene->_object3.setVisage(2800);
-		scene->_object3.setStrip(3);
-		scene->_object3._numFrames = 8;
-		scene->_object3._moveRate = 8;
-		scene->_object3.changeZoom(100);
-		scene->_object3.setPosition(Common::Point(300, 104));
-		scene->_object3.show();
-		scene->_object3.animate(ANIM_MODE_5, this);
+		_object2.setVisage(2800);
+		_object2.setStrip(7);
+
+		_object3.postInit();
+		_object3.setVisage(2800);
+		_object3.setStrip(3);
+		_object3._numFrames = 8;
+		_object3._moveRate = 8;
+		_object3.changeZoom(100);
+		_object3.setPosition(Common::Point(300, 104));
+		_object3.show();
+		_object3.animate(ANIM_MODE_5, this);
 		break;
 	case 3:
 		R2_GLOBALS._sound1.play(241);
-		scene->_object4.postInit();
-		scene->_object4.setVisage(2800);
-		scene->_object4.setStrip(2);
-		scene->_object4._numFrames = 4;
-		scene->_object4._moveRate = 4;
-		scene->_object4.changeZoom(100);
-		scene->_object4.setPosition(Common::Point(300, 104));
-		scene->_object4.fixPriority(105);
-		scene->_object4.show();
-		scene->_object4.animate(ANIM_MODE_5, this);
+		_object4.postInit();
+		_object4.setVisage(2800);
+		_object4.setStrip(2);
+		_object4._numFrames = 4;
+		_object4._moveRate = 4;
+		_object4.changeZoom(100);
+		_object4.setPosition(Common::Point(300, 104));
+		_object4.fixPriority(105);
+		_object4.show();
+		_object4.animate(ANIM_MODE_5, this);
 		break;
 	case 4:
 		setDelay(18);
-		scene->_object4.setStrip(4);
+		_object4.setStrip(4);
 		scene->_actor1.setVisage(2800);
 		scene->_actor1.setStrip(5);
 		scene->_actor1.setFrame(1);
@@ -4389,23 +4389,23 @@ void Scene2800::Action2::signal() {
 		break;
 	case 17:
 		setDelay(6);
-		scene->_object4.setStrip(2);
-		scene->_object4.setFrame(11);
+		_object4.setStrip(2);
+		_object4.setFrame(11);
 		R2_GLOBALS._player.hide();
 	// No break on purpose
 	case 18:
 		R2_GLOBALS._sound1.play(241);
-		scene->_object4.animate(ANIM_MODE_6, this);
+		_object4.animate(ANIM_MODE_6, this);
 		break;
 	case 19:
-		scene->_object4.remove();
-		scene->_object3.animate(ANIM_MODE_6, this);
+		_object4.remove();
+		_object3.animate(ANIM_MODE_6, this);
 		break;
 	case 20:
 		setDelay(6);
-		scene->_object3.remove();
-		scene->_object2.setStrip(1);
-		scene->_object2.setFrame(19);
+		_object3.remove();
+		_object2.setStrip(1);
+		_object2.setFrame(19);
 		break;
 	case 21:
 		setDelay(150);
@@ -4414,7 +4414,7 @@ void Scene2800::Action2::signal() {
 		break;
 	case 22:
 		scene->_sceneMode = 12;
-		scene->_object2.animate(ANIM_MODE_6, scene);
+		_object2.animate(ANIM_MODE_6, scene);
 		break;
 	default:
 		break;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index 2097465a48..d007f7e9f5 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -639,6 +639,9 @@ class Scene2800 : public SceneExt {
 		void signal();
 	};
 	class Action2: public Action {
+		SceneObject _object2;
+		SceneObject _object3;
+		SceneObject _object4;
 	public:
 		void signal();
 	};
@@ -654,9 +657,6 @@ public:
 	SceneObject _object1;
 	Action1 _action1;
 	Action2 _action2;
-	SceneObject _object2;
-	SceneObject _object3;
-	SceneObject _object4;
 	SequenceManager _sequenceManager;
 	int _field412;
 
-- 
cgit v1.2.3


From 08fec8fa345cc3a76928059539ecd7ab5bd8a0e2 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 02:54:51 +0200
Subject: DREAMWEB: Add meta information to saved games

This information includes savegame versioning and the saved game's
date/time, played time and game thumbnail. This information is stored
into an unused data block of the original save format, so the
generated ScummVM saves are (hopefully) fully compatible with the
original ones and can be loaded in the original interpreter
---
 engines/dreamweb/detection.cpp | 70 ++++++++++++++++++++++++++++++++++++++++++
 engines/dreamweb/dreamweb.h    |  4 +++
 engines/dreamweb/saveload.cpp  | 53 +++++++++++++++++++++++++++++---
 3 files changed, 123 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index db2155fc4c..b3483f9248 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -25,7 +25,10 @@
 #include "common/algorithm.h"
 #include "common/system.h"
 
+#include "graphics/thumbnail.h"
+
 #include "dreamweb/dreamweb.h"
+#include "dreamweb/structs.h"
 
 static const PlainGameDescriptor dreamWebGames[] = {
 	{ "dreamweb", "DreamWeb" },
@@ -56,6 +59,7 @@ public:
 	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 DreamWebMetaEngine::hasFeature(MetaEngineFeature f) const {
@@ -63,6 +67,10 @@ bool DreamWebMetaEngine::hasFeature(MetaEngineFeature f) const {
 	case kSupportsListSaves:
 	case kSupportsLoadingDuringStartup:
 	case kSupportsDeleteSave:
+	case kSavesSupportMetaInfo:
+	case kSavesSupportThumbnail:
+	case kSavesSupportCreationDate:
+	case kSavesSupportPlayTime:
 		return true;
 	default:
 		return false;
@@ -120,6 +128,68 @@ void DreamWebMetaEngine::removeSaveState(const char *target, int slot) const {
 	g_system->getSavefileManager()->removeSavefile(fileName);
 }
 
+SaveStateDescriptor DreamWebMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
+	Common::String filename = Common::String::format("DREAMWEB.D%02d", slot);
+	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str());
+
+	if (in) {
+		DreamGen::FileHeader header;
+		in->read((uint8 *)&header, sizeof(DreamGen::FileHeader));
+
+		Common::String saveName;
+		byte descSize = header.len(0);
+		byte i;
+
+		for (i = 0; i < descSize; i++)
+			saveName += (char)in->readByte();
+
+		SaveStateDescriptor desc(slot, saveName);
+		desc.setDeletableFlag(true);
+		desc.setWriteProtectedFlag(false);
+
+		// Check if there is a ScummVM data block
+		if (header.len(6) == SCUMMVM_BLOCK_MAGIC_SIZE) {
+			// Skip the game data
+			for (i = 1; i <= 5; i++)
+				in->skip(header.len(i));
+
+			uint32 tag = in->readUint32BE();
+			if (tag != SCUMMVM_HEADER) {
+				warning("ScummVM data block found, but the block header is incorrect - skipping");
+				delete in;
+				return desc;
+			}
+
+			byte version = in->readByte();
+			if (version > SAVEGAME_VERSION) {
+				warning("ScummVM data block found, but it has been saved with a newer version of ScummVM - skipping");
+				delete in;
+				return desc;
+			}
+
+			uint32 saveDate = in->readUint32LE();
+			uint32 saveTime = in->readUint32LE();
+			uint32 playTime = in->readUint32LE();
+			Graphics::Surface *thumbnail = Graphics::loadThumbnail(*in);
+
+			int day = (saveDate >> 24) & 0xFF;
+			int month = (saveDate >> 16) & 0xFF;
+			int year = saveDate & 0xFFFF;
+			int hour = (saveTime >> 16) & 0xFF;
+			int minutes = (saveTime >> 8) & 0xFF;
+
+			desc.setSaveDate(year, month, day);
+			desc.setSaveTime(hour, minutes);
+			desc.setPlayTime(playTime * 1000);
+			desc.setThumbnail(thumbnail);
+		}
+
+		return desc;
+	}
+
+	return SaveStateDescriptor();
+}	// End of namespace Toltecs
+
 #if PLUGIN_ENABLED_DYNAMIC(DREAMWEB)
 	REGISTER_PLUGIN_DYNAMIC(DREAMWEB, PLUGIN_TYPE_ENGINE, DreamWebMetaEngine);
 #else
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 7ff0005fa4..4d7bf5f0e4 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -42,6 +42,10 @@
 
 #include "dreamweb/structs.h"
 
+#define SCUMMVM_HEADER MKTAG('S', 'C', 'V', 'M')
+#define SCUMMVM_BLOCK_MAGIC_SIZE 0x1234
+#define SAVEGAME_VERSION 1
+
 namespace DreamGen {
 
 // These are for ReelRoutine::reelPointer, which is a callback field.
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 9cf3ea2c63..599ef45c66 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -22,6 +22,7 @@
 
 #include "dreamweb/dreamweb.h"
 #include "engines/metaengine.h"
+#include "graphics/thumbnail.h"
 #include "gui/saveload.h"
 #include "common/config-manager.h"
 #include "common/translation.h"
@@ -216,7 +217,6 @@ void DreamGenContext::saveGame() {
 		descbuf[++desclen] = 0;
 		while (desclen < 16)
 			descbuf[++desclen] = 1;
-		savePosition(savegameId, descbuf);
 
 		// TODO: The below is copied from actualsave
 		getRidOfTemp();
@@ -225,6 +225,12 @@ void DreamGenContext::saveGame() {
 		data.word(kTextaddressy) = 182;
 		data.byte(kTextlen) = 240;
 		redrawMainScrn();
+		workToScreenCPP();	// show the main screen without the mouse pointer
+
+		// We need to save after the scene has been redrawn, to capture the
+		// correct screen thumbnail
+		savePosition(savegameId, descbuf);
+
 		workToScreenM();
 		data.byte(kGetback) = 4;
 	}
@@ -387,9 +393,6 @@ void DreamGenContext::savePosition(unsigned int slot, const char *descbuf) {
 	madeUpRoom.facing = data.byte(kFacing);
 	madeUpRoom.b27 = 255;
 
-
-	engine->processEvents();	// TODO: Is this necessary?
-
 	Common::String filename = engine->getSavegameFilename(slot);
 	debug(1, "savePosition: slot %d filename %s", slot, filename.c_str());
 	Common::OutSaveFile *outSaveFile = engine->getSaveFileManager()->openForSaving(filename);
@@ -412,6 +415,11 @@ void DreamGenContext::savePosition(unsigned int slot, const char *descbuf) {
 	for (int i = 0; i < 6; ++i)
 		header.setLen(i, len[i]);
 
+	// Write a new section with data that we need for ScummVM (version,
+	// thumbnail, played time etc). We don't really care for its size,
+	// so we just set it to a magic number.
+	header.setLen(6, SCUMMVM_BLOCK_MAGIC_SIZE);
+
 	outSaveFile->write((const uint8 *)&header, sizeof(FileHeader));
 	outSaveFile->write(descbuf, len[0]);
 	outSaveFile->write(data.ptr(kStartvars, len[1]), len[1]);
@@ -429,6 +437,19 @@ void DreamGenContext::savePosition(unsigned int slot, const char *descbuf) {
 	}
 	outSaveFile->write(data.ptr(kReelroutines, len[5]), len[5]);
 
+	// ScummVM data block
+	outSaveFile->writeUint32BE(SCUMMVM_HEADER);
+	outSaveFile->writeByte(SAVEGAME_VERSION);
+	TimeDate curTime;
+	g_system->getTimeAndDate(curTime);
+	uint32 saveDate = ((curTime.tm_mday & 0xFF) << 24) | (((curTime.tm_mon + 1) & 0xFF) << 16) | ((curTime.tm_year + 1900) & 0xFFFF);
+	uint32 saveTime = ((curTime.tm_hour & 0xFF) << 16) | (((curTime.tm_min) & 0xFF) << 8) | ((curTime.tm_sec) & 0xFF);
+	uint32 playTime = g_engine->getTotalPlayTime() / 1000;
+	outSaveFile->writeUint32LE(saveDate);
+	outSaveFile->writeUint32LE(saveTime);
+	outSaveFile->writeUint32LE(playTime);
+	Graphics::saveThumbnail(*outSaveFile);
+
 	outSaveFile->finalize();
 	if (outSaveFile->err()) {
 		// TODO: Do proper error handling
@@ -482,6 +503,30 @@ void DreamGenContext::loadPosition(unsigned int slot) {
 		syncReelRoutine(s, (ReelRoutine*)data.ptr(kReelroutines + 8*i, 8));
 	}
 
+	// Check if there's a ScummVM data block
+	if (header.len(6) == SCUMMVM_BLOCK_MAGIC_SIZE) {
+		uint32 tag = inSaveFile->readUint32BE();
+		if (tag != SCUMMVM_HEADER) {
+			warning("ScummVM data block found, but the block header is incorrect - skipping");
+			delete inSaveFile;
+			return;
+		}
+
+		byte version = inSaveFile->readByte();
+		if (version > SAVEGAME_VERSION) {
+			warning("ScummVM data block found, but it has been saved with a newer version of ScummVM - skipping");
+			delete inSaveFile;
+			return;
+		}
+
+		inSaveFile->skip(4);	// saveDate
+		inSaveFile->skip(4);	// saveTime
+		uint32 playTime = inSaveFile->readUint32LE();
+		g_engine->setTotalPlayTime(playTime * 1000);
+
+		// The thumbnail data follows, but we don't need it here
+	}
+
 	delete inSaveFile;
 }
 
-- 
cgit v1.2.3


From 83b31ccb1d79276cbb04cd33c8a133bc0039003a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 03:07:54 +0200
Subject: DREAMWEB: Remove an erroneous comment (copy/paste error)

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

(limited to 'engines')

diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index b3483f9248..b5ec6e8e69 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -188,7 +188,7 @@ SaveStateDescriptor DreamWebMetaEngine::querySaveMetaInfos(const char *target, i
 	}
 
 	return SaveStateDescriptor();
-}	// End of namespace Toltecs
+}
 
 #if PLUGIN_ENABLED_DYNAMIC(DREAMWEB)
 	REGISTER_PLUGIN_DYNAMIC(DREAMWEB, PLUGIN_TYPE_ENGINE, DreamWebMetaEngine);
-- 
cgit v1.2.3


From 9818def85b7ede9635a918e3635b521de7e996b2 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 03:28:21 +0200
Subject: DREAMWEB: Port 'lookininterface' to C++

---
 engines/dreamweb/dreamgen.cpp | 19 -------------------
 engines/dreamweb/dreamgen.h   |  3 +--
 engines/dreamweb/monitor.cpp  | 13 ++++++++-----
 3 files changed, 9 insertions(+), 26 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 3c3abe9ca4..72f2feca0e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2044,25 +2044,6 @@ clearedlocations:
 	es.byte(bx) = 0;
 }
 
-void DreamGenContext::lookInInterface() {
-	STACK_CHECK;
-	al = 'I';
-	ah = 'N';
-	cl = 'T';
-	ch = 'F';
-	findSetObject();
-	ah = 1;
-	checkInside();
-	_cmp(cl, (114));
-	if (flags.z())
-		goto emptyinterface;
-	al = es.byte(bx+15);
-	_inc(al);
-	return;
-emptyinterface:
-	al = 0;
-}
-
 void DreamGenContext::dirCom() {
 	STACK_CHECK;
 	cx = 30;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 98bab1bd0e..29cd6e39ab 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -473,7 +473,6 @@ public:
 	void getPersonText();
 	void getObTextStart();
 	void checkObjectSize();
-	void fillOpen();
 	void doSomeTalk();
 	void resetLocation();
 	void outOfOpen();
@@ -482,7 +481,6 @@ public:
 	void startTalk();
 	void getAnyAd();
 	void reminders();
-	void lookInInterface();
 	void inToInv();
 	void deleteExText();
 	void getFreeAd();
@@ -505,6 +503,7 @@ public:
 	void rollEm();
 	void lookAtPlace();
 	void findAllOpen();
+	void fillOpen();
 	void deleteExObject();
 	void getEitherAd();
 	void setPickup();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 30ba9b88e0..577d5701ee 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -403,15 +403,18 @@ void DreamGenContext::loadNews() {
 }
 
 void DreamGenContext::loadCart() {
-	lookInInterface();
+	byte cartridgeId = 0;
+	uint16 objectIndex = findSetObject("INTF");
+	if (checkInside(objectIndex, 1) != kNumexobjects)
+		cartridgeId = getSetAd(objectIndex)->name[0] + 1;
 
-	if (al == 0)
+	if (cartridgeId == 0)
 		data.word(kTextfile3) = standardLoad("DREAMWEB.T20"); // monitor file 20
-	else if (al == 1)
+	else if (cartridgeId == 1)
 		data.word(kTextfile3) = standardLoad("DREAMWEB.T21"); // monitor file 21
-	else if (al == 2)
+	else if (cartridgeId == 2)
 		data.word(kTextfile3) = standardLoad("DREAMWEB.T22"); // monitor file 22
-	else if (al == 3)
+	else if (cartridgeId == 3)
 		data.word(kTextfile3) = standardLoad("DREAMWEB.T23"); // monitor file 23
 	else
 		data.word(kTextfile3) = standardLoad("DREAMWEB.T24"); // monitor file 24
-- 
cgit v1.2.3


From f69dfba21a5d4be8cc60a20a0dd0628717fa5373 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 18 Dec 2011 18:08:45 +1100
Subject: TSAGE: Implemented dirty rect handling in the engine

This should help improve performance when scalers are being used.
---
 engines/tsage/blue_force/blueforce_dialogs.cpp  |   4 +-
 engines/tsage/converse.cpp                      |   2 +-
 engines/tsage/core.cpp                          |   4 +-
 engines/tsage/events.cpp                        |   6 +-
 engines/tsage/globals.cpp                       |   8 +-
 engines/tsage/graphics.cpp                      | 144 ++++++++++++++++++++----
 engines/tsage/graphics.h                        |  14 ++-
 engines/tsage/ringworld/ringworld_dialogs.cpp   |   4 +-
 engines/tsage/ringworld/ringworld_logic.cpp     |   2 +-
 engines/tsage/ringworld/ringworld_scenes3.cpp   |   6 +-
 engines/tsage/ringworld/ringworld_scenes5.cpp   |   4 +-
 engines/tsage/ringworld2/ringworld2_dialogs.cpp |   2 +-
 engines/tsage/scenes.cpp                        |   2 +-
 13 files changed, 156 insertions(+), 46 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp
index b9b3ad6c22..6f294d263a 100644
--- a/engines/tsage/blue_force/blueforce_dialogs.cpp
+++ b/engines/tsage/blue_force/blueforce_dialogs.cpp
@@ -163,7 +163,7 @@ void RightClickDialog::execute() {
 		}
 
 		g_system->delayMillis(10);
-		g_system->updateScreen();
+		GLOBALS._screenSurface.copyToScreen();
 	}
 
 	// Execute the specified action
@@ -243,7 +243,7 @@ void AmmoBeltDialog::execute() {
 		}
 
 		g_system->delayMillis(10);
-		g_system->updateScreen();
+		GLOBALS._screenSurface.copyToScreen();
 	}
 
 	_gfxManager.deactivate();
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index b802f71ff3..00c0b3a1f1 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -451,7 +451,7 @@ int ConversationChoiceDialog::execute(const Common::StringArray &choiceList) {
 		while (!g_globals->_events.getEvent(event, EVENT_KEYPRESS | EVENT_BUTTON_DOWN | EVENT_MOUSE_MOVE) &&
 				!g_vm->shouldQuit()) {
 			g_system->delayMillis(10);
-			g_system->updateScreen();
+			GLOBALS._screenSurface.copyToScreen();
 		}
 		if (g_vm->shouldQuit())
 			break;
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 9d7c8abf0a..c243624608 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1415,7 +1415,7 @@ void ScenePalette::fade(const byte *adjustData, bool fullAdjust, int percent) {
 
 	// Set the altered pale4tte
 	g_system->getPaletteManager()->setPalette((const byte *)&tempPalette[0], 0, 256);
-	g_system->updateScreen();
+	GLOBALS._screenSurface.copyToScreen();
 }
 
 PaletteRotation *ScenePalette::addRotation(int start, int end, int rotationMode, int duration, Action *action) {
@@ -1708,7 +1708,7 @@ void SceneItem::display(int resNum, int lineNum, ...) {
 		// Keep event on-screen until a mouse or keypress
 		while (!g_vm->shouldQuit() && !g_globals->_events.getEvent(event,
 				EVENT_BUTTON_DOWN | EVENT_KEYPRESS)) {
-			g_system->updateScreen();
+			GLOBALS._screenSurface.copyToScreen();
 			g_system->delayMillis(10);
 		}
 
diff --git a/engines/tsage/events.cpp b/engines/tsage/events.cpp
index 152570b187..21dc86b8ec 100644
--- a/engines/tsage/events.cpp
+++ b/engines/tsage/events.cpp
@@ -49,8 +49,8 @@ bool EventsClass::pollEvent() {
 		_priorFrameTime = milli;
 		++_frameNumber;
 
-		// Update screen
-		g_system->updateScreen();
+		// Update the physical screen with any updates to the screen surface
+		GLOBALS._screenSurface.copyToScreen();
 	}
 
 	if (!g_system->getEventManager()->pollEvent(_event)) return false;
@@ -395,7 +395,7 @@ void EventsClass::delay(int numFrames) {
 		_priorFrameTime = g_system->getMillis();
 	}
 
-	g_system->updateScreen();
+	GLOBALS._screenSurface.copyToScreen();
 	_prevDelayFrame = _frameNumber;
 	_priorFrameTime = g_system->getMillis();
 }
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 769ad4c054..1d0e37d071 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -108,9 +108,15 @@ Globals::Globals() : _dialogCenter(160, 140), _gfxManagerInstance(_screenSurface
 		_color2 = _gfxColors.foreground;
 		_color3 = _gfxColors.foreground;
 	}
-	_screenSurface.setScreenSurface();
+
+	// Set up a buffer for the screen surface
+	_screenSurface.create(SCREEN_WIDTH, SCREEN_HEIGHT);
+	_screenSurface.trackDirtyRects();
+
+	// Add the global graphics manager to the graphic manager list
 	_gfxManagers.push_back(&_gfxManagerInstance);
 
+	// Set up the global scene objects list
 	_sceneObjects = &_sceneObjectsInstance;
 	_sceneObjects_queue.push_front(_sceneObjects);
 
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 171167c2ea..bc4ce75c22 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -220,11 +220,10 @@ void Rect::synchronize(Serializer &s) {
 
 GfxSurface::GfxSurface() : _bounds(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT) {
 	_disableUpdates = false;
-	_screenSurface = false;
 	_lockSurfaceCtr = 0;
 	_customSurface = NULL;
-	_screenSurfaceP = NULL;
 	_transColor = -1;
+	_trackDirtyRects = false;
 }
 
 GfxSurface::GfxSurface(const GfxSurface &s) {
@@ -241,12 +240,41 @@ GfxSurface::~GfxSurface() {
 }
 
 /**
- * Specifies that the surface will encapsulate the ScummVM screen surface
+ * Turns on dirty rectangle tracking for the surface
  */
-void GfxSurface::setScreenSurface() {
-	_screenSurface = true;
-	_customSurface = NULL;
-	_lockSurfaceCtr = 0;
+void GfxSurface::trackDirtyRects() {
+	_trackDirtyRects = true;
+}
+
+void GfxSurface::addDirtyRect(const Rect &r) {
+	if (_trackDirtyRects)
+		_dirtyRects.push_back(Rect(r.left, r.top, 
+		MIN(r.right + 1, SCREEN_WIDTH), MIN(r.bottom + 1, SCREEN_HEIGHT)));
+}
+
+/**
+ * Copies all areas specified by the dirty rect list to the screen
+ */
+void GfxSurface::copyToScreen() {
+	assert(_trackDirtyRects);
+
+	// Merge any overlapping dirty rects
+	mergeDirtyRects();
+
+	// Loop through the dirty rect list to copy the affected areas to the sc
+	for (Common::List<Rect>::iterator i = _dirtyRects.begin(); i != _dirtyRects.end(); ++i) {
+		Rect r = *i;
+
+		const byte *srcP = (const byte *)_customSurface->getBasePtr(r.left, r.top);
+		g_system->copyRectToScreen(srcP, _customSurface->pitch, r.left, r.top, 
+			r.width(), r.height());
+	}
+
+	// Update the physical screen
+	g_system->updateScreen();
+
+	// Now that the dirty rects have been copied, clear the dirty rect list
+	_dirtyRects.clear();
 }
 
 /**
@@ -254,11 +282,13 @@ void GfxSurface::setScreenSurface() {
  */
 void GfxSurface::create(int width, int height) {
 	assert((width >= 0) && (height >= 0));
-	_screenSurface = false;
+
+	// Delete any prior internal surface that may have been previously created
 	if (_customSurface) {
 		_customSurface->free();
 		delete _customSurface;
 	}
+
 	_customSurface = new Graphics::Surface();
 	_customSurface->create(width, height, Graphics::PixelFormat::createFormatCLUT8());
 	Common::fill((byte *)_customSurface->pixels, (byte *)_customSurface->pixels + (width * height), 0);
@@ -271,13 +301,7 @@ void GfxSurface::create(int width, int height) {
 Graphics::Surface GfxSurface::lockSurface() {
 	++_lockSurfaceCtr;
 
-	Graphics::Surface *src;
-	if (_screenSurface) {
-		if (_lockSurfaceCtr == 1)
-			_screenSurfaceP = g_system->lockScreen();
-		src = _screenSurfaceP;
-	} else
-		src = _customSurface;
+	Graphics::Surface *src = _customSurface;
 	assert(src);
 
 	// Setup the returned surface either as one pointing to the same pixels as the source, or
@@ -298,15 +322,10 @@ Graphics::Surface GfxSurface::lockSurface() {
 void GfxSurface::unlockSurface() {
 	assert(_lockSurfaceCtr > 0);
 	--_lockSurfaceCtr;
-
-	if ((_lockSurfaceCtr == 0) && _screenSurface) {
-		g_system->unlockScreen();
-	}
 }
 
 void GfxSurface::synchronize(Serializer &s) {
 	assert(!_lockSurfaceCtr);
-	assert(!_screenSurface);
 
 	s.syncAsByte(_disableUpdates);
 	_bounds.synchronize(s);
@@ -351,6 +370,7 @@ void GfxSurface::fillRect(const Rect &bounds, int color) {
 	Graphics::Surface surface = lockSurface();
 	surface.fillRect(bounds, color);
 	unlockSurface();
+	addDirtyRect(bounds);
 }
 
 GfxSurface &GfxSurface::operator=(const GfxSurface &s) {
@@ -363,7 +383,6 @@ GfxSurface &GfxSurface::operator=(const GfxSurface &s) {
 	}
 
 	_customSurface = s._customSurface;
-	_screenSurface = s._screenSurface;
 	_disableUpdates = s._disableUpdates;
 	_bounds = s._bounds;
 	_centroid = s._centroid;
@@ -567,10 +586,17 @@ void GfxSurface::copyFrom(GfxSurface &src, Rect srcBounds, Rect destBounds, Regi
 	if (destBounds.bottom > destSurface.h)
 		destBounds.bottom = destSurface.h;
 
-	if (destBounds.isValidRect()) {
+	if (destBounds.isValidRect() && (destBounds.left < SCREEN_WIDTH) && (destBounds.right >= 0) &&
+			(destBounds.top < SCREEN_HEIGHT) && (destBounds.bottom >= 0)) {
+		// Register the affected area as dirty
+		addDirtyRect(Rect(destBounds.left + _bounds.left, destBounds.top + _bounds.top,
+				destBounds.right + _bounds.left, destBounds.bottom + _bounds.top));
+
+		// Get pointers to the source and destination surface areas
 		const byte *pSrc = (const byte *)srcSurface.getBasePtr(srcX, srcY);
 		byte *pDest = (byte *)destSurface.getBasePtr(destBounds.left, destBounds.top);
 
+		// Loop through copying each row
 		for (int y = 0; y < destBounds.height(); ++y, pSrc += srcSurface.pitch, pDest += destSurface.pitch) {
 
 			if (!priorityRegion && (src._transColor == -1))
@@ -595,6 +621,7 @@ void GfxSurface::copyFrom(GfxSurface &src, Rect srcBounds, Rect destBounds, Regi
 		}
 	}
 
+	// Unlock the surfaces
 	unlockSurface();
 	srcImage.unlockSurface();
 }
@@ -613,6 +640,68 @@ void GfxSurface::draw(const Common::Point &pt, Rect *rect) {
 	}
 }
 
+/**
+ * Merges any clipping rectangles that overlap to try and reduce
+ * the total number of clip rectangles.
+ */
+void GfxSurface::mergeDirtyRects() {
+	if (_dirtyRects.size() <= 1)
+		return;
+
+	Common::List<Rect>::iterator rOuter, rInner;
+
+	for (rOuter = _dirtyRects.begin(); rOuter != _dirtyRects.end(); ++rOuter) {
+		rInner = rOuter;
+		while (++rInner != _dirtyRects.end()) {
+
+			if (looseIntersectRectangle(*rOuter, *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;
+			}
+		}
+	}
+}
+
+/**
+ * Check if the two rectangles are next to each other.
+ * @param pSrc1			a source rectangle
+ * @param pSrc2			a source rectangle
+ */
+bool GfxSurface::looseIntersectRectangle(const Rect &src1, const Rect &src2) {
+	Rect destRect;
+
+	destRect.left   = MAX(src1.left, src2.left);
+	destRect.top    = MAX(src1.top, src2.top);
+	destRect.right  = MIN(src1.right, src2.right);
+	destRect.bottom = MIN(src1.bottom, src2.bottom);
+
+	return destRect.isValidRect();
+}
+
+/**
+ * Creates the union of two rectangles.
+ * Returns True if there is a union.
+ * @param pDest			destination rectangle that is to receive the new union
+ * @param pSrc1			a source rectangle
+ * @param pSrc2			a source rectangle
+ */
+bool GfxSurface::unionRectangle(Common::Rect &destRect, const Rect &src1, const Rect &src2) {
+	destRect.left   = MIN(src1.left, src2.left);
+	destRect.top    = MIN(src1.top, src2.top);
+	destRect.right  = MAX(src1.right, src2.right);
+	destRect.bottom = MAX(src1.bottom, src2.bottom);
+
+	return !destRect.isEmpty();
+}
+
 /*--------------------------------------------------------------------------*/
 
 GfxElement::GfxElement() {
@@ -639,6 +728,9 @@ void GfxElement::highlight() {
 	GfxManager &gfxManager = g_globals->gfxManager();
 	Graphics::Surface surface = gfxManager.lockSurface();
 
+	// Mark the area is dirty
+	gfxManager.addDirtyRect(_bounds);
+
 	// Scan through the contents of the element, switching any occurances of the foreground
 	// color with the background color and vice versa
 	Rect tempRect(_bounds);
@@ -734,6 +826,7 @@ void GfxElement::drawFrame() {
 	gfxManager.fillRect2(tempRect.right, tempRect.top + 2, 1, tempRect.height() - 3, 0);
 
 	gfxManager.unlockSurface();
+	gfxManager.addDirtyRect(_bounds);
 }
 
 /**
@@ -1090,7 +1183,7 @@ GfxButton *GfxDialog::execute(GfxButton *defaultButton) {
 		}
 
 		g_system->delayMillis(10);
-		g_system->updateScreen();
+		GLOBALS._screenSurface.copyToScreen();
 	}
 
 	_gfxManager.deactivate();
@@ -1174,6 +1267,11 @@ void GfxManager::fillArea(int xp, int yp, int color) {
 	_surface.fillRect(tempRect, color);
 }
 
+void GfxManager::addDirtyRect(const Rect &r) { 
+	_surface.addDirtyRect(Rect(r.left + _bounds.left, r.top + _bounds.top,
+		r.right + _bounds.left, r.bottom + _bounds.top));
+}
+
 void GfxManager::fillRect(const Rect &bounds, int color) {
 	_surface.setBounds(_bounds);
 	_surface.fillRect(bounds, color);
diff --git a/engines/tsage/graphics.h b/engines/tsage/graphics.h
index dba3401700..e32994505c 100644
--- a/engines/tsage/graphics.h
+++ b/engines/tsage/graphics.h
@@ -74,12 +74,16 @@ public:
 class GfxSurface {
 private:
 	Graphics::Surface *_customSurface;
-	Graphics::Surface *_screenSurfaceP;
 	int _lockSurfaceCtr;
-	bool _screenSurface;
 
 	bool _disableUpdates;
 	Rect _bounds;
+	bool _trackDirtyRects;
+	Common::List<Rect> _dirtyRects;
+
+	void mergeDirtyRects();
+	bool looseIntersectRectangle(const Rect &src1, const Rect &src2);
+	bool unionRectangle(Common::Rect &destRect, const Rect &src1, const Rect &src2);
 public:
 	Common::Point _centroid;
 	int _transColor;
@@ -88,7 +92,9 @@ public:
 	GfxSurface(const GfxSurface &s);
 	~GfxSurface();
 
-	void setScreenSurface();
+	void trackDirtyRects();
+	void addDirtyRect(const Rect &r);
+	void copyToScreen();
 	Graphics::Surface lockSurface();
 	void unlockSurface();
 	void synchronize(Serializer &s);
@@ -274,6 +280,7 @@ public:
 		return _surface.lockSurface();
 	}
 	void unlockSurface() { _surface.unlockSurface(); }
+	void addDirtyRect(const Rect &r);
 	void fillArea(int xp, int yp, int color);
 	void fillRect(const Rect &bounds, int color);
 	void fillRect2(int xs, int ys, int width, int height, int color);
@@ -301,7 +308,6 @@ public:
 	void copyFrom(GfxSurface &src, int destX, int destY) {
 		_surface.setBounds(_bounds);
 		_surface.copyFrom(src, destX, destY);
-		g_system->updateScreen();
 	}
 	GfxSurface &getSurface() {
 		_surface.setBounds(_bounds);
diff --git a/engines/tsage/ringworld/ringworld_dialogs.cpp b/engines/tsage/ringworld/ringworld_dialogs.cpp
index 37101c9c58..d0d5ab7b4a 100644
--- a/engines/tsage/ringworld/ringworld_dialogs.cpp
+++ b/engines/tsage/ringworld/ringworld_dialogs.cpp
@@ -183,7 +183,7 @@ void RightClickDialog::execute() {
 		}
 
 		g_system->delayMillis(10);
-		g_system->updateScreen();
+		GLOBALS._screenSurface.copyToScreen();
 	}
 
 	// Execute the specified action
@@ -394,7 +394,7 @@ void InventoryDialog::execute() {
 		Event event;
 		while (!g_globals->_events.getEvent(event) && !g_vm->shouldQuit()) {
 			g_system->delayMillis(10);
-			g_system->updateScreen();
+			GLOBALS._screenSurface.copyToScreen();
 		}
 		if (g_vm->shouldQuit())
 			break;
diff --git a/engines/tsage/ringworld/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index c87b95e0b8..2497327a01 100644
--- a/engines/tsage/ringworld/ringworld_logic.cpp
+++ b/engines/tsage/ringworld/ringworld_logic.cpp
@@ -315,7 +315,7 @@ void SceneArea::wait() {
 	// Wait until a mouse or keypress
 	Event event;
 	while (!g_vm->shouldQuit() && !g_globals->_events.getEvent(event)) {
-		g_system->updateScreen();
+		GLOBALS._screenSurface.copyToScreen();
 		g_system->delayMillis(10);
 	}
 
diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp
index 81190aea7b..6f3d1ed93a 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes3.cpp
@@ -532,7 +532,7 @@ void Scene2100::Action1::signal() {
 			// Wait for an event
 			Event event;
 			if (!g_globals->_events.getEvent(event)) {
-				g_system->updateScreen();
+				GLOBALS._screenSurface.copyToScreen();
 				g_system->delayMillis(10);
 				continue;
 			}
@@ -2263,7 +2263,7 @@ void Scene2150::Action1::signal() {
 			// Wait for an event
 			Event event;
 			if (!g_globals->_events.getEvent(event)) {
-				g_system->updateScreen();
+				GLOBALS._screenSurface.copyToScreen();
 				g_system->delayMillis(10);
 				continue;
 			}
@@ -5118,7 +5118,7 @@ void Scene2320::Action3::signal() {
 			// Wait for an event
 			Event event;
 			if (!g_globals->_events.getEvent(event)) {
-				g_system->updateScreen();
+				GLOBALS._screenSurface.copyToScreen();
 				g_system->delayMillis(10);
 				continue;
 			}
diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index 49726eba2e..7c8da54fac 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes5.cpp
@@ -2810,7 +2810,7 @@ void Scene4150::Action1::signal() {
 	case 4: {
 		for (int idx = 100; idx >= 0; idx -= 5) {
 			g_globals->_scenePalette.fade(adjustData, false, idx);
-			g_system->updateScreen();
+			GLOBALS._screenSurface.copyToScreen();
 			g_system->delayMillis(10);
 		}
 
@@ -2838,7 +2838,7 @@ void Scene4150::Action1::signal() {
 	case 7:
 		for (int idx = 100; idx >= 0; idx -= 5) {
 			g_globals->_scenePalette.fade(adjustData, false, idx);
-			g_system->updateScreen();
+			GLOBALS._screenSurface.copyToScreen();
 			g_system->delayMillis(10);
 		}
 
diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
index ddb4eae9c4..6035b37e19 100644
--- a/engines/tsage/ringworld2/ringworld2_dialogs.cpp
+++ b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
@@ -153,7 +153,7 @@ void RightClickDialog::execute() {
 		}
 
 		g_system->delayMillis(10);
-		g_system->updateScreen();
+		GLOBALS._screenSurface.copyToScreen();
 	}
 
 	// Execute the specified action
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 6362c63bc3..03c7d8d0ae 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -133,7 +133,7 @@ void SceneManager::fadeInIfNecessary() {
 				percent = 100;
 
 			g_globals->_scenePalette.fade((const byte *)&adjustData, false, percent);
-			g_system->updateScreen();
+			GLOBALS._screenSurface.copyToScreen();
 			g_system->delayMillis(10);
 		}
 
-- 
cgit v1.2.3


From 421c8cd2624a9e8ac2f0091ef1b51b42f99dae26 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 11:25:49 +0200
Subject: DREAMWEB: Port 'setpickup' to C++ and added an enum for the object
 types

---
 engines/dreamweb/dreamgen.cpp | 65 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/object.cpp   | 59 ++++++++++++++++++++++++++++++++++++---
 engines/dreamweb/people.cpp   |  4 +--
 engines/dreamweb/structs.h    |  7 +++++
 engines/dreamweb/stubs.cpp    | 16 +++++------
 engines/dreamweb/stubs.h      |  1 +
 engines/dreamweb/use.cpp      |  2 +-
 8 files changed, 74 insertions(+), 81 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 72f2feca0e..04276c001e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -519,71 +519,6 @@ foundmatch:
 	bx = pop();
 }
 
-void DreamGenContext::setPickup() {
-	STACK_CHECK;
-	_cmp(data.byte(kObjecttype), 1);
-	if (flags.z())
-		goto cantpick;
-	_cmp(data.byte(kObjecttype), 3);
-	if (flags.z())
-		goto cantpick;
-	getAnyAd();
-	al = es.byte(bx+2);
-	_cmp(al, 4);
-	if (!flags.z())
-		goto canpick;
-cantpick:
-	blank();
-	return;
-canpick:
-	_cmp(data.byte(kCommandtype), 209);
-	if (flags.z())
-		goto alreadysp;
-	data.byte(kCommandtype) = 209;
-	bl = data.byte(kCommand);
-	bh = data.byte(kObjecttype);
-	al = 33;
-	commandWithOb();
-alreadysp:
-	ax = data.word(kMousebutton);
-	_cmp(ax, 1);
-	if (!flags.z())
-		return /* (nosetpick) */;
-	_cmp(ax, data.word(kOldbutton));
-	if (!flags.z())
-		goto dosetpick;
-	return;
-dosetpick:
-	createPanel();
-	showPanel();
-	showMan();
-	showExit();
-	examIcon();
-	data.byte(kPickup) = 1;
-	data.byte(kInvopen) = 2;
-	_cmp(data.byte(kObjecttype), 4);
-	if (flags.z())
-		goto pickupexob;
-	al = data.byte(kCommand);
-	data.byte(kItemframe) = al;
-	data.byte(kOpenedob) = 255;
-	transferToEx();
-	data.byte(kItemframe) = al;
-	data.byte(kObjecttype) = 4;
-	getEitherAd();
-	es.byte(bx+2) = 20;
-	es.byte(bx+3) = 255;
-	openInv();
-	workToScreenM();
-	return;
-pickupexob:
-	al = data.byte(kCommand);
-	data.byte(kItemframe) = al;
-	data.byte(kOpenedob) = 255;
-	openInv();
-	workToScreenM();
-}
-
 void DreamGenContext::reExFromInv() {
 	STACK_CHECK;
 	findInvPos();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 29cd6e39ab..cbf4d558c8 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -506,7 +506,6 @@ public:
 	void fillOpen();
 	void deleteExObject();
 	void getEitherAd();
-	void setPickup();
 	void dropObject();
 	void showDiaryKeys();
 	void useOpened();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index e4abac14f2..4daa5091a5 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -108,10 +108,10 @@ void DreamBase::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 }
 
 void DreamBase::obPicture() {
-	if (data.byte(kObjecttype) == 1)
+	if (data.byte(kObjecttype) == kSetObjectType1)
 		return;
 	Frame *frames;
-	if (data.byte(kObjecttype) == 4)
+	if (data.byte(kObjecttype) == kExObjectType)
 		frames = (Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
 	else
 		frames = (Frame *)getSegment(data.word(kFreeframes)).ptr(0, 0);
@@ -133,6 +133,7 @@ void DreamBase::obIcons() {
 void DreamGenContext::examineOb(bool examineAgain) {
 	data.byte(kPointermode) = 0;
 	data.word(kTimecount) = 0;
+
 	while (true) {
 		if (examineAgain) {
 			data.byte(kInmaparea) = 0;
@@ -140,8 +141,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 			data.byte(kOpenedob) = 255;
 			data.byte(kOpenedtype) = 255;
 			data.byte(kInvopen) = 0;
-			al = data.byte(kCommandtype);
-			data.byte(kObjecttype) = al;
+			data.byte(kObjecttype) = data.byte(kCommandtype);
 			data.byte(kItemframe) = 0;
 			data.byte(kPointerframe) = 0;
 			createPanel();
@@ -167,6 +167,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 		dumpTextLine();
 		delPointer();
 		data.byte(kGetback) = 0;
+
 		switch (data.byte(kInvopen)) {
 		case 0: {
 			RectWithCallback examList[] = {
@@ -207,6 +208,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 			break;
 		}
 		}
+
 		if (data.byte(kQuitrequested) != 0)
 			break;
 		if (data.byte(kExamagain) != 0)
@@ -426,4 +428,53 @@ void DreamGenContext::selectOb() {
 	}
 }
 
+void DreamGenContext::setPickup() {
+	if (data.byte(kObjecttype) != kSetObjectType1 && data.byte(kObjecttype) != kSetObjectType3) {
+		// The original called getAnyAd() here. However, since object types
+		// 1 and 3 are excluded, the resulting object is a DynObject, so
+		// we can use getEitherAd() instead.
+		DynObject *object = getEitherAdCPP();
+		if (object->mapad[0] == 4) {
+			blank();
+			return;
+		}
+	} else {
+		blank();
+		return;
+	}
+
+	if (data.byte(kCommandtype) != 209) {
+		data.byte(kCommandtype) = 209;
+		commandWithOb(33, data.byte(kObjecttype), data.byte(kCommand));
+	}
+
+	if (data.word(kMousebutton) == 1 && data.word(kMousebutton) == data.word(kOldbutton))
+		return;
+
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	examIcon();
+	data.byte(kPickup) = 1;
+	data.byte(kInvopen) = 2;
+
+	if (data.byte(kObjecttype) != kExObjectType) {
+		data.byte(kItemframe) = data.byte(kCommand);
+		data.byte(kOpenedob) = 255;
+		transferToEx();
+		data.byte(kItemframe) = data.byte(kCommand);
+		data.byte(kObjecttype) = kExObjectType;
+		DynObject *object = getEitherAdCPP();
+		object->mapad[0] = 20;
+		object->mapad[1] = 255;
+	} else {
+		data.byte(kItemframe) = data.byte(kCommand);
+		data.byte(kOpenedob) = 255;
+	}
+
+	openInv();
+	workToScreenM();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index af92d07439..8998e2f394 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -941,10 +941,10 @@ void DreamGenContext::mugger(ReelRoutine &routine) {
 		findXYFromPath();
 		data.byte(kResetmanxy) = 1;
 		data.byte(kCommand) = findExObject("WETA");
-		data.byte(kObjecttype) = 4;
+		data.byte(kObjecttype) = kExObjectType;
 		removeObFromInv();
 		data.byte(kCommand) = findExObject("WETB");
-		data.byte(kObjecttype) = 4;
+		data.byte(kObjecttype) = kExObjectType;
 		removeObFromInv();
 		makeMainScreen();
 		DreamBase::setupTimedUse(48, 70, 10, 68 - 32, 54 + 64);
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 709a3d2a8e..d96469fbd5 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -296,6 +296,13 @@ struct Atmosphere {
 	uint8 _repeat;
 };
 
+enum ObjectTypes {
+	kSetObjectType1 = 1,
+	kFreeObjectType = 2,
+	kSetObjectType3 = 3,
+	kExObjectType = 4
+};
+
 } // End of namespace DreamWeb
 
 #endif
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 7f1824d2bb..bf29cd05ea 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1354,24 +1354,24 @@ DynObject *DreamBase::getExAd(uint8 index) {
 }
 
 DynObject *DreamBase::getEitherAdCPP() {
-	if (data.byte(kObjecttype) == 4)
+	if (data.byte(kObjecttype) == kExObjectType)
 		return getExAd(data.byte(kItemframe));
 	else
 		return getFreeAd(data.byte(kItemframe));
 }
 
 void *DreamBase::getAnyAd(uint8 *value1, uint8 *value2) {
-	if (data.byte(kObjecttype) == 4) {
+	if (data.byte(kObjecttype) == kExObjectType) {
 		DynObject *exObject = getExAd(data.byte(kCommand));
 		*value1 = exObject->slotSize;
 		*value2 = exObject->slotCount;
 		return exObject;
-	} else if (data.byte(kObjecttype) == 2) {
+	} else if (data.byte(kObjecttype) == kFreeObjectType) {
 		DynObject *freeObject = getFreeAd(data.byte(kCommand));
 		*value1 = freeObject->slotSize;
 		*value2 = freeObject->slotCount;
 		return freeObject;
-	} else {
+	} else {	// 1 or 3. 0 should never happen
 		SetObject *setObject = getSetAd(data.byte(kCommand));
 		// Note: the original returned slotCount/priority (bytes 4 and 5)
 		// instead of slotSize/slotCount (bytes 3 and 4).
@@ -1615,7 +1615,7 @@ void DreamBase::showPointer() {
 	data.word(kOldpointery) = data.word(kMousey);
 	if (data.byte(kPickup) == 1) {
 		const Frame *frames;
-		if (data.byte(kObjecttype) != 4)
+		if (data.byte(kObjecttype) != kExObjectType)
 			frames = (const Frame *)getSegment(data.word(kFreeframes)).ptr(0, 0);
 		else
 			frames = (const Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
@@ -3209,7 +3209,7 @@ void DreamBase::getBackToOps() {
 
 void DreamGenContext::pickupOb(uint8 command, uint8 pos) {
 	data.byte(kLastinvpos) = pos;
-	data.byte(kObjecttype) = 2;
+	data.byte(kObjecttype) = kFreeObjectType;
 	data.byte(kItemframe) = command;
 	data.byte(kCommand) = command;
 	getAnyAd();
@@ -3353,13 +3353,13 @@ void DreamGenContext::obsThatDoThings() {
 void DreamGenContext::describeOb() {
 	const uint8 *obText = getObTextStartCPP();
 	uint16 y = 92;
-	if (data.byte(kForeignrelease) && data.byte(kObjecttype) == 1)
+	if (data.byte(kForeignrelease) && data.byte(kObjecttype) == kSetObjectType1)
 		y = 82;
 	data.word(kCharshift) = 91 + 91;
 	printDirect(&obText, 33, &y, 241, 241 & 1);
 	data.word(kCharshift) = 0;
 	y = 104;
-	if (data.byte(kForeignrelease) && data.byte(kObjecttype) == 1)
+	if (data.byte(kForeignrelease) && data.byte(kObjecttype) == kSetObjectType1)
 		y = 94;
 	printDirect(&obText, 36, &y, 241, 241 & 1);
 	obsThatDoThings();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 2305b93d53..e6726b664a 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -403,5 +403,6 @@
 	void selectOb();
 	void findInvPos();
 	uint16 findInvPosCPP();
+	void setPickup();
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 5b6e3f8dff..06cb5a9131 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -760,7 +760,7 @@ void DreamGenContext::useChurchGate() {
 
 void DreamGenContext::useGun() {
 
-	if (data.byte(kObjecttype) != 4) {
+	if (data.byte(kObjecttype) != kExObjectType) {
 		// gun is not taken
 		showSecondUse();
 		putBackObStuff();
-- 
cgit v1.2.3


From 8385ee1c012af3f2d62cfa098aab7254c4e559b0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 18 Dec 2011 21:07:31 +1100
Subject: TSAGE: Bugfix for using save/load buttons in the Blue Force options
 dialog

---
 engines/tsage/blue_force/blueforce_dialogs.cpp | 49 +++++++++++++++++---------
 1 file changed, 33 insertions(+), 16 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp
index 6f294d263a..11c0358aca 100644
--- a/engines/tsage/blue_force/blueforce_dialogs.cpp
+++ b/engines/tsage/blue_force/blueforce_dialogs.cpp
@@ -166,6 +166,9 @@ void RightClickDialog::execute() {
 		GLOBALS._screenSurface.copyToScreen();
 	}
 
+	// Deactivate the graphics manager used for the dialog
+	_gfxManager.deactivate();
+
 	// Execute the specified action
 	CursorType cursorNum = CURSOR_NONE;
 	switch (_selectedAction) {
@@ -193,8 +196,6 @@ void RightClickDialog::execute() {
 
 	if (cursorNum != CURSOR_NONE)
 		BF_GLOBALS._events.setCursor(cursorNum);
-
-	_gfxManager.deactivate();
 }
 
 /*--------------------------------------------------------------------------*/
@@ -435,29 +436,45 @@ void OptionsDialog::show() {
 	OptionsDialog *dlg = new OptionsDialog();
 	dlg->draw();
 
+	// Show the dialog
 	GfxButton *btn = dlg->execute();
 
-	if (btn == &dlg->_btnQuit) {
+	// Get which button was pressed
+	int btnIndex = -1;
+	if (btn == &dlg->_btnRestore)
+		btnIndex = 0;
+	else if (btn == &dlg->_btnSave)
+		btnIndex = 1;
+	else if (btn == &dlg->_btnRestart)
+		btnIndex = 2;
+	else if (btn == &dlg->_btnQuit)
+		btnIndex = 3;
+	else if (btn == &dlg->_btnSound)
+		btnIndex = 4;
+
+	// Close the dialog
+	dlg->remove();
+	delete dlg;
+
+	// Execute the given selection
+	if (btnIndex == 0) {
+		// Restore button
+		g_globals->_game->restoreGame();
+	} else if (btnIndex == 1) {
+		// Save button
+		g_globals->_game->saveGame();
+	} else if (btnIndex == 2) {
+		// Restart game
+		g_globals->_game->restartGame();
+	} else if (btnIndex == 3) {
 		// Quit game
 		if (MessageDialog::show(QUIT_CONFIRM_MSG, CANCEL_BTN_STRING, QUIT_BTN_STRING) == 1) {
 			g_vm->quitGame();
 		}
-	} else if (btn == &dlg->_btnRestart) {
-		// Restart game
-		g_globals->_game->restartGame();
-	} else if (btn == &dlg->_btnSound) {
+	} else if (btnIndex == 4) {
 		// Sound dialog
 		SoundDialog::execute();
-	} else if (btn == &dlg->_btnSave) {
-		// Save button
-		g_globals->_game->saveGame();
-	} else if (btn == &dlg->_btnRestore) {
-		// Restore button
-		g_globals->_game->restoreGame();
 	}
-
-	dlg->remove();
-	delete dlg;
 }
 
 OptionsDialog::OptionsDialog() {
-- 
cgit v1.2.3


From 96d15e83dbca886054550d3c1d676b955464a9fc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 18 Dec 2011 21:18:33 +1100
Subject: TSAGE: Bugfix for Ringworld saving and restoring via options dialog

---
 engines/tsage/ringworld/ringworld_dialogs.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld/ringworld_dialogs.cpp b/engines/tsage/ringworld/ringworld_dialogs.cpp
index d0d5ab7b4a..0561a27055 100644
--- a/engines/tsage/ringworld/ringworld_dialogs.cpp
+++ b/engines/tsage/ringworld/ringworld_dialogs.cpp
@@ -186,6 +186,8 @@ void RightClickDialog::execute() {
 		GLOBALS._screenSurface.copyToScreen();
 	}
 
+	_gfxManager.deactivate();
+
 	// Execute the specified action
 	switch (_selectedAction) {
 	case 1:
@@ -213,8 +215,6 @@ void RightClickDialog::execute() {
 		Ringworld::OptionsDialog::show();
 		break;
 	}
-
-	_gfxManager.deactivate();
 }
 
 /*--------------------------------------------------------------------------*/
-- 
cgit v1.2.3


From a1799ba0912615793c41537cae38e13c5a61f5ea Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 12:17:56 +0200
Subject: DREAMWEB: Close the file opened in querySaveMetaInfos() when
 returning

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

(limited to 'engines')

diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index b5ec6e8e69..3a5c28a104 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -184,6 +184,7 @@ SaveStateDescriptor DreamWebMetaEngine::querySaveMetaInfos(const char *target, i
 			desc.setThumbnail(thumbnail);
 		}
 
+		delete in;
 		return desc;
 	}
 
-- 
cgit v1.2.3


From 09eaef6bcd65ac55a10920920a0bb1feb32cae80 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 13:08:27 +0200
Subject: DREAMWEB: Remove regression from b0a42f1 (duplicate saved reel data)

---
 engines/dreamweb/saveload.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines')

diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 599ef45c66..e9a670c9d7 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -435,7 +435,6 @@ void DreamGenContext::savePosition(unsigned int slot, const char *descbuf) {
 	for (unsigned int i = 0; 8*i < kLenofreelrouts; ++i) {
 		syncReelRoutine(s, (ReelRoutine*)data.ptr(kReelroutines + 8*i, 8));
 	}
-	outSaveFile->write(data.ptr(kReelroutines, len[5]), len[5]);
 
 	// ScummVM data block
 	outSaveFile->writeUint32BE(SCUMMVM_HEADER);
-- 
cgit v1.2.3


From 5d1e1fbbbcff5c930b1f929883e9e0cf897e585f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 13:16:25 +0200
Subject: DREAMWEB: Spacing

---
 engines/dreamweb/saveload.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index e9a670c9d7..52f28515f5 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -432,8 +432,8 @@ void DreamGenContext::savePosition(unsigned int slot, const char *descbuf) {
 
 	// TODO: Convert more to serializer?
 	Common::Serializer s(0, outSaveFile);
-	for (unsigned int i = 0; 8*i < kLenofreelrouts; ++i) {
-		syncReelRoutine(s, (ReelRoutine*)data.ptr(kReelroutines + 8*i, 8));
+	for (unsigned int i = 0; 8 * i < kLenofreelrouts; ++i) {
+		syncReelRoutine(s, (ReelRoutine *)data.ptr(kReelroutines + 8 * i, 8));
 	}
 
 	// ScummVM data block
@@ -498,8 +498,8 @@ void DreamGenContext::loadPosition(unsigned int slot) {
 
 	// TODO: Use serializer for more
 	Common::Serializer s(inSaveFile, 0);
-	for (unsigned int i = 0; 8*i < kLenofreelrouts; ++i) {
-		syncReelRoutine(s, (ReelRoutine*)data.ptr(kReelroutines + 8*i, 8));
+	for (unsigned int i = 0; 8 * i < kLenofreelrouts; ++i) {
+		syncReelRoutine(s, (ReelRoutine *)data.ptr(kReelroutines + 8 * i, 8));
 	}
 
 	// Check if there's a ScummVM data block
-- 
cgit v1.2.3


From 4178ad6b681d32de567b00833b18bf992cbffd92 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 18 Dec 2011 12:38:53 +0100
Subject: DREAMWEB: Fix ReelRoutine terminator saving/loading

---
 engines/dreamweb/saveload.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 52f28515f5..4001cb1448 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -432,9 +432,11 @@ void DreamGenContext::savePosition(unsigned int slot, const char *descbuf) {
 
 	// TODO: Convert more to serializer?
 	Common::Serializer s(0, outSaveFile);
-	for (unsigned int i = 0; 8 * i < kLenofreelrouts; ++i) {
-		syncReelRoutine(s, (ReelRoutine *)data.ptr(kReelroutines + 8 * i, 8));
+	for (unsigned int i = 0; 8*i < kLenofreelrouts - 1; ++i) {
+		syncReelRoutine(s, (ReelRoutine *)data.ptr(kReelroutines + 8*i, 8));
 	}
+	// Terminator
+	s.syncAsByte(*data.ptr(kReelroutines + kLenofreelrouts - 1, 1));
 
 	// ScummVM data block
 	outSaveFile->writeUint32BE(SCUMMVM_HEADER);
@@ -498,9 +500,11 @@ void DreamGenContext::loadPosition(unsigned int slot) {
 
 	// TODO: Use serializer for more
 	Common::Serializer s(inSaveFile, 0);
-	for (unsigned int i = 0; 8 * i < kLenofreelrouts; ++i) {
-		syncReelRoutine(s, (ReelRoutine *)data.ptr(kReelroutines + 8 * i, 8));
+	for (unsigned int i = 0; 8*i < kLenofreelrouts - 1; ++i) {
+		syncReelRoutine(s, (ReelRoutine *)data.ptr(kReelroutines + 8*i, 8));
 	}
+	// Terminator
+	s.syncAsByte(*data.ptr(kReelroutines + kLenofreelrouts - 1, 1));
 
 	// Check if there's a ScummVM data block
 	if (header.len(6) == SCUMMVM_BLOCK_MAGIC_SIZE) {
-- 
cgit v1.2.3


From feaf297c7500aaff8a68da0a47466e537f25db4b Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 18 Dec 2011 13:06:05 +0100
Subject: DREAMWEB: Fix multiple regressions in setPickup

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

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 4daa5091a5..473d876ce8 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -448,7 +448,7 @@ void DreamGenContext::setPickup() {
 		commandWithOb(33, data.byte(kObjecttype), data.byte(kCommand));
 	}
 
-	if (data.word(kMousebutton) == 1 && data.word(kMousebutton) == data.word(kOldbutton))
+	if (data.word(kMousebutton) != 1 || data.word(kMousebutton) == data.word(kOldbutton))
 		return;
 
 	createPanel();
@@ -463,9 +463,9 @@ void DreamGenContext::setPickup() {
 		data.byte(kItemframe) = data.byte(kCommand);
 		data.byte(kOpenedob) = 255;
 		transferToEx();
-		data.byte(kItemframe) = data.byte(kCommand);
+		data.byte(kItemframe) = al;
 		data.byte(kObjecttype) = kExObjectType;
-		DynObject *object = getEitherAdCPP();
+		DynObject *object = getExAd(data.byte(kItemframe));
 		object->mapad[0] = 20;
 		object->mapad[1] = 255;
 	} else {
-- 
cgit v1.2.3


From cf73ee9939fae986db922a2551544277d8d48449 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 18 Dec 2011 13:18:24 +0100
Subject: DREAMWEB: Fix multiple regressions in checkInside and loadCart

---
 engines/dreamweb/monitor.cpp | 5 +++--
 engines/dreamweb/stubs.cpp   | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 577d5701ee..0b126ee250 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -405,8 +405,9 @@ void DreamGenContext::loadNews() {
 void DreamGenContext::loadCart() {
 	byte cartridgeId = 0;
 	uint16 objectIndex = findSetObject("INTF");
-	if (checkInside(objectIndex, 1) != kNumexobjects)
-		cartridgeId = getSetAd(objectIndex)->name[0] + 1;
+	uint16 cartridgeIndex = checkInside(objectIndex, 1);
+	if (cartridgeIndex != kNumexobjects)
+		cartridgeId = getExAd(cartridgeIndex)->id[3] + 1;
 
 	if (cartridgeId == 0)
 		data.word(kTextfile3) = standardLoad("DREAMWEB.T20"); // monitor file 20
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index bf29cd05ea..1c87a05dea 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1801,6 +1801,8 @@ bool DreamBase::isRyanHolding(const char *id) {
 
 void DreamGenContext::checkInside() {
 	cl = checkInside(al, ah);
+	es = data.word(kExtras);
+	bx = kExdata + cl * sizeof(DynObject);
 }
 
 uint16 DreamGenContext::checkInside(uint16 command, uint16 type) {
-- 
cgit v1.2.3


From f0508dd05a2840a98f98d3a215b5a859d757e653 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 18 Dec 2011 14:08:32 +0100
Subject: DREAMWEB: Fix regression in useWinch

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

(limited to 'engines')

diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 06cb5a9131..5a80a33bd5 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -994,7 +994,8 @@ void DreamGenContext::useObject() {
 }
 
 void DreamGenContext::useWinch() {
-	if (checkInside(40, 1) == kNumexobjects || !compare(cl, 4, "FUSE")) {
+	uint16 contentIndex = checkInside(40, 1);
+	if (contentIndex == kNumexobjects || !compare(contentIndex, kExObjectType, "FUSE")) {
 		// No winch
 		showFirstUse();
 		putBackObStuff();
-- 
cgit v1.2.3


From 8c8666e811d1b68fec400f4100a02146e0e1235b Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 18 Dec 2011 13:04:45 +0100
Subject: DREAMWEB: Move backdrop.cpp and more to DreamBase; remove some dead
 code

---
 engines/dreamweb/backdrop.cpp | 78 +++++++++++++++++---------------------
 engines/dreamweb/dreambase.h  | 31 ++++++++++++++-
 engines/dreamweb/dreamweb.cpp |  2 +-
 engines/dreamweb/monitor.cpp  | 18 ++++-----
 engines/dreamweb/stubs.cpp    | 88 +++++++------------------------------------
 engines/dreamweb/stubs.h      | 36 ------------------
 engines/dreamweb/use.cpp      | 32 ++++++++++++----
 engines/dreamweb/vgafades.cpp |  4 +-
 8 files changed, 113 insertions(+), 176 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 15a226a5ac..38ccb0296c 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -24,7 +24,7 @@
 
 namespace DreamGen {
 
-void DreamGenContext::doBlocks() {
+void DreamBase::doBlocks() {
 	uint16 dstOffset = data.word(kMapady) * 320 + data.word(kMapadx);
 	uint16 mapOffset = kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx);
 	const uint8 *mapData = getSegment(data.word(kMapdata)).ptr(mapOffset, 0);
@@ -49,7 +49,6 @@ void DreamGenContext::doBlocks() {
 					dst += 320;
 				}
 				dst += 4;
-				ax = 0x0dfdf;
 				memset(dst, 0xdf, 16);
 				dst += 320;
 				memset(dst, 0xdf, 16);
@@ -63,7 +62,7 @@ void DreamGenContext::doBlocks() {
 	}
 }
 
-uint8 DreamGenContext::getXAd(const uint8 *setData, uint8 *result) {
+uint8 DreamBase::getXAd(const uint8 *setData, uint8 *result) {
 	uint8 v0 = setData[0];
 	uint8 v1 = setData[1];
 	uint8 v2 = setData[2];
@@ -78,7 +77,7 @@ uint8 DreamGenContext::getXAd(const uint8 *setData, uint8 *result) {
 	return 1;
 }
 
-uint8 DreamGenContext::getYAd(const uint8 *setData, uint8 *result) {
+uint8 DreamBase::getYAd(const uint8 *setData, uint8 *result) {
 	uint8 v0 = setData[3];
 	uint8 v1 = setData[4];
 	if (v0 < data.byte(kMapy))
@@ -90,11 +89,7 @@ uint8 DreamGenContext::getYAd(const uint8 *setData, uint8 *result) {
 	return 1;
 }
 
-void DreamGenContext::getMapAd() {
-	ch = getMapAd((const uint8 *)es.ptr(si, 5));
-}
-
-uint8 DreamGenContext::getMapAd(const uint8 *setData) {
+uint8 DreamBase::getMapAd(const uint8 *setData) {
 	uint8 xad, yad;
 	if (getXAd(setData, &xad) == 0)
 		return 0;
@@ -105,14 +100,7 @@ uint8 DreamGenContext::getMapAd(const uint8 *setData) {
 	return 1;
 }
 
-void DreamGenContext::calcFrFrame(uint16 frame) {
-	uint8 width, height;
-	calcFrFrame(frame, &width, &height);
-	cl = width;
-	ch = height;
-}
-
-void DreamGenContext::calcFrFrame(uint16 frameNum, uint8* width, uint8* height) {
+void DreamBase::calcFrFrame(uint16 frameNum, uint8* width, uint8* height) {
 	const Frame *frame = (const Frame *)getSegment(data.word(kFrsegment)).ptr(frameNum * sizeof(Frame), sizeof(Frame));
 	data.word(kSavesource) = data.word(kFramesad) + frame->ptr();
 	data.byte(kSavesize+0) = frame->width;
@@ -123,21 +111,34 @@ void DreamGenContext::calcFrFrame(uint16 frameNum, uint8* width, uint8* height)
 	*height = frame->height;
 }
 
-void DreamGenContext::finalFrame() {
-	uint16 x, y;
-	finalFrame(&x, &y);
-	di = x;
-	bx = y;
-}
-
-void DreamGenContext::finalFrame(uint16 *x, uint16 *y) {
+void DreamBase::finalFrame(uint16 *x, uint16 *y) {
 	data.byte(kSavex) = (data.word(kObjectx) + data.word(kOffsetx)) & 0xff;
 	data.byte(kSavey) = (data.word(kObjecty) + data.word(kOffsety)) & 0xff;
 	*x = data.word(kObjectx);
 	*y = data.word(kObjecty);
 }
 
-void DreamGenContext::showAllObs() {
+void DreamBase::makeBackOb(SetObject *objData) {
+	if (data.byte(kNewobs) == 0)
+		return;
+	uint8 priority = objData->priority;
+	uint8 type = objData->type;
+	Sprite *sprite = makeSprite(data.word(kObjectx), data.word(kObjecty), addr_backobject, data.word(kSetframes), 0);
+
+	uint16 objDataOffset = (uint8 *)objData - getSegment(data.word(kSetdat)).ptr(0, 0);
+	assert(objDataOffset % sizeof(SetObject) == 0);
+	assert(objDataOffset < 128 * sizeof(SetObject));
+	sprite->setObjData(objDataOffset);
+	if (priority == 255)
+		priority = 0;
+	sprite->priority = priority;
+	sprite->type = type;
+	sprite->b16 = 0;
+	sprite->delay = 0;
+	sprite->animFrame = 0;
+}
+
+void DreamBase::showAllObs() {
 	data.word(kListpos) = kSetlist;
 	memset(getSegment(data.word(kBuffers)).ptr(kSetlist, 0), 0xff, 128 * 5);
 	data.word(kFrsegment) = data.word(kSetframes);
@@ -153,7 +154,8 @@ void DreamGenContext::showAllObs() {
 		uint8 currentFrame = setEntry->frames[0];
 		if (currentFrame == 0xff)
 			continue;
-		calcFrFrame(currentFrame);
+		uint8 width, height;
+		calcFrFrame(currentFrame, &width, &height);
 		uint16 x, y;
 		finalFrame(&x, &y);
 		setEntry->index = setEntry->frames[0];
@@ -174,17 +176,7 @@ void DreamGenContext::showAllObs() {
 	}
 }
 
-void DreamGenContext::getDimension() {
-	uint8 mapXstart, mapYstart;
-	uint8 mapXsize, mapYsize;
-	getDimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
-	cl = mapXstart;
-	ch = mapYstart;
-	dl = mapXsize;
-	dh = mapYsize;
-}
-
-bool DreamGenContext::addAlong(const uint8 *mapFlags) {
+bool DreamBase::addAlong(const uint8 *mapFlags) {
 	for (size_t i = 0; i < 11; ++i) {
 		if (mapFlags[3 * i] != 0)
 			return true;
@@ -192,7 +184,7 @@ bool DreamGenContext::addAlong(const uint8 *mapFlags) {
 	return false;
 }
 
-bool DreamGenContext::addLength(const uint8 *mapFlags) {
+bool DreamBase::addLength(const uint8 *mapFlags) {
 	for (size_t i = 0; i < 10; ++i) {
 		if (mapFlags[3 * 11 * i] != 0)
 			return true;
@@ -200,7 +192,7 @@ bool DreamGenContext::addLength(const uint8 *mapFlags) {
 	return false;
 }
 
-void DreamGenContext::getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize) {
+void DreamBase::getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize) {
 	const uint8 *mapFlags = getSegment(data.word(kBuffers)).ptr(kMapflags, 0);
 
 	uint8 yStart = 0;
@@ -229,7 +221,7 @@ void DreamGenContext::getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *ma
 	data.byte(kMapysize) = *mapYsize << 4;
 }
 
-void DreamGenContext::calcMapAd() {
+void DreamBase::calcMapAd() {
 	uint8 mapXstart, mapYstart;
 	uint8 mapXsize, mapYsize;
 	getDimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
@@ -237,7 +229,7 @@ void DreamGenContext::calcMapAd() {
 	data.word(kMapady) = data.word(kMapoffsety) - 8 * (mapYsize + 2 * mapYstart - 10);
 }
 
-void DreamGenContext::showAllFree() {
+void DreamBase::showAllFree() {
 	data.word(kListpos) = kFreelist;
 	ObjPos *listPos = (ObjPos *)getSegment(data.word(kBuffers)).ptr(kFreelist, 80 * sizeof(ObjPos));
 	memset(listPos, 0xff, 80 * sizeof(ObjPos));
@@ -290,7 +282,7 @@ void DreamBase::drawFlags() {
 	}
 }
 
-void DreamGenContext::showAllEx() {
+void DreamBase::showAllEx() {
 	data.word(kListpos) = kExlist;
 	memset(getSegment(data.word(kBuffers)).ptr(kExlist, 100 * 5), 0xff, 100 * 5);
 
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 06936ca72d..6f78bcad07 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -57,12 +57,29 @@ protected:
 	char _saveNames[17*7];
 	char _saveNamesOld[17*7];
 
+	// from vgagrafx.cpp
+	uint8 _workspace[(0x1000 + 2) * 16];
+
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
 
 public:
 	// from backdrop.cpp
+	void doBlocks();
+	uint8 getXAd(const uint8 *setData, uint8 *result);
+	uint8 getYAd(const uint8 *setData, uint8 *result);
+	uint8 getMapAd(const uint8 *setData);
+	void calcFrFrame(uint16 frame, uint8* width, uint8* height);
+	void finalFrame(uint16 *x, uint16 *y);
+	void makeBackOb(SetObject *objData);
+	void showAllObs();
+	bool addAlong(const uint8 *mapFlags);
+	bool addLength(const uint8 *mapFlags);
+	void getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize);
+	void calcMapAd();
+	void showAllFree();
 	void drawFlags();
+	void showAllEx();
 
 	// from keypad.cpp
 	void getUnderMenu();
@@ -110,6 +127,9 @@ public:
 	const char *monPrint(const char *string);
 	void lockLightOn();
 	void lockLightOff();
+	void loadPersonal();
+	void loadNews();
+	void loadCart();
 
 	// from object.cpp
 	void obIcons();
@@ -392,11 +412,19 @@ public:
 	bool isRyanHolding(const char *id);
 	void clearBuffers();
 	void clearChanges();
+	void drawFloor();
+	uint16 findSetObject(const char *id);
+	void hangOnCurs(uint16 frameCount);
+	const uint8 *findObName(uint8 type, uint8 index);
+	void copyName(uint8 type, uint8 index, uint8 *dst);
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
 	void removeFreeObject(uint8 index);
 	void setupTimedUse(uint16 offset, uint16 countToTimed, uint16 timeCount, byte x, byte y);
+	void withWhat();
+	uint16 checkInside(uint16 command, uint16 type);
+	void showPuzText(uint16 command, uint16 count);
 
 	// from vgafades.cpp
 	uint8 *mainPalette();
@@ -411,6 +439,8 @@ public:
 	void fadeDOS();
 	void doFade();
 	void fadeCalculation();
+	void fadeupYellows();
+	void fadeupMonFirst();
 	void fadeScreenUp();
 	void fadeScreenUps();
 	void fadeScreenUpHalf();
@@ -423,7 +453,6 @@ public:
 	void dumpCurrent();
 
 	// from vgagrafx.cpp
-	uint8 _workspace[(0x1000 + 2) * 16];
 	inline uint8 *workspace() { return _workspace; }
 	void clearWork();
 
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 0af3f00d5c..997f36438e 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -330,7 +330,7 @@ void DreamWebEngine::blit(const uint8 *src, int pitch, int x, int y, int w, int
 }
 
 void DreamWebEngine::printUnderMonitor() {
-	uint8 *dst = _base._workspace + DreamGen::kScreenwidth * 43 + 76;
+	uint8 *dst = _base.workspace() + DreamGen::kScreenwidth * 43 + 76;
 
 	Graphics::Surface *s = _system->lockScreen();
 	if (!s)
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 0b126ee250..9bac71a8e5 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -72,15 +72,11 @@ void DreamGenContext::useMon() {
 	data.word(kBufferout) = 0;
 	bool stop = false;
 	do {
-		di = data.word(kMonadx);
-		bx = data.word(kMonady);
-		push(di);
-		push(bx);
+		uint16 oldMonadx = data.word(kMonadx);
+		uint16 oldMonady = data.word(kMonady);
 		input();
-		bx = pop();
-		di = pop();
-		data.word(kMonadx) = di;
-		data.word(kMonady) = bx;
+		data.word(kMonadx) = oldMonadx;
+		data.word(kMonady) = oldMonady;
 		stop = execCommand();
 		if (quitRequested()) //TODO : Check why it crashes when put before the execcommand
 			break;
@@ -383,14 +379,14 @@ void DreamBase::printOuterMon() {
 	showFrame(tempGraphics(), 40, 164, 4, 0);
 }
 
-void DreamGenContext::loadPersonal() {
+void DreamBase::loadPersonal() {
 	if (data.byte(kLocation) == 0 || data.byte(kLocation) == 42)
 		data.word(kTextfile1) = standardLoad("DREAMWEB.T01"); // monitor file 1
 	else
 		data.word(kTextfile1) = standardLoad("DREAMWEB.T02"); // monitor file 2
 }
 
-void DreamGenContext::loadNews() {
+void DreamBase::loadNews() {
 	// textfile2 holds information accessible by anyone
 	if (data.byte(kNewsitem) == 0)
 		data.word(kTextfile2) = standardLoad("DREAMWEB.T10"); // monitor file 10
@@ -402,7 +398,7 @@ void DreamGenContext::loadNews() {
 		data.word(kTextfile2) = standardLoad("DREAMWEB.T13"); // monitor file 13
 }
 
-void DreamGenContext::loadCart() {
+void DreamBase::loadCart() {
 	byte cartridgeId = 0;
 	uint16 objectIndex = findSetObject("INTF");
 	uint16 cartridgeIndex = checkInside(objectIndex, 1);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 1c87a05dea..021b2bad84 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -785,11 +785,7 @@ void DreamBase::loadTempCharset(const char *fileName) {
 	engine->setTempCharset(standardLoadCPP(fileName));
 }
 
-void DreamGenContext::hangOnCurs() {
-	hangOnCurs(cx);
-}
-
-void DreamGenContext::hangOnCurs(uint16 frameCount) {
+void DreamBase::hangOnCurs(uint16 frameCount) {
 	for (uint16 i = 0; i < frameCount; ++i) {
 		printCurs();
 		vSync();
@@ -1035,26 +1031,6 @@ void DreamBase::lockMon() {
 	}
 }
 
-void DreamGenContext::makeBackOb(SetObject *objData) {
-	if (data.byte(kNewobs) == 0)
-		return;
-	uint8 priority = objData->priority;
-	uint8 type = objData->type;
-	Sprite *sprite = makeSprite(data.word(kObjectx), data.word(kObjecty), addr_backobject, data.word(kSetframes), 0);
-
-	uint16 objDataOffset = (uint8 *)objData - getSegment(data.word(kSetdat)).ptr(0, 0);
-	assert(objDataOffset % sizeof(SetObject) == 0);
-	assert(objDataOffset < 128 * sizeof(SetObject));
-	sprite->setObjData(objDataOffset);
-	if (priority == 255)
-		priority = 0;
-	sprite->priority = priority;
-	sprite->type = type;
-	sprite->b16 = 0;
-	sprite->delay = 0;
-	sprite->animFrame = 0;
-}
-
 uint16 DreamBase::allocateAndLoad(unsigned int size) {
 	// allocatemem adds 32 bytes, so it doesn't matter that size/16 rounds down
 	uint16 result = allocateMem(size / 16);
@@ -1252,7 +1228,7 @@ bool DreamGenContext::checkIfEx(uint8 x, uint8 y) {
 	return false;
 }
 
-const uint8 *DreamGenContext::findObName(uint8 type, uint8 index) {
+const uint8 *DreamBase::findObName(uint8 type, uint8 index) {
 	if (type == 5) {
 		uint16 i = 64 * 2 * (index & 127);
 		uint16 offset = getSegment(data.word(kPeople)).word(kPersontxtdat + i) + kPersontext;
@@ -1272,7 +1248,7 @@ const uint8 *DreamGenContext::findObName(uint8 type, uint8 index) {
 	}
 }
 
-void DreamGenContext::copyName(uint8 type, uint8 index, uint8 *dst) {
+void DreamBase::copyName(uint8 type, uint8 index, uint8 *dst) {
 	const uint8 *src = findObName(type, index);
 	size_t i;
 	for (i = 0; i < 28; ++i) { 
@@ -1737,19 +1713,7 @@ bool DreamBase::compare(uint8 index, uint8 flag, const char id[4]) {
 	return objectMatches(getAnyAdDir(index, flag), id);
 }
 
-void DreamGenContext::findSetObject() {
-	char id[5];
-	id[0] = al;
-	id[1] = ah;
-	id[2] = cl;
-	id[3] = ch;
-	id[4] = '\0';
-	al = findSetObject(id);
-	es = data.word(kSetdat);
-	bx = al * 64;
-}
-
-uint16 DreamGenContext::findSetObject(const char *id) {
+uint16 DreamBase::findSetObject(const char *id) {
 	for (uint16 index = 0; index < 128; index++) {
 		if (objectMatches(getSetAd(index), id))
 			return index;
@@ -1799,22 +1763,6 @@ bool DreamBase::isRyanHolding(const char *id) {
 	return false;
 }
 
-void DreamGenContext::checkInside() {
-	cl = checkInside(al, ah);
-	es = data.word(kExtras);
-	bx = kExdata + cl * sizeof(DynObject);
-}
-
-uint16 DreamGenContext::checkInside(uint16 command, uint16 type) {
-	for (uint16 index = 0; index < kNumexobjects; index++) {
-		DynObject *object = getExAd(index);
-		if (object->mapad[1] == command && object->mapad[0] == type)
-			return index;
-	}
-
-	return kNumexobjects;
-}
-
 bool DreamBase::isItDescribed(const ObjPos *pos) {
 	uint16 offset = getSegment(data.word(kSetdesc)).word(kSettextdat + pos->index * 2);
 	uint8 result = getSegment(data.word(kSetdesc)).byte(kSettext + offset);
@@ -2184,7 +2132,14 @@ void DreamGenContext::loadRoom() {
 	loadRoomsSample();
 	switchRyanOn();
 	drawFlags();
-	getDimension();
+
+	uint8 mapXstart, mapYstart;
+	uint8 mapXsize, mapYsize;
+	getDimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
+	cl = mapXstart;
+	ch = mapYstart;
+	dl = mapXsize;
+	dh = mapYsize;
 }
 
 void DreamGenContext::readSetData() {
@@ -2617,7 +2572,7 @@ void DreamBase::loadTempText(const char *fileName) {
 	data.word(kTextfile1) = standardLoad(fileName);
 }
 
-void DreamGenContext::drawFloor() {
+void DreamBase::drawFloor() {
 	eraseOldObs();
 	drawFlags();
 	calcMapAd();
@@ -4173,23 +4128,6 @@ void DreamGenContext::newPlace() {
 	}
 }
 
-void DreamGenContext::showPuzText() {
-	showPuzText(al, cx);
-}
-
-void DreamGenContext::showPuzText(uint16 command, uint16 count) {
-	createPanel();
-	showPanel();
-	showMan();
-	showExit();
-	obIcons();
-	uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(command * 2);
-	const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
-	printDirect(string, 36, 104, 241, 241 & 1);
-	workToScreenM();
-	hangOnP(count);
-}
-
 void DreamGenContext::monkSpeaking() {
 	// FIXME: This is the CD version only.
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index e6726b664a..b835a26ea1 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -26,8 +26,6 @@
 	void startup();
 	void startup1();
 	void saveLoad();
-	void hangOnCurs(uint16 frameCount);
-	void hangOnCurs();
 	void workToScreen();
 	void multiGet();
 	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height) {
@@ -65,39 +63,21 @@
 	void width160();
 	void spriteUpdate();
 	void mainMan(Sprite *sprite);
-	void makeBackOb(SetObject *objData);
 	void zoom();
 	void showRain();
 	void commandOnly();
 	void commandOnly(uint8 command) {
 		DreamBase::commandOnly(command);
 	}
-	void doBlocks();
 	void checkIfPerson();
 	bool checkIfPerson(uint8 x, uint8 y);
 	void checkIfFree();
 	bool checkIfFree(uint8 x, uint8 y);
 	void checkIfEx();
 	bool checkIfEx(uint8 x, uint8 y);
-	const uint8 *findObName(uint8 type, uint8 index);
-	void copyName(uint8 type, uint8 index, uint8 *dst);
 	void commandWithOb();
 	void commandWithOb(uint8 command, uint8 type, uint8 index);
 	void updatePeople();
-	bool addAlong(const uint8 *mapFlags);
-	bool addLength(const uint8 *mapFlags);
-	void getDimension();
-	void getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize);
-	void getMapAd();
-	void calcMapAd();
-	uint8 getMapAd(const uint8 *setData);
-	uint8 getXAd(const uint8 *setData, uint8 *result);
-	uint8 getYAd(const uint8 *setData, uint8 *result);
-	void calcFrFrame(uint16 frame);
-	void calcFrFrame(uint16 frame, uint8* width, uint8* height);
-	void finalFrame();
-	void finalFrame(uint16 *x, uint16 *y);
-	void showAllObs();
 	void blockNameText();
 	void walkToText();
 	void personNameText();
@@ -115,8 +95,6 @@
 	}
 	void setAllChanges();
 	void deleteTaken();
-	void showAllFree();
-	void showAllEx();
 	bool finishedWalkingCPP();
 	void finishedWalking();
 	void checkOne();
@@ -161,7 +139,6 @@
 	void findNextColon();
 	const uint8 *getObTextStartCPP();
 	void useText(const uint8 *string);
-	void useText();
 	void examineObText();
 	void showCity();
 	uint16 getPersFrame(uint8 index);
@@ -172,8 +149,6 @@
 	void watchCount();
 	void loadRoom();
 	void readSetData();
-	void fadeupYellows();
-	void fadeupMonFirst();
 	void useMenu();
 	void useMon();
 	void makeCaps();
@@ -263,7 +238,6 @@
 	void checkFolderCoords();
 	void nextFolder();
 	void lastFolder();
-	void drawFloor();
 	void mugger(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void loadSaveBox();
@@ -279,9 +253,6 @@
 	void saveGame();
 	void zoomOnOff();
 	void atmospheres();
-	void loadPersonal();
-	void loadNews();
-	void loadCart();
 	void hangOne(uint16 delay);
 	void hangOne();
 	void bibleQuote();
@@ -362,8 +333,6 @@
 	void dropError();
 	void cantDrop();
 	void newPlace();
-	void showPuzText(uint16 command, uint16 count);
-	void showPuzText();
 	void monkSpeaking();
 	void rollEndCredits2();
 	void useButtonA();
@@ -379,8 +348,6 @@
 	void runEndSeq();
 	void lookAtCard();
 	bool execCommand();
-	void findSetObject();
-	uint16 findSetObject(const char *id);
 	void findExObject();
 	uint16 findExObject(const char *id);
 	void isRyanHolding();
@@ -391,15 +358,12 @@
 	void getOpenedSize();
 	byte getOpenedSizeCPP();
 	void openOb();
-	void withWhat();
 	void notHeldError();
 	void useGun();
 	void identifyOb();
 	void showSlots();
 	void useCashCard();
 	void useStereo();
-	void checkInside();
-	uint16 checkInside(uint16 command, uint16 type);
 	void selectOb();
 	void findInvPos();
 	uint16 findInvPosCPP();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 5a80a33bd5..5cb1f6b92c 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -163,10 +163,6 @@ void DreamGenContext::useRoutine() {
 	data.byte(kCommandtype) = 255;
 }
 
-void DreamGenContext::useText() {
-	useText(es.ptr(si, 0));
-}
-
 void DreamGenContext::useText(const uint8 *string) {
 	createPanel();
 	showPanel();
@@ -1408,7 +1404,6 @@ void DreamGenContext::usePipe() {
 		putBackObStuff();
 	} else {
 		showPuzText(14, 300);
-		showPuzText();
 		putBackObStuff();
 	}
 }
@@ -1572,7 +1567,7 @@ void DreamGenContext::useAltar() {
 	}
 }
 
-void DreamGenContext::withWhat() {
+void DreamBase::withWhat() {
 	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
 
 	createPanel();
@@ -1590,7 +1585,7 @@ void DreamGenContext::withWhat() {
 	data.byte(kCommandtype) = 255;
 	readMouse();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 	data.byte(kInvopen) = 2;
 }
@@ -1666,4 +1661,27 @@ void DreamGenContext::useStereo() {
 	}
 }
 
+uint16 DreamBase::checkInside(uint16 command, uint16 type) {
+	for (uint16 index = 0; index < kNumexobjects; index++) {
+		DynObject *object = getExAd(index);
+		if (object->mapad[1] == command && object->mapad[0] == type)
+			return index;
+	}
+
+	return kNumexobjects;
+}
+
+void DreamBase::showPuzText(uint16 command, uint16 count) {
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	obIcons();
+	uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(command * 2);
+	const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
+	printDirect(string, 36, 104, 241, 241 & 1);
+	workToScreenM();
+	hangOnP(count);
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index 6766d56424..7518c226f4 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -114,7 +114,7 @@ void DreamBase::fadeCalculation() {
 	--data.byte(kFadecount);
 }
 
-void DreamGenContext::fadeupYellows() {
+void DreamBase::fadeupYellows() {
 	palToEndPal();
 	memset(endPalette() + 231 * 3, 0, 8 * 3);
 	memset(endPalette() + 246 * 3, 0, 1 * 3);
@@ -125,7 +125,7 @@ void DreamGenContext::fadeupYellows() {
 	hangOn(128);
 }
 
-void DreamGenContext::fadeupMonFirst() {
+void DreamBase::fadeupMonFirst() {
 	palToStartPal();
 	palToEndPal();
 	memset(startPalette() + 231 * 3, 0, 8 * 3);
-- 
cgit v1.2.3


From a5879196df33eb7946b2c7afa6491c9a7d5e7213 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 14:14:25 +0200
Subject: DREAMWEB: Port 'showdiarykeys' to C++

---
 engines/dreamweb/dreamgen.cpp | 46 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.cpp    | 20 +++++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 21 insertions(+), 47 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 04276c001e..43c2e50d1e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2463,52 +2463,6 @@ lookcolon:
 		goto lookcolon;
 }
 
-void DreamGenContext::showDiaryKeys() {
-	STACK_CHECK;
-	_cmp(data.byte(kPresscount), 0);
-	if (flags.z())
-		return /* (nokeyatall) */;
-	_dec(data.byte(kPresscount));
-	_cmp(data.byte(kPresscount), 0);
-	if (flags.z())
-		return /* (nokeyatall) */;
-	_cmp(data.byte(kPressed), 'N');
-	if (!flags.z())
-		goto nokeyn;
-	al = 3;
-	_cmp(data.byte(kPresscount), 1);
-	if (flags.z())
-		goto gotkeyn;
-	al = 4;
-gotkeyn:
-	ah = 0;
-	di = (68+24)+94;
-	bx = (48+12)+97;
-	ds = data.word(kTempgraphics);
-	showFrame();
-	_cmp(data.byte(kPresscount), 1);
-	if (!flags.z())
-		return /* (notshown) */;
-	showDiaryPage();
-	return;
-nokeyn:
-	al = 5;
-	_cmp(data.byte(kPresscount), 1);
-	if (flags.z())
-		goto gotkeyp;
-	al = 6;
-gotkeyp:
-	ah = 0;
-	di = (68+24)+151;
-	bx = (48+12)+71;
-	ds = data.word(kTempgraphics);
-	showFrame();
-	_cmp(data.byte(kPresscount), 1);
-	if (!flags.z())
-		return /* (notshowp) */;
-	showDiaryPage();
-}
-
 void DreamGenContext::findPathOfPoint() {
 	STACK_CHECK;
 	push(ax);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index cbf4d558c8..9ecd688824 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -507,7 +507,6 @@ public:
 	void deleteExObject();
 	void getEitherAd();
 	void dropObject();
-	void showDiaryKeys();
 	void useOpened();
 	void signOn();
 	void locationPic();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 021b2bad84..51587f1bde 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4569,5 +4569,25 @@ void DreamBase::clearChanges() {
 	memcpy(data.ptr(kRoomscango, 16), initialRoomsCanGo, 16);
 }
 
+void DreamGenContext::showDiaryKeys() {
+	if (!data.byte(kPresscount))
+		return; // nokeyatall
+
+	data.byte(kPresscount)--;
+
+	if (!data.byte(kPresscount))
+		return; // nokeyatall
+
+	if (data.byte(kPressed) == 'N') {
+		byte frame = (data.byte(kPresscount) == 1) ? 3 : 4;
+		showFrame(tempGraphics(), kDiaryx + 94, kDiaryy + 97, frame, 0);
+	} else {
+		byte frame = (data.byte(kPresscount) == 1) ? 5 : 6;
+		showFrame(tempGraphics(), kDiaryx + 151, kDiaryy + 71, frame, 0);
+	}
+
+	if (data.byte(kPresscount) == 1)
+		showDiaryPage();
+}
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index b835a26ea1..1578aefc71 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -368,5 +368,6 @@
 	void findInvPos();
 	uint16 findInvPosCPP();
 	void setPickup();
+	void showDiaryKeys();
 
 #endif
-- 
cgit v1.2.3


From 362f21d30d2b8f531c30ec19829326e369ac01cd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 15:43:03 +0200
Subject: DREAMWEB: Port 'showkeys' to C++

---
 engines/dreamweb/dreamgen.cpp | 27 ---------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/monitor.cpp  | 42 +++++++++++++++++++++++++++++++++++-------
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 36 insertions(+), 35 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 43c2e50d1e..f7632514e1 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2129,33 +2129,6 @@ passpassed:
 	es.byte(bx) = 1;
 }
 
-void DreamGenContext::showKeys() {
-	STACK_CHECK;
-	cx = 10;
-	randomAccess();
-	scrollMonitor();
-	al = 18;
-	monMessage();
-	es = cs;
-	bx = offset_keys;
-	cx = 4;
-keysloop:
-	push(cx);
-	push(bx);
-	_cmp(es.byte(bx), 0);
-	if (flags.z())
-		goto notheld;
-	_add(bx, 14);
-	monPrint();
-notheld:
-	bx = pop();
-	cx = pop();
-	_add(bx, 26);
-	if (--cx)
-		goto keysloop;
-	scrollMonitor();
-}
-
 void DreamGenContext::read() {
 	STACK_CHECK;
 	cx = 40;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 9ecd688824..12af1ab3c7 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -495,7 +495,6 @@ public:
 	void purgeAnItem();
 	void purgeALocation();
 	void getSetAd();
-	void showKeys();
 	void nextColon();
 	void findOpenPos();
 	void deleteExFrame();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 9bac71a8e5..8ff199cf49 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -25,21 +25,33 @@
 namespace DreamGen {
 
 struct MonitorKeyEntry {
-	uint8 b0;
-	uint8 b1;
-	char  b2[24];
+	uint8 keyHeld;
+	uint8 b1;	// unused, for alignment
+	char  userpass[24];
+	//char  password[12];	// for the new monitor key list below
+	//char  username[12];	// for the new monitor key list below
 };
 
+#if 0
+// New monitor key list
+static MonitorKeyEntry monitorKeyEntries[4] = {
+	{ 1, "PUBLIC     ", "PUBLIC     " },
+	{ 0, "BLACKDRAGON", "RYAN       " },
+	{ 0, "HENDRIX    ", "LOUIS      " },
+	{ 0, "SEPTIMUS   ", "BECKETT    " }
+};
+#endif
+
 void DreamGenContext::useMon() {
 	data.byte(kLasttrigger) = 0;
 	memset(data.ptr(kCurrentfile+1, 0), ' ', 12);
 	memset(data.ptr(offset_operand1+1, 0), ' ', 12);
 
 	MonitorKeyEntry *monitorKeyEntries = (MonitorKeyEntry *)data.ptr(offset_keys, 0);
-	monitorKeyEntries[0].b0 = 1;
-	monitorKeyEntries[1].b0 = 0;
-	monitorKeyEntries[2].b0 = 0;
-	monitorKeyEntries[3].b0 = 0;
+	monitorKeyEntries[0].keyHeld = 1;
+	monitorKeyEntries[1].keyHeld = 0;
+	monitorKeyEntries[2].keyHeld = 0;
+	monitorKeyEntries[3].keyHeld = 0;
 
 	createPanel();
 	showPanel();
@@ -417,4 +429,20 @@ void DreamBase::loadCart() {
 		data.word(kTextfile3) = standardLoad("DREAMWEB.T24"); // monitor file 24
 }
 
+void DreamGenContext::showKeys() {
+	randomAccess(10);
+	scrollMonitor();
+	monMessage(18);
+
+	MonitorKeyEntry *monitorKeyEntries = (MonitorKeyEntry *)data.ptr(offset_keys, 0);
+
+	for (int i = 0; i < 4; i++) {
+		if (monitorKeyEntries[i].keyHeld)
+			monPrint(monitorKeyEntries[i].userpass + 12);	// username
+			//monPrint(monitorKeyEntries[i].username);
+	}
+
+	scrollMonitor();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 1578aefc71..0d2d8dfe76 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -369,5 +369,6 @@
 	uint16 findInvPosCPP();
 	void setPickup();
 	void showDiaryKeys();
+	void showKeys();
 
 #endif
-- 
cgit v1.2.3


From 62dc71a73a894426cb2f5c61e26ab53b0c9f06ad Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 16:43:05 +0200
Subject: DREAMWEB: Port 'getkeyandlogo' to C++

---
 engines/dreamweb/dreamgen.cpp | 45 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/monitor.cpp  | 18 +++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 19 insertions(+), 46 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index f7632514e1..6034e0ea69 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2298,51 +2298,6 @@ endofdir2:
 	scrollMonitor();
 }
 
-void DreamGenContext::getKeyAndLogo() {
-	STACK_CHECK;
-	_inc(bx);
-	al = es.byte(bx);
-	_sub(al, 48);
-	data.byte(kNewlogonum) = al;
-	_add(bx, 2);
-	al = es.byte(bx);
-	_sub(al, 48);
-	data.byte(kKeynum) = al;
-	_inc(bx);
-	push(es);
-	push(bx);
-	al = data.byte(kKeynum);
-	ah = 0;
-	cx = 26;
-	_mul(cx);
-	es = cs;
-	bx = offset_keys;
-	_add(bx, ax);
-	al = es.byte(bx);
-	_cmp(al, 1);
-	if (flags.z())
-		goto keyok;
-	push(bx);
-	push(es);
-	al = 12;
-	monMessage();
-	es = pop();
-	bx = pop();
-	_add(bx, 14);
-	monPrint();
-	scrollMonitor();
-	bx = pop();
-	es = pop();
-	al = 1;
-	return;
-keyok:
-	bx = pop();
-	es = pop();
-	al = data.byte(kNewlogonum);
-	data.byte(kLogonum) = al;
-	al = 0;
-}
-
 void DreamGenContext::searchForString() {
 	STACK_CHECK;
 	dl = es.byte(di);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 12af1ab3c7..7f1601e5f6 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -487,7 +487,6 @@ public:
 	void removeObFromInv();
 	void dirFile();
 	void pickupConts();
-	void getKeyAndLogo();
 	void fadeUpMon();
 	void reExFromInv();
 	void outOfInv();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 8ff199cf49..dd94633105 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -445,4 +445,22 @@ void DreamGenContext::showKeys() {
 	scrollMonitor();
 }
 
+void DreamGenContext::getKeyAndLogo() {
+	byte newLogo = es.byte(bx + 1) - 48;
+	MonitorKeyEntry *monitorKeyEntries = (MonitorKeyEntry *)data.ptr(offset_keys, 0);
+	byte keyNum = es.byte(bx + 1 + 2) - 48;
+	bx += 1 + 2 + 1;
+
+	if (monitorKeyEntries[keyNum].keyHeld == 1) {
+		// Key OK
+		data.byte(kLogonum) = newLogo;
+		al = 0;
+	} else {
+		monMessage(12);	// "Access denied, key required -"
+		monPrint(monitorKeyEntries[keyNum].userpass + 12);	// username
+		scrollMonitor();
+		al = 1;
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 0d2d8dfe76..3e61367e2d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -370,5 +370,6 @@
 	void setPickup();
 	void showDiaryKeys();
 	void showKeys();
+	void getKeyAndLogo();
 
 #endif
-- 
cgit v1.2.3


From 133cfc3ae9de62daa3b3aa9cd7a9d0328b4043dc Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 18 Dec 2011 15:55:27 +0100
Subject: DREAMWEB: Fix yet another regression in setPickup

getAnyAd and getEitherAd have different inputs, so can't be
interchanged...
---
 engines/dreamweb/object.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 473d876ce8..53ecc0c362 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -431,9 +431,9 @@ void DreamGenContext::selectOb() {
 void DreamGenContext::setPickup() {
 	if (data.byte(kObjecttype) != kSetObjectType1 && data.byte(kObjecttype) != kSetObjectType3) {
 		// The original called getAnyAd() here. However, since object types
-		// 1 and 3 are excluded, the resulting object is a DynObject, so
-		// we can use getEitherAd() instead.
-		DynObject *object = getEitherAdCPP();
+		// 1 and 3 are excluded, the resulting object is a DynObject
+		uint8 dummy;
+		DynObject *object = (DynObject *)getAnyAd(&dummy, &dummy);
 		if (object->mapad[0] == 4) {
 			blank();
 			return;
-- 
cgit v1.2.3


From ebbc8ae3d2f7b868d4392b3df82ec1f332599dd7 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 18 Dec 2011 14:26:29 +0100
Subject: DREAMWEB: Set es for reel callbacks while it may be necessary

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

(limited to 'engines')

diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 8998e2f394..81de17cbac 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -143,11 +143,14 @@ void DreamGenContext::updatePeople() {
 	ReelRoutine *r = (ReelRoutine *)data.ptr(kReelroutines, 0);
 
 	for (int i = 0; r[i].reallocation != 255; ++i) {
-		bx = kReelroutines + 8*i;
 		if (r[i].reallocation == data.byte(kReallocation) &&
 		        r[i].mapX == data.byte(kMapx) &&
 		        r[i].mapY == data.byte(kMapy)) {
 			assert(reelCallbacks[i]);
+			// Set es:bx to the ReelRoutine, while not all ReelCallbacks are in
+			// DreamBase
+			es = data;
+			bx = kReelroutines + 8*i;
 			(this->*(reelCallbacks[i]))(r[i]);
 		}
 	}
-- 
cgit v1.2.3


From 8449493eff5ff26e8550dec6c50470521fc31947 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 18 Dec 2011 15:32:25 +0100
Subject: DREAMWEB: Convert removeObFromInv, deleteExObject, deleteExFrame,
 deleteExText

---
 engines/dreamweb/dreambase.h  |   5 ++
 engines/dreamweb/dreamgen.cpp | 143 ------------------------------------------
 engines/dreamweb/dreamgen.h   |   4 --
 engines/dreamweb/object.cpp   |  86 +++++++++++++++++++++++++
 engines/dreamweb/people.cpp   |   2 +-
 engines/dreamweb/stubs.cpp    |   2 +-
 engines/dreamweb/stubs.h      |  16 ++++-
 7 files changed, 108 insertions(+), 150 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 6f78bcad07..eae1d05902 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -137,6 +137,10 @@ public:
 	void findAllRyan(uint8 *inv);
 	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y);
 	void obPicture();
+	void removeObFromInv();
+	void deleteExObject(uint8 index);
+	void deleteExFrame(uint8 frameNum);
+	void deleteExText(uint8 textNum);
 
 	// from pathfind.cpp
 	void turnPathOn(uint8 param);
@@ -417,6 +421,7 @@ public:
 	void hangOnCurs(uint16 frameCount);
 	const uint8 *findObName(uint8 type, uint8 index);
 	void copyName(uint8 type, uint8 index, uint8 *dst);
+	uint16 findExObject(const char *id);
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 6034e0ea69..6d303e62bf 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -985,18 +985,6 @@ notinlift:
 	es.byte(bx) = al;
 }
 
-void DreamGenContext::removeObFromInv() {
-	STACK_CHECK;
-	_cmp(data.byte(kCommand), 100);
-	if (flags.z())
-		return /* (obnotexist) */;
-	getAnyAd();
-	di = bx;
-	cl = data.byte(kCommand);
-	ch = 0;
-	deleteExObject();
-}
-
 void DreamGenContext::selectOpenOb() {
 	STACK_CHECK;
 	al = data.byte(kCommand);
@@ -1466,137 +1454,6 @@ cantpurge2:
 		goto lookforpurge2;
 }
 
-void DreamGenContext::deleteExObject() {
-	STACK_CHECK;
-	push(cx);
-	push(cx);
-	push(cx);
-	push(cx);
-	al = 255;
-	cx = 16;
-	_stosb(cx, true);
-	ax = pop();
-	cl = al;
-	_add(al, al);
-	_add(al, cl);
-	deleteExFrame();
-	ax = pop();
-	cl = al;
-	_add(al, al);
-	_add(al, cl);
-	_inc(al);
-	deleteExFrame();
-	ax = pop();
-	deleteExText();
-	bx = pop();
-	bh = bl;
-	bl = 4;
-	di = (0+2080+30000);
-	cx = 0;
-deleteconts:
-	_cmp(es.word(di+2), bx);
-	if (!flags.z())
-		goto notinsideex;
-	push(bx);
-	push(cx);
-	push(di);
-	deleteExObject();
-	di = pop();
-	cx = pop();
-	bx = pop();
-notinsideex:
-	_add(di, 16);
-	_inc(cx);
-	_cmp(cx, (114));
-	if (!flags.z())
-		goto deleteconts;
-}
-
-void DreamGenContext::deleteExFrame() {
-	STACK_CHECK;
-	di = (0);
-	ah = 0;
-	_add(ax, ax);
-	_add(di, ax);
-	_add(ax, ax);
-	_add(di, ax);
-	al = es.byte(di);
-	ah = 0;
-	cl = es.byte(di+1);
-	ch = 0;
-	_mul(cx);
-	si = es.word(di+2);
-	push(si);
-	_add(si, (0+2080));
-	cx = (30000);
-	_sub(cx, es.word(di+2));
-	di = si;
-	_add(si, ax);
-	push(ax);
-	ds = es;
-	_movsb(cx, true);
-	bx = pop();
-	_sub(data.word(kExframepos), bx);
-	si = pop();
-	cx = (114)*3;
-	di = (0);
-shuffleadsdown:
-	ax = es.word(di+2);
-	_cmp(ax, si);
-	if (flags.c())
-		goto beforethisone;
-	_sub(ax, bx);
-beforethisone:
-	es.word(di+2) = ax;
-	_add(di, 6);
-	if (--cx)
-		goto shuffleadsdown;
-}
-
-void DreamGenContext::deleteExText() {
-	STACK_CHECK;
-	di = (0+2080+30000+(16*114));
-	ah = 0;
-	_add(ax, ax);
-	_add(di, ax);
-	ax = es.word(di);
-	si = ax;
-	di = ax;
-	_add(si, (0+2080+30000+(16*114)+((114+2)*2)));
-	_add(di, (0+2080+30000+(16*114)+((114+2)*2)));
-	ax = 0;
-findlenextext:
-	cl = es.byte(si);
-	_inc(ax);
-	_inc(si);
-	_cmp(cl, 0);
-	if (!flags.z())
-		goto findlenextext;
-	cx = (18000);
-	bx = si;
-	_sub(bx, (0+2080+30000+(16*114)+((114+2)*2)));
-	push(bx);
-	push(ax);
-	_sub(cx, bx);
-	_movsb(cx, true);
-	bx = pop();
-	_sub(data.word(kExtextpos), bx);
-	si = pop();
-	cx = (114);
-	di = (0+2080+30000+(16*114));
-shuffletextads:
-	ax = es.word(di);
-	_cmp(ax, si);
-	if (flags.c())
-		goto beforethistext;
-	_sub(ax, bx);
-beforethistext:
-	es.word(di) = ax;
-	_add(di, 2);
-	if (--cx)
-		goto shuffletextads;
-}
-
 void DreamGenContext::startTalk() {
 	STACK_CHECK;
 	data.byte(kTalkmode) = 0;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7f1601e5f6..b7a644fe1f 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -482,9 +482,7 @@ public:
 	void getAnyAd();
 	void reminders();
 	void inToInv();
-	void deleteExText();
 	void getFreeAd();
-	void removeObFromInv();
 	void dirFile();
 	void pickupConts();
 	void fadeUpMon();
@@ -496,13 +494,11 @@ public:
 	void getSetAd();
 	void nextColon();
 	void findOpenPos();
-	void deleteExFrame();
 	void searchForSame();
 	void rollEm();
 	void lookAtPlace();
 	void findAllOpen();
 	void fillOpen();
-	void deleteExObject();
 	void getEitherAd();
 	void dropObject();
 	void useOpened();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 53ecc0c362..384e001b5e 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -477,4 +477,90 @@ void DreamGenContext::setPickup() {
 	workToScreenM();
 }
 
+void DreamGenContext::deleteExFrame() {
+	deleteExFrame(al);
+}
+
+void DreamBase::deleteExFrame(uint8 frameNum) {
+	Frame *frame = (Frame *)getSegment(data.word(kExtras)).ptr(kExframedata + sizeof(Frame)*frameNum, sizeof(Frame));
+
+	uint16 frameSize = frame->width * frame->height;
+	// Note: the original asm didn't subtract frameSize from remainder
+	uint16 remainder = kExframeslen - frame->ptr() - frameSize;
+	uint16 startOff = kExframes + frame->ptr();
+	uint16 endOff = startOff + frameSize;
+
+	// Shift frame data after this one down
+	memmove(getSegment(data.word(kExtras)).ptr(startOff, remainder), getSegment(data.word(kExtras)).ptr(endOff, remainder), remainder);
+
+	// Combined frame data is now frameSize smaller
+	data.word(kExframepos) -= frameSize;
+
+	// Adjust all frame pointers pointing into the shifted data
+	for (unsigned int i = 0; i < 3*kNumexobjects; ++i) {
+		frame = (Frame *)getSegment(data.word(kExtras)).ptr(kExframedata + sizeof(Frame)*i, sizeof(Frame));
+		if (frame->ptr() >= startOff)
+			frame->setPtr(frame->ptr() - frameSize);
+	}
+}
+
+void DreamGenContext::deleteExText() {
+	deleteExText(al);
+}
+
+void DreamBase::deleteExText(uint8 textNum) {
+	uint16 offset = getSegment(data.word(kExtras)).word(kExtextdat + 2*textNum);
+
+	uint16 startOff = kExtext + offset;
+	uint16 textSize = strlen((char *)getSegment(data.word(kExtras)).ptr(startOff, 0)) + 1;
+	uint16 endOff = startOff + textSize;
+	uint16 remainder = kExtextlen - offset - textSize;
+
+	// Shift text data after this one down
+	memmove(getSegment(data.word(kExtras)).ptr(startOff, remainder), getSegment(data.word(kExtras)).ptr(endOff, remainder), remainder);
+
+	// Combined text data is now frameSize smaller
+	data.word(kExtextpos) -= textSize;
+
+	// Adjust all text pointers pointing into the shifted data
+	for (unsigned int i = 0; i < kNumexobjects; ++i) {
+		uint16 t = getSegment(data.word(kExtras)).word(kExtextdat + 2*i);
+		if (t >= offset + textSize)
+			getSegment(data.word(kExtras)).word(kExtextdat + 2*i) = t - textSize;
+	}
+}
+
+// This takes es:di and cl as input, but es:di always points to getExAd(cl)
+void DreamGenContext::deleteExObject() {
+	deleteExObject(cl);
+}
+
+void DreamBase::deleteExObject(uint8 index) {
+	DynObject *obj = getExAd(index);
+
+	memset(obj, 0xFF, sizeof(DynObject));
+
+	deleteExFrame(3*index);
+	deleteExFrame(3*index + 1);
+
+	deleteExText(index);
+
+	for (uint8 i = 0; i < kNumexobjects; ++i) {
+		DynObject *t = getExAd(index);
+		// Is this object contained in the one we've just deleted?
+		if (t->mapad[0] == 4 && t->mapad[1] == index)
+			deleteExObject(i);
+	}
+}
+
+void DreamBase::removeObFromInv() {
+	if (data.byte(kCommand) == 100)
+		return; // object doesn't exit
+
+	assert(data.byte(kObjecttype) == kExObjectType);
+
+	deleteExObject(data.byte(kCommand));
+}
+
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 81de17cbac..20d67763ad 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -48,7 +48,7 @@ static void (DreamGenContext::*reelCallbacks[57])(ReelRoutine &) = {
 	&DreamBase::gates, &DreamBase::introMagic3,
 	&DreamBase::introMonks1, &DreamBase::candles,
 	&DreamBase::introMonks2, &DreamBase::handClap,
-	&DreamBase::monkAndRyan, &DreamGenContext::endGameSeq,
+	&DreamBase::monkAndRyan, &DreamBase::endGameSeq,
 	&DreamBase::priest, &DreamBase::madman,
 	&DreamBase::madmansTelly, &DreamBase::alleyBarkSound,
 	&DreamBase::foghornSound, &DreamBase::carParkDrip,
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 51587f1bde..6b7e9a7784 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1734,7 +1734,7 @@ void DreamGenContext::findExObject() {
 	bx = kExdata + al * 16;
 }
 
-uint16 DreamGenContext::findExObject(const char *id) {
+uint16 DreamBase::findExObject(const char *id) {
 	for (uint16 index = 0; index < kNumexobjects; index++) {
 		if (objectMatches(getExAd(index), id))
 			return index;
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 3e61367e2d..aeda662283 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -349,7 +349,9 @@
 	void lookAtCard();
 	bool execCommand();
 	void findExObject();
-	uint16 findExObject(const char *id);
+	uint16 findExObject(const char *id) {
+		return DreamBase::findExObject(id);
+	}
 	void isRyanHolding();
 	bool isRyanHolding(const char *id) {
 		return DreamBase::isRyanHolding(id);
@@ -371,5 +373,17 @@
 	void showDiaryKeys();
 	void showKeys();
 	void getKeyAndLogo();
+	void deleteExObject();
+	void deleteExObject(uint8 index) {
+		DreamBase::deleteExObject(index);
+	}
+	void deleteExFrame();
+	void deleteExFrame(uint8 frameNum) {
+		DreamBase::deleteExFrame(frameNum);
+	}
+	void deleteExText();
+	void deleteExText(uint8 textNum) {
+		DreamBase::deleteExText(textNum);
+	}
 
 #endif
-- 
cgit v1.2.3


From 49877b231916a9ed75ab5b63870e89c351aafedf Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 18 Dec 2011 16:20:17 +0100
Subject: DREAMWEB: Move all reel functions to DreamBase

---
 engines/dreamweb/dreambase.h | 11 ++++++++++-
 engines/dreamweb/people.cpp  | 12 ++++--------
 engines/dreamweb/sprite.cpp  | 42 +++++++++++++-----------------------------
 engines/dreamweb/stubs.cpp   |  6 +++---
 engines/dreamweb/stubs.h     | 10 ----------
 5 files changed, 30 insertions(+), 51 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index eae1d05902..9a5d68436c 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -158,6 +158,7 @@ public:
 	void workoutFrames();
 
 	// from people.cpp
+	void updatePeople();
 	void madmanText();
 	void madman(ReelRoutine &routine);
 	void madMode();
@@ -206,7 +207,7 @@ public:
 	void bartender(ReelRoutine &routine);
 	void heavy(ReelRoutine &routine);
 	void helicopter(ReelRoutine &routine);
-	//void mugger(ReelRoutine &routine);
+	void mugger(ReelRoutine &routine);
 	void businessMan(ReelRoutine &routine);
 	void endGameSeq(ReelRoutine &routine);
 	void poolGuard(ReelRoutine &routine);
@@ -288,6 +289,11 @@ public:
 	void getRidOfReels();
 	void liftNoise(uint8 index);
 	void checkForExit(Sprite *sprite);
+	void mainMan(Sprite *sprite);
+	void spriteUpdate();
+	void showRain();
+	void reconstruct();
+	void reelsOnScreen();
 
 	// from stubs.cpp
 	bool isCD();
@@ -422,6 +428,9 @@ public:
 	const uint8 *findObName(uint8 type, uint8 index);
 	void copyName(uint8 type, uint8 index, uint8 *dst);
 	uint16 findExObject(const char *id);
+	void makeMainScreen();
+	void showWatchReel();
+	void watchReel();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 20d67763ad..801e959a13 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -24,7 +24,7 @@
 
 namespace DreamGen {
 
-static void (DreamGenContext::*reelCallbacks[57])(ReelRoutine &) = {
+static void (DreamBase::*reelCallbacks[57])(ReelRoutine &) = {
 	&DreamBase::gamer, &DreamBase::sparkyDrip,
 	&DreamBase::eden, &DreamBase::edenInBath,
 	&DreamBase::sparky, &DreamBase::smokeBloke,
@@ -42,7 +42,7 @@ static void (DreamGenContext::*reelCallbacks[57])(ReelRoutine &) = {
 	&DreamBase::copper, &DreamBase::poolGuard,
 	&DreamBase::rockstar, &DreamBase::businessMan,
 	&DreamBase::train, &DreamBase::genericPerson /*aide*/,
-	&DreamGenContext::mugger, &DreamBase::helicopter,
+	&DreamBase::mugger, &DreamBase::helicopter,
 	&DreamBase::introMagic1, &DreamBase::introMusic,
 	&DreamBase::introMagic2, &DreamBase::candles2,
 	&DreamBase::gates, &DreamBase::introMagic3,
@@ -135,7 +135,7 @@ void DreamBase::setupInitialReelRoutines(ReelRoutine *dest) {
 }
 #endif
 
-void DreamGenContext::updatePeople() {
+void DreamBase::updatePeople() {
 	data.word(kListpos) = kPeoplelist;
 	memset(getSegment(data.word(kBuffers)).ptr(kPeoplelist, 12 * sizeof(People)), 0xff, 12 * sizeof(People));
 	++data.word(kMaintimer);
@@ -147,10 +147,6 @@ void DreamGenContext::updatePeople() {
 		        r[i].mapX == data.byte(kMapx) &&
 		        r[i].mapY == data.byte(kMapy)) {
 			assert(reelCallbacks[i]);
-			// Set es:bx to the ReelRoutine, while not all ReelCallbacks are in
-			// DreamBase
-			es = data;
-			bx = kReelroutines + 8*i;
 			(this->*(reelCallbacks[i]))(r[i]);
 		}
 	}
@@ -915,7 +911,7 @@ void DreamBase::helicopter(ReelRoutine &routine) {
 	}
 }
 
-void DreamGenContext::mugger(ReelRoutine &routine) {
+void DreamBase::mugger(ReelRoutine &routine) {
 	if (routine.reelPointer() != 138) {
 		if (routine.reelPointer() == 176)
 			return; // endmugger2
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 1e980de015..cc6b09fd68 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -88,7 +88,7 @@ Sprite *DreamBase::makeSprite(uint8 x, uint8 y, uint16 updateCallback, uint16 fr
 	return sprite;
 }
 
-void DreamGenContext::spriteUpdate() {
+void DreamBase::spriteUpdate() {
 	Sprite *sprites = spriteTable();
 	sprites[0].hidden = data.byte(kRyanon);
 
@@ -118,30 +118,19 @@ void DreamBase::initMan() {
 	sprite->walkFrame = 0;
 }
 
-void DreamGenContext::mainMan(Sprite *sprite) {
-	push(es);
-	push(ds);
-
-	// Recover es:bx from sprite
-	es = data.word(kBuffers);
-	bx = kSpritetable;
-	Sprite *sprites = (Sprite *)es.ptr(bx, sizeof(Sprite) * 16);
-	bx += 32 * (sprite - sprites);
-	//
-
+void DreamBase::mainMan(Sprite *sprite) {
 	if (data.byte(kResetmanxy) == 1) {
 		data.byte(kResetmanxy) = 0;
 		sprite->x = data.byte(kRyanx);
 		sprite->y = data.byte(kRyany);
 		sprite->walkFrame = 0;
 	}
+
 	--sprite->speed;
-	if (sprite->speed != 0xff) {
-		ds = pop();
-		es = pop();
+	if (sprite->speed != 0xff)
 		return;
-	}
 	sprite->speed = 0;
+
 	if (data.byte(kTurntoface) != data.byte(kFacing)) {
 		aboutTurn(sprite);
 	} else {
@@ -177,9 +166,6 @@ void DreamGenContext::mainMan(Sprite *sprite) {
 	sprite->frameNumber = sprite->walkFrame + facelist[data.byte(kFacing)];
 	data.byte(kRyanx) = sprite->x;
 	data.byte(kRyany) = sprite->y;
-
-	ds = pop();
-	es = pop();
 }
 
 void DreamBase::walking(Sprite *sprite) {
@@ -487,25 +473,23 @@ const Frame *DreamBase::getReelFrameAX(uint16 frame) {
 	return base + frame;
 }
 
-void DreamGenContext::showRain() {
+void DreamBase::showRain() {
 	Rain *rain = (Rain *)getSegment(data.word(kBuffers)).ptr(kRainlist, 0);
 
 	// Do nothing if there's no rain at all
 	if (rain->x == 255)
 		return;
 
-	ds = data.word(kMainsprites);
-	si = 6*58; // Frame 58
-	ax = ds.word(si+2); // Frame::ptr
-	si = ax + 2080;
+	const Frame *frame = (const Frame *)getSegment(data.word(kMainsprites)).ptr(58 * sizeof(Frame), sizeof(Frame));
+	const uint8 *frameData = getSegment(data.word(kMainsprites)).ptr(kFrframes + frame->ptr(), 512);
 
 	for (; rain->x != 255; ++rain) {
 		uint16 y = rain->y + data.word(kMapady) + data.word(kMapystart);
 		uint16 x = rain->x + data.word(kMapadx) + data.word(kMapxstart);
 		uint16 size = rain->size;
-		ax = ((uint16)(rain->w3() - rain->b5)) & 511;
-		rain->setW3(ax);
-		const uint8 *src = ds.ptr(si, 0) + ax;
+		uint16 offset = (rain->w3() - rain->b5) & 511;
+		rain->setW3(offset);
+		const uint8 *src = frameData + offset;
 		uint8 *dst = workspace() + y * 320 + x;
 		for (uint16 i = 0; i < size; ++i) {
 			uint8 v = src[i];
@@ -872,7 +856,7 @@ void DreamBase::textForMonk() {
 	}
 }
 
-void DreamGenContext::reelsOnScreen() {
+void DreamBase::reelsOnScreen() {
 	reconstruct();
 	updatePeople();
 	watchReel();
@@ -880,7 +864,7 @@ void DreamGenContext::reelsOnScreen() {
 	useTimedText();
 }
 
-void DreamGenContext::reconstruct() {
+void DreamBase::reconstruct() {
 	if (data.byte(kHavedoneobs) == 0)
 		return;
 	data.byte(kNewobs) = 1;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 6b7e9a7784..4ac13ea3fb 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3273,7 +3273,7 @@ void DreamGenContext::allPointer() {
 	dumpPointer();
 }
 
-void DreamGenContext::makeMainScreen() {
+void DreamBase::makeMainScreen() {
 	createPanel();
 	data.byte(kNewobs) = 1;
 	drawFloor();
@@ -3697,7 +3697,7 @@ void DreamBase::putUnderZoom() {
 	multiPut(getSegment(data.word(kBuffers)).ptr(kZoomspace, 0), kZoomx + 5, kZoomy + 4, 46, 40);
 }
 
-void DreamGenContext::showWatchReel() {
+void DreamBase::showWatchReel() {
 	uint16 reelPointer = data.word(kReeltowatch);
 	plotReel(reelPointer);
 	data.word(kReeltowatch) = reelPointer;
@@ -3707,7 +3707,7 @@ void DreamGenContext::showWatchReel() {
 		data.byte(kShakecounter) = 0xFF;
 }
 
-void DreamGenContext::watchReel() {
+void DreamBase::watchReel() {
 	if (data.word(kReeltowatch) != 0xFFFF) {
 		if (data.byte(kManspath) != data.byte(kFinaldest))
 			return; // Wait until stopped walking
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index aeda662283..de03e45c62 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -61,10 +61,7 @@
 		DreamBase::showFrame(frameData, x, y, frameNumber, effectsFlag);
 	}
 	void width160();
-	void spriteUpdate();
-	void mainMan(Sprite *sprite);
 	void zoom();
-	void showRain();
 	void commandOnly();
 	void commandOnly(uint8 command) {
 		DreamBase::commandOnly(command);
@@ -77,7 +74,6 @@
 	bool checkIfEx(uint8 x, uint8 y);
 	void commandWithOb();
 	void commandWithOb(uint8 command, uint8 type, uint8 index);
-	void updatePeople();
 	void blockNameText();
 	void walkToText();
 	void personNameText();
@@ -171,8 +167,6 @@
 	void playChannel1(uint8 index) {
 		DreamBase::playChannel1(index);
 	}
-	void reelsOnScreen();
-	void reconstruct();
 	void look();
 	void autoLook();
 	void doLook();
@@ -238,7 +232,6 @@
 	void checkFolderCoords();
 	void nextFolder();
 	void lastFolder();
-	void mugger(ReelRoutine &routine);
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	void loadSaveBox();
 	uint8 nextSymbol(uint8 symbol);
@@ -295,7 +288,6 @@
 	void openTomb();
 	void hotelControl();
 	void obsThatDoThings();
-	void makeMainScreen();
 	void delEverything();
 	void errorMessage1();
 	void errorMessage2();
@@ -316,8 +308,6 @@
 	void set16ColPalette();
 	void showSaveOps();
 	void showLoadOps();
-	void watchReel();
-	void showWatchReel();
 	void afterNewRoom();
 	void madmanRun();
 	void showDecisions();
-- 
cgit v1.2.3


From 60ece632b87ab8cb797df0a245bb5f97301fe610 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 18 Dec 2011 16:53:47 +0100
Subject: DREAMWEB: Remove reelRoutines from data blob

---
 engines/dreamweb/dreambase.h  |   9 +++
 engines/dreamweb/dreamgen.cpp | 158 ++++++++++++++----------------------------
 engines/dreamweb/dreamgen.h   |  33 +++++----
 engines/dreamweb/people.cpp   |  29 +++-----
 engines/dreamweb/saveload.cpp |  29 +++-----
 engines/dreamweb/structs.h    |   8 ---
 engines/dreamweb/stubs.cpp    |   8 +--
 engines/dreamweb/stubs.h      |   2 -
 8 files changed, 96 insertions(+), 180 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 9a5d68436c..6de854f452 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -34,6 +34,9 @@ namespace DreamWeb {
 
 namespace DreamGen {
 
+
+const unsigned int kNumReelRoutines = 57;
+
 /**
  * This class is one of the parent classes of DreamGenContext. Its sole purpose
  * is to allow us to incrementally move things out of DreamGenContext into this
@@ -60,6 +63,9 @@ protected:
 	// from vgagrafx.cpp
 	uint8 _workspace[(0x1000 + 2) * 16];
 
+	// from people.cpp
+	ReelRoutine _reelRoutines[kNumReelRoutines+1];
+
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
 
@@ -158,6 +164,7 @@ public:
 	void workoutFrames();
 
 	// from people.cpp
+	void setupInitialReelRoutines();
 	void updatePeople();
 	void madmanText();
 	void madman(ReelRoutine &routine);
@@ -232,6 +239,8 @@ public:
 	void showMainOps();
 	void showDiscOps();
 	void showNames();
+	void loadPosition(unsigned int slot);
+	void savePosition(unsigned int slot, const char *descbuf);
 
 	// from sound.cpp
 	bool loadSpeech(byte type1, int idx1, byte type2, int idx2);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 6d303e62bf..33bac8299e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -1773,14 +1773,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 1120;
+	si = 663;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 1136;
+	si = 679;
 	_add(si, ax);
 	ax = pop();
 }
@@ -1832,7 +1832,7 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 1120);
+	_add(bx, 663);
 	es.byte(bx) = 0;
 }
 
@@ -1852,7 +1852,7 @@ dirroot:
 	si = offset_rootdir;
 	_inc(si);
 	es = cs;
-	di = 1045;
+	di = 588;
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
@@ -1954,7 +1954,7 @@ notyetassigned:
 	push(bx);
 	_add(bx, 2);
 	ds = cs;
-	si = 1154;
+	si = 697;
 checkpass:
 	_lodsw();
 	ah = es.byte(bx);
@@ -1998,7 +1998,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 1045;
+	di = 588;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -2128,7 +2128,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 1045+1;
+	di = 588+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -2210,7 +2210,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 1154;
+	si = 697;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -2391,113 +2391,57 @@ void DreamGenContext::__start() {
 		//0x0190: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x01a0: .... .... .... ....
-		0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x01, 0x2c, 0x00, 0x14, 0x00, 0x02, 0x00, 
-		//0x01b0: .... .... ..,. ....
-		0x01, 0x01, 0x37, 0x00, 0x00, 0x00, 0x32, 0x14, 0x00, 0x18, 0x16, 0x00, 0x4a, 0x00, 0x01, 0x00, 
-		//0x01c0: ..7. ..2. .... J...
-		0x00, 0x18, 0x21, 0x0a, 0x4b, 0x00, 0x01, 0x00, 0x01, 0x01, 0x2c, 0x00, 0x1b, 0x00, 0x02, 0x00, 
-		//0x01d0: ..!. K... ..,. ....
-		0x02, 0x01, 0x2c, 0x00, 0x60, 0x00, 0x03, 0x00, 0x04, 0x01, 0x2c, 0x00, 0x76, 0x00, 0x02, 0x00, 
-		//0x01e0: ..,. `... ..,. v...
-		0x05, 0x01, 0x2c, 0x0a, 0x00, 0x00, 0x02, 0x00, 0x00, 0x05, 0x16, 0x14, 0x35, 0x00, 0x03, 0x00, 
-		//0x01f0: ..,. .... .... 5...
-		0x00, 0x05, 0x16, 0x14, 0x28, 0x00, 0x01, 0x00, 0x02, 0x05, 0x16, 0x14, 0x32, 0x00, 0x01, 0x00, 
-		//0x0200: .... (... .... 2...
-		0x03, 0x02, 0x0b, 0x0a, 0xc0, 0x00, 0x01, 0x00, 0x00, 0x02, 0x0b, 0x0a, 0xb6, 0x00, 0x02, 0x00, 
-		//0x0210: .... .... .... ....
-		0x01, 0x08, 0x0b, 0x0a, 0x00, 0x00, 0x02, 0x00, 0x01, 0x17, 0x00, 0x32, 0x00, 0x00, 0x03, 0x00, 
-		//0x0220: .... .... ...2 ....
-		0x00, 0x1c, 0x0b, 0x14, 0xfa, 0x00, 0x04, 0x00, 0x00, 0x17, 0x00, 0x32, 0x2b, 0x00, 0x02, 0x00, 
-		//0x0230: .... .... ...2 +...
-		0x08, 0x17, 0x0b, 0x28, 0x82, 0x00, 0x02, 0x00, 0x01, 0x17, 0x16, 0x28, 0x7a, 0x00, 0x02, 0x00, 
-		//0x0240: ...( .... ...( z...
-		0x02, 0x17, 0x16, 0x28, 0x69, 0x00, 0x02, 0x00, 0x03, 0x17, 0x16, 0x28, 0x51, 0x00, 0x02, 0x00, 
-		//0x0250: ...( i... ...( Q...
-		0x04, 0x17, 0x0b, 0x28, 0x87, 0x00, 0x02, 0x00, 0x05, 0x17, 0x16, 0x28, 0x91, 0x00, 0x02, 0x00, 
-		//0x0260: ...( .... ...( ....
-		0x06, 0x04, 0x16, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0xc8, 0x00, 0x00, 0x00, 
-		//0x0270: .... .... .-.. ....
-		0x14, 0x2d, 0x16, 0x1e, 0x27, 0x00, 0x02, 0x00, 0x00, 0x2d, 0x16, 0x1e, 0x19, 0x00, 0x02, 0x00, 
-		//0x0280: .-.. '... .-.. ....
-		0x00, 0x08, 0x16, 0x28, 0x20, 0x00, 0x02, 0x00, 0x00, 0x07, 0x0b, 0x14, 0x40, 0x00, 0x02, 0x00, 
-		//0x0290: ...(  ... .... @...
-		0x00, 0x16, 0x16, 0x14, 0x52, 0x00, 0x02, 0x00, 0x00, 0x1b, 0x0b, 0x1e, 0x00, 0x00, 0x02, 0x00, 
-		//0x02a0: .... R... .... ....
-		0x00, 0x14, 0x00, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x21, 0x28, 0x15, 0x00, 0x01, 0x00, 
-		//0x02b0: .... .... ..!( ....
-		0x00, 0x1d, 0x0b, 0x0a, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x16, 0x00, 0x02, 0x00, 0x02, 0x00, 
-		//0x02c0: .... .... .... ....
-		0x00, 0x19, 0x00, 0x32, 0x04, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x1e, 0x79, 0x00, 0x02, 0x00, 
-		//0x02d0: ...2 .... .2.. y...
-		0x00, 0x32, 0x16, 0x1e, 0x00, 0x00, 0x14, 0x00, 0x00, 0x34, 0x16, 0x1e, 0xc0, 0x00, 0x02, 0x00, 
-		//0x02e0: .2.. .... .4.. ....
-		0x00, 0x34, 0x16, 0x1e, 0xe9, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x68, 0x00, 0x37, 0x00, 
-		//0x02f0: .4.. .... .2.( h.7.
-		0x00, 0x35, 0x21, 0x00, 0x63, 0x00, 0x02, 0x00, 0x00, 0x32, 0x16, 0x28, 0x00, 0x00, 0x03, 0x00, 
-		//0x0300: .5!. c... .2.( ....
-		0x00, 0x32, 0x16, 0x1e, 0xa2, 0x00, 0x02, 0x00, 0x00, 0x34, 0x16, 0x1e, 0x39, 0x00, 0x02, 0x00, 
-		//0x0310: .2.. .... .4.. 9...
-		0x00, 0x34, 0x16, 0x1e, 0x00, 0x00, 0x02, 0x00, 0x00, 0x36, 0x00, 0x00, 0x48, 0x00, 0x03, 0x00, 
-		//0x0320: .4.. .... .6.. H...
-		0x00, 0x37, 0x2c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
-		//0x0330: .7,. .... .... ....
-		0x00, 0x0e, 0x16, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x0e, 0x16, 0x00, 0x2c, 0x01, 0x01, 0x00, 
-		//0x0340: .... .... .... ,...
-		0x00, 0x0a, 0x16, 0x1e, 0xae, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x16, 0x14, 0x00, 0x00, 0x01, 0x00, 
-		//0x0350: .... .... .... ....
-		0x00, 0x0b, 0x0b, 0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x0b, 0x1e, 0x00, 0x00, 0x32, 0x14, 
-		//0x0360: .... ..2. .... ..2.
-		0x00, 0x0b, 0x16, 0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0e, 0x21, 0x28, 0x00, 0x00, 0x32, 0x14, 
-		//0x0370: .... ..2. ..!( ..2.
-		0x00, 0xff, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x01, 
-		//0x0380: ..DR EAMW EB.V 99..
-		0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 
-		//0x0390: .PUB LIC        PUB
-		0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 
-		//0x03a0: LIC       ...B LACK
-		0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x03b0: DRAG ON R YAN      
-		0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 
-		//0x03c0:   .. .HEN DRIX     
-		0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 
-		//0x03d0:  LOU IS        ...S
-		0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 
-		//0x03e0: EPTI MUS     B ECKE
-		0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x03f0: TT     .. .        
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 
-		//0x0400:        ." ROOT     
-		0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0410:      ."            
-		0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 
-		//0x0420:   .. ...$ .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-		//0x0430: .... .... .... ....
-		0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0440: D:.. .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0450: .... .... .... ....
-		0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0460: .... .... .... ....
-		0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 
-		//0x0470: .... .... .... ....
+		0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 
+		//0x01b0: .... .... .DRE AMWE
+		0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 
+		//0x01c0: B.V9 9... PUBL IC  
+		0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
+		//0x01d0:      PUBL IC      .
+		0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 
+		//0x01e0: ..BL ACKD RAGO N RY
+		0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 
+		//0x01f0: AN         ... HEND
+		0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 
+		//0x0200: RIX       LOUI S   
+		0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 
+		//0x0210:    . ..SE PTIM US  
+		0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 
+		//0x0220:   BE CKET T     ...
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 
+		//0x0230:                 ."R
+		0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 
+		//0x0240: OOT          . "   
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 
+		//0x0250:            ... ..$.
+		0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 
+		//0x0260: .... .... .... ....
+		0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0270: .... ...D :... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0480: .... .... .... ....
+		//0x0280: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0290: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 
+		//0x02a0: .... .... .... ....
+		0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x02b0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0490: .... .... .... ....
+		//0x02c0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x04a0: .... .... .... ....
+		//0x02d0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x04b0: .... .... .... ....
+		//0x02e0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x04c0: .... .... .... ....
+		//0x02f0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x04d0: .... .... .... ....
+		//0x0300: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x04e0: .... .... .... ....
+		//0x0310: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x04f0: .... .... .... ....
-		0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
+		//0x0320: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
+		//0x0330: .... .... .... ....
+		0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index b7a644fe1f..47be37a20a 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,9 +32,9 @@
 
 namespace DreamGen {
 
-static const uint16 offset_rootdir = 0x0407;
-static const uint16 offset_operand1 = 0x03f9;
-static const uint16 offset_keys = 0x038f;
+static const uint16 offset_keys = 0x01c6;
+static const uint16 offset_rootdir = 0x023e;
+static const uint16 offset_operand1 = 0x0230;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -357,17 +357,16 @@ static const uint16 kCh1blockstocopy = 435;
 static const uint16 kSoundbufferwrite = 437;
 static const uint16 kCurrentsample = 439;
 static const uint16 kRoomssample = 440;
-static const uint16 kReelroutines = 441;
-static const uint16 kBasicsample = 898;
-static const uint16 kCurrentfile = 1045;
-static const uint16 kRoomscango = 1120;
-static const uint16 kRoompics = 1136;
-static const uint16 kOplist = 1151;
-static const uint16 kInputline = 1154;
-static const uint16 kPresslist = 1282;
-static const uint16 kQuitrequested = 1288;
-static const uint16 kSubtitles = 1289;
-static const uint16 kForeignrelease = 1290;
+static const uint16 kBasicsample = 441;
+static const uint16 kCurrentfile = 588;
+static const uint16 kRoomscango = 663;
+static const uint16 kRoompics = 679;
+static const uint16 kOplist = 694;
+static const uint16 kInputline = 697;
+static const uint16 kPresslist = 825;
+static const uint16 kQuitrequested = 831;
+static const uint16 kSubtitles = 832;
+static const uint16 kForeignrelease = 833;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -406,8 +405,8 @@ static const uint16 kListofchanges = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768
 static const uint16 kUndertimedtext = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4));
 static const uint16 kRainlist = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30));
 static const uint16 kInitialreelrouts = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
-static const uint16 kInitialvars = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+898-441);
-static const uint16 kLengthofbuffer = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+898-441+68-0);
+static const uint16 kInitialvars = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+457);
+static const uint16 kLengthofbuffer = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+457+68-0);
 static const uint16 kReellist = (0+(36*144));
 static const uint16 kIntext = (0+(38*2));
 static const uint16 kLengthofmap = (0+(66*60));
@@ -440,6 +439,7 @@ static const uint16 kTablesize = (32);
 static const uint16 kScreenwidth = (320);
 static const uint16 kKeypadx = (36+112);
 static const uint16 kItempicsize = (44);
+static const uint16 kLenofreelrouts = (457);
 static const uint16 kDiaryy = (48+12);
 static const uint16 kOpsy = (52);
 static const uint16 kSymboly = (56);
@@ -458,7 +458,6 @@ static const uint16 kKeypady = (72);
 static const uint16 kZoomx = (8);
 static const uint16 kInventx = (80);
 static const uint16 kMenux = (80+40);
-static const uint16 kLenofreelrouts = (898-441);
 static const uint16 kHeaderlen = (96);
 
 
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 801e959a13..4d66134e96 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -56,12 +56,6 @@ static void (DreamBase::*reelCallbacks[57])(ReelRoutine &) = {
 	&DreamBase::carParkDrip
 };
 
-#if 0
-// TODO: Enable this when the ReelRoutine list has been moved out of the
-// data segment, all ReelCallbacks are in DreamBase, and the
-// ReelRoutine::reelPointer field is a real member.
-// See also struct ReelRoutine, clearBuffers, clearChanges, syncReelRoutine
-
 static const ReelRoutine g_initialReelRoutines[] = {
 // Room number and x,y
 // reel pointer
@@ -126,28 +120,25 @@ static const ReelRoutine g_initialReelRoutines[] = {
 	{ 255,0,0, 0, 0,0,0 }
 };
 
-void DreamBase::setupInitialReelRoutines(ReelRoutine *dest) {
-	for (unsigned int i = 0; i < ARRAYSIZE(g_initialReelRoutines); ++i) {
-		dest[i] = g_initialReelRoutines[i];
-		if (dest[i].period == 55 && isCD() && engine->getLanguage() == Common::DE_DEU)
-			dest[i].period = 65;
+void DreamBase::setupInitialReelRoutines() {
+	for (unsigned int i = 0; i < kNumReelRoutines + 1; ++i) {
+		_reelRoutines[i] = g_initialReelRoutines[i];
+		if (_reelRoutines[i].period == 55 && isCD() && engine->getLanguage() == Common::DE_DEU)
+			_reelRoutines[i].period = 65;
 	}
 }
-#endif
 
 void DreamBase::updatePeople() {
 	data.word(kListpos) = kPeoplelist;
 	memset(getSegment(data.word(kBuffers)).ptr(kPeoplelist, 12 * sizeof(People)), 0xff, 12 * sizeof(People));
 	++data.word(kMaintimer);
 
-	ReelRoutine *r = (ReelRoutine *)data.ptr(kReelroutines, 0);
-
-	for (int i = 0; r[i].reallocation != 255; ++i) {
-		if (r[i].reallocation == data.byte(kReallocation) &&
-		        r[i].mapX == data.byte(kMapx) &&
-		        r[i].mapY == data.byte(kMapy)) {
+	for (int i = 0; _reelRoutines[i].reallocation != 255; ++i) {
+		if (_reelRoutines[i].reallocation == data.byte(kReallocation) &&
+		        _reelRoutines[i].mapX == data.byte(kMapx) &&
+		        _reelRoutines[i].mapY == data.byte(kMapy)) {
 			assert(reelCallbacks[i]);
-			(this->*(reelCallbacks[i]))(r[i]);
+			(this->*(reelCallbacks[i]))(_reelRoutines[i]);
 		}
 	}
 }
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 4001cb1448..cd32e4fa34 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -38,12 +38,7 @@ void syncReelRoutine(Common::Serializer &s, ReelRoutine *reel) {
 	s.syncAsByte(reel->reallocation);
 	s.syncAsByte(reel->mapX);
 	s.syncAsByte(reel->mapY);
-#if 1
-	s.syncAsByte(reel->b3);
-	s.syncAsByte(reel->b4);
-#else
 	s.syncAsUint16LE(reel->_reelPointer);
-#endif
 	s.syncAsByte(reel->period);
 	s.syncAsByte(reel->counter);
 	s.syncAsByte(reel->b7);
@@ -380,7 +375,7 @@ void DreamGenContext::actualLoad() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::savePosition(unsigned int slot, const char *descbuf) {
+void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 
 	const Room &currentRoom = g_roomData[data.byte(kLocation)];
 
@@ -411,7 +406,7 @@ void DreamGenContext::savePosition(unsigned int slot, const char *descbuf) {
 
 	// fill length fields in savegame file header
 	uint16 len[6] = { 17, kLengthofvars, kLengthofextra,
-	                  4*kNumchanges, 48, kLenofreelrouts };
+	                  4*kNumchanges, 48, kNumReelRoutines*8+1 };
 	for (int i = 0; i < 6; ++i)
 		header.setLen(i, len[i]);
 
@@ -432,11 +427,11 @@ void DreamGenContext::savePosition(unsigned int slot, const char *descbuf) {
 
 	// TODO: Convert more to serializer?
 	Common::Serializer s(0, outSaveFile);
-	for (unsigned int i = 0; 8*i < kLenofreelrouts - 1; ++i) {
-		syncReelRoutine(s, (ReelRoutine *)data.ptr(kReelroutines + 8*i, 8));
+	for (unsigned int i = 0; i < kNumReelRoutines; ++i) {
+		syncReelRoutine(s, &_reelRoutines[i]);
 	}
 	// Terminator
-	s.syncAsByte(*data.ptr(kReelroutines + kLenofreelrouts - 1, 1));
+	s.syncAsByte(_reelRoutines[kNumReelRoutines].reallocation);
 
 	// ScummVM data block
 	outSaveFile->writeUint32BE(SCUMMVM_HEADER);
@@ -460,7 +455,7 @@ void DreamGenContext::savePosition(unsigned int slot, const char *descbuf) {
 	delete outSaveFile;
 }
 
-void DreamGenContext::loadPosition(unsigned int slot) {
+void DreamBase::loadPosition(unsigned int slot) {
 	data.word(kTimecount) = 0;
 	clearChanges();
 
@@ -500,11 +495,11 @@ void DreamGenContext::loadPosition(unsigned int slot) {
 
 	// TODO: Use serializer for more
 	Common::Serializer s(inSaveFile, 0);
-	for (unsigned int i = 0; 8*i < kLenofreelrouts - 1; ++i) {
-		syncReelRoutine(s, (ReelRoutine *)data.ptr(kReelroutines + 8*i, 8));
+	for (unsigned int i = 0; i < kNumReelRoutines; ++i) {
+		syncReelRoutine(s, &_reelRoutines[i]);
 	}
 	// Terminator
-	s.syncAsByte(*data.ptr(kReelroutines + kLenofreelrouts - 1, 1));
+	s.syncAsByte(_reelRoutines[kNumReelRoutines].reallocation);
 
 	// Check if there's a ScummVM data block
 	if (header.len(6) == SCUMMVM_BLOCK_MAGIC_SIZE) {
@@ -686,10 +681,4 @@ void DreamGenContext::selectSlot() {
 	delPointer();
 }
 
-void DreamGenContext::selectSlot2() {
-	if (data.word(kMousebutton))
-		data.byte(kLoadingorsave) = 2;
-	selectSlot();
-}
-
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index d96469fbd5..313f3caf0b 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -168,18 +168,10 @@ struct ReelRoutine {
 	uint8 reallocation;
 	uint8 mapX;
 	uint8 mapY;
-#if 0
 	uint16 _reelPointer;
 	uint16 reelPointer() const { return _reelPointer; }
 	void setReelPointer(uint16 v) { _reelPointer = v; }
 	void incReelPointer() { _reelPointer++; }
-#else
-	uint8 b3;
-	uint8 b4;
-	uint16 reelPointer() const { return READ_LE_UINT16(&b3); }
-	void setReelPointer(uint16 v) { WRITE_LE_UINT16(&b3, v); }
-	void incReelPointer() { setReelPointer(reelPointer() + 1); }
-#endif
 	uint8 period;
 	uint8 counter;
 	uint8 b7;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 4ac13ea3fb..98d961ef2b 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4540,10 +4540,6 @@ void DreamBase::clearBuffers() {
 
 	memset(getSegment(data.word(kExtras)).ptr(0, kLengthofextra), 0xFF, kLengthofextra);
 
-	// TODO: Remove this line 
-	// (once the ReelRoutines are no longer in the data segment)
-	memcpy(getSegment(data.word(kBuffers)).ptr(kInitialreelrouts, kLenofreelrouts), data.ptr(kReelroutines, kLenofreelrouts), kLenofreelrouts);
-
 	memcpy(getSegment(data.word(kBuffers)).ptr(kInitialvars, kLengthofvars), data.ptr(kStartvars, kLengthofvars), kLengthofvars);
 
 	clearChanges();
@@ -4552,9 +4548,7 @@ void DreamBase::clearBuffers() {
 void DreamBase::clearChanges() {
 	memset(getSegment(data.word(kBuffers)).ptr(kListofchanges, 4*kNumchanges), 0xFF, 4*kNumchanges);
 
-	// TODO: Call setupInitialReelRoutines instead
-	// (once the ReelRoutines are no longer in the data segment)
-	memcpy(data.ptr(kReelroutines, kLenofreelrouts), getSegment(data.word(kBuffers)).ptr(kInitialreelrouts, kLenofreelrouts), kLenofreelrouts);
+	setupInitialReelRoutines();
 
 	memcpy(data.ptr(kStartvars, kLengthofvars), getSegment(data.word(kBuffers)).ptr(kInitialvars, kLengthofvars), kLengthofvars);
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index de03e45c62..3f38ad4beb 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -174,8 +174,6 @@
 	void showSecondUse();
 	void actualSave();
 	void actualLoad();
-	void loadPosition(unsigned int slot);
-	void savePosition(unsigned int slot, const char *descbuf);
 	void restoreAll();
 	void enterSymbol();
 	void viewFolder();
-- 
cgit v1.2.3


From 833507695e9a096489cb6e3a7ca5ad854a769fc7 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 17:58:43 +0200
Subject: DREAMWEB: Remove the now unused 'keynum' and 'newlogonum' variables
 from the data blob

---
 engines/dreamweb/dreamgen.cpp |  82 ++++++-------
 engines/dreamweb/dreamgen.h   | 268 +++++++++++++++++++++---------------------
 2 files changed, 174 insertions(+), 176 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 33bac8299e..644187c558 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -1773,14 +1773,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 663;
+	si = 661;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 679;
+	si = 677;
 	_add(si, ax);
 	ax = pop();
 }
@@ -1832,7 +1832,7 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 663);
+	_add(bx, 661);
 	es.byte(bx) = 0;
 }
 
@@ -1852,7 +1852,7 @@ dirroot:
 	si = offset_rootdir;
 	_inc(si);
 	es = cs;
-	di = 588;
+	di = 586;
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
@@ -1954,7 +1954,7 @@ notyetassigned:
 	push(bx);
 	_add(bx, 2);
 	ds = cs;
-	si = 697;
+	si = 695;
 checkpass:
 	_lodsw();
 	ah = es.byte(bx);
@@ -1998,7 +1998,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 588;
+	di = 586;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -2128,7 +2128,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 588+1;
+	di = 586+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -2210,7 +2210,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 697;
+	si = 695;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -2381,49 +2381,49 @@ void DreamGenContext::__start() {
 		//0x0140: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0150: .... .... .... ....
-		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, 0xff, 
 		//0x0160: .... .... .... ....
-		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0170: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0180: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0190: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x01a0: .... .... .... ....
-		0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 
-		//0x01b0: .... .... .DRE AMWE
-		0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 
-		//0x01c0: B.V9 9... PUBL IC  
-		0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
-		//0x01d0:      PUBL IC      .
-		0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 
-		//0x01e0: ..BL ACKD RAGO N RY
-		0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 
-		//0x01f0: AN         ... HEND
-		0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 
-		//0x0200: RIX       LOUI S   
-		0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 
-		//0x0210:    . ..SE PTIM US  
-		0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 
-		//0x0220:   BE CKET T     ...
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 
-		//0x0230:                 ."R
-		0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 
-		//0x0240: OOT          . "   
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 
-		//0x0250:            ... ..$.
-		0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 
+		0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 
+		//0x01b0: .... ...D REAM WEB.
+		0x56, 0x39, 0x39, 0x00, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 
+		//0x01c0: V99. ..PU BLIC     
+		0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 
+		//0x01d0:   PU BLIC       ...
+		0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 
+		//0x01e0: BLAC KDRA GON  RYAN
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 
+		//0x01f0:         . ..HE NDRI
+		0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0200: X      LO UIS      
+		0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 
+		//0x0210:  ... SEPT IMUS     
+		0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 
+		//0x0220: BECK ETT     . ..  
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 
+		//0x0230:              . "ROO
+		0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0240: T          ."      
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 
+		//0x0250:         . .... $...
+		0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 
 		//0x0260: .... .... .... ....
-		0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0270: .... ...D :... ....
+		0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0270: .... .D:. .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0280: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0290: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 
 		//0x02a0: .... .... .... ....
-		0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x02b0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x02c0: .... .... .... ....
@@ -2439,9 +2439,9 @@ void DreamGenContext::__start() {
 		//0x0310: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0320: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
 		//0x0330: .... .... .... ....
-		0x00, 0x00, };
+		};
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 47be37a20a..6e06941d18 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,9 +32,9 @@
 
 namespace DreamGen {
 
-static const uint16 offset_keys = 0x01c6;
-static const uint16 offset_rootdir = 0x023e;
-static const uint16 offset_operand1 = 0x0230;
+static const uint16 offset_rootdir = 0x023c;
+static const uint16 offset_operand1 = 0x022e;
+static const uint16 offset_keys = 0x01c4;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -236,137 +236,135 @@ static const uint16 kTimer3to = 255;
 static const uint16 kWatchdump = 256;
 static const uint16 kLogonum = 257;
 static const uint16 kOldlogonum = 258;
-static const uint16 kNewlogonum = 259;
-static const uint16 kNetseg = 260;
-static const uint16 kNetpoint = 262;
-static const uint16 kKeynum = 264;
-static const uint16 kCursorstate = 265;
-static const uint16 kPressed = 266;
-static const uint16 kPresspointer = 267;
-static const uint16 kGraphicpress = 269;
-static const uint16 kPresscount = 270;
-static const uint16 kLightcount = 271;
-static const uint16 kFolderpage = 272;
-static const uint16 kDiarypage = 273;
-static const uint16 kMenucount = 274;
-static const uint16 kSymboltopx = 275;
-static const uint16 kSymboltopnum = 276;
-static const uint16 kSymboltopdir = 277;
-static const uint16 kSymbolbotx = 278;
-static const uint16 kSymbolbotnum = 279;
-static const uint16 kSymbolbotdir = 280;
-static const uint16 kSymboltolight = 281;
-static const uint16 kSymbol1 = 282;
-static const uint16 kSymbol2 = 283;
-static const uint16 kSymbol3 = 284;
-static const uint16 kSymbolnum = 285;
-static const uint16 kDumpx = 286;
-static const uint16 kDumpy = 288;
-static const uint16 kWalkandexam = 290;
-static const uint16 kWalkexamtype = 291;
-static const uint16 kWalkexamnum = 292;
-static const uint16 kCurslocx = 293;
-static const uint16 kCurslocy = 295;
-static const uint16 kCurpos = 297;
-static const uint16 kMonadx = 299;
-static const uint16 kMonady = 301;
-static const uint16 kMonsource = 303;
-static const uint16 kNumtodo = 305;
-static const uint16 kTimecount = 307;
-static const uint16 kCounttotimed = 309;
-static const uint16 kTimedseg = 311;
-static const uint16 kTimedoffset = 313;
-static const uint16 kTimedy = 315;
-static const uint16 kTimedx = 316;
-static const uint16 kNeedtodumptimed = 317;
-static const uint16 kLoadingorsave = 318;
-static const uint16 kCurrentslot = 319;
-static const uint16 kCursorpos = 320;
-static const uint16 kColourpos = 321;
-static const uint16 kFadedirection = 322;
-static const uint16 kNumtofade = 323;
-static const uint16 kFadecount = 324;
-static const uint16 kAddtogreen = 325;
-static const uint16 kAddtored = 326;
-static const uint16 kAddtoblue = 327;
-static const uint16 kLastsoundreel = 328;
-static const uint16 kSpeechloaded = 330;
-static const uint16 kSpeechlength = 331;
-static const uint16 kVolume = 333;
-static const uint16 kVolumeto = 334;
-static const uint16 kVolumedirection = 335;
-static const uint16 kVolumecount = 336;
-static const uint16 kWongame = 337;
-static const uint16 kLasthardkey = 338;
-static const uint16 kBufferin = 339;
-static const uint16 kBufferout = 341;
-static const uint16 kExtras = 343;
-static const uint16 kWorkspace = 345;
-static const uint16 kMapstore = 347;
-static const uint16 kCharset1 = 349;
-static const uint16 kBuffers = 351;
-static const uint16 kMainsprites = 353;
-static const uint16 kBackdrop = 355;
-static const uint16 kMapdata = 357;
-static const uint16 kSounddata = 359;
-static const uint16 kSounddata2 = 361;
-static const uint16 kRecordspace = 363;
-static const uint16 kFreedat = 365;
-static const uint16 kSetdat = 367;
-static const uint16 kReel1 = 369;
-static const uint16 kReel2 = 371;
-static const uint16 kReel3 = 373;
-static const uint16 kRoomdesc = 375;
-static const uint16 kFreedesc = 377;
-static const uint16 kSetdesc = 379;
-static const uint16 kBlockdesc = 381;
-static const uint16 kSetframes = 383;
-static const uint16 kFreeframes = 385;
-static const uint16 kPeople = 387;
-static const uint16 kReels = 389;
-static const uint16 kCommandtext = 391;
-static const uint16 kPuzzletext = 393;
-static const uint16 kTraveltext = 395;
-static const uint16 kTempgraphics = 397;
-static const uint16 kTempgraphics2 = 399;
-static const uint16 kTempgraphics3 = 401;
-static const uint16 kTempsprites = 403;
-static const uint16 kTextfile1 = 405;
-static const uint16 kTextfile2 = 407;
-static const uint16 kTextfile3 = 409;
-static const uint16 kBlinkframe = 411;
-static const uint16 kBlinkcount = 412;
-static const uint16 kReasseschanges = 413;
-static const uint16 kPointerspath = 414;
-static const uint16 kManspath = 415;
-static const uint16 kPointerfirstpath = 416;
-static const uint16 kFinaldest = 417;
-static const uint16 kDestination = 418;
-static const uint16 kLinestartx = 419;
-static const uint16 kLinestarty = 421;
-static const uint16 kLineendx = 423;
-static const uint16 kLineendy = 425;
-static const uint16 kLinepointer = 427;
-static const uint16 kLinedirection = 428;
-static const uint16 kLinelength = 429;
-static const uint16 kCh0blockstocopy = 430;
-static const uint16 kCh0playing = 432;
-static const uint16 kCh0repeat = 433;
-static const uint16 kCh1playing = 434;
-static const uint16 kCh1blockstocopy = 435;
-static const uint16 kSoundbufferwrite = 437;
-static const uint16 kCurrentsample = 439;
-static const uint16 kRoomssample = 440;
-static const uint16 kBasicsample = 441;
-static const uint16 kCurrentfile = 588;
-static const uint16 kRoomscango = 663;
-static const uint16 kRoompics = 679;
-static const uint16 kOplist = 694;
-static const uint16 kInputline = 697;
-static const uint16 kPresslist = 825;
-static const uint16 kQuitrequested = 831;
-static const uint16 kSubtitles = 832;
-static const uint16 kForeignrelease = 833;
+static const uint16 kNetseg = 259;
+static const uint16 kNetpoint = 261;
+static const uint16 kCursorstate = 263;
+static const uint16 kPressed = 264;
+static const uint16 kPresspointer = 265;
+static const uint16 kGraphicpress = 267;
+static const uint16 kPresscount = 268;
+static const uint16 kLightcount = 269;
+static const uint16 kFolderpage = 270;
+static const uint16 kDiarypage = 271;
+static const uint16 kMenucount = 272;
+static const uint16 kSymboltopx = 273;
+static const uint16 kSymboltopnum = 274;
+static const uint16 kSymboltopdir = 275;
+static const uint16 kSymbolbotx = 276;
+static const uint16 kSymbolbotnum = 277;
+static const uint16 kSymbolbotdir = 278;
+static const uint16 kSymboltolight = 279;
+static const uint16 kSymbol1 = 280;
+static const uint16 kSymbol2 = 281;
+static const uint16 kSymbol3 = 282;
+static const uint16 kSymbolnum = 283;
+static const uint16 kDumpx = 284;
+static const uint16 kDumpy = 286;
+static const uint16 kWalkandexam = 288;
+static const uint16 kWalkexamtype = 289;
+static const uint16 kWalkexamnum = 290;
+static const uint16 kCurslocx = 291;
+static const uint16 kCurslocy = 293;
+static const uint16 kCurpos = 295;
+static const uint16 kMonadx = 297;
+static const uint16 kMonady = 299;
+static const uint16 kMonsource = 301;
+static const uint16 kNumtodo = 303;
+static const uint16 kTimecount = 305;
+static const uint16 kCounttotimed = 307;
+static const uint16 kTimedseg = 309;
+static const uint16 kTimedoffset = 311;
+static const uint16 kTimedy = 313;
+static const uint16 kTimedx = 314;
+static const uint16 kNeedtodumptimed = 315;
+static const uint16 kLoadingorsave = 316;
+static const uint16 kCurrentslot = 317;
+static const uint16 kCursorpos = 318;
+static const uint16 kColourpos = 319;
+static const uint16 kFadedirection = 320;
+static const uint16 kNumtofade = 321;
+static const uint16 kFadecount = 322;
+static const uint16 kAddtogreen = 323;
+static const uint16 kAddtored = 324;
+static const uint16 kAddtoblue = 325;
+static const uint16 kLastsoundreel = 326;
+static const uint16 kSpeechloaded = 328;
+static const uint16 kSpeechlength = 329;
+static const uint16 kVolume = 331;
+static const uint16 kVolumeto = 332;
+static const uint16 kVolumedirection = 333;
+static const uint16 kVolumecount = 334;
+static const uint16 kWongame = 335;
+static const uint16 kLasthardkey = 336;
+static const uint16 kBufferin = 337;
+static const uint16 kBufferout = 339;
+static const uint16 kExtras = 341;
+static const uint16 kWorkspace = 343;
+static const uint16 kMapstore = 345;
+static const uint16 kCharset1 = 347;
+static const uint16 kBuffers = 349;
+static const uint16 kMainsprites = 351;
+static const uint16 kBackdrop = 353;
+static const uint16 kMapdata = 355;
+static const uint16 kSounddata = 357;
+static const uint16 kSounddata2 = 359;
+static const uint16 kRecordspace = 361;
+static const uint16 kFreedat = 363;
+static const uint16 kSetdat = 365;
+static const uint16 kReel1 = 367;
+static const uint16 kReel2 = 369;
+static const uint16 kReel3 = 371;
+static const uint16 kRoomdesc = 373;
+static const uint16 kFreedesc = 375;
+static const uint16 kSetdesc = 377;
+static const uint16 kBlockdesc = 379;
+static const uint16 kSetframes = 381;
+static const uint16 kFreeframes = 383;
+static const uint16 kPeople = 385;
+static const uint16 kReels = 387;
+static const uint16 kCommandtext = 389;
+static const uint16 kPuzzletext = 391;
+static const uint16 kTraveltext = 393;
+static const uint16 kTempgraphics = 395;
+static const uint16 kTempgraphics2 = 397;
+static const uint16 kTempgraphics3 = 399;
+static const uint16 kTempsprites = 401;
+static const uint16 kTextfile1 = 403;
+static const uint16 kTextfile2 = 405;
+static const uint16 kTextfile3 = 407;
+static const uint16 kBlinkframe = 409;
+static const uint16 kBlinkcount = 410;
+static const uint16 kReasseschanges = 411;
+static const uint16 kPointerspath = 412;
+static const uint16 kManspath = 413;
+static const uint16 kPointerfirstpath = 414;
+static const uint16 kFinaldest = 415;
+static const uint16 kDestination = 416;
+static const uint16 kLinestartx = 417;
+static const uint16 kLinestarty = 419;
+static const uint16 kLineendx = 421;
+static const uint16 kLineendy = 423;
+static const uint16 kLinepointer = 425;
+static const uint16 kLinedirection = 426;
+static const uint16 kLinelength = 427;
+static const uint16 kCh0blockstocopy = 428;
+static const uint16 kCh0playing = 430;
+static const uint16 kCh0repeat = 431;
+static const uint16 kCh1playing = 432;
+static const uint16 kCh1blockstocopy = 433;
+static const uint16 kSoundbufferwrite = 435;
+static const uint16 kCurrentsample = 437;
+static const uint16 kRoomssample = 438;
+static const uint16 kBasicsample = 439;
+static const uint16 kCurrentfile = 586;
+static const uint16 kRoomscango = 661;
+static const uint16 kRoompics = 677;
+static const uint16 kOplist = 692;
+static const uint16 kInputline = 695;
+static const uint16 kPresslist = 823;
+static const uint16 kQuitrequested = 829;
+static const uint16 kSubtitles = 830;
+static const uint16 kForeignrelease = 831;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -375,13 +373,13 @@ static const uint16 kPlayback = (0);
 static const uint16 kMap = (0);
 static const uint16 kSettextdat = (0);
 static const uint16 kSpanish = (0);
-static const uint16 kFramedata = (0);
 static const uint16 kRecording = (0);
 static const uint16 kFlags = (0);
 static const uint16 kGerman = (0);
 static const uint16 kTextunder = (0);
 static const uint16 kPathdata = (0);
 static const uint16 kDemo = (0);
+static const uint16 kFramedata = (0);
 static const uint16 kExframedata = (0);
 static const uint16 kIntextdat = (0);
 static const uint16 kFreetextdat = (0);
-- 
cgit v1.2.3


From 25b99c448d63da48b639834d41146d2f30a11e49 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 20:17:55 +0200
Subject: DREAMWEB: Rewrite signOn into C++, and remove the users and passwords
 from the data blob

Note that the string processing logic in signOn is a bit different from
the original, but the end result is the same (with cleaner code)
---
 engines/dreamweb/dreamgen.cpp | 183 ++++++++----------------------------------
 engines/dreamweb/dreamgen.h   |  24 +++---
 engines/dreamweb/monitor.cpp  |  97 ++++++++++++++++------
 engines/dreamweb/stubs.h      |   1 +
 4 files changed, 119 insertions(+), 186 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 644187c558..5be71266cd 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -1773,14 +1773,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 661;
+	si = 555;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 677;
+	si = 571;
 	_add(si, ax);
 	ax = pop();
 }
@@ -1832,7 +1832,7 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 661);
+	_add(bx, 555);
 	es.byte(bx) = 0;
 }
 
@@ -1852,7 +1852,7 @@ dirroot:
 	si = offset_rootdir;
 	_inc(si);
 	es = cs;
-	di = 586;
+	di = 480;
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
@@ -1885,107 +1885,6 @@ directloop1:
 	goto directloop1;
 }
 
-void DreamGenContext::signOn() {
-	STACK_CHECK;
-	parser();
-	_inc(di);
-	ds = cs;
-	si = offset_keys;
-	cx = 4;
-signonloop:
-	push(cx);
-	push(si);
-	push(di);
-	_add(si, 14);
-	cx = 11;
-signonloop2:
-	_lodsb();
-	_cmp(al, 32);
-	if (flags.z())
-		goto foundsign;
-	makeCaps();
-	ah = es.byte(di);
-	_inc(di);
-	_cmp(al, ah);
-	if (!flags.z())
-		goto nomatch;
-	if (--cx)
-		goto signonloop2;
-nomatch:
-	di = pop();
-	si = pop();
-	cx = pop();
-	_add(si, 26);
-	if (--cx)
-		goto signonloop;
-	al = 13;
-	monMessage();
-	return;
-foundsign:
-	di = pop();
-	si = pop();
-	cx = pop();
-	bx = si;
-	es = ds;
-	_cmp(es.byte(bx), 0);
-	if (flags.z())
-		goto notyetassigned;
-	al = 17;
-	monMessage();
-	return;
-notyetassigned:
-	push(es);
-	push(bx);
-	scrollMonitor();
-	al = 15;
-	monMessage();
-	di = data.word(kMonadx);
-	bx = data.word(kMonady);
-	push(di);
-	push(bx);
-	input();
-	bx = pop();
-	di = pop();
-	data.word(kMonadx) = di;
-	data.word(kMonady) = bx;
-	bx = pop();
-	es = pop();
-	push(es);
-	push(bx);
-	_add(bx, 2);
-	ds = cs;
-	si = 695;
-checkpass:
-	_lodsw();
-	ah = es.byte(bx);
-	_inc(bx);
-	_cmp(ah, 32);
-	if (flags.z())
-		goto passpassed;
-	_cmp(al, ah);
-	if (flags.z())
-		goto checkpass;
-	bx = pop();
-	es = pop();
-	scrollMonitor();
-	al = 16;
-	monMessage();
-	return;
-passpassed:
-	al = 14;
-	monMessage();
-	bx = pop();
-	es = pop();
-	push(es);
-	push(bx);
-	_add(bx, 14);
-	monPrint();
-	scrollMonitor();
-	bx = pop();
-	es = pop();
-	es.byte(bx) = 1;
-}
-
 void DreamGenContext::read() {
 	STACK_CHECK;
 	cx = 40;
@@ -1998,7 +1897,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 586;
+	di = 480;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -2128,7 +2027,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 586+1;
+	di = 480+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -2210,7 +2109,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 695;
+	si = 589;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -2393,55 +2292,41 @@ void DreamGenContext::__start() {
 		//0x01a0: .... .... .... ....
 		0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 
 		//0x01b0: .... ...D REAM WEB.
-		0x56, 0x39, 0x39, 0x00, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 
-		//0x01c0: V99. ..PU BLIC     
-		0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 
-		//0x01d0:   PU BLIC       ...
-		0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 
-		//0x01e0: BLAC KDRA GON  RYAN
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 
-		//0x01f0:         . ..HE NDRI
-		0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0200: X      LO UIS      
-		0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 
-		//0x0210:  ... SEPT IMUS     
-		0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 
-		//0x0220: BECK ETT     . ..  
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 
-		//0x0230:              . "ROO
-		0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0240: T          ."      
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 
-		//0x0250:         . .... $...
-		0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 
-		//0x0260: .... .... .... ....
-		0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0270: .... .D:. .... ....
+		0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x01c0: V99.               
+		0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
+		//0x01d0:  ."R OOT          .
+		0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 
+		//0x01e0: "               ...
+		0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+		//0x01f0: ..$. .... .... ....
+		0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 
+		//0x0200: .... .... ...D :...
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0280: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0290: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 
-		//0x02a0: .... .... .... ....
-		0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x02b0: .... .... .... ....
+		//0x0210: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 
+		//0x0220: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 
+		//0x0230: .... .... .... ....
+		0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0240: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x02c0: .... .... .... ....
+		//0x0250: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x02d0: .... .... .... ....
+		//0x0260: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x02e0: .... .... .... ....
+		//0x0270: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x02f0: .... .... .... ....
+		//0x0280: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0300: .... .... .... ....
+		//0x0290: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0310: .... .... .... ....
+		//0x02a0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0320: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
-		//0x0330: .... .... .... ....
-		};
+		//0x02b0: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
+		//0x02c0: .... .... .... ....
+		0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 6e06941d18..9b5665c0f3 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,9 +32,8 @@
 
 namespace DreamGen {
 
-static const uint16 offset_rootdir = 0x023c;
-static const uint16 offset_operand1 = 0x022e;
-static const uint16 offset_keys = 0x01c4;
+static const uint16 offset_operand1 = 0x01c4;
+static const uint16 offset_rootdir = 0x01d2;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -356,15 +355,15 @@ static const uint16 kSoundbufferwrite = 435;
 static const uint16 kCurrentsample = 437;
 static const uint16 kRoomssample = 438;
 static const uint16 kBasicsample = 439;
-static const uint16 kCurrentfile = 586;
-static const uint16 kRoomscango = 661;
-static const uint16 kRoompics = 677;
-static const uint16 kOplist = 692;
-static const uint16 kInputline = 695;
-static const uint16 kPresslist = 823;
-static const uint16 kQuitrequested = 829;
-static const uint16 kSubtitles = 830;
-static const uint16 kForeignrelease = 831;
+static const uint16 kCurrentfile = 480;
+static const uint16 kRoomscango = 555;
+static const uint16 kRoompics = 571;
+static const uint16 kOplist = 586;
+static const uint16 kInputline = 589;
+static const uint16 kPresslist = 717;
+static const uint16 kQuitrequested = 723;
+static const uint16 kSubtitles = 724;
+static const uint16 kForeignrelease = 725;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -499,7 +498,6 @@ public:
 	void getEitherAd();
 	void dropObject();
 	void useOpened();
-	void signOn();
 	void locationPic();
 	void swapWithOpen();
 	void dreamweb();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index dd94633105..26caeb29ec 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -25,33 +25,28 @@
 namespace DreamGen {
 
 struct MonitorKeyEntry {
-	uint8 keyHeld;
-	uint8 b1;	// unused, for alignment
-	char  userpass[24];
-	//char  password[12];	// for the new monitor key list below
-	//char  username[12];	// for the new monitor key list below
+	uint8 keyAssigned;
+	char  username[12];
+	char  password[12];
 };
 
-#if 0
 // New monitor key list
 static MonitorKeyEntry monitorKeyEntries[4] = {
-	{ 1, "PUBLIC     ", "PUBLIC     " },
-	{ 0, "BLACKDRAGON", "RYAN       " },
-	{ 0, "HENDRIX    ", "LOUIS      " },
-	{ 0, "SEPTIMUS   ", "BECKETT    " }
+	{ 1, "PUBLIC",  "PUBLIC"      },
+	{ 0, "RYAN",    "BLACKDRAGON" },
+	{ 0, "LOUIS",   "HENDRIX"     },
+	{ 0, "BECKETT", "SEPTIMUS"    }
 };
-#endif
 
 void DreamGenContext::useMon() {
 	data.byte(kLasttrigger) = 0;
 	memset(data.ptr(kCurrentfile+1, 0), ' ', 12);
 	memset(data.ptr(offset_operand1+1, 0), ' ', 12);
 
-	MonitorKeyEntry *monitorKeyEntries = (MonitorKeyEntry *)data.ptr(offset_keys, 0);
-	monitorKeyEntries[0].keyHeld = 1;
-	monitorKeyEntries[1].keyHeld = 0;
-	monitorKeyEntries[2].keyHeld = 0;
-	monitorKeyEntries[3].keyHeld = 0;
+	monitorKeyEntries[0].keyAssigned = 1;
+	monitorKeyEntries[1].keyAssigned = 0;
+	monitorKeyEntries[2].keyAssigned = 0;
+	monitorKeyEntries[3].keyAssigned = 0;
 
 	createPanel();
 	showPanel();
@@ -434,12 +429,9 @@ void DreamGenContext::showKeys() {
 	scrollMonitor();
 	monMessage(18);
 
-	MonitorKeyEntry *monitorKeyEntries = (MonitorKeyEntry *)data.ptr(offset_keys, 0);
-
 	for (int i = 0; i < 4; i++) {
-		if (monitorKeyEntries[i].keyHeld)
-			monPrint(monitorKeyEntries[i].userpass + 12);	// username
-			//monPrint(monitorKeyEntries[i].username);
+		if (monitorKeyEntries[i].keyAssigned)
+			monPrint(monitorKeyEntries[i].username);
 	}
 
 	scrollMonitor();
@@ -447,20 +439,77 @@ void DreamGenContext::showKeys() {
 
 void DreamGenContext::getKeyAndLogo() {
 	byte newLogo = es.byte(bx + 1) - 48;
-	MonitorKeyEntry *monitorKeyEntries = (MonitorKeyEntry *)data.ptr(offset_keys, 0);
 	byte keyNum = es.byte(bx + 1 + 2) - 48;
 	bx += 1 + 2 + 1;
 
-	if (monitorKeyEntries[keyNum].keyHeld == 1) {
+	if (monitorKeyEntries[keyNum].keyAssigned == 1) {
 		// Key OK
 		data.byte(kLogonum) = newLogo;
 		al = 0;
 	} else {
 		monMessage(12);	// "Access denied, key required -"
-		monPrint(monitorKeyEntries[keyNum].userpass + 12);	// username
+		monPrint(monitorKeyEntries[keyNum].username);
 		scrollMonitor();
 		al = 1;
 	}
 }
 
+void DreamGenContext::signOn() {
+	parser();
+
+	int8 foundIndex = -1;
+	Common::String inputLine = (const char *)data.ptr(offset_operand1 + 1, 0);
+	inputLine.trim();
+
+	for (byte i = 0; i < 4; i++) {
+		if (inputLine.equalsIgnoreCase(monitorKeyEntries[i].username)) {
+			// Check if the key has already been assigned
+			if (monitorKeyEntries[i].keyAssigned) {
+				monMessage(17);
+				return;
+			} else {
+				foundIndex = i;
+				break;
+			}
+		}
+	}
+
+	if (foundIndex == -1) {
+		monMessage(13);
+		return;
+	}
+
+	monMessage(15);
+
+	uint16 prevX = data.word(kMonadx);
+	uint16 prevY = data.word(kMonady);
+	input();	// password input
+	data.word(kMonadx) = prevX;
+	data.word(kMonady) = prevY;
+
+	inputLine = (const char *)data.ptr(kInputline, 0);
+	inputLine.toUppercase();
+
+	// The entered line has zeroes in-between each character
+	uint32 len = strlen(monitorKeyEntries[foundIndex].password);
+	bool found = true;
+
+	for (uint32 i = 0; i < len; i++) {
+		if (monitorKeyEntries[foundIndex].password[i] != inputLine[i * 2]) {
+			found = false;
+			break;
+		}
+	}
+
+	if (!found) {
+		scrollMonitor();
+		monMessage(16);
+	} else {
+		monMessage(14);
+		monPrint(monitorKeyEntries[foundIndex].username);
+		scrollMonitor();
+		monitorKeyEntries[foundIndex].keyAssigned = 1;
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 3f38ad4beb..bb86175b0d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -373,5 +373,6 @@
 	void deleteExText(uint8 textNum) {
 		DreamBase::deleteExText(textNum);
 	}
+	void signOn();
 
 #endif
-- 
cgit v1.2.3


From 5843fc11579150313b90ead919a8805081839f06 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 20:22:03 +0200
Subject: DREAMWEB: 'nextcolon' is unused

---
 engines/dreamweb/dreamgen.cpp | 10 ----------
 engines/dreamweb/dreamgen.h   |  1 -
 2 files changed, 11 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 5be71266cd..f97eba4166 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2137,16 +2137,6 @@ finishpars:
 	di = offset_operand1;
 }
 
-void DreamGenContext::nextColon() {
-	STACK_CHECK;
-lookcolon:
-	al = es.byte(si);
-	_inc(si);
-	_cmp(al, ':');
-	if (!flags.z())
-		goto lookcolon;
-}
-
 void DreamGenContext::findPathOfPoint() {
 	STACK_CHECK;
 	push(ax);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 9b5665c0f3..fb965156f3 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -488,7 +488,6 @@ public:
 	void purgeAnItem();
 	void purgeALocation();
 	void getSetAd();
-	void nextColon();
 	void findOpenPos();
 	void searchForSame();
 	void rollEm();
-- 
cgit v1.2.3


From 0cd53d5d3e6324869adf145047c65d2ef93e8b7f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 18 Dec 2011 21:07:27 +0200
Subject: DREAMWEB: Port 'lookatplace' to C++

---
 engines/dreamweb/dreamgen.cpp | 71 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.cpp    | 32 +++++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 33 insertions(+), 72 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index f97eba4166..be1bfa6d96 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -1647,77 +1647,6 @@ endheartalk:
 	data.byte(kPointermode) = 0;
 }
 
-void DreamGenContext::lookAtPlace() {
-	STACK_CHECK;
-	_cmp(data.byte(kCommandtype), 224);
-	if (flags.z())
-		goto alreadyinfo;
-	data.byte(kCommandtype) = 224;
-	al = 27;
-	commandOnly();
-alreadyinfo:
-	ax = data.word(kMousebutton);
-	_and(ax, 1);
-	if (flags.z())
-		return /* (noinfo) */;
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (noinfo) */;
-	bl = data.byte(kDestpos);
-	_cmp(bl, 15);
-	if (!flags.c())
-		return /* (noinfo) */;
-	push(bx);
-	delPointer();
-	delTextLine();
-	getUnderCentre();
-	ds = data.word(kTempgraphics3);
-	al = 0;
-	ah = 0;
-	di = 60;
-	bx = 72;
-	showFrame();
-	al = 4;
-	ah = 0;
-	di = 60;
-	bx = 72+55;
-	showFrame();
-	_cmp(data.byte(kForeignrelease),  0);
-	if (flags.z())
-		goto _tmp1;
-	al = 4;
-	ah = 0;
-	di = 60;
-	bx = 72+55+21;
-	showFrame();
-_tmp1:
-	bx = pop();
-	bh = 0;
-	_add(bx, bx);
-	es = data.word(kTraveltext);
-	si = es.word(bx);
-	_add(si, (66*2));
-	findNextColon();
-	di = 63;
-	bx = 84;
-	_cmp(data.byte(kForeignrelease),  0);
-	if (flags.z())
-		goto _tmp2;
-	bx = 84+4;
-_tmp2:
-	dl = 191;
-	al = 0;
-	ah = 0;
-	printDirect();
-	workToScreenM();
-	cx = 500;
-	hangOnP();
-	data.byte(kPointermode) = 0;
-	data.byte(kPointerframe) = 0;
-	putUnderCentre();
-	workToScreenM();
-}
-
 void DreamGenContext::locationPic() {
 	STACK_CHECK;
 	getDestInfo();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index fb965156f3..77e3abdcc9 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -491,7 +491,6 @@ public:
 	void findOpenPos();
 	void searchForSame();
 	void rollEm();
-	void lookAtPlace();
 	void findAllOpen();
 	void fillOpen();
 	void getEitherAd();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 98d961ef2b..6989a57a93 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4584,4 +4584,36 @@ void DreamGenContext::showDiaryKeys() {
 		showDiaryPage();
 }
 
+void DreamGenContext::lookAtPlace() {
+	if (data.byte(kCommandtype) != 224) {
+		data.byte(kCommandtype) = 224;
+		commandOnly(27);
+	}
+
+	if (!(data.word(kMousebutton) & 1) ||
+		data.word(kMousebutton) == data.word(kOldbutton) ||
+		data.byte(kDestpos) >= 15)
+		return; // noinfo
+
+	delPointer();
+	delTextLine();
+	getUnderCentre();
+	showFrame(tempGraphics3(), 60, 72, 0, 0);
+	showFrame(tempGraphics3(), 60, 72 + 55, 4, 0);
+	if (data.byte(kForeignrelease))
+		showFrame(tempGraphics3(), 60, 72+55+21, 4, 0);
+
+	uint16 offset = kTextstart + getSegment(data.word(kTraveltext)).word(data.byte(kDestpos) * 2);
+	const uint8 *string = getSegment(data.word(kTraveltext)).ptr(offset, 0);
+	findNextColon(&string);
+	uint16 y = (data.byte(kForeignrelease)) ? 84 + 4 : 84;
+	printDirect(&string, 63, &y, 191, 191 & 1);
+	workToScreenM();
+	hangOnP(500);
+	data.byte(kPointermode) = 0;
+	data.byte(kPointerframe) = 0;
+	putUnderCentre();
+	workToScreenM();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index bb86175b0d..3ab7cfbb11 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -374,5 +374,6 @@
 		DreamBase::deleteExText(textNum);
 	}
 	void signOn();
+	void lookAtPlace();
 
 #endif
-- 
cgit v1.2.3


From 14ccd4f1f089e11fa03044100b67f3a9380701fb Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 19 Dec 2011 00:09:48 +0100
Subject: TSAGE: R2R - Implement scene 3100

---
 engines/tsage/module.mk                          |   1 +
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   2 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 206 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h    |  73 ++++++++
 engines/tsage/ringworld2/ringworld2_speakers.cpp |  13 ++
 engines/tsage/ringworld2/ringworld2_speakers.h   |   7 +
 6 files changed, 302 insertions(+)
 create mode 100644 engines/tsage/ringworld2/ringworld2_scenes3.cpp
 create mode 100644 engines/tsage/ringworld2/ringworld2_scenes3.h

(limited to 'engines')

diff --git a/engines/tsage/module.mk b/engines/tsage/module.mk
index 44f808ba8e..95a1a583dd 100644
--- a/engines/tsage/module.mk
+++ b/engines/tsage/module.mk
@@ -39,6 +39,7 @@ MODULE_OBJS := \
 	ringworld2/ringworld2_logic.o \
 	ringworld2/ringworld2_scenes0.o \
 	ringworld2/ringworld2_scenes2.o \
+	ringworld2/ringworld2_scenes3.o \
 	ringworld2/ringworld2_speakers.o \
 	saveload.o \
 	scenes.o \
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index ccedb3a18a..689b2b5f0f 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -28,6 +28,7 @@
 #include "tsage/ringworld2/ringworld2_dialogs.h"
 #include "tsage/ringworld2/ringworld2_scenes0.h"
 #include "tsage/ringworld2/ringworld2_scenes2.h"
+#include "tsage/ringworld2/ringworld2_scenes3.h"
 
 namespace TsAGE {
 
@@ -169,6 +170,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	/* Scene group #3 */
 	//
 	case 3100:
+		return new Scene3100();
 	case 3125:
 	case 3150:
 	case 3175:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
new file mode 100644
index 0000000000..22e58b6d2b
--- /dev/null
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -0,0 +1,206 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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/scenes.h"
+#include "tsage/tsage.h"
+#include "tsage/staticres.h"
+#include "tsage/ringworld2/ringworld2_scenes3.h"
+
+namespace TsAGE {
+
+namespace Ringworld2 {
+
+/*--------------------------------------------------------------------------
+ * Scene 3100 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene3100::Scene3100() {
+	_field412 = 0;
+}
+
+void Scene3100::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+}
+
+bool Scene3100::Actor6::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_TALK)
+		return SceneActor::startAction(action, event);
+
+	Scene3100 *scene = (Scene3100 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 10;
+	R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+	scene->_stripManager.start(606, scene);
+	return true;
+}
+
+void Scene3100::postInit(SceneObjectList *OwnerList) {
+	if (R2_GLOBALS._sceneManager._previousScene == 1000) {
+		if (R2_GLOBALS._player._oldCharacterScene[1] == 3100) {
+			loadScene(3101);
+			R2_GLOBALS._v58CE2 = 0;
+		} else {
+			loadScene(3100);
+			g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
+		}
+	} else {
+		loadScene(3100);
+	}
+	// Original was doing it twice in a row. Skipped.
+
+	if (R2_GLOBALS._sceneManager._previousScene == 3255)
+		R2_GLOBALS._v58CE2 = 0;
+
+	SceneExt::postInit();
+	_stripManager.addSpeaker(&_guardSpeaker);
+
+	if (R2_GLOBALS._sceneManager._previousScene == -1)
+		R2_GLOBALS._sceneManager._previousScene = 1000;
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player._characterIndex = R2_QUINN;
+	R2_GLOBALS._player.disableControl();
+
+	_actor1.postInit();
+	_item2.setDetails(Rect(212, 97, 320, 114), 3100, 3, -1, -1, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 480, 200), 3100, 0, -1, -1, 1, NULL);
+	_field412 = 0;
+
+	if (R2_GLOBALS._sceneManager._previousScene == 1000) {
+		if (R2_GLOBALS._player._oldCharacterScene[1] == 3100) {
+			_sceneMode = 3102;
+			_actor3.postInit();
+			_actor4.postInit();
+			_actor5.postInit();
+			R2_GLOBALS._sound1.play(274);
+			_sound1.fadeSound(130);
+			setAction(&_sequenceManager, this, 3102, &_actor1, &R2_GLOBALS._player, &_actor3, &_actor4, &_actor5, NULL);
+		} else {
+			_actor6.postInit();
+			_actor6.setup(3110, 5, 1);
+			_actor6.changeZoom(50);
+			_actor6.setPosition(Common::Point(10, 149));
+			_actor6.setDetails(3100, 6, -1, -1, 2, NULL);
+
+			_actor4.postInit();
+			_actor4.setup(3103, 1, 1);
+			_actor4.setPosition(Common::Point(278, 113));
+			_actor4.setDetails(3100, 9, -1, -1, 2, NULL);
+			_actor4.animate(ANIM_MODE_2, NULL);
+
+			_field412 = 1;
+			_actor1.setDetails(3100, 3, -1, -1, 2, NULL);
+			R2_GLOBALS._sound1.play(243);
+			R2_GLOBALS._sound2.play(130);
+			_sceneMode = 3100;
+
+			setAction(&_sequenceManager, this, 3100, &R2_GLOBALS._player, &_actor1, NULL);
+		}
+	} else if (R2_GLOBALS._sceneManager._previousScene == 3255) {
+		_sceneMode = 3101;
+		_actor2.postInit();
+		_actor3.postInit();
+		_field412 = 1;
+
+		setAction(&_sequenceManager, this, 3101, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL);
+	} else {
+		_actor6.postInit();
+		_actor6.setup(3110, 5, 1);
+		_actor6.changeZoom(50);
+		_actor6.setPosition(Common::Point(10, 149));
+		_actor6.setDetails(3100, 6, -1, -1, 2, NULL);
+		
+		_actor4.postInit();
+		_actor4.setup(3103, 1, 1);
+		_actor4.setPosition(Common::Point(278, 113));
+		_actor4.setDetails(3100, 9, -1, -1, 2, NULL);
+		_actor4.animate(ANIM_MODE_2, NULL);
+
+		_actor1.postInit();
+		_actor1.setup(3104, 4, 1);
+		_actor1.setPosition(Common::Point(143, 104));
+		_actor1.setDetails(3100, 3, -1, -1, 2, NULL);
+
+		R2_GLOBALS._player.setup(3110, 3, 1);
+		R2_GLOBALS._player.changeZoom(50);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setPosition(Common::Point(160, 150));
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+
+		R2_GLOBALS._sound1.play(243);
+	}
+	
+	R2_GLOBALS._player._oldCharacterScene[1] = 3100;
+}
+
+void Scene3100::remove() {
+	R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	R2_GLOBALS._sound2.fadeOut2(NULL);
+	_sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene3100::signal() {
+	switch (_sceneMode) {
+	case 10:
+		warning("TODO: Unknown cursor used (6/-6)");
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 3100:
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+		R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	case 3101:
+		R2_GLOBALS._sceneManager.changeScene(1000);
+		break;
+	case 3102:
+		R2_GLOBALS._player._oldCharacterScene[1] = 1000;
+		R2_GLOBALS._sceneManager.changeScene(1000);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	}
+}
+
+void Scene3100::dispatch() {
+	if ((_sceneMode == 3100) && (_field412 != 0) && (R2_GLOBALS._player._position.y == 104)) {
+		_field412 = 0;
+		R2_GLOBALS._sound2.fadeOut2(NULL);
+	}
+
+	if ((_sceneMode == 3101) && (_field412 != 0) && (R2_GLOBALS._player._position.y < 104)) {
+		_field412 = 0;
+		_sound1.fadeSound(130);
+	}
+
+	Scene::dispatch();
+}
+
+} // End of namespace Ringworld2
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
new file mode 100644
index 0000000000..fe00e2cf09
--- /dev/null
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.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_RINGWORLD2_SCENES3_H
+#define TSAGE_RINGWORLD2_SCENES3_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 {
+
+namespace Ringworld2 {
+
+using namespace TsAGE;
+
+
+class Scene3100 : public SceneExt {
+	class Actor6 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+
+	int _field412;
+	SpeakerGuard3100 _guardSpeaker;
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	Actor6 _actor6;
+	ASoundExt _sound1;
+	SequenceManager _sequenceManager;
+
+	Scene3100();
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void dispatch();
+	virtual void synchronize(Serializer &s);
+};
+
+} // End of namespace Ringworld2
+} // End of namespace TsAGE
+
+#endif
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 35de45d8e6..3ec1df41d0 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1039,5 +1039,18 @@ void SpeakerGuard2800::proc15() {
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
+
+SpeakerGuard3100::SpeakerGuard3100() {
+	_speakerName = "GUARD";
+	_color1 = 5;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 31eda2431c..1d99a54e7c 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -261,6 +261,13 @@ public:
 	virtual Common::String getClassName() { return "SpeakerGuard2800"; }
 	virtual void proc15();
 };
+
+class SpeakerGuard3100 : public VisualSpeaker {
+public:
+	SpeakerGuard3100();
+
+	virtual Common::String getClassName() { return "SpeakerGuard3100"; }
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 9916d2e99ced884a4f79277dc17367cb1a4b7375 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 19 Dec 2011 01:10:48 +0100
Subject: CINE: Add some comments to the MT-32 instrument code.

---
 engines/cine/sound.cpp | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

(limited to 'engines')

diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp
index 0328466e76..b2e992e8f6 100644
--- a/engines/cine/sound.cpp
+++ b/engines/cine/sound.cpp
@@ -205,7 +205,7 @@ private:
 	Common::Mutex _mutex;
 
 	void writeInstrument(int offset, const byte *data, int size);
-	void selectInstrument(int channel, int unk, int instrument, int volume);
+	void selectInstrument(int channel, int timbreGroup, int timbreNumber, int volume);
 };
 
 class PCSoundFxPlayer {
@@ -647,8 +647,11 @@ void MidiSoundDriverH32::setupChannel(int channel, const byte *data, int instrum
 
 	if (!data)
 		selectInstrument(channel, 0, 0, volume);
+	// In case the instrument is a builtin instrument select it directly.
 	else if (data[0] < 0x80)
 		selectInstrument(channel, data[0] / 0x40, data[0] % 0x40, volume);
+	// In case we use a custom instrument we need to specify the timbre group
+	// 2, which means it's a timbre from the timbre memory area.
 	else
 		selectInstrument(channel, 2, instrument, volume);
 }
@@ -690,6 +693,9 @@ void MidiSoundDriverH32::playSample(const byte *data, int size, int channel, int
 void MidiSoundDriverH32::notifyInstrumentLoad(const byte *data, int size, int channel) {
 	Common::StackLock lock(_mutex);
 
+	// In case we specify a standard instrument or standard rhythm instrument
+	// do not do anything here. It might be noteworthy that the instrument
+	// selection client code does not support rhythm instruments!
 	if (data[0] < 0x80 || data[0] > 0xC0)
 		return;
 
@@ -717,18 +723,29 @@ void MidiSoundDriverH32::writeInstrument(int offset, const byte *data, int size)
 	_output->sysEx(sysEx, copySize + 8);
 }
 
-void MidiSoundDriverH32::selectInstrument(int channel, int unk, int instrument, int volume) {
-	const int offset = channel * 16 + 0x30000;
+void MidiSoundDriverH32::selectInstrument(int channel, int timbreGroup, int timbreNumber, int volume) {
+	const int offset = channel * 16 + 0x30000; // 0x30000 is the start of the patch temp area
 
 	byte sysEx[24] = {
 		0x41, 0x10, 0x16, 0x12,
 		0x00, 0x00, 0x00,       // offset
-		0x00,                   // unk
-		0x00,                   // instrument
-		0x18, 0x32, 0x0C, 0x03, 0x01, 0x00,
-		0x00,                   // volume
-		0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00                    // checksum
+		0x00, // Timbre group   _ timbreGroup * 64 + timbreNumber should be the
+		0x00, // Timbre number /  MT-32 instrument in case timbreGroup is 0 or 1.
+		0x18, // Key shift (= 0) 
+		0x32, // Fine tune (= 0)
+		0x0C, // Bender Range
+		0x03, // Assign Mode
+		0x01, // Reverb Switch (= enabled)
+		0x00, // dummy
+		0x00, // Output level 
+		0x07, // Panpot (= balanced)
+		0x00, // dummy
+		0x00, // dummy
+		0x00, // dummy
+		0x00, // dummy
+		0x00, // dummy
+		0x00, // dummy
+		0x00  // checksum
 	};
 
 
@@ -736,9 +753,8 @@ void MidiSoundDriverH32::selectInstrument(int channel, int unk, int instrument,
 	sysEx[5] = (offset >>  8) & 0xFF;
 	sysEx[6] = (offset >>  0) & 0xFF;
 
-	sysEx[7] = unk;
-
-	sysEx[8] = instrument;
+	sysEx[7] = timbreGroup;
+	sysEx[8] = timbreNumber;
 
 	sysEx[15] = volume;
 
-- 
cgit v1.2.3


From f0eee81d327957cddb85c5a1ffe7a308a377f636 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 19 Dec 2011 03:23:16 +0200
Subject: DREAMWEB: Port 'intoinv', 'outofinv' to C++

---
 engines/dreamweb/dreamgen.cpp | 112 ------------------------------------------
 engines/dreamweb/dreamgen.h   |   2 -
 engines/dreamweb/object.cpp   |  82 +++++++++++++++++++++++++++++++
 engines/dreamweb/stubs.h      |   2 +
 4 files changed, 84 insertions(+), 114 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index be1bfa6d96..a0ce29d416 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -691,118 +691,6 @@ actuallyswap:
 	delPointer();
 }
 
-void DreamGenContext::inToInv() {
-	STACK_CHECK;
-	_cmp(data.byte(kPickup), 0);
-	if (!flags.z())
-		goto notout;
-	outOfInv();
-	return;
-notout:
-	findInvPos();
-	ax = es.word(bx);
-	_cmp(al, 255);
-	if (flags.z())
-		goto canplace1;
-	swapWithInv();
-	return;
-canplace1:
-	al = data.byte(kItemframe);
-	ah = data.byte(kObjecttype);
-	_cmp(ax, data.word(kOldsubject));
-	if (!flags.z())
-		goto difsub1;
-	_cmp(data.byte(kCommandtype), 220);
-	if (flags.z())
-		goto alreadyplce;
-	data.byte(kCommandtype) = 220;
-difsub1:
-	data.word(kOldsubject) = ax;
-	bx = ax;
-	al = 35;
-	commandWithOb();
-alreadyplce:
-	ax = data.word(kMousebutton);
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (notletgo2) */;
-	_and(ax, 1);
-	if (!flags.z())
-		goto doplace;
-	return;
-doplace:
-	delPointer();
-	al = data.byte(kItemframe);
-	getExAd();
-	es.byte(bx+2) = 4;
-	es.byte(bx+3) = 255;
-	al = data.byte(kLastinvpos);
-	es.byte(bx+4) = al;
-	data.byte(kPickup) = 0;
-	fillRyan();
-	readMouse();
-	showPointer();
-	outOfInv();
-	workToScreen();
-	delPointer();
-}
-
-void DreamGenContext::outOfInv() {
-	STACK_CHECK;
-	findInvPos();
-	ax = es.word(bx);
-	_cmp(al, 255);
-	if (!flags.z())
-		goto canpick2;
-	blank();
-	return;
-canpick2:
-	bx = data.word(kMousebutton);
-	_cmp(bx, 2);
-	if (!flags.z())
-		goto canpick2a;
-	reExFromInv();
-	return;
-canpick2a:
-	_cmp(ax, data.word(kOldsubject));
-	if (!flags.z())
-		goto difsub3;
-	_cmp(data.byte(kCommandtype), 221);
-	if (flags.z())
-		goto alreadygrab;
-	data.byte(kCommandtype) = 221;
-difsub3:
-	data.word(kOldsubject) = ax;
-	bx = ax;
-	al = 36;
-	commandWithOb();
-alreadygrab:
-	ax = data.word(kMousebutton);
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (notletgo) */;
-	_and(ax, 1);
-	if (!flags.z())
-		goto dograb;
-	return;
-dograb:
-	delPointer();
-	data.byte(kPickup) = 1;
-	findInvPos();
-	ax = es.word(bx);
-	data.byte(kItemframe) = al;
-	data.byte(kObjecttype) = ah;
-	getExAd();
-	es.byte(bx+2) = 20;
-	es.byte(bx+3) = 255;
-	fillRyan();
-	readMouse();
-	showPointer();
-	inToInv();
-	workToScreen();
-	delPointer();
-}
-
 void DreamGenContext::getFreeAd() {
 	STACK_CHECK;
 	ah = 0;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 77e3abdcc9..b13d150ad4 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -477,13 +477,11 @@ public:
 	void startTalk();
 	void getAnyAd();
 	void reminders();
-	void inToInv();
 	void getFreeAd();
 	void dirFile();
 	void pickupConts();
 	void fadeUpMon();
 	void reExFromInv();
-	void outOfInv();
 	void transferMap();
 	void purgeAnItem();
 	void purgeALocation();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 384e001b5e..9fe94c4bd4 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -562,5 +562,87 @@ void DreamBase::removeObFromInv() {
 	deleteExObject(data.byte(kCommand));
 }
 
+void DreamGenContext::inToInv() {
+	if (!data.byte(kPickup)) {
+		outOfInv();
+		return;
+	}
+
+	findInvPos();
+	ax = es.word(bx);
+
+	if (al != 255) {
+		swapWithInv();
+		return;
+	}
+
+	al = data.byte(kItemframe);
+	ah = data.byte(kObjecttype);
+
+	if (ax == data.word(kOldsubject) && data.byte(kCommandtype) != 220)
+		data.byte(kCommandtype) = 220;
+
+	data.word(kOldsubject) = ax;
+	commandWithOb(35, data.byte(kObjecttype), data.byte(kItemframe));
+
+	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+		return; // notletgo2
+	
+	delPointer();
+	DynObject *object = getExAd(data.byte(kItemframe));
+	object->mapad[0] = 4;
+	object->mapad[1] = 255;
+	object->mapad[2] = data.byte(kLastinvpos);
+	data.byte(kPickup) = 0;
+	fillRyan();
+	readMouse();
+	showPointer();
+	outOfInv();
+	workToScreen();
+	delPointer();
+}
+
+void DreamGenContext::outOfInv() {
+	findInvPos();
+	ax = es.word(bx);
+
+	if (al == 255) {
+		blank();
+		return;
+	}
+
+	if (data.word(kMousebutton) == 2) {
+		reExFromInv();
+		return;
+	}
+
+	if (ax == data.word(kOldsubject) && data.byte(kCommandtype) != 221)
+		data.byte(kCommandtype) = 221;
+
+	data.word(kOldsubject) = ax;
+	commandWithOb(36, ah, al);
+
+	if (data.word(kMousebutton) == data.word(kOldbutton))
+		return; // notletgo
+
+	if (!(data.word(kMousebutton) & 1))
+		return;
+
+	delPointer();
+	data.byte(kPickup) = 1;
+	findInvPos();
+	ax = es.word(bx);
+	data.byte(kItemframe) = al;
+	data.byte(kObjecttype) = ah;
+	DynObject *object = getExAd(data.byte(kItemframe));
+	object->mapad[0] = 20;
+	object->mapad[1] = 255;
+	fillRyan();
+	readMouse();
+	showPointer();
+	inToInv();
+	workToScreen();
+	delPointer();
+}
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 3ab7cfbb11..1a76a785b8 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -375,5 +375,7 @@
 	}
 	void signOn();
 	void lookAtPlace();
+	void inToInv();
+	void outOfInv();
 
 #endif
-- 
cgit v1.2.3


From 7d580ee37e73673e15eaf9052e8491ec721a052d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 19 Dec 2011 22:28:25 +1100
Subject: TSAGE: Implemented R2R Scene 800 - Sickbay

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   3 +
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 284 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  49 ++++
 3 files changed, 336 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 689b2b5f0f..42f3b16d7f 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -76,7 +76,10 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 525:
 	case 600:
 	case 700:
+		error("Missing scene %d from group 0", sceneNumber);
 	case 800:
+		// Sick bay
+		return new Scene800();
 	case 825:
 		error("Missing scene %d from group 0", sceneNumber);
 	case 850:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 7a3b0cdd78..ceca8915d8 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -2900,6 +2900,290 @@ void Scene400::dispatch() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 800 - Sick Bay
+ *
+ *--------------------------------------------------------------------------*/
+
+bool Scene800::Button::startAction(CursorType action, Event &event) {
+	Scene800 *scene = (Scene800 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE) {
+		return NamedHotspot::startAction(action, event);
+	} else {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 802;
+		scene->setAction(&scene->_sequenceManager1, scene, 802, &R2_GLOBALS._player, &scene->_autodocCover, NULL);
+		return true;
+	}
+}
+
+bool Scene800::CableJunction::startAction(CursorType action, Event &event) {
+	Scene800 *scene = (Scene800 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != R2_OPTICAL_FIBRE) {
+		return NamedHotspot::startAction(action, event);
+	} else {
+		R2_GLOBALS._player.disableControl();
+		scene->_opticalFibre.postInit();
+		scene->_sceneMode = 803;
+
+		if (R2_INVENTORY.getObjectScene(R2_READER) == 800)
+			scene->setAction(&scene->_sequenceManager1, scene, 813, &R2_GLOBALS._player, &scene->_opticalFibre, &scene->_reader, NULL);
+		else
+			scene->setAction(&scene->_sequenceManager1, scene, 803, &R2_GLOBALS._player, &scene->_opticalFibre, NULL);
+
+		return true;
+	}
+}
+
+bool Scene800::DeviceSlot::startAction(CursorType action, Event &event) {
+	Scene800 *scene = (Scene800 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (R2_INVENTORY.getObjectScene(R2_READER) != 800)
+			break;
+
+		R2_GLOBALS._player.disableControl();
+		scene->_reader.postInit();
+
+		if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800)
+			scene->setAction(&scene->_sequenceManager1, scene, 814, &R2_GLOBALS._player, &scene->_reader, &scene->_opticalFibre, NULL);
+		else
+			scene->setAction(&scene->_sequenceManager1, scene, 804, &R2_GLOBALS._player, &scene->_reader, NULL);
+		return true;
+	default:
+		break;
+	}
+
+	return NamedHotspot::startAction(action, event);
+}
+
+/*--------------------------------------------------------------------------*/
+
+bool Scene800::Door::startAction(CursorType action, Event &event) {
+	Scene800 *scene = (Scene800 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 801;
+		scene->setAction(&scene->_sequenceManager1, scene, 801, &R2_GLOBALS._player, &scene->_door, NULL);
+		return true;
+	default:
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene800::Tray::startAction(CursorType action, Event &event) {
+	Scene800 *scene = (Scene800 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (!R2_GLOBALS.getFlag(10)) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 806;
+			scene->setAction(&scene->_sequenceManager1, scene, 806, &R2_GLOBALS._player, &scene->_tray, NULL);
+		} else if (R2_INVENTORY.getObjectScene(R2_OPTO_DISK) == 825) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 808;
+			scene->setAction(&scene->_sequenceManager1, scene, 808, &R2_GLOBALS._player, &scene->_tray, NULL);
+		} else {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 807;
+			scene->setAction(&scene->_sequenceManager1, scene, 807, &R2_GLOBALS._player, &scene->_tray, NULL);
+		}
+		return true;
+	default:
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene800::ComScanner::startAction(CursorType action, Event &event) {
+	Scene800 *scene = (Scene800 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (scene->_cabinet._frame == 1)
+			return false;
+
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 811;
+		scene->setAction(&scene->_sequenceManager1, scene, 811, &R2_GLOBALS._player, &scene->_comScanner, NULL);
+		return true;
+	case CURSOR_TALK:
+		SceneItem::display2(800, 35);
+		return true;
+	default:
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene800::Cabinet::startAction(CursorType action, Event &event) {
+	Scene800 *scene = (Scene800 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		R2_GLOBALS._player.disableControl();
+
+		if (scene->_cabinet._frame == 1) {
+			scene->_sceneMode = 810;
+			scene->setAction(&scene->_sequenceManager1, scene, 810, &R2_GLOBALS._player, &scene->_cabinet, NULL);
+			R2_GLOBALS.setFlag(56);
+		} else {
+			scene->_sceneMode = 812;
+			scene->setAction(&scene->_sequenceManager1, scene, 812, &R2_GLOBALS._player, &scene->_cabinet, NULL);
+			R2_GLOBALS.clearFlag(56);
+		}
+		return true;
+	default:
+		return SceneActor::startAction(action, event);
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+void Scene800::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(800);
+
+	_door.postInit();
+	_door.setVisage(800);
+	_door.setPosition(Common::Point(286, 108));
+	_door.fixPriority(50);
+	_door.setDetails(800, 3, -1, -1, 1, NULL);
+
+	_autodocCover.postInit();
+	_autodocCover.setup(800, 2, 1);
+	_autodocCover.setPosition(Common::Point(119, 161));
+	_autodocCover.setDetails(800, 6, 7, -1, 1, NULL);
+
+	if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) {
+		_opticalFibre.postInit();
+		if (R2_INVENTORY.getObjectScene(R2_READER) == 800)
+			_opticalFibre.setup(800, 4, 1);
+		else
+			_opticalFibre.setup(800, 7, 2);
+
+		_opticalFibre.setPosition(Common::Point(220, 124));
+		_opticalFibre.fixPriority(140);
+	}
+
+	if (R2_INVENTORY.getObjectScene(R2_READER) == 800) {
+		_reader.postInit();
+		
+		if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) {
+			_opticalFibre.setup(800, 4, 1);
+			_reader.hide();
+		} else {
+			_reader.setup(800, 7, 1);
+		}
+
+		_reader.setPosition(Common::Point(230, 120));
+		_reader.fixPriority(140);
+	}
+
+	_cabinet.postInit();
+	_cabinet.setup(801, 1, R2_GLOBALS.getFlag(56) ? 6 : 1);
+	_cabinet.setPosition(Common::Point(169, 79));
+	_cabinet.setDetails(800, 41, -1, -1, 1, NULL);
+
+	if (R2_INVENTORY.getObjectScene(R2_9) == 800) {
+		_comScanner.postInit();
+		_comScanner.setup(801, 2, 1);
+		_comScanner.setPosition(Common::Point(174, 73));
+		_comScanner.setDetails(800, 34, 35, -1, 1, NULL);
+	}
+
+	_tray.postInit();
+	_tray.setup(800, R2_INVENTORY.getObjectScene(R2_OPTO_DISK) == 825 ? 6 : 5, 1);
+	if (R2_GLOBALS.getFlag(10))
+		_tray.setFrame(5);
+	_tray.setPosition(Common::Point(203, 144));
+	_tray.setDetails(800, 12, -1, 14, 1, NULL);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setVisage(10);
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.disableControl();
+
+	_dataConduits.setDetails(13, 800, 21, -1, -1);
+	_cableJunction.setDetails(Rect(206, 111, 223, 125), 800, 24, -1, -1, 1, NULL);
+	_deviceSlot.setDetails(Rect(220, 108, 239, 122), 800, 27, -1, -1, 1, NULL);
+	_diskSlot.setDetails(Rect(209, 124, 226, 133), 800, 9, -1, 11, 1, NULL);
+
+	if (R2_INVENTORY.getObjectScene(R2_READER) == 800)
+		_deviceSlot._lookLineNum = 33;
+
+	_button.setDetails(Rect(189, 112, 204, 124), 800, 30, -1, -1, 1, NULL);
+	_couch.setDetails(11, 800, 15, -1, 17);
+	_autoDoc.setDetails(Rect(152, 92, 247, 151), 800, 6, 7, -1, 1, NULL);
+	_medicalDatabase.setDetails(12, 800, 18, -1, -1);
+	_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 800, 0, -1, -1, 1, NULL);
+
+	switch (R2_GLOBALS._sceneManager._previousScene) {
+	case 825:
+		_sceneMode = 800;
+		setAction(&_sequenceManager1, this, 805, &R2_GLOBALS._player, &_autodocCover, NULL);
+		break;
+	case 850:
+		_sceneMode = 800;
+		setAction(&_sequenceManager1, this, 800, &R2_GLOBALS._player, &_door, NULL);
+		break;
+	default:
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.setPosition(Common::Point(277, 132));
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
+void Scene800::signal() {
+	switch (_sceneMode) {
+	case 801:
+		R2_GLOBALS._sceneManager.changeScene(850);
+		break;
+	case 802:
+		R2_GLOBALS._sceneManager.changeScene(825);
+		break;
+	case 803:
+		R2_GLOBALS._player.enableControl();
+		R2_INVENTORY.setObjectScene(R2_OPTICAL_FIBRE, 800);
+		break;
+	case 804:
+		R2_GLOBALS._player.enableControl();
+		_deviceSlot._lookLineNum = 33;
+		R2_INVENTORY.setObjectScene(R2_READER, 800);
+		break;
+	case 806:
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS.setFlag(10);
+		break;
+	case 807:
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS.clearFlag(10);
+		break;
+	case 808:
+		R2_GLOBALS._player.enableControl();
+		R2_INVENTORY.setObjectScene(R2_OPTO_DISK, 1);
+		break;
+	case 809:
+		R2_GLOBALS._player.enableControl();
+		R2_INVENTORY.setObjectScene(R2_READER, 1);
+		break;
+	case 811:
+		R2_GLOBALS._player.enableControl();
+		_comScanner.remove();
+		R2_INVENTORY.setObjectScene(R2_9, 1);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
+
 /*--------------------------------------------------------------------------
  * Scene 850 - Deck #5 - By Lift
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 5f2d768f90..6810b5d85a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -370,6 +370,55 @@ public:
 	virtual void dispatch();
 };
 
+class Scene800: public SceneExt {
+	/* Items */
+	class Button: public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class CableJunction: public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class DeviceSlot: public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	/* Objects */
+	class Door: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Tray: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class ComScanner: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Cabinet: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+	NamedHotspot _background, _autoDoc, _diskSlot, _couch;
+	NamedHotspot _medicalDatabase, _dataConduits;
+	Button _button;
+	CableJunction _cableJunction;
+	DeviceSlot _deviceSlot;
+	SceneActor _autodocCover, _opticalFibre, _reader;
+	Door _door;
+	Tray _tray;
+	ComScanner _comScanner;
+	Cabinet _cabinet;
+	SequenceManager _sequenceManager1;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
+
 class Scene850: public SceneExt {
 	/* Items */
 	class Indicator: public NamedHotspot {
-- 
cgit v1.2.3


From 96face8ba870c09b7f7ce6847165bd2aed0d3e77 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Mon, 19 Dec 2011 10:51:01 -0600
Subject: TSAGE: Blue Force is now ready for testing

---
 engines/tsage/detection_tables.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h
index d6b1760b80..0f6d8c9d7d 100644
--- a/engines/tsage/detection_tables.h
+++ b/engines/tsage/detection_tables.h
@@ -105,7 +105,7 @@ static const tSageGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("blue.rlb", "17c3993415e8a2cf93040eef7e88ec93", 1156508),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO2(GUIO_NOSPEECH, GUIO_NOSFX)
 		},
 		GType_BlueForce,
@@ -120,7 +120,7 @@ static const tSageGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("blue.rlb", "17eabb456cb1546c66baf1aff387ba6a", 10032614),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO2(GUIO_NOSPEECH, GUIO_NOSFX)
 		},
 		GType_BlueForce,
@@ -134,7 +134,7 @@ static const tSageGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("blue.rlb", "99983f48cb218f1f3760cf2f9a7ef11d", 63863322),
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			ADGF_CD | ADGF_UNSTABLE,
+			ADGF_CD | ADGF_TESTING,
 			GUIO2(GUIO_NOSPEECH, GUIO_NOSFX)
 		},
 		GType_BlueForce,
-- 
cgit v1.2.3


From 5a3deea58ebab2a443e48c91cfff7ca5ecab349c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 19 Dec 2011 23:47:06 +0200
Subject: DREAMWEB: More work on inToInv and outOfInv

---
 engines/dreamweb/object.cpp | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 9fe94c4bd4..1cdbca0907 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -568,21 +568,19 @@ void DreamGenContext::inToInv() {
 		return;
 	}
 
-	findInvPos();
-	ax = es.word(bx);
+	uint16 subject = getSegment(data.word(kBuffers)).word(findInvPosCPP());
 
-	if (al != 255) {
+	if ((subject & 0xFF) != 255) {
 		swapWithInv();
 		return;
 	}
 
-	al = data.byte(kItemframe);
-	ah = data.byte(kObjecttype);
+	subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
 
-	if (ax == data.word(kOldsubject) && data.byte(kCommandtype) != 220)
+	if (subject == data.word(kOldsubject) && data.byte(kCommandtype) != 220)
 		data.byte(kCommandtype) = 220;
 
-	data.word(kOldsubject) = ax;
+	data.word(kOldsubject) = subject;
 	commandWithOb(35, data.byte(kObjecttype), data.byte(kItemframe));
 
 	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
@@ -603,10 +601,9 @@ void DreamGenContext::inToInv() {
 }
 
 void DreamGenContext::outOfInv() {
-	findInvPos();
-	ax = es.word(bx);
+	uint16 subject = getSegment(data.word(kBuffers)).word(findInvPosCPP());
 
-	if (al == 255) {
+	if ((subject & 0xFF) == 255) {
 		blank();
 		return;
 	}
@@ -616,11 +613,13 @@ void DreamGenContext::outOfInv() {
 		return;
 	}
 
-	if (ax == data.word(kOldsubject) && data.byte(kCommandtype) != 221)
+	if (subject == data.word(kOldsubject) && data.byte(kCommandtype) != 221)
 		data.byte(kCommandtype) = 221;
 
-	data.word(kOldsubject) = ax;
-	commandWithOb(36, ah, al);
+	data.word(kOldsubject) = subject;
+	byte type = subject >> 8;
+	byte frame = subject & 0xFF;
+	commandWithOb(36, type, frame);
 
 	if (data.word(kMousebutton) == data.word(kOldbutton))
 		return; // notletgo
@@ -630,10 +629,9 @@ void DreamGenContext::outOfInv() {
 
 	delPointer();
 	data.byte(kPickup) = 1;
-	findInvPos();
-	ax = es.word(bx);
-	data.byte(kItemframe) = al;
-	data.byte(kObjecttype) = ah;
+	subject = getSegment(data.word(kBuffers)).word(findInvPosCPP());
+	data.byte(kObjecttype) = subject >> 8;
+	data.byte(kItemframe) = subject & 0xFF;
 	DynObject *object = getExAd(data.byte(kItemframe));
 	object->mapad[0] = 20;
 	object->mapad[1] = 255;
-- 
cgit v1.2.3


From 9a40cd8fd784bbb52186f8dc14bbea8198e1a239 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 19 Dec 2011 23:15:42 +0100
Subject: TSAGE: R2R - Implement scene 3125

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 169 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h   |  38 ++++++
 3 files changed, 209 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 42f3b16d7f..e5a3919c05 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -175,6 +175,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 3100:
 		return new Scene3100();
 	case 3125:
+		// Ghouls dormitory
+		return new Scene3125();
 	case 3150:
 	case 3175:
 	case 3200:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 22e58b6d2b..488fda5d59 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -202,5 +202,174 @@ void Scene3100::dispatch() {
 	Scene::dispatch();
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3125 - Ghouls dormitory
+ *
+ *--------------------------------------------------------------------------*/
+Scene3125::Scene3125() {
+	_field412 = 0;
+}
+
+void Scene3125::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+}
+
+bool Scene3125::Item1::startAction(CursorType action, Event &event) {
+	Scene3125 *scene = (Scene3125 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (_useLineNum != -1)
+			SceneItem::display(_resNum, _useLineNum, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+		break;
+	case CURSOR_LOOK:
+		if (_lookLineNum != -1)
+			SceneItem::display(_resNum, _lookLineNum, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+		break;
+	case CURSOR_TALK:
+		if (_talkLineNum != -1)
+			SceneItem::display(_resNum, _talkLineNum, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+		break;
+	default:
+		warning("scene->display() called with two parameters");
+		return scene->display(action);
+		break;
+	}
+
+	return true;
+}
+
+bool Scene3125::Item2::startAction(CursorType action, Event &event) {
+	Scene3125 *scene = (Scene3125 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 3125;
+		scene->setAction(&scene->_sequenceManager1, scene, 3125, &R2_GLOBALS._player, NULL);
+		break;
+	case CURSOR_LOOK:
+		SceneItem::display(3125, 15, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+		break;
+	case CURSOR_TALK:
+		SceneItem::display(3125, 13, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+		break;
+	default:
+		return SceneHotspot::startAction(action, event);
+		break;
+	}
+
+	return true;
+}
+
+bool Scene3125::Item3::startAction(CursorType action, Event &event) {
+	Scene3125 *scene = (Scene3125 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		R2_GLOBALS._player.disableControl();
+		scene->_actor5.postInit();
+		scene->_sceneMode = 3126;
+		scene->setAction(&scene->_sequenceManager1, scene, 3126, &R2_GLOBALS._player, &scene->_actor2, &scene->_actor3, &scene->_actor4, &scene->_actor1, &scene->_actor5, NULL);
+		break;
+	case CURSOR_LOOK:
+		SceneItem::display(3125, 9, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+		break;
+	case CURSOR_TALK:
+		SceneItem::display(3125, 13, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+		break;
+	default:
+		return SceneHotspot::startAction(action, event);
+		break;
+	}
+
+	return true;
+}
+
+bool Scene3125::Actor1::startAction(CursorType action, Event &event) {
+	Scene3125 *scene = (Scene3125 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 3176;
+	scene->setAction(&scene->_sequenceManager1, scene, 3176, &R2_GLOBALS._player, &scene->_actor1, NULL);
+	return true;
+}
+
+void Scene3125::postInit(SceneObjectList *OwnerList) {
+	loadScene(3125);
+	SceneExt::postInit();
+	_field412 = 0;
+
+	_actor1.postInit();
+	_actor1.setup(3175, 1, 1);
+	_actor1.setPosition(Common::Point(35, 72));
+	_actor1.setDetails(3125, 12, 13, -1, 1, NULL);
+
+	_actor2.postInit();
+	_actor2.setup(3126, 4, 1);
+	_actor2.setPosition(Common::Point(71, 110));
+	_actor2._numFrames = 20;
+
+	_actor3.postInit();
+	_actor3.setup(3126, 1, 1);
+	_actor3.setPosition(Common::Point(215, 62));
+	_actor3.fixPriority(71);
+
+	_actor4.postInit();
+	_actor4.setup(3126, 1, 1);
+	_actor4.setPosition(Common::Point(171, 160));
+	_actor4.fixPriority(201);
+	
+	_item3.setDetails(12, 3125, 9, 13, -1);
+	_item2.setDetails(11, 3125, 15, 13, -1);
+	_item1.setDetails(Rect(0, 0, 320, 200), 3125, 0, 1, 2, 1, NULL);
+
+	R2_GLOBALS._sound1.play(262);
+	R2_GLOBALS._player.postInit();
+
+	if (R2_GLOBALS._player._oldCharacterScene[3] == 3250) {
+		_sceneMode = 3175;
+		setAction(&_sequenceManager1, this, 3175, &R2_GLOBALS._player, &_actor1, NULL);
+	} else {
+		R2_GLOBALS._player.setup(30, 5, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setPosition(Common::Point(89, 76));
+		R2_GLOBALS._player.enableControl();
+	}
+	R2_GLOBALS._player._oldCharacterScene[3] = 3125;
+}
+
+void Scene3125::signal() {
+	switch (_sceneMode) {
+	case 3125:
+		SceneItem::display(3125, 3, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+		_sceneMode = 3127;
+		setAction(&_sequenceManager1, this, 3127, &R2_GLOBALS._player, NULL);
+		break;
+	case 3126:
+		R2_GLOBALS.setFlag(79);
+	// No break on purpose
+	case 3176:
+		R2_GLOBALS._sceneManager.changeScene(3250);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
+void Scene3125::dispatch() {
+	if ((_sceneMode == 3126) && (_actor2._frame == 2) && (_field412 == 0)) {
+		_field412 = 1;
+		R2_GLOBALS._sound1.play(265);
+	}
+	Scene::dispatch();
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index fe00e2cf09..b135ddc0a3 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -67,6 +67,44 @@ public:
 	virtual void synchronize(Serializer &s);
 };
 
+class Scene3125 : public SceneExt {
+	class Item1 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Item2 : public Item1 {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Item3 : public Item1 {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor1 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+
+	int _field412;
+	Item1 _item1;
+	Actor1 _actor1;
+	Item2 _item2;
+	Item3 _item3;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	SequenceManager _sequenceManager1;
+	// Second sequence manager... Unused?
+	SequenceManager _sequenceManager2;
+
+	Scene3125();
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void dispatch();
+	virtual void synchronize(Serializer &s);
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From d2375c86eb9afbc7f14273f5c377533a1b10fce5 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 19 Dec 2011 23:58:55 +0100
Subject: SKY: Fix warning

---
 engines/sky/logic.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp
index 86c8828e5a..18fb4f7e82 100644
--- a/engines/sky/logic.cpp
+++ b/engines/sky/logic.cpp
@@ -1232,10 +1232,8 @@ uint16 Logic::mouseScript(uint32 scrNum, Compact *scriptComp) {
  * @return 0 if script finished. Else offset where to continue.
  */
 uint16 Logic::script(uint16 scriptNo, uint16 offset) {
-	bool restartScript;
-
 	do {
-		restartScript = false;
+		bool restartScript = false;
 
 		/// process a script
 		/// low level interface to interpreter
@@ -1422,7 +1420,7 @@ uint16 Logic::script(uint16 scriptNo, uint16 offset) {
 				error("Unknown script command: %d", command);
 			}
 		}
-	} while (restartScript);
+	} while (true);
 }
 
 bool Logic::fnCacheChip(uint32 a, uint32 b, uint32 c) {
-- 
cgit v1.2.3


From f5e8b3257e5c32c02561e4d26298775fa5547df2 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 20 Dec 2011 00:06:49 +0100
Subject: DREAMWEB: Fix regressions in intoInv, outOfInv; cleanup selectOb

---
 engines/dreamweb/object.cpp | 62 ++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 37 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 1cdbca0907..70481407f2 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -393,9 +393,7 @@ void DreamGenContext::findInvPos() {
 }
 
 void DreamGenContext::selectOb() {
-	es = data.word(kBuffers);
-
-	uint16 objectId = es.word(findInvPosCPP());
+	uint16 objectId = getSegment(data.word(kBuffers)).word(findInvPosCPP());
 	if ((objectId & 0xFF) == 255) {
 		blank();
 		return;
@@ -404,28 +402,19 @@ void DreamGenContext::selectOb() {
 	data.byte(kWithobject) = objectId & 0x00FF;
 	data.byte(kWithtype)   = objectId >> 8;
 
-	if (objectId == data.word(kOldsubject)) {
-		if (data.byte(kCommandtype) == 221) {
-			// Object already selected
-			if (data.word(kMousebutton) != data.word(kOldbutton) && (data.word(kMousebutton) & 1)) {
-				delPointer();
-				data.byte(kInvopen) = 0;
-				useRoutine();
-			}
-			return;
-		} else {
+	if (objectId != data.word(kOldsubject) || data.byte(kCommandtype) != 221) {
+		if (objectId == data.word(kOldsubject))
 			data.byte(kCommandtype) = 221;
-		}
+		data.word(kOldsubject) = objectId;
+		commandWithOb(0, data.byte(kWithtype), data.byte(kWithobject));
 	}
 
-	data.word(kOldsubject) = objectId;
-	commandWithOb(0, data.byte(kWithtype), data.byte(kWithobject));
+	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+		return;
 
-	if (data.word(kMousebutton) != data.word(kOldbutton) && (data.word(kMousebutton) & 1)) {
-		delPointer();
-		data.byte(kInvopen) = 0;
-		useRoutine();
-	}
+	delPointer();
+	data.byte(kInvopen) = 0;
+	useRoutine();
 }
 
 void DreamGenContext::setPickup() {
@@ -577,11 +566,12 @@ void DreamGenContext::inToInv() {
 
 	subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
 
-	if (subject == data.word(kOldsubject) && data.byte(kCommandtype) != 220)
-		data.byte(kCommandtype) = 220;
-
-	data.word(kOldsubject) = subject;
-	commandWithOb(35, data.byte(kObjecttype), data.byte(kItemframe));
+	if (subject != data.word(kOldsubject) || data.byte(kCommandtype) != 220) {
+		if (subject == data.word(kOldsubject))
+			data.byte(kCommandtype) = 220;
+		data.word(kOldsubject) = subject;
+		commandWithOb(35, data.byte(kObjecttype), data.byte(kItemframe));
+	}
 
 	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
 		return; // notletgo2
@@ -613,18 +603,16 @@ void DreamGenContext::outOfInv() {
 		return;
 	}
 
-	if (subject == data.word(kOldsubject) && data.byte(kCommandtype) != 221)
-		data.byte(kCommandtype) = 221;
-
-	data.word(kOldsubject) = subject;
-	byte type = subject >> 8;
-	byte frame = subject & 0xFF;
-	commandWithOb(36, type, frame);
-
-	if (data.word(kMousebutton) == data.word(kOldbutton))
-		return; // notletgo
+	if (subject != data.word(kOldsubject) || data.byte(kCommandtype) != 221) {
+		if (subject == data.word(kOldsubject))
+			data.byte(kCommandtype) = 221;
+		data.word(kOldsubject) = subject;
+		byte type = subject >> 8;
+		byte frame = subject & 0xFF;
+		commandWithOb(36, type, frame);
+	}
 
-	if (!(data.word(kMousebutton) & 1))
+	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
 		return;
 
 	delPointer();
-- 
cgit v1.2.3


From 8a22c2d65e198e01b91360fe9e2d979c7d5b3c64 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Mon, 19 Dec 2011 19:06:15 -0500
Subject: MOHAWK: Add another lilmonster demo

---
 engines/mohawk/detection_tables.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'engines')

diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 998c2ef56d..2b1b28716e 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -1970,6 +1970,22 @@ static const MohawkGameDescription gameDescriptions[] = {
 		"MONSTER.EXE"
 	},
 
+	// From GeorgeQGreg
+	{
+		{
+			"lilmonster",
+			"Demo",
+			AD_ENTRY1("MONSTER.512", "f603f04c1824d1034ec0366416a059c9"),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_DEMO,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_LIVINGBOOKSV1,
+		GF_DEMO,
+		"MONSTER.EXE"
+	},
+
 	{
 		{
 			"catinthehat",
-- 
cgit v1.2.3


From 341a2d68742d4c7dce9229c1da4c8e6b13e2087c Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 20 Dec 2011 13:58:26 +0100
Subject: DREAMWEB: Fix regression in deleteExObject

(thanks to Fingolfin)
---
 engines/dreamweb/object.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 70481407f2..54979309f4 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -535,7 +535,7 @@ void DreamBase::deleteExObject(uint8 index) {
 	deleteExText(index);
 
 	for (uint8 i = 0; i < kNumexobjects; ++i) {
-		DynObject *t = getExAd(index);
+		DynObject *t = getExAd(i);
 		// Is this object contained in the one we've just deleted?
 		if (t->mapad[0] == 4 && t->mapad[1] == index)
 			deleteExObject(i);
@@ -544,7 +544,7 @@ void DreamBase::deleteExObject(uint8 index) {
 
 void DreamBase::removeObFromInv() {
 	if (data.byte(kCommand) == 100)
-		return; // object doesn't exit
+		return; // object doesn't exist
 
 	assert(data.byte(kObjecttype) == kExObjectType);
 
-- 
cgit v1.2.3


From 62f4bb6ac1c8910381ef5579f718b692e93b9770 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 20 Dec 2011 23:56:26 +0100
Subject: TSAGE: R2R - Implement scene 3150

---
 engines/tsage/globals.cpp                       |   3 +-
 engines/tsage/globals.h                         |   1 +
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 422 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h   |  54 +++
 5 files changed, 481 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 1d0e37d071..da40485617 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -386,6 +386,7 @@ void Ringworld2Globals::reset() {
 	_v565AE = 0;
 	for (int i = 0; i < 14; i++)
 		_v56605[i] = 0;
+	_v56AA0 = 0;
 	_v57C2C = 0;
 	_v58CE2 = 0;
 	Common::fill(&_v565F1[0], &_v565F1[MAX_CHARACTERS], 0);
@@ -426,7 +427,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 		s.syncAsSint16LE(_v565F1[i]);
 	
 	s.syncAsByte(_v565AE);
-
+	s.syncAsByte(_v56AA0);
 	for (i = 0; i < 14; ++i)
 		s.syncAsByte(_v56605[i]);
 
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 9048899953..7e40276fcf 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -252,6 +252,7 @@ public:
 	int _v5657C;
 	byte _v565AE;
 	byte _v56605[14];
+	byte _v56AA0;
 	int _v57C2C;
 	int _v58CE2;
 	int _speechSubtitles;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index e5a3919c05..0248a3c32d 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -178,6 +178,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Ghouls dormitory
 		return new Scene3125();
 	case 3150:
+		// Jail
+		return new Scene3150();
 	case 3175:
 	case 3200:
 	case 3210:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 488fda5d59..2c2530f833 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -371,5 +371,427 @@ void Scene3125::dispatch() {
 	Scene::dispatch();
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3150 - Jail
+ *
+ *--------------------------------------------------------------------------*/
+bool Scene3150::Item5::startAction(CursorType action, Event &event) {
+	Scene3150 *scene = (Scene3150 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (R2_INVENTORY.getObjectScene(47) != 3150)
+			return SceneHotspot::startAction(action, event);
+
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 3154;
+		scene->setAction(&scene->_sequenceManager, scene, 3154, &R2_GLOBALS._player, &scene->_actor3, NULL);
+		return true;
+	case R2_40:
+		if ((R2_INVENTORY.getObjectScene(47) != 3150) && (R2_GLOBALS.getFlag(75))) {
+			R2_GLOBALS._player.disableControl();
+			scene->_actor3.postInit();
+			scene->_actor3._effect = 3;
+			scene->_actor3._shade = 5;
+			scene->_sceneMode = 3155;
+			scene->setAction(&scene->_sequenceManager, scene, 3155, &R2_GLOBALS._player, &scene->_actor3, NULL);
+		} else {
+			SceneItem::display(3150, 42, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		}
+		return true;
+	default:
+		return SceneHotspot::startAction(action, event);
+		break;
+	}
+}
+
+bool Scene3150::Item6::startAction(CursorType action, Event &event) {
+	Scene3150 *scene = (Scene3150 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case R2_41:
+		R2_GLOBALS._player.disableControl();
+		scene->_actor4.postInit();
+		scene->_actor4._effect = 6;
+		scene->_actor4._shade = 3;
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 3158;
+		scene->setAction(&scene->_sequenceManager, scene, 3158, &R2_GLOBALS._player, &scene->_actor4, NULL);
+		return true;
+	case R2_42:
+		if ((R2_INVENTORY.getObjectScene(47) != 3150) && (R2_INVENTORY.getObjectScene(40) == 3150) && (R2_GLOBALS.getFlag(75))) {
+			scene->_actor5.postInit();
+			scene->_actor5._effect = 6;
+			scene->_actor5._shade = 3;
+			scene->_actor5.setDetails(3150, 30, -1, -1, 2, NULL);
+
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 3159;
+			scene->setAction(&scene->_sequenceManager, scene, 3159, &R2_GLOBALS._player, &scene->_actor5, NULL);
+		} else {
+			SceneItem::display(3150, 42, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		}
+	default:
+		return SceneHotspot::startAction(action, event);
+		break;
+	}
+}
+
+bool Scene3150::Actor4::startAction(CursorType action, Event &event) {
+	Scene3150 *scene = (Scene3150 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (R2_GLOBALS.getFlag(75))
+			return SceneActor::startAction(action, event);
+		
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 3151;
+		scene->setAction(&scene->_sequenceManager, scene, 3151, &R2_GLOBALS._player, &scene->_actor4, NULL);
+		return true;
+	case R2_42:
+		return false;
+	default:
+		return SceneActor::startAction(action, event);
+		break;
+	}
+}
+
+bool Scene3150::Actor5::startAction(CursorType action, Event &event) {
+	Scene3150 *scene = (Scene3150 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action != CURSOR_USE) || (R2_GLOBALS.getFlag(77)))
+		return SceneActor::startAction(action ,event);
+
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 3157;
+	scene->setAction(&scene->_sequenceManager, scene, 3157, &R2_GLOBALS._player, &scene->_actor5, NULL);
+	return true;
+}
+
+bool Scene3150::Actor6::startAction(CursorType action, Event &event) {
+	Scene3150 *scene = (Scene3150 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action == CURSOR_USE) {
+		if (R2_GLOBALS.getFlag(75)) {
+			if (R2_GLOBALS.getFlag(77)) {
+				R2_GLOBALS._player.disableControl();
+				if (R2_GLOBALS.getFlag(76)) {
+					scene->_sceneMode = 3152;
+					scene->setAction(&scene->_sequenceManager, scene, 3152, &R2_GLOBALS._player, NULL);
+				} else {
+					scene->_sceneMode = 3153;
+					scene->setAction(&scene->_sequenceManager, scene, 3152, &R2_GLOBALS._player, &scene->_actor4, NULL);
+				}
+			} else {
+				SceneItem::display(3150, 42, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+			}
+		} else {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 3152;
+			scene->setAction(&scene->_sequenceManager, scene, 3152, &R2_GLOBALS._player, NULL);
+		}
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene3150::Actor7::startAction(CursorType action, Event &event) {
+	Scene3150 *scene = (Scene3150 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action == R2_43) && (!R2_GLOBALS.getFlag(80))) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 3160;
+		scene->setAction(&scene->_sequenceManager, scene, 3160, &R2_GLOBALS._player, &scene->_actor7, NULL);
+		return true;
+	}
+	
+	return SceneActor::startAction(action, event);
+}
+
+void Scene3150::Exit1::changeScene() {
+	Scene3150 *scene = (Scene3150 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	g_globals->_events.setCursor(CURSOR_ARROW);
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 11;
+
+	Common::Point pt(-20, 180);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene3150::Exit2::changeScene() {
+	Scene3150 *scene = (Scene3150 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	g_globals->_events.setCursor(CURSOR_ARROW);
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 12;
+
+	scene->setAction(&scene->_sequenceManager, scene, 3163, &R2_GLOBALS._player, NULL);
+}
+
+void Scene3150::postInit(SceneObjectList *OwnerList) {
+	loadScene(3150);
+	if (R2_GLOBALS._sceneManager._previousScene == -1) {
+		R2_INVENTORY.setObjectScene(35, 2000);
+		R2_GLOBALS._player._oldCharacterScene[1] = 3100;
+		R2_GLOBALS._player._oldCharacterScene[3] = 0;
+		R2_GLOBALS._player._characterIndex = R2_MIRANDA;
+	}
+	SceneExt::postInit();
+
+	if (R2_GLOBALS.getFlag(78)) {
+		_exit1.setDetails(Rect(0, 135, 60, 168), EXITCURSOR_SW, 3275);
+		_exit1.setDest(Common::Point(70, 125));
+	}
+
+	if (R2_GLOBALS.getFlag(80)) {
+		_exit2.setDetails(Rect(249, 36, 279, 60), EXITCURSOR_NE, 3150);
+		_exit2.setDest(Common::Point(241, 106));
+	}
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.disableControl();
+	
+	_actor2.postInit();
+	_actor2.setPosition(Common::Point(64, 139));
+	if (R2_GLOBALS.getFlag(78)) {
+		_actor2.setup(3151, 1, 5);
+		_actor2.fixPriority(125);
+	} else {
+		_actor2.setup(3151, 1, 1);
+		_actor2.setDetails(3150, 8, -1, 9, 1, NULL);
+	}
+
+	if (R2_GLOBALS.getFlag(78)) {
+		_actor1.postInit();
+		_actor1.setup(3154, 1, 16);
+		_actor1.setPosition(Common::Point(104, 129));
+		_actor1._effect = 6;
+		_actor1._shade = 3;
+		_actor1.setDetails(3150, 24, -1, -1, -1, NULL);
+	}
+
+	_actor7.postInit();
+	_actor7.setup(3154, 5, 1);
+	if (R2_GLOBALS.getFlag(80))
+		_actor7.setPosition(Common::Point(264, 108));
+	else
+		_actor7.setPosition(Common::Point(264, 58));
+	_actor7.fixPriority(50);
+	_actor7.setDetails(3150, 17, -1, 19, 1, NULL);
+
+	if (R2_INVENTORY.getObjectScene(41) == 3150) {
+		_actor4.postInit();
+		if (R2_GLOBALS.getFlag(75)) {
+			if (R2_GLOBALS.getFlag(76)) {
+				R2_GLOBALS._walkRegions.enableRegion(1);
+				R2_GLOBALS._walkRegions.enableRegion(4);
+				R2_GLOBALS._walkRegions.enableRegion(5);
+				R2_GLOBALS._walkRegions.enableRegion(6);
+				_actor4.setup(3152, 4, 10);
+				_actor4.setDetails(3150, 14, -1, -1, 1, NULL);
+			} else {
+				_actor4.setup(3152, 7, 4);
+				_actor4.setDetails(3150, 13, -1, -1, 1, NULL);
+			}
+			_actor4.fixPriority(110);
+			_actor4.setPosition(Common::Point(83, 88));
+			_actor4._effect = 6;
+			_actor4._shade = 3;
+		} else {
+			_actor4.setup(3152, 7, 3);
+			_actor4.setPosition(Common::Point(143, 70));
+			_actor4.setDetails(3150, 15, -1, -1, 1, NULL);
+		}
+	}
+
+	if (R2_INVENTORY.getObjectScene(47) == 3150) {
+		_actor3.postInit();
+		_actor3.setup(3152, 7, 1);
+		_actor3.setPosition(Common::Point(73, 83));
+	}
+
+	if (R2_INVENTORY.getObjectScene(40) == 3150) {
+		_actor3.postInit();
+		_actor3.setup(3152, 7, 3);
+		_actor3.setPosition(Common::Point(70, 55));
+		_actor3.fixPriority(111);
+		_actor3._effect = 6;
+		_actor3._shade = 5;
+	}
+
+	if (R2_INVENTORY.getObjectScene(42) == 3150) {
+		_actor5.postInit();
+		if (R2_GLOBALS.getFlag(77)) {
+			_actor5.setup(3152, 7, 8);
+			_actor5.setPosition(Common::Point(82, 92));
+			_actor5.fixPriority(111);
+			_actor5._effect = 6;
+			_actor5._shade = 3;
+		} else {
+			_actor5.setup(3152, 7, 7);
+			_actor5.setPosition(Common::Point(155, 79));
+		}
+		_actor5.setDetails(3150, 30, -1, -1, 2, NULL);
+	}
+
+	_actor6.postInit();
+	_actor6.setup(3152, 7, 6);
+	_actor6.setPosition(Common::Point(98, 73));
+	_actor6.setDetails(3150, 43, -1, -1, 1, NULL);
+
+	_item2.setDetails(12, 3150, 10, -1, 12);
+	_item3.setDetails(Rect(186, 17, 210, 36), 3150, 6, -1, -1, 1, NULL);
+	_item4.setDetails(Rect(61, 21, 92, 41), 3150, 7, -1, -1, 1, NULL);
+	_item5.setDetails(Rect(63, 48, 78, 58), 3150, 6, -1, -1, 1, NULL);
+	_item6.setDetails(Rect(63, 81, 100, 95), 3150, 3, 4, -1, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 200, 320), 3150, 0, 1, 2, 1, NULL);
+
+	switch (R2_GLOBALS._player._oldCharacterScene[3]) {
+	case 0:
+		_sceneMode = 3150;
+		_actor1.postInit();
+		_actor1._effect = 6;
+		_actor1._shade = 5;
+		setAction(&_sequenceManager, this, 3150, &R2_GLOBALS._player, &_actor1, &_actor2, NULL);
+		break;
+	case 1200:
+		_sceneMode = 3162;
+		setAction(&_sequenceManager, this, 3162, &R2_GLOBALS._player, NULL);
+		break;
+	case 3275: {
+		_sceneMode = 10;
+		R2_GLOBALS._player.setup(30, 3, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setPosition(Common::Point(-20, 180));
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+
+		Common::Point pt(80, 125);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		break;
+		}
+	default:
+		if ((R2_GLOBALS._v56AA0 == 1) && (R2_INVENTORY.getObjectScene(35) == 2000) && (R2_GLOBALS._player._oldCharacterScene[1] == 3100)) {
+			++R2_GLOBALS._v56AA0;
+			_sceneMode = 3156;
+			_actor1.postInit();
+			_actor1._effect = 6;
+			_actor1._shade = 3;
+
+			_actor2.postInit();
+			_actor5.postInit();
+			_actor5._effect = 6;
+			_actor5._shade = 3;
+				
+			setAction(&_sequenceManager, this, 3156, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor5, NULL);
+		} else {
+			if (R2_GLOBALS._v56AA0 != 2)
+				++R2_GLOBALS._v56AA0;
+
+			R2_GLOBALS._player.setup(30, 3, 1);
+			R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+			R2_GLOBALS._player.setPosition(Common::Point(155, 120));
+			R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+			R2_GLOBALS._player.enableControl();
+		}
+	}
+
+	R2_GLOBALS._player._oldCharacterScene[3] = 3150;
+}
+
+void Scene3150::signal() {
+	switch (_sceneMode) {
+	case 11:
+		R2_GLOBALS._sceneManager.changeScene(3275);
+		break;
+	case 12:
+		R2_GLOBALS._sceneManager.changeScene(1200);
+		break;
+	case 3151:
+		_actor1.remove();
+		R2_INVENTORY.setObjectScene(41, 3);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 3153:
+		R2_GLOBALS.setFlag(76);
+		_actor4.setDetails(3150, 14, -1, -1, 3, NULL);
+		_actor1.postInit();
+		_actor1.setDetails(3150, 24, -1, -1, 2, NULL);
+		_sceneMode = 3161;
+		setAction(&_sequenceManager, this, 3161, &_actor1, &_actor2, NULL);
+		break;
+	case 3154:
+		_actor3.remove();
+		R2_INVENTORY.setObjectScene(47, 3);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 3155:
+		R2_INVENTORY.setObjectScene(40, 3150);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 3156:
+		_actor5.setDetails(3150, 30, -1, -1, 2, NULL);
+		R2_INVENTORY.setObjectScene(42, 3150);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 3157:
+		_actor5.remove();
+		R2_INVENTORY.setObjectScene(42, 3);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 3158:
+		R2_GLOBALS.setFlag(75);
+		R2_INVENTORY.setObjectScene(41, 3150);
+		_actor4.fixPriority(110);
+		_actor4.setDetails(3150, 13, -1, -1, 2, NULL);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 3159:
+		R2_GLOBALS.setFlag(77);
+		R2_INVENTORY.setObjectScene(42, 3150);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 3160:
+		R2_INVENTORY.setObjectScene(52, 3150);
+		R2_GLOBALS.setFlag(80);
+		R2_GLOBALS._sceneManager.changeScene(1200);
+		break;
+	case 3161:
+		R2_GLOBALS._sceneItems.remove(&_actor2);
+		_exit1.setDetails(Rect(0, 135, 60, 168), EXITCURSOR_SW, 3275);
+		_exit1.setDest(Common::Point(70, 125));
+		R2_GLOBALS._walkRegions.enableRegion(1);
+		R2_GLOBALS._walkRegions.enableRegion(4);
+		R2_GLOBALS._walkRegions.enableRegion(5);
+		R2_GLOBALS._walkRegions.enableRegion(6);
+		R2_GLOBALS.setFlag(78);
+		R2_GLOBALS._player.enableControl();
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
+void Scene3150::dispatch() {
+	if (_actor5._position.x == 155) {
+		_actor5._effect = 0;
+		_actor5._shade = 0;
+	}
+
+	if (_actor1._visage == 3154) {
+		_actor1._effect = 0;
+		_actor1._shade = 0;
+	}
+
+	Scene::dispatch();
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index b135ddc0a3..cdbf4359b0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -105,6 +105,60 @@ public:
 	virtual void dispatch();
 	virtual void synchronize(Serializer &s);
 };
+
+class Scene3150 : public SceneExt {
+	class Item5 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Item6 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor4 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor5 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor6 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor7 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit2 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+public:
+
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	NamedHotspot _item3;
+	NamedHotspot _item4;
+	Item5 _item5;
+	Item6 _item6;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	Actor4 _actor4;
+	Actor5 _actor5;
+	Actor6 _actor6;
+	Actor7 _actor7;
+	Exit1 _exit1;
+	Exit2 _exit2;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void dispatch();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 53929044a66005031658657f5ede8931979f9104 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 21 Dec 2011 22:42:16 +0100
Subject: TSAGE: R2R - Implement scene 3175

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 130 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h   |  26 +++++
 3 files changed, 158 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 0248a3c32d..d84e4eb6e0 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -181,6 +181,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Jail
 		return new Scene3150();
 	case 3175:
+		// Autopsy room
+		return new Scene3175();
 	case 3200:
 	case 3210:
 	case 3220:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 2c2530f833..cdb4bee493 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -793,5 +793,135 @@ void Scene3150::dispatch() {
 	Scene::dispatch();
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3175 - Autopsy room
+ *
+ *--------------------------------------------------------------------------*/
+bool Scene3175::Item1::startAction(CursorType action, Event &event) {
+	Scene3175 *scene = (Scene3175 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (_useLineNum != -1) {
+			SceneItem::display(_resNum, _useLineNum, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+			return true;
+		}
+		break;
+	case CURSOR_LOOK:
+		if (_lookLineNum != -1) {
+			SceneItem::display(_resNum, _lookLineNum, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+			return true;
+		}
+		break;
+	case CURSOR_TALK:
+		if (_talkLineNum != -1) {
+			SceneItem::display(_resNum, _talkLineNum, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+			return true;
+		}
+		break;
+	default:
+		break;
+	}
+	warning("scene->display() called with two parameters");
+	return scene->display(action);
+}
+
+bool Scene3175::Actor3::startAction(CursorType action, Event &event) {
+	Scene3175 *scene = (Scene3175 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (_useLineNum != -1) {
+			SceneItem::display(_resNum, _useLineNum, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+			return true;
+		}
+		break;
+	case CURSOR_LOOK:
+		if (_lookLineNum != -1) {
+			SceneItem::display(_resNum, _lookLineNum, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+			return true;
+		}
+		break;
+	case CURSOR_TALK:
+		if (_talkLineNum != -1) {
+			SceneItem::display(_resNum, _talkLineNum, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+			return true;
+		}
+		break;
+	default:
+		break;
+	}
+	warning("scene->display() called with two parameters");
+	return scene->display(action);
+}
+
+bool Scene3175::Actor1::startAction(CursorType action, Event &event) {
+	Scene3175 *scene = (Scene3175 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 3176;
+		scene->setAction(&scene->_sequenceManager, scene, 3176, &R2_GLOBALS._player, &scene->_actor1, NULL);
+		return true;
+		break;
+	case CURSOR_LOOK:
+		SceneItem::display(3175, 9, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+		return true;
+		break;
+	case CURSOR_TALK:
+		SceneItem::display(3175, 10, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+		return true;
+		break;
+	default:
+		return SceneActor::startAction(action, event);
+		break;
+	}
+}
+
+void Scene3175::postInit(SceneObjectList *OwnerList) {
+	loadScene(3175);
+	SceneExt::postInit();
+
+	_actor1.postInit();
+	_actor1.setup(3175, 1, 1);
+	_actor1.setPosition(Common::Point(35, 72));
+	_actor1.setDetails(3175, 9, 10, -1, 1, NULL);
+
+	_actor2.postInit();
+	_actor2.setup(3175, 2, 1);
+	_actor2.setPosition(Common::Point(87, 148));
+
+	_actor3.postInit();
+	_actor3.setup(3175, 3, 1);
+	_actor3.setPosition(Common::Point(199, 117));
+	_actor3.setDetails(3175, 15, 16, 17, 1, NULL);
+
+	_item2.setDetails(12, 3175, 3, 1, 5);
+	_item3.setDetails(11, 3175, 6, 7, 8);
+	_item1.setDetails(Rect(0, 0, 320, 200), 3175, 0, 1, 2, 1, NULL);
+
+	R2_GLOBALS._player.postInit();
+
+	if (R2_GLOBALS._player._oldCharacterScene[3] == 3250) {
+		R2_GLOBALS._player.setup(30, 5, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setPosition(Common::Point(126, 77));
+		R2_GLOBALS._player.enableControl();
+	} else {
+		_sceneMode = 3175;
+		setAction(&_sequenceManager, this, 3175, &R2_GLOBALS._player, &_actor1, NULL);
+	}
+
+	R2_GLOBALS._player._oldCharacterScene[3] = 3175;
+}
+
+void Scene3175::signal() {
+	if (_sceneMode == 3176)
+		R2_GLOBALS._sceneManager.changeScene(3250);
+	else
+		R2_GLOBALS._player.enableControl();
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index cdbf4359b0..67c430cdfd 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -159,6 +159,32 @@ public:
 	virtual void signal();
 	virtual void dispatch();
 };
+
+class Scene3175 : public SceneExt {
+	class Item1 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor3 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor1 : public Actor3 {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+
+	Item1 _item1;
+	Item1 _item2;
+	Item1 _item3;
+	Actor1 _actor1;
+	SceneActor _actor2;
+	Actor3 _actor3;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From d49ffde8eae1fd311e4c0f800e9a5bad57381204 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 22 Dec 2011 00:30:49 +0100
Subject: TSAGE: R2R - Implement scene 3200

---
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   2 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  |  28 ++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h    |  14 +++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 106 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   |  25 ++++++
 5 files changed, 175 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index d84e4eb6e0..386d09f6db 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -184,6 +184,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Autopsy room
 		return new Scene3175();
 	case 3200:
+		// Cutscene : Guard discussion
+		return new Scene3200();
 	case 3210:
 	case 3220:
 	case 3230:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index cdb4bee493..c73cb8547e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -923,5 +923,33 @@ void Scene3175::signal() {
 		R2_GLOBALS._player.enableControl();
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3200 - Cutscene : Guard discussion
+ *
+ *--------------------------------------------------------------------------*/
+void Scene3200::postInit(SceneObjectList *OwnerList) {
+	loadScene(3200);
+	R2_GLOBALS._v58CE2 = 0;
+	SceneExt::postInit();
+
+	_stripManager.addSpeaker(&_rockoSpeaker);
+	_stripManager.addSpeaker(&_jockoSpeaker);
+	_stripManager.addSpeaker(&_sockoSpeaker);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.disableControl();
+
+	_actor1.postInit();
+	_actor3.postInit();
+	_actor2.postInit();
+
+	setAction(&_sequenceManager, this, 3200 + R2_GLOBALS._randomSource.getRandomNumber(1), &_actor1, &_actor2, &_actor3, NULL);
+}
+
+void Scene3200::signal() {
+	R2_GLOBALS._sceneManager.changeScene(1200);
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 67c430cdfd..58ba4cc590 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -185,6 +185,20 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 };
+
+class Scene3200 : public SceneExt {
+public:
+	SpeakerRocko3200 _rockoSpeaker;
+	SpeakerJocko3200 _jockoSpeaker;
+	SpeakerSocko3200 _sockoSpeaker;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 3ec1df41d0..b3a15a84d3 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -27,6 +27,7 @@
 #include "tsage/staticres.h"
 #include "tsage/ringworld2/ringworld2_scenes0.h"
 #include "tsage/ringworld2/ringworld2_scenes2.h"
+#include "tsage/ringworld2/ringworld2_scenes3.h"
 
 namespace TsAGE {
 
@@ -1052,5 +1053,110 @@ SpeakerGuard3100::SpeakerGuard3100() {
 	_numFrames = 0;
 }
 
+SpeakerRocko3200::SpeakerRocko3200() {
+	_speakerName = "Rocko";
+	_color1 = 5;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerRocko3200::proc15() {
+	int v = _fieldF6;
+	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor1;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+SpeakerJocko3200::SpeakerJocko3200() {
+	_speakerName = "Jocko";
+	_color1 = 45;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerJocko3200::proc15() {
+	int v = _fieldF6;
+	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor2;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+SpeakerSocko3200::SpeakerSocko3200() {
+	_speakerName = "Socko";
+	_color1 = 10;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerSocko3200::proc15() {
+	int v = _fieldF6;
+	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor3;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 1d99a54e7c..38a097bc61 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -268,6 +268,31 @@ public:
 
 	virtual Common::String getClassName() { return "SpeakerGuard3100"; }
 };
+
+class SpeakerRocko3200 : public VisualSpeaker {
+public:
+	SpeakerRocko3200();
+
+	virtual Common::String getClassName() { return "SpeakerRocko3200"; }
+	virtual void proc15();
+};
+
+class SpeakerJocko3200 : public VisualSpeaker {
+public:
+	SpeakerJocko3200();
+
+	virtual Common::String getClassName() { return "SpeakerJocko3200"; }
+	virtual void proc15();
+};
+
+class SpeakerSocko3200 : public VisualSpeaker {
+public:
+	SpeakerSocko3200();
+
+	virtual Common::String getClassName() { return "SpeakerSocko3200"; }
+	virtual void proc15();
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From c40df9a6edc320ad2f3c8187e4b0c2d1eb9c6aa8 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 22 Dec 2011 00:33:18 +0100
Subject: TSAGE: Work around a data issue in R2R.

The character name doesn't seem case sensitive in R2R
---
 engines/tsage/converse.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 00c0b3a1f1..1542b0a8e3 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -888,6 +888,17 @@ Speaker *StripManager::getSpeaker(const char *speakerName) {
 			return _speakerList[idx];
 	}
 
+	// TODO: Check if it necessary to make a strcmp first.
+	//
+	// If nothing is found, recheck and ignore the case as
+	// in R2R, some character names aren't in uppercase.
+	if (g_vm->getGameID() == GType_Ringworld2) {
+		for (uint idx = 0; idx < _speakerList.size(); ++idx) {
+			if (!scumm_stricmp(_speakerList[idx]->_speakerName.c_str(), speakerName))
+				return _speakerList[idx];
+		}
+	}
+
 	return NULL;
 }
 
-- 
cgit v1.2.3


From 877b6e9b1d5ca0cb47e1845c57cc7340b924a5eb Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 22 Dec 2011 07:44:58 +0100
Subject: TSAGE: R2R - Implement scene 3210

---
 engines/tsage/ringworld2/ringworld2_logic.cpp    |  4 +-
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 27 ++++++++-
 engines/tsage/ringworld2/ringworld2_scenes3.h    | 12 ++++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 70 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   | 16 ++++++
 5 files changed, 127 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 386d09f6db..0844a48ed8 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -184,9 +184,11 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Autopsy room
 		return new Scene3175();
 	case 3200:
-		// Cutscene : Guard discussion
+		// Cutscene : Cutscene : Rocko & co - Discussion
 		return new Scene3200();
 	case 3210:
+		// Cutscene : Captain and Private - Discussion
+		return new Scene3210();
 	case 3220:
 	case 3230:
 	case 3240:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index c73cb8547e..8ea83a2527 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -924,7 +924,7 @@ void Scene3175::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3200 - Cutscene : Guard discussion
+ * Scene 3200 - Cutscene : Rocko & co - Discussion
  *
  *--------------------------------------------------------------------------*/
 void Scene3200::postInit(SceneObjectList *OwnerList) {
@@ -951,5 +951,30 @@ void Scene3200::signal() {
 	R2_GLOBALS._sceneManager.changeScene(1200);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3210 - Cutscene : Captain and Private - Discussion
+ *
+ *--------------------------------------------------------------------------*/
+void Scene3210::postInit(SceneObjectList *OwnerList) {
+	loadScene(3210);
+	R2_GLOBALS._v58CE2 = 0;
+	SceneExt::postInit();
+
+	_stripManager.addSpeaker(&_privateSpeaker);
+	_stripManager.addSpeaker(&_captainSpeaker);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.disableControl();
+
+	_actor1.postInit();
+	_actor2.postInit();
+
+	setAction(&_sequenceManager, this, 3210 + R2_GLOBALS._randomSource.getRandomNumber(1), &_actor1, &_actor2, NULL);
+}
+
+void Scene3210::signal() {
+	R2_GLOBALS._sceneManager.changeScene(1200);
+}
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 58ba4cc590..fbb6392be4 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -199,6 +199,18 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 };
+
+class Scene3210 : public SceneExt {
+public:
+	SpeakerCaptain3210 _captainSpeaker;
+	SpeakerPrivate3210 _privateSpeaker;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index b3a15a84d3..80ac04c403 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1158,5 +1158,75 @@ void SpeakerSocko3200::proc15() {
 	}
 }
 
+SpeakerCaptain3210::SpeakerCaptain3210() {
+	_speakerName = "Captain";
+	_color1 = 5;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerCaptain3210::proc15() {
+	int v = _fieldF6;
+	Scene3210 *scene = (Scene3210 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor1;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+SpeakerPrivate3210::SpeakerPrivate3210() {
+	_speakerName = "Private";
+	_color1 = 45;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerPrivate3210::proc15() {
+	int v = _fieldF6;
+	Scene3210 *scene = (Scene3210 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor2;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 38a097bc61..66edd67276 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -293,6 +293,22 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerCaptain3210 : public VisualSpeaker {
+public:
+	SpeakerCaptain3210();
+
+	virtual Common::String getClassName() { return "SpeakerCaptain3210"; }
+	virtual void proc15();
+};
+
+class SpeakerPrivate3210 : public VisualSpeaker {
+public:
+	SpeakerPrivate3210();
+
+	virtual Common::String getClassName() { return "SpeakerPrivate3210"; }
+	virtual void proc15();
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 0319cd06ef8e20486a3c7aa69a84bd39e8a71683 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 22 Dec 2011 19:30:47 +1100
Subject: CGE: Added explicit 'PACKED_STRUCT' macro to the HideDesc structure

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

(limited to 'engines')

diff --git a/engines/cge/bitmap.h b/engines/cge/bitmap.h
index e7179f3b0b..3de05ac2fd 100644
--- a/engines/cge/bitmap.h
+++ b/engines/cge/bitmap.h
@@ -49,7 +49,7 @@ enum {
 struct HideDesc {
 	uint16 _skip;
 	uint16 _hide;
-};
+} PACKED_STRUCT;
 
 #include "common/pack-end.h"
 
-- 
cgit v1.2.3


From b5e53281846e455ebd3f4a7bf40d1fffc6afeafe Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 22 Dec 2011 21:12:08 +1100
Subject: TSAGE: Implement R2R 2 parameter versions of Player disableControl
 and enableControl

---
 engines/tsage/core.cpp | 17 +++++++++++++++--
 engines/tsage/core.h   |  3 ++-
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index c243624608..6c015ab45f 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -3073,9 +3073,22 @@ void Player::enableControl() {
 	}
 }
 
-void Player::enableControl(CursorType cursor) {
+void Player::disableControl(CursorType cursorId, CursorType objectId) {
+	if (cursorId != -1)
+		R2_GLOBALS._events.setCursor(cursorId);
+	else if (objectId != CURSOR_NONE)
+		R2_GLOBALS._events.setCursor(objectId);
+
+	disableControl();
+}
+
+void Player::enableControl(CursorType cursorId, CursorType objectId) {
 	enableControl();
-	R2_GLOBALS._events.setCursor(cursor);
+
+	if (cursorId != -1)
+		R2_GLOBALS._events.setCursor(cursorId);
+	else if (objectId != CURSOR_NONE)
+		R2_GLOBALS._events.setCursor(objectId);
 }
 
 void Player::process(Event &event) {
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 060ffee121..e887be050b 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -646,7 +646,8 @@ public:
 
 	void disableControl();
 	void enableControl();
-	void enableControl(CursorType cursor);
+	void disableControl(CursorType cursorId, CursorType objectId);
+	void enableControl(CursorType cursorId, CursorType objectId = CURSOR_NONE);
 };
 
 /*--------------------------------------------------------------------------*/
-- 
cgit v1.2.3


From a4934fe05a50ccdbffd5171d08b7e600572da5a7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 22 Dec 2011 21:55:46 +1100
Subject: TSAGE: Moved look/use/talk descriptions to SceneItem class, and
 implemented R2R SceneExt::display

---
 engines/tsage/blue_force/blueforce_logic.h      |   2 -
 engines/tsage/core.cpp                          | 102 +++++++++++++++++++-----
 engines/tsage/core.h                            |   6 ++
 engines/tsage/events.h                          |   1 +
 engines/tsage/ringworld/ringworld_logic.h       |   1 -
 engines/tsage/ringworld2/ringworld2_logic.cpp   |  99 ++++++++---------------
 engines/tsage/ringworld2/ringworld2_logic.h     |   7 +-
 engines/tsage/ringworld2/ringworld2_scenes3.cpp |   9 +--
 8 files changed, 130 insertions(+), 97 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h
index f5a3938f2b..65cea8efae 100644
--- a/engines/tsage/blue_force/blueforce_logic.h
+++ b/engines/tsage/blue_force/blueforce_logic.h
@@ -338,10 +338,8 @@ public:
 
 class NamedHotspot : public SceneHotspot {
 public:
-	int _resNum, _lookLineNum, _useLineNum, _talkLineNum;
 	NamedHotspot();
 
-
 	virtual bool startAction(CursorType action, Event &event);
 	virtual Common::String getClassName() { return "NamedHotspot"; }
 	virtual void synchronize(Serializer &s);
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 6c015ab45f..a32f445194 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -34,6 +34,7 @@
 #include "tsage/globals.h"
 #include "tsage/sound.h"
 #include "tsage/blue_force/blueforce_logic.h"
+#include "tsage/ringworld2/ringworld2_logic.h"
 
 namespace TsAGE {
 
@@ -1511,6 +1512,14 @@ void SceneItem::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_position.x); s.syncAsSint32LE(_position.y);
 	s.syncAsSint16LE(_yDiff);
 	s.syncAsSint32LE(_sceneRegionId);
+
+	if (g_vm->getGameID() == GType_Ringworld2) {
+		// In R2R, the following fields were moved into the SceneItem class
+		s.syncAsSint16LE(_resNum);
+		s.syncAsSint16LE(_lookLineNum);
+		s.syncAsSint16LE(_useLineNum);
+		s.syncAsSint16LE(_talkLineNum);
+	}
 }
 
 void SceneItem::remove() {
@@ -1533,25 +1542,30 @@ bool SceneItem::startAction(CursorType action, Event &event) {
 void SceneItem::doAction(int action) {
 	const char *msg = NULL;
 
-	switch ((int)action) {
-	case CURSOR_LOOK:
-		msg = LOOK_SCENE_HOTSPOT;
-		break;
-	case CURSOR_USE:
-		msg = USE_SCENE_HOTSPOT;
-		break;
-	case CURSOR_TALK:
-		msg = TALK_SCENE_HOTSPOT;
-		break;
-	case 0x1000:
-		msg = SPECIAL_SCENE_HOTSPOT;
-		break;
-	default:
-		msg = DEFAULT_SCENE_HOTSPOT;
-		break;
-	}
+	if (g_vm->getGameID() == GType_Ringworld2) {
+		Event dummyEvent;
+		((Ringworld2::SceneExt *)GLOBALS._sceneManager._scene)->display((CursorType)action, dummyEvent);
+	} else {
+		switch ((int)action) {
+		case CURSOR_LOOK:
+			msg = LOOK_SCENE_HOTSPOT;
+			break;
+		case CURSOR_USE:
+			msg = USE_SCENE_HOTSPOT;
+			break;
+		case CURSOR_TALK:
+			msg = TALK_SCENE_HOTSPOT;
+			break;
+		case 0x1000:
+			msg = SPECIAL_SCENE_HOTSPOT;
+			break;
+		default:
+			msg = DEFAULT_SCENE_HOTSPOT;
+			break;
+		}
 
-	GUIErrorMessage(msg);
+		GUIErrorMessage(msg);
+	}
 }
 
 bool SceneItem::contains(const Common::Point &pt) {
@@ -1760,6 +1774,58 @@ void SceneItem::display(const Common::String &msg) {
 		SET_EXT_FGCOLOR, 13, LIST_END);
 }
 
+void SceneItem::setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum) {
+	setBounds(ys, xe, ye, xs);
+	_resNum = resnum;
+	_lookLineNum = lookLineNum;
+	_useLineNum = useLineNum;
+	_talkLineNum = -1;
+	g_globals->_sceneItems.addItems(this, NULL);
+}
+
+void SceneItem::setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item) {
+	setBounds(bounds);
+	_resNum = resNum;
+	_lookLineNum = lookLineNum;
+	_talkLineNum = talkLineNum;
+	_useLineNum = useLineNum;
+
+	switch (mode) {
+	case 2:
+		g_globals->_sceneItems.push_front(this);
+		break;
+	case 4:
+		g_globals->_sceneItems.addBefore(item, this);
+		break;
+	case 5:
+		g_globals->_sceneItems.addAfter(item, this);
+		break;
+	default:
+		g_globals->_sceneItems.push_back(this);
+		break;
+	}
+}
+
+void SceneItem::setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode) {
+	_sceneRegionId = sceneRegionId;
+	_resNum = resNum;
+	_lookLineNum = lookLineNum;
+	_talkLineNum = talkLineNum;
+	_useLineNum = useLineNum;
+
+	// Handle adding hotspot to scene items list as necessary
+	switch (mode) {
+	case 2:
+		GLOBALS._sceneItems.push_front(this);
+		break;
+	case 3:
+		break;
+	default:
+		GLOBALS._sceneItems.push_back(this);
+		break;
+	}
+}
+
 /*--------------------------------------------------------------------------*/
 
 bool SceneHotspot::startAction(CursorType action, Event &event) {
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index e887be050b..98efaf9881 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -412,6 +412,8 @@ public:
 	Common::Point _position;
 	int _yDiff;
 	int _sceneRegionId;
+
+	int _resNum, _lookLineNum, _useLineNum, _talkLineNum;
 public:
 	SceneItem() : EventHandler() { _msg = "Feature"; _action = NULL; _sceneRegionId = 0; }
 
@@ -428,6 +430,10 @@ public:
 	static void display(int resNum, int lineNum, ...);
 	static void display2(int resNum, int lineNum);
 	static void display(const Common::String &msg);
+
+	virtual void setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum);
+	virtual void setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
+	virtual void setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode = 0);
 };
 
 class SceneItemExt : public SceneItem {
diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index fe4d3ecde6..dcff1b45b8 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -95,6 +95,7 @@ enum CursorType {
 	R2_36 = 36, R2_37 = 37, R2_38 = 38, R2_39 = 39, R2_40 = 40, R2_41 = 41, R2_42 = 42,
 	R2_43 = 43, R2_44 = 44, R2_45 = 45, R2_46 = 46, R2_47 = 47, R2_48 = 48, R2_49 = 49,
 	R2_50 = 50, R2_51 = 51, R2_52 = 52,
+	R2_LAST_INVENT = 53,
 
 	// Ringworld 2 cursors
 	R2CURSORS_START = 0x8000, EXITCURSOR_N  = 0x8007,  EXITCURSOR_S  = 0x8008, EXITCURSOR_W = 0x8009, 
diff --git a/engines/tsage/ringworld/ringworld_logic.h b/engines/tsage/ringworld/ringworld_logic.h
index 6f6a66cc26..b3f103f293 100644
--- a/engines/tsage/ringworld/ringworld_logic.h
+++ b/engines/tsage/ringworld/ringworld_logic.h
@@ -161,7 +161,6 @@ public:
 
 class NamedHotspot : public SceneHotspot {
 public:
-	int _resNum, _lookLineNum, _useLineNum, _talkLineNum;
 	NamedHotspot();
 
 	virtual void doAction(int action);
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 0844a48ed8..470cdab10c 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -303,7 +303,7 @@ void SceneExt::loadScene(int sceneNum) {
 	}
 }
 
-bool SceneExt::display(CursorType action) {
+bool SceneExt::display(CursorType action, Event &event) {
 	switch (action) {
 	case CURSOR_CROSSHAIRS:
 		return false;
@@ -316,10 +316,41 @@ bool SceneExt::display(CursorType action) {
 	case CURSOR_TALK:
 		SceneItem::display2(1, R2_GLOBALS._randomSource.getRandomNumber(4) + 10);
 		break;
+	case R2_NEGATOR_GUN:
+		if (R2_GLOBALS.getFlag(1))
+			SceneItem::display2(2, action);
+		else
+			SceneItem::display2(5, 0);
+		break;
+	case R2_7:
+		if ((R2_GLOBALS._v565F1[1] == 2) || ((R2_GLOBALS._v565F1[1] == 1) &&
+				(R2_GLOBALS._v565F1[2] == 2) && (R2_GLOBALS._sceneManager._previousScene == 300))) {
+			R2_GLOBALS._sound4.stop();
+			R2_GLOBALS._sound3.play(46);
+			SceneItem::display2(5, 15);
+		} else {
+			R2_GLOBALS._sound3.play(43, 0);
+			SceneItem::display2(2, 0);
+		}
+
+		R2_GLOBALS._sound4.play(45);
+		break;
+	case R2_9:
+	case R2_39:
+		R2_GLOBALS._sound3.play(44);
+		SceneItem::display2(2, action);
+		R2_GLOBALS._sound3.stop();
+		break;
+	case R2_44:
+		R2_GLOBALS._sound3.play(99);
+		SceneItem::display2(2, action);
+		break;
 	default:
-		return false;
+		SceneItem::display2(2, action);
+		break;
 	}
 
+	event.handled = true;
 	return true;
 }
 
@@ -840,68 +871,6 @@ bool NamedHotspot::startAction(CursorType action, Event &event) {
 	}
 }
 
-void NamedHotspot::setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum) {
-	setBounds(ys, xe, ye, xs);
-	_resNum = resnum;
-	_lookLineNum = lookLineNum;
-	_useLineNum = useLineNum;
-	_talkLineNum = -1;
-	g_globals->_sceneItems.addItems(this, NULL);
-}
-
-void NamedHotspot::setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item) {
-	setBounds(bounds);
-	_resNum = resNum;
-	_lookLineNum = lookLineNum;
-	_talkLineNum = talkLineNum;
-	_useLineNum = useLineNum;
-
-	switch (mode) {
-	case 2:
-		g_globals->_sceneItems.push_front(this);
-		break;
-	case 4:
-		g_globals->_sceneItems.addBefore(item, this);
-		break;
-	case 5:
-		g_globals->_sceneItems.addAfter(item, this);
-		break;
-	default:
-		g_globals->_sceneItems.push_back(this);
-		break;
-	}
-}
-
-void NamedHotspot::setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode) {
-	_sceneRegionId = sceneRegionId;
-	_resNum = resNum;
-	_lookLineNum = lookLineNum;
-	_talkLineNum = talkLineNum;
-	_useLineNum = useLineNum;
-
-	// Handle adding hotspot to scene items list as necessary
-	switch (mode) {
-	case 2:
-		GLOBALS._sceneItems.push_front(this);
-		break;
-	case 3:
-		break;
-	default:
-		GLOBALS._sceneItems.push_back(this);
-		break;
-	}
-}
-
-void NamedHotspot::synchronize(Serializer &s) {
-	SceneHotspot::synchronize(s);
-	s.syncAsSint16LE(_resNum);
-	s.syncAsSint16LE(_lookLineNum);
-	s.syncAsSint16LE(_useLineNum);
-
-	if (g_vm->getGameID() == GType_BlueForce)
-		s.syncAsSint16LE(_talkLineNum);
-}
-
 void SceneActor::postInit(SceneObjectList *OwnerList) {
 	_lookLineNum = _talkLineNum = _useLineNum = -1;
 	SceneObject::postInit();
@@ -943,7 +912,7 @@ bool SceneActor::startAction(CursorType action, Event &event) {
 	}
 
 	if (!handled)
-		handled = ((SceneExt *)R2_GLOBALS._sceneManager._scene)->display(action);
+		handled = ((SceneExt *)R2_GLOBALS._sceneManager._scene)->display(action, event);
 	return handled;
 }
 
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 9eaa1b0cd1..67346bcc80 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -102,7 +102,7 @@ public:
 	virtual void refreshBackground(int xAmount, int yAmount);
 	virtual void saveCharacter(int characterIndex);
 
-	bool display(CursorType action);
+	bool display(CursorType action, Event &event);
 	void fadeOut();
 	void clearScreen();
 };
@@ -233,15 +233,10 @@ public:
 
 class NamedHotspot : public SceneHotspot {
 public:
-	int _resNum, _lookLineNum, _useLineNum, _talkLineNum;
 	NamedHotspot();
 
 	virtual bool startAction(CursorType action, Event &event);
 	virtual Common::String getClassName() { return "NamedHotspot"; }
-	virtual void synchronize(Serializer &s);
-	virtual void setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum);
-	virtual void setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
-	virtual void setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode = 0);
 };
 
 class NamedHotspotExt : public NamedHotspot {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 8ea83a2527..5b1e05ebc8 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -233,8 +233,7 @@ bool Scene3125::Item1::startAction(CursorType action, Event &event) {
 			SceneItem::display(_resNum, _talkLineNum, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
 		break;
 	default:
-		warning("scene->display() called with two parameters");
-		return scene->display(action);
+		return scene->display(action, event);
 		break;
 	}
 
@@ -822,8 +821,8 @@ bool Scene3175::Item1::startAction(CursorType action, Event &event) {
 	default:
 		break;
 	}
-	warning("scene->display() called with two parameters");
-	return scene->display(action);
+
+	return scene->display(action, event);
 }
 
 bool Scene3175::Actor3::startAction(CursorType action, Event &event) {
@@ -852,7 +851,7 @@ bool Scene3175::Actor3::startAction(CursorType action, Event &event) {
 		break;
 	}
 	warning("scene->display() called with two parameters");
-	return scene->display(action);
+	return scene->display(action, event);
 }
 
 bool Scene3175::Actor1::startAction(CursorType action, Event &event) {
-- 
cgit v1.2.3


From 109ba212c6cc62ec4a2f2a664a957e66b383f44d Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 9 Oct 2011 12:47:47 +0200
Subject: SCUMM: Add initial support for AppleII sound player

---
 engines/scumm/player_appleII.cpp | 364 +++++++++++++++++++++++++++++++++++++++
 engines/scumm/player_appleII.h   | 167 ++++++++++++++++++
 engines/scumm/scumm.cpp          |   3 +-
 3 files changed, 533 insertions(+), 1 deletion(-)
 create mode 100644 engines/scumm/player_appleII.cpp
 create mode 100644 engines/scumm/player_appleII.h

(limited to 'engines')

diff --git a/engines/scumm/player_appleII.cpp b/engines/scumm/player_appleII.cpp
new file mode 100644
index 0000000000..c5f60cd700
--- /dev/null
+++ b/engines/scumm/player_appleII.cpp
@@ -0,0 +1,364 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 <assert.h>
+#include "engines/engine.h"
+#include "scumm/player_appleII.h"
+#include "scumm/scumm.h"
+
+// CPU_CLOCK according to AppleWin
+static const double CPU_CLOCK = 1020484.5; // ~ 1.02 MHz
+
+namespace Scumm {
+
+Player_AppleII::Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer) {
+	_speakerState = 0;
+	_soundNr = 0;
+
+	_mixer = mixer;
+	_sampleRate = _mixer->getOutputRate();
+	_vm = scumm;
+
+	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+}
+
+Player_AppleII::~Player_AppleII() {
+	_mixer->stopHandle(_soundHandle);
+}
+
+/*
+void logSounds() {
+	for (nr = 1; nr < 70; ++nr) {
+		switch (nr) {
+		// non-existing or invalid
+		case 3: case 4: case 5:  case 49: case 51: case 68:
+			continue;
+		}
+
+		byte *data = _vm->getResourceAddress(rtSound, nr);
+		if (data) {
+			size_t size = (data[1] << 8) | data[0];
+
+			std::stringstream s;
+			s << "d:/msound/sound" << nr << ".snd";
+			FILE *f = fopen(s.str().c_str(), "wb");
+			fwrite(data, 1, size, f);
+			fclose(f);
+			printf("sound: %d\n", nr);
+		}
+	}
+}
+*/
+
+void Player_AppleII::startSound(int nr) {
+	Common::StackLock lock(_mutex);
+
+	_soundNr = nr;
+	_buffer.clear();
+
+	byte *data = _vm->getResourceAddress(rtSound, nr);
+	assert(data);
+
+	byte *ptr1 = data + 4;
+
+	int type = ptr1[0];
+	if (type == 0)
+		return;
+	int loop = ptr1[1];
+	assert(loop > 0);
+	ptr1 += 2;
+
+	debug(4, "startSound %d: type %d, loop %d",
+		  nr, type, loop);
+	
+	do {
+		switch (type) {
+			case 1: // freq up/down
+				soundFunc1(ptr1);
+				break;
+			case 2: // symmetric wave (~)
+				soundFunc2(ptr1);
+				break;
+			case 3: // asymmetric wave (__-)
+				soundFunc3(ptr1);
+				break;
+			case 4: // polyphone (2 voices)
+				soundFunc4(ptr1);
+				break;
+			case 5:	// periodic noise
+				soundFunc5(ptr1);
+				break;
+		}
+		--loop;
+	} while (loop > 0);
+}
+
+void Player_AppleII::stopAllSounds() {
+	Common::StackLock lock(_mutex);
+	_buffer.clear();
+}
+
+void Player_AppleII::stopSound(int nr) {
+	Common::StackLock lock(_mutex);
+	if (_soundNr == nr) {
+		_buffer.clear();
+	}
+}
+
+int Player_AppleII::getSoundStatus(int nr) const {
+	Common::StackLock lock(_mutex);
+	return (_buffer.availableSize() > 0 ? 1 : 0);
+}
+
+int Player_AppleII::getMusicTimer() {
+	/* Apple-II sounds are synchronous -> no music timer */
+	return 0;
+}
+
+int Player_AppleII::readBuffer(int16 *buffer, const int numSamples) {
+	Common::StackLock lock(_mutex);
+	return _buffer.read((byte*)buffer, numSamples * 2) / 2;
+}
+
+/************************************
+ * Apple-II sound-resource parser
+ ************************************/
+
+// toggle speaker on/off
+void Player_AppleII::speakerToggle() {
+	_speakerState ^= 0x1; 
+}
+
+void Player_AppleII::generateSamples(int cycles) {
+	// sampleDiff is used to compensate fractional samples
+	static double sampleDiff = 0;
+	double fSamples = (double)cycles / CPU_CLOCK * _sampleRate + sampleDiff;
+	int samples = (int)(fSamples + 0.5);
+	sampleDiff = fSamples - samples;
+
+	float vol = (float)_maxvol / 255;
+	int16 value = vol * (_speakerState ? 32767 :  -32767);
+	for (int i = 0; i < samples; ++i)
+		_buffer.write(&value, sizeof(value));
+}
+
+void Player_AppleII::wait(int interval, int count /*y*/) {
+	assert(count > 0); // 0 == 256? 
+	assert(interval > 0); // 0 == 256? 
+	generateSamples(11 + count*(8 + 5 * interval));
+}
+
+void Player_AppleII::_soundFunc1(int interval /*a*/, int count /*y*/) { // D076
+	assert(interval > 0); // 0 == 256? 
+	assert(count > 0); // 0 == 256? 
+
+	for (; count >= 0; --count) {
+		speakerToggle();
+		generateSamples(17 + 5 * interval);
+	}
+}
+
+void Player_AppleII::soundFunc1(const byte *params) { // D085
+	int delta = params[0];
+	int count = params[1];
+	byte interval = params[2]; // must be byte ("interval < delta" possible)
+	int limit = params[3];
+	bool decInterval = (params[4] >= 0x40);
+
+	if (decInterval) {
+		do {
+			_soundFunc1(interval, count);
+			interval -= delta;
+		} while (interval >= limit);
+	} else {
+		do {
+			_soundFunc1(interval, count);
+			interval += delta;
+		} while (interval < limit);
+	}
+}
+
+void Player_AppleII::_soundFunc2(int interval /*a*/, int count) { // D0EF
+	if (interval == 0xFE) {
+		wait(interval, 10);
+	} else {
+		assert(count > 0); // 0 == 256?
+		assert(interval > 0); // 0 == 256?
+
+		int a = (interval >> 3) + count;
+		for (int y = a; y > 0; --y) { 
+			generateSamples(1292 - 5*interval);
+			speakerToggle();
+
+			generateSamples(1287 - 5*interval);
+			speakerToggle();
+		}
+	}
+}
+
+void Player_AppleII::soundFunc2(const byte *params) { // D0D6
+	for (int pos = 1; pos < 256; ++pos) {
+		byte interval = params[pos];
+		if (interval == 0xFF)
+			return;
+		_soundFunc2(interval, params[0] /*, LD12F=interval*/);
+	}
+}
+
+void Player_AppleII::_soundFunc3(int interval /*a*/, int count /*LD12D*/) { // D14B
+	if (interval == 0xFE) {
+		wait(interval, 70);
+	} else {
+		assert(interval > 0); // 0 == 256?
+		assert(count > 0); // 0 == 256?
+
+		for (int y = count; y > 0; --y) {
+			generateSamples(1289 - 5*interval);
+			speakerToggle();
+		}
+	}
+}
+
+void Player_AppleII::soundFunc3(const byte *params) { // D132
+	for (int pos = 1; pos < 256; ++pos) {
+		byte interval = params[pos];
+		if (interval == 0xFF)
+			return;
+		_soundFunc3(interval, params[0]);
+	}
+}
+
+void Player_AppleII::_soundFunc4(byte param0, byte param1, byte param2) { // D1A2
+	uint16 count = (-param2 << 8) | 0x3;
+	byte bitmask1 = 0x3;
+	byte bitmask2 = 0x3;
+	
+	byte updateInterval2 = param0;
+	if (updateInterval2 == 0)
+		bitmask2 = 0x0;
+
+	byte updateInterval1 = param1;
+	if (updateInterval1 == 0) {
+		bitmask1 = 0x0;
+		if (bitmask2 != 0) {
+			bitmask1 = bitmask2;
+			bitmask2 = 0;
+			updateInterval1 = updateInterval2;
+		}
+	}
+
+	byte speakerShiftReg = 0;
+	static byte updateRemain1 = 80;
+	static byte updateRemain2 = 10;
+
+	while (true) {
+		--updateRemain1;
+		if (updateRemain1 == 0) {
+			updateRemain1 = updateInterval1;
+			speakerShiftReg ^= bitmask1;
+		}
+
+		--updateRemain2;
+		if (updateRemain2 == 0) {
+			updateRemain2 = updateInterval2;
+			if (updateRemain1 != 0) {
+				speakerShiftReg ^= bitmask2;		
+			}
+		}
+
+		if (speakerShiftReg & 0x1)
+			speakerToggle();
+		speakerShiftReg >>= 1;
+		generateSamples(40);
+
+		++count;
+		if (count == 0) {
+			return;
+		}
+	}
+}
+
+void Player_AppleII::soundFunc4(const byte *params) { // D170
+	while (params[0] != 0x01) {
+		_soundFunc4(params[0], params[1], params[2]);
+		params += 3;
+	}
+}
+
+void Player_AppleII::_soundFunc5(int interval /*a*/, int count) { // D270
+	assert(count > 0); // 0 == 256?
+	if (interval == 0)
+		interval = 256;
+
+	for (int i = count; i > 0; --i) {
+		generateSamples(10 + 5*interval);
+		speakerToggle();
+		
+		generateSamples(5 + 5*interval);
+		speakerToggle();
+	}
+}
+
+// LD000[loc] ^ LD00A[loc]
+static const byte noiseTable[256] = {
+	0x65, 0x1b, 0xda, 0x11, 0x61, 0xe5, 0x77, 0x57, 0x92, 0xc8, 0x51, 0x1c, 0xd4, 0x91, 0x62, 0x63, 
+	0x00, 0x38, 0x57, 0xd5, 0x18, 0xd8, 0xdc, 0x40, 0x03, 0x86, 0xd3, 0x2f, 0x10, 0x11, 0xd8, 0x3c, 
+	0xbe, 0x00, 0x19, 0xc5, 0xd2, 0xc3, 0xca, 0x34, 0x00, 0x28, 0xbf, 0xb9, 0x18, 0x20, 0x01, 0xcc, 
+	0xda, 0x08, 0xbc, 0x75, 0x7c, 0xb0, 0x8d, 0xe0, 0x09, 0x18, 0xbf, 0x5d, 0xe9, 0x8c, 0x75, 0x64, 
+	0xe5, 0xb5, 0x5d, 0xe0, 0xb7, 0x7d, 0xe9, 0x8c, 0x55, 0x65, 0xc5, 0xb5, 0x5d, 0xd8, 0x09, 0x0d,
+	0x64, 0xf0, 0xf0, 0x08, 0x63, 0x03, 0x00, 0x55, 0x35, 0xc0, 0x00, 0x20, 0x74, 0xa5, 0x1e, 0xe3, 
+	0x00, 0x06, 0x3c, 0x52, 0xd1, 0x70, 0xd0, 0x57, 0x02, 0xf0, 0x00, 0xb6, 0xfc, 0x02, 0x11, 0x9a, 
+	0x3b, 0xc8, 0x38, 0xdf, 0x1a, 0xb0, 0xd1, 0xb8, 0xd0, 0x18, 0x8a, 0x4a, 0xea, 0x1b, 0x12, 0x5d, 
+	0x29, 0x58, 0xd8, 0x43, 0xb8, 0x2d, 0xd2, 0x61, 0x10, 0x3c, 0x0c, 0x5d, 0x1b, 0x61, 0x10, 0x3c, 
+	0x0a, 0x5d, 0x1d, 0x61, 0x10, 0x3c, 0x0b, 0x19, 0x88, 0x21, 0xc0, 0x21, 0x07, 0x00, 0x65, 0x62,
+	0x08, 0xe9, 0x36, 0x40, 0x20, 0x41, 0x06, 0x00, 0x20, 0x00, 0x00, 0xed, 0xa3, 0x00, 0x88, 0x06, 
+	0x98, 0x01, 0x5d, 0x7f, 0x02, 0x1d, 0x78, 0x03, 0x60, 0xcb, 0x3a, 0x01, 0xbd, 0x78, 0x02, 0x5d, 
+	0x7e, 0x03, 0x1d, 0xf5, 0xa6, 0x40, 0x81, 0xb4, 0xd0, 0x8d, 0xd3, 0xd0, 0x6d, 0xd5, 0x61, 0x48, 
+	0x61, 0x4d, 0xd1, 0xc8, 0xb1, 0xd8, 0x69, 0xff, 0x61, 0xd9, 0xed, 0xa0, 0xfe, 0x19, 0x91, 0x37, 
+	0x19, 0x37, 0x00, 0xf1, 0x00, 0x01, 0x1f, 0x00, 0xad, 0xc1, 0x01, 0x01, 0x2e, 0x00, 0x40, 0xc6,
+	0x7a, 0x9b, 0x95, 0x43, 0xfc, 0x18, 0xd2, 0x9e, 0x2a, 0x5a, 0x4b, 0x2a, 0xb6, 0x87, 0x30, 0x6c
+};
+
+byte /*a*/ Player_AppleII::noise() { // D261
+	static int pos = 0; // initial value?
+	byte result = noiseTable[pos];
+	pos = (pos + 1) % 256;
+	return result;
+}
+
+void Player_AppleII::soundFunc5(const byte *params) { // D222
+	const byte noiseMask[] = {
+		0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF, 0xFF, 0xFF, 0x0F, 0x0F
+	};
+
+	int param0 = params[0];
+	assert(param0 > 0);
+	for (int i = 0; i < 10; ++i) {
+		int count = param0;
+		do {
+			_soundFunc5(noise() & noiseMask[i], 1);
+			--count;
+		} while (count > 0);
+	}
+}
+
+} // End of namespace Scumm
diff --git a/engines/scumm/player_appleII.h b/engines/scumm/player_appleII.h
new file mode 100644
index 0000000000..545e590fdd
--- /dev/null
+++ b/engines/scumm/player_appleII.h
@@ -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.
+ *
+ */
+
+#ifndef SCUMM_PLAYER_APPLEII_H
+#define SCUMM_PLAYER_APPLEII_H
+
+#include "common/mutex.h"
+#include "common/scummsys.h"
+#include "common/memstream.h"
+#include "scumm/music.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/softsynth/sid.h"
+
+namespace Scumm {
+
+class ScummEngine;
+
+class DynamicMemoryStream {
+public:
+	DynamicMemoryStream() : _data(0) {
+		clear();
+	}
+
+	~DynamicMemoryStream() {
+		free(_data);
+	}
+
+	void clear() {
+		free(_data);
+		_data = 0;
+		_capacity = 0;
+		_size = 0;
+		_ptr = 0;
+		_pos = 0;
+		_readPos = 0;
+	}
+
+	void ensureCapacity(uint32 new_len) {
+		if (new_len <= _capacity)
+			return;
+
+		byte *old_data = _data;
+
+		_capacity *= 2;
+		if (_capacity < new_len + 2048)
+			_capacity = new_len + 2048;
+		_data = (byte *)malloc(_capacity);
+		_ptr = _data + _pos;
+
+		if (old_data) {
+			// Copy old data
+			memcpy(_data, old_data, _size);
+			free(old_data);
+		}
+
+		_size = new_len;
+	}
+
+	uint32 availableSize() const {
+		if (_readPos >= _size)
+			return 0;
+		return _size - _readPos;
+	}
+
+	virtual uint32 write(const void *dataPtr, uint32 dataSize) {
+		ensureCapacity(_pos + dataSize);
+		memcpy(_ptr, dataPtr, dataSize);
+		_ptr += dataSize;
+		_pos += dataSize;
+		if (_pos > _size)
+			_size = _pos;
+		return dataSize;
+	}
+
+	uint32 read(byte *dataPtr, uint32 dataSize) const {
+		uint32 avail = availableSize();
+		if (avail == 0)
+			return 0;
+		if (dataSize > avail)
+			dataSize = avail;
+		memcpy(dataPtr, _data + _readPos, dataSize);
+		_readPos += dataSize;
+		return dataSize;
+	}
+
+private:
+	mutable uint32 _readPos;
+	uint32 _capacity;
+	uint32 _size;
+	byte *_ptr;
+	byte *_data;
+	uint32 _pos;
+};
+
+class Player_AppleII : public Audio::AudioStream, public MusicEngine {
+public:
+	Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer);
+	virtual ~Player_AppleII();
+
+	virtual void setMusicVolume(int vol) { _maxvol = vol; }
+	void startMusic(int songResIndex);
+	virtual void startSound(int sound);
+	virtual void stopSound(int sound);
+	virtual void stopAllSounds();
+	virtual int  getSoundStatus(int sound) const;
+	virtual int  getMusicTimer();
+
+	// AudioStream API
+	int readBuffer(int16 *buffer, const int numSamples);
+	bool isStereo() const { return false; }
+	bool endOfData() const { return false; }
+	int getRate() const { return _sampleRate; }
+
+private:
+	ScummEngine *_vm;
+	Audio::Mixer *_mixer;
+	Audio::SoundHandle _soundHandle;
+	int _maxvol;
+	int _sampleRate;
+	Common::Mutex _mutex;
+
+private:
+	byte _speakerState;
+	DynamicMemoryStream _buffer;
+	int _soundNr;
+
+private:
+	void speakerToggle();
+	void generateSamples(int cycles);
+	void wait(int interval, int count);
+	byte noise();
+
+	void soundFunc1(const byte *params);
+	void _soundFunc1(int interval, int count);
+	void soundFunc2(const byte *params);
+	void _soundFunc2(int interval, int count);
+	void soundFunc3(const byte *params);
+	void _soundFunc3(int interval, int count);
+	void soundFunc4(const byte *params);
+	void _soundFunc4(byte param0, byte param1, byte param2);
+	void soundFunc5(const byte *params);
+	void _soundFunc5(int interval, int count);
+};
+
+} // End of namespace Scumm
+
+#endif
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index f94496b14b..3eea68fbbe 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -55,6 +55,7 @@
 #include "scumm/player_nes.h"
 #include "scumm/player_sid.h"
 #include "scumm/player_pce.h"
+#include "scumm/player_appleII.h"
 #include "scumm/player_v1.h"
 #include "scumm/player_v2.h"
 #include "scumm/player_v2cms.h"
@@ -1797,7 +1798,7 @@ void ScummEngine::setupMusic(int midi) {
 	if (_game.version >= 7) {
 		// Setup for digital iMuse is performed in another place
 	} else if (_game.platform == Common::kPlatformApple2GS && _game.version == 0){
-		// TODO: Add support for music format
+		_musicEngine = new Player_AppleII(this, _mixer);
 	} else if (_game.platform == Common::kPlatformC64 && _game.version <= 1) {
 #ifndef DISABLE_SID
 		_musicEngine = new Player_SID(this, _mixer);
-- 
cgit v1.2.3


From e56d5df295de63ed991bf9682f1c78e3ab92f351 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Mon, 19 Dec 2011 17:03:10 +0100
Subject: SCUMM: Fix error in player_appleII when both voices are triggered at
 the same time

---
 engines/scumm/player_appleII.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/player_appleII.cpp b/engines/scumm/player_appleII.cpp
index c5f60cd700..b83bb22871 100644
--- a/engines/scumm/player_appleII.cpp
+++ b/engines/scumm/player_appleII.cpp
@@ -272,19 +272,21 @@ void Player_AppleII::_soundFunc4(byte param0, byte param1, byte param2) { // D1A
 
 	while (true) {
 		--updateRemain1;
-		if (updateRemain1 == 0) {
-			updateRemain1 = updateInterval1;
-			speakerShiftReg ^= bitmask1;
-		}
-
 		--updateRemain2;
+
 		if (updateRemain2 == 0) {
 			updateRemain2 = updateInterval2;
+			// use only first voice's data (bitmask1) if both voices are triggered 
 			if (updateRemain1 != 0) {
 				speakerShiftReg ^= bitmask2;		
 			}
 		}
 
+		if (updateRemain1 == 0) {
+			updateRemain1 = updateInterval1;
+			speakerShiftReg ^= bitmask1;
+		}
+
 		if (speakerShiftReg & 0x1)
 			speakerToggle();
 		speakerShiftReg >>= 1;
-- 
cgit v1.2.3


From 8b7ad559c18df51deb7682ad728244fde22dc70a Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 20 Nov 2011 20:52:28 +0100
Subject: SCUMM: Aggregate speaker states of CPU cycles in between samples

- formerly only two sample levels were possible: 32767 or -32767. Now the
  speaker states (0/1) between two samples are aggregated by the new
  SampleConverter class to allow more accurate sample values between -32767
  and 32767.
- the player's state is moved into a separate state struct
---
 engines/scumm/player_appleII.cpp |  90 +++++++++++++++------------------
 engines/scumm/player_appleII.h   | 106 ++++++++++++++++++++++++++++++++++++---
 2 files changed, 139 insertions(+), 57 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/player_appleII.cpp b/engines/scumm/player_appleII.cpp
index b83bb22871..0c34c906a6 100644
--- a/engines/scumm/player_appleII.cpp
+++ b/engines/scumm/player_appleII.cpp
@@ -25,9 +25,6 @@
 #include "scumm/player_appleII.h"
 #include "scumm/scumm.h"
 
-// CPU_CLOCK according to AppleWin
-static const double CPU_CLOCK = 1020484.5; // ~ 1.02 MHz
-
 namespace Scumm {
 
 Player_AppleII::Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer) {
@@ -35,9 +32,10 @@ Player_AppleII::Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer) {
 	_soundNr = 0;
 
 	_mixer = mixer;
-	_sampleRate = _mixer->getOutputRate();
 	_vm = scumm;
 
+	setSampleRate(_mixer->getOutputRate());
+
 	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
 }
 
@@ -73,60 +71,62 @@ void Player_AppleII::startSound(int nr) {
 	Common::StackLock lock(_mutex);
 
 	_soundNr = nr;
-	_buffer.clear();
+	_sampleConverter.reset();
 
 	byte *data = _vm->getResourceAddress(rtSound, nr);
 	assert(data);
 
 	byte *ptr1 = data + 4;
 
-	int type = ptr1[0];
-	if (type == 0)
+	_state.type = ptr1[0];
+	if (_state.type == 0)
 		return;
-	int loop = ptr1[1];
-	assert(loop > 0);
-	ptr1 += 2;
+	
+	_state.loop = ptr1[1];
+	assert(_state.loop > 0);
+
+	_state.params = &ptr1[2];
 
 	debug(4, "startSound %d: type %d, loop %d",
-		  nr, type, loop);
+		  nr, _state.type, _state.loop);
 	
 	do {
-		switch (type) {
+		switch (_state.type) {
 			case 1: // freq up/down
-				soundFunc1(ptr1);
+				soundFunc1();
 				break;
 			case 2: // symmetric wave (~)
-				soundFunc2(ptr1);
+				soundFunc2();
 				break;
 			case 3: // asymmetric wave (__-)
-				soundFunc3(ptr1);
+				soundFunc3();
 				break;
 			case 4: // polyphone (2 voices)
-				soundFunc4(ptr1);
+				soundFunc4();
 				break;
 			case 5:	// periodic noise
-				soundFunc5(ptr1);
+				soundFunc5();
 				break;
 		}
-		--loop;
-	} while (loop > 0);
+		--_state.loop;
+	} while (_state.loop > 0);
 }
 
 void Player_AppleII::stopAllSounds() {
 	Common::StackLock lock(_mutex);
-	_buffer.clear();
+	_sampleConverter.reset();
 }
 
 void Player_AppleII::stopSound(int nr) {
 	Common::StackLock lock(_mutex);
 	if (_soundNr == nr) {
-		_buffer.clear();
+		_sampleConverter.reset();
 	}
 }
 
 int Player_AppleII::getSoundStatus(int nr) const {
 	Common::StackLock lock(_mutex);
-	return (_buffer.availableSize() > 0 ? 1 : 0);
+	return (_sampleConverter.availableSize() > 0 ? 1 : 0);
 }
 
 int Player_AppleII::getMusicTimer() {
@@ -136,7 +136,7 @@ int Player_AppleII::getMusicTimer() {
 
 int Player_AppleII::readBuffer(int16 *buffer, const int numSamples) {
 	Common::StackLock lock(_mutex);
-	return _buffer.read((byte*)buffer, numSamples * 2) / 2;
+	return _sampleConverter.readSamples(buffer, numSamples);
 }
 
 /************************************
@@ -149,16 +149,7 @@ void Player_AppleII::speakerToggle() {
 }
 
 void Player_AppleII::generateSamples(int cycles) {
-	// sampleDiff is used to compensate fractional samples
-	static double sampleDiff = 0;
-	double fSamples = (double)cycles / CPU_CLOCK * _sampleRate + sampleDiff;
-	int samples = (int)(fSamples + 0.5);
-	sampleDiff = fSamples - samples;
-
-	float vol = (float)_maxvol / 255;
-	int16 value = vol * (_speakerState ? 32767 :  -32767);
-	for (int i = 0; i < samples; ++i)
-		_buffer.write(&value, sizeof(value));
+	_sampleConverter.addCycles(_speakerState, cycles);
 }
 
 void Player_AppleII::wait(int interval, int count /*y*/) {
@@ -177,12 +168,12 @@ void Player_AppleII::_soundFunc1(int interval /*a*/, int count /*y*/) { // D076
 	}
 }
 
-void Player_AppleII::soundFunc1(const byte *params) { // D085
-	int delta = params[0];
-	int count = params[1];
-	byte interval = params[2]; // must be byte ("interval < delta" possible)
-	int limit = params[3];
-	bool decInterval = (params[4] >= 0x40);
+void Player_AppleII::soundFunc1() { // D085
+	const int delta = _state.params[0];
+	const int count = _state.params[1];
+	byte interval = _state.params[2]; // must be byte ("interval < delta" possible)
+	const int limit = _state.params[3];
+	const bool decInterval = (_state.params[4] >= 0x40);
 
 	if (decInterval) {
 		do {
@@ -215,12 +206,12 @@ void Player_AppleII::_soundFunc2(int interval /*a*/, int count) { // D0EF
 	}
 }
 
-void Player_AppleII::soundFunc2(const byte *params) { // D0D6
+void Player_AppleII::soundFunc2() { // D0D6
 	for (int pos = 1; pos < 256; ++pos) {
-		byte interval = params[pos];
+		byte interval = _state.params[pos];
 		if (interval == 0xFF)
 			return;
-		_soundFunc2(interval, params[0] /*, LD12F=interval*/);
+		_soundFunc2(interval, _state.params[0] /*, LD12F=interval*/);
 	}
 }
 
@@ -238,12 +229,12 @@ void Player_AppleII::_soundFunc3(int interval /*a*/, int count /*LD12D*/) { // D
 	}
 }
 
-void Player_AppleII::soundFunc3(const byte *params) { // D132
+void Player_AppleII::soundFunc3() { // D132
 	for (int pos = 1; pos < 256; ++pos) {
-		byte interval = params[pos];
+		byte interval = _state.params[pos];
 		if (interval == 0xFF)
 			return;
-		_soundFunc3(interval, params[0]);
+		_soundFunc3(interval, _state.params[0]);
 	}
 }
 
@@ -290,7 +281,7 @@ void Player_AppleII::_soundFunc4(byte param0, byte param1, byte param2) { // D1A
 		if (speakerShiftReg & 0x1)
 			speakerToggle();
 		speakerShiftReg >>= 1;
-		generateSamples(40);
+		generateSamples(42); /* actually 42.5 */
 
 		++count;
 		if (count == 0) {
@@ -299,7 +290,8 @@ void Player_AppleII::_soundFunc4(byte param0, byte param1, byte param2) { // D1A
 	}
 }
 
-void Player_AppleII::soundFunc4(const byte *params) { // D170
+void Player_AppleII::soundFunc4() { // D170
+	const byte *params = _state.params;
 	while (params[0] != 0x01) {
 		_soundFunc4(params[0], params[1], params[2]);
 		params += 3;
@@ -347,12 +339,12 @@ byte /*a*/ Player_AppleII::noise() { // D261
 	return result;
 }
 
-void Player_AppleII::soundFunc5(const byte *params) { // D222
+void Player_AppleII::soundFunc5() { // D222
 	const byte noiseMask[] = {
 		0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF, 0xFF, 0xFF, 0x0F, 0x0F
 	};
 
-	int param0 = params[0];
+	int param0 = _state.params[0];
 	assert(param0 > 0);
 	for (int i = 0; i < 10; ++i) {
 		int count = param0;
diff --git a/engines/scumm/player_appleII.h b/engines/scumm/player_appleII.h
index 545e590fdd..18572200c2 100644
--- a/engines/scumm/player_appleII.h
+++ b/engines/scumm/player_appleII.h
@@ -112,12 +112,97 @@ private:
 	uint32 _pos;
 };
 
+// CPU_CLOCK according to AppleWin
+static const double CPU_CLOCK = 1020484.5; // ~ 1.02 MHz
+
+class SampleConverter {
+private:
+	void newSample(int sample) {
+		int16 value = _volume * sample / 255;
+		_buffer.write(&value, sizeof(value));
+	}
+
+public:
+	SampleConverter() : 
+		_cyclesPerSample(0),
+		_missingCycles(0),
+		_sampleCyclesSum(0),
+		_volume(255)
+	{}
+
+	void reset() {
+		_missingCycles = 0;
+		_sampleCyclesSum = 0;
+		_buffer.clear();	
+	}
+
+	uint32 availableSize() const {
+		return _buffer.availableSize();
+	}
+
+	void setMusicVolume(int vol) {
+		assert(vol >= 0 && vol <= 255);
+		_volume = vol;
+	}
+
+	void setSampleRate(int rate) {
+		_cyclesPerSample = CPU_CLOCK / (float)rate;
+		reset();
+	}
+
+	void addCycles(byte level, int cycles) {
+		// step 1: if cycles are left from the last call, process them first
+		if (_missingCycles > 0) {
+			int n = (_missingCycles < cycles) ? _missingCycles : cycles;
+			if (level)
+				_sampleCyclesSum += n;
+			cycles -= n;
+			_missingCycles -= n;
+			if (_missingCycles == 0) {
+				newSample(2*32767 * _sampleCyclesSum / _cyclesPerSample - 32767);
+			} else {
+				return;
+			}
+		}
+
+		_sampleCyclesSum = 0;
+
+		// step 2: process blocks of cycles fitting into a whole sample
+		while (cycles >= _cyclesPerSample) {
+			newSample(level ? 32767 : -32767);
+			cycles -= _cyclesPerSample;
+		}
+
+		// step 3: remember cycles left for next call
+		if (cycles > 0) {
+			_missingCycles = _cyclesPerSample - cycles;
+			if (level)
+				_sampleCyclesSum = cycles;
+		}
+	}
+
+	uint32 readSamples(void *buffer, int numSamples) {
+		return _buffer.read((byte*)buffer, numSamples * 2) / 2;
+	}
+
+private:
+	float _cyclesPerSample;
+	int _missingCycles;
+	int _sampleCyclesSum;
+	int _volume; /* 0 - 255 */
+	DynamicMemoryStream _buffer;
+};
+
 class Player_AppleII : public Audio::AudioStream, public MusicEngine {
 public:
 	Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer);
 	virtual ~Player_AppleII();
 
-	virtual void setMusicVolume(int vol) { _maxvol = vol; }
+	virtual void setMusicVolume(int vol) { _sampleConverter.setMusicVolume(vol); }
+	void setSampleRate(int rate) {
+		_sampleRate = rate;
+		_sampleConverter.setSampleRate(rate); 
+	}
 	void startMusic(int songResIndex);
 	virtual void startSound(int sound);
 	virtual void stopSound(int sound);
@@ -132,17 +217,22 @@ public:
 	int getRate() const { return _sampleRate; }
 
 private:
+	struct state_t {
+		int type;
+		int loop;
+		const byte *params;
+	} _state;
+
 	ScummEngine *_vm;
 	Audio::Mixer *_mixer;
 	Audio::SoundHandle _soundHandle;
-	int _maxvol;
 	int _sampleRate;
 	Common::Mutex _mutex;
 
 private:
 	byte _speakerState;
-	DynamicMemoryStream _buffer;
 	int _soundNr;
+	SampleConverter _sampleConverter;
 
 private:
 	void speakerToggle();
@@ -150,15 +240,15 @@ private:
 	void wait(int interval, int count);
 	byte noise();
 
-	void soundFunc1(const byte *params);
+	void soundFunc1();
 	void _soundFunc1(int interval, int count);
-	void soundFunc2(const byte *params);
+	void soundFunc2();
 	void _soundFunc2(int interval, int count);
-	void soundFunc3(const byte *params);
+	void soundFunc3();
 	void _soundFunc3(int interval, int count);
-	void soundFunc4(const byte *params);
+	void soundFunc4();
 	void _soundFunc4(byte param0, byte param1, byte param2);
-	void soundFunc5(const byte *params);
+	void soundFunc5();
 	void _soundFunc5(int interval, int count);
 };
 
-- 
cgit v1.2.3


From 375047b72969fb4560cb7269134d586ff3baff31 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 20 Nov 2011 21:10:59 +0100
Subject: SCUMM: Increase precision of player_appleII

Use fixed precision instead of integral numbers for sample conversion
---
 engines/scumm/player_appleII.h | 84 +++++++++++++++++++++++++++---------------
 1 file changed, 54 insertions(+), 30 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/player_appleII.h b/engines/scumm/player_appleII.h
index 18572200c2..7cc02b1f01 100644
--- a/engines/scumm/player_appleII.h
+++ b/engines/scumm/player_appleII.h
@@ -113,26 +113,28 @@ private:
 };
 
 // CPU_CLOCK according to AppleWin
-static const double CPU_CLOCK = 1020484.5; // ~ 1.02 MHz
+static const double APPLEII_CPU_CLOCK = 1020484.5; // ~ 1.02 MHz
 
 class SampleConverter {
 private:
-	void newSample(int sample) {
-		int16 value = _volume * sample / 255;
+	void addSampleToBuffer(int sample) {
+		int16 value = sample * _volume / _maxVolume;
 		_buffer.write(&value, sizeof(value));
 	}
 
 public:
 	SampleConverter() : 
-		_cyclesPerSample(0),
-		_missingCycles(0),
-		_sampleCyclesSum(0),
-		_volume(255)
+		_cyclesPerSampleFP(0),
+		_missingCyclesFP(0),
+		_sampleCyclesSumFP(0),
+		_volume(_maxVolume)
 	{}
 
+	~SampleConverter() {}
+
 	void reset() {
-		_missingCycles = 0;
-		_sampleCyclesSum = 0;
+		_missingCyclesFP = 0;
+		_sampleCyclesSumFP = 0;
 		_buffer.clear();	
 	}
 
@@ -141,43 +143,47 @@ public:
 	}
 
 	void setMusicVolume(int vol) {
-		assert(vol >= 0 && vol <= 255);
+		assert(vol >= 0 && vol <= _maxVolume);
 		_volume = vol;
 	}
 
 	void setSampleRate(int rate) {
-		_cyclesPerSample = CPU_CLOCK / (float)rate;
+		/* ~46 CPU cycles per sample @ 22.05kHz */
+		_cyclesPerSampleFP = APPLEII_CPU_CLOCK * (1 << PREC_SHIFT) / rate;
 		reset();
 	}
 
-	void addCycles(byte level, int cycles) {
+	void addCycles(byte level, const int cycles) {
+		/* convert to fixed precision floats */
+		int cyclesFP = cycles << PREC_SHIFT;
+
 		// step 1: if cycles are left from the last call, process them first
-		if (_missingCycles > 0) {
-			int n = (_missingCycles < cycles) ? _missingCycles : cycles;
+		if (_missingCyclesFP > 0) {
+			int n = (_missingCyclesFP < cyclesFP) ? _missingCyclesFP : cyclesFP;
 			if (level)
-				_sampleCyclesSum += n;
-			cycles -= n;
-			_missingCycles -= n;
-			if (_missingCycles == 0) {
-				newSample(2*32767 * _sampleCyclesSum / _cyclesPerSample - 32767);
+				_sampleCyclesSumFP += n;
+			cyclesFP -= n;
+			_missingCyclesFP -= n;
+			if (_missingCyclesFP == 0) {
+				addSampleToBuffer(2*32767 * _sampleCyclesSumFP / _cyclesPerSampleFP - 32767);
 			} else {
 				return;
 			}
 		}
 
-		_sampleCyclesSum = 0;
+		_sampleCyclesSumFP = 0;
 
 		// step 2: process blocks of cycles fitting into a whole sample
-		while (cycles >= _cyclesPerSample) {
-			newSample(level ? 32767 : -32767);
-			cycles -= _cyclesPerSample;
+		while (cyclesFP >= _cyclesPerSampleFP) {
+			addSampleToBuffer(level ? 32767 : -32767);
+			cyclesFP -= _cyclesPerSampleFP;
 		}
 
 		// step 3: remember cycles left for next call
-		if (cycles > 0) {
-			_missingCycles = _cyclesPerSample - cycles;
+		if (cyclesFP > 0) {
+			_missingCyclesFP = _cyclesPerSampleFP - cyclesFP;
 			if (level)
-				_sampleCyclesSum = cycles;
+				_sampleCyclesSumFP = cyclesFP;
 		}
 	}
 
@@ -185,11 +191,29 @@ public:
 		return _buffer.read((byte*)buffer, numSamples * 2) / 2;
 	}
 
+#if 0
+	void logToFile(Common::String fileName) {
+		FILE *f;
+		byte buffer[512];
+		int n;
+
+		f = fopen(fileName.c_str(), "wb");
+		while ((n = _buffer.read(buffer, 512)) != 0) {
+			fwrite(buffer, 1, n, f);
+		}
+		fclose(f);
+	}
+#endif
+
+private:
+	static const int PREC_SHIFT = 7;
+
 private:
-	float _cyclesPerSample;
-	int _missingCycles;
-	int _sampleCyclesSum;
-	int _volume; /* 0 - 255 */
+	int _cyclesPerSampleFP;   /* (fixed precision) */
+	int _missingCyclesFP;     /* (fixed precision) */
+	int _sampleCyclesSumFP;   /* (fixed precision) */
+	int _volume; /* 0 - 256 */
+	static const int _maxVolume = 256;
 	DynamicMemoryStream _buffer;
 };
 
-- 
cgit v1.2.3


From ffc88c5ceda344d5d5166ecbd712c6714e7af738 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 20 Dec 2011 08:33:11 +0100
Subject: SCUMM: Reduce sound buffer size for player_appleII

Sound generation functions are now called incrementally instead of just
once to generate the sound data. This reduces the max. buffer size
from 1.7MB to just ~100KB (piano, sound 50).
---
 engines/scumm/player_appleII.cpp | 199 ++++++++++++++++++++++++++++-----------
 engines/scumm/player_appleII.h   |  41 ++++++--
 2 files changed, 177 insertions(+), 63 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/player_appleII.cpp b/engines/scumm/player_appleII.cpp
index 0c34c906a6..a4111c5109 100644
--- a/engines/scumm/player_appleII.cpp
+++ b/engines/scumm/player_appleII.cpp
@@ -28,11 +28,10 @@
 namespace Scumm {
 
 Player_AppleII::Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer) {
-	_speakerState = 0;
-	_soundNr = 0;
-
 	_mixer = mixer;
 	_vm = scumm;
+	
+	resetState();
 
 	setSampleRate(_mixer->getOutputRate());
 
@@ -70,18 +69,23 @@ void logSounds() {
 void Player_AppleII::startSound(int nr) {
 	Common::StackLock lock(_mutex);
 
-	_soundNr = nr;
-	_sampleConverter.reset();
+	resetState();
 
 	byte *data = _vm->getResourceAddress(rtSound, nr);
 	assert(data);
-
 	byte *ptr1 = data + 4;
 
 	_state.type = ptr1[0];
-	if (_state.type == 0)
+	if (_state.type == 0) {
+		// nothing to play
+		resetState();
 		return;
-	
+	}
+
+	_state.soundNr = nr;
+	_state.finished = false;
+	initFuncState();
+
 	_state.loop = ptr1[1];
 	assert(_state.loop > 0);
 
@@ -89,44 +93,86 @@ void Player_AppleII::startSound(int nr) {
 
 	debug(4, "startSound %d: type %d, loop %d",
 		  nr, _state.type, _state.loop);
-	
-	do {
-		switch (_state.type) {
-			case 1: // freq up/down
-				soundFunc1();
-				break;
-			case 2: // symmetric wave (~)
-				soundFunc2();
-				break;
-			case 3: // asymmetric wave (__-)
-				soundFunc3();
-				break;
-			case 4: // polyphone (2 voices)
-				soundFunc4();
-				break;
-			case 5:	// periodic noise
-				soundFunc5();
-				break;
-		}
+}
+
+void Player_AppleII::initFuncState() {
+	switch (_state.type) {
+		case 2:	case 3:
+			_state.func23.pos = 1;
+			break;
+		case 4:
+			_state.func4.updateRemain1 = 80;
+			_state.func4.updateRemain2 = 10;
+			break;
+		case 5:
+			_state.func5.index = 0;
+			break;
+	}
+}
+
+bool Player_AppleII::updateSound() {
+	if (!_state.soundNr || _state.finished)
+		return false;
+
+	bool done = false;
+	switch (_state.type) {
+		case 1: // freq up/down
+			done = soundFunc1();
+			break;
+		case 2: // symmetric wave (~)
+			done = soundFunc2();
+			break;
+		case 3: // asymmetric wave (__-)
+			done = soundFunc3();
+			break;
+		case 4: // polyphone (2 voices)
+			done = soundFunc4();
+			break;
+		case 5:	// periodic noise
+			done = soundFunc5();
+			break;
+	}
+
+	if (done) {
 		--_state.loop;
-	} while (_state.loop > 0);
+		if (_state.loop <= 0) {
+			_state.finished = true;
+		} else {
+			// reset function state on each loop
+			initFuncState();
+		}
+	}
+
+	return true;
+}
+
+void Player_AppleII::resetState() {
+	_state.soundNr = 0;
+	_state.type = 0;
+	_state.loop = 0;
+	_state.params = NULL;
+	_state.localParams = NULL;
+	_state.speakerState = 0;
+	_state.finished = true;
+
+	_sampleConverter.reset();
 }
 
 void Player_AppleII::stopAllSounds() {
 	Common::StackLock lock(_mutex);
-	_sampleConverter.reset();
+	resetState();
 }
 
 void Player_AppleII::stopSound(int nr) {
 	Common::StackLock lock(_mutex);
-	if (_soundNr == nr) {
-		_sampleConverter.reset();
+	if (_state.soundNr == nr) {
+		resetState();
 	}
 }
 
 int Player_AppleII::getSoundStatus(int nr) const {
 	Common::StackLock lock(_mutex);
-	return (_sampleConverter.availableSize() > 0 ? 1 : 0);
+	return (_state.soundNr == nr);
 }
 
 int Player_AppleII::getMusicTimer() {
@@ -136,7 +182,22 @@ int Player_AppleII::getMusicTimer() {
 
 int Player_AppleII::readBuffer(int16 *buffer, const int numSamples) {
 	Common::StackLock lock(_mutex);
-	return _sampleConverter.readSamples(buffer, numSamples);
+
+	if (!_state.soundNr)
+		return 0;
+
+	int samplesLeft = numSamples;
+	do {
+		int nSamplesRead = _sampleConverter.readSamples(buffer, samplesLeft);
+		samplesLeft -= nSamplesRead;
+		buffer += nSamplesRead;
+	} while ((samplesLeft > 0) && updateSound());
+
+	// reset state if sound is played completely
+	if (_state.finished && (_sampleConverter.availableSize() == 0))
+		resetState();
+
+	return numSamples - samplesLeft;
 }
 
 /************************************
@@ -145,11 +206,11 @@ int Player_AppleII::readBuffer(int16 *buffer, const int numSamples) {
 
 // toggle speaker on/off
 void Player_AppleII::speakerToggle() {
-	_speakerState ^= 0x1; 
+	_state.speakerState ^= 0x1; 
 }
 
 void Player_AppleII::generateSamples(int cycles) {
-	_sampleConverter.addCycles(_speakerState, cycles);
+	_sampleConverter.addCycles(_state.speakerState, cycles);
 }
 
 void Player_AppleII::wait(int interval, int count /*y*/) {
@@ -168,7 +229,7 @@ void Player_AppleII::_soundFunc1(int interval /*a*/, int count /*y*/) { // D076
 	}
 }
 
-void Player_AppleII::soundFunc1() { // D085
+bool Player_AppleII::soundFunc1() { // D085
 	const int delta = _state.params[0];
 	const int count = _state.params[1];
 	byte interval = _state.params[2]; // must be byte ("interval < delta" possible)
@@ -186,6 +247,8 @@ void Player_AppleII::soundFunc1() { // D085
 			interval += delta;
 		} while (interval < limit);
 	}
+
+	return true;
 }
 
 void Player_AppleII::_soundFunc2(int interval /*a*/, int count) { // D0EF
@@ -206,13 +269,18 @@ void Player_AppleII::_soundFunc2(int interval /*a*/, int count) { // D0EF
 	}
 }
 
-void Player_AppleII::soundFunc2() { // D0D6
-	for (int pos = 1; pos < 256; ++pos) {
-		byte interval = _state.params[pos];
+bool Player_AppleII::soundFunc2() { // D0D6
+	// while (pos = 1; pos < 256; ++pos)
+	if (_state.func23.pos < 256) {
+		byte interval = _state.params[_state.func23.pos];
 		if (interval == 0xFF)
-			return;
+			return true;
 		_soundFunc2(interval, _state.params[0] /*, LD12F=interval*/);
-	}
+
+		++_state.func23.pos;
+		return false;
+	}	
+	return true;
 }
 
 void Player_AppleII::_soundFunc3(int interval /*a*/, int count /*LD12D*/) { // D14B
@@ -229,13 +297,18 @@ void Player_AppleII::_soundFunc3(int interval /*a*/, int count /*LD12D*/) { // D
 	}
 }
 
-void Player_AppleII::soundFunc3() { // D132
-	for (int pos = 1; pos < 256; ++pos) {
-		byte interval = _state.params[pos];
+bool Player_AppleII::soundFunc3() { // D132
+	// while (pos = 1; pos < 256; ++pos)
+	if (_state.func23.pos < 256) {
+		byte interval = _state.params[_state.func23.pos];
 		if (interval == 0xFF)
-			return;
+			return true;
 		_soundFunc3(interval, _state.params[0]);
+
+		++_state.func23.pos;
+		return false;
 	}
+	return true;
 }
 
 void Player_AppleII::_soundFunc4(byte param0, byte param1, byte param2) { // D1A2
@@ -258,8 +331,8 @@ void Player_AppleII::_soundFunc4(byte param0, byte param1, byte param2) { // D1A
 	}
 
 	byte speakerShiftReg = 0;
-	static byte updateRemain1 = 80;
-	static byte updateRemain2 = 10;
+	byte updateRemain1 = _state.func4.updateRemain1;
+	byte updateRemain2 = _state.func4.updateRemain2;
 
 	while (true) {
 		--updateRemain1;
@@ -285,17 +358,26 @@ void Player_AppleII::_soundFunc4(byte param0, byte param1, byte param2) { // D1A
 
 		++count;
 		if (count == 0) {
+			_state.func4.updateRemain1 = updateRemain1;
+			_state.func4.updateRemain2 = updateRemain2;
 			return;
 		}
 	}
 }
 
-void Player_AppleII::soundFunc4() { // D170
-	const byte *params = _state.params;
-	while (params[0] != 0x01) {
-		_soundFunc4(params[0], params[1], params[2]);
-		params += 3;
+bool Player_AppleII::soundFunc4() { // D170
+	if (!_state.localParams)
+		_state.localParams = _state.params;
+
+	// while (_state.params[0] != 0x01)
+	if (_state.localParams[0] != 0x01) {
+		_soundFunc4(_state.localParams[0], _state.localParams[1], _state.localParams[2]);
+		_state.localParams += 3;
+		return false;
 	}
+
+	_state.localParams = NULL;
+	return true;
 }
 
 void Player_AppleII::_soundFunc5(int interval /*a*/, int count) { // D270
@@ -339,20 +421,27 @@ byte /*a*/ Player_AppleII::noise() { // D261
 	return result;
 }
 
-void Player_AppleII::soundFunc5() { // D222
+bool Player_AppleII::soundFunc5() { // D222
 	const byte noiseMask[] = {
 		0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF, 0xFF, 0xFF, 0x0F, 0x0F
 	};
 
 	int param0 = _state.params[0];
 	assert(param0 > 0);
-	for (int i = 0; i < 10; ++i) {
+
+	// while (i = 0; i < 10; ++i)
+	if (_state.func5.index < 10) {
 		int count = param0;
 		do {
-			_soundFunc5(noise() & noiseMask[i], 1);
+			_soundFunc5(noise() & noiseMask[_state.func5.index], 1);
 			--count;
 		} while (count > 0);
+
+		++_state.func5.index;
+		return false;
 	}
+
+	return true;
 }
 
 } // End of namespace Scumm
diff --git a/engines/scumm/player_appleII.h b/engines/scumm/player_appleII.h
index 7cc02b1f01..eb4a99c4bd 100644
--- a/engines/scumm/player_appleII.h
+++ b/engines/scumm/player_appleII.h
@@ -241,10 +241,34 @@ public:
 	int getRate() const { return _sampleRate; }
 
 private:
-	struct state_t {
+	struct sound_state {
+		// sound number
+		int soundNr;
+		// type of sound
 		int type;
+		// number of loops left
 		int loop;
+		// global sound param list
 		const byte *params;
+		// local sound param list
+		const byte *localParams;
+		// speaker toggle state (0 / 1)
+		byte speakerState;
+		// processing complete
+		bool finished;
+		// sound type specific data
+		union {
+			struct {
+				byte updateRemain1;
+				byte updateRemain2;
+			} func4;
+			struct {
+				int pos;
+			} func23;
+			struct {
+				int index;
+			} func5;
+		};
 	} _state;
 
 	ScummEngine *_vm;
@@ -254,25 +278,26 @@ private:
 	Common::Mutex _mutex;
 
 private:
-	byte _speakerState;
-	int _soundNr;
 	SampleConverter _sampleConverter;
 
 private:
+	void resetState();
+	void initFuncState();
+	bool updateSound();
 	void speakerToggle();
 	void generateSamples(int cycles);
 	void wait(int interval, int count);
 	byte noise();
 
-	void soundFunc1();
+	bool soundFunc1();
 	void _soundFunc1(int interval, int count);
-	void soundFunc2();
+	bool soundFunc2();
 	void _soundFunc2(int interval, int count);
-	void soundFunc3();
+	bool soundFunc3();
 	void _soundFunc3(int interval, int count);
-	void soundFunc4();
+	bool soundFunc4();
 	void _soundFunc4(byte param0, byte param1, byte param2);
-	void soundFunc5();
+	bool soundFunc5();
 	void _soundFunc5(int interval, int count);
 };
 
-- 
cgit v1.2.3


From 7d551c9e6e8c5a46086f9da5e601561c434bafe0 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 20 Dec 2011 12:07:50 +0100
Subject: SCUMM: Wrap player_appleII sound generation functions in classes

---
 engines/scumm/player_appleII.cpp | 623 ++++++++++++++++++++++-----------------
 engines/scumm/player_appleII.h   |  52 ++--
 2 files changed, 364 insertions(+), 311 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/player_appleII.cpp b/engines/scumm/player_appleII.cpp
index a4111c5109..a027b522b5 100644
--- a/engines/scumm/player_appleII.cpp
+++ b/engines/scumm/player_appleII.cpp
@@ -27,10 +27,322 @@
 
 namespace Scumm {
 
+/************************************
+ * Apple-II sound-resource parsers
+ ************************************/
+
+/*
+ * SoundFunction1: frequency up/down
+ */
+class AppleII_SoundFunction1_FreqUpDown : public AppleII_SoundFunction {
+public:
+	virtual void init(Player_AppleII *player, const byte *params) {
+		_player = player;
+		_delta = params[0];
+		_count = params[1];
+		_interval = params[2];
+		_limit = params[3];
+		_decInterval = (params[4] >= 0x40);
+	}
+
+	virtual bool update() { // D085
+		if (_decInterval) {
+			do {
+				_update(_interval, _count);
+				_interval -= _delta;
+			} while (_interval >= _limit);
+		} else {
+			do {
+				_update(_interval, _count);
+				_interval += _delta;
+			} while (_interval < _limit);
+		}
+		return true;
+	}
+
+private:
+	void _update(int interval /*a*/, int count /*y*/) { // D076
+		assert(interval > 0); // 0 == 256? 
+		assert(count > 0); // 0 == 256? 
+
+		for (; count >= 0; --count) {
+			_player->speakerToggle();
+			_player->generateSamples(17 + 5 * interval);
+		}
+	}
+
+protected:
+	int _delta;
+	int _count;
+	byte _interval; // must be unsigned byte ("interval < delta" possible)
+	int _limit;
+	bool _decInterval;
+};
+
+/*
+ * SoundFunction2: symmetric wave (~)
+ */
+class AppleII_SoundFunction2_SymmetricWave : public AppleII_SoundFunction {
+public:
+	virtual void init(Player_AppleII *player, const byte *params) {
+		_player = player;
+		_params = params;
+		_pos = 1;
+	}
+
+	virtual bool update() { // D0D6
+		// while (pos = 1; pos < 256; ++pos)
+		if (_pos < 256) {
+			byte interval = _params[_pos];
+			if (interval == 0xFF)
+				return true;
+			_update(interval, _params[0] /*, LD12F=interval*/);
+
+			++_pos;
+			return false;
+		}	
+		return true;
+	}
+
+private:
+	void _update(int interval /*a*/, int count) { // D0EF
+		if (interval == 0xFE) {
+			_player->wait(interval, 10);
+		} else {
+			assert(count > 0); // 0 == 256?
+			assert(interval > 0); // 0 == 256?
+
+			int a = (interval >> 3) + count;
+			for (int y = a; y > 0; --y) { 
+				_player->generateSamples(1292 - 5*interval);
+				_player->speakerToggle();
+
+				_player->generateSamples(1287 - 5*interval);
+				_player->speakerToggle();
+			}
+		}
+	}
+
+protected:
+	const byte *_params;
+	int _pos;
+};
+
+/*
+ * SoundFunction3: asymmetric wave (__-)
+ */
+class AppleII_SoundFunction3_AsymmetricWave : public AppleII_SoundFunction {
+public:
+	virtual void init(Player_AppleII *player, const byte *params) {
+		_player = player;
+		_params = params;
+		_pos = 1;
+	}
+
+	virtual bool update() { // D132
+		// while (pos = 1; pos < 256; ++pos)
+		if (_pos < 256) {
+			byte interval = _params[_pos];
+			if (interval == 0xFF)
+				return true;
+			_update(interval, _params[0]);
+
+			++_pos;
+			return false;
+		}
+		return true;
+	}
+
+private:
+	void _update(int interval /*a*/, int count /*LD12D*/) { // D14B
+		if (interval == 0xFE) {
+			_player->wait(interval, 70);
+		} else {
+			assert(interval > 0); // 0 == 256?
+			assert(count > 0); // 0 == 256?
+
+			for (int y = count; y > 0; --y) {
+				_player->generateSamples(1289 - 5*interval);
+				_player->speakerToggle();
+			}
+		}
+	}
+
+protected:
+	const byte *_params;
+	int _pos;
+};
+
+/*
+ * SoundFunction4: polyphone (2 voices)
+ */
+class AppleII_SoundFunction4_Polyphone : public AppleII_SoundFunction {
+public:
+	virtual void init(Player_AppleII *player, const byte *params) {
+		_player = player;
+		_params = params;
+		_updateRemain1 = 80;
+		_updateRemain2 = 10;
+	}
+
+	virtual bool update() { // D170
+		// while (_state.params[0] != 0x01)
+		if (_params[0] != 0x01) {
+			_update(_params[0], _params[1], _params[2]);
+			_params += 3;
+			return false;
+		}
+		return true;
+	}
+
+private:
+	void _update(byte param0, byte param1, byte param2) { // D1A2
+		uint16 count = (-param2 << 8) | 0x3;
+		byte bitmask1 = 0x3;
+		byte bitmask2 = 0x3;
+	
+		byte updateInterval2 = param0;
+		if (updateInterval2 == 0)
+			bitmask2 = 0x0;
+
+		byte updateInterval1 = param1;
+		if (updateInterval1 == 0) {
+			bitmask1 = 0x0;
+			if (bitmask2 != 0) {
+				bitmask1 = bitmask2;
+				bitmask2 = 0;
+				updateInterval1 = updateInterval2;
+			}
+		}
+
+		byte speakerShiftReg = 0;
+
+		while (true) {
+			--_updateRemain1;
+			--_updateRemain2;
+
+			if (_updateRemain2 == 0) {
+				_updateRemain2 = updateInterval2;
+				// use only first voice's data (bitmask1) if both voices are triggered 
+				if (_updateRemain1 != 0) {
+					speakerShiftReg ^= bitmask2;		
+				}
+			}
+
+			if (_updateRemain1 == 0) {
+				_updateRemain1 = updateInterval1;
+				speakerShiftReg ^= bitmask1;
+			}
+
+			if (speakerShiftReg & 0x1)
+				_player->speakerToggle();
+			speakerShiftReg >>= 1;
+			_player->generateSamples(42); /* actually 42.5 */
+
+			++count;
+			if (count == 0) {
+				return;
+			}
+		}
+	}
+
+protected:
+	const byte *_params;
+	byte _updateRemain1;
+	byte _updateRemain2;
+};
+
+/*
+ * SoundFunction5: periodic noise
+ */
+class AppleII_SoundFunction5_Noise : public AppleII_SoundFunction {
+public:
+	virtual void init(Player_AppleII *player, const byte *params) {
+		_player = player;
+		_index = 0;
+		_param0 = params[0];
+		assert(_param0 > 0);
+	}
+
+	virtual bool update() { // D222
+		const byte noiseMask[] = {
+			0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF, 0xFF, 0xFF, 0x0F, 0x0F
+		};
+
+		// while (i = 0; i < 10; ++i)
+		if (_index < 10) {
+			int count = _param0;
+			do {
+				_update(noise() & noiseMask[_index], 1);
+				--count;
+			} while (count > 0);
+
+			++_index;
+			return false;
+		}
+
+		return true;
+	}
+
+private:
+	void _update(int interval /*a*/, int count) { // D270
+		assert(count > 0); // 0 == 256?
+		if (interval == 0)
+			interval = 256;
+
+		for (int i = count; i > 0; --i) {
+			_player->generateSamples(10 + 5*interval);
+			_player->speakerToggle();
+		
+			_player->generateSamples(5 + 5*interval);
+			_player->speakerToggle();
+		}
+	}
+
+	byte /*a*/ noise() { // D261
+		static int pos = 0; // initial value?
+		byte result = _noiseTable[pos];
+		pos = (pos + 1) % 256;
+		return result;
+	}
+
+protected:
+	int _index;
+	int _param0;
+
+private:
+	static const byte _noiseTable[256];
+};
+
+// LD000[loc] ^ LD00A[loc]
+const byte AppleII_SoundFunction5_Noise::_noiseTable[256] = {
+	0x65, 0x1b, 0xda, 0x11, 0x61, 0xe5, 0x77, 0x57, 0x92, 0xc8, 0x51, 0x1c, 0xd4, 0x91, 0x62, 0x63, 
+	0x00, 0x38, 0x57, 0xd5, 0x18, 0xd8, 0xdc, 0x40, 0x03, 0x86, 0xd3, 0x2f, 0x10, 0x11, 0xd8, 0x3c, 
+	0xbe, 0x00, 0x19, 0xc5, 0xd2, 0xc3, 0xca, 0x34, 0x00, 0x28, 0xbf, 0xb9, 0x18, 0x20, 0x01, 0xcc, 
+	0xda, 0x08, 0xbc, 0x75, 0x7c, 0xb0, 0x8d, 0xe0, 0x09, 0x18, 0xbf, 0x5d, 0xe9, 0x8c, 0x75, 0x64, 
+	0xe5, 0xb5, 0x5d, 0xe0, 0xb7, 0x7d, 0xe9, 0x8c, 0x55, 0x65, 0xc5, 0xb5, 0x5d, 0xd8, 0x09, 0x0d,
+	0x64, 0xf0, 0xf0, 0x08, 0x63, 0x03, 0x00, 0x55, 0x35, 0xc0, 0x00, 0x20, 0x74, 0xa5, 0x1e, 0xe3, 
+	0x00, 0x06, 0x3c, 0x52, 0xd1, 0x70, 0xd0, 0x57, 0x02, 0xf0, 0x00, 0xb6, 0xfc, 0x02, 0x11, 0x9a, 
+	0x3b, 0xc8, 0x38, 0xdf, 0x1a, 0xb0, 0xd1, 0xb8, 0xd0, 0x18, 0x8a, 0x4a, 0xea, 0x1b, 0x12, 0x5d, 
+	0x29, 0x58, 0xd8, 0x43, 0xb8, 0x2d, 0xd2, 0x61, 0x10, 0x3c, 0x0c, 0x5d, 0x1b, 0x61, 0x10, 0x3c, 
+	0x0a, 0x5d, 0x1d, 0x61, 0x10, 0x3c, 0x0b, 0x19, 0x88, 0x21, 0xc0, 0x21, 0x07, 0x00, 0x65, 0x62,
+	0x08, 0xe9, 0x36, 0x40, 0x20, 0x41, 0x06, 0x00, 0x20, 0x00, 0x00, 0xed, 0xa3, 0x00, 0x88, 0x06, 
+	0x98, 0x01, 0x5d, 0x7f, 0x02, 0x1d, 0x78, 0x03, 0x60, 0xcb, 0x3a, 0x01, 0xbd, 0x78, 0x02, 0x5d, 
+	0x7e, 0x03, 0x1d, 0xf5, 0xa6, 0x40, 0x81, 0xb4, 0xd0, 0x8d, 0xd3, 0xd0, 0x6d, 0xd5, 0x61, 0x48, 
+	0x61, 0x4d, 0xd1, 0xc8, 0xb1, 0xd8, 0x69, 0xff, 0x61, 0xd9, 0xed, 0xa0, 0xfe, 0x19, 0x91, 0x37, 
+	0x19, 0x37, 0x00, 0xf1, 0x00, 0x01, 0x1f, 0x00, 0xad, 0xc1, 0x01, 0x01, 0x2e, 0x00, 0x40, 0xc6,
+	0x7a, 0x9b, 0x95, 0x43, 0xfc, 0x18, 0xd2, 0x9e, 0x2a, 0x5a, 0x4b, 0x2a, 0xb6, 0x87, 0x30, 0x6c
+};
+
+/************************************
+ * Apple-II player
+ ************************************/
+
 Player_AppleII::Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer) {
 	_mixer = mixer;
 	_vm = scumm;
 	
+	_state.soundFunc = 0;
 	resetState();
 
 	setSampleRate(_mixer->getOutputRate());
@@ -40,6 +352,7 @@ Player_AppleII::Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer) {
 
 Player_AppleII::~Player_AppleII() {
 	_mixer->stopHandle(_soundHandle);
+	delete _state.soundFunc;
 }
 
 /*
@@ -69,77 +382,56 @@ void logSounds() {
 void Player_AppleII::startSound(int nr) {
 	Common::StackLock lock(_mutex);
 
-	resetState();
-
 	byte *data = _vm->getResourceAddress(rtSound, nr);
 	assert(data);
 	byte *ptr1 = data + 4;
 
+	resetState();
+	_state.soundNr = nr;
 	_state.type = ptr1[0];
-	if (_state.type == 0) {
-		// nothing to play
+	_state.loop = ptr1[1];
+	_state.params = &ptr1[2];
+
+	switch (_state.type) {
+	case 0: // empty (nothing to play)
 		resetState();
 		return;
+	case 1: 
+		_state.soundFunc = new AppleII_SoundFunction1_FreqUpDown(); 
+		break;
+	case 2: 
+		_state.soundFunc = new AppleII_SoundFunction2_SymmetricWave(); 
+		break;
+	case 3:	
+		_state.soundFunc = new AppleII_SoundFunction3_AsymmetricWave(); 
+		break;
+	case 4: 
+		_state.soundFunc = new AppleII_SoundFunction4_Polyphone(); 
+		break;
+	case 5: 
+		_state.soundFunc = new AppleII_SoundFunction5_Noise(); 
+		break;
 	}
+	_state.soundFunc->init(this, _state.params);
 
-	_state.soundNr = nr;
-	_state.finished = false;
-	initFuncState();
-
-	_state.loop = ptr1[1];
 	assert(_state.loop > 0);
 
-	_state.params = &ptr1[2];
-
 	debug(4, "startSound %d: type %d, loop %d",
 		  nr, _state.type, _state.loop);
 }
 
-void Player_AppleII::initFuncState() {
-	switch (_state.type) {
-		case 2:	case 3:
-			_state.func23.pos = 1;
-			break;
-		case 4:
-			_state.func4.updateRemain1 = 80;
-			_state.func4.updateRemain2 = 10;
-			break;
-		case 5:
-			_state.func5.index = 0;
-			break;
-	}
-}
-
 bool Player_AppleII::updateSound() {
-	if (!_state.soundNr || _state.finished)
+	if (!_state.soundFunc)
 		return false;
 
-	bool done = false;
-	switch (_state.type) {
-		case 1: // freq up/down
-			done = soundFunc1();
-			break;
-		case 2: // symmetric wave (~)
-			done = soundFunc2();
-			break;
-		case 3: // asymmetric wave (__-)
-			done = soundFunc3();
-			break;
-		case 4: // polyphone (2 voices)
-			done = soundFunc4();
-			break;
-		case 5:	// periodic noise
-			done = soundFunc5();
-			break;
-	}
-
-	if (done) {
+	if (_state.soundFunc->update()) {
 		--_state.loop;
 		if (_state.loop <= 0) {
-			_state.finished = true;
+			delete _state.soundFunc;
+			_state.soundFunc = 0;
 		} else {
 			// reset function state on each loop
-			initFuncState();
+			_state.soundFunc->init(this, _state.params);
 		}
 	}
 
@@ -151,9 +443,9 @@ void Player_AppleII::resetState() {
 	_state.type = 0;
 	_state.loop = 0;
 	_state.params = NULL;
-	_state.localParams = NULL;
 	_state.speakerState = 0;
-	_state.finished = true;
+	delete _state.soundFunc;
+	_state.soundFunc = 0;
 
 	_sampleConverter.reset();
 }
@@ -194,14 +486,14 @@ int Player_AppleII::readBuffer(int16 *buffer, const int numSamples) {
 	} while ((samplesLeft > 0) && updateSound());
 
 	// reset state if sound is played completely
-	if (_state.finished && (_sampleConverter.availableSize() == 0))
+	if (!_state.soundFunc && (_sampleConverter.availableSize() == 0))
 		resetState();
 
 	return numSamples - samplesLeft;
 }
 
 /************************************
- * Apple-II sound-resource parser
+ * Apple-II sound-resource helpers
  ************************************/
 
 // toggle speaker on/off
@@ -219,229 +511,4 @@ void Player_AppleII::wait(int interval, int count /*y*/) {
 	generateSamples(11 + count*(8 + 5 * interval));
 }
 
-void Player_AppleII::_soundFunc1(int interval /*a*/, int count /*y*/) { // D076
-	assert(interval > 0); // 0 == 256? 
-	assert(count > 0); // 0 == 256? 
-
-	for (; count >= 0; --count) {
-		speakerToggle();
-		generateSamples(17 + 5 * interval);
-	}
-}
-
-bool Player_AppleII::soundFunc1() { // D085
-	const int delta = _state.params[0];
-	const int count = _state.params[1];
-	byte interval = _state.params[2]; // must be byte ("interval < delta" possible)
-	const int limit = _state.params[3];
-	const bool decInterval = (_state.params[4] >= 0x40);
-
-	if (decInterval) {
-		do {
-			_soundFunc1(interval, count);
-			interval -= delta;
-		} while (interval >= limit);
-	} else {
-		do {
-			_soundFunc1(interval, count);
-			interval += delta;
-		} while (interval < limit);
-	}
-
-	return true;
-}
-
-void Player_AppleII::_soundFunc2(int interval /*a*/, int count) { // D0EF
-	if (interval == 0xFE) {
-		wait(interval, 10);
-	} else {
-		assert(count > 0); // 0 == 256?
-		assert(interval > 0); // 0 == 256?
-
-		int a = (interval >> 3) + count;
-		for (int y = a; y > 0; --y) { 
-			generateSamples(1292 - 5*interval);
-			speakerToggle();
-
-			generateSamples(1287 - 5*interval);
-			speakerToggle();
-		}
-	}
-}
-
-bool Player_AppleII::soundFunc2() { // D0D6
-	// while (pos = 1; pos < 256; ++pos)
-	if (_state.func23.pos < 256) {
-		byte interval = _state.params[_state.func23.pos];
-		if (interval == 0xFF)
-			return true;
-		_soundFunc2(interval, _state.params[0] /*, LD12F=interval*/);
-
-		++_state.func23.pos;
-		return false;
-	}	
-	return true;
-}
-
-void Player_AppleII::_soundFunc3(int interval /*a*/, int count /*LD12D*/) { // D14B
-	if (interval == 0xFE) {
-		wait(interval, 70);
-	} else {
-		assert(interval > 0); // 0 == 256?
-		assert(count > 0); // 0 == 256?
-
-		for (int y = count; y > 0; --y) {
-			generateSamples(1289 - 5*interval);
-			speakerToggle();
-		}
-	}
-}
-
-bool Player_AppleII::soundFunc3() { // D132
-	// while (pos = 1; pos < 256; ++pos)
-	if (_state.func23.pos < 256) {
-		byte interval = _state.params[_state.func23.pos];
-		if (interval == 0xFF)
-			return true;
-		_soundFunc3(interval, _state.params[0]);
-
-		++_state.func23.pos;
-		return false;
-	}
-	return true;
-}
-
-void Player_AppleII::_soundFunc4(byte param0, byte param1, byte param2) { // D1A2
-	uint16 count = (-param2 << 8) | 0x3;
-	byte bitmask1 = 0x3;
-	byte bitmask2 = 0x3;
-	
-	byte updateInterval2 = param0;
-	if (updateInterval2 == 0)
-		bitmask2 = 0x0;
-
-	byte updateInterval1 = param1;
-	if (updateInterval1 == 0) {
-		bitmask1 = 0x0;
-		if (bitmask2 != 0) {
-			bitmask1 = bitmask2;
-			bitmask2 = 0;
-			updateInterval1 = updateInterval2;
-		}
-	}
-
-	byte speakerShiftReg = 0;
-	byte updateRemain1 = _state.func4.updateRemain1;
-	byte updateRemain2 = _state.func4.updateRemain2;
-
-	while (true) {
-		--updateRemain1;
-		--updateRemain2;
-
-		if (updateRemain2 == 0) {
-			updateRemain2 = updateInterval2;
-			// use only first voice's data (bitmask1) if both voices are triggered 
-			if (updateRemain1 != 0) {
-				speakerShiftReg ^= bitmask2;		
-			}
-		}
-
-		if (updateRemain1 == 0) {
-			updateRemain1 = updateInterval1;
-			speakerShiftReg ^= bitmask1;
-		}
-
-		if (speakerShiftReg & 0x1)
-			speakerToggle();
-		speakerShiftReg >>= 1;
-		generateSamples(42); /* actually 42.5 */
-
-		++count;
-		if (count == 0) {
-			_state.func4.updateRemain1 = updateRemain1;
-			_state.func4.updateRemain2 = updateRemain2;
-			return;
-		}
-	}
-}
-
-bool Player_AppleII::soundFunc4() { // D170
-	if (!_state.localParams)
-		_state.localParams = _state.params;
-
-	// while (_state.params[0] != 0x01)
-	if (_state.localParams[0] != 0x01) {
-		_soundFunc4(_state.localParams[0], _state.localParams[1], _state.localParams[2]);
-		_state.localParams += 3;
-		return false;
-	}
-
-	_state.localParams = NULL;
-	return true;
-}
-
-void Player_AppleII::_soundFunc5(int interval /*a*/, int count) { // D270
-	assert(count > 0); // 0 == 256?
-	if (interval == 0)
-		interval = 256;
-
-	for (int i = count; i > 0; --i) {
-		generateSamples(10 + 5*interval);
-		speakerToggle();
-		
-		generateSamples(5 + 5*interval);
-		speakerToggle();
-	}
-}
-
-// LD000[loc] ^ LD00A[loc]
-static const byte noiseTable[256] = {
-	0x65, 0x1b, 0xda, 0x11, 0x61, 0xe5, 0x77, 0x57, 0x92, 0xc8, 0x51, 0x1c, 0xd4, 0x91, 0x62, 0x63, 
-	0x00, 0x38, 0x57, 0xd5, 0x18, 0xd8, 0xdc, 0x40, 0x03, 0x86, 0xd3, 0x2f, 0x10, 0x11, 0xd8, 0x3c, 
-	0xbe, 0x00, 0x19, 0xc5, 0xd2, 0xc3, 0xca, 0x34, 0x00, 0x28, 0xbf, 0xb9, 0x18, 0x20, 0x01, 0xcc, 
-	0xda, 0x08, 0xbc, 0x75, 0x7c, 0xb0, 0x8d, 0xe0, 0x09, 0x18, 0xbf, 0x5d, 0xe9, 0x8c, 0x75, 0x64, 
-	0xe5, 0xb5, 0x5d, 0xe0, 0xb7, 0x7d, 0xe9, 0x8c, 0x55, 0x65, 0xc5, 0xb5, 0x5d, 0xd8, 0x09, 0x0d,
-	0x64, 0xf0, 0xf0, 0x08, 0x63, 0x03, 0x00, 0x55, 0x35, 0xc0, 0x00, 0x20, 0x74, 0xa5, 0x1e, 0xe3, 
-	0x00, 0x06, 0x3c, 0x52, 0xd1, 0x70, 0xd0, 0x57, 0x02, 0xf0, 0x00, 0xb6, 0xfc, 0x02, 0x11, 0x9a, 
-	0x3b, 0xc8, 0x38, 0xdf, 0x1a, 0xb0, 0xd1, 0xb8, 0xd0, 0x18, 0x8a, 0x4a, 0xea, 0x1b, 0x12, 0x5d, 
-	0x29, 0x58, 0xd8, 0x43, 0xb8, 0x2d, 0xd2, 0x61, 0x10, 0x3c, 0x0c, 0x5d, 0x1b, 0x61, 0x10, 0x3c, 
-	0x0a, 0x5d, 0x1d, 0x61, 0x10, 0x3c, 0x0b, 0x19, 0x88, 0x21, 0xc0, 0x21, 0x07, 0x00, 0x65, 0x62,
-	0x08, 0xe9, 0x36, 0x40, 0x20, 0x41, 0x06, 0x00, 0x20, 0x00, 0x00, 0xed, 0xa3, 0x00, 0x88, 0x06, 
-	0x98, 0x01, 0x5d, 0x7f, 0x02, 0x1d, 0x78, 0x03, 0x60, 0xcb, 0x3a, 0x01, 0xbd, 0x78, 0x02, 0x5d, 
-	0x7e, 0x03, 0x1d, 0xf5, 0xa6, 0x40, 0x81, 0xb4, 0xd0, 0x8d, 0xd3, 0xd0, 0x6d, 0xd5, 0x61, 0x48, 
-	0x61, 0x4d, 0xd1, 0xc8, 0xb1, 0xd8, 0x69, 0xff, 0x61, 0xd9, 0xed, 0xa0, 0xfe, 0x19, 0x91, 0x37, 
-	0x19, 0x37, 0x00, 0xf1, 0x00, 0x01, 0x1f, 0x00, 0xad, 0xc1, 0x01, 0x01, 0x2e, 0x00, 0x40, 0xc6,
-	0x7a, 0x9b, 0x95, 0x43, 0xfc, 0x18, 0xd2, 0x9e, 0x2a, 0x5a, 0x4b, 0x2a, 0xb6, 0x87, 0x30, 0x6c
-};
-
-byte /*a*/ Player_AppleII::noise() { // D261
-	static int pos = 0; // initial value?
-	byte result = noiseTable[pos];
-	pos = (pos + 1) % 256;
-	return result;
-}
-
-bool Player_AppleII::soundFunc5() { // D222
-	const byte noiseMask[] = {
-		0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF, 0xFF, 0xFF, 0x0F, 0x0F
-	};
-
-	int param0 = _state.params[0];
-	assert(param0 > 0);
-
-	// while (i = 0; i < 10; ++i)
-	if (_state.func5.index < 10) {
-		int count = param0;
-		do {
-			_soundFunc5(noise() & noiseMask[_state.func5.index], 1);
-			--count;
-		} while (count > 0);
-
-		++_state.func5.index;
-		return false;
-	}
-
-	return true;
-}
-
 } // End of namespace Scumm
diff --git a/engines/scumm/player_appleII.h b/engines/scumm/player_appleII.h
index eb4a99c4bd..91c7935f76 100644
--- a/engines/scumm/player_appleII.h
+++ b/engines/scumm/player_appleII.h
@@ -217,6 +217,8 @@ private:
 	DynamicMemoryStream _buffer;
 };
 
+class AppleII_SoundFunction;
+
 class Player_AppleII : public Audio::AudioStream, public MusicEngine {
 public:
 	Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer);
@@ -240,6 +242,11 @@ public:
 	bool endOfData() const { return false; }
 	int getRate() const { return _sampleRate; }
 
+public:
+	void speakerToggle();
+	void generateSamples(int cycles);
+	void wait(int interval, int count);
+
 private:
 	struct sound_state {
 		// sound number
@@ -250,25 +257,10 @@ private:
 		int loop;
 		// global sound param list
 		const byte *params;
-		// local sound param list
-		const byte *localParams;
 		// speaker toggle state (0 / 1)
 		byte speakerState;
-		// processing complete
-		bool finished;
-		// sound type specific data
-		union {
-			struct {
-				byte updateRemain1;
-				byte updateRemain2;
-			} func4;
-			struct {
-				int pos;
-			} func23;
-			struct {
-				int index;
-			} func5;
-		};
+		// sound function
+		AppleII_SoundFunction *soundFunc;
 	} _state;
 
 	ScummEngine *_vm;
@@ -282,23 +274,17 @@ private:
 
 private:
 	void resetState();
-	void initFuncState();
 	bool updateSound();
-	void speakerToggle();
-	void generateSamples(int cycles);
-	void wait(int interval, int count);
-	byte noise();
-
-	bool soundFunc1();
-	void _soundFunc1(int interval, int count);
-	bool soundFunc2();
-	void _soundFunc2(int interval, int count);
-	bool soundFunc3();
-	void _soundFunc3(int interval, int count);
-	bool soundFunc4();
-	void _soundFunc4(byte param0, byte param1, byte param2);
-	bool soundFunc5();
-	void _soundFunc5(int interval, int count);
+};
+
+class AppleII_SoundFunction {
+public:
+	AppleII_SoundFunction() {}
+	virtual ~AppleII_SoundFunction() {}
+	virtual void init(Player_AppleII *player, const byte *params) = 0;
+	virtual bool update() = 0;
+protected:
+	Player_AppleII *_player;
 };
 
 } // End of namespace Scumm
-- 
cgit v1.2.3


From 3a9f2c5f5bb817b4acbe279aedae938679634257 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 20 Dec 2011 13:18:27 +0100
Subject: SCUMM: Use finer grained sound updates for player_appleII

This reduces the needed buffer size for the biggest type4 sound from 170kB to only 2 bytes
---
 engines/scumm/player_appleII.cpp | 99 +++++++++++++++++++++++-----------------
 engines/scumm/player_appleII.h   |  1 +
 2 files changed, 59 insertions(+), 41 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/player_appleII.cpp b/engines/scumm/player_appleII.cpp
index a027b522b5..b566012d73 100644
--- a/engines/scumm/player_appleII.cpp
+++ b/engines/scumm/player_appleII.cpp
@@ -183,73 +183,90 @@ public:
 		_params = params;
 		_updateRemain1 = 80;
 		_updateRemain2 = 10;
+		_count = 0;
 	}
 
 	virtual bool update() { // D170
 		// while (_state.params[0] != 0x01)
 		if (_params[0] != 0x01) {
-			_update(_params[0], _params[1], _params[2]);
-			_params += 3;
+			if (_count == 0) // prepare next loop
+				nextLoop(_params[0], _params[1], _params[2]);
+			if (loopIteration()) // loop finished -> fetch next parameter set
+				_params += 3;
 			return false;
 		}
 		return true;
 	}
 
 private:
-	void _update(byte param0, byte param1, byte param2) { // D1A2
-		uint16 count = (-param2 << 8) | 0x3;
-		byte bitmask1 = 0x3;
-		byte bitmask2 = 0x3;
+	/*
+	 * prepare for next parameter set loop
+	 */
+	void nextLoop(byte param0, byte param1, byte param2) { // LD182
+		_count = (-param2 << 8) | 0x3;
+
+		_bitmask1 = 0x3;
+		_bitmask2 = 0x3;
 	
-		byte updateInterval2 = param0;
-		if (updateInterval2 == 0)
-			bitmask2 = 0x0;
-
-		byte updateInterval1 = param1;
-		if (updateInterval1 == 0) {
-			bitmask1 = 0x0;
-			if (bitmask2 != 0) {
-				bitmask1 = bitmask2;
-				bitmask2 = 0;
-				updateInterval1 = updateInterval2;
+		_updateInterval2 = param0;
+		if (_updateInterval2 == 0)
+			_bitmask2 = 0x0;
+
+		_updateInterval1 = param1;
+		if (_updateInterval1 == 0) {
+			_bitmask1 = 0x0;
+			if (_bitmask2 != 0) {
+				_bitmask1 = _bitmask2;
+				_bitmask2 = 0;
+				_updateInterval1 = _updateInterval2;
 			}
 		}
 
-		byte speakerShiftReg = 0;
-
-		while (true) {
-			--_updateRemain1;
-			--_updateRemain2;
+		_speakerShiftReg = 0;
+	}
 
-			if (_updateRemain2 == 0) {
-				_updateRemain2 = updateInterval2;
-				// use only first voice's data (bitmask1) if both voices are triggered 
-				if (_updateRemain1 != 0) {
-					speakerShiftReg ^= bitmask2;		
-				}
+	/*
+	 * perform one loop iteration
+	 * Returns true if loop finished
+	 */
+	bool loopIteration() { // D1A2
+		--_updateRemain1;
+		--_updateRemain2;
+
+		if (_updateRemain2 == 0) {
+			_updateRemain2 = _updateInterval2;
+			// use only first voice's data (bitmask1) if both voices are triggered 
+			if (_updateRemain1 != 0) {
+				_speakerShiftReg ^= _bitmask2;		
 			}
+		}
 
-			if (_updateRemain1 == 0) {
-				_updateRemain1 = updateInterval1;
-				speakerShiftReg ^= bitmask1;
-			}
+		if (_updateRemain1 == 0) {
+			_updateRemain1 = _updateInterval1;
+			_speakerShiftReg ^= _bitmask1;
+		}
 
-			if (speakerShiftReg & 0x1)
-				_player->speakerToggle();
-			speakerShiftReg >>= 1;
-			_player->generateSamples(42); /* actually 42.5 */
+		if (_speakerShiftReg & 0x1)
+			_player->speakerToggle();
+		_speakerShiftReg >>= 1;
+		_player->generateSamples(42); /* actually 42.5 */
 
-			++count;
-			if (count == 0) {
-				return;
-			}
-		}
+		++_count;
+		return (_count == 0);
 	}
 
 protected:
 	const byte *_params;
+	
 	byte _updateRemain1;
 	byte _updateRemain2;
+
+	uint16 _count;
+	byte _bitmask1;
+	byte _bitmask2;
+	byte _updateInterval1;
+	byte _updateInterval2;
+	byte _speakerShiftReg;
 };
 
 /*
diff --git a/engines/scumm/player_appleII.h b/engines/scumm/player_appleII.h
index 91c7935f76..f0b148ef86 100644
--- a/engines/scumm/player_appleII.h
+++ b/engines/scumm/player_appleII.h
@@ -282,6 +282,7 @@ public:
 	AppleII_SoundFunction() {}
 	virtual ~AppleII_SoundFunction() {}
 	virtual void init(Player_AppleII *player, const byte *params) = 0;
+	/* returns true if finished */
 	virtual bool update() = 0;
 protected:
 	Player_AppleII *_player;
-- 
cgit v1.2.3


From f7a869ccc5c22212768c43f258a7fbf7dddb758f Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Wed, 21 Dec 2011 10:10:42 +0100
Subject: SCUMM: Optimize player_appleII sample buffer

The AppleII sound player works in two phases: writing samples to the
sample buffer (sample
generation) or reading samples from the buffer and passing it to ScummVM's
output callback.
The sample buffer is read completely in the reading phase so the entries
of the already read samples of the buffer can be reused again during the
next write phase.
---
 engines/scumm/player_appleII.h | 84 +++++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 34 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/player_appleII.h b/engines/scumm/player_appleII.h
index f0b148ef86..1f53b6a8dc 100644
--- a/engines/scumm/player_appleII.h
+++ b/engines/scumm/player_appleII.h
@@ -35,13 +35,20 @@ namespace Scumm {
 
 class ScummEngine;
 
-class DynamicMemoryStream {
+/*
+ * Optimized for use with periodical read/write phases when the buffer 
+ * is filled in a write phase and completely read in a read phase.
+ * The growing strategy is optimized for repeated small (e.g. 2 bytes)
+ * single writes resulting in large buffers
+ * (avg.: 4KB, max: 18KB @ 16bit/22.050kHz (MM sound21)).
+ */
+class SampleBuffer {
 public:
-	DynamicMemoryStream() : _data(0) {
+	SampleBuffer() : _data(0) {
 		clear();
 	}
 
-	~DynamicMemoryStream() {
+	~SampleBuffer() {
 		free(_data);
 	}
 
@@ -49,50 +56,61 @@ public:
 		free(_data);
 		_data = 0;
 		_capacity = 0;
-		_size = 0;
-		_ptr = 0;
-		_pos = 0;
+		_writePos = 0;
 		_readPos = 0;
 	}
 
-	void ensureCapacity(uint32 new_len) {
-		if (new_len <= _capacity)
+	void ensureFree(uint32 needed) {
+		// if data was read completely, reset read/write pos to front
+		if ((_writePos != 0) && (_writePos == _readPos)) {
+			_writePos = 0;
+			_readPos = 0;
+		}
+
+		// check for enough space at end of buffer
+		uint32 freeEndCnt = _capacity - _writePos;
+		if (needed <= freeEndCnt)
 			return;
 
-		byte *old_data = _data;
+		uint32 avail = availableSize();
+
+		// check for enough space at beginning and end of buffer
+		if (needed <= _readPos + freeEndCnt) {
+			// move unread data to front of buffer
+			memmove(_data, _data + _readPos, avail);
+			_writePos = avail;
+			_readPos = 0;
+		} else { // needs a grow
+			byte *old_data = _data;
+			uint32 new_len = avail + needed;
 
-		_capacity *= 2;
-		if (_capacity < new_len + 2048)
 			_capacity = new_len + 2048;
-		_data = (byte *)malloc(_capacity);
-		_ptr = _data + _pos;
-
-		if (old_data) {
-			// Copy old data
-			memcpy(_data, old_data, _size);
-			free(old_data);
+			_data = (byte *)malloc(_capacity);
+
+			if (old_data) {
+				// copy old unread data to front of new buffer
+				memcpy(_data, old_data + _readPos, avail);
+				free(old_data);
+				_writePos = avail;
+				_readPos = 0;
+			}
 		}
-
-		_size = new_len;
 	}
 
 	uint32 availableSize() const {
-		if (_readPos >= _size)
+		if (_readPos >= _writePos)
 			return 0;
-		return _size - _readPos;
+		return _writePos - _readPos;
 	}
 
 	virtual uint32 write(const void *dataPtr, uint32 dataSize) {
-		ensureCapacity(_pos + dataSize);
-		memcpy(_ptr, dataPtr, dataSize);
-		_ptr += dataSize;
-		_pos += dataSize;
-		if (_pos > _size)
-			_size = _pos;
+		ensureFree(dataSize);
+		memcpy(_data + _writePos, dataPtr, dataSize);
+		_writePos += dataSize;
 		return dataSize;
 	}
 
-	uint32 read(byte *dataPtr, uint32 dataSize) const {
+	uint32 read(byte *dataPtr, uint32 dataSize) {
 		uint32 avail = availableSize();
 		if (avail == 0)
 			return 0;
@@ -104,12 +122,10 @@ public:
 	}
 
 private:
-	mutable uint32 _readPos;
+	uint32 _writePos;
+	uint32 _readPos;
 	uint32 _capacity;
-	uint32 _size;
-	byte *_ptr;
 	byte *_data;
-	uint32 _pos;
 };
 
 // CPU_CLOCK according to AppleWin
@@ -214,7 +230,7 @@ private:
 	int _sampleCyclesSumFP;   /* (fixed precision) */
 	int _volume; /* 0 - 256 */
 	static const int _maxVolume = 256;
-	DynamicMemoryStream _buffer;
+	SampleBuffer _buffer;
 };
 
 class AppleII_SoundFunction;
-- 
cgit v1.2.3


From 12103981b786d81e96ec38cc5ff24c3ce3bd9909 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Wed, 21 Dec 2011 10:12:47 +0100
Subject: SCUMM: Remove player_appleII logging

---
 engines/scumm/player_appleII.cpp | 24 ------------------------
 engines/scumm/player_appleII.h   | 14 --------------
 2 files changed, 38 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/player_appleII.cpp b/engines/scumm/player_appleII.cpp
index b566012d73..0631bcd055 100644
--- a/engines/scumm/player_appleII.cpp
+++ b/engines/scumm/player_appleII.cpp
@@ -372,30 +372,6 @@ Player_AppleII::~Player_AppleII() {
 	delete _state.soundFunc;
 }
 
-/*
-void logSounds() {
-	for (nr = 1; nr < 70; ++nr) {
-		switch (nr) {
-		// non-existing or invalid
-		case 3: case 4: case 5:  case 49: case 51: case 68:
-			continue;
-		}
-
-		byte *data = _vm->getResourceAddress(rtSound, nr);
-		if (data) {
-			size_t size = (data[1] << 8) | data[0];
-
-			std::stringstream s;
-			s << "d:/msound/sound" << nr << ".snd";
-			FILE *f = fopen(s.str().c_str(), "wb");
-			fwrite(data, 1, size, f);
-			fclose(f);
-			printf("sound: %d\n", nr);
-		}
-	}
-}
-*/
-
 void Player_AppleII::startSound(int nr) {
 	Common::StackLock lock(_mutex);
 
diff --git a/engines/scumm/player_appleII.h b/engines/scumm/player_appleII.h
index 1f53b6a8dc..a44e7b6afe 100644
--- a/engines/scumm/player_appleII.h
+++ b/engines/scumm/player_appleII.h
@@ -207,20 +207,6 @@ public:
 		return _buffer.read((byte*)buffer, numSamples * 2) / 2;
 	}
 
-#if 0
-	void logToFile(Common::String fileName) {
-		FILE *f;
-		byte buffer[512];
-		int n;
-
-		f = fopen(fileName.c_str(), "wb");
-		while ((n = _buffer.read(buffer, 512)) != 0) {
-			fwrite(buffer, 1, n, f);
-		}
-		fclose(f);
-	}
-#endif
-
 private:
 	static const int PREC_SHIFT = 7;
 
-- 
cgit v1.2.3


From 8b77f18c9e88ec2cea559578e10b33399f40a82d Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Thu, 22 Dec 2011 10:53:25 +0100
Subject: SCUMM: Revert now obsolete separation of state variables in
 player_appleII

---
 engines/scumm/player_appleII.cpp | 88 +++++++++++++++++++---------------------
 engines/scumm/player_appleII.h   | 61 +++++++++++++++-------------
 2 files changed, 73 insertions(+), 76 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/player_appleII.cpp b/engines/scumm/player_appleII.cpp
index 0631bcd055..f250f686e6 100644
--- a/engines/scumm/player_appleII.cpp
+++ b/engines/scumm/player_appleII.cpp
@@ -187,7 +187,7 @@ public:
 	}
 
 	virtual bool update() { // D170
-		// while (_state.params[0] != 0x01)
+		// while (_params[0] != 0x01)
 		if (_params[0] != 0x01) {
 			if (_count == 0) // prepare next loop
 				nextLoop(_params[0], _params[1], _params[2]);
@@ -355,21 +355,27 @@ const byte AppleII_SoundFunction5_Noise::_noiseTable[256] = {
  * Apple-II player
  ************************************/
 
-Player_AppleII::Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer) {
-	_mixer = mixer;
-	_vm = scumm;
-	
-	_state.soundFunc = 0;
+Player_AppleII::Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer)
+	: _mixer(mixer), _vm(scumm), _soundFunc(0) {
 	resetState();
-
 	setSampleRate(_mixer->getOutputRate());
-
 	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
 }
 
 Player_AppleII::~Player_AppleII() {
 	_mixer->stopHandle(_soundHandle);
-	delete _state.soundFunc;
+	delete _soundFunc;
+}
+
+void Player_AppleII::resetState() {
+	_soundNr = 0;
+	_type = 0;
+	_loop = 0;
+	_params = NULL;
+	_speakerState = 0;
+	delete _soundFunc;
+	_soundFunc = 0;
+	_sampleConverter.reset();
 }
 
 void Player_AppleII::startSound(int nr) {
@@ -380,69 +386,57 @@ void Player_AppleII::startSound(int nr) {
 	byte *ptr1 = data + 4;
 
 	resetState();
-	_state.soundNr = nr;
-	_state.type = ptr1[0];
-	_state.loop = ptr1[1];
-	_state.params = &ptr1[2];
+	_soundNr = nr;
+	_type = ptr1[0];
+	_loop = ptr1[1];
+	_params = &ptr1[2];
 
-	switch (_state.type) {
+	switch (_type) {
 	case 0: // empty (nothing to play)
 		resetState();
 		return;
 	case 1: 
-		_state.soundFunc = new AppleII_SoundFunction1_FreqUpDown(); 
+		_soundFunc = new AppleII_SoundFunction1_FreqUpDown(); 
 		break;
 	case 2: 
-		_state.soundFunc = new AppleII_SoundFunction2_SymmetricWave(); 
+		_soundFunc = new AppleII_SoundFunction2_SymmetricWave(); 
 		break;
 	case 3:	
-		_state.soundFunc = new AppleII_SoundFunction3_AsymmetricWave(); 
+		_soundFunc = new AppleII_SoundFunction3_AsymmetricWave(); 
 		break;
 	case 4: 
-		_state.soundFunc = new AppleII_SoundFunction4_Polyphone(); 
+		_soundFunc = new AppleII_SoundFunction4_Polyphone(); 
 		break;
 	case 5: 
-		_state.soundFunc = new AppleII_SoundFunction5_Noise(); 
+		_soundFunc = new AppleII_SoundFunction5_Noise(); 
 		break;
 	}
-	_state.soundFunc->init(this, _state.params);
+	_soundFunc->init(this, _params);
 
-	assert(_state.loop > 0);
+	assert(_loop > 0);
 
 	debug(4, "startSound %d: type %d, loop %d",
-		  nr, _state.type, _state.loop);
+		  nr, _type, _loop);
 }
 
 bool Player_AppleII::updateSound() {
-	if (!_state.soundFunc)
+	if (!_soundFunc)
 		return false;
 
-	if (_state.soundFunc->update()) {
-		--_state.loop;
-		if (_state.loop <= 0) {
-			delete _state.soundFunc;
-			_state.soundFunc = 0;
+	if (_soundFunc->update()) {
+		--_loop;
+		if (_loop <= 0) {
+			delete _soundFunc;
+			_soundFunc = 0;
 		} else {
 			// reset function state on each loop
-			_state.soundFunc->init(this, _state.params);
+			_soundFunc->init(this, _params);
 		}
 	}
 
 	return true;
 }
 
-void Player_AppleII::resetState() {
-	_state.soundNr = 0;
-	_state.type = 0;
-	_state.loop = 0;
-	_state.params = NULL;
-	_state.speakerState = 0;
-	delete _state.soundFunc;
-	_state.soundFunc = 0;
-
-	_sampleConverter.reset();
-}
-
 void Player_AppleII::stopAllSounds() {
 	Common::StackLock lock(_mutex);
 	resetState();
@@ -450,14 +444,14 @@ void Player_AppleII::stopAllSounds() {
 
 void Player_AppleII::stopSound(int nr) {
 	Common::StackLock lock(_mutex);
-	if (_state.soundNr == nr) {
+	if (_soundNr == nr) {
 		resetState();
 	}
 }
 
 int Player_AppleII::getSoundStatus(int nr) const {
 	Common::StackLock lock(_mutex);
-	return (_state.soundNr == nr);
+	return (_soundNr == nr);
 }
 
 int Player_AppleII::getMusicTimer() {
@@ -468,7 +462,7 @@ int Player_AppleII::getMusicTimer() {
 int Player_AppleII::readBuffer(int16 *buffer, const int numSamples) {
 	Common::StackLock lock(_mutex);
 
-	if (!_state.soundNr)
+	if (!_soundNr)
 		return 0;
 
 	int samplesLeft = numSamples;
@@ -479,7 +473,7 @@ int Player_AppleII::readBuffer(int16 *buffer, const int numSamples) {
 	} while ((samplesLeft > 0) && updateSound());
 
 	// reset state if sound is played completely
-	if (!_state.soundFunc && (_sampleConverter.availableSize() == 0))
+	if (!_soundFunc && (_sampleConverter.availableSize() == 0))
 		resetState();
 
 	return numSamples - samplesLeft;
@@ -491,11 +485,11 @@ int Player_AppleII::readBuffer(int16 *buffer, const int numSamples) {
 
 // toggle speaker on/off
 void Player_AppleII::speakerToggle() {
-	_state.speakerState ^= 0x1; 
+	_speakerState ^= 0x1; 
 }
 
 void Player_AppleII::generateSamples(int cycles) {
-	_sampleConverter.addCycles(_state.speakerState, cycles);
+	_sampleConverter.addCycles(_speakerState, cycles);
 }
 
 void Player_AppleII::wait(int interval, int count /*y*/) {
diff --git a/engines/scumm/player_appleII.h b/engines/scumm/player_appleII.h
index a44e7b6afe..9e97ab0c89 100644
--- a/engines/scumm/player_appleII.h
+++ b/engines/scumm/player_appleII.h
@@ -131,6 +131,11 @@ private:
 // CPU_CLOCK according to AppleWin
 static const double APPLEII_CPU_CLOCK = 1020484.5; // ~ 1.02 MHz
 
+/*
+ * Converts the 1-bit speaker state values into audio samples.
+ * This is done by aggregation of the speaker states at each 
+ * CPU cycle in a sampling period into an audio sample.
+ */
 class SampleConverter {
 private:
 	void addSampleToBuffer(int sample) {
@@ -219,7 +224,18 @@ private:
 	SampleBuffer _buffer;
 };
 
-class AppleII_SoundFunction;
+class Player_AppleII;
+
+class AppleII_SoundFunction {
+public:
+	AppleII_SoundFunction() {}
+	virtual ~AppleII_SoundFunction() {}
+	virtual void init(Player_AppleII *player, const byte *params) = 0;
+	/* returns true if finished */
+	virtual bool update() = 0;
+protected:
+	Player_AppleII *_player;
+};
 
 class Player_AppleII : public Audio::AudioStream, public MusicEngine {
 public:
@@ -250,46 +266,33 @@ public:
 	void wait(int interval, int count);
 
 private:
-	struct sound_state {
-		// sound number
-		int soundNr;
-		// type of sound
-		int type;
-		// number of loops left
-		int loop;
-		// global sound param list
-		const byte *params;
-		// speaker toggle state (0 / 1)
-		byte speakerState;
-		// sound function
-		AppleII_SoundFunction *soundFunc;
-	} _state;
+	// sound number
+	int _soundNr;
+	// type of sound
+	int _type;
+	// number of loops left
+	int _loop;
+	// global sound param list
+	const byte *_params;
+	// speaker toggle state (0 / 1)
+	byte _speakerState;
+	// sound function
+	AppleII_SoundFunction *_soundFunc;
+	// cycle to sample converter
+	SampleConverter _sampleConverter;
 
+private:
 	ScummEngine *_vm;
 	Audio::Mixer *_mixer;
 	Audio::SoundHandle _soundHandle;
 	int _sampleRate;
 	Common::Mutex _mutex;
 
-private:
-	SampleConverter _sampleConverter;
-
 private:
 	void resetState();
 	bool updateSound();
 };
 
-class AppleII_SoundFunction {
-public:
-	AppleII_SoundFunction() {}
-	virtual ~AppleII_SoundFunction() {}
-	virtual void init(Player_AppleII *player, const byte *params) = 0;
-	/* returns true if finished */
-	virtual bool update() = 0;
-protected:
-	Player_AppleII *_player;
-};
-
 } // End of namespace Scumm
 
 #endif
-- 
cgit v1.2.3


From 5f89ef2094e3092d4c5ffa74a77ca8931e675578 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 22 Dec 2011 22:26:08 +1100
Subject: TSAGE: R2R look/use/talk fields are more appropriate in the
 SceneHotspot class

---
 engines/tsage/core.cpp | 144 ++++++++++++++++++++++++++++++-------------------
 engines/tsage/core.h   |  15 +++---
 2 files changed, 97 insertions(+), 62 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index a32f445194..f894d2d33a 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1512,14 +1512,6 @@ void SceneItem::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_position.x); s.syncAsSint32LE(_position.y);
 	s.syncAsSint16LE(_yDiff);
 	s.syncAsSint32LE(_sceneRegionId);
-
-	if (g_vm->getGameID() == GType_Ringworld2) {
-		// In R2R, the following fields were moved into the SceneItem class
-		s.syncAsSint16LE(_resNum);
-		s.syncAsSint16LE(_lookLineNum);
-		s.syncAsSint16LE(_useLineNum);
-		s.syncAsSint16LE(_talkLineNum);
-	}
 }
 
 void SceneItem::remove() {
@@ -1774,60 +1766,24 @@ void SceneItem::display(const Common::String &msg) {
 		SET_EXT_FGCOLOR, 13, LIST_END);
 }
 
-void SceneItem::setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum) {
-	setBounds(ys, xe, ye, xs);
-	_resNum = resnum;
-	_lookLineNum = lookLineNum;
-	_useLineNum = useLineNum;
-	_talkLineNum = -1;
-	g_globals->_sceneItems.addItems(this, NULL);
-}
-
-void SceneItem::setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item) {
-	setBounds(bounds);
-	_resNum = resNum;
-	_lookLineNum = lookLineNum;
-	_talkLineNum = talkLineNum;
-	_useLineNum = useLineNum;
+/*--------------------------------------------------------------------------*/
 
-	switch (mode) {
-	case 2:
-		g_globals->_sceneItems.push_front(this);
-		break;
-	case 4:
-		g_globals->_sceneItems.addBefore(item, this);
-		break;
-	case 5:
-		g_globals->_sceneItems.addAfter(item, this);
-		break;
-	default:
-		g_globals->_sceneItems.push_back(this);
-		break;
-	}
+SceneHotspot::SceneHotspot(): SceneItem() {
+	_lookLineNum = _useLineNum = _talkLineNum = 0;
 }
 
-void SceneItem::setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode) {
-	_sceneRegionId = sceneRegionId;
-	_resNum = resNum;
-	_lookLineNum = lookLineNum;
-	_talkLineNum = talkLineNum;
-	_useLineNum = useLineNum;
+void SceneHotspot::synchronize(Serializer &s) {
+	SceneItem::synchronize(s);
 
-	// Handle adding hotspot to scene items list as necessary
-	switch (mode) {
-	case 2:
-		GLOBALS._sceneItems.push_front(this);
-		break;
-	case 3:
-		break;
-	default:
-		GLOBALS._sceneItems.push_back(this);
-		break;
+	if (g_vm->getGameID() == GType_Ringworld2) {
+		// In R2R, the following fields were moved into the SceneItem class
+		s.syncAsSint16LE(_resNum);
+		s.syncAsSint16LE(_lookLineNum);
+		s.syncAsSint16LE(_useLineNum);
+		s.syncAsSint16LE(_talkLineNum);
 	}
 }
 
-/*--------------------------------------------------------------------------*/
-
 bool SceneHotspot::startAction(CursorType action, Event &event) {
 	switch (g_vm->getGameID()) {
 	case GType_BlueForce: {
@@ -1835,6 +1791,32 @@ bool SceneHotspot::startAction(CursorType action, Event &event) {
 		assert(scene);
 		return scene->display(action);
 	}
+	case GType_Ringworld2: {
+		switch (action) {
+		case CURSOR_LOOK:
+			if (_lookLineNum != -1) {
+				SceneItem::display2(_resNum, _lookLineNum);
+				return true;
+			}
+			break;
+		case CURSOR_USE:
+			if (_useLineNum != -1) {
+				SceneItem::display2(_resNum, _useLineNum);
+				return true;
+			}
+			break;
+		case CURSOR_TALK:
+			if (_talkLineNum != -1) {
+				SceneItem::display2(_resNum, _talkLineNum);
+				return true;
+			}
+			break;
+		default:
+			break;
+		}
+
+		return ((Ringworld2::SceneExt *)GLOBALS._sceneManager._scene)->display(action, event);
+	}
 	default:
 		return SceneItem::startAction(action, event);
 	}
@@ -1871,6 +1853,58 @@ void SceneHotspot::doAction(int action) {
 	}
 }
 
+void SceneHotspot::setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum) {
+	setBounds(ys, xe, ye, xs);
+	_resNum = resnum;
+	_lookLineNum = lookLineNum;
+	_useLineNum = useLineNum;
+	_talkLineNum = -1;
+	g_globals->_sceneItems.addItems(this, NULL);
+}
+
+void SceneHotspot::setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item) {
+	setBounds(bounds);
+	_resNum = resNum;
+	_lookLineNum = lookLineNum;
+	_talkLineNum = talkLineNum;
+	_useLineNum = useLineNum;
+
+	switch (mode) {
+	case 2:
+		g_globals->_sceneItems.push_front(this);
+		break;
+	case 4:
+		g_globals->_sceneItems.addBefore(item, this);
+		break;
+	case 5:
+		g_globals->_sceneItems.addAfter(item, this);
+		break;
+	default:
+		g_globals->_sceneItems.push_back(this);
+		break;
+	}
+}
+
+void SceneHotspot::setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode) {
+	_sceneRegionId = sceneRegionId;
+	_resNum = resNum;
+	_lookLineNum = lookLineNum;
+	_talkLineNum = talkLineNum;
+	_useLineNum = useLineNum;
+
+	// Handle adding hotspot to scene items list as necessary
+	switch (mode) {
+	case 2:
+		GLOBALS._sceneItems.push_front(this);
+		break;
+	case 3:
+		break;
+	default:
+		GLOBALS._sceneItems.push_back(this);
+		break;
+	}
+}
+
 /*--------------------------------------------------------------------------*/
 
 void SceneObjectWrapper::setSceneObject(SceneObject *so) {
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 98efaf9881..ca691ec618 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -412,8 +412,6 @@ public:
 	Common::Point _position;
 	int _yDiff;
 	int _sceneRegionId;
-
-	int _resNum, _lookLineNum, _useLineNum, _talkLineNum;
 public:
 	SceneItem() : EventHandler() { _msg = "Feature"; _action = NULL; _sceneRegionId = 0; }
 
@@ -430,10 +428,6 @@ public:
 	static void display(int resNum, int lineNum, ...);
 	static void display2(int resNum, int lineNum);
 	static void display(const Common::String &msg);
-
-	virtual void setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum);
-	virtual void setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
-	virtual void setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode = 0);
 };
 
 class SceneItemExt : public SceneItem {
@@ -449,10 +443,17 @@ public:
 
 class SceneHotspot : public SceneItem {
 public:
-	SceneHotspot() : SceneItem() {}
+	int _resNum, _lookLineNum, _useLineNum, _talkLineNum;
+public:
+	SceneHotspot();
+	virtual void synchronize(Serializer &s);
 	virtual bool startAction(CursorType action, Event &event);
 	virtual Common::String getClassName() { return "SceneHotspot"; }
 	virtual void doAction(int action);
+
+	virtual void setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum);
+	virtual void setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
+	virtual void setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode = 0);
 };
 
 enum AnimateMode {ANIM_MODE_NONE = 0, ANIM_MODE_1 = 1, ANIM_MODE_2 = 2, ANIM_MODE_3 = 3,
-- 
cgit v1.2.3


From e10060f26207dc37ba38790db9fc793f1bcfb892 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 22 Dec 2011 14:31:04 +0100
Subject: TSAGE: R2R - Implement scene 3220

---
 engines/tsage/ringworld2/ringworld2_logic.cpp    |  4 +-
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 29 +++++++++-
 engines/tsage/ringworld2/ringworld2_scenes3.h    | 12 ++++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 70 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   | 16 ++++++
 5 files changed, 129 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 470cdab10c..cf294fa962 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -184,12 +184,14 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Autopsy room
 		return new Scene3175();
 	case 3200:
-		// Cutscene : Cutscene : Rocko & co - Discussion
+		// Cutscene : Guards - Discussion
 		return new Scene3200();
 	case 3210:
 		// Cutscene : Captain and Private - Discussion
 		return new Scene3210();
 	case 3220:
+		// Cutscene : Guards in cargo zone
+		return new Scene3220();
 	case 3230:
 	case 3240:
 	case 3245:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 5b1e05ebc8..097097308a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -923,7 +923,7 @@ void Scene3175::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3200 - Cutscene : Rocko & co - Discussion
+ * Scene 3200 - Cutscene : Guards - Discussion
  *
  *--------------------------------------------------------------------------*/
 void Scene3200::postInit(SceneObjectList *OwnerList) {
@@ -975,5 +975,32 @@ void Scene3210::postInit(SceneObjectList *OwnerList) {
 void Scene3210::signal() {
 	R2_GLOBALS._sceneManager.changeScene(1200);
 }
+
+/*--------------------------------------------------------------------------
+ * Scene 3220 - Cutscene : Guards in cargo zone
+ *
+ *--------------------------------------------------------------------------*/
+void Scene3220::postInit(SceneObjectList *OwnerList) {
+	loadScene(3220);
+	R2_GLOBALS._v58CE2 = 0;
+	SceneExt::postInit();
+
+	_stripManager.addSpeaker(&_rockoSpeaker);
+	_stripManager.addSpeaker(&_jockoSpeaker);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.disableControl();
+
+	_actor1.postInit();
+	_actor2.postInit();
+
+	setAction(&_sequenceManager, this, 3220 + R2_GLOBALS._randomSource.getRandomNumber(1), &_actor1, &_actor2, NULL);
+}
+
+void Scene3220::signal() {
+	R2_GLOBALS._sceneManager.changeScene(1200);
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index fbb6392be4..afd39769f0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -211,6 +211,18 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 };
+
+class Scene3220 : public SceneExt {
+public:
+	SpeakerRocko3220 _rockoSpeaker;
+	SpeakerJocko3220 _jockoSpeaker;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 80ac04c403..c216486d7f 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1228,5 +1228,75 @@ void SpeakerPrivate3210::proc15() {
 	}
 }
 
+SpeakerRocko3220::SpeakerRocko3220() {
+	_speakerName = "Rocko";
+	_color1 = 5;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerRocko3220::proc15() {
+	int v = _fieldF6;
+	Scene3220 *scene = (Scene3220 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor1;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+SpeakerJocko3220::SpeakerJocko3220() {
+	_speakerName = "Jocko";
+	_color1 = 45;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerJocko3220::proc15() {
+	int v = _fieldF6;
+	Scene3220 *scene = (Scene3220 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor2;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 66edd67276..fef700387e 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -309,6 +309,22 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerRocko3220 : public VisualSpeaker {
+public:
+	SpeakerRocko3220();
+
+	virtual Common::String getClassName() { return "SpeakerRocko3220"; }
+	virtual void proc15();
+};
+
+class SpeakerJocko3220 : public VisualSpeaker {
+public:
+	SpeakerJocko3220();
+
+	virtual Common::String getClassName() { return "SpeakerJocko3220"; }
+	virtual void proc15();
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From fc671351cf47c50f7cfc21b1f0ea38b81b105f38 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 22 Dec 2011 15:01:50 +0100
Subject: TSAGE: R2R - Implement scene 3230

---
 engines/tsage/ringworld2/ringworld2_logic.cpp    |  2 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 26 +++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h    | 13 +++++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 70 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   | 15 +++++
 5 files changed, 126 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index cf294fa962..3503765ef5 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -193,6 +193,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Cutscene : Guards in cargo zone
 		return new Scene3220();
 	case 3230:
+		// Cutscene : Guards on duty
+		return new Scene3230();
 	case 3240:
 	case 3245:
 	case 3250:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 097097308a..a07076bcba 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1002,5 +1002,31 @@ void Scene3220::signal() {
 	R2_GLOBALS._sceneManager.changeScene(1200);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3230 - Cutscene : Guards on duty
+ *
+ *--------------------------------------------------------------------------*/
+void Scene3230::postInit(SceneObjectList *OwnerList) {
+	loadScene(3230);
+	R2_GLOBALS._v58CE2 = 0;
+	SceneExt::postInit();
+
+	_stripManager.addSpeaker(&_rockoSpeaker);
+	_stripManager.addSpeaker(&_jockoSpeaker);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.disableControl();
+
+	_actor1.postInit();
+	_actor2.postInit();
+	_actor3.postInit();
+
+	setAction(&_sequenceManager, this, 3230 + R2_GLOBALS._randomSource.getRandomNumber(1), &_actor1, &_actor2, &_actor3, NULL);
+}
+
+void Scene3230::signal() {
+	R2_GLOBALS._sceneManager.changeScene(1200);
+}
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index afd39769f0..6bff8bc6d8 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -223,6 +223,19 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 };
+
+class Scene3230 : public SceneExt {
+public:
+	SpeakerRocko3230 _rockoSpeaker;
+	SpeakerJocko3230 _jockoSpeaker;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index c216486d7f..4c0494c214 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1298,5 +1298,75 @@ void SpeakerJocko3220::proc15() {
 	}
 }
 
+SpeakerRocko3230::SpeakerRocko3230() {
+	_speakerName = "Rocko";
+	_color1 = 5;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerRocko3230::proc15() {
+	int v = _fieldF6;
+	Scene3230 *scene = (Scene3230 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor1;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4111, (_object2->_strip * 2) - 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+SpeakerJocko3230::SpeakerJocko3230() {
+	_speakerName = "Jocko";
+	_color1 = 45;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerJocko3230::proc15() {
+	int v = _fieldF6;
+	Scene3230 *scene = (Scene3230 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor2;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index fef700387e..71933f3ec9 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -325,6 +325,21 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerRocko3230 : public VisualSpeaker {
+public:
+	SpeakerRocko3230();
+
+	virtual Common::String getClassName() { return "SpeakerRocko3230"; }
+	virtual void proc15();
+};
+
+class SpeakerJocko3230 : public VisualSpeaker {
+public:
+	SpeakerJocko3230();
+
+	virtual Common::String getClassName() { return "SpeakerJocko3230"; }
+	virtual void proc15();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From e6a671b555500de4f870d73cbd785e40f76d0d33 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 22 Dec 2011 16:20:21 +0100
Subject: TSAGE: R2R - Implement scene 3240

---
 engines/tsage/ringworld2/ringworld2_logic.cpp    |  2 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 28 ++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h    | 13 +++++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 70 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   | 16 ++++++
 5 files changed, 129 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 3503765ef5..0f43704fa8 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -196,6 +196,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Cutscene : Guards on duty
 		return new Scene3230();
 	case 3240:
+		// Cutscene : Teal monolog
+		return new Scene3240();
 	case 3245:
 	case 3250:
 	case 3255:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index a07076bcba..326591178d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1028,5 +1028,33 @@ void Scene3230::postInit(SceneObjectList *OwnerList) {
 void Scene3230::signal() {
 	R2_GLOBALS._sceneManager.changeScene(1200);
 }
+
+/*--------------------------------------------------------------------------
+ * Scene 3240 - Cutscene : Teal monolog
+ *
+ *--------------------------------------------------------------------------*/
+void Scene3240::postInit(SceneObjectList *OwnerList) {
+	loadScene(3240);
+	R2_GLOBALS._v58CE2 = 0;
+	SceneExt::postInit();
+
+	_stripManager.addSpeaker(&_tealSpeaker);
+	_stripManager.addSpeaker(&_webbsterSpeaker);
+	_stripManager.addSpeaker(&_mirandaSpeaker);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.disableControl();
+
+	_actor1.postInit();
+	_actor2.postInit();
+
+	setAction(&_sequenceManager, this, 3240 + R2_GLOBALS._randomSource.getRandomNumber(1), &_actor1, &_actor2, NULL);
+}
+
+void Scene3240::signal() {
+	R2_GLOBALS._sceneManager.changeScene(1200);
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 6bff8bc6d8..d652788e14 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -236,6 +236,19 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 };
+
+class Scene3240 : public SceneExt {
+public:
+	SpeakerTeal3240 _tealSpeaker;
+	SpeakerWebbster3240 _webbsterSpeaker;
+	SpeakerMiranda2500 _mirandaSpeaker;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 4c0494c214..a14d3ea8ae 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1368,5 +1368,75 @@ void SpeakerJocko3230::proc15() {
 	}
 }
 
+SpeakerTeal3240::SpeakerTeal3240() {
+	_speakerName = "Teal";
+	_color1 = 22;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerTeal3240::proc15() {
+	int v = _fieldF6;
+	Scene3240 *scene = (Scene3240 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor1;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4070, (_object2->_strip * 2) - 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+SpeakerWebbster3240::SpeakerWebbster3240() {
+	_speakerName = "Webbster";
+	_color1 = 10;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerWebbster3240::proc15() {
+	int v = _fieldF6;
+	Scene3240 *scene = (Scene3240 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor2;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4110, 5, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 71933f3ec9..bb49b985dc 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -340,6 +340,22 @@ public:
 	virtual Common::String getClassName() { return "SpeakerJocko3230"; }
 	virtual void proc15();
 };
+
+class SpeakerTeal3240 : public VisualSpeaker {
+public:
+	SpeakerTeal3240();
+
+	virtual Common::String getClassName() { return "SpeakerTeal3240"; }
+	virtual void proc15();
+};
+
+class SpeakerWebbster3240 : public VisualSpeaker {
+public:
+	SpeakerWebbster3240();
+
+	virtual Common::String getClassName() { return "SpeakerWebbster3240"; }
+	virtual void proc15();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From cdd9ab3b70da5abe287cc5ef4baa0c5b40e3bfd4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 22 Dec 2011 17:12:08 +0100
Subject: TSAGE: R2R - Implement scene 3245

---
 engines/tsage/globals.cpp                        |  2 +
 engines/tsage/globals.h                          |  1 +
 engines/tsage/ringworld2/ringworld2_logic.cpp    |  2 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 34 +++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h    | 12 +++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 96 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   | 16 ++++
 7 files changed, 163 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index da40485617..c9518fa688 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -387,6 +387,7 @@ void Ringworld2Globals::reset() {
 	for (int i = 0; i < 14; i++)
 		_v56605[i] = 0;
 	_v56AA0 = 0;
+	_v56AA1 = 0;
 	_v57C2C = 0;
 	_v58CE2 = 0;
 	Common::fill(&_v565F1[0], &_v565F1[MAX_CHARACTERS], 0);
@@ -428,6 +429,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	
 	s.syncAsByte(_v565AE);
 	s.syncAsByte(_v56AA0);
+	s.syncAsByte(_v56AA1);
 	for (i = 0; i < 14; ++i)
 		s.syncAsByte(_v56605[i]);
 
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 7e40276fcf..89ad418baa 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -253,6 +253,7 @@ public:
 	byte _v565AE;
 	byte _v56605[14];
 	byte _v56AA0;
+	byte _v56AA1;
 	int _v57C2C;
 	int _v58CE2;
 	int _speechSubtitles;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 0f43704fa8..f7dcc56d42 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -199,6 +199,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Cutscene : Teal monolog
 		return new Scene3240();
 	case 3245:
+		// Cutscene : Discussions with Dr. Tomko
+		return new Scene3245();
 	case 3250:
 	case 3255:
 	case 3260:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 326591178d..aa7361b77b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1056,5 +1056,39 @@ void Scene3240::signal() {
 	R2_GLOBALS._sceneManager.changeScene(1200);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3245 - Cutscene : Discussions with Dr. Tomko
+ *
+ *--------------------------------------------------------------------------*/
+void Scene3245::postInit(SceneObjectList *OwnerList) {
+	loadScene(3245);
+	R2_GLOBALS._v58CE2 = 0;
+	SceneExt::postInit();
+
+	_stripManager.addSpeaker(&_ralfSpeaker);
+	_stripManager.addSpeaker(&_tomkoSpeaker);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.disableControl();
+
+	_actor1.postInit();
+	_actor2.postInit();
+
+	if (R2_GLOBALS._v56AA1 < 4)
+		++R2_GLOBALS._v56AA1;
+
+	if (R2_GLOBALS._v56AA1 >= 4) {
+		SceneItem::display(1200, 7, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		signal();
+	} else {
+		setAction(&_sequenceManager, this, 3244 + R2_GLOBALS._v56AA1, &_actor1, &_actor2, NULL);
+	}
+}
+
+void Scene3245::signal() {
+	R2_GLOBALS._sceneManager.changeScene(1200);
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index d652788e14..96fa65e70f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -249,6 +249,18 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 };
+
+class Scene3245 : public SceneExt {
+public:
+	SpeakerRalf3245 _ralfSpeaker;
+	SpeakerTomko3245 _tomkoSpeaker;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index a14d3ea8ae..619b1c291f 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1438,5 +1438,101 @@ void SpeakerWebbster3240::proc15() {
 	}
 }
 
+SpeakerRalf3245::SpeakerRalf3245() {
+	_speakerName = "Ralf";
+	_color1 = 5;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerRalf3245::proc15() {
+	int v = _fieldF6;
+	Scene3245 *scene = (Scene3245 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor1;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		switch (_object2->_visage) {
+		case 3100:
+			_object1.setup(4105, (_object2->_strip * 2) - 1, 1);
+			break;
+		case 3101:
+			_object1.setup(4108, (_object2->_strip * 2) - 1, 1);
+			break;
+		case 3102:
+			_object1.setup(4109, (_object2->_strip * 2) - 1, 1);
+			break;
+		default:
+			break;
+		}
+
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+SpeakerTomko3245::SpeakerTomko3245() {
+	_speakerName = "Tomko";
+	_color1 = 10;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerTomko3245::proc15() {
+	int v = _fieldF6;
+	Scene3245 *scene = (Scene3245 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor2;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		switch (_object2->_visage) {
+		case 3100:
+			_object1.setup(4105, (_object2->_strip * 2) - 1, 1);
+			break;
+		case 3101:
+			_object1.setup(4108, (_object2->_strip * 2) - 1, 1);
+			break;
+		case 3102:
+			_object1.setup(4109, (_object2->_strip * 2) - 1, 1);
+			break;
+		default:
+			break;
+		}
+
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index bb49b985dc..e6a1819eb3 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -356,6 +356,22 @@ public:
 	virtual Common::String getClassName() { return "SpeakerWebbster3240"; }
 	virtual void proc15();
 };
+
+class SpeakerRalf3245 : public VisualSpeaker {
+public:
+	SpeakerRalf3245();
+
+	virtual Common::String getClassName() { return "SpeakerRalf3245"; }
+	virtual void proc15();
+};
+
+class SpeakerTomko3245 : public VisualSpeaker {
+public:
+	SpeakerTomko3245();
+
+	virtual Common::String getClassName() { return "SpeakerTomko3245"; }
+	virtual void proc15();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 086b0e505730a5168dc85371214d9904fbb16284 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 22 Dec 2011 19:42:13 +0100
Subject: TSAGE: R2R - Scene 3100 (space port): Fix cursor used in signal(),
 rename an object

---
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 25 ++++++++++++-------------
 engines/tsage/ringworld2/ringworld2_scenes3.h   |  4 ++--
 2 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index aa7361b77b..a46c3f7b9f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -43,7 +43,7 @@ void Scene3100::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_field412);
 }
 
-bool Scene3100::Actor6::startAction(CursorType action, Event &event) {
+bool Scene3100::Guard::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
 
@@ -98,11 +98,11 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 			_sound1.fadeSound(130);
 			setAction(&_sequenceManager, this, 3102, &_actor1, &R2_GLOBALS._player, &_actor3, &_actor4, &_actor5, NULL);
 		} else {
-			_actor6.postInit();
-			_actor6.setup(3110, 5, 1);
-			_actor6.changeZoom(50);
-			_actor6.setPosition(Common::Point(10, 149));
-			_actor6.setDetails(3100, 6, -1, -1, 2, NULL);
+			_guard.postInit();
+			_guard.setup(3110, 5, 1);
+			_guard.changeZoom(50);
+			_guard.setPosition(Common::Point(10, 149));
+			_guard.setDetails(3100, 6, -1, -1, 2, NULL);
 
 			_actor4.postInit();
 			_actor4.setup(3103, 1, 1);
@@ -126,11 +126,11 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 
 		setAction(&_sequenceManager, this, 3101, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL);
 	} else {
-		_actor6.postInit();
-		_actor6.setup(3110, 5, 1);
-		_actor6.changeZoom(50);
-		_actor6.setPosition(Common::Point(10, 149));
-		_actor6.setDetails(3100, 6, -1, -1, 2, NULL);
+		_guard.postInit();
+		_guard.setup(3110, 5, 1);
+		_guard.changeZoom(50);
+		_guard.setPosition(Common::Point(10, 149));
+		_guard.setDetails(3100, 6, -1, -1, 2, NULL);
 		
 		_actor4.postInit();
 		_actor4.setup(3103, 1, 1);
@@ -167,8 +167,7 @@ void Scene3100::remove() {
 void Scene3100::signal() {
 	switch (_sceneMode) {
 	case 10:
-		warning("TODO: Unknown cursor used (6/-6)");
-		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player.enableControl(CURSOR_TALK);
 		break;
 	case 3100:
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 96fa65e70f..ab98a8d66e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -41,7 +41,7 @@ using namespace TsAGE;
 
 
 class Scene3100 : public SceneExt {
-	class Actor6 : public SceneActor {
+	class Guard : public SceneActor {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 public:
@@ -55,7 +55,7 @@ public:
 	SceneActor _actor3;
 	SceneActor _actor4;
 	SceneActor _actor5;
-	Actor6 _actor6;
+	Guard _guard;
 	ASoundExt _sound1;
 	SequenceManager _sequenceManager;
 
-- 
cgit v1.2.3


From 0234bb5be26319a3cd634cbdcf73ad7beb31b16f Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 22 Dec 2011 19:45:44 +0100
Subject: TSAGE: R2R - Remove obsolete warning

---
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index a46c3f7b9f..65b1622883 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -849,7 +849,7 @@ bool Scene3175::Actor3::startAction(CursorType action, Event &event) {
 	default:
 		break;
 	}
-	warning("scene->display() called with two parameters");
+
 	return scene->display(action, event);
 }
 
-- 
cgit v1.2.3


From 2811d83670f63cbda6ff058d343be692f9c3ddbe Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 22 Dec 2011 20:21:23 +0100
Subject: TSAGE: Give a default value to the second parameter of
 disableControl(), as for enableControl()

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

(limited to 'engines')

diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index ca691ec618..bd27a942a4 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -653,7 +653,7 @@ public:
 
 	void disableControl();
 	void enableControl();
-	void disableControl(CursorType cursorId, CursorType objectId);
+	void disableControl(CursorType cursorId, CursorType objectId = CURSOR_NONE);
 	void enableControl(CursorType cursorId, CursorType objectId = CURSOR_NONE);
 };
 
-- 
cgit v1.2.3


From 014536cf3f8d619c257698ebd50b94c950cfca13 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 22 Dec 2011 20:23:48 +0100
Subject: TSAGE: R2R - Fix a couple of bugs in scene 2000, Fix calls to
 disableControl() with parameters

Also remove several obsolete warnings
---
 engines/tsage/globals.cpp                       |  3 ++
 engines/tsage/globals.h                         |  1 +
 engines/tsage/ringworld2/ringworld2_scenes2.cpp | 42 ++++++-------------------
 3 files changed, 14 insertions(+), 32 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index c9518fa688..740d9b91fd 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -388,6 +388,7 @@ void Ringworld2Globals::reset() {
 		_v56605[i] = 0;
 	_v56AA0 = 0;
 	_v56AA1 = 0;
+	_v56AAB = 0;
 	_v57C2C = 0;
 	_v58CE2 = 0;
 	Common::fill(&_v565F1[0], &_v565F1[MAX_CHARACTERS], 0);
@@ -420,6 +421,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 
 	s.syncAsSint16LE(_v5657C);
 	s.syncAsSint16LE(_v565F5);
+	s.syncAsSint16LE(_v56AAB);
 	s.syncAsSint16LE(_v57C2C);
 	s.syncAsSint16LE(_v58CE2);
 	s.syncAsSint16LE(_speechSubtitles);
@@ -430,6 +432,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsByte(_v565AE);
 	s.syncAsByte(_v56AA0);
 	s.syncAsByte(_v56AA1);
+
 	for (i = 0; i < 14; ++i)
 		s.syncAsByte(_v56605[i]);
 
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 89ad418baa..fb892c6cf7 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -254,6 +254,7 @@ public:
 	byte _v56605[14];
 	byte _v56AA0;
 	byte _v56AA1;
+	int _v56AAB;
 	int _v57C2C;
 	int _v58CE2;
 	int _speechSubtitles;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index b851ed4e22..1fe920e65c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -35,9 +35,7 @@ namespace Ringworld2 {
  *--------------------------------------------------------------------------*/
 void Scene2000::initPlayer() {
 	R2_GLOBALS._player.disableControl();
-	warning("DisableControl, with arguments?");
 
-	warning("initPlayer: %d", _mazePlayerMode);
 	switch (_mazePlayerMode) {
 	case 0:
 		R2_GLOBALS._player.setStrip(5);
@@ -49,7 +47,6 @@ void Scene2000::initPlayer() {
 		} else
 			R2_GLOBALS._player.setPosition(Common::Point(245, 129));
 		R2_GLOBALS._player.enableControl();
-		warning("EnableControl, with 2 arguments?");
 		break;
 	case 1:
 		if (R2_GLOBALS._player._characterIndex == 1)
@@ -179,8 +176,6 @@ void Scene2000::initExits() {
 
 	_object1.remove();
 
-	warning("initExits: %d", R2_GLOBALS._v56605[R2_GLOBALS._player._characterIndex]);
-
 	switch (R2_GLOBALS._v56605[R2_GLOBALS._player._characterIndex]) {
 	case 3:
 	case 10:
@@ -395,7 +390,6 @@ void Scene2000::Action1::signal() {
 	case 0: {
 		_actionIndex = 1;
 		Common::Point pt(-20, 127);
-		warning("TODO: Check sub_22D26");
 		NpcMover *mover = new NpcMover();
 		scene->_objList1[_state].addMover(mover, &pt, scene);
 		break;
@@ -439,7 +433,6 @@ void Scene2000::Action1::signal() {
 	case 5: {
 		_actionIndex = 6;
 		Common::Point pt(340, 127);
-		warning("TODO: Check sub_22D26");
 		NpcMover *mover = new NpcMover();
 		scene->_objList1[_state].addMover(mover, &pt, this);
 		break;
@@ -482,7 +475,6 @@ void Scene2000::Action1::signal() {
 		break;
 	case 10: {
 		Common::Point pt(290, 127);
-		warning("TODO: Check sub_22D26");
 		NpcMover *mover = new NpcMover();
 		scene->_objList1[_state].addMover(mover, &pt, this);
 		_actionIndex = 11;
@@ -508,13 +500,11 @@ void Scene2000::Action1::signal() {
 	case 15:
 		if ((R2_GLOBALS._v56605[3 + _state] == 13) || (R2_GLOBALS._v56605[3 + _state] == 22) || (R2_GLOBALS._v56605[3 + _state] == 27)) {
 			Common::Point pt(30, 127);
-			warning("TODO: Check sub_22D26");
 			NpcMover *mover = new NpcMover();
 			scene->_objList1[_state].addMover(mover, &pt, this);
 			_actionIndex = 16;
 		} else {
 			Common::Point pt(120, 127);
-			warning("TODO: Check sub_22D26");
 			NpcMover *mover = new NpcMover();
 			scene->_objList1[_state].addMover(mover, &pt, this);
 			_actionIndex = 16;
@@ -546,15 +536,12 @@ void Scene2000::Action1::signal() {
 
 void Scene2000::Exit1::changeScene() {
 	Scene2000 *scene = (Scene2000 *)R2_GLOBALS._sceneManager._scene;
-	warning("exit1");
 
 	scene->_exitingFlag = true;
 	scene->_sceneMode = 0;
-	R2_GLOBALS._player.disableControl();
-	warning("DisableControl, with arguments?");
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
 	scene->_sceneMode = 10;
 
-	warning("TODO: Check sub_22D26");
 	Common::Point pt(-10, 129);
 	NpcMover *mover = new NpcMover();
 	R2_GLOBALS._player.addMover(mover, &pt, scene);
@@ -564,15 +551,12 @@ void Scene2000::Exit1::changeScene() {
 
 void Scene2000::Exit2::changeScene() {
 	Scene2000 *scene = (Scene2000 *)R2_GLOBALS._sceneManager._scene;
-	warning("exit2");
 
 	scene->_exitingFlag = true;
 	scene->_sceneMode = 0;
-	R2_GLOBALS._player.disableControl();
-	warning("DisableControl, with arguments?");
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
 	scene->_sceneMode = 11;
 
-	warning("TODO: Check sub_22D26");
 	Common::Point pt(330, 129);
 	NpcMover *mover = new NpcMover();
 	R2_GLOBALS._player.addMover(mover, &pt, scene);
@@ -580,12 +564,10 @@ void Scene2000::Exit2::changeScene() {
 
 void Scene2000::Exit3::changeScene() {
 	Scene2000 *scene = (Scene2000 *)R2_GLOBALS._sceneManager._scene;
-	warning("exit13");
 
 	scene->_exitingFlag = true;
 	scene->_sceneMode = 0;
-	R2_GLOBALS._player.disableControl();
-	warning("DisableControl, with arguments?");
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
 	scene->_sceneMode = 12;
 
 	switch (R2_GLOBALS._v56605[R2_GLOBALS._player._characterIndex]) {
@@ -650,12 +632,10 @@ void Scene2000::Exit3::changeScene() {
 }
 void Scene2000::Exit4::changeScene() {
 	Scene2000 *scene = (Scene2000 *)R2_GLOBALS._sceneManager._scene;
-	warning("exit4");
 
 	scene->_exitingFlag = true;
 	scene->_sceneMode = 0;
-	R2_GLOBALS._player.disableControl();
-	warning("DisableControl, with arguments?");
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
 	scene->_sceneMode = 13;
 
 	switch (R2_GLOBALS._v56605[R2_GLOBALS._player._characterIndex]) {
@@ -709,11 +689,9 @@ void Scene2000::Exit4::changeScene() {
 
 void Scene2000::Exit5::changeScene() {
 	Scene2000 *scene = (Scene2000 *)R2_GLOBALS._sceneManager._scene;
-	warning("exit5");
 
 	scene->_sceneMode = 0;
-	R2_GLOBALS._player.disableControl();
-	warning("DisableControl, with arguments?");
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
 	scene->_sceneMode = 14;
 
 	switch (R2_GLOBALS._v56605[R2_GLOBALS._player._characterIndex]) {
@@ -1009,6 +987,9 @@ void Scene2000::signal() {
 			g_globals->_sceneManager.changeScene(2535);
 			break;
 		default:
+			if (R2_GLOBALS._v56AAB != 0)
+				R2_GLOBALS._v56AAB = 0;
+			R2_GLOBALS._player.enableControl(CURSOR_ARROW);
 			break;
 		}
 		break;
@@ -1024,7 +1005,6 @@ void Scene2000::signal() {
 void Scene2000::process(Event &event) {
 	if ((R2_GLOBALS._player._canWalk) && (event.eventType == EVENT_BUTTON_DOWN) && 
 			(R2_GLOBALS._events.getCursor() == CURSOR_CROSSHAIRS)) {
-		warning("TODO: Check sub_22D26");
 		
 		Common::Point pt(event.mousePos.x, 129);
 		PlayerMover *mover = new PlayerMover();
@@ -1069,7 +1049,7 @@ bool Scene2350::Actor3::startAction(CursorType action, Event &event) {
 void Scene2350::ExitUp::changeScene() {
 	Scene2350 *scene = (Scene2350 *)R2_GLOBALS._sceneManager._scene;
 	
-	R2_GLOBALS._player.disableControl();
+	R2_GLOBALS._player.disableControl(CURSOR_CROSSHAIRS);
 	scene->_sceneMode = 12;
 	if (R2_GLOBALS._player._characterIndex == 1)
 		scene->setAction(&scene->_sequenceManager, scene, 2350, &R2_GLOBALS._player, NULL);
@@ -1080,11 +1060,10 @@ void Scene2350::ExitUp::changeScene() {
 void Scene2350::ExitWest::changeScene() {
 	Scene2350 *scene = (Scene2350 *)R2_GLOBALS._sceneManager._scene;
 
-	R2_GLOBALS._player.disableControl();
+	R2_GLOBALS._player.disableControl(CURSOR_CROSSHAIRS);
 	scene->_sceneMode = 11;
 
 	Common::Point pt(-10, 129);
-	warning("TODO: Check sub_22D26");
 	NpcMover *mover = new NpcMover();
 	R2_GLOBALS._player.addMover(mover, &pt, scene);
 
@@ -1157,7 +1136,6 @@ void Scene2350::postInit(SceneObjectList *OwnerList) {
 			_sceneMode = 10;
 			R2_GLOBALS._player.setPosition(Common::Point(-20, 129));
 			Common::Point pt(20, 129);
-			warning("TODO: Check sub_22D26");
 			NpcMover *mover = new NpcMover();
 			R2_GLOBALS._player.addMover(mover, &pt, this);
 
-- 
cgit v1.2.3


From 3241d34a32fcd718e37a9b95841503675aa62a02 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Fri, 23 Dec 2011 10:39:42 +1100
Subject: Add patch #3463338 - Detect Macintosh demo of Pajama Sam 1.

---
 engines/scumm/detection_tables.h | 1 +
 engines/scumm/scumm-md5.h        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index cd055a5b78..c75089f8ca 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -717,6 +717,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "pajama", "Pajama Sam", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "pajama", "PajamaNHD", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "pajama", "PJS-DEMO", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "pajama", "PJS-DEMO", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "pajama", "pjsam", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "pajama", "PjSamDemo", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "pajama", "PYJAMA", kGenHEPC, Common::DE_DEU, UNK, 0 },
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 42ce74ec29..cb36743ee2 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 Nov 28 01:09:07 2011
+  This file was generated by the md5table tool on Thu Dec 22 23:21:30 2011
   DO NOT EDIT MANUALLY!
  */
 
@@ -16,7 +16,7 @@ struct MD5Table {
 static const MD5Table md5table[] = {
 	{ "008e76ec3ae58d0add637ea7aa299a2c", "freddi3", "", "", -1, Common::FR_FRA, Common::kPlatformMacintosh },
 	{ "02cae0e7ff8504f73618391873d5781a", "freddi3", "HE 98.5", "", -1, Common::DE_DEU, Common::kPlatformWindows },
-	{ "0305e850382b812fec6e5998ef88a966", "pajama", "", "Demo", -1, Common::NL_NLD, Common::kPlatformWindows },
+	{ "0305e850382b812fec6e5998ef88a966", "pajama", "", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "035deab53b47bc43abc763560d0f8d4b", "atlantis", "Floppy", "Demo", -1, Common::EN_ANY, Common::kPlatformPC },
 	{ "037385a953789190298494d92b89b3d0", "catalog", "HE 72", "Demo", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "03d3b18ee3fd68114e2a687c871e38d5", "freddi4", "HE 99", "Mini Game", -1, Common::EN_USA, Common::kPlatformWindows },
-- 
cgit v1.2.3


From c7dbbc860677efd01bd2aaaa5944b21c0849dda4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 23 Dec 2011 03:27:27 +0200
Subject: DREAMWEB: Ported 'reminders' to C++ and renamed it to
 edensFlatReminders()

---
 engines/dreamweb/dreamgen.cpp | 53 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.cpp    | 30 +++++++++++++++++++++++-
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 30 insertions(+), 55 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index a0ce29d416..dff190a6bf 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -26,59 +26,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::reminders() {
-	STACK_CHECK;
-	_cmp(data.byte(kReallocation), 24);
-	if (!flags.z())
-		return /* (notinedenslift) */;
-	_cmp(data.byte(kMapx), 44);
-	if (!flags.z())
-		return /* (notinedenslift) */;
-	_cmp(data.byte(kProgresspoints), 0);
-	if (!flags.z())
-		return /* (notfirst) */;
-	al = 'D';
-	ah = 'K';
-	cl = 'E';
-	ch = 'Y';
-	isRyanHolding();
-	if (flags.z())
-		goto forgotone;
-	al = 'C';
-	ah = 'S';
-	cl = 'H';
-	ch = 'R';
-	findExObject();
-	_cmp(al, (114));
-	if (flags.z())
-		goto forgotone;
-	ax = es.word(bx+2);
-	_cmp(al, 4);
-	if (!flags.z())
-		goto forgotone;
-	_cmp(ah, 255);
-	if (flags.z())
-		goto havegotcard;
-	cl = 'P';
-	ch = 'U';
-	dl = 'R';
-	dh = 'S';
-	_xchg(al, ah);
-	compare();
-	if (!flags.z())
-		goto forgotone;
-havegotcard:
-	_inc(data.byte(kProgresspoints));
-	return;
-forgotone:
-	al = 50;
-	bl = 54;
-	bh = 70;
-	cx = 48;
-	dx = 8;
-	setupTimedUse();
-}
-
 void DreamGenContext::transferMap() {
 	STACK_CHECK;
 	di = data.word(kExframepos);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index b13d150ad4..76fa167389 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -476,7 +476,6 @@ public:
 	void findFirstPath();
 	void startTalk();
 	void getAnyAd();
-	void reminders();
 	void getFreeAd();
 	void dirFile();
 	void pickupConts();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 6989a57a93..c755b93dec 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3784,7 +3784,7 @@ void DreamGenContext::afterNewRoom() {
 	zoom();
 	workToScreenM();
 	walkIntoRoom();
-	reminders();
+	edensFlatReminders();
 	atmospheres();
 }
 
@@ -4616,4 +4616,32 @@ void DreamGenContext::lookAtPlace() {
 	workToScreenM();
 }
 
+void DreamGenContext::edensFlatReminders() {
+	if (data.byte(kReallocation) != 24 || data.byte(kMapx) != 44)
+		return; // not in Eden's lift
+
+	if (data.byte(kProgresspoints))
+		return; // not the first time in Eden's apartment
+
+	uint16 exObjextIndex = findExObject("CSHR");
+	if (!isRyanHolding("DKEY") || exObjextIndex == kNumexobjects) {
+		DreamBase::setupTimedUse(50, 48, 8, 54, 70);	// forgot something
+		return;
+	}
+
+	DynObject *object = getExAd(exObjextIndex);
+
+	if (object->mapad[0] != 4) {
+		DreamBase::setupTimedUse(50, 48, 8, 54, 70);	// forgot something
+		return;
+	} else if (object->mapad[1] != 255) {
+		if (!compare(object->mapad[1], object->mapad[0], "PURS")) {
+			DreamBase::setupTimedUse(50, 48, 8, 54, 70);	// forgot something
+			return;
+		}
+	}
+
+	data.byte(kProgresspoints)++;	// got card
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 1a76a785b8..f50f4d883d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -377,5 +377,6 @@
 	void lookAtPlace();
 	void inToInv();
 	void outOfInv();
+	void edensFlatReminders();
 
 #endif
-- 
cgit v1.2.3


From 2bdcbadbfe6badc8ab7c75bd27b988be7916828d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 18 Dec 2011 23:35:03 +0100
Subject: DREAMWEB: Yet more things to DreamBase

---
 engines/dreamweb/dreambase.h  | 11 ++++++++---
 engines/dreamweb/stubs.cpp    | 26 +++++++-------------------
 engines/dreamweb/stubs.h      | 16 +++-------------
 engines/dreamweb/vgagrafx.cpp |  4 ++--
 4 files changed, 20 insertions(+), 37 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 6de854f452..0cdcefe233 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -440,6 +440,12 @@ public:
 	void makeMainScreen();
 	void showWatchReel();
 	void watchReel();
+	void commandWithOb(uint8 command, uint8 type, uint8 index);
+	void examineObText();
+	void blockNameText();
+	void personNameText();
+	void walkToText();
+	void entryTexts();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
@@ -487,9 +493,8 @@ public:
 	void panelToMap();
 	void mapToPanel();
 	void dumpMap();
-
 	void transferInv();
-
+	void zoom();
 	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height);
 	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height);
 	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height);
@@ -506,11 +511,11 @@ public:
 	void showPCX(const Common::String &name);
 	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
 	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
+	bool pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y);
 	void loadPalFromIFF();
 	void createPanel();
 	void createPanel2();
 	void showPanel();
-	void entryTexts();
 };
 
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index c755b93dec..1a0c07cea5 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1266,7 +1266,7 @@ void DreamGenContext::commandWithOb() {
 	commandWithOb(al, bh, bl); 
 }
 
-void DreamGenContext::commandWithOb(uint8 command, uint8 type, uint8 index) {
+void DreamBase::commandWithOb(uint8 command, uint8 type, uint8 index) {
 	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
 	delTextLine();
 	uint16 commandText = kTextstart + getSegment(data.word(kCommandtext)).word(command * 2);
@@ -1283,19 +1283,19 @@ void DreamGenContext::commandWithOb(uint8 command, uint8 type, uint8 index) {
 	data.byte(kNewtextline) = 1;
 }
 
-void DreamGenContext::examineObText() {
+void DreamBase::examineObText() {
 	commandWithOb(1, data.byte(kCommandtype), data.byte(kCommand));
 }
 
-void DreamGenContext::blockNameText() {
+void DreamBase::blockNameText() {
 	commandWithOb(0, data.byte(kCommandtype), data.byte(kCommand));
 }
 
-void DreamGenContext::personNameText() {
+void DreamBase::personNameText() {
 	commandWithOb(2, data.byte(kCommandtype), data.byte(kCommand) & 127);
 }
 
-void DreamGenContext::walkToText() {
+void DreamBase::walkToText() {
 	commandWithOb(3, data.byte(kCommandtype), data.byte(kCommand));
 }
 
@@ -1446,10 +1446,6 @@ void DreamGenContext::walkAndExamine() {
 		examineOb();
 }
 
-void DreamGenContext::obName() {
-	obName(al, ah);
-}
-
 void DreamGenContext::obName(uint8 command, uint8 commandType) {
 	if (data.byte(kReasseschanges) == 0) {
 		if ((commandType == data.byte(kCommandtype)) && (command == data.byte(kCommand))) {
@@ -1796,19 +1792,15 @@ void DreamBase::showIcon() {
 	}
 }
 
-void DreamGenContext::checkIfSet() {
-	flags._z = !checkIfSet(al, ah);
-}
-
 bool DreamGenContext::checkIfSet(uint8 x, uint8 y) {
 	const ObjPos *setList = (const ObjPos *)getSegment(data.word(kBuffers)).ptr(kSetlist, sizeof(ObjPos) * 128);
 	for (size_t i = 0; i < 128; ++i) {
 		const ObjPos *pos = setList + 127 - i;
 		if (pos->index == 0xff || !pos->contains(x,y))
 			continue;
-		if (! pixelCheckSet(pos, x, y))
+		if (!pixelCheckSet(pos, x, y))
 			continue;
-		if (! isItDescribed(pos))
+		if (!isItDescribed(pos))
 			continue;
 		obName(pos->index, 1);
 		return true;
@@ -1843,10 +1835,6 @@ void DreamBase::hangOnW(uint16 frameCount) {
 	}
 }
 
-void DreamGenContext::hangOnP() {
-	hangOnP(cx);
-}
-
 void DreamBase::hangOnP(uint16 count) {
 	data.word(kMaintimer) = 0;
 	uint8 pointerFrame = data.byte(kPointerframe);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index f50f4d883d..987f04f65a 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -61,7 +61,6 @@
 		DreamBase::showFrame(frameData, x, y, frameNumber, effectsFlag);
 	}
 	void width160();
-	void zoom();
 	void commandOnly();
 	void commandOnly(uint8 command) {
 		DreamBase::commandOnly(command);
@@ -73,10 +72,9 @@
 	void checkIfEx();
 	bool checkIfEx(uint8 x, uint8 y);
 	void commandWithOb();
-	void commandWithOb(uint8 command, uint8 type, uint8 index);
-	void blockNameText();
-	void walkToText();
-	void personNameText();
+	void commandWithOb(uint8 command, uint8 type, uint8 index) {
+		DreamBase::commandWithOb(command, type, index);
+	}
 	DynObject *getFreeAd(uint8 index) {
 		return DreamBase::getFreeAd(index);
 	}
@@ -98,7 +96,6 @@
 		DreamBase::checkOne(x, y, flag, flagEx, type, flagX, flagY);
 	}
 	void walkAndExamine();
-	void obName();
 	void obName(uint8 command, uint8 commandType);
 	void checkCoords(const RectWithCallback *rectWithCallbacks);
 	void getExPos();
@@ -106,8 +103,6 @@
 	bool compare(uint8 index, uint8 flag, const char id[4]) {
 		return DreamBase::compare(index, flag, id);
 	}
-	bool pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y);
-	void checkIfSet();
 	bool checkIfSet(uint8 x, uint8 y);
 	void isItWorn();
 	bool isItWorn(const DynObject *object) {
@@ -125,17 +120,12 @@
 	void hangOn(uint16 frameCount) {
 		DreamBase::hangOn(frameCount);
 	}
-	void hangOnP();
-	void hangOnP(uint16 count) {
-		DreamBase::hangOnP(count);
-	}
 	uint8 findNextColon(const uint8 **string) {
 		return DreamBase::findNextColon(string);
 	}
 	void findNextColon();
 	const uint8 *getObTextStartCPP();
 	void useText(const uint8 *string);
-	void examineObText();
 	void showCity();
 	uint16 getPersFrame(uint8 index);
 	void convIcons();
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index cea9dbef8c..b1a23a6c96 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -371,7 +371,7 @@ void DreamBase::clearWork() {
 	memset(workspace(), 0, 320*200);
 }
 
-void DreamGenContext::zoom() {
+void DreamBase::zoom() {
 	if (data.word(kWatchingtime) != 0)
 		return;
 	if (data.byte(kZoomon) != 1)
@@ -432,7 +432,7 @@ void DreamBase::transferInv() {
 	data.word(kExframepos) += byteCount;
 }
 
-bool DreamGenContext::pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y) {
+bool DreamBase::pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y) {
 	x -= pos->xMin;
 	y -= pos->yMin;
 	SetObject *setObject = getSetAd(pos->index);
-- 
cgit v1.2.3


From d033566f6dea0330d17f54d2f1539c4587f231d0 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 20 Dec 2011 09:39:33 +0100
Subject: DREAMWEB: Move most of saveload.cpp to DreamBase

---
 engines/dreamweb/dreambase.h  |  15 +++++-
 engines/dreamweb/saveload.cpp | 119 +++++++++++++++++++++++++++++++++++++-----
 engines/dreamweb/stubs.cpp    |  99 ++---------------------------------
 engines/dreamweb/stubs.h      |  12 -----
 4 files changed, 122 insertions(+), 123 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 0cdcefe233..ba0499f95e 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -238,9 +238,18 @@ public:
 	void namesToOld();
 	void showMainOps();
 	void showDiscOps();
-	void showNames();
+	void actualSave();
+	void actualLoad();
 	void loadPosition(unsigned int slot);
 	void savePosition(unsigned int slot, const char *descbuf);
+	void loadSaveBox();
+	void showNames();
+	void checkInput();
+	void selectSlot();
+	void showSlots();
+	void showOpBox();
+	void showSaveOps();
+	void showLoadOps();
 
 	// from sound.cpp
 	bool loadSpeech(byte type1, int idx1, byte type2, int idx2);
@@ -320,7 +329,6 @@ public:
 	Frame *tempGraphics2();
 	Frame *tempGraphics3();
 	void showArrows();
-	void showOpBox();
 	void middlePanel();
 	void showDiary();
 	void readMouse();
@@ -446,6 +454,9 @@ public:
 	void personNameText();
 	void walkToText();
 	void entryTexts();
+	void setAllChanges();
+	void restoreAll();
+	void redrawMainScrn();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index cd32e4fa34..5ca8ce88ec 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -81,9 +81,9 @@ void DreamGenContext::doLoad(int savegameId) {
 			dumpPointer();
 			dumpTextLine();
 			RectWithCallback loadlist[] = {
-				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamGenContext::getBackToOps },
-				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamGenContext::actualLoad },
-				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamGenContext::selectSlot },
+				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps },
+				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamBase::actualLoad },
+				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamBase::selectSlot },
 				{ 0,320,0,200,&DreamBase::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
@@ -177,9 +177,9 @@ void DreamGenContext::saveGame() {
 			dumpTextLine();
 
 			RectWithCallback savelist[] = {
-				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamGenContext::getBackToOps },
-				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamGenContext::actualSave },
-				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamGenContext::selectSlot },
+				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps },
+				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamBase::actualSave },
+				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamBase::selectSlot },
 				{ 0,320,0,200,&DreamBase::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
@@ -268,7 +268,7 @@ void DreamGenContext::doSaveLoad() {
 	workToScreenCPP();
 
 	RectWithCallback opsList[] = {
-		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::getBackFromOps },
+		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamBase::getBackFromOps },
 		{ kOpsx+10,kOpsx+77,kOpsy+10,kOpsy+59,&DreamBase::DOSReturn },
 		{ kOpsx+128,kOpsx+190,kOpsy+16,kOpsy+100,&DreamGenContext::discOps },
 		{ 0,320,0,200,&DreamBase::blank },
@@ -316,6 +316,27 @@ void DreamGenContext::doSaveLoad() {
 	data.byte(kManisoffscreen) = 0;
 }
 
+void DreamBase::getBackFromOps() {
+	if (data.byte(kMandead) == 2)
+		blank();
+	else
+		getBack1();
+}
+
+void DreamBase::getBackToOps() {
+	if (data.byte(kCommandtype) != 201) {
+		data.byte(kCommandtype) = 201;
+		commandOnly(42);
+	}
+
+	if (data.word(kMousebutton) != data.word(kOldbutton)) {
+		if (data.word(kMousebutton) & 1) {
+			oldToNames();
+			data.byte(kGetback) = 2;
+		}
+	}
+}
+
 void DreamBase::showMainOps() {
 	showFrame(tempGraphics(), kOpsx+10, kOpsy+10, 8, 0);
 	showFrame(tempGraphics(), kOpsx+59, kOpsy+30, 7, 0);
@@ -329,7 +350,46 @@ void DreamBase::showDiscOps() {
 	showFrame(tempGraphics(), kOpsx+176+2, kOpsy+60-4, 5, 0);
 }
 
-void DreamGenContext::actualSave() {
+void DreamGenContext::discOps() {
+	if (data.byte(kCommandtype) != 249) {
+		data.byte(kCommandtype) = 249;
+		commandOnly(43);
+	}
+
+	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+		return;
+
+	scanForNames();
+	data.byte(kLoadingorsave) = 2;
+	showOpBox();
+	showDiscOps();
+	data.byte(kCurrentslot) = 0;
+	workToScreenM();
+	data.byte(kGetback) = 0;
+
+	RectWithCallback discOpsList[] = {
+		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::loadGame },
+		{ kOpsx+10,kOpsx+79,kOpsy+10,kOpsy+59,&DreamGenContext::saveGame },
+		{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps },
+		{ 0,320,0,200,&DreamBase::blank },
+		{ 0xFFFF,0,0,0,0 }
+	};
+
+	do {
+		if (data.byte(kQuitrequested) != 0)
+			return; // quitdiscops
+
+		delPointer();
+		readMouse();
+		showPointer();
+		vSync();
+		dumpPointer();
+		dumpTextLine();
+		checkCoords(discOpsList);
+	} while (!data.byte(kGetback));
+}
+
+void DreamBase::actualSave() {
 	if (data.byte(kCommandtype) != 222) {
 		data.byte(kCommandtype) = 222;
 		commandOnly(44);
@@ -356,7 +416,7 @@ void DreamGenContext::actualSave() {
 	data.byte(kGetback) = 4;
 }
 
-void DreamGenContext::actualLoad() {
+void DreamBase::actualLoad() {
 	if (data.byte(kCommandtype) != 221) {
 		data.byte(kCommandtype) = 221;
 		commandOnly(41);
@@ -584,7 +644,7 @@ void DreamGenContext::loadOld() {
 	data.byte(kGetback) = 0;
 }
 
-void DreamGenContext::loadSaveBox() {
+void DreamBase::loadSaveBox() {
 	loadIntoTemp("DREAMWEB.G08");
 }
 
@@ -612,7 +672,7 @@ void DreamBase::showNames() {
 	}
 }
 
-void DreamGenContext::checkInput() {
+void DreamBase::checkInput() {
 	if (data.byte(kLoadingorsave) == 3)
 		return;
 
@@ -649,7 +709,7 @@ void DreamGenContext::checkInput() {
 	workToScreenM();
 }
 
-void DreamGenContext::selectSlot() {
+void DreamBase::selectSlot() {
 	if (data.byte(kCommandtype) != 244) {
 		data.byte(kCommandtype) = 244;
 		commandOnly(45);
@@ -677,8 +737,41 @@ void DreamGenContext::selectSlot() {
 		showSaveOps();
 	readMouse();
 	showPointer();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 }
 
+void DreamBase::showSlots() {
+	showFrame(tempGraphics(), kOpsx + 7, kOpsy + 8, 2, 0);
+
+	uint16 y = kOpsy + 11;
+
+	for (int slot = 0; slot < 7; slot++) {
+		if (slot == data.byte(kCurrentslot))
+			showFrame(tempGraphics(), kOpsx + 10, y, 3, 0);
+
+		y += 10;
+	}
+}
+
+void DreamBase::showOpBox() {
+	showFrame(tempGraphics(), kOpsx, kOpsy, 0, 0);
+
+	// CHECKME: There seem to be versions of dreamweb in which this call
+	// should be removed. It displays a red dot on the ops dialogs if left in.
+	showFrame(tempGraphics(), kOpsx, kOpsy + 55, 4, 0);
+}
+
+void DreamBase::showLoadOps() {
+	showFrame(tempGraphics(), kOpsx + 128 + 4, kOpsy + 12, 1, 0);
+	showFrame(tempGraphics(), kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
+	printMessage(kOpsx + 104, kOpsy + 14, 55, 101, (101 & 1));
+}
+
+void DreamBase::showSaveOps() {
+	showFrame(tempGraphics(), kOpsx + 128 + 4, kOpsy + 12, 1, 0);
+	showFrame(tempGraphics(), kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
+	printMessage(kOpsx + 104, kOpsy + 14, 54, 101, (101 & 1));
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 1a0c07cea5..c31edc2c65 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1314,7 +1314,7 @@ void DreamBase::findOrMake(uint8 index, uint8 value, uint8 type) {
 	change->type = type;
 }
 
-void DreamGenContext::setAllChanges() {
+void DreamBase::setAllChanges() {
 	Change *change = (Change *)getSegment(data.word(kBuffers)).ptr(kListofchanges, sizeof(Change));
 	for (; change->index != 0xff; ++change)
 		if (change->location == data.byte(kReallocation))
@@ -2309,7 +2309,7 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	engine->closeFile();
 }
 
-void DreamGenContext::restoreAll() {
+void DreamBase::restoreAll() {
 	const Room &room = g_roomData[data.byte(kLocation)];
 	loadRoomData(room, true);
 	setAllChanges();
@@ -3131,27 +3131,6 @@ void DreamGenContext::newGame() {
 		data.byte(kGetback) = 3;
 }
 
-void DreamBase::getBackFromOps() {
-	if (data.byte(kMandead) == 2)
-		blank();
-	else
-		getBack1();
-}
-
-void DreamBase::getBackToOps() {
-	if (data.byte(kCommandtype) != 201) {
-		data.byte(kCommandtype) = 201;
-		commandOnly(42);
-	}
-
-	if (data.word(kMousebutton) != data.word(kOldbutton)) {
-		if (data.word(kMousebutton) & 1) {
-			oldToNames();
-			data.byte(kGetback) = 2;
-		}
-	}
-}
-
 void DreamGenContext::pickupOb(uint8 command, uint8 pos) {
 	data.byte(kLastinvpos) = pos;
 	data.byte(kObjecttype) = kFreeObjectType;
@@ -3234,7 +3213,7 @@ void DreamGenContext::gettingShot() {
 	clearBeforeLoad();
 }
 
-void DreamGenContext::redrawMainScrn() {
+void DreamBase::redrawMainScrn() {
 	data.word(kTimecount) = 0;
 	createPanel();
 	data.byte(kNewobs) = 0;
@@ -3630,26 +3609,6 @@ void DreamBase::showArrows() {
 	showFrame(tempGraphics(), 280, 14, 2, 0);
 }
 
-void DreamBase::showOpBox() {
-	showFrame(tempGraphics(), kOpsx, kOpsy, 0, 0);
-
-	// CHECKME: There seem to be versions of dreamweb in which this call
-	// should be removed. It displays a red dot on the ops dialogs if left in.
-	showFrame(tempGraphics(), kOpsx, kOpsy + 55, 4, 0);
-}
-
-void DreamGenContext::showLoadOps() {
-	showFrame(tempGraphics(), kOpsx + 128 + 4, kOpsy + 12, 1, 0);
-	showFrame(tempGraphics(), kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
-	printMessage(kOpsx + 104, kOpsy + 14, 55, 101, (101 & 1));
-}
-
-void DreamGenContext::showSaveOps() {
-	showFrame(tempGraphics(), kOpsx + 128 + 4, kOpsy + 12, 1, 0);
-	showFrame(tempGraphics(), kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
-	printMessage(kOpsx + 104, kOpsy + 14, 54, 101, (101 & 1));
-}
-
 void DreamBase::middlePanel() {
 	Frame *tempSprites = (Frame *)getSegment(data.word(kTempsprites)).ptr(0, 0);
 	showFrame(tempSprites, 72 + 47 + 20, 0, 48, 0);
@@ -3891,45 +3850,6 @@ void DreamGenContext::talk() {
 	}
 }
 
-void DreamGenContext::discOps() {
-	if (data.byte(kCommandtype) != 249) {
-		data.byte(kCommandtype) = 249;
-		commandOnly(43);
-	}
-
-	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
-		return;
-
-	scanForNames();
-	data.byte(kLoadingorsave) = 2;
-	showOpBox();
-	showDiscOps();
-	data.byte(kCurrentslot) = 0;
-	workToScreenM();
-	data.byte(kGetback) = 0;
-
-	RectWithCallback discOpsList[] = {
-		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::loadGame },
-		{ kOpsx+10,kOpsx+79,kOpsy+10,kOpsy+59,&DreamGenContext::saveGame },
-		{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamGenContext::getBackToOps },
-		{ 0,320,0,200,&DreamBase::blank },
-		{ 0xFFFF,0,0,0,0 }
-	};
-
-	do {
-		if (data.byte(kQuitrequested) != 0)
-			return; // quitdiscops
-
-		delPointer();
-		readMouse();
-		showPointer();
-		vSync();
-		dumpPointer();
-		dumpTextLine();
-		checkCoords(discOpsList);
-	} while (!data.byte(kGetback));
-}
-
 void DreamGenContext::hangOnPQ() {
 	data.byte(kGetback) = 0;
 
@@ -4510,19 +4430,6 @@ void DreamGenContext::lookAtCard() {
 	putBackObStuff();
 }
 
-void DreamGenContext::showSlots() {
-	showFrame(tempGraphics(), kOpsx + 7, kOpsy + 8, 2, 0);
-
-	uint16 y = kOpsy + 11;
-
-	for (int slot = 0; slot < 7; slot++) {
-		if (slot == data.byte(kCurrentslot))
-			showFrame(tempGraphics(), kOpsx + 10, y, 3, 0);
-
-		y += 10;
-	}
-}
-
 void DreamBase::clearBuffers() {
 	memset(getSegment(data.word(kBuffers)).ptr(0, kLengthofbuffer), 0, kLengthofbuffer);
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 987f04f65a..8a9a41489a 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -87,7 +87,6 @@
 	SetObject *getSetAd(uint8 index) {
 		return DreamBase::getSetAd(index);
 	}
-	void setAllChanges();
 	void deleteTaken();
 	bool finishedWalkingCPP();
 	void finishedWalking();
@@ -162,9 +161,6 @@
 	void doLook();
 	void showFirstUse();
 	void showSecondUse();
-	void actualSave();
-	void actualLoad();
-	void restoreAll();
 	void enterSymbol();
 	void viewFolder();
 	void edensCDPlayer();
@@ -221,7 +217,6 @@
 	void nextFolder();
 	void lastFolder();
 	void singleKey(uint8 key, uint16 x, uint16 y);
-	void loadSaveBox();
 	uint8 nextSymbol(uint8 symbol);
 	void showSymbol();
 	void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
@@ -247,9 +242,6 @@
 	void loadIntroRoom();
 	void afterIntroRoom();
 	void gettingShot();
-	void redrawMainScrn();
-	void selectSlot();
-	void selectSlot2();
 	void allPointer();
 	void openYourNeighbour();
 	void openRyan();
@@ -294,8 +286,6 @@
 		return DreamBase::loadSpeech(type1, idx1, type2, idx2);
 	}
 	void set16ColPalette();
-	void showSaveOps();
-	void showLoadOps();
 	void afterNewRoom();
 	void madmanRun();
 	void showDecisions();
@@ -307,7 +297,6 @@
 	void hangOnPQ();
 	void showGun();
 	void endGame();
-	void checkInput();
 	void dropError();
 	void cantDrop();
 	void newPlace();
@@ -341,7 +330,6 @@
 	void notHeldError();
 	void useGun();
 	void identifyOb();
-	void showSlots();
 	void useCashCard();
 	void useStereo();
 	void selectOb();
-- 
cgit v1.2.3


From a4ffb8fe54c41c957f506c127c6aa30586769c52 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 19 Dec 2011 21:41:51 +0100
Subject: DREAMWEB: Convert fadeDownMon, fadeUpMon, initialMonCols to C++

Note that the two fade methods are currently unused; the only calls to them
are commented out in the asm version of the code.
This change also removes showGroup()
---
 engines/dreamweb/dreambase.h  |  7 ++++--
 engines/dreamweb/dreamgen.cpp | 58 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  3 ---
 engines/dreamweb/monitor.cpp  |  6 +++--
 engines/dreamweb/stubs.h      |  1 -
 engines/dreamweb/vgafades.cpp | 46 ++++++++++++++++++++++++++--------
 6 files changed, 44 insertions(+), 77 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index ba0499f95e..45560dbc35 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -479,8 +479,11 @@ public:
 	void fadeDOS();
 	void doFade();
 	void fadeCalculation();
-	void fadeupYellows();
-	void fadeupMonFirst();
+	void fadeUpYellows();
+	void fadeUpMonFirst();
+	void fadeUpMon();
+	void fadeDownMon();
+	void initialMonCols();
 	void fadeScreenUp();
 	void fadeScreenUps();
 	void fadeScreenUpHalf();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index dff190a6bf..c2d8530b25 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -167,64 +167,6 @@ endearly2:
 	cx = pop();
 }
 
-void DreamGenContext::fadeDownMon() {
-	STACK_CHECK;
-	palToStartPal();
-	palToEndPal();
-	es = data.word(kBuffers);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768)+(231*3);
-	cx = 3*8;
-	ax = 0;
-	_stosb(cx, true);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768)+(246*3);
-	_stosb();
-	_stosw();
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 63;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 128;
-	cx = 64;
-	hangOn();
-}
-
-void DreamGenContext::fadeUpMon() {
-	STACK_CHECK;
-	palToStartPal();
-	palToEndPal();
-	es = data.word(kBuffers);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3))+(231*3);
-	cx = 3*8;
-	ax = 0;
-	_stosb(cx, true);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3))+(246*3);
-	_stosb();
-	_stosw();
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 63;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 128;
-	cx = 128;
-	hangOn();
-}
-
-void DreamGenContext::initialMonCols() {
-	STACK_CHECK;
-	palToStartPal();
-	es = data.word(kBuffers);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3))+(230*3);
-	cx = 3*9;
-	ax = 0;
-	_stosb(cx, true);
-	di = (0+(228*13)+32+60+(32*32)+(11*10*3))+(246*3);
-	_stosb();
-	_stosw();
-	ds = data.word(kBuffers);
-	si = (0+(228*13)+32+60+(32*32)+(11*10*3))+(230*3);
-	al = 230;
-	cx = 18;
-	showGroup();
-}
-
 void DreamGenContext::fillOpen() {
 	STACK_CHECK;
 	delTextLine();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 76fa167389..92b75a287a 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -465,7 +465,6 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
-	void fadeDownMon();
 	void getPersonText();
 	void getObTextStart();
 	void checkObjectSize();
@@ -479,7 +478,6 @@ public:
 	void getFreeAd();
 	void dirFile();
 	void pickupConts();
-	void fadeUpMon();
 	void reExFromInv();
 	void transferMap();
 	void purgeAnItem();
@@ -504,7 +502,6 @@ public:
 	void incRyanPage();
 	void searchForFiles();
 	void getExAd();
-	void initialMonCols();
 	void swapWithInv();
 	void transferToEx();
 	void parser();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 26caeb29ec..665265052a 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -63,8 +63,8 @@ void DreamGenContext::useMon() {
 	printLogo();
 	workToScreenCPP();
 	turnOnPower();
-	fadeupYellows();
-	fadeupMonFirst();
+	fadeUpYellows();
+	fadeUpMonFirst();
 	data.word(kMonadx) = 76;
 	data.word(kMonady) = 141;
 	monMessage(1);
@@ -171,10 +171,12 @@ bool DreamGenContext::execCommand() {
 void DreamBase::monitorLogo() {
 	if (data.byte(kLogonum) != data.byte(kOldlogonum)) {
 		data.byte(kOldlogonum) = data.byte(kLogonum);
+		//fadeDownMon(); // FIXME: Commented out in ASM
 		printLogo();
 		printUnderMon();
 		workToScreenCPP();
 		printLogo();
+		//fadeUpMon(); // FIXME: Commented out in ASM
 		printLogo();
 		playChannel1(26);
 		randomAccess(20);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 8a9a41489a..81949801b1 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -280,7 +280,6 @@
 	void moreTalk();
 	void redes();
 	void selectLocation();
-	void showGroup();
 	void loadSpeech();
 	bool loadSpeech(byte type1, int idx1, byte type2, int idx2) {
 		return DreamBase::loadSpeech(type1, idx1, type2, idx2);
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index 7518c226f4..d975d303c9 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -114,7 +114,7 @@ void DreamBase::fadeCalculation() {
 	--data.byte(kFadecount);
 }
 
-void DreamBase::fadeupYellows() {
+void DreamBase::fadeUpYellows() {
 	palToEndPal();
 	memset(endPalette() + 231 * 3, 0, 8 * 3);
 	memset(endPalette() + 246 * 3, 0, 1 * 3);
@@ -125,7 +125,7 @@ void DreamBase::fadeupYellows() {
 	hangOn(128);
 }
 
-void DreamBase::fadeupMonFirst() {
+void DreamBase::fadeUpMonFirst() {
 	palToStartPal();
 	palToEndPal();
 	memset(startPalette() + 231 * 3, 0, 8 * 3);
@@ -139,6 +139,39 @@ void DreamBase::fadeupMonFirst() {
 	hangOn(64);
 }
 
+
+void DreamBase::fadeDownMon() {
+	palToStartPal();
+	palToEndPal();
+	memset(endPalette() + 231 * 3, 0, 8 * 3);
+	memset(endPalette() + 246 * 3, 0, 1 * 3);
+	data.byte(kFadedirection) = 1;
+	data.byte(kFadecount) = 63;
+	data.byte(kColourpos) = 0;
+	data.byte(kNumtofade) = 128;
+	hangOn(64);
+}
+
+void DreamBase::fadeUpMon() {
+	palToStartPal();
+	palToEndPal();
+	memset(startPalette() + 231 * 3, 0, 8 * 3);
+	memset(startPalette() + 246 * 3, 0, 1 * 3);
+	data.byte(kFadedirection) = 1;
+	data.byte(kFadecount) = 63;
+	data.byte(kColourpos) = 0;
+	data.byte(kNumtofade) = 128;
+	hangOn(128);
+}
+
+void DreamBase::initialMonCols() {
+	palToStartPal();
+	memset(startPalette() + 230 * 3, 0, 9 * 3);
+	memset(startPalette() + 246 * 3, 0, 1 * 3);
+	engine->processEvents();
+	engine->setPalette(startPalette() + 230 * 3, 230, 18);
+}
+
 void DreamBase::fadeScreenUp() {
 	clearStartPal();
 	palToEndPal();
@@ -260,15 +293,6 @@ void DreamBase::dumpCurrent() {
 	engine->setPalette(pal, 128, 128);
 }
 
-void DreamGenContext::showGroup() {
-	engine->processEvents();
-	unsigned n = (uint16)cx;
-	uint8 *src = ds.ptr(si, n * 3);
-	engine->setPalette(src, al, n);
-	si += n * 3;
-	cx = 0;
-}
-
 void DreamGenContext::rollEndCredits2() {
 	rollEm();
 }
-- 
cgit v1.2.3


From cdc6bc421bef6ed0119819a92fba1b2b9283ce17 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 20 Dec 2011 09:44:00 +0100
Subject: DREAMWEB: Turn RectWithCallback into template

Also moves checkCoords to DreamBase, adding a nasty cast to it. This is a
temporary HACK, which allows moving functions that use checkCoords to
DreamBase one at a time, instead of all at once (and at the same time as
checkCoords). This can be undone once everything using checkCoords has been
moved to DreamBase.
---
 engines/dreamweb/dreambase.h  |  1 +
 engines/dreamweb/keypad.cpp   |  2 +-
 engines/dreamweb/object.cpp   |  6 +++---
 engines/dreamweb/saveload.cpp |  8 ++++----
 engines/dreamweb/structs.h    |  3 ++-
 engines/dreamweb/stubs.cpp    | 25 +++++++++++++------------
 engines/dreamweb/stubs.h      |  2 +-
 engines/dreamweb/use.cpp      |  2 +-
 8 files changed, 26 insertions(+), 23 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 45560dbc35..f2a4b70209 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -457,6 +457,7 @@ public:
 	void setAllChanges();
 	void restoreAll();
 	void redrawMainScrn();
+	template <class T> void checkCoords(const RectWithCallback<T> *rectWithCallbacks);
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 43f6749cad..b3ed844079 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -93,7 +93,7 @@ void DreamBase::addToPressList() {
 }
 
 void DreamGenContext::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
-	RectWithCallback keypadList[] = {
+	RectWithCallback<DreamGenContext> keypadList[] = {
 		{ kKeypadx+9,kKeypadx+30,kKeypady+9,kKeypady+22,&DreamBase::buttonOne },
 		{ kKeypadx+31,kKeypadx+52,kKeypady+9,kKeypady+22,&DreamBase::buttonTwo },
 		{ kKeypadx+53,kKeypadx+74,kKeypady+9,kKeypady+22,&DreamBase::buttonThree },
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 54979309f4..1c1ae5b4a0 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -170,7 +170,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 
 		switch (data.byte(kInvopen)) {
 		case 0: {
-			RectWithCallback examList[] = {
+			RectWithCallback<DreamGenContext> examList[] = {
 				{ 273,320,157,198,&DreamGenContext::getBackFromOb },
 				{ 260,300,0,44,&DreamGenContext::useObject },
 				{ 210,254,0,44,&DreamGenContext::selectOpenOb },
@@ -184,7 +184,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 		}
 		case 1: {
 			// Note: This table contains the non-constant _openChangeSize!
-			RectWithCallback invList1[] = {
+			RectWithCallback<DreamGenContext> invList1[] = {
 				{ 273,320,157,198,&DreamGenContext::getBackFromOb },
 				{ 255,294,0,24,&DreamGenContext::dropObject },
 				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage },
@@ -197,7 +197,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 			break;
 		}
 		default: {
-			RectWithCallback withList1[] = {
+			RectWithCallback<DreamGenContext> withList1[] = {
 				{ 273,320,157,198,&DreamGenContext::getBackFromOb },
 				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage },
 				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamGenContext::selectOb },
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 5ca8ce88ec..ceaac99ae1 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -80,7 +80,7 @@ void DreamGenContext::doLoad(int savegameId) {
 			vSync();
 			dumpPointer();
 			dumpTextLine();
-			RectWithCallback loadlist[] = {
+			RectWithCallback<DreamGenContext> loadlist[] = {
 				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps },
 				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamBase::actualLoad },
 				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamBase::selectSlot },
@@ -176,7 +176,7 @@ void DreamGenContext::saveGame() {
 			dumpPointer();
 			dumpTextLine();
 
-			RectWithCallback savelist[] = {
+			RectWithCallback<DreamGenContext> savelist[] = {
 				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps },
 				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamBase::actualSave },
 				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamBase::selectSlot },
@@ -267,7 +267,7 @@ void DreamGenContext::doSaveLoad() {
 	showMainOps();
 	workToScreenCPP();
 
-	RectWithCallback opsList[] = {
+	RectWithCallback<DreamGenContext> opsList[] = {
 		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamBase::getBackFromOps },
 		{ kOpsx+10,kOpsx+77,kOpsy+10,kOpsy+59,&DreamBase::DOSReturn },
 		{ kOpsx+128,kOpsx+190,kOpsy+16,kOpsy+100,&DreamGenContext::discOps },
@@ -367,7 +367,7 @@ void DreamGenContext::discOps() {
 	workToScreenM();
 	data.byte(kGetback) = 0;
 
-	RectWithCallback discOpsList[] = {
+	RectWithCallback<DreamGenContext> discOpsList[] = {
 		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::loadGame },
 		{ kOpsx+10,kOpsx+79,kOpsy+10,kOpsy+59,&DreamGenContext::saveGame },
 		{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps },
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 313f3caf0b..320ed7e1a8 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -62,10 +62,11 @@ struct Sprite {
 
 class DreamGenContext;
 
+template <class T = DreamGenContext>
 struct RectWithCallback {
 	uint16 _xMin, _xMax;
 	uint16 _yMin, _yMax;
-	void (DreamGenContext::*_callback)();
+	void (T::*_callback)();
 
 	bool contains(uint16 x, uint16 y) const {
 		return (x >= _xMin) && (x < _xMax) && (y >= _yMin) && (y < _yMax);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index c31edc2c65..eed12ceb95 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1566,14 +1566,15 @@ void DreamBase::dumpPointer() {
 		multiDump(data.word(kOldpointerx), data.word(kOldpointery), data.byte(kPointerxs), data.byte(kPointerys));
 }
 
-void DreamGenContext::checkCoords(const RectWithCallback *rectWithCallbacks) {
+template <class T>
+void DreamBase::checkCoords(const RectWithCallback<T> *rectWithCallbacks) {
 	if (data.byte(kNewlocation) != 0xff)
 		return;
 
-	const RectWithCallback *r;
+	const RectWithCallback<T> *r;
 	for (r = rectWithCallbacks; r->_xMin != 0xffff; ++r) {
 		if (r->contains(data.word(kMousex), data.word(kMousey))) {
-			(this->*(r->_callback))();
+			(((T *)this)->*(r->_callback))();
 			return;
 		}
 	}
@@ -1918,7 +1919,7 @@ void DreamGenContext::enterSymbol() {
 		dumpPointer();
 		dumpTextLine();
 		dumpSymbol();
-		RectWithCallback symbolList[] = {
+		RectWithCallback<DreamGenContext> symbolList[] = {
 			{ kSymbolx+40,kSymbolx+64,kSymboly+2,kSymboly+16,&DreamBase::quitSymbol },
 			{ kSymbolx,kSymbolx+52,kSymboly+20,kSymboly+50,&DreamBase::setTopLeft },
 			{ kSymbolx+52,kSymbolx+104,kSymboly+20,kSymboly+50,&DreamBase::setTopRight },
@@ -1998,7 +1999,7 @@ void DreamGenContext::showCity() {
 void DreamGenContext::mainScreen() {
 	data.byte(kInmaparea) = 0;
 	if (data.byte(kWatchon) == 1) {
-		RectWithCallback mainList[] = {
+		RectWithCallback<DreamGenContext> mainList[] = {
 			{ 44,70,32,46,&DreamGenContext::look },
 			{ 0,50,0,180,&DreamGenContext::inventory },
 			{ 226,244,10,26,&DreamGenContext::zoomOnOff },
@@ -2009,7 +2010,7 @@ void DreamGenContext::mainScreen() {
 		};
 		checkCoords(mainList);
 	} else {
-		RectWithCallback mainList2[] = {
+		RectWithCallback<DreamGenContext> mainList2[] = {
 			{ 44,70,32,46,&DreamGenContext::look },
 			{ 0,50,0,180,&DreamGenContext::inventory },
 			{ 226+48,244+48,10,26,&DreamGenContext::zoomOnOff },
@@ -2476,7 +2477,7 @@ const uint8 *DreamBase::getTextInFile1(uint16 index) {
 }
 
 void DreamGenContext::checkFolderCoords() {
-	RectWithCallback folderList[] = {
+	RectWithCallback<DreamGenContext> folderList[] = {
 		{ 280,320,160,200, &DreamBase::quitKey },
 		{ 143,300,6,194, &DreamGenContext::nextFolder },
 		{ 0,143,6,194, &DreamGenContext::lastFolder },
@@ -2633,7 +2634,7 @@ void DreamGenContext::useMenu() {
 		dumpPointer();
 		dumpMenu();
 		dumpTextLine();
-		RectWithCallback menuList[] = {
+		RectWithCallback<DreamGenContext> menuList[] = {
 			{ kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamBase::quitKey },
 			{ 0,320,0,200,&DreamBase::blank },
 			{ 0xFFFF,0,0,0,0 }
@@ -3559,7 +3560,7 @@ void DreamGenContext::selectLocation() {
 		if (data.byte(kGetback) == 1)
 			break;
 
-		RectWithCallback destList[] = {
+		RectWithCallback<DreamGenContext> destList[] = {
 			{ 238,258,4,44,&DreamGenContext::nextDest },
 			{ 104,124,4,44,&DreamGenContext::lastDest },
 			{ 280,308,4,44,&DreamGenContext::lookAtPlace },
@@ -3772,7 +3773,7 @@ void DreamGenContext::decide() {
 	fadeScreenUp();
 	data.byte(kGetback) = 0;
 
-	RectWithCallback decideList[] = {
+	RectWithCallback<DreamGenContext> decideList[] = {
 		{ kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamGenContext::newGame },
 		{ kOpsx+20,kOpsx+87,kOpsy+10,kOpsy+59,&DreamBase::DOSReturn },
 		{ kOpsx+123,kOpsx+190,kOpsy+10,kOpsy+59,&DreamGenContext::loadOld },
@@ -3817,7 +3818,7 @@ void DreamGenContext::talk() {
 	showPointer();
 	workToScreenCPP();
 
-	RectWithCallback talkList[] = {
+	RectWithCallback<DreamGenContext> talkList[] = {
 		{ 273,320,157,198,&DreamBase::getBack1 },
 		{ 240,290,2,44,&DreamGenContext::moreTalk },
 		{ 0,320,0,200,&DreamBase::blank },
@@ -3853,7 +3854,7 @@ void DreamGenContext::talk() {
 void DreamGenContext::hangOnPQ() {
 	data.byte(kGetback) = 0;
 
-	RectWithCallback quitList[] = {
+	RectWithCallback<DreamGenContext> quitList[] = {
 		{ 273,320,157,198,&DreamBase::getBack1 },
 		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 81949801b1..a3efebd2fe 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -96,7 +96,7 @@
 	}
 	void walkAndExamine();
 	void obName(uint8 command, uint8 commandType);
-	void checkCoords(const RectWithCallback *rectWithCallbacks);
+
 	void getExPos();
 	void compare();
 	bool compare(uint8 index, uint8 flag, const char id[4]) {
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 5cb1f6b92c..7765215827 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1270,7 +1270,7 @@ void DreamGenContext::useDiary() {
 	delPointer();
 	data.byte(kGetback) = 0;
 
-	RectWithCallback diaryList[] = {
+	RectWithCallback<DreamGenContext> diaryList[] = {
 		{ kDiaryx+94,kDiaryx+110,kDiaryy+97,kDiaryy+113,&DreamBase::diaryKeyN },
 		{ kDiaryx+151,kDiaryx+167,kDiaryy+71,kDiaryy+87,&DreamBase::diaryKeyP },
 		{ kDiaryx+176,kDiaryx+192,kDiaryy+108,kDiaryy+124,&DreamBase::quitKey },
-- 
cgit v1.2.3


From ef98df589563d77625928b69be79f7227e97d4a7 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 20 Dec 2011 10:27:02 +0100
Subject: DREAMWEB: cleanup

---
 engines/dreamweb/dreambase.h  |  3 +++
 engines/dreamweb/keypad.cpp   |  2 +-
 engines/dreamweb/object.cpp   |  6 +++---
 engines/dreamweb/saveload.cpp | 11 +++++++++--
 engines/dreamweb/stubs.cpp    | 19 ++++++-------------
 engines/dreamweb/stubs.h      |  3 ---
 engines/dreamweb/use.cpp      |  2 +-
 7 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index f2a4b70209..18eff56a77 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -242,6 +242,7 @@ public:
 	void actualLoad();
 	void loadPosition(unsigned int slot);
 	void savePosition(unsigned int slot, const char *descbuf);
+	void showDecisions();
 	void loadSaveBox();
 	void showNames();
 	void checkInput();
@@ -458,6 +459,8 @@ public:
 	void restoreAll();
 	void redrawMainScrn();
 	template <class T> void checkCoords(const RectWithCallback<T> *rectWithCallbacks);
+	void newGame();
+	void deleteTaken();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index b3ed844079..6e6941918f 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -93,7 +93,7 @@ void DreamBase::addToPressList() {
 }
 
 void DreamGenContext::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
-	RectWithCallback<DreamGenContext> keypadList[] = {
+	RectWithCallback<DreamBase> keypadList[] = {
 		{ kKeypadx+9,kKeypadx+30,kKeypady+9,kKeypady+22,&DreamBase::buttonOne },
 		{ kKeypadx+31,kKeypadx+52,kKeypady+9,kKeypady+22,&DreamBase::buttonTwo },
 		{ kKeypadx+53,kKeypadx+74,kKeypady+9,kKeypady+22,&DreamBase::buttonThree },
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 1c1ae5b4a0..8553f41ee8 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -171,7 +171,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 		switch (data.byte(kInvopen)) {
 		case 0: {
 			RectWithCallback<DreamGenContext> examList[] = {
-				{ 273,320,157,198,&DreamGenContext::getBackFromOb },
+				{ 273,320,157,198,&DreamBase::getBackFromOb },
 				{ 260,300,0,44,&DreamGenContext::useObject },
 				{ 210,254,0,44,&DreamGenContext::selectOpenOb },
 				{ 144,176,64,96,&DreamGenContext::setPickup },
@@ -185,7 +185,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 		case 1: {
 			// Note: This table contains the non-constant _openChangeSize!
 			RectWithCallback<DreamGenContext> invList1[] = {
-				{ 273,320,157,198,&DreamGenContext::getBackFromOb },
+				{ 273,320,157,198,&DreamBase::getBackFromOb },
 				{ 255,294,0,24,&DreamGenContext::dropObject },
 				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage },
 				{ kInventx,_openChangeSize,kInventy+100,kInventy+100+kItempicsize,&DreamGenContext::useOpened },
@@ -198,7 +198,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 		}
 		default: {
 			RectWithCallback<DreamGenContext> withList1[] = {
-				{ 273,320,157,198,&DreamGenContext::getBackFromOb },
+				{ 273,320,157,198,&DreamBase::getBackFromOb },
 				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage },
 				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamGenContext::selectOb },
 				{ 0,320,0,200,&DreamBase::blank },
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index ceaac99ae1..a0309e1ee0 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -80,7 +80,7 @@ void DreamGenContext::doLoad(int savegameId) {
 			vSync();
 			dumpPointer();
 			dumpTextLine();
-			RectWithCallback<DreamGenContext> loadlist[] = {
+			RectWithCallback<DreamBase> loadlist[] = {
 				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps },
 				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamBase::actualLoad },
 				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamBase::selectSlot },
@@ -176,7 +176,7 @@ void DreamGenContext::saveGame() {
 			dumpPointer();
 			dumpTextLine();
 
-			RectWithCallback<DreamGenContext> savelist[] = {
+			RectWithCallback<DreamBase> savelist[] = {
 				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps },
 				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamBase::actualSave },
 				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamBase::selectSlot },
@@ -644,6 +644,13 @@ void DreamGenContext::loadOld() {
 	data.byte(kGetback) = 0;
 }
 
+void DreamBase::showDecisions() {
+	createPanel2();
+	showOpBox();
+	showFrame(tempGraphics(), kOpsx + 17, kOpsy + 13, 6, 0);
+	underTextLine();
+}
+
 void DreamBase::loadSaveBox() {
 	loadIntoTemp("DREAMWEB.G08");
 }
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index eed12ceb95..dde9613f52 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1386,7 +1386,7 @@ void DreamBase::doChange(uint8 index, uint8 value, uint8 type) {
 	}
 }
 
-void DreamGenContext::deleteTaken() {
+void DreamBase::deleteTaken() {
 	const DynObject *extraObjects = (const DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, 0);
 	DynObject *freeObjects = (DynObject *)getSegment(data.word(kFreedat)).ptr(0, 0);
 	for (size_t i = 0; i < kNumexobjects; ++i) {
@@ -1919,7 +1919,7 @@ void DreamGenContext::enterSymbol() {
 		dumpPointer();
 		dumpTextLine();
 		dumpSymbol();
-		RectWithCallback<DreamGenContext> symbolList[] = {
+		RectWithCallback<DreamBase> symbolList[] = {
 			{ kSymbolx+40,kSymbolx+64,kSymboly+2,kSymboly+16,&DreamBase::quitSymbol },
 			{ kSymbolx,kSymbolx+52,kSymboly+20,kSymboly+50,&DreamBase::setTopLeft },
 			{ kSymbolx+52,kSymbolx+104,kSymboly+20,kSymboly+50,&DreamBase::setTopRight },
@@ -2634,7 +2634,7 @@ void DreamGenContext::useMenu() {
 		dumpPointer();
 		dumpMenu();
 		dumpTextLine();
-		RectWithCallback<DreamGenContext> menuList[] = {
+		RectWithCallback<DreamBase> menuList[] = {
 			{ kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamBase::quitKey },
 			{ 0,320,0,200,&DreamBase::blank },
 			{ 0xFFFF,0,0,0,0 }
@@ -3122,7 +3122,7 @@ void DreamBase::setBotRight() {
 		data.byte(kSymbolbotdir) = 1;
 }
 
-void DreamGenContext::newGame() {
+void DreamBase::newGame() {
 	if (data.byte(kCommandtype) != 251) {
 		data.byte(kCommandtype) = 251;
 		commandOnly(47);
@@ -3630,13 +3630,6 @@ void DreamBase::underTextLine() {
 	multiGet(textUnder(), data.byte(kTextaddressx), y, kUndertextsizex, kUndertextsizey);
 }
 
-void DreamGenContext::showDecisions() {
-	createPanel2();
-	showOpBox();
-	showFrame(tempGraphics(), kOpsx + 17, kOpsy + 13, 6, 0);
-	underTextLine();
-}
-
 void DreamBase::getUnderZoom() {
 	multiGet(getSegment(data.word(kBuffers)).ptr(kZoomspace, 0), kZoomx + 5, kZoomy + 4, 46, 40);
 }
@@ -3774,7 +3767,7 @@ void DreamGenContext::decide() {
 	data.byte(kGetback) = 0;
 
 	RectWithCallback<DreamGenContext> decideList[] = {
-		{ kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamGenContext::newGame },
+		{ kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamBase::newGame },
 		{ kOpsx+20,kOpsx+87,kOpsy+10,kOpsy+59,&DreamBase::DOSReturn },
 		{ kOpsx+123,kOpsx+190,kOpsy+10,kOpsy+59,&DreamGenContext::loadOld },
 		{ 0,320,0,200,&DreamBase::blank },
@@ -3854,7 +3847,7 @@ void DreamGenContext::talk() {
 void DreamGenContext::hangOnPQ() {
 	data.byte(kGetback) = 0;
 
-	RectWithCallback<DreamGenContext> quitList[] = {
+	RectWithCallback<DreamBase> quitList[] = {
 		{ 273,320,157,198,&DreamBase::getBack1 },
 		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index a3efebd2fe..61697e828e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -87,7 +87,6 @@
 	SetObject *getSetAd(uint8 index) {
 		return DreamBase::getSetAd(index);
 	}
-	void deleteTaken();
 	bool finishedWalkingCPP();
 	void finishedWalking();
 	void checkOne();
@@ -235,7 +234,6 @@
 	void realCredits();
 	void runIntroSeq();
 	void intro();
-	void newGame();
 	void pickupOb(uint8 command, uint8 pos);
 	void initialInv();
 	void walkIntoRoom();
@@ -287,7 +285,6 @@
 	void set16ColPalette();
 	void afterNewRoom();
 	void madmanRun();
-	void showDecisions();
 	void decide();
 	void talk();
 	void discOps();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 7765215827..f6406dc773 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1270,7 +1270,7 @@ void DreamGenContext::useDiary() {
 	delPointer();
 	data.byte(kGetback) = 0;
 
-	RectWithCallback<DreamGenContext> diaryList[] = {
+	RectWithCallback<DreamBase> diaryList[] = {
 		{ kDiaryx+94,kDiaryx+110,kDiaryy+97,kDiaryy+113,&DreamBase::diaryKeyN },
 		{ kDiaryx+151,kDiaryx+167,kDiaryy+71,kDiaryy+87,&DreamBase::diaryKeyP },
 		{ kDiaryx+176,kDiaryx+192,kDiaryy+108,kDiaryy+124,&DreamBase::quitKey },
-- 
cgit v1.2.3


From f41412186ba7bf3748428b572a3e5147d4313064 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 20 Dec 2011 11:05:24 +0100
Subject: DREAMWEB: Add newplace.cpp

---
 engines/dreamweb/dreambase.h  |  12 +-
 engines/dreamweb/module.mk    |   1 +
 engines/dreamweb/newplace.cpp | 251 ++++++++++++++++++++++++++++++++++++++++++
 engines/dreamweb/stubs.cpp    | 217 ------------------------------------
 4 files changed, 259 insertions(+), 222 deletions(-)
 create mode 100644 engines/dreamweb/newplace.cpp

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 18eff56a77..01772bb2ff 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -137,6 +137,13 @@ public:
 	void loadNews();
 	void loadCart();
 
+	// from newplace.cpp
+	void getUnderCentre();
+	void putUnderCentre();
+	void showArrows();
+	uint8 getLocation(uint8 index);
+	void setLocation(uint8 index);
+
 	// from object.cpp
 	void obIcons();
 	void fillRyan();
@@ -329,7 +336,6 @@ public:
 	Frame *tempGraphics();
 	Frame *tempGraphics2();
 	Frame *tempGraphics3();
-	void showArrows();
 	void middlePanel();
 	void showDiary();
 	void readMouse();
@@ -503,10 +509,6 @@ public:
 	inline uint8 *workspace() { return _workspace; }
 	void clearWork();
 
-	uint8 getLocation(uint8 index);
-	void setLocation(uint8 index);
-	void getUnderCentre();
-	void putUnderCentre();
 	uint8 *mapStore();
 	void panelToMap();
 	void mapToPanel();
diff --git a/engines/dreamweb/module.mk b/engines/dreamweb/module.mk
index 398f0b8db0..9b6d9f30df 100644
--- a/engines/dreamweb/module.mk
+++ b/engines/dreamweb/module.mk
@@ -8,6 +8,7 @@ MODULE_OBJS := \
 	dreamgen.o \
 	keypad.o \
 	monitor.o \
+	newplace.o \
 	object.o \
 	pathfind.o \
 	people.o \
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
new file mode 100644
index 0000000000..ba1276b9c6
--- /dev/null
+++ b/engines/dreamweb/newplace.cpp
@@ -0,0 +1,251 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 "dreamweb/dreamweb.h"
+
+namespace DreamGen {
+
+void DreamGenContext::newPlace() {
+	if (data.byte(kNeedtotravel) == 1) {
+		data.byte(kNeedtotravel) = 0;
+		selectLocation();
+	} else if (data.byte(kAutolocation) != 0xFF) {
+		data.byte(kNewlocation) = data.byte(kAutolocation);
+		data.byte(kAutolocation) = 0xFF;
+	}
+}
+
+void DreamGenContext::selectLocation() {
+	data.byte(kInmaparea) = 0;
+	clearBeforeLoad();
+	data.byte(kGetback) = 0;
+	data.byte(kPointerframe) = 22;
+	readCityPic();
+	showCity();
+	getRidOfTemp();
+	readDestIcon();
+	loadTravelText();
+	showPanel();
+	showMan();
+	showArrows();
+	showExit();
+	locationPic();
+	underTextLine();
+	data.byte(kCommandtype) = 255;
+	readMouse();
+	data.byte(kPointerframe) = 0;
+	showPointer();
+	workToScreenCPP();
+	playChannel0(9, 255);
+	data.byte(kNewlocation) = 255;
+
+	while (data.byte(kNewlocation) == 255) {
+		if (quitRequested())
+			break;
+
+		delPointer();
+		readMouse();
+		showPointer();
+		vSync();
+		dumpPointer();
+		dumpTextLine();
+
+		if (data.byte(kGetback) == 1)
+			break;
+
+		RectWithCallback<DreamGenContext> destList[] = {
+			{ 238,258,4,44,&DreamGenContext::nextDest },
+			{ 104,124,4,44,&DreamGenContext::lastDest },
+			{ 280,308,4,44,&DreamGenContext::lookAtPlace },
+			{ 104,216,138,192,&DreamGenContext::destSelect },
+			{ 273,320,157,198,&DreamBase::getBack1 },
+			{ 0,320,0,200,&DreamBase::blank },
+			{ 0xFFFF,0,0,0,0 }
+		};
+		checkCoords(destList);
+	}
+
+	if (quitRequested() || data.byte(kGetback) == 1 || data.byte(kNewlocation) == data.byte(kLocation)) {
+		data.byte(kNewlocation) = data.byte(kReallocation);
+		data.byte(kGetback) = 0;
+	}
+
+	getRidOfTemp();
+	getRidOfTemp2();
+	getRidOfTemp3();
+	deallocateMem(data.word(kTraveltext));
+}
+
+void DreamGenContext::showCity() {
+	clearWork();
+	showFrame(tempGraphics(), 57, 32, 0, 0);
+	showFrame(tempGraphics(), 120+57, 32, 1, 0);
+}
+
+void DreamGenContext::lookAtPlace() {
+	if (data.byte(kCommandtype) != 224) {
+		data.byte(kCommandtype) = 224;
+		commandOnly(27);
+	}
+
+	if (!(data.word(kMousebutton) & 1) ||
+		data.word(kMousebutton) == data.word(kOldbutton) ||
+		data.byte(kDestpos) >= 15)
+		return; // noinfo
+
+	delPointer();
+	delTextLine();
+	getUnderCentre();
+	showFrame(tempGraphics3(), 60, 72, 0, 0);
+	showFrame(tempGraphics3(), 60, 72 + 55, 4, 0);
+	if (data.byte(kForeignrelease))
+		showFrame(tempGraphics3(), 60, 72+55+21, 4, 0);
+
+	uint16 offset = kTextstart + getSegment(data.word(kTraveltext)).word(data.byte(kDestpos) * 2);
+	const uint8 *string = getSegment(data.word(kTraveltext)).ptr(offset, 0);
+	findNextColon(&string);
+	uint16 y = (data.byte(kForeignrelease)) ? 84 + 4 : 84;
+	printDirect(&string, 63, &y, 191, 191 & 1);
+	workToScreenM();
+	hangOnP(500);
+	data.byte(kPointermode) = 0;
+	data.byte(kPointerframe) = 0;
+	putUnderCentre();
+	workToScreenM();
+}
+
+void DreamBase::getUnderCentre() {
+	multiGet(mapStore(), 58, 72, 254, 110);
+}
+
+void DreamBase::putUnderCentre() {
+	multiPut(mapStore(), 58, 72, 254, 110);
+}
+
+// TODO: put Locationpic here
+
+// TODO: put Getdestinfo here
+
+void DreamBase::showArrows() {
+	showFrame(tempGraphics(), 116 - 12, 16, 0, 0);
+	showFrame(tempGraphics(), 226 + 12, 16, 1, 0);
+	showFrame(tempGraphics(), 280, 14, 2, 0);
+}
+
+void DreamGenContext::nextDest() {
+	if (data.byte(kCommandtype) != 218) {
+		data.byte(kCommandtype) = 218;
+		commandOnly(28);
+	}
+
+	if (!(data.word(kMousebutton) & 1) || data.word(kOldbutton) == 1)
+		return;	// nodu
+
+	do {
+		data.byte(kDestpos)++;
+		if (data.byte(kDestpos) == 15)
+			data.byte(kDestpos) = 0;	// last destination
+
+		getDestInfo();
+	} while (al == 0);
+
+	data.byte(kNewtextline) = 1;
+	delTextLine();
+	delPointer();
+	showPanel();
+	showMan();
+	showArrows();
+	locationPic();
+	underTextLine();
+	readMouse();
+	showPointer();
+	workToScreenCPP();
+	delPointer();
+}
+
+void DreamGenContext::lastDest() {
+	if (data.byte(kCommandtype) != 219) {
+		data.byte(kCommandtype) = 219;
+		commandOnly(29);
+	}
+
+	if (!(data.word(kMousebutton) & 1) || data.word(kOldbutton) == 1)
+		return;	// nodd
+
+	do {
+		data.byte(kDestpos)--;
+		if (data.byte(kDestpos) == 0xFF)
+			data.byte(kDestpos) = 15;	// first destination
+
+		getDestInfo();
+	} while (al == 0);
+
+	data.byte(kNewtextline) = 1;
+	delTextLine();
+	delPointer();
+	showPanel();
+	showMan();
+	showArrows();
+	locationPic();
+	underTextLine();
+	readMouse();
+	showPointer();
+	workToScreenCPP();
+	delPointer();
+}
+
+void DreamGenContext::destSelect() {
+	if (data.byte(kCommandtype) != 222) {
+		data.byte(kCommandtype) = 222;
+		commandOnly(30);
+	}
+
+	if (!(data.word(kMousebutton) & 1) || data.word(kOldbutton) == 1)
+		return;	// notrav
+
+	getDestInfo();
+	data.byte(kNewlocation) = data.byte(kDestpos);
+}
+
+uint8 DreamBase::getLocation(uint8 index) {
+	return data.byte(kRoomscango + index);
+}
+
+void DreamBase::setLocation(uint8 index) {
+	data.byte(kRoomscango + index) = 1;
+}
+
+// TODO: Place resetLocation here
+
+void DreamGenContext::readDestIcon() {
+	loadIntoTemp("DREAMWEB.G05");
+	loadIntoTemp2("DREAMWEB.G06");
+	loadIntoTemp3("DREAMWEB.G08");
+}
+
+void DreamGenContext::readCityPic() {
+	loadIntoTemp("DREAMWEB.G04");
+}
+
+
+
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index dde9613f52..137fad4526 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -846,14 +846,6 @@ void DreamBase::putUnderTimed() {
 	multiPut(getSegment(data.word(kBuffers)).ptr(kUndertimedtext, 0), data.byte(kTimedx), y, 240, kUndertimedysize);
 }
 
-void DreamBase::getUnderCentre() {
-	multiGet(mapStore(), 58, 72, 254, 110);
-}
-
-void DreamBase::putUnderCentre() {
-	multiPut(mapStore(), 58, 72, 254, 110);
-}
-
 void DreamGenContext::triggerMessage(uint16 index) {
 	multiGet(mapStore(), 174, 153, 200, 63);
 	uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(index * 2);
@@ -1990,12 +1982,6 @@ void DreamBase::sortOutMap() {
 	}
 }
 
-void DreamGenContext::showCity() {
-	clearWork();
-	showFrame(tempGraphics(), 57, 32, 0, 0);
-	showFrame(tempGraphics(), 120+57, 32, 1, 0);
-}
-
 void DreamGenContext::mainScreen() {
 	data.byte(kInmaparea) = 0;
 	if (data.byte(kWatchon) == 1) {
@@ -2461,14 +2447,6 @@ void DreamBase::examIcon() {
 	showFrame(engine->icons2(), 254, 5, 3, 0);
 }
 
-uint8 DreamBase::getLocation(uint8 index) {
-	return data.byte(kRoomscango + index);
-}
-
-void DreamBase::setLocation(uint8 index) {
-	data.byte(kRoomscango + index) = 1;
-}
-
 const uint8 *DreamBase::getTextInFile1(uint16 index) {
 	SegmentRef text = getSegment(data.word(kTextfile1));
 	uint16 offset = text.word(index * 2) + kTextstart;
@@ -2711,16 +2689,6 @@ void DreamGenContext::atmospheres() {
 	cancelCh0();
 }
 
-void DreamGenContext::readCityPic() {
-	loadIntoTemp("DREAMWEB.G04");
-}
-
-void DreamGenContext::readDestIcon() {
-	loadIntoTemp("DREAMWEB.G05");
-	loadIntoTemp2("DREAMWEB.G06");
-	loadIntoTemp3("DREAMWEB.G08");
-}
-
 uint8 DreamGenContext::nextSymbol(uint8 symbol) {
 	uint8 result = symbol + 1;
 	if (result == 6)
@@ -3370,81 +3338,6 @@ void DreamGenContext::reExFromOpen() {
 
 }
 
-void DreamGenContext::nextDest() {
-	if (data.byte(kCommandtype) != 218) {
-		data.byte(kCommandtype) = 218;
-		commandOnly(28);
-	}
-
-	if (!(data.word(kMousebutton) & 1) || data.word(kOldbutton) == 1)
-		return;	// nodu
-
-	do {
-		data.byte(kDestpos)++;
-		if (data.byte(kDestpos) == 15)
-			data.byte(kDestpos) = 0;	// last destination
-
-		getDestInfo();
-	} while (al == 0);
-
-	data.byte(kNewtextline) = 1;
-	delTextLine();
-	delPointer();
-	showPanel();
-	showMan();
-	showArrows();
-	locationPic();
-	underTextLine();
-	readMouse();
-	showPointer();
-	workToScreenCPP();
-	delPointer();
-}
-
-void DreamGenContext::lastDest() {
-	if (data.byte(kCommandtype) != 219) {
-		data.byte(kCommandtype) = 219;
-		commandOnly(29);
-	}
-
-	if (!(data.word(kMousebutton) & 1) || data.word(kOldbutton) == 1)
-		return;	// nodd
-
-	do {
-		data.byte(kDestpos)--;
-		if (data.byte(kDestpos) == 0xFF)
-			data.byte(kDestpos) = 15;	// first destination
-
-		getDestInfo();
-	} while (al == 0);
-
-	data.byte(kNewtextline) = 1;
-	delTextLine();
-	delPointer();
-	showPanel();
-	showMan();
-	showArrows();
-	locationPic();
-	underTextLine();
-	readMouse();
-	showPointer();
-	workToScreenCPP();
-	delPointer();
-}
-
-void DreamGenContext::destSelect() {
-	if (data.byte(kCommandtype) != 222) {
-		data.byte(kCommandtype) = 222;
-		commandOnly(30);
-	}
-
-	if (!(data.word(kMousebutton) & 1) || data.word(kOldbutton) == 1)
-		return;	// notrav
-
-	getDestInfo();
-	data.byte(kNewlocation) = data.byte(kDestpos);
-}
-
 void DreamGenContext::putBackObStuff() {
 	createPanel();
 	showPanel();
@@ -3522,68 +3415,6 @@ void DreamBase::dumpZoom() {
 		multiDump(kZoomx + 5, kZoomy + 4, 46, 40);
 }
 
-void DreamGenContext::selectLocation() {
-	data.byte(kInmaparea) = 0;
-	clearBeforeLoad();
-	data.byte(kGetback) = 0;
-	data.byte(kPointerframe) = 22;
-	readCityPic();
-	showCity();
-	getRidOfTemp();
-	readDestIcon();
-	loadTravelText();
-	showPanel();
-	showMan();
-	showArrows();
-	showExit();
-	locationPic();
-	underTextLine();
-	data.byte(kCommandtype) = 255;
-	readMouse();
-	data.byte(kPointerframe) = 0;
-	showPointer();
-	workToScreenCPP();
-	playChannel0(9, 255);
-	data.byte(kNewlocation) = 255;
-
-	while (data.byte(kNewlocation) == 255) {
-		if (quitRequested())
-			break;
-
-		delPointer();
-		readMouse();
-		showPointer();
-		vSync();
-		dumpPointer();
-		dumpTextLine();
-
-		if (data.byte(kGetback) == 1)
-			break;
-
-		RectWithCallback<DreamGenContext> destList[] = {
-			{ 238,258,4,44,&DreamGenContext::nextDest },
-			{ 104,124,4,44,&DreamGenContext::lastDest },
-			{ 280,308,4,44,&DreamGenContext::lookAtPlace },
-			{ 104,216,138,192,&DreamGenContext::destSelect },
-			{ 273,320,157,198,&DreamBase::getBack1 },
-			{ 0,320,0,200,&DreamBase::blank },
-			{ 0xFFFF,0,0,0,0 }
-		};
-		checkCoords(destList);
-	}
-
-	if (quitRequested() || data.byte(kGetback) == 1 || data.byte(kNewlocation) == data.byte(kLocation)) {
-		data.byte(kNewlocation) = data.byte(kReallocation);
-		data.byte(kGetback) = 0;
-	}
-
-	getRidOfTemp();
-	getRidOfTemp2();
-	getRidOfTemp3();
-	deallocateMem(data.word(kTraveltext));
-}
-
-
 void DreamBase::examineInventory() {
 	if (data.byte(kCommandtype) != 249) {
 		data.byte(kCommandtype) = 249;
@@ -3604,12 +3435,6 @@ void DreamBase::examineInventory() {
 	workToScreenM();
 }
 
-void DreamBase::showArrows() {
-	showFrame(tempGraphics(), 116 - 12, 16, 0, 0);
-	showFrame(tempGraphics(), 226 + 12, 16, 1, 0);
-	showFrame(tempGraphics(), 280, 14, 2, 0);
-}
-
 void DreamBase::middlePanel() {
 	Frame *tempSprites = (Frame *)getSegment(data.word(kTempsprites)).ptr(0, 0);
 	showFrame(tempSprites, 72 + 47 + 20, 0, 48, 0);
@@ -4020,16 +3845,6 @@ void DreamBase::getBack1() {
 	}
 }
 
-void DreamGenContext::newPlace() {
-	if (data.byte(kNeedtotravel) == 1) {
-		data.byte(kNeedtotravel) = 0;
-		selectLocation();
-	} else if (data.byte(kAutolocation) != 0xFF) {
-		data.byte(kNewlocation) = data.byte(kAutolocation);
-		data.byte(kAutolocation) = 0xFF;
-	}
-}
-
 void DreamGenContext::monkSpeaking() {
 	// FIXME: This is the CD version only.
 
@@ -4473,38 +4288,6 @@ void DreamGenContext::showDiaryKeys() {
 		showDiaryPage();
 }
 
-void DreamGenContext::lookAtPlace() {
-	if (data.byte(kCommandtype) != 224) {
-		data.byte(kCommandtype) = 224;
-		commandOnly(27);
-	}
-
-	if (!(data.word(kMousebutton) & 1) ||
-		data.word(kMousebutton) == data.word(kOldbutton) ||
-		data.byte(kDestpos) >= 15)
-		return; // noinfo
-
-	delPointer();
-	delTextLine();
-	getUnderCentre();
-	showFrame(tempGraphics3(), 60, 72, 0, 0);
-	showFrame(tempGraphics3(), 60, 72 + 55, 4, 0);
-	if (data.byte(kForeignrelease))
-		showFrame(tempGraphics3(), 60, 72+55+21, 4, 0);
-
-	uint16 offset = kTextstart + getSegment(data.word(kTraveltext)).word(data.byte(kDestpos) * 2);
-	const uint8 *string = getSegment(data.word(kTraveltext)).ptr(offset, 0);
-	findNextColon(&string);
-	uint16 y = (data.byte(kForeignrelease)) ? 84 + 4 : 84;
-	printDirect(&string, 63, &y, 191, 191 & 1);
-	workToScreenM();
-	hangOnP(500);
-	data.byte(kPointermode) = 0;
-	data.byte(kPointerframe) = 0;
-	putUnderCentre();
-	workToScreenM();
-}
-
 void DreamGenContext::edensFlatReminders() {
 	if (data.byte(kReallocation) != 24 || data.byte(kMapx) != 44)
 		return; // not in Eden's lift
-- 
cgit v1.2.3


From b6e139d112b08d9280c145ae40f6324be6707efe Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 20 Dec 2011 11:23:51 +0100
Subject: DREAMWEB: Convert resetLocation and purgeALocation to C++

---
 engines/dreamweb/dreambase.h  |  2 ++
 engines/dreamweb/dreamgen.cpp | 82 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  2 --
 engines/dreamweb/object.cpp   | 35 ++++++++++++++++++
 engines/dreamweb/stubs.cpp    |  9 ++---
 engines/dreamweb/use.cpp      |  3 +-
 6 files changed, 41 insertions(+), 92 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 01772bb2ff..5acdca0ac9 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -143,6 +143,7 @@ public:
 	void showArrows();
 	uint8 getLocation(uint8 index);
 	void setLocation(uint8 index);
+	void resetLocation(uint8 index);
 
 	// from object.cpp
 	void obIcons();
@@ -154,6 +155,7 @@ public:
 	void deleteExObject(uint8 index);
 	void deleteExFrame(uint8 frameNum);
 	void deleteExText(uint8 textNum);
+	void purgeALocation(uint8 index);
 
 	// from pathfind.cpp
 	void turnPathOn(uint8 param);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index c2d8530b25..e23a0a7983 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -1130,37 +1130,6 @@ void DreamGenContext::transferConToEx() {
 	ds.byte(si+2) = 255;
 }
 
-void DreamGenContext::purgeALocation() {
-	STACK_CHECK;
-	push(ax);
-	es = data.word(kExtras);
-	di = (0+2080+30000);
-	bx = pop();
-	cx = 0;
-purgeloc:
-	_cmp(bl, es.byte(di+0));
-	if (!flags.z())
-		goto dontpurge;
-	_cmp(es.byte(di+2), 0);
-	if (!flags.z())
-		goto dontpurge;
-	push(di);
-	push(es);
-	push(bx);
-	push(cx);
-	deleteExObject();
-	cx = pop();
-	bx = pop();
-	es = pop();
-	di = pop();
-dontpurge:
-	_add(di, 16);
-	_inc(cx);
-	_cmp(cx, (114));
-	if (!flags.z())
-		goto purgeloc;
-}
-
 void DreamGenContext::emergencyPurge() {
 	STACK_CHECK;
 checkpurgeagain:
@@ -1491,57 +1460,6 @@ void DreamGenContext::getDestInfo() {
 	ax = pop();
 }
 
-void DreamGenContext::resetLocation() {
-	STACK_CHECK;
-	push(ax);
-	_cmp(al, 5);
-	if (!flags.z())
-		goto notdelhotel;
-	purgeALocation();
-	al = 21;
-	purgeALocation();
-	al = 22;
-	purgeALocation();
-	al = 27;
-	purgeALocation();
-	goto clearedlocations;
-notdelhotel:
-	_cmp(al, 8);
-	if (!flags.z())
-		goto notdeltvstud;
-	purgeALocation();
-	al = 28;
-	purgeALocation();
-	goto clearedlocations;
-notdeltvstud:
-	_cmp(al, 6);
-	if (!flags.z())
-		goto notdelsarters;
-	purgeALocation();
-	al = 20;
-	purgeALocation();
-	al = 25;
-	purgeALocation();
-	goto clearedlocations;
-notdelsarters:
-	_cmp(al, 13);
-	if (!flags.z())
-		goto notdelboathouse;
-	purgeALocation();
-	al = 29;
-	purgeALocation();
-	goto clearedlocations;
-notdelboathouse:
-clearedlocations:
-	ax = pop();
-	ah = 0;
-	bx = ax;
-	dx = data;
-	es = dx;
-	_add(bx, 555);
-	es.byte(bx) = 0;
-}
-
 void DreamGenContext::dirCom() {
 	STACK_CHECK;
 	cx = 30;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 92b75a287a..de710a20d1 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -469,7 +469,6 @@ public:
 	void getObTextStart();
 	void checkObjectSize();
 	void doSomeTalk();
-	void resetLocation();
 	void outOfOpen();
 	void dirCom();
 	void findFirstPath();
@@ -481,7 +480,6 @@ public:
 	void reExFromInv();
 	void transferMap();
 	void purgeAnItem();
-	void purgeALocation();
 	void getSetAd();
 	void findOpenPos();
 	void searchForSame();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 8553f41ee8..6aa1364002 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -631,4 +631,39 @@ void DreamGenContext::outOfInv() {
 	delPointer();
 }
 
+void DreamBase::resetLocation(uint8 index) {
+	if (index == 5) {
+		// delete hotel
+		purgeALocation(5);
+		purgeALocation(21);
+		purgeALocation(22);
+		purgeALocation(27);
+	} else if (index == 8) {
+		// delete TV studio
+		purgeALocation(8);
+		purgeALocation(28);
+	} else if (index == 6) {
+		// delete sarters
+		purgeALocation(6);
+		purgeALocation(20);
+		purgeALocation(25);
+	} else if (index == 13) {
+		// delete boathouse
+		purgeALocation(13);
+		purgeALocation(29);
+	}
+
+	data.byte(kRoomscango + index) = 0;
+}
+
+void DreamBase::purgeALocation(uint8 index) {
+	// index == al
+	for (uint8 i = 0; i < kNumexobjects; ++i) {
+		DynObject *t = getExAd(i);
+		if (t->currentLocation == index && t->mapad[0] == 0) {
+			deleteExObject(i);
+		}
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 137fad4526..894c247e5b 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3901,8 +3901,7 @@ void DreamGenContext::useButtonA() {
 void DreamGenContext::autoAppear() {
 	if (data.byte(kLocation) == 32) {
 		// In alley
-		al = 5;
-		resetLocation();
+		resetLocation(5);
 		setLocation(10);
 		data.byte(kDestpos) = 10;
 		return;
@@ -3932,8 +3931,7 @@ void DreamGenContext::autoAppear() {
 		if (data.byte(kReallocation) == 25) {
 			// Sart roof
 			data.byte(kNewsitem) = 3;
-			al = 6;
-			resetLocation();
+			resetLocation(6);
 			setLocation(11);
 			data.byte(kDestpos) = 11;
 		} else {
@@ -4013,8 +4011,7 @@ void DreamGenContext::entryAnims() {
 		data.byte(kSpeedcount) = 1;
 		break;
 	case 44:	// Sparky's
-		al = 8;
-		resetLocation();
+		resetLocation(8);
 		data.word(kWatchingtime) = 50*2;
 		data.word(kReeltowatch) = 247;
 		data.word(kEndwatchreel) = 297;
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index f6406dc773..d3dda0e0a0 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -823,8 +823,7 @@ void DreamGenContext::useGun() {
 	} else if (data.byte(kReallocation) == 29) {
 		// aide
 		data.byte(kGetback) = 1;
-		al = 13;
-		resetLocation();
+		resetLocation(13);
 		setLocation(12);
 		data.byte(kDestpos) = 12;
 		data.byte(kDestination) = 2;
-- 
cgit v1.2.3


From b2fcdd6c86fb341695d32afded114fecbe5d7590 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 20 Dec 2011 11:33:09 +0100
Subject: DREAMWEB: Move rest of saveload.cpp to DreamBase

---
 engines/dreamweb/dreambase.h  | 15 ++++++++++++++-
 engines/dreamweb/newplace.cpp | 25 ++++++++++++++++++++++++-
 engines/dreamweb/object.cpp   | 25 -------------------------
 engines/dreamweb/saveload.cpp | 23 ++++++++++++-----------
 engines/dreamweb/stubs.cpp    | 20 ++++++++------------
 engines/dreamweb/stubs.h      | 13 -------------
 6 files changed, 58 insertions(+), 63 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 5acdca0ac9..561237ac6e 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -243,14 +243,22 @@ public:
 	void delCurs();
 
 	// from saveload.cpp
-	void oldToNames();
+	void loadGame();
+	void doLoad(int slot);
+	void saveGame();
 	void namesToOld();
+	void oldToNames();
+	void saveLoad();
+	void doSaveLoad();
 	void showMainOps();
 	void showDiscOps();
+	void discOps();
 	void actualSave();
 	void actualLoad();
 	void loadPosition(unsigned int slot);
 	void savePosition(unsigned int slot, const char *descbuf);
+	uint scanForNames();
+	void loadOld();
 	void showDecisions();
 	void loadSaveBox();
 	void showNames();
@@ -469,6 +477,11 @@ public:
 	template <class T> void checkCoords(const RectWithCallback<T> *rectWithCallbacks);
 	void newGame();
 	void deleteTaken();
+	void autoAppear();
+	void loadRoom();
+	void startLoading(const Room &room);
+	void startup();
+	void atmospheres();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index ba1276b9c6..f1743f0e6d 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -234,7 +234,30 @@ void DreamBase::setLocation(uint8 index) {
 	data.byte(kRoomscango + index) = 1;
 }
 
-// TODO: Place resetLocation here
+void DreamBase::resetLocation(uint8 index) {
+	if (index == 5) {
+		// delete hotel
+		purgeALocation(5);
+		purgeALocation(21);
+		purgeALocation(22);
+		purgeALocation(27);
+	} else if (index == 8) {
+		// delete TV studio
+		purgeALocation(8);
+		purgeALocation(28);
+	} else if (index == 6) {
+		// delete sarters
+		purgeALocation(6);
+		purgeALocation(20);
+		purgeALocation(25);
+	} else if (index == 13) {
+		// delete boathouse
+		purgeALocation(13);
+		purgeALocation(29);
+	}
+
+	data.byte(kRoomscango + index) = 0;
+}
 
 void DreamGenContext::readDestIcon() {
 	loadIntoTemp("DREAMWEB.G05");
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 6aa1364002..207f4889db 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -631,31 +631,6 @@ void DreamGenContext::outOfInv() {
 	delPointer();
 }
 
-void DreamBase::resetLocation(uint8 index) {
-	if (index == 5) {
-		// delete hotel
-		purgeALocation(5);
-		purgeALocation(21);
-		purgeALocation(22);
-		purgeALocation(27);
-	} else if (index == 8) {
-		// delete TV studio
-		purgeALocation(8);
-		purgeALocation(28);
-	} else if (index == 6) {
-		// delete sarters
-		purgeALocation(6);
-		purgeALocation(20);
-		purgeALocation(25);
-	} else if (index == 13) {
-		// delete boathouse
-		purgeALocation(13);
-		purgeALocation(29);
-	}
-
-	data.byte(kRoomscango + index) = 0;
-}
-
 void DreamBase::purgeALocation(uint8 index) {
 	// index == al
 	for (uint8 i = 0; i < kNumexobjects; ++i) {
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index a0309e1ee0..b12c668d82 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -44,7 +44,7 @@ void syncReelRoutine(Common::Serializer &s, ReelRoutine *reel) {
 	s.syncAsByte(reel->b7);
 }
 
-void DreamGenContext::loadGame() {
+void DreamBase::loadGame() {
 	if (data.byte(kCommandtype) != 246) {
 		data.byte(kCommandtype) = 246;
 		commandOnly(41);
@@ -57,7 +57,7 @@ void DreamGenContext::loadGame() {
 
 // if -1, open menu to ask for slot to load
 // if >= 0, directly load from that slot
-void DreamGenContext::doLoad(int savegameId) {
+void DreamBase::doLoad(int savegameId) {
 	data.byte(kLoadingorsave) = 1;
 
 	if (ConfMan.getBool("dreamweb_originalsaveload") && savegameId == -1) {
@@ -138,7 +138,7 @@ void DreamGenContext::doLoad(int savegameId) {
 }
 
 
-void DreamGenContext::saveGame() {
+void DreamBase::saveGame() {
 	if (data.byte(kMandead) == 2) {
 		blank();
 		return;
@@ -239,7 +239,7 @@ void DreamBase::oldToNames() {
 	memcpy(_saveNames, _saveNamesOld, 17*7);
 }
 
-void DreamGenContext::saveLoad() {
+void DreamBase::saveLoad() {
 	if (data.word(kWatchingtime) || (data.byte(kPointermode) == 2)) {
 		blank();
 		return;
@@ -252,7 +252,7 @@ void DreamGenContext::saveLoad() {
 		doSaveLoad();
 }
 
-void DreamGenContext::doSaveLoad() {
+void DreamBase::doSaveLoad() {
 	data.byte(kPointerframe) = 0;
 	data.word(kTextaddressx) = 70;
 	data.word(kTextaddressy) = 182-8;
@@ -350,7 +350,7 @@ void DreamBase::showDiscOps() {
 	showFrame(tempGraphics(), kOpsx+176+2, kOpsy+60-4, 5, 0);
 }
 
-void DreamGenContext::discOps() {
+void DreamBase::discOps() {
 	if (data.byte(kCommandtype) != 249) {
 		data.byte(kCommandtype) = 249;
 		commandOnly(43);
@@ -368,8 +368,8 @@ void DreamGenContext::discOps() {
 	data.byte(kGetback) = 0;
 
 	RectWithCallback<DreamGenContext> discOpsList[] = {
-		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::loadGame },
-		{ kOpsx+10,kOpsx+79,kOpsy+10,kOpsy+59,&DreamGenContext::saveGame },
+		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamBase::loadGame },
+		{ kOpsx+10,kOpsx+79,kOpsy+10,kOpsy+59,&DreamBase::saveGame },
 		{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps },
 		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
@@ -589,7 +589,7 @@ void DreamBase::loadPosition(unsigned int slot) {
 }
 
 // Count number of save files, and load their descriptions into _saveNames
-unsigned int DreamGenContext::scanForNames() {
+uint DreamBase::scanForNames() {
 	// Initialize the first 7 slots (like the original code expects)
 	for (unsigned int slot = 0; slot < 7; ++slot) {
 		_saveNames[17 * slot + 0] = 2;
@@ -620,12 +620,13 @@ unsigned int DreamGenContext::scanForNames() {
 			Common::strlcpy(&_saveNames[17 * slotNum + 1], name, 16);	// the first character is unused
 	}
 
-	al = saveList.size() <= 7 ? (uint8)saveList.size() : 7;
+	// FIXME: Can the following be safely removed?
+//	al = saveList.size() <= 7 ? (uint8)saveList.size() : 7;
 
 	return saveList.size();
 }
 
-void DreamGenContext::loadOld() {
+void DreamBase::loadOld() {
 	if (data.byte(kCommandtype) != 252) {
 		data.byte(kCommandtype) = 252;
 		commandOnly(48);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 894c247e5b..6d8519b577 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -495,7 +495,7 @@ void DreamGenContext::dreamweb() {
 
 	while (true) {
 
-		unsigned int count = scanForNames();
+		uint count = scanForNames();
 
 		bool startNewGame = true;
 
@@ -707,7 +707,7 @@ void DreamGenContext::screenUpdate() {
 	delPointer();
 }
 
-void DreamGenContext::startup() {
+void DreamBase::startup() {
 	data.byte(kCurrentkey) = 0;
 	data.byte(kMainmode) = 0;
 	createPanel();
@@ -1044,7 +1044,7 @@ void DreamBase::clearAndLoad(uint16 seg, uint8 c,
 	clearAndLoad(buf, c, size, maxSize);
 }
 
-void DreamGenContext::startLoading(const Room &room) {
+void DreamBase::startLoading(const Room &room) {
 	data.byte(kCombatcount) = 0;
 	data.byte(kRoomssample) = room.roomsSample;
 	data.byte(kMapx) = room.mapX;
@@ -2092,7 +2092,7 @@ void DreamBase::zoomIcon() {
 	showFrame(engine->icons1(), kZoomx, kZoomy-1, 8, 0);
 }
 
-void DreamGenContext::loadRoom() {
+void DreamBase::loadRoom() {
 	data.byte(kRoomloaded) = 1;
 	data.word(kTimecount) = 0;
 	data.word(kMaintimer) = 0;
@@ -2111,10 +2111,6 @@ void DreamGenContext::loadRoom() {
 	uint8 mapXstart, mapYstart;
 	uint8 mapXsize, mapYsize;
 	getDimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
-	cl = mapXstart;
-	ch = mapYstart;
-	dl = mapXsize;
-	dh = mapYsize;
 }
 
 void DreamGenContext::readSetData() {
@@ -2627,7 +2623,7 @@ void DreamGenContext::useMenu() {
 	workToScreenM();
 }
 
-void DreamGenContext::atmospheres() {
+void DreamBase::atmospheres() {
 
 	const Atmosphere *a = &g_atmosphereList[0];
 
@@ -2651,8 +2647,8 @@ void DreamGenContext::atmospheres() {
 			//  I'm interpreting this as if the cmp reallocation is below the jz
 
 			if (data.byte(kMapy) == 0) {
-					data.byte(kVolume) = 0; // "fullvol"
-					return;
+				data.byte(kVolume) = 0; // "fullvol"
+				return;
 			}
 
 			if (data.byte(kReallocation) == 2 && data.byte(kMapx) == 22 && data.byte(kMapy) == 10)
@@ -3898,7 +3894,7 @@ void DreamGenContext::useButtonA() {
 	}
 }
 
-void DreamGenContext::autoAppear() {
+void DreamBase::autoAppear() {
 	if (data.byte(kLocation) == 32) {
 		// In alley
 		resetLocation(5);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 61697e828e..c94cb02a3c 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -23,9 +23,7 @@
 #define DREAMWEB_STUBS_H
 
 	void screenUpdate();
-	void startup();
 	void startup1();
-	void saveLoad();
 	void workToScreen();
 	void multiGet();
 	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height) {
@@ -52,7 +50,6 @@
 	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 		return DreamBase::printDirect(string, x, y, maxWidth, centered);
 	}
-	void startLoading(const Room &room);
 	void showFrame();
 	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
 		DreamBase::showFrame(frameData, x, y, frameNumber, effectsFlag, width, height);
@@ -131,7 +128,6 @@
 	void dumpWatch();
 	void transferText();
 	void watchCount();
-	void loadRoom();
 	void readSetData();
 	void useMenu();
 	void useMon();
@@ -219,15 +215,9 @@
 	uint8 nextSymbol(uint8 symbol);
 	void showSymbol();
 	void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
-	unsigned int scanForNames();
-	void doLoad(int slot);
-	void loadOld();
 	void inventory();
 	void mainScreen();
-	void loadGame();
-	void saveGame();
 	void zoomOnOff();
-	void atmospheres();
 	void hangOne(uint16 delay);
 	void hangOne();
 	void bibleQuote();
@@ -287,8 +277,6 @@
 	void madmanRun();
 	void decide();
 	void talk();
-	void discOps();
-	void doSaveLoad();
 	void useDiary();
 	void hangOnPQ();
 	void showGun();
@@ -299,7 +287,6 @@
 	void monkSpeaking();
 	void rollEndCredits2();
 	void useButtonA();
-	void autoAppear();
 	void setupTimedUse();
 	void entryAnims();
 	void triggerMessage(uint16 index);
-- 
cgit v1.2.3


From c9e9e5d6d8da4bdd180b4934b1dd5c3ef7d77dbe Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 21 Dec 2011 17:46:11 +0100
Subject: DREAMWEB: Add titles.cpp, move some methods to titles.cpp and
 talk.cpp

---
 engines/dreamweb/module.mk    |   1 +
 engines/dreamweb/stubs.cpp    | 561 +-----------------------------------------
 engines/dreamweb/talk.cpp     | 153 +++++++++++-
 engines/dreamweb/titles.cpp   | 426 ++++++++++++++++++++++++++++++++
 engines/dreamweb/vgafades.cpp |   1 +
 5 files changed, 589 insertions(+), 553 deletions(-)
 create mode 100644 engines/dreamweb/titles.cpp

(limited to 'engines')

diff --git a/engines/dreamweb/module.mk b/engines/dreamweb/module.mk
index 9b6d9f30df..88dfdeea53 100644
--- a/engines/dreamweb/module.mk
+++ b/engines/dreamweb/module.mk
@@ -18,6 +18,7 @@ MODULE_OBJS := \
 	sprite.o \
 	stubs.o \
 	talk.o \
+	titles.o \
 	use.o \
 	vgafades.o \
 	vgagrafx.o
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 6d8519b577..4ee19fde4d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "dreamweb/dreamweb.h"
-#include "engines/util.h"
 #include "common/config-manager.h"
 
 namespace DreamGen {
@@ -329,23 +328,23 @@ static const Atmosphere g_atmosphereList[] = {
 
 	{ 10,33,30,6,255 },
 	{ 10,22,30,6,255 },
-	
+
 	{ 9,22,10,6,255 },
 	{ 9,22,20,16,255 },
 	{ 9,22,30,16,255 },
 	{ 9,22,40,16,255 },
 	{ 9,22,50,16,255 },
-	
+
 	{ 6,11,30,6,255 },
 	{ 6,0,10,15,255 },
 	{ 6,0,20,15,255 },
 	{ 6,11,20,15,255 },
 	{ 6,22,20,15,255 },
-	
+
 	{ 7,11,20,6,255 },
 	{ 7,0,20,6,255 },
 	{ 7,0,30,6,255 },
-	
+
 	{ 55,44,0,5,255 },
 	{ 55,44,10,5,255 },
 
@@ -367,12 +366,12 @@ static const Atmosphere g_atmosphereList[] = {
 	{ 8,33,40,6,255 },
 	{ 8,22,40,6,255 },
 	{ 8,11,40,6,255 },
-    
+
 	{ 11,11,20,12,255 },
 	{ 11,11,30,12,255 },
 	{ 11,22,20,12,255 },
 	{ 11,22,30,12,255 },
-	
+
 	{ 12,22,20,12,255 },
 	{ 13,22,20,12,255 },
 	{ 13,33,20,12,255 },
@@ -384,7 +383,7 @@ static const Atmosphere g_atmosphereList[] = {
 	{ 14,33,30,12,255 },
 	{ 14,33,40,12,255 },
 	{ 14,22,0,16,255 },
-	
+
 	{ 19,0,0,12,255 },
 
 	{ 20,0,20,16,255 },
@@ -544,6 +543,7 @@ void DreamGenContext::dreamweb() {
 			// "playGame"
 
 			// "titles"
+			// TODO: In the demo version, titles() did nothing
 			clearPalette();
 			bibleQuote();
 			if (!quitRequested()) // "titlesearly"
@@ -981,9 +981,6 @@ void DreamBase::DOSReturn() {
 	}
 }
 
-void DreamGenContext::set16ColPalette() {
-}
-
 void DreamBase::eraseOldObs() {
 	if (data.byte(kNewobs) == 0)
 		return;
@@ -1243,7 +1240,7 @@ const uint8 *DreamBase::findObName(uint8 type, uint8 index) {
 void DreamBase::copyName(uint8 type, uint8 index, uint8 *dst) {
 	const uint8 *src = findObName(type, index);
 	size_t i;
-	for (i = 0; i < 28; ++i) { 
+	for (i = 0; i < 28; ++i) {
 		char c = src[i];
 		if (c == ':')
 			break;
@@ -1255,7 +1252,7 @@ void DreamBase::copyName(uint8 type, uint8 index, uint8 *dst) {
 }
 
 void DreamGenContext::commandWithOb() {
-	commandWithOb(al, bh, bl); 
+	commandWithOb(al, bh, bl);
 }
 
 void DreamBase::commandWithOb(uint8 command, uint8 type, uint8 index) {
@@ -2724,308 +2721,6 @@ void DreamBase::readKey() {
 	data.word(kBufferout) = bufOut;
 }
 
-void DreamGenContext::hangOne(uint16 delay) {
-	do {
-		vSync();
-		if (data.byte(kLasthardkey) == 1)
-			return; // "hangonearly"
-	} while	(--delay);
-}
-
-void DreamGenContext::hangOne() {
-	hangOne(cx);
-}
-
-void DreamGenContext::bibleQuote() {
-	initGraphics(640, 480, true);
-
-	showPCX("DREAMWEB.I00");
-	fadeScreenUps();
-
-	hangOne(80);
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) = 0;
-		return; // "biblequotearly"
-	}
-
-	hangOne(560);
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) = 0;
-		return; // "biblequotearly"
-	}
-
-	fadeScreenDowns();
-
-	hangOne(200);
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) = 0;
-		return; // "biblequotearly"
-	}
-
-	cancelCh0();
-
-	data.byte(kLasthardkey) = 0;
-}
-
-void DreamGenContext::realCredits() {
-	data.byte(kRoomssample) = 33;
-	loadRoomsSample();
-	data.byte(kVolume) = 0;
-
-	initGraphics(640, 480, true);
-	hangOn(35);
-
-	showPCX("DREAMWEB.I01");
-	playChannel0(12, 0);
-
-	hangOne(2);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	allPalette();
-	hangOne(80);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	fadeScreenDowns();
-	hangOne(256);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	showPCX("DREAMWEB.I02");
-	playChannel0(12, 0);
-	hangOne(2);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	allPalette();
-	hangOne(80);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	fadeScreenDowns();
-	hangOne(256);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	showPCX("DREAMWEB.I03");
-	playChannel0(12, 0);
-	hangOne(2);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	allPalette();
-	hangOne(80);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	fadeScreenDowns();
-	hangOne(256);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	showPCX("DREAMWEB.I04");
-	playChannel0(12, 0);
-	hangOne(2);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	allPalette();
-	hangOne(80);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	fadeScreenDowns();
-	hangOne(256);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	showPCX("DREAMWEB.I05");
-	playChannel0(12, 0);
-	hangOne(2);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	allPalette();
-	hangOne(80);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	fadeScreenDowns();
-	hangOne(256);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	showPCX("DREAMWEB.I06");
-	fadeScreenUps();
-	hangOne(60);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	playChannel0(13, 0);
-	hangOne(350);
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "realcreditsearly"
-	}
-
-	fadeScreenDowns();
-	hangOne(256);
-
-	data.byte(kLasthardkey) =  0;
-}
-
-void DreamGenContext::runIntroSeq() {
-	data.byte(kGetback) = 0;
-
-	do {
-		vSync();
-
-		if (data.byte(kLasthardkey) == 1)
-			break;
-
-		spriteUpdate();
-		vSync();
-
-		if (data.byte(kLasthardkey) == 1)
-			break;
-
-		delEverything();
-		printSprites();
-		reelsOnScreen();
-		afterIntroRoom();
-		useTimedText();
-		vSync();
-
-		if (data.byte(kLasthardkey) == 1)
-			break;
-
-		dumpMap();
-		dumpTimedText();
-		vSync();
-
-		if (data.byte(kLasthardkey) == 1)
-			break;
-
-	} while (data.byte(kGetback) != 1);
-
-
-	if (data.byte(kLasthardkey) == 1) {
-		getRidOfTempText();
-		clearBeforeLoad();
-	}
-
-	// These were not called in this program arc
-	// in the original code.. Bug?
-	//getRidOfTempText();
-	//clearBeforeLoad();
-}
-
-void DreamGenContext::intro() {
-	loadTempText("DREAMWEB.T82");
-	loadPalFromIFF();
-	setMode();
-	data.byte(kNewlocation) = 50;
-	clearPalette();
-	loadIntroRoom();
-	data.byte(kVolume) = 7;
-	data.byte(kVolumedirection) = (byte)-1;
-	data.byte(kVolumeto) = 4;
-	playChannel0(12, 255);
-	fadeScreenUps();
-	runIntroSeq();
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "introearly"
-	}
-
-	clearBeforeLoad();
-	data.byte(kNewlocation) = 52;
-	loadIntroRoom();
-	runIntroSeq();
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "introearly"
-	}
-
-	clearBeforeLoad();
-	data.byte(kNewlocation) = 53;
-	loadIntroRoom();
-	runIntroSeq();
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "introearly"
-	}
-
-	clearBeforeLoad();
-	allPalette();
-	data.byte(kNewlocation) = 54;
-	loadIntroRoom();
-	runIntroSeq();
-
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
-		return; // "introearly"
-	}
-
-	getRidOfTempText();
-	clearBeforeLoad();
-
-	data.byte(kLasthardkey) =  0;
-}
-
 void DreamBase::setTopLeft() {
 	if (data.byte(kSymboltopdir) != 0) {
 		blank();
@@ -3133,25 +2828,6 @@ void DreamGenContext::walkIntoRoom() {
 	}
 }
 
-void DreamGenContext::loadIntroRoom() {
-	data.byte(kIntrocount) = 0;
-	data.byte(kLocation) = 255;
-	loadRoom();
-	data.word(kMapoffsetx) = 72;
-	data.word(kMapoffsety) = 16;
-	clearSprites();
-	data.byte(kThroughdoor) = 0;
-	data.byte(kCurrentkey) = '0';
-	data.byte(kMainmode) = 0;
-	clearWork();
-	data.byte(kNewobs) = 1;
-	drawFloor();
-	reelsOnScreen();
-	spriteUpdate();
-	printSprites();
-	workToScreenCPP();
-}
-
 void DreamGenContext::afterIntroRoom() {
 	if (data.byte(kNowinnewroom) == 0)
 		return; // notnewintro
@@ -3167,17 +2843,6 @@ void DreamGenContext::afterIntroRoom() {
 	data.byte(kNowinnewroom) = 0;
 }
 
-void DreamGenContext::gettingShot() {
-	data.byte(kNewlocation) = 55;
-	clearPalette();
-	loadIntroRoom();
-	fadeScreenUps();
-	data.byte(kVolumeto) = 0;
-	data.byte(kVolumedirection) = (byte)-1;
-	runEndSeq();
-	clearBeforeLoad();
-}
-
 void DreamBase::redrawMainScrn() {
 	data.word(kTimecount) = 0;
 	createPanel();
@@ -3350,58 +3015,6 @@ void DreamGenContext::putBackObStuff() {
 	delPointer();
 }
 
-void DreamGenContext::redes() {
-	if (data.byte(kCh1playing) != 255 || data.byte(kTalkmode) != 2) {
-		blank();
-		return;
-	}
-
-	if (data.byte(kCommandtype) != 217) {
-		data.byte(kCommandtype) = 217;
-		commandOnly(50);
-	}
-
-	if (!(data.word(kMousebutton) & 1))
-		return;
-
-	delPointer();
-	createPanel();
-	showPanel();
-	showMan();
-	showExit();
-	convIcons();
-	startTalk();
-	readMouse();
-	showPointer();
-	workToScreenCPP();
-	delPointer();
-}
-
-void DreamGenContext::moreTalk() {
-	if (data.byte(kTalkmode) != 0) {
-		redes();
-		return;
-	}
-
-	if (data.byte(kCommandtype) != 215) {
-		data.byte(kCommandtype) = 215;
-		commandOnly(49);
-	}
-	
-	if (data.word(kMousebutton) == data.word(kOldbutton))
-		return;	// nomore
-
-	if (!(data.word(kMousebutton) & 1))
-		return;
-
-	data.byte(kTalkmode) = 2;
-	data.byte(kTalkpos) = 4;
-	
-	if (data.byte(kCharacter) >= 100)
-		data.byte(kTalkpos) = 48; // second part
-	doSomeTalk();
-}
-
 bool DreamBase::isSetObOnMap(uint8 index) {
 	return (getSetAd(index)->mapad[0] == 0);
 }
@@ -3616,107 +3229,6 @@ void DreamGenContext::decide() {
 	data.byte(kTextlen) = 240;
 }
 
-void DreamGenContext::talk() {
-	data.byte(kTalkpos) = 0;
-	data.byte(kInmaparea) = 0;
-	data.byte(kCharacter) = data.byte(kCommand);
-	createPanel();
-	showPanel();
-	showMan();
-	showExit();
-	underTextLine();
-	convIcons();
-	startTalk();
-	data.byte(kCommandtype) = 255;
-	readMouse();
-	showPointer();
-	workToScreenCPP();
-
-	RectWithCallback<DreamGenContext> talkList[] = {
-		{ 273,320,157,198,&DreamBase::getBack1 },
-		{ 240,290,2,44,&DreamGenContext::moreTalk },
-		{ 0,320,0,200,&DreamBase::blank },
-		{ 0xFFFF,0,0,0,0 }
-	};
-
-	do {
-		delPointer();
-		readMouse();
-		animPointer();
-		showPointer();
-		vSync();
-		dumpPointer();
-		dumpTextLine();
-		data.byte(kGetback) = 0;
-		checkCoords(talkList);
-		if (data.byte(kQuitrequested))
-			break;
-	} while (!data.byte(kGetback));
-
-	if (data.byte(kTalkpos) >= 4)
-		data.byte(data.word(kPersondata)+7) |= 128;
-
-	redrawMainScrn();
-	workToScreenM();
-	if (data.byte(kSpeechloaded) == 1) {
-		cancelCh1();
-		data.byte(kVolumedirection) = (byte)-1;
-		data.byte(kVolumeto) = 0;
-	}
-}
-
-void DreamGenContext::hangOnPQ() {
-	data.byte(kGetback) = 0;
-
-	RectWithCallback<DreamBase> quitList[] = {
-		{ 273,320,157,198,&DreamBase::getBack1 },
-		{ 0,320,0,200,&DreamBase::blank },
-		{ 0xFFFF,0,0,0,0 }
-	};
-
-	uint16 speechFlag = 0;
-
-	do {
-		delPointer();
-		readMouse();
-		animPointer();
-		showPointer();
-		vSync();
-		dumpPointer();
-		dumpTextLine();
-		checkCoords(quitList);
-
-		if (data.byte(kGetback) == 1 || data.byte(kQuitrequested)) {
-			// Quit conversation
-			delPointer();
-			data.byte(kPointermode) = 0;
-			cancelCh1();
-			flags._c = true;
-			return;
-		}
-
-		if (data.byte(kSpeechloaded) == 1 && data.byte(kCh1playing) == 255) {
-			speechFlag++;
-			if (speechFlag == 40)
-				break;
-		}
-	} while (!data.word(kMousebutton) || data.word(kOldbutton));
-
-	delPointer();
-	data.byte(kPointermode) = 0;
-	flags._c = false;
- }
-
-void DreamGenContext::endGame() {
-	loadTempText("DREAMWEB.T83");
-	monkSpeaking();
-	gettingShot();
-	getRidOfTempText();
-	data.byte(kVolumeto) = 7;
-	data.byte(kVolumedirection) = 1;
-	hangOn(200);
-}
-
 void DreamGenContext::showGun() {
 	data.byte(kAddtored) = 0;
 	data.byte(kAddtogreen) = 0;
@@ -3841,39 +3353,6 @@ void DreamBase::getBack1() {
 	}
 }
 
-void DreamGenContext::monkSpeaking() {
-	// FIXME: This is the CD version only.
-
-	data.byte(kRoomssample) = 35;
-	loadRoomsSample();
-	loadIntoTemp("DREAMWEB.G15");
-	clearWork();
-	showFrame(tempGraphics(), 160, 72, 0, 128);	// show monk
-	workToScreen();
-	data.byte(kVolume) = 7;
-	data.byte(kVolumedirection) = (byte)-1;
-	data.byte(kVolumeto) = 5;
-	playChannel0(12, 255);
-	fadeScreenUps();
-	hangOn(300);
-
-	for (int i = 40; i <= 48; i++) {
-		loadSpeech('T', 83, 'T', i);
-
-		playChannel1(50 + 12);
-
-		do {
-			engine->waitForVSync();
-		} while (data.byte(kCh1playing) != 255);
-	} 
-
-	data.byte(kVolumedirection) = 1;
-	data.byte(kVolumeto) = 7;
-	fadeScreenDowns();
-	hangOn(300);
-	getRidOfTemp();
-}
-
 void DreamGenContext::useButtonA() {
 	if (!isSetObOnMap(95)) {
 		showFirstUse();
@@ -4187,26 +3666,6 @@ void DreamGenContext::dumpDiaryKeys() {
 	multiDump(kDiaryx + 151, kDiaryy + 71, 16, 16);
 }
 
-void DreamGenContext::runEndSeq() {
-	atmospheres();
-	data.byte(kGetback) = 0;
-
-	do {
-		vSync();
-		spriteUpdate();
-		vSync();
-		delEverything();
-		printSprites();
-		reelsOnScreen();
-		afterIntroRoom();
-		useTimedText();
-		vSync();
-		dumpMap();
-		dumpTimedText();
-		vSync();
-	} while (data.byte(kGetback) != 1);
-}
-
 void DreamGenContext::lookAtCard() {
 	data.byte(kManisoffscreen) = 1;
 	getRidOfReels();
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 86d1b886ef..fac75be6cf 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -24,8 +24,53 @@
 
 namespace DreamGen {
 
-uint16 DreamGenContext::getPersFrame(uint8 index) {
-	return getSegment(data.word(kPeople)).word(kPersonframes + index * 2);
+void DreamGenContext::talk() {
+	data.byte(kTalkpos) = 0;
+	data.byte(kInmaparea) = 0;
+	data.byte(kCharacter) = data.byte(kCommand);
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	underTextLine();
+	convIcons();
+	startTalk();
+	data.byte(kCommandtype) = 255;
+	readMouse();
+	showPointer();
+	workToScreenCPP();
+
+	RectWithCallback<DreamGenContext> talkList[] = {
+		{ 273,320,157,198,&DreamBase::getBack1 },
+		{ 240,290,2,44,&DreamGenContext::moreTalk },
+		{ 0,320,0,200,&DreamBase::blank },
+		{ 0xFFFF,0,0,0,0 }
+	};
+
+	do {
+		delPointer();
+		readMouse();
+		animPointer();
+		showPointer();
+		vSync();
+		dumpPointer();
+		dumpTextLine();
+		data.byte(kGetback) = 0;
+		checkCoords(talkList);
+		if (data.byte(kQuitrequested))
+			break;
+	} while (!data.byte(kGetback));
+
+	if (data.byte(kTalkpos) >= 4)
+		data.byte(data.word(kPersondata)+7) |= 128;
+
+	redrawMainScrn();
+	workToScreenM();
+	if (data.byte(kSpeechloaded) == 1) {
+		cancelCh1();
+		data.byte(kVolumedirection) = (byte)-1;
+		data.byte(kVolumeto) = 0;
+	}
 }
 
 void DreamGenContext::convIcons() {
@@ -35,4 +80,108 @@ void DreamGenContext::convIcons() {
 	showFrame(base, 234, 2, frame, 0);
 }
 
+uint16 DreamGenContext::getPersFrame(uint8 index) {
+	return getSegment(data.word(kPeople)).word(kPersonframes + index * 2);
+}
+
+// TODO: put Starttalk here
+
+// TODO: put Getpersontext here
+
+void DreamGenContext::moreTalk() {
+	if (data.byte(kTalkmode) != 0) {
+		redes();
+		return;
+	}
+
+	if (data.byte(kCommandtype) != 215) {
+		data.byte(kCommandtype) = 215;
+		commandOnly(49);
+	}
+
+	if (data.word(kMousebutton) == data.word(kOldbutton))
+		return;	// nomore
+
+	if (!(data.word(kMousebutton) & 1))
+		return;
+
+	data.byte(kTalkmode) = 2;
+	data.byte(kTalkpos) = 4;
+
+	if (data.byte(kCharacter) >= 100)
+		data.byte(kTalkpos) = 48; // second part
+	doSomeTalk();
+}
+
+// TODO: put Dosometalk here
+
+void DreamGenContext::hangOnPQ() {
+	data.byte(kGetback) = 0;
+
+	RectWithCallback<DreamBase> quitList[] = {
+		{ 273,320,157,198,&DreamBase::getBack1 },
+		{ 0,320,0,200,&DreamBase::blank },
+		{ 0xFFFF,0,0,0,0 }
+	};
+
+	uint16 speechFlag = 0;
+
+	do {
+		delPointer();
+		readMouse();
+		animPointer();
+		showPointer();
+		vSync();
+		dumpPointer();
+		dumpTextLine();
+		checkCoords(quitList);
+
+		if (data.byte(kGetback) == 1 || data.byte(kQuitrequested)) {
+			// Quit conversation
+			delPointer();
+			data.byte(kPointermode) = 0;
+			cancelCh1();
+			flags._c = true;
+			return;
+		}
+
+		if (data.byte(kSpeechloaded) == 1 && data.byte(kCh1playing) == 255) {
+			speechFlag++;
+			if (speechFlag == 40)
+				break;
+		}
+	} while (!data.word(kMousebutton) || data.word(kOldbutton));
+
+	delPointer();
+	data.byte(kPointermode) = 0;
+	flags._c = false;
+}
+
+void DreamGenContext::redes() {
+	if (data.byte(kCh1playing) != 255 || data.byte(kTalkmode) != 2) {
+		blank();
+		return;
+	}
+
+	if (data.byte(kCommandtype) != 217) {
+		data.byte(kCommandtype) = 217;
+		commandOnly(50);
+	}
+
+	if (!(data.word(kMousebutton) & 1))
+		return;
+
+	delPointer();
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	convIcons();
+	startTalk();
+	readMouse();
+	showPointer();
+	workToScreenCPP();
+	delPointer();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
new file mode 100644
index 0000000000..b653c2cf27
--- /dev/null
+++ b/engines/dreamweb/titles.cpp
@@ -0,0 +1,426 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 "dreamweb/dreamweb.h"
+#include "engines/util.h"
+
+namespace DreamGen {
+
+void DreamGenContext::endGame() {
+	loadTempText("DREAMWEB.T83");
+	monkSpeaking();
+	gettingShot();
+	getRidOfTempText();
+	data.byte(kVolumeto) = 7;
+	data.byte(kVolumedirection) = 1;
+	hangOn(200);
+}
+
+void DreamGenContext::monkSpeaking() {
+	// FIXME: This is the CD version only.
+
+	data.byte(kRoomssample) = 35;
+	loadRoomsSample();
+	loadIntoTemp("DREAMWEB.G15");
+	clearWork();
+	showFrame(tempGraphics(), 160, 72, 0, 128);	// show monk
+	workToScreen();
+	data.byte(kVolume) = 7;
+	data.byte(kVolumedirection) = (byte)-1;
+	data.byte(kVolumeto) = 5;
+	playChannel0(12, 255);
+	fadeScreenUps();
+	hangOn(300);
+
+	for (int i = 40; i <= 48; i++) {
+		loadSpeech('T', 83, 'T', i);
+
+		playChannel1(50 + 12);
+
+		do {
+			engine->waitForVSync();
+		} while (data.byte(kCh1playing) != 255);
+	}
+
+	data.byte(kVolumedirection) = 1;
+	data.byte(kVolumeto) = 7;
+	fadeScreenDowns();
+	hangOn(300);
+	getRidOfTemp();
+}
+
+void DreamGenContext::gettingShot() {
+	data.byte(kNewlocation) = 55;
+	clearPalette();
+	loadIntroRoom();
+	fadeScreenUps();
+	data.byte(kVolumeto) = 0;
+	data.byte(kVolumedirection) = (byte)-1;
+	runEndSeq();
+	clearBeforeLoad();
+}
+
+void DreamGenContext::bibleQuote() {
+	initGraphics(640, 480, true);
+
+	showPCX("DREAMWEB.I00");
+	fadeScreenUps();
+
+	hangOne(80);
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) = 0;
+		return; // "biblequotearly"
+	}
+
+	hangOne(560);
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) = 0;
+		return; // "biblequotearly"
+	}
+
+	fadeScreenDowns();
+
+	hangOne(200);
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) = 0;
+		return; // "biblequotearly"
+	}
+
+	cancelCh0();
+
+	data.byte(kLasthardkey) = 0;
+}
+
+void DreamGenContext::hangOne(uint16 delay) {
+	do {
+		vSync();
+		if (data.byte(kLasthardkey) == 1)
+			return; // "hangonearly"
+	} while	(--delay);
+}
+
+void DreamGenContext::hangOne() {
+	hangOne(cx);
+}
+
+void DreamGenContext::intro() {
+	loadTempText("DREAMWEB.T82");
+	loadPalFromIFF();
+	setMode();
+	data.byte(kNewlocation) = 50;
+	clearPalette();
+	loadIntroRoom();
+	data.byte(kVolume) = 7;
+	data.byte(kVolumedirection) = (byte)-1;
+	data.byte(kVolumeto) = 4;
+	playChannel0(12, 255);
+	fadeScreenUps();
+	runIntroSeq();
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "introearly"
+	}
+
+	clearBeforeLoad();
+	data.byte(kNewlocation) = 52;
+	loadIntroRoom();
+	runIntroSeq();
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "introearly"
+	}
+
+	clearBeforeLoad();
+	data.byte(kNewlocation) = 53;
+	loadIntroRoom();
+	runIntroSeq();
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "introearly"
+	}
+
+	clearBeforeLoad();
+	allPalette();
+	data.byte(kNewlocation) = 54;
+	loadIntroRoom();
+	runIntroSeq();
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "introearly"
+	}
+
+	getRidOfTempText();
+	clearBeforeLoad();
+
+	data.byte(kLasthardkey) =  0;
+}
+
+void DreamGenContext::runIntroSeq() {
+	data.byte(kGetback) = 0;
+
+	do {
+		vSync();
+
+		if (data.byte(kLasthardkey) == 1)
+			break;
+
+		spriteUpdate();
+		vSync();
+
+		if (data.byte(kLasthardkey) == 1)
+			break;
+
+		delEverything();
+		printSprites();
+		reelsOnScreen();
+		afterIntroRoom();
+		useTimedText();
+		vSync();
+
+		if (data.byte(kLasthardkey) == 1)
+			break;
+
+		dumpMap();
+		dumpTimedText();
+		vSync();
+
+		if (data.byte(kLasthardkey) == 1)
+			break;
+
+	} while (data.byte(kGetback) != 1);
+
+
+	if (data.byte(kLasthardkey) == 1) {
+		getRidOfTempText();
+		clearBeforeLoad();
+	}
+
+	// These were not called in this program arc
+	// in the original code.. Bug?
+	//getRidOfTempText();
+	//clearBeforeLoad();
+}
+
+void DreamGenContext::runEndSeq() {
+	atmospheres();
+	data.byte(kGetback) = 0;
+
+	do {
+		vSync();
+		spriteUpdate();
+		vSync();
+		delEverything();
+		printSprites();
+		reelsOnScreen();
+		afterIntroRoom();
+		useTimedText();
+		vSync();
+		dumpMap();
+		dumpTimedText();
+		vSync();
+	} while (data.byte(kGetback) != 1);
+}
+
+void DreamGenContext::loadIntroRoom() {
+	data.byte(kIntrocount) = 0;
+	data.byte(kLocation) = 255;
+	loadRoom();
+	data.word(kMapoffsetx) = 72;
+	data.word(kMapoffsety) = 16;
+	clearSprites();
+	data.byte(kThroughdoor) = 0;
+	data.byte(kCurrentkey) = '0';
+	data.byte(kMainmode) = 0;
+	clearWork();
+	data.byte(kNewobs) = 1;
+	drawFloor();
+	reelsOnScreen();
+	spriteUpdate();
+	printSprites();
+	workToScreenCPP();
+}
+
+void DreamGenContext::set16ColPalette() {
+}
+
+void DreamGenContext::realCredits() {
+	data.byte(kRoomssample) = 33;
+	loadRoomsSample();
+	data.byte(kVolume) = 0;
+
+	initGraphics(640, 480, true);
+	hangOn(35);
+
+	showPCX("DREAMWEB.I01");
+	playChannel0(12, 0);
+
+	hangOne(2);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	allPalette();
+	hangOne(80);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	fadeScreenDowns();
+	hangOne(256);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	showPCX("DREAMWEB.I02");
+	playChannel0(12, 0);
+	hangOne(2);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	allPalette();
+	hangOne(80);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	fadeScreenDowns();
+	hangOne(256);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	showPCX("DREAMWEB.I03");
+	playChannel0(12, 0);
+	hangOne(2);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	allPalette();
+	hangOne(80);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	fadeScreenDowns();
+	hangOne(256);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	showPCX("DREAMWEB.I04");
+	playChannel0(12, 0);
+	hangOne(2);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	allPalette();
+	hangOne(80);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	fadeScreenDowns();
+	hangOne(256);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	showPCX("DREAMWEB.I05");
+	playChannel0(12, 0);
+	hangOne(2);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	allPalette();
+	hangOne(80);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	fadeScreenDowns();
+	hangOne(256);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	showPCX("DREAMWEB.I06");
+	fadeScreenUps();
+	hangOne(60);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	playChannel0(13, 0);
+	hangOne(350);
+
+	if (data.byte(kLasthardkey) == 1) {
+		data.byte(kLasthardkey) =  0;
+		return; // "realcreditsearly"
+	}
+
+	fadeScreenDowns();
+	hangOne(256);
+
+	data.byte(kLasthardkey) =  0;
+}
+
+} // End of namespace DreamGen
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index d975d303c9..adbc158c84 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -25,6 +25,7 @@
 namespace DreamGen {
 
 uint8 *DreamBase::mainPalette() {
+// TODO: Turn these into plain C arrays
 	return getSegment(data.word(kBuffers)).ptr(kMaingamepal, 256 * 3);
 }
 
-- 
cgit v1.2.3


From 1b98cd5686409645bb99473954dd73bfdb9c5182 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 23 Dec 2011 20:52:27 +1100
Subject: TSAGE: Implemented R2R Scene 825 - Autodoc

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   3 +-
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 358 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  36 +++
 engines/tsage/staticres.cpp                     |  20 ++
 engines/tsage/staticres.h                       |  14 +
 5 files changed, 430 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index f7dcc56d42..f48864f87d 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -81,7 +81,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Sick bay
 		return new Scene800();
 	case 825:
-		error("Missing scene %d from group 0", sceneNumber);
+		// Autodoc
+		return new Scene825();
 	case 850:
 		// Deck #5 - By Lift
 		return new Scene850();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index ceca8915d8..a58740394b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -3183,6 +3183,364 @@ void Scene800::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 825 - Autodoc
+ *
+ *--------------------------------------------------------------------------*/
+
+Scene825::Button::Button(): SceneObject() {
+	_buttonId = 0;
+	_v2 = 0;
+	_buttonDown = false;
+}
+
+void Scene825::Button::synchronize(Serializer &s) {
+	SceneObject::synchronize(s);
+	s.syncAsSint16LE(_buttonId);
+	s.syncAsSint16LE(_v2);
+	s.syncAsSint16LE(_buttonDown);
+}
+
+void Scene825::Button::process(Event &event) {
+	Scene825 *scene = (Scene825 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!event.handled) {
+		if ((event.eventType == EVENT_BUTTON_DOWN) && _bounds.contains(event.mousePos) && !_buttonDown) {
+			scene->_sound1.play(14);
+			setFrame(2);
+			_buttonDown = true;
+			event.handled = true;
+		}
+
+		if ((event.eventType == EVENT_BUTTON_UP) && _buttonDown) {
+			setFrame(1);
+			_buttonDown = false;
+			event.handled = true;
+
+			scene->doButtonPress(_buttonId);
+		}
+	}
+}
+
+bool Scene825::Button::startAction(CursorType action, Event &event) {
+	if (action == CURSOR_USE)
+		return false;
+	else
+		return SceneObject::startAction(action, event);
+}
+
+void Scene825::Button::setButton(int buttonId) {
+	SceneObject::postInit();
+	_v2 = buttonId;
+	_buttonDown = 0;
+	_sceneText._color1 = 92;
+	_sceneText._color2 = 0;
+	_sceneText._width = 200;
+	_sceneText.fixPriority(20);
+	_sceneText._fontNumber = 50;
+
+	switch (buttonId) {
+	case 1:
+		_sceneText.setPosition(Common::Point(95, 58));
+		break;
+	case 2:
+		_sceneText.setPosition(Common::Point(98, 75));
+		break;
+	case 3:
+		_sceneText.setPosition(Common::Point(102, 95));
+		break;
+	case 4:
+		_sceneText.setPosition(Common::Point(180, 58));
+		_sceneText._textMode = ALIGN_RIGHT;
+		break;
+	case 5:
+		_sceneText.setPosition(Common::Point(177, 75));
+		_sceneText._textMode = ALIGN_RIGHT;
+		break;
+	case 6:
+		_sceneText.setPosition(Common::Point(175, 95));
+		_sceneText._textMode = ALIGN_RIGHT;
+		break;
+	default:
+		break;
+	}
+
+	setDetails(825, 6, 7, -1, 2, NULL);
+}
+
+void Scene825::Button::setText(int textId) {
+	_buttonId = textId;
+	_lookLineNum = textId;
+
+	_sceneText.remove();
+	if (_buttonId != 0)
+		_sceneText.setup(AUTODOC_ITEMS[textId - 1]);
+}
+
+/*--------------------------------------------------------------------------*/
+
+Scene825::Scene825(): SceneExt() {
+	_menuId = _frame1 = _frame2 = 0;
+}
+
+void Scene825::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(825);
+	R2_GLOBALS._player._uiEnabled = false;
+	BF_GLOBALS._interfaceY = 200;
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player._effect = 0;
+	R2_GLOBALS._player.setVisage(10);
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.disableControl();
+
+	_item2.setDetails(1, 825, 3, 4, 5);
+	_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 825, 0, -1, -1, 1, NULL);
+
+	_sceneMode = 10;
+	signal();
+}
+
+void Scene825::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_menuId);
+	s.syncAsSint16LE(_frame1);
+	s.syncAsSint16LE(_frame2);
+}
+
+void Scene825::remove() {
+	SceneExt::remove();
+	R2_GLOBALS._player._uiEnabled = true;
+}
+
+void Scene825::signal() {
+	switch (_sceneMode) {
+	case 10:
+		_button1.setButton(1);
+		_button1.setup(825, 1, 1);
+		_button1.setPosition(Common::Point(71, 71));
+		_button2.setButton(2);
+		_button2.setup(825, 3, 1);
+		_button2.setPosition(Common::Point(74, 90));
+		_button3.setButton(3);
+		_button3.setup(825, 5, 1);
+		_button3.setPosition(Common::Point(78, 109));
+		_button4.setButton(4);
+		_button4.setup(825, 2, 1);
+		_button4.setPosition(Common::Point(248, 71));
+		_button5.setButton(5);
+		_button5.setup(825, 4, 1);
+		_button5.setPosition(Common::Point(245, 90));
+		_button6.setButton(6);
+		_button6.setup(825, 6, 1);
+		_button6.setPosition(Common::Point(241, 109));
+
+		doButtonPress(1);
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+		break;
+	case 825:
+		_object5.remove();
+		_sceneText._color1 = 92;
+		_sceneText._color2 = 0;
+		_sceneText._width = 200;
+		_sceneText.fixPriority(20);
+		_sceneText._fontNumber = 50;
+		_sceneText.setPosition(Common::Point(120, 75));
+		_sceneText.setup(NO_MALADY_DETECTED);
+		_sceneMode = 826;
+		setAction(&_sequenceManager1, this, 826, &R2_GLOBALS._player, NULL);
+		break;
+	case 826:
+		_sceneText.remove();
+		doButtonPress(1);
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+		break;
+	case 827:
+		_object5.remove();
+		R2_INVENTORY.setObjectScene(R2_OPTO_DISK, 825);
+		_sceneText.setPosition(Common::Point(108, 75));
+		_sceneText.setup(FOREIGN_OBJECT_EXTRACTED);
+		_sceneMode = 826;
+		setAction(&_sequenceManager1, this, 826, &R2_GLOBALS._player, NULL);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+		break;
+	}
+}
+
+void Scene825::process(Event &event) {
+	SceneExt::process(event);
+
+	if (R2_GLOBALS._player._uiEnabled) {
+		_button1.process(event);
+		_button2.process(event);
+		_button3.process(event);
+		_button4.process(event);
+		_button5.process(event);
+		_button6.process(event);
+	}
+}
+
+void Scene825::dispatch() {
+	if (R2_GLOBALS._sceneObjects->contains(&_object4) && 
+			((_object4._frame == 1) || (_object4._frame == 3)) &&
+			(_object4._frame != _frame1)) {
+		_sound2.play(25);
+	}
+
+	if (R2_GLOBALS._sceneObjects->contains(&_object1) &&
+			(_object1._frame == 3) && (_object1._frame != _frame2)) {
+		_sound3.play(26);
+	}
+
+	_frame1 = _object4._frame;
+	_frame2 = _object1._frame;
+
+	Scene::dispatch();
+}
+
+void Scene825::doButtonPress(int buttonId) {
+	if ((_menuId != 4) || (buttonId == 5)) {
+		_button1.setText(0);
+		_button2.setText(0);
+		_button3.setText(0);
+		_button4.setText(0);
+		_button5.setText(0);
+		_button6.setText(0);
+
+		switch (buttonId) {
+		case 2:
+			R2_GLOBALS._player.disableControl();
+			_object5.postInit();
+			_sceneMode = 825;
+			setAction(&_sequenceManager1, this, 825, &R2_GLOBALS._player, &_object5, NULL);
+			break;
+		case 3:
+			R2_GLOBALS._player.disableControl();
+			_sceneText._color1 = 92;
+			_sceneText._color2 = 0;
+			_sceneText._width = 200;
+			_sceneText.fixPriority(20);
+			_sceneText._fontNumber = 50;
+			_sceneText.setPosition(Common::Point(115, 75));
+
+			if (R2_GLOBALS.getFlag(4)) {
+				if ((R2_INVENTORY.getObjectScene(R2_READER) != 800) ||
+						(R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) != 800)) {
+					_sceneText.setPosition(Common::Point(116, 75));
+					_sceneText.setup(ACCESS_CODE_REQUIRED);
+				} else if (R2_INVENTORY.getObjectScene(R2_OPTO_DISK) != 800) {
+					_sceneText.setPosition(Common::Point(115, 75));
+					_sceneText.setup(NO_TREATMENT_REQUIRED);
+				} else {
+					_button6._buttonId = 5;
+					
+					_object5.postInit();
+					setAction(&_sequenceManager1, this, 827, &_object5, NULL);
+				}
+			} else {
+				R2_GLOBALS.setFlag(2);
+
+				if ((R2_INVENTORY.getObjectScene(R2_READER) != 800) ||
+						(R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) != 800)) {
+					_sceneText.setPosition(Common::Point(116, 75));
+					_sceneText.setup(ACCESS_CODE_REQUIRED);
+				} else {
+					_sceneText.setPosition(Common::Point(119, 75));
+					_sceneText.setup(INVALID_ACCESS_CODE);
+				}
+			}
+
+			if (_sceneMode != 827) {
+				_sceneMode = 826;
+				setAction(&_sequenceManager1, this, 826, &R2_GLOBALS._player, NULL);
+			}
+			break;
+		case 4:
+			_sound4.play(27);
+			_button6._buttonId = 5;
+			
+			_object1.postInit();
+			_object1.setup(826, 7, 1);
+			_object1.setPosition(Common::Point(112, 67));
+			_object1._numFrames = 1;
+			_object1.animate(ANIM_MODE_2);
+
+			_object2.postInit();
+			_object2.setup(826, 5, 1);
+			_object2.setPosition(Common::Point(158, 67));
+			_object2._numFrames = 5;
+			_object2.animate(ANIM_MODE_2);
+
+			_object3.postInit();
+			_object3.setup(826, 6, 1);
+			_object3.setPosition(Common::Point(206, 67));
+			_object3._numFrames = 1;
+			_object3.animate(ANIM_MODE_2);
+
+			_object4.postInit();
+			_object4.setup(826, 8, 1);
+			_object4.setPosition(Common::Point(158, 84));
+			_object4._numFrames = 1;
+			_object4.animate(ANIM_MODE_2);
+
+			_object5.postInit();
+			_object5.setup(826, 4, 1);
+			_object5.setPosition(Common::Point(161, 110));
+			break;
+		case 5:
+			R2_GLOBALS._player.disableControl();
+			if (_menuId == 4) {
+				_menuId = 0;
+
+				_object1.remove();
+				_object2.remove();
+				_object3.remove();
+				_object4.remove();
+				_object5.remove();
+
+				_sound2.stop();
+				_sound3.stop();
+				_sound4.stop();
+
+				doButtonPress(1);
+				R2_GLOBALS._player.enableControl();
+				R2_GLOBALS._player._canWalk = false;
+			} else {
+				R2_GLOBALS._sceneManager.changeScene(800);
+			}
+			break;
+		case 6:
+			R2_GLOBALS._player.disableControl();
+			_sceneText._color1 = 92;
+			_sceneText._color2 = 0;
+			_sceneText._width = 200;
+			_sceneText.fixPriority(20);
+			_sceneText._fontNumber = 50;
+			_sceneText.setPosition(Common::Point(115, 75));
+			_sceneText.setup(NO_TREATMENT_REQUIRED);
+
+			_sceneMode = 826;
+			setAction(&_sequenceManager1, this, 826, &R2_GLOBALS._player, NULL);
+			break;
+		default:
+			_button1.setText(2);
+			_button2.setText(3);
+			_button3.setText(4);
+			_button4.setText(6);
+			_button6.setText(5);
+			break;
+		}
+
+		_menuId = buttonId;
+	}
+}
 
 /*--------------------------------------------------------------------------
  * Scene 850 - Deck #5 - By Lift
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 6810b5d85a..7a36b8f15f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -419,6 +419,42 @@ public:
 	virtual void signal();
 };
 
+class Scene825: public SceneExt {
+	/* Objects */
+	class Button: public SceneObject {
+	public:
+		int _buttonId, _v2;
+		bool _buttonDown;
+		SceneText _sceneText;
+	public:
+		Button();
+		void setButton(int buttonId);
+		void setText(int textId);
+
+		virtual void synchronize(Serializer &s);
+		virtual void process(Event &event);
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+	NamedHotspot _background, _item2;
+	SceneActor _object1, _object2, _object3, _object4, _object5;
+	Button _button1, _button2, _button3, _button4, _button5, _button6;
+	ASoundExt _sound1, _sound2, _sound3, _sound4;
+	SequenceManager _sequenceManager1;
+	SceneText _sceneText;
+	int _menuId, _frame1, _frame2;
+public:
+	Scene825();
+	virtual void synchronize(Serializer &s);
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void process(Event &event);
+	virtual void dispatch();
+
+	void doButtonPress(int buttonId);
+};
+
 class Scene850: public SceneExt {
 	/* Items */
 	class Indicator: public NamedHotspot {
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index 238e7b3049..3be719887f 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -192,6 +192,26 @@ const char *CONSOLE_MESSAGES[] = {
 	"Mozart", "Bach", "Rossini"
 };
 
+// Scene 825 Autodoc messages
+const char *MAIN_MENU = "main menu";
+const char *DIAGNOSIS = "diagnosis";
+const char *ADVANCED_PROCEDURES = "advanced procedures";
+const char *VITAL_SIGNS = "vital signs";
+const char *OPEN_DOOR = "open door";
+const char *TREATMENTS = "treatments";
+const char *NO_MALADY_DETECTED =  "no malady detected";
+const char *NO_TREATMENT_REQUIRED = "no treatment required";
+const char *ACCESS_CODE_REQUIRED = "access code required";
+const char *INVALID_ACCESS_CODE = "invalid access code";
+const char *FOREIGN_OBJECT_EXTRACTED = "foreign object extracted";
+
+const char *AUTODOC_ITEMS[11] = { 
+	MAIN_MENU, DIAGNOSIS, ADVANCED_PROCEDURES, VITAL_SIGNS, OPEN_DOOR, TREATMENTS,
+	NO_MALADY_DETECTED, NO_TREATMENT_REQUIRED, ACCESS_CODE_REQUIRED, INVALID_ACCESS_CODE,
+	FOREIGN_OBJECT_EXTRACTED
+};
+	
+
 const char *HELP_MSG = "\x1\rRETURN TO\r RINGWORLD\x14";
 const char *CHAR_TITLE = "\x01Select Character:";
 const char *CHAR_QUINN_MSG = "  Quinn  ";
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index faff3f4103..e2afb65b34 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -149,6 +149,20 @@ namespace Ringworld2 {
 // Scene 125 - Console messages
 extern const char *CONSOLE_MESSAGES[];
 
+// Scene 825 - Autodoc Messages
+extern const char *MAIN_MENU;
+extern const char *DIAGNOSIS;
+extern const char *ADVANCED_PROCEDURES;
+extern const char *VITAL_SIGNS;
+extern const char *OPEN_DOOR;
+extern const char *TREATMENTS;
+extern const char *NO_MALADY_DETECTED;
+extern const char *NO_TREATMENT_REQUIRED;
+extern const char *ACCESS_CODE_REQUIRED;
+extern const char *INVALID_ACCESS_CODE;
+extern const char *FOREIGN_OBJECT_EXTRACTED;
+extern const char *AUTODOC_ITEMS[11];
+
 // Dialog messages
 extern const char *HELP_MSG;
 extern const char *CHAR_TITLE;
-- 
cgit v1.2.3


From 99b7fce6113943263bdf9140fab345d0353cf5bd Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 23 Dec 2011 17:09:46 +0100
Subject: DREAMWEB: Fix regression in sparky

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

(limited to 'engines')

diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 4d66134e96..1e79471a65 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -273,7 +273,7 @@ void DreamBase::sparky(ReelRoutine &routine) {
 	if (data.word(kCard1money))
 		routine.b7 = 3;
 	if (checkSpeed(routine)) {
-		if (routine.reelPointer() != 34) {
+		if (routine.reelPointer() == 34) {
 			if (engine->randomNumber() < 30)
 				routine.incReelPointer();
 			else
-- 
cgit v1.2.3


From c4af50ae63fc93e221306440fee0337a77059295 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 23 Dec 2011 18:17:33 +0100
Subject: TSAGE: R2R - Implement scene 3250

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 167 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h   |  30 +++++
 3 files changed, 199 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index f48864f87d..6f26054423 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -203,6 +203,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Cutscene : Discussions with Dr. Tomko
 		return new Scene3245();
 	case 3250:
+		// Room with large stasis field negator
+		return new Scene3250();
 	case 3255:
 	case 3260:
 	case 3275:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 65b1622883..298093be3a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1089,5 +1089,172 @@ void Scene3245::signal() {
 	R2_GLOBALS._sceneManager.changeScene(1200);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3250 - Room with large stasis field negator
+ *
+ *--------------------------------------------------------------------------*/
+bool Scene3250::Item::startAction(CursorType action, Event &event) {
+	Scene3250 *scene = (Scene3250 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (_useLineNum != -1) {
+			SceneItem::display(_resNum, _useLineNum, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+			return true;
+		}
+		break;
+	case CURSOR_LOOK:
+		if (_lookLineNum != -1) {
+			SceneItem::display(_resNum, _lookLineNum, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+			return true;
+		}
+		break;
+	case CURSOR_TALK:
+		if (_talkLineNum != -1) {
+			SceneItem::display(_resNum, _talkLineNum, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+			return true;
+		}
+		break;
+	default:
+		break;
+	}
+
+	return scene->display(action, event);
+}
+
+bool Scene3250::Actor::startAction(CursorType action, Event &event) {
+	Scene3250 *scene = (Scene3250 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	R2_GLOBALS._player.disableControl();
+
+	switch(_position.x) {
+	case 25:
+		scene->_sceneMode = 3262;
+		scene->setAction(&scene->_sequenceManager, scene, 3262, &R2_GLOBALS._player, &scene->_actor1, NULL);
+		break;
+	case 259:
+		scene->_sceneMode = 3260;
+		scene->setAction(&scene->_sequenceManager, scene, 3260, &R2_GLOBALS._player, &scene->_actor2, NULL);
+		break;
+	case 302:
+		scene->_sceneMode = 3261;
+		scene->setAction(&scene->_sequenceManager, scene, 3261, &R2_GLOBALS._player, &scene->_actor3, NULL);
+		break;
+	default:
+		break;
+	}
+	return true;
+}
+
+void Scene3250::postInit(SceneObjectList *OwnerList) {
+	loadScene(3250);
+
+	if (R2_GLOBALS._sceneManager._previousScene == -1) {
+		R2_GLOBALS._player._oldCharacterScene[3] = 1200;
+		R2_GLOBALS._player._characterIndex = R2_MIRANDA;
+	}
+
+	SceneExt::postInit();
+	_actor1.postInit();
+	_actor1.setup(3250, 6, 1);
+	_actor1.setPosition(Common::Point(25, 148));
+	_actor1.fixPriority(10);
+	_actor1.setDetails(3250, 9, 10, -1, 1, NULL);
+
+	_actor2.postInit();
+	_actor2.setup(3250, 4, 1);
+	_actor2.setPosition(Common::Point(259, 126));
+	_actor2.fixPriority(10);
+	_actor2.setDetails(3250, 9, 10, -1, 1, NULL);
+
+	_actor3.postInit();
+	_actor3.setup(3250, 5, 1);
+	_actor3.setPosition(Common::Point(302, 138));
+	_actor3.fixPriority(10);
+	_actor3.setDetails(3250, 9, 10, -1, 1, NULL);
+
+	_item3.setDetails(Rect(119, 111, 149, 168), 3250, 6, 7, 2, 1, NULL);
+	_item2.setDetails(Rect(58, 85, 231, 138), 3250, 12, 7, 2, 1, NULL);
+	_item4.setDetails(12, 3250, 3, 1, 2);
+	_item1.setDetails(Rect(0, 0, 320, 200), 3250, 0, 1, 2, 1, NULL);
+
+	R2_GLOBALS._player.postInit();
+
+	switch (R2_GLOBALS._player._oldCharacterScene[3]) {
+	case 1200:
+		_sceneMode = 3250;
+		_actor4.postInit();
+		R2_GLOBALS._player._effect = 0;
+		setAction(&_sequenceManager, this, 3250, &R2_GLOBALS._player, &_actor4, NULL);
+		break;
+	case 3125:
+		if (R2_GLOBALS.getFlag(79)) {
+			_sceneMode = 3254;
+			_actor5.postInit();
+			_actor5._effect = 1;
+			_actor6.postInit();
+			_actor6._effect = 1;
+			_actor7.postInit();
+			_actor7._effect = 1;
+			setAction(&_sequenceManager, this, 3254, &R2_GLOBALS._player, &_actor3, &_actor5, &_actor6, &_actor7, &_actor1, NULL);
+		} else {
+			_sceneMode = 3252;
+			setAction(&_sequenceManager, this, 3252, &R2_GLOBALS._player, &_actor3, NULL);
+		}
+		break;
+	case 3175:
+		_sceneMode = 3251;
+		setAction(&_sequenceManager, this, 3251, &R2_GLOBALS._player, &_actor2, NULL);
+		break;
+	case 3255:
+		_sceneMode = 3253;
+		setAction(&_sequenceManager, this, 3253, &R2_GLOBALS._player, &_actor1, NULL);
+		break;
+	default:
+		R2_GLOBALS._player.setup(31, 3, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setPosition(Common::Point(185, 150));
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+
+	R2_GLOBALS._player._oldCharacterScene[3] = 3250;
+}
+
+void Scene3250::signal() {
+	switch(_sceneMode) {
+	case 3250:
+		R2_GLOBALS._player._effect = 1;
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 3254:
+	//No break on purpose
+	case 3262:
+		R2_GLOBALS._sceneManager.changeScene(3255);
+		break;
+	case 3260:
+		R2_GLOBALS._sceneManager.changeScene(3175);
+		break;
+	case 3261:
+		R2_GLOBALS._sceneManager.changeScene(3125);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
+void Scene3250::dispatch() {
+	if ((R2_GLOBALS._player._visage == 3250) && (R2_GLOBALS._player._strip == 3) && (R2_GLOBALS._player._effect == 0)) {
+		R2_GLOBALS._player._effect = 6;
+		R2_GLOBALS._player._shade = 6;
+	}
+
+	Scene::dispatch();
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index ab98a8d66e..b83f83b1c2 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -261,6 +261,36 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 };
+
+class Scene3250 : public SceneExt {
+	class Item : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+
+	Item _item1;
+	Item _item2;
+	Item _item3;
+	Item _item4;
+	Actor _actor1;
+	Actor _actor2;
+	Actor _actor3;
+	Actor _actor4;
+	SceneActor _actor5;
+	SceneActor _actor6;
+	SceneActor _actor7;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void dispatch();
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 0f36350e03c69ce605fde1277118c43487f724af Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 23 Dec 2011 19:13:42 +0100
Subject: DREAMWEB: Fix regression from moving ReelRoutines out of data

The struct People still had an old-style pointer to a ReelRoutine.
Fix this by converting People to use a real ReelRoutine * and moving
the PeopleList from the buffers segment to a Common::List.

Thanks to digitall for the assistance with tracking this down.
---
 engines/dreamweb/dreambase.h |  3 +++
 engines/dreamweb/people.cpp  | 14 ++++++--------
 engines/dreamweb/structs.h   | 10 ++--------
 engines/dreamweb/stubs.cpp   | 16 +++++++---------
 4 files changed, 18 insertions(+), 25 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 18eff56a77..d624f8285c 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -24,6 +24,7 @@
 #define DREAMBASE_H
 
 #include "common/scummsys.h"
+#include "common/list.h"
 
 #include "dreamweb/segment.h"
 
@@ -65,6 +66,8 @@ protected:
 
 	// from people.cpp
 	ReelRoutine _reelRoutines[kNumReelRoutines+1];
+	Common::List<People> _peopleList;
+	ReelRoutine *_personData;
 
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 1e79471a65..32fbbc04e5 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -129,8 +129,7 @@ void DreamBase::setupInitialReelRoutines() {
 }
 
 void DreamBase::updatePeople() {
-	data.word(kListpos) = kPeoplelist;
-	memset(getSegment(data.word(kBuffers)).ptr(kPeoplelist, 12 * sizeof(People)), 0xff, 12 * sizeof(People));
+	_peopleList.clear();
 	++data.word(kMaintimer);
 
 	for (int i = 0; _reelRoutines[i].reallocation != 255; ++i) {
@@ -220,13 +219,12 @@ void DreamBase::madMode() {
 }
 
 void DreamBase::addToPeopleList(ReelRoutine *routine) {
-	uint16 routinePointer = (const uint8 *)routine - data.ptr(0, 0);
+	People people;
+	people._reelPointer = routine->reelPointer();
+	people._routinePointer = routine;
+	people.b4 = routine->b7;
 
-	People *people = (People *)getSegment(data.word(kBuffers)).ptr(data.word(kListpos), sizeof(People));
-	people->setReelPointer(routine->reelPointer());
-	people->setRoutinePointer(routinePointer);
-	people->b4 = routine->b7;
-	data.word(kListpos) += sizeof(People);
+	_peopleList.push_back(people);
 }
 
 bool DreamBase::checkSpeed(ReelRoutine &routine) {
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 320ed7e1a8..61400455d1 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -179,14 +179,8 @@ struct ReelRoutine {
 };
 
 struct People {
-	uint8 b0;
-	uint8 b1;
-	uint16 reelPointer() const { return READ_LE_UINT16(&b0); }
-	void setReelPointer(uint16 v) { WRITE_LE_UINT16(&b0, v); }
-	uint8 b2;
-	uint8 b3;
-	uint16 routinePointer() const { return READ_LE_UINT16(&b2); }
-	void setRoutinePointer(uint16 v) { WRITE_LE_UINT16(&b2, v); }
+	uint16 _reelPointer;
+	ReelRoutine *_routinePointer;
 	uint8 b4;
 
 };
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index dde9613f52..f3c908aad2 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1168,12 +1168,10 @@ void DreamGenContext::checkIfPerson() {
 }
 
 bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
-	People *people = (People *)getSegment(data.word(kBuffers)).ptr(kPeoplelist, 0);
-
-	for (size_t i = 0; i < 12; ++i, ++people) {
-		if (people->b4 == 255)
-			continue;
-		Reel *reel = getReelStart(people->reelPointer());
+	Common::List<People>::iterator i;
+	for (i = _peopleList.begin(); i != _peopleList.end(); ++i) {
+		People &people = *i;
+		Reel *reel = getReelStart(people._reelPointer);
 		if (reel->frame() == 0xffff)
 			++reel;
 		const Frame *frame = getReelFrameAX(reel->frame());
@@ -1189,8 +1187,8 @@ bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
 			continue;
 		if (y >= ymax)
 			continue;
-		data.word(kPersondata) = people->routinePointer();
-		obName(people->b4, 5);
+		_personData = people._routinePointer;
+		obName(people.b4, 5);
 		return true;
 	}
 	return false;
@@ -3833,7 +3831,7 @@ void DreamGenContext::talk() {
 	} while (!data.byte(kGetback));
 
 	if (data.byte(kTalkpos) >= 4)
-		data.byte(data.word(kPersondata)+7) |= 128;
+		_personData->b7 |= 128;
 
 	redrawMainScrn();
 	workToScreenM();
-- 
cgit v1.2.3


From 6653c977ef30ec9910f64c9231205f42ed58722b Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 23 Dec 2011 19:55:39 +0100
Subject: DREAMWEB: Remove a few unnecessary globals

---
 engines/dreamweb/backdrop.cpp | 79 +++++++++++++++++++------------------------
 engines/dreamweb/dreambase.h  |  2 +-
 2 files changed, 36 insertions(+), 45 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 38ccb0296c..c4c30548d0 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -100,9 +100,9 @@ uint8 DreamBase::getMapAd(const uint8 *setData) {
 	return 1;
 }
 
-void DreamBase::calcFrFrame(uint16 frameNum, uint8* width, uint8* height) {
-	const Frame *frame = (const Frame *)getSegment(data.word(kFrsegment)).ptr(frameNum * sizeof(Frame), sizeof(Frame));
-	data.word(kSavesource) = data.word(kFramesad) + frame->ptr();
+void DreamBase::calcFrFrame(uint16 frameSeg, uint16 frameNum, uint16 framesAd, uint8* width, uint8* height) {
+	const Frame *frame = (const Frame *)getSegment(frameSeg).ptr(frameNum * sizeof(Frame), sizeof(Frame));
+	data.word(kSavesource) = framesAd + frame->ptr();
 	data.byte(kSavesize+0) = frame->width;
 	data.byte(kSavesize+1) = frame->height;
 	data.word(kOffsetx) = frame->x;
@@ -139,15 +139,14 @@ void DreamBase::makeBackOb(SetObject *objData) {
 }
 
 void DreamBase::showAllObs() {
-	data.word(kListpos) = kSetlist;
-	memset(getSegment(data.word(kBuffers)).ptr(kSetlist, 0), 0xff, 128 * 5);
-	data.word(kFrsegment) = data.word(kSetframes);
-	data.word(kDataad) = kFramedata;
-	data.word(kFramesad) = kFrames;
-
-	const Frame *frames = (const Frame *)getSegment(data.word(kFrsegment)).ptr(0, 0);
-	SetObject *setEntries = (SetObject *)getSegment(data.word(kSetdat)).ptr(0, 128 * sizeof(SetObject));
-	for (size_t i = 0; i < 128; ++i) {
+	const unsigned int count = 128;
+
+	ObjPos *objPos = (ObjPos *)getSegment(data.word(kBuffers)).ptr(kSetlist, count * sizeof(ObjPos));
+	memset(objPos, 0xff, count * sizeof(ObjPos));
+
+	const Frame *frameBase = (const Frame *)getSegment(data.word(kSetframes)).ptr(0, 0);
+	SetObject *setEntries = (SetObject *)getSegment(data.word(kSetdat)).ptr(0, count * sizeof(SetObject));
+	for (size_t i = 0; i < count; ++i) {
 		SetObject *setEntry = setEntries + i;
 		if (getMapAd(setEntry->mapad) == 0)
 			continue;
@@ -155,24 +154,23 @@ void DreamBase::showAllObs() {
 		if (currentFrame == 0xff)
 			continue;
 		uint8 width, height;
-		calcFrFrame(currentFrame, &width, &height);
+		calcFrFrame(data.word(kSetframes), currentFrame, kFrames, &width, &height);
 		uint16 x, y;
 		finalFrame(&x, &y);
 		setEntry->index = setEntry->frames[0];
 		if ((setEntry->type == 0) && (setEntry->priority != 5) && (setEntry->priority != 6)) {
 			x += data.word(kMapadx);
 			y += data.word(kMapady);
-			showFrame(frames, x, y, currentFrame, 0);
+			showFrame(frameBase, x, y, currentFrame, 0);
 		} else
 			makeBackOb(setEntry);
 
-		ObjPos *objPos = (ObjPos *)getSegment(data.word(kBuffers)).ptr(data.word(kListpos), sizeof(ObjPos));
 		objPos->xMin = data.byte(kSavex);
 		objPos->yMin = data.byte(kSavey);
 		objPos->xMax = data.byte(kSavex) + data.byte(kSavesize+0);
 		objPos->yMax = data.byte(kSavey) + data.byte(kSavesize+1);
 		objPos->index = i;
-		data.word(kListpos) += sizeof(ObjPos);
+		++objPos;
 	}
 }
 
@@ -230,39 +228,34 @@ void DreamBase::calcMapAd() {
 }
 
 void DreamBase::showAllFree() {
-	data.word(kListpos) = kFreelist;
-	ObjPos *listPos = (ObjPos *)getSegment(data.word(kBuffers)).ptr(kFreelist, 80 * sizeof(ObjPos));
-	memset(listPos, 0xff, 80 * sizeof(ObjPos));
-
-	data.word(kFrsegment) = data.word(kFreeframes);
-	data.word(kDataad) = kFrframedata;
-	data.word(kFramesad) = kFrframes;
-	data.byte(kCurrentfree) = 0;
+	const unsigned int count = 80;
+
+	ObjPos *objPos = (ObjPos *)getSegment(data.word(kBuffers)).ptr(kFreelist, count * sizeof(ObjPos));
+	memset(objPos, 0xff, count * sizeof(ObjPos));
+
 	const DynObject *freeObjects = (const DynObject *)getSegment(data.word(kFreedat)).ptr(0, 0);
-	for (size_t i = 0; i < 80; ++i) {
+	const Frame *frameBase = (const Frame *)getSegment(data.word(kFreeframes)).ptr(0, 0);
+	for (size_t i = 0; i < count; ++i) {
 		uint8 mapAd = getMapAd(freeObjects[i].mapad);
 		if (mapAd != 0) {
 			uint8 width, height;
-			uint16 currentFrame = 3 * data.byte(kCurrentfree);
-			calcFrFrame(currentFrame, &width, &height);
+			uint16 currentFrame = 3 * i;
+			calcFrFrame(data.word(kFreeframes), currentFrame, kFrframes, &width, &height);
 			uint16 x, y;
 			finalFrame(&x, &y);
 			if ((width != 0) || (height != 0)) {
 				x += data.word(kMapadx);
 				y += data.word(kMapady);
 				assert(currentFrame < 256);
-				showFrame((Frame *)getSegment(data.word(kFrsegment)).ptr(0, 0), x, y, currentFrame, 0);
-				ObjPos *objPos = (ObjPos *)getSegment(data.word(kBuffers)).ptr(data.word(kListpos), sizeof(ObjPos));
+				showFrame(frameBase, x, y, currentFrame, 0);
 				objPos->xMin = data.byte(kSavex);
 				objPos->yMin = data.byte(kSavey);
 				objPos->xMax = data.byte(kSavex) + data.byte(kSavesize+0);
 				objPos->yMax = data.byte(kSavey) + data.byte(kSavesize+1);
 				objPos->index = i;
-				data.word(kListpos) += sizeof(ObjPos);
+				++objPos;
 			}
 		}
-
-		++data.byte(kCurrentfree);
 	}
 }
 
@@ -283,15 +276,14 @@ void DreamBase::drawFlags() {
 }
 
 void DreamBase::showAllEx() {
-	data.word(kListpos) = kExlist;
-	memset(getSegment(data.word(kBuffers)).ptr(kExlist, 100 * 5), 0xff, 100 * 5);
+	const unsigned int count = 100;
+
+	ObjPos *objPos = (ObjPos *)getSegment(data.word(kBuffers)).ptr(kExlist, count * sizeof(ObjPos));
+	memset(objPos, 0xff, count * sizeof(ObjPos));
 
-	data.word(kFrsegment) = data.word(kExtras);
-	data.word(kDataad) = kExframedata;
-	data.word(kFramesad) = kExframes;
-	data.byte(kCurrentex) = 0;
 	DynObject *objects = (DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, sizeof(DynObject));
-	for (size_t i = 0; i < 100; ++i, ++data.byte(kCurrentex)) {
+	const Frame *frameBase = (const Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
+	for (size_t i = 0; i < count; ++i) {
 		DynObject *object = objects + i;
 		if (object->mapad[0] == 0xff)
 			continue;
@@ -300,20 +292,19 @@ void DreamBase::showAllEx() {
 		if (getMapAd(object->mapad) == 0)
 			continue;
 		uint8 width, height;
-		uint16 currentFrame = 3 * data.byte(kCurrentex);
-		calcFrFrame(currentFrame, &width, &height);
+		uint16 currentFrame = 3 * i;
+		calcFrFrame(data.word(kExtras), currentFrame, kExframes, &width, &height);
 		uint16 x, y;
 		finalFrame(&x, &y);
 		if ((width != 0) || (height != 0)) {
 			assert(currentFrame < 256);
-			showFrame((Frame *)getSegment(data.word(kFrsegment)).ptr(0, 0), x + data.word(kMapadx), y + data.word(kMapady), currentFrame, 0);
-			ObjPos *objPos = (ObjPos *)getSegment(data.word(kBuffers)).ptr(data.word(kListpos), sizeof(ObjPos));
+			showFrame(frameBase, x + data.word(kMapadx), y + data.word(kMapady), currentFrame, 0);
 			objPos->xMin = data.byte(kSavex);
 			objPos->yMin = data.byte(kSavey);
 			objPos->xMax = data.byte(kSavesize + 0) + data.byte(kSavex);
 			objPos->yMax = data.byte(kSavesize + 1) + data.byte(kSavey);
 			objPos->index = i;
-			data.word(kListpos) += sizeof(ObjPos);
+			++objPos;
 		}
 	}
 }
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index d624f8285c..37c3be17d0 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -78,7 +78,7 @@ public:
 	uint8 getXAd(const uint8 *setData, uint8 *result);
 	uint8 getYAd(const uint8 *setData, uint8 *result);
 	uint8 getMapAd(const uint8 *setData);
-	void calcFrFrame(uint16 frame, uint8* width, uint8* height);
+	void calcFrFrame(uint16 frameSeg, uint16 frameNum, uint16 framesAd, uint8* width, uint8* height);
 	void finalFrame(uint16 *x, uint16 *y);
 	void makeBackOb(SetObject *objData);
 	void showAllObs();
-- 
cgit v1.2.3


From b6a6778843051d9150ac64c640ba19f3df08fce0 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 23 Dec 2011 20:32:52 +0100
Subject: DREAMWEB: Remove more unnecessary globals

---
 engines/dreamweb/backdrop.cpp |  62 +++----
 engines/dreamweb/dreambase.h  |   7 +-
 engines/dreamweb/dreamgen.cpp |  72 ++++----
 engines/dreamweb/dreamgen.h   | 409 ++++++++++++++++++++----------------------
 4 files changed, 257 insertions(+), 293 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index c4c30548d0..9d13eef210 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -89,41 +89,34 @@ uint8 DreamBase::getYAd(const uint8 *setData, uint8 *result) {
 	return 1;
 }
 
-uint8 DreamBase::getMapAd(const uint8 *setData) {
+uint8 DreamBase::getMapAd(const uint8 *setData, uint16 *x, uint16 *y) {
 	uint8 xad, yad;
 	if (getXAd(setData, &xad) == 0)
 		return 0;
-	data.word(kObjectx) = xad;
+	*x = xad;
 	if (getYAd(setData, &yad) == 0)
 		return 0;
-	data.word(kObjecty) = yad;
+	*y = yad;
 	return 1;
 }
 
-void DreamBase::calcFrFrame(uint16 frameSeg, uint16 frameNum, uint16 framesAd, uint8* width, uint8* height) {
+void DreamBase::calcFrFrame(uint16 frameSeg, uint16 frameNum, uint8 *width, uint8 *height, uint16 x, uint16 y, ObjPos *objPos) {
 	const Frame *frame = (const Frame *)getSegment(frameSeg).ptr(frameNum * sizeof(Frame), sizeof(Frame));
-	data.word(kSavesource) = framesAd + frame->ptr();
-	data.byte(kSavesize+0) = frame->width;
-	data.byte(kSavesize+1) = frame->height;
-	data.word(kOffsetx) = frame->x;
-	data.word(kOffsety) = frame->y;
 	*width = frame->width;
 	*height = frame->height;
-}
 
-void DreamBase::finalFrame(uint16 *x, uint16 *y) {
-	data.byte(kSavex) = (data.word(kObjectx) + data.word(kOffsetx)) & 0xff;
-	data.byte(kSavey) = (data.word(kObjecty) + data.word(kOffsety)) & 0xff;
-	*x = data.word(kObjectx);
-	*y = data.word(kObjecty);
+	objPos->xMin = (x + frame->x) & 0xff;
+	objPos->yMin = (y + frame->y) & 0xff;
+	objPos->xMax = objPos->xMin + frame->width;
+	objPos->yMax = objPos->yMin + frame->height;
 }
 
-void DreamBase::makeBackOb(SetObject *objData) {
+void DreamBase::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
 	if (data.byte(kNewobs) == 0)
 		return;
 	uint8 priority = objData->priority;
 	uint8 type = objData->type;
-	Sprite *sprite = makeSprite(data.word(kObjectx), data.word(kObjecty), addr_backobject, data.word(kSetframes), 0);
+	Sprite *sprite = makeSprite(x, y, addr_backobject, data.word(kSetframes), 0);
 
 	uint16 objDataOffset = (uint8 *)objData - getSegment(data.word(kSetdat)).ptr(0, 0);
 	assert(objDataOffset % sizeof(SetObject) == 0);
@@ -148,27 +141,22 @@ void DreamBase::showAllObs() {
 	SetObject *setEntries = (SetObject *)getSegment(data.word(kSetdat)).ptr(0, count * sizeof(SetObject));
 	for (size_t i = 0; i < count; ++i) {
 		SetObject *setEntry = setEntries + i;
-		if (getMapAd(setEntry->mapad) == 0)
+		uint16 x, y;
+		if (getMapAd(setEntry->mapad, &x, &y) == 0)
 			continue;
 		uint8 currentFrame = setEntry->frames[0];
 		if (currentFrame == 0xff)
 			continue;
 		uint8 width, height;
-		calcFrFrame(data.word(kSetframes), currentFrame, kFrames, &width, &height);
-		uint16 x, y;
-		finalFrame(&x, &y);
+		calcFrFrame(data.word(kSetframes), currentFrame, &width, &height, x, y, objPos);
 		setEntry->index = setEntry->frames[0];
 		if ((setEntry->type == 0) && (setEntry->priority != 5) && (setEntry->priority != 6)) {
 			x += data.word(kMapadx);
 			y += data.word(kMapady);
 			showFrame(frameBase, x, y, currentFrame, 0);
 		} else
-			makeBackOb(setEntry);
+			makeBackOb(setEntry, x, y);
 
-		objPos->xMin = data.byte(kSavex);
-		objPos->yMin = data.byte(kSavey);
-		objPos->xMax = data.byte(kSavex) + data.byte(kSavesize+0);
-		objPos->yMax = data.byte(kSavey) + data.byte(kSavesize+1);
 		objPos->index = i;
 		++objPos;
 	}
@@ -236,22 +224,17 @@ void DreamBase::showAllFree() {
 	const DynObject *freeObjects = (const DynObject *)getSegment(data.word(kFreedat)).ptr(0, 0);
 	const Frame *frameBase = (const Frame *)getSegment(data.word(kFreeframes)).ptr(0, 0);
 	for (size_t i = 0; i < count; ++i) {
-		uint8 mapAd = getMapAd(freeObjects[i].mapad);
+		uint16 x, y;
+		uint8 mapAd = getMapAd(freeObjects[i].mapad, &x, &y);
 		if (mapAd != 0) {
 			uint8 width, height;
 			uint16 currentFrame = 3 * i;
-			calcFrFrame(data.word(kFreeframes), currentFrame, kFrframes, &width, &height);
-			uint16 x, y;
-			finalFrame(&x, &y);
+			calcFrFrame(data.word(kFreeframes), currentFrame, &width, &height, x, y, objPos);
 			if ((width != 0) || (height != 0)) {
 				x += data.word(kMapadx);
 				y += data.word(kMapady);
 				assert(currentFrame < 256);
 				showFrame(frameBase, x, y, currentFrame, 0);
-				objPos->xMin = data.byte(kSavex);
-				objPos->yMin = data.byte(kSavey);
-				objPos->xMax = data.byte(kSavex) + data.byte(kSavesize+0);
-				objPos->yMax = data.byte(kSavey) + data.byte(kSavesize+1);
 				objPos->index = i;
 				++objPos;
 			}
@@ -289,20 +272,15 @@ void DreamBase::showAllEx() {
 			continue;
 		if (object->currentLocation != data.byte(kReallocation))
 			continue;
-		if (getMapAd(object->mapad) == 0)
+		uint16 x, y;
+		if (getMapAd(object->mapad, &x, &y) == 0)
 			continue;
 		uint8 width, height;
 		uint16 currentFrame = 3 * i;
-		calcFrFrame(data.word(kExtras), currentFrame, kExframes, &width, &height);
-		uint16 x, y;
-		finalFrame(&x, &y);
+		calcFrFrame(data.word(kExtras), currentFrame, &width, &height, x, y, objPos);
 		if ((width != 0) || (height != 0)) {
 			assert(currentFrame < 256);
 			showFrame(frameBase, x + data.word(kMapadx), y + data.word(kMapady), currentFrame, 0);
-			objPos->xMin = data.byte(kSavex);
-			objPos->yMin = data.byte(kSavey);
-			objPos->xMax = data.byte(kSavesize + 0) + data.byte(kSavex);
-			objPos->yMax = data.byte(kSavesize + 1) + data.byte(kSavey);
 			objPos->index = i;
 			++objPos;
 		}
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 37c3be17d0..b49787e3b2 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -77,10 +77,9 @@ public:
 	void doBlocks();
 	uint8 getXAd(const uint8 *setData, uint8 *result);
 	uint8 getYAd(const uint8 *setData, uint8 *result);
-	uint8 getMapAd(const uint8 *setData);
-	void calcFrFrame(uint16 frameSeg, uint16 frameNum, uint16 framesAd, uint8* width, uint8* height);
-	void finalFrame(uint16 *x, uint16 *y);
-	void makeBackOb(SetObject *objData);
+	uint8 getMapAd(const uint8 *setData, uint16 *x, uint16 *y);
+	void calcFrFrame(uint16 frameSeg, uint16 frameNum, uint8* width, uint8* height, uint16 x, uint16 y, ObjPos *objPos);
+	void makeBackOb(SetObject *objData, uint16 x, uint16 y);
 	void showAllObs();
 	bool addAlong(const uint8 *mapFlags);
 	bool addLength(const uint8 *mapFlags);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index c2d8530b25..6a68e7c2b9 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -1479,14 +1479,14 @@ void DreamGenContext::getDestInfo() {
 	push(ax);
 	dx = data;
 	es = dx;
-	si = 555;
+	si = 537;
 	_add(si, ax);
 	cl = es.byte(si);
 	ax = pop();
 	push(cx);
 	dx = data;
 	es = dx;
-	si = 571;
+	si = 553;
 	_add(si, ax);
 	ax = pop();
 }
@@ -1538,7 +1538,7 @@ clearedlocations:
 	bx = ax;
 	dx = data;
 	es = dx;
-	_add(bx, 555);
+	_add(bx, 537);
 	es.byte(bx) = 0;
 }
 
@@ -1558,7 +1558,7 @@ dirroot:
 	si = offset_rootdir;
 	_inc(si);
 	es = cs;
-	di = 480;
+	di = 462;
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
@@ -1603,7 +1603,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 480;
+	di = 462;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -1733,7 +1733,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 480+1;
+	di = 462+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -1815,7 +1815,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 589;
+	si = 571;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -1952,14 +1952,14 @@ void DreamGenContext::__start() {
 		//0x0080: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0090: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00a0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00b0: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 
+		//0x00c0: .... .... ...   ...
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x00c0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 
-		//0x00d0: .... .... .... .  .
+		//0x00d0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00e0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -1974,37 +1974,37 @@ void DreamGenContext::__start() {
 		//0x0130: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0140: .... .... .... ....
-		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, 0xff, 0xff, 0xff, 
 		//0x0150: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0160: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0170: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0180: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 
 		//0x0190: .... .... .... ....
+		0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 
+		//0x01a0: .... .DRE AMWE B.V9
+		0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
+		//0x01b0: 9.                .
+		0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 
+		//0x01c0: "ROO T          ." 
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 
+		//0x01d0:              . ....
+		0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+		//0x01e0: $... .... .... ....
+		0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x01f0: .... .... .D:. ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01a0: .... .... .... ....
-		0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 
-		//0x01b0: .... ...D REAM WEB.
-		0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x01c0: V99.               
-		0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
-		//0x01d0:  ."R OOT          .
-		0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 
-		//0x01e0: "               ...
-		0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-		//0x01f0: ..$. .... .... ....
-		0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 
-		//0x0200: .... .... ...D :...
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0200: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 
 		//0x0210: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 
 		//0x0220: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 
+		0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0230: .... .... .... ....
-		0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0240: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0250: .... .... .... ....
@@ -2018,11 +2018,9 @@ void DreamGenContext::__start() {
 		//0x0290: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x02a0: .... .... .... ....
-		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, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x02b0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-		//0x02c0: .... .... .... ....
-		0xff, 0xff, 0xff, 0x00, 0x00, 0x00, };
+		0xff, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 92b75a287a..d7f754afe9 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,8 +32,8 @@
 
 namespace DreamGen {
 
-static const uint16 offset_operand1 = 0x01c4;
-static const uint16 offset_rootdir = 0x01d2;
+static const uint16 offset_operand1 = 0x01b2;
+static const uint16 offset_rootdir = 0x01c0;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -156,214 +156,203 @@ static const uint16 kNewscreen = 149;
 static const uint16 kRyanx = 150;
 static const uint16 kRyany = 151;
 static const uint16 kLastflag = 152;
-static const uint16 kCurrentex = 153;
-static const uint16 kCurrentfree = 154;
-static const uint16 kFramesad = 155;
-static const uint16 kDataad = 157;
-static const uint16 kFrsegment = 159;
-static const uint16 kObjectx = 161;
-static const uint16 kObjecty = 163;
-static const uint16 kOffsetx = 165;
-static const uint16 kOffsety = 167;
-static const uint16 kSavesize = 169;
-static const uint16 kSavesource = 171;
-static const uint16 kSavex = 173;
-static const uint16 kSavey = 174;
-static const uint16 kCurrentob = 175;
-static const uint16 kPrioritydep = 176;
-static const uint16 kDestpos = 177;
-static const uint16 kReallocation = 178;
-static const uint16 kRoomnum = 179;
-static const uint16 kNowinnewroom = 180;
-static const uint16 kResetmanxy = 181;
-static const uint16 kNewlocation = 182;
-static const uint16 kAutolocation = 183;
-static const uint16 kMustload = 184;
-static const uint16 kAnswered = 185;
-static const uint16 kSaidno = 186;
-static const uint16 kDoorcheck1 = 187;
-static const uint16 kDoorcheck2 = 188;
-static const uint16 kDoorcheck3 = 189;
-static const uint16 kDoorcheck4 = 190;
-static const uint16 kMousex = 191;
-static const uint16 kMousey = 193;
-static const uint16 kMousebutton = 195;
-static const uint16 kMousebutton1 = 197;
-static const uint16 kMousebutton2 = 199;
-static const uint16 kMousebutton3 = 201;
-static const uint16 kMousebutton4 = 203;
-static const uint16 kOldbutton = 205;
-static const uint16 kOldx = 207;
-static const uint16 kOldy = 209;
-static const uint16 kLastbutton = 211;
-static const uint16 kOldpointerx = 213;
-static const uint16 kOldpointery = 215;
-static const uint16 kDelherex = 217;
-static const uint16 kDelherey = 219;
-static const uint16 kPointerxs = 221;
-static const uint16 kPointerys = 222;
-static const uint16 kDelxs = 223;
-static const uint16 kDelys = 224;
-static const uint16 kPointerframe = 225;
-static const uint16 kPointerpower = 226;
-static const uint16 kAuxpointerframe = 227;
-static const uint16 kPointermode = 228;
-static const uint16 kPointerspeed = 229;
-static const uint16 kPointercount = 230;
-static const uint16 kInmaparea = 231;
-static const uint16 kSlotdata = 232;
-static const uint16 kThisslot = 233;
-static const uint16 kSlotflags = 234;
-static const uint16 kTalkmode = 235;
-static const uint16 kTalkpos = 236;
-static const uint16 kCharacter = 237;
-static const uint16 kPersondata = 238;
-static const uint16 kTalknum = 240;
-static const uint16 kNumberinroom = 241;
-static const uint16 kCurrentcel = 242;
-static const uint16 kOldselection = 243;
-static const uint16 kStopwalking = 244;
-static const uint16 kMouseon = 245;
-static const uint16 kPlayed = 246;
-static const uint16 kTimer1 = 248;
-static const uint16 kTimer2 = 249;
-static const uint16 kTimer3 = 250;
-static const uint16 kWholetimer = 251;
-static const uint16 kTimer1to = 253;
-static const uint16 kTimer2to = 254;
-static const uint16 kTimer3to = 255;
-static const uint16 kWatchdump = 256;
-static const uint16 kLogonum = 257;
-static const uint16 kOldlogonum = 258;
-static const uint16 kNetseg = 259;
-static const uint16 kNetpoint = 261;
-static const uint16 kCursorstate = 263;
-static const uint16 kPressed = 264;
-static const uint16 kPresspointer = 265;
-static const uint16 kGraphicpress = 267;
-static const uint16 kPresscount = 268;
-static const uint16 kLightcount = 269;
-static const uint16 kFolderpage = 270;
-static const uint16 kDiarypage = 271;
-static const uint16 kMenucount = 272;
-static const uint16 kSymboltopx = 273;
-static const uint16 kSymboltopnum = 274;
-static const uint16 kSymboltopdir = 275;
-static const uint16 kSymbolbotx = 276;
-static const uint16 kSymbolbotnum = 277;
-static const uint16 kSymbolbotdir = 278;
-static const uint16 kSymboltolight = 279;
-static const uint16 kSymbol1 = 280;
-static const uint16 kSymbol2 = 281;
-static const uint16 kSymbol3 = 282;
-static const uint16 kSymbolnum = 283;
-static const uint16 kDumpx = 284;
-static const uint16 kDumpy = 286;
-static const uint16 kWalkandexam = 288;
-static const uint16 kWalkexamtype = 289;
-static const uint16 kWalkexamnum = 290;
-static const uint16 kCurslocx = 291;
-static const uint16 kCurslocy = 293;
-static const uint16 kCurpos = 295;
-static const uint16 kMonadx = 297;
-static const uint16 kMonady = 299;
-static const uint16 kMonsource = 301;
-static const uint16 kNumtodo = 303;
-static const uint16 kTimecount = 305;
-static const uint16 kCounttotimed = 307;
-static const uint16 kTimedseg = 309;
-static const uint16 kTimedoffset = 311;
-static const uint16 kTimedy = 313;
-static const uint16 kTimedx = 314;
-static const uint16 kNeedtodumptimed = 315;
-static const uint16 kLoadingorsave = 316;
-static const uint16 kCurrentslot = 317;
-static const uint16 kCursorpos = 318;
-static const uint16 kColourpos = 319;
-static const uint16 kFadedirection = 320;
-static const uint16 kNumtofade = 321;
-static const uint16 kFadecount = 322;
-static const uint16 kAddtogreen = 323;
-static const uint16 kAddtored = 324;
-static const uint16 kAddtoblue = 325;
-static const uint16 kLastsoundreel = 326;
-static const uint16 kSpeechloaded = 328;
-static const uint16 kSpeechlength = 329;
-static const uint16 kVolume = 331;
-static const uint16 kVolumeto = 332;
-static const uint16 kVolumedirection = 333;
-static const uint16 kVolumecount = 334;
-static const uint16 kWongame = 335;
-static const uint16 kLasthardkey = 336;
-static const uint16 kBufferin = 337;
-static const uint16 kBufferout = 339;
-static const uint16 kExtras = 341;
-static const uint16 kWorkspace = 343;
-static const uint16 kMapstore = 345;
-static const uint16 kCharset1 = 347;
-static const uint16 kBuffers = 349;
-static const uint16 kMainsprites = 351;
-static const uint16 kBackdrop = 353;
-static const uint16 kMapdata = 355;
-static const uint16 kSounddata = 357;
-static const uint16 kSounddata2 = 359;
-static const uint16 kRecordspace = 361;
-static const uint16 kFreedat = 363;
-static const uint16 kSetdat = 365;
-static const uint16 kReel1 = 367;
-static const uint16 kReel2 = 369;
-static const uint16 kReel3 = 371;
-static const uint16 kRoomdesc = 373;
-static const uint16 kFreedesc = 375;
-static const uint16 kSetdesc = 377;
-static const uint16 kBlockdesc = 379;
-static const uint16 kSetframes = 381;
-static const uint16 kFreeframes = 383;
-static const uint16 kPeople = 385;
-static const uint16 kReels = 387;
-static const uint16 kCommandtext = 389;
-static const uint16 kPuzzletext = 391;
-static const uint16 kTraveltext = 393;
-static const uint16 kTempgraphics = 395;
-static const uint16 kTempgraphics2 = 397;
-static const uint16 kTempgraphics3 = 399;
-static const uint16 kTempsprites = 401;
-static const uint16 kTextfile1 = 403;
-static const uint16 kTextfile2 = 405;
-static const uint16 kTextfile3 = 407;
-static const uint16 kBlinkframe = 409;
-static const uint16 kBlinkcount = 410;
-static const uint16 kReasseschanges = 411;
-static const uint16 kPointerspath = 412;
-static const uint16 kManspath = 413;
-static const uint16 kPointerfirstpath = 414;
-static const uint16 kFinaldest = 415;
-static const uint16 kDestination = 416;
-static const uint16 kLinestartx = 417;
-static const uint16 kLinestarty = 419;
-static const uint16 kLineendx = 421;
-static const uint16 kLineendy = 423;
-static const uint16 kLinepointer = 425;
-static const uint16 kLinedirection = 426;
-static const uint16 kLinelength = 427;
-static const uint16 kCh0blockstocopy = 428;
-static const uint16 kCh0playing = 430;
-static const uint16 kCh0repeat = 431;
-static const uint16 kCh1playing = 432;
-static const uint16 kCh1blockstocopy = 433;
-static const uint16 kSoundbufferwrite = 435;
-static const uint16 kCurrentsample = 437;
-static const uint16 kRoomssample = 438;
-static const uint16 kBasicsample = 439;
-static const uint16 kCurrentfile = 480;
-static const uint16 kRoomscango = 555;
-static const uint16 kRoompics = 571;
-static const uint16 kOplist = 586;
-static const uint16 kInputline = 589;
-static const uint16 kPresslist = 717;
-static const uint16 kQuitrequested = 723;
-static const uint16 kSubtitles = 724;
-static const uint16 kForeignrelease = 725;
+static const uint16 kOffsetx = 153;
+static const uint16 kOffsety = 155;
+static const uint16 kCurrentob = 157;
+static const uint16 kPrioritydep = 158;
+static const uint16 kDestpos = 159;
+static const uint16 kReallocation = 160;
+static const uint16 kRoomnum = 161;
+static const uint16 kNowinnewroom = 162;
+static const uint16 kResetmanxy = 163;
+static const uint16 kNewlocation = 164;
+static const uint16 kAutolocation = 165;
+static const uint16 kMustload = 166;
+static const uint16 kAnswered = 167;
+static const uint16 kSaidno = 168;
+static const uint16 kDoorcheck1 = 169;
+static const uint16 kDoorcheck2 = 170;
+static const uint16 kDoorcheck3 = 171;
+static const uint16 kDoorcheck4 = 172;
+static const uint16 kMousex = 173;
+static const uint16 kMousey = 175;
+static const uint16 kMousebutton = 177;
+static const uint16 kMousebutton1 = 179;
+static const uint16 kMousebutton2 = 181;
+static const uint16 kMousebutton3 = 183;
+static const uint16 kMousebutton4 = 185;
+static const uint16 kOldbutton = 187;
+static const uint16 kOldx = 189;
+static const uint16 kOldy = 191;
+static const uint16 kLastbutton = 193;
+static const uint16 kOldpointerx = 195;
+static const uint16 kOldpointery = 197;
+static const uint16 kDelherex = 199;
+static const uint16 kDelherey = 201;
+static const uint16 kPointerxs = 203;
+static const uint16 kPointerys = 204;
+static const uint16 kDelxs = 205;
+static const uint16 kDelys = 206;
+static const uint16 kPointerframe = 207;
+static const uint16 kPointerpower = 208;
+static const uint16 kAuxpointerframe = 209;
+static const uint16 kPointermode = 210;
+static const uint16 kPointerspeed = 211;
+static const uint16 kPointercount = 212;
+static const uint16 kInmaparea = 213;
+static const uint16 kSlotdata = 214;
+static const uint16 kThisslot = 215;
+static const uint16 kSlotflags = 216;
+static const uint16 kTalkmode = 217;
+static const uint16 kTalkpos = 218;
+static const uint16 kCharacter = 219;
+static const uint16 kPersondata = 220;
+static const uint16 kTalknum = 222;
+static const uint16 kNumberinroom = 223;
+static const uint16 kCurrentcel = 224;
+static const uint16 kOldselection = 225;
+static const uint16 kStopwalking = 226;
+static const uint16 kMouseon = 227;
+static const uint16 kPlayed = 228;
+static const uint16 kTimer1 = 230;
+static const uint16 kTimer2 = 231;
+static const uint16 kTimer3 = 232;
+static const uint16 kWholetimer = 233;
+static const uint16 kTimer1to = 235;
+static const uint16 kTimer2to = 236;
+static const uint16 kTimer3to = 237;
+static const uint16 kWatchdump = 238;
+static const uint16 kLogonum = 239;
+static const uint16 kOldlogonum = 240;
+static const uint16 kNetseg = 241;
+static const uint16 kNetpoint = 243;
+static const uint16 kCursorstate = 245;
+static const uint16 kPressed = 246;
+static const uint16 kPresspointer = 247;
+static const uint16 kGraphicpress = 249;
+static const uint16 kPresscount = 250;
+static const uint16 kLightcount = 251;
+static const uint16 kFolderpage = 252;
+static const uint16 kDiarypage = 253;
+static const uint16 kMenucount = 254;
+static const uint16 kSymboltopx = 255;
+static const uint16 kSymboltopnum = 256;
+static const uint16 kSymboltopdir = 257;
+static const uint16 kSymbolbotx = 258;
+static const uint16 kSymbolbotnum = 259;
+static const uint16 kSymbolbotdir = 260;
+static const uint16 kSymboltolight = 261;
+static const uint16 kSymbol1 = 262;
+static const uint16 kSymbol2 = 263;
+static const uint16 kSymbol3 = 264;
+static const uint16 kSymbolnum = 265;
+static const uint16 kDumpx = 266;
+static const uint16 kDumpy = 268;
+static const uint16 kWalkandexam = 270;
+static const uint16 kWalkexamtype = 271;
+static const uint16 kWalkexamnum = 272;
+static const uint16 kCurslocx = 273;
+static const uint16 kCurslocy = 275;
+static const uint16 kCurpos = 277;
+static const uint16 kMonadx = 279;
+static const uint16 kMonady = 281;
+static const uint16 kMonsource = 283;
+static const uint16 kNumtodo = 285;
+static const uint16 kTimecount = 287;
+static const uint16 kCounttotimed = 289;
+static const uint16 kTimedseg = 291;
+static const uint16 kTimedoffset = 293;
+static const uint16 kTimedy = 295;
+static const uint16 kTimedx = 296;
+static const uint16 kNeedtodumptimed = 297;
+static const uint16 kLoadingorsave = 298;
+static const uint16 kCurrentslot = 299;
+static const uint16 kCursorpos = 300;
+static const uint16 kColourpos = 301;
+static const uint16 kFadedirection = 302;
+static const uint16 kNumtofade = 303;
+static const uint16 kFadecount = 304;
+static const uint16 kAddtogreen = 305;
+static const uint16 kAddtored = 306;
+static const uint16 kAddtoblue = 307;
+static const uint16 kLastsoundreel = 308;
+static const uint16 kSpeechloaded = 310;
+static const uint16 kSpeechlength = 311;
+static const uint16 kVolume = 313;
+static const uint16 kVolumeto = 314;
+static const uint16 kVolumedirection = 315;
+static const uint16 kVolumecount = 316;
+static const uint16 kWongame = 317;
+static const uint16 kLasthardkey = 318;
+static const uint16 kBufferin = 319;
+static const uint16 kBufferout = 321;
+static const uint16 kExtras = 323;
+static const uint16 kWorkspace = 325;
+static const uint16 kMapstore = 327;
+static const uint16 kCharset1 = 329;
+static const uint16 kBuffers = 331;
+static const uint16 kMainsprites = 333;
+static const uint16 kBackdrop = 335;
+static const uint16 kMapdata = 337;
+static const uint16 kSounddata = 339;
+static const uint16 kSounddata2 = 341;
+static const uint16 kRecordspace = 343;
+static const uint16 kFreedat = 345;
+static const uint16 kSetdat = 347;
+static const uint16 kReel1 = 349;
+static const uint16 kReel2 = 351;
+static const uint16 kReel3 = 353;
+static const uint16 kRoomdesc = 355;
+static const uint16 kFreedesc = 357;
+static const uint16 kSetdesc = 359;
+static const uint16 kBlockdesc = 361;
+static const uint16 kSetframes = 363;
+static const uint16 kFreeframes = 365;
+static const uint16 kPeople = 367;
+static const uint16 kReels = 369;
+static const uint16 kCommandtext = 371;
+static const uint16 kPuzzletext = 373;
+static const uint16 kTraveltext = 375;
+static const uint16 kTempgraphics = 377;
+static const uint16 kTempgraphics2 = 379;
+static const uint16 kTempgraphics3 = 381;
+static const uint16 kTempsprites = 383;
+static const uint16 kTextfile1 = 385;
+static const uint16 kTextfile2 = 387;
+static const uint16 kTextfile3 = 389;
+static const uint16 kBlinkframe = 391;
+static const uint16 kBlinkcount = 392;
+static const uint16 kReasseschanges = 393;
+static const uint16 kPointerspath = 394;
+static const uint16 kManspath = 395;
+static const uint16 kPointerfirstpath = 396;
+static const uint16 kFinaldest = 397;
+static const uint16 kDestination = 398;
+static const uint16 kLinestartx = 399;
+static const uint16 kLinestarty = 401;
+static const uint16 kLineendx = 403;
+static const uint16 kLineendy = 405;
+static const uint16 kLinepointer = 407;
+static const uint16 kLinedirection = 408;
+static const uint16 kLinelength = 409;
+static const uint16 kCh0blockstocopy = 410;
+static const uint16 kCh0playing = 412;
+static const uint16 kCh0repeat = 413;
+static const uint16 kCh1playing = 414;
+static const uint16 kCh1blockstocopy = 415;
+static const uint16 kSoundbufferwrite = 417;
+static const uint16 kCurrentsample = 419;
+static const uint16 kRoomssample = 420;
+static const uint16 kBasicsample = 421;
+static const uint16 kCurrentfile = 462;
+static const uint16 kRoomscango = 537;
+static const uint16 kRoompics = 553;
+static const uint16 kOplist = 568;
+static const uint16 kInputline = 571;
+static const uint16 kPresslist = 699;
+static const uint16 kQuitrequested = 705;
+static const uint16 kSubtitles = 706;
+static const uint16 kForeignrelease = 707;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
-- 
cgit v1.2.3


From 625a5ef2ed8f947e43e8e8d12bd72ffe9d1776c6 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 23 Dec 2011 20:45:51 +0100
Subject: DREAMWEB: Minor cleanup

---
 engines/dreamweb/backdrop.cpp | 10 +++++-----
 engines/dreamweb/dreambase.h  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 9d13eef210..cb72454a41 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -100,8 +100,8 @@ uint8 DreamBase::getMapAd(const uint8 *setData, uint16 *x, uint16 *y) {
 	return 1;
 }
 
-void DreamBase::calcFrFrame(uint16 frameSeg, uint16 frameNum, uint8 *width, uint8 *height, uint16 x, uint16 y, ObjPos *objPos) {
-	const Frame *frame = (const Frame *)getSegment(frameSeg).ptr(frameNum * sizeof(Frame), sizeof(Frame));
+void DreamBase::calcFrFrame(const Frame *frameBase, uint16 frameNum, uint8 *width, uint8 *height, uint16 x, uint16 y, ObjPos *objPos) {
+	const Frame *frame = frameBase + frameNum;
 	*width = frame->width;
 	*height = frame->height;
 
@@ -148,7 +148,7 @@ void DreamBase::showAllObs() {
 		if (currentFrame == 0xff)
 			continue;
 		uint8 width, height;
-		calcFrFrame(data.word(kSetframes), currentFrame, &width, &height, x, y, objPos);
+		calcFrFrame(frameBase, currentFrame, &width, &height, x, y, objPos);
 		setEntry->index = setEntry->frames[0];
 		if ((setEntry->type == 0) && (setEntry->priority != 5) && (setEntry->priority != 6)) {
 			x += data.word(kMapadx);
@@ -229,7 +229,7 @@ void DreamBase::showAllFree() {
 		if (mapAd != 0) {
 			uint8 width, height;
 			uint16 currentFrame = 3 * i;
-			calcFrFrame(data.word(kFreeframes), currentFrame, &width, &height, x, y, objPos);
+			calcFrFrame(frameBase, currentFrame, &width, &height, x, y, objPos);
 			if ((width != 0) || (height != 0)) {
 				x += data.word(kMapadx);
 				y += data.word(kMapady);
@@ -277,7 +277,7 @@ void DreamBase::showAllEx() {
 			continue;
 		uint8 width, height;
 		uint16 currentFrame = 3 * i;
-		calcFrFrame(data.word(kExtras), currentFrame, &width, &height, x, y, objPos);
+		calcFrFrame(frameBase, currentFrame, &width, &height, x, y, objPos);
 		if ((width != 0) || (height != 0)) {
 			assert(currentFrame < 256);
 			showFrame(frameBase, x + data.word(kMapadx), y + data.word(kMapady), currentFrame, 0);
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index b49787e3b2..3c2283636e 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -78,7 +78,7 @@ public:
 	uint8 getXAd(const uint8 *setData, uint8 *result);
 	uint8 getYAd(const uint8 *setData, uint8 *result);
 	uint8 getMapAd(const uint8 *setData, uint16 *x, uint16 *y);
-	void calcFrFrame(uint16 frameSeg, uint16 frameNum, uint8* width, uint8* height, uint16 x, uint16 y, ObjPos *objPos);
+	void calcFrFrame(const Frame *frameBase, uint16 frameNum, uint8* width, uint8* height, uint16 x, uint16 y, ObjPos *objPos);
 	void makeBackOb(SetObject *objData, uint16 x, uint16 y);
 	void showAllObs();
 	bool addAlong(const uint8 *mapFlags);
-- 
cgit v1.2.3


From f6d63ae6a8adeb182d404274b856c03bb40bae4a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 24 Dec 2011 00:34:56 +0200
Subject: DREAMWEB: Use the C++ versions of getAnyAd and makeWorn in some
 places

This allows us to remove the ASM style version of makeWorn()
---
 engines/dreamweb/object.cpp |  7 +------
 engines/dreamweb/stubs.h    |  1 -
 engines/dreamweb/use.cpp    | 16 ++++++++--------
 3 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 207f4889db..cdd612001f 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -79,10 +79,6 @@ void DreamGenContext::wornError() {
 	workToScreenM();
 }
 
-void DreamGenContext::makeWorn() {
-	makeWorn((DynObject *)es.ptr(bx, sizeof(DynObject)));
-}
-
 void DreamGenContext::makeWorn(DynObject *object) {
 	object->id[0] = 'W'-'A';
 	object->id[1] = 'E'-'A';
@@ -419,8 +415,7 @@ void DreamGenContext::selectOb() {
 
 void DreamGenContext::setPickup() {
 	if (data.byte(kObjecttype) != kSetObjectType1 && data.byte(kObjecttype) != kSetObjectType3) {
-		// The original called getAnyAd() here. However, since object types
-		// 1 and 3 are excluded, the resulting object is a DynObject
+		// Object types 1 and 3 are excluded, so the resulting object is a DynObject
 		uint8 dummy;
 		DynObject *object = (DynObject *)getAnyAd(&dummy, &dummy);
 		if (object->mapad[0] == 4) {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index c94cb02a3c..a58bb259be 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -104,7 +104,6 @@
 		return DreamBase::isItWorn(object);
 	}
 	void wornError();
-	void makeWorn();
 	void makeWorn(DynObject *object);
 	void obToInv();
 	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index d3dda0e0a0..b642598589 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -363,8 +363,8 @@ void DreamGenContext::wearWatch() {
 		showFirstUse();
 		data.byte(kWatchon) = 1;
 		data.byte(kGetback) = 1;
-		getAnyAd();
-		makeWorn();
+		uint8 dummy;
+		makeWorn((DynObject *)getAnyAd(&dummy, &dummy));
 	}
 }
 
@@ -377,8 +377,8 @@ void DreamGenContext::wearShades() {
 		data.byte(kShadeson) = 1;
 		showFirstUse();
 		data.byte(kGetback) = 1;
-		getAnyAd();
-		makeWorn();
+		uint8 dummy;
+		makeWorn((DynObject *)getAnyAd(&dummy, &dummy));
 	}
 }
 
@@ -1027,13 +1027,13 @@ void DreamGenContext::useCart() {
 }
 
 void DreamGenContext::useTrainer() {
-	// TODO: Use the C++ version of getAnyAd()
-	getAnyAd();
-	if (es.byte(bx + 2) != 4) {
+	uint8 dummy;
+	DynObject *object = (DynObject *)getAnyAd(&dummy, &dummy);
+	if (object->mapad[0] != 4) {
 		notHeldError();
 	} else {
 		data.byte(kProgresspoints)++;
-		makeWorn();
+		makeWorn(object);
 		showSecondUse();
 		putBackObStuff();
 	}
-- 
cgit v1.2.3


From 00b0aafd4ca9fa79686340a66f9dba9b383993e2 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 23 Dec 2011 23:45:44 +0100
Subject: DREAMWEB: Fix broken merge for pull request #151

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

(limited to 'engines')

diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index fac75be6cf..40c514b34a 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -62,7 +62,7 @@ void DreamGenContext::talk() {
 	} while (!data.byte(kGetback));
 
 	if (data.byte(kTalkpos) >= 4)
-		data.byte(data.word(kPersondata)+7) |= 128;
+		_personData->b7 |= 128;
 
 	redrawMainScrn();
 	workToScreenM();
-- 
cgit v1.2.3


From 061d24bb829a9b4ee08016fb25781802799fae14 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 23 Dec 2011 22:47:20 +0100
Subject: DREAMWEB: Move palettes out of buffers

---
 engines/dreamweb/dreambase.h  | 10 ++++---
 engines/dreamweb/vgafades.cpp | 67 +++++++++++++++++--------------------------
 engines/dreamweb/vgagrafx.cpp |  4 +--
 3 files changed, 35 insertions(+), 46 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index e20ee83bac..b4265e904a 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -66,9 +66,14 @@ protected:
 
 	// from people.cpp
 	ReelRoutine _reelRoutines[kNumReelRoutines+1];
-	Common::List<People> _peopleList;
 	ReelRoutine *_personData;
 
+	// from Buffers
+	uint8 _startPal[3*256];
+	uint8 _endPal[3*256];
+	uint8 _mainPal[3*256];
+	Common::List<People> _peopleList;
+
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
 
@@ -494,9 +499,6 @@ public:
 	void showPuzText(uint16 command, uint16 count);
 
 	// from vgafades.cpp
-	uint8 *mainPalette();
-	uint8 *startPalette();
-	uint8 *endPalette();
 	void clearStartPal();
 	void clearEndPal();
 	void palToStartPal();
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index adbc158c84..80f5ce608a 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -24,41 +24,28 @@
 
 namespace DreamGen {
 
-uint8 *DreamBase::mainPalette() {
-// TODO: Turn these into plain C arrays
-	return getSegment(data.word(kBuffers)).ptr(kMaingamepal, 256 * 3);
-}
-
-uint8 *DreamBase::startPalette() {
-	return getSegment(data.word(kBuffers)).ptr(kStartpal, 256 * 3);
-}
-
-uint8 *DreamBase::endPalette() {
-	return getSegment(data.word(kBuffers)).ptr(kEndpal, 256 * 3);
-}
-
 void DreamBase::clearStartPal() {
-	memset(startPalette(), 0, 256 * 3);
+	memset(_startPal, 0, 256 * 3);
 }
 
 void DreamBase::clearEndPal() {
-	memset(endPalette(), 0, 256 * 3);
+	memset(_endPal, 0, 256 * 3);
 }
 
 void DreamBase::palToStartPal() {
-	memcpy(startPalette(), mainPalette(), 256 * 3);
+	memcpy(_startPal, _mainPal, 256 * 3);
 }
 
 void DreamBase::endPalToStart() {
-	memcpy(startPalette(), endPalette(), 256 * 3);
+	memcpy(_startPal, _endPal, 256 * 3);
 }
 
 void DreamBase::startPalToEnd() {
-	memcpy(endPalette(), startPalette(), 256 * 3);
+	memcpy(_endPal, _startPal, 256 * 3);
 }
 
 void DreamBase::palToEndPal() {
-	memcpy(endPalette(), mainPalette(), 256 * 3);
+	memcpy(_endPal, _mainPal, 256 * 3);
 }
 
 void DreamBase::fadeDOS() {
@@ -66,7 +53,7 @@ void DreamBase::fadeDOS() {
 
 	engine->waitForVSync();
 	//processEvents will be called from vsync
-	uint8 *dst = startPalette();
+	uint8 *dst = _startPal;
 	engine->getPalette(dst, 0, 64);
 	for (int fade = 0; fade < 64; ++fade) {
 		for (int c = 0; c < 768; ++c) { //original sources decrement 768 values -> 256 colors
@@ -84,7 +71,7 @@ void DreamBase::doFade() {
 		return;
 
 	engine->processEvents();
-	uint8 *src = startPalette() + 3 * data.byte(kColourpos);
+	uint8 *src = _startPal + 3 * data.byte(kColourpos);
 	engine->setPalette(src, data.byte(kColourpos), data.byte(kNumtofade));
 
 	data.byte(kColourpos) += data.byte(kNumtofade);
@@ -98,8 +85,8 @@ void DreamBase::fadeCalculation() {
 		return;
 	}
 
-	uint8 *startPal = startPalette();
-	const uint8 *endPal = endPalette();
+	uint8 *startPal = _startPal;
+	const uint8 *endPal = _endPal;
 	for (size_t i = 0; i < 256 * 3; ++i) {
 		uint8 s = startPal[i];
 		uint8 e = endPal[i];
@@ -117,8 +104,8 @@ void DreamBase::fadeCalculation() {
 
 void DreamBase::fadeUpYellows() {
 	palToEndPal();
-	memset(endPalette() + 231 * 3, 0, 8 * 3);
-	memset(endPalette() + 246 * 3, 0, 1 * 3);
+	memset(_endPal + 231 * 3, 0, 8 * 3);
+	memset(_endPal + 246 * 3, 0, 1 * 3);
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
@@ -129,8 +116,8 @@ void DreamBase::fadeUpYellows() {
 void DreamBase::fadeUpMonFirst() {
 	palToStartPal();
 	palToEndPal();
-	memset(startPalette() + 231 * 3, 0, 8 * 3);
-	memset(startPalette() + 246 * 3, 0, 1 * 3);
+	memset(_startPal + 231 * 3, 0, 8 * 3);
+	memset(_startPal + 246 * 3, 0, 1 * 3);
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
@@ -144,8 +131,8 @@ void DreamBase::fadeUpMonFirst() {
 void DreamBase::fadeDownMon() {
 	palToStartPal();
 	palToEndPal();
-	memset(endPalette() + 231 * 3, 0, 8 * 3);
-	memset(endPalette() + 246 * 3, 0, 1 * 3);
+	memset(_endPal + 231 * 3, 0, 8 * 3);
+	memset(_endPal + 246 * 3, 0, 1 * 3);
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
@@ -156,8 +143,8 @@ void DreamBase::fadeDownMon() {
 void DreamBase::fadeUpMon() {
 	palToStartPal();
 	palToEndPal();
-	memset(startPalette() + 231 * 3, 0, 8 * 3);
-	memset(startPalette() + 246 * 3, 0, 1 * 3);
+	memset(_startPal + 231 * 3, 0, 8 * 3);
+	memset(_startPal + 246 * 3, 0, 1 * 3);
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
@@ -167,10 +154,10 @@ void DreamBase::fadeUpMon() {
 
 void DreamBase::initialMonCols() {
 	palToStartPal();
-	memset(startPalette() + 230 * 3, 0, 9 * 3);
-	memset(startPalette() + 246 * 3, 0, 1 * 3);
+	memset(_startPal + 230 * 3, 0, 9 * 3);
+	memset(_startPal + 246 * 3, 0, 1 * 3);
 	engine->processEvents();
-	engine->setPalette(startPalette() + 230 * 3, 230, 18);
+	engine->setPalette(_startPal + 230 * 3, 230, 18);
 }
 
 void DreamBase::fadeScreenUp() {
@@ -222,8 +209,8 @@ void DreamBase::fadeScreenDownHalf() {
 	palToStartPal();
 	palToEndPal();
 
-	const uint8 *startPal = startPalette();
-	uint8 *endPal = endPalette();
+	const uint8 *startPal = _startPal;
+	uint8 *endPal = _endPal;
 	for (int i = 0; i < 256 * 3; ++i) {
 		*endPal >>= 1;
 		endPal++;
@@ -248,8 +235,8 @@ void DreamBase::clearPalette() {
 // Converts palette to grey scale, summed using formula
 // .20xred + .59xGreen + .11xBlue
 void DreamBase::greyscaleSum() {
-	byte *src = mainPalette();
-	byte *dst = endPalette();
+	byte *src = _mainPal;
+	byte *dst = _endPal;
 
 	for (int i = 0; i < 256; ++i) {
 		const unsigned int r = 20 * *src++;
@@ -276,12 +263,12 @@ void DreamBase::greyscaleSum() {
 }
 
 void DreamBase::allPalette() {
-	memcpy(startPalette(), mainPalette(), 3 * 256);
+	memcpy(_startPal, _mainPal, 3 * 256);
 	dumpCurrent();
 }
 
 void DreamBase::dumpCurrent() {
-	uint8 *pal = startPalette();
+	uint8 *pal = _startPal;
 
 	engine->waitForVSync();
 	engine->processEvents();
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index b1a23a6c96..87ab998553 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -202,7 +202,7 @@ void DreamBase::showPCX(const Common::String &name) {
 	// the color components have to be adjusted from 8 to 6 bits.
 
 	pcxFile.seek(16, SEEK_SET);
-	mainGamePal = mainPalette();
+	mainGamePal = _mainPal;
 	pcxFile.read(mainGamePal, 48);
 
 	memset(mainGamePal + 48, 0xff, 720);
@@ -448,7 +448,7 @@ void DreamBase::loadPalFromIFF() {
 	palFile.close();
 
 	const uint8 *src = mapStore() + 0x30;
-	uint8 *dst = mainPalette();
+	uint8 *dst = _mainPal;
 	for (size_t i = 0; i < 256*3; ++i) {
 		uint8 c = src[i] / 4;
 		if (data.byte(kBrightness) == 1) {
-- 
cgit v1.2.3


From 1749182e98ed410cd62e22185943696b7e30432a Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 23 Dec 2011 22:49:40 +0100
Subject: DREAMWEB: Move ObjPos lists out of buffers

---
 engines/dreamweb/backdrop.cpp | 30 +++++++++++++++---------------
 engines/dreamweb/dreambase.h  |  3 +++
 engines/dreamweb/stubs.cpp    | 37 ++++++++++++++++++++-----------------
 3 files changed, 38 insertions(+), 32 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index cb72454a41..9fe3c74150 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -134,8 +134,7 @@ void DreamBase::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
 void DreamBase::showAllObs() {
 	const unsigned int count = 128;
 
-	ObjPos *objPos = (ObjPos *)getSegment(data.word(kBuffers)).ptr(kSetlist, count * sizeof(ObjPos));
-	memset(objPos, 0xff, count * sizeof(ObjPos));
+	_setList.clear();
 
 	const Frame *frameBase = (const Frame *)getSegment(data.word(kSetframes)).ptr(0, 0);
 	SetObject *setEntries = (SetObject *)getSegment(data.word(kSetdat)).ptr(0, count * sizeof(SetObject));
@@ -148,7 +147,8 @@ void DreamBase::showAllObs() {
 		if (currentFrame == 0xff)
 			continue;
 		uint8 width, height;
-		calcFrFrame(frameBase, currentFrame, &width, &height, x, y, objPos);
+		ObjPos objPos;
+		calcFrFrame(frameBase, currentFrame, &width, &height, x, y, &objPos);
 		setEntry->index = setEntry->frames[0];
 		if ((setEntry->type == 0) && (setEntry->priority != 5) && (setEntry->priority != 6)) {
 			x += data.word(kMapadx);
@@ -157,8 +157,8 @@ void DreamBase::showAllObs() {
 		} else
 			makeBackOb(setEntry, x, y);
 
-		objPos->index = i;
-		++objPos;
+		objPos.index = i;
+		_setList.push_back(objPos);
 	}
 }
 
@@ -218,8 +218,7 @@ void DreamBase::calcMapAd() {
 void DreamBase::showAllFree() {
 	const unsigned int count = 80;
 
-	ObjPos *objPos = (ObjPos *)getSegment(data.word(kBuffers)).ptr(kFreelist, count * sizeof(ObjPos));
-	memset(objPos, 0xff, count * sizeof(ObjPos));
+	_freeList.clear();
 
 	const DynObject *freeObjects = (const DynObject *)getSegment(data.word(kFreedat)).ptr(0, 0);
 	const Frame *frameBase = (const Frame *)getSegment(data.word(kFreeframes)).ptr(0, 0);
@@ -228,15 +227,16 @@ void DreamBase::showAllFree() {
 		uint8 mapAd = getMapAd(freeObjects[i].mapad, &x, &y);
 		if (mapAd != 0) {
 			uint8 width, height;
+			ObjPos objPos;
 			uint16 currentFrame = 3 * i;
-			calcFrFrame(frameBase, currentFrame, &width, &height, x, y, objPos);
+			calcFrFrame(frameBase, currentFrame, &width, &height, x, y, &objPos);
 			if ((width != 0) || (height != 0)) {
 				x += data.word(kMapadx);
 				y += data.word(kMapady);
 				assert(currentFrame < 256);
 				showFrame(frameBase, x, y, currentFrame, 0);
-				objPos->index = i;
-				++objPos;
+				objPos.index = i;
+				_freeList.push_back(objPos);
 			}
 		}
 	}
@@ -261,8 +261,7 @@ void DreamBase::drawFlags() {
 void DreamBase::showAllEx() {
 	const unsigned int count = 100;
 
-	ObjPos *objPos = (ObjPos *)getSegment(data.word(kBuffers)).ptr(kExlist, count * sizeof(ObjPos));
-	memset(objPos, 0xff, count * sizeof(ObjPos));
+	_exList.clear();
 
 	DynObject *objects = (DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, sizeof(DynObject));
 	const Frame *frameBase = (const Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
@@ -276,13 +275,14 @@ void DreamBase::showAllEx() {
 		if (getMapAd(object->mapad, &x, &y) == 0)
 			continue;
 		uint8 width, height;
+		ObjPos objPos;
 		uint16 currentFrame = 3 * i;
-		calcFrFrame(frameBase, currentFrame, &width, &height, x, y, objPos);
+		calcFrFrame(frameBase, currentFrame, &width, &height, x, y, &objPos);
 		if ((width != 0) || (height != 0)) {
 			assert(currentFrame < 256);
 			showFrame(frameBase, x + data.word(kMapadx), y + data.word(kMapady), currentFrame, 0);
-			objPos->index = i;
-			++objPos;
+			objPos.index = i;
+			_exList.push_back(objPos);
 		}
 	}
 }
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index b4265e904a..b739c9cbbe 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -72,6 +72,9 @@ protected:
 	uint8 _startPal[3*256];
 	uint8 _endPal[3*256];
 	uint8 _mainPal[3*256];
+	Common::List<ObjPos> _setList;
+	Common::List<ObjPos> _freeList;
+	Common::List<ObjPos> _exList;
 	Common::List<People> _peopleList;
 
 public:
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 9969ac775a..3e7a694c91 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1188,12 +1188,13 @@ void DreamGenContext::checkIfFree() {
 }
 
 bool DreamGenContext::checkIfFree(uint8 x, uint8 y) {
-	const ObjPos *freeList = (const ObjPos *)getSegment(data.word(kBuffers)).ptr(kFreelist, 80 * sizeof(ObjPos));
-	for (size_t i = 0; i < 80; ++i) {
-		const ObjPos *objPos = freeList + 79 - i;
-		if (objPos->index == 0xff || !objPos->contains(x,y))
+	Common::List<ObjPos>::const_iterator i;
+	for (i = _freeList.reverse_begin(); i != _freeList.end(); --i) {
+		const ObjPos &pos = *i;
+		assert(pos.index != 0xff);
+		if (!pos.contains(x,y))
 			continue;
-		obName(objPos->index, 2);
+		obName(pos.index, 2);
 		return true;
 	}
 	return false;
@@ -1204,12 +1205,13 @@ void DreamGenContext::checkIfEx() {
 }
 
 bool DreamGenContext::checkIfEx(uint8 x, uint8 y) {
-	const ObjPos *exList = (const ObjPos *)getSegment(data.word(kBuffers)).ptr(kExlist, 100 * sizeof(ObjPos));
-	for (size_t i = 0; i < 100; ++i) {
-		const ObjPos *objPos = exList + 99 - i;
-		if (objPos->index == 0xff || !objPos->contains(x,y))
+	Common::List<ObjPos>::const_iterator i;
+	for (i = _exList.reverse_begin(); i != _exList.end(); --i) {
+		const ObjPos &pos = *i;
+		assert(pos.index != 0xff);
+		if (!pos.contains(x,y))
 			continue;
-		obName(objPos->index, 4);
+		obName(pos.index, 4);
 		return true;
 	}
 	return false;
@@ -1781,16 +1783,17 @@ void DreamBase::showIcon() {
 }
 
 bool DreamGenContext::checkIfSet(uint8 x, uint8 y) {
-	const ObjPos *setList = (const ObjPos *)getSegment(data.word(kBuffers)).ptr(kSetlist, sizeof(ObjPos) * 128);
-	for (size_t i = 0; i < 128; ++i) {
-		const ObjPos *pos = setList + 127 - i;
-		if (pos->index == 0xff || !pos->contains(x,y))
+	Common::List<ObjPos>::const_iterator i;
+	for (i = _setList.reverse_begin(); i != _setList.end(); --i) {
+		const ObjPos &pos = *i;
+		assert(pos.index != 0xff);
+		if (!pos.contains(x,y))
 			continue;
-		if (!pixelCheckSet(pos, x, y))
+		if (!pixelCheckSet(&pos, x, y))
 			continue;
-		if (!isItDescribed(pos))
+		if (!isItDescribed(&pos))
 			continue;
-		obName(pos->index, 1);
+		obName(pos.index, 1);
 		return true;
 	}
 	return false;
-- 
cgit v1.2.3


From 109acaab3cb9b75937e9521b582476f544ebfe71 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 23 Dec 2011 22:51:32 +0100
Subject: DREAMWEB: Move mapflags out of buffers

---
 engines/dreamweb/backdrop.cpp | 12 +++++-------
 engines/dreamweb/dreambase.h  |  1 +
 engines/dreamweb/sprite.cpp   |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 9fe3c74150..b806ba43a0 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -179,22 +179,20 @@ bool DreamBase::addLength(const uint8 *mapFlags) {
 }
 
 void DreamBase::getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize) {
-	const uint8 *mapFlags = getSegment(data.word(kBuffers)).ptr(kMapflags, 0);
-
 	uint8 yStart = 0;
-	while (! addAlong(mapFlags + 3 * 11 * yStart))
+	while (! addAlong(_mapFlags + 3 * 11 * yStart))
 		++yStart;
 
 	uint8 xStart = 0;
-	while (! addLength(mapFlags + 3 * xStart))
+	while (! addLength(_mapFlags + 3 * xStart))
 		++xStart;
 
 	uint8 yEnd = 10;
-	while (! addAlong(mapFlags + 3 * 11 * (yEnd - 1)))
+	while (! addAlong(_mapFlags + 3 * 11 * (yEnd - 1)))
 		--yEnd;
 
 	uint8 xEnd = 11;
-	while (! addLength(mapFlags + 3 * (xEnd - 1)))
+	while (! addLength(_mapFlags + 3 * (xEnd - 1)))
 		--xEnd;
 
 	*mapXstart = xStart;
@@ -243,7 +241,7 @@ void DreamBase::showAllFree() {
 }
 
 void DreamBase::drawFlags() {
-	uint8 *mapFlags = getSegment(data.word(kBuffers)).ptr(kMapflags, 0);
+	uint8 *mapFlags = _mapFlags;
 	const uint8 *mapData = getSegment(data.word(kMapdata)).ptr(kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx), 0);
 	const uint8 *backdropFlags = getSegment(data.word(kBackdrop)).ptr(kFlags, 0);
 
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index b739c9cbbe..7816308e03 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -69,6 +69,7 @@ protected:
 	ReelRoutine *_personData;
 
 	// from Buffers
+	uint8 _mapFlags[11*10*3];
 	uint8 _startPal[3*256];
 	uint8 _endPal[3*256];
 	uint8 _mainPal[3*256];
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index cc6b09fd68..17d3ccd765 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -552,7 +552,7 @@ void DreamGenContext::checkOne() {
 void DreamBase::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY) {
 	*flagX = x / 16;
 	*flagY = y / 16;
-	const uint8 *tileData = getSegment(data.word(kBuffers)).ptr(kMapflags + (*flagY * 11 + *flagX) * 3, 3);
+	const uint8 *tileData = &_mapFlags[(*flagY * 11 + *flagX) * 3];
 	*flag = tileData[0];
 	*flagEx = tileData[1];
 	*type = tileData[2];
-- 
cgit v1.2.3


From 814793de49f8002fbac17fdd604399a4f694ddf8 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 23 Dec 2011 22:53:29 +0100
Subject: DREAMWEB: Move rainlist out of buffers

---
 engines/dreamweb/dreambase.h |  3 ++-
 engines/dreamweb/sprite.cpp  | 52 ++++++++++++++++++++------------------------
 engines/dreamweb/structs.h   |  5 +----
 3 files changed, 27 insertions(+), 33 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 7816308e03..3428a8cef8 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -77,6 +77,7 @@ protected:
 	Common::List<ObjPos> _freeList;
 	Common::List<ObjPos> _exList;
 	Common::List<People> _peopleList;
+	Common::List<Rain> _rainList;
 
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
@@ -317,7 +318,7 @@ public:
 	void checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY);
 
 	uint8 getBlockOfPixel(uint8 x, uint8 y);
-	Rain *splitIntoLines(uint8 x, uint8 y, Rain *rain);
+	void splitIntoLines(uint8 x, uint8 y);
 	void initRain();
 
 	void intro1Text();
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 17d3ccd765..754f91401b 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -474,25 +474,26 @@ const Frame *DreamBase::getReelFrameAX(uint16 frame) {
 }
 
 void DreamBase::showRain() {
-	Rain *rain = (Rain *)getSegment(data.word(kBuffers)).ptr(kRainlist, 0);
+	Common::List<Rain>::iterator i;
 
 	// Do nothing if there's no rain at all
-	if (rain->x == 255)
+	if (_rainList.empty())
 		return;
 
 	const Frame *frame = (const Frame *)getSegment(data.word(kMainsprites)).ptr(58 * sizeof(Frame), sizeof(Frame));
 	const uint8 *frameData = getSegment(data.word(kMainsprites)).ptr(kFrframes + frame->ptr(), 512);
 
-	for (; rain->x != 255; ++rain) {
-		uint16 y = rain->y + data.word(kMapady) + data.word(kMapystart);
-		uint16 x = rain->x + data.word(kMapadx) + data.word(kMapxstart);
-		uint16 size = rain->size;
-		uint16 offset = (rain->w3() - rain->b5) & 511;
-		rain->setW3(offset);
+	for (i = _rainList.begin(); i != _rainList.end(); ++i) {
+		Rain &rain = *i;
+		uint16 y = rain.y + data.word(kMapady) + data.word(kMapystart);
+		uint16 x = rain.x + data.word(kMapadx) + data.word(kMapxstart);
+		uint16 size = rain.size;
+		uint16 offset = (rain.w3 - rain.b5) & 511;
+		rain.w3 = offset;
 		const uint8 *src = frameData + offset;
 		uint8 *dst = workspace() + y * 320 + x;
-		for (uint16 i = 0; i < size; ++i) {
-			uint8 v = src[i];
+		for (uint16 j = 0; j < size; ++j) {
+			uint8 v = src[j];
 			if (v != 0)
 				*dst = v;
 			dst += 320-1; // advance diagonally
@@ -567,18 +568,20 @@ uint8 DreamBase::getBlockOfPixel(uint8 x, uint8 y) {
 		return type;
 }
 
-Rain *DreamBase::splitIntoLines(uint8 x, uint8 y, Rain *rain) {
+void DreamBase::splitIntoLines(uint8 x, uint8 y) {
 	do {
+		Rain rain;
+
 		// Look for line start
 		while (!getBlockOfPixel(x, y)) {
 			--x;
 			++y;
 			if (x == 0 || y >= data.byte(kMapysize))
-				return rain;
+				return;
 		}
 
-		rain->x = x;
-		rain->y = y;
+		rain.x = x;
+		rain.y = y;
 
 		uint8 length = 1;
 
@@ -591,14 +594,11 @@ Rain *DreamBase::splitIntoLines(uint8 x, uint8 y, Rain *rain) {
 			++length;
 		}
 
-		rain->size = length;
-		rain->w3_lo = engine->randomNumber();
-		rain->w3_hi = engine->randomNumber();
-		rain->b5 = (engine->randomNumber() & 3) + 4;
-		++rain;
+		rain.size = length;
+		rain.w3 = (engine->randomNumber() << 8) | engine->randomNumber();
+		rain.b5 = (engine->randomNumber() & 3) + 4;
+		_rainList.push_back(rain);
 	} while (x > 0 && y < data.byte(kMapysize));
-
-	return rain;
 }
 
 struct RainLocation {
@@ -640,8 +640,7 @@ static const RainLocation rainLocationList[] = {
 
 void DreamBase::initRain() {
 	const RainLocation *r = rainLocationList;
-	Rain *rainList = (Rain *)getSegment(data.word(kBuffers)).ptr(kRainlist, 0);
-	Rain *rain = rainList;
+	_rainList.clear();
 
 	uint8 rainSpacing = 0;
 
@@ -656,7 +655,6 @@ void DreamBase::initRain() {
 
 	if (rainSpacing == 0) {
 		// location not found in rainLocationList: no rain
-		rain->x = 0xff;
 		return;
 	}
 
@@ -672,7 +670,7 @@ void DreamBase::initRain() {
 		if (x >= data.byte(kMapxsize))
 			break;
 
-		rain = splitIntoLines(x, 0, rain);
+		splitIntoLines(x, 0);
 	} while (true);
 
 	// start lines of rain from side of screen
@@ -687,10 +685,8 @@ void DreamBase::initRain() {
 		if (y >= data.byte(kMapysize))
 			break;
 
-		rain = splitIntoLines(data.byte(kMapxsize) - 1, y, rain);
+		splitIntoLines(data.byte(kMapxsize) - 1, y);
 	} while (true);
-
-	rain->x = 0xff;
 }
 
 void DreamBase::intro1Text() {
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 61400455d1..558b000f19 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -213,10 +213,7 @@ struct Rain {
 	uint8 x;
 	uint8 y;
 	uint8 size;
-	uint8 w3_lo;
-	uint8 w3_hi;
-	uint16 w3() const { return READ_LE_UINT16(&w3_lo); }
-	void setW3(uint16 v) { WRITE_LE_UINT16(&w3_lo, v); }
+	uint16 w3;
 	uint8 b5;
 };
 
-- 
cgit v1.2.3


From 10774daa586008af8e327a58a3ee910482a7cbfb Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 23 Dec 2011 22:56:39 +0100
Subject: DREAMWEB: Move backgrounds, zoom space, initial vars out of buffers

---
 engines/dreamweb/dreambase.h | 16 +++++++++++++++-
 engines/dreamweb/keypad.cpp  |  4 ++--
 engines/dreamweb/monitor.cpp |  4 ++--
 engines/dreamweb/stubs.cpp   | 45 ++++++++++++++++++++------------------------
 4 files changed, 39 insertions(+), 30 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 3428a8cef8..26f0395732 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -35,8 +35,17 @@ namespace DreamWeb {
 
 namespace DreamGen {
 
-
+ // Note: duplication from dreamgen.h
 const unsigned int kNumReelRoutines = 57;
+const unsigned int kUnderTextSizeX = 180;
+const unsigned int kUnderTextSizeY = 10;
+const unsigned int kUnderTimedTextSizeY = 24;
+const unsigned int kUnderTextSizeX_f = 228; // foreign version
+const unsigned int kUnderTextSizeY_f = 13; // foreign version
+const unsigned int kUnderTimedTextSizeY_f = 30;
+const unsigned int kUnderTextBufSize = kUnderTextSizeX_f * kUnderTextSizeY_f;
+const unsigned int kUnderTimedTextBufSize = 256 * kUnderTextSizeY_f;
+const unsigned int kLengthOfVars = 68;
 
 /**
  * This class is one of the parent classes of DreamGenContext. Its sole purpose
@@ -69,6 +78,8 @@ protected:
 	ReelRoutine *_personData;
 
 	// from Buffers
+	uint8 _textUnder[kUnderTextBufSize];
+	uint8 _pointerBack[32*32];
 	uint8 _mapFlags[11*10*3];
 	uint8 _startPal[3*256];
 	uint8 _endPal[3*256];
@@ -77,7 +88,10 @@ protected:
 	Common::List<ObjPos> _freeList;
 	Common::List<ObjPos> _exList;
 	Common::List<People> _peopleList;
+	uint8 _zoomSpace[46*40];
+	uint8 _underTimedText[kUnderTimedTextBufSize];
 	Common::List<Rain> _rainList;
+	uint8 _initialVars[kLengthOfVars]; // TODO: This shouldn't be necessary
 
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 6e6941918f..d0ef260e90 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -25,11 +25,11 @@
 namespace DreamGen {
 
 void DreamBase::getUnderMenu() {
-	multiGet(getSegment(data.word(kBuffers)).ptr(kUndertimedtext, 0), kMenux, kMenuy, 48, 48);
+	multiGet(_underTimedText, kMenux, kMenuy, 48, 48);
 }
 
 void DreamBase::putUnderMenu() {
-	multiPut(getSegment(data.word(kBuffers)).ptr(kUndertimedtext, 0), kMenux, kMenuy, 48, 48);
+	multiPut(_underTimedText, kMenux, kMenuy, 48, 48);
 }
 
 void DreamBase::singleKey(uint8 key, uint16 x, uint16 y) {
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 665265052a..9a1076a92f 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -267,7 +267,7 @@ void DreamBase::printCurs() {
 		height = 11;
 	} else
 		height = 8;
-	multiGet(textUnder(), x, y, 6, height);
+	multiGet(_textUnder, x, y, 6, height);
 	++data.word(kMaintimer);
 	if ((data.word(kMaintimer) & 16) == 0)
 		showFrame(engine->tempCharset(), x, y, '/' - 32, 0);
@@ -284,7 +284,7 @@ void DreamBase::delCurs() {
 		height = 11;
 	} else
 		height = 8;
-	multiPut(textUnder(), x, y, width, height);
+	multiPut(_textUnder, x, y, width, height);
 	multiDump(x, y, width, height);
 }
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 3e7a694c91..388244676d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -740,10 +740,6 @@ void DreamBase::switchRyanOff() {
 	data.byte(kRyanon) = 1;
 }
 
-uint8 *DreamBase::textUnder() {
-	return getSegment(data.word(kBuffers)).ptr(kTextunder, 0);
-}
-
 uint16 DreamBase::standardLoad(const char *fileName, uint16 *outSizeInBytes) {
 	FileHeader header;
 
@@ -833,17 +829,17 @@ void DreamBase::dumpTextLine() {
 }
 
 void DreamBase::getUnderTimed() {
-	uint16 y = data.byte(kTimedy);
 	if (data.byte(kForeignrelease))
-		y -= 3;
-	multiGet(getSegment(data.word(kBuffers)).ptr(kUndertimedtext, 0), data.byte(kTimedx), y, 240, kUndertimedysize);
+		multiGet(_underTimedText, data.byte(kTimedx), data.byte(kTimedy) - 3, 240, kUnderTimedTextSizeY_f);
+	else
+		multiGet(_underTimedText, data.byte(kTimedx), data.byte(kTimedy), 240, kUnderTimedTextSizeY);
 }
 
 void DreamBase::putUnderTimed() {
-	uint16 y = data.byte(kTimedy);
 	if (data.byte(kForeignrelease))
-		y -= 3;
-	multiPut(getSegment(data.word(kBuffers)).ptr(kUndertimedtext, 0), data.byte(kTimedx), y, 240, kUndertimedysize);
+		multiPut(_underTimedText, data.byte(kTimedx), data.byte(kTimedy) - 3, 240, kUnderTimedTextSizeY_f);
+	else
+		multiPut(_underTimedText, data.byte(kTimedx), data.byte(kTimedy), 240, kUnderTimedTextSizeY);
 }
 
 void DreamGenContext::triggerMessage(uint16 index) {
@@ -1131,11 +1127,10 @@ void DreamBase::crosshair() {
 }
 
 void DreamBase::delTextLine() {
-	uint16 x = data.word(kTextaddressx);
-	uint16 y = data.word(kTextaddressy);
-	if (data.byte(kForeignrelease) != 0)
-		y -= 3;
-	multiPut(textUnder(), x, y, kUndertextsizex, kUndertextsizey);
+	if (data.byte(kForeignrelease))
+		multiPut(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy) - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
+	else
+		multiPut(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy), kUnderTextSizeX, kUnderTextSizeY);
 }
 
 void DreamGenContext::commandOnly() {
@@ -1514,7 +1509,7 @@ void DreamBase::delPointer() {
 	data.word(kDelherey) = data.word(kOldpointery);
 	data.byte(kDelxs) = data.byte(kPointerxs);
 	data.byte(kDelys) = data.byte(kPointerys);
-	multiPut(getSegment(data.word(kBuffers)).ptr(kPointerback, 0), data.word(kDelherex), data.word(kDelherey), data.byte(kPointerxs), data.byte(kPointerys));
+	multiPut(_pointerBack, data.word(kDelherex), data.word(kDelherey), data.byte(kPointerxs), data.byte(kPointerys));
 }
 
 void DreamBase::showBlink() {
@@ -1594,7 +1589,7 @@ void DreamBase::showPointer() {
 		uint16 yMin = (y >= height / 2) ? y - height / 2 : 0;
 		data.word(kOldpointerx) = xMin;
 		data.word(kOldpointery) = yMin;
-		multiGet(getSegment(data.word(kBuffers)).ptr(kPointerback, 0), xMin, yMin, width, height);
+		multiGet(_pointerBack, xMin, yMin, width, height);
 		showFrame(frames, x, y, 3 * data.byte(kItemframe) + 1, 128);
 		showFrame(engine->icons1(), x, y, 3, 128);
 	} else {
@@ -1607,7 +1602,7 @@ void DreamBase::showPointer() {
 			height = 12;
 		data.byte(kPointerxs) = width;
 		data.byte(kPointerys) = height;
-		multiGet(getSegment(data.word(kBuffers)).ptr(kPointerback, 0), x, y, width, height);
+		multiGet(_pointerBack, x, y, width, height);
 		showFrame(engine->icons1(), x, y, data.byte(kPointerframe) + 20, 0);
 	}
 }
@@ -3059,18 +3054,18 @@ void DreamBase::showDiary() {
 }
 
 void DreamBase::underTextLine() {
-	uint16 y = data.word(kTextaddressy);
 	if (data.byte(kForeignrelease))
-		y -= 3;
-	multiGet(textUnder(), data.byte(kTextaddressx), y, kUndertextsizex, kUndertextsizey);
+		multiGet(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy) - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
+	else
+		multiGet(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy), kUnderTextSizeX, kUnderTextSizeY);
 }
 
 void DreamBase::getUnderZoom() {
-	multiGet(getSegment(data.word(kBuffers)).ptr(kZoomspace, 0), kZoomx + 5, kZoomy + 4, 46, 40);
+	multiGet(_zoomSpace, kZoomx + 5, kZoomy + 4, 46, 40);
 }
 
 void DreamBase::putUnderZoom() {
-	multiPut(getSegment(data.word(kBuffers)).ptr(kZoomspace, 0), kZoomx + 5, kZoomy + 4, 46, 40);
+	multiPut(_zoomSpace, kZoomx + 5, kZoomy + 4, 46, 40);
 }
 
 void DreamBase::showWatchReel() {
@@ -3697,7 +3692,7 @@ void DreamBase::clearBuffers() {
 
 	memset(getSegment(data.word(kExtras)).ptr(0, kLengthofextra), 0xFF, kLengthofextra);
 
-	memcpy(getSegment(data.word(kBuffers)).ptr(kInitialvars, kLengthofvars), data.ptr(kStartvars, kLengthofvars), kLengthofvars);
+	memcpy(_initialVars, data.ptr(kStartvars, kLengthofvars), kLengthofvars);
 
 	clearChanges();
 }
@@ -3707,7 +3702,7 @@ void DreamBase::clearChanges() {
 
 	setupInitialReelRoutines();
 
-	memcpy(data.ptr(kStartvars, kLengthofvars), getSegment(data.word(kBuffers)).ptr(kInitialvars, kLengthofvars), kLengthofvars);
+	memcpy(data.ptr(kStartvars, kLengthofvars), _initialVars, kLengthofvars);
 
 	data.byte(kExpos) = 0;
 	data.word(kExframepos) = 0;
-- 
cgit v1.2.3


From bbdbffc10744e4d9e789150ba151c1884c740ae0 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 23 Dec 2011 22:58:31 +0100
Subject: DREAMWEB: Move changes out of buffers

---
 engines/dreamweb/dreambase.h  | 6 ++++++
 engines/dreamweb/saveload.cpp | 4 ++--
 engines/dreamweb/stubs.cpp    | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 26f0395732..1601cb44b5 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -46,6 +46,7 @@ const unsigned int kUnderTimedTextSizeY_f = 30;
 const unsigned int kUnderTextBufSize = kUnderTextSizeX_f * kUnderTextSizeY_f;
 const unsigned int kUnderTimedTextBufSize = 256 * kUnderTextSizeY_f;
 const unsigned int kLengthOfVars = 68;
+const unsigned int kNumChanges = 250;
 
 /**
  * This class is one of the parent classes of DreamGenContext. Its sole purpose
@@ -79,16 +80,21 @@ protected:
 
 	// from Buffers
 	uint8 _textUnder[kUnderTextBufSize];
+	// _openInvList (see fillOpen/findOpenPos)
+	// _ryanInvList (see findInvPos/findInvPosCPP)
 	uint8 _pointerBack[32*32];
 	uint8 _mapFlags[11*10*3];
 	uint8 _startPal[3*256];
 	uint8 _endPal[3*256];
 	uint8 _mainPal[3*256];
+	// _spriteTable
 	Common::List<ObjPos> _setList;
 	Common::List<ObjPos> _freeList;
 	Common::List<ObjPos> _exList;
 	Common::List<People> _peopleList;
 	uint8 _zoomSpace[46*40];
+	// _printedList (unused?)
+	Change _listOfChanges[kNumChanges]; // Note: this array is saved
 	uint8 _underTimedText[kUnderTimedTextBufSize];
 	Common::List<Rain> _rainList;
 	uint8 _initialVars[kLengthOfVars]; // TODO: This shouldn't be necessary
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index b12c668d82..53c2f55d38 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -479,7 +479,7 @@ void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 	outSaveFile->write(descbuf, len[0]);
 	outSaveFile->write(data.ptr(kStartvars, len[1]), len[1]);
 	outSaveFile->write(getSegment(data.word(kExtras)).ptr(kExframedata, len[2]), len[2]);
-	outSaveFile->write(getSegment(data.word(kBuffers)).ptr(kListofchanges, len[3]), len[3]);
+	outSaveFile->write(_listOfChanges, len[3]);
 
 	// len[4] == 48, which is sizeof(Room) plus 16 for 'Roomscango'
 	outSaveFile->write((const uint8 *)&madeUpRoom, sizeof(Room));
@@ -545,7 +545,7 @@ void DreamBase::loadPosition(unsigned int slot) {
 	}
 	inSaveFile->read(data.ptr(kStartvars, len[1]), len[1]);
 	inSaveFile->read(getSegment(data.word(kExtras)).ptr(kExframedata, len[2]), len[2]);
-	inSaveFile->read(getSegment(data.word(kBuffers)).ptr(kListofchanges, len[3]), len[3]);
+	inSaveFile->read(_listOfChanges, len[3]);
 
 	// len[4] == 48, which is sizeof(Room) plus 16 for 'Roomscango'
 	// Note: the values read into g_madeUpRoomDat are only used in actualLoad,
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 388244676d..dd1a03411f 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1284,7 +1284,7 @@ void DreamBase::walkToText() {
 }
 
 void DreamBase::findOrMake(uint8 index, uint8 value, uint8 type) {
-	Change *change = (Change *)getSegment(data.word(kBuffers)).ptr(kListofchanges, sizeof(Change));
+	Change *change = _listOfChanges;
 	for (; change->index != 0xff; ++change) {
 		if (index == change->index && data.byte(kReallocation) == change->location && type == change->type) {
 			change->value = value;
@@ -1299,7 +1299,7 @@ void DreamBase::findOrMake(uint8 index, uint8 value, uint8 type) {
 }
 
 void DreamBase::setAllChanges() {
-	Change *change = (Change *)getSegment(data.word(kBuffers)).ptr(kListofchanges, sizeof(Change));
+	Change *change = _listOfChanges;
 	for (; change->index != 0xff; ++change)
 		if (change->location == data.byte(kReallocation))
 			doChange(change->index, change->value, change->type);
@@ -3698,7 +3698,7 @@ void DreamBase::clearBuffers() {
 }
 
 void DreamBase::clearChanges() {
-	memset(getSegment(data.word(kBuffers)).ptr(kListofchanges, 4*kNumchanges), 0xFF, 4*kNumchanges);
+	memset(_listOfChanges, 0xFF, 4*kNumchanges);
 
 	setupInitialReelRoutines();
 
-- 
cgit v1.2.3


From 8e79608a1de77c54cc6bf0eb23b32b1cc3175677 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 23 Dec 2011 22:58:54 +0100
Subject: DREAMWEB: Move sprite table out of buffers

---
 engines/dreamweb/backdrop.cpp |  2 +-
 engines/dreamweb/dreambase.h  |  3 +-
 engines/dreamweb/sprite.cpp   | 67 +++++++++++++++++++++----------------------
 engines/dreamweb/structs.h    |  6 ----
 engines/dreamweb/stubs.cpp    | 17 +++++++----
 5 files changed, 45 insertions(+), 50 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index b806ba43a0..875e16805e 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -121,7 +121,7 @@ void DreamBase::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
 	uint16 objDataOffset = (uint8 *)objData - getSegment(data.word(kSetdat)).ptr(0, 0);
 	assert(objDataOffset % sizeof(SetObject) == 0);
 	assert(objDataOffset < 128 * sizeof(SetObject));
-	sprite->setObjData(objDataOffset);
+	sprite->_objData = objDataOffset;
 	if (priority == 255)
 		priority = 0;
 	sprite->priority = priority;
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 1601cb44b5..32b36a56da 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -87,7 +87,7 @@ protected:
 	uint8 _startPal[3*256];
 	uint8 _endPal[3*256];
 	uint8 _mainPal[3*256];
-	// _spriteTable
+	Common::List<Sprite> _spriteTable;
 	Common::List<ObjPos> _setList;
 	Common::List<ObjPos> _freeList;
 	Common::List<ObjPos> _exList;
@@ -311,7 +311,6 @@ public:
 	void playChannel1(uint8 index);
 
 	// from sprite.cpp
-	Sprite *spriteTable();
 	void printSprites();
 	void printASprite(const Sprite *sprite);
 	void clearSprites();
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 754f91401b..e2e27bc417 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -24,18 +24,12 @@
 
 namespace DreamGen {
 
-Sprite *DreamBase::spriteTable() {
-	Sprite *sprite = (Sprite *)getSegment(data.word(kBuffers)).ptr(kSpritetable, 16 * sizeof(Sprite));
-	return sprite;
-}
-
 void DreamBase::printSprites() {
 	for (size_t priority = 0; priority < 7; ++priority) {
-		Sprite *sprites = spriteTable();
-		for (size_t j = 0; j < 16; ++j) {
-			const Sprite &sprite = sprites[j];
-			if (sprite.updateCallback() == 0x0ffff)
-				continue;
+		Common::List<Sprite>::const_iterator i;
+		for (i = _spriteTable.begin(); i != _spriteTable.end(); ++i) {
+			const Sprite &sprite = *i;
+			assert(sprite._updateCallback != 0x0ffff);
 			if (priority != sprite.priority)
 				continue;
 			if (sprite.hidden == 1)
@@ -64,24 +58,27 @@ void DreamBase::printASprite(const Sprite *sprite) {
 		c = 8;
 	else
 		c = 0;
-	showFrame((const Frame *)getSegment(sprite->frameData()).ptr(0, 0), x, y, sprite->frameNumber, c);
+	showFrame((const Frame *)getSegment(sprite->_frameData).ptr(0, 0), x, y, sprite->frameNumber, c);
 }
 
 void DreamBase::clearSprites() {
-	memset(spriteTable(), 0xff, sizeof(Sprite) * 16);
+	_spriteTable.clear();
 }
 
 Sprite *DreamBase::makeSprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi) {
-	Sprite *sprite = spriteTable();
-	while (sprite->frameNumber != 0xff) { // NB: No boundchecking in the original code either
-		++sprite;
-	}
+	// Note: the original didn't append sprites here, but filled up the
+	// first unused entry. This can change the order of entries, but since they
+	// are drawn based on the priority field, this shouldn't matter.
+	_spriteTable.push_back(Sprite());
+	Sprite *sprite = &_spriteTable.back();
+
+	memset(sprite, 0xff, sizeof(Sprite));
 
-	sprite->setUpdateCallback(updateCallback);
+	sprite->_updateCallback = updateCallback;
 	sprite->x = x;
 	sprite->y = y;
-	sprite->setFrameData(frameData);
-	WRITE_LE_UINT16(&sprite->w8, somethingInDi);
+	sprite->_frameData = frameData;
+	sprite->w8 = somethingInDi;
 	sprite->w2 = 0xffff;
 	sprite->frameNumber = 0;
 	sprite->delay = 0;
@@ -89,25 +86,25 @@ Sprite *DreamBase::makeSprite(uint8 x, uint8 y, uint16 updateCallback, uint16 fr
 }
 
 void DreamBase::spriteUpdate() {
-	Sprite *sprites = spriteTable();
-	sprites[0].hidden = data.byte(kRyanon);
-
-	Sprite *sprite = sprites;
-	for (size_t i=0; i < 16; ++i) {
-		uint16 updateCallback = sprite->updateCallback();
-		if (updateCallback != 0xffff) {
-			sprite->w24 = sprite->w2;
-			if (updateCallback == addr_mainman) // NB : Let's consider the callback as an enum while more code is not ported to C++
-				mainMan(sprite);
-			else {
-				assert(updateCallback == addr_backobject);
-				backObject(sprite);
-			}
+	// During the intro the sprite table can be empty
+	if (!_spriteTable.empty())
+		_spriteTable.front().hidden = data.byte(kRyanon);
+
+	Common::List<Sprite>::iterator i;
+	for (i = _spriteTable.begin(); i != _spriteTable.end(); ++i) {
+		Sprite &sprite = *i;
+		assert(sprite._updateCallback != 0xffff);
+
+		sprite.w24 = sprite.w2;
+		if (sprite._updateCallback == addr_mainman) // NB : Let's consider the callback as an enum while more code is not ported to C++
+			mainMan(&sprite);
+		else {
+			assert(sprite._updateCallback == addr_backobject);
+			backObject(&sprite);
 		}
 	
 		if (data.byte(kNowinnewroom) == 1)
 			break;
-		++sprite;
 	}
 }
 
@@ -228,7 +225,7 @@ void DreamBase::aboutTurn(Sprite *sprite) {
 }
 
 void DreamBase::backObject(Sprite *sprite) {
-	SetObject *objData = (SetObject *)getSegment(data.word(kSetdat)).ptr(sprite->objData(), 0);
+	SetObject *objData = (SetObject *)getSegment(data.word(kSetdat)).ptr(sprite->_objData, 0);
 
 	if (sprite->delay != 0) {
 		--sprite->delay;
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 558b000f19..4d1b1420f9 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -30,13 +30,9 @@ namespace DreamGen {
 
 struct Sprite {
 	uint16 _updateCallback;
-	uint16 updateCallback() const { return READ_LE_UINT16(&_updateCallback); }
-	void setUpdateCallback(uint16 v) { WRITE_LE_UINT16(&_updateCallback, v); }
 	uint16 w2;
 	uint16 w4;
 	uint16 _frameData;
-	uint16 frameData() const { return READ_LE_UINT16(&_frameData); }
-	void setFrameData(uint16 v) { WRITE_LE_UINT16(&_frameData, v); }
 	uint16 w8;
 	uint8  x;
 	uint8  y;
@@ -48,8 +44,6 @@ struct Sprite {
 	uint8  delay;
 	uint8  animFrame; // index into SetObject::frames
 	uint16 _objData;
-	uint16 objData() const { return READ_LE_UINT16(&_objData); }
-	void setObjData(uint16 v) { WRITE_LE_UINT16(&_objData, v); }
 	uint8  speed;
 	uint8  priority;
 	uint16 w24;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index dd1a03411f..b302bce18b 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -981,12 +981,17 @@ void DreamBase::eraseOldObs() {
 	if (data.byte(kNewobs) == 0)
 		return;
 
-	Sprite *sprites = spriteTable();
-	for (size_t i = 0; i < 16; ++i) {
-		Sprite &sprite = sprites[i];
-		if (sprite.objData() != 0xffff) {
-			memset(&sprite, 0xff, sizeof(Sprite));
-		}
+	// Note: the original didn't delete sprites here, but marked the
+	// entries as unused, to be filled again by makeSprite. This can
+	// change the order of entries, but since they are drawn based on the
+	// priority field, this shouldn't matter.
+	Common::List<Sprite>::iterator i;
+	for (i = _spriteTable.begin(); i != _spriteTable.end(); ) {
+		Sprite &sprite = *i;
+		if (sprite._objData != 0xffff)
+			i = _spriteTable.erase(i);
+		else
+			++i;
 	}
 }
 
-- 
cgit v1.2.3


From c3fad04dea55afe9412c7518c71fea22a0b9819b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 23 Dec 2011 23:58:06 +0100
Subject: TSAGE: R2R - Implement scene 3260

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 177 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h   |  48 +++++++
 3 files changed, 227 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 6f26054423..dbde0ee27a 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -207,6 +207,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		return new Scene3250();
 	case 3255:
 	case 3260:
+		// Computer room
+		return new Scene3260();
 	case 3275:
 	case 3350:
 	case 3375:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 298093be3a..8b8d8c479c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1256,5 +1256,182 @@ void Scene3250::dispatch() {
 	Scene::dispatch();
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3260 - Computer room
+ *
+ *--------------------------------------------------------------------------*/
+bool Scene3260::Actor13::startAction(CursorType action, Event &event) {
+	Scene3260 *scene = (Scene3260 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 3271;
+	scene->setAction(&scene->_sequenceManager, scene, 3271, &R2_GLOBALS._player, &scene->_actor13, NULL);
+	return true;
+}
+
+bool Scene3260::Actor14::startAction(CursorType action, Event &event) {
+	Scene3260 *scene = (Scene3260 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 3272;
+	scene->setAction(&scene->_sequenceManager, scene, 3272, &R2_GLOBALS._player, &scene->_actor14, NULL);
+	return true;
+}
+
+void Scene3260::Action1::signal() {
+	SceneObjectExt *fmtObj = (SceneObjectExt *) _endHandler;
+
+	fmtObj->setFrame(R2_GLOBALS._randomSource.getRandomNumber(6));
+	setDelay(120 + R2_GLOBALS._randomSource.getRandomNumber(179));
+}
+
+void Scene3260::postInit(SceneObjectList *OwnerList) {
+	loadScene(3260);
+	R2_GLOBALS._player._characterIndex = R2_MIRANDA;
+	SceneExt::postInit();
+	R2_GLOBALS._sound1.play(285);
+
+	_actor13.postInit();
+	_actor13.setup(3260, 6, 1);
+	_actor13.setPosition(Common::Point(40, 106));
+	_actor13.setDetails(3260, 18, 1, -1, 1, NULL);
+
+	if (R2_INVENTORY.getObjectScene(52) == 3260) {
+		_actor14.postInit();
+		_actor14.setup(3260, 7, 1);
+		_actor14.setPosition(Common::Point(202, 66));
+		_actor14.setDetails(3260, 12, 1, -1, 1, NULL);
+	}
+
+	_actor1.postInit();
+	_actor1.setup(3260, 1, 1);
+	_actor1.setPosition(Common::Point(93, 73));
+	_actor1.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor1.setAction(&_action1, &_actor1);
+
+	_actor2.postInit();
+	_actor2.setup(3260, 2, 1);
+	_actor2.setPosition(Common::Point(142, 63));
+	_actor2.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor2.setAction(&_action2, &_actor2);
+
+	_actor3.postInit();
+	_actor3.setup(3260, 2, 1);
+	_actor3.setPosition(Common::Point(166, 54));
+	_actor3.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor3.setAction(&_action3, &_actor3);
+
+	_actor4.postInit();
+	_actor4.setup(3260, 2, 1);
+	_actor4.setPosition(Common::Point(190, 46));
+	_actor4.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor4.setAction(&_action4, &_actor4);
+
+	_actor5.postInit();
+	_actor5.setup(3260, 2, 1);
+	_actor5.setPosition(Common::Point(142, 39));
+	_actor5.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor5.setAction(&_action5, &_actor5);
+
+	_actor6.postInit();
+	_actor6.setup(3260, 2, 1);
+	_actor6.setPosition(Common::Point(166, 30));
+	_actor6.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor6.setAction(&_action6, &_actor6);
+
+	_actor7.postInit();
+	_actor7.setup(3260, 2, 1);
+	_actor7.setPosition(Common::Point(190, 22));
+	_actor7.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor7.setAction(&_action7, &_actor7);
+
+	_actor8.postInit();
+	_actor8.setup(3260, 2, 1);
+	_actor8.setPosition(Common::Point(142, 14));
+	_actor8.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor8.setAction(&_action8, &_actor8);
+
+	_actor9.postInit();
+	_actor9.setup(3260, 2, 1);
+	_actor9.setPosition(Common::Point(166, 6));
+	_actor9.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor9.setAction(&_action9, &_actor9);
+
+	_actor10.postInit();
+	_actor10.setup(3260, 3, 1);
+	_actor10.setPosition(Common::Point(265, 163));
+	_actor10.fixPriority(180);
+	_actor10._numFrames = 10;
+	_actor10.setDetails(3260, 6, 1, 8, 1, NULL);
+	_actor10.animate(ANIM_MODE_2, NULL);
+
+	_actor11.postInit();
+	_actor11.setup(3260, 4, 1);
+	_actor11.setPosition(Common::Point(127, 108));
+	_actor11.fixPriority(120);
+	_actor11.setAction(&_action11, &_actor11);
+	_actor11._numFrames = 15;
+	_actor11.setDetails(3260, 6, 1, 8, 1, NULL);
+	_actor11.animate(ANIM_MODE_2, NULL);
+
+	_actor12.postInit();
+	_actor12.setup(3260, 5, 1);
+	_actor12.setPosition(Common::Point(274, 65));
+	_actor12.setAction(&_action12, &_actor12);
+	_actor12._numFrames = 5;
+	_actor12.setDetails(3260, 9, 1, 11, 1, NULL);
+	_actor12.animate(ANIM_MODE_2, NULL);
+
+	_item1.setDetails(Rect(0, 0, 320, 200), 3260, 0, 1, 2, 1, NULL);
+	R2_GLOBALS._player.postInit();
+
+	if (R2_GLOBALS._player._oldCharacterScene[3] == 3275) {
+		_sceneMode = 3270;
+		setAction(&_sequenceManager, this, 3270, &R2_GLOBALS._player, &_actor13, NULL);
+	} else {
+		R2_GLOBALS._player.setup(30, 5, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setPosition(Common::Point(53, 113));
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+		R2_GLOBALS._player.enableControl();
+	}
+	R2_GLOBALS._player._oldCharacterScene[3] = 3260;
+}
+
+void Scene3260::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene3260::signal() {
+	switch (_sceneMode) {
+	case 3271:
+		R2_GLOBALS._sceneManager.changeScene(3275);
+		break;
+	case 3272:
+		_sceneMode = 3273;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		SceneItem::display(3260, 15, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+		R2_GLOBALS._player.disableControl();
+		R2_INVENTORY.setObjectScene(52, 3);
+		R2_INVENTORY.setObjectScene(43, 3);
+		setAction(&_sequenceManager, this, 3273, &R2_GLOBALS._player, &_actor14, NULL);
+		break;
+	case 3273:
+		_actor4.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index b83f83b1c2..2a4899c205 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -291,6 +291,54 @@ public:
 	virtual void dispatch();
 };
 
+class Scene3260 : public SceneExt {
+	class Actor13 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor14 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Action1: public Action {
+	public:
+		void signal();
+	};
+public:
+
+	NamedHotspot _item1;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	SceneActor _actor6;
+	SceneActor _actor7;
+	SceneActor _actor8;
+	SceneActor _actor9;
+	SceneActor _actor10;
+	SceneActor _actor11;
+	SceneActor _actor12;
+	Actor13 _actor13;
+	Actor14 _actor14;
+	Action1 _action1;
+	Action1 _action2;
+	Action1 _action3;
+	Action1 _action4;
+	Action1 _action5;
+	Action1 _action6;
+	Action1 _action7;
+	Action1 _action8;
+	Action1 _action9;
+	Action1 _action10;
+	Action1 _action11;
+	Action1 _action12;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 1cb1df369953b6bc9cfac555cc165cb972c96f8f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 24 Dec 2011 01:00:57 +0200
Subject: DREAMWEB: Port 'incryanpage' to C++

---
 engines/dreamweb/dreamgen.cpp | 34 ----------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.cpp    | 19 +++++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 20 insertions(+), 35 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 265b215af6..17f862c411 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -284,40 +284,6 @@ findopen2a:
 		goto findopen1a;
 }
 
-void DreamGenContext::incRyanPage() {
-	STACK_CHECK;
-	_cmp(data.byte(kCommandtype), 222);
-	if (flags.z())
-		goto alreadyincryan;
-	data.byte(kCommandtype) = 222;
-	al = 31;
-	commandOnly();
-alreadyincryan:
-	ax = data.word(kMousebutton);
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (noincryan) */;
-	_and(ax, 1);
-	if (!flags.z())
-		goto doincryan;
-	return;
-doincryan:
-	ax = data.word(kMousex);
-	_sub(ax, (80)+167);
-	data.byte(kRyanpage) = -1;
-findnewpage:
-	_inc(data.byte(kRyanpage));
-	_sub(ax, 18);
-	if (!flags.c())
-		goto findnewpage;
-	delPointer();
-	fillRyan();
-	readMouse();
-	showPointer();
-	workToScreen();
-	delPointer();
-}
-
 void DreamGenContext::getObTextStart() {
 	STACK_CHECK;
 	es = data.word(kFreedesc);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f836b58577..b620b2179d 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -486,7 +486,6 @@ public:
 	void read();
 	void searchForString();
 	void selectOpenOb();
-	void incRyanPage();
 	void searchForFiles();
 	void getExAd();
 	void swapWithInv();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index b302bce18b..9efb49b873 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3769,4 +3769,23 @@ void DreamGenContext::edensFlatReminders() {
 	data.byte(kProgresspoints)++;	// got card
 }
 
+void DreamGenContext::incRyanPage() {
+	if (data.byte(kCommandtype) != 222) {
+		data.byte(kCommandtype) = 222;
+		commandOnly(31);
+	}
+
+	if (data.word(kMousebutton) == data.word(kOldbutton) || (data.word(kMousebutton) & 1))
+		return;
+
+	data.byte(kRyanpage) = (data.word(kMousex) - (kInventx + 167)) / 18;
+
+	delPointer();
+	fillRyan();
+	readMouse();
+	showPointer();
+	workToScreenCPP();
+	delPointer();
+
+}
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index a58bb259be..83b4ebfcae 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -338,5 +338,6 @@
 	void inToInv();
 	void outOfInv();
 	void edensFlatReminders();
+	void incRyanPage();
 
 #endif
-- 
cgit v1.2.3


From 99a5db20494eff00d6d149c08b75ba83d9a7af20 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 24 Dec 2011 01:09:17 +0200
Subject: DREAMWEB: Fix typo in incRyanPage()

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

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 9efb49b873..0b2ed7a7c5 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3775,7 +3775,7 @@ void DreamGenContext::incRyanPage() {
 		commandOnly(31);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton) || (data.word(kMousebutton) & 1))
+	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
 		return;
 
 	data.byte(kRyanpage) = (data.word(kMousex) - (kInventx + 167)) / 18;
-- 
cgit v1.2.3


From 544e241d221a5d503e2acf574fbde66c8a4fa527 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 24 Dec 2011 01:15:28 +0100
Subject: TSAGE: R2R - Implement scene 3255

---
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   1 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 105 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h    |  18 ++++
 engines/tsage/ringworld2/ringworld2_speakers.cpp |  68 +++++++++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   |  16 ++++
 5 files changed, 208 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index dbde0ee27a..5cb66a50f7 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -206,6 +206,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Room with large stasis field negator
 		return new Scene3250();
 	case 3255:
+		return new Scene3255();
 	case 3260:
 		// Computer room
 		return new Scene3260();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 8b8d8c479c..f7e7be02f2 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1256,6 +1256,111 @@ void Scene3250::dispatch() {
 	Scene::dispatch();
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3255 -
+ *
+ *--------------------------------------------------------------------------*/
+void Scene3255::postInit(SceneObjectList *OwnerList) {
+	loadScene(3255);
+	SceneExt::postInit();
+
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_mirandaSpeaker);
+
+	if (R2_GLOBALS._sceneManager._previousScene == -1)
+		R2_GLOBALS.setFlag(79);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.disableControl();
+
+	if (R2_GLOBALS.getFlag(79)) {
+		R2_GLOBALS._sound1.play(267);
+		R2_GLOBALS._sound2.play(268);
+		_sceneMode = 3257;
+		_actor3.postInit();
+		_actor4.postInit();
+		_actor4._effect = 1;
+		setAction(&_sequenceManager, this, 3257, &R2_GLOBALS._player, &_actor4, &_actor3, NULL);
+	} else {
+		_actor1.postInit();
+		_actor1.setup(303, 1, 1);
+		_actor1.setPosition(Common::Point(208, 128));
+		_actor2.postInit();
+		_actor2.setup(3107, 3, 1);
+		_actor2.setPosition(Common::Point(230, 127));
+		_sceneMode = 3255;
+		setAction(&_sequenceManager, this, 3255, &R2_GLOBALS._player, NULL);
+	}
+	R2_GLOBALS._player._oldCharacterScene[3] = 3255;
+}
+
+void Scene3255::signal() {
+	switch (_sceneMode) {
+	case 10:
+		_sceneMode = 3258;
+		_actor5.postInit();
+		_actor6.postInit();
+		_actor7.postInit();
+		setAction(&_sequenceManager, this, 3258, &R2_GLOBALS._player, &_actor4, &_actor3, &_actor5, &_actor6, &_actor7, NULL);
+		break;
+	case 3256:
+		R2_GLOBALS._sceneManager.changeScene(3250);
+		break;
+	case 3257:
+		_sceneMode = 10;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(607, this);
+		break;
+	case 3258:
+		R2_GLOBALS._sceneManager.changeScene(3100);
+		break;
+	default:
+		SceneItem::display(3255, 0, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		_sceneMode = 3256;
+		setAction(&_sequenceManager, this, 3256, &R2_GLOBALS._player, NULL);
+	}
+}
+
+void Scene3255::dispatch() {
+	if (R2_GLOBALS.getFlag(79)) {
+		if (_actor5._position.y >= 95) {
+			if (_actor5._position.y <= 110)
+				_actor5._shade = 6 - (_actor5._position.y - 95) / 3;
+			else
+				_actor5._effect = 1;
+		} else {
+			_actor5._effect = 6;
+			_actor5._shade = 6;
+		}
+
+		if (_actor6._position.y >= 95) {
+			if (_actor6._position.y <= 110)
+				_actor6._shade = 6 - (_actor6._position.y - 95) / 3;
+			else
+				_actor6._effect = 1;
+		} else {
+			_actor6._effect = 6;
+			_actor6._shade = 6;
+		}
+
+		if (_actor7._position.y >= 95) {
+			if (_actor7._position.y <= 110)
+				_actor7._shade = 6 - (_actor7._position.y - 95) / 3;
+			else
+				_actor7._effect = 1;
+		} else {
+			_actor7._effect = 6;
+			_actor7._shade = 6;
+		}
+	}
+
+	if ((R2_GLOBALS._player._position.x > 250) && (R2_GLOBALS._player._shade == 1)) {
+		R2_GLOBALS._player._effect = 6;
+		_actor4._effect = 6;
+	}
+	Scene::dispatch();
+}
+
 /*--------------------------------------------------------------------------
  * Scene 3260 - Computer room
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 2a4899c205..22e5fea477 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -291,6 +291,24 @@ public:
 	virtual void dispatch();
 };
 
+class Scene3255 : public SceneExt {
+public:
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	SceneActor _actor6;
+	SceneActor _actor7;
+	SpeakerQuinn3255 _quinnSpeaker;
+	SpeakerMiranda3255 _mirandaSpeaker;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void dispatch();
+};
+
 class Scene3260 : public SceneExt {
 	class Actor13 : public SceneActor {
 		virtual bool startAction(CursorType action, Event &event);
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 619b1c291f..b63409e387 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1534,5 +1534,73 @@ void SpeakerTomko3245::proc15() {
 	}
 }
 
+SpeakerQuinn3255::SpeakerQuinn3255() {
+	_speakerName = "QUINN";
+	_color1 = 60;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerQuinn3255::proc15() {
+	Scene3255 *scene = (Scene3255 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &scene->_actor4;
+		_object2->hide();
+		_object1.postInit();
+		_object1._effect = _object2->_effect;
+		_object1._shade = _object2->_shade;
+		_object1.setPosition(_object2->_position);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(3257, 3, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+SpeakerMiranda3255::SpeakerMiranda3255() {
+	_speakerName = "MIRANDA";
+	_color1 = 154;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerMiranda3255::proc15() {
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &R2_GLOBALS._player;
+		_object2->hide();
+		_object1.postInit();
+		_object1._effect = _object2->_effect;
+		_object1._shade = _object2->_shade;
+		_object1.setPosition(_object2->_position);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(3257, 5, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index e6a1819eb3..dba402b64a 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -372,6 +372,22 @@ public:
 	virtual Common::String getClassName() { return "SpeakerTomko3245"; }
 	virtual void proc15();
 };
+
+class SpeakerQuinn3255 : public VisualSpeaker {
+public:
+	SpeakerQuinn3255();
+
+	virtual Common::String getClassName() { return "SpeakerQuinn3255"; }
+	virtual void proc15();
+};
+
+class SpeakerMiranda3255 : public VisualSpeaker {
+public:
+	SpeakerMiranda3255();
+
+	virtual Common::String getClassName() { return "SpeakerMiranda3255"; }
+	virtual void proc15();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From c91d67a6639b032398baa865c8403be9c5b590c7 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 24 Dec 2011 01:27:10 +0100
Subject: SCUMM: Remove assert.h include from player_appleII

---
 engines/scumm/player_appleII.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/player_appleII.cpp b/engines/scumm/player_appleII.cpp
index f250f686e6..f310e3e546 100644
--- a/engines/scumm/player_appleII.cpp
+++ b/engines/scumm/player_appleII.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-#include <assert.h>
 #include "engines/engine.h"
 #include "scumm/player_appleII.h"
 #include "scumm/scumm.h"
-- 
cgit v1.2.3


From f07531bed36d22354a3724d53067ee22533cf049 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 24 Dec 2011 10:18:58 +0100
Subject: TSAGE: R2R - Implement scene 3275

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |  2 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 97 +++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h   | 24 ++++++
 3 files changed, 123 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 5cb66a50f7..e591436fd8 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -211,6 +211,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Computer room
 		return new Scene3260();
 	case 3275:
+		// Hall
+		return new Scene3275();
 	case 3350:
 	case 3375:
 	case 3385:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index f7e7be02f2..1a219e773a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1538,5 +1538,102 @@ void Scene3260::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3275 - Hall
+ *
+ *--------------------------------------------------------------------------*/
+bool Scene3275::Actor2::startAction(CursorType action, Event &event) {
+	Scene3275 *scene = (Scene3275 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 3275;
+	scene->setAction(&scene->_sequenceManager, scene, 3275, &R2_GLOBALS._player, &scene->_actor2, NULL);
+	return true;
+}
+
+void Scene3275::Exit1::changeScene() {
+	Scene3275 *scene = (Scene3275 *)R2_GLOBALS._sceneManager._scene;
+
+	scene->_sceneMode = 0;
+	g_globals->_events.setCursor(CURSOR_ARROW);
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 10;
+	Common::Point pt(418, 118);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene3275::postInit(SceneObjectList *OwnerList) {
+	loadScene(3275);
+
+	if (R2_GLOBALS._sceneManager._previousScene == -1)
+		R2_GLOBALS._sceneManager._previousScene = 3260;
+
+	if (R2_GLOBALS._sceneManager._previousScene == 3150)
+		g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
+	else
+		g_globals->gfxManager()._bounds.moveTo(Common::Point(0, 0));
+
+	SceneExt::postInit();
+	_exit1.setDetails(Rect(398, 60, 439, 118), SHADECURSOR_UP, 3150);
+	_exit1.setDest(Common::Point(418, 128));
+
+	_actor1.postInit();
+	_actor1.setup(3275, 1, 7);
+	_actor1.setPosition(Common::Point(419, 119));
+
+	_actor2.postInit();
+	_actor2.setup(3275, 2, 1);
+	_actor2.setPosition(Common::Point(56, 118));
+	_actor2.setDetails(3275, 3, 4, -1, 1, NULL);
+
+	_item2.setDetails(Rect(153, 58, 200, 120), 3275, 6, 7, 8, 1, NULL);
+	_item3.setDetails(Rect(275, 58, 331, 120), 3275, 6, 7, 8, 1, NULL);
+	_item4.setDetails(Rect(0, 66, 22, 127), 3275, 9, 10, 11, 1, NULL);
+	_item5.setDetails(Rect(457, 66, 480, 127), 3275, 9, 10, 11, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 480, 200), 3275, 0, 1, 2, 1, NULL);
+
+	R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.disableControl();
+	if (R2_GLOBALS._player._oldCharacterScene[3] == 3150) {
+		_sceneMode = 11;
+		R2_GLOBALS._player.setup(30, 3, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setPosition(Common::Point(418, 118));
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+		Common::Point pt(418, 128);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+	} else if (R2_GLOBALS._player._oldCharacterScene[3] == 3260) {
+		_sceneMode = 3276;
+		setAction(&_sequenceManager, this, 3276, &R2_GLOBALS._player, &_actor2, NULL);
+	} else {
+		R2_GLOBALS._player.setup(30, 3, 1);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setPosition(Common::Point(245, 135));
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+		R2_GLOBALS._player.enableControl();
+	}
+	R2_GLOBALS._player._oldCharacterScene[3] = 3275;
+}
+
+void Scene3275::signal() {
+	switch (_sceneMode) {
+	case 10:
+		R2_GLOBALS._sceneManager.changeScene(3150);
+		break;
+	case 3275:
+		R2_GLOBALS._sceneManager.changeScene(3260);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 22e5fea477..c82515c8c0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -357,6 +357,30 @@ public:
 	virtual void signal();
 };
 
+class Scene3275 : public SceneExt {
+	class Actor2 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+public:
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	NamedHotspot _item3;
+	NamedHotspot _item4;
+	NamedHotspot _item5;
+	SceneActor _actor1;
+	Actor2 _actor2;
+	Exit1 _exit1;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 64b7aee081af753366bdd2000e73f24b28b226e8 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 24 Dec 2011 00:28:45 +0100
Subject: DREAMWEB: Minor cleanup

---
 engines/dreamweb/dreambase.h | 1 +
 engines/dreamweb/stubs.cpp   | 4 ++--
 engines/dreamweb/use.cpp     | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 32b36a56da..e573443674 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -513,6 +513,7 @@ public:
 	void startLoading(const Room &room);
 	void startup();
 	void atmospheres();
+	bool objectMatches(void *object, const char *id);
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 0b2ed7a7c5..09c8b36e81 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1681,8 +1681,8 @@ void DreamBase::printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, b
 	printDirect(string, x, y, maxWidth, centered);
 }
 
-static bool objectMatches(void *object, const char *id) {
-	const char *objId = (const char *)(((const uint8 *)object) + 12); // whether it is a DynObject or a SetObject
+bool DreamBase::objectMatches(void *object, const char *id) {
+	const char *objId = (const char *)object + 12; // whether it is a DynObject or a SetObject
 	for (size_t i = 0; i < 4; ++i) {
 		if (id[i] != objId[i] + 'A')
 			return false;
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index b642598589..aa7c2bddea 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -128,11 +128,12 @@ void DreamGenContext::useRoutine() {
 	}
 
 	getAnyAd();
-	const uint8 *id = es.ptr(bx + 12, 4);
+	// CHECKME: Do the callbacks use es:bx ?
+	void *obj = es.ptr(bx, 15);
 
 	for (size_t i = 0; i < sizeof(kUseList)/sizeof(UseListEntry); ++i) {
 		const UseListEntry &entry = kUseList[i];
-		if (('A' + id[0] == entry.id[0]) && ('A' + id[1] == entry.id[1]) && ('A' + id[2] == entry.id[2]) && ('A' + id[3] == entry.id[3])) {
+		if (objectMatches(obj, entry.id)) {
 			(this->*entry.callback)();
 			return;
 		}
-- 
cgit v1.2.3


From 0133ca823e5948e7a144ae32d2bbcceda3fdc564 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 24 Dec 2011 12:10:13 +0100
Subject: DREAMWEB: Fix wrong buffer size

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

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index e573443674..7ba8a93c7c 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -44,7 +44,7 @@ const unsigned int kUnderTextSizeX_f = 228; // foreign version
 const unsigned int kUnderTextSizeY_f = 13; // foreign version
 const unsigned int kUnderTimedTextSizeY_f = 30;
 const unsigned int kUnderTextBufSize = kUnderTextSizeX_f * kUnderTextSizeY_f;
-const unsigned int kUnderTimedTextBufSize = 256 * kUnderTextSizeY_f;
+const unsigned int kUnderTimedTextBufSize = 256 * kUnderTimedTextSizeY_f;
 const unsigned int kLengthOfVars = 68;
 const unsigned int kNumChanges = 250;
 
-- 
cgit v1.2.3


From b9839635eab502b640c29e23bdbb20240b2bf440 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 24 Dec 2011 12:23:24 +0100
Subject: DREAMWEB: Convert getObTextStart

---
 engines/dreamweb/dreambase.h  |  1 +
 engines/dreamweb/dreamgen.cpp | 47 -----------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/object.cpp   | 69 +++++++++++++++++++++++++++++++++++++++++++
 engines/dreamweb/stubs.cpp    | 14 ++-------
 engines/dreamweb/use.cpp      |  8 ++---
 6 files changed, 76 insertions(+), 64 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 7ba8a93c7c..4dc537c4e3 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -188,6 +188,7 @@ public:
 	void deleteExFrame(uint8 frameNum);
 	void deleteExText(uint8 textNum);
 	void purgeALocation(uint8 index);
+	const uint8 *getObTextStart();
 
 	// from pathfind.cpp
 	void turnPathOn(uint8 param);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 17f862c411..bcb45f529f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -284,53 +284,6 @@ findopen2a:
 		goto findopen1a;
 }
 
-void DreamGenContext::getObTextStart() {
-	STACK_CHECK;
-	es = data.word(kFreedesc);
-	si = (0);
-	cx = (0+(82*2));
-	_cmp(data.byte(kObjecttype), 2);
-	if (flags.z())
-		goto describe;
-	es = data.word(kSetdesc);
-	si = (0);
-	cx = (0+(130*2));
-	_cmp(data.byte(kObjecttype), 1);
-	if (flags.z())
-		goto describe;
-	es = data.word(kExtras);
-	si = (0+2080+30000+(16*114));
-	cx = (0+2080+30000+(16*114)+((114+2)*2));
-describe:
-	al = data.byte(kCommand);
-	ah = 0;
-	_add(ax, ax);
-	_add(si, ax);
-	ax = es.word(si);
-	_add(ax, cx);
-	si = ax;
-	bx = ax;
-tryagain:
-	push(si);
-	findNextColon();
-	al = es.byte(si);
-	cx = si;
-	si = pop();
-	_cmp(data.byte(kObjecttype), 1);
-	if (!flags.z())
-		return /* (cantmakeoneup) */;
-	_cmp(al, 0);
-	if (flags.z())
-		goto findsometext;
-	_cmp(al, ':');
-	if (flags.z())
-		goto findsometext;
-	return;
-findsometext:
-	searchForSame();
-	goto tryagain;
-}
-
 void DreamGenContext::searchForSame() {
 	STACK_CHECK;
 	si = cx;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index b620b2179d..2df23e4e08 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -455,7 +455,6 @@ public:
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
 	void getPersonText();
-	void getObTextStart();
 	void checkObjectSize();
 	void doSomeTalk();
 	void outOfOpen();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index cdd612001f..8e7ade4ffd 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -636,4 +636,73 @@ void DreamBase::purgeALocation(uint8 index) {
 	}
 }
 
+const uint8 *DreamBase::getObTextStart() {
+	uint16 textSeg, textDatOff, textOff;
+	if (data.byte(kObjecttype) == kFreeObjectType) {
+		textSeg = data.word(kFreedesc);
+		textDatOff = kFreetextdat;
+		textOff = kFreetext;
+	} else if (data.byte(kObjecttype) == kSetObjectType1) {
+		textSeg = data.word(kSetdesc);
+		textDatOff = kSettextdat;
+		textOff = kSettext;
+	} else {
+		textSeg = data.word(kExtras);
+		textDatOff = kExtextdat;
+		textOff = kExtext;
+	}
+	const uint8 *textBase = getSegment(textSeg).ptr(textOff, 0);
+	const uint8 *text = textBase + getSegment(textSeg).word(textDatOff + 2*data.byte(kCommand));
+
+	if (data.byte(kObjecttype) != kSetObjectType1)
+		return text;
+
+	const uint8 *obname = text;
+	while (true) {
+		const uint8 *start = text;
+		findNextColon(&text);
+
+		// Not an empty description string?
+		if (*text != 0 && *text != ':')
+			return start;
+
+		// If the description string (of a SetObjectType1 object) is empty,
+		// look for an object with the same name.
+		// Example: Eden's garage door outside has two parts. The right part
+		// has no description of its own but uses that of the left part.
+
+		bool found = false;
+		do {
+			text++;
+			uint8 c = *obname;
+
+			// scan for matching first character
+			while (*text != c) {
+				text++;
+
+				// arbitrary give-up counter
+				if (text - (textBase - textOff) >= 8000) {
+					warning("Object description for %d/%d not found", data.byte(kObjecttype), data.byte(kCommand));
+					return obname;
+				}
+			}
+
+			// found matching first character, so match the rest
+			const uint8 *s1 = obname;
+			const uint8 *s2 = text;
+			do {
+				s1++;
+				s2++;
+			} while (*s1 != ':' && *s1 != 0 && *s1 == *s2);
+
+			if (*s1 == ':' || *s1 == 0)
+				found = true; // (prefix) matched the entire object name
+		} while (!found);
+
+		// We found an object with the same name. The next loop iteration
+		// will check if this one again has an empty description.
+	}
+}
+
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 09c8b36e81..f15325eaa9 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1875,16 +1875,6 @@ uint8 DreamBase::findNextColon(const uint8 **string) {
 	return c;
 }
 
-const uint8 *DreamGenContext::getObTextStartCPP() {
-	push(es);
-	push(si);
-	getObTextStart();
-	const uint8 *result = es.ptr(si, 0);
-	si = pop();
-	es = pop();
-	return result;
-}
-
 void DreamGenContext::enterSymbol() {
 	data.byte(kManisoffscreen) = 1;
 	getRidOfReels();
@@ -2906,7 +2896,7 @@ void DreamGenContext::obsThatDoThings() {
 }
 
 void DreamGenContext::describeOb() {
-	const uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStart();
 	uint16 y = 92;
 	if (data.byte(kForeignrelease) && data.byte(kObjecttype) == kSetObjectType1)
 		y = 82;
@@ -3673,7 +3663,7 @@ void DreamGenContext::lookAtCard() {
 	loadKeypad();
 	createPanel2();
 	showFrame(tempGraphics(), 160, 80, 42, 128);
-	const uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStart();
 	findNextColon(&obText);
 	findNextColon(&obText);
 	findNextColon(&obText);
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index aa7c2bddea..e891298f2b 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -140,7 +140,7 @@ void DreamGenContext::useRoutine() {
 	}
 
 	delPointer();
-	const uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStart();
 	if (findNextColon(&obText) != 0) {
 		if (findNextColon(&obText) != 0) {
 			if (*obText != 0) {
@@ -175,7 +175,7 @@ void DreamGenContext::useText(const uint8 *string) {
 }
 
 void DreamGenContext::showFirstUse() {
-	const uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStart();
 	findNextColon(&obText);
 	findNextColon(&obText);
 	useText(obText);
@@ -183,7 +183,7 @@ void DreamGenContext::showFirstUse() {
 }
 
 void DreamGenContext::showSecondUse() {
-	const uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStart();
 	findNextColon(&obText);
 	findNextColon(&obText);
 	findNextColon(&obText);
@@ -1611,7 +1611,7 @@ void DreamGenContext::useCashCard() {
 	showMan();
 	uint16 y = (!data.byte(kForeignrelease)) ? 120 : 120 - 3;
 	showFrame(tempGraphics(), 114, y, 39, 0);
-	const uint8 *obText = getObTextStartCPP();
+	const uint8 *obText = getObTextStart();
 	findNextColon(&obText);
 	findNextColon(&obText);
 	y = 98;
-- 
cgit v1.2.3


From be1a4de2919e7a5fa26ee05d23792aacd0e33a7a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 24 Dec 2011 13:27:09 +0200
Subject: DREAMWEB: Port 'dropobject' to C++

---
 engines/dreamweb/dreamgen.cpp | 101 ------------------------------------------
 engines/dreamweb/dreamgen.h   |   1 -
 engines/dreamweb/object.cpp   |  52 ++++++++++++++++++++++
 engines/dreamweb/stubs.h      |   1 +
 4 files changed, 53 insertions(+), 102 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index bcb45f529f..d1abe79a48 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -580,107 +580,6 @@ findopenp1:
 	_add(bx, (0+(228*13)));
 }
 
-void DreamGenContext::dropObject() {
-	STACK_CHECK;
-	_cmp(data.byte(kCommandtype), 223);
-	if (flags.z())
-		goto alreadydrop;
-	data.byte(kCommandtype) = 223;
-	_cmp(data.byte(kPickup), 0);
-	if (flags.z())
-		{ blank(); return; };
-	bl = data.byte(kItemframe);
-	bh = data.byte(kObjecttype);
-	al = 37;
-	commandWithOb();
-alreadydrop:
-	ax = data.word(kMousebutton);
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (nodrop) */;
-	_and(ax, 1);
-	if (!flags.z())
-		goto dodrop;
-	return;
-dodrop:
-	getEitherAd();
-	isItWorn();
-	if (!flags.z())
-		goto nowornerror;
-	wornError();
-	return;
-nowornerror:
-	_cmp(data.byte(kReallocation), 47);
-	if (flags.z())
-		goto nodrop2;
-	cl = data.byte(kRyanx);
-	_add(cl, 12);
-	ch = data.byte(kRyany);
-	_add(ch, 12);
-	checkOne();
-	_cmp(cl, 2);
-	if (flags.c())
-		goto nodroperror;
-nodrop2:
-	dropError();
-	return;
-nodroperror:
-	_cmp(data.byte(kMapxsize), 64);
-	if (!flags.z())
-		goto notinlift;
-	_cmp(data.byte(kMapysize), 64);
-	if (!flags.z())
-		goto notinlift;
-	dropError();
-	return;
-notinlift:
-	al = data.byte(kItemframe);
-	ah = 4;
-	cl = 'G';
-	ch = 'U';
-	dl = 'N';
-	dh = 'A';
-	compare();
-	if (flags.z())
-		{ cantDrop(); return; };
-	al = data.byte(kItemframe);
-	ah = 4;
-	cl = 'S';
-	ch = 'H';
-	dl = 'L';
-	dh = 'D';
-	compare();
-	if (flags.z())
-		{ cantDrop(); return; };
-	data.byte(kObjecttype) = 4;
-	al = data.byte(kItemframe);
-	getExAd();
-	es.byte(bx+2) = 0;
-	al = data.byte(kRyanx);
-	_add(al, 4);
-	cl = 4;
-	_shr(al, cl);
-	_add(al, data.byte(kMapx));
-	ah = data.byte(kRyany);
-	_add(ah, 8);
-	cl = 4;
-	_shr(ah, cl);
-	_add(ah, data.byte(kMapy));
-	es.byte(bx+3) = al;
-	es.byte(bx+5) = ah;
-	al = data.byte(kRyanx);
-	_add(al, 4);
-	_and(al, 15);
-	ah = data.byte(kRyany);
-	_add(ah, 8);
-	_and(ah, 15);
-	es.byte(bx+4) = al;
-	es.byte(bx+6) = ah;
-	data.byte(kPickup) = 0;
-	al = data.byte(kReallocation);
-	es.byte(bx) = al;
-}
-
 void DreamGenContext::selectOpenOb() {
 	STACK_CHECK;
 	al = data.byte(kCommand);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 2df23e4e08..2041ab186b 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -475,7 +475,6 @@ public:
 	void findAllOpen();
 	void fillOpen();
 	void getEitherAd();
-	void dropObject();
 	void useOpened();
 	void locationPic();
 	void swapWithOpen();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 8e7ade4ffd..04081e2f0e 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -704,5 +704,57 @@ const uint8 *DreamBase::getObTextStart() {
 	}
 }
 
+void DreamGenContext::dropObject() {
+	if (data.byte(kCommandtype) != 223) {
+		data.byte(kCommandtype) = 223;
+		if (!data.byte(kPickup)) {
+			blank();
+			return;
+		}
+		commandWithOb(37, data.byte(kObjecttype), data.byte(kItemframe));
+	}
+
+	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+		return;
+
+	if (isItWorn(getEitherAdCPP())) {
+		wornError();
+		return;
+	}
+
+	if (data.byte(kReallocation) != 47) {
+		byte flag, flagEx, type, flagX, flagY;
+		checkOne(data.byte(kRyanx) + 12, data.byte(kRyany) + 12, &flag, &flagEx, &type, &flagX, &flagY);
+
+		if (flag >= 2) {
+			dropError();
+			return;
+		}
+	} else {
+		dropError();
+		return;
+	}
+
+	if (data.byte(kMapxsize) == 64 && data.byte(kMapysize) == 64) {
+		// Inside lift
+		dropError();
+		return;
+	}
+
+	if (compare(data.byte(kItemframe), 4, "GUNA") || compare(data.byte(kItemframe), 4, "SHLD")) {
+		cantDrop();
+		return;
+	}
+
+	data.byte(kObjecttype) = 4;
+	DynObject *object = getExAd(data.byte(kItemframe));
+	object->mapad[0] = 0;
+	object->mapad[1] = ((data.byte(kRyanx) + 4) >> 4) + data.byte(kMapx);
+	object->mapad[2] = (data.byte(kRyanx) + 4) & 0xF;
+	object->mapad[3] = ((data.byte(kRyany) + 8) >> 4) + data.byte(kMapy);
+	object->mapad[4] = (data.byte(kRyany) + 8) & 0xF;
+	data.byte(kPickup) = 0;
+	object->currentLocation = data.byte(kReallocation);
+}
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 83b4ebfcae..5f4ad566c1 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -339,5 +339,6 @@
 	void outOfInv();
 	void edensFlatReminders();
 	void incRyanPage();
+	void dropObject();
 
 #endif
-- 
cgit v1.2.3


From efb9057dda86fb8899cfbe18e3857b88f5597b22 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 24 Dec 2011 13:12:00 +0100
Subject: DREAMWEB: Remove unused function

---
 engines/dreamweb/dreamgen.cpp | 43 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 2 files changed, 44 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index d1abe79a48..b9816c28b2 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -284,49 +284,6 @@ findopen2a:
 		goto findopen1a;
 }
 
-void DreamGenContext::searchForSame() {
-	STACK_CHECK;
-	si = cx;
-searchagain:
-	_inc(si);
-	al = es.byte(bx);
-search:
-	_cmp(es.byte(si), al);
-	if (flags.z())
-		goto gotstartletter;
-	_inc(cx);
-	_inc(si);
-	_cmp(si, 8000);
-	if (flags.c())
-		goto search;
-	si = bx;
-	ax = pop();
-	return;
-gotstartletter:
-	push(bx);
-	push(si);
-keepchecking:
-	_inc(si);
-	_inc(bx);
-	al = es.byte(bx);
-	ah = es.byte(si);
-	_cmp(al, ':');
-	if (flags.z())
-		goto foundmatch;
-	_cmp(al, 0);
-	if (flags.z())
-		goto foundmatch;
-	_cmp(al, ah);
-	if (flags.z())
-		goto keepchecking;
-	si = pop();
-	bx = pop();
-	goto searchagain;
-foundmatch:
-	si = pop();
-	bx = pop();
-}
-
 void DreamGenContext::reExFromInv() {
 	STACK_CHECK;
 	findInvPos();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 2041ab186b..10abde7fff 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -470,7 +470,6 @@ public:
 	void purgeAnItem();
 	void getSetAd();
 	void findOpenPos();
-	void searchForSame();
 	void rollEm();
 	void findAllOpen();
 	void fillOpen();
-- 
cgit v1.2.3


From bcf789274f605a0f4901399f767a1da40444fa79 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 24 Dec 2011 13:39:27 +0100
Subject: DREAMWEB: Move many use-related functions to DreamBase

---
 engines/dreamweb/dreambase.h |  87 +++++++++++++
 engines/dreamweb/keypad.cpp  |   2 +-
 engines/dreamweb/stubs.cpp   |  28 ++---
 engines/dreamweb/stubs.h     |  87 -------------
 engines/dreamweb/use.cpp     | 290 +++++++++++++++++++++----------------------
 5 files changed, 247 insertions(+), 247 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 4dc537c4e3..720fcb3116 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -144,6 +144,7 @@ public:
 	void dumpSymbol();
 	void dumpSymBox();
 	void quitSymbol();
+	void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
 
 	// from monitor.cpp
 	void input();
@@ -515,6 +516,17 @@ public:
 	void startup();
 	void atmospheres();
 	bool objectMatches(void *object, const char *id);
+	void checkFolderCoords();
+	void nextFolder();
+	void lastFolder();
+	void lookAtCard();
+	void obsThatDoThings();
+	void describeOb();
+	void putBackObStuff();
+	void reExFromOpen();
+	void showDiaryPage();
+	void showDiaryKeys();
+	void dumpDiaryKeys();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
@@ -523,6 +535,81 @@ public:
 	void withWhat();
 	uint16 checkInside(uint16 command, uint16 type);
 	void showPuzText(uint16 command, uint16 count);
+	void useText(const uint8 *string);
+	void showFirstUse();
+	void showSecondUse();
+	void viewFolder();
+	void edensCDPlayer();
+	void hotelBell();
+	void playGuitar();
+	void useElevator2();
+	void useElevator3();
+	void useElevator4();
+	void useElevator5();
+	void useHatch();
+	void wheelSound();
+	void callHotelLift();
+	void useShield();
+	void useCoveredBox();
+	void useRailing();
+	void useChurchHole();
+	void sitDownInBar();
+	void useBalcony();
+	void useWindow();
+	void trapDoor();
+	void useDryer();
+	void callEdensDLift();
+	void callEdensLift();
+	void openYourNeighbour();
+	void openRyan();
+	void openPoolBoss();
+	void openEden();
+	void openSarters();
+	void openLouis();
+	void useWall();
+	void useChurchGate();
+	void useLadder();
+	void useLadderB();
+	bool defaultUseHandler(const char *id);
+	void slabDoorA();
+	void slabDoorB();
+	void slabDoorC();
+	void slabDoorE();
+	void slabDoorD();
+	void slabDoorF();
+	void useGun();
+	void useFullCart();
+	void useClearBox();
+	void openTVDoor();
+	void usePlate();
+	void usePlinth();
+	void useElvDoor();
+	void useWinch();
+	void useCart();
+	void useHole();
+	void openHotelDoor();
+	void openHotelDoor2();
+	void grafittiDoor();
+	void useCardReader1();
+	void useCardReader2();
+	void useCardReader3();
+	void usePoolReader();
+	void useLighter();
+	void useWire();
+	void openTomb();
+	void hotelControl();
+	void useCooker();
+	void useDiary();
+	void useControl();
+	void useSlab();
+	void usePipe();
+	void useOpenBox();
+	void runTap();
+	void useAxe();
+	void useHandle();
+	void useAltar();
+	void notHeldError();
+	void useCashCard();
 
 	// from vgafades.cpp
 	void clearStartPal();
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index d0ef260e90..29f31f1bd0 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -92,7 +92,7 @@ void DreamBase::addToPressList() {
 	++data.word(kPresspointer);
 }
 
-void DreamGenContext::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
+void DreamBase::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
 	RectWithCallback<DreamBase> keypadList[] = {
 		{ kKeypadx+9,kKeypadx+30,kKeypady+9,kKeypady+22,&DreamBase::buttonOne },
 		{ kKeypadx+31,kKeypadx+52,kKeypady+9,kKeypady+22,&DreamBase::buttonTwo },
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index f15325eaa9..9a7b66ac72 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2438,18 +2438,18 @@ const uint8 *DreamBase::getTextInFile1(uint16 index) {
 	return string;
 }
 
-void DreamGenContext::checkFolderCoords() {
-	RectWithCallback<DreamGenContext> folderList[] = {
+void DreamBase::checkFolderCoords() {
+	RectWithCallback<DreamBase> folderList[] = {
 		{ 280,320,160,200, &DreamBase::quitKey },
-		{ 143,300,6,194, &DreamGenContext::nextFolder },
-		{ 0,143,6,194, &DreamGenContext::lastFolder },
+		{ 143,300,6,194, &DreamBase::nextFolder },
+		{ 0,143,6,194, &DreamBase::lastFolder },
 		{ 0,320,0,200, &DreamBase::blank },
 		{ 0xFFFF,0,0,0, 0 }
 	};
 	checkCoords(folderList);
 }
 
-void DreamGenContext::nextFolder() {
+void DreamBase::nextFolder() {
 	if (data.byte(kFolderpage) == 12) {
 		blank();
 		return;
@@ -2469,7 +2469,7 @@ void DreamGenContext::nextFolder() {
 	}
 }
 
-void DreamGenContext::lastFolder() {
+void DreamBase::lastFolder() {
 	if (data.byte(kFolderpage) == 0) {
 		blank();
 		return;
@@ -2885,7 +2885,7 @@ void DreamBase::openInv() {
 	data.byte(kCommandtype) = 255;
 }
 
-void DreamGenContext::obsThatDoThings() {
+void DreamBase::obsThatDoThings() {
 	if (!compare(data.byte(kCommand), data.byte(kObjecttype), "MEMB"))
 		return; // notlouiscard
 
@@ -2895,7 +2895,7 @@ void DreamGenContext::obsThatDoThings() {
 	}
 }
 
-void DreamGenContext::describeOb() {
+void DreamBase::describeOb() {
 	const uint8 *obText = getObTextStart();
 	uint16 y = 92;
 	if (data.byte(kForeignrelease) && data.byte(kObjecttype) == kSetObjectType1)
@@ -2986,11 +2986,11 @@ void DreamGenContext::errorMessage3() {
 	delPointer();
 }
 
-void DreamGenContext::reExFromOpen() {
+void DreamBase::reExFromOpen() {
 
 }
 
-void DreamGenContext::putBackObStuff() {
+void DreamBase::putBackObStuff() {
 	createPanel();
 	showPanel();
 	showMan();
@@ -3614,7 +3614,7 @@ void DreamGenContext::updateSymbolBot() {
 	}
 }
 
-void DreamGenContext::showDiaryPage() {
+void DreamBase::showDiaryPage() {
 	showFrame(tempGraphics(), kDiaryx, kDiaryy, 0, 0);
 	data.byte(kKerning) = 1;
 	useTempCharset();
@@ -3631,7 +3631,7 @@ void DreamGenContext::showDiaryPage() {
 	useCharset1();
 }
 
-void DreamGenContext::dumpDiaryKeys() {
+void DreamBase::dumpDiaryKeys() {
 	if (data.byte(kPresscount) == 1) {
 		if (data.byte(kSartaindead) != 1 && data.byte(kDiarypage) == 5 && getLocation(6) != 1) {
 			// Add Sartain Industries note
@@ -3657,7 +3657,7 @@ void DreamGenContext::dumpDiaryKeys() {
 	multiDump(kDiaryx + 151, kDiaryy + 71, 16, 16);
 }
 
-void DreamGenContext::lookAtCard() {
+void DreamBase::lookAtCard() {
 	data.byte(kManisoffscreen) = 1;
 	getRidOfReels();
 	loadKeypad();
@@ -3710,7 +3710,7 @@ void DreamBase::clearChanges() {
 	memcpy(data.ptr(kRoomscango, 16), initialRoomsCanGo, 16);
 }
 
-void DreamGenContext::showDiaryKeys() {
+void DreamBase::showDiaryKeys() {
 	if (!data.byte(kPresscount))
 		return; // nokeyatall
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 5f4ad566c1..da14962a27 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -119,7 +119,6 @@
 	}
 	void findNextColon();
 	const uint8 *getObTextStartCPP();
-	void useText(const uint8 *string);
 	void showCity();
 	uint16 getPersFrame(uint8 index);
 	void convIcons();
@@ -153,67 +152,15 @@
 	void look();
 	void autoLook();
 	void doLook();
-	void showFirstUse();
-	void showSecondUse();
 	void enterSymbol();
-	void viewFolder();
-	void edensCDPlayer();
-	void hotelBell();
-	void playGuitar();
-	void callEdensDLift();
-	void callEdensLift();
-	void sitDownInBar();
-	void trapDoor();
-	void useBalcony();
-	void useChurchHole();
-	void useCoveredBox();
 	void useElevator1();
-	void useElevator2();
-	void useElevator3();
-	void useElevator4();
-	void useElevator5();
-	void useDryer();
-	void useRailing();
-	void useWindow();
-	void useHatch();
-	void useLighter();
-	void useSLab();
-	void usePipe();
-	void useOpenBox();
-	void useAxe();
 	void useKey();
-	void wheelSound();
-	void callHotelLift();
-	void useShield();
-	void useWall();
-	void useChurchGate();
-	void useFullCart();
-	void useClearBox();
-	void usePlate();
-	void usePlinth();
-	void useElvDoor();
 	void useObject();
-	void useWinch();
-	void useCardReader1();
-	void useCardReader2();
-	void useCardReader3();
-	void usePoolReader();
-	void useCooker();
-	void useWire();
-	void useControl();
-	void useHandle();
-	void useAltar();
-	bool defaultUseHandler(const char *id);
-	void openTVDoor();
 	void wearWatch();
 	void wearShades();
-	void checkFolderCoords();
-	void nextFolder();
-	void lastFolder();
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	uint8 nextSymbol(uint8 symbol);
 	void showSymbol();
-	void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
 	void inventory();
 	void mainScreen();
 	void zoomOnOff();
@@ -230,40 +177,15 @@
 	void afterIntroRoom();
 	void gettingShot();
 	void allPointer();
-	void openYourNeighbour();
-	void openRyan();
-	void openPoolBoss();
-	void openEden();
-	void openSarters();
-	void openLouis();
-	void useLadder();
-	void useLadderB();
-	void useCart();
 	void useTrainer();
-	void useHole();
-	void runTap();
 	void chewy();
-	void sLabDoorA();
-	void sLabDoorB();
-	void sLabDoorC();
-	void sLabDoorE();
-	void sLabDoorD();
-	void sLabDoorF();
-	void openHotelDoor();
-	void openHotelDoor2();
-	void grafittiDoor();
-	void openTomb();
-	void hotelControl();
-	void obsThatDoThings();
 	void delEverything();
 	void errorMessage1();
 	void errorMessage2();
 	void errorMessage3();
-	void reExFromOpen();
 	void nextDest();
 	void lastDest();
 	void destSelect();
-	void putBackObStuff();
 	void moreTalk();
 	void redes();
 	void selectLocation();
@@ -276,7 +198,6 @@
 	void madmanRun();
 	void decide();
 	void talk();
-	void useDiary();
 	void hangOnPQ();
 	void showGun();
 	void endGame();
@@ -292,10 +213,7 @@
 	void processTrigger();
 	void updateSymbolTop();
 	void updateSymbolBot();
-	void showDiaryPage();
-	void dumpDiaryKeys();
 	void runEndSeq();
-	void lookAtCard();
 	bool execCommand();
 	void findExObject();
 	uint16 findExObject(const char *id) {
@@ -305,20 +223,15 @@
 	bool isRyanHolding(const char *id) {
 		return DreamBase::isRyanHolding(id);
 	}
-	void describeOb();
 	void getOpenedSize();
 	byte getOpenedSizeCPP();
 	void openOb();
-	void notHeldError();
-	void useGun();
 	void identifyOb();
-	void useCashCard();
 	void useStereo();
 	void selectOb();
 	void findInvPos();
 	uint16 findInvPosCPP();
 	void setPickup();
-	void showDiaryKeys();
 	void showKeys();
 	void getKeyAndLogo();
 	void deleteExObject();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index e891298f2b..bbcf028b78 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -40,85 +40,85 @@ void DreamGenContext::useRoutine() {
 	static const UseListEntry kUseList[] = {
 		{ &DreamGenContext::useMon,            "NETW" },
 		{ &DreamGenContext::useElevator1,      "ELVA" },
-		{ &DreamGenContext::useElevator2,      "ELVB" },
-		{ &DreamGenContext::useElevator3,      "ELVC" },
-		{ &DreamGenContext::useElevator4,      "ELVE" },
-		{ &DreamGenContext::useElevator5,      "ELVF" },
-		{ &DreamGenContext::useChurchGate,     "CGAT" },
+		{ &DreamBase::useElevator2,            "ELVB" },
+		{ &DreamBase::useElevator3,            "ELVC" },
+		{ &DreamBase::useElevator4,            "ELVE" },
+		{ &DreamBase::useElevator5,            "ELVF" },
+		{ &DreamBase::useChurchGate,           "CGAT" },
 		{ &DreamGenContext::useStereo,         "REMO" },
 		{ &DreamGenContext::useButtonA,        "BUTA" },
-		{ &DreamGenContext::useWinch,          "CBOX" },
-		{ &DreamGenContext::useLighter,        "LITE" },
-		{ &DreamGenContext::usePlate,          "PLAT" },
-		{ &DreamGenContext::useControl,        "LIFT" },
-		{ &DreamGenContext::useWire,           "WIRE" },
-		{ &DreamGenContext::useHandle,         "HNDL" },
-		{ &DreamGenContext::useHatch,          "HACH" },
-		{ &DreamGenContext::useElvDoor,        "DOOR" },
-		{ &DreamGenContext::useCashCard,       "CSHR" },
-		{ &DreamGenContext::useGun,            "GUNA" },
-		{ &DreamGenContext::useCardReader1,    "CRAA" },
-		{ &DreamGenContext::useCardReader2,    "CRBB" },
-		{ &DreamGenContext::useCardReader3,    "CRCC" },
-		{ &DreamGenContext::sitDownInBar,      "SEAT" },
+		{ &DreamBase::useWinch,                "CBOX" },
+		{ &DreamBase::useLighter,              "LITE" },
+		{ &DreamBase::usePlate,                "PLAT" },
+		{ &DreamBase::useControl,              "LIFT" },
+		{ &DreamBase::useWire,                 "WIRE" },
+		{ &DreamBase::useHandle,               "HNDL" },
+		{ &DreamBase::useHatch,                "HACH" },
+		{ &DreamBase::useElvDoor,              "DOOR" },
+		{ &DreamBase::useCashCard,             "CSHR" },
+		{ &DreamBase::useGun,                  "GUNA" },
+		{ &DreamBase::useCardReader1,          "CRAA" },
+		{ &DreamBase::useCardReader2,          "CRBB" },
+		{ &DreamBase::useCardReader3,          "CRCC" },
+		{ &DreamBase::sitDownInBar,            "SEAT" },
 		{ &DreamGenContext::useMenu,           "MENU" },
-		{ &DreamGenContext::useCooker,         "COOK" },
-		{ &DreamGenContext::callHotelLift,     "ELCA" },
-		{ &DreamGenContext::callEdensLift,     "EDCA" },
-		{ &DreamGenContext::callEdensDLift,    "DDCA" },
-		{ &DreamGenContext::useAltar,          "ALTR" },
-		{ &DreamGenContext::openHotelDoor,     "LOKA" },
-		{ &DreamGenContext::openHotelDoor2,    "LOKB" },
-		{ &DreamGenContext::openLouis,         "ENTA" },
-		{ &DreamGenContext::openRyan,          "ENTB" },
-		{ &DreamGenContext::openPoolBoss,      "ENTE" },
-		{ &DreamGenContext::openYourNeighbour, "ENTC" },
-		{ &DreamGenContext::openEden,          "ENTD" },
-		{ &DreamGenContext::openSarters,       "ENTH" },
+		{ &DreamBase::useCooker,               "COOK" },
+		{ &DreamBase::callHotelLift,           "ELCA" },
+		{ &DreamBase::callEdensLift,           "EDCA" },
+		{ &DreamBase::callEdensDLift,          "DDCA" },
+		{ &DreamBase::useAltar,                "ALTR" },
+		{ &DreamBase::openHotelDoor,           "LOKA" },
+		{ &DreamBase::openHotelDoor2,          "LOKB" },
+		{ &DreamBase::openLouis,               "ENTA" },
+		{ &DreamBase::openRyan,                "ENTB" },
+		{ &DreamBase::openPoolBoss,            "ENTE" },
+		{ &DreamBase::openYourNeighbour,       "ENTC" },
+		{ &DreamBase::openEden,                "ENTD" },
+		{ &DreamBase::openSarters,             "ENTH" },
 		{ &DreamGenContext::wearWatch,         "WWAT" },
-		{ &DreamGenContext::usePoolReader,     "POOL" },
+		{ &DreamBase::usePoolReader,           "POOL" },
 		{ &DreamGenContext::wearShades,        "WSHD" },
-		{ &DreamGenContext::grafittiDoor,      "GRAF" },
-		{ &DreamGenContext::trapDoor,          "TRAP" },
-		{ &DreamGenContext::edensCDPlayer,     "CDPE" },
-		{ &DreamGenContext::openTVDoor,        "DLOK" },
-		{ &DreamGenContext::useHole,           "HOLE" },
-		{ &DreamGenContext::useDryer,          "DRYR" },
-		{ &DreamGenContext::useChurchHole,     "HOLY" },
-		{ &DreamGenContext::useWall,           "WALL" },
-		{ &DreamGenContext::useDiary,          "BOOK" },
-		{ &DreamGenContext::useAxe,            "AXED" },
-		{ &DreamGenContext::useShield,         "SHLD" },
-		{ &DreamGenContext::useRailing,        "BCNY" },
-		{ &DreamGenContext::useCoveredBox,     "LIDC" },
-		{ &DreamGenContext::useClearBox,       "LIDU" },
-		{ &DreamGenContext::useOpenBox,        "LIDO" },
-		{ &DreamGenContext::usePipe,           "PIPE" },
-		{ &DreamGenContext::useBalcony,        "BALC" },
-		{ &DreamGenContext::useWindow,         "WIND" },
-		{ &DreamGenContext::viewFolder,        "PAPR" },
+		{ &DreamBase::grafittiDoor,            "GRAF" },
+		{ &DreamBase::trapDoor,                "TRAP" },
+		{ &DreamBase::edensCDPlayer,           "CDPE" },
+		{ &DreamBase::openTVDoor,              "DLOK" },
+		{ &DreamBase::useHole,                 "HOLE" },
+		{ &DreamBase::useDryer,                "DRYR" },
+		{ &DreamBase::useChurchHole,           "HOLY" },
+		{ &DreamBase::useWall,                 "WALL" },
+		{ &DreamBase::useDiary,                "BOOK" },
+		{ &DreamBase::useAxe,                  "AXED" },
+		{ &DreamBase::useShield,               "SHLD" },
+		{ &DreamBase::useRailing,              "BCNY" },
+		{ &DreamBase::useCoveredBox,           "LIDC" },
+		{ &DreamBase::useClearBox,             "LIDU" },
+		{ &DreamBase::useOpenBox,              "LIDO" },
+		{ &DreamBase::usePipe,                 "PIPE" },
+		{ &DreamBase::useBalcony,              "BALC" },
+		{ &DreamBase::useWindow,               "WIND" },
+		{ &DreamBase::viewFolder,              "PAPR" },
 		{ &DreamGenContext::useTrainer,        "UWTA" },
 		{ &DreamGenContext::useTrainer,        "UWTB" },
 		{ &DreamGenContext::enterSymbol,       "STAT" },
-		{ &DreamGenContext::openTomb,          "TLID" },
-		{ &DreamGenContext::useSLab,           "SLAB" },
-		{ &DreamGenContext::useCart,           "CART" },
-		{ &DreamGenContext::useFullCart,       "FCAR" },
-		{ &DreamGenContext::sLabDoorA,         "SLBA" },
-		{ &DreamGenContext::sLabDoorB,         "SLBB" },
-		{ &DreamGenContext::sLabDoorC,         "SLBC" },
-		{ &DreamGenContext::sLabDoorD,         "SLBD" },
-		{ &DreamGenContext::sLabDoorE,         "SLBE" },
-		{ &DreamGenContext::sLabDoorF,         "SLBF" },
-		{ &DreamGenContext::usePlinth,         "PLIN" },
-		{ &DreamGenContext::useLadder,         "LADD" },
-		{ &DreamGenContext::useLadderB,        "LADB" },
+		{ &DreamBase::openTomb,                "TLID" },
+		{ &DreamBase::useSlab,                 "SLAB" },
+		{ &DreamBase::useCart,                 "CART" },
+		{ &DreamBase::useFullCart,             "FCAR" },
+		{ &DreamBase::slabDoorA,               "SLBA" },
+		{ &DreamBase::slabDoorB,               "SLBB" },
+		{ &DreamBase::slabDoorC,               "SLBC" },
+		{ &DreamBase::slabDoorD,               "SLBD" },
+		{ &DreamBase::slabDoorE,               "SLBE" },
+		{ &DreamBase::slabDoorF,               "SLBF" },
+		{ &DreamBase::usePlinth,               "PLIN" },
+		{ &DreamBase::useLadder,               "LADD" },
+		{ &DreamBase::useLadderB,              "LADB" },
 		{ &DreamGenContext::chewy,             "GUMA" },
-		{ &DreamGenContext::wheelSound,        "SQEE" },
-		{ &DreamGenContext::runTap,            "TAPP" },
-		{ &DreamGenContext::playGuitar,        "GUIT" },
-		{ &DreamGenContext::hotelControl,      "CONT" },
-		{ &DreamGenContext::hotelBell,         "BELL" },
+		{ &DreamBase::wheelSound,              "SQEE" },
+		{ &DreamBase::runTap,                  "TAPP" },
+		{ &DreamBase::playGuitar,              "GUIT" },
+		{ &DreamBase::hotelControl,            "CONT" },
+		{ &DreamBase::hotelBell,               "BELL" },
 	};
 
 	if (data.byte(kReallocation) >= 50) {
@@ -164,7 +164,7 @@ void DreamGenContext::useRoutine() {
 	data.byte(kCommandtype) = 255;
 }
 
-void DreamGenContext::useText(const uint8 *string) {
+void DreamBase::useText(const uint8 *string) {
 	createPanel();
 	showPanel();
 	showMan();
@@ -174,7 +174,7 @@ void DreamGenContext::useText(const uint8 *string) {
 	workToScreenM();
 }
 
-void DreamGenContext::showFirstUse() {
+void DreamBase::showFirstUse() {
 	const uint8 *obText = getObTextStart();
 	findNextColon(&obText);
 	findNextColon(&obText);
@@ -182,7 +182,7 @@ void DreamGenContext::showFirstUse() {
 	hangOnP(400);
 }
 
-void DreamGenContext::showSecondUse() {
+void DreamBase::showSecondUse() {
 	const uint8 *obText = getObTextStart();
 	findNextColon(&obText);
 	findNextColon(&obText);
@@ -191,7 +191,7 @@ void DreamGenContext::showSecondUse() {
 	hangOnP(400);
 }
 
-void DreamGenContext::viewFolder() {
+void DreamBase::viewFolder() {
 	data.byte(kManisoffscreen) = 1;
 	getRidOfAll();
 	loadFolder();
@@ -220,7 +220,7 @@ void DreamGenContext::viewFolder() {
 	workToScreenM();
 }
 
-void DreamGenContext::edensCDPlayer() {
+void DreamBase::edensCDPlayer() {
 	showFirstUse();
 	data.word(kWatchingtime) = 18 * 2;
 	data.word(kReeltowatch) = 25;
@@ -230,13 +230,13 @@ void DreamGenContext::edensCDPlayer() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::hotelBell() {
+void DreamBase::hotelBell() {
 	playChannel1(12);
 	showFirstUse();
 	putBackObStuff();
 }
 
-void DreamGenContext::playGuitar() {
+void DreamBase::playGuitar() {
 	playChannel1(14);
 	showFirstUse();
 	putBackObStuff();
@@ -248,7 +248,7 @@ void DreamGenContext::useElevator1() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useElevator2() {
+void DreamBase::useElevator2() {
 	showFirstUse();
 
 	if (data.byte(kLocation) == 23)	// In pool hall
@@ -262,7 +262,7 @@ void DreamGenContext::useElevator2() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useElevator3() {
+void DreamBase::useElevator3() {
 	showFirstUse();
 	data.byte(kCounttoclose) = 20;
 	data.byte(kNewlocation) = 34;
@@ -274,7 +274,7 @@ void DreamGenContext::useElevator3() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useElevator4() {
+void DreamBase::useElevator4() {
 	showFirstUse();
 	data.word(kReeltowatch) = 0;
 	data.word(kEndwatchreel) = 11;
@@ -286,7 +286,7 @@ void DreamGenContext::useElevator4() {
 	data.byte(kNewlocation) = 24;
 }
 
-void DreamGenContext::useElevator5() {
+void DreamBase::useElevator5() {
 	placeSetObject(4);
 	removeSetObject(0);
 	data.byte(kNewlocation) = 20;
@@ -296,19 +296,19 @@ void DreamGenContext::useElevator5() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useHatch() {
+void DreamBase::useHatch() {
 	showFirstUse();
 	data.byte(kNewlocation) = 40;
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::wheelSound() {
+void DreamBase::wheelSound() {
 	playChannel1(17);
 	showFirstUse();
 	putBackObStuff();
 }
 
-void DreamGenContext::callHotelLift() {
+void DreamBase::callHotelLift() {
 	playChannel1(12);
 	showFirstUse();
 	data.byte(kCounttoopen) = 8;
@@ -319,7 +319,7 @@ void DreamGenContext::callHotelLift() {
 	turnPathOn(4);
 }
 
-void DreamGenContext::useShield() {
+void DreamBase::useShield() {
 	if (data.byte(kReallocation) != 20 || data.byte(kCombatcount) == 0) {
 		// Not in Sart room
 		showFirstUse();
@@ -333,7 +333,7 @@ void DreamGenContext::useShield() {
 	}
 }
 
-void DreamGenContext::useCoveredBox() {
+void DreamBase::useCoveredBox() {
 	data.byte(kProgresspoints)++;
 	showFirstUse();
 	data.word(kWatchingtime) = 50;
@@ -344,7 +344,7 @@ void DreamGenContext::useCoveredBox() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useRailing() {
+void DreamBase::useRailing() {
 	showFirstUse();
 	data.word(kWatchingtime) = 80;
 	data.word(kReeltowatch) = 0;
@@ -383,7 +383,7 @@ void DreamGenContext::wearShades() {
 	}
 }
 
-void DreamGenContext::useChurchHole() {
+void DreamBase::useChurchHole() {
 	showFirstUse();
 	data.byte(kGetback) = 1;
 	data.word(kWatchingtime) = 28;
@@ -393,7 +393,7 @@ void DreamGenContext::useChurchHole() {
 	data.byte(kSpeedcount) = 1;
 }
 
-void DreamGenContext::sitDownInBar() {
+void DreamBase::sitDownInBar() {
 	if (data.byte(kWatchmode) != 0xFF) {
 		// Sat down
 		showSecondUse();
@@ -411,13 +411,13 @@ void DreamGenContext::sitDownInBar() {
 	}
 }
 
-void DreamGenContext::useDryer() {
+void DreamBase::useDryer() {
 	playChannel1(12);
 	showFirstUse();
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useBalcony() {
+void DreamBase::useBalcony() {
 	showFirstUse();
 	turnPathOn(6);
 	turnPathOff(0);
@@ -441,7 +441,7 @@ void DreamGenContext::useBalcony() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useWindow() {
+void DreamBase::useWindow() {
 	if (data.byte(kManspath) != 6) {
 		// Not on balcony
 		showSecondUse();
@@ -454,7 +454,7 @@ void DreamGenContext::useWindow() {
 	}
 }
 
-void DreamGenContext::trapDoor() {
+void DreamBase::trapDoor() {
 	data.byte(kProgresspoints)++;
 	showFirstUse();
 	switchRyanOff();
@@ -467,14 +467,14 @@ void DreamGenContext::trapDoor() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::callEdensLift() {
+void DreamBase::callEdensLift() {
 	showFirstUse();
 	data.byte(kCounttoopen) = 8;
 	data.byte(kGetback) = 1;
 	turnPathOn(2);
 }
 
-void DreamGenContext::callEdensDLift() {
+void DreamBase::callEdensDLift() {
 	if (data.byte(kLiftflag) == 1) {
 		// Eden's D here
 		showSecondUse();
@@ -487,38 +487,38 @@ void DreamGenContext::callEdensDLift() {
 	}
 }
 
-void DreamGenContext::openYourNeighbour() {
+void DreamBase::openYourNeighbour() {
 	enterCode(255, 255, 255, 255);
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openRyan() {
+void DreamBase::openRyan() {
 	enterCode(5, 1, 0, 6);
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openPoolBoss() {
+void DreamBase::openPoolBoss() {
 	enterCode(5, 2, 2, 2);
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openEden() {
+void DreamBase::openEden() {
 	enterCode(2, 8, 6, 5);
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openSarters() {
+void DreamBase::openSarters() {
 	enterCode(7, 8, 3, 3);
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openLouis() {
+void DreamBase::openLouis() {
 	enterCode(5, 2, 3, 8);
 	data.byte(kGetback) = 1;
 }
 
 
-void DreamGenContext::useWall() {
+void DreamBase::useWall() {
 	showFirstUse();
 
 	if (data.byte(kManspath) != 3) {
@@ -561,7 +561,7 @@ void DreamGenContext::useWall() {
 	}
 }
 
-void DreamGenContext::useLadder() {
+void DreamBase::useLadder() {
 	showFirstUse();
 	data.byte(kMapx) = data.byte(kMapx) - 11;
 	findRoomInLoc();
@@ -575,7 +575,7 @@ void DreamGenContext::useLadder() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useLadderB() {
+void DreamBase::useLadderB() {
 	showFirstUse();
 	data.byte(kMapx) = data.byte(kMapx) + 11;
 	findRoomInLoc();
@@ -589,7 +589,7 @@ void DreamGenContext::useLadderB() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::sLabDoorA() {
+void DreamBase::slabDoorA() {
 	showFirstUse();
 	data.byte(kGetback) = 1;
 	data.byte(kWatchspeed) = 1;
@@ -609,7 +609,7 @@ void DreamGenContext::sLabDoorA() {
 	}
 }
 
-void DreamGenContext::sLabDoorB() {
+void DreamBase::slabDoorB() {
 	if (data.byte(kDreamnumber) != 1) {
 		// Wrong
 		showFirstUse();
@@ -641,7 +641,7 @@ void DreamGenContext::sLabDoorB() {
 	}
 }
 
-void DreamGenContext::sLabDoorC() {
+void DreamBase::slabDoorC() {
 	showFirstUse();
 	data.byte(kGetback) = 1;
 	data.byte(kWatchspeed) = 1;
@@ -661,7 +661,7 @@ void DreamGenContext::sLabDoorC() {
 	}
 }
 
-void DreamGenContext::sLabDoorD() {
+void DreamBase::slabDoorD() {
 	showFirstUse();
 	data.byte(kGetback) = 1;
 	data.byte(kWatchspeed) = 1;
@@ -681,7 +681,7 @@ void DreamGenContext::sLabDoorD() {
 	}
 }
 
-void DreamGenContext::sLabDoorE() {
+void DreamBase::slabDoorE() {
 	showFirstUse();
 	data.byte(kGetback) = 1;
 	data.byte(kWatchspeed) = 1;
@@ -701,7 +701,7 @@ void DreamGenContext::sLabDoorE() {
 	}
 }
 
-void DreamGenContext::sLabDoorF() {
+void DreamBase::slabDoorF() {
 	showFirstUse();
 	data.byte(kGetback) = 1;
 	data.byte(kWatchspeed) = 1;
@@ -721,7 +721,7 @@ void DreamGenContext::sLabDoorF() {
 	}
 }
 
-bool DreamGenContext::defaultUseHandler(const char *id) {
+bool DreamBase::defaultUseHandler(const char *id) {
 	if (data.byte(kWithobject) == 255) {
 		withWhat();
 		return true;	// event handled
@@ -737,7 +737,7 @@ bool DreamGenContext::defaultUseHandler(const char *id) {
 	return false;	// continue with the original event
 }
 
-void DreamGenContext::useChurchGate() {
+void DreamBase::useChurchGate() {
 	if (defaultUseHandler("CUTT"))
 		return;
 
@@ -755,7 +755,7 @@ void DreamGenContext::useChurchGate() {
 		turnPathOn(2);	// Open church
 }
 
-void DreamGenContext::useGun() {
+void DreamBase::useGun() {
 
 	if (data.byte(kObjecttype) != kExObjectType) {
 		// gun is not taken
@@ -866,7 +866,7 @@ void DreamGenContext::useGun() {
 	}
 }
 
-void DreamGenContext::useFullCart() {
+void DreamBase::useFullCart() {
 	data.byte(kProgresspoints)++;
 	turnAnyPathOn(2, data.byte(kRoomnum) + 6);
 	data.byte(kManspath) = 4;
@@ -884,7 +884,7 @@ void DreamGenContext::useFullCart() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useClearBox() {
+void DreamBase::useClearBox() {
 	if (defaultUseHandler("RAIL"))
 		return;
 
@@ -899,7 +899,7 @@ void DreamGenContext::useClearBox() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openTVDoor() {
+void DreamBase::openTVDoor() {
 	if (defaultUseHandler("ULOK"))
 		return;
 
@@ -909,7 +909,7 @@ void DreamGenContext::openTVDoor() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::usePlate() {
+void DreamBase::usePlate() {
 	if (data.byte(kWithobject) == 255) {
 		withWhat();
 		return;
@@ -936,7 +936,7 @@ void DreamGenContext::usePlate() {
 	}
 }
 
-void DreamGenContext::usePlinth() {
+void DreamBase::usePlinth() {
 	if (data.byte(kWithobject) == 255) {
 		withWhat();
 		return;
@@ -959,7 +959,7 @@ void DreamGenContext::usePlinth() {
 	}
 }
 
-void DreamGenContext::useElvDoor() {
+void DreamBase::useElvDoor() {
 	if (defaultUseHandler("AXED"))
 		return;
 
@@ -989,7 +989,7 @@ void DreamGenContext::useObject() {
 		useRoutine();
 }
 
-void DreamGenContext::useWinch() {
+void DreamBase::useWinch() {
 	uint16 contentIndex = checkInside(40, 1);
 	if (contentIndex == kNumexobjects || !compare(contentIndex, kExObjectType, "FUSE")) {
 		// No winch
@@ -1013,7 +1013,7 @@ void DreamGenContext::useWinch() {
 	data.byte(kProgresspoints)++;
 }
 
-void DreamGenContext::useCart() {
+void DreamBase::useCart() {
 	if (defaultUseHandler("ROCK"))
 		return;
 
@@ -1048,7 +1048,7 @@ void DreamGenContext::chewy() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useHole() {
+void DreamBase::useHole() {
 	if (defaultUseHandler("HNDA"))
 		return;
 
@@ -1060,7 +1060,7 @@ void DreamGenContext::useHole() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openHotelDoor() {
+void DreamBase::openHotelDoor() {
 	if (defaultUseHandler("KEYA"))
 		return;
 
@@ -1070,7 +1070,7 @@ void DreamGenContext::openHotelDoor() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openHotelDoor2() {
+void DreamBase::openHotelDoor2() {
 	if (defaultUseHandler("KEYA"))
 		return;
 
@@ -1079,7 +1079,7 @@ void DreamGenContext::openHotelDoor2() {
 	putBackObStuff();
 }
 
-void DreamGenContext::grafittiDoor() {
+void DreamBase::grafittiDoor() {
 	if (defaultUseHandler("APEN"))
 		return;
 
@@ -1087,7 +1087,7 @@ void DreamGenContext::grafittiDoor() {
 	putBackObStuff();
 }
 
-void DreamGenContext::usePoolReader() {
+void DreamBase::usePoolReader() {
 	if (defaultUseHandler("MEMB"))
 		return;
 
@@ -1103,7 +1103,7 @@ void DreamGenContext::usePoolReader() {
 	}
 }
 
-void DreamGenContext::useCardReader1() {
+void DreamBase::useCardReader1() {
 	if (defaultUseHandler("CSHR"))
 		return;
 
@@ -1125,7 +1125,7 @@ void DreamGenContext::useCardReader1() {
 	}
 }
 
-void DreamGenContext::useCardReader2() {
+void DreamBase::useCardReader2() {
 	if (defaultUseHandler("CSHR"))
 		return;
 
@@ -1152,7 +1152,7 @@ void DreamGenContext::useCardReader2() {
 	}
 }
 
-void DreamGenContext::useCardReader3() {
+void DreamBase::useCardReader3() {
 	if (defaultUseHandler("CSHR"))
 		return;
 
@@ -1174,7 +1174,7 @@ void DreamGenContext::useCardReader3() {
 	}
 }
 
-void DreamGenContext::useLighter() {
+void DreamBase::useLighter() {
 	if (data.byte(kWithobject) == 255) {
 		withWhat();
 		return;
@@ -1191,7 +1191,7 @@ void DreamGenContext::useLighter() {
 	}
 }
 
-void DreamGenContext::useWire() {
+void DreamBase::useWire() {
 	if (data.byte(kWithobject) == 255) {
 		withWhat();
 		return;
@@ -1216,7 +1216,7 @@ void DreamGenContext::useWire() {
 	putBackObStuff();
 }
 
-void DreamGenContext::openTomb() {
+void DreamBase::openTomb() {
 	data.byte(kProgresspoints)++;
 	showFirstUse();
 	data.word(kWatchingtime) = 35 * 2;
@@ -1227,7 +1227,7 @@ void DreamGenContext::openTomb() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::hotelControl() {
+void DreamBase::hotelControl() {
 	if (data.byte(kReallocation) != 21 || data.byte(kMapx) != 33)
 		showSecondUse();	// Not right control
 	else
@@ -1236,7 +1236,7 @@ void DreamGenContext::hotelControl() {
 	putBackObStuff();
 }
 
-void DreamGenContext::useCooker() {
+void DreamBase::useCooker() {
 	if (checkInside(data.byte(kCommand), data.byte(kObjecttype)) == kNumexobjects)
 		showFirstUse();
 	else
@@ -1254,7 +1254,7 @@ void DreamBase::removeFreeObject(uint8 index) {
 	getFreeAd(index)->mapad[0] = 0xFF;
 }
 
-void DreamGenContext::useDiary() {
+void DreamBase::useDiary() {
 	getRidOfReels();
 	loadIntoTemp("DREAMWEB.G14");
 	loadTempText("DREAMWEB.T51");
@@ -1300,7 +1300,7 @@ void DreamGenContext::useDiary() {
 	workToScreenM();
 }
 
-void DreamGenContext::useControl() {
+void DreamBase::useControl() {
 	if (data.byte(kWithobject) == 255) {
 		withWhat();
 		return;
@@ -1353,7 +1353,7 @@ void DreamGenContext::useControl() {
 	}
 }
 
-void DreamGenContext::useSLab() {
+void DreamBase::useSlab() {
 	if (data.byte(kWithobject) == 255) {
 		withWhat();
 		return;
@@ -1385,7 +1385,7 @@ void DreamGenContext::useSLab() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::usePipe() {
+void DreamBase::usePipe() {
 	if (data.byte(kWithobject) == 255) {
 		withWhat();
 		return;
@@ -1408,7 +1408,7 @@ void DreamGenContext::usePipe() {
 	}
 }
 
-void DreamGenContext::useOpenBox() {
+void DreamBase::useOpenBox() {
 	if (data.byte(kWithobject) == 255) {
 		withWhat();
 		return;
@@ -1440,7 +1440,7 @@ void DreamGenContext::useOpenBox() {
 	showFirstUse();
 }
 
-void DreamGenContext::runTap() {
+void DreamBase::runTap() {
 	if (data.byte(kWithobject) == 255) {
 		withWhat();
 		return;
@@ -1467,7 +1467,7 @@ void DreamGenContext::runTap() {
 	putBackObStuff();
 }
 
-void DreamGenContext::useAxe() {
+void DreamBase::useAxe() {
 	if (data.byte(kReallocation) != 22) {
 		// Not in pool
 		showFirstUse();
@@ -1528,7 +1528,7 @@ void DreamGenContext::useKey() {
 	}
 }
 
-void DreamGenContext::useHandle() {
+void DreamBase::useHandle() {
 	SetObject *object = getSetAd(findSetObject("CUTW"));
 	if (object->mapad[0] == 255) {
 		// Wire not cut
@@ -1542,7 +1542,7 @@ void DreamGenContext::useHandle() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useAltar() {
+void DreamBase::useAltar() {
 	if (findExObject("CNDA") == 114 || findExObject("CNDB") == 114) {
 		// Things on altar
 		showFirstUse();
@@ -1590,7 +1590,7 @@ void DreamBase::withWhat() {
 	data.byte(kInvopen) = 2;
 }
 
-void DreamGenContext::notHeldError() {
+void DreamBase::notHeldError() {
 	createPanel();
 	showPanel();
 	showMan();
@@ -1602,7 +1602,7 @@ void DreamGenContext::notHeldError() {
 	putBackObStuff();
 }
 
-void DreamGenContext::useCashCard() {
+void DreamBase::useCashCard() {
 	getRidOfReels();
 	loadKeypad();
 	createPanel();
-- 
cgit v1.2.3


From 42068065b57993c865823ff56e81bd7a87aa0278 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 24 Dec 2011 13:55:56 +0100
Subject: DREAMWEB: Move more functions to DreamBase

---
 engines/dreamweb/dreambase.h | 14 +++++++++
 engines/dreamweb/monitor.cpp |  2 +-
 engines/dreamweb/object.cpp  | 14 ++-------
 engines/dreamweb/stubs.cpp   | 71 ++++++--------------------------------------
 engines/dreamweb/stubs.h     | 36 ----------------------
 engines/dreamweb/use.cpp     | 39 ++++++++++++++++++------
 6 files changed, 57 insertions(+), 119 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 720fcb3116..750cffdeac 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -169,6 +169,7 @@ public:
 	void loadPersonal();
 	void loadNews();
 	void loadCart();
+	void showKeys();
 
 	// from newplace.cpp
 	void getUnderCentre();
@@ -190,6 +191,9 @@ public:
 	void deleteExText(uint8 textNum);
 	void purgeALocation(uint8 index);
 	const uint8 *getObTextStart();
+	void wornError();
+	void makeWorn(DynObject *object);
+	void dropObject();
 
 	// from pathfind.cpp
 	void turnPathOn(uint8 param);
@@ -527,6 +531,12 @@ public:
 	void showDiaryPage();
 	void showDiaryKeys();
 	void dumpDiaryKeys();
+	void useMenu();
+	void incRyanPage();
+	void edensFlatReminders();
+	void dropError();
+	void cantDrop();
+	void entryAnims();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
@@ -610,6 +620,10 @@ public:
 	void useAltar();
 	void notHeldError();
 	void useCashCard();
+	void useButtonA();
+	void wearWatch();
+	void wearShades();
+	void useTrainer();
 
 	// from vgafades.cpp
 	void clearStartPal();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 9a1076a92f..3ee68e897c 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -426,7 +426,7 @@ void DreamBase::loadCart() {
 		data.word(kTextfile3) = standardLoad("DREAMWEB.T24"); // monitor file 24
 }
 
-void DreamGenContext::showKeys() {
+void DreamBase::showKeys() {
 	randomAccess(10);
 	scrollMonitor();
 	monMessage(18);
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 04081e2f0e..1245187a92 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -66,7 +66,7 @@ bool DreamBase::isItWorn(const DynObject *object) {
 	return (object->id[0] == 'W'-'A') && (object->id[1] == 'E'-'A');
 }
 
-void DreamGenContext::wornError() {
+void DreamBase::wornError() {
 	data.byte(kCommandtype) = 255;
 	delPointer();
 	printMessage(76, 21, 57, 240, false);
@@ -79,7 +79,7 @@ void DreamGenContext::wornError() {
 	workToScreenM();
 }
 
-void DreamGenContext::makeWorn(DynObject *object) {
+void DreamBase::makeWorn(DynObject *object) {
 	object->id[0] = 'W'-'A';
 	object->id[1] = 'E'-'A';
 }
@@ -461,10 +461,6 @@ void DreamGenContext::setPickup() {
 	workToScreenM();
 }
 
-void DreamGenContext::deleteExFrame() {
-	deleteExFrame(al);
-}
-
 void DreamBase::deleteExFrame(uint8 frameNum) {
 	Frame *frame = (Frame *)getSegment(data.word(kExtras)).ptr(kExframedata + sizeof(Frame)*frameNum, sizeof(Frame));
 
@@ -488,10 +484,6 @@ void DreamBase::deleteExFrame(uint8 frameNum) {
 	}
 }
 
-void DreamGenContext::deleteExText() {
-	deleteExText(al);
-}
-
 void DreamBase::deleteExText(uint8 textNum) {
 	uint16 offset = getSegment(data.word(kExtras)).word(kExtextdat + 2*textNum);
 
@@ -704,7 +696,7 @@ const uint8 *DreamBase::getObTextStart() {
 	}
 }
 
-void DreamGenContext::dropObject() {
+void DreamBase::dropObject() {
 	if (data.byte(kCommandtype) != 223) {
 		data.byte(kCommandtype) = 223;
 		if (!data.byte(kPickup)) {
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 9a7b66ac72..0f5b6541d7 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1708,18 +1708,6 @@ uint16 DreamBase::findSetObject(const char *id) {
 	return 128;
 }
 
-void DreamGenContext::findExObject() {
-	char id[5];
-	id[0] = al;
-	id[1] = ah;
-	id[2] = cl;
-	id[3] = ch;
-	id[4] = '\0';
-	al = findExObject(id);
-	es = data.word(kExtras);
-	bx = kExdata + al * 16;
-}
-
 uint16 DreamBase::findExObject(const char *id) {
 	for (uint16 index = 0; index < kNumexobjects; index++) {
 		if (objectMatches(getExAd(index), id))
@@ -1729,16 +1717,6 @@ uint16 DreamBase::findExObject(const char *id) {
 	return kNumexobjects;
 }
 
-void DreamGenContext::isRyanHolding() {
-	char id[5];
-	id[0] = al;
-	id[1] = ah;
-	id[2] = cl;
-	id[3] = ch;
-	id[4] = '\0';
-	flags._z = !isRyanHolding(id);
-}
-
 bool DreamBase::isRyanHolding(const char *id) {
 	for (uint16 index = 0; index < kNumexobjects; index++) {
 		DynObject *object = getExAd(index);
@@ -1859,13 +1837,6 @@ void DreamBase::hangOnP(uint16 count) {
 	data.byte(kPointermode) = 0;
 }
 
-void DreamGenContext::findNextColon() {
-	const uint8 *initialString = es.ptr(si, 0);
-	const uint8 *string = initialString;
-	al = findNextColon(&string);
-	si += (string - initialString);
-}
-
 uint8 DreamBase::findNextColon(const uint8 **string) {
 	uint8 c;
 	do {
@@ -2572,7 +2543,7 @@ void DreamBase::dumpMenu() {
 	multiDump(kMenux, kMenuy, 48, 48);
 }
 
-void DreamGenContext::useMenu() {
+void DreamBase::useMenu() {
 	getRidOfReels();
 	loadMenu();
 	createPanel();
@@ -3296,7 +3267,7 @@ void DreamBase::diaryKeyN() {
 		data.byte(kDiarypage) = 0;
 }
 
-void DreamGenContext::dropError() {
+void DreamBase::dropError() {
 	data.byte(kCommandtype) = 255;
 	delPointer();
 	printMessage(76, 21, 56, 240, 240 & 1);
@@ -3309,7 +3280,7 @@ void DreamGenContext::dropError() {
 	workToScreenM();
 }
 
-void DreamGenContext::cantDrop() {
+void DreamBase::cantDrop() {
 	data.byte(kCommandtype) = 255;
 	delPointer();
 	printMessage(76, 21, 24, 240, 240 & 1);
@@ -3344,26 +3315,6 @@ void DreamBase::getBack1() {
 	}
 }
 
-void DreamGenContext::useButtonA() {
-	if (!isSetObOnMap(95)) {
-		showFirstUse();
-		turnAnyPathOn(0, data.byte(kRoomnum) - 1);
-		removeSetObject(9);
-		placeSetObject(95);
-		data.word(kWatchingtime) = 15 * 2;
-		data.word(kReeltowatch) = 71;
-		data.word(kEndwatchreel) = 85;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
-		data.byte(kGetback) = 1;
-		data.byte(kProgresspoints)++;
-	} else {
-		// Done this bit
-		showSecondUse();
-		putBackObStuff();
-	}
-}
-
 void DreamBase::autoAppear() {
 	if (data.byte(kLocation) == 32) {
 		// In alley
@@ -3417,10 +3368,6 @@ void DreamBase::quitKey() {
 		data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::setupTimedUse() {
-	DreamBase::setupTimedUse(al, cx, dx, bl, bh);
-}
-
 void DreamBase::setupTimedUse(uint16 textIndex, uint16 countToTimed, uint16 timeCount, byte x, byte y) {
 	if (data.word(kTimecount) != 0)
 		return; // can't setup
@@ -3463,7 +3410,7 @@ void DreamBase::entryTexts() {
 	}
 }
 
-void DreamGenContext::entryAnims() {
+void DreamBase::entryAnims() {
 	data.word(kReeltowatch) = 0xFFFF;
 	data.byte(kWatchmode) = (byte)-1;
 
@@ -3731,7 +3678,7 @@ void DreamBase::showDiaryKeys() {
 		showDiaryPage();
 }
 
-void DreamGenContext::edensFlatReminders() {
+void DreamBase::edensFlatReminders() {
 	if (data.byte(kReallocation) != 24 || data.byte(kMapx) != 44)
 		return; // not in Eden's lift
 
@@ -3740,18 +3687,18 @@ void DreamGenContext::edensFlatReminders() {
 
 	uint16 exObjextIndex = findExObject("CSHR");
 	if (!isRyanHolding("DKEY") || exObjextIndex == kNumexobjects) {
-		DreamBase::setupTimedUse(50, 48, 8, 54, 70);	// forgot something
+		setupTimedUse(50, 48, 8, 54, 70);	// forgot something
 		return;
 	}
 
 	DynObject *object = getExAd(exObjextIndex);
 
 	if (object->mapad[0] != 4) {
-		DreamBase::setupTimedUse(50, 48, 8, 54, 70);	// forgot something
+		setupTimedUse(50, 48, 8, 54, 70);	// forgot something
 		return;
 	} else if (object->mapad[1] != 255) {
 		if (!compare(object->mapad[1], object->mapad[0], "PURS")) {
-			DreamBase::setupTimedUse(50, 48, 8, 54, 70);	// forgot something
+			setupTimedUse(50, 48, 8, 54, 70);	// forgot something
 			return;
 		}
 	}
@@ -3759,7 +3706,7 @@ void DreamGenContext::edensFlatReminders() {
 	data.byte(kProgresspoints)++;	// got card
 }
 
-void DreamGenContext::incRyanPage() {
+void DreamBase::incRyanPage() {
 	if (data.byte(kCommandtype) != 222) {
 		data.byte(kCommandtype) = 222;
 		commandOnly(31);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index da14962a27..b24185b82d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -103,8 +103,6 @@
 	bool isItWorn(const DynObject *object) {
 		return DreamBase::isItWorn(object);
 	}
-	void wornError();
-	void makeWorn(DynObject *object);
 	void obToInv();
 	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 		DreamBase::obToInv(index, flag, x, y);
@@ -114,11 +112,6 @@
 	void hangOn(uint16 frameCount) {
 		DreamBase::hangOn(frameCount);
 	}
-	uint8 findNextColon(const uint8 **string) {
-		return DreamBase::findNextColon(string);
-	}
-	void findNextColon();
-	const uint8 *getObTextStartCPP();
 	void showCity();
 	uint16 getPersFrame(uint8 index);
 	void convIcons();
@@ -127,7 +120,6 @@
 	void transferText();
 	void watchCount();
 	void readSetData();
-	void useMenu();
 	void useMon();
 	void makeCaps();
 	byte makeCaps(byte c) {
@@ -156,8 +148,6 @@
 	void useElevator1();
 	void useKey();
 	void useObject();
-	void wearWatch();
-	void wearShades();
 	void singleKey(uint8 key, uint16 x, uint16 y);
 	uint8 nextSymbol(uint8 symbol);
 	void showSymbol();
@@ -177,7 +167,6 @@
 	void afterIntroRoom();
 	void gettingShot();
 	void allPointer();
-	void useTrainer();
 	void chewy();
 	void delEverything();
 	void errorMessage1();
@@ -201,28 +190,15 @@
 	void hangOnPQ();
 	void showGun();
 	void endGame();
-	void dropError();
-	void cantDrop();
 	void newPlace();
 	void monkSpeaking();
 	void rollEndCredits2();
-	void useButtonA();
-	void setupTimedUse();
-	void entryAnims();
 	void triggerMessage(uint16 index);
 	void processTrigger();
 	void updateSymbolTop();
 	void updateSymbolBot();
 	void runEndSeq();
 	bool execCommand();
-	void findExObject();
-	uint16 findExObject(const char *id) {
-		return DreamBase::findExObject(id);
-	}
-	void isRyanHolding();
-	bool isRyanHolding(const char *id) {
-		return DreamBase::isRyanHolding(id);
-	}
 	void getOpenedSize();
 	byte getOpenedSizeCPP();
 	void openOb();
@@ -232,26 +208,14 @@
 	void findInvPos();
 	uint16 findInvPosCPP();
 	void setPickup();
-	void showKeys();
 	void getKeyAndLogo();
 	void deleteExObject();
 	void deleteExObject(uint8 index) {
 		DreamBase::deleteExObject(index);
 	}
-	void deleteExFrame();
-	void deleteExFrame(uint8 frameNum) {
-		DreamBase::deleteExFrame(frameNum);
-	}
-	void deleteExText();
-	void deleteExText(uint8 textNum) {
-		DreamBase::deleteExText(textNum);
-	}
 	void signOn();
 	void lookAtPlace();
 	void inToInv();
 	void outOfInv();
-	void edensFlatReminders();
-	void incRyanPage();
-	void dropObject();
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index bbcf028b78..47c9ae62b8 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -46,7 +46,7 @@ void DreamGenContext::useRoutine() {
 		{ &DreamBase::useElevator5,            "ELVF" },
 		{ &DreamBase::useChurchGate,           "CGAT" },
 		{ &DreamGenContext::useStereo,         "REMO" },
-		{ &DreamGenContext::useButtonA,        "BUTA" },
+		{ &DreamBase::useButtonA,              "BUTA" },
 		{ &DreamBase::useWinch,                "CBOX" },
 		{ &DreamBase::useLighter,              "LITE" },
 		{ &DreamBase::usePlate,                "PLAT" },
@@ -61,7 +61,7 @@ void DreamGenContext::useRoutine() {
 		{ &DreamBase::useCardReader2,          "CRBB" },
 		{ &DreamBase::useCardReader3,          "CRCC" },
 		{ &DreamBase::sitDownInBar,            "SEAT" },
-		{ &DreamGenContext::useMenu,           "MENU" },
+		{ &DreamBase::useMenu,                 "MENU" },
 		{ &DreamBase::useCooker,               "COOK" },
 		{ &DreamBase::callHotelLift,           "ELCA" },
 		{ &DreamBase::callEdensLift,           "EDCA" },
@@ -75,9 +75,9 @@ void DreamGenContext::useRoutine() {
 		{ &DreamBase::openYourNeighbour,       "ENTC" },
 		{ &DreamBase::openEden,                "ENTD" },
 		{ &DreamBase::openSarters,             "ENTH" },
-		{ &DreamGenContext::wearWatch,         "WWAT" },
+		{ &DreamBase::wearWatch,               "WWAT" },
 		{ &DreamBase::usePoolReader,           "POOL" },
-		{ &DreamGenContext::wearShades,        "WSHD" },
+		{ &DreamBase::wearShades,              "WSHD" },
 		{ &DreamBase::grafittiDoor,            "GRAF" },
 		{ &DreamBase::trapDoor,                "TRAP" },
 		{ &DreamBase::edensCDPlayer,           "CDPE" },
@@ -97,8 +97,8 @@ void DreamGenContext::useRoutine() {
 		{ &DreamBase::useBalcony,              "BALC" },
 		{ &DreamBase::useWindow,               "WIND" },
 		{ &DreamBase::viewFolder,              "PAPR" },
-		{ &DreamGenContext::useTrainer,        "UWTA" },
-		{ &DreamGenContext::useTrainer,        "UWTB" },
+		{ &DreamBase::useTrainer,              "UWTA" },
+		{ &DreamBase::useTrainer,              "UWTB" },
 		{ &DreamGenContext::enterSymbol,       "STAT" },
 		{ &DreamBase::openTomb,                "TLID" },
 		{ &DreamBase::useSlab,                 "SLAB" },
@@ -355,7 +355,7 @@ void DreamBase::useRailing() {
 	data.byte(kMandead) = 4;
 }
 
-void DreamGenContext::wearWatch() {
+void DreamBase::wearWatch() {
 	if (data.byte(kWatchon) == 1) {
 		// Already wearing watch
 		showSecondUse();
@@ -369,7 +369,7 @@ void DreamGenContext::wearWatch() {
 	}
 }
 
-void DreamGenContext::wearShades() {
+void DreamBase::wearShades() {
 	if (data.byte(kShadeson) == 1) {
 		// Already wearing shades
 		showSecondUse();
@@ -1027,7 +1027,7 @@ void DreamBase::useCart() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useTrainer() {
+void DreamBase::useTrainer() {
 	uint8 dummy;
 	DynObject *object = (DynObject *)getAnyAd(&dummy, &dummy);
 	if (object->mapad[0] != 4) {
@@ -1684,4 +1684,25 @@ void DreamBase::showPuzText(uint16 command, uint16 count) {
 	hangOnP(count);
 }
 
+void DreamBase::useButtonA() {
+	if (!isSetObOnMap(95)) {
+		showFirstUse();
+		turnAnyPathOn(0, data.byte(kRoomnum) - 1);
+		removeSetObject(9);
+		placeSetObject(95);
+		data.word(kWatchingtime) = 15 * 2;
+		data.word(kReeltowatch) = 71;
+		data.word(kEndwatchreel) = 85;
+		data.byte(kWatchspeed) = 1;
+		data.byte(kSpeedcount) = 1;
+		data.byte(kGetback) = 1;
+		data.byte(kProgresspoints)++;
+	} else {
+		// Done this bit
+		showSecondUse();
+		putBackObStuff();
+	}
+}
+
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 854928f09a2d839c667848c2b18eb7e6b3dd6c22 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 24 Dec 2011 14:29:06 +0100
Subject: SCUMM: Rename player_appleII.* -> player_apple2.* to have the
 filenames lower case

---
 engines/scumm/player_apple2.cpp  | 500 +++++++++++++++++++++++++++++++++++++++
 engines/scumm/player_apple2.h    | 298 +++++++++++++++++++++++
 engines/scumm/player_appleII.cpp | 500 ---------------------------------------
 engines/scumm/player_appleII.h   | 298 -----------------------
 engines/scumm/scumm.cpp          |   2 +-
 5 files changed, 799 insertions(+), 799 deletions(-)
 create mode 100644 engines/scumm/player_apple2.cpp
 create mode 100644 engines/scumm/player_apple2.h
 delete mode 100644 engines/scumm/player_appleII.cpp
 delete mode 100644 engines/scumm/player_appleII.h

(limited to 'engines')

diff --git a/engines/scumm/player_apple2.cpp b/engines/scumm/player_apple2.cpp
new file mode 100644
index 0000000000..a8e150caa9
--- /dev/null
+++ b/engines/scumm/player_apple2.cpp
@@ -0,0 +1,500 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 "engines/engine.h"
+#include "scumm/player_apple2.h"
+#include "scumm/scumm.h"
+
+namespace Scumm {
+
+/************************************
+ * Apple-II sound-resource parsers
+ ************************************/
+
+/*
+ * SoundFunction1: frequency up/down
+ */
+class AppleII_SoundFunction1_FreqUpDown : public AppleII_SoundFunction {
+public:
+	virtual void init(Player_AppleII *player, const byte *params) {
+		_player = player;
+		_delta = params[0];
+		_count = params[1];
+		_interval = params[2];
+		_limit = params[3];
+		_decInterval = (params[4] >= 0x40);
+	}
+
+	virtual bool update() { // D085
+		if (_decInterval) {
+			do {
+				_update(_interval, _count);
+				_interval -= _delta;
+			} while (_interval >= _limit);
+		} else {
+			do {
+				_update(_interval, _count);
+				_interval += _delta;
+			} while (_interval < _limit);
+		}
+		return true;
+	}
+
+private:
+	void _update(int interval /*a*/, int count /*y*/) { // D076
+		assert(interval > 0); // 0 == 256? 
+		assert(count > 0); // 0 == 256? 
+
+		for (; count >= 0; --count) {
+			_player->speakerToggle();
+			_player->generateSamples(17 + 5 * interval);
+		}
+	}
+
+protected:
+	int _delta;
+	int _count;
+	byte _interval; // must be unsigned byte ("interval < delta" possible)
+	int _limit;
+	bool _decInterval;
+};
+
+/*
+ * SoundFunction2: symmetric wave (~)
+ */
+class AppleII_SoundFunction2_SymmetricWave : public AppleII_SoundFunction {
+public:
+	virtual void init(Player_AppleII *player, const byte *params) {
+		_player = player;
+		_params = params;
+		_pos = 1;
+	}
+
+	virtual bool update() { // D0D6
+		// while (pos = 1; pos < 256; ++pos)
+		if (_pos < 256) {
+			byte interval = _params[_pos];
+			if (interval == 0xFF)
+				return true;
+			_update(interval, _params[0] /*, LD12F=interval*/);
+
+			++_pos;
+			return false;
+		}	
+		return true;
+	}
+
+private:
+	void _update(int interval /*a*/, int count) { // D0EF
+		if (interval == 0xFE) {
+			_player->wait(interval, 10);
+		} else {
+			assert(count > 0); // 0 == 256?
+			assert(interval > 0); // 0 == 256?
+
+			int a = (interval >> 3) + count;
+			for (int y = a; y > 0; --y) { 
+				_player->generateSamples(1292 - 5*interval);
+				_player->speakerToggle();
+
+				_player->generateSamples(1287 - 5*interval);
+				_player->speakerToggle();
+			}
+		}
+	}
+
+protected:
+	const byte *_params;
+	int _pos;
+};
+
+/*
+ * SoundFunction3: asymmetric wave (__-)
+ */
+class AppleII_SoundFunction3_AsymmetricWave : public AppleII_SoundFunction {
+public:
+	virtual void init(Player_AppleII *player, const byte *params) {
+		_player = player;
+		_params = params;
+		_pos = 1;
+	}
+
+	virtual bool update() { // D132
+		// while (pos = 1; pos < 256; ++pos)
+		if (_pos < 256) {
+			byte interval = _params[_pos];
+			if (interval == 0xFF)
+				return true;
+			_update(interval, _params[0]);
+
+			++_pos;
+			return false;
+		}
+		return true;
+	}
+
+private:
+	void _update(int interval /*a*/, int count /*LD12D*/) { // D14B
+		if (interval == 0xFE) {
+			_player->wait(interval, 70);
+		} else {
+			assert(interval > 0); // 0 == 256?
+			assert(count > 0); // 0 == 256?
+
+			for (int y = count; y > 0; --y) {
+				_player->generateSamples(1289 - 5*interval);
+				_player->speakerToggle();
+			}
+		}
+	}
+
+protected:
+	const byte *_params;
+	int _pos;
+};
+
+/*
+ * SoundFunction4: polyphone (2 voices)
+ */
+class AppleII_SoundFunction4_Polyphone : public AppleII_SoundFunction {
+public:
+	virtual void init(Player_AppleII *player, const byte *params) {
+		_player = player;
+		_params = params;
+		_updateRemain1 = 80;
+		_updateRemain2 = 10;
+		_count = 0;
+	}
+
+	virtual bool update() { // D170
+		// while (_params[0] != 0x01)
+		if (_params[0] != 0x01) {
+			if (_count == 0) // prepare next loop
+				nextLoop(_params[0], _params[1], _params[2]);
+			if (loopIteration()) // loop finished -> fetch next parameter set
+				_params += 3;
+			return false;
+		}
+		return true;
+	}
+
+private:
+	/*
+	 * prepare for next parameter set loop
+	 */
+	void nextLoop(byte param0, byte param1, byte param2) { // LD182
+		_count = (-param2 << 8) | 0x3;
+
+		_bitmask1 = 0x3;
+		_bitmask2 = 0x3;
+	
+		_updateInterval2 = param0;
+		if (_updateInterval2 == 0)
+			_bitmask2 = 0x0;
+
+		_updateInterval1 = param1;
+		if (_updateInterval1 == 0) {
+			_bitmask1 = 0x0;
+			if (_bitmask2 != 0) {
+				_bitmask1 = _bitmask2;
+				_bitmask2 = 0;
+				_updateInterval1 = _updateInterval2;
+			}
+		}
+
+		_speakerShiftReg = 0;
+	}
+
+	/*
+	 * perform one loop iteration
+	 * Returns true if loop finished
+	 */
+	bool loopIteration() { // D1A2
+		--_updateRemain1;
+		--_updateRemain2;
+
+		if (_updateRemain2 == 0) {
+			_updateRemain2 = _updateInterval2;
+			// use only first voice's data (bitmask1) if both voices are triggered 
+			if (_updateRemain1 != 0) {
+				_speakerShiftReg ^= _bitmask2;		
+			}
+		}
+
+		if (_updateRemain1 == 0) {
+			_updateRemain1 = _updateInterval1;
+			_speakerShiftReg ^= _bitmask1;
+		}
+
+		if (_speakerShiftReg & 0x1)
+			_player->speakerToggle();
+		_speakerShiftReg >>= 1;
+		_player->generateSamples(42); /* actually 42.5 */
+
+		++_count;
+		return (_count == 0);
+	}
+
+protected:
+	const byte *_params;
+	
+	byte _updateRemain1;
+	byte _updateRemain2;
+
+	uint16 _count;
+	byte _bitmask1;
+	byte _bitmask2;
+	byte _updateInterval1;
+	byte _updateInterval2;
+	byte _speakerShiftReg;
+};
+
+/*
+ * SoundFunction5: periodic noise
+ */
+class AppleII_SoundFunction5_Noise : public AppleII_SoundFunction {
+public:
+	virtual void init(Player_AppleII *player, const byte *params) {
+		_player = player;
+		_index = 0;
+		_param0 = params[0];
+		assert(_param0 > 0);
+	}
+
+	virtual bool update() { // D222
+		const byte noiseMask[] = {
+			0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF, 0xFF, 0xFF, 0x0F, 0x0F
+		};
+
+		// while (i = 0; i < 10; ++i)
+		if (_index < 10) {
+			int count = _param0;
+			do {
+				_update(noise() & noiseMask[_index], 1);
+				--count;
+			} while (count > 0);
+
+			++_index;
+			return false;
+		}
+
+		return true;
+	}
+
+private:
+	void _update(int interval /*a*/, int count) { // D270
+		assert(count > 0); // 0 == 256?
+		if (interval == 0)
+			interval = 256;
+
+		for (int i = count; i > 0; --i) {
+			_player->generateSamples(10 + 5*interval);
+			_player->speakerToggle();
+		
+			_player->generateSamples(5 + 5*interval);
+			_player->speakerToggle();
+		}
+	}
+
+	byte /*a*/ noise() { // D261
+		static int pos = 0; // initial value?
+		byte result = _noiseTable[pos];
+		pos = (pos + 1) % 256;
+		return result;
+	}
+
+protected:
+	int _index;
+	int _param0;
+
+private:
+	static const byte _noiseTable[256];
+};
+
+// LD000[loc] ^ LD00A[loc]
+const byte AppleII_SoundFunction5_Noise::_noiseTable[256] = {
+	0x65, 0x1b, 0xda, 0x11, 0x61, 0xe5, 0x77, 0x57, 0x92, 0xc8, 0x51, 0x1c, 0xd4, 0x91, 0x62, 0x63, 
+	0x00, 0x38, 0x57, 0xd5, 0x18, 0xd8, 0xdc, 0x40, 0x03, 0x86, 0xd3, 0x2f, 0x10, 0x11, 0xd8, 0x3c, 
+	0xbe, 0x00, 0x19, 0xc5, 0xd2, 0xc3, 0xca, 0x34, 0x00, 0x28, 0xbf, 0xb9, 0x18, 0x20, 0x01, 0xcc, 
+	0xda, 0x08, 0xbc, 0x75, 0x7c, 0xb0, 0x8d, 0xe0, 0x09, 0x18, 0xbf, 0x5d, 0xe9, 0x8c, 0x75, 0x64, 
+	0xe5, 0xb5, 0x5d, 0xe0, 0xb7, 0x7d, 0xe9, 0x8c, 0x55, 0x65, 0xc5, 0xb5, 0x5d, 0xd8, 0x09, 0x0d,
+	0x64, 0xf0, 0xf0, 0x08, 0x63, 0x03, 0x00, 0x55, 0x35, 0xc0, 0x00, 0x20, 0x74, 0xa5, 0x1e, 0xe3, 
+	0x00, 0x06, 0x3c, 0x52, 0xd1, 0x70, 0xd0, 0x57, 0x02, 0xf0, 0x00, 0xb6, 0xfc, 0x02, 0x11, 0x9a, 
+	0x3b, 0xc8, 0x38, 0xdf, 0x1a, 0xb0, 0xd1, 0xb8, 0xd0, 0x18, 0x8a, 0x4a, 0xea, 0x1b, 0x12, 0x5d, 
+	0x29, 0x58, 0xd8, 0x43, 0xb8, 0x2d, 0xd2, 0x61, 0x10, 0x3c, 0x0c, 0x5d, 0x1b, 0x61, 0x10, 0x3c, 
+	0x0a, 0x5d, 0x1d, 0x61, 0x10, 0x3c, 0x0b, 0x19, 0x88, 0x21, 0xc0, 0x21, 0x07, 0x00, 0x65, 0x62,
+	0x08, 0xe9, 0x36, 0x40, 0x20, 0x41, 0x06, 0x00, 0x20, 0x00, 0x00, 0xed, 0xa3, 0x00, 0x88, 0x06, 
+	0x98, 0x01, 0x5d, 0x7f, 0x02, 0x1d, 0x78, 0x03, 0x60, 0xcb, 0x3a, 0x01, 0xbd, 0x78, 0x02, 0x5d, 
+	0x7e, 0x03, 0x1d, 0xf5, 0xa6, 0x40, 0x81, 0xb4, 0xd0, 0x8d, 0xd3, 0xd0, 0x6d, 0xd5, 0x61, 0x48, 
+	0x61, 0x4d, 0xd1, 0xc8, 0xb1, 0xd8, 0x69, 0xff, 0x61, 0xd9, 0xed, 0xa0, 0xfe, 0x19, 0x91, 0x37, 
+	0x19, 0x37, 0x00, 0xf1, 0x00, 0x01, 0x1f, 0x00, 0xad, 0xc1, 0x01, 0x01, 0x2e, 0x00, 0x40, 0xc6,
+	0x7a, 0x9b, 0x95, 0x43, 0xfc, 0x18, 0xd2, 0x9e, 0x2a, 0x5a, 0x4b, 0x2a, 0xb6, 0x87, 0x30, 0x6c
+};
+
+/************************************
+ * Apple-II player
+ ************************************/
+
+Player_AppleII::Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer)
+	: _mixer(mixer), _vm(scumm), _soundFunc(0) {
+	resetState();
+	setSampleRate(_mixer->getOutputRate());
+	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+}
+
+Player_AppleII::~Player_AppleII() {
+	_mixer->stopHandle(_soundHandle);
+	delete _soundFunc;
+}
+
+void Player_AppleII::resetState() {
+	_soundNr = 0;
+	_type = 0;
+	_loop = 0;
+	_params = NULL;
+	_speakerState = 0;
+	delete _soundFunc;
+	_soundFunc = 0;
+	_sampleConverter.reset();
+}
+
+void Player_AppleII::startSound(int nr) {
+	Common::StackLock lock(_mutex);
+
+	byte *data = _vm->getResourceAddress(rtSound, nr);
+	assert(data);
+	byte *ptr1 = data + 4;
+
+	resetState();
+	_soundNr = nr;
+	_type = ptr1[0];
+	_loop = ptr1[1];
+	_params = &ptr1[2];
+
+	switch (_type) {
+	case 0: // empty (nothing to play)
+		resetState();
+		return;
+	case 1: 
+		_soundFunc = new AppleII_SoundFunction1_FreqUpDown(); 
+		break;
+	case 2: 
+		_soundFunc = new AppleII_SoundFunction2_SymmetricWave(); 
+		break;
+	case 3:	
+		_soundFunc = new AppleII_SoundFunction3_AsymmetricWave(); 
+		break;
+	case 4: 
+		_soundFunc = new AppleII_SoundFunction4_Polyphone(); 
+		break;
+	case 5: 
+		_soundFunc = new AppleII_SoundFunction5_Noise(); 
+		break;
+	}
+	_soundFunc->init(this, _params);
+
+	assert(_loop > 0);
+
+	debug(4, "startSound %d: type %d, loop %d",
+		  nr, _type, _loop);
+}
+
+bool Player_AppleII::updateSound() {
+	if (!_soundFunc)
+		return false;
+
+	if (_soundFunc->update()) {
+		--_loop;
+		if (_loop <= 0) {
+			delete _soundFunc;
+			_soundFunc = 0;
+		} else {
+			// reset function state on each loop
+			_soundFunc->init(this, _params);
+		}
+	}
+
+	return true;
+}
+
+void Player_AppleII::stopAllSounds() {
+	Common::StackLock lock(_mutex);
+	resetState();
+}
+
+void Player_AppleII::stopSound(int nr) {
+	Common::StackLock lock(_mutex);
+	if (_soundNr == nr) {
+		resetState();
+	}
+}
+
+int Player_AppleII::getSoundStatus(int nr) const {
+	Common::StackLock lock(_mutex);
+	return (_soundNr == nr);
+}
+
+int Player_AppleII::getMusicTimer() {
+	/* Apple-II sounds are synchronous -> no music timer */
+	return 0;
+}
+
+int Player_AppleII::readBuffer(int16 *buffer, const int numSamples) {
+	Common::StackLock lock(_mutex);
+
+	if (!_soundNr)
+		return 0;
+
+	int samplesLeft = numSamples;
+	do {
+		int nSamplesRead = _sampleConverter.readSamples(buffer, samplesLeft);
+		samplesLeft -= nSamplesRead;
+		buffer += nSamplesRead;
+	} while ((samplesLeft > 0) && updateSound());
+
+	// reset state if sound is played completely
+	if (!_soundFunc && (_sampleConverter.availableSize() == 0))
+		resetState();
+
+	return numSamples - samplesLeft;
+}
+
+/************************************
+ * Apple-II sound-resource helpers
+ ************************************/
+
+// toggle speaker on/off
+void Player_AppleII::speakerToggle() {
+	_speakerState ^= 0x1; 
+}
+
+void Player_AppleII::generateSamples(int cycles) {
+	_sampleConverter.addCycles(_speakerState, cycles);
+}
+
+void Player_AppleII::wait(int interval, int count /*y*/) {
+	assert(count > 0); // 0 == 256? 
+	assert(interval > 0); // 0 == 256? 
+	generateSamples(11 + count*(8 + 5 * interval));
+}
+
+} // End of namespace Scumm
diff --git a/engines/scumm/player_apple2.h b/engines/scumm/player_apple2.h
new file mode 100644
index 0000000000..9e97ab0c89
--- /dev/null
+++ b/engines/scumm/player_apple2.h
@@ -0,0 +1,298 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 SCUMM_PLAYER_APPLEII_H
+#define SCUMM_PLAYER_APPLEII_H
+
+#include "common/mutex.h"
+#include "common/scummsys.h"
+#include "common/memstream.h"
+#include "scumm/music.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "audio/softsynth/sid.h"
+
+namespace Scumm {
+
+class ScummEngine;
+
+/*
+ * Optimized for use with periodical read/write phases when the buffer 
+ * is filled in a write phase and completely read in a read phase.
+ * The growing strategy is optimized for repeated small (e.g. 2 bytes)
+ * single writes resulting in large buffers
+ * (avg.: 4KB, max: 18KB @ 16bit/22.050kHz (MM sound21)).
+ */
+class SampleBuffer {
+public:
+	SampleBuffer() : _data(0) {
+		clear();
+	}
+
+	~SampleBuffer() {
+		free(_data);
+	}
+
+	void clear() {
+		free(_data);
+		_data = 0;
+		_capacity = 0;
+		_writePos = 0;
+		_readPos = 0;
+	}
+
+	void ensureFree(uint32 needed) {
+		// if data was read completely, reset read/write pos to front
+		if ((_writePos != 0) && (_writePos == _readPos)) {
+			_writePos = 0;
+			_readPos = 0;
+		}
+
+		// check for enough space at end of buffer
+		uint32 freeEndCnt = _capacity - _writePos;
+		if (needed <= freeEndCnt)
+			return;
+
+		uint32 avail = availableSize();
+
+		// check for enough space at beginning and end of buffer
+		if (needed <= _readPos + freeEndCnt) {
+			// move unread data to front of buffer
+			memmove(_data, _data + _readPos, avail);
+			_writePos = avail;
+			_readPos = 0;
+		} else { // needs a grow
+			byte *old_data = _data;
+			uint32 new_len = avail + needed;
+
+			_capacity = new_len + 2048;
+			_data = (byte *)malloc(_capacity);
+
+			if (old_data) {
+				// copy old unread data to front of new buffer
+				memcpy(_data, old_data + _readPos, avail);
+				free(old_data);
+				_writePos = avail;
+				_readPos = 0;
+			}
+		}
+	}
+
+	uint32 availableSize() const {
+		if (_readPos >= _writePos)
+			return 0;
+		return _writePos - _readPos;
+	}
+
+	virtual uint32 write(const void *dataPtr, uint32 dataSize) {
+		ensureFree(dataSize);
+		memcpy(_data + _writePos, dataPtr, dataSize);
+		_writePos += dataSize;
+		return dataSize;
+	}
+
+	uint32 read(byte *dataPtr, uint32 dataSize) {
+		uint32 avail = availableSize();
+		if (avail == 0)
+			return 0;
+		if (dataSize > avail)
+			dataSize = avail;
+		memcpy(dataPtr, _data + _readPos, dataSize);
+		_readPos += dataSize;
+		return dataSize;
+	}
+
+private:
+	uint32 _writePos;
+	uint32 _readPos;
+	uint32 _capacity;
+	byte *_data;
+};
+
+// CPU_CLOCK according to AppleWin
+static const double APPLEII_CPU_CLOCK = 1020484.5; // ~ 1.02 MHz
+
+/*
+ * Converts the 1-bit speaker state values into audio samples.
+ * This is done by aggregation of the speaker states at each 
+ * CPU cycle in a sampling period into an audio sample.
+ */
+class SampleConverter {
+private:
+	void addSampleToBuffer(int sample) {
+		int16 value = sample * _volume / _maxVolume;
+		_buffer.write(&value, sizeof(value));
+	}
+
+public:
+	SampleConverter() : 
+		_cyclesPerSampleFP(0),
+		_missingCyclesFP(0),
+		_sampleCyclesSumFP(0),
+		_volume(_maxVolume)
+	{}
+
+	~SampleConverter() {}
+
+	void reset() {
+		_missingCyclesFP = 0;
+		_sampleCyclesSumFP = 0;
+		_buffer.clear();	
+	}
+
+	uint32 availableSize() const {
+		return _buffer.availableSize();
+	}
+
+	void setMusicVolume(int vol) {
+		assert(vol >= 0 && vol <= _maxVolume);
+		_volume = vol;
+	}
+
+	void setSampleRate(int rate) {
+		/* ~46 CPU cycles per sample @ 22.05kHz */
+		_cyclesPerSampleFP = APPLEII_CPU_CLOCK * (1 << PREC_SHIFT) / rate;
+		reset();
+	}
+
+	void addCycles(byte level, const int cycles) {
+		/* convert to fixed precision floats */
+		int cyclesFP = cycles << PREC_SHIFT;
+
+		// step 1: if cycles are left from the last call, process them first
+		if (_missingCyclesFP > 0) {
+			int n = (_missingCyclesFP < cyclesFP) ? _missingCyclesFP : cyclesFP;
+			if (level)
+				_sampleCyclesSumFP += n;
+			cyclesFP -= n;
+			_missingCyclesFP -= n;
+			if (_missingCyclesFP == 0) {
+				addSampleToBuffer(2*32767 * _sampleCyclesSumFP / _cyclesPerSampleFP - 32767);
+			} else {
+				return;
+			}
+		}
+
+		_sampleCyclesSumFP = 0;
+
+		// step 2: process blocks of cycles fitting into a whole sample
+		while (cyclesFP >= _cyclesPerSampleFP) {
+			addSampleToBuffer(level ? 32767 : -32767);
+			cyclesFP -= _cyclesPerSampleFP;
+		}
+
+		// step 3: remember cycles left for next call
+		if (cyclesFP > 0) {
+			_missingCyclesFP = _cyclesPerSampleFP - cyclesFP;
+			if (level)
+				_sampleCyclesSumFP = cyclesFP;
+		}
+	}
+
+	uint32 readSamples(void *buffer, int numSamples) {
+		return _buffer.read((byte*)buffer, numSamples * 2) / 2;
+	}
+
+private:
+	static const int PREC_SHIFT = 7;
+
+private:
+	int _cyclesPerSampleFP;   /* (fixed precision) */
+	int _missingCyclesFP;     /* (fixed precision) */
+	int _sampleCyclesSumFP;   /* (fixed precision) */
+	int _volume; /* 0 - 256 */
+	static const int _maxVolume = 256;
+	SampleBuffer _buffer;
+};
+
+class Player_AppleII;
+
+class AppleII_SoundFunction {
+public:
+	AppleII_SoundFunction() {}
+	virtual ~AppleII_SoundFunction() {}
+	virtual void init(Player_AppleII *player, const byte *params) = 0;
+	/* returns true if finished */
+	virtual bool update() = 0;
+protected:
+	Player_AppleII *_player;
+};
+
+class Player_AppleII : public Audio::AudioStream, public MusicEngine {
+public:
+	Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer);
+	virtual ~Player_AppleII();
+
+	virtual void setMusicVolume(int vol) { _sampleConverter.setMusicVolume(vol); }
+	void setSampleRate(int rate) {
+		_sampleRate = rate;
+		_sampleConverter.setSampleRate(rate); 
+	}
+	void startMusic(int songResIndex);
+	virtual void startSound(int sound);
+	virtual void stopSound(int sound);
+	virtual void stopAllSounds();
+	virtual int  getSoundStatus(int sound) const;
+	virtual int  getMusicTimer();
+
+	// AudioStream API
+	int readBuffer(int16 *buffer, const int numSamples);
+	bool isStereo() const { return false; }
+	bool endOfData() const { return false; }
+	int getRate() const { return _sampleRate; }
+
+public:
+	void speakerToggle();
+	void generateSamples(int cycles);
+	void wait(int interval, int count);
+
+private:
+	// sound number
+	int _soundNr;
+	// type of sound
+	int _type;
+	// number of loops left
+	int _loop;
+	// global sound param list
+	const byte *_params;
+	// speaker toggle state (0 / 1)
+	byte _speakerState;
+	// sound function
+	AppleII_SoundFunction *_soundFunc;
+	// cycle to sample converter
+	SampleConverter _sampleConverter;
+
+private:
+	ScummEngine *_vm;
+	Audio::Mixer *_mixer;
+	Audio::SoundHandle _soundHandle;
+	int _sampleRate;
+	Common::Mutex _mutex;
+
+private:
+	void resetState();
+	bool updateSound();
+};
+
+} // End of namespace Scumm
+
+#endif
diff --git a/engines/scumm/player_appleII.cpp b/engines/scumm/player_appleII.cpp
deleted file mode 100644
index f310e3e546..0000000000
--- a/engines/scumm/player_appleII.cpp
+++ /dev/null
@@ -1,500 +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 "engines/engine.h"
-#include "scumm/player_appleII.h"
-#include "scumm/scumm.h"
-
-namespace Scumm {
-
-/************************************
- * Apple-II sound-resource parsers
- ************************************/
-
-/*
- * SoundFunction1: frequency up/down
- */
-class AppleII_SoundFunction1_FreqUpDown : public AppleII_SoundFunction {
-public:
-	virtual void init(Player_AppleII *player, const byte *params) {
-		_player = player;
-		_delta = params[0];
-		_count = params[1];
-		_interval = params[2];
-		_limit = params[3];
-		_decInterval = (params[4] >= 0x40);
-	}
-
-	virtual bool update() { // D085
-		if (_decInterval) {
-			do {
-				_update(_interval, _count);
-				_interval -= _delta;
-			} while (_interval >= _limit);
-		} else {
-			do {
-				_update(_interval, _count);
-				_interval += _delta;
-			} while (_interval < _limit);
-		}
-		return true;
-	}
-
-private:
-	void _update(int interval /*a*/, int count /*y*/) { // D076
-		assert(interval > 0); // 0 == 256? 
-		assert(count > 0); // 0 == 256? 
-
-		for (; count >= 0; --count) {
-			_player->speakerToggle();
-			_player->generateSamples(17 + 5 * interval);
-		}
-	}
-
-protected:
-	int _delta;
-	int _count;
-	byte _interval; // must be unsigned byte ("interval < delta" possible)
-	int _limit;
-	bool _decInterval;
-};
-
-/*
- * SoundFunction2: symmetric wave (~)
- */
-class AppleII_SoundFunction2_SymmetricWave : public AppleII_SoundFunction {
-public:
-	virtual void init(Player_AppleII *player, const byte *params) {
-		_player = player;
-		_params = params;
-		_pos = 1;
-	}
-
-	virtual bool update() { // D0D6
-		// while (pos = 1; pos < 256; ++pos)
-		if (_pos < 256) {
-			byte interval = _params[_pos];
-			if (interval == 0xFF)
-				return true;
-			_update(interval, _params[0] /*, LD12F=interval*/);
-
-			++_pos;
-			return false;
-		}	
-		return true;
-	}
-
-private:
-	void _update(int interval /*a*/, int count) { // D0EF
-		if (interval == 0xFE) {
-			_player->wait(interval, 10);
-		} else {
-			assert(count > 0); // 0 == 256?
-			assert(interval > 0); // 0 == 256?
-
-			int a = (interval >> 3) + count;
-			for (int y = a; y > 0; --y) { 
-				_player->generateSamples(1292 - 5*interval);
-				_player->speakerToggle();
-
-				_player->generateSamples(1287 - 5*interval);
-				_player->speakerToggle();
-			}
-		}
-	}
-
-protected:
-	const byte *_params;
-	int _pos;
-};
-
-/*
- * SoundFunction3: asymmetric wave (__-)
- */
-class AppleII_SoundFunction3_AsymmetricWave : public AppleII_SoundFunction {
-public:
-	virtual void init(Player_AppleII *player, const byte *params) {
-		_player = player;
-		_params = params;
-		_pos = 1;
-	}
-
-	virtual bool update() { // D132
-		// while (pos = 1; pos < 256; ++pos)
-		if (_pos < 256) {
-			byte interval = _params[_pos];
-			if (interval == 0xFF)
-				return true;
-			_update(interval, _params[0]);
-
-			++_pos;
-			return false;
-		}
-		return true;
-	}
-
-private:
-	void _update(int interval /*a*/, int count /*LD12D*/) { // D14B
-		if (interval == 0xFE) {
-			_player->wait(interval, 70);
-		} else {
-			assert(interval > 0); // 0 == 256?
-			assert(count > 0); // 0 == 256?
-
-			for (int y = count; y > 0; --y) {
-				_player->generateSamples(1289 - 5*interval);
-				_player->speakerToggle();
-			}
-		}
-	}
-
-protected:
-	const byte *_params;
-	int _pos;
-};
-
-/*
- * SoundFunction4: polyphone (2 voices)
- */
-class AppleII_SoundFunction4_Polyphone : public AppleII_SoundFunction {
-public:
-	virtual void init(Player_AppleII *player, const byte *params) {
-		_player = player;
-		_params = params;
-		_updateRemain1 = 80;
-		_updateRemain2 = 10;
-		_count = 0;
-	}
-
-	virtual bool update() { // D170
-		// while (_params[0] != 0x01)
-		if (_params[0] != 0x01) {
-			if (_count == 0) // prepare next loop
-				nextLoop(_params[0], _params[1], _params[2]);
-			if (loopIteration()) // loop finished -> fetch next parameter set
-				_params += 3;
-			return false;
-		}
-		return true;
-	}
-
-private:
-	/*
-	 * prepare for next parameter set loop
-	 */
-	void nextLoop(byte param0, byte param1, byte param2) { // LD182
-		_count = (-param2 << 8) | 0x3;
-
-		_bitmask1 = 0x3;
-		_bitmask2 = 0x3;
-	
-		_updateInterval2 = param0;
-		if (_updateInterval2 == 0)
-			_bitmask2 = 0x0;
-
-		_updateInterval1 = param1;
-		if (_updateInterval1 == 0) {
-			_bitmask1 = 0x0;
-			if (_bitmask2 != 0) {
-				_bitmask1 = _bitmask2;
-				_bitmask2 = 0;
-				_updateInterval1 = _updateInterval2;
-			}
-		}
-
-		_speakerShiftReg = 0;
-	}
-
-	/*
-	 * perform one loop iteration
-	 * Returns true if loop finished
-	 */
-	bool loopIteration() { // D1A2
-		--_updateRemain1;
-		--_updateRemain2;
-
-		if (_updateRemain2 == 0) {
-			_updateRemain2 = _updateInterval2;
-			// use only first voice's data (bitmask1) if both voices are triggered 
-			if (_updateRemain1 != 0) {
-				_speakerShiftReg ^= _bitmask2;		
-			}
-		}
-
-		if (_updateRemain1 == 0) {
-			_updateRemain1 = _updateInterval1;
-			_speakerShiftReg ^= _bitmask1;
-		}
-
-		if (_speakerShiftReg & 0x1)
-			_player->speakerToggle();
-		_speakerShiftReg >>= 1;
-		_player->generateSamples(42); /* actually 42.5 */
-
-		++_count;
-		return (_count == 0);
-	}
-
-protected:
-	const byte *_params;
-	
-	byte _updateRemain1;
-	byte _updateRemain2;
-
-	uint16 _count;
-	byte _bitmask1;
-	byte _bitmask2;
-	byte _updateInterval1;
-	byte _updateInterval2;
-	byte _speakerShiftReg;
-};
-
-/*
- * SoundFunction5: periodic noise
- */
-class AppleII_SoundFunction5_Noise : public AppleII_SoundFunction {
-public:
-	virtual void init(Player_AppleII *player, const byte *params) {
-		_player = player;
-		_index = 0;
-		_param0 = params[0];
-		assert(_param0 > 0);
-	}
-
-	virtual bool update() { // D222
-		const byte noiseMask[] = {
-			0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF, 0xFF, 0xFF, 0x0F, 0x0F
-		};
-
-		// while (i = 0; i < 10; ++i)
-		if (_index < 10) {
-			int count = _param0;
-			do {
-				_update(noise() & noiseMask[_index], 1);
-				--count;
-			} while (count > 0);
-
-			++_index;
-			return false;
-		}
-
-		return true;
-	}
-
-private:
-	void _update(int interval /*a*/, int count) { // D270
-		assert(count > 0); // 0 == 256?
-		if (interval == 0)
-			interval = 256;
-
-		for (int i = count; i > 0; --i) {
-			_player->generateSamples(10 + 5*interval);
-			_player->speakerToggle();
-		
-			_player->generateSamples(5 + 5*interval);
-			_player->speakerToggle();
-		}
-	}
-
-	byte /*a*/ noise() { // D261
-		static int pos = 0; // initial value?
-		byte result = _noiseTable[pos];
-		pos = (pos + 1) % 256;
-		return result;
-	}
-
-protected:
-	int _index;
-	int _param0;
-
-private:
-	static const byte _noiseTable[256];
-};
-
-// LD000[loc] ^ LD00A[loc]
-const byte AppleII_SoundFunction5_Noise::_noiseTable[256] = {
-	0x65, 0x1b, 0xda, 0x11, 0x61, 0xe5, 0x77, 0x57, 0x92, 0xc8, 0x51, 0x1c, 0xd4, 0x91, 0x62, 0x63, 
-	0x00, 0x38, 0x57, 0xd5, 0x18, 0xd8, 0xdc, 0x40, 0x03, 0x86, 0xd3, 0x2f, 0x10, 0x11, 0xd8, 0x3c, 
-	0xbe, 0x00, 0x19, 0xc5, 0xd2, 0xc3, 0xca, 0x34, 0x00, 0x28, 0xbf, 0xb9, 0x18, 0x20, 0x01, 0xcc, 
-	0xda, 0x08, 0xbc, 0x75, 0x7c, 0xb0, 0x8d, 0xe0, 0x09, 0x18, 0xbf, 0x5d, 0xe9, 0x8c, 0x75, 0x64, 
-	0xe5, 0xb5, 0x5d, 0xe0, 0xb7, 0x7d, 0xe9, 0x8c, 0x55, 0x65, 0xc5, 0xb5, 0x5d, 0xd8, 0x09, 0x0d,
-	0x64, 0xf0, 0xf0, 0x08, 0x63, 0x03, 0x00, 0x55, 0x35, 0xc0, 0x00, 0x20, 0x74, 0xa5, 0x1e, 0xe3, 
-	0x00, 0x06, 0x3c, 0x52, 0xd1, 0x70, 0xd0, 0x57, 0x02, 0xf0, 0x00, 0xb6, 0xfc, 0x02, 0x11, 0x9a, 
-	0x3b, 0xc8, 0x38, 0xdf, 0x1a, 0xb0, 0xd1, 0xb8, 0xd0, 0x18, 0x8a, 0x4a, 0xea, 0x1b, 0x12, 0x5d, 
-	0x29, 0x58, 0xd8, 0x43, 0xb8, 0x2d, 0xd2, 0x61, 0x10, 0x3c, 0x0c, 0x5d, 0x1b, 0x61, 0x10, 0x3c, 
-	0x0a, 0x5d, 0x1d, 0x61, 0x10, 0x3c, 0x0b, 0x19, 0x88, 0x21, 0xc0, 0x21, 0x07, 0x00, 0x65, 0x62,
-	0x08, 0xe9, 0x36, 0x40, 0x20, 0x41, 0x06, 0x00, 0x20, 0x00, 0x00, 0xed, 0xa3, 0x00, 0x88, 0x06, 
-	0x98, 0x01, 0x5d, 0x7f, 0x02, 0x1d, 0x78, 0x03, 0x60, 0xcb, 0x3a, 0x01, 0xbd, 0x78, 0x02, 0x5d, 
-	0x7e, 0x03, 0x1d, 0xf5, 0xa6, 0x40, 0x81, 0xb4, 0xd0, 0x8d, 0xd3, 0xd0, 0x6d, 0xd5, 0x61, 0x48, 
-	0x61, 0x4d, 0xd1, 0xc8, 0xb1, 0xd8, 0x69, 0xff, 0x61, 0xd9, 0xed, 0xa0, 0xfe, 0x19, 0x91, 0x37, 
-	0x19, 0x37, 0x00, 0xf1, 0x00, 0x01, 0x1f, 0x00, 0xad, 0xc1, 0x01, 0x01, 0x2e, 0x00, 0x40, 0xc6,
-	0x7a, 0x9b, 0x95, 0x43, 0xfc, 0x18, 0xd2, 0x9e, 0x2a, 0x5a, 0x4b, 0x2a, 0xb6, 0x87, 0x30, 0x6c
-};
-
-/************************************
- * Apple-II player
- ************************************/
-
-Player_AppleII::Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer)
-	: _mixer(mixer), _vm(scumm), _soundFunc(0) {
-	resetState();
-	setSampleRate(_mixer->getOutputRate());
-	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
-}
-
-Player_AppleII::~Player_AppleII() {
-	_mixer->stopHandle(_soundHandle);
-	delete _soundFunc;
-}
-
-void Player_AppleII::resetState() {
-	_soundNr = 0;
-	_type = 0;
-	_loop = 0;
-	_params = NULL;
-	_speakerState = 0;
-	delete _soundFunc;
-	_soundFunc = 0;
-	_sampleConverter.reset();
-}
-
-void Player_AppleII::startSound(int nr) {
-	Common::StackLock lock(_mutex);
-
-	byte *data = _vm->getResourceAddress(rtSound, nr);
-	assert(data);
-	byte *ptr1 = data + 4;
-
-	resetState();
-	_soundNr = nr;
-	_type = ptr1[0];
-	_loop = ptr1[1];
-	_params = &ptr1[2];
-
-	switch (_type) {
-	case 0: // empty (nothing to play)
-		resetState();
-		return;
-	case 1: 
-		_soundFunc = new AppleII_SoundFunction1_FreqUpDown(); 
-		break;
-	case 2: 
-		_soundFunc = new AppleII_SoundFunction2_SymmetricWave(); 
-		break;
-	case 3:	
-		_soundFunc = new AppleII_SoundFunction3_AsymmetricWave(); 
-		break;
-	case 4: 
-		_soundFunc = new AppleII_SoundFunction4_Polyphone(); 
-		break;
-	case 5: 
-		_soundFunc = new AppleII_SoundFunction5_Noise(); 
-		break;
-	}
-	_soundFunc->init(this, _params);
-
-	assert(_loop > 0);
-
-	debug(4, "startSound %d: type %d, loop %d",
-		  nr, _type, _loop);
-}
-
-bool Player_AppleII::updateSound() {
-	if (!_soundFunc)
-		return false;
-
-	if (_soundFunc->update()) {
-		--_loop;
-		if (_loop <= 0) {
-			delete _soundFunc;
-			_soundFunc = 0;
-		} else {
-			// reset function state on each loop
-			_soundFunc->init(this, _params);
-		}
-	}
-
-	return true;
-}
-
-void Player_AppleII::stopAllSounds() {
-	Common::StackLock lock(_mutex);
-	resetState();
-}
-
-void Player_AppleII::stopSound(int nr) {
-	Common::StackLock lock(_mutex);
-	if (_soundNr == nr) {
-		resetState();
-	}
-}
-
-int Player_AppleII::getSoundStatus(int nr) const {
-	Common::StackLock lock(_mutex);
-	return (_soundNr == nr);
-}
-
-int Player_AppleII::getMusicTimer() {
-	/* Apple-II sounds are synchronous -> no music timer */
-	return 0;
-}
-
-int Player_AppleII::readBuffer(int16 *buffer, const int numSamples) {
-	Common::StackLock lock(_mutex);
-
-	if (!_soundNr)
-		return 0;
-
-	int samplesLeft = numSamples;
-	do {
-		int nSamplesRead = _sampleConverter.readSamples(buffer, samplesLeft);
-		samplesLeft -= nSamplesRead;
-		buffer += nSamplesRead;
-	} while ((samplesLeft > 0) && updateSound());
-
-	// reset state if sound is played completely
-	if (!_soundFunc && (_sampleConverter.availableSize() == 0))
-		resetState();
-
-	return numSamples - samplesLeft;
-}
-
-/************************************
- * Apple-II sound-resource helpers
- ************************************/
-
-// toggle speaker on/off
-void Player_AppleII::speakerToggle() {
-	_speakerState ^= 0x1; 
-}
-
-void Player_AppleII::generateSamples(int cycles) {
-	_sampleConverter.addCycles(_speakerState, cycles);
-}
-
-void Player_AppleII::wait(int interval, int count /*y*/) {
-	assert(count > 0); // 0 == 256? 
-	assert(interval > 0); // 0 == 256? 
-	generateSamples(11 + count*(8 + 5 * interval));
-}
-
-} // End of namespace Scumm
diff --git a/engines/scumm/player_appleII.h b/engines/scumm/player_appleII.h
deleted file mode 100644
index 9e97ab0c89..0000000000
--- a/engines/scumm/player_appleII.h
+++ /dev/null
@@ -1,298 +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 SCUMM_PLAYER_APPLEII_H
-#define SCUMM_PLAYER_APPLEII_H
-
-#include "common/mutex.h"
-#include "common/scummsys.h"
-#include "common/memstream.h"
-#include "scumm/music.h"
-#include "audio/audiostream.h"
-#include "audio/mixer.h"
-#include "audio/softsynth/sid.h"
-
-namespace Scumm {
-
-class ScummEngine;
-
-/*
- * Optimized for use with periodical read/write phases when the buffer 
- * is filled in a write phase and completely read in a read phase.
- * The growing strategy is optimized for repeated small (e.g. 2 bytes)
- * single writes resulting in large buffers
- * (avg.: 4KB, max: 18KB @ 16bit/22.050kHz (MM sound21)).
- */
-class SampleBuffer {
-public:
-	SampleBuffer() : _data(0) {
-		clear();
-	}
-
-	~SampleBuffer() {
-		free(_data);
-	}
-
-	void clear() {
-		free(_data);
-		_data = 0;
-		_capacity = 0;
-		_writePos = 0;
-		_readPos = 0;
-	}
-
-	void ensureFree(uint32 needed) {
-		// if data was read completely, reset read/write pos to front
-		if ((_writePos != 0) && (_writePos == _readPos)) {
-			_writePos = 0;
-			_readPos = 0;
-		}
-
-		// check for enough space at end of buffer
-		uint32 freeEndCnt = _capacity - _writePos;
-		if (needed <= freeEndCnt)
-			return;
-
-		uint32 avail = availableSize();
-
-		// check for enough space at beginning and end of buffer
-		if (needed <= _readPos + freeEndCnt) {
-			// move unread data to front of buffer
-			memmove(_data, _data + _readPos, avail);
-			_writePos = avail;
-			_readPos = 0;
-		} else { // needs a grow
-			byte *old_data = _data;
-			uint32 new_len = avail + needed;
-
-			_capacity = new_len + 2048;
-			_data = (byte *)malloc(_capacity);
-
-			if (old_data) {
-				// copy old unread data to front of new buffer
-				memcpy(_data, old_data + _readPos, avail);
-				free(old_data);
-				_writePos = avail;
-				_readPos = 0;
-			}
-		}
-	}
-
-	uint32 availableSize() const {
-		if (_readPos >= _writePos)
-			return 0;
-		return _writePos - _readPos;
-	}
-
-	virtual uint32 write(const void *dataPtr, uint32 dataSize) {
-		ensureFree(dataSize);
-		memcpy(_data + _writePos, dataPtr, dataSize);
-		_writePos += dataSize;
-		return dataSize;
-	}
-
-	uint32 read(byte *dataPtr, uint32 dataSize) {
-		uint32 avail = availableSize();
-		if (avail == 0)
-			return 0;
-		if (dataSize > avail)
-			dataSize = avail;
-		memcpy(dataPtr, _data + _readPos, dataSize);
-		_readPos += dataSize;
-		return dataSize;
-	}
-
-private:
-	uint32 _writePos;
-	uint32 _readPos;
-	uint32 _capacity;
-	byte *_data;
-};
-
-// CPU_CLOCK according to AppleWin
-static const double APPLEII_CPU_CLOCK = 1020484.5; // ~ 1.02 MHz
-
-/*
- * Converts the 1-bit speaker state values into audio samples.
- * This is done by aggregation of the speaker states at each 
- * CPU cycle in a sampling period into an audio sample.
- */
-class SampleConverter {
-private:
-	void addSampleToBuffer(int sample) {
-		int16 value = sample * _volume / _maxVolume;
-		_buffer.write(&value, sizeof(value));
-	}
-
-public:
-	SampleConverter() : 
-		_cyclesPerSampleFP(0),
-		_missingCyclesFP(0),
-		_sampleCyclesSumFP(0),
-		_volume(_maxVolume)
-	{}
-
-	~SampleConverter() {}
-
-	void reset() {
-		_missingCyclesFP = 0;
-		_sampleCyclesSumFP = 0;
-		_buffer.clear();	
-	}
-
-	uint32 availableSize() const {
-		return _buffer.availableSize();
-	}
-
-	void setMusicVolume(int vol) {
-		assert(vol >= 0 && vol <= _maxVolume);
-		_volume = vol;
-	}
-
-	void setSampleRate(int rate) {
-		/* ~46 CPU cycles per sample @ 22.05kHz */
-		_cyclesPerSampleFP = APPLEII_CPU_CLOCK * (1 << PREC_SHIFT) / rate;
-		reset();
-	}
-
-	void addCycles(byte level, const int cycles) {
-		/* convert to fixed precision floats */
-		int cyclesFP = cycles << PREC_SHIFT;
-
-		// step 1: if cycles are left from the last call, process them first
-		if (_missingCyclesFP > 0) {
-			int n = (_missingCyclesFP < cyclesFP) ? _missingCyclesFP : cyclesFP;
-			if (level)
-				_sampleCyclesSumFP += n;
-			cyclesFP -= n;
-			_missingCyclesFP -= n;
-			if (_missingCyclesFP == 0) {
-				addSampleToBuffer(2*32767 * _sampleCyclesSumFP / _cyclesPerSampleFP - 32767);
-			} else {
-				return;
-			}
-		}
-
-		_sampleCyclesSumFP = 0;
-
-		// step 2: process blocks of cycles fitting into a whole sample
-		while (cyclesFP >= _cyclesPerSampleFP) {
-			addSampleToBuffer(level ? 32767 : -32767);
-			cyclesFP -= _cyclesPerSampleFP;
-		}
-
-		// step 3: remember cycles left for next call
-		if (cyclesFP > 0) {
-			_missingCyclesFP = _cyclesPerSampleFP - cyclesFP;
-			if (level)
-				_sampleCyclesSumFP = cyclesFP;
-		}
-	}
-
-	uint32 readSamples(void *buffer, int numSamples) {
-		return _buffer.read((byte*)buffer, numSamples * 2) / 2;
-	}
-
-private:
-	static const int PREC_SHIFT = 7;
-
-private:
-	int _cyclesPerSampleFP;   /* (fixed precision) */
-	int _missingCyclesFP;     /* (fixed precision) */
-	int _sampleCyclesSumFP;   /* (fixed precision) */
-	int _volume; /* 0 - 256 */
-	static const int _maxVolume = 256;
-	SampleBuffer _buffer;
-};
-
-class Player_AppleII;
-
-class AppleII_SoundFunction {
-public:
-	AppleII_SoundFunction() {}
-	virtual ~AppleII_SoundFunction() {}
-	virtual void init(Player_AppleII *player, const byte *params) = 0;
-	/* returns true if finished */
-	virtual bool update() = 0;
-protected:
-	Player_AppleII *_player;
-};
-
-class Player_AppleII : public Audio::AudioStream, public MusicEngine {
-public:
-	Player_AppleII(ScummEngine *scumm, Audio::Mixer *mixer);
-	virtual ~Player_AppleII();
-
-	virtual void setMusicVolume(int vol) { _sampleConverter.setMusicVolume(vol); }
-	void setSampleRate(int rate) {
-		_sampleRate = rate;
-		_sampleConverter.setSampleRate(rate); 
-	}
-	void startMusic(int songResIndex);
-	virtual void startSound(int sound);
-	virtual void stopSound(int sound);
-	virtual void stopAllSounds();
-	virtual int  getSoundStatus(int sound) const;
-	virtual int  getMusicTimer();
-
-	// AudioStream API
-	int readBuffer(int16 *buffer, const int numSamples);
-	bool isStereo() const { return false; }
-	bool endOfData() const { return false; }
-	int getRate() const { return _sampleRate; }
-
-public:
-	void speakerToggle();
-	void generateSamples(int cycles);
-	void wait(int interval, int count);
-
-private:
-	// sound number
-	int _soundNr;
-	// type of sound
-	int _type;
-	// number of loops left
-	int _loop;
-	// global sound param list
-	const byte *_params;
-	// speaker toggle state (0 / 1)
-	byte _speakerState;
-	// sound function
-	AppleII_SoundFunction *_soundFunc;
-	// cycle to sample converter
-	SampleConverter _sampleConverter;
-
-private:
-	ScummEngine *_vm;
-	Audio::Mixer *_mixer;
-	Audio::SoundHandle _soundHandle;
-	int _sampleRate;
-	Common::Mutex _mutex;
-
-private:
-	void resetState();
-	bool updateSound();
-};
-
-} // End of namespace Scumm
-
-#endif
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 3eea68fbbe..9a093891d2 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -55,7 +55,7 @@
 #include "scumm/player_nes.h"
 #include "scumm/player_sid.h"
 #include "scumm/player_pce.h"
-#include "scumm/player_appleII.h"
+#include "scumm/player_apple2.h"
 #include "scumm/player_v1.h"
 #include "scumm/player_v2.h"
 #include "scumm/player_v2cms.h"
-- 
cgit v1.2.3


From 5d6710ebfd7b5bac79120492bbb3ff937f99efdb Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 24 Dec 2011 14:30:57 +0100
Subject: SCUMM: add player_apple2.cpp to project files

Seems as if the iphone project files have to be updated separately.
---
 engines/scumm/module.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk
index 781ca30459..1f219f5187 100644
--- a/engines/scumm/module.mk
+++ b/engines/scumm/module.mk
@@ -34,6 +34,7 @@ MODULE_OBJS := \
 	midiparser_ro.o \
 	object.o \
 	palette.o \
+	player_apple2.o \
 	player_mod.o \
 	player_nes.o \
 	player_pce.o \
-- 
cgit v1.2.3


From ef35f1f69d3c75c2ed6dbb0bb4fe6a5551750ec1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 24 Dec 2011 14:39:22 +0100
Subject: TSAGE: R2R - Implement scene 3350

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |  2 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 63 +++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h   | 19 ++++++++
 3 files changed, 84 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index e591436fd8..30e794627f 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -214,6 +214,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Hall
 		return new Scene3275();
 	case 3350:
+		// Cutscene - Ship landing
+		return new Scene3350();
 	case 3375:
 	case 3385:
 	case 3395:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 1a219e773a..ce08e9647e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1635,5 +1635,68 @@ void Scene3275::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3350 - Cutscene - Ship landing
+ *
+ *--------------------------------------------------------------------------*/
+void Scene3350::postInit(SceneObjectList *OwnerList) {
+	loadScene(3350);
+	R2_GLOBALS._v58CE2 = 0;
+	SceneExt::postInit();
+	R2_GLOBALS._sound2.play(310);
+
+	_rotation = R2_GLOBALS._scenePalette.addRotation(176, 203, 1);
+	_rotation->setDelay(3);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.disableControl();
+
+	_actor1.postInit();
+	_actor1.hide();
+	_actor2.postInit();
+	_actor2.hide();
+	_actor3.postInit();
+	_actor3.hide();
+	_actor4.postInit();
+	_actor4.hide();
+	_actor9.postInit();
+	_actor9.hide();
+	_actor8.postInit();
+	_actor8.hide();
+	_actor5.postInit();
+	_actor5.hide();
+	_actor6.postInit();
+	_actor6.hide();
+	_actor7.postInit();
+	_actor7.hide();
+
+	_sceneMode = 3350;
+	setAction(&_sequenceManager, this, _sceneMode, &_actor5, &_actor6, &_actor7, NULL);
+}
+
+void Scene3350::remove() {
+	R2_GLOBALS._sound2.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene3350::signal() {
+	switch (_sceneMode) {
+	case 3350:
+		_sceneMode = 3351;
+		setAction(&_sequenceManager, this, 3351, &_actor4, &_actor9, &_actor8, NULL);
+		break;
+	case 3351:
+		_sceneMode = 3352;
+		setAction(&_sequenceManager, this, 3352, &_actor4, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL);
+	case 3352:
+		R2_GLOBALS._sceneManager.changeScene(3395);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index c82515c8c0..ac1436637c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -381,6 +381,25 @@ public:
 	virtual void signal();
 };
 
+class Scene3350 : public SceneExt {
+public:
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	SceneActor _actor6;
+	SceneActor _actor7;
+	SceneActor _actor8;
+	SceneActor _actor9;
+	SequenceManager _sequenceManager;
+	PaletteRotation *_rotation;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 8e36de736e88f1b7a70ad04fc3d09b7807ff94f9 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 24 Dec 2011 14:27:24 +0100
Subject: DREAMWEB: Minor cleanup

---
 engines/dreamweb/dreambase.h |  1 +
 engines/dreamweb/object.cpp  |  3 +--
 engines/dreamweb/sprite.cpp  | 11 -----------
 engines/dreamweb/stubs.cpp   | 31 +++----------------------------
 engines/dreamweb/stubs.h     | 17 -----------------
 5 files changed, 5 insertions(+), 58 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 750cffdeac..0123943c35 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -537,6 +537,7 @@ public:
 	void dropError();
 	void cantDrop();
 	void entryAnims();
+	bool finishedWalking();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 1245187a92..ac5f3132b6 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -231,8 +231,7 @@ void DreamGenContext::inventory() {
 
 	if (data.byte(kCommandtype) != 239) {
 		data.byte(kCommandtype) = 239;
-		al = 32;
-		commandOnly();
+		commandOnly(32);
 	}
 
 	if (data.word(kMousebutton) == data.word(kOldbutton))
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index e2e27bc417..c9ea699988 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -536,17 +536,6 @@ void DreamBase::moveMap(uint8 param) {
 	data.byte(kNowinnewroom) = 1;
 }
 
-void DreamGenContext::checkOne() {
-	uint8 flag, flagEx, type, flagX, flagY;
-	checkOne(cl, ch, &flag, &flagEx, &type, &flagX, &flagY);
-
-	cl = flag;
-	ch = flagEx;
-	dl = flagX;
-	dh = flagY;
-	al = type;
-}
-
 void DreamBase::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY) {
 	*flagX = x / 16;
 	*flagY = y / 16;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 0f5b6541d7..2120668ef6 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1138,10 +1138,6 @@ void DreamBase::delTextLine() {
 		multiPut(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy), kUnderTextSizeX, kUnderTextSizeY);
 }
 
-void DreamGenContext::commandOnly() {
-	commandOnly(al);
-}
-
 void DreamBase::commandOnly(uint8 command) {
 	delTextLine();
 	uint16 index = command * 2;
@@ -1152,10 +1148,6 @@ void DreamBase::commandOnly(uint8 command) {
 	data.byte(kNewtextline) = 1;
 }
 
-void DreamGenContext::checkIfPerson() {
-	flags._z = !checkIfPerson(al, ah);
-}
-
 bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
 	Common::List<People>::iterator i;
 	for (i = _peopleList.begin(); i != _peopleList.end(); ++i) {
@@ -1183,10 +1175,6 @@ bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
 	return false;
 }
 
-void DreamGenContext::checkIfFree() {
-	flags._z = !checkIfFree(al, ah);
-}
-
 bool DreamGenContext::checkIfFree(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _freeList.reverse_begin(); i != _freeList.end(); --i) {
@@ -1200,10 +1188,6 @@ bool DreamGenContext::checkIfFree(uint8 x, uint8 y) {
 	return false;
 }
 
-void DreamGenContext::checkIfEx() {
-	flags._z = !checkIfEx(al, ah);
-}
-
 bool DreamGenContext::checkIfEx(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _exList.reverse_begin(); i != _exList.end(); --i) {
@@ -1411,11 +1395,7 @@ void DreamBase::removeSetObject(uint8 index) {
 	getSetAd(index)->mapad[0] = 0xff;
 }
 
-void DreamGenContext::finishedWalking() {
-	flags._z = finishedWalkingCPP();
-}
-
-bool DreamGenContext::finishedWalkingCPP() {
+bool DreamBase::finishedWalking() {
 	return (data.byte(kLinepointer) == 254) && (data.byte(kFacing) == data.byte(kTurntoface));
 }
 
@@ -1426,7 +1406,7 @@ void DreamBase::getFlagUnderP(uint8 *flag, uint8 *flagEx) {
 }
 
 void DreamGenContext::walkAndExamine() {
-	if (!finishedWalkingCPP())
+	if (!finishedWalking())
 		return;
 	data.byte(kCommandtype) = data.byte(kWalkexamtype);
 	data.byte(kCommand) = data.byte(kWalkexamnum);
@@ -1449,7 +1429,7 @@ void DreamGenContext::obName(uint8 command, uint8 commandType) {
 				setWalk();
 				data.byte(kReasseschanges) = 1;
 				return;
-			} else if (! finishedWalkingCPP())
+			} else if (!finishedWalking())
 				return;
 			else if (data.byte(kCommandtype) == 5) {
 				if (data.word(kWatchingtime) == 0)
@@ -1690,11 +1670,6 @@ bool DreamBase::objectMatches(void *object, const char *id) {
 	return true;
 }
 
-void DreamGenContext::compare() {
-	char id[4] = { cl, ch, dl, dh };
-	flags._z = compare(al, ah, id);
-}
-
 bool DreamBase::compare(uint8 index, uint8 flag, const char id[4]) {
 	return objectMatches(getAnyAdDir(index, flag), id);
 }
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index b24185b82d..c0c8aede5b 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -58,15 +58,8 @@
 		DreamBase::showFrame(frameData, x, y, frameNumber, effectsFlag);
 	}
 	void width160();
-	void commandOnly();
-	void commandOnly(uint8 command) {
-		DreamBase::commandOnly(command);
-	}
-	void checkIfPerson();
 	bool checkIfPerson(uint8 x, uint8 y);
-	void checkIfFree();
 	bool checkIfFree(uint8 x, uint8 y);
-	void checkIfEx();
 	bool checkIfEx(uint8 x, uint8 y);
 	void commandWithOb();
 	void commandWithOb(uint8 command, uint8 type, uint8 index) {
@@ -84,20 +77,10 @@
 	SetObject *getSetAd(uint8 index) {
 		return DreamBase::getSetAd(index);
 	}
-	bool finishedWalkingCPP();
-	void finishedWalking();
-	void checkOne();
-	void checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY) {
-		DreamBase::checkOne(x, y, flag, flagEx, type, flagX, flagY);
-	}
 	void walkAndExamine();
 	void obName(uint8 command, uint8 commandType);
 
 	void getExPos();
-	void compare();
-	bool compare(uint8 index, uint8 flag, const char id[4]) {
-		return DreamBase::compare(index, flag, id);
-	}
 	bool checkIfSet(uint8 x, uint8 y);
 	void isItWorn();
 	bool isItWorn(const DynObject *object) {
-- 
cgit v1.2.3


From 4164b31e4a33b3c856acf2b58d0c05b4d96eb91d Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 22 Dec 2011 23:48:18 -0500
Subject: SAGA: Properly handle ITE Mac sound resources

---
 engines/saga/saga.h     |  3 ++-
 engines/saga/sndres.cpp | 41 +++++++++++++++++++++++++++++++++--------
 2 files changed, 35 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index fb01b1ac5d..a9bd1335e6 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -217,7 +217,8 @@ enum GameSoundTypes {
 	kSoundOGG = 5,
 	kSoundFLAC = 6,
 	kSoundAIFF = 7,
-	kSoundShorten = 8
+	kSoundShorten = 8,
+	kSoundMacSND = 9
 };
 
 enum TextStringIds {
diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp
index add34e22a2..dc527d8200 100644
--- a/engines/saga/sndres.cpp
+++ b/engines/saga/sndres.cpp
@@ -30,10 +30,12 @@
 #include "saga/sound.h"
 
 #include "common/file.h"
+#include "common/substream.h"
 
 #include "audio/audiostream.h"
 #include "audio/decoders/adpcm.h"
 #include "audio/decoders/aiff.h"
+#include "audio/decoders/mac_snd.h"
 #include "audio/decoders/raw.h"
 #include "audio/decoders/voc.h"
 #include "audio/decoders/wave.h"
@@ -174,7 +176,7 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
 	GameSoundTypes resourceType = kSoundPCM;
 	byte *data = 0;
 	int rate = 0, size = 0;
-	Common::File* file;
+	Common::File *file;
 
 	if (resourceId == (uint32)-1) {
 		return false;
@@ -258,7 +260,10 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
 	buffer.flags = Audio::FLAG_16BITS;
 	buffer.frequency = 22050;
 	if (_vm->getGameId() == GID_ITE) {
-		if (_vm->getFeatures() & GF_8BIT_UNSIGNED_PCM) {	// older ITE demos
+		if (context->fileType() & GAME_MACBINARY) {
+			// ITE Mac has sound in the Mac snd format
+			resourceType = kSoundMacSND;
+		} else if (_vm->getFeatures() & GF_8BIT_UNSIGNED_PCM) {	// older ITE demos
 			buffer.flags |= Audio::FLAG_UNSIGNED;
 			buffer.flags &= ~Audio::FLAG_16BITS;
 		} else {
@@ -276,16 +281,11 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
 	if (!context->isBigEndian())
 		buffer.flags |= Audio::FLAG_LITTLE_ENDIAN;
 
-	// Older Mac versions of ITE were Macbinary packed
-	int soundOffset = (context->fileType() & GAME_MACBINARY) ? 36 : 0;
-
 	switch (resourceType) {
 	case kSoundPCM:
-		buffer.size = soundResourceLength - soundOffset;
+		buffer.size = soundResourceLength;
 		if (!onlyHeader) {
 			buffer.buffer = (byte *) malloc(buffer.size);
-			if (soundOffset > 0)
-				readS.skip(soundOffset);
 			readS.read(buffer.buffer, buffer.size);
 		}
 		result = true;
@@ -300,6 +300,31 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
 		}
 		result = true;
 		break;
+	case kSoundMacSND: {
+		Audio::SeekableAudioStream *audStream = Audio::makeMacSndStream(new Common::SeekableSubReadStream(&readS, readS.pos(), readS.pos() + soundResourceLength), DisposeAfterUse::YES);
+		Audio::Timestamp length = audStream->getLength();
+		buffer.size = length.totalNumberOfFrames() * 2;
+		buffer.frequency = audStream->getRate();
+
+		if (audStream->isStereo()) {
+			buffer.size *= 2;
+			buffer.flags |= Audio::FLAG_STEREO;
+		}
+
+		buffer.buffer = (byte *)malloc(buffer.size);
+		audStream->readBuffer((int16 *)buffer.buffer, buffer.size / 2);
+
+		// The sound data is in native endian format now that we read it
+		// from the stream.
+#ifdef SCUMM_LITTLE_ENDIAN
+		buffer.flags |= Audio::FLAG_LITTLE_ENDIAN;
+#else
+		buffer.flags &= ~Audio::FLAG_LITTLE_ENDIAN;
+#endif
+
+		delete audStream;
+		result = true;
+		} break;
 	case kSoundWAV:
 	case kSoundAIFF:
 	case kSoundShorten:
-- 
cgit v1.2.3


From d876dddd45d4d8fa5d93396d3d922b720e273c99 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 23 Dec 2011 19:26:25 -0500
Subject: SAGA: Rework the way audio is buffered

The streams that are created are now used directly instead of SAGA creating its own RawStream after decoding it. In addition, this should fix ADPCM-compressed sounds on big endian systems (as the code was treating the result of readBuffer() to always be LE, whereas it's actual native endian).

I've also clarified the bugfix to bug #1256701. It only applies to 16-bit PCM data and the size for other data is no longer truncated too ;)
---
 engines/saga/saga.h     |  13 ---
 engines/saga/sndres.cpp | 230 ++++++++++++++++++++++--------------------------
 engines/saga/sndres.h   |   2 -
 engines/saga/sound.cpp  |  35 +-------
 engines/saga/sound.h    |  19 ++--
 5 files changed, 113 insertions(+), 186 deletions(-)

(limited to 'engines')

diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index a9bd1335e6..829425aeaf 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -208,19 +208,6 @@ enum PanelButtonType {
 	kPanelAllButtons = 0xFFFFF
 };
 
-enum GameSoundTypes {
-	kSoundPCM = 0,
-	kSoundVOX = 1,
-	kSoundVOC = 2,
-	kSoundWAV = 3,
-	kSoundMP3 = 4,
-	kSoundOGG = 5,
-	kSoundFLAC = 6,
-	kSoundAIFF = 7,
-	kSoundShorten = 8,
-	kSoundMacSND = 9
-};
-
 enum TextStringIds {
 	kTextPickUp,
 	kTextLookAt,
diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp
index dc527d8200..5a97eb6019 100644
--- a/engines/saga/sndres.cpp
+++ b/engines/saga/sndres.cpp
@@ -35,9 +35,12 @@
 #include "audio/audiostream.h"
 #include "audio/decoders/adpcm.h"
 #include "audio/decoders/aiff.h"
+#include "audio/decoders/flac.h"
 #include "audio/decoders/mac_snd.h"
+#include "audio/decoders/mp3.h"
 #include "audio/decoders/raw.h"
 #include "audio/decoders/voc.h"
+#include "audio/decoders/vorbis.h"
 #include "audio/decoders/wave.h"
 #ifdef ENABLE_SAGA2
 #include "saga/shorten.h"
@@ -169,12 +172,29 @@ void SndRes::playVoice(uint32 resourceId) {
 	_vm->_sound->playVoice(buffer);
 }
 
+enum GameSoundType {
+	kSoundPCM = 0,
+	kSoundVOX = 1,
+	kSoundVOC = 2,
+	kSoundWAV = 3,
+	kSoundMP3 = 4,
+	kSoundOGG = 5,
+	kSoundFLAC = 6,
+	kSoundAIFF = 7,
+	kSoundShorten = 8,
+	kSoundMacSND = 9
+};
+
+// Use a macro to read in the sound data based on if we actually want to buffer it or not
+#define READ_STREAM(streamSize) \
+	(onlyHeader \
+	? new Common::SeekableSubReadStream(&readS, readS.pos(), readS.pos() + (streamSize)) \
+	: readS.readStream(streamSize))
+
 bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buffer, bool onlyHeader) {
-	Audio::AudioStream *voxStream;
 	size_t soundResourceLength;
 	bool result = false;
-	GameSoundTypes resourceType = kSoundPCM;
-	byte *data = 0;
+	GameSoundType resourceType = kSoundPCM;
 	int rate = 0, size = 0;
 	Common::File *file;
 
@@ -212,7 +232,7 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
 		soundResourceLength = resourceData->size;
 	}
 
-	Common::SeekableReadStream& readS = *file;
+	Common::SeekableReadStream &readS = *file;
 	bool uncompressedSound = false;
 
 	if (soundResourceLength >= 8) {
@@ -252,183 +272,141 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff
 
 	}
 
-	// Default sound type is 16-bit signed PCM, used in ITE by PCM and VOX files
-	buffer.isCompressed = context->isCompressed();
-	buffer.soundType = resourceType;
-	buffer.originalSize = 0;
-	// Set default flags and frequency for PCM, VOC and VOX files, which got no header
-	buffer.flags = Audio::FLAG_16BITS;
-	buffer.frequency = 22050;
+	// Default sound type is 16-bit signed PCM, used in ITE
+	byte rawFlags = Audio::FLAG_16BITS;
+
 	if (_vm->getGameId() == GID_ITE) {
 		if (context->fileType() & GAME_MACBINARY) {
 			// ITE Mac has sound in the Mac snd format
 			resourceType = kSoundMacSND;
 		} else if (_vm->getFeatures() & GF_8BIT_UNSIGNED_PCM) {	// older ITE demos
-			buffer.flags |= Audio::FLAG_UNSIGNED;
-			buffer.flags &= ~Audio::FLAG_16BITS;
-		} else {
+			rawFlags |= Audio::FLAG_UNSIGNED;
+			rawFlags &= ~Audio::FLAG_16BITS;
+		} else if (!uncompressedSound && !scumm_stricmp(context->fileName(), "voicesd.rsc")) {
 			// Voice files in newer ITE demo versions are OKI ADPCM (VOX) encoded.
-			// These are LE in all the Windows and Mac demos
-			if (!uncompressedSound && !scumm_stricmp(context->fileName(), "voicesd.rsc")) {
-				resourceType = kSoundVOX;
-				buffer.flags |= Audio::FLAG_LITTLE_ENDIAN;
-			}
+			resourceType = kSoundVOX;
 		}
 	}
-	buffer.buffer = NULL;
+
+	buffer.stream = 0;
 
 	// Check for LE sounds
 	if (!context->isBigEndian())
-		buffer.flags |= Audio::FLAG_LITTLE_ENDIAN;
+		rawFlags |= Audio::FLAG_LITTLE_ENDIAN;
 
 	switch (resourceType) {
-	case kSoundPCM:
-		buffer.size = soundResourceLength;
-		if (!onlyHeader) {
-			buffer.buffer = (byte *) malloc(buffer.size);
-			readS.read(buffer.buffer, buffer.size);
-		}
+	case kSoundPCM: {
+		// In ITE CD German, some voices are absent and contain just 5 zero bytes.
+		// Round down to an even number when the audio is 16-bit so makeRawStream
+		// will accept the data (needs to be an even size for 16-bit data).
+		// See bug #1256701
+
+		if ((soundResourceLength & 1) && (rawFlags & Audio::FLAG_16BITS))
+			soundResourceLength &= ~1;
+
+		Audio::SeekableAudioStream *audStream = Audio::makeRawStream(READ_STREAM(soundResourceLength), 22050, rawFlags);
+		buffer.stream = audStream;
+		buffer.streamLength = audStream->getLength();
 		result = true;
-		break;
+		} break;
 	case kSoundVOX:
-		buffer.size = soundResourceLength * 4;
-		if (!onlyHeader) {
-			voxStream = Audio::makeADPCMStream(&readS, DisposeAfterUse::NO, soundResourceLength, Audio::kADPCMOki);
-			buffer.buffer = (byte *)malloc(buffer.size);
-			voxStream->readBuffer((int16*)buffer.buffer, soundResourceLength * 2);
-			delete voxStream;
-		}
+		buffer.stream = Audio::makeADPCMStream(READ_STREAM(soundResourceLength), DisposeAfterUse::YES, soundResourceLength, Audio::kADPCMOki, 22050, 1);
+		buffer.streamLength = Audio::Timestamp(0, soundResourceLength * 2, buffer.stream->getRate());
 		result = true;
 		break;
 	case kSoundMacSND: {
-		Audio::SeekableAudioStream *audStream = Audio::makeMacSndStream(new Common::SeekableSubReadStream(&readS, readS.pos(), readS.pos() + soundResourceLength), DisposeAfterUse::YES);
-		Audio::Timestamp length = audStream->getLength();
-		buffer.size = length.totalNumberOfFrames() * 2;
-		buffer.frequency = audStream->getRate();
-
-		if (audStream->isStereo()) {
-			buffer.size *= 2;
-			buffer.flags |= Audio::FLAG_STEREO;
-		}
-
-		buffer.buffer = (byte *)malloc(buffer.size);
-		audStream->readBuffer((int16 *)buffer.buffer, buffer.size / 2);
-
-		// The sound data is in native endian format now that we read it
-		// from the stream.
-#ifdef SCUMM_LITTLE_ENDIAN
-		buffer.flags |= Audio::FLAG_LITTLE_ENDIAN;
-#else
-		buffer.flags &= ~Audio::FLAG_LITTLE_ENDIAN;
-#endif
-
-		delete audStream;
+		Audio::SeekableAudioStream *audStream = Audio::makeMacSndStream(READ_STREAM(soundResourceLength), DisposeAfterUse::YES);
+		buffer.stream = audStream;
+		buffer.streamLength = audStream->getLength();
+		result = true;
+		} break;
+	case kSoundAIFF: {
+		Audio::SeekableAudioStream *audStream = Audio::makeAIFFStream(READ_STREAM(soundResourceLength), DisposeAfterUse::YES);
+		buffer.stream = audStream;
+		buffer.streamLength = audStream->getLength();
+		result = true;
+		} break;
+	case kSoundVOC: {
+		Audio::SeekableAudioStream *audStream = Audio::makeVOCStream(READ_STREAM(soundResourceLength), Audio::FLAG_UNSIGNED, DisposeAfterUse::YES);
+		buffer.stream = audStream;
+		buffer.streamLength = audStream->getLength();
 		result = true;
 		} break;
 	case kSoundWAV:
-	case kSoundAIFF:
 	case kSoundShorten:
-	case kSoundVOC:
 		if (resourceType == kSoundWAV) {
-			result = Audio::loadWAVFromStream(readS, size, rate, buffer.flags);
-		} else if (resourceType == kSoundAIFF) {
-			result = Audio::loadAIFFFromStream(readS, size, rate, buffer.flags);
+			result = Audio::loadWAVFromStream(readS, size, rate, rawFlags);
 #ifdef ENABLE_SAGA2
 		} else if (resourceType == kSoundShorten) {
-			result = loadShortenFromStream(readS, size, rate, buffer.flags);
+			result = loadShortenFromStream(readS, size, rate, rawFlags);
 #endif
-		} else if (resourceType == kSoundVOC) {
-			data = Audio::loadVOCFromStream(readS, size, rate);
-			result = (data != NULL);
-			if (onlyHeader)
-				free(data);
-			buffer.flags |= Audio::FLAG_UNSIGNED;
-			buffer.flags &= ~Audio::FLAG_16BITS;
-			buffer.flags &= ~Audio::FLAG_STEREO;
 		}
 
 		if (result) {
-			buffer.frequency = rate;
-			buffer.size = size;
-
-			if (!onlyHeader) {
-				if (resourceType == kSoundVOC) {
-					buffer.buffer = data;
-				} else {
-					buffer.buffer = (byte *)malloc(size);
-					readS.read(buffer.buffer, size);
-				}
-			}
+			Audio::SeekableAudioStream *audStream = Audio::makeRawStream(READ_STREAM(size), rate, rawFlags);
+			buffer.stream = audStream;
+			buffer.streamLength = audStream->getLength();
 		}
 		break;
 	case kSoundMP3:
 	case kSoundOGG:
-	case kSoundFLAC:
-		ResourceData *resourceData;
-		resourceData = context->getResourceData(resourceId);
-
-		// Read compressed sfx header
-		readS.readByte();	// Skip compression identifier byte
-		buffer.frequency = readS.readUint16LE();
-		buffer.originalSize = readS.readUint32LE();
-		if (readS.readByte() == 8)	// read sample bits
-			buffer.flags &= ~Audio::FLAG_16BITS;
-		if (readS.readByte() != 0)	// read stereo flag
-			buffer.flags |= Audio::FLAG_STEREO;
-
-		buffer.size = soundResourceLength;
-		buffer.soundType = resourceType;
-		buffer.fileOffset = resourceData->offset + 9; // skip compressed sfx header: byte + uint16 + uint32 + byte + byte
-
-		if (!onlyHeader) {
-			buffer.buffer = (byte *)malloc(buffer.size);
-			readS.read(buffer.buffer, buffer.size);
+	case kSoundFLAC: {
+		readS.skip(9); // skip sfx header
+
+		Audio::SeekableAudioStream *audStream = 0;
+		Common::SeekableReadStream *memStream = READ_STREAM(soundResourceLength - 9);
+
+		if (resourceType == kSoundMP3) {
+#ifdef USE_MAD
+			audStream = Audio::makeMP3Stream(memStream, DisposeAfterUse::YES);
+#endif
+		} else if (resourceType == kSoundOGG) {
+#ifdef USE_VORBIS
+			audStream = Audio::makeVorbisStream(memStream, DisposeAfterUse::YES);
+#endif
+		} else /* if (resourceType == kSoundFLAC) */ {
+#ifdef USE_FLAC
+			audStream = Audio::makeFLACStream(memStream, DisposeAfterUse::YES);
+#endif
 		}
 
-		result = true;
-		break;
+		if (audStream) {
+			buffer.stream = audStream;
+			buffer.streamLength = audStream->getLength();
+			result = true;
+		} else {
+			delete memStream;
+		}
+
+		} break;
 	default:
 		error("SndRes::load Unknown sound type");
 	}
 
-
 	if (_vm->getGameId() == GID_IHNM && _vm->isMacResources()) {
 		delete file;
 	}
 
-
-	// In ITE CD De some voices are absent and contain just 5 bytes header
-	// Round it to even number so soundmanager will not crash.
-	// See bug #1256701
-	buffer.size &= ~(0x1);
+	if (onlyHeader) {
+		delete buffer.stream;
+		buffer.stream = 0;
+	}
 
 	return result;
 }
 
+#undef READ_STREAM
+
 int SndRes::getVoiceLength(uint32 resourceId) {
-	double msDouble;
 	SoundBuffer buffer;
 
 	if (!(_vm->_voiceFilesExist))
 		return -1;
 
-	if (!load(_voiceContext, resourceId, buffer, true)) {
+	if (!load(_voiceContext, resourceId, buffer, true))
 		return -1;
-	}
-
-	if (!_voiceContext->isCompressed() || buffer.originalSize == 0)
-		msDouble = (double)buffer.size;
-	else
-		msDouble = (double)buffer.originalSize;
-
-	if (buffer.flags & Audio::FLAG_16BITS)
-		msDouble /= 2.0;
-
-	if (buffer.flags & Audio::FLAG_STEREO)
-		msDouble /= 2.0;
 
-	msDouble = msDouble / buffer.frequency * 1000.0;
-	return (int)msDouble;
+	return buffer.streamLength.msecs();
 }
 
 } // End of namespace Saga
diff --git a/engines/saga/sndres.h b/engines/saga/sndres.h
index 9b0eebc834..979c0288f6 100644
--- a/engines/saga/sndres.h
+++ b/engines/saga/sndres.h
@@ -52,8 +52,6 @@ public:
 
  private:
 	bool load(ResourceContext *context, uint32 resourceId, SoundBuffer &buffer, bool onlyHeader);
-	bool loadVocSound(byte *soundResource, size_t soundResourceLength, SoundBuffer &buffer);
-	bool loadWavSound(byte *soundResource, size_t soundResourceLength, SoundBuffer &buffer);
 
 	ResourceContext *_sfxContext;
 	ResourceContext *_voiceContext;
diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp
index 3408125f73..67be499bc7 100644
--- a/engines/saga/sound.cpp
+++ b/engines/saga/sound.cpp
@@ -63,42 +63,11 @@ SndHandle *Sound::getHandle() {
 void Sound::playSoundBuffer(Audio::SoundHandle *handle, const SoundBuffer &buffer, int volume,
 				sndHandleType handleType, bool loop) {
 
-	Audio::RewindableAudioStream *stream = 0;
-
 	Audio::Mixer::SoundType soundType = (handleType == kVoiceHandle) ?
 				Audio::Mixer::kSpeechSoundType : Audio::Mixer::kSFXSoundType;
 
-	if (!buffer.isCompressed) {
-		stream = Audio::makeRawStream(buffer.buffer, buffer.size, buffer.frequency, buffer.flags);
-	} else {
-		Common::SeekableReadStream *memStream = new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES);
-
-		switch (buffer.soundType) {
-#ifdef USE_MAD
-		case kSoundMP3:
-			stream = Audio::makeMP3Stream(memStream, DisposeAfterUse::YES);
-			break;
-#endif
-#ifdef USE_VORBIS
-		case kSoundOGG:
-			stream = Audio::makeVorbisStream(memStream, DisposeAfterUse::YES);
-			break;
-#endif
-#ifdef USE_FLAC
-		case kSoundFLAC:
-			stream = Audio::makeFLACStream(memStream, DisposeAfterUse::YES);
-			break;
-#endif
-		default:
-			// Unknown compression, ignore sample
-			delete memStream;
-			warning("Unknown compression, ignoring sound");
-			break;
-		}
-	}
-
-	if (stream != NULL)
-		_mixer->playStream(soundType, handle, Audio::makeLoopingAudioStream(stream, loop ? 0 : 1), -1, volume);
+	if (buffer.stream)
+		_mixer->playStream(soundType, handle, Audio::makeLoopingAudioStream(buffer.stream, loop ? 0 : 1), -1, volume);
 }
 
 void Sound::playSound(SoundBuffer &buffer, int volume, bool loop, int resId) {
diff --git a/engines/saga/sound.h b/engines/saga/sound.h
index 15624a9da5..e2163dfb0e 100644
--- a/engines/saga/sound.h
+++ b/engines/saga/sound.h
@@ -27,9 +27,11 @@
 
 #include "common/file.h"
 #include "audio/mixer.h"
-#include "audio/decoders/mp3.h"
-#include "audio/decoders/vorbis.h"
-#include "audio/decoders/flac.h"
+#include "audio/timestamp.h"
+
+namespace Audio {
+class RewindableAudioStream;
+}
 
 namespace Saga {
 
@@ -40,15 +42,8 @@ enum SOUND_FLAGS {
 };
 
 struct SoundBuffer {
-	uint16 frequency;
-	bool isCompressed;
-	byte flags;
-
-	byte *buffer;
-	size_t size;
-	size_t originalSize;
-	GameSoundTypes soundType;
-	size_t fileOffset;
+	Audio::RewindableAudioStream *stream;
+	Audio::Timestamp streamLength;
 };
 
 enum sndHandleType {
-- 
cgit v1.2.3


From df269f839d7e0fb1e2ba029e1fadba078d125030 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Sat, 24 Dec 2011 22:24:05 +0000
Subject: DREAMWEB: Ported 'starttalk' to C++

---
 engines/dreamweb/dreamgen.cpp | 39 ---------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.h      |  1 +
 engines/dreamweb/talk.cpp     | 25 ++++++++++++++++++++++++-
 4 files changed, 25 insertions(+), 41 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index b9816c28b2..487839c03b 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -975,45 +975,6 @@ cantpurge2:
 		goto lookforpurge2;
 }
 
-void DreamGenContext::startTalk() {
-	STACK_CHECK;
-	data.byte(kTalkmode) = 0;
-	al = data.byte(kCharacter);
-	_and(al, 127);
-	getPersonText();
-	data.word(kCharshift) = 91+91;
-	di = 66;
-	bx = 64;
-	dl = 241;
-	al = 0;
-	ah = 79;
-	printDirect();
-	data.word(kCharshift) = 0;
-	di = 66;
-	bx = 80;
-	dl = 241;
-	al = 0;
-	ah = 0;
-	printDirect();
-	data.byte(kSpeechloaded) = 0;
-	al = data.byte(kCharacter);
-	_and(al, 127);
-	ah = 0;
-	cx = 64;
-	_mul(cx);
-	cl = 'C';
-	dl = 'R';
-	dh = data.byte(kReallocation);
-	loadSpeech();
-	_cmp(data.byte(kSpeechloaded), 1);
-	if (!flags.z())
-		return /* (nospeech1) */;
-	data.byte(kVolumedirection) = 1;
-	data.byte(kVolumeto) = 6;
-	al = 50+12;
-	playChannel1();
-}
-
 void DreamGenContext::getPersonText() {
 	STACK_CHECK;
 	ah = 0;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 10abde7fff..f6399b4e7d 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -460,7 +460,6 @@ public:
 	void outOfOpen();
 	void dirCom();
 	void findFirstPath();
-	void startTalk();
 	void getAnyAd();
 	void getFreeAd();
 	void dirFile();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index c0c8aede5b..5f777e4e9a 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -98,6 +98,7 @@
 	void showCity();
 	uint16 getPersFrame(uint8 index);
 	void convIcons();
+	void startTalk();
 	void examineOb(bool examineAgain = true);
 	void dumpWatch();
 	void transferText();
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 40c514b34a..20ac58dd7a 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -84,7 +84,30 @@ uint16 DreamGenContext::getPersFrame(uint8 index) {
 	return getSegment(data.word(kPeople)).word(kPersonframes + index * 2);
 }
 
-// TODO: put Starttalk here
+void DreamGenContext::startTalk() {
+	data.byte(kTalkmode) = 0;
+
+	al = (data.byte(kCharacter) & 0x7F);
+	getPersonText();
+	const uint8 *str = es.ptr(si, 0);
+	uint16 y;
+
+	data.word(kCharshift) = 91+91;
+	y = 64;
+	printDirect(&str, 66, &y, 241, true);
+
+	data.word(kCharshift) = 0;
+	y = 80;
+	printDirect(&str, 66, &y, 241, true);
+
+	data.byte(kSpeechloaded) = 0;
+	loadSpeech('R', data.byte(kReallocation), 'C', 64*(data.byte(kCharacter) & 0x7F));
+	if (data.byte(kSpeechloaded) == 1) {
+		data.byte(kVolumedirection) = 1;
+		data.byte(kVolumeto) = 6;
+		playChannel1(50 + 12);
+	}
+}
 
 // TODO: put Getpersontext here
 
-- 
cgit v1.2.3


From a1ffa11620fcd0ba48b5cc2c1ca505ca4baab436 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Sat, 24 Dec 2011 23:00:11 +0000
Subject: DREAMWEB: Port 'getpersontext' to C++

---
 engines/dreamweb/dreamgen.cpp | 14 --------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.h      |  1 +
 engines/dreamweb/talk.cpp     |  8 +++++---
 4 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 487839c03b..e321c50993 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -975,20 +975,6 @@ cantpurge2:
 		goto lookforpurge2;
 }
 
-void DreamGenContext::getPersonText() {
-	STACK_CHECK;
-	ah = 0;
-	cx = 64*2;
-	_mul(cx);
-	si = ax;
-	es = data.word(kPeople);
-	_add(si, (0+24));
-	cx = (0+24+(1026*2));
-	ax = es.word(si);
-	_add(ax, cx);
-	si = ax;
-}
-
 void DreamGenContext::doSomeTalk() {
 	STACK_CHECK;
 dospeech:
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f6399b4e7d..7717c7fb1c 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -454,7 +454,6 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
-	void getPersonText();
 	void checkObjectSize();
 	void doSomeTalk();
 	void outOfOpen();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 5f777e4e9a..921b8ed2eb 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -99,6 +99,7 @@
 	uint16 getPersFrame(uint8 index);
 	void convIcons();
 	void startTalk();
+	void getPersonText(uint8 index);
 	void examineOb(bool examineAgain = true);
 	void dumpWatch();
 	void transferText();
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 20ac58dd7a..c0622f7d53 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -87,8 +87,7 @@ uint16 DreamGenContext::getPersFrame(uint8 index) {
 void DreamGenContext::startTalk() {
 	data.byte(kTalkmode) = 0;
 
-	al = (data.byte(kCharacter) & 0x7F);
-	getPersonText();
+	getPersonText(data.byte(kCharacter) & 0x7F);
 	const uint8 *str = es.ptr(si, 0);
 	uint16 y;
 
@@ -109,7 +108,10 @@ void DreamGenContext::startTalk() {
 	}
 }
 
-// TODO: put Getpersontext here
+void DreamGenContext::getPersonText(uint8 index) {
+	es = data.word(kPeople);
+	si = es.word((index * 64 * 2) + 24) + (1026 * 2) + 24;
+}
 
 void DreamGenContext::moreTalk() {
 	if (data.byte(kTalkmode) != 0) {
-- 
cgit v1.2.3


From 652403021d7dbcceb672dd21b468d1667479fc8b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 04:51:18 +0200
Subject: DREAMWEB: Convert 'checkobjectsize' to C++

Also, renamed getOpenedSizeCPP() to getSlotCount(). Special thanks to
wjp for his help and for examining the behavior of a fallback case.
---
 engines/dreamweb/dreamgen.cpp | 48 --------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/object.cpp   | 64 +++++++++++++++++++++++++++++++++++++++++--
 engines/dreamweb/structs.h    |  6 ++--
 engines/dreamweb/stubs.h      |  5 +++-
 5 files changed, 68 insertions(+), 56 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index e321c50993..7416e1bafb 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -677,54 +677,6 @@ sizeok1:
 	delPointer();
 }
 
-void DreamGenContext::checkObjectSize() {
-	STACK_CHECK;
-	getOpenedSize();
-	push(ax);
-	al = data.byte(kItemframe);
-	getEitherAd();
-	al = es.byte(bx+9);
-	cx = pop();
-	_cmp(al, 255);
-	if (!flags.z())
-		goto notunsized;
-	al = 6;
-notunsized:
-	_cmp(al, 100);
-	if (!flags.c())
-		goto specialcase;
-	_cmp(cl, 100);
-	if (flags.c())
-		goto isntspecial;
-	errorMessage3();
-	goto sizewrong;
-isntspecial:
-	_cmp(cl, al);
-	if (!flags.c())
-		goto sizeok;
-specialcase:
-	_sub(al, 100);
-	_cmp(cl, 100);
-	if (!flags.c())
-		goto bothspecial;
-	_cmp(cl, al);
-	if (!flags.c())
-		goto sizeok;
-	errorMessage2();
-	goto sizewrong;
-bothspecial:
-	_sub(cl, 100);
-	_cmp(al, cl);
-	if (flags.z())
-		goto sizeok;
-	errorMessage3();
-sizewrong:
-	al = 1;
-	return;
-sizeok:
-	al = 0;
-}
-
 void DreamGenContext::outOfOpen() {
 	STACK_CHECK;
 	_cmp(data.byte(kOpenedob), 255);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7717c7fb1c..d8270efdc3 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -454,7 +454,6 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
-	void checkObjectSize();
 	void doSomeTalk();
 	void outOfOpen();
 	void dirCom();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index ac5f3132b6..7e1ba1c2a3 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -281,7 +281,7 @@ void DreamBase::getBackFromOb() {
 }
 
 void DreamGenContext::getOpenedSize() {
-	//ax = getOpenedSizeCPP();
+	//ax = getOpenedSlotCount();
 
 	// We need to call the ASM-style versions of get*Ad, as these also set
 	// bx and es
@@ -304,7 +304,7 @@ void DreamGenContext::getOpenedSize() {
 	}
 }
 
-byte DreamGenContext::getOpenedSizeCPP() {
+byte DreamGenContext::getOpenedSlotCount() {
 	byte obj = data.byte(kOpenedob);
 	switch (data.byte(kOpenedtype)) {
 	case 4:
@@ -316,6 +316,18 @@ byte DreamGenContext::getOpenedSizeCPP() {
 	}
 }
 
+byte DreamGenContext::getOpenedSlotSize() {
+	byte obj = data.byte(kOpenedob);
+	switch (data.byte(kOpenedtype)) {
+	case 4:
+		return getExAd(obj)->slotSize;
+	case 2:
+		return getFreeAd(obj)->slotSize;
+	default:
+		return getSetAd(obj)->slotSize;
+	}
+}
+
 void DreamGenContext::openOb() {
 	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
 
@@ -326,7 +338,7 @@ void DreamGenContext::openOb() {
 	al = printDirect(commandLine, data.word(kLastxpos) + 5, kInventy+86, 220, false);
 
 	fillOpen();
-	_openChangeSize = getOpenedSizeCPP() * kItempicsize + kInventx;
+	_openChangeSize = getOpenedSlotCount() * kItempicsize + kInventx;
 }
 
 void DreamGenContext::identifyOb() {
@@ -748,4 +760,50 @@ void DreamBase::dropObject() {
 	object->currentLocation = data.byte(kReallocation);
 }
 
+void DreamGenContext::checkObjectSize() {
+	al = checkObjectSizeCPP() ? 0 : 1;
+}
+
+bool DreamGenContext::checkObjectSizeCPP() {
+	byte containerSize = getOpenedSlotSize();
+	DynObject *object = getEitherAdCPP();
+	// If there is no size defined for the object in the editor, set its size
+	// to 6. This could be a bad idea, according to the original source.
+	byte objectSize = (object->objectSize != 255) ? object->objectSize : 6;
+
+	if (objectSize >= 100) {
+		// Special case
+		if (containerSize >= 100) {
+			// Both objects are special
+			if (containerSize == objectSize) {
+				return true;
+			} else {
+				errorMessage3();
+				return false;
+			}
+		} else {
+			if (containerSize >= (byte)(objectSize - 100)) {
+				return true;
+			} else {
+				errorMessage2();
+				return false;
+			}
+		}
+	} else if (containerSize >= 100) {	// The current object isn't special, but the container object is
+		errorMessage3();
+		return false;
+	} else if (containerSize >= objectSize) {
+		return true;
+	} else {
+		// The original continues here to the special case above. It checks if
+		// cl (containerSize) < al (objectSize) and continues if this is so.
+		// However, in this case, the code subtracts 100 from objectSize, which
+		// was between 0 - 99, so it now is between 156 and 255. containerSize is
+		// smaller than 100, so comparing it with objectSize will always be true,
+		// thus this bit of code always falls through to the errorMessage2() case.
+		errorMessage2();
+		return false;
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 4d1b1420f9..5d93d1d99f 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -120,9 +120,9 @@ struct DynObject {
 	uint8 currentLocation;
 	uint8 index;
 	uint8 mapad[5];
-	uint8 slotSize;
-	uint8 slotCount;
-	uint8 b9;
+	uint8 slotSize;		// the size of an object's slots
+	uint8 slotCount;	// the number of slots of an object
+	uint8 objectSize;	// the size of an object
 	uint8 b10;
 	uint8 initialLocation;
 	uint8 id[4];
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 921b8ed2eb..09a68682a7 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -185,7 +185,10 @@
 	void runEndSeq();
 	bool execCommand();
 	void getOpenedSize();
-	byte getOpenedSizeCPP();
+	byte getOpenedSlotSize();
+	byte getOpenedSlotCount();
+	void checkObjectSize();
+	bool checkObjectSizeCPP();
 	void openOb();
 	void identifyOb();
 	void useStereo();
-- 
cgit v1.2.3


From 088c145f8f551a7faaf50e317529549503b1b7e8 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Sun, 25 Dec 2011 07:28:29 +0000
Subject: DREAMWEB: Port 'dosometalk' to C++

---
 engines/dreamweb/dreamgen.cpp | 140 ------------------------------------------
 engines/dreamweb/dreamgen.h   |   1 -
 engines/dreamweb/stubs.h      |   1 +
 engines/dreamweb/talk.cpp     |  86 +++++++++++++++++++++++++-
 4 files changed, 85 insertions(+), 143 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 7416e1bafb..8cd5dd43df 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -927,146 +927,6 @@ cantpurge2:
 		goto lookforpurge2;
 }
 
-void DreamGenContext::doSomeTalk() {
-	STACK_CHECK;
-dospeech:
-	al = data.byte(kTalkpos);
-	al = data.byte(kCharacter);
-	_and(al, 127);
-	ah = 0;
-	cx = 64;
-	_mul(cx);
-	cx = ax;
-	al = data.byte(kTalkpos);
-	ah = 0;
-	_add(ax, cx);
-	_add(ax, ax);
-	si = ax;
-	es = data.word(kPeople);
-	_add(si, (0+24));
-	cx = (0+24+(1026*2));
-	ax = es.word(si);
-	_add(ax, cx);
-	si = ax;
-	_cmp(es.byte(si), 0);
-	if (flags.z())
-		goto endheartalk;
-	push(es);
-	push(si);
-	createPanel();
-	showPanel();
-	showMan();
-	showExit();
-	convIcons();
-	si = pop();
-	es = pop();
-	di = 164;
-	bx = 64;
-	dl = 144;
-	al = 0;
-	ah = 0;
-	printDirect();
-	al = data.byte(kCharacter);
-	_and(al, 127);
-	ah = 0;
-	cx = 64;
-	_mul(cx);
-	cl = data.byte(kTalkpos);
-	ch = 0;
-	_add(ax, cx);
-	cl = 'C';
-	dl = 'R';
-	dh = data.byte(kReallocation);
-	loadSpeech();
-	_cmp(data.byte(kSpeechloaded), 0);
-	if (flags.z())
-		goto noplay1;
-	al = 62;
-	playChannel1();
-noplay1:
-	data.byte(kPointermode) = 3;
-	workToScreenM();
-	cx = 180;
-	hangOnPQ();
-	if (!flags.c())
-		goto _tmp1;
-	return;
-_tmp1:
-	_inc(data.byte(kTalkpos));
-	al = data.byte(kTalkpos);
-	al = data.byte(kCharacter);
-	_and(al, 127);
-	ah = 0;
-	cx = 64;
-	_mul(cx);
-	cx = ax;
-	al = data.byte(kTalkpos);
-	ah = 0;
-	_add(ax, cx);
-	_add(ax, ax);
-	si = ax;
-	es = data.word(kPeople);
-	_add(si, (0+24));
-	cx = (0+24+(1026*2));
-	ax = es.word(si);
-	_add(ax, cx);
-	si = ax;
-	_cmp(es.byte(si), 0);
-	if (flags.z())
-		goto endheartalk;
-	_cmp(es.byte(si), ':');
-	if (flags.z())
-		goto skiptalk2;
-	_cmp(es.byte(si), 32);
-	if (flags.z())
-		goto skiptalk2;
-	push(es);
-	push(si);
-	createPanel();
-	showPanel();
-	showMan();
-	showExit();
-	convIcons();
-	si = pop();
-	es = pop();
-	di = 48;
-	bx = 128;
-	dl = 144;
-	al = 0;
-	ah = 0;
-	printDirect();
-	al = data.byte(kCharacter);
-	_and(al, 127);
-	ah = 0;
-	cx = 64;
-	_mul(cx);
-	cl = data.byte(kTalkpos);
-	ch = 0;
-	_add(ax, cx);
-	cl = 'C';
-	dl = 'R';
-	dh = data.byte(kReallocation);
-	loadSpeech();
-	_cmp(data.byte(kSpeechloaded), 0);
-	if (flags.z())
-		goto noplay2;
-	al = 62;
-	playChannel1();
-noplay2:
-	data.byte(kPointermode) = 3;
-	workToScreenM();
-	cx = 180;
-	hangOnPQ();
-	if (!flags.c())
-		goto skiptalk2;
-	return;
-skiptalk2:
-	_inc(data.byte(kTalkpos));
-	goto dospeech;
-endheartalk:
-	data.byte(kPointermode) = 0;
-}
-
 void DreamGenContext::locationPic() {
 	STACK_CHECK;
 	getDestInfo();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d8270efdc3..52009dc5ed 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -454,7 +454,6 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
-	void doSomeTalk();
 	void outOfOpen();
 	void dirCom();
 	void findFirstPath();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 09a68682a7..b1406182f0 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -100,6 +100,7 @@
 	void convIcons();
 	void startTalk();
 	void getPersonText(uint8 index);
+	void doSomeTalk();
 	void examineOb(bool examineAgain = true);
 	void dumpWatch();
 	void transferText();
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index c0622f7d53..834109b1dc 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -110,7 +110,7 @@ void DreamGenContext::startTalk() {
 
 void DreamGenContext::getPersonText(uint8 index) {
 	es = data.word(kPeople);
-	si = es.word((index * 64 * 2) + 24) + (1026 * 2) + 24;
+	si = es.word((index * 64 * 2) + kPersontxtdat) + kPersontext;
 }
 
 void DreamGenContext::moreTalk() {
@@ -138,7 +138,89 @@ void DreamGenContext::moreTalk() {
 	doSomeTalk();
 }
 
-// TODO: put Dosometalk here
+void DreamGenContext::doSomeTalk() {
+	while (true) {
+		es = data.word(kPeople);
+		si = ((data.byte(kTalkpos) + (64 * (data.byte(kCharacter) & 0x7F))) * 2) + kPersontxtdat;
+		si = es.word(si) + kPersontext;
+
+		if (es.byte(si) == 0) {
+			// endheartalk
+			data.byte(kPointermode) = 0;
+			return;
+		}
+
+		push(es);
+		push(si);
+
+		createPanel();
+		showPanel();
+		showMan();
+		showExit();
+		convIcons();
+
+		si = pop();
+		es = pop();
+
+		const uint8 *str = es.ptr(si, 0);
+		uint16 y = 64;
+		printDirect(&str, 164, &y, 144, false);
+
+		loadSpeech('R', data.byte(kReallocation), 'C', (64 * (data.byte(kCharacter) & 0x7F)) + data.byte(kTalkpos));
+		if (data.byte(kSpeechloaded) != 0)
+			playChannel1(62);
+
+		data.byte(kPointermode) = 3;
+		workToScreenM();
+		cx = 180;
+		hangOnPQ();
+		if (flags.c())
+			return;
+
+		data.byte(kTalkpos)++;
+
+		es = data.word(kPeople);	
+		si = kPersontxtdat + (((64 * (data.byte(kCharacter) & 0x7F)) + data.byte(kTalkpos)) * 2);
+		si = es.word(si) + kPersontext;
+
+		if (es.byte(si) == 0) {
+			// endheartalk
+			data.byte(kPointermode) = 0;
+			return;
+		}
+
+		if (es.byte(si) != ':' && es.byte(si) != 32) {
+			push(es);
+			push(si);
+
+			createPanel();
+			showPanel();
+			showMan();
+			showExit();
+			convIcons();
+
+			si = pop();
+			es = pop();
+
+			str = es.ptr(si, 0);
+			y = 128;
+			printDirect(&str, 48, &y, 144, false);
+
+			loadSpeech('R', data.byte(kReallocation), 'C', (64 * (data.byte(kCharacter) & 0x7F)) + data.byte(kTalkpos));
+			if (data.byte(kSpeechloaded) != 0)
+				playChannel1(62);
+
+			data.byte(kPointermode) = 3;
+			workToScreenM();
+			cx = 180;
+			hangOnPQ();
+			if (flags.c())
+				return;
+		}
+
+		data.byte(kTalkpos)++;
+	}
+}
 
 void DreamGenContext::hangOnPQ() {
 	data.byte(kGetback) = 0;
-- 
cgit v1.2.3


From 4bb6305e59a1b3aa6ff1135ba8660fede22ff0e8 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Sun, 25 Dec 2011 07:42:04 +0000
Subject: DREAMWEB: Change hangOnPQ function signature to avoid carry flag
 usage.

---
 engines/dreamweb/stubs.h  |  2 +-
 engines/dreamweb/talk.cpp | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index b1406182f0..bf5f5c54df 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -173,7 +173,7 @@
 	void madmanRun();
 	void decide();
 	void talk();
-	void hangOnPQ();
+	bool hangOnPQ();
 	void showGun();
 	void endGame();
 	void newPlace();
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 834109b1dc..f13f40e229 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -173,8 +173,7 @@ void DreamGenContext::doSomeTalk() {
 		data.byte(kPointermode) = 3;
 		workToScreenM();
 		cx = 180;
-		hangOnPQ();
-		if (flags.c())
+		if (hangOnPQ())
 			return;
 
 		data.byte(kTalkpos)++;
@@ -213,8 +212,7 @@ void DreamGenContext::doSomeTalk() {
 			data.byte(kPointermode) = 3;
 			workToScreenM();
 			cx = 180;
-			hangOnPQ();
-			if (flags.c())
+			if (hangOnPQ())
 				return;
 		}
 
@@ -222,7 +220,7 @@ void DreamGenContext::doSomeTalk() {
 	}
 }
 
-void DreamGenContext::hangOnPQ() {
+bool DreamGenContext::hangOnPQ() {
 	data.byte(kGetback) = 0;
 
 	RectWithCallback<DreamBase> quitList[] = {
@@ -248,8 +246,7 @@ void DreamGenContext::hangOnPQ() {
 			delPointer();
 			data.byte(kPointermode) = 0;
 			cancelCh1();
-			flags._c = true;
-			return;
+			return true;
 		}
 
 		if (data.byte(kSpeechloaded) == 1 && data.byte(kCh1playing) == 255) {
@@ -261,7 +258,7 @@ void DreamGenContext::hangOnPQ() {
 
 	delPointer();
 	data.byte(kPointermode) = 0;
-	flags._c = false;
+	return false;
 }
 
 void DreamGenContext::redes() {
-- 
cgit v1.2.3


From fb068a1dbc4471b22ccc088816343e92bd1a94b4 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 25 Dec 2011 12:41:37 +0100
Subject: DREAMWEB: Simplify order of checkObjectSize checks

---
 engines/dreamweb/object.cpp | 47 ++++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 30 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 7e1ba1c2a3..4addfc404e 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -771,39 +771,26 @@ bool DreamGenContext::checkObjectSizeCPP() {
 	// to 6. This could be a bad idea, according to the original source.
 	byte objectSize = (object->objectSize != 255) ? object->objectSize : 6;
 
-	if (objectSize >= 100) {
-		// Special case
-		if (containerSize >= 100) {
-			// Both objects are special
-			if (containerSize == objectSize) {
-				return true;
-			} else {
-				errorMessage3();
-				return false;
-			}
-		} else {
-			if (containerSize >= (byte)(objectSize - 100)) {
-				return true;
-			} else {
-				errorMessage2();
-				return false;
-			}
-		}
-	} else if (containerSize >= 100) {	// The current object isn't special, but the container object is
+	if (containerSize >= 100) {
+		// Special type of container: only objects of the same special type fit.
+		if (containerSize == objectSize)
+			return true;
+
 		errorMessage3();
 		return false;
-	} else if (containerSize >= objectSize) {
-		return true;
-	} else {
-		// The original continues here to the special case above. It checks if
-		// cl (containerSize) < al (objectSize) and continues if this is so.
-		// However, in this case, the code subtracts 100 from objectSize, which
-		// was between 0 - 99, so it now is between 156 and 255. containerSize is
-		// smaller than 100, so comparing it with objectSize will always be true,
-		// thus this bit of code always falls through to the errorMessage2() case.
-		errorMessage2();
-		return false;
 	}
+
+	if (objectSize >= 100) {
+		// Special type of object, but a regular container.
+		// Subtract 100 from the size to get its regular size.
+		objectSize -= 100;
+	}
+
+	if (containerSize >= objectSize)
+		return true;
+
+	errorMessage2();
+	return false;
 }
 
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 85e54574023fde58933da06a5192793597de1ec0 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 25 Dec 2011 12:54:12 +0100
Subject: DREAMWEB: Move talk functions to DreamBase

---
 engines/dreamweb/dreambase.h |  6 ++++++
 engines/dreamweb/stubs.h     |  4 ----
 engines/dreamweb/talk.cpp    | 15 +++++++--------
 3 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 0123943c35..be88295631 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -539,6 +539,12 @@ public:
 	void entryAnims();
 	bool finishedWalking();
 
+	// from talk.cpp
+	void convIcons();
+	uint16 getPersFrame(uint8 index);
+	const uint8 *getPersonText(uint8 index);
+	void startTalk();
+
 	// from use.cpp
 	void placeFreeObject(uint8 index);
 	void removeFreeObject(uint8 index);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index bf5f5c54df..52798f556f 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -96,10 +96,6 @@
 		DreamBase::hangOn(frameCount);
 	}
 	void showCity();
-	uint16 getPersFrame(uint8 index);
-	void convIcons();
-	void startTalk();
-	void getPersonText(uint8 index);
 	void doSomeTalk();
 	void examineOb(bool examineAgain = true);
 	void dumpWatch();
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index f13f40e229..e364d63e36 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -73,22 +73,21 @@ void DreamGenContext::talk() {
 	}
 }
 
-void DreamGenContext::convIcons() {
+void DreamBase::convIcons() {
 	uint8 index = data.byte(kCharacter) & 127;
 	uint16 frame = getPersFrame(index);
 	const Frame *base = findSource(frame);
 	showFrame(base, 234, 2, frame, 0);
 }
 
-uint16 DreamGenContext::getPersFrame(uint8 index) {
+uint16 DreamBase::getPersFrame(uint8 index) {
 	return getSegment(data.word(kPeople)).word(kPersonframes + index * 2);
 }
 
-void DreamGenContext::startTalk() {
+void DreamBase::startTalk() {
 	data.byte(kTalkmode) = 0;
 
-	getPersonText(data.byte(kCharacter) & 0x7F);
-	const uint8 *str = es.ptr(si, 0);
+	const uint8 *str = getPersonText(data.byte(kCharacter) & 0x7F);
 	uint16 y;
 
 	data.word(kCharshift) = 91+91;
@@ -108,9 +107,9 @@ void DreamGenContext::startTalk() {
 	}
 }
 
-void DreamGenContext::getPersonText(uint8 index) {
-	es = data.word(kPeople);
-	si = es.word((index * 64 * 2) + kPersontxtdat) + kPersontext;
+const uint8 *DreamBase::getPersonText(uint8 index) {
+	uint16 offset = kPersontext + getSegment(data.word(kPeople)).word((index * 64 * 2) + kPersontxtdat);
+	return getSegment(data.word(kPeople)).ptr(offset, 0);
 }
 
 void DreamGenContext::moreTalk() {
-- 
cgit v1.2.3


From 5e976490c75ad9fdf11bff8f07dc1985eb56b15e Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 25 Dec 2011 13:02:56 +0100
Subject: DREAMWEB: Move remaining talk functions to DreamBase

---
 engines/dreamweb/dreambase.h |  7 +++++-
 engines/dreamweb/stubs.h     |  5 ----
 engines/dreamweb/talk.cpp    | 56 +++++++++++++-------------------------------
 3 files changed, 22 insertions(+), 46 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index be88295631..3b53353915 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -540,10 +540,15 @@ public:
 	bool finishedWalking();
 
 	// from talk.cpp
+	void talk();
 	void convIcons();
 	uint16 getPersFrame(uint8 index);
-	const uint8 *getPersonText(uint8 index);
+	const uint8 *getPersonText(uint8 index, uint8 talkPos);
 	void startTalk();
+	void moreTalk();
+	void doSomeTalk();
+	bool hangOnPQ();
+	void redes();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 52798f556f..0f473c8751 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -96,7 +96,6 @@
 		DreamBase::hangOn(frameCount);
 	}
 	void showCity();
-	void doSomeTalk();
 	void examineOb(bool examineAgain = true);
 	void dumpWatch();
 	void transferText();
@@ -157,8 +156,6 @@
 	void nextDest();
 	void lastDest();
 	void destSelect();
-	void moreTalk();
-	void redes();
 	void selectLocation();
 	void loadSpeech();
 	bool loadSpeech(byte type1, int idx1, byte type2, int idx2) {
@@ -168,8 +165,6 @@
 	void afterNewRoom();
 	void madmanRun();
 	void decide();
-	void talk();
-	bool hangOnPQ();
 	void showGun();
 	void endGame();
 	void newPlace();
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index e364d63e36..131e164cf6 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -24,7 +24,7 @@
 
 namespace DreamGen {
 
-void DreamGenContext::talk() {
+void DreamBase::talk() {
 	data.byte(kTalkpos) = 0;
 	data.byte(kInmaparea) = 0;
 	data.byte(kCharacter) = data.byte(kCommand);
@@ -42,7 +42,7 @@ void DreamGenContext::talk() {
 
 	RectWithCallback<DreamGenContext> talkList[] = {
 		{ 273,320,157,198,&DreamBase::getBack1 },
-		{ 240,290,2,44,&DreamGenContext::moreTalk },
+		{ 240,290,2,44,&DreamBase::moreTalk },
 		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
@@ -87,7 +87,7 @@ uint16 DreamBase::getPersFrame(uint8 index) {
 void DreamBase::startTalk() {
 	data.byte(kTalkmode) = 0;
 
-	const uint8 *str = getPersonText(data.byte(kCharacter) & 0x7F);
+	const uint8 *str = getPersonText(data.byte(kCharacter) & 0x7F, 0);
 	uint16 y;
 
 	data.word(kCharshift) = 91+91;
@@ -107,12 +107,12 @@ void DreamBase::startTalk() {
 	}
 }
 
-const uint8 *DreamBase::getPersonText(uint8 index) {
-	uint16 offset = kPersontext + getSegment(data.word(kPeople)).word((index * 64 * 2) + kPersontxtdat);
+const uint8 *DreamBase::getPersonText(uint8 index, uint8 talkPos) {
+	uint16 offset = kPersontext + getSegment(data.word(kPeople)).word(((index * 64 + talkPos) * 2) + kPersontxtdat);
 	return getSegment(data.word(kPeople)).ptr(offset, 0);
 }
 
-void DreamGenContext::moreTalk() {
+void DreamBase::moreTalk() {
 	if (data.byte(kTalkmode) != 0) {
 		redes();
 		return;
@@ -137,33 +137,23 @@ void DreamGenContext::moreTalk() {
 	doSomeTalk();
 }
 
-void DreamGenContext::doSomeTalk() {
+void DreamBase::doSomeTalk() {
 	while (true) {
-		es = data.word(kPeople);
-		si = ((data.byte(kTalkpos) + (64 * (data.byte(kCharacter) & 0x7F))) * 2) + kPersontxtdat;
-		si = es.word(si) + kPersontext;
+		const uint8 *str = getPersonText(data.byte(kCharacter) & 0x7F, data.byte(kTalkpos));
 
-		if (es.byte(si) == 0) {
+		if (*str == 0) {
 			// endheartalk
 			data.byte(kPointermode) = 0;
 			return;
 		}
 
-		push(es);
-		push(si);
-
 		createPanel();
 		showPanel();
 		showMan();
 		showExit();
 		convIcons();
 
-		si = pop();
-		es = pop();
-
-		const uint8 *str = es.ptr(si, 0);
-		uint16 y = 64;
-		printDirect(&str, 164, &y, 144, false);
+		printDirect(str, 164, 64, 144, false);
 
 		loadSpeech('R', data.byte(kReallocation), 'C', (64 * (data.byte(kCharacter) & 0x7F)) + data.byte(kTalkpos));
 		if (data.byte(kSpeechloaded) != 0)
@@ -171,38 +161,25 @@ void DreamGenContext::doSomeTalk() {
 
 		data.byte(kPointermode) = 3;
 		workToScreenM();
-		cx = 180;
 		if (hangOnPQ())
 			return;
 
 		data.byte(kTalkpos)++;
 
-		es = data.word(kPeople);	
-		si = kPersontxtdat + (((64 * (data.byte(kCharacter) & 0x7F)) + data.byte(kTalkpos)) * 2);
-		si = es.word(si) + kPersontext;
-
-		if (es.byte(si) == 0) {
+		str = getPersonText(data.byte(kCharacter) & 0x7F, data.byte(kTalkpos));
+		if (*str == 0) {
 			// endheartalk
 			data.byte(kPointermode) = 0;
 			return;
 		}
 
-		if (es.byte(si) != ':' && es.byte(si) != 32) {
-			push(es);
-			push(si);
-
+		if (*str != ':' && *str != 32) {
 			createPanel();
 			showPanel();
 			showMan();
 			showExit();
 			convIcons();
-
-			si = pop();
-			es = pop();
-
-			str = es.ptr(si, 0);
-			y = 128;
-			printDirect(&str, 48, &y, 144, false);
+			printDirect(str, 48, 128, 144, false);
 
 			loadSpeech('R', data.byte(kReallocation), 'C', (64 * (data.byte(kCharacter) & 0x7F)) + data.byte(kTalkpos));
 			if (data.byte(kSpeechloaded) != 0)
@@ -210,7 +187,6 @@ void DreamGenContext::doSomeTalk() {
 
 			data.byte(kPointermode) = 3;
 			workToScreenM();
-			cx = 180;
 			if (hangOnPQ())
 				return;
 		}
@@ -219,7 +195,7 @@ void DreamGenContext::doSomeTalk() {
 	}
 }
 
-bool DreamGenContext::hangOnPQ() {
+bool DreamBase::hangOnPQ() {
 	data.byte(kGetback) = 0;
 
 	RectWithCallback<DreamBase> quitList[] = {
@@ -260,7 +236,7 @@ bool DreamGenContext::hangOnPQ() {
 	return false;
 }
 
-void DreamGenContext::redes() {
+void DreamBase::redes() {
 	if (data.byte(kCh1playing) != 255 || data.byte(kTalkmode) != 2) {
 		blank();
 		return;
-- 
cgit v1.2.3


From e412078319c11206617c8d86d9b6f166b4526287 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 14:13:48 +0200
Subject: DREAMWEB: Name the return values of getAnyAd

---
 engines/dreamweb/dreambase.h |  2 +-
 engines/dreamweb/stubs.cpp   | 14 +++++++-------
 engines/dreamweb/stubs.h     |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 3b53353915..2a61331290 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -403,7 +403,7 @@ public:
 	void showMan();
 	void panelIcons1();
 	SetObject *getSetAd(uint8 index);
-	void *getAnyAd(uint8 *value1, uint8 *value2);
+	void *getAnyAd(uint8 *slotSize, uint8 *slotCount);
 	const uint8 *getTextInFile1(uint16 index);
 	uint8 findNextColon(const uint8 **string);
 	void allocateBuffers();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 2120668ef6..2ad4af89b9 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1309,16 +1309,16 @@ DynObject *DreamBase::getEitherAdCPP() {
 		return getFreeAd(data.byte(kItemframe));
 }
 
-void *DreamBase::getAnyAd(uint8 *value1, uint8 *value2) {
+void *DreamBase::getAnyAd(uint8 *slotSize, uint8 *slotCount) {
 	if (data.byte(kObjecttype) == kExObjectType) {
 		DynObject *exObject = getExAd(data.byte(kCommand));
-		*value1 = exObject->slotSize;
-		*value2 = exObject->slotCount;
+		*slotSize = exObject->slotSize;
+		*slotCount = exObject->slotCount;
 		return exObject;
 	} else if (data.byte(kObjecttype) == kFreeObjectType) {
 		DynObject *freeObject = getFreeAd(data.byte(kCommand));
-		*value1 = freeObject->slotSize;
-		*value2 = freeObject->slotCount;
+		*slotSize = freeObject->slotSize;
+		*slotCount = freeObject->slotCount;
 		return freeObject;
 	} else {	// 1 or 3. 0 should never happen
 		SetObject *setObject = getSetAd(data.byte(kCommand));
@@ -1326,8 +1326,8 @@ void *DreamBase::getAnyAd(uint8 *value1, uint8 *value2) {
 		// instead of slotSize/slotCount (bytes 3 and 4).
 		// Changed this for consistency with the Ex/Free cases, and also
 		// with getOpenedSize()
-		*value1 = setObject->slotSize;
-		*value2 = setObject->slotCount;
+		*slotSize = setObject->slotSize;
+		*slotCount = setObject->slotCount;
 		return setObject;
 	}
 }
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 0f473c8751..ed0afa4ea9 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -71,8 +71,8 @@
 	DynObject *getExAd(uint8 index) {
 		return DreamBase::getExAd(index);
 	}
-	void *getAnyAd(uint8 *value1, uint8 *value2) {
-		return DreamBase::getAnyAd(value1, value2);
+	void *getAnyAd(uint8 *slotSize, uint8 *slotCount) {
+		return DreamBase::getAnyAd(slotSize, slotCount);
 	}
 	SetObject *getSetAd(uint8 index) {
 		return DreamBase::getSetAd(index);
-- 
cgit v1.2.3


From 3ac88c16ea63243a46444e5754a94e41302f2d64 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 14:30:00 +0200
Subject: DREAMWEB: Port 'selectopenob' to C++

---
 engines/dreamweb/dreamgen.cpp | 46 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/object.cpp   | 33 +++++++++++++++++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 34 insertions(+), 47 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 8cd5dd43df..bca2232267 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -537,52 +537,6 @@ findopenp1:
 	_add(bx, (0+(228*13)));
 }
 
-void DreamGenContext::selectOpenOb() {
-	STACK_CHECK;
-	al = data.byte(kCommand);
-	getAnyAd();
-	_cmp(al, 255);
-	if (!flags.z())
-		goto canopenit1;
-	blank();
-	return;
-canopenit1:
-	_cmp(data.byte(kCommandtype), 224);
-	if (flags.z())
-		goto alreadyopob;
-	data.byte(kCommandtype) = 224;
-	bl = data.byte(kCommand);
-	bh = data.byte(kObjecttype);
-	al = 38;
-	commandWithOb();
-alreadyopob:
-	ax = data.word(kMousebutton);
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (noopenob) */;
-	_and(ax, 1);
-	if (!flags.z())
-		goto doopenob;
-	return;
-doopenob:
-	al = data.byte(kCommand);
-	data.byte(kOpenedob) = al;
-	al = data.byte(kObjecttype);
-	data.byte(kOpenedtype) = al;
-	createPanel();
-	showPanel();
-	showMan();
-	examIcon();
-	showExit();
-	openInv();
-	openOb();
-	underTextLine();
-	readMouse();
-	showPointer();
-	workToScreen();
-	delPointer();
-}
-
 void DreamGenContext::useOpened() {
 	STACK_CHECK;
 	_cmp(data.byte(kOpenedob), 255);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 52009dc5ed..db9a8c2eeb 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -478,7 +478,6 @@ public:
 	void getDestInfo();
 	void read();
 	void searchForString();
-	void selectOpenOb();
 	void searchForFiles();
 	void getExAd();
 	void swapWithInv();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 4addfc404e..dff58050a5 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -793,4 +793,37 @@ bool DreamGenContext::checkObjectSizeCPP() {
 	return false;
 }
 
+void DreamGenContext::selectOpenOb() {
+	uint8 slotSize, slotCount;
+	getAnyAd(&slotSize, &slotCount);
+	if (slotCount == 255) {
+		// Can't open the object
+		blank();
+		return;
+	}
+
+	if (data.byte(kCommandtype) != 224) {
+		data.byte(kCommandtype) = 224;
+		commandWithOb(38, data.byte(kObjecttype), data.byte(kCommand));
+	}
+
+	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+		return;
+
+	data.byte(kOpenedob) = data.byte(kCommand);
+	data.byte(kOpenedtype) = data.byte(kObjecttype);
+	createPanel();
+	showPanel();
+	showMan();
+	examIcon();
+	showExit();
+	openInv();
+	openOb();
+	underTextLine();
+	readMouse();
+	showPointer();
+	workToScreenCPP();
+	delPointer();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index ed0afa4ea9..547714e006 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -197,5 +197,6 @@
 	void lookAtPlace();
 	void inToInv();
 	void outOfInv();
+	void selectOpenOb();
 
 #endif
-- 
cgit v1.2.3


From 3802b21183b148f1c8d43cc8d2e550afed6e9e6a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 15:07:56 +0200
Subject: DREAMWEB: Move some functions to DreamBase

---
 engines/dreamweb/dreambase.h  |  5 +++++
 engines/dreamweb/newplace.cpp |  7 ++++---
 engines/dreamweb/structs.h    |  2 +-
 engines/dreamweb/stubs.h      |  7 +------
 engines/dreamweb/use.cpp      | 41 ++++++++++++++++++++++-------------------
 5 files changed, 33 insertions(+), 29 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 2a61331290..9e45e046f4 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -178,6 +178,9 @@ public:
 	uint8 getLocation(uint8 index);
 	void setLocation(uint8 index);
 	void resetLocation(uint8 index);
+	void readCityPic();
+	void readDestIcon();
+	void showCity();
 
 	// from object.cpp
 	void obIcons();
@@ -636,6 +639,8 @@ public:
 	void wearWatch();
 	void wearShades();
 	void useTrainer();
+	void useStereo();
+	void chewy();
 
 	// from vgafades.cpp
 	void clearStartPal();
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index f1743f0e6d..69e452865e 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -34,6 +34,7 @@ void DreamGenContext::newPlace() {
 	}
 }
 
+// TODO: Move to DreamBase once locationPic is moved
 void DreamGenContext::selectLocation() {
 	data.byte(kInmaparea) = 0;
 	clearBeforeLoad();
@@ -95,7 +96,7 @@ void DreamGenContext::selectLocation() {
 	deallocateMem(data.word(kTraveltext));
 }
 
-void DreamGenContext::showCity() {
+void DreamBase::showCity() {
 	clearWork();
 	showFrame(tempGraphics(), 57, 32, 0, 0);
 	showFrame(tempGraphics(), 120+57, 32, 1, 0);
@@ -259,13 +260,13 @@ void DreamBase::resetLocation(uint8 index) {
 	data.byte(kRoomscango + index) = 0;
 }
 
-void DreamGenContext::readDestIcon() {
+void DreamBase::readDestIcon() {
 	loadIntoTemp("DREAMWEB.G05");
 	loadIntoTemp2("DREAMWEB.G06");
 	loadIntoTemp3("DREAMWEB.G08");
 }
 
-void DreamGenContext::readCityPic() {
+void DreamBase::readCityPic() {
 	loadIntoTemp("DREAMWEB.G04");
 }
 
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 5d93d1d99f..d64bcab5d0 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -123,7 +123,7 @@ struct DynObject {
 	uint8 slotSize;		// the size of an object's slots
 	uint8 slotCount;	// the number of slots of an object
 	uint8 objectSize;	// the size of an object
-	uint8 b10;
+	uint8 turnedOn;
 	uint8 initialLocation;
 	uint8 id[4];
 };
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 547714e006..0c764a4495 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -39,8 +39,6 @@
 	}
 	void quickQuit();
 	void readOneBlock();
-	void readCityPic();
-	void readDestIcon();
 	void seeCommandTail();
 	void quickQuit2();
 	void printDirect();
@@ -95,7 +93,6 @@
 	void hangOn(uint16 frameCount) {
 		DreamBase::hangOn(frameCount);
 	}
-	void showCity();
 	void examineOb(bool examineAgain = true);
 	void dumpWatch();
 	void transferText();
@@ -148,7 +145,6 @@
 	void afterIntroRoom();
 	void gettingShot();
 	void allPointer();
-	void chewy();
 	void delEverything();
 	void errorMessage1();
 	void errorMessage2();
@@ -156,7 +152,6 @@
 	void nextDest();
 	void lastDest();
 	void destSelect();
-	void selectLocation();
 	void loadSpeech();
 	bool loadSpeech(byte type1, int idx1, byte type2, int idx2) {
 		return DreamBase::loadSpeech(type1, idx1, type2, idx2);
@@ -183,7 +178,6 @@
 	bool checkObjectSizeCPP();
 	void openOb();
 	void identifyOb();
-	void useStereo();
 	void selectOb();
 	void findInvPos();
 	uint16 findInvPosCPP();
@@ -198,5 +192,6 @@
 	void inToInv();
 	void outOfInv();
 	void selectOpenOb();
+	void selectLocation();
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 47c9ae62b8..eeda27780c 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -45,7 +45,7 @@ void DreamGenContext::useRoutine() {
 		{ &DreamBase::useElevator4,            "ELVE" },
 		{ &DreamBase::useElevator5,            "ELVF" },
 		{ &DreamBase::useChurchGate,           "CGAT" },
-		{ &DreamGenContext::useStereo,         "REMO" },
+		{ &DreamBase::useStereo,               "REMO" },
 		{ &DreamBase::useButtonA,              "BUTA" },
 		{ &DreamBase::useWinch,                "CBOX" },
 		{ &DreamBase::useLighter,              "LITE" },
@@ -113,7 +113,7 @@ void DreamGenContext::useRoutine() {
 		{ &DreamBase::usePlinth,               "PLIN" },
 		{ &DreamBase::useLadder,               "LADD" },
 		{ &DreamBase::useLadderB,              "LADB" },
-		{ &DreamGenContext::chewy,             "GUMA" },
+		{ &DreamBase::chewy,                   "GUMA" },
 		{ &DreamBase::wheelSound,              "SQEE" },
 		{ &DreamBase::runTap,                  "TAPP" },
 		{ &DreamBase::playGuitar,              "GUIT" },
@@ -242,6 +242,7 @@ void DreamBase::playGuitar() {
 	putBackObStuff();
 }
 
+// TODO: Move to DreamBase once selectLocation (in reality, locationPic) is moved
 void DreamGenContext::useElevator1() {
 	showFirstUse();
 	selectLocation();
@@ -1040,11 +1041,12 @@ void DreamBase::useTrainer() {
 	}
 }
 
-void DreamGenContext::chewy() {
+void DreamBase::chewy() {
+	// Chewing a gum
 	showFirstUse();
-	// TODO: Use the C++ version of getAnyAd()
-	getAnyAd();
-	es.byte(bx + 2) = 255;
+	uint8 dummy;
+	DynObject *object = (DynObject *)getAnyAd(&dummy, &dummy);
+	object->mapad[0] = 255;
 	data.byte(kGetback) = 1;
 }
 
@@ -1631,7 +1633,10 @@ void DreamBase::useCashCard() {
 	putBackObStuff();
 }
 
-void DreamGenContext::useStereo() {
+void DreamBase::useStereo() {
+	// Handles the stereo in Ryan's apartment (accessible from the remote on
+	// the couch)
+
 	if (data.byte(kLocation) != 0) {
 		showPuzText(4, 400);
 		putBackObStuff();
@@ -1642,20 +1647,18 @@ void DreamGenContext::useStereo() {
 		// No CD inside
 		showPuzText(6, 400);
 		putBackObStuff();
-		// TODO: Use the C++ version of getAnyAd()
-		getAnyAd();
-		es.byte(bx + 10) = 255;
+		uint8 dummy;
+		DynObject *object = (DynObject *)getAnyAd(&dummy, &dummy);
+		object->turnedOn = 255;
 	} else {
 		// CD inside
-		getAnyAd();
-		es.byte(bx + 10) ^= 1;
-		if (es.byte(bx + 10) != 255) {
-			// Stereo off
-			showPuzText(7, 400);
-		} else {
-			// Stereo on
-			showPuzText(8, 400);
-		}
+		uint8 dummy;
+		DynObject *object = (DynObject *)getAnyAd(&dummy, &dummy);
+		object->turnedOn ^= 1;
+		if (object->turnedOn != 255)
+			showPuzText(7, 400);	// Stereo off
+		else
+			showPuzText(8, 400);	// Stereo on
 
 		putBackObStuff();
 	}
-- 
cgit v1.2.3


From e322d6257dae83761c86c9d5bfbc7d02c0a9988d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 16:33:30 +0200
Subject: DREAMWEB: Port 'locationpic', 'reexfrominv' to C++

---
 engines/dreamweb/dreamgen.cpp | 58 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  2 --
 engines/dreamweb/newplace.cpp | 16 +++++++++++-
 engines/dreamweb/object.cpp   |  8 ++++++
 engines/dreamweb/stubs.cpp    |  1 +
 engines/dreamweb/stubs.h      |  2 ++
 engines/dreamweb/use.cpp      |  2 +-
 7 files changed, 27 insertions(+), 62 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index bca2232267..55ab3755af 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -284,16 +284,6 @@ findopen2a:
 		goto findopen1a;
 }
 
-void DreamGenContext::reExFromInv() {
-	STACK_CHECK;
-	findInvPos();
-	ax = es.word(bx);
-	data.byte(kCommandtype) = ah;
-	data.byte(kCommand) = al;
-	data.byte(kExamagain) = 1;
-	data.byte(kPointermode) = 0;
-}
-
 void DreamGenContext::swapWithInv() {
 	STACK_CHECK;
 	al = data.byte(kItemframe);
@@ -881,54 +871,6 @@ cantpurge2:
 		goto lookforpurge2;
 }
 
-void DreamGenContext::locationPic() {
-	STACK_CHECK;
-	getDestInfo();
-	al = es.byte(si);
-	push(es);
-	push(si);
-	di = 0;
-	_cmp(al, 6);
-	if (!flags.c())
-		goto secondlot;
-	ds = data.word(kTempgraphics);
-	_add(al, 4);
-	goto gotgraphic;
-secondlot:
-	_sub(al, 6);
-	ds = data.word(kTempgraphics2);
-gotgraphic:
-	_add(di, 104);
-	bx = 138+14;
-	ah = 0;
-	showFrame();
-	si = pop();
-	es = pop();
-	al = data.byte(kDestpos);
-	_cmp(al, data.byte(kReallocation));
-	if (!flags.z())
-		goto notinthisone;
-	al = 3;
-	di = 104;
-	bx = 140+14;
-	ds = data.word(kTempgraphics);
-	ah = 0;
-	showFrame();
-notinthisone:
-	bl = data.byte(kDestpos);
-	bh = 0;
-	_add(bx, bx);
-	es = data.word(kTraveltext);
-	si = es.word(bx);
-	_add(si, (66*2));
-	di = 50;
-	bx = 20;
-	dl = 241;
-	al = 0;
-	ah = 0;
-	printDirect();
-}
-
 void DreamGenContext::getDestInfo() {
 	STACK_CHECK;
 	al = data.byte(kDestpos);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index db9a8c2eeb..ffefa0dd3e 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -461,7 +461,6 @@ public:
 	void getFreeAd();
 	void dirFile();
 	void pickupConts();
-	void reExFromInv();
 	void transferMap();
 	void purgeAnItem();
 	void getSetAd();
@@ -471,7 +470,6 @@ public:
 	void fillOpen();
 	void getEitherAd();
 	void useOpened();
-	void locationPic();
 	void swapWithOpen();
 	void dreamweb();
 	void findPathOfPoint();
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 69e452865e..027d7c1937 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -34,7 +34,7 @@ void DreamGenContext::newPlace() {
 	}
 }
 
-// TODO: Move to DreamBase once locationPic is moved
+// TODO: Move to DreamBase once getDestInfo is moved
 void DreamGenContext::selectLocation() {
 	data.byte(kInmaparea) = 0;
 	clearBeforeLoad();
@@ -270,6 +270,20 @@ void DreamBase::readCityPic() {
 	loadIntoTemp("DREAMWEB.G04");
 }
 
+void DreamGenContext::locationPic() {
+	getDestInfo();
+	byte destFlag = es.byte(si);
+	if (destFlag >= 6)
+		showFrame(tempGraphics2(), 104, 138 + 14, destFlag - 6, 0);	// Second slot
+	else
+		showFrame(tempGraphics(),  104, 138 + 14, destFlag + 4, 0);
+
+	if (data.byte(kDestpos) == data.byte(kReallocation))
+		showFrame(tempGraphics(), 104, 140 + 14, 3, 0);	// Currently in this location
 
+	uint16 offset = kTextstart + getSegment(data.word(kTraveltext)).word(data.byte(kDestpos) * 2);
+	const uint8 *string = getSegment(data.word(kTraveltext)).ptr(offset, 0);
+	DreamBase::printDirect(string, 50, 20, 241, 241 & 1);
+}
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index dff58050a5..9d81825964 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -826,4 +826,12 @@ void DreamGenContext::selectOpenOb() {
 	delPointer();
 }
 
+void DreamGenContext::reExFromInv() {
+	uint16 objectId = getSegment(data.word(kBuffers)).word(findInvPosCPP());
+	data.byte(kCommandtype) = objectId >> 8;
+	data.byte(kCommand)     = objectId & 0x00FF;
+	data.byte(kExamagain) = 1;
+	data.byte(kPointermode) = 0;
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 2ad4af89b9..3a0ca79a1d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3700,4 +3700,5 @@ void DreamBase::incRyanPage() {
 	delPointer();
 
 }
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 0c764a4495..a4fcbf761d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -193,5 +193,7 @@
 	void outOfInv();
 	void selectOpenOb();
 	void selectLocation();
+	void reExFromInv();
+	void locationPic();
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index eeda27780c..41b338e885 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -242,7 +242,7 @@ void DreamBase::playGuitar() {
 	putBackObStuff();
 }
 
-// TODO: Move to DreamBase once selectLocation (in reality, locationPic) is moved
+// TODO: Move to DreamBase once selectLocation (in reality, getDestInfo) is moved
 void DreamGenContext::useElevator1() {
 	showFirstUse();
 	selectLocation();
-- 
cgit v1.2.3


From 0fff97b4b023895256cb8cce9b30684d433bfae4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 17:10:49 +0200
Subject: DREAMWEB: Port 'useopened' to C++

---
 engines/dreamweb/dreamgen.cpp | 94 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/object.cpp   | 68 +++++++++++++++++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 69 insertions(+), 95 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 55ab3755af..4d89322a77 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -527,100 +527,6 @@ findopenp1:
 	_add(bx, (0+(228*13)));
 }
 
-void DreamGenContext::useOpened() {
-	STACK_CHECK;
-	_cmp(data.byte(kOpenedob), 255);
-	if (flags.z())
-		return /* (cannotuseopen) */;
-	_cmp(data.byte(kPickup), 0);
-	if (!flags.z())
-		goto notout2;
-	outOfOpen();
-	return;
-notout2:
-	findOpenPos();
-	ax = es.word(bx);
-	_cmp(al, 255);
-	if (flags.z())
-		goto canplace3;
-	swapWithOpen();
-	return;
-canplace3:
-	_cmp(data.byte(kPickup), 1);
-	if (flags.z())
-		goto intoopen;
-	blank();
-	return;
-intoopen:
-	al = data.byte(kItemframe);
-	ah = data.byte(kObjecttype);
-	_cmp(ax, data.word(kOldsubject));
-	if (!flags.z())
-		goto difsub2;
-	_cmp(data.byte(kCommandtype), 227);
-	if (flags.z())
-		goto alreadyplc2;
-	data.byte(kCommandtype) = 227;
-difsub2:
-	data.word(kOldsubject) = ax;
-	bx = ax;
-	al = 35;
-	commandWithOb();
-alreadyplc2:
-	ax = data.word(kMousebutton);
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (notletgo3) */;
-	_cmp(ax, 1);
-	if (flags.z())
-		goto doplace2;
-	return;
-doplace2:
-	getEitherAd();
-	isItWorn();
-	if (!flags.z())
-		goto notworntoopen;
-	wornError();
-	return;
-notworntoopen:
-	delPointer();
-	al = data.byte(kItemframe);
-	_cmp(al, data.byte(kOpenedob));
-	if (!flags.z())
-		goto isntsame;
-	al = data.byte(kObjecttype);
-	_cmp(al, data.byte(kOpenedtype));
-	if (!flags.z())
-		goto isntsame;
-	errorMessage1();
-	return;
-isntsame:
-	checkObjectSize();
-	_cmp(al, 0);
-	if (flags.z())
-		goto sizeok1;
-	return;
-sizeok1:
-	data.byte(kPickup) = 0;
-	al = data.byte(kItemframe);
-	getEitherAd();
-	al = data.byte(kOpenedtype);
-	es.byte(bx+2) = al;
-	al = data.byte(kOpenedob);
-	es.byte(bx+3) = al;
-	al = data.byte(kLastinvpos);
-	es.byte(bx+4) = al;
-	al = data.byte(kReallocation);
-	es.byte(bx+5) = al;
-	fillOpen();
-	underTextLine();
-	readMouse();
-	useOpened();
-	showPointer();
-	workToScreen();
-	delPointer();
-}
-
 void DreamGenContext::outOfOpen() {
 	STACK_CHECK;
 	_cmp(data.byte(kOpenedob), 255);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index ffefa0dd3e..3ddf858053 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -469,7 +469,6 @@ public:
 	void findAllOpen();
 	void fillOpen();
 	void getEitherAd();
-	void useOpened();
 	void swapWithOpen();
 	void dreamweb();
 	void findPathOfPoint();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 9d81825964..8399c6f26a 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -834,4 +834,72 @@ void DreamGenContext::reExFromInv() {
 	data.byte(kPointermode) = 0;
 }
 
+void DreamGenContext::useOpened() {
+	if (data.byte(kOpenedob) == 255)
+		return;	// cannot use opened object
+
+	if (!data.byte(kPickup)) {
+		outOfOpen();
+		return;
+	}
+
+	findOpenPos();
+	ax = es.word(bx);
+
+	if (al != 255) {
+		swapWithOpen();
+		return;
+	}
+
+	if (data.byte(kPickup) != 1) {
+		blank();
+		return;
+	}
+
+	uint16 subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
+	if (subject == data.word(kOldsubject)) {
+		if (data.byte(kCommandtype) != 227) {
+			data.byte(kCommandtype) = 227;
+			data.word(kOldsubject) = subject;
+			commandWithOb(35, data.byte(kObjecttype), data.byte(kItemframe));
+		}
+	} else {
+		data.word(kOldsubject) = subject;
+		commandWithOb(35, data.byte(kObjecttype), data.byte(kItemframe));
+	}
+
+	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+		return;
+
+	if (isItWorn(getEitherAdCPP())) {
+		wornError();
+		return;
+	}
+
+	delPointer();
+
+	if (data.byte(kItemframe) == data.byte(kOpenedob) &&
+		data.byte(kObjecttype) == data.byte(kOpenedtype)) {
+		errorMessage1();
+		return;
+	}
+
+	if (!checkObjectSizeCPP())
+		return;
+
+	data.byte(kPickup) = 0;
+	DynObject *object = getEitherAdCPP();
+	object->mapad[0] = data.byte(kOpenedtype);
+	object->mapad[1] = data.byte(kOpenedob);
+	object->mapad[2] = data.byte(kLastinvpos);
+	object->mapad[3] = data.byte(kReallocation);
+	fillOpen();
+	underTextLine();
+	readMouse();
+	useOpened();
+	showPointer();
+	workToScreenCPP();
+	delPointer();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index a4fcbf761d..4ba8cd6dd9 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -195,5 +195,6 @@
 	void selectLocation();
 	void reExFromInv();
 	void locationPic();
+	void useOpened();
 
 #endif
-- 
cgit v1.2.3


From c531c4c1eafbf66a3724df0f3cb7b9ad8da97a8d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 17:32:56 +0200
Subject: DREAMWEB: Port 'swapwithinv' to C++

---
 engines/dreamweb/dreamgen.cpp | 60 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/object.cpp   | 43 +++++++++++++++++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 44 insertions(+), 61 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 4d89322a77..1afca17560 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -284,66 +284,6 @@ findopen2a:
 		goto findopen1a;
 }
 
-void DreamGenContext::swapWithInv() {
-	STACK_CHECK;
-	al = data.byte(kItemframe);
-	ah = data.byte(kObjecttype);
-	_cmp(ax, data.word(kOldsubject));
-	if (!flags.z())
-		goto difsub7;
-	_cmp(data.byte(kCommandtype), 243);
-	if (flags.z())
-		goto alreadyswap1;
-	data.byte(kCommandtype) = 243;
-difsub7:
-	data.word(kOldsubject) = ax;
-	bx = ax;
-	al = 34;
-	commandWithOb();
-alreadyswap1:
-	ax = data.word(kMousebutton);
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (cantswap1) */;
-	_and(ax, 1);
-	if (!flags.z())
-		goto doswap1;
-	return;
-doswap1:
-	ah = data.byte(kObjecttype);
-	al = data.byte(kItemframe);
-	push(ax);
-	findInvPos();
-	ax = es.word(bx);
-	data.byte(kItemframe) = al;
-	data.byte(kObjecttype) = ah;
-	getEitherAd();
-	es.byte(bx+2) = 20;
-	es.byte(bx+3) = 255;
-	bl = data.byte(kItemframe);
-	bh = data.byte(kObjecttype);
-	ax = pop();
-	data.byte(kObjecttype) = ah;
-	data.byte(kItemframe) = al;
-	push(bx);
-	findInvPos();
-	delPointer();
-	al = data.byte(kItemframe);
-	getEitherAd();
-	es.byte(bx+2) = 4;
-	es.byte(bx+3) = 255;
-	al = data.byte(kLastinvpos);
-	es.byte(bx+4) = al;
-	ax = pop();
-	data.byte(kObjecttype) = ah;
-	data.byte(kItemframe) = al;
-	fillRyan();
-	readMouse();
-	showPointer();
-	workToScreen();
-	delPointer();
-}
-
 void DreamGenContext::swapWithOpen() {
 	STACK_CHECK;
 	al = data.byte(kItemframe);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 3ddf858053..25901250b6 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -477,7 +477,6 @@ public:
 	void searchForString();
 	void searchForFiles();
 	void getExAd();
-	void swapWithInv();
 	void transferToEx();
 	void parser();
 	void emergencyPurge();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 8399c6f26a..9eb31f438f 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -902,4 +902,47 @@ void DreamGenContext::useOpened() {
 	delPointer();
 }
 
+void DreamGenContext::swapWithInv() {
+	uint16 subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
+	if (subject == data.word(kOldsubject)) {
+		if (data.byte(kCommandtype) != 243) {
+			data.byte(kCommandtype) = 243;
+			data.word(kOldsubject) = subject;
+			commandWithOb(34, data.byte(kObjecttype), data.byte(kItemframe));
+		}
+	} else {
+		data.word(kOldsubject) = subject;
+		commandWithOb(34, data.byte(kObjecttype), data.byte(kItemframe));
+	}
+
+	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+		return;
+
+	byte prevType = data.byte(kObjecttype);
+	byte prevFrame = data.byte(kItemframe);
+	uint16 objectId = getSegment(data.word(kBuffers)).word(findInvPosCPP());
+	data.byte(kItemframe)  = objectId & 0x00FF;
+	data.byte(kObjecttype) = objectId >> 8;
+	DynObject *object = getEitherAdCPP();
+	object->mapad[0] = 20;
+	object->mapad[1] = 255;
+	byte prevType2 = data.byte(kObjecttype);
+	byte prevFrame2 = data.byte(kItemframe);
+	data.byte(kObjecttype) = prevType;
+	data.byte(kItemframe) = prevFrame;
+	//findInvPosCPP();	// found in the original source, but it seems to be useless
+	delPointer();
+	object = getEitherAdCPP();
+	object->mapad[0] = 4;
+	object->mapad[1] = 255;
+	object->mapad[2] = data.byte(kLastinvpos);
+	data.byte(kObjecttype) = prevType2;
+	data.byte(kItemframe) = prevFrame2;
+	fillRyan();
+	readMouse();
+	showPointer();
+	workToScreenCPP();
+	delPointer();
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 4ba8cd6dd9..2ac944b06a 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -196,5 +196,6 @@
 	void reExFromInv();
 	void locationPic();
 	void useOpened();
+	void swapWithInv();
 
 #endif
-- 
cgit v1.2.3


From bf4271dfc116fa6f4b4245051e2d6a391f1d850c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 17:54:22 +0200
Subject: DREAMWEB: Port 'swapwithopen' to C++

---
 engines/dreamweb/dreamgen.cpp | 102 ------------------------------------------
 engines/dreamweb/dreamgen.h   |   1 -
 engines/dreamweb/object.cpp   |  91 ++++++++++++++++++++++++++++++++-----
 engines/dreamweb/stubs.h      |   1 +
 4 files changed, 82 insertions(+), 113 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 1afca17560..d68bd3b88f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -284,108 +284,6 @@ findopen2a:
 		goto findopen1a;
 }
 
-void DreamGenContext::swapWithOpen() {
-	STACK_CHECK;
-	al = data.byte(kItemframe);
-	ah = data.byte(kObjecttype);
-	_cmp(ax, data.word(kOldsubject));
-	if (!flags.z())
-		goto difsub8;
-	_cmp(data.byte(kCommandtype), 242);
-	if (flags.z())
-		goto alreadyswap2;
-	data.byte(kCommandtype) = 242;
-difsub8:
-	data.word(kOldsubject) = ax;
-	bx = ax;
-	al = 34;
-	commandWithOb();
-alreadyswap2:
-	ax = data.word(kMousebutton);
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (cantswap2) */;
-	_and(ax, 1);
-	if (!flags.z())
-		goto doswap2;
-	return;
-doswap2:
-	getEitherAd();
-	isItWorn();
-	if (!flags.z())
-		goto notwornswap;
-	wornError();
-	return;
-notwornswap:
-	delPointer();
-	al = data.byte(kItemframe);
-	_cmp(al, data.byte(kOpenedob));
-	if (!flags.z())
-		goto isntsame2;
-	al = data.byte(kObjecttype);
-	_cmp(al, data.byte(kOpenedtype));
-	if (!flags.z())
-		goto isntsame2;
-	errorMessage1();
-	return;
-isntsame2:
-	checkObjectSize();
-	_cmp(al, 0);
-	if (flags.z())
-		goto sizeok2;
-	return;
-sizeok2:
-	ah = data.byte(kObjecttype);
-	al = data.byte(kItemframe);
-	push(ax);
-	findOpenPos();
-	ax = es.word(bx);
-	data.byte(kItemframe) = al;
-	data.byte(kObjecttype) = ah;
-	_cmp(ah, 4);
-	if (!flags.z())
-		goto makeswapex;
-	getEitherAd();
-	es.byte(bx+2) = 20;
-	es.byte(bx+3) = 255;
-	goto actuallyswap;
-makeswapex:
-	transferToEx();
-	data.byte(kItemframe) = al;
-	data.byte(kObjecttype) = 4;
-	getEitherAd();
-	es.byte(bx+2) = 20;
-	es.byte(bx+3) = 255;
-actuallyswap:
-	bl = data.byte(kItemframe);
-	bh = data.byte(kObjecttype);
-	ax = pop();
-	data.byte(kObjecttype) = ah;
-	data.byte(kItemframe) = al;
-	push(bx);
-	findOpenPos();
-	getEitherAd();
-	al = data.byte(kOpenedtype);
-	es.byte(bx+2) = al;
-	al = data.byte(kOpenedob);
-	es.byte(bx+3) = al;
-	al = data.byte(kLastinvpos);
-	es.byte(bx+4) = al;
-	al = data.byte(kReallocation);
-	es.byte(bx+5) = al;
-	ax = pop();
-	data.byte(kObjecttype) = ah;
-	data.byte(kItemframe) = al;
-	fillOpen();
-	fillRyan();
-	underTextLine();
-	readMouse();
-	useOpened();
-	showPointer();
-	workToScreen();
-	delPointer();
-}
-
 void DreamGenContext::getFreeAd() {
 	STACK_CHECK;
 	ah = 0;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 25901250b6..f585c6a7b4 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -469,7 +469,6 @@ public:
 	void findAllOpen();
 	void fillOpen();
 	void getEitherAd();
-	void swapWithOpen();
 	void dreamweb();
 	void findPathOfPoint();
 	void getDestInfo();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 9eb31f438f..6546f19da4 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -834,6 +834,49 @@ void DreamGenContext::reExFromInv() {
 	data.byte(kPointermode) = 0;
 }
 
+void DreamGenContext::swapWithInv() {
+	uint16 subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
+	if (subject == data.word(kOldsubject)) {
+		if (data.byte(kCommandtype) != 243) {
+			data.byte(kCommandtype) = 243;
+			data.word(kOldsubject) = subject;
+			commandWithOb(34, data.byte(kObjecttype), data.byte(kItemframe));
+		}
+	} else {
+		data.word(kOldsubject) = subject;
+		commandWithOb(34, data.byte(kObjecttype), data.byte(kItemframe));
+	}
+
+	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+		return;
+
+	byte prevType = data.byte(kObjecttype);
+	byte prevFrame = data.byte(kItemframe);
+	uint16 objectId = getSegment(data.word(kBuffers)).word(findInvPosCPP());
+	data.byte(kItemframe)  = objectId & 0x00FF;
+	data.byte(kObjecttype) = objectId >> 8;
+	DynObject *object = getEitherAdCPP();
+	object->mapad[0] = 20;
+	object->mapad[1] = 255;
+	byte prevType2 = data.byte(kObjecttype);
+	byte prevFrame2 = data.byte(kItemframe);
+	data.byte(kObjecttype) = prevType;
+	data.byte(kItemframe) = prevFrame;
+	//findInvPosCPP();	// found in the original source, but it seems to be useless
+	delPointer();
+	object = getEitherAdCPP();
+	object->mapad[0] = 4;
+	object->mapad[1] = 255;
+	object->mapad[2] = data.byte(kLastinvpos);
+	data.byte(kObjecttype) = prevType2;
+	data.byte(kItemframe) = prevFrame2;
+	fillRyan();
+	readMouse();
+	showPointer();
+	workToScreenCPP();
+	delPointer();
+}
+
 void DreamGenContext::useOpened() {
 	if (data.byte(kOpenedob) == 255)
 		return;	// cannot use opened object
@@ -902,11 +945,11 @@ void DreamGenContext::useOpened() {
 	delPointer();
 }
 
-void DreamGenContext::swapWithInv() {
+void DreamGenContext::swapWithOpen() {
 	uint16 subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
 	if (subject == data.word(kOldsubject)) {
-		if (data.byte(kCommandtype) != 243) {
-			data.byte(kCommandtype) = 243;
+		if (data.byte(kCommandtype) != 242) {
+			data.byte(kCommandtype) = 242;
 			data.word(kOldsubject) = subject;
 			commandWithOb(34, data.byte(kObjecttype), data.byte(kItemframe));
 		}
@@ -918,28 +961,56 @@ void DreamGenContext::swapWithInv() {
 	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
 		return;
 
+	if (isItWorn(getEitherAdCPP())) {
+		wornError();
+		return;
+	}
+
+	delPointer();
+
+	if (data.byte(kItemframe) == data.byte(kOpenedob) &&
+		data.byte(kObjecttype) == data.byte(kOpenedtype)) {
+		errorMessage1();
+		return;
+	}
+
+	if (!checkObjectSizeCPP())
+		return;
+
 	byte prevType = data.byte(kObjecttype);
 	byte prevFrame = data.byte(kItemframe);
-	uint16 objectId = getSegment(data.word(kBuffers)).word(findInvPosCPP());
-	data.byte(kItemframe)  = objectId & 0x00FF;
-	data.byte(kObjecttype) = objectId >> 8;
+	findOpenPos();
+	ax = es.word(bx);
+	data.byte(kItemframe) = al;
+	data.byte(kObjecttype) = ah;
+
+	if (data.byte(kObjecttype) != 4) {
+		transferToEx();
+		data.byte(kItemframe) = al;
+		data.byte(kObjecttype) = 4;
+	}
+
 	DynObject *object = getEitherAdCPP();
 	object->mapad[0] = 20;
 	object->mapad[1] = 255;
+
 	byte prevType2 = data.byte(kObjecttype);
 	byte prevFrame2 = data.byte(kItemframe);
 	data.byte(kObjecttype) = prevType;
 	data.byte(kItemframe) = prevFrame;
-	//findInvPosCPP();	// found in the original source, but it seems to be useless
-	delPointer();
+	findOpenPos();
 	object = getEitherAdCPP();
-	object->mapad[0] = 4;
-	object->mapad[1] = 255;
+	object->mapad[0] = data.byte(kOpenedtype);
+	object->mapad[1] = data.byte(kOpenedob);
 	object->mapad[2] = data.byte(kLastinvpos);
+	object->mapad[3] = data.byte(kReallocation);
 	data.byte(kObjecttype) = prevType2;
 	data.byte(kItemframe) = prevFrame2;
+	fillOpen();
 	fillRyan();
+	underTextLine();
 	readMouse();
+	useOpened();
 	showPointer();
 	workToScreenCPP();
 	delPointer();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 2ac944b06a..0cdd68fa18 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -196,6 +196,7 @@
 	void reExFromInv();
 	void locationPic();
 	void useOpened();
+	void swapWithOpen();
 	void swapWithInv();
 
 #endif
-- 
cgit v1.2.3


From 21a278bb630fc7bae6f152861900101a58836344 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 18:26:13 +0200
Subject: DREAMWEB: Port 'outofopen' to C++

---
 engines/dreamweb/dreamgen.cpp | 70 -----------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/object.cpp   | 72 +++++++++++++++++++++++++++++++++++++++----
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 67 insertions(+), 77 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index d68bd3b88f..6ecbba7995 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -365,76 +365,6 @@ findopenp1:
 	_add(bx, (0+(228*13)));
 }
 
-void DreamGenContext::outOfOpen() {
-	STACK_CHECK;
-	_cmp(data.byte(kOpenedob), 255);
-	if (flags.z())
-		goto cantuseopen;
-	findOpenPos();
-	ax = es.word(bx);
-	_cmp(al, 255);
-	if (!flags.z())
-		goto canpick4;
-cantuseopen:
-	blank();
-	return;
-canpick4:
-	_cmp(ax, data.word(kOldsubject));
-	if (!flags.z())
-		goto difsub4;
-	_cmp(data.byte(kCommandtype), 228);
-	if (flags.z())
-		goto alreadygrb;
-	data.byte(kCommandtype) = 228;
-difsub4:
-	data.word(kOldsubject) = ax;
-	bx = ax;
-	al = 36;
-	commandWithOb();
-alreadygrb:
-	ax = data.word(kMousebutton);
-	_cmp(ax, data.word(kOldbutton));
-	if (flags.z())
-		return /* (notletgo4) */;
-	_cmp(ax, 1);
-	if (flags.z())
-		goto dogrb;
-	_cmp(ax, 2);
-	if (!flags.z())
-		return /* (notletgo4) */;
-	reExFromOpen();
-	return;
-dogrb:
-	delPointer();
-	data.byte(kPickup) = 1;
-	findOpenPos();
-	ax = es.word(bx);
-	data.byte(kItemframe) = al;
-	data.byte(kObjecttype) = ah;
-	_cmp(ah, 4);
-	if (!flags.z())
-		goto makeintoex;
-	getEitherAd();
-	es.byte(bx+2) = 20;
-	es.byte(bx+3) = 255;
-	goto actuallyout;
-makeintoex:
-	transferToEx();
-	data.byte(kItemframe) = al;
-	data.byte(kObjecttype) = 4;
-	getEitherAd();
-	es.byte(bx+2) = 20;
-	es.byte(bx+3) = 255;
-actuallyout:
-	fillOpen();
-	underTextLine();
-	readMouse();
-	useOpened();
-	showPointer();
-	workToScreen();
-	delPointer();
-}
-
 void DreamGenContext::transferToEx() {
 	STACK_CHECK;
 	emergencyPurge();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f585c6a7b4..7bb4793d05 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -454,7 +454,6 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
-	void outOfOpen();
 	void dirCom();
 	void findFirstPath();
 	void getAnyAd();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 6546f19da4..64b3d276bb 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -887,9 +887,9 @@ void DreamGenContext::useOpened() {
 	}
 
 	findOpenPos();
-	ax = es.word(bx);
+	uint16 subject = es.word(bx);
 
-	if (al != 255) {
+	if ((subject & 0x00FF) != 255) {
 		swapWithOpen();
 		return;
 	}
@@ -899,7 +899,7 @@ void DreamGenContext::useOpened() {
 		return;
 	}
 
-	uint16 subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
+	subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
 	if (subject == data.word(kOldsubject)) {
 		if (data.byte(kCommandtype) != 227) {
 			data.byte(kCommandtype) = 227;
@@ -945,6 +945,66 @@ void DreamGenContext::useOpened() {
 	delPointer();
 }
 
+void DreamGenContext::outOfOpen() {
+	if (data.byte(kOpenedob) == 255)
+		return;	// cannot use opened object
+
+	findOpenPos();
+	uint16 subject = es.word(bx);
+
+	if ((subject & 0x00FF) == 255) {
+		blank();
+		return;
+	}
+
+	if (subject == data.word(kOldsubject)) {
+		if (data.byte(kCommandtype) != 228) {
+			data.byte(kCommandtype) = 228;
+			data.word(kOldsubject) = subject;
+			commandWithOb(36, subject >> 8, subject & 0x00FF);
+		}
+	} else {
+		data.word(kOldsubject) = subject;
+		commandWithOb(36, subject >> 8, subject & 0x00FF);
+	}
+
+	if (data.word(kMousebutton) == data.word(kOldbutton))
+		return;	// notletgo4
+
+	if (data.word(kMousebutton) != 1) {
+		if (data.word(kMousebutton) != 2)
+			return;	// notletgo4
+
+		reExFromOpen();
+		return;
+	}
+
+	delPointer();
+	data.byte(kPickup) = 1;
+	findOpenPos();
+	subject = es.word(bx);
+	data.byte(kObjecttype) = subject >> 8;
+	data.byte(kItemframe)  = subject & 0xFF;
+
+	if (data.byte(kObjecttype) != 4) {
+		transferToEx();
+		data.byte(kItemframe) = al;
+		data.byte(kObjecttype) = 4;
+	}
+
+	DynObject *object = getEitherAdCPP();
+	object->mapad[0] = 20;
+	object->mapad[1] = 255;
+
+	fillOpen();
+	underTextLine();
+	readMouse();
+	useOpened();
+	showPointer();
+	workToScreenCPP();
+	delPointer();
+}
+
 void DreamGenContext::swapWithOpen() {
 	uint16 subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
 	if (subject == data.word(kOldsubject)) {
@@ -980,9 +1040,9 @@ void DreamGenContext::swapWithOpen() {
 	byte prevType = data.byte(kObjecttype);
 	byte prevFrame = data.byte(kItemframe);
 	findOpenPos();
-	ax = es.word(bx);
-	data.byte(kItemframe) = al;
-	data.byte(kObjecttype) = ah;
+	subject = es.word(bx);
+	data.byte(kObjecttype) = subject >> 8;
+	data.byte(kItemframe)  = subject & 0xFF;
 
 	if (data.byte(kObjecttype) != 4) {
 		transferToEx();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 0cdd68fa18..4cc0ee0027 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -196,6 +196,7 @@
 	void reExFromInv();
 	void locationPic();
 	void useOpened();
+	void outOfOpen();
 	void swapWithOpen();
 	void swapWithInv();
 
-- 
cgit v1.2.3


From eaf87bdfa7ac279f736c03b25af94ac1df3b31ce Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 18:42:13 +0200
Subject: DREAMWEB: Port 'emergencypurge' to C++

---
 engines/dreamweb/dreamgen.cpp | 20 --------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/stubs.cpp    | 12 ++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 13 insertions(+), 21 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 6ecbba7995..42c0f71d2e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -475,26 +475,6 @@ void DreamGenContext::transferConToEx() {
 	ds.byte(si+2) = 255;
 }
 
-void DreamGenContext::emergencyPurge() {
-	STACK_CHECK;
-checkpurgeagain:
-	ax = data.word(kExframepos);
-	_add(ax, 4000);
-	_cmp(ax, (30000));
-	if (flags.c())
-		goto notnearframeend;
-	purgeAnItem();
-	goto checkpurgeagain;
-notnearframeend:
-	ax = data.word(kExtextpos);
-	_add(ax, 400);
-	_cmp(ax, (18000));
-	if (flags.c())
-		return /* (notneartextend) */;
-	purgeAnItem();
-	goto checkpurgeagain;
-}
-
 void DreamGenContext::purgeAnItem() {
 	STACK_CHECK;
 	es = data.word(kExtras);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7bb4793d05..d86e0072ef 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -477,7 +477,6 @@ public:
 	void getExAd();
 	void transferToEx();
 	void parser();
-	void emergencyPurge();
 	void transferConToEx();
 };
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 3a0ca79a1d..4eea0b72b9 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3701,4 +3701,16 @@ void DreamBase::incRyanPage() {
 
 }
 
+void DreamGenContext::emergencyPurge() {
+	while (true) {
+		if (data.word(kExframepos) + 4000 < kExframeslen) {
+			// Not near frame end
+			if (data.word(kExtextpos) + 400 < kExtextlen)
+				return;	// notneartextend
+		}
+
+		purgeAnItem();
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 4cc0ee0027..5bb07adbfa 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -199,5 +199,6 @@
 	void outOfOpen();
 	void swapWithOpen();
 	void swapWithInv();
+	void emergencyPurge();
 
 #endif
-- 
cgit v1.2.3


From 95ffd7f4ce2e0274b8adf87f03bc705b1d3a1ebd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 19:25:00 +0200
Subject: DREAMWEB: Port 'purgeanitem' to C++, some cleanup

---
 engines/dreamweb/dreambase.h  |  2 ++
 engines/dreamweb/dreamgen.cpp | 50 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/object.cpp   |  5 -----
 engines/dreamweb/stubs.cpp    | 21 +++++++++++++++++-
 engines/dreamweb/stubs.h      |  5 -----
 6 files changed, 22 insertions(+), 62 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 9e45e046f4..c14bfda7a1 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -541,6 +541,8 @@ public:
 	void cantDrop();
 	void entryAnims();
 	bool finishedWalking();
+	void emergencyPurge();
+	void purgeAnItem();
 
 	// from talk.cpp
 	void talk();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 42c0f71d2e..3ab3a66f55 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -475,56 +475,6 @@ void DreamGenContext::transferConToEx() {
 	ds.byte(si+2) = 255;
 }
 
-void DreamGenContext::purgeAnItem() {
-	STACK_CHECK;
-	es = data.word(kExtras);
-	di = (0+2080+30000);
-	bl = data.byte(kReallocation);
-	cx = 0;
-lookforpurge:
-	al = es.byte(di+2);
-	_cmp(al, 0);
-	if (!flags.z())
-		goto cantpurge;
-	_cmp(es.byte(di+12), 2);
-	if (flags.z())
-		goto iscup;
-	_cmp(es.byte(di+12), 255);
-	if (!flags.z())
-		goto cantpurge;
-iscup:
-	_cmp(es.byte(di+11), bl);
-	if (flags.z())
-		goto cantpurge;
-	deleteExObject();
-	return;
-cantpurge:
-	_add(di, 16);
-	_inc(cx);
-	_cmp(cx, (114));
-	if (!flags.z())
-		goto lookforpurge;
-	di = (0+2080+30000);
-	bl = data.byte(kReallocation);
-	cx = 0;
-lookforpurge2:
-	al = es.byte(di+2);
-	_cmp(al, 0);
-	if (!flags.z())
-		goto cantpurge2;
-	_cmp(es.byte(di+12), 255);
-	if (!flags.z())
-		goto cantpurge2;
-	deleteExObject();
-	return;
-cantpurge2:
-	_add(di, 16);
-	_inc(cx);
-	_cmp(cx, (114));
-	if (!flags.z())
-		goto lookforpurge2;
-}
-
 void DreamGenContext::getDestInfo() {
 	STACK_CHECK;
 	al = data.byte(kDestpos);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d86e0072ef..cd65c723a7 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -461,7 +461,6 @@ public:
 	void dirFile();
 	void pickupConts();
 	void transferMap();
-	void purgeAnItem();
 	void getSetAd();
 	void findOpenPos();
 	void rollEm();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 64b3d276bb..f3e27d9a5b 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -517,11 +517,6 @@ void DreamBase::deleteExText(uint8 textNum) {
 	}
 }
 
-// This takes es:di and cl as input, but es:di always points to getExAd(cl)
-void DreamGenContext::deleteExObject() {
-	deleteExObject(cl);
-}
-
 void DreamBase::deleteExObject(uint8 index) {
 	DynObject *obj = getExAd(index);
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 4eea0b72b9..3425ad400f 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3701,7 +3701,7 @@ void DreamBase::incRyanPage() {
 
 }
 
-void DreamGenContext::emergencyPurge() {
+void DreamBase::emergencyPurge() {
 	while (true) {
 		if (data.word(kExframepos) + 4000 < kExframeslen) {
 			// Not near frame end
@@ -3713,4 +3713,23 @@ void DreamGenContext::emergencyPurge() {
 	}
 }
 
+void DreamBase::purgeAnItem() {
+	const DynObject *extraObjects = (const DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, 0);
+
+	for (size_t i = 0; i < kNumexobjects; ++i) {
+		if (extraObjects[i].mapad[0] && extraObjects[i].id[0] == 255 &&
+			extraObjects[i].initialLocation != data.byte(kReallocation)) {
+			deleteExObject(i);
+			return;
+		}
+	}
+
+	for (size_t i = 0; i < kNumexobjects; ++i) {
+		if (extraObjects[i].mapad[0] && extraObjects[i].id[0] == 255) {
+			deleteExObject(i);
+			return;
+		}
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 5bb07adbfa..98149f2b70 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -183,10 +183,6 @@
 	uint16 findInvPosCPP();
 	void setPickup();
 	void getKeyAndLogo();
-	void deleteExObject();
-	void deleteExObject(uint8 index) {
-		DreamBase::deleteExObject(index);
-	}
 	void signOn();
 	void lookAtPlace();
 	void inToInv();
@@ -199,6 +195,5 @@
 	void outOfOpen();
 	void swapWithOpen();
 	void swapWithInv();
-	void emergencyPurge();
 
 #endif
-- 
cgit v1.2.3


From 6dbc930b18c43c12138d68c34a12bc015e28354d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 19:48:49 +0200
Subject: DREAMWEB: Remove getDestInfo() from locationPic

This allows to move some more functions into DreamBase
---
 engines/dreamweb/dreambase.h  |  4 ++++
 engines/dreamweb/newplace.cpp | 36 ++++++++++++++++--------------------
 engines/dreamweb/stubs.h      |  4 ----
 engines/dreamweb/use.cpp      |  5 ++---
 4 files changed, 22 insertions(+), 27 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index c14bfda7a1..e023d975a4 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -181,6 +181,9 @@ public:
 	void readCityPic();
 	void readDestIcon();
 	void showCity();
+	void locationPic();
+	void selectLocation();
+	void newPlace();
 
 	// from object.cpp
 	void obIcons();
@@ -569,6 +572,7 @@ public:
 	void edensCDPlayer();
 	void hotelBell();
 	void playGuitar();
+	void useElevator1();
 	void useElevator2();
 	void useElevator3();
 	void useElevator4();
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 027d7c1937..b2456ad2e1 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -24,7 +24,7 @@
 
 namespace DreamGen {
 
-void DreamGenContext::newPlace() {
+void DreamBase::newPlace() {
 	if (data.byte(kNeedtotravel) == 1) {
 		data.byte(kNeedtotravel) = 0;
 		selectLocation();
@@ -34,8 +34,7 @@ void DreamGenContext::newPlace() {
 	}
 }
 
-// TODO: Move to DreamBase once getDestInfo is moved
-void DreamGenContext::selectLocation() {
+void DreamBase::selectLocation() {
 	data.byte(kInmaparea) = 0;
 	clearBeforeLoad();
 	data.byte(kGetback) = 0;
@@ -142,7 +141,20 @@ void DreamBase::putUnderCentre() {
 	multiPut(mapStore(), 58, 72, 254, 110);
 }
 
-// TODO: put Locationpic here
+void DreamBase::locationPic() {
+	byte destFlag = data.byte(553 + data.byte(kDestpos));
+	if (destFlag >= 6)
+		showFrame(tempGraphics2(), 104, 138 + 14, destFlag - 6, 0);	// Second slot
+	else
+		showFrame(tempGraphics(),  104, 138 + 14, destFlag + 4, 0);
+
+	if (data.byte(kDestpos) == data.byte(kReallocation))
+		showFrame(tempGraphics(), 104, 140 + 14, 3, 0);	// Currently in this location
+
+	uint16 offset = kTextstart + getSegment(data.word(kTraveltext)).word(data.byte(kDestpos) * 2);
+	const uint8 *string = getSegment(data.word(kTraveltext)).ptr(offset, 0);
+	DreamBase::printDirect(string, 50, 20, 241, 241 & 1);
+}
 
 // TODO: put Getdestinfo here
 
@@ -270,20 +282,4 @@ void DreamBase::readCityPic() {
 	loadIntoTemp("DREAMWEB.G04");
 }
 
-void DreamGenContext::locationPic() {
-	getDestInfo();
-	byte destFlag = es.byte(si);
-	if (destFlag >= 6)
-		showFrame(tempGraphics2(), 104, 138 + 14, destFlag - 6, 0);	// Second slot
-	else
-		showFrame(tempGraphics(),  104, 138 + 14, destFlag + 4, 0);
-
-	if (data.byte(kDestpos) == data.byte(kReallocation))
-		showFrame(tempGraphics(), 104, 140 + 14, 3, 0);	// Currently in this location
-
-	uint16 offset = kTextstart + getSegment(data.word(kTraveltext)).word(data.byte(kDestpos) * 2);
-	const uint8 *string = getSegment(data.word(kTraveltext)).ptr(offset, 0);
-	DreamBase::printDirect(string, 50, 20, 241, 241 & 1);
-}
-
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 98149f2b70..e447b705fb 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -123,7 +123,6 @@
 	void autoLook();
 	void doLook();
 	void enterSymbol();
-	void useElevator1();
 	void useKey();
 	void useObject();
 	void singleKey(uint8 key, uint16 x, uint16 y);
@@ -162,7 +161,6 @@
 	void decide();
 	void showGun();
 	void endGame();
-	void newPlace();
 	void monkSpeaking();
 	void rollEndCredits2();
 	void triggerMessage(uint16 index);
@@ -188,9 +186,7 @@
 	void inToInv();
 	void outOfInv();
 	void selectOpenOb();
-	void selectLocation();
 	void reExFromInv();
-	void locationPic();
 	void useOpened();
 	void outOfOpen();
 	void swapWithOpen();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 41b338e885..78dffc99ad 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -39,7 +39,7 @@ void DreamGenContext::useRoutine() {
 
 	static const UseListEntry kUseList[] = {
 		{ &DreamGenContext::useMon,            "NETW" },
-		{ &DreamGenContext::useElevator1,      "ELVA" },
+		{ &DreamBase::useElevator1,            "ELVA" },
 		{ &DreamBase::useElevator2,            "ELVB" },
 		{ &DreamBase::useElevator3,            "ELVC" },
 		{ &DreamBase::useElevator4,            "ELVE" },
@@ -242,8 +242,7 @@ void DreamBase::playGuitar() {
 	putBackObStuff();
 }
 
-// TODO: Move to DreamBase once selectLocation (in reality, getDestInfo) is moved
-void DreamGenContext::useElevator1() {
+void DreamBase::useElevator1() {
 	showFirstUse();
 	selectLocation();
 	data.byte(kGetback) = 1;
-- 
cgit v1.2.3


From e27a5931c811681590ced5df290e0c16f52aecc4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 21:00:30 +0200
Subject: DREAMWEB: Remove getdestinfo() and access the roomPics array directly
 in locationPic()

---
 engines/dreamweb/dreamgen.cpp | 31 +++++--------------------------
 engines/dreamweb/dreamgen.h   | 14 ++++++--------
 engines/dreamweb/newplace.cpp | 21 ++++++++-------------
 3 files changed, 19 insertions(+), 47 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 3ab3a66f55..f71ced9057 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -475,25 +475,6 @@ void DreamGenContext::transferConToEx() {
 	ds.byte(si+2) = 255;
 }
 
-void DreamGenContext::getDestInfo() {
-	STACK_CHECK;
-	al = data.byte(kDestpos);
-	ah = 0;
-	push(ax);
-	dx = data;
-	es = dx;
-	si = 537;
-	_add(si, ax);
-	cl = es.byte(si);
-	ax = pop();
-	push(cx);
-	dx = data;
-	es = dx;
-	si = 553;
-	_add(si, ax);
-	ax = pop();
-}
-
 void DreamGenContext::dirCom() {
 	STACK_CHECK;
 	cx = 30;
@@ -767,7 +748,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 571;
+	si = 556;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -952,9 +933,9 @@ void DreamGenContext::__start() {
 		//0x0200: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 
 		//0x0210: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0220: .... .... .... ....
-		0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 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, 
 		//0x0230: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0240: .... .... .... ....
@@ -968,11 +949,9 @@ void DreamGenContext::__start() {
 		//0x0280: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0290: .... .... .... ....
-		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, 0xff, 0xff, 0xff, 0xff, 
 		//0x02a0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x02b0: .... .... .... ....
-		0xff, 0x00, 0x00, 0x00, };
+		0xff, 0xff, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index cd65c723a7..7247bedf74 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -346,13 +346,12 @@ static const uint16 kRoomssample = 420;
 static const uint16 kBasicsample = 421;
 static const uint16 kCurrentfile = 462;
 static const uint16 kRoomscango = 537;
-static const uint16 kRoompics = 553;
-static const uint16 kOplist = 568;
-static const uint16 kInputline = 571;
-static const uint16 kPresslist = 699;
-static const uint16 kQuitrequested = 705;
-static const uint16 kSubtitles = 706;
-static const uint16 kForeignrelease = 707;
+static const uint16 kOplist = 553;
+static const uint16 kInputline = 556;
+static const uint16 kPresslist = 684;
+static const uint16 kQuitrequested = 690;
+static const uint16 kSubtitles = 691;
+static const uint16 kForeignrelease = 692;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -469,7 +468,6 @@ public:
 	void getEitherAd();
 	void dreamweb();
 	void findPathOfPoint();
-	void getDestInfo();
 	void read();
 	void searchForString();
 	void searchForFiles();
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index b2456ad2e1..e311f44ccc 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -142,11 +142,13 @@ void DreamBase::putUnderCentre() {
 }
 
 void DreamBase::locationPic() {
-	byte destFlag = data.byte(553 + data.byte(kDestpos));
-	if (destFlag >= 6)
-		showFrame(tempGraphics2(), 104, 138 + 14, destFlag - 6, 0);	// Second slot
+	const int roomPics[] = { 5, 0, 3, 2, 4, 1, 10, 9, 8, 6, 11, 4, 7, 7, 0 };
+	byte picture = roomPics[data.byte(kDestpos)];
+
+	if (picture >= 6)
+		showFrame(tempGraphics2(), 104, 138 + 14, picture - 6, 0);	// Second slot
 	else
-		showFrame(tempGraphics(),  104, 138 + 14, destFlag + 4, 0);
+		showFrame(tempGraphics(),  104, 138 + 14, picture + 4, 0);
 
 	if (data.byte(kDestpos) == data.byte(kReallocation))
 		showFrame(tempGraphics(), 104, 140 + 14, 3, 0);	// Currently in this location
@@ -156,8 +158,6 @@ void DreamBase::locationPic() {
 	DreamBase::printDirect(string, 50, 20, 241, 241 & 1);
 }
 
-// TODO: put Getdestinfo here
-
 void DreamBase::showArrows() {
 	showFrame(tempGraphics(), 116 - 12, 16, 0, 0);
 	showFrame(tempGraphics(), 226 + 12, 16, 1, 0);
@@ -177,9 +177,7 @@ void DreamGenContext::nextDest() {
 		data.byte(kDestpos)++;
 		if (data.byte(kDestpos) == 15)
 			data.byte(kDestpos) = 0;	// last destination
-
-		getDestInfo();
-	} while (al == 0);
+	} while (!data.byte(kRoomscango + data.byte(kDestpos)));
 
 	data.byte(kNewtextline) = 1;
 	delTextLine();
@@ -208,9 +206,7 @@ void DreamGenContext::lastDest() {
 		data.byte(kDestpos)--;
 		if (data.byte(kDestpos) == 0xFF)
 			data.byte(kDestpos) = 15;	// first destination
-
-		getDestInfo();
-	} while (al == 0);
+	} while (!data.byte(kRoomscango + data.byte(kDestpos)));
 
 	data.byte(kNewtextline) = 1;
 	delTextLine();
@@ -235,7 +231,6 @@ void DreamGenContext::destSelect() {
 	if (!(data.word(kMousebutton) & 1) || data.word(kOldbutton) == 1)
 		return;	// notrav
 
-	getDestInfo();
 	data.byte(kNewlocation) = data.byte(kDestpos);
 }
 
-- 
cgit v1.2.3


From 95c9a6d8cd93b7cbe921e391f207450f6082d99a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 21:10:20 +0200
Subject: DREAMWEB: Move all of the functions in newplace.cpp into DreamBase

---
 engines/dreamweb/dreambase.h  |  4 ++++
 engines/dreamweb/newplace.cpp | 18 +++++++++---------
 engines/dreamweb/stubs.h      |  4 ----
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index e023d975a4..41409bc323 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -184,6 +184,10 @@ public:
 	void locationPic();
 	void selectLocation();
 	void newPlace();
+	void nextDest();
+	void lastDest();
+	void destSelect();
+	void lookAtPlace();
 
 	// from object.cpp
 	void obIcons();
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index e311f44ccc..4942804369 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -72,11 +72,11 @@ void DreamBase::selectLocation() {
 		if (data.byte(kGetback) == 1)
 			break;
 
-		RectWithCallback<DreamGenContext> destList[] = {
-			{ 238,258,4,44,&DreamGenContext::nextDest },
-			{ 104,124,4,44,&DreamGenContext::lastDest },
-			{ 280,308,4,44,&DreamGenContext::lookAtPlace },
-			{ 104,216,138,192,&DreamGenContext::destSelect },
+		RectWithCallback<DreamBase> destList[] = {
+			{ 238,258,4,44,&DreamBase::nextDest },
+			{ 104,124,4,44,&DreamBase::lastDest },
+			{ 280,308,4,44,&DreamBase::lookAtPlace },
+			{ 104,216,138,192,&DreamBase::destSelect },
 			{ 273,320,157,198,&DreamBase::getBack1 },
 			{ 0,320,0,200,&DreamBase::blank },
 			{ 0xFFFF,0,0,0,0 }
@@ -101,7 +101,7 @@ void DreamBase::showCity() {
 	showFrame(tempGraphics(), 120+57, 32, 1, 0);
 }
 
-void DreamGenContext::lookAtPlace() {
+void DreamBase::lookAtPlace() {
 	if (data.byte(kCommandtype) != 224) {
 		data.byte(kCommandtype) = 224;
 		commandOnly(27);
@@ -164,7 +164,7 @@ void DreamBase::showArrows() {
 	showFrame(tempGraphics(), 280, 14, 2, 0);
 }
 
-void DreamGenContext::nextDest() {
+void DreamBase::nextDest() {
 	if (data.byte(kCommandtype) != 218) {
 		data.byte(kCommandtype) = 218;
 		commandOnly(28);
@@ -193,7 +193,7 @@ void DreamGenContext::nextDest() {
 	delPointer();
 }
 
-void DreamGenContext::lastDest() {
+void DreamBase::lastDest() {
 	if (data.byte(kCommandtype) != 219) {
 		data.byte(kCommandtype) = 219;
 		commandOnly(29);
@@ -222,7 +222,7 @@ void DreamGenContext::lastDest() {
 	delPointer();
 }
 
-void DreamGenContext::destSelect() {
+void DreamBase::destSelect() {
 	if (data.byte(kCommandtype) != 222) {
 		data.byte(kCommandtype) = 222;
 		commandOnly(30);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index e447b705fb..148436e8a8 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -148,9 +148,6 @@
 	void errorMessage1();
 	void errorMessage2();
 	void errorMessage3();
-	void nextDest();
-	void lastDest();
-	void destSelect();
 	void loadSpeech();
 	bool loadSpeech(byte type1, int idx1, byte type2, int idx2) {
 		return DreamBase::loadSpeech(type1, idx1, type2, idx2);
@@ -182,7 +179,6 @@
 	void setPickup();
 	void getKeyAndLogo();
 	void signOn();
-	void lookAtPlace();
 	void inToInv();
 	void outOfInv();
 	void selectOpenOb();
-- 
cgit v1.2.3


From bdded1ce12212e092452a7b4943e99cad4c16a14 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 22:11:27 +0200
Subject: DREAMWEB: The ASM-style version of getEitherAd() is no longer needed

---
 engines/dreamweb/dreamgen.cpp | 13 -------------
 engines/dreamweb/dreamgen.h   |  1 -
 2 files changed, 14 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index f71ced9057..0dffe56c2a 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -303,19 +303,6 @@ void DreamGenContext::getExAd() {
 	_add(bx, (0+2080+30000));
 }
 
-void DreamGenContext::getEitherAd() {
-	STACK_CHECK;
-	_cmp(data.byte(kObjecttype), 4);
-	if (flags.z())
-		goto isinexlist;
-	al = data.byte(kItemframe);
-	getFreeAd();
-	return;
-isinexlist:
-	al = data.byte(kItemframe);
-	getExAd();
-}
-
 void DreamGenContext::getAnyAd() {
 	STACK_CHECK;
 	_cmp(data.byte(kObjecttype), 4);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7247bedf74..0f6bfc0a48 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -465,7 +465,6 @@ public:
 	void rollEm();
 	void findAllOpen();
 	void fillOpen();
-	void getEitherAd();
 	void dreamweb();
 	void findPathOfPoint();
 	void read();
-- 
cgit v1.2.3


From 1f346baa92064388de2958110d93006ac96a5479 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Dec 2011 22:31:07 +0200
Subject: DREAMWEB: Port 'findopenpos' to C++

---
 engines/dreamweb/dreambase.h  |  1 +
 engines/dreamweb/dreamgen.cpp | 17 ---------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/object.cpp   | 51 +++++++++++++++++++++++--------------------
 4 files changed, 28 insertions(+), 42 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 41409bc323..0dc4e52d86 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -204,6 +204,7 @@ public:
 	void wornError();
 	void makeWorn(DynObject *object);
 	void dropObject();
+	uint16 findOpenPos();
 
 	// from pathfind.cpp
 	void turnPathOn(uint8 param);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 0dffe56c2a..32bb520b18 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -335,23 +335,6 @@ void DreamGenContext::getSetAd() {
 	es = data.word(kSetdat);
 }
 
-void DreamGenContext::findOpenPos() {
-	STACK_CHECK;
-	cx = data.word(kMousex);
-	_sub(cx, (80));
-	bx = -1;
-findopenp1:
-	_inc(bx);
-	_sub(cx, (44));
-	if (!flags.c())
-		goto findopenp1;
-	al = bl;
-	data.byte(kLastinvpos) = al;
-	_add(bx, bx);
-	es = data.word(kBuffers);
-	_add(bx, (0+(228*13)));
-}
-
 void DreamGenContext::transferToEx() {
 	STACK_CHECK;
 	emergencyPurge();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 0f6bfc0a48..45589cab07 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -461,7 +461,6 @@ public:
 	void pickupConts();
 	void transferMap();
 	void getSetAd();
-	void findOpenPos();
 	void rollEm();
 	void findAllOpen();
 	void fillOpen();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index f3e27d9a5b..c202ac765c 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -881,10 +881,9 @@ void DreamGenContext::useOpened() {
 		return;
 	}
 
-	findOpenPos();
-	uint16 subject = es.word(bx);
+	uint16 objectId = getSegment(data.word(kBuffers)).word(findOpenPos());
 
-	if ((subject & 0x00FF) != 255) {
+	if ((objectId & 0x00FF) != 255) {
 		swapWithOpen();
 		return;
 	}
@@ -894,15 +893,15 @@ void DreamGenContext::useOpened() {
 		return;
 	}
 
-	subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
-	if (subject == data.word(kOldsubject)) {
+	objectId = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
+	if (objectId == data.word(kOldsubject)) {
 		if (data.byte(kCommandtype) != 227) {
 			data.byte(kCommandtype) = 227;
-			data.word(kOldsubject) = subject;
+			data.word(kOldsubject) = objectId;
 			commandWithOb(35, data.byte(kObjecttype), data.byte(kItemframe));
 		}
 	} else {
-		data.word(kOldsubject) = subject;
+		data.word(kOldsubject) = objectId;
 		commandWithOb(35, data.byte(kObjecttype), data.byte(kItemframe));
 	}
 
@@ -944,23 +943,22 @@ void DreamGenContext::outOfOpen() {
 	if (data.byte(kOpenedob) == 255)
 		return;	// cannot use opened object
 
-	findOpenPos();
-	uint16 subject = es.word(bx);
+	uint16 objectId = getSegment(data.word(kBuffers)).word(findOpenPos());
 
-	if ((subject & 0x00FF) == 255) {
+	if ((objectId & 0x00FF) == 255) {
 		blank();
 		return;
 	}
 
-	if (subject == data.word(kOldsubject)) {
+	if (objectId == data.word(kOldsubject)) {
 		if (data.byte(kCommandtype) != 228) {
 			data.byte(kCommandtype) = 228;
-			data.word(kOldsubject) = subject;
-			commandWithOb(36, subject >> 8, subject & 0x00FF);
+			data.word(kOldsubject) = objectId;
+			commandWithOb(36, objectId >> 8, objectId & 0x00FF);
 		}
 	} else {
-		data.word(kOldsubject) = subject;
-		commandWithOb(36, subject >> 8, subject & 0x00FF);
+		data.word(kOldsubject) = objectId;
+		commandWithOb(36, objectId >> 8, objectId & 0x00FF);
 	}
 
 	if (data.word(kMousebutton) == data.word(kOldbutton))
@@ -976,10 +974,9 @@ void DreamGenContext::outOfOpen() {
 
 	delPointer();
 	data.byte(kPickup) = 1;
-	findOpenPos();
-	subject = es.word(bx);
-	data.byte(kObjecttype) = subject >> 8;
-	data.byte(kItemframe)  = subject & 0xFF;
+	objectId = getSegment(data.word(kBuffers)).word(findOpenPos());
+	data.byte(kObjecttype) = objectId >> 8;
+	data.byte(kItemframe)  = objectId & 0xFF;
 
 	if (data.byte(kObjecttype) != 4) {
 		transferToEx();
@@ -1034,10 +1031,9 @@ void DreamGenContext::swapWithOpen() {
 
 	byte prevType = data.byte(kObjecttype);
 	byte prevFrame = data.byte(kItemframe);
-	findOpenPos();
-	subject = es.word(bx);
-	data.byte(kObjecttype) = subject >> 8;
-	data.byte(kItemframe)  = subject & 0xFF;
+	uint16 objectId = getSegment(data.word(kBuffers)).word(findOpenPos());
+	data.byte(kObjecttype) = objectId >> 8;
+	data.byte(kItemframe)  = objectId & 0xFF;
 
 	if (data.byte(kObjecttype) != 4) {
 		transferToEx();
@@ -1053,7 +1049,7 @@ void DreamGenContext::swapWithOpen() {
 	byte prevFrame2 = data.byte(kItemframe);
 	data.byte(kObjecttype) = prevType;
 	data.byte(kItemframe) = prevFrame;
-	findOpenPos();
+	//findOpenPos();	// was in the original source, looks to be unused
 	object = getEitherAdCPP();
 	object->mapad[0] = data.byte(kOpenedtype);
 	object->mapad[1] = data.byte(kOpenedob);
@@ -1071,4 +1067,11 @@ void DreamGenContext::swapWithOpen() {
 	delPointer();
 }
 
+uint16 DreamBase::findOpenPos() {
+	uint16 pos = (data.word(kMousex) - kInventx) / kItempicsize;
+	data.byte(kLastinvpos) = pos & 0xFF;
+
+	return pos * 2 + kOpeninvlist;	// return the object position in the inventory data
+}
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From c7b1ec21980d622c138fa2dcac5a03f80aa415e1 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Sun, 25 Dec 2011 23:33:11 +0000
Subject: DREAMWEB: Ported 'findfirstpath' to C++.

This conversion could do with a bit more work to remove the es/ax/cx
temp usage and clean up the code.
---
 engines/dreamweb/dreamgen.cpp | 43 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/object.cpp   | 29 +++++++++++++++++++++++++++--
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 28 insertions(+), 46 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 32bb520b18..e92291178c 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -790,49 +790,6 @@ flunkedit:
 	dl = 255;
 }
 
-void DreamGenContext::findFirstPath() {
-	STACK_CHECK;
-	push(ax);
-	bx = (0);
-	es = data.word(kReels);
-	al = data.byte(kRoomnum);
-	ah = 0;
-	cx = 144;
-	_mul(cx);
-	_add(bx, ax);
-	cx = pop();
-	dl = 0;
-fpathloop:
-	ax = es.word(bx+2);
-	_cmp(ax, 0x0ffff);
-	if (flags.z())
-		goto nofirst;
-	_cmp(cl, al);
-	if (flags.c())
-		goto nofirst;
-	_cmp(ch, ah);
-	if (flags.c())
-		goto nofirst;
-	ax = es.word(bx+4);
-	_cmp(cl, al);
-	if (!flags.c())
-		goto nofirst;
-	_cmp(ch, ah);
-	if (!flags.c())
-		goto nofirst;
-	goto gotfirst;
-nofirst:
-	_add(bx, 8);
-	_inc(dl);
-	_cmp(dl, 12);
-	if (!flags.z())
-		goto fpathloop;
-	al = 0;
-	return;
-gotfirst:
-	al = es.byte(bx+6);
-}
-
 void DreamGenContext::__start() { 
 	static const uint8 src[] = {
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x13, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 45589cab07..4d6946e8ab 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -454,7 +454,6 @@ public:
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
 	void dirCom();
-	void findFirstPath();
 	void getAnyAd();
 	void getFreeAd();
 	void dirFile();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index c202ac765c..84829bf440 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -341,6 +341,32 @@ void DreamGenContext::openOb() {
 	_openChangeSize = getOpenedSlotCount() * kItempicsize + kInventx;
 }
 
+uint8 DreamGenContext::findFirstPath(uint16 param) {
+	es = data.word(kReels);
+	uint16 ptr = 144 * data.byte(kRoomnum);
+	// TODO: Replace ax, cx usage with temporary uint8/16 variables...
+	cx = param;
+
+	for (uint8 pathLoop = 0; pathLoop < 12; pathLoop++, ptr += 8) {
+		ax = es.word(ptr+2);
+
+		if (ax == 0x0ffff)
+			continue; // "nofirst"
+
+		if (cl < al || ch < ah)
+			continue; // "nofirst"
+
+		ax = es.word(ptr+4);
+
+		if (cl > al || ch > ah)
+			continue; // "nofirst"
+
+		return es.byte(ptr+6); // "gotfirst"
+	}
+
+	return 0;
+}
+
 void DreamGenContext::identifyOb() {
 	if (data.word(kWatchingtime) != 0) {
 		blank();
@@ -362,8 +388,7 @@ void DreamGenContext::identifyOb() {
 	data.byte(kPointerspath) = dl;
 	ax = pop();
 	push(ax);
-	findFirstPath();
-	data.byte(kPointerfirstpath) = al;
+	data.byte(kPointerfirstpath) = findFirstPath(ax);
 	ax = pop();
 
 	byte x = al;
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 148436e8a8..62259a16a5 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -172,6 +172,7 @@
 	void checkObjectSize();
 	bool checkObjectSizeCPP();
 	void openOb();
+	uint8 findFirstPath(uint16 param);
 	void identifyOb();
 	void selectOb();
 	void findInvPos();
-- 
cgit v1.2.3


From 9ba55105fccf0489659d91cee38a899f13628168 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 25 Dec 2011 23:41:03 +0100
Subject: TSAGE: R2R - Implement scene 3400

---
 engines/tsage/globals.cpp                        |   3 +
 engines/tsage/globals.h                          |   1 +
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   2 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 247 ++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h    |  24 ++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 313 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   |  40 +++
 7 files changed, 630 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 740d9b91fd..d30d585c09 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -381,6 +381,7 @@ void Ringworld2Globals::reset() {
 	T2_GLOBALS._uiElements._active = false;
 
 	// Reset fields
+	_v558B6.set(0, 0, 0, 0);
 	_v5657C = 0;
 	_v565F5 = 0;
 	_v565AE = 0;
@@ -419,6 +420,8 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	TsAGE2Globals::synchronize(s);
 	int i;
 
+	_v558B6.synchronize(s);
+
 	s.syncAsSint16LE(_v5657C);
 	s.syncAsSint16LE(_v565F5);
 	s.syncAsSint16LE(_v56AAB);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index fb892c6cf7..498659d3ae 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -248,6 +248,7 @@ public:
 	PlayStream _playStream;
 	StripProxy _stripProxy;
 	int _insetUp;
+	Rect _v558B6;
 	int _v565F5;
 	int _v5657C;
 	byte _v565AE;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 30e794627f..4462122a4d 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -219,7 +219,9 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 3375:
 	case 3385:
 	case 3395:
+		error("Missing scene %d from group 3", sceneNumber);
 	case 3400:
+		return new Scene3400();
 	case 3500:
 	case 3600:
 	case 3700:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index ce08e9647e..e3d2869634 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1698,5 +1698,252 @@ void Scene3350::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3400 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene3400::Scene3400() {
+	_field157C = 0;
+}
+
+void Scene3400::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field157C);
+}
+
+void Scene3400::postInit(SceneObjectList *OwnerList) {
+	R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
+	g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
+	loadScene(3400);
+	_field157C = 0;
+	R2_GLOBALS._v558B6.set(60, 0, 260, 200);
+	SceneExt::postInit();
+	R2_GLOBALS._sound1.play(317);
+
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+	_stripManager.addSpeaker(&_mirandaSpeaker);
+	_stripManager.addSpeaker(&_webbsterSpeaker);
+	_stripManager.addSpeaker(&_tealSpeaker);
+
+	setZoomPercents(51, 46, 180, 200);
+	R2_GLOBALS._player._characterScene[1] = 3400;
+	R2_GLOBALS._player._characterScene[2] = 3400;
+	R2_GLOBALS._player._characterScene[3] = 3400;
+
+	_actor7.postInit();
+	_actor7.setup(3403, 1, 1);
+	_actor7.setPosition(Common::Point(190, 103));
+	_actor7.fixPriority(89);
+
+	R2_GLOBALS._player.postInit();
+	if (R2_GLOBALS._player._characterIndex == 2)
+		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+	else
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+	R2_GLOBALS._player.changeZoom(-1);
+	R2_GLOBALS._player.setPosition(Common::Point(239, 64));
+
+	if (R2_GLOBALS._player._characterIndex == 2)
+		R2_GLOBALS._player.setup(20, 5, 1);
+	else if (R2_GLOBALS._player._characterIndex == 3)
+		R2_GLOBALS._player.setup(30, 5, 1);
+	else
+		R2_GLOBALS._player.setup(10, 5, 1);
+
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.disableControl();
+
+	_actor1.postInit();
+	if (R2_GLOBALS._player._characterIndex == 2) {
+		_actor1._numFrames = 10;
+		_actor1._moveDiff = Common::Point(3, 2);
+	} else {
+		_actor1._numFrames = 7;
+		_actor1._moveDiff = Common::Point(5, 3);
+	}
+	_actor1.changeZoom(-1);
+	_actor1._effect = 1;
+	_actor1.setPosition(Common::Point(247, 63));
+	if (R2_GLOBALS._player._characterIndex == 2)
+		_actor1.setup(10, 5, 1);
+	else
+		_actor1.setup(20, 5, 1);
+	_actor1.animate(ANIM_MODE_1, NULL);
+
+	_actor2.postInit();
+	_actor2._moveDiff = Common::Point(3, 2);
+	_actor2.changeZoom(-1);
+	_actor2._effect = 1;
+	_actor2.setPosition(Common::Point(225, 63));
+	if (R2_GLOBALS._player._characterIndex == 3)
+		_actor2.setup(10, 5, 1);
+	else
+		_actor2.setup(30, 5, 1);
+	_actor2.animate(ANIM_MODE_1, NULL);
+
+	_actor3.postInit();
+	_actor3._numFrames = 7;
+	_actor3._moveDiff = Common::Point(5, 3);
+	_actor3.changeZoom(-1);
+	_actor3._effect = 1;
+	_actor3.setPosition(Common::Point(235, 61));
+	_actor3.setup(40, 3, 1);
+	_actor3.animate(ANIM_MODE_1, NULL);
+
+	_actor6.postInit();
+	_actor6.setup(3400, 1, 6);
+	_actor6.setPosition(Common::Point(236, 51));
+	_actor6.fixPriority(51);
+	_actor6.animate(ANIM_MODE_6, NULL);
+
+	R2_GLOBALS.clearFlag(71);
+	_sceneMode = 3400;
+	setAction(&_sequenceManager, this, 3400, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL);
+}
+
+void Scene3400::remove() {
+	R2_GLOBALS._sound2.fadeOut2(NULL);
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene3400::signal() {
+	switch (_sceneMode) {
+	case 3305: {
+		warning("STUB: sub_1D227()");
+		_tealSpeaker._object1.hide();
+		_actor4.show();
+		_actor4.setStrip(1);
+		Common::Point pt(158, 190);
+		NpcMover *mover = new NpcMover();
+		_actor4.addMover(mover, &pt, this);
+		_sceneMode = 3402;
+		setAction(&_sequenceManager, this, 3402, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL);
+		}
+		break;
+	case 3306:
+		R2_GLOBALS._sound2.play(318);
+		_actor1.setStrip(2);
+		R2_GLOBALS._player.setStrip(6);
+		_actor2.setStrip(6);
+		_actor3.setStrip(3);
+		_actor4.setStrip(1);
+		R2_INVENTORY.setObjectScene(34, 0);
+		_stripManager.start(3307, this);
+		if (R2_GLOBALS._player._characterIndex == 2) {
+			_sceneMode = 3400;
+			R2_GLOBALS._player.setAction(&_sequenceManager, this, 3400, &R2_GLOBALS._player, &_actor4, &_actor8, NULL);
+		} else {
+			_sceneMode = 3408;
+			_actor1.setAction(&_sequenceManager, this, 3408, &_actor1, &_actor4, &_actor8, NULL);
+		}
+		break;
+	case 3307:
+	case 3404:
+	case 3408:
+		if (_field157C == 0) {
+			R2_GLOBALS._sound2.fadeOut2(NULL);
+			_field157C = 1;
+		} else {
+			_sceneMode = 3308;
+			_stripManager.start(3308, this);
+		}
+		break;
+	case 3308:
+		warning("STUB: sub_1D227()");
+		_actor1.setStrip(2);
+		R2_GLOBALS._player.setStrip(6);
+		_actor2.setStrip(6);
+		_actor3.setStrip(3);
+		_actor4.setStrip(1);
+		_sceneMode = 3403;
+		if (R2_GLOBALS._player._characterIndex == 2)
+			setAction(&_sequenceManager, this, 3403, R2_GLOBALS._player, &_actor3, &_actor7, NULL);
+		else 
+			setAction(&_sequenceManager, this, 3403, &_actor1, &_actor3, &_actor7, NULL);
+		break;
+	case 3309:
+		warning("STUB: sub_1D227()");
+		_actor4.setStrip(1);
+		_sceneMode = 3405;
+		if (R2_GLOBALS._player._characterIndex == 3)
+			setAction(&_sequenceManager, this, 3405, R2_GLOBALS._player, &_actor7, NULL);
+		else 
+			setAction(&_sequenceManager, this, 3405, &_actor2, &_actor7, NULL);
+		break;
+	case 3310:
+		warning("STUB: sub_1D227()");
+		_actor4.setStrip(1);
+		_sceneMode = 3406;
+		if (R2_GLOBALS._player._characterIndex == 1)
+			setAction(&_sequenceManager, this, 3406, &R2_GLOBALS._player, &_actor7, NULL);
+		else if (R2_GLOBALS._player._characterIndex == 2)
+			setAction(&_sequenceManager, this, 3406, &_actor1, &_actor7, NULL);
+		else if (R2_GLOBALS._player._characterIndex == 3)
+			setAction(&_sequenceManager, this, 3406, &_actor2, &_actor7, NULL);
+		break;
+	case 3311:
+		warning("STUB: sub_1D227()");
+		_tealSpeaker._object1.hide();
+		_actor4.show();
+		_actor4.setStrip(1);
+		_sceneMode = 3407;
+		setAction(&_sequenceManager, this, 3407, &_actor4, &_actor7, NULL);
+		break;
+	case 3400: {
+		_actor8.postInit();
+		_actor8.hide();
+		_actor4.postInit();
+		_actor4._numFrames = 7;
+		_actor4._moveDiff = Common::Point(3, 2);
+		_actor4.changeZoom(-1);
+		_actor4._effect = 1;
+		_actor4.setPosition(Common::Point(-15, 90));
+		_actor4.setup(3402, 1, 1);
+		_actor4.animate(ANIM_MODE_1, NULL);
+		Common::Point pt1(115, 90);
+		NpcMover *mover1 = new NpcMover();
+		_actor4.addMover(mover1, &pt1, this);
+		R2_GLOBALS._scrollFollower = &_actor4;
+		Common::Point pt2(203, 76);
+		NpcMover *mover2 = new NpcMover();
+		_actor3.addMover(mover2, &pt2, NULL);
+		_sceneMode = 3401;
+		}
+		break;
+	case 3401:
+		_sceneMode = 3305;
+		_stripManager.start(3305, this);
+		break;
+	case 3402:
+		_sceneMode = 3306;
+		_stripManager.start(3306, this);
+		break;
+	case 3403:
+		R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
+		_sceneMode = 3309;
+		_stripManager.start(3309, this);
+		break;
+	case 3405:
+		_sceneMode = 3310;
+		_stripManager.start(3310, this);
+		break;
+	case 3406:
+		_sceneMode = 3311;
+		_stripManager.start(3311, this);
+		break;
+	case 3407:
+		R2_GLOBALS._sceneManager.changeScene(3600);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index ac1436637c..8968bddf1a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -400,6 +400,30 @@ public:
 	virtual void signal();
 };
 
+class Scene3400 : public SceneExt {
+public:
+	SpeakerQuinn3400 _quinnSpeaker;
+	SpeakerSeeker3400 _seekerSpeaker;
+	SpeakerMiranda3400 _mirandaSpeaker;
+	SpeakerWebbster3400 _webbsterSpeaker;
+	SpeakerTeal3400 _tealSpeaker;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	SceneActor _actor6;
+	SceneActor _actor7;
+	SceneActor _actor8;
+	SequenceManager _sequenceManager;
+	int16 _field157C;
+
+	Scene3400();
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void synchronize(Serializer &s);
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index b63409e387..edcf340e04 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1602,5 +1602,318 @@ void SpeakerMiranda3255::proc15() {
 	}
 }
 
+SpeakerQuinn3400::SpeakerQuinn3400() {
+	_speakerName = "QUINN";
+	_color1 = 60;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+void SpeakerQuinn3400::proc15() {
+	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 1) 
+			_object2 = &R2_GLOBALS._player;
+		else if (R2_GLOBALS._player._characterIndex == 2) 
+			_object2 = &scene->_actor1;
+		else
+			_object2 = &scene->_actor2;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		R2_GLOBALS._player.disableControl();
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4010, 5, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4010, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 3:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4012, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
+SpeakerSeeker3400::SpeakerSeeker3400() {
+	_speakerName = "SEEKER";
+	_color1 = 35;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerSeeker3400::proc15() {
+	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 2) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor1;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4031, 1, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4031, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 3:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4030, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 4:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4031, 7, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 5:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4033, 1, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
+SpeakerMiranda3400::SpeakerMiranda3400() {
+	_speakerName = "MIRANDA";
+	_color1 = 154;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerMiranda3400::proc15() {
+	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 3) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor2;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4051, 5, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4050, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
+SpeakerWebbster3400::SpeakerWebbster3400() {
+	_speakerName = "WEBBSTER";
+	_color1 = 27;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerWebbster3400::proc15() {
+	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &scene->_actor3;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4110, 5, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4110, 7, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 3:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4110, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
+SpeakerTeal3400::SpeakerTeal3400() {
+	_speakerName = "TEAL";
+	_color1 = 22;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerTeal3400::proc15() {
+	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &scene->_actor4;
+		_object2->hide();
+		_object1.postInit();
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+	_object1.setPosition(_object2->_position);
+	_object1.show();
+
+	if (scene ->_sceneMode == 3305) {
+		R2_GLOBALS._player.setStrip(6);
+		scene->_actor1.setStrip(6);
+		scene->_actor2.setStrip(6);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4107, 5, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4107, 1, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 3:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4107, 7, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 4:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4107, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index dba402b64a..f85b412f9c 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -388,6 +388,46 @@ public:
 	virtual Common::String getClassName() { return "SpeakerMiranda3255"; }
 	virtual void proc15();
 };
+
+class SpeakerQuinn3400 : public VisualSpeaker {
+public:
+	SpeakerQuinn3400();
+
+	virtual Common::String getClassName() { return "SpeakerQuinn3400"; }
+	virtual void proc15();
+};
+
+class SpeakerSeeker3400 : public VisualSpeaker {
+public:
+	SpeakerSeeker3400();
+
+	virtual Common::String getClassName() { return "SpeakerSeeker3400"; }
+	virtual void proc15();
+};
+
+class SpeakerMiranda3400 : public VisualSpeaker {
+public:
+	SpeakerMiranda3400();
+
+	virtual Common::String getClassName() { return "SpeakerMiranda3400"; }
+	virtual void proc15();
+};
+
+class SpeakerWebbster3400 : public VisualSpeaker {
+public:
+	SpeakerWebbster3400();
+
+	virtual Common::String getClassName() { return "SpeakerWebbster3400"; }
+	virtual void proc15();
+};
+
+class SpeakerTeal3400 : public VisualSpeaker {
+public:
+	SpeakerTeal3400();
+
+	virtual Common::String getClassName() { return "SpeakerTeal3400"; }
+	virtual void proc15();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From d015f5d4465b971a2dc99d51a7e4c11cb23103a7 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 26 Dec 2011 00:58:37 +0100
Subject: DREAMWEB: Remove some dead code

---
 engines/dreamweb/object.cpp   | 12 ++----------
 engines/dreamweb/sound.cpp    |  8 --------
 engines/dreamweb/stubs.cpp    |  8 --------
 engines/dreamweb/stubs.h      | 29 -----------------------------
 engines/dreamweb/titles.cpp   |  2 +-
 engines/dreamweb/vgagrafx.cpp | 14 --------------
 6 files changed, 3 insertions(+), 70 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 84829bf440..0a278d11ee 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -58,10 +58,6 @@ void DreamBase::fillRyan() {
 	showRyanPage();
 }
 
-void DreamGenContext::isItWorn() {
-	flags._z = isItWorn((const DynObject *)es.ptr(bx, sizeof(DynObject)));
-}
-
 bool DreamBase::isItWorn(const DynObject *object) {
 	return (object->id[0] == 'W'-'A') && (object->id[1] == 'E'-'A');
 }
@@ -604,7 +600,7 @@ void DreamGenContext::inToInv() {
 	readMouse();
 	showPointer();
 	outOfInv();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 }
 
@@ -645,7 +641,7 @@ void DreamGenContext::outOfInv() {
 	readMouse();
 	showPointer();
 	inToInv();
-	workToScreen();
+	workToScreenCPP();
 	delPointer();
 }
 
@@ -780,10 +776,6 @@ void DreamBase::dropObject() {
 	object->currentLocation = data.byte(kReallocation);
 }
 
-void DreamGenContext::checkObjectSize() {
-	al = checkObjectSizeCPP() ? 0 : 1;
-}
-
 bool DreamGenContext::checkObjectSizeCPP() {
 	byte containerSize = getOpenedSlotSize();
 	DynObject *object = getEitherAdCPP();
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index 784a6d0d11..4683f333c9 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -30,10 +30,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::loadSpeech() {
-	loadSpeech((uint8)dl, (uint8)dh, (uint8)cl, (uint16)ax);
-}
-
 bool DreamBase::loadSpeech(byte type1, int idx1, byte type2, int idx2) {
 	cancelCh1();
 
@@ -87,10 +83,6 @@ void DreamBase::playChannel1(uint8 index) {
 	data.word(kCh1blockstocopy) = soundBank[index].blockCount();
 }
 
-void DreamGenContext::playChannel1() {
-	playChannel1(al);
-}
-
 void DreamBase::cancelCh0() {
 	data.byte(kCh0repeat) = 0;
 	data.word(kCh0blockstocopy) = 0;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 3425ad400f..b2490c0364 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1235,10 +1235,6 @@ void DreamBase::copyName(uint8 type, uint8 index, uint8 *dst) {
 	dst[i] = 0;
 }
 
-void DreamGenContext::commandWithOb() {
-	commandWithOb(al, bh, bl);
-}
-
 void DreamBase::commandWithOb(uint8 command, uint8 type, uint8 index) {
 	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
 	delTextLine();
@@ -1752,10 +1748,6 @@ bool DreamGenContext::checkIfSet(uint8 x, uint8 y) {
 	return false;
 }
 
-void DreamGenContext::hangOn() {
-	hangOn(cx);
-}
-
 void DreamBase::hangOn(uint16 frameCount) {
 	while (frameCount) {
 		vSync();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 62259a16a5..9e547837c7 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -24,7 +24,6 @@
 
 	void screenUpdate();
 	void startup1();
-	void workToScreen();
 	void multiGet();
 	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height) {
 		DreamBase::multiGet(dst, x, y, width, height);
@@ -48,21 +47,10 @@
 	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 		return DreamBase::printDirect(string, x, y, maxWidth, centered);
 	}
-	void showFrame();
-	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
-		DreamBase::showFrame(frameData, x, y, frameNumber, effectsFlag, width, height);
-	}
-	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag) {
-		DreamBase::showFrame(frameData, x, y, frameNumber, effectsFlag);
-	}
 	void width160();
 	bool checkIfPerson(uint8 x, uint8 y);
 	bool checkIfFree(uint8 x, uint8 y);
 	bool checkIfEx(uint8 x, uint8 y);
-	void commandWithOb();
-	void commandWithOb(uint8 command, uint8 type, uint8 index) {
-		DreamBase::commandWithOb(command, type, index);
-	}
 	DynObject *getFreeAd(uint8 index) {
 		return DreamBase::getFreeAd(index);
 	}
@@ -80,19 +68,11 @@
 
 	void getExPos();
 	bool checkIfSet(uint8 x, uint8 y);
-	void isItWorn();
-	bool isItWorn(const DynObject *object) {
-		return DreamBase::isItWorn(object);
-	}
 	void obToInv();
 	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 		DreamBase::obToInv(index, flag, x, y);
 	}
 	void useRoutine();
-	void hangOn();
-	void hangOn(uint16 frameCount) {
-		DreamBase::hangOn(frameCount);
-	}
 	void examineOb(bool examineAgain = true);
 	void dumpWatch();
 	void transferText();
@@ -115,10 +95,6 @@
 	void monMessage(uint8 index) {
 		DreamBase::monMessage(index);
 	}
-	void playChannel1();
-	void playChannel1(uint8 index) {
-		DreamBase::playChannel1(index);
-	}
 	void look();
 	void autoLook();
 	void doLook();
@@ -148,10 +124,6 @@
 	void errorMessage1();
 	void errorMessage2();
 	void errorMessage3();
-	void loadSpeech();
-	bool loadSpeech(byte type1, int idx1, byte type2, int idx2) {
-		return DreamBase::loadSpeech(type1, idx1, type2, idx2);
-	}
 	void set16ColPalette();
 	void afterNewRoom();
 	void madmanRun();
@@ -169,7 +141,6 @@
 	void getOpenedSize();
 	byte getOpenedSlotSize();
 	byte getOpenedSlotCount();
-	void checkObjectSize();
 	bool checkObjectSizeCPP();
 	void openOb();
 	uint8 findFirstPath(uint16 param);
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index b653c2cf27..f116a90b6a 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -43,7 +43,7 @@ void DreamGenContext::monkSpeaking() {
 	loadIntoTemp("DREAMWEB.G15");
 	clearWork();
 	showFrame(tempGraphics(), 160, 72, 0, 128);	// show monk
-	workToScreen();
+	workToScreenCPP();
 	data.byte(kVolume) = 7;
 	data.byte(kVolumedirection) = (byte)-1;
 	data.byte(kVolumeto) = 5;
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 87ab998553..1c39021420 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -90,13 +90,6 @@ void DreamBase::workToScreenCPP() {
 	engine->blit(workspace(), 320, 0, 0, 320, 200);
 }
 
-void DreamGenContext::workToScreen() {
-	workToScreenCPP();
-	uint size = 320 * 200;
-	di = si = size;
-	cx = 0;
-}
-
 void DreamBase::printUnderMon() {
 	engine->printUnderMonitor();
 }
@@ -360,13 +353,6 @@ void DreamBase::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 fra
 	return;
 }
 
-void DreamGenContext::showFrame() {
-	uint8 width, height;
-	showFrame((Frame *)ds.ptr(0, 0), di, bx, ax & 0x1ff, ah & 0xfe, &width, &height);
-	cl = width;
-	ch = height;
-}
-
 void DreamBase::clearWork() {
 	memset(workspace(), 0, 320*200);
 }
-- 
cgit v1.2.3


From 04a147921f1259e8874c7f9b723e8b3a8158f8c8 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 26 Dec 2011 00:59:04 +0100
Subject: DREAMWEB: Rename workToScreenCPP to workToScreen

---
 engines/dreamweb/dreambase.h  |  2 +-
 engines/dreamweb/keypad.cpp   |  2 +-
 engines/dreamweb/monitor.cpp  |  6 +++---
 engines/dreamweb/newplace.cpp |  6 +++---
 engines/dreamweb/object.cpp   | 18 +++++++++---------
 engines/dreamweb/people.cpp   |  2 +-
 engines/dreamweb/saveload.cpp |  8 ++++----
 engines/dreamweb/stubs.cpp    | 30 +++++++++++++++---------------
 engines/dreamweb/talk.cpp     |  4 ++--
 engines/dreamweb/titles.cpp   |  4 ++--
 engines/dreamweb/use.cpp      |  4 ++--
 engines/dreamweb/vgagrafx.cpp |  2 +-
 12 files changed, 44 insertions(+), 44 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 0dc4e52d86..0438defc05 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -692,7 +692,7 @@ public:
 	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height);
 	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height);
 	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height);
-	void workToScreenCPP();
+	void workToScreen();
 	void printUnderMon();
 	void cls();
 	void frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 29f31f1bd0..878fbda5bf 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -118,7 +118,7 @@ void DreamBase::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3
 	showKeypad();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 	data.word(kPresspointer) = 0;
 	data.byte(kGetback) = 0;
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 3ee68e897c..4627597ab0 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -61,7 +61,7 @@ void DreamGenContext::useMon() {
 	printOuterMon();
 	initialMonCols();
 	printLogo();
-	workToScreenCPP();
+	workToScreen();
 	turnOnPower();
 	fadeUpYellows();
 	fadeUpMonFirst();
@@ -174,7 +174,7 @@ void DreamBase::monitorLogo() {
 		//fadeDownMon(); // FIXME: Commented out in ASM
 		printLogo();
 		printUnderMon();
-		workToScreenCPP();
+		workToScreen();
 		printLogo();
 		//fadeUpMon(); // FIXME: Commented out in ASM
 		printLogo();
@@ -291,7 +291,7 @@ void DreamBase::delCurs() {
 void DreamBase::scrollMonitor() {
 	printLogo();
 	printUnderMon();
-	workToScreenCPP();
+	workToScreen();
 	playChannel1(25);
 }
 
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 4942804369..03824aa706 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -54,7 +54,7 @@ void DreamBase::selectLocation() {
 	readMouse();
 	data.byte(kPointerframe) = 0;
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	playChannel0(9, 255);
 	data.byte(kNewlocation) = 255;
 
@@ -189,7 +189,7 @@ void DreamBase::nextDest() {
 	underTextLine();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -218,7 +218,7 @@ void DreamBase::lastDest() {
 	underTextLine();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 0a278d11ee..8c26956681 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -147,7 +147,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 			data.byte(kCommandtype) = 255;
 			readMouse();
 			showPointer();
-			workToScreenCPP();
+			workToScreen();
 			delPointer();
 			examineAgain = false;
 		}
@@ -251,7 +251,7 @@ void DreamGenContext::inventory() {
 	openInv();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 	data.byte(kOpenedob) = 255;
 	examineOb(false);
@@ -600,7 +600,7 @@ void DreamGenContext::inToInv() {
 	readMouse();
 	showPointer();
 	outOfInv();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -641,7 +641,7 @@ void DreamGenContext::outOfInv() {
 	readMouse();
 	showPointer();
 	inToInv();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -834,7 +834,7 @@ void DreamGenContext::selectOpenOb() {
 	underTextLine();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -885,7 +885,7 @@ void DreamGenContext::swapWithInv() {
 	fillRyan();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -952,7 +952,7 @@ void DreamGenContext::useOpened() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -1010,7 +1010,7 @@ void DreamGenContext::outOfOpen() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -1080,7 +1080,7 @@ void DreamGenContext::swapWithOpen() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 32fbbc04e5..83eb10765b 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -921,7 +921,7 @@ void DreamBase::mugger(ReelRoutine &routine) {
 		const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
 		uint16 y = 104;
 		printDirect(&string, 33 + 20, &y, 241, 241 & 1);
-		workToScreenCPP();
+		workToScreen();
 		hangOn(300);
 		routine.setReelPointer(140);
 		data.byte(kManspath) = 2;
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 53c2f55d38..2076a349b5 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -133,7 +133,7 @@ void DreamBase::doLoad(int savegameId) {
 	data.word(kTextaddressy) = 182;
 	data.byte(kTextlen) = 240;
 	startup();
-	workToScreenCPP();
+	workToScreen();
 	data.byte(kGetback) = 4;
 }
 
@@ -220,7 +220,7 @@ void DreamBase::saveGame() {
 		data.word(kTextaddressy) = 182;
 		data.byte(kTextlen) = 240;
 		redrawMainScrn();
-		workToScreenCPP();	// show the main screen without the mouse pointer
+		workToScreen();	// show the main screen without the mouse pointer
 
 		// We need to save after the scene has been redrawn, to capture the
 		// correct screen thumbnail
@@ -265,7 +265,7 @@ void DreamBase::doSaveLoad() {
 	loadSaveBox();
 	showOpBox();
 	showMainOps();
-	workToScreenCPP();
+	workToScreen();
 
 	RectWithCallback<DreamGenContext> opsList[] = {
 		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamBase::getBackFromOps },
@@ -745,7 +745,7 @@ void DreamBase::selectSlot() {
 		showSaveOps();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index b2490c0364..0026d63204 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -508,7 +508,7 @@ void DreamGenContext::dreamweb() {
 			clearPalette();
 
 			doLoad(savegameId);
-			workToScreenCPP();
+			workToScreen();
 			fadeScreenUp();
 			startNewGame = false;
 
@@ -728,7 +728,7 @@ void DreamGenContext::startup1() {
 
 	startup();
 
-	workToScreenCPP();
+	workToScreen();
 	fadeScreenUp();
 }
 
@@ -849,10 +849,10 @@ void DreamGenContext::triggerMessage(uint16 index) {
 	uint16 y = 156;
 	printDirect(&string, 174, &y, 141, true);
 	hangOn(140);
-	workToScreenCPP();
+	workToScreen();
 	hangOn(340);
 	multiPut(mapStore(), 174, 153, 200, 63);
-	workToScreenCPP();
+	workToScreen();
 	data.byte(kLasttrigger) = 0;
 }
 
@@ -2490,7 +2490,7 @@ void DreamBase::workToScreenM() {
 	readMouse();
 	showPointer();
 	vSync();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -2768,7 +2768,7 @@ void DreamGenContext::afterIntroRoom() {
 	reelsOnScreen();
 	spriteUpdate();
 	printSprites();
-	workToScreenCPP();
+	workToScreen();
 	data.byte(kNowinnewroom) = 0;
 }
 
@@ -2877,7 +2877,7 @@ void DreamGenContext::errorMessage1() {
 	printMessage(76, 21, 58, 240, (240 & 1));
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 	hangOnP(50);
 	showPanel();
@@ -2886,7 +2886,7 @@ void DreamGenContext::errorMessage1() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -2896,7 +2896,7 @@ void DreamGenContext::errorMessage2() {
 	printMessage(76, 21, 59, 240, (240 & 1));
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 	hangOnP(50);
 	showPanel();
@@ -2905,7 +2905,7 @@ void DreamGenContext::errorMessage2() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -2920,7 +2920,7 @@ void DreamGenContext::errorMessage3() {
 	readMouse();
 	useOpened();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -2940,7 +2940,7 @@ void DreamBase::putBackObStuff() {
 	data.byte(kCommandtype) = 255;
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
@@ -3125,7 +3125,7 @@ void DreamGenContext::decide() {
 	data.byte(kManisoffscreen) = 1;
 	loadSaveBox();
 	showDecisions();
-	workToScreenCPP();
+	workToScreen();
 	fadeScreenUp();
 	data.byte(kGetback) = 0;
 
@@ -3184,7 +3184,7 @@ void DreamGenContext::showGun() {
 	createPanel2();
 	showFrame(tempGraphics(), 100, 4, 0, 0);
 	showFrame(tempGraphics(), 158, 106, 1, 0);
-	workToScreenCPP();
+	workToScreen();
 	getRidOfTemp();
 	fadeScreenUp();
 	hangOn(160);
@@ -3688,7 +3688,7 @@ void DreamBase::incRyanPage() {
 	fillRyan();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 
 }
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 131e164cf6..a73a5091c0 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -38,7 +38,7 @@ void DreamBase::talk() {
 	data.byte(kCommandtype) = 255;
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 
 	RectWithCallback<DreamGenContext> talkList[] = {
 		{ 273,320,157,198,&DreamBase::getBack1 },
@@ -259,7 +259,7 @@ void DreamBase::redes() {
 	startTalk();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 }
 
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index f116a90b6a..dd8b3550cf 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -43,7 +43,7 @@ void DreamGenContext::monkSpeaking() {
 	loadIntoTemp("DREAMWEB.G15");
 	clearWork();
 	showFrame(tempGraphics(), 160, 72, 0, 128);	// show monk
-	workToScreenCPP();
+	workToScreen();
 	data.byte(kVolume) = 7;
 	data.byte(kVolumedirection) = (byte)-1;
 	data.byte(kVolumeto) = 5;
@@ -260,7 +260,7 @@ void DreamGenContext::loadIntroRoom() {
 	reelsOnScreen();
 	spriteUpdate();
 	printSprites();
-	workToScreenCPP();
+	workToScreen();
 }
 
 void DreamGenContext::set16ColPalette() {
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 78dffc99ad..8aa735d84f 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1267,7 +1267,7 @@ void DreamBase::useDiary() {
 	showDiaryPage();
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 	data.byte(kGetback) = 0;
 
@@ -1586,7 +1586,7 @@ void DreamBase::withWhat() {
 	data.byte(kCommandtype) = 255;
 	readMouse();
 	showPointer();
-	workToScreenCPP();
+	workToScreen();
 	delPointer();
 	data.byte(kInvopen) = 2;
 }
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 1c39021420..ce89711f87 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -86,7 +86,7 @@ void DreamBase::multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
 	engine->blit(workspace() + offset, kScreenwidth, x, y, width, height);
 }
 
-void DreamBase::workToScreenCPP() {
+void DreamBase::workToScreen() {
 	engine->blit(workspace(), 320, 0, 0, 320, 200);
 }
 
-- 
cgit v1.2.3


From dbe5b50cd34362bc3a6743be6eac0e4840353a47 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 26 Dec 2011 01:36:29 +0100
Subject: DREAMWEB: Port rollEm() to C++

---
 engines/dreamweb/dreambase.h  |  5 +++
 engines/dreamweb/dreamgen.cpp | 94 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/sprite.cpp   |  2 +
 engines/dreamweb/stubs.h      |  3 --
 engines/dreamweb/titles.cpp   |  6 +--
 engines/dreamweb/vgafades.cpp | 47 +++++++++++++++++++++-
 7 files changed, 54 insertions(+), 104 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 0438defc05..3bc2757ac8 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -563,6 +563,9 @@ public:
 	bool hangOnPQ();
 	void redes();
 
+	// from titles.cpp
+	void hangOne(uint16 delay);
+
 	// from use.cpp
 	void placeFreeObject(uint8 index);
 	void removeFreeObject(uint8 index);
@@ -710,6 +713,8 @@ public:
 	void createPanel();
 	void createPanel2();
 	void showPanel();
+	void rollEndCredits2();
+	void rollEm();
 };
 
 
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index e92291178c..fcf8dc6727 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -73,100 +73,6 @@ void DreamGenContext::transferMap() {
 	_add(data.word(kExframepos), cx);
 }
 
-void DreamGenContext::rollEm() {
-	STACK_CHECK;
-	cl = 160;
-	ch = 160;
-	di = 25;
-	bx = 20;
-	ds = data.word(kMapstore);
-	si = 0;
-	multiGet();
-	es = data.word(kTextfile1);
-	si = 49*2;
-	ax = es.word(si);
-	si = ax;
-	_add(si, (66*2));
-	cx = 80;
-endcredits21:
-	push(cx);
-	bx = 10;
-	cx = data.word(kLinespacing);
-endcredits22:
-	push(cx);
-	push(si);
-	push(di);
-	push(es);
-	push(bx);
-	vSync();
-	cl = 160;
-	ch = 160;
-	di = 25;
-	bx = 20;
-	ds = data.word(kMapstore);
-	si = 0;
-	multiPut();
-	vSync();
-	bx = pop();
-	es = pop();
-	di = pop();
-	si = pop();
-	push(si);
-	push(di);
-	push(es);
-	push(bx);
-	cx = 18;
-onelot2:
-	push(cx);
-	di = 25;
-	dx = 161;
-	ax = 0;
-	printDirect();
-	_add(bx, data.word(kLinespacing));
-	cx = pop();
-	if (--cx)
-		goto onelot2;
-	vSync();
-	cl = 160;
-	ch = 160;
-	di = 25;
-	bx = 20;
-	multiDump();
-	bx = pop();
-	es = pop();
-	di = pop();
-	si = pop();
-	cx = pop();
-	_cmp(data.byte(kLasthardkey), 1);
-	if (flags.z())
-		goto endearly2;
-	_dec(bx);
-	if (--cx)
-		goto endcredits22;
-	cx = pop();
-looknext2:
-	al = es.byte(si);
-	_inc(si);
-	_cmp(al, ':');
-	if (flags.z())
-		goto gotnext2;
-	_cmp(al, 0);
-	if (flags.z())
-		goto gotnext2;
-	goto looknext2;
-gotnext2:
-	_cmp(data.byte(kLasthardkey), 1);
-	if (flags.z())
-		return /* (endearly) */;
-	if (--cx)
-		goto endcredits21;
-	cx = 120;
-	hangOne();
-	return;
-endearly2:
-	cx = pop();
-}
-
 void DreamGenContext::fillOpen() {
 	STACK_CHECK;
 	delTextLine();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 4d6946e8ab..40046c4379 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -460,7 +460,6 @@ public:
 	void pickupConts();
 	void transferMap();
 	void getSetAd();
-	void rollEm();
 	void findAllOpen();
 	void fillOpen();
 	void dreamweb();
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index c9ea699988..72be878e14 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -706,6 +706,8 @@ void DreamBase::intro3Text(uint16 nextReelPointer) {
 }
 
 void DreamBase::rollEndCredits() {
+	// Note: This function is very similar to rollEm() in vgafades.cpp
+
 	playChannel0(16, 255);
 	data.byte(kVolume) = 7;
 	data.byte(kVolumeto) = 0;
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 9e547837c7..9e1649dcaa 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -107,8 +107,6 @@
 	void inventory();
 	void mainScreen();
 	void zoomOnOff();
-	void hangOne(uint16 delay);
-	void hangOne();
 	void bibleQuote();
 	void realCredits();
 	void runIntroSeq();
@@ -131,7 +129,6 @@
 	void showGun();
 	void endGame();
 	void monkSpeaking();
-	void rollEndCredits2();
 	void triggerMessage(uint16 index);
 	void processTrigger();
 	void updateSymbolTop();
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index dd8b3550cf..f3dafa38d9 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -110,7 +110,7 @@ void DreamGenContext::bibleQuote() {
 	data.byte(kLasthardkey) = 0;
 }
 
-void DreamGenContext::hangOne(uint16 delay) {
+void DreamBase::hangOne(uint16 delay) {
 	do {
 		vSync();
 		if (data.byte(kLasthardkey) == 1)
@@ -118,10 +118,6 @@ void DreamGenContext::hangOne(uint16 delay) {
 	} while	(--delay);
 }
 
-void DreamGenContext::hangOne() {
-	hangOne(cx);
-}
-
 void DreamGenContext::intro() {
 	loadTempText("DREAMWEB.T82");
 	loadPalFromIFF();
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index 80f5ce608a..23a8655fa1 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -281,8 +281,53 @@ void DreamBase::dumpCurrent() {
 	engine->setPalette(pal, 128, 128);
 }
 
-void DreamGenContext::rollEndCredits2() {
+void DreamBase::rollEndCredits2() {
 	rollEm();
 }
 
+void DreamBase::rollEm() {
+	// Note: This function is very similar to rollEndCredits() in sprite.cpp
+
+	multiGet(mapStore(), 25, 20, 160, 160);
+
+	const uint8 *string = getTextInFile1(49);
+	const int linespacing = data.word(kLinespacing);
+
+	for (int i = 0; i < 80; ++i) {
+		// Output the text, initially with an offset of 10 pixels,
+		// then move it up one pixel until we shifted it by a complete
+		// line of text.
+		for (int j = 0; j < linespacing; ++j) {
+			vSync();
+			multiPut(mapStore(), 25, 20, 160, 160);
+			vSync();
+
+			// Output up to 18 lines of text
+			uint16 y = 10 - j;
+			const uint8 *tmp_str = string;
+			for (int k = 0; k < 18; ++k) {
+				DreamBase::printDirect(&tmp_str, 25, &y, 160 + 1, true);
+				y += linespacing;
+			}
+
+			vSync();
+			multiDump(25, 20, 160, 160);
+
+			if (data.byte(kLasthardkey) == 1)
+				return;
+		}
+
+		// Skip to the next text line
+		byte c;
+		do {
+			c = *string++;
+		} while (c != ':' && c != 0);
+
+		if (data.byte(kLasthardkey) == 1)
+			return;
+	}
+
+	hangOne(120);
+}
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From a4643a0484fe1f54a2cc60ad146cf459012bd0f1 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 26 Dec 2011 01:41:15 +0100
Subject: DREAMWEB: Move titles.cpp to DreamBase

---
 engines/dreamweb/dreambase.h | 12 ++++++++++++
 engines/dreamweb/stubs.cpp   |  4 ++--
 engines/dreamweb/stubs.h     | 12 ------------
 engines/dreamweb/titles.cpp  | 20 ++++++++++----------
 4 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 3bc2757ac8..2f9a9e82c4 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -564,7 +564,17 @@ public:
 	void redes();
 
 	// from titles.cpp
+	void endGame();
+	void monkSpeaking();
+	void gettingShot();
+	void bibleQuote();
 	void hangOne(uint16 delay);
+	void intro();
+	void runIntroSeq();
+	void runEndSeq();
+	void loadIntroRoom();
+	void set16ColPalette();
+	void realCredits();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
@@ -655,6 +665,8 @@ public:
 	void useTrainer();
 	void useStereo();
 	void chewy();
+	void delEverything();
+	void afterIntroRoom();
 
 	// from vgafades.cpp
 	void clearStartPal();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 0026d63204..f21927c57d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2757,7 +2757,7 @@ void DreamGenContext::walkIntoRoom() {
 	}
 }
 
-void DreamGenContext::afterIntroRoom() {
+void DreamBase::afterIntroRoom() {
 	if (data.byte(kNowinnewroom) == 0)
 		return; // notnewintro
 
@@ -2861,7 +2861,7 @@ void DreamBase::describeOb() {
 	}
 }
 
-void DreamGenContext::delEverything() {
+void DreamBase::delEverything() {
 	if (data.byte(kMapysize) + data.word(kMapoffsety) < 182) {
 		mapToPanel();
 	} else {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 9e1649dcaa..dd6cd37f8c 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -107,33 +107,21 @@
 	void inventory();
 	void mainScreen();
 	void zoomOnOff();
-	void bibleQuote();
-	void realCredits();
-	void runIntroSeq();
-	void intro();
 	void pickupOb(uint8 command, uint8 pos);
 	void initialInv();
 	void walkIntoRoom();
-	void loadIntroRoom();
-	void afterIntroRoom();
-	void gettingShot();
 	void allPointer();
-	void delEverything();
 	void errorMessage1();
 	void errorMessage2();
 	void errorMessage3();
-	void set16ColPalette();
 	void afterNewRoom();
 	void madmanRun();
 	void decide();
 	void showGun();
-	void endGame();
-	void monkSpeaking();
 	void triggerMessage(uint16 index);
 	void processTrigger();
 	void updateSymbolTop();
 	void updateSymbolBot();
-	void runEndSeq();
 	bool execCommand();
 	void getOpenedSize();
 	byte getOpenedSlotSize();
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index f3dafa38d9..a521036202 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -25,7 +25,7 @@
 
 namespace DreamGen {
 
-void DreamGenContext::endGame() {
+void DreamBase::endGame() {
 	loadTempText("DREAMWEB.T83");
 	monkSpeaking();
 	gettingShot();
@@ -35,7 +35,7 @@ void DreamGenContext::endGame() {
 	hangOn(200);
 }
 
-void DreamGenContext::monkSpeaking() {
+void DreamBase::monkSpeaking() {
 	// FIXME: This is the CD version only.
 
 	data.byte(kRoomssample) = 35;
@@ -68,7 +68,7 @@ void DreamGenContext::monkSpeaking() {
 	getRidOfTemp();
 }
 
-void DreamGenContext::gettingShot() {
+void DreamBase::gettingShot() {
 	data.byte(kNewlocation) = 55;
 	clearPalette();
 	loadIntroRoom();
@@ -79,7 +79,7 @@ void DreamGenContext::gettingShot() {
 	clearBeforeLoad();
 }
 
-void DreamGenContext::bibleQuote() {
+void DreamBase::bibleQuote() {
 	initGraphics(640, 480, true);
 
 	showPCX("DREAMWEB.I00");
@@ -118,7 +118,7 @@ void DreamBase::hangOne(uint16 delay) {
 	} while	(--delay);
 }
 
-void DreamGenContext::intro() {
+void DreamBase::intro() {
 	loadTempText("DREAMWEB.T82");
 	loadPalFromIFF();
 	setMode();
@@ -174,7 +174,7 @@ void DreamGenContext::intro() {
 	data.byte(kLasthardkey) =  0;
 }
 
-void DreamGenContext::runIntroSeq() {
+void DreamBase::runIntroSeq() {
 	data.byte(kGetback) = 0;
 
 	do {
@@ -220,7 +220,7 @@ void DreamGenContext::runIntroSeq() {
 	//clearBeforeLoad();
 }
 
-void DreamGenContext::runEndSeq() {
+void DreamBase::runEndSeq() {
 	atmospheres();
 	data.byte(kGetback) = 0;
 
@@ -240,7 +240,7 @@ void DreamGenContext::runEndSeq() {
 	} while (data.byte(kGetback) != 1);
 }
 
-void DreamGenContext::loadIntroRoom() {
+void DreamBase::loadIntroRoom() {
 	data.byte(kIntrocount) = 0;
 	data.byte(kLocation) = 255;
 	loadRoom();
@@ -259,10 +259,10 @@ void DreamGenContext::loadIntroRoom() {
 	workToScreen();
 }
 
-void DreamGenContext::set16ColPalette() {
+void DreamBase::set16ColPalette() {
 }
 
-void DreamGenContext::realCredits() {
+void DreamBase::realCredits() {
 	data.byte(kRoomssample) = 33;
 	loadRoomsSample();
 	data.byte(kVolume) = 0;
-- 
cgit v1.2.3


From 7945a0fbb0ee3ec89d2b4e51d130f47b9717bfd3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 02:50:02 +0200
Subject: DREAMWEB: Cleaned up findFirstPath(), fixed a regression and moved it
 to DreamBase

---
 engines/dreamweb/dreambase.h  |  1 +
 engines/dreamweb/object.cpp   | 28 +---------------------------
 engines/dreamweb/pathfind.cpp | 20 ++++++++++++++++++++
 engines/dreamweb/structs.h    |  8 ++++----
 engines/dreamweb/stubs.h      |  1 -
 5 files changed, 26 insertions(+), 32 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 0dc4e52d86..a7b3316dfc 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -220,6 +220,7 @@ public:
 	bool checkIfPathIsOn(uint8 index);
 	void bresenhams();
 	void workoutFrames();
+	byte findFirstPath(byte x, byte y);
 
 	// from people.cpp
 	void setupInitialReelRoutines();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 84829bf440..8e202a0ed0 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -341,32 +341,6 @@ void DreamGenContext::openOb() {
 	_openChangeSize = getOpenedSlotCount() * kItempicsize + kInventx;
 }
 
-uint8 DreamGenContext::findFirstPath(uint16 param) {
-	es = data.word(kReels);
-	uint16 ptr = 144 * data.byte(kRoomnum);
-	// TODO: Replace ax, cx usage with temporary uint8/16 variables...
-	cx = param;
-
-	for (uint8 pathLoop = 0; pathLoop < 12; pathLoop++, ptr += 8) {
-		ax = es.word(ptr+2);
-
-		if (ax == 0x0ffff)
-			continue; // "nofirst"
-
-		if (cl < al || ch < ah)
-			continue; // "nofirst"
-
-		ax = es.word(ptr+4);
-
-		if (cl > al || ch > ah)
-			continue; // "nofirst"
-
-		return es.byte(ptr+6); // "gotfirst"
-	}
-
-	return 0;
-}
-
 void DreamGenContext::identifyOb() {
 	if (data.word(kWatchingtime) != 0) {
 		blank();
@@ -388,7 +362,7 @@ void DreamGenContext::identifyOb() {
 	data.byte(kPointerspath) = dl;
 	ax = pop();
 	push(ax);
-	data.byte(kPointerfirstpath) = findFirstPath(ax);
+	data.byte(kPointerfirstpath) = findFirstPath(al, ah);
 	ax = pop();
 
 	byte x = al;
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index 8d9d9a95bb..20bbf7d67e 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -309,4 +309,24 @@ void DreamBase::workoutFrames() {
 	data.byte(kTurndirection) = 0;
 }
 
+byte DreamBase::findFirstPath(byte x, byte y) {
+	PathNode *paths = (PathNode *)getSegment(data.word(kReels)).ptr(kPathdata + 144 * data.byte(kRoomnum), 0);
+
+	for (uint8 index = 0; index < 12; index++) {
+		if (paths[index].x1 == 0xff && paths[index].y1 == 0xff)
+			continue; // "nofirst"
+
+		if (x < paths[index].x1 || y < paths[index].y1)
+			continue; // "nofirst"
+
+		if (x >= paths[index].x2 || y >= paths[index].y2)
+			continue; // "nofirst"
+
+		return paths[index].on; // "gotfirst"
+	}
+
+	return 0;
+}
+
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index d64bcab5d0..b0a168930b 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -221,10 +221,10 @@ struct Change {
 struct PathNode {
 	uint8 x;
 	uint8 y;
-	uint8 b2;
-	uint8 b3;
-	uint8 b4;
-	uint8 b5;
+	uint8 x1;
+	uint8 y1;
+	uint8 x2;
+	uint8 y2;
 	uint8 on;
 	uint8 dir;
 };
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 62259a16a5..148436e8a8 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -172,7 +172,6 @@
 	void checkObjectSize();
 	bool checkObjectSizeCPP();
 	void openOb();
-	uint8 findFirstPath(uint16 param);
 	void identifyOb();
 	void selectOb();
 	void findInvPos();
-- 
cgit v1.2.3


From d503838fd65db483a764d550cc6cce32984f6381 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 03:15:47 +0200
Subject: DREAMWEB: Moved the two rollEndCredits functions together in
 print.cpp and renamed them to rollEndCreditsGameWon and
 rollEndCreditsGameLost

---
 engines/dreamweb/dreambase.h  |  5 +--
 engines/dreamweb/people.cpp   |  2 +-
 engines/dreamweb/print.cpp    | 87 +++++++++++++++++++++++++++++++++++++++++++
 engines/dreamweb/sprite.cpp   | 46 -----------------------
 engines/dreamweb/stubs.cpp    |  2 +-
 engines/dreamweb/vgafades.cpp | 49 ------------------------
 6 files changed, 91 insertions(+), 100 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 3b4ef7e131..a669e6bc20 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -291,6 +291,8 @@ public:
 	uint16 waitFrames();
 	void printCurs();
 	void delCurs();
+	void rollEndCreditsGameWon();
+	void rollEndCreditsGameLost();
 
 	// from saveload.cpp
 	void loadGame();
@@ -362,7 +364,6 @@ public:
 	void intro2Text(uint16 nextReelPointer);
 	void intro3Text(uint16 nextReelPointer);
 
-	void rollEndCredits();
 	void monks2text();
 	void textForEnd();
 	void textForMonkHelper(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
@@ -726,8 +727,6 @@ public:
 	void createPanel();
 	void createPanel2();
 	void showPanel();
-	void rollEndCredits2();
-	void rollEm();
 };
 
 
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 83eb10765b..a6ebbcc1ec 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -1030,7 +1030,7 @@ void DreamBase::endGameSeq(ReelRoutine &routine) {
 	
 	if (routine.reelPointer() == 145) {
 		routine.setReelPointer(146);
-		rollEndCredits();
+		rollEndCreditsGameWon();
 	}
 }
 
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 0fd596ceac..0191aa8860 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -263,4 +263,91 @@ const char *DreamBase::monPrint(const char *string) {
 	return iterator;
 }
 
+void DreamBase::rollEndCreditsGameWon() {
+	playChannel0(16, 255);
+	data.byte(kVolume) = 7;
+	data.byte(kVolumeto) = 0;
+	data.byte(kVolumedirection) = (byte)-1;
+
+	multiGet(mapStore(), 75, 20, 160, 160);
+
+	const uint8 *string = getTextInFile1(3);
+	const int linespacing = data.word(kLinespacing);
+
+	for (int i = 0; i < 254; ++i) {
+		// Output the text, initially with an offset of 10 pixels,
+		// then move it up one pixel until we shifted it by a complete
+		// line of text.
+		for (int j = 0; j < linespacing; ++j) {
+			vSync();
+			multiPut(mapStore(), 75, 20, 160, 160);
+			vSync();
+
+			// Output up to 18 lines of text
+			uint16 y = 10 - j;
+			const uint8 *tmp_str = string;
+			for (int k = 0; k < 18; ++k) {
+				DreamBase::printDirect(&tmp_str, 75, &y, 160 + 1, true);
+				y += linespacing;
+			}
+
+			vSync();
+			multiDump(75, 20, 160, 160);
+		}
+
+		// Skip to the next text line
+		byte c;
+		do {
+			c = *string++;
+		} while (c != ':' && c != 0);
+	}
+
+	hangOn(100);
+	panelToMap();
+	fadeScreenUpHalf();
+}
+
+void DreamBase::rollEndCreditsGameLost() {
+	multiGet(mapStore(), 25, 20, 160, 160);
+
+	const uint8 *string = getTextInFile1(49);
+	const int linespacing = data.word(kLinespacing);
+
+	for (int i = 0; i < 80; ++i) {
+		// Output the text, initially with an offset of 10 pixels,
+		// then move it up one pixel until we shifted it by a complete
+		// line of text.
+		for (int j = 0; j < linespacing; ++j) {
+			vSync();
+			multiPut(mapStore(), 25, 20, 160, 160);
+			vSync();
+
+			// Output up to 18 lines of text
+			uint16 y = 10 - j;
+			const uint8 *tmp_str = string;
+			for (int k = 0; k < 18; ++k) {
+				DreamBase::printDirect(&tmp_str, 25, &y, 160 + 1, true);
+				y += linespacing;
+			}
+
+			vSync();
+			multiDump(25, 20, 160, 160);
+
+			if (data.byte(kLasthardkey) == 1)
+				return;
+		}
+
+		// Skip to the next text line
+		byte c;
+		do {
+			c = *string++;
+		} while (c != ':' && c != 0);
+
+		if (data.byte(kLasthardkey) == 1)
+			return;
+	}
+
+	hangOne(120);
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 72be878e14..f23804b395 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -705,52 +705,6 @@ void DreamBase::intro3Text(uint16 nextReelPointer) {
 		setupTimedTemp(46, 82, 36, 56, 100, 1);
 }
 
-void DreamBase::rollEndCredits() {
-	// Note: This function is very similar to rollEm() in vgafades.cpp
-
-	playChannel0(16, 255);
-	data.byte(kVolume) = 7;
-	data.byte(kVolumeto) = 0;
-	data.byte(kVolumedirection) = (byte)-1;
-
-	multiGet(mapStore(), 75, 20, 160, 160);
-
-	const uint8 *string = getTextInFile1(3);
-	const int linespacing = data.word(kLinespacing);
-
-	for (int i = 0; i < 254; ++i) {
-		// Output the text, initially with an offset of 10 pixels,
-		// then move it up one pixel until we shifted it by a complete
-		// line of text.
-		for (int j = 0; j < linespacing; ++j) {
-			vSync();
-			multiPut(mapStore(), 75, 20, 160, 160);
-			vSync();
-
-			// Output up to 18 lines of text
-			uint16 y = 10 - j;
-			const uint8 *tmp_str = string;
-			for (int k = 0; k < 18; ++k) {
-				DreamBase::printDirect(&tmp_str, 75, &y, 160 + 1, true);
-				y += linespacing;
-			}
-
-			vSync();
-			multiDump(75, 20, 160, 160);
-		}
-
-		// Skip to the next text line
-		byte c;
-		do {
-			c = *string++;
-		} while (c != ':' && c != 0);
-	}
-	hangOn(100);
-	panelToMap();
-	fadeScreenUpHalf();
-}
-
-
 void DreamBase::monks2text() {
 	bool isGermanCD = isCD() && engine->getLanguage() == Common::DE_DEU;
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index f21927c57d..e8fa1767b8 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3190,7 +3190,7 @@ void DreamGenContext::showGun() {
 	hangOn(160);
 	playChannel0(12, 0);
 	loadTempText("DREAMWEB.T83");
-	rollEndCredits2();
+	rollEndCreditsGameLost();
 	getRidOfTempText();
 }
 
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index 23a8655fa1..3833050003 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -281,53 +281,4 @@ void DreamBase::dumpCurrent() {
 	engine->setPalette(pal, 128, 128);
 }
 
-void DreamBase::rollEndCredits2() {
-	rollEm();
-}
-
-void DreamBase::rollEm() {
-	// Note: This function is very similar to rollEndCredits() in sprite.cpp
-
-	multiGet(mapStore(), 25, 20, 160, 160);
-
-	const uint8 *string = getTextInFile1(49);
-	const int linespacing = data.word(kLinespacing);
-
-	for (int i = 0; i < 80; ++i) {
-		// Output the text, initially with an offset of 10 pixels,
-		// then move it up one pixel until we shifted it by a complete
-		// line of text.
-		for (int j = 0; j < linespacing; ++j) {
-			vSync();
-			multiPut(mapStore(), 25, 20, 160, 160);
-			vSync();
-
-			// Output up to 18 lines of text
-			uint16 y = 10 - j;
-			const uint8 *tmp_str = string;
-			for (int k = 0; k < 18; ++k) {
-				DreamBase::printDirect(&tmp_str, 25, &y, 160 + 1, true);
-				y += linespacing;
-			}
-
-			vSync();
-			multiDump(25, 20, 160, 160);
-
-			if (data.byte(kLasthardkey) == 1)
-				return;
-		}
-
-		// Skip to the next text line
-		byte c;
-		do {
-			c = *string++;
-		} while (c != ':' && c != 0);
-
-		if (data.byte(kLasthardkey) == 1)
-			return;
-	}
-
-	hangOne(120);
-}
-
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 389afc46660918409d69458bfbb096a6ba128f63 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Mon, 26 Dec 2011 05:02:51 +0000
Subject: DREAMWEB: Port 'findpathofpoint' to C++

---
 engines/dreamweb/dreambase.h  |  1 +
 engines/dreamweb/dreamgen.cpp | 44 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/object.cpp   |  3 +--
 engines/dreamweb/pathfind.cpp | 21 +++++++++++++++++++++
 engines/dreamweb/stubs.cpp    |  5 +----
 6 files changed, 24 insertions(+), 51 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index a669e6bc20..cbcfa1e46f 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -221,6 +221,7 @@ public:
 	void bresenhams();
 	void workoutFrames();
 	byte findFirstPath(byte x, byte y);
+	byte findPathOfPoint(byte x, byte y);
 
 	// from people.cpp
 	void setupInitialReelRoutines();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index fcf8dc6727..6c16274e32 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -652,50 +652,6 @@ finishpars:
 	di = offset_operand1;
 }
 
-void DreamGenContext::findPathOfPoint() {
-	STACK_CHECK;
-	push(ax);
-	bx = (0);
-	es = data.word(kReels);
-	al = data.byte(kRoomnum);
-	ah = 0;
-	cx = 144;
-	_mul(cx);
-	_add(bx, ax);
-	cx = pop();
-	dl = 0;
-pathloop:
-	al = es.byte(bx+6);
-	_cmp(al, 255);
-	if (!flags.z())
-		goto flunkedit;
-	ax = es.word(bx+2);
-	_cmp(ax, 0x0ffff);
-	if (flags.z())
-		goto flunkedit;
-	_cmp(cl, al);
-	if (flags.c())
-		goto flunkedit;
-	_cmp(ch, ah);
-	if (flags.c())
-		goto flunkedit;
-	ax = es.word(bx+4);
-	_cmp(cl, al);
-	if (!flags.c())
-		goto flunkedit;
-	_cmp(ch, ah);
-	if (!flags.c())
-		goto flunkedit;
-	return /* (gotvalidpath) */;
-flunkedit:
-	_add(bx, 8);
-	_inc(dl);
-	_cmp(dl, 12);
-	if (!flags.z())
-		goto pathloop;
-	dl = 255;
-}
-
 void DreamGenContext::__start() { 
 	static const uint8 src[] = {
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x13, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 40046c4379..6c5bf1918b 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -463,7 +463,6 @@ public:
 	void findAllOpen();
 	void fillOpen();
 	void dreamweb();
-	void findPathOfPoint();
 	void read();
 	void searchForString();
 	void searchForFiles();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 7864b2aa25..9d5ea15fa3 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -354,8 +354,7 @@ void DreamGenContext::identifyOb() {
 	data.byte(kInmaparea) = 1;
 	ah = bl;
 	push(ax);
-	findPathOfPoint();
-	data.byte(kPointerspath) = dl;
+	data.byte(kPointerspath) = findPathOfPoint(al, ah);
 	ax = pop();
 	push(ax);
 	data.byte(kPointerfirstpath) = findFirstPath(al, ah);
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index 20bbf7d67e..4f887db251 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -328,5 +328,26 @@ byte DreamBase::findFirstPath(byte x, byte y) {
 	return 0;
 }
 
+byte DreamBase::findPathOfPoint(byte x, byte y) {
+	PathNode *paths = (PathNode *)getSegment(data.word(kReels)).ptr(kPathdata + 144 * data.byte(kRoomnum), 0);
+
+	for (uint8 index = 0; index < 12; index++) {
+		if (paths[index].on != 0xff)
+			continue; // "flunkedit"
+
+		if (paths[index].x1 == 0xff && paths[index].y1 == 0xff)
+			continue; // "flunkedit"
+
+		if (x < paths[index].x1 || y < paths[index].y1)
+			continue; // "flunkedit"
+
+		if (x >= paths[index].x2 || y >= paths[index].y2)
+			continue; // "flunkedit"
+
+		return index; // "gotvalidpath"
+	}
+
+	return 0xff;
+}
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index e8fa1767b8..413bd27c85 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3067,10 +3067,7 @@ void DreamGenContext::afterNewRoom() {
 	data.byte(kCommandtype) = 0;
 	findRoomInLoc();
 	if (data.byte(kRyanon) != 1) {
-		al = data.byte(kRyanx) + 12;
-		ah = data.byte(kRyany) + 12;
-		findPathOfPoint();
-		data.byte(kManspath) = dl;
+		data.byte(kManspath) = findPathOfPoint(data.byte(kRyanx) + 12, data.byte(kRyany) + 12);
 		findXYFromPath();
 		data.byte(kResetmanxy) = 1;
 	}
-- 
cgit v1.2.3


From 6f8a4bb336e3a881fabe7eb857a227a6dcd3d026 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Mon, 26 Dec 2011 05:46:01 +0000
Subject: DREAMWEB: Ported 'searchforfiles' to C++

---
 engines/dreamweb/dreamgen.cpp | 16 ----------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/monitor.cpp  | 13 +++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 6c16274e32..66885d7623 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -384,22 +384,6 @@ dirroot:
 	scrollMonitor();
 }
 
-void DreamGenContext::searchForFiles() {
-	STACK_CHECK;
-	bx = (66*2);
-directloop1:
-	al = es.byte(bx);
-	_inc(bx);
-	_cmp(al, '*');
-	if (flags.z())
-		return /* (endofdir) */;
-	_cmp(al, 34);
-	if (!flags.z())
-		goto directloop1;
-	monPrint();
-	goto directloop1;
-}
-
 void DreamGenContext::read() {
 	STACK_CHECK;
 	cx = 40;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 6c5bf1918b..3d98f294ce 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -465,7 +465,6 @@ public:
 	void dreamweb();
 	void read();
 	void searchForString();
-	void searchForFiles();
 	void getExAd();
 	void transferToEx();
 	void parser();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 4627597ab0..f3aad7a496 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -514,4 +514,17 @@ void DreamGenContext::signOn() {
 	}
 }
 
+void DreamGenContext::searchForFiles() {
+	bx = kTextstart;
+
+	while (true) {
+		al = es.byte(bx);
+		bx++;
+		if (al == '*')
+			return; // "endofdir"
+		if (al == 34)
+			monPrint();
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 2ed08f92c9..7301ba9158 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -143,5 +143,6 @@
 	void outOfOpen();
 	void swapWithOpen();
 	void swapWithInv();
+	void searchForFiles();
 
 #endif
-- 
cgit v1.2.3


From 9751d6ded4067f6de5b70aa61d4391b64be9e04c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 26 Dec 2011 07:21:48 +0100
Subject: TSAGE: R2R - Scene 3700: Fix a couple of bugs

Thanks to Fingolfin for pointing those out
---
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index e3d2869634..adcd86e391 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1862,7 +1862,7 @@ void Scene3400::signal() {
 		_actor4.setStrip(1);
 		_sceneMode = 3403;
 		if (R2_GLOBALS._player._characterIndex == 2)
-			setAction(&_sequenceManager, this, 3403, R2_GLOBALS._player, &_actor3, &_actor7, NULL);
+			setAction(&_sequenceManager, this, 3403, &R2_GLOBALS._player, &_actor3, &_actor7, NULL);
 		else 
 			setAction(&_sequenceManager, this, 3403, &_actor1, &_actor3, &_actor7, NULL);
 		break;
@@ -1871,7 +1871,7 @@ void Scene3400::signal() {
 		_actor4.setStrip(1);
 		_sceneMode = 3405;
 		if (R2_GLOBALS._player._characterIndex == 3)
-			setAction(&_sequenceManager, this, 3405, R2_GLOBALS._player, &_actor7, NULL);
+			setAction(&_sequenceManager, this, 3405, &R2_GLOBALS._player, &_actor7, NULL);
 		else 
 			setAction(&_sequenceManager, this, 3405, &_actor2, &_actor7, NULL);
 		break;
-- 
cgit v1.2.3


From 1b11f48a35b299633ad336fa6d9dcb723d16a92f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 13:18:09 +0200
Subject: DREAMWEB: Cleanup identifyOb()

---
 engines/dreamweb/object.cpp | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 9d5ea15fa3..10138acb78 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -343,25 +343,20 @@ void DreamGenContext::identifyOb() {
 		return;
 	}
 
-	ax = data.word(kMousex) - data.word(kMapadx);
-	bx = data.word(kMousey) - data.word(kMapady);
+	uint16 initialX = data.word(kMousex) - data.word(kMapadx);
+	uint16 initialY = data.word(kMousey) - data.word(kMapady);
 
-	if (ax >= 22 * 8 || bx >= 20 * 8) {
+	if (initialX >= 22 * 8 || initialY >= 20 * 8) {
 		blank();
 		return;
 	}
 
+	byte x = initialX & 0xFF;
+	byte y = initialY & 0xFF;
+
 	data.byte(kInmaparea) = 1;
-	ah = bl;
-	push(ax);
-	data.byte(kPointerspath) = findPathOfPoint(al, ah);
-	ax = pop();
-	push(ax);
-	data.byte(kPointerfirstpath) = findFirstPath(al, ah);
-	ax = pop();
-
-	byte x = al;
-	byte y = ah;
+	data.byte(kPointerspath) = findPathOfPoint(x, y);
+	data.byte(kPointerfirstpath) = findFirstPath(x, y);
 
 	if (checkIfEx(x, y) || checkIfFree(x, y) ||
 		checkIfPerson(x, y) || checkIfSet(x, y))
-- 
cgit v1.2.3


From 2ca00bc3c6c2817090372450dbdd835677d3c20e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 13:33:37 +0200
Subject: DREAMWEB: Cleanup searchForFiles()

---
 engines/dreamweb/monitor.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index f3aad7a496..81c0f7e168 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -515,14 +515,15 @@ void DreamGenContext::signOn() {
 }
 
 void DreamGenContext::searchForFiles() {
-	bx = kTextstart;
+	uint16 offset = kTextstart;
+	byte curChar;
 
 	while (true) {
-		al = es.byte(bx);
-		bx++;
-		if (al == '*')
+		curChar = es.byte(offset);
+		offset++;
+		if (curChar == '*')
 			return; // "endofdir"
-		if (al == 34)
+		if (curChar == 34)
 			monPrint();
 	}
 }
-- 
cgit v1.2.3


From d7335d69e351e910f33dbcc3b80a9a5d52bfd4e1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 13:59:20 +0200
Subject: DREAMWEB: Move the roomsCanGo array out of the data blob

---
 engines/dreamweb/dreambase.h  |  2 ++
 engines/dreamweb/dreamgen.cpp |  8 +++-----
 engines/dreamweb/dreamgen.h   | 13 ++++++-------
 engines/dreamweb/newplace.cpp | 14 +++++++++-----
 engines/dreamweb/saveload.cpp |  4 ++--
 engines/dreamweb/stubs.cpp    |  2 +-
 6 files changed, 23 insertions(+), 20 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index cbcfa1e46f..5ac720be89 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -98,6 +98,7 @@ protected:
 	uint8 _underTimedText[kUnderTimedTextBufSize];
 	Common::List<Rain> _rainList;
 	uint8 _initialVars[kLengthOfVars]; // TODO: This shouldn't be necessary
+	uint8 _roomsCanGo[16];
 
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
@@ -177,6 +178,7 @@ public:
 	void showArrows();
 	uint8 getLocation(uint8 index);
 	void setLocation(uint8 index);
+	void clearLocation(uint8 index);
 	void resetLocation(uint8 index);
 	void readCityPic();
 	void readDestIcon();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 66885d7623..2d58aea6c5 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -608,7 +608,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 556;
+	si = 540;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -704,7 +704,7 @@ void DreamGenContext::__start() {
 		//0x01f0: .... .... .D:. ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0200: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0210: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0220: .... .... .... ....
@@ -720,10 +720,8 @@ void DreamGenContext::__start() {
 		//0x0270: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0280: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0290: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
-		//0x02a0: .... .... .... ....
+		//0x0290: .... .... .... ....
 		0xff, 0xff, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 3d98f294ce..3da65cf189 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -345,13 +345,12 @@ static const uint16 kCurrentsample = 419;
 static const uint16 kRoomssample = 420;
 static const uint16 kBasicsample = 421;
 static const uint16 kCurrentfile = 462;
-static const uint16 kRoomscango = 537;
-static const uint16 kOplist = 553;
-static const uint16 kInputline = 556;
-static const uint16 kPresslist = 684;
-static const uint16 kQuitrequested = 690;
-static const uint16 kSubtitles = 691;
-static const uint16 kForeignrelease = 692;
+static const uint16 kOplist = 537;
+static const uint16 kInputline = 540;
+static const uint16 kPresslist = 668;
+static const uint16 kQuitrequested = 674;
+static const uint16 kSubtitles = 675;
+static const uint16 kForeignrelease = 676;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 03824aa706..efcffef82a 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -177,7 +177,7 @@ void DreamBase::nextDest() {
 		data.byte(kDestpos)++;
 		if (data.byte(kDestpos) == 15)
 			data.byte(kDestpos) = 0;	// last destination
-	} while (!data.byte(kRoomscango + data.byte(kDestpos)));
+	} while (!getLocation(data.byte(kDestpos)));
 
 	data.byte(kNewtextline) = 1;
 	delTextLine();
@@ -206,7 +206,7 @@ void DreamBase::lastDest() {
 		data.byte(kDestpos)--;
 		if (data.byte(kDestpos) == 0xFF)
 			data.byte(kDestpos) = 15;	// first destination
-	} while (!data.byte(kRoomscango + data.byte(kDestpos)));
+	} while (!getLocation(data.byte(kDestpos)));
 
 	data.byte(kNewtextline) = 1;
 	delTextLine();
@@ -235,11 +235,15 @@ void DreamBase::destSelect() {
 }
 
 uint8 DreamBase::getLocation(uint8 index) {
-	return data.byte(kRoomscango + index);
+	return _roomsCanGo[index];
 }
 
 void DreamBase::setLocation(uint8 index) {
-	data.byte(kRoomscango + index) = 1;
+	_roomsCanGo[index] = 1;
+}
+
+void DreamBase::clearLocation(uint8 index) {
+	_roomsCanGo[index] = 0;
 }
 
 void DreamBase::resetLocation(uint8 index) {
@@ -264,7 +268,7 @@ void DreamBase::resetLocation(uint8 index) {
 		purgeALocation(29);
 	}
 
-	data.byte(kRoomscango + index) = 0;
+	clearLocation(index);
 }
 
 void DreamBase::readDestIcon() {
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 2076a349b5..4fa8cf33fe 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -483,7 +483,7 @@ void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 
 	// len[4] == 48, which is sizeof(Room) plus 16 for 'Roomscango'
 	outSaveFile->write((const uint8 *)&madeUpRoom, sizeof(Room));
-	outSaveFile->write(data.ptr(kRoomscango, 16), 16);
+	outSaveFile->write(_roomsCanGo, 16);
 
 	// TODO: Convert more to serializer?
 	Common::Serializer s(0, outSaveFile);
@@ -551,7 +551,7 @@ void DreamBase::loadPosition(unsigned int slot) {
 	// Note: the values read into g_madeUpRoomDat are only used in actualLoad,
 	// which is (almost) immediately called after this function
 	inSaveFile->read((uint8 *)&g_madeUpRoomDat, sizeof(Room));
-	inSaveFile->read(data.ptr(kRoomscango, 16), 16);
+	inSaveFile->read(_roomsCanGo, 16);
 
 	// TODO: Use serializer for more
 	Common::Serializer s(inSaveFile, 0);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 413bd27c85..827fb2ee22 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3618,7 +3618,7 @@ void DreamBase::clearChanges() {
 
 	const uint8 initialRoomsCanGo[] = { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-	memcpy(data.ptr(kRoomscango, 16), initialRoomsCanGo, 16);
+	memcpy(_roomsCanGo, initialRoomsCanGo, 16);
 }
 
 void DreamBase::showDiaryKeys() {
-- 
cgit v1.2.3


From 2db59ab3111746df973641bf960b68765671ff22 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 26 Dec 2011 12:58:19 +0100
Subject: DREAMWEB: Move even more use-related functions to DreamBase

---
 engines/dreamweb/dreambase.h |  9 ++++++++-
 engines/dreamweb/stubs.cpp   | 10 +++++-----
 engines/dreamweb/stubs.h     |  5 -----
 engines/dreamweb/use.cpp     |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 5ac720be89..c96604a263 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -61,6 +61,9 @@ class DreamBase : public SegmentManager {
 protected:
 	DreamWeb::DreamWebEngine *engine;
 
+	// from newplace.cpp
+	uint8 _roomsCanGo[16];
+
 	// from object.cpp
 	uint16 _openChangeSize;
 
@@ -98,7 +101,6 @@ protected:
 	uint8 _underTimedText[kUnderTimedTextBufSize];
 	Common::List<Rain> _rainList;
 	uint8 _initialVars[kLengthOfVars]; // TODO: This shouldn't be necessary
-	uint8 _roomsCanGo[16];
 
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
@@ -556,6 +558,11 @@ public:
 	bool finishedWalking();
 	void emergencyPurge();
 	void purgeAnItem();
+	uint8 nextSymbol(uint8 symbol);
+	void enterSymbol();
+	void showSymbol();
+	void updateSymbolTop();
+	void updateSymbolBot();
 
 	// from talk.cpp
 	void talk();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 827fb2ee22..8535b17e2f 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1813,7 +1813,7 @@ uint8 DreamBase::findNextColon(const uint8 **string) {
 	return c;
 }
 
-void DreamGenContext::enterSymbol() {
+void DreamBase::enterSymbol() {
 	data.byte(kManisoffscreen) = 1;
 	getRidOfReels();
 	loadIntoTemp("DREAMWEB.G12"); // symbol graphics
@@ -2611,7 +2611,7 @@ void DreamBase::atmospheres() {
 	cancelCh0();
 }
 
-uint8 DreamGenContext::nextSymbol(uint8 symbol) {
+uint8 DreamBase::nextSymbol(uint8 symbol) {
 	uint8 result = symbol + 1;
 	if (result == 6)
 		return 0;
@@ -2620,7 +2620,7 @@ uint8 DreamGenContext::nextSymbol(uint8 symbol) {
 	return result;
 }
 
-void DreamGenContext::showSymbol() {
+void DreamBase::showSymbol() {
 	showFrame(tempGraphics(), kSymbolx, kSymboly, 12, 0);
 
 	showFrame(tempGraphics(), data.byte(kSymboltopx) + kSymbolx-44, kSymboly+20, data.byte(kSymboltopnum), 32);
@@ -3451,7 +3451,7 @@ void DreamBase::entryAnims() {
 	}
 }
 
-void DreamGenContext::updateSymbolTop() {
+void DreamBase::updateSymbolTop() {
 	if (!data.byte(kSymboltopdir))
 		return; // topfinished
 
@@ -3488,7 +3488,7 @@ void DreamGenContext::updateSymbolTop() {
 	}
 }
 
-void DreamGenContext::updateSymbolBot() {
+void DreamBase::updateSymbolBot() {
 	if (!data.byte(kSymbolbotdir))
 		return; // botfinished
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 7301ba9158..a03dbc2fb6 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -98,12 +98,9 @@
 	void look();
 	void autoLook();
 	void doLook();
-	void enterSymbol();
 	void useKey();
 	void useObject();
 	void singleKey(uint8 key, uint16 x, uint16 y);
-	uint8 nextSymbol(uint8 symbol);
-	void showSymbol();
 	void inventory();
 	void mainScreen();
 	void zoomOnOff();
@@ -120,8 +117,6 @@
 	void showGun();
 	void triggerMessage(uint16 index);
 	void processTrigger();
-	void updateSymbolTop();
-	void updateSymbolBot();
 	bool execCommand();
 	void getOpenedSize();
 	byte getOpenedSlotSize();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 8aa735d84f..24ea58e252 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -99,7 +99,7 @@ void DreamGenContext::useRoutine() {
 		{ &DreamBase::viewFolder,              "PAPR" },
 		{ &DreamBase::useTrainer,              "UWTA" },
 		{ &DreamBase::useTrainer,              "UWTB" },
-		{ &DreamGenContext::enterSymbol,       "STAT" },
+		{ &DreamBase::enterSymbol,             "STAT" },
 		{ &DreamBase::openTomb,                "TLID" },
 		{ &DreamBase::useSlab,                 "SLAB" },
 		{ &DreamBase::useCart,                 "CART" },
-- 
cgit v1.2.3


From 047a9dc19daa27b88aa105bd9d30e5cd1cd161c1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 14:34:36 +0200
Subject: DREAMWEB: Fix regression in loadRoomsSample()

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

(limited to 'engines')

diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index 4683f333c9..247935b8f8 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -104,6 +104,7 @@ void DreamBase::loadRoomsSample() {
 
 	assert(sample < 100);
 	Common::String sampleName = Common::String::format("DREAMWEB.V%02d", sample);
+	data.byte(kCurrentsample) = sample;
 
 	uint8 ch0 = data.byte(kCh0playing);
 	if (ch0 >= 12 && ch0 != 255)
-- 
cgit v1.2.3


From e311f678b989c2cf3eee03bb98c7c8deed46bddc Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 15:03:36 +0200
Subject: DREAMWEB: Move pressList out of the data blob, and remove loads of
 unused global variables from the data blob

---
 engines/dreamweb/dreambase.h  |   3 +
 engines/dreamweb/dreamgen.cpp |  60 +++----
 engines/dreamweb/dreamgen.h   | 387 ++++++++++++++++++++----------------------
 engines/dreamweb/keypad.cpp   |   6 +-
 4 files changed, 215 insertions(+), 241 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index c96604a263..ab0843663a 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -61,6 +61,9 @@ class DreamBase : public SegmentManager {
 protected:
 	DreamWeb::DreamWebEngine *engine;
 
+	// from keypad.cpp
+	uint8 _pressList[6];
+
 	// from newplace.cpp
 	uint8 _roomsCanGo[16];
 
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 2d58aea6c5..66438cfd04 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -367,7 +367,7 @@ dirroot:
 	si = offset_rootdir;
 	_inc(si);
 	es = cs;
-	di = 462;
+	di = 436;
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
@@ -396,7 +396,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 462;
+	di = 436;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -526,7 +526,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 462+1;
+	di = 436+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -608,7 +608,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 540;
+	si = 511;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -658,12 +658,12 @@ void DreamGenContext::__start() {
 		//0x0080: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0090: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00a0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00b0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 
-		//0x00c0: .... .... ...   ...
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x00c0: .... ..   .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00d0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -678,30 +678,30 @@ void DreamGenContext::__start() {
 		//0x0120: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0130: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0140: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
-		//0x0150: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		//0x0150: .... .... .... ....
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0170: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0180: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 
-		//0x0190: .... .... .... ....
-		0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 
-		//0x01a0: .... .DRE AMWE B.V9
-		0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
-		//0x01b0: 9.                .
-		0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 
-		//0x01c0: "ROO T          ." 
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 
-		//0x01d0:              . ....
-		0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
-		//0x01e0: $... .... .... ....
-		0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01f0: .... .... .D:. ....
+		0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 
+		//0x0180: .... .... ...D REAM
+		0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0190: WEB. V99.          
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x01a0:       ."R OOT      
+		0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x01b0:    . "             
+		0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 
+		//0x01c0:  ... ..$. .... ....
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 
+		//0x01d0: .... .... .... ...D
+		0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x01e0: :... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x01f0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0200: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -718,11 +718,7 @@ void DreamGenContext::__start() {
 		//0x0260: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0270: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0280: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
-		//0x0290: .... .... .... ....
-		0xff, 0xff, 0x00, 0x00, 0x00, };
+		0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 3da65cf189..a292384826 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,8 +32,8 @@
 
 namespace DreamGen {
 
-static const uint16 offset_operand1 = 0x01b2;
-static const uint16 offset_rootdir = 0x01c0;
+static const uint16 offset_rootdir = 0x01a6;
+static const uint16 offset_operand1 = 0x0198;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -147,210 +147,185 @@ static const uint16 kArrowad = 139;
 static const uint16 kCurrentkey = 141;
 static const uint16 kOldkey = 142;
 static const uint16 kUseddirection = 143;
-static const uint16 kCurrentkey2 = 144;
-static const uint16 kTimercount = 145;
-static const uint16 kOldtimercount = 146;
-static const uint16 kMapx = 147;
-static const uint16 kMapy = 148;
-static const uint16 kNewscreen = 149;
-static const uint16 kRyanx = 150;
-static const uint16 kRyany = 151;
-static const uint16 kLastflag = 152;
-static const uint16 kOffsetx = 153;
-static const uint16 kOffsety = 155;
-static const uint16 kCurrentob = 157;
-static const uint16 kPrioritydep = 158;
-static const uint16 kDestpos = 159;
-static const uint16 kReallocation = 160;
-static const uint16 kRoomnum = 161;
-static const uint16 kNowinnewroom = 162;
-static const uint16 kResetmanxy = 163;
-static const uint16 kNewlocation = 164;
-static const uint16 kAutolocation = 165;
-static const uint16 kMustload = 166;
-static const uint16 kAnswered = 167;
-static const uint16 kSaidno = 168;
-static const uint16 kDoorcheck1 = 169;
-static const uint16 kDoorcheck2 = 170;
-static const uint16 kDoorcheck3 = 171;
-static const uint16 kDoorcheck4 = 172;
-static const uint16 kMousex = 173;
-static const uint16 kMousey = 175;
-static const uint16 kMousebutton = 177;
-static const uint16 kMousebutton1 = 179;
-static const uint16 kMousebutton2 = 181;
-static const uint16 kMousebutton3 = 183;
-static const uint16 kMousebutton4 = 185;
-static const uint16 kOldbutton = 187;
-static const uint16 kOldx = 189;
-static const uint16 kOldy = 191;
-static const uint16 kLastbutton = 193;
-static const uint16 kOldpointerx = 195;
-static const uint16 kOldpointery = 197;
-static const uint16 kDelherex = 199;
-static const uint16 kDelherey = 201;
-static const uint16 kPointerxs = 203;
-static const uint16 kPointerys = 204;
-static const uint16 kDelxs = 205;
-static const uint16 kDelys = 206;
-static const uint16 kPointerframe = 207;
-static const uint16 kPointerpower = 208;
-static const uint16 kAuxpointerframe = 209;
-static const uint16 kPointermode = 210;
-static const uint16 kPointerspeed = 211;
-static const uint16 kPointercount = 212;
-static const uint16 kInmaparea = 213;
-static const uint16 kSlotdata = 214;
-static const uint16 kThisslot = 215;
-static const uint16 kSlotflags = 216;
-static const uint16 kTalkmode = 217;
-static const uint16 kTalkpos = 218;
-static const uint16 kCharacter = 219;
-static const uint16 kPersondata = 220;
-static const uint16 kTalknum = 222;
-static const uint16 kNumberinroom = 223;
-static const uint16 kCurrentcel = 224;
-static const uint16 kOldselection = 225;
-static const uint16 kStopwalking = 226;
-static const uint16 kMouseon = 227;
-static const uint16 kPlayed = 228;
-static const uint16 kTimer1 = 230;
-static const uint16 kTimer2 = 231;
-static const uint16 kTimer3 = 232;
-static const uint16 kWholetimer = 233;
-static const uint16 kTimer1to = 235;
-static const uint16 kTimer2to = 236;
-static const uint16 kTimer3to = 237;
-static const uint16 kWatchdump = 238;
-static const uint16 kLogonum = 239;
-static const uint16 kOldlogonum = 240;
-static const uint16 kNetseg = 241;
-static const uint16 kNetpoint = 243;
-static const uint16 kCursorstate = 245;
-static const uint16 kPressed = 246;
-static const uint16 kPresspointer = 247;
-static const uint16 kGraphicpress = 249;
-static const uint16 kPresscount = 250;
-static const uint16 kLightcount = 251;
-static const uint16 kFolderpage = 252;
-static const uint16 kDiarypage = 253;
-static const uint16 kMenucount = 254;
-static const uint16 kSymboltopx = 255;
-static const uint16 kSymboltopnum = 256;
-static const uint16 kSymboltopdir = 257;
-static const uint16 kSymbolbotx = 258;
-static const uint16 kSymbolbotnum = 259;
-static const uint16 kSymbolbotdir = 260;
-static const uint16 kSymboltolight = 261;
-static const uint16 kSymbol1 = 262;
-static const uint16 kSymbol2 = 263;
-static const uint16 kSymbol3 = 264;
-static const uint16 kSymbolnum = 265;
-static const uint16 kDumpx = 266;
-static const uint16 kDumpy = 268;
-static const uint16 kWalkandexam = 270;
-static const uint16 kWalkexamtype = 271;
-static const uint16 kWalkexamnum = 272;
-static const uint16 kCurslocx = 273;
-static const uint16 kCurslocy = 275;
-static const uint16 kCurpos = 277;
-static const uint16 kMonadx = 279;
-static const uint16 kMonady = 281;
-static const uint16 kMonsource = 283;
-static const uint16 kNumtodo = 285;
-static const uint16 kTimecount = 287;
-static const uint16 kCounttotimed = 289;
-static const uint16 kTimedseg = 291;
-static const uint16 kTimedoffset = 293;
-static const uint16 kTimedy = 295;
-static const uint16 kTimedx = 296;
-static const uint16 kNeedtodumptimed = 297;
-static const uint16 kLoadingorsave = 298;
-static const uint16 kCurrentslot = 299;
-static const uint16 kCursorpos = 300;
-static const uint16 kColourpos = 301;
-static const uint16 kFadedirection = 302;
-static const uint16 kNumtofade = 303;
-static const uint16 kFadecount = 304;
-static const uint16 kAddtogreen = 305;
-static const uint16 kAddtored = 306;
-static const uint16 kAddtoblue = 307;
-static const uint16 kLastsoundreel = 308;
-static const uint16 kSpeechloaded = 310;
-static const uint16 kSpeechlength = 311;
-static const uint16 kVolume = 313;
-static const uint16 kVolumeto = 314;
-static const uint16 kVolumedirection = 315;
-static const uint16 kVolumecount = 316;
-static const uint16 kWongame = 317;
-static const uint16 kLasthardkey = 318;
-static const uint16 kBufferin = 319;
-static const uint16 kBufferout = 321;
-static const uint16 kExtras = 323;
-static const uint16 kWorkspace = 325;
-static const uint16 kMapstore = 327;
-static const uint16 kCharset1 = 329;
-static const uint16 kBuffers = 331;
-static const uint16 kMainsprites = 333;
-static const uint16 kBackdrop = 335;
-static const uint16 kMapdata = 337;
-static const uint16 kSounddata = 339;
-static const uint16 kSounddata2 = 341;
-static const uint16 kRecordspace = 343;
-static const uint16 kFreedat = 345;
-static const uint16 kSetdat = 347;
-static const uint16 kReel1 = 349;
-static const uint16 kReel2 = 351;
-static const uint16 kReel3 = 353;
-static const uint16 kRoomdesc = 355;
-static const uint16 kFreedesc = 357;
-static const uint16 kSetdesc = 359;
-static const uint16 kBlockdesc = 361;
-static const uint16 kSetframes = 363;
-static const uint16 kFreeframes = 365;
-static const uint16 kPeople = 367;
-static const uint16 kReels = 369;
-static const uint16 kCommandtext = 371;
-static const uint16 kPuzzletext = 373;
-static const uint16 kTraveltext = 375;
-static const uint16 kTempgraphics = 377;
-static const uint16 kTempgraphics2 = 379;
-static const uint16 kTempgraphics3 = 381;
-static const uint16 kTempsprites = 383;
-static const uint16 kTextfile1 = 385;
-static const uint16 kTextfile2 = 387;
-static const uint16 kTextfile3 = 389;
-static const uint16 kBlinkframe = 391;
-static const uint16 kBlinkcount = 392;
-static const uint16 kReasseschanges = 393;
-static const uint16 kPointerspath = 394;
-static const uint16 kManspath = 395;
-static const uint16 kPointerfirstpath = 396;
-static const uint16 kFinaldest = 397;
-static const uint16 kDestination = 398;
-static const uint16 kLinestartx = 399;
-static const uint16 kLinestarty = 401;
-static const uint16 kLineendx = 403;
-static const uint16 kLineendy = 405;
-static const uint16 kLinepointer = 407;
-static const uint16 kLinedirection = 408;
-static const uint16 kLinelength = 409;
-static const uint16 kCh0blockstocopy = 410;
-static const uint16 kCh0playing = 412;
-static const uint16 kCh0repeat = 413;
-static const uint16 kCh1playing = 414;
-static const uint16 kCh1blockstocopy = 415;
-static const uint16 kSoundbufferwrite = 417;
-static const uint16 kCurrentsample = 419;
-static const uint16 kRoomssample = 420;
-static const uint16 kBasicsample = 421;
-static const uint16 kCurrentfile = 462;
-static const uint16 kOplist = 537;
-static const uint16 kInputline = 540;
-static const uint16 kPresslist = 668;
-static const uint16 kQuitrequested = 674;
-static const uint16 kSubtitles = 675;
-static const uint16 kForeignrelease = 676;
+static const uint16 kTimercount = 144;
+static const uint16 kOldtimercount = 145;
+static const uint16 kMapx = 146;
+static const uint16 kMapy = 147;
+static const uint16 kNewscreen = 148;
+static const uint16 kRyanx = 149;
+static const uint16 kRyany = 150;
+static const uint16 kLastflag = 151;
+static const uint16 kOffsetx = 152;
+static const uint16 kOffsety = 154;
+static const uint16 kCurrentob = 156;
+static const uint16 kDestpos = 157;
+static const uint16 kReallocation = 158;
+static const uint16 kRoomnum = 159;
+static const uint16 kNowinnewroom = 160;
+static const uint16 kResetmanxy = 161;
+static const uint16 kNewlocation = 162;
+static const uint16 kAutolocation = 163;
+static const uint16 kDoorcheck1 = 164;
+static const uint16 kDoorcheck2 = 165;
+static const uint16 kDoorcheck3 = 166;
+static const uint16 kDoorcheck4 = 167;
+static const uint16 kMousex = 168;
+static const uint16 kMousey = 170;
+static const uint16 kMousebutton = 172;
+static const uint16 kMousebutton1 = 174;
+static const uint16 kMousebutton2 = 176;
+static const uint16 kMousebutton3 = 178;
+static const uint16 kMousebutton4 = 180;
+static const uint16 kOldbutton = 182;
+static const uint16 kOldx = 184;
+static const uint16 kOldy = 186;
+static const uint16 kLastbutton = 188;
+static const uint16 kOldpointerx = 190;
+static const uint16 kOldpointery = 192;
+static const uint16 kDelherex = 194;
+static const uint16 kDelherey = 196;
+static const uint16 kPointerxs = 198;
+static const uint16 kPointerys = 199;
+static const uint16 kDelxs = 200;
+static const uint16 kDelys = 201;
+static const uint16 kPointerframe = 202;
+static const uint16 kPointerpower = 203;
+static const uint16 kAuxpointerframe = 204;
+static const uint16 kPointermode = 205;
+static const uint16 kPointerspeed = 206;
+static const uint16 kPointercount = 207;
+static const uint16 kInmaparea = 208;
+static const uint16 kTalkmode = 209;
+static const uint16 kTalkpos = 210;
+static const uint16 kCharacter = 211;
+static const uint16 kWatchdump = 212;
+static const uint16 kLogonum = 213;
+static const uint16 kOldlogonum = 214;
+static const uint16 kNetseg = 215;
+static const uint16 kNetpoint = 217;
+static const uint16 kCursorstate = 219;
+static const uint16 kPressed = 220;
+static const uint16 kPresspointer = 221;
+static const uint16 kGraphicpress = 223;
+static const uint16 kPresscount = 224;
+static const uint16 kLightcount = 225;
+static const uint16 kFolderpage = 226;
+static const uint16 kDiarypage = 227;
+static const uint16 kMenucount = 228;
+static const uint16 kSymboltopx = 229;
+static const uint16 kSymboltopnum = 230;
+static const uint16 kSymboltopdir = 231;
+static const uint16 kSymbolbotx = 232;
+static const uint16 kSymbolbotnum = 233;
+static const uint16 kSymbolbotdir = 234;
+static const uint16 kSymboltolight = 235;
+static const uint16 kSymbol1 = 236;
+static const uint16 kSymbol2 = 237;
+static const uint16 kSymbol3 = 238;
+static const uint16 kSymbolnum = 239;
+static const uint16 kDumpx = 240;
+static const uint16 kDumpy = 242;
+static const uint16 kWalkandexam = 244;
+static const uint16 kWalkexamtype = 245;
+static const uint16 kWalkexamnum = 246;
+static const uint16 kCurslocx = 247;
+static const uint16 kCurslocy = 249;
+static const uint16 kCurpos = 251;
+static const uint16 kMonadx = 253;
+static const uint16 kMonady = 255;
+static const uint16 kMonsource = 257;
+static const uint16 kNumtodo = 259;
+static const uint16 kTimecount = 261;
+static const uint16 kCounttotimed = 263;
+static const uint16 kTimedseg = 265;
+static const uint16 kTimedoffset = 267;
+static const uint16 kTimedy = 269;
+static const uint16 kTimedx = 270;
+static const uint16 kNeedtodumptimed = 271;
+static const uint16 kLoadingorsave = 272;
+static const uint16 kCurrentslot = 273;
+static const uint16 kCursorpos = 274;
+static const uint16 kColourpos = 275;
+static const uint16 kFadedirection = 276;
+static const uint16 kNumtofade = 277;
+static const uint16 kFadecount = 278;
+static const uint16 kAddtogreen = 279;
+static const uint16 kAddtored = 280;
+static const uint16 kAddtoblue = 281;
+static const uint16 kLastsoundreel = 282;
+static const uint16 kSpeechloaded = 284;
+static const uint16 kSpeechlength = 285;
+static const uint16 kVolume = 287;
+static const uint16 kVolumeto = 288;
+static const uint16 kVolumedirection = 289;
+static const uint16 kVolumecount = 290;
+static const uint16 kWongame = 291;
+static const uint16 kLasthardkey = 292;
+static const uint16 kBufferin = 293;
+static const uint16 kBufferout = 295;
+static const uint16 kExtras = 297;
+static const uint16 kWorkspace = 299;
+static const uint16 kMapstore = 301;
+static const uint16 kCharset1 = 303;
+static const uint16 kBuffers = 305;
+static const uint16 kMainsprites = 307;
+static const uint16 kBackdrop = 309;
+static const uint16 kMapdata = 311;
+static const uint16 kSounddata = 313;
+static const uint16 kSounddata2 = 315;
+static const uint16 kRecordspace = 317;
+static const uint16 kFreedat = 319;
+static const uint16 kSetdat = 321;
+static const uint16 kReel1 = 323;
+static const uint16 kReel2 = 325;
+static const uint16 kReel3 = 327;
+static const uint16 kRoomdesc = 329;
+static const uint16 kFreedesc = 331;
+static const uint16 kSetdesc = 333;
+static const uint16 kBlockdesc = 335;
+static const uint16 kSetframes = 337;
+static const uint16 kFreeframes = 339;
+static const uint16 kPeople = 341;
+static const uint16 kReels = 343;
+static const uint16 kCommandtext = 345;
+static const uint16 kPuzzletext = 347;
+static const uint16 kTraveltext = 349;
+static const uint16 kTempgraphics = 351;
+static const uint16 kTempgraphics2 = 353;
+static const uint16 kTempgraphics3 = 355;
+static const uint16 kTempsprites = 357;
+static const uint16 kTextfile1 = 359;
+static const uint16 kTextfile2 = 361;
+static const uint16 kTextfile3 = 363;
+static const uint16 kBlinkframe = 365;
+static const uint16 kBlinkcount = 366;
+static const uint16 kReasseschanges = 367;
+static const uint16 kPointerspath = 368;
+static const uint16 kManspath = 369;
+static const uint16 kPointerfirstpath = 370;
+static const uint16 kFinaldest = 371;
+static const uint16 kDestination = 372;
+static const uint16 kLinestartx = 373;
+static const uint16 kLinestarty = 375;
+static const uint16 kLineendx = 377;
+static const uint16 kLineendy = 379;
+static const uint16 kLinepointer = 381;
+static const uint16 kLinedirection = 382;
+static const uint16 kLinelength = 383;
+static const uint16 kCh0blockstocopy = 384;
+static const uint16 kCh0playing = 386;
+static const uint16 kCh0repeat = 387;
+static const uint16 kCh1playing = 388;
+static const uint16 kCh1blockstocopy = 389;
+static const uint16 kSoundbufferwrite = 391;
+static const uint16 kCurrentsample = 393;
+static const uint16 kRoomssample = 394;
+static const uint16 kBasicsample = 395;
+static const uint16 kCurrentfile = 436;
+static const uint16 kInputline = 511;
+static const uint16 kQuitrequested = 639;
+static const uint16 kSubtitles = 640;
+static const uint16 kForeignrelease = 641;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 878fbda5bf..b165c00394 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -77,8 +77,8 @@ void DreamBase::showKeypad() {
 
 bool DreamBase::isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
 	
-	return digit0 == data.byte(kPresslist+0) && digit1 == data.byte(kPresslist+1)
-		&& digit2 == data.byte(kPresslist+2) && digit3 == data.byte(kPresslist+3);
+	return digit0 == _pressList[0] && digit1 == _pressList[1]
+		&& digit2 == _pressList[2] && digit3 == _pressList[3];
 }
 
 void DreamBase::addToPressList() {
@@ -88,7 +88,7 @@ void DreamBase::addToPressList() {
 	if (pressed == 10)
 		pressed = 0;
 
-	data.byte(kPresslist + data.word(kPresspointer)) = pressed;
+	_pressList[data.word(kPresspointer)] = pressed;
 	++data.word(kPresspointer);
 }
 
-- 
cgit v1.2.3


From 63ba3988fff08911d2fecbf4808f5514e2fd420f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 16:10:28 +0200
Subject: DREAMWEB: Port 'transfertoex' to C++

---
 engines/dreamweb/dreamgen.cpp | 41 -----------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/object.cpp   | 34 ++++++++++++++++++++++++++++------
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 29 insertions(+), 48 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 66438cfd04..9582ebe5a5 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -241,47 +241,6 @@ void DreamGenContext::getSetAd() {
 	es = data.word(kSetdat);
 }
 
-void DreamGenContext::transferToEx() {
-	STACK_CHECK;
-	emergencyPurge();
-	getExPos();
-	al = data.byte(kExpos);
-	push(ax);
-	push(di);
-	al = data.byte(kItemframe);
-	ah = 0;
-	bx = 16;
-	_mul(bx);
-	ds = data.word(kFreedat);
-	si = ax;
-	cx = 8;
-	_movsw(cx, true);
-	di = pop();
-	al = data.byte(kReallocation);
-	es.byte(di) = al;
-	es.byte(di+11) = al;
-	al = data.byte(kItemframe);
-	es.byte(di+1) = al;
-	es.byte(di+2) = 4;
-	es.byte(di+3) = 255;
-	al = data.byte(kLastinvpos);
-	es.byte(di+4) = al;
-	al = data.byte(kItemframe);
-	data.byte(kItemtotran) = al;
-	transferMap();
-	transferInv();
-	transferText();
-	al = data.byte(kItemframe);
-	ah = 0;
-	bx = 16;
-	_mul(bx);
-	ds = data.word(kFreedat);
-	si = ax;
-	ds.byte(si+2) = 254;
-	pickupConts();
-	ax = pop();
-}
-
 void DreamGenContext::pickupConts() {
 	STACK_CHECK;
 	al = ds.byte(si+7);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index a292384826..0ecdf7210b 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -440,7 +440,6 @@ public:
 	void read();
 	void searchForString();
 	void getExAd();
-	void transferToEx();
 	void parser();
 	void transferConToEx();
 };
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 10138acb78..daa45e67eb 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -446,8 +446,7 @@ void DreamGenContext::setPickup() {
 	if (data.byte(kObjecttype) != kExObjectType) {
 		data.byte(kItemframe) = data.byte(kCommand);
 		data.byte(kOpenedob) = 255;
-		transferToEx();
-		data.byte(kItemframe) = al;
+		data.byte(kItemframe) = transferToEx();
 		data.byte(kObjecttype) = kExObjectType;
 		DynObject *object = getExAd(data.byte(kItemframe));
 		object->mapad[0] = 20;
@@ -964,8 +963,7 @@ void DreamGenContext::outOfOpen() {
 	data.byte(kItemframe)  = objectId & 0xFF;
 
 	if (data.byte(kObjecttype) != 4) {
-		transferToEx();
-		data.byte(kItemframe) = al;
+		data.byte(kItemframe) = transferToEx();
 		data.byte(kObjecttype) = 4;
 	}
 
@@ -1021,8 +1019,7 @@ void DreamGenContext::swapWithOpen() {
 	data.byte(kItemframe)  = objectId & 0xFF;
 
 	if (data.byte(kObjecttype) != 4) {
-		transferToEx();
-		data.byte(kItemframe) = al;
+		data.byte(kItemframe) = transferToEx();
 		data.byte(kObjecttype) = 4;
 	}
 
@@ -1059,4 +1056,29 @@ uint16 DreamBase::findOpenPos() {
 	return pos * 2 + kOpeninvlist;	// return the object position in the inventory data
 }
 
+byte DreamGenContext::transferToEx() {
+	emergencyPurge();
+	getExPos();
+	byte pos = data.byte(kExpos);
+	DynObject *exObject = getExAd(pos);
+	DynObject *freeObject = getFreeAd(data.byte(kItemframe));
+	memcpy(exObject, freeObject, sizeof(DynObject));
+	exObject->currentLocation = data.byte(kReallocation);
+	exObject->initialLocation = data.byte(kReallocation);
+	exObject->index = data.byte(kItemframe);
+	exObject->mapad[0] = 4;
+	exObject->mapad[1] = 255;
+	exObject->mapad[2] = data.byte(kLastinvpos);
+	data.byte(kItemtotran) = data.byte(kItemframe);
+	transferMap();
+	transferInv();
+	transferText();
+	freeObject = getFreeAd(data.byte(kItemframe));
+	freeObject->mapad[0] = 254;
+	ds = data.word(kFreedat);
+	si = data.byte(kItemframe);
+	pickupConts();
+	return pos;
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index a03dbc2fb6..9bbf3b3c40 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -139,5 +139,6 @@
 	void swapWithOpen();
 	void swapWithInv();
 	void searchForFiles();
+	byte transferToEx();
 
 #endif
-- 
cgit v1.2.3


From 95cabb0ffd43e6bdd2c600c5baa459cab89f068d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 24 Dec 2011 21:09:46 +0100
Subject: SCUMM: Add a difficulty selection dialog for Loom FM-Towns.

It is in spirit of the DOS version's selection dialog, but it has the
description above the buttons instead of below it.
---
 engines/scumm/dialogs.cpp | 34 ++++++++++++++++++++++++++++++++++
 engines/scumm/dialogs.h   | 21 +++++++++++++++++++++
 engines/scumm/scumm.cpp   | 10 ++++++++++
 3 files changed, 65 insertions(+)

(limited to 'engines')

diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 20aedae089..0e531daf73 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -648,4 +648,38 @@ void DebugInputDialog::handleKeyDown(Common::KeyState state) {
 	}
 }
 
+LoomTownsDifficultyDialog::LoomTownsDifficultyDialog()
+    : Dialog("LoomTownsDifficultyDialog"), _difficulty(-1) {
+	GUI::StaticTextWidget *text1 = new GUI::StaticTextWidget(this, "LoomTownsDifficultyDialog.Description1", _("Select a Proficiency Level."));
+	text1->setAlign(Graphics::kTextAlignCenter);
+	GUI::StaticTextWidget *text2 = new GUI::StaticTextWidget(this, "LoomTownsDifficultyDialog.Description2", _("Refer to your Loom(TM) manual for help."));
+	text2->setAlign(Graphics::kTextAlignCenter);
+
+	new GUI::ButtonWidget(this, "LoomTownsDifficultyDialog.Standard", _("Standard"), 0, kStandardCmd);
+	new GUI::ButtonWidget(this, "LoomTownsDifficultyDialog.Practice", _("Practice"), 0, kPracticeCmd);
+	new GUI::ButtonWidget(this, "LoomTownsDifficultyDialog.Expert", _("Expert"), 0, kExpertCmd);
+}
+
+void LoomTownsDifficultyDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
+	switch (cmd) {
+	case kStandardCmd:
+		_difficulty = 1;
+		close();
+		break;
+
+	case kPracticeCmd:
+		_difficulty = 0;
+		close();
+		break;
+
+	case kExpertCmd:
+		_difficulty = 2;
+		close();
+		break;
+
+	default:
+		GUI::Dialog::handleCommand(sender, cmd, data);
+	}
+}
+
 } // End of namespace Scumm
diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index c26aa9f414..7977f123ed 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -187,6 +187,27 @@ public:
 	Common::String mainText;
 };
 
+/**
+ * Difficulty selection dialog for Loom FM-Towns.
+ */
+class LoomTownsDifficultyDialog : public GUI::Dialog {
+public:
+	LoomTownsDifficultyDialog();
+
+	int getSelectedDifficulty() const { return _difficulty; }
+protected:
+	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
+
+private:
+	enum {
+		kStandardCmd = 'STDD',
+		kPracticeCmd = 'PRAD',
+		kExpertCmd = 'EXPD'
+	};
+
+	int _difficulty;
+};
+
 } // End of namespace Scumm
 
 #endif
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 9a093891d2..d3cc218cd3 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1256,6 +1256,16 @@ void ScummEngine::setupScumm() {
 	// Load game from specified slot, if any
 	if (ConfMan.hasKey("save_slot")) {
 		requestLoad(ConfMan.getInt("save_slot"));
+	} else if (!ConfMan.hasKey("boot_param") && _game.id == GID_LOOM && _game.platform == Common::kPlatformFMTowns) {
+		// In case we run the Loom FM-Towns version and have no boot parameter
+		// nor start save game supplied we will show our own custom difficulty
+		// selection dialog, since the original does not have any.
+		LoomTownsDifficultyDialog difficultyDialog;
+		runDialog(difficultyDialog);
+
+		int difficulty = difficultyDialog.getSelectedDifficulty();
+		if (difficulty != -1)
+			_bootParam = difficulty;
 	}
 
 	_res->allocResTypeData(rtBuffer, 0, 10, kDynamicResTypeMode);
-- 
cgit v1.2.3


From 1fef9d1f75948b3d6f10c221ce8289b44b288a7d Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 26 Dec 2011 15:23:15 +0100
Subject: DREAMWEB: Convert findAllOpen, fillOpen

---
 engines/dreamweb/dreambase.h  |   5 ++
 engines/dreamweb/dreamgen.cpp | 117 ------------------------------------------
 engines/dreamweb/dreamgen.h   |   2 -
 engines/dreamweb/object.cpp   |  59 +++++++++++++++++++--
 engines/dreamweb/stubs.h      |   3 --
 5 files changed, 59 insertions(+), 127 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index ab0843663a..3f667e8757 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -212,6 +212,11 @@ public:
 	void makeWorn(DynObject *object);
 	void dropObject();
 	uint16 findOpenPos();
+	byte getOpenedSlotSize();
+	byte getOpenedSlotCount();
+	void openOb();
+	void findAllOpen();
+	void fillOpen();
 
 	// from pathfind.cpp
 	void turnPathOn(uint8 param);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 9582ebe5a5..282fab2db2 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -73,123 +73,6 @@ void DreamGenContext::transferMap() {
 	_add(data.word(kExframepos), cx);
 }
 
-void DreamGenContext::fillOpen() {
-	STACK_CHECK;
-	delTextLine();
-	getOpenedSize();
-	_cmp(ah, 4);
-	if (flags.c())
-		goto lessthanapage;
-	ah = 4;
-lessthanapage:
-	al = 1;
-	push(ax);
-	es = data.word(kBuffers);
-	di = (0+(228*13));
-	findAllOpen();
-	si = (0+(228*13));
-	di = (80);
-	bx = (58)+96;
-	cx = pop();
-openloop1:
-	push(cx);
-	push(di);
-	push(bx);
-	ax = es.word(si);
-	_add(si, 2);
-	push(si);
-	push(es);
-	_cmp(ch, cl);
-	if (flags.c())
-		goto nextopenslot;
-	obToInv();
-nextopenslot:
-	es = pop();
-	si = pop();
-	bx = pop();
-	di = pop();
-	cx = pop();
-	_add(di, (44));
-	_inc(cl);
-	_cmp(cl, 5);
-	if (!flags.z())
-		goto openloop1;
-	underTextLine();
-}
-
-void DreamGenContext::findAllOpen() {
-	STACK_CHECK;
-	push(di);
-	cx = 16;
-	ax = 0x0ffff;
-	_stosw(cx, true);
-	di = pop();
-	cl = data.byte(kOpenedob);
-	dl = data.byte(kOpenedtype);
-	ds = data.word(kExtras);
-	bx = (0+2080+30000);
-	ch = 0;
-findopen1:
-	_cmp(ds.byte(bx+3), cl);
-	if (!flags.z())
-		goto findopen2;
-	_cmp(ds.byte(bx+2), dl);
-	if (!flags.z())
-		goto findopen2;
-	_cmp(data.byte(kOpenedtype), 4);
-	if (flags.z())
-		goto noloccheck;
-	al = ds.byte(bx+5);
-	_cmp(al, data.byte(kReallocation));
-	if (!flags.z())
-		goto findopen2;
-noloccheck:
-	al = ds.byte(bx+4);
-	ah = 0;
-	push(di);
-	_add(di, ax);
-	_add(di, ax);
-	al = ch;
-	ah = 4;
-	_stosw();
-	di = pop();
-findopen2:
-	_add(bx, 16);
-	_inc(ch);
-	_cmp(ch, (114));
-	if (!flags.z())
-		goto findopen1;
-	cl = data.byte(kOpenedob);
-	dl = data.byte(kOpenedtype);
-	push(dx);
-	ds = data.word(kFreedat);
-	dx = pop();
-	bx = 0;
-	ch = 0;
-findopen1a:
-	_cmp(ds.byte(bx+3), cl);
-	if (!flags.z())
-		goto findopen2a;
-	_cmp(ds.byte(bx+2), dl);
-	if (!flags.z())
-		goto findopen2a;
-	al = ds.byte(bx+4);
-	ah = 0;
-	push(di);
-	_add(di, ax);
-	_add(di, ax);
-	al = ch;
-	ah = 2;
-	_stosw();
-	di = pop();
-findopen2a:
-	_add(bx, 16);
-	_inc(ch);
-	_cmp(ch, 80);
-	if (!flags.z())
-		goto findopen1a;
-}
-
 void DreamGenContext::getFreeAd() {
 	STACK_CHECK;
 	ah = 0;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 0ecdf7210b..d377489da4 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -434,8 +434,6 @@ public:
 	void pickupConts();
 	void transferMap();
 	void getSetAd();
-	void findAllOpen();
-	void fillOpen();
 	void dreamweb();
 	void read();
 	void searchForString();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index daa45e67eb..c8127c345e 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -277,7 +277,8 @@ void DreamBase::getBackFromOb() {
 }
 
 void DreamGenContext::getOpenedSize() {
-	//ax = getOpenedSlotCount();
+	//ah = getOpenedSlotSize();
+	//ah = getOpenedSlotCount();
 
 	// We need to call the ASM-style versions of get*Ad, as these also set
 	// bx and es
@@ -300,7 +301,7 @@ void DreamGenContext::getOpenedSize() {
 	}
 }
 
-byte DreamGenContext::getOpenedSlotCount() {
+byte DreamBase::getOpenedSlotCount() {
 	byte obj = data.byte(kOpenedob);
 	switch (data.byte(kOpenedtype)) {
 	case 4:
@@ -312,7 +313,7 @@ byte DreamGenContext::getOpenedSlotCount() {
 	}
 }
 
-byte DreamGenContext::getOpenedSlotSize() {
+byte DreamBase::getOpenedSlotSize() {
 	byte obj = data.byte(kOpenedob);
 	switch (data.byte(kOpenedtype)) {
 	case 4:
@@ -324,14 +325,14 @@ byte DreamGenContext::getOpenedSlotSize() {
 	}
 }
 
-void DreamGenContext::openOb() {
+void DreamBase::openOb() {
 	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
 
 	copyName(data.byte(kOpenedtype), data.byte(kOpenedob), commandLine);
 
 	printMessage(kInventx, kInventy+86, 62, 240, false);
 
-	al = printDirect(commandLine, data.word(kLastxpos) + 5, kInventy+86, 220, false);
+	printDirect(commandLine, data.word(kLastxpos) + 5, kInventy+86, 220, false);
 
 	fillOpen();
 	_openChangeSize = getOpenedSlotCount() * kItempicsize + kInventx;
@@ -1081,4 +1082,52 @@ byte DreamGenContext::transferToEx() {
 	return pos;
 }
 
+void DreamBase::fillOpen() {
+	delTextLine();
+	uint8 size = getOpenedSlotCount();
+	if (size > 4)
+		size = 4;
+	findAllOpen();
+	uint8 *openInvList = getSegment(data.word(kBuffers)).ptr(kOpeninvlist, 32);
+	for (uint8 i = 0; i < size; ++i) {
+		uint8 index = openInvList[2*i]; 
+		uint8 type = openInvList[2*i + 1];
+		obToInv(index, type, kInventx + (i-1)*kItempicsize, kInventy + 96);
+	}
+	underTextLine();
+}
+
+void DreamBase::findAllOpen() {
+	uint8 *openInvList = getSegment(data.word(kBuffers)).ptr(kOpeninvlist, 32);
+
+	memset(openInvList, 0xFF, 32);
+
+	const DynObject *obj;
+
+	obj = (const DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, 0);
+	for (uint8 i = 0; i < kNumexobjects; ++i, ++obj) {
+		if (obj->mapad[1] != data.byte(kOpenedob))
+			continue;
+		if (obj->mapad[0] != data.byte(kOpenedtype))
+			continue;
+		if (data.byte(kOpenedtype) != kExObjectType && obj->mapad[3] != data.byte(kReallocation))
+			continue;
+		uint8 slot = obj->mapad[2];
+		assert(slot < 16);
+		openInvList[2*slot] = i;
+		openInvList[2*slot + 1] = kExObjectType;
+	}
+
+	obj = (const DynObject *)getSegment(data.word(kFreedat)).ptr(0, 0);
+	for (uint8 i = 0; i < 80; ++i, ++obj) {
+		if (obj->mapad[1] != data.byte(kOpenedob))
+			continue;
+		if (obj->mapad[0] != data.byte(kOpenedtype))
+			continue;
+		uint8 index = obj->mapad[2];
+		openInvList[2*index] = i;
+		openInvList[2*index + 1] = kFreeObjectType;
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 9bbf3b3c40..bd5cd9d1e5 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -119,10 +119,7 @@
 	void processTrigger();
 	bool execCommand();
 	void getOpenedSize();
-	byte getOpenedSlotSize();
-	byte getOpenedSlotCount();
 	bool checkObjectSizeCPP();
-	void openOb();
 	void identifyOb();
 	void selectOb();
 	void findInvPos();
-- 
cgit v1.2.3


From 3b9b4cb6ba72a93359523a9b7c3c115db3d0aed2 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 16:52:31 +0200
Subject: DREAMWEB: Fix a regression in fillOpen() and remove the now unused
 getOpenedSize()

---
 engines/dreamweb/object.cpp | 27 +--------------------------
 engines/dreamweb/stubs.h    |  1 -
 2 files changed, 1 insertion(+), 27 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index c8127c345e..a7a7814db3 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -276,31 +276,6 @@ void DreamBase::getBackFromOb() {
 		blank();
 }
 
-void DreamGenContext::getOpenedSize() {
-	//ah = getOpenedSlotSize();
-	//ah = getOpenedSlotCount();
-
-	// We need to call the ASM-style versions of get*Ad, as these also set
-	// bx and es
-
-	al = data.byte(kOpenedob);
-
-	switch (data.byte(kOpenedtype)) {
-	case 4:
-		getExAd();
-		ax = es.word(bx+7);
-		break;
-	case 2:
-		getFreeAd();
-		ax = es.word(bx+7);
-		break;
-	default:
-		getSetAd();
-		ax = es.word(bx+3);
-		break;
-	}
-}
-
 byte DreamBase::getOpenedSlotCount() {
 	byte obj = data.byte(kOpenedob);
 	switch (data.byte(kOpenedtype)) {
@@ -1092,7 +1067,7 @@ void DreamBase::fillOpen() {
 	for (uint8 i = 0; i < size; ++i) {
 		uint8 index = openInvList[2*i]; 
 		uint8 type = openInvList[2*i + 1];
-		obToInv(index, type, kInventx + (i-1)*kItempicsize, kInventy + 96);
+		obToInv(index, type, kInventx + i * kItempicsize, kInventy + 96);
 	}
 	underTextLine();
 }
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index bd5cd9d1e5..9ab025fb3e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -118,7 +118,6 @@
 	void triggerMessage(uint16 index);
 	void processTrigger();
 	bool execCommand();
-	void getOpenedSize();
 	bool checkObjectSizeCPP();
 	void identifyOb();
 	void selectOb();
-- 
cgit v1.2.3


From 8c3488a973fb93895d542c0b55548bb96101b187 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 16:53:28 +0200
Subject: DREAMWEB: Remove the now unused ASM style versions of getanyad,
 getexad, getfreead and getsetad

---
 engines/dreamweb/dreamgen.cpp | 51 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  4 ----
 engines/dreamweb/stubs.cpp    |  3 ++-
 engines/dreamweb/use.cpp      |  5 ++---
 4 files changed, 4 insertions(+), 59 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 282fab2db2..77af051122 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -73,57 +73,6 @@ void DreamGenContext::transferMap() {
 	_add(data.word(kExframepos), cx);
 }
 
-void DreamGenContext::getFreeAd() {
-	STACK_CHECK;
-	ah = 0;
-	cl = 4;
-	_shl(ax, cl);
-	bx = ax;
-	es = data.word(kFreedat);
-}
-
-void DreamGenContext::getExAd() {
-	STACK_CHECK;
-	ah = 0;
-	bx = 16;
-	_mul(bx);
-	bx = ax;
-	es = data.word(kExtras);
-	_add(bx, (0+2080+30000));
-}
-
-void DreamGenContext::getAnyAd() {
-	STACK_CHECK;
-	_cmp(data.byte(kObjecttype), 4);
-	if (flags.z())
-		goto isex;
-	_cmp(data.byte(kObjecttype), 2);
-	if (flags.z())
-		goto isfree;
-	al = data.byte(kCommand);
-	getSetAd();
-	ax = es.word(bx+4);
-	return;
-isfree:
-	al = data.byte(kCommand);
-	getFreeAd();
-	ax = es.word(bx+7);
-	return;
-isex:
-	al = data.byte(kCommand);
-	getExAd();
-	ax = es.word(bx+7);
-}
-
-void DreamGenContext::getSetAd() {
-	STACK_CHECK;
-	ah = 0;
-	bx = 64;
-	_mul(bx);
-	bx = ax;
-	es = data.word(kSetdat);
-}
-
 void DreamGenContext::pickupConts() {
 	STACK_CHECK;
 	al = ds.byte(si+7);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d377489da4..d3bb80da1a 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -428,16 +428,12 @@ public:
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
 	void dirCom();
-	void getAnyAd();
-	void getFreeAd();
 	void dirFile();
 	void pickupConts();
 	void transferMap();
-	void getSetAd();
 	void dreamweb();
 	void read();
 	void searchForString();
-	void getExAd();
 	void parser();
 	void transferConToEx();
 };
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 8535b17e2f..7c4bfe8a92 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2725,7 +2725,8 @@ void DreamGenContext::pickupOb(uint8 command, uint8 pos) {
 	data.byte(kObjecttype) = kFreeObjectType;
 	data.byte(kItemframe) = command;
 	data.byte(kCommand) = command;
-	getAnyAd();
+	//uint8 dummy;
+	//getAnyAd(&dummy, &dummy);	// was in the original source, seems useless here
 	transferToEx();
 }
 
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 24ea58e252..25ed8d50e5 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -127,9 +127,8 @@ void DreamGenContext::useRoutine() {
 		data.byte(kPointerpower) = 0;
 	}
 
-	getAnyAd();
-	// CHECKME: Do the callbacks use es:bx ?
-	void *obj = es.ptr(bx, 15);
+	uint8 dummy;
+	void *obj = getAnyAd(&dummy, &dummy);
 
 	for (size_t i = 0; i < sizeof(kUseList)/sizeof(UseListEntry); ++i) {
 		const UseListEntry &entry = kUseList[i];
-- 
cgit v1.2.3


From 77a81a80b4157acd7e8e580c2648ec3b3ef6bc64 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 6 Nov 2011 00:46:58 +0100
Subject: KYRA: (AdLib Driver) - implement sound effects volume

(also make internal driver version more flexible)
---
 engines/kyra/sound.cpp       |   4 +-
 engines/kyra/sound.h         |   4 +-
 engines/kyra/sound_adlib.cpp | 101 ++++++++++++++++++++++---------------------
 engines/kyra/sound_adlib.h   |   6 +--
 engines/kyra/sound_amiga.cpp |   2 +-
 engines/kyra/sound_intern.h  |  10 ++---
 engines/kyra/sound_midi.cpp  |   2 +-
 engines/kyra/sound_towns.cpp |   6 +--
 8 files changed, 68 insertions(+), 67 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp
index a1af1ad6f8..9325513066 100644
--- a/engines/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
@@ -229,8 +229,8 @@ bool MixedSoundDriver::isPlaying() const {
 	return _music->isPlaying() | _sfx->isPlaying();
 }
 
-void MixedSoundDriver::playSoundEffect(uint8 track) {
-	_sfx->playSoundEffect(track);
+void MixedSoundDriver::playSoundEffect(uint8 track, uint8 volume) {
+	_sfx->playSoundEffect(track, volume);
 }
 
 void MixedSoundDriver::stopAllSoundEffects() {
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index f3de56520e..88454e4878 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -128,7 +128,7 @@ public:
 	 *
 	 * @param track sound effect id
 	 */
-	virtual void playSoundEffect(uint8 track) = 0;
+	virtual void playSoundEffect(uint8 track, uint8 volume = 0xff) = 0;
 
 	/**
 	 * Stop playback of all sfx tracks.
@@ -273,7 +273,7 @@ public:
 	virtual void haltTrack();
 	virtual bool isPlaying() const;
 
-	virtual void playSoundEffect(uint8 track);
+	virtual void playSoundEffect(uint8 track, uint8 volume = 0xff);
 
 	virtual void stopAllSoundEffects();
 
diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index b04abea080..c31cf809ee 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -57,12 +57,12 @@ namespace Kyra {
 
 class AdLibDriver : public Audio::AudioStream {
 public:
-	AdLibDriver(Audio::Mixer *mixer, bool v2);
+	AdLibDriver(Audio::Mixer *mixer, int version);
 	~AdLibDriver();
 
 	void initDriver();
 	void setSoundData(uint8 *data);
-	void queueTrack(int track);
+	void queueTrack(int track, int volume);
 	bool isChannelPlaying(int channel) const;
 	void stopAllChannels();
 	int getSoundTrigger() const { return _soundTrigger; }
@@ -223,7 +223,7 @@ private:
 	}
 
 	uint8 *getInstrument(int instrumentId) {
-		return _soundData + READ_LE_UINT16(_soundData + (_v2 ? 1000 : 500) + 2 * instrumentId);
+		return _soundData + READ_LE_UINT16(_soundData + ((_version == 2) ? 1000 : 500) + 2 * instrumentId);
 	}
 
 	void setupPrograms();
@@ -358,11 +358,16 @@ private:
 
 	uint8 *_soundData;
 
+	struct QueueEntry {
+		uint8 *data;
+		uint8 volume;
+	};
+
+	QueueEntry _programQueue[16];
 	int _programStartTimeout;
-	uint8 *_programQueue[16];
 	int _programQueueStart, _programQueueEnd;
 
-	void adjustSfxData(uint8 *data);
+	void adjustSfxData(uint8 *data, int volume);
 	uint8 *_sfxPointer;
 	int _sfxPriority;
 	int _sfxVelocity;
@@ -394,13 +399,13 @@ private:
 
 	uint8 _musicVolume, _sfxVolume;
 
-	bool _v2;
+	int _version;
 };
 
-AdLibDriver::AdLibDriver(Audio::Mixer *mixer, bool v2) {
+AdLibDriver::AdLibDriver(Audio::Mixer *mixer, int version) {
 	setupParserOpcodeTable();
 
-	_v2 = v2;
+	_version = version;
 
 	_mixer = mixer;
 
@@ -467,7 +472,7 @@ void AdLibDriver::setMusicVolume(uint8 volume) {
 	}
 
 	// For now we use the music volume for both sfx and music in Kyra1.
-	if (!_v2) {
+	if (_version < 2) {
 		_sfxVolume = volume;
 
 		for (uint i = 6; i < 9; ++i) {
@@ -484,8 +489,8 @@ void AdLibDriver::setMusicVolume(uint8 volume) {
 }
 
 void AdLibDriver::setSfxVolume(uint8 volume) {
-	// We only support sfx volume in v2 games.
-	if (!_v2)
+	// We only support sfx volume in version 2 games.
+	if (_version < 2)
 		return;
 
 	Common::StackLock lock(_mutex);
@@ -525,20 +530,21 @@ void AdLibDriver::setSoundData(uint8 *data) {
 	_soundData = data;
 }
 
-void AdLibDriver::queueTrack(int track) {
+void AdLibDriver::queueTrack(int track, int volume) {
 	Common::StackLock lock(_mutex);
 
 	uint8 *trackData = getProgram(track);
 	if (!trackData)
 		return;
 
-	if (_programQueueEnd == _programQueueStart && _programQueue[_programQueueEnd] != 0) {
+	if (_programQueueEnd == _programQueueStart && _programQueue[_programQueueEnd].data != 0) {
 		warning("AdLibDriver: Program queue full, dropping track %d", track);
 		return;
 	}
 
-	_programQueue[_programQueueEnd++] = trackData;
-	_programQueueEnd &= 15;
+	_programQueue[_programQueueEnd].data = trackData;
+	_programQueue[_programQueueEnd].volume = volume;
+	_programQueueEnd = (_programQueueEnd + 1) & 15;
 }
 
 bool AdLibDriver::isChannelPlaying(int channel) const {
@@ -588,13 +594,13 @@ void AdLibDriver::setupPrograms() {
 	if (_programQueueStart == _programQueueEnd)
 		return;
 
-	uint8 *ptr = _programQueue[_programQueueStart];
+	uint8 *ptr = _programQueue[_programQueueStart].data;
 	// Clear the queue entry
-	_programQueue[_programQueueStart] = 0;
+	_programQueue[_programQueueStart].data = 0;
 	_programQueueStart = (_programQueueStart + 1) & 15;
 
 	// Adjust data in case we hit a sound effect.
-	adjustSfxData(ptr);
+	adjustSfxData(ptr, _programQueue[_programQueueStart].volume);
 
 	const int chan = *ptr++;
 	const int priority = *ptr++;
@@ -626,7 +632,7 @@ void AdLibDriver::setupPrograms() {
 	}
 }
 
-void AdLibDriver::adjustSfxData(uint8 *ptr) {
+void AdLibDriver::adjustSfxData(uint8 *ptr, int volume) {
 	// Check whether we need to reset the data of an old sfx which has been
 	// started.
 	if (_sfxPointer) {
@@ -647,21 +653,16 @@ void AdLibDriver::adjustSfxData(uint8 *ptr) {
 	_sfxPriority = ptr[1];
 	_sfxVelocity = ptr[3];
 
-	// In the cases I've seen, the mysterious fourth byte has been
-	// the parameter for the update_setExtraLevel3() callback.
-	//
-	// The extra level is part of the channels "total level", which
-	// is a six-bit value where larger values means softer volume.
-	//
-	// So what seems to be happening here is that sounds which are
-	// started by this function are given a slightly lower priority
-	// and a slightly higher (i.e. softer) extra level 3 than they
-	// would have if they were started from anywhere else. Strange.
-
 	// Adjust the values.
-	int newVal = ((((ptr[3]) + 63) * 0xFF) >> 8) & 0xFF;
-	ptr[3] = -newVal + 63;
-	ptr[1] = ((ptr[1] * 0xFF) >> 8) & 0xFF;
+	if (_version >= 1) {
+		int newVal = ((((ptr[3]) + 63) * volume) >> 8) & 0xFF;
+		ptr[3] = -newVal + 63;
+		ptr[1] = ((ptr[1] * volume) >> 8) & 0xFF;
+	} else {
+		int newVal = ((_sfxVelocity << 2) ^ 0xff) * volume;
+		ptr[3] = (newVal >> 10) ^ 0x3f;
+		ptr[1] = newVal >> 11;
+	}	
 }
 
 // A few words on opcode parsing and timing:
@@ -2238,20 +2239,20 @@ const int SoundAdLibPC::_kyra1NumSoundTriggers = ARRAYSIZE(SoundAdLibPC::_kyra1S
 SoundAdLibPC::SoundAdLibPC(KyraEngine_v1 *vm, Audio::Mixer *mixer)
 	: Sound(vm, mixer), _driver(0), _trackEntries(), _soundDataPtr(0) {
 	memset(_trackEntries, 0, sizeof(_trackEntries));
-	_v2 = (_vm->game() == GI_KYRA2) || (_vm->game() == GI_LOL && !_vm->gameFlags().isDemo);
-	_driver = new AdLibDriver(mixer, _v2);
+	_version = ((_vm->game() == GI_KYRA2) || (_vm->game() == GI_LOL && !_vm->gameFlags().isDemo)) ? 2 : 1;
+	_driver = new AdLibDriver(mixer, _version);
 	assert(_driver);
 
 	_sfxPlayingSound = -1;
 	_soundFileLoaded.clear();
 
-	if (_v2) {
+	if (_version == 1) {
+		_soundTriggers = _kyra1SoundTriggers;
+		_numSoundTriggers = _kyra1NumSoundTriggers;
+	} else {
 		// TODO: Figure out if Kyra 2 uses sound triggers at all.
 		_soundTriggers = 0;
 		_numSoundTriggers = 0;
-	} else {
-		_soundTriggers = _kyra1SoundTriggers;
-		_numSoundTriggers = _kyra1NumSoundTriggers;
 	}
 }
 
@@ -2307,13 +2308,13 @@ void SoundAdLibPC::playTrack(uint8 track) {
 			_driver->setSyncJumpMask(0x000F);
 		else
 			_driver->setSyncJumpMask(0);
-		play(track);
+		play(track, 0xff);
 	}
 }
 
 void SoundAdLibPC::haltTrack() {
-	play(0);
-	play(0);
+	play(0, 0);
+	play(0, 0);
 	//_vm->_system->delayMillis(3 * 60);
 }
 
@@ -2321,27 +2322,27 @@ bool SoundAdLibPC::isPlaying() const {
 	return _driver->isChannelPlaying(0);
 }
 
-void SoundAdLibPC::playSoundEffect(uint8 track) {
+void SoundAdLibPC::playSoundEffect(uint8 track, uint8 volume) {
 	if (_sfxEnabled)
-		play(track);
+		play(track, volume);
 }
 
-void SoundAdLibPC::play(uint8 track) {
+void SoundAdLibPC::play(uint8 track, uint8 volume) {
 	uint16 soundId = 0;
 
-	if (_v2)
+	if (_version == 2)
 		soundId = READ_LE_UINT16(&_trackEntries[track<<1]);
 	else
 		soundId = _trackEntries[track];
 
-	if ((soundId == 0xFFFF && _v2) || (soundId == 0xFF && !_v2) || !_soundDataPtr)
+	if ((soundId == 0xFFFF && _version == 2) || (soundId == 0xFF && _version < 2) || !_soundDataPtr)
 		return;
 
-	_driver->queueTrack(soundId);
+	_driver->queueTrack(soundId, volume);
 }
 
 void SoundAdLibPC::beginFadeOut() {
-	play(1);
+	play(1, 0xff);
 }
 
 void SoundAdLibPC::loadSoundFile(uint file) {
@@ -2377,7 +2378,7 @@ void SoundAdLibPC::internalLoadFile(Common::String file) {
 	int soundDataSize = fileSize;
 	uint8 *p = fileData;
 
-	if (_v2) {
+	if (_version == 2) {
 		memcpy(_trackEntries, p, 500);
 		p += 500;
 		soundDataSize -= 500;
diff --git a/engines/kyra/sound_adlib.h b/engines/kyra/sound_adlib.h
index 923a4cb75f..06ec9515ff 100644
--- a/engines/kyra/sound_adlib.h
+++ b/engines/kyra/sound_adlib.h
@@ -76,17 +76,17 @@ public:
 	virtual void haltTrack();
 	virtual bool isPlaying() const;
 
-	virtual void playSoundEffect(uint8 track);
+	virtual void playSoundEffect(uint8 track, uint8 volume = 0xff);
 
 	virtual void beginFadeOut();
 private:
 	void internalLoadFile(Common::String file);
 
-	void play(uint8 track);
+	void play(uint8 track, uint8 volume);
 
 	AdLibDriver *_driver;
 
-	bool _v2;
+	int _version;
 	uint8 _trackEntries[500];
 	uint8 *_soundDataPtr;
 	int _sfxPlayingSound;
diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp
index dfb0aa8bf3..ec2748dd38 100644
--- a/engines/kyra/sound_amiga.cpp
+++ b/engines/kyra/sound_amiga.cpp
@@ -173,7 +173,7 @@ void SoundAmiga::beginFadeOut() {
 	_driver->setVolume(0x40);
 }
 
-void SoundAmiga::playSoundEffect(uint8 track) {
+void SoundAmiga::playSoundEffect(uint8 track, uint8) {
 	debugC(5, kDebugLevelSound, "SoundAmiga::playSoundEffect(%d)", track);
 	const AmigaSfxTable *sfx = 0;
 	bool pan = false;
diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound_intern.h
index be3c09de96..427bef66e2 100644
--- a/engines/kyra/sound_intern.h
+++ b/engines/kyra/sound_intern.h
@@ -67,7 +67,7 @@ public:
 	void haltTrack();
 	bool isPlaying() const;
 
-	void playSoundEffect(uint8 track);
+	void playSoundEffect(uint8 track, uint8 volume = 0xff);
 	void stopAllSoundEffects();
 
 	void beginFadeOut();
@@ -116,7 +116,7 @@ public:
 	void playTrack(uint8 track);
 	void haltTrack();
 
-	void playSoundEffect(uint8);
+	void playSoundEffect(uint8 track, uint8 volume = 0xff);
 	void stopAllSoundEffects();
 
 	void beginFadeOut();
@@ -166,7 +166,7 @@ public:
 	void beginFadeOut();
 
 	int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, bool isSfx) { return -1; }
-	void playSoundEffect(uint8);
+	void playSoundEffect(uint8 track, uint8 volume = 0xff);
 
 	void updateVolumeSettings();
 
@@ -195,7 +195,7 @@ public:
 	void beginFadeOut();
 
 	int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, bool isSfx);
-	void playSoundEffect(uint8 track);
+	void playSoundEffect(uint8 track, uint8 volume = 0xff);
 
 	void updateVolumeSettings();
 
@@ -304,7 +304,7 @@ public:
 	void beginFadeOut();
 
 	int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, bool isSfx) { return -1; }
-	void playSoundEffect(uint8);
+	void playSoundEffect(uint8 track, uint8 volume = 0xff);
 
 protected:
 	Audio::MaxTrax *_driver;
diff --git a/engines/kyra/sound_midi.cpp b/engines/kyra/sound_midi.cpp
index 1a5c2f94ac..0004395f6f 100644
--- a/engines/kyra/sound_midi.cpp
+++ b/engines/kyra/sound_midi.cpp
@@ -684,7 +684,7 @@ bool SoundMidiPC::isPlaying() const {
 	return _music->isPlaying();
 }
 
-void SoundMidiPC::playSoundEffect(uint8 track) {
+void SoundMidiPC::playSoundEffect(uint8 track, uint8) {
 	if (!_sfxEnabled)
 		return;
 
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index c851842f22..b77c307872 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -125,7 +125,7 @@ void SoundTowns::loadSoundFile(uint file) {
 	_sfxFileData = _vm->resource()->fileData(fileListEntry(file), 0);
 }
 
-void SoundTowns::playSoundEffect(uint8 track) {
+void SoundTowns::playSoundEffect(uint8 track, uint8) {
 	if (!_sfxEnabled || !_sfxFileData)
 		return;
 
@@ -446,7 +446,7 @@ void SoundPC98::beginFadeOut() {
 	haltTrack();
 }
 
-void SoundPC98::playSoundEffect(uint8 track) {
+void SoundPC98::playSoundEffect(uint8 track, uint8) {
 	if (!_sfxTrackData)
 		return;
 
@@ -650,7 +650,7 @@ int32 SoundTownsPC98_v2::voicePlay(const char *file, Audio::SoundHandle *handle,
 	return 1;
 }
 
-void SoundTownsPC98_v2::playSoundEffect(uint8 track) {
+void SoundTownsPC98_v2::playSoundEffect(uint8 track, uint8) {
 	if (!_useFmSfx || !_sfxTrackData)
 		return;
 
-- 
cgit v1.2.3


From f2a1ff3f7842757d369db23652b39ed3f2a22144 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 8 Nov 2011 20:30:26 +0100
Subject: KYRA: (AdLib Driver) - fix invalid memory write issue

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

(limited to 'engines')

diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index c31cf809ee..9e47367138 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -524,7 +524,7 @@ void AdLibDriver::setSoundData(uint8 *data) {
 
 	if (_soundData) {
 		delete[] _soundData;
-		_soundData = 0;
+		_soundData = _sfxPointer = 0;
 	}
 
 	_soundData = data;
-- 
cgit v1.2.3


From 4098feff57239102a7519e5b7bc1ef8f41465dc2 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 6 Nov 2011 00:55:37 +0100
Subject: KYRA: (AdLib Driver) - allow sound trigger query

---
 engines/kyra/sound.h         | 10 ++++++++++
 engines/kyra/sound_adlib.cpp |  9 +++++++++
 engines/kyra/sound_adlib.h   |  3 +++
 3 files changed, 22 insertions(+)

(limited to 'engines')

diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index 88454e4878..63cec48d00 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -217,6 +217,16 @@ public:
 	 * Stops playback of the current voice.
 	 */
 	void voiceStop(const Audio::SoundHandle *handle = 0);
+
+	/**
+	 * Receive notifications from a song at certain points.
+	 */
+	virtual int checkTrigger() { return 0; }
+
+	/**
+	 * Reset sound trigger.
+	 */
+	virtual void resetTrigger() {}
 protected:
 	const char *fileListEntry(int file) const { return (_soundDataList != 0 && file >= 0 && file < _soundDataList->fileListLen) ? _soundDataList->fileList[file] : ""; }
 	int fileListLen() const { return _soundDataList->fileListLen; }
diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index 9e47367138..d3b72cb833 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -66,6 +66,7 @@ public:
 	bool isChannelPlaying(int channel) const;
 	void stopAllChannels();
 	int getSoundTrigger() const { return _soundTrigger; }
+	void resetSoundTrigger() { _soundTrigger = 0; }
 
 	void callback();
 
@@ -2345,6 +2346,14 @@ void SoundAdLibPC::beginFadeOut() {
 	play(1, 0xff);
 }
 
+int SoundAdLibPC::checkTrigger() {
+	return _driver->getSoundTrigger();
+}
+
+void SoundAdLibPC::resetTrigger() {
+	_driver->resetSoundTrigger();
+}
+
 void SoundAdLibPC::loadSoundFile(uint file) {
 	internalLoadFile(fileListEntry(file));
 }
diff --git a/engines/kyra/sound_adlib.h b/engines/kyra/sound_adlib.h
index 06ec9515ff..8492f3b99a 100644
--- a/engines/kyra/sound_adlib.h
+++ b/engines/kyra/sound_adlib.h
@@ -79,6 +79,9 @@ public:
 	virtual void playSoundEffect(uint8 track, uint8 volume = 0xff);
 
 	virtual void beginFadeOut();
+
+	virtual int checkTrigger();
+	virtual void resetTrigger();
 private:
 	void internalLoadFile(Common::String file);
 
-- 
cgit v1.2.3


From 86a8f694c0c09ccb5825fc7591a1303e638b2451 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 6 Nov 2011 14:12:13 +0100
Subject: KYRA: (AdLib Driver) - rename some variables to make more sense

---
 engines/kyra/sound_adlib.cpp | 49 +++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index d3b72cb833..0bc682df0d 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -107,7 +107,7 @@ private:
 	// These variables have not yet been named, but some of them are partly
 	// known nevertheless:
 	//
-	// unk16 - Sound-related. Possibly some sort of pitch bend.
+	// pitchBend - Sound-related. Possibly some sort of pitch bend.
 	// unk18 - Sound-effect. Used for secondaryEffect1()
 	// unk19 - Sound-effect. Used for secondaryEffect1()
 	// unk20 - Sound-effect. Used for secondaryEffect1()
@@ -176,7 +176,7 @@ private:
 		uint16 offset;
 		uint8 tempoReset;
 		uint8 rawNote;
-		int8 unk16;
+		int8 pitchBend;
 		uint8 volumeModifier;
 	};
 
@@ -280,7 +280,7 @@ private:
 	int updateCallback38(uint8 *&dataptr, Channel &channel, uint8 value);
 	int updateCallback39(uint8 *&dataptr, Channel &channel, uint8 value);
 	int update_removePrimaryEffect2(uint8 *&dataptr, Channel &channel, uint8 value);
-	int updateCallback41(uint8 *&dataptr, Channel &channel, uint8 value);
+	int update_pitchBend(uint8 *&dataptr, Channel &channel, uint8 value);
 	int update_resetToGlobalTempo(uint8 *&dataptr, Channel &channel, uint8 value);
 	int update_nop(uint8 *&dataptr, Channel &channel, uint8 value);
 	int update_setDurationRandomness(uint8 *&dataptr, Channel &channel, uint8 value);
@@ -318,7 +318,7 @@ private:
 	// _unkValue18     - Unknown. Rhythm section volume?
 	// _unkValue19     - Unknown. Rhythm section volume?
 	// _unkValue20     - Unknown. Rhythm section volume?
-	// _unkTable[]     - Probably frequences for the 12-tone scale.
+	// _freqTable[]     - Probably frequences for the 12-tone scale.
 	// _unkTable2[]    - Unknown. Currently only used by updateCallback46()
 	// _unkTable2_1[]  - One of the tables in _unkTable2[]
 	// _unkTable2_2[]  - One of the tables in _unkTable2[]
@@ -385,12 +385,12 @@ private:
 	const uint8 *_tablePtr2;
 
 	static const uint8 _regOffset[];
-	static const uint16 _unkTable[];
+	static const uint16 _freqTable[];
 	static const uint8 *const _unkTable2[];
 	static const uint8 _unkTable2_1[];
 	static const uint8 _unkTable2_2[];
 	static const uint8 _unkTable2_3[];
-	static const uint8 _unkTables[][32];
+	static const uint8 _pitchBendTables[][32];
 
 	uint16 _syncJumpMask;
 
@@ -975,20 +975,20 @@ void AdLibDriver::setupNote(uint8 rawNote, Channel &channel, bool flag) {
 	// octave bits, and that could possibly have been used in some sound.
 	// But as it is now, I can't see any way it would happen.
 
-	uint16 freq = _unkTable[note] + channel.baseFreq;
+	uint16 freq = _freqTable[note] + channel.baseFreq;
 
 	// When called from callback 41, the behavior is slightly different:
-	// We adjust the frequency, even when channel.unk16 is 0.
+	// We adjust the frequency, even when channel.pitchBend is 0.
 
-	if (channel.unk16 || flag) {
+	if (channel.pitchBend || flag) {
 		const uint8 *table;
 
-		if (channel.unk16 >= 0) {
-			table = _unkTables[(channel.rawNote & 0x0F) + 2];
-			freq += table[channel.unk16];
+		if (channel.pitchBend >= 0) {
+			table = _pitchBendTables[(channel.rawNote & 0x0F) + 2];
+			freq += table[channel.pitchBend];
 		} else {
-			table = _unkTables[channel.rawNote & 0x0F];
-			freq -= table[-channel.unk16];
+			table = _pitchBendTables[channel.rawNote & 0x0F];
+			freq -= table[-channel.pitchBend];
 		}
 	}
 
@@ -1670,8 +1670,8 @@ int AdLibDriver::update_removePrimaryEffect2(uint8 *&dataptr, Channel &channel,
 	return 0;
 }
 
-int AdLibDriver::updateCallback41(uint8 *&dataptr, Channel &channel, uint8 value) {
-	channel.unk16 = value;
+int AdLibDriver::update_pitchBend(uint8 *&dataptr, Channel &channel, uint8 value) {
+	channel.pitchBend = value;
 	setupNote(channel.rawNote, channel, true);
 	return 0;
 }
@@ -2022,7 +2022,7 @@ void AdLibDriver::setupParserOpcodeTable() {
 
 		// 56
 		COMMAND(update_stopChannel),
-		COMMAND(updateCallback41),
+		COMMAND(update_pitchBend),
 		COMMAND(update_resetToGlobalTempo),
 		COMMAND(update_nop),
 
@@ -2063,11 +2063,10 @@ const uint8 AdLibDriver::_regOffset[] = {
 	0x12
 };
 
-// Given the size of this table, and the range of its values, it's probably the
-// F-Numbers (10 bits) for the notes of the 12-tone scale. However, it does not
-// match the table in the AdLib documentation I've seen.
+//These are the F-Numbers (10 bits) for the notes of the 12-tone scale.
+// However, it does not match the table in the AdLib documentation I've seen.
 
-const uint16 AdLibDriver::_unkTable[] = {
+const uint16 AdLibDriver::_freqTable[] = {
 	0x0134, 0x0147, 0x015A, 0x016F, 0x0184, 0x019C, 0x01B4, 0x01CE, 0x01E9,
 	0x0207, 0x0225, 0x0246
 };
@@ -2145,13 +2144,11 @@ const uint8 AdLibDriver::_unkTable2_3[] = {
 };
 
 // This table is used to modify the frequency of the notes, depending on the
-// note value and unk16. In theory, we could very well try to access memory
-// outside this table, but in reality that probably won't happen.
+// note value and the pitch bend value. In theory, we could very well try to
+// access memory outside this table, but in reality that probably won't happen.
 //
-// This could be some sort of pitch bend, but I have yet to see it used for
-// anything so it's hard to say.
 
-const uint8 AdLibDriver::_unkTables[][32] = {
+const uint8 AdLibDriver::_pitchBendTables[][32] = {
 	// 0
 	{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x08,
 	  0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10,
-- 
cgit v1.2.3


From 93321ca4850c4859c71ec02420874101529bddce Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 6 Nov 2011 14:22:47 +0100
Subject: KYRA: (AdLib Driver) - fix secondary effect

---
 engines/kyra/sound_adlib.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index 0bc682df0d..2bce5a2c59 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -1428,7 +1428,21 @@ int AdLibDriver::update_setupSecondaryEffect1(uint8 *&dataptr, Channel &channel,
 	channel.unk19 = value;
 	channel.unk20 = channel.unk21 = *dataptr++;
 	channel.unk22 = *dataptr++;
-	channel.offset = READ_LE_UINT16(dataptr); dataptr += 2;
+	// WORKAROUND: The original code reads a true offset which later gets translated via xlat (in
+	// the current segment). This means that the outcome depends on the sound data offset.
+	// Unfortunately this offset is different in most implementations of the audio driver and
+	// probably also different from the offset assumed by the sequencer.
+	// It seems that the driver assumes an offset of 191 which is wrong for all the game driver
+	// implementations.
+	// This bug has probably not been noticed, since the effect is hardly used and the sounds are
+	// not necessarily worse. I noticed the difference between ScummVM and DOSBox for the EOB II
+	// teleporter sound. I also found the location of the table which is supposed to be used here
+	// (simple enough: it is located at the end of the track after the 0x88 ending opcode).
+	// Teleporters in EOB I and II now sound exactly the same which I am sure was the intended way,
+	// since the sound data is exactly the same.
+	// In DOSBox the teleporters will sound different in EOB I and II, due to different sound
+	// data offsets.
+	channel.offset = READ_LE_UINT16(dataptr) - 191; dataptr += 2;
 	channel.secondaryEffect = &AdLibDriver::secondaryEffect1;
 	return 0;
 }
-- 
cgit v1.2.3


From 2da431aa65da25388963687d398f4a40f2aeee73 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 6 Nov 2011 14:57:01 +0100
Subject: KYRA: (AdLib Driver) - increase versions and add necessary EOB
 modifications

---
 engines/kyra/kyra_v1.h       |  4 ++-
 engines/kyra/sound_adlib.cpp | 81 +++++++++++++++++++++++++++++---------------
 2 files changed, 56 insertions(+), 29 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 5a9feb0054..24a3b35418 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -134,7 +134,9 @@ enum {
 	GI_KYRA1 = 0,
 	GI_KYRA2 = 1,
 	GI_KYRA3 = 2,
-	GI_LOL = 4
+	GI_LOL = 4,
+	GI_EOB1 = 5,
+	GI_EOB2 = 6
 };
 
 struct AudioDataStruct {
diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index 2bce5a2c59..983d3b6031 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -224,7 +224,7 @@ private:
 	}
 
 	uint8 *getInstrument(int instrumentId) {
-		return _soundData + READ_LE_UINT16(_soundData + ((_version == 2) ? 1000 : 500) + 2 * instrumentId);
+		return getProgram(_numPrograms + instrumentId);
 	}
 
 	void setupPrograms();
@@ -400,6 +400,7 @@ private:
 
 	uint8 _musicVolume, _sfxVolume;
 
+	int _numPrograms;
 	int _version;
 };
 
@@ -407,6 +408,7 @@ AdLibDriver::AdLibDriver(Audio::Mixer *mixer, int version) {
 	setupParserOpcodeTable();
 
 	_version = version;
+	_numPrograms = (_version == 1) ? 150 : ((_version == 4) ? 500 : 250);
 
 	_mixer = mixer;
 
@@ -472,8 +474,8 @@ void AdLibDriver::setMusicVolume(uint8 volume) {
 		writeOPL(0x43 + regOffset, calculateOpLevel2(chan));
 	}
 
-	// For now we use the music volume for both sfx and music in Kyra1.
-	if (_version < 2) {
+	// For now we use the music volume for both sfx and music in Kyra1 and Eob
+	if (_version < 4) {
 		_sfxVolume = volume;
 
 		for (uint i = 6; i < 9; ++i) {
@@ -490,8 +492,8 @@ void AdLibDriver::setMusicVolume(uint8 volume) {
 }
 
 void AdLibDriver::setSfxVolume(uint8 volume) {
-	// We only support sfx volume in version 2 games.
-	if (_version < 2)
+	// We only support sfx volume in version 4 games.
+	if (_version < 4)
 		return;
 
 	Common::StackLock lock(_mutex);
@@ -655,15 +657,17 @@ void AdLibDriver::adjustSfxData(uint8 *ptr, int volume) {
 	_sfxVelocity = ptr[3];
 
 	// Adjust the values.
-	if (_version >= 1) {
-		int newVal = ((((ptr[3]) + 63) * volume) >> 8) & 0xFF;
-		ptr[3] = -newVal + 63;
-		ptr[1] = ((ptr[1] * volume) >> 8) & 0xFF;
-	} else {
-		int newVal = ((_sfxVelocity << 2) ^ 0xff) * volume;
-		ptr[3] = (newVal >> 10) ^ 0x3f;
-		ptr[1] = newVal >> 11;
-	}	
+	if (volume != 0xff) {
+		if (_version >= 3) {
+			int newVal = ((((ptr[3]) + 63) * volume) >> 8) & 0xFF;
+			ptr[3] = -newVal + 63;
+			ptr[1] = ((ptr[1] * volume) >> 8) & 0xFF;
+		} else {
+			int newVal = ((_sfxVelocity << 2) ^ 0xff) * volume;
+			ptr[3] = (newVal >> 10) ^ 0x3f;
+			ptr[1] = newVal >> 11;
+		}
+	}
 }
 
 // A few words on opcode parsing and timing:
@@ -1368,7 +1372,10 @@ int AdLibDriver::update_setNoteSpacing(uint8 *&dataptr, Channel &channel, uint8
 int AdLibDriver::update_jump(uint8 *&dataptr, Channel &channel, uint8 value) {
 	--dataptr;
 	int16 add = READ_LE_UINT16(dataptr); dataptr += 2;
-	dataptr += add;
+	if (_version == 1)
+		dataptr = _soundData + add - 191;
+	else
+		dataptr += add;
 	if (_syncJumpMask & (1 << (&channel - _channels)))
 		channel.lock = true;
 	return 0;
@@ -1378,7 +1385,10 @@ int AdLibDriver::update_jumpToSubroutine(uint8 *&dataptr, Channel &channel, uint
 	--dataptr;
 	int16 add = READ_LE_UINT16(dataptr); dataptr += 2;
 	channel.dataptrStack[channel.dataptrStackPos++] = dataptr;
-	dataptr += add;
+	if (_version < 3)
+		dataptr = _soundData + add - 191;
+	else
+		dataptr += add;
 	return 0;
 }
 
@@ -2251,21 +2261,36 @@ const int SoundAdLibPC::_kyra1NumSoundTriggers = ARRAYSIZE(SoundAdLibPC::_kyra1S
 SoundAdLibPC::SoundAdLibPC(KyraEngine_v1 *vm, Audio::Mixer *mixer)
 	: Sound(vm, mixer), _driver(0), _trackEntries(), _soundDataPtr(0) {
 	memset(_trackEntries, 0, sizeof(_trackEntries));
-	_version = ((_vm->game() == GI_KYRA2) || (_vm->game() == GI_LOL && !_vm->gameFlags().isDemo)) ? 2 : 1;
-	_driver = new AdLibDriver(mixer, _version);
-	assert(_driver);
 
+	_soundTriggers = 0;
+	_numSoundTriggers = 0;
 	_sfxPlayingSound = -1;
 	_soundFileLoaded.clear();
 
-	if (_version == 1) {
+	switch (vm->game()) {
+	case GI_LOL:
+		_version = _vm->gameFlags().isDemo ? 3 : 4;
+		break;
+	case GI_KYRA2:
+		_version = 4;
+		break;
+	case GI_KYRA1:
+		_version = 3;
 		_soundTriggers = _kyra1SoundTriggers;
 		_numSoundTriggers = _kyra1NumSoundTriggers;
-	} else {
-		// TODO: Figure out if Kyra 2 uses sound triggers at all.
-		_soundTriggers = 0;
-		_numSoundTriggers = 0;
+		break;
+	case GI_EOB2:
+		_version = 2;
+		break;
+	case GI_EOB1:
+		_version = 1;
+		break;
+	default:
+		break;
 	}
+
+	_driver = new AdLibDriver(mixer, _version);
+	assert(_driver);
 }
 
 SoundAdLibPC::~SoundAdLibPC() {
@@ -2342,12 +2367,12 @@ void SoundAdLibPC::playSoundEffect(uint8 track, uint8 volume) {
 void SoundAdLibPC::play(uint8 track, uint8 volume) {
 	uint16 soundId = 0;
 
-	if (_version == 2)
+	if (_version == 4)
 		soundId = READ_LE_UINT16(&_trackEntries[track<<1]);
 	else
 		soundId = _trackEntries[track];
 
-	if ((soundId == 0xFFFF && _version == 2) || (soundId == 0xFF && _version < 2) || !_soundDataPtr)
+	if ((soundId == 0xFFFF && _version == 4) || (soundId == 0xFF && _version < 4) || !_soundDataPtr)
 		return;
 
 	_driver->queueTrack(soundId, volume);
@@ -2374,7 +2399,7 @@ void SoundAdLibPC::loadSoundFile(Common::String file) {
 }
 
 void SoundAdLibPC::internalLoadFile(Common::String file) {
-	file += ".ADL";
+	file += ((_version == 1) ? ".DAT" : ".ADL");
 	if (_soundFileLoaded == file)
 		return;
 
@@ -2398,7 +2423,7 @@ void SoundAdLibPC::internalLoadFile(Common::String file) {
 	int soundDataSize = fileSize;
 	uint8 *p = fileData;
 
-	if (_version == 2) {
+	if (_version == 4) {
 		memcpy(_trackEntries, p, 500);
 		p += 500;
 		soundDataSize -= 500;
-- 
cgit v1.2.3


From 2bcae2451a9e5e59c2ad30e5c8560d9b8e117501 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 6 Nov 2011 21:31:18 +0100
Subject: KYRA: (AdLib Driver) - prevent squashing of sounds during halt track
 execution

This patch makes sure that the stopping track (track 0) does not squash sounds which get queued during the execution of the stopping track. This seems to be a hardware problem (original driver implementation not suitable for modern machines).
---
 engines/kyra/sound_adlib.cpp | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index 983d3b6031..94a285d729 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -360,13 +360,17 @@ private:
 	uint8 *_soundData;
 
 	struct QueueEntry {
+		QueueEntry() : data(0), id(0), volume(0) {}
+		QueueEntry(uint8 *ptr, uint8 track, uint8 vol) : data(ptr), id(track), volume(vol) {}
 		uint8 *data;
+		uint8 id;
 		uint8 volume;
 	};
 
 	QueueEntry _programQueue[16];
 	int _programStartTimeout;
 	int _programQueueStart, _programQueueEnd;
+	bool _retrySounds;
 
 	void adjustSfxData(uint8 *data, int volume);
 	uint8 *_sfxPointer;
@@ -450,6 +454,7 @@ AdLibDriver::AdLibDriver(Audio::Mixer *mixer, int version) {
 	_sfxPointer = 0;
 
 	_programQueueStart = _programQueueEnd = 0;
+	_retrySounds = false;
 }
 
 AdLibDriver::~AdLibDriver() {
@@ -545,8 +550,7 @@ void AdLibDriver::queueTrack(int track, int volume) {
 		return;
 	}
 
-	_programQueue[_programQueueEnd].data = trackData;
-	_programQueue[_programQueueEnd].volume = volume;
+	_programQueue[_programQueueEnd] = QueueEntry(trackData, track, volume);
 	_programQueueEnd = (_programQueueEnd + 1) & 15;
 }
 
@@ -570,6 +574,7 @@ void AdLibDriver::stopAllChannels() {
 		if (channel != 9)
 			noteOff(chan);
 	}
+	_retrySounds = false;
 }
 
 // timer callback
@@ -598,13 +603,25 @@ void AdLibDriver::setupPrograms() {
 		return;
 
 	uint8 *ptr = _programQueue[_programQueueStart].data;
-	// Clear the queue entry
-	_programQueue[_programQueueStart].data = 0;
-	_programQueueStart = (_programQueueStart + 1) & 15;
+
+	// The AdLib driver (in its old versions used for EOB) is not suitable for modern (fast) CPUs.
+	// The stop sound track (track 0 which has a priority of 50) will often still be busy when the
+	// next sound (with a lower priority) starts which will cause that sound to be skipped. We simply
+	// restart incoming sounds during stop sound execution.
+	// UPDATE: This stilly applies after introduction of the _programQueue.
+	QueueEntry retrySound;
+	if (_version < 3 && _programQueue[_programQueueStart].id == 0)
+		_retrySounds = true;
+	else if (_retrySounds)
+		retrySound = _programQueue[_programQueueStart];
 
 	// Adjust data in case we hit a sound effect.
 	adjustSfxData(ptr, _programQueue[_programQueueStart].volume);
 
+	// Clear the queue entry
+	_programQueue[_programQueueStart].data = 0;
+	_programQueueStart = (_programQueueStart + 1) & 15;
+
 	const int chan = *ptr++;
 	const int priority = *ptr++;
 
@@ -632,6 +649,13 @@ void AdLibDriver::setupPrograms() {
 		// This is (probably) required to assure that the sfx are started with
 		// the correct priority and velocity.
 		_programStartTimeout = 2;
+
+		retrySound = QueueEntry();
+	}
+
+	if (retrySound.data) {
+		debugC(9, kDebugLevelSound, "AdLibDriver::setupPrograms(): WORKAROUND - Restarting skipped sound %d)", retrySound.id);
+		queueTrack(retrySound.id, retrySound.volume);
 	}
 }
 
-- 
cgit v1.2.3


From 814c78e84ea4d75b2ac3442227120d4d14e7b18b Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 6 Nov 2011 22:19:26 +0100
Subject: KYRA: (AdLib Driver) - fix queue handling for Eob

Huge numbers of sound effects get started as soon as a couple of monsters are around. If we start dropping sound when the queue is full, we won't have any sounds in these situations, but we'll get tons of useless warnings instead.
---
 engines/kyra/sound_adlib.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index 94a285d729..e99990e1e0 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -545,7 +545,9 @@ void AdLibDriver::queueTrack(int track, int volume) {
 	if (!trackData)
 		return;
 
-	if (_programQueueEnd == _programQueueStart && _programQueue[_programQueueEnd].data != 0) {
+	// Don't drop tracks in Eob. The queue is always full there if a couple of monsters are around.
+	// If we drop the incoming tracks we get no sound effects, but tons of warnings instead.
+	if (_version >= 3 && _programQueueEnd == _programQueueStart && _programQueue[_programQueueEnd].data != 0) {
 		warning("AdLibDriver: Program queue full, dropping track %d", track);
 		return;
 	}
-- 
cgit v1.2.3


From 540d081a6fd4daa31f746ddf30ccc91fb88ea04b Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 11 Dec 2011 01:57:03 +0100
Subject: KYRA: (EOB) - initial code base commit

---
 engines/engines.mk               |    4 +
 engines/kyra/chargen.cpp         | 1495 ++++++++++++++++++++++++++
 engines/kyra/detection.cpp       |   11 +
 engines/kyra/detection_tables.h  |   74 ++
 engines/kyra/eob1.cpp            |  242 +++++
 engines/kyra/eob1.h              |   96 ++
 engines/kyra/eob2.cpp            |  437 ++++++++
 engines/kyra/eob2.h              |  119 +++
 engines/kyra/eobcommon.cpp       | 1845 ++++++++++++++++++++++++++++++++
 engines/kyra/eobcommon.h         |  977 +++++++++++++++++
 engines/kyra/gui.h               |    8 +-
 engines/kyra/gui_eob.cpp         | 2165 ++++++++++++++++++++++++++++++++++++++
 engines/kyra/gui_eob.h           |  130 +++
 engines/kyra/gui_lol.cpp         |   90 +-
 engines/kyra/gui_lol.h           |    2 -
 engines/kyra/items_eob.cpp       |  614 +++++++++++
 engines/kyra/kyra_hof.cpp        |    2 +-
 engines/kyra/kyra_hof.h          |    2 +-
 engines/kyra/kyra_mr.cpp         |    2 +-
 engines/kyra/kyra_mr.h           |    2 +-
 engines/kyra/kyra_v1.cpp         |   41 +-
 engines/kyra/kyra_v1.h           |    2 +-
 engines/kyra/kyra_v2.h           |    2 +-
 engines/kyra/lol.cpp             |  410 +++-----
 engines/kyra/lol.h               |  328 ++----
 engines/kyra/loleobbase.cpp      |  354 +++++++
 engines/kyra/loleobbase.h        |  324 ++++++
 engines/kyra/magic_eob.cpp       |  780 ++++++++++++++
 engines/kyra/module.mk           |   29 +
 engines/kyra/resource.cpp        |    4 +-
 engines/kyra/resource.h          |  319 +++++-
 engines/kyra/resource_intern.cpp |   11 +-
 engines/kyra/saveload_eob.cpp    |  549 ++++++++++
 engines/kyra/saveload_lol.cpp    |   96 +-
 engines/kyra/scene_eob.cpp       | 1350 ++++++++++++++++++++++++
 engines/kyra/scene_lol.cpp       |  733 +------------
 engines/kyra/screen.cpp          |   58 +-
 engines/kyra/screen.h            |   45 +-
 engines/kyra/screen_eob.cpp      |  965 +++++++++++++++++
 engines/kyra/screen_eob.h        |  105 ++
 engines/kyra/script.cpp          |    2 +-
 engines/kyra/script.h            |    4 +-
 engines/kyra/script_eob.cpp      | 1528 +++++++++++++++++++++++++++
 engines/kyra/script_eob.h        |  121 +++
 engines/kyra/script_hof.cpp      |    2 +-
 engines/kyra/script_lok.cpp      |    2 +-
 engines/kyra/script_lol.cpp      |   80 +-
 engines/kyra/script_mr.cpp       |    2 +-
 engines/kyra/script_tim.cpp      |  180 +---
 engines/kyra/script_tim.h        |   19 +-
 engines/kyra/sequences_eob1.cpp  |  140 +++
 engines/kyra/sequences_eob2.cpp  | 1277 ++++++++++++++++++++++
 engines/kyra/sound.cpp           |    2 +-
 engines/kyra/sound_lol.cpp       |   25 +-
 engines/kyra/sprites_eob.cpp     | 1249 ++++++++++++++++++++++
 engines/kyra/sprites_lol.cpp     |   77 +-
 engines/kyra/staticres.cpp       |   16 +-
 engines/kyra/staticres_eob.cpp   | 1062 +++++++++++++++++++
 engines/kyra/staticres_lol.cpp   |  190 ++--
 engines/kyra/text_eob.cpp        |  649 ++++++++++++
 engines/kyra/text_eob.h          |  112 ++
 engines/kyra/text_lol.cpp        |  501 +--------
 engines/kyra/text_lol.h          |   52 +-
 engines/kyra/timer.cpp           |    2 +-
 engines/kyra/timer_eob.cpp       |  378 +++++++
 engines/kyra/timer_lol.cpp       |   52 -
 66 files changed, 20176 insertions(+), 2370 deletions(-)
 create mode 100644 engines/kyra/chargen.cpp
 create mode 100644 engines/kyra/eob1.cpp
 create mode 100644 engines/kyra/eob1.h
 create mode 100644 engines/kyra/eob2.cpp
 create mode 100644 engines/kyra/eob2.h
 create mode 100644 engines/kyra/eobcommon.cpp
 create mode 100644 engines/kyra/eobcommon.h
 create mode 100644 engines/kyra/gui_eob.cpp
 create mode 100644 engines/kyra/gui_eob.h
 create mode 100644 engines/kyra/items_eob.cpp
 create mode 100644 engines/kyra/loleobbase.cpp
 create mode 100644 engines/kyra/loleobbase.h
 create mode 100644 engines/kyra/magic_eob.cpp
 create mode 100644 engines/kyra/saveload_eob.cpp
 create mode 100644 engines/kyra/scene_eob.cpp
 create mode 100644 engines/kyra/screen_eob.cpp
 create mode 100644 engines/kyra/screen_eob.h
 create mode 100644 engines/kyra/script_eob.cpp
 create mode 100644 engines/kyra/script_eob.h
 create mode 100644 engines/kyra/sequences_eob1.cpp
 create mode 100644 engines/kyra/sequences_eob2.cpp
 create mode 100644 engines/kyra/sprites_eob.cpp
 create mode 100644 engines/kyra/staticres_eob.cpp
 create mode 100644 engines/kyra/text_eob.cpp
 create mode 100644 engines/kyra/text_eob.h
 create mode 100644 engines/kyra/timer_eob.cpp

(limited to 'engines')

diff --git a/engines/engines.mk b/engines/engines.mk
index 5280bf92d7..9939506b86 100644
--- a/engines/engines.mk
+++ b/engines/engines.mk
@@ -87,6 +87,10 @@ MODULES += engines/kyra
 ifdef ENABLE_LOL
 DEFINES += -DENABLE_LOL
 endif
+
+ifdef ENABLE_EOB
+DEFINES += -DENABLE_EOB
+endif
 endif
 
 ifdef ENABLE_LASTEXPRESS
diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
new file mode 100644
index 0000000000..4a0e035483
--- /dev/null
+++ b/engines/kyra/chargen.cpp
@@ -0,0 +1,1495 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#include "kyra/eobcommon.h"
+#include "kyra/resource.h"
+#include "kyra/sound_intern.h"
+
+namespace Kyra {
+
+class CharacterGenerator {
+public:
+	CharacterGenerator(EobCoreEngine *vm, Screen_Eob *screen);
+	~CharacterGenerator();
+
+	void start(EobCharacter *characters, uint8 ***faceShapes);
+
+private:
+	void init();
+	void initButtonsFromList(int first, int numButtons);
+	void initButton(int index, int x, int y, int w, int h, int keyCode);
+	void checkForCompleteParty();
+	void toggleSpecialButton(int index, int bodyCustom, int pageNum);
+	void processSpecialButton(int index);
+	void highlightBoxFrame(int index);
+	int viewDeleteCharacter();
+	void createPartyMember();
+	int raceSexMenu();
+	int classMenu(int raceSex);
+	int alignmentMenu(int cClass);
+	void updateMagicShapes();
+	void generateStats(int index);
+	void modifyMenu();
+	void statsAndFacesMenu();
+	void faceSelectMenu();
+	int getNextFreeFaceShape(int shpIndex, int charSex, int step, int8 *selectedPortraits);
+	void processFaceMenuSelection(int index);
+	void printStats(int index, int mode);
+	void processNameInput(int index, int len, int textColor);
+	int rollDice();
+	int modifyStat(int index, int8 *stat1, int8 *stat2);
+	int getMaxHp(int cclass, int constitution, int level1, int level2, int level3);
+	int getMinHp(int cclass, int constitution, int level1, int level2, int level3);
+	void finish();
+
+	uint8 **_chargenMagicShapes;
+	uint8 **_chargenButtonLabels;
+	int _activeBox;
+	int _magicShapesBox;
+	int _updateBoxIndex;
+	int _updateBoxColorIndex;
+	int _updateBoxShapesIndex;
+	int _lastUpdateBoxShapesIndex;
+	uint32 _chargenBoxTimer;
+	uint32 _chargenMagicShapeTimer;
+	int8 _chargenSelectedPortraits[4];
+	int8 _chargenSelectedPortraits2[4];
+
+	uint16 _chargenMinStats[7];
+	uint16 _chargenMaxStats[7];
+
+	const char *const *_chargenStrings1;
+	const char *const *_chargenStrings2;
+	const char *const *_chargenStatStrings;
+	const char *const *_chargenRaceSexStrings;
+	const char *const *_chargenClassStrings;
+	const char *const *_chargenAlignmentStrings;
+	const char *const *_chargenEnterGameStrings;
+
+	const uint8 *_chargenStartLevels;
+	const uint8 *_chargenClassMinStats;
+	const uint8 *_chargenRaceMinStats;
+	const uint16 *_chargenRaceMaxStats;
+
+	static const EobChargenButtonDef _chargenButtonDefs[];
+	static const CreatePartyModButton _chargenModButtons[];
+	static const EobRect8 _chargenButtonBodyCoords[];
+	static const EobRect16 _chargenPortraitBoxFrames[];
+	static const int16 _chargenBoxX[];
+	static const int16 _chargenBoxY[];
+	static const int16 _chargenNameFieldX[];
+	static const int16 _chargenNameFieldY[];
+
+	static const int32 _classMenuMasks[];
+	static const int32 _alignmentMenuMasks[];
+
+	static const int16 _raceModifiers[];
+
+	EobCharacter *_characters;
+	uint8 **_faceShapes;
+
+	EobCoreEngine *_vm;
+	Screen_Eob *_screen;
+};
+
+void EobCoreEngine::startCharacterGeneration() {
+	CharacterGenerator(this, _screen).start(_characters, &_faceShapes);
+}
+
+CharacterGenerator::CharacterGenerator(EobCoreEngine *vm, Screen_Eob *screen) : _vm(vm), _screen(screen),
+	_characters(0), _faceShapes(0), _chargenMagicShapes(0), _chargenButtonLabels(0), _updateBoxIndex(-1),
+	_chargenBoxTimer(0), _chargenMagicShapeTimer(0), _updateBoxColorIndex(0), _updateBoxShapesIndex(0),
+	_lastUpdateBoxShapesIndex(0), _magicShapesBox(6), _activeBox(0) {
+
+	_chargenStatStrings = _vm->_chargenStatStrings;
+	_chargenRaceSexStrings = _vm->_chargenRaceSexStrings;
+	_chargenClassStrings = _vm->_chargenClassStrings;
+	_chargenAlignmentStrings = _vm->_chargenAlignmentStrings;
+
+	memset(_chargenSelectedPortraits, -1, sizeof(_chargenSelectedPortraits));
+	memset(_chargenSelectedPortraits2, 0, sizeof(_chargenSelectedPortraits2));
+	memset(_chargenMinStats, 0, sizeof(_chargenMinStats));
+	memset(_chargenMaxStats, 0, sizeof(_chargenMaxStats));
+
+	int temp;
+	_chargenStrings1 = _vm->staticres()->loadStrings(kEobBaseChargenStrings1, temp);
+	_chargenStrings2 = _vm->staticres()->loadStrings(kEobBaseChargenStrings2, temp);
+	_chargenStartLevels = _vm->staticres()->loadRawData(kEobBaseChargenStartLevels, temp);
+	_chargenEnterGameStrings = _vm->staticres()->loadStrings(kEobBaseChargenEnterGameStrings, temp);
+	_chargenClassMinStats = _vm->staticres()->loadRawData(kEobBaseChargenClassMinStats, temp);
+	_chargenRaceMinStats = _vm->staticres()->loadRawData(kEobBaseChargenRaceMinStats, temp);
+	_chargenRaceMaxStats = _vm->staticres()->loadRawDataBe16(kEobBaseChargenRaceMaxStats, temp);
+}
+
+CharacterGenerator::~CharacterGenerator() {
+	if (_chargenMagicShapes) {
+		for (int i = 0; i < 10; i++)
+			delete[] _chargenMagicShapes[i];
+		delete[] _chargenMagicShapes;
+	}
+
+	if (_chargenButtonLabels) {
+		for (int i = 0; i < 10; i++)
+			delete[] _chargenButtonLabels[i];
+		delete[] _chargenButtonLabels;
+	}
+}
+
+void CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
+	if (!characters && !faceShapes)
+		return;
+
+	_characters = characters;
+	_faceShapes = *faceShapes;
+
+	_vm->sound()->playTrack(0);
+
+	_vm->delay(_vm->_tickLength);
+
+	init();
+
+	_screen->setScreenDim(2);
+
+	checkForCompleteParty();
+	initButtonsFromList(0, 5);
+
+	_vm->sound()->playTrack(_vm->game() == GI_EOB1 ? 20 : 13);
+	_activeBox = 0;
+
+	for (bool loop = true; loop && (!_vm->shouldQuit()); ) {
+		highlightBoxFrame(_activeBox + 6);
+		_vm->sound()->process();
+		int inputFlag = _vm->checkInput(_vm->_activeButtons, false, 0);
+		_vm->removeInputTop();
+
+		if (inputFlag) {
+			if (inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT])
+				_activeBox ^= 1;
+			else if (inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN])
+				_activeBox ^= 2;
+			highlightBoxFrame(-1);
+		}
+
+		if (inputFlag & 0x8000) {
+			inputFlag = (inputFlag & 0x0f) - 1;
+			if (inputFlag == 4) {
+				loop = false;
+			} else {
+				_activeBox = inputFlag;
+				inputFlag = 43;
+			}
+		}
+
+		if (inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP5]) {
+			highlightBoxFrame(-1);
+			if (_characters[_activeBox].name[0]) {
+				int b = _activeBox;
+				if (viewDeleteCharacter())
+					loop = false;
+				if (b != _activeBox && !_characters[_activeBox].name[0])
+					createPartyMember();
+			} else {
+				createPartyMember();
+			}
+
+			initButtonsFromList(0, 5);
+			checkForCompleteParty();
+		}
+
+		if (loop == false) {
+			for (int i = 0; i < 4; i++) {
+				if (!_characters[i].name[0])
+					loop = true;
+			}
+		}
+	}
+
+	if (!_vm->shouldQuit()) {
+		processSpecialButton(15);
+		finish();
+	}
+
+	_vm->sound()->playTrack(15);
+
+	*faceShapes = _faceShapes;
+}
+
+void CharacterGenerator::init() {
+	_screen->loadEobBitmap("CHARGENA", 3, 3);
+	if (_faceShapes) {
+		for (int i = 0; i < 44; i++)
+			delete[] _faceShapes[i];
+		delete[] _faceShapes;
+	}
+
+	_faceShapes = new uint8*[44];
+	for (int i = 0; i < 44; i++)
+		_faceShapes[i] = _screen->encodeShape((i % 10) << 2, (i / 10) << 5, 4, 32, true);
+	_screen->_curPage = 0;
+
+	_screen->loadEobCpsFileToPage("CHARGEN", 0, 3, 3, 0);
+	_screen->loadEobBitmap("CHARGENB", 3, 3);
+	if (_chargenMagicShapes) {
+		for (int i = 0; i < 10; i++)
+			delete[] _chargenMagicShapes[i];
+		delete[] _chargenMagicShapes;
+	}
+
+	_chargenMagicShapes = new uint8*[10];
+	for (int i = 0; i < 10; i++)
+		_chargenMagicShapes[i] = _screen->encodeShape(i << 2, 0, 4, 32, true);
+
+	_chargenButtonLabels = new uint8*[17];
+	for (int i = 0; i < 17; i++) {
+		const CreatePartyModButton *c = &_chargenModButtons[i];
+		_chargenButtonLabels[i] = c->labelW? _screen->encodeShape(c->encodeLabelX, c->encodeLabelY, c->labelW, c->labelH, true) : 0;
+	}
+
+	_screen->copyPage(3, 2);
+	_screen->_curPage = 0;
+	_screen->copyRegion(144, 64, 0, 0, 180, 128, 0, 2, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+}
+
+void CharacterGenerator::initButtonsFromList(int first, int numButtons) {
+	_vm->gui_resetButtonList();
+
+	for (int i = 0; i < numButtons; i++) {
+		const EobChargenButtonDef *e = &_chargenButtonDefs[first + i];
+		initButton(i, e->x, e->y, e->w, e->h, e->keyCode);
+	}
+
+	_vm->gui_notifyButtonListChanged();
+}
+
+void CharacterGenerator::initButton(int index, int x, int y, int w, int h, int keyCode) {
+	Button *b = 0;
+	int cnt = 1;
+
+	if (_vm->_activeButtons) {
+		Button *n = _vm->_activeButtons;
+		while (n->nextButton) {
+			++cnt;
+			n = n->nextButton;
+		}
+
+		++cnt;
+		b = n->nextButton = &_vm->_activeButtonData[cnt];
+	} else {
+		b = &_vm->_activeButtonData[0];
+		_vm->_activeButtons = b;
+	}
+
+	*b = Button();
+	b->flags = 0x1100;
+	b->data0Val2 = 12;
+	b->data1Val2 = b->data2Val2 = 15;
+	b->data3Val2 = 8;
+
+	b->index = index + 1;
+	b->x = x << 3;
+	b->y = y;
+	b->width = w;
+	b->height = h;
+	b->keyCode = keyCode;
+	b->keyCode2 = keyCode + 0x100;
+}
+
+void CharacterGenerator::checkForCompleteParty() {
+	_screen->copyRegion(0, 0, 160, 0, 160, 128, 2, 2, Screen::CR_NO_P_CHECK);
+	int cp = _screen->setCurPage(2);
+	_screen->printShadedText(_chargenStrings1[8], 168, 16, 15, 0);
+	_screen->setCurPage(cp);
+	_screen->copyRegion(160, 0, 144, 64, 160, 128, 2, 0, Screen::CR_NO_P_CHECK);
+
+	int numChars = 0;
+	for (int i = 0; i < 4; i++) {
+		if (_characters[i].name[0])
+			numChars++;
+	}
+
+	if (numChars == 4) {
+		_screen->setCurPage(2);
+		_screen->printShadedText(_chargenStrings1[0], 168, 61, 15, 0);
+		_screen->setCurPage(0);
+		_screen->copyRegion(168, 61, 152, 125, 136, 40, 2, 0, Screen::CR_NO_P_CHECK);
+		toggleSpecialButton(15, 0, 0);
+	} else {
+		toggleSpecialButton(14, 0, 0);
+	}
+
+	_screen->updateScreen();
+}
+
+void CharacterGenerator::toggleSpecialButton(int index, int bodyCustom, int pageNum) {
+	if (index >= 17)
+		return;
+
+	const CreatePartyModButton *c = &_chargenModButtons[index];
+	const EobRect8 *p = &_chargenButtonBodyCoords[c->bodyIndex + bodyCustom];
+
+	int x2 = 20;
+	int y2 = 0;
+
+	if (pageNum) {
+		x2 = c->destX + 2;
+		y2 = c->destY - 64;
+	}
+
+	_screen->copyRegion(p->x << 3, p->y, x2 << 3, y2, p->w << 3, p->h, 2, 2, Screen::CR_NO_P_CHECK);
+	if (c->labelW)
+		_screen->drawShape(2, _chargenButtonLabels[index], (x2 << 3) + c->labelX, y2 + c->labelY, 0);
+
+	if (pageNum == 2)
+		return;
+
+	_screen->copyRegion(160, 0, c->destX << 3, c->destY, p->w << 3, p->h, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+}
+
+void CharacterGenerator::processSpecialButton(int index) {
+	toggleSpecialButton(index, 1, 0);
+	_vm->sound()->playSoundEffect(76);
+	_vm->_system->delayMillis(80);
+	toggleSpecialButton(index, 0, 0);
+}
+
+void CharacterGenerator::highlightBoxFrame(int index) {
+	static const uint8 colorTable[] = { 0x0F, 0xB0, 0xB2, 0xB4, 0xB6,
+		0xB8, 0xBA, 0xBC, 0x0C, 0xBC, 0xBA, 0xB8, 0xB6, 0xB4, 0xB2, 0xB0, 0x00
+	};
+
+	if (_updateBoxIndex == index) {
+		if (_updateBoxIndex == -1)
+			return;
+
+		if (_vm->_system->getMillis() <= _chargenBoxTimer)
+			return;
+
+		if (!colorTable[_updateBoxColorIndex])
+			_updateBoxColorIndex = 0;
+
+		const EobRect16 *r = &_chargenPortraitBoxFrames[_updateBoxIndex];
+		_screen->drawBox(r->x1, r->y1, r->x2, r->y2, colorTable[_updateBoxColorIndex++]);
+		_screen->updateScreen();
+
+		_chargenBoxTimer = _vm->_system->getMillis() + _vm->_tickLength;
+
+	} else {
+		if (_updateBoxIndex != -1) {
+			const EobRect16 *r = &_chargenPortraitBoxFrames[_updateBoxIndex];
+			_screen->drawBox(r->x1, r->y1, r->x2, r->y2, 12);
+			_screen->updateScreen();
+		}
+
+		_updateBoxColorIndex = 0;
+		_updateBoxIndex = index;
+		_chargenBoxTimer = _vm->_system->getMillis();
+	}
+}
+
+int CharacterGenerator::viewDeleteCharacter() {
+	initButtonsFromList(0, 7);
+	_vm->removeInputTop();
+
+	highlightBoxFrame(-1);
+	printStats(_activeBox, 2);
+
+	int res = 0;
+	for (bool loop = true; loop && _characters[_activeBox].name[0] && !_vm->shouldQuit(); ) {
+		highlightBoxFrame(_activeBox + 6);
+		_vm->sound()->process();
+
+		int inputFlag = _vm->checkInput(_vm->_activeButtons, false, 0);
+		int cbx = _activeBox;
+		_vm->removeInputTop();
+
+		if (inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE]) {
+			processSpecialButton(9);
+			res = 0;
+			loop = false;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT]) {
+			cbx ^= 1;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN]) {
+			cbx ^= 2;
+		}
+
+		if (inputFlag & 0x8000) {
+			inputFlag = (inputFlag & 0x0f) - 1;
+			if (inputFlag == 4) {
+				res = 1;
+				loop = false;
+			} else if (inputFlag == 5) {
+				processSpecialButton(9);
+				res = 0;
+				loop = false;
+			} else if (inputFlag == 6) {
+				if (_characters[_activeBox].name[0]) {
+					processSpecialButton(16);
+					_characters[_activeBox].name[0] = 0;
+					processNameInput(_activeBox, 1, 12);
+					processFaceMenuSelection(_activeBox + 50);
+				}
+			} else {
+				cbx = inputFlag;
+			}
+		}
+
+		if (loop == false)
+			highlightBoxFrame(-1);
+
+		if (!_characters[cbx].name[0])
+			loop = false;
+
+		if (cbx != _activeBox) {
+			_activeBox = cbx;
+			highlightBoxFrame(-1);
+			if (loop)
+				printStats(_activeBox, 2);
+		}
+	}
+
+	return res;
+}
+
+void CharacterGenerator::createPartyMember() {
+	_screen->setScreenDim(2);
+	_chargenBoxTimer = 0;
+
+	for (int i = 0; i != 3 && !_vm->shouldQuit(); i++) {
+		bool bck = false;
+
+		switch (i) {
+		case 0:
+			_characters[_activeBox].raceSex = raceSexMenu();
+			break;
+		case 1:
+			_characters[_activeBox].cClass = classMenu(_characters[_activeBox].raceSex);
+			if (_characters[_activeBox].cClass == _vm->_keyMap[Common::KEYCODE_ESCAPE])
+				bck = true;
+			break;
+		case 2:
+			_characters[_activeBox].alignment = alignmentMenu(_characters[_activeBox].cClass);
+			if (_characters[_activeBox].alignment == _vm->_keyMap[Common::KEYCODE_ESCAPE])
+				bck = true;
+			break;
+		default:
+			break;
+		}
+
+		if (bck)
+			i -= 2;
+	};
+
+	if (!_vm->shouldQuit()) {
+		generateStats(_activeBox);
+		statsAndFacesMenu();
+
+		for (_characters[_activeBox].name[0] = 0; _characters[_activeBox].name[0] == 0 && !_vm->shouldQuit(); ) {
+			processFaceMenuSelection(_chargenMinStats[6]);
+			printStats(_activeBox, 0);
+			_screen->printShadedText(_chargenStrings2[11], 149, 100, 9, 0);
+			if (!_vm->shouldQuit())
+				processNameInput(_activeBox, _vm->_gui->getTextInput(_characters[_activeBox].name, 24, 100, 10, 15, 0, 8), 2);
+		}
+	}
+}
+
+int CharacterGenerator::raceSexMenu() {
+	_screen->drawBox(_chargenBoxX[_activeBox], _chargenBoxY[_activeBox], _chargenBoxX[_activeBox] + 32, _chargenBoxY[_activeBox] + 33, 12);
+	_screen->copyRegion(0, 0, 144, 64, 160, 128, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->printShadedText(_chargenStrings2[8], 147, 67, 9, 0);
+	_vm->removeInputTop();
+
+	_vm->_gui->setupMenu(1, 0, _chargenRaceSexStrings, -1, 0, 0);
+	int16 res = -1;
+
+	while (res == -1 && !_vm->shouldQuit()) {
+		res = _vm->_gui->handleMenu(1, _chargenRaceSexStrings, 0, -1, 0);
+		updateMagicShapes();
+	}
+
+	return res;
+}
+
+int CharacterGenerator::classMenu(int raceSex) {
+	int32 itemsMask = -1;
+
+	for (int i = 0; i < 4; i++) {
+		// check for evil characters
+		if (_characters[i].name[0] && _characters[i].alignment > 5)
+			itemsMask = 0xFFFB;
+	}
+
+	_vm->removeInputTop();
+	updateMagicShapes();
+
+	_screen->copyRegion(0, 0, 144, 64, 160, 128, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->printShadedText(_chargenStrings2[9], 147, 67, 9, 0);
+
+	toggleSpecialButton(5, 0, 0);
+
+	itemsMask &=_classMenuMasks[raceSex / 2];
+	_vm->_gui->setupMenu(2, 15, _chargenClassStrings, itemsMask, 0, 0);
+
+	_vm->_mouseX = _vm->_mouseY = 0;
+	int16 res = -1;
+
+	while (res == -1 && !_vm->shouldQuit()) {
+		updateMagicShapes();
+
+		int in = _vm->checkInput(0, false, 0) & 0xff;
+		Common::Point mp = _vm->getMousePos();
+
+		if (in == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_b]) {
+			res = _vm->_keyMap[Common::KEYCODE_ESCAPE];
+		} else if (_vm->posWithinRect(mp.x, mp.y, 264, 171, 303, 187)) {
+			if (in == 199 || in == 201)
+				res = _vm->_keyMap[Common::KEYCODE_ESCAPE];
+			else
+				_vm->removeInputTop();
+		} else {
+			res = _vm->_gui->handleMenu(2, _chargenClassStrings, 0, itemsMask, 0);
+		}
+	}
+
+	_vm->removeInputTop();
+
+	if (res == _vm->_keyMap[Common::KEYCODE_ESCAPE])
+		processSpecialButton(5);
+
+	return res;
+}
+
+int CharacterGenerator::alignmentMenu(int cClass) {
+	int32 itemsMask = -1;
+
+	for (int i = 0; i < 4; i++) {
+		// check for paladins
+		if (_characters[i].name[0] && _characters[i].cClass == 2)
+			itemsMask = 0xFE3F;
+	}
+
+	_vm->removeInputTop();
+	updateMagicShapes();
+
+	_screen->copyRegion(0, 0, 144, 64, 160, 128, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->printShadedText(_chargenStrings2[10], 147, 67, 9, 0);
+
+	toggleSpecialButton(5, 0, 0);
+
+	itemsMask &=_alignmentMenuMasks[cClass];
+	_vm->_gui->setupMenu(3, 9, _chargenAlignmentStrings, itemsMask, 0, 0);
+
+	_vm->_mouseX = _vm->_mouseY = 0;
+	int16 res = -1;
+
+	while (res == -1 && !_vm->shouldQuit()) {
+		updateMagicShapes();
+
+		int in = _vm->checkInput(0, false, 0) & 0xff;
+		Common::Point mp = _vm->getMousePos();
+
+		if (in == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_b]) {
+			res = _vm->_keyMap[Common::KEYCODE_ESCAPE];
+		} else if (_vm->posWithinRect(mp.x, mp.y, 264, 171, 303, 187)) {
+			if (in == 199 || in == 201)
+				res = _vm->_keyMap[Common::KEYCODE_ESCAPE];
+			else
+				_vm->removeInputTop();
+		} else {
+			res = _vm->_gui->handleMenu(3, _chargenAlignmentStrings, 0, itemsMask, 0);
+		}
+	}
+
+	_vm->removeInputTop();
+
+	if (res == _vm->_keyMap[Common::KEYCODE_ESCAPE])
+		processSpecialButton(5);
+
+	return res;
+}
+
+void CharacterGenerator::updateMagicShapes() {
+	_vm->sound()->process();
+
+	if (_magicShapesBox != _activeBox) {
+		_chargenMagicShapeTimer = 0;
+		_magicShapesBox = _activeBox;
+	}
+
+	if (_chargenMagicShapeTimer < _vm->_system->getMillis()) {
+		if (++_updateBoxShapesIndex > 9)
+			_updateBoxShapesIndex = 0;
+		_chargenMagicShapeTimer = _vm->_system->getMillis() + 2 * _vm->_tickLength;
+	}
+
+	if (_updateBoxShapesIndex == _lastUpdateBoxShapesIndex)
+		return;
+
+	_screen->copyRegion(_activeBox << 5, 128, 288, 128, 32, 32, 2, 2, Screen::CR_NO_P_CHECK);
+	_screen->drawShape(2, _chargenMagicShapes[_updateBoxShapesIndex], 288, 128, 0);
+	_screen->copyRegion(288, 128, _chargenBoxX[_activeBox], _chargenBoxY[_activeBox] + 1, 32, 32, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+
+	_lastUpdateBoxShapesIndex = _updateBoxShapesIndex;
+}
+
+void CharacterGenerator::generateStats(int index) {
+	EobCharacter *c = &_characters[index];
+
+	for (int i = 0; i < 3; i++) {
+		c->level[i] = _chargenStartLevels[(c->cClass << 2) + i];
+		c->experience[i] = (_vm->game() == GI_EOB2 ? 69000 : 5000) / _chargenStartLevels[(c->cClass << 2) + 3];
+	}
+
+	int rc = c->raceSex >> 1;
+	for (int i = 0; i < 6; i++) {
+		_chargenMinStats[i] = MAX(_chargenClassMinStats[c->cClass * 6 + i], _chargenRaceMinStats[rc * 6 + i]);
+		_chargenMaxStats[i] = _chargenRaceMaxStats[rc * 6 + i];
+	}
+
+	if (_vm->_charClassModUnk[c->cClass])
+		_chargenMaxStats[0] = 18;
+
+	uint16 sv[6];
+	for (int i = 0; i < 6; i++) {
+		sv[i] = MAX<uint16>(rollDice() + _raceModifiers[rc * 6 + i], _chargenMinStats[i]);
+		if (!i && sv[i] == 18)
+			sv[i] |= (uint16)(_vm->rollDice(1, 100) << 8);
+		if (sv[i] > _chargenMaxStats[i])
+			sv[i] = _chargenMaxStats[i];
+	}
+
+	c->strengthCur = c->strengthMax = sv[0] & 0xff;
+	c->strengthExtCur = c->strengthExtMax = sv[0] >> 8;
+	c->intelligenceCur = c->intelligenceMax = sv[1] & 0xff;
+	c->wisdomCur = c->wisdomMax = sv[2] & 0xff;
+	c->dexterityCur = c->dexterityMax = sv[3] & 0xff;
+	c->constitutionCur = c->constitutionMax = sv[4] & 0xff;
+	c->charismaCur = c->charismaMax = sv[5] & 0xff;
+	c->armorClass = 10 + _vm->getDexterityArmorClassModifier(sv[3] & 0xff);
+	c->hitPointsCur = 0;
+
+	for (int l = 0; l < 3; l++) {
+		for (int i = 0; i < c->level[l]; i++)
+			c->hitPointsCur += _vm->generateCharacterHitpointsByLevel(index, 1 << l);
+	}
+
+	c->hitPointsMax = c->hitPointsCur;
+}
+
+void CharacterGenerator::modifyMenu() {
+	_vm->removeInputTop();
+	printStats(_activeBox, 3);
+
+	EobCharacter *c = &_characters[_activeBox];
+	int8 hpLO = c->hitPointsCur;
+
+	for (int i = 0; i >= 0 && i < 7; ) {
+		switch (i) {
+		case 0:
+			i = modifyStat(i, &c->strengthCur, &c->strengthExtCur);
+			break;
+		case 1:
+			i = modifyStat(i, &c->intelligenceCur, 0);
+			break;
+		case 2:
+			i = modifyStat(i, &c->wisdomCur, 0);
+			break;
+		case 3:
+			i = modifyStat(i, &c->dexterityCur, 0);
+			break;
+		case 4:
+			i = modifyStat(i, &c->constitutionCur, 0);
+			break;
+		case 5:
+			i = modifyStat(i, &c->charismaCur, 0);
+			break;
+		case 6:
+			hpLO = c->hitPointsCur;
+			i = modifyStat(i, &hpLO, 0);
+			c->hitPointsCur = hpLO;
+			break;
+		default:
+			break;
+		}
+
+		if (i == -2 || _vm->shouldQuit())
+			break;
+		else if (i < 0)
+			i = 6;
+		i %= 7;
+
+		printStats(_activeBox, 3);
+	}
+
+	printStats(_activeBox, 1);
+}
+
+void CharacterGenerator::statsAndFacesMenu() {
+	faceSelectMenu();
+	printStats(_activeBox, 1);
+	initButtonsFromList(27, 4);
+	_vm->removeInputTop();
+	int in = 0;
+
+	while (!in && !_vm->shouldQuit()) {
+		updateMagicShapes();
+		in = _vm->checkInput(_vm->_activeButtons, false, 0);
+		_vm->removeInputTop();
+
+		if (in == 0x8001) {
+			processSpecialButton(4);
+			updateMagicShapes();
+			generateStats(_activeBox);
+			in = -1;
+		} else if (in == 0x8002) {
+			processSpecialButton(7);
+			modifyMenu();
+			in = -1;
+		} else if (in == 0x8003) {
+			processSpecialButton(8);
+			faceSelectMenu();
+			in = -1;
+		} else if (in == 0x8004 || in == _vm->_keyMap[Common::KEYCODE_KP5]) {
+			processSpecialButton(6);
+			in = 1;
+		} else {
+			in = 0;
+		}
+
+		if (in & 0x8000) {
+			printStats(_activeBox, 1);
+			initButtonsFromList(27, 4);
+			in = 0;
+		}
+	}
+
+	highlightBoxFrame(6 + _activeBox);
+	highlightBoxFrame(-1);
+}
+
+void CharacterGenerator::faceSelectMenu() {
+	int8 sp[4];
+	memcpy(sp, _chargenSelectedPortraits2, sizeof(sp));
+	_vm->removeInputTop();
+	initButtonsFromList(21, 6);
+
+	int charSex = _characters[_activeBox].raceSex % 2;
+	int8 shp = charSex ? 26 : 0;
+
+	printStats(_activeBox, 4);
+	toggleSpecialButton(12, 0, 0);
+	toggleSpecialButton(13, 0, 0);
+	highlightBoxFrame(-1);
+
+	shp = getNextFreeFaceShape(shp, charSex, 1, _chargenSelectedPortraits);
+
+	int res = -1;
+	int box = 1;
+
+	while (res == -1 && !_vm->shouldQuit()) {
+		int8 shpOld = shp;
+
+		for (int i = 0; i < 4; i++) {
+			sp[i] = shp;
+			_screen->drawShape(0, _faceShapes[sp[i]], 176 + (i << 5), 66, 0);
+			shp = getNextFreeFaceShape(shp + 1, charSex, 1, _chargenSelectedPortraits);
+		}
+
+		shp = shpOld;
+		int in = 0;
+
+		while (!in && !_vm->shouldQuit()) {
+			updateMagicShapes();
+			in = _vm->checkInput(_vm->_activeButtons, false, 0);
+			_vm->removeInputTop();
+
+			highlightBoxFrame(box + 10);
+
+			if (in == 0x8002 || in == _vm->_keyMap[Common::KEYCODE_RIGHT]) {
+				processSpecialButton(13);
+				in = 2;
+			} else if (in > 0x8002 && in < 0x8007) {
+				box = (in & 7) - 3;
+				in = 3;
+			} else if (in == 0x8001 || in == _vm->_keyMap[Common::KEYCODE_LEFT]) {
+				processSpecialButton(12);
+				in = 1;
+			} else if (in == _vm->_keyMap[Common::KEYCODE_RETURN] || in == _vm->_keyMap[Common::KEYCODE_KP5]) {
+				in = 3;
+			} else if (in & 0x8000) {
+				in &= 0xff;
+			} else {
+				in = 0;
+			}
+		}
+
+		highlightBoxFrame(-1);
+
+		if (in == 1)
+			shp = getNextFreeFaceShape(shp - 1, charSex, -1, _chargenSelectedPortraits);
+		else if (in == 2)
+			shp = getNextFreeFaceShape(shp + 1, charSex, 1, _chargenSelectedPortraits);
+		else if (in == 3)
+			res = box;
+	}
+
+	if (!_vm->shouldQuit()) {
+		highlightBoxFrame(-1);
+		updateMagicShapes();
+
+		_chargenSelectedPortraits[_activeBox] = sp[res];
+		_characters[_activeBox].portrait = sp[res];
+		_characters[_activeBox].faceShape = _faceShapes[sp[res]];
+
+		printStats(_activeBox, 1);
+	}
+}
+
+int CharacterGenerator::getNextFreeFaceShape(int shpIndex, int charSex, int step, int8 *selectedPortraits) {
+	int shpCur = ((shpIndex < 0) ? 43 : shpIndex) % 44;
+	bool notUsable = false;
+
+	do {
+		notUsable = false;
+		for (int i = 0; i < 4; i++) {
+			if (_characters[i].name[0] && selectedPortraits[i] == shpCur)
+				notUsable = true;
+		}
+
+		if ((charSex && (shpCur < 26)) || (!charSex && (shpCur > 28)))
+			notUsable = true;
+
+		if (notUsable) {
+			shpCur += step;
+			shpCur = ((shpCur < 0) ? 43 : shpCur) % 44;
+		}
+	} while (notUsable);
+
+	return shpCur;
+}
+
+void CharacterGenerator::processFaceMenuSelection(int index) {
+	highlightBoxFrame(-1);
+	if (index <= 48)
+		_screen->drawShape(0, _characters[_activeBox].faceShape, _chargenBoxX[_activeBox], _chargenBoxY[_activeBox] + 1, 0);
+	else
+		toggleSpecialButton(index - 50, 0, 0);
+}
+
+void CharacterGenerator::printStats(int index, int mode) {
+	_screen->copyRegion(0, 0, 160, 0, 160, 128, 2, 2, Screen::CR_NO_P_CHECK);
+	_screen->_curPage = 2;
+
+	EobCharacter *c = &_characters[index];
+
+	if (mode != 4)
+		_screen->drawShape(2, c->faceShape, 224, 2, 0);
+
+	_screen->printShadedText(c->name, 160 + ((20 - strlen(c->name)) << 2), 35, 15, 0);
+	_screen->printShadedText(_chargenRaceSexStrings[c->raceSex], 160 + ((20 - strlen(_chargenRaceSexStrings[c->raceSex])) << 2), 45, 15, 0);
+	_screen->printShadedText(_chargenClassStrings[c->cClass], 160 + ((20 - strlen(_chargenClassStrings[c->cClass])) << 2), 54, 15, 0);
+
+	for (int i = 0; i < 6; i++)
+		_screen->printShadedText(_chargenStatStrings[i], 163, (i + 8) << 3, 15, 0);
+
+	_screen->printShadedText(_chargenStrings1[2], 248, 64, 15, 0);
+
+	char str[22];
+	snprintf(str, 22,  _chargenStrings1[3], _vm->getCharStrength(c->strengthCur, c->strengthExtCur), c->intelligenceCur, c->wisdomCur, c->dexterityCur, c->constitutionCur, c->charismaCur);
+	_screen->printShadedText(str, 192, 64, 15, 0);
+
+	snprintf(str, 22, _chargenStrings1[4], c->armorClass, c->hitPointsMax);
+	_screen->printShadedText(str, 280, 64, 15, 0);
+
+	const char *lvlStr = c->level[2] ? _chargenStrings1[7] : (c->level[1] ? _chargenStrings1[6] : _chargenStrings1[5]);
+	snprintf(str, 22, lvlStr, c->level[0], c->level[1], c->level[2]);
+	_screen->printShadedText(str, 280, 80, 15, 0);
+
+	switch (mode) {
+	case 1:
+		toggleSpecialButton(4, 0, 2);
+		toggleSpecialButton(7, 0, 2);
+		toggleSpecialButton(8, 0, 2);
+		toggleSpecialButton(6, 0, 2);
+		break;
+
+	case 2:
+		toggleSpecialButton(16, 0, 2);
+		toggleSpecialButton(9, 0, 2);
+		break;
+
+	case 3:
+		toggleSpecialButton(10, 0, 2);
+		toggleSpecialButton(11, 0, 2);
+		toggleSpecialButton(9, 0, 2);
+		break;
+
+	default:
+		break;
+	}
+
+	_screen->copyRegion(160, 0, 144, 64, 160, 128, 2, 0, Screen::CR_NO_P_CHECK);
+
+	if (mode != 3)
+		_screen->updateScreen();
+
+	_screen->_curPage = 0;
+}
+
+void CharacterGenerator::processNameInput(int index, int len, int textColor) {
+	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
+
+	// WORKAROUND for bug in original code:
+	len = strlen(_characters[index].name);
+
+	int xOffs = (60 - _screen->getFontWidth() * len) >> 1;
+	_screen->printText(_chargenStrings1[1], _chargenNameFieldX[index], _chargenNameFieldY[index], 12, 12);
+	_screen->printText(_characters[index].name, _chargenNameFieldX[index] + xOffs, _chargenNameFieldY[index], textColor, 0);
+	_screen->updateScreen();
+	_screen->setFont(of);
+}
+
+int CharacterGenerator::rollDice() {
+	int res = 0;
+	int min = 10;
+
+	for (int i = 0; i < 4; i++) {
+		int d = _vm->rollDice(1, 6, 0);
+		res += d;
+		if (d < min)
+			min = d;
+	}
+
+	res -= min;
+	return res;
+}
+
+int CharacterGenerator::modifyStat(int index, int8 *stat1, int8 *stat2) {
+	uint8 *s1 = (uint8*) stat1;
+	uint8 *s2 = (uint8*) stat2;
+
+	initButtonsFromList(31, 10);
+	Button *b = _vm->gui_getButton(_vm->_activeButtons, index + 1);
+
+	printStats(_activeBox, 3);
+	_vm->removeInputTop();
+
+	char statStr[6];
+	if (index)
+		snprintf(statStr, 6, "%d", *s1);
+	else
+		snprintf(statStr, 6, "%s", _vm->getCharStrength(*s1, *s2));
+
+	_screen->copyRegion(b->x - 112, b->y - 64, b->x + 32, b->y, 40, b->height, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->printShadedText(statStr, b->x + 32, b->y, 6, 0);
+	_screen->updateScreen();
+
+	EobCharacter *c = &_characters[_activeBox];
+
+	int ci = index;
+	uint8 v2 = s2 ? *s2 : 0;
+
+	if (index == 6) {
+		_chargenMaxStats[6] = getMaxHp(c->cClass, c->constitutionCur, c->level[0], c->level[1], c->level[2]);
+		_chargenMinStats[6] = getMinHp(c->cClass, c->constitutionCur, c->level[0], c->level[1], c->level[2]);
+	}
+
+	for (bool loop = true; loop && !_vm->shouldQuit(); ) {
+		uint8 v1 = *s1;
+		updateMagicShapes();
+		int	inputFlag = _vm->checkInput(_vm->_activeButtons, false, 0);
+		_vm->removeInputTop();
+
+		if (inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_MINUS] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP_MINUS] || inputFlag == 0x8009) {
+			processSpecialButton(11);
+			v1--;
+
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP6] || inputFlag == _vm->_keyMap[Common::KEYCODE_PLUS] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP_PLUS] || inputFlag == 0x8008) {
+			processSpecialButton(10);
+			v1++;
+
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP8]) {
+			ci = --ci % 7;
+			loop = false;
+
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP2]) {
+			ci = ++ci % 7;
+			loop = false;
+
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_o] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE] || inputFlag == 0x800A) {
+			processSpecialButton(9);
+			loop = false;
+			ci = -2;
+
+		} else if (inputFlag & 0x8000) {
+			inputFlag = (inputFlag & 0x0f) - 1;
+			if (index != inputFlag) {
+				ci = inputFlag;
+				loop = false;
+			}
+		}
+
+		if (v1 == *s1)
+			continue;
+
+		if (!index) {
+			while (v1 > 18) {
+				v1--;
+				v2++;
+			}
+			while (v2 > 0 && v1 < 18) {
+				v1++;
+				v2--;
+			}
+
+			v1 = CLIP<uint8>(v1, _chargenMinStats[index], _chargenMaxStats[index] & 0xff);
+			v2 = (v1 == 18 && _chargenMaxStats[index] >= 19) ? CLIP<uint8>(v2, 0, 100) : 0;
+			if (s2)
+				*s2 = v2;
+			else
+				error("CharacterGenerator::modifyStat:...");
+		} else {
+			v1 = CLIP<uint8>(v1, _chargenMinStats[index], _chargenMaxStats[index]);
+		}
+
+		*s1 = v1;
+
+		if (index == 6)
+			_characters[_activeBox].hitPointsMax = v1;
+
+		if (index)
+			snprintf(statStr, 6, "%d", *s1);
+		else
+			snprintf(statStr, 6, "%s", _vm->getCharStrength(*s1, *s2));
+
+		_screen->copyRegion(b->x - 112, b->y - 64, b->x + 32, b->y, 40, b->height, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->printShadedText(statStr, b->x + 32, b->y, 6, 0);
+		_screen->updateScreen();
+
+		if (index == 4) {
+			int oldVal = c->hitPointsCur;
+			_chargenMaxStats[6] = getMaxHp(c->cClass, c->constitutionCur, c->level[0], c->level[1], c->level[2]);
+			_chargenMinStats[6] = getMinHp(c->cClass, c->constitutionCur, c->level[0], c->level[1], c->level[2]);
+			c->hitPointsMax = c->hitPointsCur = CLIP<int16>(c->hitPointsCur, _chargenMinStats[6], _chargenMaxStats[6]);
+
+			if (c->hitPointsCur != oldVal) {
+				snprintf(statStr, 6, "%d", c->hitPointsCur);
+				_screen->copyRegion(120, 72, 264, 136, 40, 8, 2, 0, Screen::CR_NO_P_CHECK);
+				_screen->printShadedText(statStr, 264, 136, 15, 0);
+				_screen->updateScreen();
+			}
+
+		} else if (index == 3) {
+			int oldVal = c->armorClass;
+			c->armorClass = _vm->getDexterityArmorClassModifier(v1) + 10;
+
+			if (c->armorClass != oldVal) {
+				snprintf(statStr, 6, "%d", c->armorClass);
+				_screen->copyRegion(120, 64, 264, 128, 40, 8, 2, 0, Screen::CR_NO_P_CHECK);
+				_screen->printShadedText(statStr, 264, 128, 15, 0);
+				_screen->updateScreen();
+			}
+		}
+
+		if (loop = false) {
+			if (index)
+				snprintf(statStr, 6, "%d", *s1);
+			else
+				snprintf(statStr, 6, "%s", _vm->getCharStrength(*s1, *s2));
+			_screen->printText(statStr, b->x + 32, b->y, 15, 0);
+			_screen->updateScreen();
+		}
+	}
+
+	return ci;
+}
+
+int CharacterGenerator::getMaxHp(int cclass, int constitution, int level1, int level2, int level3) {
+	int res = 0;
+	constitution = _vm->getClassAndConstHitpointsModifier(cclass, constitution);
+
+	int m = _vm->getClassHpIncreaseType(cclass, 0);
+	if (m != -1)
+		res = _vm->getModifiedHpLimits(m, constitution, level1, false);
+
+	m = _vm->getClassHpIncreaseType(cclass, 1);
+	if (m != -1)
+		res += _vm->getModifiedHpLimits(m, constitution, level2, false);
+
+	m = _vm->getClassHpIncreaseType(cclass, 2);
+	if (m != -1)
+		res += _vm->getModifiedHpLimits(m, constitution, level3, false);
+
+	res /= _vm->_numLevelsPerClass[cclass];
+
+	return res;
+}
+
+int CharacterGenerator::getMinHp(int cclass, int constitution, int level1, int level2, int level3) {
+	int res = 0;
+	constitution = _vm->getClassAndConstHitpointsModifier(cclass, constitution);
+
+	int m = _vm->getClassHpIncreaseType(cclass, 0);
+	if (m != -1)
+		res = _vm->getModifiedHpLimits(m, constitution, level1, true);
+
+	m = _vm->getClassHpIncreaseType(cclass, 1);
+	if (m != -1)
+		res += _vm->getModifiedHpLimits(m, constitution, level2, true);
+
+	m = _vm->getClassHpIncreaseType(cclass, 2);
+	if (m != -1)
+		res += _vm->getModifiedHpLimits(m, constitution, level3, true);
+
+	res /= _vm->_numLevelsPerClass[cclass];
+
+	return res;
+}
+
+void CharacterGenerator::finish() {
+	_screen->copyRegion(0, 0, 160, 0, 160, 128, 2, 2, Screen::CR_NO_P_CHECK);
+	int cp = _screen->setCurPage(2);
+	_screen->printShadedText(_chargenEnterGameStrings[0], 168, 32, 15, 0);
+	_screen->setCurPage(cp);
+	_screen->copyRegion(160, 0, 144, 64, 160, 128, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+
+	if (_vm->game() == GI_EOB1) {
+		static const int8 classDefaultItemsList[] = { 1, 17, 2, 17, 46, -1, 4, -1, 5, -1, 6, 2, 7, -1, 8, -1, 9, 21, 10, 2, 31, 2 };
+		static const int8 classDefaultItemsListIndex[] = { 4, 8, 0, -1, 4, 3, 0, -1, 4, 10, 0, 8, 3, 6, 1, -1, 2, 7, 0, -1,
+			4, 5, 0, -1, 4, 7, 0, 8, 4, 5, 0, 8, 4, 6, 8, 8, 4, 6, 5, 8, 3, 6, 5, -1, 2, 7, 5, 0, 4, 6, 7, 0, 4, 3, 7, 0, 2, 6, 7, 1 };
+
+		_characters[0].inventory[2] = _vm->duplicateItem(35);
+
+		for (int i = 0; i < 4; i++) {
+			EobCharacter *c = &_characters[i];
+			c->flags = 1;
+			c->food = 100;
+			c->id = i;
+			c->inventory[3] = _vm->duplicateItem(10);
+
+			for (int ii = 0; ii < 4; ii++) {
+				int l = classDefaultItemsListIndex[(c->cClass << 2) + ii] << 1;
+				if (classDefaultItemsList[l] == -1)
+					continue;
+
+				int d = classDefaultItemsList[l];
+				int slot = classDefaultItemsList[l + 1];
+
+				if (slot < 0) {
+					slot = 0;
+					if (c->inventory[slot])
+						slot++;
+					if (c->inventory[slot])
+						slot++;
+				}
+
+				if (slot != 2 && c->inventory[slot])
+					continue;
+
+				if (d == 5 && (c->raceSex >> 1) == 3)
+					d = 36;
+
+				if (slot == 2) {
+					while (c->inventory[slot])
+						slot++;
+				}
+
+				c->inventory[slot] = _vm->duplicateItem(d);
+			}
+
+			_vm->recalcArmorClass(i);
+		}
+
+	} else {
+		static const uint8 classDefaultItemsListIndex[] = { 0, 0, 0, 1, 2, 3, 0, 0, 0, 0, 3, 2, 0, 0, 2 };
+		static const int8 itemList0[] = { 3, 36, 0, 17, -1, 0, 0, 56, 1, 17, 31, 0, 1, 23, 1, 17, 31, 1, 1 };
+		static const int8 itemList1[] = { 1, 2, 0, 17, -1, 0, 0 };
+		static const int8 itemList2[] = { 2, 56, 1, 17, 31, 0, 1, 23, 1, 17, 31, 0, 1 };
+		static const int8 itemList3[] = { 2, 1, 1, 17, 31, 1, 1, 1, 0, 17, 31, 2, 1 };
+		static const int8 *itemList[] = { itemList0, itemList1, itemList2, itemList3 };
+
+		for (int i = 0; i < 4; i++) {
+			EobCharacter *c = &_characters[i];
+			c->flags = 1;
+			c->food = 100;
+			c->id = i;
+			const int8 *df = itemList[classDefaultItemsListIndex[c->cClass]];
+			int v1 = _vm->rollDice(1, *df++, -1);
+
+			df = &df[v1 * 6];
+			for (int ii = 0; ii < 2; ii++) {
+				if (df[0] == -1)
+					break;
+				_vm->createInventoryItem(c, df[0], df[1], df[2]);
+				df = &df[3];
+			}
+
+			uint16 m = _vm->_classModifierFlags[c->cClass];
+			v1 = _vm->rollDice(1, 2, -1);
+
+			int ival = 0;
+			int itype = 0;
+
+			if (m & 0x31) {
+				if ((c->raceSex >> 1) == 3) {
+					itype = 22;
+					ival = 1;
+				} else {
+					if (v1 == 0) {
+						itype = 5;
+						ival = 1;
+					} else {
+						itype = 34;
+					}
+				}
+			} else if (m & 0x04) {
+				itype = 26;
+				if (v1 != 0)
+					ival = 1;
+			} else if (m & 0x08) {
+				ival = 1;
+				itype = ((c->raceSex >> 1) == 3) ? 22 : 5;
+			} else {
+				if (v1 == 0) {
+					itype = 3;
+				} else {
+					itype = 4;
+					ival = 1;
+				}
+			}
+
+			_vm->createInventoryItem(c, itype, ival, 0);
+			_vm->createInventoryItem(c, 10, -1, 2);
+			_vm->createInventoryItem(c, 10, -1, 2);
+			_vm->createInventoryItem(c, 24, 2, 2);
+
+			if (_vm->_classModifierFlags[c->cClass] & 2) {
+				_vm->createInventoryItem(c, 7, -1, 1);
+				_vm->createInventoryItem(c, 21, 4, 2);
+				_vm->createInventoryItem(c, 21, 13, 2);
+			}
+
+			if (_vm->_classModifierFlags[c->cClass] & 0x14) {
+				if (c->cClass == 2)
+					_vm->createInventoryItem(c, 27, -1, 1);
+				else
+					_vm->createInventoryItem(c, 8, -1, 1);
+
+				_vm->createInventoryItem(c, 20, 49, 1);
+			}
+
+			if (_vm->_classModifierFlags[c->cClass] & 8)
+				_vm->createInventoryItem(c, 6, -1, 1);
+
+			if (i == 0)
+				_vm->createInventoryItem(c, 93, -1, 2);
+
+			_vm->recalcArmorClass(i);
+		}
+	}
+
+	for (int i = 0; i < 4; i++) {
+		if (_vm->_classModifierFlags[_characters[i].cClass] & 2)
+			_characters[i].mageSpellsAvailabilityFlags = (_vm->game() == GI_EOB2) ? 0x81CB6 : 0x26C;
+
+		if (_vm->_classModifierFlags[_characters[i].cClass] & 0x14 && _vm->game() == GI_EOB2) {
+			// Cleric: Turn Undead
+			_characters[i].clericSpells[0] = 29;
+		}
+	}
+
+	for (int i = 0; i < 4; i++) {
+		EobCharacter *c = &_characters[i];
+		c->strengthMax = c->strengthCur;
+		c->strengthExtMax = c->strengthExtCur;
+		c->intelligenceMax = c->intelligenceCur;
+		c->wisdomMax = c->wisdomCur;
+		c->dexterityMax = c->dexterityCur;
+		c->constitutionMax = c->constitutionCur;
+		c->charismaMax = c->charismaCur;
+		c->hitPointsMax = c->hitPointsCur;
+	}
+
+	_vm->gui_resetButtonList();
+
+	if (_faceShapes) {
+		for (int i = 0; i < 44; i++) {
+			bool del = true;
+			for (int ii = 0; ii < 4; ii++) {
+				if (_characters[ii].faceShape == _faceShapes[i])
+					del = false;
+			}
+			if (del)
+				delete[] _faceShapes[i];
+		}
+		delete[] _faceShapes;
+		_faceShapes = 0;
+	}
+
+	if (_chargenMagicShapes) {
+		for (int i = 0; i < 10; i++)
+			delete[] _chargenMagicShapes[i];
+		delete[] _chargenMagicShapes;
+		_chargenMagicShapes = 0;
+	}
+
+	if (_chargenButtonLabels) {
+		for (int i = 0; i < 10; i++)
+			delete[] _chargenButtonLabels[i];
+		delete[] _chargenButtonLabels;
+		_chargenButtonLabels = 0;
+	}
+}
+
+const EobChargenButtonDef CharacterGenerator::_chargenButtonDefs[] = {
+	{ 0x01, 0x37, 0x31, 0x32, 0x70 },
+	{ 0x09, 0x37, 0x31, 0x32, 0x71 },
+	{ 0x01, 0x77, 0x31, 0x32, 0x72 },
+	{ 0x09, 0x77, 0x31, 0x32, 0x73 },
+	{ 0x03, 0xB5, 0x53, 0x10, 0x1A },
+	{ 0x21, 0xAC, 0x26, 0x10, 0x19 },
+	{ 0x1C, 0xAC, 0x26, 0x10, 0x21 },
+	{ 0x21, 0xAC, 0x26, 0x10, 0x32 },
+	{ 0x13, 0x50, 0x9A, 0x08, 0x00 },
+	{ 0x13, 0x58, 0x9A, 0x08, 0x00 },
+	{ 0x13, 0x60, 0x9A, 0x08, 0x00 },
+	{ 0x13, 0x68, 0x9A, 0x08, 0x00 },
+	{ 0x13, 0x70, 0x9A, 0x08, 0x00 },
+	{ 0x13, 0x78, 0x9A, 0x08, 0x00 },
+	{ 0x13, 0x80, 0x9A, 0x08, 0x00 },
+	{ 0x13, 0x88, 0x9A, 0x08, 0x00 },
+	{ 0x13, 0x90, 0x9A, 0x08, 0x00 },
+	{ 0x13, 0x98, 0x9A, 0x08, 0x00 },
+	{ 0x13, 0xA0, 0x9A, 0x08, 0x00 },
+	{ 0x13, 0xA8, 0x9A, 0x08, 0x00 },
+	{ 0x13, 0xB0, 0x9A, 0x08, 0x00 },
+	{ 0x12, 0x42, 0x20, 0x10, 0x00 },
+	{ 0x12, 0x52, 0x20, 0x10, 0x00 },
+	{ 0x16, 0x42, 0x20, 0x20, 0x00 },
+	{ 0x1A, 0x42, 0x20, 0x20, 0x00 },
+	{ 0x1E, 0x42, 0x20, 0x20, 0x00 },
+	{ 0x22, 0x42, 0x20, 0x20, 0x00 },
+	{ 0x1C, 0x9C, 0x26, 0x10, 0x14 },
+	{ 0x21, 0x9C, 0x26, 0x10, 0x34 },
+	{ 0x1C, 0xAC, 0x26, 0x10, 0x22 },
+	{ 0x21, 0xAC, 0x26, 0x10, 0x26 },
+	{ 0x12, 0x80, 0x35, 0x08, 0x00 },
+	{ 0x12, 0x88, 0x35, 0x08, 0x00 },
+	{ 0x12, 0x90, 0x35, 0x08, 0x00 },
+	{ 0x12, 0x98, 0x35, 0x08, 0x00 },
+	{ 0x12, 0xA0, 0x35, 0x08, 0x00 },
+	{ 0x12, 0xA8, 0x35, 0x08, 0x00 },
+	{ 0x1D, 0x88, 0x35, 0x08, 0x00 },
+	{ 0x1B, 0xAC, 0x15, 0x10, 0x0D },
+	{ 0x1E, 0xAC, 0x15, 0x10, 0x0C },
+	{ 0x21, 0xAC, 0x25, 0x10, 0x19 }
+};
+
+const CreatePartyModButton CharacterGenerator::_chargenModButtons[] = {
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x40 },
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x40 },
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x80 },
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0A, 0x80 },
+	{ 0x00, 0xC0, 0x04, 0x05, 0x07, 0x05, 0x08, 0x1C, 0x9C },
+	{ 0x04, 0xC0, 0x03, 0x05, 0x0A, 0x05, 0x08, 0x21, 0xAC },
+	{ 0x07, 0xC0, 0x03, 0x05, 0x0B, 0x05, 0x08, 0x21, 0xAC },
+	{ 0x0A, 0xC0, 0x04, 0x05, 0x06, 0x05, 0x08, 0x21, 0x9C },
+	{ 0x18, 0xC0, 0x03, 0x05, 0x09, 0x05, 0x08, 0x1C, 0xAC },
+	{ 0x0E, 0xC0, 0x02, 0x05, 0x0F, 0x05, 0x08, 0x21, 0xAC },
+	{ 0x10, 0xC0, 0x01, 0x05, 0x09, 0x05, 0x04, 0x1B, 0xAC },
+	{ 0x11, 0xC0, 0x01, 0x01, 0x09, 0x07, 0x04, 0x1E, 0xAC },
+	{ 0x12, 0xC0, 0x03, 0x07, 0x07, 0x04, 0x06, 0x12, 0x42 },
+	{ 0x15, 0xC0, 0x03, 0x07, 0x07, 0x04, 0x06, 0x12, 0x52 },
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x03, 0xB5 },
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x03, 0xB5 },
+	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x1C, 0xAC }
+};
+
+const EobRect8 CharacterGenerator::_chargenButtonBodyCoords[] = {
+	{ 0x00, 0x80, 0x04, 0x20 },
+	{ 0x04, 0x80, 0x04, 0x20 },
+	{ 0x08, 0x80, 0x04, 0x20 },
+	{ 0x0C, 0x80, 0x04, 0x20 },
+	{ 0x0E, 0xA0, 0x03, 0x10 },
+	{ 0x0B, 0xA0, 0x03, 0x10 },
+	{ 0x10, 0x80, 0x04, 0x10 },
+	{ 0x10, 0x90, 0x04, 0x10 },
+	{ 0x11, 0xA0, 0x05, 0x10 },
+	{ 0x11, 0xB0, 0x05, 0x10 },
+	{ 0x16, 0xA0, 0x05, 0x10 },
+	{ 0x16, 0xB0, 0x05, 0x10 },
+	{ 0x00, 0xA0, 0x0B, 0x10 },
+	{ 0x14, 0x80, 0x0B, 0x10 },
+	{ 0x14, 0x90, 0x0B, 0x10 }
+};
+
+const EobRect16 CharacterGenerator::_chargenPortraitBoxFrames[] = {
+	{ 0x00B7, 0x0001, 0x00F7, 0x0034 },
+	{ 0x00FF, 0x0001, 0x013F, 0x0034 },
+	{ 0x00B7, 0x0035, 0x00F7, 0x0068 },
+	{ 0x00FF, 0x0035, 0x013F, 0x0068 },
+	{ 0x00B7, 0x0069, 0x00F7, 0x009C },
+	{ 0x00FF, 0x0069, 0x013F, 0x009C },
+	{ 0x0010, 0x003F, 0x0030, 0x0060 },
+	{ 0x0050, 0x003F, 0x0070, 0x0060 },
+	{ 0x0010, 0x007F, 0x0030, 0x00A0 },
+	{ 0x0050, 0x007F, 0x0070, 0x00A0 },
+	{ 0x00B0, 0x0042, 0x00D0, 0x0061 },
+	{ 0x00D0, 0x0042, 0x00F0, 0x0061 },
+	{ 0x00F0, 0x0042, 0x0110, 0x0061 },
+	{ 0x0110, 0x0042, 0x0130, 0x0061 },
+	{ 0x0004, 0x0018, 0x0024, 0x0039 },
+	{ 0x00A3, 0x0018, 0x00C3, 0x0039 },
+	{ 0x0004, 0x0040, 0x0024, 0x0061 },
+	{ 0x00A3, 0x0040, 0x00C3, 0x0061 },
+	{ 0x0004, 0x0068, 0x0024, 0x0089 },
+	{ 0x00A3, 0x0068, 0x00C3, 0x0089 }
+};
+
+const int16 CharacterGenerator::_chargenBoxX[] = { 0x10, 0x50, 0x10, 0x50 };
+const int16 CharacterGenerator::_chargenBoxY[] = { 0x3F, 0x3F, 0x7F, 0x7F };
+const int16 CharacterGenerator::_chargenNameFieldX[] = { 0x02, 0x42, 0x02, 0x42 };
+const int16 CharacterGenerator::_chargenNameFieldY[] = { 0x6B, 0x6B, 0xAB, 0xAB };
+
+const int32 CharacterGenerator::_classMenuMasks[] = {
+	0x003F, 0x07BB, 0x77FB, 0x00F1, 0x08F1, 0x00B1
+};
+
+const int32 CharacterGenerator::_alignmentMenuMasks[] = {
+	0x01FF, 0x0007, 0x0001, 0x01FF,	0x01FF, 0x01FE, 0x01FF, 0x01FE,
+	0x01FF, 0x01FE, 0x01FE, 0x01FE, 0x01FF,	0x0007,	0x01FF
+};
+
+const int16 CharacterGenerator::_raceModifiers[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0,	1, -1, 0, 1, -1, 0, 0, 0, -1, 0, 0, 1, 0, 0
+};
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 68eb08210e..44fbc0fe68 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -17,12 +17,15 @@
  * You should have received a copy of the GNU General Public 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 "kyra/kyra_lok.h"
 #include "kyra/lol.h"
 #include "kyra/kyra_hof.h"
 #include "kyra/kyra_mr.h"
+#include "kyra/eob1.h"
+#include "kyra/eob2.h"
 
 #include "common/config-manager.h"
 #include "common/system.h"
@@ -129,6 +132,14 @@ bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame
 		*engine = new Kyra::LoLEngine(syst, flags);
 		break;
 #endif // ENABLE_LOL
+#ifdef ENABLE_EOB
+	case Kyra::GI_EOB1:
+		*engine = new Kyra::EobEngine(syst, flags);
+		break;
+	case Kyra::GI_EOB2:
+		*engine = new Kyra::DarkMoonEngine(syst, flags);
+		break;
+#endif // ENABLE_EOB
 	default:
 		res = false;
 		warning("Kyra engine: unknown gameID");
diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index ebf7c8eee7..50a154dcf3 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -57,6 +57,9 @@ namespace {
 #define LOL_DEMO_FLAGS FLAGS(true, true, false, false, false, false, false, false, Kyra::GI_LOL)
 #define LOL_KYRA2_DEMO_FLAGS FLAGS(true, false, false, false, false, false, false, false, Kyra::GI_KYRA2)
 
+#define EOB_FLAGS FLAGS(false, false, false, false, false, false, false, false, Kyra::GI_EOB1)
+#define EOB2_FLAGS FLAGS(false, false, false, false, false, false, false, false, Kyra::GI_EOB2)
+
 const KYRAGameDescription adGameDescs[] = {
 	/* disable these targets until they get supported
 	{
@@ -1439,6 +1442,73 @@ const KYRAGameDescription adGameDescs[] = {
 		LOL_KYRA2_DEMO_FLAGS
 	},
 #endif // ENABLE_LOL
+#ifdef ENABLE_EOB
+
+	{
+		{
+			"eob",
+			0,
+			{
+				{ "EOBDATA2.PAK", 0, "feaf0345086b3a1d931352f4b0ad8feb", -1 },
+				{ 0, 0, 0, 0 }
+			},
+			Common::EN_ANY,
+			Common::kPlatformPC,
+			ADGF_NO_FLAGS,
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
+		},
+		EOB_FLAGS
+	},
+
+	{
+		{
+			"eob",
+			0,
+			{
+				{ "SHINDIA.CPS", 0, "383b0c7ba0903eae5d04cad28ce90aaf", -1 },
+				{ 0, 0, 0, 0 }
+			},
+			Common::DE_DEU,
+			Common::kPlatformPC,
+			ADGF_NO_FLAGS,
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
+		},
+		EOB_FLAGS
+	},
+
+	{
+		{
+			"eob2",
+			0,
+			{
+				{ "LEVEL15.INF", 0, "10f19eab75c73d0476dc58bcf70fff7a", -1 },
+				{ 0, 0, 0, 0 }
+			},
+			Common::EN_ANY,
+			Common::kPlatformPC,
+			ADGF_NO_FLAGS,
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
+		},
+		EOB2_FLAGS
+	},
+
+	{
+		{
+			"eob2",
+			0,
+			{
+				{ "LEVEL15.INF", 0, "ce54243ad1ca4447f521340428da2c91", -1 },
+				{ 0, 0, 0, 0 }
+			},
+			Common::DE_DEU,
+			Common::kPlatformPC,
+			ADGF_NO_FLAGS,
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
+		},
+		EOB2_FLAGS
+	},
+#endif // ENABLE_EOB
+
 	{ AD_TABLE_END_MARKER, FLAGS(0, 0, 0, 0, 0, 0, 0, 0, 0) }
 };
 
@@ -1449,6 +1519,10 @@ const PlainGameDescriptor gameList[] = {
 #ifdef ENABLE_LOL
 	{ "lol", "Lands of Lore: The Throne of Chaos" },
 #endif // ENABLE_LOL
+#ifdef ENABLE_EOB
+	{ "eob", "Eye of the Beholder" },
+	{ "eob2", "Eye of the Beholder II: The Legend of Darkmoon" },
+#endif // ENABLE_EOB
 	{ 0, 0 }
 };
 
diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
new file mode 100644
index 0000000000..993d06a56b
--- /dev/null
+++ b/engines/kyra/eob1.cpp
@@ -0,0 +1,242 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#include "kyra/eob1.h"
+#include "kyra/resource.h"
+
+namespace Kyra {
+
+EobEngine::EobEngine(OSystem *system, const GameFlags &flags) : EobCoreEngine(system, flags) {
+	_numSpells = 53;
+}
+
+EobEngine::~EobEngine() {
+	delete[] _itemsOverlay;
+}
+
+Common::Error EobEngine::init() {
+	Common::Error err = EobCoreEngine::init();
+	if (err.getCode() != Common::kNoError)
+		return err;
+
+	initStaticResource();
+
+	_itemsOverlay = _res->fileData("ITEMRMP.VGA", 0);
+
+	_bkgColor_1 = 132;
+	_color1_1 = 135;
+	_color2_1 = 130;
+	_color4 = 133;
+	_color5 = 133;
+	_color6 = 180;
+	_color7 = 177;
+	_color8 = 184;
+
+	_color14 = _color8;
+	_color13 = _color7;
+	_color12 = _color6;
+
+	_screen->modifyScreenDim(7, 0x01, 0xB3, 0x22, 0x12);
+	_screen->modifyScreenDim(9, 0x01, 0x7D, 0x26, 0x3F);
+	_screen->modifyScreenDim(12, 0x01, 0x04, 0x14, 0xA0);
+
+	_scriptTimersCount = 1;
+
+	return Common::kNoError;
+}
+
+void EobEngine::startupNew() {
+	_currentLevel = 1;
+	_currentSub = 0;
+	loadLevel(1, 0);
+	_currentBlock = 490;
+	_currentDirection = 0;
+	setHandItem(0);
+}
+
+void EobEngine::startupLoad() {
+	updateHandItemCursor();
+	loadLevel(_currentLevel, _currentSub);
+	_saveLoadMode = 0;
+}
+
+void EobEngine::npcSequence(int npcIndex) {
+
+
+}
+
+void EobEngine::updateUsedCharacterHandItem(int charIndex, int slot) {
+	EobItem *itm = &_items[_characters[charIndex].inventory[slot]];
+	if (itm->type == 48) {
+		int charges = itm->flags & 0x3f;
+		if (--charges)
+			--itm->flags;
+		else
+			deleteInventoryItem(charIndex, slot);
+	} else if (itm->type == 34 || itm->type == 35) {
+		deleteInventoryItem(charIndex, slot);
+	}
+}
+
+void EobEngine::replaceMonster(int unit, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem) {
+	if (_levelBlockProperties[block].flags & 7)
+		return;
+
+	for (int i = 0; i < 30; i++) {
+		if (_monsters[i].hitPointsCur <= 0) {
+			initMonster(i, unit, block, pos, dir, type, shpIndex, mode, h2, randItem, fixedItem);;
+			break;
+		}
+	}
+}
+
+void EobEngine::loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) {
+	_screen->loadEobBitmap("DOOR", 5, 3);
+	_screen->_curPage = 2;
+
+	if (doorType1 != 0xff) {
+		for (int i = 0; i < 3; i++) {
+			const uint8 *enc = &_doorShapeEncodeDefs[(doorType1 * 3 + i) << 2];
+			_doorShapes[shapeId1 + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+			enc = &_doorSwitchShapeEncodeDefs[(doorType1 * 3 + i) << 2];
+			_doorSwitches[shapeId1 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+			_doorSwitches[shapeId1 + i].x = _doorSwitchCoords[doorType1 << 1];
+			_doorSwitches[shapeId1 + i].y = _doorSwitchCoords[(doorType1 << 1) + 1];
+		}
+	}
+
+	if (doorType2 != 0xff) {
+		for (int i = 0; i < 3; i++) {
+			const uint8 *enc = &_doorShapeEncodeDefs[(doorType2 * 3 + i) << 2];
+			_doorShapes[shapeId2 + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+			enc = &_doorSwitchShapeEncodeDefs[(doorType2 * 3 + i) << 2];
+			_doorSwitches[shapeId2 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+			_doorSwitches[shapeId2 + i].x = _doorSwitchCoords[doorType2 << 1];
+			_doorSwitches[shapeId2 + i].y = _doorSwitchCoords[(doorType2 << 1) + 1];
+		}
+	}
+
+	_screen->_curPage = 0;
+}
+
+void EobEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wall, int mDim, int16 y1, int16 y2) {
+	int shapeIndex = type + 2 - mDim;
+	uint8 *shp = _doorShapes[shapeIndex];
+
+	int d1 = 0;
+	int d2 = 0;
+	int v = 0;
+	const ScreenDim *td = _screen->getScreenDim(5);
+
+	switch (_currentLevel) {
+		case 4:
+		case 5:
+		case 6:
+			y = _dscDoorY2[mDim] - shp[1];
+			d1 = _dscDoorCoordsExt[index << 1] >> 3;
+			d2 = _dscDoorCoordsExt[(index << 1) + 1] >> 3;
+			if (_shpDmX1 > d1)
+				d1 = _shpDmX1;
+			if (_shpDmX2 < d2)
+				d2 = _shpDmX2;
+			_screen->modifyScreenDim(5, d1, td->sy, d2 - d1, td->h);
+			v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult3[mDim] : _dscDoorScaleMult4[mDim]) * -1;
+			v -= (shp[2] << 3);
+			drawBlockObject(0, 2, shp, x + v, y, 5);
+			v += (shp[2] << 3);
+			drawBlockObject(1, 2, shp, x - v, y, 5);
+			if (_wllShapeMap[wall] == -1)
+				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w - v, _doorSwitches[shapeIndex].y, 5);
+			break;
+
+		case 7:
+		case 8:
+		case 9:
+			y = _dscDoorY3[mDim] - _doorShapes[shapeIndex + 3][1];
+			d1 = x - (_doorShapes[shapeIndex + 3][2] << 2);
+			x -= (shp[2] << 2);
+			drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], d1, y, 5);
+			scaleLevelShapesDim(index, y1, y2, 5);
+			y = _dscDoorY3[mDim] - ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim] : _dscDoorScaleMult2[mDim]);
+			drawBlockObject(0, 2, shp, x, y, 5);
+			if (_wllShapeMap[wall] == -1)
+				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+			break;
+
+		case 10:
+		case 11:
+			v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult5[mDim] : _dscDoorScaleMult6[mDim]) * -1;
+			x -= (shp[2] << 2);
+			y = _dscDoorY3[mDim] + v;
+			drawBlockObject(0, 2, shp, x, y + v, 5);
+			v >>= 4;
+			y = _dscDoorY5[mDim];
+			drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], x, y - v, 5);
+			if (_wllShapeMap[wall] == -1)
+				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+			break;
+
+		default:
+			y = (_currentLevel == 12 ? _dscDoorY6[mDim] : _dscDoorY1[mDim]) - shp[1];
+			x -= (shp[2] << 2);
+			y -= (wall >= 30 ? _dscDoorScaleMult2[mDim] : (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim]);
+			drawBlockObject(0, 2, shp, x, y, 5);
+
+			if (_wllShapeMap[wall] == -1)
+				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+			break;
+	}
+}
+
+uint32 EobEngine::convertSpellFlagToEob2Format(uint32 flag, int ignoreInvisibility) {
+	uint32 res = 0;
+	if (flag & 0x01)
+		res |= 0x20;
+	if (flag & 0x02)
+		res |= 0x400;
+	if (flag & 0x04)
+		res |= 0x80;
+	if (flag & 0x08)
+		res |= 0x40;
+	if (ignoreInvisibility)
+		res |= 0x100;
+	return res;
+}
+
+uint32 EobEngine::convertCharacterEffectFlagToEob2Format(uint32 flag) {
+	uint32 res = 0;
+	if (flag & 0x02)
+		res |= 0x08;
+	if (flag & 0x04)
+		res |= 0x40;
+	if (flag & 0x80)
+		res |= 0x2000;
+	if (flag & 0x100)
+		res |= 0x4000;
+	return res;
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
new file mode 100644
index 0000000000..27a060f65c
--- /dev/null
+++ b/engines/kyra/eob1.h
@@ -0,0 +1,96 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#ifndef KYRA_EOB1_H
+#define KYRA_EOB1_H
+
+#include "kyra/eobcommon.h"
+
+namespace Kyra {
+
+class EobEngine : public EobCoreEngine {
+friend class GUI_Eob;
+public:
+	EobEngine(OSystem *system, const GameFlags &flags);
+	~EobEngine();
+
+private:
+	// Init / Release
+	Common::Error init();
+	void initStaticResource();
+	void initSpells();
+
+	// Main Menu
+	int mainMenu();
+	int mainMenuLoop();
+
+	// Main loop
+	void startupNew();
+	void startupLoad();
+
+	// Intro/Outro
+	void seq_playOpeningCredits();
+	void seq_playIntro();
+	void seq_playFinale();
+
+	// characters
+	void npcSequence(int npcIndex);
+
+	//const char *const *_npc1Strings;
+	//const char *const *_npc2Strings;
+
+	// items
+	void updateUsedCharacterHandItem(int charIndex, int slot);
+
+	// Monsters
+	void replaceMonster(int unit, uint16 block, int d, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem);
+
+	// Level
+	void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2);
+	void drawDoorIntern(int type, int index, int x, int y, int w, int wall, int mDim, int16 y1, int16 y2);
+
+	const int16 *_dscDoorCoordsExt;
+	const uint8 *_dscDoorScaleMult4;
+	const uint8 *_dscDoorScaleMult5;
+	const uint8 *_dscDoorScaleMult6;
+	const uint8 *_dscDoorY3;
+	const uint8 *_dscDoorY4;
+	const uint8 *_dscDoorY5;
+	const uint8 *_dscDoorY6;
+
+	const uint8 *_doorShapeEncodeDefs;
+	const uint8 *_doorSwitchShapeEncodeDefs;
+	const uint8 *_doorSwitchCoords;
+
+	// Misc
+	uint32 convertSpellFlagToEob2Format(uint32 flag, int ignoreInvisibility);
+	uint32 convertCharacterEffectFlagToEob2Format(uint32 flag);
+};
+
+
+}	// End of namespace Kyra
+
+#endif
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
new file mode 100644
index 0000000000..120ad157d0
--- /dev/null
+++ b/engines/kyra/eob2.cpp
@@ -0,0 +1,437 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#include "kyra/eob2.h"
+#include "kyra/resource.h"
+#include "kyra/sound.h"
+
+namespace Kyra {
+
+DarkMoonEngine::DarkMoonEngine(OSystem *system, const GameFlags &flags) : EobCoreEngine(system, flags) {
+	_seqIntro = _seqFinale = 0;
+	_shapesIntro = _shapesFinale = 0;
+	_dscDoorType5Offs = 0;
+	_numSpells = 70;
+}
+
+DarkMoonEngine::~DarkMoonEngine() {
+	delete[] _seqIntro;
+	delete[] _seqFinale;
+	delete[] _shapesIntro;
+	delete[] _shapesFinale;
+}
+
+Common::Error DarkMoonEngine::init() {
+	Common::Error err = EobCoreEngine::init();
+	if (err.getCode() != Common::kNoError)
+		return err;
+
+	initStaticResource();
+
+	_monsterProps = new EobMonsterProperty[10];
+
+	_bkgColor_1 = 183;
+	_color1_1 = 186;
+	_color2_1 = 181;
+	_color4 = 133;
+	_color5 = 184;
+	_color6 = 183;
+	_color7 = 181;
+	_color8 = 186;
+	_color12 = 180;
+	_color13 = 177;
+	_color14 = 182;
+
+	return Common::kNoError;
+}
+
+void DarkMoonEngine::startupNew() {
+	_currentLevel = 4;
+	_currentSub = 0;
+	loadLevel(4, 0);
+	_currentBlock = 171;
+	_currentDirection = 2;
+	setHandItem(0);
+}
+
+void DarkMoonEngine::startupLoad() {
+	updateHandItemCursor();
+	loadLevel(_currentLevel, _currentSub);
+	_saveLoadMode = 0;
+}
+
+void DarkMoonEngine::npcSequence(int npcIndex) {
+	_screen->loadEobBitmap("OUTTAKE", 5, 3);
+	_screen->copyRegion(0, 0, 0, 0, 176, 120, 0, 6, Screen::CR_NO_P_CHECK);
+	const uint8 *shpDef = &_npcShpData[npcIndex << 3];
+
+	for (int i = npcIndex; i != 255; i = shpDef[7]) {
+		shpDef = &_npcShpData[i << 3];
+		_screen->_curPage = 2;
+		const uint8 *shp = _screen->encodeShape(READ_LE_UINT16(shpDef), shpDef[2], shpDef[3], shpDef[4]);
+		_screen->_curPage = 0;
+		_screen->drawShape(0, shp, 88 + shpDef[5] - (shp[2] << 2), 104 + shpDef[6] - shp[1], 5);
+		delete[] shp;
+	}
+
+	Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
+	_screen->loadFileDataToPage(s, 5, 32000);
+	delete s;
+
+	gui_drawBox(0, 121, 320, 79, _color1_1, _color2_1, _bkgColor_1);
+	_txt->setupField(9, true);
+	_txt->resetPageBreakString();
+
+	if (npcIndex == 0) {
+		snd_playSoundEffect(57);
+		if (npcJoinDialogue(0, 1, 3, 2))
+			setScriptFlag(0x40);
+	} else if (npcIndex == 1) {
+		snd_playSoundEffect(53);
+		gui_drawDialogueBox();
+
+		_txt->printDialogueText(4, 0);
+		int r = runDialogue(-1, 0, _npc1Strings[0], _npc1Strings[1]) - 1;
+
+		if (r == 0) {
+			_sound->playTrack(0);
+			delay(3 * _tickLength);
+			snd_playSoundEffect(91);
+			npcJoinDialogue(1, 5, 6, 7);
+		} else if (r == 1) {
+			setScriptFlag(0x20);
+		}
+
+	} else if (npcIndex == 2) {
+		snd_playSoundEffect(55);
+		gui_drawDialogueBox();
+
+		_txt->printDialogueText(8, 0);
+		int r = runDialogue(-1, 0, _npc2Strings[0], _npc2Strings[1]) - 1;
+
+		if (r == 0) {
+			if (rollDice(1, 2, -1))
+				_txt->printDialogueText(9, _okStrings[0]);
+			else
+				npcJoinDialogue(2, 102, 103, 104);
+			setScriptFlag(8);
+		} else if (r == 1) {
+			_currentDirection = 0;
+		}
+	}
+
+	_txt->removePageBreakFlag();
+	gui_restorePlayField();
+}
+
+void DarkMoonEngine::updateUsedCharacterHandItem(int charIndex, int slot) {
+	EobItem *itm = &_items[_characters[charIndex].inventory[slot]];
+	if (itm->type == 48 || itm->type == 62) {
+		if (itm->value == 5)
+			return;
+		int charges = itm->flags & 0x3f;
+		if (--charges)
+			--itm->flags;
+		else
+			deleteInventoryItem(charIndex, slot);
+	} else if (itm->type == 26 || itm->type == 34 || itm->type == 35) {
+		deleteInventoryItem(charIndex, slot);
+	}
+}
+
+void DarkMoonEngine::generateMonsterPalettes(const char *file, int16 monsterIndex) {
+	int cp = _screen->setCurPage(2);
+	_screen->loadEobBitmap(file, 3, 3);
+	uint8 tmpPal[16];
+	uint8 newPal[16];
+
+	for (int i = 0; i < 6; i++) {
+		int dci = monsterIndex + i;
+		memcpy(tmpPal, _monsterShapes[dci] + 4, 16);
+		int colx = 302 + 3 * i;
+
+		for (int ii = 0; ii < 16; ii++) {
+			uint8 col = _screen->getPagePixel(_screen->_curPage, colx, 184 + ii);
+
+			int iii = 0;
+			for (; iii < 16; iii++) {
+				if (tmpPal[iii] == col) {
+					newPal[ii] = iii;
+					break;
+				}
+			}
+
+			if (iii == 16)
+				newPal[ii] = 0;
+		}
+
+		for (int ii = 1; ii < 3; ii++) {
+			memcpy(tmpPal, _monsterShapes[dci] + 4, 16);
+
+			for (int iii = 0; iii < 16; iii++) {
+				uint8 col = _screen->getPagePixel(_screen->_curPage, colx + ii, 184 + iii);
+				if (newPal[iii])
+					tmpPal[newPal[iii]] = col;
+			}
+
+			int c = i;
+			if (monsterIndex >= 18)
+				c += 6;
+
+			c = (c << 1) + (ii - 1);
+			memcpy(_monsterPalettes[c], tmpPal, 16);
+		}
+	}
+
+	_screen->setCurPage(cp);
+}
+
+void DarkMoonEngine::loadMonsterDecoration(const char *file, int16 monsterIndex) {
+	char filename[13];
+	snprintf(filename, 13, "%s.dcr", file);
+
+	Common::SeekableReadStream *s = _res->createReadStream(filename);
+	if (!s)
+		return;
+
+	int len = s->readUint16LE();
+
+	for (int i = 0; i < len; i++) {
+		for (int ii = 0; ii < 6; ii++) {
+			uint8 dc[6];
+			s->read(dc, 6);
+			if (!dc[2] || !dc[3])
+				continue;
+
+			SpriteDecoration *m = &_monsterDecorations[i * 6 + ii + monsterIndex];
+
+			m->shp = _screen->encodeShape(dc[0], dc[1], dc[2], dc[3]);
+			m->x = dc[4];
+			m->y = dc[5];
+		}
+	}
+
+	delete s;
+}
+
+void DarkMoonEngine::replaceMonster(int unit, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem) {
+	uint8 flg = _levelBlockProperties[block].flags & 7;
+
+	if (flg == 7 || _currentBlock == block || (flg && (_monsterProps[type].u30 || pos == 4)))
+		return;
+
+	for (int i = 0; i < 30; i++) {
+		if (_monsters[i].block != block)
+			continue;
+		if (_monsters[i].pos == 4 || _monsterProps[_monsters[i].type].u30)
+			return;
+	}
+
+	int index = -1;
+	int maxDist = 0;
+
+	for (int i = 0; i < 30; i++) {
+		if (_monsters[i].hitPointsCur <= 0) {
+			index = i;
+			break;
+		}
+
+		if (_monsters[i].flags & 0x40)
+			continue;
+
+		int dist = getBlockDistance(_monsters[i].block, _currentBlock);
+
+		if (dist > maxDist) {
+			maxDist = dist;
+			index = i;
+		}
+	}
+
+	if (index == -1)
+		return;
+
+	if (_monsters[index].hitPointsCur > 0)
+		killMonster(&_monsters[index], false);
+
+	initMonster(index, unit, block, pos, dir, type, shpIndex, mode, h2, randItem, fixedItem);
+}
+
+const uint8 *DarkMoonEngine::loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs) {
+	_screen->loadEobBitmap(filename, 3, 3);
+	for (int i = 0; i < 3; i++) {
+		_doorShapes[doorIndex * 3 + i] = _screen->encodeShape(READ_LE_UINT16(shapeDefs), READ_LE_UINT16(shapeDefs + 2), READ_LE_UINT16(shapeDefs + 4), READ_LE_UINT16(shapeDefs + 6));
+		shapeDefs += 8;
+	}
+
+	for (int i = 0; i < 2; i++) {
+		_doorSwitches[doorIndex * 3 + i].shp = _screen->encodeShape(READ_LE_UINT16(shapeDefs), READ_LE_UINT16(shapeDefs + 2), READ_LE_UINT16(shapeDefs + 4), READ_LE_UINT16(shapeDefs + 6));
+		shapeDefs += 8;
+		_doorSwitches[doorIndex * 3 + i].x = *shapeDefs;
+		shapeDefs += 2;
+		_doorSwitches[doorIndex * 3 + i]. y= *shapeDefs;
+		shapeDefs += 2;
+	}
+	_screen->_curPage = 0;
+	return shapeDefs;
+}
+
+void DarkMoonEngine::drawDoorIntern(int type, int, int x, int y, int w, int wall, int mDim, int16, int16) {
+	int shapeIndex = type * 3 + 2 - mDim;
+	uint8 *shp = _doorShapes[shapeIndex];
+
+	if ((_doorType[type] == 0) || (_doorType[type] == 1)) {
+		y = _dscDoorY1[mDim] - shp[1];
+		x -= (shp[2] << 2);
+
+		if (_doorType[type] == 1) {
+			drawBlockObject(0, 2, shp, x, y, 5);
+			shp = _doorShapes[3 + shapeIndex];
+		}
+
+		y -= ((wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim]);
+
+		if (_specialWallTypes[wall] == 5)
+			y -= _dscDoorType5Offs[shapeIndex];
+
+	} else if (_doorType[type] == 2) {
+		x -= (shp[2] << 2);
+		y = _dscDoorY2[mDim] - ((wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult3[mDim]);
+	}
+
+	drawBlockObject(0, 2, shp, x, y, 5);
+
+	if (_wllShapeMap[wall] == -1 && !_noDoorSwitch[type])
+		drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+}
+
+void DarkMoonEngine::drawLightningColumn() {
+	int f = rollDice(1, 2, -1);
+	int y = 0;
+
+	for (int i = 0; i < 6; i++) {
+		f ^= 1;
+		drawBlockObject(f, 2, _lightningColumnShape, 72, y, 5);
+		y += 64;
+	}
+}
+
+int DarkMoonEngine::resurrectionSelectDialogue() {
+	int cnt = 0;
+	const char *namesList[10];
+	memset(namesList, 0, 10 * sizeof(const char*));
+	int8 indexList[10];
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 1))
+			continue;
+		if (_characters[i].hitPointsCur != -10)
+			continue;
+
+		namesList[cnt] = _characters[i].name;
+		indexList[cnt++] = i;
+	}
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 1))
+			continue;
+
+		for (int ii = 0; ii < 27; ii++) {
+			uint16 inv = _characters[i].inventory[ii];
+			if (!inv)
+				continue;
+
+			if (_items[inv].type != 33)
+				continue;
+
+			namesList[cnt] = _npcPreset[_items[inv].value - 1].name;
+			indexList[cnt++] = -_items[inv].value;
+		}
+	}
+
+	if (_itemInHand) {
+		if (_items[_itemInHand].type == 33) {
+			namesList[cnt] = _npcPreset[_items[_itemInHand].value - 1].name;
+			indexList[cnt++] = -_items[_itemInHand].value;
+		}
+	}
+
+	namesList[cnt] = _abortStrings[0];
+	indexList[cnt++] = 99;
+
+	int r = indexList[runDialogue(-1, 1, namesList[0], namesList[1], namesList[2], namesList[3], namesList[4], namesList[5], namesList[6], namesList[7], namesList[8]) - 1];
+	if (r == 99)
+		return 0;
+
+	if (r < 0) {
+		r = -r;
+		if (prepareForNewPartyMember(33, r))
+			initNpc(r - 1);
+	} else {
+		_characters[r].hitPointsCur = 1;
+	}
+
+	return 1;
+}
+
+int DarkMoonEngine::charSelectDialogue() {
+	int cnt = 0;
+	const char *namesList[7];
+	memset(namesList, 0, 7 * sizeof(const char*));
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 3))
+			continue;
+		namesList[cnt++] = _characters[i].name;
+	}
+
+	namesList[cnt++] = _abortStrings[0];
+
+	int r = runDialogue(-1, 1, namesList[0], namesList[1], namesList[2], namesList[3], namesList[4], namesList[5], namesList[6], 0) - 1;
+	if (r == cnt - 1)
+		return 99;
+
+	for (cnt = 0; cnt < 6; cnt++) {
+		if (!testCharacter(cnt, 3))
+			continue;
+		if (--r < 0)
+			break;
+	}
+	return cnt;
+}
+
+void DarkMoonEngine::characterLevelGain(int charIndex) {
+	EobCharacter *c = &_characters[charIndex];
+	int s = _numLevelsPerClass[c->cClass];
+	for (int i = 0; i < s; i++) {
+		uint32 er = getRequiredExperience(c->cClass, i, c->level[i] + 1);
+		if (er == 0xffffffff)
+			continue;
+
+		increaseCharacterExperience(charIndex, er - c->experience[i]);
+	}
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/eob2.h b/engines/kyra/eob2.h
new file mode 100644
index 0000000000..a36ec0e466
--- /dev/null
+++ b/engines/kyra/eob2.h
@@ -0,0 +1,119 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#ifndef KYRA_EOB2_H
+#define KYRA_EOB2_H
+
+#include "kyra/eobcommon.h"
+
+namespace Kyra {
+
+class DarkmoonSequenceHelper;
+
+struct EobSequenceStep {
+	uint8 command;
+	uint8 obj;
+	int16 x1;
+	uint8 y1;
+	uint8 delay;
+	uint8 pal;
+	uint8 x2;
+	uint8 y2;
+	uint8 w;
+	uint8 h;
+};
+
+class DarkMoonEngine : public EobCoreEngine {
+friend class GUI_Eob;
+friend class DarkmoonSequenceHelper;
+public:
+	DarkMoonEngine(OSystem *system, const GameFlags &flags);
+	~DarkMoonEngine();
+
+private:
+	// Init / Release
+	Common::Error init();
+	void initStaticResource();
+	void initSpells();
+
+	// Main Menu
+	int mainMenu();
+	int mainMenuLoop();
+
+	// Main loop
+	void startupNew();
+	void startupLoad();
+
+	// Intro/Outro
+	void seq_playIntro();
+	void seq_playFinale();
+	void seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *data, int sd, int backupPage, int tempPage, int speed);
+
+	const char * const*_introStrings;
+	const char * const *_cpsFilesIntro;
+	const EobSequenceStep **_seqIntro;
+	const EobShapeDef **_shapesIntro;
+
+	const char * const*_finaleStrings;
+	const uint8 *_creditsData;
+	const char * const *_cpsFilesFinale;
+	const EobSequenceStep **_seqFinale;
+	const EobShapeDef **_shapesFinale;
+
+	static const char *_palFilesIntro[];
+	static const char *_palFilesFinale[];
+
+	// characters
+	void npcSequence(int npcIndex);
+
+	const uint8 *_npcShpData;
+	const char *const *_npc1Strings;
+	const char *const *_npc2Strings;
+
+	// items
+	void updateUsedCharacterHandItem(int charIndex, int slot);
+
+	// Monsters
+	void generateMonsterPalettes(const char *file, int16 monsterIndex);
+	void loadMonsterDecoration(const char *file, int16 monsterIndex);
+	void replaceMonster(int unit, uint16 block, int d, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem);
+
+	// Level
+	const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs);
+	void drawDoorIntern(int type, int, int x, int y, int w, int wall, int mDim, int16, int16);
+
+	const uint8 *_dscDoorType5Offs;
+
+	// misc
+	void drawLightningColumn();
+	int resurrectionSelectDialogue();
+	int charSelectDialogue();
+	void characterLevelGain(int charIndex);
+};
+
+}	// End of namespace Kyra
+
+#endif
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
new file mode 100644
index 0000000000..d82a3dd012
--- /dev/null
+++ b/engines/kyra/eobcommon.cpp
@@ -0,0 +1,1845 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#include "common/config-manager.h"
+
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
+
+#include "kyra/loleobbase.h"
+#include "kyra/resource.h"
+#include "kyra/sound_intern.h"
+#include "kyra/script_eob.h"
+#include "kyra/timer.h"
+
+namespace Kyra {
+
+EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBaseEngine(system, flags), _numLargeItemShapes(flags.gameID == GI_EOB1 ? 14 : 11),
+	_numSmallItemShapes(flags.gameID == GI_EOB1 ? 23 : 26), _numThrownItemShapes(flags.gameID == GI_EOB1 ? 12 : 9), _numItemIconShapes(flags.gameID == GI_EOB1 ? 89 : 112),
+	_teleporterWallId(flags.gameID == GI_EOB1 ? 52 : 44) {
+	_screen = 0;
+	_gui = 0;
+
+	//_runLoopUnk2 = 0;
+	//_runLoopTimerUnk = 0;
+	_playFinale = false;
+	_runFlag = true;
+	_saveLoadMode = 0;
+	_updateHandItemCursor = false;
+
+	_largeItemShapes = _smallItemShapes = _thrownItemShapes = _spellShapes = _firebeamShapes = _itemIconShapes =
+		_wallOfForceShapes = _teleporterShapes = _sparkShapes = _compassShapes = 0;
+	_redSplatShape = _greenSplatShape = _deadCharShape = _disabledCharGrid = _blackBoxSmallGrid =
+		_weaponSlotGrid = _blackBoxWideGrid = _lightningColumnShape = 0;
+	_tempIconShape = 0;
+
+	_monsterDustStrings = 0;
+	_monsterDistAttType10 = 0;
+	_monsterDistAttSfx10 = 0;
+	_monsterDistAttType17 = 0;
+	_monsterDistAttSfx17 = 0;
+
+	_faceShapes = 0;
+	_characters = 0;
+	_items = 0;
+	_itemTypes = 0;
+	_itemNames = 0;
+	_itemInHand = -1;
+	_numItems = _numItemNames = 0;
+
+	_castScrollSlot = 0;
+	_currentSub = 0;
+
+	_itemsOverlay = 0;
+
+	_partyEffectFlags = 0;
+	_lastUsedItem = 0;
+
+	_levelDecorationRects = 0;
+	_doorSwitches = 0;
+	_monsterProps = 0;
+	_monsterDecorations = 0;
+	_monsterOvl1 = _monsterOvl2 = 0;
+	_monsters = 0;
+	_dstMonsterIndex = 0;
+	_inflictMonsterDamageUnk = 0;
+
+	_teleporterPulse = 0;
+
+	_dscShapeCoords = 0;
+	_dscItemPosIndex = 0;
+	_dscItemShpX = 0;
+	_dscItemScaleIndex = 0;
+	_dscItemTileIndex = 0;
+	_dscItemShapeMap = 0;
+	_dscDoorScaleOffs = 0;
+	_dscDoorScaleMult1 = 0;
+	_dscDoorScaleMult2 = 0;
+	_dscDoorScaleMult3 = 0;
+	_dscDoorY1 = 0;
+
+	_color9 = 17;
+	_color10 = 23;
+	_color11 = 20;
+
+	_exchangeCharacterId = -1;
+	_charExchangeSwap = 0;
+	_hpBarGraphs = true;
+
+	memset(_dialogueLastBitmap, 0, 13);
+	_dlgUnk1 = 0;
+	_moveCounter = 0;
+	_partyResting = false;
+
+	_flyingObjects = 0;
+
+	_inf = 0;
+	_stepCounter = 0;
+	_stepsUntilScriptCall = 0;
+	_scriptTimersMode = 3;
+	_currentDirection = 0;
+
+	_openBookSpellLevel = 0;
+	_openBookSpellSelectedItem = 0;
+	_openBookSpellListOffset = 0;
+	_openBookChar = _openBookCharBackup = 0;
+	_openBookType = _openBookTypeBackup = 0;
+	_openBookSpellList = 0;
+	_openBookAvailableSpells = 0;
+	_activeSpellCaster = 0;
+	_activeSpellCasterPos = 0;
+	_activeSpell = 0;
+	_returnAfterSpellCallback = false;
+	_spells = 0;
+	_spellAnimBuffer = 0;
+	_clericSpellOffset = 0;
+}
+
+EobCoreEngine::~EobCoreEngine() {
+	releaseItemsAndDecorationsShapes();
+	releaseTempData();
+
+	if (_faceShapes) {
+		for (int i = 0; i < 44; i++) {
+			if (_characters) {
+				for (int ii = 0; ii < 6; ii++) {
+					if (_characters[ii].faceShape == _faceShapes[i])
+						_characters[ii].faceShape = 0;
+				}
+			}
+			delete[] _faceShapes[i];
+			_faceShapes[i] = 0;
+		}
+		delete[] _faceShapes;
+	}
+
+	if (_characters) {
+		for (int i = 0; i < 6; i++)
+			delete[] _characters[i].faceShape;
+	}
+
+	delete[] _characters;
+	delete[] _items;
+	delete[] _itemTypes;
+	if (_itemNames) {
+		for (int i = 0; i < 130; i++)
+			delete _itemNames[i];
+	}
+	delete[] _itemNames;
+	delete[] _flyingObjects;
+
+	delete[] _monsterOvl1;
+	delete[] _monsterOvl2;
+	delete[] _monsters;
+
+	if (_monsterDecorations) {
+		releaseMonsterShapes(0, 36);
+		delete[] _monsterShapes;
+		delete[] _monsterDecorations;
+
+		for (int i = 0; i < 24; i++)
+			delete[] _monsterPalettes[i];
+		delete[] _monsterPalettes;
+	}
+
+	delete[] _monsterProps;
+
+	if (_doorSwitches) {
+		releaseDoorShapes();
+		delete[] _doorSwitches;
+	}
+
+	releaseDecorations();
+	delete[] _levelDecorationRects;
+
+	delete[] _spells;
+	delete[] _spellAnimBuffer;
+
+	delete _gui;
+	_gui = 0;
+	delete _inf;
+	delete _timer;
+	_timer = 0;
+}
+
+Common::Error EobCoreEngine::init() {
+	// In EOB the timer proc is directly invoked via interrupt 0x1c, 18.2 times per second.
+	// This makes a tick length of 54.94.
+	_tickLength = 55;
+
+	_screen = new Screen_Eob(this, _system);
+
+	assert(_screen);
+	_screen->setResolution();
+
+	// Setup mixer
+	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
+
+	//MidiDriverType midiDriver = MidiDriver::detectDevice(MDT_PCSPK | MDT_ADLIB);
+	_sound = new SoundAdLibPC(this, _mixer);
+	assert(_sound);
+
+	if (_sound)
+		_sound->updateVolumeSettings();
+
+	_res = new Resource(this);
+	assert(_res);
+	_res->reset();
+
+	if (!screen()->init())
+		error("screen()->init() failed");
+
+	if (ConfMan.hasKey("save_slot")) {
+		_gameToLoad = ConfMan.getInt("save_slot");
+		if (!saveFileLoadable(_gameToLoad))
+			_gameToLoad = -1;
+	}
+
+	setupKeyMap();
+	_gui = new GUI_Eob(this);
+	_txt = new TextDisplayer_Eob(this, _screen);
+	_inf = new EobInfProcessor(this, _screen);
+
+	_screen->loadFont(Screen::FID_6_FNT, "FONT6.FNT");
+	_screen->loadFont(Screen::FID_8_FNT, "FONT8.FNT");
+
+	_activeButtons = 0;
+
+	_staticres = new StaticResource(this);
+	assert(_staticres);
+	if (!_staticres->init())
+		error("_staticres->init() failed");
+
+	Common::Error err = LolEobBaseEngine::init();
+	if (err.getCode() != Common::kNoError)
+		return err;
+
+	initButtonData();
+	initStaticResource();
+	initSpells();
+
+	_timer = new TimerManager(this, _system);
+	assert(_timer);
+	setupTimers();
+
+	_wllVmpMap[1] = 1;
+	_wllVmpMap[2] = 2;
+	memset(&_wllVmpMap[3], 3, 20);
+	_wllVmpMap[23] = 4;
+	_wllVmpMap[24] = 5;
+
+	memcpy(_wllWallFlags, _wllFlagPreset, _wllFlagPresetSize);
+
+	memset(&_specialWallTypes[3], 1, 5);
+	memset(&_specialWallTypes[13], 1, 5);
+	_specialWallTypes[8] = _specialWallTypes[18] = 6;
+
+	memset(&_wllShapeMap[3], -1, 5);
+	memset(&_wllShapeMap[13], -1, 5);
+
+	_wllVcnOffset = 16;
+
+	_monsters = new EobMonsterInPlay[30];
+	memset(_monsters, 0, 30 * sizeof(EobMonsterInPlay));
+
+	_characters = new EobCharacter[6];
+	memset(_characters, 0, sizeof(EobCharacter) * 6);
+
+	_items = new EobItem[600];
+	memset(_items, 0, sizeof(EobItem) * 600);
+
+	_itemNames = new char*[130];
+	for (int i = 0; i < 130; i++) {
+		_itemNames[i] = new char[35];
+		memset(_itemNames[i], 0, 35);
+	}
+
+	_flyingObjects = new EobFlyingObject[10];
+	memset(_flyingObjects, 0, 10 * sizeof(EobFlyingObject));
+
+	_spellAnimBuffer = new uint8[4096];
+	memset(_spellAnimBuffer, 0, 4096);
+
+	memset(_doorType, 0, sizeof(_doorType));
+	memset(_noDoorSwitch, 0, sizeof(_noDoorSwitch));
+
+	_monsterShapes = new uint8*[36];
+	memset(_monsterShapes, 0, 36 * sizeof(uint8*));
+	_monsterDecorations = new SpriteDecoration[36];
+	memset(_monsterDecorations, 0, 36 * sizeof(SpriteDecoration));
+	_monsterPalettes = new uint8*[24];
+	for (int i = 0; i < 24; i++)
+		_monsterPalettes[i] = new uint8[16];
+
+	_doorSwitches = new SpriteDecoration[6];
+	memset(_doorSwitches, 0, 6 * sizeof(SpriteDecoration));
+
+	_monsterOvl1 = new uint8[16];
+	_monsterOvl2 = new uint8[16];
+	memset(_monsterOvl1, 15, 16 * sizeof(uint8));
+	memset(_monsterOvl2, 13, 16 * sizeof(uint8));
+	_monsterOvl1[0] = _monsterOvl2[0] = 0;
+
+	return Common::kNoError;
+}
+
+Common::Error EobCoreEngine::go() {
+	_txt->removePageBreakFlag();
+	_screen->loadPalette("palette.col", _screen->getPalette(0));
+	_screen->setScreenPalette(_screen->getPalette(0));
+	_screen->setFont(Screen::FID_8_FNT);
+
+	loadItemsAndDecorationsShapes();
+	_screen->setMouseCursor(0, 0, _itemIconShapes[0]);
+	_screen->showMouse();
+
+	//initPlayBuffers
+
+	loadItemDefs();
+
+	int action = 0;
+
+	if (_gameToLoad != -1) {
+		if (loadGameState(_gameToLoad).getCode() != Common::kNoError)
+			error("Couldn't load game slot %d on startup", _gameToLoad);
+		_gameToLoad = -1;
+	} else {
+		action = mainMenu();
+	}
+
+	if (action == -1) {
+		// load game
+		_saveLoadMode = -1;
+		startupLoad();
+	} else if (action == -2) {
+		// new game
+		startCharacterGeneration();
+		startupNew();
+	} else if (action == -3) {
+		// transfer party
+	}
+
+	if (!shouldQuit() && action > -3) {
+		runLoop();
+
+		if (_playFinale)
+			seq_playFinale();
+	}
+
+	return Common::kNoError;
+}
+
+void EobCoreEngine::runLoop() {
+	_envAudioTimer = _system->getMillis() + (rollDice(1, 10, 3) * 18 * _tickLength);
+	///
+	// startupSub1
+	//
+	//
+	_updateFlags = 0;
+	//_unkCharacterId = 0;
+	_flashShapeTimer = 0;
+	_drawSceneTimer = _system->getMillis();
+	//_unkBBBBBBBBBBBBBBBB = 1;
+	gui_setPlayFieldButtons();
+	//
+
+	_screen->_curPage = 0;
+	gui_drawPlayField(0);
+
+	_screen->setFont(Screen::FID_6_FNT);
+
+	_screen->_curPage = 0;
+	gui_drawAllCharPortraitsWithStats();
+
+	drawScene(1);
+
+	_screen->setScreenDim(7);
+
+	//_runLoopUnk2 = _currentBlock;
+	_runFlag = true;
+
+	while (!shouldQuit() && _runFlag) {
+		//_runLoopUnk2 = _currentBlock;
+		updateCharacterEvents(true);
+		checkInput(_activeButtons, true);
+		removeInputTop();
+
+		if (_updateHandItemCursor) {
+			_updateHandItemCursor = false;
+			setHandItem(_itemInHand);
+		}
+
+		_timer->update();
+		updateScriptTimers();
+
+		if (_sceneUpdateRequired)
+			drawScene(1);
+
+		if (_envAudioTimer >= _system->getMillis())
+			continue;
+
+		_envAudioTimer = _system->getMillis() + (rollDice(1, 10, 3) * 18 * _tickLength);
+		snd_processEnvironmentalSoundEffect(rollDice(1, 2, -1) ? 27 : 28, _currentBlock + rollDice(1, 12, -1));
+		updateEnvironmentalSfx(0);
+	}
+}
+
+bool EobCoreEngine::updateCharacterEvents(bool a) {
+	int numChars = 0;
+	for (int i = 0; i < 6; i++)
+		numChars += testCharacter(i, 13);
+
+	if (numChars)
+		return false;
+
+	if (!a)
+		return true;
+
+
+	gui_drawAllCharPortraitsWithStats();
+
+	///	TODO
+	/// if (checkScriptFlag(0x10))
+	/// j_dranThoseFools()
+
+	///	TODO
+
+	///	TODO
+
+
+	return false;
+}
+
+void EobCoreEngine::loadItemsAndDecorationsShapes() {
+	releaseItemsAndDecorationsShapes();
+	_screen->setCurPage(2);
+
+	_screen->loadBitmap("ITEML1.CPS", 5, 3, 0);
+	_largeItemShapes = new const uint8*[_numLargeItemShapes];
+	int div = (_flags.gameID == GI_EOB1) ? 3 : 8;
+	int mul = (_flags.gameID == GI_EOB1) ? 64 : 24;
+
+	for (int i = 0; i < _numLargeItemShapes; i++)
+		_largeItemShapes[i] = _screen->encodeShape((i / div) << 3, (i % div) * mul, 8, 24);
+
+	_screen->loadBitmap("ITEMS1.CPS", 5, 3, 0);
+	_smallItemShapes = new const uint8*[_numSmallItemShapes];
+	for (int i = 0; i < _numSmallItemShapes; i++)
+		_smallItemShapes[i] = _screen->encodeShape((i / div) << 2, (i % div) * mul, 4, 24);
+
+	_screen->loadBitmap("THROWN.CPS", 5, 3, 0);
+	_thrownItemShapes = new const uint8*[_numThrownItemShapes];
+	for (int i = 0; i < _numThrownItemShapes; i++)
+		_thrownItemShapes[i] = _screen->encodeShape((i / div) << 2, (i % div) * mul, 4, 24);
+
+	_spellShapes = new const uint8*[4];
+	for (int i = 0; i < 4; i++)
+		_spellShapes[i] = _screen->encodeShape(8, i << 5, 6, 32);
+
+	_firebeamShapes = new const uint8*[3];
+	_firebeamShapes[0] = _screen->encodeShape(16, 0, 4, 24);
+	_firebeamShapes[1] = _screen->encodeShape(16, 24, 4, 24);
+	_firebeamShapes[2] = _screen->encodeShape(16, 48, 3, 24);
+	_redSplatShape = _screen->encodeShape(16, _flags.gameID == GI_EOB1 ? 144 : 72, 5, 24);
+	_greenSplatShape = _screen->encodeShape(16, _flags.gameID == GI_EOB1 ? 168 : 96, 5, 16);
+
+	_screen->loadBitmap("ITEMICN.CPS", 5, 3, 0);
+	_itemIconShapes = new const uint8*[_numItemIconShapes];
+	for (int i = 0; i < _numItemIconShapes; i++)
+		_itemIconShapes[i] = _screen->encodeShape((i % 0x14) << 1, (i / 0x14) << 4, 2, 0x10);
+	_tempIconShape = new uint8[300];
+
+	_screen->loadBitmap("DECORATE.CPS", 5, 3, 0);
+
+	if (_flags.gameID == GI_EOB2) {
+		_lightningColumnShape = _screen->encodeShape(18, 88, 4, 64);
+		_wallOfForceShapes = new const uint8*[6];
+		for (int i = 0; i < 6; i++)
+			_wallOfForceShapes[i] = _screen->encodeShape(_wallOfForceShapeDefs[(i << 2)], _wallOfForceShapeDefs[(i << 2) + 1], _wallOfForceShapeDefs[(i << 2) + 2], _wallOfForceShapeDefs[(i << 2) + 3]);
+	}
+
+	_teleporterShapes = new const uint8*[6];
+	for (int i = 0; i < 6; i++)
+		_teleporterShapes[i] = _screen->encodeShape(_teleporterShapeDefs[(i << 2)], _teleporterShapeDefs[(i << 2) + 1], _teleporterShapeDefs[(i << 2) + 2], _teleporterShapeDefs[(i << 2) + 3]);
+	_sparkShapes = new const uint8*[3];
+	_sparkShapes[0] = _screen->encodeShape(29, 0, 2, 16);
+	_sparkShapes[1] = _screen->encodeShape(31, 0, 2, 16);
+	_sparkShapes[2] = _screen->encodeShape(33, 0, 2, 16);
+	_deadCharShape = _screen->encodeShape(0, 88, 4, 32);
+	_disabledCharGrid = _screen->encodeShape(4, 88, 4, 32);
+	_blackBoxSmallGrid = _screen->encodeShape(9, 88, 2, 8);
+	_weaponSlotGrid = _screen->encodeShape(8, 88, 4, 16);
+	_blackBoxWideGrid = _screen->encodeShape(8, 104, 4, 8);
+
+	static const uint8 dHeight[] = { 17, 10, 10 };
+	static const uint8 dY[] = { 120, 137, 147 };
+
+	_compassShapes = new const uint8*[12];
+	for (int y = 0; y < 3; y++) {
+		for (int x = 0; x < 4; x++)
+			_compassShapes[(y << 2) + x] = _screen->encodeShape(x * 3, dY[y], 3, dHeight[y]);
+	}
+}
+
+void EobCoreEngine::releaseItemsAndDecorationsShapes() {
+	if (_largeItemShapes) {
+		for (int i = 0; i < _numLargeItemShapes; i++) {
+			if (_largeItemShapes[i])
+				delete[] _largeItemShapes[i];
+		}
+		delete[] _largeItemShapes;
+	}
+
+	if (_smallItemShapes) {
+		for (int i = 0; i < _numSmallItemShapes; i++) {
+			if (_smallItemShapes[i])
+				delete[] _smallItemShapes[i];
+		}
+		delete[] _smallItemShapes;
+	}
+
+	if (_thrownItemShapes) {
+		for (int i = 0; i < _numThrownItemShapes; i++) {
+			if (_thrownItemShapes[i])
+				delete[] _thrownItemShapes[i];
+		}
+		delete[] _thrownItemShapes;
+	}
+
+	if (_spellShapes) {
+		for (int i = 0; i < 4; i++) {
+			if (_spellShapes[i])
+				delete [] _spellShapes[i];
+		}
+		delete[] _spellShapes;
+	}
+
+	if (_itemIconShapes) {
+		for (int i = 0; i < _numItemIconShapes; i++) {
+			if (_itemIconShapes[i])
+				delete[] _itemIconShapes[i];
+		}
+		delete[] _itemIconShapes;
+	}
+	delete[] _tempIconShape;
+
+	if (_sparkShapes) {
+		for (int i = 0; i < 3; i++) {
+			if (_sparkShapes[i])
+				delete[] _sparkShapes[i];
+		}
+		delete[] _sparkShapes;
+	}
+
+	if (_wallOfForceShapes) {
+		for (int i = 0; i < 6; i++) {
+			if (_wallOfForceShapes[i])
+				delete[] _wallOfForceShapes[i];
+		}
+		delete[] _wallOfForceShapes;
+	}
+
+	if (_teleporterShapes) {
+		for (int i = 0; i < 6; i++) {
+			if (_teleporterShapes[i])
+				delete[] _teleporterShapes[i];
+		}
+		delete[] _teleporterShapes;
+	}
+
+	if (_compassShapes) {
+		for (int i = 0; i < 12; i++) {
+			if (_compassShapes[i])
+				delete[] _compassShapes[i];
+		}
+		delete[] _compassShapes;
+	}
+
+	if (_firebeamShapes) {
+		for (int i = 0; i < 3; i++) {
+			if (_firebeamShapes[i])
+				delete[] _firebeamShapes[i];
+		}
+		delete []_firebeamShapes;
+	}
+
+	delete[] _deadCharShape;
+	delete[] _disabledCharGrid;
+	delete[] _blackBoxSmallGrid;
+	delete[] _weaponSlotGrid;
+	delete[] _blackBoxWideGrid;
+	delete[] _lightningColumnShape;
+}
+
+void EobCoreEngine::setHandItem(Item itemIndex) {
+	if (itemIndex == -1)
+		return;
+
+	if (_screen->curDimIndex() == 7 && itemIndex) {
+		printFullItemName(itemIndex);
+		_txt->printMessage(_takenStrings[0]);
+	}
+
+	_itemInHand = itemIndex;
+	int icon = _items[_itemInHand].icon;
+	const uint8 *shp = _itemIconShapes[icon];
+
+	if (icon && (_items[_itemInHand].flags & 0x80) && ((_flags.gameID == GI_EOB2 && (_partyEffectFlags & 2)) || (_flags.gameID == GI_EOB1 && (_partyEffectFlags & 0x10000)))) {
+		memcpy(_tempIconShape, shp, 300);
+		if (_flags.gameID == GI_EOB1)
+			_screen->replaceShapePalette(_tempIconShape, &_itemsOverlay[icon << 4]);
+		else
+			_screen->applyShapeOverlay(_tempIconShape, 3);
+		shp = _tempIconShape;
+	}
+
+	int mouseOffs = itemIndex ? 8 : 0;
+	_screen->setMouseCursor(mouseOffs, mouseOffs, shp);
+}
+
+int EobCoreEngine::getDexterityArmorClassModifier(int dexterity) {
+	static const int mod[] = { 5, 5, 5, 4, 3, 2, 1, 0, 0,
+		0, 0, 0, 0, 0, 0, -1, -2, -3, -4, -4, -5, -5, -5, -6, -6 };
+	return mod[dexterity];
+}
+
+int EobCoreEngine::generateCharacterHitpointsByLevel(int charIndex, int levelIndex) {
+	EobCharacter *c = &_characters[charIndex];
+	int m = getClassAndConstHitpointsModifier(c->cClass, c->constitutionCur);
+
+	int h = 0;
+
+	for (int i = 0; i < 3; i++) {
+		if (!(levelIndex & (1 << i)))
+			continue;
+
+		int d = getClassHpIncreaseType(c->cClass, i);
+
+		if (c->level[i] <= _hpIncrPerLevel[6 + i])
+			h += rollDice(1, (d >= 0) ? _hpIncrPerLevel[d] : 0);
+		else
+			h += _hpIncrPerLevel[12 + i];
+
+		h += m;
+	}
+
+	h /= _numLevelsPerClass[c->cClass];
+
+	if (h < 1)
+		h = 1;
+
+	return h;
+}
+
+int EobCoreEngine::getClassAndConstHitpointsModifier(int cclass, int constitution) {
+	int res = _hpConstModifiers[constitution];
+
+	if (res <= 2 || (_classModifierFlags[cclass] & 0x31))
+		return res;
+
+	return 2;
+}
+
+int EobCoreEngine::getClassHpIncreaseType(int cclass, int levelIndex) {
+	return _classHpIncreaseType[cclass * 3 + levelIndex];
+}
+
+int EobCoreEngine::getModifiedHpLimits(int hpModifier, int constModifier, int level, bool mode) {
+	int s = _hpIncrPerLevel[6 + hpModifier] > level ? level : _hpIncrPerLevel[6 + hpModifier];
+	int res = s;
+
+	if (!mode)
+		res *= (hpModifier >= 0 ? _hpIncrPerLevel[hpModifier] : 0);
+
+	if (level > s) {
+		s = level - s;
+		res += (s * _hpIncrPerLevel[12 + hpModifier]);
+	}
+
+	if (!mode || (constModifier > 0))
+		res += (level * constModifier);
+
+	return res;
+}
+
+const char *EobCoreEngine::getCharStrength(int str, int strExt) {
+	if (strExt) {
+		if (strExt == 100)
+			strExt = 0;
+		snprintf(_strenghtStr, 6, "%d/%02d", str, strExt);
+	} else {
+		snprintf(_strenghtStr, 6, "%d", str);
+	}
+
+	return _strenghtStr;
+}
+
+int EobCoreEngine::testCharacter(int index, int flags) {
+	if (index == -1)
+		return 0;
+
+	EobCharacter *c = &_characters[index];
+	int res = 1;
+
+	if (flags & 1)
+		res &= (c->flags & 1);
+
+	if (flags & 2)
+		res &= ((c->hitPointsCur <= -10) || (c->flags & 8)) ? 0 : 1;
+
+	if (flags & 4)
+		res &= ((c->hitPointsCur <= 0) || (c->flags & 8)) ? 0 : 1;
+
+	if (flags & 8)
+		res &= (c->flags & 12) ? 0 : 1;
+
+	if (flags & 0x20)
+		res &= (c->flags & 4) ? 0 : 1;
+
+	if (flags & 0x10)
+		res &= (c->flags & 2) ? 0 : 1;
+
+	if (flags & 0x40)
+		res &= (c->food <= 0) ? 0 : 1;
+
+	return res;
+}
+
+int EobCoreEngine::getNextValidCharIndex(int curCharIndex, int searchStep) {
+	do {
+		curCharIndex += searchStep;
+		if (curCharIndex < 0)
+			curCharIndex = 5;
+		if (curCharIndex > 5)
+			curCharIndex = 0;
+	} while (!testCharacter(curCharIndex, 1));
+
+	return curCharIndex;
+}
+
+void EobCoreEngine::recalcArmorClass(int index) {
+	EobCharacter *c = &_characters[index];
+	int acm = getDexterityArmorClassModifier(c->dexterityCur);
+	c->armorClass = 10 + acm;
+
+	static uint8 slot[] = { 17, 0, 1, 18 };
+	for (int i = 0; i < 4; i++) {
+		int itm = c->inventory[slot[i]];
+		if (!itm)
+			continue;
+
+		if (i == 2) {
+			if (!validateWeaponSlotItem(index, 1))
+				continue;
+		}
+
+		int tp = _items[itm].type;
+
+		if (!(_itemTypes[tp].allowedClasses & _classModifierFlags[c->cClass]) || (_itemTypes[tp].extraProperties & 0x7f) || (i >= 1 && i <= 2 && tp != 27 && !(_flags.gameID == GI_EOB2 && tp == 57)))
+			continue;
+
+		c->armorClass += _itemTypes[tp].armorClass;
+		c->armorClass -= _items[itm].value;
+	}
+
+	if (!_items[c->inventory[17]].value) {
+		int8 m1 = 0;
+		int8 m2 = 0;
+
+		if (c->inventory[25]) {
+			if (!(_itemTypes[_items[c->inventory[25]].type].extraProperties & 0x7f))
+				m1 = _items[c->inventory[25]].value;
+		}
+
+		if (c->inventory[26]) {
+			if (!(_itemTypes[_items[c->inventory[26]].type].extraProperties & 0x7f))
+				m2 = _items[c->inventory[26]].value;
+		}
+
+		c->armorClass -= MAX(m1, m2);
+	}
+
+	if (c->effectsRemainder[0] > 0) {
+		if (c->armorClass <= (acm + 6))
+			c->effectsRemainder[0] = 0;
+		else
+			c->armorClass = (acm + 6);
+	}
+
+	// shield
+	if ((c->effectFlags & 8) && (c->armorClass > 4))
+		c->armorClass = 4;
+
+	// magical vestment
+	if (c->effectFlags & 0x4000) {
+		int8 m1 = 5;
+
+		if (getCharacterClericPaladinLevel(index) > 5)
+			m1 += ((getCharacterClericPaladinLevel(index) - 5) / 3);
+
+		if (c->armorClass > m1)
+			c->armorClass = m1;
+	}
+
+	if (c->armorClass < -10)
+		c->armorClass = -10;
+}
+
+int EobCoreEngine::validateWeaponSlotItem(int index, int slot) {
+	EobCharacter *c = &_characters[index];
+	int itm1 = c->inventory[0];
+	int r = itemUsableByCharacter(index, itm1);
+	int tp1 = _items[itm1].type;
+
+	if (!slot)
+		return (!itm1 || r) ? 1 : 0;
+
+	int itm2 = c->inventory[1];
+	r = itemUsableByCharacter(index, itm2);
+	int tp2 = _items[itm2].type;
+
+	if (itm1 && _itemTypes[tp1].requiredHands == 2)
+		return 0;
+
+	if (!itm2)
+		return 1;
+
+	int f = (_itemTypes[tp2].extraProperties & 0x7f);
+	if (f <= 0 || f > 3)
+		return r;
+
+	if (_itemTypes[tp2].requiredHands)
+		return 0;
+
+	return r;
+}
+
+int EobCoreEngine::getCharacterClericPaladinLevel(int index) {
+	if (_castScrollSlot)
+		return 9;
+
+	if (index == -1)
+		return (_currentLevel < 7) ? 5 : 9;
+
+	int l = getLevelIndexForHpIncType(2, _characters[index].cClass);
+	if (l > -1)
+		return _characters[index].level[l];
+
+	l = getLevelIndexForHpIncType(4, _characters[index].cClass);
+	if (l > -1) {
+		if (_characters[index].level[l] > 8)
+			return _characters[index].level[l] - 8;
+	}
+
+	return 1;
+}
+
+int EobCoreEngine::getCharacterMageLevel(int index) {
+	if (_castScrollSlot)
+		return 9;
+
+	if (index == -1)
+		return (_currentLevel < 7) ? 5 : 9;
+
+	int l = getLevelIndexForHpIncType(1, _characters[index].cClass);
+	return (l > -1) ? _characters[index].level[l] : 1;
+}
+
+int EobCoreEngine::getLevelIndexForHpIncType(int hpIncType, int cClass) {
+	if (getClassHpIncreaseType(cClass, 0) == hpIncType)
+		return 0;
+
+	if (getClassHpIncreaseType(cClass, 1) == hpIncType)
+		return 1;
+
+	if (getClassHpIncreaseType(cClass, 2) == hpIncType)
+		return 2;
+
+	return -1;
+}
+
+int EobCoreEngine::countCharactersWithSpecificItems(int16 itemType, int16 itemValue) {
+	int res = 0;
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 1))
+			continue;
+		if (checkCharacterInventoryForItem(i, itemType, itemValue) != -1)
+			res++;
+	}
+	return res;
+}
+
+int EobCoreEngine::checkCharacterInventoryForItem(int character, int16 itemType, int16 itemValue) {
+	for (int i = 0; i < 27; i++) {
+		uint16 inv = _characters[character].inventory[i];
+		if (!inv)
+			continue;
+		if (_items[inv].type != itemType && itemType != -1)
+			continue;
+		if (_items[inv].value == itemValue || itemValue == -1)
+			return i;
+	}
+	return -1;
+}
+
+void EobCoreEngine::modifyCharacterHitpoints(int character, int16 points) {
+	if (!testCharacter(character, 3))
+		return;
+
+	EobCharacter *c = &_characters[character];
+	c->hitPointsCur += points;
+	if (c->hitPointsCur > c->hitPointsMax)
+		c->hitPointsCur = c->hitPointsMax;
+
+	gui_drawHitpoints(character);
+	gui_drawCharPortraitWithStats(character);
+}
+
+void EobCoreEngine::neutralizePoison(int character) {
+	_characters[character].flags &= ~2;
+	_characters[character].effectFlags &= ~0x2000;
+	deleteCharEventTimer(character, -34);
+	gui_drawCharPortraitWithStats(character);
+}
+
+void EobCoreEngine::initNpc(int npcIndex) {
+	EobCharacter *c = _characters;
+	int i = 0;
+	for (; i < 6; i++) {
+		if (!(_characters[i].flags & 1)) {
+			c = &_characters[i];
+			break;
+		}
+	}
+
+	delete[] c->faceShape;
+	memcpy(c, &_npcPreset[npcIndex], sizeof(EobCharacter));
+	recalcArmorClass(i);
+
+	for (i = 0; i < 25; i++) {
+		if (!c->inventory[i])
+			continue;
+		c->inventory[i] = duplicateItem(c->inventory[i]);
+	}
+
+	_screen->loadEobBitmap(_flags.gameID == GI_EOB2 ? "OUTPORTS" : "OUTTAKE", 3, 3);
+	_screen->_curPage = 2;
+	c->faceShape = _screen->encodeShape(npcIndex << 2, _flags.gameID == GI_EOB2 ? 0 : 160, 4, 32, true);
+	_screen->_curPage = 0;
+}
+
+int EobCoreEngine::npcJoinDialogue(int npcIndex, int queryJoinTextId, int confirmJoinTextId, int noJoinTextId) {
+	gui_drawDialogueBox();
+	_txt->printDialogueText(queryJoinTextId, 0);
+
+	int r = runDialogue(-1, 0, _yesNoStrings[0], _yesNoStrings[1]) - 1;
+	if (r == 0) {
+		if (confirmJoinTextId == -1) {
+			char tmp[35];
+			snprintf(tmp, 35, _npcJoinStrings[0], _npcPreset[npcIndex].name);
+			_txt->printDialogueText(tmp, true);
+		} else {
+			_txt->printDialogueText(confirmJoinTextId, _okStrings[0]);
+		}
+
+		if (prepareForNewPartyMember(33, npcIndex + 1))
+			initNpc(npcIndex);
+
+	} else if (r == 1) {
+		_txt->printDialogueText(noJoinTextId, _okStrings[0]);
+	}
+
+	return r ^ 1;
+}
+
+int EobCoreEngine::prepareForNewPartyMember(int16 itemType, int16 itemValue) {
+	int numChars = 0;
+	for (int i = 0; i < 6; i++)
+		numChars += (_characters[i].flags & 1);
+
+	if (numChars < 6) {
+		deletePartyItem(itemType, itemValue);
+	} else {
+		gui_drawDialogueBox();
+		_txt->printDialogueText(_npcMaxStrings[0]);
+		int r = runDialogue(-1, 1, _characters[0].name, _characters[1].name, _characters[2].name, _characters[3].name,
+			_characters[4].name, _characters[5].name, _abortStrings[0], 0, 0) - 1;
+
+		if (r == 6)
+			return 0;
+
+		deletePartyItem(itemType, itemValue);
+		removeCharacterFromParty(r);
+	}
+
+	return 1;
+}
+
+void EobCoreEngine::removeCharacterFromParty(int charIndex) {
+	EobCharacter *c = &_characters[charIndex];
+	c->flags = 0;
+
+	for (int i = 0; i < 27; i++) {
+		if (i == 16 || !c->inventory[i])
+			continue;
+
+		setItemPosition((Item*)&_levelBlockProperties[_currentBlock & 0x3ff].drawObjects, _currentBlock, c->inventory[i], _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
+		c->inventory[i] = 0;
+	}
+
+	while (c->inventory[16])
+		setItemPosition((Item*)&_levelBlockProperties[_currentBlock & 0x3ff].drawObjects, _currentBlock, getQueuedItem(&c->inventory[16], 0, -1), _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
+
+	c->inventory[16] = 0;
+
+	if (_updateCharNum == charIndex)
+		_updateCharNum = 0;
+
+	setupCharacterTimers();
+}
+
+void EobCoreEngine::increasePartyExperience(int16 points) {
+	int cnt = 0;
+	for (int i = 0; i < 6; i++) {
+		if (testCharacter(i, 3))
+			cnt++;
+	}
+
+	if (cnt <= 0)
+		return;
+
+	points /= cnt;
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 3))
+			continue;
+		increaseCharacterExperience(i, points);
+	}
+}
+
+void EobCoreEngine::increaseCharacterExperience(int charIndex, int32 points) {
+	int cl = _characters[charIndex].cClass;
+	points /= _numLevelsPerClass[cl];
+
+	for (int i = 0; i < 3; i++) {
+		if (getClassHpIncreaseType(cl, i) == -1)
+			continue;
+		_characters[charIndex].experience[i] += points;
+
+		uint32 er = getRequiredExperience(cl, i, _characters[charIndex].level[i] + 1);
+		if (er == 0xffffffff)
+			continue;
+
+		if (_characters[charIndex].experience[i] >= er)
+			increaseCharacterLevel(charIndex, i);
+	}
+}
+
+uint32 EobCoreEngine::getRequiredExperience(int cClass, int levelIndex, int level) {
+	cClass = getClassHpIncreaseType(cClass, levelIndex);
+	if (cClass == -1)
+		return 0xffffffff;
+
+	const uint32 *tbl = _expRequirementTables[cClass];
+	return tbl[level - 1];
+}
+
+void EobCoreEngine::increaseCharacterLevel(int charIndex, int levelIndex) {
+	_characters[charIndex].level[levelIndex]++;
+	int hpInc = generateCharacterHitpointsByLevel(charIndex, levelIndex);
+	_characters[charIndex].hitPointsCur += hpInc;
+	_characters[charIndex].hitPointsMax += hpInc;
+
+	gui_drawCharPortraitWithStats(charIndex);
+	_txt->printMessage(_levelGainStrings[0], -1, _characters[charIndex].name);
+	snd_playSoundEffect(23);
+}
+
+void EobCoreEngine::setWeaponSlotStatus(int charIndex, int mode, int slot) {
+	if (mode == 0 || mode == 2)
+		_characters[charIndex].disabledSlots ^= (1 << slot);
+	else if (mode != 1)
+		return;
+
+	_characters[charIndex].slotStatus[slot] = 0;
+	gui_drawCharPortraitWithStats(charIndex);
+}
+
+void EobCoreEngine::setupDialogueButtons(int presetfirst, int numStr, const char *str1, ...) {
+	_dialogueNumButtons = numStr;
+	_dialogueButtonString[0] = str1;
+	_dialogueHighlightedButton = 0;
+
+	va_list args;
+	va_start(args, str1);
+	const char **s5p = va_arg(args, const char**);
+	va_end(args);
+	for (int i = 1; i < numStr; i++) {
+		if (s5p[i - 1])
+			_dialogueButtonString[i] = s5p[i - 1];
+		else
+			_dialogueNumButtons = numStr = i;
+	}
+
+	static const uint16 prsX[] = { 59, 166, 4, 112, 220, 4, 112, 220, 4, 112, 220, 4, 112, 220 };
+	static const uint8 prsY[] = { 0, 0, 0, 0, 0, 12, 12, 12, 24, 24, 24, 36, 36, 36 };
+
+	const ScreenDim *dm = screen()->_curDim;
+	int yOffs = (_txt->lineCount() + 1) * _screen->getFontHeight() + dm->sy + 4;
+
+	_dialogueButtonPosX = &prsX[presetfirst];
+	_dialogueButtonPosY = &prsY[presetfirst];
+	_dialogueButtonYoffs = yOffs;
+
+	drawDialogueButtons();
+
+	if (!shouldQuit())
+		removeInputTop();
+}
+
+void EobCoreEngine::initDialogueSequence() {
+	_dlgUnk1 = -1;
+	_txt->setWaitButtonMode(0);
+	_dialogueField = true;
+
+	_dialogueLastBitmap[0] = 0;
+
+	_txt->resetPageBreakString();
+	gui_updateControls();
+
+	_sound->playTrack(0);
+	Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
+	_screen->loadFileDataToPage(s, 5, 32000);
+	_txt->setupField(9, 0);
+	delete s;
+}
+
+void EobCoreEngine::restoreAfterDialogueSequence() {
+	_txt->allowPageBreak(false);
+	_dialogueField = false;
+
+	_dialogueLastBitmap[0] = 0;
+
+	gui_restorePlayField();
+	_screen->setScreenDim(7);
+
+	if (_flags.gameID == GI_EOB2)
+		_sound->playTrack(2);
+
+	_sceneUpdateRequired = true;
+}
+
+void EobCoreEngine::drawSequenceBitmap(const char *file, int destRect, int x1, int y1, int flags) {
+	static const uint8 frameX[] = { 1, 0 };
+	static const uint8 frameY[] = { 8, 0 };
+	static const uint8 frameW[] = { 20, 40 };
+	static const uint8 frameH[] = { 96, 121 };
+
+	int page = ((flags & 2) || destRect) ? 0 : 6;
+
+	if (scumm_stricmp(_dialogueLastBitmap, file)) {
+		if (!destRect) {
+			if (!(flags & 1)) {
+				_screen->loadEobCpsFileToPage("BORDER", 0, 3, 3, 2);
+				_screen->copyRegion(0, 0, 0, 0, 184, 121, 2, page, Screen::CR_NO_P_CHECK);
+			} else {
+				_screen->copyRegion(0, 0, 0, 0, 184, 121, 0, page, Screen::CR_NO_P_CHECK);
+			}
+
+			if (!page)
+				_screen->copyRegion(0, 0, 0, 0, 184, 121, 2, 6, Screen::CR_NO_P_CHECK);
+		}
+
+		_screen->loadEobCpsFileToPage(file, 0, 3, 3, 2);
+		strcpy(_dialogueLastBitmap, file);
+	}
+
+	if (flags & 2)
+		_screen->crossFadeRegion(x1 << 3, y1, frameX[destRect] << 3, frameY[destRect], frameW[destRect] << 3, frameH[destRect], 2, page);
+	else
+		_screen->copyRegion(x1 << 3, y1, frameX[destRect] << 3, frameY[destRect], frameW[destRect] << 3, frameH[destRect], 2, page, Screen::CR_NO_P_CHECK);
+
+	if (page == 6)
+		_screen->copyRegion(0, 0, 0, 0, 184, 121, 6, 0, Screen::CR_NO_P_CHECK);
+
+	_screen->updateScreen();
+}
+
+int EobCoreEngine::runDialogue(int dialogueTextId, int style, const char *button1, ...) {
+	if (dialogueTextId != -1)
+		txt()->printDialogueText(dialogueTextId, 0);
+
+	va_list args;
+	va_start(args, button1);
+	if (style)
+		setupDialogueButtons(2, 9, button1, args);
+	else
+		setupDialogueButtons(0, 2, button1, args);
+	va_end(args);
+
+	int res = 0;
+	while (res == 0 && !shouldQuit())
+		res = processDialogue();
+
+	gui_drawDialogueBox();
+
+	return res;
+}
+
+void EobCoreEngine::delay(uint32 millis, bool, bool) {
+	while (millis && !shouldQuit() && !skipFlag()) {
+		updateInput();
+		uint32 step = MIN<uint32>(millis, (_tickLength / 5));
+		_system->delayMillis(step);
+		millis -= step;
+	}
+}
+
+void EobCoreEngine::displayParchment(int id) {
+	_txt->setWaitButtonMode(1);
+	_txt->resetPageBreakString();
+	gui_updateControls();
+
+	if (id >= 0) {
+		// display text
+		Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
+		_screen->loadFileDataToPage(s, 5, 32000);
+		gui_drawBox(0, 0, 176, 175, _color1_1, _color2_1, _bkgColor_1);
+		_txt->setupField(12, 1);
+		if (_flags.gameID == GI_EOB2)
+			id++;
+		_txt->printDialogueText(id, _okStrings[0]);
+
+	} else {
+		// display bitmap
+		id = -id - 1;
+		static const uint8 x[] = { 0, 20, 0 };
+		static const uint8 y[] = { 0, 0, 96 };
+		drawSequenceBitmap("MAP", 0, x[id], y[id], 0);
+
+		removeInputTop();
+		while (!shouldQuit()) {
+			delay(_tickLength);
+			if (checkInput(0) & 0xff)
+				break;
+			removeInputTop();
+		}
+		removeInputTop();
+	}
+
+	restoreAfterDialogueSequence();
+}
+
+void EobCoreEngine::useSlotWeapon(int charIndex, int slotIndex, int item) {
+	EobCharacter *c = &_characters[charIndex];
+	int tp = item ? _items[item].type : 0;
+
+	if (c->effectFlags & 0x40)
+		removeCharacterEffect(10, charIndex, 1); // remove invisibility effect
+
+	int ep = _itemTypes[tp].extraProperties & 0x7f;
+	int8 inflict = 0;
+
+	if (ep == 1) {
+		inflict = closeDistanceAttack(charIndex, item);
+		if (!inflict)
+			inflict = -1;
+		snd_playSoundEffect(32);
+	} else if (ep == 2) {
+		inflict = thrownAttack(charIndex, slotIndex, item);
+	} else if (ep == 3) {
+		inflict = bowAttack(charIndex, item);
+		gui_drawCharPortraitWithStats(charIndex);
+	}
+
+	if (inflict > 0) {
+		if (_items[item].flags & 8) {
+			c->hitPointsCur += inflict;
+			gui_drawCharPortraitWithStats(charIndex);
+		}
+
+		if (_items[item].flags & 0x10)
+			c->inventory[slotIndex] = 0;
+
+		inflictMonsterDamage(&_monsters[_dstMonsterIndex], inflict, true);
+	}
+
+	c->disabledSlots ^= (1 << slotIndex);
+	c->slotStatus[slotIndex] = inflict;
+
+	gui_drawCharPortraitWithStats(charIndex);
+	setCharEventTimer(charIndex, 18, inflict >= -2 ? slotIndex + 2 : slotIndex, 1);
+}
+
+int EobCoreEngine::closeDistanceAttack(int charIndex, int item) {
+	if (charIndex > 1)
+		return -3;
+
+	uint16 d = calcNewBlockPosition(_currentBlock, _currentDirection);
+	int r = getClosestMonsterPos(charIndex, d);
+
+	if (r == -1) {
+		uint8 w = _specialWallTypes[_levelBlockProperties[d].walls[_sceneDrawVarDown]];
+		if (w == 0xff) {
+			if (_flags.gameID == GI_EOB1) {
+				_levelBlockProperties[d].walls[_sceneDrawVarDown]++;
+				_levelBlockProperties[d].walls[_sceneDrawVarDown ^ 2]++;
+
+			} else {
+				for (int i = 0; i < 4; i++) {
+					if (_specialWallTypes[_levelBlockProperties[d].walls[i]] == 0xff)
+						_levelBlockProperties[d].walls[i]++;
+				}
+			}
+			_sceneUpdateRequired = true;
+
+		} else if ((_flags.gameID == GI_EOB1) || (_flags.gameID == GI_EOB2 && w != 8 && w != 9)) {
+			return -1;
+		}
+
+		return (_flags.gameID == GI_EOB2 && ((_itemTypes[_items[item].type].allowedClasses & 4) || !item)) ? -5 : -2;
+
+	} else {
+		if (_monsters[r].flags & 0x20) {
+			killMonster(&_monsters[r], 1);
+			_txt->printMessage(_monsterDustStrings[0]);
+			return -2;
+		}
+
+		if (!characterAttackHitTest(charIndex, r, item, 1))
+			return -1;
+
+		uint16 flg = 0x100;
+
+		if ((_flags.gameID == GI_EOB1 && _items[item].type > 51 && _items[item].type < 57) || (_flags.gameID == GI_EOB2 && isMagicWeapon(item)))
+			flg |= 1;
+
+		_dstMonsterIndex = r;
+		return calcCloseDistanceMonsterDamage(&_monsters[r], charIndex, item, 1, flg, 5, 3);
+	}
+
+	return 0;
+}
+
+int EobCoreEngine::thrownAttack(int charIndex, int slotIndex, int item) {
+	int d = charIndex > 3 ? charIndex - 2 : charIndex;
+	if (!launchObject(charIndex, item, _currentBlock, _dropItemDirIndex[(_currentDirection << 2) + d], _currentDirection, _items[item].type))
+		return 0;
+
+	snd_playSoundEffect(11);
+	_characters[charIndex].inventory[slotIndex] = 0;
+	reloadWeaponSlot(charIndex, slotIndex, -1, 0);
+	_sceneUpdateRequired = true;
+	return 0;
+}
+
+int EobCoreEngine::bowAttack(int charIndex, int item) {
+	return 0;
+}
+
+void EobCoreEngine::inflictMonsterDamage(EobMonsterInPlay *m, int damage, bool giveExperience) {
+	m->hitPointsCur -= damage;
+	m->flags = (m->flags & 0xf7) | 1;
+
+	if (_monsterProps[m->type].flags & 0x2000) {
+		inflictMonsterDamage_s1(m);
+		checkSceneUpdateNeed(m->block);
+		m->hitPointsCur = 0;
+	} else {
+		if (checkSceneUpdateNeed(m->block)) {
+			m->flags |= 2;
+			if (_inflictMonsterDamageUnk)
+				return;
+			flashMonsterShape(m);
+		}
+	}
+
+	if (m->hitPointsCur <= 0)
+		killMonster(m, giveExperience);
+	else if (getBlockDistance(m->block, _currentBlock) < 4)
+		m->dest = _currentBlock;
+}
+
+void EobCoreEngine::calcAndInflictMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int b, int damageType) {
+	int dmg = calcCloseDistanceMonsterDamage(m, times, pips, offs, flags, b, damageType);
+	if (dmg > 0)
+		inflictMonsterDamage(m, dmg, flags & 0x800 ? true : false);
+}
+
+void EobCoreEngine::calcAndInflictCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flg, int a, int damageType) {
+	int dmg = calcCharacterDamage(charIndex, times, itemOrPips, useStrModifierOrBase, flg, a, damageType);
+	if (dmg)
+		inflictCharacterDamage(charIndex, dmg);
+}
+
+int EobCoreEngine::calcCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flg, int a, int damageType) {
+	int s = (flg & 0x100) ? calcDamageModifers(times, 0, itemOrPips, _items[itemOrPips].type, useStrModifierOrBase) : rollDice(times, itemOrPips, useStrModifierOrBase);
+	EobCharacter *c = &_characters[charIndex];
+
+	if (a != 5) {
+		if (checkUnkConstModifiers(c, _charClassModUnk[c->cClass], c->level[0], a, c->raceSex))
+			s = recalcDamageModifier(damageType, s);
+	}
+
+	if ((flg & 0x110) == 0x110) {
+		if (!calcDamageCheckItemType(_items[itemOrPips].type))
+			s = 1;
+	}
+
+	if (flg & 4) {
+		if (checkInventoryForRings(charIndex, 3))
+			s = 0;
+	}
+
+	if (flg & 0x400) {
+		if (c->effectFlags & 0x2000)
+			s = 0;
+		else
+			_txt->printMessage(_characterStatusStrings8[0], -1, c->name);
+	}
+
+	return s;
+}
+
+void EobCoreEngine::inflictCharacterDamage(int charIndex, int damage) {
+	EobCharacter *c = &_characters[charIndex];
+	if (!testCharacter(charIndex, 3))
+		return;
+
+	if (c->effectsRemainder[3])
+		c->effectsRemainder[3] = (damage < c->effectsRemainder[3]) ? (c->effectsRemainder[3] - damage) : 0;
+
+	c->hitPointsCur -= damage;
+	c->damageTaken = damage;
+
+	if (c->hitPointsCur > -10) {
+		snd_playSoundEffect(21);
+	} else {
+		c->hitPointsCur = -10;
+		c->flags &= 1;
+		c->food = 0;
+		removeAllCharacterEffects(charIndex);
+		snd_playSoundEffect(22);
+	}
+
+	if (c->effectsRemainder[0]) {
+		c->effectsRemainder[0] = (damage < c->effectsRemainder[0]) ? (c->effectsRemainder[0] - damage) : 0;
+		if (!c->effectsRemainder[0])
+			removeCharacterEffect(1, charIndex, 1);
+	}
+
+	if (_currentControlMode)
+		gui_drawFaceShape(charIndex);
+	else
+		gui_drawCharPortraitWithStats(charIndex);
+
+	if (c->hitPointsCur <= 0 && _updateFlags == 1 && charIndex == _openBookChar) {
+		Button b;
+		clickedSpellbookAbort(&b);
+	}
+
+	setCharEventTimer(charIndex, 18, 6, 1);
+}
+
+bool EobCoreEngine::characterAttackHitTest(int charIndex, int monsterIndex, int item, int attackType) {
+	if (charIndex < 0)
+		return true;
+
+	int p = item ? (_flags.gameID == GI_EOB1 ? _items[item].type : (_itemTypes[_items[item].type].extraProperties & 0x7f)) : 0;
+
+	if (_monsters[monsterIndex].flags & 0x20)
+		return true;// EOB 2 only ?
+
+	int t = _monsters[monsterIndex].type;
+	int d = (p < 1 || p > 3) ? 0 : _items[item].value;
+
+	if (_flags.gameID == GI_EOB2) {
+		if ((p > 0 && p < 4) || !item ){
+			if (((_monsterProps[t].statusFlags & 0x200) && (d <= 0)) || ((_monsterProps[t].statusFlags & 0x1000) && (d <= 1)))
+				return false;
+		}
+	}
+
+	d += (attackType ? getStrHitChanceModifier(charIndex) : getDexHitChanceModifier(charIndex));
+
+	int m = getMonsterAcHitChanceModifier(charIndex, _monsterProps[t].armorClass) - d;
+	int s = rollDice(1, 20);
+
+	_monsters[monsterIndex].flags |= 1;
+
+	if (_flags.gameID == GI_EOB1) {
+		if (_partyEffectFlags & 0x30)
+			s++;
+		if (_characters[charIndex].effectFlags & 0x40)
+			s++;
+	} else if ((_partyEffectFlags & 0x8400) || (_characters[charIndex].effectFlags & 0x1000)) {
+		s++;
+	}
+
+	s = CLIP(s, 1, 20);
+
+	return s < m ? false : true;
+}
+
+bool EobCoreEngine::monsterAttackHitTest(EobMonsterInPlay *m, int charIndex) {
+	int tp = m->type;
+	EobMonsterProperty *p = &_monsterProps[tp];
+
+	int r = rollDice(1, 20);
+	if (r != 20) {
+		if (_characters[charIndex].effectFlags & 0x800)
+			r -= 2;
+		if (_characters[charIndex].effectFlags & 0x10)
+			r -= 2;
+		if (_partyEffectFlags & 0x8000)
+			r--;
+	}
+
+	return ((r == 20) || (r >= (p->hitChance - _characters[charIndex].armorClass)));
+}
+
+bool EobCoreEngine::flyingObjectMonsterHit(EobFlyingObject *fo, int monsterIndex) {
+	if (fo->attackerId != -1) {
+		if (!characterAttackHitTest(fo->attackerId, monsterIndex, fo->item, 0))
+			return false;
+	}
+	calcAndInflictMonsterDamage(&_monsters[monsterIndex], fo->attackerId, fo->item, 0, (fo->attackerId == -1) ? 0x110: 0x910, 5, 3);
+	return true;
+}
+
+bool EobCoreEngine::flyingObjectPartyHit(EobFlyingObject *fo) {
+	int ps = _dscItemPosIndex[(_currentDirection << 2) + (_items[fo->item].pos & 3)];
+	bool res = false;
+
+	bool b = ((_currentDirection == fo->direction || _currentDirection == (fo->direction ^ 2)) && ps > 2);
+	int s = ps << 1;
+	if (ps > 2)
+		s += rollDice(1, 2, -1);
+
+	static const int8 charId[] = { 0, -1, 1, -1, 2, 4, 3, 5 };
+
+	for (int i = 0; i < 2; i++) {
+		int c = charId[s];
+		s ^= 1;
+		if (!testCharacter(c, 3))
+			continue;
+		calcAndInflictCharacterDamage(c, -1, fo->item, 0, 0x110, 5, 3);
+		res = true;
+		if (ps < 2 || b == 0)
+			break;
+	}
+
+	return res;
+}
+
+void EobCoreEngine::monsterCloseAttack(EobMonsterInPlay *m) {
+	int first = _monsterCloseAttDstTable1[(_currentDirection << 2) + m->dir] * 12;
+	int v = (m->pos == 4) ? rollDice(1, 2, -1) : _monsterCloseAttChkTable2[(m->dir << 2) + m->pos];
+	if (!v)
+		first += 6;
+
+	int last = first + 6;
+	for (int i = first; i < last; i++) {
+		int c = _monsterCloseAttDstTable2[i];
+		if (!testCharacter(c, 3))
+			continue;
+
+		// Character Invisibility
+		if ((_characters[c].effectFlags & 0x140) && (rollDice(1, 20) >= 5))
+			continue;
+
+		int dmg = 0;
+		for (int ii = 0; ii < _monsterProps[m->type].attacksPerRound; ii++) {
+			if (!monsterAttackHitTest(m, c))
+				continue;
+			dmg += rollDice(_monsterProps[m->type].dmgDc[ii].times, _monsterProps[m->type].dmgDc[ii].pips, _monsterProps[m->type].dmgDc[ii].base);
+		}
+
+		if (dmg > 0) {
+			if ((_monsterProps[m->type].flags & 0x80) && rollDice(1, 4, -1) != 3) {
+				int slot = rollDice(1, 27, -1);
+				for (int iii = 0; iii < 27; iii++) {
+					Item itm = _characters[c].inventory[slot];
+					if (!itm || !(_itemTypes[_items[itm].type].extraProperties & 0x80)) {
+						if (++slot == 27)
+							slot = 0;
+						continue;
+					}
+
+					_characters[c].inventory[slot] = 0;
+					_txt->printMessage(_itemExtraStrings[(_characters[c].raceSex & 1) ^ 1], -1, _characters[c].name);
+					printFullItemName(itm);
+					_txt->printMessage(_itemExtraStrings[2]);
+				}
+				gui_drawCharPortraitWithStats(c);
+			}
+
+			inflictCharacterDamage(c, dmg);
+
+			if (_monsterProps[m->type].flags & 0x10) {
+				statusAttack(c, 2, _monsterSpecAttStrings[_flags.gameID == GI_EOB1 ? 3 : 2], 0, 1, 8, 1);
+				_characters[c].effectFlags &= ~0x2000;
+			}
+
+			if (_monsterProps[m->type].flags & 0x20)
+				statusAttack(c, 4, _monsterSpecAttStrings[_flags.gameID == GI_EOB1 ? 4 : 3], 2, 5, 9, 1);
+
+			if (_monsterProps[m->type].flags & 0x8000)
+				statusAttack(c, 8, _monsterSpecAttStrings[4], 2, 0, 0, 1);
+
+		}
+
+		if (!(_monsterProps[m->type].flags & 0x4000))
+			return;
+	}
+}
+
+void EobCoreEngine::monsterSpellCast(EobMonsterInPlay *m, int type) {
+	launchMagicObject(-1, type, m->block, m->pos, m->dir);
+	snd_processEnvironmentalSoundEffect(_spells[_magicFlightObjectProperties[type << 2]].sound, m->block);
+}
+
+void EobCoreEngine::statusAttack(int charIndex, int attackStatusFlags, const char *attackStatusString, int a, uint32 effectDuration, int restoreEvent, int noRefresh) {
+	EobCharacter *c = &_characters[charIndex];
+	if ((c->flags & attackStatusFlags) && noRefresh)
+		return;
+	if (!testCharacter(charIndex, 3))
+		return;
+
+	if (a != 5 && specialAttackConstTest(charIndex, a))
+		return;
+
+	if (attackStatusFlags & 8) {
+		removeAllCharacterEffects(charIndex);
+		c->flags = (c->flags & 1) | 8;
+	} else {
+		c->flags |= attackStatusFlags;
+	}
+
+	if ((attackStatusFlags & 0x0c) && (_openBookChar == charIndex) && _updateFlags) {
+		Button b;
+		clickedSpellbookAbort(&b);
+	}
+
+	if (effectDuration)
+		setCharEventTimer(charIndex, effectDuration * 546, restoreEvent, 1);
+
+	gui_drawCharPortraitWithStats(charIndex);
+	_txt->printMessage(_characterStatusStrings13[0], -1, c->name, attackStatusString);
+}
+
+int EobCoreEngine::calcCloseDistanceMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int b, int damageType) {
+	int s = flags & 0x100 ? calcDamageModifers(times, m, pips, _items[pips].type, offs) : rollDice(times, pips, offs);
+	EobMonsterProperty *p = &_monsterProps[m->type];
+
+	if (b == 5) {
+		if (checkUnkConstModifiers(m, 0, p->level, b, 6))
+			s = recalcDamageModifier(damageType, s);
+	}
+
+	if ((flags & 0x110) == 0x110) {
+		if (!calcDamageCheckItemType(_items[pips].type))
+			s = 1;
+	}
+
+	if ((flags & 0x100) && ((_flags.gameID == GI_EOB2 && (p->statusFlags & 0x100)) || (_flags.gameID == GI_EOB1 && (p->flags & 4))) && (!(_itemTypes[_items[pips].type].allowedClasses & 4 /* bug in original code ??*/)))
+		s >>= 1;
+
+	if (p->statusFlags & 0x2000) {
+		if (flags & 0x100) {
+			if (_items[pips].value < 3)
+				s >>= 2;
+			if (_items[pips].value == 3)
+				s >>= 1;
+			if (s == 0)
+				s = _items[pips].value;
+
+		} else {
+			s >>= 1;
+		}
+	}
+
+	if (flags & 1) {
+		if (checkMonsterDamageEvasion(m))
+			s = 0;
+	}
+
+	if (_flags.gameID == GI_EOB1)
+		return s;
+
+	static const uint16 damageImmunityFlags[] = { 0x01, 0x10, 0x02, 0x20, 0x80, 0x400, 0x20, 0x800, 0x40, 0x80, 0x400, 0x40 };
+	for (int i = 0; i < 12; i += 2) {
+		if ((flags & damageImmunityFlags[i]) && (p->statusFlags & damageImmunityFlags[i + 1]))
+			s = 0;
+	}
+
+	return s;
+}
+
+int EobCoreEngine::calcDamageModifers(int charIndex, EobMonsterInPlay *m, int item, int itemType, int useStrModifier) {
+	int s = (useStrModifier && (charIndex != -1)) ? getStrDamageModifier(charIndex) : 0;
+	if (item) {
+		EobItemType *p = &_itemTypes[itemType];
+		int t = m ? m->type : 0;
+		s += ((m && (_monsterProps[t].flags & 1)) ?	rollDice(p->dmgNumDiceL, p->dmgNumPipsL, p->dmgIncS /* bug in original code ? */) :
+			rollDice(p->dmgNumDiceS, p->dmgNumPipsS, p->dmgIncS));
+		s += _items[item].value;
+	} else {
+		s += rollDice(1, 2);
+	}
+
+	return (s < 0) ? 0 : s;
+}
+
+bool EobCoreEngine::checkUnkConstModifiers(void *target, int hpModifier, int level, int b, int race) {
+	static const int8 constMod[] = { 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5 };
+
+	if (b == 5)
+		return false;
+
+	int s = getConstModifierTableValue(hpModifier, level, b);
+	if (((race == 3 || race == 5) && (b == 4 || b == 1 || b == 0)) || (race == 4 && (b == 4 || b == 1))) {
+		EobCharacter *c = (EobCharacter*)target;
+		s -= constMod[c->constitutionCur];
+	}
+
+	return rollDice(1, 20) < s ? false : true;
+}
+
+bool EobCoreEngine::specialAttackConstTest(int charIndex, int b) {
+	return checkUnkConstModifiers(&_characters[charIndex], _charClassModUnk[_characters[charIndex].cClass], _characters[charIndex].level[0], b, _characters[charIndex].raceSex >> 1);
+}
+
+int EobCoreEngine::getConstModifierTableValue(int hpModifier, int level, int b) {
+	const uint8 *tbl = _constModTables[hpModifier];
+	if (_constModLevelIndex[hpModifier] < level)
+		level = _constModLevelIndex[hpModifier];
+	level /= _constModDiv[hpModifier];
+	level += (_constModExt[hpModifier] * b);
+
+	return tbl[level];
+}
+
+bool EobCoreEngine::calcDamageCheckItemType(int itemType) {
+	itemType = _itemTypes[itemType].extraProperties & 0x7f;
+	return (itemType == 2 || itemType == 3) ? true : false;
+}
+
+int EobCoreEngine::recalcDamageModifier(int damageType, int dmgModifier) {
+	if (damageType == 3)
+		return 0;
+
+	if (damageType == 0 || damageType == 1)
+		return dmgModifier >> 1;
+
+	return dmgModifier;
+}
+
+bool EobCoreEngine::checkMonsterDamageEvasion(EobMonsterInPlay *m) {
+	return rollDice(1, 100) < _monsterProps[m->type].dmgModifierEvade ? true : false;
+}
+
+int EobCoreEngine::getStrHitChanceModifier(int charIndex) {
+	static const int8 strExtLimit[] = { 1, 51, 76, 91, 100 };
+	static const int8 strExtMod[] = { 1, 2, 2, 2, 3 };
+	static const int8 strMod[] = { -4, -3, -3, -2, -2, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 3, 3, 4, 4, 5, 6, 7 };
+
+	int r = strMod[_characters[charIndex].strengthCur - 1];
+	if (_characters[charIndex].strengthExtCur) {
+		for (int i = 0; i < 5; i++) {
+			if (_characters[charIndex].strengthExtCur >= strExtLimit[i])
+				r = strExtMod[i];
+		}
+	}
+
+	return r;
+}
+
+int EobCoreEngine::getStrDamageModifier(int charIndex) {
+	static const int8 strExtLimit[] = { 1, 51, 76, 91, 100 };
+	static const int8 strExtMod[] = { 3, 3, 4, 5, 6 };
+	static const int8 strMod[] = { -3, -2, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 7, 8, 9, 10, 11, 12, 14 };
+
+	int r = strMod[_characters[charIndex].strengthCur - 1];
+	if (_characters[charIndex].strengthExtCur) {
+		for (int i = 0; i < 5; i++) {
+			if (_characters[charIndex].strengthExtCur >= strExtLimit[i])
+				r = strExtMod[i];
+		}
+	}
+
+	return r;
+}
+
+int EobCoreEngine::getDexHitChanceModifier(int charIndex) {
+	static const int8 dexMod[] = { -5, -4, -3, -2, -1, 0, 0, 0, 0, 0, 0, 1, 2, 2, 3, 3, 4, 4, 4 };
+	return dexMod[_characters[charIndex].dexterityCur - 1];
+}
+
+int EobCoreEngine::getMonsterAcHitChanceModifier(int charIndex, int monsterAc) {
+	static const uint8 mod1[] = { 1, 3, 3, 2 };
+	static const uint8 mod2[] = { 1, 1, 2, 1 };
+
+	int l = _characters[charIndex].level[0] - 1;
+	int cm = _charClassModUnk[_characters[charIndex].cClass];
+
+	return (20 - ((l / mod1[cm]) * mod2[cm])) - monsterAc;
+}
+
+void EobCoreEngine::inflictMonsterDamage_s1(EobMonsterInPlay *m) {
+
+}
+
+void EobCoreEngine::snd_playSoundEffect(int id, int volume) {
+	if (id < 1 || id > 119 || shouldQuit())
+		return;
+
+	_sound->playSoundEffect(id, volume);
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
new file mode 100644
index 0000000000..201c1dfa11
--- /dev/null
+++ b/engines/kyra/eobcommon.h
@@ -0,0 +1,977 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 KYRA_EOBCOMMON_H
+#define KYRA_EOBCOMMON_H
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+#include "kyra/loleobbase.h"
+#endif // (ENABLE_EOB || ENABLE_LOL)
+
+#ifdef ENABLE_EOB
+
+namespace Kyra {
+
+struct EobShapeDef {
+	int16 index;
+	uint8 x, y, w, h;
+};
+
+struct CreatePartyModButton {
+	uint8 encodeLabelX;
+	uint8 encodeLabelY;
+	uint8 labelW;
+	uint8 labelH;
+	uint8 labelX;
+	uint8 labelY;
+	uint8 bodyIndex;
+	uint8 destX;
+	uint8 destY;
+};
+
+struct EobRect8 {
+	uint8 x;
+	uint8 y;
+	uint8 w;
+	uint8 h;
+};
+
+struct EobRect16 {
+	int16 x1;
+	int16 y1;
+	uint16 x2;
+	uint16 y2;
+};
+
+struct EobChargenButtonDef {
+	uint8 x;
+	uint8 y;
+	uint8 w;
+	uint8 h;
+	uint8 keyCode;
+};
+
+struct EobGuiButtonDef {
+	uint8 keyCode;
+	uint8 keyCode2;
+	uint16 flags;
+	uint16 x;
+	uint8 y;
+	uint16 w;
+	uint8 h;
+	Button::Callback buttonCallback;
+	uint16 arg;
+};
+
+struct EobCharacter {
+	uint8 id;
+	uint8 flags;
+	char name[11];
+	int8 strengthCur;
+	int8 strengthMax;
+	int8 strengthExtCur;
+	int8 strengthExtMax;
+	int8 intelligenceCur;
+	int8 intelligenceMax;
+	int8 wisdomCur;
+	int8 wisdomMax;
+	int8 dexterityCur;
+	int8 dexterityMax;
+	int8 constitutionCur;
+	int8 constitutionMax;
+	int8 charismaCur;
+	int8 charismaMax;
+	int16 hitPointsCur;
+	int16 hitPointsMax;
+	int8 armorClass;
+	uint8 disabledSlots;
+	uint8 raceSex;
+	uint8 cClass;
+	uint8 alignment;
+	int8 portrait;
+	uint8 food;
+	uint8 level[3];
+	uint32 experience[3];
+	uint8 *faceShape;
+
+	int8 mageSpells[80];
+	int8 clericSpells[80];
+	uint32 mageSpellsAvailabilityFlags;
+
+	Item inventory[27];
+	uint32 timers[10];
+	int8 events[10];
+	uint8 effectsRemainder[4];
+	uint32 effectFlags;
+	uint8 damageTaken;
+	int8 slotStatus[5];
+};
+
+struct EobItem {
+	uint8 nameUnid;
+	uint8 nameId;
+	uint8 flags;
+	int8 icon;
+	int8 type;
+	int8 pos;
+	int16 block;
+	Item next;
+	Item prev;
+	uint8 level;
+	int8 value;
+};
+
+struct EobItemType {
+	uint16 invFlags;
+	uint16 handFlags;
+	int8 armorClass;
+	int8 allowedClasses;
+	int8 requiredHands;
+	int8 dmgNumDiceS;
+	int8 dmgNumPipsS;
+	int8 dmgIncS;
+	int8 dmgNumDiceL;
+	int8 dmgNumPipsL;
+	int8 dmgIncL;
+	uint8 unk1;
+	uint16 extraProperties;
+};
+
+struct SpriteDecoration {
+	uint8 *shp;
+	uint8 x;
+	uint8 y;
+};
+
+struct EobMonsterProperty {
+	int8 armorClass;
+	int8 hitChance;
+	uint8 level;
+	uint8 hpDcTimes;
+	uint8 hpDcPips;
+	uint8 hpDcBase;
+	uint8 attacksPerRound;
+	struct DmgDc {
+		uint8 times;
+		uint8 pips;
+		int8 base;
+	} dmgDc[3];
+	uint16 statusFlags;
+	uint16 flags;
+	int32 u22;
+	int32 experience;
+
+	uint8 u30;
+	uint8 sound1;
+	uint8 sound2;
+	uint8 numRemoteAttacks;
+	uint8 remoteWeaponChangeMode;
+	uint8 numRemoteWeapons;
+
+	int8 remoteWeapons[5];
+
+	uint8 u41;
+	uint8 dmgModifierEvade;
+
+	uint8 decorations[3];
+};
+
+struct EobMonsterInPlay {
+	uint8 type;
+	uint8 unit;
+	uint16 block;
+	uint8 pos;
+	int8 dir;
+	uint8 animStep;
+	uint8 shpIndex;
+	int8 mode;
+	int8 f_9;
+	int8 curAttackFrame;
+	uint8 f_b;
+	int16 hitPointsMax;
+	int16 hitPointsCur;
+	uint16 dest;
+	uint16 randItem;
+	uint16 fixedItem;
+	uint8 flags;
+	uint8 idleAnimState;
+	uint8 curRemoteWeapon;
+	uint8 numRemoteAttacks;
+	int8 palette;
+	uint8 directionChanged;
+	uint8 stepsTillRemoteAttack;
+	uint8 sub;
+};
+
+struct ScriptTimer {
+	uint16 func;
+	uint16 ticks;
+	uint32 next;
+};
+
+struct EobFlyingObject {
+	uint8 enable;
+	uint8 objectType;
+	int16 attackerId;
+	Item item;
+	uint16 curBlock;
+	uint16 u2;
+	uint8 u1;
+	uint8 direction;
+	uint8 distance;
+	int8 callBackIndex;
+	uint8 curPos;
+	uint8 flags;
+	uint8 unused;
+};
+
+class EobInfProcessor;
+
+class EobCoreEngine : public LolEobBaseEngine {
+friend class TextDisplayer_Eob;
+friend class GUI_Eob;
+friend class EobInfProcessor;
+friend class DarkmoonSequenceHelper;
+friend class CharacterGenerator;
+public:
+	EobCoreEngine(OSystem *system, const GameFlags &flags);
+	virtual ~EobCoreEngine();
+
+	Screen *screen() { return _screen; }
+	GUI *gui() const { return _gui; }
+
+protected:
+	// Startup
+	virtual Common::Error init();
+	Common::Error go();
+
+	// Main Menu, Intro, Finale
+	virtual int mainMenu() = 0;
+	virtual void seq_playFinale() = 0;
+	bool _playFinale;
+
+	//Init
+	void loadItemsAndDecorationsShapes();
+	void releaseItemsAndDecorationsShapes();
+
+	void initButtonData();
+	void initStaticResource();
+	virtual void initSpells();
+
+	const uint8 **_largeItemShapes;
+	const uint8 **_smallItemShapes;
+	const uint8 **_thrownItemShapes;
+	const int _numLargeItemShapes;
+	const int _numSmallItemShapes;
+	const int _numThrownItemShapes;
+	const int _numItemIconShapes;
+
+	const uint8 **_spellShapes;
+	const uint8 **_firebeamShapes;
+	const uint8 *_redSplatShape;
+	const uint8 *_greenSplatShape;
+	const uint8 **_wallOfForceShapes;
+	const uint8 **_teleporterShapes;
+	const uint8 **_sparkShapes;
+	const uint8 *_deadCharShape;
+	const uint8 *_disabledCharGrid;
+	const uint8 *_blackBoxSmallGrid;
+	const uint8 *_weaponSlotGrid;
+	const uint8 *_blackBoxWideGrid;
+	const uint8 *_lightningColumnShape;
+
+	uint8 *_tempIconShape;
+	uint8 *_itemsOverlay;
+
+	static const uint8 _teleporterShapeDefs[];
+	static const uint8 _wallOfForceShapeDefs[];
+
+	const char *const *_mainMenuStrings;
+
+	// Main loop
+	virtual void startupNew() = 0;
+	virtual void startupLoad() = 0;
+	void runLoop();
+	void update() { screen()->updateScreen(); }
+	bool updateCharacterEvents(bool a);
+
+	bool _runFlag;
+	//int _runLoopUnk2;
+
+	// Create Party
+	void startCharacterGeneration();
+
+	uint8 **_faceShapes;
+
+	static const int8 _classHpIncreaseType[];
+	static const uint8 _hpIncrPerLevel[];
+	static const uint8 _numLevelsPerClass[];
+	static const int16 _hpConstModifiers[];
+	static const uint8 _charClassModUnk[];
+
+	const uint8 *_classModifierFlags;
+
+	// timers
+	void setupTimers();
+	void setCharEventTimer(int charIndex, uint32 countdown, int evnt, int updateExistingTimer);
+	void deleteCharEventTimer(int charIndex, int evnt);
+	void setupCharacterTimers();
+
+	void timerProcessMonsters(int timerNum);
+	void timerSpecialCharacterUpdate(int timerNum);
+	void timerProcessFlyingObjects(int timerNum);
+	void timerProcessCharacterExchange(int timerNum);
+	void timerUpdateTeleporters(int timerNum);
+	void timerUpdateFoodStatus(int timerNum);
+	void timerUpdateMonsterIdleAnim(int timerNum);
+
+	uint8 getClock2Timer(int index) { return index < _numClock2Timers ? _clock2Timers[index] : 0; }
+	uint8 getNumClock2Timers()  { return _numClock2Timers; }
+
+	static const uint8 _clock2Timers[];
+	static const uint8 _numClock2Timers;
+
+	// Mouse
+	void setHandItem(Item itemIndex);
+	void updateHandItemCursor() { _updateHandItemCursor = true; }
+	bool _updateHandItemCursor;
+
+	// Characters
+	int getDexterityArmorClassModifier(int dexterity);
+	int generateCharacterHitpointsByLevel(int charIndex, int levelIndex);
+	int getClassAndConstHitpointsModifier(int cclass, int constitution);
+	int getClassHpIncreaseType(int cclass, int levelIndex);
+	int getModifiedHpLimits(int hpModifier, int constModifier, int level, bool mode);
+	const char *getCharStrength(int str, int strExt);
+	int testCharacter(int index, int flags);
+	int getNextValidCharIndex(int curCharIndex, int searchStep);
+
+	void recalcArmorClass(int index);
+	int validateWeaponSlotItem(int index, int slot);
+	int getCharacterClericPaladinLevel(int index);
+	int getCharacterMageLevel(int index);
+	int getLevelIndexForHpIncType(int unk, int cClass);
+
+	int countCharactersWithSpecificItems(int16 itemType, int16 itemValue);
+	int checkCharacterInventoryForItem(int character, int16 itemType, int16 itemValue);
+	void modifyCharacterHitpoints(int character, int16 points);
+	void neutralizePoison(int character);
+
+	virtual void npcSequence(int npcIndex) = 0;
+	void initNpc(int npcIndex);
+	int npcJoinDialogue(int npcIndex, int queryJoinTextId, int confirmJoinTextId, int noJoinTextId);
+	int prepareForNewPartyMember(int16 itemType, int16 itemValue);
+	void removeCharacterFromParty(int charIndex);
+
+	void increasePartyExperience(int16 points);
+	void increaseCharacterExperience(int charIndex, int32 points);
+	uint32 getRequiredExperience(int cClass, int levelIndex, int level);
+	void increaseCharacterLevel(int charIndex, int levelIndex);
+
+	void setWeaponSlotStatus(int charIndex, int mode, int slot);
+
+	EobCharacter *_characters;
+	char _strenghtStr[6];
+	int _castScrollSlot;
+	int _exchangeCharacterId;
+
+	const char *const *_levelGainStrings;
+	const uint32 *_expRequirementTables[6];
+
+	const uint8 *_constModTables[6];
+	const uint8 *_constModLevelIndex;
+	const uint8 *_constModDiv;
+	const uint8 *_constModExt;
+
+	const EobCharacter *_npcPreset;
+	bool _partyResting;
+
+	// Items
+	void loadItemDefs();
+	Item duplicateItem(Item itemIndex);
+	void setItemPosition(Item *itemQueue, int block, Item item, int pos);
+	void createInventoryItem(EobCharacter *c, Item itemIndex, int itemValue, int preferedInventorySlot);
+	int deleteInventoryItem(int charIndex, int slot);
+	void deleteBlockItem(uint16 block, int type);
+	int validateInventorySlotForItem(Item item, int charIndex, int slot);
+	void deletePartyItem(Item itemType, int16 itemValue);
+	virtual void updateUsedCharacterHandItem(int charIndex, int slot) = 0;
+	int itemUsableByCharacter(int charIndex, Item item);
+	int countQueuedItems(Item itemQueue, int16 id, int16 type, int count, int includeFlyingItems);
+	int getQueuedItem(Item *items, int pos, int id);
+	void printFullItemName(Item item);
+	void identifyQueuedItems(Item itemQueue);
+	void drawItemIconShape(int pageNum, Item itemId, int x, int y);
+	bool isMagicWeapon(Item itemIndex);
+	bool checkInventoryForRings(int charIndex, int itemValue);
+	void eatItemInHand(int charIndex);
+
+	bool launchObject(int charIndex, Item item, uint16 startBlock, int startPos, int dir, int type);
+	void launchMagicObject(int charIndex, int type, uint16 startBlock, int startPos, int dir);
+	bool updateObjectFlight(EobFlyingObject *fo, int block, int pos);
+	bool updateFlyingObjectHitTest(EobFlyingObject *fo, int block, int pos);
+	void updateFlyingObject_s3(EobFlyingObject *fo);
+	void endObjectFlight(EobFlyingObject *fo);
+	void checkFlyingObjects();
+
+	void reloadWeaponSlot(int charIndex, int slotIndex, int itemType, int arrowOrDagger);
+
+	EobItem *_items;
+	uint16 _numItems;
+	EobItemType *_itemTypes;
+	char **_itemNames;
+	uint16 _numItemNames;
+	uint32 _partyEffectFlags;
+	Item _lastUsedItem;
+
+	const uint16 *_slotValidationFlags;
+
+	EobFlyingObject *_flyingObjects;
+	const uint8 *_drawObjPosIndex;
+	const uint8 *_flightObjFlipIndex;
+	const int8 *_flightObjShpMap;
+	const int8 *_flightObjSclIndex;
+
+	// Monsters
+	void loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex);
+	void releaseMonsterShapes(int first, int num);
+	virtual void generateMonsterPalettes(const char *file, int16 monsterIndex) {}
+	virtual void loadMonsterDecoration(const char *file, int16 monsterIndex) {}
+	const uint8 *loadMonsterProperties(const uint8 *data);
+	const uint8 *loadActiveMonsterData(const uint8 *data, int level);
+	void initMonster(int index, int unit, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int i, int randItem, int fixedItem);
+	void placeMonster(EobMonsterInPlay *m, uint16 block, int dir);
+	virtual void replaceMonster(int b, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem) = 0;
+	void killMonster(EobMonsterInPlay *m, bool giveExperience);
+	int countSpecificMonsters(int type);
+	void updateAttackingMonsterFlags();
+
+	const int8 *getMonsterBlockPositions(uint16 block);
+	int getClosestMonsterPos(int charIndex, int block);
+
+	bool blockHasMonsters(uint16 block);
+	bool isMonsterOnPos(EobMonsterInPlay *m, uint16 block, int pos, int checkPos4);
+	const int16 *findBlockMonsters(uint16 block, int pos, int dir, int blockDamage, int singleTargetCheckAdjacent);
+
+	void drawBlockObject(int flipped, int page, const uint8 *shape, int x, int y, int sd, uint8 *ovl = 0);
+	void drawMonsterShape(const uint8 *shape, int x, int y, int flipped, int flags, int palIndex);
+	void flashMonsterShape(EobMonsterInPlay *m);
+	void updateAllMonsterShapes();
+	void drawBlockItems(int index);
+	void drawDoor(int index);
+	virtual void drawDoorIntern(int type, int index, int x, int y, int w, int wall, int mDim, int16 y1, int16 y2) = 0;
+	void drawMonsters(int index);
+	void drawWallOfForce(int index);
+	void drawFlyingObjects(int index);
+	void drawTeleporter(int index);
+
+	void updateMonsters(int unit);
+	void updateMonsterDest(EobMonsterInPlay *m);
+	void updateMonsterDest2(EobMonsterInPlay *m);
+	void turnFriendlyMonstersHostile();
+	int getNextMonsterDirection(int curBlock, int destBlock);
+	int getNextMonsterPos(EobMonsterInPlay *m, int block);
+	int findFreeMonsterPos(int block, int size);
+	void updateMoveMonster(EobMonsterInPlay *m);
+	bool updateMonsterTryDistanceAttack(EobMonsterInPlay *m);
+	bool updateMonsterTryCloseAttack(EobMonsterInPlay *m, int block);
+	void walkMonster(EobMonsterInPlay *m, int destBlock);
+	bool walkMonsterNextStep(EobMonsterInPlay *m, int destBlock, int direction);
+	void updateMonsterFollowPath(EobMonsterInPlay *m, int turnSteps);
+	void updateMonstersStraying(EobMonsterInPlay *m, int a);
+	void updateMonsters_mode710(EobMonsterInPlay *m);
+	void setBlockMonsterDirection(int block, int dir);
+
+	uint8 *_monsterOvl1;
+	uint8 *_monsterOvl2;
+
+	SpriteDecoration *_monsterDecorations;
+	EobMonsterProperty *_monsterProps;
+
+	EobMonsterInPlay *_monsters;
+
+	const int8 *_monsterStepTable0;
+	const int8 *_monsterStepTable1;
+	const int8 *_monsterStepTable2;
+	const int8 *_monsterStepTable3;
+	const uint8 *_monsterCloseAttPosTable1;
+	const uint8 *_monsterCloseAttPosTable2;
+	const int8 *_monsterCloseAttUnkTable;
+	const uint8 *_monsterCloseAttChkTable1;
+	const uint8 *_monsterCloseAttChkTable2;
+	const uint8 *_monsterCloseAttDstTable1;
+	const uint8 *_monsterCloseAttDstTable2;
+
+	const uint8 *_monsterProximityTable;
+	const uint8 *_findBlockMonstersTable;
+	const char *const *_monsterDustStrings;
+
+	const uint8 *_monsterDistAttType10;
+	const uint8 *_monsterDistAttSfx10;
+	const uint8 *_monsterDistAttType17;
+	const uint8 *_monsterDistAttSfx17;
+	const char *const *_monsterSpecAttStrings;
+
+	const int8 *_monsterFrmOffsTable1;
+	const int8 *_monsterFrmOffsTable2;
+
+	const uint16 *_encodeMonsterShpTable;
+	const uint8 _teleporterWallId;
+
+	const int8 *_monsterDirChangeTable;
+
+	// Level
+	void loadLevel(int level, int func);
+	const char *initLevelData(int func);
+	void addLevelItems();
+	void loadVcnData(const char *file, const char */*nextFile*/);
+	void loadBlockProperties(const char *mazFile);
+	void loadDecorations(const char *cpsFile, const char *decFile);
+	void assignWallsAndDecorations(int wallIndex, int vmpIndex, int decDataIndex, int specialType, int flags);
+	void releaseDecorations();
+	void releaseDoorShapes();
+	void toggleWallState(int wall, int flags);
+	virtual void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) {}
+	virtual const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8*shapeDefs) { return (const uint8*)filename; }
+
+	void drawScene(int update);
+	void drawSceneShapes();
+	void drawDecorations(int index);
+
+	int calcNewBlockPositionAndTestPassability(uint16 curBlock, uint16 direction);
+	void notifyBlockNotPassable();
+	void moveParty(uint16 block);
+
+	int clickedDoorSwitch(uint16 block, uint16 direction);
+	int clickedDoorPry(uint16 block, uint16 direction);
+	int clickedDoorNoPry(uint16 block, uint16 direction);
+	int clickedNiche(uint16 block, uint16 direction);
+
+	int specialWallAction(int block, int direction);
+
+	void openDoor(int block);
+	void closeDoor(int block);
+
+	int16 _doorType[2];
+	int16 _noDoorSwitch[2];
+
+	EobRect8 *_levelDecorationRects;
+	SpriteDecoration *_doorSwitches;
+
+	int8 _currentSub;
+	char _curGfxFile[13];
+
+	uint32 _drawSceneTimer;
+	uint32 _flashShapeTimer;
+	uint32 _envAudioTimer;
+	uint16 _teleporterPulse;
+
+	const int16 *_dscShapeCoords;
+
+	const uint8 *_dscItemPosIndex;
+	const int16 *_dscItemShpX;
+	const uint8 *_dscItemScaleIndex;
+	const uint8 *_dscItemTileIndex;
+	const uint8 *_dscItemShapeMap;
+
+	const uint8 *_dscDoorScaleOffs;
+	const uint8 *_dscDoorScaleMult1;
+	const uint8 *_dscDoorScaleMult2;
+	const uint8 *_dscDoorScaleMult3;
+	const uint8 *_dscDoorY1;
+
+	const uint8 *_wllFlagPreset;
+	int _wllFlagPresetSize;
+	const uint8 *_teleporterShapeCoords;
+
+	// Script
+	void runLevelScript(int block, int flags);
+	void setScriptFlag(int flag);
+	bool checkScriptFlag(int flag);
+
+	const uint8 *initScriptTimers(const uint8 *pos);
+	void updateScriptTimers();
+
+	EobInfProcessor *_inf;
+	int _stepCounter;
+	int _stepsUntilScriptCall;
+	ScriptTimer _scriptTimers[5];
+	int _scriptTimersCount;
+	uint8 _scriptTimersMode;
+
+	// Gui
+	void gui_drawPlayField(int pageNum);
+	void gui_restorePlayField();
+	void gui_drawAllCharPortraitsWithStats();
+	void gui_drawCharPortraitWithStats(int index);
+	void gui_drawFaceShape(int index);
+	void gui_drawWeaponSlot(int charIndex, int slot);
+	void gui_drawWeaponSlotStatus(int x, int y, int status);
+	void gui_drawHitpoints(int index);
+	void gui_drawFoodStatusGraph(int index);
+	void gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32 curVal, int32 maxVal, int col1, int col2);
+	void gui_drawCharPortraitStatusFrame(int index);
+	void gui_drawInventoryItem(int slot, int special, int pageNum);
+	void gui_drawCompass(bool force);
+	void gui_drawDialogueBox();
+	void gui_drawSpellbook();
+	void gui_drawSpellbookScrollArrow(int x, int y, int direction);
+	void gui_updateSlotAfterScrollUse();
+	void gui_updateControls();
+	void gui_toggleButtons();
+	void gui_setPlayFieldButtons();
+	void gui_setInventoryButtons();
+	void gui_setStatsListButtons();
+	void gui_setSwapCharacterButtons();
+	void gui_setCastOnWhomButtons();
+	void gui_initButton(int index, int x = -1, int y = -1, int val = -1);
+	Button *gui_getButton(Button *buttonList, int index);
+
+	int clickedInventoryNextPage(Button *button);
+	int clickedPortraitRestore(Button *button);
+	int clickedCharPortraitDefault(Button *button);
+	int clickedCamp(Button *button);
+	int clickedSceneDropPickupItem(Button *button);
+	int clickedCharPortrait2(Button *button);
+	int clickedWeaponSlot(Button *button);
+	int clickedCharNameLabelRight(Button *button);
+	int clickedInventorySlot(Button *button);
+	int clickedEatItem(Button *button);
+	int clickedInventoryPrevChar(Button *button);
+	int clickedInventoryNextChar(Button *button);
+	int clickedSpellbookTab(Button *button);
+	int clickedSpellbookList(Button *button);
+	int clickedCastSpellOnCharacter(Button *button);
+	int clickedUpArrow(Button *button);
+	int clickedDownArrow(Button *button);
+	int clickedLeftArrow(Button *button);
+	int clickedRightArrow(Button *button);
+	int clickedTurnLeftArrow(Button *button);
+	int clickedTurnRightArrow(Button *button);
+	int clickedAbortCharSwitch(Button *button);
+	int clickedSceneThrowItem(Button *button);
+	int clickedSceneSpecial(Button *button);
+	int clickedSpellbookAbort(Button *button);
+	int clickedSpellbookScroll(Button *button);
+	int clickedUnk(Button *button);
+
+	void gui_processCharPortraitClick(int index);
+	void gui_processWeaponSlotClickLeft(int charIndex, int slotIndex);
+	void gui_processWeaponSlotClickRight(int charIndex, int slotIndex);
+	void gui_processInventorySlotClick(int slot);
+
+	static const int16 _buttonList1[];
+	int _buttonList1Size;
+	static const int16 _buttonList2[];
+	int _buttonList2Size;
+	static const int16 _buttonList3[];
+	int _buttonList3Size;
+	static const int16 _buttonList4[];
+	int _buttonList4Size;
+	static const int16 _buttonList5[];
+	int _buttonList5Size;
+	static const int16 _buttonList6[];
+	int _buttonList6Size;
+	static const int16 _buttonList7[];
+	int _buttonList7Size;
+	static const int16 _buttonList8[];
+	int _buttonList8Size;
+
+	const EobGuiButtonDef *_buttonDefs;
+	const char *const *_characterGuiStringsHp;
+	const char *const *_characterGuiStringsWp;
+	const char *const *_characterGuiStringsWr;
+	const char *const *_characterGuiStringsSt;
+	const char *const *_characterGuiStringsIn;
+
+	const char *const *_characterStatusStrings7;
+	const char *const *_characterStatusStrings8;
+	const char *const *_characterStatusStrings9;
+	const char *const *_characterStatusStrings12;
+	const char *const *_characterStatusStrings13;
+
+	const uint16 *_inventorySlotsX;
+	const uint8 *_inventorySlotsY;
+	const uint8 **_compassShapes;
+	uint8 _charExchangeSwap;
+	bool _hpBarGraphs;
+
+	// text
+	void setupDialogueButtons(int presetfirst, int numStr, const char *str1, ...);
+	void initDialogueSequence();
+	void restoreAfterDialogueSequence();
+	void drawSequenceBitmap(const char *file, int destRect, int x1, int y1, int flags);
+	int runDialogue(int dialogueTextId, int style, const char *button1, ...);
+
+	char _dialogueLastBitmap[13];
+	int _dlgUnk1;
+	int _moveCounter;
+
+	uint8 _color4;
+	uint8 _color5;
+	uint8 _color6;
+	uint8 _color7;
+	uint8 _color8;
+	uint8 _color9;
+	uint8 _color10;
+	uint8 _color11;
+	uint8 _color12;
+	uint8 _color13;
+	uint8 _color14;
+
+	const char *const *_chargenStatStrings;
+	const char *const *_chargenRaceSexStrings;
+	const char *const *_chargenClassStrings;
+	const char *const *_chargenAlignmentStrings;
+
+	const char *const *_pryDoorStrings;
+	const char *const *_warningStrings;
+	const char *const *_itemExtraStrings;
+	const char *const *_itemSuffixStrings;
+	const char *const *_takenStrings;
+	const char *const *_potionEffectStrings;
+
+	const char *const *_yesNoStrings;
+	const char *const *_npcMaxStrings;
+	const char *const *_okStrings;
+	const char *const *_npcJoinStrings;
+	const char *const *_cancelStrings;
+	const char *const *_abortStrings;
+
+	// misc
+	void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false);
+	void displayParchment(int id);
+
+	virtual void drawLightningColumn() {}
+	virtual int resurrectionSelectDialogue() { return -1; }
+	virtual int charSelectDialogue() { return -1; }
+	virtual void characterLevelGain(int charIndex) {}
+
+	Common::Error loadGameState(int slot);
+	Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail);
+
+	void *generateMonsterTempData(LevelTempData *tmp);
+	void *generateFlyingObjectTempData(LevelTempData *tmp);
+	void restoreMonsterTempData(LevelTempData *tmp);
+	void restoreFlyingObjectTempData(LevelTempData *tmp);
+	void releaseMonsterTempData(LevelTempData *tmp);
+	void releaseFlyingObjectTempData(LevelTempData *tmp);
+
+	int _saveLoadMode;
+
+	Screen_Eob *_screen;
+	GUI_Eob *_gui;
+
+	// fight
+	void useSlotWeapon(int charIndex, int slotIndex, int item);
+	int closeDistanceAttack(int charIndex, int item);
+	int thrownAttack(int charIndex, int slotIndex, int item);
+	int bowAttack(int charIndex, int item);
+
+	void inflictMonsterDamage(EobMonsterInPlay *m, int damage, bool giveExperience);
+	void calcAndInflictMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int b, int damageType);
+	void calcAndInflictCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flg, int a, int damageType);
+	int calcCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flg, int a, int damageType) ;
+	void inflictCharacterDamage(int charIndex, int damage);
+
+	bool characterAttackHitTest(int charIndex, int monsterIndex, int item, int attackType);
+	bool monsterAttackHitTest(EobMonsterInPlay *m, int charIndex);
+	bool flyingObjectMonsterHit(EobFlyingObject *fo, int monsterIndex);
+	bool flyingObjectPartyHit(EobFlyingObject *fo);
+
+	void monsterCloseAttack(EobMonsterInPlay *m);
+	void monsterSpellCast(EobMonsterInPlay *m, int type);
+	void statusAttack(int charIndex, int attackStatusFlags, const char *attackStatusString, int a, uint32 effectDuration, int restoreEvent, int noRefresh);
+
+	int calcCloseDistanceMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int b, int damageType);
+	int calcDamageModifers(int charIndex, EobMonsterInPlay *m, int item, int itemType, int useStrModifier);
+	bool checkUnkConstModifiers(void *target, int hpModifier, int level, int b, int race);
+	bool specialAttackConstTest(int charIndex, int b);
+	int getConstModifierTableValue(int hpModifier, int level, int b);
+	bool calcDamageCheckItemType(int itemType);
+	int recalcDamageModifier(int damageType, int dmgModifier);
+	bool checkMonsterDamageEvasion(EobMonsterInPlay *m);
+	int getStrHitChanceModifier(int charIndex);
+	int getStrDamageModifier(int charIndex);
+	int getDexHitChanceModifier(int charIndex);
+	int getMonsterAcHitChanceModifier(int charIndex, int monsterAc);
+	void inflictMonsterDamage_s1(EobMonsterInPlay *m);
+
+	int _dstMonsterIndex;
+	int _inflictMonsterDamageUnk;
+	int16 _foundMonstersArray[5];
+
+	// magic
+	void useMagicBookOrSymbol(int charIndex, int type);
+	void useMagicScroll(int charIndex, int type, int weaponSlot);
+	void usePotion(int charIndex, int weaponSlot);
+
+	void castSpell(int spell, int weaponSlot);
+	void removeCharacterEffect(int spell, int charIndex, int showWarning);
+	void removeAllCharacterEffects(int charIndex);
+	void castOnWhomDialogue();
+	void startSpell(int spell);
+
+	void sparkEffectDefensive(int charIndex);
+	void sparkEffectOffensive();
+	void setSpellEventTimer(int spell, int timerBaseFactor, int timerLength, int timerLevelFactor, int updateExistingTimer);
+
+	bool magicObjectHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level);
+
+	void spellCallback_start_empty() {}
+	bool spellCallback_end_empty(EobFlyingObject *fo) { return true; }
+	void spellCallback_start_armor();
+	void spellCallback_start_burningHands();
+	void spellCallback_start_detectMagic();
+	bool spellCallback_end_detectMagic(EobFlyingObject *fo);
+	void spellCallback_start_magicMissile();
+	bool spellCallback_end_magicMissile(EobFlyingObject *fo);
+	void spellCallback_start_shockingGrasp();
+	bool spellCallback_end_shockingGraspFlameBlade(EobFlyingObject *fo);
+	void spellCallback_start_improvedIdentify();
+	void spellCallback_start_melfsAcidArrow();
+	bool spellCallback_end_melfsAcidArrow(EobFlyingObject *fo);
+	void spellCallback_start_dispelMagic();
+	void spellCallback_start_fireball();
+	bool spellCallback_end_fireball(EobFlyingObject *fo);
+	void spellCallback_start_flameArrow();
+	bool spellCallback_end_flameArrow(EobFlyingObject *fo);
+	void spellCallback_start_holdPerson();
+	bool spellCallback_end_holdPerson(EobFlyingObject *fo);
+	void spellCallback_start_lightningBolt();
+	bool spellCallback_end_lightningBolt(EobFlyingObject *fo);
+	void spellCallback_start_vampiricTouch();
+	bool spellCallback_end_vampiricTouch(EobFlyingObject *fo);
+	void spellCallback_start_fear();
+	void spellCallback_start_iceStorm();
+	bool spellCallback_end_iceStorm(EobFlyingObject *fo);
+	void spellCallback_start_removeCurse();
+	void spellCallback_start_coneOfCold();
+	void spellCallback_start_holdMonster();
+	bool spellCallback_end_holdMonster(EobFlyingObject *fo);
+	void spellCallback_start_wallOfForce();
+	void spellCallback_start_disintegrate();
+	void spellCallback_start_fleshToStone();
+	void spellCallback_start_stoneToFlesh();
+	void spellCallback_start_trueSeeing();
+	bool spellCallback_end_trueSeeing(EobFlyingObject *fo);
+	void spellCallback_start_slayLiving();
+	void spellCallback_start_powerWordStun();
+	void spellCallback_start_causeLightWounds();
+	void spellCallback_start_cureLightWounds();
+	void spellCallback_start_aid();
+	bool spellCallback_end_aid(EobFlyingObject *fo);
+	void spellCallback_start_flameBlade();
+	void spellCallback_start_slowPoison();
+	bool spellCallback_end_slowPoison(EobFlyingObject *fo);
+	void spellCallback_start_createFood();
+	void spellCallback_start_removeParalysis();
+	void spellCallback_start_causeSeriousWounds();
+	void spellCallback_start_cureSeriousWounds();
+	void spellCallback_start_neutralizePoison();
+	void spellCallback_start_causeCriticalWounds();
+	void spellCallback_start_cureCriticalWounds();
+	void spellCallback_start_flameStrike();
+	bool spellCallback_end_flameStrike(EobFlyingObject *fo);
+	void spellCallback_start_raiseDead();
+	void spellCallback_start_harm();
+	void spellCallback_start_heal();
+	void spellCallback_start_layOnHands();
+	void spellCallback_start_turnUndead();
+	bool spellCallback_end_unk1Passive(EobFlyingObject *fo);
+	bool spellCallback_end_unk2Passive(EobFlyingObject *fo);
+	bool spellCallback_end_deathSpellPassive(EobFlyingObject *fo);
+	bool spellCallback_end_disintegratePassive(EobFlyingObject *fo);
+	bool spellCallback_end_causeCriticalWoundsPassive(EobFlyingObject *fo);
+	bool spellCallback_end_fleshToStonePassive(EobFlyingObject *fo);
+
+	int8 _openBookSpellLevel;
+	int8 _openBookSpellSelectedItem;
+	int8 _openBookSpellListOffset;
+	uint8 _openBookChar;
+	uint8 _openBookType;
+	uint8 _openBookCharBackup;
+	uint8 _openBookTypeBackup;
+	const char *const *_openBookSpellList;
+	int8 *_openBookAvailableSpells;
+	uint8 _activeSpellCaster;
+	uint8 _activeSpellCasterPos;
+	uint8 _activeSpell;
+	bool _returnAfterSpellCallback;
+
+	typedef void (EobCoreEngine::*SpellStartCallback)();
+	typedef bool (EobCoreEngine::*SpellEndCallback)(EobFlyingObject *fo);
+
+	struct EobSpell {
+		const char *name;
+		SpellStartCallback startCallback;
+		uint16 flags;
+		const uint16 *timingPara;
+		SpellEndCallback endCallback;
+		uint8 sound;
+		uint32 effectFlags;
+		uint16 damageFlags;
+	};
+
+	EobSpell *_spells;
+	int _numSpells;
+
+	const char *const *_bookNumbers;
+	const char *const *_mageSpellList;
+	int _mageSpellListSize;
+	int _clericSpellOffset;
+	const char *const *_clericSpellList;
+	const char *const *_spellNames;
+	const char *const *_magicStrings1;
+	const char *const *_magicStrings2;
+	const char *const *_magicStrings3;
+	const char *const *_magicStrings4;
+	const char *const *_magicStrings5;
+	const char *const *_magicStrings6;
+	const char *const *_magicStrings7;
+	const char *const *_magicStrings8;
+
+	uint8 *_spellAnimBuffer;
+
+	const uint8 *_sparkEffectDefSteps;
+	const uint8 *_sparkEffectDefSubSteps;
+	const uint8 *_sparkEffectDefShift;
+	const uint8 *_sparkEffectDefAdd;
+	const uint8 *_sparkEffectDefX;
+	const uint8 *_sparkEffectDefY;
+	const uint32 *_sparkEffectOfFlags1;
+	const uint32 *_sparkEffectOfFlags2;
+	const uint8 *_sparkEffectOfShift;
+	const uint8 *_sparkEffectOfX;
+	const uint8 *_sparkEffectOfY;
+
+	const uint8 *_magicFlightObjectProperties;
+
+	// sound
+	void snd_playSoundEffect(int id, int volume=0xFF);
+};
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
+
+#endif
\ No newline at end of file
diff --git a/engines/kyra/gui.h b/engines/kyra/gui.h
index 6e9606f1de..04fc9b5523 100644
--- a/engines/kyra/gui.h
+++ b/engines/kyra/gui.h
@@ -40,10 +40,10 @@ struct Button {
 	typedef Common::Functor1<Button *, int> CallbackFunctor;
 	typedef Common::SharedPtr<CallbackFunctor> Callback;
 
-	Button() : nextButton(0), index(0), keyCode(0), keyCode2(0), data0Val1(0), data1Val1(0), data2Val1(0), flags(0),
+	Button() : nextButton(0), index(0), keyCode(0), keyCode2(0), data0Val1(0), data1Val1(0), data2Val1(0), data3Val1(0), flags(0),
 	    data0ShapePtr(0), data1ShapePtr(0), data2ShapePtr(0), data0Callback(), data1Callback(), data2Callback(),
 	    dimTableIndex(0), x(0), y(0), width(0), height(0), data0Val2(0), data0Val3(0), data1Val2(0), data1Val3(0),
-	    data2Val2(0), data2Val3(0), flags2(0), mouseWheel(0), buttonCallback(), arg(0) {}
+	    data2Val2(0), data2Val3(0), data3Val2(0), data3Val3(0), flags2(0), mouseWheel(0), buttonCallback(), arg(0) {}
 
 	Button *nextButton;
 	uint16 index;
@@ -54,6 +54,7 @@ struct Button {
 	byte data0Val1;
 	byte data1Val1;
 	byte data2Val1;
+	byte data3Val1;
 
 	uint16 flags;
 
@@ -78,6 +79,9 @@ struct Button {
 	uint8 data2Val2;
 	uint8 data2Val3;
 
+	uint8 data3Val2;
+	uint8 data3Val3;
+
 	uint16 flags2;
 
 	int8 mouseWheel;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
new file mode 100644
index 0000000000..9aafb76189
--- /dev/null
+++ b/engines/kyra/gui_eob.cpp
@@ -0,0 +1,2165 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/eobcommon.h"
+#include "kyra/gui_eob.h"
+#include "kyra/timer.h"
+#include "kyra/util.h"
+
+#include "common/system.h"
+
+namespace Kyra {
+
+void LolEobBaseEngine::removeInputTop() {
+	if (!_eventList.empty()) {
+		if (_eventList.begin()->event.type == Common::EVENT_LBUTTONDOWN)
+			_mouseClick = 1;
+		else if (_eventList.begin()->event.type == Common::EVENT_RBUTTONDOWN)
+			_mouseClick = 2;
+		else
+			_mouseClick = 0;
+
+		_eventList.erase(_eventList.begin());
+	}
+}
+
+void LolEobBaseEngine::gui_drawBox(int x, int y, int w, int h, int frameColor1, int frameColor2, int fillColor) {
+	w--; h--;
+	if (fillColor != -1)
+		screen()->fillRect(x + 1, y + 1, x + w - 1, y + h - 1, fillColor);
+
+	screen()->drawClippedLine(x + 1, y, x + w, y, frameColor2);
+	screen()->drawClippedLine(x + w, y, x + w, y + h - 1, frameColor2);
+	screen()->drawClippedLine(x, y, x, y + h, frameColor1);
+	screen()->drawClippedLine(x, y + h, x + w, y + h, frameColor1);
+}
+
+void LolEobBaseEngine::gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32 cur, int32 max, int col1, int col2) {
+	if (max < 1)
+		return;
+	if (cur < 0)
+		cur = 0;
+
+	int32 e = MIN(cur, max);
+
+	if (!--w)
+		return;
+	if (!--h)
+		return;
+
+	int32 t = (e * w) / max;
+
+	if (!t && e)
+		t++;
+
+	if (t)
+		screen()->fillRect(x, y, x + t - 1, y + h, col1);
+
+	if (t < w && col2)
+		screen()->fillRect(x + t, y, x + w, y + h, col2);
+}
+
+void LolEobBaseEngine::gui_initButtonsFromList(const int16 *list) {
+	while (*list != -1)
+		gui_initButton(*list++);
+}
+
+void LolEobBaseEngine::gui_resetButtonList() {
+	for (uint i = 0; i < ARRAYSIZE(_activeButtonData); ++i)
+		_activeButtonData[i].nextButton = 0;
+
+	gui_notifyButtonListChanged();
+	_activeButtons = 0;
+}
+
+void LolEobBaseEngine::gui_notifyButtonListChanged() {
+	if (gui()) {
+		if (!_buttonListChanged && !_preserveEvents)
+			removeInputTop();
+		_buttonListChanged = true;
+	}
+}
+
+bool LolEobBaseEngine::clickedShape(int shapeIndex) {
+	if (_clickedSpecialFlag != 0x40)
+		return true;
+
+	for (; shapeIndex; shapeIndex = _levelDecorationProperties[shapeIndex].next) {
+		if (_flags.gameID != GI_LOL)
+			shapeIndex--;
+
+		uint16 s = _levelDecorationProperties[shapeIndex].shapeIndex[1];
+
+		if (s == 0xffff)
+			continue;
+
+		int w = _flags.gameID == GI_LOL ? _levelDecorationShapes[s][3] : (_levelDecorationShapes[s][2] << 3);
+		int h = _levelDecorationShapes[s][_flags.gameID == GI_LOL ? 2 : 1];
+		int x = _levelDecorationProperties[shapeIndex].shapeX[1] + _clickedShapeXOffs;
+		int y = _levelDecorationProperties[shapeIndex].shapeY[1] + _clickedShapeYOffs;
+
+		if (_levelDecorationProperties[shapeIndex].flags & 1) {
+			if (_flags.gameID == GI_LOL)
+				w <<= 1;
+			else
+				x = 176 - x - w;
+		}
+
+		if (posWithinRect(_mouseX, _mouseY, x - 4, y - 4, x + w + 8, y + h + 8))
+			return true;
+	}
+
+	return false;
+}
+
+#ifdef ENABLE_EOB
+
+Button *EobCoreEngine::gui_getButton(Button *buttonList, int index) {
+	while (buttonList) {
+		if (buttonList->index == index)
+			return buttonList;
+		buttonList = buttonList->nextButton;
+	}
+
+	return 0;
+}
+
+void EobCoreEngine::gui_drawPlayField(int pageNum) {
+	_screen->loadEobCpsFileToPage("PLAYFLD", 0, 5, 3, 2);
+	int cp = _screen->setCurPage(2);
+	gui_drawCompass(true);
+
+	if (pageNum && !_sceneDrawPage1)
+		drawScene(0);
+
+	_screen->setCurPage(cp);
+	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+
+	_screen->loadEobCpsFileToPage("INVENT", 0, 5, 3, 2);
+}
+
+void EobCoreEngine::gui_restorePlayField() {
+	loadVcnData(0, 0);
+	_screen->_curPage = 0;
+	gui_drawPlayField(1);
+	gui_drawAllCharPortraitsWithStats();
+}
+
+void EobCoreEngine::gui_drawAllCharPortraitsWithStats() {
+	for (int i = 0; i < 6; i++)
+		gui_drawCharPortraitWithStats(i);
+}
+
+void EobCoreEngine::gui_drawCharPortraitWithStats(int index) {
+	if (!testCharacter(index, 1))
+		return;
+
+	static const uint16 charPortraitPosX[] = { 8, 80, 184, 256 };
+	static const uint16 charPortraitPosY[] = { 2, 54, 106 };
+
+	EobCharacter *c = &_characters[index];
+	int txtCol1 = 12;
+	int txtCol2 = 15;
+
+	if ((_flags.gameID == GI_EOB1 && c->flags & 6) || (_flags.gameID == GI_EOB2 && c->flags & 0x0e)) {
+		txtCol1 = 8;
+		txtCol2 = 6;
+	}
+
+	char tmpStr[10];
+
+	if (_currentControlMode == 0) {
+		int x2 = charPortraitPosX[index & 1];
+		int y2 = charPortraitPosY[index >> 1];
+		Screen::FontId cf = _screen->setFont(Screen::FID_6_FNT);
+
+		_screen->copyRegion(176, 168, x2 , y2, 64, 24, 2, 2, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(240, 168, x2, y2 + 24, 64, 26, 2, 2, Screen::CR_NO_P_CHECK);
+		int cp = _screen->setCurPage(2);
+
+		if (index == _exchangeCharacterId)
+			_screen->printText(_characterGuiStringsSt[0], x2 + 2, y2 + 2, 8, _bkgColor_1);
+		else
+			_screen->printText(c->name, x2 + 2, y2 + 2, txtCol1, _bkgColor_1);
+
+		gui_drawFaceShape(index);
+		gui_drawWeaponSlot(index, 0);
+		gui_drawWeaponSlot(index, 1);
+		gui_drawHitpoints(index);
+
+		if (testCharacter(index, 2))
+			gui_drawCharPortraitStatusFrame(index);
+
+		if (c->damageTaken > 0) {
+			_screen->drawShape(2, _redSplatShape, x2 + 13, y2 + 30, 0);
+			sprintf(tmpStr, "%d", c->damageTaken);
+			_screen->printText(tmpStr, x2 + 34 - (strlen(tmpStr) * 3), y2 + 42, 15, 0);
+		}
+
+		_screen->setCurPage(cp);
+		_screen->setFont(cf);
+
+		if (!cp) {
+			_screen->copyRegion(x2, y2, charPortraitPosX[2 + (index & 1)], y2, 64, 50, 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->updateScreen();
+		}
+	} else if ((_currentControlMode == 1 || _currentControlMode == 2) && index == _updateCharNum) {
+		_screen->copyRegion(176, 0, 0, 0, 144, 168, 2, 2, Screen::CR_NO_P_CHECK);
+		_screen->_curPage = 2;
+		gui_drawFaceShape(index);
+		_screen->printShadedText(c->name, 219, 6, txtCol2, _bkgColor_1);
+		gui_drawHitpoints(index);
+		gui_drawFoodStatusGraph(index);
+
+		if (_currentControlMode == 1) {
+			if (c->hitPointsCur == -10)
+				_screen->printShadedText(_characterGuiStringsSt[1], 247, 158, 6, _color6);
+			else if (c->hitPointsCur < 1)
+				_screen->printShadedText(_characterGuiStringsSt[2], 226, 158, 6, _color6);
+			else if (c->effectFlags & (_flags.gameID == GI_EOB1 ? 0x80 : 0x2000))
+				_screen->printShadedText(_characterGuiStringsSt[3], 220, 158, 6, _color6);
+			else if (c->flags & 2)
+				_screen->printShadedText(_characterGuiStringsSt[4], 235, 158, 6, _color6);
+			else if (c->flags & 4)
+				_screen->printShadedText(_characterGuiStringsSt[5], 232, 158, 6, _color6);
+			else if (c->flags & 8)
+				_screen->printShadedText(_characterGuiStringsSt[6], 232, 158, 6, _color6);
+
+			for (int i = 0; i < 27; i++)
+				gui_drawInventoryItem(i, 0, 2);
+			gui_drawInventoryItem(16, 1, 2);
+
+		} else {
+			static const uint16 cm2X1[] = { 179, 272, 301 };
+			static const uint16 cm2Y1[] = { 36, 51, 51 };
+			static const uint16 cm2X2[] = { 271, 300, 318 };
+			static const uint16 cm2Y2[] = { 165, 165, 147 };
+
+			for (int i = 0; i < 3; i++)
+				_screen->fillRect(cm2X1[i], cm2Y1[i], cm2X2[i], cm2Y2[i], _color6);
+
+			_screen->printShadedText(_characterGuiStringsIn[0], 183, 42, 15, _color6);
+			_screen->printText(_chargenClassStrings[c->cClass], 183, 55, 12, _color6);
+			_screen->printText(_chargenAlignmentStrings[c->alignment], 183, 62, 12, _color6);
+			_screen->printText(_chargenRaceSexStrings[c->raceSex], 183, 69, 12, _color6);
+
+			for (int i = 0; i < 6; i++)
+				_screen->printText(_chargenStatStrings[6 + i], 183, 82 + i * 7, 12, _color6);
+
+			_screen->printText(_characterGuiStringsIn[1], 183, 124, 12, _color6);
+			_screen->printText(_characterGuiStringsIn[2], 239, 138, 12, _color6);
+			_screen->printText(_characterGuiStringsIn[3], 278, 138, 12, _color6);
+
+			_screen->printText(getCharStrength(c->strengthCur, c->strengthExtCur), 275, 82, 15, _color6);
+			sprintf(tmpStr, "%d", c->intelligenceCur);
+			_screen->printText(tmpStr, 275, 89, 15, _color6);
+			sprintf(tmpStr, "%d", c->wisdomCur);
+			_screen->printText(tmpStr, 275, 96, 15, _color6);
+			sprintf(tmpStr, "%d", c->dexterityCur);
+			_screen->printText(tmpStr, 275, 103, 15, _color6);
+			sprintf(tmpStr, "%d", c->constitutionCur);
+			_screen->printText(tmpStr, 275, 110, 15, _color6);
+			sprintf(tmpStr, "%d", c->charismaCur);
+			_screen->printText(tmpStr, 275, 117, 15, _color6);
+			sprintf(tmpStr, "%d", c->armorClass);
+			_screen->printText(tmpStr, 275, 124, 15, _color6);
+
+			for (int i = 0; i < 3; i++) {
+				int t = getClassHpIncreaseType(c->cClass, i);
+				if (t == -1)
+					continue;
+
+				_screen->printText(_chargenClassStrings[t + 15], 180, 145 + 7 * i, 12, _color6);
+				sprintf(tmpStr, "%d", c->experience[i]);
+				_screen->printText(tmpStr, 251 - strlen(tmpStr) * 3, 145 + 7 * i, 15, _color6);
+				sprintf(tmpStr, "%d", c->level[i]);
+				_screen->printText(tmpStr, 286 - strlen(tmpStr) * 3, 145 + 7 * i, 15, _color6);
+			}
+		}
+
+		_screen->_curPage = 0;
+		_screen->copyRegion(176, 0, 176, 0, 144, 168, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(0, 0, 176, 0, 144, 168, 2, 2, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+	}
+}
+
+void EobCoreEngine::gui_drawFaceShape(int index) {
+	if (!testCharacter(index, 1))
+		return;
+
+	static const uint8 xCoords[] = { 8, 80 };
+	static const uint8 yCoords[] = { 11, 63, 115 };
+
+	int x = xCoords[index & 1];
+	int y = yCoords[index >> 1];
+
+	if (!_screen->_curPage)
+		x += 176;
+
+	if (_currentControlMode) {
+		if (_updateCharNum != index)
+			return;
+
+		x = 181;
+		y = 3;
+	}
+
+	EobCharacter *c = &_characters[index];
+
+	if (c->hitPointsCur == -10) {
+		_screen->drawShape(_screen->_curPage, _deadCharShape, x, y, 0);
+		return;
+	}
+
+	if (_flags.gameID == GI_EOB1) {
+		if (c->effectFlags & 4) {
+			_screen->fillRect(x, y, x + 31, y + 31, 12);
+			return;
+		}
+	} else {
+		if (c->effectFlags & 0x140) {
+			_screen->setFadeTableIndex(1);
+			_screen->setShapeFadeMode(1, true);
+		}
+
+		if (c->flags & 2) {
+			_screen->setFadeTableIndex(0);
+			_screen->setShapeFadeMode(1, true);
+		}
+
+		if (c->flags & 8) {
+			_screen->setFadeTableIndex(2);
+			_screen->setShapeFadeMode(1, true);
+		}
+	}
+
+	_screen->drawShape(_screen->_curPage, c->faceShape, x, y, 0);
+
+	if (c->hitPointsCur < 1)
+		_screen->drawShape(_screen->_curPage, _disabledCharGrid, x, y, 0);
+
+	//if ((c->flags & 2) || (c->flags & 8) || (c->effectFlags & 0x140)) {
+		_screen->setFadeTableIndex(4);
+		_screen->setShapeFadeMode(1, false);
+	//}
+}
+
+void EobCoreEngine::gui_drawWeaponSlot(int charIndex, int slot) {
+	static const uint8 xCoords[] = { 40, 112 };
+	static const uint8 yCoords[] = { 11, 27, 63, 79, 115, 131 };
+
+	int x = xCoords[charIndex & 1];
+	int y = yCoords[(charIndex & 6) + slot];
+
+	if (!_screen->_curPage)
+		x += 176;
+
+	int itm = _characters[charIndex].inventory[slot];
+	gui_drawBox(x, y, 31, 16, _color1_1, _color2_1, _bkgColor_1);
+
+	if (_characters[charIndex].slotStatus[slot]) {
+		gui_drawWeaponSlotStatus(x, y, _characters[charIndex].slotStatus[slot]);
+		return;
+	}
+
+	if (itm)
+		drawItemIconShape(_screen->_curPage, itm, x + 8, y);
+	else if (!slot && checkScriptFlag(0x8000))
+		_screen->drawShape(_screen->_curPage, _itemIconShapes[103], x + 8, y, 0);
+	else
+		_screen->drawShape(_screen->_curPage, _itemIconShapes[85], x + 8, y, 0);
+
+	if ((_characters[charIndex].disabledSlots & (1 << slot)) || !validateWeaponSlotItem(charIndex, slot) || (_characters[charIndex].hitPointsCur <= 0) || (_characters[charIndex].flags & 0x0c))
+		_screen->drawShape(_screen->_curPage, _weaponSlotGrid, x, y, 0);
+}
+
+void EobCoreEngine::gui_drawWeaponSlotStatus(int x, int y, int status) {
+	char tmpStr[6];
+	char tmpStr2[6];
+	tmpStr2[0] = 0;
+
+	if (status > -3 || status == -5)
+		_screen->drawShape(_screen->_curPage, _greenSplatShape, x - 1, y, 0);
+	else
+		gui_drawBox(x, y, 31, 16, _color9, _color10, _color11);
+
+	switch (status + 5) {
+		case 0:
+			strcpy(tmpStr, _characterGuiStringsWp[2]);
+			break;
+		case 1:
+			strcpy(tmpStr, _characterGuiStringsWr[2]);
+			strcpy(tmpStr2, _characterGuiStringsWr[3]);
+			break;
+		case 2:
+			strcpy(tmpStr, _characterGuiStringsWr[0]);
+			strcpy(tmpStr2, _characterGuiStringsWr[1]);
+			break;
+		case 3:
+			strcpy(tmpStr, _characterGuiStringsWp[1]);
+			break;
+		case 4:
+			strcpy(tmpStr, _characterGuiStringsWp[0]);
+			break;
+		default:
+			snprintf(tmpStr, 6, "%d", status);
+			break;
+	}
+
+	if (tmpStr2[0]) {
+		_screen->printText(tmpStr, x + (16 - strlen(tmpStr) * 3), y + 2, 15, 0);
+		_screen->printText(tmpStr2, x + (16 - strlen(tmpStr) * 3), y + 9, 15, 0);
+	} else {
+		_screen->printText(tmpStr, x + (16 - strlen(tmpStr) * 3), y + 5, 15, 0);
+	}
+}
+
+void EobCoreEngine::gui_drawHitpoints(int index) {
+	if (!testCharacter(index, 1))
+		return;
+
+	if (_currentControlMode && (index != _updateCharNum))
+		return;
+
+	static const uint8 xCoords[] = { 23, 95 };
+	static const uint8 yCoords[] = { 46, 98, 150 };
+	static const uint8 barColor[] = { 3, 5, 8 };
+
+	int x = xCoords[index & 1];
+	int y = yCoords[index >> 1];
+	int w = 38;
+	int h = 3;
+
+	if (!_screen->_curPage)
+		x += 176;
+
+	if (_currentControlMode) {
+		x = 250;
+		y = 16;
+		w = 51;
+		h = 5;
+	}
+
+	EobCharacter *c = &_characters[index];
+
+	if (_hpBarGraphs) {
+		int bgCur = c->hitPointsCur + 10;
+		int bgMax = c->hitPointsMax + 10;
+		int col = ((bgMax / 3) > bgCur) ? 1 : 0;
+		if (bgCur <= 10)
+			col = 2;
+
+		if (!_currentControlMode)
+			_screen->printText(_characterGuiStringsHp[0], x - 13, y - 1, 12, 0);
+
+
+		gui_drawHorizontalBarGraph(x, y, w, h, bgCur, bgMax, barColor[col], _color5);
+
+	} else {
+		char tmpString[12];
+		snprintf(tmpString, 12, _characterGuiStringsHp[1], c->hitPointsCur, c->hitPointsMax);
+
+		if (!_currentControlMode) {
+			x -= 13;
+			y -= 1;
+		}
+
+		_screen->printText(tmpString, x, y, 12, _bkgColor_1);
+	}
+}
+
+void EobCoreEngine::gui_drawFoodStatusGraph(int index) {
+	if (!_currentControlMode)
+		return;
+
+	if (!testCharacter(index, 1))
+		return;
+
+	EobCharacter *c = &_characters[index];
+	if (!(c->flags & 1))
+		return;
+
+	if (index != _updateCharNum)
+		return;
+
+	uint8 col = c->food < 20 ? 8 : (c->food < 33 ? 5 : 3);
+	gui_drawHorizontalBarGraph(250, 25, 51, 5, c->food, 100, col, _color5);
+}
+
+void EobCoreEngine::gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32 curVal, int32 maxVal, int col1, int col2) {
+	gui_drawBox(x - 1, y - 1, w + 3, h + 2, _color2_1, _color1_1, -1);
+	LolEobBaseEngine::gui_drawHorizontalBarGraph(x, y, w + 2, h, curVal, maxVal, col1, col2);
+}
+
+void EobCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
+	uint8 boxColor = ((_partyEffectFlags & 0x20000) | (_partyEffectFlags & 0xffff)) ? 4 : 6;
+
+	static const uint8 xCoords[] = { 8, 80 };
+	static const uint8 yCoords[] = { 2, 54, 106 };
+	int x = xCoords[index & 1];
+	int y = yCoords[index >> 1];
+
+	if (!_screen->_curPage)
+		x += 176;
+
+	EobCharacter *c = &_characters[index];
+
+	int v8 = (_flags.gameID == GI_EOB2 && ((c->effectFlags & 0x4818) || c->effectsRemainder[0] || c->effectsRemainder[1] || ((_partyEffectFlags & 0x20000) | (_partyEffectFlags & 0xffff)))) ||
+		(_flags.gameID == GI_EOB1 && ((c->effectFlags & 0x302) || c->effectsRemainder[0] || c->effectsRemainder[1])) ? 1 : 0;
+	int vA = (_flags.gameID == GI_EOB2 && ((((c->effectFlags & 0x3000) | (c->effectFlags & 0x10000)) || (_partyEffectFlags & 0x8420)))) ||
+		(_flags.gameID == GI_EOB1 && ((c->effectFlags & 0x4c8) || _partyEffectFlags & 300000))? 1 : 0;
+
+	if (v8 || vA) {
+		if (v8 && !vA) {
+			_screen->drawBox(x, y, x + 63, y + 49, boxColor);
+			return;
+		}
+
+		if (vA && !v8) {
+			_screen->drawBox(x, y, x + 63, y + 49, 5);
+			return;
+		}
+
+		int iX= x;
+		int iY= y;
+
+		for (int i = 0; i < 64; i += 16) {
+			x = iX + i;
+			if (v8) {
+				_screen->drawClippedLine(x, y, x + 7, y, boxColor);
+				_screen->drawClippedLine(x + 8, y + 49, x + 15, y + 49, boxColor);
+			}
+			if (vA) {
+				_screen->drawClippedLine(x + 8, y, x + 15, y, 5);
+				_screen->drawClippedLine(x, y + 49, x + 7, y + 49, 5);
+			}
+		}
+
+		x = iX;
+
+		for (int i = 1; i < 48; i += 12) {
+			y = iY + i - 1;
+
+			if (vA) {
+				_screen->drawClippedLine(x, y + 1, x, y + 6, 5);
+				_screen->drawClippedLine(x + 63, y + 7, x + 63, y + 12, 5);
+			}
+			if (v8) {
+				_screen->drawClippedLine(x, y + 7, x, y + 12, boxColor);
+				_screen->drawClippedLine(x + 63, y + 1, x + 63, y + 6, boxColor);
+			}
+		}
+
+	} else {
+		_screen->drawClippedLine(x, y, x + 62, y, _color1_1);
+		_screen->drawClippedLine(x, y + 49, x + 62, y + 49, _color2_1);
+		_screen->drawClippedLine(x - 1, y, x - 1, y + 50, 12);
+		_screen->drawClippedLine(x + 63, y, x + 63, y + 50, 12);
+	}
+}
+
+void EobCoreEngine::gui_drawInventoryItem(int slot, int special, int pageNum) {
+	int x = _inventorySlotsX[slot];
+	int y = _inventorySlotsY[slot];
+
+	int item = _characters[_updateCharNum].inventory[slot];
+	int cp = _screen->setCurPage(pageNum);
+
+	if (special) {
+		int wh = (slot == 25 || slot == 26) ? 10 : 18;
+		gui_drawBox(x - 1, y - 1, wh, wh, _color1_1, _color2_1, slot == 16 ? -1 : _bkgColor_1);
+
+		if (slot == 16) {
+			_screen->fillRect(227, 65, 238, 69, 12);
+			int cnt = countQueuedItems(_characters[_updateCharNum].inventory[slot], -1, -1, 1, 1);
+			x = cnt >= 10 ? 227 : 233;
+			char str[3];
+			snprintf(str, 3, "%d", cnt);
+			_screen->printText(str, x, 65, 15, 0);
+		}
+	}
+
+	if (slot != 16 && item) {
+		if (slot == 25 || slot == 26) {
+			x -= 4;
+			y -= 4;
+		}
+		drawItemIconShape(pageNum, item, x, y);
+	}
+	_screen->_curPage = cp;
+	_screen->updateScreen();
+}
+
+void EobCoreEngine::gui_drawCompass(bool force) {
+	if (_currentDirection == _compassDirection && !force)
+		return;
+
+	static const uint8 shpX[2][3] = { { 0x70, 0x4D, 0x95 }, { 0x72, 0x4F, 0x97 } };
+	static const uint8 shpY[2][3] = { { 0x7F, 0x9A, 0x9A }, { 0x83, 0x9E, 0x9E } };
+	int g = _flags.gameID == GI_EOB1 ? 0 : 1;
+
+	for (int i = 0; i < 3; i++)
+		_screen->drawShape(_screen->_curPage, _compassShapes[(i << 2) + _currentDirection], shpX[g][i], shpY[g][i], 0);
+
+	_compassDirection = _currentDirection;
+}
+
+void EobCoreEngine::gui_drawDialogueBox() {
+	gui_drawBox(0, 121, 320, 79, _color1_1, _color2_1, _bkgColor_1);
+	txt()->clearCurDim();
+}
+
+void EobCoreEngine::gui_drawSpellbook() {
+	_screen->setCurPage(2);
+	int numTab = (_flags.gameID == GI_EOB1) ? 5 : 6;
+	_screen->copyRegion(64, 121, 64, 121, 112, 56, 0, 2, Screen::CR_NO_P_CHECK);
+
+	for (int i = 0; i < numTab; i++) {
+		int col1 = _color14;
+		int col2 = _color13;
+		int col3 = _color12;
+
+		if (i == _openBookSpellLevel) {
+			col1 =  _color1_1;
+			col2 =  _color2_1;
+			col3 =  _bkgColor_1;
+		}
+
+		if (_flags.gameID == GI_EOB1) {
+			gui_drawBox(i * 21 + 71, 122, 21, 9, col1, col2, col3);
+			_screen->printText(_magicStrings7[i], i * 21 + 73, 123, 12, 0);
+		} else {
+			gui_drawBox(i * 18 + 68, 121, 18, 9, col1, col2, col3);
+			char val[3];
+			sprintf(val, "%d", i + 1);
+			_screen->printText(val, i * 18 + 75, 123, 12, 0);
+		}
+	}
+
+	if (_flags.gameID == GI_EOB1)
+		gui_drawBox(71, 131, 105, 44, _color1_1, _color2_1, _bkgColor_1);
+	else {
+		gui_drawBox(68, 130, 108, 47, _color1_1, _color2_1, _bkgColor_1);
+		gui_drawBox(68, 168, 78, 9, _color8, _color7, _color6);
+		gui_drawBox(146, 168, 14, 9, _color8, _color7, _color6);
+		gui_drawBox(160, 168, 16, 9, _color8, _color7, _color6);
+		gui_drawSpellbookScrollArrow(150, 169, 0);
+		gui_drawSpellbookScrollArrow(165, 169, 1);
+	}
+
+	int textCol1 = 15;
+	int textCol2 = 8;
+	int textXa = 74;
+	int textXs = 71;
+	int textY = 170;
+	int col3 = _bkgColor_1;
+
+	if (_flags.gameID == GI_EOB1) {
+		textCol2 = 11;
+		textXa = textXs = 73;
+		textY = 168;
+	}
+
+	for (int i = 0; i < 7; i++) {
+		int d = _openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellListOffset + i];
+		if (_openBookSpellSelectedItem == i) {
+			if (d >= 0 && i < 6 && (i + _openBookSpellListOffset) < 9) {
+				_screen->printText(_openBookSpellList[d], textXs, 132 + 6 * i, textCol1, textCol2);
+			} else if (i == 6) {
+				if (_flags.gameID == GI_EOB2)
+					_screen->fillRect(69, 169, 144, 175, textCol2);
+				_screen->printText(_magicStrings1[0], textXa, textY, textCol1, textCol2);
+			}
+		} else {
+			if (d >= 0 && i < 6 && (i + _openBookSpellListOffset) < 9)
+				_screen->printText(_openBookSpellList[d], textXs, 132 + 6 * i, textCol1, col3);
+			else
+				_screen->printText(_magicStrings1[0], textXa, textY, 12, _color6);
+		}
+	}
+
+	if (_characters[_openBookChar].disabledSlots & 4) {
+		static const uint8 xpos[] = { 0x44, 0x62, 0x80, 0x90 };
+		static const uint8 ypos[] = { 0x82, 0x92, 0x98 };
+		for (int yc = 0; yc < 3; yc++) {
+			for (int xc = 0; xc < 4; xc++)
+				_screen->drawShape(_screen->_curPage, _weaponSlotGrid, xpos[xc], ypos[yc], 0);
+		}
+	}
+
+	if (_openBookAvailableSpells[_openBookSpellLevel * 10 + 6] <= 0)
+		_screen->drawShape(2, _blackBoxWideGrid, 146, 168, 0);
+
+	_screen->setCurPage(0);
+	_screen->copyRegion(64, 121, 64, 121, 112, 56, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+}
+
+void EobCoreEngine::gui_drawSpellbookScrollArrow(int x, int y, int direction) {
+	static const uint8 x1[] = { 0, 2, 1, 0, 2, 2 };
+	static const uint8 x2[] = { 2, 4, 5, 6, 4, 4 };
+	if (direction) {
+		_screen->setPagePixel(_screen->_curPage, x + 3, y + 5, 12);
+		for (int i = 1; i < 6; i++)
+			_screen->drawClippedLine(x + x1[i], (5 - i) + y, x + x2[i], (5 - i) + y, 12);
+	} else {
+		_screen->setPagePixel(_screen->_curPage, x + 3, y, 12);
+		for (int i = 1; i < 6; i++)
+			_screen->drawClippedLine(x + x1[i], y + i, x + x2[i], y + i, 12);
+	}
+}
+
+void EobCoreEngine::gui_updateSlotAfterScrollUse() {
+	_characters[_openBookChar].disabledSlots ^= (1 << (--_castScrollSlot));
+	setCharEventTimer(_openBookChar, 18, _castScrollSlot + 2, 1);
+	gui_drawCharPortraitWithStats(_openBookChar);
+	_openBookChar = _openBookCharBackup;
+	_openBookType = _openBookTypeBackup;
+	_castScrollSlot = 0;
+	gui_toggleButtons();
+}
+
+void EobCoreEngine::gui_updateControls() {
+	Button b;
+	if (_currentControlMode)
+		clickedPortraitRestore(&b);
+	if (_updateFlags)
+		clickedSpellbookAbort(&b);
+}
+
+void EobCoreEngine::gui_toggleButtons() {
+	if (_currentControlMode == 0)
+		gui_setPlayFieldButtons();
+	else if (_currentControlMode == 1)
+		gui_setInventoryButtons();
+	else if (_currentControlMode == 2)
+		gui_setStatsListButtons();
+}
+
+void EobCoreEngine::gui_setPlayFieldButtons() {
+	gui_resetButtonList();
+	gui_initButtonsFromList(_updateFlags ? _buttonList2 : _buttonList1);
+}
+
+void EobCoreEngine::gui_setInventoryButtons() {
+	gui_resetButtonList();
+	gui_initButtonsFromList(_updateFlags ? _buttonList5 : _buttonList3);
+}
+
+void EobCoreEngine::gui_setStatsListButtons() {
+	gui_resetButtonList();
+	gui_initButtonsFromList(_updateFlags ? _buttonList6 : _buttonList4);
+}
+
+void EobCoreEngine::gui_setSwapCharacterButtons() {
+	gui_resetButtonList();
+	gui_initButtonsFromList(_buttonList7);
+}
+
+void EobCoreEngine::gui_setCastOnWhomButtons() {
+	gui_resetButtonList();
+	gui_initButtonsFromList(_buttonList8);
+}
+
+void EobCoreEngine::gui_initButton(int index, int, int, int) {
+	Button *b = 0;
+	int cnt = 1;
+
+	if (_flags.gameID == GI_EOB1 && index > 92)
+		return;
+
+	if (_activeButtons) {
+		Button *n = _activeButtons;
+		while (n->nextButton) {
+			++cnt;
+			n = n->nextButton;
+		}
+
+		++cnt;
+		b = n->nextButton = &_activeButtonData[cnt];
+	} else {
+		b = &_activeButtonData[0];
+		_activeButtons = b;
+	}
+
+	*b = Button();
+	b->data0Val2 = 12;
+	b->data1Val2 = b->data2Val2 = 15;
+	b->data3Val2 = 8;
+
+	b->index = index + 1;
+
+	const EobGuiButtonDef *d = &_buttonDefs[index];
+
+	if (_flags.gameID == GI_EOB1) {
+		// EOB1 spellbook modifications
+		if (index > 61 && index < 67)
+			d = &_buttonDefs[index + 33];
+		if (index == 88)
+			d = &_buttonDefs[index + 12];
+	}
+
+	b->x = d->x;
+	b->y = d->y;
+	b->width = d->w;
+	b->height = d->h;
+
+	// EOB1 spellbook modifications
+	if (_flags.gameID == GI_EOB1 && ((index > 66 && index < 73) || (index > 76 && index < 79)))
+		b->y++;
+
+	b->flags = d->flags;
+	b->keyCode = d->keyCode;
+	b->keyCode2 = d->keyCode2;
+	b->arg = d->arg;
+	b->buttonCallback = d->buttonCallback;
+}
+
+int EobCoreEngine::clickedCharPortraitDefault(Button *button) {
+	if (!testCharacter(button->arg, 1))
+		return 1;
+
+	gui_processCharPortraitClick(button->arg);
+	return 0;
+}
+
+int EobCoreEngine::clickedCamp(Button *button) {
+	return button->arg;
+}
+
+int EobCoreEngine::clickedSceneDropPickupItem(Button *button) {
+	uint16 block = _currentBlock;
+	if (button->arg > 1) {
+		block = calcNewBlockPosition(_currentBlock, _currentDirection);
+		int f = _wllWallFlags[_levelBlockProperties[block].walls[_sceneDrawVarDown]];
+		if (!(f & 0x0b))
+			return 1;
+	}
+	int d = _dropItemDirIndex[(_currentDirection << 2) + button->arg];
+
+	if (_itemInHand) {
+		setItemPosition((Item*)&_levelBlockProperties[block & 0x3ff].drawObjects, block, _itemInHand, d);
+		setHandItem(0);
+		runLevelScript(block, 4);
+	} else {
+		d = getQueuedItem((Item*)&_levelBlockProperties[block].drawObjects, d, -1);
+		if (!d)
+			return 1;
+		setHandItem(d);
+		runLevelScript(block, 8);
+	}
+
+	_sceneUpdateRequired = true;
+	return 1;
+}
+
+int EobCoreEngine::clickedCharPortrait2(Button *button) {
+	if (!_gui->_progress) {
+		if (!testCharacter(button->arg, 1))
+			return button->index;
+	}
+
+	_currentControlMode = 1;
+	if (!_gui->_progress)
+		_updateCharNum = button->arg;
+
+	_screen->copyRegion(176, 0, 0, 0, 144, 168, 0, 5, Screen::CR_NO_P_CHECK);
+	gui_drawCharPortraitWithStats(_updateCharNum);
+	gui_setInventoryButtons();
+
+	return button->index;
+}
+
+int EobCoreEngine::clickedWeaponSlot(Button *button) {
+	if (!testCharacter(button->arg, 1))
+		return 1;
+
+	static const uint8 sY[] = { 24, 24, 80, 80, 136, 136 };
+	int slot = sY[button->arg] > _mouseY ? 0 : 1;
+
+	if ((_gui->_flagsMouseLeft & 0x7f) == 1)
+		gui_processWeaponSlotClickLeft(button->arg, slot);
+	else
+		gui_processWeaponSlotClickRight(button->arg, slot);
+
+	return 1;
+}
+
+int EobCoreEngine::clickedCharNameLabelRight(Button *button) {
+	if (!testCharacter(button->arg, 1))
+		return button->index;
+
+	if (_updateFlags) {
+		Button b;
+		clickedSpellbookAbort(&b);
+	}
+
+	if (_exchangeCharacterId == -1) {
+		_exchangeCharacterId = button->arg;
+		gui_setSwapCharacterButtons();
+		gui_drawCharPortraitWithStats(_exchangeCharacterId);
+		enableTimer(0);
+	} else {
+		int d = _exchangeCharacterId;
+		_exchangeCharacterId = -1;
+
+		EobCharacter temp;
+		memcpy(&temp, &_characters[d], sizeof(EobCharacter));
+		memcpy(&_characters[d], &_characters[button->arg], sizeof(EobCharacter));
+		memcpy(&_characters[button->arg], &temp, sizeof(EobCharacter));
+
+		_timer->disable(0);
+		gui_drawCharPortraitWithStats(d);
+		gui_processCharPortraitClick(button->arg);
+		gui_drawCharPortraitWithStats(button->arg);
+		gui_setPlayFieldButtons();
+		setupCharacterTimers();
+	}
+
+	return button->index;
+}
+
+int EobCoreEngine::clickedInventorySlot(Button *button) {
+	gui_processInventorySlotClick(button->arg);
+	return button->index;
+}
+
+int EobCoreEngine::clickedEatItem(Button *button) {
+	eatItemInHand(_updateCharNum);
+	return button->index;
+}
+
+int EobCoreEngine::clickedInventoryPrevChar(Button *button) {
+	if (_gui->_progress == 1)
+		_updateCharNum = 0;
+	else if (_gui->_progress == 2)
+		_updateCharNum = 1;
+	else
+		_updateCharNum = getNextValidCharIndex(_updateCharNum, -1);
+
+	gui_drawCharPortraitWithStats(_updateCharNum);
+	return button->index;
+}
+
+int EobCoreEngine::clickedInventoryNextChar(Button *button) {
+	int oldVal = _updateCharNum;
+	int v = button->arg == 2 ? 2 : 0;
+
+	if (_gui->_progress == 1)
+		_updateCharNum = v + 2;
+	else if (_gui->_progress == 2)
+		_updateCharNum = v + 3;
+	else
+		_updateCharNum = getNextValidCharIndex(_updateCharNum, 1);
+
+	if (!testCharacter(_updateCharNum, 1)) {
+		_updateCharNum = oldVal;
+		return 1;
+	}
+
+	gui_drawCharPortraitWithStats(_updateCharNum);
+	return button->index;
+}
+
+int EobCoreEngine::clickedSpellbookTab(Button *button) {
+	_openBookSpellLevel = button->arg;
+	_openBookSpellListOffset = 0;
+
+	for (_openBookSpellSelectedItem = 0; _openBookSpellSelectedItem < 6; _openBookSpellSelectedItem++) {
+		if (_openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellSelectedItem] > 0)
+			break;
+	}
+
+	gui_drawSpellbook();
+
+	_characters[_openBookChar].slotStatus[3] = _openBookSpellLevel;
+	_characters[_openBookChar].slotStatus[2] = _openBookSpellSelectedItem;
+	_characters[_openBookChar].slotStatus[4] = _openBookSpellListOffset;
+
+	return button->index;
+}
+
+int EobCoreEngine::clickedSpellbookList(Button *button) {
+	int listIndex = button->arg;
+	bool spellLevelAvailable = false;
+
+	if (listIndex == 6) {
+		for (int i = 0; i < 10; i++) {
+			if (_openBookAvailableSpells[_openBookSpellLevel * 10 + i] > 0) {
+				spellLevelAvailable = true;
+				break;
+			}
+		}
+		if (!spellLevelAvailable)
+			return button->index;
+
+		int v = (_gui->_progress == 1) ? -1 : ((_gui->_progress == 2) ? 1 : 0);
+
+		_openBookSpellSelectedItem += _openBookSpellListOffset;
+		if (_openBookSpellSelectedItem == 12 || (_openBookSpellSelectedItem == 6 && _openBookSpellListOffset == 0))
+			_openBookSpellSelectedItem = 9;
+
+		do {
+			_openBookSpellSelectedItem += v;
+			int s = (_openBookSpellSelectedItem >= 0) ? _openBookSpellSelectedItem : 9;
+			_openBookSpellSelectedItem = (s <= 9) ? s : 0;
+		} while (_openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellSelectedItem] <= 0 && _openBookSpellSelectedItem != 9);
+
+		if (_openBookSpellSelectedItem >= 6) {
+			_openBookSpellListOffset = 6;
+			if (_openBookSpellSelectedItem == 9)
+				_openBookSpellSelectedItem = 6;
+			else
+				_openBookSpellSelectedItem -= 6;
+		} else {
+			_openBookSpellListOffset = 0;
+		}
+
+		if (_openBookSpellListOffset == 6 && _openBookAvailableSpells[_openBookSpellLevel * 10 + 6] <= 0)
+			_openBookSpellListOffset = 0;
+
+		gui_drawSpellbook();
+
+	} else {
+		if (listIndex == 7 || _openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellListOffset + listIndex] > 0) {
+			if (listIndex < 6) {
+				if (_openBookSpellListOffset + listIndex < 9)
+					_openBookSpellSelectedItem= listIndex;
+				else if (listIndex != 7)
+					return button->index;
+			} else if (listIndex != 7) {
+				return button->index;
+			}
+
+			if (_openBookSpellSelectedItem < 6 && ((_openBookSpellSelectedItem + _openBookSpellListOffset) < 9)) {
+				if (_characters[_openBookChar].disabledSlots & 4)
+					return button->index;
+
+				gui_drawSpellbook();
+
+				int s = _openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem];
+				if (_openBookType == 1)
+					s += _mageSpellListSize;
+
+				castSpell(s, 0);
+
+			} else if ((_openBookSpellSelectedItem == 6 && listIndex == 7) || (_openBookSpellSelectedItem != 6 && listIndex == 6) ) {
+				Button b;
+				clickedSpellbookAbort(&b);
+			}
+		}
+	}
+
+	_characters[_openBookChar].slotStatus[2] = _openBookSpellSelectedItem;
+	_characters[_openBookChar].slotStatus[4] = _openBookSpellListOffset;
+	return button->index;
+}
+
+int EobCoreEngine::clickedCastSpellOnCharacter(Button *button) {
+	_activeSpellCaster = button->arg;
+
+	if (_activeSpellCaster == 255) {
+		_txt->printMessage(_magicStrings3[1]);
+		snd_playSoundEffect(79);
+		if (_castScrollSlot) {
+			gui_updateSlotAfterScrollUse();
+		} else {
+			gui_toggleButtons();
+			gui_drawSpellbook();
+		}
+	} else {
+		if (_characters[_activeSpellCaster].flags & 1)
+			startSpell(_activeSpell);
+	}
+
+	return button->index;
+}
+
+int EobCoreEngine::clickedInventoryNextPage(Button *button) {
+	if (_currentControlMode == 2) {
+		gui_setInventoryButtons();
+		_currentControlMode = 1;
+	} else {
+		gui_setStatsListButtons();
+		_currentControlMode = 2;
+	}
+
+	gui_drawCharPortraitWithStats(_updateCharNum);
+	return button->index;
+}
+
+int EobCoreEngine::clickedPortraitRestore(Button *button) {
+	_currentControlMode = 0;
+	_screen->_curPage = 2;
+	_screen->copyRegion(0, 0, 0, 0, 144, 168, 5, _screen->_curPage, Screen::CR_NO_P_CHECK);
+	gui_drawAllCharPortraitsWithStats();
+	_screen->_curPage = 0;
+	_screen->copyRegion(0, 0, 176, 0, 144, 168, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	gui_setPlayFieldButtons();
+	return button->index;
+}
+
+int EobCoreEngine::clickedUpArrow(Button *button) {
+	int b = calcNewBlockPositionAndTestPassability(_currentBlock, _currentDirection);
+
+	if (b == -1) {
+		notifyBlockNotPassable();
+	} else {
+		moveParty(b);
+		_sceneDefaultUpdate = 1;
+	}
+
+	return button->index;
+}
+
+int EobCoreEngine::clickedDownArrow(Button *button) {
+	int b = calcNewBlockPositionAndTestPassability(_currentBlock, (_currentDirection + 2) & 3);
+
+	if (b == -1) {
+		notifyBlockNotPassable();
+	} else {
+		moveParty(b);
+		_sceneDefaultUpdate = 1;
+	}
+
+	return button->index;
+}
+
+int EobCoreEngine::clickedLeftArrow(Button *button) {
+	int b = calcNewBlockPositionAndTestPassability(_currentBlock, (_currentDirection - 1) & 3);
+
+	if (b == -1) {
+		notifyBlockNotPassable();
+	} else {
+		moveParty(b);
+		_sceneDefaultUpdate = 1;
+	}
+
+	return button->index;
+}
+
+int EobCoreEngine::clickedRightArrow(Button *button) {
+	int b = calcNewBlockPositionAndTestPassability(_currentBlock, (_currentDirection + 1) & 3);
+
+	if (b == -1) {
+		notifyBlockNotPassable();
+	} else {
+		moveParty(b);
+		_sceneDefaultUpdate = 1;
+	}
+
+	return button->index;
+}
+
+int EobCoreEngine::clickedTurnLeftArrow(Button *button) {
+	_currentDirection = (_currentDirection - 1) & 3;
+	//_keybControlUnk = -1;
+	_sceneDefaultUpdate = 1;
+	_sceneUpdateRequired = true;
+	return button->index;
+}
+
+int EobCoreEngine::clickedTurnRightArrow(Button *button) {
+	_currentDirection = (_currentDirection + 1) & 3;
+	//_keybControlUnk = -1;
+	_sceneDefaultUpdate = 1;
+	_sceneUpdateRequired = true;
+	return button->index;
+}
+
+int EobCoreEngine::clickedAbortCharSwitch(Button *button) {
+	_timer->disable(0);
+	int c = _exchangeCharacterId;
+	_exchangeCharacterId = -1;
+	gui_drawCharPortraitWithStats(c);
+	gui_setPlayFieldButtons();
+	return button->index;
+}
+
+int EobCoreEngine::clickedSceneThrowItem(Button *button) {
+	if (!_itemInHand)
+		return button->index;
+
+	if (launchObject(_updateCharNum, _itemInHand, _currentBlock, _dropItemDirIndex[(_currentDirection << 2) + button->arg], _currentDirection, _items[_itemInHand].type)) {
+		setHandItem(0);
+		_sceneUpdateRequired = true;
+	}
+
+	return button->index;
+}
+
+int EobCoreEngine::clickedSceneSpecial(Button *button) {
+	_clickedSpecialFlag = 0x40;
+	return specialWallAction(calcNewBlockPosition(_currentBlock, _currentDirection), _currentDirection);
+}
+
+int EobCoreEngine::clickedSpellbookAbort(Button *button) {
+	_updateFlags = 0;
+	_screen->copyRegion(0, 0, 64, 121, 112, 56, 10, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	gui_drawCompass(true);
+	gui_toggleButtons();
+	return button->index;
+}
+
+int EobCoreEngine::clickedSpellbookScroll(Button *button) {
+	if (_openBookAvailableSpells[_openBookSpellLevel * 10] > 0) {
+		_openBookSpellListOffset ^= 6;
+		_openBookSpellSelectedItem = 0;
+	} else {
+		_openBookSpellListOffset = 6;
+	}
+
+	_characters[_openBookChar].slotStatus[2] = _openBookSpellSelectedItem;
+	_characters[_openBookChar].slotStatus[4] = _openBookSpellListOffset;
+
+	gui_drawSpellbook();
+
+	return button->index;
+}
+
+int EobCoreEngine::clickedUnk(Button *button) {
+	return button->index;
+}
+
+void EobCoreEngine::gui_processCharPortraitClick(int index) {
+	if (index == _updateCharNum)
+		return;
+
+	int a = _updateCharNum;
+	_updateCharNum = index;
+
+	gui_drawCharPortraitWithStats(a);
+	gui_drawCharPortraitWithStats(index);
+}
+
+void EobCoreEngine::gui_processWeaponSlotClickLeft(int charIndex, int slotIndex) {
+	int itm = _characters[charIndex].inventory[slotIndex];
+	if (_items[itm].flags & 0x20)
+		return;
+
+	int ih = _itemInHand;
+	int t = _items[ih].type;
+	uint16 v = (ih) ? _itemTypes[t].invFlags : 0xffff;
+
+	if (v & _slotValidationFlags[slotIndex]) {
+		setHandItem(itm);
+		_characters[charIndex].inventory[slotIndex] = ih;
+		gui_drawCharPortraitWithStats(charIndex);
+	}
+
+	recalcArmorClass(charIndex);
+}
+
+void EobCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex) {
+	const char * const *strs = &_itemExtraStrings[_flags.gameID == GI_EOB1 ? 17 : (_flags.lang == Common::DE_DEU ? 26 : 22)];
+
+	if (!testCharacter(charIndex, 0x0d))
+		return;
+
+	uint16 itm = _characters[charIndex].inventory[slotIndex];
+	int wslot = slotIndex < 2 ? slotIndex : -1;
+
+	if (slotIndex < 2 && (!validateWeaponSlotItem(charIndex, slotIndex) || (!_currentControlMode && (_characters[charIndex].disabledSlots & (1 << slotIndex)))))
+		return;
+
+	if (!itemUsableByCharacter(charIndex, itm))
+		_txt->printMessage(strs[0], -1, _characters[charIndex].name);
+
+	if (!itm && slotIndex > 1)
+		return;
+
+	int8 tp = _items[itm].type;
+	int8 vl = _items[itm].value;
+	uint8 ep = _itemTypes[tp].extraProperties & 0x7f;
+
+	switch (ep) {
+		case 0:
+		case 16:
+			// Item automatically used when worn
+			_txt->printMessage(strs[1]);
+			break;
+
+		case 1:
+		case 2:
+		case 3:
+			// Weapons
+			if (!_currentControlMode)
+				useSlotWeapon(charIndex, slotIndex, itm);
+			break;
+
+		case 4:
+		case 8:
+		case 12:
+		case 13:
+		case 15:
+			// Item not used that way
+			_txt->printMessage(strs[2]);
+			break;
+
+		case 5:
+		case 6:
+			// Cleric holy symbol / mage spell book
+			if (!_currentControlMode)
+				useMagicBookOrSymbol(charIndex, ep == 6 ? 1 : 0);
+			break;
+
+		case 7:
+			// Food ration
+			/* don't do anything if mouse control is enabled */
+			//eatItemInHand(charIndex);
+			break;
+
+		case 10:
+			if (_flags.gameID == GI_EOB1)
+				vl += _clericSpellOffset;
+		case 9:
+			// Mage/Cleric Scroll
+			if (!_currentControlMode)
+				useMagicScroll(charIndex, vl, wslot);
+			break;
+
+		case 11:
+			// Letters, Notes, Maps
+			displayParchment(vl);
+			break;
+
+		case 14:
+			// Potion
+			usePotion(charIndex, wslot);
+			break;
+
+		case 18:
+			ep = ep;
+			break;
+
+		case 19:
+			// eob2 horn
+			ep = ep;
+			break;
+
+		case 20:
+			if (vl == 1)
+				inflictCharacterDamage(charIndex, 200);
+			else
+				useMagicScroll(charIndex, 55, wslot);
+			deleteInventoryItem(charIndex, wslot);
+			break;
+
+		default:
+			break;
+	}
+
+	if (ep == 1 && charIndex >= 2)
+		return;
+
+	_lastUsedItem = itm;
+	runLevelScript(calcNewBlockPosition(_currentBlock, _currentDirection), 0x100);
+	_lastUsedItem = 0;
+}
+
+void EobCoreEngine::gui_processInventorySlotClick(int slot) {
+	int itm = _characters[_updateCharNum].inventory[slot];
+	int ih = _itemInHand;
+	if (!validateInventorySlotForItem(ih, _updateCharNum, slot))
+		return;
+
+	if (slot == 16) {
+		if (ih) {
+			setItemPosition(&_characters[_updateCharNum].inventory[16], -2, ih, 0);
+			gui_drawInventoryItem(slot, 1, 0);
+			setHandItem(0);
+
+		} else {
+			itm = getQueuedItem(&_characters[_updateCharNum].inventory[16], 0, -1);
+			gui_drawInventoryItem(slot, 1, 0);
+			setHandItem(itm);
+		}
+
+	} else {
+		setHandItem(itm);
+		_characters[_updateCharNum].inventory[slot] = ih;
+		gui_drawInventoryItem(slot, 1, 0);
+		recalcArmorClass(_updateCharNum);
+	}
+}
+
+GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
+	_scrollUpFunctor = _scrollDownFunctor = BUTTON_FUNCTOR(GUI_Eob, this, 0);
+
+	_redrawButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawButtonCallback);
+	_redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawShadedButtonCallback);
+
+	_specialProcessButton = _backupButtonList = 0;
+	_flagsMouseLeft = _flagsMouseRight = _flagsModifier = 0;
+	_backupButtonList = 0;
+	_progress = 0;
+	_prcButtonUnk3 = 1;
+	_cflag = 0xffff;
+
+	_menuLineSpacing = 0;
+	_menuUnk1 = 0;
+	_menuLastInFlags = 0;
+	_menuCur = 0;
+	_menuNumItems = 0;
+}
+
+void GUI_Eob::processButton(Button *button) {
+	if (!button->data0Val1 && !button->data2Val1 && !button->data1Val1)
+		return;
+
+	if ((button->flags & 0x18) == 0x18)
+		return;
+
+	int sd = button->dimTableIndex;
+	const ScreenDim *dm = _screen->getScreenDim(sd);
+
+	int fx = button->x;
+	if (fx < 0)
+		fx += (dm->w << 3);
+
+	int sx = fx + (dm->sx << 3);
+
+	int fy = button->y;
+	if (fy < 0)
+		fy += dm->h;
+
+	int sy = fy + dm->sy;
+
+	uint16 fw = button->width;
+	uint16 fh = button->height;
+
+	uint8 col1 = button->data1Val1;
+	uint8 col2 = button->data1Val3;
+
+	int fx2 = sx + fw - 1;
+	int fy2 = sy + fh - 1;
+
+	if (button->flags2 & 1) {
+		if (button->data1Val1 == 1) {
+			if (button->data0Val1 == 1) {
+				_screen->drawShape(_screen->_curPage, button->data1ShapePtr, fx, fy, sd);
+			} else if (button->data0Val1 == 2) {
+				if (!(button->flags2 & 4))
+					_screen->printText((const char*) button->data1ShapePtr, sx, sy, col1, col2);
+			} else if (button->data0Val1 == 3) {
+				// nullsub (at least EOBII)
+			} else if (button->data0Val1 == 4) {
+				if (button->data1Callback)
+					(*button->data1Callback.get())(button);
+			}
+		} else if (button->data1Val1 == 2) {
+			if (!(button->flags2 & 4))
+				_screen->drawBox(sx, sy, fx2, fy2, col1);
+		} else if (button->data1Val1 == 3) {
+			// nullsub (at least EOBII)
+		} else if (button->data1Val1 == 4) {
+			if (button->data1Callback)
+				(*button->data1Callback.get())(button);
+		}
+	}
+
+	if (button->flags2 & 4) {
+		if (button->data2Val1 == 1) {
+			if (button->data0Val1 == 1) {
+				_screen->drawShape(_screen->_curPage, button->data2ShapePtr, fx, fy, sd);
+			} else if (button->data0Val1 == 2) {
+				if (button->flags2 & 1)
+					_screen->printText((const char*) button->data2ShapePtr, sx, sy, button->data3Val2, button->data3Val3);
+				else
+					_screen->printText((const char*) button->data2ShapePtr, sx, sy, button->data2Val2, button->data2Val3);
+			} else if (button->data0Val1 == 3) {
+				// nullsub (at least EOBII)
+			} else if (button->data0Val1 == 4) {
+				if (button->data2Callback)
+					(*button->data2Callback.get())(button);
+			}
+		} else if (button->data2Val1 == 2) {
+			_screen->drawBox(sx, sy, fx2, fy2, (button->flags2 & 1) ? button->data3Val2 : button->data2Val2);
+		} else if (button->data2Val1 == 3) {
+			// nullsub (at least EOBII)
+		} else if (button->data2Val1 == 4) {
+			if (button->data2Callback)
+				(*button->data2Callback.get())(button);
+		}
+	}
+
+	if (!(button->flags2 & 5)) {
+		if (button->data0Val1 == 1) {
+			_screen->drawShape(_screen->_curPage, button->data0ShapePtr, fx, fy, sd);
+		} else if (button->data0Val1 == 2) {
+			_screen->printText((const char*) button->data0ShapePtr, sx, sy, button->data0Val2, button->data0Val3);
+		} else if (button->data0Val1 == 3) {
+			// nullsub (at least EOBII)
+		} else if (button->data0Val1 == 4) {
+			if (button->data0Callback)
+				(*button->data0Callback.get())(button);
+		} else if (button->data0Val1 == 5) {
+			_screen->drawBox(sx, sy, fx2, fy2, button->data0Val2);
+		} else {
+			if (!button->data0Val1) {
+				if(button->data1Val1 == 2 || button->data2Val1 == 2) {
+					_screen->drawBox(sx, sy, fx2, fy2, button->data0Val2);
+				} else {
+					// nullsub (at least EOBII)
+				}
+			}
+		}
+	}
+}
+
+int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8 mouseWheel) {
+	_progress = 0;
+	uint16 in = inputFlags & 0xff;
+	uint16 buttonReleaseFlag = 0;
+	bool clickEvt = false;
+
+	_flagsMouseLeft = (_vm->_mouseClick == 1) ? 2 : 4;
+	_flagsMouseRight = (_vm->_mouseClick == 2) ? 2 : 4;
+	_vm->_mouseClick = 0;
+
+	if (in >= 199 && in <= 202) {
+		buttonReleaseFlag = (inputFlags & 0x800) ? 3 : 1;
+		if (in < 201)
+			_flagsMouseLeft = buttonReleaseFlag;
+		else
+			_flagsMouseRight = buttonReleaseFlag;
+
+		////////////////////////////
+		if (!buttonList && !(inputFlags & 0x800))
+			return inputFlags & 0xff;
+		////////////////////////////
+
+		inputFlags = 0;
+		clickEvt = true;
+	} else {
+		inputFlags &= 0xff;
+	}
+
+	uint16 result = 0;
+	bool runLoop = true;
+
+	if (!buttonList)
+		return inputFlags;
+
+	if (_vm->_buttonListChanged || (buttonList != _backupButtonList)) {
+		_backupButtonList = buttonList;
+		_flagsModifier = 0;
+
+		while (runLoop) {
+			processButton(buttonList);
+			_flagsModifier |= (buttonList->flags & 0xAA04);
+
+			// UNUSED
+			//if (buttonList->flags2 & 0x20) {
+				// if (_processButtonListExtraCallback)
+				//	this->*_processButtonListExtraCallback(buttonList);
+			//}
+
+			if (buttonList->nextButton)
+				buttonList = buttonList->nextButton;
+			else
+				runLoop = false;
+		}
+
+		_vm->_buttonListChanged = false;
+
+		_specialProcessButton = 0;
+		_prcButtonUnk3 = 1;
+		_cflag = 0xffff;
+	}
+
+	int sd = 0;
+	const ScreenDim *dm = _screen->getScreenDim(sd);
+
+	int x1 = dm->sx << 3;
+	int y1 = dm->sy;
+	int w1 = dm->w << 3;
+	int h1 = dm->h;
+
+	uint16 v8 = 0;
+	uint16 v18 = 0;
+	uint16 v16 = 0;
+
+	if (_specialProcessButton)
+		buttonList = _specialProcessButton;
+
+	while (runLoop) {
+		if (buttonList->flags & 8) {
+			buttonList = buttonList->nextButton;
+			runLoop = buttonList ? true : false;
+			continue;
+		}
+
+		int vc = 0;
+		int v6 = 0;
+		uint16 iFlag = buttonList->index | 0x8000;
+		uint16 flgs2 = buttonList->flags2;
+		uint16 flgs = buttonList->flags;
+
+		if (flgs2 & 1)
+			flgs2 |= 8;
+		else
+			flgs2 &= 0xfff7;
+
+		if (flgs2 & 4)
+			flgs2 |= 0x10;
+		else
+			flgs2 &= 0xffef;
+
+		uint16 vL = 0;
+		uint16 vR = 0;
+
+		if (inputFlags) {
+			if (buttonList->keyCode == in) {
+				_progress = 1;
+				_flagsMouseLeft = 1;
+				flgs2 ^= 1;
+				result = iFlag;
+				v6 = 1;
+			} else if (buttonList->keyCode2 == in) {
+				_progress = 2;
+				_flagsMouseRight = 1;
+				result = iFlag;
+				v6 = 1;
+			}
+		} else if (_flagsModifier || clickEvt) {
+			vL = flgs & 0xf00;
+			vR = flgs & 0xf000;
+
+			if (_prcButtonUnk3) {
+				if (sd != buttonList->dimTableIndex) {
+					sd = buttonList->dimTableIndex;
+					dm = _screen->getScreenDim(sd);
+					x1 = dm->sx << 3;
+					y1 = dm->sy;
+					w1 = dm->w << 3;
+					h1 = dm->h;
+				}
+
+				int x2 = x1;
+				if (buttonList->x < 0)
+					x2 += w1;
+				x2 += buttonList->x;
+
+				int y2 = y1;
+				if (buttonList->y < 0)
+					y2 += h1;
+				y2 += buttonList->y;
+
+				if (_vm->_mouseX >= x2 && _vm->_mouseX <= (x2 + buttonList->width) && _vm->_mouseY >= y2 && _vm->_mouseY <= (y2 + buttonList->height)) {
+					flgs2 |= 2;
+
+					if (vL) {
+						switch (_flagsMouseLeft - 1) {
+						case 0:
+							v18 = 1;
+
+							if ((flgs & 4) && buttonList->data2Val1) {
+								flgs2 |= 4;
+								vc = 1;
+							} else {
+								flgs2 &= 0xfffb;
+							}
+
+							if (flgs & 0x100) {
+								v6 = 1;
+								if (!(flgs & 1)) {
+									flgs2 ^= 1;
+									result = iFlag;
+								}
+							}
+
+							if (flgs & 0x40) {
+								_specialProcessButton = buttonList;
+								v8 = 1;
+							}
+
+							_cflag = flgs;
+							break;
+
+						case 1:
+							if (flgs != _cflag)
+								break;
+
+							if ((flgs & 4) && buttonList->data2Val1) {
+								flgs2 |= 4;
+								vc = 1;
+							} else {
+								flgs2 &= 0xfffb;
+							}
+
+							if (!(flgs & 0x200))
+								break;
+
+							v6 = 1;
+
+							if (flgs & 1)
+								break;
+
+							flgs2 |= 1;
+							result = iFlag;
+							break;
+
+						case 2:
+							if (_cflag != flgs)
+								break;
+
+							if (flgs & 0x400) {
+								v6 = 1;
+								if (flgs & 1) {
+									flgs2 ^= 1;
+									result = iFlag;
+								}
+							}
+
+							if ((flgs & 2) && (flgs2 & 1))
+								flgs2 &= 0xfffe;
+							break;
+
+						case 3:
+							if ((flgs & 4) || (!buttonList->data2Val1))
+								flgs2 &= 0xfffb;
+							else
+								flgs2 |= 4;
+
+							if (flgs & 0x800) {
+								v6 = 1;
+								break;
+							}
+
+							if ((flgs & 2) && (flgs2 & 1))
+								flgs2 &= 0xfffe;
+							break;
+
+						default:
+							break;
+						}
+					}
+
+					if (vR && !v6 && !vc) {
+						switch (_flagsMouseRight - 1) {
+						case 0:
+							v18 = 1;
+
+							if ((flgs & 4) && buttonList->data2Val1)
+								flgs2 |= 4;
+							else
+								flgs2 &= 0xfffb;
+
+							if (flgs & 0x1000) {
+								v6 = 1;
+								if (!(flgs & 1)) {
+									flgs2 ^= 1;
+									result = iFlag;
+								}
+							}
+
+							if (flgs & 0x40) {
+								_specialProcessButton = buttonList;
+								v8 = 1;
+							}
+
+							_cflag = flgs;
+							break;
+
+						case 1:
+							if (flgs != _cflag)
+								break;
+
+							if ((flgs & 4) && buttonList->data2Val1)
+								flgs2 |= 4;
+							else
+								flgs2 &= 0xfffb;
+
+							if (!(flgs & 0x2000))
+								break;
+
+							v6 = 1;
+
+							if (flgs & 1)
+								break;
+
+							flgs2 |= 1;
+							result = iFlag;
+							break;
+						case 2:
+							if (_cflag != flgs)
+								break;
+
+							if (flgs & 0x4000) {
+								v6 = 1;
+								if (flgs & 1) {
+									flgs2 ^= 1;
+									result = iFlag;
+								}
+							}
+
+							if ((flgs & 2) && (flgs2 & 1))
+								flgs2 &= 0xfffe;
+							break;
+
+						case 3:
+							if ((flgs & 4) || (!buttonList->data2Val1))
+								flgs2 &= 0xfffb;
+							else
+								flgs2 |= 4;
+
+							if (flgs & 0x8000) {
+								v6 = 1;
+								break;
+							}
+
+							if ((flgs & 2) && (flgs2 & 1))
+								flgs2 &= 0xfffe;
+							break;
+
+						default:
+							break;
+						}
+					}
+				} else { // if (_vm->_mouseX >= x2 && _vm->_mouseX <= (x2 + buttonList->width)....)
+					flgs2 &= 0xfff9;
+
+					if ((flgs & 0x40) && (!(flgs & 0x80)) && _specialProcessButton && !v8) {
+						static const uint16 flagsTable[] = { 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000 };
+
+						if (vL) {
+							v16 = flagsTable[_flagsMouseLeft - 1];
+							if (v16 & flgs)
+								v6 = 1;
+						}
+
+						if (vR && !v6) {
+							v16 = flagsTable[_flagsMouseRight + 3];
+							if (v16 & flgs)
+								v6 = 1;
+						}
+
+						if (!v6) {
+							_specialProcessButton = 0;
+							_prcButtonUnk3 = 1;
+						}
+					}
+
+					if ((flgs & 2) && (flgs2 & 1))
+						flgs2 &= 0xfffe;
+				} // end if (_vm->_mouseX >= x2 && _vm->_mouseX <= (x2 + buttonList->width)....)
+			} // end if (_prcButtonUnk3)
+		} // end if (_flagsModifier || clickEvt)
+
+		buttonList->flags = flgs;
+		buttonList->flags2 = flgs2;
+
+		bool f21 = (flgs2 & 8) ? true : false;
+		bool f22 = (flgs2 & 1) ? true : false;
+		bool f23 = (flgs2 & 0x10) ? true : false;
+		bool f24 = (flgs2 & 4) ? true : false;
+
+		if (f21 != f22 || f23 != f24)
+			processButton(buttonList);
+
+		if (v6 && buttonList->buttonCallback)
+			runLoop = ((*buttonList->buttonCallback.get())(buttonList)) ? false : true;
+
+		if ((flgs2 & 2) && (flgs & 0x20))
+			runLoop = false;
+
+		if (_specialProcessButton && ((vL && _flagsMouseLeft == 3) || (vR && _flagsMouseRight == 3))) {
+			_specialProcessButton = 0;
+			_prcButtonUnk3 = 1;
+			runLoop = false;
+		}
+
+		if (_specialProcessButton && !v8)
+			runLoop = false;
+
+		buttonList = buttonList->nextButton;
+		if (!buttonList)
+			runLoop = false;
+	};
+
+	if ((_flagsMouseLeft == 1 || _flagsMouseRight == 1) && !v18)
+		_cflag = 0xffff;
+
+	if (!result)
+		result = inputFlags;
+
+	return result;
+}
+
+void GUI_Eob::setupMenu(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int unk, int lineSpacing) {
+	initMenuItemsMask(sd, maxItem, menuItemsMask, unk);
+
+	const ScreenDim *dm = _screen->getScreenDim(19 + sd);
+	int x = (_screen->_curDim->sx + dm->sx) << 3;
+	int y = _screen->_curDim->sy + dm->sy;
+
+	int v = getMenuItem(_menuCur, menuItemsMask, unk);
+
+	for (int i = 0; i < _menuNumItems; i++) {
+		int item = getMenuItem(i, menuItemsMask, unk);
+		int ty = y + i * (lineSpacing + _screen->getFontHeight());
+		_screen->printShadedText(strings[item], x, ty, dm->unkA, 0);
+		if (item == v)
+			_screen->printText(strings[item], x, ty, dm->unkC, 0);
+	}
+
+	_screen->updateScreen();
+	_menuLineSpacing = lineSpacing;
+	_menuUnk1 = 0;
+	_menuLastInFlags = 0;
+	_vm->removeInputTop();
+}
+
+int GUI_Eob::handleMenu(int sd, const char *const *strings, void *b, int32 menuItemsMask, int unk) {
+	const ScreenDim *dm = _screen->getScreenDim(19 + sd);
+	int h = _menuNumItems - 1;
+	int currentItem = _menuCur % _menuNumItems;
+	int newItem = currentItem;
+	int result = -1;
+	int lineH = (_menuLineSpacing + _screen->getFontHeight());
+	int lineS1 = _menuLineSpacing >> 1;
+	int x = (_screen->_curDim->sx + dm->sx) << 3;
+	int y = _screen->_curDim->sy + dm->sy;
+
+	int inFlag = _vm->checkInput(0, false, 0) & 0x8ff;
+	_vm->removeInputTop();
+	Common::Point mousePos = _vm->getMousePos();
+
+	int x1 = (_screen->_curDim->sx << 3) + (dm->sx * _screen->getFontWidth());
+	int y1 = _screen->_curDim->sy + dm->sy - lineS1;
+	int x2 = x1 + (dm->w * _screen->getFontWidth()) - 1;
+	int y2 = y1 + _menuNumItems * lineH - 1;
+	if (_vm->posWithinRect(mousePos.x, mousePos.y, x1, y1, x2, y2))
+		newItem = (mousePos.y - y1) / lineH;
+
+	if (inFlag == 199 || inFlag == 201) {
+		if (_vm->posWithinRect(_vm->_mouseX, _vm->_mouseY, x1, y1, x2, y2))
+			result = newItem = (_vm->_mouseY - y1) / lineH;
+	} else if (inFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inFlag == _vm->_keyMap[Common::KEYCODE_KP5]) {
+		result = newItem;
+	} else if (inFlag == _vm->_keyMap[Common::KEYCODE_HOME] || inFlag == _vm->_keyMap[Common::KEYCODE_KP7] || inFlag == _vm->_keyMap[Common::KEYCODE_PAGEUP] || inFlag == _vm->_keyMap[Common::KEYCODE_KP9]) {
+		newItem = 0;
+	} else if (inFlag == _vm->_keyMap[Common::KEYCODE_END] || inFlag == _vm->_keyMap[Common::KEYCODE_KP1] || inFlag == _vm->_keyMap[Common::KEYCODE_PAGEDOWN] || inFlag == _vm->_keyMap[Common::KEYCODE_KP3]) {
+		newItem = h;
+	} else if (inFlag == _vm->_keyMap[Common::KEYCODE_UP] || inFlag == _vm->_keyMap[Common::KEYCODE_KP8]) {
+		if (--newItem < 0)
+			newItem = h;
+	} else if (inFlag == _vm->_keyMap[Common::KEYCODE_DOWN] || inFlag == _vm->_keyMap[Common::KEYCODE_KP2]) {
+		if (++newItem > h)
+			newItem = 0;
+	} else {
+		_menuLastInFlags = inFlag;
+	}
+
+	if (newItem != currentItem) {
+		_screen->printText(strings[getMenuItem(currentItem, menuItemsMask, unk)], x, y + currentItem * lineH , dm->unkA, 0);
+		_screen->printText(strings[getMenuItem(newItem,  menuItemsMask, unk)], x, y + newItem * lineH , dm->unkC, 0);
+		_screen->updateScreen();
+	}
+
+	if (result != -1) {
+		result = getMenuItem(result, menuItemsMask, unk);
+		menuFlashSelection(strings[result], x, y + newItem * lineH, dm->unkA, dm->unkC, 0);
+	}
+
+	_menuCur = newItem;
+
+	return result;
+}
+
+void GUI_Eob::initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int unk) {
+	if (menuItemsMask == -1) {
+		_menuNumItems = _screen->getScreenDim(19 + menuId)->h;
+		_menuCur = _screen->getScreenDim(19 + menuId)->unk8;
+		return;
+	}
+
+	_menuNumItems = 0;
+
+	for (int i = 0; i < maxItem; i++) {
+		if (menuItemsMask & (1 << (i + unk)))
+			_menuNumItems++;
+	}
+
+	_menuCur = 0;
+}
+
+int GUI_Eob::getMenuItem(int index, int32 menuItemsMask, int unk) {
+	if (menuItemsMask == -1)
+		return index;
+
+	int res = 0;
+	int i = index;
+
+	for (; i; res++) {
+		if (menuItemsMask & (1 << (res + unk)))
+			i--;
+	}
+
+	while (!(menuItemsMask & (1 << (res + unk))))
+		res++;
+
+	return res;
+}
+
+void GUI_Eob::menuFlashSelection(const char *str, int x, int y, int color1, int color2, int color3) {
+	for (int i = 0; i < 3; i++) {
+		_screen->printText(str, x, y, color2, color3);
+		_screen->updateScreen();
+		_vm->_system->delayMillis(32);
+		_screen->printText(str, x, y, color1, color3);
+		_screen->updateScreen();
+		_vm->_system->delayMillis(32);
+	}
+}
+
+int GUI_Eob::getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor) {
+	uint8 cursorState = 1;
+	char sufx[] = " ";
+
+	int len = strlen(dest);
+	if (len > destMaxLen) {
+		len = destMaxLen;
+		dest[destMaxLen] = 0;
+	}
+
+	int pos = len;
+	if (len >= destMaxLen)
+		pos--;
+
+	_screen->copyRegion((x - 1) << 3, y, 0, 191, (destMaxLen + 2) << 3, 9, 0, 2, Screen::CR_NO_P_CHECK);
+	_screen->printShadedText(dest, x << 3, y, textColor1, textColor2);
+
+	uint32 next = _vm->_system->getMillis() + 2 * _vm->_tickLength;
+	sufx[0] = (pos < len) ? dest[pos] : 32;
+	_screen->printText(sufx, (x + pos) << 3, y, textColor1, cursorColor);
+
+	int in = 0;
+
+	do {
+		in = 0;
+		_keyPressed.reset();
+
+		while (!in) {
+			if (next <= _vm->_system->getMillis()) {
+				if (cursorState) {
+					_screen->copyRegion((pos + 1) << 3, 191, (x + pos) << 3, y, 8, 9, 2, 0, Screen::CR_NO_P_CHECK);
+					_screen->printShadedText(sufx, (x + pos) << 3, y, textColor1, textColor2);
+				} else {
+					_screen->printText(sufx, (x + pos) << 3, y, textColor1, cursorColor);
+				}
+
+				_screen->updateScreen();
+				cursorState ^= 1;
+				next = _vm->_system->getMillis() + 2 * _vm->_tickLength;
+			}
+
+			_vm->updateInput();
+			for (Common::List<KyraEngine_v1::Event>::const_iterator evt = _vm->_eventList.begin(); evt != _vm->_eventList.end(); ++evt) {
+				if (evt->event.type == Common::EVENT_KEYDOWN) {
+					_keyPressed = evt->event.kbd;
+					in = _keyPressed.ascii;
+				}
+			}
+			_vm->removeInputTop();
+		}
+
+		if (_keyPressed.keycode == Common::KEYCODE_BACKSPACE) {
+			if (pos >= len && len > 0) {
+				dest[--len] = 0;
+				pos--;
+
+			} else if (pos > 0) {
+				for (int i = pos; i < destMaxLen; i++)
+					dest[i - 1] = dest[i];
+				dest[--len] = 0;
+				pos--;
+			}
+
+		} else if (_keyPressed.keycode == Common::KEYCODE_LEFT || _keyPressed.keycode == Common::KEYCODE_KP4) {
+			if (pos > 0)
+				pos--;
+
+		} else if (_keyPressed.keycode == Common::KEYCODE_RIGHT || _keyPressed.keycode == Common::KEYCODE_KP6) {
+			if (pos < len && pos < (destMaxLen - 1))
+				pos++;
+
+		} else if (in > 31 && in < 126) {
+			if (!(in == 32 && pos == 0)) {
+				if (in >= 97 && in <= 122)
+					in -=32;
+
+				if (pos < len) {
+					for (int i = destMaxLen - 1; i >= pos; i--)
+						dest[i + 1] = dest[i];
+
+					dest[pos++] = in;
+
+					if (len == destMaxLen)
+						dest[len] = 0;
+
+				} else {
+					if (pos == destMaxLen) {
+						pos--;
+						len--;
+					}
+
+					dest[pos++] = in;
+					dest[pos] = 0;
+				}
+
+				if (++len > destMaxLen)
+					len = destMaxLen;
+
+				if (pos > (destMaxLen - 1))
+					pos = (destMaxLen - 1);
+			}
+		}
+
+		_screen->copyRegion(0, 191, (x - 1) << 3, y, (destMaxLen + 2) << 3, 9, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->printShadedText(dest, x << 3, y, textColor1, textColor2);
+		sufx[0] = (pos < len) ? dest[pos] : 32;
+
+		if (cursorState)
+			_screen->printText(sufx, (x + pos) << 3, y, textColor1, cursorColor);
+		else
+			_screen->printShadedText(sufx, (x + pos) << 3, y, textColor1, textColor2);
+		_screen->updateScreen();
+
+	} while (_keyPressed.keycode != Common::KEYCODE_RETURN && _keyPressed.keycode != Common::KEYCODE_ESCAPE);
+
+	return _keyPressed.keycode == Common::KEYCODE_ESCAPE ? -1 : len;
+}
+
+#endif // ENABLE_EOB
+
+}	// End of namespace Kyra
+
+#endif // defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
new file mode 100644
index 0000000000..82e9476fe0
--- /dev/null
+++ b/engines/kyra/gui_eob.h
@@ -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.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#ifndef KYRA_GUI_EOB_H
+#define KYRA_GUI_EOB_H
+
+#include "kyra/gui.h"
+
+#ifdef ENABLE_EOB
+
+namespace Kyra {
+
+class DarkMoonEngine;
+class Screen_Eob;
+
+class GUI_Eob : public GUI {
+	friend class EobCoreEngine;
+	friend class CharacterGenerator;
+public:
+	GUI_Eob(EobCoreEngine *vm);
+
+	void initStaticData() {}
+
+	// button specific
+	void processButton(Button *button);
+	int processButtonList(Button *buttonList, uint16 inputFlags, int8 mouseWheel);
+
+	int redrawShadedButtonCallback(Button *button) { return 0; }
+	int redrawButtonCallback(Button *button) { return 0; }
+
+	void setupMenu(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int unk, int lineSpacing);
+	int handleMenu(int sd, const char *const *strings, void *b, int32 menuItemsMask, int unk);
+	int getMenuItem(int index, int32 menuItemsMask, int unk);
+	void menuFlashSelection(const char *str, int x, int y, int color1, int color2, int color3);
+
+	int getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor);
+
+	//int runMenu(Menu &menu);
+
+	// utilities for thumbnail creation
+	void createScreenThumbnail(Graphics::Surface &dst) {}
+
+private:
+	void initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int unk);
+
+	//void backupPage0();
+	//void restorePage0();
+
+	//void setupSavegameNames(Menu &menu, int num);
+	//void printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 flags);
+
+	//int getMenuCenterStringX(const char *str, int x1, int x2);
+
+	int getInput();
+
+	Button *getButtonListData() { return _menuButtons; }
+	Button *getScrollUpButton() { return &_scrollUpButton; }
+	Button *getScrollDownButton() { return &_scrollDownButton; }
+
+	Button::Callback getScrollUpButtonHandler() const { return _scrollUpFunctor; }
+	Button::Callback getScrollDownButtonHandler() const { return _scrollDownFunctor; }
+
+	uint8 defaultColor1() const { return 0xFE; }
+	uint8 defaultColor2() const { return 0x00; }
+
+	const char *getMenuTitle(const Menu &menu) { return 0; }
+	const char *getMenuItemTitle(const MenuItem &menuItem) { return 0; }
+	const char *getMenuItemLabel(const MenuItem &menuItem) { return 0; }
+
+	Button _menuButtons[10];
+	Button _scrollUpButton;
+	Button _scrollDownButton;
+	//Menu _mainMenu, _gameOptions, _audioOptions, _choiceMenu, _loadMenu, _saveMenu, _deleteMenu, _savenameMenu, _deathMenu;
+	//Menu *_currentMenu, *_lastMenu, *_newMenu;
+	//int _menuResult;
+	//char *_saveDescription;
+
+	EobCoreEngine *_vm;
+	Screen_Eob *_screen;
+
+	bool _pressFlag;
+
+	Button *_specialProcessButton;
+	Button *_backupButtonList;
+	uint16 _flagsMouseLeft;
+	uint16 _flagsMouseRight;
+	uint16 _flagsModifier;
+	uint16 _progress;
+	uint16 _prcButtonUnk3; /// ALWAYS 1?? REMOVE ??
+	uint16 _cflag;
+
+	Button::Callback _scrollUpFunctor;
+	Button::Callback _scrollDownFunctor;
+
+	int _menuLineSpacing;
+	int _menuUnk1;
+	int _menuLastInFlags;
+
+	int _menuCur;
+	int _menuNumItems;
+};
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
+
+#endif
+
+#endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index 5bef3cd5b5..08ce0bdadd 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -32,6 +32,7 @@
 #include "common/savefile.h"
 #include "common/system.h"
 #include "common/config-manager.h"
+
 #include "graphics/scaler.h"
 
 #include "base/version.h"
@@ -213,9 +214,9 @@ void LoLEngine::gui_displayCharInventory(int charNum) {
 		}
 
 		if (_flags.use16ColorMode)
-			gui_drawBarGraph(154, 66 + i * 8, 34, 5, b, e, 0x88, 0);
+			gui_drawHorizontalBarGraph(154, 66 + i * 8, 34, 5, b, e, 0x88, 0);
 		else
-			gui_drawBarGraph(154, 64 + i * 10, 34, 5, b, e, 132, 0);
+			gui_drawHorizontalBarGraph(154, 64 + i * 10, 34, 5, b, e, 132, 0);
 	}
 
 	_screen->drawClippedLine(14, 120, 194, 120, 1);
@@ -343,31 +344,6 @@ void LoLEngine::gui_drawCharInventoryItem(int itemIndex) {
 		_screen->drawShape(_screen->_curPage, getItemIconShapePtr(i), x + 1, y + 1, 0, 0);
 }
 
-void LoLEngine::gui_drawBarGraph(int x, int y, int w, int h, int32 cur, int32 max, int col1, int col2) {
-	if (max < 1)
-		return;
-	if (cur < 0)
-		cur = 0;
-
-	int32 e = MIN(cur, max);
-
-	if (!--w)
-		return;
-	if (!--h)
-		return;
-
-	int32 t = (e * w) / max;
-
-	if (!t && e)
-		t++;
-
-	if (t)
-		_screen->fillRect(x, y, x + t - 1, y + h, col1);
-
-	if (t < w && col2)
-		_screen->fillRect(x + t, y, x + w, y + h, col2);
-}
-
 void LoLEngine::gui_drawAllCharPortraitsWithStats() {
 	int numChars = countActiveCharacters();
 	if (!numChars)
@@ -460,17 +436,6 @@ void LoLEngine::gui_drawCharPortraitWithStats(int charNum) {
 	_screen->setFont(tmpFid);
 }
 
-void LoLEngine::gui_drawBox(int x, int y, int w, int h, int frameColor1, int frameColor2, int fillColor) {
-	w--; h--;
-	if (fillColor != -1)
-		_screen->fillRect(x + 1, y + 1, x + w - 1, y + h - 1, fillColor);
-
-	_screen->drawClippedLine(x + 1, y, x + w, y, frameColor2);
-	_screen->drawClippedLine(x + w, y, x + w, y + h - 1, frameColor2);
-	_screen->drawClippedLine(x, y, x, y + h, frameColor1);
-	_screen->drawClippedLine(x, y + h, x + w, y + h, frameColor1);
-}
-
 void LoLEngine::gui_drawCharFaceShape(int charNum, int x, int y, int pageNum) {
 	if (_characters[charNum].curFaceFrame < 7 && _characters[charNum].tempFaceFrame)
 		_characters[charNum].curFaceFrame = _characters[charNum].tempFaceFrame;
@@ -853,19 +818,6 @@ void LoLEngine::gui_triggerEvent(int eventType) {
 	_preserveEvents = true;
 }
 
-void LoLEngine::removeInputTop() {
-	if (!_eventList.empty()) {
-		if (_eventList.begin()->event.type == Common::EVENT_LBUTTONDOWN)
-			_gui->_mouseClick = 1;
-		else if (_eventList.begin()->event.type == Common::EVENT_RBUTTONDOWN)
-			_gui->_mouseClick = 2;
-		else
-			_gui->_mouseClick = 0;
-
-		_eventList.erase(_eventList.begin());
-	}
-}
-
 void LoLEngine::gui_enableDefaultPlayfieldButtons() {
 	gui_resetButtonList();
 	gui_initButtonsFromList(_buttonList1);
@@ -911,19 +863,6 @@ void LoLEngine::gui_enableCharInventoryButtons(int charNum) {
 	gui_setFaceFramesControlButtons(21, 0);
 }
 
-void LoLEngine::gui_resetButtonList() {
-	for (uint i = 0; i < ARRAYSIZE(_activeButtonData); ++i)
-		_activeButtonData[i].nextButton = 0;
-
-	gui_notifyButtonListChanged();
-	_activeButtons = 0;
-}
-
-void LoLEngine::gui_initButtonsFromList(const int16 *list) {
-	while (*list != -1)
-		gui_initButton(*list++);
-}
-
 void LoLEngine::gui_setFaceFramesControlButtons(int index, int xOffs) {
 	int c = countActiveCharacters();
 	for (int i = 0; i < c; i++)
@@ -1009,14 +948,6 @@ void LoLEngine::gui_initButton(int index, int x, int y, int val) {
 	b->buttonCallback = _buttonCallbacks[index];
 }
 
-void LoLEngine::gui_notifyButtonListChanged() {
-	if (_gui) {
-		if (!_gui->_buttonListChanged && !_preserveEvents)
-			removeInputTop();
-		_gui->_buttonListChanged = true;
-	}
-}
-
 int LoLEngine::clickedUpArrow(Button *button) {
 	if (button->arg && !_floatingCursorsEnabled)
 		return 0;
@@ -1333,7 +1264,6 @@ int LoLEngine::clickedExitCharInventory(Button *button) {
 int LoLEngine::clickedSceneDropItem(Button *button) {
 	static const uint8 offsX[] = { 0x40, 0xC0, 0x40, 0xC0 };
 	static const uint8 offsY[] = { 0x40, 0x40, 0xC0, 0xC0 };
-	static const uint8 dirIndex[] = { 0, 1, 2, 3, 1, 3, 0, 2, 3, 2, 1, 0, 2, 0, 3, 1 };
 
 	if ((_updateFlags & 1) || !_itemInHand)
 		return 0;
@@ -1348,7 +1278,7 @@ int LoLEngine::clickedSceneDropItem(Button *button) {
 
 	uint16 x = 0;
 	uint16 y = 0;
-	int i = dirIndex[(_currentDirection << 2) + button->arg];
+	int i = _dropItemDirIndex[(_currentDirection << 2) + button->arg];
 
 	calcCoordinates(x, y, block, offsX[i], offsY[i]);
 	setItemPosition(_itemInHand, x, y, 0, 1);
@@ -1917,9 +1847,7 @@ GUI_LoL::GUI_LoL(LoLEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 
 	_specialProcessButton = _backUpButtonList = 0;
 	_flagsModifier = 0;
-	_mouseClick = 0;
 	_sliderSfx = 11;
-	_buttonListChanged = false;
 	_savegameList = 0;
 	_savegameListSize = 0;
 }
@@ -2015,18 +1943,18 @@ int GUI_LoL::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseW
 	if (!buttonList)
 		return inputFlag & 0x7FFF;
 
-	if (_backUpButtonList != buttonList || _buttonListChanged) {
+	if (_backUpButtonList != buttonList || _vm->_buttonListChanged) {
 		_specialProcessButton = 0;
 
 		_flagsModifier = 0;
-		if (_mouseClick == 1)
+		if (_vm->_mouseClick == 1)
 			_flagsModifier |= 0x200;
-		if (_mouseClick == 2)
+		if (_vm->_mouseClick == 2)
 			_flagsModifier |= 0x2000;
-		_mouseClick = 0;
+		_vm->_mouseClick = 0;
 
 		_backUpButtonList = buttonList;
-		_buttonListChanged = false;
+		_vm->_buttonListChanged = false;
 
 		while (buttonList) {
 			processButton(buttonList);
diff --git a/engines/kyra/gui_lol.h b/engines/kyra/gui_lol.h
index af487402f6..9c0c4e2bfe 100644
--- a/engines/kyra/gui_lol.h
+++ b/engines/kyra/gui_lol.h
@@ -162,9 +162,7 @@ private:
 
 	Button *_specialProcessButton;
 	Button *_backUpButtonList;
-	bool _buttonListChanged;
 	uint16 _flagsModifier;
-	uint8 _mouseClick;
 
 	int _savegameOffset;
 	int _sliderSfx;
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
new file mode 100644
index 0000000000..4f6982abff
--- /dev/null
+++ b/engines/kyra/items_eob.cpp
@@ -0,0 +1,614 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#include "kyra/eobcommon.h"
+#include "kyra/resource.h"
+#include "kyra/sound.h"
+
+namespace Kyra {
+
+void EobCoreEngine::loadItemDefs() {
+	Common::SeekableReadStream *s = _res->createReadStream("item.dat");
+	_numItems = s->readUint16LE();
+
+	for (int i = 0; i < 600; i++)
+		_items[i].block = -1;
+
+	for (int i = 0; i < _numItems; i++) {
+		_items[i].nameUnid = s->readByte();
+		_items[i].nameId = s->readByte();
+		_items[i].flags = s->readByte();
+		_items[i].icon = s->readSByte();
+		_items[i].type = s->readSByte();
+		_items[i].pos = s->readSByte();
+		_items[i].block = s->readSint16LE();
+		_items[i].next = s->readSint16LE();
+		_items[i].prev = s->readSint16LE();
+		_items[i].level = s->readSByte();
+		_items[i].value = s->readSByte();
+	}
+
+	_numItemNames = s->readUint16LE();
+	for (int i = 0; i < _numItemNames; i++)
+		s->read(_itemNames[i], 35);
+
+	delete s;
+
+	s = _res->createReadStream("itemtype.dat");
+	uint16 numTypes = s->readUint16LE();
+
+	_itemTypes = new EobItemType[numTypes];
+	memset(_itemTypes, 0, sizeof(EobItemType) * numTypes);
+
+	for (int i = 0; i < numTypes; i++) {
+		_itemTypes[i].invFlags = s->readUint16LE();
+		_itemTypes[i].handFlags = s->readUint16LE();
+		_itemTypes[i].armorClass = s->readSByte();
+		_itemTypes[i].allowedClasses = s->readSByte();
+		_itemTypes[i].requiredHands = s->readSByte();
+		_itemTypes[i].dmgNumDiceS = s->readSByte();
+		_itemTypes[i].dmgNumPipsS = s->readSByte();
+		_itemTypes[i].dmgIncS = s->readSByte();
+		_itemTypes[i].dmgNumDiceL = s->readSByte();
+		_itemTypes[i].dmgNumPipsL = s->readSByte();
+		_itemTypes[i].dmgIncL = s->readSByte();
+		_itemTypes[i].unk1 = s->readByte();
+		_itemTypes[i].extraProperties = s->readUint16LE();
+	}
+
+	delete s;
+}
+
+Kyra::Item EobCoreEngine::duplicateItem(Item itemIndex) {
+	EobItem *itm = &_items[itemIndex];
+
+	if (itm->block == -1)
+		return 0;
+
+	Item i = 1;
+	bool foundSlot = false;
+
+	for (; i < 600; i++) {
+		if (_items[i].block == -1) {
+			foundSlot = true;
+			break;
+		}
+	}
+
+	if (!foundSlot)
+		return 0;
+
+	memcpy(&_items[i], &_items[itemIndex], sizeof(EobItem));
+	return i;
+}
+
+void EobCoreEngine::setItemPosition(Item *itemQueue, int block, Item item, int pos) {
+	if (!item)
+		return;
+
+	EobItem *itm = &_items[item];
+	itm->pos = pos;
+	itm->block = block;
+	itm->level = block < 0 ? 0xff : _currentLevel;
+
+	if (!*itemQueue) {
+		*itemQueue = itm->next = itm->prev = item;
+	} else {
+		EobItem *itmQ = &_items[*itemQueue];
+		EobItem *itmQN = &_items[itmQ->next];
+		itm->prev = itmQN->prev;
+		itm->next = itmQ->next;
+		*itemQueue = itmQN->prev = itmQ->next = item;
+	}
+}
+
+void EobCoreEngine::createInventoryItem(EobCharacter *c, Item itemIndex, int itemValue, int preferedInventorySlot) {
+	if (itemIndex <= 0)
+		return;
+
+	itemIndex = duplicateItem(itemIndex);
+	_items[itemIndex].flags |= 0x40;
+
+	if (itemValue != -1)
+		_items[itemIndex].value = itemValue;
+
+	if (itemValue && ((_itemTypes[_items[itemIndex].type].extraProperties & 0x7f) < 4))
+		_items[itemIndex].flags |= 0x80;
+
+	if (c->inventory[preferedInventorySlot]) {
+		for (int i = 2; i < 16; i++) {
+			if (!c->inventory[i]) {
+				c->inventory[i] = itemIndex;
+				return;
+			}
+		}
+	} else {
+		c->inventory[preferedInventorySlot] = itemIndex;
+	}
+}
+
+int EobCoreEngine::deleteInventoryItem(int charIndex, int slot) {
+	int itm = (slot == -1) ? _itemInHand : _characters[charIndex].inventory[slot];
+	_items[itm].block = -1;
+
+	if (slot == -1) {
+		setHandItem(0);
+	} else {
+		_characters[charIndex].inventory[slot] = 0;
+
+		if (_currentControlMode == 1)
+			gui_drawInventoryItem(slot, 1, 0);
+
+		if (_currentControlMode == 0)
+			gui_drawCharPortraitWithStats(charIndex);
+	}
+
+	return _items[itm].value;
+}
+
+void EobCoreEngine::deleteBlockItem(uint16 block, int type) {
+	uint16 itm = _levelBlockProperties[block].drawObjects;
+	if (!itm)
+		return;	
+	
+	for (uint16 i2 = itm, i = 0; itm != i2 || !i; i++ ) {
+		if (type == _items[itm].type || type == -1) {
+			_items[itm].block = -1;
+			_items[itm].level = 0;
+			uint16 i3 = itm;
+			itm = _items[itm].prev;
+			_items[i3].prev = _items[i3].next = 0;
+		} else {
+			uint16 i3 = itm;
+			itm = _items[itm].prev;
+			_items[i3].prev = _items[i3].next = 0;
+			setItemPosition((Item*)&_levelBlockProperties[block].drawObjects, block, i3, _items[i3].pos);
+		}
+	}
+}
+
+int EobCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int slot) {
+	if (item < 0)
+		return 0;
+
+	int offset = (_flags.gameID == GI_EOB1) ? 11 : (_flags.lang == Common::DE_DEU ? 16 : 12);
+
+	if (slot == 17 && item && !itemUsableByCharacter(charIndex, item)) {
+		_txt->printMessage(_itemExtraStrings[offset], -1, _characters[charIndex].name);
+		return 0;
+	}
+
+	int itm = _characters[charIndex].inventory[slot];
+	int ex = _itemTypes[_items[itm].type].extraProperties & 0x7f;
+
+	if (slot < 2 && _items[itm].flags & 0x20 && ex > 0 && ex < 4) {
+		_txt->printMessage(_itemExtraStrings[offset + 1], -1, _characters[charIndex].name);
+		return 0;
+	}
+
+	uint16 v = item ? _itemTypes[_items[item].type].invFlags : 0xffff;
+	if (v & _slotValidationFlags[slot])
+		return 1;
+
+	_txt->printMessage(_itemExtraStrings[offset + (_flags.gameID == GI_EOB1 ? 1 : 2)]);
+	return 0;
+}
+
+void EobCoreEngine::deletePartyItem(Item itemType, int16 itemValue) {
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 1))
+			continue;
+
+		EobCharacter *c = &_characters[i];
+		int slot = checkCharacterInventoryForItem(i, itemType, itemValue);
+
+		if (slot == -1)
+			continue;
+
+		int itm = c->inventory[slot];
+		_items[itm].block = -1;
+		c->inventory[slot] = 0;
+
+		if (_currentControlMode == 0 && slot < 2 && i < 5)
+			gui_drawWeaponSlot(i, slot);
+
+		if (_currentControlMode == 1 && i == _updateCharNum)
+			gui_drawInventoryItem(slot, 1, 0);
+	}
+}
+
+int EobCoreEngine::itemUsableByCharacter(int charIndex, Item item) {
+	if (!item)
+		return 1;
+
+	return (_itemTypes[_items[item].type].allowedClasses & _classModifierFlags[_characters[charIndex].cClass]);
+}
+
+int EobCoreEngine::countQueuedItems(Item itemQueue, int16 id, int16 type, int count, int includeFlyingItems) {
+	uint16 o1 = itemQueue;
+	uint16 o2 = o1;
+	
+	if (!o1)
+		return 0;
+
+	int res = 0;
+		
+	for (bool forceLoop = true; o1 != o2 || forceLoop; o1 = _items[o1].prev) {
+		EobItem *itm = &_items[o1];
+		forceLoop = false;
+		if (id != -1 || type != -1) {
+			if ((id != -1 || (id == -1 && type != itm->type)) && (type != -1) || (id != o1))
+				continue;
+		}
+
+		if (!includeFlyingItems) {
+			if (itm->pos > 3 && itm->pos < 8)
+				continue;
+		}
+
+		if (!count)
+			return o1;
+		
+		res++;		
+	}
+
+	return res;
+}
+
+int EobCoreEngine::getQueuedItem(Item *items, int pos, int id) {
+	Item o1 = *items;
+	Item o2 = o1;
+
+	if (!o1)
+		return 0;
+
+	EobItem *itm = &_items[o1];
+	
+	for (bool forceLoop = true; o1 != o2 || forceLoop; o1 = itm->prev) {
+		itm = &_items[o1];
+		forceLoop = false;
+		if ((id != -1 || (id == -1 && itm->pos != pos)) && id != o1)
+			continue;
+		
+		Item n = itm->next;
+		Item p = itm->prev;
+		_items[n].prev = p;
+		_items[p].next = n;
+		itm->next = itm->prev = itm->block = 0;
+		itm->level = 0;
+		if (o1 == *items)
+			*items = p;
+		if (o1 == *items)
+			*items = 0;
+
+		return o1;
+	}
+
+	return 0;
+}
+
+void EobCoreEngine::printFullItemName(Item item) {
+	EobItem *itm = &_items[item];
+	const char *nameUnid = _itemNames[itm->nameUnid];
+	const char *nameId = _itemNames[itm->nameId];
+	uint8 f = _itemTypes[itm->type].extraProperties & 0x7f;
+	int8 v = itm->value;
+	
+	const char *tstr2 = 0;
+	const char *tstr3 = 0;
+	int e = 0;
+
+	char tmpString[61];
+
+	if ((itm->flags & 0x40) && !strlen(nameId)) {
+		switch (f) {
+			case 0:
+			case 1:
+			case 2:
+			case 3:
+				if (v == 0)
+					strcpy(tmpString, nameUnid);
+				else if (v < 0)
+					sprintf(tmpString, _itemExtraStrings[3], v, nameUnid);
+				else
+					sprintf(tmpString, _itemExtraStrings[4], v, nameUnid);
+				break;
+
+			case 9:
+				tstr2 = _itemExtraStrings[5];
+				tstr3 = _spells[v].name;
+				e = 1;
+				break;
+
+			case 10:
+				tstr2 = _itemExtraStrings[6];
+				tstr3 = _spells[_flags.gameID == GI_EOB1 ? (_clericSpellOffset + v) : v].name;
+				e = 1;
+				break;
+
+			case 14:
+				tstr2 = _itemExtraStrings[8];
+				tstr3 = _itemSuffixStrings[8];
+				break;
+
+			case 16:
+				tstr2 = _itemExtraStrings[7];
+				tstr3 = _itemSuffixStrings[v + 6];
+				e = 0;
+				break;
+
+			case 18:
+				if (v == 5) {
+					tstr2 = _itemExtraStrings[_flags.lang == Common::EN_ANY ? 9 : 10];
+					e = 1;
+				} else {
+					tstr2 = _itemExtraStrings[9];
+					e = 0;
+				}
+				tstr3 = _itemSuffixStrings[v + (_flags.lang == Common::EN_ANY ? 11 : 15)];
+				break;
+
+			default:
+				strcpy(tmpString, nameUnid);
+				break;
+		}
+	
+
+		if (tstr3) {
+			if (!tstr2) {
+				sprintf(tmpString, _itemExtraStrings[_flags.lang == Common::EN_ANY ? 10 : 11], tstr3);
+			} else {
+				if (e == 1) {
+					if (tstr2 == _itemExtraStrings[12])
+						sprintf(tmpString, _itemExtraStrings[_flags.lang == Common::EN_ANY ? 11 : 14], tstr2, tstr3);
+					else
+						sprintf(tmpString, _itemExtraStrings[_flags.gameID == GI_EOB1 ? 10 : (_flags.lang == Common::EN_ANY ? 11 : 13)], tstr2, tstr3);
+				} else {
+					sprintf(tmpString, _itemExtraStrings[_flags.gameID == GI_EOB1 ? 10 : (_flags.lang == Common::EN_ANY ? 11 : 15)], tstr2, tstr3);
+				}
+			}
+		}
+	} else {
+		strcpy(tmpString, (itm->flags & 0x40) ? nameId : nameUnid);
+	}
+
+	_txt->printMessage(tmpString);
+}
+
+void EobCoreEngine::identifyQueuedItems(Item itemQueue) {
+	if (!itemQueue)
+		return;
+
+	Item first = itemQueue;
+	do {
+		_items[itemQueue].flags |= 0x40;
+		itemQueue = _items[itemQueue].prev;
+
+	} while (first != itemQueue);
+}
+
+void EobCoreEngine::drawItemIconShape(int pageNum, Item itemId, int x, int y) {
+	int icn = _items[itemId].icon;
+	bool applyBluePal = ((_partyEffectFlags & 2) && (_items[itemId].flags & 0x80)) ? true : false;
+
+	if (applyBluePal) {
+		_screen->setFadeTableIndex(3);
+		_screen->setShapeFadeMode(1, true);
+	}
+
+	_screen->drawShape(pageNum, _itemIconShapes[icn], x, y, 0);
+
+	if (applyBluePal) {
+		_screen->setFadeTableIndex(4);
+		_screen->setShapeFadeMode(1, false);
+	}
+}
+
+bool EobCoreEngine::isMagicWeapon(Item itemIndex) {
+	return (_items[itemIndex].type > 10 && _items[itemIndex].type < 18);
+}
+
+bool EobCoreEngine::checkInventoryForRings(int charIndex, int itemValue) {
+	for (int i = 25; i <= 26; i++) {
+		int itm = _characters[charIndex].inventory[i];
+		if (itm && _items[itm].type == 47 && _items[itm].value == itemValue)
+			return true;
+	}
+	return false;
+}
+
+void EobCoreEngine::eatItemInHand(int charIndex) {
+	EobCharacter *c = &_characters[charIndex];
+	if (!testCharacter(charIndex, 5)) {
+		_txt->printMessage(_warningStrings[1], -1, c->name);
+	} else if (_itemInHand && _items[_itemInHand].type != 31) {
+		_txt->printMessage(_warningStrings[3]);
+	} else if (_items[_itemInHand].value == -1) {
+		_txt->printMessage(_warningStrings[2]);
+		snd_playSoundEffect(79);
+	} else {
+		c->food += _items[_itemInHand].value;
+		if (c->food > 100)
+			c->food = 100;
+
+		_items[_itemInHand].block = -1;
+		setHandItem(0);
+		gui_drawFoodStatusGraph(charIndex);
+		_screen->updateScreen();
+		snd_playSoundEffect(9);
+	}	
+}
+
+bool EobCoreEngine::launchObject(int charIndex, Item item, uint16 startBlock, int startPos, int dir, int type) {
+	EobFlyingObject *t = _flyingObjects;
+	int slot = 0;
+	for (; slot < 10; slot++) {
+		if (!t->enable)
+			break;
+		t++;
+	}
+
+	if (slot == 10)
+		return false;
+
+	setItemPosition((Item*)&_levelBlockProperties[startBlock].drawObjects, startBlock, item, startPos | 4);
+
+	t->enable = 1;
+	t->u2 = 1;
+	t->flags = 0;
+	t->direction = dir;
+	t->distance = 12;
+	t->curBlock = startBlock;
+	t->curPos = startPos;
+	t->item = item;
+	t->objectType = type;
+	t->attackerId = charIndex;
+	t->callBackIndex = 0;
+
+	snd_playSoundEffect(type == 7 ? 26 : 11);	
+	return true;
+}
+
+void EobCoreEngine::launchMagicObject(int charIndex, int type, uint16 startBlock, int startPos, int dir) {
+	EobFlyingObject *t = _flyingObjects;
+	int slot = 0;
+	for (; slot < 10; slot++) {
+		if (!t->enable)
+			break;
+		t++;
+	}
+
+	if (slot == 10)
+		return;
+
+	t->enable = 2;
+	t->u2 = 1;
+	t->flags = _magicFlightObjectProperties[(type << 2) + 2];
+	t->direction = dir;
+	t->distance = _magicFlightObjectProperties[(type << 2) + 1];
+	t->curBlock = startBlock;
+	t->curPos = startPos;
+	t->item = type;
+	t->objectType = _magicFlightObjectProperties[(type << 2) + 3];
+	t->attackerId = charIndex;
+	t->u2 = 1;
+	t->callBackIndex = _magicFlightObjectProperties[type << 2];
+	_sceneUpdateRequired = true;
+}
+
+bool EobCoreEngine::updateObjectFlight(EobFlyingObject *fo, int block, int pos) {
+	uint8 wallFlags = _wllWallFlags[_levelBlockProperties[block].walls[fo->direction ^ 2]];
+	if (fo->enable == 1) {
+		if ((wallFlags & 1) || (fo->u2) || ((wallFlags & 2) && (_dscItemShapeMap[_items[fo->item].icon] >= 15))) {
+			getQueuedItem((Item*)&_levelBlockProperties[fo->curBlock].drawObjects, 0, fo->item);
+			setItemPosition((Item*)&_levelBlockProperties[block].drawObjects, block, fo->item, pos | 4);
+			fo->curBlock = block;
+			fo->curPos = pos;
+			fo->distance--;	
+			return true;
+
+		} else {
+			_clickedSpecialFlag = 0x10;
+			specialWallAction(block, fo->direction);
+			return false;
+		}
+
+	} else {
+		if (!(wallFlags & 1) && (fo->curBlock != block))
+			return false;
+		fo->curBlock = block;
+		fo->curPos = pos;
+		if (fo->distance != 255)
+			fo->distance--;		
+	}
+	return true;
+}
+
+bool EobCoreEngine::updateFlyingObjectHitTest(EobFlyingObject *fo, int block, int pos) {
+	if (fo->u2 && (fo->curBlock != _currentBlock || fo->attackerId >= 0) && (!blockHasMonsters(block) || fo->attackerId < 0))
+		return false;
+
+	if (fo->enable == 2) {
+		if (fo->callBackIndex)
+			return (this->*_spells[fo->callBackIndex].endCallback)(fo);
+	}
+
+	if (blockHasMonsters(block)) {
+		for (int i = 0; i < 30; i++) {
+			if (!isMonsterOnPos(&_monsters[i], block, pos, 1))
+				continue;
+			if (flyingObjectMonsterHit(fo, i))
+				return true;
+		}
+
+	} else if (block == _currentBlock) {
+		return flyingObjectPartyHit(fo);
+	}
+
+	return false;
+}
+
+void EobCoreEngine::updateFlyingObject_s3(EobFlyingObject *fo) {
+
+}
+
+void EobCoreEngine::endObjectFlight(EobFlyingObject *fo) {
+	if (fo->enable == 1) {
+		_items[fo->item].pos &= 3;
+		runLevelScript(fo->curBlock, 4);
+		updateEnvironmentalSfx(18);
+	}
+	memset(fo, 0, sizeof(EobFlyingObject));
+}
+
+void EobCoreEngine::checkFlyingObjects() {
+	for (int i = 0; i < 10; i++) {
+		EobFlyingObject *fo = &_flyingObjects[i];
+		if (!fo->enable)
+			continue;
+		if (updateFlyingObjectHitTest(fo, fo->curBlock, fo->curPos))
+			endObjectFlight(fo);
+	}
+}
+
+void EobCoreEngine::reloadWeaponSlot(int charIndex, int slotIndex, int itemType, int arrowOrDagger) {
+	if (arrowOrDagger && _characters[charIndex].inventory[16]) {
+		_characters[charIndex].inventory[slotIndex] = getQueuedItem(&_characters[charIndex].inventory[16], 0, -1);
+	} else {
+		for (int i = 24; i >= 22; i--) {
+			if (!_characters[charIndex].inventory[i])
+				continue;
+			if (_items[_characters[charIndex].inventory[i]].type == itemType && itemType != -1)
+				continue;
+			_characters[charIndex].inventory[slotIndex] = _characters[charIndex].inventory[i];
+			_characters[charIndex].inventory[i] = 0;
+			return;
+		}
+	}
+}
+
+} // End of namespace Kyra
+
+#endif // ENABLE_EOB
+
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index 34bde7fe5c..df595b6ffa 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -171,7 +171,7 @@ KyraEngine_HoF::~KyraEngine_HoF() {
 		delete[] _conversationState[i];
 	delete[] _conversationState;
 
-	for (Common::Array<const TIMOpcode *>::iterator i = _timOpcodes.begin(); i != _timOpcodes.end(); ++i)
+	for (Common::Array<const TIMOpcode*>::iterator i = _timOpcodes.begin(); i != _timOpcodes.end(); ++i)
 		delete *i;
 	_timOpcodes.clear();
 }
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index 916cac0c9d..a6add505cb 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -656,7 +656,7 @@ protected:
 	int t2_resetChat(const TIM *tim, const uint16 *param);
 	int t2_playSoundEffect(const TIM *tim, const uint16 *param);
 
-	Common::Array<const TIMOpcode *> _timOpcodes;
+	Common::Array<const TIMOpcode*> _timOpcodes;
 
 	// sound
 	int _oldTalkFile;
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 39ed0d038a..4e07c8f343 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -183,7 +183,7 @@ KyraEngine_MR::~KyraEngine_MR() {
 	delete[] _sceneStrings;
 	delete[] _talkObjectList;
 
-	for (Common::Array<const Opcode *>::iterator i = _opcodesDialog.begin(); i != _opcodesDialog.end(); ++i)
+	for (Common::Array<const Opcode*>::iterator i = _opcodesDialog.begin(); i != _opcodesDialog.end(); ++i)
 		delete *i;
 	_opcodesDialog.clear();
 
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index 473c0371dc..38ff271037 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -463,7 +463,7 @@ private:
 
 	void npcChatSequence(const char *str, int object, int vocHigh, int vocLow);
 
-	Common::Array<const Opcode *> _opcodesDialog;
+	Common::Array<const Opcode*> _opcodesDialog;
 
 	int o3d_updateAnim(EMCState *script);
 	int o3d_delay(EMCState *script);
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index dbdcda22d5..f5ef0d09ac 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -211,7 +211,7 @@ Common::Error KyraEngine_v1::init() {
 }
 
 KyraEngine_v1::~KyraEngine_v1() {
-	for (Common::Array<const Opcode *>::iterator i = _opcodes.begin(); i != _opcodes.end(); ++i)
+	for (Common::Array<const Opcode*>::iterator i = _opcodes.begin(); i != _opcodes.end(); ++i)
 		delete *i;
 	_opcodes.clear();
 	_keyMap.clear();
@@ -354,14 +354,14 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
 }
 
 void KyraEngine_v1::setupKeyMap() {
-	struct KeyMapEntry {
+	struct KeyCodeMapEntry {
 		Common::KeyCode kcScummVM;
 		int16 kcDOS;
 		int16 kcPC98;
 	};
 
 #define KC(x) Common::KEYCODE_##x
-	static const KeyMapEntry keys[] = {
+	static const KeyCodeMapEntry keys[] = {
 		{ KC(SPACE), 61, 53 },
 		{ KC(RETURN), 43, 29 },
 		{ KC(UP), 96, 68 },
@@ -377,13 +377,48 @@ void KyraEngine_v1::setupKeyMap() {
 		{ KC(KP7), 91, 67 },
 		{ KC(PAGEUP), 101, 69 },
 		{ KC(KP9), 101, 69 },
+		{ KC(END), 93, 0/*unknown*/ },
+		{ KC(KP1), 93, 0/*unknown*/ },
+		{ KC(PAGEDOWN), 103, 0/*unknown*/ },
+		{ KC(KP3), 103, 0/*unknown*/ },
 		{ KC(F1), 112, 99 },
 		{ KC(F2), 113, 100 },
 		{ KC(F3), 114, 101 },
+		{ KC(F4), 115, 102 },
+		{ KC(F5), 116, 103 },
+		{ KC(F6), 117, 104 },
+		{ KC(a), 31, 31 },
+		{ KC(b), 50, 50 },
+		{ KC(c), 48, 48 },
+		{ KC(d), 33, 33 },
+		{ KC(e), 19, 19 },
+		{ KC(f), 34, 34 },
+		{ KC(i), 24, 24 },
+		{ KC(k), 38, 38 },
+		{ KC(m), 52, 52 },
+		{ KC(n), 51, 51 },
 		{ KC(o), 25, 25 },
+		{ KC(p), 26, 26 },
 		{ KC(r), 20, 20 },
+		{ KC(s), 32, 32 },
+		{ KC(w), 18, 18 },
+		{ KC(y), 22, 22 },
+		{ KC(z), 46, 46 },		
+		{ KC(1), 2, 0/*unknown*/ },
+		{ KC(2), 3, 0/*unknown*/ },
+		{ KC(3), 4, 0/*unknown*/ },
+		{ KC(4), 5, 0/*unknown*/ },
+		{ KC(5), 6, 0/*unknown*/ },
+		{ KC(6), 7, 0/*unknown*/ },
+		{ KC(7), 8, 0/*unknown*/ },
 		{ KC(SLASH), 55, 55 },
 		{ KC(ESCAPE), 110, 1 },
+		{ KC(MINUS), 12, 0/*unknown*/ },
+		{ KC(KP_MINUS), 105, 0/*unknown*/ },
+		{ KC(PLUS), 13, 0/*unknown*/ },
+		{ KC(KP_PLUS), 106, 0/*unknown*/ },
+		{ KC(COMMA), 53, 0/*unknown*/ },
+		{ KC(PERIOD), 54, 0/*unknown*/ }
 	};
 #undef KC
 
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 24a3b35418..40f9074106 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -323,7 +323,7 @@ protected:
 
 	// opcode
 	virtual void setupOpcodeTable() = 0;
-	Common::Array<const Opcode *> _opcodes;
+	Common::Array<const Opcode*> _opcodes;
 
 	int o1_queryGameFlag(EMCState *script);
 	int o1_setGameFlag(EMCState *script);
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h
index 56391d151a..7896748b96 100644
--- a/engines/kyra/kyra_v2.h
+++ b/engines/kyra/kyra_v2.h
@@ -252,7 +252,7 @@ protected:
 	virtual void uninitAnimationShapes(int count, uint8 *filedata) = 0;
 
 	// Shapes
-	typedef Common::HashMap<int, uint8 *> ShapeMap;
+	typedef Common::HashMap<int, uint8*> ShapeMap;
 	ShapeMap _gameShapes;
 
 	uint8 *getShapePtr(int index) const;
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 120900537b..6cb3b51370 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -42,10 +42,9 @@ namespace Kyra {
 
 const char *const LoLEngine::kKeymapName = "lol";
 
-LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(system, flags) {
+LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : LolEobBaseEngine(system, flags) {
 	_screen = 0;
 	_gui = 0;
-	_txt = 0;
 	_tim = 0;
 
 	_lang = 0;
@@ -97,15 +96,11 @@ LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(sy
 	memset(_inventory, 0, sizeof(_inventory));
 	memset(_charStatusFlags, 0, sizeof(_charStatusFlags));
 	_inventoryCurItem = 0;
-	_currentControlMode = 0;
-	_specialSceneFlag = 0;
 	_lastCharInventory = -1;
 	_emcLastItem = -1;
 
 	_itemIconShapes = _itemShapes = _gameShapes = _thrownShapes = _effectShapes = _fireballShapes = _healShapes = _healiShapes = 0;
 	_levelShpList = _levelDatList = 0;
-	_monsterShapes = _monsterPalettes = 0;
-	_monsterShapesEx = 0;
 	_gameShapeMap = 0;
 	memset(_monsterAnimType, 0, 3);
 	_healOverlay = 0;
@@ -116,10 +111,8 @@ LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(sy
 	_charSelection = -1;
 	_characters = 0;
 	_spellProperties = 0;
-	_updateFlags = 0;
 	_selectedSpell = 0;
-	_updateCharNum = _updatePortraitSpeechAnimDuration = _portraitSpeechAnimMode = _resetPortraitAfterSpeechAnim = _textColorFlag = _needSceneRestore = 0;
-	_fadeText = false;
+	_updateCharNum = _portraitSpeechAnimMode = _textColorFlag = 0;
 	_palUpdateTimer = _updatePortraitNext = 0;
 	_lampStatusTimer = 0xffffffff;
 
@@ -128,66 +121,42 @@ LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(sy
 	_lastButtonShape = 0;
 	_buttonPressTimer = 0;
 	_selectedCharacter = 0;
-	_suspendScript = _sceneUpdateRequired = false;
+	_suspendScript = false;
 	_scriptDirection = 0;
-	_currentDirection = 0;
-	_currentBlock = 0;
-	_compassDirection = _compassDirectionIndex = -1;
+	_compassDirectionIndex = -1;
 	_compassStep = 0;
-	memset(_visibleBlockIndex, 0, sizeof(_visibleBlockIndex));
 
 	_smoothScrollModeNormal = 1;
-	_wllVmpMap = _specialWallTypes = _wllBuffer4 = _wllWallFlags = 0;
-	_wllShapeMap = 0;
-	_lvlShapeTop = _lvlShapeBottom = _lvlShapeLeftRight = 0;
-	_levelBlockProperties = 0;
+	_wllAutomapData = 0;
+	_sceneXoffset = 112;
+	_sceneShpDim = 13;
 	_monsters = 0;
 	_monsterProperties = 0;
-	_lvlBlockIndex = _lvlShapeIndex = 0;
+	_lvlShapeIndex = 0;
 	_partyAwake = true;
-	_vcnBlocks = 0;
-	_vcnShift = 0;
-	_vcnExpTable = 0;
-	_vmpPtr = 0;
-	_vcfBlocks = 0;
 	_transparencyTable2 = 0;
 	_transparencyTable1 = 0;
-	_levelShapeProperties = 0;
-	_levelShapes = 0;
 	_specialGuiShape = 0;
 	_specialGuiShapeX = _specialGuiShapeY = _specialGuiShapeMirrorFlag = 0;
-	_blockDrawingBuffer = 0;
-	_sceneWindowBuffer = 0;
-	memset(_doorShapes, 0, sizeof(_doorShapes));
 	memset(_characterFaceShapes, 0, sizeof(_characterFaceShapes));
 
 	_lampEffect = _brightness = _lampOilStatus = 0;
 	_lampStatusSuspended = false;
-	_blockBrightness = 0;
 	_tempBuffer5120 = 0;
 	_flyingObjects = 0;
 	_monsters = 0;
 	_lastMouseRegion = 0;
-	_objectLastDirection = _monsterStepCounter = _monsterStepMode = 0;
+	_objectLastDirection = 0;
 	_monsterCurBlock = 0;
 	_seqWindowX1 = _seqWindowY1 = _seqWindowX2 = _seqWindowY2 = _seqTrigger = 0;
 	_spsWindowX = _spsWindowY = _spsWindowW = _spsWindowH = 0;
 
-	_dscUnk1 = 0;
-	_dscShapeIndex = 0;
+	_dscWalls = 0;
 	_dscOvlMap = 0;
 	_dscShapeScaleW = 0;
-	_dscShapeScaleH = 0;
-	_dscShapeX = 0;
+	_dscShapeScaleH = 0;	
 	_dscShapeY = 0;
-	_dscTileIndex = 0;
-	_dscUnk2 = 0;
-	_dscDoorShpIndex = 0;
-	_dscDim1 = 0;
-	_dscDim2 = 0;
-	_dscBlockMap = _dscDoor1 = _dscShapeOvlIndex = 0;
-	_dscBlockIndex = 0;
-	_dscDimMap = 0;
+	_dscShapeOvlIndex = 0;	
 	_dscDoorMonsterX = _dscDoorMonsterY = 0;
 	_dscDoor4 = 0;
 
@@ -198,29 +167,24 @@ LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(sy
 	_curMusicTheme = -1;
 	_curMusicFileExt = 0;
 	_curMusicFileIndex = -1;
-	_environmentSfx = _environmentSfxVol = _envSfxDistThreshold = 0;
 	_envSfxUseQueue = false;
 	_envSfxNumTracksInQueue = 0;
 	memset(_envSfxQueuedTracks, 0, sizeof(_envSfxQueuedTracks));
 	memset(_envSfxQueuedBlocks, 0, sizeof(_envSfxQueuedBlocks));
 
-	_sceneDrawVarDown = _sceneDrawVarRight = _sceneDrawVarLeft = _wllProcessFlag = 0;
 	_partyPosX = _partyPosY = 0;
 	_shpDmX = _shpDmY = _dmScaleW = _dmScaleH = 0;
 
 	_floatingCursorControl = _currentFloatingCursor = 0;
 
 	memset(_activeTim, 0, sizeof(_activeTim));
-	memset(_openDoorState, 0, sizeof(_openDoorState));
 	memset(&_activeSpell, 0, sizeof(_activeSpell));
 
-	_activeVoiceFileTotalTime = 0;
 	_pageBuffer1 = _pageBuffer2 = 0;
 
 	memset(_charStatsTemp, 0, sizeof(_charStatsTemp));
 
 	_compassBroken = _drainMagic = 0;
-	_dialogueField = false;
 
 	_buttonData = 0;
 	_activeButtons = 0;
@@ -228,8 +192,6 @@ LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(sy
 	_preserveEvents = false;
 	_buttonList1 = _buttonList2 = _buttonList3 = _buttonList4 = _buttonList5 = _buttonList6 = _buttonList7 = _buttonList8 = 0;
 
-	memset(_lvlTempData, 0, sizeof(_lvlTempData));
-
 	_mapOverlay = 0;
 	_automapShapes = 0;
 	_defaultLegendData = 0;
@@ -250,6 +212,7 @@ LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(sy
 
 LoLEngine::~LoLEngine() {
 	setupPrologueData(false);
+	releaseTempData();
 
 #ifdef ENABLE_KEYMAPPER
 	_eventMan->getKeymapper()->cleanupGameKeymaps();
@@ -264,8 +227,6 @@ LoLEngine::~LoLEngine() {
 	_gui = 0;
 	delete _tim;
 	_tim = 0;
-	delete _txt;
-	_txt = 0;
 
 	delete[] _itemsInPlay;
 	delete[] _itemProperties;
@@ -322,64 +283,47 @@ LoLEngine::~LoLEngine() {
 		delete[] _healiShapes;
 	}
 
-	for (int i = 0; i < 3; i++)
-		releaseMonsterShapes(i);
+	if (_monsterDecorationShapes) {
+		for (int i = 0; i < 3; i++)
+			releaseMonsterShapes(i);
 
-	delete[] _monsterShapes;
-	delete[] _monsterPalettes;
-	delete[] _monsterShapesEx;
+		delete[] _monsterShapes;
+		_monsterShapes = 0;
+		delete[] _monsterPalettes;
+		_monsterPalettes = 0;
+		delete[] _monsterDecorationShapes;
+		_monsterDecorationShapes = 0;
+	}
+
+	for (int i = 0; i < 6; i++) {
+		delete[] _doorShapes[i];
+		_doorShapes[i] = 0;
+	}
 
 	delete[] _automapShapes;
 
-	for (Common::Array<const TIMOpcode *>::iterator i = _timIntroOpcodes.begin(); i != _timIntroOpcodes.end(); ++i)
+	for (Common::Array<const TIMOpcode*>::iterator i = _timIntroOpcodes.begin(); i != _timIntroOpcodes.end(); ++i)
 		delete *i;
 	_timIntroOpcodes.clear();
 
-	for (Common::Array<const TIMOpcode *>::iterator i = _timOutroOpcodes.begin(); i != _timOutroOpcodes.end(); ++i)
+	for (Common::Array<const TIMOpcode*>::iterator i = _timOutroOpcodes.begin(); i != _timOutroOpcodes.end(); ++i)
 		delete *i;
 	_timOutroOpcodes.clear();
 
-	for (Common::Array<const TIMOpcode *>::iterator i = _timIngameOpcodes.begin(); i != _timIngameOpcodes.end(); ++i)
+	for (Common::Array<const TIMOpcode*>::iterator i = _timIngameOpcodes.begin(); i != _timIngameOpcodes.end(); ++i)
 		delete *i;
 	_timIngameOpcodes.clear();
 
-
-	delete[] _wllVmpMap;
-	delete[] _wllShapeMap;
-	delete[] _specialWallTypes;
-	delete[] _wllBuffer4;
-	delete[] _wllWallFlags;
-	delete[] _lvlShapeTop;
-	delete[] _lvlShapeBottom;
-	delete[] _lvlShapeLeftRight;
+	delete[] _wllAutomapData;
 	delete[] _tempBuffer5120;
 	delete[] _flyingObjects;
 	delete[] _monsters;
-	delete[] _levelBlockProperties;
 	delete[] _monsterProperties;
 
-	delete[] _levelFileData;
-	delete[] _vcnExpTable;
-	delete[] _vcnBlocks;
-	delete[] _vcnShift;
-	delete[] _vmpPtr;
-	delete[] _vcfBlocks;
 	delete[] _transparencyTable2;
 	delete[] _transparencyTable1;
-	delete[] _levelShapeProperties;
-	delete[] _blockDrawingBuffer;
-	delete[] _sceneWindowBuffer;
 	delete[] _lightningProps;
 
-	if (_levelShapes) {
-		for (int i = 0; i < 400; i++)
-			delete[]  _levelShapes[i];
-		delete[] _levelShapes;
-	}
-
-	for (int i = 0; i < 2; i++)
-		delete[] _doorShapes[i];
-
 	delete _lvlShpFileHandle;
 
 	if (_ingameSoundList) {
@@ -388,16 +332,6 @@ LoLEngine::~LoLEngine() {
 		delete[] _ingameSoundList;
 	}
 
-	for (int i = 0; i < 29; i++) {
-		if (_lvlTempData[i]) {
-			delete[] _lvlTempData[i]->wallsXorData;
-			delete[] _lvlTempData[i]->flags;
-			delete[] _lvlTempData[i]->monsters;
-			delete[] _lvlTempData[i]->flyingObjects;
-			delete _lvlTempData[i];
-		}
-	}
-
 	for (int i = 0; i < 3; i++) {
 		for (int ii = 0; ii < 40; ii++)
 			delete[] _characterFaceShapes[ii][i];
@@ -409,7 +343,7 @@ LoLEngine::~LoLEngine() {
 	delete[] _mapCursorOverlay;
 	delete[] _mapOverlay;
 
-	for (Common::Array<const SpellProc *>::iterator i = _spellProcs.begin(); i != _spellProcs.end(); ++i)
+	for (Common::Array<const SpellProc*>::iterator i = _spellProcs.begin(); i != _spellProcs.end(); ++i)
 		delete *i;
 	_spellProcs.clear();
 
@@ -440,13 +374,18 @@ Common::Error LoLEngine::init() {
 	KyraEngine_v1::init();
 	initStaticResource();
 
-	_envSfxDistThreshold = _sound->getSfxType() == Sound::kAdLib ? 15 : 3;
-
 	_gui = new GUI_LoL(this);
 	assert(_gui);
 	_gui->initStaticData();
 
 	_txt = new TextDisplayer_LoL(this, _screen);
+	_dialogueButtonLabelCol1 = 144;
+	_dialogueButtonLabelCol2 = 254;
+	_dialogueButtonW = 74;
+	_dialogueButtonH = 9;
+	_bkgColor_1 = -1;
+	_color1_1 = 136;
+	_color2_1 = 251;
 
 	_screen->setAnimBlockPtr(10000);
 	_screen->setScreenDim(0);
@@ -465,41 +404,15 @@ Common::Error LoLEngine::init() {
 	if (!_sound->init())
 		error("Couldn't init sound");
 
-	_wllVmpMap = new uint8[80];
-	memset(_wllVmpMap, 0, 80);
-	_wllShapeMap = new int8[80];
-	memset(_wllShapeMap, 0, 80);
-	_specialWallTypes = new uint8[80];
-	memset(_specialWallTypes, 0, 80);
-	_wllBuffer4 = new uint8[80];
-	memset(_wllBuffer4, 0, 80);
-	_wllWallFlags = new uint8[80];
-	memset(_wllWallFlags, 0, 80);
-	_lvlShapeTop = new int16[18];
-	memset(_lvlShapeTop, 0, 18 * sizeof(int16));
-	_lvlShapeBottom = new int16[18];
-	memset(_lvlShapeBottom, 0, 18 * sizeof(int16));
-	_lvlShapeLeftRight = new int16[36];
-	memset(_lvlShapeLeftRight, 0, 36 * sizeof(int16));
-	_levelShapeProperties = new LevelShapeProperty[100];
-	memset(_levelShapeProperties, 0, 100 * sizeof(LevelShapeProperty));
-	_levelShapes = new uint8 *[400];
-	memset(_levelShapes, 0, 400 * sizeof(uint8 *));
-	_blockDrawingBuffer = new uint16[1320];
-	memset(_blockDrawingBuffer, 0, 1320 * sizeof(uint16));
-	_sceneWindowBuffer = new uint8[21120];
-	memset(_sceneWindowBuffer, 0, 21120);
-
-	_levelBlockProperties = new LevelBlockProperty[1025];
-	memset(_levelBlockProperties, 0, 1025 * sizeof(LevelBlockProperty));
-	_monsters = new MonsterInPlay[30];
-	memset(_monsters, 0, 30 * sizeof(MonsterInPlay));
-	_monsterProperties = new MonsterProperty[5];
-	memset(_monsterProperties, 0, 5 * sizeof(MonsterProperty));
-
-	_vcnExpTable = new uint8[128];
-	for (int i = 0; i < 128; i++)
-		_vcnExpTable[i] = i & 0x0f;
+	LolEobBaseEngine::init();
+	
+	_wllAutomapData = new uint8[80];
+	memset(_wllAutomapData, 0, 80);
+
+	_monsters = new LolMonsterInPlay[30];
+	memset(_monsters, 0, 30 * sizeof(LolMonsterInPlay));
+	_monsterProperties = new LolMonsterProperty[5];
+	memset(_monsterProperties, 0, 5 * sizeof(LolMonsterProperty));
 
 	_tempBuffer5120 = new uint8[5120];
 	memset(_tempBuffer5120, 0, 5120);
@@ -509,25 +422,26 @@ Common::Error LoLEngine::init() {
 
 	memset(_globalScriptVars, 0, sizeof(_globalScriptVars));
 
-	_levelFileData = 0;
 	_lvlShpFileHandle = 0;
 
 	_sceneDrawPage1 = 2;
 	_sceneDrawPage2 = 6;
 
-	_monsterShapes = new uint8 *[48];
-	memset(_monsterShapes, 0, 48 * sizeof(uint8 *));
-	_monsterPalettes = new uint8 *[48];
-	memset(_monsterPalettes, 0, 48 * sizeof(uint8 *));
+	_clickedShapeXOffs = 136;
+	_clickedShapeYOffs = 8;
+	_clickedSpecialFlag = 0x40;
 
-	_monsterShapesEx = new uint8 *[576];
-	memset(_monsterShapesEx, 0, 576 * sizeof(uint8 *));
+	_monsterShapes = new uint8*[48];
+	memset(_monsterShapes, 0, 48 * sizeof(uint8*));
+	_monsterPalettes = new uint8*[48];
+	memset(_monsterPalettes, 0, 48 * sizeof(uint8*));
+	_monsterDecorationShapes = new uint8*[576];
+	memset(_monsterDecorationShapes, 0, 576 * sizeof(uint8*));
 	memset(&_scriptData, 0, sizeof(EMCData));
 
-	_hasTempDataFlags = 0;
 	_activeMagicMenu = -1;
 
-	_automapShapes = new const uint8 *[109];
+	_automapShapes = new const uint8*[109];
 	_mapOverlay = new uint8[256];
 
 	memset(_availableSpells, -1, 8);
@@ -687,7 +601,7 @@ void LoLEngine::loadItemIconShapes() {
 	_screen->loadBitmap("ITEMICN.SHP", 3, 3, 0);
 	const uint8 *shp = _screen->getCPagePtr(3);
 	_numItemIconShapes = READ_LE_UINT16(shp);
-	_itemIconShapes = new uint8 *[_numItemIconShapes];
+	_itemIconShapes = new uint8*[_numItemIconShapes];
 	for (int i = 0; i < _numItemIconShapes; i++)
 		_itemIconShapes[i] = _screen->makeShapeCopy(shp, i);
 
@@ -697,7 +611,7 @@ void LoLEngine::loadItemIconShapes() {
 		_screen->loadBitmap("GAMESHP.SHP", 3, 3, 0);
 		shp = _screen->getCPagePtr(3);
 		_numGameShapes = READ_LE_UINT16(shp);
-		_gameShapes = new uint8 *[_numGameShapes];
+		_gameShapes = new uint8*[_numGameShapes];
 		for (int i = 0; i < _numGameShapes; i++)
 			_gameShapes[i] = _screen->makeShapeCopy(shp, i);
 	}
@@ -717,12 +631,6 @@ void LoLEngine::setMouseCursorToItemInHand() {
 	_screen->setMouseCursor(o, o, getItemIconShapePtr(_itemInHand));
 }
 
-bool LoLEngine::posWithinRect(int mouseX, int mouseY, int x1, int y1, int x2, int y2) {
-	if (mouseX < x1 || mouseX > x2 || mouseY < y1 || mouseY > y2)
-		return false;
-	return true;
-}
-
 void LoLEngine::checkFloatingPointerRegions() {
 	if (!_floatingCursorsEnabled)
 		return;
@@ -877,42 +785,42 @@ void LoLEngine::startup() {
 	_screen->loadBitmap("ITEMSHP.SHP", 3, 3, 0);
 	const uint8 *shp = _screen->getCPagePtr(3);
 	_numItemShapes = READ_LE_UINT16(shp);
-	_itemShapes = new uint8 *[_numItemShapes];
+	_itemShapes = new uint8*[_numItemShapes];
 	for (int i = 0; i < _numItemShapes; i++)
 		_itemShapes[i] = _screen->makeShapeCopy(shp, i);
 
 	_screen->loadBitmap("THROWN.SHP", 3, 3, 0);
 	shp = _screen->getCPagePtr(3);
 	_numThrownShapes = READ_LE_UINT16(shp);
-	_thrownShapes = new uint8 *[_numThrownShapes];
+	_thrownShapes = new uint8*[_numThrownShapes];
 	for (int i = 0; i < _numThrownShapes; i++)
 		_thrownShapes[i] = _screen->makeShapeCopy(shp, i);
 
 	_screen->loadBitmap("ICE.SHP", 3, 3, 0);
 	shp = _screen->getCPagePtr(3);
 	_numEffectShapes = READ_LE_UINT16(shp);
-	_effectShapes = new uint8 *[_numEffectShapes];
+	_effectShapes = new uint8*[_numEffectShapes];
 	for (int i = 0; i < _numEffectShapes; i++)
 		_effectShapes[i] = _screen->makeShapeCopy(shp, i);
 
 	_screen->loadBitmap("FIREBALL.SHP", 3, 3, 0);
 	shp = _screen->getCPagePtr(3);
 	_numFireballShapes = READ_LE_UINT16(shp);
-	_fireballShapes = new uint8 *[_numFireballShapes];
+	_fireballShapes = new uint8*[_numFireballShapes];
 	for (int i = 0; i < _numFireballShapes; i++)
 		_fireballShapes[i] = _screen->makeShapeCopy(shp, i);
 
 	_screen->loadBitmap("HEAL.SHP", 3, 3, 0);
 	shp = _screen->getCPagePtr(3);
 	_numHealShapes = READ_LE_UINT16(shp);
-	_healShapes = new uint8 *[_numHealShapes];
+	_healShapes = new uint8*[_numHealShapes];
 	for (int i = 0; i < _numHealShapes; i++)
 		_healShapes[i] = _screen->makeShapeCopy(shp, i);
 
 	_screen->loadBitmap("HEALI.SHP", 3, 3, 0);
 	shp = _screen->getCPagePtr(3);
 	_numHealiShapes = READ_LE_UINT16(shp);
-	_healiShapes = new uint8 *[_numHealiShapes];
+	_healiShapes = new uint8*[_numHealiShapes];
 	for (int i = 0; i < _numHealiShapes; i++)
 		_healiShapes[i] = _screen->makeShapeCopy(shp, i);
 
@@ -969,10 +877,9 @@ void LoLEngine::runLoop() {
 
 	enableSysTimer(2);
 
-	bool _runFlag = true;
 	_flagsTable[73] |= 0x08;
 
-	while (!shouldQuit() && _runFlag) {
+	while (!shouldQuit()) {
 		if (_gameToLoad != -1) {
 			// FIXME: Instead of throwing away the error returned by
 			// loadGameState, we should use it / augment it.
@@ -1784,44 +1691,6 @@ void LoLEngine::fadeText() {
 	_fadeText = false;
 }
 
-void LoLEngine::transformRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage) {
-	uint16 *p1 = (uint16 *)_tempBuffer5120;
-	uint16 *p2 = (uint16 *)(_tempBuffer5120 + 640);
-
-	for (int i = 0; i < w; i++)
-		p1[i] = i;
-
-	for (int i = 0; i < h; i++)
-		p2[i] = i;
-
-	for (int i = 0; i < w; i++)
-		SWAP(p1[_rnd.getRandomNumberRng(0, w - 1)], p1[i]);
-
-	for (int i = 0; i < h; i++)
-		SWAP(p2[_rnd.getRandomNumberRng(0, h - 1)], p2[i]);
-
-	for (int i = 0; i < h; i++) {
-		int i2 = i;
-
-		for (int ii = 0; ii < w; ii++) {
-			int dx1 = x1 + p1[ii];
-			int dy1 = y1 + p2[i2];
-			int dx2 = x2 + p1[ii];
-			int dy2 = y2 + p2[i2];
-
-			if (++i2 == h)
-				i2 = 0;
-
-			_screen->setPagePixel(dstPage, dx2, dy2, _screen->getPagePixel(srcPage, dx1, dy1));
-		}
-
-		if (!dstPage && (i & 5) == 5) {
-			updateInput();
-			_screen->updateScreen();
-		}
-	}
-}
-
 void LoLEngine::setPaletteBrightness(const Palette &srcPal, int brightness, int modifier) {
 	generateBrightnessPalette(srcPal, _screen->getPalette(1), brightness, modifier);
 	_screen->fadePalette(_screen->getPalette(1), 5, 0);
@@ -2040,7 +1909,46 @@ int LoLEngine::playCharacterScriptChat(int charId, int mode, int restorePortrait
 	return 1;
 }
 
-void LoLEngine::giveItemToMonster(MonsterInPlay *monster, Item item) {
+void LoLEngine::setupDialogueButtons(int numStr, const char *s1, const char *s2, const char *s3) {
+	screen()->setScreenDim(5);
+
+	if (numStr == 1 && speechEnabled()) {
+		_dialogueNumButtons = 0;
+		_dialogueButtonString[0] = _dialogueButtonString[1] = _dialogueButtonString[2] = 0;
+	} else {
+		_dialogueNumButtons = numStr;
+		_dialogueButtonString[0] = s1;
+		_dialogueButtonString[1] = s2;
+		_dialogueButtonString[2] = s3;
+		_dialogueHighlightedButton = 0;
+		
+		const ScreenDim *d = screen()->getScreenDim(5);
+
+		static uint16 posX[3];
+		static uint8 posY[3];
+
+		memset(posY, d->sy + d->h - 9, 3);
+
+		_dialogueButtonPosX = posX;
+		_dialogueButtonPosY = posY;
+
+		if (numStr == 1) {
+			posX[0] = posX[1] = posX[2] = d->sx + d->w - (_dialogueButtonW + 3);
+		} else {
+			int xOffs = d->w / numStr;
+			posX[0] = d->sx + (xOffs >> 1) - 37;
+			posX[1] = posX[0] + xOffs; 
+			posX[2] = posX[1] + xOffs;		
+		}
+
+		drawDialogueButtons();
+	}
+
+	if (!shouldQuit())
+		removeInputTop();
+}
+
+void LoLEngine::giveItemToMonster(LolMonsterInPlay *monster, Item item) {
 	uint16 *c = &monster->assignedItems;
 	while (*c)
 		c = &_itemsInPlay[*c].nextAssignedObject;
@@ -2049,7 +1957,7 @@ void LoLEngine::giveItemToMonster(MonsterInPlay *monster, Item item) {
 }
 
 const uint16 *LoLEngine::getCharacterOrMonsterStats(int id) {
-	return (id & 0x8000) ? (const uint16 *)_monsters[id & 0x7fff].properties->fightingStats : _characters[id].defaultModifiers;
+	return (id & 0x8000) ? (const uint16*)_monsters[id & 0x7fff].properties->fightingStats : _characters[id].defaultModifiers;
 }
 
 uint16 *LoLEngine::getCharacterOrMonsterItemsMight(int id) {
@@ -2073,21 +1981,6 @@ void LoLEngine::delay(uint32 millis, bool doUpdate, bool) {
 	}
 }
 
-int LoLEngine::rollDice(int times, int pips) {
-	if (times <= 0 || pips <= 0)
-		return 0;
-
-	int res = 0;
-	while (times--)
-		res += _rnd.getRandomNumberRng(1, pips);
-
-	return res;
-}
-
-void LoLEngine::updateEnvironmentalSfx(int soundId) {
-	snd_processEnvironmentalSoundEffect(soundId, _currentBlock);
-}
-
 // spells
 
 int LoLEngine::castSpell(int charNum, int spellType, int spellLevel) {
@@ -2502,7 +2395,7 @@ int LoLEngine::processMagicIce(int charNum, int spellLevel) {
 			int might = rollDice(iceDamageMin[spellLevel], iceDamageMax[spellLevel]) + iceDamageAdd[spellLevel];
 			int dmg = calcInflictableDamagePerItem(charNum, 0, might, 3, 2);
 
-			MonsterInPlay *m = &_monsters[o & 0x7fff];
+			LolMonsterInPlay *m = &_monsters[o & 0x7fff];
 			if (m->hitPoints <= dmg) {
 				increaseExperience(charNum, 2, m->hitPoints);
 				o = m->nextAssignedObject;
@@ -2581,7 +2474,7 @@ int LoLEngine::processMagicFireball(int charNum, int spellLevel) {
 			while (o & 0x8000) {
 				static const uint8 fireballDamage[] = { 20, 40, 80, 100 };
 				int dmg = calcInflictableDamagePerItem(charNum, o, fireballDamage[spellLevel], 4, 1);
-				MonsterInPlay *m = &_monsters[o & 0x7fff];
+				LolMonsterInPlay *m = &_monsters[o & 0x7fff];
 				o = m->nextAssignedObject;
 				_envSfxUseQueue = true;
 				inflictDamage(m->id | 0x8000, dmg, charNum, 2, 4);
@@ -2746,7 +2639,7 @@ int LoLEngine::processMagicHandOfFate(int spellLevel) {
 				uint16 o = _levelBlockProperties[b1].assignedObjects;
 				while (o & 0x8000) {
 					uint16 o2 = o;
-					MonsterInPlay *m = &_monsters[o & 0x7fff];
+					LolMonsterInPlay *m = &_monsters[o & 0x7fff];
 					o = findObject(o)->nextAssignedObject;
 					int nX = 0;
 					int nY = 0;
@@ -3015,7 +2908,7 @@ int LoLEngine::processMagicVaelansCube() {
 
 	uint16 o = _levelBlockProperties[bl].assignedObjects;
 	while (o & 0x8000) {
-		MonsterInPlay *m = &_monsters[o & 0x7fff];
+		LolMonsterInPlay *m = &_monsters[o & 0x7fff];
 		if (m->properties->flags & 0x1000) {
 			inflictDamage(o, 100, 0xffff, 0, 0x80);
 			v = 1;
@@ -3495,7 +3388,7 @@ int LoLEngine::calcInflictableDamage(int16 attacker, int16 target, int hitType)
 }
 
 int LoLEngine::inflictDamage(uint16 target, int damage, uint16 attacker, int skill, int flags) {
-	MonsterInPlay *m = 0;
+	LolMonsterInPlay *m = 0;
 	LoLCharacter *c = 0;
 
 	if (target & 0x8000) {
@@ -3712,7 +3605,7 @@ void LoLEngine::checkForPartyDeath() {
 	}
 }
 
-void LoLEngine::applyMonsterAttackSkill(MonsterInPlay *monster, int16 target, int16 damage) {
+void LoLEngine::applyMonsterAttackSkill(LolMonsterInPlay *monster, int16 target, int16 damage) {
 	if (rollDice(1, 100) > monster->properties->attackSkillChance)
 		return;
 
@@ -3782,7 +3675,7 @@ void LoLEngine::applyMonsterAttackSkill(MonsterInPlay *monster, int16 target, in
 	}
 }
 
-void LoLEngine::applyMonsterDefenseSkill(MonsterInPlay *monster, int16 attacker, int flags, int skill, int damage) {
+void LoLEngine::applyMonsterDefenseSkill(LolMonsterInPlay *monster, int16 attacker, int flags, int skill, int damage) {
 	if (rollDice(1, 100) > monster->properties->defenseSkillChance)
 		return;
 
@@ -4041,7 +3934,7 @@ uint16 LoLEngine::getNearestMonsterFromCharacterForBlock(uint16 block, int charN
 	int o = _levelBlockProperties[block].assignedObjects;
 
 	while (o & 0x8000) {
-		MonsterInPlay *m = &_monsters[o & 0x7fff];
+		LolMonsterInPlay *m = &_monsters[o & 0x7fff];
 		if (m->mode >= 13) {
 			o = m->nextAssignedObject;
 			continue;
@@ -4107,7 +4000,7 @@ void LoLEngine::displayAutomap() {
 
 	_currentMapLevel = _currentLevel;
 	uint8 *tmpWll = new uint8[80];
-	memcpy(tmpWll, _wllBuffer4, 80);
+	memcpy(tmpWll, _wllAutomapData, 80);
 
 	_screen->loadBitmap("parch.cps", 2, 2, &_screen->getPalette(3));
 	_screen->loadBitmap("autobut.shp", 3, 5, 0);
@@ -4188,7 +4081,7 @@ void LoLEngine::displayAutomap() {
 
 	_screen->fadeToBlack(10);
 	loadLevelWallData(_currentLevel, false);
-	memcpy(_wllBuffer4, tmpWll, 80);
+	memcpy(_wllAutomapData, tmpWll, 80);
 	delete[] tmpWll;
 	restoreBlockTempData(_currentLevel);
 	addLevelItems();
@@ -4229,7 +4122,7 @@ bool LoLEngine::updateAutoMapIntern(uint16 block, uint16 x, uint16 y, int16 xOff
 	uint16 b = block + blockPosTable[6 + xOffs];
 
 	if (fx != -1) {
-		if (_wllBuffer4[_levelBlockProperties[b].walls[fx]] & 0xc0)
+		if (_wllAutomapData[_levelBlockProperties[b].walls[fx]] & 0xc0)
 			return false;
 	}
 
@@ -4237,13 +4130,13 @@ bool LoLEngine::updateAutoMapIntern(uint16 block, uint16 x, uint16 y, int16 xOff
 	b = block + blockPosTable[9 + yOffs];
 
 	if (fy != -1) {
-		if (_wllBuffer4[_levelBlockProperties[b].walls[fy]] & 0xc0)
+		if (_wllAutomapData[_levelBlockProperties[b].walls[fy]] & 0xc0)
 			return false;
 	}
 
 	b = block + blockPosTable[6 + xOffs] + blockPosTable[9 + yOffs];
 
-	if ((fx != -1) && (fy != -1) && (_wllBuffer4[_levelBlockProperties[b].walls[fx]] & 0xc0) && (_wllBuffer4[_levelBlockProperties[b].walls[fy]] & 0xc0))
+	if ((fx != -1) && (fy != -1) && (_wllAutomapData[_levelBlockProperties[b].walls[fx]] & 0xc0) && (_wllAutomapData[_levelBlockProperties[b].walls[fy]] & 0xc0))
 		return false;
 
 	_levelBlockProperties[b].flags |= 7;
@@ -4252,7 +4145,7 @@ bool LoLEngine::updateAutoMapIntern(uint16 block, uint16 x, uint16 y, int16 xOff
 }
 
 void LoLEngine::loadMapLegendData(int level) {
-	uint16 *legendData = (uint16 *)_tempBuffer5120;
+	uint16 *legendData= (uint16*)_tempBuffer5120;
 	for (int i = 0; i < 32; i++) {
 		legendData[i * 6] = 0xffff;
 		legendData[i * 6 + 5] = 0xffff;
@@ -4306,7 +4199,7 @@ void LoLEngine::drawMapPage(int pageNum) {
 
 		for (; bl < 1024; bl++) {
 			uint8 *w = _levelBlockProperties[bl].walls;
-			if ((_levelBlockProperties[bl].flags & 7) == 7 && (!(_wllBuffer4[w[0]] & 0xc0)) && (!(_wllBuffer4[w[2]] & 0xc0)) && (!(_wllBuffer4[w[1]] & 0xc0))&& (!(_wllBuffer4[w[3]] & 0xc0))) {
+			if ((_levelBlockProperties[bl].flags & 7) == 7 && (!(_wllAutomapData[w[0]] & 0xc0)) && (!(_wllAutomapData[w[2]] & 0xc0)) && (!(_wllAutomapData[w[1]] & 0xc0))&& (!(_wllAutomapData[w[3]] & 0xc0))) {
 				uint16 b0 = calcNewBlockPosition(bl, 0);
 				uint16 b2 = calcNewBlockPosition(bl, 2);
 				uint16 b1 = calcNewBlockPosition(bl, 1);
@@ -4323,25 +4216,25 @@ void LoLEngine::drawMapPage(int pageNum) {
 				// draw north wall
 				drawMapBlockWall(b3, w31, sx, sy, 3);
 				drawMapShape(w31, sx, sy, 3);
-				if (_wllBuffer4[w31] & 0xc0)
+				if (_wllAutomapData[w31] & 0xc0)
 					_screen->copyBlockAndApplyOverlay(_screen->_curPage, sx, sy, _screen->_curPage, sx, sy, 1, 6, 0, _mapOverlay);
 
 				// draw west wall
 				drawMapBlockWall(b1, w13, sx, sy, 1);
 				drawMapShape(w13, sx, sy, 1);
-				if (_wllBuffer4[w13] & 0xc0)
+				if (_wllAutomapData[w13] & 0xc0)
 					_screen->copyBlockAndApplyOverlay(_screen->_curPage, sx + 6, sy, _screen->_curPage, sx + 6, sy, 1, 6, 0, _mapOverlay);
 
 				// draw east wall
 				drawMapBlockWall(b0, w02, sx, sy, 0);
 				drawMapShape(w02, sx, sy, 0);
-				if (_wllBuffer4[w02] & 0xc0)
+				if (_wllAutomapData[w02] & 0xc0)
 					_screen->copyBlockAndApplyOverlay(_screen->_curPage, sx, sy, _screen->_curPage, sx, sy, 7, 1, 0, _mapOverlay);
 
 				//draw south wall
 				drawMapBlockWall(b2, w20, sx, sy, 2);
 				drawMapShape(w20, sx, sy, 2);
-				if (_wllBuffer4[w20] & 0xc0)
+				if (_wllAutomapData[w20] & 0xc0)
 					_screen->copyBlockAndApplyOverlay(_screen->_curPage, sx, sy + 5, _screen->_curPage, sx, sy + 5, 7, 1, 0, _mapOverlay);
 			}
 
@@ -4362,7 +4255,7 @@ void LoLEngine::drawMapPage(int pageNum) {
 		sx = mapGetStartPosX();
 		sy = mapGetStartPosY();
 
-		uint16 *legendData = (uint16 *)_tempBuffer5120;
+		uint16 *legendData = (uint16*)_tempBuffer5120;
 		uint8 yOffset = _flags.use16ColorMode ? 4 : 0;
 
 		for (int ii = 0; ii < 32; ii++)  {
@@ -4508,7 +4401,7 @@ void LoLEngine::redrawMapCursor() {
 }
 
 void LoLEngine::drawMapBlockWall(uint16 block, uint8 wall, int x, int y, int direction) {
-	if (((1 << direction) & _levelBlockProperties[block].flags) || ((_wllBuffer4[wall] & 0x1f) != 13))
+	if (((1 << direction) & _levelBlockProperties[block].flags) || ((_wllAutomapData[wall] & 0x1f) != 13))
 		return;
 
 	int cp = _screen->_curPage;
@@ -4518,7 +4411,7 @@ void LoLEngine::drawMapBlockWall(uint16 block, uint8 wall, int x, int y, int dir
 }
 
 void LoLEngine::drawMapShape(uint8 wall, int x, int y, int direction) {
-	int l = _wllBuffer4[wall] & 0x1f;
+	int l = _wllAutomapData[wall] & 0x1f;
 	if (l == 0x1f)
 		return;
 
@@ -4611,48 +4504,7 @@ void LoLEngine::printMapExitButtonText() {
 	_screen->setCurPage(cp);
 }
 
-void LoLEngine::generateTempData() {
-	int l = _currentLevel - 1;
-	if (_lvlTempData[l]) {
-		delete[] _lvlTempData[l]->wallsXorData;
-		delete[] _lvlTempData[l]->flags;
-		delete[] _lvlTempData[l]->monsters;
-		delete[] _lvlTempData[l]->flyingObjects;
-		delete _lvlTempData[l];
-	}
-
-	_lvlTempData[l] = new LevelTempData;
 
-	_lvlTempData[l]->wallsXorData = new uint8[4096];
-	_lvlTempData[l]->flags = new uint8[1024];
-	_lvlTempData[l]->monsters = new MonsterInPlay[30];
-	_lvlTempData[l]->flyingObjects = new FlyingObject[8];
-
-	Common::String filename = Common::String::format("LEVEL%d.CMZ", _currentLevel);
-
-	_screen->loadBitmap(filename.c_str(), 15, 15, 0);
-	const uint8 *p = _screen->getCPagePtr(14);
-	uint16 len = READ_LE_UINT16(p + 4);
-	p += 6;
-
-	memset(_lvlTempData[l]->wallsXorData, 0, 4096);
-	memset(_lvlTempData[l]->flags, 0, 1024);
-	uint8 *d = _lvlTempData[l]->wallsXorData;
-	uint8 *df = _lvlTempData[l]->flags;
-
-	for (int i = 0; i < 1024; i++) {
-		for (int ii = 0; ii < 4; ii++)
-			*d++ = p[i * len + ii] ^ _levelBlockProperties[i].walls[ii];
-		*df++ = _levelBlockProperties[i].flags;
-	}
-
-	memcpy(_lvlTempData[l]->monsters, _monsters,  sizeof(MonsterInPlay) * 30);
-	memcpy(_lvlTempData[l]->flyingObjects, _flyingObjects,  sizeof(FlyingObject) * 8);
-
-	_lvlTempData[l]->monsterDifficulty =_monsterDifficulty;
-
-	_hasTempDataFlags |= (1 << l);
-}
 
 } // End of namespace Kyra
 
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index eb2f6cf2d7..20519b78fb 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -25,7 +25,7 @@
 #ifndef KYRA_LOL_H
 #define KYRA_LOL_H
 
-#include "kyra/kyra_v1.h"
+#include "kyra/loleobbase.h"
 #include "kyra/script_tim.h"
 #include "kyra/script.h"
 #include "kyra/gui_lol.h"
@@ -86,15 +86,7 @@ struct SpellProperty {
 	uint16 flags;
 };
 
-struct LevelBlockProperty {
-	uint8 walls[4];
-	uint16 assignedObjects;
-	uint16 drawObjects;
-	uint8 direction;
-	uint8 flags;
-};
-
-struct MonsterProperty {
+struct LolMonsterProperty {
 	uint8 shapeIndex;
 	uint8 maxWidth;
 	uint16 fightingStats[9];
@@ -116,7 +108,7 @@ struct MonsterProperty {
 	uint8 sounds[3];
 };
 
-struct MonsterInPlay {
+struct LolMonsterInPlay {
 	uint16 nextAssignedObject;
 	uint16 nextDrawObject;
 	uint8 flyingHeight;
@@ -142,7 +134,7 @@ struct MonsterInPlay {
 	int16 hitPoints;
 	uint8 speedTick;
 	uint8 type;
-	MonsterProperty *properties;
+	LolMonsterProperty *properties;
 	uint8 numDistAttacks;
 	uint8 curDistWeapon;
 	int8 distAttackTick;
@@ -179,15 +171,6 @@ struct ItemProperty {
 	uint8 unkD;
 };
 
-struct LevelShapeProperty {
-	uint16 shapeIndex[10];
-	uint8 scaleFlag[10];
-	int16 shapeX[10];
-	int16 shapeY[10];
-	int8 next;
-	uint8 flags;
-};
-
 struct CompassDef {
 	uint8 shapeIndex;
 	int8 x;
@@ -195,7 +178,7 @@ struct CompassDef {
 	uint8 flags;
 };
 
-struct ButtonDef {
+struct LoLButtonDef {
 	uint16 buttonflags;
 	uint16 keyCode;
 	uint16 keyCode2;
@@ -207,12 +190,6 @@ struct ButtonDef {
 	uint16 screenDim;
 };
 
-struct OpenDoorState {
-	uint16 block;
-	int8 wall;
-	int8 state;
-};
-
 struct ActiveSpell {
 	uint8 spell;
 	const SpellProperty *p;
@@ -245,14 +222,6 @@ struct FlyingObjectShape {
 	uint8 flipFlags;
 };
 
-struct LevelTempData {
-	uint8 *wallsXorData;
-	uint8 *flags;
-	MonsterInPlay *monsters;
-	FlyingObject *flyingObjects;
-	uint8 monsterDifficulty;
-};
-
 struct MapLegendData {
 	uint8 shapeIndex;
 	bool enable;
@@ -296,7 +265,7 @@ struct MistOfDoomAnimData {
 	uint8 sound;
 };
 
-class LoLEngine : public KyraEngine_v1 {
+class LoLEngine : public LolEobBaseEngine {
 friend class GUI_LoL;
 friend class TextDisplayer_LoL;
 friend class TIMInterpreter_LoL;
@@ -305,7 +274,7 @@ friend class Debugger_LoL;
 friend class HistoryPlayer;
 public:
 	LoLEngine(OSystem *system, const GameFlags &flags);
-	~LoLEngine();
+	virtual ~LoLEngine();
 
 	virtual void initKeymap();
 
@@ -348,13 +317,11 @@ private:
 	// main loop
 	void runLoop();
 	void update();
-	void updateEnvironmentalSfx(int soundId);
 
 	// mouse
 	void setMouseCursorToIcon(int icon);
 	void setMouseCursorToItemInHand();
 	uint8 *getItemIconShapePtr(int index);
-	bool posWithinRect(int mouseX, int mouseY, int x1, int y1, int x2, int y2);
 
 	void checkFloatingPointerRegions();
 	int _floatingCursorControl;
@@ -443,11 +410,7 @@ private:
 
 	// timers
 	void setupTimers();
-	void enableTimer(int id);
-	void enableSysTimer(int sysTimer);
-	void disableSysTimer(int sysTimer);
 
-	void timerProcessDoors(int timerNum);
 	void timerProcessMonsters(int timerNum);
 	void timerSpecialCharacterUpdate(int timerNum);
 	void timerProcessFlyingObjects(int timerNum);
@@ -457,6 +420,9 @@ private:
 	void timerUpdateLampState(int timerNum);
 	void timerFadeMessageText(int timerNum);
 
+	uint8 getClock2Timer(int index) { return index < _numClock2Timers ? _clock2Timers[index] : 0; }
+	uint8 getNumClock2Timers()  { return _numClock2Timers; }
+
 	static const uint8 _clock2Timers[];
 	static const uint8 _numClock2Timers;
 
@@ -470,7 +436,7 @@ private:
 	int snd_updateCharacterSpeech();
 	void snd_stopSpeech(bool setFlag);
 	void snd_playSoundEffect(int track, int volume);
-	void snd_processEnvironmentalSoundEffect(int soundId, int block);
+	bool snd_processEnvironmentalSoundEffect(int soundId, int block);
 	void snd_queueEnvironmentalSoundEffect(int soundId, int block);
 	void snd_playQueuedEffects();
 	void snd_loadSoundFile(int track);
@@ -479,21 +445,17 @@ private:
 
 	int _lastSpeechId;
 	int _lastSpeaker;
-	uint32 _activeVoiceFileTotalTime;
 	int _lastSfxTrack;
 	int _lastMusicTrack;
 	int _curMusicFileIndex;
 	char _curMusicFileExt;
-	int _environmentSfx;
-	int _environmentSfxVol;
-	int _envSfxDistThreshold;
 	bool _envSfxUseQueue;
 	int _envSfxNumTracksInQueue;
 	uint16 _envSfxQueuedTracks[10];
 	uint16 _envSfxQueuedBlocks[10];
 	int _nextSpeechId;
 	int _nextSpeaker;
-	typedef Common::List<Audio::SeekableAudioStream *> SpeechList;
+	typedef Common::List<Audio::SeekableAudioStream*> SpeechList;
 	SpeechList _speechList;
 
 	int _curTlkFile;
@@ -502,9 +464,7 @@ private:
 	int _ingameSoundListSize;
 
 	const uint8 *_musicTrackMap;
-	int _musicTrackMapSize;
 	const uint16 *_ingameSoundIndex;
-	int _ingameSoundIndexSize;
 	const uint8 *_ingameGMSoundIndex;
 	int _ingameGMSoundIndexSize;
 	const uint8 *_ingameMT32SoundIndex;
@@ -519,7 +479,6 @@ private:
 	void gui_drawScene(int pageNum);
 	void gui_drawAllCharPortraitsWithStats();
 	void gui_drawCharPortraitWithStats(int charNum);
-	void gui_drawBox(int x, int y, int w, int h, int frameColor1, int frameColor2, int fillColor);
 	void gui_drawCharFaceShape(int charNum, int x, int y, int pageNum);
 	void gui_highlightPortraitFrame(int charNum);
 	void gui_drawLiveMagicBar(int x, int y, int curPoints, int unk, int maxPoints, int w, int h, int col1, int col2, int flag);
@@ -534,7 +493,6 @@ private:
 	void gui_printCharacterStats(int index, int redraw, int value);
 	void gui_changeCharacterStats(int charNum);
 	void gui_drawCharInventoryItem(int itemIndex);
-	void gui_drawBarGraph(int x, int y, int w, int h, int32 curVal, int32 maxVal, int col1, int col2);
 
 	int gui_enableControls();
 	int gui_disableControls(int controlMode);
@@ -548,37 +506,27 @@ private:
 	int _lastButtonShape;
 	uint32 _buttonPressTimer;
 	int _selectedCharacter;
-	int _compassDirection;
 	int _compassStep;
 	int _compassDirectionIndex;
 	uint32 _compassTimer;
 	int _charInventoryUnk;
 
 	const CompassDef *_compassDefs;
-	int _compassDefsSize;
 
 	void gui_updateInput();
 	void gui_triggerEvent(int eventType);
-	void removeInputTop();
 	void gui_enableDefaultPlayfieldButtons();
 	void gui_enableSequenceButtons(int x, int y, int w, int h, int enableFlags);
 	void gui_specialSceneRestoreButtons();
 	void gui_enableCharInventoryButtons(int charNum);
 
-	void gui_resetButtonList();
-	void gui_initButtonsFromList(const int16 *list);
 	void gui_setFaceFramesControlButtons(int index, int xOffs);
 	void gui_initCharInventorySpecialButtons(int charNum);
 	void gui_initMagicScrollButtons();
 	void gui_initMagicSubmenu(int charNum);
 	void gui_initButton(int index, int x = -1, int y = -1, int val = -1);
-	void gui_notifyButtonListChanged();
 
-	Common::Array<Button::Callback> _buttonCallbacks;
-	Button *_activeButtons;
-	Button _activeButtonData[70];
-	ButtonDef _sceneWindowButton;
-	bool _preserveEvents;
+	LoLButtonDef _sceneWindowButton;
 
 	int clickedUpArrow(Button *button);
 	int clickedDownArrow(Button *button);
@@ -613,45 +561,34 @@ private:
 	int clickedLamp(Button *button);
 	int clickedStatusIcon(Button *button);
 
-	const ButtonDef *_buttonData;
-	int _buttonDataSize;
+	Common::Array<Button::Callback> _buttonCallbacks;
+	const LoLButtonDef *_buttonData;
 	const int16 *_buttonList1;
-	int _buttonList1Size;
 	const int16 *_buttonList2;
-	int _buttonList2Size;
 	const int16 *_buttonList3;
-	int _buttonList3Size;
 	const int16 *_buttonList4;
-	int _buttonList4Size;
 	const int16 *_buttonList5;
-	int _buttonList5Size;
 	const int16 *_buttonList6;
-	int _buttonList6Size;
 	const int16 *_buttonList7;
-	int _buttonList7Size;
 	const int16 *_buttonList8;
-	int _buttonList8Size;
 
 	// text
 	int characterSays(int track, int charId, bool redraw);
 	int playCharacterScriptChat(int charId, int mode, int restorePortrait, char *str, EMCState *script, const uint16 *paramList, int16 paramIndex);
+	void setupDialogueButtons(int numStr, const char *s1, const char *s2, const char *s3);
 
 	TextDisplayer_LoL *_txt;
+	TextDisplayer_Eob *txt() { return _txt; }
 
 	// emc scripts
 	void runInitScript(const char *filename, int optionalFunc);
 	void runInfScript(const char *filename);
 	void runLevelScript(int block, int flags);
 	void runLevelScriptCustom(int block, int flags, int charNum, int item, int reg3, int reg4);
-	bool checkSceneUpdateNeed(int func);
 
 	EMCData _scriptData;
 	bool _suspendScript;
 	uint16 _scriptDirection;
-	uint16 _currentDirection;
-	uint16 _currentBlock;
-	bool _sceneUpdateRequired;
-	int16 _visibleBlockIndex[18];
 	int16 _globalScriptVars[24];
 
 	// emc opcode
@@ -702,7 +639,7 @@ private:
 	int olol_checkEquippedItemScriptFlags(EMCState *script);
 	int olol_setDoorState(EMCState *script);
 	int olol_updateBlockAnimations(EMCState *script);
-	int olol_mapShapeToBlock(EMCState *script);
+	int olol_assignLevelDecorationShape(EMCState *script);
 	int olol_resetBlockShapeAssignment(EMCState *script);
 	int olol_copyRegion(EMCState *script);
 	int olol_initMonster(EMCState *script);
@@ -716,7 +653,7 @@ private:
 	int olol_battleHitSkillTest(EMCState *script);
 	int olol_inflictDamage(EMCState *script);
 	int olol_moveMonster(EMCState *script);
-	int olol_dialogueBox(EMCState *script);
+	int olol_setupDialogueButtons(EMCState *script);
 	int olol_giveTakeMoney(EMCState *script);
 	int olol_checkMoney(EMCState *script);
 	int olol_setScriptTimer(EMCState *script);
@@ -792,7 +729,7 @@ private:
 	int olol_assignCustomSfx(EMCState *script);
 	int olol_findAssignedMonster(EMCState *script);
 	int olol_checkBlockForMonster(EMCState *script);
-	int olol_transformRegion(EMCState *script);
+	int olol_crossFadeRegion(EMCState *script);
 	int olol_calcCoordinatesAddDirectionOffset(EMCState *script);
 	int olol_resetPortraitsAndDisableSysTimer(EMCState *script);
 	int olol_enableSysTimer(EMCState *script);
@@ -820,7 +757,7 @@ private:
 	int olol_shakeScene(EMCState *script);
 	int olol_gasExplosion(EMCState *script);
 	int olol_calcNewBlockPosition(EMCState *script);
-	int olol_fadeScene(EMCState *script);
+	int olol_crossFadeScene(EMCState *script);
 	int olol_updateDrawPage2(EMCState *script);
 	int olol_setMouseCursor(EMCState *script);
 	int olol_characterSays(EMCState *script);
@@ -834,14 +771,14 @@ private:
 	// tim opcode
 	void setupOpcodeTable();
 
-	Common::Array<const TIMOpcode *> _timIntroOpcodes;
+	Common::Array<const TIMOpcode*> _timIntroOpcodes;
 	int tlol_setupPaletteFade(const TIM *tim, const uint16 *param);
 	int tlol_loadPalette(const TIM *tim, const uint16 *param);
 	int tlol_setupPaletteFadeEx(const TIM *tim, const uint16 *param);
 	int tlol_processWsaFrame(const TIM *tim, const uint16 *param);
 	int tlol_displayText(const TIM *tim, const uint16 *param);
 
-	Common::Array<const TIMOpcode *> _timOutroOpcodes;
+	Common::Array<const TIMOpcode*> _timOutroOpcodes;
 	int tlol_fadeInScene(const TIM *tim, const uint16 *param);
 	int tlol_unusedResourceFunc(const TIM *tim, const uint16 *param);
 	int tlol_fadeInPalette(const TIM *tim, const uint16 *param);
@@ -850,7 +787,7 @@ private:
 	int tlol_delayForChat(const TIM *tim, const uint16 *param);
 	int tlol_fadeOutSound(const TIM *tim, const uint16 *param);
 
-	Common::Array<const TIMOpcode *> _timIngameOpcodes;
+	Common::Array<const TIMOpcode*> _timIngameOpcodes;
 	int tlol_initSceneWindowDialogue(const TIM *tim, const uint16 *param);
 	int tlol_restoreAfterSceneWindowDialogue(const TIM *tim, const uint16 *param);
 	int tlol_giveItem(const TIM *tim, const uint16 *param);
@@ -900,7 +837,6 @@ private:
 	void createTransparencyTables();
 	void updateSequenceBackgroundAnimations();
 
-	bool _dialogueField;
 	uint8 **_itemIconShapes;
 	int _numItemIconShapes;
 	uint8 **_itemShapes;
@@ -913,7 +849,6 @@ private:
 	int _numEffectShapes;
 
 	const int8 *_gameShapeMap;
-	int _gameShapeMapSize;
 
 	uint8 *_characterFaceShapes[40][3];
 
@@ -942,19 +877,13 @@ private:
 
 	LoLCharacter *_characters;
 	uint16 _activeCharsXpos[3];
-	int _updateFlags;
-	int _updateCharNum;
-	int _updatePortraitSpeechAnimDuration;
+
 	int _portraitSpeechAnimMode;
-	int _resetPortraitAfterSpeechAnim;
 	int _textColorFlag;
-	bool _fadeText;
-	int _needSceneRestore;
 	uint32 _palUpdateTimer;
 	uint32 _updatePortraitNext;
 
 	int _loadLevelFlag;
-	int _hasTempDataFlags;
 	int _activeMagicMenu;
 	uint16 _scriptCharacterCycle;
 	int _charStatsTemp[5];
@@ -963,15 +892,10 @@ private:
 	int _charDefaultsSize;
 
 	const uint16 *_charDefsMan;
-	int _charDefsManSize;
 	const uint16 *_charDefsWoman;
-	int _charDefsWomanSize;
 	const uint16 *_charDefsKieran;
-	int _charDefsKieranSize;
 	const uint16 *_charDefsAkshel;
-	int _charDefsAkshelSize;
 	const int32 *_expRequirements;
-	int _expRequirementsSize;
 
 	// lamp
 	void resetLampStatus();
@@ -983,16 +907,14 @@ private:
 	int _lampOilStatus;
 	uint32 _lampStatusTimer;
 	bool _lampStatusSuspended;
-	uint8 _blockBrightness;
 
 	// level
 	void loadLevel(int index);
 	void addLevelItems();
-	void loadLevelWallData(int index, bool mapShapes);
+	void loadLevelWallData(int fileIndex, bool mapShapes);
 	void assignBlockObject(LevelBlockProperty *l, uint16 item);
-	int assignLevelShapes(int index);
-	uint8 *getLevelShapes(int index);
-	void restoreBlockTempData(int index);
+	int assignLevelDecorationShapes(int index);
+	uint8 *getLevelDecorationShapes(int index);
 	void restoreTempDataAdjustMonsterStrength(int index);
 	void loadBlockProperties(const char *cmzFile);
 	void loadLevelShpDat(const char *shpFile, const char *datFile, bool flag);
@@ -1006,17 +928,7 @@ private:
 
 	void drawScene(int pageNum);
 
-	void generateBlockDrawingBuffer();
-	void generateVmpTileData(int16 startBlockX, uint8 startBlockY, uint8 wllVmpIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY);
-	void generateVmpTileDataFlipped(int16 startBlockX, uint8 startBlockY, uint8 wllVmpIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY);
-	bool hasWall(int index);
-	void assignVisibleBlocks(int block, int direction);
-
-	void drawVcnBlocks();
 	void drawSceneShapes();
-	void setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim);
-	void scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim);
-	void drawLevelModifyScreenDim(int dim, int16 x1, int16 y1, int16 x2, int16 y2);
 	void drawDecorations(int index);
 	void drawBlockEffects(int index, int type);
 	void drawSpecialGuiShape(int pageNum);
@@ -1033,27 +945,17 @@ private:
 	void updateCompass();
 
 	void moveParty(uint16 direction, int unk1, int unk2, int buttonShape);
-	bool checkBlockPassability(uint16 block, uint16 direction);
 	void notifyBlockNotPassable(int scrollFlag);
+	virtual bool checkBlockPassability(uint16 block, uint16 direction);
 
-	uint16 calcNewBlockPosition(uint16 curBlock, uint16 direction);
 	uint16 calcBlockIndex(uint16 x, uint16 y);
 	void calcCoordinates(uint16 &x, uint16 &y, int block, uint16 xOffs, uint16 yOffs);
 	void calcCoordinatesForSingleCharacter(int charNum, uint16 &x, uint16 &y);
 	void calcCoordinatesAddDirectionOffset(uint16 &x, uint16 &y, int direction);
 
-	int clickedWallShape(uint16 block, uint16 direction);
-	int clickedLeverOn(uint16 block, uint16 direction);
-	int clickedLeverOff(uint16 block, uint16 direction);
-	int clickedWallOnlyScript(uint16 block);
 	int clickedDoorSwitch(uint16 block, uint16 direction);
 	int clickedNiche(uint16 block, uint16 direction);
 
-	bool clickedShape(int shapeIndex);
-	void processDoorSwitch(uint16 block, int unk);
-	void openCloseDoor(uint16 block, int openClose);
-	void completeDoorOperations();
-
 	void movePartySmoothScrollBlocked(int speed);
 	void movePartySmoothScrollUp(int speed);
 	void movePartySmoothScrollDown(int speed);
@@ -1069,79 +971,40 @@ private:
 
 	int smoothScrollDrawSpecialGuiShape(int pageNum);
 
-	OpenDoorState _openDoorState[3];
 	int _blockDoor;
 
 	int _smoothScrollModeNormal;
 
 	const uint8 *_scrollXTop;
-	int _scrollXTopSize;
 	const uint8 *_scrollYTop;
-	int _scrollYTopSize;
 	const uint8 *_scrollXBottom;
-	int _scrollXBottomSize;
 	const uint8 *_scrollYBottom;
-	int _scrollYBottomSize;
 
 	int _nextScriptFunc;
-	uint8 _currentLevel;
-	int _sceneDefaultUpdate;
-	int _lvlBlockIndex;
 	int _lvlShapeIndex;
 	bool _partyAwake;
-	uint8 *_vcnBlocks;
-	uint8 *_vcnShift;
-	uint8 *_vcnExpTable;
-	uint16 *_vmpPtr;
-	uint8 *_vcfBlocks;
-	uint16 *_blockDrawingBuffer;
-	uint8 *_sceneWindowBuffer;
-	LevelShapeProperty *_levelShapeProperties;
-	uint8 **_levelShapes;
 
 	uint8 *_specialGuiShape;
 	uint16 _specialGuiShapeX;
 	uint16 _specialGuiShapeY;
 	uint16 _specialGuiShapeMirrorFlag;
 
-	char _lastBlockDataFile[12];
 	char _lastOverridePalFile[12];
 	char *_lastOverridePalFilePtr;
 	int _lastSpecialColor;
 	int _lastSpecialColorWeight;
 
-	int _sceneDrawVarDown;
-	int _sceneDrawVarRight;
-	int _sceneDrawVarLeft;
-	int _wllProcessFlag;
-
 	uint8 *_transparencyTable2;
 	uint8 *_transparencyTable1;
 
 	int _loadSuppFilesFlag;
-
-	uint8 *_wllVmpMap;
-	int8 *_wllShapeMap;
-	uint8 *_specialWallTypes;
-	uint8 *_wllBuffer4;
-	uint8 *_wllWallFlags;
-
-	int16 *_lvlShapeTop;
-	int16 *_lvlShapeBottom;
-	int16 *_lvlShapeLeftRight;
-
-	LevelBlockProperty *_levelBlockProperties;
-	LevelBlockProperty *_visibleBlocks[18];
+	uint8 *_wllAutomapData;
 
 	uint16 _partyPosX;
 	uint16 _partyPosY;
 
 	Common::SeekableReadStream *_lvlShpFileHandle;
-	uint16 _lvlShpNum;
-	uint16 _levelFileDataSize;
-	LevelShapeProperty *_levelFileData;
 
-	uint8 *_doorShapes[2];
 	int _shpDmX;
 	int _shpDmY;
 	uint16 _dmScaleW;
@@ -1154,55 +1017,20 @@ private:
 	uint8 *_tempBuffer5120;
 
 	const char * const *_levelDatList;
-	int _levelDatListSize;
 	const char * const *_levelShpList;
-	int _levelShpListSize;
 
-	const int8 *_dscUnk1;
-	int _dscUnk1Size;
-	const int8 *_dscShapeIndex;
-	int _dscShapeIndexSize;
+	const int8 *_dscWalls;
+
 	const uint8 *_dscOvlMap;
-	int _dscOvlMapSize;
+	const uint8 *_dscShapeOvlIndex;
 	const uint16 *_dscShapeScaleW;
-	int _dscShapeScaleWSize;
 	const uint16 *_dscShapeScaleH;
-	int _dscShapeScaleHSize;
-	const int16 *_dscShapeX;
-	int _dscShapeXSize;
 	const int8 *_dscShapeY;
-	int _dscShapeYSize;
-	const uint8 *_dscTileIndex;
-	int _dscTileIndexSize;
-	const uint8 *_dscUnk2;
-	int _dscUnk2Size;
-	const uint8 *_dscDoorShpIndex;
-	int _dscDoorShpIndexSize;
-	const int8 *_dscDim1;
-	int _dscDim1Size;
-	const int8 *_dscDim2;
-	int _dscDim2Size;
-	const uint8 *_dscBlockMap;
-	int _dscBlockMapSize;
-	const uint8 *_dscDimMap;
-	int _dscDimMapSize;
+
 	const uint16 *_dscDoorMonsterScaleTable;
-	int _dscDoorMonsterScaleTableSize;
 	const uint16 *_dscDoor4;
-	int _dscDoor4Size;
-	const uint8 *_dscShapeOvlIndex;
-	int _dscShapeOvlIndexSize;
-	const int8 *_dscBlockIndex;
-	int _dscBlockIndexSize;
-	const uint8 *_dscDoor1;
-	int _dscDoor1Size;
 	const int16 *_dscDoorMonsterX;
-	int _dscDoorMonsterXSize;
 	const int16 *_dscDoorMonsterY;
-	int _dscDoorMonsterYSize;
-
-	int _sceneDrawPage1;
-	int _sceneDrawPage2;
 
 	// items
 	void giveCredits(int credits, int redraw);
@@ -1239,8 +1067,7 @@ private:
 	Item _itemInHand;
 	Item _inventory[48];
 	Item _inventoryCurItem;
-	int _currentControlMode;
-	int _specialSceneFlag;
+
 	int _lastCharInventory;
 	uint16 _charStatusFlags[3];
 	int _emcLastItem;
@@ -1250,34 +1077,27 @@ private:
 	EMCData _itemScript;
 
 	const uint8 *_charInvIndex;
-	int _charInvIndexSize;
 	const uint8 *_charInvDefs;
-	int _charInvDefsSize;
 	const uint16 *_inventorySlotDesc;
-	int _inventorySlotDescSize;
 	const uint16 *_itemCost;
-	int _itemCostSize;
 	const uint8 *_stashSetupData;
-	int _stashSetupDataSize;
 	const int8 *_sceneItemOffs;
-	int _sceneItemOffsSize;
 	const FlyingObjectShape *_flyingItemShapes;
-	int _flyingItemShapesSize;
 
 	// monsters
 	void loadMonsterShapes(const char *file, int monsterIndex, int b);
 	void releaseMonsterShapes(int monsterIndex);
 	int deleteMonstersFromBlock(int block);
-	void setMonsterMode(MonsterInPlay *monster, int mode);
-	bool updateMonsterAdjustBlocks(MonsterInPlay *monster);
-	void placeMonster(MonsterInPlay *monster, uint16 x, uint16 y);
+	void setMonsterMode(LolMonsterInPlay *monster, int mode);
+	bool updateMonsterAdjustBlocks(LolMonsterInPlay *monster);
+	void placeMonster(LolMonsterInPlay *monster, uint16 x, uint16 y);
 	int calcMonsterDirection(uint16 x1, uint16 y1, uint16 x2, uint16 y2);
-	void setMonsterDirection(MonsterInPlay *monster, int dir);
-	void monsterDropItems(MonsterInPlay *monster);
+	void setMonsterDirection(LolMonsterInPlay *monster, int dir);
+	void monsterDropItems(LolMonsterInPlay *monster);
 	void removeAssignedObjectFromBlock(LevelBlockProperty *l, uint16 id);
 	void removeDrawObjectFromBlock(LevelBlockProperty *l, uint16 id);
 	void assignMonsterToBlock(uint16 *assignedBlockObjects, uint16 id);
-	void giveItemToMonster(MonsterInPlay *monster, Item item);
+	void giveItemToMonster(LolMonsterInPlay *monster, Item item);
 	int checkBlockBeforeObjectPlacement(uint16 x, uint16 y, uint16 objectWidth, uint16 testFlag, uint16 wallFlag);
 	int checkBlockForWallsAndSufficientSpace(int block, int x, int y, int objectWidth, int testFlag, int wallFlag);
 	int calcMonsterSkillLevel(int id, int a);
@@ -1288,7 +1108,7 @@ private:
 
 	void drawBlockObjects(int blockArrayIndex);
 	void drawMonster(uint16 id);
-	int getMonsterCurFrame(MonsterInPlay *m, uint16 dirFlags);
+	int getMonsterCurFrame(LolMonsterInPlay *m, uint16 dirFlags);
 	void reassignDrawObjects(uint16 direction, uint16 itemIndex, LevelBlockProperty *l, bool flag);
 	void redrawSceneItem();
 	int calcItemMonsterPosition(ItemInPlay *i, uint16 direction);
@@ -1298,47 +1118,35 @@ private:
 	uint8 *drawItemOrMonster(uint8 *shape, uint8 *monsterPalette, int x, int y, int fineX, int fineY, int flags, int tblValue, bool vflip);
 	int calcDrawingLayerParameters(int srcX, int srcY, int &x2, int &y2, uint16 &w, uint16 &h, uint8 *shape, int vflip);
 
-	void updateMonster(MonsterInPlay *monster);
-	void moveMonster(MonsterInPlay *monster);
-	void walkMonster(MonsterInPlay *monster);
-	bool chasePartyWithDistanceAttacks(MonsterInPlay *monster);
-	void chasePartyWithCloseAttacks(MonsterInPlay *monster);
-	int walkMonsterCalcNextStep(MonsterInPlay *monster);
-	int getMonsterDistance(uint16 block1, uint16 block2);
+	void updateMonster(LolMonsterInPlay *monster);
+	void moveMonster(LolMonsterInPlay *monster);
+	void walkMonster(LolMonsterInPlay *monster);
+	bool chasePartyWithDistanceAttacks(LolMonsterInPlay *monster);
+	void chasePartyWithCloseAttacks(LolMonsterInPlay *monster);
+	int walkMonsterCalcNextStep(LolMonsterInPlay *monster);
 	int checkForPossibleDistanceAttack(uint16 monsterBlock, int direction, int distance, uint16 curBlock);
-	int walkMonsterCheckDest(int x, int y, MonsterInPlay *monster, int unk);
+	int walkMonsterCheckDest(int x, int y, LolMonsterInPlay *monster, int unk);
 	void getNextStepCoords(int16 monsterX, int16 monsterY, int &newX, int &newY, uint16 direction);
-	void rearrangeAttackingMonster(MonsterInPlay *monster);
-	void moveStrayingMonster(MonsterInPlay *monster);
-	void killMonster(MonsterInPlay *monster);
-
-	MonsterInPlay *_monsters;
-	MonsterProperty *_monsterProperties;
-	uint8 **_monsterShapes;
-	uint8 **_monsterPalettes;
-	uint8 **_monsterShapesEx;
+	void rearrangeAttackingMonster(LolMonsterInPlay *monster);
+	void moveStrayingMonster(LolMonsterInPlay *monster);
+	void killMonster(LolMonsterInPlay *monster);
+
+	LolMonsterInPlay *_monsters;
+	LolMonsterProperty *_monsterProperties;
+	uint8 **_monsterDecorationShapes;
 	uint8 _monsterAnimType[3];
 	uint16 _monsterCurBlock;
 	int _objectLastDirection;
-	int _monsterStepCounter;
-	int _monsterStepMode;
 
 	const uint16 *_monsterModifiers;
-	int _monsterModifiersSize;
 	const int8 *_monsterShiftOffs;
-	int _monsterShiftOffsSize;
 	const uint8 *_monsterDirFlags;
-	int _monsterDirFlagsSize;
 	const uint8 *_monsterScaleX;
-	int _monsterScaleXSize;
 	const uint8 *_monsterScaleY;
-	int _monsterScaleYSize;
 	const uint16 *_monsterScaleWH;
-	int _monsterScaleWHSize;
 
 	// misc
 	void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false);
-	int rollDice(int times, int pips);
 
 	uint8 _compassBroken;
 	uint8 _drainMagic;
@@ -1349,7 +1157,7 @@ private:
 
 	// spells
 	typedef Common::Functor1Mem<ActiveSpell *, int, LoLEngine> SpellProc;
-	Common::Array<const SpellProc *> _spellProcs;
+	Common::Array<const SpellProc*> _spellProcs;
 	typedef void (LoLEngine::*SpellProcCallback)(WSAMovie_v2 *, int, int);
 
 	int castSpell(int charNum, int spellType, int spellLevel);
@@ -1398,7 +1206,7 @@ private:
 	int8 _availableSpells[8];
 	int _selectedSpell;
 	const SpellProperty *_spellProperties;
-	int _spellPropertiesSize;
+	//int _spellPropertiesSize;
 	int _subMenuIndex;
 
 	LightningProperty *_lightningProps;
@@ -1420,13 +1228,9 @@ private:
 	static const MistOfDoomAnimData _mistAnimData[];
 
 	const uint8 *_updateSpellBookCoords;
-	int _updateSpellBookCoordsSize;
 	const uint8 *_updateSpellBookAnimData;
-	int _updateSpellBookAnimDataSize;
 	const uint8 *_healShapeFrames;
-	int _healShapeFramesSize;
 	const int16 *_fireBallCoords;
-	int _fireBallCoordsSize;
 
 	// fight
 	int battleHitSkillTest(int16 attacker, int16 target, int skill);
@@ -1437,8 +1241,8 @@ private:
 	int calcInflictableDamagePerItem(int16 attacker, int16 target, uint16 itemMight, int index, int hitType);
 	void checkForPartyDeath();
 
-	void applyMonsterAttackSkill(MonsterInPlay *monster, int16 target, int16 damage);
-	void applyMonsterDefenseSkill(MonsterInPlay *monster, int16 attacker, int flags, int skill, int damage);
+	void applyMonsterAttackSkill(LolMonsterInPlay *monster, int16 target, int16 damage);
+	void applyMonsterDefenseSkill(LolMonsterInPlay *monster, int16 attacker, int flags, int skill, int damage);
 	int removeCharacterItem(int charNum, int itemFlags);
 	int paralyzePoisonCharacter(int charNum, int typeFlag, int immunityFlags, int hitChance, int redraw);
 	void paralyzePoisonAllCharacters(int typeFlag, int immunityFlags, int hitChance);
@@ -1478,7 +1282,6 @@ private:
 	uint8 *_mapOverlay;
 	const uint8 **_automapShapes;
 	const uint16 *_autoMapStrings;
-	int _autoMapStringsSize;
 	MapLegendData *_defaultLegendData;
 	uint8 *_mapCursorOverlay;
 	uint8 _automapTopLeftX;
@@ -1495,10 +1298,15 @@ private:
 	Common::Error loadGameState(int slot);
 	Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail);
 
-	Graphics::Surface *generateSaveThumbnail() const;
+	void *generateMonsterTempData(LevelTempData *tmp);
+	void *generateFlyingObjectTempData(LevelTempData *tmp);
+	void restoreBlockTempData(int levelIndex);
+	void restoreMonsterTempData(LevelTempData *tmp);
+	void restoreFlyingObjectTempData(LevelTempData *tmp);
+	void releaseMonsterTempData(LevelTempData *tmp);
+	void releaseFlyingObjectTempData(LevelTempData *tmp);
 
-	void generateTempData();
-	LevelTempData *_lvlTempData[29];
+	Graphics::Surface *generateSaveThumbnail() const;
 };
 
 class HistoryPlayer {
diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
new file mode 100644
index 0000000000..05b683b830
--- /dev/null
+++ b/engines/kyra/loleobbase.cpp
@@ -0,0 +1,354 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/loleobbase.h"
+#include "kyra/sound.h"
+
+#include "common/system.h"
+
+namespace Kyra {
+
+LolEobBaseEngine::LolEobBaseEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(system, flags) {
+	_txt = 0;
+	_mouseClick = 0;
+	_preserveEvents = _buttonListChanged = false;
+
+	_sceneXoffset = 0;
+	_sceneShpDim = 5;
+	_activeButtons = 0;
+
+	_currentLevel = 0;
+
+	_vmpPtr = 0;
+	_vcnBlocks = 0;
+	_vcfBlocks = 0;
+	_vcnShift = 0;
+	_vcnExpTable = 0;
+	_vmpPtr = 0;
+	_blockBrightness = _wllVcnOffset = 0;
+	_blockDrawingBuffer = 0;
+	_sceneWindowBuffer = 0;
+	_monsterShapes = _monsterPalettes = 0;
+
+	_doorShapes = 0;
+
+	_levelDecorationProperties = 0;
+	_levelDecorationData = 0;
+	_levelDecorationShapes = 0;
+	_decorationCount = 0;
+	_mappedDecorationsCount = 0;
+	memset(_visibleBlockIndex, 0, sizeof(_visibleBlockIndex));
+
+	_lvlShapeTop = _lvlShapeBottom = _lvlShapeLeftRight = 0;
+	_levelBlockProperties = 0;
+	_hasTempDataFlags = 0;
+
+	_wllVmpMap = _specialWallTypes = _wllWallFlags = 0;
+	_wllShapeMap = 0;
+
+	_sceneDrawVarDown = _sceneDrawVarRight = _sceneDrawVarLeft = _wllProcessFlag = 0;
+
+	_currentBlock = 0;
+	_currentDirection = 0;
+	_compassDirection = -1;
+	_updateFlags = _clickedSpecialFlag = 0;
+	_sceneDefaultUpdate = 0;
+	_sceneUpdateRequired = false;
+
+	_clickedShapeXOffs = _clickedShapeYOffs = 0;
+
+	_dscShapeX = 0;
+	_dscTileIndex = 0;
+	_dscUnk2 = 0;
+	_dscDim1 = 0;
+	_dscDim2 = 0;
+	_dscBlockMap = 0;
+	_dscBlockIndex = 0;
+	_dscShapeIndex = 0;
+	_dscDimMap = 0;
+	_dscDoorShpIndex = 0;
+	_dscDoorY2 = 0;
+
+	_shpDmX1 = _shpDmX2 = 0;
+
+	memset(_openDoorState, 0, sizeof(_openDoorState));
+	memset(_dialogueButtonString, 0, 3 * sizeof(const char *));
+	_dialogueButtonPosX = 0;
+	_dialogueButtonPosY = 0;
+	_dialogueNumButtons = _dialogueButtonYoffs = _dialogueHighlightedButton = 0;
+	_currentControlMode = 0;
+	_specialSceneFlag = 0;
+	_dialogueButtonLabelCol1 = 9;
+	_dialogueButtonLabelCol2 = 15;
+	_dialogueButtonW = 95;
+	_dialogueButtonH = 9;
+
+	_updateCharNum = -1;
+	_activeVoiceFileTotalTime = 0;
+	_updatePortraitSpeechAnimDuration = _resetPortraitAfterSpeechAnim = _needSceneRestore = 0;
+	_fadeText = false;
+
+	memset(_lvlTempData, 0, sizeof(_lvlTempData));
+
+	_dialogueField = false;
+
+	_environmentSfx = _environmentSfxVol = _envSfxDistThreshold = 0;
+	_monsterStepCounter = _monsterStepMode = 0;
+}
+
+LolEobBaseEngine::~LolEobBaseEngine() {
+	delete[] _wllVmpMap;
+	delete[] _wllShapeMap;
+	delete[] _specialWallTypes;
+	delete[] _wllWallFlags;
+
+	delete[] _vmpPtr;
+	delete[] _vcnExpTable;
+	delete[] _vcnBlocks;
+	delete[] _vcfBlocks;
+	delete[] _vcnShift;
+	delete[] _blockDrawingBuffer;
+	delete[] _sceneWindowBuffer;
+
+	delete[] _lvlShapeTop;
+	delete[] _lvlShapeBottom;
+	delete[] _lvlShapeLeftRight;
+
+	delete[] _doorShapes;
+
+	delete[] _levelDecorationShapes;
+	delete[] _levelDecorationData;
+	delete[] _levelDecorationProperties;
+	delete[] _levelBlockProperties;
+
+	delete _txt;
+	_txt = 0;
+}
+
+Common::Error LolEobBaseEngine::init() {
+	_levelDecorationProperties = new LevelDecorationProperty[100];
+	memset(_levelDecorationProperties, 0, 100 * sizeof(LevelDecorationProperty));
+	_levelDecorationShapes = new uint8*[400];
+	memset(_levelDecorationShapes, 0, 400 * sizeof(uint8*));
+	_levelBlockProperties = new LevelBlockProperty[1025];
+	memset(_levelBlockProperties, 0, 1025 * sizeof(LevelBlockProperty));
+
+	_wllVmpMap = new uint8[255];
+	memset(_wllVmpMap, 0, 255);
+	_wllShapeMap = new int8[255];
+	memset(_wllShapeMap, 0, 255);
+	_specialWallTypes = new uint8[255];
+	memset(_specialWallTypes, 0, 255);
+	_wllWallFlags = new uint8[255];
+	memset(_wllWallFlags, 0, 255);
+
+	_blockDrawingBuffer = new uint16[1320];
+	memset(_blockDrawingBuffer, 0, 1320 * sizeof(uint16));
+	_sceneWindowBuffer = new uint8[21120];
+	memset(_sceneWindowBuffer, 0, 21120);
+
+	_lvlShapeTop = new int16[18];
+	memset(_lvlShapeTop, 0, 18 * sizeof(int16));
+	_lvlShapeBottom = new int16[18];
+	memset(_lvlShapeBottom, 0, 18 * sizeof(int16));
+	_lvlShapeLeftRight = new int16[36];
+	memset(_lvlShapeLeftRight, 0, 36 * sizeof(int16));
+
+	_vcnExpTable = new uint8[128];
+	for (int i = 0; i < 128; i++)
+		_vcnExpTable[i] = i & 0x0f;
+
+	_doorShapes = new uint8*[6];
+	memset(_doorShapes, 0, 6 * sizeof(uint8*));
+
+	initStaticResource();
+
+	_envSfxDistThreshold = (_sound->getSfxType() == Sound::kAdLib || _sound->getSfxType() == Sound::kPCSpkr) ? 15 : 3;
+
+	return Common::kNoError;
+}
+
+bool LolEobBaseEngine::posWithinRect(int mouseX, int mouseY, int x1, int y1, int x2, int y2) {
+	if (mouseX < x1 || mouseX > x2 || mouseY < y1 || mouseY > y2)
+		return false;
+	return true;
+}
+
+void LolEobBaseEngine::drawDialogueButtons() {
+	int cp = screen()->setCurPage(0);
+	Screen::FontId of = screen()->setFont(gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
+
+	for (int i = 0; i < _dialogueNumButtons; i++) {
+		int x = _dialogueButtonPosX[i];
+		if (gameFlags().use16ColorMode) {
+			gui_drawBox(x, ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1, 74, 10, 0xee, 0xcc, -1);
+			screen()->printText(_dialogueButtonString[i], (x + 37 - (screen()->getTextWidth(_dialogueButtonString[i])) / 2) & ~3,
+				((_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2) & ~7, _dialogueHighlightedButton == i ? 0xc1 : 0xe1, 0);
+		} else {
+			gui_drawBox(x, (_dialogueButtonYoffs + _dialogueButtonPosY[i]), _dialogueButtonW, _dialogueButtonH, _color1_1, _color2_1, _bkgColor_1);
+			screen()->printText(_dialogueButtonString[i], x + (_dialogueButtonW >> 1) - (screen()->getTextWidth(_dialogueButtonString[i])) / 2,
+				(_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2, _dialogueHighlightedButton == i ? _dialogueButtonLabelCol1 : _dialogueButtonLabelCol2, 0);
+		}
+	}
+	screen()->setFont(of);
+	screen()->setCurPage(cp);
+}
+
+uint16 LolEobBaseEngine::processDialogue() {
+	int df = _dialogueHighlightedButton;
+	int res = 0;
+
+	for (int i = 0; i < _dialogueNumButtons; i++) {
+		int x = _dialogueButtonPosX[i];
+		int y = (gameFlags().use16ColorMode ? ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1 : (_dialogueButtonYoffs + _dialogueButtonPosY[i]));
+		Common::Point p = getMousePos();
+		if (posWithinRect(p.x, p.y, x, y, x + _dialogueButtonW, y + _dialogueButtonH)) {
+			_dialogueHighlightedButton = i;
+			break;
+		}
+	}
+
+	if (_dialogueNumButtons == 0) {
+		int e = checkInput(0, false) & 0xFF;
+		removeInputTop();
+
+		if (e) {
+			gui_notifyButtonListChanged();
+
+			if (e == _keyMap[Common::KEYCODE_SPACE] || e == _keyMap[Common::KEYCODE_RETURN]) {
+				snd_stopSpeech(true);
+			}
+		}
+
+		if (snd_updateCharacterSpeech() != 2) {
+				res = 1;
+				if (!shouldQuit()) {
+					removeInputTop();
+					gui_notifyButtonListChanged();
+				}
+		}
+	} else {
+		int e = checkInput(0, false) & 0xFF;
+		removeInputTop();
+		if (e)
+			gui_notifyButtonListChanged();
+
+		if (_flags.gameID == GI_LOL && (e == 200 || e == 202) || _flags.gameID != GI_LOL && (e == 199 || e == 201)) {
+			for (int i = 0; i < _dialogueNumButtons; i++) {
+				int x = _dialogueButtonPosX[i];
+				int y = (gameFlags().use16ColorMode ? ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1 : (_dialogueButtonYoffs + _dialogueButtonPosY[i]));
+				Common::Point p = getMousePos();
+				if (posWithinRect(p.x, p.y, x, y, x + _dialogueButtonW, y + _dialogueButtonH)) {
+					_dialogueHighlightedButton = i;
+					res = _dialogueHighlightedButton + 1;
+					break;
+				}
+			}
+		} else if (e == _keyMap[Common::KEYCODE_SPACE] || e == _keyMap[Common::KEYCODE_RETURN]) {
+			snd_stopSpeech(true);
+			res = _dialogueHighlightedButton + 1;
+		} else if (e == _keyMap[Common::KEYCODE_LEFT] || e == _keyMap[Common::KEYCODE_DOWN]) {
+			if (_dialogueNumButtons > 1 && _dialogueHighlightedButton > 0)
+				_dialogueHighlightedButton--;
+		} else if (e == _keyMap[Common::KEYCODE_RIGHT] || e == _keyMap[Common::KEYCODE_UP]) {
+			if (_dialogueNumButtons > 1 && _dialogueHighlightedButton < (_dialogueNumButtons - 1))
+				_dialogueHighlightedButton++;
+		}
+	}
+
+	if (df != _dialogueHighlightedButton)
+		drawDialogueButtons();
+
+	screen()->updateScreen();
+
+	if (res == 0)
+		return 0;
+
+	stopPortraitSpeechAnim();
+
+	if (game() == GI_LOL) {
+		if (!textEnabled() && _currentControlMode) {
+			screen()->setScreenDim(5);
+			const ScreenDim *d = screen()->getScreenDim(5);
+			screen()->fillRect(d->sx, d->sy + d->h - 9, d->sx + d->w - 1, d->sy + d->h - 1, d->unkA);
+		} else {
+			const ScreenDim *d = screen()->_curDim;
+			if (gameFlags().use16ColorMode)
+				screen()->fillRect(d->sx, d->sy, d->sx + d->w - 3, d->sy + d->h - 2, d->unkA);
+			else
+				screen()->fillRect(d->sx, d->sy, d->sx + d->w - 2, d->sy + d->h - 1, d->unkA);
+			txt()->clearDim(4);
+			txt()->resetDimTextPositions(4);
+		}
+	}
+
+	return res;
+}
+
+void LolEobBaseEngine::delayUntil(uint32 time, bool doUpdate, bool isMainLoop) {
+	uint32 curTime = _system->getMillis();
+	if (time > curTime)
+		delay(time - curTime, doUpdate, isMainLoop);
+}
+
+int LolEobBaseEngine::rollDice(int times, int pips, int inc) {
+	if (times <= 0 || pips <= 0)
+		return inc;
+
+	int res = 0;
+	while (times--)
+		res += _rnd.getRandomNumberRng(1, pips);
+
+	return res + inc;
+}
+
+bool LolEobBaseEngine::snd_processEnvironmentalSoundEffect(int soundId, int block) {
+	if (!_sound->sfxEnabled() || shouldQuit())
+		return false;
+
+	if (_environmentSfx)
+		snd_playSoundEffect(_environmentSfx, _environmentSfxVol);
+
+	int dist = 0;
+	if (block) {
+		dist = getBlockDistance(_currentBlock, block);
+		if (dist > _envSfxDistThreshold) {
+			_environmentSfx = 0;
+			return false;
+		}
+	}
+
+	_environmentSfx = soundId;
+	_environmentSfxVol = (15 - ((block || (_flags.gameID == GI_LOL && dist < 2)) ? dist : 0)) << 4;
+
+	return true;
+}
+
+void LolEobBaseEngine::updateEnvironmentalSfx(int soundId) {
+	snd_processEnvironmentalSoundEffect(soundId, _currentBlock);
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/loleobbase.h b/engines/kyra/loleobbase.h
new file mode 100644
index 0000000000..042f9c0e78
--- /dev/null
+++ b/engines/kyra/loleobbase.h
@@ -0,0 +1,324 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 KYRA_LOLEOBBASE_H
+#define KYRA_LOLEOBBASE_H
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/kyra_v1.h"
+#include "kyra/screen_eob.h"
+#include "kyra/gui_eob.h"
+#include "kyra/text_lol.h"
+
+namespace Kyra {
+
+struct LevelDecorationProperty {
+	uint16 shapeIndex[10];
+	uint8 scaleFlag[10];
+	int16 shapeX[10];
+	int16 shapeY[10];
+	int8 next;
+	uint8 flags;
+};
+
+struct LevelBlockProperty {
+	uint8 walls[4];
+	uint16 assignedObjects;
+	uint16 drawObjects;
+	uint8 direction;
+	uint16 flags;
+};
+
+struct OpenDoorState {
+	uint16 block;
+	int8 wall;
+	int8 state;
+};
+
+struct LevelTempData {
+	uint8 *wallsXorData;
+	uint16 *flags;
+	void *monsters;
+	void *flyingObjects;
+	uint8 monsterDifficulty;
+};
+
+class LolEobBaseEngine : public KyraEngine_v1 {
+friend class TextDisplayer_Eob;
+public:
+	LolEobBaseEngine(OSystem *system, const GameFlags &flags);
+	virtual ~LolEobBaseEngine();
+
+	virtual Screen *screen() = 0;
+	virtual GUI *gui() const = 0;
+
+protected:
+	// Startup
+	virtual Common::Error init();
+	virtual Common::Error go() = 0;
+
+	// Init
+	void initStaticResource();
+
+	const uint8 **_itemIconShapes;
+
+	// Main loop
+	virtual void update() = 0;
+	void updateEnvironmentalSfx(int soundId);
+
+	// timers
+	virtual void setupTimers() = 0;
+	void enableSysTimer(int sysTimer);
+	void disableSysTimer(int sysTimer);
+	void enableTimer(int id);
+	virtual uint8 getClock2Timer(int index) = 0;
+	virtual uint8 getNumClock2Timers() = 0;
+
+	void timerProcessDoors(int timerNum);
+
+	// mouse
+	bool posWithinRect(int mouseX, int mouseY, int x1, int y1, int x2, int y2);
+	virtual void setHandItem(Item itemIndex) = 0;
+
+	// Characters
+	int _updateCharNum;
+	int _updatePortraitSpeechAnimDuration;
+	bool _fadeText;
+	int _resetPortraitAfterSpeechAnim;
+	int _needSceneRestore;
+
+	// Items
+	int _itemInHand;
+
+	// Monsters
+	int getBlockDistance(uint16 block1, uint16 block2);
+
+	uint8 **_monsterPalettes;
+	uint8 **_monsterShapes;
+
+	int16 _shpDmX1;
+	int16 _shpDmX2;
+
+	int _monsterStepCounter;
+	int _monsterStepMode;
+
+	// Level
+	virtual void addLevelItems() = 0;
+	virtual void loadBlockProperties(const char *file) = 0;
+
+	virtual void drawScene(int pageNum) = 0;
+	virtual void drawSceneShapes() = 0;
+	virtual void drawDecorations(int index) = 0;
+
+	void setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim);
+	void scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim);
+	void drawLevelModifyScreenDim(int dim, int16 x1, int16 y1, int16 x2, int16 y2);
+	void generateBlockDrawingBuffer();
+	void generateVmpTileData(int16 startBlockX, uint8 startBlockY, uint8 wllVmpIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY);
+	void generateVmpTileDataFlipped(int16 startBlockX, uint8 startBlockY, uint8 wllVmpIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY);
+	bool hasWall(int index);
+	void assignVisibleBlocks(int block, int direction);
+	bool checkSceneUpdateNeed(int block);
+	void drawVcnBlocks();
+	uint16 calcNewBlockPosition(uint16 curBlock, uint16 direction);
+
+	virtual int clickedDoorSwitch(uint16 block, uint16 direction) = 0;
+	int clickedWallShape(uint16 block, uint16 direction);
+	int clickedLeverOn(uint16 block, uint16 direction);
+	int clickedLeverOff(uint16 block, uint16 direction);
+	int clickedWallOnlyScript(uint16 block);
+	virtual int clickedNiche(uint16 block, uint16 direction) = 0;
+
+	void processDoorSwitch(uint16 block, int openClose);
+	void openCloseDoor(int block, int openClose);
+	void completeDoorOperations();
+
+	uint8 *_wllVmpMap;
+	int8 *_wllShapeMap;
+	uint8 *_specialWallTypes;
+	uint8 *_wllWallFlags;
+
+	int _sceneXoffset;
+	int _sceneShpDim;
+
+	LevelBlockProperty *_levelBlockProperties;
+	LevelBlockProperty *_visibleBlocks[18];
+	LevelDecorationProperty *_levelDecorationData;
+	uint16 _levelDecorationDataSize;
+	LevelDecorationProperty *_levelDecorationProperties;
+	uint8 **_levelDecorationShapes;
+	uint16 _decorationCount;
+	int16 _mappedDecorationsCount;
+	uint16 *_vmpPtr;
+	uint8 *_vcnBlocks;
+	uint8 *_vcfBlocks;
+	uint8 *_vcnShift;
+	uint8 *_vcnExpTable;
+	uint16 *_blockDrawingBuffer;
+	uint8 *_sceneWindowBuffer;
+	uint8 _blockBrightness;
+	uint8 _wllVcnOffset;
+
+	uint8 **_doorShapes;
+
+	uint8 _currentLevel;
+	uint16 _currentBlock;
+	uint16 _currentDirection;
+	int _sceneDefaultUpdate;
+	bool _sceneUpdateRequired;
+
+	int16 _visibleBlockIndex[18];
+	int16 *_lvlShapeLeftRight;
+	int16 *_lvlShapeTop;
+	int16 *_lvlShapeBottom;
+
+	char _lastBlockDataFile[13];
+	uint32 _hasTempDataFlags;
+
+	int16 _sceneDrawVarDown;
+	int16 _sceneDrawVarRight;
+	int16 _sceneDrawVarLeft;
+	int _wllProcessFlag;
+
+	OpenDoorState _openDoorState[3];
+
+	int _sceneDrawPage1;
+	int _sceneDrawPage2;
+
+	const int8 *_dscShapeIndex;
+	const uint8 *_dscDimMap;
+	const int8 *_dscDim1;
+	const int8 *_dscDim2;
+	const int16 *_dscShapeX;
+	const uint8 *_dscUnk2;
+	const uint8 *_dscBlockMap;
+	const int8 *_dscBlockIndex;
+	const uint8 *_dscTileIndex;
+
+	const uint8 *_dscDoorShpIndex;
+	const uint8 *_dscDoorY2;
+
+	// Script
+	virtual void runLevelScript(int block, int flags) = 0;
+
+	// Gui
+	void removeInputTop();
+	void gui_drawBox(int x, int y, int w, int h, int frameColor1, int frameColor2, int fillColor);
+	virtual void gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32 curVal, int32 maxVal, int col1, int col2);
+	void gui_initButtonsFromList(const int16 *list);
+	virtual void gui_initButton(int index, int x = -1, int y = -1, int val = -1) = 0;
+	void gui_resetButtonList();
+	void gui_notifyButtonListChanged();
+
+	bool clickedShape(int shapeIndex);
+
+	int _clickedShapeXOffs;
+	int _clickedShapeYOffs;
+
+	Button *_activeButtons;
+	Button _activeButtonData[70];
+
+	uint8 _mouseClick;
+	bool _preserveEvents;
+	bool _buttonListChanged;
+
+	int _updateFlags;
+	int _clickedSpecialFlag;
+
+	int _compassDirection;
+
+	static const uint8 _dropItemDirIndex[];
+
+	// text
+	void drawDialogueButtons();
+	uint16 processDialogue();
+
+	TextDisplayer_Eob *_txt;
+	virtual TextDisplayer_Eob *txt() { return _txt; }
+
+	bool _dialogueField;
+
+	const char *_dialogueButtonString[9];
+	const uint16 *_dialogueButtonPosX;
+	const uint8 *_dialogueButtonPosY;
+	int16 _dialogueButtonYoffs;
+	uint16 _dialogueButtonW;
+	uint16 _dialogueButtonH;
+	int _dialogueNumButtons;
+	int _dialogueHighlightedButton;
+	int _currentControlMode;
+	int _specialSceneFlag;
+	uint8 _dialogueButtonLabelCol1;
+	uint8 _dialogueButtonLabelCol2;
+
+	int _bkgColor_1;
+	uint8 _color1_1;
+	uint8 _color2_1;
+
+	const char *const *_moreStrings;
+
+	// misc
+	virtual void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false) = 0;
+	void delayUntil(uint32 time, bool doUpdate = false, bool isMainLoop = false);
+	int rollDice(int times, int pips, int inc = 0);
+
+	virtual Common::Error loadGameState(int slot) = 0;
+	virtual Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail) = 0;
+
+	void generateTempData();
+	void restoreBlockTempData(int levelIndex);
+	void releaseTempData();
+	virtual void *generateMonsterTempData(LevelTempData *tmp) = 0;
+	virtual void *generateFlyingObjectTempData(LevelTempData *tmp) = 0;
+	virtual void restoreMonsterTempData(LevelTempData *tmp) = 0;
+	virtual void restoreFlyingObjectTempData(LevelTempData *tmp) = 0;
+	virtual void releaseMonsterTempData(LevelTempData *tmp) = 0;
+	virtual void releaseFlyingObjectTempData(LevelTempData *tmp) = 0;
+
+	LevelTempData *_lvlTempData[29];
+
+	// sound
+	virtual bool snd_processEnvironmentalSoundEffect(int soundId, int block);
+	virtual void snd_stopSpeech(bool) {}
+	virtual int snd_updateCharacterSpeech() { return 0; }
+	virtual void stopPortraitSpeechAnim() {}
+	virtual void setupOpcodeTable() {}
+	virtual void snd_playVoiceFile(int) {}
+
+	int _environmentSfx;
+	int _environmentSfxVol;
+	int _envSfxDistThreshold;
+
+	uint32 _activeVoiceFileTotalTime;
+
+	// unused
+	void setWalkspeed(uint8) {}
+	void removeHandItem() {}
+	bool lineIsPassable(int, int) { return false; }
+};
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB || ENABLE_LOL
+
+#endif
\ No newline at end of file
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
new file mode 100644
index 0000000000..aefe20c06a
--- /dev/null
+++ b/engines/kyra/magic_eob.cpp
@@ -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.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#include "kyra/eobcommon.h"
+#include "kyra/resource.h"
+
+namespace Kyra {
+
+void EobCoreEngine::useMagicBookOrSymbol(int charIndex, int type) {
+	EobCharacter *c = &_characters[charIndex];
+	_openBookSpellLevel = c->slotStatus[3];
+	_openBookSpellSelectedItem = c->slotStatus[2];
+	_openBookSpellListOffset = c->slotStatus[4];
+	_openBookChar = charIndex;
+	_openBookType = type;
+	_openBookSpellList = (type == 1) ? _clericSpellList : _mageSpellList;
+	_openBookAvailableSpells = (type == 1) ? c->clericSpells : c->mageSpells;
+	int8 *tmp = _openBookAvailableSpells + _openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem;
+
+	if (*tmp <= 0) {
+		for (bool loop = true; loop && _openBookSpellSelectedItem < 10; ) {
+			tmp = _openBookAvailableSpells + _openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem;
+			if (*tmp > 0) {
+				if (_openBookSpellSelectedItem > 5) {
+					_openBookSpellListOffset = 6;
+					_openBookSpellSelectedItem -= 6;
+				}
+				loop = false;
+			} else {
+				_openBookSpellSelectedItem++;
+			}
+		}
+
+		if (_openBookSpellSelectedItem == 10) {
+			_openBookSpellListOffset = 0;
+			_openBookSpellSelectedItem = 6;
+		}
+	}
+
+	if (!_updateFlags)
+		_screen->copyRegion(64, 121, 0, 0, 112, 56, 0, 10, Screen::CR_NO_P_CHECK);
+	_updateFlags = 1;
+	gui_setPlayFieldButtons();
+	gui_drawSpellbook();
+}
+
+void EobCoreEngine::useMagicScroll(int charIndex, int type, int weaponSlot) {
+	_openBookCharBackup = _openBookChar;
+	_openBookTypeBackup = _openBookType;
+	_castScrollSlot = weaponSlot + 1;
+	_openBookChar = charIndex;
+	_openBookType = type <= _clericSpellOffset ? 0 : 1;
+	castSpell(type, weaponSlot);
+}
+
+void EobCoreEngine::usePotion(int charIndex, int weaponSlot) {
+	EobCharacter *c = &_characters[_openBookChar];
+	int offset = (_flags.gameID == GI_EOB1) ? 13 : (_flags.lang == Common::DE_DEU ? 19 : 15);
+
+	int val = deleteInventoryItem(charIndex, weaponSlot);
+	snd_playSoundEffect(10);
+
+	switch (val) {
+	case 0:
+		sparkEffectDefensive(charIndex);
+		c->strengthCur = 22;
+		c->strengthExtCur = 0;
+		setCharEventTimer(charIndex, 546 * rollDice(1, 4, 4), 7, 1);
+		break;
+
+	case 1:
+		sparkEffectDefensive(charIndex);
+		modifyCharacterHitpoints(charIndex, rollDice(2, 4, 2));
+		break;
+
+	case 2:
+		sparkEffectDefensive(charIndex);
+		modifyCharacterHitpoints(charIndex, rollDice(3, 8, 3));
+		break;
+
+	case 3:
+		statusAttack(charIndex, 2, _itemExtraStrings[offset], 0, 1, 8, 1);
+		c->effectFlags &= ~0x2000;
+		if (c->flags & 2)
+			return;
+		break;
+
+	case 4:
+		sparkEffectDefensive(charIndex);
+		c->food = 100;
+		if (_currentControlMode)
+			gui_drawCharPortraitWithStats(charIndex);
+		break;
+
+	case 5:
+		sparkEffectDefensive(charIndex);
+		c->effectFlags |= 0x10000;
+		setCharEventTimer(charIndex, 546 * rollDice(1, 4, 4), 12, 1);
+		snd_playSoundEffect(100);
+		gui_drawCharPortraitWithStats(charIndex);
+		break;
+
+	case 6:
+		sparkEffectDefensive(charIndex);
+		c->effectFlags |= 0x40;
+		gui_drawCharPortraitWithStats(charIndex);
+		break;
+
+	case 7:
+		sparkEffectDefensive(charIndex);
+		neutralizePoison(charIndex);
+		break;
+
+	default:
+		break;
+	}
+
+	_txt->printMessage(_itemExtraStrings[offset + 1], -1, c->name, _potionEffectStrings[val]);
+}
+
+void EobCoreEngine::castSpell(int spell, int weaponSlot) {
+	EobSpell *s = &_spells[spell];
+	EobCharacter *c = &_characters[_openBookChar];
+	_activeSpell = spell;
+
+	if ((s->flags & 0x100) && (c->effectFlags & 0x40))
+		// remove invisibility effect
+		removeCharacterEffect(10, _openBookChar, 1);
+
+	int ci = _openBookChar;
+	if (ci > 3)
+		ci -= 2;
+
+	_activeSpellCasterPos = _dropItemDirIndex[(_currentDirection << 2) + ci];
+
+	if (s->flags & 0x400) {
+		if (c->inventory[0] && c->inventory[1]) {
+			_txt->printMessage(_magicStrings1[2]);
+			snd_playSoundEffect(79);
+			return;
+		}
+
+		if (isMagicWeapon(c->inventory[0]) || isMagicWeapon(c->inventory[1])) {
+			_txt->printMessage(_magicStrings1[3]);
+			snd_playSoundEffect(79);
+			return;
+		}
+	}
+
+	if (!(_flags.gameID == GI_EOB2 && _activeSpell == 62)) {
+		if (!_castScrollSlot) {
+			int8 tmp = _openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem];
+			if (_openBookSpellListOffset + _openBookSpellSelectedItem < 8)
+				memmove(&_openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem], &_openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem + 1], 8 - (_openBookSpellListOffset + _openBookSpellSelectedItem));
+			_openBookAvailableSpells[_openBookSpellLevel * 10 + 8] = -tmp;
+			if (_openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem] < 0) {
+				if (--_openBookSpellSelectedItem == -1)
+					if (_openBookSpellListOffset) {
+						_openBookSpellListOffset = 0;
+						_openBookSpellSelectedItem = 5;
+					} else {
+						_openBookSpellSelectedItem = 6;
+					}
+			}
+		} else if (weaponSlot != -1) {
+			updateUsedCharacterHandItem(_openBookChar, weaponSlot);
+		}
+	}
+
+	_txt->printMessage(_magicStrings1[4], -1, c->name, s->name);
+
+	if (s->flags & 0x20) {
+		castOnWhomDialogue();
+		return;
+	}
+
+	_activeSpellCaster = _openBookChar;
+	startSpell(spell);
+}
+
+void EobCoreEngine::removeCharacterEffect(int spell, int charIndex, int showWarning) {
+	EobCharacter *c = &_characters[charIndex];
+	EobSpell *s = &_spells[spell];
+
+	if (showWarning) {
+		_txt->printMessage(_magicStrings3[2], -1, c->name, s->name);
+		snd_playSoundEffect(79);
+	}
+
+	if (s->endCallback)
+		(this->*s->endCallback)(0);
+
+	if (s->flags & 1)
+		c->effectFlags &= ~s->effectFlags;
+
+	if (s->flags & 4)
+		_partyEffectFlags &= ~s->effectFlags;
+
+	if (s->flags & 0x200) {
+		for (int i = 0; i < 6; i++) {
+			if (!testCharacter(i, 1))
+				continue;
+			if (!testCharacter(i, 2) && !(s->flags & 0x800))
+				continue;
+			_characters[i].effectFlags &= ~s->effectFlags;
+		}
+	}
+
+	if (s->flags & 0x2)
+		recalcArmorClass(_activeSpellCaster);
+
+	if (showWarning) {
+		if (s->flags & 0x20A0)
+			gui_drawCharPortraitWithStats(charIndex);
+		else if (s->flags & 0x20A0)
+			gui_drawAllCharPortraitsWithStats();
+	}
+}
+
+void EobCoreEngine::removeAllCharacterEffects(int charIndex) {
+	EobCharacter *c = &_characters[charIndex];
+	memset(c->effectsRemainder, 0, 4);
+
+	for (int i = 0; i < 10; i++) {
+		if (c->events[i] < 0)
+			removeCharacterEffect(-c->events[i], charIndex, 0);
+		c->timers[i] = 0;
+		c->events[i] = 0;
+	}
+
+	setupCharacterTimers();
+	recalcArmorClass(charIndex);
+	c->disabledSlots = 0;
+	c->slotStatus[0] = c->slotStatus[1] = 0;
+	c->damageTaken = 0;
+	c->strengthCur = c->strengthMax;
+	c->strengthExtCur = c->strengthExtMax;
+	gui_drawAllCharPortraitsWithStats();
+}
+
+void EobCoreEngine::castOnWhomDialogue() {
+	_txt->printMessage(_magicStrings3[0]);
+	snd_playSoundEffect(79);
+	gui_setCastOnWhomButtons();
+}
+
+void EobCoreEngine::startSpell(int spell) {
+	EobSpell *s = &_spells[spell];
+	EobCharacter *c = &_characters[_activeSpellCaster];
+	snd_playSoundEffect(s->sound);
+
+	if (s->flags & 0xa0)
+		sparkEffectDefensive(_activeSpellCaster);
+	else if (s->flags & 0x40)
+		sparkEffectDefensive(-1);
+	else if (s->flags & 0x1000)
+		sparkEffectOffensive();
+
+	if (s->flags & 0x20) {
+		_txt->printMessage(c->name);
+		_txt->printMessage(_magicStrings1[5]);
+	}
+
+	if ((s->flags & 0x30) && (s->effectFlags & c->effectFlags)) {
+		_txt->printMessage(_magicStrings7[0], -1, c->name, s->name);
+		snd_playSoundEffect(79);
+	} else if ((s->flags & 0x50) && (s->effectFlags & _partyEffectFlags)) {
+		_txt->printMessage(_magicStrings7[1], -1, s->name);
+		snd_playSoundEffect(79);
+	} else {
+		if (s->flags & 8)
+			setSpellEventTimer(spell, s->timingPara[0], s->timingPara[1], s->timingPara[2], s->timingPara[3]);
+
+		_returnAfterSpellCallback = false;
+		if (s->startCallback)
+			(this->*s->startCallback)();
+		if (_returnAfterSpellCallback)
+			return;
+
+		if (s->flags & 1)
+			c->effectFlags |= s->effectFlags;
+		if (s->flags & 4)
+			_partyEffectFlags |= s->effectFlags;
+
+		if (s->flags & 0x200) {
+			for (int i = 0; i < 6; i++) {
+				if (!testCharacter(i, 1))
+					continue;
+				if (!testCharacter(i, 2) && !(s->flags & 0x800))
+					continue;
+				_characters[i].effectFlags |= s->effectFlags;
+			}
+		}
+
+		if (s->flags & 2)
+			recalcArmorClass(_activeSpellCaster);
+
+		if (s->flags & 0x20A0)
+			gui_drawCharPortraitWithStats(_activeSpellCaster);
+		if (s->flags & 0x40)
+			gui_drawAllCharPortraitsWithStats();
+	}
+
+	if (_castScrollSlot) {
+		gui_updateSlotAfterScrollUse();
+	} else {
+		c->disabledSlots |= 4;
+		setCharEventTimer(_openBookChar, 72, 11, 1);
+		gui_toggleButtons();
+		gui_drawSpellbook();
+	}
+
+	if (_flags.gameID == GI_EOB2) {
+		//_castSpellWd1 = spell;
+		runLevelScript(_currentBlock, 0x800);
+		//_castSpellWd1 = 0;
+	}
+}
+
+void EobCoreEngine::sparkEffectDefensive(int charIndex) {
+	int first = charIndex;
+	int last = charIndex;
+	if (charIndex == -1) {
+		first = 0;
+		last = 5;
+	}
+
+	for (int i = 0; i < 8; i++) {
+		for (int ii = first; ii <= last; ii++) {
+			if (!testCharacter(ii, 1) || (_currentControlMode && ii != _updateCharNum))
+				continue;
+
+			gui_drawCharPortraitWithStats(ii);
+
+			for (int iii = 0; iii < 4; iii++) {
+				int shpIndex = ((_sparkEffectDefSteps[i] & _sparkEffectDefSubSteps[iii]) >> _sparkEffectDefShift[iii]);
+				if (!shpIndex)
+					continue;
+				int x = _sparkEffectDefAdd[iii * 2] - 8;
+				int y = _sparkEffectDefAdd[iii * 2 + 1];
+				if (_currentControlMode) {
+					x += 181;
+					y += 3;
+				} else {
+					x += (_sparkEffectDefX[ii] << 3);
+					y += _sparkEffectDefY[ii];
+				}
+				_screen->drawShape(0, _sparkShapes[shpIndex - 1], x, y, 0);
+				_screen->updateScreen();
+			}
+		}
+		resetSkipFlag();
+		delay(2 * _tickLength);
+	}
+
+	for (int i = first; i < last; i++)
+		gui_drawCharPortraitWithStats(i);
+}
+
+void EobCoreEngine::sparkEffectOffensive() {
+	disableSysTimer(2);
+	_screen->copyRegion(0, 0, 0, 0, 176, 120, 0, 2, Screen::CR_NO_P_CHECK);
+
+	for (int i = 0; i < 16; i++)
+		_screen->copyRegionToBuffer(0, _sparkEffectOfX[i], _sparkEffectOfY[i], 16, 16, &_spellAnimBuffer[i << 8]);
+	_screen->updateScreen();
+
+	for (int i = 0; i < 11; i++) {
+		for (int ii = 0; ii < 16; ii++)
+			_screen->copyBlockToPage(2, _sparkEffectOfX[ii], _sparkEffectOfY[ii], 16, 16, &_spellAnimBuffer[ii << 8]);
+
+		for (int ii = 0; ii < 16; ii++) {
+			int shpIndex = (_sparkEffectOfFlags1[i] & _sparkEffectOfFlags2[ii]) >> _sparkEffectOfShift[ii];
+			if (shpIndex)
+				_screen->drawShape(2, _sparkShapes[shpIndex - 1], _sparkEffectOfX[ii], _sparkEffectOfY[ii], 0);
+		}
+		resetSkipFlag();
+		delay(2 * _tickLength);
+		_screen->copyRegion(0, 0, 0, 0, 176, 120, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+	}
+
+	for (int i = 0; i < 16; i++)
+		_screen->copyBlockToPage(0, _sparkEffectOfX[i], _sparkEffectOfY[i], 16, 16, &_spellAnimBuffer[i << 8]);
+
+	_screen->updateScreen();
+	enableSysTimer(2);
+}
+
+void EobCoreEngine::setSpellEventTimer(int spell, int timerBaseFactor, int timerLength, int timerLevelFactor, int updateExistingTimer) {
+	int l = _openBookType == 1 ? getCharacterClericPaladinLevel(_openBookChar) : getCharacterMageLevel(_openBookChar);
+	uint32 countdown = timerLength * timerBaseFactor + timerLength * l * timerLevelFactor;
+	setCharEventTimer(_activeSpellCaster, countdown, -spell, updateExistingTimer);
+}
+
+bool EobCoreEngine::magicObjectHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level) {
+	int ignoreAttackerId = fo->flags & 0x10;
+	int singleTargetCheckAdjacent = fo->flags & 1;
+	int blockDamage = fo->flags & 2;
+	int hitTest = fo->flags & 4;
+
+	int s = 5;
+	int dmgType = 3;
+	if (fo->flags & 8) {
+		s = 4;
+		dmgType = 0;
+	}
+
+	int dmgFlag = _spells[fo->callBackIndex].damageFlags;
+	if (fo->attackerId >= 0)
+		dmgFlag |= 0x800;
+
+	bool res = false;
+	if (!level)
+		level = 1;
+
+	if ((_levelBlockProperties[fo->curBlock].flags & 7) && (fo->attackerId >= 0 || ignoreAttackerId)) {
+		_inflictMonsterDamageUnk = 1;
+
+		for (const int16 *m = findBlockMonsters(fo->curBlock, fo->curPos, fo->direction, blockDamage, singleTargetCheckAdjacent); *m != -1; m++) {
+			int dmg = rollDice(dcTimes, dcPips, dcOffs) * level;
+
+			if (hitTest) {
+				if (!characterAttackHitTest(fo->attackerId, *m, 0, 0))
+					continue;
+			}
+
+			calcAndInflictMonsterDamage(&_monsters[*m], 0, 0, dmg, dmgFlag, s, dmgType);
+			res = true;
+		}
+		updateAllMonsterShapes();
+
+	} else if (fo->curBlock == _currentBlock && (fo->attackerId < 0 || ignoreAttackerId)) {
+		if (blockDamage) {
+			for (int i = 0; i < 6; i++) {
+				if (!testCharacter(i, 1))
+					continue;
+				if (hitTest && !monsterAttackHitTest(&_monsters[0], i))
+					continue;
+
+				int dmg = rollDice(dcTimes, dcPips, dcOffs) * level;
+				res = true;
+
+				calcAndInflictCharacterDamage(i, 0, 0, dmg, dmgFlag, s, dmgType);
+			}
+		} else {
+			int c = _dscItemPosIndex[(_currentDirection << 2) + (fo->curPos & 3)];
+			if ((c > 2) && (testCharacter(5, 1) || testCharacter(6, 1)) && rollDice(1, 2, -1))
+				c += 2;
+
+			if (!fo->item && (_characters[c].effectFlags & 8)) {
+				res = true;
+			} else {
+				if ((_characters[c].flags & 1) && hitTest && !monsterAttackHitTest(&_monsters[0], c)) {
+					int dmg = rollDice(dcTimes, dcPips, dcOffs) * level;
+					res = true;
+					calcAndInflictCharacterDamage(c, 0, 0, dmg, dmgFlag, s, dmgType);
+				}
+			}
+		}
+	}
+
+	if (res && (fo->flags & 0x40))
+		updateFlyingObject_s3(fo);
+	else if ((_flags.gameID == GI_EOB1 && fo->item == 5) || (_flags.gameID == GI_EOB2 && fo->item == 4))
+		res = false;
+
+	return res;
+}
+
+void EobCoreEngine::spellCallback_start_armor() {
+
+}
+
+void EobCoreEngine::spellCallback_start_burningHands() {
+
+}
+
+void EobCoreEngine::spellCallback_start_detectMagic() {
+
+}
+
+bool EobCoreEngine::spellCallback_end_detectMagic(EobFlyingObject*) {
+	return true;
+}
+
+void EobCoreEngine::spellCallback_start_magicMissile() {
+	launchMagicObject(_openBookChar, 0, _currentBlock, _activeSpellCasterPos, _currentDirection);
+}
+
+bool EobCoreEngine::spellCallback_end_magicMissile(EobFlyingObject *fo) {
+	return magicObjectHit(fo, 1, 4, 1, (getCharacterMageLevel(fo->attackerId) - 1) >> 1);
+}
+
+void EobCoreEngine::spellCallback_start_shockingGrasp() {
+
+}
+
+bool EobCoreEngine::spellCallback_end_shockingGraspFlameBlade(EobFlyingObject*) {
+	return true;
+}
+
+void EobCoreEngine::spellCallback_start_improvedIdentify() {
+
+}
+
+void EobCoreEngine::spellCallback_start_melfsAcidArrow() {
+	launchMagicObject(_openBookChar, 1, _currentBlock, _activeSpellCasterPos, _currentDirection);
+}
+
+bool EobCoreEngine::spellCallback_end_melfsAcidArrow(EobFlyingObject *fo) {
+	return magicObjectHit(fo, 2, 4, 0, getCharacterMageLevel(fo->attackerId) / 3);
+}
+
+void EobCoreEngine::spellCallback_start_dispelMagic() {
+
+}
+
+void EobCoreEngine::spellCallback_start_fireball() {
+	launchMagicObject(_openBookChar, 2, _currentBlock, _activeSpellCasterPos, _currentDirection);
+}
+
+bool EobCoreEngine::spellCallback_end_fireball(EobFlyingObject *fo) {
+	return magicObjectHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
+}
+
+void EobCoreEngine::spellCallback_start_flameArrow() {
+	launchMagicObject(_openBookChar, 3, _currentBlock, _activeSpellCasterPos, _currentDirection);
+}
+
+bool EobCoreEngine::spellCallback_end_flameArrow(EobFlyingObject *fo) {
+	return magicObjectHit(fo, 5, 6, 0, getCharacterMageLevel(fo->attackerId));
+}
+
+void EobCoreEngine::spellCallback_start_holdPerson() {
+	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 4 : 3, _currentBlock, _activeSpellCasterPos, _currentDirection);
+}
+
+bool EobCoreEngine::spellCallback_end_holdPerson(EobFlyingObject *fo) {
+	return true;
+}
+
+void EobCoreEngine::spellCallback_start_lightningBolt() {
+	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 5 : 4, _currentBlock, _activeSpellCasterPos, _currentDirection);
+}
+
+bool EobCoreEngine::spellCallback_end_lightningBolt(EobFlyingObject *fo) {
+	return magicObjectHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
+}
+
+void EobCoreEngine::spellCallback_start_vampiricTouch() {
+
+}
+
+bool EobCoreEngine::spellCallback_end_vampiricTouch(EobFlyingObject*) {
+	return true;
+}
+
+void EobCoreEngine::spellCallback_start_fear() {
+
+}
+
+void EobCoreEngine::spellCallback_start_iceStorm() {
+	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 6 : 5, _currentBlock, _activeSpellCasterPos, _currentDirection);
+}
+
+bool EobCoreEngine::spellCallback_end_iceStorm(EobFlyingObject *fo) {
+	static int8 blockAdv[] = { -32, 32, 1, -1 };
+	bool res = magicObjectHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
+	if (res) {
+		for (int i = 0; i < 4; i++) {
+			uint16 bl = fo->curBlock;
+			fo->curBlock = (fo->curBlock + blockAdv[i]) & 0x3ff;
+			magicObjectHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
+			fo->curBlock = bl;
+		}
+	}
+	return res;
+}
+
+void EobCoreEngine::spellCallback_start_removeCurse() {
+
+}
+
+void EobCoreEngine::spellCallback_start_coneOfCold() {
+
+}
+
+void EobCoreEngine::spellCallback_start_holdMonster() {
+
+}
+
+bool EobCoreEngine::spellCallback_end_holdMonster(EobFlyingObject *fo) {
+	return true;
+}
+
+void EobCoreEngine::spellCallback_start_wallOfForce() {
+
+}
+
+void EobCoreEngine::spellCallback_start_disintegrate() {
+
+}
+
+void EobCoreEngine::spellCallback_start_fleshToStone() {
+
+}
+
+void EobCoreEngine::spellCallback_start_stoneToFlesh() {
+
+}
+
+void EobCoreEngine::spellCallback_start_trueSeeing() {
+
+}
+
+bool EobCoreEngine::spellCallback_end_trueSeeing(EobFlyingObject*) {
+	return true;
+}
+
+void EobCoreEngine::spellCallback_start_slayLiving() {
+
+}
+
+void EobCoreEngine::spellCallback_start_powerWordStun() {
+
+}
+
+void EobCoreEngine::spellCallback_start_causeLightWounds() {
+
+}
+
+void EobCoreEngine::spellCallback_start_cureLightWounds() {
+	modifyCharacterHitpoints(_activeSpellCaster, rollDice(1, 8));
+}
+
+void EobCoreEngine::spellCallback_start_aid() {
+
+}
+
+bool EobCoreEngine::spellCallback_end_aid(EobFlyingObject*) {
+	return true;
+}
+
+void EobCoreEngine::spellCallback_start_flameBlade() {
+
+}
+
+void EobCoreEngine::spellCallback_start_slowPoison() {
+
+}
+
+bool EobCoreEngine::spellCallback_end_slowPoison(EobFlyingObject*) {
+	return true;
+}
+
+void EobCoreEngine::spellCallback_start_createFood() {
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 3))
+			continue;
+		_characters[_activeSpellCaster].food = 100;
+	}
+}
+
+void EobCoreEngine::spellCallback_start_removeParalysis() {
+
+}
+
+void EobCoreEngine::spellCallback_start_causeSeriousWounds() {
+	modifyCharacterHitpoints(_activeSpellCaster, rollDice(2, 8, 1));
+}
+
+void EobCoreEngine::spellCallback_start_cureSeriousWounds() {
+
+}
+
+void EobCoreEngine::spellCallback_start_neutralizePoison() {
+
+}
+
+void EobCoreEngine::spellCallback_start_causeCriticalWounds() {
+
+}
+
+void EobCoreEngine::spellCallback_start_cureCriticalWounds() {
+	modifyCharacterHitpoints(_activeSpellCaster, rollDice(3, 8, 3));
+}
+
+void EobCoreEngine::spellCallback_start_flameStrike() {
+	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 8 : 7, _currentBlock, _activeSpellCasterPos, _currentDirection);
+}
+
+bool EobCoreEngine::spellCallback_end_flameStrike(EobFlyingObject *fo) {
+	return magicObjectHit(fo, 6, 8, 0, 0);
+}
+
+void EobCoreEngine::spellCallback_start_raiseDead() {
+
+}
+
+void EobCoreEngine::spellCallback_start_harm() {
+
+}
+
+void EobCoreEngine::spellCallback_start_heal() {
+	EobCharacter *c = &_characters[_activeSpellCaster];
+	if (c->hitPointsMax <= c->hitPointsCur) {
+		_txt->printMessage(_magicStrings4[0]);
+		snd_playSoundEffect(79);
+	} else {
+		modifyCharacterHitpoints(_activeSpellCaster, c->hitPointsMax - c->hitPointsCur);
+	}
+}
+
+void EobCoreEngine::spellCallback_start_layOnHands() {
+
+}
+
+void EobCoreEngine::spellCallback_start_turnUndead() {
+
+}
+
+bool EobCoreEngine::spellCallback_end_unk1Passive(EobFlyingObject *fo) {
+	bool res = false;
+	if (_partyEffectFlags & 0x20000) {
+		res = magicObjectHit(fo, 4, 10, 6, 0);
+		if (res) {
+			gui_drawAllCharPortraitsWithStats();
+			_partyEffectFlags &= ~0x20000;
+		}
+	} else {
+		res = magicObjectHit(fo, 12, 10, 6, 0);
+	}
+	return res;
+}
+
+bool EobCoreEngine::spellCallback_end_unk2Passive(EobFlyingObject *fo) {
+	return magicObjectHit(fo, 0, 0, 18, 0);
+}
+
+bool EobCoreEngine::spellCallback_end_deathSpellPassive(EobFlyingObject *fo) {
+	return true;
+}
+
+bool EobCoreEngine::spellCallback_end_disintegratePassive(EobFlyingObject *fo) {
+	return true;
+}
+
+bool EobCoreEngine::spellCallback_end_causeCriticalWoundsPassive(EobFlyingObject *fo) {
+	return true;
+}
+
+bool EobCoreEngine::spellCallback_end_fleshToStonePassive(EobFlyingObject *fo) {
+	return true;
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
index abd535ee29..50bcbdd6e9 100644
--- a/engines/kyra/module.mk
+++ b/engines/kyra/module.mk
@@ -72,8 +72,19 @@ MODULE_OBJS := \
 	vqa.o \
 	wsamovie.o
 
+KYRARPG_COMMON_OBJ = \
+	gui_eob.o \
+	loleobbase.o \
+	saveload_eob.o \
+	scene_eob.o \
+	sprites_eob.o \
+	staticres_eob.o \
+	text_eob.o \
+	timer_eob.o
+
 ifdef ENABLE_LOL
 MODULE_OBJS += \
+	$(KYRARPG_COMMON_OBJ) \
 	gui_lol.o \
 	items_lol.o \
 	lol.o \
@@ -89,6 +100,24 @@ MODULE_OBJS += \
 	timer_lol.o
 endif
 
+ifdef ENABLE_EOB
+ifndef ENABLE_LOL
+MODULE_OBJS += \
+	$(KYRARPG_COMMON_OBJ)
+endif
+MODULE_OBJS += \
+	chargen.o \
+	eobcommon.o \
+	eob1.o \
+	eob2.o \
+	items_eob.o \
+	magic_eob.o \
+	screen_eob.o \
+	script_eob.o \
+	sequences_eob1.o \
+	sequences_eob2.o
+endif
+
 # This module can be built as a plugin
 ifeq ($(ENABLE_KYRA), DYNAMIC_PLUGIN)
 PLUGIN := 1
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index a35ec3d81b..3aaab07c0d 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -59,7 +59,7 @@ bool Resource::reset() {
 	if (!dir.exists() || !dir.isDirectory())
 		error("invalid game path '%s'", dir.getPath().c_str());
 
-	if (_vm->game() == GI_KYRA1) {
+	if (_vm->game() == GI_KYRA1 || _vm->game() == GI_EOB1) {
 		// We only need kyra.dat for the demo.
 		if (_vm->gameFlags().isDemo && !_vm->gameFlags().isTalkie)
 			return true;
@@ -128,7 +128,7 @@ bool Resource::reset() {
 
 			loadProtectedFiles(list);
 		}
-	} else {
+	} else if (_vm->game() != GI_EOB2) {
 		error("Unknown game id: %d", _vm->game());
 		return false;	// for compilers that don't support NORETURN
 	}
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index c2a697f18d..2c484b4d01 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -35,6 +35,7 @@
 #include "common/archive.h"
 
 #include "kyra/kyra_v1.h"
+#include "kyra/eob2.h"
 #include "kyra/lol.h"
 #include "kyra/kyra_hof.h"
 
@@ -250,7 +251,264 @@ enum KyraResources {
 	k3ItemMagicTable,
 	k3ItemStringMap,
 
-#ifdef ENABLE_LOL
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+	kLolEobCommonMoreStrings,
+	kLolEobCommonDscShapeIndex,
+	kLolEobCommonDscX,
+	kLolEobCommonDscTileIndex,
+	kLolEobCommonDscUnk2,
+	kLolEobCommonDscDoorShapeIndex,
+	kLolEobCommonDscDimData1,
+	kLolEobCommonDscDimData2,
+	kLolEobCommonDscBlockMap,
+	kLolEobCommonDscDimMap,
+	kLolEobCommonDscDoorY2,
+	kLolEobCommonDscBlockIndex,
+
+	kEobBaseChargenStrings1,
+	kEobBaseChargenStrings2,
+	kEobBaseChargenStartLevels,
+	kEobBaseChargenStatStrings,
+	kEobBaseChargenRaceSexStrings,
+	kEobBaseChargenClassStrings,
+	kEobBaseChargenAlignmentStrings,
+	kEobBaseChargenEnterGameStrings,
+	kEobBaseChargenClassMinStats,
+	kEobBaseChargenRaceMinStats,
+	kEobBaseChargenRaceMaxStats,
+
+	kEobBaseConstModTable1,
+	kEobBaseConstModTable2,
+	kEobBaseConstModTable3,
+	kEobBaseConstModTable4,
+	kEobBaseConstModLvlIndex,
+	kEobBaseConstModDiv,
+	kEobBaseConstModExt,
+
+	kEobBasePryDoorStrings,
+	kEobBaseWarningStrings,
+	kEobBaseItemSuffixStrings,
+	kEobBaseItemExtraStrings,
+	kEobBaseTakenStrings,
+	kEobBasePotionEffectStrings,
+
+	kEobBaseYesNoStrings,
+	kEobBaseNpcMaxStrings,
+	kEobBaseOkStrings,
+	kEobBaseNpcJoinStrings,
+	kEobBaseCancelStrings,
+	kEobBaseAbortStrings,
+
+	kEobBaseCharGuiStringsHp,
+	kEobBaseCharGuiStringsWp1,
+	kEobBaseCharGuiStringsWp2,
+	kEobBaseCharGuiStringsWr,
+	kEobBaseCharGuiStringsSt1,
+	kEobBaseCharGuiStringsSt2,
+	kEobBaseCharGuiStringsIn,
+
+	kEobBaseCharStatusStrings7,
+	kEobBaseCharStatusStrings81,
+	kEobBaseCharStatusStrings82,
+	kEobBaseCharStatusStrings9,
+	kEobBaseCharStatusStrings12,
+	kEobBaseCharStatusStrings131,
+	kEobBaseCharStatusStrings132,
+
+	kEobBaseLevelGainStrings,
+	kEobBaseExperienceTable0,
+	kEobBaseExperienceTable1,
+	kEobBaseExperienceTable2,
+	kEobBaseExperienceTable3,
+	kEobBaseExperienceTable4,
+
+	kEobBaseClassModifierFlags,
+
+	kEobBaseMonsterStepTable01,
+	kEobBaseMonsterStepTable02,
+	kEobBaseMonsterStepTable1,
+	kEobBaseMonsterStepTable2,
+	kEobBaseMonsterStepTable3,
+	kEobBaseMonsterCloseAttPosTable1,
+	kEobBaseMonsterCloseAttPosTable21,
+	kEobBaseMonsterCloseAttPosTable22,
+	kEobBaseMonsterCloseAttUnkTable,
+	kEobBaseMonsterCloseAttChkTable1,
+	kEobBaseMonsterCloseAttChkTable2,
+	kEobBaseMonsterCloseAttDstTable1,
+	kEobBaseMonsterCloseAttDstTable2,
+
+	kEobBaseMonsterProximityTable,
+	kEobBaseFindBlockMonstersTable,
+	kEobBaseMonsterDirChangeTable,
+	kEobBaseMonsterDistAttStrings,
+
+	kEobBaseEncodeMonsterDefs,
+	kEobBaseNpcPresets,
+
+	kEobBaseWllFlagPreset,
+	kEobBaseDscShapeCoords,
+
+	kEobBaseDscDoorScaleOffs,
+	kEobBaseDscDoorScaleMult1,
+	kEobBaseDscDoorScaleMult2,
+	kEobBaseDscDoorScaleMult3,
+	kEobBaseDscDoorScaleMult4,
+	kEobBaseDscDoorScaleMult5,
+	kEobBaseDscDoorScaleMult6,
+	kEobBaseDscDoorType5Offs,
+	kEobBaseDscDoorY1,
+	kEobBaseDscDoorY3,
+	kEobBaseDscDoorY4,
+	kEobBaseDscDoorY5,
+	kEobBaseDscDoorY6,
+	kEobBaseDscDoorCoordsExt,
+
+	kEobBaseDscItemPosIndex,
+	kEobBaseDscItemShpX,
+	kEobBaseDscItemScaleIndex,
+	kEobBaseDscItemTileIndex,
+	kEobBaseDscItemShapeMap,
+
+	kEobBaseDscMonsterFrmOffsTbl1,
+	kEobBaseDscMonsterFrmOffsTbl2,
+
+	kEobBaseInvSlotX,
+	kEobBaseInvSlotY,
+	kEobBaseSlotValidationFlags,
+	kEobBaseDrawObjPosIndex,
+	kEobBaseFlightObjFlipIndex,
+	kEobBaseFlightObjShpMap,
+	kEobBaseFlightObjSclIndex,
+
+	kEobBaseDscTelptrShpCoords,
+
+	kEobBaseBookNumbers,
+	kEobBaseMageSpellsList,
+	kEobBaseClericSpellsList,
+	kEobBaseSpellNames,
+	kEobBaseMagicStrings1,
+	kEobBaseMagicStrings2,
+	kEobBaseMagicStrings3,
+	kEobBaseMagicStrings4,
+	kEobBaseMagicStrings5,
+	kEobBaseMagicStrings6,
+	kEobBaseMagicStrings7,
+	kEobBaseMagicStrings8,
+
+	kEobBaseSparkDefSteps,
+	kEobBaseSparkDefSubSteps,
+	kEobBaseSparkDefShift,
+	kEobBaseSparkDefAdd,
+	kEobBaseSparkDefX,
+	kEobBaseSparkDefY,
+	kEobBaseSparkOfFlags1,
+	kEobBaseSparkOfFlags2,
+	kEobBaseSparkOfShift,
+	kEobBaseSparkOfX,
+	kEobBaseSparkOfY,
+
+	kEobBaseSpellProperties,
+	kEobBaseMagicFlightProps,
+
+	kEob1MainMenuStrings,
+	kEob1DoorShapeDefs,
+	kEob1DoorSwitchShapeDefs,
+	kEob1DoorSwitchCoords,
+	kEob1MonsterProperties,
+
+	kEob1MonsterDistAttType10,
+	kEob1MonsterDistAttSfx10,
+	kEob1MonsterDistAttType17,
+	kEob1MonsterDistAttSfx17,
+
+	kEob2MainMenuStrings,
+	kEob2IntroStrings,
+	kEob2IntroCPSFiles,
+	kEob2IntroSeqData00,
+ 	kEob2IntroSeqData01,
+ 	kEob2IntroSeqData02,
+ 	kEob2IntroSeqData03,
+ 	kEob2IntroSeqData04,
+ 	kEob2IntroSeqData05,
+ 	kEob2IntroSeqData06,
+ 	kEob2IntroSeqData07,
+ 	kEob2IntroSeqData08,
+ 	kEob2IntroSeqData09,
+ 	kEob2IntroSeqData10,
+ 	kEob2IntroSeqData11,
+ 	kEob2IntroSeqData12,
+ 	kEob2IntroSeqData13,
+ 	kEob2IntroSeqData14,
+ 	kEob2IntroSeqData15,
+ 	kEob2IntroSeqData16,
+ 	kEob2IntroSeqData17,
+ 	kEob2IntroSeqData18,
+ 	kEob2IntroSeqData19,
+ 	kEob2IntroSeqData20,
+ 	kEob2IntroSeqData21,
+ 	kEob2IntroSeqData22,
+ 	kEob2IntroSeqData23,
+ 	kEob2IntroSeqData24,
+ 	kEob2IntroSeqData25,
+ 	kEob2IntroSeqData26,
+ 	kEob2IntroSeqData27,
+ 	kEob2IntroSeqData28,
+ 	kEob2IntroSeqData29,
+ 	kEob2IntroSeqData30,
+ 	kEob2IntroSeqData31,
+ 	kEob2IntroSeqData32,
+ 	kEob2IntroSeqData33,
+ 	kEob2IntroSeqData34,
+ 	kEob2IntroSeqData35,
+ 	kEob2IntroSeqData36,
+ 	kEob2IntroSeqData37,
+ 	kEob2IntroSeqData38,
+ 	kEob2IntroSeqData39,
+ 	kEob2IntroSeqData40,
+ 	kEob2IntroSeqData41,
+ 	kEob2IntroSeqData42,
+ 	kEob2IntroSeqData43,
+	kEob2IntroShapes00,
+ 	kEob2IntroShapes01,
+ 	kEob2IntroShapes04,
+ 	kEob2IntroShapes07,
+
+	kEob2FinaleStrings,
+	kEob2CreditsData,
+	kEob2FinaleCPSFiles,
+	kEob2FinaleSeqData00,
+ 	kEob2FinaleSeqData01,
+ 	kEob2FinaleSeqData02,
+ 	kEob2FinaleSeqData03,
+ 	kEob2FinaleSeqData04,
+ 	kEob2FinaleSeqData05,
+ 	kEob2FinaleSeqData06,
+ 	kEob2FinaleSeqData07,
+ 	kEob2FinaleSeqData08,
+ 	kEob2FinaleSeqData09,
+ 	kEob2FinaleSeqData10,
+ 	kEob2FinaleSeqData11,
+ 	kEob2FinaleSeqData12,
+ 	kEob2FinaleSeqData13,
+ 	kEob2FinaleSeqData14,
+ 	kEob2FinaleSeqData15,
+ 	kEob2FinaleSeqData16,
+ 	kEob2FinaleSeqData17,
+ 	kEob2FinaleSeqData18,
+ 	kEob2FinaleSeqData19,
+ 	kEob2FinaleSeqData20,
+	kEob2FinaleShapes00,
+ 	kEob2FinaleShapes03,
+ 	kEob2FinaleShapes07,
+ 	kEob2FinaleShapes09,
+ 	kEob2FinaleShapes10,
+
+	kEob2NpcShapeData,
+	kEob2Npc1Strings,
+	kEob2Npc2Strings,
+	kEob2MonsterDustStrings,
+
 	kLolIngamePakFiles,
 	kLolCharacterDefs,
 	kLolIngameSfxFiles,
@@ -284,27 +542,17 @@ enum KyraResources {
 	kLolItemPrices,
 	kLolStashSetup,
 
-	kLolDscUnk1,
-	kLolDscShapeIndex,
+	kLolDscWalls,
 	kLolDscOvlMap,
 	kLolDscScaleWidthData,
 	kLolDscScaleHeightData,
-	kLolDscX,
-	kLolDscY,
-	kLolDscTileIndex,
-	kLolDscUnk2,
-	kLolDscDoorShapeIndex,
-	kLolDscDimData1,
-	kLolDscDimData2,
-	kLolDscBlockMap,
-	kLolDscDimMap,
-	kLolDscDoor1,
+	kLolBaseDscY,
+
 	kLolDscDoorScale,
 	kLolDscDoor4,
 	kLolDscDoorX,
 	kLolDscDoorY,
 	kLolDscOvlIndex,
-	kLolDscBlockIndex,
 
 	kLolScrollXTop,
 	kLolScrollYTop,
@@ -334,7 +582,7 @@ enum KyraResources {
 	kLolCredits,
 
 	kLolHistory,
-#endif
+#endif // ENABLE_EOB || ENABLE_LOL
 
 	kMaxResIDs
 };
@@ -363,15 +611,22 @@ public:
 	const HofSeqData *loadHofSequenceData(int id, int &entries);
 	const ItemAnimData_v1 *loadShapeAnimData_v1(int id, int &entries);
 	const ItemAnimData_v2 *loadShapeAnimData_v2(int id, int &entries);
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+	const uint16 *loadRawDataBe16(int id, int &entries);
+	const uint32 *loadRawDataBe32(int id, int &entries);
+#endif // (ENABLE_EOB || ENABLE_LOL)
 #ifdef ENABLE_LOL
 	const LoLCharacter *loadCharData(int id, int &entries);
 	const SpellProperty *loadSpellData(int id, int &entries);
 	const CompassDef *loadCompassData(int id, int &entries);
 	const FlyingObjectShape *loadFlyingObjectData(int id, int &entries);
-	const uint16 *loadRawDataBe16(int id, int &entries);
-	const uint32 *loadRawDataBe32(int id, int &entries);
-	const ButtonDef *loadButtonDefs(int id, int &entries);
+	const LoLButtonDef *loadButtonDefs(int id, int &entries);
 #endif // ENABLE_LOL
+#ifdef ENABLE_EOB
+	const EobSequenceStep *loadEob2SeqData(int id, int &entries);
+	const EobShapeDef *loadEob2ShapeData(int id, int &entries);
+	const EobCharacter *loadEobNpcData(int id, int &entries);
+#endif // ENABLE_EOB
 
 	// use '-1' to prefetch/unload all ids
 	// prefetchId retruns false if only on of the resources
@@ -398,15 +653,22 @@ private:
 	bool loadHofSequenceData(Common::SeekableReadStream &stream, void *&ptr, int &size);
 	bool loadShapeAnimData_v1(Common::SeekableReadStream &stream, void *&ptr, int &size);
 	bool loadShapeAnimData_v2(Common::SeekableReadStream &stream, void *&ptr, int &size);
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+	bool loadRawDataBe16(Common::SeekableReadStream &stream, void *&ptr, int &size);
+	bool loadRawDataBe32(Common::SeekableReadStream &stream, void *&ptr, int &size);
+#endif // (ENABLE_LOL || ENABLE_EOB)
 #ifdef ENABLE_LOL
 	bool loadCharData(Common::SeekableReadStream &stream, void *&ptr, int &size);
 	bool loadSpellData(Common::SeekableReadStream &stream, void *&ptr, int &size);
 	bool loadCompassData(Common::SeekableReadStream &stream, void *&ptr, int &size);
 	bool loadFlyingObjectData(Common::SeekableReadStream &stream, void *&ptr, int &size);
-	bool loadRawDataBe16(Common::SeekableReadStream &stream, void *&ptr, int &size);
-	bool loadRawDataBe32(Common::SeekableReadStream &stream, void *&ptr, int &size);
 	bool loadButtonDefs(Common::SeekableReadStream &stream, void *&ptr, int &size);
 #endif // ENABLE_LOL
+#ifdef ENABLE_EOB
+	bool loadEob2SeqData(Common::SeekableReadStream &stream, void *&ptr, int &size);
+	bool loadEob2ShapeData(Common::SeekableReadStream &stream, void *&ptr, int &size);
+	bool loadEobNpcData(Common::SeekableReadStream &stream, void *&ptr, int &size);
+#endif // ENABLE_EOB
 
 	void freeRawData(void *&ptr, int &size);
 	void freeStringTable(void *&ptr, int &size);
@@ -416,15 +678,22 @@ private:
 	void freeHofSequenceData(void *&ptr, int &size);
 	void freeHofShapeAnimDataV1(void *&ptr, int &size);
 	void freeHofShapeAnimDataV2(void *&ptr, int &size);
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+	void freeRawDataBe16(void *&ptr, int &size);
+	void freeRawDataBe32(void *&ptr, int &size);
+#endif // (ENABLE_EOB || ENABLE_LOL)
 #ifdef ENABLE_LOL
 	void freeCharData(void *&ptr, int &size);
 	void freeSpellData(void *&ptr, int &size);
 	void freeCompassData(void *&ptr, int &size);
 	void freeFlyingObjectData(void *&ptr, int &size);
-	void freeRawDataBe16(void *&ptr, int &size);
-	void freeRawDataBe32(void *&ptr, int &size);
 	void freeButtonDefs(void *&ptr, int &size);
 #endif // ENABLE_LOL
+#ifdef ENABLE_EOB
+	void freeEob2SeqData(void *&ptr, int &size);
+	void freeEob2ShapeData(void *&ptr, int &size);
+	void freeEobNpcData(void *&ptr, int &size);
+#endif // ENABLE_EOB
 
 	enum ResTypes {
 		kStringList = 0,
@@ -443,7 +712,11 @@ private:
 		kLolFlightShpData = 11,
 		kLolButtonData = 12,
 		kLolRawDataBe16 = 13,
-		kLolRawDataBe32 = 14
+		kLolRawDataBe32 = 14,
+
+		kEob2SequenceData = 15,
+		kEob2ShapeData = 16,
+		kEobNpcData = 17
 	};
 
 	struct FileType {
diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp
index f9aae2c550..af050b12e7 100644
--- a/engines/kyra/resource_intern.cpp
+++ b/engines/kyra/resource_intern.cpp
@@ -254,6 +254,8 @@ bool ResLoaderPak::isLoadable(const Common::String &filename, Common::SeekableRe
 		offset = SWAP_BYTES_32(offset);
 	}
 
+	int32 firstOffset = offset;
+
 	Common::String file;
 	while (!stream.eos()) {
 		// The start offset of a file should never be in the filelist
@@ -276,7 +278,7 @@ bool ResLoaderPak::isLoadable(const Common::String &filename, Common::SeekableRe
 		firstFile = false;
 		offset = switchEndian ? stream.readUint32BE() : stream.readUint32LE();
 
-		if (!offset || offset == filesize)
+		if (!offset || offset == filesize || firstOffset == stream.pos())
 			break;
 	}
 
@@ -297,6 +299,7 @@ Common::Archive *ResLoaderPak::load(Common::ArchiveMemberPtr memberFile, Common:
 	bool firstFile = true;
 
 	startoffset = stream.readUint32LE();
+	int32 firstOffset = startoffset;
 	if (startoffset > filesize || startoffset < 0) {
 		switchEndian = true;
 		startoffset = SWAP_BYTES_32(startoffset);
@@ -330,12 +333,12 @@ Common::Archive *ResLoaderPak::load(Common::ArchiveMemberPtr memberFile, Common:
 		firstFile = false;
 		endoffset = switchEndian ? stream.readUint32BE() : stream.readUint32LE();
 
-		if (endoffset < 0) {
+		if (endoffset < 0 && stream.pos() != firstOffset) {
 			warning("PAK file '%s' is corrupted", memberFile->getDisplayName().c_str());
 			return 0;
 		}
 
-		if (!endoffset)
+		if (!endoffset || stream.pos() == firstOffset)
 			endoffset = filesize;
 
 		if (startoffset != endoffset)
@@ -493,7 +496,7 @@ public:
 	void advSrcBitsBy1();
 	void advSrcBitsByIndex(uint8 newIndex);
 
-	uint8 getKeyLower() { return _key & 0xff; }
+	uint8 getKeyLower() const { return _key & 0xff; }
 	void setIndex(uint8 index) { _index = index; }
 	uint16 getKeyMasked(uint8 newIndex);
 	uint16 keyMaskedAlign(uint16 val);
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
new file mode 100644
index 0000000000..3b3964bdc5
--- /dev/null
+++ b/engines/kyra/saveload_eob.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.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/eobcommon.h"
+#include "kyra/resource.h"
+#include "kyra/script_eob.h"
+
+#include "common/system.h"
+#include "common/savefile.h"
+#include "common/substream.h"
+
+namespace Kyra {
+
+void LolEobBaseEngine::generateTempData() {
+	int l = _currentLevel - 1;
+	if (_lvlTempData[l]) {
+		delete[] _lvlTempData[l]->wallsXorData;
+		delete[] _lvlTempData[l]->flags;
+		releaseMonsterTempData(_lvlTempData[l]);
+		releaseFlyingObjectTempData(_lvlTempData[l]);
+		delete _lvlTempData[l];
+	}
+
+	_lvlTempData[l] = new LevelTempData;
+
+	_lvlTempData[l]->wallsXorData = new uint8[4096];
+	_lvlTempData[l]->flags = new uint16[1024];
+
+	char filename[13];
+	const uint8 *p = 0;
+	const uint8 *p2 = 0;
+	if (_flags.gameID == GI_LOL) {
+		snprintf(filename, sizeof(filename), "LEVEL%d.CMZ", _currentLevel);
+		screen()->loadBitmap(filename, 15, 15, 0);
+		p = screen()->getCPagePtr(14);
+	} else {
+		snprintf(filename, sizeof(filename), "LEVEL%d.MAZ", _currentLevel);
+		p2 = p = _res->fileData(filename, 0);
+	}
+
+	uint16 len = READ_LE_UINT16(p + 4);
+	p += 6;
+
+	memset(_lvlTempData[l]->wallsXorData, 0, 4096);
+	memset(_lvlTempData[l]->flags, 0, 1024 * sizeof(uint16));
+	uint8 *d = _lvlTempData[l]->wallsXorData;
+	uint16 *df = _lvlTempData[l]->flags;
+
+	for (int i = 0; i < 1024; i++) {
+		for (int ii = 0; ii < 4; ii++)
+			*d++ = p[i * len + ii] ^ _levelBlockProperties[i].walls[ii];
+		*df++ = _levelBlockProperties[i].flags;
+	}
+
+	_lvlTempData[l]->monsters = generateMonsterTempData(_lvlTempData[l]);
+	_lvlTempData[l]->flyingObjects = generateFlyingObjectTempData(_lvlTempData[l]);
+
+	_hasTempDataFlags |= (1 << l);
+	delete[] p2;
+}
+
+void LolEobBaseEngine::restoreBlockTempData(int levelIndex) {
+	int l = levelIndex - 1;
+	char filename[13];
+	const uint8 *p = 0;
+	const uint8 *p2 = 0;
+	if (_flags.gameID == GI_LOL) {
+		snprintf(filename, sizeof(filename), "LEVEL%d.CMZ", levelIndex);
+		screen()->loadBitmap(filename, 3, 3, 0);
+		p = screen()->getCPagePtr(2);
+	} else {
+		snprintf(filename, sizeof(filename), "LEVEL%d.MAZ", levelIndex);
+		p2 = p = _res->fileData(filename, 0);
+	}
+
+	uint16 len = READ_LE_UINT16(p + 4);
+	p += 6;
+
+	memset(_levelBlockProperties, 0, 1024 * sizeof(LevelBlockProperty));
+
+	uint8 *t = _lvlTempData[l]->wallsXorData;
+	uint16 *t2 = _lvlTempData[l]->flags;
+
+	for (int i = 0; i < 1024; i++) {
+		for (int ii = 0; ii < 4; ii++)
+			_levelBlockProperties[i].walls[ii] = p[i * len + ii] ^ *t++;
+		_levelBlockProperties[i].flags = *t2++;
+	}
+
+	restoreMonsterTempData(_lvlTempData[l]);
+	restoreFlyingObjectTempData(_lvlTempData[l]);
+
+	delete[] p2;
+}
+
+void LolEobBaseEngine::releaseTempData() {
+	for (int i = 0; i < 29; i++) {
+		if (_lvlTempData[i]) {
+			delete[] _lvlTempData[i]->wallsXorData;
+			delete[] _lvlTempData[i]->flags;
+			releaseMonsterTempData(_lvlTempData[i]);
+			releaseFlyingObjectTempData(_lvlTempData[i]);
+			delete _lvlTempData[i];
+			_lvlTempData[i] = 0;
+		}
+	}
+}
+
+#ifdef ENABLE_EOB
+
+Common::Error EobCoreEngine::loadGameState(int slot) {
+	const char *fileName = getSavegameFilename(slot);
+
+	SaveHeader header;
+	Common::InSaveFile *saveFile = openSaveForReading(fileName, header);
+	if (!saveFile) {
+		//_txt->printMessage(2, "%s", getLangString(0x425d));
+		return Common::kNoError;
+	}
+
+	Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, DisposeAfterUse::YES);
+
+	for (int i = 0; i < 6; i++) {
+		EobCharacter *c = &_characters[i];
+		c->id = in.readByte();
+		c->flags = in.readByte();
+		in.read(c->name, 11);
+		c->strengthCur = in.readSByte();
+		c->strengthMax = in.readSByte();
+		c->strengthExtCur = in.readSByte();
+		c->strengthExtMax = in.readSByte();
+		c->intelligenceCur = in.readSByte();
+		c->intelligenceMax = in.readSByte();
+		c->wisdomCur = in.readSByte();
+		c->wisdomMax = in.readSByte();
+		c->dexterityCur = in.readSByte();
+		c->dexterityMax = in.readSByte();
+		c->constitutionCur = in.readSByte();
+		c->constitutionMax = in.readSByte();
+		c->charismaCur = in.readSByte();
+		c->charismaMax = in.readSByte();
+		c->hitPointsCur = in.readSint16BE();
+		c->hitPointsMax = in.readSint16BE();
+		c->armorClass = in.readSByte();
+		c->disabledSlots = in.readByte();
+		c->raceSex = in.readByte();
+		c->cClass = in.readByte();
+		c->alignment = in.readByte();
+		c->portrait = in.readSByte();
+		c->food = in.readByte();
+		in.read(c->level, 3);
+		for (int ii = 0; ii < 3; ii++)
+			c->experience[ii] = in.readUint32BE();
+		delete[] c->faceShape;
+		c->faceShape = 0;
+		in.read(c->mageSpells, 80);
+		in.read(c->clericSpells, 80);
+		c->mageSpellsAvailabilityFlags = in.readUint32BE();
+		for (int ii = 0; ii < 27; ii++)
+			c->inventory[ii] = in.readSint16BE();
+		uint32 ct = _system->getMillis();
+		for (int ii = 0; ii < 10; ii++) {
+			c->timers[ii] = in.readUint32BE();
+			if (c->timers[ii])
+				c->timers[ii] += ct;
+		}
+		in.read(c->events, 10);
+		in.read(c->effectsRemainder, 4);
+		c->effectFlags = in.readUint32BE();
+		c->damageTaken = in.readByte();
+		in.read(c->slotStatus, 5);
+	}
+
+	setupCharacterTimers();
+
+	_screen->loadEobBitmap("CHARGENA", 3, 3);
+	for (int i = 0; i < 6; i++) {
+		EobCharacter *c = &_characters[i];
+		if (!c->flags || c->portrait < 0)
+			continue;
+		c->faceShape = _screen->encodeShape((c->portrait % 10) << 2, (c->portrait / 10) << 5, 4, 32, true);
+	}
+
+	_screen->loadEobBitmap(_flags.gameID == GI_EOB2 ? "OUTPORTS" : "OUTTAKE", 3, 3);
+	for (int i = 0; i < 6; i++) {
+		EobCharacter *c = &_characters[i];
+		if (!c->flags || c->portrait >= 0)
+			continue;
+		c->faceShape = _screen->encodeShape(-(c->portrait + 1), _flags.gameID == GI_EOB2 ? 0 : 160, 4, 32, true);
+	}
+	_screen->_curPage = 0;
+
+	_currentLevel = in.readByte();
+	_currentSub = in.readSByte();
+	_currentBlock = in.readUint16BE();
+	_currentDirection = in.readUint16BE();
+	_itemInHand = in.readSint16BE();
+	_hasTempDataFlags = in.readUint32BE();
+	_partyEffectFlags = in.readUint32BE();
+	_inf->loadState(in);
+
+	for (int i = 0; i < 600; i++) {
+		EobItem *t = &_items[i];
+		t->nameUnid = in.readByte();
+		t->nameId = in.readByte();
+		t->flags = in.readByte();
+		t->icon = in.readSByte();
+		t->type = in.readSByte();
+		t->pos = in.readSByte();
+		t->block = in.readSint16BE();
+		t->next = in.readSint16BE();
+		t->prev = in.readSint16BE();
+		t->level = in.readByte();
+		t->value = in.readSByte();
+	}
+
+	for (int i = 51; i < 65; i++) {
+		EobItemType *t = &_itemTypes[i];
+		t->invFlags = in.readUint16BE();
+		t->handFlags = in.readUint16BE();
+		t->armorClass = in.readSByte();
+		t->allowedClasses = in.readSByte();
+		t->requiredHands = in.readSByte();
+		t->dmgNumDiceS = in.readSByte();
+		t->dmgNumPipsS = in.readSByte();
+		t->dmgIncS = in.readSByte();
+		t->dmgNumDiceL = in.readSByte();
+		t->dmgNumPipsL = in.readSByte();
+		t->dmgIncL = in.readSByte();
+		t->unk1 = in.readByte();
+		t->extraProperties = in.readUint16BE();
+	}
+
+	for (int i = 0; i < 18; i++) {
+		if (!(_hasTempDataFlags & (1 << i)))
+			continue;
+
+		if (_lvlTempData[i]) {
+			delete[] _lvlTempData[i]->wallsXorData;
+			delete[] _lvlTempData[i]->flags;
+			releaseMonsterTempData(_lvlTempData[i]);
+			releaseFlyingObjectTempData(_lvlTempData[i]);
+			delete _lvlTempData[i];
+		}
+
+		_lvlTempData[i] = new LevelTempData;
+		_lvlTempData[i]->wallsXorData = new uint8[4096];
+		_lvlTempData[i]->flags = new uint16[1024];
+		EobMonsterInPlay *lm = new EobMonsterInPlay[30];
+		 _lvlTempData[i]->monsters = lm;
+		EobFlyingObject *lf = new EobFlyingObject[10];
+		_lvlTempData[i]->flyingObjects = lf;
+		LevelTempData *l = _lvlTempData[i];
+
+		in.read(l->wallsXorData, 4096);
+		for (int ii = 0; ii < 1024; ii++)
+			l->flags[ii] = in.readByte();
+
+		for (int ii = 0; ii < 30; ii++) {
+			EobMonsterInPlay *m = &lm[ii];
+			m->type = in.readByte();
+			m->unit = in.readByte();
+			m->block = in.readUint16BE();
+			m->pos = in.readByte();
+			m->dir = in.readSByte();
+			m->animStep = in.readByte();
+			m->shpIndex = in.readByte();
+			m->mode = in.readSByte();
+			m->f_9 = in.readSByte();
+			m->curAttackFrame = in.readSByte();
+			m->f_b = in.readByte();
+			m->hitPointsMax = in.readSint16BE();
+			m->hitPointsCur = in.readSint16BE();
+			m->dest = in.readUint16BE();
+			m->randItem = in.readUint16BE();
+			m->fixedItem = in.readUint16BE();
+			m->flags = in.readByte();
+			m->idleAnimState = in.readByte();
+			m->curRemoteWeapon = in.readByte();
+			m->numRemoteAttacks = in.readByte();
+			m->palette = in.readSByte();
+			m->directionChanged = in.readByte();
+			m->stepsTillRemoteAttack = in.readByte();
+			m->sub = in.readByte();
+		}
+
+		for (int ii = 0; ii < 10; ii++) {
+			EobFlyingObject *m = &lf[ii];
+			m->enable = in.readByte();
+			m->objectType = in.readByte();
+			m->attackerId = in.readSint16BE();
+			m->item = in.readSint16BE();
+			m->curBlock = in.readUint16BE();
+			m->u2 = in.readUint16BE();
+			m->u1 = in.readByte();
+			m->direction = in.readByte();
+			m->distance = in.readByte();
+			m->callBackIndex = in.readSByte();
+			m->curPos = in.readByte();
+			m->flags = in.readByte();
+			m->unused = in.readByte();
+		}
+	}
+
+	if (_saveLoadMode != -1) {
+		loadLevel(_currentLevel, _currentSub);
+		gui_drawPlayField(0);
+		_sceneUpdateRequired = true;
+		_screen->setCurPage(0);
+		_screen->setFont(Screen::FID_6_FNT);
+		gui_drawAllCharPortraitsWithStats();
+		updateHandItemCursor();
+		_saveLoadMode = 1;
+	}
+
+	while (!_screen->isMouseVisible())
+		_screen->showMouse();
+
+	return Common::kNoError;
+}
+
+Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail) {
+	const Common::String finSuffix(".FIN");
+	const char *fileName = (slot != -1) ? getSavegameFilename(slot) : (_targetName + finSuffix).c_str();
+
+	Common::OutSaveFile *out = openSaveForWriting(fileName, saveName, thumbnail);
+	if (!out)
+		return _saveFileMan->getError();
+
+	completeDoorOperations();
+	generateTempData();
+
+	for (int i = 0; i < 6; i++) {
+		timerSpecialCharacterUpdate(0x30 + i);
+		uint32 ct = _system->getMillis();
+		EobCharacter *c = &_characters[i];
+
+		out->writeByte(c->id);
+		out->writeByte(c->flags);
+		out->write(c->name, 11);
+		out->writeSByte(c->strengthCur);
+		out->writeSByte(c->strengthMax);
+		out->writeSByte(c->strengthExtCur);
+		out->writeSByte(c->strengthExtMax);
+		out->writeSByte(c->intelligenceCur);
+		out->writeSByte(c->intelligenceMax);
+		out->writeSByte(c->wisdomCur);
+		out->writeSByte(c->wisdomMax);
+		out->writeSByte(c->dexterityCur);
+		out->writeSByte(c->dexterityMax);
+		out->writeSByte(c->constitutionCur);
+		out->writeSByte(c->constitutionMax);
+		out->writeSByte(c->charismaCur);
+		out->writeSByte(c->charismaMax);
+		out->writeSint16BE(c->hitPointsCur);
+		out->writeSint16BE(c->hitPointsMax);
+		out->writeSByte(c->armorClass);
+		out->writeByte(c->disabledSlots);
+		out->writeByte(c->raceSex);
+		out->writeByte(c->cClass);
+		out->writeByte(c->alignment);
+		out->writeByte(c->portrait);
+		out->writeByte(c->food);
+		out->write(c->level, 3);
+		for (int ii = 0; ii < 3; ii++)
+			out->writeUint32BE(c->experience[ii]);
+		out->write(c->mageSpells, 80);
+		out->write(c->clericSpells, 80);
+		out->writeUint32BE(c->mageSpellsAvailabilityFlags);
+		for (int ii = 0; ii < 27; ii++)
+			out->writeSint16BE(c->inventory[ii]);
+		for (int ii = 0; ii < 10; ii++)
+			out->writeUint32BE(c->timers[ii] ? c->timers[ii] - ct : 0);
+
+		out->write(c->events, 10);
+		out->write(c->effectsRemainder, 4);
+		out->writeUint32BE(c->effectFlags);
+		out->writeByte(c->damageTaken);
+		out->write(c->slotStatus, 5);
+	}
+
+	out->writeByte(_currentLevel);
+	out->writeSByte(_currentSub);
+	out->writeUint16BE(_currentBlock);
+	out->writeUint16BE(_currentDirection);
+	out->writeSint16BE(_itemInHand);
+	out->writeUint32BE(_hasTempDataFlags);
+	out->writeUint32BE(_partyEffectFlags);
+	_inf->saveState(out);
+
+	for (int i = 0; i < 600; i++) {
+		EobItem *t = &_items[i];
+		out->writeByte(t->nameUnid);
+		out->writeByte(t->nameId);
+		out->writeByte(t->flags);
+		out->writeSByte(t->icon);
+		out->writeSByte(t->type);
+		out->writeSByte(t->pos);
+		out->writeSint16BE(t->block);
+		out->writeSint16BE(t->next);
+		out->writeSint16BE(t->prev);
+		out->writeByte(t->level);
+		out->writeSByte(t->value);
+	}
+
+	for (int i = 51; i < 65; i++) {
+		EobItemType *t = &_itemTypes[i];
+		out->writeUint16BE(t->invFlags);
+		out->writeUint16BE(t->handFlags);
+		out->writeSByte(t->armorClass);
+		out->writeSByte(t->allowedClasses);
+		out->writeSByte(t->requiredHands);
+		out->writeSByte(t->dmgNumDiceS);
+		out->writeSByte(t->dmgNumPipsS);
+		out->writeSByte(t->dmgIncS);
+		out->writeSByte(t->dmgNumDiceL);
+		out->writeSByte(t->dmgNumPipsL);
+		out->writeSByte(t->dmgIncL);
+		out->writeByte(t->unk1);
+		out->writeUint16BE(t->extraProperties);
+	}
+
+	for (int i = 0; i < 18; i++) {
+		LevelTempData *l = _lvlTempData[i];
+		if (!l || !(_hasTempDataFlags & (1 << i)))
+			continue;
+
+		out->write(l->wallsXorData, 4096);
+		for (int ii = 0; ii < 1024; ii++)
+			out->writeByte(l->flags[ii] & 0xff);
+
+		EobMonsterInPlay *lm = (EobMonsterInPlay*)_lvlTempData[i]->monsters;
+		EobFlyingObject *lf = (EobFlyingObject*)_lvlTempData[i]->flyingObjects;
+
+		for (int ii = 0; ii < 30; ii++) {
+			EobMonsterInPlay *m = &lm[ii];
+			out->writeByte(m->type);
+			out->writeByte(m->unit);
+			out->writeUint16BE(m->block);
+			out->writeByte(m->pos);
+			out->writeSByte(m->dir);
+			out->writeByte(m->animStep);
+			out->writeByte(m->shpIndex);
+			out->writeSByte(m->mode);
+			out->writeSByte(m->f_9);
+			out->writeSByte(m->curAttackFrame);
+			out->writeByte(m->f_b);
+			out->writeSint16BE(m->hitPointsMax);
+			out->writeSint16BE(m->hitPointsCur);
+			out->writeUint16BE(m->dest);
+			out->writeUint16BE(m->randItem);
+			out->writeUint16BE(m->fixedItem);
+			out->writeByte(m->flags);
+			out->writeByte(m->idleAnimState);
+			out->writeByte(m->curRemoteWeapon);
+			out->writeByte(m->numRemoteAttacks);
+			out->writeSByte(m->palette);
+			out->writeByte(m->directionChanged);
+			out->writeByte(m->stepsTillRemoteAttack);
+			out->writeByte(m->sub);
+		}
+
+		for (int ii = 0; ii < 10; ii++) {
+			EobFlyingObject *m = &lf[ii];
+			out->writeByte(m->enable);
+			out->writeByte(m->objectType);
+			out->writeSint16BE(m->attackerId);
+			out->writeSint16BE(m->item);
+			out->writeUint16BE(m->curBlock);
+			out->writeUint16BE(m->u2);
+			out->writeByte(m->u1);
+			out->writeByte(m->direction);
+			out->writeByte(m->distance);
+			out->writeSByte(m->callBackIndex);
+			out->writeByte(m->curPos);
+			out->writeByte(m->flags);
+			out->writeByte(m->unused);
+		}
+	}
+
+	out->finalize();
+
+	// check for errors
+	if (out->err()) {
+		warning("Can't write file '%s'. (Disk full?)", fileName);
+		return Common::kUnknownError;
+	} else {
+		debugC(1, kDebugLevelMain, "Saved game '%s.'", saveName);
+	}
+
+	delete out;
+	return Common::kNoError;
+}
+
+void *EobCoreEngine::generateMonsterTempData(LevelTempData *tmp) {
+	EobMonsterInPlay *m = new EobMonsterInPlay[30];
+	memcpy(m, _monsters,  sizeof(EobMonsterInPlay) * 30);
+	return m;
+}
+
+void *EobCoreEngine::generateFlyingObjectTempData(LevelTempData *tmp) {
+	EobFlyingObject *f = new EobFlyingObject[10];
+	memcpy(f, _flyingObjects,  sizeof(EobFlyingObject) * 10);
+	return f;
+}
+
+void EobCoreEngine::restoreMonsterTempData(LevelTempData *tmp) {
+	memcpy(_monsters, tmp->monsters, sizeof(EobMonsterInPlay) * 30);
+}
+
+void EobCoreEngine::restoreFlyingObjectTempData(LevelTempData *tmp) {
+	memcpy(_flyingObjects, tmp->flyingObjects, sizeof(EobFlyingObject) * 10);
+}
+
+void EobCoreEngine::releaseMonsterTempData(LevelTempData *tmp) {
+	EobMonsterInPlay *p = (EobMonsterInPlay*)tmp->monsters;
+	delete[] p;
+}
+
+void EobCoreEngine::releaseFlyingObjectTempData(LevelTempData *tmp) {
+
+}
+
+#endif // ENABLE_EOB
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp
index 1bf26477e6..7d8e6c32d9 100644
--- a/engines/kyra/saveload_lol.cpp
+++ b/engines/kyra/saveload_lol.cpp
@@ -96,7 +96,7 @@ Common::Error LoLEngine::loadGameState(int slot) {
 		}
 	}
 
-	in.read(_wllBuffer4, 80);
+	in.read(_wllAutomapData, 80);
 
 	_currentBlock = in.readUint16BE();
 	_partyPosX = in.readUint16BE();
@@ -185,23 +185,26 @@ Common::Error LoLEngine::loadGameState(int slot) {
 		if (_lvlTempData[i]) {
 			delete[] _lvlTempData[i]->wallsXorData;
 			delete[] _lvlTempData[i]->flags;
-			delete[] _lvlTempData[i]->monsters;
-			delete[] _lvlTempData[i]->flyingObjects;
+			releaseMonsterTempData(_lvlTempData[i]);
+			releaseFlyingObjectTempData(_lvlTempData[i]);
 			delete _lvlTempData[i];
 		}
 
 		_lvlTempData[i] = new LevelTempData;
 		_lvlTempData[i]->wallsXorData = new uint8[4096];
-		_lvlTempData[i]->flags = new uint8[1024];
-		_lvlTempData[i]->monsters = new MonsterInPlay[30];
-		_lvlTempData[i]->flyingObjects = new FlyingObject[8];
+		_lvlTempData[i]->flags = new uint16[1024];
+		LolMonsterInPlay *lm = new LolMonsterInPlay[30];
+		 _lvlTempData[i]->monsters = lm;
+		FlyingObject *lf = new FlyingObject[8];
+		_lvlTempData[i]->flyingObjects = lf;
 		LevelTempData *l = _lvlTempData[i];
 
 		in.read(l->wallsXorData, 4096);
-		in.read(l->flags, 1024);
+		for (int ii = 0; ii < 1024; ii++)
+			l->flags[ii] = in.readByte();
 
 		for (int ii = 0; ii < 30; ii++) {
-			MonsterInPlay *m = &l->monsters[ii];
+			LolMonsterInPlay *m = &lm[ii];
 			m->nextAssignedObject = in.readUint16BE();
 			m->nextDrawObject = in.readUint16BE();
 			m->flyingHeight = in.readByte();
@@ -234,7 +237,7 @@ Common::Error LoLEngine::loadGameState(int slot) {
 		}
 
 		for (int ii = 0; ii < 8; ii++) {
-			FlyingObject *m = &l->flyingObjects[ii];
+			FlyingObject *m = &lf[ii];
 			m->enable = in.readByte();
 			m->objectType = in.readByte();
 			m->attackerId = in.readUint16BE();
@@ -319,7 +322,7 @@ Common::Error LoLEngine::saveGameStateIntern(int slot, const char *saveName, con
 			out->writeByte(c->characterUpdateDelay[ii]);
 	}
 
-	out->write(_wllBuffer4, 80);
+	out->write(_wllAutomapData, 80);
 
 	out->writeUint16BE(_currentBlock);
 	out->writeUint16BE(_partyPosX);
@@ -379,10 +382,14 @@ Common::Error LoLEngine::saveGameStateIntern(int slot, const char *saveName, con
 			continue;
 
 		out->write(l->wallsXorData, 4096);
-		out->write(l->flags, 1024);
+		for (int ii = 0; ii < 1024; ii++)
+			out->writeByte(l->flags[ii] & 0xff);
+
+		LolMonsterInPlay *lm = (LolMonsterInPlay*)_lvlTempData[i]->monsters;
+		FlyingObject *lf = (FlyingObject*)_lvlTempData[i]->flyingObjects;
 
 		for (int ii = 0; ii < 30; ii++) {
-			MonsterInPlay *m = &l->monsters[ii];
+			LolMonsterInPlay *m = &lm[ii];
 			out->writeUint16BE(m->nextAssignedObject);
 			out->writeUint16BE(m->nextDrawObject);
 			out->writeByte(m->flyingHeight);
@@ -414,7 +421,7 @@ Common::Error LoLEngine::saveGameStateIntern(int slot, const char *saveName, con
 		}
 
 		for (int ii = 0; ii < 8; ii++) {
-			FlyingObject *m = &l->flyingObjects[ii];
+			FlyingObject *m = &lf[ii];
 			out->writeByte(m->enable);
 			out->writeByte(m->objectType);
 			out->writeUint16BE(m->attackerId);
@@ -469,6 +476,69 @@ Graphics::Surface *LoLEngine::generateSaveThumbnail() const {
 	return dst;
 }
 
+void LoLEngine::restoreBlockTempData(int levelIndex) {
+	memset(_tempBuffer5120, 0, 5120);
+	LolEobBaseEngine::restoreBlockTempData(levelIndex);
+	restoreTempDataAdjustMonsterStrength(levelIndex - 1);
+}
+
+void *LoLEngine::generateMonsterTempData(LevelTempData *tmp) {
+	LolMonsterInPlay *m = new LolMonsterInPlay[30];
+	memcpy(m, _monsters,  sizeof(LolMonsterInPlay) * 30);
+	tmp->monsterDifficulty = _monsterDifficulty;
+	return m;
+}
+
+void *LoLEngine::generateFlyingObjectTempData(LevelTempData *tmp) {
+	FlyingObject *f = new FlyingObject[8];
+	memcpy(f, _flyingObjects,  sizeof(FlyingObject) * 8);
+	return f;
+}
+
+void LoLEngine::restoreTempDataAdjustMonsterStrength(int index) {
+	if (_lvlTempData[index]->monsterDifficulty == _monsterDifficulty)
+		return;
+
+	uint16 d = (_monsterModifiers[_lvlTempData[index]->monsterDifficulty] << 8) / _monsterModifiers[_monsterDifficulty];
+
+	for (int i = 0; i < 30; i++) {
+		if (_monsters[i].mode >= 14 || _monsters[i].block == 0 || _monsters[i].hitPoints <= 0)
+			continue;
+
+		_monsters[i].hitPoints = (d * _monsters[i].hitPoints) >> 8;
+		if (_monsterDifficulty < _lvlTempData[index]->monsterDifficulty)
+			_monsters[i].hitPoints++;
+		if (_monsters[i].hitPoints == 0)
+			_monsters[i].hitPoints = 1;
+	}
+}
+
+void LoLEngine::restoreMonsterTempData(LevelTempData *tmp) {
+	memcpy(_monsters, tmp->monsters, sizeof(LolMonsterInPlay) * 30);
+
+	for (int i = 0; i < 30; i++) {
+		if (_monsters[i].block) {
+			_monsters[i].block = 0;
+			_monsters[i].properties = &_monsterProperties[_monsters[i].type];
+			placeMonster(&_monsters[i], _monsters[i].x, _monsters[i].y);
+		}
+	}
+}
+
+void LoLEngine::restoreFlyingObjectTempData(LevelTempData *tmp) {
+	memcpy(_flyingObjects, tmp->flyingObjects, sizeof(FlyingObject) * 8);
+}
+
+void LoLEngine::releaseMonsterTempData(LevelTempData *tmp) {
+	LolMonsterInPlay *p = (LolMonsterInPlay*)tmp->monsters;
+	delete[] p;
+}
+
+void LoLEngine::releaseFlyingObjectTempData(LevelTempData *tmp) {
+	FlyingObject *p = (FlyingObject*)tmp->flyingObjects;
+	delete[] p;
+}
+
 } // End of namespace Kyra
 
 #endif // ENABLE_LOL
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
new file mode 100644
index 0000000000..90aa9ff533
--- /dev/null
+++ b/engines/kyra/scene_eob.cpp
@@ -0,0 +1,1350 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/eobcommon.h"
+#include "kyra/resource.h"
+#include "kyra/script_eob.h"
+#include "kyra/timer.h"
+#include "kyra/sound.h"
+
+#include "common/system.h"
+
+namespace Kyra {
+
+void LolEobBaseEngine::setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim) {
+	if (_lvlShapeLeftRight[index << 1] == -1) {
+		x1 = 0;
+		x2 = 22;
+
+		int16 y1 = 0;
+		int16 y2 = 120;
+
+		int m = index * 18;
+
+		for (int i = 0; i < 18; i++) {
+			uint8 d = _visibleBlocks[i]->walls[_sceneDrawVarDown];
+			uint8 a = _wllWallFlags[d];
+
+			if (a & 8) {
+				int t = _dscDim2[(m + i) << 1];
+
+				if (t > x1) {
+					x1 = t;
+					if (!(a & 0x10))
+						scaleLevelShapesDim(index, y1, y2, -1);
+				}
+
+				t = _dscDim2[((m + i) << 1) + 1];
+
+				if (t < x2) {
+					x2 = t;
+					if (!(a & 0x10))
+						scaleLevelShapesDim(index, y1, y2, -1);
+				}
+			} else {
+				int t = _dscDim1[m + i];
+
+				if (!_wllVmpMap[d] || t == -40)
+					continue;
+
+				if (t == -41) {
+					x1 = 22;
+					x2 = 0;
+					break;
+				}
+
+				if (t > 0 && x2 > t)
+					x2 = t;
+
+				if (t < 0 && x1 < -t)
+					x1 = -t;
+			}
+
+			if (x2 < x1)
+				break;
+		}
+
+		x1 += (_sceneXoffset >> 3);
+		x2 += (_sceneXoffset >> 3);
+
+
+		_lvlShapeTop[index] = y1;
+		_lvlShapeBottom[index] = y2;
+		_lvlShapeLeftRight[index << 1] = x1;
+		_lvlShapeLeftRight[(index << 1) + 1] = x2;
+	} else {
+		x1 = _lvlShapeLeftRight[index << 1];
+		x2 = _lvlShapeLeftRight[(index << 1) + 1];
+	}
+
+	drawLevelModifyScreenDim(dim, x1, 0, x2, 15);
+}
+
+void LolEobBaseEngine::scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim) {
+	static const int8 dscY1[] = { 0x1E, 0x18, 0x10, 0x00 };
+	static const int8 dscY2[] = { 0x3B, 0x47, 0x56, 0x78 };
+
+	uint8 a = _dscDimMap[index];
+
+	if (dim == -1 && a != 3)
+		a++;
+
+	y1 = dscY1[a];
+	y2 = dscY2[a];
+
+	if (dim == -1)
+		return;
+
+	const ScreenDim *cDim = screen()->getScreenDim(dim);
+
+	screen()->modifyScreenDim(dim, cDim->sx, y1, cDim->w, y2 - y1);
+}
+
+void LolEobBaseEngine::drawLevelModifyScreenDim(int dim, int16 x1, int16 y1, int16 x2, int16 y2) {
+	screen()->modifyScreenDim(dim, x1, y1 << 3, x2 - x1, (y2 - y1) << 3);
+}
+
+void LolEobBaseEngine::generateBlockDrawingBuffer() {
+	_sceneDrawVarDown = _dscBlockMap[_currentDirection];
+	_sceneDrawVarRight = _dscBlockMap[_currentDirection + 4];
+	_sceneDrawVarLeft = _dscBlockMap[_currentDirection + 8];
+
+	/*******************************************
+    *             _visibleBlocks map           *
+	*                                          *
+	*     |     |     |     |     |     |      *
+	*  00 |  01 |  02 |  03 |  04 |  05 |  06  *
+	* ____|_____|_____|_____|_____|_____|_____ *
+	*     |     |     |     |     |     |      *
+	*     |  07 |  08 |  09 |  10 |  11 |      *
+	*     |_____|_____|_____|_____|_____|      *
+	*           |     |     |     |            *
+	*           |  12 |  13 |  14 |            *
+	*           |_____|_____|_____|            *
+	*                 |     |                  *
+	*              15 |  16 |  17              *
+	*                 | (P) |                  *
+	********************************************/
+
+	memset(_blockDrawingBuffer, 0, 660 * sizeof(uint16));
+
+	_wllProcessFlag = ((_currentBlock >> 5) + (_currentBlock & 0x1f) + _currentDirection) & 1;
+
+	if (_wllProcessFlag) // floor and ceiling
+		generateVmpTileDataFlipped(0, 15, 1, -330, 22, 15);
+	else
+		generateVmpTileData(0, 15, 1, -330, 22, 15);
+
+	assignVisibleBlocks(_currentBlock, _currentDirection);
+
+	uint8 t = _visibleBlocks[0]->walls[_sceneDrawVarRight];
+	if (t)
+		generateVmpTileData(-2, 3, t, 102, 3, 5);
+
+	t = _visibleBlocks[6]->walls[_sceneDrawVarLeft];
+	if (t)
+		generateVmpTileDataFlipped(21, 3, t, 102, 3, 5);
+
+	t = _visibleBlocks[1]->walls[_sceneDrawVarRight];
+	uint8 t2 = _visibleBlocks[2]->walls[_sceneDrawVarDown];
+
+	if (hasWall(t) && !(_wllWallFlags[t2] & 8))
+		generateVmpTileData(2, 3, t, 102, 3, 5);
+	else if (t && (_wllWallFlags[t2] & 8))
+		generateVmpTileData(2, 3, t2, 102, 3, 5);
+
+	t = _visibleBlocks[5]->walls[_sceneDrawVarLeft];
+	t2 = _visibleBlocks[4]->walls[_sceneDrawVarDown];
+
+	if (hasWall(t) && !(_wllWallFlags[t2] & 8))
+		generateVmpTileDataFlipped(17, 3, t, 102, 3, 5);
+	else if (t && (_wllWallFlags[t2] & 8))
+		generateVmpTileDataFlipped(17, 3, t2, 102, 3, 5);
+
+	t = _visibleBlocks[2]->walls[_sceneDrawVarRight];
+	if (t)
+		generateVmpTileData(8, 3, t, 97, 1, 5);
+
+	t = _visibleBlocks[4]->walls[_sceneDrawVarLeft];
+	if (t)
+		generateVmpTileDataFlipped(13, 3, t, 97, 1, 5);
+
+	t = _visibleBlocks[1]->walls[_sceneDrawVarDown];
+	if (hasWall(t))
+		generateVmpTileData(-4, 3, t, 129, 6, 5);
+
+	t = _visibleBlocks[5]->walls[_sceneDrawVarDown];
+	if (hasWall(t))
+		generateVmpTileData(20, 3, t, 129, 6, 5);
+
+	t = _visibleBlocks[2]->walls[_sceneDrawVarDown];
+	if (hasWall(t))
+		generateVmpTileData(2, 3, t, 129, 6, 5);
+
+	t = _visibleBlocks[4]->walls[_sceneDrawVarDown];
+	if (hasWall(t))
+		generateVmpTileData(14, 3, t, 129, 6, 5);
+
+	t = _visibleBlocks[3]->walls[_sceneDrawVarDown];
+	if (t)
+		generateVmpTileData(8, 3, t, 129, 6, 5);
+
+	t = _visibleBlocks[7]->walls[_sceneDrawVarRight];
+	if (t)
+		generateVmpTileData(0, 3, t, 117, 2, 6);
+
+	t = _visibleBlocks[11]->walls[_sceneDrawVarLeft];
+	if (t)
+		generateVmpTileDataFlipped(20, 3, t, 117, 2, 6);
+
+	t = _visibleBlocks[8]->walls[_sceneDrawVarRight];
+	if (t)
+		generateVmpTileData(6, 2, t, 81, 2, 8);
+
+	t = _visibleBlocks[10]->walls[_sceneDrawVarLeft];
+	if (t)
+		generateVmpTileDataFlipped(14, 2, t, 81, 2, 8);
+
+	t = _visibleBlocks[8]->walls[_sceneDrawVarDown];
+	if (hasWall(t))
+		generateVmpTileData(-4, 2, t, 159, 10, 8);
+
+	t = _visibleBlocks[10]->walls[_sceneDrawVarDown];
+	if (hasWall(t))
+		generateVmpTileData(16, 2, t, 159, 10, 8);
+
+	t = _visibleBlocks[9]->walls[_sceneDrawVarDown];
+	if (t)
+		generateVmpTileData(6, 2, t, 159, 10, 8);
+
+	t = _visibleBlocks[12]->walls[_sceneDrawVarRight];
+	if (t)
+		generateVmpTileData(3, 1, t, 45, 3, 12);
+
+	t = _visibleBlocks[14]->walls[_sceneDrawVarLeft];
+	if (t)
+		generateVmpTileDataFlipped(16, 1, t, 45, 3, 12);
+
+	t = _visibleBlocks[12]->walls[_sceneDrawVarDown];
+	if (!(_wllWallFlags[t] & 8))
+		generateVmpTileData(-13, 1, t, 239, 16, 12);
+
+	t = _visibleBlocks[14]->walls[_sceneDrawVarDown];
+	if (!(_wllWallFlags[t] & 8))
+		generateVmpTileData(19, 1, t, 239, 16, 12);
+
+	t = _visibleBlocks[13]->walls[_sceneDrawVarDown];
+	if (t)
+		generateVmpTileData(3, 1, t, 239, 16, 12);
+
+	t = _visibleBlocks[15]->walls[_sceneDrawVarRight];
+	t2 = _visibleBlocks[17]->walls[_sceneDrawVarLeft];
+	if (t)
+		generateVmpTileData(0, 0, t, 0, 3, 15);
+	if (t2)
+		generateVmpTileDataFlipped(19, 0, t2, 0, 3, 15);
+}
+
+void LolEobBaseEngine::generateVmpTileData(int16 startBlockX, uint8 startBlockY, uint8 vmpMapIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY) {
+	if (!_wllVmpMap[vmpMapIndex])
+		return;
+
+	uint16 *vmp = &_vmpPtr[(_wllVmpMap[vmpMapIndex] - 1) * 431 + vmpOffset + 330];
+
+	for (int i = 0; i < numBlocksY; i++) {
+		uint16 *bl = &_blockDrawingBuffer[(startBlockY + i) * 22 + startBlockX];
+		for (int ii = 0; ii < numBlocksX; ii++) {
+			if ((startBlockX + ii >= 0) && (startBlockX + ii < 22) && *vmp)
+				*bl = *vmp;
+			bl++;
+			vmp++;
+		}
+	}
+}
+
+void LolEobBaseEngine::generateVmpTileDataFlipped(int16 startBlockX, uint8 startBlockY, uint8 vmpMapIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY) {
+	if (!_wllVmpMap[vmpMapIndex])
+		return;
+
+	uint16 *vmp = &_vmpPtr[(_wllVmpMap[vmpMapIndex] - 1) * 431 + vmpOffset + 330];
+
+	for (int i = 0; i < numBlocksY; i++) {
+		for (int ii = 0; ii < numBlocksX; ii++) {
+			if ((startBlockX + ii) < 0 || (startBlockX + ii) > 21)
+				continue;
+
+			uint16 v = vmp[i * numBlocksX + (numBlocksX - 1 - ii)];
+			if (!v)
+				continue;
+
+			if (v & 0x4000)
+				v -= 0x4000;
+			else
+				v |= 0x4000;
+
+			_blockDrawingBuffer[(startBlockY + i) * 22 + startBlockX + ii] = v;
+		}
+	}
+}
+
+bool LolEobBaseEngine::hasWall(int index) {
+	if (!index || (_wllWallFlags[index] & 8))
+		return false;
+	return true;
+}
+
+void LolEobBaseEngine::assignVisibleBlocks(int block, int direction) {
+	for (int i = 0; i < 18; i++) {
+		uint16 t = (block + _dscBlockIndex[direction * 18 + i]) & 0x3ff;
+		_visibleBlockIndex[i] = t;
+
+		_visibleBlocks[i] = &_levelBlockProperties[t];
+		_lvlShapeLeftRight[i] = _lvlShapeLeftRight[18 + i] = -1;
+	}
+}
+
+bool LolEobBaseEngine::checkSceneUpdateNeed(int block) {
+	if (_sceneUpdateRequired)
+		return true;
+
+	for (int i = 0; i < 15; i++) {
+		if (_visibleBlockIndex[i] == block) {
+			_sceneUpdateRequired = true;
+			return true;
+		}
+	}
+
+	if (_currentBlock == block){
+		_sceneUpdateRequired = true;
+		return true;
+	}
+
+	return false;
+}
+
+void LolEobBaseEngine::drawVcnBlocks() {
+	uint8 *d = _sceneWindowBuffer;
+	uint16 *bdb = _blockDrawingBuffer;
+
+	for (int y = 0; y < 15; y++) {
+		for (int x = 0; x < 22; x++) {
+			bool horizontalFlip = false;
+			int remainder = 0;
+
+			uint16 vcnOffset = *bdb++;
+			int wllVcnOffset = 0;
+			int wllVcnRmdOffset = 0;
+
+			if (vcnOffset & 0x8000) {
+				// this renders a wall block over the transparent pixels of a floor/ceiling block
+				remainder = vcnOffset - 0x8000;
+				vcnOffset = 0;
+				wllVcnRmdOffset = _wllVcnOffset;
+			}
+
+			if (vcnOffset & 0x4000) {
+				horizontalFlip = true;
+				vcnOffset &= 0x3fff;
+			}
+
+			uint8 *src = 0;
+			if (vcnOffset) {
+				src = &_vcnBlocks[vcnOffset << 5];
+				wllVcnOffset = _wllVcnOffset;
+			} else {
+				// floor/ceiling blocks
+				vcnOffset = bdb[329];
+				if (vcnOffset & 0x4000) {
+					horizontalFlip = true;
+					vcnOffset &= 0x3fff;
+				}
+
+				src = (_vcfBlocks ? _vcfBlocks : _vcnBlocks) + (vcnOffset << 5);
+			}
+
+			uint8 shift = _vcnShift ? _vcnShift[vcnOffset] : _blockBrightness;
+
+			if (horizontalFlip) {
+				for (int blockY = 0; blockY < 8; blockY++) {
+					src += 3;
+					for (int blockX = 0; blockX < 4; blockX++) {
+						uint8 t = *src--;
+						*d++ = _vcnExpTable[((t & 0x0f) + wllVcnOffset) | shift];
+						*d++ = _vcnExpTable[((t >> 4) + wllVcnOffset) | shift];
+					}
+					src += 5;
+					d += 168;
+				}
+			} else {
+				for (int blockY = 0; blockY < 8; blockY++) {
+					for (int blockX = 0; blockX < 4; blockX++) {
+						uint8 t = *src++;
+						*d++ = _vcnExpTable[((t >> 4) + wllVcnOffset) | shift];
+						*d++ = _vcnExpTable[((t & 0x0f) + wllVcnOffset) | shift];
+					}
+					d += 168;
+				}
+			}
+			d -= 1400;
+
+			if (remainder) {
+				d -= 8;
+				horizontalFlip = false;
+
+				if (remainder & 0x4000) {
+					remainder &= 0x3fff;
+					horizontalFlip = true;
+				}
+
+				shift = _vcnShift ? _vcnShift[remainder] : _blockBrightness;
+				src = &_vcnBlocks[remainder << 5];
+
+				if (horizontalFlip) {
+					for (int blockY = 0; blockY < 8; blockY++) {
+						src += 3;
+						for (int blockX = 0; blockX < 4; blockX++) {
+							uint8 t = *src--;
+							uint8 h = _vcnExpTable[((t & 0x0f) + wllVcnRmdOffset) | shift];
+							uint8 l = _vcnExpTable[((t >> 4) + wllVcnRmdOffset) | shift];
+							if (h)
+								*d = h;
+							d++;
+							if (l)
+								*d = l;
+							d++;
+						}
+						src += 5;
+						d += 168;
+					}
+				} else {
+					for (int blockY = 0; blockY < 8; blockY++) {
+						for (int blockX = 0; blockX < 4; blockX++) {
+							uint8 t = *src++;
+							uint8 h = _vcnExpTable[((t >> 4) + wllVcnRmdOffset) | shift];
+							uint8 l = _vcnExpTable[((t & 0x0f) + wllVcnRmdOffset) | shift];
+							if (h)
+								*d = h;
+							d++;
+							if (l)
+								*d = l;
+							d++;
+						}
+						d += 168;
+					}
+				}
+				d -= 1400;
+			}
+		}
+		d += 1232;
+	}
+
+	screen()->copyBlockToPage(_sceneDrawPage1, _sceneXoffset, 0, 176, 120, _sceneWindowBuffer);
+}
+
+uint16 LolEobBaseEngine::calcNewBlockPosition(uint16 curBlock, uint16 direction) {
+	static const int16 blockPosTable[] = { -32, 1, 32, -1 };
+	return (curBlock + blockPosTable[direction]) & 0x3ff;
+}
+
+int LolEobBaseEngine::clickedWallShape(uint16 block, uint16 direction) {
+	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
+	if (!clickedShape(v))
+		return 0;
+
+	snd_stopSpeech(true);
+	runLevelScript(block, 0x40);
+
+	return 1;
+}
+
+int LolEobBaseEngine::clickedLeverOn(uint16 block, uint16 direction) {
+	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
+	if (!clickedShape(v))
+		return 0;
+
+	_levelBlockProperties[block].walls[direction]++;
+	_sceneUpdateRequired = true;
+
+	if (_flags.gameID == GI_LOL)
+		snd_playSoundEffect(30, -1);
+
+	runLevelScript(block, _clickedSpecialFlag);
+
+	return 1;
+}
+
+int LolEobBaseEngine::clickedLeverOff(uint16 block, uint16 direction) {
+	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
+	if (!clickedShape(v))
+		return 0;
+
+	_levelBlockProperties[block].walls[direction]--;
+	_sceneUpdateRequired = true;
+
+	if (_flags.gameID == GI_LOL)
+		snd_playSoundEffect(29, -1);
+
+	runLevelScript(block, _clickedSpecialFlag);
+	return 1;
+}
+
+int LolEobBaseEngine::clickedWallOnlyScript(uint16 block) {
+	runLevelScript(block, _clickedSpecialFlag);
+	return 1;
+}
+
+void LolEobBaseEngine::processDoorSwitch(uint16 block, int openClose) {
+	if (block == _currentBlock)
+		return;
+
+	if ((_flags.gameID == GI_LOL && (_levelBlockProperties[block].assignedObjects & 0x8000)) || (_flags.gameID != GI_LOL  && (_levelBlockProperties[block].flags & 7)))
+		return;
+
+	if (openClose == 0) {
+		for (int i = 0; i < 3; i++) {
+			if (_openDoorState[i].block != block)
+				continue;
+			openClose = -_openDoorState[i].state;
+			break;
+		}
+	}
+
+	if (openClose == 0) {
+		openClose = (_wllWallFlags[_levelBlockProperties[block].walls[_wllWallFlags[_levelBlockProperties[block].walls[0]] & 8 ? 0 : 1]] & 1) ? 1 : -1;
+		if (_flags.gameID != GI_LOL)
+			openClose *= -1;
+	}
+
+	openCloseDoor(block, openClose);
+}
+
+void LolEobBaseEngine::openCloseDoor(int block, int openClose) {
+	int s1 = -1;
+	int s2 = -1;
+
+	int c = (_wllWallFlags[_levelBlockProperties[block].walls[0]] & 8) ? 0 : 1;
+	int v = _levelBlockProperties[block].walls[c];
+	int flg = (openClose == 1) ? 0x10 : (openClose == -1 ? 0x20 : 0);
+
+	if (_wllWallFlags[v] & flg)
+		return;
+
+	for (int i = 0; i < 3; i++) {
+		if (_openDoorState[i].block == block) {
+			s1 = i;
+			break;
+		} else if (_openDoorState[i].block == 0 && s2 == -1) {
+			s2 = i;
+		}
+	}
+
+	if (s1 != -1 || s2 != -1) {
+		if (s1 == -1)
+			s1 = s2;
+
+		_openDoorState[s1].block = block;
+		_openDoorState[s1].state = openClose;
+		_openDoorState[s1].wall = c;
+
+		flg = (-openClose == 1) ? 0x10 : (-openClose == -1 ? 0x20 : 0);
+
+		if (_wllWallFlags[v] & flg) {
+			_levelBlockProperties[block].walls[c] += openClose;
+			_levelBlockProperties[block].walls[c ^ 2] += openClose;
+
+			int snd = (openClose == -1) ? 4 : 3;
+			if (_flags.gameID == GI_LOL) {
+				snd_processEnvironmentalSoundEffect(snd + 28, _currentBlock);
+				if (!checkSceneUpdateNeed(block))
+					updateEnvironmentalSfx(0);
+			} else {
+				updateEnvironmentalSfx(snd);
+			}
+		}
+
+		enableTimer(_flags.gameID == GI_LOL ? 0 : 12);
+
+	} else {
+		while (!(flg & _wllWallFlags[v]))
+			v += openClose;
+
+		_levelBlockProperties[block].walls[c] = _levelBlockProperties[block].walls[c ^ 2] = v;
+		checkSceneUpdateNeed(block);
+	}
+}
+
+void LolEobBaseEngine::completeDoorOperations() {
+	for (int i = 0; i < 3; i++) {
+		if (!_openDoorState[i].block)
+			continue;
+
+		uint16 b = _openDoorState[i].block;
+
+		do {
+			_levelBlockProperties[b].walls[_openDoorState[i].wall] += _openDoorState[i].state;
+			_levelBlockProperties[b].walls[_openDoorState[i].wall ^ 2] += _openDoorState[i].state;
+		} while	(!(_wllWallFlags[_levelBlockProperties[b].walls[_openDoorState[i].wall]] & 0x30));
+
+		_openDoorState[i].block = 0;
+	}
+}
+
+} // End of namespace Kyra
+
+#endif // ENABLE_EOB || ENABLE_LOL
+#ifdef ENABLE_EOB
+
+namespace Kyra {
+
+void EobCoreEngine::loadLevel(int level, int sub) {
+	_currentLevel = level;
+	_currentSub = sub;
+
+	char file[13];
+	snprintf(file, 13, "LEVEL%d.INF", level);
+
+	Common::SeekableReadStream *s = _res->createReadStream(file);
+	if (!s) {
+		snprintf(file, 13, "LEVEL%d.DRO", level);
+		s = _res->createReadStream(file);
+	}
+
+	if (!s) {
+		snprintf(file, 13, "LEVEL%d.ELO", level);
+		s = _res->createReadStream(file);
+	}
+
+	if (!s)
+		error("Failed loading level file LEVEL%d.INF/DRO/ELO", level);
+
+	if (s->readUint16LE() + 2 == s->size()) {
+		if (s->readUint16LE() == 4) {
+			delete s;
+			s = 0;
+			_screen->loadBitmap(file, 5, 5, 0);
+		}
+	}
+
+	if (s) {
+		s->seek(0);
+		_screen->loadFileDataToPage(s, 5, 15000);
+		delete s;
+	}
+
+	const char *gfxFile = initLevelData(sub);
+
+	const uint8 *data = _screen->getCPagePtr(5);
+	const uint8 *pos = data + READ_LE_UINT16(data);
+	uint16 len = READ_LE_UINT16(pos);
+	uint16 len2 = len;
+	pos += 2;
+
+	if (_flags.gameID == GI_EOB2) {
+		if (*pos++ == 0xEC)
+			pos = loadActiveMonsterData(pos, level);
+		else if (!(_hasTempDataFlags & (1 << (level - 1))))
+			memset(_monsters, 0, 30 * sizeof(EobMonsterInPlay));
+
+		len2 = len - (pos - data);
+		_inf->loadData(pos, len2);
+	} else {
+		_inf->loadData(data, READ_LE_UINT16(data));
+	}
+
+	_screen->setCurPage(2);
+	addLevelItems();
+
+	if (_flags.gameID == GI_EOB2) {
+		pos = data + len;
+		len2 = READ_LE_UINT16(pos);
+		pos += 2;
+	}
+
+	for (uint16 i = 0; i < len2; i++) {
+		LevelBlockProperty *p = &_levelBlockProperties[READ_LE_UINT16(pos)];
+		pos += 2;
+		if (_flags.gameID == GI_EOB2) {
+			p->flags |= READ_LE_UINT16(pos);
+			pos += 2;
+		} else {
+			p->flags |= *pos++;
+		}
+		p->assignedObjects = READ_LE_UINT16(pos);
+		pos += 2;
+	}
+
+	loadVcnData(gfxFile, 0);
+	_screen->loadEobCpsFileToPage("INVENT", 0, 5, 3, 2);
+
+	enableSysTimer(2);
+	_sceneDrawPage1 = 2;
+	_sceneDrawPage2 = 1;
+	_screen->setCurPage(0);
+}
+
+const char *EobCoreEngine::initLevelData(int sub){
+	const uint8 *data = _screen->getCPagePtr(5) + 2;
+	const uint8 *pos = data;
+
+	int slen = (_flags.gameID == GI_EOB1) ? 12 : 13;
+
+	char tmpStr[13];
+	_sound->playTrack(0);
+
+	for (int i = 0; i < sub; i++)
+		pos = data + READ_LE_UINT16(pos);
+
+	pos += 2;
+	if (*pos++ == 0xEC || _flags.gameID == GI_EOB1) {
+		if (_flags.gameID == GI_EOB1)
+			pos -= 3;
+
+		loadBlockProperties((const char*)pos);
+		pos += slen;
+
+		snprintf(tmpStr, slen, "%s.VMP", (const char*) pos);
+		Common::SeekableReadStream *s = _res->createReadStream(tmpStr);
+		uint16 size = s->readUint16LE();
+		delete[] _vmpPtr;
+		_vmpPtr = new uint16[size];
+		for (int i = 0; i < size; i++)
+			_vmpPtr[i] = s->readUint16LE();
+		delete s;
+
+		snprintf(tmpStr, 13, "%s.PAL", (const char*) pos);
+		strcpy(_curGfxFile, (const char*) pos);
+		pos += slen;
+
+		if (*pos++ != 0xff && _flags.gameID == GI_EOB2) {
+			snprintf(tmpStr, 13, "%s.PAL", (const char*) pos);
+			pos += 13;
+		}
+
+	////////	_screen->loadPalette(tmpStr, _screen->getPalette(0));
+
+		if (_flags.gameID == GI_EOB1) {
+			pos += 11;
+			_screen->setShapeFadeMode(0, false);
+			_screen->setShapeFadeMode(1, false);
+		} ////////////////////
+		else
+			_screen->loadPalette(tmpStr, _screen->getPalette(0));
+		////////////////////7
+
+		Palette backupPal(256);
+		backupPal.copy(_screen->getPalette(0), 224, 32, 224);
+		_screen->getPalette(0).fill(224, 32, 0x3f);
+		uint8 *src = _screen->getPalette(0).getData();
+
+		_screen->createFadeTable(src, _screen->getFadeTable(0), 4, 75);		// green
+		_screen->createFadeTable(src, _screen->getFadeTable(1), 12, 200);	// black
+		_screen->createFadeTable(src, _screen->getFadeTable(2), 10, 85);	// blue
+		_screen->createFadeTable(src, _screen->getFadeTable(3), 11, 125);	// light blue
+
+		_screen->getPalette(0).copy(backupPal, 224, 32, 224);
+		_screen->createFadeTable(src, _screen->getFadeTable(4), 12, 85);	// grey (shadow)
+		_screen->setFadeTableIndex(4);
+	}
+
+	if (_flags.gameID == GI_EOB2) {
+		delay(_tickLength);
+		_sound->loadSoundFile((const char*) pos);
+		pos += 13;
+	}
+
+	releaseDoorShapes();
+	releaseMonsterShapes(0, 36);
+	releaseDecorations();
+
+	if (_flags.gameID == GI_EOB1) {
+		loadDoorShapes(pos[0], pos[1], pos[2], pos[3]);
+		pos += 4;
+		_scriptTimersMode = *pos++;
+		_scriptTimers[0].ticks = READ_LE_UINT16(pos);
+		_scriptTimers[0].func = 0;
+		_scriptTimers[0].next = _system->getMillis() + _scriptTimers[0].ticks * _tickLength;
+		pos+= 2;
+	} else {
+		for (int i = 0; i < 2; i++) {
+			int a = (*pos == 0xEC) ? 0 : ((*pos == 0xEA) ? 1 : -1);
+			pos++;
+			if (a == -1)
+				continue;
+			toggleWallState(pos[13], a);
+			_doorType[pos[13]] = pos[14];
+			_noDoorSwitch[pos[13]] = pos[15];
+			pos = loadDoorShapes((const char*)pos, pos[13], pos + 16);
+		}
+	}
+
+	_stepsUntilScriptCall = READ_LE_UINT16(pos);
+	pos+= 2;
+	_stepCounter = 0;
+
+	for (int i = 0; i < 2; i++) {
+		if (_flags.gameID == GI_EOB1) {
+			if (*pos == 0xFF)
+				continue;
+			loadMonsterShapes((const char *)(pos + 1), i * 18, false, *pos * 18);
+			pos += 13;
+		} else {
+			if (*pos++ != 0xEC)
+				continue;
+			loadMonsterShapes((const char *)(pos + 2), pos[1] * 18, pos[15] ? true : false, *pos * 18);
+			pos += 16;
+		}
+	}
+
+	if (_flags.gameID == GI_EOB1)
+		pos = loadActiveMonsterData(pos, _currentLevel) - 1;
+	else
+		pos = loadMonsterProperties(pos);
+
+	if (*pos++ == 0xEC || _flags.gameID == GI_EOB1) {
+		int num = READ_LE_UINT16(pos);
+		pos += 2;
+
+		for (int i = 0; i < num; i++) {
+			if (*pos++ == 0xEC) {
+				loadDecorations((const char*)pos, (const char*)(pos + slen));
+				pos += (slen << 1);
+			} else {
+				assignWallsAndDecorations(pos[0], pos[1], (int8)pos[2], pos[3], pos[4]);
+				pos += 5;
+			}
+		}
+	}
+
+	if (_flags.gameID == GI_EOB2)
+		pos = initScriptTimers(pos);
+
+	return _curGfxFile;
+}
+
+void EobCoreEngine::addLevelItems() {
+	for (int i = 0; i < 1024; i++)
+		_levelBlockProperties[i].drawObjects = 0;
+
+	for (int i = 0; i < 600; i++) {
+		if (_items[i].level != _currentLevel || _items[i].block <= 0)
+			continue;
+		setItemPosition((Item*)&_levelBlockProperties[_items[i].block & 0x3ff].drawObjects, _items[i].block, i, _items[i].pos);
+	}
+}
+
+void EobCoreEngine::loadVcnData(const char *file, const char*/*nextFile*/) {
+	if (file)
+		strcpy(_lastBlockDataFile, file);
+
+	char fname[13];
+	snprintf(fname, sizeof(fname), "%s.VCN", _lastBlockDataFile);
+	_screen->loadBitmap(fname, 3, 3, 0);
+	const uint8 *v = _screen->getCPagePtr(2);
+	uint32 tlen = READ_LE_UINT16(v) << 5;
+	v += 2;
+	memcpy(_vcnExpTable, v, 32);
+	v += 32;
+	delete[] _vcnBlocks;
+	_vcnBlocks = new uint8[tlen];
+	memcpy(_vcnBlocks, v, tlen);
+}
+
+void EobCoreEngine::loadBlockProperties(const char *mazFile) {
+	memset(_levelBlockProperties, 0, 1024 * sizeof(LevelBlockProperty));
+	Common::SeekableReadStream *s = _res->createReadStream(mazFile);
+	_screen->loadFileDataToPage(s, 2, 4096);
+	delete s;
+
+	if (_hasTempDataFlags & (1 << (_currentLevel - 1))) {
+		restoreBlockTempData(_currentLevel);
+		return;
+	}
+
+	const uint8 *p = _screen->getCPagePtr(2) + 6;
+
+	for (int i = 0; i < 1024; i++) {
+		for (int ii = 0; ii < 4; ii++)
+			_levelBlockProperties[i].walls[ii] = *p++;
+	}
+}
+
+void EobCoreEngine::loadDecorations(const char *cpsFile, const char *decFile) {
+	_screen->loadEobBitmap(cpsFile, 3, 3);
+	Common::SeekableReadStream *s = _res->createReadStream(decFile);
+
+	_levelDecorationDataSize = s->readUint16LE();
+	delete[] _levelDecorationData;
+	_levelDecorationData = new LevelDecorationProperty[_levelDecorationDataSize];
+
+	for (int i = 0; i < _levelDecorationDataSize; i++) {
+		LevelDecorationProperty *l = &_levelDecorationData[i];
+		for (int ii = 0; ii < 10; ii++) {
+			l->shapeIndex[ii] = s->readByte();
+			if (l->shapeIndex[ii] == 0xff)
+				l->shapeIndex[ii] = 0xffff;
+		}
+		l->next = s->readByte();
+		l->flags = s->readByte();
+		for (int ii = 0; ii < 10; ii++)
+			l->shapeX[ii] = s->readSint16LE();
+		for (int ii = 0; ii < 10; ii++)
+			l->shapeY[ii] = s->readSint16LE();
+	}
+
+	int len = s->readUint16LE();
+	delete[] _levelDecorationRects;
+	_levelDecorationRects = new EobRect8[len];
+	for (int i = 0; i < len; i++) {
+		EobRect8 *l = &_levelDecorationRects[i];
+		l->x = s->readUint16LE();
+		l->y = s->readUint16LE();
+		l->w = s->readUint16LE();
+		l->h = s->readUint16LE();
+	}
+
+	delete s;
+}
+
+void EobCoreEngine::assignWallsAndDecorations(int wallIndex, int vmpIndex, int decIndex, int specialType, int flags) {
+	_wllVmpMap[wallIndex] = vmpIndex;
+	_wllShapeMap[wallIndex] = _mappedDecorationsCount + 1;
+	_specialWallTypes[wallIndex] = specialType;
+	_wllWallFlags[wallIndex] = flags ^ 4;
+
+	if (decIndex == -1) {
+		_wllShapeMap[wallIndex] = 0;
+		return;
+	}
+
+	do {
+		memcpy(&_levelDecorationProperties[_mappedDecorationsCount], &_levelDecorationData[decIndex], sizeof(LevelDecorationProperty));
+
+		for (int i = 0; i < 10; i++) {
+			uint16 t = _levelDecorationProperties[_mappedDecorationsCount].shapeIndex[i];
+			if (t == 0xffff)
+				continue;
+
+			if (_levelDecorationShapes[t])
+				continue;
+
+			EobRect8 *r = &_levelDecorationRects[t];
+			if (r->w == 0 || r->h == 0)
+				error("Error trying to make decoration %d	x: %d y:%d w:%d h:%d", decIndex, r->x, r->y, r->w, r->h);
+
+			_levelDecorationShapes[t] = _screen->encodeShape(r->x, r->y, r->w, r->h);
+		}
+
+		decIndex = _levelDecorationProperties[_mappedDecorationsCount++].next;
+
+		if (decIndex)
+			_levelDecorationProperties[_mappedDecorationsCount - 1].next = _mappedDecorationsCount + 1;
+		else
+			decIndex = -1;
+
+	} while (decIndex != -1);
+}
+
+void EobCoreEngine::releaseDecorations() {
+	if (_levelDecorationShapes) {
+		for (int i = 0; i < 400; i++) {
+			delete[] _levelDecorationShapes[i];
+			_levelDecorationShapes[i] = 0;
+		}
+	}
+	_mappedDecorationsCount = 0;
+}
+
+void EobCoreEngine::releaseDoorShapes() {
+	for (int i = 0; i < 6; i++) {
+		delete[] _doorShapes[i];
+		_doorShapes[i] = 0;
+		delete[] _doorSwitches[i].shp;
+		_doorSwitches[i].shp = 0;
+	}
+}
+
+void EobCoreEngine::toggleWallState(int wall, int toggle) {
+	wall = wall * 10 + 3;
+
+	for (int i = 0; i < 9 ; i++) {
+		if (i == 4)
+			continue;
+
+		if (toggle)
+			_wllWallFlags[wall + i] |= 2;
+		else
+			_wllWallFlags[wall + i] &= 0xfd;
+	}
+}
+
+void EobCoreEngine::drawScene(int update) {
+	generateBlockDrawingBuffer();
+	drawVcnBlocks();
+	drawSceneShapes();
+
+	if (_sceneDrawPage2) {
+		if (update)
+			_screen->fillRect(0, 0, 176, 120, 12);
+
+		_screen->setScreenPalette(_screen->getPalette(0));
+		_sceneDrawPage2 = 0;
+	}
+
+	uint32 ct = _system->getMillis();
+	if (_flashShapeTimer > ct) {
+		int diff = _flashShapeTimer - ct;
+		while ((diff > 0) && !shouldQuit()) {
+			updateInput();
+			uint32 step = MIN<uint32>(diff, _tickLength / 5);
+			_system->delayMillis(step);
+			diff -= step;
+		}
+	}
+
+	if (_sceneDefaultUpdate) {
+		resetSkipFlag();
+		delayUntil(_drawSceneTimer);
+	}
+
+	if (update && !_partyResting)
+		_screen->copyRegion(0, 0, 0, 0, 176, 120, 2, 0, Screen::CR_NO_P_CHECK);
+
+	updateEnvironmentalSfx(0);
+
+	if (!_dialogueField && update && !_updateFlags)
+		gui_drawCompass(false);
+
+	if (update && !_partyResting)
+		_screen->updateScreen();
+
+	if (_sceneDefaultUpdate) {
+		_sceneDefaultUpdate = false;
+		_drawSceneTimer = _system->getMillis() /*+ 4 * _tickLength*/;
+	}
+
+	_sceneUpdateRequired = false;
+}
+
+void EobCoreEngine::drawSceneShapes() {
+	for (int i = 0; i < 18; i++) {
+		uint8 t = _dscTileIndex[i];
+		uint8 s = _visibleBlocks[t]->walls[_sceneDrawVarDown];
+
+		_shpDmX1 = 0;
+		_shpDmX2 = 0;
+
+		setLevelShapesDim(t, _shpDmX1, _shpDmX2, _sceneShpDim);
+
+		if (_shpDmX2 <= _shpDmX1)
+			continue;
+
+		drawDecorations(t);
+
+		if (_visibleBlocks[t]->drawObjects)
+			drawBlockItems(t);
+
+		if (t < 15) {
+			uint16 w = _wllWallFlags[s];
+
+			if (w & 8)
+				drawDoor(t);
+
+			if (_visibleBlocks[t]->flags & 7) {
+				const ScreenDim *dm = _screen->getScreenDim(5);
+				_screen->modifyScreenDim(5, dm->sx, _lvlShapeTop[t], dm->w, _lvlShapeBottom[t] - _lvlShapeTop[t]);
+				drawMonsters(t);
+				drawLevelModifyScreenDim(5, _lvlShapeLeftRight[(t << 1)], 0, _lvlShapeLeftRight[(t << 1) + 1], 15);
+			}
+
+			if (_flags.gameID == GI_EOB2 && s == 74)
+				drawWallOfForce(t);
+		}
+
+		drawFlyingObjects(t);
+
+		if (s == _teleporterWallId)
+			drawTeleporter(t);
+	}
+}
+
+void EobCoreEngine::drawDecorations(int index) {
+	static const int16 *dscWalls[] =  { 0, 0, &_sceneDrawVarDown, &_sceneDrawVarRight, &_sceneDrawVarDown,
+		&_sceneDrawVarRight, &_sceneDrawVarDown, 0, &_sceneDrawVarDown, &_sceneDrawVarLeft, &_sceneDrawVarDown,
+		&_sceneDrawVarLeft,	0, 0, &_sceneDrawVarDown, &_sceneDrawVarRight, &_sceneDrawVarDown, &_sceneDrawVarRight,
+		&_sceneDrawVarDown,	0, &_sceneDrawVarDown, &_sceneDrawVarLeft, &_sceneDrawVarDown, &_sceneDrawVarLeft,
+		&_sceneDrawVarDown,	&_sceneDrawVarRight, &_sceneDrawVarDown, 0, &_sceneDrawVarDown, &_sceneDrawVarLeft,
+		0, &_sceneDrawVarRight,	&_sceneDrawVarDown, 0, 0, &_sceneDrawVarLeft
+	};
+
+	for (int i = 1; i >= 0; i--) {
+		int s = index * 2 + i;
+		if (dscWalls[s]) {
+			int d = *dscWalls[s];
+			int8 l = _wllShapeMap[_visibleBlocks[index]->walls[d]];
+
+			uint8 *shapeData = 0;
+
+			int x = 0;
+
+			while (l > 0) {
+				l--;
+				int8 ix = _dscShapeIndex[s];
+				uint8 shpIx = ABS(ix) - 1;
+				uint8 flg = _levelDecorationProperties[l].flags;
+
+				if ((i == 0) && (flg & 1 || ((flg & 2) && _wllProcessFlag)))
+					ix = -ix;
+
+				if (_levelDecorationProperties[l].shapeIndex[shpIx] == 0xffff) {
+					l = _levelDecorationProperties[l].next;
+					continue;
+				}
+
+				shapeData = _levelDecorationShapes[_levelDecorationProperties[l].shapeIndex[shpIx]];
+				if (shapeData) {
+					x = 0;
+					if (i == 0) {
+						if (flg & 4)
+							x += _dscShapeCoords[(index * 5 + 4) << 1];
+						else
+							x += _dscShapeX[index];
+					}
+
+					if (ix < 0) {
+						x += (176 - _levelDecorationProperties[l].shapeX[shpIx] - (shapeData[2] << 3));
+						drawBlockObject(1, 2, shapeData, x, _levelDecorationProperties[l].shapeY[shpIx], _sceneShpDim);
+					} else {
+						x += _levelDecorationProperties[l].shapeX[shpIx];
+						drawBlockObject(0, 2, shapeData, x, _levelDecorationProperties[l].shapeY[shpIx], _sceneShpDim);
+
+					}
+				}
+				l = _levelDecorationProperties[l].next;
+				continue;
+			}
+		}
+	}
+}
+
+int EobCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint16 direction) {
+	uint16 b = calcNewBlockPosition(curBlock, direction);
+	int w = _levelBlockProperties[b].walls[direction ^ 2];
+	int f = _wllWallFlags[w];
+
+	if (w == 74 && _currentBlock == curBlock) {
+		for (int i = 0; i < 5; i++) {
+
+		}
+	}
+
+	if (!(f & 1) || _levelBlockProperties[b].flags & 7)
+		return -1;
+
+	return b;
+}
+
+void EobCoreEngine::notifyBlockNotPassable() {
+	_txt->printMessage(_warningStrings[0]);
+	snd_playSoundEffect(29);
+	removeInputTop();
+}
+
+void EobCoreEngine::moveParty(uint16 block) {
+	//processMonstersUnk1();
+	uint16 old = _currentBlock;
+	_currentBlock = block;
+
+	runLevelScript(old, 2);
+
+	if (++_moveCounter > 3) {
+		_txt->printMessage("\r");
+		_moveCounter = 0;
+	}
+
+	runLevelScript(block, 1);
+
+	if (_levelBlockProperties[block].walls[0] == 26)
+		memset(_levelBlockProperties[block].walls, 0, 4);
+
+	//processMonstersUnk1();
+	_stepCounter++;
+	//_keybControlUnk = -1;
+	_sceneUpdateRequired = true;
+
+	checkFlyingObjects();
+}
+
+int EobCoreEngine::clickedDoorSwitch(uint16 block, uint16 direction) {
+	uint8 v = _visibleBlocks[13]->walls[_sceneDrawVarDown];
+	SpriteDecoration *d = &_doorSwitches[((v > 12 && v < 23) || v == 31) ? 3 : 0];
+	int x1 = d->x + _dscShapeCoords[138] - 4;
+	int y1 = d->y - 4;
+	if (!posWithinRect(_mouseX, _mouseY, x1, y1, x1 + (d->shp[2] << 3) + 8, y1 + d->shp[1] + 8) && (_clickedSpecialFlag == 0x40))
+		return clickedDoorNoPry(block, direction);
+
+	processDoorSwitch(block, 0);
+	snd_playSoundEffect(6);
+
+	return 1;
+}
+
+int EobCoreEngine::clickedNiche(uint16 block, uint16 direction) {
+	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
+	if (!clickedShape(v))
+		return 0;
+
+	if (_itemInHand) {
+		if (_dscItemShapeMap[_items[_itemInHand].icon] <= 14) {
+			_txt->printMessage(_pryDoorStrings[5]);
+		} else {
+			setItemPosition((Item*)&_levelBlockProperties[block & 0x3ff].drawObjects, block, _itemInHand, 8);
+			runLevelScript(block, 4);
+			setHandItem(0);
+			_sceneUpdateRequired = true;
+		}
+	} else {
+		int d = getQueuedItem((Item*)&_levelBlockProperties[block].drawObjects, 8, -1);
+		if (!d)
+			return 1;
+		runLevelScript(block, 8);
+		setHandItem(d);
+		_sceneUpdateRequired = true;
+	}
+
+	return 1;
+}
+
+int EobCoreEngine::clickedDoorPry(uint16 block, uint16 direction) {
+	if (!posWithinRect(_mouseX, _mouseY, 40, 16, 136, 88) && (_clickedSpecialFlag == 0x40))
+		return 0;
+
+	int d = -1;
+	for (int i = 0; i < 6; i++)  {
+		if (!testCharacter(i, 0x0d))
+			continue;
+		if (d >= 0) {
+			int s1 = _characters[i].strengthCur + _characters[i].strengthExtCur;
+			int s2 = _characters[d].strengthCur + _characters[d].strengthExtCur;
+			if (s1 >= s2)
+				d = i;
+		} else {
+			d = i;
+		}
+	}
+
+	if (d == -1) {
+		_txt->printMessage(_pryDoorStrings[_flags.gameID == GI_EOB2 ? 1 : 0]);
+		return 1;
+	}
+
+	static const uint8 forceDoorChanceTable[] = { 1, 1, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 10, 11, 12, 13 };
+	int s = _characters[d].strengthCur > 18 ? 18 : _characters[d].strengthCur;
+
+	if (rollDice(1, 20) < forceDoorChanceTable[s]) {
+		_txt->printMessage(_pryDoorStrings[_flags.gameID == GI_EOB2 ? 2 : 1]);
+		_levelBlockProperties[block].walls[direction] = _levelBlockProperties[block].walls[direction ^ 2] =
+			(_levelBlockProperties[block].walls[direction] == (_flags.gameID == GI_EOB2 ? 51 : 30)) ? 8 : 18;
+		openDoor(block);
+	} else {
+		_txt->printMessage(_pryDoorStrings[3]);
+	}
+
+	return 1;
+}
+
+int EobCoreEngine::clickedDoorNoPry(uint16 block, uint16 direction) {
+	if (!posWithinRect(_mouseX, _mouseY, 40, 16, 136, 88) && (_clickedSpecialFlag == 0x40))
+		return 0;
+
+	if (!(_wllWallFlags[_levelBlockProperties[block].walls[direction]] & 0x20))
+		return 0;
+	_txt->printMessage(_pryDoorStrings[6]);
+	return 1;
+}
+
+int EobCoreEngine::specialWallAction(int block, int direction) {
+	direction ^= 2;
+	uint8 type = _specialWallTypes[_levelBlockProperties[block].walls[direction]];
+	if (!type || !(_clickedSpecialFlag & (((_levelBlockProperties[block].flags & 0xf8) >> 3) | 0xe0)))
+		return 0;
+
+	int res = 0;
+	switch (type) {
+	case 1:
+		res = clickedDoorSwitch(block, direction);
+		break;
+
+	case 2:
+	case 8:
+		res = clickedWallShape(block, direction);
+		break;
+
+	case 3:
+		res = clickedLeverOn(block, direction);
+		break;
+
+	case 4:
+		res = clickedLeverOff(block, direction);
+		break;
+
+	case 5:
+		res =  clickedDoorPry(block, direction);
+		break;
+
+	case 6:
+		res = clickedDoorNoPry(block, direction);
+		break;
+
+	case 7:
+	case 9:
+		res = clickedWallOnlyScript(block);
+		break;
+
+	case 10:
+		res = clickedNiche(block, direction);
+		break;
+
+	default:
+		break;
+	}
+
+	_clickedSpecialFlag = 0;
+	_sceneUpdateRequired = true;
+
+	return res;
+}
+
+void EobCoreEngine::openDoor(int block) {
+	openCloseDoor(block, 1);
+}
+
+void EobCoreEngine::closeDoor(int block) {
+	if (block == _currentBlock || _levelBlockProperties[block].flags & 7)
+		return;
+	openCloseDoor(block, -1);
+}
+
+} // End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index a5a2562448..c2b16cab88 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -42,8 +42,8 @@ void LoLEngine::loadLevel(int index) {
 	stopPortraitSpeechAnim();
 
 	for (int i = 0; i < 400; i++) {
-		delete[] _levelShapes[i];
-		_levelShapes[i] = 0;
+		delete[] _levelDecorationShapes[i];
+		_levelDecorationShapes[i] = 0;
 	}
 	_emc->unload(&_scriptData);
 
@@ -160,7 +160,7 @@ void LoLEngine::loadLevelWallData(int index, bool mapShapes) {
 		if (mapShapes) {
 			int16 sh = (int16) READ_LE_UINT16(d);
 			if (sh > 0)
-				_wllShapeMap[c] = assignLevelShapes(sh);
+				_wllShapeMap[c] = assignLevelDecorationShapes(sh);
 			else
 				_wllShapeMap[c] = *d;
 		}
@@ -169,7 +169,7 @@ void LoLEngine::loadLevelWallData(int index, bool mapShapes) {
 		d += 2;
 		_wllWallFlags[c] = *d;
 		d += 2;
-		_wllBuffer4[c] = *d;
+		_wllAutomapData[c] = *d;
 		d += 2;
 	}
 
@@ -179,7 +179,7 @@ void LoLEngine::loadLevelWallData(int index, bool mapShapes) {
 	_lvlShpFileHandle = 0;
 }
 
-int LoLEngine::assignLevelShapes(int index) {
+int LoLEngine::assignLevelDecorationShapes(int index) {
 	uint16 *p1 = (uint16 *)_tempBuffer5120;
 	uint16 *p2 = (uint16 *)(_tempBuffer5120 + 4000);
 
@@ -187,34 +187,34 @@ int LoLEngine::assignLevelShapes(int index) {
 	if (r)
 		return r;
 
-	uint16 o = _lvlBlockIndex++;
+	uint16 o = _mappedDecorationsCount++;
 
-	memcpy(&_levelShapeProperties[o], &_levelFileData[index], sizeof(LevelShapeProperty));
+	memcpy(&_levelDecorationProperties[o], &_levelDecorationData[index], sizeof(LevelDecorationProperty));
 
 	for (int i = 0; i < 10; i++) {
-		uint16 t = _levelShapeProperties[o].shapeIndex[i];
+		uint16 t = _levelDecorationProperties[o].shapeIndex[i];
 		if (t == 0xffff)
 			continue;
 
 		uint16 pv = p1[t];
 		if (pv) {
-			_levelShapeProperties[o].shapeIndex[i] = pv;
+			_levelDecorationProperties[o].shapeIndex[i] = pv;
 		} else {
-			_levelShapes[_lvlShapeIndex] = getLevelShapes(t);
+			_levelDecorationShapes[_lvlShapeIndex] = getLevelDecorationShapes(t);
 			p1[t] = _lvlShapeIndex;
-			_levelShapeProperties[o].shapeIndex[i] = _lvlShapeIndex++;
+			_levelDecorationProperties[o].shapeIndex[i] = _lvlShapeIndex++;
 		}
 	}
 
 	p2[index] = o;
-	if (_levelShapeProperties[o].next)
-		_levelShapeProperties[o].next = assignLevelShapes(_levelShapeProperties[o].next);
+	if (_levelDecorationProperties[o].next)
+		_levelDecorationProperties[o].next = assignLevelDecorationShapes(_levelDecorationProperties[o].next);
 
 	return o;
 }
 
-uint8 *LoLEngine::getLevelShapes(int shapeIndex) {
-	if (_lvlShpNum <= shapeIndex)
+uint8 *LoLEngine::getLevelDecorationShapes(int shapeIndex) {
+	if (_decorationCount <= shapeIndex)
 		return 0;
 
 	_lvlShpFileHandle->seek(shapeIndex * 4 + 2, SEEK_SET);
@@ -232,60 +232,6 @@ uint8 *LoLEngine::getLevelShapes(int shapeIndex) {
 	return res;
 }
 
-void LoLEngine::restoreBlockTempData(int index) {
-	memset(_tempBuffer5120, 0, 5120);
-	int l = index - 1;
-
-	memcpy(_monsters, _lvlTempData[l]->monsters, sizeof(MonsterInPlay) * 30);
-	memcpy(_flyingObjects, _lvlTempData[l]->flyingObjects, sizeof(FlyingObject) * 8);
-
-	Common::String filename = Common::String::format("LEVEL%d.CMZ", index);
-
-	_screen->loadBitmap(filename.c_str(), 3, 3, 0);
-	const uint8 *p = _screen->getCPagePtr(2);
-	uint16 len = READ_LE_UINT16(p + 4);
-	p += 6;
-
-	memset(_levelBlockProperties, 0, 1024 * sizeof(LevelBlockProperty));
-
-	uint8 *t = _lvlTempData[l]->wallsXorData;
-	uint8 *t2 = _lvlTempData[l]->flags;
-
-	for (int i = 0; i < 1024; i++) {
-		for (int ii = 0; ii < 4; ii++)
-			_levelBlockProperties[i].walls[ii] = p[i * len + ii] ^ *t++;
-		_levelBlockProperties[i].flags = *t2++;
-	}
-
-	for (int i = 0; i < 30; i++) {
-		if (_monsters[i].block) {
-			_monsters[i].block = 0;
-			_monsters[i].properties = &_monsterProperties[_monsters[i].type];
-			placeMonster(&_monsters[i], _monsters[i].x, _monsters[i].y);
-		}
-	}
-
-	restoreTempDataAdjustMonsterStrength(l);
-}
-
-void LoLEngine::restoreTempDataAdjustMonsterStrength(int index) {
-	if (_lvlTempData[index]->monsterDifficulty == _monsterDifficulty)
-		return;
-
-	uint16 d = (_monsterModifiers[_lvlTempData[index]->monsterDifficulty] << 8) / _monsterModifiers[_monsterDifficulty];
-
-	for (int i = 0; i < 30; i++) {
-		if (_monsters[i].mode >= 14 || _monsters[i].block == 0 || _monsters[i].hitPoints <= 0)
-			continue;
-
-		_monsters[i].hitPoints = (d * _monsters[i].hitPoints) >> 8;
-		if (_monsterDifficulty < _lvlTempData[index]->monsterDifficulty)
-			_monsters[i].hitPoints++;
-		if (_monsters[i].hitPoints == 0)
-			_monsters[i].hitPoints = 1;
-	}
-}
-
 void LoLEngine::loadBlockProperties(const char *cmzFile) {
 	memset(_levelBlockProperties, 0, 1024 * sizeof(LevelBlockProperty));
 	_screen->loadBitmap(cmzFile, 2, 2, 0);
@@ -299,7 +245,7 @@ void LoLEngine::loadBlockProperties(const char *cmzFile) {
 
 		_levelBlockProperties[i].direction = 5;
 
-		if (_wllBuffer4[_levelBlockProperties[i].walls[0]] == 17) {
+		if (_wllAutomapData[_levelBlockProperties[i].walls[0]] == 17) {
 			_levelBlockProperties[i].flags &= 0xef;
 			_levelBlockProperties[i].flags |= 0x20;
 		}
@@ -310,15 +256,15 @@ void LoLEngine::loadLevelShpDat(const char *shpFile, const char *datFile, bool f
 	memset(_tempBuffer5120, 0, 5120);
 
 	_lvlShpFileHandle = _res->createReadStream(shpFile);
-	_lvlShpNum = _lvlShpFileHandle->readUint16LE();
+	_decorationCount = _lvlShpFileHandle->readUint16LE();
 
 	Common::SeekableReadStream *s = _res->createReadStream(datFile);
 
-	_levelFileDataSize = s->readUint16LE();
-	delete[] _levelFileData;
-	_levelFileData = new LevelShapeProperty[_levelFileDataSize];
-	for (int i = 0; i < _levelFileDataSize; i++) {
-		LevelShapeProperty * l = &_levelFileData[i];
+	_levelDecorationDataSize = s->readUint16LE();
+	delete[] _levelDecorationData;
+	_levelDecorationData = new LevelDecorationProperty[_levelDecorationDataSize];
+	for (int i = 0; i < _levelDecorationDataSize; i++) {
+		LevelDecorationProperty * l = &_levelDecorationData[i];
 		for (int ii = 0; ii < 10; ii++)
 			l->shapeIndex[ii] = s->readUint16LE();
 		for (int ii = 0; ii < 10; ii++)
@@ -334,7 +280,7 @@ void LoLEngine::loadLevelShpDat(const char *shpFile, const char *datFile, bool f
 	delete s;
 
 	if (!flag) {
-		_lvlBlockIndex = 1;
+		_mappedDecorationsCount = 1;
 		_lvlShapeIndex = 1;
 	}
 }
@@ -515,10 +461,10 @@ void LoLEngine::resetItems(int flag) {
 	for (int i = 0; i < 1024; i++) {
 		_levelBlockProperties[i].direction = 5;
 		uint16 id = _levelBlockProperties[i].assignedObjects;
-		MonsterInPlay *r = 0;
+		LolMonsterInPlay *r = 0;
 
 		while (id & 0x8000) {
-			r = (MonsterInPlay *)findObject(id);
+			r = (LolMonsterInPlay *)findObject(id);
 			id = r->nextAssignedObject;
 		}
 
@@ -537,7 +483,7 @@ void LoLEngine::resetItems(int flag) {
 }
 
 void LoLEngine::disableMonsters() {
-	memset(_monsters, 0, 30 * sizeof(MonsterInPlay));
+	memset(_monsters, 0, 30 * sizeof(LolMonsterInPlay));
 	for (int i = 0; i < 30; i++)
 		_monsters[i].mode = 0x10;
 }
@@ -751,11 +697,6 @@ void LoLEngine::moveParty(uint16 direction, int unk1, int unk2, int buttonShape)
 	updateAutoMap(_currentBlock);
 }
 
-uint16 LoLEngine::calcNewBlockPosition(uint16 curBlock, uint16 direction) {
-	static const int16 blockPosTable[] = { -32, 1, 32, -1 };
-	return (curBlock + blockPosTable[direction]) & 0x3ff;
-}
-
 uint16 LoLEngine::calcBlockIndex(uint16 x, uint16 y) {
 	return (((y & 0xff00) >> 3) | (x >> 8)) & 0x3ff;
 }
@@ -827,51 +768,6 @@ void LoLEngine::notifyBlockNotPassable(int scrollFlag) {
 	snd_playSoundEffect(19, -1);
 }
 
-int LoLEngine::clickedWallShape(uint16 block, uint16 direction) {
-	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
-	if (!clickedShape(v))
-		return 0;
-
-	snd_stopSpeech(true);
-	runLevelScript(block, 0x40);
-
-	return 1;
-}
-
-int LoLEngine::clickedLeverOn(uint16 block, uint16 direction) {
-	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
-	if (!clickedShape(v))
-		return 0;
-
-	_levelBlockProperties[block].walls[direction]++;
-	_sceneUpdateRequired = true;
-
-	snd_playSoundEffect(30, -1);
-
-	runLevelScript(block, 0x40);
-
-	return 1;
-}
-
-int LoLEngine::clickedLeverOff(uint16 block, uint16 direction) {
-	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
-	if (!clickedShape(v))
-		return 0;
-
-	_levelBlockProperties[block].walls[direction]--;
-	_sceneUpdateRequired = true;
-
-	snd_playSoundEffect(29, -1);
-
-	runLevelScript(block, 0x40);
-	return 1;
-}
-
-int LoLEngine::clickedWallOnlyScript(uint16 block) {
-	runLevelScript(block, 0x40);
-	return 1;
-}
-
 int LoLEngine::clickedDoorSwitch(uint16 block, uint16 direction) {
 	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
 	if (!clickedShape(v))
@@ -903,119 +799,6 @@ int LoLEngine::clickedNiche(uint16 block, uint16 direction) {
 	return 1;
 }
 
-bool LoLEngine::clickedShape(int shapeIndex) {
-	while (shapeIndex) {
-		uint16 s = _levelShapeProperties[shapeIndex].shapeIndex[1];
-
-		if (s == 0xffff) {
-			shapeIndex = _levelShapeProperties[shapeIndex].next;
-			continue;
-		}
-
-		int w = _levelShapes[s][3];
-		int h = _levelShapes[s][2];
-		int x = _levelShapeProperties[shapeIndex].shapeX[1] + 136;
-		int y = _levelShapeProperties[shapeIndex].shapeY[1] + 8;
-
-		if (_levelShapeProperties[shapeIndex].flags & 1)
-			w <<= 1;
-
-		if (posWithinRect(_mouseX, _mouseY, x - 4, y - 4, x + w + 8, y + h + 8))
-			return true;
-
-		shapeIndex = _levelShapeProperties[shapeIndex].next;
-	}
-
-	return false;
-}
-
-void LoLEngine::processDoorSwitch(uint16 block, int openClose) {
-	if ((block == _currentBlock) || (_levelBlockProperties[block].assignedObjects & 0x8000))
-		return;
-
-	if (openClose == 0) {
-		for (int i = 0; i < 3; i++) {
-			if (_openDoorState[i].block != block)
-				continue;
-			openClose = -_openDoorState[i].state;
-			break;
-		}
-	}
-
-	if (openClose == 0)
-		openClose = (_wllWallFlags[_levelBlockProperties[block].walls[_wllWallFlags[_levelBlockProperties[block].walls[0]] & 8 ? 0 : 1]] & 1) ? 1 : -1;
-
-	openCloseDoor(block, openClose);
-}
-
-void LoLEngine::openCloseDoor(uint16 block, int openClose) {
-	int s1 = -1;
-	int s2 = -1;
-
-	int c = (_wllWallFlags[_levelBlockProperties[block].walls[0]] & 8) ? 0 : 1;
-	int v = _levelBlockProperties[block].walls[c];
-	int flg = (openClose == 1) ? 0x10 : (openClose == -1 ? 0x20 : 0);
-
-	if (_wllWallFlags[v] & flg)
-		return;
-
-	for (int i = 0; i < 3; i++) {
-		if (_openDoorState[i].block == block) {
-			s1 = i;
-			break;
-		} else if (_openDoorState[i].block == 0 && s2 == -1) {
-			s2 = i;
-		}
-	}
-
-	if (s1 != -1 || s2 != -1) {
-		if (s1 == -1)
-			s1 = s2;
-
-		_openDoorState[s1].block = block;
-		_openDoorState[s1].state = openClose;
-		_openDoorState[s1].wall = c;
-
-		flg = (-openClose == 1) ? 0x10 : (-openClose == -1 ? 0x20 : 0);
-
-		if (_wllWallFlags[v] & flg) {
-			_levelBlockProperties[block].walls[c] += openClose;
-			_levelBlockProperties[block].walls[c ^ 2] += openClose;
-
-			int snd = (openClose == -1) ? 32 : 31;
-
-			snd_processEnvironmentalSoundEffect(snd, block);
-			if (!checkSceneUpdateNeed(block))
-				updateEnvironmentalSfx(0);
-		}
-
-		enableTimer(0);
-
-	} else {
-		while (!(flg & _wllWallFlags[v]))
-			v += openClose;
-
-		_levelBlockProperties[block].walls[c] = _levelBlockProperties[block].walls[c ^ 2] = v;
-		checkSceneUpdateNeed(block);
-	}
-}
-
-void LoLEngine::completeDoorOperations() {
-	for (int i = 0; i < 3; i++) {
-		if (!_openDoorState[i].block)
-			continue;
-
-		uint16 b = _openDoorState[i].block;
-
-		do {
-			_levelBlockProperties[b].walls[_openDoorState[i].wall] += _openDoorState[i].state;
-			_levelBlockProperties[b].walls[_openDoorState[i].wall ^ 2] += _openDoorState[i].state;
-		} while	(!(_wllWallFlags[_levelBlockProperties[b].walls[_openDoorState[i].wall]] & 0x30));
-
-		_openDoorState[i].block = 0;
-	}
-}
-
 void LoLEngine::movePartySmoothScrollBlocked(int speed) {
 	if (!_smoothScrollingEnabled || (_smoothScrollingEnabled && _needSceneRestore))
 		return;
@@ -1447,7 +1230,7 @@ void LoLEngine::setWallType(int block, int wall, int val) {
 	if (wall == -1) {
 		for (int i = 0; i < 4; i++)
 			_levelBlockProperties[block].walls[i] = val;
-		if (_wllBuffer4[val] == 17) {
+		if (_wllAutomapData[val] == 17) {
 			_levelBlockProperties[block].flags &= 0xef;
 			_levelBlockProperties[block].flags |= 0x20;
 		} else {
@@ -1603,334 +1386,20 @@ void LoLEngine::setDefaultButtonState() {
 	_lampStatusSuspended = false;
 }
 
-void LoLEngine::generateBlockDrawingBuffer() {
-	_sceneDrawVarDown = _dscBlockMap[_currentDirection];
-	_sceneDrawVarRight = _dscBlockMap[_currentDirection + 4];
-	_sceneDrawVarLeft = _dscBlockMap[_currentDirection + 8];
-
-	/*******************************************
-	*             _visibleBlocks map           *
-	*                                          *
-	*     |     |     |     |     |     |      *
-	*  00 |  01 |  02 |  03 |  04 |  05 |  06  *
-	* ____|_____|_____|_____|_____|_____|_____ *
-	*     |     |     |     |     |     |      *
-	*     |  07 |  08 |  09 |  10 |  11 |      *
-	*     |_____|_____|_____|_____|_____|      *
-	*           |     |     |     |            *
-	*           |  12 |  13 |  14 |            *
-	*           |_____|_____|_____|            *
-	*                 |     |                  *
-	*              15 |  16 |  17              *
-	*                 | (P) |                  *
-	********************************************/
-
-	memset(_blockDrawingBuffer, 0, 660 * sizeof(uint16));
-
-	_wllProcessFlag = ((_currentBlock >> 5) + (_currentBlock & 0x1f) + _currentDirection) & 1;
-
-	if (_wllProcessFlag) // floor and ceiling
-		generateVmpTileDataFlipped(0, 15, 1, -330, 22, 15);
-	else
-		generateVmpTileData(0, 15, 1, -330, 22, 15);
-
-	assignVisibleBlocks(_currentBlock, _currentDirection);
-
-	uint8 t = _visibleBlocks[0]->walls[_sceneDrawVarRight];
-	if (t)
-		generateVmpTileData(-2, 3, t, 102, 3, 5);
-
-	t = _visibleBlocks[6]->walls[_sceneDrawVarLeft];
-	if (t)
-		generateVmpTileDataFlipped(21, 3, t, 102, 3, 5);
-
-	t = _visibleBlocks[1]->walls[_sceneDrawVarRight];
-	uint8 t2 = _visibleBlocks[2]->walls[_sceneDrawVarDown];
-
-	if (hasWall(t) && !(_wllWallFlags[t2] & 8))
-		generateVmpTileData(2, 3, t, 102, 3, 5);
-	else if (t && (_wllWallFlags[t2] & 8))
-		generateVmpTileData(2, 3, t2, 102, 3, 5);
-
-	t = _visibleBlocks[5]->walls[_sceneDrawVarLeft];
-	t2 = _visibleBlocks[4]->walls[_sceneDrawVarDown];
-
-	if (hasWall(t) && !(_wllWallFlags[t2] & 8))
-		generateVmpTileDataFlipped(17, 3, t, 102, 3, 5);
-	else if (t && (_wllWallFlags[t2] & 8))
-		generateVmpTileDataFlipped(17, 3, t2, 102, 3, 5);
-
-	t = _visibleBlocks[2]->walls[_sceneDrawVarRight];
-	if (t)
-		generateVmpTileData(8, 3, t, 97, 1, 5);
-
-	t = _visibleBlocks[4]->walls[_sceneDrawVarLeft];
-	if (t)
-		generateVmpTileDataFlipped(13, 3, t, 97, 1, 5);
-
-	t = _visibleBlocks[1]->walls[_sceneDrawVarDown];
-	if (hasWall(t))
-		generateVmpTileData(-4, 3, t, 129, 6, 5);
-
-	t = _visibleBlocks[5]->walls[_sceneDrawVarDown];
-	if (hasWall(t))
-		generateVmpTileData(20, 3, t, 129, 6, 5);
-
-	t = _visibleBlocks[2]->walls[_sceneDrawVarDown];
-	if (hasWall(t))
-		generateVmpTileData(2, 3, t, 129, 6, 5);
-
-	t = _visibleBlocks[4]->walls[_sceneDrawVarDown];
-	if (hasWall(t))
-		generateVmpTileData(14, 3, t, 129, 6, 5);
-
-	t = _visibleBlocks[3]->walls[_sceneDrawVarDown];
-	if (t)
-		generateVmpTileData(8, 3, t, 129, 6, 5);
-
-	t = _visibleBlocks[7]->walls[_sceneDrawVarRight];
-	if (t)
-		generateVmpTileData(0, 3, t, 117, 2, 6);
-
-	t = _visibleBlocks[11]->walls[_sceneDrawVarLeft];
-	if (t)
-		generateVmpTileDataFlipped(20, 3, t, 117, 2, 6);
-
-	t = _visibleBlocks[8]->walls[_sceneDrawVarRight];
-	if (t)
-		generateVmpTileData(6, 2, t, 81, 2, 8);
-
-	t = _visibleBlocks[10]->walls[_sceneDrawVarLeft];
-	if (t)
-		generateVmpTileDataFlipped(14, 2, t, 81, 2, 8);
-
-	t = _visibleBlocks[8]->walls[_sceneDrawVarDown];
-	if (hasWall(t))
-		generateVmpTileData(-4, 2, t, 159, 10, 8);
-
-	t = _visibleBlocks[10]->walls[_sceneDrawVarDown];
-	if (hasWall(t))
-		generateVmpTileData(16, 2, t, 159, 10, 8);
-
-	t = _visibleBlocks[9]->walls[_sceneDrawVarDown];
-	if (t)
-		generateVmpTileData(6, 2, t, 159, 10, 8);
-
-	t = _visibleBlocks[12]->walls[_sceneDrawVarRight];
-	if (t)
-		generateVmpTileData(3, 1, t, 45, 3, 12);
-
-	t = _visibleBlocks[14]->walls[_sceneDrawVarLeft];
-	if (t)
-		generateVmpTileDataFlipped(16, 1, t, 45, 3, 12);
-
-	t = _visibleBlocks[12]->walls[_sceneDrawVarDown];
-	if (!(_wllWallFlags[t] & 8))
-		generateVmpTileData(-13, 1, t, 239, 16, 12);
-
-	t = _visibleBlocks[14]->walls[_sceneDrawVarDown];
-	if (!(_wllWallFlags[t] & 8))
-		generateVmpTileData(19, 1, t, 239, 16, 12);
-
-	t = _visibleBlocks[13]->walls[_sceneDrawVarDown];
-	if (t)
-		generateVmpTileData(3, 1, t, 239, 16, 12);
-
-	t = _visibleBlocks[15]->walls[_sceneDrawVarRight];
-	t2 = _visibleBlocks[17]->walls[_sceneDrawVarLeft];
-	if (t)
-		generateVmpTileData(0, 0, t, 0, 3, 15);
-	if (t2)
-		generateVmpTileDataFlipped(19, 0, t2, 0, 3, 15);
-}
-
-void LoLEngine::generateVmpTileData(int16 startBlockX, uint8 startBlockY, uint8 vmpMapIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY) {
-	if (!_wllVmpMap[vmpMapIndex])
-		return;
-
-	uint16 *vmp = &_vmpPtr[(_wllVmpMap[vmpMapIndex] - 1) * 431 + vmpOffset + 330];
-
-	for (int i = 0; i < numBlocksY; i++) {
-		uint16 *bl = &_blockDrawingBuffer[(startBlockY + i) * 22 + startBlockX];
-		for (int ii = 0; ii < numBlocksX; ii++) {
-			if ((startBlockX + ii >= 0) && (startBlockX + ii < 22) && *vmp)
-				*bl = *vmp;
-			bl++;
-			vmp++;
-		}
-	}
-}
-
-void LoLEngine::generateVmpTileDataFlipped(int16 startBlockX, uint8 startBlockY, uint8 vmpMapIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY) {
-	if (!_wllVmpMap[vmpMapIndex])
-		return;
-
-	uint16 *vmp = &_vmpPtr[(_wllVmpMap[vmpMapIndex] - 1) * 431 + vmpOffset + 330];
-
-	for (int i = 0; i < numBlocksY; i++) {
-		for (int ii = 0; ii < numBlocksX; ii++) {
-			if ((startBlockX + ii) < 0 || (startBlockX + ii) > 21)
-				continue;
-
-			uint16 v = vmp[i * numBlocksX + (numBlocksX - 1 - ii)];
-			if (!v)
-				continue;
-
-			if (v & 0x4000)
-				v -= 0x4000;
-			else
-				v |= 0x4000;
-
-			_blockDrawingBuffer[(startBlockY + i) * 22 + startBlockX + ii] = v;
-		}
-	}
-}
-
-bool LoLEngine::hasWall(int index) {
-	if (!index || (_wllWallFlags[index] & 8))
-		return false;
-	return true;
-}
-
-void LoLEngine::assignVisibleBlocks(int block, int direction) {
-	for (int i = 0; i < 18; i++) {
-		uint16 t = (block + _dscBlockIndex[direction * 18 + i]) & 0x3ff;
-		_visibleBlockIndex[i] = t;
-
-		_visibleBlocks[i] = &_levelBlockProperties[t];
-		_lvlShapeLeftRight[i] = _lvlShapeLeftRight[18 + i] = -1;
-	}
-}
-
-void LoLEngine::drawVcnBlocks() {
-	uint8 *d = _sceneWindowBuffer;
-	uint16 *bdb = _blockDrawingBuffer;
-
-	for (int y = 0; y < 15; y++) {
-		for (int x = 0; x < 22; x++) {
-			bool horizontalFlip = false;
-			int remainder = 0;
-
-			uint16 vcnOffset = *bdb++;
-
-			if (vcnOffset & 0x8000) {
-				// this renders a wall block over the transparent pixels of a floor/ceiling block
-				remainder = vcnOffset - 0x8000;
-				vcnOffset = 0;
-			}
-
-			if (vcnOffset & 0x4000) {
-				horizontalFlip = true;
-				vcnOffset &= 0x3fff;
-			}
-
-			uint8 *src = 0;
-			if (vcnOffset) {
-				src = &_vcnBlocks[vcnOffset << 5];
-			} else {
-				// floor/ceiling blocks
-				vcnOffset = bdb[329];
-				if (vcnOffset & 0x4000) {
-					horizontalFlip = true;
-					vcnOffset &= 0x3fff;
-				}
-
-				src = (_vcfBlocks ? _vcfBlocks : _vcnBlocks) + (vcnOffset << 5);
-			}
-
-			uint8 shift = _vcnShift ? _vcnShift[vcnOffset] : _blockBrightness;
-
-			if (horizontalFlip) {
-				for (int blockY = 0; blockY < 8; blockY++) {
-					src += 3;
-					for (int blockX = 0; blockX < 4; blockX++) {
-						uint8 t = *src--;
-						*d++ = _vcnExpTable[(t & 0x0f) | shift];
-						*d++ = _vcnExpTable[(t >> 4) | shift];
-					}
-					src += 5;
-					d += 168;
-				}
-			} else {
-				for (int blockY = 0; blockY < 8; blockY++) {
-					for (int blockX = 0; blockX < 4; blockX++) {
-						uint8 t = *src++;
-						*d++ = _vcnExpTable[(t >> 4) | shift];
-						*d++ = _vcnExpTable[(t & 0x0f) | shift];
-					}
-					d += 168;
-				}
-			}
-			d -= 1400;
-
-			if (remainder) {
-				d -= 8;
-				horizontalFlip = false;
-
-				if (remainder & 0x4000) {
-					remainder &= 0x3fff;
-					horizontalFlip = true;
-				}
-
-				shift = _vcnShift ? _vcnShift[remainder] : _blockBrightness;
-				src = &_vcnBlocks[remainder << 5];
-
-				if (horizontalFlip) {
-					for (int blockY = 0; blockY < 8; blockY++) {
-						src += 3;
-						for (int blockX = 0; blockX < 4; blockX++) {
-							uint8 t = *src--;
-							uint8 h = _vcnExpTable[(t & 0x0f) | shift];
-							uint8 l = _vcnExpTable[(t >> 4) | shift];
-							if (h)
-								*d = h;
-							d++;
-							if (l)
-								*d = l;
-							d++;
-						}
-						src += 5;
-						d += 168;
-					}
-				} else {
-					for (int blockY = 0; blockY < 8; blockY++) {
-						for (int blockX = 0; blockX < 4; blockX++) {
-							uint8 t = *src++;
-							uint8 h = _vcnExpTable[(t >> 4) | shift];
-							uint8 l = _vcnExpTable[(t & 0x0f) | shift];
-							if (h)
-								*d = h;
-							d++;
-							if (l)
-								*d = l;
-							d++;
-						}
-						d += 168;
-					}
-				}
-				d -= 1400;
-			}
-		}
-		d += 1232;
-	}
-
-	_screen->copyBlockToPage(_sceneDrawPage1, 112, 0, 176, 120, _sceneWindowBuffer);
-}
-
 void LoLEngine::drawSceneShapes() {
 	for (int i = 0; i < 18; i++) {
 		uint8 t = _dscTileIndex[i];
 		uint8 s = _visibleBlocks[t]->walls[_sceneDrawVarDown];
 
-		int16 x1 = 0;
-		int16 x2 = 0;
+		_shpDmX1 = 0;
+		_shpDmX2 = 0;
 
 		int16 dimY1 = 0;
 		int16 dimY2 = 0;
 
-		setLevelShapesDim(t, x1, x2, 13);
+		setLevelShapesDim(t, _shpDmX1, _shpDmX2, _sceneShpDim);
 
-		if (x2 <= x1)
+		if (_shpDmX2 <= _shpDmX1)
 			continue;
 
 		drawDecorations(t);
@@ -1954,104 +1423,12 @@ void LoLEngine::drawSceneShapes() {
 		if (v > 80)
 			v = 80;
 
-		scaleLevelShapesDim(t, dimY1, dimY2, 13);
+		scaleLevelShapesDim(t, dimY1, dimY2, _sceneShpDim);
 		drawDoor(_doorShapes[(s < 23 ? _dscDoorShpIndex[s] : 0)], 0, t, 10, 0, -v, 2);
-		setLevelShapesDim(t, dimY1, dimY2, 13);
+		setLevelShapesDim(t, dimY1, dimY2, _sceneShpDim);
 	}
 }
 
-void LoLEngine::setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim) {
-	if (_lvlShapeLeftRight[index << 1] == -1) {
-		x1 = 0;
-		x2 = 22;
-
-		int16 y1 = 0;
-		int16 y2 = 120;
-
-		int m = index * 18;
-
-		for (int i = 0; i < 18; i++) {
-			uint8 d = _visibleBlocks[i]->walls[_sceneDrawVarDown];
-			uint8 a = _wllWallFlags[d];
-
-			if (a & 8) {
-				int t = _dscDim2[(m + i) << 1];
-
-				if (t > x1) {
-					x1 = t;
-					if (!(a & 0x10))
-						scaleLevelShapesDim(index, y1, y2, -1);
-				}
-
-				t = _dscDim2[((m + i) << 1) + 1];
-
-				if (t < x2) {
-					x2 = t;
-					if (!(a & 0x10))
-						scaleLevelShapesDim(index, y1, y2, -1);
-				}
-			} else {
-				int t = _dscDim1[m + i];
-
-				if (!_wllVmpMap[d] || t == -40)
-					continue;
-
-				if (t == -41) {
-					x1 = 22;
-					x2 = 0;
-					break;
-				}
-
-				if (t > 0 && x2 > t)
-					x2 = t;
-
-				if (t < 0 && x1 < -t)
-					x1 = -t;
-			}
-
-			if (x2 < x1)
-				break;
-		}
-
-		x1 += 14;
-		x2 += 14;
-
-		_lvlShapeTop[index] = y1;
-		_lvlShapeBottom[index] = y2;
-		_lvlShapeLeftRight[index << 1] = x1;
-		_lvlShapeLeftRight[(index << 1) + 1] = x2;
-	} else {
-		x1 = _lvlShapeLeftRight[index << 1];
-		x2 = _lvlShapeLeftRight[(index << 1) + 1];
-	}
-
-	drawLevelModifyScreenDim(dim, x1, 0, x2, 15);
-}
-
-void LoLEngine::scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim) {
-	static const int8 dscY1[] = { 0x1E, 0x18, 0x10, 0x00 };
-	static const int8 dscY2[] = { 0x3B, 0x47, 0x56, 0x78 };
-
-	uint8 a = _dscDimMap[index];
-
-	if (dim == -1 && a != 3)
-		a++;
-
-	y1 = dscY1[a];
-	y2 = dscY2[a];
-
-	if (dim == -1)
-		return;
-
-	const ScreenDim *cDim = _screen->getScreenDim(dim);
-
-	_screen->modifyScreenDim(dim, cDim->sx, y1, cDim->w, y2 - y1);
-}
-
-void LoLEngine::drawLevelModifyScreenDim(int dim, int16 x1, int16 y1, int16 x2, int16 y2) {
-	_screen->modifyScreenDim(dim, x1, y1 << 3, x2 - x1, (y2 - y1) << 3);
-}
-
 void LoLEngine::drawDecorations(int index) {
 	for (int i = 1; i >= 0; i--) {
 		int s = index * 2 + i;
@@ -2066,7 +1443,7 @@ void LoLEngine::drawDecorations(int index) {
 		if (!scaleW || !scaleH)
 			continue;
 
-		uint8 d = (_currentDirection + _dscUnk1[s]) & 3;
+		uint8 d = (_currentDirection + _dscWalls[s]) & 3;
 		int8 l = _wllShapeMap[_visibleBlocks[index]->walls[d]];
 
 		uint8 *shapeData = 0;
@@ -2076,21 +1453,21 @@ void LoLEngine::drawDecorations(int index) {
 		int flags = 0;
 
 		while (l > 0) {
-			if ((_levelShapeProperties[l].flags & 8) && index != 3 && index != 9 && index != 13) {
-				l = _levelShapeProperties[l].next;
+			if ((_levelDecorationProperties[l].flags & 8) && index != 3 && index != 9 && index != 13) {
+				l = _levelDecorationProperties[l].next;
 				continue;
 			}
 
-			if (_dscOvlMap[shpIx] == 1 && ((_levelShapeProperties[l].flags & 2) || ((_levelShapeProperties[l].flags & 4) && _wllProcessFlag)))
+			if (_dscOvlMap[shpIx] == 1 && ((_levelDecorationProperties[l].flags & 2) || ((_levelDecorationProperties[l].flags & 4) && _wllProcessFlag)))
 				ix = -ix;
 
 			int xOffs = 0;
 			int yOffs = 0;
 			uint8 *ovl = 0;
 
-			if (_levelShapeProperties[l].scaleFlag[shpIx] & 1) {
-				xOffs = _levelShapeProperties[l].shapeX[shpIx];
-				yOffs = _levelShapeProperties[l].shapeY[shpIx];
+			if (_levelDecorationProperties[l].scaleFlag[shpIx] & 1) {
+				xOffs = _levelDecorationProperties[l].shapeX[shpIx];
+				yOffs = _levelDecorationProperties[l].shapeY[shpIx];
 				shpIx = _dscOvlMap[shpIx];
 				int ov = ovlIndex;
 				if (_flags.use16ColorMode) {
@@ -2100,8 +1477,8 @@ void LoLEngine::drawDecorations(int index) {
 					else
 						ov = 0;
 				}
-				ovl = _screen->getLevelOverlay(ov);
-			} else if (_levelShapeProperties[l].shapeIndex[shpIx] != 0xffff) {
+				ovl = screen()->getLevelOverlay(ov);
+			} else if (_levelDecorationProperties[l].shapeIndex[shpIx] != 0xffff) {
 				scaleW = scaleH = 0x100;
 				int ov = 7;
 				if (_flags.use16ColorMode) {
@@ -2111,37 +1488,37 @@ void LoLEngine::drawDecorations(int index) {
 					else
 						ov = 0;
 				}
-				ovl = _screen->getLevelOverlay(ov);
+				ovl = screen()->getLevelOverlay(ov);
 			}
 
-			if (_levelShapeProperties[l].shapeIndex[shpIx] != 0xffff) {
-				shapeData = _levelShapes[_levelShapeProperties[l].shapeIndex[shpIx]];
+			if (_levelDecorationProperties[l].shapeIndex[shpIx] != 0xffff) {
+				shapeData = _levelDecorationShapes[_levelDecorationProperties[l].shapeIndex[shpIx]];
 				if (shapeData) {
 					if (ix < 0) {
-						x = _dscShapeX[s] + xOffs + ((_levelShapeProperties[l].shapeX[shpIx] * scaleW) >> 8);
+						x = _dscShapeX[s] + xOffs + ((_levelDecorationProperties[l].shapeX[shpIx] * scaleW) >> 8);
 						if (ix == _dscShapeIndex[s]) {
-							x = _dscShapeX[s] - ((_levelShapeProperties[l].shapeX[shpIx] * scaleW) >> 8) -
-								_screen->getShapeScaledWidth(shapeData, scaleW) - xOffs;
+							x = _dscShapeX[s] - ((_levelDecorationProperties[l].shapeX[shpIx] * scaleW) >> 8) -
+								screen()->getShapeScaledWidth(shapeData, scaleW) - xOffs;
 						}
 						flags = 0x105;
 					} else {
-						x = _dscShapeX[s] + xOffs + ((_levelShapeProperties[l].shapeX[shpIx] * scaleW) >> 8);
+						x = _dscShapeX[s] + xOffs + ((_levelDecorationProperties[l].shapeX[shpIx] * scaleW) >> 8);
 						flags = 0x104;
 					}
 
-					y = _dscShapeY[s] + yOffs + ((_levelShapeProperties[l].shapeY[shpIx] * scaleH) >> 8);
-					_screen->drawShape(_sceneDrawPage1, shapeData, x + 112, y, 13, flags, ovl, 1, scaleW, scaleH);
+					y = _dscShapeY[s] + yOffs + ((_levelDecorationProperties[l].shapeY[shpIx] * scaleH) >> 8);
+					screen()->drawShape(_sceneDrawPage1, shapeData, x + 112, y, _sceneShpDim, flags, ovl, 1, scaleW, scaleH);
 
-					if ((_levelShapeProperties[l].flags & 1) && shpIx < 4) {
+					if ((_levelDecorationProperties[l].flags & 1) && shpIx < 4) {
 						//draw shadow
-						x += (_screen->getShapeScaledWidth(shapeData, scaleW));
+						x += (screen()->getShapeScaledWidth(shapeData, scaleW));
 						flags ^= 1;
-						_screen->drawShape(_sceneDrawPage1, shapeData, x + 112, y, 13, flags, ovl, 1, scaleW, scaleH);
+						screen()->drawShape(_sceneDrawPage1, shapeData, x + 112, y, _sceneShpDim, flags, ovl, 1, scaleW, scaleH);
 					}
 				}
 			}
 
-			l = _levelShapeProperties[l].next;
+			l = _levelDecorationProperties[l].next;
 			shpIx = (_dscShapeIndex[s] < 0) ? -_dscShapeIndex[s] : _dscShapeIndex[s];
 		}
 	}
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 4eae89e0d4..5e424b4817 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -976,6 +976,58 @@ void Screen::fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum,
 	}
 }
 
+void Screen::crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage) {
+	if (srcPage > 13 || dstPage > 13)
+		error("Screen::crossFadeRegion: attempting to use temp page as source or dest page.");
+
+	hideMouse();
+
+	uint16 *wB = (uint16*)_pagePtrs[14];
+	uint8 *hB = _pagePtrs[14] + 640;
+
+	for (int i = 0; i < w; i++)
+		wB[i] = i;
+
+	for (int i = 0; i < h; i++)
+		hB[i] = i;
+
+	for (int i = 0; i < w; i++)
+		SWAP(wB[_vm->_rnd.getRandomNumberRng(0, w - 1)], wB[i]);
+
+	for (int i = 0; i < h; i++)
+		SWAP(hB[_vm->_rnd.getRandomNumberRng(0, h - 1)], hB[i]);
+
+	uint8 *s = _pagePtrs[srcPage];
+	uint8 *d = _pagePtrs[dstPage];
+
+	for (int i = 0; i < h; i++) {
+		int iH = i;
+		uint32 end = _system->getMillis() + 1;
+		for (int ii = 0; ii < w; ii++) {
+			int sX = x1 + wB[ii];
+			int sY = y1 + hB[iH];
+			int dX = x2 + wB[ii];
+			int dY = y2 + hB[iH];
+
+			if (++iH >= h)
+				iH = 0;
+
+			d[dY * 320 + dX] = s[sY * 320 + sX];
+			addDirtyRect(dX, dY, 1, 1);
+		}
+
+		// This tries to speed things up, to get similiar speeds as in DOSBox etc.
+		if ((i & 5) == 5)
+			updateScreen();
+
+		uint32 cur = _system->getMillis();
+		if (end > cur)
+			_system->delayMillis(end - cur);
+	}
+
+	showMouse();
+}
+
 void Screen::drawBox(int x1, int y1, int x2, int y2, int color) {
 	drawClippedLine(x1, y1, x2, y1, color);
 	drawClippedLine(x1, y1, x1, y2, color);
@@ -1088,6 +1140,10 @@ bool Screen::loadFont(FontId fontId, const char *filename) {
 	if (!fnt) {
 		if (_isAmiga)
 			fnt = new AMIGAFont();
+#ifdef ENABLE_EOB
+		else if (_vm->game() == GI_EOB1 || _vm->game() == GI_EOB2)
+			fnt = new OldDOSFont();
+#endif // ENABLE_EOB
 		else
 			fnt = new DOSFont();
 
@@ -2859,7 +2915,7 @@ void Screen::loadBitmap(const char *filename, int tempPage, int dstPage, Palette
 
 	const char *ext = filename + strlen(filename) - 3;
 	uint8 compType = srcData[2];
-	uint32 imgSize = scumm_stricmp(ext, "CMP") ? READ_LE_UINT32(srcData + 4) : READ_LE_UINT16(srcData);
+	uint32 imgSize = (_vm->game() == GI_KYRA2 && !scumm_stricmp(ext, "CMP")) ? READ_LE_UINT16(srcData) : READ_LE_UINT32(srcData + 4);
 	uint16 palSize = READ_LE_UINT16(srcData + 8);
 
 	if (pal && palSize)
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index 51a9a7f744..cb7d73d1c1 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -137,6 +137,37 @@ private:
 	uint16 *_bitmapOffsets;
 };
 
+#ifdef ENABLE_EOB
+/**
+ * Implementation of the Font interface for old DOS fonts used
+ * in EOB and EOB II.
+ *
+ */
+class OldDOSFont : public Font {
+public:
+	OldDOSFont();
+	~OldDOSFont() { unload(); }
+
+	bool load(Common::SeekableReadStream &file);
+	int getHeight() const { return _height; }
+	int getWidth() const { return _width; }
+	int getCharWidth(uint16 c) const;
+	void setColorMap(const uint8 *src) { _colorMap = src; }
+	void drawChar(uint16 c, byte *dst, int pitch) const;
+
+private:
+	void unload();
+
+	uint8 *_data;
+	uint16 *_bitmapOffsets;
+
+	int _width, _height;
+	const uint8 *_colorMap;
+
+	int _numGlyphs;
+};
+#endif // ENABLE_EOB
+
 /**
  * Implementation of the Font interface for AMIGA fonts.
  */
@@ -369,6 +400,8 @@ public:
 	void shuffleScreen(int sx, int sy, int w, int h, int srcPage, int dstPage, int ticks, bool transparent);
 	void fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum = -1, bool xored = false);
 
+	void crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage);
+
 	void clearPage(int pageNum);
 
 	uint8 getPagePixel(int pageNum, int x, int y);
@@ -420,6 +453,8 @@ public:
 
 	virtual void setScreenDim(int dim) = 0;
 	virtual const ScreenDim *getScreenDim(int dim) = 0;
+	virtual int curDimIndex() const { return 0; }
+	virtual void modifyScreenDim(int dim, int x, int y, int w, int h) {}
 	virtual int screenDimTableCount() const = 0;
 
 	const ScreenDim *_curDim;
@@ -430,13 +465,15 @@ public:
 	int setNewShapeHeight(uint8 *shape, int height);
 	int resetShapeHeight(uint8 *shape);
 
-	void drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd, int flags, ...);
+	virtual int getShapeScaledWidth( const uint8*, int) { return 0; }
+
+	virtual void drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd, int flags, ...);
 
 	// mouse handling
 	void hideMouse();
 	void showMouse();
 	bool isMouseVisible() const;
-	void setMouseCursor(int x, int y, const byte *shape);
+	virtual void setMouseCursor(int x, int y, const byte *shape);
 
 	// rect handling
 	virtual int getRectSize(int w, int h) = 0;
@@ -463,6 +500,8 @@ public:
 	void blockInRegion(int x, int y, int width, int height);
 	void blockOutRegion(int x, int y, int width, int height);
 
+	virtual uint8 *getLevelOverlay(int) { return 0; }
+
 	int _charWidth;
 	int _charOffset;
 	int _curPage;
@@ -514,7 +553,7 @@ protected:
 	uint8 _sjisInvisibleColor;
 
 	Palette *_screenPalette;
-	Common::Array<Palette *> _palettes;
+	Common::Array<Palette*> _palettes;
 	Palette *_internFadePalette;
 
 	Font *_fonts[FID_NUM];
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
new file mode 100644
index 0000000000..eb5a52477b
--- /dev/null
+++ b/engines/kyra/screen_eob.cpp
@@ -0,0 +1,965 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+
+#if !defined(ENABLE_EOB)
+#include "kyra/screen.h"
+#endif
+
+#ifdef ENABLE_EOB
+
+#include "kyra/eobcommon.h"
+#include "kyra/resource.h"
+
+#include "common/system.h"
+
+#include "graphics/cursorman.h"
+
+namespace Kyra {
+
+Screen_Eob::Screen_Eob(EobCoreEngine *vm, OSystem *system) : Screen(vm, system) {
+	_shapeFadeMode[0] = _shapeFadeMode[1] = 0;
+	_shapeFadeInternal = 0;
+	_fadeData = 0;
+	_fadeDataIndex = 0;
+	_dsX1 = _dsX2 = _dsY1 = _dsY2 = 0;
+	_customDimTable = 0;
+	_dsTempPage = 0;
+}
+
+Screen_Eob::~Screen_Eob() {
+	delete[] _fadeData;
+	delete[] _customDimTable;
+	delete[] _dsTempPage;
+}
+
+bool Screen_Eob::init() {
+	if (Screen::init()) {
+		_customDimTable = new ScreenDim*[_screenDimTableCount];
+		memset(_customDimTable, 0, sizeof(ScreenDim *)* _screenDimTableCount);
+
+		_fadeData = _vm->resource()->fileData("FADING.DAT", 0);
+
+		if (!_fadeData) {
+			_fadeData = new uint8[0x700];
+			memset(_fadeData, 0, 0x700);
+			uint8 *pal = _vm->resource()->fileData("palette1.pal", 0); // EGA: palette0.pal
+			for (int i = 0; i < 7; i++)
+				createFadeTable(pal, &_fadeData[i << 8], 18, (i + 1) * 36);
+			delete[] pal;
+		}
+
+		_dsTempPage = new uint8[6000];
+
+		return true;
+	}
+	return false;
+}
+
+void Screen_Eob::setScreenDim(int dim) {
+	assert(dim < _screenDimTableCount);
+	_curDim = _customDimTable[dim] ? (const ScreenDim *)_customDimTable[dim] : &_screenDimTable[dim];
+	_curDimIndex = dim;
+}
+
+const ScreenDim *Screen_Eob::getScreenDim(int dim) {
+	assert(dim < _screenDimTableCount);
+	return _customDimTable[dim] ? (const ScreenDim *)_customDimTable[dim] : &_screenDimTable[dim];
+}
+
+void Screen_Eob::modifyScreenDim(int dim, int x, int y, int w, int h) {
+	delete _customDimTable[dim];
+	_customDimTable[dim] = new ScreenDim;
+	memcpy(_customDimTable[dim], &_screenDimTable[dim], sizeof(ScreenDim));
+	_customDimTable[dim]->sx = x;
+	_customDimTable[dim]->sy = y;
+	_customDimTable[dim]->w = w;
+	_customDimTable[dim]->h = h;
+	if (dim == _curDimIndex)
+		setScreenDim(dim);
+}
+
+void Screen_Eob::setClearScreenDim(int dim) {
+	setScreenDim(dim);
+	clearCurDim();
+}
+
+void Screen_Eob::clearCurDim() {
+	fillRect(_curDim->sx << 3, _curDim->sy, ((_curDim->sx + _curDim->w) << 3) - 1, (_curDim->sy + _curDim->h) - 1, _curDim->unkA);
+}
+
+void Screen_Eob::setMouseCursor(int x, int y, const byte *shape) {
+	if (!shape)
+		return;
+	int mouseW = shape[2] << 3;
+	int mouseH = shape[3];
+	uint8 *cursor = new uint8[mouseW * mouseH];
+	fillRect(0, 0, mouseW, mouseH, _cursorColorKey, 8);
+	drawShape(8, shape, 0, 0, 0);
+	CursorMan.showMouse(false);
+	copyRegionToBuffer(8, 0, 0, mouseW, mouseH, cursor);
+	CursorMan.replaceCursor(cursor, mouseW, mouseH, x, y, _cursorColorKey);
+	if (isMouseVisible())
+		CursorMan.showMouse(true);
+	delete[] cursor;
+
+	// makes sure that the cursor is drawn
+	// we do not use Screen::updateScreen here
+	// so we can be sure that changes to page 0
+	// are NOT updated on the real screen here
+	_system->updateScreen();
+}
+
+void Screen_Eob::loadFileDataToPage(Common::SeekableReadStream *s, int pageNum, uint32 size) {
+	s->read(_pagePtrs[pageNum], size);
+}
+
+void Screen_Eob::printShadedText(const char *string, int x, int y, int col1, int col2) {
+	printText(string, x - 1, y, 12, col2);
+	printText(string, x, y + 1, 12, 0);
+	printText(string, x - 1, y + 1, 12, 0);
+	printText(string, x, y, col1, 0);
+}
+
+void Screen_Eob::loadEobBitmap(const char *file, int tempPage, int destPage) {
+	loadEobCpsFileToPage(file, 0, tempPage, destPage, -1);
+	_curPage = 2;
+}
+
+void Screen_Eob::loadEobCpsFileToPage(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage) {
+	char tmp[13];
+	sprintf(tmp, "%s.CPS", file);
+
+	Common::SeekableReadStream *s = _vm->resource()->createReadStream(tmp);
+	bool loadAlternative = false;
+	if (s) {
+		// This additional check is necessary since some localized versions of EOB II seem to contain invalid (size zero) cps files
+		if (s->size())
+			loadBitmap(tmp, tempPage, destPage, 0);
+		else
+			loadAlternative = true;
+
+		delete s;
+	} else {
+		loadAlternative = true;
+	}
+
+	if (loadAlternative) {
+		tmp[0] = 'X';
+		s = _vm->resource()->createReadStream(tmp);
+		if (!s)
+			error("Screen_Eob::loadEobCpsFileToPage(): CPS file loading failed.");
+		s->seek(768);
+		loadFileDataToPage(s, destPage, 64000);
+		delete s;
+	}
+
+	if (copyToPage == -1) {
+		return;
+	} else if (copyToPage == 0) {
+		copyPage(destPage, 2);
+		copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+	} else {
+		copyPage(destPage, copyToPage);
+	}
+}
+
+uint8 *Screen_Eob::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool flag) {
+	uint8 *shp = 0;
+	uint16 shapesize = 0;
+
+	uint8 *srcPage = getPagePtr(_curPage) + y * 320 + (x << 3);
+	uint8 *src = srcPage;
+
+	if (flag) {
+		uint16 h1 = h;
+		while (h1--) {
+			uint8 *lineEnd = src + (w << 3);
+			do {
+				if (!*src++) {
+					shapesize++;
+					uint8 *startZeroPos = src;
+					while (src != lineEnd && *src == 0)
+						src++;
+
+					uint16 numZero = src - startZeroPos + 1;
+					if (numZero >> 8)
+						shapesize += 2;
+				}
+				shapesize++;
+			} while (src != lineEnd);
+
+			srcPage += 320;
+			src = srcPage;
+		}
+
+		shapesize += 4;
+
+		shp = new uint8[shapesize];
+		memset (shp, 0, shapesize);
+		uint8 *dst = shp;
+
+		*dst++ = 0;
+		*dst++ = (h & 0xff);
+		*dst++ = (w & 0xff);
+		*dst++ = (h & 0xff);
+
+		srcPage = getPagePtr(_curPage) + y * 320 + (x << 3);
+		src = srcPage;
+
+		h1 = h;
+		while (h1--) {
+			uint8 *lineEnd = src + (w << 3);
+			do {
+				uint8 val = *src++;
+				if (!val) {
+					*dst++ = val;
+					uint8 *startZeroPos = src;
+					while (src != lineEnd && *src == 0)
+						src++;
+
+					uint16 numZero = src - startZeroPos + 1;
+					if (numZero >> 8) {
+						numZero -= 0xff;
+						*dst++ = 0xff;
+						*dst++ = 0;
+					}
+					val = (numZero & 0xff);
+				}
+				*dst++ = val;
+			} while (src != lineEnd);
+
+			srcPage += 320;
+			src = srcPage;
+		}
+
+	} else {
+		uint8 nib = 0, col = 0;
+		uint8 *colorMap = new uint8[0x100];
+		memset (colorMap, 0xff, 0x100);
+
+		shapesize = h * (w << 2) + 0x14;
+		shp = new uint8[shapesize];
+		memset (shp, 0, shapesize);
+		uint8 *dst = shp;
+
+		*dst++ = 1;
+		*dst++ = (h & 0xff);
+		*dst++ = (w & 0xff);
+		*dst++ = (h & 0xff);
+		memset (dst, 0xff, 0x10);
+
+		uint8 *pal = dst;
+		dst += 0x10;
+
+		srcPage = getPagePtr(_curPage) + y * 320 + (x << 3);
+		src = srcPage;
+		nib = col = 0;
+
+		uint16 h1 = h;
+		while (h1--) {
+			uint16 w1 = w << 3;
+			while (w1--) {
+				uint8 s = *src++;
+				uint8 c = colorMap[s];
+				if (c == 0xff) {
+					if (col < 0x10) {
+						*pal++ = s;
+						c = colorMap[s] = col++;
+						if (!col)
+							c = 0;
+					} else {
+						c = 0;
+					}
+				}
+
+				if(++nib & 1) {
+					*dst = c << 4;
+				} else {
+					*dst++ |= c;
+				}
+			}
+			srcPage += 320;
+			src = srcPage;
+		}
+    	delete [] colorMap;
+	}
+
+	return shp;
+}
+
+void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd, int flags, ...) {
+	uint8 *dst = getPagePtr(pageNum);
+	const uint8 *src = shapeData;
+
+	if (!src)
+		return;
+
+	va_list args;
+	va_start(args, flags);
+	uint8 *ovl = (flags & 2) ? va_arg(args, uint8*) : 0;
+	va_end(args);
+
+	if (sd != -1) {
+		const ScreenDim *dm = getScreenDim(sd);
+		setShapeFrame(dm->sx, dm->sy, dm->sx + dm->w, dm->sy + dm->h);
+		x += (_dsX1 << 3);
+		y += _dsY1;
+	}
+
+	dst += (_dsX1 << 3);
+	int16 dX = x - (_dsX1 << 3);
+	int16 dY = y;
+	int16 dW = _dsX2 - _dsX1;
+	uint8 flag = *src++;
+
+	uint16 dH = *src++;
+	uint16 width = (*src++) << 3;
+	src++;
+
+	int rX = x;
+	int rY = y;
+	int rW = width + 8;
+	int rH = dH;
+
+	uint16 w2 = width;
+	int d = dY - _dsY1;
+
+	int pixelStep = (flags & 1) ? -1 : 1;
+
+	if (flag) {
+		const uint8 *pal = ovl ? ovl : src;
+		src += 16;
+
+		if (d < 0) {
+			d = -d;
+			if (d >= dH)
+				return;
+			src += (d * (width >> 1));
+			d = dY + dH - _dsY1;
+			if (d >=0) {
+				dH = d;
+				dY = _dsY1;
+				d = _dsY2 - dY;
+			}
+		} else {
+			d = _dsY2 - dY;
+		}
+
+		if (d < 1)
+			return;
+
+		if (d < dH)
+			dH = d;
+
+        int16 cnt1 = 0;
+		int16 cnt2 = 0;
+		int16 dXbit1 = dX & 1;
+
+		if (dX < 0) {
+			width += dX;
+			d = -dX;
+			if ((flags & 1))
+				src -= (d >> 1);
+			else
+				src += (d >> 1);
+
+			if (d >= w2)
+				return;
+
+			dX = 0;
+			cnt1++;
+		}
+
+		d = (dW << 3) - dX;
+
+		if (d < 1)
+			return;
+
+		if (d < width) {
+			width = d;
+			cnt2++;
+		}
+
+		dst += (dY * 320 + dX);
+
+		if (pageNum == 0 || pageNum == 1)
+			addDirtyRect(rX, rY, rW, rH);
+
+		int w3 = w2;
+		dY = 320 - width;
+		width >>= 1;
+		w2 >>= 1;
+		if ((flags & 1))
+			src += (w2 - 1);
+
+		int16 w1shr = width;
+
+		if (cnt1 && (dXbit1 & 1)) {
+			w1shr++;
+			w2++;
+			if (!cnt2)
+				dY += 2;
+		}
+
+		if (cnt2 && (dXbit1 & 1))
+			w1shr++;
+
+		int lineSrcStep = (w2 - w1shr);
+		if ((flags & 1))
+			lineSrcStep = w3 - lineSrcStep;
+
+		while (dH--) {
+			int16 hpos = width;
+			uint8 col = 0;
+			uint8 b = 0;
+			uint8 nextloop = 0;
+
+			if (cnt1 && dXbit1) {
+				if (!hpos)
+					return;
+				b = *src;
+				src += pixelStep;
+				nextloop = 2;
+			} else {
+				nextloop = hpos ? 1 : 3;
+			}
+
+			while (nextloop) {
+				switch (nextloop) {
+				case 1:
+					b = *src;
+					src += pixelStep;
+					col = pal[(flags & 1) ? (b & 0x0f) : (b >> 4)];
+					if (col)
+						drawShapeSetPixel(dst, col);
+					dst++;
+
+				case 2:
+					col = pal[(flags & 1) ? (b >> 4) : (b & 0x0f)];
+
+					if (!col) {
+						nextloop = 4;
+						break;
+					}
+
+					drawShapeSetPixel(dst++, col);
+					nextloop = --hpos ? 1 : 3;
+					break;
+
+				case 3:
+					if (cnt2 && dXbit1) {
+						col = pal[(flags & 1) ? (*src & 0x0f) : (*src >> 4)];
+						src += pixelStep;
+						if (col)
+							drawShapeSetPixel(dst, col);
+						dst++;
+					}
+
+					src += lineSrcStep;
+					dst += dY;
+					nextloop = 0;
+					break;
+
+				case 4:
+					dst++;
+					nextloop = --hpos ? 1 : 3;
+					break;
+				}
+			}
+		}
+	} else {
+		uint16 marginLeft = 0;
+		uint16 marginRight = 0;
+
+		if (d < 0) {
+			dH += d;
+			if (dH <= 0)
+				return;
+			d = -d;
+
+			for (int ii = 0; ii < d; ii++) {
+				marginLeft = width;
+				int i = 0;
+				do {
+					for (i = 0; i < marginLeft; i++)
+						if (!*src++)
+							break;
+
+					if (!*(src-1) || i < marginLeft)
+						marginLeft = ++marginLeft - *src++;
+					else
+						marginLeft = 0;
+
+				} while (marginLeft);
+			}
+            dY = _dsY1;
+		}
+
+		d = _dsY2 - dY;
+
+		if (d < 1)
+			return;
+
+		if (d < dH)
+			dH = d;
+
+		marginLeft = 0;
+
+		if (dX < 0) {
+			width += dX;
+			marginLeft = -dX;
+
+			if (marginLeft >= w2)
+				return;
+
+			dX = 0;
+		}
+
+		marginRight = 0;
+		d = (dW << 3) - dX;
+
+		if (d < 1)
+			return;
+
+		if (d < width) {
+			width = d;
+			marginRight = w2 - marginLeft - width;
+		}
+
+		dst += (y * 320 + dX);
+		uint8 * dstL = dst;
+
+		if (pageNum == 0 || pageNum == 1)
+			addDirtyRect(rX, rY, rW, rH);
+
+		while (dH--) {
+			int16 xpos = (int16) marginLeft;
+
+			if (xpos) {
+				do {
+					while (*src && xpos) {
+						src++;
+						xpos--;
+					}
+
+					if (!*src) {
+						uint8 bt = *++src;
+						src++;
+						xpos = xpos - bt;
+					}
+				} while (xpos > 0);
+			}
+
+			dst -= xpos;
+			xpos += width;
+
+			while (xpos > 0) {
+				uint8 c = *src++;
+
+				if (c) {
+					drawShapeSetPixel(dst++, c);
+					xpos--;
+				} else {
+					dst += *src;
+					xpos -= *src++;
+				}
+			}
+			xpos += marginRight;
+
+			if (xpos) {
+				do {
+					while (*src && xpos) {
+						src++;
+						xpos--;
+					}
+
+					if (!*src) {
+						uint8 bt = *++src;
+						src++;
+						xpos = xpos - bt;
+					}
+				} while (xpos > 0);
+			}
+
+			dstL += 320;
+			dst = dstL;
+		}
+	}
+}
+
+void Screen_Eob::drawShapeSetPixel(uint8 * dst, uint8 c) {
+	if (_shapeFadeMode[0]) {
+		if (_shapeFadeMode[1]) {
+			c = *dst;
+		} else {
+			_shapeFadeInternal &= 7;
+            c = *(dst + _shapeFadeInternal++);
+		}
+	}
+
+	if (_shapeFadeMode[1]) {
+		uint8 cnt = _shapeFadeMode[1];
+		while (cnt--)
+			c = _fadeData[_fadeDataIndex + c];
+	}
+
+	*dst = c;
+}
+
+const uint8 *Screen_Eob::scaleShape(const uint8 *shapeData, int steps) {
+	setShapeFadeMode(1, steps ? true : false);
+
+	while (shapeData && steps--)
+		shapeData = scaleShapeStep(shapeData);
+
+	return shapeData;
+}
+
+const uint8 *Screen_Eob::scaleShapeStep(const uint8 *shp) {
+	uint8 *d = _dsTempPage;
+	*d++ = *shp++;
+
+	uint16 h = (*shp++) + 1;
+	d[0] = d[2] = (h << 1) / 3;
+	d++;
+
+	uint16 w = *shp++;
+	uint16 w2 = w << 2;
+	uint16 t = ((w << 1) % 3) ? 1 : 0;
+	*d++ = ((w << 1) / 3) + t;
+
+	shp++;
+	d++;
+
+	int i = 0;
+	while (i < 16) {
+		if (!shp[i]) {
+			i = -i;
+			break;
+		}
+		i++;
+	}
+
+	if (i >= 0)
+		i = 0;
+	else
+		i = -i;
+
+	_dsScaleTmp = (i << 4) | (i & 0x0f);
+	memcpy(d, shp, 16);
+	d += 16;
+	shp += 16;
+
+	_dsDiv = w2 / 3;
+	_dsRem = w2 % 3;
+
+	do {
+		scaleShapeProcessLine(d, shp);
+		if (!--h)
+			break;
+		scaleShapeProcessLine(d, shp);
+		if (!--h)
+			break;
+		shp += w2;
+	} while (--h);
+
+	return (const uint8 *) _dsTempPage;
+}
+
+void Screen_Eob::replaceShapePalette(uint8 *shp, const uint8 *pal) {
+	if (*shp != 1)
+		return;
+	shp += 4;
+	memcpy(shp, pal, 16);
+}
+
+void Screen_Eob::applyShapeOverlay(uint8 *shp, int ovlIndex) {
+	if (*shp != 1)
+		return;
+	shp += 4;
+	uint8 *ovl = getFadeTable(ovlIndex);
+	for (int i = 0; i < 16; i++)
+		shp[i] = ovl[shp[i]];
+}
+
+void Screen_Eob::scaleShapeProcessLine(uint8 *&dst, const uint8 *&src) {
+	for (int i = 0; i < _dsDiv; i++) {
+		*dst++ = *src++;
+		*dst++ = READ_BE_UINT16(src) >> 4;
+		src += 2;
+	}
+
+	if (_dsRem == 1) {
+		*dst++ = *src++;
+		*dst++ = _dsScaleTmp;
+
+	} if (_dsRem == 2) {
+		*dst++ = (src[0] & 0xf0) | (src[1] >> 4);
+		src += 2;
+		*dst++ = _dsScaleTmp;
+		*dst++ = _dsScaleTmp;
+		*dst++ = _dsScaleTmp;
+	}
+}
+
+void Screen_Eob::fadeTextColor(Palette *pal, int color1, int rate) {
+	uint8 *col = pal->getData();
+
+	for (bool loop = true; loop; ) {
+		loop = true;
+		uint32 end = _system->getMillis() + 16;
+
+		loop = false;
+		for (int ii = 0; ii < 3; ii++) {
+			uint8 c = col[color1 * 3 + ii];
+			if (c > rate) {
+				col[color1 * 3 + ii] -= rate;
+				loop = true;
+			} else if (c) {
+				col[color1 * 3 + ii] = 0;
+				loop = true;
+			}
+		}
+
+		if (loop) {
+			setScreenPalette(*pal);
+			updateScreen();
+			uint32 cur = _system->getMillis();
+			if (end > cur)
+				_system->delayMillis(end - cur);
+		}
+	}
+}
+
+bool Screen_Eob::delayedFadePalStep(Palette *fadePal, Palette *destPal, int rate) {
+	bool res = false;
+
+	uint8 *s = fadePal->getData();
+	uint8 *d = destPal->getData();
+
+	for (int i = 0; i < 765; i++) {
+		int fadeVal = *s++;
+		int dstCur = *d;
+		int diff = ABS(fadeVal - dstCur);
+
+		if (diff == 0) {
+			d++;
+			continue;
+		}
+
+		res = true;
+		diff = MIN(diff, rate);
+
+		if (dstCur < fadeVal)
+			*d += diff;
+		else
+			*d -= diff;
+		d++;
+	}
+
+	return res;
+}
+
+void Screen_Eob::createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, uint8 weight) {
+	if (!palData)
+		return;
+
+	uint8 *src = palData + 3 * rootColor;
+	uint8 r = *src++;
+	uint8 g = *src++;
+	uint8 b = *src;
+	uint8 tr, tg, tb;
+	src = palData + 3;
+
+	*dst++ = 0;
+	weight >>= 1;
+
+	for (uint8 i = 1; i; i++) {
+		uint16 tmp = (uint16)((*src - r) * weight) << 1;
+		tr = *src++ - ((tmp >> 8) & 0xff);
+		tmp = (uint16)((*src - g) * weight) << 1;
+		tg = *src++ - ((tmp >> 8) & 0xff);
+		tmp = (uint16)((*src - b) * weight) << 1;
+		tb = *src++ - ((tmp >> 8) & 0xff);
+
+		uint8 * d = palData + 3;
+		uint16 v = 0xffff;
+		uint8 col = rootColor;
+
+		for (uint8 ii = 1; ii; ii++) {
+			int a = *d++ - tr;
+			int t = a * a;
+			a = *d++ - tg;
+			t += (a * a);
+			a = *d++ - tb;
+			t += (a * a);
+
+			if (t <= v && (ii == rootColor || ii != i)) {
+				v = t;
+				col = ii ;
+			}
+		}
+        *dst++ = col;
+	}
+}
+
+OldDOSFont::OldDOSFont() {
+	_data = 0;
+	_width = _height = _numGlyphs = 0;
+	_bitmapOffsets = 0;
+}
+
+bool OldDOSFont::load(Common::SeekableReadStream &file) {
+	unload();
+
+	_data = new uint8[file.size()];
+	assert(_data);
+
+	file.read(_data, file.size());
+	if (file.err())
+		return false;
+
+	if (file.size() - 2 != READ_LE_UINT16(_data))
+		return false;
+
+	_width = _data[0x103];
+	_height = _data[0x102];
+	_numGlyphs = 255;
+
+	_bitmapOffsets = (uint16 *)(_data + 2);
+
+	for (int i = 0; i < _numGlyphs; ++i)
+		_bitmapOffsets[i] = READ_LE_UINT16(&_bitmapOffsets[i]);
+
+	return true;
+}
+
+int OldDOSFont::getCharWidth(uint16 c) const {
+	if (c >= _numGlyphs)
+		return 0;
+	return _width;
+}
+
+void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
+	static const uint8 renderMaskTable6[] = { 0xFC, 0x00, 0x7E, 0x00, 0x3F, 0x00, 0x1F, 0x80, 0x0F, 0xC0, 0x07, 0xE0, 0x03, 0xF0, 0x01, 0xF8	};
+	static const uint8 renderMaskTable8[] = { 0xFF, 0x00, 0x7F, 0x80, 0x3F, 0xC0, 0x1F, 0xE0, 0x0F, 0xF0, 0x07, 0xF8, 0x03, 0xFC, 0x01, 0xFE };
+
+	if (_width != 8 && _width != 6)
+		error("EOB font rendering not implemented for other font widths than 6 and 8.");
+
+	if (_width == 6) {
+		switch (c) {
+		case 0x81:
+		case 0x9a:
+			c = 0x5d;
+			break;
+		case 0x84:
+		case 0x8e:
+			c = 0x5b;
+			break;
+		case 0x94:
+		case 0x99:
+			c = 0x40;
+		case 0xe1:
+			// TODO: recheck this: no conversion for 'ß' ?
+			break;
+		}
+	} else if (_width == 8){
+		switch (c) {
+		case 0x81:
+		case 0x9a:
+		case 0x5d:
+			c = 0x1d;
+			break;
+		case 0x84:
+		case 0x5b:
+			c = 0x1e;
+			break;
+		case 0x94:
+		case 0x40:
+			c = 0x1f;
+			break;
+		case 0x8e:
+			c = 0x1b;
+			break;
+		case 0x99:
+			c = 0x1c;
+			break;
+		case 0xe1:
+			c = 0x19;
+			break;
+		}
+	}
+
+	const uint8 *src = &_data[_bitmapOffsets[c]];
+
+	int w = (_width - 1) >> 3;
+	pitch -= _width;
+
+	uint8 color1 = _colorMap[1];
+	uint8 color2 = _colorMap[0];
+
+	int cH = _height;
+	while (cH--) {
+		int cW = w;
+		const uint8 *mtbl = _width == 8 ? renderMaskTable8 : renderMaskTable6;
+
+		for (bool runWidthLoop = true; runWidthLoop; ) {
+			uint8 s = *src++;
+			uint8 m = *mtbl++;
+
+			for (uint8 i = 0x80; i; i >>= 1) {
+				if (!(m & i)) {
+					runWidthLoop = false;
+					break;
+				}
+
+				if (s & i) {
+					if (color1)
+						*dst = color1;
+				} else if (color2) {
+					*dst = color2;
+				}
+				dst++;
+			}
+
+			if (cW)
+				cW--;
+			else
+				runWidthLoop = false;
+		}
+
+		dst += pitch;
+	}
+}
+
+void OldDOSFont::unload() {
+	delete[] _data;
+	_data = 0;
+	_width = _height = _numGlyphs = 0;
+	_bitmapOffsets = 0;
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
new file mode 100644
index 0000000000..038ba85791
--- /dev/null
+++ b/engines/kyra/screen_eob.h
@@ -0,0 +1,105 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 KYRA_SCREEN_EOB_H
+#define KYRA_SCREEN_EOB_H
+
+#ifdef ENABLE_EOB
+
+#include "kyra/screen.h"
+
+namespace Kyra {
+
+class EobCoreEngine;
+class Screen_Eob : public Screen{
+public:
+	Screen_Eob(EobCoreEngine *vm, OSystem *system);
+	virtual ~Screen_Eob();
+
+	bool init();
+
+	void setScreenDim(int dim);
+	const ScreenDim *getScreenDim(int dim);
+	int curDimIndex() const { return _curDimIndex; }
+	void modifyScreenDim(int dim, int x, int y, int w, int h);
+	int screenDimTableCount() const { return _screenDimTableCount; }
+
+	void setClearScreenDim(int dim);
+	void clearCurDim();
+
+	void setMouseCursor(int x, int y, const byte *shape);
+
+	void loadFileDataToPage(Common::SeekableReadStream *s, int pageNum, uint32 size);
+
+	void printShadedText(const char *string, int x, int y, int col1, int col2);
+	void loadEobCpsFileToPage(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage);
+	void loadEobBitmap(const char *file, int tempPage, int destPage);
+
+	uint8 *encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool flag = false);
+	void drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd = -1, int flags = 0, ...);
+	const uint8 *scaleShape(const uint8 *shapeData, int blockDistance);
+	const uint8 *scaleShapeStep(const uint8 *shp);
+	void replaceShapePalette(uint8 *shp, const uint8 *pal);
+	void applyShapeOverlay(uint8 *shp, int ovlIndex);
+
+	void setShapeFrame(int x1, int y1, int x2, int y2) { _dsX1 = x1; _dsY1 = y1; _dsX2 = x2; _dsY2 = y2; }
+	void setShapeFadeMode (uint8 i, bool b) { if (!i || i == 1) _shapeFadeMode[i] = b; }
+
+	void fadeTextColor(Palette *pal, int color1, int fadeTextColor);
+	bool delayedFadePalStep(Palette *fadePal, Palette *destPal, int rate);
+
+	void setTextColorMap(const uint8 *cmap) {}
+	int getRectSize(int w, int h) { return w * h; }
+
+	void setFadeTableIndex(int index) { _fadeDataIndex = (CLIP(index, 0, 7) << 8); }
+	void createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, uint8 weight);
+	uint8 *getFadeTable(int index) { return (index >= 0 && index < 5) ? &_fadeData[index << 8] : 0; }
+
+protected:
+	int16 _dsX1, _dsX2, _dsY1, _dsY2;
+	bool _shapeFadeMode[2];
+	uint16 _shapeFadeInternal;
+	uint8 *_fadeData;
+	int _fadeDataIndex;
+
+	uint8 *_dsTempPage;
+
+	static const ScreenDim _screenDimTable[];
+	static const int _screenDimTableCount;
+
+	ScreenDim **_customDimTable;
+	int _curDimIndex;
+
+private:
+	void drawShapeSetPixel(uint8 *dst, uint8 c);
+	void scaleShapeProcessLine(uint8 *&dst, const uint8 *&src);
+
+	int _dsDiv, _dsRem, _dsScaleTmp;
+};
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
+
+#endif
+
+
diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp
index 303cbb45aa..1981341063 100644
--- a/engines/kyra/script.cpp
+++ b/engines/kyra/script.cpp
@@ -95,7 +95,7 @@ bool EMCInterpreter::callback(Common::IFFChunk &chunk) {
 	return false;
 }
 
-bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Common::Array<const Opcode *> *opcodes) {
+bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Common::Array<const Opcode*> *opcodes) {
 	Common::SeekableReadStream *stream = _vm->resource()->createReadStream(filename);
 	if (!stream) {
 		error("Couldn't open script file '%s'", filename);
diff --git a/engines/kyra/script.h b/engines/kyra/script.h
index 5bd75f7b80..858b2b11b8 100644
--- a/engines/kyra/script.h
+++ b/engines/kyra/script.h
@@ -41,7 +41,7 @@ struct EMCData {
 	uint16 *ordr;
 	uint16 dataSize;
 
-	const Common::Array<const Opcode *> *sysFuncs;
+	const Common::Array<const Opcode*> *sysFuncs;
 };
 
 struct EMCState {
@@ -92,7 +92,7 @@ class EMCInterpreter {
 public:
 	EMCInterpreter(KyraEngine_v1 *vm);
 
-	bool load(const char *filename, EMCData *data, const Common::Array<const Opcode *> *opcodes);
+	bool load(const char *filename, EMCData *data, const Common::Array<const Opcode*> *opcodes);
 	void unload(EMCData *data);
 
 	void init(EMCState *scriptState, const EMCData *data);
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
new file mode 100644
index 0000000000..40656c575a
--- /dev/null
+++ b/engines/kyra/script_eob.cpp
@@ -0,0 +1,1528 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#include "kyra/eobcommon.h"
+#include "kyra/screen_eob.h"
+#include "kyra/script_eob.h"
+#include "kyra/resource.h"
+#include "kyra/sound.h"
+
+#include "common/system.h"
+
+namespace Kyra {
+
+void EobCoreEngine::runLevelScript(int block, int flags) {
+	_inf->run(block, flags);
+}
+
+void EobCoreEngine::setScriptFlag(int flag) {
+	_inf->setFlag(flag);
+}
+
+bool EobCoreEngine::checkScriptFlag(int flag) {
+	return _inf->checkFlag(0x8000);
+}
+
+const uint8 *EobCoreEngine::initScriptTimers(const uint8 *pos) {
+	_scriptTimersCount = 0;
+
+	while (((int16)READ_LE_UINT16(pos)) != -1) {
+		_scriptTimers[_scriptTimersCount].func = READ_LE_UINT16(pos);
+		pos += 2;
+		uint16 ticks = (int16)READ_LE_UINT16(pos) * 18;
+		_scriptTimers[_scriptTimersCount].ticks = ticks;
+		pos += 2;
+		_scriptTimers[_scriptTimersCount++].next = _system->getMillis() + ticks * _tickLength;
+	}
+
+	return pos;
+}
+
+void EobCoreEngine::updateScriptTimers() {
+	if ((_scriptTimersMode & 1) && _stepsUntilScriptCall && _stepCounter > _stepsUntilScriptCall) {
+		_inf->run(0, 0x20);
+		_stepCounter = 0;
+	}
+
+	if (_scriptTimersMode & 2) {
+		for (int i = 0; i < _scriptTimersCount; i++) {
+			if (_scriptTimers[i].next < _system->getMillis()) {
+				_inf->run(_scriptTimers[i].func, _flags.gameID == GI_EOB1 ? 0x20 : 0x80);
+				_scriptTimers[i].next = _system->getMillis() + _scriptTimers[i].ticks * _tickLength;
+				_sceneUpdateRequired = true;
+			}
+		}
+	}
+}
+
+EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _vm(engine), _screen(screen),
+	_commandMin(engine->game() == GI_EOB1 ? -27 : -31) {
+
+#define Opcode(x) _opcodes.push_back(new InfProc(this, &EobInfProcessor::x))
+#define OpcodeAlt(x, y) if (_vm->game() == GI_EOB1) Opcode(x); else Opcode(y);
+	Opcode(oeob_setWallType);
+	Opcode(oeob_toggleWallState);
+	Opcode(oeob_openDoor);
+	Opcode(oeob_closeDoor);
+	Opcode(oeob_replaceMonster);
+	Opcode(oeob_movePartyOrObject);
+	Opcode(oeob_moveInventoryItemToBlock);
+	OpcodeAlt(oeob_printMessage_v1, oeob_printMessage_v2);
+	Opcode(oeob_setFlags);
+	Opcode(oeob_playSoundEffect);
+	Opcode(oeob_removeFlags);
+	Opcode(oeob_modifyCharacterHitPoints);
+	Opcode(oeob_calcAndInflictCharacterDamage);
+	Opcode(oeob_jump);
+	Opcode(oeob_end);
+	Opcode(oeob_popPosAndReturn);
+	Opcode(oeob_pushPosAndJump);
+	OpcodeAlt(oeob_eval_v1, oeob_eval_v2);
+	Opcode(oeob_deleteItem);
+	Opcode(oeob_loadNewLevelOrMonsters);
+	Opcode(oeob_increasePartyExperience);
+	OpcodeAlt(oeob_createItem_v1, oeob_createItem_v2);
+	Opcode(oeob_launchObject);
+	Opcode(oeob_changeDirection);
+	Opcode(oeob_identifyItems);
+	Opcode(oeob_sequence);
+	Opcode(oeob_delay);
+	Opcode(oeob_drawScene);
+	Opcode(oeob_dialogue);
+	Opcode(oeob_specialEvent);
+#undef Opcode
+#undef OpcodeAlt
+
+	_scriptData = 0;
+
+	_abortScript = 0;
+	_abortAfterSubroutine = 0;
+	_dlgResult = 0;
+	_script2 = 0;
+
+	_lastScriptFunc = 0;
+	_lastScriptSub = 0;
+
+	_scriptPosStack = new int8*[10];
+	memset(_scriptPosStack, 0, 10 * sizeof(int8*));
+	_scriptPosStackIndex = 0;
+
+	_flagTable = new uint32[18];
+	memset(_flagTable, 0, 18 * sizeof(uint32));
+
+	_stack = new int16[30];
+	memset(_stack, 0, 30 * sizeof(int16));
+	_stackIndex = 0;
+
+	memset(_scriptPosStack, 0, sizeof(_scriptPosStack));
+	_scriptPosStackIndex = 0;
+
+	_activeCharacter = -1;
+}
+
+EobInfProcessor::~EobInfProcessor() {
+	delete[] _scriptPosStack;
+	delete[] _flagTable;
+	delete[] _stack;
+	delete[] _scriptData;
+	for (Common::Array<const InfProc*>::const_iterator a = _opcodes.begin(); a != _opcodes.end(); ++a)
+		delete *a;
+	_opcodes.clear();
+}
+
+void EobInfProcessor::loadData(const uint8 *data, uint32 dataSize) {
+	delete[] _scriptData;
+	_scriptData = new int8[dataSize];
+	memcpy(_scriptData, data, dataSize);
+}
+
+void EobInfProcessor::run(int func, int sub) {
+	int o = _vm->_levelBlockProperties[func].assignedObjects;
+	if (!o)
+		return;
+
+	uint16 f = _vm->_levelBlockProperties[func].flags;
+
+	uint16 subFlags = ((f & 0xfff8) >> 3) | 0xe0;
+	if (!(sub & subFlags))
+		return;
+
+	_abortScript = 0;
+	_abortAfterSubroutine = 0;
+	_dlgResult = 0;
+	_activeCharacter = -1;
+
+	_lastScriptFunc = func;
+	_lastScriptSub = sub;
+
+	_vm->resetSkipFlag(true);
+
+	int8 *pos = (int8*)(_scriptData + o);
+
+	do {
+		int8 cmd = *pos++;
+		if (cmd <= _commandMin || cmd >= 0)
+			continue;
+		pos += (*_opcodes[-(cmd + 1)])(pos);
+	} while (!_abortScript && !_abortAfterSubroutine);
+}
+
+void EobInfProcessor::loadState(Common::SeekableSubReadStreamEndian &in) {
+	_script2 = in.readByte();
+	for (int i = 0; i < 18; i++)
+		_flagTable[i] = in.readUint16BE();
+}
+
+void EobInfProcessor::saveState(Common::OutSaveFile *out) {
+	out->writeByte(_script2);
+	for (int i = 0; i < 18; i++)
+		out->writeUint16BE(_flagTable[i]);
+}
+
+const char *EobInfProcessor::getString(uint16 index) {
+	if (index == 0xffff)
+		return 0;
+
+	int8 *res = _scriptData + READ_LE_UINT16(_scriptData);
+
+	while (index) {
+		if(*res++)
+			continue;
+		index--;
+	}
+
+	return (const char*)res;
+}
+
+int EobInfProcessor::oeob_setWallType(int8 *data) {
+	int8 *pos = data;
+
+	uint16 block = 0;
+	int8 dir = 0;
+
+	switch (*pos++) {
+	case -23:
+		block = READ_LE_UINT16(pos);
+		pos += 2;
+		dir = *pos++;
+		_vm->_levelBlockProperties[block].walls[dir] = *pos++;
+		_vm->checkSceneUpdateNeed(block);
+		break;
+
+	case -19:
+		_vm->_currentDirection = *pos++;
+		break;
+
+	case -9:
+		block = READ_LE_UINT16(pos);
+		pos += 2;
+		dir = *pos++;
+		memset(_vm->_levelBlockProperties[block].walls, dir, 4 * sizeof(uint8));
+		_vm->checkSceneUpdateNeed(block);
+		break;
+
+	default:
+		break;
+	}
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_toggleWallState(int8 *data) {
+	int8 *pos = data;
+
+	uint16 block = 0;
+	int8 dir = 0;
+	uint8 a = 0;
+	uint8 b = 0;
+
+	switch (*pos++) {
+	case -23:
+		block = READ_LE_UINT16(pos);
+		pos += 2;
+		dir = *pos++;
+		a = (uint8)*pos++;
+		b = (uint8)*pos++;
+		a = (_vm->_levelBlockProperties[block].walls[dir] == a) ? b : a;
+		_vm->_levelBlockProperties[block].walls[dir] = a;
+		_vm->checkSceneUpdateNeed(block);
+		break;
+
+	case -22:
+		_vm->processDoorSwitch(READ_LE_UINT16(pos), 0);
+		pos += 2;
+		break;
+
+	case -9:
+		block = READ_LE_UINT16(pos);
+		pos += 2;
+		a = (uint8)*pos++;
+		b = (uint8)*pos++;
+		a = (_vm->_levelBlockProperties[block].walls[dir] == a) ? b : a;
+		memset(_vm->_levelBlockProperties[block].walls, a, 4 * sizeof(uint8));
+		_vm->checkSceneUpdateNeed(block);
+		break;
+
+	default:
+		break;
+	}
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_openDoor(int8 *data) {
+	int8 *pos = data;
+	_vm->openDoor(READ_LE_UINT16(pos));
+	pos += 2;
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_closeDoor(int8 *data) {
+	int8 *pos = data;
+	_vm->closeDoor(READ_LE_UINT16(pos));
+	pos += 2;
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_replaceMonster(int8 *data) {
+	int8 *pos = data;
+	_vm->replaceMonster(pos[1], READ_LE_UINT16(pos + 2), pos[4], pos[5], pos[6], pos[7], pos[8], pos[9], READ_LE_UINT16(pos + 10), READ_LE_UINT16(pos + 12));
+	pos += 14;
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_movePartyOrObject(int8 *data) {
+	int8 *pos = data;
+
+	int8 a = *pos++;
+	uint16 b = 0xffff;
+	uint16 c = 0;
+	uint16 d = 0;
+
+	if (_vm->game() == GI_EOB2 && a == -31) {
+		b = READ_LE_UINT16(pos);
+		pos += 2;
+	}
+
+	if (_vm->game() == GI_EOB1) {
+		if (a != -15) {
+			c = READ_LE_UINT16(pos);
+			pos += 2;
+		}
+		d = READ_LE_UINT16(pos);
+		pos += 2;
+	}
+
+	if (_vm->game() == GI_EOB2 && a != -31 && a != -11) {
+		c = READ_LE_UINT16(pos);
+		pos += 2;
+		d = READ_LE_UINT16(pos);
+		pos += 2;
+	}
+
+	if (a == -13) {
+		// move monster from block c to block d
+		for (int i = 0; i < 30; i++) {
+			if (_vm->_monsters[i].block != c)
+				continue;
+			_vm->placeMonster(&_vm->_monsters[i], d, _vm->_monsters[i].pos);
+		}
+
+	} else if (a == -24) {
+		// move party to block d
+		int ba = _dlgResult;
+		int bb = _lastScriptFunc;
+		int bc = _lastScriptSub;
+		int bd = _abortScript;
+		int be = _activeCharacter;
+		int bf = _scriptPosStackIndex;
+
+		_vm->moveParty(d);
+
+		_dlgResult = ba;
+		_lastScriptFunc = bb;
+		_lastScriptSub = bc;
+		_abortScript = bd;
+		_activeCharacter = be;
+		if (!_abortAfterSubroutine)
+			_scriptPosStackIndex = bf;
+		_vm->_sceneDefaultUpdate = 0;
+
+	} else if ((a == -31 && _vm->game() == GI_EOB2) || a == -11) {
+		// move item
+		int8 e = _vm->_currentLevel;
+		int8 f = _vm->_currentLevel;
+
+		if (_vm->game() == GI_EOB2) {
+			e = (*pos++ == -21) ? _vm->_currentLevel : *pos++;
+			c = READ_LE_UINT16(pos);
+			pos += 2;
+			f = (*pos++ == -21) ? _vm->_currentLevel : *pos++;
+			d = READ_LE_UINT16(pos);
+			pos += 2;
+		}
+
+		if (e == _vm->_currentLevel) {
+			int i = _vm->countQueuedItems(_vm->_levelBlockProperties[c].drawObjects, -1, (int16)b, 0, 1);
+			while (i) {
+				int p = _vm->_items[i].pos;
+				_vm->getQueuedItem((Item*)&_vm->_levelBlockProperties[c].drawObjects, 0, i);
+				if (_vm->_currentLevel == f) {
+					_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[d].drawObjects, d, i, p);
+				} else {
+					_vm->_items[i].level = f;
+					_vm->_items[i].block = d;
+					if (p < 8)
+						_vm->_items[i].pos = p & 3;
+				}
+				i = _vm->countQueuedItems(_vm->_levelBlockProperties[c].drawObjects, -1, (int16)b, 0, 1);
+			}
+
+			for (i = 0; i < 10; i++) {
+				if (_vm->_flyingObjects[i].enable != 1 || _vm->_flyingObjects[i].curBlock != c)
+					continue;
+				if (f == _vm->_currentLevel || _vm->game() == GI_EOB1)
+					_vm->_flyingObjects[i].curBlock = d;
+				else
+					_vm->_flyingObjects[i].enable = 0;
+			}
+
+		} else {
+			for (int i = 0; i < 600; i++) {
+				if (_vm->_items[i].level != e || _vm->_items[i].block != c)
+					continue;
+				_vm->_items[i].level = f;
+				_vm->_items[i].block = d;
+			}
+		}
+	}
+
+	_vm->_sceneUpdateRequired = true;
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_moveInventoryItemToBlock(int8 *data) {
+	int8 *pos = data;
+	int8 c = *pos++;
+	uint16 block = READ_LE_UINT16(pos);
+	pos += 2;
+	int8 p = *pos++;
+
+	if (c == -1)
+		c = _vm->rollDice(1, 6, -1);
+
+	while (!(_vm->_characters[c].flags & 1)) {
+		if (++c == 5)
+			c = 0;
+	}
+
+	if (_vm->_currentControlMode && (_vm->_updateCharNum == c))
+		return pos - data;
+
+	int slot = _vm->rollDice(1, 27, 0);
+	int itm = 0;
+	int i = 0;
+
+	for (; i < 27; i++) {
+		if ((!_vm->_currentControlMode && slot > 1) || slot == 16)
+			continue;
+
+		itm = _vm->_characters[c].inventory[slot];
+
+		if (!itm)
+			continue;
+
+		if (_vm->_dscItemShapeMap[_vm->_items[itm].icon] >= 15)
+			break;
+
+		if (++slot == 27)
+			slot = 0;
+	}
+
+	if (i < 27 && itm) {
+		_vm->_characters[c].inventory[slot] = 0;
+		_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[block].drawObjects, block, itm, p);
+	}
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_printMessage_v1(int8 *data) {
+	static const char ColorConfig[] = { 6, 33, 2, 33, 0 };
+	char col[5];
+	int8 *pos = data;
+
+	strcpy(col, ColorConfig);
+	const char *str = (const char*) pos;
+	pos += (strlen(str) + 1);
+
+	col[1] = *pos++;
+	col[3] = *pos++;
+	_vm->txt()->printMessage(col);
+	_vm->txt()->printMessage(str);
+
+	col[1] = _screen->_curDim->unk8;
+	col[3] = _screen->_curDim->unkA;
+	_vm->txt()->printMessage(col);
+	_vm->txt()->printMessage("\r");
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_printMessage_v2(int8 *data) {
+	int8 *pos = data;
+	uint16 str = READ_LE_UINT16(pos);
+	pos += 2;
+	uint8 col = (uint8)*pos;
+	pos += 2;
+
+	int c = 0;
+	if (_activeCharacter == -1) {
+		c = _vm->rollDice(1, 6, -1);
+		while (!_vm->testCharacter(c, 3))
+			c = (c + 1) % 6;
+	} else {
+		c = _activeCharacter;
+	}
+
+	_vm->txt()->printMessage(getString(str), col, _vm->_characters[c].name);
+	_vm->txt()->printMessage("\r");
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_setFlags(int8 *data) {
+	int8 *pos = data;
+	int8 b = 0;
+
+	switch (*pos++) {
+	case -47:
+		_script2 = 0;
+		break;
+
+	case -28:
+		_dlgResult = 1;
+		break;
+
+	case -17:
+		_flagTable[_vm->_currentLevel] |= (1 << (*pos++));
+		break;
+
+	case -16:
+		_flagTable[17] |= (1 << (*pos++));
+		break;
+
+	case -13:
+		b = *pos++;
+		_vm->_monsters[b].flags |= (1 << (*pos++));
+		_vm->_monsters[b].mode = 0;
+		break;
+
+	default:
+		break;
+	}
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_playSoundEffect(int8 *data) {
+	int8 *pos = data;
+	uint16 block = READ_LE_UINT16(pos + 1);
+
+	if (block) {
+		_vm->snd_processEnvironmentalSoundEffect(pos[0], block);
+	} else {
+		_vm->snd_playSoundEffect(pos[0]);
+	}
+
+	pos += 3;
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_removeFlags(int8 *data) {
+	int8 *pos = data;
+	int8 a = *pos++;
+	int8 b = *pos++;
+
+	switch (a) {
+	case -47:
+		_script2 = 1;
+		break;
+
+	case -28:
+		_dlgResult = 0;
+		break;
+
+	case -17:
+		_flagTable[_vm->_currentLevel] &= ~(1 << b);
+		break;
+
+	case -16:
+		_flagTable[17] &= ~(1 << b);
+		break;
+
+	default:
+		break;
+	}
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_modifyCharacterHitPoints(int8 *data) {
+	int8 *pos = data;
+	int8 c = *pos++;
+	int8 p = *pos++;
+
+	if (c == -1) {
+		for (c = 0; c < 6; c++)
+			_vm->modifyCharacterHitpoints(c, p);
+	} else {
+		_vm->modifyCharacterHitpoints(c, p);
+	}
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_calcAndInflictCharacterDamage(int8 *data) {
+	int8 *pos = data;
+	int charIndex = *pos++;
+	int times = *pos++;
+	int itemOrPips = *pos++;
+	int useStrModifierOrBase = *pos++;
+
+	int flg = (charIndex == -1) ? 4 : 0;
+	int a = 5;
+	int damageType = 1;
+
+	if (_vm->game() == GI_EOB2) {
+		flg = *pos++;
+		a = *pos++;
+		damageType = *pos++;
+	} else if (!itemOrPips) {
+		useStrModifierOrBase = times;
+		times = 0;
+	}
+
+	if (charIndex == -1) {
+		for (int i = 0; i < 6; i++)
+			_vm->calcAndInflictCharacterDamage(i, times, itemOrPips, useStrModifierOrBase, flg, a, damageType);
+	} else {
+		_vm->calcAndInflictCharacterDamage(charIndex, times, itemOrPips, useStrModifierOrBase, flg, a, damageType);
+	}
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_jump(int8 *data) {
+	int8 *pos = data;
+	pos = _scriptData + READ_LE_UINT16(pos);
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_end(int8 *data) {
+	_abortScript = 1;
+	_scriptPosStackIndex = 0;
+	return 0;
+}
+
+int EobInfProcessor::oeob_popPosAndReturn(int8 *data) {
+	int8 *pos = data;
+
+	if (_scriptPosStackIndex)
+		pos = _scriptPosStack[--_scriptPosStackIndex];
+	else
+		_abortScript = 1;
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_pushPosAndJump(int8 *data) {
+	int8 *pos = data;
+	uint16 offs = READ_LE_UINT16(pos);
+	pos += 2;
+
+	if (_scriptPosStackIndex < 10) {
+		_scriptPosStack[_scriptPosStackIndex++] = pos;
+		pos = _scriptData + offs;
+	}
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_eval_v1(int8 *data) {
+	int8 *pos = data;
+	int8 cmd = *pos++;
+
+	int a = 0;
+	int b = 0;
+	int i = 0;
+	EobItem *itm = &_vm->_items[_vm->_itemInHand];
+	Common::String tempString1;
+	Common::String tempString2;
+
+	while (cmd != -18) {
+		switch (cmd + 38) {
+		case 0:
+			a = 0;
+			for (i = 0; i < 6; i++) {
+				if (!(_vm->_characters[i].flags & 1))
+					continue;
+				if (_vm->_characters[i].effectFlags & 4)
+					continue;
+				a = 1;
+				break;
+			}
+			_stack[_stackIndex++] = a;
+			break;
+
+		case 1:
+			_stack[_stackIndex++] = _vm->rollDice(pos[0], pos[1], pos[2]);
+			pos += 3;
+			break;
+
+		case 2:
+			cmd = *pos++;
+			b = 0;
+			for (i = 0; i < 6; i++) {
+				if (!(_vm->_characters[i].flags & 1))
+					continue;
+				if (_vm->_classModifierFlags[_vm->_characters[i].cClass] & cmd) {
+					b = 1;
+					break;
+				}
+			}
+			_stack[_stackIndex++] = b;
+			break;
+
+		case 3:
+			cmd = *pos++;
+			b = 0;
+			for (i = 0; i < 6; i++) {
+				if (!(_vm->_characters[i].flags & 1))
+					continue;
+				if ((_vm->_characters[a].raceSex >> 1) == cmd) {
+					b = 1;
+					break;
+				}
+			}
+			_stack[_stackIndex++] = b;
+			break;
+
+		case 6:
+			_stack[_stackIndex++] = _lastScriptSub;
+			break;
+
+		case 13:
+			itm = &_vm->_items[_vm->_itemInHand];
+			switch (*pos++) {
+			case -31:
+				_stack[_stackIndex++] = itm->type;
+				break;
+
+			case -11:
+				_stack[_stackIndex++] = _vm->_itemInHand;
+				break;
+
+			default:
+				_stack[_stackIndex++] = itm->value;
+				break;
+			}
+			break;
+
+		case 15:
+			_stack[_stackIndex++] = _vm->_levelBlockProperties[READ_LE_UINT16(pos + 1)].walls[pos[0]];
+			pos += 3;
+			break;
+
+		case 19:
+			_stack[_stackIndex++] = _vm->_currentDirection;
+			break;
+
+		case 21:
+			_stack[_stackIndex++] = (_flagTable[_vm->_currentLevel] & (1 << (*pos++))) ? 1 : 0;
+			break;
+
+		case 22:
+			_stack[_stackIndex++] = (_flagTable[17] & (1 << (*pos++))) ? 1 : 0;
+			break;
+
+		case 23:
+			_stack[_stackIndex++] = (_vm->_currentBlock == READ_LE_UINT16(pos)) ? 1 : 0;
+			pos += 2;
+			break;
+
+		case 24:
+			a = (int16)READ_LE_UINT16(pos);
+			pos += 2;
+			b = READ_LE_UINT16(pos);
+			pos += 2;
+			_stack[_stackIndex++] = _vm->countQueuedItems(_vm->_levelBlockProperties[b].drawObjects, a, -1, 0, 1);
+			break;
+
+		case 25:
+			_stack[_stackIndex++] = _vm->_levelBlockProperties[READ_LE_UINT16(pos)].flags ? 1 : 0;
+			pos += 2;
+			break;
+
+		case 27:
+			b = *pos++;
+			i = READ_LE_UINT16(pos);
+			pos += 2;
+			_stack[_stackIndex++] = _vm->countQueuedItems(_vm->_levelBlockProperties[i].drawObjects, -1, b, 1, 1);
+			break;
+
+		case 29:
+			_stack[_stackIndex++] = _vm->_levelBlockProperties[READ_LE_UINT16(pos)].walls[0];
+			pos += 2;
+			break;
+
+		case 30:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a || b) ? 1 : 0;
+			break;
+
+		case 31:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a && b) ? 1 : 0;
+			break;
+
+		case 32:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a <= b) ? 1 : 0;
+			break;
+
+		case 33:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a < b) ? 1 : 0;
+			break;
+
+		case 34:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a >= b) ? 1 : 0;
+			break;
+
+		case 35:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a > b) ? 1 : 0;
+			break;
+
+		case 36:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a != b) ? 1 : 0;
+			break;
+
+		case 37:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a == b) ? 1 : 0;
+			break;
+
+		default:
+			a = cmd;
+			if (a >= 0 && a < 128)
+				_stack[_stackIndex++] = a;
+			break;
+		}
+		cmd = *pos++;
+	}
+
+	cmd = _stack[--_stackIndex];
+	if (cmd)
+		pos += 2;
+	else
+		pos = _scriptData + READ_LE_UINT16(pos);
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_eval_v2(int8 *data) {
+	int8 *pos = data;
+	int8 cmd = *pos++;
+
+	int a = 0;
+	int b = 0;
+	int i = 0;
+	EobItem *itm = (_vm->_itemInHand != -1) ? &_vm->_items[_vm->_itemInHand] : 0;
+	Common::String tempString1;
+	Common::String tempString2;
+
+	while (cmd != -18) {
+		switch (cmd + 50) {
+		case 0:
+			a = 0;
+			b = *pos++;
+
+			for (i = 0; i < 6; i++) {
+				if (!_vm->testCharacter(i, 5))
+					continue;
+
+				if (_vm->_characters[i].portrait != b) {
+					a = 1;
+					_activeCharacter = i;
+					break;
+				}
+			}
+
+			_stack[_stackIndex++] = a;
+			break;
+
+		case 4:
+			_stack[_stackIndex++] = (int16)READ_LE_UINT16(pos);
+			pos += 2;
+			break;
+
+		case 9:
+			switch (*pos++) {
+			case -36:
+				_stack[_stackIndex++] = _vm->_itemTypes[_vm->_items[_vm->_lastUsedItem].type].extraProperties & 0x7f;
+				break;
+			case -31:
+				_stack[_stackIndex++] = _vm->_items[_vm->_lastUsedItem].type;
+				break;
+			case -11:
+				_stack[_stackIndex++] = _vm->_lastUsedItem;
+				break;
+			case -10:
+				_stack[_stackIndex++] = _vm->_items[_vm->_lastUsedItem].value;
+				break;
+			default:
+				break;
+			}
+			break;
+
+		case 12:
+			a = 0;
+			for (i = 0; i < 6; i++) {
+				if (!(_vm->_characters[i].flags & 1))
+					continue;
+				if (_vm->_characters[i].effectFlags & 0x40)
+					continue;
+				a = 1;
+				break;
+			}
+			_stack[_stackIndex++] = a;
+			break;
+
+		case 13:
+			_stack[_stackIndex++] = _vm->rollDice(pos[0], pos[1], pos[2]);
+			pos += 3;
+			break;
+
+		case 14:
+			cmd = *pos++;
+			a = _vm->rollDice(1, 6);
+			b = 0;
+			for (i = 0; i < 6 && b == 0; i++) {
+				if (++a > 5)
+					a = 0;
+				if (_vm->testCharacter(a, 5)) {
+					if (_vm->_classModifierFlags[_vm->_characters[a].cClass] & cmd) {
+						_activeCharacter = a;
+						b = 1;
+					}
+				}
+			}
+			_stack[_stackIndex++] = b;
+			break;
+
+		case 15:
+			cmd = *pos++;
+			a = _vm->rollDice(1, 6);
+			b = 0;
+			for (i = 0; i < 6; i++) {
+				if (++a > 5)
+					a = 0;
+				if (_vm->testCharacter(a, 5)) {
+					if ((_vm->_characters[a].raceSex >> 1) == cmd) {
+						_activeCharacter = a;
+						b = 1;
+					}
+				}
+			}
+			_stack[_stackIndex++] = b;
+			break;
+
+		case 17:
+			_stack[_stackIndex++] = _vm->_activeSpell;
+			break;
+
+		case 18:
+			_stack[_stackIndex++] = _lastScriptSub;
+			break;
+
+		case 22:
+			_stack[_stackIndex++] = _dlgResult;
+			break;
+
+		case 25:
+			itm = &_vm->_items[_vm->_itemInHand];
+
+			switch (*pos++) {
+			case -49:
+				a = *pos++;
+				tempString1 = _vm->_itemNames[itm->nameId];
+				tempString1.toUppercase();
+				tempString2 = (const char*)pos;
+				tempString2.toUppercase();
+				pos += a;
+				_stack[_stackIndex++] = tempString1.contains(tempString2) ? 1 : 0;
+				break;
+
+			case -48:
+				a = *pos++;
+				tempString1 = _vm->_itemNames[itm->nameUnid];
+				tempString1.toUppercase();
+				tempString2 = (const char*)pos;
+				tempString2.toUppercase();
+				pos += a;
+				_stack[_stackIndex++] = tempString1.contains(tempString2) ? 1 : 0;
+				break;
+
+			case -31:
+				_stack[_stackIndex++] = itm->type;
+				break;
+
+			case -11:
+				_stack[_stackIndex++] = _vm->_itemInHand;
+				break;
+
+			case -10:
+				_stack[_stackIndex++] = itm->value;
+				break;
+
+			default:
+				break;
+			}
+
+			break;
+
+		case 26:
+			a = 0;
+			for (i = 0; i < 6; i++) {
+				if (_vm->testCharacter(i, 0x0f))
+					a++;
+			}
+			_stack[_stackIndex++] = a;
+			break;
+
+		case 27:
+			_stack[_stackIndex++] = _vm->_levelBlockProperties[READ_LE_UINT16(pos + 1)].walls[pos[0]];
+			pos += 3;
+			break;
+
+		case 31:
+			_stack[_stackIndex++] = _vm->_currentDirection;
+			break;
+
+		case 33:
+			_stack[_stackIndex++] = (_flagTable[_vm->_currentLevel] & (1 << (*pos++))) ? 1 : 0;
+			break;
+
+		case 34:
+			_stack[_stackIndex++] = (_flagTable[17] & (1 << (*pos++))) ? 1 : 0;
+			break;
+
+		case 35:
+			if (*pos++ == -11) {
+				a = (int16)READ_LE_UINT16(pos);
+				pos += 2;
+				b = (int16)READ_LE_UINT16(pos);
+				pos += 2;
+				_stack[_stackIndex++] = _vm->countCharactersWithSpecificItems(a, b);
+			} else {
+				_stack[_stackIndex++] = (_vm->_currentBlock == READ_LE_UINT16(pos)) ? 1 : 0;
+				pos += 2;
+			}
+			break;
+
+		case 36:
+			a = (int16)READ_LE_UINT16(pos);
+			pos += 2;
+			b = READ_LE_UINT16(pos);
+			pos += 2;
+			_stack[_stackIndex++] = _vm->countQueuedItems(_vm->_levelBlockProperties[b].drawObjects, a, -1, 0, 0);
+			break;
+
+		case 37:
+			if (*pos++ == -1) {
+				_stack[_stackIndex++] = _vm->_levelBlockProperties[READ_LE_UINT16(pos)].flags & 7;
+				pos += 2;
+			} else {
+				do {
+					a += _vm->countSpecificMonsters(*pos++);
+				} while (*pos != -1);
+				pos++;
+				_stack[_stackIndex++] = a;
+			}
+			break;
+
+		case 39:
+			a = *pos++;
+			b = *pos++;
+			i = READ_LE_UINT16(pos);
+			pos += 2;
+			_stack[_stackIndex++] = _vm->countQueuedItems(_vm->_levelBlockProperties[i].drawObjects, -1, b, 1, a);
+			break;
+
+		case 41:
+			_stack[_stackIndex++] = _vm->_levelBlockProperties[READ_LE_UINT16(pos)].walls[0];
+			pos += 2;
+			break;
+
+		case 42:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a || b) ? 1 : 0;
+			break;
+
+		case 43:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a && b) ? 1 : 0;
+			break;
+
+		case 44:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a <= b) ? 1 : 0;
+			break;
+
+		case 45:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a < b) ? 1 : 0;
+			break;
+
+		case 46:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a >= b) ? 1 : 0;
+			break;
+
+		case 47:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a > b) ? 1 : 0;
+			break;
+
+		case 48:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a != b) ? 1 : 0;
+			break;
+
+		case 49:
+			a = _stack[--_stackIndex];
+			b = _stack[--_stackIndex];
+			_stack[_stackIndex++] = (a == b) ? 1 : 0;
+			break;
+
+		default:
+			break;
+		}
+		cmd = *pos++;
+	}
+
+	cmd = _stack[--_stackIndex];
+	if (cmd)
+		pos += 2;
+	else
+		pos = _scriptData + READ_LE_UINT16(pos);
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_deleteItem(int8 *data) {
+	int8 *pos = data;
+	int8 c = *pos++;
+	if (c == -1) {
+		_vm->deleteInventoryItem(0, -1);
+	} else {
+		_vm->deleteBlockItem(READ_LE_UINT16(pos), (c == -2) ? -1 : c);
+		pos += 2;
+	}
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_loadNewLevelOrMonsters(int8 *data) {
+	int8 *pos = data;
+	_vm->gui_updateControls();
+
+	int8 cmd = *pos++;
+	int8 index = *pos++;
+	int res = 0;
+
+	if (cmd == -27 || _vm->game() == GI_EOB1) {
+		cmd = _vm->game() == GI_EOB2 ? *pos++ : 0;
+		_vm->_currentBlock = READ_LE_UINT16(pos);
+		pos += 2;
+		uint8 dir = (uint8)*pos++;
+
+		if (dir != 0xff)
+			_vm->_currentDirection = dir;
+
+		for (int i = 0; i < 30; i++)
+			_vm->_monsters[i].curAttackFrame = 0;
+
+		for (int i = 0; i < 10; i++) {
+			EobFlyingObject *fo = &_vm->_flyingObjects[i];
+			if (fo->enable == 1) {
+				_vm->_items[fo->item].pos &= 3;
+				run(_vm->_items[fo->item].block, 4);
+			}
+			fo->enable = 0;
+		}
+
+		_vm->completeDoorOperations();
+
+		_vm->generateTempData();
+		_vm->txt()->removePageBreakFlag();
+		_screen->setScreenDim(7);
+
+		_vm->loadLevel(index, cmd);
+
+		if (_vm->_dialogueField)
+			_vm->restoreAfterDialogueSequence();
+
+		_vm->moveParty(_vm->_currentBlock);
+
+		_abortScript = 1;
+		_abortAfterSubroutine = 1;
+		_vm->_sceneUpdateRequired = true;
+
+		_vm->gui_drawAllCharPortraitsWithStats();
+		_scriptPosStackIndex = 0;
+
+	} else {
+		cmd = *pos++;
+		_vm->releaseMonsterShapes(cmd * 18, 18);
+		_vm->loadMonsterShapes((const char*)pos, cmd * 18, true, index * 18);
+		pos += 13;
+		_vm->gui_restorePlayField();
+		res = pos - data;
+	}
+
+	return res;
+}
+
+int EobInfProcessor::oeob_increasePartyExperience(int8 *data) {
+	int8 *pos = data;
+	if (*pos++ == -30) {
+		_vm->increasePartyExperience((int16)READ_LE_UINT16(pos));
+		pos += 2;
+	}
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_createItem_v1(int8 *data) {
+	int8 *pos = data;
+	uint16 itm = _vm->duplicateItem(READ_LE_UINT16(pos));
+	pos += 2;
+	uint16 block = READ_LE_UINT16(pos);
+	pos += 2;
+	uint8 itmPos = *pos++;
+
+	if (itm) {
+		if (block == 0xffff && !_vm->_itemInHand)
+			_vm->setHandItem(itm);
+		else if (block != 0xffff )
+			_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[block & 0x3ff].drawObjects, block, itm, itmPos);
+	}
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_createItem_v2(int8 *data) {
+	static const uint8 _itemPos[] = { 0, 1, 2, 3, 1, 3, 0, 2, 3, 2, 1, 0, 2, 0, 3, 1 };
+	int8 *pos = data;
+
+	uint16 itm = _vm->duplicateItem(READ_LE_UINT16(pos));
+	pos += 2;
+	uint16 block = READ_LE_UINT16(pos);
+	pos += 2;
+	uint8 itmPos = *pos++;
+	uint8 flg = *pos++;
+
+	if (flg & 1)
+		_vm->_items[itm].value = *pos++;
+
+	if (flg & 2)
+		_vm->_items[itm].flags = *pos++;
+
+	if (flg & 4)
+		_vm->_items[itm].icon = *pos++;
+
+	if (!itm)
+		return pos - data;
+
+	if (block == 0xffff) {
+		if (!_vm->_itemInHand)
+			_vm->setHandItem(itm);
+		else
+			_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[_vm->_currentBlock & 0x3ff].drawObjects, _vm->_currentBlock, itm, _itemPos[_vm->rollDice(1, 2, -1)]);
+	} else if (block == 0xfffe) {
+		_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[_vm->_currentBlock & 0x3ff].drawObjects, _vm->_currentBlock, itm, _itemPos[(_vm->_currentDirection << 2) + _vm->rollDice(1, 2, -1)]);
+	} else {
+		_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[block & 0x3ff].drawObjects, block, itm, itmPos);
+	}
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_launchObject(int8 *data) {
+	static const uint8 startPos[] = { 2, 3, 0, 2, 1, 0, 3, 1 };
+
+	int8 *pos = data;
+	bool m = (*pos++ == -33);
+	int i = READ_LE_UINT16(pos);
+	pos += 2;
+	uint16 block = READ_LE_UINT16(pos);
+	pos += 2;
+	int dir = *pos++;
+	int dirOffs =  *pos++;
+
+	if (m) {
+		uint8 openBookType = _vm->_openBookType;
+		_vm->_openBookType = 0;
+		_vm->launchMagicObject(-1, i, block, startPos[dir * 2 + dirOffs], dir);
+		_vm->_openBookType = openBookType;
+	} else {
+		Item itm = _vm->duplicateItem(i);
+		if (itm) {
+			if (!_vm->launchObject(-1, itm, block, startPos[dir * 2 + dirOffs], dir, _vm->_items[itm].type))
+				_vm->_items[itm].block = -1;
+		}
+	}
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_changeDirection(int8 *data) {
+	int8 *pos = data;
+
+	int8 cmd = *pos++;
+	int8 dir = *pos++;
+
+	if (cmd == -15) {
+		_vm->_currentDirection = (_vm->_currentDirection + dir) & 3;
+		//_vm->_keybControlUnk = -1;
+		_vm->_sceneUpdateRequired = true;
+
+	} else if (cmd == -11) {
+		for (int i = 0; i < 10; i++) {
+			if (_vm->_flyingObjects[i].enable)
+				_vm->_flyingObjects[i].direction = (_vm->_flyingObjects[i].direction + dir) & 3;
+		}
+	}
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_identifyItems(int8 *data) {
+	int8 *pos = data;
+	uint16 block = READ_LE_UINT16(pos);
+
+	if (block == _vm->_currentBlock) {
+		for (int i = 0; i < 6; i++) {
+			if (!(_vm->_characters[i].flags & 1))
+				continue;
+
+			for (int ii = 0; ii < 27; ii++) {
+				int inv = _vm->_characters[i].inventory[ii];
+				if (inv)
+					_vm->_items[inv].flags |= 0x40;
+			}
+
+			_vm->identifyQueuedItems(_vm->_characters[i].inventory[16]);
+		}
+	}
+
+	_vm->identifyQueuedItems(_vm->_levelBlockProperties[block].drawObjects);
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_sequence(int8 *data) {
+	int8 *pos = data;
+	_vm->_dlgUnk1 = -1;
+	_vm->txt()->setWaitButtonMode(0);
+	_vm->gui_updateControls();
+	_vm->drawScene(1);
+
+	int cmd = *pos++;
+
+	if (_vm->game() == GI_EOB1) {
+		if (cmd == 10)
+			cmd = -1;
+		else if (cmd == 9)
+			cmd = -3;
+		else if (cmd == 8)
+			cmd = -2;
+	}
+
+	switch (cmd) {
+	case -3:
+		// eob1 outro
+		_vm->_runFlag = false;
+		_vm->_playFinale = true;
+		_abortScript = 1;
+		return 0;
+
+	case -2:
+		// portal sequence
+		pos=pos;
+		break;
+
+	case -1:
+		// copy protection
+		pos=pos;
+		break;
+
+	default:
+		_vm->npcSequence(cmd);
+		break;
+	}
+	_vm->screen()->setScreenDim(7);
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_delay(int8 *data) {
+	int8 *pos = data;
+	_vm->delay(READ_LE_UINT16(pos) * _vm->tickLength());
+	pos += 2;
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_drawScene(int8 *data) {
+	_vm->drawScene(1);
+	return 0;
+}
+
+int EobInfProcessor::oeob_dialogue(int8 *data) {
+	int8 *pos = data;
+
+	switch (*pos++) {
+		case -45:
+			_vm->drawSequenceBitmap((const char*)pos, pos[13], READ_LE_UINT16(pos + 14), READ_LE_UINT16(pos + 16), READ_LE_UINT16(pos + 18));
+			pos += 20;
+			break;
+
+		case -44:
+			_vm->restoreAfterDialogueSequence();
+			break;
+
+		case -43:
+			_vm->initDialogueSequence();
+			break;
+
+		case -42:
+			_vm->gui_drawDialogueBox();
+			break;
+
+		case -40:
+			_dlgResult = _vm->runDialogue(READ_LE_UINT16(pos), READ_LE_UINT16(pos + 6) == 0xffff ? 0 : 1, getString(READ_LE_UINT16(pos + 2)), getString(READ_LE_UINT16(pos + 4)), getString(READ_LE_UINT16(pos + 6)), 0);
+			pos += 8;
+			break;
+
+		case -8:
+			_vm->txt()->printDialogueText(READ_LE_UINT16(pos), getString(READ_LE_UINT16(pos + 2)));
+			pos += 4;
+			break;
+
+		default:
+			break;
+	}
+
+	return pos - data;
+}
+
+int EobInfProcessor::oeob_specialEvent(int8 *data) {
+	int8 *pos = data;
+	uint16 cmd = READ_LE_UINT16(pos);
+	pos += 2;
+
+	uint32 endTime = 0;
+	int i = 0;
+
+	switch (cmd) {
+		case 0:
+			_vm->drawScene(1);
+			_screen->_curPage = 2;
+			_screen->copyRegion(72, 0, 0, 0, 32, 120, 2, 12, Screen::CR_NO_P_CHECK);
+
+			for (; i < 4; i++) {
+				endTime = _vm->_system->getMillis() + _vm->_tickLength;
+				_vm->drawLightningColumn();
+				_screen->copyRegion(72, 0, 72, 0, 32, 120, 2, 0, Screen::CR_NO_P_CHECK);
+				_screen->updateScreen();
+				_screen->copyRegion(0, 0, 72, 0, 32, 120, 12, 2, Screen::CR_NO_P_CHECK);
+				_vm->delayUntil(endTime);
+			}
+
+			_screen->_curPage = 0;
+			_vm->_sceneUpdateRequired = true;
+			break;
+
+		case 1:
+			_dlgResult = _vm->charSelectDialogue();
+			break;
+
+		case 2:
+			_vm->characterLevelGain(_dlgResult);
+			break;
+
+		case 3:
+			_dlgResult = _vm->resurrectionSelectDialogue();
+			break;
+
+		case 4:
+			if (_vm->prepareForNewPartyMember(33, 5))
+				_vm->initNpc(4);
+			break;
+
+		case 5:
+			_vm->deletePartyItem(46, 5);
+			_vm->deletePartyItem(46, 6);
+			break;
+
+		case 6:
+			_vm->loadVcnData(0, 0);
+			break;
+
+		default:
+			break;
+	}
+
+	return pos - data;
+}
+
+} // End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h
new file mode 100644
index 0000000000..2b02807531
--- /dev/null
+++ b/engines/kyra/script_eob.h
@@ -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.
+ *
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#ifndef KYRA_SCRIPT_EOB_H
+#define KYRA_SCRIPT_EOB_H
+
+#include "common/func.h"
+#include "common/substream.h"
+#include "common/savefile.h"
+
+namespace Kyra {
+
+class LolEobBaseEngine;
+
+class EobInfProcessor {
+public:
+	EobInfProcessor(EobCoreEngine *engine, Screen_Eob *_screen);
+	~EobInfProcessor();
+
+	void loadData(const uint8 *data, uint32 dataSize);
+	void run(int func, int sub);
+
+	void setFlag(int flag) { _flagTable[17] |= flag; }
+	bool checkFlag(int flag) { return (_flagTable[17] & flag) ? true : false; }
+
+	void loadState(Common::SeekableSubReadStreamEndian &in);
+	void saveState(Common::OutSaveFile *out);
+
+private:
+	const char *getString(uint16 index);
+
+	int oeob_setWallType(int8 *data);
+	int oeob_toggleWallState(int8 *data);
+	int oeob_openDoor(int8 *data);
+	int oeob_closeDoor(int8 *data);
+	int oeob_replaceMonster(int8 *data);
+	int oeob_movePartyOrObject(int8 *data);
+	int oeob_moveInventoryItemToBlock(int8 *data);
+	int oeob_printMessage_v1(int8 *data);
+	int oeob_printMessage_v2(int8 *data);
+	int oeob_setFlags(int8 *data);
+	int oeob_playSoundEffect(int8 *data);
+	int oeob_removeFlags(int8 *data);
+	int oeob_modifyCharacterHitPoints(int8 *data);
+	int oeob_calcAndInflictCharacterDamage(int8 *data);
+	int oeob_jump(int8 *data);
+	int oeob_end(int8 *data);
+	int oeob_popPosAndReturn(int8 *data);
+	int oeob_pushPosAndJump(int8 *data);
+	int oeob_eval_v1(int8 *data);
+	int oeob_eval_v2(int8 *data);
+	int oeob_deleteItem(int8 *data);
+	int oeob_loadNewLevelOrMonsters(int8 *data);
+	int oeob_increasePartyExperience(int8 *data);
+	int oeob_createItem_v1(int8 *data);
+	int oeob_createItem_v2(int8 *data);
+	int oeob_launchObject(int8 *data);
+	int oeob_changeDirection(int8 *data);
+	int oeob_identifyItems(int8 *data);
+	int oeob_sequence(int8 *data);
+	int oeob_delay(int8 *data);
+	int oeob_drawScene(int8 *data);
+	int oeob_dialogue(int8 *data);
+	int oeob_specialEvent(int8 *data);
+
+	EobCoreEngine *_vm;
+	Screen_Eob *_screen;
+
+	typedef Common::Functor1Mem<int8*, int, EobInfProcessor> InfProc;
+	Common::Array<const InfProc*> _opcodes;
+
+	int8 *_scriptData;
+
+	uint8 _abortScript;
+	uint16 _abortAfterSubroutine;
+	int _dlgResult;
+	uint8 _script2;
+
+	uint16 _lastScriptFunc;
+	uint16 _lastScriptSub;
+
+	int8 **_scriptPosStack;
+	int _scriptPosStackIndex;
+
+	uint32 *_flagTable;
+
+	int16 *_stack;
+	int _stackIndex;
+
+	int8 _activeCharacter;
+
+	const int _commandMin;
+};
+
+} // End of namespace Kyra
+
+#endif
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp
index b80b8105a1..73b6915c89 100644
--- a/engines/kyra/script_hof.cpp
+++ b/engines/kyra/script_hof.cpp
@@ -1480,7 +1480,7 @@ typedef Common::Functor2Mem<const TIM *, const uint16 *, int, KyraEngine_HoF> TI
 #define OpcodeTimUnImpl() _timOpcodes.push_back(new TIMOpcodeV2(this, 0))
 
 void KyraEngine_HoF::setupOpcodeTable() {
-	Common::Array<const Opcode *> *table = 0;
+	Common::Array<const Opcode*> *table = 0;
 
 	_opcodes.reserve(176);
 	SetOpcodeTable(_opcodes);
diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp
index 4d40971124..ae6fb4b5e5 100644
--- a/engines/kyra/script_lok.cpp
+++ b/engines/kyra/script_lok.cpp
@@ -1754,7 +1754,7 @@ typedef Common::Functor1Mem<EMCState *, int, KyraEngine_LoK> OpcodeV1;
 #define SetOpcodeTable(x) table = &x;
 #define Opcode(x) table->push_back(new OpcodeV1(this, &KyraEngine_LoK::x))
 void KyraEngine_LoK::setupOpcodeTable() {
-	Common::Array<const Opcode *> *table = 0;
+	Common::Array<const Opcode*> *table = 0;
 
 	_opcodes.reserve(157);
 	SetOpcodeTable(_opcodes);
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp
index d8ba32ce09..ead7e17f4c 100644
--- a/engines/kyra/script_lol.cpp
+++ b/engines/kyra/script_lol.cpp
@@ -93,25 +93,6 @@ void LoLEngine::runLevelScriptCustom(int block, int flags, int charNum, int item
 	checkSceneUpdateNeed(block);
 }
 
-bool LoLEngine::checkSceneUpdateNeed(int func) {
-	if (_sceneUpdateRequired)
-		return true;
-
-	for (int i = 0; i < 15; i++) {
-		if (_visibleBlockIndex[i] == func) {
-			_sceneUpdateRequired = true;
-			return true;
-		}
-	}
-
-	if (_currentBlock == func){
-		_sceneUpdateRequired = true;
-		return true;
-	}
-
-	return false;
-}
-
 int LoLEngine::olol_setWallType(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_setWallType(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	if (stackPos(2) != -1) {
@@ -796,9 +777,9 @@ int LoLEngine::olol_updateBlockAnimations(EMCState *script) {
 	return 0;
 }
 
-int LoLEngine::olol_mapShapeToBlock(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_mapShapeToBlock(%p) (%d)", (const void *)script, stackPos(0));
-	return assignLevelShapes(stackPos(0));
+int LoLEngine::olol_assignLevelDecorationShape(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_assignLevelDecorationShape(%p) (%d)", (const void *)script, stackPos(0));
+	return assignLevelDecorationShapes(stackPos(0));
 }
 
 int LoLEngine::olol_resetBlockShapeAssignment(EMCState *script) {
@@ -830,11 +811,11 @@ int LoLEngine::olol_initMonster(EMCState *script) {
 		return -1;
 
 	for (uint8 i = 0; i < 30; i++) {
-		MonsterInPlay *l = &_monsters[i];
+		LolMonsterInPlay *l = &_monsters[i];
 		if (l->hitPoints || l->mode == 13)
 			continue;
 
-		memset(l, 0, sizeof(MonsterInPlay));
+		memset(l, 0, sizeof(LolMonsterInPlay));
 		l->id = i;
 		l->x = x;
 		l->y = y;
@@ -945,7 +926,7 @@ int LoLEngine::olol_loadMonsterProperties(EMCState *script) {
 		stackPos(28), stackPos(29), stackPos(30), stackPos(31), stackPos(32), stackPos(33), stackPos(34),
 		stackPos(35), stackPos(36), stackPos(37), stackPos(38), stackPos(39), stackPos(40), stackPos(41));
 
-	MonsterProperty *l = &_monsterProperties[stackPos(0)];
+	LolMonsterProperty *l = &_monsterProperties[stackPos(0)];
 	l->shapeIndex = stackPos(1) & 0xff;
 
 	int shpWidthMax = 0;
@@ -1017,7 +998,7 @@ int LoLEngine::olol_inflictDamage(EMCState *script) {
 
 int LoLEngine::olol_moveMonster(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_moveMonster(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
-	MonsterInPlay *m = &_monsters[stackPos(0)];
+	LolMonsterInPlay *m = &_monsters[stackPos(0)];
 
 	if (m->mode == 1 || m->mode == 2) {
 		calcCoordinates(m->destX, m->destY, stackPos(1), stackPos(2), stackPos(3));
@@ -1029,10 +1010,9 @@ int LoLEngine::olol_moveMonster(EMCState *script) {
 	return 1;
 }
 
-int LoLEngine::olol_dialogueBox(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_dialogueBox(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
-
-	_tim->drawDialogueBox(stackPos(0), getLangString(stackPos(1)), getLangString(stackPos(2)), getLangString(stackPos(3)));
+int LoLEngine::olol_setupDialogueButtons(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_setupDialogueButtons(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	setupDialogueButtons(stackPos(0), getLangString(stackPos(1)), getLangString(stackPos(2)), getLangString(stackPos(3)));
 	return 1;
 }
 
@@ -1194,7 +1174,7 @@ int LoLEngine::olol_playSoundEffect(EMCState *script) {
 
 int LoLEngine::olol_processDialogue(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_processDialogue(%p)", (const void *)script);
-	return _tim->processDialogue();
+	return processDialogue();
 }
 
 int LoLEngine::olol_stopTimScript(EMCState *script) {
@@ -1213,7 +1193,7 @@ int LoLEngine::olol_changeMonsterStat(EMCState *script) {
 	if (stackPos(0) == -1)
 		return 1;
 
-	MonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
+	LolMonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
 
 	int16 d = stackPos(2);
 	uint16 x = 0;
@@ -1254,7 +1234,7 @@ int LoLEngine::olol_getMonsterStat(EMCState *script) {
 	if (stackPos(0) == -1)
 		return 0;
 
-	MonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
+	LolMonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
 	int d = stackPos(1);
 
 	switch (d) {
@@ -1567,7 +1547,7 @@ int LoLEngine::olol_moveBlockObjects(EMCState *script) {
 
 			l &= 0x7fff;
 
-			MonsterInPlay *m = &_monsters[l];
+			LolMonsterInPlay *m = &_monsters[l];
 
 			setMonsterMode(m, 14);
 			checkSceneUpdateNeed(m->block);
@@ -1582,8 +1562,8 @@ int LoLEngine::olol_moveBlockObjects(EMCState *script) {
 			placeMoveLevelItem(l, level, destBlock, _itemsInPlay[l].x & 0xff, _itemsInPlay[l].y & 0xff, _itemsInPlay[l].flyingHeight);
 			res = 1;
 
-			if (!runScript || level != _currentLevel)				
-				continue;			
+			if (!runScript || level != _currentLevel)
+				continue;
 
 			runLevelScriptCustom(destBlock, 0x80, -1, l, 0, 0);
 		}
@@ -1638,7 +1618,7 @@ int LoLEngine::olol_dummy1(EMCState *script) {
 
 int LoLEngine::olol_suspendMonster(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_suspendMonster(%p) (%d)", (const void *)script, stackPos(0));
-	MonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
+	LolMonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
 	setMonsterMode(m, 14);
 	checkSceneUpdateNeed(m->block);
 	placeMonster(m, 0, 0);
@@ -1889,9 +1869,9 @@ int LoLEngine::olol_checkBlockForMonster(EMCState *script) {
 	return -1;
 }
 
-int LoLEngine::olol_transformRegion(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_transformRegion(%p) (%d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7));
-	transformRegion(stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7));
+int LoLEngine::olol_crossFadeRegion(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_crossFadeRegion(%p) (%d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7));
+	_screen->crossFadeRegion(stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7));
 	return 1;
 }
 
@@ -1984,7 +1964,7 @@ int LoLEngine::olol_getAnimationLastPart(EMCState *script) {
 int LoLEngine::olol_assignSpecialGuiShape(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_assignSpecialGuiShape(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	if (stackPos(0)) {
-		_specialGuiShape = _levelShapes[_levelShapeProperties[_wllShapeMap[stackPos(0)]].shapeIndex[stackPos(1)]];
+		_specialGuiShape = _levelDecorationShapes[_levelDecorationProperties[_wllShapeMap[stackPos(0)]].shapeIndex[stackPos(1)]];
 		_specialGuiShapeX = stackPos(2);
 		_specialGuiShapeY = stackPos(3);
 		_specialGuiShapeMirrorFlag = stackPos(4);
@@ -2291,10 +2271,10 @@ int LoLEngine::olol_calcNewBlockPosition(EMCState *script) {
 	return calcNewBlockPosition(stackPos(0), stackPos(1));
 }
 
-int LoLEngine::olol_fadeScene(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_fadeScene(%p)", (const void *)script);
+int LoLEngine::olol_crossFadeScene(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_crossFadeScene(%p)", (const void *)script);
 	gui_drawScene(2);
-	transformRegion(112, 0, 112, 0, 176, 120, 2, 0);
+	_screen->crossFadeRegion(112, 0, 112, 0, 176, 120, 2, 0);
 	updateDrawPage2();
 	return 1;
 }
@@ -2700,7 +2680,7 @@ typedef Common::Functor2Mem<const TIM *, const uint16 *, int, LoLEngine> TIMOpco
 #define OpcodeTimUnImpl() timTable->push_back(new TIMOpcodeLoL(this, 0))
 
 void LoLEngine::setupOpcodeTable() {
-	Common::Array<const Opcode *> *table = 0;
+	Common::Array<const Opcode*> *table = 0;
 
 	_opcodes.reserve(192);
 	SetOpcodeTable(_opcodes);
@@ -2784,7 +2764,7 @@ void LoLEngine::setupOpcodeTable() {
 
 	// 0x34
 	Opcode(olol_updateBlockAnimations);
-	Opcode(olol_mapShapeToBlock);
+	Opcode(olol_assignLevelDecorationShape);
 	Opcode(olol_resetBlockShapeAssignment);
 	Opcode(olol_copyRegion);
 
@@ -2808,7 +2788,7 @@ void LoLEngine::setupOpcodeTable() {
 
 	// 0x44
 	Opcode(olol_moveMonster);
-	Opcode(olol_dialogueBox);
+	Opcode(olol_setupDialogueButtons);
 	Opcode(olol_giveTakeMoney);
 	Opcode(olol_checkMoney);
 
@@ -2933,7 +2913,7 @@ void LoLEngine::setupOpcodeTable() {
 	Opcode(olol_checkBlockForMonster);
 
 	// 0x98
-	Opcode(olol_transformRegion);
+	Opcode(olol_crossFadeRegion);
 	Opcode(olol_calcCoordinatesAddDirectionOffset);
 	Opcode(olol_resetPortraitsAndDisableSysTimer);
 	Opcode(olol_enableSysTimer);
@@ -2981,7 +2961,7 @@ void LoLEngine::setupOpcodeTable() {
 	Opcode(olol_calcNewBlockPosition);
 
 	// 0xB8
-	Opcode(olol_fadeScene);
+	Opcode(olol_crossFadeScene);
 	Opcode(olol_updateDrawPage2);
 	Opcode(olol_setMouseCursor);
 	Opcode(olol_characterSays);
@@ -2992,7 +2972,7 @@ void LoLEngine::setupOpcodeTable() {
 	Opcode(olol_getLanguage);
 	Opcode(olol_dummy0);
 
-	Common::Array<const TIMOpcode *> *timTable = 0;
+	Common::Array<const TIMOpcode*> *timTable = 0;
 
 	_timIntroOpcodes.reserve(8);
 	SetTimOpcodeTable(_timIntroOpcodes);
diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp
index afe11aba02..56b2a48b89 100644
--- a/engines/kyra/script_mr.cpp
+++ b/engines/kyra/script_mr.cpp
@@ -1129,7 +1129,7 @@ typedef Common::Functor1Mem<EMCState *, int, KyraEngine_MR> OpcodeV3;
 #define Opcode(x) table->push_back(new OpcodeV3(this, &KyraEngine_MR::x))
 #define OpcodeUnImpl() table->push_back(new OpcodeV3(this, 0))
 void KyraEngine_MR::setupOpcodeTable() {
-	Common::Array<const Opcode *> *table = 0;
+	Common::Array<const Opcode*> *table = 0;
 
 	_opcodes.reserve(176);
 	SetOpcodeTable(_opcodes);
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index 83d03d1f63..75977fc87c 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -135,7 +135,7 @@ bool TIMInterpreter::callback(Common::IFFChunk &chunk) {
 	return false;
 }
 
-TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpcode *> *opcodes) {
+TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpcode*> *opcodes) {
 	if (!_vm->resource()->exists(filename))
 		return 0;
 
@@ -833,18 +833,6 @@ int TIMInterpreter::cmd_stopFuncNow(const uint16 *param) {
 	return 1;
 }
 
-int TIMInterpreter::cmd_stopAllFuncs(const uint16 *param) {
-	while (_currentTim->dlgFunc == -1 && _currentTim->clickedButton == 0 && !_vm->shouldQuit()) {
-		update();
-		_currentTim->clickedButton = processDialogue();
-	}
-
-	for (int i = 0; i < TIM::kCountFuncs; ++i)
-		_currentTim->func[i].ip = 0;
-
-	return -1;
-}
-
 // TODO: Consider moving to another file
 
 #ifdef ENABLE_LOL
@@ -908,9 +896,6 @@ TIMInterpreter_LoL::TIMInterpreter_LoL(LoLEngine *engine, Screen_v2 *screen_v2,
 	_animator = new TimAnimator(engine, screen_v2, system, true);
 
 	_drawPage2 = 0;
-
-	memset(_dialogueButtonString, 0, 3 * sizeof(const char *));
-	_dialogueButtonPosX = _dialogueButtonPosY = _dialogueNumButtons = _dialogueButtonXoffs = _dialogueHighlightedButton = 0;
 }
 
 int TIMInterpreter_LoL::initAnimStruct(int index, const char *filename, int x, int y, int frameDelay, int, uint16 wsaFlags) {
@@ -978,157 +963,12 @@ void TIMInterpreter_LoL::advanceToOpcode(int opcode) {
 	f->nextTime = _system->getMillis();
 }
 
-void TIMInterpreter_LoL::drawDialogueBox(int numStr, const char *s1, const char *s2, const char *s3) {
-	_screen->setScreenDim(5);
-
-	if (numStr == 1 && _vm->speechEnabled()) {
-		_dialogueNumButtons = 0;
-		_dialogueButtonString[0] = _dialogueButtonString[1] = _dialogueButtonString[2] = 0;
-	} else {
-		_dialogueNumButtons = numStr;
-		_dialogueButtonString[0] = s1;
-		_dialogueButtonString[1] = s2;
-		_dialogueButtonString[2] = s3;
-		_dialogueHighlightedButton = 0;
-
-		const ScreenDim *d = _screen->getScreenDim(5);
-		_dialogueButtonPosY = d->sy + d->h - 9;
-
-		if (numStr == 1) {
-			_dialogueButtonXoffs = 0;
-			_dialogueButtonPosX = d->sx + d->w - 77;
-		} else {
-			_dialogueButtonXoffs = d->w / numStr;
-			_dialogueButtonPosX = d->sx + (_dialogueButtonXoffs >> 1) - 37;
-		}
-
-		drawDialogueButtons();
-	}
-
-	if (!_vm->shouldQuit())
-		_vm->removeInputTop();
-}
-
-void TIMInterpreter_LoL::drawDialogueButtons() {
-	int cp = _screen->setCurPage(0);
-	Screen::FontId of = _screen->setFont(_vm->gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
-
-	int x = _dialogueButtonPosX;
-
-	for (int i = 0; i < _dialogueNumButtons; i++) {
-		if (_vm->gameFlags().use16ColorMode) {
-			_vm->gui_drawBox(x, (_dialogueButtonPosY & ~7) - 1, 74, 10, 0xee, 0xcc, -1);
-			_screen->printText(_dialogueButtonString[i], (x + 37 - (_screen->getTextWidth(_dialogueButtonString[i])) / 2) & ~3,
-				(_dialogueButtonPosY + 2) & ~7, _dialogueHighlightedButton == i ? 0xc1 : 0xe1, 0);
-		} else {
-			_vm->gui_drawBox(x, _dialogueButtonPosY, 74, 9, 136, 251, -1);
-			_screen->printText(_dialogueButtonString[i], x + 37 - (_screen->getTextWidth(_dialogueButtonString[i])) / 2,
-				_dialogueButtonPosY + 2, _dialogueHighlightedButton == i ? 144 : 254, 0);
-		}
-
-		x += _dialogueButtonXoffs;
-	}
-	_screen->setFont(of);
-	_screen->setCurPage(cp);
-}
-
-uint16 TIMInterpreter_LoL::processDialogue() {
-	int df = _dialogueHighlightedButton;
-	int res = 0;
-	int x = _dialogueButtonPosX;
-	int y = (_vm->gameFlags().use16ColorMode ? (_dialogueButtonPosY & ~7) - 1 : _dialogueButtonPosY);
-
-	for (int i = 0; i < _dialogueNumButtons; i++) {
-		Common::Point p = _vm->getMousePos();
-		if (_vm->posWithinRect(p.x, p.y, x, y, x + 74, y + 9)) {
-			_dialogueHighlightedButton = i;
-			break;
-		}
-		x += _dialogueButtonXoffs;
-	}
-
-	if (_dialogueNumButtons == 0) {
-		int e = _vm->checkInput(0, false) & 0xFF;
-		_vm->removeInputTop();
-
-		if (e) {
-			_vm->gui_notifyButtonListChanged();
-
-			if (e == 43 || e == 61) {
-				_vm->snd_stopSpeech(true);
-			}
-		}
-
-		if (_vm->snd_updateCharacterSpeech() != 2) {
-				res = 1;
-				if (!_vm->shouldQuit()) {
-					_vm->removeInputTop();
-					_vm->gui_notifyButtonListChanged();
-				}
-		}
-	} else {
-		int e = _vm->checkInput(0, false) & 0xFF;
-		_vm->removeInputTop();
-		if (e)
-			_vm->gui_notifyButtonListChanged();
-
-		if (e == 200 || e == 202) {
-			x = _dialogueButtonPosX;
-
-			for (int i = 0; i < _dialogueNumButtons; i++) {
-				Common::Point p = _vm->getMousePos();
-				if (_vm->posWithinRect(p.x, p.y, x, y, x + 74, y + 9)) {
-					_dialogueHighlightedButton = i;
-					res = _dialogueHighlightedButton + 1;
-					break;
-				}
-				x += _dialogueButtonXoffs;
-			}
-		} else if (e == _vm->_keyMap[Common::KEYCODE_SPACE] || e == _vm->_keyMap[Common::KEYCODE_RETURN]) {
-			_vm->snd_stopSpeech(true);
-			res = _dialogueHighlightedButton + 1;
-		} else if (e == _vm->_keyMap[Common::KEYCODE_LEFT] || e == _vm->_keyMap[Common::KEYCODE_DOWN]) {
-			if (_dialogueNumButtons > 1 && _dialogueHighlightedButton > 0)
-				_dialogueHighlightedButton--;
-		} else if (e == _vm->_keyMap[Common::KEYCODE_RIGHT] || e == _vm->_keyMap[Common::KEYCODE_UP]) {
-			if (_dialogueNumButtons > 1 && _dialogueHighlightedButton < (_dialogueNumButtons - 1))
-				_dialogueHighlightedButton++;
-		}
-	}
-
-	if (df != _dialogueHighlightedButton)
-		drawDialogueButtons();
-
-	_screen->updateScreen();
-
-	if (res == 0)
-		return 0;
-
-	_vm->stopPortraitSpeechAnim();
-
-	if (!_vm->textEnabled() && _vm->_currentControlMode) {
-		_screen->setScreenDim(5);
-		const ScreenDim *d = _screen->getScreenDim(5);
-		_screen->fillRect(d->sx, d->sy + d->h - 9, d->sx + d->w - 1, d->sy + d->h - 1, d->unkA);
-	} else {
-		const ScreenDim *d = _screen->_curDim;
-		if (_vm->gameFlags().use16ColorMode)
-			_screen->fillRect(d->sx, d->sy, d->sx + d->w - 3, d->sy + d->h - 2, d->unkA);
-		else
-			_screen->fillRect(d->sx, d->sy, d->sx + d->w - 2, d->sy + d->h - 1, d->unkA);
-		_vm->_txt->clearDim(4);
-		_vm->_txt->resetDimTextPositions(4);
-	}
-
-	return res;
-}
-
 void TIMInterpreter_LoL::resetDialogueState(TIM *tim) {
 	if (!tim)
 		return;
 
 	tim->procFunc = 0;
-	tim->procParam = _dialogueNumButtons ? _dialogueNumButtons : 1;
+	tim->procParam = _vm->_dialogueNumButtons ? _vm->_dialogueNumButtons : 1;
 	tim->clickedButton = 0;
 	tim->dlgFunc = -1;
 }
@@ -1168,6 +1008,18 @@ int TIMInterpreter_LoL::execCommand(int cmd, const uint16 *param) {
 	return (this->*_commands[cmd].proc)(param);
 }
 
+int TIMInterpreter_LoL::cmd_stopAllFuncs(const uint16 *param) {
+	while (_currentTim->dlgFunc == -1 && _currentTim->clickedButton == 0 && !_vm->shouldQuit()) {
+		update();
+		_currentTim->clickedButton = _vm->processDialogue();
+	}
+
+	for (int i = 0; i < TIM::kCountFuncs; ++i)
+		_currentTim->func[i].ip = 0;
+
+	return -1;
+}
+
 int TIMInterpreter_LoL::cmd_setLoopIp(const uint16 *param) {
 	if (_vm->speechEnabled()) {
 		if (_vm->snd_updateCharacterSpeech() == 2)
@@ -1201,7 +1053,7 @@ int TIMInterpreter_LoL::cmd_continueLoop(const uint16 *param) {
 }
 
 int TIMInterpreter_LoL::cmd_processDialogue(const uint16 *param) {
-	int res = processDialogue();
+	int res = _vm->processDialogue();
 	if (!res || !_currentTim->procParam)
 		return res;
 
@@ -1238,7 +1090,7 @@ int TIMInterpreter_LoL::cmd_dialogueBox(const uint16 *param) {
 		}
 	}
 
-	drawDialogueBox(cnt, tmpStr[0], tmpStr[1], tmpStr[2]);
+	_vm->setupDialogueButtons(cnt, tmpStr[0], tmpStr[1], tmpStr[2]);
 	_vm->gui_notifyButtonListChanged();
 
 	return -3;
diff --git a/engines/kyra/script_tim.h b/engines/kyra/script_tim.h
index 11b716c3a9..e132ed78c5 100644
--- a/engines/kyra/script_tim.h
+++ b/engines/kyra/script_tim.h
@@ -146,7 +146,7 @@ struct TIM {
 	uint16 *avtl;
 	uint8 *text;
 
-	const Common::Array<const TIMOpcode *> *opcodes;
+	const Common::Array<const TIMOpcode*> *opcodes;
 
 	// TODO: Get rid of this ugly HACK to allow the
 	// Lands of Lore outro to be working properly.
@@ -159,7 +159,7 @@ public:
 	TIMInterpreter(KyraEngine_v1 *engine, Screen_v2 *screen_v2, OSystem *system);
 	virtual ~TIMInterpreter();
 
-	TIM *load(const char *filename, const Common::Array<const TIMOpcode *> *opcodes);
+	TIM *load(const char *filename, const Common::Array<const TIMOpcode*> *opcodes);
 	void unload(TIM *&tim) const;
 
 	bool callback(Common::IFFChunk &chunk);
@@ -186,8 +186,6 @@ public:
 	void displayText(uint16 textId, int16 flags, uint8 color);
 	void setupTextPalette(uint index, int fadePalette);
 
-	virtual void drawDialogueBox(int numStr, const char *s1, const char *s2, const char *s3) {}
-	virtual uint16 processDialogue() { return 1; }
 	virtual void resetDialogueState(TIM *tim) {}
 
 	int _drawPage2;
@@ -255,7 +253,6 @@ protected:
 	int cmd_execOpcode(const uint16 *param);
 	int cmd_initFuncNow(const uint16 *param);
 	int cmd_stopFuncNow(const uint16 *param);
-	int cmd_stopAllFuncs(const uint16 *param);
 #define cmd_return(n, v) \
 	int cmd_return_##n(const uint16 *){ return v; }
 	cmd_return( 1,  1)
@@ -273,8 +270,6 @@ public:
 	int initAnimStruct(int index, const char *filename, int x, int y, int frameDelay, int, uint16 wsaCopyParams);
 	int freeAnimStruct(int index);
 
-	void drawDialogueBox(int numStr, const char *s1, const char *s2, const char *s3);
-	uint16 processDialogue();
 	void resetDialogueState(TIM *tim);
 
 private:
@@ -284,18 +279,9 @@ private:
 	char *getTableString(int id);
 	void advanceToOpcode(int opcode);
 
-	void drawDialogueButtons();
-
 	LoLEngine *_vm;
 	Screen_LoL *_screen;
 
-	const char *_dialogueButtonString[3];
-	uint16 _dialogueButtonPosX;
-	uint16 _dialogueButtonPosY;
-	int _dialogueNumButtons;
-	uint16 _dialogueButtonXoffs;
-	int _dialogueHighlightedButton;
-
 	virtual int execCommand(int cmd, const uint16 *param);
 
 	typedef int (TIMInterpreter_LoL::*CommandProc)(const uint16 *);
@@ -307,6 +293,7 @@ private:
 	const CommandEntry *_commands;
 	int _commandsSize;
 
+	int cmd_stopAllFuncs(const uint16 *param);
 	int cmd_setLoopIp(const uint16 *param);
 	int cmd_continueLoop(const uint16 *param);
 	int cmd_processDialogue(const uint16 *param);
diff --git a/engines/kyra/sequences_eob1.cpp b/engines/kyra/sequences_eob1.cpp
new file mode 100644
index 0000000000..0606742421
--- /dev/null
+++ b/engines/kyra/sequences_eob1.cpp
@@ -0,0 +1,140 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#include "kyra/eob1.h"
+#include "kyra/screen_eob.h"
+#include "kyra/resource.h"
+#include "kyra/sound.h"
+
+#include "common/system.h"
+
+#include "base/version.h"
+
+namespace Kyra {
+
+int EobEngine::mainMenu() {
+	int menuChoice = 4;
+
+	Screen::FontId of = _screen->_currentFont;
+	Common::SeekableReadStream *s = 0;
+
+	while (menuChoice >= 0 && !shouldQuit()) {
+		switch (menuChoice) {
+			case 0:
+				_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
+				_screen->loadEobCpsFileToPage("INTRO", 0, 5, 3, 2);
+				_screen->setScreenPalette(_screen->getPalette(0));
+				_screen->_curPage = 2;
+				of = _screen->setFont(Screen::FID_6_FNT);
+				_screen->printText(gScummVMVersion, 280 - strlen(gScummVMVersion) * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
+				_screen->setFont(of);
+				_screen->fillRect(0, 159, 319, 199, _screen->getPagePixel(2, 0, 0));
+				gui_drawBox(77, 165, 173, 29, 13, 14, 12);
+				gui_drawBox(76, 164, 175, 31, 13, 14, -1);
+				_screen->_curPage = 0;
+				_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+				_screen->updateScreen();
+				menuChoice = mainMenuLoop();
+				break;
+
+			case 1:
+				// load game in progress
+				//
+				menuChoice = -1;
+				break;
+
+			case 2:
+				// create new party
+				menuChoice = -2;
+				break;
+
+			case 3:
+				// quit
+				menuChoice = -5;
+				break;
+
+			case 4:
+				// intro
+				_sound->loadSoundFile("SOUND");
+				_screen->hideMouse();
+				seq_playOpeningCredits();
+				seq_playIntro();
+				_screen->showMouse();
+				_sound->loadSoundFile("ADLIB");
+				menuChoice = 0;
+				break;
+		}
+	}
+
+	return shouldQuit() ? -5 : menuChoice;
+}
+
+int EobEngine::mainMenuLoop() {
+	int sel = -1;
+	do {
+		_screen->setScreenDim(28);
+		_gui->setupMenu(8, 0, _mainMenuStrings, -1, 0, 0);
+
+		while (sel == -1 && !shouldQuit())
+			sel = _gui->handleMenu(8, _mainMenuStrings, 0, -1, 0);
+	} while ((sel < 0 || sel > 5) && !shouldQuit());
+
+	return sel + 1;
+}
+
+void EobEngine::seq_playOpeningCredits() {
+	static const char *cmpList[] = { "WESTWOOD.CMP", "AND.CMP", "SSI.CMP", "PRESENT.CMP", "DAND.CMP" };
+	static const uint8 frameDelay[] = { 140, 50, 100, 50, 140 };
+
+	_screen->loadPalette("WESTWOOD.COL", _screen->getPalette(0));
+	_screen->setScreenPalette(_screen->getPalette(0));
+
+	_screen->loadBitmap(cmpList[0], 5, 3, 0);
+	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+
+	_sound->playTrack(1);
+	delay(frameDelay[0] * _tickLength);
+
+	for (int i = 1; i < 5 && !shouldQuit() && !skipFlag(); i++) {
+		_screen->loadBitmap(cmpList[i], 5, 3, 0);
+		uint32 nextFrameTimer = _system->getMillis() + frameDelay[i] * _tickLength;
+		_screen->crossFadeRegion(0, 50, 0, 50, 320, 102, 2, 0);
+		delayUntil(nextFrameTimer);
+	}
+
+	delay(50 * _tickLength);
+}
+
+void EobEngine::seq_playIntro() {
+	//_sound->playTrack(2);
+}
+
+void EobEngine::seq_playFinale() {
+
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
new file mode 100644
index 0000000000..708e9cd23a
--- /dev/null
+++ b/engines/kyra/sequences_eob2.cpp
@@ -0,0 +1,1277 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#include "kyra/eob2.h"
+#include "kyra/screen_eob.h"
+#include "kyra/resource.h"
+#include "kyra/sound.h"
+
+#include "common/system.h"
+
+#include "base/version.h"
+
+namespace Kyra {
+
+class DarkmoonSequenceHelper {
+friend class DarkMoonEngine;
+public:
+	enum Mode {
+		kIntro,
+		kFinale
+	};
+
+	DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_Eob *screen, Mode mode, const char *const *strings, const char *const *cpsFiles, const char *const *palFiles, const EobShapeDef **shapeDefList, const EobSequenceStep **seqList);
+	~DarkmoonSequenceHelper();
+
+	void loadScene(int index, int pageNum);
+	void runSequence(int index, int del = -1);
+
+	void printText(int index, int color);
+	void fadeText();
+
+	void update(int srcPage);
+
+	void setPalette(int index);
+	void fadePalette(int index, int del);
+	void copyPalette(int srcIndex, int destIndex);
+
+	void initDelayedPaletteFade(int palIndex, int rate);
+	bool processDelayedPaletteFade();
+
+	void delay(uint32 ticks);
+	void waitForSongNotifier(int index, bool introUpdateAnim = false);
+
+private:
+	void setPaletteWithoutTextColor(int index);
+
+	OSystem *_system;
+	DarkMoonEngine *_vm;
+	Screen_Eob *_screen;
+	Mode _mode;
+
+	uint8 _notifier;
+
+	const char *const *_strings;
+	const char *const *_cpsFiles;
+	const char *const *_palFiles;
+	const EobShapeDef **_shapeDefs;
+	const EobSequenceStep **_seqData;
+
+	Palette *_palettes[12];
+
+	const uint8 **_shapes;
+
+	uint32 _fadePalTimer;
+	int _fadePalRate;
+	int _fadePalIndex;
+};
+
+int DarkMoonEngine::mainMenu() {
+	int menuChoice = 4;
+
+	_sound->loadSoundFile("INTRO");
+	Screen::FontId of = _screen->_currentFont;
+	int op = 0;
+	Common::SeekableReadStream *s = 0;
+
+	while (menuChoice >= 0 && !shouldQuit()) {
+		switch (menuChoice) {
+			case 0:
+				s = _res->createReadStream("XENU.CPS");
+				if (s) {
+					s->read(_screen->getPalette(0).getData(), 768);
+					_screen->loadFileDataToPage(s, 3, 64000);
+					delete s;
+				} else {
+					_screen->loadBitmap("MENU.CPS", 3, 2, &_screen->getPalette(0));
+				}
+
+				_screen->setScreenPalette(_screen->getPalette(0));
+
+				of = _screen->setFont(Screen::FID_6_FNT);
+				op = _screen->setCurPage(2);
+				_screen->printText(gScummVMVersion, 267 - strlen(gScummVMVersion) * 6, 160, 13, 0);
+				_screen->setFont(of);
+				_screen->_curPage = op;
+				_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+				_screen->updateScreen();
+				menuChoice = mainMenuLoop();
+				break;
+
+			case 1:
+				// load game in progress
+				//
+				menuChoice = -1;
+				break;
+
+			case 2:
+				// create new party
+				menuChoice = -2;
+				break;
+
+			case 3:
+				// transfer party
+				seq_playFinale();
+				menuChoice = -3;
+				break;
+
+			case 4:
+				// play intro
+				seq_playIntro();
+				menuChoice = 0;
+				break;
+
+			case 5:
+				// quit
+				menuChoice = -5;
+				break;
+		}
+	}
+
+	return shouldQuit() ? -5 : menuChoice;
+}
+
+int DarkMoonEngine::mainMenuLoop() {
+	int sel = -1;
+	do {
+		_screen->setScreenDim(6);
+		_gui->setupMenu(6, 0, _mainMenuStrings, -1, 0, 0);
+
+		while (sel == -1 && !shouldQuit())
+			sel = _gui->handleMenu(6, _mainMenuStrings, 0, -1, 0);
+	} while ((sel < 0 || sel > 5) && !shouldQuit());
+
+	return sel + 1;
+}
+
+void DarkMoonEngine::seq_playIntro() {
+	DarkmoonSequenceHelper sq(_system, this, _screen, DarkmoonSequenceHelper::kIntro, _introStrings, _cpsFilesIntro, _palFilesIntro, _shapesIntro, _seqIntro);
+
+	_screen->setCurPage(0);
+	_screen->clearCurPage();
+
+	_sound->playTrack(0);
+
+	sq.loadScene(4, 2);
+	sq.loadScene(0, 2);
+
+	sq.delay(1);
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(12);
+
+	_screen->copyRegion(0, 0, 8, 8, 304, 128, 2, 0, Screen::CR_NO_P_CHECK);
+	sq.setPalette(9);
+	sq.fadePalette(0, 3);
+
+	_screen->setCurPage(2);
+	_screen->setClearScreenDim(17);
+	_screen->setCurPage(0);
+
+	removeInputTop();
+	sq.delay(18);
+
+	sq.runSequence(3, 18);
+	sq.runSequence(6, 18);
+	sq.runSequence(0);
+
+	sq.waitForSongNotifier(1);
+
+	sq.runSequence(11);
+	sq.runSequence(7, 6);
+	sq.runSequence(2, 6);
+
+	sq.waitForSongNotifier(2);
+
+	sq.runSequence(38);
+	sq.runSequence(3);
+	sq.runSequence(8);
+	sq.runSequence(1, 10);
+	sq.runSequence(0, 6);
+	sq.runSequence(2);
+
+	sq.waitForSongNotifier(3);
+
+	_screen->setClearScreenDim(17);
+	_screen->setCurPage(2);
+	_screen->setClearScreenDim(17);
+	_screen->setCurPage(0);
+
+	sq.runSequence(40);
+	sq.runSequence(7, 18);
+
+	sq.printText(0, 16);	// You were settling...
+	sq.runSequence(7, 90);
+	sq.fadeText();
+
+	sq.printText(1, 16);	// Then a note was slipped to you
+	sq.runSequence(8);
+	sq.runSequence(2, 72);
+	sq.fadeText();
+
+	sq.printText(2, 16);	// It was from your friend Khelben Blackstaff...
+	sq.runSequence(2);
+	sq.runSequence(6, 36);
+	sq.runSequence(3);
+	sq.fadeText();
+
+	sq.printText(3, 16);	// The message was urgent.
+
+	sq.loadScene(1, 2);
+	sq.waitForSongNotifier(4);
+
+	//intro scroll
+	if (!skipFlag() && !shouldQuit()) {
+		for (int i = 0; i < 280; i += 3) {
+			uint32 endtime = _system->getMillis() + _tickLength;
+			_screen->copyRegion(11, 8, 8, 8, 301, 128, 0, 0, Screen::CR_NO_P_CHECK);
+			_screen->copyRegion(i, 0, 309, 8, 3, 128, 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->updateScreen();
+			if (i == 96)
+				sq.runSequence(42);
+			delayUntil(endtime);
+		}
+	}
+
+	_screen->copyRegion(8, 8, 0, 0, 304, 128, 0, 2, Screen::CR_NO_P_CHECK);
+	sq.runSequence(4);
+	sq.fadeText();
+	sq.delay(10);
+
+	sq.loadScene(2, 2);
+	sq.update(2);
+	sq.delay(10);
+
+	sq.printText(4, 16);	// What could Khelben want?
+	sq.delay(25);
+
+	sq.loadScene(3, 2);
+	sq.delay(54);
+	sq.runSequence(13);
+	_screen->copyRegion(104, 16, 96, 8, 120, 100, 0, 2, Screen::CR_NO_P_CHECK);
+	sq.fadeText();
+
+	sq.printText(5, 15);	// Welcome, please come in
+	sq.runSequence(10);
+	sq.runSequence(10);
+	sq.runSequence(9);
+	sq.runSequence(9);
+	sq.fadeText();
+
+	sq.printText(6, 15);	// Khelben awaits you in his study
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(10);
+	sq.runSequence(9);
+	sq.runSequence(14);
+	sq.loadScene(5, 2);
+
+	sq.waitForSongNotifier(5);
+
+	sq.fadeText();
+	_screen->clearCurPage();
+	_screen->updateScreen();
+
+	for (int i = 0; i < 6; i++)
+		sq.runSequence(15);
+
+	sq.loadScene(6, 2);
+	sq.loadScene(7, 2);
+	_screen->clearCurPage();
+	sq.update(2);
+
+	sq.runSequence(16);
+	sq.printText(7, 15);	// Thank you for coming so quickly
+	sq.runSequence(16);
+	sq.runSequence(17);
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(16);
+	sq.fadeText();
+	sq.runSequence(16);
+
+	sq.loadScene(8, 2);
+	sq.update(2);
+	sq.runSequence(32);
+	sq.printText(8, 15);	// I am troubled my friend
+	sq.runSequence(33);
+	sq.runSequence(33);
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(32);
+	sq.fadeText();
+
+	sq.printText(9, 15);	// Ancient evil stirs in the Temple Darkmoon
+	sq.runSequence(33);
+	sq.runSequence(43);
+	sq.runSequence(33);
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(32);
+	sq.fadeText();
+
+	sq.printText(10, 15);	// I fear for the safety of our city
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(33);
+	sq.runSequence(32);
+	sq.runSequence(32);
+
+	sq.loadScene(9, 2);
+	sq.fadeText();
+
+	sq.waitForSongNotifier(6);
+
+	sq.update(2);
+	sq.runSequence(34);
+
+	sq.printText(11, 15);	// I need your help
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(34);
+	sq.runSequence(35);
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(34);
+	sq.fadeText();
+
+	sq.loadScene(12, 2);
+	sq.update(2);
+	sq.loadScene(6, 2);
+	sq.runSequence(18);
+
+	sq.printText(12, 15);	// Three nights ago I sent forth a scout
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(22);
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(18);
+	sq.fadeText();
+
+	sq.printText(13, 15);	// She has not yet returned
+	sq.runSequence(20);
+	sq.runSequence(19);
+	sq.runSequence(23);
+	sq.runSequence(24);
+	sq.runSequence(20);
+	sq.runSequence(19);
+	sq.runSequence(17);
+	sq.runSequence(18);
+	sq.fadeText();
+
+	sq.printText(14, 15);	// I fear for her safety
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(20);
+	sq.runSequence(18);
+	sq.runSequence(25);
+	sq.runSequence(18);
+	sq.runSequence(18);
+	sq.fadeText();
+	sq.runSequence(18);
+	sq.runSequence(18);
+
+	sq.printText(15, 15);	// Take this coin
+	sq.runSequence(28);
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(18);
+	sq.runSequence(18);
+	sq.fadeText();
+
+	sq.loadScene(10, 2);
+	_screen->clearCurPage();
+	_screen->updateScreen();
+
+	sq.runSequence(37, 18);
+	sq.runSequence(36, 36);
+
+	sq.loadScene(12, 2);
+	_screen->clearCurPage();
+	sq.update(2);
+
+	sq.loadScene(11, 2);
+	sq.printText(16, 15);	// I will use it to contact you
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(20);
+	sq.runSequence(18);
+	sq.runSequence(18);
+	sq.fadeText();
+
+	sq.printText(17, 15);	// You must act quickly
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(19);
+	sq.runSequence(18);
+	sq.runSequence(18);
+	sq.fadeText();
+	sq.runSequence(18);
+
+	sq.printText(18, 15);	// I will teleport you near Darkmoon
+	sq.runSequence(20);
+	sq.runSequence(27);
+	sq.runSequence(20);
+	sq.runSequence(19);
+	sq.runSequence(18);
+	sq.runSequence(18);
+	sq.fadeText();
+	sq.runSequence(18);
+
+	sq.printText(19, 15);	// May luck be with you my friend
+	sq.runSequence(19);
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(18);
+	sq.fadeText();
+	sq.runSequence(29);
+
+	sq.waitForSongNotifier(7);
+
+	sq.runSequence(30);
+	sq.runSequence(31);
+
+	sq.waitForSongNotifier(8, true);
+
+	if (skipFlag() || shouldQuit()) {
+		_sound->playTrack(15);
+	} else {
+		_screen->setScreenDim(17);
+		_screen->clearCurDim();
+		_sound->playTrack(14);
+		sq.fadePalette(10, 1);
+		_screen->setClearScreenDim(18);
+		sq.delay(6);
+		sq.fadePalette(9, 1);
+		_screen->clearCurPage();
+	}
+
+	sq.fadePalette(9, 10);
+}
+
+void DarkMoonEngine::seq_playFinale() {
+	DarkmoonSequenceHelper sq(_system, this, _screen, DarkmoonSequenceHelper::kFinale, _finaleStrings, _cpsFilesFinale, _palFilesFinale, _shapesFinale, _seqFinale);
+
+	_screen->setCurPage(0);
+
+	_sound->loadSoundFile("FINALE1");
+	_sound->playTrack(0);
+
+	sq.delay(3);
+
+	_screen->clearCurPage();
+	_screen->updateScreen();
+
+	sq.loadScene(0, 2);
+	sq.delay(18);
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(1);
+	sq.update(2);
+
+	sq.loadScene(1, 2);
+
+	sq.runSequence(0);
+	sq.runSequence(0);
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(2);
+	sq.runSequence(1);
+	sq.runSequence(2);
+	sq.runSequence(2);
+
+	sq.printText(0, 10);			// Finally, Dran has been defeated
+	for (int i = 0; i < 7; i++)
+		sq.runSequence(2);
+	sq.fadeText();
+	sq.runSequence(2);
+
+	sq.waitForSongNotifier(1);
+
+	sq.printText(1, 10);			// Suddenly, your friend Khelben appears
+	sq.runSequence(4);
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(2);
+	sq.fadeText();
+
+	sq.printText(2, 15);			// Greetings, my victorious friends
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+	sq.runSequence(6);
+
+	sq.printText(3, 15);			// You have defeated Dran
+	for (int i = 0; i < 5; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+
+	sq.printText(4, 15);			// I did not know Dran was a dragon
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+
+	sq.printText(5, 15);			// He must have been over 300 years old
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+
+	sq.printText(6, 15);			// His power is gone
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+
+	sq.printText(7, 15);			// But Darkmoon is still a source of great evil
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+
+	sq.printText(8, 15);			// And many of his minions remain
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+
+	sq.loadScene(2, 2);
+	sq.update(2);
+	sq.loadScene(3, 2);
+	_screen->copyRegion(8, 8, 0, 0, 304, 128, 0, 2, Screen::CR_NO_P_CHECK);
+
+	sq.printText(9, 15);			// Now we must leave this place
+	sq.runSequence(7);
+	sq.runSequence(8);
+	sq.runSequence(7);
+	sq.runSequence(7, 36);
+	sq.fadeText();
+
+	sq.printText(10, 15);			// So my forces can destroy it..
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(7);
+	sq.runSequence(8);
+	sq.runSequence(7);
+	sq.runSequence(7, 36);
+	sq.runSequence(8, 18);
+	sq.fadeText();
+
+	sq.printText(11, 15);			// Follow me
+	sq.runSequence(7, 18);
+	sq.runSequence(9, 18);
+	sq.runSequence(8, 18);
+	sq.fadeText();
+
+	sq.loadScene(7, 2);
+	sq.copyPalette(3, 0);
+	sq.loadScene(4, 2);
+
+	sq.waitForSongNotifier(2);
+
+	_screen->clearCurPage();
+	sq.update(2);
+
+	sq.loadScene(8, 2);
+	sq.loadScene(6, 6);
+	sq.delay(10);
+
+	sq.printText(12, 10);			// Powerful mages stand ready for the final assault...
+	sq.delay(90);
+	sq.fadeText();
+
+	sq.waitForSongNotifier(3);
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(7);
+	sq.delay(8);
+
+	sq.runSequence(10);
+	sq.runSequence(13);
+	sq.initDelayedPaletteFade(4, 1);
+
+	sq.runSequence(14);
+	sq.runSequence(13);
+	sq.runSequence(14);
+	sq.runSequence(14);
+	sq.runSequence(13);
+	sq.initDelayedPaletteFade(2, 1);
+
+	sq.runSequence(15);
+	sq.runSequence(14);
+	sq.runSequence(13);
+	sq.runSequence(15);
+	sq.runSequence(15);
+	sq.runSequence(11);
+
+	sq.printText(13, 10);			// The temple's evil is very strong
+	sq.delay(72);
+	sq.fadeText();
+
+	sq.printText(14, 10);			// It must not be allowed...
+	sq.delay(72);
+	sq.fadeText();
+
+	sq.waitForSongNotifier(4);
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(7);
+	sq.delay(8);
+
+	sq.runSequence(10);
+	sq.initDelayedPaletteFade(5, 1);
+	sq.runSequence(13);
+	sq.runSequence(14);
+	sq.runSequence(13);
+	sq.runSequence(14);
+	sq.runSequence(13);
+	sq.runSequence(13);
+	sq.runSequence(14);
+	sq.runSequence(14);
+	sq.runSequence(13);
+	sq.runSequence(12);
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(16);
+	sq.runSequence(17);
+	sq.runSequence(18);
+
+	sq.printText(15, 10);			// The temple ceases to exist
+	sq.initDelayedPaletteFade(6, 1);
+	sq.delay(36);
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(11);
+
+	sq.delay(54);
+	sq.fadeText();
+	sq.loadScene(12, 2);
+
+	sq.waitForSongNotifier(5);
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(6);
+
+	if (!skipFlag() && !shouldQuit())
+		_screen->crossFadeRegion(0, 0, 8, 8, 304, 128, 2, 0);
+	sq.delay(18);
+
+	sq.printText(16, 15);			// My friends, our work is done
+	sq.runSequence(20);
+	sq.runSequence(19);
+	sq.runSequence(19, 36);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(12);
+	sq.fadeText();
+
+	sq.printText(17, 15);			// Thank you
+	sq.runSequence(19);
+	sq.runSequence(20, 36);
+	sq.fadeText();
+
+	sq.printText(18, 15);			// You have earned my deepest respect
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(11);
+	sq.runSequence(20);
+	sq.runSequence(19);
+	sq.runSequence(19);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(11);
+	sq.delay(36);
+	sq.fadeText();
+
+	sq.printText(19, 15);			// We will remember you always
+	sq.runSequence(19);
+	sq.runSequence(19, 18);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(11);
+	sq.runSequence(20, 18);
+	sq.fadeText();
+
+	sq.delay(28);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(12);
+	sq.delay(3);
+
+	sq.loadScene(5, 2);
+	if (skipFlag() || shouldQuit()) {
+		_screen->copyRegion(0, 0, 8, 8, 304, 128, 2, 0, Screen::CR_NO_P_CHECK);
+	} else {
+		_sound->playTrack(6);
+		_screen->crossFadeRegion(0, 0, 8, 8, 304, 128, 2, 0);
+	}
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(12);
+	sq.delay(5);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(11);
+	sq.delay(11);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(12);
+	sq.delay(7);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(11);
+	sq.delay(12);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(12);
+
+	removeInputTop();
+	resetSkipFlag(true);
+
+	sq.loadScene(10, 2);
+	sq.loadScene(9, 2);
+	_sound->playTrack(0);
+	sq.delay(3);
+
+	_sound->loadSoundFile("FINALE2");
+
+	sq.delay(18);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(1);
+
+	seq_playCredits(&sq, _creditsData, 18, 2, 6, 2);
+
+	sq.delay(90);
+
+	resetSkipFlag(true);
+
+	sq.setPalette(11);
+	sq.fadePalette(9, 10);
+
+	_screen->clearCurPage();
+	sq.loadScene(11, 2);
+
+	static const uint8 finPortraitPos[] = { 0x50, 0x50, 0xD0, 0x50, 0x50, 0x90, 0xD0, 0x90, 0x90, 0x50, 0x90, 0x90 };
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 1))
+			continue;
+		if (i > 3)
+			_screen->drawShape(2, sq._shapes[6 + i], finPortraitPos[i << 1] - 16, finPortraitPos[(i << 1) + 1] - 16, 0);
+		_screen->drawShape(2, _characters[i].faceShape, finPortraitPos[i << 1], finPortraitPos[(i << 1) + 1], 0);
+	}
+
+	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+
+	sq.setPalette(9);
+	sq.fadePalette(0, 18);
+
+	while (!skipFlag() && !shouldQuit())
+		delay(_tickLength);
+
+	_sound->playTrack(0);
+	sq.fadePalette(9, 10);
+}
+
+void DarkMoonEngine::seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *data, int sd, int backupPage, int tempPage, int speed) {
+	if (!data)
+		return;
+
+	_screen->setScreenDim(sd);
+	const ScreenDim *dm = _screen->_curDim;
+
+	_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 0, backupPage, Screen::CR_NO_P_CHECK);
+
+	struct CreditsDataItem {
+		int16 x;
+		int16 y;
+		const void *data;
+		char *str;
+		uint8 crlf;
+		uint8 size;
+		uint8 dataType;
+	} items[36];
+	memset(items, 0, sizeof(items));
+
+	const char *pos = (const char *)data;
+	uint32 end = _system->getMillis();
+	uint32 cur = 0;
+	int i = 0;
+
+	do {
+		for (bool loop = true; loop; ) {
+			sq->processDelayedPaletteFade();
+			cur = _system->getMillis();
+			if (end <= cur)
+				break;
+			delay(MIN<uint32>(_tickLength, end - cur));
+		}
+
+		end = _system->getMillis() + speed * _tickLength;
+
+		for (; i < 35 && *pos; i++) {
+			int16 nextY = i ? items[i].y + items[i].size + (items[i].size >> 2) : dm->h;
+
+			const char *posOld = pos;
+			pos = strchr(pos, 0x0d);
+			if (!pos)
+				pos = strchr(posOld, 0x00);
+
+			items[i + 1].crlf = *pos++;
+
+			if (*posOld == 2) {
+				const uint8 *shp = sq->_shapes[(*++posOld) - 1];
+				items[i + 1].data = shp;
+				items[i + 1].size = shp[1];
+				items[i + 1].x = (dm->w - shp[2]) << 2 ;
+				items[i + 1].dataType = 1;
+				delete[] items[i + 1].str;
+				items[i + 1].str = 0;
+
+			} else {
+				if (*posOld == 1) {
+					posOld++;
+					items[i + 1].size = 6;
+				} else {
+					items[i + 1].size = _screen->getFontWidth();
+				}
+
+				items[i + 1].dataType = 0;
+
+				int l = pos - posOld;
+				if (items[i + 1].crlf != 0x0d)
+					l++;
+
+				delete[] items[i + 1].str;
+				items[i + 1].str = new char[l];
+				memcpy(items[i + 1].str, posOld, l);
+				items[i + 1].str[l - 1] = 0;
+				items[i + 1].data = 0;
+				items[i + 1].x = (((dm->w << 3) - (strlen(items[i + 1].str) * items[i + 1].size)) >> 1) + 1;
+			}
+
+			items[i + 1].y = nextY;
+		}
+
+		_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, backupPage, tempPage, Screen::CR_NO_P_CHECK);
+
+		for (int h = 0; h < i; h++) {
+			if (items[h + 1].y < dm->h) {
+				if (items[h + 1].dataType == 1) {
+					_screen->drawShape(tempPage, (const uint8*)items[h + 1].data, items[h + 1].x, items[h + 1].y, sd);
+				} else {
+					_screen->setCurPage(tempPage);
+
+					if (items[h + 1].size == 6)
+						_screen->setFont(Screen::FID_6_FNT);
+
+					_screen->printText(items[h + 1].str, (dm->sx << 3) + items[h + 1].x - 1, dm->sy + items[h + 1].y + 1, 12, 0);
+					_screen->printText(items[h + 1].str, (dm->sx << 3) + items[h + 1].x, dm->sy + items[h + 1].y, 240, 0);
+
+					if (items[h + 1].size == 6)
+						_screen->setFont(Screen::FID_8_FNT);
+
+					_screen->setCurPage(0);
+				}
+			}
+
+			items[h + 1].y -= 2;
+		}
+
+		_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, tempPage, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+
+		if (-items[1].size > items[1].y) {
+			delete[] items[1].str;
+			--i;
+			for (int t = 1; t <= i; t++)
+				memcpy(&items[t], &items[t + 1], sizeof(CreditsDataItem));
+			items[i + 1].str = 0;
+		}
+
+		if (i < 35 && ((items[i].y + items[i].size) < (dm->sy + dm->h))) {
+			resetSkipFlag(true);
+			break;
+		}
+
+		sq->processDelayedPaletteFade();
+	} while (!skipFlag() && i && !shouldQuit());
+
+	for (i = 0; i < 35; i++)
+		delete[] items[i].str;
+}
+
+DarkmoonSequenceHelper::DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_Eob *screen, Mode mode, const char *const *strings, const char *const *cpsFiles, const char *const *palFiles, const EobShapeDef **shapeDefList, const EobSequenceStep **seqList) :
+	_system(system), _vm(vm), _screen(screen), _mode(mode), _strings(strings), _cpsFiles(cpsFiles), _palFiles(palFiles), _shapeDefs(shapeDefList), _seqData(seqList) {
+
+	for (int i = 0; _palFiles[i]; i++) {
+		if (i < 4)
+			_palettes[i] = &_screen->getPalette(i);
+		else
+			_palettes[i] = new Palette(256);
+		_screen->loadPalette(_palFiles[i], *_palettes[i]);
+	}
+
+	_palettes[9] = new Palette(256);
+	_palettes[9]->fill(0, 256, 0);
+	_palettes[10] = new Palette(256);
+	_palettes[10]->fill(0, 256, 63);
+	_palettes[11] = new Palette(256);
+	_palettes[11]->fill(0, 256, 0);
+
+	_shapes = new const uint8*[30];
+	memset(_shapes, 0, 30 * sizeof(uint8*));
+
+	_fadePalTimer = 0;
+	_fadePalRate = 0;
+
+	_screen->setScreenPalette(*_palettes[0]);
+	_screen->hideMouse();
+
+	_system->delayMillis(150);
+	_vm->resetSkipFlag(true);
+}
+
+DarkmoonSequenceHelper::~DarkmoonSequenceHelper() {
+	for (int i = 4; _palFiles[i]; i++)
+		delete _palettes[i];
+	delete _palettes[9];
+	delete _palettes[10];
+	delete _palettes[11];
+
+	for (int i = 0; i < 30; i++)
+		delete _shapes[i];
+	delete[] _shapes;
+
+	_screen->clearCurPage();
+	_screen->showMouse();
+	_screen->updateScreen();
+
+	_system->delayMillis(150);
+	_vm->resetSkipFlag(true);
+}
+
+void DarkmoonSequenceHelper::loadScene(int index, int pageNum) {
+	char file[13];
+	strcpy(file, _cpsFiles[index]);
+
+	Common::SeekableReadStream *s = _vm->resource()->createReadStream(file);
+	if (s && file[0] != 'X') {
+		delete s;
+		_screen->loadBitmap(_cpsFiles[index], pageNum | 1, pageNum | 1, _palettes[0]);
+	} else {
+		if (!s) {
+			file[0] = 'X';
+			s = _vm->resource()->createReadStream(file);
+		}
+
+		if (!s)
+			error("DarkmoonSequenceHelper::loadScene(): Sequence CPS file loading failed.");
+
+		if (_mode == kFinale)
+			s->read(_palettes[0]->getData(), 768);
+		else
+			s->seek(768);
+		_screen->loadFileDataToPage(s, 3, 64000);
+		delete s;
+	}
+
+	int cp = _screen->setCurPage(pageNum);
+
+	if (_shapeDefs[index]) {
+		for (const EobShapeDef *df = _shapeDefs[index]; df->w; df++ ) {
+			uint16 shapeIndex = (df->index < 0) ? df->index * -1 : df->index;
+			if (_shapes[shapeIndex])
+				delete[] _shapes[shapeIndex];
+			_shapes[shapeIndex] = _screen->encodeShape(df->x, df->y, df->w, df->h, (df->index >> 8) != 0);
+		}
+	}
+
+	_screen->setCurPage(cp);
+	_screen->copyPage(pageNum | 1, pageNum);
+
+	if ((pageNum == 0 || pageNum == 1) && !_vm->skipFlag() && !_vm->shouldQuit())
+		_screen->updateScreen();
+}
+
+void DarkmoonSequenceHelper::runSequence(int index, int del) {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	uint32 end = 0;
+
+	for (const EobSequenceStep *s = _seqData[index]; s->command != 0xff && !_vm->skipFlag() && !_vm->shouldQuit(); s++) {
+		int palIndex = _mode == kFinale ? (s->pal + 1) : s->pal;
+		int x = s->x1;
+		int y = s->y1;
+		int x2 = 0;
+		uint16 shapeW = 0;
+		uint16 shapeH = 0;
+
+		switch(s->command) {
+		case 0:
+			// flash palette
+			if (s->pal)
+				setPaletteWithoutTextColor(palIndex);
+			delay(s->delay);
+			if (_mode == DarkmoonSequenceHelper::kIntro && s->pal)
+				setPaletteWithoutTextColor(0);
+			break;
+
+		case 1:
+			// draw shape, then restore beackground
+			shapeW = _shapes[s->obj][2];
+			shapeH = _shapes[s->obj][3];
+
+			if (_mode == DarkmoonSequenceHelper::kFinale) {
+				_screen->setScreenDim(18);
+				x -= (_screen->_curDim->sx << 3);
+				y -= _screen->_curDim->sy;
+				if (x < 0)
+					shapeW -= ((-x >> 3) + 1);
+				else
+					x2 = x;
+			}
+
+			_screen->drawShape(0, _shapes[s->obj], x, y, _mode == DarkmoonSequenceHelper::kIntro ? 0 : 18);
+
+			if (s->pal)
+				setPaletteWithoutTextColor(palIndex);
+			else
+				_screen->updateScreen();
+
+			delay(s->delay);
+
+			if (_mode == DarkmoonSequenceHelper::kIntro) {
+				if (s->pal)
+					setPaletteWithoutTextColor(0);
+				_screen->copyRegion(x - 8, y - 8, x, y, (shapeW + 1) << 3, shapeH, 2, 0, Screen::CR_NO_P_CHECK);
+			} else {
+				_screen->copyRegion(x2, y, x2 + (_screen->_curDim->sx << 3), y + _screen->_curDim->sy, (shapeW + 1) << 3, shapeH, 2, 0, Screen::CR_NO_P_CHECK);
+			}
+
+			_screen->updateScreen();
+			break;
+
+		case 2:
+			// draw shape
+			_screen->drawShape(_screen->_curPage, _shapes[s->obj], x, y, 0);
+
+			if (s->pal)
+				setPaletteWithoutTextColor(palIndex);
+			else if(!_screen->_curPage)
+				_screen->updateScreen();
+
+			delay(s->delay);
+
+			if (_mode == DarkmoonSequenceHelper::kIntro && s->pal)
+				setPaletteWithoutTextColor(0);
+			break;
+
+		case 3:
+		case 4:
+			// fade shape in or out or restore background
+			if (_mode == DarkmoonSequenceHelper::kFinale)
+				break;
+
+			_screen->setShapeFadeMode(0, true);
+			_screen->setShapeFadeMode(1, true);
+
+			end = _system->getMillis() + s->delay * _vm->tickLength();
+
+			if (palIndex) {
+				_screen->setFadeTableIndex(palIndex - 1);
+
+				_screen->copyRegion(s->x1 - 8, s->y1 - 8, 0, 0, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 2, 4, Screen::CR_NO_P_CHECK);
+				_screen->drawShape(4, _shapes[s->obj], s->x1 & 7, 0, 0);
+				_screen->copyRegion(0, 0, s->x1, s->y1, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 4, 0, Screen::CR_NO_P_CHECK);
+			} else {
+				_screen->copyRegion(s->x1 - 8, s->y1 - 8, s->x1, s->y1, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 2, 0, Screen::CR_NO_P_CHECK);
+			}
+			_screen->updateScreen();
+
+			_vm->delayUntil(end);
+			_screen->setShapeFadeMode(0, false);
+			_screen->setShapeFadeMode(1, false);
+			break;
+
+		case 5:
+			// copyregion
+			if (_mode == DarkmoonSequenceHelper::kFinale && s->pal)
+				setPaletteWithoutTextColor(palIndex);
+
+			_screen->copyRegion(s->x2 << 3, s->y2, s->x1, s->y1, s->w << 3, s->h, (s->obj && _mode == DarkmoonSequenceHelper::kFinale) ? 6 : 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->updateScreen();
+			delay(s->delay);
+			break;
+
+		case 6:
+			// play sound effect
+			if (s->obj != 0xff)
+				_vm->sound()->playSoundEffect(s->obj);
+			break;
+
+		default:
+			error("DarkmoonSequenceHelper::runSequence(): Unknown animation opcode encountered.");
+			break;
+		}
+	}
+
+	if (del > 0)
+		delay(del);
+}
+
+void DarkmoonSequenceHelper::printText(int index, int color) {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	_screen->setClearScreenDim(17);
+	_palettes[0]->copy(*_palettes[0], color, 1, 255);
+	setPalette(0);
+
+	char *temp = new char[strlen(_strings[index]) + 1];
+	char *str = temp;
+	strcpy(str, _strings[index]);
+
+	const ScreenDim *dm = _screen->_curDim;
+
+	for (int yOffs = 0; *str; yOffs += 9) {
+		char *cr = strchr(str, 13);
+
+		if (cr)
+			*cr = 0;
+
+		uint32 len = strlen(str);
+		_screen->printText(str, (dm->sx + ((dm->w - len) >> 1)) << 3, dm->sy + yOffs, 255, dm->unkA);
+
+		if (cr) {
+			*cr = 13;
+			str = cr + 1;
+		} else {
+			str += len;
+		}
+	}
+
+	delete[] temp;
+	_screen->updateScreen();
+}
+
+void DarkmoonSequenceHelper::fadeText() {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	_screen->fadeTextColor(_palettes[0], 255, 2);
+	_screen->clearCurDim();
+}
+
+void DarkmoonSequenceHelper::update(int srcPage) {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	_screen->copyRegion(0, 0, 8, 8, 304, 128, srcPage, 0, Screen::CR_NO_P_CHECK);
+	setPaletteWithoutTextColor(0);
+}
+
+void DarkmoonSequenceHelper::setPaletteWithoutTextColor(int index) {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	if (!memcmp(_palettes[11]->getData(), _palettes[index]->getData(), 765))
+		return;
+
+	_palettes[11]->copy(*_palettes[index], 0, 255);
+	_palettes[11]->copy(*_palettes[0], 255, 1, 255);
+	setPalette(11);
+
+	_screen->updateScreen();
+}
+
+void DarkmoonSequenceHelper::setPalette(int index) {
+	_screen->setScreenPalette(*_palettes[index]);
+}
+
+void DarkmoonSequenceHelper::fadePalette(int index, int del) {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	_screen->fadePalette(*_palettes[index], del * _vm->tickLength());
+}
+
+void DarkmoonSequenceHelper::copyPalette(int srcIndex, int destIndex) {
+	_palettes[destIndex]->copy(*_palettes[srcIndex]);
+}
+
+void DarkmoonSequenceHelper::initDelayedPaletteFade(int palIndex, int rate) {
+	_palettes[11]->copy(*_palettes[0]);
+
+	_fadePalIndex = palIndex;
+	_fadePalRate = rate;
+	_fadePalTimer = _system->getMillis() + 2 * _vm->_tickLength;
+}
+
+bool DarkmoonSequenceHelper::processDelayedPaletteFade() {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return true;
+
+	if (!_fadePalRate || (_system->getMillis() <= _fadePalTimer))
+		return false;
+
+	if (_screen->delayedFadePalStep(_palettes[_fadePalIndex], _palettes[0], _fadePalRate)) {
+		setPaletteWithoutTextColor(0);
+		_fadePalTimer = _system->getMillis() + 3 * _vm->_tickLength;
+	} else {
+		_fadePalRate = 0;
+	}
+
+	return false;
+}
+
+void DarkmoonSequenceHelper::delay(uint32 ticks) {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	uint32 end = _system->getMillis() + ticks * _vm->_tickLength;
+
+	if (_mode == kFinale) {
+		do {
+			if (processDelayedPaletteFade())
+				break;
+			_vm->updateInput();
+		} while (end > _system->getMillis());
+		processDelayedPaletteFade();
+
+	} else {
+		_vm->delayUntil(end);
+	}
+}
+
+void DarkmoonSequenceHelper::waitForSongNotifier(int index, bool introUpdateAnim) {
+	int seq = 0;
+	while (_notifier < index && !(_vm->skipFlag() || _vm->shouldQuit())) {
+		if (introUpdateAnim) {
+			runSequence(30 | seq);
+			seq ^= 1;
+		}
+
+		if (_mode == kFinale)
+			processDelayedPaletteFade();
+
+		_vm->updateInput();
+	}
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp
index 9325513066..73c20ee6df 100644
--- a/engines/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
@@ -266,7 +266,7 @@ void KyraEngine_v1::snd_playTheme(int file, int track) {
 }
 
 void KyraEngine_v1::snd_playSoundEffect(int track, int volume) {
-	_sound->playSoundEffect(track);
+	_sound->playSoundEffect(track, volume);
 }
 
 void KyraEngine_v1::snd_playWanderScoreViaMap(int command, int restart) {
diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp
index 968488eef3..6bf047fe35 100644
--- a/engines/kyra/sound_lol.cpp
+++ b/engines/kyra/sound_lol.cpp
@@ -197,24 +197,9 @@ void LoLEngine::snd_playSoundEffect(int track, int volume) {
 	}
 }
 
-void LoLEngine::snd_processEnvironmentalSoundEffect(int soundId, int block) {
-	if (!_sound->sfxEnabled() || shouldQuit())
-		return;
-
-	if (_environmentSfx)
-		snd_playSoundEffect(_environmentSfx, _environmentSfxVol);
-
-	int dist = 0;
-	if (block) {
-		dist = getMonsterDistance(_currentBlock, block);
-		if (dist > _envSfxDistThreshold) {
-			_environmentSfx = 0;
-			return;
-		}
-	}
-
-	_environmentSfx = soundId;
-	_environmentSfxVol = (15 - ((block || dist < 2) ? dist : 0)) << 4;
+bool LoLEngine::snd_processEnvironmentalSoundEffect(int soundId, int block) {
+	if (!LolEobBaseEngine::snd_processEnvironmentalSoundEffect(soundId, block))
+		return false;
 
 	if (block != _currentBlock) {
 		static const int8 blockShiftTable[] = { -32, -31, 1, 33, 32, 31, -1, -33 };
@@ -231,9 +216,9 @@ void LoLEngine::snd_processEnvironmentalSoundEffect(int soundId, int block) {
 	}
 
 	if (!soundId || _sceneUpdateRequired)
-		return;
+		return false;
 
-	snd_processEnvironmentalSoundEffect(0, 0);
+	return snd_processEnvironmentalSoundEffect(0, 0);
 }
 
 void LoLEngine::snd_queueEnvironmentalSoundEffect(int soundId, int block) {
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
new file mode 100644
index 0000000000..aac3c274db
--- /dev/null
+++ b/engines/kyra/sprites_eob.cpp
@@ -0,0 +1,1249 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/eobcommon.h"
+#include "kyra/script_eob.h"
+#include "kyra/resource.h"
+#include "kyra/timer.h"
+
+#include "common/system.h"
+
+namespace Kyra {
+
+int LolEobBaseEngine::getBlockDistance(uint16 block1, uint16 block2) {
+	int b1x = block1 & 0x1f;
+	int b1y = block1 >> 5;
+	int b2x = block2 & 0x1f;
+	int b2y = block2 >> 5;
+
+	uint8 dy = ABS(b2y - b1y);
+	uint8 dx = ABS(b2x - b1x);
+
+	if (dx > dy)
+		SWAP(dx, dy);
+
+	return (dx >> 1) + dy;
+}
+
+} // namespace Kyra
+
+#endif
+#ifdef ENABLE_EOB
+
+namespace Kyra {
+
+void EobCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex) {
+	_screen->loadEobBitmap(filename, 3, 3);
+	const uint16 *enc = &_encodeMonsterShpTable[encodeTableIndex << 2];
+
+	for (int i = 0; i < 6; i++, enc += 4)
+		_monsterShapes[monsterIndex + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+
+	generateMonsterPalettes(filename, monsterIndex);
+
+	if (hasDecorations)
+		loadMonsterDecoration(filename, monsterIndex);
+
+	_screen->_curPage = 0;
+}
+
+void EobCoreEngine::releaseMonsterShapes(int first, int num) {
+	for (int i = first; i < first + num; i++) {
+		delete[] _monsterShapes[i];
+		_monsterShapes[i] = 0;
+		delete[] _monsterDecorations[i].shp;
+		_monsterDecorations[i].shp = 0;
+	}
+}
+
+const uint8 *EobCoreEngine::loadMonsterProperties(const uint8 *data) {
+	uint8 cmd = *data++;
+	while (cmd != 0xff) {
+		EobMonsterProperty *d = &_monsterProps[cmd];
+		d->armorClass = (int8)*data++;
+		d->hitChance = (int8)*data++;
+		d->level = *data++;
+		d->hpDcTimes = *data++;
+		d->hpDcPips = *data++;
+		d->hpDcBase = *data++;
+		d->attacksPerRound = *data++;
+		d->dmgDc[0].times = *data++;
+		d->dmgDc[0].pips = *data++;
+		d->dmgDc[0].base = (int8)*data++;
+		d->dmgDc[1].times = *data++;
+		d->dmgDc[1].pips = *data++;
+		d->dmgDc[1].base = (int8)*data++;
+		d->dmgDc[2].times = *data++;
+		d->dmgDc[2].pips = *data++;
+		d->dmgDc[3].base = (int8)*data++;
+		d->statusFlags = READ_LE_UINT16(data);
+		data += 2;
+		d->flags = READ_LE_UINT16(data);
+		data += 2;
+		d->u22 = (int16)READ_LE_UINT16(data);
+		data += 2;
+		d->experience = READ_LE_UINT16(data);
+		data += 2;
+
+		d->u30 = *data++;
+		d->sound1 = *data++;
+		d->sound2 = *data++;
+		d->numRemoteAttacks = *data++;
+
+		if (*data++ != 0xff) {
+			d->remoteWeaponChangeMode = *data++;
+			d->numRemoteWeapons = *data++;
+
+			for (int i = 0; i < d->numRemoteWeapons; i++) {
+				d->remoteWeapons[i] = (int8)*data;
+				data += 2;
+			}
+		}
+
+		d->u41 = *data++;
+		d->dmgModifierEvade = *data++;
+
+		for (int i = 0; i < 3; i++)
+			d->decorations[i] = *data++;
+
+		cmd = *data++;
+	}
+
+	return data;
+}
+
+const uint8 *EobCoreEngine::loadActiveMonsterData(const uint8 *data, int level) {
+	for (uint8 p = *data++; p != 0xff; p = *data++) {
+		uint8 v = *data++;
+		_timer->setCountdown(0x20 + (p << 1), v);
+		_timer->setCountdown(0x21 + (p << 1), v);
+	}
+
+	if (_hasTempDataFlags & (1 << (level - 1)))
+		return data + 420;
+
+	memset(_monsters, 0, 30 * sizeof(EobMonsterInPlay));
+
+	for (int i = 0; i < 30; i++, data += 14) {
+		if (*data == 0xff)
+			continue;
+
+		initMonster(data[0], data[1], READ_LE_UINT16(&data[2]), data[4], (int8)data[5], data[6], data[7], data[8], data[9], READ_LE_UINT16(&data[10]), READ_LE_UINT16(&data[12]));
+		_monsters[data[0]].flags |= 0x40;
+	}
+
+	return data;
+}
+
+void EobCoreEngine::initMonster(int index, int unit, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int i, int randItem, int fixedItem) {
+	EobMonsterInPlay *m = &_monsters[index];
+	EobMonsterProperty *p = &_monsterProps[type];
+	memset(m, 0, sizeof(EobMonsterInPlay));
+
+	if (!block)
+		return;
+
+	unit <<= 1;
+	if (index & 1)
+		unit++;
+
+	m->stepsTillRemoteAttack = _flags.gameID == GI_EOB2 ? rollDice(1, 3, 0) : 0;
+	m->type = type;
+	m->numRemoteAttacks = p->numRemoteAttacks;
+	m->curRemoteWeapon = 0;
+	m->unit = unit;
+	m->pos = pos;
+	m->shpIndex = shpIndex;
+	m->mode = mode;
+	m->f_b = i;
+	m->dir = dir;
+	m->palette = _flags.gameID == GI_EOB2 ? (index % 3) : 0;
+	m->hitPointsCur = m->hitPointsMax = _flags.gameID == GI_EOB2 ? rollDice(p->hpDcTimes, p->hpDcPips, p->hpDcBase) : (p->hpDcTimes == 255 ? rollDice(1, 4, 0) : rollDice(p->hpDcTimes, 8, 0));
+	m->randItem = randItem;
+	m->fixedItem = fixedItem;
+	m->sub = _currentSub;
+
+	placeMonster(m, block, dir);
+}
+
+void EobCoreEngine::placeMonster(EobMonsterInPlay *m, uint16 block, int dir) {
+	if (block != 0xffff){
+		checkSceneUpdateNeed(m->block);
+		if (_levelBlockProperties[m->block].flags & 7) {
+			_levelBlockProperties[m->block].flags--;
+			if (_flags.gameID == GI_EOB2)
+				runLevelScript(m->block, 0x400);
+		}
+		m->block = block;
+		_levelBlockProperties[block].flags++;
+		if (_flags.gameID == GI_EOB2)
+			runLevelScript(m->block, 0x200);
+	}
+
+	if (dir != -1) {
+		m->dir = dir;
+		block = m->block;
+	}
+
+	checkSceneUpdateNeed(block);
+}
+
+void EobCoreEngine::killMonster(EobMonsterInPlay *m, bool giveExperience) {
+	m->hitPointsCur = -1;
+	int pos = (m->pos == 4) ? rollDice(1, 4, -1) : m->pos;
+
+	if (m->randItem) {
+		if (rollDice(1, 10, 0) == 1)
+			setItemPosition((Item*)&_levelBlockProperties[m->block & 0x3ff].drawObjects, m->block, duplicateItem(m->randItem), pos);
+	}
+
+	if (m->fixedItem)
+		setItemPosition((Item*)&_levelBlockProperties[m->block & 0x3ff].drawObjects, m->block, duplicateItem(m->fixedItem), pos);
+
+	if (giveExperience)
+		increasePartyExperience(_monsterProps[m->type].experience);
+
+	if ((_flags.gameID == GI_EOB2) && (_currentLevel == 16) && (_currentSub == 1) && (_monsterProps[m->type].flags & 4)) {
+		if (m->type) {
+			_playFinale = true;
+			_runFlag = false;
+		} else {
+			m->hitPointsCur = 150;
+			m->curRemoteWeapon = 0;
+			m->numRemoteAttacks = 255;
+			m->shpIndex++;
+			m->type++;
+			//// TODO
+			// dranDragonTransformation();
+		}
+	} else {
+		placeMonster(m, 0, -1);
+
+		if ((_flags.gameID == GI_EOB1) && (m->type == 21)) {
+			_playFinale = true;
+			_runFlag = false;
+		}
+
+		if (m->mode == 8)
+			updateAttackingMonsterFlags();
+	}
+}
+
+int EobCoreEngine::countSpecificMonsters(int type) {
+	int res = 0;
+	for (int i = 0; i < 30; i++) {
+		if (_monsters[i].type != type || _monsters[i].sub != _currentSub || _monsters[i].hitPointsCur < 0)
+			continue;
+		res++;
+	}
+	return res;
+}
+
+void EobCoreEngine::updateAttackingMonsterFlags() {
+	EobMonsterInPlay *m2 = 0;
+	for (EobMonsterInPlay *m = _monsters; m < &_monsters[30]; m++) {
+		if (m->mode != 8)
+			continue;
+		m->mode = 0;
+		m->dest = _currentBlock;
+		m2 = m;
+	}
+
+	if (m2->type == 7)
+		_inf->setFlag(4);
+
+	if (m2->type == 12)
+		_inf->setFlag(0x800);
+}
+
+const int8 *EobCoreEngine::getMonsterBlockPositions(uint16 block) {
+	static int8 pos[6];
+	memset(pos, -1, sizeof(pos));
+	for (int8 i = 0; i < 30; i++) {
+		if (_monsters[i].block != block)
+			continue;
+		pos[_monsters[i].pos] = i;
+	}
+	return pos;
+}
+
+int EobCoreEngine::getClosestMonsterPos(int charIndex, int block) {
+	const int8 *pos = getMonsterBlockPositions(block);
+	if (pos[4] != -1)
+		return pos[4];
+
+	const uint8 *p = &_monsterProximityTable[(_currentDirection << 3) + ((charIndex & 1) << 2)];
+	for (int i = 0; i < 4; i++) {
+		if (pos[p[i]] != -1)
+			return pos[p[i]];
+	}
+	return -1;
+}
+
+bool EobCoreEngine::blockHasMonsters(uint16 block) {
+	return _levelBlockProperties[block].flags & 7 ? true : false;
+}
+
+bool EobCoreEngine::isMonsterOnPos(EobMonsterInPlay *m, uint16 block, int pos, int checkPos4) {
+	return (m->block == block && (m->pos == pos || (m->pos == 4 && checkPos4))) ? true : false;
+}
+
+const int16 *EobCoreEngine::findBlockMonsters(uint16 block, int pos, int dir, int blockDamage, int singleTargetCheckAdjacent) {
+	static const uint8 cpos4[] = { 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1 };
+	int checkPos4 = (pos <= 4) ? cpos4[(dir << 2) + pos] : 1;
+	int16 *dst = _foundMonstersArray;
+
+	if (blockDamage) {
+		for (int i = 0; i < 30; i++) {
+			if (_monsters[i].block == block && (_monsters[i].pos != 4 || checkPos4))
+				*dst++ = i;
+		}
+
+	} else if (singleTargetCheckAdjacent) {
+		int16 r = -1;
+		int f = 5;
+
+		for (int i = 0; i < 30; i++) {
+			const uint8 *tbl = &_findBlockMonstersTable[(dir << 4) + (pos << 2)];
+
+			if (_monsters[i].block != block)
+				continue;
+
+			if (_monsters[i].pos == pos) {
+				r = i;
+				break;
+			}
+
+			for (int ii = 0; ii < 4; ii++) {
+				if (_monsters[i].pos == tbl[ii] && ii < f) {
+					f = ii;
+					r = i;
+				}
+			}
+		}
+
+		*dst++ = r;
+
+	} else {
+		for (int i = 0; i < 30; i++) {
+			if (isMonsterOnPos(&_monsters[i], block, pos, checkPos4))
+				*dst++ = i;
+		}
+	}
+
+	*dst = -1;
+	return _foundMonstersArray;
+}
+
+void EobCoreEngine::drawBlockObject(int flipped, int page, const uint8 *shape, int x, int y, int sd, uint8 *ovl) {
+	const ScreenDim *d = _screen->getScreenDim(sd);
+	_screen->drawShape(page, shape, x - (d->sx << 3), y - d->sy, sd, flipped | (ovl ? 2 : 0), ovl);
+}
+
+void EobCoreEngine::drawMonsterShape(const uint8 *shape, int x, int y, int flipped, int flags, int palIndex) {
+	uint8 *ovl = 0;
+
+	if (flags & 2)
+		ovl = _monsterOvl1;
+	else if (_flags.gameID == GI_EOB2 && flags & 0x20)
+		ovl = _monsterOvl2;
+	else if (palIndex != -1)
+		ovl = _monsterPalettes[palIndex];
+
+	drawBlockObject(flipped, 2, shape, x, y, 5, ovl);
+}
+
+void EobCoreEngine::flashMonsterShape(EobMonsterInPlay *m) {
+	disableSysTimer(2);
+	_flashShapeTimer = 0;
+	drawScene(1);
+	m->flags &= 0xfd;
+	_flashShapeTimer  = _system->getMillis() + _tickLength;
+	enableSysTimer(2);
+
+	_sceneUpdateRequired = true;
+}
+
+void EobCoreEngine::updateAllMonsterShapes() {
+	drawScene(1);
+	bool update = false;
+
+	for (EobMonsterInPlay *m = _monsters; m < &_monsters[30]; m++) {
+		if (m->flags & 2) {
+			m->flags &= ~2;
+			update = true;
+			if (m->hitPointsCur <= 0)
+				killMonster(m, true);
+		}
+	}
+
+	if (update) {
+		_sceneUpdateRequired = true;
+		_flashShapeTimer = _system->getMillis() + _tickLength;
+	} else {
+		_sceneUpdateRequired = false;
+	}
+	_inflictMonsterDamageUnk = 0;
+}
+
+void EobCoreEngine::drawBlockItems(int index) {
+	uint16 o = _visibleBlocks[index]->drawObjects;
+	uint8 w = _visibleBlocks[index]->walls[_sceneDrawVarDown];
+	uint8 flg = (index == 16) ? 0x80 : _wllWallFlags[w];
+
+	if (_wllVmpMap[w] && !(flg & 0x80))
+		return;
+
+	uint16 o2 = o = _items[o].next;
+	bool forceLoop = true;
+	static const int8 itemPosYNiche[] = { 0x25, 0x31, 0x38, 0x00 };
+	static const int8 itemPosFin[] = { 0, -2, 1, -1, 2, 0, 1, -1 };
+	int tile2 = 0;
+
+	while (o != o2 || forceLoop) {
+		EobItem *itm = &_items[o];
+		if (itm->pos == 8 || itm->pos < 4) {
+			tile2 = -1;
+
+			uint8 ps = (itm->pos == 8) ? 4 : _dscItemPosIndex[(_currentDirection << 2) + (itm->pos & 3)];
+			uint16 wo = (index * 5 + ps) << 1;
+			int x = _dscShapeCoords[wo] + 88;
+			int y = 0;
+
+			if (itm->pos == 8) {
+				x = _dscItemShpX[index];
+				y = itemPosYNiche[_dscDimMap[index]];
+				ps = 0;
+			} else {
+				y = _dscShapeCoords[wo + 1] + 124;
+			}
+
+			int8 scaleSteps = (int8)_dscItemScaleIndex[(_dscDimMap[index] << 2) + ps];
+			if (flg & 8 && ps < 2 && scaleSteps) {
+				tile2 = _dscItemTileIndex[index];
+				if (tile2 != -1)
+					setLevelShapesDim(tile2, _shpDmX1, _shpDmX2, 5);
+				y -= 4;
+			}
+
+			if (scaleSteps >= 0) {
+				const uint8 *shp = _screen->scaleShape(_dscItemShapeMap[itm->icon] < _numLargeItemShapes ? _largeItemShapes[_dscItemShapeMap[itm->icon]] : (_dscItemShapeMap[itm->icon] < 15 ? 0 : _smallItemShapes[_dscItemShapeMap[itm->icon] - 15]), scaleSteps);
+				x = x + itemPosFin[o & 7] - (shp[2] << 2);
+				y -= shp[1];
+
+				if (itm->pos != 8)
+					y += itemPosFin[(o >> 1) & 7];
+
+				drawBlockObject(0, 2, shp, x, y, 5);
+				_screen->setShapeFadeMode(1, false);
+			}
+		}
+
+		o = itm->next;
+		forceLoop = false;
+		if(tile2 != -1)
+			setLevelShapesDim(index, _shpDmX1, _shpDmX2, 5);
+	}
+}
+
+void EobCoreEngine::drawDoor(int index) {
+	int s = _visibleBlocks[index]->walls[_sceneDrawVarDown];
+	int type = _dscDoorShpIndex[s];
+	int d = _dscDimMap[index];
+	int w = _dscShapeCoords[(index * 5 + 4) << 1];
+
+	int x = 88 + w;
+	int y = 0;
+
+	int16 y1 = 0;
+	int16 y2 = 0;
+	scaleLevelShapesDim(index, y1, y2, 5);
+	drawDoorIntern(type, index, x, y, w, s, d, y1, y2);
+	drawLevelModifyScreenDim(5, _shpDmX1, 0, _shpDmX2, 15);
+}
+
+void EobCoreEngine::drawMonsters(int index) {
+	static const uint8 distMap[] = { 2, 1, 0, 4 };
+	static const uint8 yAdd[] = { 20, 12, 4, 4, 2, 0, 0 };
+
+	int blockDistance = distMap[_dscDimMap[index]];
+
+	uint16 bl = _visibleBlockIndex[index];
+	if (!bl)
+		return;
+
+	int drawObjDirIndex = _currentDirection * 5;
+	int cDirOffs = _currentDirection << 2;
+
+	EobMonsterInPlay *drawObj[5];
+	memset(drawObj, 0, 5 * sizeof(EobMonsterInPlay*));
+
+	for (int i = 0; i < 30; i++) {
+		if (_monsters[i].block != bl)
+			continue;
+		drawObj[_drawObjPosIndex[drawObjDirIndex + _monsters[i].pos]] = &_monsters[i];
+	}
+
+	for (int i = 0; i < 5; i++) {
+		EobMonsterInPlay *d = drawObj[i];
+		if (!d)
+			continue;
+
+		EobMonsterProperty *p = &_monsterProps[d->type];
+
+		if (_flags.gameID == GI_EOB2 && (p->flags & 0x100) && !(_partyEffectFlags & 0x220) && !(d->flags & 2))
+			continue;
+
+		int f = (d->animStep << 4) + cDirOffs + d->dir;
+		f = (p->flags & 2) ? _monsterFrmOffsTable1[f] : _monsterFrmOffsTable2[f];
+
+		if (!blockDistance && d->curAttackFrame < 0)
+			f = d->curAttackFrame + 7;
+
+		int subFrame = ABS(f);
+		int shpIndex = d->shpIndex ? 18 : 0;
+		int palIndex = d->palette ? ((((shpIndex == 18) ? subFrame + 5 : subFrame - 1) << 1) + (d->palette - 1)) : -1;
+
+		const uint8 *shp = _screen->scaleShape(_monsterShapes[subFrame + shpIndex - 1], blockDistance);
+
+		int v30 = (subFrame == 1 || subFrame > 3) ? 1 : 0;
+		int v1e = (d->pos == 4) ? 4 : _dscItemPosIndex[cDirOffs + d->pos];
+		int posIndex = (index * 5 + v1e) << 1;
+
+		int x = _dscShapeCoords[posIndex] + 88;
+		int y = _dscShapeCoords[posIndex + 1] + 127;
+
+		if (p->u30 == 1) {
+			if (v30) {
+				if (_flags.gameID == GI_EOB2)
+					posIndex = ((posIndex >> 1) - v1e) << 1;
+				y = _dscShapeCoords[posIndex + 1] + 127 + yAdd[blockDistance + ((v1e == 4 || _flags.gameID == GI_EOB1) ? 0 : 3)];
+			} else {
+				if (_flags.gameID == GI_EOB2)
+					posIndex = ((posIndex >> 1) - v1e + 4) << 1;
+				x = _dscShapeCoords[posIndex] + 88;
+			}
+		}
+
+		int w = shp[2] << 3;
+		int h = shp[1];
+
+		x = x - (w >> 1) + (d->idleAnimState >> 4);
+		y = y - h + (d->idleAnimState & 0x0f);
+
+		drawMonsterShape(shp, x, y, f >= 0 ? 0 : 1, d->flags, palIndex);
+
+		if (_flags.gameID == GI_EOB1) {
+			_screen->setShapeFadeMode(1, false);
+			continue;
+		}
+
+		for (int ii = 0; ii < 3; ii++) {
+			if (!p->decorations[ii])
+				continue;
+
+			SpriteDecoration *dcr = &_monsterDecorations[(p->decorations[ii] - 1) * 6 + subFrame + shpIndex - 1];
+
+			if (!dcr)
+				continue;
+			if (!dcr->shp)
+				continue;
+
+			shp = _screen->scaleShape(dcr->shp, blockDistance);
+			int dx = dcr->x;
+			int dy = dcr->y;
+
+			for (int iii = 0; iii < blockDistance; iii++) {
+				dx = (dx << 1) / 3;
+				dy = (dy << 1) / 3;
+			}
+
+			drawMonsterShape(shp, x + ((f < 0) ? (w - dx - (shp[2] << 3)) : dx), y + dy, f >= 0 ? 0 : 1, d->flags, -1);
+		}
+		_screen->setShapeFadeMode(1, false);
+	}
+}
+
+void EobCoreEngine::drawWallOfForce(int index) {
+
+}
+
+void EobCoreEngine::drawFlyingObjects(int index) {
+	LevelBlockProperty *bl = _visibleBlocks[index];
+	int blockIndex = _visibleBlockIndex[index];
+	int w = bl->walls[_sceneDrawVarDown];
+
+	if (_wllVmpMap[w] && !(_wllWallFlags[w] & 0x80))
+		return;
+
+	EobFlyingObject *drawObj[5];
+	memset(drawObj, 0, 5 * sizeof(EobFlyingObject*));
+
+	for (int i = 0; i < 10; i++) {
+		if (!_flyingObjects[i].enable || blockIndex != _flyingObjects[i].curBlock)
+			continue;
+		drawObj[_drawObjPosIndex[_currentDirection * 5 + (_flyingObjects[i].curPos & 3)]] = &_flyingObjects[i];
+	}
+
+	for (int i = 0; i < 5; i++) {
+		EobFlyingObject *fo = drawObj[i];
+		if (!fo)
+			continue;
+
+		int p = _dscItemPosIndex[(_currentDirection << 2) + (fo->curPos & 3)];
+		int x = _dscShapeCoords[(index * 5 + p) << 1] + 88;
+		int y = 39;
+
+		int sclValue = _flightObjSclIndex[(index << 2) + p];
+		int flipped = 0;
+
+		if (sclValue < 0) {
+			_screen->setShapeFadeMode(1, false);
+			continue;
+		}
+
+		const uint8 *shp = 0;
+		bool rstFade = false;
+
+		if (fo->enable == 1) {
+			int shpIx = _dscItemShapeMap[_items[fo->item].icon];
+			int dirOffs = (fo->direction == _currentDirection) ? 0 : ((fo->direction == (_currentDirection ^ 2)) ? 1 : -1);
+
+			if (dirOffs == -1 || _flightObjShpMap[shpIx] == -1) {
+				shp = shpIx < _numLargeItemShapes ? _largeItemShapes[shpIx] : (shpIx < 15 ? 0 : _smallItemShapes[shpIx - 15]);
+				flipped = fo->direction == ((_currentDirection + 1) & 3) ? 1 : 0;
+			} else {
+				shp = (_flightObjShpMap[shpIx] + dirOffs) < _numThrownItemShapes ? _thrownItemShapes[_flightObjShpMap[shpIx] + dirOffs] : _spellShapes[_flightObjShpMap[shpIx - _numThrownItemShapes] + dirOffs];
+				flipped = _flightObjFlipIndex[(fo->direction << 2) + fo->curPos];
+			}
+
+		} else {
+			rstFade = true;
+			shp = (fo->objectType < _numThrownItemShapes) ? _thrownItemShapes[fo->objectType] : _spellShapes[fo->objectType - _numThrownItemShapes];
+			flipped = _flightObjFlipIndex[(fo->direction << 2) + fo->curPos];
+
+			if (fo->flags & 0x40) {
+				x = _dscShapeCoords[(index * 5 + 4) << 1] + 88;
+				y = 44;
+			}
+		}
+
+		shp = _screen->scaleShape(shp, sclValue);
+
+		if (rstFade) {
+			_screen->setShapeFadeMode(1, false);
+			rstFade = false;
+		}
+
+		x -= (shp[2] << 2);
+		y -= (y == 44 ? (shp[1]  >> 1) : shp[1]);
+
+		drawBlockObject(flipped, 2, shp, x, y, 5);
+		_screen->setShapeFadeMode(1, false);
+	}
+}
+
+void EobCoreEngine::drawTeleporter(int index) {
+	static const uint8 telprtX[] = { 0x28, 0x1C, 0x12 };
+	static const uint8 telprtY[] = { 0x0D, 0x15, 0x1A };
+
+	int t = 2 - _dscDimMap[index];
+	if (t < 0)
+		return;
+
+	int16 x1 = _dscItemShpX[index] - telprtX[t];
+	int16 y1 = telprtY[t];
+
+	for (int i = 0; i < 2; i++) {
+
+		int16 x2 = 0;
+		int16 y2 = 0;
+		int d = (t << 1) + i;
+		if (!d)
+			x2 = y2 = -4;
+
+		const uint8 *shp = _teleporterShapes[d ^ _teleporterPulse];
+
+		for (int ii = 0; ii < 13; ii++)
+			drawBlockObject(0, 2, shp, x1 + x2 + _teleporterShapeCoords[d * 26 + ii * 2], y1 + y2 + _teleporterShapeCoords[d * 26 + ii * 2 + 1], 5);
+	}
+}
+
+void EobCoreEngine::updateMonsters(int unit) {
+	for (int i = 0; i < 30; i++) {
+		EobMonsterInPlay *m = &_monsters[i];
+
+		if (m->unit == unit) {
+			if (m->hitPointsCur <= 0 || m->flags & 0x20)
+				continue;
+			if (m->directionChanged) {
+				m->directionChanged = 0;
+				continue;
+			}
+
+			updateMonsterDest(m);
+
+			if (m->mode > 0)
+				updateMonsterDest2(m);
+
+			switch (m->mode) {
+			case 0:
+				updateMoveMonster(m);
+				break;
+			case 1:
+				updateMonsterFollowPath(m, 2);
+				break;
+			case 2:
+				updateMonsterFollowPath(m, -1);
+				break;
+			case 3:
+				updateMonsterFollowPath(m, 1);
+				break;
+			case 5:
+				updateMonstersStraying(m, -1);
+				break;
+			case 6:
+				updateMonstersStraying(m, 1);
+				break;
+			case 7:
+			case 10:
+				updateMonsters_mode710(m);
+				break;
+			default:
+				break;
+			}
+
+			if (m->mode != 4 && m->mode != 7 && m->mode != 8)
+				m->animStep ^= 1;
+
+			if (_monsterProps[m->type].u30 == 1)
+				setBlockMonsterDirection(m->block, m->dir);
+		}
+	}
+	checkFlyingObjects();
+}
+
+void EobCoreEngine::updateMonsterDest(EobMonsterInPlay *m) {
+	if (m->mode >= 7 && m->mode <= 10)
+		return;
+	int dist = getBlockDistance(m->block, _currentBlock);
+	if (dist >= 4)
+		return;
+
+	int s = getNextMonsterDirection(m->block, _currentBlock) - (m->dir << 1) - 3;
+
+	if (s < 0)
+		s += 8;
+
+	if (s <= 2 && dist >= 2)
+		return;
+
+	m->mode = 0;
+	m->dest = _currentBlock;
+}
+
+void EobCoreEngine::updateMonsterDest2(EobMonsterInPlay *m) {
+	if (!(m->flags & 1) || m->mode == 10)
+		return;
+	if (m->mode == 8) {
+		turnFriendlyMonstersHostile();
+		return;
+	}
+	m->mode = 0;
+	m->dest = _currentBlock;
+}
+
+void EobCoreEngine::turnFriendlyMonstersHostile() {
+	EobMonsterInPlay *m = 0;
+	for (int i = 0; i < 30; i++) {
+		if (_monsters[i].mode == 8) {
+			_monsters[i].mode = 0;
+			_monsters[i].dest = _currentBlock;
+			m = &_monsters[i];
+		}
+	}
+
+	if (m) {
+		if (m->type == 7)
+			_inf->setFlag(0x40000);
+		else if (m->type == 12)
+			_inf->setFlag(0x8000000);
+	}
+}
+
+int EobCoreEngine::getNextMonsterDirection(int curBlock, int destBlock) {
+	uint8 c = destBlock % 32;
+	uint8 d = destBlock / 32;
+	uint8 e = curBlock % 32;
+	uint8 f = curBlock / 32;
+
+	int r = 0;
+
+	int s1 = f - d;
+	int d1 = ABS(s1);
+	s1 <<= 1;
+	int s2 = c - e;
+	int d2 = ABS(s2);
+	s2 <<= 1;
+
+	if (s1 >= d2)
+		r |= 8;
+	if (-s1 >= d2)
+		r |= 4;
+	if (s2 >= d1)
+		r |= 2;
+	if (-s2 >= d1)
+		r |= 1;
+
+	return _monsterDirChangeTable[r];
+}
+
+int EobCoreEngine::getNextMonsterPos(EobMonsterInPlay *m, int block) {
+	if ((_flags.gameID == GI_EOB1 && _monsterProps[m->type].u30 != 0) || (_flags.gameID == GI_EOB2 && _monsterProps[m->type].u30 == 2))
+		return -1;
+	int d = findFreeMonsterPos(block, _monsterProps[m->type].u30);
+	if (d < 0)
+		return -1;
+
+	int dir = m->dir;
+	if (_flags.gameID == GI_EOB2) {
+		if (_monsterProps[m->type].u30 == 1) {
+			if (d == 9)
+				return -1;
+
+			int v = _monsterCloseAttUnkTable[d];
+			if (v != -1)
+				//////
+				m->dir = 0;
+			return v;
+		}
+	} else {
+		dir &= 1;
+	}
+
+	for (int i = 0; i < 4; i++) {
+		int v = m->dir ^ _monsterCloseAttPosTable2[(dir << 2) + i];
+		if (!(d & (1 << v)))
+			return v;
+	}
+
+	return -1;
+}
+
+int EobCoreEngine::findFreeMonsterPos(int block, int size) {
+	int nm = _levelBlockProperties[block].flags & 7;
+	if (nm == 4)
+		return -2;
+
+	int res = 0;
+
+	for (int i = 0; i < 30; i++) {
+		EobMonsterInPlay *m = &_monsters[i];
+		if (m->block != block)
+			continue;
+		if (_monsterProps[m->type].u30 != size)
+			return -1;
+
+		if (m->pos == 4 && !(_flags.gameID == GI_EOB2 && m->flags & 0x20))
+			m->pos = (_flags.gameID == GI_EOB2 && _monsterProps[m->type].u30 == 1) ? 0 : _monsterCloseAttPosTable1[m->dir];
+
+		res |= (1 << m->pos);
+		if (--nm == 0)
+			break;
+	}
+
+	return res;
+}
+
+void EobCoreEngine::updateMoveMonster(EobMonsterInPlay *m) {
+	EobMonsterProperty *p = &_monsterProps[m->type];
+	int d = getNextMonsterDirection(m->block, _currentBlock);
+
+	if ((p->flags & 0x800) && !(d & 1))
+		d >>= 1;
+	else
+		d = m->dir;
+
+	d = calcNewBlockPosition(m->block, d);
+
+	if (m->dest == d && _currentBlock != d) {
+		m->mode = rollDice(1, 2, -1) + 5;
+		return;
+	}
+
+	if (updateMonsterTryDistanceAttack(m))
+		return;
+
+	if (updateMonsterTryCloseAttack(m, d))
+		return;
+
+	m->curAttackFrame = 0;
+	walkMonster(m, m->dest);
+
+	if (p->flags & 8)
+		updateMonsterTryCloseAttack(m, -1);
+}
+
+bool EobCoreEngine::updateMonsterTryDistanceAttack(EobMonsterInPlay *m) {
+	EobMonsterProperty *p = &_monsterProps[m->type];
+	if (!m->numRemoteAttacks || ((_flags.gameID == GI_EOB1) && !(p->flags & 0x40)))
+		return false;
+
+	if ((_flags.gameID == GI_EOB1 && m->stepsTillRemoteAttack == 5) || (_flags.gameID == GI_EOB2 && rollDice(1, 3) > m->stepsTillRemoteAttack)) {
+		m->stepsTillRemoteAttack++;
+		return false;
+	}
+
+	if (getBlockDistance(m->block, _currentBlock) > 3 || getNextMonsterDirection(m->block, _currentBlock) != (m->dir << 1))
+		return false;
+
+	int d = m->dir;
+	int bl = calcNewBlockPosition(m->block, d);
+
+	while (bl != _currentBlock) {
+		if (!(_wllWallFlags[_levelBlockProperties[bl].walls[d ^ 2]] & 3) || (_levelBlockProperties[bl].flags & 7))
+			return false;
+		bl = calcNewBlockPosition(bl, d);
+	}
+
+	Item itm = 0;
+	if (_flags.gameID == GI_EOB1) {
+		switch (m->type - 4) {
+		case 0:
+			launchMagicObject(-1, 9, m->block, m->pos, m->dir);
+			snd_processEnvironmentalSoundEffect(31, m->block);
+			break;
+		case 10:
+			launchMagicObject(-1, _monsterDistAttType10[m->numRemoteAttacks], m->block, m->pos, m->dir);
+			snd_processEnvironmentalSoundEffect(_monsterDistAttSfx10[m->numRemoteAttacks], m->block);
+			break;
+		case 11:
+			itm = duplicateItem(60);
+			if (itm) {
+				if (launchObject(-1, itm, m->block, m->pos, m->dir, _items[itm].type))
+					_items[itm].block = -1;
+			}
+			break;
+		case 12:
+			launchMagicObject(-1, 0, m->block, m->pos, m->dir);
+			snd_processEnvironmentalSoundEffect(85, m->block);
+			break;
+		case 13:
+			snd_processEnvironmentalSoundEffect(83, m->block);
+			_txt->printMessage(_monsterSpecAttStrings[1]);
+			for (int i = 0; i < 6; i++)
+				statusAttack(i, 4, _monsterSpecAttStrings[2], 1, 5, 9, 1);
+			break;
+		case 17:
+			d = rollDice(1, 4, -1);
+			if (d >= 3) {
+				for (int i = 0; i < 6; i++) {
+					if (!testCharacter(i, 3))
+						continue;
+					_txt->printMessage(_monsterSpecAttStrings[0], -1, _characters[i].name);
+					inflictCharacterDamage(i, rollDice(2, 8, 1));
+				}
+				snd_processEnvironmentalSoundEffect(108, m->block);
+			} else {
+				launchMagicObject(-1, _monsterDistAttType17[m->numRemoteAttacks], m->block, m->pos, m->dir);
+				snd_processEnvironmentalSoundEffect(_monsterDistAttSfx17[m->numRemoteAttacks], m->block);
+			}
+			break;
+		default:
+			break;
+		}
+
+	} else {
+		int cw = 0;
+		if (p->remoteWeaponChangeMode == 1) {
+			cw = m->curRemoteWeapon++;
+			if (m->curRemoteWeapon == p->numRemoteWeapons)
+				m->curRemoteWeapon = 0;
+		} else if (p->remoteWeaponChangeMode == 2) {
+			cw = rollDice(1, p->numRemoteWeapons, -1);
+		}
+
+		int s = p->remoteWeapons[cw];
+		if (s >= 0) {
+			if (s < 20) {
+				monsterSpellCast(m, s);
+			} else if (s == 20) {
+				snd_processEnvironmentalSoundEffect(103, m->block);
+				_txt->printMessage(_monsterSpecAttStrings[0]);
+				for (int i = 0; i < 6; i++)
+					statusAttack(i, 4, _monsterSpecAttStrings[1], 1, 5, 9, 1);
+			}
+		} else {
+			Item itm = duplicateItem(-s);
+			if (itm) {
+				if (launchObject(-1, itm, m->block, m->pos, m->dir, _items[itm].type))
+					_items[itm].block = -1;
+			}
+		}
+	}
+
+	if (m->numRemoteAttacks != 255)
+		m->numRemoteAttacks--;
+	m->stepsTillRemoteAttack = 0;
+	return true;
+}
+
+bool EobCoreEngine::updateMonsterTryCloseAttack(EobMonsterInPlay *m, int block) {
+	if (block == -1)
+		block = calcNewBlockPosition(m->block, m->dir);
+
+	if (block != _currentBlock)
+		return false;
+
+	int r = (m->pos == 4 || (_flags.gameID == GI_EOB2 && _monsterProps[m->type].u30 == 1)) ? 1 : _monsterCloseAttChkTable1[(m->dir << 2) + m->pos];
+
+	if (r) {
+		m->flags ^= 4;
+		if (!(m->flags & 4))
+			return true;
+
+		bool facing = (m->block == _visibleBlockIndex[13]);
+
+		if (facing) {
+			disableSysTimer(2);
+			if (m->type == 4)
+				updateEnvironmentalSfx(_monsterProps[m->type].sound1);
+			m->curAttackFrame = -2;
+			_flashShapeTimer = 0;
+			drawScene(1);
+			m->curAttackFrame = -1;
+			if (m->type != 4)
+				updateEnvironmentalSfx(_monsterProps[m->type].sound1);
+			_flashShapeTimer = _system->getMillis() + 8 * _tickLength;
+			drawScene(1);
+		} else {
+			updateEnvironmentalSfx(_monsterProps[m->type].sound1);
+		}
+
+		monsterCloseAttack(m);
+
+		if (facing) {
+			m->curAttackFrame = 0;
+			m->animStep ^= 1;
+			_sceneUpdateRequired = 1;
+			enableSysTimer(2);
+			_flashShapeTimer = _system->getMillis() + 8 * _tickLength;
+		}
+	} else {
+		int b = m->block;
+		if ((_levelBlockProperties[b].flags & 7) == 1) {
+			m->pos = 4;
+		} else {
+			b = getNextMonsterPos(m, b);
+			if (b >= 0)
+				m->pos = b;
+		}
+		checkSceneUpdateNeed(m->block);
+	}
+
+	return true;
+}
+
+void EobCoreEngine::walkMonster(EobMonsterInPlay *m, int destBlock) {
+	if (++_monsterStepCounter > 10) {
+		_monsterStepCounter = 0;
+		_monsterStepMode ^= 1;
+	}
+
+	const int8 *tbl = _monsterStepMode ? _monsterStepTable3 : _monsterStepTable2;
+
+	int s = m->dir << 1;
+	int b = m->block;
+	int d = getNextMonsterDirection(b, destBlock);
+	if (d == -1)
+		return;
+
+	if (m->flags & 8) {
+		if (_flags.gameID == GI_EOB1 ) {
+			d ^= 4;
+		} else if (--m->f_b <= 0) {
+			m->f_b = 0;
+			m->flags &= ~8;
+		} else {
+			d ^= 4;
+		}
+	}
+
+	int d2 = (d - s) & 7;
+
+	if (b + _monsterStepTable0[_flags.gameID == GI_EOB1 ? (d >> 1) : d] == destBlock) {
+		if (_flags.gameID == GI_EOB1 && !(d & 1)) {
+			if (d2 >= 5) {
+				s = m->dir - 1;
+			} else if (d2 != 0) {
+				s = m->dir + 1;
+			}
+			walkMonsterNextStep(m, -1, s & 3);
+			return;
+		} else if (_flags.gameID == GI_EOB2) {
+			if (d & 1) {
+				int e = _monsterStepTable1[((d - 1) << 1) + m->dir];
+				if (e && !((_monsterProps[m->type].flags & 0x200) && (rollDice(1, 4) == 4))) {
+					if (walkMonsterNextStep(m, b + e, -1))
+						return;
+				}
+			} else {
+				walkMonsterNextStep(m, -1, d >> 1);
+				return;
+			}
+		}
+	}
+
+	if (d2) {
+		if (d2 >= 5)
+			s -= (1 + ((d & 1) ^ 1));
+		else
+			s += (1 + ((d & 1) ^ 1));
+		s &= 7;
+	}
+
+	for (int i = 7; i > -1; i--) {
+		s = (s + tbl[i]) & 7;
+		uint16 b2 = (s & 1) ? 0 : calcNewBlockPosition(b, s >> 1);
+		if (!b2)
+			continue;
+		if (walkMonsterNextStep(m, b2, s >> 1))
+			return;
+	}
+}
+
+bool EobCoreEngine::walkMonsterNextStep(EobMonsterInPlay *m, int destBlock, int direction) {
+	EobMonsterProperty *p = &_monsterProps[m->type];
+	int obl = m->block;
+
+	if (destBlock != m->block && destBlock != -1) {
+		if (m->flags & 8) {
+			if (getBlockDistance(destBlock, _currentBlock) < getBlockDistance(m->block, _currentBlock))
+				return false;
+		}
+
+		if (destBlock == _currentBlock)
+			return false;
+
+		if (direction == -1)
+			direction = m->dir;
+
+		LevelBlockProperty *l = &_levelBlockProperties[destBlock];
+		uint8 w = l->walls[direction ^ 2];
+
+		if (!(_wllWallFlags[w] & 4)) {
+			if (_flags.gameID == GI_EOB1 ||!(p->flags & 0x1000) || _wllShapeMap[w] != -1)
+				return false;
+
+			if (_wllWallFlags[w] & 0x20) {
+				if (p->flags & 4 && m->type == 1)
+					l->walls[direction] = l->walls[direction ^ 2] = 72;
+				else
+					openDoor(destBlock);
+			}
+
+			if (direction != -1) {
+				m->dir = direction;
+				checkSceneUpdateNeed(m->block);
+			}
+			return true;
+		}
+
+		if ((l->flags & 7) && destBlock) {
+			int pos = getNextMonsterPos(m, destBlock);
+			if (pos == -1)
+				return false;
+			m->pos = pos;
+		}
+
+		placeMonster(m, destBlock, direction);
+		direction = -1;
+	}
+
+	if (direction != -1)
+		m->dir = direction;
+
+	checkSceneUpdateNeed(obl);
+	if (!_partyResting && p->sound2)
+		snd_processEnvironmentalSoundEffect(p->sound2, m->block);
+
+	return true;
+}
+
+void EobCoreEngine::updateMonsterFollowPath(EobMonsterInPlay *m, int turnSteps) {
+	if (!walkMonsterNextStep(m, calcNewBlockPosition(m->block, m->dir), -1)) {
+		m->dir = (m->dir + turnSteps) & 3;
+		walkMonsterNextStep(m, -1, m->dir);
+	}
+}
+
+void EobCoreEngine::updateMonstersStraying(EobMonsterInPlay *m, int a) {
+	if (m->f_9 >= 0) {
+		if (m->f_9 == 0)
+			updateMonsterFollowPath(m, -a);
+
+		int8 d = (m->dir + a) & 3;
+		uint16 bl = calcNewBlockPosition(m->block, d);
+		uint8 flg = _wllWallFlags[_levelBlockProperties[bl].walls[_dscBlockMap[d]]] & 4;
+
+		if (m->f_9 == 0) {
+			if (!flg)
+				m->f_9 = -1;
+			return;
+		}
+
+		if (flg) {
+			walkMonsterNextStep(m, -1, d);
+			m->f_9 = -1;
+			return;
+		}
+	}
+
+	if (walkMonsterNextStep(m, calcNewBlockPosition(m->block, m->dir), -1)) {
+		m->f_9 = 1;
+	} else {
+		walkMonsterNextStep(m, -1, (m->dir - a) & 3);
+		m->f_9 = 0;
+	}
+}
+
+void EobCoreEngine::updateMonsters_mode710(EobMonsterInPlay *m) {
+	if (m->f_b) {
+		if (!--m->f_b)
+			m->mode = 0;
+	}
+}
+
+void EobCoreEngine::setBlockMonsterDirection(int block, int dir) {
+	for (int i = 0; i < 30; i++) {
+		if (_monsters[i].block != block || _monsters[i].dir == dir)
+			continue;
+		_monsters[i].dir = dir;
+		_monsters[i].directionChanged == 1;
+	}
+}
+
+} // End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp
index fbf4c7c5c2..9f7e05627b 100644
--- a/engines/kyra/sprites_lol.cpp
+++ b/engines/kyra/sprites_lol.cpp
@@ -59,7 +59,7 @@ void LoLEngine::loadMonsterShapes(const char *file, int monsterIndex, int animTy
 
 	for (int i = 0; i < 4; i++) {
 		for (int ii = 0; ii < 16; ii++) {
-			uint8 **of = &_monsterShapesEx[monsterIndex * 192 + i * 48 + ii * 3];
+			uint8 **of = &_monsterDecorationShapes[monsterIndex * 192 + i * 48 + ii * 3];
 			int s = (i << 4) + ii + 17;
 			of[0] = _screen->makeShapeCopy(p, s);
 			of[1] = _screen->makeShapeCopy(p, s + 1);
@@ -140,9 +140,9 @@ void LoLEngine::releaseMonsterShapes(int monsterIndex) {
 
 	for (int i = 0; i < 192; i++) {
 		int pos = (monsterIndex * 192) + i;
-		if (_monsterShapesEx[pos]) {
-			delete[] _monsterShapesEx[pos];
-			_monsterShapesEx[pos] = 0;
+		if (_monsterDecorationShapes[pos]) {
+			delete[] _monsterDecorationShapes[pos];
+			_monsterDecorationShapes[pos] = 0;
 		}
 	}
 }
@@ -159,7 +159,7 @@ int LoLEngine::deleteMonstersFromBlock(int block) {
 			continue;
 		}
 
-		MonsterInPlay *m = &_monsters[i & 0x7fff];
+		LolMonsterInPlay *m = &_monsters[i & 0x7fff];
 
 		cnt++;
 		setMonsterMode(m, 14);
@@ -173,7 +173,7 @@ int LoLEngine::deleteMonstersFromBlock(int block) {
 	return cnt;
 }
 
-void LoLEngine::setMonsterMode(MonsterInPlay *monster, int mode) {
+void LoLEngine::setMonsterMode(LolMonsterInPlay *monster, int mode) {
 	if (monster->mode == 13 && mode != 14)
 		return;
 
@@ -210,7 +210,7 @@ void LoLEngine::setMonsterMode(MonsterInPlay *monster, int mode) {
 	}
 }
 
-bool LoLEngine::updateMonsterAdjustBlocks(MonsterInPlay *monster) {
+bool LoLEngine::updateMonsterAdjustBlocks(LolMonsterInPlay *monster) {
 	static const uint8 dims[] = { 0, 13, 9, 3 };
 	if (monster->properties->flags & 8)
 		return true;
@@ -251,7 +251,7 @@ bool LoLEngine::updateMonsterAdjustBlocks(MonsterInPlay *monster) {
 	return (fx1 >= fx2) ? false : true;
 }
 
-void LoLEngine::placeMonster(MonsterInPlay *monster, uint16 x, uint16 y) {
+void LoLEngine::placeMonster(LolMonsterInPlay *monster, uint16 x, uint16 y) {
 	bool cont = true;
 	int t = monster->block;
 	if (monster->block) {
@@ -329,7 +329,7 @@ int LoLEngine::calcMonsterDirection(uint16 x1, uint16 y1, uint16 x2, uint16 y2)
 	return retVal[r];
 }
 
-void LoLEngine::setMonsterDirection(MonsterInPlay *monster, int dir) {
+void LoLEngine::setMonsterDirection(LolMonsterInPlay *monster, int dir) {
 	monster->direction = dir;
 
 	if (!(dir & 1) || ((monster->direction - (monster->facing << 1)) >= 2))
@@ -338,7 +338,7 @@ void LoLEngine::setMonsterDirection(MonsterInPlay *monster, int dir) {
 	checkSceneUpdateNeed(monster->block);
 }
 
-void LoLEngine::monsterDropItems(MonsterInPlay *monster) {
+void LoLEngine::monsterDropItems(LolMonsterInPlay *monster) {
 	uint16 a = monster->assignedItems;
 	while (a) {
 		uint16 b = a;
@@ -503,7 +503,7 @@ int LoLEngine::checkBlockForWallsAndSufficientSpace(int block, int x, int y, int
 
 	uint16 b = _levelBlockProperties[block].assignedObjects;
 	while (b & 0x8000) {
-		MonsterInPlay *monster = &_monsters[b & 0x7fff];
+		LolMonsterInPlay *monster = &_monsters[b & 0x7fff];
 
 		if (monster->mode < 13) {
 			int r = checkDrawObjectSpace(x, y, monster->x, monster->y);
@@ -645,7 +645,7 @@ void LoLEngine::drawBlockObjects(int blockArrayIndex) {
 }
 
 void LoLEngine::drawMonster(uint16 id) {
-	MonsterInPlay *m = &_monsters[id];
+	LolMonsterInPlay *m = &_monsters[id];
 	int16 flg = _monsterDirFlags[(_currentDirection << 2) + m->facing];
 	int curFrm = getMonsterCurFrame(m, flg & 0xffef);
 	uint8 *shp = 0;
@@ -670,7 +670,7 @@ void LoLEngine::drawMonster(uint16 id) {
 			if (v == -1)
 				break;
 
-			uint8 *shp2 = _monsterShapesEx[m->properties->shapeIndex * 192 + v * 48 + curFrm * 3];
+			uint8 *shp2 = _monsterDecorationShapes[m->properties->shapeIndex * 192 + v * 48 + curFrm * 3];
 			if (!shp2)
 				continue;
 
@@ -721,7 +721,7 @@ void LoLEngine::drawMonster(uint16 id) {
 	delete[] tbl;
 }
 
-int LoLEngine::getMonsterCurFrame(MonsterInPlay *m, uint16 dirFlags) {
+int LoLEngine::getMonsterCurFrame(LolMonsterInPlay *m, uint16 dirFlags) {
 	int tmp = 0;
 	switch (_monsterAnimType[m->properties->shapeIndex]) {
 	case 0:
@@ -901,7 +901,7 @@ void LoLEngine::drawDoor(uint8 *shape, uint8 *doorPalette, int index, int unk2,
 	if (!shape)
 		return;
 
-	uint8 c = _dscDoor1[(_currentDirection << 5) + unk2];
+	uint8 c = _dscDoorY2[(_currentDirection << 5) + unk2];
 	int r = (c / 5) + 5 * _dscDimMap[index];
 	uint16 d = _dscShapeOvlIndex[r];
 	uint16 t = (index << 5) + c;
@@ -1080,7 +1080,7 @@ int LoLEngine::calcDrawingLayerParameters(int x1, int y1, int &x2, int &y2, uint
 	return l;
 }
 
-void LoLEngine::updateMonster(MonsterInPlay *monster) {
+void LoLEngine::updateMonster(LolMonsterInPlay *monster) {
 	static const uint8 flags[] = { 1, 0, 1, 3, 3, 0, 0, 3, 4, 1, 0, 0, 4, 0, 0 };
 	if (monster->mode > 14)
 		return;
@@ -1228,7 +1228,7 @@ void LoLEngine::updateMonster(MonsterInPlay *monster) {
 	monster->flags &= 0xffef;
 }
 
-void LoLEngine::moveMonster(MonsterInPlay *monster) {
+void LoLEngine::moveMonster(LolMonsterInPlay *monster) {
 	static const int8 turnPos[] = { 0, 2, 6, 6, 0, 2, 4, 4, 2, 2, 4, 6, 0, 0, 4, 6, 0 };
 	if (monster->x != monster->destX || monster->y != monster->destY) {
 		walkMonster(monster);
@@ -1238,7 +1238,7 @@ void LoLEngine::moveMonster(MonsterInPlay *monster) {
 	}
 }
 
-void LoLEngine::walkMonster(MonsterInPlay *monster) {
+void LoLEngine::walkMonster(LolMonsterInPlay *monster) {
 	if (monster->properties->flags & 0x400)
 		return;
 
@@ -1253,7 +1253,7 @@ void LoLEngine::walkMonster(MonsterInPlay *monster) {
 	} else {
 		setMonsterDirection(monster, s);
 		if (monster->numDistAttacks) {
-			if (getMonsterDistance(monster->block, _currentBlock) >= 2) {
+			if (getBlockDistance(monster->block, _currentBlock) >= 2) {
 				if (checkForPossibleDistanceAttack(monster->block, monster->direction, 3, _currentBlock) != 5) {
 					if (monster->distAttackTick)
 						return;
@@ -1269,7 +1269,7 @@ void LoLEngine::walkMonster(MonsterInPlay *monster) {
 	placeMonster(monster, fx, fy);
 }
 
-bool LoLEngine::chasePartyWithDistanceAttacks(MonsterInPlay *monster) {
+bool LoLEngine::chasePartyWithDistanceAttacks(LolMonsterInPlay *monster) {
 	if (!monster->numDistAttacks)
 		return false;
 
@@ -1295,7 +1295,7 @@ bool LoLEngine::chasePartyWithDistanceAttacks(MonsterInPlay *monster) {
 	int flyingObject = monster->properties->distWeapons[s];
 
 	if (flyingObject & 0xc000) {
-		if (getMonsterDistance(monster->block, _currentBlock) > 1) {
+		if (getBlockDistance(monster->block, _currentBlock) > 1) {
 			int type = flyingObject & 0x4000 ? 0 : 1;
 			flyingObject = makeItem(flyingObject & 0x3fff, 0, 0);
 
@@ -1305,7 +1305,7 @@ bool LoLEngine::chasePartyWithDistanceAttacks(MonsterInPlay *monster) {
 			}
 		}
 	} else if (!(flyingObject & 0x2000)) {
-		if (getMonsterDistance(monster->block, _currentBlock) > 1)
+		if (getBlockDistance(monster->block, _currentBlock) > 1)
 			return false;
 
 		if (flyingObject == 1) {
@@ -1326,7 +1326,7 @@ bool LoLEngine::chasePartyWithDistanceAttacks(MonsterInPlay *monster) {
 		} else if (flyingObject == 3) {
 			// shriek
 			for (int i = 0; i < 30; i++) {
-				if (getMonsterDistance(monster->block, _monsters[i].block) < 7)
+				if (getBlockDistance(monster->block, _monsters[i].block) < 7)
 					setMonsterMode(monster, 7);
 			}
 			_txt->printMessage(2, "%s", getLangString(0x401a));
@@ -1347,7 +1347,7 @@ bool LoLEngine::chasePartyWithDistanceAttacks(MonsterInPlay *monster) {
 	return true;
 }
 
-void LoLEngine::chasePartyWithCloseAttacks(MonsterInPlay *monster) {
+void LoLEngine::chasePartyWithCloseAttacks(LolMonsterInPlay *monster) {
 	if (!(monster->flags & 8)) {
 		int dir = calcMonsterDirection(monster->x & 0xff00, monster->y & 0xff00, _partyPosX & 0xff00, _partyPosY & 0xff00);
 		int x1 = _partyPosX;
@@ -1389,7 +1389,7 @@ void LoLEngine::chasePartyWithCloseAttacks(MonsterInPlay *monster) {
 	}
 }
 
-int LoLEngine::walkMonsterCalcNextStep(MonsterInPlay *monster) {
+int LoLEngine::walkMonsterCalcNextStep(LolMonsterInPlay *monster) {
 	static const int8 walkMonsterTable1[] = { 7, -6, 5, -4, 3, -2, 1, 0 };
 	static const int8 walkMonsterTable2[] = { -7, 6, -5, 4, -3, 2, -1, 0 };
 
@@ -1445,23 +1445,8 @@ int LoLEngine::walkMonsterCalcNextStep(MonsterInPlay *monster) {
 	return -1;
 }
 
-int LoLEngine::getMonsterDistance(uint16 block1, uint16 block2) {
-	int b1x = block1 & 0x1f;
-	int b1y = block1 >> 5;
-	int b2x = block2 & 0x1f;
-	int b2y = block2 >> 5;
-
-	uint8 dy = ABS(b2y - b1y);
-	uint8 dx = ABS(b2x - b1x);
-
-	if (dx > dy)
-		SWAP(dx, dy);
-
-	return (dx >> 1) + dy;
-}
-
 int LoLEngine::checkForPossibleDistanceAttack(uint16 monsterBlock, int direction, int distance, uint16 curBlock) {
-	int mdist = getMonsterDistance(curBlock, monsterBlock);
+	int mdist = getBlockDistance(curBlock, monsterBlock);
 
 	if (mdist > distance)
 		return 5;
@@ -1494,7 +1479,7 @@ int LoLEngine::checkForPossibleDistanceAttack(uint16 monsterBlock, int direction
 	return 5;
 }
 
-int LoLEngine::walkMonsterCheckDest(int x, int y, MonsterInPlay *monster, int unk) {
+int LoLEngine::walkMonsterCheckDest(int x, int y, LolMonsterInPlay *monster, int unk) {
 	uint8 m = monster->mode;
 	monster->mode = 15;
 
@@ -1512,7 +1497,7 @@ void LoLEngine::getNextStepCoords(int16 srcX, int16 srcY, int &newX, int &newY,
 	newY = (srcY + shiftTableY[direction]) & 0x1fff;
 }
 
-void LoLEngine::rearrangeAttackingMonster(MonsterInPlay *monster) {
+void LoLEngine::rearrangeAttackingMonster(LolMonsterInPlay *monster) {
 	int t = (monster->direction >> 1);
 	uint16 mx = monster->x;
 	uint16 my = monster->y;
@@ -1579,7 +1564,7 @@ void LoLEngine::rearrangeAttackingMonster(MonsterInPlay *monster) {
 	placeMonster(monster, mx, my);
 }
 
-void LoLEngine::moveStrayingMonster(MonsterInPlay *monster) {
+void LoLEngine::moveStrayingMonster(LolMonsterInPlay *monster) {
 	int x = 0;
 	int y = 0;
 
@@ -1616,13 +1601,13 @@ void LoLEngine::moveStrayingMonster(MonsterInPlay *monster) {
 	}
 }
 
-void LoLEngine::killMonster(MonsterInPlay *monster) {
+void LoLEngine::killMonster(LolMonsterInPlay *monster) {
 	setMonsterMode(monster, 14);
 	monsterDropItems(monster);
 	checkSceneUpdateNeed(monster->block);
 
 	uint8 w = _levelBlockProperties[monster->block].walls[0];
-	uint8 f = _levelBlockProperties[monster->block].flags;
+	uint16 f = _levelBlockProperties[monster->block].flags;
 	if (_wllVmpMap[w] == 0 && _wllShapeMap[w] == 0 && !(f & 0x40) && !(monster->properties->flags & 0x1000))
 		_levelBlockProperties[monster->block].flags |= 0x80;
 
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index e03369f700..acc61353f4 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -75,7 +75,9 @@ const IndexTable iGameTable[] = {
 	{ GI_KYRA1, 0 },
 	{ GI_KYRA2, 1 },
 	{ GI_KYRA3, 2 },
-	{ GI_LOL, 3 },
+	{ GI_EOB1, 3 },
+	{ GI_EOB2, 4 },
+	{ GI_LOL, 5 },
 	{ -1, -1 }
 };
 
@@ -257,6 +259,12 @@ bool StaticResource::init() {
 		{ kLolButtonData, proc(loadButtonDefs), proc(freeButtonDefs) },
 #endif // ENABLE_LOL
 
+#ifdef ENABLE_EOB
+		{ kEob2SequenceData, proc(loadEob2SeqData), proc(freeEob2SeqData) },
+		{ kEob2ShapeData, proc(loadEob2ShapeData), proc(freeEob2ShapeData) },
+		{ kEobNpcData, proc(loadEobNpcData), proc(freeEobNpcData) },
+#endif // ENABLE_EOB
+
 		{ 0, 0, 0 }
 	};
 #undef proc
@@ -503,9 +511,9 @@ bool StaticResource::loadHofSequenceData(Common::SeekableReadStream &stream, voi
 
 		tmp_s[i].flags = stream.readUint16BE();
 		tmp_s[i].wsaFile = new char[14];
-		stream.read(const_cast<char *>(tmp_s[i].wsaFile), 14);
+		stream.read(const_cast<char*>(tmp_s[i].wsaFile), 14);
 		tmp_s[i].cpsFile = new char[14];
-		stream.read(const_cast<char *>(tmp_s[i].cpsFile), 14);
+		stream.read(const_cast<char*>(tmp_s[i].cpsFile), 14);
 		tmp_s[i].startupCommand = stream.readByte();
 		tmp_s[i].finalCommand = stream.readByte();
 		tmp_s[i].stringIndex1 = stream.readUint16BE();
@@ -529,7 +537,7 @@ bool StaticResource::loadHofSequenceData(Common::SeekableReadStream &stream, voi
 
 		tmp_n[i].flags = stream.readUint16BE();
 		tmp_n[i].wsaFile = new char[14];
-		stream.read(const_cast<char *>(tmp_n[i].wsaFile), 14);
+		stream.read(const_cast<char*>(tmp_n[i].wsaFile), 14);
 		tmp_n[i].startframe = stream.readUint16BE();
 		tmp_n[i].endFrame = stream.readUint16BE();
 		tmp_n[i].frameDelay = stream.readUint16BE();
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
new file mode 100644
index 0000000000..88bfbd8f08
--- /dev/null
+++ b/engines/kyra/staticres_eob.cpp
@@ -0,0 +1,1062 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 "kyra/eob1.h"
+#include "kyra/eob2.h"
+#include "kyra/resource.h"
+
+
+namespace Kyra {
+
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+const uint16 *StaticResource::loadRawDataBe16(int id, int &entries) {
+	return (const uint16 *)getData(id, kLolRawDataBe16, entries);
+}
+
+const uint32 *StaticResource::loadRawDataBe32(int id, int &entries) {
+	return (const uint32 *)getData(id, kLolRawDataBe32, entries);
+}
+#endif // defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#ifdef ENABLE_EOB
+const EobSequenceStep *StaticResource::loadEob2SeqData(int id, int &entries) {
+	return (const EobSequenceStep *)getData(id, kEob2SequenceData, entries);
+}
+
+const EobShapeDef *StaticResource::loadEob2ShapeData(int id, int &entries) {
+	return (const EobShapeDef *)getData(id, kEob2ShapeData, entries);
+}
+
+const EobCharacter *StaticResource::loadEobNpcData(int id, int &entries) {
+	return (const EobCharacter *)getData(id, kEobNpcData, entries);
+}
+#endif // ENABLE_EOB
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+bool StaticResource::loadRawDataBe16(Common::SeekableReadStream &stream, void *&ptr, int &size) {
+	size = stream.size() >> 1;
+
+	uint16 *r = new uint16[size];
+
+	for (int i = 0; i < size; i++)
+		r[i] = stream.readUint16BE();
+
+	ptr = r;
+	return true;
+}
+
+bool StaticResource::loadRawDataBe32(Common::SeekableReadStream &stream, void *&ptr, int &size) {
+	size = stream.size() >> 2;
+
+	uint32 *r = new uint32[size];
+
+	for (int i = 0; i < size; i++)
+		r[i] = stream.readUint32BE();
+
+	ptr = r;
+	return true;
+}
+#endif // defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#ifdef ENABLE_EOB
+bool StaticResource::loadEob2SeqData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
+	size = stream.size() / 11;
+
+	EobSequenceStep *s = new EobSequenceStep[size];
+
+	for (int i = 0; i < size; i++) {
+		s[i].command = stream.readByte();
+		s[i].obj = stream.readByte();
+		s[i].x1 = stream.readSint16BE();
+		s[i].y1 = stream.readByte();
+		s[i].delay = stream.readByte();
+		s[i].pal = stream.readByte();
+		s[i].x2 = stream.readByte();
+		s[i].y2 = stream.readByte();
+		s[i].w = stream.readByte();
+		s[i].h = stream.readByte();
+	}
+
+	ptr = s;
+	return true;
+}
+
+bool StaticResource::loadEob2ShapeData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
+	size = stream.size() / 6;
+
+	EobShapeDef *s = new EobShapeDef[size];
+
+	for (int i = 0; i < size; i++) {
+		s[i].index = stream.readSint16BE();
+		s[i].x = stream.readByte();
+		s[i].y = stream.readByte();
+		s[i].w = stream.readByte();
+		s[i].h = stream.readByte();
+	}
+
+	ptr = s;
+	return true;
+}
+
+bool StaticResource::loadEobNpcData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
+	size = stream.readUint16BE();
+
+	EobCharacter *e = new EobCharacter[size];
+	memset(e, 0, size * sizeof(EobCharacter));
+	EobCharacter *s = e;
+
+	for (int i = 0; i < size; i++, s++) {
+		s->id = stream.readByte();
+		s->flags = stream.readByte();
+		stream.read(s->name, 11);
+		s->strengthCur = stream.readSByte();
+		s->strengthMax = stream.readSByte();
+		s->strengthExtCur = stream.readSByte();
+		s->strengthExtMax = stream.readSByte();
+		s->intelligenceCur = stream.readSByte();
+		s->intelligenceMax = stream.readSByte();
+		s->wisdomCur = stream.readSByte();
+		s->wisdomMax = stream.readSByte();
+		s->dexterityCur = stream.readSByte();
+		s->dexterityMax = stream.readSByte();
+		s->constitutionCur = stream.readSByte();
+		s->constitutionMax = stream.readSByte();
+		s->charismaCur = stream.readSByte();
+		s->charismaMax = stream.readSByte();
+		s->hitPointsCur = stream.readSint16BE();
+		s->hitPointsMax = stream.readSint16BE();
+		s->armorClass = stream.readSByte();
+		s->disabledSlots = stream.readByte();
+		s->raceSex = stream.readByte();
+		s->cClass = stream.readByte();
+		s->alignment = stream.readByte();
+		s->portrait = stream.readByte();
+		s->food = stream.readByte();
+		stream.read(s->level, 3);
+		s->experience[0] = stream.readUint32BE();
+		s->experience[1] = stream.readUint32BE();
+		s->experience[2] = stream.readUint32BE();
+		s->mageSpellsAvailabilityFlags = stream.readUint32BE();
+		for (int ii = 0; ii < 27; ii++)
+			s->inventory[i] = stream.readUint16BE();
+	}
+
+	ptr = e;
+	return true;
+}
+#endif // ENABLE_EOB
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+void StaticResource::freeRawDataBe16(void *&ptr, int &size) {
+	uint16 *data = (uint16 *)ptr;
+	delete[] data;
+	ptr = 0;
+	size = 0;
+}
+
+void StaticResource::freeRawDataBe32(void *&ptr, int &size) {
+	uint32 *data = (uint32 *)ptr;
+	delete[] data;
+	ptr = 0;
+	size = 0;
+}
+#endif // defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#ifdef ENABLE_EOB
+void StaticResource::freeEob2SeqData(void *&ptr, int &size) {
+	EobSequenceStep *d = (EobSequenceStep *)ptr;
+	delete[] d;
+	ptr = 0;
+	size = 0;
+}
+
+void StaticResource::freeEob2ShapeData(void *&ptr, int &size) {
+	EobShapeDef *d = (EobShapeDef *)ptr;
+	delete[] d;
+	ptr = 0;
+	size = 0;
+}
+
+void StaticResource::freeEobNpcData(void *&ptr, int &size) {
+	EobCharacter *d = (EobCharacter *)ptr;
+	delete[] d;
+	ptr = 0;
+	size = 0;
+}
+
+const ScreenDim Screen_Eob::_screenDimTable[] = {
+	{ 0x00, 0x00, 0x28, 0xC8, 0x0F, 0x0C, 0x00, 0x00 },
+	{ 0x08, 0x48, 0x18, 0x38, 0x0E, 0x0C, 0x00, 0x00 },
+	{ 0x13, 0x40, 0x14, 0x80, 0x06, 0x0C, 0x00, 0x00 },
+	{ 0x1D, 0x78, 0x08, 0x40, 0x0F, 0x0D, 0x00, 0x00 },
+	{ 0x02, 0x18, 0x14, 0x78, 0x0F, 0x02, 0x03, 0x00 },
+	{ 0x00, 0x00, 0x16, 0x78, 0x0F, 0x0D, 0x00, 0x00 },
+	{ 0x0A, 0x6C, 0x15, 0x28, 0x0F, 0x00, 0x00, 0x00 },
+	{ 0x01, 0xB4, 0x22, 0x12, 0x0F, 0x0C, 0x00, 0x00 },
+	{ 0x02, 0x18, 0x14, 0x00, 0x0F, 0x02, 0x03, 0x00 },
+	{ 0x01, 0x7D, 0x26, 0x40, 0x0F, 0x00, 0x03, 0x00 },
+	{ 0x00, 0x00, 0x16, 0x90, 0x0F, 0x02, 0x00, 0x00 },
+	{ 0x01, 0x14, 0x14, 0x38, 0x0F, 0x02, 0x00, 0x00 },
+	{ 0x01, 0x04, 0x14, 0x9C, 0x0F, 0x02, 0x00, 0x00 },
+	{ 0x01, 0x19, 0x26, 0x64, 0x0F, 0x02, 0x00, 0x00 },
+	{ 0x01, 0x14, 0x14, 0x58, 0x0F, 0x02, 0x00, 0x00 },
+	{ 0x02, 0x06, 0x23, 0x78, 0x0F, 0x02, 0x00, 0x00 },
+	{ 0x09, 0x14, 0x16, 0x38, 0x0F, 0x02, 0x00, 0x00 },
+	{ 0x01, 0x96, 0x26, 0x31, 0x0F, 0x00, 0x00, 0x00 },
+	{ 0x01, 0x08, 0x26, 0x80, 0x0C, 0x0F, 0x00, 0x00 },
+	{ 0x01, 0x10, 0x26, 0x14, 0x00, 0x0F, 0x06, 0x00 },
+	{ 0x00, 0x10, 0x10, 0x0C, 0x00, 0x0F, 0x06, 0x00 },
+	{ 0x00, 0x10, 0x17, 0x00, 0x00, 0x0F, 0x06, 0x00 },
+	{ 0x00, 0x10, 0x10, 0x00, 0x00, 0x0F, 0x06, 0x00 },
+	{ 0x00, 0x10, 0x07, 0x04, 0x00, 0x0F, 0x06, 0x00 },
+	{ 0x00, 0x00, 0x11, 0x05, 0x00, 0x0F, 0x06, 0x00 },
+	{ 0x00, 0x00, 0x15, 0x05, 0x00, 0x0F, 0x06, 0x00 },
+	{ 0x00, 0x00, 0x11, 0x08, 0x00, 0x0F, 0x06, 0x00 },
+	{ 0x00, 0x00, 0x15, 0x03, 0x00, 0x0F, 0x06, 0x00 },
+	{ 0x0A, 0xA8, 0x15, 0x18, 0x0F, 0x0C, 0x00, 0x00 }
+};
+
+const int Screen_Eob::_screenDimTableCount = ARRAYSIZE(Screen_Eob::_screenDimTable);
+#endif
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+const uint8 LolEobBaseEngine::_dropItemDirIndex[] = { 0, 1, 2, 3, 1, 3, 0, 2, 3, 2, 1, 0, 2, 0, 3, 1 };
+
+void LolEobBaseEngine::initStaticResource() {
+	int temp;
+	_dscShapeX = (const int16 *)_staticres->loadRawDataBe16(kLolEobCommonDscX, temp);
+	_dscShapeIndex = (const int8 *)_staticres->loadRawData(kLolEobCommonDscShapeIndex, temp);
+	_dscTileIndex = _staticres->loadRawData(kLolEobCommonDscTileIndex, temp);
+	_dscDim1 = (const int8 *)_staticres->loadRawData(kLolEobCommonDscDimData1, temp);
+	_dscDim2 = (const int8 *)_staticres->loadRawData(kLolEobCommonDscDimData2, temp);
+	_dscUnk2 = _staticres->loadRawData(kLolEobCommonDscUnk2, temp);
+	_dscBlockMap = _staticres->loadRawData(kLolEobCommonDscBlockMap, temp);
+	_dscBlockIndex = (const int8 *)_staticres->loadRawData(kLolEobCommonDscBlockIndex, temp);
+	_dscDimMap = _staticres->loadRawData(kLolEobCommonDscDimMap, temp);
+	_dscDoorShpIndex = _staticres->loadRawData(kLolEobCommonDscDoorShapeIndex, temp);
+	_dscDoorY2 = _staticres->loadRawData(kLolEobCommonDscDoorY2, temp);
+	_moreStrings = _staticres->loadStrings(kLolEobCommonMoreStrings, temp);
+}
+
+#endif // (ENABLE_EOB || ENABLE_LOL)
+#ifdef ENABLE_EOB
+
+const uint8 EobCoreEngine::_hpIncrPerLevel[] = { 10, 4, 8, 6, 10, 10, 9, 10, 9, 10, 9, 9, 3, 1, 2, 2, 3, 3 };
+
+const uint8 EobCoreEngine::_numLevelsPerClass[] = { 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 2, 2, 3, 2, 2 };
+
+const int8 EobCoreEngine::_classHpIncreaseType[] = {
+	0, -1, -1, 5, -1, -1, 4, -1, -1, 1, -1, -1, 2, -1, -1, 3, -1, -1,  0,
+	2, -1, 0, 3, -1, 0, 1, -1, 0, 1, 3, 3, 1, -1, 2, 3, -1, 0, 2,  1,  5,
+	2, -1, 2, 1, -1
+};
+
+const int16 EobCoreEngine::_hpConstModifiers[] = { -1, -3, -2, -2, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 6, 6, 7, 7 };
+
+const uint8 EobCoreEngine::_charClassModUnk[] = {
+	0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02,
+	0x00, 0x00, 0x02
+};
+
+const uint8 EobCoreEngine::_teleporterShapeDefs[] = {
+	0x0C, 0x58, 0x02, 0x0E,
+	0x0C, 0x67, 0x01, 0x07,
+	0x0C, 0x6F, 0x01, 0x07,
+	0x0C, 0x77, 0x01, 0x05,
+	0x0C, 0x7D, 0x01, 0x05,
+	0x0C, 0x83, 0x01, 0x03
+};
+
+const uint8 EobCoreEngine::_wallOfForceShapeDefs[] = {
+	0x00, 0x00, 0x04, 0x08,
+	0x00, 0x08,	0x04, 0x08,
+	0x04, 0x00, 0x04, 0x08,
+	0x04, 0x08, 0x04, 0x08,
+	0x08, 0x00, 0x05, 0x10,
+	0x0C, 0x00,	0x05, 0x10
+};
+
+const int16 EobCoreEngine::_buttonList1[] = {
+	58, 0, 1, 2, 3, 90, 91, 4, 5, 6, 7, 8, 9, 10, 11, 12, 78, 79, 13, 14,  15,  16,
+	80, 81, 17, 18, 19, 20, 82, 83, 49, 50, 51, 52, 53, 54, 56, 57, -1
+};
+
+const int16 EobCoreEngine::_buttonList2[] = {
+	58, 61, 62, 63,	64, 65, 93, 94, 66, 67, 68, 69, 70, 71, 76, 77, 88, 0, 1, 2, 3,
+	90, 91,  4,  5,	6, 7, 8, 9, 10, 11, 12, 78, 79, 13, 14, 15, 16, 80, 81, 17, 18,
+	19, 20, 82, 83,	49, 50, 51, 52, 53, 54, 56, 57, -1
+};
+
+const int16 EobCoreEngine::_buttonList3[] = {
+	58, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,	32, 33, 34, 35, 36, 37, 38, 39,
+	40, 41, 42, 43, 44, 45, 84, 85, 46, 47, 48, 60,	59, 92, 4, 5, 6, 7, 8, 49,  50,
+	51, 52, 53, 54, 56, 57, -1
+};
+
+const int16 EobCoreEngine::_buttonList4[] = {
+	58, 47, 48, 60, 59, 92, 4, 5, 6, 7, 8, 49, 50, 51, 52, 53, 54, 56, 57, -1
+};
+
+const int16 EobCoreEngine::_buttonList5[] = {
+	58, 61, 62, 63, 64, 65, 93, 66,	67, 68, 69, 70, 71, 88, 21, 22, 23, 24, 25, 26,
+	27, 28, 29, 30, 31, 32, 33, 34,	35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 84,
+	85, 46, 47, 48, 60, 59, 92, 4, 5, 6, 7, 8, 49, 50, 51, 52, 53, 54, 56, 57, -1
+};
+
+const int16 EobCoreEngine::_buttonList6[] = {
+	58, 61, 62, 63, 64, 65, 93, 66, 67, 68, 69, 70, 71, 88, 46, 47, 48, 60, 59, 92,
+	4, 5, 6, 7, 8, 49, 50, 51, 52, 53, 54, 56, 57, -1
+};
+
+const int16 EobCoreEngine::_buttonList7[] = {
+	17, 18, 19, 20, 82, 83, 55, -1
+};
+
+const int16 EobCoreEngine::_buttonList8[] = {
+	72, 73, 74, 75, 86, 87, 89, -1
+};
+
+const uint8 EobCoreEngine::_clock2Timers[] = {
+	0x00, 0x01, 0x20, 0x21, 0x22, 0x22,
+	0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
+	0x04, 0x05, 0x06, 0x07
+};
+
+const uint8 EobCoreEngine::_numClock2Timers = ARRAYSIZE(EobCoreEngine::_clock2Timers);
+
+void EobCoreEngine::initStaticResource() {
+	int temp;
+	_chargenStatStrings = _staticres->loadStrings(kEobBaseChargenStatStrings, temp);
+	_chargenRaceSexStrings = _staticres->loadStrings(kEobBaseChargenRaceSexStrings, temp);
+	_chargenClassStrings = _staticres->loadStrings(kEobBaseChargenClassStrings, temp);
+	_chargenAlignmentStrings = _staticres->loadStrings(kEobBaseChargenAlignmentStrings, temp);
+
+	_pryDoorStrings = _staticres->loadStrings(kEobBasePryDoorStrings, temp);
+	_warningStrings = _staticres->loadStrings(kEobBaseWarningStrings, temp);
+	_itemSuffixStrings = _staticres->loadStrings(kEobBaseItemSuffixStrings, temp);
+	_itemExtraStrings = _staticres->loadStrings(kEobBaseItemExtraStrings, temp);
+	_takenStrings = _staticres->loadStrings(kEobBaseTakenStrings, temp);
+	_potionEffectStrings = _staticres->loadStrings(kEobBasePotionEffectStrings, temp);
+
+	_yesNoStrings = _staticres->loadStrings(kEobBaseYesNoStrings, temp);
+	_npcMaxStrings = _staticres->loadStrings(kEobBaseNpcMaxStrings, temp);
+	_okStrings = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseOkStrings : kLolEobCommonMoreStrings, temp);
+	_npcJoinStrings = _staticres->loadStrings(kEobBaseNpcJoinStrings, temp);
+	_cancelStrings = _staticres->loadStrings(kEobBaseCancelStrings, temp);
+	_abortStrings = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseAbortStrings : kEobBaseCancelStrings, temp);
+
+	_characterGuiStringsHp = _staticres->loadStrings(kEobBaseCharGuiStringsHp, temp);
+	_characterGuiStringsWp = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharGuiStringsWp2 : kEobBaseCharGuiStringsWp1, temp);
+	_characterGuiStringsWr = _staticres->loadStrings(kEobBaseCharGuiStringsWr, temp);
+	_characterGuiStringsSt = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharGuiStringsSt2 : kEobBaseCharGuiStringsSt1, temp);
+	_characterGuiStringsIn = _staticres->loadStrings(kEobBaseCharGuiStringsIn, temp);
+
+	_characterStatusStrings7 = _staticres->loadStrings(kEobBaseCharStatusStrings7, temp);
+	_characterStatusStrings8 = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharStatusStrings82 : kEobBaseCharStatusStrings81, temp);
+	_characterStatusStrings9 = _staticres->loadStrings(kEobBaseCharStatusStrings9, temp);
+	_characterStatusStrings12 = _staticres->loadStrings(kEobBaseCharStatusStrings12, temp);
+	_characterStatusStrings13 = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharStatusStrings132 : kEobBaseCharStatusStrings131, temp);
+
+	_levelGainStrings = _staticres->loadStrings(kEobBaseLevelGainStrings, temp);
+	_expRequirementTables[0] = _staticres->loadRawDataBe32(kEobBaseExperienceTable0, temp);
+	_expRequirementTables[1] = _staticres->loadRawDataBe32(kEobBaseExperienceTable1, temp);
+	_expRequirementTables[2] = _staticres->loadRawDataBe32(kEobBaseExperienceTable2, temp);
+	_expRequirementTables[3] = _staticres->loadRawDataBe32(kEobBaseExperienceTable3, temp);
+	_expRequirementTables[4] = _staticres->loadRawDataBe32(kEobBaseExperienceTable4, temp);
+	_expRequirementTables[5] = _staticres->loadRawDataBe32(kEobBaseExperienceTable4, temp);
+
+	_classModifierFlags = _staticres->loadRawData(kEobBaseClassModifierFlags, temp);
+
+	_constModTables[0] = _constModTables[4] = _constModTables[5] = _staticres->loadRawData(kEobBaseConstModTable1, temp);
+	_constModTables[1] = _staticres->loadRawData(kEobBaseConstModTable2, temp);
+	_constModTables[2] = _staticres->loadRawData(kEobBaseConstModTable3, temp);
+	_constModTables[3] = _staticres->loadRawData(kEobBaseConstModTable4, temp);
+	_constModLevelIndex = _staticres->loadRawData(kEobBaseConstModLvlIndex, temp);
+	_constModDiv = _staticres->loadRawData(kEobBaseConstModDiv, temp);
+	_constModExt = _staticres->loadRawData(kEobBaseConstModExt, temp);
+
+	_encodeMonsterShpTable = _staticres->loadRawDataBe16(kEobBaseEncodeMonsterDefs, temp);
+	_npcPreset = _staticres->loadEobNpcData(kEobBaseNpcPresets, temp);
+
+	_teleporterShapeCoords = _staticres->loadRawData(kEobBaseDscTelptrShpCoords, temp);
+
+	_monsterStepTable0 = (int8*) _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEobBaseMonsterStepTable02 : kEobBaseMonsterStepTable01, temp);
+	_monsterStepTable1 = (int8*)_staticres->loadRawData(kEobBaseMonsterStepTable1, temp);
+	_monsterStepTable2 = (int8*)_staticres->loadRawData(kEobBaseMonsterStepTable2, temp);
+	_monsterStepTable3 = (int8*)_staticres->loadRawData(kEobBaseMonsterStepTable3, temp);
+	_monsterCloseAttPosTable1 = _staticres->loadRawData(kEobBaseMonsterCloseAttPosTable1, temp);
+	_monsterCloseAttPosTable2 = _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEobBaseMonsterCloseAttPosTable22 : kEobBaseMonsterCloseAttPosTable21, temp);
+	_monsterCloseAttUnkTable = (int8*)_staticres->loadRawData(kEobBaseMonsterCloseAttUnkTable, temp);
+	_monsterCloseAttChkTable1 = _staticres->loadRawData(kEobBaseMonsterCloseAttChkTable1, temp);
+	_monsterCloseAttChkTable2 = _staticres->loadRawData(kEobBaseMonsterCloseAttChkTable2, temp);
+	_monsterCloseAttDstTable1 = _staticres->loadRawData(kEobBaseMonsterCloseAttDstTable1, temp);
+	_monsterCloseAttDstTable2 = _staticres->loadRawData(kEobBaseMonsterCloseAttDstTable2, temp);
+
+	_monsterProximityTable = _staticres->loadRawData(kEobBaseMonsterProximityTable, temp);
+	_findBlockMonstersTable = _staticres->loadRawData(kEobBaseFindBlockMonstersTable, temp);
+	_monsterDirChangeTable = (const int8*)_staticres->loadRawData(kEobBaseMonsterDirChangeTable, temp);
+	_monsterSpecAttStrings = _staticres->loadStrings(kEobBaseMonsterDistAttStrings, temp);
+
+	_monsterFrmOffsTable1 = (const int8*)_staticres->loadRawData(kEobBaseDscMonsterFrmOffsTbl1, temp);
+	_monsterFrmOffsTable2 = (const int8*)_staticres->loadRawData(kEobBaseDscMonsterFrmOffsTbl2, temp);
+
+	_inventorySlotsX = _staticres->loadRawDataBe16(kEobBaseInvSlotX, temp);
+	_inventorySlotsY = _staticres->loadRawData(kEobBaseInvSlotY, temp);
+	_slotValidationFlags = _staticres->loadRawDataBe16(kEobBaseSlotValidationFlags, temp);
+
+	_drawObjPosIndex = _staticres->loadRawData(kEobBaseDrawObjPosIndex, temp);
+	_flightObjFlipIndex = _staticres->loadRawData(kEobBaseFlightObjFlipIndex, temp);
+	_flightObjShpMap = (const int8*)_staticres->loadRawData(kEobBaseFlightObjShpMap, temp);
+	_flightObjSclIndex = (const int8*)_staticres->loadRawData(kEobBaseFlightObjSclIndex, temp);
+
+	_wllFlagPreset = _staticres->loadRawData(kEobBaseWllFlagPreset, _wllFlagPresetSize);
+	_dscShapeCoords = (const int16*)_staticres->loadRawDataBe16(kEobBaseDscShapeCoords, temp);
+
+	_dscDoorScaleOffs = _staticres->loadRawData(kEobBaseDscDoorScaleOffs, temp);
+	_dscDoorScaleMult1 = _staticres->loadRawData(kEobBaseDscDoorScaleMult1, temp);
+	_dscDoorScaleMult2 = _staticres->loadRawData(kEobBaseDscDoorScaleMult2, temp);
+	_dscDoorScaleMult3 = _staticres->loadRawData(kEobBaseDscDoorScaleMult3, temp);
+	_dscDoorY1 = _staticres->loadRawData(kEobBaseDscDoorY1, temp);
+
+	_dscItemPosIndex= _staticres->loadRawData(kEobBaseDscItemPosIndex, temp);
+	_dscItemShpX = (const int16*)_staticres->loadRawDataBe16(kEobBaseDscItemShpX, temp);
+	_dscItemScaleIndex = _staticres->loadRawData(kEobBaseDscItemScaleIndex, temp);
+	_dscItemTileIndex = _staticres->loadRawData(kEobBaseDscItemTileIndex, temp);
+	_dscItemShapeMap = _staticres->loadRawData(kEobBaseDscItemShapeMap, temp);
+
+	_bookNumbers = _staticres->loadStrings(kEobBaseBookNumbers, temp);
+	_mageSpellList = _staticres->loadStrings(kEobBaseMageSpellsList, _mageSpellListSize);
+	_clericSpellList = _staticres->loadStrings(kEobBaseClericSpellsList, temp);
+	_spellNames = _staticres->loadStrings(kEobBaseSpellNames, temp);
+
+	_magicStrings1 = _staticres->loadStrings(kEobBaseMagicStrings1, temp);
+	_magicStrings2 = _staticres->loadStrings(kEobBaseMagicStrings2, temp);
+	_magicStrings3 = _staticres->loadStrings(kEobBaseMagicStrings3, temp);
+	_magicStrings4 = _staticres->loadStrings(kEobBaseMagicStrings4, temp);
+	_magicStrings5 = _staticres->loadStrings(kEobBaseMagicStrings5, temp);
+	_magicStrings6 = _staticres->loadStrings(kEobBaseMagicStrings6, temp);
+	_magicStrings7 = _staticres->loadStrings(kEobBaseMagicStrings7, temp);
+	_magicStrings8 = _staticres->loadStrings(kEobBaseMagicStrings8, temp);
+
+	_sparkEffectDefSteps = _staticres->loadRawData(kEobBaseSparkDefSteps, temp);
+	_sparkEffectDefSubSteps = _staticres->loadRawData(kEobBaseSparkDefSubSteps, temp);
+	_sparkEffectDefShift = _staticres->loadRawData(kEobBaseSparkDefShift, temp);
+	_sparkEffectDefAdd = _staticres->loadRawData(kEobBaseSparkDefAdd, temp);
+	_sparkEffectDefX = _staticres->loadRawData(kEobBaseSparkDefX, temp);
+	_sparkEffectDefY = _staticres->loadRawData(kEobBaseSparkDefY, temp);
+	_sparkEffectOfFlags1 = _staticres->loadRawDataBe32(kEobBaseSparkOfFlags1, temp);
+	_sparkEffectOfFlags2 = _staticres->loadRawDataBe32(kEobBaseSparkOfFlags2, temp);
+	_sparkEffectOfShift = _staticres->loadRawData(kEobBaseSparkOfShift, temp);
+	_sparkEffectOfX = _staticres->loadRawData(kEobBaseSparkOfX, temp);
+	_sparkEffectOfY = _staticres->loadRawData(kEobBaseSparkOfY, temp);
+	_magicFlightObjectProperties = _staticres->loadRawData(kEobBaseMagicFlightProps, temp);
+}
+
+void EobCoreEngine::initButtonData() {
+	#define EOB_CB(x)	BUTTON_FUNCTOR(EobCoreEngine, this, &EobCoreEngine::x)
+	static const EobGuiButtonDef buttonDefs[] = {
+		{ 112, 0, 0x1100, 184, 2, 63, 50, EOB_CB(clickedCharPortraitDefault), 0 },
+		{ 113, 0, 0x1100, 256, 2, 63, 50, EOB_CB(clickedCharPortraitDefault), 1 },
+		{ 114, 0, 0x1100, 184, 54, 63, 50, EOB_CB(clickedCharPortraitDefault), 2 },
+		{ 115, 0, 0x1100, 256, 54, 63, 50, EOB_CB(clickedCharPortraitDefault), 3 },
+		{ 48, 110, 0x1100, 289, 177, 31, 21, EOB_CB(clickedCamp), 0 },
+		{ 0, 0, 0x1100, 0, 102, 88, 18, EOB_CB(clickedSceneDropPickupItem), 0 },
+		{ 0, 0, 0x1100, 89, 102, 88, 18, EOB_CB(clickedSceneDropPickupItem), 1 },
+		{ 0, 0, 0x1100, 0, 72, 88, 29, EOB_CB(clickedSceneDropPickupItem), 2 },
+		{ 0, 0, 0x1100, 89, 72, 88, 29, EOB_CB(clickedSceneDropPickupItem), 3 },
+		{ 24, 0, 0x1100, 184, 10, 33, 33, EOB_CB(clickedCharPortrait2), 0 },
+		{ 0, 0, 0x1100, 256, 10, 33, 33, EOB_CB(clickedCharPortrait2), 1 },
+		{ 0, 0, 0x1100, 184, 62, 33, 33, EOB_CB(clickedCharPortrait2), 2 },
+		{ 0, 0, 0x1100, 256, 62, 33, 33, EOB_CB(clickedCharPortrait2), 3 },
+		{ 0, 0, 0x1100, 216, 10, 31, 33, EOB_CB(clickedWeaponSlot), 0 },
+		{ 0, 0, 0x1100, 288, 10, 31, 33, EOB_CB(clickedWeaponSlot), 1 },
+		{ 0, 0, 0x1100, 216, 62, 31, 33, EOB_CB(clickedWeaponSlot), 2 },
+		{ 0, 0, 0x1100, 288, 62, 31, 33, EOB_CB(clickedWeaponSlot), 3 },
+		{ 368, 0, 0x1000, 184, 2, 63, 8, EOB_CB(clickedCharNameLabelRight), 0 },
+		{ 369, 0, 0x1000, 256, 2, 63, 8, EOB_CB(clickedCharNameLabelRight), 1 },
+		{ 370, 0, 0x1000, 184, 54, 63, 8, EOB_CB(clickedCharNameLabelRight), 2 },
+		{ 371, 0, 0x1000, 256, 54, 63, 8, EOB_CB(clickedCharNameLabelRight), 3 },
+		{ 0, 0, 0x1100, 230, 116, 16, 16, EOB_CB(clickedInventorySlot), 0 },
+		{ 0, 0, 0x1100, 278, 116, 16, 16, EOB_CB(clickedInventorySlot), 1 },
+		{ 0, 0, 0x1100, 181, 40, 16, 16, EOB_CB(clickedInventorySlot), 2 },
+		{ 0, 0, 0x1100, 199, 40, 16, 16, EOB_CB(clickedInventorySlot), 3 },
+		{ 0, 0, 0x1100, 181, 58, 16, 16, EOB_CB(clickedInventorySlot), 4 },
+		{ 0, 0, 0x1100, 199, 58, 16, 16, EOB_CB(clickedInventorySlot), 5 },
+		{ 0, 0, 0x1100, 181, 76, 16, 16, EOB_CB(clickedInventorySlot), 6 },
+		{ 0, 0, 0x1100, 199, 76, 16, 16, EOB_CB(clickedInventorySlot), 7 },
+		{ 0, 0, 0x1100, 181, 94, 16, 16, EOB_CB(clickedInventorySlot), 8 },
+		{ 0, 0, 0x1100, 199, 94, 16, 16, EOB_CB(clickedInventorySlot), 9 },
+		{ 0, 0, 0x1100, 181, 112, 16, 16, EOB_CB(clickedInventorySlot), 10 },
+		{ 0, 0, 0x1100, 199, 112, 16, 16, EOB_CB(clickedInventorySlot), 11 },
+		{ 0, 0, 0x1100, 181, 130, 16, 16, EOB_CB(clickedInventorySlot), 12 },
+		{ 0, 0, 0x1100, 199, 130, 16, 16, EOB_CB(clickedInventorySlot), 13 },
+		{ 0, 0, 0x1100, 181, 148, 16, 16, EOB_CB(clickedInventorySlot), 14 },
+		{ 0, 0, 0x1100, 199, 148, 16, 16, EOB_CB(clickedInventorySlot), 15 },
+		{ 0, 0, 0x1100, 225, 55, 16, 16, EOB_CB(clickedInventorySlot), 16 },
+		{ 0, 0, 0x1100, 224, 76, 16, 16, EOB_CB(clickedInventorySlot), 17 },
+		{ 0, 0, 0x1100, 225, 96, 16, 16, EOB_CB(clickedInventorySlot), 18 },
+		{ 0, 0, 0x1100, 298, 55, 16, 16, EOB_CB(clickedInventorySlot), 19 },
+		{ 0, 0, 0x1100, 287, 75, 16, 16, EOB_CB(clickedInventorySlot), 20 },
+		{ 0, 0, 0x1100, 277, 137, 16, 16, EOB_CB(clickedInventorySlot), 21 },
+		{ 0, 0, 0x1100, 300, 94, 16, 16, EOB_CB(clickedInventorySlot), 22 },
+		{ 0, 0, 0x1100, 300, 112, 16, 16, EOB_CB(clickedInventorySlot), 23 },
+		{ 0, 0, 0x1100, 300, 130, 16, 16, EOB_CB(clickedInventorySlot), 24 },
+		{ 0, 0, 0x1100, 236, 37, 31, 16, EOB_CB(clickedEatItem), 25 },
+		{ 26, 0, 0x1100, 291, 149, 25, 17, EOB_CB(clickedInventoryNextPage), 25 },
+		{ 110, 24, 0x1100, 181, 3, 32, 32, EOB_CB(clickedPortraitRestore), 25 },
+		{ 96, 352, 0x1100, 24, 128, 21, 16, EOB_CB(clickedUpArrow), 25 },
+		{ 98, 97, 0x1100, 24, 144, 21, 16, EOB_CB(clickedDownArrow), 25 },
+		{ 92, 348, 0x1100, 3, 144, 21, 16, EOB_CB(clickedLeftArrow), 25 },
+		{ 102, 358, 0x1100, 45, 144, 21, 16, EOB_CB(clickedRightArrow), 25 },
+		{ 91, 0, 0x1100, 3, 128, 21, 16, EOB_CB(clickedTurnLeftArrow), 25 },
+		{ 101, 0, 0x1100, 45, 128, 21, 16, EOB_CB(clickedTurnRightArrow), 25 },
+		{ 110, 0, 0x1100, 184, 0, 136, 120, EOB_CB(clickedAbortCharSwitch), 0 },
+		{ 0, 0, 0x1100, 0, 8, 88, 48, EOB_CB(clickedSceneThrowItem), 0 },
+		{ 0, 0, 0x1100, 88, 8, 88, 48, EOB_CB(clickedSceneThrowItem), 1 },
+		{ 0, 0, 0x1100, 24, 8, 128, 96, EOB_CB(clickedSceneSpecial), 1 },
+		{ 112, 113, 0x1100, 274, 35, 20, 15, EOB_CB(clickedInventoryPrevChar), 1 },
+		{ 114, 115, 0x1100, 297, 35, 20, 15, EOB_CB(clickedInventoryNextChar), 1 },
+		{ 2, 0, 0x1100, 68, 121, 18, 10, EOB_CB(clickedSpellbookTab), 0 },
+		{ 3, 0, 0x1100, 86, 121, 18, 10, EOB_CB(clickedSpellbookTab), 1 },
+		{ 4, 0, 0x1100, 104, 121, 15, 10, EOB_CB(clickedSpellbookTab), 2 },
+		{ 5, 0, 0x1100, 122, 121, 15, 10, EOB_CB(clickedSpellbookTab), 3 },
+		{ 6, 0, 0x1100, 140, 121, 15, 10, EOB_CB(clickedSpellbookTab), 4 },
+		{ 0, 0, 0x1100, 75, 131, 97, 6, EOB_CB(clickedSpellbookList), 0 },
+		{ 0, 0, 0x1100, 75, 137, 97, 6, EOB_CB(clickedSpellbookList), 1 },
+		{ 0, 0, 0x1100, 75, 143, 97, 6, EOB_CB(clickedSpellbookList), 2 },
+		{ 0, 0, 0x1100, 75, 149, 97, 6, EOB_CB(clickedSpellbookList), 3 },
+		{ 0, 0, 0x1100, 75, 155, 97, 6, EOB_CB(clickedSpellbookList), 4 },
+		{ 0, 0, 0x1100, 75, 161, 97, 6, EOB_CB(clickedSpellbookList), 5 },
+		{ 112, 0, 0x1100, 184, 2, 63, 50, EOB_CB(clickedCastSpellOnCharacter), 0 },
+		{ 113, 0, 0x1100, 256, 2, 63, 50, EOB_CB(clickedCastSpellOnCharacter), 1 },
+		{ 114, 0, 0x1100, 184, 54, 63, 50, EOB_CB(clickedCastSpellOnCharacter), 2 },
+		{ 115, 0, 0x1100, 256, 54, 63, 50, EOB_CB(clickedCastSpellOnCharacter), 3 },
+		{ 53, 54, 0x1100, 320, 200, 0, 0, EOB_CB(clickedSpellbookList), 6 },
+		{ 61, 0, 0x1100, 320, 200, 0, 0, EOB_CB(clickedSpellbookList), 7 },
+		{ 0, 0, 0x1100, 184, 114, 33, 33, EOB_CB(clickedCharPortrait2), 4 },
+		{ 0, 0, 0x1100, 256, 114, 33, 33, EOB_CB(clickedCharPortrait2), 5 },
+		{ 0, 0, 0x1100, 216, 114, 31, 33, EOB_CB(clickedWeaponSlot), 4 },
+		{ 0, 0, 0x1100, 288, 114, 31, 33, EOB_CB(clickedWeaponSlot), 5 },
+		{ 372, 0, 0x1000, 184, 106, 63, 8, EOB_CB(clickedCharNameLabelRight), 4 },
+		{ 373, 0, 0x1000, 256, 106, 63, 8, EOB_CB(clickedCharNameLabelRight), 5 },
+		{ 0, 0, 0x1100, 227, 135, 10, 10, EOB_CB(clickedInventorySlot), 25 },
+		{ 0, 0, 0x1100, 239, 135, 10, 10, EOB_CB(clickedInventorySlot), 26 },
+		{ 116, 0, 0x1100, 184, 106, 63, 50, EOB_CB(clickedCastSpellOnCharacter), 4 },
+		{ 117, 0, 0x1100, 256, 106, 63, 50, EOB_CB(clickedCastSpellOnCharacter), 5 },
+		{ 110, 0, 0x1100, 68, 168, 78, 10, EOB_CB(clickedSpellbookAbort), 0 },
+		{ 110, 0, 0x1100, 68, 168, 78, 10, EOB_CB(clickedCastSpellOnCharacter), 65535 },
+		{ 116, 0, 0x1100, 184, 106, 63, 50, EOB_CB(clickedCharPortraitDefault), 4 },
+		{ 117, 0, 0x1100, 256, 106, 63, 50, EOB_CB(clickedCharPortraitDefault), 5 },
+		{ 116, 117, 0x1100, 320, 200, 1, 1, EOB_CB(clickedInventoryNextChar), 2 },
+		{ 7, 0, 0x1100, 158, 121, 15, 10, EOB_CB(clickedSpellbookTab), 5 },
+		{ 0, 0, 0x1100, 146, 168, 32, 10, EOB_CB(clickedSpellbookScroll), 0 },
+
+		// EOB1 spellbook modifications
+		{ 2, 0, 0x1100, 71, 122, 20, 8, EOB_CB(clickedSpellbookTab), 0 },
+		{ 3, 0, 0x1100, 92, 122, 20, 8, EOB_CB(clickedSpellbookTab), 1 },
+		{ 4, 0, 0x1100, 113, 122, 20, 8, EOB_CB(clickedSpellbookTab), 2 },
+		{ 5, 0, 0x1100, 134, 122, 20, 8, EOB_CB(clickedSpellbookTab), 3 },
+		{ 6, 0, 0x1100, 155, 122, 20, 8, EOB_CB(clickedSpellbookTab), 4 },
+		{ 110, 0, 0x1100, 75, 168, 97, 6, EOB_CB(clickedSpellbookAbort), 0 },
+	};
+
+	_buttonDefs = buttonDefs;
+}
+
+void EobCoreEngine::initSpells() {
+#define mpn magicTimingParaAssign.push_back(0);
+#define mp1n if (_flags.gameID == GI_EOB1) magicTimingParaAssign.push_back(0);
+#define mp2n if (_flags.gameID == GI_EOB2) magicTimingParaAssign.push_back(0);
+#define mp(x) magicTimingParaAssign.push_back(&magicTimingPara[x << 2]);
+#define mp1(x) if (_flags.gameID == GI_EOB1) magicTimingParaAssign.push_back(&magicTimingPara[x << 2]);
+#define mp2(x) if (_flags.gameID == GI_EOB2) magicTimingParaAssign.push_back(&magicTimingPara[x << 2]);
+
+#define sc(x) startCallback.push_back(&EobCoreEngine::spellCallback_start_##x);
+#define sc1(x) if (_flags.gameID == GI_EOB1) startCallback.push_back(&EobCoreEngine::spellCallback_start_##x);
+#define sc2(x) if (_flags.gameID == GI_EOB2) startCallback.push_back(&EobCoreEngine::spellCallback_start_##x);
+#define ec(x) endCallback.push_back(&EobCoreEngine::spellCallback_end_##x);
+#define ec1(x) if (_flags.gameID == GI_EOB1) endCallback.push_back(&EobCoreEngine::spellCallback_end_##x);
+#define ec2(x) if (_flags.gameID == GI_EOB2) endCallback.push_back(&EobCoreEngine::spellCallback_end_##x);
+
+	static const uint16 magicTimingPara[] = {
+		0, 546, 2, 1, // 0 detect magic
+		0, 546, 5, 1, // 1 shield, detect invis, magical vestment
+		0, 546, 1, 1, // 2 shocking grasp, vamp touch, true seeing, prayer
+		3, 546, 1, 1, // 3 blur, haste
+		5, 546, 1, 1, // 4 imp invisibility
+		6, 546, 0, 1, // 5 bless
+		0, 546, 3, 1, // 6 prot from evil
+		1, 546, 1, 1, // 7 aid
+		4, 546, 1, 1, // 8 flame blade
+		0, 32760, 1, 1, // 9 slow poison
+		1, 546, 0, 1, // 10 mystic defense
+	};
+
+	Common::Array<const uint16*> magicTimingParaAssign;
+	mpn;
+	mpn;
+	mpn;
+	mp(0);	// Detect Magic
+	mpn;	// Magic Missile
+	mp1n;						///
+	mp(1);	// Shield
+	mp(2);	// Shocking Grasp
+	mp2(3);	// Blur				///
+	mp2(1);	// Detect Invis		///
+	mp2n;	// Imp Identify		///
+	mpn;	// Invis
+	mp1n;						///
+	mpn;	// Melf
+	mp1n;	// Stinking Cloud	///
+	mpn;	// Dispel Magic
+	mpn;	// Fireball
+	mp1n;	// Flame Arrow		///
+	mp(3);	// Haste
+	mpn;	// Hold Person
+	mpn;	// Invisibility
+	mpn;	// Lightning Bolt
+	mp(2);	// Vampiric Touch
+	mpn;	// Fear
+	mpn;	// Ice Storm
+	mp1n;	// Stone Skin		/// --- para required?
+	mp1n;	// Cloud Kill		///
+	mp2(4);	// Improved Invisibility	///
+	mp2n;	// remove Curse		///
+	mpn;	// Cone of Cold
+	mpn;	// Hold Monster
+	mp2n;	// Wall of Force	///
+	mp2n;	// Disintegrate		///
+	mp2n;	// Flesh To Stone	///
+	mp2n;	// Stone To Flesh	///
+	mp2(2);	// True Seeing		///
+	mp2n;	// Finger of Death	///
+	mp2n;	// Power Word Stun	///
+	mp2n;	// Bigby's Fist		///
+	mp2n;	// empty			///
+	mp(5);	// Bless
+	mpn;						/// EOB1: cure, EOB2: cause
+	mpn;						/// EOB1: cause, EOB2: cure
+	mp(0);	// Detect Magic
+	mp(6);	// Prot from Evil
+	mp(7);	// Aid
+	mp(8);	// Flame Blad
+	mpn;	// Hold Person
+	mp(9);	// Slow Poison
+	mpn;	// Create Food
+	mpn;	// Dispel Magic
+	mp(1);	// Magical Vestment
+	mp(2);	// Prayer
+	mpn;	// Remove Paralysis
+	mpn;						/// EOB1: cure, EOB2: cause
+	mpn;						/// EOB1: cause, EOB2: cure
+	mpn;	// Neutral Poison
+	mp(6);	// Prot From Evil 10'
+	mp1n;	// Prot From Lightning			/// --- para required?
+	mpn;						/// EOB1: cure, EOB2: cause
+	mpn;						/// EOB1: cause, EOB2: cure
+	mpn;	// Flame Strike
+	mpn;	// Raise Dead
+	mp2n;	// Slay Living		///
+	mp2(2);	// True Seeing		///
+	mp2n;	// Harm				///
+	mp2n;	// Heal				///
+	mp2n;	// Resurrect		///
+	mpn;	// Lay on Hands
+	mp2n;	// Turn Undead		///
+	mpn;	// UNK 1 passive
+	mp2(10);// Mystic Defense	///
+	mp2n;	// UNK 2 passive	///
+	mpn;	// death spell passive
+	mpn;	// disintegrate passive
+	mp2n;	// cause critical passive
+	mp2n;	// flesh to stone passive
+
+	Common::Array<SpellStartCallback> startCallback;
+	sc(empty);
+	sc(armor);
+	sc(burningHands);
+	sc(detectMagic);
+	sc(magicMissile);
+	sc1(empty);
+	sc(empty);
+	sc(shockingGrasp);
+	sc(empty);
+	sc2(empty);
+	sc2(improvedIdentify);
+	sc(empty);
+	sc(melfsAcidArrow);
+	sc1(empty);		// Stinking Cloud
+	sc(dispelMagic);
+	sc(fireball);
+	sc1(flameArrow);
+	sc(empty);
+	sc(holdPerson);
+	sc(empty);
+	sc(lightningBolt);
+	sc(vampiricTouch);
+	sc(fear);
+	sc(iceStorm);
+	sc(empty);	// EOB1: stone skin, EOB2: imp invisibility
+	sc1(empty); // Cloudkill
+	sc2(removeCurse);
+	sc(coneOfCold);
+	sc(holdMonster);
+	sc2(wallOfForce);
+	sc2(disintegrate);
+	sc2(fleshToStone);
+	sc2(stoneToFlesh);
+	sc2(trueSeeing);
+	sc2(slayLiving);
+	sc2(powerWordStun);
+	sc2(empty);
+	sc2(empty);
+	sc(empty);	// Bless
+	sc2(causeLightWounds);
+	sc(cureLightWounds);
+	sc1(causeLightWounds);
+	sc(detectMagic);
+	sc(empty);
+	sc(aid);
+	sc(flameBlade);
+	sc(holdPerson);
+	sc(slowPoison);
+	sc(createFood);
+	sc(dispelMagic);
+	sc(empty);
+	sc(empty);
+	sc(removeParalysis);
+	sc2(causeSeriousWounds);
+	sc(cureSeriousWounds);
+	sc1(causeSeriousWounds);
+	sc(neutralizePoison);
+	sc(empty);
+	sc1(empty);	// Prot from Lightning
+	sc2(causeCriticalWounds);
+	sc(cureCriticalWounds);
+	sc1(causeCriticalWounds);
+	sc(flameStrike);
+	sc(raiseDead);
+	sc2(slayLiving);
+	sc2(trueSeeing);
+	sc2(harm);
+	sc2(heal);
+	sc2(empty);
+	sc(layOnHands);
+	sc2(turnUndead);
+	sc(empty);
+	sc2(empty);
+	sc2(empty);
+	sc(empty);
+	sc(empty);
+	sc2(empty);
+	sc2(empty);
+
+	Common::Array<SpellEndCallback> endCallback;
+	ec(empty);
+	ec(empty);
+	ec(empty);
+	ec(detectMagic);
+	ec(magicMissile);
+	ec1(empty);
+	ec(empty);
+	ec(shockingGraspFlameBlade);
+	ec(empty);
+	ec(empty);
+	ec2(empty);
+	ec2(empty);
+	ec(melfsAcidArrow);
+	ec1(empty);		// Stinking Cloud
+	ec(empty);
+	ec(fireball);
+	ec1(flameArrow);
+	ec(empty);
+	ec(holdPerson);
+	ec(empty);
+	ec(lightningBolt);
+	ec(vampiricTouch);
+	ec(empty);
+	ec(iceStorm);
+	ec(empty);		// EOB1: stone skin, EOB2: imp invisibility
+	ec(empty);		// EOB1: cloud kill, EOB2: remove curse
+	ec(empty);
+	ec(holdMonster);
+	ec2(empty);
+	ec2(empty);
+	ec2(empty);
+	ec2(empty);
+	ec2(trueSeeing);
+	ec2(empty);
+	ec2(empty);
+	ec2(empty);
+	ec2(empty);
+	ec(empty);	// Bless
+	ec(empty);
+	ec(empty);
+	ec(detectMagic);
+	ec(empty);
+	ec(aid);
+	ec(shockingGraspFlameBlade);
+	ec(holdPerson);
+	ec(slowPoison);
+	ec(empty);
+	ec(empty);
+	ec(empty);
+	ec(empty);
+	ec(empty);
+	ec(empty);
+	ec(empty);
+	ec(empty);
+	ec(empty);
+	ec1(empty);	// Prot from Lightning
+	ec(empty);
+	ec(empty);
+	ec(flameStrike);
+	ec(empty);
+	ec2(empty);
+	ec2(trueSeeing);
+	ec2(empty);
+	ec2(empty);
+	ec2(empty);
+	ec(empty);
+	ec2(empty);
+	ec(unk1Passive);
+	ec2(empty);
+	ec2(unk2Passive);
+	ec(deathSpellPassive);
+	ec(disintegratePassive);
+	ec2(causeCriticalWoundsPassive);
+	ec2(fleshToStonePassive);
+
+	_spells = new EobSpell[_numSpells];
+	memset(_spells, 0, _numSpells * sizeof(EobSpell));
+
+	for (int i = 0; i < _numSpells; i++) {
+		EobSpell *s = &_spells[i];
+		s->name = _flags.gameID == GI_EOB2 ? ((i == 0 || i == _mageSpellListSize) ? _mageSpellList[0] : ((i < (_mageSpellListSize + 1)) ? _spellNames[i - 1] : _spellNames[i - 2])) : _spellNames[i];
+		s->startCallback = startCallback[i];
+		s->timingPara = magicTimingParaAssign[i];
+		s->endCallback = endCallback[i];
+	}
+
+	magicTimingParaAssign.clear();
+	startCallback.clear();
+	endCallback.clear();
+
+	_clericSpellOffset = _mageSpellListSize;
+
+#undef mpn
+#undef mp1n
+#undef mp2n
+#undef mp
+#undef mp1
+#undef mp2
+#undef sc
+#undef sc1
+#undef sc2
+#undef ec
+#undef ec1
+#undef ec2
+}
+
+void EobEngine::initStaticResource() {
+	int temp;
+	_mainMenuStrings = _staticres->loadStrings(kEob1MainMenuStrings, temp);
+
+	_doorShapeEncodeDefs = _staticres->loadRawData(kEob1DoorShapeDefs, temp);
+	_doorSwitchShapeEncodeDefs = _staticres->loadRawData(kEob1DoorSwitchShapeDefs, temp);
+	_doorSwitchCoords = _staticres->loadRawData(kEob1DoorSwitchCoords, temp);
+
+	_dscDoorScaleMult4 = _staticres->loadRawData(kEobBaseDscDoorScaleMult4, temp);
+	_dscDoorScaleMult5 = _staticres->loadRawData(kEobBaseDscDoorScaleMult5, temp);
+	_dscDoorScaleMult6 = _staticres->loadRawData(kEobBaseDscDoorScaleMult6, temp);
+	_dscDoorY3 = _staticres->loadRawData(kEobBaseDscDoorY3, temp);
+	_dscDoorY4 = _staticres->loadRawData(kEobBaseDscDoorY4, temp);
+	_dscDoorY5 = _staticres->loadRawData(kEobBaseDscDoorY5, temp);
+	_dscDoorY6 = _staticres->loadRawData(kEobBaseDscDoorY6, temp);
+	_dscDoorCoordsExt = (const int16*)_staticres->loadRawDataBe16(kEobBaseDscDoorCoordsExt, temp);
+
+	_monsterDistAttType10 = _staticres->loadRawData(kEob1MonsterDistAttType10, temp);
+	_monsterDistAttSfx10 = _staticres->loadRawData(kEob1MonsterDistAttSfx10, temp);
+	_monsterDistAttType17 = _staticres->loadRawData(kEob1MonsterDistAttType17, temp);
+	_monsterDistAttSfx17 = _staticres->loadRawData(kEob1MonsterDistAttSfx17, temp);
+
+	const uint8 *ps = _staticres->loadRawData(kEob1MonsterProperties, temp);
+	temp /= 27;
+	_monsterProps = new EobMonsterProperty[temp];
+	memset(_monsterProps, 0, temp * sizeof(EobMonsterProperty));
+	// Try to convert EOB1 (hard coded) monster properties to EOB2 type monster properties.
+	// This is still WIP, since most properties are unknown for now.
+	for (int i = 0; i < temp; i++) {
+		EobMonsterProperty *p = &_monsterProps[i];
+		p->armorClass = (int8)*ps++;
+		p->hitChance = (int8)*ps++;
+		p->hpDcTimes = *ps++;
+		p->attacksPerRound = *ps++;
+		p->dmgDc[0].times = *ps++;
+		p->dmgDc[0].pips = *ps++;
+		p->dmgDc[0].base = (int8)*ps++;
+		p->dmgDc[1].times = *ps++;
+		p->dmgDc[1].pips = *ps++;
+		p->dmgDc[1].base =(int8) *ps++;
+		p->dmgDc[2].times = *ps++;
+		p->dmgDc[2].pips = *ps++;
+		p->dmgDc[2].base = (int8)*ps++;
+		ps++;
+		p->flags = *ps++;
+		ps++;
+		ps++;
+		ps++;
+		ps++;
+		p->experience = READ_LE_UINT16(ps);
+		ps += 2;
+		p->u30 = *ps++;
+		p->sound1 = *ps++;
+		p->sound2 = *ps++;
+		p->numRemoteAttacks = *ps++;
+		ps++;
+		p->dmgModifierEvade = *ps++;
+	}
+}
+
+void EobEngine::initSpells() {
+	EobCoreEngine::initSpells();
+
+	static const uint32 eflags[] = {
+		0x0000, 0x0001, 0x0000, 0x0002, 0x0000, 0x0000, 0x0008, 0x0000, 0x0040, 0x0000,
+		0x0000,	0x0000 /*stinking cloud*/, 0x0000, 0x0000, 0x0000 /*flame arrow*/, 0x10000,0x0000, 0x0040, 0x0000, 0x0000,
+		0x0000, 0x0000, 0x0000 /*stone skin*/, 0x0000 /*cloud kill*/, 0x0000, 0x0000, 0x0400, 0x0000, 0x0000, 0x0002,
+		0x0800,	0x0000, 0x0000, 0x0000, 0x2000, 0x0000, 0x0000, 0x4000, 0x8000, 0x0000,
+		0x0000, 0x0000,	0x0000,	0x0800, 0x0000 /*Prot From Lightning*/, 0x0000,	0x0000,	0x0000, 0x0000, 0x0000,
+		0x0000,	0x0000, 0x0000
+	};
+
+	static const uint8 dflags[] = {
+		0x00, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00,
+		0x11, 0x00 /*stinking cloud*/, 0x00, 0x21, 0x11 /*flame arrow*/, 0x00, 0x00, 0x00, 0x03, 0x01,
+		0x00, 0x41, 0x00 /*stone skin*/, 0x00 /*cloud kill*/, 0x41, 0x00, 0x00, 0x00, 0x01, 0x00,
+		0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x01,	0x00, 0x00, 0x00 /*Prot From Lightning*/, 0x00,	0x01, 0x21, 0x00, 0x00,
+		0x00, 0x00, 0x00
+	};
+
+	int temp;
+	const uint8 *src = _staticres->loadRawData(kEobBaseSpellProperties, temp);
+	_clericSpellOffset -= 3;
+
+	for (int i = 0; i < _numSpells; i++) {
+		EobSpell *s = &_spells[i];
+		src += 4;
+		s->flags = convertSpellFlagToEob2Format(src[0], src[14]);
+		s->damageFlags = dflags[i];
+		s->effectFlags = eflags[i];
+		s->sound = src[13];
+		src += 15;
+	}
+}
+
+void DarkMoonEngine::initStaticResource() {
+	int temp;
+	_mainMenuStrings = _staticres->loadStrings(kEob2MainMenuStrings, temp);
+	_introStrings = _staticres->loadStrings(kEob2IntroStrings, temp);
+	_cpsFilesIntro = _staticres->loadStrings(kEob2IntroCPSFiles, temp);
+
+	_seqIntro = new const EobSequenceStep*[44];
+	for (int i = 0; i < 44; i++)
+		_seqIntro[i] = _staticres->loadEob2SeqData(kEob2IntroSeqData00 + i, temp);
+
+	_shapesIntro = new const EobShapeDef*[13];
+	memset(_shapesIntro, 0, sizeof(EobShapeDef*) * 13);
+ 	_shapesIntro[0] = _staticres->loadEob2ShapeData(kEob2IntroShapes00, temp);
+ 	_shapesIntro[1] = _staticres->loadEob2ShapeData(kEob2IntroShapes01, temp);
+ 	_shapesIntro[4] = _staticres->loadEob2ShapeData(kEob2IntroShapes04, temp);
+ 	_shapesIntro[7] = _staticres->loadEob2ShapeData(kEob2IntroShapes07, temp);
+
+	_finaleStrings = _staticres->loadStrings(kEob2FinaleStrings, temp);
+	_creditsData = _staticres->loadRawData(kEob2CreditsData, temp);
+	_cpsFilesFinale = _staticres->loadStrings(kEob2FinaleCPSFiles, temp);
+
+	_seqFinale = new const EobSequenceStep*[21];
+	for (int i = 0; i < 21; i++)
+		_seqFinale[i] = _staticres->loadEob2SeqData(kEob2FinaleSeqData00 + i, temp);
+
+	_shapesFinale = new const EobShapeDef*[13];
+	memset(_shapesFinale, 0, sizeof(EobShapeDef*) * 13);
+	_shapesFinale[0] = _staticres->loadEob2ShapeData(kEob2FinaleShapes00, temp);
+ 	_shapesFinale[3] = _staticres->loadEob2ShapeData(kEob2FinaleShapes03, temp);
+ 	_shapesFinale[7] = _staticres->loadEob2ShapeData(kEob2FinaleShapes07, temp);
+ 	_shapesFinale[9] = _staticres->loadEob2ShapeData(kEob2FinaleShapes09, temp);
+ 	_shapesFinale[10] = _staticres->loadEob2ShapeData(kEob2FinaleShapes10, temp);
+
+	_dscDoorType5Offs = _staticres->loadRawData(kEobBaseDscDoorType5Offs, temp);
+
+	_npcShpData = _staticres->loadRawData(kEob2NpcShapeData, temp);
+	_npc1Strings = _staticres->loadStrings(kEob2Npc1Strings, temp);
+	_npc2Strings = _staticres->loadStrings(kEob2Npc2Strings, temp);
+	_monsterDustStrings = _staticres->loadStrings(kEob2MonsterDustStrings, temp);
+}
+
+void DarkMoonEngine::initSpells() {
+	EobCoreEngine::initSpells();
+
+	int temp;
+	const uint8 *src = _staticres->loadRawData(kEobBaseSpellProperties, temp);
+
+	for (int i = 0; i < _numSpells; i++) {
+		EobSpell *s = &_spells[i];
+		src += 8;
+		s->flags = READ_LE_UINT16(src);
+		src += 10;
+		s->sound = *src++;
+		s->effectFlags = READ_LE_UINT32(src);
+		src += 4;
+		s->damageFlags = READ_LE_UINT16(src);
+		src += 2;
+	}
+}
+
+const char *DarkMoonEngine::_palFilesIntro[] = {
+	"PALETTE1.PAL", // EGA: palette0.pal
+	"PALETTE3.PAL",
+	"PALETTE2.PAL",
+	"PALETTE4.PAL",
+	0
+};
+
+const char *DarkMoonEngine::_palFilesFinale[] = {
+	"FINALE_0.PAL",
+	"FINALE_0.PAL",
+	"FINALE_1.PAL",
+	"FINALE_2.PAL",
+	"FINALE_3.PAL",
+	"FINALE_4.PAL",
+	"FINALE_5.PAL",
+	"FINALE_6.PAL",
+	"FINALE_7.PAL",
+	0
+};
+
+#endif // ENABLE_EOB
+
+} // End of namespace Kyra
+
diff --git a/engines/kyra/staticres_lol.cpp b/engines/kyra/staticres_lol.cpp
index bf838cd572..44b82ceb00 100644
--- a/engines/kyra/staticres_lol.cpp
+++ b/engines/kyra/staticres_lol.cpp
@@ -45,16 +45,8 @@ const FlyingObjectShape *StaticResource::loadFlyingObjectData(int id, int &entri
 	return (const FlyingObjectShape *)getData(id, kLolFlightShpData, entries);
 }
 
-const uint16 *StaticResource::loadRawDataBe16(int id, int &entries) {
-	return (const uint16 *)getData(id, kLolRawDataBe16, entries);
-}
-
-const uint32 *StaticResource::loadRawDataBe32(int id, int &entries) {
-	return (const uint32 *)getData(id, kLolRawDataBe32, entries);
-}
-
-const ButtonDef *StaticResource::loadButtonDefs(int id, int &entries) {
-	return (const ButtonDef *)getData(id, kLolButtonData, entries);
+const LoLButtonDef *StaticResource::loadButtonDefs(int id, int &entries) {
+	return (const LoLButtonDef *)getData(id, kLolButtonData, entries);
 }
 
 bool StaticResource::loadCharData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
@@ -164,34 +156,10 @@ bool StaticResource::loadFlyingObjectData(Common::SeekableReadStream &stream, vo
 	return true;
 }
 
-bool StaticResource::loadRawDataBe16(Common::SeekableReadStream &stream, void *&ptr, int &size) {
-	size = stream.size() >> 1;
-
-	uint16 *r = new uint16[size];
-
-	for (int i = 0; i < size; i++)
-		r[i] = stream.readUint16BE();
-
-	ptr = r;
-	return true;
-}
-
-bool StaticResource::loadRawDataBe32(Common::SeekableReadStream &stream, void *&ptr, int &size) {
-	size = stream.size() >> 2;
-
-	uint32 *r = new uint32[size];
-
-	for (int i = 0; i < size; i++)
-		r[i] = stream.readUint32BE();
-
-	ptr = r;
-	return true;
-}
-
 bool StaticResource::loadButtonDefs(Common::SeekableReadStream &stream, void *&ptr, int &size) {
 	size = stream.size() / 18;
 
-	ButtonDef *r = new ButtonDef[size];
+	LoLButtonDef *r = new LoLButtonDef[size];
 
 	for (int i = 0; i < size; i++) {
 		r[i].buttonflags = stream.readUint16BE();
@@ -237,23 +205,8 @@ void StaticResource::freeFlyingObjectData(void *&ptr, int &size) {
 	size = 0;
 }
 
-
-void StaticResource::freeRawDataBe16(void *&ptr, int &size) {
-	uint16 *data = (uint16 *)ptr;
-	delete[] data;
-	ptr = 0;
-	size = 0;
-}
-
-void StaticResource::freeRawDataBe32(void *&ptr, int &size) {
-	uint32 *data = (uint32 *)ptr;
-	delete[] data;
-	ptr = 0;
-	size = 0;
-}
-
 void StaticResource::freeButtonDefs(void *&ptr, int &size) {
-	ButtonDef *d = (ButtonDef *)ptr;
+	LoLButtonDef *d = (LoLButtonDef *)ptr;
 	delete[] d;
 	ptr = 0;
 	size = 0;
@@ -289,67 +242,59 @@ void LoLEngine::initStaticResource() {
 	if (_flags.isDemo)
 		return;
 
+	int tempSize;
 	_pakFileList = _staticres->loadStrings(kLolIngamePakFiles, _pakFileListSize);
 	_charDefaults = _staticres->loadCharData(kLolCharacterDefs, _charDefaultsSize);
-	_ingameSoundIndex = (const uint16 *)_staticres->loadRawData(kLolIngameSfxIndex, _ingameSoundIndexSize);
-	_musicTrackMap = _staticres->loadRawData(kLolMusicTrackMap, _musicTrackMapSize);
+	_ingameSoundIndex = (const uint16 *)_staticres->loadRawData(kLolIngameSfxIndex, tempSize);
+	_musicTrackMap = _staticres->loadRawData(kLolMusicTrackMap, tempSize);
 	_ingameGMSoundIndex = _staticres->loadRawData(kLolIngameGMSfxIndex, _ingameGMSoundIndexSize);
 	_ingameMT32SoundIndex = _staticres->loadRawData(kLolIngameMT32SfxIndex, _ingameMT32SoundIndexSize);
 	_ingamePCSpeakerSoundIndex = _staticres->loadRawData(kLolIngamePcSpkSfxIndex, _ingamePCSpeakerSoundIndexSize);
-	_spellProperties = _staticres->loadSpellData(kLolSpellProperties, _spellPropertiesSize);
-	_gameShapeMap = (const int8 *)_staticres->loadRawData(kLolGameShapeMap, _gameShapeMapSize);
-	_sceneItemOffs = (const int8 *)_staticres->loadRawData(kLolSceneItemOffs, _sceneItemOffsSize);
-	_charInvIndex = _staticres->loadRawData(kLolCharInvIndex, _charInvIndexSize);
-	_charInvDefs = _staticres->loadRawData(kLolCharInvDefs, _charInvDefsSize);
-	_charDefsMan = _staticres->loadRawDataBe16(kLolCharDefsMan, _charDefsManSize);
-	_charDefsWoman = _staticres->loadRawDataBe16(kLolCharDefsWoman, _charDefsWomanSize);
-	_charDefsKieran = _staticres->loadRawDataBe16(kLolCharDefsKieran, _charDefsKieranSize);
-	_charDefsAkshel = _staticres->loadRawDataBe16(kLolCharDefsAkshel, _charDefsAkshelSize);
-	_expRequirements = (const int32 *)_staticres->loadRawDataBe32(kLolExpRequirements, _expRequirementsSize);
-	_monsterModifiers = _staticres->loadRawDataBe16(kLolMonsterModifiers, _monsterModifiersSize);
-	_monsterShiftOffs = (const int8 *)_staticres->loadRawData(kLolMonsterShiftOffsets, _monsterShiftOffsSize);
-	_monsterDirFlags = _staticres->loadRawData(kLolMonsterDirFlags, _monsterDirFlagsSize);
-	_monsterScaleX = _staticres->loadRawData(kLolMonsterScaleX, _monsterScaleXSize);
-	_monsterScaleY = _staticres->loadRawData(kLolMonsterScaleY, _monsterScaleYSize);
-	_monsterScaleWH = _staticres->loadRawDataBe16(kLolMonsterScaleWH, _monsterScaleWHSize);
-	_inventorySlotDesc = _staticres->loadRawDataBe16(kLolInventoryDesc, _inventorySlotDescSize);
-	_levelShpList = _staticres->loadStrings(kLolLevelShpList, _levelShpListSize);
-	_levelDatList = _staticres->loadStrings(kLolLevelDatList, _levelDatListSize);
-	_compassDefs = _staticres->loadCompassData(kLolCompassDefs, _compassDefsSize);
-	_flyingItemShapes = _staticres->loadFlyingObjectData(kLolFlyingObjectShp, _flyingItemShapesSize);
-	_itemCost = _staticres->loadRawDataBe16(kLolItemPrices, _itemCostSize);
-	_stashSetupData = _staticres->loadRawData(kLolStashSetup, _stashSetupDataSize);
-
-	_dscUnk1 = (const int8 *)_staticres->loadRawData(kLolDscUnk1, _dscUnk1Size);
-	_dscShapeIndex = (const int8 *)_staticres->loadRawData(kLolDscShapeIndex, _dscShapeIndexSize);
-	_dscOvlMap = _staticres->loadRawData(kLolDscOvlMap, _dscOvlMapSize);
-	_dscShapeScaleW = _staticres->loadRawDataBe16(kLolDscScaleWidthData, _dscShapeScaleWSize);
-	_dscShapeScaleH = _staticres->loadRawDataBe16(kLolDscScaleHeightData, _dscShapeScaleHSize);
-	_dscShapeX = (const int16 *)_staticres->loadRawDataBe16(kLolDscX, _dscShapeXSize);
-	_dscShapeY = (const int8 *)_staticres->loadRawData(kLolDscY, _dscShapeYSize);
-	_dscTileIndex = _staticres->loadRawData(kLolDscTileIndex, _dscTileIndexSize);
-	_dscUnk2 = _staticres->loadRawData(kLolDscUnk2, _dscUnk2Size);
-	_dscDoorShpIndex = _staticres->loadRawData(kLolDscDoorShapeIndex, _dscDoorShpIndexSize);
-	_dscDim1 = (const int8 *)_staticres->loadRawData(kLolDscDimData1, _dscDim1Size);
-	_dscDim2 = (const int8 *)_staticres->loadRawData(kLolDscDimData2, _dscDim2Size);
-	_dscBlockMap = _staticres->loadRawData(kLolDscBlockMap, _dscBlockMapSize);
-	_dscDimMap = _staticres->loadRawData(kLolDscDimMap, _dscDimMapSize);
-	_dscDoorMonsterScaleTable = _staticres->loadRawDataBe16(kLolDscDoorScale, _dscDoorMonsterScaleTableSize);
-	_dscShapeOvlIndex = _staticres->loadRawData(kLolDscOvlIndex, _dscShapeOvlIndexSize);
-	_dscDoor4 = _staticres->loadRawDataBe16(kLolDscDoor4, _dscDoor4Size);
-	_dscBlockIndex = (const int8 *)_staticres->loadRawData(kLolDscBlockIndex, _dscBlockIndexSize);
-	_dscDoor1 = _staticres->loadRawData(kLolDscDoor1, _dscDoor1Size);
-	_dscDoorMonsterX = (const int16 *)_staticres->loadRawDataBe16(kLolDscDoorX, _dscDoorMonsterXSize);
-	_dscDoorMonsterY = (const int16 *)_staticres->loadRawDataBe16(kLolDscDoorY, _dscDoorMonsterYSize);
-
-	_scrollXTop = _staticres->loadRawData(kLolScrollXTop, _scrollXTopSize);
-	_scrollYTop = _staticres->loadRawData(kLolScrollYTop, _scrollYTopSize);
-	_scrollXBottom = _staticres->loadRawData(kLolScrollXBottom, _scrollXBottomSize);
-	_scrollYBottom = _staticres->loadRawData(kLolScrollYBottom, _scrollYBottomSize);
+	_spellProperties = _staticres->loadSpellData(kLolSpellProperties, tempSize);
+	_gameShapeMap = (const int8 *)_staticres->loadRawData(kLolGameShapeMap, tempSize);
+	_sceneItemOffs = (const int8 *)_staticres->loadRawData(kLolSceneItemOffs, tempSize);
+	_charInvIndex = _staticres->loadRawData(kLolCharInvIndex, tempSize);
+	_charInvDefs = _staticres->loadRawData(kLolCharInvDefs, tempSize);
+	_charDefsMan = _staticres->loadRawDataBe16(kLolCharDefsMan, tempSize);
+	_charDefsWoman = _staticres->loadRawDataBe16(kLolCharDefsWoman, tempSize);
+	_charDefsKieran = _staticres->loadRawDataBe16(kLolCharDefsKieran, tempSize);
+	_charDefsAkshel = _staticres->loadRawDataBe16(kLolCharDefsAkshel, tempSize);
+	_expRequirements = (const int32 *)_staticres->loadRawDataBe32(kLolExpRequirements, tempSize);
+	_monsterModifiers = _staticres->loadRawDataBe16(kLolMonsterModifiers, tempSize);
+	_monsterShiftOffs = (const int8 *)_staticres->loadRawData(kLolMonsterShiftOffsets, tempSize);
+	_monsterDirFlags = _staticres->loadRawData(kLolMonsterDirFlags, tempSize);
+	_monsterScaleX = _staticres->loadRawData(kLolMonsterScaleX, tempSize);
+	_monsterScaleY = _staticres->loadRawData(kLolMonsterScaleY, tempSize);
+	_monsterScaleWH = _staticres->loadRawDataBe16(kLolMonsterScaleWH, tempSize);
+	_inventorySlotDesc = _staticres->loadRawDataBe16(kLolInventoryDesc, tempSize);
+	_levelShpList = _staticres->loadStrings(kLolLevelShpList, tempSize);
+	_levelDatList = _staticres->loadStrings(kLolLevelDatList, tempSize);
+	_compassDefs = _staticres->loadCompassData(kLolCompassDefs, tempSize);
+	_flyingItemShapes = _staticres->loadFlyingObjectData(kLolFlyingObjectShp, tempSize);
+	_itemCost = _staticres->loadRawDataBe16(kLolItemPrices, tempSize);
+	_stashSetupData = _staticres->loadRawData(kLolStashSetup, tempSize);
+
+	_dscWalls = (const int8 *)_staticres->loadRawData(kLolDscWalls, tempSize);
+
+	_dscOvlMap = _staticres->loadRawData(kLolDscOvlMap, tempSize);
+	_dscShapeOvlIndex = _staticres->loadRawData(kLolDscOvlIndex, tempSize);
+	_dscShapeScaleW = _staticres->loadRawDataBe16(kLolDscScaleWidthData, tempSize);
+	_dscShapeScaleH = _staticres->loadRawDataBe16(kLolDscScaleHeightData, tempSize);
+	_dscShapeY = (const int8 *)_staticres->loadRawData(kLolBaseDscY, tempSize);
+
+	_dscDoorMonsterScaleTable = _staticres->loadRawDataBe16(kLolDscDoorScale, tempSize);
+	_dscDoor4 = _staticres->loadRawDataBe16(kLolDscDoor4, tempSize);
+	_dscDoorMonsterX = (const int16 *)_staticres->loadRawDataBe16(kLolDscDoorX, tempSize);
+	_dscDoorMonsterY = (const int16 *)_staticres->loadRawDataBe16(kLolDscDoorY, tempSize);
+
+	_scrollXTop = _staticres->loadRawData(kLolScrollXTop, tempSize);
+	_scrollYTop = _staticres->loadRawData(kLolScrollYTop, tempSize);
+	_scrollXBottom = _staticres->loadRawData(kLolScrollXBottom, tempSize);
+	_scrollYBottom = _staticres->loadRawData(kLolScrollYBottom, tempSize);
 
 	const char *const *tmpSndList = _staticres->loadStrings(kLolIngameSfxFiles, _ingameSoundListSize);
 	if (tmpSndList) {
-		_ingameSoundList = new char *[_ingameSoundListSize];
+		_ingameSoundList = new char*[_ingameSoundListSize];
 		for (int i = 0; i < _ingameSoundListSize; i++) {
 			_ingameSoundList[i] = new char[strlen(tmpSndList[i]) + 1];
 			strcpy(_ingameSoundList[i], tmpSndList[i]);
@@ -357,19 +302,18 @@ void LoLEngine::initStaticResource() {
 		_staticres->unloadId(kLolIngameSfxFiles);
 	}
 
-	_buttonData = _staticres->loadButtonDefs(kLolButtonDefs, _buttonDataSize);
-	_buttonList1 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList1, _buttonList1Size);
-	_buttonList2 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList2, _buttonList2Size);
-	_buttonList3 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList3, _buttonList3Size);
-	_buttonList4 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList4, _buttonList4Size);
-	_buttonList5 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList5, _buttonList5Size);
-	_buttonList6 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList6, _buttonList6Size);
-	_buttonList7 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList7, _buttonList7Size);
-	_buttonList8 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList8, _buttonList8Size);
+	_buttonData = _staticres->loadButtonDefs(kLolButtonDefs, tempSize);
+	_buttonList1 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList1, tempSize);
+	_buttonList2 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList2, tempSize);
+	_buttonList3 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList3, tempSize);
+	_buttonList4 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList4, tempSize);
+	_buttonList5 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList5, tempSize);
+	_buttonList6 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList6, tempSize);
+	_buttonList7 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList7, tempSize);
+	_buttonList8 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList8, tempSize);
 
-	_autoMapStrings = _staticres->loadRawDataBe16(kLolMapStringId, _autoMapStringsSize);
+	_autoMapStrings = _staticres->loadRawDataBe16(kLolMapStringId, tempSize);
 
-	int tempSize;
 	const uint8 *tmp = _staticres->loadRawData(kLolLegendData, tempSize);
 	uint8 entrySize = tempSize / 12;
 	tempSize /= entrySize;
@@ -386,13 +330,15 @@ void LoLEngine::initStaticResource() {
 	}
 
 	tmp = _staticres->loadRawData(kLolMapCursorOvl, tempSize);
-	_mapCursorOverlay = new uint8[tempSize];
-	memcpy(_mapCursorOverlay, tmp, tempSize);
-	_staticres->unloadId(kLolMapCursorOvl);
+	if (tmp) {
+		_mapCursorOverlay = new uint8[tempSize];
+		memcpy(_mapCursorOverlay, tmp, tempSize);
+		_staticres->unloadId(kLolMapCursorOvl);
+	}
 
-	_updateSpellBookCoords = _staticres->loadRawData(kLolSpellbookCoords, _updateSpellBookCoordsSize);
-	_updateSpellBookAnimData = _staticres->loadRawData(kLolSpellbookAnim, _updateSpellBookAnimDataSize);
-	_healShapeFrames = _staticres->loadRawData(kLolHealShapeFrames, _healShapeFramesSize);
+	_updateSpellBookCoords = _staticres->loadRawData(kLolSpellbookCoords, tempSize);
+	_updateSpellBookAnimData = _staticres->loadRawData(kLolSpellbookAnim, tempSize);
+	_healShapeFrames = _staticres->loadRawData(kLolHealShapeFrames, tempSize);
 
 	tmp = _staticres->loadRawData(kLolLightningDefs, tempSize);
 	if (tmp) {
@@ -405,7 +351,7 @@ void LoLEngine::initStaticResource() {
 		_staticres->unloadId(kLolLightningDefs);
 	}
 
-	_fireBallCoords = (const int16 *)_staticres->loadRawDataBe16(kLolFireballCoords, _fireBallCoordsSize);
+	_fireBallCoords = (const int16*)_staticres->loadRawDataBe16(kLolFireballCoords, tempSize);
 
 	_buttonCallbacks.clear();
 	_buttonCallbacks.reserve(95);
diff --git a/engines/kyra/text_eob.cpp b/engines/kyra/text_eob.cpp
new file mode 100644
index 0000000000..dc53ae295a
--- /dev/null
+++ b/engines/kyra/text_eob.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.
+ *
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/loleobbase.h"
+#include "kyra/screen.h"
+#include "kyra/timer.h"
+
+#include "common/system.h"
+
+namespace Kyra {
+
+TextDisplayer_Eob::TextDisplayer_Eob(LolEobBaseEngine *engine, Screen *sScreen) : _vm(engine), _screen(sScreen),
+	_lineCount(0), _printFlag(false), _lineWidth(0), _numCharsTotal(0), _allowPageBreak(true),
+	_numCharsLeft(0), _numCharsPrinted(0), _sjisLineBreakFlag(false), _waitButtonMode(1) {
+
+	_dialogueBuffer = new char[1024];
+	memset(_dialogueBuffer, 0, 1024);
+
+	_currentLine = new char[85];
+	memset(_currentLine, 0, 85);
+
+	_textDimData = new TextDimData[_screen->screenDimTableCount()];
+
+	for (int i = 0; i < _screen->screenDimTableCount(); i++){
+		const ScreenDim *d = _screen->getScreenDim(i);
+		_textDimData[i].color1 = d->unk8;
+		_textDimData[i].color2 = d->unkA;
+		_textDimData[i].line = d->unkC;
+		_textDimData[i].column = d->unkE;
+	}
+
+	_waitButtonSpace = 0;
+}
+
+TextDisplayer_Eob::~TextDisplayer_Eob() {
+	delete[] _dialogueBuffer;
+	delete[] _currentLine;
+	delete[] _textDimData;
+}
+
+void TextDisplayer_Eob::setupField(int dim, bool mode) {
+	setPageBreakFlag();
+
+	_textDimData[dim].color2 = _vm->_bkgColor_1;
+	_screen->setScreenDim(dim);
+
+	if (mode)
+		clearCurDim();
+	else
+		resetDimTextPositions(dim);
+
+	//_textPageBreakFunc = textPageBreakMore; + 0x25
+}
+
+void TextDisplayer_Eob::resetDimTextPositions(int dim) {
+	_textDimData[dim].column = 0;
+	_textDimData[dim].line = 0;
+}
+
+void TextDisplayer_Eob::resetPageBreakString() {
+	if (vm()->_moreStrings)
+		strcpy(_pageBreakString, vm()->_moreStrings[0]);
+}
+
+void TextDisplayer_Eob::setPageBreakFlag() {
+	_allowPageBreak = true;
+	_lineCount = 0;
+}
+
+void TextDisplayer_Eob::removePageBreakFlag() {
+	_allowPageBreak = false;
+}
+
+void TextDisplayer_Eob::displayText(char *str, ...) {
+	const bool isPc98 = (_vm->gameFlags().platform == Common::kPlatformPC98);
+
+	_printFlag = false;
+
+	_lineWidth = 0;
+	_numCharsLeft = 0;
+	_numCharsPrinted = 0;
+
+	_tempString1 = str;
+	_tempString2 = 0;
+
+	_currentLine[0] = 0;
+
+	memset(_ctrl, 0, 3);
+
+	char c = parseCommand();
+
+	va_list args;
+	va_start(args, str);
+
+	const ScreenDim *sd = _screen->_curDim;
+	int sdx = _screen->curDimIndex();
+
+	bool pc98PrintFlag = (isPc98 && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
+	uint16 charsPerLine = (sd->w << 3) / (_screen->getFontWidth() + _screen->_charWidth);
+
+	while (c) {
+		char a = tolower(_ctrl[1]);
+
+		if (!_tempString2 && c == '%') {
+			if (a == 'd') {
+				snprintf(_scriptParaString, 11, "%d", va_arg(args, int));
+				_tempString2 = _scriptParaString;
+			} else if (a == 's') {
+				_tempString2 = va_arg(args, char *);
+			} else {
+				break;
+			}
+
+			_ctrl[0] = _ctrl[2];
+			_ctrl[2] = _ctrl[1] = 0;
+			c = parseCommand();
+		}
+
+		if (isPc98) {
+			uint8 cu = (uint8) c;
+			if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0)) {
+				_currentLine[_numCharsLeft++] = c;
+				_currentLine[_numCharsLeft++] = parseCommand();
+				_currentLine[_numCharsLeft] = '\0';
+				_lineWidth += 8;
+				if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
+					printLine(_currentLine);
+				c = parseCommand();
+				continue;
+			}
+		}
+
+		uint16 dv = _textDimData[sdx].column / (_screen->getFontWidth() + _screen->_charWidth);
+
+		switch (c - 1) {
+		case 0:
+			printLine(_currentLine);
+			textPageBreak();
+			_numCharsPrinted = 0;
+			break;
+
+		case 1:
+			printLine(_currentLine);
+			_textDimData[sdx].color2 = parseCommand();
+			break;
+
+		case 5:
+			printLine(_currentLine);
+			_textDimData[sdx].color1 = parseCommand();
+			break;
+
+		case 8:
+			printLine(_currentLine);
+			dv = _textDimData[sdx].column / (_screen->getFontWidth() + _screen->_charWidth);
+			dv = ((dv + 8) & 0xfff8) - 1;
+			if (dv >= charsPerLine)
+				dv = 0;
+			_textDimData[sdx].column = (_screen->getFontWidth() + _screen->_charWidth) * dv;
+			break;
+
+		case 11:
+			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			// TODO (UNUSED)
+			break;
+
+		case 12:
+			if (isPc98)
+				_sjisLineBreakFlag = true;
+			printLine(_currentLine);
+			_sjisLineBreakFlag = false;
+			_lineCount++;
+			_textDimData[sdx].column = 0;
+			_textDimData[sdx].line++;
+			break;
+
+		case 18:
+			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			// TODO (UNUSED)
+			break;
+
+		case 23:
+			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			// TODO (UNUSED)
+			break;
+
+		case 24:
+			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			// TODO (UNUSED)
+			break;
+
+		case 26:
+			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			// TODO (UNUSED)
+			break;
+
+		case 28:
+			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			// TODO (UNUSED)
+			break;
+
+		default:
+			_lineWidth += (pc98PrintFlag ? 4 : _screen->getCharWidth((uint8)c));
+			_currentLine[_numCharsLeft++] = c;
+			_currentLine[_numCharsLeft] = 0;
+
+			if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
+				printLine(_currentLine);
+		}
+
+		c = parseCommand();
+	}
+
+	va_end(args);
+
+	if (_numCharsLeft)
+		printLine(_currentLine);
+}
+
+char TextDisplayer_Eob::parseCommand() {
+	if (!_ctrl[1])
+		readNextPara();
+
+	char res = _ctrl[1];
+	_ctrl[1] = _ctrl[2];
+	_ctrl[2] = 0;
+
+	if (!_ctrl[1])
+		readNextPara();
+
+	return res;
+}
+
+void TextDisplayer_Eob::readNextPara() {
+	char d = 0;
+
+	if (_tempString2) {
+		if (*_tempString2) {
+			d = *_tempString2++;
+		} else {
+			_tempString2 = 0;
+			d = _ctrl[0];
+		}
+	}
+
+	if (!d && _tempString1) {
+		if (*_tempString1)
+			d = *_tempString1++;
+		else
+			_tempString1 = 0;
+	}
+
+	_ctrl[1] = d;
+	_ctrl[2] = 0;
+}
+
+void TextDisplayer_Eob::printLine(char *str) {
+	const bool isPc98 = (_vm->gameFlags().platform == Common::kPlatformPC98);
+	const ScreenDim *sd = _screen->_curDim;
+	int sdx = _screen->curDimIndex();
+	bool pc98PrintFlag = (isPc98 && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
+
+	int fh = (_screen->_currentFont == Screen::FID_SJIS_FNT) ? 9 : (_screen->getFontHeight() + _screen->_charOffset);
+	int lines = (sd->h - _screen->_charOffset) / fh;
+
+	while (_textDimData[sdx].line >= lines) {
+		if ((lines - _waitButtonSpace) <= _lineCount && _allowPageBreak) {
+			_lineCount = 0;
+			textPageBreak();
+			_numCharsPrinted = 0;
+		}
+
+		int h1 = ((sd->h / fh) - 1) * fh;
+		int h2 = sd->h - fh;
+
+		if (h2)
+			_screen->copyRegion(sd->sx << 3, sd->sy + fh, sd->sx << 3, sd->sy, sd->w << 3, h2, _screen->_curPage, _screen->_curPage, Screen::CR_NO_P_CHECK);
+
+		_screen->fillRect(sd->sx << 3, sd->sy + h1, ((sd->sx + sd->w) << 3) - 1, sd->sy + sd->h - 1, _textDimData[sdx].color2);
+		if (_textDimData[sdx].line)
+			_textDimData[sdx].line--;
+	}
+
+	int x1 = (sd->sx << 3) + _textDimData[sdx].column;
+	int y = sd->sy + (pc98PrintFlag ? (_textDimData[sdx].line << 3) : (fh * _textDimData[sdx].line));
+	int w = sd->w << 3;
+	int lw = _lineWidth;
+	int s = _numCharsLeft;
+	char c = 0;
+
+	if (pc98PrintFlag) {
+		bool ct = true;
+
+		if ((lw + _textDimData[sdx].column) > w) {
+			if ((lines - 1 - (_waitButtonSpace << 1)) <= _lineCount)
+				// cut off line to leave space for "MORE" button
+				w -= 80;
+		} else {
+			if (!_sjisLineBreakFlag || (_lineCount + 1 < lines - 1))
+				ct = false;
+			else
+				// cut off line to leave space for "MORE" button
+				w -= 80;
+		}
+
+		if (ct) {
+			w -= _textDimData[sdx].column;
+
+			int n2 = 0;
+			int n1 = (w / 4) - 1;
+
+			while (n2 < n1 && n2 < s) {
+				c = str[n2];
+				uint8 cu = (uint8) c;
+				if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0))
+					n2++;
+				n2++;
+			}
+			s = n2;
+		}
+	} else {
+		if ((lw + _textDimData[sdx].column) > w) {
+			if ((lines - 1) <= _lineCount && _allowPageBreak)
+				// cut off line to leave space for "MORE" button
+				w -= (10 * (_screen->getFontWidth() + _screen->_charWidth));
+
+			w -= _textDimData[sdx].column;
+
+			int n2 = 0;
+			int n1 = s - 1;
+
+			while (n1 > 0) {
+				//cut off line after last space
+				c = str[n1];
+
+				lw -= _screen->getCharWidth((uint8)c);
+
+				if (!n2 && lw <= w)
+					n2 = n1;
+
+				if (n2 && c == ' ') {
+					s = n1;
+					_printFlag = false;
+					break;
+				}
+				n1--;
+			}
+
+			if (!n1) {
+				if (_textDimData[sdx].column && !_printFlag) {
+					s = lw = 0;
+					_printFlag = true;
+				} else {
+					s = n2;
+				}
+			}
+		}
+	}
+
+	c = str[s];
+	str[s] = 0;
+
+	uint8 col = _textDimData[sdx].color1;
+	if (isPc98 && (sdx == 2 || sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) {
+		switch (_textDimData[sdx].color1) {
+		case 0x88:
+			col = 0x41;
+			break;
+		case 0x55:
+			col = 0x81;
+			break;
+		case 0xaa:
+			col = 0x21;
+			break;
+		case 0x99:
+			col = 0xa1;
+			break;
+		case 0x33:
+			col = 0xe1;
+			break;
+		case 0x18:
+			col = 0x61;
+			break;
+		default:
+			col = 1;
+			break;
+		}
+		_screen->printText(str, x1 & ~3, (y + 8) & ~7, col, 0);
+	} else {
+		_screen->printText(str, x1, y, col, _textDimData[sdx].color2);
+	}
+
+	_textDimData[sdx].column += lw;
+	_numCharsPrinted += strlen(str);
+
+	str[s] = c;
+
+	if (c == ' ')
+		s++;
+
+	if (str[s] == ' ')
+		s++;
+
+	uint32 len = strlen(&str[s]);
+	for (uint32 i = 0; i < len; i++)
+		str[i] = str[s + i];
+	str[len] = 0;
+
+	_numCharsLeft = strlen(str);
+	_lineWidth = pc98PrintFlag ? (_numCharsLeft << 2) : _screen->getTextWidth(str);
+
+	if (!_numCharsLeft && _textDimData[sdx].column < (sd->w << 3))
+		return;
+
+	_textDimData[sdx].column = 0;
+	_textDimData[sdx].line++;
+	_lineCount++;
+
+	printLine(str);
+}
+
+void TextDisplayer_Eob::printDialogueText(int stringId, const char *pageBreakString) {
+	strcpy(_dialogueBuffer, (const char *)(screen()->getCPagePtr(5) + READ_LE_UINT16(&screen()->getCPagePtr(5)[(stringId - 1) << 1])));
+	displayText(_dialogueBuffer);
+
+	if (pageBreakString) {
+		strcpy(_pageBreakString, pageBreakString);
+		displayWaitButton();
+		resetPageBreakString();
+	}
+}
+
+void TextDisplayer_Eob::printDialogueText(const char *str, bool wait) {
+	strcpy(_dialogueBuffer, str);
+	displayText(_dialogueBuffer);
+	if (wait)
+		displayWaitButton();
+}
+
+void TextDisplayer_Eob::printMessage(const char *str, int textColor, ...) {
+	int tc = _textDimData[screen()->curDimIndex()].color1;
+
+	if (textColor != -1)
+		_textDimData[screen()->curDimIndex()].color1 = textColor;
+
+	va_list args;
+	va_start(args, textColor);
+	vsnprintf(_dialogueBuffer, 240, str, args);
+	va_end(args);
+
+	displayText(_dialogueBuffer);
+
+	//if (textColor != -1)
+		_textDimData[screen()->curDimIndex()].color1 = tc;
+
+	if (!screen()->_curPage)
+		screen()->updateScreen();
+}
+
+int TextDisplayer_Eob::clearDim(int dim) {
+	int res = screen()->curDimIndex();
+	screen()->setScreenDim(dim);
+	_textDimData[dim].color1 = screen()->_curDim->unk8;
+	_textDimData[dim].color2 = vm()->game() == GI_LOL ? screen()->_curDim->unkA : vm()->_bkgColor_1;
+	clearCurDim();
+	return res;
+}
+
+void TextDisplayer_Eob::clearCurDim() {
+	int d = screen()->curDimIndex();
+	const ScreenDim *tmp = screen()->getScreenDim(d);
+	if (vm()->gameFlags().use16ColorMode) {
+		screen()->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 2, (tmp->sy + tmp->h) - 2, _textDimData[d].color2);
+	} else
+		screen()->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 1, (tmp->sy + tmp->h) - 1, _textDimData[d].color2);
+
+	_lineCount = 0;
+	_textDimData[d].column = _textDimData[d].line = 0;
+}
+
+void TextDisplayer_Eob::textPageBreak() {
+	if (vm()->game() != GI_LOL)
+		SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
+
+	int cp = _screen->setCurPage(0);
+	Screen::FontId cf = screen()->setFont(vm()->gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
+
+	vm()->_timer->pauseSingleTimer(11, true);
+
+	vm()->_fadeText = false;
+	int resetPortraitAfterSpeechAnim = 0;
+	int updatePortraitSpeechAnimDuration = 0;
+
+	if (vm()->_updateCharNum != -1)  {
+		resetPortraitAfterSpeechAnim = vm()->_resetPortraitAfterSpeechAnim;
+		vm()->_resetPortraitAfterSpeechAnim = 0;
+		updatePortraitSpeechAnimDuration = vm()->_updatePortraitSpeechAnimDuration;
+		if (vm()->_updatePortraitSpeechAnimDuration > 36)
+			vm()->_updatePortraitSpeechAnimDuration = 36;
+	}
+
+	uint32 speechPartTime = 0;
+	if (vm()->speechEnabled() && vm()->_activeVoiceFileTotalTime && _numCharsTotal)
+		speechPartTime = vm()->_system->getMillis() + ((_numCharsPrinted * vm()->_activeVoiceFileTotalTime) / _numCharsTotal);
+
+	const ScreenDim *dim = screen()->getScreenDim(screen()->curDimIndex());
+
+	int x = ((dim->sx + dim->w) << 3) - (_vm->_dialogueButtonW + 3);
+	int y = 0;
+
+	if (vm()->_needSceneRestore && (vm()->_updateFlags & 2)) {
+		if (vm()->_currentControlMode || !(vm()->_updateFlags & 2)) {
+			y = dim->sy + dim->h - 5;
+		} else {
+			x += 6;
+			y = dim->sy + dim->h - 2;
+		}
+	} else if (vm()->game() == GI_LOL) {
+		y = dim->sy + dim->h - 10;
+	} else {
+		y = _waitButtonMode ? 162 : 189;
+		x = _waitButtonMode ? 76 : 221;
+	}
+
+	if (vm()->gameFlags().use16ColorMode) {
+		vm()->gui_drawBox(x + 8, (y & ~7) - 1, 66, 10, 0xee, 0xcc, -1);
+		screen()->printText(_pageBreakString, (x + 37 - (strlen(_pageBreakString) << 1) + 4) & ~3, (y + 2) & ~7, 0xc1, 0);
+	} else {
+		vm()->gui_drawBox(x, y, vm()->_dialogueButtonW, vm()->_dialogueButtonH, vm()->_color1_1, vm()->_color2_1, vm()->_bkgColor_1);
+		screen()->printText(_pageBreakString, x + (vm()->_dialogueButtonW >> 1) - (vm()->screen()->getTextWidth(_pageBreakString) >> 1), y + 2, vm()->_dialogueButtonLabelCol1, 0);
+	}
+
+	vm()->removeInputTop();
+
+	bool loop = true;
+	bool target = false;
+
+	do {
+		int inputFlag = vm()->checkInput(0, false) & 0xFF;
+		vm()->removeInputTop();
+
+		while (!inputFlag) {
+			vm()->update();
+
+			if (vm()->speechEnabled()) {
+				if (((vm()->_system->getMillis() > speechPartTime) || (vm()->snd_updateCharacterSpeech() != 2)) && speechPartTime) {
+					loop = false;
+					inputFlag = vm()->_keyMap[Common::KEYCODE_RETURN];
+					break;
+				}
+			}
+
+			inputFlag = vm()->checkInput(0, false) & 0xFF;
+			vm()->removeInputTop();
+		}
+
+		vm()->gui_notifyButtonListChanged();
+
+		if (inputFlag == vm()->_keyMap[Common::KEYCODE_SPACE] || inputFlag == vm()->_keyMap[Common::KEYCODE_RETURN]) {
+			loop = false;
+		} else if (inputFlag == 199 || inputFlag == 201) {
+			if (vm()->posWithinRect(vm()->_mouseX, vm()->_mouseY, x, y, x + _vm->_dialogueButtonW, y + 9)) {
+				if (_vm->game() == GI_LOL)
+					target = true;
+				else
+					loop = false;
+			}
+		} else if (inputFlag == 200 || inputFlag == 202) {
+			if (target)
+				loop = false;
+		}
+	} while (loop);
+
+	if (vm()->gameFlags().use16ColorMode)
+		screen()->fillRect(x + 8, y, x + 57, y + 9, _textDimData[screen()->curDimIndex()].color2);
+	else
+		screen()->fillRect(x, y, x + 73, y + 8, _textDimData[screen()->curDimIndex()].color2);
+
+	clearCurDim();
+
+	vm()->_timer->pauseSingleTimer(11, false);
+
+	if (vm()->_updateCharNum != -1) {
+		vm()->_resetPortraitAfterSpeechAnim = resetPortraitAfterSpeechAnim;
+		if (updatePortraitSpeechAnimDuration > 36)
+			updatePortraitSpeechAnimDuration -= 36;
+		else
+			updatePortraitSpeechAnimDuration >>= 1;
+
+		vm()->_updatePortraitSpeechAnimDuration = updatePortraitSpeechAnimDuration;
+	}
+
+	screen()->setFont(cf);
+	screen()->setCurPage(cp);
+
+	if (vm()->game() != GI_LOL)
+		SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
+
+	vm()->removeInputTop();
+}
+
+void TextDisplayer_Eob::displayWaitButton() {
+	vm()->_dialogueNumButtons = 1;
+	vm()->_dialogueButtonString[0] = _pageBreakString;
+	vm()->_dialogueButtonString[1] = 0;
+	vm()->_dialogueButtonString[2] = 0;
+	vm()->_dialogueHighlightedButton = 0;
+
+	static const uint16 posX[] = { 221, 76 };
+	static const uint8 posY[] = { 189, 162 };
+
+	vm()->_dialogueButtonPosX = &posX[_waitButtonMode];
+	vm()->_dialogueButtonPosY = &posY[_waitButtonMode];
+	vm()->_dialogueButtonYoffs = 0;
+
+	SWAP(_vm->_dialogueButtonLabelCol1, _vm->_dialogueButtonLabelCol2);
+	vm()->drawDialogueButtons();
+
+	if (!vm()->shouldQuit())
+		vm()->removeInputTop();
+
+	while (!vm()->processDialogue() && !vm()->shouldQuit()) {}
+	SWAP(_vm->_dialogueButtonLabelCol1, _vm->_dialogueButtonLabelCol2);
+}
+
+} // End of namespace Kyra
+
+#endif // (ENABLE_EOB || ENABLE_LOL)
diff --git a/engines/kyra/text_eob.h b/engines/kyra/text_eob.h
new file mode 100644
index 0000000000..eb4957448b
--- /dev/null
+++ b/engines/kyra/text_eob.h
@@ -0,0 +1,112 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are to numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#ifndef KYRA_TEXT_EOB_H
+#define KYRA_TEXT_EOB_H
+
+#include "common/scummsys.h"
+
+namespace Kyra {
+
+class Screen;
+class LolEobBaseEngine;
+
+class TextDisplayer_Eob {
+public:
+	TextDisplayer_Eob(LolEobBaseEngine *engine, Screen *sScreen);
+	virtual ~TextDisplayer_Eob();
+
+	virtual void setupField(int dim, bool mode);
+
+	void printDialogueText(int stringId, const char *pageBreakString);
+	void printDialogueText(const char *str, bool wait = false);
+	void printMessage(const char *str, int textColor = -1, ...);
+
+	int clearDim(int dim);
+	void clearCurDim();
+
+	void resetDimTextPositions(int dim);
+	void resetPageBreakString();
+	void setPageBreakFlag();
+	void removePageBreakFlag();
+
+	void allowPageBreak(bool mode) { _allowPageBreak = mode; }
+	void setWaitButtonMode(int mode) { _waitButtonMode = mode; }
+	int lineCount() { return _lineCount; }
+
+protected:
+	virtual LolEobBaseEngine *vm() { return _vm; }
+	virtual Screen *screen() { return _screen; }
+
+	void displayText(char *str, ...);
+	char parseCommand();
+	void readNextPara();
+	void printLine(char *str);
+	virtual void textPageBreak();
+	void displayWaitButton();
+
+	char *_dialogueBuffer;
+
+	char *_tempString1;
+	char *_tempString2;
+	char *_currentLine;
+	char _ctrl[3];
+
+	uint16 _lineWidth;
+	uint32 _numCharsTotal;
+	uint32 _numCharsLeft;
+	uint32 _numCharsPrinted;
+
+	bool _printFlag;
+	bool _sjisLineBreakFlag;
+
+	char _pageBreakString[20];
+	char _scriptParaString[11];
+	int _lineCount;
+
+	bool _allowPageBreak;
+	int _waitButtonSpace;
+	int _waitButtonMode;
+
+	static const char _pageBreakDefault[3][5];
+
+	struct TextDimData {
+		uint8 color1;
+		uint8 color2;
+		uint16 column;
+		uint8 line;
+	};
+
+	TextDimData *_textDimData;
+
+private:
+	LolEobBaseEngine *_vm;
+	Screen *_screen;
+};
+
+} // End of namespace Kyra
+
+#endif
+
+#endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp
index 1c2167b892..3127e6d54b 100644
--- a/engines/kyra/text_lol.cpp
+++ b/engines/kyra/text_lol.cpp
@@ -32,36 +32,18 @@
 
 namespace Kyra {
 
-TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *vm, Screen_LoL *screen) : _vm(vm), _screen(screen),
-	_scriptTextParameter(0), _lineCount(0),	_printFlag(false), _lineWidth(0), _numCharsTotal(0),
-	_numCharsLeft(0), _numCharsPrinted(0), _sjisLineBreakFlag(false) {
+TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *engine, Screen_LoL *screenLoL) : TextDisplayer_Eob(engine, engine->screen()),
+	_vm(engine), _screen(screenLoL), _scriptTextParameter(0) {
 
 	memset(_stringParameters, 0, 15 * sizeof(char *));
 	_buffer = new char[600];
 	memset(_buffer, 0, 600);
 
-	_dialogueBuffer = new char[1024];
-	memset(_dialogueBuffer, 0, 1024);
-
-	_currentLine = new char[85];
-	memset(_currentLine, 0, 85);
-
-	_textDimData = new TextDimData[_screen->screenDimTableCount()];
-
-	for (int i = 0; i < _screen->screenDimTableCount(); i++){
-		const ScreenDim *d = _screen->getScreenDim(i);
-		_textDimData[i].color1 = d->unk8;
-		_textDimData[i].color2 = d->unkA;
-		_textDimData[i].line = d->unkC;
-		_textDimData[i].column = d->unkE;
-	}
+	_waitButtonSpace = 0;
 }
 
 TextDisplayer_LoL::~TextDisplayer_LoL() {
 	delete[] _buffer;
-	delete[] _dialogueBuffer;
-	delete[] _currentLine;
-	delete[] _textDimData;
 }
 
 void TextDisplayer_LoL::setupField(bool mode) {
@@ -151,20 +133,6 @@ void TextDisplayer_LoL::expandField() {
 	}
 }
 
-int TextDisplayer_LoL::clearDim(int dim) {
-	int res = _screen->curDimIndex();
-	_screen->setScreenDim(dim);
-	_textDimData[dim].color1 = _screen->_curDim->unk8;
-	_textDimData[dim].color2 = _screen->_curDim->unkA;
-	clearCurDim();
-	return res;
-}
-
-void TextDisplayer_LoL::resetDimTextPositions(int dim) {
-	_textDimData[dim].column = 0;
-	_textDimData[dim].line = 0;
-}
-
 void TextDisplayer_LoL::printDialogueText(int dim, char *str, EMCState *script, const uint16 *paramList, int16 paramIndex) {
 	int oldDim = 0;
 
@@ -201,10 +169,9 @@ void TextDisplayer_LoL::printDialogueText(int dim, char *str, EMCState *script,
 	displayText(_dialogueBuffer);
 
 	_screen->setScreenDim(oldDim);
-	_lineCount = 0;
 	_screen->setCurPage(cp);
 	_screen->setFont(of);
-
+	_lineCount = 0;
 	_vm->_fadeText = false;
 }
 
@@ -366,465 +333,17 @@ void TextDisplayer_LoL::preprocessString(char *str, EMCState *script, const uint
 	*dst = 0;
 }
 
-void TextDisplayer_LoL::displayText(char *str, ...) {
-	const bool isPc98 = (_vm->gameFlags().platform == Common::kPlatformPC98);
-
-	_printFlag = false;
-
-	_lineWidth = 0;
-	_numCharsLeft = 0;
-	_numCharsPrinted = 0;
-
-	_tempString1 = str;
-	_tempString2 = 0;
-
-	_currentLine[0] = 0;
-	memset(_ctrl, 0, 3);
-
-	char c = parseCommand();
-
-	va_list args;
-	va_start(args, str);
-
-	const ScreenDim *sd = _screen->_curDim;
-	int sdx = _screen->curDimIndex();
-
-	bool pc98PrintFlag = (isPc98 && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
-	uint16 charsPerLine = (sd->w << 3) / (_screen->getFontWidth() + _screen->_charWidth);
-
-	while (c) {
-		char a = tolower(_ctrl[1]);
-
-		if (!_tempString2 && c == '%') {
-			if (a == 'd') {
-				snprintf(_scriptParaString, 11, "%d", va_arg(args, int));
-				_tempString2 = _scriptParaString;
-			} else if (a == 's') {
-				_tempString2 = va_arg(args, char *);
-			} else {
-				break;
-			}
-
-			_ctrl[0] = _ctrl[2];
-			_ctrl[2] = _ctrl[1] = 0;
-			c = parseCommand();
-		}
-
-		if (isPc98) {
-			uint8 cu = (uint8) c;
-			if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0)) {
-				_currentLine[_numCharsLeft++] = c;
-				_currentLine[_numCharsLeft++] = parseCommand();
-				_currentLine[_numCharsLeft] = '\0';
-				_lineWidth += 8;
-				if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
-					printLine(_currentLine);
-				c = parseCommand();
-				continue;
-			}
-		}
-
-		uint16 dv = _textDimData[sdx].column / (_screen->getFontWidth() + _screen->_charWidth);
-
-		switch (c - 1) {
-		case 0:
-			printLine(_currentLine);
-			textPageBreak();
-			_numCharsPrinted = 0;
-			break;
-
-		case 1:
-			printLine(_currentLine);
-			_textDimData[sdx].color2 = parseCommand();
-			break;
-
-		case 5:
-			printLine(_currentLine);
-			_textDimData[sdx].color1 = parseCommand();
-			break;
-
-		case 8:
-			printLine(_currentLine);
-			dv = _textDimData[sdx].column / (_screen->getFontWidth() + _screen->_charWidth);
-			dv = ((dv + 8) & 0xfff8) - 1;
-			if (dv >= charsPerLine)
-				dv = 0;
-			_textDimData[sdx].column = (_screen->getFontWidth() + _screen->_charWidth) * dv;
-			break;
-
-		case 11:
-			// TODO (UNUSED)
-			break;
-
-		case 12:
-			if (isPc98)
-				_sjisLineBreakFlag = true;
-			printLine(_currentLine);
-			_sjisLineBreakFlag = false;
-			_lineCount++;
-			_textDimData[sdx].column = 0;
-			_textDimData[sdx].line++;
-			break;
-
-		case 18:
-			// TODO (UNUSED)
-			break;
-
-		case 23:
-			// TODO (UNUSED)
-			break;
-
-		case 24:
-			// TODO (UNUSED)
-			break;
-
-		case 26:
-			// TODO (UNUSED)
-			break;
-
-		case 28:
-			// TODO (UNUSED)
-			break;
-
-		default:
-			_lineWidth += (pc98PrintFlag ? 4 : _screen->getCharWidth((uint8)c));
-			_currentLine[_numCharsLeft++] = c;
-			_currentLine[_numCharsLeft] = 0;
-
-			if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
-				printLine(_currentLine);
-		}
-
-		c = parseCommand();
-	}
-
-	va_end(args);
-
-	if (_numCharsLeft)
-		printLine(_currentLine);
-}
-
-char TextDisplayer_LoL::parseCommand() {
-	if (!_ctrl[1])
-		readNextPara();
-
-	char res = _ctrl[1];
-	_ctrl[1] = _ctrl[2];
-	_ctrl[2] = 0;
-
-	if (!_ctrl[1])
-		readNextPara();
-
-	return res;
+LolEobBaseEngine *TextDisplayer_LoL::vm() {
+	return _vm;
 }
 
-void TextDisplayer_LoL::readNextPara() {
-	char d = 0;
-
-	if (_tempString2) {
-		if (*_tempString2) {
-			d = *_tempString2++;
-		} else {
-			_tempString2 = 0;
-			d = _ctrl[0];
-		}
-	}
-
-	if (!d && _tempString1) {
-		if (*_tempString1)
-			d = *_tempString1++;
-		else
-			_tempString1 = 0;
-	}
-
-	_ctrl[1] = d;
-	_ctrl[2] = 0;
-}
-
-void TextDisplayer_LoL::printLine(char *str) {
-	const bool isPc98 = (_vm->gameFlags().platform == Common::kPlatformPC98);
-	const ScreenDim *sd = _screen->_curDim;
-	int sdx = _screen->curDimIndex();
-	bool pc98PrintFlag = (isPc98 && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
-
-	int fh = (_screen->_currentFont == Screen::FID_SJIS_FNT) ? 9 : (_screen->getFontHeight() + _screen->_charOffset);
-	int lines = (sd->h - _screen->_charOffset) / fh;
-
-	while (_textDimData[sdx].line >= lines) {
-		if (lines <= _lineCount) {
-			_lineCount = 0;
-			textPageBreak();
-			_numCharsPrinted = 0;
-		}
-
-		int h1 = ((sd->h / fh) - 1) * fh;
-		int h2 = sd->h - fh;
-
-		if (h2)
-			_screen->copyRegion(sd->sx << 3, sd->sy + fh, sd->sx << 3, sd->sy, sd->w << 3, h2, _screen->_curPage, _screen->_curPage, Screen::CR_NO_P_CHECK);
-
-		_screen->fillRect(sd->sx << 3, sd->sy + h1, (sd->sx + sd->w - 1) << 3, sd->sy + sd->h - 1, _textDimData[sdx].color2);
-		if (_textDimData[sdx].line)
-			_textDimData[sdx].line--;
-	}
-
-	int x1 = (sd->sx << 3) + _textDimData[sdx].column;
-	int y = sd->sy + (pc98PrintFlag ? (_textDimData[sdx].line << 3) : (fh * _textDimData[sdx].line));
-	int w = sd->w << 3;
-	int lw = _lineWidth;
-	int s = _numCharsLeft;
-	char c = 0;
-
-	if (pc98PrintFlag) {
-		bool ct = true;
-
-		if ((lw + _textDimData[sdx].column) > w) {
-			if ((lines - 1) <= _lineCount)
-				// cut off line to leave space for "MORE" button
-				w -= 80;
-		} else {
-			if (!_sjisLineBreakFlag || (_lineCount + 1 < lines - 1))
-				ct = false;
-			else
-				// cut off line to leave space for "MORE" button
-				w -= 80;
-		}
-
-		if (ct) {
-			w -= _textDimData[sdx].column;
-
-			int n2 = 0;
-			int n1 = (w / 4) - 1;
-
-			while (n2 < n1 && n2 < s) {
-				c = str[n2];
-				uint8 cu = (uint8) c;
-				if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0))
-					n2++;
-				n2++;
-			}
-			s = n2;
-		}
-	} else {
-		if ((lw + _textDimData[sdx].column) > w) {
-			if ((lines - 1) <= _lineCount)
-				// cut off line to leave space for "MORE" button
-				w -= (10 * (_screen->getFontWidth() + _screen->_charWidth));
-
-			w -= _textDimData[sdx].column;
-
-			int n2 = 0;
-			int n1 = s - 1;
-
-			while (n1 > 0) {
-				//cut off line after last space
-				c = str[n1];
-
-				lw -= _screen->getCharWidth((uint8)c);
-
-				if (!n2 && lw <= w)
-					n2 = n1;
-
-				if (n2 && c == ' ') {
-					s = n1;
-					_printFlag = false;
-					break;
-				}
-				n1--;
-			}
-
-			if (!n1) {
-				if (_textDimData[sdx].column && !_printFlag) {
-					s = lw = 0;
-					_printFlag = true;
-				} else {
-					s = n2;
-				}
-			}
-		}
-	}
-
-	c = str[s];
-	str[s] = 0;
-
-	uint8 col = _textDimData[sdx].color1;
-	if (isPc98 && (sdx == 2 || sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) {
-		switch (_textDimData[sdx].color1) {
-		case 0x88:
-			col = 0x41;
-			break;
-		case 0x55:
-			col = 0x81;
-			break;
-		case 0xaa:
-			col = 0x21;
-			break;
-		case 0x99:
-			col = 0xa1;
-			break;
-		case 0x33:
-			col = 0xe1;
-			break;
-		case 0x18:
-			col = 0x61;
-			break;
-		default:
-			col = 1;
-			break;
-		}
-		_screen->printText(str, x1 & ~3, (y + 8) & ~7, col, 0);
-	} else {
-		_screen->printText(str, x1, y, col, _textDimData[sdx].color2);
-	}
-
-	_textDimData[sdx].column += lw;
-	_numCharsPrinted += strlen(str);
-
-	str[s] = c;
-
-	if (c == ' ')
-		s++;
-
-	if (str[s] == ' ')
-		s++;
-
-	uint32 len = strlen(&str[s]);
-	for (uint32 i = 0; i < len; i++)
-		str[i] = str[s + i];
-	str[len] = 0;
-
-	_numCharsLeft = strlen(str);
-	_lineWidth = pc98PrintFlag ? (_numCharsLeft << 2) : _screen->getTextWidth(str);
-
-	if (!_numCharsLeft && _textDimData[sdx].column < (sd->w << 3))
-		return;
-
-	_textDimData[sdx].column = 0;
-	_textDimData[sdx].line++;
-	_lineCount++;
-
-	printLine(str);
+Screen *TextDisplayer_LoL::screen() {
+	return _screen;
 }
 
 void TextDisplayer_LoL::textPageBreak() {
-	int cp = _screen->setCurPage(0);
-	Screen::FontId cf = _screen->setFont(_vm->gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
-
-	_vm->_timer->pauseSingleTimer(11, true);
-
-	_vm->_fadeText = false;
-	int resetPortraitAfterSpeechAnim = 0;
-	int updatePortraitSpeechAnimDuration = 0;
-
-	if (_vm->_updateCharNum != -1)  {
-		resetPortraitAfterSpeechAnim = _vm->_resetPortraitAfterSpeechAnim;
-		_vm->_resetPortraitAfterSpeechAnim = 0;
-		updatePortraitSpeechAnimDuration = _vm->_updatePortraitSpeechAnimDuration;
-		if (_vm->_updatePortraitSpeechAnimDuration > 36)
-			_vm->_updatePortraitSpeechAnimDuration = 36;
-	}
-
-	uint32 speechPartTime = 0;
-	if (_vm->speechEnabled() && _vm->_activeVoiceFileTotalTime && _numCharsTotal)
-		speechPartTime = _vm->_system->getMillis() + ((_numCharsPrinted * _vm->_activeVoiceFileTotalTime) / _numCharsTotal);
-
-	const ScreenDim *dim = _screen->getScreenDim(_screen->curDimIndex());
-
-	int x = ((dim->sx + dim->w) << 3) - 77;
-	int y = 0;
-
-	if (_vm->_needSceneRestore && (_vm->_updateFlags & 2)) {
-		if (_vm->_currentControlMode || !(_vm->_updateFlags & 2)) {
-			y = dim->sy + dim->h - 5;
-		} else {
-			x += 6;
-			y = dim->sy + dim->h - 2;
-		}
-	} else {
-		y = dim->sy + dim->h - 10;
-	}
-
-	char *txt = _vm->getLangString(0x4073);
-	if (_vm->gameFlags().use16ColorMode) {
-		_vm->gui_drawBox(x + 8, (y & ~7) - 1, 66, 10, 0xee, 0xcc, -1);
-		_vm->_screen->printText(txt, (x + 37 - (strlen(txt) << 1) + 4) & ~3, (y + 2) & ~7, 0xc1, 0);
-	} else {
-		_vm->gui_drawBox(x, y, 74, 9, 136, 251, -1);
-		_vm->_screen->printText(txt, x + 37 - (_vm->_screen->getTextWidth(txt) >> 1), y + 2, 144, 0);
-	}
-
-	_vm->removeInputTop();
-
-	bool loop = true;
-	bool target = false;
-
-	do {
-		int inputFlag = _vm->checkInput(0, false) & 0xFF;
-		_vm->removeInputTop();
-
-		while (!inputFlag) {
-			_vm->update();
-
-			if (_vm->speechEnabled()) {
-				if (((_vm->_system->getMillis() > speechPartTime) || (_vm->snd_updateCharacterSpeech() != 2)) && speechPartTime) {
-					loop = false;
-					inputFlag = _vm->_keyMap[Common::KEYCODE_RETURN];
-					break;
-				}
-			}
-
-			inputFlag = _vm->checkInput(0, false) & 0xFF;
-			_vm->removeInputTop();
-		}
-
-		_vm->gui_notifyButtonListChanged();
-
-		if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
-			loop = false;
-		} else if (inputFlag == 199 || inputFlag == 201) {
-			if (_vm->posWithinRect(_vm->_mouseX, _vm->_mouseY, x, y, x + 74, y + 9))
-				target = true;
-		} else if (inputFlag == 200 || inputFlag == 202) {
-			if (target)
-				loop = false;
-		}
-	} while (loop);
-
-
-	if (_vm->gameFlags().use16ColorMode)
-		_screen->fillRect(x + 8, y, x + 57, y + 9, _textDimData[_screen->curDimIndex()].color2);
-	else
-		_screen->fillRect(x, y, x + 73, y + 8, _textDimData[_screen->curDimIndex()].color2);
-
-	clearCurDim();
-
-	_vm->_timer->pauseSingleTimer(11, false);
-
-	if (_vm->_updateCharNum != -1) {
-		_vm->_resetPortraitAfterSpeechAnim = resetPortraitAfterSpeechAnim;
-		if (updatePortraitSpeechAnimDuration > 36)
-			updatePortraitSpeechAnimDuration -= 36;
-		else
-			updatePortraitSpeechAnimDuration >>= 1;
-
-		_vm->_updatePortraitSpeechAnimDuration = updatePortraitSpeechAnimDuration;
-	}
-
-	_screen->setFont(cf);
-	_screen->setCurPage(cp);
-	_vm->removeInputTop();
-}
-
-void TextDisplayer_LoL::clearCurDim() {
-	int d = _screen->curDimIndex();
-	const ScreenDim *tmp = _screen->getScreenDim(d);
-	if (_vm->gameFlags().use16ColorMode) {
-		_screen->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 2, (tmp->sy + tmp->h) - 2, _textDimData[d].color2);
-	} else
-		_screen->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 1, (tmp->sy + tmp->h) - 1, _textDimData[d].color2);
-
-	_lineCount = 0;
-	_textDimData[d].column = _textDimData[d].line = 0;
+	strcpy(_pageBreakString, _vm->getLangString(0x4073));
+	TextDisplayer_Eob::textPageBreak();
 }
 
 } // End of namespace Kyra
diff --git a/engines/kyra/text_lol.h b/engines/kyra/text_lol.h
index 3e59bc90fe..0dcc4b73b3 100644
--- a/engines/kyra/text_lol.h
+++ b/engines/kyra/text_lol.h
@@ -20,80 +20,52 @@
  *
  */
 
-#ifdef ENABLE_LOL
-
 #ifndef KYRA_TEXT_LOL_H
 #define KYRA_TEXT_LOL_H
 
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+#include "kyra/text_eob.h"
+#endif
 #include "common/scummsys.h"
 
+#ifdef ENABLE_LOL
+
 namespace Kyra {
 
 class Screen_LoL;
 class LoLEngine;
 struct EMCState;
 
-class TextDisplayer_LoL {
-friend class LoLEngine;
+class TextDisplayer_LoL : public TextDisplayer_Eob {
 public:
-	TextDisplayer_LoL(LoLEngine *vm, Screen_LoL *screen);
+	TextDisplayer_LoL(LoLEngine *engine, Screen_LoL *screenLoL);
 	~TextDisplayer_LoL();
 
 	void setupField(bool mode);
 	void expandField();
 
-	int clearDim(int dim);
-	void resetDimTextPositions(int dim);
-
 	void printDialogueText(int dim, char *str, EMCState *script, const uint16 *paramList, int16 paramIndex);
 	void printMessage(uint16 type, const char *str, ...) GCC_PRINTF(3, 4);
 
 	int16 _scriptTextParameter;
 
 private:
-	void displayText(char *str, ...);
-	char parseCommand();
-	void readNextPara();
-	void printLine(char *str);
+	LolEobBaseEngine *vm();
+	Screen *screen();
+
 	void preprocessString(char *str, EMCState *script, const uint16 *paramList, int16 paramIndex);
 	void textPageBreak();
 
-	void clearCurDim();
-
 	char *_stringParameters[15];
 	char *_buffer;
-	char *_dialogueBuffer;
-	char *_tempString1;
-	char *_tempString2;
-	char *_currentLine;
-	char _ctrl[3];
-
-	char _scriptParaString[11];
-
-	uint16 _lineWidth;
-	int _lineCount;
-	uint32 _numCharsTotal;
-	uint32 _numCharsLeft;
-	uint32 _numCharsPrinted;
-
-	bool _printFlag;
-	bool _sjisLineBreakFlag;
 
 	LoLEngine *_vm;
 	Screen_LoL *_screen;
-
-	struct TextDimData {
-		uint8 color1;
-		uint8 color2;
-		uint16 column;
-		uint8 line;
-	};
-
-	TextDimData *_textDimData;
 };
 
 } // End of namespace Kyra
 
+#endif // ENABLE_LOL
+
 #endif
 
-#endif // ENABLE_LOL
diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp
index 9834646a45..2ab2b621f3 100644
--- a/engines/kyra/timer.cpp
+++ b/engines/kyra/timer.cpp
@@ -217,7 +217,7 @@ void TimerManager::pauseSingleTimer(uint8 id, bool p) {
 bool TimerManager::isEnabled(uint8 id) const {
 	CIterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id));
 	if (timer != _timers.end())
-		return (timer->enabled == 1);
+		return (timer->enabled & 1);
 
 	warning("TimerManager::isEnabled: No timer %d", id);
 	return false;
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
new file mode 100644
index 0000000000..92c7f34ee6
--- /dev/null
+++ b/engines/kyra/timer_eob.cpp
@@ -0,0 +1,378 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/eobcommon.h"
+#include "kyra/timer.h"
+
+#include "common/system.h"
+
+namespace Kyra {
+
+void LolEobBaseEngine::enableSysTimer(int sysTimer) {
+	if (sysTimer != 2)
+		return;
+
+	for (int i = 0; i < getNumClock2Timers(); i++)
+		_timer->pauseSingleTimer(getClock2Timer(i), false);
+}
+
+void LolEobBaseEngine::disableSysTimer(int sysTimer) {
+	if (sysTimer != 2)
+		return;
+
+	for (int i = 0; i < getNumClock2Timers(); i++)
+		_timer->pauseSingleTimer(getClock2Timer(i), true);
+}
+
+void LolEobBaseEngine::enableTimer(int id) {
+	_timer->enable(id);
+	_timer->setCountdown(id, _timer->getDelay(id));
+}
+
+void LolEobBaseEngine::timerProcessDoors(int timerNum) {
+	for (int i = 0; i < 3; i++) {
+		uint16 b = _openDoorState[i].block;
+		if (!b)
+			continue;
+
+		int v = _openDoorState[i].state;
+		int c = _openDoorState[i].wall;
+
+		_levelBlockProperties[b].walls[c] += v;
+		_levelBlockProperties[b].walls[c ^ 2] += v;
+
+		int snd = 3;
+		int flg = _wllWallFlags[_levelBlockProperties[b].walls[c]];
+		if (flg & 0x20)
+			snd = 5;
+		else if (v == -1)
+			snd = 4;
+
+		if (_flags.gameID == GI_LOL) {
+			if (!(_updateFlags & 1)) {
+				snd_processEnvironmentalSoundEffect(snd + 28, b);
+				if (!checkSceneUpdateNeed(b))
+					updateEnvironmentalSfx(0);
+			}
+		} else {
+			checkSceneUpdateNeed(b);
+			updateEnvironmentalSfx(snd);
+		}
+
+		if (flg & 0x30)
+			_openDoorState[i].block = 0;
+	}
+}
+
+} // namespace Kyra
+
+#endif
+#ifdef ENABLE_EOB
+
+namespace Kyra {
+
+#define TimerV2(x) new Common::Functor1Mem<int, void, EobCoreEngine>(this, &EobCoreEngine::x)
+
+void EobCoreEngine::setupTimers() {
+	_timer->addTimer(0, TimerV2(timerProcessCharacterExchange), 9, false);
+	_timer->addTimer(1, TimerV2(timerProcessFlyingObjects), 3, true);
+	_timer->addTimer(0x20, TimerV2(timerProcessMonsters), 20, true);
+	_timer->addTimer(0x21, TimerV2(timerProcessMonsters), 20, true);
+	_timer->addTimer(0x22, TimerV2(timerProcessMonsters), 20, true);
+	_timer->addTimer(0x23, TimerV2(timerProcessMonsters), 20, true);
+	_timer->setNextRun(0x21, _system->getMillis() + 7 * _tickLength);
+	_timer->setNextRun(0x22, _system->getMillis() + 14 * _tickLength);
+	_timer->setNextRun(0x23, _system->getMillis() + 14 * _tickLength);
+	_timer->addTimer(0x30, TimerV2(timerSpecialCharacterUpdate), 50, false);
+	_timer->addTimer(0x31, TimerV2(timerSpecialCharacterUpdate), 50, false);
+	_timer->addTimer(0x32, TimerV2(timerSpecialCharacterUpdate), 50, false);
+	_timer->addTimer(0x33, TimerV2(timerSpecialCharacterUpdate), 50, false);
+	_timer->addTimer(0x34, TimerV2(timerSpecialCharacterUpdate), 50, false);
+	_timer->addTimer(0x35, TimerV2(timerSpecialCharacterUpdate), 50, false);
+	_timer->addTimer(4, TimerV2(timerProcessDoors), 5, true);
+	_timer->addTimer(5, TimerV2(timerUpdateTeleporters), 10, true);
+	_timer->addTimer(6, TimerV2(timerUpdateFoodStatus), 1080, true);
+	_timer->addTimer(7, TimerV2(timerUpdateMonsterIdleAnim), 25, true);
+}
+
+void EobCoreEngine::setCharEventTimer(int charIndex, uint32 countdown, int evnt, int updateExistingTimer) {
+	uint32 ntime = _system->getMillis() + countdown * _tickLength;
+	uint8 timerId = 0x30 | (charIndex & 0x0f);
+	EobCharacter *c = &_characters[charIndex];
+
+	if (!_timer->isEnabled(timerId)) {
+		c->timers[0] = ntime;
+		c->events[0] = evnt;
+		_timer->setCountdown(timerId, countdown);
+		enableTimer(timerId);
+		return;
+	}
+
+	if (ntime < _timer->getNextRun(timerId))
+		_timer->setNextRun(timerId, ntime);
+
+	if (updateExistingTimer) {
+		bool br = false;
+		int d = -1;
+
+		for (int i = 0; i < 10 && br == false; i++) {
+			if (d == -1 && !c->timers[i])
+				d = i;
+
+			if (!br && c->events[i] == evnt) {
+				d = i;
+				br = true;
+			}
+		}
+
+		c->timers[d] = ntime;
+		c->events[d] = evnt;
+	} else {
+		for (int i = 0; i < 10; i++) {
+			if (c->timers[i])
+				continue;
+			c->timers[i] = ntime;
+			c->events[i] = evnt;
+			return;
+		}
+	}
+}
+
+void EobCoreEngine::deleteCharEventTimer(int charIndex, int evnt) {
+	EobCharacter *c = &_characters[charIndex];
+	for (int i = 0; i < 10; i++) {
+		if (c->events[i] == evnt) {
+			c->events[i] = 0;
+			c->timers[i] = 0;
+		}
+	}
+	setupCharacterTimers();
+}
+
+void EobCoreEngine::setupCharacterTimers() {
+	for (int i = 0; i < 6; i++) {
+		EobCharacter *c = &_characters[i];
+		if (!testCharacter(i, 1))
+			continue;
+
+		uint32 nextTimer = 0xffffffff;
+
+		for (int ii = 0; ii < 10; ii++) {
+			if (c->timers[ii] < nextTimer)
+				nextTimer = c->timers[ii];
+		}
+		uint32 ctime = _system->getMillis();
+
+		if (nextTimer == 0xffffffff)
+			_timer->disable(0x30 | i);
+		else {
+			enableTimer(0x30 | i);
+			_timer->setCountdown(0x30 | i, (nextTimer - ctime) / _tickLength);
+		}
+	}
+}
+
+void EobCoreEngine::timerProcessCharacterExchange(int timerNum) {
+	_charExchangeSwap ^= 1;
+	if (_charExchangeSwap) {
+		int index = _exchangeCharacterId;
+		_exchangeCharacterId = -1;
+		gui_drawCharPortraitWithStats(index);
+		_exchangeCharacterId = index;
+	} else {
+		gui_drawCharPortraitWithStats(_exchangeCharacterId);
+	}
+}
+
+void EobCoreEngine::timerProcessFlyingObjects(int timerNum) {
+	static const uint8 dirPosIndex[] = { 0x82, 0x83, 0x00, 0x01, 0x01, 0x80, 0x03, 0x82, 0x02, 0x03, 0x80, 0x81, 0x81, 0x00, 0x83, 0x02 };
+	for (int i = 0; i < 10; i++) {
+		EobFlyingObject *fo = &_flyingObjects[i];
+		if (!fo->enable)
+			continue;
+
+		bool endFlight = fo->distance ? false : true;
+
+		uint8 pos = dirPosIndex[(fo->direction << 2) + (fo->curPos & 3)];
+		uint16 bl = fo->curBlock;
+		bool newBl = (pos & 0x80) ? true : false;
+
+		if (newBl) {
+			bl = calcNewBlockPosition(fo->curBlock, fo->direction);
+			pos &= 3;
+			fo->u2 = 0;
+		}
+
+		if (updateObjectFlight(fo, bl, pos)) {
+			if (newBl)
+				runLevelScript(bl, 0x10);
+			if (updateFlyingObjectHitTest(fo, bl, pos))
+				endFlight = true;
+		} else {
+			if (fo->flags & 0x20) {
+				if (!updateFlyingObjectHitTest(fo, fo->curBlock, fo->curPos))
+					updateFlyingObject_s3(fo);
+			}
+			endFlight = true;
+		}
+
+		if (endFlight)
+			endObjectFlight(fo);
+
+		_sceneUpdateRequired = true;
+	}
+}
+
+void EobCoreEngine::timerProcessMonsters(int timerNum) {
+	updateMonsters(timerNum & 0x0f);
+}
+
+
+void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
+	int charIndex = timerNum & 0x0f;
+	EobCharacter *c = &_characters[charIndex];
+	uint32 ctime =  _system->getMillis();
+
+	for (int i = 0; i < 10; i++) {
+		if (!c->timers[i])
+			continue;
+		if (c->timers[i] > ctime)
+			continue;
+
+		c->timers[i] = 0;
+		int evt = c->events[i];
+
+		if (evt < 0) {
+			removeCharacterEffect(evt, charIndex, 1);
+			continue;
+		}
+
+		switch (evt) {
+		case 2:
+		case 3:
+			setCharEventTimer(charIndex, (c->effectFlags & 0x10000) ? 9 : 36, evt + 2, 1);
+		case 0:
+		case 1:
+		case 4:
+		case 5:
+			setWeaponSlotStatus(charIndex, evt / 2, evt & 1);
+			break;
+
+		case 6:
+			c->damageTaken = 0;
+			gui_drawCharPortraitWithStats(charIndex);
+			break;
+
+		case 7:
+			_txt->printMessage(_characterStatusStrings7[0], -1, c->name);
+			c->strengthCur = c->strengthMax;
+			c->strengthExtCur = c->strengthExtMax;
+			if (_currentControlMode == 2)
+				gui_drawCharPortraitWithStats(charIndex);
+			break;
+
+		case 8:
+			if (c->flags & 2) {
+				calcAndInflictCharacterDamage(charIndex, 0, 0, 5, 0x400, 5, 3);
+				setCharEventTimer(charIndex, 546, 8, 1);
+			} else {
+				c->flags &= 0xfd;
+				gui_drawCharPortraitWithStats(charIndex);
+			}
+			break;
+
+		case 9:
+			if (c->flags & 4) {
+				_txt->printMessage(_characterStatusStrings9[0], -1, c->name);
+				c->flags &= 0xfb;
+				gui_drawCharPortraitWithStats(charIndex);
+			}
+			break;
+
+		case 11:
+			if (c->disabledSlots & 4) {
+				c->disabledSlots &= 0xfb;
+				if (_openBookChar == charIndex && _updateFlags)
+					gui_drawSpellbook();
+			}
+			break;
+
+		case 12:
+			c->effectFlags &= ~0x1000;
+			_txt->printMessage(_characterStatusStrings12[0], -1, c->name);
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	uint32 nextTimer = (uint32)(-1);
+	for (int i = 0; i < 10; i++) {
+		if (c->timers[i] && c->timers[i] < nextTimer)
+			nextTimer = c->timers[i];
+	}
+
+	if (nextTimer == (uint32)(-1))
+		_timer->disable(timerNum);
+	else
+		_timer->setCountdown(timerNum, (nextTimer - ctime) / _tickLength);
+}
+
+void EobCoreEngine::timerUpdateTeleporters(int timerNum) {
+	_teleporterPulse ^= 1;
+	for (int i = 0; i < 18; i++) {
+		uint8 w = _visibleBlocks[i]->walls[_sceneDrawVarDown];
+		if (w == 44 || w == 74) {
+			_sceneUpdateRequired = true;
+			return;
+		}
+	}
+}
+
+void EobCoreEngine::timerUpdateFoodStatus(int timerNum) {
+	for (int i = 0; i < 6; i++) {
+		if (checkInventoryForRings(i, 2))
+			continue;
+		EobCharacter *c = &_characters[i];
+		if (c->food != 0 && c->flags & 1 && c->hitPointsCur > -10) {
+			c->food--;
+			gui_drawFoodStatusGraph(i);
+		}
+	}
+}
+
+void EobCoreEngine::timerUpdateMonsterIdleAnim(int timerNum) {
+	for (int i = 0; i < 18; i++) {
+		EobMonsterInPlay *m = &_monsters[i];
+		if (m->mode == 7 || m->mode == 10 || (m->flags & 0x20) || (rollDice(1, 2, 0) != 1))
+			continue;
+		m->idleAnimState = (rollDice(1, 2, 0) << 4) | rollDice(1, 2, 0);
+		checkSceneUpdateNeed(m->block);
+	}
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/timer_lol.cpp
index 3221556e6d..5a6677a4f6 100644
--- a/engines/kyra/timer_lol.cpp
+++ b/engines/kyra/timer_lol.cpp
@@ -47,58 +47,6 @@ void LoLEngine::setupTimers() {
 	_timer->addTimer(11, TimerV2(timerFadeMessageText), 360, false);
 }
 
-void LoLEngine::enableTimer(int id) {
-	_timer->enable(id);
-	_timer->setCountdown(id, _timer->getDelay(id));
-}
-
-void LoLEngine::enableSysTimer(int sysTimer) {
-	if (sysTimer != 2)
-		return;
-
-	for (int i = 0; i < _numClock2Timers; i++)
-		_timer->pauseSingleTimer(_clock2Timers[i], false);
-}
-
-void LoLEngine::disableSysTimer(int sysTimer) {
-	if (sysTimer != 2)
-		return;
-
-	for (int i = 0; i < _numClock2Timers; i++)
-		_timer->pauseSingleTimer(_clock2Timers[i], true);
-}
-
-void LoLEngine::timerProcessDoors(int timerNum) {
-	for (int i = 0; i < 3; i++) {
-		uint16 b = _openDoorState[i].block;
-		if (!b)
-			continue;
-
-		int v = _openDoorState[i].state;
-		int c = _openDoorState[i].wall;
-
-		_levelBlockProperties[b].walls[c] += v;
-		_levelBlockProperties[b].walls[c ^ 2] += v;
-
-		int snd = 31;
-
-		int flg = _wllWallFlags[_levelBlockProperties[b].walls[c]];
-		if (flg & 0x20)
-			snd = 33;
-		else if (v == -1)
-			snd = 32;
-
-		if (!(_updateFlags & 1)) {
-			snd_processEnvironmentalSoundEffect(snd, b);
-			if (!checkSceneUpdateNeed(b))
-				updateEnvironmentalSfx(0);
-		}
-
-		if (flg & 0x30)
-			_openDoorState[i].block = 0;
-	}
-}
-
 void LoLEngine::timerProcessMonsters(int timerNum) {
 	for (int i = timerNum & 0x0f; i < 30; i += 2)
 		updateMonster(&_monsters[i]);
-- 
cgit v1.2.3


From ff8a030c379e70d9f90ece071ff9a63495db36cf Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sat, 14 May 2011 16:41:15 +0200
Subject: KYRA: (EOB) - fix EOB1 spell definitions

---
 engines/kyra/staticres_eob.cpp | 78 +++++++++++++++++++++++++++++++++---------
 1 file changed, 61 insertions(+), 17 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 88bfbd8f08..557bacb239 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -942,22 +942,66 @@ void EobEngine::initStaticResource() {
 void EobEngine::initSpells() {
 	EobCoreEngine::initSpells();
 
-	static const uint32 eflags[] = {
-		0x0000, 0x0001, 0x0000, 0x0002, 0x0000, 0x0000, 0x0008, 0x0000, 0x0040, 0x0000,
-		0x0000,	0x0000 /*stinking cloud*/, 0x0000, 0x0000, 0x0000 /*flame arrow*/, 0x10000,0x0000, 0x0040, 0x0000, 0x0000,
-		0x0000, 0x0000, 0x0000 /*stone skin*/, 0x0000 /*cloud kill*/, 0x0000, 0x0000, 0x0400, 0x0000, 0x0000, 0x0002,
-		0x0800,	0x0000, 0x0000, 0x0000, 0x2000, 0x0000, 0x0000, 0x4000, 0x8000, 0x0000,
-		0x0000, 0x0000,	0x0000,	0x0800, 0x0000 /*Prot From Lightning*/, 0x0000,	0x0000,	0x0000, 0x0000, 0x0000,
-		0x0000,	0x0000, 0x0000
+	struct FlagTableEntry {
+		uint16 typeFlag;
+		uint32 effectFlag;
+		uint8 damageFlag;
 	};
 
-	static const uint8 dflags[] = {
-		0x00, 0x00, 0x21, 0x00, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00,
-		0x11, 0x00 /*stinking cloud*/, 0x00, 0x21, 0x11 /*flame arrow*/, 0x00, 0x00, 0x00, 0x03, 0x01,
-		0x00, 0x41, 0x00 /*stone skin*/, 0x00 /*cloud kill*/, 0x41, 0x00, 0x00, 0x00, 0x01, 0x00,
-		0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x01,	0x00, 0x00, 0x00 /*Prot From Lightning*/, 0x00,	0x01, 0x21, 0x00, 0x00,
-		0x00, 0x00, 0x00
+	static const FlagTableEntry flagTable[] = {
+		{ 0x0000, 0x000000, 0x00 },	// dummy
+		{ 0x0033, 0x000001, 0x00 },	// armor
+		{ 0x0100, 0x000000, 0x21 },	// burning hands
+		{ 0x004c, 0x000002, 0x00 },	// detect magic
+		{ 0x0100, 0x000000, 0x01 },	// magic missile
+		{ 0x0000, 0x000000, 0x00 },	// dummy
+		{ 0x008b, 0x000008, 0x00 },	// shield
+		{ 0x0488, 0x000000, 0x03 },	// shocking grasp
+		{ 0x0021, 0x000040, 0x00 },	// invisibility
+		{ 0x0000, 0x000000, 0x00 },	// dummy
+		{ 0x0100, 0x000000, 0x11 },	// melf's acid arrow
+		{ 0x0000, 0x000000, 0x00 },	// STINKING CLOUD
+		{ 0x1000, 0x000000, 0x00 },	// dispel magic
+		{ 0x0100, 0x000000, 0x21 },	// fireball
+		{ 0x0100, 0x000000, 0x11 },	// FLAME ARROW
+		{ 0x0248, 0x010000, 0x00 },	// haste
+		{ 0x0100, 0x000000, 0x00 },	// hold person
+		{ 0x0240, 0x000040, 0x00 },	// inv 10'
+		{ 0x0100, 0x000000, 0x03 },	// lightning bolt
+		{ 0x0488, 0x000000, 0x01 },	// vampiric touch
+		{ 0x0100, 0x000000, 0x00 },	// fear
+		{ 0x0100, 0x000000, 0x41 },	// ice storm
+		{ 0x0000, 0x000000, 0x00 },	// STONE SKIN
+		{ 0x0000, 0x000000, 0x00 },	// CLOUD KILL
+		{ 0x0100, 0x000000, 0x41 },	// cone of cold
+		{ 0x0100, 0x000000, 0x00 },	// hold monster
+		{ 0x005c, 0x000400, 0x00 },	// bless
+		{ 0x0020, 0x000000, 0x00 },	// cure light wounds
+		{ 0x0100, 0x000000, 0x01 },	// cause light wounds
+		{ 0x004c, 0x000002, 0x00 },	// detect magic
+		{ 0x0029, 0x000800, 0x00 },	// prot from evil
+		{ 0x0039, 0x000000, 0x00 },	// aid
+		{ 0x2408, 0x000000, 0x21 },	// flame blade
+		{ 0x0100, 0x000000, 0x00 },	// hold person
+		{ 0x0028, 0x002000, 0x00 },	// slow poison
+		{ 0x0040, 0x000000, 0x00 },	// create food
+		{ 0x1000, 0x000000, 0x00 },	// dispel magic
+		{ 0x0099, 0x004000, 0x00 },	// magical vestment
+		{ 0x004c, 0x008000, 0x00 },	// prayer
+		{ 0x0040, 0x000000, 0x00 },	// remove paralysis
+		{ 0x0020, 0x000000, 0x00 },	// cure serious
+		{ 0x0100, 0x000000, 0x01 },	// cause serious
+		{ 0x0020, 0x000000, 0x00 },	// neutralize poison
+		{ 0x0248, 0x000800, 0x00 },	// prot from evil 10'
+		{ 0x0000, 0x000000, 0x00 },	// PROT FROM LIGHTNING
+		{ 0x0020, 0x000000, 0x00 },	// cure critical
+		{ 0x0100, 0x000000, 0x01 },	// cause critical
+		{ 0x0100, 0x000000, 0x21 },	// flame strike
+		{ 0x0020, 0x000000, 0x00 },	// raise dead
+		{ 0x0020, 0x000000, 0x00 },	// lay on hands
+		{ 0x0000, 0x000000, 0x00 },	// obj hit passive
+		{ 0x0000, 0x000000, 0x00 },	// disintegrate passive
+		{ 0x0000, 0x000000, 0x00 }	// death spell passive
 	};
 
 	int temp;
@@ -967,9 +1011,9 @@ void EobEngine::initSpells() {
 	for (int i = 0; i < _numSpells; i++) {
 		EobSpell *s = &_spells[i];
 		src += 4;
-		s->flags = convertSpellFlagToEob2Format(src[0], src[14]);
-		s->damageFlags = dflags[i];
-		s->effectFlags = eflags[i];
+		s->flags = flagTable[i].typeFlag;/*convertSpellFlagToEob2Format(src[0], src[14]);*/
+		s->damageFlags = flagTable[i].damageFlag;
+		s->effectFlags = flagTable[i].effectFlag;
 		s->sound = src[13];
 		src += 15;
 	}
-- 
cgit v1.2.3


From aa031bf98ef1b6da485122fabef1178f6101aded Mon Sep 17 00:00:00 2001
From: athrxx
Date: Thu, 9 Jun 2011 16:30:41 +0200
Subject: KYRA: (EOB) - minor code size reduction

---
 engines/kyra/eobcommon.cpp    |  5 +++--
 engines/kyra/eobcommon.h      | 19 -------------------
 engines/kyra/lol.cpp          |  6 ++++--
 engines/kyra/lol.h            |  3 ---
 engines/kyra/loleobbase.cpp   |  5 ++++-
 engines/kyra/loleobbase.h     | 25 ++++++++++++++++++++++---
 engines/kyra/saveload_eob.cpp | 37 ++++++++++++++++++++-----------------
 engines/kyra/saveload_lol.cpp | 21 +++------------------
 8 files changed, 56 insertions(+), 65 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index d82a3dd012..12a0a0d9ba 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -297,8 +297,9 @@ Common::Error EobCoreEngine::init() {
 		memset(_itemNames[i], 0, 35);
 	}
 
-	_flyingObjects = new EobFlyingObject[10];
-	memset(_flyingObjects, 0, 10 * sizeof(EobFlyingObject));
+	_flyingObjects = new EobFlyingObject[_numFlyingObjects];
+	_flyingObjectsPtr = _flyingObjects;
+	memset(_flyingObjects, 0, _numFlyingObjects * sizeof(EobFlyingObject));
 
 	_spellAnimBuffer = new uint8[4096];
 	memset(_spellAnimBuffer, 0, 4096);
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 201c1dfa11..1ad7b91aca 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -228,22 +228,6 @@ struct ScriptTimer {
 	uint32 next;
 };
 
-struct EobFlyingObject {
-	uint8 enable;
-	uint8 objectType;
-	int16 attackerId;
-	Item item;
-	uint16 curBlock;
-	uint16 u2;
-	uint8 u1;
-	uint8 direction;
-	uint8 distance;
-	int8 callBackIndex;
-	uint8 curPos;
-	uint8 flags;
-	uint8 unused;
-};
-
 class EobInfProcessor;
 
 class EobCoreEngine : public LolEobBaseEngine {
@@ -770,11 +754,8 @@ protected:
 	Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail);
 
 	void *generateMonsterTempData(LevelTempData *tmp);
-	void *generateFlyingObjectTempData(LevelTempData *tmp);
 	void restoreMonsterTempData(LevelTempData *tmp);
-	void restoreFlyingObjectTempData(LevelTempData *tmp);
 	void releaseMonsterTempData(LevelTempData *tmp);
-	void releaseFlyingObjectTempData(LevelTempData *tmp);
 
 	int _saveLoadMode;
 
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 6cb3b51370..ebe6ea6e19 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -417,8 +417,10 @@ Common::Error LoLEngine::init() {
 	_tempBuffer5120 = new uint8[5120];
 	memset(_tempBuffer5120, 0, 5120);
 
-	_flyingObjects = new FlyingObject[8];
-	memset(_flyingObjects, 0, 8 * sizeof(FlyingObject));
+	_flyingObjects = new FlyingObject[_numFlyingObjects];
+	_flyingObjectsPtr = _flyingObjects;
+	_flyingObjectStructSize = sizeof(FlyingObject);
+	memset(_flyingObjects, 0, _numFlyingObjects * sizeof(FlyingObject));
 
 	memset(_globalScriptVars, 0, sizeof(_globalScriptVars));
 
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index 20519b78fb..f4fcbeb269 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -1299,12 +1299,9 @@ private:
 	Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail);
 
 	void *generateMonsterTempData(LevelTempData *tmp);
-	void *generateFlyingObjectTempData(LevelTempData *tmp);
 	void restoreBlockTempData(int levelIndex);
 	void restoreMonsterTempData(LevelTempData *tmp);
-	void restoreFlyingObjectTempData(LevelTempData *tmp);
 	void releaseMonsterTempData(LevelTempData *tmp);
-	void releaseFlyingObjectTempData(LevelTempData *tmp);
 
 	Graphics::Surface *generateSaveThumbnail() const;
 };
diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
index 05b683b830..1c4068de20 100644
--- a/engines/kyra/loleobbase.cpp
+++ b/engines/kyra/loleobbase.cpp
@@ -29,7 +29,7 @@
 
 namespace Kyra {
 
-LolEobBaseEngine::LolEobBaseEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(system, flags) {
+LolEobBaseEngine::LolEobBaseEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(system, flags), _numFlyingObjects(_flags.gameID == GI_LOL ? 8 : 10) {
 	_txt = 0;
 	_mouseClick = 0;
 	_preserveEvents = _buttonListChanged = false;
@@ -75,6 +75,9 @@ LolEobBaseEngine::LolEobBaseEngine(OSystem *system, const GameFlags &flags) : Ky
 	_updateFlags = _clickedSpecialFlag = 0;
 	_sceneDefaultUpdate = 0;
 	_sceneUpdateRequired = false;
+	
+	_flyingObjectsPtr = 0;
+	_flyingObjectStructSize = sizeof(EobFlyingObject);
 
 	_clickedShapeXOffs = _clickedShapeYOffs = 0;
 
diff --git a/engines/kyra/loleobbase.h b/engines/kyra/loleobbase.h
index 042f9c0e78..43a86465bc 100644
--- a/engines/kyra/loleobbase.h
+++ b/engines/kyra/loleobbase.h
@@ -63,6 +63,22 @@ struct LevelTempData {
 	uint8 monsterDifficulty;
 };
 
+struct EobFlyingObject {
+	uint8 enable;
+	uint8 objectType;
+	int16 attackerId;
+	Item item;	
+	uint16 curBlock;
+	uint16 u2;
+	uint8 u1;
+	uint8 direction;
+	uint8 distance;
+	int8 callBackIndex;
+	uint8 curPos;
+	uint8 flags;
+	uint8 unused;
+};
+
 class LolEobBaseEngine : public KyraEngine_v1 {
 friend class TextDisplayer_Eob;
 public:
@@ -289,13 +305,16 @@ protected:
 	void restoreBlockTempData(int levelIndex);
 	void releaseTempData();
 	virtual void *generateMonsterTempData(LevelTempData *tmp) = 0;
-	virtual void *generateFlyingObjectTempData(LevelTempData *tmp) = 0;
 	virtual void restoreMonsterTempData(LevelTempData *tmp) = 0;
-	virtual void restoreFlyingObjectTempData(LevelTempData *tmp) = 0;
 	virtual void releaseMonsterTempData(LevelTempData *tmp) = 0;
-	virtual void releaseFlyingObjectTempData(LevelTempData *tmp) = 0;
+	void restoreFlyingObjectTempData(LevelTempData *tmp);
+	void *generateFlyingObjectTempData(LevelTempData *tmp);
+	void releaseFlyingObjectTempData(LevelTempData *tmp);
 
 	LevelTempData *_lvlTempData[29];
+	const int _numFlyingObjects;
+	uint32 _flyingObjectStructSize;
+	void *_flyingObjectsPtr;
 
 	// sound
 	virtual bool snd_processEnvironmentalSoundEffect(int soundId, int block);
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 3b3964bdc5..90192a4e51 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -127,6 +127,23 @@ void LolEobBaseEngine::releaseTempData() {
 	}
 }
 
+void *LolEobBaseEngine::generateFlyingObjectTempData(LevelTempData *tmp) {
+	assert(_flyingObjectStructSize == sizeof(EobFlyingObject));
+	EobFlyingObject *f = new EobFlyingObject[_numFlyingObjects];
+	memcpy(f, _flyingObjectsPtr,  sizeof(EobFlyingObject) * _numFlyingObjects);
+	return f;
+}
+
+void LolEobBaseEngine::restoreFlyingObjectTempData(LevelTempData *tmp) {
+	assert(_flyingObjectStructSize == sizeof(EobFlyingObject));
+	memcpy(_flyingObjectsPtr, tmp->flyingObjects, sizeof(EobFlyingObject) * _numFlyingObjects);
+}
+
+void LolEobBaseEngine::releaseFlyingObjectTempData(LevelTempData *tmp) {
+	EobFlyingObject *p = (EobFlyingObject*)tmp->flyingObjects;
+	delete[] p;
+}
+
 #ifdef ENABLE_EOB
 
 Common::Error EobCoreEngine::loadGameState(int slot) {
@@ -269,7 +286,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 		_lvlTempData[i]->flags = new uint16[1024];
 		EobMonsterInPlay *lm = new EobMonsterInPlay[30];
 		 _lvlTempData[i]->monsters = lm;
-		EobFlyingObject *lf = new EobFlyingObject[10];
+		EobFlyingObject *lf = new EobFlyingObject[_numFlyingObjects];
 		_lvlTempData[i]->flyingObjects = lf;
 		LevelTempData *l = _lvlTempData[i];
 
@@ -305,7 +322,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 			m->sub = in.readByte();
 		}
 
-		for (int ii = 0; ii < 10; ii++) {
+		for (int ii = 0; ii < _numFlyingObjects; ii++) {
 			EobFlyingObject *m = &lf[ii];
 			m->enable = in.readByte();
 			m->objectType = in.readByte();
@@ -481,7 +498,7 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 			out->writeByte(m->sub);
 		}
 
-		for (int ii = 0; ii < 10; ii++) {
+		for (int ii = 0; ii < _numFlyingObjects; ii++) {
 			EobFlyingObject *m = &lf[ii];
 			out->writeByte(m->enable);
 			out->writeByte(m->objectType);
@@ -519,29 +536,15 @@ void *EobCoreEngine::generateMonsterTempData(LevelTempData *tmp) {
 	return m;
 }
 
-void *EobCoreEngine::generateFlyingObjectTempData(LevelTempData *tmp) {
-	EobFlyingObject *f = new EobFlyingObject[10];
-	memcpy(f, _flyingObjects,  sizeof(EobFlyingObject) * 10);
-	return f;
-}
-
 void EobCoreEngine::restoreMonsterTempData(LevelTempData *tmp) {
 	memcpy(_monsters, tmp->monsters, sizeof(EobMonsterInPlay) * 30);
 }
 
-void EobCoreEngine::restoreFlyingObjectTempData(LevelTempData *tmp) {
-	memcpy(_flyingObjects, tmp->flyingObjects, sizeof(EobFlyingObject) * 10);
-}
-
 void EobCoreEngine::releaseMonsterTempData(LevelTempData *tmp) {
 	EobMonsterInPlay *p = (EobMonsterInPlay*)tmp->monsters;
 	delete[] p;
 }
 
-void EobCoreEngine::releaseFlyingObjectTempData(LevelTempData *tmp) {
-
-}
-
 #endif // ENABLE_EOB
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp
index 7d8e6c32d9..33097a86a3 100644
--- a/engines/kyra/saveload_lol.cpp
+++ b/engines/kyra/saveload_lol.cpp
@@ -195,7 +195,7 @@ Common::Error LoLEngine::loadGameState(int slot) {
 		_lvlTempData[i]->flags = new uint16[1024];
 		LolMonsterInPlay *lm = new LolMonsterInPlay[30];
 		 _lvlTempData[i]->monsters = lm;
-		FlyingObject *lf = new FlyingObject[8];
+		FlyingObject *lf = new FlyingObject[_numFlyingObjects];
 		_lvlTempData[i]->flyingObjects = lf;
 		LevelTempData *l = _lvlTempData[i];
 
@@ -236,7 +236,7 @@ Common::Error LoLEngine::loadGameState(int slot) {
 			in.read(m->equipmentShapes, 4);
 		}
 
-		for (int ii = 0; ii < 8; ii++) {
+		for (int ii = 0; ii < _numFlyingObjects; ii++) {
 			FlyingObject *m = &lf[ii];
 			m->enable = in.readByte();
 			m->objectType = in.readByte();
@@ -420,7 +420,7 @@ Common::Error LoLEngine::saveGameStateIntern(int slot, const char *saveName, con
 			out->write(m->equipmentShapes, 4);
 		}
 
-		for (int ii = 0; ii < 8; ii++) {
+		for (int ii = 0; ii < _numFlyingObjects; ii++) {
 			FlyingObject *m = &lf[ii];
 			out->writeByte(m->enable);
 			out->writeByte(m->objectType);
@@ -489,12 +489,6 @@ void *LoLEngine::generateMonsterTempData(LevelTempData *tmp) {
 	return m;
 }
 
-void *LoLEngine::generateFlyingObjectTempData(LevelTempData *tmp) {
-	FlyingObject *f = new FlyingObject[8];
-	memcpy(f, _flyingObjects,  sizeof(FlyingObject) * 8);
-	return f;
-}
-
 void LoLEngine::restoreTempDataAdjustMonsterStrength(int index) {
 	if (_lvlTempData[index]->monsterDifficulty == _monsterDifficulty)
 		return;
@@ -525,20 +519,11 @@ void LoLEngine::restoreMonsterTempData(LevelTempData *tmp) {
 	}
 }
 
-void LoLEngine::restoreFlyingObjectTempData(LevelTempData *tmp) {
-	memcpy(_flyingObjects, tmp->flyingObjects, sizeof(FlyingObject) * 8);
-}
-
 void LoLEngine::releaseMonsterTempData(LevelTempData *tmp) {
 	LolMonsterInPlay *p = (LolMonsterInPlay*)tmp->monsters;
 	delete[] p;
 }
 
-void LoLEngine::releaseFlyingObjectTempData(LevelTempData *tmp) {
-	FlyingObject *p = (FlyingObject*)tmp->flyingObjects;
-	delete[] p;
-}
-
 } // End of namespace Kyra
 
 #endif // ENABLE_LOL
-- 
cgit v1.2.3


From 80ece6caaef652e4d0f618ab793c11b00fcf9441 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Thu, 9 Jun 2011 23:59:11 +0200
Subject: KYRA: (EOB) - replace snprintf/sprintf

---
 engines/kyra/chargen.cpp      | 43 +++++++++--------------
 engines/kyra/eob2.cpp         |  5 +--
 engines/kyra/eobcommon.cpp    | 11 +++---
 engines/kyra/eobcommon.h      |  8 ++---
 engines/kyra/gui_eob.cpp      | 79 ++++++++++++++++++-------------------------
 engines/kyra/items_eob.cpp    | 22 ++++++------
 engines/kyra/saveload_eob.cpp | 14 +++-----
 engines/kyra/scene_eob.cpp    | 47 +++++++++++--------------
 engines/kyra/screen_eob.cpp   |  8 ++---
 engines/kyra/sound_towns.cpp  | 28 +++++----------
 engines/kyra/text_eob.cpp     |  5 ++-
 engines/kyra/text_lol.cpp     |  4 +--
 12 files changed, 108 insertions(+), 166 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 4a0e035483..59b46b5043 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -918,16 +918,15 @@ void CharacterGenerator::printStats(int index, int mode) {
 
 	_screen->printShadedText(_chargenStrings1[2], 248, 64, 15, 0);
 
-	char str[22];
-	snprintf(str, 22,  _chargenStrings1[3], _vm->getCharStrength(c->strengthCur, c->strengthExtCur), c->intelligenceCur, c->wisdomCur, c->dexterityCur, c->constitutionCur, c->charismaCur);
-	_screen->printShadedText(str, 192, 64, 15, 0);
+	Common::String str = Common::String::format(_chargenStrings1[3], _vm->getCharStrength(c->strengthCur, c->strengthExtCur).c_str(), c->intelligenceCur, c->wisdomCur, c->dexterityCur, c->constitutionCur, c->charismaCur);
+	_screen->printShadedText(str.c_str(), 192, 64, 15, 0);
 
-	snprintf(str, 22, _chargenStrings1[4], c->armorClass, c->hitPointsMax);
-	_screen->printShadedText(str, 280, 64, 15, 0);
+	str = Common::String::format(_chargenStrings1[4], c->armorClass, c->hitPointsMax);
+	_screen->printShadedText(str.c_str(), 280, 64, 15, 0);
 
 	const char *lvlStr = c->level[2] ? _chargenStrings1[7] : (c->level[1] ? _chargenStrings1[6] : _chargenStrings1[5]);
-	snprintf(str, 22, lvlStr, c->level[0], c->level[1], c->level[2]);
-	_screen->printShadedText(str, 280, 80, 15, 0);
+	str = Common::String::format(lvlStr, c->level[0], c->level[1], c->level[2]);
+	_screen->printShadedText(str.c_str(), 280, 80, 15, 0);
 
 	switch (mode) {
 	case 1:
@@ -998,14 +997,10 @@ int CharacterGenerator::modifyStat(int index, int8 *stat1, int8 *stat2) {
 	printStats(_activeBox, 3);
 	_vm->removeInputTop();
 
-	char statStr[6];
-	if (index)
-		snprintf(statStr, 6, "%d", *s1);
-	else
-		snprintf(statStr, 6, "%s", _vm->getCharStrength(*s1, *s2));
+	Common::String statStr = index ? Common::String::format("%d", *s1) : _vm->getCharStrength(*s1, *s2);
 
 	_screen->copyRegion(b->x - 112, b->y - 64, b->x + 32, b->y, 40, b->height, 2, 0, Screen::CR_NO_P_CHECK);
-	_screen->printShadedText(statStr, b->x + 32, b->y, 6, 0);
+	_screen->printShadedText(statStr.c_str(), b->x + 32, b->y, 6, 0);
 	_screen->updateScreen();
 
 	EobCharacter *c = &_characters[_activeBox];
@@ -1081,13 +1076,10 @@ int CharacterGenerator::modifyStat(int index, int8 *stat1, int8 *stat2) {
 		if (index == 6)
 			_characters[_activeBox].hitPointsMax = v1;
 
-		if (index)
-			snprintf(statStr, 6, "%d", *s1);
-		else
-			snprintf(statStr, 6, "%s", _vm->getCharStrength(*s1, *s2));
+		statStr = index ? Common::String::format("%d", *s1) : _vm->getCharStrength(*s1, *s2);
 
 		_screen->copyRegion(b->x - 112, b->y - 64, b->x + 32, b->y, 40, b->height, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->printShadedText(statStr, b->x + 32, b->y, 6, 0);
+		_screen->printShadedText(statStr.c_str(), b->x + 32, b->y, 6, 0);
 		_screen->updateScreen();
 
 		if (index == 4) {
@@ -1097,9 +1089,9 @@ int CharacterGenerator::modifyStat(int index, int8 *stat1, int8 *stat2) {
 			c->hitPointsMax = c->hitPointsCur = CLIP<int16>(c->hitPointsCur, _chargenMinStats[6], _chargenMaxStats[6]);
 
 			if (c->hitPointsCur != oldVal) {
-				snprintf(statStr, 6, "%d", c->hitPointsCur);
+				statStr = Common::String::format("%d", c->hitPointsCur);
 				_screen->copyRegion(120, 72, 264, 136, 40, 8, 2, 0, Screen::CR_NO_P_CHECK);
-				_screen->printShadedText(statStr, 264, 136, 15, 0);
+				_screen->printShadedText(statStr.c_str(), 264, 136, 15, 0);
 				_screen->updateScreen();
 			}
 
@@ -1108,19 +1100,16 @@ int CharacterGenerator::modifyStat(int index, int8 *stat1, int8 *stat2) {
 			c->armorClass = _vm->getDexterityArmorClassModifier(v1) + 10;
 
 			if (c->armorClass != oldVal) {
-				snprintf(statStr, 6, "%d", c->armorClass);
+				statStr = Common::String::format("%d", c->armorClass);
 				_screen->copyRegion(120, 64, 264, 128, 40, 8, 2, 0, Screen::CR_NO_P_CHECK);
-				_screen->printShadedText(statStr, 264, 128, 15, 0);
+				_screen->printShadedText(statStr.c_str(), 264, 128, 15, 0);
 				_screen->updateScreen();
 			}
 		}
 
 		if (loop = false) {
-			if (index)
-				snprintf(statStr, 6, "%d", *s1);
-			else
-				snprintf(statStr, 6, "%s", _vm->getCharStrength(*s1, *s2));
-			_screen->printText(statStr, b->x + 32, b->y, 15, 0);
+			statStr = index ? Common::String::format("%d", *s1) : _vm->getCharStrength(*s1, *s2);
+			_screen->printText(statStr.c_str(), b->x + 32, b->y, 15, 0);
 			_screen->updateScreen();
 		}
 	}
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index 120ad157d0..5af5049025 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -208,10 +208,7 @@ void DarkMoonEngine::generateMonsterPalettes(const char *file, int16 monsterInde
 }
 
 void DarkMoonEngine::loadMonsterDecoration(const char *file, int16 monsterIndex) {
-	char filename[13];
-	snprintf(filename, 13, "%s.dcr", file);
-
-	Common::SeekableReadStream *s = _res->createReadStream(filename);
+	Common::SeekableReadStream *s = _res->createReadStream(Common::String::format("%s.dcr", file));
 	if (!s)
 		return;
 
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 12a0a0d9ba..97b871cb60 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -706,13 +706,13 @@ int EobCoreEngine::getModifiedHpLimits(int hpModifier, int constModifier, int le
 	return res;
 }
 
-const char *EobCoreEngine::getCharStrength(int str, int strExt) {
+Common::String EobCoreEngine::getCharStrength(int str, int strExt) {
 	if (strExt) {
 		if (strExt == 100)
 			strExt = 0;
-		snprintf(_strenghtStr, 6, "%d/%02d", str, strExt);
+		_strenghtStr = Common::String::format("%d/%02d", str, strExt);
 	} else {
-		snprintf(_strenghtStr, 6, "%d", str);
+		_strenghtStr = Common::String::format("%d", str);
 	}
 
 	return _strenghtStr;
@@ -979,9 +979,8 @@ int EobCoreEngine::npcJoinDialogue(int npcIndex, int queryJoinTextId, int confir
 	int r = runDialogue(-1, 0, _yesNoStrings[0], _yesNoStrings[1]) - 1;
 	if (r == 0) {
 		if (confirmJoinTextId == -1) {
-			char tmp[35];
-			snprintf(tmp, 35, _npcJoinStrings[0], _npcPreset[npcIndex].name);
-			_txt->printDialogueText(tmp, true);
+			Common::String tmp = Common::String::format(_npcJoinStrings[0], _npcPreset[npcIndex].name);
+			_txt->printDialogueText(tmp.c_str(), true);
 		} else {
 			_txt->printDialogueText(confirmJoinTextId, _okStrings[0]);
 		}
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 1ad7b91aca..e88ab84d7a 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -345,7 +345,7 @@ protected:
 	int getClassAndConstHitpointsModifier(int cclass, int constitution);
 	int getClassHpIncreaseType(int cclass, int levelIndex);
 	int getModifiedHpLimits(int hpModifier, int constModifier, int level, bool mode);
-	const char *getCharStrength(int str, int strExt);
+	Common::String getCharStrength(int str, int strExt);
 	int testCharacter(int index, int flags);
 	int getNextValidCharIndex(int curCharIndex, int searchStep);
 
@@ -374,7 +374,7 @@ protected:
 	void setWeaponSlotStatus(int charIndex, int mode, int slot);
 
 	EobCharacter *_characters;
-	char _strenghtStr[6];
+	Common::String _strenghtStr;
 	int _castScrollSlot;
 	int _exchangeCharacterId;
 
@@ -525,7 +525,7 @@ protected:
 
 	// Level
 	void loadLevel(int level, int func);
-	const char *initLevelData(int func);
+	Common::String initLevelData(int func);
 	void addLevelItems();
 	void loadVcnData(const char *file, const char */*nextFile*/);
 	void loadBlockProperties(const char *mazFile);
@@ -562,7 +562,7 @@ protected:
 	SpriteDecoration *_doorSwitches;
 
 	int8 _currentSub;
-	char _curGfxFile[13];
+	Common::String _curGfxFile;
 
 	uint32 _drawSceneTimer;
 	uint32 _flashShapeTimer;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 9aafb76189..34ab19034d 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -188,8 +188,6 @@ void EobCoreEngine::gui_drawCharPortraitWithStats(int index) {
 		txtCol2 = 6;
 	}
 
-	char tmpStr[10];
-
 	if (_currentControlMode == 0) {
 		int x2 = charPortraitPosX[index & 1];
 		int y2 = charPortraitPosY[index >> 1];
@@ -214,8 +212,8 @@ void EobCoreEngine::gui_drawCharPortraitWithStats(int index) {
 
 		if (c->damageTaken > 0) {
 			_screen->drawShape(2, _redSplatShape, x2 + 13, y2 + 30, 0);
-			sprintf(tmpStr, "%d", c->damageTaken);
-			_screen->printText(tmpStr, x2 + 34 - (strlen(tmpStr) * 3), y2 + 42, 15, 0);
+			Common::String tmpStr = Common::String::format("%d", c->damageTaken);
+			_screen->printText(tmpStr.c_str(), x2 + 34 - tmpStr.size() * 3, y2 + 42, 15, 0);
 		}
 
 		_screen->setCurPage(cp);
@@ -272,19 +270,13 @@ void EobCoreEngine::gui_drawCharPortraitWithStats(int index) {
 			_screen->printText(_characterGuiStringsIn[2], 239, 138, 12, _color6);
 			_screen->printText(_characterGuiStringsIn[3], 278, 138, 12, _color6);
 
-			_screen->printText(getCharStrength(c->strengthCur, c->strengthExtCur), 275, 82, 15, _color6);
-			sprintf(tmpStr, "%d", c->intelligenceCur);
-			_screen->printText(tmpStr, 275, 89, 15, _color6);
-			sprintf(tmpStr, "%d", c->wisdomCur);
-			_screen->printText(tmpStr, 275, 96, 15, _color6);
-			sprintf(tmpStr, "%d", c->dexterityCur);
-			_screen->printText(tmpStr, 275, 103, 15, _color6);
-			sprintf(tmpStr, "%d", c->constitutionCur);
-			_screen->printText(tmpStr, 275, 110, 15, _color6);
-			sprintf(tmpStr, "%d", c->charismaCur);
-			_screen->printText(tmpStr, 275, 117, 15, _color6);
-			sprintf(tmpStr, "%d", c->armorClass);
-			_screen->printText(tmpStr, 275, 124, 15, _color6);
+			_screen->printText(getCharStrength(c->strengthCur, c->strengthExtCur).c_str(), 275, 82, 15, _color6);
+			_screen->printText(Common::String::format("%d", c->intelligenceCur).c_str(), 275, 89, 15, _color6);
+			_screen->printText(Common::String::format("%d", c->wisdomCur).c_str(), 275, 96, 15, _color6);
+			_screen->printText(Common::String::format("%d", c->dexterityCur).c_str(), 275, 103, 15, _color6);
+			_screen->printText(Common::String::format("%d", c->constitutionCur).c_str(), 275, 110, 15, _color6);
+			_screen->printText(Common::String::format("%d", c->charismaCur).c_str(), 275, 117, 15, _color6);
+			_screen->printText(Common::String::format("%d", c->armorClass).c_str(), 275, 124, 15, _color6);
 
 			for (int i = 0; i < 3; i++) {
 				int t = getClassHpIncreaseType(c->cClass, i);
@@ -292,10 +284,10 @@ void EobCoreEngine::gui_drawCharPortraitWithStats(int index) {
 					continue;
 
 				_screen->printText(_chargenClassStrings[t + 15], 180, 145 + 7 * i, 12, _color6);
-				sprintf(tmpStr, "%d", c->experience[i]);
-				_screen->printText(tmpStr, 251 - strlen(tmpStr) * 3, 145 + 7 * i, 15, _color6);
-				sprintf(tmpStr, "%d", c->level[i]);
-				_screen->printText(tmpStr, 286 - strlen(tmpStr) * 3, 145 + 7 * i, 15, _color6);
+				Common::String tmpStr = Common::String::format("%d", c->experience[i]);
+				_screen->printText(tmpStr.c_str(), 251 - tmpStr.size() * 3, 145 + 7 * i, 15, _color6);
+				tmpStr = Common::String::format("%d", c->level[i]);
+				_screen->printText(tmpStr.c_str(), 286 - tmpStr.size() * 3, 145 + 7 * i, 15, _color6);
 			}
 		}
 
@@ -397,10 +389,9 @@ void EobCoreEngine::gui_drawWeaponSlot(int charIndex, int slot) {
 }
 
 void EobCoreEngine::gui_drawWeaponSlotStatus(int x, int y, int status) {
-	char tmpStr[6];
-	char tmpStr2[6];
-	tmpStr2[0] = 0;
-
+	Common::String tmpStr;
+	Common::String tmpStr2;
+	
 	if (status > -3 || status == -5)
 		_screen->drawShape(_screen->_curPage, _greenSplatShape, x - 1, y, 0);
 	else
@@ -408,32 +399,32 @@ void EobCoreEngine::gui_drawWeaponSlotStatus(int x, int y, int status) {
 
 	switch (status + 5) {
 		case 0:
-			strcpy(tmpStr, _characterGuiStringsWp[2]);
+			tmpStr = _characterGuiStringsWp[2];
 			break;
 		case 1:
-			strcpy(tmpStr, _characterGuiStringsWr[2]);
-			strcpy(tmpStr2, _characterGuiStringsWr[3]);
+			tmpStr = _characterGuiStringsWr[2];
+			tmpStr2 = _characterGuiStringsWr[3];
 			break;
 		case 2:
-			strcpy(tmpStr, _characterGuiStringsWr[0]);
-			strcpy(tmpStr2, _characterGuiStringsWr[1]);
+			tmpStr = _characterGuiStringsWr[0];
+			tmpStr2 = _characterGuiStringsWr[1];
 			break;
 		case 3:
-			strcpy(tmpStr, _characterGuiStringsWp[1]);
+			tmpStr = _characterGuiStringsWp[1];
 			break;
 		case 4:
-			strcpy(tmpStr, _characterGuiStringsWp[0]);
+			tmpStr = _characterGuiStringsWp[0];
 			break;
 		default:
-			snprintf(tmpStr, 6, "%d", status);
+			tmpStr = Common::String::format("%d", status);
 			break;
 	}
 
-	if (tmpStr2[0]) {
-		_screen->printText(tmpStr, x + (16 - strlen(tmpStr) * 3), y + 2, 15, 0);
-		_screen->printText(tmpStr2, x + (16 - strlen(tmpStr) * 3), y + 9, 15, 0);
+	if (!tmpStr2.empty()) {
+		_screen->printText(tmpStr.c_str(), x + (16 - tmpStr.size() * 3), y + 2, 15, 0);
+		_screen->printText(tmpStr2.c_str(), x + (16 - tmpStr.size() * 3), y + 9, 15, 0);
 	} else {
-		_screen->printText(tmpStr, x + (16 - strlen(tmpStr) * 3), y + 5, 15, 0);
+		_screen->printText(tmpStr.c_str(), x + (16 - tmpStr.size() * 3), y + 5, 15, 0);
 	}
 }
 
@@ -479,15 +470,14 @@ void EobCoreEngine::gui_drawHitpoints(int index) {
 		gui_drawHorizontalBarGraph(x, y, w, h, bgCur, bgMax, barColor[col], _color5);
 
 	} else {
-		char tmpString[12];
-		snprintf(tmpString, 12, _characterGuiStringsHp[1], c->hitPointsCur, c->hitPointsMax);
+		Common::String tmpString = Common::String::format(_characterGuiStringsHp[1], c->hitPointsCur, c->hitPointsMax);
 
 		if (!_currentControlMode) {
 			x -= 13;
 			y -= 1;
 		}
 
-		_screen->printText(tmpString, x, y, 12, _bkgColor_1);
+		_screen->printText(tmpString.c_str(), x, y, 12, _bkgColor_1);
 	}
 }
 
@@ -596,9 +586,8 @@ void EobCoreEngine::gui_drawInventoryItem(int slot, int special, int pageNum) {
 			_screen->fillRect(227, 65, 238, 69, 12);
 			int cnt = countQueuedItems(_characters[_updateCharNum].inventory[slot], -1, -1, 1, 1);
 			x = cnt >= 10 ? 227 : 233;
-			char str[3];
-			snprintf(str, 3, "%d", cnt);
-			_screen->printText(str, x, 65, 15, 0);
+			Common::String str = Common::String::format("%d", cnt);
+			_screen->printText(str.c_str(), x, 65, 15, 0);
 		}
 	}
 
@@ -653,9 +642,7 @@ void EobCoreEngine::gui_drawSpellbook() {
 			_screen->printText(_magicStrings7[i], i * 21 + 73, 123, 12, 0);
 		} else {
 			gui_drawBox(i * 18 + 68, 121, 18, 9, col1, col2, col3);
-			char val[3];
-			sprintf(val, "%d", i + 1);
-			_screen->printText(val, i * 18 + 75, 123, 12, 0);
+			_screen->printText(Common::String::format("%d", i + 1).c_str(), i * 18 + 75, 123, 12, 0);
 		}
 	}
 
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index 4f6982abff..9e87b7c931 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -319,7 +319,7 @@ void EobCoreEngine::printFullItemName(Item item) {
 	const char *tstr3 = 0;
 	int e = 0;
 
-	char tmpString[61];
+	Common::String tmpString;
 
 	if ((itm->flags & 0x40) && !strlen(nameId)) {
 		switch (f) {
@@ -328,11 +328,11 @@ void EobCoreEngine::printFullItemName(Item item) {
 			case 2:
 			case 3:
 				if (v == 0)
-					strcpy(tmpString, nameUnid);
+					tmpString = nameUnid;
 				else if (v < 0)
-					sprintf(tmpString, _itemExtraStrings[3], v, nameUnid);
+					tmpString = Common::String::format(_itemExtraStrings[3], v, nameUnid);
 				else
-					sprintf(tmpString, _itemExtraStrings[4], v, nameUnid);
+					tmpString = Common::String::format(_itemExtraStrings[4], v, nameUnid);
 				break;
 
 			case 9:
@@ -370,30 +370,30 @@ void EobCoreEngine::printFullItemName(Item item) {
 				break;
 
 			default:
-				strcpy(tmpString, nameUnid);
+				tmpString = nameUnid;
 				break;
 		}
 	
 
 		if (tstr3) {
 			if (!tstr2) {
-				sprintf(tmpString, _itemExtraStrings[_flags.lang == Common::EN_ANY ? 10 : 11], tstr3);
+				tmpString = Common::String::format(_itemExtraStrings[_flags.lang == Common::EN_ANY ? 10 : 11], tstr3);
 			} else {
 				if (e == 1) {
 					if (tstr2 == _itemExtraStrings[12])
-						sprintf(tmpString, _itemExtraStrings[_flags.lang == Common::EN_ANY ? 11 : 14], tstr2, tstr3);
+						tmpString = Common::String::format(_itemExtraStrings[_flags.lang == Common::EN_ANY ? 11 : 14], tstr2, tstr3);
 					else
-						sprintf(tmpString, _itemExtraStrings[_flags.gameID == GI_EOB1 ? 10 : (_flags.lang == Common::EN_ANY ? 11 : 13)], tstr2, tstr3);
+						tmpString = Common::String::format(_itemExtraStrings[_flags.gameID == GI_EOB1 ? 10 : (_flags.lang == Common::EN_ANY ? 11 : 13)], tstr2, tstr3);
 				} else {
-					sprintf(tmpString, _itemExtraStrings[_flags.gameID == GI_EOB1 ? 10 : (_flags.lang == Common::EN_ANY ? 11 : 15)], tstr2, tstr3);
+					tmpString = Common::String::format(_itemExtraStrings[_flags.gameID == GI_EOB1 ? 10 : (_flags.lang == Common::EN_ANY ? 11 : 15)], tstr2, tstr3);
 				}
 			}
 		}
 	} else {
-		strcpy(tmpString, (itm->flags & 0x40) ? nameId : nameUnid);
+		tmpString = (itm->flags & 0x40) ? nameId : nameUnid;
 	}
 
-	_txt->printMessage(tmpString);
+	_txt->printMessage(tmpString.c_str());
 }
 
 void EobCoreEngine::identifyQueuedItems(Item itemQueue) {
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 90192a4e51..ee91b6549e 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -47,16 +47,13 @@ void LolEobBaseEngine::generateTempData() {
 	_lvlTempData[l]->wallsXorData = new uint8[4096];
 	_lvlTempData[l]->flags = new uint16[1024];
 
-	char filename[13];
 	const uint8 *p = 0;
 	const uint8 *p2 = 0;
 	if (_flags.gameID == GI_LOL) {
-		snprintf(filename, sizeof(filename), "LEVEL%d.CMZ", _currentLevel);
-		screen()->loadBitmap(filename, 15, 15, 0);
+		screen()->loadBitmap(Common::String::format("LEVEL%d.CMZ", _currentLevel).c_str(), 15, 15, 0);
 		p = screen()->getCPagePtr(14);
 	} else {
-		snprintf(filename, sizeof(filename), "LEVEL%d.MAZ", _currentLevel);
-		p2 = p = _res->fileData(filename, 0);
+		p2 = p = _res->fileData(Common::String::format("LEVEL%d.MAZ", _currentLevel).c_str(), 0);
 	}
 
 	uint16 len = READ_LE_UINT16(p + 4);
@@ -82,16 +79,13 @@ void LolEobBaseEngine::generateTempData() {
 
 void LolEobBaseEngine::restoreBlockTempData(int levelIndex) {
 	int l = levelIndex - 1;
-	char filename[13];
 	const uint8 *p = 0;
 	const uint8 *p2 = 0;
 	if (_flags.gameID == GI_LOL) {
-		snprintf(filename, sizeof(filename), "LEVEL%d.CMZ", levelIndex);
-		screen()->loadBitmap(filename, 3, 3, 0);
+		screen()->loadBitmap(Common::String::format("LEVEL%d.CMZ", levelIndex).c_str(), 3, 3, 0);
 		p = screen()->getCPagePtr(2);
 	} else {
-		snprintf(filename, sizeof(filename), "LEVEL%d.MAZ", levelIndex);
-		p2 = p = _res->fileData(filename, 0);
+		p2 = p = _res->fileData(Common::String::format("LEVEL%d.MAZ", levelIndex).c_str(), 0);
 	}
 
 	uint16 len = READ_LE_UINT16(p + 4);
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 90aa9ff533..f8f527cce6 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -621,28 +621,23 @@ void EobCoreEngine::loadLevel(int level, int sub) {
 	_currentLevel = level;
 	_currentSub = sub;
 
-	char file[13];
-	snprintf(file, 13, "LEVEL%d.INF", level);
-
-	Common::SeekableReadStream *s = _res->createReadStream(file);
-	if (!s) {
-		snprintf(file, 13, "LEVEL%d.DRO", level);
-		s = _res->createReadStream(file);
-	}
-
-	if (!s) {
-		snprintf(file, 13, "LEVEL%d.ELO", level);
-		s = _res->createReadStream(file);
+	Common::String file;
+	Common::SeekableReadStream *s = 0;
+	static const char *suffix[] = { "INF", "DRO", "ELO", 0 };
+	
+	for (const char *const *sf = suffix; *sf && !s; sf++) {
+		file = Common::String::format("LEVEL%d.%s", level, *sf);
+		s = _res->createReadStream(file.c_str());
 	}
 
 	if (!s)
-		error("Failed loading level file LEVEL%d.INF/DRO/ELO", level);
+		error("Failed to load level file LEVEL%d.INF/DRO/ELO", level);
 
 	if (s->readUint16LE() + 2 == s->size()) {
 		if (s->readUint16LE() == 4) {
 			delete s;
 			s = 0;
-			_screen->loadBitmap(file, 5, 5, 0);
+			_screen->loadBitmap(file.c_str(), 5, 5, 0);
 		}
 	}
 
@@ -652,7 +647,7 @@ void EobCoreEngine::loadLevel(int level, int sub) {
 		delete s;
 	}
 
-	const char *gfxFile = initLevelData(sub);
+	Common::String gfxFile = initLevelData(sub);
 
 	const uint8 *data = _screen->getCPagePtr(5);
 	const uint8 *pos = data + READ_LE_UINT16(data);
@@ -694,7 +689,7 @@ void EobCoreEngine::loadLevel(int level, int sub) {
 		pos += 2;
 	}
 
-	loadVcnData(gfxFile, 0);
+	loadVcnData(gfxFile.c_str(), 0);
 	_screen->loadEobCpsFileToPage("INVENT", 0, 5, 3, 2);
 
 	enableSysTimer(2);
@@ -703,13 +698,12 @@ void EobCoreEngine::loadLevel(int level, int sub) {
 	_screen->setCurPage(0);
 }
 
-const char *EobCoreEngine::initLevelData(int sub){
+Common::String EobCoreEngine::initLevelData(int sub){
 	const uint8 *data = _screen->getCPagePtr(5) + 2;
 	const uint8 *pos = data;
 
 	int slen = (_flags.gameID == GI_EOB1) ? 12 : 13;
 
-	char tmpStr[13];
 	_sound->playTrack(0);
 
 	for (int i = 0; i < sub; i++)
@@ -723,8 +717,7 @@ const char *EobCoreEngine::initLevelData(int sub){
 		loadBlockProperties((const char*)pos);
 		pos += slen;
 
-		snprintf(tmpStr, slen, "%s.VMP", (const char*) pos);
-		Common::SeekableReadStream *s = _res->createReadStream(tmpStr);
+		Common::SeekableReadStream *s = _res->createReadStream(Common::String::format("%s.VMP", (const char*)pos).c_str());
 		uint16 size = s->readUint16LE();
 		delete[] _vmpPtr;
 		_vmpPtr = new uint16[size];
@@ -732,12 +725,12 @@ const char *EobCoreEngine::initLevelData(int sub){
 			_vmpPtr[i] = s->readUint16LE();
 		delete s;
 
-		snprintf(tmpStr, 13, "%s.PAL", (const char*) pos);
-		strcpy(_curGfxFile, (const char*) pos);
+		Common::String tmpStr = Common::String::format("%s.PAL", (const char*) pos);
+		_curGfxFile = (const char*) pos;
 		pos += slen;
 
 		if (*pos++ != 0xff && _flags.gameID == GI_EOB2) {
-			snprintf(tmpStr, 13, "%s.PAL", (const char*) pos);
+			tmpStr = Common::String::format("%s.PAL", (const char*) pos);
 			pos += 13;
 		}
 
@@ -749,7 +742,7 @@ const char *EobCoreEngine::initLevelData(int sub){
 			_screen->setShapeFadeMode(1, false);
 		} ////////////////////
 		else
-			_screen->loadPalette(tmpStr, _screen->getPalette(0));
+			_screen->loadPalette(tmpStr.c_str(), _screen->getPalette(0));
 		////////////////////7
 
 		Palette backupPal(256);
@@ -856,10 +849,8 @@ void EobCoreEngine::addLevelItems() {
 void EobCoreEngine::loadVcnData(const char *file, const char*/*nextFile*/) {
 	if (file)
 		strcpy(_lastBlockDataFile, file);
-
-	char fname[13];
-	snprintf(fname, sizeof(fname), "%s.VCN", _lastBlockDataFile);
-	_screen->loadBitmap(fname, 3, 3, 0);
+	
+	_screen->loadBitmap(Common::String::format("%s.VCN", _lastBlockDataFile).c_str(), 3, 3, 0);
 	const uint8 *v = _screen->getCPagePtr(2);
 	uint32 tlen = READ_LE_UINT16(v) << 5;
 	v += 2;
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index eb5a52477b..f095b0409e 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -146,15 +146,13 @@ void Screen_Eob::loadEobBitmap(const char *file, int tempPage, int destPage) {
 }
 
 void Screen_Eob::loadEobCpsFileToPage(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage) {
-	char tmp[13];
-	sprintf(tmp, "%s.CPS", file);
-
+	Common::String tmp = Common::String::format("%s.CPS", file);
 	Common::SeekableReadStream *s = _vm->resource()->createReadStream(tmp);
 	bool loadAlternative = false;
 	if (s) {
 		// This additional check is necessary since some localized versions of EOB II seem to contain invalid (size zero) cps files
 		if (s->size())
-			loadBitmap(tmp, tempPage, destPage, 0);
+			loadBitmap(tmp.c_str(), tempPage, destPage, 0);
 		else
 			loadAlternative = true;
 
@@ -164,7 +162,7 @@ void Screen_Eob::loadEobCpsFileToPage(const char *file, const uint8 *ditheringDa
 	}
 
 	if (loadAlternative) {
-		tmp[0] = 'X';
+		tmp.setChar('X', 0);
 		s = _vm->resource()->createReadStream(tmp);
 		if (!s)
 			error("Screen_Eob::loadEobCpsFileToPage(): CPS file loading failed.");
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index b77c307872..2f996de1ac 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -414,14 +414,9 @@ void SoundPC98::playTrack(uint8 track) {
 
 	beginFadeOut();
 
-	char musicfile[13];
-	sprintf(musicfile, fileListEntry(0), track);
-	if (fileListLen() == 1)
-		sprintf(musicfile, fileListEntry(0), track);
-	else
-		strcpy(musicfile, fileListEntry(track));
+	Common::String musicFile = fileListLen() == 1 ? Common::String::format(fileListEntry(0), track) : fileListEntry(track);
 	delete[] _musicTrackData;
-	_musicTrackData = _vm->resource()->fileData(musicfile, 0);
+	_musicTrackData = _vm->resource()->fileData(musicFile.c_str(), 0);
 	if (_musicEnabled)
 		_driver->loadMusicData(_musicTrackData);
 
@@ -537,17 +532,12 @@ void SoundTownsPC98_v2::playTrack(uint8 track) {
 
 	beginFadeOut();
 
-	char musicfile[13];
-	if (fileListLen() == 1) {
-		sprintf(musicfile, fileListEntry(0), track);
-	} else {
-		strcpy(musicfile, fileListEntry(track));
-		if (!musicfile[0])
-			return;
-	}
+	Common::String musicFile = fileListLen() == 1 ? Common::String::format(fileListEntry(0), track) : fileListEntry(track);
+	if (musicFile.empty())
+		return;
 	delete[] _musicTrackData;
 
-	_musicTrackData = _vm->resource()->fileData(musicfile, 0);
+	_musicTrackData = _vm->resource()->fileData(musicFile.c_str(), 0);
 	_driver->loadMusicData(_musicTrackData, true);
 
 	if (_musicEnabled == 2 && trackNum != -1) {
@@ -592,11 +582,9 @@ int32 SoundTownsPC98_v2::voicePlay(const char *file, Audio::SoundHandle *handle,
 			return 0;
 	}
 
-	char filename[13];
-	const char *pattern = _vm->game() == GI_LOL ? patternLOL : patternHOF;
-	sprintf(filename, pattern, file);
+	Common::String fileName = Common::String::format( _vm->game() == GI_LOL ? patternLOL : patternHOF, file);
 
-	uint8 *data = _vm->resource()->fileData(filename, 0);
+	uint8 *data = _vm->resource()->fileData(fileName.c_str(), 0);
 	uint8 *src = data;
 	if (!src)
 		return 0;
diff --git a/engines/kyra/text_eob.cpp b/engines/kyra/text_eob.cpp
index dc53ae295a..0d9bf9dffa 100644
--- a/engines/kyra/text_eob.cpp
+++ b/engines/kyra/text_eob.cpp
@@ -125,7 +125,7 @@ void TextDisplayer_Eob::displayText(char *str, ...) {
 
 		if (!_tempString2 && c == '%') {
 			if (a == 'd') {
-				snprintf(_scriptParaString, 11, "%d", va_arg(args, int));
+				strcpy(_scriptParaString, Common::String::format("%d", va_arg(args, int)).c_str());
 				_tempString2 = _scriptParaString;
 			} else if (a == 's') {
 				_tempString2 = va_arg(args, char *);
@@ -471,8 +471,7 @@ void TextDisplayer_Eob::printMessage(const char *str, int textColor, ...) {
 
 	displayText(_dialogueBuffer);
 
-	//if (textColor != -1)
-		_textDimData[screen()->curDimIndex()].color1 = tc;
+	_textDimData[screen()->curDimIndex()].color1 = tc;
 
 	if (!screen()->_curPage)
 		screen()->updateScreen();
diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp
index 3127e6d54b..da1efa37fe 100644
--- a/engines/kyra/text_lol.cpp
+++ b/engines/kyra/text_lol.cpp
@@ -303,7 +303,7 @@ void TextDisplayer_LoL::preprocessString(char *str, EMCState *script, const uint
 
 		switch (para) {
 		case 'a':
-			snprintf(dst, 7, "%d", _scriptTextParameter);
+			strcpy(dst, Common::String::format("%d", _scriptTextParameter).c_str());
 			dst += strlen(dst);
 			break;
 
@@ -321,7 +321,7 @@ void TextDisplayer_LoL::preprocessString(char *str, EMCState *script, const uint
 		case 'd':
 		case 'u':
 		case 'x':
-			snprintf(dst, 7, "%d", script ? script->stack[script->sp + paramIndex] : paramList[paramIndex]);
+			strcpy(dst, Common::String::format("%d", script ? script->stack[script->sp + paramIndex] : paramList[paramIndex]).c_str());
 			dst += strlen(dst);
 			break;
 
-- 
cgit v1.2.3


From 089ad94b681df8f4493cecc0ba7bc2d3d31b8ddb Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sat, 11 Jun 2011 13:31:22 +0200
Subject: KYRA: (EOB) - minor cleanup

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

(limited to 'engines')

diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index f8f527cce6..be106a9ec3 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -627,7 +627,7 @@ void EobCoreEngine::loadLevel(int level, int sub) {
 	
 	for (const char *const *sf = suffix; *sf && !s; sf++) {
 		file = Common::String::format("LEVEL%d.%s", level, *sf);
-		s = _res->createReadStream(file.c_str());
+		s = _res->createReadStream(file);
 	}
 
 	if (!s)
@@ -717,7 +717,7 @@ Common::String EobCoreEngine::initLevelData(int sub){
 		loadBlockProperties((const char*)pos);
 		pos += slen;
 
-		Common::SeekableReadStream *s = _res->createReadStream(Common::String::format("%s.VMP", (const char*)pos).c_str());
+		Common::SeekableReadStream *s = _res->createReadStream(Common::String::format("%s.VMP", (const char*)pos));
 		uint16 size = s->readUint16LE();
 		delete[] _vmpPtr;
 		_vmpPtr = new uint16[size];
-- 
cgit v1.2.3


From 77d210765a2e1e299d2321863f5cc543b64ee1bb Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sat, 11 Jun 2011 21:36:02 +0200
Subject: KYRA: (EOB) - add some static res (flight object data) to kyra.dat

---
 engines/kyra/eobcommon.cpp     | 2 --
 engines/kyra/eobcommon.h       | 7 +++++++
 engines/kyra/lol.cpp           | 2 --
 engines/kyra/loleobbase.cpp    | 3 +++
 engines/kyra/resource.h        | 7 +++++++
 engines/kyra/staticres_eob.cpp | 7 +++++++
 6 files changed, 24 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 97b871cb60..49f07acd5f 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -246,8 +246,6 @@ Common::Error EobCoreEngine::init() {
 	_screen->loadFont(Screen::FID_6_FNT, "FONT6.FNT");
 	_screen->loadFont(Screen::FID_8_FNT, "FONT8.FNT");
 
-	_activeButtons = 0;
-
 	_staticres = new StaticResource(this);
 	assert(_staticres);
 	if (!_staticres->init())
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index e88ab84d7a..e2873cbbcf 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -435,6 +435,13 @@ protected:
 	const int8 *_flightObjShpMap;
 	const int8 *_flightObjSclIndex;
 
+	const uint8 *_flightObjAnimTiles;
+	const uint8 *_flightObjAnimIndex;
+	const uint8 *_flightObjAnimDim;
+	const uint8 *_flightObjAnimTbl1;
+	const uint8 *_flightObjAnimTbl2;
+	const uint8 *_flightObjAnimTbl3;
+
 	// Monsters
 	void loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex);
 	void releaseMonsterShapes(int first, int num);
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index ebe6ea6e19..7a4a3ec3e2 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -187,8 +187,6 @@ LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : LolEobBaseEngine
 	_compassBroken = _drainMagic = 0;
 
 	_buttonData = 0;
-	_activeButtons = 0;
-	gui_resetButtonList();
 	_preserveEvents = false;
 	_buttonList1 = _buttonList2 = _buttonList3 = _buttonList4 = _buttonList5 = _buttonList6 = _buttonList7 = _buttonList8 = 0;
 
diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
index 1c4068de20..02ffbea803 100644
--- a/engines/kyra/loleobbase.cpp
+++ b/engines/kyra/loleobbase.cpp
@@ -36,6 +36,7 @@ LolEobBaseEngine::LolEobBaseEngine(OSystem *system, const GameFlags &flags) : Ky
 
 	_sceneXoffset = 0;
 	_sceneShpDim = 5;
+	
 	_activeButtons = 0;
 
 	_currentLevel = 0;
@@ -150,6 +151,8 @@ LolEobBaseEngine::~LolEobBaseEngine() {
 }
 
 Common::Error LolEobBaseEngine::init() {
+	gui_resetButtonList();
+
 	_levelDecorationProperties = new LevelDecorationProperty[100];
 	memset(_levelDecorationProperties, 0, 100 * sizeof(LevelDecorationProperty));
 	_levelDecorationShapes = new uint8*[400];
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 2c484b4d01..3e9ba09e69 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -396,6 +396,13 @@ enum KyraResources {
 	kEobBaseMagicStrings7,
 	kEobBaseMagicStrings8,
 
+	kEobBaseFlightObjAnimTiles,
+	kEobBaseFlightObjAnimIndex,
+	kEobBaseFlightObjAnimDim,
+	kEobBaseFlightObjAnimTbl1,
+	kEobBaseFlightObjAnimTbl2,
+	kEobBaseFlightObjAnimTbl3,
+
 	kEobBaseSparkDefSteps,
 	kEobBaseSparkDefSubSteps,
 	kEobBaseSparkDefShift,
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 557bacb239..e25508f459 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -459,6 +459,13 @@ void EobCoreEngine::initStaticResource() {
 	_magicStrings7 = _staticres->loadStrings(kEobBaseMagicStrings7, temp);
 	_magicStrings8 = _staticres->loadStrings(kEobBaseMagicStrings8, temp);
 
+	_flightObjAnimTiles = _staticres->loadRawData(kEobBaseFlightObjAnimTiles, temp);
+	_flightObjAnimIndex = _staticres->loadRawData(kEobBaseFlightObjAnimIndex, temp);
+	_flightObjAnimDim = _staticres->loadRawData(kEobBaseFlightObjAnimDim, temp);
+	_flightObjAnimTbl1 = _staticres->loadRawData(kEobBaseFlightObjAnimTbl1, temp);
+	_flightObjAnimTbl2 = _staticres->loadRawData(kEobBaseFlightObjAnimTbl2, temp);
+	_flightObjAnimTbl3 = _staticres->loadRawData(kEobBaseFlightObjAnimTbl3, temp);
+
 	_sparkEffectDefSteps = _staticres->loadRawData(kEobBaseSparkDefSteps, temp);
 	_sparkEffectDefSubSteps = _staticres->loadRawData(kEobBaseSparkDefSubSteps, temp);
 	_sparkEffectDefShift = _staticres->loadRawData(kEobBaseSparkDefShift, temp);
-- 
cgit v1.2.3


From 9a6be57afd843b0cae09633b3745b104034100fa Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 6 Nov 2011 17:02:52 +0100
Subject: KYRA: (EOB) - implement explodeObject()

---
 engines/kyra/eobcommon.cpp     |  34 ++++---
 engines/kyra/eobcommon.h       |  24 ++---
 engines/kyra/items_eob.cpp     |  63 +++++++++++-
 engines/kyra/lol.h             |   2 +-
 engines/kyra/loleobbase.cpp    |   4 +-
 engines/kyra/loleobbase.h      |   4 +-
 engines/kyra/magic_eob.cpp     |   2 +-
 engines/kyra/resource.h        |  14 +--
 engines/kyra/scene_eob.cpp     |   4 +-
 engines/kyra/scene_lol.cpp     |   2 +-
 engines/kyra/screen_eob.cpp    | 217 ++++++++++++++++++++++++++++++++++-------
 engines/kyra/screen_eob.h      |  32 +++---
 engines/kyra/staticres_eob.cpp |  13 ++-
 engines/kyra/timer_eob.cpp     |   2 +-
 14 files changed, 322 insertions(+), 95 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 49f07acd5f..d40620c7ae 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -22,17 +22,17 @@
 
 #ifdef ENABLE_EOB
 
-#include "common/config-manager.h"
-
-#include "audio/mididrv.h"
-#include "audio/mixer.h"
-
 #include "kyra/loleobbase.h"
 #include "kyra/resource.h"
 #include "kyra/sound_intern.h"
 #include "kyra/script_eob.h"
 #include "kyra/timer.h"
 
+#include "common/config-manager.h"
+
+#include "audio/mididrv.h"
+#include "audio/mixer.h"
+
 namespace Kyra {
 
 EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBaseEngine(system, flags), _numLargeItemShapes(flags.gameID == GI_EOB1 ? 14 : 11),
@@ -229,6 +229,11 @@ Common::Error EobCoreEngine::init() {
 	assert(_res);
 	_res->reset();
 
+	_staticres = new StaticResource(this);
+	assert(_staticres);
+	if (!_staticres->init())
+		error("_staticres->init() failed");
+
 	if (!screen()->init())
 		error("screen()->init() failed");
 
@@ -246,11 +251,6 @@ Common::Error EobCoreEngine::init() {
 	_screen->loadFont(Screen::FID_6_FNT, "FONT6.FNT");
 	_screen->loadFont(Screen::FID_8_FNT, "FONT8.FNT");
 
-	_staticres = new StaticResource(this);
-	assert(_staticres);
-	if (!_staticres->init())
-		error("_staticres->init() failed");
-
 	Common::Error err = LolEobBaseEngine::init();
 	if (err.getCode() != Common::kNoError)
 		return err;
@@ -1383,7 +1383,7 @@ void EobCoreEngine::inflictMonsterDamage(EobMonsterInPlay *m, int damage, bool g
 	m->flags = (m->flags & 0xf7) | 1;
 
 	if (_monsterProps[m->type].flags & 0x2000) {
-		inflictMonsterDamage_s1(m);
+		explodeMonster(m);
 		checkSceneUpdateNeed(m->block);
 		m->hitPointsCur = 0;
 	} else {
@@ -1827,8 +1827,16 @@ int EobCoreEngine::getMonsterAcHitChanceModifier(int charIndex, int monsterAc) {
 	return (20 - ((l / mod1[cm]) * mod2[cm])) - monsterAc;
 }
 
-void EobCoreEngine::inflictMonsterDamage_s1(EobMonsterInPlay *m) {
-
+void EobCoreEngine::explodeMonster(EobMonsterInPlay *m) {
+	m->flags |= 2;
+	if (getBlockDistance(m->block, _currentBlock) < 2) {
+		explodeObject(0, _currentBlock, 2);
+		for (int i = 0; i < 6; i++)
+			calcAndInflictCharacterDamage(i, 6, 6, 0, 8, 1, 0);
+	} else {
+		explodeObject(0, m->block, 2);
+	}
+	m->flags &= ~2;
 }
 
 void EobCoreEngine::snd_playSoundEffect(int id, int volume) {
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index e2873cbbcf..8b28e86f2e 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -413,7 +413,7 @@ protected:
 	void launchMagicObject(int charIndex, int type, uint16 startBlock, int startPos, int dir);
 	bool updateObjectFlight(EobFlyingObject *fo, int block, int pos);
 	bool updateFlyingObjectHitTest(EobFlyingObject *fo, int block, int pos);
-	void updateFlyingObject_s3(EobFlyingObject *fo);
+	void explodeObject(EobFlyingObject *fo, int block, Item item);
 	void endObjectFlight(EobFlyingObject *fo);
 	void checkFlyingObjects();
 
@@ -435,12 +435,15 @@ protected:
 	const int8 *_flightObjShpMap;
 	const int8 *_flightObjSclIndex;
 
-	const uint8 *_flightObjAnimTiles;
-	const uint8 *_flightObjAnimIndex;
-	const uint8 *_flightObjAnimDim;
-	const uint8 *_flightObjAnimTbl1;
-	const uint8 *_flightObjAnimTbl2;
-	const uint8 *_flightObjAnimTbl3;
+	const uint8 *_expObjectTlMode;
+	const uint8 *_expObjectTblIndex;
+	const uint8 *_expObjectShpStart;
+	const uint8 *_expObjectAnimTbl1;
+	int _expObjectAnimTbl1Size;
+	const uint8 *_expObjectAnimTbl2;
+	int _expObjectAnimTbl2Size;
+	const uint8 *_expObjectAnimTbl3;
+	int _expObjectAnimTbl3Size;
 
 	// Monsters
 	void loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex);
@@ -545,7 +548,7 @@ protected:
 	virtual const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8*shapeDefs) { return (const uint8*)filename; }
 
 	void drawScene(int update);
-	void drawSceneShapes();
+	void drawSceneShapes(int start = 0);
 	void drawDecorations(int index);
 
 	int calcNewBlockPositionAndTestPassability(uint16 curBlock, uint16 direction);
@@ -802,8 +805,8 @@ protected:
 	int getStrDamageModifier(int charIndex);
 	int getDexHitChanceModifier(int charIndex);
 	int getMonsterAcHitChanceModifier(int charIndex, int monsterAc);
-	void inflictMonsterDamage_s1(EobMonsterInPlay *m);
-
+	void explodeMonster(EobMonsterInPlay *m);
+	
 	int _dstMonsterIndex;
 	int _inflictMonsterDamageUnk;
 	int16 _foundMonstersArray[5];
@@ -933,7 +936,6 @@ protected:
 	const char *const *_magicStrings2;
 	const char *const *_magicStrings3;
 	const char *const *_magicStrings4;
-	const char *const *_magicStrings5;
 	const char *const *_magicStrings6;
 	const char *const *_magicStrings7;
 	const char *const *_magicStrings8;
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index 9e87b7c931..e536b67324 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -569,8 +569,69 @@ bool EobCoreEngine::updateFlyingObjectHitTest(EobFlyingObject *fo, int block, in
 	return false;
 }
 
-void EobCoreEngine::updateFlyingObject_s3(EobFlyingObject *fo) {
+void EobCoreEngine::explodeObject(EobFlyingObject *fo, int block, Item item) {
+	if (_partyResting) {
+		snd_processEnvironmentalSoundEffect(35, _currentBlock);
+		return;
+	}
+
+	const uint8 *table = (_expObjectTblIndex[item] == 0) ? _expObjectAnimTbl1 : ((_expObjectTblIndex[item] == 1) ? _expObjectAnimTbl2 : _expObjectAnimTbl3);
+	int tableSize = (_expObjectTblIndex[item] == 0) ? _expObjectAnimTbl1Size : ((_expObjectTblIndex[item] == 1) ? _expObjectAnimTbl2Size : _expObjectAnimTbl3Size);
+
+	int tl = 0;
+	for (; tl < 18; tl++) {
+		if (_visibleBlockIndex[tl] == block)
+			break;
+	}
+
+	if (tl == 18)
+		return;
+
+	int b = _expObjectTlMode ? _expObjectTlMode[tl] : 2;
+
+	if (b == 0 || (b == 1 && (fo->direction & 1) == (_currentDirection & 1))) {
+		snd_processEnvironmentalSoundEffect(35, _currentBlock);
+		return;
+	}
 
+	uint8 dm = _dscDimMap[tl];
+	int16 x1 = 0;
+	int16 x2 = 0;
+
+	setLevelShapesDim(tl, x1, x2, 5);
+	
+	if (x2 < x1)
+		return;
+
+	if (fo)
+		fo->enable = 0;
+
+	drawScene(1);
+
+	if (fo)
+		fo->enable = 2;
+
+	_screen->fillRect(0, 0, 176, 120, 0, 2);
+	uint8 col = _screen->getPagePixel(2, 0, 0);
+	drawSceneShapes(_expObjectShpStart[dm]);
+
+	setLevelShapesDim(tl, x1, x2, 5);
+	_screen->updateScreen();
+
+	_screen->setGfxParameters(_dscShapeCoords[(tl * 5 + 4) << 1] + 88, 48, col);
+	snd_processEnvironmentalSoundEffect(35, _currentBlock);
+
+	disableSysTimer(2);
+	if (dm == 0) {
+		_screen->drawExplosion(3, 147, 35, 20, 7, table, tableSize);
+	} else if (dm == 1) {
+		_screen->drawExplosion(2, 147, 35, 20, 7, table, tableSize);
+	} else if (dm == 2) {
+		_screen->drawExplosion(1, 147, 35, 20, 7, table, tableSize);
+	} else if (dm == 3) {
+		_screen->drawExplosion(0, 460, 50, 20, 4, table, tableSize);
+	}
+	enableSysTimer(2);
 }
 
 void EobCoreEngine::endObjectFlight(EobFlyingObject *fo) {
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index f4fcbeb269..8ddba8607c 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -928,7 +928,7 @@ private:
 
 	void drawScene(int pageNum);
 
-	void drawSceneShapes();
+	void drawSceneShapes(int start = 0);
 	void drawDecorations(int index);
 	void drawBlockEffects(int index, int type);
 	void drawSpecialGuiShape(int pageNum);
diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
index 02ffbea803..a7a47b6531 100644
--- a/engines/kyra/loleobbase.cpp
+++ b/engines/kyra/loleobbase.cpp
@@ -195,8 +195,8 @@ Common::Error LolEobBaseEngine::init() {
 	return Common::kNoError;
 }
 
-bool LolEobBaseEngine::posWithinRect(int mouseX, int mouseY, int x1, int y1, int x2, int y2) {
-	if (mouseX < x1 || mouseX > x2 || mouseY < y1 || mouseY > y2)
+bool LolEobBaseEngine::posWithinRect(int posX, int posY, int x1, int y1, int x2, int y2) {
+	if (posX < x1 || posX > x2 || posY < y1 || posY > y2)
 		return false;
 	return true;
 }
diff --git a/engines/kyra/loleobbase.h b/engines/kyra/loleobbase.h
index 43a86465bc..831c64467c 100644
--- a/engines/kyra/loleobbase.h
+++ b/engines/kyra/loleobbase.h
@@ -113,7 +113,7 @@ protected:
 	void timerProcessDoors(int timerNum);
 
 	// mouse
-	bool posWithinRect(int mouseX, int mouseY, int x1, int y1, int x2, int y2);
+	bool posWithinRect(int posX, int posY, int x1, int y1, int x2, int y2);
 	virtual void setHandItem(Item itemIndex) = 0;
 
 	// Characters
@@ -143,7 +143,7 @@ protected:
 	virtual void loadBlockProperties(const char *file) = 0;
 
 	virtual void drawScene(int pageNum) = 0;
-	virtual void drawSceneShapes() = 0;
+	virtual void drawSceneShapes(int start) = 0;
 	virtual void drawDecorations(int index) = 0;
 
 	void setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim);
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index aefe20c06a..16e8996340 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -482,7 +482,7 @@ bool EobCoreEngine::magicObjectHit(EobFlyingObject *fo, int dcTimes, int dcPips,
 	}
 
 	if (res && (fo->flags & 0x40))
-		updateFlyingObject_s3(fo);
+		explodeObject(fo, fo->curBlock, fo->item);
 	else if ((_flags.gameID == GI_EOB1 && fo->item == 5) || (_flags.gameID == GI_EOB2 && fo->item == 4))
 		res = false;
 
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 3e9ba09e69..2f93adde3c 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -391,17 +391,17 @@ enum KyraResources {
 	kEobBaseMagicStrings2,
 	kEobBaseMagicStrings3,
 	kEobBaseMagicStrings4,
-	kEobBaseMagicStrings5,
 	kEobBaseMagicStrings6,
 	kEobBaseMagicStrings7,
 	kEobBaseMagicStrings8,
 
-	kEobBaseFlightObjAnimTiles,
-	kEobBaseFlightObjAnimIndex,
-	kEobBaseFlightObjAnimDim,
-	kEobBaseFlightObjAnimTbl1,
-	kEobBaseFlightObjAnimTbl2,
-	kEobBaseFlightObjAnimTbl3,
+	kEobBaseExpObjectTlMode,
+	kEobBaseExpObjectTblIndex,
+	kEobBaseExpObjectShpStart,
+	kEobBaseExpObjectTbl1,
+	kEobBaseExpObjectTbl2,
+	kEobBaseExpObjectTbl3,
+	kEobBaseExpObjectY,
 
 	kEobBaseSparkDefSteps,
 	kEobBaseSparkDefSubSteps,
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index be106a9ec3..a8ca966d49 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -1037,8 +1037,8 @@ void EobCoreEngine::drawScene(int update) {
 	_sceneUpdateRequired = false;
 }
 
-void EobCoreEngine::drawSceneShapes() {
-	for (int i = 0; i < 18; i++) {
+void EobCoreEngine::drawSceneShapes(int start) {
+	for (int i = start; i < 18; i++) {
 		uint8 t = _dscTileIndex[i];
 		uint8 s = _visibleBlocks[t]->walls[_sceneDrawVarDown];
 
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index c2b16cab88..998fb73364 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -1386,7 +1386,7 @@ void LoLEngine::setDefaultButtonState() {
 	_lampStatusSuspended = false;
 }
 
-void LoLEngine::drawSceneShapes() {
+void LoLEngine::drawSceneShapes(int) {
 	for (int i = 0; i < 18; i++) {
 		uint8 t = _dscTileIndex[i];
 		uint8 s = _visibleBlocks[t]->walls[_sceneDrawVarDown];
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index f095b0409e..b93ab3eafb 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -42,6 +42,8 @@ Screen_Eob::Screen_Eob(EobCoreEngine *vm, OSystem *system) : Screen(vm, system)
 	_fadeData = 0;
 	_fadeDataIndex = 0;
 	_dsX1 = _dsX2 = _dsY1 = _dsY2 = 0;
+	_gfxX = _gfxY = 0;
+	_gfxCol = 0;
 	_customDimTable = 0;
 	_dsTempPage = 0;
 }
@@ -57,6 +59,8 @@ bool Screen_Eob::init() {
 		_customDimTable = new ScreenDim*[_screenDimTableCount];
 		memset(_customDimTable, 0, sizeof(ScreenDim *)* _screenDimTableCount);
 
+		int temp;
+		_gfxMaxY = _vm->staticres()->loadRawData(kEobBaseExpObjectY, temp);
 		_fadeData = _vm->resource()->fileData("FADING.DAT", 0);
 
 		if (!_fadeData) {
@@ -605,25 +609,6 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 	}
 }
 
-void Screen_Eob::drawShapeSetPixel(uint8 * dst, uint8 c) {
-	if (_shapeFadeMode[0]) {
-		if (_shapeFadeMode[1]) {
-			c = *dst;
-		} else {
-			_shapeFadeInternal &= 7;
-            c = *(dst + _shapeFadeInternal++);
-		}
-	}
-
-	if (_shapeFadeMode[1]) {
-		uint8 cnt = _shapeFadeMode[1];
-		while (cnt--)
-			c = _fadeData[_fadeDataIndex + c];
-	}
-
-	*dst = c;
-}
-
 const uint8 *Screen_Eob::scaleShape(const uint8 *shapeData, int steps) {
 	setShapeFadeMode(1, steps ? true : false);
 
@@ -700,24 +685,133 @@ void Screen_Eob::applyShapeOverlay(uint8 *shp, int ovlIndex) {
 		shp[i] = ovl[shp[i]];
 }
 
-void Screen_Eob::scaleShapeProcessLine(uint8 *&dst, const uint8 *&src) {
-	for (int i = 0; i < _dsDiv; i++) {
-		*dst++ = *src++;
-		*dst++ = READ_BE_UINT16(src) >> 4;
-		src += 2;
+void Screen_Eob::setShapeFrame(int x1, int y1, int x2, int y2) {
+	_dsX1 = x1;
+	_dsY1 = y1;
+	_dsX2 = x2;
+	_dsY2 = y2;
+}
+
+void Screen_Eob::setShapeFadeMode (uint8 i, bool b) {
+	if (!i || i == 1)
+		_shapeFadeMode[i] = b;
+}
+
+void Screen_Eob::setGfxParameters(int x, int y, int col) {
+	_gfxX = x;
+	_gfxY = y;
+	_gfxCol = col;
+}
+
+void Screen_Eob::drawExplosion(int scale, int radius, int numSteps, int stepSize, int aspectRatio, const uint8 *colorTable, int colorTableSize) {
+	int ymin = 0;
+	int ymax = _gfxMaxY[scale];
+	int xmin = -100;
+	int xmax = 276;
+
+	if (scale)
+		--scale;
+
+	hideMouse();
+
+	const ScreenDim *dm = getScreenDim(5);
+	int rX1 = dm->sx << 3;
+	int rY1 = dm->sy;
+	int rX2 = rX1 + (dm->w << 3);
+	int rY2 = rY1 + dm->h - 1;
+	
+	int16 gx2 = _gfxX;
+	int16 gy2 = _gfxY;
+
+	uint8 *ptr1 = _dsTempPage;
+	int16 *ptr2 = (int16*)_dsTempPage;
+	int16 *ptr3 = (int16*)&_dsTempPage[300];
+	int16 *ptr4 = (int16*)&_dsTempPage[600];
+	int16 *ptr5 = (int16*)&_dsTempPage[900];
+	int16 *ptr6 = (int16*)&_dsTempPage[1200];
+	int16 *ptr7 = (int16*)&_dsTempPage[1500];
+	int16 *ptr8 = (int16*)&_dsTempPage[1800];
+
+	if (numSteps > 150)
+		numSteps = 150;
+
+	for (int i = 0; i < numSteps; i++) {
+		ptr2[i] = ptr3[i] = 0;
+		ptr4[i] = _vm->_rnd.getRandomNumberRng(0, radius) - (radius >> 1);
+		ptr5[i] = _vm->_rnd.getRandomNumberRng(0, radius) - (radius >> 1) - (radius >> (8 - aspectRatio));
+		ptr7[i] = _vm->_rnd.getRandomNumberRng(1024/stepSize, 2048/stepSize);
+		ptr8[i] = scale << 8;
 	}
 
-	if (_dsRem == 1) {
-		*dst++ = *src++;
-		*dst++ = _dsScaleTmp;
+	for (int l = 2; l;) {
+		if (l != 2) {
+			for (int i = numSteps - 1; i >= 0; i--) {
+				uint32 end = _system->getMillis() + 1;
+				int16 px = ((ptr2[i] >> 6) >> scale) + gx2;
+				int16 py = ((ptr3[i] >> 6) >> scale) + gy2;
+				if (py > ymax)
+					py = ymax;
+				if (posWithinRect(px, py, rX1, rY1, rX2, rY2)) {
+					setPagePixel(0, px, py, ptr6[i]);
+					if (i % 5 == 0)  {
+						updateScreen();
+						uint32 cur = _system->getMillis();
+						if (end > cur)
+						_system->delayMillis(end - cur);
+					}
+				}
+			}			
+		}
 
-	} if (_dsRem == 2) {
-		*dst++ = (src[0] & 0xf0) | (src[1] >> 4);
-		src += 2;
-		*dst++ = _dsScaleTmp;
-		*dst++ = _dsScaleTmp;
-		*dst++ = _dsScaleTmp;
+		l = 0;
+
+		for (int i = 0; i < numSteps; i++) {
+			uint32 end = _system->getMillis() + 1;
+			if (ptr4[i] <= 0)
+				ptr4[i]++;
+			else
+				ptr4[i]--;
+			ptr2[i] += ptr4[i];
+			ptr5[i] += 5;
+			ptr3[i] += ptr5[i];
+			ptr8[i] += ptr7[i];
+				
+			int16 px = ((ptr2[i] >> 6) >> scale) + gx2;
+			int16 py = ((ptr3[i] >> 6) >> scale) + gy2;
+			if (py >= ymax || py < ymin)
+				ptr5[i] = -(ptr5[i] >> 1);
+			if (px >= xmax || px < xmin)
+				ptr4[i] = -(ptr4[i] >> 1);
+
+			if (py > ymax)
+				py = ymax;
+			
+			int pxVal1 = 0;
+			if (posWithinRect(px, py, 0, 0, 319, 199)) {
+				pxVal1 = getPagePixel(2, px, py);
+				ptr6[i] = getPagePixel(0, px, py);
+			}
+
+			assert((ptr8[i] >> 8) < colorTableSize);
+			int pxVal2 = colorTable[ptr8[i] >> 8];
+			if (pxVal2) {
+				l = 1;
+				if (pxVal1 == _gfxCol && posWithinRect(px, py, rX1, rY1, rX2, rY2)) {
+					setPagePixel(0, px, py, pxVal2);
+					if (i % 5 == 0)  {
+						updateScreen();
+						uint32 cur = _system->getMillis();
+						if (end > cur)
+						_system->delayMillis(end - cur);
+					}
+				}
+			} else {
+				ptr7[i] = 0;
+			}
+		}
 	}
+	
+	showMouse();
 }
 
 void Screen_Eob::fadeTextColor(Palette *pal, int color1, int rate) {
@@ -778,6 +872,14 @@ bool Screen_Eob::delayedFadePalStep(Palette *fadePal, Palette *destPal, int rate
 	return res;
 }
 
+int Screen_Eob::getRectSize(int w, int h) {
+	return w * h;
+}
+
+void Screen_Eob::setFadeTableIndex(int index) {
+	_fadeDataIndex = (CLIP(index, 0, 7) << 8);
+}
+
 void Screen_Eob::createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, uint8 weight) {
 	if (!palData)
 		return;
@@ -821,6 +923,55 @@ void Screen_Eob::createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, ui
 	}
 }
 
+uint8 *Screen_Eob::getFadeTable(int index) {
+	return (index >= 0 && index < 5) ? &_fadeData[index << 8] : 0;
+}
+
+void Screen_Eob::drawShapeSetPixel(uint8 * dst, uint8 c) {
+	if (_shapeFadeMode[0]) {
+		if (_shapeFadeMode[1]) {
+			c = *dst;
+		} else {
+			_shapeFadeInternal &= 7;
+            c = *(dst + _shapeFadeInternal++);
+		}
+	}
+
+	if (_shapeFadeMode[1]) {
+		uint8 cnt = _shapeFadeMode[1];
+		while (cnt--)
+			c = _fadeData[_fadeDataIndex + c];
+	}
+
+	*dst = c;
+}
+
+void Screen_Eob::scaleShapeProcessLine(uint8 *&dst, const uint8 *&src) {
+	for (int i = 0; i < _dsDiv; i++) {
+		*dst++ = *src++;
+		*dst++ = READ_BE_UINT16(src) >> 4;
+		src += 2;
+	}
+
+	if (_dsRem == 1) {
+		*dst++ = *src++;
+		*dst++ = _dsScaleTmp;
+
+	} if (_dsRem == 2) {
+		*dst++ = (src[0] & 0xf0) | (src[1] >> 4);
+		src += 2;
+		*dst++ = _dsScaleTmp;
+		*dst++ = _dsScaleTmp;
+		*dst++ = _dsScaleTmp;
+	}
+}
+
+bool Screen_Eob::posWithinRect(int posX, int posY, int x1, int y1, int x2, int y2) {
+	if (posX < x1 || posX > x2 || posY < y1 || posY > y2)
+		return false;
+	return true;
+}
+
 OldDOSFont::OldDOSFont() {
 	_data = 0;
 	_width = _height = _numGlyphs = 0;
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index 038ba85791..19cbdb5b4a 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -61,20 +61,32 @@ public:
 	void replaceShapePalette(uint8 *shp, const uint8 *pal);
 	void applyShapeOverlay(uint8 *shp, int ovlIndex);
 
-	void setShapeFrame(int x1, int y1, int x2, int y2) { _dsX1 = x1; _dsY1 = y1; _dsX2 = x2; _dsY2 = y2; }
-	void setShapeFadeMode (uint8 i, bool b) { if (!i || i == 1) _shapeFadeMode[i] = b; }
+	void setShapeFrame(int x1, int y1, int x2, int y2);
+	void setShapeFadeMode (uint8 i, bool b);
+
+	void setGfxParameters(int x, int y, int col);
+	void drawExplosion(int scale, int radius, int numSteps, int stepSize, int aspectRatio, const uint8 *colorTable, int colorTableSize);
 
 	void fadeTextColor(Palette *pal, int color1, int fadeTextColor);
 	bool delayedFadePalStep(Palette *fadePal, Palette *destPal, int rate);
 
 	void setTextColorMap(const uint8 *cmap) {}
-	int getRectSize(int w, int h) { return w * h; }
+	int getRectSize(int w, int h);
 
-	void setFadeTableIndex(int index) { _fadeDataIndex = (CLIP(index, 0, 7) << 8); }
+	void setFadeTableIndex(int index);
 	void createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, uint8 weight);
-	uint8 *getFadeTable(int index) { return (index >= 0 && index < 5) ? &_fadeData[index << 8] : 0; }
+	uint8 *getFadeTable(int index);
+
+private:
+	void drawShapeSetPixel(uint8 *dst, uint8 c);
+	void scaleShapeProcessLine(uint8 *&dst, const uint8 *&src);
+	bool posWithinRect(int posX, int posY, int x1, int y1, int x2, int y2);
+
+	int _dsDiv, _dsRem, _dsScaleTmp;
+	int16 _gfxX, _gfxY;
+	uint8 _gfxCol;
+	const uint8 *_gfxMaxY;
 
-protected:
 	int16 _dsX1, _dsX2, _dsY1, _dsY2;
 	bool _shapeFadeMode[2];
 	uint16 _shapeFadeInternal;
@@ -87,13 +99,7 @@ protected:
 	static const int _screenDimTableCount;
 
 	ScreenDim **_customDimTable;
-	int _curDimIndex;
-
-private:
-	void drawShapeSetPixel(uint8 *dst, uint8 c);
-	void scaleShapeProcessLine(uint8 *&dst, const uint8 *&src);
-
-	int _dsDiv, _dsRem, _dsScaleTmp;
+	int _curDimIndex;	
 };
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index e25508f459..a291a486f4 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -454,17 +454,16 @@ void EobCoreEngine::initStaticResource() {
 	_magicStrings2 = _staticres->loadStrings(kEobBaseMagicStrings2, temp);
 	_magicStrings3 = _staticres->loadStrings(kEobBaseMagicStrings3, temp);
 	_magicStrings4 = _staticres->loadStrings(kEobBaseMagicStrings4, temp);
-	_magicStrings5 = _staticres->loadStrings(kEobBaseMagicStrings5, temp);
 	_magicStrings6 = _staticres->loadStrings(kEobBaseMagicStrings6, temp);
 	_magicStrings7 = _staticres->loadStrings(kEobBaseMagicStrings7, temp);
 	_magicStrings8 = _staticres->loadStrings(kEobBaseMagicStrings8, temp);
 
-	_flightObjAnimTiles = _staticres->loadRawData(kEobBaseFlightObjAnimTiles, temp);
-	_flightObjAnimIndex = _staticres->loadRawData(kEobBaseFlightObjAnimIndex, temp);
-	_flightObjAnimDim = _staticres->loadRawData(kEobBaseFlightObjAnimDim, temp);
-	_flightObjAnimTbl1 = _staticres->loadRawData(kEobBaseFlightObjAnimTbl1, temp);
-	_flightObjAnimTbl2 = _staticres->loadRawData(kEobBaseFlightObjAnimTbl2, temp);
-	_flightObjAnimTbl3 = _staticres->loadRawData(kEobBaseFlightObjAnimTbl3, temp);
+	_expObjectTlMode = _staticres->loadRawData(kEobBaseExpObjectTlMode, temp);
+	_expObjectTblIndex = _staticres->loadRawData(kEobBaseExpObjectTblIndex, temp);
+	_expObjectShpStart = _staticres->loadRawData(kEobBaseExpObjectShpStart, temp);
+	_expObjectAnimTbl1 = _staticres->loadRawData(kEobBaseExpObjectTbl1, _expObjectAnimTbl1Size);
+	_expObjectAnimTbl2 = _staticres->loadRawData(kEobBaseExpObjectTbl2, _expObjectAnimTbl2Size);
+	_expObjectAnimTbl3 = _staticres->loadRawData(kEobBaseExpObjectTbl3, _expObjectAnimTbl3Size);
 
 	_sparkEffectDefSteps = _staticres->loadRawData(kEobBaseSparkDefSteps, temp);
 	_sparkEffectDefSubSteps = _staticres->loadRawData(kEobBaseSparkDefSubSteps, temp);
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 92c7f34ee6..70b89bee9c 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -232,7 +232,7 @@ void EobCoreEngine::timerProcessFlyingObjects(int timerNum) {
 		} else {
 			if (fo->flags & 0x20) {
 				if (!updateFlyingObjectHitTest(fo, fo->curBlock, fo->curPos))
-					updateFlyingObject_s3(fo);
+					explodeObject(fo, fo->curBlock, fo->item);
 			}
 			endFlight = true;
 		}
-- 
cgit v1.2.3


From adbf14c3c480890dfb155b896d1805e102311aa9 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 13 Jun 2011 17:38:28 +0200
Subject: KYRA: (EOB) - update static resources (menu strings)

---
 engines/kyra/eobcommon.h       | 22 ++++++++++++++++++++++
 engines/kyra/gui_eob.cpp       | 28 ++++++++++++++++++++++++++--
 engines/kyra/resource.h        | 20 ++++++++++++++++++++
 engines/kyra/staticres_eob.cpp | 20 ++++++++++++++++++++
 4 files changed, 88 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 8b28e86f2e..9ead3c2408 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -956,6 +956,28 @@ protected:
 
 	const uint8 *_magicFlightObjectProperties;
 
+	// Menu
+	const char *const *_menuStringsMain;
+	const char *const *_menuStringsSaveLoad;
+	const char *const *_menuStringsOnOff;
+	const char *const *_menuStringsSpells;
+	const char *const *_menuStringsRest;
+	const char *const *_menuStringsDrop;
+	const char *const *_menuStringsExit;
+	const char *const *_menuStringsStarve;
+	const char *const *_menuStringsScribe;
+	const char *const *_menuStringsDrop2;
+	const char *const *_menuStringsHead;
+	const char *const *_menuStringsPoison;
+	const char *const *_menuStringsMgc;
+	const char *const *_menuStringsPrefs;
+	const char *const *_menuStringsRest2;
+	const char *const *_menuStringsDefeat;
+
+	const char *const *_menuStringsTransfer;
+	const char *const *_menuStringsSpec;
+	const char *const *_menuStringsSpellNo;
+
 	// sound
 	void snd_playSoundEffect(int id, int volume=0xFF);
 };
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 34ab19034d..02af458d65 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -834,6 +834,29 @@ int EobCoreEngine::clickedCharPortraitDefault(Button *button) {
 }
 
 int EobCoreEngine::clickedCamp(Button *button) {
+	gui_updateControls();
+	disableSysTimer(2);
+	int cd = _screen->curDimIndex();
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 1))
+			continue;
+		_characters[i].damageTaken = 0;
+		_characters[i].slotStatus[0] = _characters[i].slotStatus[1] = 0;
+		gui_drawCharPortraitWithStats(i);
+	}
+
+	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 14, Screen::CR_NO_P_CHECK);
+	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
+	
+
+	_screen->setFont(of);
+	_screen->setCurPage(0);
+	_screen->setScreenDim(cd);
+
+	enableSysTimer(2);	
+	updateCharacterEvents(true);
+
 	return button->arg;
 }
 
@@ -1317,13 +1340,14 @@ void EobCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex
 
 		case 7:
 			// Food ration
-			/* don't do anything if mouse control is enabled */
-			//eatItemInHand(charIndex);
+			// Don't do anything if mouse control is enabled (we don't support anything else)
+			// eatItemInHand(charIndex);
 			break;
 
 		case 10:
 			if (_flags.gameID == GI_EOB1)
 				vl += _clericSpellOffset;
+			// drop through
 		case 9:
 			// Mage/Cleric Scroll
 			if (!_currentControlMode)
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 2f93adde3c..90a3e74b19 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -299,6 +299,26 @@ enum KyraResources {
 	kEobBaseCancelStrings,
 	kEobBaseAbortStrings,
 
+	kEobBaseMenuStringsMain,
+	kEobBaseMenuStringsSaveLoad,
+	kEobBaseMenuStringsOnOff,
+	kEobBaseMenuStringsSpells,
+	kEobBaseMenuStringsRest,
+	kEobBaseMenuStringsDrop,
+	kEobBaseMenuStringsExit,
+	kEobBaseMenuStringsStarve,
+	kEobBaseMenuStringsScribe,
+	kEobBaseMenuStringsDrop2,
+	kEobBaseMenuStringsHead,
+	kEobBaseMenuStringsPoison,
+	kEobBaseMenuStringsMgc,
+	kEobBaseMenuStringsPrefs,
+	kEobBaseMenuStringsRest2,
+	kEobBaseMenuStringsDefeat,
+	kEobBaseMenuStringsTransfer,
+	kEobBaseMenuStringsSpec,
+	kEobBaseMenuStringsSpellNo,
+
 	kEobBaseCharGuiStringsHp,
 	kEobBaseCharGuiStringsWp1,
 	kEobBaseCharGuiStringsWp2,
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index a291a486f4..da4e6752b0 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -366,6 +366,26 @@ void EobCoreEngine::initStaticResource() {
 	_cancelStrings = _staticres->loadStrings(kEobBaseCancelStrings, temp);
 	_abortStrings = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseAbortStrings : kEobBaseCancelStrings, temp);
 
+	_menuStringsMain = _staticres->loadStrings(kEobBaseMenuStringsMain, temp);
+	_menuStringsSaveLoad = _staticres->loadStrings(kEobBaseMenuStringsSaveLoad, temp);
+	_menuStringsOnOff = _staticres->loadStrings(kEobBaseMenuStringsOnOff, temp);
+	_menuStringsSpells = _staticres->loadStrings(kEobBaseMenuStringsSpells, temp);
+	_menuStringsRest = _staticres->loadStrings(kEobBaseMenuStringsRest, temp);
+	_menuStringsDrop = _staticres->loadStrings(kEobBaseMenuStringsDrop, temp);
+	_menuStringsExit = _staticres->loadStrings(kEobBaseMenuStringsExit, temp);
+	_menuStringsStarve = _staticres->loadStrings(kEobBaseMenuStringsStarve, temp);
+	_menuStringsScribe = _staticres->loadStrings(kEobBaseMenuStringsScribe, temp);
+	_menuStringsDrop2 = _staticres->loadStrings(kEobBaseMenuStringsDrop2, temp);
+	_menuStringsHead = _staticres->loadStrings(kEobBaseMenuStringsHead, temp);
+	_menuStringsPoison = _staticres->loadStrings(kEobBaseMenuStringsPoison, temp);
+	_menuStringsMgc = _staticres->loadStrings(kEobBaseMenuStringsMgc, temp);
+	_menuStringsPrefs = _staticres->loadStrings(kEobBaseMenuStringsPrefs, temp);
+	_menuStringsRest2 = _staticres->loadStrings(kEobBaseMenuStringsRest2, temp);
+	_menuStringsDefeat = _staticres->loadStrings(kEobBaseMenuStringsDefeat, temp);
+	_menuStringsTransfer = _staticres->loadStrings(kEobBaseMenuStringsTransfer, temp);
+	_menuStringsSpec = _staticres->loadStrings(kEobBaseMenuStringsSpec, temp);
+	_menuStringsSpellNo = _staticres->loadStrings(kEobBaseMenuStringsSpellNo, temp);
+
 	_characterGuiStringsHp = _staticres->loadStrings(kEobBaseCharGuiStringsHp, temp);
 	_characterGuiStringsWp = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharGuiStringsWp2 : kEobBaseCharGuiStringsWp1, temp);
 	_characterGuiStringsWr = _staticres->loadStrings(kEobBaseCharGuiStringsWr, temp);
-- 
cgit v1.2.3


From c8665d06bc59b695cb6c444b1e3c24104b69dec4 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Thu, 16 Jun 2011 18:51:47 +0200
Subject: KYRA: (EOB) - fix some warnings and add some menu code

---
 engines/kyra/chargen.cpp        |  6 +++---
 engines/kyra/eob2.cpp           |  1 +
 engines/kyra/eobcommon.cpp      | 26 +++++++++++++++++---------
 engines/kyra/eobcommon.h        | 12 ++++++++----
 engines/kyra/gui_eob.cpp        | 30 ++++++++++++++++++++++++++----
 engines/kyra/gui_eob.h          |  3 ++-
 engines/kyra/items_eob.cpp      |  4 ++--
 engines/kyra/loleobbase.cpp     |  2 +-
 engines/kyra/loleobbase.h       |  1 +
 engines/kyra/magic_eob.cpp      |  3 ++-
 engines/kyra/scene_eob.cpp      | 10 +++++-----
 engines/kyra/screen_eob.cpp     |  3 +--
 engines/kyra/sequences_eob1.cpp |  3 +--
 engines/kyra/sequences_eob2.cpp |  4 +---
 engines/kyra/sprites_eob.cpp    | 10 +++++-----
 15 files changed, 76 insertions(+), 42 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 59b46b5043..17ee920127 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -1028,11 +1028,11 @@ int CharacterGenerator::modifyStat(int index, int8 *stat1, int8 *stat2) {
 			v1++;
 
 		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP8]) {
-			ci = --ci % 7;
+			ci = (ci - 1) % 7;
 			loop = false;
 
 		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP2]) {
-			ci = ++ci % 7;
+			ci = (ci + 1) % 7;
 			loop = false;
 
 		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_o] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE] || inputFlag == 0x800A) {
@@ -1107,7 +1107,7 @@ int CharacterGenerator::modifyStat(int index, int8 *stat1, int8 *stat2) {
 			}
 		}
 
-		if (loop = false) {
+		if (loop == false) {
 			statStr = index ? Common::String::format("%d", *s1) : _vm->getCharStrength(*s1, *s2);
 			_screen->printText(statStr.c_str(), b->x + 32, b->y, 15, 0);
 			_screen->updateScreen();
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index 5af5049025..45df528c75 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -200,6 +200,7 @@ void DarkMoonEngine::generateMonsterPalettes(const char *file, int16 monsterInde
 				c += 6;
 
 			c = (c << 1) + (ii - 1);
+			assert(c < 24);
 			memcpy(_monsterPalettes[c], tmpPal, 16);
 		}
 	}
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index d40620c7ae..b7f31702dd 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -40,13 +40,14 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_teleporterWallId(flags.gameID == GI_EOB1 ? 52 : 44) {
 	_screen = 0;
 	_gui = 0;
-
+TTTTT=false;
 	//_runLoopUnk2 = 0;
 	//_runLoopTimerUnk = 0;
 	_playFinale = false;
 	_runFlag = true;
 	_saveLoadMode = 0;
 	_updateHandItemCursor = false;
+	_configMouse = true;
 
 	_largeItemShapes = _smallItemShapes = _thrownItemShapes = _spellShapes = _firebeamShapes = _itemIconShapes =
 		_wallOfForceShapes = _teleporterShapes = _sparkShapes = _compassShapes = 0;
@@ -54,6 +55,8 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 		_weaponSlotGrid = _blackBoxWideGrid = _lightningColumnShape = 0;
 	_tempIconShape = 0;
 
+	_menuStringsPrefsTemp = 0;
+
 	_monsterDustStrings = 0;
 	_monsterDistAttType10 = 0;
 	_monsterDistAttSfx10 = 0;
@@ -105,7 +108,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 
 	_exchangeCharacterId = -1;
 	_charExchangeSwap = 0;
-	_hpBarGraphs = true;
+	_configHpBarGraphs = true;
 
 	memset(_dialogueLastBitmap, 0, 13);
 	_dlgUnk1 = 0;
@@ -140,6 +143,12 @@ EobCoreEngine::~EobCoreEngine() {
 	releaseItemsAndDecorationsShapes();
 	releaseTempData();
 
+	if (_menuStringsPrefsTemp) {
+		for (int i = 0; i < 4; i++)
+			delete _menuStringsPrefsTemp[i];
+		delete[] _menuStringsPrefsTemp;
+	}
+
 	if (_faceShapes) {
 		for (int i = 0; i < 44; i++) {
 			if (_characters) {
@@ -259,6 +268,9 @@ Common::Error EobCoreEngine::init() {
 	initStaticResource();
 	initSpells();
 
+	_menuStringsPrefsTemp = new char*[4];
+	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char*));
+
 	_timer = new TimerManager(this, _system);
 	assert(_timer);
 	setupTimers();
@@ -373,17 +385,13 @@ Common::Error EobCoreEngine::go() {
 
 void EobCoreEngine::runLoop() {
 	_envAudioTimer = _system->getMillis() + (rollDice(1, 10, 3) * 18 * _tickLength);
-	///
-	// startupSub1
-	//
-	//
+	
 	_updateFlags = 0;
-	//_unkCharacterId = 0;
+	_updateCharNum = 0;
 	_flashShapeTimer = 0;
 	_drawSceneTimer = _system->getMillis();
-	//_unkBBBBBBBBBBBBBBBB = 1;
+	//__unkB__ = 1;
 	gui_setPlayFieldButtons();
-	//
 
 	_screen->_curPage = 0;
 	gui_drawPlayField(0);
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 9ead3c2408..5e34dc3791 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -71,8 +71,8 @@ struct EobChargenButtonDef {
 };
 
 struct EobGuiButtonDef {
-	uint8 keyCode;
-	uint8 keyCode2;
+	uint16 keyCode;
+	uint16 keyCode2;
 	uint16 flags;
 	uint16 x;
 	uint8 y;
@@ -547,7 +547,7 @@ protected:
 	virtual void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) {}
 	virtual const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8*shapeDefs) { return (const uint8*)filename; }
 
-	void drawScene(int update);
+	void drawScene(int refresh);
 	void drawSceneShapes(int start = 0);
 	void drawDecorations(int index);
 
@@ -707,7 +707,7 @@ protected:
 	const uint8 *_inventorySlotsY;
 	const uint8 **_compassShapes;
 	uint8 _charExchangeSwap;
-	bool _hpBarGraphs;
+	bool _configHpBarGraphs;
 
 	// text
 	void setupDialogueButtons(int presetfirst, int numStr, const char *str1, ...);
@@ -957,6 +957,10 @@ protected:
 	const uint8 *_magicFlightObjectProperties;
 
 	// Menu
+	char **_menuStringsPrefsTemp;
+
+	bool _configMouse;
+
 	const char *const *_menuStringsMain;
 	const char *const *_menuStringsSaveLoad;
 	const char *const *_menuStringsOnOff;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 02af458d65..56c5acd3df 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -456,7 +456,7 @@ void EobCoreEngine::gui_drawHitpoints(int index) {
 
 	EobCharacter *c = &_characters[index];
 
-	if (_hpBarGraphs) {
+	if (_configHpBarGraphs) {
 		int bgCur = c->hitPointsCur + 10;
 		int bgMax = c->hitPointsMax + 10;
 		int col = ((bgMax / 3) > bgCur) ? 1 : 0;
@@ -849,10 +849,32 @@ int EobCoreEngine::clickedCamp(Button *button) {
 	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 14, Screen::CR_NO_P_CHECK);
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
 	
+	for (int i = 0; i < 4; i++) {
+		delete _menuStringsPrefsTemp[i];
+		_menuStringsPrefsTemp[i] = new char[strlen(_menuStringsPrefs[i]) + 8];
+	}
 
+	Common::strlcpy(_menuStringsPrefsTemp[0], Common::String::format(_menuStringsPrefs[0], _menuStringsOnOff[_configMusic ? 0 : 1]).c_str(), strlen(_menuStringsPrefs[0]) + 8);
+	Common::strlcpy(_menuStringsPrefsTemp[1], Common::String::format(_menuStringsPrefs[1], _menuStringsOnOff[_configSounds ? 0 : 1]).c_str(), strlen(_menuStringsPrefs[1]) + 8);
+	Common::strlcpy(_menuStringsPrefsTemp[2], Common::String::format(_menuStringsPrefs[2], _menuStringsOnOff[_configHpBarGraphs ? 0 : 1]).c_str(), strlen(_menuStringsPrefs[2]) + 8);
+	Common::strlcpy(_menuStringsPrefsTemp[3], Common::String::format(_menuStringsPrefs[3], _menuStringsOnOff[_configMouse ? 0 : 1]).c_str(), strlen(_menuStringsPrefs[3]) + 8);
+	
 	_screen->setFont(of);
-	_screen->setCurPage(0);
+	_screen->copyRegion(0, 0, 0, 120, 176, 24, 14, 2, Screen::CR_NO_P_CHECK);
 	_screen->setScreenDim(cd);
+	drawScene(0);
+
+	//for (int i = 0; i < 6; i++)
+	//	cleanupCharacterSpellList(i);
+
+	_screen->setCurPage(0);
+	const ScreenDim *dm = _screen->getScreenDim(10);
+	_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 2, 0, Screen::CR_NO_P_CHECK);	
+	
+	//if (displayInv)
+	//	_screen->loadEobCpsFileToPage("INVENT", 0, 5, 3, 2);
+	
+	_screen->updateScreen();
 
 	enableSysTimer(2);	
 	updateCharacterEvents(true);
@@ -1548,7 +1570,7 @@ int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 	uint16 in = inputFlags & 0xff;
 	uint16 buttonReleaseFlag = 0;
 	bool clickEvt = false;
-
+	_vm->TTTTT = true;
 	_flagsMouseLeft = (_vm->_mouseClick == 1) ? 2 : 4;
 	_flagsMouseRight = (_vm->_mouseClick == 2) ? 2 : 4;
 	_vm->_mouseClick = 0;
@@ -1919,7 +1941,7 @@ int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 
 	if (!result)
 		result = inputFlags;
-
+_vm->	TTTTT=false;
 	return result;
 }
 
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index 82e9476fe0..2ad69e700a 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -49,6 +49,7 @@ public:
 	int redrawShadedButtonCallback(Button *button) { return 0; }
 	int redrawButtonCallback(Button *button) { return 0; }
 
+	// general menu handling (main menu, character generation, ingame menus, etc.)
 	void setupMenu(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int unk, int lineSpacing);
 	int handleMenu(int sd, const char *const *strings, void *b, int32 menuItemsMask, int unk);
 	int getMenuItem(int index, int32 menuItemsMask, int unk);
@@ -56,7 +57,7 @@ public:
 
 	int getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor);
 
-	//int runMenu(Menu &menu);
+	// int runMenu(Menu &menu);
 
 	// utilities for thumbnail creation
 	void createScreenThumbnail(Graphics::Surface &dst) {}
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index e536b67324..f9b5212c62 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -258,8 +258,8 @@ int EobCoreEngine::countQueuedItems(Item itemQueue, int16 id, int16 type, int co
 		EobItem *itm = &_items[o1];
 		forceLoop = false;
 		if (id != -1 || type != -1) {
-			if ((id != -1 || (id == -1 && type != itm->type)) && (type != -1) || (id != o1))
-				continue;
+			if (((id != -1 ) || (id == -1 && type != itm->type)) && ((type != -1) || (type == -1 && id != o1)))
+				continue;			
 		}
 
 		if (!includeFlyingItems) {
diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
index a7a47b6531..7db1a4ac68 100644
--- a/engines/kyra/loleobbase.cpp
+++ b/engines/kyra/loleobbase.cpp
@@ -260,7 +260,7 @@ uint16 LolEobBaseEngine::processDialogue() {
 		if (e)
 			gui_notifyButtonListChanged();
 
-		if (_flags.gameID == GI_LOL && (e == 200 || e == 202) || _flags.gameID != GI_LOL && (e == 199 || e == 201)) {
+		if ((_flags.gameID == GI_LOL && (e == 200 || e == 202)) || (_flags.gameID != GI_LOL && (e == 199 || e == 201))) {
 			for (int i = 0; i < _dialogueNumButtons; i++) {
 				int x = _dialogueButtonPosX[i];
 				int y = (gameFlags().use16ColorMode ? ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1 : (_dialogueButtonYoffs + _dialogueButtonPosY[i]));
diff --git a/engines/kyra/loleobbase.h b/engines/kyra/loleobbase.h
index 831c64467c..1be2a8b07f 100644
--- a/engines/kyra/loleobbase.h
+++ b/engines/kyra/loleobbase.h
@@ -253,6 +253,7 @@ protected:
 
 	Button *_activeButtons;
 	Button _activeButtonData[70];
+bool TTTTT;
 
 	uint8 _mouseClick;
 	bool _preserveEvents;
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 16e8996340..2c83c26b83 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -175,13 +175,14 @@ void EobCoreEngine::castSpell(int spell, int weaponSlot) {
 				memmove(&_openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem], &_openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem + 1], 8 - (_openBookSpellListOffset + _openBookSpellSelectedItem));
 			_openBookAvailableSpells[_openBookSpellLevel * 10 + 8] = -tmp;
 			if (_openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem] < 0) {
-				if (--_openBookSpellSelectedItem == -1)
+				if (--_openBookSpellSelectedItem == -1) {
 					if (_openBookSpellListOffset) {
 						_openBookSpellListOffset = 0;
 						_openBookSpellSelectedItem = 5;
 					} else {
 						_openBookSpellSelectedItem = 6;
 					}
+				}
 			}
 		} else if (weaponSlot != -1) {
 			updateUsedCharacterHandItem(_openBookChar, weaponSlot);
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index a8ca966d49..56bf352b98 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -989,13 +989,13 @@ void EobCoreEngine::toggleWallState(int wall, int toggle) {
 	}
 }
 
-void EobCoreEngine::drawScene(int update) {
+void EobCoreEngine::drawScene(int refresh) {
 	generateBlockDrawingBuffer();
 	drawVcnBlocks();
 	drawSceneShapes();
 
 	if (_sceneDrawPage2) {
-		if (update)
+		if (refresh)
 			_screen->fillRect(0, 0, 176, 120, 12);
 
 		_screen->setScreenPalette(_screen->getPalette(0));
@@ -1018,15 +1018,15 @@ void EobCoreEngine::drawScene(int update) {
 		delayUntil(_drawSceneTimer);
 	}
 
-	if (update && !_partyResting)
+	if (refresh && !_partyResting)
 		_screen->copyRegion(0, 0, 0, 0, 176, 120, 2, 0, Screen::CR_NO_P_CHECK);
 
 	updateEnvironmentalSfx(0);
 
-	if (!_dialogueField && update && !_updateFlags)
+	if (!_dialogueField && refresh && !_updateFlags)
 		gui_drawCompass(false);
 
-	if (update && !_partyResting)
+	if (refresh && !_partyResting)
 		_screen->updateScreen();
 
 	if (_sceneDefaultUpdate) {
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index b93ab3eafb..f6b0eafcf4 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -508,7 +508,7 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 							break;
 
 					if (!*(src-1) || i < marginLeft)
-						marginLeft = ++marginLeft - *src++;
+						marginLeft = marginLeft + 1 - *src++;
 					else
 						marginLeft = 0;
 
@@ -723,7 +723,6 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numSteps, int stepSize
 	int16 gx2 = _gfxX;
 	int16 gy2 = _gfxY;
 
-	uint8 *ptr1 = _dsTempPage;
 	int16 *ptr2 = (int16*)_dsTempPage;
 	int16 *ptr3 = (int16*)&_dsTempPage[300];
 	int16 *ptr4 = (int16*)&_dsTempPage[600];
diff --git a/engines/kyra/sequences_eob1.cpp b/engines/kyra/sequences_eob1.cpp
index 0606742421..7e15a7aac7 100644
--- a/engines/kyra/sequences_eob1.cpp
+++ b/engines/kyra/sequences_eob1.cpp
@@ -37,8 +37,7 @@ int EobEngine::mainMenu() {
 	int menuChoice = 4;
 
 	Screen::FontId of = _screen->_currentFont;
-	Common::SeekableReadStream *s = 0;
-
+	
 	while (menuChoice >= 0 && !shouldQuit()) {
 		switch (menuChoice) {
 			case 0:
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
index 708e9cd23a..07dd5237b8 100644
--- a/engines/kyra/sequences_eob2.cpp
+++ b/engines/kyra/sequences_eob2.cpp
@@ -70,8 +70,6 @@ private:
 	Screen_Eob *_screen;
 	Mode _mode;
 
-	uint8 _notifier;
-
 	const char *const *_strings;
 	const char *const *_cpsFiles;
 	const char *const *_palFiles;
@@ -1259,7 +1257,7 @@ void DarkmoonSequenceHelper::delay(uint32 ticks) {
 
 void DarkmoonSequenceHelper::waitForSongNotifier(int index, bool introUpdateAnim) {
 	int seq = 0;
-	while (_notifier < index && !(_vm->skipFlag() || _vm->shouldQuit())) {
+	while (_vm->sound()->checkTrigger() < index && !(_vm->skipFlag() || _vm->shouldQuit())) {
 		if (introUpdateAnim) {
 			runSequence(30 | seq);
 			seq ^= 1;
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index aac3c274db..1fa89ead3c 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -387,18 +387,18 @@ void EobCoreEngine::flashMonsterShape(EobMonsterInPlay *m) {
 
 void EobCoreEngine::updateAllMonsterShapes() {
 	drawScene(1);
-	bool update = false;
+	bool updateShp = false;
 
 	for (EobMonsterInPlay *m = _monsters; m < &_monsters[30]; m++) {
 		if (m->flags & 2) {
 			m->flags &= ~2;
-			update = true;
+			updateShp = true;
 			if (m->hitPointsCur <= 0)
 				killMonster(m, true);
 		}
 	}
 
-	if (update) {
+	if (updateShp) {
 		_sceneUpdateRequired = true;
 		_flashShapeTimer = _system->getMillis() + _tickLength;
 	} else {
@@ -995,7 +995,7 @@ bool EobCoreEngine::updateMonsterTryDistanceAttack(EobMonsterInPlay *m) {
 					statusAttack(i, 4, _monsterSpecAttStrings[1], 1, 5, 9, 1);
 			}
 		} else {
-			Item itm = duplicateItem(-s);
+			itm = duplicateItem(-s);
 			if (itm) {
 				if (launchObject(-1, itm, m->block, m->pos, m->dir, _items[itm].type))
 					_items[itm].block = -1;
@@ -1240,7 +1240,7 @@ void EobCoreEngine::setBlockMonsterDirection(int block, int dir) {
 		if (_monsters[i].block != block || _monsters[i].dir == dir)
 			continue;
 		_monsters[i].dir = dir;
-		_monsters[i].directionChanged == 1;
+		_monsters[i].directionChanged = 1;
 	}
 }
 
-- 
cgit v1.2.3


From 514c77625f3f4d60ca463c1af34fc0672c75df45 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Fri, 17 Jun 2011 00:03:50 +0200
Subject: KYRA: (EOB) - fix out of bounds mem access

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

(limited to 'engines')

diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index f9b5212c62..98cd634405 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -58,8 +58,8 @@ void EobCoreEngine::loadItemDefs() {
 	s = _res->createReadStream("itemtype.dat");
 	uint16 numTypes = s->readUint16LE();
 
-	_itemTypes = new EobItemType[numTypes];
-	memset(_itemTypes, 0, sizeof(EobItemType) * numTypes);
+	_itemTypes = new EobItemType[65];
+	memset(_itemTypes, 0, sizeof(EobItemType) * 65);
 
 	for (int i = 0; i < numTypes; i++) {
 		_itemTypes[i].invFlags = s->readUint16LE();
-- 
cgit v1.2.3


From 6853452bcbed083aa84638f11e4ce04ca189f0a1 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Fri, 17 Jun 2011 17:35:00 +0200
Subject: KYRA: (EOB) - fix shift key input

---
 engines/kyra/eobcommon.cpp  |  6 +++---
 engines/kyra/gui_eob.cpp    | 12 +++++++-----
 engines/kyra/kyra_v1.cpp    |  7 +++++--
 engines/kyra/loleobbase.cpp |  2 +-
 engines/kyra/loleobbase.h   |  2 +-
 5 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index b7f31702dd..89a20a0ea3 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -40,7 +40,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_teleporterWallId(flags.gameID == GI_EOB1 ? 52 : 44) {
 	_screen = 0;
 	_gui = 0;
-TTTTT=false;
+	//_processingButtons=false;
 	//_runLoopUnk2 = 0;
 	//_runLoopTimerUnk = 0;
 	_playFinale = false;
@@ -411,7 +411,7 @@ void EobCoreEngine::runLoop() {
 	while (!shouldQuit() && _runFlag) {
 		//_runLoopUnk2 = _currentBlock;
 		updateCharacterEvents(true);
-		checkInput(_activeButtons, true);
+		checkInput(_activeButtons, true, 0);
 		removeInputTop();
 
 		if (_updateHandItemCursor) {
@@ -1269,7 +1269,7 @@ void EobCoreEngine::displayParchment(int id) {
 		removeInputTop();
 		while (!shouldQuit()) {
 			delay(_tickLength);
-			if (checkInput(0) & 0xff)
+			if (checkInput(0, false, 0) & 0xff)
 				break;
 			removeInputTop();
 		}
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 56c5acd3df..10eabe937f 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -1570,7 +1570,7 @@ int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 	uint16 in = inputFlags & 0xff;
 	uint16 buttonReleaseFlag = 0;
 	bool clickEvt = false;
-	_vm->TTTTT = true;
+	//_vm->_processingButtons = true;
 	_flagsMouseLeft = (_vm->_mouseClick == 1) ? 2 : 4;
 	_flagsMouseRight = (_vm->_mouseClick == 2) ? 2 : 4;
 	_vm->_mouseClick = 0;
@@ -1589,7 +1589,7 @@ int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 
 		inputFlags = 0;
 		clickEvt = true;
-	} else {
+	} else if (inputFlags & 0x8000) {
 		inputFlags &= 0xff;
 	}
 
@@ -1668,13 +1668,13 @@ int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 		uint16 vR = 0;
 
 		if (inputFlags) {
-			if (buttonList->keyCode == in) {
+			if (buttonList->keyCode == inputFlags) {
 				_progress = 1;
 				_flagsMouseLeft = 1;
 				flgs2 ^= 1;
 				result = iFlag;
 				v6 = 1;
-			} else if (buttonList->keyCode2 == in) {
+			} else if (buttonList->keyCode2 == inputFlags) {
 				_progress = 2;
 				_flagsMouseRight = 1;
 				result = iFlag;
@@ -1941,7 +1941,9 @@ int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 
 	if (!result)
 		result = inputFlags;
-_vm->	TTTTT=false;
+	
+	//_vm->_processingButtons=false;
+
 	return result;
 }
 
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index f5ef0d09ac..c1b9f2a453 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -285,10 +285,13 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
 				}
 			} else {
 				KeyMap::const_iterator keycode = _keyMap.find(event.kbd.keycode);
-				if (keycode != _keyMap.end())
+				if (keycode != _keyMap.end()) {
 					keys = keycode->_value;
-				else
+					if (event.kbd.flags & Common::KBD_SHIFT)
+						keys |= 0x100;
+				} else {
 					keys = 0;
+				}
 
 				// When we got an keypress, which we might need to handle,
 				// break the event loop and pass it to GUI code.
diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
index 7db1a4ac68..47a261be6f 100644
--- a/engines/kyra/loleobbase.cpp
+++ b/engines/kyra/loleobbase.cpp
@@ -255,7 +255,7 @@ uint16 LolEobBaseEngine::processDialogue() {
 				}
 		}
 	} else {
-		int e = checkInput(0, false) & 0xFF;
+		int e = checkInput(0, false, 0) & 0xFF;
 		removeInputTop();
 		if (e)
 			gui_notifyButtonListChanged();
diff --git a/engines/kyra/loleobbase.h b/engines/kyra/loleobbase.h
index 1be2a8b07f..a2c13827fc 100644
--- a/engines/kyra/loleobbase.h
+++ b/engines/kyra/loleobbase.h
@@ -253,7 +253,7 @@ protected:
 
 	Button *_activeButtons;
 	Button _activeButtonData[70];
-bool TTTTT;
+	//bool _processingButtons;
 
 	uint8 _mouseClick;
 	bool _preserveEvents;
-- 
cgit v1.2.3


From 894df5a4ac97bc67cfe7fd9a7df17e541c505365 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Fri, 17 Jun 2011 19:11:32 +0200
Subject: KYRA: (EOB) - extended saveload caps

(also save/load inventory and spellbook display state)
---
 engines/kyra/eob1.cpp         |  1 +
 engines/kyra/eob2.cpp         |  1 +
 engines/kyra/eobcommon.cpp    | 23 ++++++++----------
 engines/kyra/eobcommon.h      |  2 +-
 engines/kyra/saveload_eob.cpp | 56 +++++++++++++++++++++++++++++++++++++++----
 5 files changed, 65 insertions(+), 18 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index 993d06a56b..3a6bd28342 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -73,6 +73,7 @@ void EobEngine::startupNew() {
 	_currentBlock = 490;
 	_currentDirection = 0;
 	setHandItem(0);
+	EobCoreEngine::startupNew();
 }
 
 void EobEngine::startupLoad() {
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index 45df528c75..06e85a8cc7 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -73,6 +73,7 @@ void DarkMoonEngine::startupNew() {
 	_currentBlock = 171;
 	_currentDirection = 2;
 	setHandItem(0);
+	EobCoreEngine::startupNew();
 }
 
 void DarkMoonEngine::startupLoad() {
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 89a20a0ea3..e0fb584e16 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -383,26 +383,23 @@ Common::Error EobCoreEngine::go() {
 	return Common::kNoError;
 }
 
-void EobCoreEngine::runLoop() {
-	_envAudioTimer = _system->getMillis() + (rollDice(1, 10, 3) * 18 * _tickLength);
-	
-	_updateFlags = 0;
-	_updateCharNum = 0;
-	_flashShapeTimer = 0;
-	_drawSceneTimer = _system->getMillis();
-	//__unkB__ = 1;
+void EobCoreEngine::startupNew() {
 	gui_setPlayFieldButtons();
-
 	_screen->_curPage = 0;
 	gui_drawPlayField(0);
-
-	_screen->setFont(Screen::FID_6_FNT);
-
 	_screen->_curPage = 0;
 	gui_drawAllCharPortraitsWithStats();
-
 	drawScene(1);
+	_updateFlags = 0;
+	_updateCharNum = 0;
+}
 
+void EobCoreEngine::runLoop() {
+	_envAudioTimer = _system->getMillis() + (rollDice(1, 10, 3) * 18 * _tickLength);	
+	_flashShapeTimer = 0;
+	_drawSceneTimer = _system->getMillis();
+	//__unkB__ = 1;
+	_screen->setFont(Screen::FID_6_FNT);
 	_screen->setScreenDim(7);
 
 	//_runLoopUnk2 = _currentBlock;
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 5e34dc3791..6632ae3cba 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -292,7 +292,7 @@ protected:
 	const char *const *_mainMenuStrings;
 
 	// Main loop
-	virtual void startupNew() = 0;
+	virtual void startupNew();
 	virtual void startupLoad() = 0;
 	void runLoop();
 	void update() { screen()->updateScreen(); }
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index ee91b6549e..18dddddd83 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -229,6 +229,23 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 	_itemInHand = in.readSint16BE();
 	_hasTempDataFlags = in.readUint32BE();
 	_partyEffectFlags = in.readUint32BE();
+	
+	_updateFlags = in.readUint16BE();
+	_compassDirection = in.readUint16BE();
+	_currentControlMode = in.readUint16BE();
+	_updateCharNum = in.readUint16BE();
+	_openBookSpellLevel = in.readSByte();
+	_openBookSpellSelectedItem  = in.readSByte();
+	_openBookSpellListOffset = in.readSByte();
+	_openBookChar = in.readByte();
+	_openBookType = in.readByte();
+	_openBookCharBackup = in.readByte();
+	_openBookTypeBackup = in.readByte();
+	_activeSpellCaster = in.readByte();
+	_activeSpellCasterPos = in.readByte();
+	_activeSpell = in.readByte();
+	_returnAfterSpellCallback = in.readByte() ? true : false;
+
 	_inf->loadState(in);
 
 	for (int i = 0; i < 600; i++) {
@@ -336,15 +353,29 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 
 	if (_saveLoadMode != -1) {
 		loadLevel(_currentLevel, _currentSub);
-		gui_drawPlayField(0);
 		_sceneUpdateRequired = true;
-		_screen->setCurPage(0);
 		_screen->setFont(Screen::FID_6_FNT);
-		gui_drawAllCharPortraitsWithStats();
-		updateHandItemCursor();
 		_saveLoadMode = 1;
 	}
 
+	_screen->setCurPage(0);
+	gui_drawPlayField(0);
+
+	if (_currentControlMode)
+		_screen->copyRegion(176, 0, 0, 0, 144, 168, 0, 5, Screen::CR_NO_P_CHECK);
+
+	_screen->setCurPage(0);
+	gui_drawAllCharPortraitsWithStats();
+	drawScene(1);
+
+	if (_updateFlags) {
+		_updateFlags = 0;
+		useMagicBookOrSymbol(_openBookChar, _openBookType);
+	}
+
+	gui_toggleButtons();
+	updateHandItemCursor();
+
 	while (!_screen->isMouseVisible())
 		_screen->showMouse();
 
@@ -418,6 +449,23 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 	out->writeSint16BE(_itemInHand);
 	out->writeUint32BE(_hasTempDataFlags);
 	out->writeUint32BE(_partyEffectFlags);
+	
+	out->writeUint16BE(_updateFlags);
+	out->writeUint16BE(_compassDirection);
+	out->writeUint16BE(_currentControlMode);
+	out->writeUint16BE(_updateCharNum);
+	out->writeSByte(_openBookSpellLevel);
+	out->writeSByte(_openBookSpellSelectedItem);
+	out->writeSByte(_openBookSpellListOffset);
+	out->writeByte(_openBookChar);
+	out->writeByte(_openBookType);
+	out->writeByte(_openBookCharBackup);
+	out->writeByte(_openBookTypeBackup);
+	out->writeByte(_activeSpellCaster);
+	out->writeByte(_activeSpellCasterPos);
+	out->writeByte(_activeSpell);
+	out->writeByte(_returnAfterSpellCallback ? 1 : 0);
+
 	_inf->saveState(out);
 
 	for (int i = 0; i < 600; i++) {
-- 
cgit v1.2.3


From 69ad70afbb16f25f62432fb497e39c9d5633c10a Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 19 Jun 2011 00:00:48 +0200
Subject: KYRA: (EOB) - allow returning to the main menu from character
 generation via ESC

---
 engines/kyra/chargen.cpp        | 20 +++++++++++++-------
 engines/kyra/eob1.cpp           |  1 +
 engines/kyra/eob1.h             |  1 +
 engines/kyra/eob2.cpp           |  1 +
 engines/kyra/eob2.h             |  1 +
 engines/kyra/eobcommon.cpp      | 42 ++++++++++++++++++++++-------------------
 engines/kyra/eobcommon.h        |  2 +-
 engines/kyra/sequences_eob1.cpp |  3 ++-
 engines/kyra/sequences_eob2.cpp |  3 ++-
 9 files changed, 45 insertions(+), 29 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 17ee920127..fc3e874de3 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -33,7 +33,7 @@ public:
 	CharacterGenerator(EobCoreEngine *vm, Screen_Eob *screen);
 	~CharacterGenerator();
 
-	void start(EobCharacter *characters, uint8 ***faceShapes);
+	bool start(EobCharacter *characters, uint8 ***faceShapes);
 
 private:
 	void init();
@@ -113,8 +113,8 @@ private:
 	Screen_Eob *_screen;
 };
 
-void EobCoreEngine::startCharacterGeneration() {
-	CharacterGenerator(this, _screen).start(_characters, &_faceShapes);
+bool EobCoreEngine::startCharacterGeneration() {
+	return CharacterGenerator(this, _screen).start(_characters, &_faceShapes);
 }
 
 CharacterGenerator::CharacterGenerator(EobCoreEngine *vm, Screen_Eob *screen) : _vm(vm), _screen(screen),
@@ -156,9 +156,9 @@ CharacterGenerator::~CharacterGenerator() {
 	}
 }
 
-void CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
+bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 	if (!characters && !faceShapes)
-		return;
+		return true;
 
 	_characters = characters;
 	_faceShapes = *faceShapes;
@@ -184,10 +184,15 @@ void CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 		_vm->removeInputTop();
 
 		if (inputFlag) {
-			if (inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT])
+			if (inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT]) {
 				_activeBox ^= 1;
-			else if (inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN])
+			} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN]) {
 				_activeBox ^= 2;
+			} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE]) {
+				// Unlike the original we allow returning to the main menu
+				_vm->sound()->haltTrack();
+				return false;
+			}
 			highlightBoxFrame(-1);
 		}
 
@@ -233,6 +238,7 @@ void CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 	_vm->sound()->playTrack(15);
 
 	*faceShapes = _faceShapes;
+	return true;
 }
 
 void CharacterGenerator::init() {
diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index 3a6bd28342..cdccd65414 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -29,6 +29,7 @@ namespace Kyra {
 
 EobEngine::EobEngine(OSystem *system, const GameFlags &flags) : EobCoreEngine(system, flags) {
 	_numSpells = 53;
+	_menuChoiceInit = 4;
 }
 
 EobEngine::~EobEngine() {
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
index 27a060f65c..8a959e9fa4 100644
--- a/engines/kyra/eob1.h
+++ b/engines/kyra/eob1.h
@@ -44,6 +44,7 @@ private:
 	// Main Menu
 	int mainMenu();
 	int mainMenuLoop();
+	int _menuChoiceInit;
 
 	// Main loop
 	void startupNew();
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index 06e85a8cc7..de8e90c80f 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -33,6 +33,7 @@ DarkMoonEngine::DarkMoonEngine(OSystem *system, const GameFlags &flags) : EobCor
 	_shapesIntro = _shapesFinale = 0;
 	_dscDoorType5Offs = 0;
 	_numSpells = 70;
+	_menuChoiceInit = 4;
 }
 
 DarkMoonEngine::~DarkMoonEngine() {
diff --git a/engines/kyra/eob2.h b/engines/kyra/eob2.h
index a36ec0e466..3fabe44bf0 100644
--- a/engines/kyra/eob2.h
+++ b/engines/kyra/eob2.h
@@ -60,6 +60,7 @@ private:
 	// Main Menu
 	int mainMenu();
 	int mainMenuLoop();
+	int _menuChoiceInit;
 
 	// Main loop
 	void startupNew();
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index e0fb584e16..3f9782a343 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -350,27 +350,31 @@ Common::Error EobCoreEngine::go() {
 	//initPlayBuffers
 
 	loadItemDefs();
-
 	int action = 0;
 
-	if (_gameToLoad != -1) {
-		if (loadGameState(_gameToLoad).getCode() != Common::kNoError)
-			error("Couldn't load game slot %d on startup", _gameToLoad);
-		_gameToLoad = -1;
-	} else {
-		action = mainMenu();
-	}
-
-	if (action == -1) {
-		// load game
-		_saveLoadMode = -1;
-		startupLoad();
-	} else if (action == -2) {
-		// new game
-		startCharacterGeneration();
-		startupNew();
-	} else if (action == -3) {
-		// transfer party
+	for (bool repeatLoop = true; repeatLoop; repeatLoop ^= true) {
+		action = 0;
+
+		if (_gameToLoad != -1) {
+			if (loadGameState(_gameToLoad).getCode() != Common::kNoError)
+				error("Couldn't load game slot %d on startup", _gameToLoad);
+			_gameToLoad = -1;
+		} else {
+			action = mainMenu();
+		}
+
+		if (action == -1) {
+			// load game
+			_saveLoadMode = -1;
+			startupLoad();
+		} else if (action == -2) {
+			// new game
+			repeatLoop = startCharacterGeneration();
+			if (repeatLoop)
+				startupNew();
+		} else if (action == -3) {
+			// transfer party
+		}
 	}
 
 	if (!shouldQuit() && action > -3) {
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 6632ae3cba..4ad4ebfe99 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -302,7 +302,7 @@ protected:
 	//int _runLoopUnk2;
 
 	// Create Party
-	void startCharacterGeneration();
+	bool startCharacterGeneration();
 
 	uint8 **_faceShapes;
 
diff --git a/engines/kyra/sequences_eob1.cpp b/engines/kyra/sequences_eob1.cpp
index 7e15a7aac7..e835c12f0f 100644
--- a/engines/kyra/sequences_eob1.cpp
+++ b/engines/kyra/sequences_eob1.cpp
@@ -34,7 +34,8 @@
 namespace Kyra {
 
 int EobEngine::mainMenu() {
-	int menuChoice = 4;
+	int menuChoice = _menuChoiceInit;
+	_menuChoiceInit = 0;
 
 	Screen::FontId of = _screen->_currentFont;
 	
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
index 07dd5237b8..c926eb6934 100644
--- a/engines/kyra/sequences_eob2.cpp
+++ b/engines/kyra/sequences_eob2.cpp
@@ -86,7 +86,8 @@ private:
 };
 
 int DarkMoonEngine::mainMenu() {
-	int menuChoice = 4;
+	int menuChoice = _menuChoiceInit;
+	_menuChoiceInit = 0;
 
 	_sound->loadSoundFile("INTRO");
 	Screen::FontId of = _screen->_currentFont;
-- 
cgit v1.2.3


From 045d08986d3accc3fc7d55d76eb550db01ad7fc7 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Wed, 22 Jun 2011 01:08:28 +0200
Subject: KYRA: (EOB) - start implementing camp menu

---
 engines/kyra/chargen.cpp       |   2 +-
 engines/kyra/eobcommon.cpp     |  17 +-
 engines/kyra/eobcommon.h       |  24 ++-
 engines/kyra/gui.h             |   2 +
 engines/kyra/gui_eob.cpp       | 393 +++++++++++++++++++++++++++++++++++++----
 engines/kyra/gui_eob.h         |  28 ++-
 engines/kyra/magic_eob.cpp     |   4 +
 engines/kyra/screen_eob.cpp    |   5 +-
 engines/kyra/script_eob.cpp    |  11 +-
 engines/kyra/staticres_eob.cpp |  58 ++++++
 10 files changed, 487 insertions(+), 57 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index fc3e874de3..03ab45363f 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -319,7 +319,7 @@ void CharacterGenerator::initButton(int index, int x, int y, int w, int h, int k
 	b->width = w;
 	b->height = h;
 	b->keyCode = keyCode;
-	b->keyCode2 = keyCode + 0x100;
+	b->keyCode2 = keyCode | 0x100;
 }
 
 void CharacterGenerator::checkForCompleteParty() {
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 3f9782a343..d193bc0842 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -55,8 +55,6 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 		_weaponSlotGrid = _blackBoxWideGrid = _lightningColumnShape = 0;
 	_tempIconShape = 0;
 
-	_menuStringsPrefsTemp = 0;
-
 	_monsterDustStrings = 0;
 	_monsterDistAttType10 = 0;
 	_monsterDistAttSfx10 = 0;
@@ -106,6 +104,8 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_color10 = 23;
 	_color11 = 20;
 
+	_menuDefs = 0;
+
 	_exchangeCharacterId = -1;
 	_charExchangeSwap = 0;
 	_configHpBarGraphs = true;
@@ -143,12 +143,6 @@ EobCoreEngine::~EobCoreEngine() {
 	releaseItemsAndDecorationsShapes();
 	releaseTempData();
 
-	if (_menuStringsPrefsTemp) {
-		for (int i = 0; i < 4; i++)
-			delete _menuStringsPrefsTemp[i];
-		delete[] _menuStringsPrefsTemp;
-	}
-
 	if (_faceShapes) {
 		for (int i = 0; i < 44; i++) {
 			if (_characters) {
@@ -207,6 +201,9 @@ EobCoreEngine::~EobCoreEngine() {
 
 	delete _gui;
 	_gui = 0;
+	delete[] _menuDefs;
+	_menuDefs = 0;
+
 	delete _inf;
 	delete _timer;
 	_timer = 0;
@@ -265,12 +262,10 @@ Common::Error EobCoreEngine::init() {
 		return err;
 
 	initButtonData();
+	initMenus();
 	initStaticResource();
 	initSpells();
 
-	_menuStringsPrefsTemp = new char*[4];
-	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char*));
-
 	_timer = new TimerManager(this, _system);
 	assert(_timer);
 	setupTimers();
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 4ad4ebfe99..a4fb0d7735 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -228,6 +228,23 @@ struct ScriptTimer {
 	uint32 next;
 };
 
+struct EobMenuDef {
+	int8 titleStrId;
+	uint8 dim;
+	uint8 firstButtonStrId;
+	int8 numButtons;
+	int8 titleCol;
+};
+struct EobMenuButtonDef {
+	int8 labelId;
+	int16 x;
+	int8 y;
+	uint8 width;
+	uint8 height;
+	int16 keyCode;
+	int16 flags;
+};
+
 class EobInfProcessor;
 
 class EobCoreEngine : public LolEobBaseEngine {
@@ -258,8 +275,9 @@ protected:
 	void releaseItemsAndDecorationsShapes();
 
 	void initButtonData();
+	void initMenus();
 	void initStaticResource();
-	virtual void initSpells();
+	virtual void initSpells();	
 
 	const uint8 **_largeItemShapes;
 	const uint8 **_smallItemShapes;
@@ -825,6 +843,7 @@ protected:
 	void sparkEffectDefensive(int charIndex);
 	void sparkEffectOffensive();
 	void setSpellEventTimer(int spell, int timerBaseFactor, int timerLength, int timerLevelFactor, int updateExistingTimer);
+	void cleanupCharacterSpellList(int charIndex);
 
 	bool magicObjectHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level);
 
@@ -957,7 +976,8 @@ protected:
 	const uint8 *_magicFlightObjectProperties;
 
 	// Menu
-	char **_menuStringsPrefsTemp;
+	EobMenuDef *_menuDefs;
+	const EobMenuButtonDef *_menuButtonDefs;
 
 	bool _configMouse;
 
diff --git a/engines/kyra/gui.h b/engines/kyra/gui.h
index 04fc9b5523..ad0e0d630f 100644
--- a/engines/kyra/gui.h
+++ b/engines/kyra/gui.h
@@ -88,6 +88,8 @@ struct Button {
 
 	Callback buttonCallback;
 
+	const void *extButtonDef;
+
 	uint16 arg;
 };
 
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 10eabe937f..9baed752a3 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -24,6 +24,7 @@
 
 #include "kyra/eobcommon.h"
 #include "kyra/gui_eob.h"
+#include "kyra/text_eob.h"
 #include "kyra/timer.h"
 #include "kyra/util.h"
 
@@ -847,25 +848,15 @@ int EobCoreEngine::clickedCamp(Button *button) {
 	}
 
 	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 14, Screen::CR_NO_P_CHECK);
-	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
 	
-	for (int i = 0; i < 4; i++) {
-		delete _menuStringsPrefsTemp[i];
-		_menuStringsPrefsTemp[i] = new char[strlen(_menuStringsPrefs[i]) + 8];
-	}
-
-	Common::strlcpy(_menuStringsPrefsTemp[0], Common::String::format(_menuStringsPrefs[0], _menuStringsOnOff[_configMusic ? 0 : 1]).c_str(), strlen(_menuStringsPrefs[0]) + 8);
-	Common::strlcpy(_menuStringsPrefsTemp[1], Common::String::format(_menuStringsPrefs[1], _menuStringsOnOff[_configSounds ? 0 : 1]).c_str(), strlen(_menuStringsPrefs[1]) + 8);
-	Common::strlcpy(_menuStringsPrefsTemp[2], Common::String::format(_menuStringsPrefs[2], _menuStringsOnOff[_configHpBarGraphs ? 0 : 1]).c_str(), strlen(_menuStringsPrefs[2]) + 8);
-	Common::strlcpy(_menuStringsPrefsTemp[3], Common::String::format(_menuStringsPrefs[3], _menuStringsOnOff[_configMouse ? 0 : 1]).c_str(), strlen(_menuStringsPrefs[3]) + 8);
+	_gui->runCampMenu();	
 	
-	_screen->setFont(of);
 	_screen->copyRegion(0, 0, 0, 120, 176, 24, 14, 2, Screen::CR_NO_P_CHECK);
 	_screen->setScreenDim(cd);
 	drawScene(0);
 
-	//for (int i = 0; i < 6; i++)
-	//	cleanupCharacterSpellList(i);
+	for (int i = 0; i < 6; i++)
+		cleanupCharacterSpellList(i);
 
 	_screen->setCurPage(0);
 	const ScreenDim *dm = _screen->getScreenDim(10);
@@ -1447,18 +1438,30 @@ GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 	_redrawButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawButtonCallback);
 	_redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawShadedButtonCallback);
 
+	_menuStringsPrefsTemp = new char*[4];
+	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char*));
+
 	_specialProcessButton = _backupButtonList = 0;
 	_flagsMouseLeft = _flagsMouseRight = _flagsModifier = 0;
 	_backupButtonList = 0;
 	_progress = 0;
 	_prcButtonUnk3 = 1;
 	_cflag = 0xffff;
-
+	
 	_menuLineSpacing = 0;
 	_menuUnk1 = 0;
 	_menuLastInFlags = 0;
 	_menuCur = 0;
 	_menuNumItems = 0;
+	_menuButtons = 0;
+}
+
+GUI_Eob::~GUI_Eob() {
+	if (_menuStringsPrefsTemp) {
+		for (int i = 0; i < 4; i++)
+			delete _menuStringsPrefsTemp[i];
+		delete[] _menuStringsPrefsTemp;
+	}
 }
 
 void GUI_Eob::processButton(Button *button) {
@@ -2028,23 +2031,6 @@ int GUI_Eob::handleMenu(int sd, const char *const *strings, void *b, int32 menuI
 	return result;
 }
 
-void GUI_Eob::initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int unk) {
-	if (menuItemsMask == -1) {
-		_menuNumItems = _screen->getScreenDim(19 + menuId)->h;
-		_menuCur = _screen->getScreenDim(19 + menuId)->unk8;
-		return;
-	}
-
-	_menuNumItems = 0;
-
-	for (int i = 0; i < maxItem; i++) {
-		if (menuItemsMask & (1 << (i + unk)))
-			_menuNumItems++;
-	}
-
-	_menuCur = 0;
-}
-
 int GUI_Eob::getMenuItem(int index, int32 menuItemsMask, int unk) {
 	if (menuItemsMask == -1)
 		return index;
@@ -2074,6 +2060,172 @@ void GUI_Eob::menuFlashSelection(const char *str, int x, int y, int color1, int
 	}
 }
 
+int GUI_Eob::runCampMenu() {
+	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
+	
+	Button *highlightButton = 0;
+	Button *prevHighlightButton = 0;
+	
+	int newMenu = 0;
+	int lastMenu = -1;
+	int e = 0;
+	int menuG = 0;
+	int menuH = 0;
+	_menuButtons = 0;
+
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+		if (newMenu == 2)
+			updateOptionsStrings();
+		
+		if (newMenu != -1) {
+			releaseButtons(_menuButtons);
+
+			_vm->_menuDefs[0].titleStrId = newMenu ? 1 : 56;
+			if (newMenu == 2)
+				_vm->_menuDefs[2].titleStrId = 57;
+			else if (newMenu == 1)
+				_vm->_menuDefs[1].titleStrId = 58;
+			
+			_menuButtons = initMenu(newMenu);
+
+			if (newMenu != lastMenu) {
+				highlightButton = _menuButtons;
+				prevHighlightButton = 0;
+			}
+
+			lastMenu = newMenu;
+			newMenu = -1;
+		}
+		
+		int inputFlag = _vm->checkInput(_menuButtons, false, 0) & 0x80ff;
+		_vm->removeInputTop();
+		
+		if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE])
+			inputFlag = 0x8007;
+		else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
+			inputFlag = 0x8000 + prevHighlightButton->index;
+		}
+
+		Button *clickedButton = _vm->gui_getButton(_menuButtons, inputFlag & 0x7fff);
+
+		if (clickedButton) {
+			drawMenuButton(prevHighlightButton, false, false, true);
+			drawMenuButton(clickedButton, true, true, true);
+			_screen->updateScreen();
+			_vm->_system->delayMillis(80);
+			drawMenuButton(clickedButton, false, true, true);
+			_screen->updateScreen();
+			highlightButton = clickedButton;
+			prevHighlightButton = 0;
+		}
+
+		if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP3] || inputFlag == _vm->_keyMap[Common::KEYCODE_PAGEDOWN] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP1] || inputFlag == _vm->_keyMap[Common::KEYCODE_END]) {
+			highlightButton = _vm->gui_getButton(_menuButtons, _vm->_menuDefs[lastMenu].firstButtonStrId + _vm->_menuDefs[lastMenu].numButtons);
+			inputFlag = _vm->_keyMap[Common::KEYCODE_UP];
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP7] || inputFlag == _vm->_keyMap[Common::KEYCODE_HOME] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP9] || inputFlag == _vm->_keyMap[Common::KEYCODE_PAGEUP]) {
+			highlightButton = _vm->gui_getButton(_menuButtons, _vm->_menuDefs[lastMenu].firstButtonStrId + 1);
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP8] || inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP2] || inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN]) {
+			if (prevHighlightButton) {
+				int dir = (inputFlag == _vm->_keyMap[Common::KEYCODE_UP]) ? -1 : 1;
+				int s = prevHighlightButton->index + dir;
+				int a = _vm->_menuDefs[lastMenu].firstButtonStrId + 1;
+				int b = a + _vm->_menuDefs[lastMenu].numButtons - 1;
+
+				do {
+					if (s < a)
+						s = b;
+					if (s > b)
+						s = a;
+					if (_vm->_menuButtonDefs[s - 1].flags & 2)
+						break;
+					s += dir;
+				} while(!_vm->shouldQuit());
+
+				highlightButton = _vm->gui_getButton(_menuButtons, s);
+			}
+			
+		} else if (inputFlag > 0x8001 && inputFlag < 0x8010) {
+			switch (inputFlag) {
+			case 0x8001:
+				break;
+			case 0x8002:
+				break;
+			case 0x8003:
+				break;
+			case 0x8004:
+				break;
+			case 0x8005:
+				newMenu = 2;
+				break;
+			case 0x8006:
+				newMenu = 1;
+				break;
+			case 0x8007:
+				if (menuH)
+					displayTextBox(44);
+				// fall through
+			case 0x800c:
+			case 0x800f:
+				if (lastMenu == 1 || lastMenu == 2)
+					newMenu = 0;
+				else if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE])
+					newMenu = 0;
+				else
+					runLoop = false;
+				break;
+			case 0x8008:
+				break;
+			case 0x8009:
+				break;
+			case 0x800a:
+				break;
+			case 0x800b:
+				break;
+			case 0x800d:
+				break;
+			case 0x800e:
+				break;
+			default:
+				break;
+			}
+			
+		} else {
+			Common::Point p = _vm->getMousePos();
+			for (Button *b = _menuButtons; b; b = b->nextButton) {
+				if ((b->arg & 2) && _vm->posWithinRect(p.x, p.y, b->x, b->y, b->x + b->width, b->y + b->height))
+					highlightButton = b;
+			}
+		}
+		
+		if (menuG || e) {
+			for (int i = 0; i < 6; i++) {
+				_vm->gui_drawCharPortraitWithStats(i);
+				_vm->cleanupCharacterSpellList(i);
+			}
+		}
+
+		menuG = e = 0;
+
+		if (prevHighlightButton != highlightButton && newMenu == -1 && runLoop) {
+			drawMenuButton(prevHighlightButton, false, false, true);
+			drawMenuButton(highlightButton, false, true, true);
+			_screen->updateScreen();
+			prevHighlightButton = highlightButton;
+		}
+	}
+
+	releaseButtons(_menuButtons);
+	_menuButtons = 0;
+	
+	_screen->setFont(of);
+
+	return 0;
+}
+
+int GUI_Eob::runLoadMenu(int x, int y) {
+	return 0;
+}
+
 int GUI_Eob::getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor) {
 	uint8 cursorState = 1;
 	char sufx[] = " ";
@@ -2192,6 +2344,185 @@ int GUI_Eob::getTextInput(char *dest, int x, int y, int destMaxLen, int textColo
 	return _keyPressed.keycode == Common::KEYCODE_ESCAPE ? -1 : len;
 }
 
+void GUI_Eob::initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int unk) {
+	if (menuItemsMask == -1) {
+		_menuNumItems = _screen->getScreenDim(19 + menuId)->h;
+		_menuCur = _screen->getScreenDim(19 + menuId)->unk8;
+		return;
+	}
+
+	_menuNumItems = 0;
+
+	for (int i = 0; i < maxItem; i++) {
+		if (menuItemsMask & (1 << (i + unk)))
+			_menuNumItems++;
+	}
+
+	_menuCur = 0;
+}
+
+Button *GUI_Eob::initMenu(int id) {
+	_screen->setCurPage(2);
+
+	EobMenuDef *m = &_vm->_menuDefs[id];
+
+	if (m->dim) {
+		const ScreenDim *dm = _screen->getScreenDim(m->dim);
+		_screen->fillRect(dm->sx << 3, dm->sy, ((dm->sx + dm->w) << 3) - 1, (dm->sy + dm->h) - 1, _vm->_bkgColor_1);
+		_screen->setScreenDim(m->dim);
+		drawMenuButtonBox(dm->sx << 3, dm->sy, dm->w << 3, dm->h, false, false);		
+	}
+
+	_screen->printShadedText(getMenuString(m->titleStrId), 5, 5, m->titleCol, 0);
+
+	Button *buttons = 0;
+	for (int i = 0; i < m->numButtons; i++) {
+		const EobMenuButtonDef *df = &_vm->_menuButtonDefs[m->firstButtonStrId + i];
+		Button *b = new Button;
+		b->index = m->firstButtonStrId + i + 1;		
+		b->data0Val2 = 12;
+		b->data1Val2 = b->data2Val2 = 15;
+		b->data3Val2 = 8;
+		b->flags = 0x1100;
+		b->keyCode = df->keyCode;
+		b->keyCode2 = df->keyCode | 0x100;
+		b->x = df->x;
+		b->y = df->y;
+		b->width = df->width;
+		b->height = df->height;
+		b->extButtonDef = df;
+		b->arg = df->flags;
+
+		drawMenuButton(b, false, false, false);
+		buttons = linkButton(buttons, b);
+	}
+
+	_screen->copyRegion(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, 2, 0, Screen::CR_NO_P_CHECK);
+	_vm->gui_notifyButtonListChanged();
+	_screen->setCurPage(0);
+	_screen->updateScreen();
+
+	return buttons;
+}
+
+void GUI_Eob::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFill) {
+	if (!b)
+		return;
+	
+	EobMenuButtonDef *d = (EobMenuButtonDef*)b->extButtonDef;
+
+	if (d->flags & 1)
+		drawMenuButtonBox(b->x, b->y, b->width, b->height, clicked, noFill);
+
+	if (d->labelId) {
+		const char *s = getMenuString(d->labelId);
+		
+		int xOffs = 4;
+		int yOffs = 3;
+
+		if (d->flags & 4) {
+			xOffs = ((b->width - (strlen(s) << 3)) >> 1) + 1;
+			yOffs = (b->height - 7) >> 1;
+		}
+
+		if (noFill || clicked)
+			_screen->printText(s, b->x + xOffs, b->y + yOffs, highlight ? 6 : 15, 0);
+		else
+			_screen->printShadedText(s, b->x + xOffs, b->y + yOffs, highlight ? 6 : 15, 0);
+	}
+}
+
+void GUI_Eob::drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool noFill) {
+	uint8 col1 = _vm->_color1_1;
+	uint8 col2 = _vm->_color2_1;
+	
+	if (clicked)
+		col1 = col2 = _vm->_bkgColor_1;
+
+	_vm->gui_drawBox(x, y, w, h, col1, col2, -1);
+	_vm->gui_drawBox(x + 1, y + 1, w - 2, h - 2, _vm->_color1_1, _vm->_color2_1, noFill ? -1 : _vm->_bkgColor_1);
+}
+
+void GUI_Eob::displayTextBox(int id) {
+
+}
+
+void GUI_Eob::updateOptionsStrings() {
+	for (int i = 0; i < 4; i++) {
+		delete _menuStringsPrefsTemp[i];
+		_menuStringsPrefsTemp[i] = new char[strlen(_vm->_menuStringsPrefs[i]) + 8];
+	}
+
+	Common::strlcpy(_menuStringsPrefsTemp[0], Common::String::format(_vm->_menuStringsPrefs[0], _vm->_menuStringsOnOff[_vm->_configMusic ? 0 : 1]).c_str(), strlen(_vm->_menuStringsPrefs[0]) + 8);
+	Common::strlcpy(_menuStringsPrefsTemp[1], Common::String::format(_vm->_menuStringsPrefs[1], _vm->_menuStringsOnOff[_vm->_configSounds ? 0 : 1]).c_str(), strlen(_vm->_menuStringsPrefs[1]) + 8);
+	Common::strlcpy(_menuStringsPrefsTemp[2], Common::String::format(_vm->_menuStringsPrefs[2], _vm->_menuStringsOnOff[_vm->_configHpBarGraphs ? 0 : 1]).c_str(), strlen(_vm->_menuStringsPrefs[2]) + 8);
+	Common::strlcpy(_menuStringsPrefsTemp[3], Common::String::format(_vm->_menuStringsPrefs[3], _vm->_menuStringsOnOff[_vm->_configMouse ? 0 : 1]).c_str(), strlen(_vm->_menuStringsPrefs[3]) + 8);
+}
+
+const char *GUI_Eob::getMenuString(int id) {
+	if (id >= 69)
+		return _vm->_menuStringsTransfer[id - 69];
+	else if (id >= 67)
+		return _vm->_menuStringsDefeat[id - 67];
+	else if (id >= 63)
+		return _vm->_menuStringsSpec[id - 63];
+	else if (id >= 60)
+		return _vm->_menuStringsSpellNo[id - 60];
+	else if (id == 59)
+		return _vm->_menuStringsPoison[0];
+	else if (id >= 56)
+		return _vm->_menuStringsHead[id - 56];
+	else if (id >= 53)
+		return _vm->_menuStringsDrop2[id - 53];
+	else if (id >= 48)
+		return _vm->_menuStringsScribe[id - 48];
+	else if (id == 47)
+		_vm->_menuStringsStarve[0];
+	else if (id == 46)
+		_vm->_menuStringsExit[0];
+	else if (id == 45)
+		_vm->_menuStringsDrop[0];
+	else if (id >= 40)
+		return _vm->_menuStringsRest[id - 40];
+	else if (id >= 23)
+		return _vm->_menuStringsSpells[id - 23];
+	else if (id >= 21)
+		return _vm->_menuStringsOnOff[id - 21];
+	else if (id >= 17)
+		return _menuStringsPrefsTemp[id - 17];
+	else if (id >= 9)
+		return _vm->_menuStringsSaveLoad[id - 9];
+	else if (id >= 1)
+		return _vm->_menuStringsMain[id - 1];
+	return 0;
+}
+
+Button *GUI_Eob::linkButton(Button *list, Button *newbt) {
+	if (!list) {
+		list = newbt;
+		return list;
+	}
+
+	if (!newbt)
+		return list;
+
+	Button *resList = list;
+	while (list->nextButton)
+		list = list->nextButton;
+	list->nextButton = newbt;
+	newbt->nextButton = 0;
+
+	return resList;
+}
+
+void GUI_Eob::releaseButtons(Button *list) {
+	while (list) {
+		Button *n = list->nextButton;
+		delete list;
+		list = n;
+	}
+}
+
 #endif // ENABLE_EOB
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index 2ad69e700a..3eddee553b 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -39,6 +39,7 @@ class GUI_Eob : public GUI {
 	friend class CharacterGenerator;
 public:
 	GUI_Eob(EobCoreEngine *vm);
+	virtual ~GUI_Eob();
 
 	void initStaticData() {}
 
@@ -49,15 +50,17 @@ public:
 	int redrawShadedButtonCallback(Button *button) { return 0; }
 	int redrawButtonCallback(Button *button) { return 0; }
 
-	// general menu handling (main menu, character generation, ingame menus, etc.)
+	// Non button based menu handling (main menu, character generation)
 	void setupMenu(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int unk, int lineSpacing);
-	int handleMenu(int sd, const char *const *strings, void *b, int32 menuItemsMask, int unk);
+	int handleMenu(int sd, const char *const *strings, void *b, int32 menuItemsMask, int unk);	
 	int getMenuItem(int index, int32 menuItemsMask, int unk);
 	void menuFlashSelection(const char *str, int x, int y, int color1, int color2, int color3);
 
-	int getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor);
+	// Button based menus (camp menu, options, save/load)
+	int runCampMenu();
+	int runLoadMenu(int x, int y);
 
-	// int runMenu(Menu &menu);
+	int getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor);
 
 	// utilities for thumbnail creation
 	void createScreenThumbnail(Graphics::Surface &dst) {}
@@ -73,7 +76,17 @@ private:
 
 	//int getMenuCenterStringX(const char *str, int x1, int x2);
 
-	int getInput();
+	//int getInput();
+	Button *initMenu(int id);
+	
+	void drawMenuButton(Button *b, bool clicked, bool highlight, bool noFill);
+	void drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool noFill);
+	void displayTextBox(int id);
+	void updateOptionsStrings();
+	const char *getMenuString(int id);
+
+	Button *linkButton(Button *list, Button *newbt);
+	void releaseButtons(Button *list);
 
 	Button *getButtonListData() { return _menuButtons; }
 	Button *getScrollUpButton() { return &_scrollUpButton; }
@@ -89,7 +102,8 @@ private:
 	const char *getMenuItemTitle(const MenuItem &menuItem) { return 0; }
 	const char *getMenuItemLabel(const MenuItem &menuItem) { return 0; }
 
-	Button _menuButtons[10];
+	//Button _menuButtons[10];
+	Button *_menuButtons;
 	Button _scrollUpButton;
 	Button _scrollDownButton;
 	//Menu _mainMenu, _gameOptions, _audioOptions, _choiceMenu, _loadMenu, _saveMenu, _deleteMenu, _savenameMenu, _deathMenu;
@@ -97,6 +111,8 @@ private:
 	//int _menuResult;
 	//char *_saveDescription;
 
+	char **_menuStringsPrefsTemp;
+
 	EobCoreEngine *_vm;
 	Screen_Eob *_screen;
 
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 2c83c26b83..8b6de927bf 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -415,6 +415,10 @@ void EobCoreEngine::setSpellEventTimer(int spell, int timerBaseFactor, int timer
 	setCharEventTimer(_activeSpellCaster, countdown, -spell, updateExistingTimer);
 }
 
+void EobCoreEngine::cleanupCharacterSpellList(int charIndex) {
+
+}
+
 bool EobCoreEngine::magicObjectHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level) {
 	int ignoreAttackerId = fo->flags & 0x10;
 	int singleTargetCheckAdjacent = fo->flags & 1;
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index f6b0eafcf4..d3c2187177 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -91,8 +91,9 @@ const ScreenDim *Screen_Eob::getScreenDim(int dim) {
 }
 
 void Screen_Eob::modifyScreenDim(int dim, int x, int y, int w, int h) {
-	delete _customDimTable[dim];
-	_customDimTable[dim] = new ScreenDim;
+	if (!_customDimTable[dim])
+		_customDimTable[dim] = new ScreenDim;
+
 	memcpy(_customDimTable[dim], &_screenDimTable[dim], sizeof(ScreenDim));
 	_customDimTable[dim]->sx = x;
 	_customDimTable[dim]->sy = y;
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index 40656c575a..ef3a623e83 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -80,7 +80,9 @@ EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _v
 	_commandMin(engine->game() == GI_EOB1 ? -27 : -31) {
 
 #define Opcode(x) _opcodes.push_back(new InfProc(this, &EobInfProcessor::x))
-#define OpcodeAlt(x, y) if (_vm->game() == GI_EOB1) Opcode(x); else Opcode(y);
+//#define OpcodeAltV(x, y) if (_vm->game() == GI_EOB1) Opcode(x); else Opcode(y);
+//#define OpcodeAlt(x) OpcodeAltV(x##_v1, x##_v2)
+#define OpcodeAlt(x) if (_vm->game() == GI_EOB1) Opcode(x##_v1); else Opcode(x##_v2);
 	Opcode(oeob_setWallType);
 	Opcode(oeob_toggleWallState);
 	Opcode(oeob_openDoor);
@@ -88,7 +90,7 @@ EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _v
 	Opcode(oeob_replaceMonster);
 	Opcode(oeob_movePartyOrObject);
 	Opcode(oeob_moveInventoryItemToBlock);
-	OpcodeAlt(oeob_printMessage_v1, oeob_printMessage_v2);
+	OpcodeAlt(oeob_printMessage);
 	Opcode(oeob_setFlags);
 	Opcode(oeob_playSoundEffect);
 	Opcode(oeob_removeFlags);
@@ -98,11 +100,11 @@ EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _v
 	Opcode(oeob_end);
 	Opcode(oeob_popPosAndReturn);
 	Opcode(oeob_pushPosAndJump);
-	OpcodeAlt(oeob_eval_v1, oeob_eval_v2);
+	OpcodeAlt(oeob_eval);
 	Opcode(oeob_deleteItem);
 	Opcode(oeob_loadNewLevelOrMonsters);
 	Opcode(oeob_increasePartyExperience);
-	OpcodeAlt(oeob_createItem_v1, oeob_createItem_v2);
+	OpcodeAlt(oeob_createItem);
 	Opcode(oeob_launchObject);
 	Opcode(oeob_changeDirection);
 	Opcode(oeob_identifyItems);
@@ -112,6 +114,7 @@ EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _v
 	Opcode(oeob_dialogue);
 	Opcode(oeob_specialEvent);
 #undef Opcode
+//#undef OpcodeAltV
 #undef OpcodeAlt
 
 	_scriptData = 0;
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index da4e6752b0..bf06ba66bd 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -610,6 +610,64 @@ void EobCoreEngine::initButtonData() {
 	_buttonDefs = buttonDefs;
 }
 
+void EobCoreEngine::initMenus() {
+	static const EobMenuButtonDef buttonDefs[] = {
+		{  2,   12,  20, 158,  14,  20,  3  },
+		{  3,   12,  37, 158,  14,  52,  3  },
+		{  4,   12,  54, 158,  14,  26,  3  },
+		{  5,   12,  71, 158,  14,  32,  3  },
+		{  6,   12,  88, 158,  14,   0,  3  },
+		{  7,   12, 105, 158,  14,  35,  3  },
+		{  8,  128, 122,  40,  14,  19,  7  },
+		{  9,   12,  20, 158,  14,  39,  3  },
+		{  10,  12,  37, 158,  14,  32,  3  },
+		{  11,  12,  54, 158,  14,  33,  3  },
+		{  12,  12,  71, 158,  14,  17,  3  },
+		{  8,  128, 122,  40,  14,  19,  7  },
+		{  18,  12,  20, 158,  14,  32,  3  },
+		{  19,  12,  37, 158,  14,  50,  3  },
+		{  8,  128, 122,  40,  14,  19,  7  },
+		{  8,  128, 122,  40,  14,  19,  5  },
+		{  0,  184,   0,  64,  48, 112,  0  },
+		{  0,  256,   0,  64,  48, 113,  0  },
+		{  0,  184,  56,  64,  48, 114,  0  },
+		{  0,  256,  56,  64,  48, 115,  0  },
+		{  0,  184, 112,  64,  48, 116,  0  },
+		{  0,  256, 112,  64,  48, 117,  0  },
+		{  36,   8, 126,  48,  14,  48,  5  },
+		{  8,  128, 126,  40,  14,  19,  5  },
+		{  0,    0,  50, 168,  72,  61,  0  },
+		{  31,  11,  16,  20,  18,   2,  5  },
+		{  32,  38,  16,  20,  18,   3,  5  },
+		{  33,  65,  16,  20,  18,   4,  5  },
+		{  34,  92,  16,  20,  18,   5,  5  },
+		{  35, 119,  16,  20,  18,   6,  5  },
+		{  60, 146,  16,  20,  18,   7,  5  },
+		{  61, 150,  16,  20,  18,   8,  5  },
+		{  38,  16,  57,  32,  14,  22,  7  },
+		{  39, 128,  57,  32,  14,  51,  7  },
+		{  8,  128, 126,  40,  14,  19,  7  },
+		{  0,    0,  50, 168,  72,  61,  0  }
+	};
+
+	_menuButtonDefs = buttonDefs;
+
+	static const EobMenuDef menuDefs[] = {
+		{  1, 10,  0, 7,  9 },
+		{  1, 10,  7, 5,  9 },
+		{  1, 10, 12, 3,  9 },
+		{  0, 10, 15, 7, 15 },
+		{ 37, 10, 22, 9,  9 },
+		{  0, 11, 32, 2, 15 },
+		{ 48, 10, 34, 2,  9 }
+	};
+
+	delete[] _menuDefs;
+	_menuDefs = new EobMenuDef[ARRAYSIZE(menuDefs)];
+	memcpy(_menuDefs, menuDefs, sizeof(menuDefs));
+}
+
+
 void EobCoreEngine::initSpells() {
 #define mpn magicTimingParaAssign.push_back(0);
 #define mp1n if (_flags.gameID == GI_EOB1) magicTimingParaAssign.push_back(0);
-- 
cgit v1.2.3


From 97e5036bf0022f1b5e2ce5a9fe3a11d5f3216b50 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Thu, 23 Jun 2011 22:42:12 +0200
Subject: KYRA: (EOB) - more work on ingame menus

---
 engines/kyra/chargen.cpp        | 102 +++------
 engines/kyra/eobcommon.cpp      | 100 +++++++--
 engines/kyra/eobcommon.h        |  31 +--
 engines/kyra/gui.cpp            |  40 ++--
 engines/kyra/gui.h              |   6 +-
 engines/kyra/gui_eob.cpp        | 447 +++++++++++++++++++++++++++++++++++-----
 engines/kyra/gui_eob.h          |  92 +++++----
 engines/kyra/gui_lok.cpp        |   2 +-
 engines/kyra/gui_lok.h          |   2 +-
 engines/kyra/gui_lol.cpp        |   6 +-
 engines/kyra/gui_lol.h          |   2 +-
 engines/kyra/gui_v2.cpp         |   4 +-
 engines/kyra/gui_v2.h           |   2 +-
 engines/kyra/kyra_hof.h         |   2 +-
 engines/kyra/kyra_lok.h         |   2 +-
 engines/kyra/kyra_mr.h          |   2 +-
 engines/kyra/kyra_v1.cpp        |   2 +-
 engines/kyra/kyra_v1.h          |   6 +-
 engines/kyra/lol.cpp            |   2 +-
 engines/kyra/lol.h              |   2 +-
 engines/kyra/loleobbase.h       |   2 +-
 engines/kyra/resource.h         |   2 +
 engines/kyra/script_eob.cpp     |  10 +-
 engines/kyra/script_eob.h       |   5 +-
 engines/kyra/sequences_eob1.cpp |   4 +-
 engines/kyra/sequences_eob2.cpp |   4 +-
 engines/kyra/staticres_eob.cpp  |   4 +-
 27 files changed, 637 insertions(+), 248 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 03ab45363f..380cc12a62 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -42,7 +42,6 @@ private:
 	void checkForCompleteParty();
 	void toggleSpecialButton(int index, int bodyCustom, int pageNum);
 	void processSpecialButton(int index);
-	void highlightBoxFrame(int index);
 	int viewDeleteCharacter();
 	void createPartyMember();
 	int raceSexMenu();
@@ -67,11 +66,8 @@ private:
 	uint8 **_chargenButtonLabels;
 	int _activeBox;
 	int _magicShapesBox;
-	int _updateBoxIndex;
-	int _updateBoxColorIndex;
 	int _updateBoxShapesIndex;
 	int _lastUpdateBoxShapesIndex;
-	uint32 _chargenBoxTimer;
 	uint32 _chargenMagicShapeTimer;
 	int8 _chargenSelectedPortraits[4];
 	int8 _chargenSelectedPortraits2[4];
@@ -95,7 +91,6 @@ private:
 	static const EobChargenButtonDef _chargenButtonDefs[];
 	static const CreatePartyModButton _chargenModButtons[];
 	static const EobRect8 _chargenButtonBodyCoords[];
-	static const EobRect16 _chargenPortraitBoxFrames[];
 	static const int16 _chargenBoxX[];
 	static const int16 _chargenBoxY[];
 	static const int16 _chargenNameFieldX[];
@@ -118,9 +113,8 @@ bool EobCoreEngine::startCharacterGeneration() {
 }
 
 CharacterGenerator::CharacterGenerator(EobCoreEngine *vm, Screen_Eob *screen) : _vm(vm), _screen(screen),
-	_characters(0), _faceShapes(0), _chargenMagicShapes(0), _chargenButtonLabels(0), _updateBoxIndex(-1),
-	_chargenBoxTimer(0), _chargenMagicShapeTimer(0), _updateBoxColorIndex(0), _updateBoxShapesIndex(0),
-	_lastUpdateBoxShapesIndex(0), _magicShapesBox(6), _activeBox(0) {
+	_characters(0), _faceShapes(0), _chargenMagicShapes(0), _chargenButtonLabels(0), _chargenMagicShapeTimer(0),
+	_updateBoxShapesIndex(0), _lastUpdateBoxShapesIndex(0), _magicShapesBox(6), _activeBox(0) {
 
 	_chargenStatStrings = _vm->_chargenStatStrings;
 	_chargenRaceSexStrings = _vm->_chargenRaceSexStrings;
@@ -178,7 +172,7 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 	_activeBox = 0;
 
 	for (bool loop = true; loop && (!_vm->shouldQuit()); ) {
-		highlightBoxFrame(_activeBox + 6);
+		_vm->_gui->highLightBoxFrame(_activeBox + 6);
 		_vm->sound()->process();
 		int inputFlag = _vm->checkInput(_vm->_activeButtons, false, 0);
 		_vm->removeInputTop();
@@ -193,7 +187,7 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 				_vm->sound()->haltTrack();
 				return false;
 			}
-			highlightBoxFrame(-1);
+			_vm->_gui->highLightBoxFrame(-1);
 		}
 
 		if (inputFlag & 0x8000) {
@@ -207,7 +201,7 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 		}
 
 		if (inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP5]) {
-			highlightBoxFrame(-1);
+			_vm->_gui->highLightBoxFrame(-1);
 			if (_characters[_activeBox].name[0]) {
 				int b = _activeBox;
 				if (viewDeleteCharacter())
@@ -381,50 +375,16 @@ void CharacterGenerator::processSpecialButton(int index) {
 	toggleSpecialButton(index, 0, 0);
 }
 
-void CharacterGenerator::highlightBoxFrame(int index) {
-	static const uint8 colorTable[] = { 0x0F, 0xB0, 0xB2, 0xB4, 0xB6,
-		0xB8, 0xBA, 0xBC, 0x0C, 0xBC, 0xBA, 0xB8, 0xB6, 0xB4, 0xB2, 0xB0, 0x00
-	};
-
-	if (_updateBoxIndex == index) {
-		if (_updateBoxIndex == -1)
-			return;
-
-		if (_vm->_system->getMillis() <= _chargenBoxTimer)
-			return;
-
-		if (!colorTable[_updateBoxColorIndex])
-			_updateBoxColorIndex = 0;
-
-		const EobRect16 *r = &_chargenPortraitBoxFrames[_updateBoxIndex];
-		_screen->drawBox(r->x1, r->y1, r->x2, r->y2, colorTable[_updateBoxColorIndex++]);
-		_screen->updateScreen();
-
-		_chargenBoxTimer = _vm->_system->getMillis() + _vm->_tickLength;
-
-	} else {
-		if (_updateBoxIndex != -1) {
-			const EobRect16 *r = &_chargenPortraitBoxFrames[_updateBoxIndex];
-			_screen->drawBox(r->x1, r->y1, r->x2, r->y2, 12);
-			_screen->updateScreen();
-		}
-
-		_updateBoxColorIndex = 0;
-		_updateBoxIndex = index;
-		_chargenBoxTimer = _vm->_system->getMillis();
-	}
-}
-
 int CharacterGenerator::viewDeleteCharacter() {
 	initButtonsFromList(0, 7);
 	_vm->removeInputTop();
 
-	highlightBoxFrame(-1);
+	_vm->_gui->highLightBoxFrame(-1);
 	printStats(_activeBox, 2);
 
 	int res = 0;
 	for (bool loop = true; loop && _characters[_activeBox].name[0] && !_vm->shouldQuit(); ) {
-		highlightBoxFrame(_activeBox + 6);
+		_vm->_gui->highLightBoxFrame(_activeBox + 6);
 		_vm->sound()->process();
 
 		int inputFlag = _vm->checkInput(_vm->_activeButtons, false, 0);
@@ -463,14 +423,14 @@ int CharacterGenerator::viewDeleteCharacter() {
 		}
 
 		if (loop == false)
-			highlightBoxFrame(-1);
+			_vm->_gui->highLightBoxFrame(-1);
 
 		if (!_characters[cbx].name[0])
 			loop = false;
 
 		if (cbx != _activeBox) {
 			_activeBox = cbx;
-			highlightBoxFrame(-1);
+			_vm->_gui->highLightBoxFrame(-1);
 			if (loop)
 				printStats(_activeBox, 2);
 		}
@@ -480,8 +440,8 @@ int CharacterGenerator::viewDeleteCharacter() {
 }
 
 void CharacterGenerator::createPartyMember() {
-	_screen->setScreenDim(2);
-	_chargenBoxTimer = 0;
+	_screen->setScreenDim(2);	
+	assert(_vm->_gui);
 
 	for (int i = 0; i != 3 && !_vm->shouldQuit(); i++) {
 		bool bck = false;
@@ -528,11 +488,11 @@ int CharacterGenerator::raceSexMenu() {
 	_screen->printShadedText(_chargenStrings2[8], 147, 67, 9, 0);
 	_vm->removeInputTop();
 
-	_vm->_gui->setupMenu(1, 0, _chargenRaceSexStrings, -1, 0, 0);
+	_vm->_gui->simpleMenu_setup(1, 0, _chargenRaceSexStrings, -1, 0, 0);
 	int16 res = -1;
 
 	while (res == -1 && !_vm->shouldQuit()) {
-		res = _vm->_gui->handleMenu(1, _chargenRaceSexStrings, 0, -1, 0);
+		res = _vm->_gui->simpleMenu_process(1, _chargenRaceSexStrings, 0, -1, 0);
 		updateMagicShapes();
 	}
 
@@ -557,7 +517,7 @@ int CharacterGenerator::classMenu(int raceSex) {
 	toggleSpecialButton(5, 0, 0);
 
 	itemsMask &=_classMenuMasks[raceSex / 2];
-	_vm->_gui->setupMenu(2, 15, _chargenClassStrings, itemsMask, 0, 0);
+	_vm->_gui->simpleMenu_setup(2, 15, _chargenClassStrings, itemsMask, 0, 0);
 
 	_vm->_mouseX = _vm->_mouseY = 0;
 	int16 res = -1;
@@ -576,7 +536,7 @@ int CharacterGenerator::classMenu(int raceSex) {
 			else
 				_vm->removeInputTop();
 		} else {
-			res = _vm->_gui->handleMenu(2, _chargenClassStrings, 0, itemsMask, 0);
+			res = _vm->_gui->simpleMenu_process(2, _chargenClassStrings, 0, itemsMask, 0);
 		}
 	}
 
@@ -606,7 +566,7 @@ int CharacterGenerator::alignmentMenu(int cClass) {
 	toggleSpecialButton(5, 0, 0);
 
 	itemsMask &=_alignmentMenuMasks[cClass];
-	_vm->_gui->setupMenu(3, 9, _chargenAlignmentStrings, itemsMask, 0, 0);
+	_vm->_gui->simpleMenu_setup(3, 9, _chargenAlignmentStrings, itemsMask, 0, 0);
 
 	_vm->_mouseX = _vm->_mouseY = 0;
 	int16 res = -1;
@@ -625,7 +585,7 @@ int CharacterGenerator::alignmentMenu(int cClass) {
 			else
 				_vm->removeInputTop();
 		} else {
-			res = _vm->_gui->handleMenu(3, _chargenAlignmentStrings, 0, itemsMask, 0);
+			res = _vm->_gui->simpleMenu_process(3, _chargenAlignmentStrings, 0, itemsMask, 0);
 		}
 	}
 
@@ -793,8 +753,8 @@ void CharacterGenerator::statsAndFacesMenu() {
 		}
 	}
 
-	highlightBoxFrame(6 + _activeBox);
-	highlightBoxFrame(-1);
+	_vm->_gui->highLightBoxFrame(6 + _activeBox);
+	_vm->_gui->highLightBoxFrame(-1);
 }
 
 void CharacterGenerator::faceSelectMenu() {
@@ -809,7 +769,7 @@ void CharacterGenerator::faceSelectMenu() {
 	printStats(_activeBox, 4);
 	toggleSpecialButton(12, 0, 0);
 	toggleSpecialButton(13, 0, 0);
-	highlightBoxFrame(-1);
+	_vm->_gui->highLightBoxFrame(-1);
 
 	shp = getNextFreeFaceShape(shp, charSex, 1, _chargenSelectedPortraits);
 
@@ -833,7 +793,7 @@ void CharacterGenerator::faceSelectMenu() {
 			in = _vm->checkInput(_vm->_activeButtons, false, 0);
 			_vm->removeInputTop();
 
-			highlightBoxFrame(box + 10);
+			_vm->_gui->highLightBoxFrame(box + 10);
 
 			if (in == 0x8002 || in == _vm->_keyMap[Common::KEYCODE_RIGHT]) {
 				processSpecialButton(13);
@@ -853,7 +813,7 @@ void CharacterGenerator::faceSelectMenu() {
 			}
 		}
 
-		highlightBoxFrame(-1);
+		_vm->_gui->highLightBoxFrame(-1);
 
 		if (in == 1)
 			shp = getNextFreeFaceShape(shp - 1, charSex, -1, _chargenSelectedPortraits);
@@ -864,7 +824,7 @@ void CharacterGenerator::faceSelectMenu() {
 	}
 
 	if (!_vm->shouldQuit()) {
-		highlightBoxFrame(-1);
+		_vm->_gui->highLightBoxFrame(-1);
 		updateMagicShapes();
 
 		_chargenSelectedPortraits[_activeBox] = sp[res];
@@ -899,7 +859,7 @@ int CharacterGenerator::getNextFreeFaceShape(int shpIndex, int charSex, int step
 }
 
 void CharacterGenerator::processFaceMenuSelection(int index) {
-	highlightBoxFrame(-1);
+	_vm->_gui->highLightBoxFrame(-1);
 	if (index <= 48)
 		_screen->drawShape(0, _characters[_activeBox].faceShape, _chargenBoxX[_activeBox], _chargenBoxY[_activeBox] + 1, 0);
 	else
@@ -1127,15 +1087,15 @@ int CharacterGenerator::getMaxHp(int cclass, int constitution, int level1, int l
 	int res = 0;
 	constitution = _vm->getClassAndConstHitpointsModifier(cclass, constitution);
 
-	int m = _vm->getClassHpIncreaseType(cclass, 0);
+	int m = _vm->getCharacterClassType(cclass, 0);
 	if (m != -1)
 		res = _vm->getModifiedHpLimits(m, constitution, level1, false);
 
-	m = _vm->getClassHpIncreaseType(cclass, 1);
+	m = _vm->getCharacterClassType(cclass, 1);
 	if (m != -1)
 		res += _vm->getModifiedHpLimits(m, constitution, level2, false);
 
-	m = _vm->getClassHpIncreaseType(cclass, 2);
+	m = _vm->getCharacterClassType(cclass, 2);
 	if (m != -1)
 		res += _vm->getModifiedHpLimits(m, constitution, level3, false);
 
@@ -1148,15 +1108,15 @@ int CharacterGenerator::getMinHp(int cclass, int constitution, int level1, int l
 	int res = 0;
 	constitution = _vm->getClassAndConstHitpointsModifier(cclass, constitution);
 
-	int m = _vm->getClassHpIncreaseType(cclass, 0);
+	int m = _vm->getCharacterClassType(cclass, 0);
 	if (m != -1)
 		res = _vm->getModifiedHpLimits(m, constitution, level1, true);
 
-	m = _vm->getClassHpIncreaseType(cclass, 1);
+	m = _vm->getCharacterClassType(cclass, 1);
 	if (m != -1)
 		res += _vm->getModifiedHpLimits(m, constitution, level2, true);
 
-	m = _vm->getClassHpIncreaseType(cclass, 2);
+	m = _vm->getCharacterClassType(cclass, 2);
 	if (m != -1)
 		res += _vm->getModifiedHpLimits(m, constitution, level3, true);
 
@@ -1443,7 +1403,7 @@ const EobRect8 CharacterGenerator::_chargenButtonBodyCoords[] = {
 	{ 0x14, 0x90, 0x0B, 0x10 }
 };
 
-const EobRect16 CharacterGenerator::_chargenPortraitBoxFrames[] = {
+const EobRect16 GUI_Eob::_highLightBoxFrames[] = {
 	{ 0x00B7, 0x0001, 0x00F7, 0x0034 },
 	{ 0x00FF, 0x0001, 0x013F, 0x0034 },
 	{ 0x00B7, 0x0035, 0x00F7, 0x0068 },
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index d193bc0842..83a57cd66f 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -48,6 +48,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_saveLoadMode = 0;
 	_updateHandItemCursor = false;
 	_configMouse = true;
+	_resting = false;
 
 	_largeItemShapes = _smallItemShapes = _thrownItemShapes = _spellShapes = _firebeamShapes = _itemIconShapes =
 		_wallOfForceShapes = _teleporterShapes = _sparkShapes = _compassShapes = 0;
@@ -257,6 +258,8 @@ Common::Error EobCoreEngine::init() {
 	_screen->loadFont(Screen::FID_6_FNT, "FONT6.FNT");
 	_screen->loadFont(Screen::FID_8_FNT, "FONT8.FNT");
 
+	readSettings();
+
 	Common::Error err = LolEobBaseEngine::init();
 	if (err.getCode() != Common::kNoError)
 		return err;
@@ -365,7 +368,7 @@ Common::Error EobCoreEngine::go() {
 		} else if (action == -2) {
 			// new game
 			repeatLoop = startCharacterGeneration();
-			if (repeatLoop)
+			if (repeatLoop && !shouldQuit())
 				startupNew();
 		} else if (action == -3) {
 			// transfer party
@@ -382,6 +385,34 @@ Common::Error EobCoreEngine::go() {
 	return Common::kNoError;
 }
 
+void EobCoreEngine::registerDefaultSettings() {
+	KyraEngine_v1::registerDefaultSettings();
+	ConfMan.registerDefault("hpbargraphs", true);
+}
+
+void EobCoreEngine::readSettings() {
+	_configHpBarGraphs = ConfMan.getBool("hpbargraphs");
+	_configSounds = ConfMan.getBool("sfx_mute") ? 0 : 1;
+	_configMusic = _configSounds ? 1 : 0;
+
+	if (_sound)
+		_sound->enableSFX(_configSounds);
+}
+
+void EobCoreEngine::writeSettings() {
+	ConfMan.setBool("hpbargraphs", _configHpBarGraphs);
+	ConfMan.setBool("sfx_mute", _configSounds == 0);
+
+	if (_sound) {
+		if (!_configSounds)
+			_sound->beginFadeOut();
+		_sound->enableMusic(_configSounds ? 1 : 0);
+		_sound->enableSFX(_configSounds);
+	}
+
+	ConfMan.flushToDisk();
+}
+
 void EobCoreEngine::startupNew() {
 	gui_setPlayFieldButtons();
 	_screen->_curPage = 0;
@@ -659,7 +690,7 @@ int EobCoreEngine::generateCharacterHitpointsByLevel(int charIndex, int levelInd
 		if (!(levelIndex & (1 << i)))
 			continue;
 
-		int d = getClassHpIncreaseType(c->cClass, i);
+		int d = getCharacterClassType(c->cClass, i);
 
 		if (c->level[i] <= _hpIncrPerLevel[6 + i])
 			h += rollDice(1, (d >= 0) ? _hpIncrPerLevel[d] : 0);
@@ -686,8 +717,8 @@ int EobCoreEngine::getClassAndConstHitpointsModifier(int cclass, int constitutio
 	return 2;
 }
 
-int EobCoreEngine::getClassHpIncreaseType(int cclass, int levelIndex) {
-	return _classHpIncreaseType[cclass * 3 + levelIndex];
+int EobCoreEngine::getCharacterClassType(int cclass, int levelIndex) {
+	return _characterClassType[cclass * 3 + levelIndex];
 }
 
 int EobCoreEngine::getModifiedHpLimits(int hpModifier, int constModifier, int level, bool mode) {
@@ -867,11 +898,11 @@ int EobCoreEngine::getCharacterClericPaladinLevel(int index) {
 	if (index == -1)
 		return (_currentLevel < 7) ? 5 : 9;
 
-	int l = getLevelIndexForHpIncType(2, _characters[index].cClass);
+	int l = getCharacterLevelIndex(2, _characters[index].cClass);
 	if (l > -1)
 		return _characters[index].level[l];
 
-	l = getLevelIndexForHpIncType(4, _characters[index].cClass);
+	l = getCharacterLevelIndex(4, _characters[index].cClass);
 	if (l > -1) {
 		if (_characters[index].level[l] > 8)
 			return _characters[index].level[l] - 8;
@@ -887,18 +918,18 @@ int EobCoreEngine::getCharacterMageLevel(int index) {
 	if (index == -1)
 		return (_currentLevel < 7) ? 5 : 9;
 
-	int l = getLevelIndexForHpIncType(1, _characters[index].cClass);
+	int l = getCharacterLevelIndex(1, _characters[index].cClass);
 	return (l > -1) ? _characters[index].level[l] : 1;
 }
 
-int EobCoreEngine::getLevelIndexForHpIncType(int hpIncType, int cClass) {
-	if (getClassHpIncreaseType(cClass, 0) == hpIncType)
+int EobCoreEngine::getCharacterLevelIndex(int type, int cClass) {
+	if (getCharacterClassType(cClass, 0) == type)
 		return 0;
 
-	if (getClassHpIncreaseType(cClass, 1) == hpIncType)
+	if (getCharacterClassType(cClass, 1) == type)
 		return 1;
 
-	if (getClassHpIncreaseType(cClass, 2) == hpIncType)
+	if (getCharacterClassType(cClass, 2) == type)
 		return 2;
 
 	return -1;
@@ -1020,6 +1051,20 @@ int EobCoreEngine::prepareForNewPartyMember(int16 itemType, int16 itemValue) {
 	return 1;
 }
 
+void EobCoreEngine::dropCharacter(int charIndex) {
+	if (!testCharacter(charIndex, 1))
+		return;
+
+	removeCharacterFromParty(charIndex);
+	
+	if (charIndex < 5)
+		exchangeCharacters(charIndex, testCharacter(5, 1) ? 5 : 4);
+
+	gui_processCharPortraitClick(0);
+	gui_setPlayFieldButtons();
+	setupCharacterTimers();
+}
+
 void EobCoreEngine::removeCharacterFromParty(int charIndex) {
 	EobCharacter *c = &_characters[charIndex];
 	c->flags = 0;
@@ -1043,6 +1088,13 @@ void EobCoreEngine::removeCharacterFromParty(int charIndex) {
 	setupCharacterTimers();
 }
 
+void EobCoreEngine::exchangeCharacters(int charIndex1, int charIndex2) {
+	EobCharacter temp;
+	memcpy(&temp, &_characters[charIndex1], sizeof(EobCharacter));
+	memcpy(&_characters[charIndex1], &_characters[charIndex2], sizeof(EobCharacter));
+	memcpy(&_characters[charIndex2], &temp, sizeof(EobCharacter));
+}
+
 void EobCoreEngine::increasePartyExperience(int16 points) {
 	int cnt = 0;
 	for (int i = 0; i < 6; i++) {
@@ -1067,7 +1119,7 @@ void EobCoreEngine::increaseCharacterExperience(int charIndex, int32 points) {
 	points /= _numLevelsPerClass[cl];
 
 	for (int i = 0; i < 3; i++) {
-		if (getClassHpIncreaseType(cl, i) == -1)
+		if (getCharacterClassType(cl, i) == -1)
 			continue;
 		_characters[charIndex].experience[i] += points;
 
@@ -1081,7 +1133,7 @@ void EobCoreEngine::increaseCharacterExperience(int charIndex, int32 points) {
 }
 
 uint32 EobCoreEngine::getRequiredExperience(int cClass, int levelIndex, int level) {
-	cClass = getClassHpIncreaseType(cClass, levelIndex);
+	cClass = getCharacterClassType(cClass, levelIndex);
 	if (cClass == -1)
 		return 0xffffffff;
 
@@ -1275,6 +1327,28 @@ void EobCoreEngine::displayParchment(int id) {
 	restoreAfterDialogueSequence();
 }
 
+bool EobCoreEngine::restParty() {
+	if (_inf->preventRest()) {
+		assert(_menuStringsRest3[0]);
+		displayRestWarning(_menuStringsRest3[0]);
+		return true;
+	}
+
+	return true;
+}
+
+void EobCoreEngine::displayRestWarning(const char *str) {
+	int od = _screen->curDimIndex();
+	_screen->setScreenDim(7);
+	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
+	_screen->setCurPage(0);
+
+	_txt->printMessage(Common::String::format("\r%s\r", str).c_str());
+
+	_screen->setFont(of);
+	_screen->setScreenDim(od);
+}
+
 void EobCoreEngine::useSlotWeapon(int charIndex, int slotIndex, int item) {
 	EobCharacter *c = &_characters[charIndex];
 	int tp = item ? _items[item].type : 0;
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index a4fb0d7735..ede25dd140 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -55,13 +55,6 @@ struct EobRect8 {
 	uint8 h;
 };
 
-struct EobRect16 {
-	int16 x1;
-	int16 y1;
-	uint16 x2;
-	uint16 y2;
-};
-
 struct EobChargenButtonDef {
 	uint8 x;
 	uint8 y;
@@ -258,7 +251,7 @@ public:
 	virtual ~EobCoreEngine();
 
 	Screen *screen() { return _screen; }
-	GUI *gui() const { return _gui; }
+	GUI_v1 *gui() const { return _gui; }
 
 protected:
 	// Startup
@@ -270,14 +263,18 @@ protected:
 	virtual void seq_playFinale() = 0;
 	bool _playFinale;
 
-	//Init
+	//Init, config
 	void loadItemsAndDecorationsShapes();
 	void releaseItemsAndDecorationsShapes();
 
 	void initButtonData();
 	void initMenus();
 	void initStaticResource();
-	virtual void initSpells();	
+	virtual void initSpells();
+
+	void registerDefaultSettings();
+	void readSettings();
+	void writeSettings();
 
 	const uint8 **_largeItemShapes;
 	const uint8 **_smallItemShapes;
@@ -324,7 +321,7 @@ protected:
 
 	uint8 **_faceShapes;
 
-	static const int8 _classHpIncreaseType[];
+	static const int8 _characterClassType[];
 	static const uint8 _hpIncrPerLevel[];
 	static const uint8 _numLevelsPerClass[];
 	static const int16 _hpConstModifiers[];
@@ -361,7 +358,7 @@ protected:
 	int getDexterityArmorClassModifier(int dexterity);
 	int generateCharacterHitpointsByLevel(int charIndex, int levelIndex);
 	int getClassAndConstHitpointsModifier(int cclass, int constitution);
-	int getClassHpIncreaseType(int cclass, int levelIndex);
+	int getCharacterClassType(int cclass, int levelIndex);
 	int getModifiedHpLimits(int hpModifier, int constModifier, int level, bool mode);
 	Common::String getCharStrength(int str, int strExt);
 	int testCharacter(int index, int flags);
@@ -371,7 +368,7 @@ protected:
 	int validateWeaponSlotItem(int index, int slot);
 	int getCharacterClericPaladinLevel(int index);
 	int getCharacterMageLevel(int index);
-	int getLevelIndexForHpIncType(int unk, int cClass);
+	int getCharacterLevelIndex(int type, int cClass);
 
 	int countCharactersWithSpecificItems(int16 itemType, int16 itemValue);
 	int checkCharacterInventoryForItem(int character, int16 itemType, int16 itemValue);
@@ -382,7 +379,9 @@ protected:
 	void initNpc(int npcIndex);
 	int npcJoinDialogue(int npcIndex, int queryJoinTextId, int confirmJoinTextId, int noJoinTextId);
 	int prepareForNewPartyMember(int16 itemType, int16 itemValue);
+	void dropCharacter(int charIndex);
 	void removeCharacterFromParty(int charIndex);
+	void exchangeCharacters(int charIndex1, int charIndex2);
 
 	void increasePartyExperience(int16 points);
 	void increaseCharacterExperience(int charIndex, int32 points);
@@ -773,6 +772,9 @@ protected:
 	void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false);
 	void displayParchment(int id);
 
+	bool restParty();
+	void displayRestWarning(const char *str);
+
 	virtual void drawLightningColumn() {}
 	virtual int resurrectionSelectDialogue() { return -1; }
 	virtual int charSelectDialogue() { return -1; }
@@ -786,6 +788,7 @@ protected:
 	void releaseMonsterTempData(LevelTempData *tmp);
 
 	int _saveLoadMode;
+	bool _resting;
 
 	Screen_Eob *_screen;
 	GUI_Eob *_gui;
@@ -996,6 +999,8 @@ protected:
 	const char *const *_menuStringsMgc;
 	const char *const *_menuStringsPrefs;
 	const char *const *_menuStringsRest2;
+	const char *const *_menuStringsRest3;
+	const char *const *_menuStringsRest4;
 	const char *const *_menuStringsDefeat;
 
 	const char *const *_menuStringsTransfer;
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index 27f09b645e..3a5d79817e 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -30,15 +30,15 @@
 
 namespace Kyra {
 
-GUI::GUI(KyraEngine_v1 *kyra)
+GUI_v1::GUI_v1(KyraEngine_v1 *kyra)
 	: _vm(kyra), _screen(kyra->screen()), _text(kyra->text()) {
 	_menuButtonList = 0;
 
-	_redrawButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawButtonCallback);
-	_redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawShadedButtonCallback);
+	_redrawButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawButtonCallback);
+	_redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawShadedButtonCallback);
 }
 
-Button *GUI::addButtonToList(Button *list, Button *newButton) {
+Button *GUI_v1::addButtonToList(Button *list, Button *newButton) {
 	if (!newButton)
 		return list;
 
@@ -56,7 +56,7 @@ Button *GUI::addButtonToList(Button *list, Button *newButton) {
 	return list;
 }
 
-void GUI::initMenuLayout(Menu &menu) {
+void GUI_v1::initMenuLayout(Menu &menu) {
 	if (menu.x == -1)
 		menu.x = (320 - menu.width) >> 1;
 	if (menu.y == -1)
@@ -68,7 +68,7 @@ void GUI::initMenuLayout(Menu &menu) {
 	}
 }
 
-void GUI::initMenu(Menu &menu) {
+void GUI_v1::initMenu(Menu &menu) {
 	_menuButtonList = 0;
 
 	_screen->hideMouse();
@@ -197,7 +197,7 @@ void GUI::initMenu(Menu &menu) {
 	_screen->updateScreen();
 }
 
-void GUI::processHighlights(Menu &menu) {
+void GUI_v1::processHighlights(Menu &menu) {
 	int x1, y1, x2, y2;
 	Common::Point p = _vm->getMousePos();
 	int mouseX = p.x;
@@ -242,7 +242,7 @@ void GUI::processHighlights(Menu &menu) {
 	_screen->updateScreen();
 }
 
-void GUI::redrawText(const Menu &menu) {
+void GUI_v1::redrawText(const Menu &menu) {
 	int textX;
 	int i = menu.highlightedItem;
 
@@ -271,7 +271,7 @@ void GUI::redrawText(const Menu &menu) {
 	}
 }
 
-void GUI::redrawHighlight(const Menu &menu) {
+void GUI_v1::redrawHighlight(const Menu &menu) {
 	int textX;
 	int i = menu.highlightedItem;
 
@@ -301,12 +301,12 @@ void GUI::redrawHighlight(const Menu &menu) {
 	}
 }
 
-void GUI::updateAllMenuButtons() {
+void GUI_v1::updateAllMenuButtons() {
 	for (Button *cur = _menuButtonList; cur; cur = cur->nextButton)
 		updateMenuButton(cur);
 }
 
-void GUI::updateMenuButton(Button *button) {
+void GUI_v1::updateMenuButton(Button *button) {
 	if (!_displayMenu)
 		return;
 
@@ -316,7 +316,7 @@ void GUI::updateMenuButton(Button *button) {
 	_screen->showMouse();
 }
 
-void GUI::updateButton(Button *button) {
+void GUI_v1::updateButton(Button *button) {
 	if (!button || (button->flags & 8))
 		return;
 
@@ -337,7 +337,7 @@ void GUI::updateButton(Button *button) {
 	processButton(button);
 }
 
-int GUI::redrawButtonCallback(Button *button) {
+int GUI_v1::redrawButtonCallback(Button *button) {
 	if (!_displayMenu)
 		return 0;
 
@@ -351,7 +351,7 @@ int GUI::redrawButtonCallback(Button *button) {
 	return 0;
 }
 
-int GUI::redrawShadedButtonCallback(Button *button) {
+int GUI_v1::redrawShadedButtonCallback(Button *button) {
 	if (!_displayMenu)
 		return 0;
 
@@ -365,7 +365,7 @@ int GUI::redrawShadedButtonCallback(Button *button) {
 	return 0;
 }
 
-void GUI::updateSaveList(bool excludeQuickSaves) {
+void GUI_v1::updateSaveList(bool excludeQuickSaves) {
 	Common::String pattern = _vm->_targetName + ".???";
 	Common::StringArray saveFileList = _vm->_saveFileMan->listSavefiles(pattern);
 	_saveSlots.clear();
@@ -391,13 +391,13 @@ void GUI::updateSaveList(bool excludeQuickSaves) {
 	sortSaveSlots();
 }
 
-void GUI::sortSaveSlots() {
+void GUI_v1::sortSaveSlots() {
 	Common::sort(_saveSlots.begin(), _saveSlots.end(), Common::Less<int>());
 	if (_saveSlots.size() > 2)
 		Common::sort(_saveSlots.begin()+1, _saveSlots.end(), Common::Greater<int>());
 }
 
-int GUI::getNextSavegameSlot() {
+int GUI_v1::getNextSavegameSlot() {
 	Common::InSaveFile *in;
 
 	int start = _vm->game() == GI_LOL ? 0 : 1;
@@ -412,7 +412,7 @@ int GUI::getNextSavegameSlot() {
 	return 0;
 }
 
-void GUI::checkTextfieldInput() {
+void GUI_v1::checkTextfieldInput() {
 	Common::Event event;
 
 	uint32 now = _vm->_system->getMillis();
@@ -461,11 +461,11 @@ void GUI::checkTextfieldInput() {
 	_vm->_system->delayMillis(3);
 }
 
-void GUI::printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 c2) {
+void GUI_v1::printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 c2) {
 	_text->printText(str, x, y, c0, c1, c2);
 }
 
-int GUI::getMenuCenterStringX(const char *str, int x1, int x2) {
+int GUI_v1::getMenuCenterStringX(const char *str, int x1, int x2) {
 	return _text->getCenterStringX(str, x1, x2);
 }
 
diff --git a/engines/kyra/gui.h b/engines/kyra/gui.h
index ad0e0d630f..597f088c0d 100644
--- a/engines/kyra/gui.h
+++ b/engines/kyra/gui.h
@@ -146,10 +146,10 @@ struct Menu {
 class Screen;
 class TextDisplayer;
 
-class GUI {
+class GUI_v1 {
 public:
-	GUI(KyraEngine_v1 *vm);
-	virtual ~GUI() {}
+	GUI_v1(KyraEngine_v1 *vm);
+	virtual ~GUI_v1() {}
 
 	// button specific
 	virtual Button *addButtonToList(Button *list, Button *newButton);
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 9baed752a3..4d5a1bf438 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -151,7 +151,7 @@ void EobCoreEngine::gui_drawPlayField(int pageNum) {
 	int cp = _screen->setCurPage(2);
 	gui_drawCompass(true);
 
-	if (pageNum && !_sceneDrawPage1)
+	if (pageNum && !_sceneDrawPage2)
 		drawScene(0);
 
 	_screen->setCurPage(cp);
@@ -280,7 +280,7 @@ void EobCoreEngine::gui_drawCharPortraitWithStats(int index) {
 			_screen->printText(Common::String::format("%d", c->armorClass).c_str(), 275, 124, 15, _color6);
 
 			for (int i = 0; i < 3; i++) {
-				int t = getClassHpIncreaseType(c->cClass, i);
+				int t = getCharacterClassType(c->cClass, i);
 				if (t == -1)
 					continue;
 
@@ -862,8 +862,8 @@ int EobCoreEngine::clickedCamp(Button *button) {
 	const ScreenDim *dm = _screen->getScreenDim(10);
 	_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 2, 0, Screen::CR_NO_P_CHECK);	
 	
-	//if (displayInv)
-	//	_screen->loadEobCpsFileToPage("INVENT", 0, 5, 3, 2);
+	/*if (reloadInv)
+		_screen->loadEobCpsFileToPage("INVENT", 0, 5, 3, 2);*/
 	
 	_screen->updateScreen();
 
@@ -948,11 +948,7 @@ int EobCoreEngine::clickedCharNameLabelRight(Button *button) {
 	} else {
 		int d = _exchangeCharacterId;
 		_exchangeCharacterId = -1;
-
-		EobCharacter temp;
-		memcpy(&temp, &_characters[d], sizeof(EobCharacter));
-		memcpy(&_characters[d], &_characters[button->arg], sizeof(EobCharacter));
-		memcpy(&_characters[button->arg], &temp, sizeof(EobCharacter));
+		exchangeCharacters(d, button->arg);
 
 		_timer->disable(0);
 		gui_drawCharPortraitWithStats(d);
@@ -1432,11 +1428,11 @@ void EobCoreEngine::gui_processInventorySlotClick(int slot) {
 	}
 }
 
-GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
+GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI_v1(vm), _vm(vm), _screen(vm->_screen) {
 	_scrollUpFunctor = _scrollDownFunctor = BUTTON_FUNCTOR(GUI_Eob, this, 0);
 
-	_redrawButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawButtonCallback);
-	_redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawShadedButtonCallback);
+	_redrawButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawButtonCallback);
+	_redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawShadedButtonCallback);
 
 	_menuStringsPrefsTemp = new char*[4];
 	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char*));
@@ -1453,7 +1449,12 @@ GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 	_menuLastInFlags = 0;
 	_menuCur = 0;
 	_menuNumItems = 0;
-	_menuButtons = 0;
+
+	_charSelectRedraw = false;
+	
+	_updateBoxIndex = -1;
+	_highLightBoxTimer = 0;
+	_updateBoxColorIndex = 0;
 }
 
 GUI_Eob::~GUI_Eob() {
@@ -1950,17 +1951,17 @@ int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 	return result;
 }
 
-void GUI_Eob::setupMenu(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int unk, int lineSpacing) {
-	initMenuItemsMask(sd, maxItem, menuItemsMask, unk);
+void GUI_Eob::simpleMenu_setup(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int unk, int lineSpacing) {
+	simpleMenu_initMenuItemsMask(sd, maxItem, menuItemsMask, unk);
 
 	const ScreenDim *dm = _screen->getScreenDim(19 + sd);
 	int x = (_screen->_curDim->sx + dm->sx) << 3;
 	int y = _screen->_curDim->sy + dm->sy;
 
-	int v = getMenuItem(_menuCur, menuItemsMask, unk);
+	int v = simpleMenu_getMenuItem(_menuCur, menuItemsMask, unk);
 
 	for (int i = 0; i < _menuNumItems; i++) {
-		int item = getMenuItem(i, menuItemsMask, unk);
+		int item = simpleMenu_getMenuItem(i, menuItemsMask, unk);
 		int ty = y + i * (lineSpacing + _screen->getFontHeight());
 		_screen->printShadedText(strings[item], x, ty, dm->unkA, 0);
 		if (item == v)
@@ -1974,7 +1975,7 @@ void GUI_Eob::setupMenu(int sd, int maxItem, const char *const *strings, int32 m
 	_vm->removeInputTop();
 }
 
-int GUI_Eob::handleMenu(int sd, const char *const *strings, void *b, int32 menuItemsMask, int unk) {
+int GUI_Eob::simpleMenu_process(int sd, const char *const *strings, void *b, int32 menuItemsMask, int unk) {
 	const ScreenDim *dm = _screen->getScreenDim(19 + sd);
 	int h = _menuNumItems - 1;
 	int currentItem = _menuCur % _menuNumItems;
@@ -2016,14 +2017,14 @@ int GUI_Eob::handleMenu(int sd, const char *const *strings, void *b, int32 menuI
 	}
 
 	if (newItem != currentItem) {
-		_screen->printText(strings[getMenuItem(currentItem, menuItemsMask, unk)], x, y + currentItem * lineH , dm->unkA, 0);
-		_screen->printText(strings[getMenuItem(newItem,  menuItemsMask, unk)], x, y + newItem * lineH , dm->unkC, 0);
+		_screen->printText(strings[simpleMenu_getMenuItem(currentItem, menuItemsMask, unk)], x, y + currentItem * lineH , dm->unkA, 0);
+		_screen->printText(strings[simpleMenu_getMenuItem(newItem,  menuItemsMask, unk)], x, y + newItem * lineH , dm->unkC, 0);
 		_screen->updateScreen();
 	}
 
 	if (result != -1) {
-		result = getMenuItem(result, menuItemsMask, unk);
-		menuFlashSelection(strings[result], x, y + newItem * lineH, dm->unkA, dm->unkC, 0);
+		result = simpleMenu_getMenuItem(result, menuItemsMask, unk);
+		simpleMenu_flashSelection(strings[result], x, y + newItem * lineH, dm->unkA, dm->unkC, 0);
 	}
 
 	_menuCur = newItem;
@@ -2031,7 +2032,7 @@ int GUI_Eob::handleMenu(int sd, const char *const *strings, void *b, int32 menuI
 	return result;
 }
 
-int GUI_Eob::getMenuItem(int index, int32 menuItemsMask, int unk) {
+int GUI_Eob::simpleMenu_getMenuItem(int index, int32 menuItemsMask, int unk) {
 	if (menuItemsMask == -1)
 		return index;
 
@@ -2049,7 +2050,7 @@ int GUI_Eob::getMenuItem(int index, int32 menuItemsMask, int unk) {
 	return res;
 }
 
-void GUI_Eob::menuFlashSelection(const char *str, int x, int y, int color1, int color2, int color3) {
+void GUI_Eob::simpleMenu_flashSelection(const char *str, int x, int y, int color1, int color2, int color3) {
 	for (int i = 0; i < 3; i++) {
 		_screen->printText(str, x, y, color2, color3);
 		_screen->updateScreen();
@@ -2060,7 +2061,7 @@ void GUI_Eob::menuFlashSelection(const char *str, int x, int y, int color1, int
 	}
 }
 
-int GUI_Eob::runCampMenu() {
+void GUI_Eob::runCampMenu() {
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
 	
 	Button *highlightButton = 0;
@@ -2068,17 +2069,18 @@ int GUI_Eob::runCampMenu() {
 	
 	int newMenu = 0;
 	int lastMenu = -1;
-	int e = 0;
-	int menuG = 0;
-	int menuH = 0;
-	_menuButtons = 0;
+	bool redrawPortraits = false;
+	bool res = false;
+	_charSelectRedraw = false;
+	_vm->_resting = false;
+	Button *buttonList = 0;
 
 	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
 		if (newMenu == 2)
 			updateOptionsStrings();
 		
 		if (newMenu != -1) {
-			releaseButtons(_menuButtons);
+			releaseButtons(buttonList);
 
 			_vm->_menuDefs[0].titleStrId = newMenu ? 1 : 56;
 			if (newMenu == 2)
@@ -2086,10 +2088,10 @@ int GUI_Eob::runCampMenu() {
 			else if (newMenu == 1)
 				_vm->_menuDefs[1].titleStrId = 58;
 			
-			_menuButtons = initMenu(newMenu);
+			buttonList = initMenu(newMenu);
 
 			if (newMenu != lastMenu) {
-				highlightButton = _menuButtons;
+				highlightButton = buttonList;
 				prevHighlightButton = 0;
 			}
 
@@ -2097,7 +2099,7 @@ int GUI_Eob::runCampMenu() {
 			newMenu = -1;
 		}
 		
-		int inputFlag = _vm->checkInput(_menuButtons, false, 0) & 0x80ff;
+		int inputFlag = _vm->checkInput(buttonList, false, 0) & 0x80ff;
 		_vm->removeInputTop();
 		
 		if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE])
@@ -2106,7 +2108,7 @@ int GUI_Eob::runCampMenu() {
 			inputFlag = 0x8000 + prevHighlightButton->index;
 		}
 
-		Button *clickedButton = _vm->gui_getButton(_menuButtons, inputFlag & 0x7fff);
+		Button *clickedButton = _vm->gui_getButton(buttonList, inputFlag & 0x7fff);
 
 		if (clickedButton) {
 			drawMenuButton(prevHighlightButton, false, false, true);
@@ -2120,10 +2122,10 @@ int GUI_Eob::runCampMenu() {
 		}
 
 		if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP3] || inputFlag == _vm->_keyMap[Common::KEYCODE_PAGEDOWN] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP1] || inputFlag == _vm->_keyMap[Common::KEYCODE_END]) {
-			highlightButton = _vm->gui_getButton(_menuButtons, _vm->_menuDefs[lastMenu].firstButtonStrId + _vm->_menuDefs[lastMenu].numButtons);
+			highlightButton = _vm->gui_getButton(buttonList, _vm->_menuDefs[lastMenu].firstButtonStrId + _vm->_menuDefs[lastMenu].numButtons);
 			inputFlag = _vm->_keyMap[Common::KEYCODE_UP];
 		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP7] || inputFlag == _vm->_keyMap[Common::KEYCODE_HOME] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP9] || inputFlag == _vm->_keyMap[Common::KEYCODE_PAGEUP]) {
-			highlightButton = _vm->gui_getButton(_menuButtons, _vm->_menuDefs[lastMenu].firstButtonStrId + 1);
+			highlightButton = _vm->gui_getButton(buttonList, _vm->_menuDefs[lastMenu].firstButtonStrId + 1);
 		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP8] || inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP2] || inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN]) {
 			if (prevHighlightButton) {
 				int dir = (inputFlag == _vm->_keyMap[Common::KEYCODE_UP]) ? -1 : 1;
@@ -2141,29 +2143,50 @@ int GUI_Eob::runCampMenu() {
 					s += dir;
 				} while(!_vm->shouldQuit());
 
-				highlightButton = _vm->gui_getButton(_menuButtons, s);
+				highlightButton = _vm->gui_getButton(buttonList, s);
 			}
 			
-		} else if (inputFlag > 0x8001 && inputFlag < 0x8010) {
+		} else if (inputFlag > 0x8000 && inputFlag < 0x8010) {
+			int i = 0;
+			int cnt = 0;
+
 			switch (inputFlag) {
 			case 0x8001:
+				if (_vm->restParty())
+					runLoop = false;
+				else
+					_vm->_resting = false;
+				redrawPortraits = true;
 				break;
+
 			case 0x8002:
+				runMemorizePrayMenu(selectCharacterDialogue(23), 0);
+				newMenu = 0;
 				break;
+
 			case 0x8003:
+				runMemorizePrayMenu(selectCharacterDialogue(26), 1);
+				newMenu = 0;
 				break;
+
 			case 0x8004:
+				scribeScrollDialogue();
+				newMenu = 0;
 				break;
+
 			case 0x8005:
 				newMenu = 2;
 				break;
+
 			case 0x8006:
 				newMenu = 1;
 				break;
+
 			case 0x8007:
-				if (menuH)
+				if (_vm->_resting)
 					displayTextBox(44);
 				// fall through
+
 			case 0x800c:
 			case 0x800f:
 				if (lastMenu == 1 || lastMenu == 2)
@@ -2173,38 +2196,74 @@ int GUI_Eob::runCampMenu() {
 				else
 					runLoop = false;
 				break;
+
 			case 0x8008:
+				// load
 				break;
+
 			case 0x8009:
+				// save
 				break;
+
 			case 0x800a:
+				for (; i < 6; i++) {
+					if (_vm->testCharacter(i, 1))
+						cnt++;
+				}
+
+				if (cnt > 4) {
+					_vm->dropCharacter(selectCharacterDialogue(53));
+					_vm->gui_drawPlayField(0);
+					res = true;
+					_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 14, Screen::CR_NO_P_CHECK);
+					_screen->setFont(Screen::FID_6_FNT);
+					_vm->gui_drawAllCharPortraitsWithStats();
+					_screen->setFont(Screen::FID_8_FNT);
+				} else {
+					displayTextBox(45);
+				}
+
+				newMenu = 0;
 				break;
+
 			case 0x800b:
+				if (confirmDialogue(46))
+					_vm->quitGame();
+				newMenu = 0;
 				break;
+
 			case 0x800d:
+				_vm->_configSounds ^= true;
+				_vm->_configMusic = _vm->_configSounds ? 1 : 0;
+				newMenu = 2;
 				break;
+
 			case 0x800e:
+				_vm->_configHpBarGraphs ^= true;
+				newMenu = 2;
+				redrawPortraits = true;
 				break;
+
 			default:
 				break;
 			}
 			
 		} else {
 			Common::Point p = _vm->getMousePos();
-			for (Button *b = _menuButtons; b; b = b->nextButton) {
+			for (Button *b = buttonList; b; b = b->nextButton) {
 				if ((b->arg & 2) && _vm->posWithinRect(p.x, p.y, b->x, b->y, b->x + b->width, b->y + b->height))
 					highlightButton = b;
 			}
 		}
 		
-		if (menuG || e) {
+		if (_charSelectRedraw || redrawPortraits) {
 			for (int i = 0; i < 6; i++) {
 				_vm->gui_drawCharPortraitWithStats(i);
 				_vm->cleanupCharacterSpellList(i);
 			}
 		}
 
-		menuG = e = 0;
+		_charSelectRedraw = redrawPortraits = false;
 
 		if (prevHighlightButton != highlightButton && newMenu == -1 && runLoop) {
 			drawMenuButton(prevHighlightButton, false, false, true);
@@ -2214,18 +2273,51 @@ int GUI_Eob::runCampMenu() {
 		}
 	}
 
-	releaseButtons(_menuButtons);
-	_menuButtons = 0;
+	releaseButtons(buttonList);
+	
+	_vm->writeSettings();
 	
 	_screen->setFont(of);
-
-	return 0;
 }
 
 int GUI_Eob::runLoadMenu(int x, int y) {
 	return 0;
 }
 
+void GUI_Eob::highLightBoxFrame(int box) {
+	static const uint8 colorTable[] = { 0x0F, 0xB0, 0xB2, 0xB4, 0xB6,
+		0xB8, 0xBA, 0xBC, 0x0C, 0xBC, 0xBA, 0xB8, 0xB6, 0xB4, 0xB2, 0xB0, 0x00
+	};
+
+	if (_updateBoxIndex == box) {
+		if (_updateBoxIndex == -1)
+			return;
+
+		if (_vm->_system->getMillis() <= _highLightBoxTimer)
+			return;
+
+		if (!colorTable[_updateBoxColorIndex])
+			_updateBoxColorIndex = 0;
+
+		const EobRect16 *r = &_highLightBoxFrames[_updateBoxIndex];
+		_screen->drawBox(r->x1, r->y1, r->x2, r->y2, colorTable[_updateBoxColorIndex++]);
+		_screen->updateScreen();
+
+		_highLightBoxTimer = _vm->_system->getMillis() + _vm->_tickLength;
+
+	} else {
+		if (_updateBoxIndex != -1) {
+			const EobRect16 *r = &_highLightBoxFrames[_updateBoxIndex];
+			_screen->drawBox(r->x1, r->y1, r->x2, r->y2, 12);
+			_screen->updateScreen();
+		}
+
+		_updateBoxColorIndex = 0;
+		_updateBoxIndex = box;
+		_highLightBoxTimer = _vm->_system->getMillis();
+	}
+}
+
 int GUI_Eob::getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor) {
 	uint8 cursorState = 1;
 	char sufx[] = " ";
@@ -2344,7 +2436,7 @@ int GUI_Eob::getTextInput(char *dest, int x, int y, int destMaxLen, int textColo
 	return _keyPressed.keycode == Common::KEYCODE_ESCAPE ? -1 : len;
 }
 
-void GUI_Eob::initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int unk) {
+void GUI_Eob::simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int unk) {
 	if (menuItemsMask == -1) {
 		_menuNumItems = _screen->getScreenDim(19 + menuId)->h;
 		_menuCur = _screen->getScreenDim(19 + menuId)->unk8;
@@ -2361,6 +2453,253 @@ void GUI_Eob::initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, in
 	_menuCur = 0;
 }
 
+void GUI_Eob::runSaveMenu() {
+
+}
+
+void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
+
+}
+
+void GUI_Eob::scribeScrollDialogue() {
+
+}
+
+bool GUI_Eob::confirmDialogue(int id) {
+	int od = _screen->curDimIndex();
+	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
+
+	Button *buttonList = initMenu(5);
+	
+	_screen->printShadedText(getMenuString(id), (_screen->_curDim->sx + 1) << 3, _screen->_curDim->sy + 4, 15, 0);
+
+	int newHighlight = 0;
+	int lastHighlight = -1;
+	bool result = false;
+
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+		if (newHighlight != lastHighlight) {
+			if (lastHighlight != -1)
+				drawMenuButton(_vm->gui_getButton(buttonList, lastHighlight + 33), false, false, true);
+			drawMenuButton(_vm->gui_getButton(buttonList, newHighlight + 33), false, true, true);
+			_screen->updateScreen();
+			lastHighlight = newHighlight;
+		}
+		
+		int inputFlag = _vm->checkInput(buttonList, false, 0) & 0x80ff;
+		_vm->removeInputTop();
+
+		if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
+			result = lastHighlight ? false : true;
+			inputFlag = 0x8021 + lastHighlight;
+			runLoop = false;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP6] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT]) {
+			newHighlight ^= 1;
+		} else if (inputFlag == 0x8021) {
+			result = true;
+			runLoop = false;
+		} else if (inputFlag == 0x8022) {
+			result = false;
+			runLoop = false;
+		} else {
+			Common::Point p = _vm->getMousePos();
+			for (Button *b = buttonList; b; b = b->nextButton) {
+				if ((b->arg & 2) && _vm->posWithinRect(p.x, p.y, b->x, b->y, b->x + b->width, b->y + b->height))
+					newHighlight = b->index - 33;
+			}
+		}
+
+		if (!runLoop) {
+			Button *b = _vm->gui_getButton(buttonList, lastHighlight + 33);
+			drawMenuButton(b, true, true, true);
+			_screen->updateScreen();
+			_vm->_system->delayMillis(80);
+			drawMenuButton(b, false, true, true);
+			_screen->updateScreen();
+		}
+	}
+
+	releaseButtons(buttonList);
+
+	_screen->setFont(of);
+	_screen->setScreenDim(od);
+
+	return result;
+}
+
+int GUI_Eob::selectCharacterDialogue(int id) {
+	uint8 flags = (id == 26) ? 0x14 : 0x02;
+	_vm->removeInputTop();
+
+	_charSelectRedraw = false;	
+	bool abort = false;
+	int count = 0;
+	int result = -1;
+	int found[6];
+
+	for (int i = 0; i < 6; i++) {
+		found[i] = -1;
+		
+		if (!_vm->testCharacter(i, 1))
+			continue;
+		
+		if (!(_vm->_classModifierFlags[_vm->_characters[i].cClass] & flags) && (id != 53))
+			continue;
+		
+		if (id != 53 && (!_vm->_characters[i].food || !_vm->testCharacter(i, 4))) {
+			abort = true;
+		} else {
+			found[i] = 0;
+			result = i;
+			count++;
+		} 
+	}
+
+	if (!count) {
+		int eid = 0;
+		if (id == 23)
+			eid = abort ? 28 : 72;
+		else if (id == 26)
+			eid = abort ? 27 : 73;
+		else if (id == 49)
+			eid = 52;
+
+		displayTextBox(eid);
+		return -1;
+	}
+
+	static const uint16 selX[] = { 184, 256, 184, 256, 184, 256 };
+	static const uint8 selY[] = { 2, 2, 54, 54, 106, 106};
+
+	for (int i = 0; i < 6; i++) {
+		if (found[i] != -1 || !_vm->testCharacter(i, 1))
+			continue;
+
+		_screen->drawShape(0, _vm->_blackBoxSmallGrid, selX[i], selY[i], 0);
+		_screen->drawShape(0, _vm->_blackBoxSmallGrid, selX[i] + 16, selY[i], 0);
+		_screen->drawShape(0, _vm->_blackBoxSmallGrid, selX[i] + 32, selY[i], 0);
+		_screen->drawShape(0, _vm->_blackBoxSmallGrid, selX[i] + 48, selY[i], 0);
+		_charSelectRedraw = true;
+	}
+
+	if (count == 1) {		
+		int l = _vm->getCharacterLevelIndex(4, _vm->_characters[result].cClass);
+
+		if (l == -1)
+			return result;
+
+		if (_vm->_characters[result].level[l] > 8)
+			return result;
+
+		displayTextBox(24);
+		return -1;
+	}
+
+	_vm->_menuDefs[3].titleStrId = id;
+	Button *buttonList = initMenu(3);
+
+	result = -2;
+	int hlCur = -1;
+	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
+
+	while (result == -2 && !_vm->shouldQuit()) {
+		int inputFlag = _vm->checkInput(buttonList, false, 0);
+		_vm->removeInputTop();
+		
+		highLightBoxFrame(hlCur);
+
+		if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP8] || inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_a] || inputFlag == _vm->_keyMap[Common::KEYCODE_w]) {
+			highLightBoxFrame(-1);
+			_vm->gui_drawCharPortraitWithStats(hlCur--);
+			if (hlCur < 0)
+				hlCur = 5;
+			while (found[hlCur]) {
+				if (--hlCur < 0)
+					hlCur = 5;
+			}
+
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP6] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP2] || inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN] || inputFlag == _vm->_keyMap[Common::KEYCODE_z] || inputFlag == _vm->_keyMap[Common::KEYCODE_s]) {
+			highLightBoxFrame(-1);
+			_vm->gui_drawCharPortraitWithStats(hlCur++);
+			if (hlCur == 6)
+				hlCur = 0;
+			while (found[hlCur]) {
+				if (++hlCur == 6)
+					hlCur = 0;
+			}
+
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
+			if (found >= 0)
+				result = hlCur;
+
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE] || inputFlag == 0x8010) {
+			_screen->setFont(Screen::FID_8_FNT);
+			drawMenuButton(buttonList, true, true, true);
+			_screen->updateScreen();
+			_vm->_system->delayMillis(80);
+			drawMenuButton(buttonList, false, false, true);
+			_screen->updateScreen();
+			_screen->setFont(Screen::FID_6_FNT);
+			result = -1;
+
+		} else if (inputFlag > 0x8010 && inputFlag < 0x8017) {
+			result = inputFlag - 0x8011;
+			if (found[result])
+				result = -2;
+		}
+	}
+
+	highLightBoxFrame(-1);
+	if (hlCur >= 0)
+		_vm->gui_drawCharPortraitWithStats(hlCur);
+
+	_screen->setFont(Screen::FID_8_FNT);
+
+	if (result != -1 && id != 53) {
+		if (flags == 0x14) {
+			if (_vm->_classModifierFlags[_vm->_characters[result].cClass] & 0x10 && _vm->_characters[result].level[0] < 9) {
+				displayTextBox(24);
+				result = -1;
+			}
+		} else {
+			if (_vm->checkCharacterInventoryForItem(result, 29, -1) == -1) {
+				displayTextBox(25);
+				result = -1;
+			}
+		}
+	}
+
+	releaseButtons(buttonList);
+	_screen->setFont(of);
+
+	return result;
+}
+
+void GUI_Eob::displayTextBox(int id) {
+	int op = _screen->setCurPage(2);
+	int od = _screen->curDimIndex();
+	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
+	_screen->setClearScreenDim(11);
+	const ScreenDim *dm = _screen->getScreenDim(11);
+
+	drawMenuButtonBox(dm->sx << 3, dm->sy, dm->w << 3, dm->h, false, false);
+	_screen->printShadedText(getMenuString(id), (dm->sx << 3) + 5, dm->sy + 5, 15, 0);
+	_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+
+	for (uint32 timeOut = _vm->_system->getMillis() + 1440; _vm->_system->getMillis() < timeOut && !_vm->shouldQuit(); ) {
+	 	int in = _vm->checkInput(0, false, 0);
+		_vm->removeInputTop();
+		if (in && !(in & 0x800))
+			break;
+		_vm->_system->delayMillis(4);
+	}
+
+	_screen->setCurPage(op);
+	_screen->setFont(of);
+	_screen->setScreenDim(od);
+}
+
 Button *GUI_Eob::initMenu(int id) {
 	_screen->setCurPage(2);
 
@@ -2443,10 +2782,6 @@ void GUI_Eob::drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool n
 	_vm->gui_drawBox(x + 1, y + 1, w - 2, h - 2, _vm->_color1_1, _vm->_color2_1, noFill ? -1 : _vm->_bkgColor_1);
 }
 
-void GUI_Eob::displayTextBox(int id) {
-
-}
-
 void GUI_Eob::updateOptionsStrings() {
 	for (int i = 0; i < 4; i++) {
 		delete _menuStringsPrefsTemp[i];
@@ -2460,6 +2795,8 @@ void GUI_Eob::updateOptionsStrings() {
 }
 
 const char *GUI_Eob::getMenuString(int id) {
+	static const char empty[] = "";
+
 	if (id >= 69)
 		return _vm->_menuStringsTransfer[id - 69];
 	else if (id >= 67)
@@ -2477,11 +2814,11 @@ const char *GUI_Eob::getMenuString(int id) {
 	else if (id >= 48)
 		return _vm->_menuStringsScribe[id - 48];
 	else if (id == 47)
-		_vm->_menuStringsStarve[0];
+		return _vm->_menuStringsStarve[0];
 	else if (id == 46)
-		_vm->_menuStringsExit[0];
+		return _vm->_menuStringsExit[0];
 	else if (id == 45)
-		_vm->_menuStringsDrop[0];
+		return _vm->_menuStringsDrop[0];
 	else if (id >= 40)
 		return _vm->_menuStringsRest[id - 40];
 	else if (id >= 23)
@@ -2494,7 +2831,7 @@ const char *GUI_Eob::getMenuString(int id) {
 		return _vm->_menuStringsSaveLoad[id - 9];
 	else if (id >= 1)
 		return _vm->_menuStringsMain[id - 1];
-	return 0;
+	return empty;
 }
 
 Button *GUI_Eob::linkButton(Button *list, Button *newbt) {
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index 3eddee553b..64f1c1979a 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -31,10 +31,17 @@
 
 namespace Kyra {
 
+struct EobRect16 {
+	int16 x1;
+	int16 y1;
+	uint16 x2;
+	uint16 y2;
+};
+
 class DarkMoonEngine;
 class Screen_Eob;
 
-class GUI_Eob : public GUI {
+class GUI_Eob : public GUI_v1 {
 	friend class EobCoreEngine;
 	friend class CharacterGenerator;
 public:
@@ -47,69 +54,49 @@ public:
 	void processButton(Button *button);
 	int processButtonList(Button *buttonList, uint16 inputFlags, int8 mouseWheel);
 
-	int redrawShadedButtonCallback(Button *button) { return 0; }
-	int redrawButtonCallback(Button *button) { return 0; }
-
 	// Non button based menu handling (main menu, character generation)
-	void setupMenu(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int unk, int lineSpacing);
-	int handleMenu(int sd, const char *const *strings, void *b, int32 menuItemsMask, int unk);	
-	int getMenuItem(int index, int32 menuItemsMask, int unk);
-	void menuFlashSelection(const char *str, int x, int y, int color1, int color2, int color3);
+	void simpleMenu_setup(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int unk, int lineSpacing);
+	int simpleMenu_process(int sd, const char *const *strings, void *b, int32 menuItemsMask, int unk);	
 
 	// Button based menus (camp menu, options, save/load)
-	int runCampMenu();
+	void runCampMenu();
 	int runLoadMenu(int x, int y);
 
+	void highLightBoxFrame(int box);
+
 	int getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor);
 
 	// utilities for thumbnail creation
 	void createScreenThumbnail(Graphics::Surface &dst) {}
 
-private:
-	void initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int unk);
-
-	//void backupPage0();
-	//void restorePage0();
+	// unused
+	int redrawShadedButtonCallback(Button *button) { return 0; }
+	int redrawButtonCallback(Button *button) { return 0; }
 
-	//void setupSavegameNames(Menu &menu, int num);
-	//void printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 flags);
+private:
+	int simpleMenu_getMenuItem(int index, int32 menuItemsMask, int unk);
+	void simpleMenu_flashSelection(const char *str, int x, int y, int color1, int color2, int color3);
+	void simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int unk);
 
-	//int getMenuCenterStringX(const char *str, int x1, int x2);
+	void runSaveMenu();
+	void runMemorizePrayMenu(int charIndex, int spellType);
+	void scribeScrollDialogue();
 
-	//int getInput();
-	Button *initMenu(int id);
+	bool confirmDialogue(int id);
+	int selectCharacterDialogue(int id);
+	void displayTextBox(int id);
 	
+	Button *initMenu(int id);	
 	void drawMenuButton(Button *b, bool clicked, bool highlight, bool noFill);
 	void drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool noFill);
-	void displayTextBox(int id);
 	void updateOptionsStrings();
 	const char *getMenuString(int id);
 
 	Button *linkButton(Button *list, Button *newbt);
 	void releaseButtons(Button *list);
 
-	Button *getButtonListData() { return _menuButtons; }
-	Button *getScrollUpButton() { return &_scrollUpButton; }
-	Button *getScrollDownButton() { return &_scrollDownButton; }
-
-	Button::Callback getScrollUpButtonHandler() const { return _scrollUpFunctor; }
-	Button::Callback getScrollDownButtonHandler() const { return _scrollDownFunctor; }
-
-	uint8 defaultColor1() const { return 0xFE; }
-	uint8 defaultColor2() const { return 0x00; }
-
-	const char *getMenuTitle(const Menu &menu) { return 0; }
-	const char *getMenuItemTitle(const MenuItem &menuItem) { return 0; }
-	const char *getMenuItemLabel(const MenuItem &menuItem) { return 0; }
-
-	//Button _menuButtons[10];
-	Button *_menuButtons;
-	Button _scrollUpButton;
+	Button _scrollUpButton;//////////////////77
 	Button _scrollDownButton;
-	//Menu _mainMenu, _gameOptions, _audioOptions, _choiceMenu, _loadMenu, _saveMenu, _deleteMenu, _savenameMenu, _deathMenu;
-	//Menu *_currentMenu, *_lastMenu, *_newMenu;
-	//int _menuResult;
-	//char *_saveDescription;
 
 	char **_menuStringsPrefsTemp;
 
@@ -124,7 +111,7 @@ private:
 	uint16 _flagsMouseRight;
 	uint16 _flagsModifier;
 	uint16 _progress;
-	uint16 _prcButtonUnk3; /// ALWAYS 1?? REMOVE ??
+	uint16 _prcButtonUnk3;
 	uint16 _cflag;
 
 	Button::Callback _scrollUpFunctor;
@@ -136,6 +123,27 @@ private:
 
 	int _menuCur;
 	int _menuNumItems;
+	bool _charSelectRedraw;
+
+	int _updateBoxIndex;
+	int _updateBoxColorIndex;
+	uint32 _highLightBoxTimer;
+	static const EobRect16 _highLightBoxFrames[];
+
+	// unused
+	Button *getButtonListData() { return 0; }
+	Button *getScrollUpButton() { return &_scrollUpButton; }
+	Button *getScrollDownButton() { return &_scrollDownButton; }
+
+	Button::Callback getScrollUpButtonHandler() const { return _scrollUpFunctor; }
+	Button::Callback getScrollDownButtonHandler() const { return _scrollDownFunctor; }
+
+	uint8 defaultColor1() const { return 0xFE; }
+	uint8 defaultColor2() const { return 0x00; }
+
+	const char *getMenuTitle(const Menu &menu) { return 0; }
+	const char *getMenuItemTitle(const MenuItem &menuItem) { return 0; }
+	const char *getMenuItemLabel(const MenuItem &menuItem) { return 0; }
 };
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp
index 4a2d51faa3..6e0d108435 100644
--- a/engines/kyra/gui_lok.cpp
+++ b/engines/kyra/gui_lok.cpp
@@ -184,7 +184,7 @@ int KyraEngine_LoK::buttonAmuletCallback(Button *caller) {
 
 #pragma mark -
 
-GUI_LoK::GUI_LoK(KyraEngine_LoK *vm, Screen_LoK *screen) : GUI(vm), _vm(vm), _screen(screen) {
+GUI_LoK::GUI_LoK(KyraEngine_LoK *vm, Screen_LoK *screen) : GUI_v1(vm), _vm(vm), _screen(screen) {
 	_lastScreenUpdate = 0;
 	_menu = 0;
 	_pressFlag = false;
diff --git a/engines/kyra/gui_lok.h b/engines/kyra/gui_lok.h
index 5a8d6ab532..1d1060312d 100644
--- a/engines/kyra/gui_lok.h
+++ b/engines/kyra/gui_lok.h
@@ -92,7 +92,7 @@ namespace Kyra {
 
 class KyraEngine_LoK;
 
-class GUI_LoK : public GUI {
+class GUI_LoK : public GUI_v1 {
 	friend class KyraEngine_LoK;
 public:
 	GUI_LoK(KyraEngine_LoK *vm, Screen_LoK *screen);
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index 08ce0bdadd..681caf93b1 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -1838,12 +1838,12 @@ int LoLEngine::clickedStatusIcon(Button *button) {
 	return 1;
 }
 
-GUI_LoL::GUI_LoL(LoLEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
+GUI_LoL::GUI_LoL(LoLEngine *vm) : GUI_v1(vm), _vm(vm), _screen(vm->_screen) {
 	_scrollUpFunctor = BUTTON_FUNCTOR(GUI_LoL, this, &GUI_LoL::scrollUp);
 	_scrollDownFunctor = BUTTON_FUNCTOR(GUI_LoL, this, &GUI_LoL::scrollDown);
 
-	_redrawButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawButtonCallback);
-	_redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawShadedButtonCallback);
+	_redrawButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawButtonCallback);
+	_redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawShadedButtonCallback);
 
 	_specialProcessButton = _backUpButtonList = 0;
 	_flagsModifier = 0;
diff --git a/engines/kyra/gui_lol.h b/engines/kyra/gui_lol.h
index 9c0c4e2bfe..3a8135a1b9 100644
--- a/engines/kyra/gui_lol.h
+++ b/engines/kyra/gui_lol.h
@@ -88,7 +88,7 @@ namespace Kyra {
 class LoLEngine;
 class Screen_LoL;
 
-class GUI_LoL : public GUI {
+class GUI_LoL : public GUI_v1 {
 	friend class LoLEngine;
 public:
 	GUI_LoL(LoLEngine *vm);
diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp
index c0477f29f1..a1d74fded9 100644
--- a/engines/kyra/gui_v2.cpp
+++ b/engines/kyra/gui_v2.cpp
@@ -30,7 +30,7 @@
 
 namespace Kyra {
 
-GUI_v2::GUI_v2(KyraEngine_v2 *vm) : GUI(vm), _vm(vm), _screen(vm->screen_v2()) {
+GUI_v2::GUI_v2(KyraEngine_v2 *vm) : GUI_v1(vm), _vm(vm), _screen(vm->screen_v2()) {
 	_backUpButtonList = _specialProcessButton = 0;
 	_buttonListChanged = false;
 	_lastScreenUpdate = 0;
@@ -48,7 +48,7 @@ GUI_v2::GUI_v2(KyraEngine_v2 *vm) : GUI(vm), _vm(vm), _screen(vm->screen_v2()) {
 }
 
 Button *GUI_v2::addButtonToList(Button *list, Button *newButton) {
-	list = GUI::addButtonToList(list, newButton);
+	list = GUI_v1::addButtonToList(list, newButton);
 	_buttonListChanged = true;
 	return list;
 }
diff --git a/engines/kyra/gui_v2.h b/engines/kyra/gui_v2.h
index ef95c0301a..402766b1ca 100644
--- a/engines/kyra/gui_v2.h
+++ b/engines/kyra/gui_v2.h
@@ -99,7 +99,7 @@ namespace Kyra {
 class KyraEngine_v2;
 class Screen_v2;
 
-class GUI_v2 : public GUI {
+class GUI_v2 : public GUI_v1 {
 public:
 	GUI_v2(KyraEngine_v2 *vm);
 
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index a6add505cb..3acefdde8e 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -199,7 +199,7 @@ public:
 
 	Screen *screen() { return _screen; }
 	Screen_v2 *screen_v2() const { return _screen; }
-	GUI *gui() const { return _gui; }
+	GUI_v1 *gui() const { return _gui; }
 	virtual TextDisplayer *text() { return _text; }
 	int language() const { return _lang; }
 protected:
diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h
index e5fb3cddca..3ecefbac5d 100644
--- a/engines/kyra/kyra_lok.h
+++ b/engines/kyra/kyra_lok.h
@@ -109,7 +109,7 @@ public:
 
 	Screen *screen() { return _screen; }
 	Animator_LoK *animator() { return _animator; }
-	GUI *gui() const { return _gui; }
+	GUI_v1 *gui() const { return _gui; }
 	virtual Movie *createWSAMovie();
 
 	uint8 **shapes() { return _shapes; }
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index 38ff271037..4b3e8b3fc7 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -54,7 +54,7 @@ public:
 
 	Screen *screen() { return _screen; }
 	Screen_v2 *screen_v2() const { return _screen; }
-	GUI *gui() const { return _gui; }
+	GUI_v1 *gui() const { return _gui; }
 	SoundDigital *soundDigital() { return _soundDigital; }
 	int language() const { return _lang; }
 	bool heliumMode() const { return _configHelium; }
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index c1b9f2a453..72cc5bc396 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -345,7 +345,7 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
 		_eventList.erase(_eventList.begin());
 	}
 
-	GUI *guiInstance = gui();
+	GUI_v1 *guiInstance = gui();
 	if (guiInstance) {
 		if (keys)
 			return guiInstance->processButtonList(buttonList, keys | eventFlag, mouseWheel);
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 40f9074106..3a4be467ac 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -176,14 +176,14 @@ class TextDisplayer;
 class StaticResource;
 class TimerManager;
 class Debugger;
-class GUI;
+class GUI_v1;
 
 struct Button;
 
 class KyraEngine_v1 : public Engine {
 friend class Debugger;
 friend class ::KyraMetaEngine;
-friend class GUI;
+friend class GUI_v1;
 friend class SoundMidiPC;    // For _eventMan
 public:
 	KyraEngine_v1(OSystem *system, const GameFlags &flags);
@@ -196,7 +196,7 @@ public:
 	Resource *resource() { return _res; }
 	virtual Screen *screen() = 0;
 	virtual TextDisplayer *text() { return _text; }
-	virtual GUI *gui() const { return 0; }
+	virtual GUI_v1 *gui() const { return 0; }
 	Sound *sound() { return _sound; }
 	StaticResource *staticres() { return _staticres; }
 	TimerManager *timer() { return _timer; }
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 7a4a3ec3e2..8e978c1b34 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -357,7 +357,7 @@ Screen *LoLEngine::screen() {
 	return _screen;
 }
 
-GUI *LoLEngine::gui() const {
+GUI_v1 *LoLEngine::gui() const {
 	return _gui;
 }
 
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index 8ddba8607c..a33263fc96 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -279,7 +279,7 @@ public:
 	virtual void initKeymap();
 
 	Screen *screen();
-	GUI *gui() const;
+	GUI_v1 *gui() const;
 
 private:
 	Screen_LoL *_screen;
diff --git a/engines/kyra/loleobbase.h b/engines/kyra/loleobbase.h
index a2c13827fc..8bebfe4306 100644
--- a/engines/kyra/loleobbase.h
+++ b/engines/kyra/loleobbase.h
@@ -86,7 +86,7 @@ public:
 	virtual ~LolEobBaseEngine();
 
 	virtual Screen *screen() = 0;
-	virtual GUI *gui() const = 0;
+	virtual GUI_v1 *gui() const = 0;
 
 protected:
 	// Startup
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 90a3e74b19..fa4dd10893 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -314,6 +314,8 @@ enum KyraResources {
 	kEobBaseMenuStringsMgc,
 	kEobBaseMenuStringsPrefs,
 	kEobBaseMenuStringsRest2,
+	kEobBaseMenuStringsRest3,
+	kEobBaseMenuStringsRest4,
 	kEobBaseMenuStringsDefeat,
 	kEobBaseMenuStringsTransfer,
 	kEobBaseMenuStringsSpec,
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index ef3a623e83..c514c8d239 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -122,7 +122,7 @@ EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _v
 	_abortScript = 0;
 	_abortAfterSubroutine = 0;
 	_dlgResult = 0;
-	_script2 = 0;
+	_preventRest = 0;
 
 	_lastScriptFunc = 0;
 	_lastScriptSub = 0;
@@ -192,13 +192,13 @@ void EobInfProcessor::run(int func, int sub) {
 }
 
 void EobInfProcessor::loadState(Common::SeekableSubReadStreamEndian &in) {
-	_script2 = in.readByte();
+	_preventRest = in.readByte();
 	for (int i = 0; i < 18; i++)
 		_flagTable[i] = in.readUint16BE();
 }
 
 void EobInfProcessor::saveState(Common::OutSaveFile *out) {
-	out->writeByte(_script2);
+	out->writeByte(_preventRest);
 	for (int i = 0; i < 18; i++)
 		out->writeUint16BE(_flagTable[i]);
 }
@@ -521,7 +521,7 @@ int EobInfProcessor::oeob_setFlags(int8 *data) {
 
 	switch (*pos++) {
 	case -47:
-		_script2 = 0;
+		_preventRest = 0;
 		break;
 
 	case -28:
@@ -570,7 +570,7 @@ int EobInfProcessor::oeob_removeFlags(int8 *data) {
 
 	switch (a) {
 	case -47:
-		_script2 = 1;
+		_preventRest = 1;
 		break;
 
 	case -28:
diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h
index 2b02807531..322322ae1f 100644
--- a/engines/kyra/script_eob.h
+++ b/engines/kyra/script_eob.h
@@ -43,7 +43,8 @@ public:
 	void run(int func, int sub);
 
 	void setFlag(int flag) { _flagTable[17] |= flag; }
-	bool checkFlag(int flag) { return (_flagTable[17] & flag) ? true : false; }
+	bool checkFlag(int flag) const { return (_flagTable[17] & flag) ? true : false; }
+	bool preventRest() const { return _preventRest ? true : false; }
 
 	void loadState(Common::SeekableSubReadStreamEndian &in);
 	void saveState(Common::OutSaveFile *out);
@@ -96,7 +97,7 @@ private:
 	uint8 _abortScript;
 	uint16 _abortAfterSubroutine;
 	int _dlgResult;
-	uint8 _script2;
+	uint8 _preventRest;
 
 	uint16 _lastScriptFunc;
 	uint16 _lastScriptSub;
diff --git a/engines/kyra/sequences_eob1.cpp b/engines/kyra/sequences_eob1.cpp
index e835c12f0f..dcfabfeddd 100644
--- a/engines/kyra/sequences_eob1.cpp
+++ b/engines/kyra/sequences_eob1.cpp
@@ -94,10 +94,10 @@ int EobEngine::mainMenuLoop() {
 	int sel = -1;
 	do {
 		_screen->setScreenDim(28);
-		_gui->setupMenu(8, 0, _mainMenuStrings, -1, 0, 0);
+		_gui->simpleMenu_setup(8, 0, _mainMenuStrings, -1, 0, 0);
 
 		while (sel == -1 && !shouldQuit())
-			sel = _gui->handleMenu(8, _mainMenuStrings, 0, -1, 0);
+			sel = _gui->simpleMenu_process(8, _mainMenuStrings, 0, -1, 0);
 	} while ((sel < 0 || sel > 5) && !shouldQuit());
 
 	return sel + 1;
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
index c926eb6934..3765ee3d92 100644
--- a/engines/kyra/sequences_eob2.cpp
+++ b/engines/kyra/sequences_eob2.cpp
@@ -155,10 +155,10 @@ int DarkMoonEngine::mainMenuLoop() {
 	int sel = -1;
 	do {
 		_screen->setScreenDim(6);
-		_gui->setupMenu(6, 0, _mainMenuStrings, -1, 0, 0);
+		_gui->simpleMenu_setup(6, 0, _mainMenuStrings, -1, 0, 0);
 
 		while (sel == -1 && !shouldQuit())
-			sel = _gui->handleMenu(6, _mainMenuStrings, 0, -1, 0);
+			sel = _gui->simpleMenu_process(6, _mainMenuStrings, 0, -1, 0);
 	} while ((sel < 0 || sel > 5) && !shouldQuit());
 
 	return sel + 1;
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index bf06ba66bd..a9746004bd 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -266,7 +266,7 @@ const uint8 EobCoreEngine::_hpIncrPerLevel[] = { 10, 4, 8, 6, 10, 10, 9, 10, 9,
 
 const uint8 EobCoreEngine::_numLevelsPerClass[] = { 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 2, 2, 3, 2, 2 };
 
-const int8 EobCoreEngine::_classHpIncreaseType[] = {
+const int8 EobCoreEngine::_characterClassType[] = {
 	0, -1, -1, 5, -1, -1, 4, -1, -1, 1, -1, -1, 2, -1, -1, 3, -1, -1,  0,
 	2, -1, 0, 3, -1, 0, 1, -1, 0, 1, 3, 3, 1, -1, 2, 3, -1, 0, 2,  1,  5,
 	2, -1, 2, 1, -1
@@ -381,6 +381,8 @@ void EobCoreEngine::initStaticResource() {
 	_menuStringsMgc = _staticres->loadStrings(kEobBaseMenuStringsMgc, temp);
 	_menuStringsPrefs = _staticres->loadStrings(kEobBaseMenuStringsPrefs, temp);
 	_menuStringsRest2 = _staticres->loadStrings(kEobBaseMenuStringsRest2, temp);
+	_menuStringsRest3 = _staticres->loadStrings(kEobBaseMenuStringsRest3, temp);
+	_menuStringsRest4 = _staticres->loadStrings(kEobBaseMenuStringsRest4, temp);
 	_menuStringsDefeat = _staticres->loadStrings(kEobBaseMenuStringsDefeat, temp);
 	_menuStringsTransfer = _staticres->loadStrings(kEobBaseMenuStringsTransfer, temp);
 	_menuStringsSpec = _staticres->loadStrings(kEobBaseMenuStringsSpec, temp);
-- 
cgit v1.2.3


From e29f6397911265439fb229710bf17282c66d5f51 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Thu, 23 Jun 2011 23:48:59 +0200
Subject: KYRA: (EOB) - fix monster distance attack bug

---
 engines/kyra/items_eob.cpp   | 2 +-
 engines/kyra/script_eob.cpp  | 3 ---
 engines/kyra/sprites_eob.cpp | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index 98cd634405..f7aed1b920 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -99,7 +99,7 @@ Kyra::Item EobCoreEngine::duplicateItem(Item itemIndex) {
 	if (!foundSlot)
 		return 0;
 
-	memcpy(&_items[i], &_items[itemIndex], sizeof(EobItem));
+	memcpy(&_items[i], itm, sizeof(EobItem));
 	return i;
 }
 
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index c514c8d239..9e18a14fb2 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -80,8 +80,6 @@ EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _v
 	_commandMin(engine->game() == GI_EOB1 ? -27 : -31) {
 
 #define Opcode(x) _opcodes.push_back(new InfProc(this, &EobInfProcessor::x))
-//#define OpcodeAltV(x, y) if (_vm->game() == GI_EOB1) Opcode(x); else Opcode(y);
-//#define OpcodeAlt(x) OpcodeAltV(x##_v1, x##_v2)
 #define OpcodeAlt(x) if (_vm->game() == GI_EOB1) Opcode(x##_v1); else Opcode(x##_v2);
 	Opcode(oeob_setWallType);
 	Opcode(oeob_toggleWallState);
@@ -114,7 +112,6 @@ EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _v
 	Opcode(oeob_dialogue);
 	Opcode(oeob_specialEvent);
 #undef Opcode
-//#undef OpcodeAltV
 #undef OpcodeAlt
 
 	_scriptData = 0;
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 1fa89ead3c..109d244569 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -941,7 +941,7 @@ bool EobCoreEngine::updateMonsterTryDistanceAttack(EobMonsterInPlay *m) {
 		case 11:
 			itm = duplicateItem(60);
 			if (itm) {
-				if (launchObject(-1, itm, m->block, m->pos, m->dir, _items[itm].type))
+				if (!launchObject(-1, itm, m->block, m->pos, m->dir, _items[itm].type))
 					_items[itm].block = -1;
 			}
 			break;
@@ -997,7 +997,7 @@ bool EobCoreEngine::updateMonsterTryDistanceAttack(EobMonsterInPlay *m) {
 		} else {
 			itm = duplicateItem(-s);
 			if (itm) {
-				if (launchObject(-1, itm, m->block, m->pos, m->dir, _items[itm].type))
+				if (!launchObject(-1, itm, m->block, m->pos, m->dir, _items[itm].type))
 					_items[itm].block = -1;
 			}
 		}
-- 
cgit v1.2.3


From 8d4034f428062d82c981536365961971fef0243e Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sat, 25 Jun 2011 14:07:39 +0200
Subject: KYRA: (EOB) - add static resources for memorize/pray menu

---
 engines/kyra/eobcommon.h       | 7 +++++++
 engines/kyra/resource.h        | 7 +++++++
 engines/kyra/staticres_eob.cpp | 7 +++++++
 3 files changed, 21 insertions(+)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index ede25dd140..2e4df6aa1c 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -1007,6 +1007,13 @@ protected:
 	const char *const *_menuStringsSpec;
 	const char *const *_menuStringsSpellNo;
 
+	const uint8 *_spellLevelsMage;
+	const uint8 *_spellLevelsCleric;
+	const uint8 *_spellLevelsMps1;
+	const uint8 *_spellLevelsMps2;
+	const uint8 *_spellLevelsMps3;
+	const uint8 *_spellLevelsMps4;
+
 	// sound
 	void snd_playSoundEffect(int id, int volume=0xFF);
 };
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index fa4dd10893..5d9554c31f 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -321,6 +321,13 @@ enum KyraResources {
 	kEobBaseMenuStringsSpec,
 	kEobBaseMenuStringsSpellNo,
 
+	kEobBaseSpellLevelsMage,
+	kEobBaseSpellLevelsCleric,
+	kEobBaseSpellMps1,
+	kEobBaseSpellMps2,
+	kEobBaseSpellMps3,
+	kEobBaseSpellMps4,
+
 	kEobBaseCharGuiStringsHp,
 	kEobBaseCharGuiStringsWp1,
 	kEobBaseCharGuiStringsWp2,
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index a9746004bd..7908bc28ee 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -388,6 +388,13 @@ void EobCoreEngine::initStaticResource() {
 	_menuStringsSpec = _staticres->loadStrings(kEobBaseMenuStringsSpec, temp);
 	_menuStringsSpellNo = _staticres->loadStrings(kEobBaseMenuStringsSpellNo, temp);
 
+	_spellLevelsMage = _staticres->loadRawData(kEobBaseSpellLevelsMage, temp);
+	_spellLevelsCleric = _staticres->loadRawData(kEobBaseSpellLevelsCleric, temp);
+	_spellLevelsMps1 = _staticres->loadRawData(kEobBaseSpellMps1, temp);
+	_spellLevelsMps2 = _staticres->loadRawData(kEobBaseSpellMps2, temp);
+	_spellLevelsMps3 = _staticres->loadRawData(kEobBaseSpellMps3, temp);
+	_spellLevelsMps4 = _staticres->loadRawData(kEobBaseSpellMps4, temp);
+
 	_characterGuiStringsHp = _staticres->loadStrings(kEobBaseCharGuiStringsHp, temp);
 	_characterGuiStringsWp = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharGuiStringsWp2 : kEobBaseCharGuiStringsWp1, temp);
 	_characterGuiStringsWr = _staticres->loadStrings(kEobBaseCharGuiStringsWr, temp);
-- 
cgit v1.2.3


From d7f2720b5709b1b4a93f81163752d2da148d2fd9 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sat, 25 Jun 2011 17:21:09 +0200
Subject: KYRA: (EOB) - match eob code with
 3f2b5b9e8b9196c9d0e573abf8f8350ec4034b1d

---
 engines/kyra/eob1.cpp         |  2 +-
 engines/kyra/eob2.cpp         |  2 +-
 engines/kyra/eobcommon.cpp    |  6 ------
 engines/kyra/eobcommon.h      |  2 --
 engines/kyra/gui_eob.cpp      | 28 ++++++++++++++--------------
 engines/kyra/gui_eob.h        |  2 +-
 engines/kyra/saveload_eob.cpp |  2 +-
 7 files changed, 18 insertions(+), 26 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index cdccd65414..69071d3aef 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -78,7 +78,7 @@ void EobEngine::startupNew() {
 }
 
 void EobEngine::startupLoad() {
-	updateHandItemCursor();
+	setHandItem(_itemInHand);
 	loadLevel(_currentLevel, _currentSub);
 	_saveLoadMode = 0;
 }
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index de8e90c80f..56ef838e54 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -78,7 +78,7 @@ void DarkMoonEngine::startupNew() {
 }
 
 void DarkMoonEngine::startupLoad() {
-	updateHandItemCursor();
+	setHandItem(_itemInHand);
 	loadLevel(_currentLevel, _currentSub);
 	_saveLoadMode = 0;
 }
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 83a57cd66f..7ec988ef1e 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -46,7 +46,6 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_playFinale = false;
 	_runFlag = true;
 	_saveLoadMode = 0;
-	_updateHandItemCursor = false;
 	_configMouse = true;
 	_resting = false;
 
@@ -441,11 +440,6 @@ void EobCoreEngine::runLoop() {
 		checkInput(_activeButtons, true, 0);
 		removeInputTop();
 
-		if (_updateHandItemCursor) {
-			_updateHandItemCursor = false;
-			setHandItem(_itemInHand);
-		}
-
 		_timer->update();
 		updateScriptTimers();
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 2e4df6aa1c..8b97ab361d 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -351,8 +351,6 @@ protected:
 
 	// Mouse
 	void setHandItem(Item itemIndex);
-	void updateHandItemCursor() { _updateHandItemCursor = true; }
-	bool _updateHandItemCursor;
 
 	// Characters
 	int getDexterityArmorClassModifier(int dexterity);
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 4d5a1bf438..4fe5b6bed9 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -1951,17 +1951,17 @@ int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 	return result;
 }
 
-void GUI_Eob::simpleMenu_setup(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int unk, int lineSpacing) {
-	simpleMenu_initMenuItemsMask(sd, maxItem, menuItemsMask, unk);
+void GUI_Eob::simpleMenu_setup(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int itemOffset, int lineSpacing) {
+	simpleMenu_initMenuItemsMask(sd, maxItem, menuItemsMask, itemOffset);
 
 	const ScreenDim *dm = _screen->getScreenDim(19 + sd);
 	int x = (_screen->_curDim->sx + dm->sx) << 3;
 	int y = _screen->_curDim->sy + dm->sy;
 
-	int v = simpleMenu_getMenuItem(_menuCur, menuItemsMask, unk);
+	int v = simpleMenu_getMenuItem(_menuCur, menuItemsMask, itemOffset);
 
 	for (int i = 0; i < _menuNumItems; i++) {
-		int item = simpleMenu_getMenuItem(i, menuItemsMask, unk);
+		int item = simpleMenu_getMenuItem(i, menuItemsMask, itemOffset);
 		int ty = y + i * (lineSpacing + _screen->getFontHeight());
 		_screen->printShadedText(strings[item], x, ty, dm->unkA, 0);
 		if (item == v)
@@ -1975,7 +1975,7 @@ void GUI_Eob::simpleMenu_setup(int sd, int maxItem, const char *const *strings,
 	_vm->removeInputTop();
 }
 
-int GUI_Eob::simpleMenu_process(int sd, const char *const *strings, void *b, int32 menuItemsMask, int unk) {
+int GUI_Eob::simpleMenu_process(int sd, const char *const *strings, void *b, int32 menuItemsMask, int itemOffset) {
 	const ScreenDim *dm = _screen->getScreenDim(19 + sd);
 	int h = _menuNumItems - 1;
 	int currentItem = _menuCur % _menuNumItems;
@@ -2017,13 +2017,13 @@ int GUI_Eob::simpleMenu_process(int sd, const char *const *strings, void *b, int
 	}
 
 	if (newItem != currentItem) {
-		_screen->printText(strings[simpleMenu_getMenuItem(currentItem, menuItemsMask, unk)], x, y + currentItem * lineH , dm->unkA, 0);
-		_screen->printText(strings[simpleMenu_getMenuItem(newItem,  menuItemsMask, unk)], x, y + newItem * lineH , dm->unkC, 0);
+		_screen->printText(strings[simpleMenu_getMenuItem(currentItem, menuItemsMask, itemOffset)], x, y + currentItem * lineH , dm->unkA, 0);
+		_screen->printText(strings[simpleMenu_getMenuItem(newItem,  menuItemsMask, itemOffset)], x, y + newItem * lineH , dm->unkC, 0);
 		_screen->updateScreen();
 	}
 
 	if (result != -1) {
-		result = simpleMenu_getMenuItem(result, menuItemsMask, unk);
+		result = simpleMenu_getMenuItem(result, menuItemsMask, itemOffset);
 		simpleMenu_flashSelection(strings[result], x, y + newItem * lineH, dm->unkA, dm->unkC, 0);
 	}
 
@@ -2032,7 +2032,7 @@ int GUI_Eob::simpleMenu_process(int sd, const char *const *strings, void *b, int
 	return result;
 }
 
-int GUI_Eob::simpleMenu_getMenuItem(int index, int32 menuItemsMask, int unk) {
+int GUI_Eob::simpleMenu_getMenuItem(int index, int32 menuItemsMask, int itemOffset) {
 	if (menuItemsMask == -1)
 		return index;
 
@@ -2040,11 +2040,11 @@ int GUI_Eob::simpleMenu_getMenuItem(int index, int32 menuItemsMask, int unk) {
 	int i = index;
 
 	for (; i; res++) {
-		if (menuItemsMask & (1 << (res + unk)))
+		if (menuItemsMask & (1 << (res + itemOffset)))
 			i--;
 	}
 
-	while (!(menuItemsMask & (1 << (res + unk))))
+	while (!(menuItemsMask & (1 << (res + itemOffset))))
 		res++;
 
 	return res;
@@ -2436,7 +2436,7 @@ int GUI_Eob::getTextInput(char *dest, int x, int y, int destMaxLen, int textColo
 	return _keyPressed.keycode == Common::KEYCODE_ESCAPE ? -1 : len;
 }
 
-void GUI_Eob::simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int unk) {
+void GUI_Eob::simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int itemOffset) {
 	if (menuItemsMask == -1) {
 		_menuNumItems = _screen->getScreenDim(19 + menuId)->h;
 		_menuCur = _screen->getScreenDim(19 + menuId)->unk8;
@@ -2446,7 +2446,7 @@ void GUI_Eob::simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuIt
 	_menuNumItems = 0;
 
 	for (int i = 0; i < maxItem; i++) {
-		if (menuItemsMask & (1 << (i + unk)))
+		if (menuItemsMask & (1 << (i + itemOffset)))
 			_menuNumItems++;
 	}
 
@@ -2462,7 +2462,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 }
 
 void GUI_Eob::scribeScrollDialogue() {
-
+	
 }
 
 bool GUI_Eob::confirmDialogue(int id) {
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index 64f1c1979a..bb446f75a0 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -74,7 +74,7 @@ public:
 	int redrawButtonCallback(Button *button) { return 0; }
 
 private:
-	int simpleMenu_getMenuItem(int index, int32 menuItemsMask, int unk);
+	int simpleMenu_getMenuItem(int index, int32 menuItemsMask, int itemOffset);
 	void simpleMenu_flashSelection(const char *str, int x, int y, int color1, int color2, int color3);
 	void simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int unk);
 
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 18dddddd83..85b94cd3d4 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -374,7 +374,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 	}
 
 	gui_toggleButtons();
-	updateHandItemCursor();
+	setHandItem(_itemInHand);
 
 	while (!_screen->isMouseVisible())
 		_screen->showMouse();
-- 
cgit v1.2.3


From b7f7635876d3621b11d66cddca9babc1b5f1a1c6 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 6 Nov 2011 17:35:27 +0100
Subject: KYRA: (EOB) - implement memorize/pray spells menu

---
 engines/kyra/chargen.cpp       |  30 ++--
 engines/kyra/eobcommon.cpp     |   2 -
 engines/kyra/eobcommon.h       |  10 +-
 engines/kyra/gui_eob.cpp       | 324 +++++++++++++++++++++++++++++++++++++++--
 engines/kyra/gui_eob.h         |  13 +-
 engines/kyra/magic_eob.cpp     |   1 +
 engines/kyra/resource.h        |   8 +-
 engines/kyra/saveload_eob.cpp  |   6 +-
 engines/kyra/scene_eob.cpp     |   3 +-
 engines/kyra/staticres_eob.cpp |  30 +++-
 engines/kyra/timer_eob.cpp     |   2 +-
 11 files changed, 379 insertions(+), 50 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 380cc12a62..3147fbb850 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -172,7 +172,7 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 	_activeBox = 0;
 
 	for (bool loop = true; loop && (!_vm->shouldQuit()); ) {
-		_vm->_gui->highLightBoxFrame(_activeBox + 6);
+		_vm->_gui->updateBoxFrameHighLight(_activeBox + 6);
 		_vm->sound()->process();
 		int inputFlag = _vm->checkInput(_vm->_activeButtons, false, 0);
 		_vm->removeInputTop();
@@ -187,7 +187,7 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 				_vm->sound()->haltTrack();
 				return false;
 			}
-			_vm->_gui->highLightBoxFrame(-1);
+			_vm->_gui->updateBoxFrameHighLight(-1);
 		}
 
 		if (inputFlag & 0x8000) {
@@ -201,7 +201,7 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 		}
 
 		if (inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP5]) {
-			_vm->_gui->highLightBoxFrame(-1);
+			_vm->_gui->updateBoxFrameHighLight(-1);
 			if (_characters[_activeBox].name[0]) {
 				int b = _activeBox;
 				if (viewDeleteCharacter())
@@ -379,12 +379,12 @@ int CharacterGenerator::viewDeleteCharacter() {
 	initButtonsFromList(0, 7);
 	_vm->removeInputTop();
 
-	_vm->_gui->highLightBoxFrame(-1);
+	_vm->_gui->updateBoxFrameHighLight(-1);
 	printStats(_activeBox, 2);
 
 	int res = 0;
 	for (bool loop = true; loop && _characters[_activeBox].name[0] && !_vm->shouldQuit(); ) {
-		_vm->_gui->highLightBoxFrame(_activeBox + 6);
+		_vm->_gui->updateBoxFrameHighLight(_activeBox + 6);
 		_vm->sound()->process();
 
 		int inputFlag = _vm->checkInput(_vm->_activeButtons, false, 0);
@@ -423,14 +423,14 @@ int CharacterGenerator::viewDeleteCharacter() {
 		}
 
 		if (loop == false)
-			_vm->_gui->highLightBoxFrame(-1);
+			_vm->_gui->updateBoxFrameHighLight(-1);
 
 		if (!_characters[cbx].name[0])
 			loop = false;
 
 		if (cbx != _activeBox) {
 			_activeBox = cbx;
-			_vm->_gui->highLightBoxFrame(-1);
+			_vm->_gui->updateBoxFrameHighLight(-1);
 			if (loop)
 				printStats(_activeBox, 2);
 		}
@@ -753,8 +753,8 @@ void CharacterGenerator::statsAndFacesMenu() {
 		}
 	}
 
-	_vm->_gui->highLightBoxFrame(6 + _activeBox);
-	_vm->_gui->highLightBoxFrame(-1);
+	_vm->_gui->updateBoxFrameHighLight(6 + _activeBox);
+	_vm->_gui->updateBoxFrameHighLight(-1);
 }
 
 void CharacterGenerator::faceSelectMenu() {
@@ -769,7 +769,7 @@ void CharacterGenerator::faceSelectMenu() {
 	printStats(_activeBox, 4);
 	toggleSpecialButton(12, 0, 0);
 	toggleSpecialButton(13, 0, 0);
-	_vm->_gui->highLightBoxFrame(-1);
+	_vm->_gui->updateBoxFrameHighLight(-1);
 
 	shp = getNextFreeFaceShape(shp, charSex, 1, _chargenSelectedPortraits);
 
@@ -793,7 +793,7 @@ void CharacterGenerator::faceSelectMenu() {
 			in = _vm->checkInput(_vm->_activeButtons, false, 0);
 			_vm->removeInputTop();
 
-			_vm->_gui->highLightBoxFrame(box + 10);
+			_vm->_gui->updateBoxFrameHighLight(box + 10);
 
 			if (in == 0x8002 || in == _vm->_keyMap[Common::KEYCODE_RIGHT]) {
 				processSpecialButton(13);
@@ -813,7 +813,7 @@ void CharacterGenerator::faceSelectMenu() {
 			}
 		}
 
-		_vm->_gui->highLightBoxFrame(-1);
+		_vm->_gui->updateBoxFrameHighLight(-1);
 
 		if (in == 1)
 			shp = getNextFreeFaceShape(shp - 1, charSex, -1, _chargenSelectedPortraits);
@@ -824,7 +824,7 @@ void CharacterGenerator::faceSelectMenu() {
 	}
 
 	if (!_vm->shouldQuit()) {
-		_vm->_gui->highLightBoxFrame(-1);
+		_vm->_gui->updateBoxFrameHighLight(-1);
 		updateMagicShapes();
 
 		_chargenSelectedPortraits[_activeBox] = sp[res];
@@ -859,7 +859,7 @@ int CharacterGenerator::getNextFreeFaceShape(int shpIndex, int charSex, int step
 }
 
 void CharacterGenerator::processFaceMenuSelection(int index) {
-	_vm->_gui->highLightBoxFrame(-1);
+	_vm->_gui->updateBoxFrameHighLight(-1);
 	if (index <= 48)
 		_screen->drawShape(0, _characters[_activeBox].faceShape, _chargenBoxX[_activeBox], _chargenBoxY[_activeBox] + 1, 0);
 	else
@@ -1403,7 +1403,7 @@ const EobRect8 CharacterGenerator::_chargenButtonBodyCoords[] = {
 	{ 0x14, 0x90, 0x0B, 0x10 }
 };
 
-const EobRect16 GUI_Eob::_highLightBoxFrames[] = {
+const EobRect16 GUI_Eob::_updateBoxFrameHighLights[] = {
 	{ 0x00B7, 0x0001, 0x00F7, 0x0034 },
 	{ 0x00FF, 0x0001, 0x013F, 0x0034 },
 	{ 0x00B7, 0x0035, 0x00F7, 0x0068 },
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 7ec988ef1e..04739c2735 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -344,8 +344,6 @@ Common::Error EobCoreEngine::go() {
 	_screen->setMouseCursor(0, 0, _itemIconShapes[0]);
 	_screen->showMouse();
 
-	//initPlayBuffers
-
 	loadItemDefs();
 	int action = 0;
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 8b97ab361d..27e0dc9545 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -1006,11 +1006,13 @@ protected:
 	const char *const *_menuStringsSpellNo;
 
 	const uint8 *_spellLevelsMage;
+	int _spellLevelsMageSize;
 	const uint8 *_spellLevelsCleric;
-	const uint8 *_spellLevelsMps1;
-	const uint8 *_spellLevelsMps2;
-	const uint8 *_spellLevelsMps3;
-	const uint8 *_spellLevelsMps4;
+	int _spellLevelsClericSize;
+	const uint8 *_numSpellsCleric;
+	const uint8 *_numSpellsWisAdj;
+	const uint8 *_numSpellsPal;
+	const uint8 *_numSpellsMage;
 
 	// sound
 	void snd_playSoundEffect(int id, int volume=0xFF);
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 4fe5b6bed9..5d86b9c589 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -1445,11 +1445,18 @@ GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI_v1(vm), _vm(vm), _screen(vm->_screen)
 	_cflag = 0xffff;
 	
 	_menuLineSpacing = 0;
-	_menuUnk1 = 0;
+	//_menuUnk1 = 0;
 	_menuLastInFlags = 0;
 	_menuCur = 0;
 	_menuNumItems = 0;
 
+	_numPages = (_vm->game() == GI_EOB2) ? 8 : 5;
+	_numVisPages = (_vm->game() == GI_EOB2) ? 6 : 5;
+	_clericSpellAvltyFlags = (_vm->game() == GI_EOB2) ? 0xf7ffffff : 0x7bffff;
+	_paladinSpellAvltyFlags = (_vm->game() == GI_EOB2) ? 0xa9bbd1d : 0x800ff2;
+	_numAssignedSpellsOfType = new int8[72];
+	memset(_numAssignedSpellsOfType, 0, 72);
+
 	_charSelectRedraw = false;
 	
 	_updateBoxIndex = -1;
@@ -1463,6 +1470,8 @@ GUI_Eob::~GUI_Eob() {
 			delete _menuStringsPrefsTemp[i];
 		delete[] _menuStringsPrefsTemp;
 	}
+
+	delete[] _numAssignedSpellsOfType;
 }
 
 void GUI_Eob::processButton(Button *button) {
@@ -1970,7 +1979,7 @@ void GUI_Eob::simpleMenu_setup(int sd, int maxItem, const char *const *strings,
 
 	_screen->updateScreen();
 	_menuLineSpacing = lineSpacing;
-	_menuUnk1 = 0;
+	//_menuUnk1 = 0;
 	_menuLastInFlags = 0;
 	_vm->removeInputTop();
 }
@@ -2284,7 +2293,7 @@ int GUI_Eob::runLoadMenu(int x, int y) {
 	return 0;
 }
 
-void GUI_Eob::highLightBoxFrame(int box) {
+void GUI_Eob::updateBoxFrameHighLight(int box) {
 	static const uint8 colorTable[] = { 0x0F, 0xB0, 0xB2, 0xB4, 0xB6,
 		0xB8, 0xBA, 0xBC, 0x0C, 0xBC, 0xBA, 0xB8, 0xB6, 0xB4, 0xB2, 0xB0, 0x00
 	};
@@ -2299,7 +2308,7 @@ void GUI_Eob::highLightBoxFrame(int box) {
 		if (!colorTable[_updateBoxColorIndex])
 			_updateBoxColorIndex = 0;
 
-		const EobRect16 *r = &_highLightBoxFrames[_updateBoxIndex];
+		const EobRect16 *r = &_updateBoxFrameHighLights[_updateBoxIndex];
 		_screen->drawBox(r->x1, r->y1, r->x2, r->y2, colorTable[_updateBoxColorIndex++]);
 		_screen->updateScreen();
 
@@ -2307,7 +2316,7 @@ void GUI_Eob::highLightBoxFrame(int box) {
 
 	} else {
 		if (_updateBoxIndex != -1) {
-			const EobRect16 *r = &_highLightBoxFrames[_updateBoxIndex];
+			const EobRect16 *r = &_updateBoxFrameHighLights[_updateBoxIndex];
 			_screen->drawBox(r->x1, r->y1, r->x2, r->y2, 12);
 			_screen->updateScreen();
 		}
@@ -2458,9 +2467,283 @@ void GUI_Eob::runSaveMenu() {
 }
 
 void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
+	if (charIndex == -1)
+		return;
+
+	uint8 np[8];
+	memset(np, 0, sizeof(np));
+	uint32 avltyFlags = 0;
+	int li = 0;
+	int lv = 0;
+	
+	EobCharacter *c = &_vm->_characters[charIndex];
+	int8 wm = c->wisdomCur - 12;
+	if (wm < 0)
+		wm = 0;
+
+	if (spellType) {
+		li = _vm->getCharacterLevelIndex(2, c->cClass);
+		
+		if (li == -1) {
+			li = _vm->getCharacterLevelIndex(4, c->cClass);
+			
+			if (li != -1) {
+				lv = c->level[li] - 1;
+				if (lv < 0)
+					lv = 0;
+
+				for (int i = 0; i < _numPages; i++)
+					np[i] = _vm->_numSpellsPal[lv * _numPages + i];
+				
+				avltyFlags = _paladinSpellAvltyFlags;
+			}
+
+		} else {
+			lv = c->level[li] - 1;
+			for (int i = 0; i < _numPages; i++) {
+				np[i] = _vm->_numSpellsCleric[lv * _numPages + i];
+				if (np[i])
+					np[i] += _vm->_numSpellsWisAdj[wm * _numPages + i];
+			}
+			avltyFlags = _clericSpellAvltyFlags;
+		}
+
+	} else {
+		li = _vm->getCharacterLevelIndex(1, c->cClass);
+
+		if (li == -1) {
+			if (_vm->checkInventoryForRings(charIndex, 1)) {
+				np[3] <<= 1;
+				np[4] <<= 1;
+			}
+
+		} else {
+			lv = c->level[li] - 1;
+			for (int i = 0; i < _numPages; i++)
+				np[i] = _vm->_numSpellsMage[lv * _numPages + i];
+
+			avltyFlags = c->mageSpellsAvailabilityFlags;
+		}
+	}
+
+	int8 *menuSpellMap = new int8[88];
+	memset(menuSpellMap, 0, 88);
+	int8 *numAssignedSpellsPerBookPage = new int8[8];
+	memset(numAssignedSpellsPerBookPage, 0, 8);
+	memset(_numAssignedSpellsOfType, 0, 72);
+	int8 *lh = new int8[40];
+	memset(lh, 0, 40);
+
+	memcpy(lh, spellType ? _vm->_spellLevelsCleric : _vm->_spellLevelsMage, spellType ? _vm->_spellLevelsClericSize : _vm->_spellLevelsMageSize);
+	int8 *charSpellList = spellType ? c->clericSpells : c->mageSpells;
+
+	for (int i = 0; i < 80; i++) {
+		int8 s = charSpellList[i];
+		if (s == 0 || s == _vm->_spellLevelsClericSize)
+			continue;
+
+		if (s < 0)
+			s = -s;
+		else
+			_numAssignedSpellsOfType[s * 2 - 1]++;
+
+		s--;
+		_numAssignedSpellsOfType[s * 2]++;
+		numAssignedSpellsPerBookPage[lh[s] - 1]++;
+	}
+
+	for (int i = 0; i < 32; i++) {
+		if (!(avltyFlags & (1 << i)))
+			continue;
+		
+		int d = lh[i] - 1;
+		if (d < 0)
+			continue;
+
+		if (!spellType || (spellType && np[d])) {
+			menuSpellMap[d * 11]++;
+			menuSpellMap[d * 11 + menuSpellMap[d * 11]] = i + 1;
+		}
+	}
+
+	Button *buttonList = initMenu(4);
+
+	int lastHighLightText = -1;
+	int lastHighLightButton = -1;
+	int newHighLightButton = 0;
+	int newHighLightText = 0;
+	bool updateDesc = true;
+	bool updateList = true;
+
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+		updateBoxFrameHighLight(charIndex);
+
+		if (newHighLightButton < 0)
+			newHighLightButton = 7;
+		if (newHighLightButton > 7)
+			newHighLightButton = 0;
+
+		Button *b = 0;
+
+		if (lastHighLightButton != newHighLightButton) {
+			if (lastHighLightButton >= 0)
+				drawMenuButton(_vm->gui_getButton(buttonList, lastHighLightButton + 26), false, false, true);
+			drawMenuButton(_vm->gui_getButton(buttonList, newHighLightButton + 26), false, true, true);
+			newHighLightText = 0;
+			lastHighLightText = -1;
+			lastHighLightButton = newHighLightButton;
+			updateDesc = updateList = true;
+		}
+
+		if (updateList) {
+			updateList = false;
+			_screen->setCurPage(2);
+			for (int ii = 1; ii < 9; ii++)
+				memorizePrayMenuPrintString(menuSpellMap[lastHighLightButton * 11 + ii], ii - 1, spellType, false, false);
+
+			_screen->setCurPage(0);
+			_screen->copyRegion(0, 50, 0, 50, 176, 72, 2, 0, Screen::CR_NO_P_CHECK);
+			lastHighLightText = -1;
+		}
+
+		if (updateDesc) {
+			updateDesc = false;
+			_screen->printShadedText(Common::String::format(_vm->_menuStringsMgc[1], np[lastHighLightButton] - numAssignedSpellsPerBookPage[lastHighLightButton], np[lastHighLightButton]).c_str(), 8, 38, 9, _vm->_bkgColor_1);		
+		}
+
+		if (newHighLightText < 0)
+			newHighLightText = menuSpellMap[lastHighLightButton * 11] - 1;
+
+		if (menuSpellMap[lastHighLightButton * 11] <= newHighLightText)
+			newHighLightText = 0;
+		
+		if (newHighLightText != lastHighLightText) {
+			memorizePrayMenuPrintString(menuSpellMap[lastHighLightButton * 11 + lastHighLightText + 1], lastHighLightText, spellType, true, false);
+			memorizePrayMenuPrintString(menuSpellMap[lastHighLightButton * 11 + newHighLightText + 1], newHighLightText, spellType, true, true);
+			lastHighLightText = newHighLightText;
+		}
+		
+		int inputFlag = _vm->checkInput(buttonList, false, 0) & 0x80ff;
+		_vm->removeInputTop();
+
+		if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP6] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT]) {
+			inputFlag = 0x801a + ((lastHighLightButton + 1) % _numVisPages);
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT]) {
+			inputFlag = lastHighLightButton ? 0x8019 + lastHighLightButton : 0x8019 + _numVisPages;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE]) {
+			inputFlag = 0x8018;
+		} else {
+			Common::Point p = _vm->getMousePos();
+			if (_vm->posWithinRect(p.x, p.y, 8, 50, 168, 122)) {
+				newHighLightText = (p.y - 50 ) / 9;
+				if (menuSpellMap[lastHighLightButton * 11] - 1 < newHighLightText)
+					newHighLightText = menuSpellMap[lastHighLightButton * 11] - 1;
+			}			
+		}
+
+		if (inputFlag & 0x8000) {
+			Button *b = _vm->gui_getButton(buttonList, inputFlag & 0x7fff);
+			drawMenuButton(b, true, true, true);
+			_screen->updateScreen();
+			_vm->_system->delayMillis(80);
+			drawMenuButton(b, false, false, true);
+			_screen->updateScreen();
+		}
 
+		if (inputFlag == 0x8019 || inputFlag == _vm->_keyMap[Common::KEYCODE_KP_PLUS] || inputFlag == _vm->_keyMap[Common::KEYCODE_PLUS] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
+			if (np[lastHighLightButton] > numAssignedSpellsPerBookPage[lastHighLightButton] && lastHighLightText != -1) {
+				_numAssignedSpellsOfType[menuSpellMap[lastHighLightButton * 11 + lastHighLightText + 1] * 2 - 2]++;
+				numAssignedSpellsPerBookPage[lastHighLightButton]++;
+				memorizePrayMenuPrintString(menuSpellMap[lastHighLightButton * 11 + lastHighLightText + 1], lastHighLightText, spellType, false, true);
+				updateDesc = true;
+			}
+
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP_MINUS] || inputFlag == _vm->_keyMap[Common::KEYCODE_MINUS] /*|| inputFlag == _vm->_keyMap[Common::KEYCODE_*/) {
+			if (np[lastHighLightButton] && _numAssignedSpellsOfType[menuSpellMap[lastHighLightButton * 11 + lastHighLightText + 1] * 2 - 2]) {
+				_numAssignedSpellsOfType[menuSpellMap[lastHighLightButton * 11 + lastHighLightText + 1] * 2 - 2]--;
+				numAssignedSpellsPerBookPage[lastHighLightButton]--;
+				memorizePrayMenuPrintString(menuSpellMap[lastHighLightButton * 11 + lastHighLightText + 1], lastHighLightText, spellType, false, true);
+				updateDesc = true;
+			}
+
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP8]) {
+			newHighLightText = lastHighLightText - 1;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP2]) {
+			newHighLightText = lastHighLightText + 1;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_END] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP1]) {
+			newHighLightText = menuSpellMap[lastHighLightButton * 11] - 1;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_HOME] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP7]) {
+			newHighLightText = 0;
+		} else if (inputFlag == 0x8017) {
+			if (numAssignedSpellsPerBookPage[lastHighLightButton]) {
+				for (int i = 1; i <= menuSpellMap[lastHighLightButton * 11]; i++) {				
+					numAssignedSpellsPerBookPage[lastHighLightButton] -= _numAssignedSpellsOfType[menuSpellMap[lastHighLightButton * 11 + i] * 2 - 2];
+					_numAssignedSpellsOfType[menuSpellMap[lastHighLightButton * 11 + i] * 2 - 2] = 0;
+				}
+
+				updateDesc = updateList = true;
+			}
+
+		} else if (inputFlag == 0x8018) {
+			_vm->gui_drawAllCharPortraitsWithStats();
+			runLoop = false;
+
+		} else if (inputFlag & 0x8000) {
+			newHighLightButton = inputFlag - 0x801a;
+			if (newHighLightButton == lastHighLightButton)
+				drawMenuButton(_vm->gui_getButton(buttonList, inputFlag & 0x7fff), false, true, true);
+		}
+	}
+
+	releaseButtons(buttonList);
+	updateBoxFrameHighLight(-1);
+
+	_screen->setFont(Screen::FID_6_FNT);
+	_vm->gui_drawCharPortraitWithStats(charIndex);
+	_screen->setFont(Screen::FID_8_FNT);
+
+	memset(charSpellList, 0, 80);
+	if (spellType)
+		charSpellList[0] = _vm->_spellLevelsClericSize;
+
+	for (int i = 0; i < 32; i++) {
+		if (_numAssignedSpellsOfType[i * 2] < _numAssignedSpellsOfType[i * 2 + 1])
+			_numAssignedSpellsOfType[i * 2 + 1] = _numAssignedSpellsOfType[i * 2];
+
+		if (_numAssignedSpellsOfType[i * 2 + 1]) {
+			_numAssignedSpellsOfType[i * 2]--;
+			_numAssignedSpellsOfType[i * 2 + 1]--;
+
+			int pg = lh[i] - 1;
+			for (int ii = 0; ii < 10; ii++) {
+				if (!charSpellList[pg * 10 + ii]) {
+					charSpellList[pg * 10 + ii] = i + 1;
+					break;
+				}
+			}
+			i--;
+
+		} else if (_numAssignedSpellsOfType[i * 2]) {
+			_numAssignedSpellsOfType[i * 2]--;
+
+			_vm->_resting = true;
+			int pg = lh[i] - 1;
+			for (int ii = 0; ii < 10; ii++) {
+				if (!charSpellList[pg * 10 + ii]) {
+					charSpellList[pg * 10 + ii] = -(i + 1);
+					break;
+				}
+			}
+			i--;
+		}
+	}
+
+	delete[] menuSpellMap;
+	delete[] numAssignedSpellsPerBookPage;
+	delete[] lh;
 }
 
+
 void GUI_Eob::scribeScrollDialogue() {
 	
 }
@@ -2606,10 +2889,10 @@ int GUI_Eob::selectCharacterDialogue(int id) {
 		int inputFlag = _vm->checkInput(buttonList, false, 0);
 		_vm->removeInputTop();
 		
-		highLightBoxFrame(hlCur);
+		updateBoxFrameHighLight(hlCur);
 
 		if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP8] || inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_a] || inputFlag == _vm->_keyMap[Common::KEYCODE_w]) {
-			highLightBoxFrame(-1);
+			updateBoxFrameHighLight(-1);
 			_vm->gui_drawCharPortraitWithStats(hlCur--);
 			if (hlCur < 0)
 				hlCur = 5;
@@ -2619,7 +2902,7 @@ int GUI_Eob::selectCharacterDialogue(int id) {
 			}
 
 		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP6] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP2] || inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN] || inputFlag == _vm->_keyMap[Common::KEYCODE_z] || inputFlag == _vm->_keyMap[Common::KEYCODE_s]) {
-			highLightBoxFrame(-1);
+			updateBoxFrameHighLight(-1);
 			_vm->gui_drawCharPortraitWithStats(hlCur++);
 			if (hlCur == 6)
 				hlCur = 0;
@@ -2649,7 +2932,7 @@ int GUI_Eob::selectCharacterDialogue(int id) {
 		}
 	}
 
-	highLightBoxFrame(-1);
+	updateBoxFrameHighLight(-1);
 	if (hlCur >= 0)
 		_vm->gui_drawCharPortraitWithStats(hlCur);
 
@@ -2718,7 +3001,10 @@ Button *GUI_Eob::initMenu(int id) {
 	for (int i = 0; i < m->numButtons; i++) {
 		const EobMenuButtonDef *df = &_vm->_menuButtonDefs[m->firstButtonStrId + i];
 		Button *b = new Button;
-		b->index = m->firstButtonStrId + i + 1;		
+		b->index = m->firstButtonStrId + i + 1;
+		if (id == 4 && _vm->game() == GI_EOB1)
+			b->index -= 14;
+
 		b->data0Val2 = 12;
 		b->data1Val2 = b->data2Val2 = 15;
 		b->data3Val2 = 8;
@@ -2782,6 +3068,24 @@ void GUI_Eob::drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool n
 	_vm->gui_drawBox(x + 1, y + 1, w - 2, h - 2, _vm->_color1_1, _vm->_color2_1, noFill ? -1 : _vm->_bkgColor_1);
 }
 
+void GUI_Eob::memorizePrayMenuPrintString(int spellId, int bookPageIndex, int spellType, bool noFill, bool highLight) {
+	if (bookPageIndex < 0)
+		return;
+
+	int y = bookPageIndex * 9 + 50;
+
+	if (spellId) {
+		Common::String s(Common::String::format(_vm->_menuStringsMgc[0], spellType ? _vm->_clericSpellList[spellId] : _vm->_mageSpellList[spellId], _numAssignedSpellsOfType[spellId * 2 - 2]));
+		if (noFill)
+			_screen->printText(s.c_str(), 8, y, highLight ? 6 : 15, 0);
+		else
+			_screen->printShadedText(s.c_str(), 8, y, highLight ? 6 : 15, _vm->_bkgColor_1);
+
+	} else {
+		_screen->fillRect(6, y, 168, y + 8,  _vm->_bkgColor_1);
+	}
+}
+
 void GUI_Eob::updateOptionsStrings() {
 	for (int i = 0; i < 4; i++) {
 		delete _menuStringsPrefsTemp[i];
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index bb446f75a0..6d4edfde24 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -62,7 +62,7 @@ public:
 	void runCampMenu();
 	int runLoadMenu(int x, int y);
 
-	void highLightBoxFrame(int box);
+	void updateBoxFrameHighLight(int box);
 
 	int getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor);
 
@@ -89,6 +89,7 @@ private:
 	Button *initMenu(int id);	
 	void drawMenuButton(Button *b, bool clicked, bool highlight, bool noFill);
 	void drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool noFill);
+	void memorizePrayMenuPrintString(int spellId, int bookPageIndex, int spellType, bool noFill, bool highLight);
 	void updateOptionsStrings();
 	const char *getMenuString(int id);
 
@@ -118,9 +119,15 @@ private:
 	Button::Callback _scrollDownFunctor;
 
 	int _menuLineSpacing;
-	int _menuUnk1;
+	//int _menuUnk1;
 	int _menuLastInFlags;
 
+	uint8 _numPages;
+	uint8 _numVisPages;
+	int8 *_numAssignedSpellsOfType;
+	uint32 _clericSpellAvltyFlags;
+	uint32 _paladinSpellAvltyFlags;
+
 	int _menuCur;
 	int _menuNumItems;
 	bool _charSelectRedraw;
@@ -128,7 +135,7 @@ private:
 	int _updateBoxIndex;
 	int _updateBoxColorIndex;
 	uint32 _highLightBoxTimer;
-	static const EobRect16 _highLightBoxFrames[];
+	static const EobRect16 _updateBoxFrameHighLights[];
 
 	// unused
 	Button *getButtonListData() { return 0; }
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 8b6de927bf..77971da441 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -201,6 +201,7 @@ void EobCoreEngine::castSpell(int spell, int weaponSlot) {
 }
 
 void EobCoreEngine::removeCharacterEffect(int spell, int charIndex, int showWarning) {
+	assert(spell >= 0);
 	EobCharacter *c = &_characters[charIndex];
 	EobSpell *s = &_spells[spell];
 
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 5d9554c31f..441199ce6b 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -323,10 +323,10 @@ enum KyraResources {
 
 	kEobBaseSpellLevelsMage,
 	kEobBaseSpellLevelsCleric,
-	kEobBaseSpellMps1,
-	kEobBaseSpellMps2,
-	kEobBaseSpellMps3,
-	kEobBaseSpellMps4,
+	kEobBaseNumSpellsCleric,
+	kEobBaseNumSpellsWisAdj,
+	kEobBaseNumSpellsPal,
+	kEobBaseNumSpellsMage,
 
 	kEobBaseCharGuiStringsHp,
 	kEobBaseCharGuiStringsWp1,
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 85b94cd3d4..497be6fdce 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -352,6 +352,8 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 	}
 
 	if (_saveLoadMode != -1) {
+		if (_flags.gameID == GI_EOB1)
+			_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
 		loadLevel(_currentLevel, _currentSub);
 		_sceneUpdateRequired = true;
 		_screen->setFont(Screen::FID_6_FNT);
@@ -395,7 +397,6 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 
 	for (int i = 0; i < 6; i++) {
 		timerSpecialCharacterUpdate(0x30 + i);
-		uint32 ct = _system->getMillis();
 		EobCharacter *c = &_characters[i];
 
 		out->writeByte(c->id);
@@ -432,8 +433,9 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 		out->writeUint32BE(c->mageSpellsAvailabilityFlags);
 		for (int ii = 0; ii < 27; ii++)
 			out->writeSint16BE(c->inventory[ii]);
+		uint32 ct = _system->getMillis();
 		for (int ii = 0; ii < 10; ii++)
-			out->writeUint32BE(c->timers[ii] ? c->timers[ii] - ct : 0);
+			out->writeUint32BE((c->timers[ii] && c->timers[ii] > ct) ? c->timers[ii] - ct : 0);
 
 		out->write(c->events, 10);
 		out->write(c->effectsRemainder, 4);
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 56bf352b98..e92d813af9 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -740,10 +740,9 @@ Common::String EobCoreEngine::initLevelData(int sub){
 			pos += 11;
 			_screen->setShapeFadeMode(0, false);
 			_screen->setShapeFadeMode(1, false);
-		} ////////////////////
+		}
 		else
 			_screen->loadPalette(tmpStr.c_str(), _screen->getPalette(0));
-		////////////////////7
 
 		Palette backupPal(256);
 		backupPal.copy(_screen->getPalette(0), 224, 32, 224);
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 7908bc28ee..e348ef2616 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -388,12 +388,12 @@ void EobCoreEngine::initStaticResource() {
 	_menuStringsSpec = _staticres->loadStrings(kEobBaseMenuStringsSpec, temp);
 	_menuStringsSpellNo = _staticres->loadStrings(kEobBaseMenuStringsSpellNo, temp);
 
-	_spellLevelsMage = _staticres->loadRawData(kEobBaseSpellLevelsMage, temp);
-	_spellLevelsCleric = _staticres->loadRawData(kEobBaseSpellLevelsCleric, temp);
-	_spellLevelsMps1 = _staticres->loadRawData(kEobBaseSpellMps1, temp);
-	_spellLevelsMps2 = _staticres->loadRawData(kEobBaseSpellMps2, temp);
-	_spellLevelsMps3 = _staticres->loadRawData(kEobBaseSpellMps3, temp);
-	_spellLevelsMps4 = _staticres->loadRawData(kEobBaseSpellMps4, temp);
+	_spellLevelsMage = _staticres->loadRawData(kEobBaseSpellLevelsMage, _spellLevelsMageSize);
+	_spellLevelsCleric = _staticres->loadRawData(kEobBaseSpellLevelsCleric, _spellLevelsClericSize);
+	_numSpellsCleric = _staticres->loadRawData(kEobBaseNumSpellsCleric, temp);
+	_numSpellsWisAdj = _staticres->loadRawData(kEobBaseNumSpellsWisAdj, temp);
+	_numSpellsPal = _staticres->loadRawData(kEobBaseNumSpellsPal, temp);
+	_numSpellsMage = _staticres->loadRawData(kEobBaseNumSpellsMage, temp);
 
 	_characterGuiStringsHp = _staticres->loadStrings(kEobBaseCharGuiStringsHp, temp);
 	_characterGuiStringsWp = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharGuiStringsWp2 : kEobBaseCharGuiStringsWp1, temp);
@@ -656,7 +656,17 @@ void EobCoreEngine::initMenus() {
 		{  38,  16,  57,  32,  14,  22,  7  },
 		{  39, 128,  57,  32,  14,  51,  7  },
 		{  8,  128, 126,  40,  14,  19,  7  },
-		{  0,    0,  50, 168,  72,  61,  0  }
+		{  0,    0,  50, 168,  72,  61,  0  },
+		// EOB 1 memorize/pray menu:
+		{  36,   8, 126,  48,  14,  48,  5  },
+		{  8,  128, 126,  40,  14,  19,  5  },
+		{  0,    0,  50, 168,  72,  61,  0  },
+		{  31,   8,  16,  24,  20,   2,  5  },
+		{  32,  40,  16,  24,  20,   3,  5  },
+		{  33,  72,  16,  24,  20,   4,  5  },
+		{  34, 104,  16,  24,  20,   5,  5  },
+		{  35, 136,  16,  24,  20,   6,  5  },
+		{  31,   8,  16,  24,  20,   2,  5  }
 	};
 
 	_menuButtonDefs = buttonDefs;
@@ -674,6 +684,12 @@ void EobCoreEngine::initMenus() {
 	delete[] _menuDefs;
 	_menuDefs = new EobMenuDef[ARRAYSIZE(menuDefs)];
 	memcpy(_menuDefs, menuDefs, sizeof(menuDefs));
+	
+	if (_flags.gameID == GI_EOB1) {
+		// assign EOB 1 style memorize/pray menu
+		_menuDefs[4].numButtons = 8;
+		_menuDefs[4].firstButtonStrId = 36;
+	}
 }
 
 
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 70b89bee9c..f6e8b63dc1 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -264,7 +264,7 @@ void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
 		int evt = c->events[i];
 
 		if (evt < 0) {
-			removeCharacterEffect(evt, charIndex, 1);
+			removeCharacterEffect(-evt, charIndex, 1);
 			continue;
 		}
 
-- 
cgit v1.2.3


From 76bfcf834d73a9578164842ed5ab8e1eff2814e8 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Wed, 16 Nov 2011 19:16:19 +0100
Subject: KYRA: (EOB) - some refactoring

---
 engines/kyra/eobcommon.cpp     |   1 -
 engines/kyra/eobcommon.h       |   5 +-
 engines/kyra/gui.cpp           | 628 +++-------------------------------------
 engines/kyra/gui.h             | 159 +----------
 engines/kyra/gui_eob.cpp       |  54 ++--
 engines/kyra/gui_eob.h         |  27 +-
 engines/kyra/gui_lok.h         |   2 +-
 engines/kyra/gui_lol.cpp       |  40 ---
 engines/kyra/gui_lol.h         |   7 +-
 engines/kyra/gui_v1.cpp        | 630 +++++++++++++++++++++++++++++++++++++++++
 engines/kyra/gui_v1.h          | 198 +++++++++++++
 engines/kyra/gui_v2.h          |   2 +-
 engines/kyra/kyra_hof.h        |   2 +-
 engines/kyra/kyra_lok.h        |   2 +-
 engines/kyra/kyra_mr.h         |   2 +-
 engines/kyra/kyra_v1.cpp       |   2 +-
 engines/kyra/kyra_v1.h         |   5 +-
 engines/kyra/kyra_v2.h         |   2 +-
 engines/kyra/lol.cpp           |   2 +-
 engines/kyra/lol.h             |   2 +-
 engines/kyra/loleobbase.h      |   2 +-
 engines/kyra/module.mk         |   1 +
 engines/kyra/staticres_eob.cpp |   3 +-
 23 files changed, 944 insertions(+), 834 deletions(-)
 create mode 100644 engines/kyra/gui_v1.cpp
 create mode 100644 engines/kyra/gui_v1.h

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 04739c2735..0cc2f5ab75 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -47,7 +47,6 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_runFlag = true;
 	_saveLoadMode = 0;
 	_configMouse = true;
-	_resting = false;
 
 	_largeItemShapes = _smallItemShapes = _thrownItemShapes = _spellShapes = _firebeamShapes = _itemIconShapes =
 		_wallOfForceShapes = _teleporterShapes = _sparkShapes = _compassShapes = 0;
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 27e0dc9545..0f9210ee5e 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -251,7 +251,7 @@ public:
 	virtual ~EobCoreEngine();
 
 	Screen *screen() { return _screen; }
-	GUI_v1 *gui() const { return _gui; }
+	GUI *gui() const { return _gui; }
 
 protected:
 	// Startup
@@ -786,8 +786,7 @@ protected:
 	void releaseMonsterTempData(LevelTempData *tmp);
 
 	int _saveLoadMode;
-	bool _resting;
-
+	
 	Screen_Eob *_screen;
 	GUI_Eob *_gui;
 
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index 3a5d79817e..47461637b1 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -20,352 +20,33 @@
  *
  */
 
-#include "kyra/gui.h"
 
-#include "kyra/text.h"
-#include "kyra/wsamovie.h"
+#include "kyra/gui.h"
+#include "kyra/kyra_v1.h"
+#include "kyra/util.h"
 
 #include "common/savefile.h"
 #include "common/system.h"
 
-namespace Kyra {
-
-GUI_v1::GUI_v1(KyraEngine_v1 *kyra)
-	: _vm(kyra), _screen(kyra->screen()), _text(kyra->text()) {
-	_menuButtonList = 0;
-
-	_redrawButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawButtonCallback);
-	_redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawShadedButtonCallback);
-}
-
-Button *GUI_v1::addButtonToList(Button *list, Button *newButton) {
-	if (!newButton)
-		return list;
-
-	newButton->nextButton = 0;
-
-	if (list) {
-		Button *cur = list;
-		while (cur->nextButton)
-			cur = cur->nextButton;
-		cur->nextButton = newButton;
-	} else {
-		list = newButton;
-	}
-
-	return list;
-}
-
-void GUI_v1::initMenuLayout(Menu &menu) {
-	if (menu.x == -1)
-		menu.x = (320 - menu.width) >> 1;
-	if (menu.y == -1)
-		menu.y = (200 - menu.height) >> 1;
-
-	for (int i = 0; i < menu.numberOfItems; ++i) {
-		if (menu.item[i].x == -1)
-			menu.item[i].x = (menu.width - menu.item[i].width) >> 1;
-	}
-}
-
-void GUI_v1::initMenu(Menu &menu) {
-	_menuButtonList = 0;
-
-	_screen->hideMouse();
-
-	int textX;
-	int textY;
-
-	int menu_x2 = menu.width  + menu.x - 1;
-	int menu_y2 = menu.height + menu.y - 1;
-
-	_screen->fillRect(menu.x + 2, menu.y + 2, menu_x2 - 2, menu_y2 - 2, menu.bkgdColor);
-	_screen->drawShadedBox(menu.x, menu.y, menu_x2, menu_y2, menu.color1, menu.color2);
-
-	if (menu.titleX != -1)
-		textX = menu.titleX;
-	else
-		textX = getMenuCenterStringX(getMenuTitle(menu), menu.x, menu_x2);
 
-	textY = menu.y + menu.titleY;
-
-	if (_vm->game() == GI_LOL) {
-		printMenuText(getMenuTitle(menu), textX, textY, menu.textColor, 0, 9);
-	} else {
-		if (_vm->gameFlags().platform != Common::kPlatformAmiga)
-			printMenuText(getMenuTitle(menu), textX - 1, textY + 1, defaultColor1(), defaultColor2(), 0);
-		printMenuText(getMenuTitle(menu), textX, textY, menu.textColor, 0, 0);
-	}
-
-	int x1, y1, x2, y2;
-	for (int i = 0; i < menu.numberOfItems; ++i) {
-		if (!menu.item[i].enabled)
-			continue;
-
-		x1 = menu.x + menu.item[i].x;
-		y1 = menu.y + menu.item[i].y;
-
-		x2 = x1 + menu.item[i].width - 1;
-		y2 = y1 + menu.item[i].height - 1;
-
-		if (i < 7) {
-			Button *menuButtonData = getButtonListData() + i;
-			menuButtonData->nextButton = 0;
-			menuButtonData->x = x1;
-			menuButtonData->y = y1;
-			menuButtonData->width  = menu.item[i].width - 1;
-			menuButtonData->height = menu.item[i].height - 1;
-			menuButtonData->buttonCallback = menu.item[i].callback;
-			menuButtonData->keyCode = menu.item[i].keyCode;
-			menuButtonData->keyCode2 = 0;
-			menuButtonData->arg = menu.item[i].itemId;
-
-			_menuButtonList = addButtonToList(_menuButtonList, menuButtonData);
-		}
-
-		_screen->fillRect(x1, y1, x2, y2, menu.item[i].bkgdColor);
-		_screen->drawShadedBox(x1, y1, x2, y2, menu.item[i].color1, menu.item[i].color2);
-
-		if (getMenuItemTitle(menu.item[i])) {
-			if (menu.item[i].titleX != -1)
-				textX = x1 + menu.item[i].titleX + 3;
-			else
-				textX = getMenuCenterStringX(getMenuItemTitle(menu.item[i]), x1, x2);
-
-			textY = y1 + 2;
-			if (_vm->game() == GI_LOL) {
-				textY++;
-				if (i == menu.highlightedItem)
-					printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].highlightColor, 0, 8);
-				else
-					printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 8);
-			} else {
-				Screen::FontId of = _screen->_currentFont;
-				if (menu.item[i].saveSlot > 0)
-					_screen->setFont(Screen::FID_8_FNT);
-
-				if (_vm->gameFlags().platform != Common::kPlatformAmiga)
-					printMenuText(getMenuItemTitle(menu.item[i]), textX - 1, textY + 1, defaultColor1(), 0, 0);
-
-				if (i == menu.highlightedItem)
-					printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].highlightColor, 0, 0);
-				else
-					printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 0);
-
-				_screen->setFont(of);
-			}
-		}
-	}
-
-	for (int i = 0; i < menu.numberOfItems; ++i) {
-		if (getMenuItemLabel(menu.item[i])) {
-			if (_vm->game() == GI_LOL) {
-				menu.item[i].labelX = menu.item[i].x - 1;
-				menu.item[i].labelY = menu.item[i].y + 3;
-				printMenuText(getMenuItemLabel(menu.item[i]), menu.x + menu.item[i].labelX, menu.y + menu.item[i].labelY, menu.item[i].textColor, 0, 10);
-			} else {
-				if (_vm->gameFlags().platform != Common::kPlatformAmiga)
-					printMenuText(getMenuItemLabel(menu.item[i]), menu.x + menu.item[i].labelX - 1, menu.y + menu.item[i].labelY + 1, defaultColor1(), 0, 0);
-				printMenuText(getMenuItemLabel(menu.item[i]), menu.x + menu.item[i].labelX, menu.y + menu.item[i].labelY, menu.item[i].textColor, 0, 0);
-			}
-		}
-	}
-
-	if (menu.scrollUpButtonX != -1) {
-		Button *scrollUpButton = getScrollUpButton();
-		scrollUpButton->x = menu.scrollUpButtonX + menu.x;
-		scrollUpButton->y = menu.scrollUpButtonY + menu.y;
-		scrollUpButton->buttonCallback = getScrollUpButtonHandler();
-		scrollUpButton->nextButton = 0;
-		scrollUpButton->mouseWheel = -1;
-
-		_menuButtonList = addButtonToList(_menuButtonList, scrollUpButton);
-		updateMenuButton(scrollUpButton);
-
-		Button *scrollDownButton = getScrollDownButton();
-		scrollDownButton->x = menu.scrollDownButtonX + menu.x;
-		scrollDownButton->y = menu.scrollDownButtonY + menu.y;
-		scrollDownButton->buttonCallback = getScrollDownButtonHandler();
-		scrollDownButton->nextButton = 0;
-		scrollDownButton->mouseWheel = 1;
-
-		_menuButtonList = addButtonToList(_menuButtonList, scrollDownButton);
-		updateMenuButton(scrollDownButton);
-	}
-
-	_screen->showMouse();
-	_screen->updateScreen();
-}
-
-void GUI_v1::processHighlights(Menu &menu) {
-	int x1, y1, x2, y2;
-	Common::Point p = _vm->getMousePos();
-	int mouseX = p.x;
-	int mouseY = p.y;
-
-	if (_vm->game() == GI_LOL && menu.highlightedItem != 255) {
-		// LoL doesnt't have default highlighted items.
-		// We use a highlightedItem value of 255 for this.
-
-		// With LoL no highlighting should take place unless the
-		// mouse cursor moves over a button. The highlighting should end
-		// when the mouse cursor leaves the button.
-		if (menu.item[menu.highlightedItem].enabled)
-			redrawText(menu);
-	}
-
-	for (int i = 0; i < menu.numberOfItems; ++i) {
-		if (!menu.item[i].enabled)
-			continue;
-
-		x1 = menu.x + menu.item[i].x;
-		y1 = menu.y + menu.item[i].y;
-
-		x2 = x1 + menu.item[i].width;
-		y2 = y1 + menu.item[i].height;
-
-		if (mouseX > x1 && mouseX < x2 &&
-			mouseY > y1 && mouseY < y2) {
-
-			if (menu.highlightedItem != i || _vm->game() == GI_LOL) {
-				if (_vm->game() != GI_LOL) {
-					if (menu.item[menu.highlightedItem].enabled)
-						redrawText(menu);
-				}
-
-				menu.highlightedItem = i;
-				redrawHighlight(menu);
-			}
-		}
-	}
-
-	_screen->updateScreen();
-}
-
-void GUI_v1::redrawText(const Menu &menu) {
-	int textX;
-	int i = menu.highlightedItem;
-
-	int x1 = menu.x + menu.item[i].x;
-	int y1 = menu.y + menu.item[i].y;
-
-	int x2 = x1 + menu.item[i].width - 1;
-
-	if (menu.item[i].titleX >= 0)
-		textX = x1 + menu.item[i].titleX + 3;
-	else
-		textX = getMenuCenterStringX(getMenuItemTitle(menu.item[i]), x1, x2);
+namespace Kyra {
 
-	int textY = y1 + 2;
-	if (_vm->game() == GI_LOL) {
-		textY++;
-		printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 8);
-	} else {
-		Screen::FontId of = _screen->_currentFont;
-		if (menu.item[i].saveSlot > 0)
-			_screen->setFont(Screen::FID_8_FNT);
-		if (_vm->gameFlags().platform != Common::kPlatformAmiga)
-			printMenuText(getMenuItemTitle(menu.item[i]), textX - 1, textY + 1, defaultColor1(), 0, 0);
-		printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 0);
-		_screen->setFont(of);
-	}
+GUI::GUI(KyraEngine_v1 *kyra) : _vm(kyra), _screen(kyra->screen()) {
+	_savegameListUpdateNeeded = false;
+	_savegameListSize = 0;
+	_savegameList = 0;
 }
 
-void GUI_v1::redrawHighlight(const Menu &menu) {
-	int textX;
-	int i = menu.highlightedItem;
-
-	int x1 = menu.x + menu.item[i].x;
-	int y1 = menu.y + menu.item[i].y;
-
-	int x2 = x1 + menu.item[i].width - 1;
-
-	if (menu.item[i].titleX != -1)
-		textX = x1 + menu.item[i].titleX + 3;
-	else
-		textX = getMenuCenterStringX(getMenuItemTitle(menu.item[i]), x1, x2);
-
-	int textY = y1 + 2;
-
-	if (_vm->game() == GI_LOL) {
-		textY++;
-		printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].highlightColor, 0, 8);
-	} else {
-		Screen::FontId of = _screen->_currentFont;
-		if (menu.item[i].saveSlot > 0)
-			_screen->setFont(Screen::FID_8_FNT);
-		if (_vm->gameFlags().platform != Common::kPlatformAmiga)
-			printMenuText(getMenuItemTitle(menu.item[i]), textX - 1, textY + 1, defaultColor1(), 0, 0);
-		printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].highlightColor, 0, 0);
-		_screen->setFont(of);
+GUI::~GUI() {
+	if (_savegameList) {
+		for (int i = 0; i < _savegameListSize; i++)
+			delete[] _savegameList[i];
+		delete[] _savegameList;
+		_savegameList = 0;
 	}
 }
 
-void GUI_v1::updateAllMenuButtons() {
-	for (Button *cur = _menuButtonList; cur; cur = cur->nextButton)
-		updateMenuButton(cur);
-}
-
-void GUI_v1::updateMenuButton(Button *button) {
-	if (!_displayMenu)
-		return;
-
-	_screen->hideMouse();
-	updateButton(button);
-	_screen->updateScreen();
-	_screen->showMouse();
-}
-
-void GUI_v1::updateButton(Button *button) {
-	if (!button || (button->flags & 8))
-		return;
-
-	if (button->flags2 & 1)
-		button->flags2 &= 0xFFF7;
-	else
-		button->flags2 |= 8;
-
-	button->flags2 &= 0xFFFC;
-
-	if (button->flags2 & 4)
-		button->flags2 |= 0x10;
-	else
-		button->flags2 &= 0xEEEF;
-
-	button->flags2 &= 0xFFFB;
-
-	processButton(button);
-}
-
-int GUI_v1::redrawButtonCallback(Button *button) {
-	if (!_displayMenu)
-		return 0;
-
-	_screen->hideMouse();
-	if (_vm->gameFlags().platform == Common::kPlatformAmiga)
-		_screen->drawBox(button->x + 1, button->y + 1, button->x + button->width - 1, button->y + button->height - 1, 17);
-	else
-		_screen->drawBox(button->x + 1, button->y + 1, button->x + button->width - 1, button->y + button->height - 1, 0xF8);
-	_screen->showMouse();
-
-	return 0;
-}
-
-int GUI_v1::redrawShadedButtonCallback(Button *button) {
-	if (!_displayMenu)
-		return 0;
-
-	_screen->hideMouse();
-	if (_vm->gameFlags().platform == Common::kPlatformAmiga)
-		_screen->drawShadedBox(button->x, button->y, button->x + button->width, button->y + button->height, 31, 18);
-	else
-		_screen->drawShadedBox(button->x, button->y, button->x + button->width, button->y + button->height, 0xF9, 0xFA);
-	_screen->showMouse();
-
-	return 0;
-}
-
-void GUI_v1::updateSaveList(bool excludeQuickSaves) {
+void GUI::updateSaveList(bool excludeQuickSaves) {
 	Common::String pattern = _vm->_targetName + ".???";
 	Common::StringArray saveFileList = _vm->_saveFileMan->listSavefiles(pattern);
 	_saveSlots.clear();
@@ -391,13 +72,13 @@ void GUI_v1::updateSaveList(bool excludeQuickSaves) {
 	sortSaveSlots();
 }
 
-void GUI_v1::sortSaveSlots() {
+void GUI::sortSaveSlots() {
 	Common::sort(_saveSlots.begin(), _saveSlots.end(), Common::Less<int>());
 	if (_saveSlots.size() > 2)
 		Common::sort(_saveSlots.begin()+1, _saveSlots.end(), Common::Greater<int>());
 }
 
-int GUI_v1::getNextSavegameSlot() {
+int GUI::getNextSavegameSlot() {
 	Common::InSaveFile *in;
 
 	int start = _vm->game() == GI_LOL ? 0 : 1;
@@ -412,266 +93,47 @@ int GUI_v1::getNextSavegameSlot() {
 	return 0;
 }
 
-void GUI_v1::checkTextfieldInput() {
-	Common::Event event;
-
-	uint32 now = _vm->_system->getMillis();
-
-	bool running = true;
-	int keys = 0;
-	while (running && _vm->_eventMan->pollEvent(event)) {
-		switch (event.type) {
-		case Common::EVENT_KEYDOWN:
-			if (event.kbd.keycode == Common::KEYCODE_q && event.kbd.hasFlags(Common::KBD_CTRL))
-				_vm->quitGame();
-			else
-				_keyPressed = event.kbd;
-			running = false;
-			break;
-
-		case Common::EVENT_LBUTTONDOWN:
-		case Common::EVENT_LBUTTONUP: {
-			Common::Point pos = _vm->getMousePos();
-			_vm->_mouseX = pos.x;
-			_vm->_mouseY = pos.y;
-			keys = event.type == Common::EVENT_LBUTTONDOWN ? 199 : (200 | 0x800);
-			running = false;
-			} break;
-
-		case Common::EVENT_MOUSEMOVE: {
-			Common::Point pos = _vm->getMousePos();
-			_vm->_mouseX = pos.x;
-			_vm->_mouseY = pos.y;
-
-			_vm->_system->updateScreen();
-			_lastScreenUpdate = now;
-			} break;
-
-		default:
-			break;
-		}
-	}
-
-	if (now - _lastScreenUpdate > 50) {
-		_vm->_system->updateScreen();
-		_lastScreenUpdate = now;
-	}
-
-	processButtonList(_menuButtonList, keys | 0x8000, 0);
-	_vm->_system->delayMillis(3);
-}
-
-void GUI_v1::printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 c2) {
-	_text->printText(str, x, y, c0, c1, c2);
-}
-
-int GUI_v1::getMenuCenterStringX(const char *str, int x1, int x2) {
-	return _text->getCenterStringX(str, x1, x2);
-}
-
-#pragma mark -
-
-MainMenu::MainMenu(KyraEngine_v1 *vm) : _vm(vm), _screen(0) {
-	_screen = _vm->screen();
-	_nextUpdate = 0;
-	_system = g_system;
-}
-
-void MainMenu::init(StaticData data, Animation anim) {
-	_static = data;
-	_anim = anim;
-	_animIntern.curFrame = _anim.startFrame;
-	_animIntern.direction = 1;
-}
-
-void MainMenu::updateAnimation() {
-	if (_anim.anim) {
-		uint32 now = _system->getMillis();
-		if (now > _nextUpdate) {
-			_nextUpdate = now + _anim.delay * _vm->tickLength();
-
-			_anim.anim->displayFrame(_animIntern.curFrame, 0, 0, 0, 0, 0, 0);
-			_animIntern.curFrame += _animIntern.direction;
-			if (_animIntern.curFrame < _anim.startFrame) {
-				_animIntern.curFrame = _anim.startFrame;
-				_animIntern.direction = 1;
-			} else if (_animIntern.curFrame > _anim.endFrame) {
-				_animIntern.curFrame = _anim.endFrame;
-				_animIntern.direction = -1;
-			}
-		}
-	}
-
-	_screen->updateScreen();
-}
-
-bool MainMenu::getInput() {
-	Common::Event event;
-	Common::EventManager *eventMan = _vm->getEventManager();
-
-	bool updateScreen = false;
-
-	while (eventMan->pollEvent(event)) {
-		switch (event.type) {
-		case Common::EVENT_LBUTTONUP:
-			return true;
+void GUI::updateSavegameList() {
+	if (!_savegameListUpdateNeeded)
+		return;
 
-		case Common::EVENT_MOUSEMOVE:
-			updateScreen = true;
-			break;
+	_savegameListUpdateNeeded = false;
 
-		default:
-			break;
-		}
+	if (_savegameList) {
+		for (int i = 0; i < _savegameListSize; i++)
+			delete[] _savegameList[i];
+		delete[] _savegameList;
 	}
 
-	if (updateScreen)
-		_system->updateScreen();
-	return false;
-}
-
-int MainMenu::handle(int dim) {
-	int command = -1;
-
-	uint8 colorMap[16];
-	memset(colorMap, 0, sizeof(colorMap));
-	_screen->setTextColorMap(colorMap);
-
-	Screen::FontId oldFont = _screen->setFont(_static.font);
-	int charWidthBackUp = _screen->_charWidth;
-
-	if (_vm->game() != GI_LOL)
-		_screen->_charWidth = -2;
-	_screen->setScreenDim(dim);
-
-	int backUpX = _screen->_curDim->sx;
-	int backUpY = _screen->_curDim->sy;
-	int backUpWidth = _screen->_curDim->w;
-	int backUpHeight = _screen->_curDim->h;
-	_screen->copyRegion(backUpX, backUpY, backUpX, backUpY, backUpWidth, backUpHeight, 0, 3);
-
-	int x = _screen->_curDim->sx << 3;
-	int y = _screen->_curDim->sy;
-	int width = _screen->_curDim->w << 3;
-	int height =  _screen->_curDim->h;
-
-	drawBox(x, y, width, height, 1);
-	drawBox(x + 1, y + 1, width - 2, height - 2, 0);
+	updateSaveList(true);
+	_savegameListSize = _saveSlots.size();
 
-	int selected = 0;
+	if (_savegameListSize) {
+		Common::sort(_saveSlots.begin(), _saveSlots.end(), Common::Greater<int>());
 
-	draw(selected);
+		KyraEngine_v1::SaveHeader header;
+		Common::InSaveFile *in;
 
-	while (!_screen->isMouseVisible())
-		_screen->showMouse();
+		_savegameList = new char *[_savegameListSize];
 
-	int fh = _screen->getFontHeight();
-	if (_vm->gameFlags().lang == Common::JA_JPN)
-		fh++;
-
-	int textPos = ((_screen->_curDim->w >> 1) + _screen->_curDim->sx) << 3;
-
-	Common::Rect menuRect(x + 16, y + 4, x + width - 16, y + 4 + fh * _static.menuTable[3]);
-
-	while (!_vm->shouldQuit()) {
-		updateAnimation();
-		bool mousePressed = getInput();
-
-		Common::Point mouse = _vm->getMousePos();
-		if (menuRect.contains(mouse)) {
-			int item = (mouse.y - menuRect.top) / fh;
-
-			if (item != selected) {
-				printString("%s", textPos, menuRect.top + selected * fh, _static.menuTable[5], 0, 5, _static.strings[selected]);
-				printString("%s", textPos, menuRect.top + item * fh, _static.menuTable[6], 0, 5, _static.strings[item]);
-
-				selected = item;
-			}
-
-			if (mousePressed) {
-				for (int i = 0; i < 3; i++) {
-					printString("%s", textPos, menuRect.top + selected * fh, _static.menuTable[5], 0, 5, _static.strings[selected]);
-					_screen->updateScreen();
-					_system->delayMillis(50);
-					printString("%s", textPos, menuRect.top + selected * fh, _static.menuTable[6], 0, 5, _static.strings[selected]);
-					_screen->updateScreen();
-					_system->delayMillis(50);
-				}
-				command = item;
-				break;
+		for (int i = 0; i < _savegameListSize; i++) {
+			in = _vm->openSaveForReading(_vm->getSavegameFilename(i), header);
+			if (in) {
+				_savegameList[i] = new char[header.description.size() + 1];
+				Common::strlcpy(_savegameList[i], header.description.c_str(), header.description.size() + 1);
+				Util::convertISOToDOS(_savegameList[i]);
+				delete in;
+			} else {
+				_savegameList[i] = 0;
+				error("GUI::updateSavegameList(): Unexpected missing save file for slot: %d.", i);
 			}
 		}
-		_system->delayMillis(10);
-	}
-
-	if (_vm->shouldQuit())
-		command = -1;
 
-	_screen->copyRegion(backUpX, backUpY, backUpX, backUpY, backUpWidth, backUpHeight, 3, 0);
-	_screen->_charWidth = charWidthBackUp;
-	_screen->setFont(oldFont);
-
-	return command;
-}
-
-void MainMenu::draw(int select) {
-	int top = _screen->_curDim->sy;
-	top += _static.menuTable[1];
-	int fh = _screen->getFontHeight();
-	if (_vm->gameFlags().lang == Common::JA_JPN)
-		fh++;
-
-	for (int i = 0; i < _static.menuTable[3]; ++i) {
-		int curY = top + i * fh;
-		int color = (i == select) ? _static.menuTable[6] : _static.menuTable[5];
-		printString("%s", ((_screen->_curDim->w >> 1) + _screen->_curDim->sx) << 3, curY, color, 0, 5, _static.strings[i]);
+	} else {
+		_savegameList = 0;
 	}
 }
 
-void MainMenu::drawBox(int x, int y, int w, int h, int fill) {
-	--w; --h;
-
-	if (fill)
-		_screen->fillRect(x, y, x+w, y+h, _static.colorTable[0]);
-
-	_screen->drawClippedLine(x, y+h, x+w, y+h, _static.colorTable[1]);
-	_screen->drawClippedLine(x+w, y, x+w, y+h, _static.colorTable[1]);
-	_screen->drawClippedLine(x, y, x+w, y, _static.colorTable[2]);
-	_screen->drawClippedLine(x, y, x, y+h, _static.colorTable[2]);
-
-	_screen->setPagePixel(_screen->_curPage, x, y+h, _static.colorTable[3]);
-	_screen->setPagePixel(_screen->_curPage, x+w, y, _static.colorTable[3]);
-}
-
-void MainMenu::printString(const char *format, int x, int y, int col1, int col2, int flags, ...) {
-	if (!format)
-		return;
-
-	va_list vaList;
-	va_start(vaList, flags);
-	Common::String string = Common::String::vformat(format, vaList);
-	va_end(vaList);
-
-	if (flags & 1)
-		x -= _screen->getTextWidth(string.c_str()) >> 1;
-
-	if (flags & 2)
-		x -= _screen->getTextWidth(string.c_str());
-
-	if (_vm->gameFlags().use16ColorMode)
-		flags &= 3;
-
-	if (flags & 4) {
-		_screen->printText(string.c_str(), x - 1, y, _static.altColor, col2);
-		_screen->printText(string.c_str(), x, y + 1, _static.altColor, col2);
-	}
+} // End of namespace Kyra
 
-	if (flags & 8) {
-		_screen->printText(string.c_str(), x - 1, y, 227, col2);
-		_screen->printText(string.c_str(), x, y + 1, 227, col2);
-	}
 
-	_screen->printText(string.c_str(), x, y, col1, col2);
-}
-
-} // End of namespace Kyra
diff --git a/engines/kyra/gui.h b/engines/kyra/gui.h
index 597f088c0d..efca845482 100644
--- a/engines/kyra/gui.h
+++ b/engines/kyra/gui.h
@@ -93,118 +93,24 @@ struct Button {
 	uint16 arg;
 };
 
-struct MenuItem {
-	bool enabled;
-
-	const char *itemString;
-	uint16 itemId;
-
-	int16 x, y;
-	uint16 width, height;
-
-	uint8 textColor, highlightColor;
-
-	int16 titleX;
-
-	uint8 color1, color2;
-	uint8 bkgdColor;
-
-	Button::Callback callback;
-
-	int16 saveSlot;
-
-	const char *labelString;
-	uint16 labelId;
-	int16 labelX, labelY;
-
-	uint16 keyCode;
-};
-
-struct Menu {
-	int16 x, y;
-	uint16 width, height;
-
-	uint8 bkgdColor;
-	uint8 color1, color2;
-
-	const char *menuNameString;
-	uint16 menuNameId;
-
-	uint8 textColor;
-	int16 titleX, titleY;
-
-	uint8 highlightedItem;
-
-	uint8 numberOfItems;
-
-	int16 scrollUpButtonX, scrollUpButtonY;
-	int16 scrollDownButtonX, scrollDownButtonY;
-
-	MenuItem item[7];
-};
-
 class Screen;
 class TextDisplayer;
 
-class GUI_v1 {
+class GUI {
 public:
-	GUI_v1(KyraEngine_v1 *vm);
-	virtual ~GUI_v1() {}
+	GUI(KyraEngine_v1 *vm);
+	virtual ~GUI();
 
 	// button specific
-	virtual Button *addButtonToList(Button *list, Button *newButton);
-
 	virtual void processButton(Button *button) = 0;
 	virtual int processButtonList(Button *buttonList, uint16 inputFlags, int8 mouseWheel) = 0;
 
-	virtual int redrawShadedButtonCallback(Button *button);
-	virtual int redrawButtonCallback(Button *button);
-
-	// menu specific
-	virtual void initMenuLayout(Menu &menu);
-	void initMenu(Menu &menu);
-
-	void processHighlights(Menu &menu);
-
 	// utilities for thumbnail creation
 	virtual void createScreenThumbnail(Graphics::Surface &dst) = 0;
 
 protected:
 	KyraEngine_v1 *_vm;
 	Screen *_screen;
-	TextDisplayer *_text;
-
-	Button *_menuButtonList;
-	bool _displayMenu;
-	bool _displaySubMenu;
-	bool _cancelSubMenu;
-
-	virtual void printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 c2);
-	virtual int getMenuCenterStringX(const char *str, int x1, int x2);
-
-	Button::Callback _redrawShadedButtonFunctor;
-	Button::Callback _redrawButtonFunctor;
-
-	virtual Button *getButtonListData() = 0;
-	virtual Button *getScrollUpButton() = 0;
-	virtual Button *getScrollDownButton() = 0;
-
-	virtual Button::Callback getScrollUpButtonHandler() const = 0;
-	virtual Button::Callback getScrollDownButtonHandler() const = 0;
-
-	virtual uint8 defaultColor1() const = 0;
-	virtual uint8 defaultColor2() const = 0;
-
-	virtual const char *getMenuTitle(const Menu &menu) = 0;
-	virtual const char *getMenuItemTitle(const MenuItem &menuItem) = 0;
-	virtual const char *getMenuItemLabel(const MenuItem &menuItem) = 0;
-
-	void updateAllMenuButtons();
-	void updateMenuButton(Button *button);
-	virtual void updateButton(Button *button);
-
-	void redrawText(const Menu &menu);
-	void redrawHighlight(const Menu &menu);
 
 	// The engine expects a list of contiguous savegame indices.
 	// Since ScummVM's savegame indices aren't, we re-index them.
@@ -212,65 +118,18 @@ protected:
 	Common::Array<int> _saveSlots;
 	void updateSaveList(bool excludeQuickSaves = false);
 	int getNextSavegameSlot();
+	void updateSavegameList();
 
 	virtual void sortSaveSlots();
 
 	uint32 _lastScreenUpdate;
-	Common::KeyState _keyPressed;
-	void checkTextfieldInput();
-};
-
-class Movie;
+	char **_savegameList;
+	int _savegameListSize;
+	bool _savegameListUpdateNeeded;
 
-class MainMenu {
-public:
-	MainMenu(KyraEngine_v1 *vm);
-	virtual ~MainMenu() {}
-
-	struct Animation {
-		Animation() : anim(0), startFrame(0), endFrame(0), delay(0) {}
-
-		Movie *anim;
-		int startFrame;
-		int endFrame;
-		int delay;
-	};
-
-	struct StaticData {
-		const char *strings[5];
-
-		uint8 menuTable[7];
-		uint8 colorTable[4];
-
-		Screen::FontId font;
-		uint8 altColor;
-	};
-
-	void init(StaticData data, Animation anim);
-	int handle(int dim);
-private:
-	KyraEngine_v1 *_vm;
-	Screen *_screen;
-	OSystem *_system;
-
-	StaticData _static;
-	struct AnimIntern {
-		int curFrame;
-		int direction;
-	};
-	Animation _anim;
-	AnimIntern _animIntern;
-
-	uint32 _nextUpdate;
-
-	void updateAnimation();
-	void draw(int select);
-	void drawBox(int x, int y, int w, int h, int fill);
-	bool getInput();
-
-	void printString(const char *string, int x, int y, int col1, int col2, int flags, ...) GCC_PRINTF(2, 8);
+	Common::KeyState _keyPressed;
 };
 
-} // end of namesapce Kyra
+} // End of namespace Kyra
 
 #endif
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 5d86b9c589..6eab4a0083 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -29,6 +29,7 @@
 #include "kyra/util.h"
 
 #include "common/system.h"
+#include "common/savefile.h"
 
 namespace Kyra {
 
@@ -1428,12 +1429,9 @@ void EobCoreEngine::gui_processInventorySlotClick(int slot) {
 	}
 }
 
-GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI_v1(vm), _vm(vm), _screen(vm->_screen) {
+GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 	_scrollUpFunctor = _scrollDownFunctor = BUTTON_FUNCTOR(GUI_Eob, this, 0);
 
-	_redrawButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawButtonCallback);
-	_redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawShadedButtonCallback);
-
 	_menuStringsPrefsTemp = new char*[4];
 	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char*));
 
@@ -1445,7 +1443,6 @@ GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI_v1(vm), _vm(vm), _screen(vm->_screen)
 	_cflag = 0xffff;
 	
 	_menuLineSpacing = 0;
-	//_menuUnk1 = 0;
 	_menuLastInFlags = 0;
 	_menuCur = 0;
 	_menuNumItems = 0;
@@ -1462,6 +1459,7 @@ GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI_v1(vm), _vm(vm), _screen(vm->_screen)
 	_updateBoxIndex = -1;
 	_highLightBoxTimer = 0;
 	_updateBoxColorIndex = 0;
+	_needRest = false;
 }
 
 GUI_Eob::~GUI_Eob() {
@@ -1979,7 +1977,6 @@ void GUI_Eob::simpleMenu_setup(int sd, int maxItem, const char *const *strings,
 
 	_screen->updateScreen();
 	_menuLineSpacing = lineSpacing;
-	//_menuUnk1 = 0;
 	_menuLastInFlags = 0;
 	_vm->removeInputTop();
 }
@@ -2081,7 +2078,7 @@ void GUI_Eob::runCampMenu() {
 	bool redrawPortraits = false;
 	bool res = false;
 	_charSelectRedraw = false;
-	_vm->_resting = false;
+	_needRest = false;
 	Button *buttonList = 0;
 
 	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
@@ -2164,7 +2161,7 @@ void GUI_Eob::runCampMenu() {
 				if (_vm->restParty())
 					runLoop = false;
 				else
-					_vm->_resting = false;
+					_needRest = false;
 				redrawPortraits = true;
 				break;
 
@@ -2192,7 +2189,7 @@ void GUI_Eob::runCampMenu() {
 				break;
 
 			case 0x8007:
-				if (_vm->_resting)
+				if (_needRest)
 					displayTextBox(44);
 				// fall through
 
@@ -2207,11 +2204,17 @@ void GUI_Eob::runCampMenu() {
 				break;
 
 			case 0x8008:
-				// load
+				if (runLoadMenu(0, 0))
+					runLoop = false;
+				else
+					newMenu = 1;
 				break;
 
 			case 0x8009:
-				// save
+				if (runSaveMenu(0, 0))
+					displayTextBox(14);
+				else
+					newMenu = 1;
 				break;
 
 			case 0x800a:
@@ -2289,8 +2292,21 @@ void GUI_Eob::runCampMenu() {
 	_screen->setFont(of);
 }
 
-int GUI_Eob::runLoadMenu(int x, int y) {
-	return 0;
+bool GUI_Eob::runLoadMenu(int x, int y) {
+	const ScreenDim *dm = _screen->getScreenDim(11);
+	int xo = dm->sx;
+	int yo = dm->sy;
+	bool result = false;
+	_savegameListUpdateNeeded = true;
+	
+	_screen->modifyScreenDim(11, dm->sx + (x >> 8), dm->sy + y, dm->w, dm->sy);
+	
+	updateSavegameList();
+	setupSaveMenuSlots();
+
+	_screen->modifyScreenDim(11, xo, yo, dm->w, dm->sy);
+
+	return result;
 }
 
 void GUI_Eob::updateBoxFrameHighLight(int box) {
@@ -2462,8 +2478,8 @@ void GUI_Eob::simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuIt
 	_menuCur = 0;
 }
 
-void GUI_Eob::runSaveMenu() {
-
+bool GUI_Eob::runSaveMenu(int x, int y) {
+	return true;
 }
 
 void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
@@ -2642,7 +2658,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 		}
 
 		if (inputFlag & 0x8000) {
-			Button *b = _vm->gui_getButton(buttonList, inputFlag & 0x7fff);
+			b = _vm->gui_getButton(buttonList, inputFlag & 0x7fff);
 			drawMenuButton(b, true, true, true);
 			_screen->updateScreen();
 			_vm->_system->delayMillis(80);
@@ -2726,7 +2742,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 		} else if (_numAssignedSpellsOfType[i * 2]) {
 			_numAssignedSpellsOfType[i * 2]--;
 
-			_vm->_resting = true;
+			_needRest = true;
 			int pg = lh[i] - 1;
 			for (int ii = 0; ii < 10; ii++) {
 				if (!charSpellList[pg * 10 + ii]) {
@@ -3164,6 +3180,10 @@ void GUI_Eob::releaseButtons(Button *list) {
 	}
 }
 
+void GUI_Eob::setupSaveMenuSlots() {
+
+}
+
 #endif // ENABLE_EOB
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index 6d4edfde24..c8e9744152 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -41,7 +41,7 @@ struct EobRect16 {
 class DarkMoonEngine;
 class Screen_Eob;
 
-class GUI_Eob : public GUI_v1 {
+class GUI_Eob : public GUI {
 	friend class EobCoreEngine;
 	friend class CharacterGenerator;
 public:
@@ -58,9 +58,9 @@ public:
 	void simpleMenu_setup(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int unk, int lineSpacing);
 	int simpleMenu_process(int sd, const char *const *strings, void *b, int32 menuItemsMask, int unk);	
 
-	// Button based menus (camp menu, options, save/load)
+	// Button based menus (camp menu, load menu)
 	void runCampMenu();
-	int runLoadMenu(int x, int y);
+	bool runLoadMenu(int x, int y);
 
 	void updateBoxFrameHighLight(int box);
 
@@ -78,7 +78,7 @@ private:
 	void simpleMenu_flashSelection(const char *str, int x, int y, int color1, int color2, int color3);
 	void simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int unk);
 
-	void runSaveMenu();
+	bool runSaveMenu(int x, int y);
 	void runMemorizePrayMenu(int charIndex, int spellType);
 	void scribeScrollDialogue();
 
@@ -96,6 +96,8 @@ private:
 	Button *linkButton(Button *list, Button *newbt);
 	void releaseButtons(Button *list);
 
+	void setupSaveMenuSlots();
+
 	Button _scrollUpButton;//////////////////77
 	Button _scrollDownButton;
 
@@ -119,7 +121,6 @@ private:
 	Button::Callback _scrollDownFunctor;
 
 	int _menuLineSpacing;
-	//int _menuUnk1;
 	int _menuLastInFlags;
 
 	uint8 _numPages;
@@ -127,6 +128,7 @@ private:
 	int8 *_numAssignedSpellsOfType;
 	uint32 _clericSpellAvltyFlags;
 	uint32 _paladinSpellAvltyFlags;
+	bool _needRest;
 
 	int _menuCur;
 	int _menuNumItems;
@@ -136,21 +138,6 @@ private:
 	int _updateBoxColorIndex;
 	uint32 _highLightBoxTimer;
 	static const EobRect16 _updateBoxFrameHighLights[];
-
-	// unused
-	Button *getButtonListData() { return 0; }
-	Button *getScrollUpButton() { return &_scrollUpButton; }
-	Button *getScrollDownButton() { return &_scrollDownButton; }
-
-	Button::Callback getScrollUpButtonHandler() const { return _scrollUpFunctor; }
-	Button::Callback getScrollDownButtonHandler() const { return _scrollDownFunctor; }
-
-	uint8 defaultColor1() const { return 0xFE; }
-	uint8 defaultColor2() const { return 0x00; }
-
-	const char *getMenuTitle(const Menu &menu) { return 0; }
-	const char *getMenuItemTitle(const MenuItem &menuItem) { return 0; }
-	const char *getMenuItemLabel(const MenuItem &menuItem) { return 0; }
 };
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/gui_lok.h b/engines/kyra/gui_lok.h
index 1d1060312d..d3e0beaa9e 100644
--- a/engines/kyra/gui_lok.h
+++ b/engines/kyra/gui_lok.h
@@ -23,7 +23,7 @@
 #ifndef KYRA_GUI_LOK_H
 #define KYRA_GUI_LOK_H
 
-#include "kyra/gui.h"
+#include "kyra/gui_v1.h"
 #include "kyra/screen_lok.h"
 
 namespace Kyra {
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index 681caf93b1..ac3d16be67 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -1848,8 +1848,6 @@ GUI_LoL::GUI_LoL(LoLEngine *vm) : GUI_v1(vm), _vm(vm), _screen(vm->_screen) {
 	_specialProcessButton = _backUpButtonList = 0;
 	_flagsModifier = 0;
 	_sliderSfx = 11;
-	_savegameList = 0;
-	_savegameListSize = 0;
 }
 
 void GUI_LoL::processButton(Button *button) {
@@ -2530,44 +2528,6 @@ void GUI_LoL::setupSaveMenuSlots(Menu &menu, int num) {
 	}
 }
 
-void GUI_LoL::updateSavegameList() {
-	if (!_savegameListUpdateNeeded)
-		return;
-
-	_savegameListUpdateNeeded = false;
-
-	if (_savegameList) {
-		for (int i = 0; i < _savegameListSize; i++)
-			delete[] _savegameList[i];
-		delete[] _savegameList;
-	}
-
-	updateSaveList(true);
-	_savegameListSize = _saveSlots.size();
-
-	if (_savegameListSize) {
-		LoLEngine::SaveHeader header;
-		Common::InSaveFile *in;
-
-		_savegameList = new char *[_savegameListSize];
-
-		for (int i = 0; i < _savegameListSize; i++) {
-			in = _vm->openSaveForReading(_vm->getSavegameFilename(_saveSlots[i]), header);
-			if (in) {
-				_savegameList[i] = new char[header.description.size() + 1];
-				Common::strlcpy(_savegameList[i], header.description.c_str(), header.description.size() + 1);
-				Util::convertISOToDOS(_savegameList[i]);
-				delete in;
-			} else {
-				_savegameList[i] = 0;
-				warning("GUI_LoL::updateSavegameList(): Unexpected missing save file for slot: %d.", _saveSlots[i]);
-			}
-		}
-	} else {
-		_savegameList = 0;
-	}
-}
-
 void GUI_LoL::sortSaveSlots() {
 	Common::sort(_saveSlots.begin(), _saveSlots.end(), Common::Greater<int>());
 }
diff --git a/engines/kyra/gui_lol.h b/engines/kyra/gui_lol.h
index 3a8135a1b9..dbf54e41f0 100644
--- a/engines/kyra/gui_lol.h
+++ b/engines/kyra/gui_lol.h
@@ -25,7 +25,7 @@
 #ifndef KYRA_GUI_LOL_H
 #define KYRA_GUI_LOL_H
 
-#include "kyra/gui.h"
+#include "kyra/gui_v1.h"
 
 namespace Kyra {
 #define GUI_LOL_MENU(menu, a, b, c, d, e, f, g, i) \
@@ -112,7 +112,6 @@ private:
 	void restorePage0();
 
 	void setupSaveMenuSlots(Menu &menu, int num);
-	void updateSavegameList();
 
 	void printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 flags);
 	int getMenuCenterStringX(const char *str, int x1, int x2);
@@ -170,10 +169,6 @@ private:
 	Button::Callback _scrollUpFunctor;
 	Button::Callback _scrollDownFunctor;
 
-	char **_savegameList;
-	int _savegameListSize;
-	bool _savegameListUpdateNeeded;
-
 	virtual void sortSaveSlots();
 };
 
diff --git a/engines/kyra/gui_v1.cpp b/engines/kyra/gui_v1.cpp
new file mode 100644
index 0000000000..c38c828ff0
--- /dev/null
+++ b/engines/kyra/gui_v1.cpp
@@ -0,0 +1,630 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 "kyra/gui_v1.h"
+
+#include "kyra/text.h"
+#include "kyra/wsamovie.h"
+
+#include "common/savefile.h"
+#include "common/system.h"
+
+namespace Kyra {
+
+GUI_v1::GUI_v1(KyraEngine_v1 *kyra) : GUI(kyra), _text(kyra->text()) {
+	_menuButtonList = 0;
+
+	_redrawButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawButtonCallback);
+	_redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::redrawShadedButtonCallback);
+}
+
+Button *GUI_v1::addButtonToList(Button *list, Button *newButton) {
+	if (!newButton)
+		return list;
+
+	newButton->nextButton = 0;
+
+	if (list) {
+		Button *cur = list;
+		while (cur->nextButton)
+			cur = cur->nextButton;
+		cur->nextButton = newButton;
+	} else {
+		list = newButton;
+	}
+
+	return list;
+}
+
+void GUI_v1::initMenuLayout(Menu &menu) {
+	if (menu.x == -1)
+		menu.x = (320 - menu.width) >> 1;
+	if (menu.y == -1)
+		menu.y = (200 - menu.height) >> 1;
+
+	for (int i = 0; i < menu.numberOfItems; ++i) {
+		if (menu.item[i].x == -1)
+			menu.item[i].x = (menu.width - menu.item[i].width) >> 1;
+	}
+}
+
+void GUI_v1::initMenu(Menu &menu) {
+	_menuButtonList = 0;
+
+	_screen->hideMouse();
+
+	int textX;
+	int textY;
+
+	int menu_x2 = menu.width  + menu.x - 1;
+	int menu_y2 = menu.height + menu.y - 1;
+
+	_screen->fillRect(menu.x + 2, menu.y + 2, menu_x2 - 2, menu_y2 - 2, menu.bkgdColor);
+	_screen->drawShadedBox(menu.x, menu.y, menu_x2, menu_y2, menu.color1, menu.color2);
+
+	if (menu.titleX != -1)
+		textX = menu.titleX;
+	else
+		textX = getMenuCenterStringX(getMenuTitle(menu), menu.x, menu_x2);
+
+	textY = menu.y + menu.titleY;
+
+	if (_vm->game() == GI_LOL) {
+		printMenuText(getMenuTitle(menu), textX, textY, menu.textColor, 0, 9);
+	} else {
+		if (_vm->gameFlags().platform != Common::kPlatformAmiga)
+			printMenuText(getMenuTitle(menu), textX - 1, textY + 1, defaultColor1(), defaultColor2(), 0);
+		printMenuText(getMenuTitle(menu), textX, textY, menu.textColor, 0, 0);
+	}
+
+	int x1, y1, x2, y2;
+	for (int i = 0; i < menu.numberOfItems; ++i) {
+		if (!menu.item[i].enabled)
+			continue;
+
+		x1 = menu.x + menu.item[i].x;
+		y1 = menu.y + menu.item[i].y;
+
+		x2 = x1 + menu.item[i].width - 1;
+		y2 = y1 + menu.item[i].height - 1;
+
+		if (i < 7) {
+			Button *menuButtonData = getButtonListData() + i;
+			menuButtonData->nextButton = 0;
+			menuButtonData->x = x1;
+			menuButtonData->y = y1;
+			menuButtonData->width  = menu.item[i].width - 1;
+			menuButtonData->height = menu.item[i].height - 1;
+			menuButtonData->buttonCallback = menu.item[i].callback;
+			menuButtonData->keyCode = menu.item[i].keyCode;
+			menuButtonData->keyCode2 = 0;
+			menuButtonData->arg = menu.item[i].itemId;
+
+			_menuButtonList = addButtonToList(_menuButtonList, menuButtonData);
+		}
+
+		_screen->fillRect(x1, y1, x2, y2, menu.item[i].bkgdColor);
+		_screen->drawShadedBox(x1, y1, x2, y2, menu.item[i].color1, menu.item[i].color2);
+
+		if (getMenuItemTitle(menu.item[i])) {
+			if (menu.item[i].titleX != -1)
+				textX = x1 + menu.item[i].titleX + 3;
+			else
+				textX = getMenuCenterStringX(getMenuItemTitle(menu.item[i]), x1, x2);
+
+			textY = y1 + 2;
+			if (_vm->game() == GI_LOL) {
+				textY++;
+				if (i == menu.highlightedItem)
+					printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].highlightColor, 0, 8);
+				else
+					printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 8);
+			} else {
+				Screen::FontId of = _screen->_currentFont;
+				if (menu.item[i].saveSlot > 0)
+					_screen->setFont(Screen::FID_8_FNT);
+
+				if (_vm->gameFlags().platform != Common::kPlatformAmiga)
+					printMenuText(getMenuItemTitle(menu.item[i]), textX - 1, textY + 1, defaultColor1(), 0, 0);
+
+				if (i == menu.highlightedItem)
+					printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].highlightColor, 0, 0);
+				else
+					printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 0);
+
+				_screen->setFont(of);
+			}
+		}
+	}
+
+	for (int i = 0; i < menu.numberOfItems; ++i) {
+		if (getMenuItemLabel(menu.item[i])) {
+			if (_vm->game() == GI_LOL) {
+				menu.item[i].labelX = menu.item[i].x - 1;
+				menu.item[i].labelY = menu.item[i].y + 3;
+				printMenuText(getMenuItemLabel(menu.item[i]), menu.x + menu.item[i].labelX, menu.y + menu.item[i].labelY, menu.item[i].textColor, 0, 10);
+			} else {
+				if (_vm->gameFlags().platform != Common::kPlatformAmiga)
+					printMenuText(getMenuItemLabel(menu.item[i]), menu.x + menu.item[i].labelX - 1, menu.y + menu.item[i].labelY + 1, defaultColor1(), 0, 0);
+				printMenuText(getMenuItemLabel(menu.item[i]), menu.x + menu.item[i].labelX, menu.y + menu.item[i].labelY, menu.item[i].textColor, 0, 0);
+			}
+		}
+	}
+
+	if (menu.scrollUpButtonX != -1) {
+		Button *scrollUpButton = getScrollUpButton();
+		scrollUpButton->x = menu.scrollUpButtonX + menu.x;
+		scrollUpButton->y = menu.scrollUpButtonY + menu.y;
+		scrollUpButton->buttonCallback = getScrollUpButtonHandler();
+		scrollUpButton->nextButton = 0;
+		scrollUpButton->mouseWheel = -1;
+
+		_menuButtonList = addButtonToList(_menuButtonList, scrollUpButton);
+		updateMenuButton(scrollUpButton);
+
+		Button *scrollDownButton = getScrollDownButton();
+		scrollDownButton->x = menu.scrollDownButtonX + menu.x;
+		scrollDownButton->y = menu.scrollDownButtonY + menu.y;
+		scrollDownButton->buttonCallback = getScrollDownButtonHandler();
+		scrollDownButton->nextButton = 0;
+		scrollDownButton->mouseWheel = 1;
+
+		_menuButtonList = addButtonToList(_menuButtonList, scrollDownButton);
+		updateMenuButton(scrollDownButton);
+	}
+
+	_screen->showMouse();
+	_screen->updateScreen();
+}
+
+void GUI_v1::processHighlights(Menu &menu) {
+	int x1, y1, x2, y2;
+	Common::Point p = _vm->getMousePos();
+	int mouseX = p.x;
+	int mouseY = p.y;
+
+	if (_vm->game() == GI_LOL && menu.highlightedItem != 255) {
+		// LoL doesnt't have default highlighted items.
+		// We use a highlightedItem value of 255 for this.
+
+		// With LoL no highlighting should take place unless the
+		// mouse cursor moves over a button. The highlighting should end
+		// when the mouse cursor leaves the button.
+		if (menu.item[menu.highlightedItem].enabled)
+			redrawText(menu);
+	}
+
+	for (int i = 0; i < menu.numberOfItems; ++i) {
+		if (!menu.item[i].enabled)
+			continue;
+
+		x1 = menu.x + menu.item[i].x;
+		y1 = menu.y + menu.item[i].y;
+
+		x2 = x1 + menu.item[i].width;
+		y2 = y1 + menu.item[i].height;
+
+		if (mouseX > x1 && mouseX < x2 &&
+			mouseY > y1 && mouseY < y2) {
+
+			if (menu.highlightedItem != i || _vm->game() == GI_LOL) {
+				if (_vm->game() != GI_LOL) {
+					if (menu.item[menu.highlightedItem].enabled)
+						redrawText(menu);
+				}
+
+				menu.highlightedItem = i;
+				redrawHighlight(menu);
+			}
+		}
+	}
+
+	_screen->updateScreen();
+}
+
+void GUI_v1::redrawText(const Menu &menu) {
+	int textX;
+	int i = menu.highlightedItem;
+
+	int x1 = menu.x + menu.item[i].x;
+	int y1 = menu.y + menu.item[i].y;
+
+	int x2 = x1 + menu.item[i].width - 1;
+
+	if (menu.item[i].titleX >= 0)
+		textX = x1 + menu.item[i].titleX + 3;
+	else
+		textX = getMenuCenterStringX(getMenuItemTitle(menu.item[i]), x1, x2);
+
+	int textY = y1 + 2;
+	if (_vm->game() == GI_LOL) {
+		textY++;
+		printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 8);
+	} else {
+		Screen::FontId of = _screen->_currentFont;
+		if (menu.item[i].saveSlot > 0)
+			_screen->setFont(Screen::FID_8_FNT);
+		if (_vm->gameFlags().platform != Common::kPlatformAmiga)
+			printMenuText(getMenuItemTitle(menu.item[i]), textX - 1, textY + 1, defaultColor1(), 0, 0);
+		printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 0);
+		_screen->setFont(of);
+	}
+}
+
+void GUI_v1::redrawHighlight(const Menu &menu) {
+	int textX;
+	int i = menu.highlightedItem;
+
+	int x1 = menu.x + menu.item[i].x;
+	int y1 = menu.y + menu.item[i].y;
+
+	int x2 = x1 + menu.item[i].width - 1;
+
+	if (menu.item[i].titleX != -1)
+		textX = x1 + menu.item[i].titleX + 3;
+	else
+		textX = getMenuCenterStringX(getMenuItemTitle(menu.item[i]), x1, x2);
+
+	int textY = y1 + 2;
+
+	if (_vm->game() == GI_LOL) {
+		textY++;
+		printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].highlightColor, 0, 8);
+	} else {
+		Screen::FontId of = _screen->_currentFont;
+		if (menu.item[i].saveSlot > 0)
+			_screen->setFont(Screen::FID_8_FNT);
+		if (_vm->gameFlags().platform != Common::kPlatformAmiga)
+			printMenuText(getMenuItemTitle(menu.item[i]), textX - 1, textY + 1, defaultColor1(), 0, 0);
+		printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].highlightColor, 0, 0);
+		_screen->setFont(of);
+	}
+}
+
+void GUI_v1::updateAllMenuButtons() {
+	for (Button *cur = _menuButtonList; cur; cur = cur->nextButton)
+		updateMenuButton(cur);
+}
+
+void GUI_v1::updateMenuButton(Button *button) {
+	if (!_displayMenu)
+		return;
+
+	_screen->hideMouse();
+	updateButton(button);
+	_screen->updateScreen();
+	_screen->showMouse();
+}
+
+void GUI_v1::updateButton(Button *button) {
+	if (!button || (button->flags & 8))
+		return;
+
+	if (button->flags2 & 1)
+		button->flags2 &= 0xFFF7;
+	else
+		button->flags2 |= 8;
+
+	button->flags2 &= 0xFFFC;
+
+	if (button->flags2 & 4)
+		button->flags2 |= 0x10;
+	else
+		button->flags2 &= 0xEEEF;
+
+	button->flags2 &= 0xFFFB;
+
+	processButton(button);
+}
+
+int GUI_v1::redrawButtonCallback(Button *button) {
+	if (!_displayMenu)
+		return 0;
+
+	_screen->hideMouse();
+	if (_vm->gameFlags().platform == Common::kPlatformAmiga)
+		_screen->drawBox(button->x + 1, button->y + 1, button->x + button->width - 1, button->y + button->height - 1, 17);
+	else
+		_screen->drawBox(button->x + 1, button->y + 1, button->x + button->width - 1, button->y + button->height - 1, 0xF8);
+	_screen->showMouse();
+
+	return 0;
+}
+
+int GUI_v1::redrawShadedButtonCallback(Button *button) {
+	if (!_displayMenu)
+		return 0;
+
+	_screen->hideMouse();
+	if (_vm->gameFlags().platform == Common::kPlatformAmiga)
+		_screen->drawShadedBox(button->x, button->y, button->x + button->width, button->y + button->height, 31, 18);
+	else
+		_screen->drawShadedBox(button->x, button->y, button->x + button->width, button->y + button->height, 0xF9, 0xFA);
+	_screen->showMouse();
+
+	return 0;
+}
+
+void GUI_v1::checkTextfieldInput() {
+	Common::Event event;
+
+	uint32 now = _vm->_system->getMillis();
+
+	bool running = true;
+	int keys = 0;
+	while (_vm->_eventMan->pollEvent(event) && running) {
+		switch (event.type) {
+		case Common::EVENT_KEYDOWN:
+			if (event.kbd.keycode == Common::KEYCODE_q && event.kbd.hasFlags(Common::KBD_CTRL))
+				_vm->quitGame();
+			else
+				_keyPressed = event.kbd;
+			running = false;
+			break;
+
+		case Common::EVENT_LBUTTONDOWN:
+		case Common::EVENT_LBUTTONUP: {
+			Common::Point pos = _vm->getMousePos();
+			_vm->_mouseX = pos.x;
+			_vm->_mouseY = pos.y;
+			keys = event.type == Common::EVENT_LBUTTONDOWN ? 199 : (200 | 0x800);
+			running = false;
+			} break;
+
+		case Common::EVENT_MOUSEMOVE: {
+			Common::Point pos = _vm->getMousePos();
+			_vm->_mouseX = pos.x;
+			_vm->_mouseY = pos.y;
+
+			_vm->_system->updateScreen();
+			_lastScreenUpdate = now;
+			} break;
+
+		default:
+			break;
+		}
+	}
+
+	if (now - _lastScreenUpdate > 50) {
+		_vm->_system->updateScreen();
+		_lastScreenUpdate = now;
+	}
+
+	processButtonList(_menuButtonList, keys | 0x8000, 0);
+	_vm->_system->delayMillis(3);
+}
+
+void GUI_v1::printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 c2) {
+	_text->printText(str, x, y, c0, c1, c2);
+}
+
+int GUI_v1::getMenuCenterStringX(const char *str, int x1, int x2) {
+	return _text->getCenterStringX(str, x1, x2);
+}
+
+#pragma mark -
+
+MainMenu::MainMenu(KyraEngine_v1 *vm) : _vm(vm), _screen(0) {
+	_screen = _vm->screen();
+	_nextUpdate = 0;
+	_system = g_system;
+}
+
+void MainMenu::init(StaticData data, Animation anim) {
+	_static = data;
+	_anim = anim;
+	_animIntern.curFrame = _anim.startFrame;
+	_animIntern.direction = 1;
+}
+
+void MainMenu::updateAnimation() {
+	if (_anim.anim) {
+		uint32 now = _system->getMillis();
+		if (now > _nextUpdate) {
+			_nextUpdate = now + _anim.delay * _vm->tickLength();
+
+			_anim.anim->displayFrame(_animIntern.curFrame, 0, 0, 0, 0, 0, 0);
+			_animIntern.curFrame += _animIntern.direction;
+			if (_animIntern.curFrame < _anim.startFrame) {
+				_animIntern.curFrame = _anim.startFrame;
+				_animIntern.direction = 1;
+			} else if (_animIntern.curFrame > _anim.endFrame) {
+				_animIntern.curFrame = _anim.endFrame;
+				_animIntern.direction = -1;
+			}
+		}
+	}
+
+	_screen->updateScreen();
+}
+
+bool MainMenu::getInput() {
+	Common::Event event;
+	Common::EventManager *eventMan = _vm->getEventManager();
+
+	bool updateScreen = false;
+
+	while (eventMan->pollEvent(event)) {
+		switch (event.type) {
+		case Common::EVENT_LBUTTONUP:
+			return true;
+
+		case Common::EVENT_MOUSEMOVE:
+			updateScreen = true;
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	if (updateScreen)
+		_system->updateScreen();
+	return false;
+}
+
+int MainMenu::handle(int dim) {
+	int command = -1;
+
+	uint8 colorMap[16];
+	memset(colorMap, 0, sizeof(colorMap));
+	_screen->setTextColorMap(colorMap);
+
+	Screen::FontId oldFont = _screen->setFont(_static.font);
+	int charWidthBackUp = _screen->_charWidth;
+
+	if (_vm->game() != GI_LOL)
+		_screen->_charWidth = -2;
+	_screen->setScreenDim(dim);
+
+	int backUpX = _screen->_curDim->sx;
+	int backUpY = _screen->_curDim->sy;
+	int backUpWidth = _screen->_curDim->w;
+	int backUpHeight = _screen->_curDim->h;
+	_screen->copyRegion(backUpX, backUpY, backUpX, backUpY, backUpWidth, backUpHeight, 0, 3);
+
+	int x = _screen->_curDim->sx << 3;
+	int y = _screen->_curDim->sy;
+	int width = _screen->_curDim->w << 3;
+	int height =  _screen->_curDim->h;
+
+	drawBox(x, y, width, height, 1);
+	drawBox(x + 1, y + 1, width - 2, height - 2, 0);
+
+	int selected = 0;
+
+	draw(selected);
+
+	while (!_screen->isMouseVisible())
+		_screen->showMouse();
+
+	int fh = _screen->getFontHeight();
+	if (_vm->gameFlags().lang == Common::JA_JPN)
+		fh++;
+
+	int textPos = ((_screen->_curDim->w >> 1) + _screen->_curDim->sx) << 3;
+
+	Common::Rect menuRect(x + 16, y + 4, x + width - 16, y + 4 + fh * _static.menuTable[3]);
+
+	while (!_vm->shouldQuit()) {
+		updateAnimation();
+		bool mousePressed = getInput();
+
+		Common::Point mouse = _vm->getMousePos();
+		if (menuRect.contains(mouse)) {
+			int item = (mouse.y - menuRect.top) / fh;
+
+			if (item != selected) {
+				printString("%s", textPos, menuRect.top + selected * fh, _static.menuTable[5], 0, 5, _static.strings[selected]);
+				printString("%s", textPos, menuRect.top + item * fh, _static.menuTable[6], 0, 5, _static.strings[item]);
+
+				selected = item;
+			}
+
+			if (mousePressed) {
+				for (int i = 0; i < 3; i++) {
+					printString("%s", textPos, menuRect.top + selected * fh, _static.menuTable[5], 0, 5, _static.strings[selected]);
+					_screen->updateScreen();
+					_system->delayMillis(50);
+					printString("%s", textPos, menuRect.top + selected * fh, _static.menuTable[6], 0, 5, _static.strings[selected]);
+					_screen->updateScreen();
+					_system->delayMillis(50);
+				}
+				command = item;
+				break;
+			}
+		}
+		_system->delayMillis(10);
+	}
+
+	if (_vm->shouldQuit())
+		command = -1;
+
+	_screen->copyRegion(backUpX, backUpY, backUpX, backUpY, backUpWidth, backUpHeight, 3, 0);
+	_screen->_charWidth = charWidthBackUp;
+	_screen->setFont(oldFont);
+
+	return command;
+}
+
+void MainMenu::draw(int select) {
+	int top = _screen->_curDim->sy;
+	top += _static.menuTable[1];
+	int fh = _screen->getFontHeight();
+	if (_vm->gameFlags().lang == Common::JA_JPN)
+		fh++;
+
+	for (int i = 0; i < _static.menuTable[3]; ++i) {
+		int curY = top + i * fh;
+		int color = (i == select) ? _static.menuTable[6] : _static.menuTable[5];
+		printString("%s", ((_screen->_curDim->w >> 1) + _screen->_curDim->sx) << 3, curY, color, 0, 5, _static.strings[i]);
+	}
+}
+
+void MainMenu::drawBox(int x, int y, int w, int h, int fill) {
+	--w; --h;
+
+	if (fill)
+		_screen->fillRect(x, y, x+w, y+h, _static.colorTable[0]);
+
+	_screen->drawClippedLine(x, y+h, x+w, y+h, _static.colorTable[1]);
+	_screen->drawClippedLine(x+w, y, x+w, y+h, _static.colorTable[1]);
+	_screen->drawClippedLine(x, y, x+w, y, _static.colorTable[2]);
+	_screen->drawClippedLine(x, y, x, y+h, _static.colorTable[2]);
+
+	_screen->setPagePixel(_screen->_curPage, x, y+h, _static.colorTable[3]);
+	_screen->setPagePixel(_screen->_curPage, x+w, y, _static.colorTable[3]);
+}
+
+void MainMenu::printString(const char *format, int x, int y, int col1, int col2, int flags, ...) {
+	if (!format)
+		return;
+
+	va_list vaList;
+	va_start(vaList, flags);
+	Common::String string = Common::String::vformat(format, vaList);
+	va_end(vaList);
+
+	if (flags & 1)
+		x -= _screen->getTextWidth(string.c_str()) >> 1;
+
+	if (flags & 2)
+		x -= _screen->getTextWidth(string.c_str());
+
+	if (_vm->gameFlags().use16ColorMode)
+		flags &= 3;
+
+	if (flags & 4) {
+		_screen->printText(string.c_str(), x - 1, y, _static.altColor, col2);
+		_screen->printText(string.c_str(), x, y + 1, _static.altColor, col2);
+	}
+
+	if (flags & 8) {
+		_screen->printText(string.c_str(), x - 1, y, 227, col2);
+		_screen->printText(string.c_str(), x, y + 1, 227, col2);
+	}
+
+	_screen->printText(string.c_str(), x, y, col1, col2);
+}
+
+} // End of namespace Kyra
+
diff --git a/engines/kyra/gui_v1.h b/engines/kyra/gui_v1.h
new file mode 100644
index 0000000000..ec0d577982
--- /dev/null
+++ b/engines/kyra/gui_v1.h
@@ -0,0 +1,198 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 KYRA_GUI_V1_H
+#define KYRA_GUI_V1_H
+
+#include "kyra/gui.h"
+
+namespace Kyra {
+
+struct MenuItem {
+	bool enabled;
+
+	const char *itemString;
+	uint16 itemId;
+
+	int16 x, y;
+	uint16 width, height;
+
+	uint8 textColor, highlightColor;
+
+	int16 titleX;
+
+	uint8 color1, color2;
+	uint8 bkgdColor;
+
+	Button::Callback callback;
+
+	int16 saveSlot;
+
+	const char *labelString;
+	uint16 labelId;
+	int16 labelX, labelY;
+
+	uint16 keyCode;
+};
+
+struct Menu {
+	int16 x, y;
+	uint16 width, height;
+
+	uint8 bkgdColor;
+	uint8 color1, color2;
+
+	const char *menuNameString;
+	uint16 menuNameId;
+
+	uint8 textColor;
+	int16 titleX, titleY;
+
+	uint8 highlightedItem;
+
+	uint8 numberOfItems;
+
+	int16 scrollUpButtonX, scrollUpButtonY;
+	int16 scrollDownButtonX, scrollDownButtonY;
+
+	MenuItem item[7];
+};
+
+class TextDisplayer;
+
+class GUI_v1 : public GUI {
+public:
+	GUI_v1(KyraEngine_v1 *vm);
+	virtual ~GUI_v1() {}
+
+	// button specific
+	virtual Button *addButtonToList(Button *list, Button *newButton);
+
+	virtual void processButton(Button *button) = 0;
+	virtual int processButtonList(Button *buttonList, uint16 inputFlags, int8 mouseWheel) = 0;
+
+	virtual int redrawShadedButtonCallback(Button *button);
+	virtual int redrawButtonCallback(Button *button);
+
+	// menu specific
+	virtual void initMenuLayout(Menu &menu);
+	void initMenu(Menu &menu);
+
+	void processHighlights(Menu &menu);
+
+	// utilities for thumbnail creation
+	virtual void createScreenThumbnail(Graphics::Surface &dst) = 0;
+
+protected:
+	TextDisplayer *_text;
+
+	Button *_menuButtonList;
+	bool _displayMenu;
+	bool _displaySubMenu;
+	bool _cancelSubMenu;
+
+	virtual void printMenuText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 c2);
+	virtual int getMenuCenterStringX(const char *str, int x1, int x2);
+
+	Button::Callback _redrawShadedButtonFunctor;
+	Button::Callback _redrawButtonFunctor;
+
+	virtual Button *getButtonListData() = 0;
+	virtual Button *getScrollUpButton() = 0;
+	virtual Button *getScrollDownButton() = 0;
+
+	virtual Button::Callback getScrollUpButtonHandler() const = 0;
+	virtual Button::Callback getScrollDownButtonHandler() const = 0;
+
+	virtual uint8 defaultColor1() const = 0;
+	virtual uint8 defaultColor2() const = 0;
+
+	virtual const char *getMenuTitle(const Menu &menu) = 0;
+	virtual const char *getMenuItemTitle(const MenuItem &menuItem) = 0;
+	virtual const char *getMenuItemLabel(const MenuItem &menuItem) = 0;
+
+	void updateAllMenuButtons();
+	void updateMenuButton(Button *button);
+	virtual void updateButton(Button *button);
+
+	void redrawText(const Menu &menu);
+	void redrawHighlight(const Menu &menu);
+
+	uint32 _lastScreenUpdate;
+	void checkTextfieldInput();
+};
+
+class Movie;
+
+class MainMenu {
+public:
+	MainMenu(KyraEngine_v1 *vm);
+	virtual ~MainMenu() {}
+
+	struct Animation {
+		Animation() : anim(0), startFrame(0), endFrame(0), delay(0) {}
+
+		Movie *anim;
+		int startFrame;
+		int endFrame;
+		int delay;
+	};
+
+	struct StaticData {
+		const char *strings[5];
+
+		uint8 menuTable[7];
+		uint8 colorTable[4];
+
+		Screen::FontId font;
+		uint8 altColor;
+	};
+
+	void init(StaticData data, Animation anim);
+	int handle(int dim);
+private:
+	KyraEngine_v1 *_vm;
+	Screen *_screen;
+	OSystem *_system;
+
+	StaticData _static;
+	struct AnimIntern {
+		int curFrame;
+		int direction;
+	};
+	Animation _anim;
+	AnimIntern _animIntern;
+
+	uint32 _nextUpdate;
+
+	void updateAnimation();
+	void draw(int select);
+	void drawBox(int x, int y, int w, int h, int fill);
+	bool getInput();
+
+	void printString(const char *string, int x, int y, int col1, int col2, int flags, ...) GCC_PRINTF(2, 8);
+};
+
+} // end of namesapce Kyra
+
+#endif
+
diff --git a/engines/kyra/gui_v2.h b/engines/kyra/gui_v2.h
index 402766b1ca..bdbcce1c4f 100644
--- a/engines/kyra/gui_v2.h
+++ b/engines/kyra/gui_v2.h
@@ -23,7 +23,7 @@
 #ifndef KYRA_GUI_V2_H
 #define KYRA_GUI_V2_H
 
-#include "kyra/gui.h"
+#include "kyra/gui_v1.h"
 
 namespace Kyra {
 
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index 3acefdde8e..a6add505cb 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -199,7 +199,7 @@ public:
 
 	Screen *screen() { return _screen; }
 	Screen_v2 *screen_v2() const { return _screen; }
-	GUI_v1 *gui() const { return _gui; }
+	GUI *gui() const { return _gui; }
 	virtual TextDisplayer *text() { return _text; }
 	int language() const { return _lang; }
 protected:
diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h
index 3ecefbac5d..e5fb3cddca 100644
--- a/engines/kyra/kyra_lok.h
+++ b/engines/kyra/kyra_lok.h
@@ -109,7 +109,7 @@ public:
 
 	Screen *screen() { return _screen; }
 	Animator_LoK *animator() { return _animator; }
-	GUI_v1 *gui() const { return _gui; }
+	GUI *gui() const { return _gui; }
 	virtual Movie *createWSAMovie();
 
 	uint8 **shapes() { return _shapes; }
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index 4b3e8b3fc7..38ff271037 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -54,7 +54,7 @@ public:
 
 	Screen *screen() { return _screen; }
 	Screen_v2 *screen_v2() const { return _screen; }
-	GUI_v1 *gui() const { return _gui; }
+	GUI *gui() const { return _gui; }
 	SoundDigital *soundDigital() { return _soundDigital; }
 	int language() const { return _lang; }
 	bool heliumMode() const { return _configHelium; }
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 72cc5bc396..c1b9f2a453 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -345,7 +345,7 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
 		_eventList.erase(_eventList.begin());
 	}
 
-	GUI_v1 *guiInstance = gui();
+	GUI *guiInstance = gui();
 	if (guiInstance) {
 		if (keys)
 			return guiInstance->processButtonList(buttonList, keys | eventFlag, mouseWheel);
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 3a4be467ac..f530c02980 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -176,13 +176,14 @@ class TextDisplayer;
 class StaticResource;
 class TimerManager;
 class Debugger;
-class GUI_v1;
+class GUI;
 
 struct Button;
 
 class KyraEngine_v1 : public Engine {
 friend class Debugger;
 friend class ::KyraMetaEngine;
+friend class GUI;
 friend class GUI_v1;
 friend class SoundMidiPC;    // For _eventMan
 public:
@@ -196,7 +197,7 @@ public:
 	Resource *resource() { return _res; }
 	virtual Screen *screen() = 0;
 	virtual TextDisplayer *text() { return _text; }
-	virtual GUI_v1 *gui() const { return 0; }
+	virtual GUI *gui() const { return 0; }
 	Sound *sound() { return _sound; }
 	StaticResource *staticres() { return _staticres; }
 	TimerManager *timer() { return _timer; }
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h
index 7896748b96..3d7b9c4997 100644
--- a/engines/kyra/kyra_v2.h
+++ b/engines/kyra/kyra_v2.h
@@ -24,7 +24,7 @@
 #define KYRA_KYRA_V2_H
 
 #include "kyra/kyra_v1.h"
-#include "kyra/gui.h"
+#include "kyra/gui_v1.h"
 #include "kyra/wsamovie.h"
 #include "kyra/item.h"
 
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 8e978c1b34..7a4a3ec3e2 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -357,7 +357,7 @@ Screen *LoLEngine::screen() {
 	return _screen;
 }
 
-GUI_v1 *LoLEngine::gui() const {
+GUI *LoLEngine::gui() const {
 	return _gui;
 }
 
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index a33263fc96..8ddba8607c 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -279,7 +279,7 @@ public:
 	virtual void initKeymap();
 
 	Screen *screen();
-	GUI_v1 *gui() const;
+	GUI *gui() const;
 
 private:
 	Screen_LoL *_screen;
diff --git a/engines/kyra/loleobbase.h b/engines/kyra/loleobbase.h
index 8bebfe4306..a2c13827fc 100644
--- a/engines/kyra/loleobbase.h
+++ b/engines/kyra/loleobbase.h
@@ -86,7 +86,7 @@ public:
 	virtual ~LolEobBaseEngine();
 
 	virtual Screen *screen() = 0;
-	virtual GUI_v1 *gui() const = 0;
+	virtual GUI *gui() const = 0;
 
 protected:
 	// Startup
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
index 50bcbdd6e9..6eed6daae4 100644
--- a/engines/kyra/module.mk
+++ b/engines/kyra/module.mk
@@ -9,6 +9,7 @@ MODULE_OBJS := \
 	debugger.o \
 	detection.o \
 	gui.o \
+	gui_v1.o \
 	gui_lok.o \
 	gui_v2.o \
 	gui_hof.o \
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index e348ef2616..6800a13da3 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -665,8 +665,7 @@ void EobCoreEngine::initMenus() {
 		{  32,  40,  16,  24,  20,   3,  5  },
 		{  33,  72,  16,  24,  20,   4,  5  },
 		{  34, 104,  16,  24,  20,   5,  5  },
-		{  35, 136,  16,  24,  20,   6,  5  },
-		{  31,   8,  16,  24,  20,   2,  5  }
+		{  35, 136,  16,  24,  20,   6,  5  }
 	};
 
 	_menuButtonDefs = buttonDefs;
-- 
cgit v1.2.3


From c53589bcda2875154b2590f264838b1be728d1f3 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Fri, 1 Jul 2011 00:43:37 +0200
Subject: KYRA: (EOB) - implement load menu

(only 6 slots supported for now)
---
 engines/kyra/eobcommon.cpp      |   8 +-
 engines/kyra/eobcommon.h        |   5 +-
 engines/kyra/gui.cpp            |   8 +-
 engines/kyra/gui_eob.cpp        | 248 ++++++++++++++++++++++++++++++++++++++--
 engines/kyra/gui_eob.h          |  10 ++
 engines/kyra/saveload_eob.cpp   |   6 +-
 engines/kyra/sequences_eob2.cpp |   6 +-
 engines/kyra/staticres_eob.cpp  |  17 +++
 8 files changed, 288 insertions(+), 20 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 0cc2f5ab75..2d5c4e61c3 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -359,8 +359,11 @@ Common::Error EobCoreEngine::go() {
 
 		if (action == -1) {
 			// load game
-			_saveLoadMode = -1;
-			startupLoad();
+			repeatLoop = _gui->runLoadMenu(72, 14);
+			if (repeatLoop && !shouldQuit()) {
+				_saveLoadMode = -1;
+				startupLoad();
+			}
 		} else if (action == -2) {
 			// new game
 			repeatLoop = startCharacterGeneration();
@@ -368,6 +371,7 @@ Common::Error EobCoreEngine::go() {
 				startupNew();
 		} else if (action == -3) {
 			// transfer party
+			repeatLoop = false;
 		}
 	}
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 0f9210ee5e..eae03ac221 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -786,7 +786,9 @@ protected:
 	void releaseMonsterTempData(LevelTempData *tmp);
 
 	int _saveLoadMode;
-	
+
+	const char * const *_saveLoadStrings;
+
 	Screen_Eob *_screen;
 	GUI_Eob *_gui;
 
@@ -999,6 +1001,7 @@ protected:
 	const char *const *_menuStringsRest3;
 	const char *const *_menuStringsRest4;
 	const char *const *_menuStringsDefeat;
+	const char *_errorSlotEmptyString;
 
 	const char *const *_menuStringsTransfer;
 	const char *const *_menuStringsSpec;
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index 47461637b1..d03fa23d5a 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -109,7 +109,12 @@ void GUI::updateSavegameList() {
 	_savegameListSize = _saveSlots.size();
 
 	if (_savegameListSize) {
-		Common::sort(_saveSlots.begin(), _saveSlots.end(), Common::Greater<int>());
+		if (_vm->game() == GI_EOB1 || _vm->game() == GI_EOB2) {
+			Common::sort(_saveSlots.begin(), _saveSlots.end(),  Common::Less<int>());
+			_savegameListSize = _saveSlots.back() + 1;
+		} else {
+			Common::sort(_saveSlots.begin(), _saveSlots.end(),  Common::Greater<int>());
+		}
 
 		KyraEngine_v1::SaveHeader header;
 		Common::InSaveFile *in;
@@ -125,7 +130,6 @@ void GUI::updateSavegameList() {
 				delete in;
 			} else {
 				_savegameList[i] = 0;
-				error("GUI::updateSavegameList(): Unexpected missing save file for slot: %d.", i);
 			}
 		}
 
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 6eab4a0083..4eb2497539 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -1435,6 +1435,15 @@ GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 	_menuStringsPrefsTemp = new char*[4];
 	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char*));
 
+	_saveSlotStringsTemp = new char*[6];
+	for (int i = 0; i < 6; i++) {
+		_saveSlotStringsTemp[i] = new char[20];
+		memset(_saveSlotStringsTemp[i], 0, 20);
+	}
+	_saveSlotIdTemp = new int16[6];
+	_savegameOffset = 0;
+	_saveSlotX = _saveSlotY = 0;
+
 	_specialProcessButton = _backupButtonList = 0;
 	_flagsMouseLeft = _flagsMouseRight = _flagsModifier = 0;
 	_backupButtonList = 0;
@@ -1469,6 +1478,14 @@ GUI_Eob::~GUI_Eob() {
 		delete[] _menuStringsPrefsTemp;
 	}
 
+	if (_saveSlotStringsTemp) {
+		for (int i = 0; i < 6; i++)
+			delete[] _saveSlotStringsTemp[i];
+		delete[] _saveSlotStringsTemp;
+	}
+
+	delete[] _saveSlotIdTemp;
+
 	delete[] _numAssignedSpellsOfType;
 }
 
@@ -2285,11 +2302,9 @@ void GUI_Eob::runCampMenu() {
 		}
 	}
 
+	_screen->setFont(of);
 	releaseButtons(buttonList);
-	
 	_vm->writeSettings();
-	
-	_screen->setFont(of);
 }
 
 bool GUI_Eob::runLoadMenu(int x, int y) {
@@ -2299,13 +2314,27 @@ bool GUI_Eob::runLoadMenu(int x, int y) {
 	bool result = false;
 	_savegameListUpdateNeeded = true;
 	
-	_screen->modifyScreenDim(11, dm->sx + (x >> 8), dm->sy + y, dm->w, dm->sy);
+	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
 	
 	updateSavegameList();
-	setupSaveMenuSlots();
 
-	_screen->modifyScreenDim(11, xo, yo, dm->w, dm->sy);
+	for (bool runLoop = true; runLoop; ) {	
+		int slot = selectSaveSlotDialogue(x, y, 1);
+		if (slot > 5) {
+			runLoop = result = false;
+		} else if (slot >= 0) {
+			if (_saveSlotIdTemp[slot] == -1) {
+				messageDialogue(11, 65, 6);
+			} else {
+				if (_vm->loadGameState(_saveSlotIdTemp[slot]).getCode() != Common::kNoError)
+					messageDialogue(11, 16, 6);
+				runLoop = false;
+				result = true;
+			}
+		}
+	}
 
+	_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
 	return result;
 }
 
@@ -2479,7 +2508,95 @@ void GUI_Eob::simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuIt
 }
 
 bool GUI_Eob::runSaveMenu(int x, int y) {
-	return true;
+	const ScreenDim *dm = _screen->getScreenDim(11);
+	int xo = dm->sx;
+	int yo = dm->sy;
+	bool result = false;
+	_savegameListUpdateNeeded = true;
+	
+	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
+	
+	updateSavegameList();
+
+	/*for (bool runLoop = true; runLoop; ) {	
+		int slot = selectSaveSlotDialogue(x, y, 1);
+		if (slot > 5) {
+			runLoop = result = false;
+		} else if (slot >= 0) {
+			if (_saveSlotIdTemp[slot] == -1) {
+				messageDialogue(11, 65, 6);
+			} else {
+				if (_vm->loadGameState(_saveSlotIdTemp[slot]).getCode() != Common::kNoError)
+					messageDialogue(11, 16, 6);
+				runLoop = false;
+				result = true;
+			}
+		}
+	}*/
+
+	_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
+	return result;
+}
+
+int GUI_Eob::selectSaveSlotDialogue(int x, int y, int id) {
+	assert (id < 2);
+
+	_saveSlotX = _saveSlotY = 0;
+	_screen->setCurPage(2);
+	
+	setupSaveMenuSlots();
+	drawMenuButtonBox(0, 0, 176, 144, false, false);
+	_screen->printShadedText(_vm->_saveLoadStrings[2 + id], 52, 5, 15, 0);
+	
+	for (int i = 0; i < 7; i++)
+		drawSaveSlotButton(i, 1, 15);
+
+	_screen->copyRegion(0, 0, x, y, 176, 144, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->setCurPage(0);
+	_screen->updateScreen();
+
+	_saveSlotX = x;
+	_saveSlotY = y;
+	int lastHighlight = -1;
+	int newHighlight = 0;
+	int slot = -1;
+
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {		
+		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
+		_vm->removeInputTop();
+
+		if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
+			runLoop = false;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP2]) {
+			if (++newHighlight > 6)
+				newHighlight = 0;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP8]) {
+			if (--newHighlight < 0)
+				newHighlight = 6;
+		} else {
+			slot = getHighlightSlot();
+			if (slot != -1) {
+				newHighlight = slot;
+				if (inputFlag == 199)
+					runLoop = false;
+			}
+		}
+
+		if (lastHighlight != newHighlight) {
+			drawSaveSlotButton(lastHighlight, 0, 15);
+			drawSaveSlotButton(newHighlight, 0, 6);
+			_screen->updateScreen();
+			lastHighlight = newHighlight;
+		}
+	}
+
+	drawSaveSlotButton(newHighlight, 2, 6);
+	_screen->updateScreen();
+	_vm->_system->delayMillis(80);
+	drawSaveSlotButton(newHighlight, 1, 6);
+	_screen->updateScreen();
+
+	return newHighlight;
 }
 
 void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
@@ -2674,7 +2791,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 				updateDesc = true;
 			}
 
-		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP_MINUS] || inputFlag == _vm->_keyMap[Common::KEYCODE_MINUS] /*|| inputFlag == _vm->_keyMap[Common::KEYCODE_*/) {
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP_MINUS] || inputFlag == _vm->_keyMap[Common::KEYCODE_MINUS]) {
 			if (np[lastHighLightButton] && _numAssignedSpellsOfType[menuSpellMap[lastHighLightButton * 11 + lastHighLightText + 1] * 2 - 2]) {
 				_numAssignedSpellsOfType[menuSpellMap[lastHighLightButton * 11 + lastHighLightText + 1] * 2 - 2]--;
 				numAssignedSpellsPerBookPage[lastHighLightButton]--;
@@ -2826,6 +2943,47 @@ bool GUI_Eob::confirmDialogue(int id) {
 	return result;
 }
 
+void GUI_Eob::messageDialogue(int dim, int id, int buttonTextCol) {
+	static const char buttonText[] = "OK";
+
+	int od = _screen->curDimIndex();
+	_screen->setScreenDim(dim);
+	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
+
+	drawTextBox(dim, id);
+	const ScreenDim *dm = _screen->getScreenDim(dim);
+	
+	int bx = ((dm->sx + dm->w) << 3) - ((strlen(buttonText) << 3) + 16);
+	int by = dm->sy + dm->h - 19;
+	int bw = (strlen(buttonText) << 3) + 7;
+
+	drawMenuButtonBox(bx, by, bw, 14, false, false);
+	_screen->printShadedText(buttonText, bx + 4, by + 3, buttonTextCol, 0);
+	_screen->updateScreen();
+
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
+		_vm->removeInputTop();
+
+		if (inputFlag == 199 || inputFlag == 201) {
+			Common::Point p = _vm->getMousePos();
+				if (_vm->posWithinRect(p.x, p.y, bx, by, bx + bw, by + 14))
+					runLoop = false;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inputFlag == _vm->_keyMap[Common::KEYCODE_o]) {
+			runLoop = false;
+		}
+	}
+
+	drawMenuButtonBox(bx, by, bw, 14, true, true);
+	_screen->updateScreen();
+	_vm->_system->delayMillis(80);
+	drawMenuButtonBox(bx, by, bw, 14, false, true);
+	_screen->updateScreen();
+
+	_screen->setScreenDim(od);
+	_screen->setFont(of);
+}
+
 int GUI_Eob::selectCharacterDialogue(int id) {
 	uint8 flags = (id == 26) ? 0x14 : 0x02;
 	_vm->removeInputTop();
@@ -3084,6 +3242,48 @@ void GUI_Eob::drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool n
 	_vm->gui_drawBox(x + 1, y + 1, w - 2, h - 2, _vm->_color1_1, _vm->_color2_1, noFill ? -1 : _vm->_bkgColor_1);
 }
 
+void GUI_Eob::drawTextBox(int dim, int id) {
+	int od = _screen->curDimIndex();
+	_screen->setScreenDim(dim);
+	const ScreenDim *dm = _screen->getScreenDim(dim);
+	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
+
+	if (dm->w <= 22 && dm->h <= 84)
+		_screen->copyRegion(dm->sx << 3, dm->sy, 0, dm->h, dm->w << 3, dm->h, 0, 2, Screen::CR_NO_P_CHECK);
+
+	_screen->setCurPage(2);
+
+	drawMenuButtonBox(0, 0, dm->w << 3, dm->h, false, false);
+	_screen->printShadedText(getMenuString(id), 5, 5, 15, 0);
+
+	_screen->setCurPage(0);
+	_screen->copyRegion(0, 0, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	_screen->setScreenDim(od);
+	_screen->setFont(of);
+}
+
+void GUI_Eob::drawSaveSlotButton(int slot, int redrawBox, int textCol) {
+	if (slot < 0)
+		return;
+
+	int x = _saveSlotX + 4;
+	int y = _saveSlotY + slot * 17 + 20;	
+	int w = 167;
+	const char *s = (slot < 6) ?_saveSlotStringsTemp[slot] : _vm->_saveLoadStrings[0];
+
+	if (slot >= 6 ) {
+		x = _saveSlotX + 118;
+		y = _saveSlotY + 126;
+		w = 53;
+	} 
+	
+	if (redrawBox)
+		drawMenuButtonBox(x, y, w, 14, (redrawBox - 1) ? true : false, false);
+
+	_screen->printShadedText(s, x + 4, y + 3, textCol, 0);
+}
+
 void GUI_Eob::memorizePrayMenuPrintString(int spellId, int bookPageIndex, int spellType, bool noFill, bool highLight) {
 	if (bookPageIndex < 0)
 		return;
@@ -3121,6 +3321,10 @@ const char *GUI_Eob::getMenuString(int id) {
 		return _vm->_menuStringsTransfer[id - 69];
 	else if (id >= 67)
 		return _vm->_menuStringsDefeat[id - 67];
+	else if (id == 66)
+		return _vm->_errorSlotEmptyString;
+	else if (id == 65)
+		return _vm->_errorSlotEmptyString;
 	else if (id >= 63)
 		return _vm->_menuStringsSpec[id - 63];
 	else if (id >= 60)
@@ -3181,7 +3385,35 @@ void GUI_Eob::releaseButtons(Button *list) {
 }
 
 void GUI_Eob::setupSaveMenuSlots() {
+	for (int i = 0; i < 6; ++i) {
+		if (_savegameOffset + i < _savegameListSize) {
+			if (_savegameList[i + _savegameOffset]) {
+				Common::strlcpy(_saveSlotStringsTemp[i], _savegameList[i + _savegameOffset], 20);
+				_saveSlotIdTemp[i] = i + _savegameOffset;
+				continue;
+			}
+		}
+		Common::strlcpy(_saveSlotStringsTemp[i], _vm->_saveLoadStrings[1], 20);
+		_saveSlotIdTemp[i] = -1;
+	}
+}
+
+int GUI_Eob::getHighlightSlot() {
+	int res = -1;
+	Common::Point p = _vm->getMousePos();
+	
+	for (int i = 0; i < 6; i++) {
+		int y = _saveSlotY + i * 17 + 20;
+		if (_vm->posWithinRect(p.x, p.y, _saveSlotX + 4, y, _saveSlotX + 167, y + 14)) {
+			res = i;
+			break;
+		}
+	}
+
+	if (_vm->posWithinRect(p.x, p.y, _saveSlotX + 118, _saveSlotY + 126, _saveSlotX + 171, _saveSlotY + 140))
+		res = 6;
 
+	return res;
 }
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index c8e9744152..f866c9e341 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -79,16 +79,20 @@ private:
 	void simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int unk);
 
 	bool runSaveMenu(int x, int y);
+	int selectSaveSlotDialogue(int x, int y, int id);
 	void runMemorizePrayMenu(int charIndex, int spellType);
 	void scribeScrollDialogue();
 
 	bool confirmDialogue(int id);
+	void messageDialogue(int dim, int id, int buttonTextCol);
 	int selectCharacterDialogue(int id);
 	void displayTextBox(int id);
 	
 	Button *initMenu(int id);	
 	void drawMenuButton(Button *b, bool clicked, bool highlight, bool noFill);
 	void drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool noFill);
+	void drawTextBox(int dim, int id);
+	void drawSaveSlotButton(int slot, int redrawBox, int textCol);
 	void memorizePrayMenuPrintString(int spellId, int bookPageIndex, int spellType, bool noFill, bool highLight);
 	void updateOptionsStrings();
 	const char *getMenuString(int id);
@@ -97,11 +101,17 @@ private:
 	void releaseButtons(Button *list);
 
 	void setupSaveMenuSlots();
+	int getHighlightSlot();
 
 	Button _scrollUpButton;//////////////////77
 	Button _scrollDownButton;
 
 	char **_menuStringsPrefsTemp;
+	char **_saveSlotStringsTemp;
+	int16 *_saveSlotIdTemp;
+	int _savegameOffset;
+	int16 _saveSlotX;
+	int16 _saveSlotY;
 
 	EobCoreEngine *_vm;
 	Screen_Eob *_screen;
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 497be6fdce..72bebf997b 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -145,10 +145,8 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 
 	SaveHeader header;
 	Common::InSaveFile *saveFile = openSaveForReading(fileName, header);
-	if (!saveFile) {
-		//_txt->printMessage(2, "%s", getLangString(0x425d));
-		return Common::kNoError;
-	}
+	if (!saveFile)
+		return Common::Error(Common::kReadingFailed);
 
 	Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, DisposeAfterUse::YES);
 
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
index 3765ee3d92..1cc4585e1c 100644
--- a/engines/kyra/sequences_eob2.cpp
+++ b/engines/kyra/sequences_eob2.cpp
@@ -131,7 +131,7 @@ int DarkMoonEngine::mainMenu() {
 
 			case 3:
 				// transfer party
-				seq_playFinale();
+				//seq_playFinale();
 				menuChoice = -3;
 				break;
 
@@ -1030,7 +1030,7 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 			break;
 
 		case 1:
-			// draw shape, then restore beackground
+			// draw shape, then restore background
 			shapeW = _shapes[s->obj][2];
 			shapeH = _shapes[s->obj][3];
 
@@ -1107,7 +1107,7 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 			break;
 
 		case 5:
-			// copyregion
+			// copy region
 			if (_mode == DarkmoonSequenceHelper::kFinale && s->pal)
 				setPaletteWithoutTextColor(palIndex);
 
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 6800a13da3..6cc7606a21 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -506,6 +506,23 @@ void EobCoreEngine::initStaticResource() {
 	_sparkEffectOfX = _staticres->loadRawData(kEobBaseSparkOfX, temp);
 	_sparkEffectOfY = _staticres->loadRawData(kEobBaseSparkOfY, temp);
 	_magicFlightObjectProperties = _staticres->loadRawData(kEobBaseMagicFlightProps, temp);
+
+	// Hard code these strings, since EOB 1 doesn't have them in the original
+	// (because there is only one single save slot)
+	static const char *saveLoadStrings[3][4] = {
+		{	"Cancel",	"Empty Slot",	"Save Game",	"Load Game"		},
+		{	"Abbr.",	"Leerer Slot",	"Speichern",	"  Laden"		},
+		{	0,			0,				0,				0				}
+	};
+
+	static const char *errorSlotEmptyString[3] = {
+		"There is no game\rsaved in that slot!",
+		"Hier ist noch kein\rSpiel gespeichert!",
+		0
+	};
+	
+	_saveLoadStrings = saveLoadStrings[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
+	_errorSlotEmptyString = errorSlotEmptyString[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
 }
 
 void EobCoreEngine::initButtonData() {
-- 
cgit v1.2.3


From 5baabf037df661e4730500ecebca6347031aa295 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sat, 2 Jul 2011 03:19:46 +0200
Subject: KYRA: (EOB) - implement save menu

---
 engines/kyra/eob1.cpp          |   6 --
 engines/kyra/eob1.h            |   2 +-
 engines/kyra/eob2.cpp          |   6 --
 engines/kyra/eob2.h            |   2 +-
 engines/kyra/eobcommon.cpp     |   5 +-
 engines/kyra/eobcommon.h       |   3 +-
 engines/kyra/gui_eob.cpp       | 149 ++++++++++++++++++++++++++++++++++-------
 engines/kyra/gui_eob.h         |  11 ++-
 engines/kyra/magic_eob.cpp     |   4 +-
 engines/kyra/resource.h        |   1 +
 engines/kyra/saveload_eob.cpp  |  17 +++--
 engines/kyra/staticres_eob.cpp |   1 +
 12 files changed, 145 insertions(+), 62 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index 69071d3aef..3992b2284e 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -77,12 +77,6 @@ void EobEngine::startupNew() {
 	EobCoreEngine::startupNew();
 }
 
-void EobEngine::startupLoad() {
-	setHandItem(_itemInHand);
-	loadLevel(_currentLevel, _currentSub);
-	_saveLoadMode = 0;
-}
-
 void EobEngine::npcSequence(int npcIndex) {
 
 
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
index 8a959e9fa4..8181f3281e 100644
--- a/engines/kyra/eob1.h
+++ b/engines/kyra/eob1.h
@@ -48,7 +48,7 @@ private:
 
 	// Main loop
 	void startupNew();
-	void startupLoad();
+	void startupLoad() {}
 
 	// Intro/Outro
 	void seq_playOpeningCredits();
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index 56ef838e54..baed595e8c 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -77,12 +77,6 @@ void DarkMoonEngine::startupNew() {
 	EobCoreEngine::startupNew();
 }
 
-void DarkMoonEngine::startupLoad() {
-	setHandItem(_itemInHand);
-	loadLevel(_currentLevel, _currentSub);
-	_saveLoadMode = 0;
-}
-
 void DarkMoonEngine::npcSequence(int npcIndex) {
 	_screen->loadEobBitmap("OUTTAKE", 5, 3);
 	_screen->copyRegion(0, 0, 0, 0, 176, 120, 0, 6, Screen::CR_NO_P_CHECK);
diff --git a/engines/kyra/eob2.h b/engines/kyra/eob2.h
index 3fabe44bf0..22193cecf2 100644
--- a/engines/kyra/eob2.h
+++ b/engines/kyra/eob2.h
@@ -64,7 +64,7 @@ private:
 
 	// Main loop
 	void startupNew();
-	void startupLoad();
+	void startupLoad() {}
 
 	// Intro/Outro
 	void seq_playIntro();
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 2d5c4e61c3..4c8d4886fd 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -45,7 +45,6 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	//_runLoopTimerUnk = 0;
 	_playFinale = false;
 	_runFlag = true;
-	_saveLoadMode = 0;
 	_configMouse = true;
 
 	_largeItemShapes = _smallItemShapes = _thrownItemShapes = _spellShapes = _firebeamShapes = _itemIconShapes =
@@ -360,10 +359,8 @@ Common::Error EobCoreEngine::go() {
 		if (action == -1) {
 			// load game
 			repeatLoop = _gui->runLoadMenu(72, 14);
-			if (repeatLoop && !shouldQuit()) {
-				_saveLoadMode = -1;
+			if (repeatLoop && !shouldQuit())
 				startupLoad();
-			}
 		} else if (action == -2) {
 			// new game
 			repeatLoop = startCharacterGeneration();
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index eae03ac221..e6b816e291 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -785,8 +785,6 @@ protected:
 	void restoreMonsterTempData(LevelTempData *tmp);
 	void releaseMonsterTempData(LevelTempData *tmp);
 
-	int _saveLoadMode;
-
 	const char * const *_saveLoadStrings;
 
 	Screen_Eob *_screen;
@@ -1006,6 +1004,7 @@ protected:
 	const char *const *_menuStringsTransfer;
 	const char *const *_menuStringsSpec;
 	const char *const *_menuStringsSpellNo;
+	const char *const *_menuYesNoStrings;
 
 	const uint8 *_spellLevelsMage;
 	int _spellLevelsMageSize;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 4eb2497539..1d69a901e5 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -30,6 +30,7 @@
 
 #include "common/system.h"
 #include "common/savefile.h"
+#include "graphics/scaler.h"
 
 namespace Kyra {
 
@@ -849,9 +850,10 @@ int EobCoreEngine::clickedCamp(Button *button) {
 	}
 
 	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 14, Screen::CR_NO_P_CHECK);
+	_screen->copyPage(0, 7);
 	
-	_gui->runCampMenu();	
-	
+	_gui->runCampMenu();
+
 	_screen->copyRegion(0, 0, 0, 120, 176, 24, 14, 2, Screen::CR_NO_P_CHECK);
 	_screen->setScreenDim(cd);
 	drawScene(0);
@@ -862,10 +864,7 @@ int EobCoreEngine::clickedCamp(Button *button) {
 	_screen->setCurPage(0);
 	const ScreenDim *dm = _screen->getScreenDim(10);
 	_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 2, 0, Screen::CR_NO_P_CHECK);	
-	
-	/*if (reloadInv)
-		_screen->loadEobCpsFileToPage("INVENT", 0, 5, 3, 2);*/
-	
+
 	_screen->updateScreen();
 
 	enableSysTimer(2);	
@@ -1430,7 +1429,7 @@ void EobCoreEngine::gui_processInventorySlotClick(int slot) {
 }
 
 GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
-	_scrollUpFunctor = _scrollDownFunctor = BUTTON_FUNCTOR(GUI_Eob, this, 0);
+	//_scrollUpFunctor = _scrollDownFunctor = BUTTON_FUNCTOR(GUI_Eob, this, 0);
 
 	_menuStringsPrefsTemp = new char*[4];
 	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char*));
@@ -2230,8 +2229,7 @@ void GUI_Eob::runCampMenu() {
 			case 0x8009:
 				if (runSaveMenu(0, 0))
 					displayTextBox(14);
-				else
-					newMenu = 1;
+				newMenu = 1;
 				break;
 
 			case 0x800a:
@@ -2316,9 +2314,7 @@ bool GUI_Eob::runLoadMenu(int x, int y) {
 	
 	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
 	
-	updateSavegameList();
-
-	for (bool runLoop = true; runLoop; ) {	
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {	
 		int slot = selectSaveSlotDialogue(x, y, 1);
 		if (slot > 5) {
 			runLoop = result = false;
@@ -2490,6 +2486,13 @@ int GUI_Eob::getTextInput(char *dest, int x, int y, int destMaxLen, int textColo
 	return _keyPressed.keycode == Common::KEYCODE_ESCAPE ? -1 : len;
 }
 
+void GUI_Eob::createScreenThumbnail(Graphics::Surface &dst) {
+	uint8 *screenPal = new uint8[768];
+	_screen->getRealPalette(0, screenPal);
+	::createThumbnail(&dst, _screen->getCPagePtr(7), Screen::SCREEN_W, Screen::SCREEN_H, screenPal);
+	delete[] screenPal;
+}
+
 void GUI_Eob::simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int itemOffset) {
 	if (menuItemsMask == -1) {
 		_menuNumItems = _screen->getScreenDim(19 + menuId)->h;
@@ -2516,23 +2519,49 @@ bool GUI_Eob::runSaveMenu(int x, int y) {
 	
 	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
 	
-	updateSavegameList();
-
-	/*for (bool runLoop = true; runLoop; ) {	
-		int slot = selectSaveSlotDialogue(x, y, 1);
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {	
+		int slot = selectSaveSlotDialogue(x, y, 0);
 		if (slot > 5) {
 			runLoop = result = false;
 		} else if (slot >= 0) {
-			if (_saveSlotIdTemp[slot] == -1) {
-				messageDialogue(11, 65, 6);
-			} else {
-				if (_vm->loadGameState(_saveSlotIdTemp[slot]).getCode() != Common::kNoError)
-					messageDialogue(11, 16, 6);
-				runLoop = false;
+			bool useSlot = (_saveSlotIdTemp[slot] == -1);
+			if (useSlot)
+				_saveSlotStringsTemp[slot][0] = 0;
+			else
+				useSlot = confirmDialogue2(11, 55, 1);
+			
+			if (!useSlot)
+				continue;
+
+			int fx = (x + 1) << 3;
+			int fy = y + slot * 17 + 23;
+			
+			for (int in = -1; in == -1 && !_vm->shouldQuit(); ) {
+				_screen->fillRect(fx - 2, fy, fx + 160, fy + 8, _vm->_bkgColor_1);
+				in = getTextInput(_saveSlotStringsTemp[slot], x + 1, fy, 19, 2, 0, 8);
+				if (!strlen(_saveSlotStringsTemp[slot])) {
+					messageDialogue(11, 54, 6);
+					in = -1;
+				}
+			};
+
+			_screen->fillRect(fx - 2, fy, fx + 160, fy + 8, _vm->_bkgColor_1);
+			_screen->printShadedText(_saveSlotStringsTemp[slot], (x + 1) << 3, fy, 15, 0);
+
+			Graphics::Surface thumb;
+			createScreenThumbnail(thumb);
+			Common::Error err = _vm->saveGameStateIntern(_savegameOffset + slot, _saveSlotStringsTemp[slot], &thumb);
+			thumb.free();
+
+			if (err.getCode() == Common::kNoError) {
+				_savegameListUpdateNeeded = true;			
 				result = true;
+			} else {
+				messageDialogue(11, 15, 6);
 			}
+			runLoop = false;			
 		}
-	}*/
+	}
 
 	_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
 	return result;
@@ -2544,7 +2573,9 @@ int GUI_Eob::selectSaveSlotDialogue(int x, int y, int id) {
 	_saveSlotX = _saveSlotY = 0;
 	_screen->setCurPage(2);
 	
+	updateSavegameList();
 	setupSaveMenuSlots();
+
 	drawMenuButtonBox(0, 0, 176, 144, false, false);
 	_screen->printShadedText(_vm->_saveLoadStrings[2 + id], 52, 5, 15, 0);
 	
@@ -2943,6 +2974,74 @@ bool GUI_Eob::confirmDialogue(int id) {
 	return result;
 }
 
+bool GUI_Eob::confirmDialogue2(int dim, int id, int deflt) {
+	int od = _screen->curDimIndex();
+	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
+	_screen->setScreenDim(dim);
+
+	drawTextBox(dim, id);
+
+	int16 x[2];
+	x[0] = (_screen->_curDim->sx << 3) + 8;
+	x[1] = (_screen->_curDim->sx + _screen->_curDim->w - 5) << 3;
+	int16 y = _screen->_curDim->sy + _screen->_curDim->h - 21;
+	int newHighlight = deflt ^ 1;
+	int lastHighlight = -1;
+	
+	for (int i = 0; i < 2; i++)
+		drawMenuButtonBox(x[i], y, 32, 14, false, false);
+
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+		Common::Point p = _vm->getMousePos();
+		if (_vm->posWithinRect(p.x, p.y, x[0], y, x[0] + 32, y + 14))
+			newHighlight = 0;
+		else if (_vm->posWithinRect(p.x, p.y, x[1], y, x[1] + 32, y + 14))
+			newHighlight = 1;
+
+		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
+		_vm->removeInputTop();
+
+		if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
+			runLoop = false;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP6]) {
+			newHighlight ^= 1;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_n]) {
+			newHighlight = 1;
+			runLoop = false;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_y]) {
+			newHighlight = 0;
+			runLoop = false;
+		}  else if (inputFlag == 199 || inputFlag == 201) {
+			if (_vm->posWithinRect(p.x, p.y, x[0], y, x[0] + 32, y + 14)) {
+				newHighlight = 0;
+				runLoop = false;
+			} else if (_vm->posWithinRect(p.x, p.y, x[1], y, x[1] + 32, y + 14)) {
+				newHighlight = 1;
+				runLoop = false;
+			}
+		}
+
+		if (newHighlight != lastHighlight) {
+			for (int i = 0; i < 2; i++)				
+				_screen->printShadedText(_vm->_menuYesNoStrings[i], x[i] + 16 - (strlen(_vm->_menuYesNoStrings[i]) << 2) + 1, y + 3, i == newHighlight ? 6 : 15, 0);
+			_screen->updateScreen();
+			lastHighlight = newHighlight;
+		}
+	}
+
+	drawMenuButtonBox(x[newHighlight], y, 32, 14, true, true);
+	_screen->updateScreen();
+	_vm->_system->delayMillis(80);
+	drawMenuButtonBox(x[newHighlight], y, 32, 14, false, true);
+	_screen->updateScreen();
+
+	_screen->copyRegion(0, _screen->_curDim->h, _screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->setFont(of);
+	_screen->setScreenDim(od);
+	
+	return newHighlight ? false : true;
+}
+
 void GUI_Eob::messageDialogue(int dim, int id, int buttonTextCol) {
 	static const char buttonText[] = "OK";
 
@@ -2979,9 +3078,11 @@ void GUI_Eob::messageDialogue(int dim, int id, int buttonTextCol) {
 	_vm->_system->delayMillis(80);
 	drawMenuButtonBox(bx, by, bw, 14, false, true);
 	_screen->updateScreen();
-
+	
+	_screen->copyRegion(0, dm->h, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->setScreenDim(od);
 	_screen->setFont(of);
+	dm = _screen->getScreenDim(dim);
 }
 
 int GUI_Eob::selectCharacterDialogue(int id) {
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index f866c9e341..234f2f6ae5 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -67,11 +67,7 @@ public:
 	int getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor);
 
 	// utilities for thumbnail creation
-	void createScreenThumbnail(Graphics::Surface &dst) {}
-
-	// unused
-	int redrawShadedButtonCallback(Button *button) { return 0; }
-	int redrawButtonCallback(Button *button) { return 0; }
+	void createScreenThumbnail(Graphics::Surface &dst);
 
 private:
 	int simpleMenu_getMenuItem(int index, int32 menuItemsMask, int itemOffset);
@@ -84,6 +80,7 @@ private:
 	void scribeScrollDialogue();
 
 	bool confirmDialogue(int id);
+	bool confirmDialogue2(int dim, int id, int deflt);
 	void messageDialogue(int dim, int id, int buttonTextCol);
 	int selectCharacterDialogue(int id);
 	void displayTextBox(int id);
@@ -127,8 +124,8 @@ private:
 	uint16 _prcButtonUnk3;
 	uint16 _cflag;
 
-	Button::Callback _scrollUpFunctor;
-	Button::Callback _scrollDownFunctor;
+	//Button::Callback _scrollUpFunctor;
+	//Button::Callback _scrollDownFunctor;
 
 	int _menuLineSpacing;
 	int _menuLastInFlags;
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 77971da441..7a9750fb69 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -694,11 +694,11 @@ void EobCoreEngine::spellCallback_start_removeParalysis() {
 }
 
 void EobCoreEngine::spellCallback_start_causeSeriousWounds() {
-	modifyCharacterHitpoints(_activeSpellCaster, rollDice(2, 8, 1));
+	
 }
 
 void EobCoreEngine::spellCallback_start_cureSeriousWounds() {
-
+	modifyCharacterHitpoints(_activeSpellCaster, rollDice(2, 8, 1));
 }
 
 void EobCoreEngine::spellCallback_start_neutralizePoison() {
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 441199ce6b..599539c2d2 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -320,6 +320,7 @@ enum KyraResources {
 	kEobBaseMenuStringsTransfer,
 	kEobBaseMenuStringsSpec,
 	kEobBaseMenuStringsSpellNo,
+	kEobBaseMenuYesNoStrings,
 
 	kEobBaseSpellLevelsMage,
 	kEobBaseSpellLevelsCleric,
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 72bebf997b..a5b2a69c09 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -349,17 +349,14 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 		}
 	}
 
-	if (_saveLoadMode != -1) {
-		if (_flags.gameID == GI_EOB1)
-			_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
-		loadLevel(_currentLevel, _currentSub);
-		_sceneUpdateRequired = true;
-		_screen->setFont(Screen::FID_6_FNT);
-		_saveLoadMode = 1;
-	}
+	if (_flags.gameID == GI_EOB1)
+		_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
+	loadLevel(_currentLevel, _currentSub);
+	_sceneUpdateRequired = true;
+	_screen->setFont(Screen::FID_6_FNT);
 
 	_screen->setCurPage(0);
-	gui_drawPlayField(0);
+	gui_drawPlayField(0);	
 
 	if (_currentControlMode)
 		_screen->copyRegion(176, 0, 0, 0, 144, 168, 0, 5, Screen::CR_NO_P_CHECK);
@@ -373,6 +370,8 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 		useMagicBookOrSymbol(_openBookChar, _openBookType);
 	}
 
+	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 14, Screen::CR_NO_P_CHECK);
+
 	gui_toggleButtons();
 	setHandItem(_itemInHand);
 
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 6cc7606a21..efc5b854b8 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -387,6 +387,7 @@ void EobCoreEngine::initStaticResource() {
 	_menuStringsTransfer = _staticres->loadStrings(kEobBaseMenuStringsTransfer, temp);
 	_menuStringsSpec = _staticres->loadStrings(kEobBaseMenuStringsSpec, temp);
 	_menuStringsSpellNo = _staticres->loadStrings(kEobBaseMenuStringsSpellNo, temp);
+	_menuYesNoStrings = _staticres->loadStrings(kEobBaseMenuYesNoStrings, temp);
 
 	_spellLevelsMage = _staticres->loadRawData(kEobBaseSpellLevelsMage, _spellLevelsMageSize);
 	_spellLevelsCleric = _staticres->loadRawData(kEobBaseSpellLevelsCleric, _spellLevelsClericSize);
-- 
cgit v1.2.3


From db83458330310072c743d5acc7e1a470c888ec3b Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 5 Jul 2011 17:28:02 +0200
Subject: KYRA: (EOB) - implement scribe scroll menu

---
 engines/kyra/gui_eob.cpp | 120 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 119 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 1d69a901e5..936567b5bf 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -2909,7 +2909,125 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 
 
 void GUI_Eob::scribeScrollDialogue() {
-	
+	int16 *scrollInvSlot = new int16[32];
+	int16 *scrollCharacter = new int16[32];
+	int16 *menuItems = new int16[6];
+	int numScrolls = 0;
+
+	for (int i = 0; i < 32; i++) {
+		for (int ii = 0; ii < 6; ii++) {
+			scrollInvSlot[i] = _vm->checkCharacterInventoryForItem(ii, 34, i + 1) + 1;
+			if (scrollInvSlot[i] > 0) {
+				numScrolls++;
+				scrollCharacter[i] = ii;
+				break;
+			}
+		}
+	}
+
+	if (numScrolls) {
+		int csel = selectCharacterDialogue(49);
+		if (csel != -1) {
+			
+			EobCharacter *c = &_vm->_characters[csel];
+			int s = 0;
+
+			for (int i = 0; i < 32 && s < 6; i++) {
+				if (!scrollInvSlot[i])
+					continue;
+
+				if (c->mageSpellsAvailabilityFlags & (1 << i))
+					scrollInvSlot[i] = 0;
+				else
+					menuItems[s++] = i + 1;
+			}
+
+			if (s) {
+				Button *buttonList = 0;
+				bool redraw = true;
+				int lastHighLight = -1;
+				int newHighLight = 0;
+
+				while (s && !_vm->shouldQuit()) {
+					if (redraw) {
+						s = 0;
+						for (int i = 0; i < 32 && s < 6; i++) {
+							if (!scrollInvSlot[i])
+								continue;
+							menuItems[s++] = i + 1;
+						}
+
+						if (!s)
+							break;
+
+						releaseButtons(buttonList);
+						buttonList = initMenu(6);
+
+						for (int i = 0; i < s; i++)
+							_screen->printShadedText(_vm->_mageSpellList[menuItems[i]], 8, 9 * i + 50, 15, 0);
+
+						redraw = false;
+						lastHighLight = -1;
+						newHighLight = 0;
+					}					
+
+					if (lastHighLight != newHighLight) {
+						if (lastHighLight >= 0)
+							_screen->printText(_vm->_mageSpellList[menuItems[lastHighLight]], 8, 9 * lastHighLight + 50, 15, 0);
+						lastHighLight = newHighLight;
+						_screen->printText(_vm->_mageSpellList[menuItems[lastHighLight]], 8, 9 * lastHighLight + 50, 6, 0);
+						_screen->updateScreen();
+					}
+
+					int inputFlag = _vm->checkInput(buttonList, false, 0);
+					_vm->removeInputTop();
+
+					if (inputFlag == 0) {
+						Common::Point p = _vm->getMousePos();
+						if (_vm->posWithinRect(p.x, p.y, 8, 50, 176, s * 9 + 49))
+							newHighLight = (p.y - 50) / 9;
+					} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP2] || inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN]) {
+						newHighLight = (newHighLight + 1) % s;
+					} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP8] || inputFlag == _vm->_keyMap[Common::KEYCODE_UP]) {
+						newHighLight = (newHighLight + s - 1) % s;
+					} else if (inputFlag == 0x8023 || inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE]) {
+						s = 0;
+					} else if (inputFlag == 0x8024) {
+						newHighLight = (_vm->_mouseY - 50) / 9;						
+						if (newHighLight >= 0 && newHighLight < s) {
+							inputFlag = _vm->_keyMap[Common::KEYCODE_SPACE];
+						} else {
+							inputFlag = 0;
+							newHighLight = lastHighLight;
+						}
+					}
+
+					if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP5])  {
+						int t = menuItems[newHighLight] - 1;
+						Item scItem = _vm->_characters[scrollCharacter[t]].inventory[scrollInvSlot[t] - 1];
+						c->mageSpellsAvailabilityFlags |= (1 << t);
+						_vm->_characters[scrollCharacter[t]].inventory[scrollInvSlot[t] - 1] = 0;
+						_vm->gui_drawCharPortraitWithStats(_vm->_characters[scrollCharacter[t]].id);
+						scrollInvSlot[t] = 0;
+						_vm->_items[scItem].block = -1;
+						redraw = true;
+						s--;
+					}
+				}
+
+				releaseButtons(buttonList);
+
+			} else {
+				displayTextBox(51);
+			}
+		}
+	} else {
+		displayTextBox(50);
+	}
+
+	delete[] menuItems;
+	delete[] scrollCharacter;
+	delete[] scrollInvSlot;
 }
 
 bool GUI_Eob::confirmDialogue(int id) {
-- 
cgit v1.2.3


From 9140fd8e91882250e23e2e4b44bf3088f3da827a Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 18 Jul 2011 01:22:58 +0200
Subject: KYRA: (EOB) - implement party resting

---
 engines/kyra/chargen.cpp        |   4 +-
 engines/kyra/eob1.cpp           |   5 +
 engines/kyra/eob1.h             |   2 +-
 engines/kyra/eob2.cpp           |  36 +++
 engines/kyra/eob2.h             |  14 ++
 engines/kyra/eobcommon.cpp      | 173 ++++++++++----
 engines/kyra/eobcommon.h        |  27 ++-
 engines/kyra/gui_eob.cpp        | 496 ++++++++++++++++++++++++++++++++--------
 engines/kyra/gui_eob.h          |   5 +-
 engines/kyra/items_eob.cpp      |   2 +-
 engines/kyra/magic_eob.cpp      |  38 ++-
 engines/kyra/resource.h         |   2 +
 engines/kyra/saveload_eob.cpp   |   4 +-
 engines/kyra/sequences_eob2.cpp |  73 ++++++
 engines/kyra/sprites_eob.cpp    |  19 +-
 engines/kyra/staticres_eob.cpp  |   3 +-
 engines/kyra/text_eob.cpp       |   8 +-
 engines/kyra/timer.cpp          |  20 ++
 engines/kyra/timer.h            |   2 +
 engines/kyra/timer_eob.cpp      |  17 ++
 20 files changed, 780 insertions(+), 170 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 3147fbb850..c8040ed9de 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -1270,10 +1270,10 @@ void CharacterGenerator::finish() {
 
 	for (int i = 0; i < 4; i++) {
 		if (_vm->_classModifierFlags[_characters[i].cClass] & 2)
-			_characters[i].mageSpellsAvailabilityFlags = (_vm->game() == GI_EOB2) ? 0x81CB6 : 0x26C;
+			_characters[i].mageSpellsAvailableFlags = (_vm->game() == GI_EOB2) ? 0x81CB6 : 0x26C;
 
 		if (_vm->_classModifierFlags[_characters[i].cClass] & 0x14 && _vm->game() == GI_EOB2) {
-			// Cleric: Turn Undead
+			// Cleric/Paladin: Add Turn Undead spell
 			_characters[i].clericSpells[0] = 29;
 		}
 	}
diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index 3992b2284e..70031bfd27 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -24,6 +24,7 @@
 
 #include "kyra/eob1.h"
 #include "kyra/resource.h"
+#include "kyra/sound.h"
 
 namespace Kyra {
 
@@ -77,6 +78,10 @@ void EobEngine::startupNew() {
 	EobCoreEngine::startupNew();
 }
 
+void EobEngine::startupLoad() {
+	_sound->loadSoundFile("ADLIB");
+}
+
 void EobEngine::npcSequence(int npcIndex) {
 
 
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
index 8181f3281e..8a959e9fa4 100644
--- a/engines/kyra/eob1.h
+++ b/engines/kyra/eob1.h
@@ -48,7 +48,7 @@ private:
 
 	// Main loop
 	void startupNew();
-	void startupLoad() {}
+	void startupLoad();
 
 	// Intro/Outro
 	void seq_playOpeningCredits();
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index baed595e8c..8f3a10c374 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -271,6 +271,24 @@ void DarkMoonEngine::replaceMonster(int unit, uint16 block, int pos, int dir, in
 	initMonster(index, unit, block, pos, dir, type, shpIndex, mode, h2, randItem, fixedItem);
 }
 
+bool DarkMoonEngine::killMonsterExtra(EobMonsterInPlay *m) {
+	if (_currentLevel == 16 && _currentSub == 1 && (_monsterProps[m->type].flags & 4)) {
+		if (m->type) {
+			_playFinale = true;
+			_runFlag = false;
+		} else {
+			m->hitPointsCur = 150;
+			m->curRemoteWeapon = 0;
+			m->numRemoteAttacks = 255;
+			m->shpIndex++;
+			m->type++;
+			seq_dranDragonTransformation();
+		}
+		return false;
+	}
+	return true;
+}
+
 const uint8 *DarkMoonEngine::loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs) {
 	_screen->loadEobBitmap(filename, 3, 3);
 	for (int i = 0; i < 3; i++) {
@@ -319,6 +337,24 @@ void DarkMoonEngine::drawDoorIntern(int type, int, int x, int y, int w, int wall
 		drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
 }
 
+void DarkMoonEngine::restParty_npc() {
+
+}
+
+bool DarkMoonEngine::restParty_extraAbortCondition() {
+	if (_currentLevel != 3)
+		return false;
+	
+	seq_nightmare();
+
+	return true;
+}
+
+void DarkMoonEngine::checkPartyStatusExtra() {
+	if (checkScriptFlag(0x10))
+		seq_dranFools();
+}
+
 void DarkMoonEngine::drawLightningColumn() {
 	int f = rollDice(1, 2, -1);
 	int y = 0;
diff --git a/engines/kyra/eob2.h b/engines/kyra/eob2.h
index 22193cecf2..93a3518f35 100644
--- a/engines/kyra/eob2.h
+++ b/engines/kyra/eob2.h
@@ -60,6 +60,7 @@ private:
 	// Main Menu
 	int mainMenu();
 	int mainMenuLoop();
+
 	int _menuChoiceInit;
 
 	// Main loop
@@ -85,6 +86,13 @@ private:
 	static const char *_palFilesIntro[];
 	static const char *_palFilesFinale[];
 
+	// Ingame sequence
+	void seq_nightmare();
+	void seq_dranFools();
+	void seq_dranDragonTransformation();
+
+	const char *const *_dranFoolsStrings;
+
 	// characters
 	void npcSequence(int npcIndex);
 
@@ -99,6 +107,7 @@ private:
 	void generateMonsterPalettes(const char *file, int16 monsterIndex);
 	void loadMonsterDecoration(const char *file, int16 monsterIndex);
 	void replaceMonster(int unit, uint16 block, int d, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem);
+	bool killMonsterExtra(EobMonsterInPlay *m);
 
 	// Level
 	const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs);
@@ -106,7 +115,12 @@ private:
 
 	const uint8 *_dscDoorType5Offs;
 
+	// Rest party
+	void restParty_npc();
+	bool restParty_extraAbortCondition();
+
 	// misc
+	void checkPartyStatusExtra();
 	void drawLightningColumn();
 	int resurrectionSelectDialogue();
 	int charSelectDialogue();
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 4c8d4886fd..eebe7528b4 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -135,6 +135,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_spells = 0;
 	_spellAnimBuffer = 0;
 	_clericSpellOffset = 0;
+	_restPartyElapsedTime = 0;
 }
 
 EobCoreEngine::~EobCoreEngine() {
@@ -351,6 +352,7 @@ Common::Error EobCoreEngine::go() {
 		if (_gameToLoad != -1) {
 			if (loadGameState(_gameToLoad).getCode() != Common::kNoError)
 				error("Couldn't load game slot %d on startup", _gameToLoad);
+			startupLoad();
 			_gameToLoad = -1;
 		} else {
 			action = mainMenu();
@@ -434,7 +436,7 @@ void EobCoreEngine::runLoop() {
 
 	while (!shouldQuit() && _runFlag) {
 		//_runLoopUnk2 = _currentBlock;
-		updateCharacterEvents(true);
+		checkPartyStatus(true);
 		checkInput(_activeButtons, true, 0);
 		removeInputTop();
 
@@ -444,16 +446,18 @@ void EobCoreEngine::runLoop() {
 		if (_sceneUpdateRequired)
 			drawScene(1);
 
-		if (_envAudioTimer >= _system->getMillis())
+		if (_envAudioTimer >= _system->getMillis() || (_flags.gameID == GI_EOB1 && (_currentLevel == 0 || _currentLevel > 3)))
 			continue;
 
 		_envAudioTimer = _system->getMillis() + (rollDice(1, 10, 3) * 18 * _tickLength);
-		snd_processEnvironmentalSoundEffect(rollDice(1, 2, -1) ? 27 : 28, _currentBlock + rollDice(1, 12, -1));
+		snd_processEnvironmentalSoundEffect(_flags.gameID == GI_EOB1 ? 30 : (rollDice(1, 2, -1) ? 27 : 28), _currentBlock + rollDice(1, 12, -1));
 		updateEnvironmentalSfx(0);
+		//TODO
+		//EOB1__level_2_7__turnUndead();
 	}
 }
 
-bool EobCoreEngine::updateCharacterEvents(bool a) {
+bool EobCoreEngine::checkPartyStatus(bool handleDeath) {
 	int numChars = 0;
 	for (int i = 0; i < 6; i++)
 		numChars += testCharacter(i, 13);
@@ -461,21 +465,22 @@ bool EobCoreEngine::updateCharacterEvents(bool a) {
 	if (numChars)
 		return false;
 
-	if (!a)
+	if (!handleDeath)
 		return true;
 
-
 	gui_drawAllCharPortraitsWithStats();
+	checkPartyStatusExtra();
+
+	if (_gui->confirmDialogue2(14, 67, 1)) {
+		_screen->setFont(Screen::FID_8_FNT);
+		gui_updateControls();
+		if (_gui->runLoadMenu(0, 0)) {
+			_screen->setFont(Screen::FID_6_FNT);
+			return true;
+		}
+	}
 
-	///	TODO
-	/// if (checkScriptFlag(0x10))
-	/// j_dranThoseFools()
-
-	///	TODO
-
-	///	TODO
-
-
+	quitGame();
 	return false;
 }
 
@@ -932,13 +937,13 @@ int EobCoreEngine::countCharactersWithSpecificItems(int16 itemType, int16 itemVa
 	for (int i = 0; i < 6; i++) {
 		if (!testCharacter(i, 1))
 			continue;
-		if (checkCharacterInventoryForItem(i, itemType, itemValue) != -1)
+		if (checkInventoryForItem(i, itemType, itemValue) != -1)
 			res++;
 	}
 	return res;
 }
 
-int EobCoreEngine::checkCharacterInventoryForItem(int character, int16 itemType, int16 itemValue) {
+int EobCoreEngine::checkInventoryForItem(int character, int16 itemType, int16 itemValue) {
 	for (int i = 0; i < 27; i++) {
 		uint16 inv = _characters[character].inventory[i];
 		if (!inv)
@@ -1275,6 +1280,118 @@ int EobCoreEngine::runDialogue(int dialogueTextId, int style, const char *button
 	return res;
 }
 
+void EobCoreEngine::restParty_displayWarning(const char *str) {
+	int od = _screen->curDimIndex();
+	_screen->setScreenDim(7);
+	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
+	_screen->setCurPage(0);
+
+	_txt->printMessage(Common::String::format("\r%s\r", str).c_str());
+
+	_screen->setFont(of);
+	_screen->setScreenDim(od);
+}
+
+bool EobCoreEngine::restParty_updateMonsters() {
+	bool sfxEnabled = _sound->sfxEnabled();
+	bool musicEnabled = _sound->musicEnabled();
+	_sound->enableSFX(false);
+	_sound->enableMusic(false);
+
+	for (int i = 0; i < 5; i++) {
+		_partyResting = true;
+		Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
+		int od = _screen->curDimIndex();
+		_screen->setScreenDim(7);
+		updateMonsters(0);
+		updateMonsters(1);
+		timerProcessFlyingObjects(0);
+		_screen->setScreenDim(od);
+		_screen->setFont(of);
+		_partyResting = false;
+
+		for (int ii = 0; ii < 30; ii++) {
+			if (_monsters[ii].mode == 8)
+				continue;
+			if (getBlockDistance(_currentBlock, _monsters[ii].block) >= 2)
+				continue;
+
+			restParty_displayWarning(_menuStringsRest4[0]);
+			_sound->enableSFX(sfxEnabled);
+			_sound->enableMusic(musicEnabled);
+			return true;
+		}
+	}
+	
+	_sound->enableSFX(sfxEnabled);
+	_sound->enableMusic(musicEnabled);
+	return false;
+}
+
+int EobCoreEngine::restParty_getCharacterWithLowestHp() {
+	int lhp = 900;
+	int res = -1;
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 3))
+			continue;
+		if (_characters[i].hitPointsCur >= _characters[i].hitPointsMax)
+			continue;
+		if (_characters[i].hitPointsCur < lhp) {
+			lhp = _characters[i].hitPointsCur;
+			res = i;
+		}
+	}
+
+	return res + 1;
+}
+
+bool EobCoreEngine::restParty_checkHealSpells(int charIndex) {
+	static const uint8 eob1healSpells[] = { 2, 15, 20 };
+	static const uint8 eob2healSpells[] = { 3, 16, 20 };
+	const uint8 *spells = _flags.gameID == GI_EOB1 ? eob1healSpells : eob2healSpells;
+	const int8 *list = _characters[charIndex].clericSpells;
+	
+	for (int i = 0; i < 80; i++) {
+		int s = list[i] < 0 ? -list[i] : list[i];
+		if (s == spells[0] || s == spells[1] || s == spells[2])
+			return true;
+	}
+
+	return false;
+}
+
+bool EobCoreEngine::restParty_checkSpellsToLearn() {
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 0x43))
+			continue;
+
+		if ((getCharacterLevelIndex(2, _characters[i].cClass) != -1 || getCharacterLevelIndex(4, _characters[i].cClass) != -1) && (checkInventoryForItem(i, 30, -1) != -1)) {
+			for (int ii = 0; ii < 80; ii++) {
+				if (_characters[i].clericSpells[ii] < 0)
+					return true;
+			}
+		}
+
+		if ((getCharacterLevelIndex(1, _characters[i].cClass) != -1) && (checkInventoryForItem(i, 29, -1) != -1)) {
+			for (int ii = 0; ii < 80; ii++) {
+				if (_characters[i].mageSpells[ii] < 0)
+					return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+void EobCoreEngine::restParty_npc() {
+
+}
+
+bool EobCoreEngine::restParty_extraAbortCondition() {
+	return false;
+}
+
 void EobCoreEngine::delay(uint32 millis, bool, bool) {
 	while (millis && !shouldQuit() && !skipFlag()) {
 		updateInput();
@@ -1319,28 +1436,6 @@ void EobCoreEngine::displayParchment(int id) {
 	restoreAfterDialogueSequence();
 }
 
-bool EobCoreEngine::restParty() {
-	if (_inf->preventRest()) {
-		assert(_menuStringsRest3[0]);
-		displayRestWarning(_menuStringsRest3[0]);
-		return true;
-	}
-
-	return true;
-}
-
-void EobCoreEngine::displayRestWarning(const char *str) {
-	int od = _screen->curDimIndex();
-	_screen->setScreenDim(7);
-	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
-	_screen->setCurPage(0);
-
-	_txt->printMessage(Common::String::format("\r%s\r", str).c_str());
-
-	_screen->setFont(of);
-	_screen->setScreenDim(od);
-}
-
 void EobCoreEngine::useSlotWeapon(int charIndex, int slotIndex, int item) {
 	EobCharacter *c = &_characters[charIndex];
 	int tp = item ? _items[item].type : 0;
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index e6b816e291..0cf2e9dc38 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -108,7 +108,7 @@ struct EobCharacter {
 
 	int8 mageSpells[80];
 	int8 clericSpells[80];
-	uint32 mageSpellsAvailabilityFlags;
+	uint32 mageSpellsAvailableFlags;
 
 	Item inventory[27];
 	uint32 timers[10];
@@ -311,7 +311,7 @@ protected:
 	virtual void startupLoad() = 0;
 	void runLoop();
 	void update() { screen()->updateScreen(); }
-	bool updateCharacterEvents(bool a);
+	bool checkPartyStatus(bool handleDeath);
 
 	bool _runFlag;
 	//int _runLoopUnk2;
@@ -334,6 +334,7 @@ protected:
 	void setCharEventTimer(int charIndex, uint32 countdown, int evnt, int updateExistingTimer);
 	void deleteCharEventTimer(int charIndex, int evnt);
 	void setupCharacterTimers();
+	void manualAdvanceTimer(int sysTimer, uint32 millis);
 
 	void timerProcessMonsters(int timerNum);
 	void timerSpecialCharacterUpdate(int timerNum);
@@ -349,6 +350,8 @@ protected:
 	static const uint8 _clock2Timers[];
 	static const uint8 _numClock2Timers;
 
+	int32 _restPartyElapsedTime;
+
 	// Mouse
 	void setHandItem(Item itemIndex);
 
@@ -369,7 +372,7 @@ protected:
 	int getCharacterLevelIndex(int type, int cClass);
 
 	int countCharactersWithSpecificItems(int16 itemType, int16 itemValue);
-	int checkCharacterInventoryForItem(int character, int16 itemType, int16 itemValue);
+	int checkInventoryForItem(int character, int16 itemType, int16 itemValue);
 	void modifyCharacterHitpoints(int character, int16 points);
 	void neutralizePoison(int character);
 
@@ -471,6 +474,7 @@ protected:
 	void placeMonster(EobMonsterInPlay *m, uint16 block, int dir);
 	virtual void replaceMonster(int b, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem) = 0;
 	void killMonster(EobMonsterInPlay *m, bool giveExperience);
+	virtual bool killMonsterExtra(EobMonsterInPlay *m);
 	int countSpecificMonsters(int type);
 	void updateAttackingMonsterFlags();
 
@@ -533,7 +537,7 @@ protected:
 	const uint8 *_monsterProximityTable;
 	const uint8 *_findBlockMonstersTable;
 	const char *const *_monsterDustStrings;
-
+	
 	const uint8 *_monsterDistAttType10;
 	const uint8 *_monsterDistAttSfx10;
 	const uint8 *_monsterDistAttType17;
@@ -766,12 +770,19 @@ protected:
 	const char *const *_cancelStrings;
 	const char *const *_abortStrings;
 
+	// Rest party
+	void restParty_displayWarning(const char *str);
+	bool restParty_updateMonsters();
+	int restParty_getCharacterWithLowestHp();
+	bool restParty_checkHealSpells(int charIndex);
+	bool restParty_checkSpellsToLearn();
+	virtual void restParty_npc();
+	virtual bool restParty_extraAbortCondition();
+
 	// misc
 	void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false);
 	void displayParchment(int id);
-
-	bool restParty();
-	void displayRestWarning(const char *str);
+	virtual void checkPartyStatusExtra() {}
 
 	virtual void drawLightningColumn() {}
 	virtual int resurrectionSelectDialogue() { return -1; }
@@ -843,7 +854,7 @@ protected:
 	void sparkEffectDefensive(int charIndex);
 	void sparkEffectOffensive();
 	void setSpellEventTimer(int spell, int timerBaseFactor, int timerLength, int timerLevelFactor, int updateExistingTimer);
-	void cleanupCharacterSpellList(int charIndex);
+	void sortCharacterSpellList(int charIndex);
 
 	bool magicObjectHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level);
 
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 936567b5bf..3a71642f9b 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -24,6 +24,7 @@
 
 #include "kyra/eobcommon.h"
 #include "kyra/gui_eob.h"
+#include "kyra/script_eob.h"
 #include "kyra/text_eob.h"
 #include "kyra/timer.h"
 #include "kyra/util.h"
@@ -508,7 +509,7 @@ void EobCoreEngine::gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32
 }
 
 void EobCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
-	uint8 boxColor = ((_partyEffectFlags & 0x20000) | (_partyEffectFlags & 0xffff)) ? 4 : 6;
+	uint8 redGreenColor = (_partyEffectFlags & 0x20000) ? 4 : 6;
 
 	static const uint8 xCoords[] = { 8, 80 };
 	static const uint8 yCoords[] = { 2, 54, 106 };
@@ -520,18 +521,16 @@ void EobCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
 
 	EobCharacter *c = &_characters[index];
 
-	int v8 = (_flags.gameID == GI_EOB2 && ((c->effectFlags & 0x4818) || c->effectsRemainder[0] || c->effectsRemainder[1] || ((_partyEffectFlags & 0x20000) | (_partyEffectFlags & 0xffff)))) ||
-		(_flags.gameID == GI_EOB1 && ((c->effectFlags & 0x302) || c->effectsRemainder[0] || c->effectsRemainder[1])) ? 1 : 0;
-	int vA = (_flags.gameID == GI_EOB2 && ((((c->effectFlags & 0x3000) | (c->effectFlags & 0x10000)) || (_partyEffectFlags & 0x8420)))) ||
-		(_flags.gameID == GI_EOB1 && ((c->effectFlags & 0x4c8) || _partyEffectFlags & 300000))? 1 : 0;
+	bool redGreen = ((c->effectFlags & 0x4818) || (_partyEffectFlags & 0x20000) || c->effectsRemainder[0] || c->effectsRemainder[1]) ? true : false;
+	bool yellow = ((c->effectFlags & 0x13000) || (_partyEffectFlags & 0x8420) || c->effectsRemainder[0] || c->effectsRemainder[1]) ? true : false;
 
-	if (v8 || vA) {
-		if (v8 && !vA) {
-			_screen->drawBox(x, y, x + 63, y + 49, boxColor);
+	if (redGreen || yellow) {
+		if (redGreen && !yellow) {
+			_screen->drawBox(x, y, x + 63, y + 49, redGreenColor);
 			return;
 		}
 
-		if (vA && !v8) {
+		if (yellow && !redGreen) {
 			_screen->drawBox(x, y, x + 63, y + 49, 5);
 			return;
 		}
@@ -541,11 +540,11 @@ void EobCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
 
 		for (int i = 0; i < 64; i += 16) {
 			x = iX + i;
-			if (v8) {
-				_screen->drawClippedLine(x, y, x + 7, y, boxColor);
-				_screen->drawClippedLine(x + 8, y + 49, x + 15, y + 49, boxColor);
+			if (redGreen) {
+				_screen->drawClippedLine(x, y, x + 7, y, redGreenColor);
+				_screen->drawClippedLine(x + 8, y + 49, x + 15, y + 49, redGreenColor);
 			}
-			if (vA) {
+			if (yellow) {
 				_screen->drawClippedLine(x + 8, y, x + 15, y, 5);
 				_screen->drawClippedLine(x, y + 49, x + 7, y + 49, 5);
 			}
@@ -556,13 +555,13 @@ void EobCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
 		for (int i = 1; i < 48; i += 12) {
 			y = iY + i - 1;
 
-			if (vA) {
+			if (yellow) {
 				_screen->drawClippedLine(x, y + 1, x, y + 6, 5);
 				_screen->drawClippedLine(x + 63, y + 7, x + 63, y + 12, 5);
 			}
-			if (v8) {
-				_screen->drawClippedLine(x, y + 7, x, y + 12, boxColor);
-				_screen->drawClippedLine(x + 63, y + 1, x + 63, y + 6, boxColor);
+			if (redGreen) {
+				_screen->drawClippedLine(x, y + 7, x, y + 12, redGreenColor);
+				_screen->drawClippedLine(x + 63, y + 1, x + 63, y + 6, redGreenColor);
 			}
 		}
 
@@ -859,7 +858,7 @@ int EobCoreEngine::clickedCamp(Button *button) {
 	drawScene(0);
 
 	for (int i = 0; i < 6; i++)
-		cleanupCharacterSpellList(i);
+		sortCharacterSpellList(i);
 
 	_screen->setCurPage(0);
 	const ScreenDim *dm = _screen->getScreenDim(10);
@@ -867,8 +866,11 @@ int EobCoreEngine::clickedCamp(Button *button) {
 
 	_screen->updateScreen();
 
-	enableSysTimer(2);	
-	updateCharacterEvents(true);
+	enableSysTimer(2);
+	manualAdvanceTimer(2, _restPartyElapsedTime);
+	_restPartyElapsedTime = 0;
+
+	checkPartyStatus(true);
 
 	return button->arg;
 }
@@ -2174,11 +2176,12 @@ void GUI_Eob::runCampMenu() {
 
 			switch (inputFlag) {
 			case 0x8001:
-				if (_vm->restParty())
+				if (restParty())
 					runLoop = false;
 				else
 					_needRest = false;
 				redrawPortraits = true;
+				newMenu = 0;
 				break;
 
 			case 0x8002:
@@ -2286,7 +2289,7 @@ void GUI_Eob::runCampMenu() {
 		if (_charSelectRedraw || redrawPortraits) {
 			for (int i = 0; i < 6; i++) {
 				_vm->gui_drawCharPortraitWithStats(i);
-				_vm->cleanupCharacterSpellList(i);
+				_vm->sortCharacterSpellList(i);
 			}
 		}
 
@@ -2334,6 +2337,74 @@ bool GUI_Eob::runLoadMenu(int x, int y) {
 	return result;
 }
 
+bool GUI_Eob::confirmDialogue2(int dim, int id, int deflt) {
+	int od = _screen->curDimIndex();
+	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
+	_screen->setScreenDim(dim);
+
+	drawTextBox(dim, id);
+
+	int16 x[2];
+	x[0] = (_screen->_curDim->sx << 3) + 8;
+	x[1] = (_screen->_curDim->sx + _screen->_curDim->w - 5) << 3;
+	int16 y = _screen->_curDim->sy + _screen->_curDim->h - 21;
+	int newHighlight = deflt ^ 1;
+	int lastHighlight = -1;
+	
+	for (int i = 0; i < 2; i++)
+		drawMenuButtonBox(x[i], y, 32, 14, false, false);
+
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+		Common::Point p = _vm->getMousePos();
+		if (_vm->posWithinRect(p.x, p.y, x[0], y, x[0] + 32, y + 14))
+			newHighlight = 0;
+		else if (_vm->posWithinRect(p.x, p.y, x[1], y, x[1] + 32, y + 14))
+			newHighlight = 1;
+
+		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
+		_vm->removeInputTop();
+
+		if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
+			runLoop = false;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP6]) {
+			newHighlight ^= 1;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_n]) {
+			newHighlight = 1;
+			runLoop = false;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_y]) {
+			newHighlight = 0;
+			runLoop = false;
+		}  else if (inputFlag == 199 || inputFlag == 201) {
+			if (_vm->posWithinRect(p.x, p.y, x[0], y, x[0] + 32, y + 14)) {
+				newHighlight = 0;
+				runLoop = false;
+			} else if (_vm->posWithinRect(p.x, p.y, x[1], y, x[1] + 32, y + 14)) {
+				newHighlight = 1;
+				runLoop = false;
+			}
+		}
+
+		if (newHighlight != lastHighlight) {
+			for (int i = 0; i < 2; i++)				
+				_screen->printShadedText(_vm->_menuYesNoStrings[i], x[i] + 16 - (strlen(_vm->_menuYesNoStrings[i]) << 2) + 1, y + 3, i == newHighlight ? 6 : 15, 0);
+			_screen->updateScreen();
+			lastHighlight = newHighlight;
+		}
+	}
+
+	drawMenuButtonBox(x[newHighlight], y, 32, 14, true, true);
+	_screen->updateScreen();
+	_vm->_system->delayMillis(80);
+	drawMenuButtonBox(x[newHighlight], y, 32, 14, false, true);
+	_screen->updateScreen();
+
+	_screen->copyRegion(0, _screen->_curDim->h, _screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->setFont(of);
+	_screen->setScreenDim(od);
+	
+	return newHighlight ? false : true;
+}
+
 void GUI_Eob::updateBoxFrameHighLight(int box) {
 	static const uint8 colorTable[] = { 0x0F, 0xB0, 0xB2, 0xB4, 0xB6,
 		0xB8, 0xBA, 0xBC, 0x0C, 0xBC, 0xBA, 0xB8, 0xB6, 0xB4, 0xB2, 0xB0, 0x00
@@ -2686,7 +2757,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 			for (int i = 0; i < _numPages; i++)
 				np[i] = _vm->_numSpellsMage[lv * _numPages + i];
 
-			avltyFlags = c->mageSpellsAvailabilityFlags;
+			avltyFlags = c->mageSpellsAvailableFlags;
 		}
 	}
 
@@ -2916,7 +2987,7 @@ void GUI_Eob::scribeScrollDialogue() {
 
 	for (int i = 0; i < 32; i++) {
 		for (int ii = 0; ii < 6; ii++) {
-			scrollInvSlot[i] = _vm->checkCharacterInventoryForItem(ii, 34, i + 1) + 1;
+			scrollInvSlot[i] = _vm->checkInventoryForItem(ii, 34, i + 1) + 1;
 			if (scrollInvSlot[i] > 0) {
 				numScrolls++;
 				scrollCharacter[i] = ii;
@@ -2936,7 +3007,7 @@ void GUI_Eob::scribeScrollDialogue() {
 				if (!scrollInvSlot[i])
 					continue;
 
-				if (c->mageSpellsAvailabilityFlags & (1 << i))
+				if (c->mageSpellsAvailableFlags & (1 << i))
 					scrollInvSlot[i] = 0;
 				else
 					menuItems[s++] = i + 1;
@@ -3005,7 +3076,7 @@ void GUI_Eob::scribeScrollDialogue() {
 					if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP5])  {
 						int t = menuItems[newHighLight] - 1;
 						Item scItem = _vm->_characters[scrollCharacter[t]].inventory[scrollInvSlot[t] - 1];
-						c->mageSpellsAvailabilityFlags |= (1 << t);
+						c->mageSpellsAvailableFlags |= (1 << t);
 						_vm->_characters[scrollCharacter[t]].inventory[scrollInvSlot[t] - 1] = 0;
 						_vm->gui_drawCharPortraitWithStats(_vm->_characters[scrollCharacter[t]].id);
 						scrollInvSlot[t] = 0;
@@ -3030,6 +3101,284 @@ void GUI_Eob::scribeScrollDialogue() {
 	delete[] scrollInvSlot;
 }
 
+bool GUI_Eob::restParty() {
+	static const int8 eob1healSpells[] = { 2, 15, 20, 24 };
+	static const int8 eob2healSpells[] = { 3, 16, 20, 28 };
+	const int8 *spells = _vm->game() == GI_EOB1 ? eob1healSpells : eob2healSpells;
+	
+	uint8 crs[6];
+	memset(crs, 0, 6);
+	int hours = 0;
+
+	if (_vm->_inf->preventRest()) {
+		assert(_vm->_menuStringsRest3[0]);
+		_vm->restParty_displayWarning(_vm->_menuStringsRest3[0]);
+		return true;
+	}
+
+	if (_vm->restParty_updateMonsters())
+		return true;
+
+	if (_vm->restParty_extraAbortCondition())
+		return true;
+
+	drawMenuButtonBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, false, false);
+
+	int nonPoisoned = 0;
+	for (int i = 0; i < 6; i++) {
+		if (!_vm->testCharacter(i, 1))
+			continue;
+		nonPoisoned |= _vm->testCharacter(i, 0x10);
+	}
+
+	if (!nonPoisoned) {
+		if (!confirmDialogue(59))
+			return false;
+	}
+
+	int8 *list = 0;
+	bool useHealers = false;
+	bool res = false;
+	bool restLoop = true;
+	bool restContinue = false;
+	int injured = _vm->restParty_getCharacterWithLowestHp();
+
+	if (injured > 0) {
+		for (int i = 0; i < 6; i++) {
+			if (!_vm->testCharacter(i, 13))
+				continue;
+			if (_vm->getCharacterLevelIndex(2, _vm->_characters[i].cClass) == -1 && _vm->getCharacterLevelIndex(4, _vm->_characters[i].cClass) == -1)
+				continue;
+			if (_vm->checkInventoryForItem(i, 30, -1) == -1)
+				continue;
+			if (_vm->restParty_checkHealSpells(i))
+				useHealers = confirmDialogue(40);
+		} 
+	}
+
+	_screen->setClearScreenDim(7);
+	_screen->setFont(Screen::FID_6_FNT);
+
+	restParty_updateRestTime(hours, true);
+
+	for (int l = 0; !res && restLoop && !_vm->shouldQuit(); ) {
+		l++;
+
+		// Regenerate spells
+		for (int i = 0; i < 6; i++) {
+			crs[i]++;
+
+			if (!_vm->_characters[i].food)
+				continue;
+			if (!_vm->testCharacter(i, 5))
+				continue;
+
+			if (_vm->checkInventoryForItem(i, 30, -1) != -1) {
+				list = _vm->_characters[i].clericSpells;
+
+				for (int ii = 0; ii < 80; ii++) {
+					if ((ii / 10 + 48) >= crs[i])
+						break;
+					
+					if (*list >= 0) {
+						list++;
+						continue;
+					}
+
+					*list *= -1;
+					crs[i] = 48;					
+					_vm->_txt->printMessage(Common::String::format(_vm->_menuStringsRest2[0], _vm->_characters[i].name, _vm->_spells[_vm->_mageSpellListSize + *list].name).c_str());
+					_vm->delay(80);
+					break;
+				}
+			}
+
+			if (_vm->checkInventoryForItem(i, 29, -1) != -1) {
+				list = _vm->_characters[i].mageSpells;
+
+				for (int ii = 0; ii < 80; ii++) {
+					if ((ii / 6 + 48) >= crs[i])
+						break;
+					
+					if (*list >= 0) {
+						list++;
+						continue;
+					}
+
+					*list *= -1;
+					crs[i] = 48;					
+					_vm->_txt->printMessage(Common::String::format(_vm->_menuStringsRest2[1], _vm->_characters[i].name, _vm->_spells[*list].name).c_str());
+					_vm->delay(80);
+					break;
+				}
+			}
+		}
+
+		// Heal party members
+		if (useHealers) {
+			for (int i = 0; i < 6 && injured; i++) {
+				if (_vm->getCharacterLevelIndex(2, _vm->_characters[i].cClass) == -1 && _vm->getCharacterLevelIndex(4, _vm->_characters[i].cClass) == -1)
+					continue;
+				if (_vm->checkInventoryForItem(i, 30, -1) == -1)
+					continue;
+				
+				list = 0;
+				if (crs[i] >= 48) {
+					for (int ii = 0; !list && ii < 3; ii++)
+						list = (int8*)memchr(_vm->_characters[i].clericSpells, -spells[ii], 80);
+				}
+
+				if (list)
+					break;
+
+				list = _vm->_characters[i].clericSpells;
+				for (int ii = 0; ii < 80 && injured; ii++) {
+					int healHp = 0;
+					if (*list == spells[0])
+						healHp = _vm->rollDice(1, 8, 0);
+					else if (*list == spells[1])
+						healHp = _vm->rollDice(2, 8, 1);
+					else if (*list == spells[2])
+						healHp = _vm->rollDice(3, 8, 3);
+
+					if (!healHp) {
+						list++;
+						continue;
+					}
+
+					*list *= -1;
+					list++;
+
+					crs[i] = 0;
+					injured--;
+
+					_vm->_txt->printMessage(Common::String::format(_vm->_menuStringsRest2[2], _vm->_characters[i].name, _vm->_characters[injured].name).c_str());
+					_vm->delay(80);
+
+					_vm->_characters[injured].hitPointsCur += healHp;
+					if (_vm->_characters[injured].hitPointsCur > _vm->_characters[injured].hitPointsMax)
+						_vm->_characters[injured].hitPointsCur = _vm->_characters[injured].hitPointsMax;
+
+					_vm->gui_drawCharPortraitWithStats(injured++);
+				}
+			}
+		}
+
+		if (l == 6) {
+			l = 0;
+			restParty_updateRestTime(++hours, false);
+			_vm->_restPartyElapsedTime += (32760 * _vm->_tickLength);
+
+			// Update poisoning
+			for (int i = 0; i < 6; i++) {
+				if (!_vm->testCharacter(i, 1))
+					continue;
+				if (_vm->testCharacter(i, 16))
+					continue;
+				_vm->inflictCharacterDamage(i, 10);
+				_vm->delayWithTicks(5);
+			}
+
+			if (!(hours % 8)) {
+				bool starving = false;
+				for (int i = 0; i < 6; i++) {
+					// Add Lay On Hands spell
+					if (_vm->_characters[i].cClass == 2) {
+						list = (int8*)memchr(_vm->_characters[i].clericSpells, spells[3], 10);
+						if (list) {
+							*list = spells[3];
+						} else {
+							list = (int8*)memchr(_vm->_characters[i].clericSpells, -spells[3], 10);
+							if (list) {
+								*list = spells[3];
+							} else if (!memchr(_vm->_characters[i].clericSpells, spells[3], 10)) {
+								list = (int8*)memchr(_vm->_characters[i].clericSpells, 0, 10);
+								*list = spells[3];
+							}
+						}
+					}
+
+					if (!_vm->testCharacter(i, 3))
+						continue;
+
+					// Update hitpoints and food status
+					if (_vm->_characters[i].food) {
+						if (_vm->_characters[i].hitPointsCur < _vm->_characters[i].hitPointsMax) {
+							_vm->_characters[i].hitPointsCur++;
+							_screen->setFont(Screen::FID_6_FNT);
+							_vm->gui_drawCharPortraitWithStats(i);
+						}
+
+						if (!_vm->checkInventoryForRings(i, 2)) {
+							if (_vm->_characters[i].food <= 5) {
+								_vm->_characters[i].food = 0;
+								starving = true;
+							} else {
+								_vm->_characters[i].food -= 5;
+							}
+						}
+					} else {
+						if ((hours % 24) || (_vm->_characters[i].hitPointsCur <= -10))
+							continue;
+						_vm->inflictCharacterDamage(i, 1);
+						starving = true;
+						_screen->setFont(Screen::FID_6_FNT);
+						_vm->gui_drawCharPortraitWithStats(i);
+					}
+				}
+				
+				if (starving) {
+					if (!confirmDialogue(47)) {
+						restContinue = false;
+						restLoop = false;
+					}
+					restParty_updateRestTime(hours, true);
+				}
+				injured = restLoop ? _vm->restParty_getCharacterWithLowestHp() : 0;
+			}
+		}
+
+		if (!_vm->restParty_checkSpellsToLearn() && restLoop && !restContinue && injured) {
+			restContinue = confirmDialogue(41);
+			restParty_updateRestTime(hours, true);
+			if (!restContinue)
+				restLoop = false;
+		}
+
+		int in = _vm->checkInput(0, false, 0);
+		_vm->removeInputTop();
+		if (in)
+			restLoop = false;
+
+		if (restLoop) {
+			res = _vm->restParty_updateMonsters();
+			if (!res)
+				res = _vm->checkPartyStatus(false);
+		}
+
+		if (!_vm->restParty_checkSpellsToLearn()) {
+			if (!restContinue) {
+				if (!useHealers)
+					restLoop = false;
+			}
+			if (!injured)
+				restLoop = false;
+		}
+	}
+
+	_vm->removeInputTop();
+	_screen->setScreenDim(4);
+	_screen->setFont(Screen::FID_8_FNT);
+
+	if (!injured && !res)
+		displayTextBox(43);
+
+	if (res && hours > 4)
+		_vm->restParty_npc();
+
+	return res;
+}
+
 bool GUI_Eob::confirmDialogue(int id) {
 	int od = _screen->curDimIndex();
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
@@ -3092,74 +3441,6 @@ bool GUI_Eob::confirmDialogue(int id) {
 	return result;
 }
 
-bool GUI_Eob::confirmDialogue2(int dim, int id, int deflt) {
-	int od = _screen->curDimIndex();
-	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
-	_screen->setScreenDim(dim);
-
-	drawTextBox(dim, id);
-
-	int16 x[2];
-	x[0] = (_screen->_curDim->sx << 3) + 8;
-	x[1] = (_screen->_curDim->sx + _screen->_curDim->w - 5) << 3;
-	int16 y = _screen->_curDim->sy + _screen->_curDim->h - 21;
-	int newHighlight = deflt ^ 1;
-	int lastHighlight = -1;
-	
-	for (int i = 0; i < 2; i++)
-		drawMenuButtonBox(x[i], y, 32, 14, false, false);
-
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
-		Common::Point p = _vm->getMousePos();
-		if (_vm->posWithinRect(p.x, p.y, x[0], y, x[0] + 32, y + 14))
-			newHighlight = 0;
-		else if (_vm->posWithinRect(p.x, p.y, x[1], y, x[1] + 32, y + 14))
-			newHighlight = 1;
-
-		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
-		_vm->removeInputTop();
-
-		if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
-			runLoop = false;
-		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP6]) {
-			newHighlight ^= 1;
-		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_n]) {
-			newHighlight = 1;
-			runLoop = false;
-		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_y]) {
-			newHighlight = 0;
-			runLoop = false;
-		}  else if (inputFlag == 199 || inputFlag == 201) {
-			if (_vm->posWithinRect(p.x, p.y, x[0], y, x[0] + 32, y + 14)) {
-				newHighlight = 0;
-				runLoop = false;
-			} else if (_vm->posWithinRect(p.x, p.y, x[1], y, x[1] + 32, y + 14)) {
-				newHighlight = 1;
-				runLoop = false;
-			}
-		}
-
-		if (newHighlight != lastHighlight) {
-			for (int i = 0; i < 2; i++)				
-				_screen->printShadedText(_vm->_menuYesNoStrings[i], x[i] + 16 - (strlen(_vm->_menuYesNoStrings[i]) << 2) + 1, y + 3, i == newHighlight ? 6 : 15, 0);
-			_screen->updateScreen();
-			lastHighlight = newHighlight;
-		}
-	}
-
-	drawMenuButtonBox(x[newHighlight], y, 32, 14, true, true);
-	_screen->updateScreen();
-	_vm->_system->delayMillis(80);
-	drawMenuButtonBox(x[newHighlight], y, 32, 14, false, true);
-	_screen->updateScreen();
-
-	_screen->copyRegion(0, _screen->_curDim->h, _screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, 2, 0, Screen::CR_NO_P_CHECK);
-	_screen->setFont(of);
-	_screen->setScreenDim(od);
-	
-	return newHighlight ? false : true;
-}
-
 void GUI_Eob::messageDialogue(int dim, int id, int buttonTextCol) {
 	static const char buttonText[] = "OK";
 
@@ -3338,7 +3619,7 @@ int GUI_Eob::selectCharacterDialogue(int id) {
 				result = -1;
 			}
 		} else {
-			if (_vm->checkCharacterInventoryForItem(result, 29, -1) == -1) {
+			if (_vm->checkInventoryForItem(result, 29, -1) == -1) {
 				displayTextBox(25);
 				result = -1;
 			}
@@ -3635,6 +3916,31 @@ int GUI_Eob::getHighlightSlot() {
 	return res;
 }
 
+void GUI_Eob::restParty_updateRestTime(int hours, bool init) {
+	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
+	int od = _screen->curDimIndex();
+	_screen->setScreenDim(10);
+
+	if (init) {
+		_screen->setCurPage(0);
+		_vm->_txt->clearCurDim();
+		drawMenuButtonBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, false, false);
+		_screen->copyRegion(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, 0, 2, Screen::CR_NO_P_CHECK);
+		_screen->printShadedText(getMenuString(42), (_screen->_curDim->sx + 1) << 3, _screen->_curDim->sy + 5, 9, 0);
+	}
+
+	_screen->setCurPage(2);
+	_screen->printShadedText(Common::String::format(_vm->_menuStringsRest2[3], hours).c_str(), (_screen->_curDim->sx + 1) << 3, _screen->_curDim->sy + 20, 15, _vm->_bkgColor_1);
+	_screen->setCurPage(0);
+	_screen->copyRegion(((_screen->_curDim->sx + 1) << 3) - 1, _screen->_curDim->sy + 20, ((_screen->_curDim->sx + 1) << 3) - 1, _screen->_curDim->sy + 20, 144, 8, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	
+	_vm->delay(160);
+
+	_screen->setScreenDim(od);
+	_screen->setFont(of);
+}
+
 #endif // ENABLE_EOB
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index 234f2f6ae5..709c676517 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -62,6 +62,7 @@ public:
 	void runCampMenu();
 	bool runLoadMenu(int x, int y);
 
+	bool confirmDialogue2(int dim, int id, int deflt);
 	void updateBoxFrameHighLight(int box);
 
 	int getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor);
@@ -78,9 +79,9 @@ private:
 	int selectSaveSlotDialogue(int x, int y, int id);
 	void runMemorizePrayMenu(int charIndex, int spellType);
 	void scribeScrollDialogue();
+	bool restParty();
 
 	bool confirmDialogue(int id);
-	bool confirmDialogue2(int dim, int id, int deflt);
 	void messageDialogue(int dim, int id, int buttonTextCol);
 	int selectCharacterDialogue(int id);
 	void displayTextBox(int id);
@@ -100,6 +101,8 @@ private:
 	void setupSaveMenuSlots();
 	int getHighlightSlot();
 
+	void restParty_updateRestTime(int hours, bool init);
+
 	Button _scrollUpButton;//////////////////77
 	Button _scrollDownButton;
 
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index f7aed1b920..c6ec81a00e 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -221,7 +221,7 @@ void EobCoreEngine::deletePartyItem(Item itemType, int16 itemValue) {
 			continue;
 
 		EobCharacter *c = &_characters[i];
-		int slot = checkCharacterInventoryForItem(i, itemType, itemValue);
+		int slot = checkInventoryForItem(i, itemType, itemValue);
 
 		if (slot == -1)
 			continue;
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 7a9750fb69..fe770d465e 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -235,7 +235,7 @@ void EobCoreEngine::removeCharacterEffect(int spell, int charIndex, int showWarn
 	if (showWarning) {
 		if (s->flags & 0x20A0)
 			gui_drawCharPortraitWithStats(charIndex);
-		else if (s->flags & 0x20A0)
+		else if (s->flags & 0x40)
 			gui_drawAllCharPortraitsWithStats();
 	}
 }
@@ -416,8 +416,40 @@ void EobCoreEngine::setSpellEventTimer(int spell, int timerBaseFactor, int timer
 	setCharEventTimer(_activeSpellCaster, countdown, -spell, updateExistingTimer);
 }
 
-void EobCoreEngine::cleanupCharacterSpellList(int charIndex) {
+void EobCoreEngine::sortCharacterSpellList(int charIndex) {
+	int8 *list = _characters[charIndex].mageSpells;
 
+	for (int i = 0; i < 16; ) {
+		bool p = false;
+		for (int ii = 0; ii < 9; ii++) {
+			int8 *pos = &list[ii];
+
+			int s1 = pos[0];
+			int s2 = pos[1];
+
+			if (s1 == 0)
+				s1 = 80;
+			else if (s1 < 0)
+				s1 = s1 * -1 + 40;
+
+			if (s2 == 0)
+				s2 = 80;
+			else if (s2 < 0)
+				s2 = s2 * -1 + 40;
+
+			if (s1 > s2) {
+				SWAP(pos[0], pos[1]);
+				p = true;
+			}
+		}
+
+		if (p)
+			continue;
+
+		list += 10;
+		if (++i == 8)
+			list = _characters[charIndex].clericSpells;
+	}
 }
 
 bool EobCoreEngine::magicObjectHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level) {
@@ -685,7 +717,7 @@ void EobCoreEngine::spellCallback_start_createFood() {
 	for (int i = 0; i < 6; i++) {
 		if (!testCharacter(i, 3))
 			continue;
-		_characters[_activeSpellCaster].food = 100;
+		_characters[i].food = 100;
 	}
 }
 
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 599539c2d2..889865b8ea 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -546,6 +546,8 @@ enum KyraResources {
 	kEob2Npc2Strings,
 	kEob2MonsterDustStrings,
 
+	kEob2DranFoolsStrings,
+
 	kLolIngamePakFiles,
 	kLolCharacterDefs,
 	kLolIngameSfxFiles,
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index a5b2a69c09..cde900bc12 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -185,7 +185,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 		c->faceShape = 0;
 		in.read(c->mageSpells, 80);
 		in.read(c->clericSpells, 80);
-		c->mageSpellsAvailabilityFlags = in.readUint32BE();
+		c->mageSpellsAvailableFlags = in.readUint32BE();
 		for (int ii = 0; ii < 27; ii++)
 			c->inventory[ii] = in.readSint16BE();
 		uint32 ct = _system->getMillis();
@@ -427,7 +427,7 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 			out->writeUint32BE(c->experience[ii]);
 		out->write(c->mageSpells, 80);
 		out->write(c->clericSpells, 80);
-		out->writeUint32BE(c->mageSpellsAvailabilityFlags);
+		out->writeUint32BE(c->mageSpellsAvailableFlags);
 		for (int ii = 0; ii < 27; ii++)
 			out->writeSint16BE(c->inventory[ii]);
 		uint32 ct = _system->getMillis();
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
index 1cc4585e1c..8ff5581b9d 100644
--- a/engines/kyra/sequences_eob2.cpp
+++ b/engines/kyra/sequences_eob2.cpp
@@ -1271,6 +1271,79 @@ void DarkmoonSequenceHelper::waitForSongNotifier(int index, bool introUpdateAnim
 	}
 }
 
+void DarkMoonEngine::seq_nightmare() {
+	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
+	_screen->copyRegion(0, 0, 0, 120, 176, 24, 14, 2, Screen::CR_NO_P_CHECK);
+
+	initDialogueSequence();
+	gui_drawDialogueBox();
+	
+	_txt->printDialogueText(99, 0);
+	snd_playSoundEffect(54);
+
+	static const int8 dreamSteps[] = { 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 3, 2, 1, 0, -1 };
+	static const uint8 seqX[] = { 0, 20, 0, 20 };
+	static const uint8 seqY[] = { 0, 0, 96, 96 };
+	static const uint8 seqDelay[] = { 12, 7, 7, 12 };
+
+	for (const int8 *i = dreamSteps; *i != -1; ++i) {
+		drawSequenceBitmap("DREAM", 0, seqX[*i], seqY[*i], 0);
+		delay(seqDelay[*i] * _tickLength);
+	}
+
+	_txt->printDialogueText(20, _okStrings[0]);
+	
+	restoreAfterDialogueSequence();
+
+	_screen->setFont(of);
+}
+
+void DarkMoonEngine::seq_dranFools() {
+	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
+
+	initDialogueSequence();
+	gui_drawDialogueBox();
+	
+	static const char file[] = "KHELDRAN";
+	_txt->printDialogueText(_dranFoolsStrings[0]);
+	drawSequenceBitmap(file, 0, 0, 0, 0);
+	_txt->printDialogueText(20, _moreStrings[0]);
+	snd_playSoundEffect(56);
+	drawSequenceBitmap(file, 0, 20, 0, 0);
+	delay(10 * _tickLength);
+	drawSequenceBitmap(file, 0, 0, 96, 0);
+	delay(10 * _tickLength);
+	drawSequenceBitmap(file, 0, 20, 96, 0);
+	delay(7 * _tickLength);
+	_txt->printDialogueText(76, _okStrings[0]);
+	
+	restoreAfterDialogueSequence();
+
+	_screen->setFont(of);
+}
+
+void DarkMoonEngine::seq_dranDragonTransformation() {
+	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
+
+	initDialogueSequence();
+	gui_drawDialogueBox();
+	
+	static const char file[] = "DRANX";
+	drawSequenceBitmap(file, 0, 0, 0, 0);
+	_txt->printDialogueText(120, _moreStrings[0]);
+	snd_playSoundEffect(56);
+	drawSequenceBitmap(file, 0, 20, 0, 0);
+	delay(7 * _tickLength);
+	drawSequenceBitmap(file, 0, 0, 96, 0);
+	delay(7 * _tickLength);
+	drawSequenceBitmap(file, 0, 20, 96, 0);
+	delay(18 * _tickLength);
+	
+	restoreAfterDialogueSequence();
+
+	_screen->setFont(of);
+}
+
 }	// End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 109d244569..8c492aa4e2 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -224,20 +224,7 @@ void EobCoreEngine::killMonster(EobMonsterInPlay *m, bool giveExperience) {
 	if (giveExperience)
 		increasePartyExperience(_monsterProps[m->type].experience);
 
-	if ((_flags.gameID == GI_EOB2) && (_currentLevel == 16) && (_currentSub == 1) && (_monsterProps[m->type].flags & 4)) {
-		if (m->type) {
-			_playFinale = true;
-			_runFlag = false;
-		} else {
-			m->hitPointsCur = 150;
-			m->curRemoteWeapon = 0;
-			m->numRemoteAttacks = 255;
-			m->shpIndex++;
-			m->type++;
-			//// TODO
-			// dranDragonTransformation();
-		}
-	} else {
+	if (killMonsterExtra(m)) {
 		placeMonster(m, 0, -1);
 
 		if ((_flags.gameID == GI_EOB1) && (m->type == 21)) {
@@ -250,6 +237,10 @@ void EobCoreEngine::killMonster(EobMonsterInPlay *m, bool giveExperience) {
 	}
 }
 
+bool EobCoreEngine::killMonsterExtra(EobMonsterInPlay*) {
+	return true;
+}
+
 int EobCoreEngine::countSpecificMonsters(int type) {
 	int res = 0;
 	for (int i = 0; i < 30; i++) {
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index efc5b854b8..19789bbb3c 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -157,7 +157,7 @@ bool StaticResource::loadEobNpcData(Common::SeekableReadStream &stream, void *&p
 		s->experience[0] = stream.readUint32BE();
 		s->experience[1] = stream.readUint32BE();
 		s->experience[2] = stream.readUint32BE();
-		s->mageSpellsAvailabilityFlags = stream.readUint32BE();
+		s->mageSpellsAvailableFlags = stream.readUint32BE();
 		for (int ii = 0; ii < 27; ii++)
 			s->inventory[i] = stream.readUint16BE();
 	}
@@ -1184,6 +1184,7 @@ void DarkMoonEngine::initStaticResource() {
 	_npc1Strings = _staticres->loadStrings(kEob2Npc1Strings, temp);
 	_npc2Strings = _staticres->loadStrings(kEob2Npc2Strings, temp);
 	_monsterDustStrings = _staticres->loadStrings(kEob2MonsterDustStrings, temp);
+	_dranFoolsStrings = _staticres->loadStrings(kEob2DranFoolsStrings, temp);
 }
 
 void DarkMoonEngine::initSpells() {
diff --git a/engines/kyra/text_eob.cpp b/engines/kyra/text_eob.cpp
index 0d9bf9dffa..c350666226 100644
--- a/engines/kyra/text_eob.cpp
+++ b/engines/kyra/text_eob.cpp
@@ -445,9 +445,11 @@ void TextDisplayer_Eob::printDialogueText(int stringId, const char *pageBreakStr
 	displayText(_dialogueBuffer);
 
 	if (pageBreakString) {
-		strcpy(_pageBreakString, pageBreakString);
-		displayWaitButton();
-		resetPageBreakString();
+		if (pageBreakString[0]) {
+			strcpy(_pageBreakString, pageBreakString);
+			displayWaitButton();
+			resetPageBreakString();
+		}
 	}
 }
 
diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp
index 2ab2b621f3..4722966cad 100644
--- a/engines/kyra/timer.cpp
+++ b/engines/kyra/timer.cpp
@@ -129,6 +129,26 @@ void TimerManager::update() {
 	}
 }
 
+void TimerManager::manualAdvance(uint32 millis) {
+	uint32 curTime = _system->getMillis();
+	for (Iterator pos = _timers.begin(); pos != _timers.end(); ++pos) {
+		if (pos->enabled == 1 && pos->countdown >= 0) {
+			pos->nextRun -= curTime;
+			while (pos->nextRun <= millis) {
+				if (pos->func && pos->func->isValid())
+					(*pos->func)(pos->id);
+
+				pos->lastUpdate = curTime;
+				pos->nextRun = pos->countdown * _vm->tickLength();
+				millis -= pos->nextRun;
+			}
+			pos->nextRun += curTime;
+			_nextRun = MIN(_nextRun, pos->nextRun);
+		}
+	}
+
+}
+
 void TimerManager::resync() {
 	const uint32 curTime = _isPaused ? _pauseStart : _system->getMillis();
 
diff --git a/engines/kyra/timer.h b/engines/kyra/timer.h
index 205be5957d..5e53d615d3 100644
--- a/engines/kyra/timer.h
+++ b/engines/kyra/timer.h
@@ -61,6 +61,8 @@ public:
 
 	void update();
 
+	void manualAdvance(uint32 millis);
+
 	void resetNextRun();
 
 	void setCountdown(uint8 id, int32 countdown);
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index f6e8b63dc1..00dc758a27 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -193,6 +193,23 @@ void EobCoreEngine::setupCharacterTimers() {
 	}
 }
 
+void EobCoreEngine::manualAdvanceTimer(int sysTimer, uint32 millis) {
+	if (sysTimer != 2)
+		return;
+
+	uint32 ct = _system->getMillis();
+	for (int i = 0; i < 6; i++) {
+		for (int ii = 0; ii < 10; ii++) {
+			if (_characters[i].timers[ii]) {
+				uint32 chrt = _characters[i].timers[ii] - ct;
+				_characters[i].timers[ii] = chrt > millis ? chrt - millis : 1;
+			}
+		}
+	}
+
+	_timer->manualAdvance(millis);
+}
+
 void EobCoreEngine::timerProcessCharacterExchange(int timerNum) {
 	_charExchangeSwap ^= 1;
 	if (_charExchangeSwap) {
-- 
cgit v1.2.3


From c302b3e43b1d8cfe1eae669e01d3a0775d1f7b51 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Thu, 21 Jul 2011 00:28:57 +0200
Subject: KYRA: (EOB) - fix various bugs and implement some spells

---
 engines/kyra/eob2.cpp          |   2 +-
 engines/kyra/eobcommon.cpp     |  20 ++---
 engines/kyra/eobcommon.h       |  20 +++--
 engines/kyra/gui_eob.cpp       |  38 +++++----
 engines/kyra/items_eob.cpp     |   3 +-
 engines/kyra/magic_eob.cpp     | 177 ++++++++++++++++++++++++++++++++---------
 engines/kyra/saveload_eob.cpp  |   4 +-
 engines/kyra/scene_eob.cpp     |   2 +-
 engines/kyra/sprites_eob.cpp   |  36 ++++-----
 engines/kyra/staticres_eob.cpp |  29 ++++---
 engines/kyra/timer.cpp         |  20 -----
 engines/kyra/timer.h           |   2 -
 engines/kyra/timer_eob.cpp     |  43 ++++++----
 13 files changed, 248 insertions(+), 148 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index 8f3a10c374..1931572cd2 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -272,7 +272,7 @@ void DarkMoonEngine::replaceMonster(int unit, uint16 block, int pos, int dir, in
 }
 
 bool DarkMoonEngine::killMonsterExtra(EobMonsterInPlay *m) {
-	if (_currentLevel == 16 && _currentSub == 1 && (_monsterProps[m->type].flags & 4)) {
+	if (_currentLevel == 16 && _currentSub == 1 && (_monsterProps[m->type].capsFlags & 4)) {
 		if (m->type) {
 			_playFinale = true;
 			_runFlag = false;
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index eebe7528b4..bb3848e429 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -1547,7 +1547,7 @@ void EobCoreEngine::inflictMonsterDamage(EobMonsterInPlay *m, int damage, bool g
 	m->hitPointsCur -= damage;
 	m->flags = (m->flags & 0xf7) | 1;
 
-	if (_monsterProps[m->type].flags & 0x2000) {
+	if (_monsterProps[m->type].capsFlags & 0x2000) {
 		explodeMonster(m);
 		checkSceneUpdateNeed(m->block);
 		m->hitPointsCur = 0;
@@ -1762,7 +1762,7 @@ void EobCoreEngine::monsterCloseAttack(EobMonsterInPlay *m) {
 		}
 
 		if (dmg > 0) {
-			if ((_monsterProps[m->type].flags & 0x80) && rollDice(1, 4, -1) != 3) {
+			if ((_monsterProps[m->type].capsFlags & 0x80) && rollDice(1, 4, -1) != 3) {
 				int slot = rollDice(1, 27, -1);
 				for (int iii = 0; iii < 27; iii++) {
 					Item itm = _characters[c].inventory[slot];
@@ -1782,20 +1782,20 @@ void EobCoreEngine::monsterCloseAttack(EobMonsterInPlay *m) {
 
 			inflictCharacterDamage(c, dmg);
 
-			if (_monsterProps[m->type].flags & 0x10) {
+			if (_monsterProps[m->type].capsFlags & 0x10) {
 				statusAttack(c, 2, _monsterSpecAttStrings[_flags.gameID == GI_EOB1 ? 3 : 2], 0, 1, 8, 1);
 				_characters[c].effectFlags &= ~0x2000;
 			}
 
-			if (_monsterProps[m->type].flags & 0x20)
+			if (_monsterProps[m->type].capsFlags & 0x20)
 				statusAttack(c, 4, _monsterSpecAttStrings[_flags.gameID == GI_EOB1 ? 4 : 3], 2, 5, 9, 1);
 
-			if (_monsterProps[m->type].flags & 0x8000)
+			if (_monsterProps[m->type].capsFlags & 0x8000)
 				statusAttack(c, 8, _monsterSpecAttStrings[4], 2, 0, 0, 1);
 
 		}
 
-		if (!(_monsterProps[m->type].flags & 0x4000))
+		if (!(_monsterProps[m->type].capsFlags & 0x4000))
 			return;
 	}
 }
@@ -1848,7 +1848,7 @@ int EobCoreEngine::calcCloseDistanceMonsterDamage(EobMonsterInPlay *m, int times
 			s = 1;
 	}
 
-	if ((flags & 0x100) && ((_flags.gameID == GI_EOB2 && (p->statusFlags & 0x100)) || (_flags.gameID == GI_EOB1 && (p->flags & 4))) && (!(_itemTypes[_items[pips].type].allowedClasses & 4 /* bug in original code ??*/)))
+	if ((flags & 0x100) && ((_flags.gameID == GI_EOB2 && (p->statusFlags & 0x100)) || (_flags.gameID == GI_EOB1 && (p->capsFlags & 4))) && (!(_itemTypes[_items[pips].type].allowedClasses & 4 /* bug in original code ??*/)))
 		s >>= 1;
 
 	if (p->statusFlags & 0x2000) {
@@ -1866,7 +1866,7 @@ int EobCoreEngine::calcCloseDistanceMonsterDamage(EobMonsterInPlay *m, int times
 	}
 
 	if (flags & 1) {
-		if (checkMonsterDamageEvasion(m))
+		if (tryMonsterAttackEvasion(m))
 			s = 0;
 	}
 
@@ -1887,7 +1887,7 @@ int EobCoreEngine::calcDamageModifers(int charIndex, EobMonsterInPlay *m, int it
 	if (item) {
 		EobItemType *p = &_itemTypes[itemType];
 		int t = m ? m->type : 0;
-		s += ((m && (_monsterProps[t].flags & 1)) ?	rollDice(p->dmgNumDiceL, p->dmgNumPipsL, p->dmgIncS /* bug in original code ? */) :
+		s += ((m && (_monsterProps[t].capsFlags & 1)) ?	rollDice(p->dmgNumDiceL, p->dmgNumPipsL, p->dmgIncS /* bug in original code ? */) :
 			rollDice(p->dmgNumDiceS, p->dmgNumPipsS, p->dmgIncS));
 		s += _items[item].value;
 	} else {
@@ -1941,7 +1941,7 @@ int EobCoreEngine::recalcDamageModifier(int damageType, int dmgModifier) {
 	return dmgModifier;
 }
 
-bool EobCoreEngine::checkMonsterDamageEvasion(EobMonsterInPlay *m) {
+bool EobCoreEngine::tryMonsterAttackEvasion(EobMonsterInPlay *m) {
 	return rollDice(1, 100) < _monsterProps[m->type].dmgModifierEvade ? true : false;
 }
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 0cf2e9dc38..db56951b9a 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -169,8 +169,8 @@ struct EobMonsterProperty {
 		int8 base;
 	} dmgDc[3];
 	uint16 statusFlags;
-	uint16 flags;
-	int32 u22;
+	uint32 capsFlags;
+	uint32 typeFlags;
 	int32 experience;
 
 	uint8 u30;
@@ -182,7 +182,7 @@ struct EobMonsterProperty {
 
 	int8 remoteWeapons[5];
 
-	uint8 u41;
+	uint8 tuResist;
 	uint8 dmgModifierEvade;
 
 	uint8 decorations[3];
@@ -199,7 +199,7 @@ struct EobMonsterInPlay {
 	int8 mode;
 	int8 f_9;
 	int8 curAttackFrame;
-	uint8 f_b;
+	int8 spellStatusLeft;
 	int16 hitPointsMax;
 	int16 hitPointsCur;
 	uint16 dest;
@@ -334,7 +334,7 @@ protected:
 	void setCharEventTimer(int charIndex, uint32 countdown, int evnt, int updateExistingTimer);
 	void deleteCharEventTimer(int charIndex, int evnt);
 	void setupCharacterTimers();
-	void manualAdvanceTimer(int sysTimer, uint32 millis);
+	void advanceTimers(uint32 millis);
 
 	void timerProcessMonsters(int timerNum);
 	void timerSpecialCharacterUpdate(int timerNum);
@@ -511,7 +511,7 @@ protected:
 	bool walkMonsterNextStep(EobMonsterInPlay *m, int destBlock, int direction);
 	void updateMonsterFollowPath(EobMonsterInPlay *m, int turnSteps);
 	void updateMonstersStraying(EobMonsterInPlay *m, int a);
-	void updateMonsters_mode710(EobMonsterInPlay *m);
+	void updateMonstersSpellStatus(EobMonsterInPlay *m);
 	void setBlockMonsterDirection(int block, int dir);
 
 	uint8 *_monsterOvl1;
@@ -829,7 +829,7 @@ protected:
 	int getConstModifierTableValue(int hpModifier, int level, int b);
 	bool calcDamageCheckItemType(int itemType);
 	int recalcDamageModifier(int damageType, int dmgModifier);
-	bool checkMonsterDamageEvasion(EobMonsterInPlay *m);
+	bool tryMonsterAttackEvasion(EobMonsterInPlay *m);
 	int getStrHitChanceModifier(int charIndex);
 	int getStrDamageModifier(int charIndex);
 	int getDexHitChanceModifier(int charIndex);
@@ -856,7 +856,11 @@ protected:
 	void setSpellEventTimer(int spell, int timerBaseFactor, int timerLength, int timerLevelFactor, int updateExistingTimer);
 	void sortCharacterSpellList(int charIndex);
 
-	bool magicObjectHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level);
+	bool magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level);
+	bool magicObjectStatusHit(EobMonsterInPlay *m, int type, bool tryEvade, int mod);
+
+	void printWarning(const char* str);
+	void printNoEffectWarning();
 
 	void spellCallback_start_empty() {}
 	bool spellCallback_end_empty(EobFlyingObject *fo) { return true; }
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 3a71642f9b..c13b4da7e9 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -665,11 +665,13 @@ void EobCoreEngine::gui_drawSpellbook() {
 	int textXs = 71;
 	int textY = 170;
 	int col3 = _bkgColor_1;
+	int col4 = _color6;
 
 	if (_flags.gameID == GI_EOB1) {
 		textCol2 = 11;
 		textXa = textXs = 73;
 		textY = 168;
+		col4 = _bkgColor_1;
 	}
 
 	for (int i = 0; i < 7; i++) {
@@ -686,7 +688,7 @@ void EobCoreEngine::gui_drawSpellbook() {
 			if (d >= 0 && i < 6 && (i + _openBookSpellListOffset) < 9)
 				_screen->printText(_openBookSpellList[d], textXs, 132 + 6 * i, textCol1, col3);
 			else
-				_screen->printText(_magicStrings1[0], textXa, textY, 12, _color6);
+				_screen->printText(_magicStrings1[0], textXa, textY, 12, col4);
 		}
 	}
 
@@ -805,7 +807,7 @@ void EobCoreEngine::gui_initButton(int index, int, int, int) {
 
 	if (_flags.gameID == GI_EOB1) {
 		// EOB1 spellbook modifications
-		if (index > 61 && index < 67)
+		if (index > 60 && index < 66)
 			d = &_buttonDefs[index + 33];
 		if (index == 88)
 			d = &_buttonDefs[index + 12];
@@ -867,7 +869,7 @@ int EobCoreEngine::clickedCamp(Button *button) {
 	_screen->updateScreen();
 
 	enableSysTimer(2);
-	manualAdvanceTimer(2, _restPartyElapsedTime);
+	advanceTimers(_restPartyElapsedTime);
 	_restPartyElapsedTime = 0;
 
 	checkPartyStatus(true);
@@ -1083,7 +1085,7 @@ int EobCoreEngine::clickedSpellbookList(Button *button) {
 
 				int s = _openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem];
 				if (_openBookType == 1)
-					s += _mageSpellListSize;
+					s += _clericSpellOffset;
 
 				castSpell(s, 0);
 
@@ -1100,11 +1102,10 @@ int EobCoreEngine::clickedSpellbookList(Button *button) {
 }
 
 int EobCoreEngine::clickedCastSpellOnCharacter(Button *button) {
-	_activeSpellCaster = button->arg;
+	_activeSpellCaster = button->arg & 0xff;
 
-	if (_activeSpellCaster == 255) {
-		_txt->printMessage(_magicStrings3[1]);
-		snd_playSoundEffect(79);
+	if (_activeSpellCaster == 0xff) {
+		printWarning(_magicStrings3[_flags.gameID == GI_EOB1 ? 2 : 1]);
 		if (_castScrollSlot) {
 			gui_updateSlotAfterScrollUse();
 		} else {
@@ -2774,7 +2775,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 
 	for (int i = 0; i < 80; i++) {
 		int8 s = charSpellList[i];
-		if (s == 0 || s == _vm->_spellLevelsClericSize)
+		if (s == 0 || (_vm->game() == GI_EOB2 && s == 29))
 			continue;
 
 		if (s < 0)
@@ -2938,8 +2939,8 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 	_screen->setFont(Screen::FID_8_FNT);
 
 	memset(charSpellList, 0, 80);
-	if (spellType)
-		charSpellList[0] = _vm->_spellLevelsClericSize;
+	if (spellType && _vm->game() == GI_EOB2)
+		charSpellList[0] = 29;
 
 	for (int i = 0; i < 32; i++) {
 		if (_numAssignedSpellsOfType[i * 2] < _numAssignedSpellsOfType[i * 2 + 1])
@@ -3187,7 +3188,7 @@ bool GUI_Eob::restParty() {
 
 					*list *= -1;
 					crs[i] = 48;					
-					_vm->_txt->printMessage(Common::String::format(_vm->_menuStringsRest2[0], _vm->_characters[i].name, _vm->_spells[_vm->_mageSpellListSize + *list].name).c_str());
+					_vm->_txt->printMessage(Common::String::format(_vm->_menuStringsRest2[0], _vm->_characters[i].name, _vm->_spells[_vm->_clericSpellOffset + *list].name).c_str());
 					_vm->delay(80);
 					break;
 				}
@@ -3485,7 +3486,7 @@ void GUI_Eob::messageDialogue(int dim, int id, int buttonTextCol) {
 }
 
 int GUI_Eob::selectCharacterDialogue(int id) {
-	uint8 flags = (id == 26) ? 0x14 : 0x02;
+	uint8 flags = (id == 26) ? (_vm->game() == GI_EOB1 ? 0x04 : 0x14) : 0x02;
 	_vm->removeInputTop();
 
 	_charSelectRedraw = false;	
@@ -3613,10 +3614,13 @@ int GUI_Eob::selectCharacterDialogue(int id) {
 	_screen->setFont(Screen::FID_8_FNT);
 
 	if (result != -1 && id != 53) {
-		if (flags == 0x14) {
-			if (_vm->_classModifierFlags[_vm->_characters[result].cClass] & 0x10 && _vm->_characters[result].level[0] < 9) {
-				displayTextBox(24);
-				result = -1;
+		if (flags & 4) {
+			int lv = _vm->getCharacterLevelIndex(4, _vm->_characters[result].cClass);
+			if (lv != -1) {
+				if (_vm->_characters[result].level[lv] < 9) {
+					displayTextBox(24);
+					result = -1;
+				}
 			}
 		} else {
 			if (_vm->checkInventoryForItem(result, 29, -1) == -1) {
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index c6ec81a00e..6c331e80be 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -445,8 +445,7 @@ void EobCoreEngine::eatItemInHand(int charIndex) {
 	} else if (_itemInHand && _items[_itemInHand].type != 31) {
 		_txt->printMessage(_warningStrings[3]);
 	} else if (_items[_itemInHand].value == -1) {
-		_txt->printMessage(_warningStrings[2]);
-		snd_playSoundEffect(79);
+		printWarning(_warningStrings[2]);
 	} else {
 		c->food += _items[_itemInHand].value;
 		if (c->food > 100)
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index fe770d465e..2275bd53a4 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -156,14 +156,12 @@ void EobCoreEngine::castSpell(int spell, int weaponSlot) {
 
 	if (s->flags & 0x400) {
 		if (c->inventory[0] && c->inventory[1]) {
-			_txt->printMessage(_magicStrings1[2]);
-			snd_playSoundEffect(79);
+			printWarning(_magicStrings1[2]);
 			return;
 		}
 
 		if (isMagicWeapon(c->inventory[0]) || isMagicWeapon(c->inventory[1])) {
-			_txt->printMessage(_magicStrings1[3]);
-			snd_playSoundEffect(79);
+			printWarning(_magicStrings1[3]);
 			return;
 		}
 	}
@@ -205,10 +203,8 @@ void EobCoreEngine::removeCharacterEffect(int spell, int charIndex, int showWarn
 	EobCharacter *c = &_characters[charIndex];
 	EobSpell *s = &_spells[spell];
 
-	if (showWarning) {
-		_txt->printMessage(_magicStrings3[2], -1, c->name, s->name);
-		snd_playSoundEffect(79);
-	}
+	if (showWarning)
+		printWarning(Common::String::format(_magicStrings3[_flags.gameID == GI_EOB1 ? 3 : 2], c->name, s->name).c_str());
 
 	if (s->endCallback)
 		(this->*s->endCallback)(0);
@@ -262,8 +258,7 @@ void EobCoreEngine::removeAllCharacterEffects(int charIndex) {
 }
 
 void EobCoreEngine::castOnWhomDialogue() {
-	_txt->printMessage(_magicStrings3[0]);
-	snd_playSoundEffect(79);
+	printWarning(_magicStrings3[0]);
 	gui_setCastOnWhomButtons();
 }
 
@@ -281,15 +276,13 @@ void EobCoreEngine::startSpell(int spell) {
 
 	if (s->flags & 0x20) {
 		_txt->printMessage(c->name);
-		_txt->printMessage(_magicStrings1[5]);
+		_txt->printMessage(_flags.gameID == GI_EOB1 ? _magicStrings3[1] : _magicStrings1[5]);
 	}
 
 	if ((s->flags & 0x30) && (s->effectFlags & c->effectFlags)) {
-		_txt->printMessage(_magicStrings7[0], -1, c->name, s->name);
-		snd_playSoundEffect(79);
+		printWarning(Common::String::format(_magicStrings7[0], c->name, s->name).c_str());
 	} else if ((s->flags & 0x50) && (s->effectFlags & _partyEffectFlags)) {
-		_txt->printMessage(_magicStrings7[1], -1, s->name);
-		snd_playSoundEffect(79);
+		printWarning(Common::String::format(_magicStrings7[1], s->name).c_str());
 	} else {
 		if (s->flags & 8)
 			setSpellEventTimer(spell, s->timingPara[0], s->timingPara[1], s->timingPara[2], s->timingPara[3]);
@@ -452,7 +445,7 @@ void EobCoreEngine::sortCharacterSpellList(int charIndex) {
 	}
 }
 
-bool EobCoreEngine::magicObjectHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level) {
+bool EobCoreEngine::magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level) {
 	int ignoreAttackerId = fo->flags & 0x10;
 	int singleTargetCheckAdjacent = fo->flags & 1;
 	int blockDamage = fo->flags & 2;
@@ -527,6 +520,70 @@ bool EobCoreEngine::magicObjectHit(EobFlyingObject *fo, int dcTimes, int dcPips,
 	return res;
 }
 
+bool EobCoreEngine::magicObjectStatusHit(EobMonsterInPlay *m, int type, bool tryEvade, int mod) {
+	EobMonsterProperty *p = &_monsterProps[m->type];
+	if (tryEvade) {
+		if (tryMonsterAttackEvasion(m) || (p->capsFlags & 0x10))
+			return true;
+	}
+
+	if (checkUnkConstModifiers(m, 0, p->level, mod, 6))
+		return false;
+	
+	int para = 0;
+		
+	switch (type) {
+	case 0:
+	case 1:
+	case 2:
+		para = (type == 0) ? ((p->typeFlags & 1) ? 1 : 0) : ((type == 1) ? ((p->typeFlags & 2) ? 1 : 0) : 1);
+		if (para && !(p->statusFlags & 2)) {
+			m->mode = 10;
+			m->spellStatusLeft = 15;
+		}
+
+		break;
+
+	case 3:
+		if (!(p->statusFlags & 8))
+			inflictMonsterDamage(m, 1000, true);
+		break;
+
+	case 4:
+		inflictMonsterDamage(m, 1000, true);
+		break;
+
+	case 5:
+		m->flags |= 0x20;
+		_sceneUpdateRequired = true;
+		break;
+
+	case 6:
+		if (!(p->statusFlags & 4) && m->mode != 7 && m->mode != 8 && m->mode != 10) {
+			m->mode = 0;
+			m->spellStatusLeft = 20;
+			para = (getNextMonsterDirection(m->block, _currentBlock) ^ 4) >> 1;
+			m->flags |= 8;
+			walkMonsterNextStep(m, -1, para);
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	return true;
+}
+
+void EobCoreEngine::printWarning(const char* str) {
+	_txt->printMessage(str);
+	snd_playSoundEffect(79);
+}
+
+void EobCoreEngine::printNoEffectWarning() {
+	printWarning(_magicStrings4[0]);
+}
+
 void EobCoreEngine::spellCallback_start_armor() {
 
 }
@@ -548,7 +605,7 @@ void EobCoreEngine::spellCallback_start_magicMissile() {
 }
 
 bool EobCoreEngine::spellCallback_end_magicMissile(EobFlyingObject *fo) {
-	return magicObjectHit(fo, 1, 4, 1, (getCharacterMageLevel(fo->attackerId) - 1) >> 1);
+	return magicObjectDamageHit(fo, 1, 4, 1, (getCharacterMageLevel(fo->attackerId) - 1) >> 1);
 }
 
 void EobCoreEngine::spellCallback_start_shockingGrasp() {
@@ -568,7 +625,7 @@ void EobCoreEngine::spellCallback_start_melfsAcidArrow() {
 }
 
 bool EobCoreEngine::spellCallback_end_melfsAcidArrow(EobFlyingObject *fo) {
-	return magicObjectHit(fo, 2, 4, 0, getCharacterMageLevel(fo->attackerId) / 3);
+	return magicObjectDamageHit(fo, 2, 4, 0, getCharacterMageLevel(fo->attackerId) / 3);
 }
 
 void EobCoreEngine::spellCallback_start_dispelMagic() {
@@ -580,7 +637,7 @@ void EobCoreEngine::spellCallback_start_fireball() {
 }
 
 bool EobCoreEngine::spellCallback_end_fireball(EobFlyingObject *fo) {
-	return magicObjectHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
+	return magicObjectDamageHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
 }
 
 void EobCoreEngine::spellCallback_start_flameArrow() {
@@ -588,7 +645,7 @@ void EobCoreEngine::spellCallback_start_flameArrow() {
 }
 
 bool EobCoreEngine::spellCallback_end_flameArrow(EobFlyingObject *fo) {
-	return magicObjectHit(fo, 5, 6, 0, getCharacterMageLevel(fo->attackerId));
+	return magicObjectDamageHit(fo, 5, 6, 0, getCharacterMageLevel(fo->attackerId));
 }
 
 void EobCoreEngine::spellCallback_start_holdPerson() {
@@ -596,7 +653,28 @@ void EobCoreEngine::spellCallback_start_holdPerson() {
 }
 
 bool EobCoreEngine::spellCallback_end_holdPerson(EobFlyingObject *fo) {
-	return true;
+	bool res = false;
+	
+	if (_flags.gameID == GI_EOB2 && fo->curBlock == _currentBlock) {
+		// party hit
+		int numChar = rollDice(1, 4, 0);
+		int charIndex = rollDice(1, 6, 0);
+		for (int i = 0; i < 6 && numChar; i++) {
+			if (testCharacter(charIndex, 3)) {
+				statusAttack(charIndex, 4, _magicStrings8[1], 4, 5, 9, 1);
+				numChar--;
+			}
+			charIndex = (charIndex + 1) % 6;
+		}
+		res = true;
+
+	} else {
+		// monster hit
+		for (const int16 *m = findBlockMonsters(fo->curBlock, fo->curPos, fo->direction, 1, 1); *m != -1; m++)
+			res |= magicObjectStatusHit(&_monsters[*m], 0, true, 4);
+	}
+
+	return res;
 }
 
 void EobCoreEngine::spellCallback_start_lightningBolt() {
@@ -604,7 +682,7 @@ void EobCoreEngine::spellCallback_start_lightningBolt() {
 }
 
 bool EobCoreEngine::spellCallback_end_lightningBolt(EobFlyingObject *fo) {
-	return magicObjectHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
+	return magicObjectDamageHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
 }
 
 void EobCoreEngine::spellCallback_start_vampiricTouch() {
@@ -616,7 +694,12 @@ bool EobCoreEngine::spellCallback_end_vampiricTouch(EobFlyingObject*) {
 }
 
 void EobCoreEngine::spellCallback_start_fear() {
-
+	sparkEffectOffensive();
+	uint16 bl = calcNewBlockPosition(_currentBlock, _currentDirection);
+	for (int i = 0; i < 30; i++) {
+		if (_monsters[i].block == bl)
+			magicObjectStatusHit(&_monsters[i], 6, true, 4);
+	}
 }
 
 void EobCoreEngine::spellCallback_start_iceStorm() {
@@ -625,12 +708,12 @@ void EobCoreEngine::spellCallback_start_iceStorm() {
 
 bool EobCoreEngine::spellCallback_end_iceStorm(EobFlyingObject *fo) {
 	static int8 blockAdv[] = { -32, 32, 1, -1 };
-	bool res = magicObjectHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
+	bool res = magicObjectDamageHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
 	if (res) {
 		for (int i = 0; i < 4; i++) {
 			uint16 bl = fo->curBlock;
 			fo->curBlock = (fo->curBlock + blockAdv[i]) & 0x3ff;
-			magicObjectHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
+			magicObjectDamageHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
 			fo->curBlock = bl;
 		}
 	}
@@ -650,7 +733,10 @@ void EobCoreEngine::spellCallback_start_holdMonster() {
 }
 
 bool EobCoreEngine::spellCallback_end_holdMonster(EobFlyingObject *fo) {
-	return true;
+	bool res = false;
+	for (const int16 *m = findBlockMonsters(fo->curBlock, fo->curPos, fo->direction, 1, 1); *m != -1; m++)
+		res |= magicObjectStatusHit(&_monsters[*m], 1, true, 4);
+	return res;
 }
 
 void EobCoreEngine::spellCallback_start_wallOfForce() {
@@ -662,18 +748,27 @@ void EobCoreEngine::spellCallback_start_disintegrate() {
 }
 
 void EobCoreEngine::spellCallback_start_fleshToStone() {
-
+	sparkEffectOffensive();
+	int t = getClosestMonsterPos(_openBookChar, calcNewBlockPosition(_currentBlock, _currentDirection));
+	if (t != -1)
+		magicObjectStatusHit(&_monsters[t], 5, true, 4);
+	else
+		printWarning(_magicStrings8[4]);
 }
 
 void EobCoreEngine::spellCallback_start_stoneToFlesh() {
-
+	if (_characters[_activeSpellCaster].flags & 8)
+		_characters[_activeSpellCaster].flags &= ~8;
+	else
+		printNoEffectWarning();
 }
 
 void EobCoreEngine::spellCallback_start_trueSeeing() {
-
+	_wllVmpMap[46] = 0;
 }
 
 bool EobCoreEngine::spellCallback_end_trueSeeing(EobFlyingObject*) {
+	_wllVmpMap[46] = 1;
 	return true;
 }
 
@@ -722,7 +817,13 @@ void EobCoreEngine::spellCallback_start_createFood() {
 }
 
 void EobCoreEngine::spellCallback_start_removeParalysis() {
-
+	int numChar = 4;
+	for (int i = 0; i < 6; i++) {
+		if (!(_characters[i].flags & 4) || !numChar)
+			continue;
+		_characters[i].flags &= ~4;
+		numChar--;
+	}
 }
 
 void EobCoreEngine::spellCallback_start_causeSeriousWounds() {
@@ -750,7 +851,7 @@ void EobCoreEngine::spellCallback_start_flameStrike() {
 }
 
 bool EobCoreEngine::spellCallback_end_flameStrike(EobFlyingObject *fo) {
-	return magicObjectHit(fo, 6, 8, 0, 0);
+	return magicObjectDamageHit(fo, 6, 8, 0, 0);
 }
 
 void EobCoreEngine::spellCallback_start_raiseDead() {
@@ -763,12 +864,10 @@ void EobCoreEngine::spellCallback_start_harm() {
 
 void EobCoreEngine::spellCallback_start_heal() {
 	EobCharacter *c = &_characters[_activeSpellCaster];
-	if (c->hitPointsMax <= c->hitPointsCur) {
-		_txt->printMessage(_magicStrings4[0]);
-		snd_playSoundEffect(79);
-	} else {
+	if (c->hitPointsMax <= c->hitPointsCur)
+		printWarning(_magicStrings4[0]);
+	else
 		modifyCharacterHitpoints(_activeSpellCaster, c->hitPointsMax - c->hitPointsCur);
-	}
 }
 
 void EobCoreEngine::spellCallback_start_layOnHands() {
@@ -782,19 +881,19 @@ void EobCoreEngine::spellCallback_start_turnUndead() {
 bool EobCoreEngine::spellCallback_end_unk1Passive(EobFlyingObject *fo) {
 	bool res = false;
 	if (_partyEffectFlags & 0x20000) {
-		res = magicObjectHit(fo, 4, 10, 6, 0);
+		res = magicObjectDamageHit(fo, 4, 10, 6, 0);
 		if (res) {
 			gui_drawAllCharPortraitsWithStats();
 			_partyEffectFlags &= ~0x20000;
 		}
 	} else {
-		res = magicObjectHit(fo, 12, 10, 6, 0);
+		res = magicObjectDamageHit(fo, 12, 10, 6, 0);
 	}
 	return res;
 }
 
 bool EobCoreEngine::spellCallback_end_unk2Passive(EobFlyingObject *fo) {
-	return magicObjectHit(fo, 0, 0, 18, 0);
+	return magicObjectDamageHit(fo, 0, 0, 18, 0);
 }
 
 bool EobCoreEngine::spellCallback_end_deathSpellPassive(EobFlyingObject *fo) {
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index cde900bc12..1fa26c26b1 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -315,7 +315,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 			m->mode = in.readSByte();
 			m->f_9 = in.readSByte();
 			m->curAttackFrame = in.readSByte();
-			m->f_b = in.readByte();
+			m->spellStatusLeft = in.readSByte();
 			m->hitPointsMax = in.readSint16BE();
 			m->hitPointsCur = in.readSint16BE();
 			m->dest = in.readUint16BE();
@@ -523,7 +523,7 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 			out->writeSByte(m->mode);
 			out->writeSByte(m->f_9);
 			out->writeSByte(m->curAttackFrame);
-			out->writeByte(m->f_b);
+			out->writeSByte(m->spellStatusLeft);
 			out->writeSint16BE(m->hitPointsMax);
 			out->writeSint16BE(m->hitPointsCur);
 			out->writeUint16BE(m->dest);
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index e92d813af9..36584d462b 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -583,7 +583,7 @@ void LolEobBaseEngine::openCloseDoor(int block, int openClose) {
 			}
 		}
 
-		enableTimer(_flags.gameID == GI_LOL ? 0 : 12);
+		enableTimer(_flags.gameID == GI_LOL ? 0 : 4);
 
 	} else {
 		while (!(flg & _wllWallFlags[v]))
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 8c492aa4e2..baa7a0bfda 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -99,9 +99,9 @@ const uint8 *EobCoreEngine::loadMonsterProperties(const uint8 *data) {
 		d->dmgDc[3].base = (int8)*data++;
 		d->statusFlags = READ_LE_UINT16(data);
 		data += 2;
-		d->flags = READ_LE_UINT16(data);
+		d->capsFlags = READ_LE_UINT16(data);
 		data += 2;
-		d->u22 = (int16)READ_LE_UINT16(data);
+		d->typeFlags = READ_LE_UINT16(data);
 		data += 2;
 		d->experience = READ_LE_UINT16(data);
 		data += 2;
@@ -121,7 +121,7 @@ const uint8 *EobCoreEngine::loadMonsterProperties(const uint8 *data) {
 			}
 		}
 
-		d->u41 = *data++;
+		d->tuResist = *data++;
 		d->dmgModifierEvade = *data++;
 
 		for (int i = 0; i < 3; i++)
@@ -176,7 +176,7 @@ void EobCoreEngine::initMonster(int index, int unit, uint16 block, int pos, int
 	m->pos = pos;
 	m->shpIndex = shpIndex;
 	m->mode = mode;
-	m->f_b = i;
+	m->spellStatusLeft = i;
 	m->dir = dir;
 	m->palette = _flags.gameID == GI_EOB2 ? (index % 3) : 0;
 	m->hitPointsCur = m->hitPointsMax = _flags.gameID == GI_EOB2 ? rollDice(p->hpDcTimes, p->hpDcPips, p->hpDcBase) : (p->hpDcTimes == 255 ? rollDice(1, 4, 0) : rollDice(p->hpDcTimes, 8, 0));
@@ -503,11 +503,11 @@ void EobCoreEngine::drawMonsters(int index) {
 
 		EobMonsterProperty *p = &_monsterProps[d->type];
 
-		if (_flags.gameID == GI_EOB2 && (p->flags & 0x100) && !(_partyEffectFlags & 0x220) && !(d->flags & 2))
+		if (_flags.gameID == GI_EOB2 && (p->capsFlags & 0x100) && !(_partyEffectFlags & 0x220) && !(d->flags & 2))
 			continue;
 
 		int f = (d->animStep << 4) + cDirOffs + d->dir;
-		f = (p->flags & 2) ? _monsterFrmOffsTable1[f] : _monsterFrmOffsTable2[f];
+		f = (p->capsFlags & 2) ? _monsterFrmOffsTable1[f] : _monsterFrmOffsTable2[f];
 
 		if (!blockDistance && d->curAttackFrame < 0)
 			f = d->curAttackFrame + 7;
@@ -719,7 +719,7 @@ void EobCoreEngine::updateMonsters(int unit) {
 				break;
 			case 7:
 			case 10:
-				updateMonsters_mode710(m);
+				updateMonstersSpellStatus(m);
 				break;
 			default:
 				break;
@@ -871,7 +871,7 @@ void EobCoreEngine::updateMoveMonster(EobMonsterInPlay *m) {
 	EobMonsterProperty *p = &_monsterProps[m->type];
 	int d = getNextMonsterDirection(m->block, _currentBlock);
 
-	if ((p->flags & 0x800) && !(d & 1))
+	if ((p->capsFlags & 0x800) && !(d & 1))
 		d >>= 1;
 	else
 		d = m->dir;
@@ -892,13 +892,13 @@ void EobCoreEngine::updateMoveMonster(EobMonsterInPlay *m) {
 	m->curAttackFrame = 0;
 	walkMonster(m, m->dest);
 
-	if (p->flags & 8)
+	if (p->capsFlags & 8)
 		updateMonsterTryCloseAttack(m, -1);
 }
 
 bool EobCoreEngine::updateMonsterTryDistanceAttack(EobMonsterInPlay *m) {
 	EobMonsterProperty *p = &_monsterProps[m->type];
-	if (!m->numRemoteAttacks || ((_flags.gameID == GI_EOB1) && !(p->flags & 0x40)))
+	if (!m->numRemoteAttacks || ((_flags.gameID == GI_EOB1) && !(p->capsFlags & 0x40)))
 		return false;
 
 	if ((_flags.gameID == GI_EOB1 && m->stepsTillRemoteAttack == 5) || (_flags.gameID == GI_EOB2 && rollDice(1, 3) > m->stepsTillRemoteAttack)) {
@@ -1073,8 +1073,8 @@ void EobCoreEngine::walkMonster(EobMonsterInPlay *m, int destBlock) {
 	if (m->flags & 8) {
 		if (_flags.gameID == GI_EOB1 ) {
 			d ^= 4;
-		} else if (--m->f_b <= 0) {
-			m->f_b = 0;
+		} else if (--m->spellStatusLeft <= 0) {
+			m->spellStatusLeft = 0;
 			m->flags &= ~8;
 		} else {
 			d ^= 4;
@@ -1095,7 +1095,7 @@ void EobCoreEngine::walkMonster(EobMonsterInPlay *m, int destBlock) {
 		} else if (_flags.gameID == GI_EOB2) {
 			if (d & 1) {
 				int e = _monsterStepTable1[((d - 1) << 1) + m->dir];
-				if (e && !((_monsterProps[m->type].flags & 0x200) && (rollDice(1, 4) == 4))) {
+				if (e && !((_monsterProps[m->type].capsFlags & 0x200) && (rollDice(1, 4) == 4))) {
 					if (walkMonsterNextStep(m, b + e, -1))
 						return;
 				}
@@ -1144,11 +1144,11 @@ bool EobCoreEngine::walkMonsterNextStep(EobMonsterInPlay *m, int destBlock, int
 		uint8 w = l->walls[direction ^ 2];
 
 		if (!(_wllWallFlags[w] & 4)) {
-			if (_flags.gameID == GI_EOB1 ||!(p->flags & 0x1000) || _wllShapeMap[w] != -1)
+			if (_flags.gameID == GI_EOB1 || !(p->capsFlags & 0x1000) || _wllShapeMap[w] != -1)
 				return false;
 
 			if (_wllWallFlags[w] & 0x20) {
-				if (p->flags & 4 && m->type == 1)
+				if (p->capsFlags & 4 && m->type == 1)
 					l->walls[direction] = l->walls[direction ^ 2] = 72;
 				else
 					openDoor(destBlock);
@@ -1219,9 +1219,9 @@ void EobCoreEngine::updateMonstersStraying(EobMonsterInPlay *m, int a) {
 	}
 }
 
-void EobCoreEngine::updateMonsters_mode710(EobMonsterInPlay *m) {
-	if (m->f_b) {
-		if (!--m->f_b)
+void EobCoreEngine::updateMonstersSpellStatus(EobMonsterInPlay *m) {
+	if (m->spellStatusLeft) {
+		if (!--m->spellStatusLeft)
 			m->mode = 0;
 	}
 }
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 19789bbb3c..f422d6993e 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -631,7 +631,7 @@ void EobCoreEngine::initButtonData() {
 		{ 4, 0, 0x1100, 113, 122, 20, 8, EOB_CB(clickedSpellbookTab), 2 },
 		{ 5, 0, 0x1100, 134, 122, 20, 8, EOB_CB(clickedSpellbookTab), 3 },
 		{ 6, 0, 0x1100, 155, 122, 20, 8, EOB_CB(clickedSpellbookTab), 4 },
-		{ 110, 0, 0x1100, 75, 168, 97, 6, EOB_CB(clickedSpellbookAbort), 0 },
+		{ 110, 0, 0x1100, 75, 168, 97, 6, EOB_CB(clickedSpellbookAbort), 0 }
 	};
 
 	_buttonDefs = buttonDefs;
@@ -975,11 +975,19 @@ void EobCoreEngine::initSpells() {
 	ec2(fleshToStonePassive);
 
 	_spells = new EobSpell[_numSpells];
-	memset(_spells, 0, _numSpells * sizeof(EobSpell));
+	memset(_spells, 0, _numSpells * sizeof(EobSpell));	
 
-	for (int i = 0; i < _numSpells; i++) {
+	for (int i = 0, n = 0; i < _numSpells; i++, n++) {
 		EobSpell *s = &_spells[i];
-		s->name = _flags.gameID == GI_EOB2 ? ((i == 0 || i == _mageSpellListSize) ? _mageSpellList[0] : ((i < (_mageSpellListSize + 1)) ? _spellNames[i - 1] : _spellNames[i - 2])) : _spellNames[i];
+
+		// Fix Eob 1 spell names
+		bool skip = false;
+		if (i == 5 || i == 9) {
+			n--;
+			skip = true;
+		}
+
+		s->name = _flags.gameID == GI_EOB2 ? ((i == 0 || i == _mageSpellListSize) ? _mageSpellList[0] : ((i < (_mageSpellListSize + 1)) ? _spellNames[i - 1] : _spellNames[i - 2])) : (skip ? _spellNames[0] : _spellNames[n]);
 		s->startCallback = startCallback[i];
 		s->timingPara = magicTimingParaAssign[i];
 		s->endCallback = endCallback[i];
@@ -1031,8 +1039,7 @@ void EobEngine::initStaticResource() {
 	temp /= 27;
 	_monsterProps = new EobMonsterProperty[temp];
 	memset(_monsterProps, 0, temp * sizeof(EobMonsterProperty));
-	// Try to convert EOB1 (hard coded) monster properties to EOB2 type monster properties.
-	// This is still WIP, since most properties are unknown for now.
+	// Convert EOB1 (hard coded) monster properties to EOB2 type monster properties.
 	for (int i = 0; i < temp; i++) {
 		EobMonsterProperty *p = &_monsterProps[i];
 		p->armorClass = (int8)*ps++;
@@ -1049,9 +1056,9 @@ void EobEngine::initStaticResource() {
 		p->dmgDc[2].pips = *ps++;
 		p->dmgDc[2].base = (int8)*ps++;
 		ps++;
-		p->flags = *ps++;
-		ps++;
-		ps++;
+		p->capsFlags = *ps++;
+		p->typeFlags = READ_LE_UINT16(ps);
+		ps += 2;
 		ps++;
 		ps++;
 		p->experience = READ_LE_UINT16(ps);
@@ -1060,7 +1067,7 @@ void EobEngine::initStaticResource() {
 		p->sound1 = *ps++;
 		p->sound2 = *ps++;
 		p->numRemoteAttacks = *ps++;
-		ps++;
+		p->tuResist = *ps++;
 		p->dmgModifierEvade = *ps++;
 	}
 }
@@ -1132,7 +1139,7 @@ void EobEngine::initSpells() {
 
 	int temp;
 	const uint8 *src = _staticres->loadRawData(kEobBaseSpellProperties, temp);
-	_clericSpellOffset -= 3;
+	_clericSpellOffset -= 1;
 
 	for (int i = 0; i < _numSpells; i++) {
 		EobSpell *s = &_spells[i];
diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp
index 4722966cad..2ab2b621f3 100644
--- a/engines/kyra/timer.cpp
+++ b/engines/kyra/timer.cpp
@@ -129,26 +129,6 @@ void TimerManager::update() {
 	}
 }
 
-void TimerManager::manualAdvance(uint32 millis) {
-	uint32 curTime = _system->getMillis();
-	for (Iterator pos = _timers.begin(); pos != _timers.end(); ++pos) {
-		if (pos->enabled == 1 && pos->countdown >= 0) {
-			pos->nextRun -= curTime;
-			while (pos->nextRun <= millis) {
-				if (pos->func && pos->func->isValid())
-					(*pos->func)(pos->id);
-
-				pos->lastUpdate = curTime;
-				pos->nextRun = pos->countdown * _vm->tickLength();
-				millis -= pos->nextRun;
-			}
-			pos->nextRun += curTime;
-			_nextRun = MIN(_nextRun, pos->nextRun);
-		}
-	}
-
-}
-
 void TimerManager::resync() {
 	const uint32 curTime = _isPaused ? _pauseStart : _system->getMillis();
 
diff --git a/engines/kyra/timer.h b/engines/kyra/timer.h
index 5e53d615d3..205be5957d 100644
--- a/engines/kyra/timer.h
+++ b/engines/kyra/timer.h
@@ -61,8 +61,6 @@ public:
 
 	void update();
 
-	void manualAdvance(uint32 millis);
-
 	void resetNextRun();
 
 	void setCountdown(uint8 id, int32 countdown);
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 00dc758a27..903dec2102 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -133,19 +133,21 @@ void EobCoreEngine::setCharEventTimer(int charIndex, uint32 countdown, int evnt,
 		_timer->setNextRun(timerId, ntime);
 
 	if (updateExistingTimer) {
-		bool br = false;
+		bool updated = false;
 		int d = -1;
 
-		for (int i = 0; i < 10 && br == false; i++) {
+		for (int i = 0; i < 10 && updated == false; i++) {
 			if (d == -1 && !c->timers[i])
 				d = i;
 
-			if (!br && c->events[i] == evnt) {
+			if (!updated && c->events[i] == evnt) {
 				d = i;
-				br = true;
+				updated = true;
 			}
 		}
 
+		assert(d != -1);
+
 		c->timers[d] = ntime;
 		c->events[d] = evnt;
 	} else {
@@ -179,7 +181,7 @@ void EobCoreEngine::setupCharacterTimers() {
 		uint32 nextTimer = 0xffffffff;
 
 		for (int ii = 0; ii < 10; ii++) {
-			if (c->timers[ii] < nextTimer)
+			if (c->timers[ii] && c->timers[ii] < nextTimer)
 				nextTimer = c->timers[ii];
 		}
 		uint32 ctime = _system->getMillis();
@@ -193,21 +195,28 @@ void EobCoreEngine::setupCharacterTimers() {
 	}
 }
 
-void EobCoreEngine::manualAdvanceTimer(int sysTimer, uint32 millis) {
-	if (sysTimer != 2)
-		return;
-
+void EobCoreEngine::advanceTimers(uint32 millis) {
 	uint32 ct = _system->getMillis();
 	for (int i = 0; i < 6; i++) {
+		EobCharacter *c = &_characters[i];
 		for (int ii = 0; ii < 10; ii++) {
-			if (_characters[i].timers[ii]) {
-				uint32 chrt = _characters[i].timers[ii] - ct;
-				_characters[i].timers[ii] = chrt > millis ? chrt - millis : 1;
+			if (c->timers[ii] > ct) {
+				uint32 chrt = c->timers[ii] - ct;
+				c->timers[ii] = chrt > millis ? chrt - millis : ct;
 			}
 		}
 	}
 
-	_timer->manualAdvance(millis);
+	setupCharacterTimers();
+
+	if (_scriptTimersMode & 2) {
+		for (int i = 0; i < _scriptTimersCount; i++) {
+			if (_scriptTimers[i].next > ct) {
+				uint32 chrt = _scriptTimers[i].next - ct;
+				_scriptTimers[i].next = chrt > millis ? chrt - millis : ct;
+			}
+		}
+	}
 }
 
 void EobCoreEngine::timerProcessCharacterExchange(int timerNum) {
@@ -314,7 +323,7 @@ void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
 				calcAndInflictCharacterDamage(charIndex, 0, 0, 5, 0x400, 5, 3);
 				setCharEventTimer(charIndex, 546, 8, 1);
 			} else {
-				c->flags &= 0xfd;
+				c->flags &= ~2;
 				gui_drawCharPortraitWithStats(charIndex);
 			}
 			break;
@@ -329,7 +338,7 @@ void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
 
 		case 11:
 			if (c->disabledSlots & 4) {
-				c->disabledSlots &= 0xfb;
+				c->disabledSlots &= ~4;
 				if (_openBookChar == charIndex && _updateFlags)
 					gui_drawSpellbook();
 			}
@@ -345,13 +354,13 @@ void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
 		}
 	}
 
-	uint32 nextTimer = (uint32)(-1);
+	uint32 nextTimer = 0xffffffff;
 	for (int i = 0; i < 10; i++) {
 		if (c->timers[i] && c->timers[i] < nextTimer)
 			nextTimer = c->timers[i];
 	}
 
-	if (nextTimer == (uint32)(-1))
+	if (nextTimer == 0xffffffff)
 		_timer->disable(timerNum);
 	else
 		_timer->setCountdown(timerNum, (nextTimer - ctime) / _tickLength);
-- 
cgit v1.2.3


From 0e4c184e285c9b20b90536eb485a7f8a50833da3 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Thu, 28 Jul 2011 17:56:59 +0200
Subject: KYRA: (EOB) - implement some gui functionality, some bug fixes, etc.

---
 engines/kyra/eob1.cpp          | 14 ++++++++++
 engines/kyra/eob1.h            |  1 +
 engines/kyra/eob2.cpp          |  9 ++++++-
 engines/kyra/eob2.h            |  6 ++++-
 engines/kyra/eobcommon.cpp     | 52 ++++++++++++++++++++++++++++-------
 engines/kyra/eobcommon.h       | 37 ++++++++++++++++++++-----
 engines/kyra/gui_eob.cpp       | 29 +++++++++++---------
 engines/kyra/items_eob.cpp     | 61 ++++++++++++++++++++++--------------------
 engines/kyra/magic_eob.cpp     | 35 +++++++++++++++++++++---
 engines/kyra/resource.h        | 28 +++++++++++++++++--
 engines/kyra/staticres.cpp     |  2 +-
 engines/kyra/staticres_eob.cpp | 40 ++++++++++++++++++++++++---
 12 files changed, 245 insertions(+), 69 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index 70031bfd27..a9051de833 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -210,6 +210,20 @@ void EobEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wal
 	}
 }
 
+bool EobEngine::checkPartyStatusExtra() {
+	_screen->copyPage(0, 10);
+	gui_drawBox(0, 121, 319, 200, _color2_1, _color1_1, _bkgColor_1);
+	_screen->setScreenDim(9);
+	_txt->printMessage(_menuStringsDefeat[0]);
+	while (!shouldQuit()) {
+		removeInputTop();
+		if (checkInput(0, false, 0) & 0xff)
+			break;
+	}
+	_screen->copyPage(10, 0);
+	return true;
+}
+
 uint32 EobEngine::convertSpellFlagToEob2Format(uint32 flag, int ignoreInvisibility) {
 	uint32 res = 0;
 	if (flag & 0x01)
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
index 8a959e9fa4..3460ac7591 100644
--- a/engines/kyra/eob1.h
+++ b/engines/kyra/eob1.h
@@ -85,6 +85,7 @@ private:
 	const uint8 *_doorSwitchCoords;
 
 	// Misc
+	bool checkPartyStatusExtra();
 	uint32 convertSpellFlagToEob2Format(uint32 flag, int ignoreInvisibility);
 	uint32 convertCharacterEffectFlagToEob2Format(uint32 flag);
 };
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index 1931572cd2..c3169b10bf 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -350,9 +350,16 @@ bool DarkMoonEngine::restParty_extraAbortCondition() {
 	return true;
 }
 
-void DarkMoonEngine::checkPartyStatusExtra() {
+void DarkMoonEngine::useHorn(int charIndex, int weaponSlot) {
+	int v = _items[_characters[charIndex].inventory[weaponSlot]].value - 1;
+	_txt->printMessage(_hornStrings[v]);
+	snd_playSoundEffect(_hornSounds[v]);
+}
+
+bool DarkMoonEngine::checkPartyStatusExtra() {
 	if (checkScriptFlag(0x10))
 		seq_dranFools();
+	return _gui->confirmDialogue2(14, 67, 1);
 }
 
 void DarkMoonEngine::drawLightningColumn() {
diff --git a/engines/kyra/eob2.h b/engines/kyra/eob2.h
index 93a3518f35..e1c574a243 100644
--- a/engines/kyra/eob2.h
+++ b/engines/kyra/eob2.h
@@ -120,11 +120,15 @@ private:
 	bool restParty_extraAbortCondition();
 
 	// misc
-	void checkPartyStatusExtra();
+	void useHorn(int charIndex, int weaponSlot);
+	bool checkPartyStatusExtra();
 	void drawLightningColumn();
 	int resurrectionSelectDialogue();
 	int charSelectDialogue();
 	void characterLevelGain(int charIndex);
+
+	const char *const *_hornStrings;
+	const uint8 *_hornSounds;
 };
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index bb3848e429..07c1f0760a 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -469,9 +469,8 @@ bool EobCoreEngine::checkPartyStatus(bool handleDeath) {
 		return true;
 
 	gui_drawAllCharPortraitsWithStats();
-	checkPartyStatusExtra();
 
-	if (_gui->confirmDialogue2(14, 67, 1)) {
+	if (checkPartyStatusExtra()) {
 		_screen->setFont(Screen::FID_8_FNT);
 		gui_updateControls();
 		if (_gui->runLoadMenu(0, 0)) {
@@ -1436,7 +1435,7 @@ void EobCoreEngine::displayParchment(int id) {
 	restoreAfterDialogueSequence();
 }
 
-void EobCoreEngine::useSlotWeapon(int charIndex, int slotIndex, int item) {
+void EobCoreEngine::useSlotWeapon(int charIndex, int slotIndex, Item item) {
 	EobCharacter *c = &_characters[charIndex];
 	int tp = item ? _items[item].type : 0;
 
@@ -1454,7 +1453,7 @@ void EobCoreEngine::useSlotWeapon(int charIndex, int slotIndex, int item) {
 	} else if (ep == 2) {
 		inflict = thrownAttack(charIndex, slotIndex, item);
 	} else if (ep == 3) {
-		inflict = bowAttack(charIndex, item);
+		inflict = projectileWeaponAttack(charIndex, item);
 		gui_drawCharPortraitWithStats(charIndex);
 	}
 
@@ -1477,7 +1476,7 @@ void EobCoreEngine::useSlotWeapon(int charIndex, int slotIndex, int item) {
 	setCharEventTimer(charIndex, 18, inflict >= -2 ? slotIndex + 2 : slotIndex, 1);
 }
 
-int EobCoreEngine::closeDistanceAttack(int charIndex, int item) {
+int EobCoreEngine::closeDistanceAttack(int charIndex, Item item) {
 	if (charIndex > 1)
 		return -3;
 
@@ -1527,7 +1526,7 @@ int EobCoreEngine::closeDistanceAttack(int charIndex, int item) {
 	return 0;
 }
 
-int EobCoreEngine::thrownAttack(int charIndex, int slotIndex, int item) {
+int EobCoreEngine::thrownAttack(int charIndex, int slotIndex, Item item) {
 	int d = charIndex > 3 ? charIndex - 2 : charIndex;
 	if (!launchObject(charIndex, item, _currentBlock, _dropItemDirIndex[(_currentDirection << 2) + d], _currentDirection, _items[item].type))
 		return 0;
@@ -1539,7 +1538,42 @@ int EobCoreEngine::thrownAttack(int charIndex, int slotIndex, int item) {
 	return 0;
 }
 
-int EobCoreEngine::bowAttack(int charIndex, int item) {
+int EobCoreEngine::projectileWeaponAttack(int charIndex, Item item) {
+	int tp = _items[item].type;
+	int t = _projectileWeaponAmmoTypes[_flags.gameID == GI_EOB1 ? tp - 2 : tp];
+	Item ammoItem = 0;
+
+	if (t == 16) {
+		if (_characters[charIndex].inventory[0] && _items[_characters[charIndex].inventory[0]].type == 16)
+			SWAP(ammoItem, _characters[charIndex].inventory[0]);
+		else if (_characters[charIndex].inventory[1] && _items[_characters[charIndex].inventory[1]].type == 16)
+			SWAP(ammoItem, _characters[charIndex].inventory[1]);
+		else if (_characters[charIndex].inventory[16])
+			ammoItem = getQueuedItem(&_characters[charIndex].inventory[16], 0, -1);
+		
+	} else {
+		for (int i = 0; i < 27; i++) {
+			if (_items[_characters[charIndex].inventory[i]].type == t) {
+				SWAP(ammoItem, _characters[charIndex].inventory[i] );
+				if (i < 2)
+					gui_drawCharPortraitWithStats(charIndex);
+				break;
+			}
+		}
+	}
+
+	if (!ammoItem)
+		return -4;
+
+	int c = charIndex;
+	if (c > 3)
+		c -= 2;
+
+	if (launchObject(charIndex, ammoItem, _currentBlock, _dropItemDirIndex[(_currentDirection << 2) + c], _currentDirection, tp)) {
+		snd_playSoundEffect(tp == 7 ? 26 : 11);
+		_sceneUpdateRequired = true;
+	}
+
 	return 0;
 }
 
@@ -1773,9 +1807,9 @@ void EobCoreEngine::monsterCloseAttack(EobMonsterInPlay *m) {
 					}
 
 					_characters[c].inventory[slot] = 0;
-					_txt->printMessage(_itemExtraStrings[(_characters[c].raceSex & 1) ^ 1], -1, _characters[c].name);
+					_txt->printMessage(_ripItemStrings[(_characters[c].raceSex & 1) ^ 1], -1, _characters[c].name);
 					printFullItemName(itm);
-					_txt->printMessage(_itemExtraStrings[2]);
+					_txt->printMessage(_ripItemStrings[2]);
 				}
 				gui_drawCharPortraitWithStats(c);
 			}
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index db56951b9a..39919ca086 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -446,6 +446,8 @@ protected:
 	Item _lastUsedItem;
 
 	const uint16 *_slotValidationFlags;
+	const int8 *_projectileWeaponAmmoTypes;
+	const uint8 *_wandTypes;
 
 	EobFlyingObject *_flyingObjects;
 	const uint8 *_drawObjPosIndex;
@@ -758,8 +760,26 @@ protected:
 
 	const char *const *_pryDoorStrings;
 	const char *const *_warningStrings;
-	const char *const *_itemExtraStrings;
-	const char *const *_itemSuffixStrings;
+
+	const char *const *_ripItemStrings;
+	const char *const *_cursedString;
+	const char *const *_enchantedString;
+	const char *const *_magicObjectStrings;
+	const char *const *_magicObjectString5;
+	const char *const *_patternSuffix;
+	const char *const *_patternGrFix1;
+	const char *const *_patternGrFix2;
+	const char *const *_validateArmorString;
+	const char *const *_validateCursedString;
+	const char *const *_validateNoDropString;
+	const char *const *_potionStrings;
+	const char *const *_wandStrings;	
+	const char *const *_itemMisuseStrings;	
+	
+	const char *const *_suffixStringsRings;
+	const char *const *_suffixStringsPotions;
+	const char *const *_suffixStringsWands;
+
 	const char *const *_takenStrings;
 	const char *const *_potionEffectStrings;
 
@@ -782,7 +802,8 @@ protected:
 	// misc
 	void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false);
 	void displayParchment(int id);
-	virtual void checkPartyStatusExtra() {}
+	virtual void useHorn(int charIndex, int weaponSlot) {}
+	virtual bool checkPartyStatusExtra() = 0;
 
 	virtual void drawLightningColumn() {}
 	virtual int resurrectionSelectDialogue() { return -1; }
@@ -802,10 +823,10 @@ protected:
 	GUI_Eob *_gui;
 
 	// fight
-	void useSlotWeapon(int charIndex, int slotIndex, int item);
-	int closeDistanceAttack(int charIndex, int item);
-	int thrownAttack(int charIndex, int slotIndex, int item);
-	int bowAttack(int charIndex, int item);
+	void useSlotWeapon(int charIndex, int slotIndex, Item item);
+	int closeDistanceAttack(int charIndex, Item item);
+	int thrownAttack(int charIndex, int slotIndex, Item item);
+	int projectileWeaponAttack(int charIndex, Item item);
 
 	void inflictMonsterDamage(EobMonsterInPlay *m, int damage, bool giveExperience);
 	void calcAndInflictMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int b, int damageType);
@@ -844,6 +865,7 @@ protected:
 	void useMagicBookOrSymbol(int charIndex, int type);
 	void useMagicScroll(int charIndex, int type, int weaponSlot);
 	void usePotion(int charIndex, int weaponSlot);
+	void useWand(int charIndex, int weaponSlot);
 
 	void castSpell(int spell, int weaponSlot);
 	void removeCharacterEffect(int spell, int charIndex, int showWarning);
@@ -1015,6 +1037,7 @@ protected:
 	const char *const *_menuStringsRest4;
 	const char *const *_menuStringsDefeat;
 	const char *_errorSlotEmptyString;
+	const char *_errorSlotNoNameString;
 
 	const char *const *_menuStringsTransfer;
 	const char *const *_menuStringsSpec;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index c13b4da7e9..c7972299d1 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -924,7 +924,10 @@ int EobCoreEngine::clickedWeaponSlot(Button *button) {
 	if (!testCharacter(button->arg, 1))
 		return 1;
 
-	static const uint8 sY[] = { 24, 24, 80, 80, 136, 136 };
+	// Fix this using the coordinates from gui_drawWeaponSlot().
+	// The coordinates used in the original are slightly wrong
+	// (most noticeable for characters 5 and 6).
+	static const uint8 sY[] = { 27, 27, 79, 79, 131, 131 };
 	int slot = sY[button->arg] > _mouseY ? 0 : 1;
 
 	if ((_gui->_flagsMouseLeft & 0x7f) == 1)
@@ -1298,19 +1301,17 @@ void EobCoreEngine::gui_processWeaponSlotClickLeft(int charIndex, int slotIndex)
 }
 
 void EobCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex) {
-	const char * const *strs = &_itemExtraStrings[_flags.gameID == GI_EOB1 ? 17 : (_flags.lang == Common::DE_DEU ? 26 : 22)];
-
 	if (!testCharacter(charIndex, 0x0d))
 		return;
 
-	uint16 itm = _characters[charIndex].inventory[slotIndex];
+	Item itm = _characters[charIndex].inventory[slotIndex];
 	int wslot = slotIndex < 2 ? slotIndex : -1;
 
 	if (slotIndex < 2 && (!validateWeaponSlotItem(charIndex, slotIndex) || (!_currentControlMode && (_characters[charIndex].disabledSlots & (1 << slotIndex)))))
 		return;
 
 	if (!itemUsableByCharacter(charIndex, itm))
-		_txt->printMessage(strs[0], -1, _characters[charIndex].name);
+		_txt->printMessage(_itemMisuseStrings[0], -1, _characters[charIndex].name);
 
 	if (!itm && slotIndex > 1)
 		return;
@@ -1323,7 +1324,7 @@ void EobCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex
 		case 0:
 		case 16:
 			// Item automatically used when worn
-			_txt->printMessage(strs[1]);
+			_txt->printMessage(_itemMisuseStrings[1]);
 			break;
 
 		case 1:
@@ -1340,7 +1341,7 @@ void EobCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex
 		case 13:
 		case 15:
 			// Item not used that way
-			_txt->printMessage(strs[2]);
+			_txt->printMessage(_itemMisuseStrings[2]);
 			break;
 
 		case 5:
@@ -1377,12 +1378,12 @@ void EobCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex
 			break;
 
 		case 18:
-			ep = ep;
+			useWand(charIndex, wslot);
 			break;
 
 		case 19:
 			// eob2 horn
-			ep = ep;
+			useHorn(charIndex, wslot);
 			break;
 
 		case 20:
@@ -1397,7 +1398,7 @@ void EobCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex
 			break;
 	}
 
-	if (ep == 1 && charIndex >= 2)
+	if (_flags.gameID == GI_EOB1 || (ep == 1 && charIndex >= 2))
 		return;
 
 	_lastUsedItem = itm;
@@ -3837,8 +3838,12 @@ const char *GUI_Eob::getMenuString(int id) {
 		return _vm->_menuStringsPoison[0];
 	else if (id >= 56)
 		return _vm->_menuStringsHead[id - 56];
-	else if (id >= 53)
-		return _vm->_menuStringsDrop2[id - 53];
+	else if (id == 55)
+		return _vm->_menuStringsDrop2[_vm->game() == GI_EOB1 ? 1 : 2];
+	else if (id == 54)
+		return _vm->_errorSlotNoNameString;
+	else if (id == 53)
+		return _vm->_menuStringsDrop2[0];
 	else if (id >= 48)
 		return _vm->_menuStringsScribe[id - 48];
 	else if (id == 47)
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index 6c331e80be..de5fe6b32a 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -192,10 +192,8 @@ int EobCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int sl
 	if (item < 0)
 		return 0;
 
-	int offset = (_flags.gameID == GI_EOB1) ? 11 : (_flags.lang == Common::DE_DEU ? 16 : 12);
-
 	if (slot == 17 && item && !itemUsableByCharacter(charIndex, item)) {
-		_txt->printMessage(_itemExtraStrings[offset], -1, _characters[charIndex].name);
+		_txt->printMessage(_validateArmorString[0], -1, _characters[charIndex].name);
 		return 0;
 	}
 
@@ -203,7 +201,8 @@ int EobCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int sl
 	int ex = _itemTypes[_items[itm].type].extraProperties & 0x7f;
 
 	if (slot < 2 && _items[itm].flags & 0x20 && ex > 0 && ex < 4) {
-		_txt->printMessage(_itemExtraStrings[offset + 1], -1, _characters[charIndex].name);
+		if (_flags.gameID == GI_EOB2)
+			_txt->printMessage(_validateCursedString[0], -1, _characters[charIndex].name);
 		return 0;
 	}
 
@@ -211,7 +210,7 @@ int EobCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int sl
 	if (v & _slotValidationFlags[slot])
 		return 1;
 
-	_txt->printMessage(_itemExtraStrings[offset + (_flags.gameID == GI_EOB1 ? 1 : 2)]);
+	_txt->printMessage(_validateNoDropString[0]);
 	return 0;
 }
 
@@ -317,7 +316,8 @@ void EobCoreEngine::printFullItemName(Item item) {
 	
 	const char *tstr2 = 0;
 	const char *tstr3 = 0;
-	int e = 0;
+	
+	bool correctSuffixCase = false;
 
 	Common::String tmpString;
 
@@ -330,43 +330,46 @@ void EobCoreEngine::printFullItemName(Item item) {
 				if (v == 0)
 					tmpString = nameUnid;
 				else if (v < 0)
-					tmpString = Common::String::format(_itemExtraStrings[3], v, nameUnid);
+					tmpString = Common::String::format(_cursedString[0], v, nameUnid);
 				else
-					tmpString = Common::String::format(_itemExtraStrings[4], v, nameUnid);
+					tmpString = Common::String::format(_enchantedString[0], v, nameUnid);
 				break;
 
 			case 9:
-				tstr2 = _itemExtraStrings[5];
+				tstr2 = _magicObjectStrings[0];
 				tstr3 = _spells[v].name;
-				e = 1;
+				correctSuffixCase = true;
 				break;
 
 			case 10:
-				tstr2 = _itemExtraStrings[6];
+				tstr2 = _magicObjectStrings[1];
 				tstr3 = _spells[_flags.gameID == GI_EOB1 ? (_clericSpellOffset + v) : v].name;
-				e = 1;
+				correctSuffixCase = true;
 				break;
 
 			case 14:
-				tstr2 = _itemExtraStrings[8];
-				tstr3 = _itemSuffixStrings[8];
+				tstr2 = _magicObjectStrings[3];
+				if (_flags.gameID == GI_EOB1)
+					v--;
+				tstr3 = _suffixStringsPotions[v];
 				break;
 
 			case 16:
-				tstr2 = _itemExtraStrings[7];
-				tstr3 = _itemSuffixStrings[v + 6];
-				e = 0;
+				tstr2 = _magicObjectStrings[2];
+				tstr3 = _suffixStringsRings[v];
 				break;
 
 			case 18:
-				if (v == 5) {
-					tstr2 = _itemExtraStrings[_flags.lang == Common::EN_ANY ? 9 : 10];
-					e = 1;
+				if (_flags.gameID == GI_EOB2 && v == 5) {
+					if (_flags.lang == Common::DE_DEU)
+						tstr2 = _magicObjectString5[0];
+					else
+						tstr3 = _magicObjectString5[0];
+					correctSuffixCase = true;
 				} else {
-					tstr2 = _itemExtraStrings[9];
-					e = 0;
+					tstr2 = _magicObjectStrings[4];
 				}
-				tstr3 = _itemSuffixStrings[v + (_flags.lang == Common::EN_ANY ? 11 : 15)];
+				tstr3 = _suffixStringsWands[v];
 				break;
 
 			default:
@@ -377,15 +380,15 @@ void EobCoreEngine::printFullItemName(Item item) {
 
 		if (tstr3) {
 			if (!tstr2) {
-				tmpString = Common::String::format(_itemExtraStrings[_flags.lang == Common::EN_ANY ? 10 : 11], tstr3);
+				tmpString = tstr3;
 			} else {
-				if (e == 1) {
-					if (tstr2 == _itemExtraStrings[12])
-						tmpString = Common::String::format(_itemExtraStrings[_flags.lang == Common::EN_ANY ? 11 : 14], tstr2, tstr3);
+				if (correctSuffixCase) {
+					if (tstr2 == _magicObjectString5[0])
+						tmpString = Common::String::format(_patternGrFix2[0], tstr2, tstr3);
 					else
-						tmpString = Common::String::format(_itemExtraStrings[_flags.gameID == GI_EOB1 ? 10 : (_flags.lang == Common::EN_ANY ? 11 : 13)], tstr2, tstr3);
+						tmpString = Common::String::format(_patternGrFix1[0], tstr2, tstr3);
 				} else {
-					tmpString = Common::String::format(_itemExtraStrings[_flags.gameID == GI_EOB1 ? 10 : (_flags.lang == Common::EN_ANY ? 11 : 15)], tstr2, tstr3);
+					tmpString = Common::String::format(_patternSuffix[0], tstr2, tstr3);
 				}
 			}
 		}
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 2275bd53a4..593ef63544 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -76,7 +76,6 @@ void EobCoreEngine::useMagicScroll(int charIndex, int type, int weaponSlot) {
 
 void EobCoreEngine::usePotion(int charIndex, int weaponSlot) {
 	EobCharacter *c = &_characters[_openBookChar];
-	int offset = (_flags.gameID == GI_EOB1) ? 13 : (_flags.lang == Common::DE_DEU ? 19 : 15);
 
 	int val = deleteInventoryItem(charIndex, weaponSlot);
 	snd_playSoundEffect(10);
@@ -100,7 +99,7 @@ void EobCoreEngine::usePotion(int charIndex, int weaponSlot) {
 		break;
 
 	case 3:
-		statusAttack(charIndex, 2, _itemExtraStrings[offset], 0, 1, 8, 1);
+		statusAttack(charIndex, 2, _potionStrings[0], 0, 1, 8, 1);
 		c->effectFlags &= ~0x2000;
 		if (c->flags & 2)
 			return;
@@ -136,7 +135,37 @@ void EobCoreEngine::usePotion(int charIndex, int weaponSlot) {
 		break;
 	}
 
-	_txt->printMessage(_itemExtraStrings[offset + 1], -1, c->name, _potionEffectStrings[val]);
+	_txt->printMessage(_potionStrings[1], -1, c->name, _potionEffectStrings[val]);
+}
+
+void EobCoreEngine::useWand(int charIndex, int weaponSlot) {
+	int v = _items[_characters[charIndex].inventory[weaponSlot]].value - 1;
+	if (!v) {
+		_txt->printMessage(_wandStrings[0]);
+		return;
+	}
+
+	if (v != 5)
+		useMagicScroll(charIndex, _wandTypes[v], weaponSlot);
+	else if (_flags.gameID == GI_EOB2)
+		useMagicScroll(charIndex, 64, weaponSlot);
+	else {
+		uint16 bl1 = calcNewBlockPosition(_currentBlock, _currentDirection);
+		uint16 bl2 = calcNewBlockPosition(bl1, _currentDirection);
+		snd_playSoundEffect(98);
+		sparkEffectOffensive();
+		
+		if ((_wllWallFlags[_levelBlockProperties[bl2].walls[_currentDirection ^ 2]] & 4) && !(_levelBlockProperties[bl2].flags & 7) && (_levelBlockProperties[bl1].flags & 7)) {
+			for (int i = 0; i < 30; i++) {
+				if (_monsters[i].block != bl1)
+					continue;
+				placeMonster(&_monsters[i], bl2, -1);
+				_sceneUpdateRequired = true;
+			}
+		} else {
+			_txt->printMessage(_wandStrings[1]);
+		}
+	}
 }
 
 void EobCoreEngine::castSpell(int spell, int weaponSlot) {
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 889865b8ea..02ee384f5c 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -287,8 +287,26 @@ enum KyraResources {
 
 	kEobBasePryDoorStrings,
 	kEobBaseWarningStrings,
-	kEobBaseItemSuffixStrings,
-	kEobBaseItemExtraStrings,
+
+	kEobBaseItemSuffixStringsRings,
+	kEobBaseItemSuffixStringsPotions,
+	kEobBaseItemSuffixStringsWands,
+	
+	kEobBaseRipItemStrings,
+	kEobBaseCursedString,
+	kEobBaseEnchantedString,
+	kEobBaseMagicObjectStrings,
+	kEobBaseMagicObjectString5,
+	kEobBasePatternSuffix,
+	kEobBasePatternGrFix1,
+	kEobBasePatternGrFix2,
+	kEobBaseValidateArmorString,
+	kEobBaseValidateCursedString,
+	kEobBaseValidateNoDropString,
+	kEobBasePotionStrings,
+	kEobBaseWandStrings,
+	kEobBaseItemMisuseStrings,
+
 	kEobBaseTakenStrings,
 	kEobBasePotionEffectStrings,
 
@@ -406,6 +424,10 @@ enum KyraResources {
 	kEobBaseInvSlotX,
 	kEobBaseInvSlotY,
 	kEobBaseSlotValidationFlags,
+
+	kEobBaseProjectileWeaponTypes,
+	kEobBaseWandTypes,
+
 	kEobBaseDrawObjPosIndex,
 	kEobBaseFlightObjFlipIndex,
 	kEobBaseFlightObjShpMap,
@@ -547,6 +569,8 @@ enum KyraResources {
 	kEob2MonsterDustStrings,
 
 	kEob2DranFoolsStrings,
+	kEob2HornStrings,
+	kEob2HornSounds,
 
 	kLolIngamePakFiles,
 	kLolCharacterDefs,
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index acc61353f4..c169a397bb 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -38,7 +38,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 78
+#define RESFILE_VERSION 79
 
 namespace {
 bool checkKyraDat(Common::SeekableReadStream *file) {
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index f422d6993e..19e2512da5 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -354,8 +354,26 @@ void EobCoreEngine::initStaticResource() {
 
 	_pryDoorStrings = _staticres->loadStrings(kEobBasePryDoorStrings, temp);
 	_warningStrings = _staticres->loadStrings(kEobBaseWarningStrings, temp);
-	_itemSuffixStrings = _staticres->loadStrings(kEobBaseItemSuffixStrings, temp);
-	_itemExtraStrings = _staticres->loadStrings(kEobBaseItemExtraStrings, temp);
+
+	_suffixStringsRings = _staticres->loadStrings(kEobBaseItemSuffixStringsRings, temp);
+	_suffixStringsPotions = _staticres->loadStrings(kEobBaseItemSuffixStringsPotions, temp);
+	_suffixStringsWands = _staticres->loadStrings(kEobBaseItemSuffixStringsWands, temp);
+
+	_ripItemStrings = _staticres->loadStrings(kEobBaseRipItemStrings, temp);
+	_cursedString = _staticres->loadStrings(kEobBaseCursedString, temp);
+	_enchantedString = _staticres->loadStrings(kEobBaseEnchantedString, temp);
+	_magicObjectStrings = _staticres->loadStrings(kEobBaseMagicObjectStrings, temp);
+	_magicObjectString5 = _staticres->loadStrings(kEobBaseMagicObjectString5, temp);
+	_patternSuffix = _staticres->loadStrings(kEobBasePatternSuffix, temp);
+	_patternGrFix1 = _staticres->loadStrings(kEobBasePatternGrFix1, temp);
+	_patternGrFix2 = _staticres->loadStrings(kEobBasePatternGrFix2, temp);
+	_validateArmorString = _staticres->loadStrings(kEobBaseValidateArmorString, temp);
+	_validateCursedString = _staticres->loadStrings(kEobBaseValidateCursedString, temp);
+	_validateNoDropString = _staticres->loadStrings(kEobBaseValidateNoDropString, temp);
+	_potionStrings = _staticres->loadStrings(kEobBasePotionStrings, temp);
+	_wandStrings = _staticres->loadStrings(kEobBaseWandStrings, temp);
+	_itemMisuseStrings = _staticres->loadStrings(kEobBaseItemMisuseStrings, temp);
+	
 	_takenStrings = _staticres->loadStrings(kEobBaseTakenStrings, temp);
 	_potionEffectStrings = _staticres->loadStrings(kEobBasePotionEffectStrings, temp);
 
@@ -455,6 +473,9 @@ void EobCoreEngine::initStaticResource() {
 	_inventorySlotsY = _staticres->loadRawData(kEobBaseInvSlotY, temp);
 	_slotValidationFlags = _staticres->loadRawDataBe16(kEobBaseSlotValidationFlags, temp);
 
+	_projectileWeaponAmmoTypes = (const int8*)_staticres->loadRawData(kEobBaseProjectileWeaponTypes, temp);
+	_wandTypes = _staticres->loadRawData(kEobBaseWandTypes, temp);
+
 	_drawObjPosIndex = _staticres->loadRawData(kEobBaseDrawObjPosIndex, temp);
 	_flightObjFlipIndex = _staticres->loadRawData(kEobBaseFlightObjFlipIndex, temp);
 	_flightObjShpMap = (const int8*)_staticres->loadRawData(kEobBaseFlightObjShpMap, temp);
@@ -508,8 +529,10 @@ void EobCoreEngine::initStaticResource() {
 	_sparkEffectOfY = _staticres->loadRawData(kEobBaseSparkOfY, temp);
 	_magicFlightObjectProperties = _staticres->loadRawData(kEobBaseMagicFlightProps, temp);
 
-	// Hard code these strings, since EOB 1 doesn't have them in the original
-	// (because there is only one single save slot)
+	// Hard code the following strings, since EOB I doesn't have them in the original.
+	// EOB I doesn't have load and save menus, because there is only one single
+	// save slot. Instead of emulating this we provide a menu similiar to EOB II.
+
 	static const char *saveLoadStrings[3][4] = {
 		{	"Cancel",	"Empty Slot",	"Save Game",	"Load Game"		},
 		{	"Abbr.",	"Leerer Slot",	"Speichern",	"  Laden"		},
@@ -521,9 +544,16 @@ void EobCoreEngine::initStaticResource() {
 		"Hier ist noch kein\rSpiel gespeichert!",
 		0
 	};
+
+	static const char *errorSlotNoNameString[3] = {
+		" You must specify\r a name for your\r save game!",
+		" Spielstände müssen\r einen Namen haben!",
+		0
+	};
 	
 	_saveLoadStrings = saveLoadStrings[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
 	_errorSlotEmptyString = errorSlotEmptyString[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
+	_errorSlotNoNameString = errorSlotNoNameString[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
 }
 
 void EobCoreEngine::initButtonData() {
@@ -1192,6 +1222,8 @@ void DarkMoonEngine::initStaticResource() {
 	_npc2Strings = _staticres->loadStrings(kEob2Npc2Strings, temp);
 	_monsterDustStrings = _staticres->loadStrings(kEob2MonsterDustStrings, temp);
 	_dranFoolsStrings = _staticres->loadStrings(kEob2DranFoolsStrings, temp);
+	_hornStrings = _staticres->loadStrings(kEob2HornStrings, temp);
+	_hornSounds = _staticres->loadRawData(kEob2HornSounds, temp);
 }
 
 void DarkMoonEngine::initSpells() {
-- 
cgit v1.2.3


From 84900e8e50df8490fbdebc3acb25a338949f2de9 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Fri, 29 Jul 2011 15:57:02 +0200
Subject: KYRA: (EOB) - add turn undead spell, add some screen fades, fix some
 bugs

---
 engines/kyra/eob1.cpp          | 51 +++++++++++++++++++++++++++++++++++++++---
 engines/kyra/eob1.h            |  6 +++++
 engines/kyra/eob2.cpp          |  2 +-
 engines/kyra/eobcommon.cpp     | 18 +++++++++------
 engines/kyra/eobcommon.h       | 11 +++++++--
 engines/kyra/gui_eob.cpp       | 15 ++++++++-----
 engines/kyra/magic_eob.cpp     | 46 +++++++++++++++++++++++++++++++++++--
 engines/kyra/resource.h        |  3 +++
 engines/kyra/saveload_eob.cpp  |  7 +++++-
 engines/kyra/scene_eob.cpp     |  6 +++--
 engines/kyra/script_eob.cpp    |  4 ++--
 engines/kyra/sprites_eob.cpp   | 15 ++++++++-----
 engines/kyra/staticres_eob.cpp |  3 +++
 engines/kyra/text_eob.cpp      |  2 --
 engines/kyra/timer_eob.cpp     |  5 +++--
 15 files changed, 159 insertions(+), 35 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index a9051de833..d12283f140 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -83,7 +83,7 @@ void EobEngine::startupLoad() {
 }
 
 void EobEngine::npcSequence(int npcIndex) {
-
+	error("EobEngine::npcSequence(): unimplemented");
 
 }
 
@@ -210,10 +210,54 @@ void EobEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wal
 	}
 }
 
+void EobEngine::turnUndeadAuto() {
+	if (_currentLevel != 2 && _currentLevel != 7)
+		return;
+
+	int oc = _openBookChar;
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 0x0d))
+			continue;
+		
+		EobCharacter *c = &_characters[i];
+
+		if (_itemTypes[_items[c->inventory[0]].type].extraProperties != 6 && _itemTypes[_items[c->inventory[1]].type].extraProperties != 6)
+			continue;
+
+		int l = getCharacterLevelIndex(2, c->cClass);
+		if (l > -1) {
+			if (c->level[l] > _openBookCasterLevel) {
+				_openBookCasterLevel = c->level[l];
+				_openBookChar = i;
+			}
+		} else {
+			l = getCharacterLevelIndex(4, c->cClass);
+			if (l > -1) {
+				if ((c->level[l] - 2) > _openBookCasterLevel) {
+					_openBookCasterLevel = (c->level[l] - 2);
+					_openBookChar = i;
+				}
+			}
+		}
+	}
+
+	if (_openBookCasterLevel)
+		spellCallback_start_turnUndead();
+
+	_openBookChar = oc;
+	_openBookCasterLevel = 0;
+}
+
+void EobEngine::turnUndeadAutoHit() {
+	_txt->printMessage(_turnUndeadString[0], -1, _characters[_openBookChar].name);
+	sparkEffectOffensive();
+}
+
 bool EobEngine::checkPartyStatusExtra() {
 	_screen->copyPage(0, 10);
-	gui_drawBox(0, 121, 319, 200, _color2_1, _color1_1, _bkgColor_1);
-	_screen->setScreenDim(9);
+	gui_drawBox(0, 121, 320, 80, _color1_1, _color2_1, _bkgColor_1);
+	_txt->setupField(9, false);
 	_txt->printMessage(_menuStringsDefeat[0]);
 	while (!shouldQuit()) {
 		removeInputTop();
@@ -221,6 +265,7 @@ bool EobEngine::checkPartyStatusExtra() {
 			break;
 	}
 	_screen->copyPage(10, 0);
+	_eventList.clear();
 	return true;
 }
 
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
index 3460ac7591..8d41118e52 100644
--- a/engines/kyra/eob1.h
+++ b/engines/kyra/eob1.h
@@ -84,6 +84,12 @@ private:
 	const uint8 *_doorSwitchShapeEncodeDefs;
 	const uint8 *_doorSwitchCoords;
 
+	// Magic
+	void turnUndeadAuto();
+	void turnUndeadAutoHit();
+
+	const char * const *_turnUndeadString;
+
 	// Misc
 	bool checkPartyStatusExtra();
 	uint32 convertSpellFlagToEob2Format(uint32 flag, int ignoreInvisibility);
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index c3169b10bf..cd306863ba 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -338,7 +338,7 @@ void DarkMoonEngine::drawDoorIntern(int type, int, int x, int y, int w, int wall
 }
 
 void DarkMoonEngine::restParty_npc() {
-
+	warning("DarkMoonEngine::restParty_npc(): implement!");
 }
 
 bool DarkMoonEngine::restParty_extraAbortCondition() {
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 07c1f0760a..22c0519069 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -46,6 +46,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_playFinale = false;
 	_runFlag = true;
 	_configMouse = true;
+	_loading = false;
 
 	_largeItemShapes = _smallItemShapes = _thrownItemShapes = _spellShapes = _firebeamShapes = _itemIconShapes =
 		_wallOfForceShapes = _teleporterShapes = _sparkShapes = _compassShapes = 0;
@@ -82,7 +83,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_monsterOvl1 = _monsterOvl2 = 0;
 	_monsters = 0;
 	_dstMonsterIndex = 0;
-	_inflictMonsterDamageUnk = 0;
+	_preventMonsterFlash = false;
 
 	_teleporterPulse = 0;
 
@@ -124,7 +125,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_openBookSpellLevel = 0;
 	_openBookSpellSelectedItem = 0;
 	_openBookSpellListOffset = 0;
-	_openBookChar = _openBookCharBackup = 0;
+	_openBookChar = _openBookCharBackup = _openBookCasterLevel = 0;
 	_openBookType = _openBookTypeBackup = 0;
 	_openBookSpellList = 0;
 	_openBookAvailableSpells = 0;
@@ -415,7 +416,7 @@ void EobCoreEngine::writeSettings() {
 void EobCoreEngine::startupNew() {
 	gui_setPlayFieldButtons();
 	_screen->_curPage = 0;
-	gui_drawPlayField(0);
+	gui_drawPlayField(false);
 	_screen->_curPage = 0;
 	gui_drawAllCharPortraitsWithStats();
 	drawScene(1);
@@ -452,8 +453,7 @@ void EobCoreEngine::runLoop() {
 		_envAudioTimer = _system->getMillis() + (rollDice(1, 10, 3) * 18 * _tickLength);
 		snd_processEnvironmentalSoundEffect(_flags.gameID == GI_EOB1 ? 30 : (rollDice(1, 2, -1) ? 27 : 28), _currentBlock + rollDice(1, 12, -1));
 		updateEnvironmentalSfx(0);
-		//TODO
-		//EOB1__level_2_7__turnUndead();
+		turnUndeadAuto();
 	}
 }
 
@@ -1540,7 +1540,11 @@ int EobCoreEngine::thrownAttack(int charIndex, int slotIndex, Item item) {
 
 int EobCoreEngine::projectileWeaponAttack(int charIndex, Item item) {
 	int tp = _items[item].type;
-	int t = _projectileWeaponAmmoTypes[_flags.gameID == GI_EOB1 ? tp - 2 : tp];
+
+	if (_flags.gameID == GI_EOB1)
+		assert(tp >= 7);
+
+	int t = _projectileWeaponAmmoTypes[_flags.gameID == GI_EOB1 ? tp - 7 : tp];
 	Item ammoItem = 0;
 
 	if (t == 16) {
@@ -1588,7 +1592,7 @@ void EobCoreEngine::inflictMonsterDamage(EobMonsterInPlay *m, int damage, bool g
 	} else {
 		if (checkSceneUpdateNeed(m->block)) {
 			m->flags |= 2;
-			if (_inflictMonsterDamageUnk)
+			if (_preventMonsterFlash)
 				return;
 			flashMonsterShape(m);
 		}
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 39919ca086..6463f839c8 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -406,6 +406,7 @@ protected:
 
 	const EobCharacter *_npcPreset;
 	bool _partyResting;
+	bool _loading;
 
 	// Items
 	void loadItemDefs();
@@ -634,7 +635,7 @@ protected:
 	uint8 _scriptTimersMode;
 
 	// Gui
-	void gui_drawPlayField(int pageNum);
+	void gui_drawPlayField(bool refresh);
 	void gui_restorePlayField();
 	void gui_drawAllCharPortraitsWithStats();
 	void gui_drawCharPortraitWithStats(int index);
@@ -858,7 +859,7 @@ protected:
 	void explodeMonster(EobMonsterInPlay *m);
 	
 	int _dstMonsterIndex;
-	int _inflictMonsterDamageUnk;
+	bool _preventMonsterFlash;
 	int16 _foundMonstersArray[5];
 
 	// magic
@@ -867,6 +868,9 @@ protected:
 	void usePotion(int charIndex, int weaponSlot);
 	void useWand(int charIndex, int weaponSlot);
 
+	virtual void turnUndeadAuto() {};
+	virtual void turnUndeadAutoHit() {};
+
 	void castSpell(int spell, int weaponSlot);
 	void removeCharacterEffect(int spell, int charIndex, int showWarning);
 	void removeAllCharacterEffects(int charIndex);
@@ -880,6 +884,7 @@ protected:
 
 	bool magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level);
 	bool magicObjectStatusHit(EobMonsterInPlay *m, int type, bool tryEvade, int mod);
+	bool turnUndeadHit(EobMonsterInPlay *m, int hitChance, int casterLevel);
 
 	void printWarning(const char* str);
 	void printNoEffectWarning();
@@ -958,6 +963,7 @@ protected:
 	uint8 _openBookType;
 	uint8 _openBookCharBackup;
 	uint8 _openBookTypeBackup;
+	uint8 _openBookCasterLevel;
 	const char *const *_openBookSpellList;
 	int8 *_openBookAvailableSpells;
 	uint8 _activeSpellCaster;
@@ -1011,6 +1017,7 @@ protected:
 	const uint8 *_sparkEffectOfY;
 
 	const uint8 *_magicFlightObjectProperties;
+	const uint8 *_turnUndeadEffect;
 
 	// Menu
 	EobMenuDef *_menuDefs;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index c7972299d1..ce5f3ea53f 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -149,17 +149,19 @@ Button *EobCoreEngine::gui_getButton(Button *buttonList, int index) {
 	return 0;
 }
 
-void EobCoreEngine::gui_drawPlayField(int pageNum) {
+void EobCoreEngine::gui_drawPlayField(bool refresh) {
 	_screen->loadEobCpsFileToPage("PLAYFLD", 0, 5, 3, 2);
 	int cp = _screen->setCurPage(2);
 	gui_drawCompass(true);
 
-	if (pageNum && !_sceneDrawPage2)
+	if (refresh && !_sceneDrawPage2)
 		drawScene(0);
 
 	_screen->setCurPage(cp);
 	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
+	
+	if (!_loading)
+		_screen->updateScreen();
 
 	_screen->loadEobCpsFileToPage("INVENT", 0, 5, 3, 2);
 }
@@ -167,7 +169,7 @@ void EobCoreEngine::gui_drawPlayField(int pageNum) {
 void EobCoreEngine::gui_restorePlayField() {
 	loadVcnData(0, 0);
 	_screen->_curPage = 0;
-	gui_drawPlayField(1);
+	gui_drawPlayField(true);
 	gui_drawAllCharPortraitsWithStats();
 }
 
@@ -706,7 +708,8 @@ void EobCoreEngine::gui_drawSpellbook() {
 
 	_screen->setCurPage(0);
 	_screen->copyRegion(64, 121, 64, 121, 112, 56, 2, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
+	if (!_loading)
+		_screen->updateScreen();
 }
 
 void EobCoreEngine::gui_drawSpellbookScrollArrow(int x, int y, int direction) {
@@ -2245,7 +2248,7 @@ void GUI_Eob::runCampMenu() {
 
 				if (cnt > 4) {
 					_vm->dropCharacter(selectCharacterDialogue(53));
-					_vm->gui_drawPlayField(0);
+					_vm->gui_drawPlayField(false);
 					res = true;
 					_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 14, Screen::CR_NO_P_CHECK);
 					_screen->setFont(Screen::FID_6_FNT);
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 593ef63544..f828625dbb 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -80,6 +80,9 @@ void EobCoreEngine::usePotion(int charIndex, int weaponSlot) {
 	int val = deleteInventoryItem(charIndex, weaponSlot);
 	snd_playSoundEffect(10);
 
+	if (_flags.gameID == GI_EOB1)
+		val--;
+
 	switch (val) {
 	case 0:
 		sparkEffectDefensive(charIndex);
@@ -496,7 +499,7 @@ bool EobCoreEngine::magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int d
 		level = 1;
 
 	if ((_levelBlockProperties[fo->curBlock].flags & 7) && (fo->attackerId >= 0 || ignoreAttackerId)) {
-		_inflictMonsterDamageUnk = 1;
+		_preventMonsterFlash = true;
 
 		for (const int16 *m = findBlockMonsters(fo->curBlock, fo->curPos, fo->direction, blockDamage, singleTargetCheckAdjacent); *m != -1; m++) {
 			int dmg = rollDice(dcTimes, dcPips, dcOffs) * level;
@@ -604,6 +607,23 @@ bool EobCoreEngine::magicObjectStatusHit(EobMonsterInPlay *m, int type, bool try
 	return true;
 }
 
+bool EobCoreEngine::turnUndeadHit(EobMonsterInPlay *m, int hitChance, int casterLevel) {
+	uint8 e = _turnUndeadEffect[_monsterProps[m->type].tuResist * 14 + MIN(casterLevel, 14)];
+
+	if (e == 0xff) {
+		calcAndInflictMonsterDamage(m, 0, 0, 500, 0x200, 5, 3);
+	} else if (hitChance < e) {
+		return false;
+	} else {
+		m->mode = 0;
+		m->flags |= 8;
+		m->spellStatusLeft = 40;
+		m->dir = (getNextMonsterDirection(m->block, _currentBlock) ^ 4) >> 1;	
+	}
+
+	return true;
+}
+
 void EobCoreEngine::printWarning(const char* str) {
 	_txt->printMessage(str);
 	snd_playSoundEffect(79);
@@ -900,11 +920,33 @@ void EobCoreEngine::spellCallback_start_heal() {
 }
 
 void EobCoreEngine::spellCallback_start_layOnHands() {
-
+	modifyCharacterHitpoints(_activeSpellCaster, _characters[_openBookChar].level[0] << 1);
 }
 
 void EobCoreEngine::spellCallback_start_turnUndead() {
+	uint16 bl = calcNewBlockPosition(_currentBlock, _currentDirection);
+	if (!(_levelBlockProperties[bl].flags & 7))
+		return;
+	
+	int cl = _openBookCasterLevel ? _openBookCasterLevel : getCharacterClericPaladinLevel(_openBookChar);
+	int r = rollDice(1, 20);
+	bool hit = false;
+
+	for (const int16 *m = findBlockMonsters(bl, 4, 4, 1, 1); *m != -1; m++) {		
+		if ((_monsterProps[_monsters[*m].type].typeFlags & 4) && !(_monsters[*m].flags & 0x10)) {
+			_preventMonsterFlash = true;
+			_monsters[*m].flags |= 0x10;
+			hit |= turnUndeadHit(&_monsters[*m], r, cl);
+		}
+	}
+
+	if (hit) {
+		turnUndeadAutoHit();
+		snd_playSoundEffect(95);
+		updateAllMonsterShapes();
+	}
 
+	_preventMonsterFlash = false;
 }
 
 bool EobCoreEngine::spellCallback_end_unk1Passive(EobFlyingObject *fo) {
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 02ee384f5c..5328aeff35 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -469,6 +469,7 @@ enum KyraResources {
 
 	kEobBaseSpellProperties,
 	kEobBaseMagicFlightProps,
+	kEobBaseTurnUndeadEffect,
 
 	kEob1MainMenuStrings,
 	kEob1DoorShapeDefs,
@@ -481,6 +482,8 @@ enum KyraResources {
 	kEob1MonsterDistAttType17,
 	kEob1MonsterDistAttSfx17,
 
+	kEob1TurnUndeadString,
+
 	kEob2MainMenuStrings,
 	kEob2IntroStrings,
 	kEob2IntroCPSFiles,
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 1fa26c26b1..43a230e590 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -149,6 +149,8 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 		return Common::Error(Common::kReadingFailed);
 
 	Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, DisposeAfterUse::YES);
+	_loading = true;
+	_screen->fadeToBlack(10);
 
 	for (int i = 0; i < 6; i++) {
 		EobCharacter *c = &_characters[i];
@@ -356,7 +358,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 	_screen->setFont(Screen::FID_6_FNT);
 
 	_screen->setCurPage(0);
-	gui_drawPlayField(0);	
+	gui_drawPlayField(false);	
 
 	if (_currentControlMode)
 		_screen->copyRegion(176, 0, 0, 0, 144, 168, 0, 5, Screen::CR_NO_P_CHECK);
@@ -378,6 +380,9 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 	while (!_screen->isMouseVisible())
 		_screen->showMouse();
 
+	_loading = false;
+	_screen->fadeFromBlack(20);
+
 	return Common::kNoError;
 }
 
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 36584d462b..e6b3c26394 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -997,7 +997,9 @@ void EobCoreEngine::drawScene(int refresh) {
 		if (refresh)
 			_screen->fillRect(0, 0, 176, 120, 12);
 
-		_screen->setScreenPalette(_screen->getPalette(0));
+		if (!_loading)
+			_screen->setScreenPalette(_screen->getPalette(0));
+
 		_sceneDrawPage2 = 0;
 	}
 
@@ -1025,7 +1027,7 @@ void EobCoreEngine::drawScene(int refresh) {
 	if (!_dialogueField && refresh && !_updateFlags)
 		gui_drawCompass(false);
 
-	if (refresh && !_partyResting)
+	if (refresh && !_partyResting && !_loading)
 		_screen->updateScreen();
 
 	if (_sceneDefaultUpdate) {
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index 9e18a14fb2..833413c69b 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -1397,12 +1397,12 @@ int EobInfProcessor::oeob_sequence(int8 *data) {
 
 	case -2:
 		// portal sequence
-		pos=pos;
+		error("EobInfProcessor::oeob_sequence(): unimplemented cmd -2");
 		break;
 
 	case -1:
 		// copy protection
-		pos=pos;
+		error("EobInfProcessor::oeob_sequence(): unimplemented cmd -1");
 		break;
 
 	default:
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index baa7a0bfda..0874de82e3 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -140,6 +140,12 @@ const uint8 *EobCoreEngine::loadActiveMonsterData(const uint8 *data, int level)
 		_timer->setCountdown(0x21 + (p << 1), v);
 	}
 
+	uint32 ct = _system->getMillis();
+	for (int i = 0x20; i < 0x24; i++) {
+		int32 del = _timer->getDelay(i);
+		_timer->setNextRun(i, (i & 1) ? ct + (del >> 1) : ct + del);
+	}
+
 	if (_hasTempDataFlags & (1 << (level - 1)))
 		return data + 420;
 
@@ -302,12 +308,12 @@ bool EobCoreEngine::isMonsterOnPos(EobMonsterInPlay *m, uint16 block, int pos, i
 
 const int16 *EobCoreEngine::findBlockMonsters(uint16 block, int pos, int dir, int blockDamage, int singleTargetCheckAdjacent) {
 	static const uint8 cpos4[] = { 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1 };
-	int checkPos4 = (pos <= 4) ? cpos4[(dir << 2) + pos] : 1;
+	int include4 = (pos < 4) ? cpos4[(dir << 2) + pos] : 1;
 	int16 *dst = _foundMonstersArray;
 
 	if (blockDamage) {
 		for (int i = 0; i < 30; i++) {
-			if (_monsters[i].block == block && (_monsters[i].pos != 4 || checkPos4))
+			if (_monsters[i].block == block && (_monsters[i].pos != 4 || include4))
 				*dst++ = i;
 		}
 
@@ -338,7 +344,7 @@ const int16 *EobCoreEngine::findBlockMonsters(uint16 block, int pos, int dir, in
 
 	} else {
 		for (int i = 0; i < 30; i++) {
-			if (isMonsterOnPos(&_monsters[i], block, pos, checkPos4))
+			if (isMonsterOnPos(&_monsters[i], block, pos, include4))
 				*dst++ = i;
 		}
 	}
@@ -395,7 +401,7 @@ void EobCoreEngine::updateAllMonsterShapes() {
 	} else {
 		_sceneUpdateRequired = false;
 	}
-	_inflictMonsterDamageUnk = 0;
+	_preventMonsterFlash = false;
 }
 
 void EobCoreEngine::drawBlockItems(int index) {
@@ -684,7 +690,6 @@ void EobCoreEngine::drawTeleporter(int index) {
 void EobCoreEngine::updateMonsters(int unit) {
 	for (int i = 0; i < 30; i++) {
 		EobMonsterInPlay *m = &_monsters[i];
-
 		if (m->unit == unit) {
 			if (m->hitPointsCur <= 0 || m->flags & 0x20)
 				continue;
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 19e2512da5..1cf78eef5c 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -528,6 +528,7 @@ void EobCoreEngine::initStaticResource() {
 	_sparkEffectOfX = _staticres->loadRawData(kEobBaseSparkOfX, temp);
 	_sparkEffectOfY = _staticres->loadRawData(kEobBaseSparkOfY, temp);
 	_magicFlightObjectProperties = _staticres->loadRawData(kEobBaseMagicFlightProps, temp);
+	_turnUndeadEffect = _staticres->loadRawData(kEobBaseTurnUndeadEffect, temp);
 
 	// Hard code the following strings, since EOB I doesn't have them in the original.
 	// EOB I doesn't have load and save menus, because there is only one single
@@ -1065,6 +1066,8 @@ void EobEngine::initStaticResource() {
 	_monsterDistAttType17 = _staticres->loadRawData(kEob1MonsterDistAttType17, temp);
 	_monsterDistAttSfx17 = _staticres->loadRawData(kEob1MonsterDistAttSfx17, temp);
 
+	_turnUndeadString = _staticres->loadStrings(kEob1TurnUndeadString, temp);
+
 	const uint8 *ps = _staticres->loadRawData(kEob1MonsterProperties, temp);
 	temp /= 27;
 	_monsterProps = new EobMonsterProperty[temp];
diff --git a/engines/kyra/text_eob.cpp b/engines/kyra/text_eob.cpp
index c350666226..63d893d2cc 100644
--- a/engines/kyra/text_eob.cpp
+++ b/engines/kyra/text_eob.cpp
@@ -70,8 +70,6 @@ void TextDisplayer_Eob::setupField(int dim, bool mode) {
 		clearCurDim();
 	else
 		resetDimTextPositions(dim);
-
-	//_textPageBreakFunc = textPageBreakMore; + 0x25
 }
 
 void TextDisplayer_Eob::resetDimTextPositions(int dim) {
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 903dec2102..9e03bdebcf 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -101,6 +101,7 @@ void EobCoreEngine::setupTimers() {
 	_timer->addTimer(0x21, TimerV2(timerProcessMonsters), 20, true);
 	_timer->addTimer(0x22, TimerV2(timerProcessMonsters), 20, true);
 	_timer->addTimer(0x23, TimerV2(timerProcessMonsters), 20, true);
+	_timer->setNextRun(0x20, _system->getMillis());
 	_timer->setNextRun(0x21, _system->getMillis() + 7 * _tickLength);
 	_timer->setNextRun(0x22, _system->getMillis() + 14 * _tickLength);
 	_timer->setNextRun(0x23, _system->getMillis() + 14 * _tickLength);
@@ -274,7 +275,6 @@ void EobCoreEngine::timerProcessMonsters(int timerNum) {
 	updateMonsters(timerNum & 0x0f);
 }
 
-
 void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
 	int charIndex = timerNum & 0x0f;
 	EobCharacter *c = &_characters[charIndex];
@@ -346,7 +346,8 @@ void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
 
 		case 12:
 			c->effectFlags &= ~0x1000;
-			_txt->printMessage(_characterStatusStrings12[0], -1, c->name);
+			if (_characterStatusStrings12)
+				_txt->printMessage(_characterStatusStrings12[0], -1, c->name);
 			break;
 
 		default:
-- 
cgit v1.2.3


From 48f83b7bb48a1625f6c195e396f8d40047f50915 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 1 Aug 2011 22:50:51 +0200
Subject: KYRA: (EOB) - implement npc sequences and fix some bugs

---
 engines/kyra/eob1.cpp          | 271 ++++++++++++++++++++++++++++++++++++++++-
 engines/kyra/eob1.h            |  26 +++-
 engines/kyra/eob2.cpp          | 117 +++++++++---------
 engines/kyra/eob2.h            |   3 +-
 engines/kyra/eobcommon.cpp     | 101 ++++++++++++---
 engines/kyra/eobcommon.h       |  27 ++--
 engines/kyra/gui_eob.cpp       |  64 +++++++---
 engines/kyra/gui_eob.h         |   2 +
 engines/kyra/items_eob.cpp     |  59 ++++++++-
 engines/kyra/lol.cpp           |   5 +-
 engines/kyra/loleobbase.cpp    |  12 +-
 engines/kyra/loleobbase.h      |   4 +
 engines/kyra/magic_eob.cpp     |  13 +-
 engines/kyra/resource.h        |  16 +++
 engines/kyra/script_eob.cpp    |  35 ++++--
 engines/kyra/script_eob.h      |   7 +-
 engines/kyra/sprites_eob.cpp   |   6 +-
 engines/kyra/staticres_eob.cpp |  23 +++-
 engines/kyra/text_eob.cpp      |  70 +++++++----
 19 files changed, 693 insertions(+), 168 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index d12283f140..95052311ff 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -46,6 +46,19 @@ Common::Error EobEngine::init() {
 
 	_itemsOverlay = _res->fileData("ITEMRMP.VGA", 0);
 
+	static const uint16 wX[] = { 285, 139 };
+	static const uint8 wY[] = { 189, 162 };
+	static const uint16 wW[] = { 31, 31 };
+
+	_dialogueButtonLabelCol1 = 9;
+	_dialogueButtonLabelCol2 = 15;
+	_dialogueButtonW = 95;
+	_dialogueButtonH = 9;
+	_waitButtonPresX = wX;
+	_waitButtonPresY = wY;
+	_waitButtonPresW = wW;
+	_waitButtonReverveW = 7;
+
 	_bkgColor_1 = 132;
 	_color1_1 = 135;
 	_color2_1 = 130;
@@ -82,11 +95,227 @@ void EobEngine::startupLoad() {
 	_sound->loadSoundFile("ADLIB");
 }
 
-void EobEngine::npcSequence(int npcIndex) {
-	error("EobEngine::npcSequence(): unimplemented");
+void EobEngine::drawNpcScene(int npcIndex) {
+	_screen->copyRegion(0, 0, 0, 0, 176, 120, 6, 0, Screen::CR_NO_P_CHECK);
+	switch (npcIndex) {
+	case 0:
+		encodeDrawNpcSeqShape(2, 88, 104);
+		break;
+
+	case 1:
+		if (_npcSequenceSub == -1) {
+			encodeDrawNpcSeqShape(0, 88, 104);
+		} else {
+			encodeDrawNpcSeqShape(0, 60, 104);
+			encodeDrawNpcSeqShape(5, 116, 104);
+		}
+		break;
+
+	case 2:
+		if (_npcSequenceSub == -1) {
+			encodeDrawNpcSeqShape(3, 88, 104);
+		} else {
+			encodeDrawNpcSeqShape(3, 60, 104);
+			encodeDrawNpcSeqShape(_npcSubShpIndex1[_npcSequenceSub], 116, 104);
+			encodeDrawNpcSeqShape(_npcSubShpIndex2[_npcSequenceSub], 116, _npcSubShpY[_npcSequenceSub]);
+		}
+		break;
+
+	case 3:
+		encodeDrawNpcSeqShape(7, 88, 104);
+		break;
+
+	case 4:
+		encodeDrawNpcSeqShape(6, 88, 104);
+		break;
+
+	case 5:
+		encodeDrawNpcSeqShape(18, 88, 88);
+		break;
+
+	case 6:
+		encodeDrawNpcSeqShape(17, 88, 104);
+		break;
+
+	case 7:
+		encodeDrawNpcSeqShape(4, 88, 104);
+		break;
+
+	default:
+		break;
+	}
+}
 
+void EobEngine::encodeDrawNpcSeqShape(int npcIndex, int drawX, int drawY) {
+	const uint8 *shpDef = &_npcShpData[npcIndex << 2];
+	_screen->_curPage = 2;
+	const uint8 *shp = _screen->encodeShape(shpDef[0], shpDef[1], shpDef[2], shpDef[3]);
+	_screen->_curPage = 0;
+	_screen->drawShape(0, shp, drawX - (shp[2] << 2), drawY - shp[1], 5);
+	delete[] shp;
 }
 
+#define DLG2(txt, buttonstr) (runDialogue(txt, 0, _npc##buttonstr##Strings[0], _npc##buttonstr##Strings[1], 0) - 1)
+#define DLG3(txt, buttonstr) (runDialogue(txt, 1, _npc##buttonstr##Strings[0], _npc##buttonstr##Strings[1], _npc##buttonstr##Strings[2], 0) - 1)
+#define DLG2A3(cond, txt, buttonstr1, buttonstr2) ((cond) ? (DLG2(txt, buttonstr1) ? 2 : 0) : DLG3(txt, buttonstr2))
+#define TXT(txt) _txt->printDialogueText(txt, _moreStrings[0])
+
+void EobEngine::runNpcDialogue(int npcIndex) {
+	int r = 0;
+	int a = 0;
+	Item itm = 0;
+	
+	switch (npcIndex) {
+	case 0:
+		for (r = 1; r == 1; ) {
+			gui_drawDialogueBox();
+			r = DLG2A3(checkScriptFlag(0x2000), 8, 12, 11);
+			if (r == 1) {
+				TXT(1);
+				setScriptFlag(0x2000);
+			} else if (r == 0) {
+				npcJoinDialogue(6, 12, 23, 2);
+				setScriptFlag(0x4000);
+			}
+		}
+		break;
+
+	case 1:
+		if (!checkScriptFlag(0x10000)) {
+			if (checkScriptFlag(0x8000)) {
+				a = 1;
+			} else {
+				setScriptFlag(0x8000);
+				r = DLG2(3, 21);
+			}
+			if (!r)
+				r = DLG2(a ? 13 : 4, 22);
+			
+			if (!r) {
+				for (a = 0; a < 6; a++)
+					createItemOnCurrentBlock(55);
+				createItemOnCurrentBlock(62);
+				setScriptFlag(0x10000);
+				TXT(6);
+				npcJoinDialogue(7, 7, 29, 30);
+			} else {
+				TXT(5);
+			}
+			r = 1;
+		}
+
+		if (!checkScriptFlag(0x80000)) {
+			for (a = 0; a < 6; a++) {
+				if (testCharacter(a, 1) && _characters[a].portrait == -9)
+					break;
+			}
+			if (a != 6) {
+				TXT(25);
+				TXT(26);
+				setScriptFlag(0x80000);
+				r = 1;
+			}
+		}
+
+		if (!checkScriptFlag(0x100000)) {
+			if (deletePartyItems(6, -1)) {
+				TXT(28);
+				createItemOnCurrentBlock(32);
+				setScriptFlag(0x100000);
+				r = 1;
+			}
+		}
+
+		if (!r)
+			 _txt->printDialogueText(_npc0Strings[0], true);
+
+		break;
+
+	case 2:
+		if (checkScriptFlag(0x10000)) {
+			if (checkScriptFlag(0x20000)) {
+				TXT(11);
+			} else {
+				r = DLG2A3(!countResurrectionCandidates(), 9, 31, 32);
+				if (r < 2) {
+					if (r == 0)
+						healParty();
+					else
+						resurrectionSelectDialogue();
+					setScriptFlag(0x20000);
+				}				
+			}
+		} else {
+			TXT(24);
+		}
+		break;
+
+	case 3:
+		if (!DLG2(18, 4)) {
+			setScriptFlag(0x8400000);
+			for (a = 0; a < 30; a++) {
+				if (_monsters[a].mode == 8)
+					_monsters[a].mode = 5;
+			}
+		} else if (deletePartyItems(49, -1)) {
+			TXT(20);
+			setScriptFlag(0x400000);
+		} else {
+			TXT(19);
+		}
+		break;
+
+	case 4:
+		r = DLG3(14, 5);
+		if (r == 0)
+			setScriptFlag(0x200000);
+		else if (r == 1)
+			TXT(15);
+		setScriptFlag(0x800000);
+		break;
+
+	case 5:
+		if (!DLG2(16, 6)) {
+			TXT(17);
+			for (a = 0; a < 6; a++) {
+				for (r = 0; r < 2; r++) {
+					itm = _characters[a].inventory[r];
+					if (itm && (_items[itm].type < 51 || _items[itm].type > 56)) {
+						_characters[a].inventory[r] = 0;
+						setItemPosition((Item*)&_levelBlockProperties[_currentBlock].drawObjects, _currentBlock, itm, _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
+					}
+				}
+			}
+		}
+		setScriptFlag(0x2000000);
+		break;
+
+	case 6:
+		TXT(21);
+		setScriptFlag(0x1000000);
+		break;
+
+	case 7:
+		r = DLG3(22, 7);
+		if (r  < 2) {
+			if (r == 0)
+				npcJoinDialogue(8, 27, 44, 45);
+			else
+				TXT(31);
+			setScriptFlag(0x4000000);
+		}
+		break;
+
+	default:
+		break;
+	}
+}
+
+#undef TXT
+#undef DLG2
+#undef DLG3
+#undef DLG2A3
+
 void EobEngine::updateUsedCharacterHandItem(int charIndex, int slot) {
 	EobItem *itm = &_items[_characters[charIndex].inventory[slot]];
 	if (itm->type == 48) {
@@ -269,6 +498,44 @@ bool EobEngine::checkPartyStatusExtra() {
 	return true;
 }
 
+int EobEngine::resurrectionSelectDialogue() {
+	gui_drawDialogueBox();
+	_txt->printDialogueText(_npc0Strings[1]);
+
+	int r = _rrId[runDialogue(-1, 1, _rrNames[0], _rrNames[1], _rrNames[2], _rrNames[3], _rrNames[4], _rrNames[5], _rrNames[6], _rrNames[7], _rrNames[8]) - 1];
+
+	if (r < 0) {
+		r = -r;
+		deletePartyItems(33, r);
+		_npcSequenceSub = r - 1;
+		drawNpcScene(2);
+		npcJoinDialogue(_npcSequenceSub, 32 + (_npcSequenceSub << 1), -1, 33 + (_npcSequenceSub << 1));
+	} else {
+		_characters[r].hitPointsCur = _characters[r].hitPointsMax;
+	}
+
+	return 1;
+}
+
+void EobEngine::healParty() {
+	int cnt = rollDice(1, 3, 2);
+	for (int i = 0; i < 6 && cnt; i++) {
+		if (testCharacter(i, 3))
+			continue;
+		
+		_characters[i].flags &= ~4;
+		neutralizePoison(i);
+		
+		if (_characters[i].hitPointsCur >= _characters[i].hitPointsMax)
+			continue;
+		
+		cnt--;
+		_characters[i].hitPointsCur += rollDice(1, 8, 9);
+		if (_characters[i].hitPointsCur > _characters[i].hitPointsMax)
+			_characters[i].hitPointsCur = _characters[i].hitPointsMax;
+	}
+}
+
 uint32 EobEngine::convertSpellFlagToEob2Format(uint32 flag, int ignoreInvisibility) {
 	uint32 res = 0;
 	if (flag & 0x01)
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
index 8d41118e52..8b805c00e8 100644
--- a/engines/kyra/eob1.h
+++ b/engines/kyra/eob1.h
@@ -56,10 +56,25 @@ private:
 	void seq_playFinale();
 
 	// characters
-	void npcSequence(int npcIndex);
-
-	//const char *const *_npc1Strings;
-	//const char *const *_npc2Strings;
+	void drawNpcScene(int npcIndex);
+	void encodeDrawNpcSeqShape(int npcIndex, int drawX, int drawY);
+	void runNpcDialogue(int npcIndex);
+
+	const uint8 *_npcShpData;
+	const uint8 *_npcSubShpIndex1;
+	const uint8 *_npcSubShpIndex2;
+	const uint8 *_npcSubShpY;
+	const char *const *_npc0Strings;
+	const char *const *_npc11Strings;
+	const char *const *_npc12Strings;
+	const char *const *_npc21Strings;
+	const char *const *_npc22Strings;
+	const char *const *_npc31Strings;
+	const char *const *_npc32Strings;
+	const char *const *_npc4Strings;
+	const char *const *_npc5Strings;
+	const char *const *_npc6Strings;
+	const char *const *_npc7Strings;
 
 	// items
 	void updateUsedCharacterHandItem(int charIndex, int slot);
@@ -92,6 +107,9 @@ private:
 
 	// Misc
 	bool checkPartyStatusExtra();
+	int resurrectionSelectDialogue();
+	void healParty();
+
 	uint32 convertSpellFlagToEob2Format(uint32 flag, int ignoreInvisibility);
 	uint32 convertCharacterEffectFlagToEob2Format(uint32 flag);
 };
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index cd306863ba..2b4cf46afe 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -52,6 +52,19 @@ Common::Error DarkMoonEngine::init() {
 
 	_monsterProps = new EobMonsterProperty[10];
 
+	static const uint16 wX[] = { 221, 76 };
+	static const uint8 wY[] = { 189, 162 };
+	static const uint16 wW[] = { 95, 95 };
+
+	_dialogueButtonLabelCol1 = 9;
+	_dialogueButtonLabelCol2 = 15;
+	_dialogueButtonW = 95;
+	_dialogueButtonH = 9;
+	_waitButtonPresX = wX;
+	_waitButtonPresY = wY;
+	_waitButtonPresW = wW;
+	_waitButtonReverveW = 7;
+
 	_bkgColor_1 = 183;
 	_color1_1 = 186;
 	_color2_1 = 181;
@@ -77,11 +90,8 @@ void DarkMoonEngine::startupNew() {
 	EobCoreEngine::startupNew();
 }
 
-void DarkMoonEngine::npcSequence(int npcIndex) {
-	_screen->loadEobBitmap("OUTTAKE", 5, 3);
-	_screen->copyRegion(0, 0, 0, 0, 176, 120, 0, 6, Screen::CR_NO_P_CHECK);
+void DarkMoonEngine::drawNpcScene(int npcIndex) {
 	const uint8 *shpDef = &_npcShpData[npcIndex << 3];
-
 	for (int i = npcIndex; i != 255; i = shpDef[7]) {
 		shpDef = &_npcShpData[i << 3];
 		_screen->_curPage = 2;
@@ -90,15 +100,9 @@ void DarkMoonEngine::npcSequence(int npcIndex) {
 		_screen->drawShape(0, shp, 88 + shpDef[5] - (shp[2] << 2), 104 + shpDef[6] - shp[1], 5);
 		delete[] shp;
 	}
+}
 
-	Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
-	_screen->loadFileDataToPage(s, 5, 32000);
-	delete s;
-
-	gui_drawBox(0, 121, 320, 79, _color1_1, _color2_1, _bkgColor_1);
-	_txt->setupField(9, true);
-	_txt->resetPageBreakString();
-
+void DarkMoonEngine::runNpcDialogue(int npcIndex) {
 	if (npcIndex == 0) {
 		snd_playSoundEffect(57);
 		if (npcJoinDialogue(0, 1, 3, 2))
@@ -108,7 +112,7 @@ void DarkMoonEngine::npcSequence(int npcIndex) {
 		gui_drawDialogueBox();
 
 		_txt->printDialogueText(4, 0);
-		int r = runDialogue(-1, 0, _npc1Strings[0], _npc1Strings[1]) - 1;
+		int r = runDialogue(-1, 0, _npc1Strings[0], _npc1Strings[1], 0) - 1;
 
 		if (r == 0) {
 			_sound->playTrack(0);
@@ -124,7 +128,7 @@ void DarkMoonEngine::npcSequence(int npcIndex) {
 		gui_drawDialogueBox();
 
 		_txt->printDialogueText(8, 0);
-		int r = runDialogue(-1, 0, _npc2Strings[0], _npc2Strings[1]) - 1;
+		int r = runDialogue(-1, 0, _npc2Strings[0], _npc2Strings[1], 0) - 1;
 
 		if (r == 0) {
 			if (rollDice(1, 2, -1))
@@ -136,9 +140,6 @@ void DarkMoonEngine::npcSequence(int npcIndex) {
 			_currentDirection = 0;
 		}
 	}
-
-	_txt->removePageBreakFlag();
-	gui_restorePlayField();
 }
 
 void DarkMoonEngine::updateUsedCharacterHandItem(int charIndex, int slot) {
@@ -338,7 +339,40 @@ void DarkMoonEngine::drawDoorIntern(int type, int, int x, int y, int w, int wall
 }
 
 void DarkMoonEngine::restParty_npc() {
-	warning("DarkMoonEngine::restParty_npc(): implement!");
+	int insalId = -1;
+	int numChar = 0;
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 1))
+			continue;
+		if (testCharacter(i, 2) && _characters[i].portrait == -1)
+			insalId = i;
+		numChar++;
+	}
+
+	if (insalId == -1 || numChar < 5)
+		return;
+
+	removeCharacterFromParty(insalId);
+	if (insalId < 4)
+		exchangeCharacters(insalId, testCharacter(5, 1) ? 5 : 4);
+
+	clearScriptFlag(6);
+
+	if (!stripPartyItems(1, 1, 1, 1))
+		stripPartyItems(2, 1, 1, 1);
+	stripPartyItems(31, 0, 1, 3);
+	stripPartyItems(39, 1, 0, 3);
+	stripPartyItems(47, 0, 1, 2);
+
+	_items[createItemOnCurrentBlock(28)].value = 26;
+
+	gui_drawPlayField(false);
+	gui_drawAllCharPortraitsWithStats();
+
+	_screen->setClearScreenDim(10);
+	_gui->messageDialogue2(11, 63, 6);
+	_gui->messageDialogue2(11, 64, 6);
 }
 
 bool DarkMoonEngine::restParty_extraAbortCondition() {
@@ -357,7 +391,7 @@ void DarkMoonEngine::useHorn(int charIndex, int weaponSlot) {
 }
 
 bool DarkMoonEngine::checkPartyStatusExtra() {
-	if (checkScriptFlag(0x10))
+	if (checkScriptFlag(0x100000))
 		seq_dranFools();
 	return _gui->confirmDialogue2(14, 67, 1);
 }
@@ -374,49 +408,12 @@ void DarkMoonEngine::drawLightningColumn() {
 }
 
 int DarkMoonEngine::resurrectionSelectDialogue() {
-	int cnt = 0;
-	const char *namesList[10];
-	memset(namesList, 0, 10 * sizeof(const char*));
-	int8 indexList[10];
-
-	for (int i = 0; i < 6; i++) {
-		if (!testCharacter(i, 1))
-			continue;
-		if (_characters[i].hitPointsCur != -10)
-			continue;
-
-		namesList[cnt] = _characters[i].name;
-		indexList[cnt++] = i;
-	}
-
-	for (int i = 0; i < 6; i++) {
-		if (!testCharacter(i, 1))
-			continue;
-
-		for (int ii = 0; ii < 27; ii++) {
-			uint16 inv = _characters[i].inventory[ii];
-			if (!inv)
-				continue;
-
-			if (_items[inv].type != 33)
-				continue;
-
-			namesList[cnt] = _npcPreset[_items[inv].value - 1].name;
-			indexList[cnt++] = -_items[inv].value;
-		}
-	}
-
-	if (_itemInHand) {
-		if (_items[_itemInHand].type == 33) {
-			namesList[cnt] = _npcPreset[_items[_itemInHand].value - 1].name;
-			indexList[cnt++] = -_items[_itemInHand].value;
-		}
-	}
+	countResurrectionCandidates();
 
-	namesList[cnt] = _abortStrings[0];
-	indexList[cnt++] = 99;
+	_rrNames[_rrCount] = _abortStrings[0];
+	_rrId[_rrCount++] = 99;
 
-	int r = indexList[runDialogue(-1, 1, namesList[0], namesList[1], namesList[2], namesList[3], namesList[4], namesList[5], namesList[6], namesList[7], namesList[8]) - 1];
+	int r = _rrId[runDialogue(-1, 1, _rrNames[0], _rrNames[1], _rrNames[2], _rrNames[3], _rrNames[4], _rrNames[5], _rrNames[6], _rrNames[7], _rrNames[8]) - 1];
 	if (r == 99)
 		return 0;
 
diff --git a/engines/kyra/eob2.h b/engines/kyra/eob2.h
index e1c574a243..f24db79e62 100644
--- a/engines/kyra/eob2.h
+++ b/engines/kyra/eob2.h
@@ -94,7 +94,8 @@ private:
 	const char *const *_dranFoolsStrings;
 
 	// characters
-	void npcSequence(int npcIndex);
+	void drawNpcScene(int npcIndex);
+	void runNpcDialogue(int npcIndex);
 
 	const uint8 *_npcShpData;
 	const char *const *_npc1Strings;
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 22c0519069..eef3873285 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -110,7 +110,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_configHpBarGraphs = true;
 
 	memset(_dialogueLastBitmap, 0, 13);
-	_dlgUnk1 = 0;
+	_npcSequenceSub = 0;
 	_moveCounter = 0;
 	_partyResting = false;
 
@@ -137,6 +137,10 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_spellAnimBuffer = 0;
 	_clericSpellOffset = 0;
 	_restPartyElapsedTime = 0;
+
+	_rrCount = 0;
+	memset(_rrNames, 0, 10 * sizeof(const char*));
+	memset(_rrId, 0, 10 * sizeof(int8));
 }
 
 EobCoreEngine::~EobCoreEngine() {
@@ -975,6 +979,26 @@ void EobCoreEngine::neutralizePoison(int character) {
 	gui_drawCharPortraitWithStats(character);
 }
 
+void EobCoreEngine::npcSequence(int npcIndex) {
+	_screen->loadEobBitmap("OUTTAKE", 5, 3);
+	_screen->copyRegion(0, 0, 0, 0, 176, 120, 0, 6, Screen::CR_NO_P_CHECK);
+
+	drawNpcScene(npcIndex);
+
+	Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
+	_screen->loadFileDataToPage(s, 5, 32000);
+	delete s;
+
+	gui_drawBox(0, 121, 320, 79, _color1_1, _color2_1, _bkgColor_1);
+	_txt->setupField(9, true);
+	_txt->resetPageBreakString();
+
+	runNpcDialogue(npcIndex);
+
+	_txt->removePageBreakFlag();
+	gui_restorePlayField();
+}
+
 void EobCoreEngine::initNpc(int npcIndex) {
 	EobCharacter *c = _characters;
 	int i = 0;
@@ -1005,7 +1029,7 @@ int EobCoreEngine::npcJoinDialogue(int npcIndex, int queryJoinTextId, int confir
 	gui_drawDialogueBox();
 	_txt->printDialogueText(queryJoinTextId, 0);
 
-	int r = runDialogue(-1, 0, _yesNoStrings[0], _yesNoStrings[1]) - 1;
+	int r = runDialogue(-1, 0, _yesNoStrings[0], _yesNoStrings[1], 0) - 1;
 	if (r == 0) {
 		if (confirmJoinTextId == -1) {
 			Common::String tmp = Common::String::format(_npcJoinStrings[0], _npcPreset[npcIndex].name);
@@ -1030,7 +1054,7 @@ int EobCoreEngine::prepareForNewPartyMember(int16 itemType, int16 itemValue) {
 		numChars += (_characters[i].flags & 1);
 
 	if (numChars < 6) {
-		deletePartyItem(itemType, itemValue);
+		deletePartyItems(itemType, itemValue);
 	} else {
 		gui_drawDialogueBox();
 		_txt->printDialogueText(_npcMaxStrings[0]);
@@ -1040,7 +1064,7 @@ int EobCoreEngine::prepareForNewPartyMember(int16 itemType, int16 itemValue) {
 		if (r == 6)
 			return 0;
 
-		deletePartyItem(itemType, itemValue);
+		deletePartyItems(itemType, itemValue);
 		removeCharacterFromParty(r);
 	}
 
@@ -1165,11 +1189,11 @@ void EobCoreEngine::setupDialogueButtons(int presetfirst, int numStr, const char
 
 	va_list args;
 	va_start(args, str1);
-	const char **s5p = va_arg(args, const char**);
+	const char **sp = va_arg(args, const char**);
 	va_end(args);
 	for (int i = 1; i < numStr; i++) {
-		if (s5p[i - 1])
-			_dialogueButtonString[i] = s5p[i - 1];
+		if (sp[i - 1])
+			_dialogueButtonString[i] = sp[i - 1];
 		else
 			_dialogueNumButtons = numStr = i;
 	}
@@ -1191,7 +1215,7 @@ void EobCoreEngine::setupDialogueButtons(int presetfirst, int numStr, const char
 }
 
 void EobCoreEngine::initDialogueSequence() {
-	_dlgUnk1 = -1;
+	_npcSequenceSub = -1;
 	_txt->setWaitButtonMode(0);
 	_dialogueField = true;
 
@@ -1435,6 +1459,47 @@ void EobCoreEngine::displayParchment(int id) {
 	restoreAfterDialogueSequence();
 }
 
+int EobCoreEngine::countResurrectionCandidates() {
+	_rrCount = 0;
+	memset(_rrNames, 0, 10 * sizeof(const char*));	
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 1))
+			continue;
+		if (_characters[i].hitPointsCur != -10)
+			continue;
+
+		_rrNames[_rrCount] = _characters[i].name;
+		_rrId[_rrCount++] = i;
+	}
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 1))
+			continue;
+
+		for (int ii = 0; ii < 27; ii++) {
+			uint16 inv = _characters[i].inventory[ii];
+			if (!inv)
+				continue;
+
+			if ((_flags.gameID == GI_EOB1 && ((_itemTypes[_items[inv].type].extraProperties & 0x7f) != 8)) || (_flags.gameID == GI_EOB2 && _items[inv].type != 33))
+				continue;
+
+			_rrNames[_rrCount] = _npcPreset[_items[inv].value - 1].name;
+			_rrId[_rrCount++] = -_items[inv].value;
+		}
+	}
+
+	if (_itemInHand > 0) {
+		if ((_flags.gameID == GI_EOB1 && ((_itemTypes[_items[_itemInHand].type].extraProperties & 0x7f) == 8)) || (_flags.gameID == GI_EOB2 && _items[_itemInHand].type == 33)) {
+			_rrNames[_rrCount] = _npcPreset[_items[_itemInHand].value - 1].name;
+			_rrId[_rrCount++] = -_items[_itemInHand].value;
+		}
+	}
+
+	return _rrCount;
+}
+
 void EobCoreEngine::useSlotWeapon(int charIndex, int slotIndex, Item item) {
 	EobCharacter *c = &_characters[charIndex];
 	int tp = item ? _items[item].type : 0;
@@ -1621,7 +1686,7 @@ int EobCoreEngine::calcCharacterDamage(int charIndex, int times, int itemOrPips,
 	EobCharacter *c = &_characters[charIndex];
 
 	if (a != 5) {
-		if (checkUnkConstModifiers(c, _charClassModUnk[c->cClass], c->level[0], a, c->raceSex))
+		if (checkMonsterLevelConstModifiers(c, _charClassModUnk[c->cClass], c->level[0], a, c->raceSex))
 			s = recalcDamageModifier(damageType, s);
 	}
 
@@ -1699,7 +1764,7 @@ bool EobCoreEngine::characterAttackHitTest(int charIndex, int monsterIndex, int
 
 	if (_flags.gameID == GI_EOB2) {
 		if ((p > 0 && p < 4) || !item ){
-			if (((_monsterProps[t].statusFlags & 0x200) && (d <= 0)) || ((_monsterProps[t].statusFlags & 0x1000) && (d <= 1)))
+			if (((_monsterProps[t].immunityFlags & 0x200) && (d <= 0)) || ((_monsterProps[t].immunityFlags & 0x1000) && (d <= 1)))
 				return false;
 		}
 	}
@@ -1877,7 +1942,7 @@ int EobCoreEngine::calcCloseDistanceMonsterDamage(EobMonsterInPlay *m, int times
 	EobMonsterProperty *p = &_monsterProps[m->type];
 
 	if (b == 5) {
-		if (checkUnkConstModifiers(m, 0, p->level, b, 6))
+		if (checkMonsterLevelConstModifiers(m, 0, p->level, b, 6))
 			s = recalcDamageModifier(damageType, s);
 	}
 
@@ -1886,10 +1951,12 @@ int EobCoreEngine::calcCloseDistanceMonsterDamage(EobMonsterInPlay *m, int times
 			s = 1;
 	}
 
-	if ((flags & 0x100) && ((_flags.gameID == GI_EOB2 && (p->statusFlags & 0x100)) || (_flags.gameID == GI_EOB1 && (p->capsFlags & 4))) && (!(_itemTypes[_items[pips].type].allowedClasses & 4 /* bug in original code ??*/)))
-		s >>= 1;
+	if ((flags & 0x100) && (!(_itemTypes[_items[pips].type].allowedClasses & 4 /* bug in original code ??*/)) &&
+		((_flags.gameID == GI_EOB2 && (p->immunityFlags & 0x100)) ||
+		(_flags.gameID == GI_EOB1 && (p->capsFlags & 4))))
+			s >>= 1;
 
-	if (p->statusFlags & 0x2000) {
+	if (p->immunityFlags & 0x2000) {
 		if (flags & 0x100) {
 			if (_items[pips].value < 3)
 				s >>= 2;
@@ -1913,7 +1980,7 @@ int EobCoreEngine::calcCloseDistanceMonsterDamage(EobMonsterInPlay *m, int times
 
 	static const uint16 damageImmunityFlags[] = { 0x01, 0x10, 0x02, 0x20, 0x80, 0x400, 0x20, 0x800, 0x40, 0x80, 0x400, 0x40 };
 	for (int i = 0; i < 12; i += 2) {
-		if ((flags & damageImmunityFlags[i]) && (p->statusFlags & damageImmunityFlags[i + 1]))
+		if ((flags & damageImmunityFlags[i]) && (p->immunityFlags & damageImmunityFlags[i + 1]))
 			s = 0;
 	}
 
@@ -1935,7 +2002,7 @@ int EobCoreEngine::calcDamageModifers(int charIndex, EobMonsterInPlay *m, int it
 	return (s < 0) ? 0 : s;
 }
 
-bool EobCoreEngine::checkUnkConstModifiers(void *target, int hpModifier, int level, int b, int race) {
+bool EobCoreEngine::checkMonsterLevelConstModifiers(void *target, int hpModifier, int level, int b, int race) {
 	static const int8 constMod[] = { 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5 };
 
 	if (b == 5)
@@ -1951,7 +2018,7 @@ bool EobCoreEngine::checkUnkConstModifiers(void *target, int hpModifier, int lev
 }
 
 bool EobCoreEngine::specialAttackConstTest(int charIndex, int b) {
-	return checkUnkConstModifiers(&_characters[charIndex], _charClassModUnk[_characters[charIndex].cClass], _characters[charIndex].level[0], b, _characters[charIndex].raceSex >> 1);
+	return checkMonsterLevelConstModifiers(&_characters[charIndex], _charClassModUnk[_characters[charIndex].cClass], _characters[charIndex].level[0], b, _characters[charIndex].raceSex >> 1);
 }
 
 int EobCoreEngine::getConstModifierTableValue(int hpModifier, int level, int b) {
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 6463f839c8..1c730f7687 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -158,7 +158,7 @@ struct SpriteDecoration {
 struct EobMonsterProperty {
 	int8 armorClass;
 	int8 hitChance;
-	uint8 level;
+	int8 level;
 	uint8 hpDcTimes;
 	uint8 hpDcPips;
 	uint8 hpDcBase;
@@ -168,7 +168,7 @@ struct EobMonsterProperty {
 		uint8 pips;
 		int8 base;
 	} dmgDc[3];
-	uint16 statusFlags;
+	uint16 immunityFlags;
 	uint32 capsFlags;
 	uint32 typeFlags;
 	int32 experience;
@@ -376,7 +376,9 @@ protected:
 	void modifyCharacterHitpoints(int character, int16 points);
 	void neutralizePoison(int character);
 
-	virtual void npcSequence(int npcIndex) = 0;
+	void npcSequence(int npcIndex);
+	virtual void drawNpcScene(int npcIndex) = 0;
+	virtual void runNpcDialogue(int npcIndex) = 0;
 	void initNpc(int npcIndex);
 	int npcJoinDialogue(int npcIndex, int queryJoinTextId, int confirmJoinTextId, int noJoinTextId);
 	int prepareForNewPartyMember(int16 itemType, int16 itemValue);
@@ -405,6 +407,7 @@ protected:
 	const uint8 *_constModExt;
 
 	const EobCharacter *_npcPreset;
+	int _npcSequenceSub;
 	bool _partyResting;
 	bool _loading;
 
@@ -412,11 +415,13 @@ protected:
 	void loadItemDefs();
 	Item duplicateItem(Item itemIndex);
 	void setItemPosition(Item *itemQueue, int block, Item item, int pos);
-	void createInventoryItem(EobCharacter *c, Item itemIndex, int itemValue, int preferedInventorySlot);
+	Item createItemOnCurrentBlock(Item itemIndex);
+	void createInventoryItem(EobCharacter *c, Item itemIndex, int16 itemValue, int preferedInventorySlot);
 	int deleteInventoryItem(int charIndex, int slot);
 	void deleteBlockItem(uint16 block, int type);
 	int validateInventorySlotForItem(Item item, int charIndex, int slot);
-	void deletePartyItem(Item itemType, int16 itemValue);
+	int stripPartyItems(int16 itemType, int16 itemValue, int handleValueMode, int numItems);
+	bool deletePartyItems(int16 itemType, int16 itemValue);
 	virtual void updateUsedCharacterHandItem(int charIndex, int slot) = 0;
 	int itemUsableByCharacter(int charIndex, Item item);
 	int countQueuedItems(Item itemQueue, int16 id, int16 type, int count, int includeFlyingItems);
@@ -622,6 +627,7 @@ protected:
 	// Script
 	void runLevelScript(int block, int flags);
 	void setScriptFlag(int flag);
+	void clearScriptFlag(int flag);
 	bool checkScriptFlag(int flag);
 
 	const uint8 *initScriptTimers(const uint8 *pos);
@@ -739,7 +745,6 @@ protected:
 	int runDialogue(int dialogueTextId, int style, const char *button1, ...);
 
 	char _dialogueLastBitmap[13];
-	int _dlgUnk1;
 	int _moveCounter;
 
 	uint8 _color4;
@@ -803,11 +808,12 @@ protected:
 	// misc
 	void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false);
 	void displayParchment(int id);
+	int countResurrectionCandidates();
+	virtual int resurrectionSelectDialogue() = 0;
 	virtual void useHorn(int charIndex, int weaponSlot) {}
 	virtual bool checkPartyStatusExtra() = 0;
 
 	virtual void drawLightningColumn() {}
-	virtual int resurrectionSelectDialogue() { return -1; }
 	virtual int charSelectDialogue() { return -1; }
 	virtual void characterLevelGain(int charIndex) {}
 
@@ -820,6 +826,10 @@ protected:
 
 	const char * const *_saveLoadStrings;
 
+	int _rrCount;
+	const char *_rrNames[10];
+	int8 _rrId[10];
+
 	Screen_Eob *_screen;
 	GUI_Eob *_gui;
 
@@ -846,7 +856,7 @@ protected:
 
 	int calcCloseDistanceMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int b, int damageType);
 	int calcDamageModifers(int charIndex, EobMonsterInPlay *m, int item, int itemType, int useStrModifier);
-	bool checkUnkConstModifiers(void *target, int hpModifier, int level, int b, int race);
+	bool checkMonsterLevelConstModifiers(void *target, int hpModifier, int level, int b, int race);
 	bool specialAttackConstTest(int charIndex, int b);
 	int getConstModifierTableValue(int hpModifier, int level, int b);
 	bool calcDamageCheckItemType(int itemType);
@@ -1045,6 +1055,7 @@ protected:
 	const char *const *_menuStringsDefeat;
 	const char *_errorSlotEmptyString;
 	const char *_errorSlotNoNameString;
+	const char *_menuOkString;
 
 	const char *const *_menuStringsTransfer;
 	const char *const *_menuStringsSpec;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index ce5f3ea53f..c495eb541f 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -385,7 +385,7 @@ void EobCoreEngine::gui_drawWeaponSlot(int charIndex, int slot) {
 
 	if (itm)
 		drawItemIconShape(_screen->_curPage, itm, x + 8, y);
-	else if (!slot && checkScriptFlag(0x8000))
+	else if (!slot && _flags.gameID == GI_EOB2 && checkScriptFlag(0x80000000))
 		_screen->drawShape(_screen->_curPage, _itemIconShapes[103], x + 8, y, 0);
 	else
 		_screen->drawShape(_screen->_curPage, _itemIconShapes[85], x + 8, y, 0);
@@ -2410,6 +2410,44 @@ bool GUI_Eob::confirmDialogue2(int dim, int id, int deflt) {
 	return newHighlight ? false : true;
 }
 
+void GUI_Eob::messageDialogue2(int dim, int id, int buttonTextCol) {
+	drawMenuButtonBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, false, false);
+
+	_screen->_curPage = 2;
+	_screen->setClearScreenDim(dim);
+	drawMenuButtonBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, false, false);
+	_screen->printShadedText(getMenuString(id), (_screen->_curDim->sx << 3) + 5, _screen->_curDim->sy + 5, 15, 0);	
+	_screen->_curPage = 0;
+	_screen->copyRegion(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, 2, 0, Screen::CR_NO_P_CHECK);
+
+	int x = (_screen->_curDim->sx << 3) + (_screen->_curDim->w << 2) - (strlen(_vm->_menuOkString) << 2);
+	int y = _screen->_curDim->sy + _screen->_curDim->h - 21;
+	int w = (strlen(_vm->_menuOkString) << 3) + 8;
+	drawMenuButtonBox(x, y, w, 14, false, false);
+	_screen->printShadedText(_vm->_menuOkString, x + 4, y + 3, buttonTextCol, 0);
+	_screen->updateScreen();
+
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
+		_vm->removeInputTop();
+
+		if (inputFlag == 199 || inputFlag == 201) {
+			if (_vm->posWithinRect(_vm->_mouseX, _vm->_mouseY, x, y, x + w, y + 14))
+				runLoop = false;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inputFlag == _vm->_keyMap[Common::KEYCODE_o]) {
+			runLoop = false;
+		}
+	}
+
+	_vm->gui_drawBox(x, y, w, 14, _vm->_color2_1, _vm->_bkgColor_1, -1);
+	_screen->updateScreen();
+	_vm->_system->delayMillis(80);
+	drawMenuButtonBox(x, y, w, 14, false, false);
+	_screen->printShadedText(_vm->_menuOkString, x + 4, y + 3, buttonTextCol, 0);
+	_screen->updateScreen();
+
+}
+
 void GUI_Eob::updateBoxFrameHighLight(int box) {
 	static const uint8 colorTable[] = { 0x0F, 0xB0, 0xB2, 0xB4, 0xB6,
 		0xB8, 0xBA, 0xBC, 0x0C, 0xBC, 0xBA, 0xB8, 0xB6, 0xB4, 0xB2, 0xB0, 0x00
@@ -3375,11 +3413,12 @@ bool GUI_Eob::restParty() {
 	_screen->setScreenDim(4);
 	_screen->setFont(Screen::FID_8_FNT);
 
-	if (!injured && !res)
-		displayTextBox(43);
-
-	if (res && hours > 4)
-		_vm->restParty_npc();
+	if (!res) {
+		if (!injured)
+			displayTextBox(43);
+		if (hours > 4)
+			_vm->restParty_npc();
+	}
 
 	return res;
 }
@@ -3447,8 +3486,6 @@ bool GUI_Eob::confirmDialogue(int id) {
 }
 
 void GUI_Eob::messageDialogue(int dim, int id, int buttonTextCol) {
-	static const char buttonText[] = "OK";
-
 	int od = _screen->curDimIndex();
 	_screen->setScreenDim(dim);
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
@@ -3456,12 +3493,12 @@ void GUI_Eob::messageDialogue(int dim, int id, int buttonTextCol) {
 	drawTextBox(dim, id);
 	const ScreenDim *dm = _screen->getScreenDim(dim);
 	
-	int bx = ((dm->sx + dm->w) << 3) - ((strlen(buttonText) << 3) + 16);
+	int bx = ((dm->sx + dm->w) << 3) - ((strlen(_vm->_menuOkString) << 3) + 16);
 	int by = dm->sy + dm->h - 19;
-	int bw = (strlen(buttonText) << 3) + 7;
+	int bw = (strlen(_vm->_menuOkString) << 3) + 7;
 
 	drawMenuButtonBox(bx, by, bw, 14, false, false);
-	_screen->printShadedText(buttonText, bx + 4, by + 3, buttonTextCol, 0);
+	_screen->printShadedText(_vm->_menuOkString, bx + 4, by + 3, buttonTextCol, 0);
 	_screen->updateScreen();
 
 	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
@@ -3469,9 +3506,8 @@ void GUI_Eob::messageDialogue(int dim, int id, int buttonTextCol) {
 		_vm->removeInputTop();
 
 		if (inputFlag == 199 || inputFlag == 201) {
-			Common::Point p = _vm->getMousePos();
-				if (_vm->posWithinRect(p.x, p.y, bx, by, bx + bw, by + 14))
-					runLoop = false;
+			if (_vm->posWithinRect(_vm->_mouseX, _vm->_mouseY, bx, by, bx + bw, by + 14))
+				runLoop = false;
 		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inputFlag == _vm->_keyMap[Common::KEYCODE_o]) {
 			runLoop = false;
 		}
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index 709c676517..af3d3d2e48 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -63,6 +63,8 @@ public:
 	bool runLoadMenu(int x, int y);
 
 	bool confirmDialogue2(int dim, int id, int deflt);
+	void messageDialogue2(int dim, int id, int buttonTextCol);
+
 	void updateBoxFrameHighLight(int box);
 
 	int getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor);
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index de5fe6b32a..78d3f8b8aa 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -103,6 +103,12 @@ Kyra::Item EobCoreEngine::duplicateItem(Item itemIndex) {
 	return i;
 }
 
+Item EobCoreEngine::createItemOnCurrentBlock(Item itemIndex) {
+	Item itm = duplicateItem(itemIndex);
+	setItemPosition((Item*)&_levelBlockProperties[_currentBlock].drawObjects, _currentBlock, itm, _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
+	return itm;
+}
+
 void EobCoreEngine::setItemPosition(Item *itemQueue, int block, Item item, int pos) {
 	if (!item)
 		return;
@@ -123,7 +129,7 @@ void EobCoreEngine::setItemPosition(Item *itemQueue, int block, Item item, int p
 	}
 }
 
-void EobCoreEngine::createInventoryItem(EobCharacter *c, Item itemIndex, int itemValue, int preferedInventorySlot) {
+void EobCoreEngine::createInventoryItem(EobCharacter *c, Item itemIndex, int16 itemValue, int preferedInventorySlot) {
 	if (itemIndex <= 0)
 		return;
 
@@ -214,7 +220,35 @@ int EobCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int sl
 	return 0;
 }
 
-void EobCoreEngine::deletePartyItem(Item itemType, int16 itemValue) {
+int EobCoreEngine::stripPartyItems(int16 itemType, int16 itemValue, int handleValueMode, int numItems) {
+	int itemsLeft = numItems;
+	
+	for (bool runloop = true; runloop && itemsLeft; ) {
+		runloop = false;
+		for (int i = 0; i < 6 && itemsLeft; i++) {
+			if (!testCharacter(i, 1))
+				continue;
+			
+			for (int ii = 0; ii < 27 && itemsLeft; ii++) {
+				if (ii == 16)
+					continue;
+
+				Item itm = _characters[i].inventory[ii];
+				if ((_items[itm].type == itemType) && ((handleValueMode == -1 && _items[itm].value <= itemValue) || (handleValueMode == 0 && _items[itm].value == itemValue) || (handleValueMode == 1 && _items[itm].value >= itemValue))) {
+					_characters[i].inventory[ii] = 0;
+					_items[itm].block = -1;
+					itemsLeft--;
+					runloop = true;
+				}
+			}
+		}
+	}
+
+	return numItems - itemsLeft;
+}
+
+bool EobCoreEngine::deletePartyItems(int16 itemType, int16 itemValue) {
+	bool res = false;
 	for (int i = 0; i < 6; i++) {
 		if (!testCharacter(i, 1))
 			continue;
@@ -228,13 +262,26 @@ void EobCoreEngine::deletePartyItem(Item itemType, int16 itemValue) {
 		int itm = c->inventory[slot];
 		_items[itm].block = -1;
 		c->inventory[slot] = 0;
+		res = true;
 
-		if (_currentControlMode == 0 && slot < 2 && i < 5)
-			gui_drawWeaponSlot(i, slot);
+		if (!_dialogueField) {
+			if (_currentControlMode == 0 && slot < 2 && i < 5)
+				gui_drawWeaponSlot(i, slot);
 
-		if (_currentControlMode == 1 && i == _updateCharNum)
-			gui_drawInventoryItem(slot, 1, 0);
+			if (_currentControlMode == 1 && i == _updateCharNum)
+				gui_drawInventoryItem(slot, 1, 0);
+		}
 	}
+
+	if (_itemInHand > 0) {
+		if ((itemType == -1 || itemType == _items[_itemInHand].type) && (itemValue == -1 || itemValue == _items[_itemInHand].value)) {
+			_items[_itemInHand].block = -1;
+			setHandItem(0);
+			res = true;
+		}
+	}
+
+	return res;
 }
 
 int EobCoreEngine::itemUsableByCharacter(int charIndex, Item item) {
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 7a4a3ec3e2..4fc78c0b64 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -376,11 +376,14 @@ Common::Error LoLEngine::init() {
 	assert(_gui);
 	_gui->initStaticData();
 
-	_txt = new TextDisplayer_LoL(this, _screen);
 	_dialogueButtonLabelCol1 = 144;
 	_dialogueButtonLabelCol2 = 254;
 	_dialogueButtonW = 74;
 	_dialogueButtonH = 9;
+	_waitButtonReverveW = 80;
+
+	_txt = new TextDisplayer_LoL(this, _screen);
+
 	_bkgColor_1 = -1;
 	_color1_1 = 136;
 	_color2_1 = 251;
diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
index 47a261be6f..2ffae915b1 100644
--- a/engines/kyra/loleobbase.cpp
+++ b/engines/kyra/loleobbase.cpp
@@ -103,10 +103,14 @@ LolEobBaseEngine::LolEobBaseEngine(OSystem *system, const GameFlags &flags) : Ky
 	_dialogueNumButtons = _dialogueButtonYoffs = _dialogueHighlightedButton = 0;
 	_currentControlMode = 0;
 	_specialSceneFlag = 0;
-	_dialogueButtonLabelCol1 = 9;
-	_dialogueButtonLabelCol2 = 15;
-	_dialogueButtonW = 95;
-	_dialogueButtonH = 9;
+	_dialogueButtonLabelCol1 = 0;
+	_dialogueButtonLabelCol2 = 0;
+	_dialogueButtonW = 0;
+	_dialogueButtonH = 0;
+	_waitButtonPresX = 0;
+	_waitButtonPresY = 0;
+	_waitButtonPresW = 0;
+	_waitButtonReverveW = 0;
 
 	_updateCharNum = -1;
 	_activeVoiceFileTotalTime = 0;
diff --git a/engines/kyra/loleobbase.h b/engines/kyra/loleobbase.h
index a2c13827fc..ba59fe796b 100644
--- a/engines/kyra/loleobbase.h
+++ b/engines/kyra/loleobbase.h
@@ -281,6 +281,10 @@ protected:
 	int16 _dialogueButtonYoffs;
 	uint16 _dialogueButtonW;
 	uint16 _dialogueButtonH;
+	const uint16 *_waitButtonPresX;
+	const uint8 *_waitButtonPresY;
+	const uint16 *_waitButtonPresW;
+	int _waitButtonReverveW;
 	int _dialogueNumButtons;
 	int _dialogueHighlightedButton;
 	int _currentControlMode;
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index f828625dbb..70e4892342 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -555,11 +555,11 @@ bool EobCoreEngine::magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int d
 bool EobCoreEngine::magicObjectStatusHit(EobMonsterInPlay *m, int type, bool tryEvade, int mod) {
 	EobMonsterProperty *p = &_monsterProps[m->type];
 	if (tryEvade) {
-		if (tryMonsterAttackEvasion(m) || (p->capsFlags & 0x10))
+		if (tryMonsterAttackEvasion(m) || (p->immunityFlags & 0x10))
 			return true;
 	}
 
-	if (checkUnkConstModifiers(m, 0, p->level, mod, 6))
+	if (checkMonsterLevelConstModifiers(m, 0, p->level, mod, 6))
 		return false;
 	
 	int para = 0;
@@ -569,7 +569,7 @@ bool EobCoreEngine::magicObjectStatusHit(EobMonsterInPlay *m, int type, bool try
 	case 1:
 	case 2:
 		para = (type == 0) ? ((p->typeFlags & 1) ? 1 : 0) : ((type == 1) ? ((p->typeFlags & 2) ? 1 : 0) : 1);
-		if (para && !(p->statusFlags & 2)) {
+		if (para && !(p->immunityFlags & 2)) {
 			m->mode = 10;
 			m->spellStatusLeft = 15;
 		}
@@ -577,7 +577,7 @@ bool EobCoreEngine::magicObjectStatusHit(EobMonsterInPlay *m, int type, bool try
 		break;
 
 	case 3:
-		if (!(p->statusFlags & 8))
+		if (!(p->immunityFlags & 8))
 			inflictMonsterDamage(m, 1000, true);
 		break;
 
@@ -591,12 +591,11 @@ bool EobCoreEngine::magicObjectStatusHit(EobMonsterInPlay *m, int type, bool try
 		break;
 
 	case 6:
-		if (!(p->statusFlags & 4) && m->mode != 7 && m->mode != 8 && m->mode != 10) {
+		if (!(_flags.gameID == GI_EOB1 && !(p->typeFlags & 3)) && !(p->immunityFlags & 4) && m->mode != 7 && m->mode != 8 && m->mode != 10) {
 			m->mode = 0;
 			m->spellStatusLeft = 20;
-			para = (getNextMonsterDirection(m->block, _currentBlock) ^ 4) >> 1;
 			m->flags |= 8;
-			walkMonsterNextStep(m, -1, para);
+			walkMonsterNextStep(m, -1, (getNextMonsterDirection(m->block, _currentBlock) ^ 4) >> 1);
 		}
 		break;
 
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 5328aeff35..55946e5b7f 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -484,6 +484,22 @@ enum KyraResources {
 
 	kEob1TurnUndeadString,
 
+	kEob1NpcShpData,
+	kEob1NpcSubShpIndex1,
+	kEob1NpcSubShpIndex2,
+	kEob1NpcSubShpY,
+	kEob1Npc0Strings,
+	kEob1Npc11Strings,
+	kEob1Npc12Strings,
+	kEob1Npc21Strings,
+	kEob1Npc22Strings,
+	kEob1Npc31Strings,
+	kEob1Npc32Strings,
+	kEob1Npc4Strings,
+	kEob1Npc5Strings,
+	kEob1Npc6Strings,
+	kEob1Npc7Strings,
+
 	kEob2MainMenuStrings,
 	kEob2IntroStrings,
 	kEob2IntroCPSFiles,
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index 833413c69b..1e113fb2ae 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -40,8 +40,12 @@ void EobCoreEngine::setScriptFlag(int flag) {
 	_inf->setFlag(flag);
 }
 
+void EobCoreEngine::clearScriptFlag(int flag) {
+	_inf->clearFlag(flag);
+}
+
 bool EobCoreEngine::checkScriptFlag(int flag) {
-	return _inf->checkFlag(0x8000);
+	return _inf->checkFlag(flag);
 }
 
 const uint8 *EobCoreEngine::initScriptTimers(const uint8 *pos) {
@@ -188,6 +192,22 @@ void EobInfProcessor::run(int func, int sub) {
 	} while (!_abortScript && !_abortAfterSubroutine);
 }
 
+void EobInfProcessor::setFlag(int flag) {
+	_flagTable[17] |= flag;
+}
+
+void EobInfProcessor::clearFlag(int flag) {
+	_flagTable[17] &= ~flag;
+}
+
+bool EobInfProcessor::checkFlag(int flag) const {
+	return (_flagTable[17] & flag) ? true : false;
+}
+
+bool EobInfProcessor::preventRest() const {
+	return _preventRest ? true : false;
+}
+
 void EobInfProcessor::loadState(Common::SeekableSubReadStreamEndian &in) {
 	_preventRest = in.readByte();
 	for (int i = 0; i < 18; i++)
@@ -469,11 +489,11 @@ int EobInfProcessor::oeob_moveInventoryItemToBlock(int8 *data) {
 }
 
 int EobInfProcessor::oeob_printMessage_v1(int8 *data) {
-	static const char ColorConfig[] = { 6, 33, 2, 33, 0 };
+	static const char colorConfig[] = "\x6\x21\x2\x21";
 	char col[5];
 	int8 *pos = data;
 
-	strcpy(col, ColorConfig);
+	strcpy(col, colorConfig);
 	const char *str = (const char*) pos;
 	pos += (strlen(str) + 1);
 
@@ -720,7 +740,7 @@ int EobInfProcessor::oeob_eval_v1(int8 *data) {
 			for (i = 0; i < 6; i++) {
 				if (!(_vm->_characters[i].flags & 1))
 					continue;
-				if ((_vm->_characters[a].raceSex >> 1) == cmd) {
+				if ((_vm->_characters[i].raceSex >> 1) == cmd) {
 					b = 1;
 					break;
 				}
@@ -1371,7 +1391,7 @@ int EobInfProcessor::oeob_identifyItems(int8 *data) {
 
 int EobInfProcessor::oeob_sequence(int8 *data) {
 	int8 *pos = data;
-	_vm->_dlgUnk1 = -1;
+	_vm->_npcSequenceSub = -1;
 	_vm->txt()->setWaitButtonMode(0);
 	_vm->gui_updateControls();
 	_vm->drawScene(1);
@@ -1402,7 +1422,6 @@ int EobInfProcessor::oeob_sequence(int8 *data) {
 
 	case -1:
 		// copy protection
-		error("EobInfProcessor::oeob_sequence(): unimplemented cmd -1");
 		break;
 
 	default:
@@ -1508,8 +1527,8 @@ int EobInfProcessor::oeob_specialEvent(int8 *data) {
 			break;
 
 		case 5:
-			_vm->deletePartyItem(46, 5);
-			_vm->deletePartyItem(46, 6);
+			_vm->deletePartyItems(46, 5);
+			_vm->deletePartyItems(46, 6);
 			break;
 
 		case 6:
diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h
index 322322ae1f..71e53bc802 100644
--- a/engines/kyra/script_eob.h
+++ b/engines/kyra/script_eob.h
@@ -42,9 +42,10 @@ public:
 	void loadData(const uint8 *data, uint32 dataSize);
 	void run(int func, int sub);
 
-	void setFlag(int flag) { _flagTable[17] |= flag; }
-	bool checkFlag(int flag) const { return (_flagTable[17] & flag) ? true : false; }
-	bool preventRest() const { return _preventRest ? true : false; }
+	void setFlag(int flag);
+	void clearFlag(int flag);
+	bool checkFlag(int flag) const;
+	bool preventRest() const;
 
 	void loadState(Common::SeekableSubReadStreamEndian &in);
 	void saveState(Common::OutSaveFile *out);
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 0874de82e3..97ee51bd22 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -83,7 +83,7 @@ const uint8 *EobCoreEngine::loadMonsterProperties(const uint8 *data) {
 		EobMonsterProperty *d = &_monsterProps[cmd];
 		d->armorClass = (int8)*data++;
 		d->hitChance = (int8)*data++;
-		d->level = *data++;
+		d->level = (int8)*data++;
 		d->hpDcTimes = *data++;
 		d->hpDcPips = *data++;
 		d->hpDcBase = *data++;
@@ -97,7 +97,7 @@ const uint8 *EobCoreEngine::loadMonsterProperties(const uint8 *data) {
 		d->dmgDc[2].times = *data++;
 		d->dmgDc[2].pips = *data++;
 		d->dmgDc[3].base = (int8)*data++;
-		d->statusFlags = READ_LE_UINT16(data);
+		d->immunityFlags = READ_LE_UINT16(data);
 		data += 2;
 		d->capsFlags = READ_LE_UINT16(data);
 		data += 2;
@@ -185,7 +185,7 @@ void EobCoreEngine::initMonster(int index, int unit, uint16 block, int pos, int
 	m->spellStatusLeft = i;
 	m->dir = dir;
 	m->palette = _flags.gameID == GI_EOB2 ? (index % 3) : 0;
-	m->hitPointsCur = m->hitPointsMax = _flags.gameID == GI_EOB2 ? rollDice(p->hpDcTimes, p->hpDcPips, p->hpDcBase) : (p->hpDcTimes == 255 ? rollDice(1, 4, 0) : rollDice(p->hpDcTimes, 8, 0));
+	m->hitPointsCur = m->hitPointsMax = _flags.gameID == GI_EOB2 ? rollDice(p->hpDcTimes, p->hpDcPips, p->hpDcBase) : (p->level == -1 ? rollDice(1, 4, 0) : rollDice(p->level, 8, 0));
 	m->randItem = randItem;
 	m->fixedItem = fixedItem;
 	m->sub = _currentSub;
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 1cf78eef5c..ea943f32d4 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -151,7 +151,7 @@ bool StaticResource::loadEobNpcData(Common::SeekableReadStream &stream, void *&p
 		s->raceSex = stream.readByte();
 		s->cClass = stream.readByte();
 		s->alignment = stream.readByte();
-		s->portrait = stream.readByte();
+		s->portrait = stream.readSByte();
 		s->food = stream.readByte();
 		stream.read(s->level, 3);
 		s->experience[0] = stream.readUint32BE();
@@ -159,7 +159,7 @@ bool StaticResource::loadEobNpcData(Common::SeekableReadStream &stream, void *&p
 		s->experience[2] = stream.readUint32BE();
 		s->mageSpellsAvailableFlags = stream.readUint32BE();
 		for (int ii = 0; ii < 27; ii++)
-			s->inventory[i] = stream.readUint16BE();
+			s->inventory[ii] = stream.readSint16BE();
 	}
 
 	ptr = e;
@@ -555,6 +555,7 @@ void EobCoreEngine::initStaticResource() {
 	_saveLoadStrings = saveLoadStrings[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
 	_errorSlotEmptyString = errorSlotEmptyString[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
 	_errorSlotNoNameString = errorSlotNoNameString[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
+	_menuOkString = "OK";
 }
 
 void EobCoreEngine::initButtonData() {
@@ -1068,6 +1069,22 @@ void EobEngine::initStaticResource() {
 
 	_turnUndeadString = _staticres->loadStrings(kEob1TurnUndeadString, temp);
 
+	_npcShpData = _staticres->loadRawData(kEob1NpcShpData, temp);
+	_npcSubShpIndex1 = _staticres->loadRawData(kEob1NpcSubShpIndex1, temp);
+	_npcSubShpIndex2 = _staticres->loadRawData(kEob1NpcSubShpIndex2, temp);
+	_npcSubShpY = _staticres->loadRawData(kEob1NpcSubShpY, temp);
+	_npc0Strings = _staticres->loadStrings(kEob1Npc0Strings, temp);
+	_npc11Strings = _staticres->loadStrings(kEob1Npc11Strings, temp);
+	_npc12Strings = _staticres->loadStrings(kEob1Npc12Strings, temp);
+	_npc21Strings = _staticres->loadStrings(kEob1Npc21Strings, temp);
+	_npc22Strings = _staticres->loadStrings(kEob1Npc22Strings, temp);
+	_npc31Strings = _staticres->loadStrings(kEob1Npc31Strings, temp);
+	_npc32Strings = _staticres->loadStrings(kEob1Npc32Strings, temp);
+	_npc4Strings = _staticres->loadStrings(kEob1Npc4Strings, temp);
+	_npc5Strings = _staticres->loadStrings(kEob1Npc5Strings, temp);
+	_npc6Strings = _staticres->loadStrings(kEob1Npc6Strings, temp);
+	_npc7Strings = _staticres->loadStrings(kEob1Npc7Strings, temp);
+
 	const uint8 *ps = _staticres->loadRawData(kEob1MonsterProperties, temp);
 	temp /= 27;
 	_monsterProps = new EobMonsterProperty[temp];
@@ -1077,7 +1094,7 @@ void EobEngine::initStaticResource() {
 		EobMonsterProperty *p = &_monsterProps[i];
 		p->armorClass = (int8)*ps++;
 		p->hitChance = (int8)*ps++;
-		p->hpDcTimes = *ps++;
+		p->level = (int8)*ps++;
 		p->attacksPerRound = *ps++;
 		p->dmgDc[0].times = *ps++;
 		p->dmgDc[0].pips = *ps++;
diff --git a/engines/kyra/text_eob.cpp b/engines/kyra/text_eob.cpp
index 63d893d2cc..80858d1743 100644
--- a/engines/kyra/text_eob.cpp
+++ b/engines/kyra/text_eob.cpp
@@ -29,14 +29,16 @@
 
 #include "common/system.h"
 
+#define EOBTEXTBUFFERSIZE 2048
+
 namespace Kyra {
 
 TextDisplayer_Eob::TextDisplayer_Eob(LolEobBaseEngine *engine, Screen *sScreen) : _vm(engine), _screen(sScreen),
 	_lineCount(0), _printFlag(false), _lineWidth(0), _numCharsTotal(0), _allowPageBreak(true),
 	_numCharsLeft(0), _numCharsPrinted(0), _sjisLineBreakFlag(false), _waitButtonMode(1) {
 
-	_dialogueBuffer = new char[1024];
-	memset(_dialogueBuffer, 0, 1024);
+	_dialogueBuffer = new char[EOBTEXTBUFFERSIZE];
+	memset(_dialogueBuffer, 0, EOBTEXTBUFFERSIZE);
 
 	_currentLine = new char[85];
 	memset(_currentLine, 0, 85);
@@ -313,13 +315,13 @@ void TextDisplayer_Eob::printLine(char *str) {
 		if ((lw + _textDimData[sdx].column) > w) {
 			if ((lines - 1 - (_waitButtonSpace << 1)) <= _lineCount)
 				// cut off line to leave space for "MORE" button
-				w -= 80;
+				w -= vm()->_waitButtonReverveW;
 		} else {
 			if (!_sjisLineBreakFlag || (_lineCount + 1 < lines - 1))
 				ct = false;
 			else
 				// cut off line to leave space for "MORE" button
-				w -= 80;
+				w -= vm()->_waitButtonReverveW;
 		}
 
 		if (ct) {
@@ -341,7 +343,7 @@ void TextDisplayer_Eob::printLine(char *str) {
 		if ((lw + _textDimData[sdx].column) > w) {
 			if ((lines - 1) <= _lineCount && _allowPageBreak)
 				// cut off line to leave space for "MORE" button
-				w -= (10 * (_screen->getFontWidth() + _screen->_charWidth));
+				w -= vm()->_waitButtonReverveW;
 
 			w -= _textDimData[sdx].column;
 
@@ -439,7 +441,10 @@ void TextDisplayer_Eob::printLine(char *str) {
 }
 
 void TextDisplayer_Eob::printDialogueText(int stringId, const char *pageBreakString) {
-	strcpy(_dialogueBuffer, (const char *)(screen()->getCPagePtr(5) + READ_LE_UINT16(&screen()->getCPagePtr(5)[(stringId - 1) << 1])));
+	const char * str = (const char *)(screen()->getCPagePtr(5) + READ_LE_UINT16(&screen()->getCPagePtr(5)[(stringId - 1) << 1]));
+	assert (strlen(str) < EOBTEXTBUFFERSIZE);
+	Common::strlcpy(_dialogueBuffer, str, EOBTEXTBUFFERSIZE);
+	
 	displayText(_dialogueBuffer);
 
 	if (pageBreakString) {
@@ -452,6 +457,9 @@ void TextDisplayer_Eob::printDialogueText(int stringId, const char *pageBreakStr
 }
 
 void TextDisplayer_Eob::printDialogueText(const char *str, bool wait) {
+	assert (strlen(str) < EOBTEXTBUFFERSIZE);
+	Common::strlcpy(_dialogueBuffer, str, EOBTEXTBUFFERSIZE);
+
 	strcpy(_dialogueBuffer, str);
 	displayText(_dialogueBuffer);
 	if (wait)
@@ -471,7 +479,8 @@ void TextDisplayer_Eob::printMessage(const char *str, int textColor, ...) {
 
 	displayText(_dialogueBuffer);
 
-	_textDimData[screen()->curDimIndex()].color1 = tc;
+	if (vm()->game() != GI_EOB1)
+		_textDimData[screen()->curDimIndex()].color1 = tc;
 
 	if (!screen()->_curPage)
 		screen()->updateScreen();
@@ -505,7 +514,8 @@ void TextDisplayer_Eob::textPageBreak() {
 	int cp = _screen->setCurPage(0);
 	Screen::FontId cf = screen()->setFont(vm()->gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
 
-	vm()->_timer->pauseSingleTimer(11, true);
+	if (vm()->game() == GI_LOL)
+		vm()->_timer->pauseSingleTimer(11, true);
 
 	vm()->_fadeText = false;
 	int resetPortraitAfterSpeechAnim = 0;
@@ -527,27 +537,31 @@ void TextDisplayer_Eob::textPageBreak() {
 
 	int x = ((dim->sx + dim->w) << 3) - (_vm->_dialogueButtonW + 3);
 	int y = 0;
+	int w = vm()->_dialogueButtonW;
 
-	if (vm()->_needSceneRestore && (vm()->_updateFlags & 2)) {
-		if (vm()->_currentControlMode || !(vm()->_updateFlags & 2)) {
-			y = dim->sy + dim->h - 5;
+	if (vm()->game() == GI_LOL) {
+		if (vm()->_needSceneRestore && (vm()->_updateFlags & 2)) {
+			if (vm()->_currentControlMode || !(vm()->_updateFlags & 2)) {
+				y = dim->sy + dim->h - 5;
+			} else {
+				x += 6;
+				y = dim->sy + dim->h - 2;
+			}
 		} else {
-			x += 6;
-			y = dim->sy + dim->h - 2;
+			y = dim->sy + dim->h - 10;
 		}
-	} else if (vm()->game() == GI_LOL) {
-		y = dim->sy + dim->h - 10;
 	} else {
-		y = _waitButtonMode ? 162 : 189;
-		x = _waitButtonMode ? 76 : 221;
+		y = vm()->_waitButtonPresY[_waitButtonMode];
+		x = vm()->_waitButtonPresX[_waitButtonMode];
+		w = vm()->_waitButtonPresW[_waitButtonMode];
 	}
 
 	if (vm()->gameFlags().use16ColorMode) {
 		vm()->gui_drawBox(x + 8, (y & ~7) - 1, 66, 10, 0xee, 0xcc, -1);
 		screen()->printText(_pageBreakString, (x + 37 - (strlen(_pageBreakString) << 1) + 4) & ~3, (y + 2) & ~7, 0xc1, 0);
 	} else {
-		vm()->gui_drawBox(x, y, vm()->_dialogueButtonW, vm()->_dialogueButtonH, vm()->_color1_1, vm()->_color2_1, vm()->_bkgColor_1);
-		screen()->printText(_pageBreakString, x + (vm()->_dialogueButtonW >> 1) - (vm()->screen()->getTextWidth(_pageBreakString) >> 1), y + 2, vm()->_dialogueButtonLabelCol1, 0);
+		vm()->gui_drawBox(x, y, w, vm()->_dialogueButtonH, vm()->_color1_1, vm()->_color2_1, vm()->_bkgColor_1);
+		screen()->printText(_pageBreakString, x + (w >> 1) - (vm()->screen()->getTextWidth(_pageBreakString) >> 1), y + 2, vm()->_dialogueButtonLabelCol1, 0);
 	}
 
 	vm()->removeInputTop();
@@ -579,7 +593,7 @@ void TextDisplayer_Eob::textPageBreak() {
 		if (inputFlag == vm()->_keyMap[Common::KEYCODE_SPACE] || inputFlag == vm()->_keyMap[Common::KEYCODE_RETURN]) {
 			loop = false;
 		} else if (inputFlag == 199 || inputFlag == 201) {
-			if (vm()->posWithinRect(vm()->_mouseX, vm()->_mouseY, x, y, x + _vm->_dialogueButtonW, y + 9)) {
+			if (vm()->posWithinRect(vm()->_mouseX, vm()->_mouseY, x, y, x + w, y + 9)) {
 				if (_vm->game() == GI_LOL)
 					target = true;
 				else
@@ -594,11 +608,12 @@ void TextDisplayer_Eob::textPageBreak() {
 	if (vm()->gameFlags().use16ColorMode)
 		screen()->fillRect(x + 8, y, x + 57, y + 9, _textDimData[screen()->curDimIndex()].color2);
 	else
-		screen()->fillRect(x, y, x + 73, y + 8, _textDimData[screen()->curDimIndex()].color2);
+		screen()->fillRect(x, y, x + w - 1, y + 8, _textDimData[screen()->curDimIndex()].color2);
 
 	clearCurDim();
 
-	vm()->_timer->pauseSingleTimer(11, false);
+	if (vm()->game() == GI_LOL)
+		vm()->_timer->pauseSingleTimer(11, false);
 
 	if (vm()->_updateCharNum != -1) {
 		vm()->_resetPortraitAfterSpeechAnim = resetPortraitAfterSpeechAnim;
@@ -626,11 +641,9 @@ void TextDisplayer_Eob::displayWaitButton() {
 	vm()->_dialogueButtonString[2] = 0;
 	vm()->_dialogueHighlightedButton = 0;
 
-	static const uint16 posX[] = { 221, 76 };
-	static const uint8 posY[] = { 189, 162 };
-
-	vm()->_dialogueButtonPosX = &posX[_waitButtonMode];
-	vm()->_dialogueButtonPosY = &posY[_waitButtonMode];
+	vm()->_dialogueButtonPosX = &vm()->_waitButtonPresX[_waitButtonMode];
+	vm()->_dialogueButtonPosY = &vm()->_waitButtonPresY[_waitButtonMode];
+	vm()->_dialogueButtonW = vm()->_waitButtonPresW[_waitButtonMode];
 	vm()->_dialogueButtonYoffs = 0;
 
 	SWAP(_vm->_dialogueButtonLabelCol1, _vm->_dialogueButtonLabelCol2);
@@ -640,7 +653,10 @@ void TextDisplayer_Eob::displayWaitButton() {
 		vm()->removeInputTop();
 
 	while (!vm()->processDialogue() && !vm()->shouldQuit()) {}
+	
+	vm()->_dialogueButtonW = 95;
 	SWAP(_vm->_dialogueButtonLabelCol1, _vm->_dialogueButtonLabelCol2);
+	clearCurDim();
 }
 
 } // End of namespace Kyra
-- 
cgit v1.2.3


From aab9e62247af1c22772bb79821675fbab06c047d Mon Sep 17 00:00:00 2001
From: athrxx
Date: Wed, 3 Aug 2011 00:40:21 +0200
Subject: KYRA: (EOB) - some more sequence code and bug fixes

---
 engines/kyra/eobcommon.cpp     | 36 +++++++++++++++++++++++++++++++++++-
 engines/kyra/eobcommon.h       | 18 ++++++++++++++----
 engines/kyra/gui_eob.cpp       |  8 +++++---
 engines/kyra/items_eob.cpp     |  4 +++-
 engines/kyra/magic_eob.cpp     |  3 ++-
 engines/kyra/resource.h        |  5 +++++
 engines/kyra/script_eob.cpp    |  5 ++---
 engines/kyra/sprites_eob.cpp   |  8 ++++----
 engines/kyra/staticres_eob.cpp | 10 +++++++---
 9 files changed, 77 insertions(+), 20 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index eef3873285..f323dd4e17 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -1500,6 +1500,40 @@ int EobCoreEngine::countResurrectionCandidates() {
 	return _rrCount;
 }
 
+void EobCoreEngine::seq_portal() {
+	//_portalSeq
+}
+
+bool EobCoreEngine::checkPassword() {
+	char answ[20];
+	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
+	_screen->copyPage(0, 10);
+	
+	_screen->setScreenDim(13);
+	gui_drawBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, _color1_1, _color2_1, -1);
+	gui_drawBox((_screen->_curDim->sx << 3) + 1, _screen->_curDim->sy + 1, (_screen->_curDim->w << 3) - 2, _screen->_curDim->h - 2, _color1_1, _color2_1, _bkgColor_1);
+	_screen->modifyScreenDim(13, _screen->_curDim->sx + 1, _screen->_curDim->sy + 2, _screen->_curDim->w - 2, _screen->_curDim->h - 16);
+	
+	for (int i = 0; i < 3; i++) {
+		_screen->fillRect(_screen->_curDim->sx << 3, _screen->_curDim->sy, ((_screen->_curDim->sx + _screen->_curDim->w) << 3) - 1, (_screen->_curDim->sy + _screen->_curDim->h) - 1, _bkgColor_1);
+		int c = rollDice(1, _mnNumWord - 1, -1);
+		_screen->drawShape(0, _largeItemShapes[_mnDef[c << 2]], 100, 2, 13);
+		_screen->printShadedText(Common::String::format(_mnPrompt[0], _mnDef[(c << 2) + 1], _mnDef[(c << 2) + 2]).c_str(), (_screen->_curDim->sx + 1) << 3, _screen->_curDim->sy, _screen->_curDim->unk8, _bkgColor_1);
+		memset(answ, 0, 20);
+		gui_drawBox(76, 100, 133, 14, _color2_1, _color1_1, -1);
+		gui_drawBox(77, 101, 131, 12, _color2_1, _color1_1, -1);	
+		if (_gui->getTextInput(answ, 10, 103, 15, _screen->_curDim->unk8, _bkgColor_1, 8) < 0)
+			i = 3;
+		if (scumm_stricmp(_mnWord[c], answ) && i == 2)
+			return false;
+	}
+
+	_screen->modifyScreenDim(13, _screen->_curDim->sx - 1, _screen->_curDim->sy - 2, _screen->_curDim->w + 2, _screen->_curDim->h + 16);
+	_screen->setFont(of);
+	_screen->copyPage(10, 0);
+	return true;
+}
+
 void EobCoreEngine::useSlotWeapon(int charIndex, int slotIndex, Item item) {
 	EobCharacter *c = &_characters[charIndex];
 	int tp = item ? _items[item].type : 0;
@@ -2110,7 +2144,7 @@ void EobCoreEngine::explodeMonster(EobMonsterInPlay *m) {
 }
 
 void EobCoreEngine::snd_playSoundEffect(int id, int volume) {
-	if (id < 1 || id > 119 || shouldQuit())
+	if ((id < 1) || (_flags.gameID == GI_EOB2 && id > 119) || shouldQuit())
 		return;
 
 	_sound->playSoundEffect(id, volume);
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 1c730f7687..7ebc883f3e 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -174,15 +174,15 @@ struct EobMonsterProperty {
 	int32 experience;
 
 	uint8 u30;
-	uint8 sound1;
-	uint8 sound2;
+	int8 sound1;
+	int8 sound2;
 	uint8 numRemoteAttacks;
 	uint8 remoteWeaponChangeMode;
 	uint8 numRemoteWeapons;
 
 	int8 remoteWeapons[5];
 
-	uint8 tuResist;
+	int8 tuResist;
 	uint8 dmgModifierEvade;
 
 	uint8 decorations[3];
@@ -623,6 +623,7 @@ protected:
 	const uint8 *_wllFlagPreset;
 	int _wllFlagPresetSize;
 	const uint8 *_teleporterShapeCoords;
+	const uint8 *_portalSeq;
 
 	// Script
 	void runLevelScript(int block, int flags);
@@ -807,12 +808,16 @@ protected:
 
 	// misc
 	void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false);
+
 	void displayParchment(int id);
 	int countResurrectionCandidates();
+
+	void seq_portal();
+	bool checkPassword();
+	
 	virtual int resurrectionSelectDialogue() = 0;
 	virtual void useHorn(int charIndex, int weaponSlot) {}
 	virtual bool checkPartyStatusExtra() = 0;
-
 	virtual void drawLightningColumn() {}
 	virtual int charSelectDialogue() { return -1; }
 	virtual void characterLevelGain(int charIndex) {}
@@ -826,6 +831,11 @@ protected:
 
 	const char * const *_saveLoadStrings;
 
+	const uint8 *_mnDef;
+	const char * const *_mnWord;
+	const char * const *_mnPrompt;
+	int _mnNumWord;
+
 	int _rrCount;
 	const char *_rrNames[10];
 	int8 _rrId[10];
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index c495eb541f..9dec1584c5 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -2509,7 +2509,7 @@ int GUI_Eob::getTextInput(char *dest, int x, int y, int destMaxLen, int textColo
 		in = 0;
 		_keyPressed.reset();
 
-		while (!in) {
+		while (!in && !_vm->shouldQuit()) {
 			if (next <= _vm->_system->getMillis()) {
 				if (cursorState) {
 					_screen->copyRegion((pos + 1) << 3, 191, (x + pos) << 3, y, 8, 9, 2, 0, Screen::CR_NO_P_CHECK);
@@ -2595,7 +2595,7 @@ int GUI_Eob::getTextInput(char *dest, int x, int y, int destMaxLen, int textColo
 			_screen->printShadedText(sufx, (x + pos) << 3, y, textColor1, textColor2);
 		_screen->updateScreen();
 
-	} while (_keyPressed.keycode != Common::KEYCODE_RETURN && _keyPressed.keycode != Common::KEYCODE_ESCAPE);
+	} while (_keyPressed.keycode != Common::KEYCODE_RETURN && _keyPressed.keycode != Common::KEYCODE_ESCAPE && !_vm->shouldQuit());
 
 	return _keyPressed.keycode == Common::KEYCODE_ESCAPE ? -1 : len;
 }
@@ -3194,8 +3194,10 @@ bool GUI_Eob::restParty() {
 				continue;
 			if (_vm->checkInventoryForItem(i, 30, -1) == -1)
 				continue;
-			if (_vm->restParty_checkHealSpells(i))
+			if (_vm->restParty_checkHealSpells(i)) {
 				useHealers = confirmDialogue(40);
+				break;
+			}
 		} 
 	}
 
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index 78d3f8b8aa..b48c3934c8 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -176,7 +176,9 @@ int EobCoreEngine::deleteInventoryItem(int charIndex, int slot) {
 void EobCoreEngine::deleteBlockItem(uint16 block, int type) {
 	uint16 itm = _levelBlockProperties[block].drawObjects;
 	if (!itm)
-		return;	
+		return;
+
+	_levelBlockProperties[block].drawObjects = 0;
 	
 	for (uint16 i2 = itm, i = 0; itm != i2 || !i; i++ ) {
 		if (type == _items[itm].type || type == -1) {
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 70e4892342..3eb7591413 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -75,7 +75,7 @@ void EobCoreEngine::useMagicScroll(int charIndex, int type, int weaponSlot) {
 }
 
 void EobCoreEngine::usePotion(int charIndex, int weaponSlot) {
-	EobCharacter *c = &_characters[_openBookChar];
+	EobCharacter *c = &_characters[charIndex];
 
 	int val = deleteInventoryItem(charIndex, weaponSlot);
 	snd_playSoundEffect(10);
@@ -607,6 +607,7 @@ bool EobCoreEngine::magicObjectStatusHit(EobMonsterInPlay *m, int type, bool try
 }
 
 bool EobCoreEngine::turnUndeadHit(EobMonsterInPlay *m, int hitChance, int casterLevel) {
+	assert(_monsterProps[m->type].tuResist > 0);
 	uint8 e = _turnUndeadEffect[_monsterProps[m->type].tuResist * 14 + MIN(casterLevel, 14)];
 
 	if (e == 0xff) {
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 55946e5b7f..0f1539b610 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -435,6 +435,11 @@ enum KyraResources {
 
 	kEobBaseDscTelptrShpCoords,
 
+	kEobBasePortalSeqData,
+	kEobBaseManDef,
+	kEobBaseManWord,
+	kEobBaseManPrompt,
+
 	kEobBaseBookNumbers,
 	kEobBaseMageSpellsList,
 	kEobBaseClericSpellsList,
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index 1e113fb2ae..715970074a 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -1416,12 +1416,11 @@ int EobInfProcessor::oeob_sequence(int8 *data) {
 		return 0;
 
 	case -2:
-		// portal sequence
-		error("EobInfProcessor::oeob_sequence(): unimplemented cmd -2");
+		_vm->seq_portal();		
 		break;
 
 	case -1:
-		// copy protection
+		_vm->_runFlag = _vm->checkPassword();
 		break;
 
 	default:
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 97ee51bd22..3447b6bc7f 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -107,8 +107,8 @@ const uint8 *EobCoreEngine::loadMonsterProperties(const uint8 *data) {
 		data += 2;
 
 		d->u30 = *data++;
-		d->sound1 = *data++;
-		d->sound2 = *data++;
+		d->sound1 = (int8)*data++;
+		d->sound2 = (int8)*data++;
 		d->numRemoteAttacks = *data++;
 
 		if (*data++ != 0xff) {
@@ -121,7 +121,7 @@ const uint8 *EobCoreEngine::loadMonsterProperties(const uint8 *data) {
 			}
 		}
 
-		d->tuResist = *data++;
+		d->tuResist = (int8)*data++;
 		d->dmgModifierEvade = *data++;
 
 		for (int i = 0; i < 3; i++)
@@ -1181,7 +1181,7 @@ bool EobCoreEngine::walkMonsterNextStep(EobMonsterInPlay *m, int destBlock, int
 		m->dir = direction;
 
 	checkSceneUpdateNeed(obl);
-	if (!_partyResting && p->sound2)
+	if (!_partyResting && p->sound2 > 0)
 		snd_processEnvironmentalSoundEffect(p->sound2, m->block);
 
 	return true;
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index ea943f32d4..9b15d4aea8 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -448,6 +448,10 @@ void EobCoreEngine::initStaticResource() {
 	_npcPreset = _staticres->loadEobNpcData(kEobBaseNpcPresets, temp);
 
 	_teleporterShapeCoords = _staticres->loadRawData(kEobBaseDscTelptrShpCoords, temp);
+	_portalSeq = _staticres->loadRawData(kEobBasePortalSeqData, temp);
+	_mnDef = _staticres->loadRawData(kEobBaseManDef, temp);
+	_mnWord = _staticres->loadStrings(kEobBaseManWord, _mnNumWord);
+	_mnPrompt = _staticres->loadStrings(kEobBaseManPrompt, temp);
 
 	_monsterStepTable0 = (int8*) _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEobBaseMonsterStepTable02 : kEobBaseMonsterStepTable01, temp);
 	_monsterStepTable1 = (int8*)_staticres->loadRawData(kEobBaseMonsterStepTable1, temp);
@@ -1114,10 +1118,10 @@ void EobEngine::initStaticResource() {
 		p->experience = READ_LE_UINT16(ps);
 		ps += 2;
 		p->u30 = *ps++;
-		p->sound1 = *ps++;
-		p->sound2 = *ps++;
+		p->sound1 = (int8)*ps++;
+		p->sound2 = (int8)*ps++;
 		p->numRemoteAttacks = *ps++;
-		p->tuResist = *ps++;
+		p->tuResist = (int8)*ps++;
 		p->dmgModifierEvade = *ps++;
 	}
 }
-- 
cgit v1.2.3


From bac0caeb0ff712fe9002985c44c1ea651b86e018 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sat, 6 Aug 2011 00:40:53 +0200
Subject: KYRA: (EOB) - lots of fixes towards EOB1 playability

also implement some new code (EOB1 portals, burning hands spell, etc.)
---
 engines/kyra/chargen.cpp        |  6 +--
 engines/kyra/eob1.cpp           | 34 ++++++++++++----
 engines/kyra/eob1.h             |  2 +
 engines/kyra/eob2.cpp           |  4 +-
 engines/kyra/eobcommon.cpp      | 89 ++++++++++++++++++++++++++++++++++++-----
 engines/kyra/eobcommon.h        | 12 +++++-
 engines/kyra/gui_eob.cpp        |  4 +-
 engines/kyra/magic_eob.cpp      | 32 ++++++++++++++-
 engines/kyra/resource.h         |  3 ++
 engines/kyra/saveload_eob.cpp   |  6 +--
 engines/kyra/scene_eob.cpp      | 32 +++++++++------
 engines/kyra/screen.cpp         | 15 +++++++
 engines/kyra/screen.h           |  5 +++
 engines/kyra/screen_eob.cpp     | 11 +++--
 engines/kyra/screen_eob.h       |  4 +-
 engines/kyra/script_eob.cpp     | 16 +++++---
 engines/kyra/sequences_eob1.cpp | 10 ++++-
 engines/kyra/sequences_eob2.cpp |  2 +
 engines/kyra/sprites_eob.cpp    | 19 ++++++---
 engines/kyra/staticres_eob.cpp  |  8 +++-
 engines/kyra/timer_eob.cpp      |  4 +-
 21 files changed, 254 insertions(+), 64 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index c8040ed9de..681412915d 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -236,7 +236,7 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 }
 
 void CharacterGenerator::init() {
-	_screen->loadEobBitmap("CHARGENA", 3, 3);
+	_screen->loadShapeSetBitmap("CHARGENA", 3, 3);
 	if (_faceShapes) {
 		for (int i = 0; i < 44; i++)
 			delete[] _faceShapes[i];
@@ -248,8 +248,8 @@ void CharacterGenerator::init() {
 		_faceShapes[i] = _screen->encodeShape((i % 10) << 2, (i / 10) << 5, 4, 32, true);
 	_screen->_curPage = 0;
 
-	_screen->loadEobCpsFileToPage("CHARGEN", 0, 3, 3, 0);
-	_screen->loadEobBitmap("CHARGENB", 3, 3);
+	_screen->loadEobBitmap("CHARGEN", 0, 3, 3, 0);
+	_screen->loadShapeSetBitmap("CHARGENB", 3, 3);
 	if (_chargenMagicShapes) {
 		for (int i = 0; i < 10; i++)
 			delete[] _chargenMagicShapes[i];
diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index 95052311ff..762b2d1bd1 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -78,6 +78,9 @@ Common::Error EobEngine::init() {
 
 	_scriptTimersCount = 1;
 
+	//_wllWallFlags[132] = 0x1f;
+	_wllWallFlags[133] = 1;
+
 	return Common::kNoError;
 }
 
@@ -341,8 +344,25 @@ void EobEngine::replaceMonster(int unit, uint16 block, int pos, int dir, int typ
 	}
 }
 
+void EobEngine::updateScriptTimersExtra() {
+	int cnt = 0;
+	for (int i = 1; i < 30; i++) {
+		if (_monsters[i].hitPointsCur <= 0)
+			cnt++;
+	}
+
+	if (!cnt) {
+		for (int i = 1; i < 30; i++) {
+			if (getBlockDistance(_monsters[i].block, _currentBlock) > 3) {
+				killMonster(&_monsters[i], true);
+				break;
+			}
+		}
+	}
+}
+
 void EobEngine::loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) {
-	_screen->loadEobBitmap("DOOR", 5, 3);
+	_screen->loadShapeSetBitmap("DOOR", 5, 3);
 	_screen->_curPage = 2;
 
 	if (doorType1 != 0xff) {
@@ -351,8 +371,8 @@ void EobEngine::loadDoorShapes(int doorType1, int shapeId1, int doorType2, int s
 			_doorShapes[shapeId1 + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
 			enc = &_doorSwitchShapeEncodeDefs[(doorType1 * 3 + i) << 2];
 			_doorSwitches[shapeId1 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
-			_doorSwitches[shapeId1 + i].x = _doorSwitchCoords[doorType1 << 1];
-			_doorSwitches[shapeId1 + i].y = _doorSwitchCoords[(doorType1 << 1) + 1];
+			_doorSwitches[shapeId1 + i].x = _doorSwitchCoords[doorType1 * 6 + i * 2];
+			_doorSwitches[shapeId1 + i].y = _doorSwitchCoords[doorType1 * 6 + i * 2 + 1];
 		}
 	}
 
@@ -362,8 +382,8 @@ void EobEngine::loadDoorShapes(int doorType1, int shapeId1, int doorType2, int s
 			_doorShapes[shapeId2 + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
 			enc = &_doorSwitchShapeEncodeDefs[(doorType2 * 3 + i) << 2];
 			_doorSwitches[shapeId2 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
-			_doorSwitches[shapeId2 + i].x = _doorSwitchCoords[doorType2 << 1];
-			_doorSwitches[shapeId2 + i].y = _doorSwitchCoords[(doorType2 << 1) + 1];
+			_doorSwitches[shapeId2 + i].x = _doorSwitchCoords[doorType2 * 6 + i * 2];
+			_doorSwitches[shapeId2 + i].y = _doorSwitchCoords[doorType2 * 6 + i * 2+ 1];
 		}
 	}
 
@@ -383,7 +403,7 @@ void EobEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wal
 		case 4:
 		case 5:
 		case 6:
-			y = _dscDoorY2[mDim] - shp[1];
+			y = _dscDoorY6[mDim] - shp[1];
 			d1 = _dscDoorCoordsExt[index << 1] >> 3;
 			d2 = _dscDoorCoordsExt[(index << 1) + 1] >> 3;
 			if (_shpDmX1 > d1)
@@ -403,7 +423,7 @@ void EobEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wal
 		case 7:
 		case 8:
 		case 9:
-			y = _dscDoorY3[mDim] - _doorShapes[shapeIndex + 3][1];
+			y = _dscDoorY7[mDim] - _doorShapes[shapeIndex + 3][1];
 			d1 = x - (_doorShapes[shapeIndex + 3][2] << 2);
 			x -= (shp[2] << 2);
 			drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], d1, y, 5);
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
index 8b805c00e8..21543ddfa5 100644
--- a/engines/kyra/eob1.h
+++ b/engines/kyra/eob1.h
@@ -81,6 +81,7 @@ private:
 
 	// Monsters
 	void replaceMonster(int unit, uint16 block, int d, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem);
+	void updateScriptTimersExtra();
 
 	// Level
 	void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2);
@@ -94,6 +95,7 @@ private:
 	const uint8 *_dscDoorY4;
 	const uint8 *_dscDoorY5;
 	const uint8 *_dscDoorY6;
+	const uint8 *_dscDoorY7;
 
 	const uint8 *_doorShapeEncodeDefs;
 	const uint8 *_doorSwitchShapeEncodeDefs;
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index 2b4cf46afe..9efc558b7f 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -159,7 +159,7 @@ void DarkMoonEngine::updateUsedCharacterHandItem(int charIndex, int slot) {
 
 void DarkMoonEngine::generateMonsterPalettes(const char *file, int16 monsterIndex) {
 	int cp = _screen->setCurPage(2);
-	_screen->loadEobBitmap(file, 3, 3);
+	_screen->loadShapeSetBitmap(file, 3, 3);
 	uint8 tmpPal[16];
 	uint8 newPal[16];
 
@@ -291,7 +291,7 @@ bool DarkMoonEngine::killMonsterExtra(EobMonsterInPlay *m) {
 }
 
 const uint8 *DarkMoonEngine::loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs) {
-	_screen->loadEobBitmap(filename, 3, 3);
+	_screen->loadShapeSetBitmap(filename, 3, 3);
 	for (int i = 0; i < 3; i++) {
 		_doorShapes[doorIndex * 3 + i] = _screen->encodeShape(READ_LE_UINT16(shapeDefs), READ_LE_UINT16(shapeDefs + 2), READ_LE_UINT16(shapeDefs + 4), READ_LE_UINT16(shapeDefs + 6));
 		shapeDefs += 8;
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index f323dd4e17..3e1001d2bd 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -98,6 +98,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_dscDoorScaleMult2 = 0;
 	_dscDoorScaleMult3 = 0;
 	_dscDoorY1 = 0;
+	_dscDoorXE = 0;
 
 	_color9 = 17;
 	_color10 = 23;
@@ -137,6 +138,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_spellAnimBuffer = 0;
 	_clericSpellOffset = 0;
 	_restPartyElapsedTime = 0;
+	_allowSkip = false;
 
 	_rrCount = 0;
 	memset(_rrNames, 0, 10 * sizeof(const char*));
@@ -980,7 +982,7 @@ void EobCoreEngine::neutralizePoison(int character) {
 }
 
 void EobCoreEngine::npcSequence(int npcIndex) {
-	_screen->loadEobBitmap("OUTTAKE", 5, 3);
+	_screen->loadShapeSetBitmap("OUTTAKE", 5, 3);
 	_screen->copyRegion(0, 0, 0, 0, 176, 120, 0, 6, Screen::CR_NO_P_CHECK);
 
 	drawNpcScene(npcIndex);
@@ -1019,7 +1021,7 @@ void EobCoreEngine::initNpc(int npcIndex) {
 		c->inventory[i] = duplicateItem(c->inventory[i]);
 	}
 
-	_screen->loadEobBitmap(_flags.gameID == GI_EOB2 ? "OUTPORTS" : "OUTTAKE", 3, 3);
+	_screen->loadShapeSetBitmap(_flags.gameID == GI_EOB2 ? "OUTPORTS" : "OUTTAKE", 3, 3);
 	_screen->_curPage = 2;
 	c->faceShape = _screen->encodeShape(npcIndex << 2, _flags.gameID == GI_EOB2 ? 0 : 160, 4, 32, true);
 	_screen->_curPage = 0;
@@ -1257,7 +1259,7 @@ void EobCoreEngine::drawSequenceBitmap(const char *file, int destRect, int x1, i
 	if (scumm_stricmp(_dialogueLastBitmap, file)) {
 		if (!destRect) {
 			if (!(flags & 1)) {
-				_screen->loadEobCpsFileToPage("BORDER", 0, 3, 3, 2);
+				_screen->loadEobBitmap("BORDER", 0, 3, 3, 2);
 				_screen->copyRegion(0, 0, 0, 0, 184, 121, 2, page, Screen::CR_NO_P_CHECK);
 			} else {
 				_screen->copyRegion(0, 0, 0, 0, 184, 121, 0, page, Screen::CR_NO_P_CHECK);
@@ -1267,7 +1269,7 @@ void EobCoreEngine::drawSequenceBitmap(const char *file, int destRect, int x1, i
 				_screen->copyRegion(0, 0, 0, 0, 184, 121, 2, 6, Screen::CR_NO_P_CHECK);
 		}
 
-		_screen->loadEobCpsFileToPage(file, 0, 3, 3, 2);
+		_screen->loadEobBitmap(file, 0, 3, 3, 2);
 		strcpy(_dialogueLastBitmap, file);
 	}
 
@@ -1407,16 +1409,12 @@ bool EobCoreEngine::restParty_checkSpellsToLearn() {
 	return false;
 }
 
-void EobCoreEngine::restParty_npc() {
-
-}
-
 bool EobCoreEngine::restParty_extraAbortCondition() {
 	return false;
 }
 
 void EobCoreEngine::delay(uint32 millis, bool, bool) {
-	while (millis && !shouldQuit() && !skipFlag()) {
+	while (millis && !shouldQuit() && !(_allowSkip && skipFlag())) {
 		updateInput();
 		uint32 step = MIN<uint32>(millis, (_tickLength / 5));
 		_system->delayMillis(step);
@@ -1501,7 +1499,75 @@ int EobCoreEngine::countResurrectionCandidates() {
 }
 
 void EobCoreEngine::seq_portal() {
-	//_portalSeq
+	releaseDoorShapes();
+	releaseMonsterShapes(0, 36);
+	releaseDecorations();
+
+	uint8 *shapes1[5];
+	uint8 *shapes2[5];
+	uint8 *shapes3[5];
+	uint8 *shape0;
+
+	_screen->loadShapeSetBitmap("PORTALA", 5, 3);
+
+	for (int i = 0; i < 5; i++) {
+		shapes1[i] = _screen->encodeShape(i * 3, 0, 3, 75);
+		shapes2[i] = _screen->encodeShape(i * 3, 80, 3, 75);
+		shapes3[i] = _screen->encodeShape(15, i * 18, 15, 18);
+	}
+
+	shape0 = _screen->encodeShape(30, 0, 8, 77);
+	_screen->loadEobBitmap("PORTALB", 0, 5, 3, 2);
+
+	snd_playSoundEffect(33);
+	snd_playSoundEffect(19);
+	_screen->copyRegion(24, 0, 24, 0, 144, 104, 2, 5, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(24, 0, 24, 0, 144, 104, 0, 2, Screen::CR_NO_P_CHECK);
+	_screen->drawShape(2, shapes3[0], 28, 9, 0);
+	_screen->drawShape(2, shapes1[0], 34, 28, 0);
+	_screen->drawShape(2, shapes2[0], 120, 28, 0);
+	_screen->drawShape(2, shape0, 56, 27, 0);
+	_screen->crossFadeRegion(24, 0, 24, 0, 144, 104, 2, 0);
+	_screen->copyRegion(24, 0, 24, 0, 144, 104, 5, 2, Screen::CR_NO_P_CHECK);
+	delay(30 * _tickLength);
+
+	for (const int8 *pos = _portalSeq; *pos > -1 && !shouldQuit(); ) {
+		int s = *pos++;
+		_screen->drawShape(0, shapes3[s], 28, 9, 0);
+		_screen->drawShape(0, shapes1[s], 34, 28, 0);
+		_screen->drawShape(0, shapes2[s], 120, 28, 0);
+
+		if ((s == 1) && (pos >= _portalSeq + 3)) {
+			if (*(pos - 3) == 0) {
+				snd_playSoundEffect(24);
+				snd_playSoundEffect(86);
+			}
+		}
+
+		s = *pos++;
+		if (s == 0) {
+			_screen->drawShape(0, shape0, 56, 27, 0);
+		} else {
+			s--;
+			_screen->copyRegion((s % 5) << 6, s / 5 * 77, 56, 27, 64, 77, 2, 0, Screen::CR_NO_P_CHECK);
+			if (s == 0)
+				snd_playSoundEffect(31);
+			else if (s == 3) {
+				if (*(pos - 2) == 3)
+					snd_playSoundEffect(90);
+			}
+		}		
+		
+		_screen->updateScreen();
+		delay(2 * _tickLength);
+	}
+	
+	delete[] shape0;
+	for (int i = 0; i < 5; i++) {
+		delete[] shapes1[i];
+		delete[] shapes2[i];
+		delete[] shapes3[i];
+	}
 }
 
 bool EobCoreEngine::checkPassword() {
@@ -1830,10 +1896,13 @@ bool EobCoreEngine::monsterAttackHitTest(EobMonsterInPlay *m, int charIndex) {
 
 	int r = rollDice(1, 20);
 	if (r != 20) {
+		// Prot from evil
 		if (_characters[charIndex].effectFlags & 0x800)
 			r -= 2;
+		// blur
 		if (_characters[charIndex].effectFlags & 0x10)
 			r -= 2;
+		// prayer
 		if (_partyEffectFlags & 0x8000)
 			r--;
 	}
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 7ebc883f3e..33b4a2fc2d 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -508,6 +508,7 @@ protected:
 	void updateMonsters(int unit);
 	void updateMonsterDest(EobMonsterInPlay *m);
 	void updateMonsterDest2(EobMonsterInPlay *m);
+	void updateAllMonsterDests();
 	void turnFriendlyMonstersHostile();
 	int getNextMonsterDirection(int curBlock, int destBlock);
 	int getNextMonsterPos(EobMonsterInPlay *m, int block);
@@ -619,11 +620,12 @@ protected:
 	const uint8 *_dscDoorScaleMult2;
 	const uint8 *_dscDoorScaleMult3;
 	const uint8 *_dscDoorY1;
+	const uint8 *_dscDoorXE;
 
 	const uint8 *_wllFlagPreset;
 	int _wllFlagPresetSize;
 	const uint8 *_teleporterShapeCoords;
-	const uint8 *_portalSeq;
+	const int8 *_portalSeq;
 
 	// Script
 	void runLevelScript(int block, int flags);
@@ -633,6 +635,7 @@ protected:
 
 	const uint8 *initScriptTimers(const uint8 *pos);
 	void updateScriptTimers();
+	virtual void updateScriptTimersExtra() {}
 
 	EobInfProcessor *_inf;
 	int _stepCounter;
@@ -803,7 +806,7 @@ protected:
 	int restParty_getCharacterWithLowestHp();
 	bool restParty_checkHealSpells(int charIndex);
 	bool restParty_checkSpellsToLearn();
-	virtual void restParty_npc();
+	virtual void restParty_npc() {}
 	virtual bool restParty_extraAbortCondition();
 
 	// misc
@@ -840,6 +843,8 @@ protected:
 	const char *_rrNames[10];
 	int8 _rrId[10];
 
+	bool _allowSkip;
+
 	Screen_Eob *_screen;
 	GUI_Eob *_gui;
 
@@ -881,6 +886,7 @@ protected:
 	int _dstMonsterIndex;
 	bool _preventMonsterFlash;
 	int16 _foundMonstersArray[5];
+	int8 _monsterBlockPosArray[6];
 
 	// magic
 	void useMagicBookOrSymbol(int charIndex, int type);
@@ -969,6 +975,7 @@ protected:
 	void spellCallback_start_heal();
 	void spellCallback_start_layOnHands();
 	void spellCallback_start_turnUndead();
+	bool spellCallback_end_kuotoaAttack(EobFlyingObject *fo);
 	bool spellCallback_end_unk1Passive(EobFlyingObject *fo);
 	bool spellCallback_end_unk2Passive(EobFlyingObject *fo);
 	bool spellCallback_end_deathSpellPassive(EobFlyingObject *fo);
@@ -1038,6 +1045,7 @@ protected:
 
 	const uint8 *_magicFlightObjectProperties;
 	const uint8 *_turnUndeadEffect;
+	const uint8 *_burningHandsDest;
 
 	// Menu
 	EobMenuDef *_menuDefs;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 9dec1584c5..04b863c325 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -150,7 +150,7 @@ Button *EobCoreEngine::gui_getButton(Button *buttonList, int index) {
 }
 
 void EobCoreEngine::gui_drawPlayField(bool refresh) {
-	_screen->loadEobCpsFileToPage("PLAYFLD", 0, 5, 3, 2);
+	_screen->loadEobBitmap("PLAYFLD", 0, 5, 3, 2);
 	int cp = _screen->setCurPage(2);
 	gui_drawCompass(true);
 
@@ -163,7 +163,7 @@ void EobCoreEngine::gui_drawPlayField(bool refresh) {
 	if (!_loading)
 		_screen->updateScreen();
 
-	_screen->loadEobCpsFileToPage("INVENT", 0, 5, 3, 2);
+	_screen->loadEobBitmap("INVENT", 0, 5, 3, 2);
 }
 
 void EobCoreEngine::gui_restorePlayField() {
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 3eb7591413..12d2524545 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -142,7 +142,7 @@ void EobCoreEngine::usePotion(int charIndex, int weaponSlot) {
 }
 
 void EobCoreEngine::useWand(int charIndex, int weaponSlot) {
-	int v = _items[_characters[charIndex].inventory[weaponSlot]].value - 1;
+	int v = _items[_characters[charIndex].inventory[weaponSlot]].value;
 	if (!v) {
 		_txt->printMessage(_wandStrings[0]);
 		return;
@@ -535,7 +535,7 @@ bool EobCoreEngine::magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int d
 			if (!fo->item && (_characters[c].effectFlags & 8)) {
 				res = true;
 			} else {
-				if ((_characters[c].flags & 1) && hitTest && !monsterAttackHitTest(&_monsters[0], c)) {
+				if ((_characters[c].flags & 1) && (!hitTest || monsterAttackHitTest(&_monsters[0], c))) {
 					int dmg = rollDice(dcTimes, dcPips, dcOffs) * level;
 					res = true;
 					calcAndInflictCharacterDamage(c, 0, 0, dmg, dmgFlag, s, dmgType);
@@ -638,7 +638,31 @@ void EobCoreEngine::spellCallback_start_armor() {
 }
 
 void EobCoreEngine::spellCallback_start_burningHands() {
+	static const int16 bX[] = { 0, 152, 24, 120, 56, 88 };
+	static const int8 bY[] = { 64, 64, 56, 56, 56, 56 };
 
+	for (int i = 0; i < 6; i++)
+		drawBlockObject(i & 1, 0, _firebeamShapes[(5 - i) >> 1], bX[i], bY[i], 0);
+	_screen->updateScreen();
+	delay(2 * _tickLength);
+	
+	int cl = getCharacterMageLevel(_openBookChar);
+	int bl = calcNewBlockPosition(_currentBlock, _currentDirection);
+
+	const int8 *pos = getMonsterBlockPositions(bl);
+	_preventMonsterFlash = true;
+
+	int numDest = (_flags.gameID == GI_EOB1) ? 2 : 6;
+	const uint8 *d = &_burningHandsDest[_currentDirection * (_flags.gameID == GI_EOB1 ? 2 : 8)];
+
+	for (int i = 0; i < numDest; i++, d++) {
+		if (pos[*d] == -1)
+			continue;
+		calcAndInflictMonsterDamage(&_monsters[pos[*d]], 1, 3, cl << 1, 0x21, 4, 0);
+	}
+
+	updateAllMonsterShapes();
+	_sceneUpdateRequired = true;
 }
 
 void EobCoreEngine::spellCallback_start_detectMagic() {
@@ -949,6 +973,10 @@ void EobCoreEngine::spellCallback_start_turnUndead() {
 	_preventMonsterFlash = false;
 }
 
+bool EobCoreEngine::spellCallback_end_kuotoaAttack(EobFlyingObject *fo) {
+	return magicObjectDamageHit(fo, 0, 0, 12, 1);
+}
+
 bool EobCoreEngine::spellCallback_end_unk1Passive(EobFlyingObject *fo) {
 	bool res = false;
 	if (_partyEffectFlags & 0x20000) {
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 0f1539b610..f80fdd91c2 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -405,11 +405,13 @@ enum KyraResources {
 	kEobBaseDscDoorScaleMult5,
 	kEobBaseDscDoorScaleMult6,
 	kEobBaseDscDoorType5Offs,
+	kEobBaseDscDoorXE,
 	kEobBaseDscDoorY1,
 	kEobBaseDscDoorY3,
 	kEobBaseDscDoorY4,
 	kEobBaseDscDoorY5,
 	kEobBaseDscDoorY6,
+	kEobBaseDscDoorY7,
 	kEobBaseDscDoorCoordsExt,
 
 	kEobBaseDscItemPosIndex,
@@ -475,6 +477,7 @@ enum KyraResources {
 	kEobBaseSpellProperties,
 	kEobBaseMagicFlightProps,
 	kEobBaseTurnUndeadEffect,
+	kEobBaseBurningHandsDest,
 
 	kEob1MainMenuStrings,
 	kEob1DoorShapeDefs,
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 43a230e590..88f0c1c64e 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -205,7 +205,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 
 	setupCharacterTimers();
 
-	_screen->loadEobBitmap("CHARGENA", 3, 3);
+	_screen->loadShapeSetBitmap("CHARGENA", 3, 3);
 	for (int i = 0; i < 6; i++) {
 		EobCharacter *c = &_characters[i];
 		if (!c->flags || c->portrait < 0)
@@ -213,12 +213,12 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 		c->faceShape = _screen->encodeShape((c->portrait % 10) << 2, (c->portrait / 10) << 5, 4, 32, true);
 	}
 
-	_screen->loadEobBitmap(_flags.gameID == GI_EOB2 ? "OUTPORTS" : "OUTTAKE", 3, 3);
+	_screen->loadShapeSetBitmap(_flags.gameID == GI_EOB2 ? "OUTPORTS" : "OUTTAKE", 3, 3);
 	for (int i = 0; i < 6; i++) {
 		EobCharacter *c = &_characters[i];
 		if (!c->flags || c->portrait >= 0)
 			continue;
-		c->faceShape = _screen->encodeShape(-(c->portrait + 1), _flags.gameID == GI_EOB2 ? 0 : 160, 4, 32, true);
+		c->faceShape = _screen->encodeShape((-(c->portrait + 1)) << 2, _flags.gameID == GI_EOB2 ? 0 : 160, 4, 32, true);
 	}
 	_screen->_curPage = 0;
 
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index e6b3c26394..4c1bb1636f 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -690,7 +690,7 @@ void EobCoreEngine::loadLevel(int level, int sub) {
 	}
 
 	loadVcnData(gfxFile.c_str(), 0);
-	_screen->loadEobCpsFileToPage("INVENT", 0, 5, 3, 2);
+	_screen->loadEobBitmap("INVENT", 0, 5, 3, 2);
 
 	enableSysTimer(2);
 	_sceneDrawPage1 = 2;
@@ -734,15 +734,13 @@ Common::String EobCoreEngine::initLevelData(int sub){
 			pos += 13;
 		}
 
-	////////	_screen->loadPalette(tmpStr, _screen->getPalette(0));
-
 		if (_flags.gameID == GI_EOB1) {
 			pos += 11;
 			_screen->setShapeFadeMode(0, false);
 			_screen->setShapeFadeMode(1, false);
 		}
-		else
-			_screen->loadPalette(tmpStr.c_str(), _screen->getPalette(0));
+		
+		_screen->loadPalette(tmpStr.c_str(), _screen->getPalette(0));
 
 		Palette backupPal(256);
 		backupPal.copy(_screen->getPalette(0), 224, 32, 224);
@@ -796,9 +794,8 @@ Common::String EobCoreEngine::initLevelData(int sub){
 
 	for (int i = 0; i < 2; i++) {
 		if (_flags.gameID == GI_EOB1) {
-			if (*pos == 0xFF)
-				continue;
-			loadMonsterShapes((const char *)(pos + 1), i * 18, false, *pos * 18);
+			if (*pos != 0xFF)
+				loadMonsterShapes((const char *)(pos + 1), i * 18, false, *pos * 18);
 			pos += 13;
 		} else {
 			if (*pos++ != 0xEC)
@@ -880,7 +877,7 @@ void EobCoreEngine::loadBlockProperties(const char *mazFile) {
 }
 
 void EobCoreEngine::loadDecorations(const char *cpsFile, const char *decFile) {
-	_screen->loadEobBitmap(cpsFile, 3, 3);
+	_screen->loadShapeSetBitmap(cpsFile, 3, 3);
 	Common::SeekableReadStream *s = _res->createReadStream(decFile);
 
 	_levelDecorationDataSize = s->readUint16LE();
@@ -1142,7 +1139,10 @@ void EobCoreEngine::drawDecorations(int index) {
 int EobCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint16 direction) {
 	uint16 b = calcNewBlockPosition(curBlock, direction);
 	int w = _levelBlockProperties[b].walls[direction ^ 2];
+	
 	int f = _wllWallFlags[w];
+	if (!f)
+		assert (w < (_flags.gameID == GI_EOB1 ? 70 : 80));
 
 	if (w == 74 && _currentBlock == curBlock) {
 		for (int i = 0; i < 5; i++) {
@@ -1163,7 +1163,7 @@ void EobCoreEngine::notifyBlockNotPassable() {
 }
 
 void EobCoreEngine::moveParty(uint16 block) {
-	//processMonstersUnk1();
+	updateAllMonsterDests();
 	uint16 old = _currentBlock;
 	_currentBlock = block;
 
@@ -1176,10 +1176,10 @@ void EobCoreEngine::moveParty(uint16 block) {
 
 	runLevelScript(block, 1);
 
-	if (_levelBlockProperties[block].walls[0] == 26)
+	if (_flags.gameID == GI_EOB2 && _levelBlockProperties[block].walls[0] == 26)
 		memset(_levelBlockProperties[block].walls, 0, 4);
 
-	//processMonstersUnk1();
+	updateAllMonsterDests();
 	_stepCounter++;
 	//_keybControlUnk = -1;
 	_sceneUpdateRequired = true;
@@ -1192,6 +1192,14 @@ int EobCoreEngine::clickedDoorSwitch(uint16 block, uint16 direction) {
 	SpriteDecoration *d = &_doorSwitches[((v > 12 && v < 23) || v == 31) ? 3 : 0];
 	int x1 = d->x + _dscShapeCoords[138] - 4;
 	int y1 = d->y - 4;
+
+	if (_flags.gameID == GI_EOB1 && _currentLevel >= 4 && _currentLevel <= 6) {
+		if (v >= 30)
+			x1 += 4;
+		else
+			x1 += ((v - _dscDoorXE[v]) * 9);
+	}
+	
 	if (!posWithinRect(_mouseX, _mouseY, x1, y1, x1 + (d->shp[2] << 3) + 8, y1 + d->shp[1] + 8) && (_clickedSpecialFlag == 0x40))
 		return clickedDoorNoPry(block, direction);
 
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 5e424b4817..79edfe9d72 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -2971,6 +2971,9 @@ bool Screen::loadPalette(const char *filename, Palette &pal) {
 	} else if (_vm->gameFlags().platform == Common::kPlatformPC98 && _use16ColorMode) {
 		numCols = stream->size() / Palette::kPC98BytesPerColor;
 		pal.loadPC98Palette(*stream, 0, MIN(maxCols, numCols));
+	} else if (_vm->gameFlags().gameID == GI_EOB1) {		
+		numCols = stream->size() / Palette::kVGABytesPerColor;
+		pal.loadVGAPalette7bit(*stream, 0, MIN(maxCols, numCols));
 	} else {
 		numCols = stream->size() / Palette::kVGABytesPerColor;
 		pal.loadVGAPalette(*stream, 0, MIN(maxCols, numCols));
@@ -3438,6 +3441,18 @@ void Palette::loadVGAPalette(Common::ReadStream &stream, int startIndex, int col
 	stream.read(_palData + startIndex * 3, colors * 3);
 }
 
+void Palette::loadVGAPalette7bit(Common::ReadStream &stream, int startIndex, int colors) {
+	assert(startIndex + colors <= _numColors);
+
+	stream.read(_palData + startIndex * 3, colors * 3);
+	uint8 *pos = _palData + startIndex * 3;
+	for (int i = 0 ; i < colors; i++) {
+		*pos++ &= 0x3f;
+		*pos++ &= 0x3f;
+		*pos++ &= 0x3f;
+	}
+}
+
 void Palette::loadAmigaPalette(Common::ReadStream &stream, int startIndex, int colors) {
 	assert(startIndex + colors <= _numColors);
 
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index cb7d73d1c1..d4f0dc97da 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -251,6 +251,11 @@ public:
 	 */
 	void loadVGAPalette(Common::ReadStream &stream, int startIndex, int colors);
 
+	/**
+	 * Load a VGA palette from the given stream masking out the upper bit.
+	 */
+	void loadVGAPalette7bit(Common::ReadStream &stream, int startIndex, int colors);
+
 	/**
 	 * Load a AMIGA palette from the given stream.
 	 */
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index d3c2187177..ccbc2a166b 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -145,12 +145,15 @@ void Screen_Eob::printShadedText(const char *string, int x, int y, int col1, int
 	printText(string, x, y, col1, 0);
 }
 
-void Screen_Eob::loadEobBitmap(const char *file, int tempPage, int destPage) {
-	loadEobCpsFileToPage(file, 0, tempPage, destPage, -1);
+void Screen_Eob::loadShapeSetBitmap(const char *file, int tempPage, int destPage) {
+	loadEobBitmap(file, 0, tempPage, destPage, -1);
 	_curPage = 2;
 }
 
-void Screen_Eob::loadEobCpsFileToPage(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage) {
+void Screen_Eob::loadEobBitmap(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage) {
+	//Common::String tmp = file;
+	//if (_vm->game() == GI_EOB1 && tmp.equalsIgnoreCase("spider"))
+	//	tmp += "1";
 	Common::String tmp = Common::String::format("%s.CPS", file);
 	Common::SeekableReadStream *s = _vm->resource()->createReadStream(tmp);
 	bool loadAlternative = false;
@@ -170,7 +173,7 @@ void Screen_Eob::loadEobCpsFileToPage(const char *file, const uint8 *ditheringDa
 		tmp.setChar('X', 0);
 		s = _vm->resource()->createReadStream(tmp);
 		if (!s)
-			error("Screen_Eob::loadEobCpsFileToPage(): CPS file loading failed.");
+			error("Screen_Eob::loadEobBitmap(): CPS file loading failed.");
 		s->seek(768);
 		loadFileDataToPage(s, destPage, 64000);
 		delete s;
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index 19cbdb5b4a..909a561462 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -51,8 +51,8 @@ public:
 	void loadFileDataToPage(Common::SeekableReadStream *s, int pageNum, uint32 size);
 
 	void printShadedText(const char *string, int x, int y, int col1, int col2);
-	void loadEobCpsFileToPage(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage);
-	void loadEobBitmap(const char *file, int tempPage, int destPage);
+	void loadEobBitmap(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage);
+	void loadShapeSetBitmap(const char *file, int tempPage, int destPage);
 
 	uint8 *encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool flag = false);
 	void drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd = -1, int flags = 0, ...);
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index 715970074a..2b86aa8d51 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -54,7 +54,7 @@ const uint8 *EobCoreEngine::initScriptTimers(const uint8 *pos) {
 	while (((int16)READ_LE_UINT16(pos)) != -1) {
 		_scriptTimers[_scriptTimersCount].func = READ_LE_UINT16(pos);
 		pos += 2;
-		uint16 ticks = (int16)READ_LE_UINT16(pos) * 18;
+		uint16 ticks = READ_LE_UINT16(pos) * 18;
 		_scriptTimers[_scriptTimersCount].ticks = ticks;
 		pos += 2;
 		_scriptTimers[_scriptTimersCount++].next = _system->getMillis() + ticks * _tickLength;
@@ -64,20 +64,26 @@ const uint8 *EobCoreEngine::initScriptTimers(const uint8 *pos) {
 }
 
 void EobCoreEngine::updateScriptTimers() {
-	if ((_scriptTimersMode & 1) && _stepsUntilScriptCall && _stepCounter > _stepsUntilScriptCall) {
+	bool timerUpdate = false;
+	if ((_scriptTimersMode & 2) && _stepsUntilScriptCall && _stepCounter > _stepsUntilScriptCall) {
 		_inf->run(0, 0x20);
 		_stepCounter = 0;
+		timerUpdate = true;
 	}
 
-	if (_scriptTimersMode & 2) {
+	if (_scriptTimersMode & 1) {
 		for (int i = 0; i < _scriptTimersCount; i++) {
 			if (_scriptTimers[i].next < _system->getMillis()) {
 				_inf->run(_scriptTimers[i].func, _flags.gameID == GI_EOB1 ? 0x20 : 0x80);
 				_scriptTimers[i].next = _system->getMillis() + _scriptTimers[i].ticks * _tickLength;
 				_sceneUpdateRequired = true;
+				timerUpdate = true;
 			}
 		}
 	}
+
+	if (timerUpdate)
+		updateScriptTimersExtra();
 }
 
 EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _vm(engine), _screen(screen),
@@ -211,13 +217,13 @@ bool EobInfProcessor::preventRest() const {
 void EobInfProcessor::loadState(Common::SeekableSubReadStreamEndian &in) {
 	_preventRest = in.readByte();
 	for (int i = 0; i < 18; i++)
-		_flagTable[i] = in.readUint16BE();
+		_flagTable[i] = in.readUint32BE();
 }
 
 void EobInfProcessor::saveState(Common::OutSaveFile *out) {
 	out->writeByte(_preventRest);
 	for (int i = 0; i < 18; i++)
-		out->writeUint16BE(_flagTable[i]);
+		out->writeUint32BE(_flagTable[i]);
 }
 
 const char *EobInfProcessor::getString(uint16 index) {
diff --git a/engines/kyra/sequences_eob1.cpp b/engines/kyra/sequences_eob1.cpp
index dcfabfeddd..8f360c071d 100644
--- a/engines/kyra/sequences_eob1.cpp
+++ b/engines/kyra/sequences_eob1.cpp
@@ -43,7 +43,7 @@ int EobEngine::mainMenu() {
 		switch (menuChoice) {
 			case 0:
 				_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
-				_screen->loadEobCpsFileToPage("INTRO", 0, 5, 3, 2);
+				_screen->loadEobBitmap("INTRO", 0, 5, 3, 2);
 				_screen->setScreenPalette(_screen->getPalette(0));
 				_screen->_curPage = 2;
 				of = _screen->setFont(Screen::FID_6_FNT);
@@ -107,6 +107,7 @@ void EobEngine::seq_playOpeningCredits() {
 	static const char *cmpList[] = { "WESTWOOD.CMP", "AND.CMP", "SSI.CMP", "PRESENT.CMP", "DAND.CMP" };
 	static const uint8 frameDelay[] = { 140, 50, 100, 50, 140 };
 
+	_allowSkip = true;
 	_screen->loadPalette("WESTWOOD.COL", _screen->getPalette(0));
 	_screen->setScreenPalette(_screen->getPalette(0));
 
@@ -125,14 +126,21 @@ void EobEngine::seq_playOpeningCredits() {
 	}
 
 	delay(50 * _tickLength);
+	_allowSkip = false;
 }
 
 void EobEngine::seq_playIntro() {
+	_allowSkip = true;
 	//_sound->playTrack(2);
+
+	_allowSkip = false;
 }
 
 void EobEngine::seq_playFinale() {
+	_allowSkip = true;
+
 
+	_allowSkip = false;
 }
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
index 8ff5581b9d..bba5a7a220 100644
--- a/engines/kyra/sequences_eob2.cpp
+++ b/engines/kyra/sequences_eob2.cpp
@@ -941,6 +941,7 @@ DarkmoonSequenceHelper::DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *
 
 	_system->delayMillis(150);
 	_vm->resetSkipFlag(true);
+	_vm->_allowSkip = true;
 }
 
 DarkmoonSequenceHelper::~DarkmoonSequenceHelper() {
@@ -960,6 +961,7 @@ DarkmoonSequenceHelper::~DarkmoonSequenceHelper() {
 
 	_system->delayMillis(150);
 	_vm->resetSkipFlag(true);
+	_vm->_allowSkip = false;
 }
 
 void DarkmoonSequenceHelper::loadScene(int index, int pageNum) {
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 3447b6bc7f..802ba4e4c8 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -54,7 +54,11 @@ int LolEobBaseEngine::getBlockDistance(uint16 block1, uint16 block2) {
 namespace Kyra {
 
 void EobCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex) {
-	_screen->loadEobBitmap(filename, 3, 3);
+	Common::String s = _flags.gameID == GI_EOB1 && !scumm_stricmp(filename, "spider") ? "spider1" : filename;
+	if (GI_EOB1 && !scumm_stricmp(filename, "rust"))
+		s += "1";
+
+	_screen->loadShapeSetBitmap(s.c_str(), 3, 3);
 	const uint16 *enc = &_encodeMonsterShpTable[encodeTableIndex << 2];
 
 	for (int i = 0; i < 6; i++, enc += 4)
@@ -275,14 +279,14 @@ void EobCoreEngine::updateAttackingMonsterFlags() {
 }
 
 const int8 *EobCoreEngine::getMonsterBlockPositions(uint16 block) {
-	static int8 pos[6];
-	memset(pos, -1, sizeof(pos));
+	memset(_monsterBlockPosArray, -1, sizeof(_monsterBlockPosArray));
 	for (int8 i = 0; i < 30; i++) {
 		if (_monsters[i].block != block)
 			continue;
-		pos[_monsters[i].pos] = i;
+		assert(_monsters[i].pos < sizeof(_monsterBlockPosArray));
+		_monsterBlockPosArray[_monsters[i].pos] = i;
 	}
-	return pos;
+	return _monsterBlockPosArray;
 }
 
 int EobCoreEngine::getClosestMonsterPos(int charIndex, int block) {
@@ -770,6 +774,11 @@ void EobCoreEngine::updateMonsterDest2(EobMonsterInPlay *m) {
 	m->dest = _currentBlock;
 }
 
+void EobCoreEngine::updateAllMonsterDests() {
+	for (int i = 0; i < 30; i++)
+		updateMonsterDest(&_monsters[i]);
+}
+
 void EobCoreEngine::turnFriendlyMonstersHostile() {
 	EobMonsterInPlay *m = 0;
 	for (int i = 0; i < 30; i++) {
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 9b15d4aea8..f07cd1186f 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -448,7 +448,7 @@ void EobCoreEngine::initStaticResource() {
 	_npcPreset = _staticres->loadEobNpcData(kEobBaseNpcPresets, temp);
 
 	_teleporterShapeCoords = _staticres->loadRawData(kEobBaseDscTelptrShpCoords, temp);
-	_portalSeq = _staticres->loadRawData(kEobBasePortalSeqData, temp);
+	_portalSeq = (const int8*)_staticres->loadRawData(kEobBasePortalSeqData, temp);
 	_mnDef = _staticres->loadRawData(kEobBaseManDef, temp);
 	_mnWord = _staticres->loadStrings(kEobBaseManWord, _mnNumWord);
 	_mnPrompt = _staticres->loadStrings(kEobBaseManPrompt, temp);
@@ -493,6 +493,7 @@ void EobCoreEngine::initStaticResource() {
 	_dscDoorScaleMult2 = _staticres->loadRawData(kEobBaseDscDoorScaleMult2, temp);
 	_dscDoorScaleMult3 = _staticres->loadRawData(kEobBaseDscDoorScaleMult3, temp);
 	_dscDoorY1 = _staticres->loadRawData(kEobBaseDscDoorY1, temp);
+	_dscDoorXE = _staticres->loadRawData(kEobBaseDscDoorXE, temp);
 
 	_dscItemPosIndex= _staticres->loadRawData(kEobBaseDscItemPosIndex, temp);
 	_dscItemShpX = (const int16*)_staticres->loadRawDataBe16(kEobBaseDscItemShpX, temp);
@@ -533,6 +534,7 @@ void EobCoreEngine::initStaticResource() {
 	_sparkEffectOfY = _staticres->loadRawData(kEobBaseSparkOfY, temp);
 	_magicFlightObjectProperties = _staticres->loadRawData(kEobBaseMagicFlightProps, temp);
 	_turnUndeadEffect = _staticres->loadRawData(kEobBaseTurnUndeadEffect, temp);
+	_burningHandsDest = _staticres->loadRawData(kEobBaseBurningHandsDest, temp);
 
 	// Hard code the following strings, since EOB I doesn't have them in the original.
 	// EOB I doesn't have load and save menus, because there is only one single
@@ -1002,7 +1004,8 @@ void EobCoreEngine::initSpells() {
 	ec2(empty);
 	ec(empty);
 	ec2(empty);
-	ec(unk1Passive);
+	ec1(kuotoaAttack);
+	ec2(unk1Passive);
 	ec2(empty);
 	ec2(unk2Passive);
 	ec(deathSpellPassive);
@@ -1064,6 +1067,7 @@ void EobEngine::initStaticResource() {
 	_dscDoorY4 = _staticres->loadRawData(kEobBaseDscDoorY4, temp);
 	_dscDoorY5 = _staticres->loadRawData(kEobBaseDscDoorY5, temp);
 	_dscDoorY6 = _staticres->loadRawData(kEobBaseDscDoorY6, temp);
+	_dscDoorY7 = _staticres->loadRawData(kEobBaseDscDoorY7, temp);
 	_dscDoorCoordsExt = (const int16*)_staticres->loadRawDataBe16(kEobBaseDscDoorCoordsExt, temp);
 
 	_monsterDistAttType10 = _staticres->loadRawData(kEob1MonsterDistAttType10, temp);
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 9e03bdebcf..ba4d6a2475 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -210,7 +210,7 @@ void EobCoreEngine::advanceTimers(uint32 millis) {
 
 	setupCharacterTimers();
 
-	if (_scriptTimersMode & 2) {
+	if (_scriptTimersMode & 1) {
 		for (int i = 0; i < _scriptTimersCount; i++) {
 			if (_scriptTimers[i].next > ct) {
 				uint32 chrt = _scriptTimers[i].next - ct;
@@ -371,7 +371,7 @@ void EobCoreEngine::timerUpdateTeleporters(int timerNum) {
 	_teleporterPulse ^= 1;
 	for (int i = 0; i < 18; i++) {
 		uint8 w = _visibleBlocks[i]->walls[_sceneDrawVarDown];
-		if (w == 44 || w == 74) {
+		if ((_flags.gameID == GI_EOB1 && w == 52) || (_flags.gameID == GI_EOB2 && (w == 44 || w == 74))) {
 			_sceneUpdateRequired = true;
 			return;
 		}
-- 
cgit v1.2.3


From fc5b29fdbcf4170436a32da2c1f4b078b1f1f90f Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 7 Aug 2011 03:31:15 +0200
Subject: KYRA: (EOB) - implemented some spells and fixed more bugs

---
 engines/kyra/eob1.cpp          |   7 ++-
 engines/kyra/eobcommon.cpp     |  27 +++++----
 engines/kyra/eobcommon.h       |  21 ++++---
 engines/kyra/gui_eob.cpp       |   8 +--
 engines/kyra/items_eob.cpp     |  29 ++++-----
 engines/kyra/magic_eob.cpp     | 132 ++++++++++++++++++++++++++++++-----------
 engines/kyra/resource.h        |   4 +-
 engines/kyra/saveload_eob.cpp  |   8 +--
 engines/kyra/sprites_eob.cpp   |  20 +++----
 engines/kyra/staticres_eob.cpp |   4 +-
 engines/kyra/timer_eob.cpp     |   6 +-
 11 files changed, 167 insertions(+), 99 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index 762b2d1bd1..f48e850274 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -438,9 +438,9 @@ void EobEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wal
 		case 11:
 			v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult5[mDim] : _dscDoorScaleMult6[mDim]) * -1;
 			x -= (shp[2] << 2);
-			y = _dscDoorY3[mDim] + v;
+			y = _dscDoorY4[mDim] + v;
 			drawBlockObject(0, 2, shp, x, y + v, 5);
-			v >>= 4;
+			v = (v >> 3) + (v >> 2);
 			y = _dscDoorY5[mDim];
 			drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], x, y - v, 5);
 			if (_wllShapeMap[wall] == -1)
@@ -505,6 +505,7 @@ void EobEngine::turnUndeadAutoHit() {
 
 bool EobEngine::checkPartyStatusExtra() {
 	_screen->copyPage(0, 10);
+	int cd = _screen->curDimIndex();
 	gui_drawBox(0, 121, 320, 80, _color1_1, _color2_1, _bkgColor_1);
 	_txt->setupField(9, false);
 	_txt->printMessage(_menuStringsDefeat[0]);
@@ -515,6 +516,8 @@ bool EobEngine::checkPartyStatusExtra() {
 	}
 	_screen->copyPage(10, 0);
 	_eventList.clear();
+	_screen->setScreenDim(cd);
+	_txt->removePageBreakFlag();
 	return true;
 }
 
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 3e1001d2bd..5fc50f667b 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -55,8 +55,8 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_tempIconShape = 0;
 
 	_monsterDustStrings = 0;
-	_monsterDistAttType10 = 0;
-	_monsterDistAttSfx10 = 0;
+	_enemyMageSpellList = 0;
+	_enemyMageSfx = 0;
 	_monsterDistAttType17 = 0;
 	_monsterDistAttSfx17 = 0;
 
@@ -130,8 +130,8 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_openBookType = _openBookTypeBackup = 0;
 	_openBookSpellList = 0;
 	_openBookAvailableSpells = 0;
-	_activeSpellCaster = 0;
-	_activeSpellCasterPos = 0;
+	_activeSpellCharId = 0;
+	_activeSpellCharacterPos = 0;
 	_activeSpell = 0;
 	_returnAfterSpellCallback = false;
 	_spells = 0;
@@ -473,7 +473,7 @@ bool EobCoreEngine::checkPartyStatus(bool handleDeath) {
 
 	if (!handleDeath)
 		return true;
-
+	
 	gui_drawAllCharPortraitsWithStats();
 
 	if (checkPartyStatusExtra()) {
@@ -1550,13 +1550,14 @@ void EobCoreEngine::seq_portal() {
 		} else {
 			s--;
 			_screen->copyRegion((s % 5) << 6, s / 5 * 77, 56, 27, 64, 77, 2, 0, Screen::CR_NO_P_CHECK);
-			if (s == 0)
-				snd_playSoundEffect(31);
-			else if (s == 3) {
-				if (*(pos - 2) == 3)
-					snd_playSoundEffect(90);
-			}
-		}		
+		}
+
+		if (s == 1)
+			snd_playSoundEffect(31);
+		else if (s == 3) {
+			if (*(pos - 2) == 3)
+				snd_playSoundEffect(90);
+		}
 		
 		_screen->updateScreen();
 		delay(2 * _tickLength);
@@ -1646,7 +1647,7 @@ int EobCoreEngine::closeDistanceAttack(int charIndex, Item item) {
 		return -3;
 
 	uint16 d = calcNewBlockPosition(_currentBlock, _currentDirection);
-	int r = getClosestMonsterPos(charIndex, d);
+	int r = getClosestMonster(charIndex, d);
 
 	if (r == -1) {
 		uint8 w = _specialWallTypes[_levelBlockProperties[d].walls[_sceneDrawVarDown]];
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 33b4a2fc2d..1b701cfeb3 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -486,8 +486,8 @@ protected:
 	int countSpecificMonsters(int type);
 	void updateAttackingMonsterFlags();
 
-	const int8 *getMonsterBlockPositions(uint16 block);
-	int getClosestMonsterPos(int charIndex, int block);
+	const int8 *getMonstersOnBlockPositions(uint16 block);
+	int getClosestMonster(int charIndex, int block);
 
 	bool blockHasMonsters(uint16 block);
 	bool isMonsterOnPos(EobMonsterInPlay *m, uint16 block, int pos, int checkPos4);
@@ -547,8 +547,8 @@ protected:
 	const uint8 *_findBlockMonstersTable;
 	const char *const *_monsterDustStrings;
 	
-	const uint8 *_monsterDistAttType10;
-	const uint8 *_monsterDistAttSfx10;
+	const uint8 *_enemyMageSpellList;
+	const uint8 *_enemyMageSfx;
 	const uint8 *_monsterDistAttType17;
 	const uint8 *_monsterDistAttSfx17;
 	const char *const *_monsterSpecAttStrings;
@@ -912,7 +912,9 @@ protected:
 	bool magicObjectStatusHit(EobMonsterInPlay *m, int type, bool tryEvade, int mod);
 	bool turnUndeadHit(EobMonsterInPlay *m, int hitChance, int casterLevel);
 
-	void printWarning(const char* str);
+	int findSingleSpellTarget(int dist);
+
+	void printWarning(const char *str);
 	void printNoEffectWarning();
 
 	void spellCallback_start_empty() {}
@@ -993,8 +995,8 @@ protected:
 	uint8 _openBookCasterLevel;
 	const char *const *_openBookSpellList;
 	int8 *_openBookAvailableSpells;
-	uint8 _activeSpellCaster;
-	uint8 _activeSpellCasterPos;
+	uint8 _activeSpellCharId;
+	uint8 _activeSpellCharacterPos;
 	uint8 _activeSpell;
 	bool _returnAfterSpellCallback;
 
@@ -1046,6 +1048,11 @@ protected:
 	const uint8 *_magicFlightObjectProperties;
 	const uint8 *_turnUndeadEffect;
 	const uint8 *_burningHandsDest;
+	const int8 *_coneOfColdDest1;
+	const int8 *_coneOfColdDest2;
+	const int8 *_coneOfColdDest3;
+	const int8 *_coneOfColdDest4;
+	const int8 *_coneOfColdGfxTbl;
 
 	// Menu
 	EobMenuDef *_menuDefs;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 04b863c325..393bbab4a8 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -524,7 +524,7 @@ void EobCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
 	EobCharacter *c = &_characters[index];
 
 	bool redGreen = ((c->effectFlags & 0x4818) || (_partyEffectFlags & 0x20000) || c->effectsRemainder[0] || c->effectsRemainder[1]) ? true : false;
-	bool yellow = ((c->effectFlags & 0x13000) || (_partyEffectFlags & 0x8420) || c->effectsRemainder[0] || c->effectsRemainder[1]) ? true : false;
+	bool yellow = ((c->effectFlags & 0x13000) || (_partyEffectFlags & 0x8420)) ? true : false;
 
 	if (redGreen || yellow) {
 		if (redGreen && !yellow) {
@@ -1108,9 +1108,9 @@ int EobCoreEngine::clickedSpellbookList(Button *button) {
 }
 
 int EobCoreEngine::clickedCastSpellOnCharacter(Button *button) {
-	_activeSpellCaster = button->arg & 0xff;
+	_activeSpellCharId = button->arg & 0xff;
 
-	if (_activeSpellCaster == 0xff) {
+	if (_activeSpellCharId == 0xff) {
 		printWarning(_magicStrings3[_flags.gameID == GI_EOB1 ? 2 : 1]);
 		if (_castScrollSlot) {
 			gui_updateSlotAfterScrollUse();
@@ -1119,7 +1119,7 @@ int EobCoreEngine::clickedCastSpellOnCharacter(Button *button) {
 			gui_drawSpellbook();
 		}
 	} else {
-		if (_characters[_activeSpellCaster].flags & 1)
+		if (_characters[_activeSpellCharId].flags & 1)
 			startSpell(_activeSpell);
 	}
 
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index b48c3934c8..e2d28703a8 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -256,22 +256,19 @@ bool EobCoreEngine::deletePartyItems(int16 itemType, int16 itemValue) {
 			continue;
 
 		EobCharacter *c = &_characters[i];
-		int slot = checkInventoryForItem(i, itemType, itemValue);
-
-		if (slot == -1)
-			continue;
-
-		int itm = c->inventory[slot];
-		_items[itm].block = -1;
-		c->inventory[slot] = 0;
-		res = true;
+		for (int slot = checkInventoryForItem(i, itemType, itemValue); slot != -1; slot = checkInventoryForItem(i, itemType, itemValue)) {
+			int itm = c->inventory[slot];
+			_items[itm].block = -1;
+			c->inventory[slot] = 0;
+			res = true;
 
-		if (!_dialogueField) {
-			if (_currentControlMode == 0 && slot < 2 && i < 5)
-				gui_drawWeaponSlot(i, slot);
+			if (!_dialogueField) {
+				if (_currentControlMode == 0 && slot < 2 && i < 5)
+					gui_drawWeaponSlot(i, slot);
 
-			if (_currentControlMode == 1 && i == _updateCharNum)
-				gui_drawInventoryItem(slot, 1, 0);
+				if (_currentControlMode == 1 && i == _updateCharNum)
+					gui_drawInventoryItem(slot, 1, 0);
+			}
 		}
 	}
 
@@ -379,9 +376,9 @@ void EobCoreEngine::printFullItemName(Item item) {
 				if (v == 0)
 					tmpString = nameUnid;
 				else if (v < 0)
-					tmpString = Common::String::format(_cursedString[0], v, nameUnid);
+					tmpString = _flags.gameID == GI_EOB1 ? Common::String::format(_cursedString[0], nameUnid, v) : Common::String::format(_cursedString[0], v, nameUnid);
 				else
-					tmpString = Common::String::format(_enchantedString[0], v, nameUnid);
+					tmpString = _flags.gameID == GI_EOB1 ? Common::String::format(_enchantedString[0], nameUnid, v) : Common::String::format(_enchantedString[0], v, nameUnid);
 				break;
 
 			case 9:
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 12d2524545..d06e15b36f 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -184,7 +184,7 @@ void EobCoreEngine::castSpell(int spell, int weaponSlot) {
 	if (ci > 3)
 		ci -= 2;
 
-	_activeSpellCasterPos = _dropItemDirIndex[(_currentDirection << 2) + ci];
+	_activeSpellCharacterPos = _dropItemDirIndex[(_currentDirection << 2) + ci];
 
 	if (s->flags & 0x400) {
 		if (c->inventory[0] && c->inventory[1]) {
@@ -226,7 +226,7 @@ void EobCoreEngine::castSpell(int spell, int weaponSlot) {
 		return;
 	}
 
-	_activeSpellCaster = _openBookChar;
+	_activeSpellCharId = _openBookChar;
 	startSpell(spell);
 }
 
@@ -258,7 +258,7 @@ void EobCoreEngine::removeCharacterEffect(int spell, int charIndex, int showWarn
 	}
 
 	if (s->flags & 0x2)
-		recalcArmorClass(_activeSpellCaster);
+		recalcArmorClass(_activeSpellCharId);
 
 	if (showWarning) {
 		if (s->flags & 0x20A0)
@@ -296,11 +296,11 @@ void EobCoreEngine::castOnWhomDialogue() {
 
 void EobCoreEngine::startSpell(int spell) {
 	EobSpell *s = &_spells[spell];
-	EobCharacter *c = &_characters[_activeSpellCaster];
+	EobCharacter *c = &_characters[_activeSpellCharId];
 	snd_playSoundEffect(s->sound);
 
 	if (s->flags & 0xa0)
-		sparkEffectDefensive(_activeSpellCaster);
+		sparkEffectDefensive(_activeSpellCharId);
 	else if (s->flags & 0x40)
 		sparkEffectDefensive(-1);
 	else if (s->flags & 0x1000)
@@ -312,9 +312,17 @@ void EobCoreEngine::startSpell(int spell) {
 	}
 
 	if ((s->flags & 0x30) && (s->effectFlags & c->effectFlags)) {
-		printWarning(Common::String::format(_magicStrings7[0], c->name, s->name).c_str());
+		if (_flags.gameID == GI_EOB1) {
+			// TODO: warnings seem to exist at least for bless and aid
+		} else {
+			printWarning(Common::String::format(_magicStrings7[0], c->name, s->name).c_str());
+		}
 	} else if ((s->flags & 0x50) && (s->effectFlags & _partyEffectFlags)) {
-		printWarning(Common::String::format(_magicStrings7[1], s->name).c_str());
+		if (_flags.gameID == GI_EOB1) {
+			// TODO: warnings seem to exist at least for bless and aid
+		} else {
+			printWarning(Common::String::format(_magicStrings7[1], s->name).c_str());
+		}
 	} else {
 		if (s->flags & 8)
 			setSpellEventTimer(spell, s->timingPara[0], s->timingPara[1], s->timingPara[2], s->timingPara[3]);
@@ -341,10 +349,10 @@ void EobCoreEngine::startSpell(int spell) {
 		}
 
 		if (s->flags & 2)
-			recalcArmorClass(_activeSpellCaster);
+			recalcArmorClass(_activeSpellCharId);
 
 		if (s->flags & 0x20A0)
-			gui_drawCharPortraitWithStats(_activeSpellCaster);
+			gui_drawCharPortraitWithStats(_activeSpellCharId);
 		if (s->flags & 0x40)
 			gui_drawAllCharPortraitsWithStats();
 	}
@@ -438,7 +446,7 @@ void EobCoreEngine::sparkEffectOffensive() {
 void EobCoreEngine::setSpellEventTimer(int spell, int timerBaseFactor, int timerLength, int timerLevelFactor, int updateExistingTimer) {
 	int l = _openBookType == 1 ? getCharacterClericPaladinLevel(_openBookChar) : getCharacterMageLevel(_openBookChar);
 	uint32 countdown = timerLength * timerBaseFactor + timerLength * l * timerLevelFactor;
-	setCharEventTimer(_activeSpellCaster, countdown, -spell, updateExistingTimer);
+	setCharEventTimer(_activeSpellCharId, countdown, -spell, updateExistingTimer);
 }
 
 void EobCoreEngine::sortCharacterSpellList(int charIndex) {
@@ -624,7 +632,23 @@ bool EobCoreEngine::turnUndeadHit(EobMonsterInPlay *m, int hitChance, int caster
 	return true;
 }
 
-void EobCoreEngine::printWarning(const char* str) {
+int EobCoreEngine::findSingleSpellTarget(int dist) {
+	uint16 bl = _currentBlock;
+	int res = -1;
+
+	for (int i = 0; i < dist && res == -1; i++) {
+		bl = calcNewBlockPosition(bl, _currentDirection);
+		res = getClosestMonster(_openBookChar, bl);
+		if (!(_wllWallFlags[_levelBlockProperties[bl].walls[_sceneDrawVarDown]] & 1)) {
+			i = dist;
+			res = -1;
+		}
+	}
+
+	return res;
+}
+
+void EobCoreEngine::printWarning(const char *str) {
 	_txt->printMessage(str);
 	snd_playSoundEffect(79);
 }
@@ -634,7 +658,9 @@ void EobCoreEngine::printNoEffectWarning() {
 }
 
 void EobCoreEngine::spellCallback_start_armor() {
-
+	_characters[_activeSpellCharId].effectsRemainder[0] = getCharacterMageLevel(_openBookChar) + 8;
+	if ((getDexterityArmorClassModifier(_characters[_activeSpellCharId].dexterityCur) + 6) >= _characters[_activeSpellCharId].armorClass)
+		printWarning(Common::String::format(_magicStrings6[0], _characters[_activeSpellCharId].name).c_str());
 }
 
 void EobCoreEngine::spellCallback_start_burningHands() {
@@ -649,7 +675,7 @@ void EobCoreEngine::spellCallback_start_burningHands() {
 	int cl = getCharacterMageLevel(_openBookChar);
 	int bl = calcNewBlockPosition(_currentBlock, _currentDirection);
 
-	const int8 *pos = getMonsterBlockPositions(bl);
+	const int8 *pos = getMonstersOnBlockPositions(bl);
 	_preventMonsterFlash = true;
 
 	int numDest = (_flags.gameID == GI_EOB1) ? 2 : 6;
@@ -674,7 +700,7 @@ bool EobCoreEngine::spellCallback_end_detectMagic(EobFlyingObject*) {
 }
 
 void EobCoreEngine::spellCallback_start_magicMissile() {
-	launchMagicObject(_openBookChar, 0, _currentBlock, _activeSpellCasterPos, _currentDirection);
+	launchMagicObject(_openBookChar, 0, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
 bool EobCoreEngine::spellCallback_end_magicMissile(EobFlyingObject *fo) {
@@ -694,10 +720,11 @@ void EobCoreEngine::spellCallback_start_improvedIdentify() {
 }
 
 void EobCoreEngine::spellCallback_start_melfsAcidArrow() {
-	launchMagicObject(_openBookChar, 1, _currentBlock, _activeSpellCasterPos, _currentDirection);
+	launchMagicObject(_openBookChar, 1, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
 bool EobCoreEngine::spellCallback_end_melfsAcidArrow(EobFlyingObject *fo) {
+	assert(fo);
 	return magicObjectDamageHit(fo, 2, 4, 0, getCharacterMageLevel(fo->attackerId) / 3);
 }
 
@@ -706,7 +733,7 @@ void EobCoreEngine::spellCallback_start_dispelMagic() {
 }
 
 void EobCoreEngine::spellCallback_start_fireball() {
-	launchMagicObject(_openBookChar, 2, _currentBlock, _activeSpellCasterPos, _currentDirection);
+	launchMagicObject(_openBookChar, 2, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
 bool EobCoreEngine::spellCallback_end_fireball(EobFlyingObject *fo) {
@@ -714,7 +741,7 @@ bool EobCoreEngine::spellCallback_end_fireball(EobFlyingObject *fo) {
 }
 
 void EobCoreEngine::spellCallback_start_flameArrow() {
-	launchMagicObject(_openBookChar, 3, _currentBlock, _activeSpellCasterPos, _currentDirection);
+	launchMagicObject(_openBookChar, 3, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
 bool EobCoreEngine::spellCallback_end_flameArrow(EobFlyingObject *fo) {
@@ -722,7 +749,7 @@ bool EobCoreEngine::spellCallback_end_flameArrow(EobFlyingObject *fo) {
 }
 
 void EobCoreEngine::spellCallback_start_holdPerson() {
-	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 4 : 3, _currentBlock, _activeSpellCasterPos, _currentDirection);
+	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 4 : 3, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
 bool EobCoreEngine::spellCallback_end_holdPerson(EobFlyingObject *fo) {
@@ -751,7 +778,7 @@ bool EobCoreEngine::spellCallback_end_holdPerson(EobFlyingObject *fo) {
 }
 
 void EobCoreEngine::spellCallback_start_lightningBolt() {
-	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 5 : 4, _currentBlock, _activeSpellCasterPos, _currentDirection);
+	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 5 : 4, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
 bool EobCoreEngine::spellCallback_end_lightningBolt(EobFlyingObject *fo) {
@@ -776,7 +803,7 @@ void EobCoreEngine::spellCallback_start_fear() {
 }
 
 void EobCoreEngine::spellCallback_start_iceStorm() {
-	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 6 : 5, _currentBlock, _activeSpellCasterPos, _currentDirection);
+	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 6 : 5, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
 bool EobCoreEngine::spellCallback_end_iceStorm(EobFlyingObject *fo) {
@@ -794,15 +821,32 @@ bool EobCoreEngine::spellCallback_end_iceStorm(EobFlyingObject *fo) {
 }
 
 void EobCoreEngine::spellCallback_start_removeCurse() {
-
+	for (int i = 0; i < 27; i++) {
+		Item itm = _characters[_activeSpellCharId].inventory[i];
+		if (itm && (_items[itm].flags & 0x20) && !isMagicWeapon(itm))
+			_items[itm].flags = (_items[itm].flags & ~0x20) | 0x40;
+	}
 }
 
 void EobCoreEngine::spellCallback_start_coneOfCold() {
+	static const int8 *dirTables[] = { _coneOfColdDest1, _coneOfColdDest2, _coneOfColdDest3, _coneOfColdDest4 };
+	
+	int cl = getCharacterMageLevel(_openBookChar);
+	//drawConeOfColdEffect(150, 50, 10, 1, 100, _coneOfColdGfxTbl);
+	
+	const int8 *tbl = dirTables[_currentDirection];
+	_preventMonsterFlash = true;
+
+	for (int i = 0; i < 7; i++) {		
+		for (const int16 *m = findBlockMonsters((_currentBlock + tbl[i]) & 0x3ff, 4, _currentDirection, 1, 1); *m != -1; m++)
+			calcAndInflictMonsterDamage(&_monsters[*m], cl, 4, cl, 0x41, 5, 0);
+	}
 
+	updateAllMonsterShapes();
 }
 
 void EobCoreEngine::spellCallback_start_holdMonster() {
-
+	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 7 : 6, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
 bool EobCoreEngine::spellCallback_end_holdMonster(EobFlyingObject *fo) {
@@ -817,12 +861,16 @@ void EobCoreEngine::spellCallback_start_wallOfForce() {
 }
 
 void EobCoreEngine::spellCallback_start_disintegrate() {
-
+	int d = findSingleSpellTarget(1);
+	if (d != -1)
+		magicObjectStatusHit(&_monsters[d], 4, true, 4);
+	memset(_visibleBlocks[13]->walls, 0, 4);
+	_sceneUpdateRequired = true;
 }
 
 void EobCoreEngine::spellCallback_start_fleshToStone() {
 	sparkEffectOffensive();
-	int t = getClosestMonsterPos(_openBookChar, calcNewBlockPosition(_currentBlock, _currentDirection));
+	int t = getClosestMonster(_openBookChar, calcNewBlockPosition(_currentBlock, _currentDirection));
 	if (t != -1)
 		magicObjectStatusHit(&_monsters[t], 5, true, 4);
 	else
@@ -830,8 +878,8 @@ void EobCoreEngine::spellCallback_start_fleshToStone() {
 }
 
 void EobCoreEngine::spellCallback_start_stoneToFlesh() {
-	if (_characters[_activeSpellCaster].flags & 8)
-		_characters[_activeSpellCaster].flags &= ~8;
+	if (_characters[_activeSpellCharId].flags & 8)
+		_characters[_activeSpellCharId].flags &= ~8;
 	else
 		printNoEffectWarning();
 }
@@ -846,11 +894,18 @@ bool EobCoreEngine::spellCallback_end_trueSeeing(EobFlyingObject*) {
 }
 
 void EobCoreEngine::spellCallback_start_slayLiving() {
-
+	int d = findSingleSpellTarget(2);
+	if (d != -1)
+		if (!magicObjectStatusHit(&_monsters[d], 3, true, 4))
+			inflictMonsterDamage(&_monsters[d], rollDice(2, 8, 1), true);
 }
 
 void EobCoreEngine::spellCallback_start_powerWordStun() {
-
+	int d = findSingleSpellTarget(2);
+	if (d != -1) {
+		if (_monsters[d].hitPointsCur < 90)
+			magicObjectStatusHit(&_monsters[d], 5, true, 4);
+	}
 }
 
 void EobCoreEngine::spellCallback_start_causeLightWounds() {
@@ -858,7 +913,7 @@ void EobCoreEngine::spellCallback_start_causeLightWounds() {
 }
 
 void EobCoreEngine::spellCallback_start_cureLightWounds() {
-	modifyCharacterHitpoints(_activeSpellCaster, rollDice(1, 8));
+	modifyCharacterHitpoints(_activeSpellCharId, rollDice(1, 8));
 }
 
 void EobCoreEngine::spellCallback_start_aid() {
@@ -904,7 +959,7 @@ void EobCoreEngine::spellCallback_start_causeSeriousWounds() {
 }
 
 void EobCoreEngine::spellCallback_start_cureSeriousWounds() {
-	modifyCharacterHitpoints(_activeSpellCaster, rollDice(2, 8, 1));
+	modifyCharacterHitpoints(_activeSpellCharId, rollDice(2, 8, 1));
 }
 
 void EobCoreEngine::spellCallback_start_neutralizePoison() {
@@ -916,11 +971,11 @@ void EobCoreEngine::spellCallback_start_causeCriticalWounds() {
 }
 
 void EobCoreEngine::spellCallback_start_cureCriticalWounds() {
-	modifyCharacterHitpoints(_activeSpellCaster, rollDice(3, 8, 3));
+	modifyCharacterHitpoints(_activeSpellCharId, rollDice(3, 8, 3));
 }
 
 void EobCoreEngine::spellCallback_start_flameStrike() {
-	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 8 : 7, _currentBlock, _activeSpellCasterPos, _currentDirection);
+	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 8 : 7, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
 bool EobCoreEngine::spellCallback_end_flameStrike(EobFlyingObject *fo) {
@@ -928,7 +983,12 @@ bool EobCoreEngine::spellCallback_end_flameStrike(EobFlyingObject *fo) {
 }
 
 void EobCoreEngine::spellCallback_start_raiseDead() {
-
+	if (_characters[_activeSpellCharId].hitPointsCur == -10 || ((_characters[_activeSpellCharId].raceSex >> 1) == 1)) {
+		_characters[_activeSpellCharId].hitPointsCur = 1;
+		gui_drawCharPortraitWithStats(_activeSpellCharId);
+	} else {
+		printNoEffectWarning();
+	}
 }
 
 void EobCoreEngine::spellCallback_start_harm() {
@@ -936,15 +996,15 @@ void EobCoreEngine::spellCallback_start_harm() {
 }
 
 void EobCoreEngine::spellCallback_start_heal() {
-	EobCharacter *c = &_characters[_activeSpellCaster];
+	EobCharacter *c = &_characters[_activeSpellCharId];
 	if (c->hitPointsMax <= c->hitPointsCur)
 		printWarning(_magicStrings4[0]);
 	else
-		modifyCharacterHitpoints(_activeSpellCaster, c->hitPointsMax - c->hitPointsCur);
+		modifyCharacterHitpoints(_activeSpellCharId, c->hitPointsMax - c->hitPointsCur);
 }
 
 void EobCoreEngine::spellCallback_start_layOnHands() {
-	modifyCharacterHitpoints(_activeSpellCaster, _characters[_openBookChar].level[0] << 1);
+	modifyCharacterHitpoints(_activeSpellCharId, _characters[_openBookChar].level[0] << 1);
 }
 
 void EobCoreEngine::spellCallback_start_turnUndead() {
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index f80fdd91c2..a54ae6cd9a 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -485,8 +485,8 @@ enum KyraResources {
 	kEob1DoorSwitchCoords,
 	kEob1MonsterProperties,
 
-	kEob1MonsterDistAttType10,
-	kEob1MonsterDistAttSfx10,
+	kEob1EnemyMageSpellList,
+	kEob1EnemyMageSfx,
 	kEob1MonsterDistAttType17,
 	kEob1MonsterDistAttSfx17,
 
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 88f0c1c64e..05eea820bb 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -241,8 +241,8 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 	_openBookType = in.readByte();
 	_openBookCharBackup = in.readByte();
 	_openBookTypeBackup = in.readByte();
-	_activeSpellCaster = in.readByte();
-	_activeSpellCasterPos = in.readByte();
+	_activeSpellCharId = in.readByte();
+	_activeSpellCharacterPos = in.readByte();
 	_activeSpell = in.readByte();
 	_returnAfterSpellCallback = in.readByte() ? true : false;
 
@@ -465,8 +465,8 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 	out->writeByte(_openBookType);
 	out->writeByte(_openBookCharBackup);
 	out->writeByte(_openBookTypeBackup);
-	out->writeByte(_activeSpellCaster);
-	out->writeByte(_activeSpellCasterPos);
+	out->writeByte(_activeSpellCharId);
+	out->writeByte(_activeSpellCharacterPos);
 	out->writeByte(_activeSpell);
 	out->writeByte(_returnAfterSpellCallback ? 1 : 0);
 
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 802ba4e4c8..945ccaca17 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -54,8 +54,8 @@ int LolEobBaseEngine::getBlockDistance(uint16 block1, uint16 block2) {
 namespace Kyra {
 
 void EobCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex) {
-	Common::String s = _flags.gameID == GI_EOB1 && !scumm_stricmp(filename, "spider") ? "spider1" : filename;
-	if (GI_EOB1 && !scumm_stricmp(filename, "rust"))
+	Common::String s = filename;
+	if (GI_EOB1 && !scumm_stricmp(filename, "rust") || !scumm_stricmp(filename, "drider") || !scumm_stricmp(filename, "spider") || !scumm_stricmp(filename, "mantis") || !scumm_stricmp(filename, "xorn"))
 		s += "1";
 
 	_screen->loadShapeSetBitmap(s.c_str(), 3, 3);
@@ -147,7 +147,7 @@ const uint8 *EobCoreEngine::loadActiveMonsterData(const uint8 *data, int level)
 	uint32 ct = _system->getMillis();
 	for (int i = 0x20; i < 0x24; i++) {
 		int32 del = _timer->getDelay(i);
-		_timer->setNextRun(i, (i & 1) ? ct + (del >> 1) : ct + del);
+		_timer->setNextRun(i, (i & 1) ? ct + (del >> 1) * _tickLength : ct + del * _tickLength);
 	}
 
 	if (_hasTempDataFlags & (1 << (level - 1)))
@@ -178,7 +178,7 @@ void EobCoreEngine::initMonster(int index, int unit, uint16 block, int pos, int
 	if (index & 1)
 		unit++;
 
-	m->stepsTillRemoteAttack = _flags.gameID == GI_EOB2 ? rollDice(1, 3, 0) : 0;
+	m->stepsTillRemoteAttack = _flags.gameID == GI_EOB2 ? rollDice(1, 3, 0) : 5;
 	m->type = type;
 	m->numRemoteAttacks = p->numRemoteAttacks;
 	m->curRemoteWeapon = 0;
@@ -278,7 +278,7 @@ void EobCoreEngine::updateAttackingMonsterFlags() {
 		_inf->setFlag(0x800);
 }
 
-const int8 *EobCoreEngine::getMonsterBlockPositions(uint16 block) {
+const int8 *EobCoreEngine::getMonstersOnBlockPositions(uint16 block) {
 	memset(_monsterBlockPosArray, -1, sizeof(_monsterBlockPosArray));
 	for (int8 i = 0; i < 30; i++) {
 		if (_monsters[i].block != block)
@@ -289,8 +289,8 @@ const int8 *EobCoreEngine::getMonsterBlockPositions(uint16 block) {
 	return _monsterBlockPosArray;
 }
 
-int EobCoreEngine::getClosestMonsterPos(int charIndex, int block) {
-	const int8 *pos = getMonsterBlockPositions(block);
+int EobCoreEngine::getClosestMonster(int charIndex, int block) {
+	const int8 *pos = getMonstersOnBlockPositions(block);
 	if (pos[4] != -1)
 		return pos[4];
 
@@ -915,7 +915,7 @@ bool EobCoreEngine::updateMonsterTryDistanceAttack(EobMonsterInPlay *m) {
 	if (!m->numRemoteAttacks || ((_flags.gameID == GI_EOB1) && !(p->capsFlags & 0x40)))
 		return false;
 
-	if ((_flags.gameID == GI_EOB1 && m->stepsTillRemoteAttack == 5) || (_flags.gameID == GI_EOB2 && rollDice(1, 3) > m->stepsTillRemoteAttack)) {
+	if ((_flags.gameID == GI_EOB1 && m->stepsTillRemoteAttack < 5) || (_flags.gameID == GI_EOB2 && (rollDice(1, 3) > m->stepsTillRemoteAttack))) {
 		m->stepsTillRemoteAttack++;
 		return false;
 	}
@@ -940,8 +940,8 @@ bool EobCoreEngine::updateMonsterTryDistanceAttack(EobMonsterInPlay *m) {
 			snd_processEnvironmentalSoundEffect(31, m->block);
 			break;
 		case 10:
-			launchMagicObject(-1, _monsterDistAttType10[m->numRemoteAttacks], m->block, m->pos, m->dir);
-			snd_processEnvironmentalSoundEffect(_monsterDistAttSfx10[m->numRemoteAttacks], m->block);
+			launchMagicObject(-1, _enemyMageSpellList[m->numRemoteAttacks], m->block, m->pos, m->dir);
+			snd_processEnvironmentalSoundEffect(_enemyMageSfx[m->numRemoteAttacks], m->block);
 			break;
 		case 11:
 			itm = duplicateItem(60);
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index f07cd1186f..f30833cc08 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -1070,8 +1070,8 @@ void EobEngine::initStaticResource() {
 	_dscDoorY7 = _staticres->loadRawData(kEobBaseDscDoorY7, temp);
 	_dscDoorCoordsExt = (const int16*)_staticres->loadRawDataBe16(kEobBaseDscDoorCoordsExt, temp);
 
-	_monsterDistAttType10 = _staticres->loadRawData(kEob1MonsterDistAttType10, temp);
-	_monsterDistAttSfx10 = _staticres->loadRawData(kEob1MonsterDistAttSfx10, temp);
+	_enemyMageSpellList = _staticres->loadRawData(kEob1EnemyMageSpellList, temp);
+	_enemyMageSfx = _staticres->loadRawData(kEob1EnemyMageSfx, temp);
 	_monsterDistAttType17 = _staticres->loadRawData(kEob1MonsterDistAttType17, temp);
 	_monsterDistAttSfx17 = _staticres->loadRawData(kEob1MonsterDistAttSfx17, temp);
 
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index ba4d6a2475..20a05f9ee6 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -203,7 +203,7 @@ void EobCoreEngine::advanceTimers(uint32 millis) {
 		for (int ii = 0; ii < 10; ii++) {
 			if (c->timers[ii] > ct) {
 				uint32 chrt = c->timers[ii] - ct;
-				c->timers[ii] = chrt > millis ? chrt - millis : ct;
+				c->timers[ii] = chrt > millis ? ct + chrt - millis : ct;
 			}
 		}
 	}
@@ -214,7 +214,7 @@ void EobCoreEngine::advanceTimers(uint32 millis) {
 		for (int i = 0; i < _scriptTimersCount; i++) {
 			if (_scriptTimers[i].next > ct) {
 				uint32 chrt = _scriptTimers[i].next - ct;
-				_scriptTimers[i].next = chrt > millis ? chrt - millis : ct;
+				_scriptTimers[i].next = chrt > millis ? ct + chrt - millis : ct;
 			}
 		}
 	}
@@ -331,7 +331,7 @@ void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
 		case 9:
 			if (c->flags & 4) {
 				_txt->printMessage(_characterStatusStrings9[0], -1, c->name);
-				c->flags &= 0xfb;
+				c->flags &= ~4;
 				gui_drawCharPortraitWithStats(charIndex);
 			}
 			break;
-- 
cgit v1.2.3


From 359f3efd03704965d258c90381412a5ef2cf9239 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 7 Aug 2011 22:14:10 +0200
Subject: KYRA: (EOB) - add some spells

(shocking grasp, flame blade, vampiric touch etc.)
---
 engines/kyra/eob1.cpp          |   8 +-
 engines/kyra/eobcommon.cpp     |  18 +--
 engines/kyra/eobcommon.h       |  67 +++++++-----
 engines/kyra/items_eob.cpp     |   6 +-
 engines/kyra/magic_eob.cpp     | 243 +++++++++++++++++++++++++++++++++--------
 engines/kyra/resource.h        |   4 +-
 engines/kyra/sprites_eob.cpp   |   6 +-
 engines/kyra/staticres_eob.cpp |  13 ++-
 8 files changed, 263 insertions(+), 102 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index f48e850274..6491dfa135 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -78,7 +78,7 @@ Common::Error EobEngine::init() {
 
 	_scriptTimersCount = 1;
 
-	//_wllWallFlags[132] = 0x1f;
+	_wllWallFlags[132] = 1;
 	_wllWallFlags[133] = 1;
 
 	return Common::kNoError;
@@ -222,7 +222,9 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 
 		if (!checkScriptFlag(0x100000)) {
 			if (deletePartyItems(6, -1)) {
-				TXT(28);
+				//_npcSequenceSub = 0;
+				//drawNpcScene(npcIndex);
+				TXT(28);				
 				createItemOnCurrentBlock(32);
 				setScriptFlag(0x100000);
 				r = 1;
@@ -423,7 +425,7 @@ void EobEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wal
 		case 7:
 		case 8:
 		case 9:
-			y = _dscDoorY7[mDim] - _doorShapes[shapeIndex + 3][1];
+			y = _dscDoorY3[mDim] - _doorShapes[shapeIndex + 3][1];
 			d1 = x - (_doorShapes[shapeIndex + 3][2] << 2);
 			x -= (shp[2] << 2);
 			drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], d1, y, 5);
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 5fc50f667b..b9406ff05d 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -57,8 +57,8 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_monsterDustStrings = 0;
 	_enemyMageSpellList = 0;
 	_enemyMageSfx = 0;
-	_monsterDistAttType17 = 0;
-	_monsterDistAttSfx17 = 0;
+	_beholderSpellList = 0;
+	_beholderSfx = 0;
 
 	_faceShapes = 0;
 	_characters = 0;
@@ -853,8 +853,8 @@ void EobCoreEngine::recalcArmorClass(int index) {
 	if (c->effectFlags & 0x4000) {
 		int8 m1 = 5;
 
-		if (getCharacterClericPaladinLevel(index) > 5)
-			m1 += ((getCharacterClericPaladinLevel(index) - 5) / 3);
+		if (getClericPaladinLevel(index) > 5)
+			m1 += ((getClericPaladinLevel(index) - 5) / 3);
 
 		if (c->armorClass > m1)
 			c->armorClass = m1;
@@ -893,7 +893,7 @@ int EobCoreEngine::validateWeaponSlotItem(int index, int slot) {
 	return r;
 }
 
-int EobCoreEngine::getCharacterClericPaladinLevel(int index) {
+int EobCoreEngine::getClericPaladinLevel(int index) {
 	if (_castScrollSlot)
 		return 9;
 
@@ -913,7 +913,7 @@ int EobCoreEngine::getCharacterClericPaladinLevel(int index) {
 	return 1;
 }
 
-int EobCoreEngine::getCharacterMageLevel(int index) {
+int EobCoreEngine::getMageLevel(int index) {
 	if (_castScrollSlot)
 		return 9;
 
@@ -1682,7 +1682,7 @@ int EobCoreEngine::closeDistanceAttack(int charIndex, Item item) {
 
 		uint16 flg = 0x100;
 
-		if ((_flags.gameID == GI_EOB1 && _items[item].type > 51 && _items[item].type < 57) || (_flags.gameID == GI_EOB2 && isMagicWeapon(item)))
+		if (isMagicEffectItem(item))
 			flg |= 1;
 
 		_dstMonsterIndex = r;
@@ -1966,6 +1966,10 @@ void EobCoreEngine::monsterCloseAttack(EobMonsterInPlay *m) {
 			if (!monsterAttackHitTest(m, c))
 				continue;
 			dmg += rollDice(_monsterProps[m->type].dmgDc[ii].times, _monsterProps[m->type].dmgDc[ii].pips, _monsterProps[m->type].dmgDc[ii].base);
+			if (_characters[c].effectsRemainder[1]) {
+				if (--_characters[c].effectsRemainder[1])
+					dmg = 0;
+			}
 		}
 
 		if (dmg > 0) {
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 1b701cfeb3..867582864f 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -367,8 +367,9 @@ protected:
 
 	void recalcArmorClass(int index);
 	int validateWeaponSlotItem(int index, int slot);
-	int getCharacterClericPaladinLevel(int index);
-	int getCharacterMageLevel(int index);
+
+	int getClericPaladinLevel(int index);
+	int getMageLevel(int index);
 	int getCharacterLevelIndex(int type, int cClass);
 
 	int countCharactersWithSpecificItems(int16 itemType, int16 itemValue);
@@ -429,7 +430,7 @@ protected:
 	void printFullItemName(Item item);
 	void identifyQueuedItems(Item itemQueue);
 	void drawItemIconShape(int pageNum, Item itemId, int x, int y);
-	bool isMagicWeapon(Item itemIndex);
+	bool isMagicEffectItem(Item itemIndex);
 	bool checkInventoryForRings(int charIndex, int itemValue);
 	void eatItemInHand(int charIndex);
 
@@ -549,8 +550,8 @@ protected:
 	
 	const uint8 *_enemyMageSpellList;
 	const uint8 *_enemyMageSfx;
-	const uint8 *_monsterDistAttType17;
-	const uint8 *_monsterDistAttSfx17;
+	const uint8 *_beholderSpellList;
+	const uint8 *_beholderSfx;
 	const char *const *_monsterSpecAttStrings;
 
 	const int8 *_monsterFrmOffsTable1;
@@ -912,57 +913,63 @@ protected:
 	bool magicObjectStatusHit(EobMonsterInPlay *m, int type, bool tryEvade, int mod);
 	bool turnUndeadHit(EobMonsterInPlay *m, int hitChance, int casterLevel);
 
+	int getMagicWeaponSlot(int charIndex);
+	int createMagicWeaponType(int invFlags, int handFlags, int armorClass, int allowedClasses, int dmgNum, int dmgPips, int dmgInc, int extraProps);
+	Item createMagicWeaponItem(int flags, int icon, int value, int type);
+	void removeMagicWeaponItem(Item item);
+
 	int findSingleSpellTarget(int dist);
 
 	void printWarning(const char *str);
 	void printNoEffectWarning();
 
 	void spellCallback_start_empty() {}
-	bool spellCallback_end_empty(EobFlyingObject *fo) { return true; }
+	bool spellCallback_end_empty(void*) { return true; }
 	void spellCallback_start_armor();
 	void spellCallback_start_burningHands();
 	void spellCallback_start_detectMagic();
-	bool spellCallback_end_detectMagic(EobFlyingObject *fo);
+	bool spellCallback_end_detectMagic(void*);
 	void spellCallback_start_magicMissile();
-	bool spellCallback_end_magicMissile(EobFlyingObject *fo);
+	bool spellCallback_end_magicMissile(void *obj);
 	void spellCallback_start_shockingGrasp();
-	bool spellCallback_end_shockingGraspFlameBlade(EobFlyingObject *fo);
+	bool spellCallback_end_shockingGraspFlameBlade(void *obj);
 	void spellCallback_start_improvedIdentify();
 	void spellCallback_start_melfsAcidArrow();
-	bool spellCallback_end_melfsAcidArrow(EobFlyingObject *fo);
+	bool spellCallback_end_melfsAcidArrow(void *obj);
 	void spellCallback_start_dispelMagic();
 	void spellCallback_start_fireball();
-	bool spellCallback_end_fireball(EobFlyingObject *fo);
+	bool spellCallback_end_fireball(void *obj);
 	void spellCallback_start_flameArrow();
-	bool spellCallback_end_flameArrow(EobFlyingObject *fo);
+	bool spellCallback_end_flameArrow(void *obj);
 	void spellCallback_start_holdPerson();
-	bool spellCallback_end_holdPerson(EobFlyingObject *fo);
+	bool spellCallback_end_holdPerson(void *obj);
 	void spellCallback_start_lightningBolt();
-	bool spellCallback_end_lightningBolt(EobFlyingObject *fo);
+	bool spellCallback_end_lightningBolt(void *obj);
 	void spellCallback_start_vampiricTouch();
-	bool spellCallback_end_vampiricTouch(EobFlyingObject *fo);
+	bool spellCallback_end_vampiricTouch(void *obj);
 	void spellCallback_start_fear();
 	void spellCallback_start_iceStorm();
-	bool spellCallback_end_iceStorm(EobFlyingObject *fo);
+	bool spellCallback_end_iceStorm(void *obj);
+	void spellCallback_start_stoneSkin();
 	void spellCallback_start_removeCurse();
 	void spellCallback_start_coneOfCold();
 	void spellCallback_start_holdMonster();
-	bool spellCallback_end_holdMonster(EobFlyingObject *fo);
+	bool spellCallback_end_holdMonster(void *obj);
 	void spellCallback_start_wallOfForce();
 	void spellCallback_start_disintegrate();
 	void spellCallback_start_fleshToStone();
 	void spellCallback_start_stoneToFlesh();
 	void spellCallback_start_trueSeeing();
-	bool spellCallback_end_trueSeeing(EobFlyingObject *fo);
+	bool spellCallback_end_trueSeeing(void*);
 	void spellCallback_start_slayLiving();
 	void spellCallback_start_powerWordStun();
 	void spellCallback_start_causeLightWounds();
 	void spellCallback_start_cureLightWounds();
 	void spellCallback_start_aid();
-	bool spellCallback_end_aid(EobFlyingObject *fo);
+	bool spellCallback_end_aid(void *obj);
 	void spellCallback_start_flameBlade();
 	void spellCallback_start_slowPoison();
-	bool spellCallback_end_slowPoison(EobFlyingObject *fo);
+	bool spellCallback_end_slowPoison(void *obj);
 	void spellCallback_start_createFood();
 	void spellCallback_start_removeParalysis();
 	void spellCallback_start_causeSeriousWounds();
@@ -971,19 +978,19 @@ protected:
 	void spellCallback_start_causeCriticalWounds();
 	void spellCallback_start_cureCriticalWounds();
 	void spellCallback_start_flameStrike();
-	bool spellCallback_end_flameStrike(EobFlyingObject *fo);
+	bool spellCallback_end_flameStrike(void *obj);
 	void spellCallback_start_raiseDead();
 	void spellCallback_start_harm();
 	void spellCallback_start_heal();
 	void spellCallback_start_layOnHands();
 	void spellCallback_start_turnUndead();
-	bool spellCallback_end_kuotoaAttack(EobFlyingObject *fo);
-	bool spellCallback_end_unk1Passive(EobFlyingObject *fo);
-	bool spellCallback_end_unk2Passive(EobFlyingObject *fo);
-	bool spellCallback_end_deathSpellPassive(EobFlyingObject *fo);
-	bool spellCallback_end_disintegratePassive(EobFlyingObject *fo);
-	bool spellCallback_end_causeCriticalWoundsPassive(EobFlyingObject *fo);
-	bool spellCallback_end_fleshToStonePassive(EobFlyingObject *fo);
+	bool spellCallback_end_lightningBoltPassive(void *obj);
+	bool spellCallback_end_unk1Passive(void *obj);
+	bool spellCallback_end_unk2Passive(void *obj);
+	bool spellCallback_end_deathSpellPassive(void*);
+	bool spellCallback_end_disintegratePassive(void*);
+	bool spellCallback_end_causeCriticalWoundsPassive(void*);
+	bool spellCallback_end_fleshToStonePassive(void*);
 
 	int8 _openBookSpellLevel;
 	int8 _openBookSpellSelectedItem;
@@ -997,11 +1004,11 @@ protected:
 	int8 *_openBookAvailableSpells;
 	uint8 _activeSpellCharId;
 	uint8 _activeSpellCharacterPos;
-	uint8 _activeSpell;
+	int _activeSpell;
 	bool _returnAfterSpellCallback;
 
 	typedef void (EobCoreEngine::*SpellStartCallback)();
-	typedef bool (EobCoreEngine::*SpellEndCallback)(EobFlyingObject *fo);
+	typedef bool (EobCoreEngine::*SpellEndCallback)(void *obj);
 
 	struct EobSpell {
 		const char *name;
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index e2d28703a8..a83207b565 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -208,7 +208,7 @@ int EobCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int sl
 	int itm = _characters[charIndex].inventory[slot];
 	int ex = _itemTypes[_items[itm].type].extraProperties & 0x7f;
 
-	if (slot < 2 && _items[itm].flags & 0x20 && ex > 0 && ex < 4) {
+	if (slot < 2 && (_items[itm].flags & 0x20) && ex > 0 && ex < 4) {
 		if (_flags.gameID == GI_EOB2)
 			_txt->printMessage(_validateCursedString[0], -1, _characters[charIndex].name);
 		return 0;
@@ -474,8 +474,8 @@ void EobCoreEngine::drawItemIconShape(int pageNum, Item itemId, int x, int y) {
 	}
 }
 
-bool EobCoreEngine::isMagicWeapon(Item itemIndex) {
-	return (_items[itemIndex].type > 10 && _items[itemIndex].type < 18);
+bool EobCoreEngine::isMagicEffectItem(Item itemIndex) {
+	return (itemIndex > 10 && itemIndex < 18);
 }
 
 bool EobCoreEngine::checkInventoryForRings(int charIndex, int itemValue) {
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index d06e15b36f..88046fd3a5 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -192,7 +192,7 @@ void EobCoreEngine::castSpell(int spell, int weaponSlot) {
 			return;
 		}
 
-		if (isMagicWeapon(c->inventory[0]) || isMagicWeapon(c->inventory[1])) {
+		if (isMagicEffectItem(c->inventory[0]) || isMagicEffectItem(c->inventory[1])) {
 			printWarning(_magicStrings1[3]);
 			return;
 		}
@@ -239,7 +239,7 @@ void EobCoreEngine::removeCharacterEffect(int spell, int charIndex, int showWarn
 		printWarning(Common::String::format(_magicStrings3[_flags.gameID == GI_EOB1 ? 3 : 2], c->name, s->name).c_str());
 
 	if (s->endCallback)
-		(this->*s->endCallback)(0);
+		(this->*s->endCallback)(c);
 
 	if (s->flags & 1)
 		c->effectFlags &= ~s->effectFlags;
@@ -270,13 +270,15 @@ void EobCoreEngine::removeCharacterEffect(int spell, int charIndex, int showWarn
 
 void EobCoreEngine::removeAllCharacterEffects(int charIndex) {
 	EobCharacter *c = &_characters[charIndex];
+	c->effectFlags = 0;
 	memset(c->effectsRemainder, 0, 4);
 
 	for (int i = 0; i < 10; i++) {
-		if (c->events[i] < 0)
+		if (c->events[i] < 0) {
 			removeCharacterEffect(-c->events[i], charIndex, 0);
-		c->timers[i] = 0;
-		c->events[i] = 0;
+			c->timers[i] = 0;
+			c->events[i] = 0;
+		}
 	}
 
 	setupCharacterTimers();
@@ -444,7 +446,7 @@ void EobCoreEngine::sparkEffectOffensive() {
 }
 
 void EobCoreEngine::setSpellEventTimer(int spell, int timerBaseFactor, int timerLength, int timerLevelFactor, int updateExistingTimer) {
-	int l = _openBookType == 1 ? getCharacterClericPaladinLevel(_openBookChar) : getCharacterMageLevel(_openBookChar);
+	int l = _openBookType == 1 ? getClericPaladinLevel(_openBookChar) : getMageLevel(_openBookChar);
 	uint32 countdown = timerLength * timerBaseFactor + timerLength * l * timerLevelFactor;
 	setCharEventTimer(_activeSpellCharId, countdown, -spell, updateExistingTimer);
 }
@@ -632,6 +634,63 @@ bool EobCoreEngine::turnUndeadHit(EobMonsterInPlay *m, int hitChance, int caster
 	return true;
 }
 
+int EobCoreEngine::getMagicWeaponSlot(int charIndex) {
+	return _characters[charIndex].inventory[1] ? 0 : 1;
+}
+
+int EobCoreEngine::createMagicWeaponType(int invFlags, int handFlags, int armorClass, int allowedClasses, int dmgNumDice, int dmgPips, int dmgInc, int extraProps) {
+	int i = 51;
+	for (; i < 57; i++) {
+		if (_itemTypes[i].armorClass == -30)
+			break;
+	}
+
+	if (i == 57)
+		return -1;
+
+	EobItemType *tp = &_itemTypes[i];
+	tp->invFlags = invFlags;
+	tp->requiredHands = 0;
+	tp->handFlags = handFlags;
+	tp->armorClass = armorClass;
+	tp->allowedClasses = allowedClasses;
+	tp->dmgNumDiceL = tp->dmgNumDiceS = dmgNumDice;
+	tp->dmgNumPipsL = tp->dmgNumPipsL = dmgPips;
+	tp->dmgIncL = tp->dmgIncS = dmgInc;
+	tp->extraProperties = extraProps;
+
+	return i;
+}
+
+Item EobCoreEngine::createMagicWeaponItem(int flags, int icon, int value, int type) {
+	Item i = 11;
+	for (; i < 17; i++) {
+		if (_items[i].block == -2)
+			break;
+	}
+
+	if (i == 17)
+		return -1;
+
+	EobItem *itm = &_items[i];
+	itm->flags = 0x20 | flags;
+	itm->icon = icon;
+	itm->value = value;
+	itm->type = type;
+	itm->pos = 0;
+	itm->block = 0;
+	itm->nameId = itm->nameUnid = 0;
+	itm->prev = itm->next = 0;
+
+	return i;
+}
+
+void EobCoreEngine::removeMagicWeaponItem(Item item) {
+	_itemTypes[_items[item].type].armorClass = -30;
+	_items[item].block = -2;
+	_items[item].level = -1;
+}
+
 int EobCoreEngine::findSingleSpellTarget(int dist) {
 	uint16 bl = _currentBlock;
 	int res = -1;
@@ -658,7 +717,7 @@ void EobCoreEngine::printNoEffectWarning() {
 }
 
 void EobCoreEngine::spellCallback_start_armor() {
-	_characters[_activeSpellCharId].effectsRemainder[0] = getCharacterMageLevel(_openBookChar) + 8;
+	_characters[_activeSpellCharId].effectsRemainder[0] = getMageLevel(_openBookChar) + 8;
 	if ((getDexterityArmorClassModifier(_characters[_activeSpellCharId].dexterityCur) + 6) >= _characters[_activeSpellCharId].armorClass)
 		printWarning(Common::String::format(_magicStrings6[0], _characters[_activeSpellCharId].name).c_str());
 }
@@ -672,7 +731,7 @@ void EobCoreEngine::spellCallback_start_burningHands() {
 	_screen->updateScreen();
 	delay(2 * _tickLength);
 	
-	int cl = getCharacterMageLevel(_openBookChar);
+	int cl = getMageLevel(_openBookChar);
 	int bl = calcNewBlockPosition(_currentBlock, _currentDirection);
 
 	const int8 *pos = getMonstersOnBlockPositions(bl);
@@ -692,10 +751,11 @@ void EobCoreEngine::spellCallback_start_burningHands() {
 }
 
 void EobCoreEngine::spellCallback_start_detectMagic() {
-
+	setHandItem(_itemInHand);
 }
 
-bool EobCoreEngine::spellCallback_end_detectMagic(EobFlyingObject*) {
+bool EobCoreEngine::spellCallback_end_detectMagic(void*) {
+	setHandItem(_itemInHand);
 	return true;
 }
 
@@ -703,15 +763,33 @@ void EobCoreEngine::spellCallback_start_magicMissile() {
 	launchMagicObject(_openBookChar, 0, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_magicMissile(EobFlyingObject *fo) {
-	return magicObjectDamageHit(fo, 1, 4, 1, (getCharacterMageLevel(fo->attackerId) - 1) >> 1);
+bool EobCoreEngine::spellCallback_end_magicMissile(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
+	return magicObjectDamageHit(fo, 1, 4, 1, (getMageLevel(fo->attackerId) - 1) >> 1);
 }
 
 void EobCoreEngine::spellCallback_start_shockingGrasp() {
-
+	int t = createMagicWeaponType(0, 0, 0, 0x0f, 1, 8, getMageLevel(_openBookChar), 1);
+	Item i = (t != -1) ? createMagicWeaponItem(0x10, 82, 0, t) : -1;
+	if (t == -1 || i == -1) {
+		if (_flags.gameID == GI_EOB2)
+			printWarning(_magicStrings8[0]);
+		removeCharacterEffect(_activeSpell, _activeSpellCharId, 0);
+		deleteCharEventTimer(_activeSpellCharId, -_activeSpell);
+		_returnAfterSpellCallback = true;
+	} else {
+		_characters[_activeSpellCharId].inventory[getMagicWeaponSlot(_activeSpellCharId)] = i;
+	}
 }
 
-bool EobCoreEngine::spellCallback_end_shockingGraspFlameBlade(EobFlyingObject*) {
+bool EobCoreEngine::spellCallback_end_shockingGraspFlameBlade(void *obj) {
+	EobCharacter *c = (EobCharacter*)obj;
+	for (int i = 0; i < 2; i++) {
+		if (isMagicEffectItem(c->inventory[i])) {
+			removeMagicWeaponItem(c->inventory[i]);
+			c->inventory[i] = 0;
+		}
+	}
 	return true;
 }
 
@@ -723,36 +801,43 @@ void EobCoreEngine::spellCallback_start_melfsAcidArrow() {
 	launchMagicObject(_openBookChar, 1, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_melfsAcidArrow(EobFlyingObject *fo) {
+bool EobCoreEngine::spellCallback_end_melfsAcidArrow(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	assert(fo);
-	return magicObjectDamageHit(fo, 2, 4, 0, getCharacterMageLevel(fo->attackerId) / 3);
+	return magicObjectDamageHit(fo, 2, 4, 0, getMageLevel(fo->attackerId) / 3);
 }
 
 void EobCoreEngine::spellCallback_start_dispelMagic() {
-
+	for (int i = 0; i < 6; i++) {
+		if (testCharacter(i, 1))
+			removeAllCharacterEffects(i);
+	}
 }
 
 void EobCoreEngine::spellCallback_start_fireball() {
 	launchMagicObject(_openBookChar, 2, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_fireball(EobFlyingObject *fo) {
-	return magicObjectDamageHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
+bool EobCoreEngine::spellCallback_end_fireball(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
+	return magicObjectDamageHit(fo, 1, 6, 0, getMageLevel(fo->attackerId));
 }
 
 void EobCoreEngine::spellCallback_start_flameArrow() {
 	launchMagicObject(_openBookChar, 3, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_flameArrow(EobFlyingObject *fo) {
-	return magicObjectDamageHit(fo, 5, 6, 0, getCharacterMageLevel(fo->attackerId));
+bool EobCoreEngine::spellCallback_end_flameArrow(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
+	return magicObjectDamageHit(fo, 5, 6, 0, getMageLevel(fo->attackerId));
 }
 
 void EobCoreEngine::spellCallback_start_holdPerson() {
 	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 4 : 3, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_holdPerson(EobFlyingObject *fo) {
+bool EobCoreEngine::spellCallback_end_holdPerson(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	bool res = false;
 	
 	if (_flags.gameID == GI_EOB2 && fo->curBlock == _currentBlock) {
@@ -781,15 +866,30 @@ void EobCoreEngine::spellCallback_start_lightningBolt() {
 	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 5 : 4, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_lightningBolt(EobFlyingObject *fo) {
-	return magicObjectDamageHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
+bool EobCoreEngine::spellCallback_end_lightningBolt(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
+	return magicObjectDamageHit(fo, 1, 6, 0, getMageLevel(fo->attackerId));
 }
 
 void EobCoreEngine::spellCallback_start_vampiricTouch() {
-
+	int t = createMagicWeaponType(0, 0, 0, 0x0f, getMageLevel(_openBookChar) >> 1, 6, 0, 1);
+	Item i = (t != -1) ? createMagicWeaponItem(0x18, 83, 0, t) : -1;
+	if (t == -1 || i == -1) {
+		if (_flags.gameID == GI_EOB2)
+			printWarning(_magicStrings8[0]);
+		removeCharacterEffect(_activeSpell, _activeSpellCharId, 0);
+		deleteCharEventTimer(_activeSpellCharId, -_activeSpell);
+		_returnAfterSpellCallback = true;
+	} else {
+		_characters[_activeSpellCharId].inventory[getMagicWeaponSlot(_activeSpellCharId)] = i;
+	}
 }
 
-bool EobCoreEngine::spellCallback_end_vampiricTouch(EobFlyingObject*) {
+bool EobCoreEngine::spellCallback_end_vampiricTouch(void *obj) {
+	EobCharacter *c = (EobCharacter*)obj;
+	if (c->hitPointsCur > c->hitPointsMax)
+		c->hitPointsCur = c->hitPointsMax;
+	spellCallback_end_shockingGraspFlameBlade(obj);
 	return true;
 }
 
@@ -806,24 +906,29 @@ void EobCoreEngine::spellCallback_start_iceStorm() {
 	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 6 : 5, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_iceStorm(EobFlyingObject *fo) {
+bool EobCoreEngine::spellCallback_end_iceStorm(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	static int8 blockAdv[] = { -32, 32, 1, -1 };
-	bool res = magicObjectDamageHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
+	bool res = magicObjectDamageHit(fo, 1, 6, 0, getMageLevel(fo->attackerId));
 	if (res) {
 		for (int i = 0; i < 4; i++) {
 			uint16 bl = fo->curBlock;
 			fo->curBlock = (fo->curBlock + blockAdv[i]) & 0x3ff;
-			magicObjectDamageHit(fo, 1, 6, 0, getCharacterMageLevel(fo->attackerId));
+			magicObjectDamageHit(fo, 1, 6, 0, getMageLevel(fo->attackerId));
 			fo->curBlock = bl;
 		}
 	}
 	return res;
 }
 
+void EobCoreEngine::spellCallback_start_stoneSkin() {
+	_characters[_activeSpellCharId].effectsRemainder[1] = (getMageLevel(_openBookChar) >> 1) + rollDice(1, 4);
+}
+
 void EobCoreEngine::spellCallback_start_removeCurse() {
 	for (int i = 0; i < 27; i++) {
 		Item itm = _characters[_activeSpellCharId].inventory[i];
-		if (itm && (_items[itm].flags & 0x20) && !isMagicWeapon(itm))
+		if (itm && (_items[itm].flags & 0x20) && !isMagicEffectItem(itm))
 			_items[itm].flags = (_items[itm].flags & ~0x20) | 0x40;
 	}
 }
@@ -831,7 +936,7 @@ void EobCoreEngine::spellCallback_start_removeCurse() {
 void EobCoreEngine::spellCallback_start_coneOfCold() {
 	static const int8 *dirTables[] = { _coneOfColdDest1, _coneOfColdDest2, _coneOfColdDest3, _coneOfColdDest4 };
 	
-	int cl = getCharacterMageLevel(_openBookChar);
+	int cl = getMageLevel(_openBookChar);
 	//drawConeOfColdEffect(150, 50, 10, 1, 100, _coneOfColdGfxTbl);
 	
 	const int8 *tbl = dirTables[_currentDirection];
@@ -849,7 +954,8 @@ void EobCoreEngine::spellCallback_start_holdMonster() {
 	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 7 : 6, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_holdMonster(EobFlyingObject *fo) {
+bool EobCoreEngine::spellCallback_end_holdMonster(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	bool res = false;
 	for (const int16 *m = findBlockMonsters(fo->curBlock, fo->curPos, fo->direction, 1, 1); *m != -1; m++)
 		res |= magicObjectStatusHit(&_monsters[*m], 1, true, 4);
@@ -888,16 +994,17 @@ void EobCoreEngine::spellCallback_start_trueSeeing() {
 	_wllVmpMap[46] = 0;
 }
 
-bool EobCoreEngine::spellCallback_end_trueSeeing(EobFlyingObject*) {
+bool EobCoreEngine::spellCallback_end_trueSeeing(void*) {
 	_wllVmpMap[46] = 1;
 	return true;
 }
 
 void EobCoreEngine::spellCallback_start_slayLiving() {
 	int d = findSingleSpellTarget(2);
-	if (d != -1)
+	if (d != -1) {
 		if (!magicObjectStatusHit(&_monsters[d], 3, true, 4))
 			inflictMonsterDamage(&_monsters[d], rollDice(2, 8, 1), true);
+	}
 }
 
 void EobCoreEngine::spellCallback_start_powerWordStun() {
@@ -917,22 +1024,55 @@ void EobCoreEngine::spellCallback_start_cureLightWounds() {
 }
 
 void EobCoreEngine::spellCallback_start_aid() {
+	if (!testCharacter(_activeSpellCharId, 3)) {
+		printNoEffectWarning();
+	} else if (_characters[_activeSpellCharId].effectsRemainder[3]) {
+		printWarning(Common::String::format(_magicStrings8[(_flags.gameID == GI_EOB1) ? 2 : 5], _characters[_activeSpellCharId].name).c_str());
+	} else {
+		_characters[_activeSpellCharId].effectsRemainder[3] = rollDice(1, 8);
+		_characters[_activeSpellCharId].hitPointsCur += _characters[_activeSpellCharId].effectsRemainder[3];
+		_characters[_activeSpellCharId].effectFlags |= 0x1000;
+		return;
+	}
 
+	removeCharacterEffect(_activeSpell, _activeSpellCharId, 0);
+	deleteCharEventTimer(_activeSpellCharId, -_activeSpell);
 }
 
-bool EobCoreEngine::spellCallback_end_aid(EobFlyingObject*) {
+bool EobCoreEngine::spellCallback_end_aid(void *obj) {
+	EobCharacter *c = (EobCharacter*)obj;
+	c->hitPointsCur -= c->effectsRemainder[3];
+	c->effectsRemainder[3] = 0;
+	c->effectFlags &= ~0x1000;
 	return true;
 }
 
 void EobCoreEngine::spellCallback_start_flameBlade() {
-
+	int t = createMagicWeaponType(0, 0, 0, 0x0f, 1, 4, 4, 1);
+	Item i = (t != -1) ? createMagicWeaponItem(0, 84, 0, t) : -1;
+	if (t == -1 || i == -1) {
+		if (_flags.gameID == GI_EOB2)
+			printWarning(_magicStrings8[0]);
+		removeCharacterEffect(_activeSpell, _activeSpellCharId, 0);
+		deleteCharEventTimer(_activeSpellCharId, -_activeSpell);
+		_returnAfterSpellCallback = true;
+	} else {
+		_characters[_activeSpellCharId].inventory[getMagicWeaponSlot(_activeSpellCharId)] = i;
+	}
 }
 
 void EobCoreEngine::spellCallback_start_slowPoison() {
-
+	if (_characters[_activeSpellCharId].flags & 2) {
+		_characters[_activeSpellCharId].effectFlags |= 0x2000;
+		setSpellEventTimer(_activeSpell, 1, 32760, 1, 1);
+	} else {
+		printNoEffectWarning();
+	}
 }
 
-bool EobCoreEngine::spellCallback_end_slowPoison(EobFlyingObject*) {
+bool EobCoreEngine::spellCallback_end_slowPoison(void *obj) {
+	EobCharacter *c = (EobCharacter*)obj;
+	c->effectFlags &= ~0x2000;
 	return true;
 }
 
@@ -963,7 +1103,10 @@ void EobCoreEngine::spellCallback_start_cureSeriousWounds() {
 }
 
 void EobCoreEngine::spellCallback_start_neutralizePoison() {
-
+	if (_characters[_activeSpellCharId].flags & 2)
+		neutralizePoison(_activeSpellCharId);
+	else
+		printNoEffectWarning();
 }
 
 void EobCoreEngine::spellCallback_start_causeCriticalWounds() {
@@ -978,7 +1121,8 @@ void EobCoreEngine::spellCallback_start_flameStrike() {
 	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 8 : 7, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_flameStrike(EobFlyingObject *fo) {
+bool EobCoreEngine::spellCallback_end_flameStrike(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	return magicObjectDamageHit(fo, 6, 8, 0, 0);
 }
 
@@ -1012,7 +1156,7 @@ void EobCoreEngine::spellCallback_start_turnUndead() {
 	if (!(_levelBlockProperties[bl].flags & 7))
 		return;
 	
-	int cl = _openBookCasterLevel ? _openBookCasterLevel : getCharacterClericPaladinLevel(_openBookChar);
+	int cl = _openBookCasterLevel ? _openBookCasterLevel : getClericPaladinLevel(_openBookChar);
 	int r = rollDice(1, 20);
 	bool hit = false;
 
@@ -1033,11 +1177,13 @@ void EobCoreEngine::spellCallback_start_turnUndead() {
 	_preventMonsterFlash = false;
 }
 
-bool EobCoreEngine::spellCallback_end_kuotoaAttack(EobFlyingObject *fo) {
+bool EobCoreEngine::spellCallback_end_lightningBoltPassive(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	return magicObjectDamageHit(fo, 0, 0, 12, 1);
 }
 
-bool EobCoreEngine::spellCallback_end_unk1Passive(EobFlyingObject *fo) {
+bool EobCoreEngine::spellCallback_end_unk1Passive(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	bool res = false;
 	if (_partyEffectFlags & 0x20000) {
 		res = magicObjectDamageHit(fo, 4, 10, 6, 0);
@@ -1051,23 +1197,24 @@ bool EobCoreEngine::spellCallback_end_unk1Passive(EobFlyingObject *fo) {
 	return res;
 }
 
-bool EobCoreEngine::spellCallback_end_unk2Passive(EobFlyingObject *fo) {
+bool EobCoreEngine::spellCallback_end_unk2Passive(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	return magicObjectDamageHit(fo, 0, 0, 18, 0);
 }
 
-bool EobCoreEngine::spellCallback_end_deathSpellPassive(EobFlyingObject *fo) {
+bool EobCoreEngine::spellCallback_end_deathSpellPassive(void*) {
 	return true;
 }
 
-bool EobCoreEngine::spellCallback_end_disintegratePassive(EobFlyingObject *fo) {
+bool EobCoreEngine::spellCallback_end_disintegratePassive(void*) {
 	return true;
 }
 
-bool EobCoreEngine::spellCallback_end_causeCriticalWoundsPassive(EobFlyingObject *fo) {
+bool EobCoreEngine::spellCallback_end_causeCriticalWoundsPassive(void*) {
 	return true;
 }
 
-bool EobCoreEngine::spellCallback_end_fleshToStonePassive(EobFlyingObject *fo) {
+bool EobCoreEngine::spellCallback_end_fleshToStonePassive(void*) {
 	return true;
 }
 
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index a54ae6cd9a..b3a5aa3817 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -487,8 +487,8 @@ enum KyraResources {
 
 	kEob1EnemyMageSpellList,
 	kEob1EnemyMageSfx,
-	kEob1MonsterDistAttType17,
-	kEob1MonsterDistAttSfx17,
+	kEob1BeholderSpellList,
+	kEob1BeholderSfx,
 
 	kEob1TurnUndeadString,
 
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 945ccaca17..cb8ae51860 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -55,7 +55,7 @@ namespace Kyra {
 
 void EobCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex) {
 	Common::String s = filename;
-	if (GI_EOB1 && !scumm_stricmp(filename, "rust") || !scumm_stricmp(filename, "drider") || !scumm_stricmp(filename, "spider") || !scumm_stricmp(filename, "mantis") || !scumm_stricmp(filename, "xorn"))
+	if (GI_EOB1 && !scumm_stricmp(filename, "rust") || !scumm_stricmp(filename, "drider") || !scumm_stricmp(filename, "spider") || !scumm_stricmp(filename, "mantis") || !scumm_stricmp(filename, "xorn") || !scumm_stricmp(filename, "xanath"))
 		s += "1";
 
 	_screen->loadShapeSetBitmap(s.c_str(), 3, 3);
@@ -971,8 +971,8 @@ bool EobCoreEngine::updateMonsterTryDistanceAttack(EobMonsterInPlay *m) {
 				}
 				snd_processEnvironmentalSoundEffect(108, m->block);
 			} else {
-				launchMagicObject(-1, _monsterDistAttType17[m->numRemoteAttacks], m->block, m->pos, m->dir);
-				snd_processEnvironmentalSoundEffect(_monsterDistAttSfx17[m->numRemoteAttacks], m->block);
+				launchMagicObject(-1, _beholderSpellList[d], m->block, m->pos, m->dir);
+				snd_processEnvironmentalSoundEffect(_beholderSfx[d], m->block);
 			}
 			break;
 		default:
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index f30833cc08..b1ab606f5e 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -803,7 +803,7 @@ void EobCoreEngine::initSpells() {
 	mp(2);	// Vampiric Touch
 	mpn;	// Fear
 	mpn;	// Ice Storm
-	mp1n;	// Stone Skin		/// --- para required?
+	mp1n;	// Stone Skin
 	mp1n;	// Cloud Kill		///
 	mp2(4);	// Improved Invisibility	///
 	mp2n;	// remove Curse		///
@@ -881,7 +881,8 @@ void EobCoreEngine::initSpells() {
 	sc(vampiricTouch);
 	sc(fear);
 	sc(iceStorm);
-	sc(empty);	// EOB1: stone skin, EOB2: imp invisibility
+	sc1(stoneSkin);	// stone skin
+	sc2(empty); // imp invisibility
 	sc1(empty); // Cloudkill
 	sc2(removeCurse);
 	sc(coneOfCold);
@@ -1004,7 +1005,7 @@ void EobCoreEngine::initSpells() {
 	ec2(empty);
 	ec(empty);
 	ec2(empty);
-	ec1(kuotoaAttack);
+	ec1(lightningBoltPassive);
 	ec2(unk1Passive);
 	ec2(empty);
 	ec2(unk2Passive);
@@ -1072,8 +1073,8 @@ void EobEngine::initStaticResource() {
 
 	_enemyMageSpellList = _staticres->loadRawData(kEob1EnemyMageSpellList, temp);
 	_enemyMageSfx = _staticres->loadRawData(kEob1EnemyMageSfx, temp);
-	_monsterDistAttType17 = _staticres->loadRawData(kEob1MonsterDistAttType17, temp);
-	_monsterDistAttSfx17 = _staticres->loadRawData(kEob1MonsterDistAttSfx17, temp);
+	_beholderSpellList = _staticres->loadRawData(kEob1BeholderSpellList, temp);
+	_beholderSfx = _staticres->loadRawData(kEob1BeholderSfx, temp);
 
 	_turnUndeadString = _staticres->loadStrings(kEob1TurnUndeadString, temp);
 
@@ -1162,7 +1163,7 @@ void EobEngine::initSpells() {
 		{ 0x0488, 0x000000, 0x01 },	// vampiric touch
 		{ 0x0100, 0x000000, 0x00 },	// fear
 		{ 0x0100, 0x000000, 0x41 },	// ice storm
-		{ 0x0000, 0x000000, 0x00 },	// STONE SKIN
+		{ 0x0033, 0x000001, 0x00 },	// STONE SKIN
 		{ 0x0000, 0x000000, 0x00 },	// CLOUD KILL
 		{ 0x0100, 0x000000, 0x41 },	// cone of cold
 		{ 0x0100, 0x000000, 0x00 },	// hold monster
-- 
cgit v1.2.3


From 0d54aff6324b1f6c739df89ab072328cc5402873 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 14 Aug 2011 18:29:45 +0200
Subject: KYRA: (EOB) - add EOB 1 intro

(also add and fix several other things, like cone of cold vortex, drawShape issues, etc.)
---
 engines/kyra/chargen.cpp        |   6 +-
 engines/kyra/eob1.cpp           |  42 +-
 engines/kyra/eob1.h             |  38 ++
 engines/kyra/eob2.cpp           |  10 +-
 engines/kyra/eobcommon.cpp      |  68 +--
 engines/kyra/eobcommon.h        |  40 +-
 engines/kyra/gui_eob.cpp        |   2 +-
 engines/kyra/magic_eob.cpp      | 145 ++++++-
 engines/kyra/resource.h         |  28 ++
 engines/kyra/scene_eob.cpp      |   4 +-
 engines/kyra/screen_eob.cpp     | 259 +++++++++--
 engines/kyra/screen_eob.h       |   5 +-
 engines/kyra/script_eob.cpp     |  38 +-
 engines/kyra/script_eob.h       |   6 +-
 engines/kyra/sequences_eob1.cpp | 937 +++++++++++++++++++++++++++++++++++++++-
 engines/kyra/sequences_eob2.cpp |   1 -
 engines/kyra/sprites_eob.cpp    |  10 +-
 engines/kyra/staticres_eob.cpp  |  27 ++
 engines/kyra/text_eob.cpp       |   5 +-
 19 files changed, 1476 insertions(+), 195 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 681412915d..e97b7a1b2d 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -144,7 +144,7 @@ CharacterGenerator::~CharacterGenerator() {
 	}
 
 	if (_chargenButtonLabels) {
-		for (int i = 0; i < 10; i++)
+		for (int i = 0; i < 17; i++)
 			delete[] _chargenButtonLabels[i];
 		delete[] _chargenButtonLabels;
 	}
@@ -516,7 +516,7 @@ int CharacterGenerator::classMenu(int raceSex) {
 
 	toggleSpecialButton(5, 0, 0);
 
-	itemsMask &=_classMenuMasks[raceSex / 2];
+	itemsMask &= _classMenuMasks[raceSex / 2];
 	_vm->_gui->simpleMenu_setup(2, 15, _chargenClassStrings, itemsMask, 0, 0);
 
 	_vm->_mouseX = _vm->_mouseY = 0;
@@ -565,7 +565,7 @@ int CharacterGenerator::alignmentMenu(int cClass) {
 
 	toggleSpecialButton(5, 0, 0);
 
-	itemsMask &=_alignmentMenuMasks[cClass];
+	itemsMask &= _alignmentMenuMasks[cClass];
 	_vm->_gui->simpleMenu_setup(3, 9, _chargenAlignmentStrings, itemsMask, 0, 0);
 
 	_vm->_mouseX = _vm->_mouseY = 0;
diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index 6491dfa135..71644c5a87 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -172,23 +172,23 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 	case 0:
 		for (r = 1; r == 1; ) {
 			gui_drawDialogueBox();
-			r = DLG2A3(checkScriptFlag(0x2000), 8, 12, 11);
+			r = DLG2A3(checkScriptFlags(0x2000), 8, 12, 11);
 			if (r == 1) {
 				TXT(1);
-				setScriptFlag(0x2000);
+				setScriptFlags(0x2000);
 			} else if (r == 0) {
 				npcJoinDialogue(6, 12, 23, 2);
-				setScriptFlag(0x4000);
+				setScriptFlags(0x4000);
 			}
 		}
 		break;
 
 	case 1:
-		if (!checkScriptFlag(0x10000)) {
-			if (checkScriptFlag(0x8000)) {
+		if (!checkScriptFlags(0x10000)) {
+			if (checkScriptFlags(0x8000)) {
 				a = 1;
 			} else {
-				setScriptFlag(0x8000);
+				setScriptFlags(0x8000);
 				r = DLG2(3, 21);
 			}
 			if (!r)
@@ -198,7 +198,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 				for (a = 0; a < 6; a++)
 					createItemOnCurrentBlock(55);
 				createItemOnCurrentBlock(62);
-				setScriptFlag(0x10000);
+				setScriptFlags(0x10000);
 				TXT(6);
 				npcJoinDialogue(7, 7, 29, 30);
 			} else {
@@ -207,7 +207,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 			r = 1;
 		}
 
-		if (!checkScriptFlag(0x80000)) {
+		if (!checkScriptFlags(0x80000)) {
 			for (a = 0; a < 6; a++) {
 				if (testCharacter(a, 1) && _characters[a].portrait == -9)
 					break;
@@ -215,18 +215,18 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 			if (a != 6) {
 				TXT(25);
 				TXT(26);
-				setScriptFlag(0x80000);
+				setScriptFlags(0x80000);
 				r = 1;
 			}
 		}
 
-		if (!checkScriptFlag(0x100000)) {
+		if (!checkScriptFlags(0x100000)) {
 			if (deletePartyItems(6, -1)) {
 				//_npcSequenceSub = 0;
 				//drawNpcScene(npcIndex);
 				TXT(28);				
 				createItemOnCurrentBlock(32);
-				setScriptFlag(0x100000);
+				setScriptFlags(0x100000);
 				r = 1;
 			}
 		}
@@ -237,8 +237,8 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 		break;
 
 	case 2:
-		if (checkScriptFlag(0x10000)) {
-			if (checkScriptFlag(0x20000)) {
+		if (checkScriptFlags(0x10000)) {
+			if (checkScriptFlags(0x20000)) {
 				TXT(11);
 			} else {
 				r = DLG2A3(!countResurrectionCandidates(), 9, 31, 32);
@@ -247,7 +247,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 						healParty();
 					else
 						resurrectionSelectDialogue();
-					setScriptFlag(0x20000);
+					setScriptFlags(0x20000);
 				}				
 			}
 		} else {
@@ -257,14 +257,14 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 
 	case 3:
 		if (!DLG2(18, 4)) {
-			setScriptFlag(0x8400000);
+			setScriptFlags(0x8400000);
 			for (a = 0; a < 30; a++) {
 				if (_monsters[a].mode == 8)
 					_monsters[a].mode = 5;
 			}
 		} else if (deletePartyItems(49, -1)) {
 			TXT(20);
-			setScriptFlag(0x400000);
+			setScriptFlags(0x400000);
 		} else {
 			TXT(19);
 		}
@@ -273,10 +273,10 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 	case 4:
 		r = DLG3(14, 5);
 		if (r == 0)
-			setScriptFlag(0x200000);
+			setScriptFlags(0x200000);
 		else if (r == 1)
 			TXT(15);
-		setScriptFlag(0x800000);
+		setScriptFlags(0x800000);
 		break;
 
 	case 5:
@@ -292,12 +292,12 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 				}
 			}
 		}
-		setScriptFlag(0x2000000);
+		setScriptFlags(0x2000000);
 		break;
 
 	case 6:
 		TXT(21);
-		setScriptFlag(0x1000000);
+		setScriptFlags(0x1000000);
 		break;
 
 	case 7:
@@ -307,7 +307,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 				npcJoinDialogue(8, 27, 44, 45);
 			else
 				TXT(31);
-			setScriptFlag(0x4000000);
+			setScriptFlags(0x4000000);
 		}
 		break;
 
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
index 21543ddfa5..227db4f916 100644
--- a/engines/kyra/eob1.h
+++ b/engines/kyra/eob1.h
@@ -55,6 +55,44 @@ private:
 	void seq_playIntro();
 	void seq_playFinale();
 
+	void seq_tower();
+	void seq_orb();
+	void seq_waterdeepEntry();
+	void seq_king();
+	void seq_hands();
+	void seq_waterdeepExit();
+	void seq_tunnel();	
+
+	void seq_xdeath();
+
+	void copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step);
+
+	void boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH);
+	void whirlTransition();
+	
+	const char *const *_introFilesOpening;
+	const char *const *_introFilesTower;
+	const char *const *_introFilesOrb;
+	const char *const *_introFilesWdEntry;
+	const char *const *_introFilesKing;
+	const char *const *_introFilesHands;
+	const char *const *_introFilesWdExit;
+	const char *const *_introFilesTunnel;
+	const uint8 *_introOpeningFrmDelay;
+	const uint8 *_introWdEncodeX;
+	const uint8 *_introWdEncodeY;
+	const uint8 *_introWdEncodeWH;
+	const uint16 *_introWdDsX;
+	const uint8 *_introWdDsY;
+	const uint8 *_introTvlX1;
+	const uint8 *_introTvlY1;
+	const uint8 *_introTvlX2;
+	const uint8 *_introTvlY2;
+	const uint8 *_introTvlW;
+	const uint8 *_introTvlH;
+	
+	const char *const *_finBonusStrings;
+
 	// characters
 	void drawNpcScene(int npcIndex);
 	void encodeDrawNpcSeqShape(int npcIndex, int drawX, int drawY);
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index 9efc558b7f..0ecdba0fd3 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -106,7 +106,7 @@ void DarkMoonEngine::runNpcDialogue(int npcIndex) {
 	if (npcIndex == 0) {
 		snd_playSoundEffect(57);
 		if (npcJoinDialogue(0, 1, 3, 2))
-			setScriptFlag(0x40);
+			setScriptFlags(0x40);
 	} else if (npcIndex == 1) {
 		snd_playSoundEffect(53);
 		gui_drawDialogueBox();
@@ -120,7 +120,7 @@ void DarkMoonEngine::runNpcDialogue(int npcIndex) {
 			snd_playSoundEffect(91);
 			npcJoinDialogue(1, 5, 6, 7);
 		} else if (r == 1) {
-			setScriptFlag(0x20);
+			setScriptFlags(0x20);
 		}
 
 	} else if (npcIndex == 2) {
@@ -135,7 +135,7 @@ void DarkMoonEngine::runNpcDialogue(int npcIndex) {
 				_txt->printDialogueText(9, _okStrings[0]);
 			else
 				npcJoinDialogue(2, 102, 103, 104);
-			setScriptFlag(8);
+			setScriptFlags(8);
 		} else if (r == 1) {
 			_currentDirection = 0;
 		}
@@ -357,7 +357,7 @@ void DarkMoonEngine::restParty_npc() {
 	if (insalId < 4)
 		exchangeCharacters(insalId, testCharacter(5, 1) ? 5 : 4);
 
-	clearScriptFlag(6);
+	clearScriptFlags(6);
 
 	if (!stripPartyItems(1, 1, 1, 1))
 		stripPartyItems(2, 1, 1, 1);
@@ -391,7 +391,7 @@ void DarkMoonEngine::useHorn(int charIndex, int weaponSlot) {
 }
 
 bool DarkMoonEngine::checkPartyStatusExtra() {
-	if (checkScriptFlag(0x100000))
+	if (checkScriptFlags(0x100000))
 		seq_dranFools();
 	return _gui->confirmDialogue2(14, 67, 1);
 }
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index b9406ff05d..dc987c1533 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -133,6 +133,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_activeSpellCharId = 0;
 	_activeSpellCharacterPos = 0;
 	_activeSpell = 0;
+	_characterSpellTarget = 0;
 	_returnAfterSpellCallback = false;
 	_spells = 0;
 	_spellAnimBuffer = 0;
@@ -447,6 +448,9 @@ void EobCoreEngine::runLoop() {
 		checkInput(_activeButtons, true, 0);
 		removeInputTop();
 
+		if (!_runFlag)
+			break;
+
 		_timer->update();
 		updateScriptTimers();
 
@@ -1499,10 +1503,6 @@ int EobCoreEngine::countResurrectionCandidates() {
 }
 
 void EobCoreEngine::seq_portal() {
-	releaseDoorShapes();
-	releaseMonsterShapes(0, 36);
-	releaseDecorations();
-
 	uint8 *shapes1[5];
 	uint8 *shapes2[5];
 	uint8 *shapes3[5];
@@ -1686,7 +1686,7 @@ int EobCoreEngine::closeDistanceAttack(int charIndex, Item item) {
 			flg |= 1;
 
 		_dstMonsterIndex = r;
-		return calcCloseDistanceMonsterDamage(&_monsters[r], charIndex, item, 1, flg, 5, 3);
+		return calcMonsterDamage(&_monsters[r], charIndex, item, 1, flg, 5, 3);
 	}
 
 	return 0;
@@ -1770,38 +1770,38 @@ void EobCoreEngine::inflictMonsterDamage(EobMonsterInPlay *m, int damage, bool g
 		m->dest = _currentBlock;
 }
 
-void EobCoreEngine::calcAndInflictMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int b, int damageType) {
-	int dmg = calcCloseDistanceMonsterDamage(m, times, pips, offs, flags, b, damageType);
+void EobCoreEngine::calcAndInflictMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect) {
+	int dmg = calcMonsterDamage(m, times, pips, offs, flags, savingThrowType, savingThrowEffect);
 	if (dmg > 0)
 		inflictMonsterDamage(m, dmg, flags & 0x800 ? true : false);
 }
 
-void EobCoreEngine::calcAndInflictCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flg, int a, int damageType) {
-	int dmg = calcCharacterDamage(charIndex, times, itemOrPips, useStrModifierOrBase, flg, a, damageType);
+void EobCoreEngine::calcAndInflictCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int savingThrowEffect) {
+	int dmg = calcCharacterDamage(charIndex, times, itemOrPips, useStrModifierOrBase, flags, savingThrowType, savingThrowEffect);
 	if (dmg)
 		inflictCharacterDamage(charIndex, dmg);
 }
 
-int EobCoreEngine::calcCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flg, int a, int damageType) {
-	int s = (flg & 0x100) ? calcDamageModifers(times, 0, itemOrPips, _items[itemOrPips].type, useStrModifierOrBase) : rollDice(times, itemOrPips, useStrModifierOrBase);
+int EobCoreEngine::calcCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int savingThrowEffect) {
+	int s = (flags & 0x100) ? calcDamageModifers(times, 0, itemOrPips, _items[itemOrPips].type, useStrModifierOrBase) : rollDice(times, itemOrPips, useStrModifierOrBase);
 	EobCharacter *c = &_characters[charIndex];
 
-	if (a != 5) {
-		if (checkMonsterLevelConstModifiers(c, _charClassModUnk[c->cClass], c->level[0], a, c->raceSex))
-			s = recalcDamageModifier(damageType, s);
+	if (savingThrowType != 5) {
+		if (trySavingThrow(c, _charClassModUnk[c->cClass], c->level[0], savingThrowType, c->raceSex))
+			s = savingThrowReduceDamage(savingThrowEffect, s);
 	}
 
-	if ((flg & 0x110) == 0x110) {
+	if ((flags & 0x110) == 0x110) {
 		if (!calcDamageCheckItemType(_items[itemOrPips].type))
 			s = 1;
 	}
 
-	if (flg & 4) {
+	if (flags & 4) {
 		if (checkInventoryForRings(charIndex, 3))
 			s = 0;
 	}
 
-	if (flg & 0x400) {
+	if (flags & 0x400) {
 		if (c->effectFlags & 0x2000)
 			s = 0;
 		else
@@ -2016,14 +2016,14 @@ void EobCoreEngine::monsterSpellCast(EobMonsterInPlay *m, int type) {
 	snd_processEnvironmentalSoundEffect(_spells[_magicFlightObjectProperties[type << 2]].sound, m->block);
 }
 
-void EobCoreEngine::statusAttack(int charIndex, int attackStatusFlags, const char *attackStatusString, int a, uint32 effectDuration, int restoreEvent, int noRefresh) {
+void EobCoreEngine::statusAttack(int charIndex, int attackStatusFlags, const char *attackStatusString, int savingThrowType, uint32 effectDuration, int restoreEvent, int noRefresh) {
 	EobCharacter *c = &_characters[charIndex];
 	if ((c->flags & attackStatusFlags) && noRefresh)
 		return;
 	if (!testCharacter(charIndex, 3))
 		return;
 
-	if (a != 5 && specialAttackConstTest(charIndex, a))
+	if (savingThrowType != 5 && specialAttackSavingThrow(charIndex, savingThrowType))
 		return;
 
 	if (attackStatusFlags & 8) {
@@ -2045,13 +2045,13 @@ void EobCoreEngine::statusAttack(int charIndex, int attackStatusFlags, const cha
 	_txt->printMessage(_characterStatusStrings13[0], -1, c->name, attackStatusString);
 }
 
-int EobCoreEngine::calcCloseDistanceMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int b, int damageType) {
+int EobCoreEngine::calcMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect) {
 	int s = flags & 0x100 ? calcDamageModifers(times, m, pips, _items[pips].type, offs) : rollDice(times, pips, offs);
 	EobMonsterProperty *p = &_monsterProps[m->type];
 
-	if (b == 5) {
-		if (checkMonsterLevelConstModifiers(m, 0, p->level, b, 6))
-			s = recalcDamageModifier(damageType, s);
+	if (savingThrowType != 5) {
+		if (trySavingThrow(m, 0, p->level, savingThrowType, 6))
+			s = savingThrowReduceDamage(savingThrowEffect, s);
 	}
 
 	if ((flags & 0x110) == 0x110) {
@@ -2110,14 +2110,14 @@ int EobCoreEngine::calcDamageModifers(int charIndex, EobMonsterInPlay *m, int it
 	return (s < 0) ? 0 : s;
 }
 
-bool EobCoreEngine::checkMonsterLevelConstModifiers(void *target, int hpModifier, int level, int b, int race) {
+bool EobCoreEngine::trySavingThrow(void *target, int hpModifier, int level, int type, int race) {
 	static const int8 constMod[] = { 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5 };
 
-	if (b == 5)
+	if (type == 5)
 		return false;
 
-	int s = getConstModifierTableValue(hpModifier, level, b);
-	if (((race == 3 || race == 5) && (b == 4 || b == 1 || b == 0)) || (race == 4 && (b == 4 || b == 1))) {
+	int s = getConstModifierTableValue(hpModifier, level, type);
+	if (((race == 3 || race == 5) && (type == 4 || type == 1 || type == 0)) || (race == 4 && (type == 4 || type == 1))) {
 		EobCharacter *c = (EobCharacter*)target;
 		s -= constMod[c->constitutionCur];
 	}
@@ -2125,8 +2125,8 @@ bool EobCoreEngine::checkMonsterLevelConstModifiers(void *target, int hpModifier
 	return rollDice(1, 20) < s ? false : true;
 }
 
-bool EobCoreEngine::specialAttackConstTest(int charIndex, int b) {
-	return checkMonsterLevelConstModifiers(&_characters[charIndex], _charClassModUnk[_characters[charIndex].cClass], _characters[charIndex].level[0], b, _characters[charIndex].raceSex >> 1);
+bool EobCoreEngine::specialAttackSavingThrow(int charIndex, int type) {
+	return trySavingThrow(&_characters[charIndex], _charClassModUnk[_characters[charIndex].cClass], _characters[charIndex].level[0], type, _characters[charIndex].raceSex >> 1);
 }
 
 int EobCoreEngine::getConstModifierTableValue(int hpModifier, int level, int b) {
@@ -2144,14 +2144,14 @@ bool EobCoreEngine::calcDamageCheckItemType(int itemType) {
 	return (itemType == 2 || itemType == 3) ? true : false;
 }
 
-int EobCoreEngine::recalcDamageModifier(int damageType, int dmgModifier) {
-	if (damageType == 3)
+int EobCoreEngine::savingThrowReduceDamage(int savingThrowEffect, int damage) {
+	if (savingThrowEffect == 3)
 		return 0;
 
-	if (damageType == 0 || damageType == 1)
-		return dmgModifier >> 1;
+	if (savingThrowEffect == 0 || savingThrowEffect == 1)
+		return damage >> 1;
 
-	return dmgModifier;
+	return damage;
 }
 
 bool EobCoreEngine::tryMonsterAttackEvasion(EobMonsterInPlay *m) {
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 867582864f..51dfb8b726 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -260,6 +260,7 @@ protected:
 
 	// Main Menu, Intro, Finale
 	virtual int mainMenu() = 0;
+	virtual void seq_xdeath() {};
 	virtual void seq_playFinale() = 0;
 	bool _playFinale;
 
@@ -630,9 +631,9 @@ protected:
 
 	// Script
 	void runLevelScript(int block, int flags);
-	void setScriptFlag(int flag);
-	void clearScriptFlag(int flag);
-	bool checkScriptFlag(int flag);
+	void setScriptFlags(uint32 flags);
+	void clearScriptFlags(uint32 flags);
+	bool checkScriptFlags(uint32 flags);
 
 	const uint8 *initScriptTimers(const uint8 *pos);
 	void updateScriptTimers();
@@ -856,9 +857,9 @@ protected:
 	int projectileWeaponAttack(int charIndex, Item item);
 
 	void inflictMonsterDamage(EobMonsterInPlay *m, int damage, bool giveExperience);
-	void calcAndInflictMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int b, int damageType);
-	void calcAndInflictCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flg, int a, int damageType);
-	int calcCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flg, int a, int damageType) ;
+	void calcAndInflictMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect);
+	void calcAndInflictCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int savingThrowEffect);
+	int calcCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int damageType) ;
 	void inflictCharacterDamage(int charIndex, int damage);
 
 	bool characterAttackHitTest(int charIndex, int monsterIndex, int item, int attackType);
@@ -868,15 +869,15 @@ protected:
 
 	void monsterCloseAttack(EobMonsterInPlay *m);
 	void monsterSpellCast(EobMonsterInPlay *m, int type);
-	void statusAttack(int charIndex, int attackStatusFlags, const char *attackStatusString, int a, uint32 effectDuration, int restoreEvent, int noRefresh);
+	void statusAttack(int charIndex, int attackStatusFlags, const char *attackStatusString, int savingThrowType, uint32 effectDuration, int restoreEvent, int noRefresh);
 
-	int calcCloseDistanceMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int b, int damageType);
+	int calcMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect);
 	int calcDamageModifers(int charIndex, EobMonsterInPlay *m, int item, int itemType, int useStrModifier);
-	bool checkMonsterLevelConstModifiers(void *target, int hpModifier, int level, int b, int race);
-	bool specialAttackConstTest(int charIndex, int b);
+	bool trySavingThrow(void *target, int hpModifier, int level, int type, int race);
+	bool specialAttackSavingThrow(int charIndex, int type);
 	int getConstModifierTableValue(int hpModifier, int level, int b);
 	bool calcDamageCheckItemType(int itemType);
-	int recalcDamageModifier(int damageType, int dmgModifier);
+	int savingThrowReduceDamage(int savingThrowEffect, int damage);
 	bool tryMonsterAttackEvasion(EobMonsterInPlay *m);
 	int getStrHitChanceModifier(int charIndex);
 	int getStrDamageModifier(int charIndex);
@@ -912,6 +913,7 @@ protected:
 	bool magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level);
 	bool magicObjectStatusHit(EobMonsterInPlay *m, int type, bool tryEvade, int mod);
 	bool turnUndeadHit(EobMonsterInPlay *m, int hitChance, int casterLevel);
+	void causeWounds(int dcTimes, int dcPips, int dcOffs);
 
 	int getMagicWeaponSlot(int charIndex);
 	int createMagicWeaponType(int invFlags, int handFlags, int armorClass, int allowedClasses, int dmgNum, int dmgPips, int dmgInc, int extraProps);
@@ -919,6 +921,10 @@ protected:
 	void removeMagicWeaponItem(Item item);
 
 	int findSingleSpellTarget(int dist);
+	
+	int findFirstCharacterSpellTarget();
+	int findNextCharacterSpellTarget(int curCharIndex);
+	int charDeathSavingThrow(int charIndex, int div);
 
 	void printWarning(const char *str);
 	void printNoEffectWarning();
@@ -987,10 +993,10 @@ protected:
 	bool spellCallback_end_lightningBoltPassive(void *obj);
 	bool spellCallback_end_unk1Passive(void *obj);
 	bool spellCallback_end_unk2Passive(void *obj);
-	bool spellCallback_end_deathSpellPassive(void*);
-	bool spellCallback_end_disintegratePassive(void*);
-	bool spellCallback_end_causeCriticalWoundsPassive(void*);
-	bool spellCallback_end_fleshToStonePassive(void*);
+	bool spellCallback_end_deathSpellPassive(void *obj);
+	bool spellCallback_end_disintegratePassive(void *obj);
+	bool spellCallback_end_causeCriticalWoundsPassive(void *obj);
+	bool spellCallback_end_fleshToStonePassive(void *obj);
 
 	int8 _openBookSpellLevel;
 	int8 _openBookSpellSelectedItem;
@@ -1005,6 +1011,7 @@ protected:
 	uint8 _activeSpellCharId;
 	uint8 _activeSpellCharacterPos;
 	int _activeSpell;
+	int _characterSpellTarget;
 	bool _returnAfterSpellCallback;
 
 	typedef void (EobCoreEngine::*SpellStartCallback)();
@@ -1059,7 +1066,8 @@ protected:
 	const int8 *_coneOfColdDest2;
 	const int8 *_coneOfColdDest3;
 	const int8 *_coneOfColdDest4;
-	const int8 *_coneOfColdGfxTbl;
+	const uint8 *_coneOfColdGfxTbl;
+	int _coneOfColdGfxTblSize;
 
 	// Menu
 	EobMenuDef *_menuDefs;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 393bbab4a8..fcd66c923b 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -385,7 +385,7 @@ void EobCoreEngine::gui_drawWeaponSlot(int charIndex, int slot) {
 
 	if (itm)
 		drawItemIconShape(_screen->_curPage, itm, x + 8, y);
-	else if (!slot && _flags.gameID == GI_EOB2 && checkScriptFlag(0x80000000))
+	else if (!slot && _flags.gameID == GI_EOB2 && checkScriptFlags(0x80000000))
 		_screen->drawShape(_screen->_curPage, _itemIconShapes[103], x + 8, y, 0);
 	else
 		_screen->drawShape(_screen->_curPage, _itemIconShapes[85], x + 8, y, 0);
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 88046fd3a5..2ad0da7258 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -314,17 +314,14 @@ void EobCoreEngine::startSpell(int spell) {
 	}
 
 	if ((s->flags & 0x30) && (s->effectFlags & c->effectFlags)) {
-		if (_flags.gameID == GI_EOB1) {
-			// TODO: warnings seem to exist at least for bless and aid
-		} else {
+		if (_flags.gameID == GI_EOB2)
 			printWarning(Common::String::format(_magicStrings7[0], c->name, s->name).c_str());
-		}
 	} else if ((s->flags & 0x50) && (s->effectFlags & _partyEffectFlags)) {
-		if (_flags.gameID == GI_EOB1) {
-			// TODO: warnings seem to exist at least for bless and aid
-		} else {
+		if (_flags.gameID == GI_EOB1 && s->effectFlags == 0x400)
+			// EOB 1 only warns in case of a bless spell
+			printWarning(_magicStrings8[1]);
+		else
 			printWarning(Common::String::format(_magicStrings7[1], s->name).c_str());
-		}
 	} else {
 		if (s->flags & 8)
 			setSpellEventTimer(spell, s->timingPara[0], s->timingPara[1], s->timingPara[2], s->timingPara[3]);
@@ -569,7 +566,7 @@ bool EobCoreEngine::magicObjectStatusHit(EobMonsterInPlay *m, int type, bool try
 			return true;
 	}
 
-	if (checkMonsterLevelConstModifiers(m, 0, p->level, mod, 6))
+	if (trySavingThrow(m, 0, p->level, mod, 6))
 		return false;
 	
 	int para = 0;
@@ -638,6 +635,26 @@ int EobCoreEngine::getMagicWeaponSlot(int charIndex) {
 	return _characters[charIndex].inventory[1] ? 0 : 1;
 }
 
+void EobCoreEngine::causeWounds(int dcTimes, int dcPips, int dcOffs) {
+	if (_openBookChar == 0 || _openBookChar == 1) {
+		int d = getClosestMonster(_openBookChar, calcNewBlockPosition(_currentBlock, _currentDirection));
+		if (d != -1) {
+			if (!characterAttackHitTest(_openBookChar, d, 0, 1))
+				return;
+			
+			if (dcTimes == -1) {
+				dcOffs = _monsters[d].hitPointsMax - rollDice(1, 4);
+				dcTimes = dcPips = 0;
+			}
+			calcAndInflictMonsterDamage(&_monsters[d], dcTimes, dcPips, dcOffs, 0x801, 4, 2);
+		} else {
+			printWarning(Common::String::format(_magicStrings3[_flags.gameID == GI_EOB1 ? 4 : 3], _characters[_openBookChar].name).c_str());
+		}
+	} else {
+		printWarning(Common::String::format(_magicStrings3[_flags.gameID == GI_EOB1 ? 5 : 4], _characters[_openBookChar].name).c_str());
+	}
+}
+
 int EobCoreEngine::createMagicWeaponType(int invFlags, int handFlags, int armorClass, int allowedClasses, int dmgNumDice, int dmgPips, int dmgInc, int extraProps) {
 	int i = 51;
 	for (; i < 57; i++) {
@@ -655,7 +672,7 @@ int EobCoreEngine::createMagicWeaponType(int invFlags, int handFlags, int armorC
 	tp->armorClass = armorClass;
 	tp->allowedClasses = allowedClasses;
 	tp->dmgNumDiceL = tp->dmgNumDiceS = dmgNumDice;
-	tp->dmgNumPipsL = tp->dmgNumPipsL = dmgPips;
+	tp->dmgNumPipsL = tp->dmgNumPipsS = dmgPips;
 	tp->dmgIncL = tp->dmgIncS = dmgInc;
 	tp->extraProperties = extraProps;
 
@@ -707,6 +724,33 @@ int EobCoreEngine::findSingleSpellTarget(int dist) {
 	return res;
 }
 
+int EobCoreEngine::findFirstCharacterSpellTarget() {
+	int curCharIndex = rollDice(1, 6, -1);
+	for (_characterSpellTarget = 0; _characterSpellTarget < 6; _characterSpellTarget++) {
+		if (testCharacter(curCharIndex, 3))
+			return curCharIndex;
+		if (++curCharIndex == 6)
+			curCharIndex = 0;
+	}
+	return -1;
+}
+
+int EobCoreEngine::findNextCharacterSpellTarget(int curCharIndex) {
+	for (; _characterSpellTarget < 6; _characterSpellTarget++) {
+		if (++curCharIndex == 6)
+			curCharIndex = 0;
+		if (testCharacter(curCharIndex, 3))
+			return curCharIndex;
+	}
+	return -1;
+}
+
+int EobCoreEngine::charDeathSavingThrow(int charIndex, int div) {
+	if (specialAttackSavingThrow(charIndex, 4))
+		div >>= 1;
+	return div;
+}
+
 void EobCoreEngine::printWarning(const char *str) {
 	_txt->printMessage(str);
 	snd_playSoundEffect(79);
@@ -794,7 +838,11 @@ bool EobCoreEngine::spellCallback_end_shockingGraspFlameBlade(void *obj) {
 }
 
 void EobCoreEngine::spellCallback_start_improvedIdentify() {
-
+	for (int i = 0; i < 2; i++) {
+		Item itm = _characters[_activeSpellCharId].inventory[i];
+		if (itm)
+			_items[itm].flags |= 0x40;
+	}
 }
 
 void EobCoreEngine::spellCallback_start_melfsAcidArrow() {
@@ -937,7 +985,15 @@ void EobCoreEngine::spellCallback_start_coneOfCold() {
 	static const int8 *dirTables[] = { _coneOfColdDest1, _coneOfColdDest2, _coneOfColdDest3, _coneOfColdDest4 };
 	
 	int cl = getMageLevel(_openBookChar);
-	//drawConeOfColdEffect(150, 50, 10, 1, 100, _coneOfColdGfxTbl);
+
+	_screen->setCurPage(2);
+	_screen->fillRect(0, 0, 176, 120, 0);
+	_screen->setGfxParameters(0, 0, _screen->getPagePixel(2, 0, 0));
+	drawSceneShapes(7);
+	_screen->setCurPage(0);
+	disableSysTimer(2);
+	_screen->drawVortex(150, 50, 10, 1, 100, _coneOfColdGfxTbl, _coneOfColdGfxTblSize);
+	enableSysTimer(2);
 	
 	const int8 *tbl = dirTables[_currentDirection];
 	_preventMonsterFlash = true;
@@ -1016,7 +1072,7 @@ void EobCoreEngine::spellCallback_start_powerWordStun() {
 }
 
 void EobCoreEngine::spellCallback_start_causeLightWounds() {
-
+	causeWounds(1, 8, 0);
 }
 
 void EobCoreEngine::spellCallback_start_cureLightWounds() {
@@ -1095,7 +1151,7 @@ void EobCoreEngine::spellCallback_start_removeParalysis() {
 }
 
 void EobCoreEngine::spellCallback_start_causeSeriousWounds() {
-	
+	causeWounds(2, 8, 1);
 }
 
 void EobCoreEngine::spellCallback_start_cureSeriousWounds() {
@@ -1110,7 +1166,7 @@ void EobCoreEngine::spellCallback_start_neutralizePoison() {
 }
 
 void EobCoreEngine::spellCallback_start_causeCriticalWounds() {
-
+	causeWounds(3, 8, 3);
 }
 
 void EobCoreEngine::spellCallback_start_cureCriticalWounds() {
@@ -1136,7 +1192,7 @@ void EobCoreEngine::spellCallback_start_raiseDead() {
 }
 
 void EobCoreEngine::spellCallback_start_harm() {
-
+	causeWounds(-1, -1, -1);
 }
 
 void EobCoreEngine::spellCallback_start_heal() {
@@ -1202,19 +1258,68 @@ bool EobCoreEngine::spellCallback_end_unk2Passive(void *obj) {
 	return magicObjectDamageHit(fo, 0, 0, 18, 0);
 }
 
-bool EobCoreEngine::spellCallback_end_deathSpellPassive(void*) {
+bool EobCoreEngine::spellCallback_end_deathSpellPassive(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
+	if (fo->curBlock != _currentBlock)
+		return false;
+
+	int numDest = rollDice(1, 4);
+	_txt->printMessage(_magicStrings2[2]);
+	for (int d = findFirstCharacterSpellTarget(); d != -1 && numDest; d = findNextCharacterSpellTarget(d)) {
+		if (_characters[d].level[0] < 8) {
+			inflictCharacterDamage(d, 300);
+			numDest--;
+		}
+	}
+
 	return true;
 }
 
-bool EobCoreEngine::spellCallback_end_disintegratePassive(void*) {
+bool EobCoreEngine::spellCallback_end_disintegratePassive(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
+	if (fo->curBlock != _currentBlock)
+		return false;
+	
+	int d = findFirstCharacterSpellTarget();
+	if (d != -1) {
+		if (!charDeathSavingThrow(d, 1)) {
+			inflictCharacterDamage(d, 300);
+			_txt->printMessage(_magicStrings2[1], -1, _characters[d].name);
+		}
+	}
+
 	return true;
 }
 
-bool EobCoreEngine::spellCallback_end_causeCriticalWoundsPassive(void*) {
+bool EobCoreEngine::spellCallback_end_causeCriticalWoundsPassive(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
+	if (fo->curBlock != _currentBlock)
+		return false;
+
+	int d = findFirstCharacterSpellTarget();
+	if (d != -1) {
+		_txt->printMessage(_magicStrings2[3], -1, _characters[d].name);
+		inflictCharacterDamage(d, rollDice(3, 8, 3));
+	}
+
 	return true;
 }
 
-bool EobCoreEngine::spellCallback_end_fleshToStonePassive(void*) {
+bool EobCoreEngine::spellCallback_end_fleshToStonePassive(void *obj) {
+	EobFlyingObject *fo = (EobFlyingObject*)obj;
+	if (fo->curBlock != _currentBlock)
+		return false;
+	
+	int d = findFirstCharacterSpellTarget();
+	while (d != -1) {
+		if (!charDeathSavingThrow(d, 2)) {
+			statusAttack(d, 8, _magicStrings2[4], 5, 0, 0, 1);
+			d = -1;
+		} else {
+			d = findNextCharacterSpellTarget(d);
+		}
+	}
+	
 	return true;
 }
 
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index b3a5aa3817..5ed658ccee 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -478,8 +478,36 @@ enum KyraResources {
 	kEobBaseMagicFlightProps,
 	kEobBaseTurnUndeadEffect,
 	kEobBaseBurningHandsDest,
+	kEobBaseConeOfColdDest1,
+	kEobBaseConeOfColdDest2,
+	kEobBaseConeOfColdDest3,
+	kEobBaseConeOfColdDest4,
+	kEobBaseConeOfColdGfxTbl,
 
 	kEob1MainMenuStrings,
+	kEob1BonusStrings,
+
+	kEob1IntroFilesOpening,
+	kEob1IntroFilesTower,
+	kEob1IntroFilesOrb,
+	kEob1IntroFilesWdEntry,
+	kEob1IntroFilesKing,
+	kEob1IntroFilesHands,
+	kEob1IntroFilesWdExit,
+	kEob1IntroFilesTunnel,
+	kEob1IntroOpeningFrmDelay,
+	kEob1IntroWdEncodeX,
+	kEob1IntroWdEncodeY,
+	kEob1IntroWdEncodeWH,
+	kEob1IntroWdDsX,
+	kEob1IntroWdDsY,
+	kEob1IntroTvlX1,
+	kEob1IntroTvlY1,
+	kEob1IntroTvlX2,
+	kEob1IntroTvlY2,
+	kEob1IntroTvlW,
+	kEob1IntroTvlH,
+
 	kEob1DoorShapeDefs,
 	kEob1DoorSwitchShapeDefs,
 	kEob1DoorSwitchCoords,
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 4c1bb1636f..aef131f6cb 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -1139,10 +1139,10 @@ void EobCoreEngine::drawDecorations(int index) {
 int EobCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint16 direction) {
 	uint16 b = calcNewBlockPosition(curBlock, direction);
 	int w = _levelBlockProperties[b].walls[direction ^ 2];
-	
 	int f = _wllWallFlags[w];
+
 	if (!f)
-		assert (w < (_flags.gameID == GI_EOB1 ? 70 : 80));
+		assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80));
 
 	if (w == 74 && _currentBlock == curBlock) {
 		for (int i = 0; i < 5; i++) {
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index ccbc2a166b..c9ee9119db 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -189,14 +189,14 @@ void Screen_Eob::loadEobBitmap(const char *file, const uint8 *ditheringData, int
 	}
 }
 
-uint8 *Screen_Eob::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool flag) {
+uint8 *Screen_Eob::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4bitEncoding) {
 	uint8 *shp = 0;
 	uint16 shapesize = 0;
 
 	uint8 *srcPage = getPagePtr(_curPage) + y * 320 + (x << 3);
 	uint8 *src = srcPage;
 
-	if (flag) {
+	if (no4bitEncoding) {
 		uint16 h1 = h;
 		while (h1--) {
 			uint8 *lineEnd = src + (w << 3);
@@ -237,19 +237,20 @@ uint8 *Screen_Eob::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool flag
 			uint8 *lineEnd = src + (w << 3);
 			do {
 				uint8 val = *src++;
-				if (!val) {
-					*dst++ = val;
+				if (!val) {				
+					*dst++ = 0;
 					uint8 *startZeroPos = src;
+
 					while (src != lineEnd && *src == 0)
 						src++;
 
 					uint16 numZero = src - startZeroPos + 1;
 					if (numZero >> 8) {
-						numZero -= 0xff;
-						*dst++ = 0xff;
+						*dst++ = 255;
 						*dst++ = 0;
+						numZero -= 255;
 					}
-					val = (numZero & 0xff);
+					val = numZero & 0xff;
 				}
 				*dst++ = val;
 			} while (src != lineEnd);
@@ -384,7 +385,7 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 		if (dX < 0) {
 			width += dX;
 			d = -dX;
-			if ((flags & 1))
+			if (flags & 1)
 				src -= (d >> 1);
 			else
 				src += (d >> 1);
@@ -415,7 +416,7 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 		dY = 320 - width;
 		width >>= 1;
 		w2 >>= 1;
-		if ((flags & 1))
+		if (flags & 1)
 			src += (w2 - 1);
 
 		int16 w1shr = width;
@@ -431,7 +432,7 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 			w1shr++;
 
 		int lineSrcStep = (w2 - w1shr);
-		if ((flags & 1))
+		if (flags & 1)
 			lineSrcStep = w3 - lineSrcStep;
 
 		while (dH--) {
@@ -503,20 +504,12 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 				return;
 			d = -d;
 
-			for (int ii = 0; ii < d; ii++) {
+			for (int i = 0; i < d; i++) {
 				marginLeft = width;
-				int i = 0;
-				do {
-					for (i = 0; i < marginLeft; i++)
-						if (!*src++)
-							break;
-
-					if (!*(src-1) || i < marginLeft)
+				for (int ii = 0; ii < marginLeft; ii++) {
+					if (!*src++)
 						marginLeft = marginLeft + 1 - *src++;
-					else
-						marginLeft = 0;
-
-				} while (marginLeft);
+				}
 			}
             dY = _dsY1;
 		}
@@ -552,25 +545,40 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 			marginRight = w2 - marginLeft - width;
 		}
 
-		dst += (y * 320 + dX);
+		dst += (dY * 320 + dX);
 		uint8 * dstL = dst;
 
 		if (pageNum == 0 || pageNum == 1)
 			addDirtyRect(rX, rY, rW, rH);
 
 		while (dH--) {
-			int16 xpos = (int16) marginLeft;
+			int16 xpos = (int16) marginLeft;			
+
+			if (flags & 1) {				
+				for (int i = 0; i < w2; i++) {
+					if (*src++ == 0) {
+						i += (*src - 1);
+						src += (*src - 1);
+					}
+				}
+				src--;
+			}
+			const uint8 *src2 = src;
 
 			if (xpos) {
 				do {
-					while (*src && xpos) {
-						src++;
+					uint8 val = (flags & 1) ? *(src - 1) : *src;
+					while (val && xpos) {
+						src += pixelStep;
 						xpos--;
+						val = (flags & 1) ? *(src - 1) : *src;
 					}
 
-					if (!*src) {
-						uint8 bt = *++src;
-						src++;
+					val = (flags & 1) ? *(src - 1) : *src;
+					if (!val) {
+						src += pixelStep;
+						uint8 bt = (flags & 1) ? src[1] : src[0];
+						src += pixelStep;
 						xpos = xpos - bt;
 					}
 				} while (xpos > 0);
@@ -580,28 +588,36 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 			xpos += width;
 
 			while (xpos > 0) {
-				uint8 c = *src++;
+				uint8 c = *src;
+				uint8 m = (flags & 1) ? *(src - 1) : c;
+				src += pixelStep;
 
-				if (c) {
+				if (m) {
 					drawShapeSetPixel(dst++, c);
 					xpos--;
 				} else {
-					dst += *src;
-					xpos -= *src++;
+					uint8 len = (flags & 1) ? src[1] : src[0];
+					dst += len;
+					xpos -= len;
+					src += pixelStep;
 				}
 			}
 			xpos += marginRight;
 
 			if (xpos) {
 				do {
-					while (*src && xpos) {
-						src++;
+					uint8 val = (flags & 1) ? *(src - 1) : *src;
+					while (val && xpos) {
+						src += pixelStep;
 						xpos--;
+						val = (flags & 1) ? *(src - 1) : *src;
 					}
 
-					if (!*src) {
-						uint8 bt = *++src;
-						src++;
+					val = (flags & 1) ? *(src - 1) : *src;
+					if (!val) {
+						src += pixelStep;
+						uint8 bt = (flags & 1) ? src[1] : src[0];
+						src += pixelStep;
 						xpos = xpos - bt;
 					}
 				} while (xpos > 0);
@@ -609,6 +625,8 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 
 			dstL += 320;
 			dst = dstL;
+			if (flags & 1)			
+				src = src2 + 1;
 		}
 	}
 }
@@ -707,7 +725,7 @@ void Screen_Eob::setGfxParameters(int x, int y, int col) {
 	_gfxCol = col;
 }
 
-void Screen_Eob::drawExplosion(int scale, int radius, int numSteps, int stepSize, int aspectRatio, const uint8 *colorTable, int colorTableSize) {
+void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepSize, int aspectRatio, const uint8 *colorTable, int colorTableSize) {
 	int ymin = 0;
 	int ymax = _gfxMaxY[scale];
 	int xmin = -100;
@@ -735,20 +753,20 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numSteps, int stepSize
 	int16 *ptr7 = (int16*)&_dsTempPage[1500];
 	int16 *ptr8 = (int16*)&_dsTempPage[1800];
 
-	if (numSteps > 150)
-		numSteps = 150;
+	if (numElements > 150)
+		numElements = 150;
 
-	for (int i = 0; i < numSteps; i++) {
+	for (int i = 0; i < numElements; i++) {
 		ptr2[i] = ptr3[i] = 0;
 		ptr4[i] = _vm->_rnd.getRandomNumberRng(0, radius) - (radius >> 1);
 		ptr5[i] = _vm->_rnd.getRandomNumberRng(0, radius) - (radius >> 1) - (radius >> (8 - aspectRatio));
-		ptr7[i] = _vm->_rnd.getRandomNumberRng(1024/stepSize, 2048/stepSize);
+		ptr7[i] = _vm->_rnd.getRandomNumberRng(1024 / stepSize, 2048 / stepSize);
 		ptr8[i] = scale << 8;
 	}
 
 	for (int l = 2; l;) {
 		if (l != 2) {
-			for (int i = numSteps - 1; i >= 0; i--) {
+			for (int i = numElements - 1; i >= 0; i--) {
 				uint32 end = _system->getMillis() + 1;
 				int16 px = ((ptr2[i] >> 6) >> scale) + gx2;
 				int16 py = ((ptr3[i] >> 6) >> scale) + gy2;
@@ -760,7 +778,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numSteps, int stepSize
 						updateScreen();
 						uint32 cur = _system->getMillis();
 						if (end > cur)
-						_system->delayMillis(end - cur);
+							_system->delayMillis(end - cur);
 					}
 				}
 			}			
@@ -768,7 +786,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numSteps, int stepSize
 
 		l = 0;
 
-		for (int i = 0; i < numSteps; i++) {
+		for (int i = 0; i < numElements; i++) {
 			uint32 end = _system->getMillis() + 1;
 			if (ptr4[i] <= 0)
 				ptr4[i]++;
@@ -805,7 +823,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numSteps, int stepSize
 						updateScreen();
 						uint32 cur = _system->getMillis();
 						if (end > cur)
-						_system->delayMillis(end - cur);
+							_system->delayMillis(end - cur);
 					}
 				}
 			} else {
@@ -817,12 +835,157 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numSteps, int stepSize
 	showMouse();
 }
 
+void Screen_Eob::drawVortex(int numElements, int radius, int stepSize, int, int disorder, const uint8 *colorTable, int colorTableSize) {
+	int16 *xCoords = (int16*)_dsTempPage;
+	int16 *yCoords = (int16*)&_dsTempPage[300];
+	int16 *xMod = (int16*)&_dsTempPage[600];
+	int16 *yMod = (int16*)&_dsTempPage[900];
+	int16 *pixBackup = (int16*)&_dsTempPage[1200];
+	int16 *colTableStep = (int16*)&_dsTempPage[1500];
+	int16 *colTableIndex = (int16*)&_dsTempPage[1800];
+	int16 *pixDelay = (int16*)&_dsTempPage[2100];
+
+	hideMouse();
+	int cp = _curPage;
+
+	if (numElements > 150)
+		numElements = 150;
+
+	int cx = 88;
+	int cy = 48;
+	radius <<= 6;
+
+	for (int i = 0; i < numElements; i++) {
+		int16 v38 = _vm->_rnd.getRandomNumberRng(radius >> 2, radius);
+		int16 stepSum = 0;
+		int16 sqsum = 0;
+		while (sqsum < v38) {
+			stepSum += stepSize;
+			sqsum += stepSum;
+		}
+
+		switch (_vm->_rnd.getRandomNumber(255) & 3) {
+		case 0:
+			xCoords[i] = 32;
+			yCoords[i] = sqsum;
+			xMod[i] = stepSum;
+			yMod[i] = 0;
+			break;
+
+		case 1:
+			xCoords[i] = sqsum;
+			yCoords[i] = 32;
+			xMod[i] = 0;
+			yMod[i] = stepSum;
+			break;
+
+		case 2:
+			xCoords[i] = 32;
+			yCoords[i] = -sqsum;
+			xMod[i] = stepSum;
+			yMod[i] = 0;
+			break;
+
+		default:
+			xCoords[i] = -sqsum;
+			yCoords[i] = 32;
+			xMod[i] = 0;
+			yMod[i] = stepSum;
+			break;
+		}
+
+		if (_vm->_rnd.getRandomBit()) {
+			xMod[i] *= -1;
+			yMod[i] *= -1;
+		}
+
+		colTableStep[i] = _vm->_rnd.getRandomNumberRng(1024 / disorder, 2048 / disorder);
+		colTableIndex[i] = 0;
+		pixDelay[i] = _vm->_rnd.getRandomNumberRng(0, disorder >> 2);
+	}
+
+	int d = 0;
+	for (int i = 2; i; ) {
+		if (i != 2) {
+			uint32 nextDelay = _system->getMillis() + 1;
+			for (int ii = numElements - 1; ii >= 0; ii--) {
+				int16 px = CLIP((xCoords[ii] >> 6) + cx, 0, SCREEN_W - 1);
+				int16 py = CLIP((yCoords[ii] >> 6) + cy, 0, SCREEN_H - 1);
+				setPagePixel(0, px, py, pixBackup[ii]);
+		
+				if (ii % 15 == 0)  {
+					updateScreen();
+					uint32 cur = _system->getMillis();
+					if (nextDelay > cur)
+						_system->delayMillis(nextDelay - cur);
+					nextDelay += 1;
+				}
+			}
+		}
+
+		i = 0;
+		int r = (stepSize >> 1) + (stepSize >> 2) + (stepSize >> 3);
+		uint32 nextDelay2 = _system->getMillis() + 1;
+
+		for (int ii = 0; ii < numElements; ii++) {
+			if (pixDelay[ii] == 0) {
+				if (xCoords[ii] > 0) {
+					xMod[ii] -= ((xMod[ii] > 0) ? stepSize : r);
+				} else {
+					xMod[ii] += ((xMod[ii] < 0) ? stepSize : r);
+				}
+
+				if (yCoords[ii] > 0) {
+					yMod[ii] -= ((yMod[ii] > 0) ? stepSize : r);
+				} else {
+					yMod[ii] += ((yMod[ii] < 0) ? stepSize : r);
+				}
+
+				xCoords[ii] += xMod[ii];
+				yCoords[ii] += yMod[ii];
+				colTableIndex[ii] += colTableStep[ii];
+
+			} else {
+				pixDelay[ii]--;
+			}
+
+			int16 px = CLIP((xCoords[ii] >> 6) + cx, 0, SCREEN_W - 1);
+			int16 py = CLIP((yCoords[ii] >> 6) + cy, 0, SCREEN_H - 1);
+
+			uint8 tc1 =  ((disorder >> 2) <= d) ? getPagePixel(2, px, py) : 0;
+			pixBackup[ii] = getPagePixel(0, px, py);
+			uint8 tblIndex = CLIP(colTableIndex[ii] >> 8, 0, colorTableSize - 1);
+			uint8 tc2 = colorTable[tblIndex];
+
+			if (tc2) {
+				i = 1;
+				if (tc1 == _gfxCol && !pixDelay[ii]) {
+					setPagePixel(0, px, py, tc2);
+					if (ii % 15 == 0)  {
+						updateScreen();
+						uint32 cur = _system->getMillis();
+						if (nextDelay2 > cur)
+							_system->delayMillis(nextDelay2 - cur);
+						nextDelay2 += 1;
+					}
+				}
+			} else {
+				colTableStep[ii] = 0;
+			}
+		}
+		d++;
+	}
+
+	_curPage = cp;
+	showMouse();
+}
+
 void Screen_Eob::fadeTextColor(Palette *pal, int color1, int rate) {
 	uint8 *col = pal->getData();
 
 	for (bool loop = true; loop; ) {
 		loop = true;
-		uint32 end = _system->getMillis() + 16;
+		uint32 end = _system->getMillis() + 1;
 
 		loop = false;
 		for (int ii = 0; ii < 3; ii++) {
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index 909a561462..d2d888107a 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -54,7 +54,7 @@ public:
 	void loadEobBitmap(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage);
 	void loadShapeSetBitmap(const char *file, int tempPage, int destPage);
 
-	uint8 *encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool flag = false);
+	uint8 *encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4bitEncoding = false);
 	void drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd = -1, int flags = 0, ...);
 	const uint8 *scaleShape(const uint8 *shapeData, int blockDistance);
 	const uint8 *scaleShapeStep(const uint8 *shp);
@@ -65,7 +65,8 @@ public:
 	void setShapeFadeMode (uint8 i, bool b);
 
 	void setGfxParameters(int x, int y, int col);
-	void drawExplosion(int scale, int radius, int numSteps, int stepSize, int aspectRatio, const uint8 *colorTable, int colorTableSize);
+	void drawExplosion(int scale, int radius, int numElements, int stepSize, int aspectRatio, const uint8 *colorTable, int colorTableSize);
+	void drawVortex(int numElements, int radius, int stepSize, int, int disorder, const uint8 *colorTable, int colorTableSize);
 
 	void fadeTextColor(Palette *pal, int color1, int fadeTextColor);
 	bool delayedFadePalStep(Palette *fadePal, Palette *destPal, int rate);
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index 2b86aa8d51..15f3c80b22 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -36,16 +36,16 @@ void EobCoreEngine::runLevelScript(int block, int flags) {
 	_inf->run(block, flags);
 }
 
-void EobCoreEngine::setScriptFlag(int flag) {
-	_inf->setFlag(flag);
+void EobCoreEngine::setScriptFlags(uint32 flags) {
+	_inf->setFlags(flags);
 }
 
-void EobCoreEngine::clearScriptFlag(int flag) {
-	_inf->clearFlag(flag);
+void EobCoreEngine::clearScriptFlags(uint32 flags) {
+	_inf->clearFlags(flags);
 }
 
-bool EobCoreEngine::checkScriptFlag(int flag) {
-	return _inf->checkFlag(flag);
+bool EobCoreEngine::checkScriptFlags(uint32 flags) {
+	return _inf->checkFlags(flags);
 }
 
 const uint8 *EobCoreEngine::initScriptTimers(const uint8 *pos) {
@@ -198,16 +198,16 @@ void EobInfProcessor::run(int func, int sub) {
 	} while (!_abortScript && !_abortAfterSubroutine);
 }
 
-void EobInfProcessor::setFlag(int flag) {
-	_flagTable[17] |= flag;
+void EobInfProcessor::setFlags(uint32 flags) {
+	_flagTable[17] |= flags;
 }
 
-void EobInfProcessor::clearFlag(int flag) {
-	_flagTable[17] &= ~flag;
+void EobInfProcessor::clearFlags(uint32 flags) {
+	_flagTable[17] &= ~flags;
 }
 
-bool EobInfProcessor::checkFlag(int flag) const {
-	return (_flagTable[17] & flag) ? true : false;
+bool EobInfProcessor::checkFlags(uint32 flags) const {
+	return ((_flagTable[17] & flags) == flags) ? true : false;
 }
 
 bool EobInfProcessor::preventRest() const {
@@ -709,13 +709,13 @@ int EobInfProcessor::oeob_eval_v1(int8 *data) {
 	while (cmd != -18) {
 		switch (cmd + 38) {
 		case 0:
-			a = 0;
+			a = 1;
 			for (i = 0; i < 6; i++) {
 				if (!(_vm->_characters[i].flags & 1))
 					continue;
-				if (_vm->_characters[i].effectFlags & 4)
+				if (_vm->_characters[i].effectFlags & 0x40)
 					continue;
-				a = 1;
+				a = 0;
 				break;
 			}
 			_stack[_stackIndex++] = a;
@@ -806,7 +806,7 @@ int EobInfProcessor::oeob_eval_v1(int8 *data) {
 			break;
 
 		case 25:
-			_stack[_stackIndex++] = _vm->_levelBlockProperties[READ_LE_UINT16(pos)].flags ? 1 : 0;
+			_stack[_stackIndex++] = (_vm->_levelBlockProperties[READ_LE_UINT16(pos)].flags & 1) ? 1 : 0;
 			pos += 2;
 			break;
 
@@ -944,13 +944,13 @@ int EobInfProcessor::oeob_eval_v2(int8 *data) {
 			break;
 
 		case 12:
-			a = 0;
+			a = 1;
 			for (i = 0; i < 6; i++) {
 				if (!(_vm->_characters[i].flags & 1))
 					continue;
 				if (_vm->_characters[i].effectFlags & 0x40)
 					continue;
-				a = 1;
+				a = 0;
 				break;
 			}
 			_stack[_stackIndex++] = a;
@@ -1415,7 +1415,7 @@ int EobInfProcessor::oeob_sequence(int8 *data) {
 
 	switch (cmd) {
 	case -3:
-		// eob1 outro
+		_vm->seq_xdeath();
 		_vm->_runFlag = false;
 		_vm->_playFinale = true;
 		_abortScript = 1;
diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h
index 71e53bc802..648d214017 100644
--- a/engines/kyra/script_eob.h
+++ b/engines/kyra/script_eob.h
@@ -42,9 +42,9 @@ public:
 	void loadData(const uint8 *data, uint32 dataSize);
 	void run(int func, int sub);
 
-	void setFlag(int flag);
-	void clearFlag(int flag);
-	bool checkFlag(int flag) const;
+	void setFlags(uint32 flags);
+	void clearFlags(uint32 flags);
+	bool checkFlags(uint32 flags) const;
 	bool preventRest() const;
 
 	void loadState(Common::SeekableSubReadStreamEndian &in);
diff --git a/engines/kyra/sequences_eob1.cpp b/engines/kyra/sequences_eob1.cpp
index 8f360c071d..4c5bd17f02 100644
--- a/engines/kyra/sequences_eob1.cpp
+++ b/engines/kyra/sequences_eob1.cpp
@@ -104,43 +104,954 @@ int EobEngine::mainMenuLoop() {
 }
 
 void EobEngine::seq_playOpeningCredits() {
-	static const char *cmpList[] = { "WESTWOOD.CMP", "AND.CMP", "SSI.CMP", "PRESENT.CMP", "DAND.CMP" };
-	static const uint8 frameDelay[] = { 140, 50, 100, 50, 140 };
-
 	_allowSkip = true;
-	_screen->loadPalette("WESTWOOD.COL", _screen->getPalette(0));
+	_screen->loadPalette(_introFilesOpening[5], _screen->getPalette(0));
 	_screen->setScreenPalette(_screen->getPalette(0));
 
-	_screen->loadBitmap(cmpList[0], 5, 3, 0);
+	_screen->loadBitmap(_introFilesOpening[4], 5, 3, 0);
 	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
 
 	_sound->playTrack(1);
-	delay(frameDelay[0] * _tickLength);
+	delay(_introOpeningFrmDelay[0] * _tickLength);
 
-	for (int i = 1; i < 5 && !shouldQuit() && !skipFlag(); i++) {
-		_screen->loadBitmap(cmpList[i], 5, 3, 0);
-		uint32 nextFrameTimer = _system->getMillis() + frameDelay[i] * _tickLength;
+	for (int i = 0; i < 4 && !shouldQuit() && !skipFlag(); i++) {
+		_screen->loadBitmap(_introFilesOpening[i], 5, 3, 0);
+		uint32 nextFrameTimer = _system->getMillis() + _introOpeningFrmDelay[i + 1] * _tickLength;
 		_screen->crossFadeRegion(0, 50, 0, 50, 320, 102, 2, 0);
 		delayUntil(nextFrameTimer);
 	}
 
-	delay(50 * _tickLength);
 	_allowSkip = false;
 }
 
 void EobEngine::seq_playIntro() {
 	_allowSkip = true;
-	//_sound->playTrack(2);
 
+	if (!shouldQuit() && !skipFlag()) {
+		_sound->playTrack(2);
+		_screen->loadBitmap("TITLE-V.CMP", 5, 3, 0);
+		_screen->crossFadeRegion(0, 0, 0, 0, 320, 200, 2, 0);
+		delay(120 * _tickLength);
+	}
+
+	_screen->loadBitmap("TEXT.CMP", 3, 6, 0);
+
+	seq_tower();
+	seq_orb();
+	seq_waterdeepEntry();
+	seq_king();
+	seq_hands();
+	seq_waterdeepExit();
+	seq_tunnel();
+
+	whirlTransition();
+	_sound->haltTrack();
 	_allowSkip = false;
 }
 
 void EobEngine::seq_playFinale() {
-	_allowSkip = true;
+	Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
+	_screen->loadFileDataToPage(s, 5, 32000);
+	delete s;
 
+	snd_playSoundEffect(20);
+	
+	_txt->resetPageBreakString();
+	_txt->setWaitButtonMode(1);
+	_txt->setupField(12, true);
+	gui_drawBox(0, 0, 176, 175, _color1_1, _color2_1, _bkgColor_1);
+	_txt->printDialogueText(51, _moreStrings[0]);
+	
+	if (!checkScriptFlags(0x1ffe)) {
+		_screen->fadeToBlack();
+		return;
+	}
+	
+	_txt->printDialogueText(_finBonusStrings[0]);
+	for (int i = 0; i < 6; i++) {
+		_txt->printDialogueText(_finBonusStrings[1]);
+		if (_characters[i].flags & 1)
+			_txt->printDialogueText(_characters[i].name);
+	}
+	
+	uint32 password = 0;
+	for (int i = 0; i < 4; i++) {
+		if (!(_characters[i].flags & 1))
+			continue;
 
-	_allowSkip = false;
+		int len = strlen(_characters[i].name);
+		for (int ii = 0; ii < len; ii++) {
+			uint32 c = _characters[i].name[ii];
+			password += (c * c);
+		}
+	}
+
+	_txt->printDialogueText(Common::String::format(_finBonusStrings[2], password).c_str(), true);
+	_screen->fadeToBlack();
+}
+
+void EobEngine::seq_tower() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	_screen->loadPalette(_introFilesTower[0], _screen->getPalette(0));
+	_screen->loadBitmap(_introFilesTower[1], 5, 3, 0);
+	_screen->setCurPage(2);
+	uint8 *shp = _screen->encodeShape(0, 0, 16, 56, true);
+	_screen->copyPage(3, 4);
+	_screen->clearCurPage();
+
+	for (int i = 0; i < 200; i += 64)
+		_screen->copyRegion(128, 104, 96, i, 128, 64, 4, 2, Screen::CR_NO_P_CHECK);
+
+	_screen->fillRect(0, 184, 319, 199, 12);
+	int cp = _screen->setCurPage(0);
+	whirlTransition();
+	_screen->setScreenPalette(_screen->getPalette(0));
+	_screen->setCurPage(cp);
+	_screen->clearCurPage();
+
+	for (int i = 0; i < 200; i += 64)
+		_screen->copyRegion(128, 104, 0, i, 128, 64, 4, 2, Screen::CR_NO_P_CHECK);
+
+	_screen->setCurPage(0);
+
+	for (int i = 0; i < 64 && !shouldQuit() && !skipFlag(); i += 2) {
+		uint32 end = _system->getMillis() + 2 * _tickLength;
+		_screen->copyRegion(0, 142 - i, 96, 0, 128, i + 1, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(0, 0, 96, i + 1, 128, 167 - i, 2, 0, Screen::CR_NO_P_CHECK);
+		if (!i)
+			_screen->copyRegion(0, 0, 0, 168, 320, 32, 6, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	for (int i = 0; i < 24 && !shouldQuit() && !skipFlag(); i += 2) {
+		uint32 end = _system->getMillis() + 2 * _tickLength;
+		_screen->copyRegion(0, 79 - i, 96, 0, 24, 65 + i, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(104, 79 - i, 200, 0, 24, 65 + i, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(24, 110, 120, i + 31, 80, 34, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(152, 0, 120, 32, 80, i + 1, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(0, 0, 96, 65 + i, 128, 103 - i, 2, 0, Screen::CR_NO_P_CHECK);	
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	for (int i = 0; i < 56 && !shouldQuit() && !skipFlag(); i += 2) {
+		uint32 end = _system->getMillis() + 2 * _tickLength;
+		_screen->copyRegion(0, 56, 96, i, 24, 54, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(104, 56, 200, i, 24, 54, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(0, 110, 96, 54 + i, 128, 34, 4, 0, Screen::CR_NO_P_CHECK);
+
+		if (i < 32) {
+			_screen->fillRect(128, 0, 255, i + 1, 12, 2);
+			_screen->copyRegion(152, 0, 120, 32, 80, i + 25, 4, 0, Screen::CR_NO_P_CHECK);
+		} else {
+			_screen->fillRect(128, 0, 255, i + 1, 12, 2);
+			_screen->copyRegion(152, i + 1, 120, 32 + i + 1, 80, 23, 4, 0, Screen::CR_NO_P_CHECK);
+			_screen->copyRegion(152, 0, 152, 32, 80, i + 1, 4, 2, Screen::CR_NO_P_CHECK);
+		}
+
+		_screen->drawShape(2, shp, 128, i - 55, 0);
+		_screen->copyRegion(128, 0, 96, 0, 128, i + 1, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(0, 0, 96, i + 89, 128, 79 - i, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->copyRegion(0, 32, 0, 168, 320, 32, 6, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(65 * _tickLength);
+	delete[] shp;
+}
+
+void EobEngine::seq_orb() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	uint8 *shp[5];
+	_screen->loadBitmap(_introFilesOrb[0], 5, 3, 0);
+	_screen->setCurPage(2);
+	shp[4] = _screen->encodeShape(0, 0, 20, 136, true);
+	_screen->loadBitmap(_introFilesOrb[1], 5, 3, 0);
+	shp[3] = _screen->encodeShape(16, 0, 16, 104, true);
+	
+	_screen->fillRect(0, 0, 127, 103, 12);
+	for (int i = 1; i < 4; i++) {
+		copyBlurRegion(128, 0, 0, 0, 128, 104, i);
+		shp[3 - i] = _screen->encodeShape(0, 0, 16, 104, true);
+	}
+	
+	_screen->fillRect(0, 0, 159, 135, 12);
+	_screen->setCurPage(0);
+	_screen->copyPage(3, 4);
+	_screen->clearCurPage();
+	
+	_sound->playTrack(6);
+
+	for (int i = -1; i < 4 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + 3 * _tickLength;
+		if (i >= 0)
+			_screen->drawShape(2, shp[i], 16, 16, 0);
+		_screen->drawShape(2, shp[4], 0, 0, 0);
+		_screen->copyRegion(0, 0, 80, 24, 160, 136, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->copyRegion(0, 64, 0, 168, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(40 * _tickLength);
+
+	_sound->playTrack(6);
+
+	for (int i = 3; i > -2 && !shouldQuit() && !skipFlag(); i--) {
+		uint32 end = _system->getMillis() + 3 * _tickLength;
+		_screen->fillRect(16, 16, 143, 119, 12, 2);
+		if (i >= 0)
+			_screen->drawShape(2, shp[i], 16, 16, 0);
+		_screen->drawShape(2, shp[4], 0, 0, 0);
+		_screen->copyRegion(0, 0, 80, 24, 160, 136, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	delay(40 * _tickLength);
+
+	for (int i = 0; i < 5; i++)
+		delete[] shp[i];
+}
+
+void EobEngine::seq_waterdeepEntry() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	uint8 *shp[4];
+	uint8 *shp2[31];
+	uint8 *shp3[3];
+
+	_screen->loadPalette(_introFilesWdEntry[0], _screen->getPalette(0));
+	_screen->setScreenPalette(_screen->getPalette(0));
+	_screen->loadBitmap(_introFilesWdEntry[1], 5, 3, 0);
+	_screen->setCurPage(2);
+	shp[3] = _screen->encodeShape(0, 0, 20, 136, true);
+	for (int i = 1; i < 4; i++) {
+		copyBlurRegion(0, 0, 0, 0, 160, 136, i);
+		shp[3 - i] = _screen->encodeShape(0, 0, 20, 136, true);
+	}
+	_screen->setCurPage(0);
+
+	_screen->copyPage(3, 4);
+	_screen->fillRect(0, 168, 319, 199, 12, 0);
+	_sound->playTrack(6);
+
+	for (int i = 0; i < 4 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + 3 * _tickLength;
+		_screen->drawShape(0, shp[i], 80, 24, 0);
+		delete[] shp[i];
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->copyRegion(0, 80, 0, 168, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(50 * _tickLength);
+
+	_screen->setCurPage(2);
+	shp[0] = _screen->encodeShape(20, 0, 20, 136, true);
+	_screen->loadBitmap(_introFilesWdEntry[2], 5, 3, 0);
+	shp[1] = _screen->encodeShape(0, 0, 20, 136, true);
+	shp[2] = _screen->encodeShape(20, 0, 20, 136, true);
+	_screen->loadBitmap(_introFilesWdEntry[3], 5, 3, 0);
+
+	for (int i = 0; i < 31; i++)
+		shp2[i] = _screen->encodeShape(_introWdEncodeX[i], 136 + (_introWdEncodeY[i] << 3), _introWdEncodeWH[i], _introWdEncodeWH[i] << 3, true);
+	for (int i = 0; i < 3; i++)
+		shp3[i] = _screen->encodeShape(5 * i, 152, 5, 32, true);
+
+	_screen->copyPage(3, 4);
+
+	for (int i = 0; i < 3 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + 3 * _tickLength;
+		_screen->fillRect(0, 0, 159, 135, 12, 2);
+		_screen->drawShape(2, shp[i], 0, 0, 0);
+		_screen->copyRegion(0, 0, 80, 24, 160, 136, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->copyRegion(0, 0, 80, 24, 160, 136, 4, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(4 * _tickLength);
+	_screen->copyRegion(160, 0, 80, 24, 160, 136, 4, 0, Screen::CR_NO_P_CHECK);
+	_screen->fillRect(0, 168, 319, 199, 12, 0);
+	_screen->updateScreen();
+	delay(4 * _tickLength);
+	_screen->copyRegion(0, 184, 40, 184, 232, 16, 4, 0, Screen::CR_NO_P_CHECK);
+
+	int cx = 264;
+	int cy = 11;
+
+	for (int i = 0; i < 70 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + 3 * _tickLength;
+
+		_screen->copyRegion(cx - 2, cy - 2, 0, 0, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
+		_screen->drawShape(4, shp3[((i & 3) == 3) ? 1 : (i & 3)], cx, cy, 0);
+		_screen->copyRegion(cx - 2, cy - 2, cx - 82, cy + 22, 48, 36, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(0, 0, cx - 2, cy - 2, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
+		cx--;
+		cy++;
+
+		for (int ii = 0; ii < 5; ii++) {
+			int s = _rnd.getRandomNumber(255) % 31;
+			_screen->drawShape(0, shp2[s], _introWdDsX[s] - 80, _introWdDsY[s] + 24, 0);
+		}
+
+		if (!(_rnd.getRandomNumber(255) & 7))
+			_sound->playTrack(_rnd.getRandomBit() ? 5 : 14);
+
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	for (int i = 0; i < 3; i++) {
+		delete[] shp[i];
+		delete[] shp3[i];
+	}
+
+	for (int i = 0; i < 31; i++)
+		delete[] shp2[i];
+}
+
+void EobEngine::seq_king() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	_screen->loadBitmap(_introFilesKing[0], 5, 3, 0);
+	_screen->copyPage(3, 4);
+
+	int x = 15;
+	int y = 14;
+	int w = 1;
+	int h = 1;
+
+	for (int i = 0; i < 10 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->copyRegion(x << 3, y << 3, x << 3, y << 3, w << 3, h << 3, 4, 0, Screen::CR_NO_P_CHECK);
+		if (x > 6)
+			x --;
+		if (y > 0)
+			y -= 2;
+		w += 3;
+		if (x + w > 34)
+			w = 34 - x;
+		h += 3;
+		if (y + h > 23)
+			h = 23 - y;
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	delay(25 * _tickLength);
+
+	uint8 *shp[4];
+	int16 dy[4];
+	int16 stepY[4];
+
+	static const uint8 advEncX[] = { 0, 6, 12, 19 };
+	static const uint8 advEncW[] = { 6, 6, 7, 6 };
+	static const int8 modY[] = { -4, -8, -2, -2, 1, 0, 0, 0 };
+	
+	_screen->loadBitmap(_introFilesKing[1], 5, 3, 0);
+	_screen->setCurPage(2);
+	for (int i = 0; i < 4; i++) {
+		shp[i] = _screen->encodeShape(advEncX[i], 0, advEncW[i], 98, true);
+		dy[i] = 180 + ((_rnd.getRandomNumber(255) & 3) << 3);
+		stepY[i] = (i * 5) & 3;
+	}
+
+	_screen->copyPage(0, 4);
+
+	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag(); ) {
+		runloop = false;
+		uint32 end = _system->getMillis() + 2 * _tickLength;
+		
+		for (int i = 0; i < 4; i++) {
+			if (dy[i] <= 82)
+				continue;
+			stepY[i] = (stepY[i] + 1) & 7;
+			dy[i] += modY[stepY[i]];
+
+			if (dy[i] < 82)
+				dy[i] = 82;
+
+			if (dy[i] < 180) {
+				_screen->copyRegion((advEncX[i] + 8) << 3, dy[i] - 2, 0, dy[i] - 2, advEncW[i] << 3, 182 - dy[i], 4, 4, Screen::CR_NO_P_CHECK);
+				_screen->drawShape(4, shp[i], 0, dy[i], 0);
+				_screen->copyRegion(0, dy[i] - 2, (advEncX[i] + 8) << 3, dy[i] - 2, advEncW[i] << 3, 182 - dy[i], 4, 0, Screen::CR_NO_P_CHECK);
+			}
+
+			if (_rnd.getRandomNumber(255) & 3)
+				_sound->playTrack(7);
+
+			runloop = true;
+		}
+
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->copyRegion(0, 96, 0, 160, 320, 32, 6, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(70 * _tickLength);
+
+	for (int i = 0; i < 4; i++)
+		delete[] shp[i];
+}
+
+void EobEngine::seq_hands() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	_screen->setCurPage(2);
+	uint8 *shp1 = _screen->encodeShape(0, 140, 21, 60, true);
+	uint8 *shp2 = _screen->encodeShape(21, 140, 12, 60, true);
+	_screen->loadBitmap(_introFilesHands[0], 3, 5, 0);
+
+	_screen->fillRect(0, 160, 319, 199, 12, 0);
+	_screen->fillRect(0, 0, 191, 63, 157, 2);
+	_screen->drawShape(2, shp1, 0, 4, 0);
+	_screen->drawShape(2, shp2, 151, 4, 0);	
+	boxMorphTransition(25, 8, 18, 4, 3, 0, 21, 8, 6, 0, 28, 23);
+	_screen->copyRegion(0, 128, 0, 176, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
+
+	_screen->updateScreen();
+	delay(15 * _tickLength);
+	_sound->playTrack(11);
+
+	for (int i = -22; i <= 20 && !shouldQuit() && !skipFlag(); i += 4) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->fillRect(0, 0, 167, 63, 157);
+		_screen->drawShape(2, shp1, i, 4, 0);
+		_screen->drawShape(2, shp1, 105 - i, 4, 0);
+		_screen->copyRegion(0, 0, 144, 32, 168, 64, 2, 0, Screen::CR_NO_P_CHECK);		
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_sound->playTrack(10);
+
+	delete[] shp1;
+	delete[] shp2;
+	delay(15 * _tickLength);
+
+	_screen->setCurPage(4);
+	shp1 = _screen->encodeShape(17, 0, 11, 120, true);
+	shp2 = _screen->encodeShape(28, 112, 1, 31, true);
+	uint8 *shp3 = _screen->encodeShape(9, 138, 14, 54, true);
+	
+	_screen->setCurPage(2);
+	_screen->fillRect(0, 0, 135, 63, 157);
+	_screen->drawShape(2, shp1, 32, -80, 0);
+	_screen->drawShape(2, shp2, 40, -16, 0);
+	boxMorphTransition(18, 16, 10, 12, 0, 0, 17, 8, 17, 3, 25, 10);
+	delay(15 * _tickLength);
+
+	for (int i = -80; i <= 0 && !shouldQuit() && !skipFlag(); i += 4) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->fillRect(0, 0, 135, 63, 157);
+		_screen->drawShape(2, shp1, 32, i, 0);
+		_screen->drawShape(2, shp2, 40, i + 64, 0);
+		_screen->copyRegion(0, 0, 80, 96, 136, 64, 2, 0, Screen::CR_NO_P_CHECK);		
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_sound->playTrack(12);
+	delay(5 * _tickLength);
+
+	for (int i = 0; i > -54 && !shouldQuit() && !skipFlag(); i -= 4) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->fillRect(0, 0, 135, 63, 157);
+		_screen->drawShape(2, shp3, 12, 64 + i, 0);
+		_screen->drawShape(2, shp1, 32, i, 0);
+		_screen->copyRegion(0, 0, 80, 96, 136, 64, 2, 0, Screen::CR_NO_P_CHECK);		
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	delete[] shp1;
+	delete[] shp2;
+	delete[] shp3;
+	delay(15 * _tickLength);
+
+	_screen->setCurPage(4);
+	shp1 = _screen->encodeShape(0, 0, 17, 136, true);
+	shp2 = _screen->encodeShape(0, 136, 9, 48, true);
+
+	_screen->setCurPage(2);
+	_screen->fillRect(0, 0, 143, 95, 157);
+	_screen->drawShape(2, shp1, -56, -56, 0);
+	_screen->drawShape(2, shp2, 52, 49, 0);
+	boxMorphTransition(9, 6, 0, 0, 0, 0, 18, 12, 8, 11, 21, 10);
+	delay(15 * _tickLength);
+	_sound->playTrack(11);
+
+	for (int i = -56; i <= -8 && !shouldQuit() && !skipFlag(); i += 4) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->fillRect(0, 0, 143, 95, 157);
+		_screen->drawShape(2, shp1, i, i, 0);
+		_screen->drawShape(2, shp2, (i == -8) ? 55 : 52, (i == -8) ? 52 : 49, 0);
+		_screen->copyRegion(0, 0, 0, 0, 144, 96, 2, 0, Screen::CR_NO_P_CHECK);		
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_sound->playTrack(10);
+	delete[] shp1;
+	delete[] shp2;
+	delay(30 * _tickLength);
+
+	_screen->setCurPage(4);
+	shp1 = _screen->encodeShape(28, 0, 11, 40, true);
+	shp2 = _screen->encodeShape(28, 40, 10, 72, true);
+
+	_screen->setCurPage(2);
+	_screen->fillRect(0, 0, 87, 112, 157);
+	_screen->drawShape(2, shp2, 0, 90, 0);
+	boxMorphTransition(20, 13, 15, 6, 0, 0, 11, 14, 0, 0, 24, 16);
+	delay(15 * _tickLength);
+
+	int dy = 90;
+	for (int i = -40; i <= 0 && !shouldQuit() && !skipFlag(); i += 4) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->fillRect(0, 0, 87, 112, 157);
+		_screen->drawShape(2, shp2, 0, dy, 0);
+		_screen->copyRegion(0, 0, 120, 48, 88, 112, 2, 0, Screen::CR_NO_P_CHECK);		
+		_screen->updateScreen();
+		delayUntil(end);
+		dy -= 5;
+	}
+
+	_sound->playTrack(13);
+
+	for (int i = -40; i <= 0 && !shouldQuit() && !skipFlag(); i += 4) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->fillRect(0, 0, 87, 39, 157);
+		_screen->drawShape(2, shp1, 0, i, 0);
+		_screen->copyRegion(0, 0, 120, 48, 88, 112, 2, 0, Screen::CR_NO_P_CHECK);		
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	delete[] shp1;
+	delete[] shp2;
+	delay(48 * _tickLength);
+}
+
+void EobEngine::seq_waterdeepExit() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	uint8 *shp2[31];
+	uint8 *shp3[3];
+
+	_screen->loadBitmap(_introFilesWdExit[0], 5, 3, 0);
+	_screen->setCurPage(2);
+	for (int i = 0; i < 31; i++)
+		shp2[i] = _screen->encodeShape(_introWdEncodeX[i], 136 + (_introWdEncodeY[i] << 3), _introWdEncodeWH[i], _introWdEncodeWH[i] << 3, true);
+	for (int i = 0; i < 3; i++)
+		shp3[i] = _screen->encodeShape(5 * i + 15, 152, 5, 32, true);
+	uint8 *shp1 = _screen->encodeShape(31, 136, 5, 32, true);
+	_screen->copyPage(3, 4);
+	_screen->copyRegion(0, 0, 0, 136, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
+	_screen->fillRect(0, 168, 319, 199, 12, 0);
+	_screen->copyRegion(160, 0, 80, 24, 160, 136, 4, 0, Screen::CR_NO_P_CHECK);
+
+	int cx = 140;
+	int cy = 128;
+
+	for (int i = 0; i < 70 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + 3 * _tickLength;
+		int fx = cx - 2;
+		if (fx < 160)
+			fx = 160;
+		int fy = cy - 2;
+		if (fy > 98)
+			fy = 98;
+
+		_screen->copyRegion(fx, fy, 0, 0, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
+		_screen->drawShape(4, shp3[((i & 3) == 3) ? 1 : (i & 3)], cx, cy, 0);
+		_screen->drawShape(4, shp1, 160, 104, 0);
+		_screen->copyRegion(fx, fy, fx - 80, fy + 24, 48, 36, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(0, 0, fx, fy, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
+		cx++;
+		cy--;
+
+		for (int ii = 0; ii < 5; ii++) {
+			int s = _rnd.getRandomNumber(255) % 31;
+			_screen->drawShape(0, shp2[s], _introWdDsX[s] - 80, _introWdDsY[s] + 24, 0);
+		}
+
+		if (!(_rnd.getRandomNumber(255) & 7))
+			_sound->playTrack(_rnd.getRandomBit() ? 5 : 14);
+
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	for (int i = 0; i < 3; i++)
+		delete[] shp3[i];
+
+	for (int i = 0; i < 31; i++)
+		delete[] shp2[i];
+	delete[] shp1;
+
+	_screen->setCurPage(0);
+	_screen->fillRect(0, 168, 319, 199, 12, 0);
+	_screen->copyRegion(0, 136, 0, 0, 48, 36, 0, 4, Screen::CR_NO_P_CHECK);
+
+	_screen->loadPalette(_introFilesWdExit[1], _screen->getPalette(0));
+	_screen->setScreenPalette(_screen->getPalette(0));
+	_screen->loadBitmap(_introFilesWdExit[2], 3, 5, 0);
+	_screen->copyPage(5, 2);
+	whirlTransition();
+	delay(6 * _tickLength);
+
+	_screen->copyRegion(0, 144, 0, 184, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
+
+	cx = 0;
+	cy = 136;
+	int dy = 0;
+	for (int i = 0; i < 19 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->copyRegion(cx, cy, 80, dy + 16, 160, 8, 2, 0, Screen::CR_NO_P_CHECK);
+		cy += 8;
+		dy += 8;
+		if (i == 6) {
+			cx = 160;
+			cy = 0;
+		}
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_sound->playTrack(3);
+	delay(60 * _tickLength);
+
+	for (int i = 0; i < 56 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->copyRegion(0, 136 + i, 80, 16, 160, 56 - i, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(160, 0, 80, 72 - i, 160, 96 + i, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	for (int i = 1; i < 48 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->copyRegion(160, i, 80, 16, 160, 152, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->loadBitmap(_introFilesWdExit[3], 3, 5, 0);
+	_screen->copyPage(5, 2);
+	delay(30 * _tickLength);
+	_screen->setCurPage(0);
+	_screen->fillRect(0, 16, 319, 31, 12);
+	_screen->fillRect(0, 136, 319, 199, 12);
+	_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->loadPalette(_introFilesWdExit[4], _screen->getPalette(0));
+	_screen->setScreenPalette(_screen->getPalette(0));
+	_screen->updateScreen();
+	delay(50 * _tickLength);
+}
+
+void EobEngine::seq_tunnel() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	_screen->setCurPage(4);
+	uint8 *shp2 = _screen->encodeShape(20, 0, 20, 120, true);
+	uint8 *shp1 = _screen->encodeShape(0, 0, 20, 120, true);
+	drawBlockObject(1, 4, shp2, 160, 0, 0);
+	drawBlockObject(1, 4, shp1, 0, 0, 0);
+	delete[] shp1;
+	delete[] shp2;
+
+	for (int i = 0; i < 3 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + 8 * _tickLength;
+		_screen->copyRegion(0, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
+		_sound->playTrack(7);
+		_screen->updateScreen();
+		delayUntil(end);
+		_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
+		_sound->playTrack(7);
+		end = _system->getMillis() + 8 * _tickLength;
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->copyRegion(0, 160, 0, 184, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(18 * _tickLength);
+	_screen->copyRegion(160, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(5 * _tickLength);
+	_screen->copyRegion(0, 122, 80, 32, 160, 60, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(160, 122, 80, 92, 160, 60, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(5 * _tickLength);
+	_screen->copyRegion(160, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
+	for (int i = 0; i < 6; i++)
+		_screen->copyRegion(i * 48, 185, 56, (i << 3) + 24, 48, 8, 2, 2, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(5 * _tickLength);
+	_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
+
+	_screen->loadBitmap(_introFilesTunnel[0], 5, 3, 0);
+	_screen->copyPage(3, 4);
+	_screen->updateScreen();
+	delay(40 * _tickLength);
+
+	_screen->copyRegion(264, 0, 136, 56, 48, 48, 4, 0, Screen::CR_NO_P_CHECK);
+	_sound->playTrack(8);
+	_screen->copyRegion(0, 0, 0, 0, 320, 184, 0, 2, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(16 * _tickLength);
+	_sound->playTrack(4);
+
+	for (int i = 0; i < 30 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + _tickLength;
+		if (i == 0)
+			_screen->fillRect(0, 168, 319, 199, 12, 0);
+		_screen->copyRegion(80, 25 + (_rnd.getRandomNumber(255) & 7), 80, 24, 160, 144, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_sound->playTrack(9);
+
+	for (int i = 0; i < 6 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + _tickLength;		
+		_screen->copyRegion(_introTvlX1[i] << 3, _introTvlY1[i], _introTvlX2[i] << 3, _introTvlY2[i], _introTvlW[i] << 3, _introTvlH[i], 4, 2, Screen::CR_NO_P_CHECK);
+		for (int ii = 0; ii < 4 && !shouldQuit() && !skipFlag(); ii++) {
+			_screen->updateScreen();
+			delayUntil(end);
+			end = _system->getMillis() + _tickLength;
+			_screen->copyRegion(80, 25 + (_rnd.getRandomNumber(255) & 7), 80, 24, 160, 144, 2, 0, Screen::CR_NO_P_CHECK);
+		}
+	}
+	_screen->copyRegion(0, 0, 0, 0, 320, 168, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(40 * _tickLength);
+
+	_screen->loadBitmap(_introFilesTunnel[1], 5, 3, 0);
+	_screen->copyPage(3, 4);
+	_sound->playTrack(6);
+	_screen->copyRegion(0, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(2 * _tickLength);
+	_screen->copyRegion(160, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(2 * _tickLength);
+	_screen->copyRegion(0, 120, 80, 30, 160, 64, 4, 0, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(160, 120, 80, 94, 160, 64, 4, 0, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(0, 176, 0, 184, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
+	_screen->setCurPage(0);
+	_screen->updateScreen();
+	delay(50 * _tickLength);	
+}
+
+void EobEngine::seq_xdeath() {
+	uint8 *shapes1[5];
+	uint8 *shapes2;
+	
+	_screen->loadShapeSetBitmap("XDEATH2", 5, 3);
+	for (int i = 0; i < 4; i++)
+		shapes1[i] = _screen->encodeShape(i / 2 * 14, i / 2 * 88, 14, 88, true);
+	_screen->loadShapeSetBitmap("XDEATH3", 5, 3);
+	shapes2 = _screen->encodeShape(22, 0, 16, 95, true);
+	_screen->loadEobBitmap("XDEATH1", 0, 5, 3, -1);
+	_screen->setCurPage(0);
+
+	for (int i = 0; i < 10; i++) {
+		if (i == 2)
+			snd_playSoundEffect(72);
+		else if (i == 4 || i == 6)
+			snd_playSoundEffect(54);
+		else
+			snd_playSoundEffect(34);
+
+		if (i < 6) {
+			_screen->copyRegion((i % 3) * 104, i / 3 * 88, 32, 10, 104, 88, 2, 0, Screen::CR_NO_P_CHECK);
+		} else {
+			snd_playSoundEffect(42);
+			_screen->drawShape(0, shapes1[i - 6], 32, 10, 0);
+		}
+
+		_screen->updateScreen();
+		delay(4 * _tickLength);
+	}
+
+	const ScreenDim *dm = _screen->getScreenDim(5);
+	_screen->modifyScreenDim(5, dm->sx, 8, dm->w, dm->h);
+	_screen->copyRegion(0, 0, 0, 0, 176, 120, 0, 5, Screen::CR_NO_P_CHECK);
+
+	for (int i = 0; i < 19; i++) {
+		snd_playSoundEffect(119);
+		_screen->copyRegion(0, 0, 0, 0, 176, 120, 5, 2, Screen::CR_NO_P_CHECK);
+		_screen->drawShape(2, shapes2, 24, i * 5 - 90, 5);
+		_screen->copyRegion(0, 0, 0, 0, 176, 120, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delay(2 * _tickLength);
+	}
+	
+	_screen->modifyScreenDim(5, dm->sx, 0, dm->w, dm->h);
+
+	snd_playSoundEffect(5);
+	delay(60 * _tickLength);
+
+	for (int i = 0; i < 4; i++)
+		delete[] shapes1[i];
+	delete[] shapes2;
+}
+
+void EobEngine::copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step) {
+	const uint8 *ptr2 = _screen->getCPagePtr(3) + y1 * 320 + x1;
+
+	if (step == 1) {
+		while (h > 0) {
+			int dx = x2;
+			for (int i = 0; i < w; i += 2) {
+				_screen->setPagePixel(3, dx++, y2, ptr2[i]);
+				_screen->setPagePixel(3, dx++, y2, 0);
+			}
+			dx = x2;
+			y2++;
+			ptr2 += 320;
+			for (int i = 0; i < w; i += 2) {
+				_screen->setPagePixel(3, dx++, y2, 0);
+				_screen->setPagePixel(3, dx++, y2, ptr2[i + 1]);
+			}
+			y2++;
+			ptr2 += 320;
+			h -= 2;
+		}
+	} else if (step == 2) {
+		while (h > 0) {
+			int dx = x2;
+			for (int i = 0; i < w; i += 2) {
+				_screen->setPagePixel(3, dx++, y2, ptr2[i]);
+				_screen->setPagePixel(3, dx++, y2, 0);
+			}
+			dx = x2;
+			y2++;
+			ptr2 += 320;
+			for (int i = 0; i < w; i++)
+				_screen->setPagePixel(3, dx++, y2, 0);
+
+			y2++;
+			ptr2 += 320;
+			h -= 2;
+		}
+	} else if (step == 3) {
+		for (int i = 0; i < h; i++) {
+			int dx = x2;
+			if ((i % 3) == 0) {
+				int ii = 0;
+				for (; ii < w - 3; ii += 3) {
+					_screen->setPagePixel(3, dx++, y2, ptr2[ii]);
+					_screen->setPagePixel(3, dx++, y2, 0);
+					_screen->setPagePixel(3, dx++, y2, 0);
+				}
+				for (; ii < w; ii++)
+					_screen->setPagePixel(3, dx++, y2, 0);
+			} else {
+				for (int ii = 0; ii < w; ii++)
+					_screen->setPagePixel(3, dx++, y2, 0);
+			}
+			y2++;
+			ptr2 += 320;
+		}
+	}
+}
+
+void EobEngine::boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH) {
+	int originX2 = originX1 + originW;
+	int originY2 = originY1 + originH;
+	if (originY2 > 21)
+		originY2 = 21;
+
+	int w = 1;
+	int h = 1;
+	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag(); ) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->copyRegion(targetSrcX << 3, targetSrcY << 3, targetDestX << 3, targetDestY << 3, w << 3, h << 3, 2, 0, Screen::CR_NO_P_CHECK);
+		if (originX1 < targetDestX)
+			_screen->copyRegion(312, 0, originX1 << 3, 0, 8, 176, 0, 0, Screen::CR_NO_P_CHECK);
+		if (originY1 < targetDestY)
+			_screen->copyRegion(0, 192, 0, originY1 << 3, 320, 8, 0, 0, Screen::CR_NO_P_CHECK);
+		if ((targetFinalX + targetFinalW) <= originX2)
+			_screen->copyRegion(312, 0, originX2 << 3, 0, 8, 176, 0, 0, Screen::CR_NO_P_CHECK);
+		if ((targetFinalY + targetFinalH) <= originY2)
+			_screen->copyRegion(0, 192, 0, originY2 << 3, 320, 8, 0, 0, Screen::CR_NO_P_CHECK);
+
+		if (!(targetDestX != targetFinalX || targetDestY != targetFinalY || w != targetFinalW || h != targetFinalH || originX1 < targetFinalX || originY1 < targetFinalY || (targetFinalX + targetFinalW) < originX2 || (targetFinalY + targetFinalH) < originY2))
+			runloop = false;
+
+		int v = targetFinalX - targetDestX;
+		v = (v < 0) ? -1 : ((v > 0) ? 1 : 0);
+		targetDestX += v;
+		v = targetFinalY - targetDestY;
+		v = (v < 0) ? -1 : ((v > 0) ? 1 : 0);
+		targetDestY += v;
+
+		if (w != targetFinalW)
+			w += 2;
+		if (w > targetFinalW)
+			w = targetFinalW;
+
+		if (h != targetFinalH)
+			h += 2;
+		if (h > targetFinalH)
+			h = targetFinalH;
+
+		if (++originX1 > targetFinalX)
+			originX1 = targetFinalX;
+
+		if (++originY1 > targetFinalY)
+			originY1 = targetFinalY;
+
+		if ((targetFinalX + targetFinalW) < originX2)
+			originX2--;
+
+		if ((targetFinalY + targetFinalH) < originY2)
+			originY2--;
+
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+}
+
+void EobEngine::whirlTransition() {
+	for (int i = 0; i < 2; i++) {
+		for (int ii = 0; ii < 8; ii++) {
+			uint32 e = _system->getMillis() + 3;
+			if (ii & 1) {
+				for (int iii = i + ii; iii < 320; iii += 8)
+					_screen->drawClippedLine(iii, 0, iii, 199, 12);
+			} else {
+				for (int iii = i + ii; iii < 200; iii += 8)
+					_screen->drawClippedLine(0, iii, 319, iii, 12);
+			}
+			_screen->updateScreen();
+			uint32 c = _system->getMillis();
+			if (e > c)
+				_system->delayMillis(e - c);
+		}
+	}
 }
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
index bba5a7a220..395e94713c 100644
--- a/engines/kyra/sequences_eob2.cpp
+++ b/engines/kyra/sequences_eob2.cpp
@@ -120,7 +120,6 @@ int DarkMoonEngine::mainMenu() {
 
 			case 1:
 				// load game in progress
-				//
 				menuChoice = -1;
 				break;
 
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index cb8ae51860..e4001b24d7 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -55,7 +55,7 @@ namespace Kyra {
 
 void EobCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex) {
 	Common::String s = filename;
-	if (GI_EOB1 && !scumm_stricmp(filename, "rust") || !scumm_stricmp(filename, "drider") || !scumm_stricmp(filename, "spider") || !scumm_stricmp(filename, "mantis") || !scumm_stricmp(filename, "xorn") || !scumm_stricmp(filename, "xanath"))
+	if ((_flags.gameID == GI_EOB1) && (!scumm_stricmp(filename, "rust") || !scumm_stricmp(filename, "drider") || !scumm_stricmp(filename, "spider") || !scumm_stricmp(filename, "mantis") || !scumm_stricmp(filename, "xorn") || !scumm_stricmp(filename, "xanath")))
 		s += "1";
 
 	_screen->loadShapeSetBitmap(s.c_str(), 3, 3);
@@ -272,10 +272,10 @@ void EobCoreEngine::updateAttackingMonsterFlags() {
 	}
 
 	if (m2->type == 7)
-		_inf->setFlag(4);
+		setScriptFlags(4);
 
 	if (m2->type == 12)
-		_inf->setFlag(0x800);
+		setScriptFlags(0x800);
 }
 
 const int8 *EobCoreEngine::getMonstersOnBlockPositions(uint16 block) {
@@ -791,9 +791,9 @@ void EobCoreEngine::turnFriendlyMonstersHostile() {
 
 	if (m) {
 		if (m->type == 7)
-			_inf->setFlag(0x40000);
+			setScriptFlags(0x40000);
 		else if (m->type == 12)
-			_inf->setFlag(0x8000000);
+			setScriptFlags(0x8000000);
 	}
 }
 
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index b1ab606f5e..5995f8a5cd 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -535,6 +535,11 @@ void EobCoreEngine::initStaticResource() {
 	_magicFlightObjectProperties = _staticres->loadRawData(kEobBaseMagicFlightProps, temp);
 	_turnUndeadEffect = _staticres->loadRawData(kEobBaseTurnUndeadEffect, temp);
 	_burningHandsDest = _staticres->loadRawData(kEobBaseBurningHandsDest, temp);
+	_coneOfColdDest1 = (const int8*)_staticres->loadRawData(kEobBaseConeOfColdDest1, temp);
+	_coneOfColdDest2 = (const int8*)_staticres->loadRawData(kEobBaseConeOfColdDest2, temp);
+	_coneOfColdDest3 = (const int8*)_staticres->loadRawData(kEobBaseConeOfColdDest3, temp);
+	_coneOfColdDest4 = (const int8*)_staticres->loadRawData(kEobBaseConeOfColdDest4, temp);
+	_coneOfColdGfxTbl = _staticres->loadRawData(kEobBaseConeOfColdGfxTbl, _coneOfColdGfxTblSize);
 
 	// Hard code the following strings, since EOB I doesn't have them in the original.
 	// EOB I doesn't have load and save menus, because there is only one single
@@ -1056,6 +1061,28 @@ void EobCoreEngine::initSpells() {
 void EobEngine::initStaticResource() {
 	int temp;
 	_mainMenuStrings = _staticres->loadStrings(kEob1MainMenuStrings, temp);
+	_finBonusStrings = _staticres->loadStrings(kEob1BonusStrings, temp);
+		
+	_introFilesOpening = _staticres->loadStrings(kEob1IntroFilesOpening, temp);
+	_introFilesTower = _staticres->loadStrings(kEob1IntroFilesTower, temp);
+	_introFilesOrb = _staticres->loadStrings(kEob1IntroFilesOrb, temp);
+	_introFilesWdEntry = _staticres->loadStrings(kEob1IntroFilesWdEntry, temp);
+	_introFilesKing = _staticres->loadStrings(kEob1IntroFilesKing, temp);
+	_introFilesHands = _staticres->loadStrings(kEob1IntroFilesHands, temp);
+	_introFilesWdExit = _staticres->loadStrings(kEob1IntroFilesWdExit, temp);
+	_introFilesTunnel = _staticres->loadStrings(kEob1IntroFilesTunnel, temp);
+	_introOpeningFrmDelay = _staticres->loadRawData(kEob1IntroOpeningFrmDelay, temp);
+	_introWdEncodeX = _staticres->loadRawData(kEob1IntroWdEncodeX, temp);
+	_introWdEncodeY = _staticres->loadRawData(kEob1IntroWdEncodeY, temp);
+	_introWdEncodeWH = _staticres->loadRawData(kEob1IntroWdEncodeWH, temp);
+	_introWdDsX = _staticres->loadRawDataBe16(kEob1IntroWdDsX, temp);
+	_introWdDsY = _staticres->loadRawData(kEob1IntroWdDsY, temp);
+	_introTvlX1 = _staticres->loadRawData(kEob1IntroTvlX1, temp);
+	_introTvlY1 = _staticres->loadRawData(kEob1IntroTvlY1, temp);
+	_introTvlX2 = _staticres->loadRawData(kEob1IntroTvlX2, temp);
+	_introTvlY2 = _staticres->loadRawData(kEob1IntroTvlY2, temp);
+	_introTvlW = _staticres->loadRawData(kEob1IntroTvlW, temp);
+	_introTvlH = _staticres->loadRawData(kEob1IntroTvlH, temp);
 
 	_doorShapeEncodeDefs = _staticres->loadRawData(kEob1DoorShapeDefs, temp);
 	_doorSwitchShapeEncodeDefs = _staticres->loadRawData(kEob1DoorSwitchShapeDefs, temp);
diff --git a/engines/kyra/text_eob.cpp b/engines/kyra/text_eob.cpp
index 80858d1743..3641681f4b 100644
--- a/engines/kyra/text_eob.cpp
+++ b/engines/kyra/text_eob.cpp
@@ -646,7 +646,7 @@ void TextDisplayer_Eob::displayWaitButton() {
 	vm()->_dialogueButtonW = vm()->_waitButtonPresW[_waitButtonMode];
 	vm()->_dialogueButtonYoffs = 0;
 
-	SWAP(_vm->_dialogueButtonLabelCol1, _vm->_dialogueButtonLabelCol2);
+	SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
 	vm()->drawDialogueButtons();
 
 	if (!vm()->shouldQuit())
@@ -654,8 +654,9 @@ void TextDisplayer_Eob::displayWaitButton() {
 
 	while (!vm()->processDialogue() && !vm()->shouldQuit()) {}
 	
+	_screen->fillRect(vm()->_dialogueButtonPosX[0], vm()->_dialogueButtonPosY[0], vm()->_dialogueButtonPosX[0] + vm()->_dialogueButtonW - 1, vm()->_dialogueButtonPosY[0] + vm()->_dialogueButtonH - 1, vm()->_bkgColor_1);
 	vm()->_dialogueButtonW = 95;
-	SWAP(_vm->_dialogueButtonLabelCol1, _vm->_dialogueButtonLabelCol2);
+	SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
 	clearCurDim();
 }
 
-- 
cgit v1.2.3


From b288889c978990423b08dad8f838d891610f36b5 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 15 Aug 2011 01:43:26 +0200
Subject: KYRA: (EOB) - implement wall of force spell

---
 engines/kyra/eobcommon.cpp      |  9 ++++++-
 engines/kyra/eobcommon.h        | 19 +++++++++++++
 engines/kyra/loleobbase.h       |  4 +++
 engines/kyra/magic_eob.cpp      | 59 +++++++++++++++++++++++++++++++++++------
 engines/kyra/resource.h         |  6 +++++
 engines/kyra/saveload_eob.cpp   | 51 ++++++++++++++++++++++++++++++-----
 engines/kyra/scene_eob.cpp      |  7 +++--
 engines/kyra/script_eob.cpp     | 12 ++++-----
 engines/kyra/sequences_eob2.cpp | 20 +++++++-------
 engines/kyra/sprites_eob.cpp    | 19 ++++++++++++-
 engines/kyra/staticres_eob.cpp  |  6 +++++
 engines/kyra/timer_eob.cpp      |  2 +-
 12 files changed, 178 insertions(+), 36 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index dc987c1533..c94cb16703 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -141,6 +141,8 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_restPartyElapsedTime = 0;
 	_allowSkip = false;
 
+	_wallsOfForce = 0;
+
 	_rrCount = 0;
 	memset(_rrNames, 0, 10 * sizeof(const char*));
 	memset(_rrId, 0, 10 * sizeof(int8));
@@ -205,6 +207,7 @@ EobCoreEngine::~EobCoreEngine() {
 
 	delete[] _spells;
 	delete[] _spellAnimBuffer;
+	delete[] _wallsOfForce;
 
 	delete _gui;
 	_gui = 0;
@@ -318,6 +321,9 @@ Common::Error EobCoreEngine::init() {
 	_spellAnimBuffer = new uint8[4096];
 	memset(_spellAnimBuffer, 0, 4096);
 
+	_wallsOfForce = new WallOfForce[5];
+	memset(_wallsOfForce, 0, 5 * sizeof(WallOfForce));
+
 	memset(_doorType, 0, sizeof(_doorType));
 	memset(_noDoorSwitch, 0, sizeof(_noDoorSwitch));
 
@@ -349,7 +355,6 @@ Common::Error EobCoreEngine::go() {
 
 	loadItemsAndDecorationsShapes();
 	_screen->setMouseCursor(0, 0, _itemIconShapes[0]);
-	_screen->showMouse();
 
 	loadItemDefs();
 	int action = 0;
@@ -363,6 +368,7 @@ Common::Error EobCoreEngine::go() {
 			startupLoad();
 			_gameToLoad = -1;
 		} else {
+			_screen->showMouse();
 			action = mainMenu();
 		}
 
@@ -453,6 +459,7 @@ void EobCoreEngine::runLoop() {
 
 		_timer->update();
 		updateScriptTimers();
+		updateWallOfForceTimers();
 
 		if (_sceneUpdateRequired)
 			drawScene(1);
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 51dfb8b726..ffc951e80d 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -561,6 +561,12 @@ protected:
 	const uint16 *_encodeMonsterShpTable;
 	const uint8 _teleporterWallId;
 
+	const int16 *_wallOfForceDsX;
+	const uint8 *_wallOfForceDsY;
+	const uint8 *_wallOfForceDsNumW;
+	const uint8 *_wallOfForceDsNumH;
+	const uint8 *_wallOfForceShpId;
+
 	const int8 *_monsterDirChangeTable;
 
 	// Level
@@ -833,6 +839,9 @@ protected:
 	void *generateMonsterTempData(LevelTempData *tmp);
 	void restoreMonsterTempData(LevelTempData *tmp);
 	void releaseMonsterTempData(LevelTempData *tmp);
+	void *generateWallOfForceTempData(LevelTempData *tmp);
+	void restoreWallOfForceTempData(LevelTempData *tmp);
+	void releaseWallOfForceTempData(LevelTempData *tmp);
 
 	const char * const *_saveLoadStrings;
 
@@ -920,6 +929,9 @@ protected:
 	Item createMagicWeaponItem(int flags, int icon, int value, int type);
 	void removeMagicWeaponItem(Item item);
 
+	void updateWallOfForceTimers();
+	void destroyWallOfForce(int index);
+
 	int findSingleSpellTarget(int dist);
 	
 	int findFirstCharacterSpellTarget();
@@ -1031,6 +1043,13 @@ protected:
 	EobSpell *_spells;
 	int _numSpells;
 
+	struct WallOfForce {
+		uint16 block;
+		uint32 duration;
+	};
+
+	WallOfForce *_wallsOfForce;
+
 	const char *const *_bookNumbers;
 	const char *const *_mageSpellList;
 	int _mageSpellListSize;
diff --git a/engines/kyra/loleobbase.h b/engines/kyra/loleobbase.h
index ba59fe796b..02b236d44f 100644
--- a/engines/kyra/loleobbase.h
+++ b/engines/kyra/loleobbase.h
@@ -60,6 +60,7 @@ struct LevelTempData {
 	uint16 *flags;
 	void *monsters;
 	void *flyingObjects;
+	void *wallsOfForce;
 	uint8 monsterDifficulty;
 };
 
@@ -315,6 +316,9 @@ protected:
 	void restoreFlyingObjectTempData(LevelTempData *tmp);
 	void *generateFlyingObjectTempData(LevelTempData *tmp);
 	void releaseFlyingObjectTempData(LevelTempData *tmp);
+	virtual void *generateWallOfForceTempData(LevelTempData *tmp) { return 0; }
+	virtual void restoreWallOfForceTempData(LevelTempData *tmp) {}
+	virtual void releaseWallOfForceTempData(LevelTempData *tmp) {}
 
 	LevelTempData *_lvlTempData[29];
 	const int _numFlyingObjects;
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 2ad0da7258..646d389706 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -24,6 +24,7 @@
 
 #include "kyra/eobcommon.h"
 #include "kyra/resource.h"
+#include "common/system.h"
 
 namespace Kyra {
 
@@ -490,11 +491,11 @@ bool EobCoreEngine::magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int d
 	int blockDamage = fo->flags & 2;
 	int hitTest = fo->flags & 4;
 
-	int s = 5;
-	int dmgType = 3;
+	int savingThrowType = 5;
+	int savingThrowEffect = 3;
 	if (fo->flags & 8) {
-		s = 4;
-		dmgType = 0;
+		savingThrowType = 4;
+		savingThrowEffect = 0;
 	}
 
 	int dmgFlag = _spells[fo->callBackIndex].damageFlags;
@@ -516,7 +517,7 @@ bool EobCoreEngine::magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int d
 					continue;
 			}
 
-			calcAndInflictMonsterDamage(&_monsters[*m], 0, 0, dmg, dmgFlag, s, dmgType);
+			calcAndInflictMonsterDamage(&_monsters[*m], 0, 0, dmg, dmgFlag, savingThrowType, savingThrowEffect);
 			res = true;
 		}
 		updateAllMonsterShapes();
@@ -532,7 +533,7 @@ bool EobCoreEngine::magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int d
 				int dmg = rollDice(dcTimes, dcPips, dcOffs) * level;
 				res = true;
 
-				calcAndInflictCharacterDamage(i, 0, 0, dmg, dmgFlag, s, dmgType);
+				calcAndInflictCharacterDamage(i, 0, 0, dmg, dmgFlag, savingThrowType, savingThrowEffect);
 			}
 		} else {
 			int c = _dscItemPosIndex[(_currentDirection << 2) + (fo->curPos & 3)];
@@ -545,7 +546,7 @@ bool EobCoreEngine::magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int d
 				if ((_characters[c].flags & 1) && (!hitTest || monsterAttackHitTest(&_monsters[0], c))) {
 					int dmg = rollDice(dcTimes, dcPips, dcOffs) * level;
 					res = true;
-					calcAndInflictCharacterDamage(c, 0, 0, dmg, dmgFlag, s, dmgType);
+					calcAndInflictCharacterDamage(c, 0, 0, dmg, dmgFlag, savingThrowType, savingThrowEffect);
 				}
 			}
 		}
@@ -708,6 +709,22 @@ void EobCoreEngine::removeMagicWeaponItem(Item item) {
 	_items[item].level = -1;
 }
 
+void EobCoreEngine::updateWallOfForceTimers() {
+	uint32 ct = _system->getMillis();
+	for (int i = 0; i < 5; i++) {
+		if (!_wallsOfForce[i].block)
+			continue;
+		if (_wallsOfForce[i].duration < ct)
+			destroyWallOfForce(i);
+	}
+}
+
+void EobCoreEngine::destroyWallOfForce(int index) {
+	memset(_levelBlockProperties[_wallsOfForce[index].block].walls, 0, 4);
+	_wallsOfForce[index].block = 0;
+	_sceneUpdateRequired = true;
+}
+
 int EobCoreEngine::findSingleSpellTarget(int dist) {
 	uint16 bl = _currentBlock;
 	int res = -1;
@@ -924,7 +941,7 @@ void EobCoreEngine::spellCallback_start_vampiricTouch() {
 	Item i = (t != -1) ? createMagicWeaponItem(0x18, 83, 0, t) : -1;
 	if (t == -1 || i == -1) {
 		if (_flags.gameID == GI_EOB2)
-			printWarning(_magicStrings8[0]);
+			printWarning(_magicStrings8[2]);
 		removeCharacterEffect(_activeSpell, _activeSpellCharId, 0);
 		deleteCharEventTimer(_activeSpellCharId, -_activeSpell);
 		_returnAfterSpellCallback = true;
@@ -1019,7 +1036,33 @@ bool EobCoreEngine::spellCallback_end_holdMonster(void *obj) {
 }
 
 void EobCoreEngine::spellCallback_start_wallOfForce() {
+	uint16 bl = calcNewBlockPosition(_currentBlock, _currentDirection);
+	LevelBlockProperty *l = &_levelBlockProperties[bl];
+	if (l->walls[0] || l->walls[1] || l->walls[2] || l->walls[3] || (l->flags & 7)) {
+		printWarning(_magicStrings8[3]);
+		return;
+	}
+
+	uint32 dur = 0xffffffff;
+	int s = 0;
+	int i = 0;
 
+	for (; i < 5; i++) {
+		if (!_wallsOfForce[i].block)
+			break;
+		if (_wallsOfForce[i].duration < dur) {
+			dur = _wallsOfForce[i].duration;
+			s = i;
+		}
+	}
+
+	if (i == 5)
+		destroyWallOfForce(s);
+
+	memset(_levelBlockProperties[bl].walls, 74, 4);
+	_wallsOfForce[s].block = bl;
+	_wallsOfForce[s].duration = _system->getMillis() + (((getMageLevel(_openBookChar) * 546) >> 1) + 546) * _tickLength;
+	_sceneUpdateRequired = true;
 }
 
 void EobCoreEngine::spellCallback_start_disintegrate() {
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 5ed658ccee..f330d42004 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -627,6 +627,12 @@ enum KyraResources {
 	kEob2HornStrings,
 	kEob2HornSounds,
 
+	kEob2WallOfForceDsX,
+	kEob2WallOfForceDsY,
+	kEob2WallOfForceNumW,
+	kEob2WallOfForceNumH,
+	kEob2WallOfForceShpId,
+
 	kLolIngamePakFiles,
 	kLolCharacterDefs,
 	kLolIngameSfxFiles,
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 05eea820bb..24a10133d0 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -72,6 +72,7 @@ void LolEobBaseEngine::generateTempData() {
 
 	_lvlTempData[l]->monsters = generateMonsterTempData(_lvlTempData[l]);
 	_lvlTempData[l]->flyingObjects = generateFlyingObjectTempData(_lvlTempData[l]);
+	_lvlTempData[l]->wallsOfForce = generateWallOfForceTempData(_lvlTempData[l]);
 
 	_hasTempDataFlags |= (1 << l);
 	delete[] p2;
@@ -104,6 +105,7 @@ void LolEobBaseEngine::restoreBlockTempData(int levelIndex) {
 
 	restoreMonsterTempData(_lvlTempData[l]);
 	restoreFlyingObjectTempData(_lvlTempData[l]);
+	restoreWallOfForceTempData(_lvlTempData[l]);
 
 	delete[] p2;
 }
@@ -115,6 +117,7 @@ void LolEobBaseEngine::releaseTempData() {
 			delete[] _lvlTempData[i]->flags;
 			releaseMonsterTempData(_lvlTempData[i]);
 			releaseFlyingObjectTempData(_lvlTempData[i]);
+			releaseWallOfForceTempData(_lvlTempData[i]);
 			delete _lvlTempData[i];
 			_lvlTempData[i] = 0;
 		}
@@ -293,13 +296,15 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 		}
 
 		_lvlTempData[i] = new LevelTempData;
-		_lvlTempData[i]->wallsXorData = new uint8[4096];
-		_lvlTempData[i]->flags = new uint16[1024];
+		LevelTempData *l = _lvlTempData[i];
+		l->wallsXorData = new uint8[4096];
+		l->flags = new uint16[1024];
 		EobMonsterInPlay *lm = new EobMonsterInPlay[30];
-		 _lvlTempData[i]->monsters = lm;
+		l->monsters = lm;
 		EobFlyingObject *lf = new EobFlyingObject[_numFlyingObjects];
-		_lvlTempData[i]->flyingObjects = lf;
-		LevelTempData *l = _lvlTempData[i];
+		l->flyingObjects = lf;
+		WallOfForce *lw = new WallOfForce[5];
+		l->wallsOfForce = lw;		
 
 		in.read(l->wallsXorData, 4096);
 		for (int ii = 0; ii < 1024; ii++)
@@ -349,10 +354,14 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 			m->flags = in.readByte();
 			m->unused = in.readByte();
 		}
+
+		for (int ii = 0; ii < 5; ii++) {
+			WallOfForce *w = &lw[ii];
+			w->block = in.readUint16BE();
+			w->duration = in.readUint32BE();
+		}
 	}
 
-	if (_flags.gameID == GI_EOB1)
-		_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
 	loadLevel(_currentLevel, _currentSub);
 	_sceneUpdateRequired = true;
 	_screen->setFont(Screen::FID_6_FNT);
@@ -515,6 +524,7 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 
 		EobMonsterInPlay *lm = (EobMonsterInPlay*)_lvlTempData[i]->monsters;
 		EobFlyingObject *lf = (EobFlyingObject*)_lvlTempData[i]->flyingObjects;
+		WallOfForce *lw = (WallOfForce*)_lvlTempData[i]->wallsOfForce;
 
 		for (int ii = 0; ii < 30; ii++) {
 			EobMonsterInPlay *m = &lm[ii];
@@ -560,6 +570,12 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 			out->writeByte(m->flags);
 			out->writeByte(m->unused);
 		}
+
+		for (int ii = 0; ii < 5; ii++) {
+			WallOfForce *w = &lw[ii];
+			out->writeUint16BE(w->block);
+			out->writeUint32BE(w->duration);
+		}
 	}
 
 	out->finalize();
@@ -591,6 +607,27 @@ void EobCoreEngine::releaseMonsterTempData(LevelTempData *tmp) {
 	delete[] p;
 }
 
+void *EobCoreEngine::generateWallOfForceTempData(LevelTempData *tmp) {
+	WallOfForce *w = new WallOfForce[5];
+	memcpy(w, _wallsOfForce,  sizeof(WallOfForce) * 5);
+	uint32 ct = _system->getMillis();
+	for (int i = 0; i < 5; i++)
+		w[i].duration = (w[i].duration > ct) ? w[i].duration - ct : _tickLength;
+	return w;
+}
+
+void EobCoreEngine::restoreWallOfForceTempData(LevelTempData *tmp) {
+	memcpy(_wallsOfForce, tmp->wallsOfForce,  sizeof(WallOfForce) * 5);
+	uint32 ct = _system->getMillis();
+	for (int i = 0; i < 5; i++)
+		_wallsOfForce[i].duration += ct;
+}
+
+void EobCoreEngine::releaseWallOfForceTempData(LevelTempData *tmp) {
+	WallOfForce *p = (WallOfForce*)tmp->wallsOfForce;
+	delete[] p;
+}
+
 #endif // ENABLE_EOB
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index aef131f6cb..afce9efdfa 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -1144,9 +1144,12 @@ int EobCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint1
 	if (!f)
 		assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80));
 
-	if (w == 74 && _currentBlock == curBlock) {
+	if (_flags.gameID == GI_EOB2 && w == 74 && _currentBlock == curBlock) {
 		for (int i = 0; i < 5; i++) {
-
+			if (_wallsOfForce[i].block == b) {
+				destroyWallOfForce(i);
+				f = _wllWallFlags[0];
+			}
 		}
 	}
 
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index 15f3c80b22..6feac6bd77 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -638,13 +638,13 @@ int EobInfProcessor::oeob_calcAndInflictCharacterDamage(int8 *data) {
 	int useStrModifierOrBase = *pos++;
 
 	int flg = (charIndex == -1) ? 4 : 0;
-	int a = 5;
-	int damageType = 1;
+	int savingThrowType = 5;
+	int savingThrowEffect = 1;
 
 	if (_vm->game() == GI_EOB2) {
 		flg = *pos++;
-		a = *pos++;
-		damageType = *pos++;
+		savingThrowType = *pos++;
+		savingThrowEffect = *pos++;
 	} else if (!itemOrPips) {
 		useStrModifierOrBase = times;
 		times = 0;
@@ -652,9 +652,9 @@ int EobInfProcessor::oeob_calcAndInflictCharacterDamage(int8 *data) {
 
 	if (charIndex == -1) {
 		for (int i = 0; i < 6; i++)
-			_vm->calcAndInflictCharacterDamage(i, times, itemOrPips, useStrModifierOrBase, flg, a, damageType);
+			_vm->calcAndInflictCharacterDamage(i, times, itemOrPips, useStrModifierOrBase, flg, savingThrowType, savingThrowEffect);
 	} else {
-		_vm->calcAndInflictCharacterDamage(charIndex, times, itemOrPips, useStrModifierOrBase, flg, a, damageType);
+		_vm->calcAndInflictCharacterDamage(charIndex, times, itemOrPips, useStrModifierOrBase, flg, savingThrowType, savingThrowEffect);
 	}
 	return pos - data;
 }
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
index 395e94713c..ea96779bb1 100644
--- a/engines/kyra/sequences_eob2.cpp
+++ b/engines/kyra/sequences_eob2.cpp
@@ -239,7 +239,7 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.loadScene(1, 2);
 	sq.waitForSongNotifier(4);
 
-	//intro scroll
+	// intro scroll
 	if (!skipFlag() && !shouldQuit()) {
 		for (int i = 0; i < 280; i += 3) {
 			uint32 endtime = _system->getMillis() + _tickLength;
@@ -978,7 +978,7 @@ void DarkmoonSequenceHelper::loadScene(int index, int pageNum) {
 		}
 
 		if (!s)
-			error("DarkmoonSequenceHelper::loadScene(): Sequence CPS file loading failed.");
+			error("DarkmoonSequenceHelper::loadScene(): CPS file loading failure in scene %d", index);
 
 		if (_mode == kFinale)
 			s->read(_palettes[0]->getData(), 768);
@@ -1026,7 +1026,7 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 			if (s->pal)
 				setPaletteWithoutTextColor(palIndex);
 			delay(s->delay);
-			if (_mode == DarkmoonSequenceHelper::kIntro && s->pal)
+			if (_mode == kIntro && s->pal)
 				setPaletteWithoutTextColor(0);
 			break;
 
@@ -1035,7 +1035,7 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 			shapeW = _shapes[s->obj][2];
 			shapeH = _shapes[s->obj][3];
 
-			if (_mode == DarkmoonSequenceHelper::kFinale) {
+			if (_mode == kFinale) {
 				_screen->setScreenDim(18);
 				x -= (_screen->_curDim->sx << 3);
 				y -= _screen->_curDim->sy;
@@ -1045,7 +1045,7 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 					x2 = x;
 			}
 
-			_screen->drawShape(0, _shapes[s->obj], x, y, _mode == DarkmoonSequenceHelper::kIntro ? 0 : 18);
+			_screen->drawShape(0, _shapes[s->obj], x, y, _mode == kIntro ? 0 : 18);
 
 			if (s->pal)
 				setPaletteWithoutTextColor(palIndex);
@@ -1054,7 +1054,7 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 
 			delay(s->delay);
 
-			if (_mode == DarkmoonSequenceHelper::kIntro) {
+			if (_mode == kIntro) {
 				if (s->pal)
 					setPaletteWithoutTextColor(0);
 				_screen->copyRegion(x - 8, y - 8, x, y, (shapeW + 1) << 3, shapeH, 2, 0, Screen::CR_NO_P_CHECK);
@@ -1076,14 +1076,14 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 
 			delay(s->delay);
 
-			if (_mode == DarkmoonSequenceHelper::kIntro && s->pal)
+			if (_mode == kIntro && s->pal)
 				setPaletteWithoutTextColor(0);
 			break;
 
 		case 3:
 		case 4:
 			// fade shape in or out or restore background
-			if (_mode == DarkmoonSequenceHelper::kFinale)
+			if (_mode == kFinale)
 				break;
 
 			_screen->setShapeFadeMode(0, true);
@@ -1109,10 +1109,10 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 
 		case 5:
 			// copy region
-			if (_mode == DarkmoonSequenceHelper::kFinale && s->pal)
+			if (_mode == kFinale && s->pal)
 				setPaletteWithoutTextColor(palIndex);
 
-			_screen->copyRegion(s->x2 << 3, s->y2, s->x1, s->y1, s->w << 3, s->h, (s->obj && _mode == DarkmoonSequenceHelper::kFinale) ? 6 : 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->copyRegion(s->x2 << 3, s->y2, s->x1, s->y1, s->w << 3, s->h, (s->obj && _mode == kFinale) ? 6 : 2, 0, Screen::CR_NO_P_CHECK);
 			_screen->updateScreen();
 			delay(s->delay);
 			break;
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index e4001b24d7..caf4a748da 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -587,7 +587,24 @@ void EobCoreEngine::drawMonsters(int index) {
 }
 
 void EobCoreEngine::drawWallOfForce(int index) {
-
+	int d = _dscDimMap[index];
+	assert(d < 3);
+	int dH = _wallOfForceDsNumH[d];
+	int dW = _wallOfForceDsNumW[d];
+	int y = _wallOfForceDsY[d];
+	int shpId = _wallOfForceShpId[d] + _teleporterPulse;
+	int h = _wallOfForceShapes[shpId][1];
+	int w = _wallOfForceShapes[shpId][2] << 3;
+
+	for (int i = 0; i < dH; i++) {
+		int x = _wallOfForceDsX[index];
+		for (int ii = 0; ii < dW; ii++) {
+			drawBlockObject(0, 2, _wallOfForceShapes[shpId], x, y, 5);
+			x += w;
+		}
+		y += h;
+		shpId ^= 1;
+	}
 }
 
 void EobCoreEngine::drawFlyingObjects(int index) {
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 5995f8a5cd..069bf1337d 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -1280,6 +1280,12 @@ void DarkMoonEngine::initStaticResource() {
 	_dranFoolsStrings = _staticres->loadStrings(kEob2DranFoolsStrings, temp);
 	_hornStrings = _staticres->loadStrings(kEob2HornStrings, temp);
 	_hornSounds = _staticres->loadRawData(kEob2HornSounds, temp);
+
+	_wallOfForceDsX = (const int16*)_staticres->loadRawDataBe16(kEob2WallOfForceDsX, temp);
+	_wallOfForceDsY = _staticres->loadRawData(kEob2WallOfForceDsY, temp);
+	_wallOfForceDsNumW = _staticres->loadRawData(kEob2WallOfForceNumW, temp);
+	_wallOfForceDsNumH = _staticres->loadRawData(kEob2WallOfForceNumH, temp);
+	_wallOfForceShpId = _staticres->loadRawData(kEob2WallOfForceShpId, temp);
 }
 
 void DarkMoonEngine::initSpells() {
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 20a05f9ee6..61fa554193 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -371,7 +371,7 @@ void EobCoreEngine::timerUpdateTeleporters(int timerNum) {
 	_teleporterPulse ^= 1;
 	for (int i = 0; i < 18; i++) {
 		uint8 w = _visibleBlocks[i]->walls[_sceneDrawVarDown];
-		if ((_flags.gameID == GI_EOB1 && w == 52) || (_flags.gameID == GI_EOB2 && (w == 44 || w == 74))) {
+		if ((w == _teleporterWallId) || (_flags.gameID == GI_EOB2 && w == 74)) {
 			_sceneUpdateRequired = true;
 			return;
 		}
-- 
cgit v1.2.3


From b3c8173bd46ddc831344848723598846bd5c41e8 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 14 Nov 2011 19:57:23 +0100
Subject: KYRA: (EOB) - extend save/load dialogue to support 990 slots

---
 engines/kyra/gui.cpp          | 40 ++++++++++-----------
 engines/kyra/gui.h            |  8 +++--
 engines/kyra/gui_eob.cpp      | 84 ++++++++++++++++++++++++++++++++++---------
 engines/kyra/gui_eob.h        |  1 +
 engines/kyra/gui_hof.cpp      |  2 +-
 engines/kyra/gui_lok.cpp      |  4 +--
 engines/kyra/gui_lol.cpp      |  6 ++--
 engines/kyra/gui_mr.cpp       |  2 +-
 engines/kyra/gui_v2.cpp       |  4 +--
 engines/kyra/saveload_eob.cpp |  4 +++
 engines/kyra/text_eob.cpp     |  4 +--
 11 files changed, 109 insertions(+), 50 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index d03fa23d5a..9c0adf159b 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -32,7 +32,7 @@
 namespace Kyra {
 
 GUI::GUI(KyraEngine_v1 *kyra) : _vm(kyra), _screen(kyra->screen()) {
-	_savegameListUpdateNeeded = false;
+	_saveSlotsListUpdateNeeded = true;
 	_savegameListSize = 0;
 	_savegameList = 0;
 }
@@ -46,7 +46,7 @@ GUI::~GUI() {
 	}
 }
 
-void GUI::updateSaveList(bool excludeQuickSaves) {
+void GUI::updateSaveFileList(bool excludeQuickSaves) {
 	Common::String pattern = _vm->_targetName + ".???";
 	Common::StringArray saveFileList = _vm->_saveFileMan->listSavefiles(pattern);
 	_saveSlots.clear();
@@ -93,11 +93,11 @@ int GUI::getNextSavegameSlot() {
 	return 0;
 }
 
-void GUI::updateSavegameList() {
-	if (!_savegameListUpdateNeeded)
+void GUI::updateSaveSlotsList() {
+	if (!_saveSlotsListUpdateNeeded)
 		return;
 
-	_savegameListUpdateNeeded = false;
+	_saveSlotsListUpdateNeeded = false;
 
 	if (_savegameList) {
 		for (int i = 0; i < _savegameListSize; i++)
@@ -105,31 +105,31 @@ void GUI::updateSavegameList() {
 		delete[] _savegameList;
 	}
 
-	updateSaveList(true);
-	_savegameListSize = _saveSlots.size();
+	updateSaveFileList(true);
+	int numSaves = _savegameListSize = _saveSlots.size();
+	bool allowEmptySlots = (_vm->game() == GI_EOB1 || _vm->game() == GI_EOB2);
 
 	if (_savegameListSize) {
-		if (_vm->game() == GI_EOB1 || _vm->game() == GI_EOB2) {
-			Common::sort(_saveSlots.begin(), _saveSlots.end(),  Common::Less<int>());
-			_savegameListSize = _saveSlots.back() + 1;
-		} else {
-			Common::sort(_saveSlots.begin(), _saveSlots.end(),  Common::Greater<int>());
-		}
+		if (allowEmptySlots)
+			_savegameListSize = 990;
 
 		KyraEngine_v1::SaveHeader header;
 		Common::InSaveFile *in;
 
-		_savegameList = new char *[_savegameListSize];
+		_savegameList = new char*[_savegameListSize];
+		memset(_savegameList, 0, _savegameListSize * sizeof(char*));
 
-		for (int i = 0; i < _savegameListSize; i++) {
-			in = _vm->openSaveForReading(_vm->getSavegameFilename(i), header);
+		for (int i = 0; i < numSaves; i++) {
+			in = _vm->openSaveForReading(_vm->getSavegameFilename(_saveSlots[i]), header);
+			char **listEntry = &_savegameList[allowEmptySlots? _saveSlots[i] : i];
 			if (in) {
-				_savegameList[i] = new char[header.description.size() + 1];
-				Common::strlcpy(_savegameList[i], header.description.c_str(), header.description.size() + 1);
-				Util::convertISOToDOS(_savegameList[i]);
+				*listEntry = new char[header.description.size() + 1];
+				Common::strlcpy(*listEntry, header.description.c_str(), header.description.size() + 1);
+				Util::convertISOToDOS(*listEntry);
 				delete in;
 			} else {
-				_savegameList[i] = 0;
+				*listEntry = 0;
+				error("GUI::updateSavegameList(): Unexpected missing save file for slot: %d.", _saveSlots[i]);
 			}
 		}
 
diff --git a/engines/kyra/gui.h b/engines/kyra/gui.h
index efca845482..4991707744 100644
--- a/engines/kyra/gui.h
+++ b/engines/kyra/gui.h
@@ -108,6 +108,8 @@ public:
 	// utilities for thumbnail creation
 	virtual void createScreenThumbnail(Graphics::Surface &dst) = 0;
 
+	void notifyUpdateSaveSlotsList() { _saveSlotsListUpdateNeeded = true; }
+
 protected:
 	KyraEngine_v1 *_vm;
 	Screen *_screen;
@@ -116,16 +118,16 @@ protected:
 	// Since ScummVM's savegame indices aren't, we re-index them.
 	// The integers stored in _saveSlots are ScummVM savegame indices.
 	Common::Array<int> _saveSlots;
-	void updateSaveList(bool excludeQuickSaves = false);
+	void updateSaveFileList(bool excludeQuickSaves = false);
 	int getNextSavegameSlot();
-	void updateSavegameList();
+	void updateSaveSlotsList();
 
 	virtual void sortSaveSlots();
 
 	uint32 _lastScreenUpdate;
 	char **_savegameList;
 	int _savegameListSize;
-	bool _savegameListUpdateNeeded;
+	bool _saveSlotsListUpdateNeeded;
 
 	Common::KeyState _keyPressed;
 };
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index fcd66c923b..7778feba8e 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -1609,7 +1609,9 @@ int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 	_flagsMouseRight = (_vm->_mouseClick == 2) ? 2 : 4;
 	_vm->_mouseClick = 0;
 
-	if (in >= 199 && in <= 202) {
+	if (mouseWheel) {
+		return 204 + mouseWheel;
+	} else if (in >= 199 && in <= 202) {
 		buttonReleaseFlag = (inputFlags & 0x800) ? 3 : 1;
 		if (in < 201)
 			_flagsMouseLeft = buttonReleaseFlag;
@@ -2318,7 +2320,6 @@ bool GUI_Eob::runLoadMenu(int x, int y) {
 	int xo = dm->sx;
 	int yo = dm->sy;
 	bool result = false;
-	_savegameListUpdateNeeded = true;
 	
 	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
 	
@@ -2629,7 +2630,6 @@ bool GUI_Eob::runSaveMenu(int x, int y) {
 	int xo = dm->sx;
 	int yo = dm->sy;
 	bool result = false;
-	_savegameListUpdateNeeded = true;
 	
 	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
 	
@@ -2667,12 +2667,11 @@ bool GUI_Eob::runSaveMenu(int x, int y) {
 			Common::Error err = _vm->saveGameStateIntern(_savegameOffset + slot, _saveSlotStringsTemp[slot], &thumb);
 			thumb.free();
 
-			if (err.getCode() == Common::kNoError) {
-				_savegameListUpdateNeeded = true;			
+			if (err.getCode() == Common::kNoError)			
 				result = true;
-			} else {
+			else
 				messageDialogue(11, 15, 6);
-			}
+
 			runLoop = false;			
 		}
 	}
@@ -2687,14 +2686,11 @@ int GUI_Eob::selectSaveSlotDialogue(int x, int y, int id) {
 	_saveSlotX = _saveSlotY = 0;
 	_screen->setCurPage(2);
 	
-	updateSavegameList();
-	setupSaveMenuSlots();
+	updateSaveSlotsList();
+	_savegameOffset = 0;
 
 	drawMenuButtonBox(0, 0, 176, 144, false, false);
 	_screen->printShadedText(_vm->_saveLoadStrings[2 + id], 52, 5, 15, 0);
-	
-	for (int i = 0; i < 7; i++)
-		drawSaveSlotButton(i, 1, 15);
 
 	_screen->copyRegion(0, 0, x, y, 176, 144, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->setCurPage(0);
@@ -2703,6 +2699,7 @@ int GUI_Eob::selectSaveSlotDialogue(int x, int y, int id) {
 	_saveSlotX = x;
 	_saveSlotY = y;
 	int lastHighlight = -1;
+	int lastOffset = -1;
 	int newHighlight = 0;
 	int slot = -1;
 
@@ -2712,12 +2709,47 @@ int GUI_Eob::selectSaveSlotDialogue(int x, int y, int id) {
 
 		if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
 			runLoop = false;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE]) {
+			newHighlight = 6;
+			runLoop = false;
 		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP2]) {
-			if (++newHighlight > 6)
-				newHighlight = 0;
+			if (++newHighlight > 5) {
+				newHighlight = 5;
+				if (++_savegameOffset > 984)
+					_savegameOffset = 984;
+				else
+					lastOffset = -1;
+			}
 		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP8]) {
-			if (--newHighlight < 0)
-				newHighlight = 6;
+			if (--newHighlight < 0) {
+				newHighlight = 0;
+				if (--_savegameOffset < 0)
+					_savegameOffset = 0;
+				else
+					lastOffset = -1;
+			}
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_PAGEDOWN] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP1]) {
+			_savegameOffset += 6;
+			if (_savegameOffset > 984)
+				_savegameOffset = 984;
+			else
+				lastOffset = -1;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_PAGEUP] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP7]) {
+			_savegameOffset -= 6;
+			if (_savegameOffset < 0)
+				_savegameOffset = 0;
+			else
+				lastOffset = -1;
+		} else if (inputFlag == 205) {
+			if (++_savegameOffset > 984)
+				_savegameOffset = 984;
+			else
+				lastOffset = -1;
+		} else if (inputFlag == 203) {
+			if (--_savegameOffset < 0)
+				_savegameOffset = 0;
+			else
+				lastOffset = -1;
 		} else {
 			slot = getHighlightSlot();
 			if (slot != -1) {
@@ -2727,9 +2759,25 @@ int GUI_Eob::selectSaveSlotDialogue(int x, int y, int id) {
 			}
 		}
 
+		if (lastOffset != _savegameOffset) {
+			lastHighlight = -1;
+			setupSaveMenuSlots();
+			for (int i = 0; i < 7; i++)
+				drawSaveSlotButton(i, 1, 15);
+			lastOffset = _savegameOffset;
+		}
+
 		if (lastHighlight != newHighlight) {
 			drawSaveSlotButton(lastHighlight, 0, 15);
 			drawSaveSlotButton(newHighlight, 0, 6);
+			
+			// Display highlighted slot index in the bottom left corner to avoid people getting lost with the 990 save slots
+			_screen->setFont(Screen::FID_6_FNT);
+			_screen->fillRect(_saveSlotX + 5, _saveSlotY + 135, _saveSlotX + 46, _saveSlotY + 140, _vm->_bkgColor_1);
+			int sli = (newHighlight == 6) ?  _savegameOffset : (_savegameOffset + newHighlight);
+			_screen->printText(Common::String::format("%03d/989", sli).c_str(), _saveSlotX + 5, _saveSlotY + 135, _vm->_color2_1, _vm->_bkgColor_1);
+			_screen->setFont(Screen::FID_8_FNT);
+
 			_screen->updateScreen();
 			lastHighlight = newHighlight;
 		}
@@ -3966,6 +4014,10 @@ int GUI_Eob::getHighlightSlot() {
 	return res;
 }
 
+void GUI_Eob::sortSaveSlots() {
+	Common::sort(_saveSlots.begin(), _saveSlots.end(), Common::Less<int>());
+}
+
 void GUI_Eob::restParty_updateRestTime(int hours, bool init) {
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
 	int od = _screen->curDimIndex();
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index af3d3d2e48..30fd4ccc38 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -102,6 +102,7 @@ private:
 
 	void setupSaveMenuSlots();
 	int getHighlightSlot();
+	void sortSaveSlots();
 
 	void restParty_updateRestTime(int hours, bool init);
 
diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui_hof.cpp
index a1e0ce66bf..8d968ec58c 100644
--- a/engines/kyra/gui_hof.cpp
+++ b/engines/kyra/gui_hof.cpp
@@ -1148,7 +1148,7 @@ int GUI_HoF::sliderHandler(Button *caller) {
 }
 
 int GUI_HoF::loadMenu(Button *caller) {
-	updateSaveList();
+	updateSaveFileList();
 
 	if (!_vm->_menuDirectlyToLoad) {
 		updateMenuButton(caller);
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp
index 6e0d108435..e66b3cec51 100644
--- a/engines/kyra/gui_lok.cpp
+++ b/engines/kyra/gui_lok.cpp
@@ -596,7 +596,7 @@ void GUI_LoK::setupSavegames(Menu &menu, int num) {
 }
 
 int GUI_LoK::saveGameMenu(Button *button) {
-	updateSaveList();
+	updateSaveFileList();
 
 	updateMenuButton(button);
 	_menu[2].item[5].enabled = true;
@@ -636,7 +636,7 @@ int GUI_LoK::saveGameMenu(Button *button) {
 }
 
 int GUI_LoK::loadGameMenu(Button *button) {
-	updateSaveList();
+	updateSaveFileList();
 
 	if (_vm->_menuDirectlyToLoad) {
 		_menu[2].item[5].enabled = false;
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index ac3d16be67..6a8e6e13b7 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -2222,13 +2222,13 @@ int GUI_LoL::runMenu(Menu &menu) {
 	// Instead, the respevtive struct entry is used to determine whether
 	// a menu has scroll buttons or slider bars.
 	uint8 hasSpecialButtons = 0;
-	_savegameListUpdateNeeded = true;
+	_saveSlotsListUpdateNeeded = true;
 
 	while (_displayMenu) {
 		_vm->_mouseX = _vm->_mouseY = 0;
 
 		if (_currentMenu == &_loadMenu || _currentMenu == &_saveMenu || _currentMenu == &_deleteMenu) {
-			updateSavegameList();
+			updateSaveSlotsList();
 			setupSaveMenuSlots(*_currentMenu, 4);
 		}
 
@@ -2837,7 +2837,7 @@ int GUI_LoL::clickedChoiceMenu(Button *button) {
 				_vm->_saveFileMan->renameSavefile(oldName, newName);
 			}
 			_newMenu = &_mainMenu;
-			_savegameListUpdateNeeded = true;
+			_saveSlotsListUpdateNeeded = true;
 		}
 	} else if (button->arg == _choiceMenu.item[1].itemId) {
 		_newMenu = &_mainMenu;
diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp
index 82082961e9..b8bf8f43e2 100644
--- a/engines/kyra/gui_mr.cpp
+++ b/engines/kyra/gui_mr.cpp
@@ -1277,7 +1277,7 @@ int GUI_MR::optionsButton(Button *button) {
 }
 
 int GUI_MR::loadMenu(Button *caller) {
-	updateSaveList();
+	updateSaveFileList();
 
 	if (!_vm->_menuDirectlyToLoad) {
 		updateMenuButton(caller);
diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp
index a1d74fded9..27b329c25a 100644
--- a/engines/kyra/gui_v2.cpp
+++ b/engines/kyra/gui_v2.cpp
@@ -594,7 +594,7 @@ int GUI_v2::cancelLoadMenu(Button *caller) {
 }
 
 int GUI_v2::saveMenu(Button *caller) {
-	updateSaveList();
+	updateSaveFileList();
 
 	updateMenuButton(caller);
 
@@ -690,7 +690,7 @@ int GUI_v2::cancelSaveMenu(Button *caller) {
 }
 
 int GUI_v2::deleteMenu(Button *caller) {
-	updateSaveList();
+	updateSaveFileList();
 
 	updateMenuButton(caller);
 	if (_saveSlots.size() < 2) {
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 24a10133d0..847f304288 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -391,6 +391,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 
 	_loading = false;
 	_screen->fadeFromBlack(20);
+	removeInputTop();
 
 	return Common::kNoError;
 }
@@ -589,6 +590,9 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 	}
 
 	delete out;
+
+	_gui->notifyUpdateSaveSlotsList();
+
 	return Common::kNoError;
 }
 
diff --git a/engines/kyra/text_eob.cpp b/engines/kyra/text_eob.cpp
index 3641681f4b..318147c679 100644
--- a/engines/kyra/text_eob.cpp
+++ b/engines/kyra/text_eob.cpp
@@ -573,7 +573,7 @@ void TextDisplayer_Eob::textPageBreak() {
 		int inputFlag = vm()->checkInput(0, false) & 0xFF;
 		vm()->removeInputTop();
 
-		while (!inputFlag) {
+		while (!inputFlag && !_vm->shouldQuit()) {
 			vm()->update();
 
 			if (vm()->speechEnabled()) {
@@ -603,7 +603,7 @@ void TextDisplayer_Eob::textPageBreak() {
 			if (target)
 				loop = false;
 		}
-	} while (loop);
+	} while (loop && !_vm->shouldQuit());
 
 	if (vm()->gameFlags().use16ColorMode)
 		screen()->fillRect(x + 8, y, x + 57, y + 9, _textDimData[screen()->curDimIndex()].color2);
-- 
cgit v1.2.3


From f7032c126dd097e8083e0fc740c7c856e0f2dd58 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Wed, 17 Aug 2011 18:46:29 +0200
Subject: KYRA: (EOB) - fix some bugs

- fix monster movement
- fix character level gain
- add some static res for party transfer
---
 engines/kyra/chargen.cpp       | 13 ++++++++----
 engines/kyra/eob1.cpp          |  4 ++--
 engines/kyra/eobcommon.cpp     | 30 ++++++++++++++++++--------
 engines/kyra/eobcommon.h       |  8 +++++--
 engines/kyra/gui_eob.cpp       |  4 +---
 engines/kyra/lol.cpp           |  1 +
 engines/kyra/loleobbase.cpp    | 16 +++++++-------
 engines/kyra/resource.h        |  3 +++
 engines/kyra/scene_eob.cpp     |  8 +++----
 engines/kyra/screen_eob.cpp    | 24 +++++++++++----------
 engines/kyra/sprites_eob.cpp   | 48 ++++++++++++++++++++++++------------------
 engines/kyra/staticres_eob.cpp |  3 +++
 engines/kyra/timer.cpp         |  4 ++++
 engines/kyra/timer_eob.cpp     |  3 +++
 engines/kyra/timer_lol.cpp     |  1 +
 15 files changed, 106 insertions(+), 64 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index e97b7a1b2d..7516916f67 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -108,10 +108,6 @@ private:
 	Screen_Eob *_screen;
 };
 
-bool EobCoreEngine::startCharacterGeneration() {
-	return CharacterGenerator(this, _screen).start(_characters, &_faceShapes);
-}
-
 CharacterGenerator::CharacterGenerator(EobCoreEngine *vm, Screen_Eob *screen) : _vm(vm), _screen(screen),
 	_characters(0), _faceShapes(0), _chargenMagicShapes(0), _chargenButtonLabels(0), _chargenMagicShapeTimer(0),
 	_updateBoxShapesIndex(0), _lastUpdateBoxShapesIndex(0), _magicShapesBox(6), _activeBox(0) {
@@ -1445,6 +1441,15 @@ const int16 CharacterGenerator::_raceModifiers[] = {
 	0, 0, 0, 0,	1, -1, 0, 1, -1, 0, 0, 0, -1, 0, 0, 1, 0, 0
 };
 
+bool EobCoreEngine::startCharacterGeneration() {
+	return CharacterGenerator(this, _screen).start(_characters, &_faceShapes);
+}
+
+bool EobCoreEngine::transferParty() {
+
+	return false;
+}
+
 }	// End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index 71644c5a87..8ce41d6b5b 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -78,8 +78,8 @@ Common::Error EobEngine::init() {
 
 	_scriptTimersCount = 1;
 
-	_wllWallFlags[132] = 1;
-	_wllWallFlags[133] = 1;
+	//_wllWallFlags[132] = 1;
+	//_wllWallFlags[133] = 1;
 
 	return Common::kNoError;
 }
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index c94cb16703..3a298d84ad 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -40,14 +40,16 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_teleporterWallId(flags.gameID == GI_EOB1 ? 52 : 44) {
 	_screen = 0;
 	_gui = 0;
-	//_processingButtons=false;
-	//_runLoopUnk2 = 0;
-	//_runLoopTimerUnk = 0;
+
 	_playFinale = false;
 	_runFlag = true;
 	_configMouse = true;
 	_loading = false;
 
+	_envAudioTimer = 0;
+	_flashShapeTimer = 0;
+	_drawSceneTimer = 0;
+
 	_largeItemShapes = _smallItemShapes = _thrownItemShapes = _spellShapes = _firebeamShapes = _itemIconShapes =
 		_wallOfForceShapes = _teleporterShapes = _sparkShapes = _compassShapes = 0;
 	_redSplatShape = _greenSplatShape = _deadCharShape = _disabledCharGrid = _blackBoxSmallGrid =
@@ -60,6 +62,9 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_beholderSpellList = 0;
 	_beholderSfx = 0;
 
+	_transferConvertTable = 0;
+	_transferExpTable = 0;
+
 	_faceShapes = 0;
 	_characters = 0;
 	_items = 0;
@@ -297,6 +302,13 @@ Common::Error EobCoreEngine::init() {
 	memset(&_wllShapeMap[3], -1, 5);
 	memset(&_wllShapeMap[13], -1, 5);
 
+	/*int clen = _flags.gameID == GI_EOB2 ? 80 : 70;
+	memcpy(&_wllShapeMap[256 - clen], _wllVmpMap, clen);
+	memcpy(&_specialWallTypes[256 - 2 * clen], _wllVmpMap, clen);
+	memcpy(&_specialWallTypes[256 - clen], _wllShapeMap, clen);
+	memcpy(&_wllWallFlags[256 - 2 * clen], _wllShapeMap, clen);
+	memcpy(&_wllWallFlags[256 - clen], _specialWallTypes, clen);*/
+
 	_wllVcnOffset = 16;
 
 	_monsters = new EobMonsterInPlay[30];
@@ -384,7 +396,9 @@ Common::Error EobCoreEngine::go() {
 				startupNew();
 		} else if (action == -3) {
 			// transfer party
-			repeatLoop = false;
+			repeatLoop = transferParty();
+			if (repeatLoop && !shouldQuit())
+				startupNew();
 		}
 	}
 
@@ -441,15 +455,13 @@ void EobCoreEngine::runLoop() {
 	_envAudioTimer = _system->getMillis() + (rollDice(1, 10, 3) * 18 * _tickLength);	
 	_flashShapeTimer = 0;
 	_drawSceneTimer = _system->getMillis();
-	//__unkB__ = 1;
+
 	_screen->setFont(Screen::FID_6_FNT);
 	_screen->setScreenDim(7);
 
-	//_runLoopUnk2 = _currentBlock;
 	_runFlag = true;
 
 	while (!shouldQuit() && _runFlag) {
-		//_runLoopUnk2 = _currentBlock;
 		checkPartyStatus(true);
 		checkInput(_activeButtons, true, 0);
 		removeInputTop();
@@ -723,7 +735,7 @@ int EobCoreEngine::generateCharacterHitpointsByLevel(int charIndex, int levelInd
 
 int EobCoreEngine::getClassAndConstHitpointsModifier(int cclass, int constitution) {
 	int res = _hpConstModifiers[constitution];
-
+	// This also applies to EOB1 despite being coded differently there
 	if (res <= 2 || (_classModifierFlags[cclass] & 0x31))
 		return res;
 
@@ -1176,7 +1188,7 @@ uint32 EobCoreEngine::getRequiredExperience(int cClass, int levelIndex, int leve
 
 void EobCoreEngine::increaseCharacterLevel(int charIndex, int levelIndex) {
 	_characters[charIndex].level[levelIndex]++;
-	int hpInc = generateCharacterHitpointsByLevel(charIndex, levelIndex);
+	int hpInc = generateCharacterHitpointsByLevel(charIndex, 1 << levelIndex);
 	_characters[charIndex].hitPointsCur += hpInc;
 	_characters[charIndex].hitPointsMax += hpInc;
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index ffc951e80d..5f1bf8b709 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -317,8 +317,9 @@ protected:
 	bool _runFlag;
 	//int _runLoopUnk2;
 
-	// Create Party
+	// Character generation / party transfer
 	bool startCharacterGeneration();
+	bool transferParty();
 
 	uint8 **_faceShapes;
 
@@ -329,6 +330,9 @@ protected:
 	static const uint8 _charClassModUnk[];
 
 	const uint8 *_classModifierFlags;
+	
+	const uint8 *_transferConvertTable;
+	const uint32 *_transferExpTable;
 
 	// timers
 	void setupTimers();
@@ -509,7 +513,7 @@ protected:
 
 	void updateMonsters(int unit);
 	void updateMonsterDest(EobMonsterInPlay *m);
-	void updateMonsterDest2(EobMonsterInPlay *m);
+	void updateMonsterAttackMode(EobMonsterInPlay *m);
 	void updateAllMonsterDests();
 	void turnFriendlyMonstersHostile();
 	int getNextMonsterDirection(int curBlock, int destBlock);
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 7778feba8e..a5f06c551e 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -1978,8 +1978,6 @@ int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 	if (!result)
 		result = inputFlags;
 	
-	//_vm->_processingButtons=false;
-
 	return result;
 }
 
@@ -2773,7 +2771,6 @@ int GUI_Eob::selectSaveSlotDialogue(int x, int y, int id) {
 			
 			// Display highlighted slot index in the bottom left corner to avoid people getting lost with the 990 save slots
 			_screen->setFont(Screen::FID_6_FNT);
-			_screen->fillRect(_saveSlotX + 5, _saveSlotY + 135, _saveSlotX + 46, _saveSlotY + 140, _vm->_bkgColor_1);
 			int sli = (newHighlight == 6) ?  _savegameOffset : (_savegameOffset + newHighlight);
 			_screen->printText(Common::String::format("%03d/989", sli).c_str(), _saveSlotX + 5, _saveSlotY + 135, _vm->_color2_1, _vm->_bkgColor_1);
 			_screen->setFont(Screen::FID_8_FNT);
@@ -3980,6 +3977,7 @@ void GUI_Eob::releaseButtons(Button *list) {
 		delete list;
 		list = n;
 	}
+	_vm->gui_notifyButtonListChanged();
 }
 
 void GUI_Eob::setupSaveMenuSlots() {
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 4fc78c0b64..030b1dec7a 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -1163,6 +1163,7 @@ void LoLEngine::setCharacterUpdateEvent(int charNum, int updateType, int updateD
 		l->characterUpdateEvents[i] = updateType;
 		l->characterUpdateDelay[i] = updateDelay;
 		_timer->setNextRun(3, _system->getMillis());
+		_timer->resetNextRun();
 		_timer->enable(3);
 		break;
 	}
diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
index 2ffae915b1..c2ec8da706 100644
--- a/engines/kyra/loleobbase.cpp
+++ b/engines/kyra/loleobbase.cpp
@@ -164,14 +164,14 @@ Common::Error LolEobBaseEngine::init() {
 	_levelBlockProperties = new LevelBlockProperty[1025];
 	memset(_levelBlockProperties, 0, 1025 * sizeof(LevelBlockProperty));
 
-	_wllVmpMap = new uint8[255];
-	memset(_wllVmpMap, 0, 255);
-	_wllShapeMap = new int8[255];
-	memset(_wllShapeMap, 0, 255);
-	_specialWallTypes = new uint8[255];
-	memset(_specialWallTypes, 0, 255);
-	_wllWallFlags = new uint8[255];
-	memset(_wllWallFlags, 0, 255);
+	_wllVmpMap = new uint8[256];
+	memset(_wllVmpMap, 0, 256);
+	_wllShapeMap = new int8[256];
+	memset(_wllShapeMap, 0, 256);
+	_specialWallTypes = new uint8[256];
+	memset(_specialWallTypes, 0, 256);
+	_wllWallFlags = new uint8[256];
+	memset(_wllWallFlags, 0, 256);
 
 	_blockDrawingBuffer = new uint16[1320];
 	memset(_blockDrawingBuffer, 0, 1320 * sizeof(uint16));
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index f330d42004..cd3865736f 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -537,6 +537,9 @@ enum KyraResources {
 	kEob1Npc7Strings,
 
 	kEob2MainMenuStrings,
+	kEob2TransferConvertTable,
+	kEob2TransferExpTable,
+
 	kEob2IntroStrings,
 	kEob2IntroCPSFiles,
 	kEob2IntroSeqData00,
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index afce9efdfa..1bd7fca04a 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -1012,8 +1012,8 @@ void EobCoreEngine::drawScene(int refresh) {
 	}
 
 	if (_sceneDefaultUpdate) {
-		resetSkipFlag();
 		delayUntil(_drawSceneTimer);
+		removeInputTop();
 	}
 
 	if (refresh && !_partyResting)
@@ -1029,7 +1029,7 @@ void EobCoreEngine::drawScene(int refresh) {
 
 	if (_sceneDefaultUpdate) {
 		_sceneDefaultUpdate = false;
-		_drawSceneTimer = _system->getMillis() /*+ 4 * _tickLength*/;
+		_drawSceneTimer = _system->getMillis() + 4 * _tickLength;
 	}
 
 	_sceneUpdateRequired = false;
@@ -1141,8 +1141,8 @@ int EobCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint1
 	int w = _levelBlockProperties[b].walls[direction ^ 2];
 	int f = _wllWallFlags[w];
 
-	if (!f)
-		assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80));
+	//if (!f)
+	assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80));
 
 	if (_flags.gameID == GI_EOB2 && w == 74 && _currentBlock == curBlock) {
 		for (int i = 0; i < 5; i++) {
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index c9ee9119db..d29af69f0a 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -151,9 +151,6 @@ void Screen_Eob::loadShapeSetBitmap(const char *file, int tempPage, int destPage
 }
 
 void Screen_Eob::loadEobBitmap(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage) {
-	//Common::String tmp = file;
-	//if (_vm->game() == GI_EOB1 && tmp.equalsIgnoreCase("spider"))
-	//	tmp += "1";
 	Common::String tmp = Common::String::format("%s.CPS", file);
 	Common::SeekableReadStream *s = _vm->resource()->createReadStream(tmp);
 	bool loadAlternative = false;
@@ -170,15 +167,20 @@ void Screen_Eob::loadEobBitmap(const char *file, const uint8 *ditheringData, int
 	}
 
 	if (loadAlternative) {
-		tmp.setChar('X', 0);
-		s = _vm->resource()->createReadStream(tmp);
-		if (!s)
-			error("Screen_Eob::loadEobBitmap(): CPS file loading failed.");
-		s->seek(768);
-		loadFileDataToPage(s, destPage, 64000);
-		delete s;
+		if (_vm->game() == GI_EOB1) {
+			tmp.insertChar('1', tmp.size() - 4);
+			loadBitmap(tmp.c_str(), tempPage, destPage, 0);
+		} else {
+			tmp.setChar('X', 0);
+			s = _vm->resource()->createReadStream(tmp);
+			if (!s)
+				error("Screen_Eob::loadEobBitmap(): CPS file loading failed.");
+			s->seek(768);
+			loadFileDataToPage(s, destPage, 64000);
+			delete s;
+		}
 	}
-
+	
 	if (copyToPage == -1) {
 		return;
 	} else if (copyToPage == 0) {
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index caf4a748da..bd5ab27ead 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -53,12 +53,8 @@ int LolEobBaseEngine::getBlockDistance(uint16 block1, uint16 block2) {
 
 namespace Kyra {
 
-void EobCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex) {
-	Common::String s = filename;
-	if ((_flags.gameID == GI_EOB1) && (!scumm_stricmp(filename, "rust") || !scumm_stricmp(filename, "drider") || !scumm_stricmp(filename, "spider") || !scumm_stricmp(filename, "mantis") || !scumm_stricmp(filename, "xorn") || !scumm_stricmp(filename, "xanath")))
-		s += "1";
-
-	_screen->loadShapeSetBitmap(s.c_str(), 3, 3);
+void EobCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex) {	
+	_screen->loadShapeSetBitmap(filename, 3, 3);
 	const uint16 *enc = &_encodeMonsterShpTable[encodeTableIndex << 2];
 
 	for (int i = 0; i < 6; i++, enc += 4)
@@ -149,6 +145,7 @@ const uint8 *EobCoreEngine::loadActiveMonsterData(const uint8 *data, int level)
 		int32 del = _timer->getDelay(i);
 		_timer->setNextRun(i, (i & 1) ? ct + (del >> 1) * _tickLength : ct + del * _tickLength);
 	}
+	_timer->resetNextRun();
 
 	if (_hasTempDataFlags & (1 << (level - 1)))
 		return data + 420;
@@ -470,6 +467,12 @@ void EobCoreEngine::drawBlockItems(int index) {
 
 void EobCoreEngine::drawDoor(int index) {
 	int s = _visibleBlocks[index]->walls[_sceneDrawVarDown];
+
+	if (_flags.gameID == GI_EOB1 && s == 0x85)
+		s = 0;
+
+	assert((_flags.gameID == GI_EOB1 && s < 32) || (_flags.gameID == GI_EOB2 && s < 53));
+
 	int type = _dscDoorShpIndex[s];
 	int d = _dscDimMap[index];
 	int w = _dscShapeCoords[(index * 5 + 4) << 1];
@@ -722,7 +725,7 @@ void EobCoreEngine::updateMonsters(int unit) {
 			updateMonsterDest(m);
 
 			if (m->mode > 0)
-				updateMonsterDest2(m);
+				updateMonsterAttackMode(m);
 
 			switch (m->mode) {
 			case 0:
@@ -780,7 +783,7 @@ void EobCoreEngine::updateMonsterDest(EobMonsterInPlay *m) {
 	m->dest = _currentBlock;
 }
 
-void EobCoreEngine::updateMonsterDest2(EobMonsterInPlay *m) {
+void EobCoreEngine::updateMonsterAttackMode(EobMonsterInPlay *m) {
 	if (!(m->flags & 1) || m->mode == 10)
 		return;
 	if (m->mode == 8) {
@@ -902,7 +905,7 @@ void EobCoreEngine::updateMoveMonster(EobMonsterInPlay *m) {
 	EobMonsterProperty *p = &_monsterProps[m->type];
 	int d = getNextMonsterDirection(m->block, _currentBlock);
 
-	if ((p->capsFlags & 0x800) && !(d & 1))
+	if ((_flags.gameID == GI_EOB2) && (p->capsFlags & 0x800) && !(d & 1))
 		d >>= 1;
 	else
 		d = m->dir;
@@ -1102,31 +1105,34 @@ void EobCoreEngine::walkMonster(EobMonsterInPlay *m, int destBlock) {
 		return;
 
 	if (m->flags & 8) {
+		// Interestingly, the fear spell in EOB 1 does not expire.
+		// I don't know whether this is intended or not.
 		if (_flags.gameID == GI_EOB1 ) {
 			d ^= 4;
-		} else if (--m->spellStatusLeft <= 0) {
-			m->spellStatusLeft = 0;
-			m->flags &= ~8;
-		} else {
-			d ^= 4;
+		} else if (m->spellStatusLeft > 0) {
+			if (--m->spellStatusLeft == 0)
+				m->flags &= ~8;
+			else
+				d ^= 4;
 		}
 	}
 
 	int d2 = (d - s) & 7;
 
-	if (b + _monsterStepTable0[_flags.gameID == GI_EOB1 ? (d >> 1) : d] == destBlock) {
-		if (_flags.gameID == GI_EOB1 && !(d & 1)) {
-			if (d2 >= 5) {
+	if (_flags.gameID == GI_EOB1) {
+		if ((b + _monsterStepTable0[d >> 1] == _currentBlock) && !(d & 1)) {
+			if (d2 >= 5)
 				s = m->dir - 1;
-			} else if (d2 != 0) {
+			else if (d2 != 0)
 				s = m->dir + 1;
-			}
 			walkMonsterNextStep(m, -1, s & 3);
 			return;
-		} else if (_flags.gameID == GI_EOB2) {
+		}
+	} else if (_flags.gameID == GI_EOB2) {
+		if (b + _monsterStepTable0[d] == destBlock) {
 			if (d & 1) {
 				int e = _monsterStepTable1[((d - 1) << 1) + m->dir];
-				if (e && !((_monsterProps[m->type].capsFlags & 0x200) && (rollDice(1, 4) == 4))) {
+				if (e && (!(_monsterProps[m->type].capsFlags & 0x200) || (rollDice(1, 4) < 4))) {
 					if (walkMonsterNextStep(m, b + e, -1))
 						return;
 				}
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 069bf1337d..57ee737ba0 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -1241,6 +1241,9 @@ void EobEngine::initSpells() {
 void DarkMoonEngine::initStaticResource() {
 	int temp;
 	_mainMenuStrings = _staticres->loadStrings(kEob2MainMenuStrings, temp);
+	_transferConvertTable = _staticres->loadRawData(kEob2TransferConvertTable, temp);
+	_transferExpTable = _staticres->loadRawDataBe32(kEob2TransferExpTable, temp);
+
 	_introStrings = _staticres->loadStrings(kEob2IntroStrings, temp);
 	_cpsFilesIntro = _staticres->loadStrings(kEob2IntroCPSFiles, temp);
 
diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp
index 2ab2b621f3..95c283f063 100644
--- a/engines/kyra/timer.cpp
+++ b/engines/kyra/timer.cpp
@@ -149,6 +149,8 @@ void TimerManager::setCountdown(uint8 id, int32 countdown) {
 			uint32 curTime = _system->getMillis();
 			timer->lastUpdate = curTime;
 			timer->nextRun = curTime + countdown * _vm->tickLength();
+			if (timer->enabled & 2)
+				timer->pauseStartTime = curTime;
 
 			_nextRun = MIN(_nextRun, timer->nextRun);
 		}
@@ -177,6 +179,8 @@ int32 TimerManager::getDelay(uint8 id) const {
 void TimerManager::setNextRun(uint8 id, uint32 nextRun) {
 	Iterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id));
 	if (timer != _timers.end()) {
+		if (timer->enabled & 2)
+			timer->pauseStartTime = _system->getMillis();
 		timer->nextRun = nextRun;
 		return;
 	}
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 61fa554193..caeae8cb29 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -115,6 +115,7 @@ void EobCoreEngine::setupTimers() {
 	_timer->addTimer(5, TimerV2(timerUpdateTeleporters), 10, true);
 	_timer->addTimer(6, TimerV2(timerUpdateFoodStatus), 1080, true);
 	_timer->addTimer(7, TimerV2(timerUpdateMonsterIdleAnim), 25, true);
+	_timer->resetNextRun();
 }
 
 void EobCoreEngine::setCharEventTimer(int charIndex, uint32 countdown, int evnt, int updateExistingTimer) {
@@ -132,6 +133,7 @@ void EobCoreEngine::setCharEventTimer(int charIndex, uint32 countdown, int evnt,
 
 	if (ntime < _timer->getNextRun(timerId))
 		_timer->setNextRun(timerId, ntime);
+	_timer->resetNextRun();
 
 	if (updateExistingTimer) {
 		bool updated = false;
@@ -194,6 +196,7 @@ void EobCoreEngine::setupCharacterTimers() {
 			_timer->setCountdown(0x30 | i, (nextTimer - ctime) / _tickLength);
 		}
 	}
+	_timer->resetNextRun();
 }
 
 void EobCoreEngine::advanceTimers(uint32 millis) {
diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/timer_lol.cpp
index 5a6677a4f6..d0b4062a65 100644
--- a/engines/kyra/timer_lol.cpp
+++ b/engines/kyra/timer_lol.cpp
@@ -45,6 +45,7 @@ void LoLEngine::setupTimers() {
 	_timer->addTimer(9, TimerV2(timerUpdatePortraitAnimations), 10, true);
 	_timer->addTimer(10, TimerV2(timerUpdateLampState), 360, true);
 	_timer->addTimer(11, TimerV2(timerFadeMessageText), 360, false);
+	_timer->resetNextRun();
 }
 
 void LoLEngine::timerProcessMonsters(int timerNum) {
-- 
cgit v1.2.3


From c35de374dfe545ffc5044a00a247c5814e3b250e Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sat, 20 Aug 2011 13:24:36 +0200
Subject: KYRA: (EOB) - lots of bug fixes, mostly for EOB II

---
 engines/kyra/detection.cpp      | 10 ++++-----
 engines/kyra/eob2.cpp           | 10 +++++++--
 engines/kyra/eob2.h             |  5 +++--
 engines/kyra/eobcommon.cpp      | 20 ++++++++---------
 engines/kyra/magic_eob.cpp      | 17 +++++++++------
 engines/kyra/resource.h         |  3 ++-
 engines/kyra/saveload_eob.cpp   |  7 ++++++
 engines/kyra/scene_eob.cpp      | 10 ++++++---
 engines/kyra/screen_eob.cpp     | 17 +--------------
 engines/kyra/script_eob.cpp     | 48 +++++++++++++++++++++--------------------
 engines/kyra/script_eob.h       |  9 ++++----
 engines/kyra/sequences_eob2.cpp |  7 +++---
 engines/kyra/staticres_eob.cpp  |  3 ++-
 engines/kyra/text_eob.cpp       | 37 +++++++++++++++++++------------
 engines/kyra/timer_eob.cpp      |  7 ++++++
 15 files changed, 119 insertions(+), 91 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 44fbc0fe68..adfb1c612a 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -188,7 +188,7 @@ void KyraMetaEngine::removeSaveState(const char *target, int slot) const {
 	// In Kyra games slot 0 can't be deleted, it's for restarting the game(s).
 	// An exception makes Lands of Lore here, it does not have any way to restart the
 	// game except via its main menu.
-	if (slot == 0 && !ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("lol"))
+	if (slot == 0 && !ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("lol") && !ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("eob") && !ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("eob2"))
 		return;
 
 	Common::String filename = Kyra::KyraEngine_v1::getSavegameFilename(target, slot);
@@ -198,7 +198,7 @@ void KyraMetaEngine::removeSaveState(const char *target, int slot) const {
 SaveStateDescriptor KyraMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
 	Common::String filename = Kyra::KyraEngine_v1::getSavegameFilename(target, slot);
 	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename);
-	const bool lolGame = ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("lol");
+	bool nonKyraGame = ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("lol") || ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("eob") || ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("eob2");
 
 	if (in) {
 		Kyra::KyraEngine_v1::SaveHeader header;
@@ -212,12 +212,12 @@ SaveStateDescriptor KyraMetaEngine::querySaveMetaInfos(const char *target, int s
 
 			// Slot 0 is used for the 'restart game' save in all three Kyrandia games, thus
 			// we prevent it from being deleted.
-			desc.setDeletableFlag(slot != 0 || lolGame);
+			desc.setDeletableFlag(slot != 0 || nonKyraGame);
 
 			// We don't allow quick saves (slot 990 till 998) to be overwritten.
 			// The same goes for the 'Autosave', which is slot 999. Slot 0 will also
 			// be protected in Kyra 1-3, since it's the 'restart game' save.
-			desc.setWriteProtectedFlag((slot == 0 && !lolGame) || slot >= 990);
+			desc.setWriteProtectedFlag((slot == 0 && !nonKyraGame) || slot >= 990);
 			desc.setThumbnail(header.thumbnail);
 
 			return desc;
@@ -229,7 +229,7 @@ SaveStateDescriptor KyraMetaEngine::querySaveMetaInfos(const char *target, int s
 	// We don't allow quick saves (slot 990 till 998) to be overwritten.
 	// The same goes for the 'Autosave', which is slot 999. Slot 0 will also
 	// be protected in Kyra 1-3, since it's the 'restart game' save.
-	desc.setWriteProtectedFlag((slot == 0 && !lolGame) || slot >= 990);
+	desc.setWriteProtectedFlag((slot == 0 && !nonKyraGame) || slot >= 990);
 
 	return desc;
 }
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index 0ecdba0fd3..0ffca10093 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -77,6 +77,10 @@ Common::Error DarkMoonEngine::init() {
 	_color13 = 177;
 	_color14 = 182;
 
+	// Necessary wall hacks (where the original code makes out of bounds accesses)
+	_wllWallFlags[183] = 0x50;
+	_wllVmpMap[183] = 1;
+
 	return Common::kNoError;
 }
 
@@ -312,6 +316,8 @@ const uint8 *DarkMoonEngine::loadDoorShapes(const char *filename, int doorIndex,
 void DarkMoonEngine::drawDoorIntern(int type, int, int x, int y, int w, int wall, int mDim, int16, int16) {
 	int shapeIndex = type * 3 + 2 - mDim;
 	uint8 *shp = _doorShapes[shapeIndex];
+	if (!shp)
+		return;
 
 	if ((_doorType[type] == 0) || (_doorType[type] == 1)) {
 		y = _dscDoorY1[mDim] - shp[1];
@@ -392,7 +398,7 @@ void DarkMoonEngine::useHorn(int charIndex, int weaponSlot) {
 
 bool DarkMoonEngine::checkPartyStatusExtra() {
 	if (checkScriptFlags(0x100000))
-		seq_dranFools();
+		seq_kheldran();
 	return _gui->confirmDialogue2(14, 67, 1);
 }
 
@@ -462,7 +468,7 @@ void DarkMoonEngine::characterLevelGain(int charIndex) {
 		if (er == 0xffffffff)
 			continue;
 
-		increaseCharacterExperience(charIndex, er - c->experience[i]);
+		increaseCharacterExperience(charIndex, er - c->experience[i] + 1);
 	}
 }
 
diff --git a/engines/kyra/eob2.h b/engines/kyra/eob2.h
index f24db79e62..6da09010b4 100644
--- a/engines/kyra/eob2.h
+++ b/engines/kyra/eob2.h
@@ -88,10 +88,11 @@ private:
 
 	// Ingame sequence
 	void seq_nightmare();
-	void seq_dranFools();
+	void seq_kheldran();
 	void seq_dranDragonTransformation();
 
-	const char *const *_dranFoolsStrings;
+	const int8 *_dreamSteps;
+	const char *const *_kheldranStrings;
 
 	// characters
 	void drawNpcScene(int npcIndex);
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 3a298d84ad..67609520fa 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -302,13 +302,6 @@ Common::Error EobCoreEngine::init() {
 	memset(&_wllShapeMap[3], -1, 5);
 	memset(&_wllShapeMap[13], -1, 5);
 
-	/*int clen = _flags.gameID == GI_EOB2 ? 80 : 70;
-	memcpy(&_wllShapeMap[256 - clen], _wllVmpMap, clen);
-	memcpy(&_specialWallTypes[256 - 2 * clen], _wllVmpMap, clen);
-	memcpy(&_specialWallTypes[256 - clen], _wllShapeMap, clen);
-	memcpy(&_wllWallFlags[256 - 2 * clen], _wllShapeMap, clen);
-	memcpy(&_wllWallFlags[256 - clen], _specialWallTypes, clen);*/
-
 	_wllVcnOffset = 16;
 
 	_monsters = new EobMonsterInPlay[30];
@@ -1248,6 +1241,7 @@ void EobCoreEngine::initDialogueSequence() {
 
 	_txt->resetPageBreakString();
 	gui_updateControls();
+	//_allowSkip = true;
 
 	_sound->playTrack(0);
 	Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
@@ -1263,6 +1257,7 @@ void EobCoreEngine::restoreAfterDialogueSequence() {
 	_dialogueLastBitmap[0] = 0;
 
 	gui_restorePlayField();
+	//_allowSkip = false;
 	_screen->setScreenDim(7);
 
 	if (_flags.gameID == GI_EOB2)
@@ -1603,14 +1598,18 @@ bool EobCoreEngine::checkPassword() {
 	for (int i = 0; i < 3; i++) {
 		_screen->fillRect(_screen->_curDim->sx << 3, _screen->_curDim->sy, ((_screen->_curDim->sx + _screen->_curDim->w) << 3) - 1, (_screen->_curDim->sy + _screen->_curDim->h) - 1, _bkgColor_1);
 		int c = rollDice(1, _mnNumWord - 1, -1);
-		_screen->drawShape(0, _largeItemShapes[_mnDef[c << 2]], 100, 2, 13);
+		const uint8 *shp = (_mnDef[c << 2] < _numLargeItemShapes) ? _largeItemShapes[_mnDef[c << 2]] : (_mnDef[c << 2] < 15 ? 0 : _smallItemShapes[_mnDef[c << 2] - 15]);
+		assert(shp);
+		_screen->drawShape(0, shp, 100, 2, 13);
 		_screen->printShadedText(Common::String::format(_mnPrompt[0], _mnDef[(c << 2) + 1], _mnDef[(c << 2) + 2]).c_str(), (_screen->_curDim->sx + 1) << 3, _screen->_curDim->sy, _screen->_curDim->unk8, _bkgColor_1);
 		memset(answ, 0, 20);
 		gui_drawBox(76, 100, 133, 14, _color2_1, _color1_1, -1);
 		gui_drawBox(77, 101, 131, 12, _color2_1, _color1_1, -1);	
 		if (_gui->getTextInput(answ, 10, 103, 15, _screen->_curDim->unk8, _bkgColor_1, 8) < 0)
 			i = 3;
-		if (scumm_stricmp(_mnWord[c], answ) && i == 2)
+		if (!scumm_stricmp(_mnWord[c], answ))
+			break;
+		else if (i == 2)
 			return false;
 	}
 
@@ -1806,7 +1805,7 @@ int EobCoreEngine::calcCharacterDamage(int charIndex, int times, int itemOrPips,
 	EobCharacter *c = &_characters[charIndex];
 
 	if (savingThrowType != 5) {
-		if (trySavingThrow(c, _charClassModUnk[c->cClass], c->level[0], savingThrowType, c->raceSex))
+		if (trySavingThrow(c, _charClassModUnk[c->cClass], c->level[0], savingThrowType, c->raceSex >> 1 /*fix bug in original code by adding a right shift*/))
 			s = savingThrowReduceDamage(savingThrowEffect, s);
 	}
 
@@ -2006,6 +2005,7 @@ void EobCoreEngine::monsterCloseAttack(EobMonsterInPlay *m) {
 					_txt->printMessage(_ripItemStrings[(_characters[c].raceSex & 1) ^ 1], -1, _characters[c].name);
 					printFullItemName(itm);
 					_txt->printMessage(_ripItemStrings[2]);
+					break;
 				}
 				gui_drawCharPortraitWithStats(c);
 			}
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 646d389706..0424558b04 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -360,7 +360,7 @@ void EobCoreEngine::startSpell(int spell) {
 	if (_castScrollSlot) {
 		gui_updateSlotAfterScrollUse();
 	} else {
-		c->disabledSlots |= 4;
+		_characters[_openBookChar].disabledSlots |= 4;
 		setCharEventTimer(_openBookChar, 72, 11, 1);
 		gui_toggleButtons();
 		gui_drawSpellbook();
@@ -405,7 +405,6 @@ void EobCoreEngine::sparkEffectDefensive(int charIndex) {
 				_screen->updateScreen();
 			}
 		}
-		resetSkipFlag();
 		delay(2 * _tickLength);
 	}
 
@@ -430,7 +429,6 @@ void EobCoreEngine::sparkEffectOffensive() {
 			if (shpIndex)
 				_screen->drawShape(2, _sparkShapes[shpIndex - 1], _sparkEffectOfX[ii], _sparkEffectOfY[ii], 0);
 		}
-		resetSkipFlag();
 		delay(2 * _tickLength);
 		_screen->copyRegion(0, 0, 0, 0, 176, 120, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
@@ -444,6 +442,7 @@ void EobCoreEngine::sparkEffectOffensive() {
 }
 
 void EobCoreEngine::setSpellEventTimer(int spell, int timerBaseFactor, int timerLength, int timerLevelFactor, int updateExistingTimer) {
+	assert (spell >= 0);
 	int l = _openBookType == 1 ? getClericPaladinLevel(_openBookChar) : getMageLevel(_openBookChar);
 	uint32 countdown = timerLength * timerBaseFactor + timerLength * l * timerLevelFactor;
 	setCharEventTimer(_activeSpellCharId, countdown, -spell, updateExistingTimer);
@@ -753,7 +752,7 @@ int EobCoreEngine::findFirstCharacterSpellTarget() {
 }
 
 int EobCoreEngine::findNextCharacterSpellTarget(int curCharIndex) {
-	for (; _characterSpellTarget < 6; _characterSpellTarget++) {
+	for (_characterSpellTarget++; _characterSpellTarget < 6; ) {
 		if (++curCharIndex == 6)
 			curCharIndex = 0;
 		if (testCharacter(curCharIndex, 3))
@@ -763,8 +762,14 @@ int EobCoreEngine::findNextCharacterSpellTarget(int curCharIndex) {
 }
 
 int EobCoreEngine::charDeathSavingThrow(int charIndex, int div) {
-	if (specialAttackSavingThrow(charIndex, 4))
+	bool _beholderOrgBhv = true;
+	// Due to a bug in the original code the saving throw result is completely ignored
+	// here. The Beholders' disintegrate spell will alway succeed while their flesh to
+	// stone spell will always fail.
+	if (_beholderOrgBhv)
 		div >>= 1;
+	else
+		div = specialAttackSavingThrow(charIndex, 4) ? 1 : 0;
 	return div;
 }
 
@@ -1226,7 +1231,7 @@ bool EobCoreEngine::spellCallback_end_flameStrike(void *obj) {
 }
 
 void EobCoreEngine::spellCallback_start_raiseDead() {
-	if (_characters[_activeSpellCharId].hitPointsCur == -10 || ((_characters[_activeSpellCharId].raceSex >> 1) == 1)) {
+	if (_characters[_activeSpellCharId].hitPointsCur == -10 && ((_characters[_activeSpellCharId].raceSex >> 1) != 1)) {
 		_characters[_activeSpellCharId].hitPointsCur = 1;
 		gui_drawCharPortraitWithStats(_activeSpellCharId);
 	} else {
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index cd3865736f..a7060cdf6d 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -626,7 +626,8 @@ enum KyraResources {
 	kEob2Npc2Strings,
 	kEob2MonsterDustStrings,
 
-	kEob2DranFoolsStrings,
+	kEob2DreamSteps,
+	kEob2KheldranStrings,
 	kEob2HornStrings,
 	kEob2HornSounds,
 
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 847f304288..01fbd75cfe 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -366,6 +366,13 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 	_sceneUpdateRequired = true;
 	_screen->setFont(Screen::FID_6_FNT);
 
+	for (int i = 0; i < 6; i++) {
+		for (int ii = 0; ii < 10; ii++) {
+			if (_characters[i].events[ii] == -57)
+				spellCallback_start_trueSeeing();
+		}
+	}
+
 	_screen->setCurPage(0);
 	gui_drawPlayField(false);	
 
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 1bd7fca04a..98cd60dcd9 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -647,8 +647,12 @@ void EobCoreEngine::loadLevel(int level, int sub) {
 		delete s;
 	}
 
-	Common::String gfxFile = initLevelData(sub);
-
+	Common::String gfxFile;
+	// Work around for issue with corrupt (incomplete) monster property data 
+	// when loading a savegame saved in a sub level
+	for (int i = 0; i <= sub; i++)
+		gfxFile = initLevelData(i);
+	
 	const uint8 *data = _screen->getCPagePtr(5);
 	const uint8 *pos = data + READ_LE_UINT16(data);
 	uint16 len = READ_LE_UINT16(pos);
@@ -1142,7 +1146,7 @@ int EobCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint1
 	int f = _wllWallFlags[w];
 
 	//if (!f)
-	assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80));
+		assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80));
 
 	if (_flags.gameID == GI_EOB2 && w == 74 && _currentBlock == curBlock) {
 		for (int i = 0; i < 5; i++) {
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index d29af69f0a..9c67750ba8 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -774,15 +774,8 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepS
 				int16 py = ((ptr3[i] >> 6) >> scale) + gy2;
 				if (py > ymax)
 					py = ymax;
-				if (posWithinRect(px, py, rX1, rY1, rX2, rY2)) {
+				if (posWithinRect(px, py, rX1, rY1, rX2, rY2))
 					setPagePixel(0, px, py, ptr6[i]);
-					if (i % 5 == 0)  {
-						updateScreen();
-						uint32 cur = _system->getMillis();
-						if (end > cur)
-							_system->delayMillis(end - cur);
-					}
-				}
 			}			
 		}
 
@@ -914,14 +907,6 @@ void Screen_Eob::drawVortex(int numElements, int radius, int stepSize, int, int
 				int16 px = CLIP((xCoords[ii] >> 6) + cx, 0, SCREEN_W - 1);
 				int16 py = CLIP((yCoords[ii] >> 6) + cy, 0, SCREEN_H - 1);
 				setPagePixel(0, px, py, pixBackup[ii]);
-		
-				if (ii % 15 == 0)  {
-					updateScreen();
-					uint32 cur = _system->getMillis();
-					if (nextDelay > cur)
-						_system->delayMillis(nextDelay - cur);
-					nextDelay += 1;
-				}
 			}
 		}
 
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index 6feac6bd77..1dbb02414f 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -106,8 +106,8 @@ EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _v
 	Opcode(oeob_calcAndInflictCharacterDamage);
 	Opcode(oeob_jump);
 	Opcode(oeob_end);
-	Opcode(oeob_popPosAndReturn);
-	Opcode(oeob_pushPosAndJump);
+	Opcode(oeob_returnFromSubroutine);
+	Opcode(oeob_callSubroutine);
 	OpcodeAlt(oeob_eval);
 	Opcode(oeob_deleteItem);
 	Opcode(oeob_loadNewLevelOrMonsters);
@@ -125,6 +125,7 @@ EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _v
 #undef OpcodeAlt
 
 	_scriptData = 0;
+	_scriptSize = 0;
 
 	_abortScript = 0;
 	_abortAfterSubroutine = 0;
@@ -134,9 +135,9 @@ EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _v
 	_lastScriptFunc = 0;
 	_lastScriptSub = 0;
 
-	_scriptPosStack = new int8*[10];
-	memset(_scriptPosStack, 0, 10 * sizeof(int8*));
-	_scriptPosStackIndex = 0;
+	_subroutineStack = new int8*[10];
+	memset(_subroutineStack, 0, 10 * sizeof(int8*));
+	_subroutineStackPos = 0;
 
 	_flagTable = new uint32[18];
 	memset(_flagTable, 0, 18 * sizeof(uint32));
@@ -145,14 +146,14 @@ EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _v
 	memset(_stack, 0, 30 * sizeof(int16));
 	_stackIndex = 0;
 
-	memset(_scriptPosStack, 0, sizeof(_scriptPosStack));
-	_scriptPosStackIndex = 0;
+	memset(_subroutineStack, 0, sizeof(_subroutineStack));
+	_subroutineStackPos = 0;
 
 	_activeCharacter = -1;
 }
 
 EobInfProcessor::~EobInfProcessor() {
-	delete[] _scriptPosStack;
+	delete[] _subroutineStack;
 	delete[] _flagTable;
 	delete[] _stack;
 	delete[] _scriptData;
@@ -163,8 +164,9 @@ EobInfProcessor::~EobInfProcessor() {
 
 void EobInfProcessor::loadData(const uint8 *data, uint32 dataSize) {
 	delete[] _scriptData;
-	_scriptData = new int8[dataSize];
-	memcpy(_scriptData, data, dataSize);
+	_scriptSize = dataSize;
+	_scriptData = new int8[_scriptSize];
+	memcpy(_scriptData, data, _scriptSize);
 }
 
 void EobInfProcessor::run(int func, int sub) {
@@ -382,7 +384,7 @@ int EobInfProcessor::oeob_movePartyOrObject(int8 *data) {
 		int bc = _lastScriptSub;
 		int bd = _abortScript;
 		int be = _activeCharacter;
-		int bf = _scriptPosStackIndex;
+		int bf = _subroutineStackPos;
 
 		_vm->moveParty(d);
 
@@ -392,7 +394,7 @@ int EobInfProcessor::oeob_movePartyOrObject(int8 *data) {
 		_abortScript = bd;
 		_activeCharacter = be;
 		if (!_abortAfterSubroutine)
-			_scriptPosStackIndex = bf;
+			_subroutineStackPos = bf;
 		_vm->_sceneDefaultUpdate = 0;
 
 	} else if ((a == -31 && _vm->game() == GI_EOB2) || a == -11) {
@@ -589,7 +591,6 @@ int EobInfProcessor::oeob_playSoundEffect(int8 *data) {
 int EobInfProcessor::oeob_removeFlags(int8 *data) {
 	int8 *pos = data;
 	int8 a = *pos++;
-	int8 b = *pos++;
 
 	switch (a) {
 	case -47:
@@ -601,11 +602,11 @@ int EobInfProcessor::oeob_removeFlags(int8 *data) {
 		break;
 
 	case -17:
-		_flagTable[_vm->_currentLevel] &= ~(1 << b);
+		_flagTable[_vm->_currentLevel] &= ~(1 << (*pos++));
 		break;
 
 	case -16:
-		_flagTable[17] &= ~(1 << b);
+		_flagTable[17] &= ~(1 << (*pos++));
 		break;
 
 	default:
@@ -667,28 +668,29 @@ int EobInfProcessor::oeob_jump(int8 *data) {
 
 int EobInfProcessor::oeob_end(int8 *data) {
 	_abortScript = 1;
-	_scriptPosStackIndex = 0;
+	_subroutineStackPos = 0;
 	return 0;
 }
 
-int EobInfProcessor::oeob_popPosAndReturn(int8 *data) {
+int EobInfProcessor::oeob_returnFromSubroutine(int8 *data) {
 	int8 *pos = data;
 
-	if (_scriptPosStackIndex)
-		pos = _scriptPosStack[--_scriptPosStackIndex];
+	if (_subroutineStackPos)
+		pos = _subroutineStack[--_subroutineStackPos];
 	else
 		_abortScript = 1;
 
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_pushPosAndJump(int8 *data) {
+int EobInfProcessor::oeob_callSubroutine(int8 *data) {
 	int8 *pos = data;
 	uint16 offs = READ_LE_UINT16(pos);
+	assert(offs < _scriptSize);
 	pos += 2;
 
-	if (_scriptPosStackIndex < 10) {
-		_scriptPosStack[_scriptPosStackIndex++] = pos;
+	if (_subroutineStackPos < 10) {
+		_subroutineStack[_subroutineStackPos++] = pos;
 		pos = _scriptData + offs;
 	}
 
@@ -1245,7 +1247,7 @@ int EobInfProcessor::oeob_loadNewLevelOrMonsters(int8 *data) {
 		_vm->_sceneUpdateRequired = true;
 
 		_vm->gui_drawAllCharPortraitsWithStats();
-		_scriptPosStackIndex = 0;
+		_subroutineStackPos = 0;
 
 	} else {
 		cmd = *pos++;
diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h
index 648d214017..8f44c7f6f9 100644
--- a/engines/kyra/script_eob.h
+++ b/engines/kyra/script_eob.h
@@ -69,8 +69,8 @@ private:
 	int oeob_calcAndInflictCharacterDamage(int8 *data);
 	int oeob_jump(int8 *data);
 	int oeob_end(int8 *data);
-	int oeob_popPosAndReturn(int8 *data);
-	int oeob_pushPosAndJump(int8 *data);
+	int oeob_returnFromSubroutine(int8 *data);
+	int oeob_callSubroutine(int8 *data);
 	int oeob_eval_v1(int8 *data);
 	int oeob_eval_v2(int8 *data);
 	int oeob_deleteItem(int8 *data);
@@ -94,6 +94,7 @@ private:
 	Common::Array<const InfProc*> _opcodes;
 
 	int8 *_scriptData;
+	uint16 _scriptSize;
 
 	uint8 _abortScript;
 	uint16 _abortAfterSubroutine;
@@ -103,8 +104,8 @@ private:
 	uint16 _lastScriptFunc;
 	uint16 _lastScriptSub;
 
-	int8 **_scriptPosStack;
-	int _scriptPosStackIndex;
+	int8 **_subroutineStack;
+	int _subroutineStackPos;
 
 	uint32 *_flagTable;
 
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
index ea96779bb1..dcf293bd52 100644
--- a/engines/kyra/sequences_eob2.cpp
+++ b/engines/kyra/sequences_eob2.cpp
@@ -1282,12 +1282,11 @@ void DarkMoonEngine::seq_nightmare() {
 	_txt->printDialogueText(99, 0);
 	snd_playSoundEffect(54);
 
-	static const int8 dreamSteps[] = { 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 3, 2, 1, 0, -1 };
 	static const uint8 seqX[] = { 0, 20, 0, 20 };
 	static const uint8 seqY[] = { 0, 0, 96, 96 };
 	static const uint8 seqDelay[] = { 12, 7, 7, 12 };
 
-	for (const int8 *i = dreamSteps; *i != -1; ++i) {
+	for (const int8 *i = _dreamSteps; *i != -1; ++i) {
 		drawSequenceBitmap("DREAM", 0, seqX[*i], seqY[*i], 0);
 		delay(seqDelay[*i] * _tickLength);
 	}
@@ -1299,14 +1298,14 @@ void DarkMoonEngine::seq_nightmare() {
 	_screen->setFont(of);
 }
 
-void DarkMoonEngine::seq_dranFools() {
+void DarkMoonEngine::seq_kheldran() {
 	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
 
 	initDialogueSequence();
 	gui_drawDialogueBox();
 	
 	static const char file[] = "KHELDRAN";
-	_txt->printDialogueText(_dranFoolsStrings[0]);
+	_txt->printDialogueText(_kheldranStrings[0]);
 	drawSequenceBitmap(file, 0, 0, 0, 0);
 	_txt->printDialogueText(20, _moreStrings[0]);
 	snd_playSoundEffect(56);
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 57ee737ba0..274feba4fa 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -1280,7 +1280,8 @@ void DarkMoonEngine::initStaticResource() {
 	_npc1Strings = _staticres->loadStrings(kEob2Npc1Strings, temp);
 	_npc2Strings = _staticres->loadStrings(kEob2Npc2Strings, temp);
 	_monsterDustStrings = _staticres->loadStrings(kEob2MonsterDustStrings, temp);
-	_dranFoolsStrings = _staticres->loadStrings(kEob2DranFoolsStrings, temp);
+	_dreamSteps = (const int8*)_staticres->loadRawData(kEob2DreamSteps, temp);
+	_kheldranStrings = _staticres->loadStrings(kEob2KheldranStrings, temp);
 	_hornStrings = _staticres->loadStrings(kEob2HornStrings, temp);
 	_hornSounds = _staticres->loadRawData(kEob2HornSounds, temp);
 
diff --git a/engines/kyra/text_eob.cpp b/engines/kyra/text_eob.cpp
index 318147c679..a2cc5c6e00 100644
--- a/engines/kyra/text_eob.cpp
+++ b/engines/kyra/text_eob.cpp
@@ -29,16 +29,18 @@
 
 #include "common/system.h"
 
-#define EOBTEXTBUFFERSIZE 2048
-
 namespace Kyra {
 
+enum {
+	kEobTextBufferSize = 2048
+};
+
 TextDisplayer_Eob::TextDisplayer_Eob(LolEobBaseEngine *engine, Screen *sScreen) : _vm(engine), _screen(sScreen),
 	_lineCount(0), _printFlag(false), _lineWidth(0), _numCharsTotal(0), _allowPageBreak(true),
 	_numCharsLeft(0), _numCharsPrinted(0), _sjisLineBreakFlag(false), _waitButtonMode(1) {
 
-	_dialogueBuffer = new char[EOBTEXTBUFFERSIZE];
-	memset(_dialogueBuffer, 0, EOBTEXTBUFFERSIZE);
+	_dialogueBuffer = new char[kEobTextBufferSize];
+	memset(_dialogueBuffer, 0, kEobTextBufferSize);
 
 	_currentLine = new char[85];
 	memset(_currentLine, 0, 85);
@@ -221,12 +223,14 @@ void TextDisplayer_Eob::displayText(char *str, ...) {
 			break;
 
 		default:
-			_lineWidth += (pc98PrintFlag ? 4 : _screen->getCharWidth((uint8)c));
-			_currentLine[_numCharsLeft++] = c;
-			_currentLine[_numCharsLeft] = 0;
+			if (_vm->game() == GI_LOL || c > 30) {
+				_lineWidth += (pc98PrintFlag ? 4 : _screen->getCharWidth((uint8)c));
+				_currentLine[_numCharsLeft++] = c;
+				_currentLine[_numCharsLeft] = 0;
 
-			if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
-				printLine(_currentLine);
+				if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
+					printLine(_currentLine);
+			}
 		}
 
 		c = parseCommand();
@@ -271,6 +275,10 @@ void TextDisplayer_Eob::readNextPara() {
 			_tempString1 = 0;
 	}
 
+	if (d & 0x80) {
+		warning("TextDisplayer_Eob::readNextPara():");
+	}
+
 	_ctrl[1] = d;
 	_ctrl[2] = 0;
 }
@@ -442,8 +450,8 @@ void TextDisplayer_Eob::printLine(char *str) {
 
 void TextDisplayer_Eob::printDialogueText(int stringId, const char *pageBreakString) {
 	const char * str = (const char *)(screen()->getCPagePtr(5) + READ_LE_UINT16(&screen()->getCPagePtr(5)[(stringId - 1) << 1]));
-	assert (strlen(str) < EOBTEXTBUFFERSIZE);
-	Common::strlcpy(_dialogueBuffer, str, EOBTEXTBUFFERSIZE);
+	assert (strlen(str) < kEobTextBufferSize);
+	Common::strlcpy(_dialogueBuffer, str, kEobTextBufferSize);
 	
 	displayText(_dialogueBuffer);
 
@@ -457,8 +465,8 @@ void TextDisplayer_Eob::printDialogueText(int stringId, const char *pageBreakStr
 }
 
 void TextDisplayer_Eob::printDialogueText(const char *str, bool wait) {
-	assert (strlen(str) < EOBTEXTBUFFERSIZE);
-	Common::strlcpy(_dialogueBuffer, str, EOBTEXTBUFFERSIZE);
+	assert (strlen(str) < kEobTextBufferSize);
+	Common::strlcpy(_dialogueBuffer, str, kEobTextBufferSize);
 
 	strcpy(_dialogueBuffer, str);
 	displayText(_dialogueBuffer);
@@ -474,7 +482,7 @@ void TextDisplayer_Eob::printMessage(const char *str, int textColor, ...) {
 
 	va_list args;
 	va_start(args, textColor);
-	vsnprintf(_dialogueBuffer, 240, str, args);
+	vsnprintf(_dialogueBuffer, kEobTextBufferSize - 1, str, args);
 	va_end(args);
 
 	displayText(_dialogueBuffer);
@@ -655,6 +663,7 @@ void TextDisplayer_Eob::displayWaitButton() {
 	while (!vm()->processDialogue() && !vm()->shouldQuit()) {}
 	
 	_screen->fillRect(vm()->_dialogueButtonPosX[0], vm()->_dialogueButtonPosY[0], vm()->_dialogueButtonPosX[0] + vm()->_dialogueButtonW - 1, vm()->_dialogueButtonPosY[0] + vm()->_dialogueButtonH - 1, vm()->_bkgColor_1);
+	_screen->updateScreen();
 	vm()->_dialogueButtonW = 95;
 	SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
 	clearCurDim();
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index caeae8cb29..f36688df39 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -221,6 +221,13 @@ void EobCoreEngine::advanceTimers(uint32 millis) {
 			}
 		}
 	}
+
+	for (int i = 0; i < 5; i++) {
+		if (_wallsOfForce[i].duration > ct) {
+			uint32 chrt = _wallsOfForce[i].duration - ct;
+			_wallsOfForce[i].duration = chrt > millis ? ct + chrt - millis : ct;
+		}
+	}
 }
 
 void EobCoreEngine::timerProcessCharacterExchange(int timerNum) {
-- 
cgit v1.2.3


From 2448d885e4e331a22e1e468277142155a5ddda87 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 21 Aug 2011 20:26:07 +0200
Subject: KYRA: (EOB) - complete EOBII playability

- fixed temp data generation, block data loading, some spell issues, etc.
- both EOB I and II should now be completable
- one big issue remaining (AdLib driver gets swamped with monster sounds which causes heavy lags in some levels)
---
 engines/kyra/detection.cpp      |  4 ++++
 engines/kyra/eob1.cpp           |  3 ---
 engines/kyra/eob2.cpp           | 11 ++++-----
 engines/kyra/eobcommon.cpp      |  5 ++++-
 engines/kyra/eobcommon.h        | 25 ++++++++++++---------
 engines/kyra/gui_eob.cpp        |  8 ++++---
 engines/kyra/items_eob.cpp      |  7 ++++--
 engines/kyra/lol.h              |  1 +
 engines/kyra/loleobbase.h       |  4 +++-
 engines/kyra/magic_eob.cpp      | 22 +++++++++++-------
 engines/kyra/saveload_eob.cpp   | 50 ++++++++++++++++++++---------------------
 engines/kyra/scene_eob.cpp      | 27 ++++++++++++++++------
 engines/kyra/scene_lol.cpp      |  5 +++++
 engines/kyra/screen_eob.cpp     | 10 ++++-----
 engines/kyra/script_eob.cpp     | 11 +++++----
 engines/kyra/script_eob.h       |  7 +++++-
 engines/kyra/sequences_eob2.cpp |  8 ++++---
 engines/kyra/sprites_eob.cpp    |  3 ++-
 engines/kyra/staticres_eob.cpp  | 16 ++++++-------
 engines/kyra/text_eob.cpp       |  1 +
 engines/kyra/timer_eob.cpp      |  1 +
 21 files changed, 137 insertions(+), 92 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index adfb1c612a..dd67c3e715 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -160,6 +160,10 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const {
 
 	SaveStateList saveList;
 	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
+		// Skip automatic final saves made by EOB for the purpose of party transfer
+		if (!scumm_stricmp(file->c_str() + file->size() - 3, "fin"))
+			continue;
+		
 		// Obtain the last 3 digits of the filename, since they correspond to the save slot
 		int slotNum = atoi(file->c_str() + file->size() - 3);
 
diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index 8ce41d6b5b..d67cda529d 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -78,9 +78,6 @@ Common::Error EobEngine::init() {
 
 	_scriptTimersCount = 1;
 
-	//_wllWallFlags[132] = 1;
-	//_wllWallFlags[133] = 1;
-
 	return Common::kNoError;
 }
 
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index 0ffca10093..d9aad0ce3d 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -77,10 +77,6 @@ Common::Error DarkMoonEngine::init() {
 	_color13 = 177;
 	_color14 = 182;
 
-	// Necessary wall hacks (where the original code makes out of bounds accesses)
-	_wllWallFlags[183] = 0x50;
-	_wllVmpMap[183] = 1;
-
 	return Common::kNoError;
 }
 
@@ -226,8 +222,8 @@ void DarkMoonEngine::loadMonsterDecoration(const char *file, int16 monsterIndex)
 			SpriteDecoration *m = &_monsterDecorations[i * 6 + ii + monsterIndex];
 
 			m->shp = _screen->encodeShape(dc[0], dc[1], dc[2], dc[3]);
-			m->x = dc[4];
-			m->y = dc[5];
+			m->x = (int8)dc[4];
+			m->y = (int8)dc[5];
 		}
 	}
 
@@ -281,6 +277,7 @@ bool DarkMoonEngine::killMonsterExtra(EobMonsterInPlay *m) {
 		if (m->type) {
 			_playFinale = true;
 			_runFlag = false;
+			delay(850);
 		} else {
 			m->hitPointsCur = 150;
 			m->curRemoteWeapon = 0;
@@ -306,7 +303,7 @@ const uint8 *DarkMoonEngine::loadDoorShapes(const char *filename, int doorIndex,
 		shapeDefs += 8;
 		_doorSwitches[doorIndex * 3 + i].x = *shapeDefs;
 		shapeDefs += 2;
-		_doorSwitches[doorIndex * 3 + i]. y= *shapeDefs;
+		_doorSwitches[doorIndex * 3 + i].y= *shapeDefs;
 		shapeDefs += 2;
 	}
 	_screen->_curPage = 0;
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 67609520fa..fbd8ef62e1 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -398,8 +398,11 @@ Common::Error EobCoreEngine::go() {
 	if (!shouldQuit() && action > -3) {
 		runLoop();
 
-		if (_playFinale)
+		if (_playFinale) {
+			// make final save for party transfer
+			saveGameStateIntern(-1, 0, 0);
 			seq_playFinale();
+		}
 	}
 
 	return Common::kNoError;
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 5f1bf8b709..7ab933390e 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -151,8 +151,8 @@ struct EobItemType {
 
 struct SpriteDecoration {
 	uint8 *shp;
-	uint8 x;
-	uint8 y;
+	int16 x;
+	int16 y;
 };
 
 struct EobMonsterProperty {
@@ -574,11 +574,13 @@ protected:
 	const int8 *_monsterDirChangeTable;
 
 	// Level
-	void loadLevel(int level, int func);
-	Common::String initLevelData(int func);
+	void loadLevel(int level, int sub);
+	Common::String initLevelData(int sub);
 	void addLevelItems();
 	void loadVcnData(const char *file, const char */*nextFile*/);
 	void loadBlockProperties(const char *mazFile);
+	const uint8 *getBlockFileData(int levelIndex);
+	const uint8 *getBlockFileData(const char *mazFile);
 	void loadDecorations(const char *cpsFile, const char *decFile);
 	void assignWallsAndDecorations(int wallIndex, int vmpIndex, int decDataIndex, int specialType, int flags);
 	void releaseDecorations();
@@ -613,6 +615,7 @@ protected:
 
 	int8 _currentSub;
 	Common::String _curGfxFile;
+	Common::String _curBlockFile;
 
 	uint32 _drawSceneTimer;
 	uint32 _flashShapeTimer;
@@ -1006,13 +1009,13 @@ protected:
 	void spellCallback_start_heal();
 	void spellCallback_start_layOnHands();
 	void spellCallback_start_turnUndead();
-	bool spellCallback_end_lightningBoltPassive(void *obj);
-	bool spellCallback_end_unk1Passive(void *obj);
-	bool spellCallback_end_unk2Passive(void *obj);
-	bool spellCallback_end_deathSpellPassive(void *obj);
-	bool spellCallback_end_disintegratePassive(void *obj);
-	bool spellCallback_end_causeCriticalWoundsPassive(void *obj);
-	bool spellCallback_end_fleshToStonePassive(void *obj);
+	bool spellCallback_end_monster_lightningBolt(void *obj);
+	bool spellCallback_end_monster_fireball1(void *obj);
+	bool spellCallback_end_monster_fireball2(void *obj);
+	bool spellCallback_end_monster_deathSpell(void *obj);
+	bool spellCallback_end_monster_disintegrate(void *obj);
+	bool spellCallback_end_monster_causeCriticalWounds(void *obj);
+	bool spellCallback_end_monster_fleshToStone(void *obj);
 
 	int8 _openBookSpellLevel;
 	int8 _openBookSpellSelectedItem;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index a5f06c551e..d333528ab2 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -853,12 +853,12 @@ int EobCoreEngine::clickedCamp(Button *button) {
 		gui_drawCharPortraitWithStats(i);
 	}
 
-	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 14, Screen::CR_NO_P_CHECK);
 	_screen->copyPage(0, 7);
+	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 12, Screen::CR_NO_P_CHECK);
 	
 	_gui->runCampMenu();
 
-	_screen->copyRegion(0, 0, 0, 120, 176, 24, 14, 2, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(0, 0, 0, 120, 176, 24, 12, 2, Screen::CR_NO_P_CHECK);
 	_screen->setScreenDim(cd);
 	drawScene(0);
 
@@ -2250,7 +2250,7 @@ void GUI_Eob::runCampMenu() {
 					_vm->dropCharacter(selectCharacterDialogue(53));
 					_vm->gui_drawPlayField(false);
 					res = true;
-					_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 14, Screen::CR_NO_P_CHECK);
+					_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 12, Screen::CR_NO_P_CHECK);
 					_screen->setFont(Screen::FID_6_FNT);
 					_vm->gui_drawAllCharPortraitsWithStats();
 					_screen->setFont(Screen::FID_8_FNT);
@@ -2282,6 +2282,8 @@ void GUI_Eob::runCampMenu() {
 			default:
 				break;
 			}
+
+			lastMenu = -1;
 			
 		} else {
 			Common::Point p = _vm->getMousePos();
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index a83207b565..e3309f830d 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -208,8 +208,8 @@ int EobCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int sl
 	int itm = _characters[charIndex].inventory[slot];
 	int ex = _itemTypes[_items[itm].type].extraProperties & 0x7f;
 
-	if (slot < 2 && (_items[itm].flags & 0x20) && ex > 0 && ex < 4) {
-		if (_flags.gameID == GI_EOB2)
+	if (_items[itm].flags & 0x20 && (_flags.gameID == GI_EOB1 || slot < 2)) {
+		if (_flags.gameID == GI_EOB2 && ex > 0 && ex < 4)
 			_txt->printMessage(_validateCursedString[0], -1, _characters[charIndex].name);
 		return 0;
 	}
@@ -692,6 +692,9 @@ void EobCoreEngine::endObjectFlight(EobFlyingObject *fo) {
 }
 
 void EobCoreEngine::checkFlyingObjects() {
+	if (!_runFlag)
+		return;
+
 	for (int i = 0; i < 10; i++) {
 		EobFlyingObject *fo = &_flyingObjects[i];
 		if (!fo->enable)
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index 8ddba8607c..e75d621cc3 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -917,6 +917,7 @@ private:
 	uint8 *getLevelDecorationShapes(int index);
 	void restoreTempDataAdjustMonsterStrength(int index);
 	void loadBlockProperties(const char *cmzFile);
+	const uint8 *getBlockFileData(int levelIndex);
 	void loadLevelShpDat(const char *shpFile, const char *datFile, bool flag);
 	void loadLevelGraphics(const char *file, int specialColor, int weight, int vcnLen, int vmpLen, const char *palFile);
 
diff --git a/engines/kyra/loleobbase.h b/engines/kyra/loleobbase.h
index 02b236d44f..cb7f920cb8 100644
--- a/engines/kyra/loleobbase.h
+++ b/engines/kyra/loleobbase.h
@@ -147,6 +147,7 @@ protected:
 	virtual void drawSceneShapes(int start) = 0;
 	virtual void drawDecorations(int index) = 0;
 
+	virtual const uint8 *getBlockFileData(int levelIndex) = 0;
 	void setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim);
 	void scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim);
 	void drawLevelModifyScreenDim(int dim, int16 x1, int16 y1, int16 x2, int16 y2);
@@ -233,6 +234,7 @@ protected:
 	const uint8 *_dscTileIndex;
 
 	const uint8 *_dscDoorShpIndex;
+	int _dscDoorShpIndexSize;
 	const uint8 *_dscDoorY2;
 
 	// Script
@@ -308,7 +310,7 @@ protected:
 	virtual Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail) = 0;
 
 	void generateTempData();
-	void restoreBlockTempData(int levelIndex);
+	virtual void restoreBlockTempData(int levelIndex);
 	void releaseTempData();
 	virtual void *generateMonsterTempData(LevelTempData *tmp) = 0;
 	virtual void restoreMonsterTempData(LevelTempData *tmp) = 0;
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 0424558b04..9063d512f0 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -236,8 +236,14 @@ void EobCoreEngine::removeCharacterEffect(int spell, int charIndex, int showWarn
 	EobCharacter *c = &_characters[charIndex];
 	EobSpell *s = &_spells[spell];
 
-	if (showWarning)
+	if (showWarning) {
+		int od = _screen->curDimIndex();
+		Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
+		_screen->setScreenDim(7);
 		printWarning(Common::String::format(_magicStrings3[_flags.gameID == GI_EOB1 ? 3 : 2], c->name, s->name).c_str());
+		_screen->setScreenDim(od);
+		_screen->setFont(of);
+	}
 
 	if (s->endCallback)
 		(this->*s->endCallback)(c);
@@ -1281,12 +1287,12 @@ void EobCoreEngine::spellCallback_start_turnUndead() {
 	_preventMonsterFlash = false;
 }
 
-bool EobCoreEngine::spellCallback_end_lightningBoltPassive(void *obj) {
+bool EobCoreEngine::spellCallback_end_monster_lightningBolt(void *obj) {
 	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	return magicObjectDamageHit(fo, 0, 0, 12, 1);
 }
 
-bool EobCoreEngine::spellCallback_end_unk1Passive(void *obj) {
+bool EobCoreEngine::spellCallback_end_monster_fireball1(void *obj) {
 	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	bool res = false;
 	if (_partyEffectFlags & 0x20000) {
@@ -1301,12 +1307,12 @@ bool EobCoreEngine::spellCallback_end_unk1Passive(void *obj) {
 	return res;
 }
 
-bool EobCoreEngine::spellCallback_end_unk2Passive(void *obj) {
+bool EobCoreEngine::spellCallback_end_monster_fireball2(void *obj) {
 	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	return magicObjectDamageHit(fo, 0, 0, 18, 0);
 }
 
-bool EobCoreEngine::spellCallback_end_deathSpellPassive(void *obj) {
+bool EobCoreEngine::spellCallback_end_monster_deathSpell(void *obj) {
 	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
@@ -1323,7 +1329,7 @@ bool EobCoreEngine::spellCallback_end_deathSpellPassive(void *obj) {
 	return true;
 }
 
-bool EobCoreEngine::spellCallback_end_disintegratePassive(void *obj) {
+bool EobCoreEngine::spellCallback_end_monster_disintegrate(void *obj) {
 	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
@@ -1339,7 +1345,7 @@ bool EobCoreEngine::spellCallback_end_disintegratePassive(void *obj) {
 	return true;
 }
 
-bool EobCoreEngine::spellCallback_end_causeCriticalWoundsPassive(void *obj) {
+bool EobCoreEngine::spellCallback_end_monster_causeCriticalWounds(void *obj) {
 	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
@@ -1353,7 +1359,7 @@ bool EobCoreEngine::spellCallback_end_causeCriticalWoundsPassive(void *obj) {
 	return true;
 }
 
-bool EobCoreEngine::spellCallback_end_fleshToStonePassive(void *obj) {
+bool EobCoreEngine::spellCallback_end_monster_fleshToStone(void *obj) {
 	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 01fbd75cfe..49c6668abf 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -47,15 +47,7 @@ void LolEobBaseEngine::generateTempData() {
 	_lvlTempData[l]->wallsXorData = new uint8[4096];
 	_lvlTempData[l]->flags = new uint16[1024];
 
-	const uint8 *p = 0;
-	const uint8 *p2 = 0;
-	if (_flags.gameID == GI_LOL) {
-		screen()->loadBitmap(Common::String::format("LEVEL%d.CMZ", _currentLevel).c_str(), 15, 15, 0);
-		p = screen()->getCPagePtr(14);
-	} else {
-		p2 = p = _res->fileData(Common::String::format("LEVEL%d.MAZ", _currentLevel).c_str(), 0);
-	}
-
+	const uint8 *p = getBlockFileData(_currentLevel);
 	uint16 len = READ_LE_UINT16(p + 4);
 	p += 6;
 
@@ -75,20 +67,11 @@ void LolEobBaseEngine::generateTempData() {
 	_lvlTempData[l]->wallsOfForce = generateWallOfForceTempData(_lvlTempData[l]);
 
 	_hasTempDataFlags |= (1 << l);
-	delete[] p2;
 }
 
 void LolEobBaseEngine::restoreBlockTempData(int levelIndex) {
 	int l = levelIndex - 1;
-	const uint8 *p = 0;
-	const uint8 *p2 = 0;
-	if (_flags.gameID == GI_LOL) {
-		screen()->loadBitmap(Common::String::format("LEVEL%d.CMZ", levelIndex).c_str(), 3, 3, 0);
-		p = screen()->getCPagePtr(2);
-	} else {
-		p2 = p = _res->fileData(Common::String::format("LEVEL%d.MAZ", levelIndex).c_str(), 0);
-	}
-
+	const uint8 *p = getBlockFileData(levelIndex);
 	uint16 len = READ_LE_UINT16(p + 4);
 	p += 6;
 
@@ -106,8 +89,6 @@ void LolEobBaseEngine::restoreBlockTempData(int levelIndex) {
 	restoreMonsterTempData(_lvlTempData[l]);
 	restoreFlyingObjectTempData(_lvlTempData[l]);
 	restoreWallOfForceTempData(_lvlTempData[l]);
-
-	delete[] p2;
 }
 
 void LolEobBaseEngine::releaseTempData() {
@@ -144,7 +125,14 @@ void LolEobBaseEngine::releaseFlyingObjectTempData(LevelTempData *tmp) {
 #ifdef ENABLE_EOB
 
 Common::Error EobCoreEngine::loadGameState(int slot) {
-	const char *fileName = getSavegameFilename(slot);
+	const char *fileName = 0;
+
+	if (slot == -1) {
+		_savegameFilename = /*_targetName + */Common::String("eob.fin");
+		fileName = _savegameFilename.c_str();
+	} else {
+		fileName = getSavegameFilename(slot);
+	}
 
 	SaveHeader header;
 	Common::InSaveFile *saveFile = openSaveForReading(fileName, header);
@@ -388,7 +376,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 		useMagicBookOrSymbol(_openBookChar, _openBookType);
 	}
 
-	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 14, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 12, Screen::CR_NO_P_CHECK);
 
 	gui_toggleButtons();
 	setHandItem(_itemInHand);
@@ -404,8 +392,18 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 }
 
 Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail) {
-	const Common::String finSuffix(".FIN");
-	const char *fileName = (slot != -1) ? getSavegameFilename(slot) : (_targetName + finSuffix).c_str();
+	Common::String saveNameTmp;
+	const char *fileName = 0;
+
+	if (slot == -1) {
+		_savegameFilename = _targetName + Common::String(".fin");
+		fileName = _savegameFilename.c_str();
+		saveNameTmp = _targetName + Common::String(" final");
+		saveNameTmp.toUppercase();
+		saveName = saveNameTmp.c_str();
+	} else {
+		fileName = getSavegameFilename(slot);
+	}
 
 	Common::OutSaveFile *out = openSaveForWriting(fileName, saveName, thumbnail);
 	if (!out)
@@ -525,7 +523,7 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 		LevelTempData *l = _lvlTempData[i];
 		if (!l || !(_hasTempDataFlags & (1 << i)))
 			continue;
-
+	
 		out->write(l->wallsXorData, 4096);
 		for (int ii = 0; ii < 1024; ii++)
 			out->writeByte(l->flags[ii] & 0xff);
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 98cd60dcd9..5f06139f3f 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -863,23 +863,31 @@ void EobCoreEngine::loadVcnData(const char *file, const char*/*nextFile*/) {
 
 void EobCoreEngine::loadBlockProperties(const char *mazFile) {
 	memset(_levelBlockProperties, 0, 1024 * sizeof(LevelBlockProperty));
-	Common::SeekableReadStream *s = _res->createReadStream(mazFile);
-	_screen->loadFileDataToPage(s, 2, 4096);
-	delete s;
+	const uint8 *p = getBlockFileData(mazFile) + 6;
 
 	if (_hasTempDataFlags & (1 << (_currentLevel - 1))) {
 		restoreBlockTempData(_currentLevel);
 		return;
 	}
 
-	const uint8 *p = _screen->getCPagePtr(2) + 6;
-
 	for (int i = 0; i < 1024; i++) {
 		for (int ii = 0; ii < 4; ii++)
 			_levelBlockProperties[i].walls[ii] = *p++;
 	}
 }
 
+const uint8 *EobCoreEngine::getBlockFileData(int) {
+	Common::SeekableReadStream *s = _res->createReadStream(_curBlockFile);
+	_screen->loadFileDataToPage(s, 15, s->size());
+	delete s;
+	return _screen->getCPagePtr(14);
+}
+
+const uint8 *EobCoreEngine::getBlockFileData(const char *mazFile) {
+	_curBlockFile = mazFile;
+	return getBlockFileData(0);
+}
+
 void EobCoreEngine::loadDecorations(const char *cpsFile, const char *decFile) {
 	_screen->loadShapeSetBitmap(cpsFile, 3, 3);
 	Common::SeekableReadStream *s = _res->createReadStream(decFile);
@@ -919,6 +927,12 @@ void EobCoreEngine::loadDecorations(const char *cpsFile, const char *decFile) {
 
 void EobCoreEngine::assignWallsAndDecorations(int wallIndex, int vmpIndex, int decIndex, int specialType, int flags) {
 	_wllVmpMap[wallIndex] = vmpIndex;
+	for (int i = 0; i < 6; i++) {
+		for (int ii = 0; ii < 10; ii++) {
+			if (_characters[i].events[ii] == -57)
+				spellCallback_start_trueSeeing();
+		}
+	}
 	_wllShapeMap[wallIndex] = _mappedDecorationsCount + 1;
 	_specialWallTypes[wallIndex] = specialType;
 	_wllWallFlags[wallIndex] = flags ^ 4;
@@ -1145,8 +1159,7 @@ int EobCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint1
 	int w = _levelBlockProperties[b].walls[direction ^ 2];
 	int f = _wllWallFlags[w];
 
-	//if (!f)
-		assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80));
+	assert((_flags.gameID == GI_EOB1 && w < 70) || (_flags.gameID == GI_EOB2 && w < 80));
 
 	if (_flags.gameID == GI_EOB2 && w == 74 && _currentBlock == curBlock) {
 		for (int i = 0; i < 5; i++) {
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index 998fb73364..d28477b148 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -252,6 +252,11 @@ void LoLEngine::loadBlockProperties(const char *cmzFile) {
 	}
 }
 
+const uint8 *LoLEngine::getBlockFileData(int levelIndex) {
+	_screen->loadBitmap(Common::String::format("LEVEL%d.CMZ", levelIndex).c_str(), 15, 15, 0);
+	return screen()->getCPagePtr(14);
+}
+
 void LoLEngine::loadLevelShpDat(const char *shpFile, const char *datFile, bool flag) {
 	memset(_tempBuffer5120, 0, 5120);
 
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 9c67750ba8..4161c757d8 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -769,7 +769,6 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepS
 	for (int l = 2; l;) {
 		if (l != 2) {
 			for (int i = numElements - 1; i >= 0; i--) {
-				uint32 end = _system->getMillis() + 1;
 				int16 px = ((ptr2[i] >> 6) >> scale) + gx2;
 				int16 py = ((ptr3[i] >> 6) >> scale) + gy2;
 				if (py > ymax)
@@ -902,7 +901,6 @@ void Screen_Eob::drawVortex(int numElements, int radius, int stepSize, int, int
 	int d = 0;
 	for (int i = 2; i; ) {
 		if (i != 2) {
-			uint32 nextDelay = _system->getMillis() + 1;
 			for (int ii = numElements - 1; ii >= 0; ii--) {
 				int16 px = CLIP((xCoords[ii] >> 6) + cx, 0, SCREEN_W - 1);
 				int16 py = CLIP((yCoords[ii] >> 6) + cy, 0, SCREEN_H - 1);
@@ -912,7 +910,7 @@ void Screen_Eob::drawVortex(int numElements, int radius, int stepSize, int, int
 
 		i = 0;
 		int r = (stepSize >> 1) + (stepSize >> 2) + (stepSize >> 3);
-		uint32 nextDelay2 = _system->getMillis() + 1;
+		uint32 nextDelay = _system->getMillis() + 1;
 
 		for (int ii = 0; ii < numElements; ii++) {
 			if (pixDelay[ii] == 0) {
@@ -951,9 +949,9 @@ void Screen_Eob::drawVortex(int numElements, int radius, int stepSize, int, int
 					if (ii % 15 == 0)  {
 						updateScreen();
 						uint32 cur = _system->getMillis();
-						if (nextDelay2 > cur)
-							_system->delayMillis(nextDelay2 - cur);
-						nextDelay2 += 1;
+						if (nextDelay > cur)
+							_system->delayMillis(nextDelay - cur);
+						nextDelay += 1;
 					}
 				}
 			} else {
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index 1dbb02414f..6522731751 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -89,8 +89,8 @@ void EobCoreEngine::updateScriptTimers() {
 EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _vm(engine), _screen(screen),
 	_commandMin(engine->game() == GI_EOB1 ? -27 : -31) {
 
-#define Opcode(x) _opcodes.push_back(new InfProc(this, &EobInfProcessor::x))
-#define OpcodeAlt(x) if (_vm->game() == GI_EOB1) Opcode(x##_v1); else Opcode(x##_v2);
+#define Opcode(x) _opcodes.push_back(new InfOpcode(new InfProc(this, &EobInfProcessor::x), #x))
+#define OpcodeAlt(x) if (_vm->game() == GI_EOB1) { Opcode(x##_v1); } else { Opcode(x##_v2); }
 	Opcode(oeob_setWallType);
 	Opcode(oeob_toggleWallState);
 	Opcode(oeob_openDoor);
@@ -157,8 +157,10 @@ EobInfProcessor::~EobInfProcessor() {
 	delete[] _flagTable;
 	delete[] _stack;
 	delete[] _scriptData;
-	for (Common::Array<const InfProc*>::const_iterator a = _opcodes.begin(); a != _opcodes.end(); ++a)
+	for (Common::Array<const InfOpcode*>::const_iterator a = _opcodes.begin(); a != _opcodes.end(); ++a) {
+		delete (*a)->proc;
 		delete *a;
+	}
 	_opcodes.clear();
 }
 
@@ -196,7 +198,8 @@ void EobInfProcessor::run(int func, int sub) {
 		int8 cmd = *pos++;
 		if (cmd <= _commandMin || cmd >= 0)
 			continue;
-		pos += (*_opcodes[-(cmd + 1)])(pos);
+		debugC(5, kDebugLevelScript, "[0x%.08X] EobInfProcessor::%s()", (uint32)(pos - _scriptData), _opcodes[-(cmd + 1)]->desc.c_str());
+		pos += (*_opcodes[-(cmd + 1)]->proc)(pos);
 	} while (!_abortScript && !_abortAfterSubroutine);
 }
 
diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h
index 8f44c7f6f9..f7e5f09379 100644
--- a/engines/kyra/script_eob.h
+++ b/engines/kyra/script_eob.h
@@ -91,7 +91,12 @@ private:
 	Screen_Eob *_screen;
 
 	typedef Common::Functor1Mem<int8*, int, EobInfProcessor> InfProc;
-	Common::Array<const InfProc*> _opcodes;
+	struct InfOpcode {
+		InfOpcode(InfProc *p, const char *d) : proc(p), desc(d) {}
+		InfProc *proc;
+		Common::String desc;
+	};
+	Common::Array<const InfOpcode*> _opcodes;
 
 	int8 *_scriptData;
 	uint16 _scriptSize;
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
index dcf293bd52..37aca45237 100644
--- a/engines/kyra/sequences_eob2.cpp
+++ b/engines/kyra/sequences_eob2.cpp
@@ -466,6 +466,7 @@ void DarkMoonEngine::seq_playFinale() {
 	DarkmoonSequenceHelper sq(_system, this, _screen, DarkmoonSequenceHelper::kFinale, _finaleStrings, _cpsFilesFinale, _palFilesFinale, _shapesFinale, _seqFinale);
 
 	_screen->setCurPage(0);
+	_screen->setFont(Screen::FID_8_FNT);
 
 	_sound->loadSoundFile("FINALE1");
 	_sound->playTrack(0);
@@ -936,10 +937,11 @@ DarkmoonSequenceHelper::DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *
 	_fadePalRate = 0;
 
 	_screen->setScreenPalette(*_palettes[0]);
+	_screen->setFont(Screen::FID_8_FNT);
 	_screen->hideMouse();
 
-	_system->delayMillis(150);
-	_vm->resetSkipFlag(true);
+	_vm->delay(150);
+	_vm->_eventList.clear();
 	_vm->_allowSkip = true;
 }
 
@@ -1274,7 +1276,7 @@ void DarkmoonSequenceHelper::waitForSongNotifier(int index, bool introUpdateAnim
 
 void DarkMoonEngine::seq_nightmare() {
 	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
-	_screen->copyRegion(0, 0, 0, 120, 176, 24, 14, 2, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(0, 0, 0, 120, 176, 24, 12, 2, Screen::CR_NO_P_CHECK);
 
 	initDialogueSequence();
 	gui_drawDialogueBox();
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index bd5ab27ead..eca053017c 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -471,7 +471,8 @@ void EobCoreEngine::drawDoor(int index) {
 	if (_flags.gameID == GI_EOB1 && s == 0x85)
 		s = 0;
 
-	assert((_flags.gameID == GI_EOB1 && s < 32) || (_flags.gameID == GI_EOB2 && s < 53));
+	if (s >= _dscDoorShpIndexSize)
+		return;
 
 	int type = _dscDoorShpIndex[s];
 	int d = _dscDimMap[index];
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 274feba4fa..4ff879c69c 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -254,7 +254,7 @@ void LolEobBaseEngine::initStaticResource() {
 	_dscBlockMap = _staticres->loadRawData(kLolEobCommonDscBlockMap, temp);
 	_dscBlockIndex = (const int8 *)_staticres->loadRawData(kLolEobCommonDscBlockIndex, temp);
 	_dscDimMap = _staticres->loadRawData(kLolEobCommonDscDimMap, temp);
-	_dscDoorShpIndex = _staticres->loadRawData(kLolEobCommonDscDoorShapeIndex, temp);
+	_dscDoorShpIndex = _staticres->loadRawData(kLolEobCommonDscDoorShapeIndex, _dscDoorShpIndexSize);
 	_dscDoorY2 = _staticres->loadRawData(kLolEobCommonDscDoorY2, temp);
 	_moreStrings = _staticres->loadStrings(kLolEobCommonMoreStrings, temp);
 }
@@ -1010,14 +1010,14 @@ void EobCoreEngine::initSpells() {
 	ec2(empty);
 	ec(empty);
 	ec2(empty);
-	ec1(lightningBoltPassive);
-	ec2(unk1Passive);
+	ec1(monster_lightningBolt);
+	ec2(monster_fireball1);
 	ec2(empty);
-	ec2(unk2Passive);
-	ec(deathSpellPassive);
-	ec(disintegratePassive);
-	ec2(causeCriticalWoundsPassive);
-	ec2(fleshToStonePassive);
+	ec2(monster_fireball2);
+	ec(monster_deathSpell);
+	ec(monster_disintegrate);
+	ec2(monster_causeCriticalWounds);
+	ec2(monster_fleshToStone);
 
 	_spells = new EobSpell[_numSpells];
 	memset(_spells, 0, _numSpells * sizeof(EobSpell));	
diff --git a/engines/kyra/text_eob.cpp b/engines/kyra/text_eob.cpp
index a2cc5c6e00..0fe01df770 100644
--- a/engines/kyra/text_eob.cpp
+++ b/engines/kyra/text_eob.cpp
@@ -619,6 +619,7 @@ void TextDisplayer_Eob::textPageBreak() {
 		screen()->fillRect(x, y, x + w - 1, y + 8, _textDimData[screen()->curDimIndex()].color2);
 
 	clearCurDim();
+	_screen->updateScreen();
 
 	if (vm()->game() == GI_LOL)
 		vm()->_timer->pauseSingleTimer(11, false);
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index f36688df39..277e04e769 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -390,6 +390,7 @@ void EobCoreEngine::timerUpdateTeleporters(int timerNum) {
 
 void EobCoreEngine::timerUpdateFoodStatus(int timerNum) {
 	for (int i = 0; i < 6; i++) {
+		// Ring of Sustenance check
 		if (checkInventoryForRings(i, 2))
 			continue;
 		EobCharacter *c = &_characters[i];
-- 
cgit v1.2.3


From 816b40ebf8c653f4c3f898ae4697ea85f5fe015f Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 6 Nov 2011 17:53:52 +0100
Subject: KYRA: (EOB) - add debugger, etc.

- add basic debugger support
- fix several minor bugs
---
 engines/kyra/chargen.cpp        | 39 +++++++++++--------
 engines/kyra/debugger.cpp       |  6 +++
 engines/kyra/debugger.h         | 12 ++++++
 engines/kyra/eob1.h             |  2 +-
 engines/kyra/eob2.cpp           |  2 +-
 engines/kyra/eobcommon.cpp      | 19 +++++++++-
 engines/kyra/eobcommon.h        |  1 +
 engines/kyra/items_eob.cpp      |  2 +-
 engines/kyra/saveload_eob.cpp   |  6 ++-
 engines/kyra/scene_eob.cpp      |  8 +---
 engines/kyra/script_eob.cpp     | 83 +++++++++++++++++++++++++++++++++--------
 engines/kyra/script_eob.h       |  4 +-
 engines/kyra/sequences_eob1.cpp | 36 ++++++++++++------
 engines/kyra/sequences_eob2.cpp | 10 ++---
 engines/kyra/sound_lol.cpp      |  6 +--
 engines/kyra/sprites_eob.cpp    |  4 +-
 engines/kyra/timer_eob.cpp      |  9 ++++-
 17 files changed, 179 insertions(+), 70 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 7516916f67..0e38ffec3d 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -47,6 +47,7 @@ private:
 	int raceSexMenu();
 	int classMenu(int raceSex);
 	int alignmentMenu(int cClass);
+	int getInput(Button *buttonList);
 	void updateMagicShapes();
 	void generateStats(int index);
 	void modifyMenu();
@@ -153,8 +154,7 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 	_characters = characters;
 	_faceShapes = *faceShapes;
 
-	_vm->sound()->playTrack(0);
-
+	_vm->snd_stopSound();
 	_vm->delay(_vm->_tickLength);
 
 	init();
@@ -169,8 +169,7 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 
 	for (bool loop = true; loop && (!_vm->shouldQuit()); ) {
 		_vm->_gui->updateBoxFrameHighLight(_activeBox + 6);
-		_vm->sound()->process();
-		int inputFlag = _vm->checkInput(_vm->_activeButtons, false, 0);
+		int inputFlag = getInput(_vm->_activeButtons);		
 		_vm->removeInputTop();
 
 		if (inputFlag) {
@@ -381,9 +380,7 @@ int CharacterGenerator::viewDeleteCharacter() {
 	int res = 0;
 	for (bool loop = true; loop && _characters[_activeBox].name[0] && !_vm->shouldQuit(); ) {
 		_vm->_gui->updateBoxFrameHighLight(_activeBox + 6);
-		_vm->sound()->process();
-
-		int inputFlag = _vm->checkInput(_vm->_activeButtons, false, 0);
+		int inputFlag =getInput(_vm->_activeButtons);
 		int cbx = _activeBox;
 		_vm->removeInputTop();
 
@@ -520,8 +517,7 @@ int CharacterGenerator::classMenu(int raceSex) {
 
 	while (res == -1 && !_vm->shouldQuit()) {
 		updateMagicShapes();
-
-		int in = _vm->checkInput(0, false, 0) & 0xff;
+		int in = getInput(_vm->_activeButtons) & 0xff;
 		Common::Point mp = _vm->getMousePos();
 
 		if (in == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_b]) {
@@ -569,8 +565,7 @@ int CharacterGenerator::alignmentMenu(int cClass) {
 
 	while (res == -1 && !_vm->shouldQuit()) {
 		updateMagicShapes();
-
-		int in = _vm->checkInput(0, false, 0) & 0xff;
+		int in = getInput(_vm->_activeButtons) & 0xff;
 		Common::Point mp = _vm->getMousePos();
 
 		if (in == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_b]) {
@@ -593,9 +588,21 @@ int CharacterGenerator::alignmentMenu(int cClass) {
 	return res;
 }
 
-void CharacterGenerator::updateMagicShapes() {
-	_vm->sound()->process();
+int CharacterGenerator::getInput(Button *buttonList) {
+	if (_vm->game() == GI_EOB1 && _vm->sound()->checkTrigger()) {
+		_vm->sound()->resetTrigger();
+		_vm->sound()->playTrack(20);
+	// WORKAROUND for EOB II: The original implements the same sound trigger check as in EOB I.
+	// However, Westwood seems to have forgotten to set the trigger at the end of the AdLib song,
+	// so that the music will not loop. We simply check whether the sound driver is still playing.
+	} else if (_vm->game() == GI_EOB2 && !_vm->sound()->isPlaying()) {
+		_vm->delay(3 * _vm->_tickLength);
+		_vm->sound()->playTrack(13);
+	}
+	return _vm->checkInput(buttonList, false, 0);
+}
 
+void CharacterGenerator::updateMagicShapes() {
 	if (_magicShapesBox != _activeBox) {
 		_chargenMagicShapeTimer = 0;
 		_magicShapesBox = _activeBox;
@@ -719,7 +726,7 @@ void CharacterGenerator::statsAndFacesMenu() {
 
 	while (!in && !_vm->shouldQuit()) {
 		updateMagicShapes();
-		in = _vm->checkInput(_vm->_activeButtons, false, 0);
+		in = getInput(_vm->_activeButtons);
 		_vm->removeInputTop();
 
 		if (in == 0x8001) {
@@ -786,7 +793,7 @@ void CharacterGenerator::faceSelectMenu() {
 
 		while (!in && !_vm->shouldQuit()) {
 			updateMagicShapes();
-			in = _vm->checkInput(_vm->_activeButtons, false, 0);
+			in = getInput(_vm->_activeButtons);
 			_vm->removeInputTop();
 
 			_vm->_gui->updateBoxFrameHighLight(box + 10);
@@ -978,7 +985,7 @@ int CharacterGenerator::modifyStat(int index, int8 *stat1, int8 *stat2) {
 	for (bool loop = true; loop && !_vm->shouldQuit(); ) {
 		uint8 v1 = *s1;
 		updateMagicShapes();
-		int	inputFlag = _vm->checkInput(_vm->_activeButtons, false, 0);
+		int	inputFlag = getInput(_vm->_activeButtons);
 		_vm->removeInputTop();
 
 		if (inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_MINUS] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP_MINUS] || inputFlag == 0x8009) {
diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index 35b4d8ba7f..6a4b88c77a 100644
--- a/engines/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
@@ -26,6 +26,7 @@
 #include "kyra/timer.h"
 #include "kyra/resource.h"
 #include "kyra/lol.h"
+#include "kyra/eobcommon.h"
 
 #include "common/system.h"
 
@@ -470,4 +471,9 @@ Debugger_LoL::Debugger_LoL(LoLEngine *vm) : Debugger(vm), _vm(vm) {
 }
 #endif // ENABLE_LOL
 
+#ifdef ENABLE_EOB
+Debugger_Eob::Debugger_Eob(EobCoreEngine *vm) : Debugger(vm), _vm(vm) {
+}
+#endif // ENABLE_EOB
+
 } // End of namespace Kyra
diff --git a/engines/kyra/debugger.h b/engines/kyra/debugger.h
index e9c0a6a98a..1bd8363612 100644
--- a/engines/kyra/debugger.h
+++ b/engines/kyra/debugger.h
@@ -108,6 +108,18 @@ protected:
 };
 #endif // ENABLE_LOL
 
+#ifdef ENABLE_EOB
+class EobCoreEngine;
+
+class Debugger_Eob : public Debugger {
+public:
+	Debugger_Eob(EobCoreEngine *vm);
+
+protected:
+	EobCoreEngine *_vm;
+};
+#endif // ENABLE_EOB
+
 } // End of namespace Kyra
 
 #endif
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
index 227db4f916..8811d7d92a 100644
--- a/engines/kyra/eob1.h
+++ b/engines/kyra/eob1.h
@@ -65,8 +65,8 @@ private:
 
 	void seq_xdeath();
 
+	void loadSetIntroPalette(const char *filename);
 	void copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step);
-
 	void boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH);
 	void whirlTransition();
 	
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index d9aad0ce3d..f309fae2aa 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -115,7 +115,7 @@ void DarkMoonEngine::runNpcDialogue(int npcIndex) {
 		int r = runDialogue(-1, 0, _npc1Strings[0], _npc1Strings[1], 0) - 1;
 
 		if (r == 0) {
-			_sound->playTrack(0);
+			snd_stopSound();
 			delay(3 * _tickLength);
 			snd_playSoundEffect(91);
 			npcJoinDialogue(1, 5, 6, 7);
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index fbd8ef62e1..802907eba5 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -27,6 +27,7 @@
 #include "kyra/sound_intern.h"
 #include "kyra/script_eob.h"
 #include "kyra/timer.h"
+#include "kyra/debugger.h"
 
 #include "common/config-manager.h"
 
@@ -40,6 +41,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_teleporterWallId(flags.gameID == GI_EOB1 ? 52 : 44) {
 	_screen = 0;
 	_gui = 0;
+	_debugger = 0;
 
 	_playFinale = false;
 	_runFlag = true;
@@ -220,8 +222,11 @@ EobCoreEngine::~EobCoreEngine() {
 	_menuDefs = 0;
 
 	delete _inf;
+	_inf = 0;
 	delete _timer;
 	_timer = 0;
+	delete _debugger;
+	_debugger = 0;
 }
 
 Common::Error EobCoreEngine::init() {
@@ -241,6 +246,7 @@ Common::Error EobCoreEngine::init() {
 
 	//MidiDriverType midiDriver = MidiDriver::detectDevice(MDT_PCSPK | MDT_ADLIB);
 	_sound = new SoundAdLibPC(this, _mixer);
+	_sound->init();
 	assert(_sound);
 
 	if (_sound)
@@ -266,8 +272,13 @@ Common::Error EobCoreEngine::init() {
 
 	setupKeyMap();
 	_gui = new GUI_Eob(this);
+	assert(_gui);
 	_txt = new TextDisplayer_Eob(this, _screen);
+	assert(_txt);
 	_inf = new EobInfProcessor(this, _screen);
+	assert(_inf);
+	_debugger = new Debugger_Eob(this);
+	assert(_debugger);
 
 	_screen->loadFont(Screen::FID_6_FNT, "FONT6.FNT");
 	_screen->loadFont(Screen::FID_8_FNT, "FONT8.FNT");
@@ -682,7 +693,7 @@ void EobCoreEngine::setHandItem(Item itemIndex) {
 	int icon = _items[_itemInHand].icon;
 	const uint8 *shp = _itemIconShapes[icon];
 
-	if (icon && (_items[_itemInHand].flags & 0x80) && ((_flags.gameID == GI_EOB2 && (_partyEffectFlags & 2)) || (_flags.gameID == GI_EOB1 && (_partyEffectFlags & 0x10000)))) {
+	if (icon && (_items[_itemInHand].flags & 0x80) && (_partyEffectFlags & 2)) {
 		memcpy(_tempIconShape, shp, 300);
 		if (_flags.gameID == GI_EOB1)
 			_screen->replaceShapePalette(_tempIconShape, &_itemsOverlay[icon << 4]);
@@ -1246,7 +1257,7 @@ void EobCoreEngine::initDialogueSequence() {
 	gui_updateControls();
 	//_allowSkip = true;
 
-	_sound->playTrack(0);
+	snd_stopSound();
 	Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
 	_screen->loadFileDataToPage(s, 5, 32000);
 	_txt->setupField(9, 0);
@@ -2246,6 +2257,10 @@ void EobCoreEngine::snd_playSoundEffect(int id, int volume) {
 	_sound->playSoundEffect(id, volume);
 }
 
+void EobCoreEngine::snd_stopSound() {
+	_sound->playSoundEffect(0);
+}
+
 }	// End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 7ab933390e..fcfc29f766 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -1139,6 +1139,7 @@ protected:
 
 	// sound
 	void snd_playSoundEffect(int id, int volume=0xFF);
+	void snd_stopSound();
 };
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index e3309f830d..96b19a9f93 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -303,7 +303,7 @@ int EobCoreEngine::countQueuedItems(Item itemQueue, int16 id, int16 type, int co
 		EobItem *itm = &_items[o1];
 		forceLoop = false;
 		if (id != -1 || type != -1) {
-			if (((id != -1 ) || (id == -1 && type != itm->type)) && ((type != -1) || (type == -1 && id != o1)))
+			if (((id != -1) || (id == -1 && type != itm->type)) && ((type != -1) || (type == -1 && id != o1)))
 				continue;			
 		}
 
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 49c6668abf..07841be1e4 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -411,9 +411,13 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 
 	completeDoorOperations();
 	generateTempData();
+	advanceTimers(_restPartyElapsedTime);
+	_restPartyElapsedTime = 0;
 
-	for (int i = 0; i < 6; i++) {
+	for (int i = 0; i < 6; i++)
 		timerSpecialCharacterUpdate(0x30 + i);
+
+	for (int i = 0; i < 6; i++) {
 		EobCharacter *c = &_characters[i];
 
 		out->writeByte(c->id);
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 5f06139f3f..cf20429e2c 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -708,8 +708,6 @@ Common::String EobCoreEngine::initLevelData(int sub){
 
 	int slen = (_flags.gameID == GI_EOB1) ? 12 : 13;
 
-	_sound->playTrack(0);
-
 	for (int i = 0; i < sub; i++)
 		pos = data + READ_LE_UINT16(pos);
 
@@ -762,7 +760,7 @@ Common::String EobCoreEngine::initLevelData(int sub){
 	}
 
 	if (_flags.gameID == GI_EOB2) {
-		delay(_tickLength);
+		delay(3 * _tickLength);
 		_sound->loadSoundFile((const char*) pos);
 		pos += 13;
 	}
@@ -1029,10 +1027,8 @@ void EobCoreEngine::drawScene(int refresh) {
 		}
 	}
 
-	if (_sceneDefaultUpdate) {
+	if (_sceneDefaultUpdate)
 		delayUntil(_drawSceneTimer);
-		removeInputTop();
-	}
 
 	if (refresh && !_partyResting)
 		_screen->copyRegion(0, 0, 0, 0, 176, 120, 2, 0, Screen::CR_NO_P_CHECK);
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index 6522731751..e85b1dc11a 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -133,7 +133,7 @@ EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _v
 	_preventRest = 0;
 
 	_lastScriptFunc = 0;
-	_lastScriptSub = 0;
+	_lastScriptFlags = 0;
 
 	_subroutineStack = new int8*[10];
 	memset(_subroutineStack, 0, 10 * sizeof(int8*));
@@ -171,7 +171,7 @@ void EobInfProcessor::loadData(const uint8 *data, uint32 dataSize) {
 	memcpy(_scriptData, data, _scriptSize);
 }
 
-void EobInfProcessor::run(int func, int sub) {
+void EobInfProcessor::run(int func, int flags) {
 	int o = _vm->_levelBlockProperties[func].assignedObjects;
 	if (!o)
 		return;
@@ -179,7 +179,7 @@ void EobInfProcessor::run(int func, int sub) {
 	uint16 f = _vm->_levelBlockProperties[func].flags;
 
 	uint16 subFlags = ((f & 0xfff8) >> 3) | 0xe0;
-	if (!(sub & subFlags))
+	if (!(flags & subFlags))
 		return;
 
 	_abortScript = 0;
@@ -188,9 +188,7 @@ void EobInfProcessor::run(int func, int sub) {
 	_activeCharacter = -1;
 
 	_lastScriptFunc = func;
-	_lastScriptSub = sub;
-
-	_vm->resetSkipFlag(true);
+	_lastScriptFlags = flags;
 
 	int8 *pos = (int8*)(_scriptData + o);
 
@@ -198,7 +196,7 @@ void EobInfProcessor::run(int func, int sub) {
 		int8 cmd = *pos++;
 		if (cmd <= _commandMin || cmd >= 0)
 			continue;
-		debugC(5, kDebugLevelScript, "[0x%.08X] EobInfProcessor::%s()", (uint32)(pos - _scriptData), _opcodes[-(cmd + 1)]->desc.c_str());
+		debugC(3, kDebugLevelScript, "[0x%.04X] EobInfProcessor::%s()", (uint32)(pos - _scriptData), _opcodes[-(cmd + 1)]->desc.c_str());
 		pos += (*_opcodes[-(cmd + 1)]->proc)(pos);
 	} while (!_abortScript && !_abortAfterSubroutine);
 }
@@ -379,21 +377,23 @@ int EobInfProcessor::oeob_movePartyOrObject(int8 *data) {
 				continue;
 			_vm->placeMonster(&_vm->_monsters[i], d, _vm->_monsters[i].pos);
 		}
+		debugC(5, kDebugLevelScript, "         - move monsters on block '0x%.04X' to block '0x%.04X'", c, d);
 
 	} else if (a == -24) {
 		// move party to block d
 		int ba = _dlgResult;
 		int bb = _lastScriptFunc;
-		int bc = _lastScriptSub;
+		int bc = _lastScriptFlags;
 		int bd = _abortScript;
 		int be = _activeCharacter;
 		int bf = _subroutineStackPos;
 
 		_vm->moveParty(d);
+		debugC(5, kDebugLevelScript, "         - move party to block '0x%.04X'", d);
 
 		_dlgResult = ba;
 		_lastScriptFunc = bb;
-		_lastScriptSub = bc;
+		_lastScriptFlags = bc;
 		_abortScript = bd;
 		_activeCharacter = be;
 		if (!_abortAfterSubroutine)
@@ -447,6 +447,7 @@ int EobInfProcessor::oeob_movePartyOrObject(int8 *data) {
 				_vm->_items[i].block = d;
 			}
 		}
+		debugC(5, kDebugLevelScript, "         - move items from level '%d', block '0x%.04X' to level '%d', block '0x%.04X'", c, e, d, f);
 	}
 
 	_vm->_sceneUpdateRequired = true;
@@ -550,24 +551,29 @@ int EobInfProcessor::oeob_setFlags(int8 *data) {
 	switch (*pos++) {
 	case -47:
 		_preventRest = 0;
+		debugC(5, kDebugLevelScript, "         - set preventRest to 0");
 		break;
 
 	case -28:
 		_dlgResult = 1;
+		debugC(5, kDebugLevelScript, "         - set dlgResult to 1");
 		break;
 
 	case -17:
 		_flagTable[_vm->_currentLevel] |= (1 << (*pos++));
+		debugC(5, kDebugLevelScript, "         - set level flag '%d' for current level (current level = '%d')", *(pos - 1), _vm->_currentLevel);
 		break;
 
 	case -16:
 		_flagTable[17] |= (1 << (*pos++));
+		debugC(5, kDebugLevelScript, "         - set global flag '%d'", *(pos - 1));
 		break;
 
 	case -13:
 		b = *pos++;
 		_vm->_monsters[b].flags |= (1 << (*pos++));
 		_vm->_monsters[b].mode = 0;
+		debugC(5, kDebugLevelScript, "         - set monster flag '%d' for monster '%d'", *(pos - 1), b);
 		break;
 
 	default:
@@ -598,18 +604,22 @@ int EobInfProcessor::oeob_removeFlags(int8 *data) {
 	switch (a) {
 	case -47:
 		_preventRest = 1;
+		debugC(5, kDebugLevelScript, "         - set preventRest to 1");
 		break;
 
 	case -28:
 		_dlgResult = 0;
+		debugC(5, kDebugLevelScript, "         - set dlgResult to 0");
 		break;
 
 	case -17:
 		_flagTable[_vm->_currentLevel] &= ~(1 << (*pos++));
+		debugC(5, kDebugLevelScript, "         - clear level flag '%d' for current level (current level = '%d')", *(pos - 1), _vm->_currentLevel);
 		break;
 
 	case -16:
 		_flagTable[17] &= ~(1 << (*pos++));
+		debugC(5, kDebugLevelScript, "         - clear global flag '%d'", *(pos - 1));
 		break;
 
 	default:
@@ -724,10 +734,12 @@ int EobInfProcessor::oeob_eval_v1(int8 *data) {
 				break;
 			}
 			_stack[_stackIndex++] = a;
+			debugC(5, kDebugLevelScript, "         - check if whole party is invisible - PUSH result: '%d'", a);
 			break;
 
-		case 1:
+		case 1:			
 			_stack[_stackIndex++] = _vm->rollDice(pos[0], pos[1], pos[2]);
+			debugC(9, kDebugLevelScript, "         - throw dice(s): num = '%d', pips = '%d', offset = '%d' - PUSH result: '%d'", pos[0], pos[1], pos[2], _stack[_stackIndex - 1]);
 			pos += 3;
 			break;
 
@@ -743,6 +755,7 @@ int EobInfProcessor::oeob_eval_v1(int8 *data) {
 				}
 			}
 			_stack[_stackIndex++] = b;
+			debugC(5, kDebugLevelScript, "         - check if character with class flags '0x%.02X' is present - PUSH result: '%d'", cmd, b);
 			break;
 
 		case 3:
@@ -757,10 +770,12 @@ int EobInfProcessor::oeob_eval_v1(int8 *data) {
 				}
 			}
 			_stack[_stackIndex++] = b;
+			debugC(5, kDebugLevelScript, "         - check if character with race '%d' is present - PUSH result: '%d'", cmd, b);
 			break;
 
 		case 6:
-			_stack[_stackIndex++] = _lastScriptSub;
+			_stack[_stackIndex++] = _lastScriptFlags;
+			debugC(5, kDebugLevelScript, "         - get script execution flags - PUSH result: '%d'", _lastScriptFlags);
 			break;
 
 		case 13:
@@ -768,37 +783,45 @@ int EobInfProcessor::oeob_eval_v1(int8 *data) {
 			switch (*pos++) {
 			case -31:
 				_stack[_stackIndex++] = itm->type;
+				debugC(5, kDebugLevelScript, "         - get hand item type (hand item number = '%d') - PUSH result: '%d'", _vm->_itemInHand, itm->type);
 				break;
 
 			case -11:
 				_stack[_stackIndex++] = _vm->_itemInHand;
+				debugC(5, kDebugLevelScript, "         - get hand item number - PUSH result: '%d'", _vm->_itemInHand);
 				break;
 
 			default:
 				_stack[_stackIndex++] = itm->value;
+				debugC(5, kDebugLevelScript, "         - get hand item value (hand item number = '%d') - PUSH result: '%d'", _vm->_itemInHand, itm->value);
 				break;
 			}
 			break;
 
 		case 15:
 			_stack[_stackIndex++] = _vm->_levelBlockProperties[READ_LE_UINT16(pos + 1)].walls[pos[0]];
+			debugC(5, kDebugLevelScript, "         - get wall index for block '0x%.04X', direction '%d' - PUSH result: '%d'", READ_LE_UINT16(pos + 1), pos[0], _stack[_stackIndex - 1]);
 			pos += 3;
 			break;
 
 		case 19:
 			_stack[_stackIndex++] = _vm->_currentDirection;
+			debugC(5, kDebugLevelScript, "         - get current direction - PUSH result: '%d'", _vm->_currentDirection);
 			break;
 
 		case 21:
 			_stack[_stackIndex++] = (_flagTable[_vm->_currentLevel] & (1 << (*pos++))) ? 1 : 0;
+			debugC(5, kDebugLevelScript, "         - test level flag '%d' (current level = '%d') - PUSH result: '%d'", *(pos - 1), _vm->_currentLevel, _stack[_stackIndex - 1]);
 			break;
 
 		case 22:
 			_stack[_stackIndex++] = (_flagTable[17] & (1 << (*pos++))) ? 1 : 0;
+			debugC(5, kDebugLevelScript, "         - test global flag '%d' - PUSH result: '%d'", *(pos - 1), _stack[_stackIndex - 1]);
 			break;
 
 		case 23:
 			_stack[_stackIndex++] = (_vm->_currentBlock == READ_LE_UINT16(pos)) ? 1 : 0;
+			debugC(5, kDebugLevelScript, "         - compare current block with block '0x%.04X' (current block = '0x%.04X') - PUSH result: '%d'", _vm->_currentBlock, READ_LE_UINT16(pos), _stack[_stackIndex - 1]);
 			pos += 2;
 			break;
 
@@ -808,10 +831,12 @@ int EobInfProcessor::oeob_eval_v1(int8 *data) {
 			b = READ_LE_UINT16(pos);
 			pos += 2;
 			_stack[_stackIndex++] = _vm->countQueuedItems(_vm->_levelBlockProperties[b].drawObjects, a, -1, 0, 1);
+			debugC(5, kDebugLevelScript, "         - find item number '%d' on block '0x%.04X' - PUSH result: '%d'", a, b, _stack[_stackIndex - 1]);
 			break;
 
 		case 25:
 			_stack[_stackIndex++] = (_vm->_levelBlockProperties[READ_LE_UINT16(pos)].flags & 1) ? 1 : 0;
+			debugC(5, kDebugLevelScript, "         - test block flag '1' for block '0x%.04X' - PUSH result: '%d'", READ_LE_UINT16(pos), _stack[_stackIndex - 1]);
 			pos += 2;
 			break;
 
@@ -820,10 +845,12 @@ int EobInfProcessor::oeob_eval_v1(int8 *data) {
 			i = READ_LE_UINT16(pos);
 			pos += 2;
 			_stack[_stackIndex++] = _vm->countQueuedItems(_vm->_levelBlockProperties[i].drawObjects, -1, b, 1, 1);
+			debugC(5, kDebugLevelScript, "         - count items of type '%d' on block '0x%.04X' - PUSH result: '%d'", b, i, _stack[_stackIndex - 1]);
 			break;
 
 		case 29:
 			_stack[_stackIndex++] = _vm->_levelBlockProperties[READ_LE_UINT16(pos)].walls[0];
+			debugC(5, kDebugLevelScript, "         - get wall index 0 for block '0x%.04X' - PUSH result: '%d'", READ_LE_UINT16(pos), _stack[_stackIndex - 1]);
 			pos += 2;
 			break;
 
@@ -831,54 +858,63 @@ int EobInfProcessor::oeob_eval_v1(int8 *data) {
 			a = _stack[--_stackIndex];
 			b = _stack[--_stackIndex];
 			_stack[_stackIndex++] = (a || b) ? 1 : 0;
+			debugC(5, kDebugLevelScript, "         - evaluate: POP('%d') || POP('%d') - PUSH result: '%d'", a, b, _stack[_stackIndex - 1]);
 			break;
 
 		case 31:
 			a = _stack[--_stackIndex];
 			b = _stack[--_stackIndex];
 			_stack[_stackIndex++] = (a && b) ? 1 : 0;
+			debugC(5, kDebugLevelScript, "         - evaluate: POP('%d') && POP('%d') - PUSH result: '%d'", a, b, _stack[_stackIndex - 1]);
 			break;
 
 		case 32:
 			a = _stack[--_stackIndex];
 			b = _stack[--_stackIndex];
 			_stack[_stackIndex++] = (a <= b) ? 1 : 0;
+			debugC(5, kDebugLevelScript, "         - evaluate: POP('%d') <= POP('%d') - PUSH result: '%d'", a, b, _stack[_stackIndex - 1]);
 			break;
 
 		case 33:
 			a = _stack[--_stackIndex];
 			b = _stack[--_stackIndex];
 			_stack[_stackIndex++] = (a < b) ? 1 : 0;
+			debugC(5, kDebugLevelScript, "         - evaluate: POP('%d') < POP('%d') - PUSH result: '%d'", a, b, _stack[_stackIndex - 1]);
 			break;
 
 		case 34:
 			a = _stack[--_stackIndex];
 			b = _stack[--_stackIndex];
 			_stack[_stackIndex++] = (a >= b) ? 1 : 0;
+			debugC(5, kDebugLevelScript, "         - evaluate: POP('%d') >= POP('%d') - PUSH result: '%d'", a, b, _stack[_stackIndex - 1]);
 			break;
 
 		case 35:
 			a = _stack[--_stackIndex];
 			b = _stack[--_stackIndex];
 			_stack[_stackIndex++] = (a > b) ? 1 : 0;
+			debugC(5, kDebugLevelScript, "         - evaluate: POP('%d') > POP('%d') - PUSH result: '%d'", a, b, _stack[_stackIndex - 1]);
 			break;
 
 		case 36:
 			a = _stack[--_stackIndex];
 			b = _stack[--_stackIndex];
 			_stack[_stackIndex++] = (a != b) ? 1 : 0;
+			debugC(5, kDebugLevelScript, "         - evaluate: POP('%d') != POP('%d') - PUSH result: '%d'", a, b, _stack[_stackIndex - 1]);
 			break;
 
 		case 37:
 			a = _stack[--_stackIndex];
 			b = _stack[--_stackIndex];
 			_stack[_stackIndex++] = (a == b) ? 1 : 0;
+			debugC(5, kDebugLevelScript, "         - evaluate: POP('%d') == POP('%d') - PUSH result: '%d'", a, b, _stack[_stackIndex - 1]);
 			break;
 
 		default:
 			a = cmd;
 			if (a >= 0 && a < 128)
 				_stack[_stackIndex++] = a;
+			debugC(5, kDebugLevelScript, "         - PUSH value: '%d'", a);
 			break;
 		}
 		cmd = *pos++;
@@ -889,6 +925,7 @@ int EobInfProcessor::oeob_eval_v1(int8 *data) {
 		pos += 2;
 	else
 		pos = _scriptData + READ_LE_UINT16(pos);
+	debugC(5, kDebugLevelScript, "         - conditional jump depending on POP('%d')", cmd);
 
 	return pos - data;
 }
@@ -1005,7 +1042,7 @@ int EobInfProcessor::oeob_eval_v2(int8 *data) {
 			break;
 
 		case 18:
-			_stack[_stackIndex++] = _lastScriptSub;
+			_stack[_stackIndex++] = _lastScriptFlags;
 			break;
 
 		case 22:
@@ -1193,10 +1230,13 @@ int EobInfProcessor::oeob_eval_v2(int8 *data) {
 int EobInfProcessor::oeob_deleteItem(int8 *data) {
 	int8 *pos = data;
 	int8 c = *pos++;
+
 	if (c == -1) {
 		_vm->deleteInventoryItem(0, -1);
+		debugC(5, kDebugLevelScript, "         - delete hand item");
 	} else {
 		_vm->deleteBlockItem(READ_LE_UINT16(pos), (c == -2) ? -1 : c);
+		debugC(5, kDebugLevelScript, "         - delete item(s) of type '%d' on block '0x%.04X'", (c == -2) ? -1 : c, READ_LE_UINT16(pos));
 		pos += 2;
 	}
 
@@ -1239,6 +1279,7 @@ int EobInfProcessor::oeob_loadNewLevelOrMonsters(int8 *data) {
 		_screen->setScreenDim(7);
 
 		_vm->loadLevel(index, cmd);
+		debugC(5, kDebugLevelScript, "         - entering level '%d', sub level '%d', start block '0x%.04X', start direction '%d'", index, cmd, _vm->_currentBlock, _vm->_currentDirection);
 
 		if (_vm->_dialogueField)
 			_vm->restoreAfterDialogueSequence();
@@ -1256,6 +1297,7 @@ int EobInfProcessor::oeob_loadNewLevelOrMonsters(int8 *data) {
 		cmd = *pos++;
 		_vm->releaseMonsterShapes(cmd * 18, 18);
 		_vm->loadMonsterShapes((const char*)pos, cmd * 18, true, index * 18);
+		debugC(5, kDebugLevelScript, "         - loading monster shapes '%s', monster number '%d', encode type '%d'", (const char*)pos, cmd, index);
 		pos += 13;
 		_vm->gui_restorePlayField();
 		res = pos - data;
@@ -1268,6 +1310,7 @@ int EobInfProcessor::oeob_increasePartyExperience(int8 *data) {
 	int8 *pos = data;
 	if (*pos++ == -30) {
 		_vm->increasePartyExperience((int16)READ_LE_UINT16(pos));
+		debugC(5, kDebugLevelScript, "         - award '%d' experience points", READ_LE_UINT16(pos));
 		pos += 2;
 	}
 	return pos - data;
@@ -1282,10 +1325,13 @@ int EobInfProcessor::oeob_createItem_v1(int8 *data) {
 	uint8 itmPos = *pos++;
 
 	if (itm) {
-		if (block == 0xffff && !_vm->_itemInHand)
+		if (block == 0xffff && !_vm->_itemInHand) {
 			_vm->setHandItem(itm);
-		else if (block != 0xffff )
+			debugC(5, kDebugLevelScript, "         - create hand item '%d'", itm);
+		} else if (block != 0xffff) {
 			_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[block & 0x3ff].drawObjects, block, itm, itmPos);
+			debugC(5, kDebugLevelScript, "         - create item '%d' on block '0x%.04X', position '%d'", itm, block, itmPos);
+		}
 	}
 
 	return pos - data;
@@ -1315,14 +1361,19 @@ int EobInfProcessor::oeob_createItem_v2(int8 *data) {
 		return pos - data;
 
 	if (block == 0xffff) {
-		if (!_vm->_itemInHand)
+		if (!_vm->_itemInHand) {
 			_vm->setHandItem(itm);
-		else
+			debugC(5, kDebugLevelScript, "         - create hand item '%d' (value '%d', flags '0x%X', icon number '%d')", itm, _vm->_items[itm].value, _vm->_items[itm].flags, _vm->_items[itm].icon);
+		} else {
 			_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[_vm->_currentBlock & 0x3ff].drawObjects, _vm->_currentBlock, itm, _itemPos[_vm->rollDice(1, 2, -1)]);
+			debugC(5, kDebugLevelScript, "         - create item '%d' (value '%d', flags '0x%X', icon number '%d') on current block", itm, _vm->_items[itm].value, _vm->_items[itm].flags, _vm->_items[itm].icon);
+		}
 	} else if (block == 0xfffe) {
 		_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[_vm->_currentBlock & 0x3ff].drawObjects, _vm->_currentBlock, itm, _itemPos[(_vm->_currentDirection << 2) + _vm->rollDice(1, 2, -1)]);
+		debugC(5, kDebugLevelScript, "         - create item '%d' (value '%d', flags '0x%X', icon number '%d') on current block", itm, _vm->_items[itm].value, _vm->_items[itm].flags, _vm->_items[itm].icon);
 	} else {
 		_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[block & 0x3ff].drawObjects, block, itm, itmPos);
+		debugC(5, kDebugLevelScript, "         - create item '%d' (value '%d', flags '0x%X', icon number '%d') on block '0x%.04X', position '%d'", itm, _vm->_items[itm].value, _vm->_items[itm].flags, _vm->_items[itm].icon, block, itmPos);
 	}
 
 	return pos - data;
diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h
index f7e5f09379..8f883fd712 100644
--- a/engines/kyra/script_eob.h
+++ b/engines/kyra/script_eob.h
@@ -40,7 +40,7 @@ public:
 	~EobInfProcessor();
 
 	void loadData(const uint8 *data, uint32 dataSize);
-	void run(int func, int sub);
+	void run(int func, int flags);
 
 	void setFlags(uint32 flags);
 	void clearFlags(uint32 flags);
@@ -107,7 +107,7 @@ private:
 	uint8 _preventRest;
 
 	uint16 _lastScriptFunc;
-	uint16 _lastScriptSub;
+	uint16 _lastScriptFlags;
 
 	int8 **_subroutineStack;
 	int _subroutineStackPos;
diff --git a/engines/kyra/sequences_eob1.cpp b/engines/kyra/sequences_eob1.cpp
index 4c5bd17f02..2ff4a3aa9f 100644
--- a/engines/kyra/sequences_eob1.cpp
+++ b/engines/kyra/sequences_eob1.cpp
@@ -105,9 +105,8 @@ int EobEngine::mainMenuLoop() {
 
 void EobEngine::seq_playOpeningCredits() {
 	_allowSkip = true;
-	_screen->loadPalette(_introFilesOpening[5], _screen->getPalette(0));
-	_screen->setScreenPalette(_screen->getPalette(0));
 
+	loadSetIntroPalette(_introFilesOpening[5]);
 	_screen->loadBitmap(_introFilesOpening[4], 5, 3, 0);
 	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
@@ -135,7 +134,14 @@ void EobEngine::seq_playIntro() {
 		delay(120 * _tickLength);
 	}
 
-	_screen->loadBitmap("TEXT.CMP", 3, 6, 0);
+	Common::SeekableReadStream *s = _res->createReadStream("TEXT.RAW");
+	if (s) {
+		s->seek(768);
+		_screen->loadFileDataToPage(s, 6, s->size() - 768);
+		delete s;
+	} else {
+		_screen->loadBitmap("TEXT.CMP", 3, 6, 0);
+	}
 
 	seq_tower();
 	seq_orb();
@@ -194,8 +200,7 @@ void EobEngine::seq_playFinale() {
 void EobEngine::seq_tower() {
 	if (shouldQuit() || skipFlag())
 		return;
-
-	_screen->loadPalette(_introFilesTower[0], _screen->getPalette(0));
+	
 	_screen->loadBitmap(_introFilesTower[1], 5, 3, 0);
 	_screen->setCurPage(2);
 	uint8 *shp = _screen->encodeShape(0, 0, 16, 56, true);
@@ -208,7 +213,8 @@ void EobEngine::seq_tower() {
 	_screen->fillRect(0, 184, 319, 199, 12);
 	int cp = _screen->setCurPage(0);
 	whirlTransition();
-	_screen->setScreenPalette(_screen->getPalette(0));
+	loadSetIntroPalette(_introFilesTower[0]);
+
 	_screen->setCurPage(cp);
 	_screen->clearCurPage();
 
@@ -331,8 +337,7 @@ void EobEngine::seq_waterdeepEntry() {
 	uint8 *shp2[31];
 	uint8 *shp3[3];
 
-	_screen->loadPalette(_introFilesWdEntry[0], _screen->getPalette(0));
-	_screen->setScreenPalette(_screen->getPalette(0));
+	loadSetIntroPalette(_introFilesWdEntry[0]);
 	_screen->loadBitmap(_introFilesWdEntry[1], 5, 3, 0);
 	_screen->setCurPage(2);
 	shp[3] = _screen->encodeShape(0, 0, 20, 136, true);
@@ -712,8 +717,7 @@ void EobEngine::seq_waterdeepExit() {
 	_screen->fillRect(0, 168, 319, 199, 12, 0);
 	_screen->copyRegion(0, 136, 0, 0, 48, 36, 0, 4, Screen::CR_NO_P_CHECK);
 
-	_screen->loadPalette(_introFilesWdExit[1], _screen->getPalette(0));
-	_screen->setScreenPalette(_screen->getPalette(0));
+	loadSetIntroPalette(_introFilesWdExit[1]);
 	_screen->loadBitmap(_introFilesWdExit[2], 3, 5, 0);
 	_screen->copyPage(5, 2);
 	whirlTransition();
@@ -762,8 +766,7 @@ void EobEngine::seq_waterdeepExit() {
 	_screen->fillRect(0, 16, 319, 31, 12);
 	_screen->fillRect(0, 136, 319, 199, 12);
 	_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
-	_screen->loadPalette(_introFilesWdExit[4], _screen->getPalette(0));
-	_screen->setScreenPalette(_screen->getPalette(0));
+	loadSetIntroPalette(_introFilesWdExit[4]);
 	_screen->updateScreen();
 	delay(50 * _tickLength);
 }
@@ -916,6 +919,15 @@ void EobEngine::seq_xdeath() {
 	for (int i = 0; i < 4; i++)
 		delete[] shapes1[i];
 	delete[] shapes2;
+
+	gui_drawPlayField(false);
+	gui_drawAllCharPortraitsWithStats();
+}
+
+void EobEngine::loadSetIntroPalette(const char *filename) {
+	_screen->loadPalette(filename, _screen->getPalette(0));
+	_screen->getPalette(0).fill(0, 1, 0);
+	_screen->setScreenPalette(_screen->getPalette(0));
 }
 
 void EobEngine::copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step) {
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
index 37aca45237..58540fdc85 100644
--- a/engines/kyra/sequences_eob2.cpp
+++ b/engines/kyra/sequences_eob2.cpp
@@ -169,11 +169,10 @@ void DarkMoonEngine::seq_playIntro() {
 	_screen->setCurPage(0);
 	_screen->clearCurPage();
 
-	_sound->playTrack(0);
+	snd_stopSound();
 
 	sq.loadScene(4, 2);
 	sq.loadScene(0, 2);
-
 	sq.delay(1);
 
 	if (!skipFlag() && !shouldQuit())
@@ -469,8 +468,7 @@ void DarkMoonEngine::seq_playFinale() {
 	_screen->setFont(Screen::FID_8_FNT);
 
 	_sound->loadSoundFile("FINALE1");
-	_sound->playTrack(0);
-
+	snd_stopSound();
 	sq.delay(3);
 
 	_screen->clearCurPage();
@@ -741,7 +739,7 @@ void DarkMoonEngine::seq_playFinale() {
 
 	sq.loadScene(10, 2);
 	sq.loadScene(9, 2);
-	_sound->playTrack(0);
+	snd_stopSound();
 	sq.delay(3);
 
 	_sound->loadSoundFile("FINALE2");
@@ -780,7 +778,7 @@ void DarkMoonEngine::seq_playFinale() {
 	while (!skipFlag() && !shouldQuit())
 		delay(_tickLength);
 
-	_sound->playTrack(0);
+	snd_stopSound();
 	sq.fadePalette(9, 10);
 }
 
diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp
index 6bf047fe35..a37ec9f674 100644
--- a/engines/kyra/sound_lol.cpp
+++ b/engines/kyra/sound_lol.cpp
@@ -167,8 +167,8 @@ void LoLEngine::snd_playSoundEffect(int track, int volume) {
 	volume &= 0xff;
 	int16 volIndex = (int16)READ_LE_UINT16(&_ingameSoundIndex[track * 2 + 1]);
 
-	volume = (volIndex > 0) ? (volIndex * volume) >> 8 : -volIndex;
-	volume = CLIP(volume >> 4, 2, 13) * 7 + 164;
+	uint16 vocLevel = (volIndex > 0) ? (volIndex * volume) >> 8 : -volIndex;
+	vocLevel = CLIP(volume >> 4, 2, 13) * 7 + 164;
 
 	int16 vocIndex = (int16)READ_LE_UINT16(&_ingameSoundIndex[track * 2]);
 
@@ -180,7 +180,7 @@ void LoLEngine::snd_playSoundEffect(int track, int volume) {
 
 	if (hasVocFile) {
 		if (_sound->isVoicePresent(_ingameSoundList[vocIndex]))
-			_sound->voicePlay(_ingameSoundList[vocIndex], 0, volume & 0xff, true);
+			_sound->voicePlay(_ingameSoundList[vocIndex], 0, vocLevel & 0xff, true);
 	} else if (_flags.platform == Common::kPlatformPC) {
 		if (_sound->getSfxType() == Sound::kMidiMT32)
 			track = (track < _ingameMT32SoundIndexSize) ? (_ingameMT32SoundIndex[track] - 1) : -1;
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index eca053017c..2dc9405f72 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -438,7 +438,7 @@ void EobCoreEngine::drawBlockItems(int index) {
 			}
 
 			int8 scaleSteps = (int8)_dscItemScaleIndex[(_dscDimMap[index] << 2) + ps];
-			if (flg & 8 && ps < 2 && scaleSteps) {
+			if ((flg & 8) && ps < 2 && scaleSteps) {
 				tile2 = _dscItemTileIndex[index];
 				if (tile2 != -1)
 					setLevelShapesDim(tile2, _shpDmX1, _shpDmX2, 5);
@@ -447,7 +447,7 @@ void EobCoreEngine::drawBlockItems(int index) {
 
 			if (scaleSteps >= 0) {
 				const uint8 *shp = _screen->scaleShape(_dscItemShapeMap[itm->icon] < _numLargeItemShapes ? _largeItemShapes[_dscItemShapeMap[itm->icon]] : (_dscItemShapeMap[itm->icon] < 15 ? 0 : _smallItemShapes[_dscItemShapeMap[itm->icon] - 15]), scaleSteps);
-				x = x + itemPosFin[o & 7] - (shp[2] << 2);
+				x = x + (itemPosFin[o & 7] << 1) - ((shp[2] << 3) >> 1);
 				y -= shp[1];
 
 				if (itm->pos != 8)
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 277e04e769..3b56b793d5 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -304,6 +304,10 @@ void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
 			continue;
 		}
 
+		int od = _screen->curDimIndex();
+		Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
+		_screen->setScreenDim(7);
+
 		switch (evt) {
 		case 2:
 		case 3:
@@ -363,7 +367,10 @@ void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
 		default:
 			break;
 		}
-	}
+
+		_screen->setScreenDim(od);
+		_screen->setFont(of);
+	}	
 
 	uint32 nextTimer = 0xffffffff;
 	for (int i = 0; i < 10; i++) {
-- 
cgit v1.2.3


From 68ed8b95989d784fe42f4e6e400224ffb63ba80b Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 13 Sep 2011 21:46:23 +0200
Subject: KYRA: (EOB) - fix some valgrind warnings

---
 engines/kyra/eobcommon.cpp      | 20 ++++++++++++--------
 engines/kyra/eobcommon.h        |  2 +-
 engines/kyra/lol.cpp            |  4 ++++
 engines/kyra/lol.h              |  1 +
 engines/kyra/loleobbase.cpp     |  3 ---
 engines/kyra/scene_eob.cpp      | 18 +++++++++++-------
 engines/kyra/scene_lol.cpp      |  8 ++++++++
 engines/kyra/screen.cpp         |  3 ++-
 engines/kyra/screen_eob.cpp     | 17 ++++++++---------
 engines/kyra/script_tim.cpp     |  1 +
 engines/kyra/sequences_eob2.cpp |  2 +-
 11 files changed, 49 insertions(+), 30 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 802907eba5..3bc145a398 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -183,7 +183,7 @@ EobCoreEngine::~EobCoreEngine() {
 	delete[] _itemTypes;
 	if (_itemNames) {
 		for (int i = 0; i < 130; i++)
-			delete _itemNames[i];
+			delete[] _itemNames[i];
 	}
 	delete[] _itemNames;
 	delete[] _flyingObjects;
@@ -218,6 +218,9 @@ EobCoreEngine::~EobCoreEngine() {
 
 	delete _gui;
 	_gui = 0;
+	delete _screen;
+	_screen = 0;
+
 	delete[] _menuDefs;
 	_menuDefs = 0;
 
@@ -227,6 +230,8 @@ EobCoreEngine::~EobCoreEngine() {
 	_timer = 0;
 	delete _debugger;
 	_debugger = 0;
+	delete _txt;
+	_txt = 0;
 }
 
 Common::Error EobCoreEngine::init() {
@@ -672,6 +677,8 @@ void EobCoreEngine::releaseItemsAndDecorationsShapes() {
 		delete []_firebeamShapes;
 	}
 
+	delete[] _redSplatShape;
+	delete[] _greenSplatShape;
 	delete[] _deadCharShape;
 	delete[] _disabledCharGrid;
 	delete[] _blackBoxSmallGrid;
@@ -1214,18 +1221,15 @@ void EobCoreEngine::setWeaponSlotStatus(int charIndex, int mode, int slot) {
 	gui_drawCharPortraitWithStats(charIndex);
 }
 
-void EobCoreEngine::setupDialogueButtons(int presetfirst, int numStr, const char *str1, ...) {
+void EobCoreEngine::setupDialogueButtons(int presetfirst, int numStr, const char *str1, va_list &args) {
 	_dialogueNumButtons = numStr;
 	_dialogueButtonString[0] = str1;
 	_dialogueHighlightedButton = 0;
 
-	va_list args;
-	va_start(args, str1);
-	const char **sp = va_arg(args, const char**);
-	va_end(args);
 	for (int i = 1; i < numStr; i++) {
-		if (sp[i - 1])
-			_dialogueButtonString[i] = sp[i - 1];
+		const char *tmp = va_arg(args, const char*);
+		if (tmp)
+			_dialogueButtonString[i] = tmp;
 		else
 			_dialogueNumButtons = numStr = i;
 	}
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index fcfc29f766..800716c81e 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -757,7 +757,7 @@ protected:
 	bool _configHpBarGraphs;
 
 	// text
-	void setupDialogueButtons(int presetfirst, int numStr, const char *str1, ...);
+	void setupDialogueButtons(int presetfirst, int numStr, const char *str1, va_list &args);
 	void initDialogueSequence();
 	void restoreAfterDialogueSequence();
 	void drawSequenceBitmap(const char *file, int destRect, int x1, int y1, int flags);
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 030b1dec7a..a8dfeb5b52 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -225,6 +225,8 @@ LoLEngine::~LoLEngine() {
 	_gui = 0;
 	delete _tim;
 	_tim = 0;
+	delete _txt;
+	_txt = 0;
 
 	delete[] _itemsInPlay;
 	delete[] _itemProperties;
@@ -298,6 +300,8 @@ LoLEngine::~LoLEngine() {
 		_doorShapes[i] = 0;
 	}
 
+	releaseDecorations();
+
 	delete[] _automapShapes;
 
 	for (Common::Array<const TIMOpcode*>::iterator i = _timIntroOpcodes.begin(); i != _timIntroOpcodes.end(); ++i)
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index e75d621cc3..ae3408eb1a 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -915,6 +915,7 @@ private:
 	void assignBlockObject(LevelBlockProperty *l, uint16 item);
 	int assignLevelDecorationShapes(int index);
 	uint8 *getLevelDecorationShapes(int index);
+	void releaseDecorations(int first = 0, int num = 400);
 	void restoreTempDataAdjustMonsterStrength(int index);
 	void loadBlockProperties(const char *cmzFile);
 	const uint8 *getBlockFileData(int levelIndex);
diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
index c2ec8da706..bcab2781a0 100644
--- a/engines/kyra/loleobbase.cpp
+++ b/engines/kyra/loleobbase.cpp
@@ -149,9 +149,6 @@ LolEobBaseEngine::~LolEobBaseEngine() {
 	delete[] _levelDecorationData;
 	delete[] _levelDecorationProperties;
 	delete[] _levelBlockProperties;
-
-	delete _txt;
-	_txt = 0;
 }
 
 Common::Error LolEobBaseEngine::init() {
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index cf20429e2c..ce0cdf8b59 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -1092,18 +1092,22 @@ void EobCoreEngine::drawSceneShapes(int start) {
 }
 
 void EobCoreEngine::drawDecorations(int index) {
-	static const int16 *dscWalls[] =  { 0, 0, &_sceneDrawVarDown, &_sceneDrawVarRight, &_sceneDrawVarDown,
-		&_sceneDrawVarRight, &_sceneDrawVarDown, 0, &_sceneDrawVarDown, &_sceneDrawVarLeft, &_sceneDrawVarDown,
-		&_sceneDrawVarLeft,	0, 0, &_sceneDrawVarDown, &_sceneDrawVarRight, &_sceneDrawVarDown, &_sceneDrawVarRight,
-		&_sceneDrawVarDown,	0, &_sceneDrawVarDown, &_sceneDrawVarLeft, &_sceneDrawVarDown, &_sceneDrawVarLeft,
-		&_sceneDrawVarDown,	&_sceneDrawVarRight, &_sceneDrawVarDown, 0, &_sceneDrawVarDown, &_sceneDrawVarLeft,
-		0, &_sceneDrawVarRight,	&_sceneDrawVarDown, 0, 0, &_sceneDrawVarLeft
+	static const int16 *dscWalls[] =  { 
+		0,					0,						&_sceneDrawVarDown, &_sceneDrawVarRight,
+		&_sceneDrawVarDown,	&_sceneDrawVarRight,	&_sceneDrawVarDown, 0,
+		&_sceneDrawVarDown, &_sceneDrawVarLeft,		&_sceneDrawVarDown,	&_sceneDrawVarLeft,
+		0,					0,						&_sceneDrawVarDown, &_sceneDrawVarRight,
+		&_sceneDrawVarDown, &_sceneDrawVarRight,	&_sceneDrawVarDown,	0,
+		&_sceneDrawVarDown, &_sceneDrawVarLeft,		&_sceneDrawVarDown, &_sceneDrawVarLeft,
+		&_sceneDrawVarDown,	&_sceneDrawVarRight,	&_sceneDrawVarDown, 0,
+		&_sceneDrawVarDown, &_sceneDrawVarLeft,		0,					&_sceneDrawVarRight,
+		&_sceneDrawVarDown, 0,						0,					&_sceneDrawVarLeft
 	};
 
 	for (int i = 1; i >= 0; i--) {
 		int s = index * 2 + i;
 		if (dscWalls[s]) {
-			int d = *dscWalls[s];
+			int16 d = *dscWalls[s];
 			int8 l = _wllShapeMap[_visibleBlocks[index]->walls[d]];
 
 			uint8 *shapeData = 0;
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index d28477b148..e38e5ebc22 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -200,6 +200,7 @@ int LoLEngine::assignLevelDecorationShapes(int index) {
 		if (pv) {
 			_levelDecorationProperties[o].shapeIndex[i] = pv;
 		} else {
+			releaseDecorations(_lvlShapeIndex, 1);
 			_levelDecorationShapes[_lvlShapeIndex] = getLevelDecorationShapes(t);
 			p1[t] = _lvlShapeIndex;
 			_levelDecorationProperties[o].shapeIndex[i] = _lvlShapeIndex++;
@@ -232,6 +233,13 @@ uint8 *LoLEngine::getLevelDecorationShapes(int shapeIndex) {
 	return res;
 }
 
+void LoLEngine::releaseDecorations(int first, int num) {
+	for (int i = first; i < (first + num); i++) {
+		delete[] _levelDecorationShapes[i];
+		_levelDecorationShapes[i] = 0;
+	}
+}
+
 void LoLEngine::loadBlockProperties(const char *cmzFile) {
 	memset(_levelBlockProperties, 0, 1024 * sizeof(LevelBlockProperty));
 	_screen->loadBitmap(cmzFile, 2, 2, 0);
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 79edfe9d72..f9a49e7a7b 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -848,7 +848,8 @@ void Screen::copyRegionToBuffer(int pageNum, int x, int y, int w, int h, uint8 *
 void Screen::copyPage(uint8 srcPage, uint8 dstPage) {
 	uint8 *src = getPagePtr(srcPage);
 	uint8 *dst = getPagePtr(dstPage);
-	memcpy(dst, src, SCREEN_W * SCREEN_H);
+	if (src != dst)
+		memcpy(dst, src, SCREEN_W * SCREEN_H);
 	copyOverlayRegion(0, 0, 0, 0, SCREEN_W, SCREEN_H, srcPage, dstPage);
 
 	if (dstPage == 0 || dstPage == 1)
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 4161c757d8..8562e25480 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -46,6 +46,7 @@ Screen_Eob::Screen_Eob(EobCoreEngine *vm, OSystem *system) : Screen(vm, system)
 	_gfxCol = 0;
 	_customDimTable = 0;
 	_dsTempPage = 0;
+	_curDimIndex = 0;
 }
 
 Screen_Eob::~Screen_Eob() {
@@ -266,7 +267,7 @@ uint8 *Screen_Eob::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 		uint8 *colorMap = new uint8[0x100];
 		memset (colorMap, 0xff, 0x100);
 
-		shapesize = h * (w << 2) + 0x14;
+		shapesize = h * (w << 2) + 20;
 		shp = new uint8[shapesize];
 		memset (shp, 0, shapesize);
 		uint8 *dst = shp;
@@ -673,14 +674,13 @@ const uint8 *Screen_Eob::scaleShapeStep(const uint8 *shp) {
 		i = -i;
 
 	_dsScaleTmp = (i << 4) | (i & 0x0f);
-	memcpy(d, shp, 16);
-	d += 16;
-	shp += 16;
+	for (int ii = 0; ii < 16; ii++)
+		*d++ = *shp++;
 
 	_dsDiv = w2 / 3;
 	_dsRem = w2 % 3;
 
-	do {
+	while (--h) {
 		scaleShapeProcessLine(d, shp);
 		if (!--h)
 			break;
@@ -688,7 +688,7 @@ const uint8 *Screen_Eob::scaleShapeStep(const uint8 *shp) {
 		if (!--h)
 			break;
 		shp += w2;
-	} while (--h);
+	}
 
 	return (const uint8 *) _dsTempPage;
 }
@@ -1100,15 +1100,14 @@ void Screen_Eob::drawShapeSetPixel(uint8 * dst, uint8 c) {
 void Screen_Eob::scaleShapeProcessLine(uint8 *&dst, const uint8 *&src) {
 	for (int i = 0; i < _dsDiv; i++) {
 		*dst++ = *src++;
-		*dst++ = READ_BE_UINT16(src) >> 4;
+		*dst++ = (READ_BE_UINT16(src) >> 4) & 0xff;
 		src += 2;
 	}
 
 	if (_dsRem == 1) {
 		*dst++ = *src++;
 		*dst++ = _dsScaleTmp;
-
-	} if (_dsRem == 2) {
+	} else if (_dsRem == 2) {
 		*dst++ = (src[0] & 0xf0) | (src[1] >> 4);
 		src += 2;
 		*dst++ = _dsScaleTmp;
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index 75977fc87c..7995ad21f1 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -893,6 +893,7 @@ TIMInterpreter_LoL::TIMInterpreter_LoL(LoLEngine *engine, Screen_v2 *screen_v2,
 
 	_screen = engine->_screen;
 
+	delete _animator;
 	_animator = new TimAnimator(engine, screen_v2, system, true);
 
 	_drawPage2 = 0;
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
index 58540fdc85..597d84d81c 100644
--- a/engines/kyra/sequences_eob2.cpp
+++ b/engines/kyra/sequences_eob2.cpp
@@ -951,7 +951,7 @@ DarkmoonSequenceHelper::~DarkmoonSequenceHelper() {
 	delete _palettes[11];
 
 	for (int i = 0; i < 30; i++)
-		delete _shapes[i];
+		delete[] _shapes[i];
 	delete[] _shapes;
 
 	_screen->clearCurPage();
-- 
cgit v1.2.3


From ac1aa43ca8b2ad9f2743006a5e40a7967a40fec5 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 18 Sep 2011 15:53:47 +0200
Subject: KYRA: (EOB) - fix char generator regression + cleanup

---
 engines/kyra/chargen.cpp  |  6 +++---
 engines/kyra/text_eob.cpp | 18 +++++++++++++++---
 engines/kyra/text_eob.h   |  3 +++
 3 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 0e38ffec3d..92d1b15ec3 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -380,7 +380,7 @@ int CharacterGenerator::viewDeleteCharacter() {
 	int res = 0;
 	for (bool loop = true; loop && _characters[_activeBox].name[0] && !_vm->shouldQuit(); ) {
 		_vm->_gui->updateBoxFrameHighLight(_activeBox + 6);
-		int inputFlag =getInput(_vm->_activeButtons);
+		int inputFlag = getInput(_vm->_activeButtons);
 		int cbx = _activeBox;
 		_vm->removeInputTop();
 
@@ -517,7 +517,7 @@ int CharacterGenerator::classMenu(int raceSex) {
 
 	while (res == -1 && !_vm->shouldQuit()) {
 		updateMagicShapes();
-		int in = getInput(_vm->_activeButtons) & 0xff;
+		int in = getInput(0) & 0xff;
 		Common::Point mp = _vm->getMousePos();
 
 		if (in == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_b]) {
@@ -565,7 +565,7 @@ int CharacterGenerator::alignmentMenu(int cClass) {
 
 	while (res == -1 && !_vm->shouldQuit()) {
 		updateMagicShapes();
-		int in = getInput(_vm->_activeButtons) & 0xff;
+		int in = getInput(0) & 0xff;
 		Common::Point mp = _vm->getMousePos();
 
 		if (in == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_ESCAPE] || _vm->_gui->_menuLastInFlags == _vm->_keyMap[Common::KEYCODE_b]) {
diff --git a/engines/kyra/text_eob.cpp b/engines/kyra/text_eob.cpp
index 0fe01df770..e4e9b37379 100644
--- a/engines/kyra/text_eob.cpp
+++ b/engines/kyra/text_eob.cpp
@@ -55,6 +55,11 @@ TextDisplayer_Eob::TextDisplayer_Eob(LolEobBaseEngine *engine, Screen *sScreen)
 		_textDimData[i].column = d->unkE;
 	}
 
+	_table1 = new char[128];
+	memset(_table1, 0, 128);
+	_table2 = new char[16];
+	memset(_table2, 0, 16);
+
 	_waitButtonSpace = 0;
 }
 
@@ -62,6 +67,8 @@ TextDisplayer_Eob::~TextDisplayer_Eob() {
 	delete[] _dialogueBuffer;
 	delete[] _currentLine;
 	delete[] _textDimData;
+	delete[] _table1;
+	delete[] _table2;
 }
 
 void TextDisplayer_Eob::setupField(int dim, bool mode) {
@@ -257,6 +264,7 @@ char TextDisplayer_Eob::parseCommand() {
 }
 
 void TextDisplayer_Eob::readNextPara() {
+	char c = 0;
 	char d = 0;
 
 	if (_tempString2) {
@@ -275,12 +283,16 @@ void TextDisplayer_Eob::readNextPara() {
 			_tempString1 = 0;
 	}
 
-	if (d & 0x80) {
-		warning("TextDisplayer_Eob::readNextPara():");
+	if ((_vm->game() != GI_LOL) && (d & 0x80)) {		
+		d &= 0x7f;
+		c = d & 7;
+		d = (d & 0x78) >> 3;
+		c = _table1[(d << 3) + c];
+		d = _table2[d];
 	}
 
 	_ctrl[1] = d;
-	_ctrl[2] = 0;
+	_ctrl[2] = c;
 }
 
 void TextDisplayer_Eob::printLine(char *str) {
diff --git a/engines/kyra/text_eob.h b/engines/kyra/text_eob.h
index eb4957448b..9409ac43f0 100644
--- a/engines/kyra/text_eob.h
+++ b/engines/kyra/text_eob.h
@@ -103,6 +103,9 @@ protected:
 private:
 	LolEobBaseEngine *_vm;
 	Screen *_screen;
+
+	char *_table1;
+	char *_table2;
 };
 
 } // End of namespace Kyra
-- 
cgit v1.2.3


From 1cbd56693086afa8ce93092c3638e1052e31a5d9 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Thu, 29 Sep 2011 22:51:36 +0200
Subject: KYRA: (EOB) - fix invalid string access

(also fix several cpp-check warnings)
---
 engines/kyra/chargen.cpp       |  2 +-
 engines/kyra/eob1.cpp          | 37 +++++++--------------------
 engines/kyra/eob1.h            |  3 ---
 engines/kyra/eob2.cpp          |  6 +++++
 engines/kyra/eob2.h            |  4 +--
 engines/kyra/eobcommon.cpp     | 58 +++++++++++++++++++++++++++++++++++++-----
 engines/kyra/gui.h             |  2 +-
 engines/kyra/gui_eob.cpp       |  6 +++--
 engines/kyra/items_eob.cpp     | 16 ++++++++----
 engines/kyra/magic_eob.cpp     |  2 +-
 engines/kyra/saveload_eob.cpp  |  2 ++
 engines/kyra/saveload_lol.cpp  |  1 +
 engines/kyra/screen.cpp        |  1 +
 engines/kyra/screen_eob.cpp    | 10 +++++++-
 engines/kyra/screen_lol.cpp    |  4 ++-
 engines/kyra/sprites_eob.cpp   |  4 +--
 engines/kyra/staticres_eob.cpp |  2 +-
 engines/kyra/text_eob.cpp      |  5 ++--
 18 files changed, 108 insertions(+), 57 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 92d1b15ec3..5231093133 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -1317,7 +1317,7 @@ void CharacterGenerator::finish() {
 	}
 
 	if (_chargenButtonLabels) {
-		for (int i = 0; i < 10; i++)
+		for (int i = 0; i < 17; i++)
 			delete[] _chargenButtonLabels[i];
 		delete[] _chargenButtonLabels;
 		_chargenButtonLabels = 0;
diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index d67cda529d..c345b4710a 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -31,6 +31,15 @@ namespace Kyra {
 EobEngine::EobEngine(OSystem *system, const GameFlags &flags) : EobCoreEngine(system, flags) {
 	_numSpells = 53;
 	_menuChoiceInit = 4;
+
+	_turnUndeadString = _introFilesOpening = _introFilesTower = _introFilesOrb = _introFilesWdEntry	= _introFilesKing = _introFilesHands = _introFilesWdExit =
+		_introFilesTunnel = _finBonusStrings = _npc11Strings = _npc12Strings = _npc21Strings = _npc22Strings = _npc31Strings = _npc32Strings = _npc4Strings	=
+		_npc5Strings = _npc6Strings	= _npc7Strings = 0;
+	_introOpeningFrmDelay = _introWdEncodeX	= _introWdEncodeY = _introWdEncodeWH = _npcShpData = _npcSubShpIndex1 = _npcSubShpIndex2 = _npcSubShpY = _introWdDsY =
+		_introTvlX1 = _introTvlY1 = _introTvlX2	= _introTvlY2 = _introTvlW = _introTvlH = _dscDoorScaleMult4 = _dscDoorScaleMult5 = _dscDoorScaleMult6 =
+		_dscDoorY3 = _dscDoorY4 = _dscDoorY5 = _dscDoorY6 = _dscDoorY7 = _doorShapeEncodeDefs = _doorSwitchShapeEncodeDefs = _doorSwitchCoords = 0;
+	_introWdDsX = 0;
+	_dscDoorCoordsExt = 0;
 }
 
 EobEngine::~EobEngine() {
@@ -558,34 +567,6 @@ void EobEngine::healParty() {
 	}
 }
 
-uint32 EobEngine::convertSpellFlagToEob2Format(uint32 flag, int ignoreInvisibility) {
-	uint32 res = 0;
-	if (flag & 0x01)
-		res |= 0x20;
-	if (flag & 0x02)
-		res |= 0x400;
-	if (flag & 0x04)
-		res |= 0x80;
-	if (flag & 0x08)
-		res |= 0x40;
-	if (ignoreInvisibility)
-		res |= 0x100;
-	return res;
-}
-
-uint32 EobEngine::convertCharacterEffectFlagToEob2Format(uint32 flag) {
-	uint32 res = 0;
-	if (flag & 0x02)
-		res |= 0x08;
-	if (flag & 0x04)
-		res |= 0x40;
-	if (flag & 0x80)
-		res |= 0x2000;
-	if (flag & 0x100)
-		res |= 0x4000;
-	return res;
-}
-
 }	// End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
index 8811d7d92a..3eade85e6f 100644
--- a/engines/kyra/eob1.h
+++ b/engines/kyra/eob1.h
@@ -149,9 +149,6 @@ private:
 	bool checkPartyStatusExtra();
 	int resurrectionSelectDialogue();
 	void healParty();
-
-	uint32 convertSpellFlagToEob2Format(uint32 flag, int ignoreInvisibility);
-	uint32 convertCharacterEffectFlagToEob2Format(uint32 flag);
 };
 
 
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index f309fae2aa..afaef0b43a 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -34,6 +34,12 @@ DarkMoonEngine::DarkMoonEngine(OSystem *system, const GameFlags &flags) : EobCor
 	_dscDoorType5Offs = 0;
 	_numSpells = 70;
 	_menuChoiceInit = 4;
+
+	_introStrings = _cpsFilesIntro = _cpsFilesFinale = _finaleStrings = _kheldranStrings = _npc1Strings = _npc2Strings = _hornStrings = 0;
+	_seqIntro = _seqFinale = 0;
+	_shapesIntro = _shapesFinale = 0;
+	_creditsData = _npcShpData = _dscDoorType5Offs = _hornSounds = 0;
+	_dreamSteps = 0;
 }
 
 DarkMoonEngine::~DarkMoonEngine() {
diff --git a/engines/kyra/eob2.h b/engines/kyra/eob2.h
index 6da09010b4..8c9b6dd9fa 100644
--- a/engines/kyra/eob2.h
+++ b/engines/kyra/eob2.h
@@ -72,12 +72,12 @@ private:
 	void seq_playFinale();
 	void seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *data, int sd, int backupPage, int tempPage, int speed);
 
-	const char * const*_introStrings;
+	const char * const *_introStrings;
 	const char * const *_cpsFilesIntro;
 	const EobSequenceStep **_seqIntro;
 	const EobShapeDef **_shapesIntro;
 
-	const char * const*_finaleStrings;
+	const char * const *_finaleStrings;
 	const uint8 *_creditsData;
 	const char * const *_cpsFilesFinale;
 	const EobSequenceStep **_seqFinale;
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 3bc145a398..9e75be017c 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -110,6 +110,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_color9 = 17;
 	_color10 = 23;
 	_color11 = 20;
+	_color4 = _color5 = _color6 = _color7 = _color8 = _color12 = _color13 = _color14 = 0;
 
 	_menuDefs = 0;
 
@@ -153,6 +154,48 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_rrCount = 0;
 	memset(_rrNames, 0, 10 * sizeof(const char*));
 	memset(_rrId, 0, 10 * sizeof(int8));
+
+	_mainMenuStrings = _levelGainStrings = _monsterSpecAttStrings = _characterGuiStringsHp = _characterGuiStringsWp = _characterGuiStringsWr = _characterGuiStringsSt =
+		_characterGuiStringsIn = _characterStatusStrings7 = _characterStatusStrings8 = _characterStatusStrings9 = _characterStatusStrings12 = _characterStatusStrings13 = 0;
+	_classModifierFlags = _constModLevelIndex = _constModDiv = _constModExt = _wandTypes = _drawObjPosIndex = _flightObjFlipIndex = _expObjectTblIndex =
+		_expObjectShpStart = _expObjectTlMode = _expObjectAnimTbl1 = _expObjectAnimTbl2 = _expObjectAnimTbl3 = 0;
+	_monsterStepTable0 = _monsterStepTable1 = _monsterStepTable2 = _monsterStepTable3 = _projectileWeaponAmmoTypes = _flightObjShpMap = _flightObjSclIndex = 0;
+	_monsterCloseAttPosTable1 = _monsterCloseAttPosTable2 = _monsterCloseAttChkTable1 = _monsterCloseAttChkTable2 = _monsterCloseAttDstTable1 = _monsterCloseAttDstTable2 = 0;
+	_monsterProximityTable = _findBlockMonstersTable = _wallOfForceDsY = _wallOfForceDsNumW = _wallOfForceDsNumH = _wallOfForceShpId = _wllFlagPreset = _teleporterShapeCoords = 0;
+		_monsterCloseAttUnkTable = _monsterFrmOffsTable1 = _monsterFrmOffsTable2 = _monsterDirChangeTable = _portalSeq = 0;
+	_wallOfForceDsX = 0;
+	_expObjectAnimTbl1Size = _expObjectAnimTbl2Size = _expObjectAnimTbl3Size = _wllFlagPresetSize = _scriptTimersCount = _buttonList1Size = _buttonList2Size = 
+		_buttonList3Size = _buttonList4Size = _buttonList5Size = _buttonList6Size = _buttonList7Size = _buttonList8Size = 0;
+	_inventorySlotsY = _mnDef = 0;
+	_buttonDefs = 0;
+	_npcPreset = 0;
+	_chargenStatStrings	= _chargenRaceSexStrings = _chargenClassStrings = _chargenAlignmentStrings = _pryDoorStrings = _warningStrings = _ripItemStrings =
+		_cursedString = _enchantedString = _magicObjectStrings = _magicObjectString5 = _patternSuffix = _patternGrFix1 = _patternGrFix2 = _validateArmorString =
+		_validateCursedString = _validateNoDropString = _potionStrings = _wandStrings = _itemMisuseStrings = _suffixStringsRings = _suffixStringsPotions =
+		_suffixStringsWands	= _takenStrings	= _potionEffectStrings = _yesNoStrings = _npcMaxStrings = _okStrings = _npcJoinStrings = _cancelStrings	=
+		_abortStrings = _saveLoadStrings = _mnWord = _mnPrompt = _bookNumbers = _mageSpellList = _clericSpellList = _spellNames = _magicStrings1 = _magicStrings2 =
+		_magicStrings3 = _magicStrings4 = _magicStrings6 = _magicStrings7 = _magicStrings8 = 0;
+	_spellAnimBuffer = 0;
+	_sparkEffectDefSteps = _sparkEffectDefSubSteps = _sparkEffectDefShift = _sparkEffectDefAdd = _sparkEffectDefX = _sparkEffectDefY = _sparkEffectOfShift =
+		_sparkEffectOfX	= _sparkEffectOfY = _magicFlightObjectProperties = _turnUndeadEffect = _burningHandsDest = _coneOfColdGfxTbl = 0;
+	_sparkEffectOfFlags1 = _sparkEffectOfFlags2 = 0;
+	_coneOfColdDest1 = _coneOfColdDest2 = _coneOfColdDest3 = _coneOfColdDest4 = 0;
+	_coneOfColdGfxTblSize = 0;
+	_menuButtonDefs = 0;
+	_menuStringsMain = _menuStringsSaveLoad	= _menuStringsOnOff	= _menuStringsSpells = _menuStringsRest	= _menuStringsDrop = _menuStringsExit = _menuStringsStarve =
+		_menuStringsScribe = _menuStringsDrop2 = _menuStringsHead = _menuStringsPoison = _menuStringsMgc = _menuStringsPrefs = _menuStringsRest2 = _menuStringsRest3 =
+		_menuStringsRest4 = _menuStringsDefeat = _menuStringsTransfer = _menuStringsSpec = _menuStringsSpellNo = _menuYesNoStrings = 0;
+	_errorSlotEmptyString = _errorSlotNoNameString = _menuOkString = 0;
+	_spellLevelsMage = _spellLevelsCleric = _numSpellsCleric = _numSpellsWisAdj	= _numSpellsPal	= _numSpellsMage = 0;
+	_mnNumWord = _numSpells = _mageSpellListSize = _spellLevelsMageSize = _spellLevelsClericSize = 0;
+	_inventorySlotsX = _slotValidationFlags = _encodeMonsterShpTable = 0;
+	memset(_expRequirementTables, 0, sizeof(_expRequirementTables));
+	memset(_constModTables, 0, sizeof(_constModTables));
+	memset(_doorType, 0, sizeof(_doorType));
+	memset(_noDoorSwitch, 0, sizeof(_noDoorSwitch));
+	memset(_scriptTimers, 0, sizeof(_scriptTimers));
+	memset(_monsterBlockPosArray, 0, sizeof(_monsterBlockPosArray));
+	memset(_foundMonstersArray, 0, sizeof(_foundMonstersArray));
 }
 
 EobCoreEngine::~EobCoreEngine() {
@@ -251,11 +294,10 @@ Common::Error EobCoreEngine::init() {
 
 	//MidiDriverType midiDriver = MidiDriver::detectDevice(MDT_PCSPK | MDT_ADLIB);
 	_sound = new SoundAdLibPC(this, _mixer);
-	_sound->init();
 	assert(_sound);
+	_sound->init();	
 
-	if (_sound)
-		_sound->updateVolumeSettings();
+	syncSoundSettings();
 
 	_res = new Resource(this);
 	assert(_res);
@@ -288,8 +330,6 @@ Common::Error EobCoreEngine::init() {
 	_screen->loadFont(Screen::FID_6_FNT, "FONT6.FNT");
 	_screen->loadFont(Screen::FID_8_FNT, "FONT8.FNT");
 
-	readSettings();
-
 	Common::Error err = LolEobBaseEngine::init();
 	if (err.getCode() != Common::kNoError)
 		return err;
@@ -365,6 +405,9 @@ Common::Error EobCoreEngine::init() {
 	memset(_monsterOvl2, 13, 16 * sizeof(uint8));
 	_monsterOvl1[0] = _monsterOvl2[0] = 0;
 
+	// Prevent autosave on game startup
+	_lastAutosave = _system->getMillis();
+
 	return Common::kNoError;
 }
 
@@ -701,7 +744,7 @@ void EobCoreEngine::setHandItem(Item itemIndex) {
 	const uint8 *shp = _itemIconShapes[icon];
 
 	if (icon && (_items[_itemInHand].flags & 0x80) && (_partyEffectFlags & 2)) {
-		memcpy(_tempIconShape, shp, 300);
+		memcpy(_tempIconShape, shp, shp[1] * shp[2] * 4 + 20);
 		if (_flags.gameID == GI_EOB1)
 			_screen->replaceShapePalette(_tempIconShape, &_itemsOverlay[icon << 4]);
 		else
@@ -1225,9 +1268,10 @@ void EobCoreEngine::setupDialogueButtons(int presetfirst, int numStr, const char
 	_dialogueNumButtons = numStr;
 	_dialogueButtonString[0] = str1;
 	_dialogueHighlightedButton = 0;
+	const char *tmp = 0;
 
 	for (int i = 1; i < numStr; i++) {
-		const char *tmp = va_arg(args, const char*);
+		tmp = va_arg(args, const char*);
 		if (tmp)
 			_dialogueButtonString[i] = tmp;
 		else
diff --git a/engines/kyra/gui.h b/engines/kyra/gui.h
index 4991707744..2b32bf38f6 100644
--- a/engines/kyra/gui.h
+++ b/engines/kyra/gui.h
@@ -43,7 +43,7 @@ struct Button {
 	Button() : nextButton(0), index(0), keyCode(0), keyCode2(0), data0Val1(0), data1Val1(0), data2Val1(0), data3Val1(0), flags(0),
 	    data0ShapePtr(0), data1ShapePtr(0), data2ShapePtr(0), data0Callback(), data1Callback(), data2Callback(),
 	    dimTableIndex(0), x(0), y(0), width(0), height(0), data0Val2(0), data0Val3(0), data1Val2(0), data1Val3(0),
-	    data2Val2(0), data2Val3(0), data3Val2(0), data3Val3(0), flags2(0), mouseWheel(0), buttonCallback(), arg(0) {}
+	    data2Val2(0), data2Val3(0), data3Val2(0), data3Val3(0), flags2(0), mouseWheel(0), buttonCallback(), extButtonDef(0), arg(0) {}
 
 	Button *nextButton;
 	uint16 index;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index d333528ab2..af97d487cb 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -85,6 +85,7 @@ void LolEobBaseEngine::gui_drawHorizontalBarGraph(int x, int y, int w, int h, in
 }
 
 void LolEobBaseEngine::gui_initButtonsFromList(const int16 *list) {
+	return;
 	while (*list != -1)
 		gui_initButton(*list++);
 }
@@ -1480,7 +1481,7 @@ GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 GUI_Eob::~GUI_Eob() {
 	if (_menuStringsPrefsTemp) {
 		for (int i = 0; i < 4; i++)
-			delete _menuStringsPrefsTemp[i];
+			delete[] _menuStringsPrefsTemp[i];
 		delete[] _menuStringsPrefsTemp;
 	}
 
@@ -1600,6 +1601,7 @@ void GUI_Eob::processButton(Button *button) {
 }
 
 int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8 mouseWheel) {
+	return 0;
 	_progress = 0;
 	uint16 in = inputFlags & 0xff;
 	uint16 buttonReleaseFlag = 0;
@@ -3897,7 +3899,7 @@ void GUI_Eob::memorizePrayMenuPrintString(int spellId, int bookPageIndex, int sp
 
 void GUI_Eob::updateOptionsStrings() {
 	for (int i = 0; i < 4; i++) {
-		delete _menuStringsPrefsTemp[i];
+		delete[] _menuStringsPrefsTemp[i];
 		_menuStringsPrefsTemp[i] = new char[strlen(_vm->_menuStringsPrefs[i]) + 8];
 	}
 
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index 96b19a9f93..44f3a7ef3d 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -461,12 +461,18 @@ void EobCoreEngine::drawItemIconShape(int pageNum, Item itemId, int x, int y) {
 	int icn = _items[itemId].icon;
 	bool applyBluePal = ((_partyEffectFlags & 2) && (_items[itemId].flags & 0x80)) ? true : false;
 
+	memcpy(_tempIconShape, _itemIconShapes[icn], _itemIconShapes[icn][1] * _itemIconShapes[icn][2] * 4 + 20);
+
 	if (applyBluePal) {
-		_screen->setFadeTableIndex(3);
-		_screen->setShapeFadeMode(1, true);
+		if (_flags.gameID == GI_EOB1) {
+			_screen->replaceShapePalette(_tempIconShape, &_itemsOverlay[icn << 4]);
+		} else {
+			_screen->setFadeTableIndex(3);
+			_screen->setShapeFadeMode(1, true);
+		}
 	}
 
-	_screen->drawShape(pageNum, _itemIconShapes[icn], x, y, 0);
+	_screen->drawShape(pageNum, _tempIconShape, x, y, 0);
 
 	if (applyBluePal) {
 		_screen->setFadeTableIndex(4);
@@ -491,8 +497,8 @@ void EobCoreEngine::eatItemInHand(int charIndex) {
 	EobCharacter *c = &_characters[charIndex];
 	if (!testCharacter(charIndex, 5)) {
 		_txt->printMessage(_warningStrings[1], -1, c->name);
-	} else if (_itemInHand && _items[_itemInHand].type != 31) {
-		_txt->printMessage(_warningStrings[3]);
+	} else if (_itemInHand && _items[_itemInHand].type != 31 && !(_flags.gameID == GI_EOB1 && _items[_itemInHand].type == 49)) {
+		_txt->printMessage(_warningStrings[_flags.gameID == GI_EOB1 ? 2 : 3]);
 	} else if (_items[_itemInHand].value == -1) {
 		printWarning(_warningStrings[2]);
 	} else {
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 9063d512f0..b70058d7ff 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -542,7 +542,7 @@ bool EobCoreEngine::magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int d
 			}
 		} else {
 			int c = _dscItemPosIndex[(_currentDirection << 2) + (fo->curPos & 3)];
-			if ((c > 2) && (testCharacter(5, 1) || testCharacter(6, 1)) && rollDice(1, 2, -1))
+			if ((c > 2) && (testCharacter(4, 1) || testCharacter(5, 1)) && rollDice(1, 2, -1))
 				c += 2;
 
 			if (!fo->item && (_characters[c].effectFlags & 8)) {
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 07841be1e4..ec89fca5e2 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -39,6 +39,7 @@ void LolEobBaseEngine::generateTempData() {
 		delete[] _lvlTempData[l]->flags;
 		releaseMonsterTempData(_lvlTempData[l]);
 		releaseFlyingObjectTempData(_lvlTempData[l]);
+		releaseWallOfForceTempData(_lvlTempData[l]);
 		delete _lvlTempData[l];
 	}
 
@@ -280,6 +281,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 			delete[] _lvlTempData[i]->flags;
 			releaseMonsterTempData(_lvlTempData[i]);
 			releaseFlyingObjectTempData(_lvlTempData[i]);
+			releaseWallOfForceTempData(_lvlTempData[i]);
 			delete _lvlTempData[i];
 		}
 
diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp
index 33097a86a3..e5977dd915 100644
--- a/engines/kyra/saveload_lol.cpp
+++ b/engines/kyra/saveload_lol.cpp
@@ -187,6 +187,7 @@ Common::Error LoLEngine::loadGameState(int slot) {
 			delete[] _lvlTempData[i]->flags;
 			releaseMonsterTempData(_lvlTempData[i]);
 			releaseFlyingObjectTempData(_lvlTempData[i]);
+			releaseWallOfForceTempData(_lvlTempData[i]);
 			delete _lvlTempData[i];
 		}
 
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index f9a49e7a7b..c0d05dc851 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -51,6 +51,7 @@ Screen::Screen(KyraEngine_v1 *vm, OSystem *system)
 
 	_currentFont = FID_8_FNT;
 	_paletteChanged = true;
+	_curDim = 0;
 }
 
 Screen::~Screen() {
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 8562e25480..0b877b7247 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -47,10 +47,18 @@ Screen_Eob::Screen_Eob(EobCoreEngine *vm, OSystem *system) : Screen(vm, system)
 	_customDimTable = 0;
 	_dsTempPage = 0;
 	_curDimIndex = 0;
+	_dsDiv = 0;
+	_dsRem = 0;
+	_dsScaleTmp = 0;
+	_gfxMaxY = 0;
 }
 
 Screen_Eob::~Screen_Eob() {
 	delete[] _fadeData;
+	if (_customDimTable) {
+		for (int i = 0; i < _screenDimTableCount; i++)
+			delete _customDimTable[i];
+	}
 	delete[] _customDimTable;
 	delete[] _dsTempPage;
 }
@@ -58,7 +66,7 @@ Screen_Eob::~Screen_Eob() {
 bool Screen_Eob::init() {
 	if (Screen::init()) {
 		_customDimTable = new ScreenDim*[_screenDimTableCount];
-		memset(_customDimTable, 0, sizeof(ScreenDim *)* _screenDimTableCount);
+		memset(_customDimTable, 0, sizeof(ScreenDim*) * _screenDimTableCount);
 
 		int temp;
 		_gfxMaxY = _vm->staticres()->loadRawData(kEobBaseExpObjectY, temp);
diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp
index 6d0460e0a1..0f02165ac5 100644
--- a/engines/kyra/screen_lol.cpp
+++ b/engines/kyra/screen_lol.cpp
@@ -42,8 +42,10 @@ Screen_LoL::Screen_LoL(LoLEngine *vm, OSystem *system) : Screen_v2(vm, system),
 	for (int i = 0; i < 8; i++)
 		_levelOverlays[i] = new uint8[256];
 
-	_fadeFlag = 2;
+	_screenDimTable = 0;
+	_customDimTable = 0;
 	_curDimIndex = 0;
+	_fadeFlag = 2;
 }
 
 Screen_LoL::~Screen_LoL() {
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 2dc9405f72..6d8776f3b0 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -657,13 +657,13 @@ void EobCoreEngine::drawFlyingObjects(int index) {
 				flipped = fo->direction == ((_currentDirection + 1) & 3) ? 1 : 0;
 			} else {
 				shp = (_flightObjShpMap[shpIx] + dirOffs) < _numThrownItemShapes ? _thrownItemShapes[_flightObjShpMap[shpIx] + dirOffs] : _spellShapes[_flightObjShpMap[shpIx - _numThrownItemShapes] + dirOffs];
-				flipped = _flightObjFlipIndex[(fo->direction << 2) + fo->curPos];
+				flipped = _flightObjFlipIndex[(fo->direction << 2) + (fo->curPos & 3)];
 			}
 
 		} else {
 			rstFade = true;
 			shp = (fo->objectType < _numThrownItemShapes) ? _thrownItemShapes[fo->objectType] : _spellShapes[fo->objectType - _numThrownItemShapes];
-			flipped = _flightObjFlipIndex[(fo->direction << 2) + fo->curPos];
+			flipped = _flightObjFlipIndex[(fo->direction << 2) + (fo->curPos & 3)];
 
 			if (fo->flags & 0x40) {
 				x = _dscShapeCoords[(index * 5 + 4) << 1] + 88;
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 4ff879c69c..6f7dfc15ef 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -1230,7 +1230,7 @@ void EobEngine::initSpells() {
 	for (int i = 0; i < _numSpells; i++) {
 		EobSpell *s = &_spells[i];
 		src += 4;
-		s->flags = flagTable[i].typeFlag;/*convertSpellFlagToEob2Format(src[0], src[14]);*/
+		s->flags = flagTable[i].typeFlag;
 		s->damageFlags = flagTable[i].damageFlag;
 		s->effectFlags = flagTable[i].effectFlag;
 		s->sound = src[13];
diff --git a/engines/kyra/text_eob.cpp b/engines/kyra/text_eob.cpp
index e4e9b37379..1c0c7e5d41 100644
--- a/engines/kyra/text_eob.cpp
+++ b/engines/kyra/text_eob.cpp
@@ -287,8 +287,9 @@ void TextDisplayer_Eob::readNextPara() {
 		d &= 0x7f;
 		c = d & 7;
 		d = (d & 0x78) >> 3;
-		c = _table1[(d << 3) + c];
-		d = _table2[d];
+		uint8 l = d;
+		c = _table1[(l << 3) + c];
+		d = _table2[l];
 	}
 
 	_ctrl[1] = d;
-- 
cgit v1.2.3


From 532f8f33f2dad8c0292c41301926becc5198a83e Mon Sep 17 00:00:00 2001
From: athrxx
Date: Fri, 30 Sep 2011 19:34:42 +0200
Subject: KYRA: (EOB) - fix mem leak

---
 engines/kyra/eobcommon.h       |   2 +-
 engines/kyra/gui_eob.cpp       |  13 +-
 engines/kyra/lol.h             |   1 -
 engines/kyra/loleobbase.cpp    |   4 +
 engines/kyra/loleobbase.h      |   1 +
 engines/kyra/staticres_eob.cpp | 332 ++++++++++++++++++++++++-----------------
 6 files changed, 206 insertions(+), 147 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 800716c81e..795b0178d2 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -71,7 +71,6 @@ struct EobGuiButtonDef {
 	uint8 y;
 	uint16 w;
 	uint8 h;
-	Button::Callback buttonCallback;
 	uint16 arg;
 };
 
@@ -738,6 +737,7 @@ protected:
 	int _buttonList8Size;
 
 	const EobGuiButtonDef *_buttonDefs;
+
 	const char *const *_characterGuiStringsHp;
 	const char *const *_characterGuiStringsWp;
 	const char *const *_characterGuiStringsWr;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index af97d487cb..4ced205d91 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -85,7 +85,6 @@ void LolEobBaseEngine::gui_drawHorizontalBarGraph(int x, int y, int w, int h, in
 }
 
 void LolEobBaseEngine::gui_initButtonsFromList(const int16 *list) {
-	return;
 	while (*list != -1)
 		gui_initButton(*list++);
 }
@@ -808,13 +807,17 @@ void EobCoreEngine::gui_initButton(int index, int, int, int) {
 	b->index = index + 1;
 
 	const EobGuiButtonDef *d = &_buttonDefs[index];
+	b->buttonCallback = _buttonCallbacks[index];
 
 	if (_flags.gameID == GI_EOB1) {
 		// EOB1 spellbook modifications
-		if (index > 60 && index < 66)
+		if (index > 60 && index < 66) {
 			d = &_buttonDefs[index + 33];
-		if (index == 88)
+			b->buttonCallback = _buttonCallbacks[index + 33];
+		} else if (index == 88) {
 			d = &_buttonDefs[index + 12];
+			b->buttonCallback = _buttonCallbacks[index + 12];
+		}
 	}
 
 	b->x = d->x;
@@ -830,7 +833,6 @@ void EobCoreEngine::gui_initButton(int index, int, int, int) {
 	b->keyCode = d->keyCode;
 	b->keyCode2 = d->keyCode2;
 	b->arg = d->arg;
-	b->buttonCallback = d->buttonCallback;
 }
 
 int EobCoreEngine::clickedCharPortraitDefault(Button *button) {
@@ -1437,8 +1439,6 @@ void EobCoreEngine::gui_processInventorySlotClick(int slot) {
 }
 
 GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
-	//_scrollUpFunctor = _scrollDownFunctor = BUTTON_FUNCTOR(GUI_Eob, this, 0);
-
 	_menuStringsPrefsTemp = new char*[4];
 	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char*));
 
@@ -1601,7 +1601,6 @@ void GUI_Eob::processButton(Button *button) {
 }
 
 int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8 mouseWheel) {
-	return 0;
 	_progress = 0;
 	uint16 in = inputFlags & 0xff;
 	uint16 buttonReleaseFlag = 0;
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index ae3408eb1a..7bd67686e6 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -561,7 +561,6 @@ private:
 	int clickedLamp(Button *button);
 	int clickedStatusIcon(Button *button);
 
-	Common::Array<Button::Callback> _buttonCallbacks;
 	const LoLButtonDef *_buttonData;
 	const int16 *_buttonList1;
 	const int16 *_buttonList2;
diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
index bcab2781a0..3db7537ded 100644
--- a/engines/kyra/loleobbase.cpp
+++ b/engines/kyra/loleobbase.cpp
@@ -149,6 +149,10 @@ LolEobBaseEngine::~LolEobBaseEngine() {
 	delete[] _levelDecorationData;
 	delete[] _levelDecorationProperties;
 	delete[] _levelBlockProperties;
+
+	for (Common::Array<Button::Callback>::iterator i = _buttonCallbacks.begin(); i != _buttonCallbacks.end(); ++i)
+		i->reset();
+	_buttonCallbacks.clear();
 }
 
 Common::Error LolEobBaseEngine::init() {
diff --git a/engines/kyra/loleobbase.h b/engines/kyra/loleobbase.h
index cb7f920cb8..06d0688058 100644
--- a/engines/kyra/loleobbase.h
+++ b/engines/kyra/loleobbase.h
@@ -256,6 +256,7 @@ protected:
 
 	Button *_activeButtons;
 	Button _activeButtonData[70];
+	Common::Array<Button::Callback> _buttonCallbacks;
 	//bool _processingButtons;
 
 	uint8 _mouseClick;
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 6f7dfc15ef..e90fea5467 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -570,114 +570,170 @@ void EobCoreEngine::initStaticResource() {
 }
 
 void EobCoreEngine::initButtonData() {
-	#define EOB_CB(x)	BUTTON_FUNCTOR(EobCoreEngine, this, &EobCoreEngine::x)
 	static const EobGuiButtonDef buttonDefs[] = {
-		{ 112, 0, 0x1100, 184, 2, 63, 50, EOB_CB(clickedCharPortraitDefault), 0 },
-		{ 113, 0, 0x1100, 256, 2, 63, 50, EOB_CB(clickedCharPortraitDefault), 1 },
-		{ 114, 0, 0x1100, 184, 54, 63, 50, EOB_CB(clickedCharPortraitDefault), 2 },
-		{ 115, 0, 0x1100, 256, 54, 63, 50, EOB_CB(clickedCharPortraitDefault), 3 },
-		{ 48, 110, 0x1100, 289, 177, 31, 21, EOB_CB(clickedCamp), 0 },
-		{ 0, 0, 0x1100, 0, 102, 88, 18, EOB_CB(clickedSceneDropPickupItem), 0 },
-		{ 0, 0, 0x1100, 89, 102, 88, 18, EOB_CB(clickedSceneDropPickupItem), 1 },
-		{ 0, 0, 0x1100, 0, 72, 88, 29, EOB_CB(clickedSceneDropPickupItem), 2 },
-		{ 0, 0, 0x1100, 89, 72, 88, 29, EOB_CB(clickedSceneDropPickupItem), 3 },
-		{ 24, 0, 0x1100, 184, 10, 33, 33, EOB_CB(clickedCharPortrait2), 0 },
-		{ 0, 0, 0x1100, 256, 10, 33, 33, EOB_CB(clickedCharPortrait2), 1 },
-		{ 0, 0, 0x1100, 184, 62, 33, 33, EOB_CB(clickedCharPortrait2), 2 },
-		{ 0, 0, 0x1100, 256, 62, 33, 33, EOB_CB(clickedCharPortrait2), 3 },
-		{ 0, 0, 0x1100, 216, 10, 31, 33, EOB_CB(clickedWeaponSlot), 0 },
-		{ 0, 0, 0x1100, 288, 10, 31, 33, EOB_CB(clickedWeaponSlot), 1 },
-		{ 0, 0, 0x1100, 216, 62, 31, 33, EOB_CB(clickedWeaponSlot), 2 },
-		{ 0, 0, 0x1100, 288, 62, 31, 33, EOB_CB(clickedWeaponSlot), 3 },
-		{ 368, 0, 0x1000, 184, 2, 63, 8, EOB_CB(clickedCharNameLabelRight), 0 },
-		{ 369, 0, 0x1000, 256, 2, 63, 8, EOB_CB(clickedCharNameLabelRight), 1 },
-		{ 370, 0, 0x1000, 184, 54, 63, 8, EOB_CB(clickedCharNameLabelRight), 2 },
-		{ 371, 0, 0x1000, 256, 54, 63, 8, EOB_CB(clickedCharNameLabelRight), 3 },
-		{ 0, 0, 0x1100, 230, 116, 16, 16, EOB_CB(clickedInventorySlot), 0 },
-		{ 0, 0, 0x1100, 278, 116, 16, 16, EOB_CB(clickedInventorySlot), 1 },
-		{ 0, 0, 0x1100, 181, 40, 16, 16, EOB_CB(clickedInventorySlot), 2 },
-		{ 0, 0, 0x1100, 199, 40, 16, 16, EOB_CB(clickedInventorySlot), 3 },
-		{ 0, 0, 0x1100, 181, 58, 16, 16, EOB_CB(clickedInventorySlot), 4 },
-		{ 0, 0, 0x1100, 199, 58, 16, 16, EOB_CB(clickedInventorySlot), 5 },
-		{ 0, 0, 0x1100, 181, 76, 16, 16, EOB_CB(clickedInventorySlot), 6 },
-		{ 0, 0, 0x1100, 199, 76, 16, 16, EOB_CB(clickedInventorySlot), 7 },
-		{ 0, 0, 0x1100, 181, 94, 16, 16, EOB_CB(clickedInventorySlot), 8 },
-		{ 0, 0, 0x1100, 199, 94, 16, 16, EOB_CB(clickedInventorySlot), 9 },
-		{ 0, 0, 0x1100, 181, 112, 16, 16, EOB_CB(clickedInventorySlot), 10 },
-		{ 0, 0, 0x1100, 199, 112, 16, 16, EOB_CB(clickedInventorySlot), 11 },
-		{ 0, 0, 0x1100, 181, 130, 16, 16, EOB_CB(clickedInventorySlot), 12 },
-		{ 0, 0, 0x1100, 199, 130, 16, 16, EOB_CB(clickedInventorySlot), 13 },
-		{ 0, 0, 0x1100, 181, 148, 16, 16, EOB_CB(clickedInventorySlot), 14 },
-		{ 0, 0, 0x1100, 199, 148, 16, 16, EOB_CB(clickedInventorySlot), 15 },
-		{ 0, 0, 0x1100, 225, 55, 16, 16, EOB_CB(clickedInventorySlot), 16 },
-		{ 0, 0, 0x1100, 224, 76, 16, 16, EOB_CB(clickedInventorySlot), 17 },
-		{ 0, 0, 0x1100, 225, 96, 16, 16, EOB_CB(clickedInventorySlot), 18 },
-		{ 0, 0, 0x1100, 298, 55, 16, 16, EOB_CB(clickedInventorySlot), 19 },
-		{ 0, 0, 0x1100, 287, 75, 16, 16, EOB_CB(clickedInventorySlot), 20 },
-		{ 0, 0, 0x1100, 277, 137, 16, 16, EOB_CB(clickedInventorySlot), 21 },
-		{ 0, 0, 0x1100, 300, 94, 16, 16, EOB_CB(clickedInventorySlot), 22 },
-		{ 0, 0, 0x1100, 300, 112, 16, 16, EOB_CB(clickedInventorySlot), 23 },
-		{ 0, 0, 0x1100, 300, 130, 16, 16, EOB_CB(clickedInventorySlot), 24 },
-		{ 0, 0, 0x1100, 236, 37, 31, 16, EOB_CB(clickedEatItem), 25 },
-		{ 26, 0, 0x1100, 291, 149, 25, 17, EOB_CB(clickedInventoryNextPage), 25 },
-		{ 110, 24, 0x1100, 181, 3, 32, 32, EOB_CB(clickedPortraitRestore), 25 },
-		{ 96, 352, 0x1100, 24, 128, 21, 16, EOB_CB(clickedUpArrow), 25 },
-		{ 98, 97, 0x1100, 24, 144, 21, 16, EOB_CB(clickedDownArrow), 25 },
-		{ 92, 348, 0x1100, 3, 144, 21, 16, EOB_CB(clickedLeftArrow), 25 },
-		{ 102, 358, 0x1100, 45, 144, 21, 16, EOB_CB(clickedRightArrow), 25 },
-		{ 91, 0, 0x1100, 3, 128, 21, 16, EOB_CB(clickedTurnLeftArrow), 25 },
-		{ 101, 0, 0x1100, 45, 128, 21, 16, EOB_CB(clickedTurnRightArrow), 25 },
-		{ 110, 0, 0x1100, 184, 0, 136, 120, EOB_CB(clickedAbortCharSwitch), 0 },
-		{ 0, 0, 0x1100, 0, 8, 88, 48, EOB_CB(clickedSceneThrowItem), 0 },
-		{ 0, 0, 0x1100, 88, 8, 88, 48, EOB_CB(clickedSceneThrowItem), 1 },
-		{ 0, 0, 0x1100, 24, 8, 128, 96, EOB_CB(clickedSceneSpecial), 1 },
-		{ 112, 113, 0x1100, 274, 35, 20, 15, EOB_CB(clickedInventoryPrevChar), 1 },
-		{ 114, 115, 0x1100, 297, 35, 20, 15, EOB_CB(clickedInventoryNextChar), 1 },
-		{ 2, 0, 0x1100, 68, 121, 18, 10, EOB_CB(clickedSpellbookTab), 0 },
-		{ 3, 0, 0x1100, 86, 121, 18, 10, EOB_CB(clickedSpellbookTab), 1 },
-		{ 4, 0, 0x1100, 104, 121, 15, 10, EOB_CB(clickedSpellbookTab), 2 },
-		{ 5, 0, 0x1100, 122, 121, 15, 10, EOB_CB(clickedSpellbookTab), 3 },
-		{ 6, 0, 0x1100, 140, 121, 15, 10, EOB_CB(clickedSpellbookTab), 4 },
-		{ 0, 0, 0x1100, 75, 131, 97, 6, EOB_CB(clickedSpellbookList), 0 },
-		{ 0, 0, 0x1100, 75, 137, 97, 6, EOB_CB(clickedSpellbookList), 1 },
-		{ 0, 0, 0x1100, 75, 143, 97, 6, EOB_CB(clickedSpellbookList), 2 },
-		{ 0, 0, 0x1100, 75, 149, 97, 6, EOB_CB(clickedSpellbookList), 3 },
-		{ 0, 0, 0x1100, 75, 155, 97, 6, EOB_CB(clickedSpellbookList), 4 },
-		{ 0, 0, 0x1100, 75, 161, 97, 6, EOB_CB(clickedSpellbookList), 5 },
-		{ 112, 0, 0x1100, 184, 2, 63, 50, EOB_CB(clickedCastSpellOnCharacter), 0 },
-		{ 113, 0, 0x1100, 256, 2, 63, 50, EOB_CB(clickedCastSpellOnCharacter), 1 },
-		{ 114, 0, 0x1100, 184, 54, 63, 50, EOB_CB(clickedCastSpellOnCharacter), 2 },
-		{ 115, 0, 0x1100, 256, 54, 63, 50, EOB_CB(clickedCastSpellOnCharacter), 3 },
-		{ 53, 54, 0x1100, 320, 200, 0, 0, EOB_CB(clickedSpellbookList), 6 },
-		{ 61, 0, 0x1100, 320, 200, 0, 0, EOB_CB(clickedSpellbookList), 7 },
-		{ 0, 0, 0x1100, 184, 114, 33, 33, EOB_CB(clickedCharPortrait2), 4 },
-		{ 0, 0, 0x1100, 256, 114, 33, 33, EOB_CB(clickedCharPortrait2), 5 },
-		{ 0, 0, 0x1100, 216, 114, 31, 33, EOB_CB(clickedWeaponSlot), 4 },
-		{ 0, 0, 0x1100, 288, 114, 31, 33, EOB_CB(clickedWeaponSlot), 5 },
-		{ 372, 0, 0x1000, 184, 106, 63, 8, EOB_CB(clickedCharNameLabelRight), 4 },
-		{ 373, 0, 0x1000, 256, 106, 63, 8, EOB_CB(clickedCharNameLabelRight), 5 },
-		{ 0, 0, 0x1100, 227, 135, 10, 10, EOB_CB(clickedInventorySlot), 25 },
-		{ 0, 0, 0x1100, 239, 135, 10, 10, EOB_CB(clickedInventorySlot), 26 },
-		{ 116, 0, 0x1100, 184, 106, 63, 50, EOB_CB(clickedCastSpellOnCharacter), 4 },
-		{ 117, 0, 0x1100, 256, 106, 63, 50, EOB_CB(clickedCastSpellOnCharacter), 5 },
-		{ 110, 0, 0x1100, 68, 168, 78, 10, EOB_CB(clickedSpellbookAbort), 0 },
-		{ 110, 0, 0x1100, 68, 168, 78, 10, EOB_CB(clickedCastSpellOnCharacter), 65535 },
-		{ 116, 0, 0x1100, 184, 106, 63, 50, EOB_CB(clickedCharPortraitDefault), 4 },
-		{ 117, 0, 0x1100, 256, 106, 63, 50, EOB_CB(clickedCharPortraitDefault), 5 },
-		{ 116, 117, 0x1100, 320, 200, 1, 1, EOB_CB(clickedInventoryNextChar), 2 },
-		{ 7, 0, 0x1100, 158, 121, 15, 10, EOB_CB(clickedSpellbookTab), 5 },
-		{ 0, 0, 0x1100, 146, 168, 32, 10, EOB_CB(clickedSpellbookScroll), 0 },
+		{ 112, 0, 0x1100, 184, 2, 63, 50, 0 },
+		{ 113, 0, 0x1100, 256, 2, 63, 50, 1 },
+		{ 114, 0, 0x1100, 184, 54, 63, 50, 2 },
+		{ 115, 0, 0x1100, 256, 54, 63, 50, 3 },
+		{ 48, 110, 0x1100, 289, 177, 31, 21, 0 },
+		{ 0, 0, 0x1100, 0, 102, 88, 18, 0 },
+		{ 0, 0, 0x1100, 89, 102, 88, 18, 1 },
+		{ 0, 0, 0x1100, 0, 72, 88, 29, 2 },
+		{ 0, 0, 0x1100, 89, 72, 88, 29, 3 },
+		{ 24, 0, 0x1100, 184, 10, 33, 33, 0 },
+		{ 0, 0, 0x1100, 256, 10, 33, 33, 1 },
+		{ 0, 0, 0x1100, 184, 62, 33, 33, 2 },
+		{ 0, 0, 0x1100, 256, 62, 33, 33, 3 },
+		{ 0, 0, 0x1100, 216, 10, 31, 33, 0 },
+		{ 0, 0, 0x1100, 288, 10, 31, 33, 1 },
+		{ 0, 0, 0x1100, 216, 62, 31, 33, 2 },
+		{ 0, 0, 0x1100, 288, 62, 31, 33, 3 },
+		{ 368, 0, 0x1000, 184, 2, 63, 8, 0 },
+		{ 369, 0, 0x1000, 256, 2, 63, 8, 1 },
+		{ 370, 0, 0x1000, 184, 54, 63, 8, 2 },		
+		{ 371, 0, 0x1000, 256, 54, 63, 8, 3 },
+		{ 0, 0, 0x1100, 230, 116, 16, 16, 0 },
+		{ 0, 0, 0x1100, 278, 116, 16, 16, 1 },
+		{ 0, 0, 0x1100, 181, 40, 16, 16, 2 },
+		{ 0, 0, 0x1100, 199, 40, 16, 16, 3 },
+		{ 0, 0, 0x1100, 181, 58, 16, 16, 4 },
+		{ 0, 0, 0x1100, 199, 58, 16, 16, 5 },
+		{ 0, 0, 0x1100, 181, 76, 16, 16, 6 },
+		{ 0, 0, 0x1100, 199, 76, 16, 16, 7 },
+		{ 0, 0, 0x1100, 181, 94, 16, 16, 8 },		
+		{ 0, 0, 0x1100, 199, 94, 16, 16, 9 },
+		{ 0, 0, 0x1100, 181, 112, 16, 16, 10 },
+		{ 0, 0, 0x1100, 199, 112, 16, 16, 11 },
+		{ 0, 0, 0x1100, 181, 130, 16, 16, 12 },
+		{ 0, 0, 0x1100, 199, 130, 16, 16, 13 },
+		{ 0, 0, 0x1100, 181, 148, 16, 16, 14 },
+		{ 0, 0, 0x1100, 199, 148, 16, 16, 15 },
+		{ 0, 0, 0x1100, 225, 55, 16, 16, 16 },
+		{ 0, 0, 0x1100, 224, 76, 16, 16, 17 },
+		{ 0, 0, 0x1100, 225, 96, 16, 16, 18 },
+		{ 0, 0, 0x1100, 298, 55, 16, 16, 19 },
+		{ 0, 0, 0x1100, 287, 75, 16, 16, 20 },
+		{ 0, 0, 0x1100, 277, 137, 16, 16, 21 },
+		{ 0, 0, 0x1100, 300, 94, 16, 16, 22 },
+		{ 0, 0, 0x1100, 300, 112, 16, 16, 23 },
+		{ 0, 0, 0x1100, 300, 130, 16, 16, 24 },
+		{ 0, 0, 0x1100, 236, 37, 31, 16, 25 },
+		{ 26, 0, 0x1100, 291, 149, 25, 17, 25 },
+		{ 110, 24, 0x1100, 181, 3, 32, 32, 25 },
+		{ 96, 352, 0x1100, 24, 128, 21, 16, 25 },
+		{ 98, 97, 0x1100, 24, 144, 21, 16, 25 },
+		{ 92, 348, 0x1100, 3, 144, 21, 16, 25 },
+		{ 102, 358, 0x1100, 45, 144, 21, 16, 25 },
+		{ 91, 0, 0x1100, 3, 128, 21, 16, 25 },
+		{ 101, 0, 0x1100, 45, 128, 21, 16, 25 },
+		{ 110, 0, 0x1100, 184, 0, 136, 120, 0 },
+		{ 0, 0, 0x1100, 0, 8, 88, 48, 0 },
+		{ 0, 0, 0x1100, 88, 8, 88, 48, 1 },
+		{ 0, 0, 0x1100, 24, 8, 128, 96, 1 },
+		{ 112, 113, 0x1100, 274, 35, 20, 15, 1 },
+		{ 114, 115, 0x1100, 297, 35, 20, 15, 1 },
+		{ 2, 0, 0x1100, 68, 121, 18, 10, 0 },
+		{ 3, 0, 0x1100, 86, 121, 18, 10, 1 },
+		{ 4, 0, 0x1100, 104, 121, 15, 10, 2 },
+		{ 5, 0, 0x1100, 122, 121, 15, 10, 3 },
+		{ 6, 0, 0x1100, 140, 121, 15, 10, 4 },
+		{ 0, 0, 0x1100, 75, 131, 97, 6, 0 },
+		{ 0, 0, 0x1100, 75, 137, 97, 6, 1 },
+		{ 0, 0, 0x1100, 75, 143, 97, 6, 2 },
+		{ 0, 0, 0x1100, 75, 149, 97, 6, 3 },
+		{ 0, 0, 0x1100, 75, 155, 97, 6, 4 },
+		{ 0, 0, 0x1100, 75, 161, 97, 6, 5 },
+		{ 112, 0, 0x1100, 184, 2, 63, 50, 0 },
+		{ 113, 0, 0x1100, 256, 2, 63, 50, 1 },
+		{ 114, 0, 0x1100, 184, 54, 63, 50, 2 },
+		{ 115, 0, 0x1100, 256, 54, 63, 50, 3 },
+		{ 53, 54, 0x1100, 320, 200, 0, 0, 6 },
+		{ 61, 0, 0x1100, 320, 200, 0, 0, 7 },
+		{ 0, 0, 0x1100, 184, 114, 33, 33, 4 },
+		{ 0, 0, 0x1100, 256, 114, 33, 33, 5 },
+		{ 0, 0, 0x1100, 216, 114, 31, 33, 4 },
+		{ 0, 0, 0x1100, 288, 114, 31, 33, 5 },
+		{ 372, 0, 0x1000, 184, 106, 63, 8, 4 },
+		{ 373, 0, 0x1000, 256, 106, 63, 8, 5 },
+		{ 0, 0, 0x1100, 227, 135, 10, 10, 25 },
+		{ 0, 0, 0x1100, 239, 135, 10, 10, 26 },
+		{ 116, 0, 0x1100, 184, 106, 63, 50, 4 },
+		{ 117, 0, 0x1100, 256, 106, 63, 50, 5 },
+		{ 110, 0, 0x1100, 68, 168, 78, 10, 0 },
+		{ 110, 0, 0x1100, 68, 168, 78, 10, 65535 },
+		{ 116, 0, 0x1100, 184, 106, 63, 50, 4 },
+		{ 117, 0, 0x1100, 256, 106, 63, 50, 5 },
+		{ 116, 117, 0x1100, 320, 200, 1, 1, 2 },
+		{ 7, 0, 0x1100, 158, 121, 15, 10, 5 },
+		{ 0, 0, 0x1100, 146, 168, 32, 10, 0 },
 
 		// EOB1 spellbook modifications
-		{ 2, 0, 0x1100, 71, 122, 20, 8, EOB_CB(clickedSpellbookTab), 0 },
-		{ 3, 0, 0x1100, 92, 122, 20, 8, EOB_CB(clickedSpellbookTab), 1 },
-		{ 4, 0, 0x1100, 113, 122, 20, 8, EOB_CB(clickedSpellbookTab), 2 },
-		{ 5, 0, 0x1100, 134, 122, 20, 8, EOB_CB(clickedSpellbookTab), 3 },
-		{ 6, 0, 0x1100, 155, 122, 20, 8, EOB_CB(clickedSpellbookTab), 4 },
-		{ 110, 0, 0x1100, 75, 168, 97, 6, EOB_CB(clickedSpellbookAbort), 0 }
+		{ 2, 0, 0x1100, 71, 122, 20, 8, 0 },
+		{ 3, 0, 0x1100, 92, 122, 20, 8, 1 },
+		{ 4, 0, 0x1100, 113, 122, 20, 8, 2 },
+		{ 5, 0, 0x1100, 134, 122, 20, 8, 3 },
+		{ 6, 0, 0x1100, 155, 122, 20, 8, 4 },
+		{ 110, 0, 0x1100, 75, 168, 97, 6, 0 }
 	};
 
 	_buttonDefs = buttonDefs;
+	_buttonCallbacks.clear();
+	_buttonCallbacks.reserve(ARRAYSIZE(buttonDefs));
+
+#define EOB_CBN(x) _buttonCallbacks.push_back(BUTTON_FUNCTOR(EobCoreEngine, this, &EobCoreEngine::x))
+#define EOB_CBR(x) for (int l = x; l; l--) { _buttonCallbacks.push_back(_buttonCallbacks[_buttonCallbacks.size() - 1]); }
+#define EOB_CBI(x, y) for (int l = x; l; l--) { _buttonCallbacks.push_back(_buttonCallbacks[y]); }
+	EOB_CBN(clickedCharPortraitDefault);
+	EOB_CBR(3);
+	EOB_CBN(clickedCamp);
+	EOB_CBN(clickedSceneDropPickupItem);
+	EOB_CBR(3);
+	EOB_CBN(clickedCharPortrait2);
+	EOB_CBR(3);
+	EOB_CBN(clickedWeaponSlot);
+	EOB_CBR(3);
+	EOB_CBN(clickedCharNameLabelRight);
+	EOB_CBR(3);
+	EOB_CBN(clickedInventorySlot);
+	EOB_CBR(24);
+	EOB_CBN(clickedEatItem);
+	EOB_CBN(clickedInventoryNextPage);
+	EOB_CBN(clickedPortraitRestore);
+	EOB_CBN(clickedUpArrow);
+	EOB_CBN(clickedDownArrow);
+	EOB_CBN(clickedLeftArrow);
+	EOB_CBN(clickedRightArrow);
+	EOB_CBN(clickedTurnLeftArrow);
+	EOB_CBN(clickedTurnRightArrow);
+	EOB_CBN(clickedAbortCharSwitch);
+	EOB_CBN(clickedSceneThrowItem);
+	EOB_CBR(1);
+	EOB_CBN(clickedSceneSpecial);
+	EOB_CBN(clickedInventoryPrevChar);
+	EOB_CBN(clickedInventoryNextChar);
+	EOB_CBN(clickedSpellbookTab);
+	EOB_CBR(4);
+	EOB_CBN(clickedSpellbookList);
+	EOB_CBR(5);
+	EOB_CBN(clickedCastSpellOnCharacter);
+	EOB_CBR(3);
+	EOB_CBI(2, 66);
+	EOB_CBI(2, 9);
+	EOB_CBI(2, 13);
+	EOB_CBI(2, 17);
+	EOB_CBI(2, 21);
+	EOB_CBI(2, 72);
+	EOB_CBN(clickedSpellbookAbort);
+	EOB_CBI(1, 72);
+	EOB_CBI(2, 0);
+	EOB_CBI(1, 60);
+	EOB_CBI(1, 61);
+	EOB_CBN(clickedSpellbookScroll);
+	EOB_CBI(5, 61);
+	EOB_CBI(1, 88);
+#undef EOB_CBI
+#undef EOB_CBR
+#undef EOB_CBN
 }
 
 void EobCoreEngine::initMenus() {
@@ -788,19 +844,19 @@ void EobCoreEngine::initSpells() {
 	mpn;
 	mp(0);	// Detect Magic
 	mpn;	// Magic Missile
-	mp1n;						///
+	mp1n;
 	mp(1);	// Shield
 	mp(2);	// Shocking Grasp
-	mp2(3);	// Blur				///
-	mp2(1);	// Detect Invis		///
-	mp2n;	// Imp Identify		///
+	mp2(3);	// Blur
+	mp2(1);	// Detect Invis
+	mp2n;	// Imp Identify
 	mpn;	// Invis
-	mp1n;						///
+	mp1n;
 	mpn;	// Melf
-	mp1n;	// Stinking Cloud	///
+	mp1n;	// Stinking Cloud
 	mpn;	// Dispel Magic
 	mpn;	// Fireball
-	mp1n;	// Flame Arrow		///
+	mp1n;	// Flame Arrow
 	mp(3);	// Haste
 	mpn;	// Hold Person
 	mpn;	// Invisibility
@@ -809,23 +865,23 @@ void EobCoreEngine::initSpells() {
 	mpn;	// Fear
 	mpn;	// Ice Storm
 	mp1n;	// Stone Skin
-	mp1n;	// Cloud Kill		///
-	mp2(4);	// Improved Invisibility	///
-	mp2n;	// remove Curse		///
+	mp1n;	// Cloud Kill
+	mp2(4);	// Improved Invisibility
+	mp2n;	// remove Curse
 	mpn;	// Cone of Cold
 	mpn;	// Hold Monster
-	mp2n;	// Wall of Force	///
-	mp2n;	// Disintegrate		///
-	mp2n;	// Flesh To Stone	///
-	mp2n;	// Stone To Flesh	///
-	mp2(2);	// True Seeing		///
-	mp2n;	// Finger of Death	///
-	mp2n;	// Power Word Stun	///
-	mp2n;	// Bigby's Fist		///
-	mp2n;	// empty			///
+	mp2n;	// Wall of Force
+	mp2n;	// Disintegrate
+	mp2n;	// Flesh To Stone
+	mp2n;	// Stone To Flesh
+	mp2(2);	// True Seeing
+	mp2n;	// Finger of Death
+	mp2n;	// Power Word Stun
+	mp2n;	// Bigby's Fist
+	mp2n;	// empty
 	mp(5);	// Bless
-	mpn;						/// EOB1: cure, EOB2: cause
-	mpn;						/// EOB1: cause, EOB2: cure
+	mpn;						// EOB1: cure, EOB2: cause
+	mpn;						// EOB1: cause, EOB2: cure
 	mp(0);	// Detect Magic
 	mp(6);	// Prot from Evil
 	mp(7);	// Aid
@@ -837,25 +893,25 @@ void EobCoreEngine::initSpells() {
 	mp(1);	// Magical Vestment
 	mp(2);	// Prayer
 	mpn;	// Remove Paralysis
-	mpn;						/// EOB1: cure, EOB2: cause
-	mpn;						/// EOB1: cause, EOB2: cure
+	mpn;						// EOB1: cure, EOB2: cause
+	mpn;						// EOB1: cause, EOB2: cure
 	mpn;	// Neutral Poison
 	mp(6);	// Prot From Evil 10'
-	mp1n;	// Prot From Lightning			/// --- para required?
-	mpn;						/// EOB1: cure, EOB2: cause
-	mpn;						/// EOB1: cause, EOB2: cure
+	mp1n;	// Prot From Lightning
+	mpn;						// EOB1: cure, EOB2: cause
+	mpn;						// EOB1: cause, EOB2: cure
 	mpn;	// Flame Strike
 	mpn;	// Raise Dead
-	mp2n;	// Slay Living		///
-	mp2(2);	// True Seeing		///
-	mp2n;	// Harm				///
-	mp2n;	// Heal				///
-	mp2n;	// Resurrect		///
+	mp2n;	// Slay Living
+	mp2(2);	// True Seeing
+	mp2n;	// Harm
+	mp2n;	// Heal
+	mp2n;	// Resurrect
 	mpn;	// Lay on Hands
-	mp2n;	// Turn Undead		///
-	mpn;	// UNK 1 passive
-	mp2(10);// Mystic Defense	///
-	mp2n;	// UNK 2 passive	///
+	mp2n;	// Turn Undead
+	mpn;	// Lightning Bolt (EOB1) / Fireball 1(EOB2) passive
+	mp2(10);// Mystic Defense
+	mp2n;	// Fireball 2 passive
 	mpn;	// death spell passive
 	mpn;	// disintegrate passive
 	mp2n;	// cause critical passive
@@ -921,7 +977,7 @@ void EobCoreEngine::initSpells() {
 	sc1(causeSeriousWounds);
 	sc(neutralizePoison);
 	sc(empty);
-	sc1(empty);	// Prot from Lightning
+	sc1(empty);
 	sc2(causeCriticalWounds);
 	sc(cureCriticalWounds);
 	sc1(causeCriticalWounds);
-- 
cgit v1.2.3


From 812ea181b86aab153592c16bceea6a32b39b3cf4 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 2 Oct 2011 15:22:06 +0200
Subject: KYRA: (EOB) - cleanup

---
 engines/kyra/loleobbase.cpp    |  4 ---
 engines/kyra/staticres_eob.cpp | 66 +++++++++++++++++-------------------------
 2 files changed, 27 insertions(+), 43 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
index 3db7537ded..bcab2781a0 100644
--- a/engines/kyra/loleobbase.cpp
+++ b/engines/kyra/loleobbase.cpp
@@ -149,10 +149,6 @@ LolEobBaseEngine::~LolEobBaseEngine() {
 	delete[] _levelDecorationData;
 	delete[] _levelDecorationProperties;
 	delete[] _levelBlockProperties;
-
-	for (Common::Array<Button::Callback>::iterator i = _buttonCallbacks.begin(); i != _buttonCallbacks.end(); ++i)
-		i->reset();
-	_buttonCallbacks.clear();
 }
 
 Common::Error LolEobBaseEngine::init() {
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index e90fea5467..72b09e45b4 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -680,59 +680,47 @@ void EobCoreEngine::initButtonData() {
 	_buttonCallbacks.clear();
 	_buttonCallbacks.reserve(ARRAYSIZE(buttonDefs));
 
-#define EOB_CBN(x) _buttonCallbacks.push_back(BUTTON_FUNCTOR(EobCoreEngine, this, &EobCoreEngine::x))
-#define EOB_CBR(x) for (int l = x; l; l--) { _buttonCallbacks.push_back(_buttonCallbacks[_buttonCallbacks.size() - 1]); }
+#define EOB_CBN(x, y) _buttonCallbacks.push_back(BUTTON_FUNCTOR(EobCoreEngine, this, &EobCoreEngine::y)); for (int l = 0; l < (x - 1); l++) { _buttonCallbacks.push_back(_buttonCallbacks[_buttonCallbacks.size() - 1 - l]); }
 #define EOB_CBI(x, y) for (int l = x; l; l--) { _buttonCallbacks.push_back(_buttonCallbacks[y]); }
-	EOB_CBN(clickedCharPortraitDefault);
-	EOB_CBR(3);
-	EOB_CBN(clickedCamp);
-	EOB_CBN(clickedSceneDropPickupItem);
-	EOB_CBR(3);
-	EOB_CBN(clickedCharPortrait2);
-	EOB_CBR(3);
-	EOB_CBN(clickedWeaponSlot);
-	EOB_CBR(3);
-	EOB_CBN(clickedCharNameLabelRight);
-	EOB_CBR(3);
-	EOB_CBN(clickedInventorySlot);
-	EOB_CBR(24);
-	EOB_CBN(clickedEatItem);
-	EOB_CBN(clickedInventoryNextPage);
-	EOB_CBN(clickedPortraitRestore);
-	EOB_CBN(clickedUpArrow);
-	EOB_CBN(clickedDownArrow);
-	EOB_CBN(clickedLeftArrow);
-	EOB_CBN(clickedRightArrow);
-	EOB_CBN(clickedTurnLeftArrow);
-	EOB_CBN(clickedTurnRightArrow);
-	EOB_CBN(clickedAbortCharSwitch);
-	EOB_CBN(clickedSceneThrowItem);
-	EOB_CBR(1);
-	EOB_CBN(clickedSceneSpecial);
-	EOB_CBN(clickedInventoryPrevChar);
-	EOB_CBN(clickedInventoryNextChar);
-	EOB_CBN(clickedSpellbookTab);
-	EOB_CBR(4);
-	EOB_CBN(clickedSpellbookList);
-	EOB_CBR(5);
-	EOB_CBN(clickedCastSpellOnCharacter);
-	EOB_CBR(3);
+	EOB_CBN(4, clickedCharPortraitDefault);
+	EOB_CBN(1, clickedCamp);
+	EOB_CBN(4, clickedSceneDropPickupItem);
+	EOB_CBN(4, clickedCharPortrait2);
+	EOB_CBN(4, clickedWeaponSlot);
+	EOB_CBN(4, clickedCharNameLabelRight);
+	EOB_CBN(25, clickedInventorySlot);
+	EOB_CBN(1, clickedEatItem);
+	EOB_CBN(1, clickedInventoryNextPage);
+	EOB_CBN(1, clickedPortraitRestore);
+	EOB_CBN(1, clickedUpArrow);
+	EOB_CBN(1, clickedDownArrow);
+	EOB_CBN(1, clickedLeftArrow);
+	EOB_CBN(1, clickedRightArrow);
+	EOB_CBN(1, clickedTurnLeftArrow);
+	EOB_CBN(1, clickedTurnRightArrow);
+	EOB_CBN(1, clickedAbortCharSwitch);
+	EOB_CBN(2, clickedSceneThrowItem);
+	EOB_CBN(1, clickedSceneSpecial);
+	EOB_CBN(1, clickedInventoryPrevChar);
+	EOB_CBN(1, clickedInventoryNextChar);
+	EOB_CBN(5, clickedSpellbookTab);
+	EOB_CBN(6, clickedSpellbookList);
+	EOB_CBN(4, clickedCastSpellOnCharacter);
 	EOB_CBI(2, 66);
 	EOB_CBI(2, 9);
 	EOB_CBI(2, 13);
 	EOB_CBI(2, 17);
 	EOB_CBI(2, 21);
 	EOB_CBI(2, 72);
-	EOB_CBN(clickedSpellbookAbort);
+	EOB_CBN(1, clickedSpellbookAbort);
 	EOB_CBI(1, 72);
 	EOB_CBI(2, 0);
 	EOB_CBI(1, 60);
 	EOB_CBI(1, 61);
-	EOB_CBN(clickedSpellbookScroll);
+	EOB_CBN(1, clickedSpellbookScroll);
 	EOB_CBI(5, 61);
 	EOB_CBI(1, 88);
 #undef EOB_CBI
-#undef EOB_CBR
 #undef EOB_CBN
 }
 
-- 
cgit v1.2.3


From a944990a6896e9e667e987a3cb3d3d8affc0e5b3 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 6 Nov 2011 23:06:05 +0100
Subject: KYRA: (EOB) - rename some saving throw related data

---
 engines/kyra/chargen.cpp       |  2 +-
 engines/kyra/eobcommon.cpp     | 24 ++++++++++++------------
 engines/kyra/eobcommon.h       | 12 ++++++------
 engines/kyra/resource.h        | 14 +++++++-------
 engines/kyra/staticres_eob.cpp | 16 ++++++++--------
 5 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 5231093133..a288359092 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -639,7 +639,7 @@ void CharacterGenerator::generateStats(int index) {
 		_chargenMaxStats[i] = _chargenRaceMaxStats[rc * 6 + i];
 	}
 
-	if (_vm->_charClassModUnk[c->cClass])
+	if (_vm->_charClassModifier[c->cClass])
 		_chargenMaxStats[0] = 18;
 
 	uint16 sv[6];
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 9e75be017c..6f58d3a4f6 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -157,7 +157,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 
 	_mainMenuStrings = _levelGainStrings = _monsterSpecAttStrings = _characterGuiStringsHp = _characterGuiStringsWp = _characterGuiStringsWr = _characterGuiStringsSt =
 		_characterGuiStringsIn = _characterStatusStrings7 = _characterStatusStrings8 = _characterStatusStrings9 = _characterStatusStrings12 = _characterStatusStrings13 = 0;
-	_classModifierFlags = _constModLevelIndex = _constModDiv = _constModExt = _wandTypes = _drawObjPosIndex = _flightObjFlipIndex = _expObjectTblIndex =
+	_classModifierFlags = _saveThrowLevelIndex = _saveThrowModDiv = _saveThrowModExt = _wandTypes = _drawObjPosIndex = _flightObjFlipIndex = _expObjectTblIndex =
 		_expObjectShpStart = _expObjectTlMode = _expObjectAnimTbl1 = _expObjectAnimTbl2 = _expObjectAnimTbl3 = 0;
 	_monsterStepTable0 = _monsterStepTable1 = _monsterStepTable2 = _monsterStepTable3 = _projectileWeaponAmmoTypes = _flightObjShpMap = _flightObjSclIndex = 0;
 	_monsterCloseAttPosTable1 = _monsterCloseAttPosTable2 = _monsterCloseAttChkTable1 = _monsterCloseAttChkTable2 = _monsterCloseAttDstTable1 = _monsterCloseAttDstTable2 = 0;
@@ -190,7 +190,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_mnNumWord = _numSpells = _mageSpellListSize = _spellLevelsMageSize = _spellLevelsClericSize = 0;
 	_inventorySlotsX = _slotValidationFlags = _encodeMonsterShpTable = 0;
 	memset(_expRequirementTables, 0, sizeof(_expRequirementTables));
-	memset(_constModTables, 0, sizeof(_constModTables));
+	memset(_saveThrowTables, 0, sizeof(_saveThrowTables));
 	memset(_doorType, 0, sizeof(_doorType));
 	memset(_noDoorSwitch, 0, sizeof(_noDoorSwitch));
 	memset(_scriptTimers, 0, sizeof(_scriptTimers));
@@ -1867,7 +1867,7 @@ int EobCoreEngine::calcCharacterDamage(int charIndex, int times, int itemOrPips,
 	EobCharacter *c = &_characters[charIndex];
 
 	if (savingThrowType != 5) {
-		if (trySavingThrow(c, _charClassModUnk[c->cClass], c->level[0], savingThrowType, c->raceSex >> 1 /*fix bug in original code by adding a right shift*/))
+		if (trySavingThrow(c, _charClassModifier[c->cClass], c->level[0], savingThrowType, c->raceSex >> 1 /*fix bug in original code by adding a right shift*/))
 			s = savingThrowReduceDamage(savingThrowEffect, s);
 	}
 
@@ -2197,7 +2197,7 @@ bool EobCoreEngine::trySavingThrow(void *target, int hpModifier, int level, int
 	if (type == 5)
 		return false;
 
-	int s = getConstModifierTableValue(hpModifier, level, type);
+	int s = getSaveThrowModifier(hpModifier, level, type);
 	if (((race == 3 || race == 5) && (type == 4 || type == 1 || type == 0)) || (race == 4 && (type == 4 || type == 1))) {
 		EobCharacter *c = (EobCharacter*)target;
 		s -= constMod[c->constitutionCur];
@@ -2207,15 +2207,15 @@ bool EobCoreEngine::trySavingThrow(void *target, int hpModifier, int level, int
 }
 
 bool EobCoreEngine::specialAttackSavingThrow(int charIndex, int type) {
-	return trySavingThrow(&_characters[charIndex], _charClassModUnk[_characters[charIndex].cClass], _characters[charIndex].level[0], type, _characters[charIndex].raceSex >> 1);
+	return trySavingThrow(&_characters[charIndex], _charClassModifier[_characters[charIndex].cClass], _characters[charIndex].level[0], type, _characters[charIndex].raceSex >> 1);
 }
 
-int EobCoreEngine::getConstModifierTableValue(int hpModifier, int level, int b) {
-	const uint8 *tbl = _constModTables[hpModifier];
-	if (_constModLevelIndex[hpModifier] < level)
-		level = _constModLevelIndex[hpModifier];
-	level /= _constModDiv[hpModifier];
-	level += (_constModExt[hpModifier] * b);
+int EobCoreEngine::getSaveThrowModifier(int hpModifier, int level, int type) {
+	const uint8 *tbl = _saveThrowTables[hpModifier];
+	if (_saveThrowLevelIndex[hpModifier] < level)
+		level = _saveThrowLevelIndex[hpModifier];
+	level /= _saveThrowModDiv[hpModifier];
+	level += (_saveThrowModExt[hpModifier] * type);
 
 	return tbl[level];
 }
@@ -2281,7 +2281,7 @@ int EobCoreEngine::getMonsterAcHitChanceModifier(int charIndex, int monsterAc) {
 	static const uint8 mod2[] = { 1, 1, 2, 1 };
 
 	int l = _characters[charIndex].level[0] - 1;
-	int cm = _charClassModUnk[_characters[charIndex].cClass];
+	int cm = _charClassModifier[_characters[charIndex].cClass];
 
 	return (20 - ((l / mod1[cm]) * mod2[cm])) - monsterAc;
 }
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 795b0178d2..e4c06fefcd 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -326,7 +326,7 @@ protected:
 	static const uint8 _hpIncrPerLevel[];
 	static const uint8 _numLevelsPerClass[];
 	static const int16 _hpConstModifiers[];
-	static const uint8 _charClassModUnk[];
+	static const uint8 _charClassModifier[];
 
 	const uint8 *_classModifierFlags;
 	
@@ -406,10 +406,10 @@ protected:
 	const char *const *_levelGainStrings;
 	const uint32 *_expRequirementTables[6];
 
-	const uint8 *_constModTables[6];
-	const uint8 *_constModLevelIndex;
-	const uint8 *_constModDiv;
-	const uint8 *_constModExt;
+	const uint8 *_saveThrowTables[6];
+	const uint8 *_saveThrowLevelIndex;
+	const uint8 *_saveThrowModDiv;
+	const uint8 *_saveThrowModExt;
 
 	const EobCharacter *_npcPreset;
 	int _npcSequenceSub;
@@ -891,7 +891,7 @@ protected:
 	int calcDamageModifers(int charIndex, EobMonsterInPlay *m, int item, int itemType, int useStrModifier);
 	bool trySavingThrow(void *target, int hpModifier, int level, int type, int race);
 	bool specialAttackSavingThrow(int charIndex, int type);
-	int getConstModifierTableValue(int hpModifier, int level, int b);
+	int getSaveThrowModifier(int hpModifier, int level, int type);
 	bool calcDamageCheckItemType(int itemType);
 	int savingThrowReduceDamage(int savingThrowEffect, int damage);
 	bool tryMonsterAttackEvasion(EobMonsterInPlay *m);
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index a7060cdf6d..8edfd0a174 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -277,13 +277,13 @@ enum KyraResources {
 	kEobBaseChargenRaceMinStats,
 	kEobBaseChargenRaceMaxStats,
 
-	kEobBaseConstModTable1,
-	kEobBaseConstModTable2,
-	kEobBaseConstModTable3,
-	kEobBaseConstModTable4,
-	kEobBaseConstModLvlIndex,
-	kEobBaseConstModDiv,
-	kEobBaseConstModExt,
+	kEobBaseSaveThrowTable1,
+	kEobBaseSaveThrowTable2,
+	kEobBaseSaveThrowTable3,
+	kEobBaseSaveThrowTable4,
+	kEobBaseSaveThrwLvlIndex,
+	kEobBaseSaveThrwModDiv,
+	kEobBaseSaveThrwModExt,
 
 	kEobBasePryDoorStrings,
 	kEobBaseWarningStrings,
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 72b09e45b4..ec5d184c28 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -274,7 +274,7 @@ const int8 EobCoreEngine::_characterClassType[] = {
 
 const int16 EobCoreEngine::_hpConstModifiers[] = { -1, -3, -2, -2, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 6, 6, 7, 7 };
 
-const uint8 EobCoreEngine::_charClassModUnk[] = {
+const uint8 EobCoreEngine::_charClassModifier[] = {
 	0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02,
 	0x00, 0x00, 0x02
 };
@@ -436,13 +436,13 @@ void EobCoreEngine::initStaticResource() {
 
 	_classModifierFlags = _staticres->loadRawData(kEobBaseClassModifierFlags, temp);
 
-	_constModTables[0] = _constModTables[4] = _constModTables[5] = _staticres->loadRawData(kEobBaseConstModTable1, temp);
-	_constModTables[1] = _staticres->loadRawData(kEobBaseConstModTable2, temp);
-	_constModTables[2] = _staticres->loadRawData(kEobBaseConstModTable3, temp);
-	_constModTables[3] = _staticres->loadRawData(kEobBaseConstModTable4, temp);
-	_constModLevelIndex = _staticres->loadRawData(kEobBaseConstModLvlIndex, temp);
-	_constModDiv = _staticres->loadRawData(kEobBaseConstModDiv, temp);
-	_constModExt = _staticres->loadRawData(kEobBaseConstModExt, temp);
+	_saveThrowTables[0] = _saveThrowTables[4] = _saveThrowTables[5] = _staticres->loadRawData(kEobBaseSaveThrowTable1, temp);
+	_saveThrowTables[1] = _staticres->loadRawData(kEobBaseSaveThrowTable2, temp);
+	_saveThrowTables[2] = _staticres->loadRawData(kEobBaseSaveThrowTable3, temp);
+	_saveThrowTables[3] = _staticres->loadRawData(kEobBaseSaveThrowTable4, temp);
+	_saveThrowLevelIndex = _staticres->loadRawData(kEobBaseSaveThrwLvlIndex, temp);
+	_saveThrowModDiv = _staticres->loadRawData(kEobBaseSaveThrwModDiv, temp);
+	_saveThrowModExt = _staticres->loadRawData(kEobBaseSaveThrwModExt, temp);
 
 	_encodeMonsterShpTable = _staticres->loadRawDataBe16(kEobBaseEncodeMonsterDefs, temp);
 	_npcPreset = _staticres->loadEobNpcData(kEobBaseNpcPresets, temp);
-- 
cgit v1.2.3


From 5837e0f94ea7abf67ecd618fb641eec98231ebcb Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sat, 12 Nov 2011 14:35:16 +0100
Subject: KYRA: (EOB) - make sure that the music stops after character
 generation in Eob 1

(also more cleanup)
---
 engines/kyra/chargen.cpp   | 26 ++------------------------
 engines/kyra/eobcommon.h   |  1 -
 engines/kyra/gui_eob.cpp   | 27 ++++++++++++++++++++++++---
 engines/kyra/gui_eob.h     |  7 +------
 engines/kyra/scene_eob.cpp |  3 +++
 5 files changed, 30 insertions(+), 34 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index a288359092..f7a546091d 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -224,7 +224,8 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 		finish();
 	}
 
-	_vm->sound()->playTrack(15);
+	if (_vm->game() == GI_EOB2)
+		_vm->sound()->playTrack(15);
 
 	*faceShapes = _faceShapes;
 	return true;
@@ -1406,29 +1407,6 @@ const EobRect8 CharacterGenerator::_chargenButtonBodyCoords[] = {
 	{ 0x14, 0x90, 0x0B, 0x10 }
 };
 
-const EobRect16 GUI_Eob::_updateBoxFrameHighLights[] = {
-	{ 0x00B7, 0x0001, 0x00F7, 0x0034 },
-	{ 0x00FF, 0x0001, 0x013F, 0x0034 },
-	{ 0x00B7, 0x0035, 0x00F7, 0x0068 },
-	{ 0x00FF, 0x0035, 0x013F, 0x0068 },
-	{ 0x00B7, 0x0069, 0x00F7, 0x009C },
-	{ 0x00FF, 0x0069, 0x013F, 0x009C },
-	{ 0x0010, 0x003F, 0x0030, 0x0060 },
-	{ 0x0050, 0x003F, 0x0070, 0x0060 },
-	{ 0x0010, 0x007F, 0x0030, 0x00A0 },
-	{ 0x0050, 0x007F, 0x0070, 0x00A0 },
-	{ 0x00B0, 0x0042, 0x00D0, 0x0061 },
-	{ 0x00D0, 0x0042, 0x00F0, 0x0061 },
-	{ 0x00F0, 0x0042, 0x0110, 0x0061 },
-	{ 0x0110, 0x0042, 0x0130, 0x0061 },
-	{ 0x0004, 0x0018, 0x0024, 0x0039 },
-	{ 0x00A3, 0x0018, 0x00C3, 0x0039 },
-	{ 0x0004, 0x0040, 0x0024, 0x0061 },
-	{ 0x00A3, 0x0040, 0x00C3, 0x0061 },
-	{ 0x0004, 0x0068, 0x0024, 0x0089 },
-	{ 0x00A3, 0x0068, 0x00C3, 0x0089 }
-};
-
 const int16 CharacterGenerator::_chargenBoxX[] = { 0x10, 0x50, 0x10, 0x50 };
 const int16 CharacterGenerator::_chargenBoxY[] = { 0x3F, 0x3F, 0x7F, 0x7F };
 const int16 CharacterGenerator::_chargenNameFieldX[] = { 0x02, 0x42, 0x02, 0x42 };
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index e4c06fefcd..06d43272cc 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -314,7 +314,6 @@ protected:
 	bool checkPartyStatus(bool handleDeath);
 
 	bool _runFlag;
-	//int _runLoopUnk2;
 
 	// Character generation / party transfer
 	bool startCharacterGeneration();
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 4ced205d91..f084bc9978 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -2451,9 +2451,7 @@ void GUI_Eob::messageDialogue2(int dim, int id, int buttonTextCol) {
 }
 
 void GUI_Eob::updateBoxFrameHighLight(int box) {
-	static const uint8 colorTable[] = { 0x0F, 0xB0, 0xB2, 0xB4, 0xB6,
-		0xB8, 0xBA, 0xBC, 0x0C, 0xBC, 0xBA, 0xB8, 0xB6, 0xB4, 0xB2, 0xB0, 0x00
-	};
+	static const uint8 colorTable[] = { 0x0F, 0xB0, 0xB2, 0xB4, 0xB6, 0xB8, 0xBA, 0xBC, 0x0C, 0xBC, 0xBA, 0xB8, 0xB6, 0xB4, 0xB2, 0xB0, 0x00 };
 
 	if (_updateBoxIndex == box) {
 		if (_updateBoxIndex == -1)
@@ -4044,6 +4042,29 @@ void GUI_Eob::restParty_updateRestTime(int hours, bool init) {
 	_screen->setFont(of);
 }
 
+const EobRect16 GUI_Eob::_updateBoxFrameHighLights[] = {
+	{ 0x00B7, 0x0001, 0x00F7, 0x0034 },
+	{ 0x00FF, 0x0001, 0x013F, 0x0034 },
+	{ 0x00B7, 0x0035, 0x00F7, 0x0068 },
+	{ 0x00FF, 0x0035, 0x013F, 0x0068 },
+	{ 0x00B7, 0x0069, 0x00F7, 0x009C },
+	{ 0x00FF, 0x0069, 0x013F, 0x009C },
+	{ 0x0010, 0x003F, 0x0030, 0x0060 },
+	{ 0x0050, 0x003F, 0x0070, 0x0060 },
+	{ 0x0010, 0x007F, 0x0030, 0x00A0 },
+	{ 0x0050, 0x007F, 0x0070, 0x00A0 },
+	{ 0x00B0, 0x0042, 0x00D0, 0x0061 },
+	{ 0x00D0, 0x0042, 0x00F0, 0x0061 },
+	{ 0x00F0, 0x0042, 0x0110, 0x0061 },
+	{ 0x0110, 0x0042, 0x0130, 0x0061 },
+	{ 0x0004, 0x0018, 0x0024, 0x0039 },
+	{ 0x00A3, 0x0018, 0x00C3, 0x0039 },
+	{ 0x0004, 0x0040, 0x0024, 0x0061 },
+	{ 0x00A3, 0x0040, 0x00C3, 0x0061 },
+	{ 0x0004, 0x0068, 0x0024, 0x0089 },
+	{ 0x00A3, 0x0068, 0x00C3, 0x0089 }
+};
+
 #endif // ENABLE_EOB
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index 30fd4ccc38..a0ac509026 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -106,9 +106,6 @@ private:
 
 	void restParty_updateRestTime(int hours, bool init);
 
-	Button _scrollUpButton;//////////////////77
-	Button _scrollDownButton;
-
 	char **_menuStringsPrefsTemp;
 	char **_saveSlotStringsTemp;
 	int16 *_saveSlotIdTemp;
@@ -130,9 +127,6 @@ private:
 	uint16 _prcButtonUnk3;
 	uint16 _cflag;
 
-	//Button::Callback _scrollUpFunctor;
-	//Button::Callback _scrollDownFunctor;
-
 	int _menuLineSpacing;
 	int _menuLastInFlags;
 
@@ -150,6 +144,7 @@ private:
 	int _updateBoxIndex;
 	int _updateBoxColorIndex;
 	uint32 _highLightBoxTimer;
+
 	static const EobRect16 _updateBoxFrameHighLights[];
 };
 
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index ce0cdf8b59..0aaad6d35c 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -620,6 +620,7 @@ namespace Kyra {
 void EobCoreEngine::loadLevel(int level, int sub) {
 	_currentLevel = level;
 	_currentSub = sub;
+	uint32 end = _system->getMillis() + 500;
 
 	Common::String file;
 	Common::SeekableReadStream *s = 0;
@@ -695,6 +696,8 @@ void EobCoreEngine::loadLevel(int level, int sub) {
 
 	loadVcnData(gfxFile.c_str(), 0);
 	_screen->loadEobBitmap("INVENT", 0, 5, 3, 2);
+	delayUntil(end);
+	snd_stopSound();
 
 	enableSysTimer(2);
 	_sceneDrawPage1 = 2;
-- 
cgit v1.2.3


From 49c111f8ca4a822ce98c81a9162899d3d1e4e6b2 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Fri, 25 Nov 2011 23:23:16 +0100
Subject: KYRA: (EOB) - ignore 'EYE.PAK' file in resource loader

(This seems to be some sort of installer archive which is not supported atm)
---
 engines/kyra/resource.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index 3aaab07c0d..e1b72275c3 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -84,7 +84,7 @@ bool Resource::reset() {
 				name.toUppercase();
 
 				// No PAK file
-				if (name == "TWMUSIC.PAK")
+				if (name == "TWMUSIC.PAK" || name == "EYE.PAK")
 					continue;
 
 				// We need to only load the script archive for the language the user specified
-- 
cgit v1.2.3


From aac7e16afa8546232a27754c6928cd43cd6ba876 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 28 Nov 2011 18:44:40 +0100
Subject: KYRA: (EOB) - fix some more bugs

- wrong usage of static array which caused issues when restarting after RTL
- portability issue with dialog labels
- (original code) bug in hold person spell
---
 engines/kyra/eob1.cpp          | 30 +++++++++++++--------------
 engines/kyra/eob1.h            | 12 +----------
 engines/kyra/eob2.cpp          | 10 ++++-----
 engines/kyra/eob2.h            |  3 +--
 engines/kyra/eobcommon.cpp     | 46 ++++++++++++++++++++++++++----------------
 engines/kyra/eobcommon.h       |  5 +++--
 engines/kyra/gui_eob.cpp       |  3 +--
 engines/kyra/magic_eob.cpp     |  4 ++--
 engines/kyra/scene_eob.cpp     | 20 +++++-------------
 engines/kyra/script_eob.cpp    |  2 +-
 engines/kyra/staticres_eob.cpp | 24 ++++++----------------
 11 files changed, 69 insertions(+), 90 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index c345b4710a..ae24b14efb 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -33,8 +33,8 @@ EobEngine::EobEngine(OSystem *system, const GameFlags &flags) : EobCoreEngine(sy
 	_menuChoiceInit = 4;
 
 	_turnUndeadString = _introFilesOpening = _introFilesTower = _introFilesOrb = _introFilesWdEntry	= _introFilesKing = _introFilesHands = _introFilesWdExit =
-		_introFilesTunnel = _finBonusStrings = _npc11Strings = _npc12Strings = _npc21Strings = _npc22Strings = _npc31Strings = _npc32Strings = _npc4Strings	=
-		_npc5Strings = _npc6Strings	= _npc7Strings = 0;
+		_introFilesTunnel = _finBonusStrings = _npcStrings[1] = _npcStrings[2] = _npcStrings[3] = _npcStrings[4] = _npcStrings[5] = _npcStrings[6] = _npcStrings[7]	=
+		_npcStrings[8] = _npcStrings[9]	= _npcStrings[10] = 0;
 	_introOpeningFrmDelay = _introWdEncodeX	= _introWdEncodeY = _introWdEncodeWH = _npcShpData = _npcSubShpIndex1 = _npcSubShpIndex2 = _npcSubShpY = _introWdDsY =
 		_introTvlX1 = _introTvlY1 = _introTvlX2	= _introTvlY2 = _introTvlW = _introTvlH = _dscDoorScaleMult4 = _dscDoorScaleMult5 = _dscDoorScaleMult6 =
 		_dscDoorY3 = _dscDoorY4 = _dscDoorY5 = _dscDoorY6 = _dscDoorY7 = _doorShapeEncodeDefs = _doorSwitchShapeEncodeDefs = _doorSwitchCoords = 0;
@@ -164,8 +164,8 @@ void EobEngine::encodeDrawNpcSeqShape(int npcIndex, int drawX, int drawY) {
 	delete[] shp;
 }
 
-#define DLG2(txt, buttonstr) (runDialogue(txt, 0, _npc##buttonstr##Strings[0], _npc##buttonstr##Strings[1], 0) - 1)
-#define DLG3(txt, buttonstr) (runDialogue(txt, 1, _npc##buttonstr##Strings[0], _npc##buttonstr##Strings[1], _npc##buttonstr##Strings[2], 0) - 1)
+#define DLG2(txt, buttonstr) (runDialogue(txt, 2, _npcStrings[buttonstr][0], _npcStrings[buttonstr][1]) - 1)
+#define DLG3(txt, buttonstr) (runDialogue(txt, 3, _npcStrings[buttonstr][0], _npcStrings[buttonstr][1], _npcStrings[buttonstr][2]) - 1)
 #define DLG2A3(cond, txt, buttonstr1, buttonstr2) ((cond) ? (DLG2(txt, buttonstr1) ? 2 : 0) : DLG3(txt, buttonstr2))
 #define TXT(txt) _txt->printDialogueText(txt, _moreStrings[0])
 
@@ -178,7 +178,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 	case 0:
 		for (r = 1; r == 1; ) {
 			gui_drawDialogueBox();
-			r = DLG2A3(checkScriptFlags(0x2000), 8, 12, 11);
+			r = DLG2A3(checkScriptFlags(0x2000), 8, 2, 1);
 			if (r == 1) {
 				TXT(1);
 				setScriptFlags(0x2000);
@@ -195,10 +195,10 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 				a = 1;
 			} else {
 				setScriptFlags(0x8000);
-				r = DLG2(3, 21);
+				r = DLG2(3, 3);
 			}
 			if (!r)
-				r = DLG2(a ? 13 : 4, 22);
+				r = DLG2(a ? 13 : 4, 4);
 			
 			if (!r) {
 				for (a = 0; a < 6; a++)
@@ -238,7 +238,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 		}
 
 		if (!r)
-			 _txt->printDialogueText(_npc0Strings[0], true);
+			 _txt->printDialogueText(_npcStrings[0][0], true);
 
 		break;
 
@@ -247,7 +247,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 			if (checkScriptFlags(0x20000)) {
 				TXT(11);
 			} else {
-				r = DLG2A3(!countResurrectionCandidates(), 9, 31, 32);
+				r = DLG2A3(!countResurrectionCandidates(), 9, 5, 6);
 				if (r < 2) {
 					if (r == 0)
 						healParty();
@@ -262,7 +262,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 		break;
 
 	case 3:
-		if (!DLG2(18, 4)) {
+		if (!DLG2(18, 7)) {
 			setScriptFlags(0x8400000);
 			for (a = 0; a < 30; a++) {
 				if (_monsters[a].mode == 8)
@@ -277,7 +277,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 		break;
 
 	case 4:
-		r = DLG3(14, 5);
+		r = DLG3(14, 8);
 		if (r == 0)
 			setScriptFlags(0x200000);
 		else if (r == 1)
@@ -286,7 +286,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 		break;
 
 	case 5:
-		if (!DLG2(16, 6)) {
+		if (!DLG2(16, 9)) {
 			TXT(17);
 			for (a = 0; a < 6; a++) {
 				for (r = 0; r < 2; r++) {
@@ -307,7 +307,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 		break;
 
 	case 7:
-		r = DLG3(22, 7);
+		r = DLG3(22, 10);
 		if (r  < 2) {
 			if (r == 0)
 				npcJoinDialogue(8, 27, 44, 45);
@@ -531,9 +531,9 @@ bool EobEngine::checkPartyStatusExtra() {
 
 int EobEngine::resurrectionSelectDialogue() {
 	gui_drawDialogueBox();
-	_txt->printDialogueText(_npc0Strings[1]);
+	_txt->printDialogueText(_npcStrings[0][1]);
 
-	int r = _rrId[runDialogue(-1, 1, _rrNames[0], _rrNames[1], _rrNames[2], _rrNames[3], _rrNames[4], _rrNames[5], _rrNames[6], _rrNames[7], _rrNames[8]) - 1];
+	int r = _rrId[runDialogue(-1, 9, _rrNames[0], _rrNames[1], _rrNames[2], _rrNames[3], _rrNames[4], _rrNames[5], _rrNames[6], _rrNames[7], _rrNames[8]) - 1];
 
 	if (r < 0) {
 		r = -r;
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
index 3eade85e6f..00583e9330 100644
--- a/engines/kyra/eob1.h
+++ b/engines/kyra/eob1.h
@@ -102,17 +102,7 @@ private:
 	const uint8 *_npcSubShpIndex1;
 	const uint8 *_npcSubShpIndex2;
 	const uint8 *_npcSubShpY;
-	const char *const *_npc0Strings;
-	const char *const *_npc11Strings;
-	const char *const *_npc12Strings;
-	const char *const *_npc21Strings;
-	const char *const *_npc22Strings;
-	const char *const *_npc31Strings;
-	const char *const *_npc32Strings;
-	const char *const *_npc4Strings;
-	const char *const *_npc5Strings;
-	const char *const *_npc6Strings;
-	const char *const *_npc7Strings;
+	const char *const *_npcStrings[11];
 
 	// items
 	void updateUsedCharacterHandItem(int charIndex, int slot);
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index afaef0b43a..60df8f8520 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -35,7 +35,7 @@ DarkMoonEngine::DarkMoonEngine(OSystem *system, const GameFlags &flags) : EobCor
 	_numSpells = 70;
 	_menuChoiceInit = 4;
 
-	_introStrings = _cpsFilesIntro = _cpsFilesFinale = _finaleStrings = _kheldranStrings = _npc1Strings = _npc2Strings = _hornStrings = 0;
+	_introStrings = _cpsFilesIntro = _cpsFilesFinale = _finaleStrings = _kheldranStrings = _npcStrings[0] = _npcStrings[1] = _hornStrings = 0;
 	_seqIntro = _seqFinale = 0;
 	_shapesIntro = _shapesFinale = 0;
 	_creditsData = _npcShpData = _dscDoorType5Offs = _hornSounds = 0;
@@ -118,7 +118,7 @@ void DarkMoonEngine::runNpcDialogue(int npcIndex) {
 		gui_drawDialogueBox();
 
 		_txt->printDialogueText(4, 0);
-		int r = runDialogue(-1, 0, _npc1Strings[0], _npc1Strings[1], 0) - 1;
+		int r = runDialogue(-1, 2, _npcStrings[0][0], _npcStrings[0][1]) - 1;
 
 		if (r == 0) {
 			snd_stopSound();
@@ -134,7 +134,7 @@ void DarkMoonEngine::runNpcDialogue(int npcIndex) {
 		gui_drawDialogueBox();
 
 		_txt->printDialogueText(8, 0);
-		int r = runDialogue(-1, 0, _npc2Strings[0], _npc2Strings[1], 0) - 1;
+		int r = runDialogue(-1, 2, _npcStrings[1][0], _npcStrings[1][1]) - 1;
 
 		if (r == 0) {
 			if (rollDice(1, 2, -1))
@@ -422,7 +422,7 @@ int DarkMoonEngine::resurrectionSelectDialogue() {
 	_rrNames[_rrCount] = _abortStrings[0];
 	_rrId[_rrCount++] = 99;
 
-	int r = _rrId[runDialogue(-1, 1, _rrNames[0], _rrNames[1], _rrNames[2], _rrNames[3], _rrNames[4], _rrNames[5], _rrNames[6], _rrNames[7], _rrNames[8]) - 1];
+	int r = _rrId[runDialogue(-1, 9, _rrNames[0], _rrNames[1], _rrNames[2], _rrNames[3], _rrNames[4], _rrNames[5], _rrNames[6], _rrNames[7], _rrNames[8]) - 1];
 	if (r == 99)
 		return 0;
 
@@ -450,7 +450,7 @@ int DarkMoonEngine::charSelectDialogue() {
 
 	namesList[cnt++] = _abortStrings[0];
 
-	int r = runDialogue(-1, 1, namesList[0], namesList[1], namesList[2], namesList[3], namesList[4], namesList[5], namesList[6], 0) - 1;
+	int r = runDialogue(-1, 7, namesList[0], namesList[1], namesList[2], namesList[3], namesList[4], namesList[5], namesList[6]) - 1;
 	if (r == cnt - 1)
 		return 99;
 
diff --git a/engines/kyra/eob2.h b/engines/kyra/eob2.h
index 8c9b6dd9fa..35eb90a9dc 100644
--- a/engines/kyra/eob2.h
+++ b/engines/kyra/eob2.h
@@ -99,8 +99,7 @@ private:
 	void runNpcDialogue(int npcIndex);
 
 	const uint8 *_npcShpData;
-	const char *const *_npc1Strings;
-	const char *const *_npc2Strings;
+	const char *const *_npcStrings[2];
 
 	// items
 	void updateUsedCharacterHandItem(int charIndex, int slot);
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 6f58d3a4f6..389a0e9947 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -196,6 +196,20 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	memset(_scriptTimers, 0, sizeof(_scriptTimers));
 	memset(_monsterBlockPosArray, 0, sizeof(_monsterBlockPosArray));
 	memset(_foundMonstersArray, 0, sizeof(_foundMonstersArray));
+
+#define DWM0 _dscWallMapping.push_back(0)
+#define DWM(x) _dscWallMapping.push_back(&_sceneDrawVar##x)
+	DWM0;		DWM0;		DWM(Down);	DWM(Right);
+	DWM(Down);	DWM(Right);	DWM(Down);	DWM0;
+	DWM(Down);	DWM(Left);	DWM(Down);	DWM(Left);
+	DWM0;		DWM0;		DWM(Down);	DWM(Right);
+	DWM(Down);	DWM(Right);	DWM(Down);	DWM0;
+	DWM(Down);	DWM(Left);	DWM(Down);	DWM(Left);
+	DWM(Down);	DWM(Right);	DWM(Down);	DWM0;
+	DWM(Down);	DWM(Left);	DWM0;		DWM(Right);
+	DWM(Down);	DWM0;		DWM0;		DWM(Left);
+#undef DWM
+#undef DWM0
 }
 
 EobCoreEngine::~EobCoreEngine() {
@@ -254,6 +268,7 @@ EobCoreEngine::~EobCoreEngine() {
 
 	releaseDecorations();
 	delete[] _levelDecorationRects;
+	_dscWallMapping.clear();
 
 	delete[] _spells;
 	delete[] _spellAnimBuffer;
@@ -757,8 +772,7 @@ void EobCoreEngine::setHandItem(Item itemIndex) {
 }
 
 int EobCoreEngine::getDexterityArmorClassModifier(int dexterity) {
-	static const int mod[] = { 5, 5, 5, 4, 3, 2, 1, 0, 0,
-		0, 0, 0, 0, 0, 0, -1, -2, -3, -4, -4, -5, -5, -5, -6, -6 };
+	static const int8 mod[] = { 5, 5, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, -1, -2, -3, -4, -4, -5, -5, -5, -6, -6 };
 	return mod[dexterity];
 }
 
@@ -1111,7 +1125,7 @@ int EobCoreEngine::npcJoinDialogue(int npcIndex, int queryJoinTextId, int confir
 	gui_drawDialogueBox();
 	_txt->printDialogueText(queryJoinTextId, 0);
 
-	int r = runDialogue(-1, 0, _yesNoStrings[0], _yesNoStrings[1], 0) - 1;
+	int r = runDialogue(-1, 2, _yesNoStrings[0], _yesNoStrings[1]) - 1;
 	if (r == 0) {
 		if (confirmJoinTextId == -1) {
 			Common::String tmp = Common::String::format(_npcJoinStrings[0], _npcPreset[npcIndex].name);
@@ -1140,8 +1154,8 @@ int EobCoreEngine::prepareForNewPartyMember(int16 itemType, int16 itemValue) {
 	} else {
 		gui_drawDialogueBox();
 		_txt->printDialogueText(_npcMaxStrings[0]);
-		int r = runDialogue(-1, 1, _characters[0].name, _characters[1].name, _characters[2].name, _characters[3].name,
-			_characters[4].name, _characters[5].name, _abortStrings[0], 0, 0) - 1;
+		int r = runDialogue(-1, 7, _characters[0].name, _characters[1].name, _characters[2].name, _characters[3].name,
+			_characters[4].name, _characters[5].name, _abortStrings[0]) - 1;
 
 		if (r == 6)
 			return 0;
@@ -1264,16 +1278,14 @@ void EobCoreEngine::setWeaponSlotStatus(int charIndex, int mode, int slot) {
 	gui_drawCharPortraitWithStats(charIndex);
 }
 
-void EobCoreEngine::setupDialogueButtons(int presetfirst, int numStr, const char *str1, va_list &args) {
+void EobCoreEngine::setupDialogueButtons(int presetfirst, int numStr, va_list &args) {
 	_dialogueNumButtons = numStr;
-	_dialogueButtonString[0] = str1;
 	_dialogueHighlightedButton = 0;
-	const char *tmp = 0;
 
-	for (int i = 1; i < numStr; i++) {
-		tmp = va_arg(args, const char*);
-		if (tmp)
-			_dialogueButtonString[i] = tmp;
+	for (int i = 0; i < numStr; i++) {
+		const char *s = va_arg(args, const char*);
+		if (s)
+			_dialogueButtonString[i] = s;
 		else
 			_dialogueNumButtons = numStr = i;
 	}
@@ -1364,16 +1376,16 @@ void EobCoreEngine::drawSequenceBitmap(const char *file, int destRect, int x1, i
 	_screen->updateScreen();
 }
 
-int EobCoreEngine::runDialogue(int dialogueTextId, int style, const char *button1, ...) {
+int EobCoreEngine::runDialogue(int dialogueTextId, int numStr, ...) {
 	if (dialogueTextId != -1)
 		txt()->printDialogueText(dialogueTextId, 0);
 
 	va_list args;
-	va_start(args, button1);
-	if (style)
-		setupDialogueButtons(2, 9, button1, args);
+	va_start(args, numStr);
+	if (numStr > 2)
+		setupDialogueButtons(2, numStr, args);
 	else
-		setupDialogueButtons(0, 2, button1, args);
+		setupDialogueButtons(0, numStr, args);
 	va_end(args);
 
 	int res = 0;
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 06d43272cc..93db0b3623 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -620,6 +620,7 @@ protected:
 	uint32 _envAudioTimer;
 	uint16 _teleporterPulse;
 
+	Common::Array<const int16*> _dscWallMapping;
 	const int16 *_dscShapeCoords;
 
 	const uint8 *_dscItemPosIndex;
@@ -756,11 +757,11 @@ protected:
 	bool _configHpBarGraphs;
 
 	// text
-	void setupDialogueButtons(int presetfirst, int numStr, const char *str1, va_list &args);
+	void setupDialogueButtons(int presetfirst, int numStr, va_list &args);
 	void initDialogueSequence();
 	void restoreAfterDialogueSequence();
 	void drawSequenceBitmap(const char *file, int destRect, int x1, int y1, int flags);
-	int runDialogue(int dialogueTextId, int style, const char *button1, ...);
+	int runDialogue(int dialogueTextId, int numStr, ...);
 
 	char _dialogueLastBitmap[13];
 	int _moveCounter;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index f084bc9978..7d8e9250cd 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -2100,7 +2100,7 @@ void GUI_Eob::runCampMenu() {
 	int newMenu = 0;
 	int lastMenu = -1;
 	bool redrawPortraits = false;
-	bool res = false;
+
 	_charSelectRedraw = false;
 	_needRest = false;
 	Button *buttonList = 0;
@@ -2250,7 +2250,6 @@ void GUI_Eob::runCampMenu() {
 				if (cnt > 4) {
 					_vm->dropCharacter(selectCharacterDialogue(53));
 					_vm->gui_drawPlayField(false);
-					res = true;
 					_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 12, Screen::CR_NO_P_CHECK);
 					_screen->setFont(Screen::FID_6_FNT);
 					_vm->gui_drawAllCharPortraitsWithStats();
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index b70058d7ff..21bb10a1de 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -919,7 +919,7 @@ bool EobCoreEngine::spellCallback_end_holdPerson(void *obj) {
 	if (_flags.gameID == GI_EOB2 && fo->curBlock == _currentBlock) {
 		// party hit
 		int numChar = rollDice(1, 4, 0);
-		int charIndex = rollDice(1, 6, 0);
+		int charIndex = rollDice(1, 6, -1);
 		for (int i = 0; i < 6 && numChar; i++) {
 			if (testCharacter(charIndex, 3)) {
 				statusAttack(charIndex, 4, _magicStrings8[1], 4, 5, 9, 1);
@@ -1010,7 +1010,7 @@ void EobCoreEngine::spellCallback_start_removeCurse() {
 }
 
 void EobCoreEngine::spellCallback_start_coneOfCold() {
-	static const int8 *dirTables[] = { _coneOfColdDest1, _coneOfColdDest2, _coneOfColdDest3, _coneOfColdDest4 };
+	const int8 *dirTables[] = { _coneOfColdDest1, _coneOfColdDest2, _coneOfColdDest3, _coneOfColdDest4 };
 	
 	int cl = getMageLevel(_openBookChar);
 
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 0aaad6d35c..e2a2e794ff 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -896,6 +896,7 @@ void EobCoreEngine::loadDecorations(const char *cpsFile, const char *decFile) {
 	_levelDecorationDataSize = s->readUint16LE();
 	delete[] _levelDecorationData;
 	_levelDecorationData = new LevelDecorationProperty[_levelDecorationDataSize];
+	memset(_levelDecorationData, 0, _levelDecorationDataSize * sizeof(LevelDecorationProperty));
 
 	for (int i = 0; i < _levelDecorationDataSize; i++) {
 		LevelDecorationProperty *l = &_levelDecorationData[i];
@@ -944,6 +945,7 @@ void EobCoreEngine::assignWallsAndDecorations(int wallIndex, int vmpIndex, int d
 	}
 
 	do {
+		assert(decIndex < _levelDecorationDataSize);
 		memcpy(&_levelDecorationProperties[_mappedDecorationsCount], &_levelDecorationData[decIndex], sizeof(LevelDecorationProperty));
 
 		for (int i = 0; i < 10; i++) {
@@ -956,7 +958,7 @@ void EobCoreEngine::assignWallsAndDecorations(int wallIndex, int vmpIndex, int d
 
 			EobRect8 *r = &_levelDecorationRects[t];
 			if (r->w == 0 || r->h == 0)
-				error("Error trying to make decoration %d	x: %d y:%d w:%d h:%d", decIndex, r->x, r->y, r->w, r->h);
+				error("Error trying to make decoration %d (x: %d, y: %d, w: %d, h: %d)", decIndex, r->x, r->y, r->w, r->h);
 
 			_levelDecorationShapes[t] = _screen->encodeShape(r->x, r->y, r->w, r->h);
 		}
@@ -1095,22 +1097,10 @@ void EobCoreEngine::drawSceneShapes(int start) {
 }
 
 void EobCoreEngine::drawDecorations(int index) {
-	static const int16 *dscWalls[] =  { 
-		0,					0,						&_sceneDrawVarDown, &_sceneDrawVarRight,
-		&_sceneDrawVarDown,	&_sceneDrawVarRight,	&_sceneDrawVarDown, 0,
-		&_sceneDrawVarDown, &_sceneDrawVarLeft,		&_sceneDrawVarDown,	&_sceneDrawVarLeft,
-		0,					0,						&_sceneDrawVarDown, &_sceneDrawVarRight,
-		&_sceneDrawVarDown, &_sceneDrawVarRight,	&_sceneDrawVarDown,	0,
-		&_sceneDrawVarDown, &_sceneDrawVarLeft,		&_sceneDrawVarDown, &_sceneDrawVarLeft,
-		&_sceneDrawVarDown,	&_sceneDrawVarRight,	&_sceneDrawVarDown, 0,
-		&_sceneDrawVarDown, &_sceneDrawVarLeft,		0,					&_sceneDrawVarRight,
-		&_sceneDrawVarDown, 0,						0,					&_sceneDrawVarLeft
-	};
-
 	for (int i = 1; i >= 0; i--) {
 		int s = index * 2 + i;
-		if (dscWalls[s]) {
-			int16 d = *dscWalls[s];
+		if (_dscWallMapping[s]) {
+			int16 d = *_dscWallMapping[s];
 			int8 l = _wllShapeMap[_visibleBlocks[index]->walls[d]];
 
 			uint8 *shapeData = 0;
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index e85b1dc11a..4123e89a14 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -1527,7 +1527,7 @@ int EobInfProcessor::oeob_dialogue(int8 *data) {
 			break;
 
 		case -40:
-			_dlgResult = _vm->runDialogue(READ_LE_UINT16(pos), READ_LE_UINT16(pos + 6) == 0xffff ? 0 : 1, getString(READ_LE_UINT16(pos + 2)), getString(READ_LE_UINT16(pos + 4)), getString(READ_LE_UINT16(pos + 6)), 0);
+			_dlgResult = _vm->runDialogue(READ_LE_UINT16(pos), READ_LE_UINT16(pos + 6) == 0xffff ? 2 : 3, getString(READ_LE_UINT16(pos + 2)), getString(READ_LE_UINT16(pos + 4)), getString(READ_LE_UINT16(pos + 6)));
 			pos += 8;
 			break;
 
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index ec5d184c28..7433fbf126 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -427,11 +427,8 @@ void EobCoreEngine::initStaticResource() {
 	_characterStatusStrings13 = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharStatusStrings132 : kEobBaseCharStatusStrings131, temp);
 
 	_levelGainStrings = _staticres->loadStrings(kEobBaseLevelGainStrings, temp);
-	_expRequirementTables[0] = _staticres->loadRawDataBe32(kEobBaseExperienceTable0, temp);
-	_expRequirementTables[1] = _staticres->loadRawDataBe32(kEobBaseExperienceTable1, temp);
-	_expRequirementTables[2] = _staticres->loadRawDataBe32(kEobBaseExperienceTable2, temp);
-	_expRequirementTables[3] = _staticres->loadRawDataBe32(kEobBaseExperienceTable3, temp);
-	_expRequirementTables[4] = _staticres->loadRawDataBe32(kEobBaseExperienceTable4, temp);
+	for (int i = 0; i < 5; i++)
+		_expRequirementTables[i] = _staticres->loadRawDataBe32(kEobBaseExperienceTable0 + i, temp);
 	_expRequirementTables[5] = _staticres->loadRawDataBe32(kEobBaseExperienceTable4, temp);
 
 	_classModifierFlags = _staticres->loadRawData(kEobBaseClassModifierFlags, temp);
@@ -1153,17 +1150,8 @@ void EobEngine::initStaticResource() {
 	_npcSubShpIndex1 = _staticres->loadRawData(kEob1NpcSubShpIndex1, temp);
 	_npcSubShpIndex2 = _staticres->loadRawData(kEob1NpcSubShpIndex2, temp);
 	_npcSubShpY = _staticres->loadRawData(kEob1NpcSubShpY, temp);
-	_npc0Strings = _staticres->loadStrings(kEob1Npc0Strings, temp);
-	_npc11Strings = _staticres->loadStrings(kEob1Npc11Strings, temp);
-	_npc12Strings = _staticres->loadStrings(kEob1Npc12Strings, temp);
-	_npc21Strings = _staticres->loadStrings(kEob1Npc21Strings, temp);
-	_npc22Strings = _staticres->loadStrings(kEob1Npc22Strings, temp);
-	_npc31Strings = _staticres->loadStrings(kEob1Npc31Strings, temp);
-	_npc32Strings = _staticres->loadStrings(kEob1Npc32Strings, temp);
-	_npc4Strings = _staticres->loadStrings(kEob1Npc4Strings, temp);
-	_npc5Strings = _staticres->loadStrings(kEob1Npc5Strings, temp);
-	_npc6Strings = _staticres->loadStrings(kEob1Npc6Strings, temp);
-	_npc7Strings = _staticres->loadStrings(kEob1Npc7Strings, temp);
+	for (int i = 0; i < 11; i++)
+		_npcStrings[i] = _staticres->loadStrings(kEob1Npc0Strings + i, temp);
 
 	const uint8 *ps = _staticres->loadRawData(kEob1MonsterProperties, temp);
 	temp /= 27;
@@ -1321,8 +1309,8 @@ void DarkMoonEngine::initStaticResource() {
 	_dscDoorType5Offs = _staticres->loadRawData(kEobBaseDscDoorType5Offs, temp);
 
 	_npcShpData = _staticres->loadRawData(kEob2NpcShapeData, temp);
-	_npc1Strings = _staticres->loadStrings(kEob2Npc1Strings, temp);
-	_npc2Strings = _staticres->loadStrings(kEob2Npc2Strings, temp);
+	_npcStrings[0] = _staticres->loadStrings(kEob2Npc1Strings, temp);
+	_npcStrings[1] = _staticres->loadStrings(kEob2Npc2Strings, temp);
 	_monsterDustStrings = _staticres->loadStrings(kEob2MonsterDustStrings, temp);
 	_dreamSteps = (const int8*)_staticres->loadRawData(kEob2DreamSteps, temp);
 	_kheldranStrings = _staticres->loadStrings(kEob2KheldranStrings, temp);
-- 
cgit v1.2.3


From 8b618e46df21d90a1a5ad62633a2b9d3c1da0317 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 11 Dec 2011 12:29:09 +0100
Subject: KYRA: (EOB/LOL) - cleanup common code

(rename some stuff and move EOB/LOL common code to separate files)
---
 engines/kyra/chargen.cpp        |   4 +-
 engines/kyra/detection.cpp      |   2 +-
 engines/kyra/eob1.cpp           |  16 +-
 engines/kyra/eob1.h             |   6 +-
 engines/kyra/eob2.cpp           |   2 +-
 engines/kyra/eobcommon.cpp      |  36 +--
 engines/kyra/eobcommon.h        |  22 +-
 engines/kyra/gui_eob.cpp        | 262 +++++----------
 engines/kyra/gui_eob.h          |   6 +-
 engines/kyra/gui_rpg.cpp        | 134 ++++++++
 engines/kyra/items_eob.cpp      |  36 +--
 engines/kyra/kyra_rpg.cpp       | 361 +++++++++++++++++++++
 engines/kyra/kyra_rpg.h         | 355 +++++++++++++++++++++
 engines/kyra/lol.cpp            |  18 +-
 engines/kyra/lol.h              |   6 +-
 engines/kyra/loleobbase.cpp     | 361 ---------------------
 engines/kyra/loleobbase.h       | 355 ---------------------
 engines/kyra/magic_eob.cpp      |  30 +-
 engines/kyra/module.mk          |  24 +-
 engines/kyra/saveload_eob.cpp   | 110 +------
 engines/kyra/saveload_lol.cpp   |   2 +-
 engines/kyra/saveload_rpg.cpp   | 127 ++++++++
 engines/kyra/scene_eob.cpp      | 598 +---------------------------------
 engines/kyra/scene_rpg.cpp      | 614 +++++++++++++++++++++++++++++++++++
 engines/kyra/screen_eob.cpp     |  20 +-
 engines/kyra/screen_eob.h       |   2 +-
 engines/kyra/script_eob.cpp     |   4 +-
 engines/kyra/script_eob.h       |   2 +-
 engines/kyra/sequences_eob1.cpp |  48 +--
 engines/kyra/sequences_eob2.cpp |  12 +-
 engines/kyra/sound_lol.cpp      |   2 +-
 engines/kyra/sprites_eob.cpp    |  25 +-
 engines/kyra/sprites_rpg.cpp    |  46 +++
 engines/kyra/staticres_eob.cpp  |  95 +-----
 engines/kyra/staticres_rpg.cpp  |  97 ++++++
 engines/kyra/text_eob.cpp       | 688 ----------------------------------------
 engines/kyra/text_eob.h         | 115 -------
 engines/kyra/text_lol.cpp       |   6 +-
 engines/kyra/text_lol.h         |   6 +-
 engines/kyra/text_rpg.cpp       | 688 ++++++++++++++++++++++++++++++++++++++++
 engines/kyra/text_rpg.h         | 115 +++++++
 engines/kyra/timer_eob.cpp      |  65 +---
 engines/kyra/timer_rpg.cpp      |  90 ++++++
 43 files changed, 2888 insertions(+), 2725 deletions(-)
 create mode 100644 engines/kyra/gui_rpg.cpp
 create mode 100644 engines/kyra/kyra_rpg.cpp
 create mode 100644 engines/kyra/kyra_rpg.h
 delete mode 100644 engines/kyra/loleobbase.cpp
 delete mode 100644 engines/kyra/loleobbase.h
 create mode 100644 engines/kyra/saveload_rpg.cpp
 create mode 100644 engines/kyra/scene_rpg.cpp
 create mode 100644 engines/kyra/sprites_rpg.cpp
 create mode 100644 engines/kyra/staticres_rpg.cpp
 delete mode 100644 engines/kyra/text_eob.cpp
 delete mode 100644 engines/kyra/text_eob.h
 create mode 100644 engines/kyra/text_rpg.cpp
 create mode 100644 engines/kyra/text_rpg.h
 create mode 100644 engines/kyra/timer_rpg.cpp

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index f7a546091d..b190e111c7 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -169,7 +169,7 @@ bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
 
 	for (bool loop = true; loop && (!_vm->shouldQuit()); ) {
 		_vm->_gui->updateBoxFrameHighLight(_activeBox + 6);
-		int inputFlag = getInput(_vm->_activeButtons);		
+		int inputFlag = getInput(_vm->_activeButtons);
 		_vm->removeInputTop();
 
 		if (inputFlag) {
@@ -434,7 +434,7 @@ int CharacterGenerator::viewDeleteCharacter() {
 }
 
 void CharacterGenerator::createPartyMember() {
-	_screen->setScreenDim(2);	
+	_screen->setScreenDim(2);
 	assert(_vm->_gui);
 
 	for (int i = 0; i != 3 && !_vm->shouldQuit(); i++) {
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index dd67c3e715..abb6a70f42 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -163,7 +163,7 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const {
 		// Skip automatic final saves made by EOB for the purpose of party transfer
 		if (!scumm_stricmp(file->c_str() + file->size() - 3, "fin"))
 			continue;
-		
+
 		// Obtain the last 3 digits of the filename, since they correspond to the save slot
 		int slotNum = atoi(file->c_str() + file->size() - 3);
 
diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
index ae24b14efb..c87118918a 100644
--- a/engines/kyra/eob1.cpp
+++ b/engines/kyra/eob1.cpp
@@ -173,7 +173,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 	int r = 0;
 	int a = 0;
 	Item itm = 0;
-	
+
 	switch (npcIndex) {
 	case 0:
 		for (r = 1; r == 1; ) {
@@ -199,7 +199,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 			}
 			if (!r)
 				r = DLG2(a ? 13 : 4, 4);
-			
+
 			if (!r) {
 				for (a = 0; a < 6; a++)
 					createItemOnCurrentBlock(55);
@@ -230,7 +230,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 			if (deletePartyItems(6, -1)) {
 				//_npcSequenceSub = 0;
 				//drawNpcScene(npcIndex);
-				TXT(28);				
+				TXT(28);
 				createItemOnCurrentBlock(32);
 				setScriptFlags(0x100000);
 				r = 1;
@@ -254,7 +254,7 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 					else
 						resurrectionSelectDialogue();
 					setScriptFlags(0x20000);
-				}				
+				}
 			}
 		} else {
 			TXT(24);
@@ -476,7 +476,7 @@ void EobEngine::turnUndeadAuto() {
 	for (int i = 0; i < 6; i++) {
 		if (!testCharacter(i, 0x0d))
 			continue;
-		
+
 		EobCharacter *c = &_characters[i];
 
 		if (_itemTypes[_items[c->inventory[0]].type].extraProperties != 6 && _itemTypes[_items[c->inventory[1]].type].extraProperties != 6)
@@ -553,13 +553,13 @@ void EobEngine::healParty() {
 	for (int i = 0; i < 6 && cnt; i++) {
 		if (testCharacter(i, 3))
 			continue;
-		
+
 		_characters[i].flags &= ~4;
 		neutralizePoison(i);
-		
+
 		if (_characters[i].hitPointsCur >= _characters[i].hitPointsMax)
 			continue;
-		
+
 		cnt--;
 		_characters[i].hitPointsCur += rollDice(1, 8, 9);
 		if (_characters[i].hitPointsCur > _characters[i].hitPointsMax)
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
index 00583e9330..2dfccca94e 100644
--- a/engines/kyra/eob1.h
+++ b/engines/kyra/eob1.h
@@ -61,7 +61,7 @@ private:
 	void seq_king();
 	void seq_hands();
 	void seq_waterdeepExit();
-	void seq_tunnel();	
+	void seq_tunnel();
 
 	void seq_xdeath();
 
@@ -69,7 +69,7 @@ private:
 	void copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step);
 	void boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH);
 	void whirlTransition();
-	
+
 	const char *const *_introFilesOpening;
 	const char *const *_introFilesTower;
 	const char *const *_introFilesOrb;
@@ -90,7 +90,7 @@ private:
 	const uint8 *_introTvlY2;
 	const uint8 *_introTvlW;
 	const uint8 *_introTvlH;
-	
+
 	const char *const *_finBonusStrings;
 
 	// characters
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
index 60df8f8520..64e394a717 100644
--- a/engines/kyra/eob2.cpp
+++ b/engines/kyra/eob2.cpp
@@ -387,7 +387,7 @@ void DarkMoonEngine::restParty_npc() {
 bool DarkMoonEngine::restParty_extraAbortCondition() {
 	if (_currentLevel != 3)
 		return false;
-	
+
 	seq_nightmare();
 
 	return true;
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 389a0e9947..dfa465c789 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -22,7 +22,7 @@
 
 #ifdef ENABLE_EOB
 
-#include "kyra/loleobbase.h"
+#include "kyra/kyra_rpg.h"
 #include "kyra/resource.h"
 #include "kyra/sound_intern.h"
 #include "kyra/script_eob.h"
@@ -36,7 +36,7 @@
 
 namespace Kyra {
 
-EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBaseEngine(system, flags), _numLargeItemShapes(flags.gameID == GI_EOB1 ? 14 : 11),
+EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : KyraRpgEngine(system, flags), _numLargeItemShapes(flags.gameID == GI_EOB1 ? 14 : 11),
 	_numSmallItemShapes(flags.gameID == GI_EOB1 ? 23 : 26), _numThrownItemShapes(flags.gameID == GI_EOB1 ? 12 : 9), _numItemIconShapes(flags.gameID == GI_EOB1 ? 89 : 112),
 	_teleporterWallId(flags.gameID == GI_EOB1 ? 52 : 44) {
 	_screen = 0;
@@ -164,7 +164,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : LolEobBa
 	_monsterProximityTable = _findBlockMonstersTable = _wallOfForceDsY = _wallOfForceDsNumW = _wallOfForceDsNumH = _wallOfForceShpId = _wllFlagPreset = _teleporterShapeCoords = 0;
 		_monsterCloseAttUnkTable = _monsterFrmOffsTable1 = _monsterFrmOffsTable2 = _monsterDirChangeTable = _portalSeq = 0;
 	_wallOfForceDsX = 0;
-	_expObjectAnimTbl1Size = _expObjectAnimTbl2Size = _expObjectAnimTbl3Size = _wllFlagPresetSize = _scriptTimersCount = _buttonList1Size = _buttonList2Size = 
+	_expObjectAnimTbl1Size = _expObjectAnimTbl2Size = _expObjectAnimTbl3Size = _wllFlagPresetSize = _scriptTimersCount = _buttonList1Size = _buttonList2Size =
 		_buttonList3Size = _buttonList4Size = _buttonList5Size = _buttonList6Size = _buttonList7Size = _buttonList8Size = 0;
 	_inventorySlotsY = _mnDef = 0;
 	_buttonDefs = 0;
@@ -310,7 +310,7 @@ Common::Error EobCoreEngine::init() {
 	//MidiDriverType midiDriver = MidiDriver::detectDevice(MDT_PCSPK | MDT_ADLIB);
 	_sound = new SoundAdLibPC(this, _mixer);
 	assert(_sound);
-	_sound->init();	
+	_sound->init();
 
 	syncSoundSettings();
 
@@ -335,7 +335,7 @@ Common::Error EobCoreEngine::init() {
 	setupKeyMap();
 	_gui = new GUI_Eob(this);
 	assert(_gui);
-	_txt = new TextDisplayer_Eob(this, _screen);
+	_txt = new TextDisplayer_rpg(this, _screen);
 	assert(_txt);
 	_inf = new EobInfProcessor(this, _screen);
 	assert(_inf);
@@ -345,7 +345,7 @@ Common::Error EobCoreEngine::init() {
 	_screen->loadFont(Screen::FID_6_FNT, "FONT6.FNT");
 	_screen->loadFont(Screen::FID_8_FNT, "FONT8.FNT");
 
-	Common::Error err = LolEobBaseEngine::init();
+	Common::Error err = KyraRpgEngine::init();
 	if (err.getCode() != Common::kNoError)
 		return err;
 
@@ -522,7 +522,7 @@ void EobCoreEngine::startupNew() {
 }
 
 void EobCoreEngine::runLoop() {
-	_envAudioTimer = _system->getMillis() + (rollDice(1, 10, 3) * 18 * _tickLength);	
+	_envAudioTimer = _system->getMillis() + (rollDice(1, 10, 3) * 18 * _tickLength);
 	_flashShapeTimer = 0;
 	_drawSceneTimer = _system->getMillis();
 
@@ -566,7 +566,7 @@ bool EobCoreEngine::checkPartyStatus(bool handleDeath) {
 
 	if (!handleDeath)
 		return true;
-	
+
 	gui_drawAllCharPortraitsWithStats();
 
 	if (checkPartyStatusExtra()) {
@@ -1172,7 +1172,7 @@ void EobCoreEngine::dropCharacter(int charIndex) {
 		return;
 
 	removeCharacterFromParty(charIndex);
-	
+
 	if (charIndex < 5)
 		exchangeCharacters(charIndex, testCharacter(5, 1) ? 5 : 4);
 
@@ -1439,7 +1439,7 @@ bool EobCoreEngine::restParty_updateMonsters() {
 			return true;
 		}
 	}
-	
+
 	_sound->enableSFX(sfxEnabled);
 	_sound->enableMusic(musicEnabled);
 	return false;
@@ -1468,7 +1468,7 @@ bool EobCoreEngine::restParty_checkHealSpells(int charIndex) {
 	static const uint8 eob2healSpells[] = { 3, 16, 20 };
 	const uint8 *spells = _flags.gameID == GI_EOB1 ? eob1healSpells : eob2healSpells;
 	const int8 *list = _characters[charIndex].clericSpells;
-	
+
 	for (int i = 0; i < 80; i++) {
 		int s = list[i] < 0 ? -list[i] : list[i];
 		if (s == spells[0] || s == spells[1] || s == spells[2])
@@ -1551,7 +1551,7 @@ void EobCoreEngine::displayParchment(int id) {
 
 int EobCoreEngine::countResurrectionCandidates() {
 	_rrCount = 0;
-	memset(_rrNames, 0, 10 * sizeof(const char*));	
+	memset(_rrNames, 0, 10 * sizeof(const char*));
 
 	for (int i = 0; i < 6; i++) {
 		if (!testCharacter(i, 1))
@@ -1646,11 +1646,11 @@ void EobCoreEngine::seq_portal() {
 			if (*(pos - 2) == 3)
 				snd_playSoundEffect(90);
 		}
-		
+
 		_screen->updateScreen();
 		delay(2 * _tickLength);
 	}
-	
+
 	delete[] shape0;
 	for (int i = 0; i < 5; i++) {
 		delete[] shapes1[i];
@@ -1663,12 +1663,12 @@ bool EobCoreEngine::checkPassword() {
 	char answ[20];
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
 	_screen->copyPage(0, 10);
-	
+
 	_screen->setScreenDim(13);
 	gui_drawBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, _color1_1, _color2_1, -1);
 	gui_drawBox((_screen->_curDim->sx << 3) + 1, _screen->_curDim->sy + 1, (_screen->_curDim->w << 3) - 2, _screen->_curDim->h - 2, _color1_1, _color2_1, _bkgColor_1);
 	_screen->modifyScreenDim(13, _screen->_curDim->sx + 1, _screen->_curDim->sy + 2, _screen->_curDim->w - 2, _screen->_curDim->h - 16);
-	
+
 	for (int i = 0; i < 3; i++) {
 		_screen->fillRect(_screen->_curDim->sx << 3, _screen->_curDim->sy, ((_screen->_curDim->sx + _screen->_curDim->w) << 3) - 1, (_screen->_curDim->sy + _screen->_curDim->h) - 1, _bkgColor_1);
 		int c = rollDice(1, _mnNumWord - 1, -1);
@@ -1678,7 +1678,7 @@ bool EobCoreEngine::checkPassword() {
 		_screen->printShadedText(Common::String::format(_mnPrompt[0], _mnDef[(c << 2) + 1], _mnDef[(c << 2) + 2]).c_str(), (_screen->_curDim->sx + 1) << 3, _screen->_curDim->sy, _screen->_curDim->unk8, _bkgColor_1);
 		memset(answ, 0, 20);
 		gui_drawBox(76, 100, 133, 14, _color2_1, _color1_1, -1);
-		gui_drawBox(77, 101, 131, 12, _color2_1, _color1_1, -1);	
+		gui_drawBox(77, 101, 131, 12, _color2_1, _color1_1, -1);
 		if (_gui->getTextInput(answ, 10, 103, 15, _screen->_curDim->unk8, _bkgColor_1, 8) < 0)
 			i = 3;
 		if (!scumm_stricmp(_mnWord[c], answ))
@@ -1812,7 +1812,7 @@ int EobCoreEngine::projectileWeaponAttack(int charIndex, Item item) {
 			SWAP(ammoItem, _characters[charIndex].inventory[1]);
 		else if (_characters[charIndex].inventory[16])
 			ammoItem = getQueuedItem(&_characters[charIndex].inventory[16], 0, -1);
-		
+
 	} else {
 		for (int i = 0; i < 27; i++) {
 			if (_items[_characters[charIndex].inventory[i]].type == t) {
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 93db0b3623..3b1230830e 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -24,7 +24,7 @@
 #define KYRA_EOBCOMMON_H
 
 #if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-#include "kyra/loleobbase.h"
+#include "kyra/kyra_rpg.h"
 #endif // (ENABLE_EOB || ENABLE_LOL)
 
 #ifdef ENABLE_EOB
@@ -239,8 +239,8 @@ struct EobMenuButtonDef {
 
 class EobInfProcessor;
 
-class EobCoreEngine : public LolEobBaseEngine {
-friend class TextDisplayer_Eob;
+class EobCoreEngine : public KyraRpgEngine {
+friend class TextDisplayer_rpg;
 friend class GUI_Eob;
 friend class EobInfProcessor;
 friend class DarkmoonSequenceHelper;
@@ -328,7 +328,7 @@ protected:
 	static const uint8 _charClassModifier[];
 
 	const uint8 *_classModifierFlags;
-	
+
 	const uint8 *_transferConvertTable;
 	const uint32 *_transferExpTable;
 
@@ -550,7 +550,7 @@ protected:
 	const uint8 *_monsterProximityTable;
 	const uint8 *_findBlockMonstersTable;
 	const char *const *_monsterDustStrings;
-	
+
 	const uint8 *_enemyMageSpellList;
 	const uint8 *_enemyMageSfx;
 	const uint8 *_beholderSpellList;
@@ -798,9 +798,9 @@ protected:
 	const char *const *_validateCursedString;
 	const char *const *_validateNoDropString;
 	const char *const *_potionStrings;
-	const char *const *_wandStrings;	
-	const char *const *_itemMisuseStrings;	
-	
+	const char *const *_wandStrings;
+	const char *const *_itemMisuseStrings;
+
 	const char *const *_suffixStringsRings;
 	const char *const *_suffixStringsPotions;
 	const char *const *_suffixStringsWands;
@@ -832,7 +832,7 @@ protected:
 
 	void seq_portal();
 	bool checkPassword();
-	
+
 	virtual int resurrectionSelectDialogue() = 0;
 	virtual void useHorn(int charIndex, int weaponSlot) {}
 	virtual bool checkPartyStatusExtra() = 0;
@@ -900,7 +900,7 @@ protected:
 	int getDexHitChanceModifier(int charIndex);
 	int getMonsterAcHitChanceModifier(int charIndex, int monsterAc);
 	void explodeMonster(EobMonsterInPlay *m);
-	
+
 	int _dstMonsterIndex;
 	bool _preventMonsterFlash;
 	int16 _foundMonstersArray[5];
@@ -940,7 +940,7 @@ protected:
 	void destroyWallOfForce(int index);
 
 	int findSingleSpellTarget(int dist);
-	
+
 	int findFirstCharacterSpellTarget();
 	int findNextCharacterSpellTarget(int curCharIndex);
 	int charDeathSavingThrow(int charIndex, int div);
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 7d8e9250cd..6d13b17a5f 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -20,12 +20,12 @@
  *
  */
 
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+#ifdef ENABLE_EOB
 
 #include "kyra/eobcommon.h"
 #include "kyra/gui_eob.h"
 #include "kyra/script_eob.h"
-#include "kyra/text_eob.h"
+#include "kyra/text_rpg.h"
 #include "kyra/timer.h"
 #include "kyra/util.h"
 
@@ -35,110 +35,6 @@
 
 namespace Kyra {
 
-void LolEobBaseEngine::removeInputTop() {
-	if (!_eventList.empty()) {
-		if (_eventList.begin()->event.type == Common::EVENT_LBUTTONDOWN)
-			_mouseClick = 1;
-		else if (_eventList.begin()->event.type == Common::EVENT_RBUTTONDOWN)
-			_mouseClick = 2;
-		else
-			_mouseClick = 0;
-
-		_eventList.erase(_eventList.begin());
-	}
-}
-
-void LolEobBaseEngine::gui_drawBox(int x, int y, int w, int h, int frameColor1, int frameColor2, int fillColor) {
-	w--; h--;
-	if (fillColor != -1)
-		screen()->fillRect(x + 1, y + 1, x + w - 1, y + h - 1, fillColor);
-
-	screen()->drawClippedLine(x + 1, y, x + w, y, frameColor2);
-	screen()->drawClippedLine(x + w, y, x + w, y + h - 1, frameColor2);
-	screen()->drawClippedLine(x, y, x, y + h, frameColor1);
-	screen()->drawClippedLine(x, y + h, x + w, y + h, frameColor1);
-}
-
-void LolEobBaseEngine::gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32 cur, int32 max, int col1, int col2) {
-	if (max < 1)
-		return;
-	if (cur < 0)
-		cur = 0;
-
-	int32 e = MIN(cur, max);
-
-	if (!--w)
-		return;
-	if (!--h)
-		return;
-
-	int32 t = (e * w) / max;
-
-	if (!t && e)
-		t++;
-
-	if (t)
-		screen()->fillRect(x, y, x + t - 1, y + h, col1);
-
-	if (t < w && col2)
-		screen()->fillRect(x + t, y, x + w, y + h, col2);
-}
-
-void LolEobBaseEngine::gui_initButtonsFromList(const int16 *list) {
-	while (*list != -1)
-		gui_initButton(*list++);
-}
-
-void LolEobBaseEngine::gui_resetButtonList() {
-	for (uint i = 0; i < ARRAYSIZE(_activeButtonData); ++i)
-		_activeButtonData[i].nextButton = 0;
-
-	gui_notifyButtonListChanged();
-	_activeButtons = 0;
-}
-
-void LolEobBaseEngine::gui_notifyButtonListChanged() {
-	if (gui()) {
-		if (!_buttonListChanged && !_preserveEvents)
-			removeInputTop();
-		_buttonListChanged = true;
-	}
-}
-
-bool LolEobBaseEngine::clickedShape(int shapeIndex) {
-	if (_clickedSpecialFlag != 0x40)
-		return true;
-
-	for (; shapeIndex; shapeIndex = _levelDecorationProperties[shapeIndex].next) {
-		if (_flags.gameID != GI_LOL)
-			shapeIndex--;
-
-		uint16 s = _levelDecorationProperties[shapeIndex].shapeIndex[1];
-
-		if (s == 0xffff)
-			continue;
-
-		int w = _flags.gameID == GI_LOL ? _levelDecorationShapes[s][3] : (_levelDecorationShapes[s][2] << 3);
-		int h = _levelDecorationShapes[s][_flags.gameID == GI_LOL ? 2 : 1];
-		int x = _levelDecorationProperties[shapeIndex].shapeX[1] + _clickedShapeXOffs;
-		int y = _levelDecorationProperties[shapeIndex].shapeY[1] + _clickedShapeYOffs;
-
-		if (_levelDecorationProperties[shapeIndex].flags & 1) {
-			if (_flags.gameID == GI_LOL)
-				w <<= 1;
-			else
-				x = 176 - x - w;
-		}
-
-		if (posWithinRect(_mouseX, _mouseY, x - 4, y - 4, x + w + 8, y + h + 8))
-			return true;
-	}
-
-	return false;
-}
-
-#ifdef ENABLE_EOB
-
 Button *EobCoreEngine::gui_getButton(Button *buttonList, int index) {
 	while (buttonList) {
 		if (buttonList->index == index)
@@ -159,7 +55,7 @@ void EobCoreEngine::gui_drawPlayField(bool refresh) {
 
 	_screen->setCurPage(cp);
 	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
-	
+
 	if (!_loading)
 		_screen->updateScreen();
 
@@ -397,7 +293,7 @@ void EobCoreEngine::gui_drawWeaponSlot(int charIndex, int slot) {
 void EobCoreEngine::gui_drawWeaponSlotStatus(int x, int y, int status) {
 	Common::String tmpStr;
 	Common::String tmpStr2;
-	
+
 	if (status > -3 || status == -5)
 		_screen->drawShape(_screen->_curPage, _greenSplatShape, x - 1, y, 0);
 	else
@@ -507,7 +403,7 @@ void EobCoreEngine::gui_drawFoodStatusGraph(int index) {
 
 void EobCoreEngine::gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32 curVal, int32 maxVal, int col1, int col2) {
 	gui_drawBox(x - 1, y - 1, w + 3, h + 2, _color2_1, _color1_1, -1);
-	LolEobBaseEngine::gui_drawHorizontalBarGraph(x, y, w + 2, h, curVal, maxVal, col1, col2);
+	KyraRpgEngine::gui_drawHorizontalBarGraph(x, y, w + 2, h, curVal, maxVal, col1, col2);
 }
 
 void EobCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
@@ -858,7 +754,7 @@ int EobCoreEngine::clickedCamp(Button *button) {
 
 	_screen->copyPage(0, 7);
 	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 12, Screen::CR_NO_P_CHECK);
-	
+
 	_gui->runCampMenu();
 
 	_screen->copyRegion(0, 0, 0, 120, 176, 24, 12, 2, Screen::CR_NO_P_CHECK);
@@ -870,7 +766,7 @@ int EobCoreEngine::clickedCamp(Button *button) {
 
 	_screen->setCurPage(0);
 	const ScreenDim *dm = _screen->getScreenDim(10);
-	_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 2, 0, Screen::CR_NO_P_CHECK);	
+	_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 2, 0, Screen::CR_NO_P_CHECK);
 
 	_screen->updateScreen();
 
@@ -1457,7 +1353,7 @@ GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 	_progress = 0;
 	_prcButtonUnk3 = 1;
 	_cflag = 0xffff;
-	
+
 	_menuLineSpacing = 0;
 	_menuLastInFlags = 0;
 	_menuCur = 0;
@@ -1471,7 +1367,7 @@ GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 	memset(_numAssignedSpellsOfType, 0, 72);
 
 	_charSelectRedraw = false;
-	
+
 	_updateBoxIndex = -1;
 	_highLightBoxTimer = 0;
 	_updateBoxColorIndex = 0;
@@ -1978,7 +1874,7 @@ int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 
 	if (!result)
 		result = inputFlags;
-	
+
 	return result;
 }
 
@@ -2093,10 +1989,10 @@ void GUI_Eob::simpleMenu_flashSelection(const char *str, int x, int y, int color
 
 void GUI_Eob::runCampMenu() {
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
-	
+
 	Button *highlightButton = 0;
 	Button *prevHighlightButton = 0;
-	
+
 	int newMenu = 0;
 	int lastMenu = -1;
 	bool redrawPortraits = false;
@@ -2108,7 +2004,7 @@ void GUI_Eob::runCampMenu() {
 	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
 		if (newMenu == 2)
 			updateOptionsStrings();
-		
+
 		if (newMenu != -1) {
 			releaseButtons(buttonList);
 
@@ -2117,7 +2013,7 @@ void GUI_Eob::runCampMenu() {
 				_vm->_menuDefs[2].titleStrId = 57;
 			else if (newMenu == 1)
 				_vm->_menuDefs[1].titleStrId = 58;
-			
+
 			buttonList = initMenu(newMenu);
 
 			if (newMenu != lastMenu) {
@@ -2128,10 +2024,10 @@ void GUI_Eob::runCampMenu() {
 			lastMenu = newMenu;
 			newMenu = -1;
 		}
-		
+
 		int inputFlag = _vm->checkInput(buttonList, false, 0) & 0x80ff;
 		_vm->removeInputTop();
-		
+
 		if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE])
 			inputFlag = 0x8007;
 		else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
@@ -2175,7 +2071,7 @@ void GUI_Eob::runCampMenu() {
 
 				highlightButton = _vm->gui_getButton(buttonList, s);
 			}
-			
+
 		} else if (inputFlag > 0x8000 && inputFlag < 0x8010) {
 			int i = 0;
 			int cnt = 0;
@@ -2284,7 +2180,7 @@ void GUI_Eob::runCampMenu() {
 			}
 
 			lastMenu = -1;
-			
+
 		} else {
 			Common::Point p = _vm->getMousePos();
 			for (Button *b = buttonList; b; b = b->nextButton) {
@@ -2292,7 +2188,7 @@ void GUI_Eob::runCampMenu() {
 					highlightButton = b;
 			}
 		}
-		
+
 		if (_charSelectRedraw || redrawPortraits) {
 			for (int i = 0; i < 6; i++) {
 				_vm->gui_drawCharPortraitWithStats(i);
@@ -2320,10 +2216,10 @@ bool GUI_Eob::runLoadMenu(int x, int y) {
 	int xo = dm->sx;
 	int yo = dm->sy;
 	bool result = false;
-	
+
 	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
-	
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {	
+
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
 		int slot = selectSaveSlotDialogue(x, y, 1);
 		if (slot > 5) {
 			runLoop = result = false;
@@ -2356,7 +2252,7 @@ bool GUI_Eob::confirmDialogue2(int dim, int id, int deflt) {
 	int16 y = _screen->_curDim->sy + _screen->_curDim->h - 21;
 	int newHighlight = deflt ^ 1;
 	int lastHighlight = -1;
-	
+
 	for (int i = 0; i < 2; i++)
 		drawMenuButtonBox(x[i], y, 32, 14, false, false);
 
@@ -2391,7 +2287,7 @@ bool GUI_Eob::confirmDialogue2(int dim, int id, int deflt) {
 		}
 
 		if (newHighlight != lastHighlight) {
-			for (int i = 0; i < 2; i++)				
+			for (int i = 0; i < 2; i++)
 				_screen->printShadedText(_vm->_menuYesNoStrings[i], x[i] + 16 - (strlen(_vm->_menuYesNoStrings[i]) << 2) + 1, y + 3, i == newHighlight ? 6 : 15, 0);
 			_screen->updateScreen();
 			lastHighlight = newHighlight;
@@ -2407,7 +2303,7 @@ bool GUI_Eob::confirmDialogue2(int dim, int id, int deflt) {
 	_screen->copyRegion(0, _screen->_curDim->h, _screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->setFont(of);
 	_screen->setScreenDim(od);
-	
+
 	return newHighlight ? false : true;
 }
 
@@ -2417,7 +2313,7 @@ void GUI_Eob::messageDialogue2(int dim, int id, int buttonTextCol) {
 	_screen->_curPage = 2;
 	_screen->setClearScreenDim(dim);
 	drawMenuButtonBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, false, false);
-	_screen->printShadedText(getMenuString(id), (_screen->_curDim->sx << 3) + 5, _screen->_curDim->sy + 5, 15, 0);	
+	_screen->printShadedText(getMenuString(id), (_screen->_curDim->sx << 3) + 5, _screen->_curDim->sy + 5, 15, 0);
 	_screen->_curPage = 0;
 	_screen->copyRegion(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, 2, 0, Screen::CR_NO_P_CHECK);
 
@@ -2628,10 +2524,10 @@ bool GUI_Eob::runSaveMenu(int x, int y) {
 	int xo = dm->sx;
 	int yo = dm->sy;
 	bool result = false;
-	
+
 	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
-	
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {	
+
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
 		int slot = selectSaveSlotDialogue(x, y, 0);
 		if (slot > 5) {
 			runLoop = result = false;
@@ -2641,13 +2537,13 @@ bool GUI_Eob::runSaveMenu(int x, int y) {
 				_saveSlotStringsTemp[slot][0] = 0;
 			else
 				useSlot = confirmDialogue2(11, 55, 1);
-			
+
 			if (!useSlot)
 				continue;
 
 			int fx = (x + 1) << 3;
 			int fy = y + slot * 17 + 23;
-			
+
 			for (int in = -1; in == -1 && !_vm->shouldQuit(); ) {
 				_screen->fillRect(fx - 2, fy, fx + 160, fy + 8, _vm->_bkgColor_1);
 				in = getTextInput(_saveSlotStringsTemp[slot], x + 1, fy, 19, 2, 0, 8);
@@ -2665,12 +2561,12 @@ bool GUI_Eob::runSaveMenu(int x, int y) {
 			Common::Error err = _vm->saveGameStateIntern(_savegameOffset + slot, _saveSlotStringsTemp[slot], &thumb);
 			thumb.free();
 
-			if (err.getCode() == Common::kNoError)			
+			if (err.getCode() == Common::kNoError)
 				result = true;
 			else
 				messageDialogue(11, 15, 6);
 
-			runLoop = false;			
+			runLoop = false;
 		}
 	}
 
@@ -2683,7 +2579,7 @@ int GUI_Eob::selectSaveSlotDialogue(int x, int y, int id) {
 
 	_saveSlotX = _saveSlotY = 0;
 	_screen->setCurPage(2);
-	
+
 	updateSaveSlotsList();
 	_savegameOffset = 0;
 
@@ -2701,7 +2597,7 @@ int GUI_Eob::selectSaveSlotDialogue(int x, int y, int id) {
 	int newHighlight = 0;
 	int slot = -1;
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {		
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
 		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
 		_vm->removeInputTop();
 
@@ -2768,7 +2664,7 @@ int GUI_Eob::selectSaveSlotDialogue(int x, int y, int id) {
 		if (lastHighlight != newHighlight) {
 			drawSaveSlotButton(lastHighlight, 0, 15);
 			drawSaveSlotButton(newHighlight, 0, 6);
-			
+
 			// Display highlighted slot index in the bottom left corner to avoid people getting lost with the 990 save slots
 			_screen->setFont(Screen::FID_6_FNT);
 			int sli = (newHighlight == 6) ?  _savegameOffset : (_savegameOffset + newHighlight);
@@ -2798,7 +2694,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 	uint32 avltyFlags = 0;
 	int li = 0;
 	int lv = 0;
-	
+
 	EobCharacter *c = &_vm->_characters[charIndex];
 	int8 wm = c->wisdomCur - 12;
 	if (wm < 0)
@@ -2806,10 +2702,10 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 
 	if (spellType) {
 		li = _vm->getCharacterLevelIndex(2, c->cClass);
-		
+
 		if (li == -1) {
 			li = _vm->getCharacterLevelIndex(4, c->cClass);
-			
+
 			if (li != -1) {
 				lv = c->level[li] - 1;
 				if (lv < 0)
@@ -2817,7 +2713,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 
 				for (int i = 0; i < _numPages; i++)
 					np[i] = _vm->_numSpellsPal[lv * _numPages + i];
-				
+
 				avltyFlags = _paladinSpellAvltyFlags;
 			}
 
@@ -2878,7 +2774,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 	for (int i = 0; i < 32; i++) {
 		if (!(avltyFlags & (1 << i)))
 			continue;
-		
+
 		int d = lh[i] - 1;
 		if (d < 0)
 			continue;
@@ -2931,7 +2827,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 
 		if (updateDesc) {
 			updateDesc = false;
-			_screen->printShadedText(Common::String::format(_vm->_menuStringsMgc[1], np[lastHighLightButton] - numAssignedSpellsPerBookPage[lastHighLightButton], np[lastHighLightButton]).c_str(), 8, 38, 9, _vm->_bkgColor_1);		
+			_screen->printShadedText(Common::String::format(_vm->_menuStringsMgc[1], np[lastHighLightButton] - numAssignedSpellsPerBookPage[lastHighLightButton], np[lastHighLightButton]).c_str(), 8, 38, 9, _vm->_bkgColor_1);
 		}
 
 		if (newHighLightText < 0)
@@ -2939,13 +2835,13 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 
 		if (menuSpellMap[lastHighLightButton * 11] <= newHighLightText)
 			newHighLightText = 0;
-		
+
 		if (newHighLightText != lastHighLightText) {
 			memorizePrayMenuPrintString(menuSpellMap[lastHighLightButton * 11 + lastHighLightText + 1], lastHighLightText, spellType, true, false);
 			memorizePrayMenuPrintString(menuSpellMap[lastHighLightButton * 11 + newHighLightText + 1], newHighLightText, spellType, true, true);
 			lastHighLightText = newHighLightText;
 		}
-		
+
 		int inputFlag = _vm->checkInput(buttonList, false, 0) & 0x80ff;
 		_vm->removeInputTop();
 
@@ -2961,7 +2857,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 				newHighLightText = (p.y - 50 ) / 9;
 				if (menuSpellMap[lastHighLightButton * 11] - 1 < newHighLightText)
 					newHighLightText = menuSpellMap[lastHighLightButton * 11] - 1;
-			}			
+			}
 		}
 
 		if (inputFlag & 0x8000) {
@@ -2999,7 +2895,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 			newHighLightText = 0;
 		} else if (inputFlag == 0x8017) {
 			if (numAssignedSpellsPerBookPage[lastHighLightButton]) {
-				for (int i = 1; i <= menuSpellMap[lastHighLightButton * 11]; i++) {				
+				for (int i = 1; i <= menuSpellMap[lastHighLightButton * 11]; i++) {
 					numAssignedSpellsPerBookPage[lastHighLightButton] -= _numAssignedSpellsOfType[menuSpellMap[lastHighLightButton * 11 + i] * 2 - 2];
 					_numAssignedSpellsOfType[menuSpellMap[lastHighLightButton * 11 + i] * 2 - 2] = 0;
 				}
@@ -3087,7 +2983,7 @@ void GUI_Eob::scribeScrollDialogue() {
 	if (numScrolls) {
 		int csel = selectCharacterDialogue(49);
 		if (csel != -1) {
-			
+
 			EobCharacter *c = &_vm->_characters[csel];
 			int s = 0;
 
@@ -3128,7 +3024,7 @@ void GUI_Eob::scribeScrollDialogue() {
 						redraw = false;
 						lastHighLight = -1;
 						newHighLight = 0;
-					}					
+					}
 
 					if (lastHighLight != newHighLight) {
 						if (lastHighLight >= 0)
@@ -3152,7 +3048,7 @@ void GUI_Eob::scribeScrollDialogue() {
 					} else if (inputFlag == 0x8023 || inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE]) {
 						s = 0;
 					} else if (inputFlag == 0x8024) {
-						newHighLight = (_vm->_mouseY - 50) / 9;						
+						newHighLight = (_vm->_mouseY - 50) / 9;
 						if (newHighLight >= 0 && newHighLight < s) {
 							inputFlag = _vm->_keyMap[Common::KEYCODE_SPACE];
 						} else {
@@ -3193,7 +3089,7 @@ bool GUI_Eob::restParty() {
 	static const int8 eob1healSpells[] = { 2, 15, 20, 24 };
 	static const int8 eob2healSpells[] = { 3, 16, 20, 28 };
 	const int8 *spells = _vm->game() == GI_EOB1 ? eob1healSpells : eob2healSpells;
-	
+
 	uint8 crs[6];
 	memset(crs, 0, 6);
 	int hours = 0;
@@ -3243,7 +3139,7 @@ bool GUI_Eob::restParty() {
 				useHealers = confirmDialogue(40);
 				break;
 			}
-		} 
+		}
 	}
 
 	_screen->setClearScreenDim(7);
@@ -3269,14 +3165,14 @@ bool GUI_Eob::restParty() {
 				for (int ii = 0; ii < 80; ii++) {
 					if ((ii / 10 + 48) >= crs[i])
 						break;
-					
+
 					if (*list >= 0) {
 						list++;
 						continue;
 					}
 
 					*list *= -1;
-					crs[i] = 48;					
+					crs[i] = 48;
 					_vm->_txt->printMessage(Common::String::format(_vm->_menuStringsRest2[0], _vm->_characters[i].name, _vm->_spells[_vm->_clericSpellOffset + *list].name).c_str());
 					_vm->delay(80);
 					break;
@@ -3289,14 +3185,14 @@ bool GUI_Eob::restParty() {
 				for (int ii = 0; ii < 80; ii++) {
 					if ((ii / 6 + 48) >= crs[i])
 						break;
-					
+
 					if (*list >= 0) {
 						list++;
 						continue;
 					}
 
 					*list *= -1;
-					crs[i] = 48;					
+					crs[i] = 48;
 					_vm->_txt->printMessage(Common::String::format(_vm->_menuStringsRest2[1], _vm->_characters[i].name, _vm->_spells[*list].name).c_str());
 					_vm->delay(80);
 					break;
@@ -3311,7 +3207,7 @@ bool GUI_Eob::restParty() {
 					continue;
 				if (_vm->checkInventoryForItem(i, 30, -1) == -1)
 					continue;
-				
+
 				list = 0;
 				if (crs[i] >= 48) {
 					for (int ii = 0; !list && ii < 3; ii++)
@@ -3416,7 +3312,7 @@ bool GUI_Eob::restParty() {
 						_vm->gui_drawCharPortraitWithStats(i);
 					}
 				}
-				
+
 				if (starving) {
 					if (!confirmDialogue(47)) {
 						restContinue = false;
@@ -3475,7 +3371,7 @@ bool GUI_Eob::confirmDialogue(int id) {
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
 
 	Button *buttonList = initMenu(5);
-	
+
 	_screen->printShadedText(getMenuString(id), (_screen->_curDim->sx + 1) << 3, _screen->_curDim->sy + 4, 15, 0);
 
 	int newHighlight = 0;
@@ -3490,7 +3386,7 @@ bool GUI_Eob::confirmDialogue(int id) {
 			_screen->updateScreen();
 			lastHighlight = newHighlight;
 		}
-		
+
 		int inputFlag = _vm->checkInput(buttonList, false, 0) & 0x80ff;
 		_vm->removeInputTop();
 
@@ -3539,7 +3435,7 @@ void GUI_Eob::messageDialogue(int dim, int id, int buttonTextCol) {
 
 	drawTextBox(dim, id);
 	const ScreenDim *dm = _screen->getScreenDim(dim);
-	
+
 	int bx = ((dm->sx + dm->w) << 3) - ((strlen(_vm->_menuOkString) << 3) + 16);
 	int by = dm->sy + dm->h - 19;
 	int bw = (strlen(_vm->_menuOkString) << 3) + 7;
@@ -3565,7 +3461,7 @@ void GUI_Eob::messageDialogue(int dim, int id, int buttonTextCol) {
 	_vm->_system->delayMillis(80);
 	drawMenuButtonBox(bx, by, bw, 14, false, true);
 	_screen->updateScreen();
-	
+
 	_screen->copyRegion(0, dm->h, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->setScreenDim(od);
 	_screen->setFont(of);
@@ -3576,7 +3472,7 @@ int GUI_Eob::selectCharacterDialogue(int id) {
 	uint8 flags = (id == 26) ? (_vm->game() == GI_EOB1 ? 0x04 : 0x14) : 0x02;
 	_vm->removeInputTop();
 
-	_charSelectRedraw = false;	
+	_charSelectRedraw = false;
 	bool abort = false;
 	int count = 0;
 	int result = -1;
@@ -3584,20 +3480,20 @@ int GUI_Eob::selectCharacterDialogue(int id) {
 
 	for (int i = 0; i < 6; i++) {
 		found[i] = -1;
-		
+
 		if (!_vm->testCharacter(i, 1))
 			continue;
-		
+
 		if (!(_vm->_classModifierFlags[_vm->_characters[i].cClass] & flags) && (id != 53))
 			continue;
-		
+
 		if (id != 53 && (!_vm->_characters[i].food || !_vm->testCharacter(i, 4))) {
 			abort = true;
 		} else {
 			found[i] = 0;
 			result = i;
 			count++;
-		} 
+		}
 	}
 
 	if (!count) {
@@ -3627,7 +3523,7 @@ int GUI_Eob::selectCharacterDialogue(int id) {
 		_charSelectRedraw = true;
 	}
 
-	if (count == 1) {		
+	if (count == 1) {
 		int l = _vm->getCharacterLevelIndex(4, _vm->_characters[result].cClass);
 
 		if (l == -1)
@@ -3650,7 +3546,7 @@ int GUI_Eob::selectCharacterDialogue(int id) {
 	while (result == -2 && !_vm->shouldQuit()) {
 		int inputFlag = _vm->checkInput(buttonList, false, 0);
 		_vm->removeInputTop();
-		
+
 		updateBoxFrameHighLight(hlCur);
 
 		if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP8] || inputFlag == _vm->_keyMap[Common::KEYCODE_UP] || inputFlag == _vm->_keyMap[Common::KEYCODE_a] || inputFlag == _vm->_keyMap[Common::KEYCODE_w]) {
@@ -3757,7 +3653,7 @@ Button *GUI_Eob::initMenu(int id) {
 		const ScreenDim *dm = _screen->getScreenDim(m->dim);
 		_screen->fillRect(dm->sx << 3, dm->sy, ((dm->sx + dm->w) << 3) - 1, (dm->sy + dm->h) - 1, _vm->_bkgColor_1);
 		_screen->setScreenDim(m->dim);
-		drawMenuButtonBox(dm->sx << 3, dm->sy, dm->w << 3, dm->h, false, false);		
+		drawMenuButtonBox(dm->sx << 3, dm->sy, dm->w << 3, dm->h, false, false);
 	}
 
 	_screen->printShadedText(getMenuString(m->titleStrId), 5, 5, m->titleCol, 0);
@@ -3798,7 +3694,7 @@ Button *GUI_Eob::initMenu(int id) {
 void GUI_Eob::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFill) {
 	if (!b)
 		return;
-	
+
 	EobMenuButtonDef *d = (EobMenuButtonDef*)b->extButtonDef;
 
 	if (d->flags & 1)
@@ -3806,7 +3702,7 @@ void GUI_Eob::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFil
 
 	if (d->labelId) {
 		const char *s = getMenuString(d->labelId);
-		
+
 		int xOffs = 4;
 		int yOffs = 3;
 
@@ -3825,7 +3721,7 @@ void GUI_Eob::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFil
 void GUI_Eob::drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool noFill) {
 	uint8 col1 = _vm->_color1_1;
 	uint8 col2 = _vm->_color2_1;
-	
+
 	if (clicked)
 		col1 = col2 = _vm->_bkgColor_1;
 
@@ -3859,7 +3755,7 @@ void GUI_Eob::drawSaveSlotButton(int slot, int redrawBox, int textCol) {
 		return;
 
 	int x = _saveSlotX + 4;
-	int y = _saveSlotY + slot * 17 + 20;	
+	int y = _saveSlotY + slot * 17 + 20;
 	int w = 167;
 	const char *s = (slot < 6) ?_saveSlotStringsTemp[slot] : _vm->_saveLoadStrings[0];
 
@@ -3867,8 +3763,8 @@ void GUI_Eob::drawSaveSlotButton(int slot, int redrawBox, int textCol) {
 		x = _saveSlotX + 118;
 		y = _saveSlotY + 126;
 		w = 53;
-	} 
-	
+	}
+
 	if (redrawBox)
 		drawMenuButtonBox(x, y, w, 14, (redrawBox - 1) ? true : false, false);
 
@@ -3997,7 +3893,7 @@ void GUI_Eob::setupSaveMenuSlots() {
 int GUI_Eob::getHighlightSlot() {
 	int res = -1;
 	Common::Point p = _vm->getMousePos();
-	
+
 	for (int i = 0; i < 6; i++) {
 		int y = _saveSlotY + i * 17 + 20;
 		if (_vm->posWithinRect(p.x, p.y, _saveSlotX + 4, y, _saveSlotX + 167, y + 14)) {
@@ -4034,7 +3930,7 @@ void GUI_Eob::restParty_updateRestTime(int hours, bool init) {
 	_screen->setCurPage(0);
 	_screen->copyRegion(((_screen->_curDim->sx + 1) << 3) - 1, _screen->_curDim->sy + 20, ((_screen->_curDim->sx + 1) << 3) - 1, _screen->_curDim->sy + 20, 144, 8, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	
+
 	_vm->delay(160);
 
 	_screen->setScreenDim(od);
@@ -4064,9 +3960,7 @@ const EobRect16 GUI_Eob::_updateBoxFrameHighLights[] = {
 	{ 0x00A3, 0x0068, 0x00C3, 0x0089 }
 };
 
-#endif // ENABLE_EOB
-
 }	// End of namespace Kyra
 
-#endif // defined(ENABLE_EOB) || defined(ENABLE_LOL)
+#endif // ENABLE_EOB
 
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index a0ac509026..46d36b97b7 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -56,7 +56,7 @@ public:
 
 	// Non button based menu handling (main menu, character generation)
 	void simpleMenu_setup(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int unk, int lineSpacing);
-	int simpleMenu_process(int sd, const char *const *strings, void *b, int32 menuItemsMask, int unk);	
+	int simpleMenu_process(int sd, const char *const *strings, void *b, int32 menuItemsMask, int unk);
 
 	// Button based menus (camp menu, load menu)
 	void runCampMenu();
@@ -87,8 +87,8 @@ private:
 	void messageDialogue(int dim, int id, int buttonTextCol);
 	int selectCharacterDialogue(int id);
 	void displayTextBox(int id);
-	
-	Button *initMenu(int id);	
+
+	Button *initMenu(int id);
 	void drawMenuButton(Button *b, bool clicked, bool highlight, bool noFill);
 	void drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool noFill);
 	void drawTextBox(int dim, int id);
diff --git a/engines/kyra/gui_rpg.cpp b/engines/kyra/gui_rpg.cpp
new file mode 100644
index 0000000000..8b2a593d6b
--- /dev/null
+++ b/engines/kyra/gui_rpg.cpp
@@ -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.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/kyra_rpg.h"
+
+namespace Kyra {
+
+void KyraRpgEngine::removeInputTop() {
+	if (!_eventList.empty()) {
+		if (_eventList.begin()->event.type == Common::EVENT_LBUTTONDOWN)
+			_mouseClick = 1;
+		else if (_eventList.begin()->event.type == Common::EVENT_RBUTTONDOWN)
+			_mouseClick = 2;
+		else
+			_mouseClick = 0;
+
+		_eventList.erase(_eventList.begin());
+	}
+}
+
+void KyraRpgEngine::gui_drawBox(int x, int y, int w, int h, int frameColor1, int frameColor2, int fillColor) {
+	w--; h--;
+	if (fillColor != -1)
+		screen()->fillRect(x + 1, y + 1, x + w - 1, y + h - 1, fillColor);
+
+	screen()->drawClippedLine(x + 1, y, x + w, y, frameColor2);
+	screen()->drawClippedLine(x + w, y, x + w, y + h - 1, frameColor2);
+	screen()->drawClippedLine(x, y, x, y + h, frameColor1);
+	screen()->drawClippedLine(x, y + h, x + w, y + h, frameColor1);
+}
+
+void KyraRpgEngine::gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32 cur, int32 max, int col1, int col2) {
+	if (max < 1)
+		return;
+	if (cur < 0)
+		cur = 0;
+
+	int32 e = MIN(cur, max);
+
+	if (!--w)
+		return;
+	if (!--h)
+		return;
+
+	int32 t = (e * w) / max;
+
+	if (!t && e)
+		t++;
+
+	if (t)
+		screen()->fillRect(x, y, x + t - 1, y + h, col1);
+
+	if (t < w && col2)
+		screen()->fillRect(x + t, y, x + w, y + h, col2);
+}
+
+void KyraRpgEngine::gui_initButtonsFromList(const int16 *list) {
+	while (*list != -1)
+		gui_initButton(*list++);
+}
+
+void KyraRpgEngine::gui_resetButtonList() {
+	for (uint i = 0; i < ARRAYSIZE(_activeButtonData); ++i)
+		_activeButtonData[i].nextButton = 0;
+
+	gui_notifyButtonListChanged();
+	_activeButtons = 0;
+}
+
+void KyraRpgEngine::gui_notifyButtonListChanged() {
+	if (gui()) {
+		if (!_buttonListChanged && !_preserveEvents)
+			removeInputTop();
+		_buttonListChanged = true;
+	}
+}
+
+bool KyraRpgEngine::clickedShape(int shapeIndex) {
+	if (_clickedSpecialFlag != 0x40)
+		return true;
+
+	for (; shapeIndex; shapeIndex = _levelDecorationProperties[shapeIndex].next) {
+		if (_flags.gameID != GI_LOL)
+			shapeIndex--;
+
+		uint16 s = _levelDecorationProperties[shapeIndex].shapeIndex[1];
+
+		if (s == 0xffff)
+			continue;
+
+		int w = _flags.gameID == GI_LOL ? _levelDecorationShapes[s][3] : (_levelDecorationShapes[s][2] << 3);
+		int h = _levelDecorationShapes[s][_flags.gameID == GI_LOL ? 2 : 1];
+		int x = _levelDecorationProperties[shapeIndex].shapeX[1] + _clickedShapeXOffs;
+		int y = _levelDecorationProperties[shapeIndex].shapeY[1] + _clickedShapeYOffs;
+
+		if (_levelDecorationProperties[shapeIndex].flags & 1) {
+			if (_flags.gameID == GI_LOL)
+				w <<= 1;
+			else
+				x = 176 - x - w;
+		}
+
+		if (posWithinRect(_mouseX, _mouseY, x - 4, y - 4, x + w + 8, y + h + 8))
+			return true;
+	}
+
+	return false;
+}
+
+}	// End of namespace Kyra
+
+#endif // defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index 44f3a7ef3d..454e56a845 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -179,7 +179,7 @@ void EobCoreEngine::deleteBlockItem(uint16 block, int type) {
 		return;
 
 	_levelBlockProperties[block].drawObjects = 0;
-	
+
 	for (uint16 i2 = itm, i = 0; itm != i2 || !i; i++ ) {
 		if (type == _items[itm].type || type == -1) {
 			_items[itm].block = -1;
@@ -224,13 +224,13 @@ int EobCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int sl
 
 int EobCoreEngine::stripPartyItems(int16 itemType, int16 itemValue, int handleValueMode, int numItems) {
 	int itemsLeft = numItems;
-	
+
 	for (bool runloop = true; runloop && itemsLeft; ) {
 		runloop = false;
 		for (int i = 0; i < 6 && itemsLeft; i++) {
 			if (!testCharacter(i, 1))
 				continue;
-			
+
 			for (int ii = 0; ii < 27 && itemsLeft; ii++) {
 				if (ii == 16)
 					continue;
@@ -293,18 +293,18 @@ int EobCoreEngine::itemUsableByCharacter(int charIndex, Item item) {
 int EobCoreEngine::countQueuedItems(Item itemQueue, int16 id, int16 type, int count, int includeFlyingItems) {
 	uint16 o1 = itemQueue;
 	uint16 o2 = o1;
-	
+
 	if (!o1)
 		return 0;
 
 	int res = 0;
-		
+
 	for (bool forceLoop = true; o1 != o2 || forceLoop; o1 = _items[o1].prev) {
 		EobItem *itm = &_items[o1];
 		forceLoop = false;
 		if (id != -1 || type != -1) {
 			if (((id != -1) || (id == -1 && type != itm->type)) && ((type != -1) || (type == -1 && id != o1)))
-				continue;			
+				continue;
 		}
 
 		if (!includeFlyingItems) {
@@ -314,8 +314,8 @@ int EobCoreEngine::countQueuedItems(Item itemQueue, int16 id, int16 type, int co
 
 		if (!count)
 			return o1;
-		
-		res++;		
+
+		res++;
 	}
 
 	return res;
@@ -329,13 +329,13 @@ int EobCoreEngine::getQueuedItem(Item *items, int pos, int id) {
 		return 0;
 
 	EobItem *itm = &_items[o1];
-	
+
 	for (bool forceLoop = true; o1 != o2 || forceLoop; o1 = itm->prev) {
 		itm = &_items[o1];
 		forceLoop = false;
 		if ((id != -1 || (id == -1 && itm->pos != pos)) && id != o1)
 			continue;
-		
+
 		Item n = itm->next;
 		Item p = itm->prev;
 		_items[n].prev = p;
@@ -359,10 +359,10 @@ void EobCoreEngine::printFullItemName(Item item) {
 	const char *nameId = _itemNames[itm->nameId];
 	uint8 f = _itemTypes[itm->type].extraProperties & 0x7f;
 	int8 v = itm->value;
-	
+
 	const char *tstr2 = 0;
 	const char *tstr3 = 0;
-	
+
 	bool correctSuffixCase = false;
 
 	Common::String tmpString;
@@ -422,7 +422,7 @@ void EobCoreEngine::printFullItemName(Item item) {
 				tmpString = nameUnid;
 				break;
 		}
-	
+
 
 		if (tstr3) {
 			if (!tstr2) {
@@ -511,7 +511,7 @@ void EobCoreEngine::eatItemInHand(int charIndex) {
 		gui_drawFoodStatusGraph(charIndex);
 		_screen->updateScreen();
 		snd_playSoundEffect(9);
-	}	
+	}
 }
 
 bool EobCoreEngine::launchObject(int charIndex, Item item, uint16 startBlock, int startPos, int dir, int type) {
@@ -540,7 +540,7 @@ bool EobCoreEngine::launchObject(int charIndex, Item item, uint16 startBlock, in
 	t->attackerId = charIndex;
 	t->callBackIndex = 0;
 
-	snd_playSoundEffect(type == 7 ? 26 : 11);	
+	snd_playSoundEffect(type == 7 ? 26 : 11);
 	return true;
 }
 
@@ -579,7 +579,7 @@ bool EobCoreEngine::updateObjectFlight(EobFlyingObject *fo, int block, int pos)
 			setItemPosition((Item*)&_levelBlockProperties[block].drawObjects, block, fo->item, pos | 4);
 			fo->curBlock = block;
 			fo->curPos = pos;
-			fo->distance--;	
+			fo->distance--;
 			return true;
 
 		} else {
@@ -594,7 +594,7 @@ bool EobCoreEngine::updateObjectFlight(EobFlyingObject *fo, int block, int pos)
 		fo->curBlock = block;
 		fo->curPos = pos;
 		if (fo->distance != 255)
-			fo->distance--;		
+			fo->distance--;
 	}
 	return true;
 }
@@ -653,7 +653,7 @@ void EobCoreEngine::explodeObject(EobFlyingObject *fo, int block, Item item) {
 	int16 x2 = 0;
 
 	setLevelShapesDim(tl, x1, x2, 5);
-	
+
 	if (x2 < x1)
 		return;
 
diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp
new file mode 100644
index 0000000000..4a0db7b78d
--- /dev/null
+++ b/engines/kyra/kyra_rpg.cpp
@@ -0,0 +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.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/kyra_rpg.h"
+#include "kyra/sound.h"
+
+#include "common/system.h"
+
+namespace Kyra {
+
+KyraRpgEngine::KyraRpgEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(system, flags), _numFlyingObjects(_flags.gameID == GI_LOL ? 8 : 10) {
+	_txt = 0;
+	_mouseClick = 0;
+	_preserveEvents = _buttonListChanged = false;
+
+	_sceneXoffset = 0;
+	_sceneShpDim = 5;
+
+	_activeButtons = 0;
+
+	_currentLevel = 0;
+
+	_vmpPtr = 0;
+	_vcnBlocks = 0;
+	_vcfBlocks = 0;
+	_vcnShift = 0;
+	_vcnExpTable = 0;
+	_vmpPtr = 0;
+	_blockBrightness = _wllVcnOffset = 0;
+	_blockDrawingBuffer = 0;
+	_sceneWindowBuffer = 0;
+	_monsterShapes = _monsterPalettes = 0;
+
+	_doorShapes = 0;
+
+	_levelDecorationProperties = 0;
+	_levelDecorationData = 0;
+	_levelDecorationShapes = 0;
+	_decorationCount = 0;
+	_mappedDecorationsCount = 0;
+	memset(_visibleBlockIndex, 0, sizeof(_visibleBlockIndex));
+
+	_lvlShapeTop = _lvlShapeBottom = _lvlShapeLeftRight = 0;
+	_levelBlockProperties = 0;
+	_hasTempDataFlags = 0;
+
+	_wllVmpMap = _specialWallTypes = _wllWallFlags = 0;
+	_wllShapeMap = 0;
+
+	_sceneDrawVarDown = _sceneDrawVarRight = _sceneDrawVarLeft = _wllProcessFlag = 0;
+
+	_currentBlock = 0;
+	_currentDirection = 0;
+	_compassDirection = -1;
+	_updateFlags = _clickedSpecialFlag = 0;
+	_sceneDefaultUpdate = 0;
+	_sceneUpdateRequired = false;
+
+	_flyingObjectsPtr = 0;
+	_flyingObjectStructSize = sizeof(EobFlyingObject);
+
+	_clickedShapeXOffs = _clickedShapeYOffs = 0;
+
+	_dscShapeX = 0;
+	_dscTileIndex = 0;
+	_dscUnk2 = 0;
+	_dscDim1 = 0;
+	_dscDim2 = 0;
+	_dscBlockMap = 0;
+	_dscBlockIndex = 0;
+	_dscShapeIndex = 0;
+	_dscDimMap = 0;
+	_dscDoorShpIndex = 0;
+	_dscDoorY2 = 0;
+
+	_shpDmX1 = _shpDmX2 = 0;
+
+	memset(_openDoorState, 0, sizeof(_openDoorState));
+	memset(_dialogueButtonString, 0, 3 * sizeof(const char *));
+	_dialogueButtonPosX = 0;
+	_dialogueButtonPosY = 0;
+	_dialogueNumButtons = _dialogueButtonYoffs = _dialogueHighlightedButton = 0;
+	_currentControlMode = 0;
+	_specialSceneFlag = 0;
+	_dialogueButtonLabelCol1 = 0;
+	_dialogueButtonLabelCol2 = 0;
+	_dialogueButtonW = 0;
+	_dialogueButtonH = 0;
+	_waitButtonPresX = 0;
+	_waitButtonPresY = 0;
+	_waitButtonPresW = 0;
+	_waitButtonReverveW = 0;
+
+	_updateCharNum = -1;
+	_activeVoiceFileTotalTime = 0;
+	_updatePortraitSpeechAnimDuration = _resetPortraitAfterSpeechAnim = _needSceneRestore = 0;
+	_fadeText = false;
+
+	memset(_lvlTempData, 0, sizeof(_lvlTempData));
+
+	_dialogueField = false;
+
+	_environmentSfx = _environmentSfxVol = _envSfxDistThreshold = 0;
+	_monsterStepCounter = _monsterStepMode = 0;
+}
+
+KyraRpgEngine::~KyraRpgEngine() {
+	delete[] _wllVmpMap;
+	delete[] _wllShapeMap;
+	delete[] _specialWallTypes;
+	delete[] _wllWallFlags;
+
+	delete[] _vmpPtr;
+	delete[] _vcnExpTable;
+	delete[] _vcnBlocks;
+	delete[] _vcfBlocks;
+	delete[] _vcnShift;
+	delete[] _blockDrawingBuffer;
+	delete[] _sceneWindowBuffer;
+
+	delete[] _lvlShapeTop;
+	delete[] _lvlShapeBottom;
+	delete[] _lvlShapeLeftRight;
+
+	delete[] _doorShapes;
+
+	delete[] _levelDecorationShapes;
+	delete[] _levelDecorationData;
+	delete[] _levelDecorationProperties;
+	delete[] _levelBlockProperties;
+}
+
+Common::Error KyraRpgEngine::init() {
+	gui_resetButtonList();
+
+	_levelDecorationProperties = new LevelDecorationProperty[100];
+	memset(_levelDecorationProperties, 0, 100 * sizeof(LevelDecorationProperty));
+	_levelDecorationShapes = new uint8*[400];
+	memset(_levelDecorationShapes, 0, 400 * sizeof(uint8*));
+	_levelBlockProperties = new LevelBlockProperty[1025];
+	memset(_levelBlockProperties, 0, 1025 * sizeof(LevelBlockProperty));
+
+	_wllVmpMap = new uint8[256];
+	memset(_wllVmpMap, 0, 256);
+	_wllShapeMap = new int8[256];
+	memset(_wllShapeMap, 0, 256);
+	_specialWallTypes = new uint8[256];
+	memset(_specialWallTypes, 0, 256);
+	_wllWallFlags = new uint8[256];
+	memset(_wllWallFlags, 0, 256);
+
+	_blockDrawingBuffer = new uint16[1320];
+	memset(_blockDrawingBuffer, 0, 1320 * sizeof(uint16));
+	_sceneWindowBuffer = new uint8[21120];
+	memset(_sceneWindowBuffer, 0, 21120);
+
+	_lvlShapeTop = new int16[18];
+	memset(_lvlShapeTop, 0, 18 * sizeof(int16));
+	_lvlShapeBottom = new int16[18];
+	memset(_lvlShapeBottom, 0, 18 * sizeof(int16));
+	_lvlShapeLeftRight = new int16[36];
+	memset(_lvlShapeLeftRight, 0, 36 * sizeof(int16));
+
+	_vcnExpTable = new uint8[128];
+	for (int i = 0; i < 128; i++)
+		_vcnExpTable[i] = i & 0x0f;
+
+	_doorShapes = new uint8*[6];
+	memset(_doorShapes, 0, 6 * sizeof(uint8*));
+
+	initStaticResource();
+
+	_envSfxDistThreshold = (_sound->getSfxType() == Sound::kAdLib || _sound->getSfxType() == Sound::kPCSpkr) ? 15 : 3;
+
+	return Common::kNoError;
+}
+
+bool KyraRpgEngine::posWithinRect(int posX, int posY, int x1, int y1, int x2, int y2) {
+	if (posX < x1 || posX > x2 || posY < y1 || posY > y2)
+		return false;
+	return true;
+}
+
+void KyraRpgEngine::drawDialogueButtons() {
+	int cp = screen()->setCurPage(0);
+	Screen::FontId of = screen()->setFont(gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
+
+	for (int i = 0; i < _dialogueNumButtons; i++) {
+		int x = _dialogueButtonPosX[i];
+		if (gameFlags().use16ColorMode) {
+			gui_drawBox(x, ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1, 74, 10, 0xee, 0xcc, -1);
+			screen()->printText(_dialogueButtonString[i], (x + 37 - (screen()->getTextWidth(_dialogueButtonString[i])) / 2) & ~3,
+				((_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2) & ~7, _dialogueHighlightedButton == i ? 0xc1 : 0xe1, 0);
+		} else {
+			gui_drawBox(x, (_dialogueButtonYoffs + _dialogueButtonPosY[i]), _dialogueButtonW, _dialogueButtonH, _color1_1, _color2_1, _bkgColor_1);
+			screen()->printText(_dialogueButtonString[i], x + (_dialogueButtonW >> 1) - (screen()->getTextWidth(_dialogueButtonString[i])) / 2,
+				(_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2, _dialogueHighlightedButton == i ? _dialogueButtonLabelCol1 : _dialogueButtonLabelCol2, 0);
+		}
+	}
+	screen()->setFont(of);
+	screen()->setCurPage(cp);
+}
+
+uint16 KyraRpgEngine::processDialogue() {
+	int df = _dialogueHighlightedButton;
+	int res = 0;
+
+	for (int i = 0; i < _dialogueNumButtons; i++) {
+		int x = _dialogueButtonPosX[i];
+		int y = (gameFlags().use16ColorMode ? ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1 : (_dialogueButtonYoffs + _dialogueButtonPosY[i]));
+		Common::Point p = getMousePos();
+		if (posWithinRect(p.x, p.y, x, y, x + _dialogueButtonW, y + _dialogueButtonH)) {
+			_dialogueHighlightedButton = i;
+			break;
+		}
+	}
+
+	if (_dialogueNumButtons == 0) {
+		int e = checkInput(0, false) & 0xFF;
+		removeInputTop();
+
+		if (e) {
+			gui_notifyButtonListChanged();
+
+			if (e == _keyMap[Common::KEYCODE_SPACE] || e == _keyMap[Common::KEYCODE_RETURN]) {
+				snd_stopSpeech(true);
+			}
+		}
+
+		if (snd_updateCharacterSpeech() != 2) {
+				res = 1;
+				if (!shouldQuit()) {
+					removeInputTop();
+					gui_notifyButtonListChanged();
+				}
+		}
+	} else {
+		int e = checkInput(0, false, 0) & 0xFF;
+		removeInputTop();
+		if (e)
+			gui_notifyButtonListChanged();
+
+		if ((_flags.gameID == GI_LOL && (e == 200 || e == 202)) || (_flags.gameID != GI_LOL && (e == 199 || e == 201))) {
+			for (int i = 0; i < _dialogueNumButtons; i++) {
+				int x = _dialogueButtonPosX[i];
+				int y = (gameFlags().use16ColorMode ? ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1 : (_dialogueButtonYoffs + _dialogueButtonPosY[i]));
+				Common::Point p = getMousePos();
+				if (posWithinRect(p.x, p.y, x, y, x + _dialogueButtonW, y + _dialogueButtonH)) {
+					_dialogueHighlightedButton = i;
+					res = _dialogueHighlightedButton + 1;
+					break;
+				}
+			}
+		} else if (e == _keyMap[Common::KEYCODE_SPACE] || e == _keyMap[Common::KEYCODE_RETURN]) {
+			snd_stopSpeech(true);
+			res = _dialogueHighlightedButton + 1;
+		} else if (e == _keyMap[Common::KEYCODE_LEFT] || e == _keyMap[Common::KEYCODE_DOWN]) {
+			if (_dialogueNumButtons > 1 && _dialogueHighlightedButton > 0)
+				_dialogueHighlightedButton--;
+		} else if (e == _keyMap[Common::KEYCODE_RIGHT] || e == _keyMap[Common::KEYCODE_UP]) {
+			if (_dialogueNumButtons > 1 && _dialogueHighlightedButton < (_dialogueNumButtons - 1))
+				_dialogueHighlightedButton++;
+		}
+	}
+
+	if (df != _dialogueHighlightedButton)
+		drawDialogueButtons();
+
+	screen()->updateScreen();
+
+	if (res == 0)
+		return 0;
+
+	stopPortraitSpeechAnim();
+
+	if (game() == GI_LOL) {
+		if (!textEnabled() && _currentControlMode) {
+			screen()->setScreenDim(5);
+			const ScreenDim *d = screen()->getScreenDim(5);
+			screen()->fillRect(d->sx, d->sy + d->h - 9, d->sx + d->w - 1, d->sy + d->h - 1, d->unkA);
+		} else {
+			const ScreenDim *d = screen()->_curDim;
+			if (gameFlags().use16ColorMode)
+				screen()->fillRect(d->sx, d->sy, d->sx + d->w - 3, d->sy + d->h - 2, d->unkA);
+			else
+				screen()->fillRect(d->sx, d->sy, d->sx + d->w - 2, d->sy + d->h - 1, d->unkA);
+			txt()->clearDim(4);
+			txt()->resetDimTextPositions(4);
+		}
+	}
+
+	return res;
+}
+
+void KyraRpgEngine::delayUntil(uint32 time, bool doUpdate, bool isMainLoop) {
+	uint32 curTime = _system->getMillis();
+	if (time > curTime)
+		delay(time - curTime, doUpdate, isMainLoop);
+}
+
+int KyraRpgEngine::rollDice(int times, int pips, int inc) {
+	if (times <= 0 || pips <= 0)
+		return inc;
+
+	int res = 0;
+	while (times--)
+		res += _rnd.getRandomNumberRng(1, pips);
+
+	return res + inc;
+}
+
+bool KyraRpgEngine::snd_processEnvironmentalSoundEffect(int soundId, int block) {
+	if (!_sound->sfxEnabled() || shouldQuit())
+		return false;
+
+	if (_environmentSfx)
+		snd_playSoundEffect(_environmentSfx, _environmentSfxVol);
+
+	int dist = 0;
+	if (block) {
+		dist = getBlockDistance(_currentBlock, block);
+		if (dist > _envSfxDistThreshold) {
+			_environmentSfx = 0;
+			return false;
+		}
+	}
+
+	_environmentSfx = soundId;
+	_environmentSfxVol = (15 - ((block || (_flags.gameID == GI_LOL && dist < 2)) ? dist : 0)) << 4;
+
+	return true;
+}
+
+void KyraRpgEngine::updateEnvironmentalSfx(int soundId) {
+	snd_processEnvironmentalSoundEffect(soundId, _currentBlock);
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
new file mode 100644
index 0000000000..9acc6ff0dc
--- /dev/null
+++ b/engines/kyra/kyra_rpg.h
@@ -0,0 +1,355 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 KYRA_RPG_H
+#define KYRA_RPG_H
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/kyra_v1.h"
+#include "kyra/screen_eob.h"
+#include "kyra/gui_eob.h"
+#include "kyra/text_lol.h"
+
+namespace Kyra {
+
+struct LevelDecorationProperty {
+	uint16 shapeIndex[10];
+	uint8 scaleFlag[10];
+	int16 shapeX[10];
+	int16 shapeY[10];
+	int8 next;
+	uint8 flags;
+};
+
+struct LevelBlockProperty {
+	uint8 walls[4];
+	uint16 assignedObjects;
+	uint16 drawObjects;
+	uint8 direction;
+	uint16 flags;
+};
+
+struct OpenDoorState {
+	uint16 block;
+	int8 wall;
+	int8 state;
+};
+
+struct LevelTempData {
+	uint8 *wallsXorData;
+	uint16 *flags;
+	void *monsters;
+	void *flyingObjects;
+	void *wallsOfForce;
+	uint8 monsterDifficulty;
+};
+
+struct EobFlyingObject {
+	uint8 enable;
+	uint8 objectType;
+	int16 attackerId;
+	Item item;
+	uint16 curBlock;
+	uint16 u2;
+	uint8 u1;
+	uint8 direction;
+	uint8 distance;
+	int8 callBackIndex;
+	uint8 curPos;
+	uint8 flags;
+	uint8 unused;
+};
+
+class KyraRpgEngine : public KyraEngine_v1 {
+friend class TextDisplayer_rpg;
+public:
+	KyraRpgEngine(OSystem *system, const GameFlags &flags);
+	virtual ~KyraRpgEngine();
+
+	virtual Screen *screen() = 0;
+	virtual GUI *gui() const = 0;
+
+protected:
+	// Startup
+	virtual Common::Error init();
+	virtual Common::Error go() = 0;
+
+	// Init
+	void initStaticResource();
+
+	const uint8 **_itemIconShapes;
+
+	// Main loop
+	virtual void update() = 0;
+	void updateEnvironmentalSfx(int soundId);
+
+	// timers
+	virtual void setupTimers() = 0;
+	void enableSysTimer(int sysTimer);
+	void disableSysTimer(int sysTimer);
+	void enableTimer(int id);
+	virtual uint8 getClock2Timer(int index) = 0;
+	virtual uint8 getNumClock2Timers() = 0;
+
+	void timerProcessDoors(int timerNum);
+
+	// mouse
+	bool posWithinRect(int posX, int posY, int x1, int y1, int x2, int y2);
+	virtual void setHandItem(Item itemIndex) = 0;
+
+	// Characters
+	int _updateCharNum;
+	int _updatePortraitSpeechAnimDuration;
+	bool _fadeText;
+	int _resetPortraitAfterSpeechAnim;
+	int _needSceneRestore;
+
+	// Items
+	int _itemInHand;
+
+	// Monsters
+	int getBlockDistance(uint16 block1, uint16 block2);
+
+	uint8 **_monsterPalettes;
+	uint8 **_monsterShapes;
+
+	int16 _shpDmX1;
+	int16 _shpDmX2;
+
+	int _monsterStepCounter;
+	int _monsterStepMode;
+
+	// Level
+	virtual void addLevelItems() = 0;
+	virtual void loadBlockProperties(const char *file) = 0;
+
+	virtual void drawScene(int pageNum) = 0;
+	virtual void drawSceneShapes(int start) = 0;
+	virtual void drawDecorations(int index) = 0;
+
+	virtual const uint8 *getBlockFileData(int levelIndex) = 0;
+	void setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim);
+	void scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim);
+	void drawLevelModifyScreenDim(int dim, int16 x1, int16 y1, int16 x2, int16 y2);
+	void generateBlockDrawingBuffer();
+	void generateVmpTileData(int16 startBlockX, uint8 startBlockY, uint8 wllVmpIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY);
+	void generateVmpTileDataFlipped(int16 startBlockX, uint8 startBlockY, uint8 wllVmpIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY);
+	bool hasWall(int index);
+	void assignVisibleBlocks(int block, int direction);
+	bool checkSceneUpdateNeed(int block);
+	void drawVcnBlocks();
+	uint16 calcNewBlockPosition(uint16 curBlock, uint16 direction);
+
+	virtual int clickedDoorSwitch(uint16 block, uint16 direction) = 0;
+	int clickedWallShape(uint16 block, uint16 direction);
+	int clickedLeverOn(uint16 block, uint16 direction);
+	int clickedLeverOff(uint16 block, uint16 direction);
+	int clickedWallOnlyScript(uint16 block);
+	virtual int clickedNiche(uint16 block, uint16 direction) = 0;
+
+	void processDoorSwitch(uint16 block, int openClose);
+	void openCloseDoor(int block, int openClose);
+	void completeDoorOperations();
+
+	uint8 *_wllVmpMap;
+	int8 *_wllShapeMap;
+	uint8 *_specialWallTypes;
+	uint8 *_wllWallFlags;
+
+	int _sceneXoffset;
+	int _sceneShpDim;
+
+	LevelBlockProperty *_levelBlockProperties;
+	LevelBlockProperty *_visibleBlocks[18];
+	LevelDecorationProperty *_levelDecorationData;
+	uint16 _levelDecorationDataSize;
+	LevelDecorationProperty *_levelDecorationProperties;
+	uint8 **_levelDecorationShapes;
+	uint16 _decorationCount;
+	int16 _mappedDecorationsCount;
+	uint16 *_vmpPtr;
+	uint8 *_vcnBlocks;
+	uint8 *_vcfBlocks;
+	uint8 *_vcnShift;
+	uint8 *_vcnExpTable;
+	uint16 *_blockDrawingBuffer;
+	uint8 *_sceneWindowBuffer;
+	uint8 _blockBrightness;
+	uint8 _wllVcnOffset;
+
+	uint8 **_doorShapes;
+
+	uint8 _currentLevel;
+	uint16 _currentBlock;
+	uint16 _currentDirection;
+	int _sceneDefaultUpdate;
+	bool _sceneUpdateRequired;
+
+	int16 _visibleBlockIndex[18];
+	int16 *_lvlShapeLeftRight;
+	int16 *_lvlShapeTop;
+	int16 *_lvlShapeBottom;
+
+	char _lastBlockDataFile[13];
+	uint32 _hasTempDataFlags;
+
+	int16 _sceneDrawVarDown;
+	int16 _sceneDrawVarRight;
+	int16 _sceneDrawVarLeft;
+	int _wllProcessFlag;
+
+	OpenDoorState _openDoorState[3];
+
+	int _sceneDrawPage1;
+	int _sceneDrawPage2;
+
+	const int8 *_dscShapeIndex;
+	const uint8 *_dscDimMap;
+	const int8 *_dscDim1;
+	const int8 *_dscDim2;
+	const int16 *_dscShapeX;
+	const uint8 *_dscUnk2;
+	const uint8 *_dscBlockMap;
+	const int8 *_dscBlockIndex;
+	const uint8 *_dscTileIndex;
+
+	const uint8 *_dscDoorShpIndex;
+	int _dscDoorShpIndexSize;
+	const uint8 *_dscDoorY2;
+
+	// Script
+	virtual void runLevelScript(int block, int flags) = 0;
+
+	// Gui
+	void removeInputTop();
+	void gui_drawBox(int x, int y, int w, int h, int frameColor1, int frameColor2, int fillColor);
+	virtual void gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32 curVal, int32 maxVal, int col1, int col2);
+	void gui_initButtonsFromList(const int16 *list);
+	virtual void gui_initButton(int index, int x = -1, int y = -1, int val = -1) = 0;
+	void gui_resetButtonList();
+	void gui_notifyButtonListChanged();
+
+	bool clickedShape(int shapeIndex);
+
+	int _clickedShapeXOffs;
+	int _clickedShapeYOffs;
+
+	Button *_activeButtons;
+	Button _activeButtonData[70];
+	Common::Array<Button::Callback> _buttonCallbacks;
+	//bool _processingButtons;
+
+	uint8 _mouseClick;
+	bool _preserveEvents;
+	bool _buttonListChanged;
+
+	int _updateFlags;
+	int _clickedSpecialFlag;
+
+	int _compassDirection;
+
+	static const uint8 _dropItemDirIndex[];
+
+	// text
+	void drawDialogueButtons();
+	uint16 processDialogue();
+
+	TextDisplayer_rpg *_txt;
+	virtual TextDisplayer_rpg *txt() { return _txt; }
+
+	bool _dialogueField;
+
+	const char *_dialogueButtonString[9];
+	const uint16 *_dialogueButtonPosX;
+	const uint8 *_dialogueButtonPosY;
+	int16 _dialogueButtonYoffs;
+	uint16 _dialogueButtonW;
+	uint16 _dialogueButtonH;
+	const uint16 *_waitButtonPresX;
+	const uint8 *_waitButtonPresY;
+	const uint16 *_waitButtonPresW;
+	int _waitButtonReverveW;
+	int _dialogueNumButtons;
+	int _dialogueHighlightedButton;
+	int _currentControlMode;
+	int _specialSceneFlag;
+	uint8 _dialogueButtonLabelCol1;
+	uint8 _dialogueButtonLabelCol2;
+
+	int _bkgColor_1;
+	uint8 _color1_1;
+	uint8 _color2_1;
+
+	const char *const *_moreStrings;
+
+	// misc
+	virtual void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false) = 0;
+	void delayUntil(uint32 time, bool doUpdate = false, bool isMainLoop = false);
+	int rollDice(int times, int pips, int inc = 0);
+
+	virtual Common::Error loadGameState(int slot) = 0;
+	virtual Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail) = 0;
+
+	void generateTempData();
+	virtual void restoreBlockTempData(int levelIndex);
+	void releaseTempData();
+	virtual void *generateMonsterTempData(LevelTempData *tmp) = 0;
+	virtual void restoreMonsterTempData(LevelTempData *tmp) = 0;
+	virtual void releaseMonsterTempData(LevelTempData *tmp) = 0;
+	void restoreFlyingObjectTempData(LevelTempData *tmp);
+	void *generateFlyingObjectTempData(LevelTempData *tmp);
+	void releaseFlyingObjectTempData(LevelTempData *tmp);
+	virtual void *generateWallOfForceTempData(LevelTempData *tmp) { return 0; }
+	virtual void restoreWallOfForceTempData(LevelTempData *tmp) {}
+	virtual void releaseWallOfForceTempData(LevelTempData *tmp) {}
+
+	LevelTempData *_lvlTempData[29];
+	const int _numFlyingObjects;
+	uint32 _flyingObjectStructSize;
+	void *_flyingObjectsPtr;
+
+	// sound
+	virtual bool snd_processEnvironmentalSoundEffect(int soundId, int block);
+	virtual void snd_stopSpeech(bool) {}
+	virtual int snd_updateCharacterSpeech() { return 0; }
+	virtual void stopPortraitSpeechAnim() {}
+	virtual void setupOpcodeTable() {}
+	virtual void snd_playVoiceFile(int) {}
+
+	int _environmentSfx;
+	int _environmentSfxVol;
+	int _envSfxDistThreshold;
+
+	uint32 _activeVoiceFileTotalTime;
+
+	// unused
+	void setWalkspeed(uint8) {}
+	void removeHandItem() {}
+	bool lineIsPassable(int, int) { return false; }
+};
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB || ENABLE_LOL
+
+#endif
\ No newline at end of file
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index a8dfeb5b52..8561b5e071 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -42,7 +42,7 @@ namespace Kyra {
 
 const char *const LoLEngine::kKeymapName = "lol";
 
-LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : LolEobBaseEngine(system, flags) {
+LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : KyraRpgEngine(system, flags) {
 	_screen = 0;
 	_gui = 0;
 	_tim = 0;
@@ -154,9 +154,9 @@ LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : LolEobBaseEngine
 	_dscWalls = 0;
 	_dscOvlMap = 0;
 	_dscShapeScaleW = 0;
-	_dscShapeScaleH = 0;	
+	_dscShapeScaleH = 0;
 	_dscShapeY = 0;
-	_dscShapeOvlIndex = 0;	
+	_dscShapeOvlIndex = 0;
 	_dscDoorMonsterX = _dscDoorMonsterY = 0;
 	_dscDoor4 = 0;
 
@@ -409,8 +409,8 @@ Common::Error LoLEngine::init() {
 	if (!_sound->init())
 		error("Couldn't init sound");
 
-	LolEobBaseEngine::init();
-	
+	KyraRpgEngine::init();
+
 	_wllAutomapData = new uint8[80];
 	memset(_wllAutomapData, 0, 80);
 
@@ -1091,7 +1091,7 @@ int LoLEngine::decodeCyrillic(const char *src, char *dst) {
 			assert(cChar < sizeof(decodeTable2));
 			cChar = decodeTable2[cChar];
 		} else if (cChar >= 0x70) {
-			cChar = *src++;			
+			cChar = *src++;
 		} else if (cChar >= 0x30) {
 			if (cChar < 0x60)
 				cChar -= 0x30;
@@ -1929,7 +1929,7 @@ void LoLEngine::setupDialogueButtons(int numStr, const char *s1, const char *s2,
 		_dialogueButtonString[1] = s2;
 		_dialogueButtonString[2] = s3;
 		_dialogueHighlightedButton = 0;
-		
+
 		const ScreenDim *d = screen()->getScreenDim(5);
 
 		static uint16 posX[3];
@@ -1945,8 +1945,8 @@ void LoLEngine::setupDialogueButtons(int numStr, const char *s1, const char *s2,
 		} else {
 			int xOffs = d->w / numStr;
 			posX[0] = d->sx + (xOffs >> 1) - 37;
-			posX[1] = posX[0] + xOffs; 
-			posX[2] = posX[1] + xOffs;		
+			posX[1] = posX[0] + xOffs;
+			posX[2] = posX[1] + xOffs;
 		}
 
 		drawDialogueButtons();
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index 7bd67686e6..dabc141775 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -25,7 +25,7 @@
 #ifndef KYRA_LOL_H
 #define KYRA_LOL_H
 
-#include "kyra/loleobbase.h"
+#include "kyra/kyra_rpg.h"
 #include "kyra/script_tim.h"
 #include "kyra/script.h"
 #include "kyra/gui_lol.h"
@@ -265,7 +265,7 @@ struct MistOfDoomAnimData {
 	uint8 sound;
 };
 
-class LoLEngine : public LolEobBaseEngine {
+class LoLEngine : public KyraRpgEngine {
 friend class GUI_LoL;
 friend class TextDisplayer_LoL;
 friend class TIMInterpreter_LoL;
@@ -577,7 +577,7 @@ private:
 	void setupDialogueButtons(int numStr, const char *s1, const char *s2, const char *s3);
 
 	TextDisplayer_LoL *_txt;
-	TextDisplayer_Eob *txt() { return _txt; }
+	TextDisplayer_rpg *txt() { return _txt; }
 
 	// emc scripts
 	void runInitScript(const char *filename, int optionalFunc);
diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
deleted file mode 100644
index bcab2781a0..0000000000
--- a/engines/kyra/loleobbase.cpp
+++ /dev/null
@@ -1,361 +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.
- *
- */
-
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-
-#include "kyra/loleobbase.h"
-#include "kyra/sound.h"
-
-#include "common/system.h"
-
-namespace Kyra {
-
-LolEobBaseEngine::LolEobBaseEngine(OSystem *system, const GameFlags &flags) : KyraEngine_v1(system, flags), _numFlyingObjects(_flags.gameID == GI_LOL ? 8 : 10) {
-	_txt = 0;
-	_mouseClick = 0;
-	_preserveEvents = _buttonListChanged = false;
-
-	_sceneXoffset = 0;
-	_sceneShpDim = 5;
-	
-	_activeButtons = 0;
-
-	_currentLevel = 0;
-
-	_vmpPtr = 0;
-	_vcnBlocks = 0;
-	_vcfBlocks = 0;
-	_vcnShift = 0;
-	_vcnExpTable = 0;
-	_vmpPtr = 0;
-	_blockBrightness = _wllVcnOffset = 0;
-	_blockDrawingBuffer = 0;
-	_sceneWindowBuffer = 0;
-	_monsterShapes = _monsterPalettes = 0;
-
-	_doorShapes = 0;
-
-	_levelDecorationProperties = 0;
-	_levelDecorationData = 0;
-	_levelDecorationShapes = 0;
-	_decorationCount = 0;
-	_mappedDecorationsCount = 0;
-	memset(_visibleBlockIndex, 0, sizeof(_visibleBlockIndex));
-
-	_lvlShapeTop = _lvlShapeBottom = _lvlShapeLeftRight = 0;
-	_levelBlockProperties = 0;
-	_hasTempDataFlags = 0;
-
-	_wllVmpMap = _specialWallTypes = _wllWallFlags = 0;
-	_wllShapeMap = 0;
-
-	_sceneDrawVarDown = _sceneDrawVarRight = _sceneDrawVarLeft = _wllProcessFlag = 0;
-
-	_currentBlock = 0;
-	_currentDirection = 0;
-	_compassDirection = -1;
-	_updateFlags = _clickedSpecialFlag = 0;
-	_sceneDefaultUpdate = 0;
-	_sceneUpdateRequired = false;
-	
-	_flyingObjectsPtr = 0;
-	_flyingObjectStructSize = sizeof(EobFlyingObject);
-
-	_clickedShapeXOffs = _clickedShapeYOffs = 0;
-
-	_dscShapeX = 0;
-	_dscTileIndex = 0;
-	_dscUnk2 = 0;
-	_dscDim1 = 0;
-	_dscDim2 = 0;
-	_dscBlockMap = 0;
-	_dscBlockIndex = 0;
-	_dscShapeIndex = 0;
-	_dscDimMap = 0;
-	_dscDoorShpIndex = 0;
-	_dscDoorY2 = 0;
-
-	_shpDmX1 = _shpDmX2 = 0;
-
-	memset(_openDoorState, 0, sizeof(_openDoorState));
-	memset(_dialogueButtonString, 0, 3 * sizeof(const char *));
-	_dialogueButtonPosX = 0;
-	_dialogueButtonPosY = 0;
-	_dialogueNumButtons = _dialogueButtonYoffs = _dialogueHighlightedButton = 0;
-	_currentControlMode = 0;
-	_specialSceneFlag = 0;
-	_dialogueButtonLabelCol1 = 0;
-	_dialogueButtonLabelCol2 = 0;
-	_dialogueButtonW = 0;
-	_dialogueButtonH = 0;
-	_waitButtonPresX = 0;
-	_waitButtonPresY = 0;
-	_waitButtonPresW = 0;
-	_waitButtonReverveW = 0;
-
-	_updateCharNum = -1;
-	_activeVoiceFileTotalTime = 0;
-	_updatePortraitSpeechAnimDuration = _resetPortraitAfterSpeechAnim = _needSceneRestore = 0;
-	_fadeText = false;
-
-	memset(_lvlTempData, 0, sizeof(_lvlTempData));
-
-	_dialogueField = false;
-
-	_environmentSfx = _environmentSfxVol = _envSfxDistThreshold = 0;
-	_monsterStepCounter = _monsterStepMode = 0;
-}
-
-LolEobBaseEngine::~LolEobBaseEngine() {
-	delete[] _wllVmpMap;
-	delete[] _wllShapeMap;
-	delete[] _specialWallTypes;
-	delete[] _wllWallFlags;
-
-	delete[] _vmpPtr;
-	delete[] _vcnExpTable;
-	delete[] _vcnBlocks;
-	delete[] _vcfBlocks;
-	delete[] _vcnShift;
-	delete[] _blockDrawingBuffer;
-	delete[] _sceneWindowBuffer;
-
-	delete[] _lvlShapeTop;
-	delete[] _lvlShapeBottom;
-	delete[] _lvlShapeLeftRight;
-
-	delete[] _doorShapes;
-
-	delete[] _levelDecorationShapes;
-	delete[] _levelDecorationData;
-	delete[] _levelDecorationProperties;
-	delete[] _levelBlockProperties;
-}
-
-Common::Error LolEobBaseEngine::init() {
-	gui_resetButtonList();
-
-	_levelDecorationProperties = new LevelDecorationProperty[100];
-	memset(_levelDecorationProperties, 0, 100 * sizeof(LevelDecorationProperty));
-	_levelDecorationShapes = new uint8*[400];
-	memset(_levelDecorationShapes, 0, 400 * sizeof(uint8*));
-	_levelBlockProperties = new LevelBlockProperty[1025];
-	memset(_levelBlockProperties, 0, 1025 * sizeof(LevelBlockProperty));
-
-	_wllVmpMap = new uint8[256];
-	memset(_wllVmpMap, 0, 256);
-	_wllShapeMap = new int8[256];
-	memset(_wllShapeMap, 0, 256);
-	_specialWallTypes = new uint8[256];
-	memset(_specialWallTypes, 0, 256);
-	_wllWallFlags = new uint8[256];
-	memset(_wllWallFlags, 0, 256);
-
-	_blockDrawingBuffer = new uint16[1320];
-	memset(_blockDrawingBuffer, 0, 1320 * sizeof(uint16));
-	_sceneWindowBuffer = new uint8[21120];
-	memset(_sceneWindowBuffer, 0, 21120);
-
-	_lvlShapeTop = new int16[18];
-	memset(_lvlShapeTop, 0, 18 * sizeof(int16));
-	_lvlShapeBottom = new int16[18];
-	memset(_lvlShapeBottom, 0, 18 * sizeof(int16));
-	_lvlShapeLeftRight = new int16[36];
-	memset(_lvlShapeLeftRight, 0, 36 * sizeof(int16));
-
-	_vcnExpTable = new uint8[128];
-	for (int i = 0; i < 128; i++)
-		_vcnExpTable[i] = i & 0x0f;
-
-	_doorShapes = new uint8*[6];
-	memset(_doorShapes, 0, 6 * sizeof(uint8*));
-
-	initStaticResource();
-
-	_envSfxDistThreshold = (_sound->getSfxType() == Sound::kAdLib || _sound->getSfxType() == Sound::kPCSpkr) ? 15 : 3;
-
-	return Common::kNoError;
-}
-
-bool LolEobBaseEngine::posWithinRect(int posX, int posY, int x1, int y1, int x2, int y2) {
-	if (posX < x1 || posX > x2 || posY < y1 || posY > y2)
-		return false;
-	return true;
-}
-
-void LolEobBaseEngine::drawDialogueButtons() {
-	int cp = screen()->setCurPage(0);
-	Screen::FontId of = screen()->setFont(gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
-
-	for (int i = 0; i < _dialogueNumButtons; i++) {
-		int x = _dialogueButtonPosX[i];
-		if (gameFlags().use16ColorMode) {
-			gui_drawBox(x, ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1, 74, 10, 0xee, 0xcc, -1);
-			screen()->printText(_dialogueButtonString[i], (x + 37 - (screen()->getTextWidth(_dialogueButtonString[i])) / 2) & ~3,
-				((_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2) & ~7, _dialogueHighlightedButton == i ? 0xc1 : 0xe1, 0);
-		} else {
-			gui_drawBox(x, (_dialogueButtonYoffs + _dialogueButtonPosY[i]), _dialogueButtonW, _dialogueButtonH, _color1_1, _color2_1, _bkgColor_1);
-			screen()->printText(_dialogueButtonString[i], x + (_dialogueButtonW >> 1) - (screen()->getTextWidth(_dialogueButtonString[i])) / 2,
-				(_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2, _dialogueHighlightedButton == i ? _dialogueButtonLabelCol1 : _dialogueButtonLabelCol2, 0);
-		}
-	}
-	screen()->setFont(of);
-	screen()->setCurPage(cp);
-}
-
-uint16 LolEobBaseEngine::processDialogue() {
-	int df = _dialogueHighlightedButton;
-	int res = 0;
-
-	for (int i = 0; i < _dialogueNumButtons; i++) {
-		int x = _dialogueButtonPosX[i];
-		int y = (gameFlags().use16ColorMode ? ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1 : (_dialogueButtonYoffs + _dialogueButtonPosY[i]));
-		Common::Point p = getMousePos();
-		if (posWithinRect(p.x, p.y, x, y, x + _dialogueButtonW, y + _dialogueButtonH)) {
-			_dialogueHighlightedButton = i;
-			break;
-		}
-	}
-
-	if (_dialogueNumButtons == 0) {
-		int e = checkInput(0, false) & 0xFF;
-		removeInputTop();
-
-		if (e) {
-			gui_notifyButtonListChanged();
-
-			if (e == _keyMap[Common::KEYCODE_SPACE] || e == _keyMap[Common::KEYCODE_RETURN]) {
-				snd_stopSpeech(true);
-			}
-		}
-
-		if (snd_updateCharacterSpeech() != 2) {
-				res = 1;
-				if (!shouldQuit()) {
-					removeInputTop();
-					gui_notifyButtonListChanged();
-				}
-		}
-	} else {
-		int e = checkInput(0, false, 0) & 0xFF;
-		removeInputTop();
-		if (e)
-			gui_notifyButtonListChanged();
-
-		if ((_flags.gameID == GI_LOL && (e == 200 || e == 202)) || (_flags.gameID != GI_LOL && (e == 199 || e == 201))) {
-			for (int i = 0; i < _dialogueNumButtons; i++) {
-				int x = _dialogueButtonPosX[i];
-				int y = (gameFlags().use16ColorMode ? ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1 : (_dialogueButtonYoffs + _dialogueButtonPosY[i]));
-				Common::Point p = getMousePos();
-				if (posWithinRect(p.x, p.y, x, y, x + _dialogueButtonW, y + _dialogueButtonH)) {
-					_dialogueHighlightedButton = i;
-					res = _dialogueHighlightedButton + 1;
-					break;
-				}
-			}
-		} else if (e == _keyMap[Common::KEYCODE_SPACE] || e == _keyMap[Common::KEYCODE_RETURN]) {
-			snd_stopSpeech(true);
-			res = _dialogueHighlightedButton + 1;
-		} else if (e == _keyMap[Common::KEYCODE_LEFT] || e == _keyMap[Common::KEYCODE_DOWN]) {
-			if (_dialogueNumButtons > 1 && _dialogueHighlightedButton > 0)
-				_dialogueHighlightedButton--;
-		} else if (e == _keyMap[Common::KEYCODE_RIGHT] || e == _keyMap[Common::KEYCODE_UP]) {
-			if (_dialogueNumButtons > 1 && _dialogueHighlightedButton < (_dialogueNumButtons - 1))
-				_dialogueHighlightedButton++;
-		}
-	}
-
-	if (df != _dialogueHighlightedButton)
-		drawDialogueButtons();
-
-	screen()->updateScreen();
-
-	if (res == 0)
-		return 0;
-
-	stopPortraitSpeechAnim();
-
-	if (game() == GI_LOL) {
-		if (!textEnabled() && _currentControlMode) {
-			screen()->setScreenDim(5);
-			const ScreenDim *d = screen()->getScreenDim(5);
-			screen()->fillRect(d->sx, d->sy + d->h - 9, d->sx + d->w - 1, d->sy + d->h - 1, d->unkA);
-		} else {
-			const ScreenDim *d = screen()->_curDim;
-			if (gameFlags().use16ColorMode)
-				screen()->fillRect(d->sx, d->sy, d->sx + d->w - 3, d->sy + d->h - 2, d->unkA);
-			else
-				screen()->fillRect(d->sx, d->sy, d->sx + d->w - 2, d->sy + d->h - 1, d->unkA);
-			txt()->clearDim(4);
-			txt()->resetDimTextPositions(4);
-		}
-	}
-
-	return res;
-}
-
-void LolEobBaseEngine::delayUntil(uint32 time, bool doUpdate, bool isMainLoop) {
-	uint32 curTime = _system->getMillis();
-	if (time > curTime)
-		delay(time - curTime, doUpdate, isMainLoop);
-}
-
-int LolEobBaseEngine::rollDice(int times, int pips, int inc) {
-	if (times <= 0 || pips <= 0)
-		return inc;
-
-	int res = 0;
-	while (times--)
-		res += _rnd.getRandomNumberRng(1, pips);
-
-	return res + inc;
-}
-
-bool LolEobBaseEngine::snd_processEnvironmentalSoundEffect(int soundId, int block) {
-	if (!_sound->sfxEnabled() || shouldQuit())
-		return false;
-
-	if (_environmentSfx)
-		snd_playSoundEffect(_environmentSfx, _environmentSfxVol);
-
-	int dist = 0;
-	if (block) {
-		dist = getBlockDistance(_currentBlock, block);
-		if (dist > _envSfxDistThreshold) {
-			_environmentSfx = 0;
-			return false;
-		}
-	}
-
-	_environmentSfx = soundId;
-	_environmentSfxVol = (15 - ((block || (_flags.gameID == GI_LOL && dist < 2)) ? dist : 0)) << 4;
-
-	return true;
-}
-
-void LolEobBaseEngine::updateEnvironmentalSfx(int soundId) {
-	snd_processEnvironmentalSoundEffect(soundId, _currentBlock);
-}
-
-}	// End of namespace Kyra
-
-#endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/loleobbase.h b/engines/kyra/loleobbase.h
deleted file mode 100644
index 06d0688058..0000000000
--- a/engines/kyra/loleobbase.h
+++ /dev/null
@@ -1,355 +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 KYRA_LOLEOBBASE_H
-#define KYRA_LOLEOBBASE_H
-
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-
-#include "kyra/kyra_v1.h"
-#include "kyra/screen_eob.h"
-#include "kyra/gui_eob.h"
-#include "kyra/text_lol.h"
-
-namespace Kyra {
-
-struct LevelDecorationProperty {
-	uint16 shapeIndex[10];
-	uint8 scaleFlag[10];
-	int16 shapeX[10];
-	int16 shapeY[10];
-	int8 next;
-	uint8 flags;
-};
-
-struct LevelBlockProperty {
-	uint8 walls[4];
-	uint16 assignedObjects;
-	uint16 drawObjects;
-	uint8 direction;
-	uint16 flags;
-};
-
-struct OpenDoorState {
-	uint16 block;
-	int8 wall;
-	int8 state;
-};
-
-struct LevelTempData {
-	uint8 *wallsXorData;
-	uint16 *flags;
-	void *monsters;
-	void *flyingObjects;
-	void *wallsOfForce;
-	uint8 monsterDifficulty;
-};
-
-struct EobFlyingObject {
-	uint8 enable;
-	uint8 objectType;
-	int16 attackerId;
-	Item item;	
-	uint16 curBlock;
-	uint16 u2;
-	uint8 u1;
-	uint8 direction;
-	uint8 distance;
-	int8 callBackIndex;
-	uint8 curPos;
-	uint8 flags;
-	uint8 unused;
-};
-
-class LolEobBaseEngine : public KyraEngine_v1 {
-friend class TextDisplayer_Eob;
-public:
-	LolEobBaseEngine(OSystem *system, const GameFlags &flags);
-	virtual ~LolEobBaseEngine();
-
-	virtual Screen *screen() = 0;
-	virtual GUI *gui() const = 0;
-
-protected:
-	// Startup
-	virtual Common::Error init();
-	virtual Common::Error go() = 0;
-
-	// Init
-	void initStaticResource();
-
-	const uint8 **_itemIconShapes;
-
-	// Main loop
-	virtual void update() = 0;
-	void updateEnvironmentalSfx(int soundId);
-
-	// timers
-	virtual void setupTimers() = 0;
-	void enableSysTimer(int sysTimer);
-	void disableSysTimer(int sysTimer);
-	void enableTimer(int id);
-	virtual uint8 getClock2Timer(int index) = 0;
-	virtual uint8 getNumClock2Timers() = 0;
-
-	void timerProcessDoors(int timerNum);
-
-	// mouse
-	bool posWithinRect(int posX, int posY, int x1, int y1, int x2, int y2);
-	virtual void setHandItem(Item itemIndex) = 0;
-
-	// Characters
-	int _updateCharNum;
-	int _updatePortraitSpeechAnimDuration;
-	bool _fadeText;
-	int _resetPortraitAfterSpeechAnim;
-	int _needSceneRestore;
-
-	// Items
-	int _itemInHand;
-
-	// Monsters
-	int getBlockDistance(uint16 block1, uint16 block2);
-
-	uint8 **_monsterPalettes;
-	uint8 **_monsterShapes;
-
-	int16 _shpDmX1;
-	int16 _shpDmX2;
-
-	int _monsterStepCounter;
-	int _monsterStepMode;
-
-	// Level
-	virtual void addLevelItems() = 0;
-	virtual void loadBlockProperties(const char *file) = 0;
-
-	virtual void drawScene(int pageNum) = 0;
-	virtual void drawSceneShapes(int start) = 0;
-	virtual void drawDecorations(int index) = 0;
-
-	virtual const uint8 *getBlockFileData(int levelIndex) = 0;
-	void setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim);
-	void scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim);
-	void drawLevelModifyScreenDim(int dim, int16 x1, int16 y1, int16 x2, int16 y2);
-	void generateBlockDrawingBuffer();
-	void generateVmpTileData(int16 startBlockX, uint8 startBlockY, uint8 wllVmpIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY);
-	void generateVmpTileDataFlipped(int16 startBlockX, uint8 startBlockY, uint8 wllVmpIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY);
-	bool hasWall(int index);
-	void assignVisibleBlocks(int block, int direction);
-	bool checkSceneUpdateNeed(int block);
-	void drawVcnBlocks();
-	uint16 calcNewBlockPosition(uint16 curBlock, uint16 direction);
-
-	virtual int clickedDoorSwitch(uint16 block, uint16 direction) = 0;
-	int clickedWallShape(uint16 block, uint16 direction);
-	int clickedLeverOn(uint16 block, uint16 direction);
-	int clickedLeverOff(uint16 block, uint16 direction);
-	int clickedWallOnlyScript(uint16 block);
-	virtual int clickedNiche(uint16 block, uint16 direction) = 0;
-
-	void processDoorSwitch(uint16 block, int openClose);
-	void openCloseDoor(int block, int openClose);
-	void completeDoorOperations();
-
-	uint8 *_wllVmpMap;
-	int8 *_wllShapeMap;
-	uint8 *_specialWallTypes;
-	uint8 *_wllWallFlags;
-
-	int _sceneXoffset;
-	int _sceneShpDim;
-
-	LevelBlockProperty *_levelBlockProperties;
-	LevelBlockProperty *_visibleBlocks[18];
-	LevelDecorationProperty *_levelDecorationData;
-	uint16 _levelDecorationDataSize;
-	LevelDecorationProperty *_levelDecorationProperties;
-	uint8 **_levelDecorationShapes;
-	uint16 _decorationCount;
-	int16 _mappedDecorationsCount;
-	uint16 *_vmpPtr;
-	uint8 *_vcnBlocks;
-	uint8 *_vcfBlocks;
-	uint8 *_vcnShift;
-	uint8 *_vcnExpTable;
-	uint16 *_blockDrawingBuffer;
-	uint8 *_sceneWindowBuffer;
-	uint8 _blockBrightness;
-	uint8 _wllVcnOffset;
-
-	uint8 **_doorShapes;
-
-	uint8 _currentLevel;
-	uint16 _currentBlock;
-	uint16 _currentDirection;
-	int _sceneDefaultUpdate;
-	bool _sceneUpdateRequired;
-
-	int16 _visibleBlockIndex[18];
-	int16 *_lvlShapeLeftRight;
-	int16 *_lvlShapeTop;
-	int16 *_lvlShapeBottom;
-
-	char _lastBlockDataFile[13];
-	uint32 _hasTempDataFlags;
-
-	int16 _sceneDrawVarDown;
-	int16 _sceneDrawVarRight;
-	int16 _sceneDrawVarLeft;
-	int _wllProcessFlag;
-
-	OpenDoorState _openDoorState[3];
-
-	int _sceneDrawPage1;
-	int _sceneDrawPage2;
-
-	const int8 *_dscShapeIndex;
-	const uint8 *_dscDimMap;
-	const int8 *_dscDim1;
-	const int8 *_dscDim2;
-	const int16 *_dscShapeX;
-	const uint8 *_dscUnk2;
-	const uint8 *_dscBlockMap;
-	const int8 *_dscBlockIndex;
-	const uint8 *_dscTileIndex;
-
-	const uint8 *_dscDoorShpIndex;
-	int _dscDoorShpIndexSize;
-	const uint8 *_dscDoorY2;
-
-	// Script
-	virtual void runLevelScript(int block, int flags) = 0;
-
-	// Gui
-	void removeInputTop();
-	void gui_drawBox(int x, int y, int w, int h, int frameColor1, int frameColor2, int fillColor);
-	virtual void gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32 curVal, int32 maxVal, int col1, int col2);
-	void gui_initButtonsFromList(const int16 *list);
-	virtual void gui_initButton(int index, int x = -1, int y = -1, int val = -1) = 0;
-	void gui_resetButtonList();
-	void gui_notifyButtonListChanged();
-
-	bool clickedShape(int shapeIndex);
-
-	int _clickedShapeXOffs;
-	int _clickedShapeYOffs;
-
-	Button *_activeButtons;
-	Button _activeButtonData[70];
-	Common::Array<Button::Callback> _buttonCallbacks;
-	//bool _processingButtons;
-
-	uint8 _mouseClick;
-	bool _preserveEvents;
-	bool _buttonListChanged;
-
-	int _updateFlags;
-	int _clickedSpecialFlag;
-
-	int _compassDirection;
-
-	static const uint8 _dropItemDirIndex[];
-
-	// text
-	void drawDialogueButtons();
-	uint16 processDialogue();
-
-	TextDisplayer_Eob *_txt;
-	virtual TextDisplayer_Eob *txt() { return _txt; }
-
-	bool _dialogueField;
-
-	const char *_dialogueButtonString[9];
-	const uint16 *_dialogueButtonPosX;
-	const uint8 *_dialogueButtonPosY;
-	int16 _dialogueButtonYoffs;
-	uint16 _dialogueButtonW;
-	uint16 _dialogueButtonH;
-	const uint16 *_waitButtonPresX;
-	const uint8 *_waitButtonPresY;
-	const uint16 *_waitButtonPresW;
-	int _waitButtonReverveW;
-	int _dialogueNumButtons;
-	int _dialogueHighlightedButton;
-	int _currentControlMode;
-	int _specialSceneFlag;
-	uint8 _dialogueButtonLabelCol1;
-	uint8 _dialogueButtonLabelCol2;
-
-	int _bkgColor_1;
-	uint8 _color1_1;
-	uint8 _color2_1;
-
-	const char *const *_moreStrings;
-
-	// misc
-	virtual void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false) = 0;
-	void delayUntil(uint32 time, bool doUpdate = false, bool isMainLoop = false);
-	int rollDice(int times, int pips, int inc = 0);
-
-	virtual Common::Error loadGameState(int slot) = 0;
-	virtual Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail) = 0;
-
-	void generateTempData();
-	virtual void restoreBlockTempData(int levelIndex);
-	void releaseTempData();
-	virtual void *generateMonsterTempData(LevelTempData *tmp) = 0;
-	virtual void restoreMonsterTempData(LevelTempData *tmp) = 0;
-	virtual void releaseMonsterTempData(LevelTempData *tmp) = 0;
-	void restoreFlyingObjectTempData(LevelTempData *tmp);
-	void *generateFlyingObjectTempData(LevelTempData *tmp);
-	void releaseFlyingObjectTempData(LevelTempData *tmp);
-	virtual void *generateWallOfForceTempData(LevelTempData *tmp) { return 0; }
-	virtual void restoreWallOfForceTempData(LevelTempData *tmp) {}
-	virtual void releaseWallOfForceTempData(LevelTempData *tmp) {}
-
-	LevelTempData *_lvlTempData[29];
-	const int _numFlyingObjects;
-	uint32 _flyingObjectStructSize;
-	void *_flyingObjectsPtr;
-
-	// sound
-	virtual bool snd_processEnvironmentalSoundEffect(int soundId, int block);
-	virtual void snd_stopSpeech(bool) {}
-	virtual int snd_updateCharacterSpeech() { return 0; }
-	virtual void stopPortraitSpeechAnim() {}
-	virtual void setupOpcodeTable() {}
-	virtual void snd_playVoiceFile(int) {}
-
-	int _environmentSfx;
-	int _environmentSfxVol;
-	int _envSfxDistThreshold;
-
-	uint32 _activeVoiceFileTotalTime;
-
-	// unused
-	void setWalkspeed(uint8) {}
-	void removeHandItem() {}
-	bool lineIsPassable(int, int) { return false; }
-};
-
-}	// End of namespace Kyra
-
-#endif // ENABLE_EOB || ENABLE_LOL
-
-#endif
\ No newline at end of file
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 21bb10a1de..e3428fb3c7 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -158,7 +158,7 @@ void EobCoreEngine::useWand(int charIndex, int weaponSlot) {
 		uint16 bl2 = calcNewBlockPosition(bl1, _currentDirection);
 		snd_playSoundEffect(98);
 		sparkEffectOffensive();
-		
+
 		if ((_wllWallFlags[_levelBlockProperties[bl2].walls[_currentDirection ^ 2]] & 4) && !(_levelBlockProperties[bl2].flags & 7) && (_levelBlockProperties[bl1].flags & 7)) {
 			for (int i = 0; i < 30; i++) {
 				if (_monsters[i].block != bl1)
@@ -574,9 +574,9 @@ bool EobCoreEngine::magicObjectStatusHit(EobMonsterInPlay *m, int type, bool try
 
 	if (trySavingThrow(m, 0, p->level, mod, 6))
 		return false;
-	
+
 	int para = 0;
-		
+
 	switch (type) {
 	case 0:
 	case 1:
@@ -631,7 +631,7 @@ bool EobCoreEngine::turnUndeadHit(EobMonsterInPlay *m, int hitChance, int caster
 		m->mode = 0;
 		m->flags |= 8;
 		m->spellStatusLeft = 40;
-		m->dir = (getNextMonsterDirection(m->block, _currentBlock) ^ 4) >> 1;	
+		m->dir = (getNextMonsterDirection(m->block, _currentBlock) ^ 4) >> 1;
 	}
 
 	return true;
@@ -647,7 +647,7 @@ void EobCoreEngine::causeWounds(int dcTimes, int dcPips, int dcOffs) {
 		if (d != -1) {
 			if (!characterAttackHitTest(_openBookChar, d, 0, 1))
 				return;
-			
+
 			if (dcTimes == -1) {
 				dcOffs = _monsters[d].hitPointsMax - rollDice(1, 4);
 				dcTimes = dcPips = 0;
@@ -802,7 +802,7 @@ void EobCoreEngine::spellCallback_start_burningHands() {
 		drawBlockObject(i & 1, 0, _firebeamShapes[(5 - i) >> 1], bX[i], bY[i], 0);
 	_screen->updateScreen();
 	delay(2 * _tickLength);
-	
+
 	int cl = getMageLevel(_openBookChar);
 	int bl = calcNewBlockPosition(_currentBlock, _currentDirection);
 
@@ -915,7 +915,7 @@ void EobCoreEngine::spellCallback_start_holdPerson() {
 bool EobCoreEngine::spellCallback_end_holdPerson(void *obj) {
 	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	bool res = false;
-	
+
 	if (_flags.gameID == GI_EOB2 && fo->curBlock == _currentBlock) {
 		// party hit
 		int numChar = rollDice(1, 4, 0);
@@ -1011,7 +1011,7 @@ void EobCoreEngine::spellCallback_start_removeCurse() {
 
 void EobCoreEngine::spellCallback_start_coneOfCold() {
 	const int8 *dirTables[] = { _coneOfColdDest1, _coneOfColdDest2, _coneOfColdDest3, _coneOfColdDest4 };
-	
+
 	int cl = getMageLevel(_openBookChar);
 
 	_screen->setCurPage(2);
@@ -1022,11 +1022,11 @@ void EobCoreEngine::spellCallback_start_coneOfCold() {
 	disableSysTimer(2);
 	_screen->drawVortex(150, 50, 10, 1, 100, _coneOfColdGfxTbl, _coneOfColdGfxTblSize);
 	enableSysTimer(2);
-	
+
 	const int8 *tbl = dirTables[_currentDirection];
 	_preventMonsterFlash = true;
 
-	for (int i = 0; i < 7; i++) {		
+	for (int i = 0; i < 7; i++) {
 		for (const int16 *m = findBlockMonsters((_currentBlock + tbl[i]) & 0x3ff, 4, _currentDirection, 1, 1); *m != -1; m++)
 			calcAndInflictMonsterDamage(&_monsters[*m], cl, 4, cl, 0x41, 5, 0);
 	}
@@ -1265,12 +1265,12 @@ void EobCoreEngine::spellCallback_start_turnUndead() {
 	uint16 bl = calcNewBlockPosition(_currentBlock, _currentDirection);
 	if (!(_levelBlockProperties[bl].flags & 7))
 		return;
-	
+
 	int cl = _openBookCasterLevel ? _openBookCasterLevel : getClericPaladinLevel(_openBookChar);
 	int r = rollDice(1, 20);
 	bool hit = false;
 
-	for (const int16 *m = findBlockMonsters(bl, 4, 4, 1, 1); *m != -1; m++) {		
+	for (const int16 *m = findBlockMonsters(bl, 4, 4, 1, 1); *m != -1; m++) {
 		if ((_monsterProps[_monsters[*m].type].typeFlags & 4) && !(_monsters[*m].flags & 0x10)) {
 			_preventMonsterFlash = true;
 			_monsters[*m].flags |= 0x10;
@@ -1333,7 +1333,7 @@ bool EobCoreEngine::spellCallback_end_monster_disintegrate(void *obj) {
 	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
-	
+
 	int d = findFirstCharacterSpellTarget();
 	if (d != -1) {
 		if (!charDeathSavingThrow(d, 1)) {
@@ -1363,7 +1363,7 @@ bool EobCoreEngine::spellCallback_end_monster_fleshToStone(void *obj) {
 	EobFlyingObject *fo = (EobFlyingObject*)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
-	
+
 	int d = findFirstCharacterSpellTarget();
 	while (d != -1) {
 		if (!charDeathSavingThrow(d, 2)) {
@@ -1373,7 +1373,7 @@ bool EobCoreEngine::spellCallback_end_monster_fleshToStone(void *obj) {
 			d = findNextCharacterSpellTarget(d);
 		}
 	}
-	
+
 	return true;
 }
 
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
index 6eed6daae4..23aee52465 100644
--- a/engines/kyra/module.mk
+++ b/engines/kyra/module.mk
@@ -74,14 +74,14 @@ MODULE_OBJS := \
 	wsamovie.o
 
 KYRARPG_COMMON_OBJ = \
-	gui_eob.o \
-	loleobbase.o \
-	saveload_eob.o \
-	scene_eob.o \
-	sprites_eob.o \
-	staticres_eob.o \
-	text_eob.o \
-	timer_eob.o
+	gui_rpg.o \
+	kyra_rpg.o \
+	saveload_rpg.o \
+	scene_rpg.o \
+	sprites_rpg.o \
+	staticres_rpg.o \
+	text_rpg.o \
+	timer_rpg.o
 
 ifdef ENABLE_LOL
 MODULE_OBJS += \
@@ -111,12 +111,18 @@ MODULE_OBJS += \
 	eobcommon.o \
 	eob1.o \
 	eob2.o \
+	gui_eob.o \
 	items_eob.o \
 	magic_eob.o \
+	saveload_eob.o \
+	scene_eob.o \
 	screen_eob.o \
 	script_eob.o \
 	sequences_eob1.o \
-	sequences_eob2.o
+	sequences_eob2.o \
+	sprites_eob.o \
+	staticres_eob.o \
+	timer_eob.o
 endif
 
 # This module can be built as a plugin
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index ec89fca5e2..091b3201bd 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -20,9 +20,8 @@
  *
  */
 
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+#ifdef ENABLE_EOB
 
-#include "kyra/eobcommon.h"
 #include "kyra/resource.h"
 #include "kyra/script_eob.h"
 
@@ -32,99 +31,6 @@
 
 namespace Kyra {
 
-void LolEobBaseEngine::generateTempData() {
-	int l = _currentLevel - 1;
-	if (_lvlTempData[l]) {
-		delete[] _lvlTempData[l]->wallsXorData;
-		delete[] _lvlTempData[l]->flags;
-		releaseMonsterTempData(_lvlTempData[l]);
-		releaseFlyingObjectTempData(_lvlTempData[l]);
-		releaseWallOfForceTempData(_lvlTempData[l]);
-		delete _lvlTempData[l];
-	}
-
-	_lvlTempData[l] = new LevelTempData;
-
-	_lvlTempData[l]->wallsXorData = new uint8[4096];
-	_lvlTempData[l]->flags = new uint16[1024];
-
-	const uint8 *p = getBlockFileData(_currentLevel);
-	uint16 len = READ_LE_UINT16(p + 4);
-	p += 6;
-
-	memset(_lvlTempData[l]->wallsXorData, 0, 4096);
-	memset(_lvlTempData[l]->flags, 0, 1024 * sizeof(uint16));
-	uint8 *d = _lvlTempData[l]->wallsXorData;
-	uint16 *df = _lvlTempData[l]->flags;
-
-	for (int i = 0; i < 1024; i++) {
-		for (int ii = 0; ii < 4; ii++)
-			*d++ = p[i * len + ii] ^ _levelBlockProperties[i].walls[ii];
-		*df++ = _levelBlockProperties[i].flags;
-	}
-
-	_lvlTempData[l]->monsters = generateMonsterTempData(_lvlTempData[l]);
-	_lvlTempData[l]->flyingObjects = generateFlyingObjectTempData(_lvlTempData[l]);
-	_lvlTempData[l]->wallsOfForce = generateWallOfForceTempData(_lvlTempData[l]);
-
-	_hasTempDataFlags |= (1 << l);
-}
-
-void LolEobBaseEngine::restoreBlockTempData(int levelIndex) {
-	int l = levelIndex - 1;
-	const uint8 *p = getBlockFileData(levelIndex);
-	uint16 len = READ_LE_UINT16(p + 4);
-	p += 6;
-
-	memset(_levelBlockProperties, 0, 1024 * sizeof(LevelBlockProperty));
-
-	uint8 *t = _lvlTempData[l]->wallsXorData;
-	uint16 *t2 = _lvlTempData[l]->flags;
-
-	for (int i = 0; i < 1024; i++) {
-		for (int ii = 0; ii < 4; ii++)
-			_levelBlockProperties[i].walls[ii] = p[i * len + ii] ^ *t++;
-		_levelBlockProperties[i].flags = *t2++;
-	}
-
-	restoreMonsterTempData(_lvlTempData[l]);
-	restoreFlyingObjectTempData(_lvlTempData[l]);
-	restoreWallOfForceTempData(_lvlTempData[l]);
-}
-
-void LolEobBaseEngine::releaseTempData() {
-	for (int i = 0; i < 29; i++) {
-		if (_lvlTempData[i]) {
-			delete[] _lvlTempData[i]->wallsXorData;
-			delete[] _lvlTempData[i]->flags;
-			releaseMonsterTempData(_lvlTempData[i]);
-			releaseFlyingObjectTempData(_lvlTempData[i]);
-			releaseWallOfForceTempData(_lvlTempData[i]);
-			delete _lvlTempData[i];
-			_lvlTempData[i] = 0;
-		}
-	}
-}
-
-void *LolEobBaseEngine::generateFlyingObjectTempData(LevelTempData *tmp) {
-	assert(_flyingObjectStructSize == sizeof(EobFlyingObject));
-	EobFlyingObject *f = new EobFlyingObject[_numFlyingObjects];
-	memcpy(f, _flyingObjectsPtr,  sizeof(EobFlyingObject) * _numFlyingObjects);
-	return f;
-}
-
-void LolEobBaseEngine::restoreFlyingObjectTempData(LevelTempData *tmp) {
-	assert(_flyingObjectStructSize == sizeof(EobFlyingObject));
-	memcpy(_flyingObjectsPtr, tmp->flyingObjects, sizeof(EobFlyingObject) * _numFlyingObjects);
-}
-
-void LolEobBaseEngine::releaseFlyingObjectTempData(LevelTempData *tmp) {
-	EobFlyingObject *p = (EobFlyingObject*)tmp->flyingObjects;
-	delete[] p;
-}
-
-#ifdef ENABLE_EOB
-
 Common::Error EobCoreEngine::loadGameState(int slot) {
 	const char *fileName = 0;
 
@@ -221,7 +127,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 	_itemInHand = in.readSint16BE();
 	_hasTempDataFlags = in.readUint32BE();
 	_partyEffectFlags = in.readUint32BE();
-	
+
 	_updateFlags = in.readUint16BE();
 	_compassDirection = in.readUint16BE();
 	_currentControlMode = in.readUint16BE();
@@ -294,7 +200,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 		EobFlyingObject *lf = new EobFlyingObject[_numFlyingObjects];
 		l->flyingObjects = lf;
 		WallOfForce *lw = new WallOfForce[5];
-		l->wallsOfForce = lw;		
+		l->wallsOfForce = lw;
 
 		in.read(l->wallsXorData, 4096);
 		for (int ii = 0; ii < 1024; ii++)
@@ -364,7 +270,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 	}
 
 	_screen->setCurPage(0);
-	gui_drawPlayField(false);	
+	gui_drawPlayField(false);
 
 	if (_currentControlMode)
 		_screen->copyRegion(176, 0, 0, 0, 144, 168, 0, 5, Screen::CR_NO_P_CHECK);
@@ -474,7 +380,7 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 	out->writeSint16BE(_itemInHand);
 	out->writeUint32BE(_hasTempDataFlags);
 	out->writeUint32BE(_partyEffectFlags);
-	
+
 	out->writeUint16BE(_updateFlags);
 	out->writeUint16BE(_compassDirection);
 	out->writeUint16BE(_currentControlMode);
@@ -529,7 +435,7 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 		LevelTempData *l = _lvlTempData[i];
 		if (!l || !(_hasTempDataFlags & (1 << i)))
 			continue;
-	
+
 		out->write(l->wallsXorData, 4096);
 		for (int ii = 0; ii < 1024; ii++)
 			out->writeByte(l->flags[ii] & 0xff);
@@ -643,8 +549,6 @@ void EobCoreEngine::releaseWallOfForceTempData(LevelTempData *tmp) {
 	delete[] p;
 }
 
-#endif // ENABLE_EOB
-
 }	// End of namespace Kyra
 
-#endif // ENABLE_EOB || ENABLE_LOL
+#endif // ENABLE_EOB
diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp
index e5977dd915..c7fb107f35 100644
--- a/engines/kyra/saveload_lol.cpp
+++ b/engines/kyra/saveload_lol.cpp
@@ -479,7 +479,7 @@ Graphics::Surface *LoLEngine::generateSaveThumbnail() const {
 
 void LoLEngine::restoreBlockTempData(int levelIndex) {
 	memset(_tempBuffer5120, 0, 5120);
-	LolEobBaseEngine::restoreBlockTempData(levelIndex);
+	KyraRpgEngine::restoreBlockTempData(levelIndex);
 	restoreTempDataAdjustMonsterStrength(levelIndex - 1);
 }
 
diff --git a/engines/kyra/saveload_rpg.cpp b/engines/kyra/saveload_rpg.cpp
new file mode 100644
index 0000000000..4553570f46
--- /dev/null
+++ b/engines/kyra/saveload_rpg.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.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/resource.h"
+#include "kyra/script_eob.h"
+
+#include "common/system.h"
+#include "common/savefile.h"
+#include "common/substream.h"
+
+namespace Kyra {
+
+void KyraRpgEngine::generateTempData() {
+	int l = _currentLevel - 1;
+	if (_lvlTempData[l]) {
+		delete[] _lvlTempData[l]->wallsXorData;
+		delete[] _lvlTempData[l]->flags;
+		releaseMonsterTempData(_lvlTempData[l]);
+		releaseFlyingObjectTempData(_lvlTempData[l]);
+		releaseWallOfForceTempData(_lvlTempData[l]);
+		delete _lvlTempData[l];
+	}
+
+	_lvlTempData[l] = new LevelTempData;
+
+	_lvlTempData[l]->wallsXorData = new uint8[4096];
+	_lvlTempData[l]->flags = new uint16[1024];
+
+	const uint8 *p = getBlockFileData(_currentLevel);
+	uint16 len = READ_LE_UINT16(p + 4);
+	p += 6;
+
+	memset(_lvlTempData[l]->wallsXorData, 0, 4096);
+	memset(_lvlTempData[l]->flags, 0, 1024 * sizeof(uint16));
+	uint8 *d = _lvlTempData[l]->wallsXorData;
+	uint16 *df = _lvlTempData[l]->flags;
+
+	for (int i = 0; i < 1024; i++) {
+		for (int ii = 0; ii < 4; ii++)
+			*d++ = p[i * len + ii] ^ _levelBlockProperties[i].walls[ii];
+		*df++ = _levelBlockProperties[i].flags;
+	}
+
+	_lvlTempData[l]->monsters = generateMonsterTempData(_lvlTempData[l]);
+	_lvlTempData[l]->flyingObjects = generateFlyingObjectTempData(_lvlTempData[l]);
+	_lvlTempData[l]->wallsOfForce = generateWallOfForceTempData(_lvlTempData[l]);
+
+	_hasTempDataFlags |= (1 << l);
+}
+
+void KyraRpgEngine::restoreBlockTempData(int levelIndex) {
+	int l = levelIndex - 1;
+	const uint8 *p = getBlockFileData(levelIndex);
+	uint16 len = READ_LE_UINT16(p + 4);
+	p += 6;
+
+	memset(_levelBlockProperties, 0, 1024 * sizeof(LevelBlockProperty));
+
+	uint8 *t = _lvlTempData[l]->wallsXorData;
+	uint16 *t2 = _lvlTempData[l]->flags;
+
+	for (int i = 0; i < 1024; i++) {
+		for (int ii = 0; ii < 4; ii++)
+			_levelBlockProperties[i].walls[ii] = p[i * len + ii] ^ *t++;
+		_levelBlockProperties[i].flags = *t2++;
+	}
+
+	restoreMonsterTempData(_lvlTempData[l]);
+	restoreFlyingObjectTempData(_lvlTempData[l]);
+	restoreWallOfForceTempData(_lvlTempData[l]);
+}
+
+void KyraRpgEngine::releaseTempData() {
+	for (int i = 0; i < 29; i++) {
+		if (_lvlTempData[i]) {
+			delete[] _lvlTempData[i]->wallsXorData;
+			delete[] _lvlTempData[i]->flags;
+			releaseMonsterTempData(_lvlTempData[i]);
+			releaseFlyingObjectTempData(_lvlTempData[i]);
+			releaseWallOfForceTempData(_lvlTempData[i]);
+			delete _lvlTempData[i];
+			_lvlTempData[i] = 0;
+		}
+	}
+}
+
+void *KyraRpgEngine::generateFlyingObjectTempData(LevelTempData *tmp) {
+	assert(_flyingObjectStructSize == sizeof(EobFlyingObject));
+	EobFlyingObject *f = new EobFlyingObject[_numFlyingObjects];
+	memcpy(f, _flyingObjectsPtr,  sizeof(EobFlyingObject) * _numFlyingObjects);
+	return f;
+}
+
+void KyraRpgEngine::restoreFlyingObjectTempData(LevelTempData *tmp) {
+	assert(_flyingObjectStructSize == sizeof(EobFlyingObject));
+	memcpy(_flyingObjectsPtr, tmp->flyingObjects, sizeof(EobFlyingObject) * _numFlyingObjects);
+}
+
+void KyraRpgEngine::releaseFlyingObjectTempData(LevelTempData *tmp) {
+	EobFlyingObject *p = (EobFlyingObject*)tmp->flyingObjects;
+	delete[] p;
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index e2a2e794ff..1927df79c1 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+#ifdef ENABLE_EOB
 
 #include "kyra/eobcommon.h"
 #include "kyra/resource.h"
@@ -30,590 +30,6 @@
 
 #include "common/system.h"
 
-namespace Kyra {
-
-void LolEobBaseEngine::setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim) {
-	if (_lvlShapeLeftRight[index << 1] == -1) {
-		x1 = 0;
-		x2 = 22;
-
-		int16 y1 = 0;
-		int16 y2 = 120;
-
-		int m = index * 18;
-
-		for (int i = 0; i < 18; i++) {
-			uint8 d = _visibleBlocks[i]->walls[_sceneDrawVarDown];
-			uint8 a = _wllWallFlags[d];
-
-			if (a & 8) {
-				int t = _dscDim2[(m + i) << 1];
-
-				if (t > x1) {
-					x1 = t;
-					if (!(a & 0x10))
-						scaleLevelShapesDim(index, y1, y2, -1);
-				}
-
-				t = _dscDim2[((m + i) << 1) + 1];
-
-				if (t < x2) {
-					x2 = t;
-					if (!(a & 0x10))
-						scaleLevelShapesDim(index, y1, y2, -1);
-				}
-			} else {
-				int t = _dscDim1[m + i];
-
-				if (!_wllVmpMap[d] || t == -40)
-					continue;
-
-				if (t == -41) {
-					x1 = 22;
-					x2 = 0;
-					break;
-				}
-
-				if (t > 0 && x2 > t)
-					x2 = t;
-
-				if (t < 0 && x1 < -t)
-					x1 = -t;
-			}
-
-			if (x2 < x1)
-				break;
-		}
-
-		x1 += (_sceneXoffset >> 3);
-		x2 += (_sceneXoffset >> 3);
-
-
-		_lvlShapeTop[index] = y1;
-		_lvlShapeBottom[index] = y2;
-		_lvlShapeLeftRight[index << 1] = x1;
-		_lvlShapeLeftRight[(index << 1) + 1] = x2;
-	} else {
-		x1 = _lvlShapeLeftRight[index << 1];
-		x2 = _lvlShapeLeftRight[(index << 1) + 1];
-	}
-
-	drawLevelModifyScreenDim(dim, x1, 0, x2, 15);
-}
-
-void LolEobBaseEngine::scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim) {
-	static const int8 dscY1[] = { 0x1E, 0x18, 0x10, 0x00 };
-	static const int8 dscY2[] = { 0x3B, 0x47, 0x56, 0x78 };
-
-	uint8 a = _dscDimMap[index];
-
-	if (dim == -1 && a != 3)
-		a++;
-
-	y1 = dscY1[a];
-	y2 = dscY2[a];
-
-	if (dim == -1)
-		return;
-
-	const ScreenDim *cDim = screen()->getScreenDim(dim);
-
-	screen()->modifyScreenDim(dim, cDim->sx, y1, cDim->w, y2 - y1);
-}
-
-void LolEobBaseEngine::drawLevelModifyScreenDim(int dim, int16 x1, int16 y1, int16 x2, int16 y2) {
-	screen()->modifyScreenDim(dim, x1, y1 << 3, x2 - x1, (y2 - y1) << 3);
-}
-
-void LolEobBaseEngine::generateBlockDrawingBuffer() {
-	_sceneDrawVarDown = _dscBlockMap[_currentDirection];
-	_sceneDrawVarRight = _dscBlockMap[_currentDirection + 4];
-	_sceneDrawVarLeft = _dscBlockMap[_currentDirection + 8];
-
-	/*******************************************
-    *             _visibleBlocks map           *
-	*                                          *
-	*     |     |     |     |     |     |      *
-	*  00 |  01 |  02 |  03 |  04 |  05 |  06  *
-	* ____|_____|_____|_____|_____|_____|_____ *
-	*     |     |     |     |     |     |      *
-	*     |  07 |  08 |  09 |  10 |  11 |      *
-	*     |_____|_____|_____|_____|_____|      *
-	*           |     |     |     |            *
-	*           |  12 |  13 |  14 |            *
-	*           |_____|_____|_____|            *
-	*                 |     |                  *
-	*              15 |  16 |  17              *
-	*                 | (P) |                  *
-	********************************************/
-
-	memset(_blockDrawingBuffer, 0, 660 * sizeof(uint16));
-
-	_wllProcessFlag = ((_currentBlock >> 5) + (_currentBlock & 0x1f) + _currentDirection) & 1;
-
-	if (_wllProcessFlag) // floor and ceiling
-		generateVmpTileDataFlipped(0, 15, 1, -330, 22, 15);
-	else
-		generateVmpTileData(0, 15, 1, -330, 22, 15);
-
-	assignVisibleBlocks(_currentBlock, _currentDirection);
-
-	uint8 t = _visibleBlocks[0]->walls[_sceneDrawVarRight];
-	if (t)
-		generateVmpTileData(-2, 3, t, 102, 3, 5);
-
-	t = _visibleBlocks[6]->walls[_sceneDrawVarLeft];
-	if (t)
-		generateVmpTileDataFlipped(21, 3, t, 102, 3, 5);
-
-	t = _visibleBlocks[1]->walls[_sceneDrawVarRight];
-	uint8 t2 = _visibleBlocks[2]->walls[_sceneDrawVarDown];
-
-	if (hasWall(t) && !(_wllWallFlags[t2] & 8))
-		generateVmpTileData(2, 3, t, 102, 3, 5);
-	else if (t && (_wllWallFlags[t2] & 8))
-		generateVmpTileData(2, 3, t2, 102, 3, 5);
-
-	t = _visibleBlocks[5]->walls[_sceneDrawVarLeft];
-	t2 = _visibleBlocks[4]->walls[_sceneDrawVarDown];
-
-	if (hasWall(t) && !(_wllWallFlags[t2] & 8))
-		generateVmpTileDataFlipped(17, 3, t, 102, 3, 5);
-	else if (t && (_wllWallFlags[t2] & 8))
-		generateVmpTileDataFlipped(17, 3, t2, 102, 3, 5);
-
-	t = _visibleBlocks[2]->walls[_sceneDrawVarRight];
-	if (t)
-		generateVmpTileData(8, 3, t, 97, 1, 5);
-
-	t = _visibleBlocks[4]->walls[_sceneDrawVarLeft];
-	if (t)
-		generateVmpTileDataFlipped(13, 3, t, 97, 1, 5);
-
-	t = _visibleBlocks[1]->walls[_sceneDrawVarDown];
-	if (hasWall(t))
-		generateVmpTileData(-4, 3, t, 129, 6, 5);
-
-	t = _visibleBlocks[5]->walls[_sceneDrawVarDown];
-	if (hasWall(t))
-		generateVmpTileData(20, 3, t, 129, 6, 5);
-
-	t = _visibleBlocks[2]->walls[_sceneDrawVarDown];
-	if (hasWall(t))
-		generateVmpTileData(2, 3, t, 129, 6, 5);
-
-	t = _visibleBlocks[4]->walls[_sceneDrawVarDown];
-	if (hasWall(t))
-		generateVmpTileData(14, 3, t, 129, 6, 5);
-
-	t = _visibleBlocks[3]->walls[_sceneDrawVarDown];
-	if (t)
-		generateVmpTileData(8, 3, t, 129, 6, 5);
-
-	t = _visibleBlocks[7]->walls[_sceneDrawVarRight];
-	if (t)
-		generateVmpTileData(0, 3, t, 117, 2, 6);
-
-	t = _visibleBlocks[11]->walls[_sceneDrawVarLeft];
-	if (t)
-		generateVmpTileDataFlipped(20, 3, t, 117, 2, 6);
-
-	t = _visibleBlocks[8]->walls[_sceneDrawVarRight];
-	if (t)
-		generateVmpTileData(6, 2, t, 81, 2, 8);
-
-	t = _visibleBlocks[10]->walls[_sceneDrawVarLeft];
-	if (t)
-		generateVmpTileDataFlipped(14, 2, t, 81, 2, 8);
-
-	t = _visibleBlocks[8]->walls[_sceneDrawVarDown];
-	if (hasWall(t))
-		generateVmpTileData(-4, 2, t, 159, 10, 8);
-
-	t = _visibleBlocks[10]->walls[_sceneDrawVarDown];
-	if (hasWall(t))
-		generateVmpTileData(16, 2, t, 159, 10, 8);
-
-	t = _visibleBlocks[9]->walls[_sceneDrawVarDown];
-	if (t)
-		generateVmpTileData(6, 2, t, 159, 10, 8);
-
-	t = _visibleBlocks[12]->walls[_sceneDrawVarRight];
-	if (t)
-		generateVmpTileData(3, 1, t, 45, 3, 12);
-
-	t = _visibleBlocks[14]->walls[_sceneDrawVarLeft];
-	if (t)
-		generateVmpTileDataFlipped(16, 1, t, 45, 3, 12);
-
-	t = _visibleBlocks[12]->walls[_sceneDrawVarDown];
-	if (!(_wllWallFlags[t] & 8))
-		generateVmpTileData(-13, 1, t, 239, 16, 12);
-
-	t = _visibleBlocks[14]->walls[_sceneDrawVarDown];
-	if (!(_wllWallFlags[t] & 8))
-		generateVmpTileData(19, 1, t, 239, 16, 12);
-
-	t = _visibleBlocks[13]->walls[_sceneDrawVarDown];
-	if (t)
-		generateVmpTileData(3, 1, t, 239, 16, 12);
-
-	t = _visibleBlocks[15]->walls[_sceneDrawVarRight];
-	t2 = _visibleBlocks[17]->walls[_sceneDrawVarLeft];
-	if (t)
-		generateVmpTileData(0, 0, t, 0, 3, 15);
-	if (t2)
-		generateVmpTileDataFlipped(19, 0, t2, 0, 3, 15);
-}
-
-void LolEobBaseEngine::generateVmpTileData(int16 startBlockX, uint8 startBlockY, uint8 vmpMapIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY) {
-	if (!_wllVmpMap[vmpMapIndex])
-		return;
-
-	uint16 *vmp = &_vmpPtr[(_wllVmpMap[vmpMapIndex] - 1) * 431 + vmpOffset + 330];
-
-	for (int i = 0; i < numBlocksY; i++) {
-		uint16 *bl = &_blockDrawingBuffer[(startBlockY + i) * 22 + startBlockX];
-		for (int ii = 0; ii < numBlocksX; ii++) {
-			if ((startBlockX + ii >= 0) && (startBlockX + ii < 22) && *vmp)
-				*bl = *vmp;
-			bl++;
-			vmp++;
-		}
-	}
-}
-
-void LolEobBaseEngine::generateVmpTileDataFlipped(int16 startBlockX, uint8 startBlockY, uint8 vmpMapIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY) {
-	if (!_wllVmpMap[vmpMapIndex])
-		return;
-
-	uint16 *vmp = &_vmpPtr[(_wllVmpMap[vmpMapIndex] - 1) * 431 + vmpOffset + 330];
-
-	for (int i = 0; i < numBlocksY; i++) {
-		for (int ii = 0; ii < numBlocksX; ii++) {
-			if ((startBlockX + ii) < 0 || (startBlockX + ii) > 21)
-				continue;
-
-			uint16 v = vmp[i * numBlocksX + (numBlocksX - 1 - ii)];
-			if (!v)
-				continue;
-
-			if (v & 0x4000)
-				v -= 0x4000;
-			else
-				v |= 0x4000;
-
-			_blockDrawingBuffer[(startBlockY + i) * 22 + startBlockX + ii] = v;
-		}
-	}
-}
-
-bool LolEobBaseEngine::hasWall(int index) {
-	if (!index || (_wllWallFlags[index] & 8))
-		return false;
-	return true;
-}
-
-void LolEobBaseEngine::assignVisibleBlocks(int block, int direction) {
-	for (int i = 0; i < 18; i++) {
-		uint16 t = (block + _dscBlockIndex[direction * 18 + i]) & 0x3ff;
-		_visibleBlockIndex[i] = t;
-
-		_visibleBlocks[i] = &_levelBlockProperties[t];
-		_lvlShapeLeftRight[i] = _lvlShapeLeftRight[18 + i] = -1;
-	}
-}
-
-bool LolEobBaseEngine::checkSceneUpdateNeed(int block) {
-	if (_sceneUpdateRequired)
-		return true;
-
-	for (int i = 0; i < 15; i++) {
-		if (_visibleBlockIndex[i] == block) {
-			_sceneUpdateRequired = true;
-			return true;
-		}
-	}
-
-	if (_currentBlock == block){
-		_sceneUpdateRequired = true;
-		return true;
-	}
-
-	return false;
-}
-
-void LolEobBaseEngine::drawVcnBlocks() {
-	uint8 *d = _sceneWindowBuffer;
-	uint16 *bdb = _blockDrawingBuffer;
-
-	for (int y = 0; y < 15; y++) {
-		for (int x = 0; x < 22; x++) {
-			bool horizontalFlip = false;
-			int remainder = 0;
-
-			uint16 vcnOffset = *bdb++;
-			int wllVcnOffset = 0;
-			int wllVcnRmdOffset = 0;
-
-			if (vcnOffset & 0x8000) {
-				// this renders a wall block over the transparent pixels of a floor/ceiling block
-				remainder = vcnOffset - 0x8000;
-				vcnOffset = 0;
-				wllVcnRmdOffset = _wllVcnOffset;
-			}
-
-			if (vcnOffset & 0x4000) {
-				horizontalFlip = true;
-				vcnOffset &= 0x3fff;
-			}
-
-			uint8 *src = 0;
-			if (vcnOffset) {
-				src = &_vcnBlocks[vcnOffset << 5];
-				wllVcnOffset = _wllVcnOffset;
-			} else {
-				// floor/ceiling blocks
-				vcnOffset = bdb[329];
-				if (vcnOffset & 0x4000) {
-					horizontalFlip = true;
-					vcnOffset &= 0x3fff;
-				}
-
-				src = (_vcfBlocks ? _vcfBlocks : _vcnBlocks) + (vcnOffset << 5);
-			}
-
-			uint8 shift = _vcnShift ? _vcnShift[vcnOffset] : _blockBrightness;
-
-			if (horizontalFlip) {
-				for (int blockY = 0; blockY < 8; blockY++) {
-					src += 3;
-					for (int blockX = 0; blockX < 4; blockX++) {
-						uint8 t = *src--;
-						*d++ = _vcnExpTable[((t & 0x0f) + wllVcnOffset) | shift];
-						*d++ = _vcnExpTable[((t >> 4) + wllVcnOffset) | shift];
-					}
-					src += 5;
-					d += 168;
-				}
-			} else {
-				for (int blockY = 0; blockY < 8; blockY++) {
-					for (int blockX = 0; blockX < 4; blockX++) {
-						uint8 t = *src++;
-						*d++ = _vcnExpTable[((t >> 4) + wllVcnOffset) | shift];
-						*d++ = _vcnExpTable[((t & 0x0f) + wllVcnOffset) | shift];
-					}
-					d += 168;
-				}
-			}
-			d -= 1400;
-
-			if (remainder) {
-				d -= 8;
-				horizontalFlip = false;
-
-				if (remainder & 0x4000) {
-					remainder &= 0x3fff;
-					horizontalFlip = true;
-				}
-
-				shift = _vcnShift ? _vcnShift[remainder] : _blockBrightness;
-				src = &_vcnBlocks[remainder << 5];
-
-				if (horizontalFlip) {
-					for (int blockY = 0; blockY < 8; blockY++) {
-						src += 3;
-						for (int blockX = 0; blockX < 4; blockX++) {
-							uint8 t = *src--;
-							uint8 h = _vcnExpTable[((t & 0x0f) + wllVcnRmdOffset) | shift];
-							uint8 l = _vcnExpTable[((t >> 4) + wllVcnRmdOffset) | shift];
-							if (h)
-								*d = h;
-							d++;
-							if (l)
-								*d = l;
-							d++;
-						}
-						src += 5;
-						d += 168;
-					}
-				} else {
-					for (int blockY = 0; blockY < 8; blockY++) {
-						for (int blockX = 0; blockX < 4; blockX++) {
-							uint8 t = *src++;
-							uint8 h = _vcnExpTable[((t >> 4) + wllVcnRmdOffset) | shift];
-							uint8 l = _vcnExpTable[((t & 0x0f) + wllVcnRmdOffset) | shift];
-							if (h)
-								*d = h;
-							d++;
-							if (l)
-								*d = l;
-							d++;
-						}
-						d += 168;
-					}
-				}
-				d -= 1400;
-			}
-		}
-		d += 1232;
-	}
-
-	screen()->copyBlockToPage(_sceneDrawPage1, _sceneXoffset, 0, 176, 120, _sceneWindowBuffer);
-}
-
-uint16 LolEobBaseEngine::calcNewBlockPosition(uint16 curBlock, uint16 direction) {
-	static const int16 blockPosTable[] = { -32, 1, 32, -1 };
-	return (curBlock + blockPosTable[direction]) & 0x3ff;
-}
-
-int LolEobBaseEngine::clickedWallShape(uint16 block, uint16 direction) {
-	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
-	if (!clickedShape(v))
-		return 0;
-
-	snd_stopSpeech(true);
-	runLevelScript(block, 0x40);
-
-	return 1;
-}
-
-int LolEobBaseEngine::clickedLeverOn(uint16 block, uint16 direction) {
-	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
-	if (!clickedShape(v))
-		return 0;
-
-	_levelBlockProperties[block].walls[direction]++;
-	_sceneUpdateRequired = true;
-
-	if (_flags.gameID == GI_LOL)
-		snd_playSoundEffect(30, -1);
-
-	runLevelScript(block, _clickedSpecialFlag);
-
-	return 1;
-}
-
-int LolEobBaseEngine::clickedLeverOff(uint16 block, uint16 direction) {
-	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
-	if (!clickedShape(v))
-		return 0;
-
-	_levelBlockProperties[block].walls[direction]--;
-	_sceneUpdateRequired = true;
-
-	if (_flags.gameID == GI_LOL)
-		snd_playSoundEffect(29, -1);
-
-	runLevelScript(block, _clickedSpecialFlag);
-	return 1;
-}
-
-int LolEobBaseEngine::clickedWallOnlyScript(uint16 block) {
-	runLevelScript(block, _clickedSpecialFlag);
-	return 1;
-}
-
-void LolEobBaseEngine::processDoorSwitch(uint16 block, int openClose) {
-	if (block == _currentBlock)
-		return;
-
-	if ((_flags.gameID == GI_LOL && (_levelBlockProperties[block].assignedObjects & 0x8000)) || (_flags.gameID != GI_LOL  && (_levelBlockProperties[block].flags & 7)))
-		return;
-
-	if (openClose == 0) {
-		for (int i = 0; i < 3; i++) {
-			if (_openDoorState[i].block != block)
-				continue;
-			openClose = -_openDoorState[i].state;
-			break;
-		}
-	}
-
-	if (openClose == 0) {
-		openClose = (_wllWallFlags[_levelBlockProperties[block].walls[_wllWallFlags[_levelBlockProperties[block].walls[0]] & 8 ? 0 : 1]] & 1) ? 1 : -1;
-		if (_flags.gameID != GI_LOL)
-			openClose *= -1;
-	}
-
-	openCloseDoor(block, openClose);
-}
-
-void LolEobBaseEngine::openCloseDoor(int block, int openClose) {
-	int s1 = -1;
-	int s2 = -1;
-
-	int c = (_wllWallFlags[_levelBlockProperties[block].walls[0]] & 8) ? 0 : 1;
-	int v = _levelBlockProperties[block].walls[c];
-	int flg = (openClose == 1) ? 0x10 : (openClose == -1 ? 0x20 : 0);
-
-	if (_wllWallFlags[v] & flg)
-		return;
-
-	for (int i = 0; i < 3; i++) {
-		if (_openDoorState[i].block == block) {
-			s1 = i;
-			break;
-		} else if (_openDoorState[i].block == 0 && s2 == -1) {
-			s2 = i;
-		}
-	}
-
-	if (s1 != -1 || s2 != -1) {
-		if (s1 == -1)
-			s1 = s2;
-
-		_openDoorState[s1].block = block;
-		_openDoorState[s1].state = openClose;
-		_openDoorState[s1].wall = c;
-
-		flg = (-openClose == 1) ? 0x10 : (-openClose == -1 ? 0x20 : 0);
-
-		if (_wllWallFlags[v] & flg) {
-			_levelBlockProperties[block].walls[c] += openClose;
-			_levelBlockProperties[block].walls[c ^ 2] += openClose;
-
-			int snd = (openClose == -1) ? 4 : 3;
-			if (_flags.gameID == GI_LOL) {
-				snd_processEnvironmentalSoundEffect(snd + 28, _currentBlock);
-				if (!checkSceneUpdateNeed(block))
-					updateEnvironmentalSfx(0);
-			} else {
-				updateEnvironmentalSfx(snd);
-			}
-		}
-
-		enableTimer(_flags.gameID == GI_LOL ? 0 : 4);
-
-	} else {
-		while (!(flg & _wllWallFlags[v]))
-			v += openClose;
-
-		_levelBlockProperties[block].walls[c] = _levelBlockProperties[block].walls[c ^ 2] = v;
-		checkSceneUpdateNeed(block);
-	}
-}
-
-void LolEobBaseEngine::completeDoorOperations() {
-	for (int i = 0; i < 3; i++) {
-		if (!_openDoorState[i].block)
-			continue;
-
-		uint16 b = _openDoorState[i].block;
-
-		do {
-			_levelBlockProperties[b].walls[_openDoorState[i].wall] += _openDoorState[i].state;
-			_levelBlockProperties[b].walls[_openDoorState[i].wall ^ 2] += _openDoorState[i].state;
-		} while	(!(_wllWallFlags[_levelBlockProperties[b].walls[_openDoorState[i].wall]] & 0x30));
-
-		_openDoorState[i].block = 0;
-	}
-}
-
-} // End of namespace Kyra
-
-#endif // ENABLE_EOB || ENABLE_LOL
-#ifdef ENABLE_EOB
 
 namespace Kyra {
 
@@ -625,7 +41,7 @@ void EobCoreEngine::loadLevel(int level, int sub) {
 	Common::String file;
 	Common::SeekableReadStream *s = 0;
 	static const char *suffix[] = { "INF", "DRO", "ELO", 0 };
-	
+
 	for (const char *const *sf = suffix; *sf && !s; sf++) {
 		file = Common::String::format("LEVEL%d.%s", level, *sf);
 		s = _res->createReadStream(file);
@@ -649,11 +65,11 @@ void EobCoreEngine::loadLevel(int level, int sub) {
 	}
 
 	Common::String gfxFile;
-	// Work around for issue with corrupt (incomplete) monster property data 
+	// Work around for issue with corrupt (incomplete) monster property data
 	// when loading a savegame saved in a sub level
 	for (int i = 0; i <= sub; i++)
 		gfxFile = initLevelData(i);
-	
+
 	const uint8 *data = _screen->getCPagePtr(5);
 	const uint8 *pos = data + READ_LE_UINT16(data);
 	uint16 len = READ_LE_UINT16(pos);
@@ -744,7 +160,7 @@ Common::String EobCoreEngine::initLevelData(int sub){
 			_screen->setShapeFadeMode(0, false);
 			_screen->setShapeFadeMode(1, false);
 		}
-		
+
 		_screen->loadPalette(tmpStr.c_str(), _screen->getPalette(0));
 
 		Palette backupPal(256);
@@ -850,7 +266,7 @@ void EobCoreEngine::addLevelItems() {
 void EobCoreEngine::loadVcnData(const char *file, const char*/*nextFile*/) {
 	if (file)
 		strcpy(_lastBlockDataFile, file);
-	
+
 	_screen->loadBitmap(Common::String::format("%s.VCN", _lastBlockDataFile).c_str(), 3, 3, 0);
 	const uint8 *v = _screen->getCPagePtr(2);
 	uint32 tlen = READ_LE_UINT16(v) << 5;
@@ -1212,7 +628,7 @@ int EobCoreEngine::clickedDoorSwitch(uint16 block, uint16 direction) {
 		else
 			x1 += ((v - _dscDoorXE[v]) * 9);
 	}
-	
+
 	if (!posWithinRect(_mouseX, _mouseY, x1, y1, x1 + (d->shp[2] << 3) + 8, y1 + d->shp[1] + 8) && (_clickedSpecialFlag == 0x40))
 		return clickedDoorNoPry(block, direction);
 
diff --git a/engines/kyra/scene_rpg.cpp b/engines/kyra/scene_rpg.cpp
new file mode 100644
index 0000000000..07a7a879b1
--- /dev/null
+++ b/engines/kyra/scene_rpg.cpp
@@ -0,0 +1,614 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/kyra_rpg.h"
+#include "kyra/resource.h"
+#include "kyra/timer.h"
+#include "kyra/sound.h"
+
+#include "common/system.h"
+
+namespace Kyra {
+
+void KyraRpgEngine::setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim) {
+	if (_lvlShapeLeftRight[index << 1] == -1) {
+		x1 = 0;
+		x2 = 22;
+
+		int16 y1 = 0;
+		int16 y2 = 120;
+
+		int m = index * 18;
+
+		for (int i = 0; i < 18; i++) {
+			uint8 d = _visibleBlocks[i]->walls[_sceneDrawVarDown];
+			uint8 a = _wllWallFlags[d];
+
+			if (a & 8) {
+				int t = _dscDim2[(m + i) << 1];
+
+				if (t > x1) {
+					x1 = t;
+					if (!(a & 0x10))
+						scaleLevelShapesDim(index, y1, y2, -1);
+				}
+
+				t = _dscDim2[((m + i) << 1) + 1];
+
+				if (t < x2) {
+					x2 = t;
+					if (!(a & 0x10))
+						scaleLevelShapesDim(index, y1, y2, -1);
+				}
+			} else {
+				int t = _dscDim1[m + i];
+
+				if (!_wllVmpMap[d] || t == -40)
+					continue;
+
+				if (t == -41) {
+					x1 = 22;
+					x2 = 0;
+					break;
+				}
+
+				if (t > 0 && x2 > t)
+					x2 = t;
+
+				if (t < 0 && x1 < -t)
+					x1 = -t;
+			}
+
+			if (x2 < x1)
+				break;
+		}
+
+		x1 += (_sceneXoffset >> 3);
+		x2 += (_sceneXoffset >> 3);
+
+
+		_lvlShapeTop[index] = y1;
+		_lvlShapeBottom[index] = y2;
+		_lvlShapeLeftRight[index << 1] = x1;
+		_lvlShapeLeftRight[(index << 1) + 1] = x2;
+	} else {
+		x1 = _lvlShapeLeftRight[index << 1];
+		x2 = _lvlShapeLeftRight[(index << 1) + 1];
+	}
+
+	drawLevelModifyScreenDim(dim, x1, 0, x2, 15);
+}
+
+void KyraRpgEngine::scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim) {
+	static const int8 dscY1[] = { 0x1E, 0x18, 0x10, 0x00 };
+	static const int8 dscY2[] = { 0x3B, 0x47, 0x56, 0x78 };
+
+	uint8 a = _dscDimMap[index];
+
+	if (dim == -1 && a != 3)
+		a++;
+
+	y1 = dscY1[a];
+	y2 = dscY2[a];
+
+	if (dim == -1)
+		return;
+
+	const ScreenDim *cDim = screen()->getScreenDim(dim);
+
+	screen()->modifyScreenDim(dim, cDim->sx, y1, cDim->w, y2 - y1);
+}
+
+void KyraRpgEngine::drawLevelModifyScreenDim(int dim, int16 x1, int16 y1, int16 x2, int16 y2) {
+	screen()->modifyScreenDim(dim, x1, y1 << 3, x2 - x1, (y2 - y1) << 3);
+}
+
+void KyraRpgEngine::generateBlockDrawingBuffer() {
+	_sceneDrawVarDown = _dscBlockMap[_currentDirection];
+	_sceneDrawVarRight = _dscBlockMap[_currentDirection + 4];
+	_sceneDrawVarLeft = _dscBlockMap[_currentDirection + 8];
+
+	/*******************************************
+    *             _visibleBlocks map           *
+	*                                          *
+	*     |     |     |     |     |     |      *
+	*  00 |  01 |  02 |  03 |  04 |  05 |  06  *
+	* ____|_____|_____|_____|_____|_____|_____ *
+	*     |     |     |     |     |     |      *
+	*     |  07 |  08 |  09 |  10 |  11 |      *
+	*     |_____|_____|_____|_____|_____|      *
+	*           |     |     |     |            *
+	*           |  12 |  13 |  14 |            *
+	*           |_____|_____|_____|            *
+	*                 |     |                  *
+	*              15 |  16 |  17              *
+	*                 | (P) |                  *
+	********************************************/
+
+	memset(_blockDrawingBuffer, 0, 660 * sizeof(uint16));
+
+	_wllProcessFlag = ((_currentBlock >> 5) + (_currentBlock & 0x1f) + _currentDirection) & 1;
+
+	if (_wllProcessFlag) // floor and ceiling
+		generateVmpTileDataFlipped(0, 15, 1, -330, 22, 15);
+	else
+		generateVmpTileData(0, 15, 1, -330, 22, 15);
+
+	assignVisibleBlocks(_currentBlock, _currentDirection);
+
+	uint8 t = _visibleBlocks[0]->walls[_sceneDrawVarRight];
+	if (t)
+		generateVmpTileData(-2, 3, t, 102, 3, 5);
+
+	t = _visibleBlocks[6]->walls[_sceneDrawVarLeft];
+	if (t)
+		generateVmpTileDataFlipped(21, 3, t, 102, 3, 5);
+
+	t = _visibleBlocks[1]->walls[_sceneDrawVarRight];
+	uint8 t2 = _visibleBlocks[2]->walls[_sceneDrawVarDown];
+
+	if (hasWall(t) && !(_wllWallFlags[t2] & 8))
+		generateVmpTileData(2, 3, t, 102, 3, 5);
+	else if (t && (_wllWallFlags[t2] & 8))
+		generateVmpTileData(2, 3, t2, 102, 3, 5);
+
+	t = _visibleBlocks[5]->walls[_sceneDrawVarLeft];
+	t2 = _visibleBlocks[4]->walls[_sceneDrawVarDown];
+
+	if (hasWall(t) && !(_wllWallFlags[t2] & 8))
+		generateVmpTileDataFlipped(17, 3, t, 102, 3, 5);
+	else if (t && (_wllWallFlags[t2] & 8))
+		generateVmpTileDataFlipped(17, 3, t2, 102, 3, 5);
+
+	t = _visibleBlocks[2]->walls[_sceneDrawVarRight];
+	if (t)
+		generateVmpTileData(8, 3, t, 97, 1, 5);
+
+	t = _visibleBlocks[4]->walls[_sceneDrawVarLeft];
+	if (t)
+		generateVmpTileDataFlipped(13, 3, t, 97, 1, 5);
+
+	t = _visibleBlocks[1]->walls[_sceneDrawVarDown];
+	if (hasWall(t))
+		generateVmpTileData(-4, 3, t, 129, 6, 5);
+
+	t = _visibleBlocks[5]->walls[_sceneDrawVarDown];
+	if (hasWall(t))
+		generateVmpTileData(20, 3, t, 129, 6, 5);
+
+	t = _visibleBlocks[2]->walls[_sceneDrawVarDown];
+	if (hasWall(t))
+		generateVmpTileData(2, 3, t, 129, 6, 5);
+
+	t = _visibleBlocks[4]->walls[_sceneDrawVarDown];
+	if (hasWall(t))
+		generateVmpTileData(14, 3, t, 129, 6, 5);
+
+	t = _visibleBlocks[3]->walls[_sceneDrawVarDown];
+	if (t)
+		generateVmpTileData(8, 3, t, 129, 6, 5);
+
+	t = _visibleBlocks[7]->walls[_sceneDrawVarRight];
+	if (t)
+		generateVmpTileData(0, 3, t, 117, 2, 6);
+
+	t = _visibleBlocks[11]->walls[_sceneDrawVarLeft];
+	if (t)
+		generateVmpTileDataFlipped(20, 3, t, 117, 2, 6);
+
+	t = _visibleBlocks[8]->walls[_sceneDrawVarRight];
+	if (t)
+		generateVmpTileData(6, 2, t, 81, 2, 8);
+
+	t = _visibleBlocks[10]->walls[_sceneDrawVarLeft];
+	if (t)
+		generateVmpTileDataFlipped(14, 2, t, 81, 2, 8);
+
+	t = _visibleBlocks[8]->walls[_sceneDrawVarDown];
+	if (hasWall(t))
+		generateVmpTileData(-4, 2, t, 159, 10, 8);
+
+	t = _visibleBlocks[10]->walls[_sceneDrawVarDown];
+	if (hasWall(t))
+		generateVmpTileData(16, 2, t, 159, 10, 8);
+
+	t = _visibleBlocks[9]->walls[_sceneDrawVarDown];
+	if (t)
+		generateVmpTileData(6, 2, t, 159, 10, 8);
+
+	t = _visibleBlocks[12]->walls[_sceneDrawVarRight];
+	if (t)
+		generateVmpTileData(3, 1, t, 45, 3, 12);
+
+	t = _visibleBlocks[14]->walls[_sceneDrawVarLeft];
+	if (t)
+		generateVmpTileDataFlipped(16, 1, t, 45, 3, 12);
+
+	t = _visibleBlocks[12]->walls[_sceneDrawVarDown];
+	if (!(_wllWallFlags[t] & 8))
+		generateVmpTileData(-13, 1, t, 239, 16, 12);
+
+	t = _visibleBlocks[14]->walls[_sceneDrawVarDown];
+	if (!(_wllWallFlags[t] & 8))
+		generateVmpTileData(19, 1, t, 239, 16, 12);
+
+	t = _visibleBlocks[13]->walls[_sceneDrawVarDown];
+	if (t)
+		generateVmpTileData(3, 1, t, 239, 16, 12);
+
+	t = _visibleBlocks[15]->walls[_sceneDrawVarRight];
+	t2 = _visibleBlocks[17]->walls[_sceneDrawVarLeft];
+	if (t)
+		generateVmpTileData(0, 0, t, 0, 3, 15);
+	if (t2)
+		generateVmpTileDataFlipped(19, 0, t2, 0, 3, 15);
+}
+
+void KyraRpgEngine::generateVmpTileData(int16 startBlockX, uint8 startBlockY, uint8 vmpMapIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY) {
+	if (!_wllVmpMap[vmpMapIndex])
+		return;
+
+	uint16 *vmp = &_vmpPtr[(_wllVmpMap[vmpMapIndex] - 1) * 431 + vmpOffset + 330];
+
+	for (int i = 0; i < numBlocksY; i++) {
+		uint16 *bl = &_blockDrawingBuffer[(startBlockY + i) * 22 + startBlockX];
+		for (int ii = 0; ii < numBlocksX; ii++) {
+			if ((startBlockX + ii >= 0) && (startBlockX + ii < 22) && *vmp)
+				*bl = *vmp;
+			bl++;
+			vmp++;
+		}
+	}
+}
+
+void KyraRpgEngine::generateVmpTileDataFlipped(int16 startBlockX, uint8 startBlockY, uint8 vmpMapIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY) {
+	if (!_wllVmpMap[vmpMapIndex])
+		return;
+
+	uint16 *vmp = &_vmpPtr[(_wllVmpMap[vmpMapIndex] - 1) * 431 + vmpOffset + 330];
+
+	for (int i = 0; i < numBlocksY; i++) {
+		for (int ii = 0; ii < numBlocksX; ii++) {
+			if ((startBlockX + ii) < 0 || (startBlockX + ii) > 21)
+				continue;
+
+			uint16 v = vmp[i * numBlocksX + (numBlocksX - 1 - ii)];
+			if (!v)
+				continue;
+
+			if (v & 0x4000)
+				v -= 0x4000;
+			else
+				v |= 0x4000;
+
+			_blockDrawingBuffer[(startBlockY + i) * 22 + startBlockX + ii] = v;
+		}
+	}
+}
+
+bool KyraRpgEngine::hasWall(int index) {
+	if (!index || (_wllWallFlags[index] & 8))
+		return false;
+	return true;
+}
+
+void KyraRpgEngine::assignVisibleBlocks(int block, int direction) {
+	for (int i = 0; i < 18; i++) {
+		uint16 t = (block + _dscBlockIndex[direction * 18 + i]) & 0x3ff;
+		_visibleBlockIndex[i] = t;
+
+		_visibleBlocks[i] = &_levelBlockProperties[t];
+		_lvlShapeLeftRight[i] = _lvlShapeLeftRight[18 + i] = -1;
+	}
+}
+
+bool KyraRpgEngine::checkSceneUpdateNeed(int block) {
+	if (_sceneUpdateRequired)
+		return true;
+
+	for (int i = 0; i < 15; i++) {
+		if (_visibleBlockIndex[i] == block) {
+			_sceneUpdateRequired = true;
+			return true;
+		}
+	}
+
+	if (_currentBlock == block){
+		_sceneUpdateRequired = true;
+		return true;
+	}
+
+	return false;
+}
+
+void KyraRpgEngine::drawVcnBlocks() {
+	uint8 *d = _sceneWindowBuffer;
+	uint16 *bdb = _blockDrawingBuffer;
+
+	for (int y = 0; y < 15; y++) {
+		for (int x = 0; x < 22; x++) {
+			bool horizontalFlip = false;
+			int remainder = 0;
+
+			uint16 vcnOffset = *bdb++;
+			int wllVcnOffset = 0;
+			int wllVcnRmdOffset = 0;
+
+			if (vcnOffset & 0x8000) {
+				// this renders a wall block over the transparent pixels of a floor/ceiling block
+				remainder = vcnOffset - 0x8000;
+				vcnOffset = 0;
+				wllVcnRmdOffset = _wllVcnOffset;
+			}
+
+			if (vcnOffset & 0x4000) {
+				horizontalFlip = true;
+				vcnOffset &= 0x3fff;
+			}
+
+			uint8 *src = 0;
+			if (vcnOffset) {
+				src = &_vcnBlocks[vcnOffset << 5];
+				wllVcnOffset = _wllVcnOffset;
+			} else {
+				// floor/ceiling blocks
+				vcnOffset = bdb[329];
+				if (vcnOffset & 0x4000) {
+					horizontalFlip = true;
+					vcnOffset &= 0x3fff;
+				}
+
+				src = (_vcfBlocks ? _vcfBlocks : _vcnBlocks) + (vcnOffset << 5);
+			}
+
+			uint8 shift = _vcnShift ? _vcnShift[vcnOffset] : _blockBrightness;
+
+			if (horizontalFlip) {
+				for (int blockY = 0; blockY < 8; blockY++) {
+					src += 3;
+					for (int blockX = 0; blockX < 4; blockX++) {
+						uint8 t = *src--;
+						*d++ = _vcnExpTable[((t & 0x0f) + wllVcnOffset) | shift];
+						*d++ = _vcnExpTable[((t >> 4) + wllVcnOffset) | shift];
+					}
+					src += 5;
+					d += 168;
+				}
+			} else {
+				for (int blockY = 0; blockY < 8; blockY++) {
+					for (int blockX = 0; blockX < 4; blockX++) {
+						uint8 t = *src++;
+						*d++ = _vcnExpTable[((t >> 4) + wllVcnOffset) | shift];
+						*d++ = _vcnExpTable[((t & 0x0f) + wllVcnOffset) | shift];
+					}
+					d += 168;
+				}
+			}
+			d -= 1400;
+
+			if (remainder) {
+				d -= 8;
+				horizontalFlip = false;
+
+				if (remainder & 0x4000) {
+					remainder &= 0x3fff;
+					horizontalFlip = true;
+				}
+
+				shift = _vcnShift ? _vcnShift[remainder] : _blockBrightness;
+				src = &_vcnBlocks[remainder << 5];
+
+				if (horizontalFlip) {
+					for (int blockY = 0; blockY < 8; blockY++) {
+						src += 3;
+						for (int blockX = 0; blockX < 4; blockX++) {
+							uint8 t = *src--;
+							uint8 h = _vcnExpTable[((t & 0x0f) + wllVcnRmdOffset) | shift];
+							uint8 l = _vcnExpTable[((t >> 4) + wllVcnRmdOffset) | shift];
+							if (h)
+								*d = h;
+							d++;
+							if (l)
+								*d = l;
+							d++;
+						}
+						src += 5;
+						d += 168;
+					}
+				} else {
+					for (int blockY = 0; blockY < 8; blockY++) {
+						for (int blockX = 0; blockX < 4; blockX++) {
+							uint8 t = *src++;
+							uint8 h = _vcnExpTable[((t >> 4) + wllVcnRmdOffset) | shift];
+							uint8 l = _vcnExpTable[((t & 0x0f) + wllVcnRmdOffset) | shift];
+							if (h)
+								*d = h;
+							d++;
+							if (l)
+								*d = l;
+							d++;
+						}
+						d += 168;
+					}
+				}
+				d -= 1400;
+			}
+		}
+		d += 1232;
+	}
+
+	screen()->copyBlockToPage(_sceneDrawPage1, _sceneXoffset, 0, 176, 120, _sceneWindowBuffer);
+}
+
+uint16 KyraRpgEngine::calcNewBlockPosition(uint16 curBlock, uint16 direction) {
+	static const int16 blockPosTable[] = { -32, 1, 32, -1 };
+	return (curBlock + blockPosTable[direction]) & 0x3ff;
+}
+
+int KyraRpgEngine::clickedWallShape(uint16 block, uint16 direction) {
+	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
+	if (!clickedShape(v))
+		return 0;
+
+	snd_stopSpeech(true);
+	runLevelScript(block, 0x40);
+
+	return 1;
+}
+
+int KyraRpgEngine::clickedLeverOn(uint16 block, uint16 direction) {
+	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
+	if (!clickedShape(v))
+		return 0;
+
+	_levelBlockProperties[block].walls[direction]++;
+	_sceneUpdateRequired = true;
+
+	if (_flags.gameID == GI_LOL)
+		snd_playSoundEffect(30, -1);
+
+	runLevelScript(block, _clickedSpecialFlag);
+
+	return 1;
+}
+
+int KyraRpgEngine::clickedLeverOff(uint16 block, uint16 direction) {
+	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
+	if (!clickedShape(v))
+		return 0;
+
+	_levelBlockProperties[block].walls[direction]--;
+	_sceneUpdateRequired = true;
+
+	if (_flags.gameID == GI_LOL)
+		snd_playSoundEffect(29, -1);
+
+	runLevelScript(block, _clickedSpecialFlag);
+	return 1;
+}
+
+int KyraRpgEngine::clickedWallOnlyScript(uint16 block) {
+	runLevelScript(block, _clickedSpecialFlag);
+	return 1;
+}
+
+void KyraRpgEngine::processDoorSwitch(uint16 block, int openClose) {
+	if (block == _currentBlock)
+		return;
+
+	if ((_flags.gameID == GI_LOL && (_levelBlockProperties[block].assignedObjects & 0x8000)) || (_flags.gameID != GI_LOL  && (_levelBlockProperties[block].flags & 7)))
+		return;
+
+	if (openClose == 0) {
+		for (int i = 0; i < 3; i++) {
+			if (_openDoorState[i].block != block)
+				continue;
+			openClose = -_openDoorState[i].state;
+			break;
+		}
+	}
+
+	if (openClose == 0) {
+		openClose = (_wllWallFlags[_levelBlockProperties[block].walls[_wllWallFlags[_levelBlockProperties[block].walls[0]] & 8 ? 0 : 1]] & 1) ? 1 : -1;
+		if (_flags.gameID != GI_LOL)
+			openClose *= -1;
+	}
+
+	openCloseDoor(block, openClose);
+}
+
+void KyraRpgEngine::openCloseDoor(int block, int openClose) {
+	int s1 = -1;
+	int s2 = -1;
+
+	int c = (_wllWallFlags[_levelBlockProperties[block].walls[0]] & 8) ? 0 : 1;
+	int v = _levelBlockProperties[block].walls[c];
+	int flg = (openClose == 1) ? 0x10 : (openClose == -1 ? 0x20 : 0);
+
+	if (_wllWallFlags[v] & flg)
+		return;
+
+	for (int i = 0; i < 3; i++) {
+		if (_openDoorState[i].block == block) {
+			s1 = i;
+			break;
+		} else if (_openDoorState[i].block == 0 && s2 == -1) {
+			s2 = i;
+		}
+	}
+
+	if (s1 != -1 || s2 != -1) {
+		if (s1 == -1)
+			s1 = s2;
+
+		_openDoorState[s1].block = block;
+		_openDoorState[s1].state = openClose;
+		_openDoorState[s1].wall = c;
+
+		flg = (-openClose == 1) ? 0x10 : (-openClose == -1 ? 0x20 : 0);
+
+		if (_wllWallFlags[v] & flg) {
+			_levelBlockProperties[block].walls[c] += openClose;
+			_levelBlockProperties[block].walls[c ^ 2] += openClose;
+
+			int snd = (openClose == -1) ? 4 : 3;
+			if (_flags.gameID == GI_LOL) {
+				snd_processEnvironmentalSoundEffect(snd + 28, _currentBlock);
+				if (!checkSceneUpdateNeed(block))
+					updateEnvironmentalSfx(0);
+			} else {
+				updateEnvironmentalSfx(snd);
+			}
+		}
+
+		enableTimer(_flags.gameID == GI_LOL ? 0 : 4);
+
+	} else {
+		while (!(flg & _wllWallFlags[v]))
+			v += openClose;
+
+		_levelBlockProperties[block].walls[c] = _levelBlockProperties[block].walls[c ^ 2] = v;
+		checkSceneUpdateNeed(block);
+	}
+}
+
+void KyraRpgEngine::completeDoorOperations() {
+	for (int i = 0; i < 3; i++) {
+		if (!_openDoorState[i].block)
+			continue;
+
+		uint16 b = _openDoorState[i].block;
+
+		do {
+			_levelBlockProperties[b].walls[_openDoorState[i].wall] += _openDoorState[i].state;
+			_levelBlockProperties[b].walls[_openDoorState[i].wall ^ 2] += _openDoorState[i].state;
+		} while	(!(_wllWallFlags[_levelBlockProperties[b].walls[_openDoorState[i].wall]] & 0x30));
+
+		_openDoorState[i].block = 0;
+	}
+}
+
+} // End of namespace Kyra
+
+#endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 0b877b7247..ca44a8a771 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -189,7 +189,7 @@ void Screen_Eob::loadEobBitmap(const char *file, const uint8 *ditheringData, int
 			delete s;
 		}
 	}
-	
+
 	if (copyToPage == -1) {
 		return;
 	} else if (copyToPage == 0) {
@@ -248,7 +248,7 @@ uint8 *Screen_Eob::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 			uint8 *lineEnd = src + (w << 3);
 			do {
 				uint8 val = *src++;
-				if (!val) {				
+				if (!val) {
 					*dst++ = 0;
 					uint8 *startZeroPos = src;
 
@@ -563,9 +563,9 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 			addDirtyRect(rX, rY, rW, rH);
 
 		while (dH--) {
-			int16 xpos = (int16) marginLeft;			
+			int16 xpos = (int16) marginLeft;
 
-			if (flags & 1) {				
+			if (flags & 1) {
 				for (int i = 0; i < w2; i++) {
 					if (*src++ == 0) {
 						i += (*src - 1);
@@ -636,7 +636,7 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 
 			dstL += 320;
 			dst = dstL;
-			if (flags & 1)			
+			if (flags & 1)
 				src = src2 + 1;
 		}
 	}
@@ -751,7 +751,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepS
 	int rY1 = dm->sy;
 	int rX2 = rX1 + (dm->w << 3);
 	int rY2 = rY1 + dm->h - 1;
-	
+
 	int16 gx2 = _gfxX;
 	int16 gy2 = _gfxY;
 
@@ -783,7 +783,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepS
 					py = ymax;
 				if (posWithinRect(px, py, rX1, rY1, rX2, rY2))
 					setPagePixel(0, px, py, ptr6[i]);
-			}			
+			}
 		}
 
 		l = 0;
@@ -798,7 +798,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepS
 			ptr5[i] += 5;
 			ptr3[i] += ptr5[i];
 			ptr8[i] += ptr7[i];
-				
+
 			int16 px = ((ptr2[i] >> 6) >> scale) + gx2;
 			int16 py = ((ptr3[i] >> 6) >> scale) + gy2;
 			if (py >= ymax || py < ymin)
@@ -808,7 +808,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepS
 
 			if (py > ymax)
 				py = ymax;
-			
+
 			int pxVal1 = 0;
 			if (posWithinRect(px, py, 0, 0, 319, 199)) {
 				pxVal1 = getPagePixel(2, px, py);
@@ -833,7 +833,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepS
 			}
 		}
 	}
-	
+
 	showMouse();
 }
 
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index d2d888107a..78361ebaa6 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -100,7 +100,7 @@ private:
 	static const int _screenDimTableCount;
 
 	ScreenDim **_customDimTable;
-	int _curDimIndex;	
+	int _curDimIndex;
 };
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index 4123e89a14..c59c66b04f 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -737,7 +737,7 @@ int EobInfProcessor::oeob_eval_v1(int8 *data) {
 			debugC(5, kDebugLevelScript, "         - check if whole party is invisible - PUSH result: '%d'", a);
 			break;
 
-		case 1:			
+		case 1:
 			_stack[_stackIndex++] = _vm->rollDice(pos[0], pos[1], pos[2]);
 			debugC(9, kDebugLevelScript, "         - throw dice(s): num = '%d', pips = '%d', offset = '%d' - PUSH result: '%d'", pos[0], pos[1], pos[2], _stack[_stackIndex - 1]);
 			pos += 3;
@@ -1478,7 +1478,7 @@ int EobInfProcessor::oeob_sequence(int8 *data) {
 		return 0;
 
 	case -2:
-		_vm->seq_portal();		
+		_vm->seq_portal();
 		break;
 
 	case -1:
diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h
index 8f883fd712..a561568336 100644
--- a/engines/kyra/script_eob.h
+++ b/engines/kyra/script_eob.h
@@ -32,7 +32,7 @@
 
 namespace Kyra {
 
-class LolEobBaseEngine;
+class KyraRpgEngine;
 
 class EobInfProcessor {
 public:
diff --git a/engines/kyra/sequences_eob1.cpp b/engines/kyra/sequences_eob1.cpp
index 2ff4a3aa9f..b25de5ccd2 100644
--- a/engines/kyra/sequences_eob1.cpp
+++ b/engines/kyra/sequences_eob1.cpp
@@ -38,7 +38,7 @@ int EobEngine::mainMenu() {
 	_menuChoiceInit = 0;
 
 	Screen::FontId of = _screen->_currentFont;
-	
+
 	while (menuChoice >= 0 && !shouldQuit()) {
 		switch (menuChoice) {
 			case 0:
@@ -162,25 +162,25 @@ void EobEngine::seq_playFinale() {
 	delete s;
 
 	snd_playSoundEffect(20);
-	
+
 	_txt->resetPageBreakString();
 	_txt->setWaitButtonMode(1);
 	_txt->setupField(12, true);
 	gui_drawBox(0, 0, 176, 175, _color1_1, _color2_1, _bkgColor_1);
 	_txt->printDialogueText(51, _moreStrings[0]);
-	
+
 	if (!checkScriptFlags(0x1ffe)) {
 		_screen->fadeToBlack();
 		return;
 	}
-	
+
 	_txt->printDialogueText(_finBonusStrings[0]);
 	for (int i = 0; i < 6; i++) {
 		_txt->printDialogueText(_finBonusStrings[1]);
 		if (_characters[i].flags & 1)
 			_txt->printDialogueText(_characters[i].name);
 	}
-	
+
 	uint32 password = 0;
 	for (int i = 0; i < 4; i++) {
 		if (!(_characters[i].flags & 1))
@@ -200,7 +200,7 @@ void EobEngine::seq_playFinale() {
 void EobEngine::seq_tower() {
 	if (shouldQuit() || skipFlag())
 		return;
-	
+
 	_screen->loadBitmap(_introFilesTower[1], 5, 3, 0);
 	_screen->setCurPage(2);
 	uint8 *shp = _screen->encodeShape(0, 0, 16, 56, true);
@@ -239,7 +239,7 @@ void EobEngine::seq_tower() {
 		_screen->copyRegion(104, 79 - i, 200, 0, 24, 65 + i, 4, 0, Screen::CR_NO_P_CHECK);
 		_screen->copyRegion(24, 110, 120, i + 31, 80, 34, 4, 0, Screen::CR_NO_P_CHECK);
 		_screen->copyRegion(152, 0, 120, 32, 80, i + 1, 4, 0, Screen::CR_NO_P_CHECK);
-		_screen->copyRegion(0, 0, 96, 65 + i, 128, 103 - i, 2, 0, Screen::CR_NO_P_CHECK);	
+		_screen->copyRegion(0, 0, 96, 65 + i, 128, 103 - i, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
 		delayUntil(end);
 	}
@@ -282,18 +282,18 @@ void EobEngine::seq_orb() {
 	shp[4] = _screen->encodeShape(0, 0, 20, 136, true);
 	_screen->loadBitmap(_introFilesOrb[1], 5, 3, 0);
 	shp[3] = _screen->encodeShape(16, 0, 16, 104, true);
-	
+
 	_screen->fillRect(0, 0, 127, 103, 12);
 	for (int i = 1; i < 4; i++) {
 		copyBlurRegion(128, 0, 0, 0, 128, 104, i);
 		shp[3 - i] = _screen->encodeShape(0, 0, 16, 104, true);
 	}
-	
+
 	_screen->fillRect(0, 0, 159, 135, 12);
 	_screen->setCurPage(0);
 	_screen->copyPage(3, 4);
 	_screen->clearCurPage();
-	
+
 	_sound->playTrack(6);
 
 	for (int i = -1; i < 4 && !shouldQuit() && !skipFlag(); i++) {
@@ -467,7 +467,7 @@ void EobEngine::seq_king() {
 	static const uint8 advEncX[] = { 0, 6, 12, 19 };
 	static const uint8 advEncW[] = { 6, 6, 7, 6 };
 	static const int8 modY[] = { -4, -8, -2, -2, 1, 0, 0, 0 };
-	
+
 	_screen->loadBitmap(_introFilesKing[1], 5, 3, 0);
 	_screen->setCurPage(2);
 	for (int i = 0; i < 4; i++) {
@@ -481,7 +481,7 @@ void EobEngine::seq_king() {
 	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag(); ) {
 		runloop = false;
 		uint32 end = _system->getMillis() + 2 * _tickLength;
-		
+
 		for (int i = 0; i < 4; i++) {
 			if (dy[i] <= 82)
 				continue;
@@ -527,7 +527,7 @@ void EobEngine::seq_hands() {
 	_screen->fillRect(0, 160, 319, 199, 12, 0);
 	_screen->fillRect(0, 0, 191, 63, 157, 2);
 	_screen->drawShape(2, shp1, 0, 4, 0);
-	_screen->drawShape(2, shp2, 151, 4, 0);	
+	_screen->drawShape(2, shp2, 151, 4, 0);
 	boxMorphTransition(25, 8, 18, 4, 3, 0, 21, 8, 6, 0, 28, 23);
 	_screen->copyRegion(0, 128, 0, 176, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
 
@@ -540,7 +540,7 @@ void EobEngine::seq_hands() {
 		_screen->fillRect(0, 0, 167, 63, 157);
 		_screen->drawShape(2, shp1, i, 4, 0);
 		_screen->drawShape(2, shp1, 105 - i, 4, 0);
-		_screen->copyRegion(0, 0, 144, 32, 168, 64, 2, 0, Screen::CR_NO_P_CHECK);		
+		_screen->copyRegion(0, 0, 144, 32, 168, 64, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
 		delayUntil(end);
 	}
@@ -555,7 +555,7 @@ void EobEngine::seq_hands() {
 	shp1 = _screen->encodeShape(17, 0, 11, 120, true);
 	shp2 = _screen->encodeShape(28, 112, 1, 31, true);
 	uint8 *shp3 = _screen->encodeShape(9, 138, 14, 54, true);
-	
+
 	_screen->setCurPage(2);
 	_screen->fillRect(0, 0, 135, 63, 157);
 	_screen->drawShape(2, shp1, 32, -80, 0);
@@ -568,7 +568,7 @@ void EobEngine::seq_hands() {
 		_screen->fillRect(0, 0, 135, 63, 157);
 		_screen->drawShape(2, shp1, 32, i, 0);
 		_screen->drawShape(2, shp2, 40, i + 64, 0);
-		_screen->copyRegion(0, 0, 80, 96, 136, 64, 2, 0, Screen::CR_NO_P_CHECK);		
+		_screen->copyRegion(0, 0, 80, 96, 136, 64, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
 		delayUntil(end);
 	}
@@ -581,7 +581,7 @@ void EobEngine::seq_hands() {
 		_screen->fillRect(0, 0, 135, 63, 157);
 		_screen->drawShape(2, shp3, 12, 64 + i, 0);
 		_screen->drawShape(2, shp1, 32, i, 0);
-		_screen->copyRegion(0, 0, 80, 96, 136, 64, 2, 0, Screen::CR_NO_P_CHECK);		
+		_screen->copyRegion(0, 0, 80, 96, 136, 64, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
 		delayUntil(end);
 	}
@@ -608,7 +608,7 @@ void EobEngine::seq_hands() {
 		_screen->fillRect(0, 0, 143, 95, 157);
 		_screen->drawShape(2, shp1, i, i, 0);
 		_screen->drawShape(2, shp2, (i == -8) ? 55 : 52, (i == -8) ? 52 : 49, 0);
-		_screen->copyRegion(0, 0, 0, 0, 144, 96, 2, 0, Screen::CR_NO_P_CHECK);		
+		_screen->copyRegion(0, 0, 0, 0, 144, 96, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
 		delayUntil(end);
 	}
@@ -633,7 +633,7 @@ void EobEngine::seq_hands() {
 		uint32 end = _system->getMillis() + _tickLength;
 		_screen->fillRect(0, 0, 87, 112, 157);
 		_screen->drawShape(2, shp2, 0, dy, 0);
-		_screen->copyRegion(0, 0, 120, 48, 88, 112, 2, 0, Screen::CR_NO_P_CHECK);		
+		_screen->copyRegion(0, 0, 120, 48, 88, 112, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
 		delayUntil(end);
 		dy -= 5;
@@ -645,7 +645,7 @@ void EobEngine::seq_hands() {
 		uint32 end = _system->getMillis() + _tickLength;
 		_screen->fillRect(0, 0, 87, 39, 157);
 		_screen->drawShape(2, shp1, 0, i, 0);
-		_screen->copyRegion(0, 0, 120, 48, 88, 112, 2, 0, Screen::CR_NO_P_CHECK);		
+		_screen->copyRegion(0, 0, 120, 48, 88, 112, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
 		delayUntil(end);
 	}
@@ -837,7 +837,7 @@ void EobEngine::seq_tunnel() {
 	_sound->playTrack(9);
 
 	for (int i = 0; i < 6 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + _tickLength;		
+		uint32 end = _system->getMillis() + _tickLength;
 		_screen->copyRegion(_introTvlX1[i] << 3, _introTvlY1[i], _introTvlX2[i] << 3, _introTvlY2[i], _introTvlW[i] << 3, _introTvlH[i], 4, 2, Screen::CR_NO_P_CHECK);
 		for (int ii = 0; ii < 4 && !shouldQuit() && !skipFlag(); ii++) {
 			_screen->updateScreen();
@@ -864,13 +864,13 @@ void EobEngine::seq_tunnel() {
 	_screen->copyRegion(0, 176, 0, 184, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
 	_screen->setCurPage(0);
 	_screen->updateScreen();
-	delay(50 * _tickLength);	
+	delay(50 * _tickLength);
 }
 
 void EobEngine::seq_xdeath() {
 	uint8 *shapes1[5];
 	uint8 *shapes2;
-	
+
 	_screen->loadShapeSetBitmap("XDEATH2", 5, 3);
 	for (int i = 0; i < 4; i++)
 		shapes1[i] = _screen->encodeShape(i / 2 * 14, i / 2 * 88, 14, 88, true);
@@ -910,7 +910,7 @@ void EobEngine::seq_xdeath() {
 		_screen->updateScreen();
 		delay(2 * _tickLength);
 	}
-	
+
 	_screen->modifyScreenDim(5, dm->sx, 0, dm->w, dm->h);
 
 	snd_playSoundEffect(5);
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
index 597d84d81c..433ee4ae1f 100644
--- a/engines/kyra/sequences_eob2.cpp
+++ b/engines/kyra/sequences_eob2.cpp
@@ -1278,7 +1278,7 @@ void DarkMoonEngine::seq_nightmare() {
 
 	initDialogueSequence();
 	gui_drawDialogueBox();
-	
+
 	_txt->printDialogueText(99, 0);
 	snd_playSoundEffect(54);
 
@@ -1292,7 +1292,7 @@ void DarkMoonEngine::seq_nightmare() {
 	}
 
 	_txt->printDialogueText(20, _okStrings[0]);
-	
+
 	restoreAfterDialogueSequence();
 
 	_screen->setFont(of);
@@ -1303,7 +1303,7 @@ void DarkMoonEngine::seq_kheldran() {
 
 	initDialogueSequence();
 	gui_drawDialogueBox();
-	
+
 	static const char file[] = "KHELDRAN";
 	_txt->printDialogueText(_kheldranStrings[0]);
 	drawSequenceBitmap(file, 0, 0, 0, 0);
@@ -1316,7 +1316,7 @@ void DarkMoonEngine::seq_kheldran() {
 	drawSequenceBitmap(file, 0, 20, 96, 0);
 	delay(7 * _tickLength);
 	_txt->printDialogueText(76, _okStrings[0]);
-	
+
 	restoreAfterDialogueSequence();
 
 	_screen->setFont(of);
@@ -1327,7 +1327,7 @@ void DarkMoonEngine::seq_dranDragonTransformation() {
 
 	initDialogueSequence();
 	gui_drawDialogueBox();
-	
+
 	static const char file[] = "DRANX";
 	drawSequenceBitmap(file, 0, 0, 0, 0);
 	_txt->printDialogueText(120, _moreStrings[0]);
@@ -1338,7 +1338,7 @@ void DarkMoonEngine::seq_dranDragonTransformation() {
 	delay(7 * _tickLength);
 	drawSequenceBitmap(file, 0, 20, 96, 0);
 	delay(18 * _tickLength);
-	
+
 	restoreAfterDialogueSequence();
 
 	_screen->setFont(of);
diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp
index a37ec9f674..cb9be43b07 100644
--- a/engines/kyra/sound_lol.cpp
+++ b/engines/kyra/sound_lol.cpp
@@ -198,7 +198,7 @@ void LoLEngine::snd_playSoundEffect(int track, int volume) {
 }
 
 bool LoLEngine::snd_processEnvironmentalSoundEffect(int soundId, int block) {
-	if (!LolEobBaseEngine::snd_processEnvironmentalSoundEffect(soundId, block))
+	if (!KyraRpgEngine::snd_processEnvironmentalSoundEffect(soundId, block))
 		return false;
 
 	if (block != _currentBlock) {
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 6d8776f3b0..9adf84d1ad 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+#ifdef ENABLE_EOB
 
 #include "kyra/eobcommon.h"
 #include "kyra/script_eob.h"
@@ -29,31 +29,10 @@
 
 #include "common/system.h"
 
-namespace Kyra {
-
-int LolEobBaseEngine::getBlockDistance(uint16 block1, uint16 block2) {
-	int b1x = block1 & 0x1f;
-	int b1y = block1 >> 5;
-	int b2x = block2 & 0x1f;
-	int b2y = block2 >> 5;
-
-	uint8 dy = ABS(b2y - b1y);
-	uint8 dx = ABS(b2x - b1x);
-
-	if (dx > dy)
-		SWAP(dx, dy);
-
-	return (dx >> 1) + dy;
-}
-
-} // namespace Kyra
-
-#endif
-#ifdef ENABLE_EOB
 
 namespace Kyra {
 
-void EobCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex) {	
+void EobCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex) {
 	_screen->loadShapeSetBitmap(filename, 3, 3);
 	const uint16 *enc = &_encodeMonsterShpTable[encodeTableIndex << 2];
 
diff --git a/engines/kyra/sprites_rpg.cpp b/engines/kyra/sprites_rpg.cpp
new file mode 100644
index 0000000000..0c4fcb09ab
--- /dev/null
+++ b/engines/kyra/sprites_rpg.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.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/kyra_rpg.h"
+
+namespace Kyra {
+
+int KyraRpgEngine::getBlockDistance(uint16 block1, uint16 block2) {
+	int b1x = block1 & 0x1f;
+	int b1y = block1 >> 5;
+	int b2x = block2 & 0x1f;
+	int b2y = block2 >> 5;
+
+	uint8 dy = ABS(b2y - b1y);
+	uint8 dx = ABS(b2x - b1x);
+
+	if (dx > dy)
+		SWAP(dx, dy);
+
+	return (dx >> 1) + dy;
+}
+
+} // namespace Kyra
+
+#endif
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 7433fbf126..faa2591163 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -22,23 +22,11 @@
  */
 
 #include "kyra/eob1.h"
-#include "kyra/eob2.h"
 #include "kyra/resource.h"
 
 
 namespace Kyra {
 
-
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-const uint16 *StaticResource::loadRawDataBe16(int id, int &entries) {
-	return (const uint16 *)getData(id, kLolRawDataBe16, entries);
-}
-
-const uint32 *StaticResource::loadRawDataBe32(int id, int &entries) {
-	return (const uint32 *)getData(id, kLolRawDataBe32, entries);
-}
-#endif // defined(ENABLE_EOB) || defined(ENABLE_LOL)
-
 #ifdef ENABLE_EOB
 const EobSequenceStep *StaticResource::loadEob2SeqData(int id, int &entries) {
 	return (const EobSequenceStep *)getData(id, kEob2SequenceData, entries);
@@ -51,35 +39,7 @@ const EobShapeDef *StaticResource::loadEob2ShapeData(int id, int &entries) {
 const EobCharacter *StaticResource::loadEobNpcData(int id, int &entries) {
 	return (const EobCharacter *)getData(id, kEobNpcData, entries);
 }
-#endif // ENABLE_EOB
-
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-bool StaticResource::loadRawDataBe16(Common::SeekableReadStream &stream, void *&ptr, int &size) {
-	size = stream.size() >> 1;
-
-	uint16 *r = new uint16[size];
-
-	for (int i = 0; i < size; i++)
-		r[i] = stream.readUint16BE();
-
-	ptr = r;
-	return true;
-}
-
-bool StaticResource::loadRawDataBe32(Common::SeekableReadStream &stream, void *&ptr, int &size) {
-	size = stream.size() >> 2;
-
-	uint32 *r = new uint32[size];
-
-	for (int i = 0; i < size; i++)
-		r[i] = stream.readUint32BE();
-
-	ptr = r;
-	return true;
-}
-#endif // defined(ENABLE_EOB) || defined(ENABLE_LOL)
 
-#ifdef ENABLE_EOB
 bool StaticResource::loadEob2SeqData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
 	size = stream.size() / 11;
 
@@ -165,25 +125,7 @@ bool StaticResource::loadEobNpcData(Common::SeekableReadStream &stream, void *&p
 	ptr = e;
 	return true;
 }
-#endif // ENABLE_EOB
 
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-void StaticResource::freeRawDataBe16(void *&ptr, int &size) {
-	uint16 *data = (uint16 *)ptr;
-	delete[] data;
-	ptr = 0;
-	size = 0;
-}
-
-void StaticResource::freeRawDataBe32(void *&ptr, int &size) {
-	uint32 *data = (uint32 *)ptr;
-	delete[] data;
-	ptr = 0;
-	size = 0;
-}
-#endif // defined(ENABLE_EOB) || defined(ENABLE_LOL)
-
-#ifdef ENABLE_EOB
 void StaticResource::freeEob2SeqData(void *&ptr, int &size) {
 	EobSequenceStep *d = (EobSequenceStep *)ptr;
 	delete[] d;
@@ -238,29 +180,6 @@ const ScreenDim Screen_Eob::_screenDimTable[] = {
 };
 
 const int Screen_Eob::_screenDimTableCount = ARRAYSIZE(Screen_Eob::_screenDimTable);
-#endif
-
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-const uint8 LolEobBaseEngine::_dropItemDirIndex[] = { 0, 1, 2, 3, 1, 3, 0, 2, 3, 2, 1, 0, 2, 0, 3, 1 };
-
-void LolEobBaseEngine::initStaticResource() {
-	int temp;
-	_dscShapeX = (const int16 *)_staticres->loadRawDataBe16(kLolEobCommonDscX, temp);
-	_dscShapeIndex = (const int8 *)_staticres->loadRawData(kLolEobCommonDscShapeIndex, temp);
-	_dscTileIndex = _staticres->loadRawData(kLolEobCommonDscTileIndex, temp);
-	_dscDim1 = (const int8 *)_staticres->loadRawData(kLolEobCommonDscDimData1, temp);
-	_dscDim2 = (const int8 *)_staticres->loadRawData(kLolEobCommonDscDimData2, temp);
-	_dscUnk2 = _staticres->loadRawData(kLolEobCommonDscUnk2, temp);
-	_dscBlockMap = _staticres->loadRawData(kLolEobCommonDscBlockMap, temp);
-	_dscBlockIndex = (const int8 *)_staticres->loadRawData(kLolEobCommonDscBlockIndex, temp);
-	_dscDimMap = _staticres->loadRawData(kLolEobCommonDscDimMap, temp);
-	_dscDoorShpIndex = _staticres->loadRawData(kLolEobCommonDscDoorShapeIndex, _dscDoorShpIndexSize);
-	_dscDoorY2 = _staticres->loadRawData(kLolEobCommonDscDoorY2, temp);
-	_moreStrings = _staticres->loadStrings(kLolEobCommonMoreStrings, temp);
-}
-
-#endif // (ENABLE_EOB || ENABLE_LOL)
-#ifdef ENABLE_EOB
 
 const uint8 EobCoreEngine::_hpIncrPerLevel[] = { 10, 4, 8, 6, 10, 10, 9, 10, 9, 10, 9, 9, 3, 1, 2, 2, 3, 3 };
 
@@ -373,7 +292,7 @@ void EobCoreEngine::initStaticResource() {
 	_potionStrings = _staticres->loadStrings(kEobBasePotionStrings, temp);
 	_wandStrings = _staticres->loadStrings(kEobBaseWandStrings, temp);
 	_itemMisuseStrings = _staticres->loadStrings(kEobBaseItemMisuseStrings, temp);
-	
+
 	_takenStrings = _staticres->loadStrings(kEobBaseTakenStrings, temp);
 	_potionEffectStrings = _staticres->loadStrings(kEobBasePotionEffectStrings, temp);
 
@@ -559,7 +478,7 @@ void EobCoreEngine::initStaticResource() {
 		" Spielstände müssen\r einen Namen haben!",
 		0
 	};
-	
+
 	_saveLoadStrings = saveLoadStrings[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
 	_errorSlotEmptyString = errorSlotEmptyString[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
 	_errorSlotNoNameString = errorSlotNoNameString[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
@@ -587,7 +506,7 @@ void EobCoreEngine::initButtonData() {
 		{ 0, 0, 0x1100, 288, 62, 31, 33, 3 },
 		{ 368, 0, 0x1000, 184, 2, 63, 8, 0 },
 		{ 369, 0, 0x1000, 256, 2, 63, 8, 1 },
-		{ 370, 0, 0x1000, 184, 54, 63, 8, 2 },		
+		{ 370, 0, 0x1000, 184, 54, 63, 8, 2 },
 		{ 371, 0, 0x1000, 256, 54, 63, 8, 3 },
 		{ 0, 0, 0x1100, 230, 116, 16, 16, 0 },
 		{ 0, 0, 0x1100, 278, 116, 16, 16, 1 },
@@ -597,7 +516,7 @@ void EobCoreEngine::initButtonData() {
 		{ 0, 0, 0x1100, 199, 58, 16, 16, 5 },
 		{ 0, 0, 0x1100, 181, 76, 16, 16, 6 },
 		{ 0, 0, 0x1100, 199, 76, 16, 16, 7 },
-		{ 0, 0, 0x1100, 181, 94, 16, 16, 8 },		
+		{ 0, 0, 0x1100, 181, 94, 16, 16, 8 },
 		{ 0, 0, 0x1100, 199, 94, 16, 16, 9 },
 		{ 0, 0, 0x1100, 181, 112, 16, 16, 10 },
 		{ 0, 0, 0x1100, 199, 112, 16, 16, 11 },
@@ -785,7 +704,7 @@ void EobCoreEngine::initMenus() {
 	delete[] _menuDefs;
 	_menuDefs = new EobMenuDef[ARRAYSIZE(menuDefs)];
 	memcpy(_menuDefs, menuDefs, sizeof(menuDefs));
-	
+
 	if (_flags.gameID == GI_EOB1) {
 		// assign EOB 1 style memorize/pray menu
 		_menuDefs[4].numButtons = 8;
@@ -1061,7 +980,7 @@ void EobCoreEngine::initSpells() {
 	ec2(monster_fleshToStone);
 
 	_spells = new EobSpell[_numSpells];
-	memset(_spells, 0, _numSpells * sizeof(EobSpell));	
+	memset(_spells, 0, _numSpells * sizeof(EobSpell));
 
 	for (int i = 0, n = 0; i < _numSpells; i++, n++) {
 		EobSpell *s = &_spells[i];
@@ -1103,7 +1022,7 @@ void EobEngine::initStaticResource() {
 	int temp;
 	_mainMenuStrings = _staticres->loadStrings(kEob1MainMenuStrings, temp);
 	_finBonusStrings = _staticres->loadStrings(kEob1BonusStrings, temp);
-		
+
 	_introFilesOpening = _staticres->loadStrings(kEob1IntroFilesOpening, temp);
 	_introFilesTower = _staticres->loadStrings(kEob1IntroFilesTower, temp);
 	_introFilesOrb = _staticres->loadStrings(kEob1IntroFilesOrb, temp);
diff --git a/engines/kyra/staticres_rpg.cpp b/engines/kyra/staticres_rpg.cpp
new file mode 100644
index 0000000000..49a55fc9b8
--- /dev/null
+++ b/engines/kyra/staticres_rpg.cpp
@@ -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.
+ *
+ *
+ */
+
+#include "kyra/resource.h"
+
+
+namespace Kyra {
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+const uint16 *StaticResource::loadRawDataBe16(int id, int &entries) {
+	return (const uint16 *)getData(id, kLolRawDataBe16, entries);
+}
+
+const uint32 *StaticResource::loadRawDataBe32(int id, int &entries) {
+	return (const uint32 *)getData(id, kLolRawDataBe32, entries);
+}
+
+bool StaticResource::loadRawDataBe16(Common::SeekableReadStream &stream, void *&ptr, int &size) {
+	size = stream.size() >> 1;
+
+	uint16 *r = new uint16[size];
+
+	for (int i = 0; i < size; i++)
+		r[i] = stream.readUint16BE();
+
+	ptr = r;
+	return true;
+}
+
+bool StaticResource::loadRawDataBe32(Common::SeekableReadStream &stream, void *&ptr, int &size) {
+	size = stream.size() >> 2;
+
+	uint32 *r = new uint32[size];
+
+	for (int i = 0; i < size; i++)
+		r[i] = stream.readUint32BE();
+
+	ptr = r;
+	return true;
+}
+
+void StaticResource::freeRawDataBe16(void *&ptr, int &size) {
+	uint16 *data = (uint16 *)ptr;
+	delete[] data;
+	ptr = 0;
+	size = 0;
+}
+
+void StaticResource::freeRawDataBe32(void *&ptr, int &size) {
+	uint32 *data = (uint32 *)ptr;
+	delete[] data;
+	ptr = 0;
+	size = 0;
+}
+
+const uint8 KyraRpgEngine::_dropItemDirIndex[] = { 0, 1, 2, 3, 1, 3, 0, 2, 3, 2, 1, 0, 2, 0, 3, 1 };
+
+void KyraRpgEngine::initStaticResource() {
+	int temp;
+	_dscShapeX = (const int16 *)_staticres->loadRawDataBe16(kLolEobCommonDscX, temp);
+	_dscShapeIndex = (const int8 *)_staticres->loadRawData(kLolEobCommonDscShapeIndex, temp);
+	_dscTileIndex = _staticres->loadRawData(kLolEobCommonDscTileIndex, temp);
+	_dscDim1 = (const int8 *)_staticres->loadRawData(kLolEobCommonDscDimData1, temp);
+	_dscDim2 = (const int8 *)_staticres->loadRawData(kLolEobCommonDscDimData2, temp);
+	_dscUnk2 = _staticres->loadRawData(kLolEobCommonDscUnk2, temp);
+	_dscBlockMap = _staticres->loadRawData(kLolEobCommonDscBlockMap, temp);
+	_dscBlockIndex = (const int8 *)_staticres->loadRawData(kLolEobCommonDscBlockIndex, temp);
+	_dscDimMap = _staticres->loadRawData(kLolEobCommonDscDimMap, temp);
+	_dscDoorShpIndex = _staticres->loadRawData(kLolEobCommonDscDoorShapeIndex, _dscDoorShpIndexSize);
+	_dscDoorY2 = _staticres->loadRawData(kLolEobCommonDscDoorY2, temp);
+	_moreStrings = _staticres->loadStrings(kLolEobCommonMoreStrings, temp);
+}
+
+#endif // (ENABLE_EOB || ENABLE_LOL)
+
+} // End of namespace Kyra
+
diff --git a/engines/kyra/text_eob.cpp b/engines/kyra/text_eob.cpp
deleted file mode 100644
index 1c0c7e5d41..0000000000
--- a/engines/kyra/text_eob.cpp
+++ /dev/null
@@ -1,688 +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.
- *
- *
- */
-
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-
-#include "kyra/loleobbase.h"
-#include "kyra/screen.h"
-#include "kyra/timer.h"
-
-#include "common/system.h"
-
-namespace Kyra {
-
-enum {
-	kEobTextBufferSize = 2048
-};
-
-TextDisplayer_Eob::TextDisplayer_Eob(LolEobBaseEngine *engine, Screen *sScreen) : _vm(engine), _screen(sScreen),
-	_lineCount(0), _printFlag(false), _lineWidth(0), _numCharsTotal(0), _allowPageBreak(true),
-	_numCharsLeft(0), _numCharsPrinted(0), _sjisLineBreakFlag(false), _waitButtonMode(1) {
-
-	_dialogueBuffer = new char[kEobTextBufferSize];
-	memset(_dialogueBuffer, 0, kEobTextBufferSize);
-
-	_currentLine = new char[85];
-	memset(_currentLine, 0, 85);
-
-	_textDimData = new TextDimData[_screen->screenDimTableCount()];
-
-	for (int i = 0; i < _screen->screenDimTableCount(); i++){
-		const ScreenDim *d = _screen->getScreenDim(i);
-		_textDimData[i].color1 = d->unk8;
-		_textDimData[i].color2 = d->unkA;
-		_textDimData[i].line = d->unkC;
-		_textDimData[i].column = d->unkE;
-	}
-
-	_table1 = new char[128];
-	memset(_table1, 0, 128);
-	_table2 = new char[16];
-	memset(_table2, 0, 16);
-
-	_waitButtonSpace = 0;
-}
-
-TextDisplayer_Eob::~TextDisplayer_Eob() {
-	delete[] _dialogueBuffer;
-	delete[] _currentLine;
-	delete[] _textDimData;
-	delete[] _table1;
-	delete[] _table2;
-}
-
-void TextDisplayer_Eob::setupField(int dim, bool mode) {
-	setPageBreakFlag();
-
-	_textDimData[dim].color2 = _vm->_bkgColor_1;
-	_screen->setScreenDim(dim);
-
-	if (mode)
-		clearCurDim();
-	else
-		resetDimTextPositions(dim);
-}
-
-void TextDisplayer_Eob::resetDimTextPositions(int dim) {
-	_textDimData[dim].column = 0;
-	_textDimData[dim].line = 0;
-}
-
-void TextDisplayer_Eob::resetPageBreakString() {
-	if (vm()->_moreStrings)
-		strcpy(_pageBreakString, vm()->_moreStrings[0]);
-}
-
-void TextDisplayer_Eob::setPageBreakFlag() {
-	_allowPageBreak = true;
-	_lineCount = 0;
-}
-
-void TextDisplayer_Eob::removePageBreakFlag() {
-	_allowPageBreak = false;
-}
-
-void TextDisplayer_Eob::displayText(char *str, ...) {
-	const bool isPc98 = (_vm->gameFlags().platform == Common::kPlatformPC98);
-
-	_printFlag = false;
-
-	_lineWidth = 0;
-	_numCharsLeft = 0;
-	_numCharsPrinted = 0;
-
-	_tempString1 = str;
-	_tempString2 = 0;
-
-	_currentLine[0] = 0;
-
-	memset(_ctrl, 0, 3);
-
-	char c = parseCommand();
-
-	va_list args;
-	va_start(args, str);
-
-	const ScreenDim *sd = _screen->_curDim;
-	int sdx = _screen->curDimIndex();
-
-	bool pc98PrintFlag = (isPc98 && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
-	uint16 charsPerLine = (sd->w << 3) / (_screen->getFontWidth() + _screen->_charWidth);
-
-	while (c) {
-		char a = tolower(_ctrl[1]);
-
-		if (!_tempString2 && c == '%') {
-			if (a == 'd') {
-				strcpy(_scriptParaString, Common::String::format("%d", va_arg(args, int)).c_str());
-				_tempString2 = _scriptParaString;
-			} else if (a == 's') {
-				_tempString2 = va_arg(args, char *);
-			} else {
-				break;
-			}
-
-			_ctrl[0] = _ctrl[2];
-			_ctrl[2] = _ctrl[1] = 0;
-			c = parseCommand();
-		}
-
-		if (isPc98) {
-			uint8 cu = (uint8) c;
-			if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0)) {
-				_currentLine[_numCharsLeft++] = c;
-				_currentLine[_numCharsLeft++] = parseCommand();
-				_currentLine[_numCharsLeft] = '\0';
-				_lineWidth += 8;
-				if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
-					printLine(_currentLine);
-				c = parseCommand();
-				continue;
-			}
-		}
-
-		uint16 dv = _textDimData[sdx].column / (_screen->getFontWidth() + _screen->_charWidth);
-
-		switch (c - 1) {
-		case 0:
-			printLine(_currentLine);
-			textPageBreak();
-			_numCharsPrinted = 0;
-			break;
-
-		case 1:
-			printLine(_currentLine);
-			_textDimData[sdx].color2 = parseCommand();
-			break;
-
-		case 5:
-			printLine(_currentLine);
-			_textDimData[sdx].color1 = parseCommand();
-			break;
-
-		case 8:
-			printLine(_currentLine);
-			dv = _textDimData[sdx].column / (_screen->getFontWidth() + _screen->_charWidth);
-			dv = ((dv + 8) & 0xfff8) - 1;
-			if (dv >= charsPerLine)
-				dv = 0;
-			_textDimData[sdx].column = (_screen->getFontWidth() + _screen->_charWidth) * dv;
-			break;
-
-		case 11:
-			_sjisLineBreakFlag=_sjisLineBreakFlag;
-			// TODO (UNUSED)
-			break;
-
-		case 12:
-			if (isPc98)
-				_sjisLineBreakFlag = true;
-			printLine(_currentLine);
-			_sjisLineBreakFlag = false;
-			_lineCount++;
-			_textDimData[sdx].column = 0;
-			_textDimData[sdx].line++;
-			break;
-
-		case 18:
-			_sjisLineBreakFlag=_sjisLineBreakFlag;
-			// TODO (UNUSED)
-			break;
-
-		case 23:
-			_sjisLineBreakFlag=_sjisLineBreakFlag;
-			// TODO (UNUSED)
-			break;
-
-		case 24:
-			_sjisLineBreakFlag=_sjisLineBreakFlag;
-			// TODO (UNUSED)
-			break;
-
-		case 26:
-			_sjisLineBreakFlag=_sjisLineBreakFlag;
-			// TODO (UNUSED)
-			break;
-
-		case 28:
-			_sjisLineBreakFlag=_sjisLineBreakFlag;
-			// TODO (UNUSED)
-			break;
-
-		default:
-			if (_vm->game() == GI_LOL || c > 30) {
-				_lineWidth += (pc98PrintFlag ? 4 : _screen->getCharWidth((uint8)c));
-				_currentLine[_numCharsLeft++] = c;
-				_currentLine[_numCharsLeft] = 0;
-
-				if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
-					printLine(_currentLine);
-			}
-		}
-
-		c = parseCommand();
-	}
-
-	va_end(args);
-
-	if (_numCharsLeft)
-		printLine(_currentLine);
-}
-
-char TextDisplayer_Eob::parseCommand() {
-	if (!_ctrl[1])
-		readNextPara();
-
-	char res = _ctrl[1];
-	_ctrl[1] = _ctrl[2];
-	_ctrl[2] = 0;
-
-	if (!_ctrl[1])
-		readNextPara();
-
-	return res;
-}
-
-void TextDisplayer_Eob::readNextPara() {
-	char c = 0;
-	char d = 0;
-
-	if (_tempString2) {
-		if (*_tempString2) {
-			d = *_tempString2++;
-		} else {
-			_tempString2 = 0;
-			d = _ctrl[0];
-		}
-	}
-
-	if (!d && _tempString1) {
-		if (*_tempString1)
-			d = *_tempString1++;
-		else
-			_tempString1 = 0;
-	}
-
-	if ((_vm->game() != GI_LOL) && (d & 0x80)) {		
-		d &= 0x7f;
-		c = d & 7;
-		d = (d & 0x78) >> 3;
-		uint8 l = d;
-		c = _table1[(l << 3) + c];
-		d = _table2[l];
-	}
-
-	_ctrl[1] = d;
-	_ctrl[2] = c;
-}
-
-void TextDisplayer_Eob::printLine(char *str) {
-	const bool isPc98 = (_vm->gameFlags().platform == Common::kPlatformPC98);
-	const ScreenDim *sd = _screen->_curDim;
-	int sdx = _screen->curDimIndex();
-	bool pc98PrintFlag = (isPc98 && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
-
-	int fh = (_screen->_currentFont == Screen::FID_SJIS_FNT) ? 9 : (_screen->getFontHeight() + _screen->_charOffset);
-	int lines = (sd->h - _screen->_charOffset) / fh;
-
-	while (_textDimData[sdx].line >= lines) {
-		if ((lines - _waitButtonSpace) <= _lineCount && _allowPageBreak) {
-			_lineCount = 0;
-			textPageBreak();
-			_numCharsPrinted = 0;
-		}
-
-		int h1 = ((sd->h / fh) - 1) * fh;
-		int h2 = sd->h - fh;
-
-		if (h2)
-			_screen->copyRegion(sd->sx << 3, sd->sy + fh, sd->sx << 3, sd->sy, sd->w << 3, h2, _screen->_curPage, _screen->_curPage, Screen::CR_NO_P_CHECK);
-
-		_screen->fillRect(sd->sx << 3, sd->sy + h1, ((sd->sx + sd->w) << 3) - 1, sd->sy + sd->h - 1, _textDimData[sdx].color2);
-		if (_textDimData[sdx].line)
-			_textDimData[sdx].line--;
-	}
-
-	int x1 = (sd->sx << 3) + _textDimData[sdx].column;
-	int y = sd->sy + (pc98PrintFlag ? (_textDimData[sdx].line << 3) : (fh * _textDimData[sdx].line));
-	int w = sd->w << 3;
-	int lw = _lineWidth;
-	int s = _numCharsLeft;
-	char c = 0;
-
-	if (pc98PrintFlag) {
-		bool ct = true;
-
-		if ((lw + _textDimData[sdx].column) > w) {
-			if ((lines - 1 - (_waitButtonSpace << 1)) <= _lineCount)
-				// cut off line to leave space for "MORE" button
-				w -= vm()->_waitButtonReverveW;
-		} else {
-			if (!_sjisLineBreakFlag || (_lineCount + 1 < lines - 1))
-				ct = false;
-			else
-				// cut off line to leave space for "MORE" button
-				w -= vm()->_waitButtonReverveW;
-		}
-
-		if (ct) {
-			w -= _textDimData[sdx].column;
-
-			int n2 = 0;
-			int n1 = (w / 4) - 1;
-
-			while (n2 < n1 && n2 < s) {
-				c = str[n2];
-				uint8 cu = (uint8) c;
-				if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0))
-					n2++;
-				n2++;
-			}
-			s = n2;
-		}
-	} else {
-		if ((lw + _textDimData[sdx].column) > w) {
-			if ((lines - 1) <= _lineCount && _allowPageBreak)
-				// cut off line to leave space for "MORE" button
-				w -= vm()->_waitButtonReverveW;
-
-			w -= _textDimData[sdx].column;
-
-			int n2 = 0;
-			int n1 = s - 1;
-
-			while (n1 > 0) {
-				//cut off line after last space
-				c = str[n1];
-
-				lw -= _screen->getCharWidth((uint8)c);
-
-				if (!n2 && lw <= w)
-					n2 = n1;
-
-				if (n2 && c == ' ') {
-					s = n1;
-					_printFlag = false;
-					break;
-				}
-				n1--;
-			}
-
-			if (!n1) {
-				if (_textDimData[sdx].column && !_printFlag) {
-					s = lw = 0;
-					_printFlag = true;
-				} else {
-					s = n2;
-				}
-			}
-		}
-	}
-
-	c = str[s];
-	str[s] = 0;
-
-	uint8 col = _textDimData[sdx].color1;
-	if (isPc98 && (sdx == 2 || sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) {
-		switch (_textDimData[sdx].color1) {
-		case 0x88:
-			col = 0x41;
-			break;
-		case 0x55:
-			col = 0x81;
-			break;
-		case 0xaa:
-			col = 0x21;
-			break;
-		case 0x99:
-			col = 0xa1;
-			break;
-		case 0x33:
-			col = 0xe1;
-			break;
-		case 0x18:
-			col = 0x61;
-			break;
-		default:
-			col = 1;
-			break;
-		}
-		_screen->printText(str, x1 & ~3, (y + 8) & ~7, col, 0);
-	} else {
-		_screen->printText(str, x1, y, col, _textDimData[sdx].color2);
-	}
-
-	_textDimData[sdx].column += lw;
-	_numCharsPrinted += strlen(str);
-
-	str[s] = c;
-
-	if (c == ' ')
-		s++;
-
-	if (str[s] == ' ')
-		s++;
-
-	uint32 len = strlen(&str[s]);
-	for (uint32 i = 0; i < len; i++)
-		str[i] = str[s + i];
-	str[len] = 0;
-
-	_numCharsLeft = strlen(str);
-	_lineWidth = pc98PrintFlag ? (_numCharsLeft << 2) : _screen->getTextWidth(str);
-
-	if (!_numCharsLeft && _textDimData[sdx].column < (sd->w << 3))
-		return;
-
-	_textDimData[sdx].column = 0;
-	_textDimData[sdx].line++;
-	_lineCount++;
-
-	printLine(str);
-}
-
-void TextDisplayer_Eob::printDialogueText(int stringId, const char *pageBreakString) {
-	const char * str = (const char *)(screen()->getCPagePtr(5) + READ_LE_UINT16(&screen()->getCPagePtr(5)[(stringId - 1) << 1]));
-	assert (strlen(str) < kEobTextBufferSize);
-	Common::strlcpy(_dialogueBuffer, str, kEobTextBufferSize);
-	
-	displayText(_dialogueBuffer);
-
-	if (pageBreakString) {
-		if (pageBreakString[0]) {
-			strcpy(_pageBreakString, pageBreakString);
-			displayWaitButton();
-			resetPageBreakString();
-		}
-	}
-}
-
-void TextDisplayer_Eob::printDialogueText(const char *str, bool wait) {
-	assert (strlen(str) < kEobTextBufferSize);
-	Common::strlcpy(_dialogueBuffer, str, kEobTextBufferSize);
-
-	strcpy(_dialogueBuffer, str);
-	displayText(_dialogueBuffer);
-	if (wait)
-		displayWaitButton();
-}
-
-void TextDisplayer_Eob::printMessage(const char *str, int textColor, ...) {
-	int tc = _textDimData[screen()->curDimIndex()].color1;
-
-	if (textColor != -1)
-		_textDimData[screen()->curDimIndex()].color1 = textColor;
-
-	va_list args;
-	va_start(args, textColor);
-	vsnprintf(_dialogueBuffer, kEobTextBufferSize - 1, str, args);
-	va_end(args);
-
-	displayText(_dialogueBuffer);
-
-	if (vm()->game() != GI_EOB1)
-		_textDimData[screen()->curDimIndex()].color1 = tc;
-
-	if (!screen()->_curPage)
-		screen()->updateScreen();
-}
-
-int TextDisplayer_Eob::clearDim(int dim) {
-	int res = screen()->curDimIndex();
-	screen()->setScreenDim(dim);
-	_textDimData[dim].color1 = screen()->_curDim->unk8;
-	_textDimData[dim].color2 = vm()->game() == GI_LOL ? screen()->_curDim->unkA : vm()->_bkgColor_1;
-	clearCurDim();
-	return res;
-}
-
-void TextDisplayer_Eob::clearCurDim() {
-	int d = screen()->curDimIndex();
-	const ScreenDim *tmp = screen()->getScreenDim(d);
-	if (vm()->gameFlags().use16ColorMode) {
-		screen()->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 2, (tmp->sy + tmp->h) - 2, _textDimData[d].color2);
-	} else
-		screen()->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 1, (tmp->sy + tmp->h) - 1, _textDimData[d].color2);
-
-	_lineCount = 0;
-	_textDimData[d].column = _textDimData[d].line = 0;
-}
-
-void TextDisplayer_Eob::textPageBreak() {
-	if (vm()->game() != GI_LOL)
-		SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
-
-	int cp = _screen->setCurPage(0);
-	Screen::FontId cf = screen()->setFont(vm()->gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
-
-	if (vm()->game() == GI_LOL)
-		vm()->_timer->pauseSingleTimer(11, true);
-
-	vm()->_fadeText = false;
-	int resetPortraitAfterSpeechAnim = 0;
-	int updatePortraitSpeechAnimDuration = 0;
-
-	if (vm()->_updateCharNum != -1)  {
-		resetPortraitAfterSpeechAnim = vm()->_resetPortraitAfterSpeechAnim;
-		vm()->_resetPortraitAfterSpeechAnim = 0;
-		updatePortraitSpeechAnimDuration = vm()->_updatePortraitSpeechAnimDuration;
-		if (vm()->_updatePortraitSpeechAnimDuration > 36)
-			vm()->_updatePortraitSpeechAnimDuration = 36;
-	}
-
-	uint32 speechPartTime = 0;
-	if (vm()->speechEnabled() && vm()->_activeVoiceFileTotalTime && _numCharsTotal)
-		speechPartTime = vm()->_system->getMillis() + ((_numCharsPrinted * vm()->_activeVoiceFileTotalTime) / _numCharsTotal);
-
-	const ScreenDim *dim = screen()->getScreenDim(screen()->curDimIndex());
-
-	int x = ((dim->sx + dim->w) << 3) - (_vm->_dialogueButtonW + 3);
-	int y = 0;
-	int w = vm()->_dialogueButtonW;
-
-	if (vm()->game() == GI_LOL) {
-		if (vm()->_needSceneRestore && (vm()->_updateFlags & 2)) {
-			if (vm()->_currentControlMode || !(vm()->_updateFlags & 2)) {
-				y = dim->sy + dim->h - 5;
-			} else {
-				x += 6;
-				y = dim->sy + dim->h - 2;
-			}
-		} else {
-			y = dim->sy + dim->h - 10;
-		}
-	} else {
-		y = vm()->_waitButtonPresY[_waitButtonMode];
-		x = vm()->_waitButtonPresX[_waitButtonMode];
-		w = vm()->_waitButtonPresW[_waitButtonMode];
-	}
-
-	if (vm()->gameFlags().use16ColorMode) {
-		vm()->gui_drawBox(x + 8, (y & ~7) - 1, 66, 10, 0xee, 0xcc, -1);
-		screen()->printText(_pageBreakString, (x + 37 - (strlen(_pageBreakString) << 1) + 4) & ~3, (y + 2) & ~7, 0xc1, 0);
-	} else {
-		vm()->gui_drawBox(x, y, w, vm()->_dialogueButtonH, vm()->_color1_1, vm()->_color2_1, vm()->_bkgColor_1);
-		screen()->printText(_pageBreakString, x + (w >> 1) - (vm()->screen()->getTextWidth(_pageBreakString) >> 1), y + 2, vm()->_dialogueButtonLabelCol1, 0);
-	}
-
-	vm()->removeInputTop();
-
-	bool loop = true;
-	bool target = false;
-
-	do {
-		int inputFlag = vm()->checkInput(0, false) & 0xFF;
-		vm()->removeInputTop();
-
-		while (!inputFlag && !_vm->shouldQuit()) {
-			vm()->update();
-
-			if (vm()->speechEnabled()) {
-				if (((vm()->_system->getMillis() > speechPartTime) || (vm()->snd_updateCharacterSpeech() != 2)) && speechPartTime) {
-					loop = false;
-					inputFlag = vm()->_keyMap[Common::KEYCODE_RETURN];
-					break;
-				}
-			}
-
-			inputFlag = vm()->checkInput(0, false) & 0xFF;
-			vm()->removeInputTop();
-		}
-
-		vm()->gui_notifyButtonListChanged();
-
-		if (inputFlag == vm()->_keyMap[Common::KEYCODE_SPACE] || inputFlag == vm()->_keyMap[Common::KEYCODE_RETURN]) {
-			loop = false;
-		} else if (inputFlag == 199 || inputFlag == 201) {
-			if (vm()->posWithinRect(vm()->_mouseX, vm()->_mouseY, x, y, x + w, y + 9)) {
-				if (_vm->game() == GI_LOL)
-					target = true;
-				else
-					loop = false;
-			}
-		} else if (inputFlag == 200 || inputFlag == 202) {
-			if (target)
-				loop = false;
-		}
-	} while (loop && !_vm->shouldQuit());
-
-	if (vm()->gameFlags().use16ColorMode)
-		screen()->fillRect(x + 8, y, x + 57, y + 9, _textDimData[screen()->curDimIndex()].color2);
-	else
-		screen()->fillRect(x, y, x + w - 1, y + 8, _textDimData[screen()->curDimIndex()].color2);
-
-	clearCurDim();
-	_screen->updateScreen();
-
-	if (vm()->game() == GI_LOL)
-		vm()->_timer->pauseSingleTimer(11, false);
-
-	if (vm()->_updateCharNum != -1) {
-		vm()->_resetPortraitAfterSpeechAnim = resetPortraitAfterSpeechAnim;
-		if (updatePortraitSpeechAnimDuration > 36)
-			updatePortraitSpeechAnimDuration -= 36;
-		else
-			updatePortraitSpeechAnimDuration >>= 1;
-
-		vm()->_updatePortraitSpeechAnimDuration = updatePortraitSpeechAnimDuration;
-	}
-
-	screen()->setFont(cf);
-	screen()->setCurPage(cp);
-
-	if (vm()->game() != GI_LOL)
-		SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
-
-	vm()->removeInputTop();
-}
-
-void TextDisplayer_Eob::displayWaitButton() {
-	vm()->_dialogueNumButtons = 1;
-	vm()->_dialogueButtonString[0] = _pageBreakString;
-	vm()->_dialogueButtonString[1] = 0;
-	vm()->_dialogueButtonString[2] = 0;
-	vm()->_dialogueHighlightedButton = 0;
-
-	vm()->_dialogueButtonPosX = &vm()->_waitButtonPresX[_waitButtonMode];
-	vm()->_dialogueButtonPosY = &vm()->_waitButtonPresY[_waitButtonMode];
-	vm()->_dialogueButtonW = vm()->_waitButtonPresW[_waitButtonMode];
-	vm()->_dialogueButtonYoffs = 0;
-
-	SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
-	vm()->drawDialogueButtons();
-
-	if (!vm()->shouldQuit())
-		vm()->removeInputTop();
-
-	while (!vm()->processDialogue() && !vm()->shouldQuit()) {}
-	
-	_screen->fillRect(vm()->_dialogueButtonPosX[0], vm()->_dialogueButtonPosY[0], vm()->_dialogueButtonPosX[0] + vm()->_dialogueButtonW - 1, vm()->_dialogueButtonPosY[0] + vm()->_dialogueButtonH - 1, vm()->_bkgColor_1);
-	_screen->updateScreen();
-	vm()->_dialogueButtonW = 95;
-	SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
-	clearCurDim();
-}
-
-} // End of namespace Kyra
-
-#endif // (ENABLE_EOB || ENABLE_LOL)
diff --git a/engines/kyra/text_eob.h b/engines/kyra/text_eob.h
deleted file mode 100644
index 9409ac43f0..0000000000
--- a/engines/kyra/text_eob.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are to numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-
-#ifndef KYRA_TEXT_EOB_H
-#define KYRA_TEXT_EOB_H
-
-#include "common/scummsys.h"
-
-namespace Kyra {
-
-class Screen;
-class LolEobBaseEngine;
-
-class TextDisplayer_Eob {
-public:
-	TextDisplayer_Eob(LolEobBaseEngine *engine, Screen *sScreen);
-	virtual ~TextDisplayer_Eob();
-
-	virtual void setupField(int dim, bool mode);
-
-	void printDialogueText(int stringId, const char *pageBreakString);
-	void printDialogueText(const char *str, bool wait = false);
-	void printMessage(const char *str, int textColor = -1, ...);
-
-	int clearDim(int dim);
-	void clearCurDim();
-
-	void resetDimTextPositions(int dim);
-	void resetPageBreakString();
-	void setPageBreakFlag();
-	void removePageBreakFlag();
-
-	void allowPageBreak(bool mode) { _allowPageBreak = mode; }
-	void setWaitButtonMode(int mode) { _waitButtonMode = mode; }
-	int lineCount() { return _lineCount; }
-
-protected:
-	virtual LolEobBaseEngine *vm() { return _vm; }
-	virtual Screen *screen() { return _screen; }
-
-	void displayText(char *str, ...);
-	char parseCommand();
-	void readNextPara();
-	void printLine(char *str);
-	virtual void textPageBreak();
-	void displayWaitButton();
-
-	char *_dialogueBuffer;
-
-	char *_tempString1;
-	char *_tempString2;
-	char *_currentLine;
-	char _ctrl[3];
-
-	uint16 _lineWidth;
-	uint32 _numCharsTotal;
-	uint32 _numCharsLeft;
-	uint32 _numCharsPrinted;
-
-	bool _printFlag;
-	bool _sjisLineBreakFlag;
-
-	char _pageBreakString[20];
-	char _scriptParaString[11];
-	int _lineCount;
-
-	bool _allowPageBreak;
-	int _waitButtonSpace;
-	int _waitButtonMode;
-
-	static const char _pageBreakDefault[3][5];
-
-	struct TextDimData {
-		uint8 color1;
-		uint8 color2;
-		uint16 column;
-		uint8 line;
-	};
-
-	TextDimData *_textDimData;
-
-private:
-	LolEobBaseEngine *_vm;
-	Screen *_screen;
-
-	char *_table1;
-	char *_table2;
-};
-
-} // End of namespace Kyra
-
-#endif
-
-#endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp
index da1efa37fe..d07956b3ff 100644
--- a/engines/kyra/text_lol.cpp
+++ b/engines/kyra/text_lol.cpp
@@ -32,7 +32,7 @@
 
 namespace Kyra {
 
-TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *engine, Screen_LoL *screenLoL) : TextDisplayer_Eob(engine, engine->screen()),
+TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *engine, Screen_LoL *screenLoL) : TextDisplayer_rpg(engine, engine->screen()),
 	_vm(engine), _screen(screenLoL), _scriptTextParameter(0) {
 
 	memset(_stringParameters, 0, 15 * sizeof(char *));
@@ -333,7 +333,7 @@ void TextDisplayer_LoL::preprocessString(char *str, EMCState *script, const uint
 	*dst = 0;
 }
 
-LolEobBaseEngine *TextDisplayer_LoL::vm() {
+KyraRpgEngine *TextDisplayer_LoL::vm() {
 	return _vm;
 }
 
@@ -343,7 +343,7 @@ Screen *TextDisplayer_LoL::screen() {
 
 void TextDisplayer_LoL::textPageBreak() {
 	strcpy(_pageBreakString, _vm->getLangString(0x4073));
-	TextDisplayer_Eob::textPageBreak();
+	TextDisplayer_rpg::textPageBreak();
 }
 
 } // End of namespace Kyra
diff --git a/engines/kyra/text_lol.h b/engines/kyra/text_lol.h
index 0dcc4b73b3..6da217e30e 100644
--- a/engines/kyra/text_lol.h
+++ b/engines/kyra/text_lol.h
@@ -24,7 +24,7 @@
 #define KYRA_TEXT_LOL_H
 
 #if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-#include "kyra/text_eob.h"
+#include "kyra/text_rpg.h"
 #endif
 #include "common/scummsys.h"
 
@@ -36,7 +36,7 @@ class Screen_LoL;
 class LoLEngine;
 struct EMCState;
 
-class TextDisplayer_LoL : public TextDisplayer_Eob {
+class TextDisplayer_LoL : public TextDisplayer_rpg {
 public:
 	TextDisplayer_LoL(LoLEngine *engine, Screen_LoL *screenLoL);
 	~TextDisplayer_LoL();
@@ -50,7 +50,7 @@ public:
 	int16 _scriptTextParameter;
 
 private:
-	LolEobBaseEngine *vm();
+	KyraRpgEngine *vm();
 	Screen *screen();
 
 	void preprocessString(char *str, EMCState *script, const uint16 *paramList, int16 paramIndex);
diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text_rpg.cpp
new file mode 100644
index 0000000000..bbc3cdbd98
--- /dev/null
+++ b/engines/kyra/text_rpg.cpp
@@ -0,0 +1,688 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/kyra_rpg.h"
+#include "kyra/screen.h"
+#include "kyra/timer.h"
+
+#include "common/system.h"
+
+namespace Kyra {
+
+enum {
+	kEobTextBufferSize = 2048
+};
+
+TextDisplayer_rpg::TextDisplayer_rpg(KyraRpgEngine *engine, Screen *sScreen) : _vm(engine), _screen(sScreen),
+	_lineCount(0), _printFlag(false), _lineWidth(0), _numCharsTotal(0), _allowPageBreak(true),
+	_numCharsLeft(0), _numCharsPrinted(0), _sjisLineBreakFlag(false), _waitButtonMode(1) {
+
+	_dialogueBuffer = new char[kEobTextBufferSize];
+	memset(_dialogueBuffer, 0, kEobTextBufferSize);
+
+	_currentLine = new char[85];
+	memset(_currentLine, 0, 85);
+
+	_textDimData = new TextDimData[_screen->screenDimTableCount()];
+
+	for (int i = 0; i < _screen->screenDimTableCount(); i++){
+		const ScreenDim *d = _screen->getScreenDim(i);
+		_textDimData[i].color1 = d->unk8;
+		_textDimData[i].color2 = d->unkA;
+		_textDimData[i].line = d->unkC;
+		_textDimData[i].column = d->unkE;
+	}
+
+	_table1 = new char[128];
+	memset(_table1, 0, 128);
+	_table2 = new char[16];
+	memset(_table2, 0, 16);
+
+	_waitButtonSpace = 0;
+}
+
+TextDisplayer_rpg::~TextDisplayer_rpg() {
+	delete[] _dialogueBuffer;
+	delete[] _currentLine;
+	delete[] _textDimData;
+	delete[] _table1;
+	delete[] _table2;
+}
+
+void TextDisplayer_rpg::setupField(int dim, bool mode) {
+	setPageBreakFlag();
+
+	_textDimData[dim].color2 = _vm->_bkgColor_1;
+	_screen->setScreenDim(dim);
+
+	if (mode)
+		clearCurDim();
+	else
+		resetDimTextPositions(dim);
+}
+
+void TextDisplayer_rpg::resetDimTextPositions(int dim) {
+	_textDimData[dim].column = 0;
+	_textDimData[dim].line = 0;
+}
+
+void TextDisplayer_rpg::resetPageBreakString() {
+	if (vm()->_moreStrings)
+		strcpy(_pageBreakString, vm()->_moreStrings[0]);
+}
+
+void TextDisplayer_rpg::setPageBreakFlag() {
+	_allowPageBreak = true;
+	_lineCount = 0;
+}
+
+void TextDisplayer_rpg::removePageBreakFlag() {
+	_allowPageBreak = false;
+}
+
+void TextDisplayer_rpg::displayText(char *str, ...) {
+	const bool isPc98 = (_vm->gameFlags().platform == Common::kPlatformPC98);
+
+	_printFlag = false;
+
+	_lineWidth = 0;
+	_numCharsLeft = 0;
+	_numCharsPrinted = 0;
+
+	_tempString1 = str;
+	_tempString2 = 0;
+
+	_currentLine[0] = 0;
+
+	memset(_ctrl, 0, 3);
+
+	char c = parseCommand();
+
+	va_list args;
+	va_start(args, str);
+
+	const ScreenDim *sd = _screen->_curDim;
+	int sdx = _screen->curDimIndex();
+
+	bool pc98PrintFlag = (isPc98 && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
+	uint16 charsPerLine = (sd->w << 3) / (_screen->getFontWidth() + _screen->_charWidth);
+
+	while (c) {
+		char a = tolower(_ctrl[1]);
+
+		if (!_tempString2 && c == '%') {
+			if (a == 'd') {
+				strcpy(_scriptParaString, Common::String::format("%d", va_arg(args, int)).c_str());
+				_tempString2 = _scriptParaString;
+			} else if (a == 's') {
+				_tempString2 = va_arg(args, char *);
+			} else {
+				break;
+			}
+
+			_ctrl[0] = _ctrl[2];
+			_ctrl[2] = _ctrl[1] = 0;
+			c = parseCommand();
+		}
+
+		if (isPc98) {
+			uint8 cu = (uint8) c;
+			if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0)) {
+				_currentLine[_numCharsLeft++] = c;
+				_currentLine[_numCharsLeft++] = parseCommand();
+				_currentLine[_numCharsLeft] = '\0';
+				_lineWidth += 8;
+				if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
+					printLine(_currentLine);
+				c = parseCommand();
+				continue;
+			}
+		}
+
+		uint16 dv = _textDimData[sdx].column / (_screen->getFontWidth() + _screen->_charWidth);
+
+		switch (c - 1) {
+		case 0:
+			printLine(_currentLine);
+			textPageBreak();
+			_numCharsPrinted = 0;
+			break;
+
+		case 1:
+			printLine(_currentLine);
+			_textDimData[sdx].color2 = parseCommand();
+			break;
+
+		case 5:
+			printLine(_currentLine);
+			_textDimData[sdx].color1 = parseCommand();
+			break;
+
+		case 8:
+			printLine(_currentLine);
+			dv = _textDimData[sdx].column / (_screen->getFontWidth() + _screen->_charWidth);
+			dv = ((dv + 8) & 0xfff8) - 1;
+			if (dv >= charsPerLine)
+				dv = 0;
+			_textDimData[sdx].column = (_screen->getFontWidth() + _screen->_charWidth) * dv;
+			break;
+
+		case 11:
+			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			// TODO (UNUSED)
+			break;
+
+		case 12:
+			if (isPc98)
+				_sjisLineBreakFlag = true;
+			printLine(_currentLine);
+			_sjisLineBreakFlag = false;
+			_lineCount++;
+			_textDimData[sdx].column = 0;
+			_textDimData[sdx].line++;
+			break;
+
+		case 18:
+			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			// TODO (UNUSED)
+			break;
+
+		case 23:
+			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			// TODO (UNUSED)
+			break;
+
+		case 24:
+			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			// TODO (UNUSED)
+			break;
+
+		case 26:
+			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			// TODO (UNUSED)
+			break;
+
+		case 28:
+			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			// TODO (UNUSED)
+			break;
+
+		default:
+			if (_vm->game() == GI_LOL || c > 30) {
+				_lineWidth += (pc98PrintFlag ? 4 : _screen->getCharWidth((uint8)c));
+				_currentLine[_numCharsLeft++] = c;
+				_currentLine[_numCharsLeft] = 0;
+
+				if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
+					printLine(_currentLine);
+			}
+		}
+
+		c = parseCommand();
+	}
+
+	va_end(args);
+
+	if (_numCharsLeft)
+		printLine(_currentLine);
+}
+
+char TextDisplayer_rpg::parseCommand() {
+	if (!_ctrl[1])
+		readNextPara();
+
+	char res = _ctrl[1];
+	_ctrl[1] = _ctrl[2];
+	_ctrl[2] = 0;
+
+	if (!_ctrl[1])
+		readNextPara();
+
+	return res;
+}
+
+void TextDisplayer_rpg::readNextPara() {
+	char c = 0;
+	char d = 0;
+
+	if (_tempString2) {
+		if (*_tempString2) {
+			d = *_tempString2++;
+		} else {
+			_tempString2 = 0;
+			d = _ctrl[0];
+		}
+	}
+
+	if (!d && _tempString1) {
+		if (*_tempString1)
+			d = *_tempString1++;
+		else
+			_tempString1 = 0;
+	}
+
+	if ((_vm->game() != GI_LOL) && (d & 0x80)) {
+		d &= 0x7f;
+		c = d & 7;
+		d = (d & 0x78) >> 3;
+		uint8 l = d;
+		c = _table1[(l << 3) + c];
+		d = _table2[l];
+	}
+
+	_ctrl[1] = d;
+	_ctrl[2] = c;
+}
+
+void TextDisplayer_rpg::printLine(char *str) {
+	const bool isPc98 = (_vm->gameFlags().platform == Common::kPlatformPC98);
+	const ScreenDim *sd = _screen->_curDim;
+	int sdx = _screen->curDimIndex();
+	bool pc98PrintFlag = (isPc98 && (sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) ? true : false;
+
+	int fh = (_screen->_currentFont == Screen::FID_SJIS_FNT) ? 9 : (_screen->getFontHeight() + _screen->_charOffset);
+	int lines = (sd->h - _screen->_charOffset) / fh;
+
+	while (_textDimData[sdx].line >= lines) {
+		if ((lines - _waitButtonSpace) <= _lineCount && _allowPageBreak) {
+			_lineCount = 0;
+			textPageBreak();
+			_numCharsPrinted = 0;
+		}
+
+		int h1 = ((sd->h / fh) - 1) * fh;
+		int h2 = sd->h - fh;
+
+		if (h2)
+			_screen->copyRegion(sd->sx << 3, sd->sy + fh, sd->sx << 3, sd->sy, sd->w << 3, h2, _screen->_curPage, _screen->_curPage, Screen::CR_NO_P_CHECK);
+
+		_screen->fillRect(sd->sx << 3, sd->sy + h1, ((sd->sx + sd->w) << 3) - 1, sd->sy + sd->h - 1, _textDimData[sdx].color2);
+		if (_textDimData[sdx].line)
+			_textDimData[sdx].line--;
+	}
+
+	int x1 = (sd->sx << 3) + _textDimData[sdx].column;
+	int y = sd->sy + (pc98PrintFlag ? (_textDimData[sdx].line << 3) : (fh * _textDimData[sdx].line));
+	int w = sd->w << 3;
+	int lw = _lineWidth;
+	int s = _numCharsLeft;
+	char c = 0;
+
+	if (pc98PrintFlag) {
+		bool ct = true;
+
+		if ((lw + _textDimData[sdx].column) > w) {
+			if ((lines - 1 - (_waitButtonSpace << 1)) <= _lineCount)
+				// cut off line to leave space for "MORE" button
+				w -= vm()->_waitButtonReverveW;
+		} else {
+			if (!_sjisLineBreakFlag || (_lineCount + 1 < lines - 1))
+				ct = false;
+			else
+				// cut off line to leave space for "MORE" button
+				w -= vm()->_waitButtonReverveW;
+		}
+
+		if (ct) {
+			w -= _textDimData[sdx].column;
+
+			int n2 = 0;
+			int n1 = (w / 4) - 1;
+
+			while (n2 < n1 && n2 < s) {
+				c = str[n2];
+				uint8 cu = (uint8) c;
+				if (cu >= 0xE0 || (cu > 0x80 && cu < 0xA0))
+					n2++;
+				n2++;
+			}
+			s = n2;
+		}
+	} else {
+		if ((lw + _textDimData[sdx].column) > w) {
+			if ((lines - 1) <= _lineCount && _allowPageBreak)
+				// cut off line to leave space for "MORE" button
+				w -= vm()->_waitButtonReverveW;
+
+			w -= _textDimData[sdx].column;
+
+			int n2 = 0;
+			int n1 = s - 1;
+
+			while (n1 > 0) {
+				//cut off line after last space
+				c = str[n1];
+
+				lw -= _screen->getCharWidth((uint8)c);
+
+				if (!n2 && lw <= w)
+					n2 = n1;
+
+				if (n2 && c == ' ') {
+					s = n1;
+					_printFlag = false;
+					break;
+				}
+				n1--;
+			}
+
+			if (!n1) {
+				if (_textDimData[sdx].column && !_printFlag) {
+					s = lw = 0;
+					_printFlag = true;
+				} else {
+					s = n2;
+				}
+			}
+		}
+	}
+
+	c = str[s];
+	str[s] = 0;
+
+	uint8 col = _textDimData[sdx].color1;
+	if (isPc98 && (sdx == 2 || sdx == 3 || sdx == 4 || sdx == 5 || sdx == 15)) {
+		switch (_textDimData[sdx].color1) {
+		case 0x88:
+			col = 0x41;
+			break;
+		case 0x55:
+			col = 0x81;
+			break;
+		case 0xaa:
+			col = 0x21;
+			break;
+		case 0x99:
+			col = 0xa1;
+			break;
+		case 0x33:
+			col = 0xe1;
+			break;
+		case 0x18:
+			col = 0x61;
+			break;
+		default:
+			col = 1;
+			break;
+		}
+		_screen->printText(str, x1 & ~3, (y + 8) & ~7, col, 0);
+	} else {
+		_screen->printText(str, x1, y, col, _textDimData[sdx].color2);
+	}
+
+	_textDimData[sdx].column += lw;
+	_numCharsPrinted += strlen(str);
+
+	str[s] = c;
+
+	if (c == ' ')
+		s++;
+
+	if (str[s] == ' ')
+		s++;
+
+	uint32 len = strlen(&str[s]);
+	for (uint32 i = 0; i < len; i++)
+		str[i] = str[s + i];
+	str[len] = 0;
+
+	_numCharsLeft = strlen(str);
+	_lineWidth = pc98PrintFlag ? (_numCharsLeft << 2) : _screen->getTextWidth(str);
+
+	if (!_numCharsLeft && _textDimData[sdx].column < (sd->w << 3))
+		return;
+
+	_textDimData[sdx].column = 0;
+	_textDimData[sdx].line++;
+	_lineCount++;
+
+	printLine(str);
+}
+
+void TextDisplayer_rpg::printDialogueText(int stringId, const char *pageBreakString) {
+	const char * str = (const char *)(screen()->getCPagePtr(5) + READ_LE_UINT16(&screen()->getCPagePtr(5)[(stringId - 1) << 1]));
+	assert (strlen(str) < kEobTextBufferSize);
+	Common::strlcpy(_dialogueBuffer, str, kEobTextBufferSize);
+
+	displayText(_dialogueBuffer);
+
+	if (pageBreakString) {
+		if (pageBreakString[0]) {
+			strcpy(_pageBreakString, pageBreakString);
+			displayWaitButton();
+			resetPageBreakString();
+		}
+	}
+}
+
+void TextDisplayer_rpg::printDialogueText(const char *str, bool wait) {
+	assert (strlen(str) < kEobTextBufferSize);
+	Common::strlcpy(_dialogueBuffer, str, kEobTextBufferSize);
+
+	strcpy(_dialogueBuffer, str);
+	displayText(_dialogueBuffer);
+	if (wait)
+		displayWaitButton();
+}
+
+void TextDisplayer_rpg::printMessage(const char *str, int textColor, ...) {
+	int tc = _textDimData[screen()->curDimIndex()].color1;
+
+	if (textColor != -1)
+		_textDimData[screen()->curDimIndex()].color1 = textColor;
+
+	va_list args;
+	va_start(args, textColor);
+	vsnprintf(_dialogueBuffer, kEobTextBufferSize - 1, str, args);
+	va_end(args);
+
+	displayText(_dialogueBuffer);
+
+	if (vm()->game() != GI_EOB1)
+		_textDimData[screen()->curDimIndex()].color1 = tc;
+
+	if (!screen()->_curPage)
+		screen()->updateScreen();
+}
+
+int TextDisplayer_rpg::clearDim(int dim) {
+	int res = screen()->curDimIndex();
+	screen()->setScreenDim(dim);
+	_textDimData[dim].color1 = screen()->_curDim->unk8;
+	_textDimData[dim].color2 = vm()->game() == GI_LOL ? screen()->_curDim->unkA : vm()->_bkgColor_1;
+	clearCurDim();
+	return res;
+}
+
+void TextDisplayer_rpg::clearCurDim() {
+	int d = screen()->curDimIndex();
+	const ScreenDim *tmp = screen()->getScreenDim(d);
+	if (vm()->gameFlags().use16ColorMode) {
+		screen()->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 2, (tmp->sy + tmp->h) - 2, _textDimData[d].color2);
+	} else
+		screen()->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 1, (tmp->sy + tmp->h) - 1, _textDimData[d].color2);
+
+	_lineCount = 0;
+	_textDimData[d].column = _textDimData[d].line = 0;
+}
+
+void TextDisplayer_rpg::textPageBreak() {
+	if (vm()->game() != GI_LOL)
+		SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
+
+	int cp = _screen->setCurPage(0);
+	Screen::FontId cf = screen()->setFont(vm()->gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
+
+	if (vm()->game() == GI_LOL)
+		vm()->_timer->pauseSingleTimer(11, true);
+
+	vm()->_fadeText = false;
+	int resetPortraitAfterSpeechAnim = 0;
+	int updatePortraitSpeechAnimDuration = 0;
+
+	if (vm()->_updateCharNum != -1)  {
+		resetPortraitAfterSpeechAnim = vm()->_resetPortraitAfterSpeechAnim;
+		vm()->_resetPortraitAfterSpeechAnim = 0;
+		updatePortraitSpeechAnimDuration = vm()->_updatePortraitSpeechAnimDuration;
+		if (vm()->_updatePortraitSpeechAnimDuration > 36)
+			vm()->_updatePortraitSpeechAnimDuration = 36;
+	}
+
+	uint32 speechPartTime = 0;
+	if (vm()->speechEnabled() && vm()->_activeVoiceFileTotalTime && _numCharsTotal)
+		speechPartTime = vm()->_system->getMillis() + ((_numCharsPrinted * vm()->_activeVoiceFileTotalTime) / _numCharsTotal);
+
+	const ScreenDim *dim = screen()->getScreenDim(screen()->curDimIndex());
+
+	int x = ((dim->sx + dim->w) << 3) - (_vm->_dialogueButtonW + 3);
+	int y = 0;
+	int w = vm()->_dialogueButtonW;
+
+	if (vm()->game() == GI_LOL) {
+		if (vm()->_needSceneRestore && (vm()->_updateFlags & 2)) {
+			if (vm()->_currentControlMode || !(vm()->_updateFlags & 2)) {
+				y = dim->sy + dim->h - 5;
+			} else {
+				x += 6;
+				y = dim->sy + dim->h - 2;
+			}
+		} else {
+			y = dim->sy + dim->h - 10;
+		}
+	} else {
+		y = vm()->_waitButtonPresY[_waitButtonMode];
+		x = vm()->_waitButtonPresX[_waitButtonMode];
+		w = vm()->_waitButtonPresW[_waitButtonMode];
+	}
+
+	if (vm()->gameFlags().use16ColorMode) {
+		vm()->gui_drawBox(x + 8, (y & ~7) - 1, 66, 10, 0xee, 0xcc, -1);
+		screen()->printText(_pageBreakString, (x + 37 - (strlen(_pageBreakString) << 1) + 4) & ~3, (y + 2) & ~7, 0xc1, 0);
+	} else {
+		vm()->gui_drawBox(x, y, w, vm()->_dialogueButtonH, vm()->_color1_1, vm()->_color2_1, vm()->_bkgColor_1);
+		screen()->printText(_pageBreakString, x + (w >> 1) - (vm()->screen()->getTextWidth(_pageBreakString) >> 1), y + 2, vm()->_dialogueButtonLabelCol1, 0);
+	}
+
+	vm()->removeInputTop();
+
+	bool loop = true;
+	bool target = false;
+
+	do {
+		int inputFlag = vm()->checkInput(0, false) & 0xFF;
+		vm()->removeInputTop();
+
+		while (!inputFlag && !_vm->shouldQuit()) {
+			vm()->update();
+
+			if (vm()->speechEnabled()) {
+				if (((vm()->_system->getMillis() > speechPartTime) || (vm()->snd_updateCharacterSpeech() != 2)) && speechPartTime) {
+					loop = false;
+					inputFlag = vm()->_keyMap[Common::KEYCODE_RETURN];
+					break;
+				}
+			}
+
+			inputFlag = vm()->checkInput(0, false) & 0xFF;
+			vm()->removeInputTop();
+		}
+
+		vm()->gui_notifyButtonListChanged();
+
+		if (inputFlag == vm()->_keyMap[Common::KEYCODE_SPACE] || inputFlag == vm()->_keyMap[Common::KEYCODE_RETURN]) {
+			loop = false;
+		} else if (inputFlag == 199 || inputFlag == 201) {
+			if (vm()->posWithinRect(vm()->_mouseX, vm()->_mouseY, x, y, x + w, y + 9)) {
+				if (_vm->game() == GI_LOL)
+					target = true;
+				else
+					loop = false;
+			}
+		} else if (inputFlag == 200 || inputFlag == 202) {
+			if (target)
+				loop = false;
+		}
+	} while (loop && !_vm->shouldQuit());
+
+	if (vm()->gameFlags().use16ColorMode)
+		screen()->fillRect(x + 8, y, x + 57, y + 9, _textDimData[screen()->curDimIndex()].color2);
+	else
+		screen()->fillRect(x, y, x + w - 1, y + 8, _textDimData[screen()->curDimIndex()].color2);
+
+	clearCurDim();
+	_screen->updateScreen();
+
+	if (vm()->game() == GI_LOL)
+		vm()->_timer->pauseSingleTimer(11, false);
+
+	if (vm()->_updateCharNum != -1) {
+		vm()->_resetPortraitAfterSpeechAnim = resetPortraitAfterSpeechAnim;
+		if (updatePortraitSpeechAnimDuration > 36)
+			updatePortraitSpeechAnimDuration -= 36;
+		else
+			updatePortraitSpeechAnimDuration >>= 1;
+
+		vm()->_updatePortraitSpeechAnimDuration = updatePortraitSpeechAnimDuration;
+	}
+
+	screen()->setFont(cf);
+	screen()->setCurPage(cp);
+
+	if (vm()->game() != GI_LOL)
+		SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
+
+	vm()->removeInputTop();
+}
+
+void TextDisplayer_rpg::displayWaitButton() {
+	vm()->_dialogueNumButtons = 1;
+	vm()->_dialogueButtonString[0] = _pageBreakString;
+	vm()->_dialogueButtonString[1] = 0;
+	vm()->_dialogueButtonString[2] = 0;
+	vm()->_dialogueHighlightedButton = 0;
+
+	vm()->_dialogueButtonPosX = &vm()->_waitButtonPresX[_waitButtonMode];
+	vm()->_dialogueButtonPosY = &vm()->_waitButtonPresY[_waitButtonMode];
+	vm()->_dialogueButtonW = vm()->_waitButtonPresW[_waitButtonMode];
+	vm()->_dialogueButtonYoffs = 0;
+
+	SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
+	vm()->drawDialogueButtons();
+
+	if (!vm()->shouldQuit())
+		vm()->removeInputTop();
+
+	while (!vm()->processDialogue() && !vm()->shouldQuit()) {}
+
+	_screen->fillRect(vm()->_dialogueButtonPosX[0], vm()->_dialogueButtonPosY[0], vm()->_dialogueButtonPosX[0] + vm()->_dialogueButtonW - 1, vm()->_dialogueButtonPosY[0] + vm()->_dialogueButtonH - 1, vm()->_bkgColor_1);
+	_screen->updateScreen();
+	vm()->_dialogueButtonW = 95;
+	SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
+	clearCurDim();
+}
+
+} // End of namespace Kyra
+
+#endif // (ENABLE_EOB || ENABLE_LOL)
diff --git a/engines/kyra/text_rpg.h b/engines/kyra/text_rpg.h
new file mode 100644
index 0000000000..fcafcc0f4d
--- /dev/null
+++ b/engines/kyra/text_rpg.h
@@ -0,0 +1,115 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are to numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#ifndef KYRA_TEXT_EOB_H
+#define KYRA_TEXT_EOB_H
+
+#include "common/scummsys.h"
+
+namespace Kyra {
+
+class Screen;
+class KyraRpgEngine;
+
+class TextDisplayer_rpg {
+public:
+	TextDisplayer_rpg(KyraRpgEngine *engine, Screen *sScreen);
+	virtual ~TextDisplayer_rpg();
+
+	virtual void setupField(int dim, bool mode);
+
+	void printDialogueText(int stringId, const char *pageBreakString);
+	void printDialogueText(const char *str, bool wait = false);
+	void printMessage(const char *str, int textColor = -1, ...);
+
+	int clearDim(int dim);
+	void clearCurDim();
+
+	void resetDimTextPositions(int dim);
+	void resetPageBreakString();
+	void setPageBreakFlag();
+	void removePageBreakFlag();
+
+	void allowPageBreak(bool mode) { _allowPageBreak = mode; }
+	void setWaitButtonMode(int mode) { _waitButtonMode = mode; }
+	int lineCount() { return _lineCount; }
+
+protected:
+	virtual KyraRpgEngine *vm() { return _vm; }
+	virtual Screen *screen() { return _screen; }
+
+	void displayText(char *str, ...);
+	char parseCommand();
+	void readNextPara();
+	void printLine(char *str);
+	virtual void textPageBreak();
+	void displayWaitButton();
+
+	char *_dialogueBuffer;
+
+	char *_tempString1;
+	char *_tempString2;
+	char *_currentLine;
+	char _ctrl[3];
+
+	uint16 _lineWidth;
+	uint32 _numCharsTotal;
+	uint32 _numCharsLeft;
+	uint32 _numCharsPrinted;
+
+	bool _printFlag;
+	bool _sjisLineBreakFlag;
+
+	char _pageBreakString[20];
+	char _scriptParaString[11];
+	int _lineCount;
+
+	bool _allowPageBreak;
+	int _waitButtonSpace;
+	int _waitButtonMode;
+
+	static const char _pageBreakDefault[3][5];
+
+	struct TextDimData {
+		uint8 color1;
+		uint8 color2;
+		uint16 column;
+		uint8 line;
+	};
+
+	TextDimData *_textDimData;
+
+private:
+	KyraRpgEngine *_vm;
+	Screen *_screen;
+
+	char *_table1;
+	char *_table2;
+};
+
+} // End of namespace Kyra
+
+#endif
+
+#endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 3b56b793d5..b80563bd11 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -20,74 +20,11 @@
  *
  */
 
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-
 #include "kyra/eobcommon.h"
 #include "kyra/timer.h"
 
 #include "common/system.h"
 
-namespace Kyra {
-
-void LolEobBaseEngine::enableSysTimer(int sysTimer) {
-	if (sysTimer != 2)
-		return;
-
-	for (int i = 0; i < getNumClock2Timers(); i++)
-		_timer->pauseSingleTimer(getClock2Timer(i), false);
-}
-
-void LolEobBaseEngine::disableSysTimer(int sysTimer) {
-	if (sysTimer != 2)
-		return;
-
-	for (int i = 0; i < getNumClock2Timers(); i++)
-		_timer->pauseSingleTimer(getClock2Timer(i), true);
-}
-
-void LolEobBaseEngine::enableTimer(int id) {
-	_timer->enable(id);
-	_timer->setCountdown(id, _timer->getDelay(id));
-}
-
-void LolEobBaseEngine::timerProcessDoors(int timerNum) {
-	for (int i = 0; i < 3; i++) {
-		uint16 b = _openDoorState[i].block;
-		if (!b)
-			continue;
-
-		int v = _openDoorState[i].state;
-		int c = _openDoorState[i].wall;
-
-		_levelBlockProperties[b].walls[c] += v;
-		_levelBlockProperties[b].walls[c ^ 2] += v;
-
-		int snd = 3;
-		int flg = _wllWallFlags[_levelBlockProperties[b].walls[c]];
-		if (flg & 0x20)
-			snd = 5;
-		else if (v == -1)
-			snd = 4;
-
-		if (_flags.gameID == GI_LOL) {
-			if (!(_updateFlags & 1)) {
-				snd_processEnvironmentalSoundEffect(snd + 28, b);
-				if (!checkSceneUpdateNeed(b))
-					updateEnvironmentalSfx(0);
-			}
-		} else {
-			checkSceneUpdateNeed(b);
-			updateEnvironmentalSfx(snd);
-		}
-
-		if (flg & 0x30)
-			_openDoorState[i].block = 0;
-	}
-}
-
-} // namespace Kyra
-
-#endif
 #ifdef ENABLE_EOB
 
 namespace Kyra {
@@ -370,7 +307,7 @@ void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
 
 		_screen->setScreenDim(od);
 		_screen->setFont(of);
-	}	
+	}
 
 	uint32 nextTimer = 0xffffffff;
 	for (int i = 0; i < 10; i++) {
diff --git a/engines/kyra/timer_rpg.cpp b/engines/kyra/timer_rpg.cpp
new file mode 100644
index 0000000000..02c2669436
--- /dev/null
+++ b/engines/kyra/timer_rpg.cpp
@@ -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.
+ *
+ */
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/kyra_rpg.h"
+#include "kyra/timer.h"
+
+#include "common/system.h"
+
+namespace Kyra {
+
+void KyraRpgEngine::enableSysTimer(int sysTimer) {
+	if (sysTimer != 2)
+		return;
+
+	for (int i = 0; i < getNumClock2Timers(); i++)
+		_timer->pauseSingleTimer(getClock2Timer(i), false);
+}
+
+void KyraRpgEngine::disableSysTimer(int sysTimer) {
+	if (sysTimer != 2)
+		return;
+
+	for (int i = 0; i < getNumClock2Timers(); i++)
+		_timer->pauseSingleTimer(getClock2Timer(i), true);
+}
+
+void KyraRpgEngine::enableTimer(int id) {
+	_timer->enable(id);
+	_timer->setCountdown(id, _timer->getDelay(id));
+}
+
+void KyraRpgEngine::timerProcessDoors(int timerNum) {
+	for (int i = 0; i < 3; i++) {
+		uint16 b = _openDoorState[i].block;
+		if (!b)
+			continue;
+
+		int v = _openDoorState[i].state;
+		int c = _openDoorState[i].wall;
+
+		_levelBlockProperties[b].walls[c] += v;
+		_levelBlockProperties[b].walls[c ^ 2] += v;
+
+		int snd = 3;
+		int flg = _wllWallFlags[_levelBlockProperties[b].walls[c]];
+		if (flg & 0x20)
+			snd = 5;
+		else if (v == -1)
+			snd = 4;
+
+		if (_flags.gameID == GI_LOL) {
+			if (!(_updateFlags & 1)) {
+				snd_processEnvironmentalSoundEffect(snd + 28, b);
+				if (!checkSceneUpdateNeed(b))
+					updateEnvironmentalSfx(0);
+			}
+		} else {
+			checkSceneUpdateNeed(b);
+			updateEnvironmentalSfx(snd);
+		}
+
+		if (flg & 0x30)
+			_openDoorState[i].block = 0;
+	}
+}
+
+} // namespace Kyra
+
+#endif
-- 
cgit v1.2.3


From 6c8fb30cbd80660bc3882ca0c0895dec8cbc4108 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sat, 3 Dec 2011 18:28:09 +0100
Subject: KYRA: (EOB) - fix static resource loading for EOB when LOL is
 disabled

---
 engines/kyra/resource.h    |  2 ++
 engines/kyra/staticres.cpp | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

(limited to 'engines')

diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 8edfd0a174..413bc4572f 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -773,6 +773,7 @@ private:
 	const FileType *getFiletype(int type);
 	const void *getData(int id, int requesttype, int &size);
 
+	bool loadDummy(Common::SeekableReadStream &stream, void *&ptr, int &size);
 	bool loadStringTable(Common::SeekableReadStream &stream, void *&ptr, int &size);
 	bool loadRawData(Common::SeekableReadStream &stream, void *&ptr, int &size);
 	bool loadShapeTable(Common::SeekableReadStream &stream, void *&ptr, int &size);
@@ -798,6 +799,7 @@ private:
 	bool loadEobNpcData(Common::SeekableReadStream &stream, void *&ptr, int &size);
 #endif // ENABLE_EOB
 
+	void freeDummy(void *&ptr, int &size);
 	void freeRawData(void *&ptr, int &size);
 	void freeStringTable(void *&ptr, int &size);
 	void freeShapeTable(void *&ptr, int &size);
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index c169a397bb..092a4cc1e9 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -257,6 +257,14 @@ bool StaticResource::init() {
 		{ kLolRawDataBe16, proc(loadRawDataBe16), proc(freeRawDataBe16) },
 		{ kLolRawDataBe32, proc(loadRawDataBe32), proc(freeRawDataBe32) },
 		{ kLolButtonData, proc(loadButtonDefs), proc(freeButtonDefs) },
+#else
+		{ kLolCharData, proc(loadDummy), proc(freeDummy) },
+		{ kLolSpellData, proc(loadDummy), proc(freeDummy) },
+		{ kLolCompassData, proc(loadDummy), proc(freeDummy) },
+		{ kLolFlightShpData, proc(loadDummy), proc(freeDummy) },
+		{ kLolRawDataBe16, proc(loadDummy), proc(freeDummy) },
+		{ kLolRawDataBe32, proc(loadDummy), proc(freeDummy) },
+		{ kLolButtonData, proc(loadDummy), proc(freeDummy) },
 #endif // ENABLE_LOL
 
 #ifdef ENABLE_EOB
@@ -411,6 +419,10 @@ const void *StaticResource::getData(int id, int requesttype, int &size) {
 	return 0;
 }
 
+bool StaticResource::loadDummy(Common::SeekableReadStream &stream, void *&ptr, int &size) {
+	return true;
+}
+
 bool StaticResource::loadStringTable(Common::SeekableReadStream &stream, void *&ptr, int &size) {
 	uint32 count = stream.readUint32BE();
 	size = count;
@@ -615,6 +627,9 @@ bool StaticResource::loadShapeAnimData_v2(Common::SeekableReadStream &stream, vo
 	return true;
 }
 
+void StaticResource::freeDummy(void *&ptr, int &size) {
+}
+
 void StaticResource::freeRawData(void *&ptr, int &size) {
 	uint8 *data = (uint8 *)ptr;
 	delete[] data;
-- 
cgit v1.2.3


From 4c6302943b1122703241686a66c1f90b2ee4a209 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 5 Dec 2011 07:39:16 +0100
Subject: KYRA: implement Screen::decodeFrame1()

(required for decoding some EGA bitmaps in EOB1)
---
 engines/kyra/screen.cpp | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
 engines/kyra/screen.h   |  3 ++
 2 files changed, 87 insertions(+)

(limited to 'engines')

diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index c0d05dc851..e4613e2634 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -2052,6 +2052,87 @@ void Screen::drawShapePlotType52(uint8 *dst, uint8 cmd) {
 	*dst = cmd;
 }
 
+void Screen::decodeFrame1(const uint8 *src, uint8 *dst, uint32 size) {
+	const uint8 *dstEnd = dst + size;
+
+	struct Pattern {
+		const uint8 *pos;
+		uint16 len;
+	};
+
+	Pattern *patterns = new Pattern[3840];
+	uint16 numPatterns = 0;
+	uint8 nib = 0;	
+
+	uint16 code = decodeEGAGetCode(src, nib);
+	uint8 last = code & 0xff;
+
+	uint8 *dstPrev = dst;
+	uint16 count = 1;
+	uint16 countPrev = 1;
+
+	*dst++ = last;
+
+	while (dst < dstEnd) {
+		code = decodeEGAGetCode(src, nib);
+		last = code & 0xff;
+		uint8 cmd = code >> 8;
+
+		if (cmd--) {
+			code = (cmd << 8) | last;
+			uint8 *tmpDst = dst;
+			last = *dst;
+
+			if (code < numPatterns) {
+				const uint8 *tmpSrc = patterns[code].pos;
+				countPrev = patterns[code].len;
+				for (int i = 0; i < countPrev; i++)
+					*dst++ = *tmpSrc++;
+
+			} else {
+				const uint8 *tmpSrc = dstPrev;
+				count = countPrev;
+				for (int i = 0; i < countPrev; i++)
+					*dst++ = *tmpSrc++;
+				*dst++ = last;
+				countPrev++;
+			}
+
+			if (numPatterns < 3840) {
+				patterns[numPatterns].pos = dstPrev;
+				patterns[numPatterns++].len = ++count;
+			}
+
+			dstPrev = tmpDst;
+			count = countPrev;
+
+		} else {
+			*dst++ = last;
+
+			if (numPatterns < 3840) {
+				patterns[numPatterns].pos = dstPrev;
+				patterns[numPatterns++].len = ++count;
+			}
+
+			dstPrev = dst - 1;
+			count = 1;
+			countPrev = 1;
+		}
+	}
+	delete[] patterns;
+}
+
+uint16 Screen::decodeEGAGetCode(const uint8 *&pos, uint8 &nib) {
+	uint16 res = READ_BE_UINT16(pos++);
+	if ((++nib) & 1) {
+		res >>= 4;		
+	} else {
+		pos++;
+		res &= 0xfff;
+	}
+	return res;
+}
+
 void Screen::decodeFrame3(const uint8 *src, uint8 *dst, uint32 size) {
 	const uint8 *dstEnd = dst + size;
 	while (dst < dstEnd) {
@@ -2933,6 +3014,9 @@ void Screen::loadBitmap(const char *filename, int tempPage, int dstPage, Palette
 	case 0:
 		memcpy(dstData, srcPtr, imgSize);
 		break;
+	case 1:
+		Screen::decodeFrame1(srcPtr, dstData, imgSize);
+		break;
 	case 3:
 		Screen::decodeFrame3(srcPtr, dstData, imgSize);
 		break;
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index d4f0dc97da..192e267014 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -515,6 +515,9 @@ public:
 	FontId _currentFont;
 
 	// decoding functions
+	static void decodeFrame1(const uint8 *src, uint8 *dst, uint32 size);
+	static uint16 decodeEGAGetCode(const uint8 *&pos, uint8 &nib);
+
 	static void decodeFrame3(const uint8 *src, uint8 *dst, uint32 size);
 	static uint decodeFrame4(const uint8 *src, uint8 *dst, uint32 dstSize);
 	static void decodeFrameDelta(uint8 *dst, const uint8 *src, bool noXor = false);
-- 
cgit v1.2.3


From 36d85a315fe2d6927f6609ec312f8fea8b9a3c3c Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 12 Dec 2011 16:14:08 +0100
Subject: KYRA: (EOB) - rename some files for a better match with the contained
 code

---
 engines/kyra/darkmoon.cpp           |  480 +++++++++++++
 engines/kyra/darkmoon.h             |  139 ++++
 engines/kyra/detection.cpp          |    4 +-
 engines/kyra/eob.cpp                |  572 +++++++++++++++
 engines/kyra/eob.h                  |  149 ++++
 engines/kyra/eob1.cpp               |  572 ---------------
 engines/kyra/eob1.h                 |  149 ----
 engines/kyra/eob2.cpp               |  480 -------------
 engines/kyra/eob2.h                 |  139 ----
 engines/kyra/module.mk              |    8 +-
 engines/kyra/resource.h             |    2 +-
 engines/kyra/sequences_darkmoon.cpp | 1349 +++++++++++++++++++++++++++++++++++
 engines/kyra/sequences_eob.cpp      | 1071 +++++++++++++++++++++++++++
 engines/kyra/sequences_eob1.cpp     | 1071 ---------------------------
 engines/kyra/sequences_eob2.cpp     | 1349 -----------------------------------
 engines/kyra/staticres_eob.cpp      |    2 +-
 16 files changed, 3768 insertions(+), 3768 deletions(-)
 create mode 100644 engines/kyra/darkmoon.cpp
 create mode 100644 engines/kyra/darkmoon.h
 create mode 100644 engines/kyra/eob.cpp
 create mode 100644 engines/kyra/eob.h
 delete mode 100644 engines/kyra/eob1.cpp
 delete mode 100644 engines/kyra/eob1.h
 delete mode 100644 engines/kyra/eob2.cpp
 delete mode 100644 engines/kyra/eob2.h
 create mode 100644 engines/kyra/sequences_darkmoon.cpp
 create mode 100644 engines/kyra/sequences_eob.cpp
 delete mode 100644 engines/kyra/sequences_eob1.cpp
 delete mode 100644 engines/kyra/sequences_eob2.cpp

(limited to 'engines')

diff --git a/engines/kyra/darkmoon.cpp b/engines/kyra/darkmoon.cpp
new file mode 100644
index 0000000000..e44040b0d5
--- /dev/null
+++ b/engines/kyra/darkmoon.cpp
@@ -0,0 +1,480 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#include "kyra/darkmoon.h"
+#include "kyra/resource.h"
+#include "kyra/sound.h"
+
+namespace Kyra {
+
+DarkMoonEngine::DarkMoonEngine(OSystem *system, const GameFlags &flags) : EobCoreEngine(system, flags) {
+	_seqIntro = _seqFinale = 0;
+	_shapesIntro = _shapesFinale = 0;
+	_dscDoorType5Offs = 0;
+	_numSpells = 70;
+	_menuChoiceInit = 4;
+
+	_introStrings = _cpsFilesIntro = _cpsFilesFinale = _finaleStrings = _kheldranStrings = _npcStrings[0] = _npcStrings[1] = _hornStrings = 0;
+	_seqIntro = _seqFinale = 0;
+	_shapesIntro = _shapesFinale = 0;
+	_creditsData = _npcShpData = _dscDoorType5Offs = _hornSounds = 0;
+	_dreamSteps = 0;
+}
+
+DarkMoonEngine::~DarkMoonEngine() {
+	delete[] _seqIntro;
+	delete[] _seqFinale;
+	delete[] _shapesIntro;
+	delete[] _shapesFinale;
+}
+
+Common::Error DarkMoonEngine::init() {
+	Common::Error err = EobCoreEngine::init();
+	if (err.getCode() != Common::kNoError)
+		return err;
+
+	initStaticResource();
+
+	_monsterProps = new EobMonsterProperty[10];
+
+	static const uint16 wX[] = { 221, 76 };
+	static const uint8 wY[] = { 189, 162 };
+	static const uint16 wW[] = { 95, 95 };
+
+	_dialogueButtonLabelCol1 = 9;
+	_dialogueButtonLabelCol2 = 15;
+	_dialogueButtonW = 95;
+	_dialogueButtonH = 9;
+	_waitButtonPresX = wX;
+	_waitButtonPresY = wY;
+	_waitButtonPresW = wW;
+	_waitButtonReverveW = 7;
+
+	_bkgColor_1 = 183;
+	_color1_1 = 186;
+	_color2_1 = 181;
+	_color4 = 133;
+	_color5 = 184;
+	_color6 = 183;
+	_color7 = 181;
+	_color8 = 186;
+	_color12 = 180;
+	_color13 = 177;
+	_color14 = 182;
+
+	return Common::kNoError;
+}
+
+void DarkMoonEngine::startupNew() {
+	_currentLevel = 4;
+	_currentSub = 0;
+	loadLevel(4, 0);
+	_currentBlock = 171;
+	_currentDirection = 2;
+	setHandItem(0);
+	EobCoreEngine::startupNew();
+}
+
+void DarkMoonEngine::drawNpcScene(int npcIndex) {
+	const uint8 *shpDef = &_npcShpData[npcIndex << 3];
+	for (int i = npcIndex; i != 255; i = shpDef[7]) {
+		shpDef = &_npcShpData[i << 3];
+		_screen->_curPage = 2;
+		const uint8 *shp = _screen->encodeShape(READ_LE_UINT16(shpDef), shpDef[2], shpDef[3], shpDef[4]);
+		_screen->_curPage = 0;
+		_screen->drawShape(0, shp, 88 + shpDef[5] - (shp[2] << 2), 104 + shpDef[6] - shp[1], 5);
+		delete[] shp;
+	}
+}
+
+void DarkMoonEngine::runNpcDialogue(int npcIndex) {
+	if (npcIndex == 0) {
+		snd_playSoundEffect(57);
+		if (npcJoinDialogue(0, 1, 3, 2))
+			setScriptFlags(0x40);
+	} else if (npcIndex == 1) {
+		snd_playSoundEffect(53);
+		gui_drawDialogueBox();
+
+		_txt->printDialogueText(4, 0);
+		int r = runDialogue(-1, 2, _npcStrings[0][0], _npcStrings[0][1]) - 1;
+
+		if (r == 0) {
+			snd_stopSound();
+			delay(3 * _tickLength);
+			snd_playSoundEffect(91);
+			npcJoinDialogue(1, 5, 6, 7);
+		} else if (r == 1) {
+			setScriptFlags(0x20);
+		}
+
+	} else if (npcIndex == 2) {
+		snd_playSoundEffect(55);
+		gui_drawDialogueBox();
+
+		_txt->printDialogueText(8, 0);
+		int r = runDialogue(-1, 2, _npcStrings[1][0], _npcStrings[1][1]) - 1;
+
+		if (r == 0) {
+			if (rollDice(1, 2, -1))
+				_txt->printDialogueText(9, _okStrings[0]);
+			else
+				npcJoinDialogue(2, 102, 103, 104);
+			setScriptFlags(8);
+		} else if (r == 1) {
+			_currentDirection = 0;
+		}
+	}
+}
+
+void DarkMoonEngine::updateUsedCharacterHandItem(int charIndex, int slot) {
+	EobItem *itm = &_items[_characters[charIndex].inventory[slot]];
+	if (itm->type == 48 || itm->type == 62) {
+		if (itm->value == 5)
+			return;
+		int charges = itm->flags & 0x3f;
+		if (--charges)
+			--itm->flags;
+		else
+			deleteInventoryItem(charIndex, slot);
+	} else if (itm->type == 26 || itm->type == 34 || itm->type == 35) {
+		deleteInventoryItem(charIndex, slot);
+	}
+}
+
+void DarkMoonEngine::generateMonsterPalettes(const char *file, int16 monsterIndex) {
+	int cp = _screen->setCurPage(2);
+	_screen->loadShapeSetBitmap(file, 3, 3);
+	uint8 tmpPal[16];
+	uint8 newPal[16];
+
+	for (int i = 0; i < 6; i++) {
+		int dci = monsterIndex + i;
+		memcpy(tmpPal, _monsterShapes[dci] + 4, 16);
+		int colx = 302 + 3 * i;
+
+		for (int ii = 0; ii < 16; ii++) {
+			uint8 col = _screen->getPagePixel(_screen->_curPage, colx, 184 + ii);
+
+			int iii = 0;
+			for (; iii < 16; iii++) {
+				if (tmpPal[iii] == col) {
+					newPal[ii] = iii;
+					break;
+				}
+			}
+
+			if (iii == 16)
+				newPal[ii] = 0;
+		}
+
+		for (int ii = 1; ii < 3; ii++) {
+			memcpy(tmpPal, _monsterShapes[dci] + 4, 16);
+
+			for (int iii = 0; iii < 16; iii++) {
+				uint8 col = _screen->getPagePixel(_screen->_curPage, colx + ii, 184 + iii);
+				if (newPal[iii])
+					tmpPal[newPal[iii]] = col;
+			}
+
+			int c = i;
+			if (monsterIndex >= 18)
+				c += 6;
+
+			c = (c << 1) + (ii - 1);
+			assert(c < 24);
+			memcpy(_monsterPalettes[c], tmpPal, 16);
+		}
+	}
+
+	_screen->setCurPage(cp);
+}
+
+void DarkMoonEngine::loadMonsterDecoration(const char *file, int16 monsterIndex) {
+	Common::SeekableReadStream *s = _res->createReadStream(Common::String::format("%s.dcr", file));
+	if (!s)
+		return;
+
+	int len = s->readUint16LE();
+
+	for (int i = 0; i < len; i++) {
+		for (int ii = 0; ii < 6; ii++) {
+			uint8 dc[6];
+			s->read(dc, 6);
+			if (!dc[2] || !dc[3])
+				continue;
+
+			SpriteDecoration *m = &_monsterDecorations[i * 6 + ii + monsterIndex];
+
+			m->shp = _screen->encodeShape(dc[0], dc[1], dc[2], dc[3]);
+			m->x = (int8)dc[4];
+			m->y = (int8)dc[5];
+		}
+	}
+
+	delete s;
+}
+
+void DarkMoonEngine::replaceMonster(int unit, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem) {
+	uint8 flg = _levelBlockProperties[block].flags & 7;
+
+	if (flg == 7 || _currentBlock == block || (flg && (_monsterProps[type].u30 || pos == 4)))
+		return;
+
+	for (int i = 0; i < 30; i++) {
+		if (_monsters[i].block != block)
+			continue;
+		if (_monsters[i].pos == 4 || _monsterProps[_monsters[i].type].u30)
+			return;
+	}
+
+	int index = -1;
+	int maxDist = 0;
+
+	for (int i = 0; i < 30; i++) {
+		if (_monsters[i].hitPointsCur <= 0) {
+			index = i;
+			break;
+		}
+
+		if (_monsters[i].flags & 0x40)
+			continue;
+
+		int dist = getBlockDistance(_monsters[i].block, _currentBlock);
+
+		if (dist > maxDist) {
+			maxDist = dist;
+			index = i;
+		}
+	}
+
+	if (index == -1)
+		return;
+
+	if (_monsters[index].hitPointsCur > 0)
+		killMonster(&_monsters[index], false);
+
+	initMonster(index, unit, block, pos, dir, type, shpIndex, mode, h2, randItem, fixedItem);
+}
+
+bool DarkMoonEngine::killMonsterExtra(EobMonsterInPlay *m) {
+	if (_currentLevel == 16 && _currentSub == 1 && (_monsterProps[m->type].capsFlags & 4)) {
+		if (m->type) {
+			_playFinale = true;
+			_runFlag = false;
+			delay(850);
+		} else {
+			m->hitPointsCur = 150;
+			m->curRemoteWeapon = 0;
+			m->numRemoteAttacks = 255;
+			m->shpIndex++;
+			m->type++;
+			seq_dranDragonTransformation();
+		}
+		return false;
+	}
+	return true;
+}
+
+const uint8 *DarkMoonEngine::loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs) {
+	_screen->loadShapeSetBitmap(filename, 3, 3);
+	for (int i = 0; i < 3; i++) {
+		_doorShapes[doorIndex * 3 + i] = _screen->encodeShape(READ_LE_UINT16(shapeDefs), READ_LE_UINT16(shapeDefs + 2), READ_LE_UINT16(shapeDefs + 4), READ_LE_UINT16(shapeDefs + 6));
+		shapeDefs += 8;
+	}
+
+	for (int i = 0; i < 2; i++) {
+		_doorSwitches[doorIndex * 3 + i].shp = _screen->encodeShape(READ_LE_UINT16(shapeDefs), READ_LE_UINT16(shapeDefs + 2), READ_LE_UINT16(shapeDefs + 4), READ_LE_UINT16(shapeDefs + 6));
+		shapeDefs += 8;
+		_doorSwitches[doorIndex * 3 + i].x = *shapeDefs;
+		shapeDefs += 2;
+		_doorSwitches[doorIndex * 3 + i].y= *shapeDefs;
+		shapeDefs += 2;
+	}
+	_screen->_curPage = 0;
+	return shapeDefs;
+}
+
+void DarkMoonEngine::drawDoorIntern(int type, int, int x, int y, int w, int wall, int mDim, int16, int16) {
+	int shapeIndex = type * 3 + 2 - mDim;
+	uint8 *shp = _doorShapes[shapeIndex];
+	if (!shp)
+		return;
+
+	if ((_doorType[type] == 0) || (_doorType[type] == 1)) {
+		y = _dscDoorY1[mDim] - shp[1];
+		x -= (shp[2] << 2);
+
+		if (_doorType[type] == 1) {
+			drawBlockObject(0, 2, shp, x, y, 5);
+			shp = _doorShapes[3 + shapeIndex];
+		}
+
+		y -= ((wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim]);
+
+		if (_specialWallTypes[wall] == 5)
+			y -= _dscDoorType5Offs[shapeIndex];
+
+	} else if (_doorType[type] == 2) {
+		x -= (shp[2] << 2);
+		y = _dscDoorY2[mDim] - ((wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult3[mDim]);
+	}
+
+	drawBlockObject(0, 2, shp, x, y, 5);
+
+	if (_wllShapeMap[wall] == -1 && !_noDoorSwitch[type])
+		drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+}
+
+void DarkMoonEngine::restParty_npc() {
+	int insalId = -1;
+	int numChar = 0;
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 1))
+			continue;
+		if (testCharacter(i, 2) && _characters[i].portrait == -1)
+			insalId = i;
+		numChar++;
+	}
+
+	if (insalId == -1 || numChar < 5)
+		return;
+
+	removeCharacterFromParty(insalId);
+	if (insalId < 4)
+		exchangeCharacters(insalId, testCharacter(5, 1) ? 5 : 4);
+
+	clearScriptFlags(6);
+
+	if (!stripPartyItems(1, 1, 1, 1))
+		stripPartyItems(2, 1, 1, 1);
+	stripPartyItems(31, 0, 1, 3);
+	stripPartyItems(39, 1, 0, 3);
+	stripPartyItems(47, 0, 1, 2);
+
+	_items[createItemOnCurrentBlock(28)].value = 26;
+
+	gui_drawPlayField(false);
+	gui_drawAllCharPortraitsWithStats();
+
+	_screen->setClearScreenDim(10);
+	_gui->messageDialogue2(11, 63, 6);
+	_gui->messageDialogue2(11, 64, 6);
+}
+
+bool DarkMoonEngine::restParty_extraAbortCondition() {
+	if (_currentLevel != 3)
+		return false;
+
+	seq_nightmare();
+
+	return true;
+}
+
+void DarkMoonEngine::useHorn(int charIndex, int weaponSlot) {
+	int v = _items[_characters[charIndex].inventory[weaponSlot]].value - 1;
+	_txt->printMessage(_hornStrings[v]);
+	snd_playSoundEffect(_hornSounds[v]);
+}
+
+bool DarkMoonEngine::checkPartyStatusExtra() {
+	if (checkScriptFlags(0x100000))
+		seq_kheldran();
+	return _gui->confirmDialogue2(14, 67, 1);
+}
+
+void DarkMoonEngine::drawLightningColumn() {
+	int f = rollDice(1, 2, -1);
+	int y = 0;
+
+	for (int i = 0; i < 6; i++) {
+		f ^= 1;
+		drawBlockObject(f, 2, _lightningColumnShape, 72, y, 5);
+		y += 64;
+	}
+}
+
+int DarkMoonEngine::resurrectionSelectDialogue() {
+	countResurrectionCandidates();
+
+	_rrNames[_rrCount] = _abortStrings[0];
+	_rrId[_rrCount++] = 99;
+
+	int r = _rrId[runDialogue(-1, 9, _rrNames[0], _rrNames[1], _rrNames[2], _rrNames[3], _rrNames[4], _rrNames[5], _rrNames[6], _rrNames[7], _rrNames[8]) - 1];
+	if (r == 99)
+		return 0;
+
+	if (r < 0) {
+		r = -r;
+		if (prepareForNewPartyMember(33, r))
+			initNpc(r - 1);
+	} else {
+		_characters[r].hitPointsCur = 1;
+	}
+
+	return 1;
+}
+
+int DarkMoonEngine::charSelectDialogue() {
+	int cnt = 0;
+	const char *namesList[7];
+	memset(namesList, 0, 7 * sizeof(const char*));
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 3))
+			continue;
+		namesList[cnt++] = _characters[i].name;
+	}
+
+	namesList[cnt++] = _abortStrings[0];
+
+	int r = runDialogue(-1, 7, namesList[0], namesList[1], namesList[2], namesList[3], namesList[4], namesList[5], namesList[6]) - 1;
+	if (r == cnt - 1)
+		return 99;
+
+	for (cnt = 0; cnt < 6; cnt++) {
+		if (!testCharacter(cnt, 3))
+			continue;
+		if (--r < 0)
+			break;
+	}
+	return cnt;
+}
+
+void DarkMoonEngine::characterLevelGain(int charIndex) {
+	EobCharacter *c = &_characters[charIndex];
+	int s = _numLevelsPerClass[c->cClass];
+	for (int i = 0; i < s; i++) {
+		uint32 er = getRequiredExperience(c->cClass, i, c->level[i] + 1);
+		if (er == 0xffffffff)
+			continue;
+
+		increaseCharacterExperience(charIndex, er - c->experience[i] + 1);
+	}
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/darkmoon.h b/engines/kyra/darkmoon.h
new file mode 100644
index 0000000000..35eb90a9dc
--- /dev/null
+++ b/engines/kyra/darkmoon.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.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#ifndef KYRA_EOB2_H
+#define KYRA_EOB2_H
+
+#include "kyra/eobcommon.h"
+
+namespace Kyra {
+
+class DarkmoonSequenceHelper;
+
+struct EobSequenceStep {
+	uint8 command;
+	uint8 obj;
+	int16 x1;
+	uint8 y1;
+	uint8 delay;
+	uint8 pal;
+	uint8 x2;
+	uint8 y2;
+	uint8 w;
+	uint8 h;
+};
+
+class DarkMoonEngine : public EobCoreEngine {
+friend class GUI_Eob;
+friend class DarkmoonSequenceHelper;
+public:
+	DarkMoonEngine(OSystem *system, const GameFlags &flags);
+	~DarkMoonEngine();
+
+private:
+	// Init / Release
+	Common::Error init();
+	void initStaticResource();
+	void initSpells();
+
+	// Main Menu
+	int mainMenu();
+	int mainMenuLoop();
+
+	int _menuChoiceInit;
+
+	// Main loop
+	void startupNew();
+	void startupLoad() {}
+
+	// Intro/Outro
+	void seq_playIntro();
+	void seq_playFinale();
+	void seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *data, int sd, int backupPage, int tempPage, int speed);
+
+	const char * const *_introStrings;
+	const char * const *_cpsFilesIntro;
+	const EobSequenceStep **_seqIntro;
+	const EobShapeDef **_shapesIntro;
+
+	const char * const *_finaleStrings;
+	const uint8 *_creditsData;
+	const char * const *_cpsFilesFinale;
+	const EobSequenceStep **_seqFinale;
+	const EobShapeDef **_shapesFinale;
+
+	static const char *_palFilesIntro[];
+	static const char *_palFilesFinale[];
+
+	// Ingame sequence
+	void seq_nightmare();
+	void seq_kheldran();
+	void seq_dranDragonTransformation();
+
+	const int8 *_dreamSteps;
+	const char *const *_kheldranStrings;
+
+	// characters
+	void drawNpcScene(int npcIndex);
+	void runNpcDialogue(int npcIndex);
+
+	const uint8 *_npcShpData;
+	const char *const *_npcStrings[2];
+
+	// items
+	void updateUsedCharacterHandItem(int charIndex, int slot);
+
+	// Monsters
+	void generateMonsterPalettes(const char *file, int16 monsterIndex);
+	void loadMonsterDecoration(const char *file, int16 monsterIndex);
+	void replaceMonster(int unit, uint16 block, int d, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem);
+	bool killMonsterExtra(EobMonsterInPlay *m);
+
+	// Level
+	const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs);
+	void drawDoorIntern(int type, int, int x, int y, int w, int wall, int mDim, int16, int16);
+
+	const uint8 *_dscDoorType5Offs;
+
+	// Rest party
+	void restParty_npc();
+	bool restParty_extraAbortCondition();
+
+	// misc
+	void useHorn(int charIndex, int weaponSlot);
+	bool checkPartyStatusExtra();
+	void drawLightningColumn();
+	int resurrectionSelectDialogue();
+	int charSelectDialogue();
+	void characterLevelGain(int charIndex);
+
+	const char *const *_hornStrings;
+	const uint8 *_hornSounds;
+};
+
+}	// End of namespace Kyra
+
+#endif
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index abb6a70f42..e021a3a4c2 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -24,8 +24,8 @@
 #include "kyra/lol.h"
 #include "kyra/kyra_hof.h"
 #include "kyra/kyra_mr.h"
-#include "kyra/eob1.h"
-#include "kyra/eob2.h"
+#include "kyra/eob.h"
+#include "kyra/darkmoon.h"
 
 #include "common/config-manager.h"
 #include "common/system.h"
diff --git a/engines/kyra/eob.cpp b/engines/kyra/eob.cpp
new file mode 100644
index 0000000000..d90a3caa74
--- /dev/null
+++ b/engines/kyra/eob.cpp
@@ -0,0 +1,572 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#include "kyra/eob.h"
+#include "kyra/resource.h"
+#include "kyra/sound.h"
+
+namespace Kyra {
+
+EobEngine::EobEngine(OSystem *system, const GameFlags &flags) : EobCoreEngine(system, flags) {
+	_numSpells = 53;
+	_menuChoiceInit = 4;
+
+	_turnUndeadString = _introFilesOpening = _introFilesTower = _introFilesOrb = _introFilesWdEntry	= _introFilesKing = _introFilesHands = _introFilesWdExit =
+		_introFilesTunnel = _finBonusStrings = _npcStrings[1] = _npcStrings[2] = _npcStrings[3] = _npcStrings[4] = _npcStrings[5] = _npcStrings[6] = _npcStrings[7]	=
+		_npcStrings[8] = _npcStrings[9]	= _npcStrings[10] = 0;
+	_introOpeningFrmDelay = _introWdEncodeX	= _introWdEncodeY = _introWdEncodeWH = _npcShpData = _npcSubShpIndex1 = _npcSubShpIndex2 = _npcSubShpY = _introWdDsY =
+		_introTvlX1 = _introTvlY1 = _introTvlX2	= _introTvlY2 = _introTvlW = _introTvlH = _dscDoorScaleMult4 = _dscDoorScaleMult5 = _dscDoorScaleMult6 =
+		_dscDoorY3 = _dscDoorY4 = _dscDoorY5 = _dscDoorY6 = _dscDoorY7 = _doorShapeEncodeDefs = _doorSwitchShapeEncodeDefs = _doorSwitchCoords = 0;
+	_introWdDsX = 0;
+	_dscDoorCoordsExt = 0;
+}
+
+EobEngine::~EobEngine() {
+	delete[] _itemsOverlay;
+}
+
+Common::Error EobEngine::init() {
+	Common::Error err = EobCoreEngine::init();
+	if (err.getCode() != Common::kNoError)
+		return err;
+
+	initStaticResource();
+
+	_itemsOverlay = _res->fileData("ITEMRMP.VGA", 0);
+
+	static const uint16 wX[] = { 285, 139 };
+	static const uint8 wY[] = { 189, 162 };
+	static const uint16 wW[] = { 31, 31 };
+
+	_dialogueButtonLabelCol1 = 9;
+	_dialogueButtonLabelCol2 = 15;
+	_dialogueButtonW = 95;
+	_dialogueButtonH = 9;
+	_waitButtonPresX = wX;
+	_waitButtonPresY = wY;
+	_waitButtonPresW = wW;
+	_waitButtonReverveW = 7;
+
+	_bkgColor_1 = 132;
+	_color1_1 = 135;
+	_color2_1 = 130;
+	_color4 = 133;
+	_color5 = 133;
+	_color6 = 180;
+	_color7 = 177;
+	_color8 = 184;
+
+	_color14 = _color8;
+	_color13 = _color7;
+	_color12 = _color6;
+
+	_screen->modifyScreenDim(7, 0x01, 0xB3, 0x22, 0x12);
+	_screen->modifyScreenDim(9, 0x01, 0x7D, 0x26, 0x3F);
+	_screen->modifyScreenDim(12, 0x01, 0x04, 0x14, 0xA0);
+
+	_scriptTimersCount = 1;
+
+	return Common::kNoError;
+}
+
+void EobEngine::startupNew() {
+	_currentLevel = 1;
+	_currentSub = 0;
+	loadLevel(1, 0);
+	_currentBlock = 490;
+	_currentDirection = 0;
+	setHandItem(0);
+	EobCoreEngine::startupNew();
+}
+
+void EobEngine::startupLoad() {
+	_sound->loadSoundFile("ADLIB");
+}
+
+void EobEngine::drawNpcScene(int npcIndex) {
+	_screen->copyRegion(0, 0, 0, 0, 176, 120, 6, 0, Screen::CR_NO_P_CHECK);
+	switch (npcIndex) {
+	case 0:
+		encodeDrawNpcSeqShape(2, 88, 104);
+		break;
+
+	case 1:
+		if (_npcSequenceSub == -1) {
+			encodeDrawNpcSeqShape(0, 88, 104);
+		} else {
+			encodeDrawNpcSeqShape(0, 60, 104);
+			encodeDrawNpcSeqShape(5, 116, 104);
+		}
+		break;
+
+	case 2:
+		if (_npcSequenceSub == -1) {
+			encodeDrawNpcSeqShape(3, 88, 104);
+		} else {
+			encodeDrawNpcSeqShape(3, 60, 104);
+			encodeDrawNpcSeqShape(_npcSubShpIndex1[_npcSequenceSub], 116, 104);
+			encodeDrawNpcSeqShape(_npcSubShpIndex2[_npcSequenceSub], 116, _npcSubShpY[_npcSequenceSub]);
+		}
+		break;
+
+	case 3:
+		encodeDrawNpcSeqShape(7, 88, 104);
+		break;
+
+	case 4:
+		encodeDrawNpcSeqShape(6, 88, 104);
+		break;
+
+	case 5:
+		encodeDrawNpcSeqShape(18, 88, 88);
+		break;
+
+	case 6:
+		encodeDrawNpcSeqShape(17, 88, 104);
+		break;
+
+	case 7:
+		encodeDrawNpcSeqShape(4, 88, 104);
+		break;
+
+	default:
+		break;
+	}
+}
+
+void EobEngine::encodeDrawNpcSeqShape(int npcIndex, int drawX, int drawY) {
+	const uint8 *shpDef = &_npcShpData[npcIndex << 2];
+	_screen->_curPage = 2;
+	const uint8 *shp = _screen->encodeShape(shpDef[0], shpDef[1], shpDef[2], shpDef[3]);
+	_screen->_curPage = 0;
+	_screen->drawShape(0, shp, drawX - (shp[2] << 2), drawY - shp[1], 5);
+	delete[] shp;
+}
+
+#define DLG2(txt, buttonstr) (runDialogue(txt, 2, _npcStrings[buttonstr][0], _npcStrings[buttonstr][1]) - 1)
+#define DLG3(txt, buttonstr) (runDialogue(txt, 3, _npcStrings[buttonstr][0], _npcStrings[buttonstr][1], _npcStrings[buttonstr][2]) - 1)
+#define DLG2A3(cond, txt, buttonstr1, buttonstr2) ((cond) ? (DLG2(txt, buttonstr1) ? 2 : 0) : DLG3(txt, buttonstr2))
+#define TXT(txt) _txt->printDialogueText(txt, _moreStrings[0])
+
+void EobEngine::runNpcDialogue(int npcIndex) {
+	int r = 0;
+	int a = 0;
+	Item itm = 0;
+
+	switch (npcIndex) {
+	case 0:
+		for (r = 1; r == 1; ) {
+			gui_drawDialogueBox();
+			r = DLG2A3(checkScriptFlags(0x2000), 8, 2, 1);
+			if (r == 1) {
+				TXT(1);
+				setScriptFlags(0x2000);
+			} else if (r == 0) {
+				npcJoinDialogue(6, 12, 23, 2);
+				setScriptFlags(0x4000);
+			}
+		}
+		break;
+
+	case 1:
+		if (!checkScriptFlags(0x10000)) {
+			if (checkScriptFlags(0x8000)) {
+				a = 1;
+			} else {
+				setScriptFlags(0x8000);
+				r = DLG2(3, 3);
+			}
+			if (!r)
+				r = DLG2(a ? 13 : 4, 4);
+
+			if (!r) {
+				for (a = 0; a < 6; a++)
+					createItemOnCurrentBlock(55);
+				createItemOnCurrentBlock(62);
+				setScriptFlags(0x10000);
+				TXT(6);
+				npcJoinDialogue(7, 7, 29, 30);
+			} else {
+				TXT(5);
+			}
+			r = 1;
+		}
+
+		if (!checkScriptFlags(0x80000)) {
+			for (a = 0; a < 6; a++) {
+				if (testCharacter(a, 1) && _characters[a].portrait == -9)
+					break;
+			}
+			if (a != 6) {
+				TXT(25);
+				TXT(26);
+				setScriptFlags(0x80000);
+				r = 1;
+			}
+		}
+
+		if (!checkScriptFlags(0x100000)) {
+			if (deletePartyItems(6, -1)) {
+				//_npcSequenceSub = 0;
+				//drawNpcScene(npcIndex);
+				TXT(28);
+				createItemOnCurrentBlock(32);
+				setScriptFlags(0x100000);
+				r = 1;
+			}
+		}
+
+		if (!r)
+			 _txt->printDialogueText(_npcStrings[0][0], true);
+
+		break;
+
+	case 2:
+		if (checkScriptFlags(0x10000)) {
+			if (checkScriptFlags(0x20000)) {
+				TXT(11);
+			} else {
+				r = DLG2A3(!countResurrectionCandidates(), 9, 5, 6);
+				if (r < 2) {
+					if (r == 0)
+						healParty();
+					else
+						resurrectionSelectDialogue();
+					setScriptFlags(0x20000);
+				}
+			}
+		} else {
+			TXT(24);
+		}
+		break;
+
+	case 3:
+		if (!DLG2(18, 7)) {
+			setScriptFlags(0x8400000);
+			for (a = 0; a < 30; a++) {
+				if (_monsters[a].mode == 8)
+					_monsters[a].mode = 5;
+			}
+		} else if (deletePartyItems(49, -1)) {
+			TXT(20);
+			setScriptFlags(0x400000);
+		} else {
+			TXT(19);
+		}
+		break;
+
+	case 4:
+		r = DLG3(14, 8);
+		if (r == 0)
+			setScriptFlags(0x200000);
+		else if (r == 1)
+			TXT(15);
+		setScriptFlags(0x800000);
+		break;
+
+	case 5:
+		if (!DLG2(16, 9)) {
+			TXT(17);
+			for (a = 0; a < 6; a++) {
+				for (r = 0; r < 2; r++) {
+					itm = _characters[a].inventory[r];
+					if (itm && (_items[itm].type < 51 || _items[itm].type > 56)) {
+						_characters[a].inventory[r] = 0;
+						setItemPosition((Item*)&_levelBlockProperties[_currentBlock].drawObjects, _currentBlock, itm, _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
+					}
+				}
+			}
+		}
+		setScriptFlags(0x2000000);
+		break;
+
+	case 6:
+		TXT(21);
+		setScriptFlags(0x1000000);
+		break;
+
+	case 7:
+		r = DLG3(22, 10);
+		if (r  < 2) {
+			if (r == 0)
+				npcJoinDialogue(8, 27, 44, 45);
+			else
+				TXT(31);
+			setScriptFlags(0x4000000);
+		}
+		break;
+
+	default:
+		break;
+	}
+}
+
+#undef TXT
+#undef DLG2
+#undef DLG3
+#undef DLG2A3
+
+void EobEngine::updateUsedCharacterHandItem(int charIndex, int slot) {
+	EobItem *itm = &_items[_characters[charIndex].inventory[slot]];
+	if (itm->type == 48) {
+		int charges = itm->flags & 0x3f;
+		if (--charges)
+			--itm->flags;
+		else
+			deleteInventoryItem(charIndex, slot);
+	} else if (itm->type == 34 || itm->type == 35) {
+		deleteInventoryItem(charIndex, slot);
+	}
+}
+
+void EobEngine::replaceMonster(int unit, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem) {
+	if (_levelBlockProperties[block].flags & 7)
+		return;
+
+	for (int i = 0; i < 30; i++) {
+		if (_monsters[i].hitPointsCur <= 0) {
+			initMonster(i, unit, block, pos, dir, type, shpIndex, mode, h2, randItem, fixedItem);;
+			break;
+		}
+	}
+}
+
+void EobEngine::updateScriptTimersExtra() {
+	int cnt = 0;
+	for (int i = 1; i < 30; i++) {
+		if (_monsters[i].hitPointsCur <= 0)
+			cnt++;
+	}
+
+	if (!cnt) {
+		for (int i = 1; i < 30; i++) {
+			if (getBlockDistance(_monsters[i].block, _currentBlock) > 3) {
+				killMonster(&_monsters[i], true);
+				break;
+			}
+		}
+	}
+}
+
+void EobEngine::loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) {
+	_screen->loadShapeSetBitmap("DOOR", 5, 3);
+	_screen->_curPage = 2;
+
+	if (doorType1 != 0xff) {
+		for (int i = 0; i < 3; i++) {
+			const uint8 *enc = &_doorShapeEncodeDefs[(doorType1 * 3 + i) << 2];
+			_doorShapes[shapeId1 + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+			enc = &_doorSwitchShapeEncodeDefs[(doorType1 * 3 + i) << 2];
+			_doorSwitches[shapeId1 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+			_doorSwitches[shapeId1 + i].x = _doorSwitchCoords[doorType1 * 6 + i * 2];
+			_doorSwitches[shapeId1 + i].y = _doorSwitchCoords[doorType1 * 6 + i * 2 + 1];
+		}
+	}
+
+	if (doorType2 != 0xff) {
+		for (int i = 0; i < 3; i++) {
+			const uint8 *enc = &_doorShapeEncodeDefs[(doorType2 * 3 + i) << 2];
+			_doorShapes[shapeId2 + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+			enc = &_doorSwitchShapeEncodeDefs[(doorType2 * 3 + i) << 2];
+			_doorSwitches[shapeId2 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+			_doorSwitches[shapeId2 + i].x = _doorSwitchCoords[doorType2 * 6 + i * 2];
+			_doorSwitches[shapeId2 + i].y = _doorSwitchCoords[doorType2 * 6 + i * 2+ 1];
+		}
+	}
+
+	_screen->_curPage = 0;
+}
+
+void EobEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wall, int mDim, int16 y1, int16 y2) {
+	int shapeIndex = type + 2 - mDim;
+	uint8 *shp = _doorShapes[shapeIndex];
+
+	int d1 = 0;
+	int d2 = 0;
+	int v = 0;
+	const ScreenDim *td = _screen->getScreenDim(5);
+
+	switch (_currentLevel) {
+		case 4:
+		case 5:
+		case 6:
+			y = _dscDoorY6[mDim] - shp[1];
+			d1 = _dscDoorCoordsExt[index << 1] >> 3;
+			d2 = _dscDoorCoordsExt[(index << 1) + 1] >> 3;
+			if (_shpDmX1 > d1)
+				d1 = _shpDmX1;
+			if (_shpDmX2 < d2)
+				d2 = _shpDmX2;
+			_screen->modifyScreenDim(5, d1, td->sy, d2 - d1, td->h);
+			v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult3[mDim] : _dscDoorScaleMult4[mDim]) * -1;
+			v -= (shp[2] << 3);
+			drawBlockObject(0, 2, shp, x + v, y, 5);
+			v += (shp[2] << 3);
+			drawBlockObject(1, 2, shp, x - v, y, 5);
+			if (_wllShapeMap[wall] == -1)
+				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w - v, _doorSwitches[shapeIndex].y, 5);
+			break;
+
+		case 7:
+		case 8:
+		case 9:
+			y = _dscDoorY3[mDim] - _doorShapes[shapeIndex + 3][1];
+			d1 = x - (_doorShapes[shapeIndex + 3][2] << 2);
+			x -= (shp[2] << 2);
+			drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], d1, y, 5);
+			scaleLevelShapesDim(index, y1, y2, 5);
+			y = _dscDoorY3[mDim] - ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim] : _dscDoorScaleMult2[mDim]);
+			drawBlockObject(0, 2, shp, x, y, 5);
+			if (_wllShapeMap[wall] == -1)
+				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+			break;
+
+		case 10:
+		case 11:
+			v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult5[mDim] : _dscDoorScaleMult6[mDim]) * -1;
+			x -= (shp[2] << 2);
+			y = _dscDoorY4[mDim] + v;
+			drawBlockObject(0, 2, shp, x, y + v, 5);
+			v = (v >> 3) + (v >> 2);
+			y = _dscDoorY5[mDim];
+			drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], x, y - v, 5);
+			if (_wllShapeMap[wall] == -1)
+				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+			break;
+
+		default:
+			y = (_currentLevel == 12 ? _dscDoorY6[mDim] : _dscDoorY1[mDim]) - shp[1];
+			x -= (shp[2] << 2);
+			y -= (wall >= 30 ? _dscDoorScaleMult2[mDim] : (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim]);
+			drawBlockObject(0, 2, shp, x, y, 5);
+
+			if (_wllShapeMap[wall] == -1)
+				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+			break;
+	}
+}
+
+void EobEngine::turnUndeadAuto() {
+	if (_currentLevel != 2 && _currentLevel != 7)
+		return;
+
+	int oc = _openBookChar;
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 0x0d))
+			continue;
+
+		EobCharacter *c = &_characters[i];
+
+		if (_itemTypes[_items[c->inventory[0]].type].extraProperties != 6 && _itemTypes[_items[c->inventory[1]].type].extraProperties != 6)
+			continue;
+
+		int l = getCharacterLevelIndex(2, c->cClass);
+		if (l > -1) {
+			if (c->level[l] > _openBookCasterLevel) {
+				_openBookCasterLevel = c->level[l];
+				_openBookChar = i;
+			}
+		} else {
+			l = getCharacterLevelIndex(4, c->cClass);
+			if (l > -1) {
+				if ((c->level[l] - 2) > _openBookCasterLevel) {
+					_openBookCasterLevel = (c->level[l] - 2);
+					_openBookChar = i;
+				}
+			}
+		}
+	}
+
+	if (_openBookCasterLevel)
+		spellCallback_start_turnUndead();
+
+	_openBookChar = oc;
+	_openBookCasterLevel = 0;
+}
+
+void EobEngine::turnUndeadAutoHit() {
+	_txt->printMessage(_turnUndeadString[0], -1, _characters[_openBookChar].name);
+	sparkEffectOffensive();
+}
+
+bool EobEngine::checkPartyStatusExtra() {
+	_screen->copyPage(0, 10);
+	int cd = _screen->curDimIndex();
+	gui_drawBox(0, 121, 320, 80, _color1_1, _color2_1, _bkgColor_1);
+	_txt->setupField(9, false);
+	_txt->printMessage(_menuStringsDefeat[0]);
+	while (!shouldQuit()) {
+		removeInputTop();
+		if (checkInput(0, false, 0) & 0xff)
+			break;
+	}
+	_screen->copyPage(10, 0);
+	_eventList.clear();
+	_screen->setScreenDim(cd);
+	_txt->removePageBreakFlag();
+	return true;
+}
+
+int EobEngine::resurrectionSelectDialogue() {
+	gui_drawDialogueBox();
+	_txt->printDialogueText(_npcStrings[0][1]);
+
+	int r = _rrId[runDialogue(-1, 9, _rrNames[0], _rrNames[1], _rrNames[2], _rrNames[3], _rrNames[4], _rrNames[5], _rrNames[6], _rrNames[7], _rrNames[8]) - 1];
+
+	if (r < 0) {
+		r = -r;
+		deletePartyItems(33, r);
+		_npcSequenceSub = r - 1;
+		drawNpcScene(2);
+		npcJoinDialogue(_npcSequenceSub, 32 + (_npcSequenceSub << 1), -1, 33 + (_npcSequenceSub << 1));
+	} else {
+		_characters[r].hitPointsCur = _characters[r].hitPointsMax;
+	}
+
+	return 1;
+}
+
+void EobEngine::healParty() {
+	int cnt = rollDice(1, 3, 2);
+	for (int i = 0; i < 6 && cnt; i++) {
+		if (testCharacter(i, 3))
+			continue;
+
+		_characters[i].flags &= ~4;
+		neutralizePoison(i);
+
+		if (_characters[i].hitPointsCur >= _characters[i].hitPointsMax)
+			continue;
+
+		cnt--;
+		_characters[i].hitPointsCur += rollDice(1, 8, 9);
+		if (_characters[i].hitPointsCur > _characters[i].hitPointsMax)
+			_characters[i].hitPointsCur = _characters[i].hitPointsMax;
+	}
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/eob.h b/engines/kyra/eob.h
new file mode 100644
index 0000000000..2dfccca94e
--- /dev/null
+++ b/engines/kyra/eob.h
@@ -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.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#ifndef KYRA_EOB1_H
+#define KYRA_EOB1_H
+
+#include "kyra/eobcommon.h"
+
+namespace Kyra {
+
+class EobEngine : public EobCoreEngine {
+friend class GUI_Eob;
+public:
+	EobEngine(OSystem *system, const GameFlags &flags);
+	~EobEngine();
+
+private:
+	// Init / Release
+	Common::Error init();
+	void initStaticResource();
+	void initSpells();
+
+	// Main Menu
+	int mainMenu();
+	int mainMenuLoop();
+	int _menuChoiceInit;
+
+	// Main loop
+	void startupNew();
+	void startupLoad();
+
+	// Intro/Outro
+	void seq_playOpeningCredits();
+	void seq_playIntro();
+	void seq_playFinale();
+
+	void seq_tower();
+	void seq_orb();
+	void seq_waterdeepEntry();
+	void seq_king();
+	void seq_hands();
+	void seq_waterdeepExit();
+	void seq_tunnel();
+
+	void seq_xdeath();
+
+	void loadSetIntroPalette(const char *filename);
+	void copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step);
+	void boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH);
+	void whirlTransition();
+
+	const char *const *_introFilesOpening;
+	const char *const *_introFilesTower;
+	const char *const *_introFilesOrb;
+	const char *const *_introFilesWdEntry;
+	const char *const *_introFilesKing;
+	const char *const *_introFilesHands;
+	const char *const *_introFilesWdExit;
+	const char *const *_introFilesTunnel;
+	const uint8 *_introOpeningFrmDelay;
+	const uint8 *_introWdEncodeX;
+	const uint8 *_introWdEncodeY;
+	const uint8 *_introWdEncodeWH;
+	const uint16 *_introWdDsX;
+	const uint8 *_introWdDsY;
+	const uint8 *_introTvlX1;
+	const uint8 *_introTvlY1;
+	const uint8 *_introTvlX2;
+	const uint8 *_introTvlY2;
+	const uint8 *_introTvlW;
+	const uint8 *_introTvlH;
+
+	const char *const *_finBonusStrings;
+
+	// characters
+	void drawNpcScene(int npcIndex);
+	void encodeDrawNpcSeqShape(int npcIndex, int drawX, int drawY);
+	void runNpcDialogue(int npcIndex);
+
+	const uint8 *_npcShpData;
+	const uint8 *_npcSubShpIndex1;
+	const uint8 *_npcSubShpIndex2;
+	const uint8 *_npcSubShpY;
+	const char *const *_npcStrings[11];
+
+	// items
+	void updateUsedCharacterHandItem(int charIndex, int slot);
+
+	// Monsters
+	void replaceMonster(int unit, uint16 block, int d, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem);
+	void updateScriptTimersExtra();
+
+	// Level
+	void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2);
+	void drawDoorIntern(int type, int index, int x, int y, int w, int wall, int mDim, int16 y1, int16 y2);
+
+	const int16 *_dscDoorCoordsExt;
+	const uint8 *_dscDoorScaleMult4;
+	const uint8 *_dscDoorScaleMult5;
+	const uint8 *_dscDoorScaleMult6;
+	const uint8 *_dscDoorY3;
+	const uint8 *_dscDoorY4;
+	const uint8 *_dscDoorY5;
+	const uint8 *_dscDoorY6;
+	const uint8 *_dscDoorY7;
+
+	const uint8 *_doorShapeEncodeDefs;
+	const uint8 *_doorSwitchShapeEncodeDefs;
+	const uint8 *_doorSwitchCoords;
+
+	// Magic
+	void turnUndeadAuto();
+	void turnUndeadAutoHit();
+
+	const char * const *_turnUndeadString;
+
+	// Misc
+	bool checkPartyStatusExtra();
+	int resurrectionSelectDialogue();
+	void healParty();
+};
+
+
+}	// End of namespace Kyra
+
+#endif
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob1.cpp
deleted file mode 100644
index c87118918a..0000000000
--- a/engines/kyra/eob1.cpp
+++ /dev/null
@@ -1,572 +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.
- *
- */
-
-#ifdef ENABLE_EOB
-
-#include "kyra/eob1.h"
-#include "kyra/resource.h"
-#include "kyra/sound.h"
-
-namespace Kyra {
-
-EobEngine::EobEngine(OSystem *system, const GameFlags &flags) : EobCoreEngine(system, flags) {
-	_numSpells = 53;
-	_menuChoiceInit = 4;
-
-	_turnUndeadString = _introFilesOpening = _introFilesTower = _introFilesOrb = _introFilesWdEntry	= _introFilesKing = _introFilesHands = _introFilesWdExit =
-		_introFilesTunnel = _finBonusStrings = _npcStrings[1] = _npcStrings[2] = _npcStrings[3] = _npcStrings[4] = _npcStrings[5] = _npcStrings[6] = _npcStrings[7]	=
-		_npcStrings[8] = _npcStrings[9]	= _npcStrings[10] = 0;
-	_introOpeningFrmDelay = _introWdEncodeX	= _introWdEncodeY = _introWdEncodeWH = _npcShpData = _npcSubShpIndex1 = _npcSubShpIndex2 = _npcSubShpY = _introWdDsY =
-		_introTvlX1 = _introTvlY1 = _introTvlX2	= _introTvlY2 = _introTvlW = _introTvlH = _dscDoorScaleMult4 = _dscDoorScaleMult5 = _dscDoorScaleMult6 =
-		_dscDoorY3 = _dscDoorY4 = _dscDoorY5 = _dscDoorY6 = _dscDoorY7 = _doorShapeEncodeDefs = _doorSwitchShapeEncodeDefs = _doorSwitchCoords = 0;
-	_introWdDsX = 0;
-	_dscDoorCoordsExt = 0;
-}
-
-EobEngine::~EobEngine() {
-	delete[] _itemsOverlay;
-}
-
-Common::Error EobEngine::init() {
-	Common::Error err = EobCoreEngine::init();
-	if (err.getCode() != Common::kNoError)
-		return err;
-
-	initStaticResource();
-
-	_itemsOverlay = _res->fileData("ITEMRMP.VGA", 0);
-
-	static const uint16 wX[] = { 285, 139 };
-	static const uint8 wY[] = { 189, 162 };
-	static const uint16 wW[] = { 31, 31 };
-
-	_dialogueButtonLabelCol1 = 9;
-	_dialogueButtonLabelCol2 = 15;
-	_dialogueButtonW = 95;
-	_dialogueButtonH = 9;
-	_waitButtonPresX = wX;
-	_waitButtonPresY = wY;
-	_waitButtonPresW = wW;
-	_waitButtonReverveW = 7;
-
-	_bkgColor_1 = 132;
-	_color1_1 = 135;
-	_color2_1 = 130;
-	_color4 = 133;
-	_color5 = 133;
-	_color6 = 180;
-	_color7 = 177;
-	_color8 = 184;
-
-	_color14 = _color8;
-	_color13 = _color7;
-	_color12 = _color6;
-
-	_screen->modifyScreenDim(7, 0x01, 0xB3, 0x22, 0x12);
-	_screen->modifyScreenDim(9, 0x01, 0x7D, 0x26, 0x3F);
-	_screen->modifyScreenDim(12, 0x01, 0x04, 0x14, 0xA0);
-
-	_scriptTimersCount = 1;
-
-	return Common::kNoError;
-}
-
-void EobEngine::startupNew() {
-	_currentLevel = 1;
-	_currentSub = 0;
-	loadLevel(1, 0);
-	_currentBlock = 490;
-	_currentDirection = 0;
-	setHandItem(0);
-	EobCoreEngine::startupNew();
-}
-
-void EobEngine::startupLoad() {
-	_sound->loadSoundFile("ADLIB");
-}
-
-void EobEngine::drawNpcScene(int npcIndex) {
-	_screen->copyRegion(0, 0, 0, 0, 176, 120, 6, 0, Screen::CR_NO_P_CHECK);
-	switch (npcIndex) {
-	case 0:
-		encodeDrawNpcSeqShape(2, 88, 104);
-		break;
-
-	case 1:
-		if (_npcSequenceSub == -1) {
-			encodeDrawNpcSeqShape(0, 88, 104);
-		} else {
-			encodeDrawNpcSeqShape(0, 60, 104);
-			encodeDrawNpcSeqShape(5, 116, 104);
-		}
-		break;
-
-	case 2:
-		if (_npcSequenceSub == -1) {
-			encodeDrawNpcSeqShape(3, 88, 104);
-		} else {
-			encodeDrawNpcSeqShape(3, 60, 104);
-			encodeDrawNpcSeqShape(_npcSubShpIndex1[_npcSequenceSub], 116, 104);
-			encodeDrawNpcSeqShape(_npcSubShpIndex2[_npcSequenceSub], 116, _npcSubShpY[_npcSequenceSub]);
-		}
-		break;
-
-	case 3:
-		encodeDrawNpcSeqShape(7, 88, 104);
-		break;
-
-	case 4:
-		encodeDrawNpcSeqShape(6, 88, 104);
-		break;
-
-	case 5:
-		encodeDrawNpcSeqShape(18, 88, 88);
-		break;
-
-	case 6:
-		encodeDrawNpcSeqShape(17, 88, 104);
-		break;
-
-	case 7:
-		encodeDrawNpcSeqShape(4, 88, 104);
-		break;
-
-	default:
-		break;
-	}
-}
-
-void EobEngine::encodeDrawNpcSeqShape(int npcIndex, int drawX, int drawY) {
-	const uint8 *shpDef = &_npcShpData[npcIndex << 2];
-	_screen->_curPage = 2;
-	const uint8 *shp = _screen->encodeShape(shpDef[0], shpDef[1], shpDef[2], shpDef[3]);
-	_screen->_curPage = 0;
-	_screen->drawShape(0, shp, drawX - (shp[2] << 2), drawY - shp[1], 5);
-	delete[] shp;
-}
-
-#define DLG2(txt, buttonstr) (runDialogue(txt, 2, _npcStrings[buttonstr][0], _npcStrings[buttonstr][1]) - 1)
-#define DLG3(txt, buttonstr) (runDialogue(txt, 3, _npcStrings[buttonstr][0], _npcStrings[buttonstr][1], _npcStrings[buttonstr][2]) - 1)
-#define DLG2A3(cond, txt, buttonstr1, buttonstr2) ((cond) ? (DLG2(txt, buttonstr1) ? 2 : 0) : DLG3(txt, buttonstr2))
-#define TXT(txt) _txt->printDialogueText(txt, _moreStrings[0])
-
-void EobEngine::runNpcDialogue(int npcIndex) {
-	int r = 0;
-	int a = 0;
-	Item itm = 0;
-
-	switch (npcIndex) {
-	case 0:
-		for (r = 1; r == 1; ) {
-			gui_drawDialogueBox();
-			r = DLG2A3(checkScriptFlags(0x2000), 8, 2, 1);
-			if (r == 1) {
-				TXT(1);
-				setScriptFlags(0x2000);
-			} else if (r == 0) {
-				npcJoinDialogue(6, 12, 23, 2);
-				setScriptFlags(0x4000);
-			}
-		}
-		break;
-
-	case 1:
-		if (!checkScriptFlags(0x10000)) {
-			if (checkScriptFlags(0x8000)) {
-				a = 1;
-			} else {
-				setScriptFlags(0x8000);
-				r = DLG2(3, 3);
-			}
-			if (!r)
-				r = DLG2(a ? 13 : 4, 4);
-
-			if (!r) {
-				for (a = 0; a < 6; a++)
-					createItemOnCurrentBlock(55);
-				createItemOnCurrentBlock(62);
-				setScriptFlags(0x10000);
-				TXT(6);
-				npcJoinDialogue(7, 7, 29, 30);
-			} else {
-				TXT(5);
-			}
-			r = 1;
-		}
-
-		if (!checkScriptFlags(0x80000)) {
-			for (a = 0; a < 6; a++) {
-				if (testCharacter(a, 1) && _characters[a].portrait == -9)
-					break;
-			}
-			if (a != 6) {
-				TXT(25);
-				TXT(26);
-				setScriptFlags(0x80000);
-				r = 1;
-			}
-		}
-
-		if (!checkScriptFlags(0x100000)) {
-			if (deletePartyItems(6, -1)) {
-				//_npcSequenceSub = 0;
-				//drawNpcScene(npcIndex);
-				TXT(28);
-				createItemOnCurrentBlock(32);
-				setScriptFlags(0x100000);
-				r = 1;
-			}
-		}
-
-		if (!r)
-			 _txt->printDialogueText(_npcStrings[0][0], true);
-
-		break;
-
-	case 2:
-		if (checkScriptFlags(0x10000)) {
-			if (checkScriptFlags(0x20000)) {
-				TXT(11);
-			} else {
-				r = DLG2A3(!countResurrectionCandidates(), 9, 5, 6);
-				if (r < 2) {
-					if (r == 0)
-						healParty();
-					else
-						resurrectionSelectDialogue();
-					setScriptFlags(0x20000);
-				}
-			}
-		} else {
-			TXT(24);
-		}
-		break;
-
-	case 3:
-		if (!DLG2(18, 7)) {
-			setScriptFlags(0x8400000);
-			for (a = 0; a < 30; a++) {
-				if (_monsters[a].mode == 8)
-					_monsters[a].mode = 5;
-			}
-		} else if (deletePartyItems(49, -1)) {
-			TXT(20);
-			setScriptFlags(0x400000);
-		} else {
-			TXT(19);
-		}
-		break;
-
-	case 4:
-		r = DLG3(14, 8);
-		if (r == 0)
-			setScriptFlags(0x200000);
-		else if (r == 1)
-			TXT(15);
-		setScriptFlags(0x800000);
-		break;
-
-	case 5:
-		if (!DLG2(16, 9)) {
-			TXT(17);
-			for (a = 0; a < 6; a++) {
-				for (r = 0; r < 2; r++) {
-					itm = _characters[a].inventory[r];
-					if (itm && (_items[itm].type < 51 || _items[itm].type > 56)) {
-						_characters[a].inventory[r] = 0;
-						setItemPosition((Item*)&_levelBlockProperties[_currentBlock].drawObjects, _currentBlock, itm, _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
-					}
-				}
-			}
-		}
-		setScriptFlags(0x2000000);
-		break;
-
-	case 6:
-		TXT(21);
-		setScriptFlags(0x1000000);
-		break;
-
-	case 7:
-		r = DLG3(22, 10);
-		if (r  < 2) {
-			if (r == 0)
-				npcJoinDialogue(8, 27, 44, 45);
-			else
-				TXT(31);
-			setScriptFlags(0x4000000);
-		}
-		break;
-
-	default:
-		break;
-	}
-}
-
-#undef TXT
-#undef DLG2
-#undef DLG3
-#undef DLG2A3
-
-void EobEngine::updateUsedCharacterHandItem(int charIndex, int slot) {
-	EobItem *itm = &_items[_characters[charIndex].inventory[slot]];
-	if (itm->type == 48) {
-		int charges = itm->flags & 0x3f;
-		if (--charges)
-			--itm->flags;
-		else
-			deleteInventoryItem(charIndex, slot);
-	} else if (itm->type == 34 || itm->type == 35) {
-		deleteInventoryItem(charIndex, slot);
-	}
-}
-
-void EobEngine::replaceMonster(int unit, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem) {
-	if (_levelBlockProperties[block].flags & 7)
-		return;
-
-	for (int i = 0; i < 30; i++) {
-		if (_monsters[i].hitPointsCur <= 0) {
-			initMonster(i, unit, block, pos, dir, type, shpIndex, mode, h2, randItem, fixedItem);;
-			break;
-		}
-	}
-}
-
-void EobEngine::updateScriptTimersExtra() {
-	int cnt = 0;
-	for (int i = 1; i < 30; i++) {
-		if (_monsters[i].hitPointsCur <= 0)
-			cnt++;
-	}
-
-	if (!cnt) {
-		for (int i = 1; i < 30; i++) {
-			if (getBlockDistance(_monsters[i].block, _currentBlock) > 3) {
-				killMonster(&_monsters[i], true);
-				break;
-			}
-		}
-	}
-}
-
-void EobEngine::loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) {
-	_screen->loadShapeSetBitmap("DOOR", 5, 3);
-	_screen->_curPage = 2;
-
-	if (doorType1 != 0xff) {
-		for (int i = 0; i < 3; i++) {
-			const uint8 *enc = &_doorShapeEncodeDefs[(doorType1 * 3 + i) << 2];
-			_doorShapes[shapeId1 + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
-			enc = &_doorSwitchShapeEncodeDefs[(doorType1 * 3 + i) << 2];
-			_doorSwitches[shapeId1 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
-			_doorSwitches[shapeId1 + i].x = _doorSwitchCoords[doorType1 * 6 + i * 2];
-			_doorSwitches[shapeId1 + i].y = _doorSwitchCoords[doorType1 * 6 + i * 2 + 1];
-		}
-	}
-
-	if (doorType2 != 0xff) {
-		for (int i = 0; i < 3; i++) {
-			const uint8 *enc = &_doorShapeEncodeDefs[(doorType2 * 3 + i) << 2];
-			_doorShapes[shapeId2 + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
-			enc = &_doorSwitchShapeEncodeDefs[(doorType2 * 3 + i) << 2];
-			_doorSwitches[shapeId2 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
-			_doorSwitches[shapeId2 + i].x = _doorSwitchCoords[doorType2 * 6 + i * 2];
-			_doorSwitches[shapeId2 + i].y = _doorSwitchCoords[doorType2 * 6 + i * 2+ 1];
-		}
-	}
-
-	_screen->_curPage = 0;
-}
-
-void EobEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wall, int mDim, int16 y1, int16 y2) {
-	int shapeIndex = type + 2 - mDim;
-	uint8 *shp = _doorShapes[shapeIndex];
-
-	int d1 = 0;
-	int d2 = 0;
-	int v = 0;
-	const ScreenDim *td = _screen->getScreenDim(5);
-
-	switch (_currentLevel) {
-		case 4:
-		case 5:
-		case 6:
-			y = _dscDoorY6[mDim] - shp[1];
-			d1 = _dscDoorCoordsExt[index << 1] >> 3;
-			d2 = _dscDoorCoordsExt[(index << 1) + 1] >> 3;
-			if (_shpDmX1 > d1)
-				d1 = _shpDmX1;
-			if (_shpDmX2 < d2)
-				d2 = _shpDmX2;
-			_screen->modifyScreenDim(5, d1, td->sy, d2 - d1, td->h);
-			v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult3[mDim] : _dscDoorScaleMult4[mDim]) * -1;
-			v -= (shp[2] << 3);
-			drawBlockObject(0, 2, shp, x + v, y, 5);
-			v += (shp[2] << 3);
-			drawBlockObject(1, 2, shp, x - v, y, 5);
-			if (_wllShapeMap[wall] == -1)
-				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w - v, _doorSwitches[shapeIndex].y, 5);
-			break;
-
-		case 7:
-		case 8:
-		case 9:
-			y = _dscDoorY3[mDim] - _doorShapes[shapeIndex + 3][1];
-			d1 = x - (_doorShapes[shapeIndex + 3][2] << 2);
-			x -= (shp[2] << 2);
-			drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], d1, y, 5);
-			scaleLevelShapesDim(index, y1, y2, 5);
-			y = _dscDoorY3[mDim] - ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim] : _dscDoorScaleMult2[mDim]);
-			drawBlockObject(0, 2, shp, x, y, 5);
-			if (_wllShapeMap[wall] == -1)
-				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
-			break;
-
-		case 10:
-		case 11:
-			v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult5[mDim] : _dscDoorScaleMult6[mDim]) * -1;
-			x -= (shp[2] << 2);
-			y = _dscDoorY4[mDim] + v;
-			drawBlockObject(0, 2, shp, x, y + v, 5);
-			v = (v >> 3) + (v >> 2);
-			y = _dscDoorY5[mDim];
-			drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], x, y - v, 5);
-			if (_wllShapeMap[wall] == -1)
-				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
-			break;
-
-		default:
-			y = (_currentLevel == 12 ? _dscDoorY6[mDim] : _dscDoorY1[mDim]) - shp[1];
-			x -= (shp[2] << 2);
-			y -= (wall >= 30 ? _dscDoorScaleMult2[mDim] : (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim]);
-			drawBlockObject(0, 2, shp, x, y, 5);
-
-			if (_wllShapeMap[wall] == -1)
-				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
-			break;
-	}
-}
-
-void EobEngine::turnUndeadAuto() {
-	if (_currentLevel != 2 && _currentLevel != 7)
-		return;
-
-	int oc = _openBookChar;
-
-	for (int i = 0; i < 6; i++) {
-		if (!testCharacter(i, 0x0d))
-			continue;
-
-		EobCharacter *c = &_characters[i];
-
-		if (_itemTypes[_items[c->inventory[0]].type].extraProperties != 6 && _itemTypes[_items[c->inventory[1]].type].extraProperties != 6)
-			continue;
-
-		int l = getCharacterLevelIndex(2, c->cClass);
-		if (l > -1) {
-			if (c->level[l] > _openBookCasterLevel) {
-				_openBookCasterLevel = c->level[l];
-				_openBookChar = i;
-			}
-		} else {
-			l = getCharacterLevelIndex(4, c->cClass);
-			if (l > -1) {
-				if ((c->level[l] - 2) > _openBookCasterLevel) {
-					_openBookCasterLevel = (c->level[l] - 2);
-					_openBookChar = i;
-				}
-			}
-		}
-	}
-
-	if (_openBookCasterLevel)
-		spellCallback_start_turnUndead();
-
-	_openBookChar = oc;
-	_openBookCasterLevel = 0;
-}
-
-void EobEngine::turnUndeadAutoHit() {
-	_txt->printMessage(_turnUndeadString[0], -1, _characters[_openBookChar].name);
-	sparkEffectOffensive();
-}
-
-bool EobEngine::checkPartyStatusExtra() {
-	_screen->copyPage(0, 10);
-	int cd = _screen->curDimIndex();
-	gui_drawBox(0, 121, 320, 80, _color1_1, _color2_1, _bkgColor_1);
-	_txt->setupField(9, false);
-	_txt->printMessage(_menuStringsDefeat[0]);
-	while (!shouldQuit()) {
-		removeInputTop();
-		if (checkInput(0, false, 0) & 0xff)
-			break;
-	}
-	_screen->copyPage(10, 0);
-	_eventList.clear();
-	_screen->setScreenDim(cd);
-	_txt->removePageBreakFlag();
-	return true;
-}
-
-int EobEngine::resurrectionSelectDialogue() {
-	gui_drawDialogueBox();
-	_txt->printDialogueText(_npcStrings[0][1]);
-
-	int r = _rrId[runDialogue(-1, 9, _rrNames[0], _rrNames[1], _rrNames[2], _rrNames[3], _rrNames[4], _rrNames[5], _rrNames[6], _rrNames[7], _rrNames[8]) - 1];
-
-	if (r < 0) {
-		r = -r;
-		deletePartyItems(33, r);
-		_npcSequenceSub = r - 1;
-		drawNpcScene(2);
-		npcJoinDialogue(_npcSequenceSub, 32 + (_npcSequenceSub << 1), -1, 33 + (_npcSequenceSub << 1));
-	} else {
-		_characters[r].hitPointsCur = _characters[r].hitPointsMax;
-	}
-
-	return 1;
-}
-
-void EobEngine::healParty() {
-	int cnt = rollDice(1, 3, 2);
-	for (int i = 0; i < 6 && cnt; i++) {
-		if (testCharacter(i, 3))
-			continue;
-
-		_characters[i].flags &= ~4;
-		neutralizePoison(i);
-
-		if (_characters[i].hitPointsCur >= _characters[i].hitPointsMax)
-			continue;
-
-		cnt--;
-		_characters[i].hitPointsCur += rollDice(1, 8, 9);
-		if (_characters[i].hitPointsCur > _characters[i].hitPointsMax)
-			_characters[i].hitPointsCur = _characters[i].hitPointsMax;
-	}
-}
-
-}	// End of namespace Kyra
-
-#endif // ENABLE_EOB
diff --git a/engines/kyra/eob1.h b/engines/kyra/eob1.h
deleted file mode 100644
index 2dfccca94e..0000000000
--- a/engines/kyra/eob1.h
+++ /dev/null
@@ -1,149 +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.
- *
- */
-
-#ifdef ENABLE_EOB
-
-#ifndef KYRA_EOB1_H
-#define KYRA_EOB1_H
-
-#include "kyra/eobcommon.h"
-
-namespace Kyra {
-
-class EobEngine : public EobCoreEngine {
-friend class GUI_Eob;
-public:
-	EobEngine(OSystem *system, const GameFlags &flags);
-	~EobEngine();
-
-private:
-	// Init / Release
-	Common::Error init();
-	void initStaticResource();
-	void initSpells();
-
-	// Main Menu
-	int mainMenu();
-	int mainMenuLoop();
-	int _menuChoiceInit;
-
-	// Main loop
-	void startupNew();
-	void startupLoad();
-
-	// Intro/Outro
-	void seq_playOpeningCredits();
-	void seq_playIntro();
-	void seq_playFinale();
-
-	void seq_tower();
-	void seq_orb();
-	void seq_waterdeepEntry();
-	void seq_king();
-	void seq_hands();
-	void seq_waterdeepExit();
-	void seq_tunnel();
-
-	void seq_xdeath();
-
-	void loadSetIntroPalette(const char *filename);
-	void copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step);
-	void boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH);
-	void whirlTransition();
-
-	const char *const *_introFilesOpening;
-	const char *const *_introFilesTower;
-	const char *const *_introFilesOrb;
-	const char *const *_introFilesWdEntry;
-	const char *const *_introFilesKing;
-	const char *const *_introFilesHands;
-	const char *const *_introFilesWdExit;
-	const char *const *_introFilesTunnel;
-	const uint8 *_introOpeningFrmDelay;
-	const uint8 *_introWdEncodeX;
-	const uint8 *_introWdEncodeY;
-	const uint8 *_introWdEncodeWH;
-	const uint16 *_introWdDsX;
-	const uint8 *_introWdDsY;
-	const uint8 *_introTvlX1;
-	const uint8 *_introTvlY1;
-	const uint8 *_introTvlX2;
-	const uint8 *_introTvlY2;
-	const uint8 *_introTvlW;
-	const uint8 *_introTvlH;
-
-	const char *const *_finBonusStrings;
-
-	// characters
-	void drawNpcScene(int npcIndex);
-	void encodeDrawNpcSeqShape(int npcIndex, int drawX, int drawY);
-	void runNpcDialogue(int npcIndex);
-
-	const uint8 *_npcShpData;
-	const uint8 *_npcSubShpIndex1;
-	const uint8 *_npcSubShpIndex2;
-	const uint8 *_npcSubShpY;
-	const char *const *_npcStrings[11];
-
-	// items
-	void updateUsedCharacterHandItem(int charIndex, int slot);
-
-	// Monsters
-	void replaceMonster(int unit, uint16 block, int d, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem);
-	void updateScriptTimersExtra();
-
-	// Level
-	void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2);
-	void drawDoorIntern(int type, int index, int x, int y, int w, int wall, int mDim, int16 y1, int16 y2);
-
-	const int16 *_dscDoorCoordsExt;
-	const uint8 *_dscDoorScaleMult4;
-	const uint8 *_dscDoorScaleMult5;
-	const uint8 *_dscDoorScaleMult6;
-	const uint8 *_dscDoorY3;
-	const uint8 *_dscDoorY4;
-	const uint8 *_dscDoorY5;
-	const uint8 *_dscDoorY6;
-	const uint8 *_dscDoorY7;
-
-	const uint8 *_doorShapeEncodeDefs;
-	const uint8 *_doorSwitchShapeEncodeDefs;
-	const uint8 *_doorSwitchCoords;
-
-	// Magic
-	void turnUndeadAuto();
-	void turnUndeadAutoHit();
-
-	const char * const *_turnUndeadString;
-
-	// Misc
-	bool checkPartyStatusExtra();
-	int resurrectionSelectDialogue();
-	void healParty();
-};
-
-
-}	// End of namespace Kyra
-
-#endif
-
-#endif // ENABLE_EOB
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/eob2.cpp
deleted file mode 100644
index 64e394a717..0000000000
--- a/engines/kyra/eob2.cpp
+++ /dev/null
@@ -1,480 +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.
- *
- */
-
-#ifdef ENABLE_EOB
-
-#include "kyra/eob2.h"
-#include "kyra/resource.h"
-#include "kyra/sound.h"
-
-namespace Kyra {
-
-DarkMoonEngine::DarkMoonEngine(OSystem *system, const GameFlags &flags) : EobCoreEngine(system, flags) {
-	_seqIntro = _seqFinale = 0;
-	_shapesIntro = _shapesFinale = 0;
-	_dscDoorType5Offs = 0;
-	_numSpells = 70;
-	_menuChoiceInit = 4;
-
-	_introStrings = _cpsFilesIntro = _cpsFilesFinale = _finaleStrings = _kheldranStrings = _npcStrings[0] = _npcStrings[1] = _hornStrings = 0;
-	_seqIntro = _seqFinale = 0;
-	_shapesIntro = _shapesFinale = 0;
-	_creditsData = _npcShpData = _dscDoorType5Offs = _hornSounds = 0;
-	_dreamSteps = 0;
-}
-
-DarkMoonEngine::~DarkMoonEngine() {
-	delete[] _seqIntro;
-	delete[] _seqFinale;
-	delete[] _shapesIntro;
-	delete[] _shapesFinale;
-}
-
-Common::Error DarkMoonEngine::init() {
-	Common::Error err = EobCoreEngine::init();
-	if (err.getCode() != Common::kNoError)
-		return err;
-
-	initStaticResource();
-
-	_monsterProps = new EobMonsterProperty[10];
-
-	static const uint16 wX[] = { 221, 76 };
-	static const uint8 wY[] = { 189, 162 };
-	static const uint16 wW[] = { 95, 95 };
-
-	_dialogueButtonLabelCol1 = 9;
-	_dialogueButtonLabelCol2 = 15;
-	_dialogueButtonW = 95;
-	_dialogueButtonH = 9;
-	_waitButtonPresX = wX;
-	_waitButtonPresY = wY;
-	_waitButtonPresW = wW;
-	_waitButtonReverveW = 7;
-
-	_bkgColor_1 = 183;
-	_color1_1 = 186;
-	_color2_1 = 181;
-	_color4 = 133;
-	_color5 = 184;
-	_color6 = 183;
-	_color7 = 181;
-	_color8 = 186;
-	_color12 = 180;
-	_color13 = 177;
-	_color14 = 182;
-
-	return Common::kNoError;
-}
-
-void DarkMoonEngine::startupNew() {
-	_currentLevel = 4;
-	_currentSub = 0;
-	loadLevel(4, 0);
-	_currentBlock = 171;
-	_currentDirection = 2;
-	setHandItem(0);
-	EobCoreEngine::startupNew();
-}
-
-void DarkMoonEngine::drawNpcScene(int npcIndex) {
-	const uint8 *shpDef = &_npcShpData[npcIndex << 3];
-	for (int i = npcIndex; i != 255; i = shpDef[7]) {
-		shpDef = &_npcShpData[i << 3];
-		_screen->_curPage = 2;
-		const uint8 *shp = _screen->encodeShape(READ_LE_UINT16(shpDef), shpDef[2], shpDef[3], shpDef[4]);
-		_screen->_curPage = 0;
-		_screen->drawShape(0, shp, 88 + shpDef[5] - (shp[2] << 2), 104 + shpDef[6] - shp[1], 5);
-		delete[] shp;
-	}
-}
-
-void DarkMoonEngine::runNpcDialogue(int npcIndex) {
-	if (npcIndex == 0) {
-		snd_playSoundEffect(57);
-		if (npcJoinDialogue(0, 1, 3, 2))
-			setScriptFlags(0x40);
-	} else if (npcIndex == 1) {
-		snd_playSoundEffect(53);
-		gui_drawDialogueBox();
-
-		_txt->printDialogueText(4, 0);
-		int r = runDialogue(-1, 2, _npcStrings[0][0], _npcStrings[0][1]) - 1;
-
-		if (r == 0) {
-			snd_stopSound();
-			delay(3 * _tickLength);
-			snd_playSoundEffect(91);
-			npcJoinDialogue(1, 5, 6, 7);
-		} else if (r == 1) {
-			setScriptFlags(0x20);
-		}
-
-	} else if (npcIndex == 2) {
-		snd_playSoundEffect(55);
-		gui_drawDialogueBox();
-
-		_txt->printDialogueText(8, 0);
-		int r = runDialogue(-1, 2, _npcStrings[1][0], _npcStrings[1][1]) - 1;
-
-		if (r == 0) {
-			if (rollDice(1, 2, -1))
-				_txt->printDialogueText(9, _okStrings[0]);
-			else
-				npcJoinDialogue(2, 102, 103, 104);
-			setScriptFlags(8);
-		} else if (r == 1) {
-			_currentDirection = 0;
-		}
-	}
-}
-
-void DarkMoonEngine::updateUsedCharacterHandItem(int charIndex, int slot) {
-	EobItem *itm = &_items[_characters[charIndex].inventory[slot]];
-	if (itm->type == 48 || itm->type == 62) {
-		if (itm->value == 5)
-			return;
-		int charges = itm->flags & 0x3f;
-		if (--charges)
-			--itm->flags;
-		else
-			deleteInventoryItem(charIndex, slot);
-	} else if (itm->type == 26 || itm->type == 34 || itm->type == 35) {
-		deleteInventoryItem(charIndex, slot);
-	}
-}
-
-void DarkMoonEngine::generateMonsterPalettes(const char *file, int16 monsterIndex) {
-	int cp = _screen->setCurPage(2);
-	_screen->loadShapeSetBitmap(file, 3, 3);
-	uint8 tmpPal[16];
-	uint8 newPal[16];
-
-	for (int i = 0; i < 6; i++) {
-		int dci = monsterIndex + i;
-		memcpy(tmpPal, _monsterShapes[dci] + 4, 16);
-		int colx = 302 + 3 * i;
-
-		for (int ii = 0; ii < 16; ii++) {
-			uint8 col = _screen->getPagePixel(_screen->_curPage, colx, 184 + ii);
-
-			int iii = 0;
-			for (; iii < 16; iii++) {
-				if (tmpPal[iii] == col) {
-					newPal[ii] = iii;
-					break;
-				}
-			}
-
-			if (iii == 16)
-				newPal[ii] = 0;
-		}
-
-		for (int ii = 1; ii < 3; ii++) {
-			memcpy(tmpPal, _monsterShapes[dci] + 4, 16);
-
-			for (int iii = 0; iii < 16; iii++) {
-				uint8 col = _screen->getPagePixel(_screen->_curPage, colx + ii, 184 + iii);
-				if (newPal[iii])
-					tmpPal[newPal[iii]] = col;
-			}
-
-			int c = i;
-			if (monsterIndex >= 18)
-				c += 6;
-
-			c = (c << 1) + (ii - 1);
-			assert(c < 24);
-			memcpy(_monsterPalettes[c], tmpPal, 16);
-		}
-	}
-
-	_screen->setCurPage(cp);
-}
-
-void DarkMoonEngine::loadMonsterDecoration(const char *file, int16 monsterIndex) {
-	Common::SeekableReadStream *s = _res->createReadStream(Common::String::format("%s.dcr", file));
-	if (!s)
-		return;
-
-	int len = s->readUint16LE();
-
-	for (int i = 0; i < len; i++) {
-		for (int ii = 0; ii < 6; ii++) {
-			uint8 dc[6];
-			s->read(dc, 6);
-			if (!dc[2] || !dc[3])
-				continue;
-
-			SpriteDecoration *m = &_monsterDecorations[i * 6 + ii + monsterIndex];
-
-			m->shp = _screen->encodeShape(dc[0], dc[1], dc[2], dc[3]);
-			m->x = (int8)dc[4];
-			m->y = (int8)dc[5];
-		}
-	}
-
-	delete s;
-}
-
-void DarkMoonEngine::replaceMonster(int unit, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem) {
-	uint8 flg = _levelBlockProperties[block].flags & 7;
-
-	if (flg == 7 || _currentBlock == block || (flg && (_monsterProps[type].u30 || pos == 4)))
-		return;
-
-	for (int i = 0; i < 30; i++) {
-		if (_monsters[i].block != block)
-			continue;
-		if (_monsters[i].pos == 4 || _monsterProps[_monsters[i].type].u30)
-			return;
-	}
-
-	int index = -1;
-	int maxDist = 0;
-
-	for (int i = 0; i < 30; i++) {
-		if (_monsters[i].hitPointsCur <= 0) {
-			index = i;
-			break;
-		}
-
-		if (_monsters[i].flags & 0x40)
-			continue;
-
-		int dist = getBlockDistance(_monsters[i].block, _currentBlock);
-
-		if (dist > maxDist) {
-			maxDist = dist;
-			index = i;
-		}
-	}
-
-	if (index == -1)
-		return;
-
-	if (_monsters[index].hitPointsCur > 0)
-		killMonster(&_monsters[index], false);
-
-	initMonster(index, unit, block, pos, dir, type, shpIndex, mode, h2, randItem, fixedItem);
-}
-
-bool DarkMoonEngine::killMonsterExtra(EobMonsterInPlay *m) {
-	if (_currentLevel == 16 && _currentSub == 1 && (_monsterProps[m->type].capsFlags & 4)) {
-		if (m->type) {
-			_playFinale = true;
-			_runFlag = false;
-			delay(850);
-		} else {
-			m->hitPointsCur = 150;
-			m->curRemoteWeapon = 0;
-			m->numRemoteAttacks = 255;
-			m->shpIndex++;
-			m->type++;
-			seq_dranDragonTransformation();
-		}
-		return false;
-	}
-	return true;
-}
-
-const uint8 *DarkMoonEngine::loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs) {
-	_screen->loadShapeSetBitmap(filename, 3, 3);
-	for (int i = 0; i < 3; i++) {
-		_doorShapes[doorIndex * 3 + i] = _screen->encodeShape(READ_LE_UINT16(shapeDefs), READ_LE_UINT16(shapeDefs + 2), READ_LE_UINT16(shapeDefs + 4), READ_LE_UINT16(shapeDefs + 6));
-		shapeDefs += 8;
-	}
-
-	for (int i = 0; i < 2; i++) {
-		_doorSwitches[doorIndex * 3 + i].shp = _screen->encodeShape(READ_LE_UINT16(shapeDefs), READ_LE_UINT16(shapeDefs + 2), READ_LE_UINT16(shapeDefs + 4), READ_LE_UINT16(shapeDefs + 6));
-		shapeDefs += 8;
-		_doorSwitches[doorIndex * 3 + i].x = *shapeDefs;
-		shapeDefs += 2;
-		_doorSwitches[doorIndex * 3 + i].y= *shapeDefs;
-		shapeDefs += 2;
-	}
-	_screen->_curPage = 0;
-	return shapeDefs;
-}
-
-void DarkMoonEngine::drawDoorIntern(int type, int, int x, int y, int w, int wall, int mDim, int16, int16) {
-	int shapeIndex = type * 3 + 2 - mDim;
-	uint8 *shp = _doorShapes[shapeIndex];
-	if (!shp)
-		return;
-
-	if ((_doorType[type] == 0) || (_doorType[type] == 1)) {
-		y = _dscDoorY1[mDim] - shp[1];
-		x -= (shp[2] << 2);
-
-		if (_doorType[type] == 1) {
-			drawBlockObject(0, 2, shp, x, y, 5);
-			shp = _doorShapes[3 + shapeIndex];
-		}
-
-		y -= ((wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim]);
-
-		if (_specialWallTypes[wall] == 5)
-			y -= _dscDoorType5Offs[shapeIndex];
-
-	} else if (_doorType[type] == 2) {
-		x -= (shp[2] << 2);
-		y = _dscDoorY2[mDim] - ((wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult3[mDim]);
-	}
-
-	drawBlockObject(0, 2, shp, x, y, 5);
-
-	if (_wllShapeMap[wall] == -1 && !_noDoorSwitch[type])
-		drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
-}
-
-void DarkMoonEngine::restParty_npc() {
-	int insalId = -1;
-	int numChar = 0;
-
-	for (int i = 0; i < 6; i++) {
-		if (!testCharacter(i, 1))
-			continue;
-		if (testCharacter(i, 2) && _characters[i].portrait == -1)
-			insalId = i;
-		numChar++;
-	}
-
-	if (insalId == -1 || numChar < 5)
-		return;
-
-	removeCharacterFromParty(insalId);
-	if (insalId < 4)
-		exchangeCharacters(insalId, testCharacter(5, 1) ? 5 : 4);
-
-	clearScriptFlags(6);
-
-	if (!stripPartyItems(1, 1, 1, 1))
-		stripPartyItems(2, 1, 1, 1);
-	stripPartyItems(31, 0, 1, 3);
-	stripPartyItems(39, 1, 0, 3);
-	stripPartyItems(47, 0, 1, 2);
-
-	_items[createItemOnCurrentBlock(28)].value = 26;
-
-	gui_drawPlayField(false);
-	gui_drawAllCharPortraitsWithStats();
-
-	_screen->setClearScreenDim(10);
-	_gui->messageDialogue2(11, 63, 6);
-	_gui->messageDialogue2(11, 64, 6);
-}
-
-bool DarkMoonEngine::restParty_extraAbortCondition() {
-	if (_currentLevel != 3)
-		return false;
-
-	seq_nightmare();
-
-	return true;
-}
-
-void DarkMoonEngine::useHorn(int charIndex, int weaponSlot) {
-	int v = _items[_characters[charIndex].inventory[weaponSlot]].value - 1;
-	_txt->printMessage(_hornStrings[v]);
-	snd_playSoundEffect(_hornSounds[v]);
-}
-
-bool DarkMoonEngine::checkPartyStatusExtra() {
-	if (checkScriptFlags(0x100000))
-		seq_kheldran();
-	return _gui->confirmDialogue2(14, 67, 1);
-}
-
-void DarkMoonEngine::drawLightningColumn() {
-	int f = rollDice(1, 2, -1);
-	int y = 0;
-
-	for (int i = 0; i < 6; i++) {
-		f ^= 1;
-		drawBlockObject(f, 2, _lightningColumnShape, 72, y, 5);
-		y += 64;
-	}
-}
-
-int DarkMoonEngine::resurrectionSelectDialogue() {
-	countResurrectionCandidates();
-
-	_rrNames[_rrCount] = _abortStrings[0];
-	_rrId[_rrCount++] = 99;
-
-	int r = _rrId[runDialogue(-1, 9, _rrNames[0], _rrNames[1], _rrNames[2], _rrNames[3], _rrNames[4], _rrNames[5], _rrNames[6], _rrNames[7], _rrNames[8]) - 1];
-	if (r == 99)
-		return 0;
-
-	if (r < 0) {
-		r = -r;
-		if (prepareForNewPartyMember(33, r))
-			initNpc(r - 1);
-	} else {
-		_characters[r].hitPointsCur = 1;
-	}
-
-	return 1;
-}
-
-int DarkMoonEngine::charSelectDialogue() {
-	int cnt = 0;
-	const char *namesList[7];
-	memset(namesList, 0, 7 * sizeof(const char*));
-
-	for (int i = 0; i < 6; i++) {
-		if (!testCharacter(i, 3))
-			continue;
-		namesList[cnt++] = _characters[i].name;
-	}
-
-	namesList[cnt++] = _abortStrings[0];
-
-	int r = runDialogue(-1, 7, namesList[0], namesList[1], namesList[2], namesList[3], namesList[4], namesList[5], namesList[6]) - 1;
-	if (r == cnt - 1)
-		return 99;
-
-	for (cnt = 0; cnt < 6; cnt++) {
-		if (!testCharacter(cnt, 3))
-			continue;
-		if (--r < 0)
-			break;
-	}
-	return cnt;
-}
-
-void DarkMoonEngine::characterLevelGain(int charIndex) {
-	EobCharacter *c = &_characters[charIndex];
-	int s = _numLevelsPerClass[c->cClass];
-	for (int i = 0; i < s; i++) {
-		uint32 er = getRequiredExperience(c->cClass, i, c->level[i] + 1);
-		if (er == 0xffffffff)
-			continue;
-
-		increaseCharacterExperience(charIndex, er - c->experience[i] + 1);
-	}
-}
-
-}	// End of namespace Kyra
-
-#endif // ENABLE_EOB
diff --git a/engines/kyra/eob2.h b/engines/kyra/eob2.h
deleted file mode 100644
index 35eb90a9dc..0000000000
--- a/engines/kyra/eob2.h
+++ /dev/null
@@ -1,139 +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.
- *
- */
-
-#ifdef ENABLE_EOB
-
-#ifndef KYRA_EOB2_H
-#define KYRA_EOB2_H
-
-#include "kyra/eobcommon.h"
-
-namespace Kyra {
-
-class DarkmoonSequenceHelper;
-
-struct EobSequenceStep {
-	uint8 command;
-	uint8 obj;
-	int16 x1;
-	uint8 y1;
-	uint8 delay;
-	uint8 pal;
-	uint8 x2;
-	uint8 y2;
-	uint8 w;
-	uint8 h;
-};
-
-class DarkMoonEngine : public EobCoreEngine {
-friend class GUI_Eob;
-friend class DarkmoonSequenceHelper;
-public:
-	DarkMoonEngine(OSystem *system, const GameFlags &flags);
-	~DarkMoonEngine();
-
-private:
-	// Init / Release
-	Common::Error init();
-	void initStaticResource();
-	void initSpells();
-
-	// Main Menu
-	int mainMenu();
-	int mainMenuLoop();
-
-	int _menuChoiceInit;
-
-	// Main loop
-	void startupNew();
-	void startupLoad() {}
-
-	// Intro/Outro
-	void seq_playIntro();
-	void seq_playFinale();
-	void seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *data, int sd, int backupPage, int tempPage, int speed);
-
-	const char * const *_introStrings;
-	const char * const *_cpsFilesIntro;
-	const EobSequenceStep **_seqIntro;
-	const EobShapeDef **_shapesIntro;
-
-	const char * const *_finaleStrings;
-	const uint8 *_creditsData;
-	const char * const *_cpsFilesFinale;
-	const EobSequenceStep **_seqFinale;
-	const EobShapeDef **_shapesFinale;
-
-	static const char *_palFilesIntro[];
-	static const char *_palFilesFinale[];
-
-	// Ingame sequence
-	void seq_nightmare();
-	void seq_kheldran();
-	void seq_dranDragonTransformation();
-
-	const int8 *_dreamSteps;
-	const char *const *_kheldranStrings;
-
-	// characters
-	void drawNpcScene(int npcIndex);
-	void runNpcDialogue(int npcIndex);
-
-	const uint8 *_npcShpData;
-	const char *const *_npcStrings[2];
-
-	// items
-	void updateUsedCharacterHandItem(int charIndex, int slot);
-
-	// Monsters
-	void generateMonsterPalettes(const char *file, int16 monsterIndex);
-	void loadMonsterDecoration(const char *file, int16 monsterIndex);
-	void replaceMonster(int unit, uint16 block, int d, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem);
-	bool killMonsterExtra(EobMonsterInPlay *m);
-
-	// Level
-	const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs);
-	void drawDoorIntern(int type, int, int x, int y, int w, int wall, int mDim, int16, int16);
-
-	const uint8 *_dscDoorType5Offs;
-
-	// Rest party
-	void restParty_npc();
-	bool restParty_extraAbortCondition();
-
-	// misc
-	void useHorn(int charIndex, int weaponSlot);
-	bool checkPartyStatusExtra();
-	void drawLightningColumn();
-	int resurrectionSelectDialogue();
-	int charSelectDialogue();
-	void characterLevelGain(int charIndex);
-
-	const char *const *_hornStrings;
-	const uint8 *_hornSounds;
-};
-
-}	// End of namespace Kyra
-
-#endif
-
-#endif // ENABLE_EOB
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
index 23aee52465..21e3ba3dff 100644
--- a/engines/kyra/module.mk
+++ b/engines/kyra/module.mk
@@ -109,8 +109,8 @@ endif
 MODULE_OBJS += \
 	chargen.o \
 	eobcommon.o \
-	eob1.o \
-	eob2.o \
+	eob.o \
+	darkmoon.o \
 	gui_eob.o \
 	items_eob.o \
 	magic_eob.o \
@@ -118,8 +118,8 @@ MODULE_OBJS += \
 	scene_eob.o \
 	screen_eob.o \
 	script_eob.o \
-	sequences_eob1.o \
-	sequences_eob2.o \
+	sequences_eob.o \
+	sequences_darkmoon.o \
 	sprites_eob.o \
 	staticres_eob.o \
 	timer_eob.o
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 413bc4572f..072b4187c1 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -35,7 +35,7 @@
 #include "common/archive.h"
 
 #include "kyra/kyra_v1.h"
-#include "kyra/eob2.h"
+#include "kyra/darkmoon.h"
 #include "kyra/lol.h"
 #include "kyra/kyra_hof.h"
 
diff --git a/engines/kyra/sequences_darkmoon.cpp b/engines/kyra/sequences_darkmoon.cpp
new file mode 100644
index 0000000000..6b342adb50
--- /dev/null
+++ b/engines/kyra/sequences_darkmoon.cpp
@@ -0,0 +1,1349 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#include "kyra/darkmoon.h"
+#include "kyra/screen_eob.h"
+#include "kyra/resource.h"
+#include "kyra/sound.h"
+
+#include "common/system.h"
+
+#include "base/version.h"
+
+namespace Kyra {
+
+class DarkmoonSequenceHelper {
+friend class DarkMoonEngine;
+public:
+	enum Mode {
+		kIntro,
+		kFinale
+	};
+
+	DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_Eob *screen, Mode mode, const char *const *strings, const char *const *cpsFiles, const char *const *palFiles, const EobShapeDef **shapeDefList, const EobSequenceStep **seqList);
+	~DarkmoonSequenceHelper();
+
+	void loadScene(int index, int pageNum);
+	void runSequence(int index, int del = -1);
+
+	void printText(int index, int color);
+	void fadeText();
+
+	void update(int srcPage);
+
+	void setPalette(int index);
+	void fadePalette(int index, int del);
+	void copyPalette(int srcIndex, int destIndex);
+
+	void initDelayedPaletteFade(int palIndex, int rate);
+	bool processDelayedPaletteFade();
+
+	void delay(uint32 ticks);
+	void waitForSongNotifier(int index, bool introUpdateAnim = false);
+
+private:
+	void setPaletteWithoutTextColor(int index);
+
+	OSystem *_system;
+	DarkMoonEngine *_vm;
+	Screen_Eob *_screen;
+	Mode _mode;
+
+	const char *const *_strings;
+	const char *const *_cpsFiles;
+	const char *const *_palFiles;
+	const EobShapeDef **_shapeDefs;
+	const EobSequenceStep **_seqData;
+
+	Palette *_palettes[12];
+
+	const uint8 **_shapes;
+
+	uint32 _fadePalTimer;
+	int _fadePalRate;
+	int _fadePalIndex;
+};
+
+int DarkMoonEngine::mainMenu() {
+	int menuChoice = _menuChoiceInit;
+	_menuChoiceInit = 0;
+
+	_sound->loadSoundFile("INTRO");
+	Screen::FontId of = _screen->_currentFont;
+	int op = 0;
+	Common::SeekableReadStream *s = 0;
+
+	while (menuChoice >= 0 && !shouldQuit()) {
+		switch (menuChoice) {
+			case 0:
+				s = _res->createReadStream("XENU.CPS");
+				if (s) {
+					s->read(_screen->getPalette(0).getData(), 768);
+					_screen->loadFileDataToPage(s, 3, 64000);
+					delete s;
+				} else {
+					_screen->loadBitmap("MENU.CPS", 3, 2, &_screen->getPalette(0));
+				}
+
+				_screen->setScreenPalette(_screen->getPalette(0));
+
+				of = _screen->setFont(Screen::FID_6_FNT);
+				op = _screen->setCurPage(2);
+				_screen->printText(gScummVMVersion, 267 - strlen(gScummVMVersion) * 6, 160, 13, 0);
+				_screen->setFont(of);
+				_screen->_curPage = op;
+				_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+				_screen->updateScreen();
+				menuChoice = mainMenuLoop();
+				break;
+
+			case 1:
+				// load game in progress
+				menuChoice = -1;
+				break;
+
+			case 2:
+				// create new party
+				menuChoice = -2;
+				break;
+
+			case 3:
+				// transfer party
+				//seq_playFinale();
+				menuChoice = -3;
+				break;
+
+			case 4:
+				// play intro
+				seq_playIntro();
+				menuChoice = 0;
+				break;
+
+			case 5:
+				// quit
+				menuChoice = -5;
+				break;
+		}
+	}
+
+	return shouldQuit() ? -5 : menuChoice;
+}
+
+int DarkMoonEngine::mainMenuLoop() {
+	int sel = -1;
+	do {
+		_screen->setScreenDim(6);
+		_gui->simpleMenu_setup(6, 0, _mainMenuStrings, -1, 0, 0);
+
+		while (sel == -1 && !shouldQuit())
+			sel = _gui->simpleMenu_process(6, _mainMenuStrings, 0, -1, 0);
+	} while ((sel < 0 || sel > 5) && !shouldQuit());
+
+	return sel + 1;
+}
+
+void DarkMoonEngine::seq_playIntro() {
+	DarkmoonSequenceHelper sq(_system, this, _screen, DarkmoonSequenceHelper::kIntro, _introStrings, _cpsFilesIntro, _palFilesIntro, _shapesIntro, _seqIntro);
+
+	_screen->setCurPage(0);
+	_screen->clearCurPage();
+
+	snd_stopSound();
+
+	sq.loadScene(4, 2);
+	sq.loadScene(0, 2);
+	sq.delay(1);
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(12);
+
+	_screen->copyRegion(0, 0, 8, 8, 304, 128, 2, 0, Screen::CR_NO_P_CHECK);
+	sq.setPalette(9);
+	sq.fadePalette(0, 3);
+
+	_screen->setCurPage(2);
+	_screen->setClearScreenDim(17);
+	_screen->setCurPage(0);
+
+	removeInputTop();
+	sq.delay(18);
+
+	sq.runSequence(3, 18);
+	sq.runSequence(6, 18);
+	sq.runSequence(0);
+
+	sq.waitForSongNotifier(1);
+
+	sq.runSequence(11);
+	sq.runSequence(7, 6);
+	sq.runSequence(2, 6);
+
+	sq.waitForSongNotifier(2);
+
+	sq.runSequence(38);
+	sq.runSequence(3);
+	sq.runSequence(8);
+	sq.runSequence(1, 10);
+	sq.runSequence(0, 6);
+	sq.runSequence(2);
+
+	sq.waitForSongNotifier(3);
+
+	_screen->setClearScreenDim(17);
+	_screen->setCurPage(2);
+	_screen->setClearScreenDim(17);
+	_screen->setCurPage(0);
+
+	sq.runSequence(40);
+	sq.runSequence(7, 18);
+
+	sq.printText(0, 16);	// You were settling...
+	sq.runSequence(7, 90);
+	sq.fadeText();
+
+	sq.printText(1, 16);	// Then a note was slipped to you
+	sq.runSequence(8);
+	sq.runSequence(2, 72);
+	sq.fadeText();
+
+	sq.printText(2, 16);	// It was from your friend Khelben Blackstaff...
+	sq.runSequence(2);
+	sq.runSequence(6, 36);
+	sq.runSequence(3);
+	sq.fadeText();
+
+	sq.printText(3, 16);	// The message was urgent.
+
+	sq.loadScene(1, 2);
+	sq.waitForSongNotifier(4);
+
+	// intro scroll
+	if (!skipFlag() && !shouldQuit()) {
+		for (int i = 0; i < 280; i += 3) {
+			uint32 endtime = _system->getMillis() + _tickLength;
+			_screen->copyRegion(11, 8, 8, 8, 301, 128, 0, 0, Screen::CR_NO_P_CHECK);
+			_screen->copyRegion(i, 0, 309, 8, 3, 128, 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->updateScreen();
+			if (i == 96)
+				sq.runSequence(42);
+			delayUntil(endtime);
+		}
+	}
+
+	_screen->copyRegion(8, 8, 0, 0, 304, 128, 0, 2, Screen::CR_NO_P_CHECK);
+	sq.runSequence(4);
+	sq.fadeText();
+	sq.delay(10);
+
+	sq.loadScene(2, 2);
+	sq.update(2);
+	sq.delay(10);
+
+	sq.printText(4, 16);	// What could Khelben want?
+	sq.delay(25);
+
+	sq.loadScene(3, 2);
+	sq.delay(54);
+	sq.runSequence(13);
+	_screen->copyRegion(104, 16, 96, 8, 120, 100, 0, 2, Screen::CR_NO_P_CHECK);
+	sq.fadeText();
+
+	sq.printText(5, 15);	// Welcome, please come in
+	sq.runSequence(10);
+	sq.runSequence(10);
+	sq.runSequence(9);
+	sq.runSequence(9);
+	sq.fadeText();
+
+	sq.printText(6, 15);	// Khelben awaits you in his study
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(10);
+	sq.runSequence(9);
+	sq.runSequence(14);
+	sq.loadScene(5, 2);
+
+	sq.waitForSongNotifier(5);
+
+	sq.fadeText();
+	_screen->clearCurPage();
+	_screen->updateScreen();
+
+	for (int i = 0; i < 6; i++)
+		sq.runSequence(15);
+
+	sq.loadScene(6, 2);
+	sq.loadScene(7, 2);
+	_screen->clearCurPage();
+	sq.update(2);
+
+	sq.runSequence(16);
+	sq.printText(7, 15);	// Thank you for coming so quickly
+	sq.runSequence(16);
+	sq.runSequence(17);
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(16);
+	sq.fadeText();
+	sq.runSequence(16);
+
+	sq.loadScene(8, 2);
+	sq.update(2);
+	sq.runSequence(32);
+	sq.printText(8, 15);	// I am troubled my friend
+	sq.runSequence(33);
+	sq.runSequence(33);
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(32);
+	sq.fadeText();
+
+	sq.printText(9, 15);	// Ancient evil stirs in the Temple Darkmoon
+	sq.runSequence(33);
+	sq.runSequence(43);
+	sq.runSequence(33);
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(32);
+	sq.fadeText();
+
+	sq.printText(10, 15);	// I fear for the safety of our city
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(33);
+	sq.runSequence(32);
+	sq.runSequence(32);
+
+	sq.loadScene(9, 2);
+	sq.fadeText();
+
+	sq.waitForSongNotifier(6);
+
+	sq.update(2);
+	sq.runSequence(34);
+
+	sq.printText(11, 15);	// I need your help
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(34);
+	sq.runSequence(35);
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(34);
+	sq.fadeText();
+
+	sq.loadScene(12, 2);
+	sq.update(2);
+	sq.loadScene(6, 2);
+	sq.runSequence(18);
+
+	sq.printText(12, 15);	// Three nights ago I sent forth a scout
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(22);
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(18);
+	sq.fadeText();
+
+	sq.printText(13, 15);	// She has not yet returned
+	sq.runSequence(20);
+	sq.runSequence(19);
+	sq.runSequence(23);
+	sq.runSequence(24);
+	sq.runSequence(20);
+	sq.runSequence(19);
+	sq.runSequence(17);
+	sq.runSequence(18);
+	sq.fadeText();
+
+	sq.printText(14, 15);	// I fear for her safety
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(20);
+	sq.runSequence(18);
+	sq.runSequence(25);
+	sq.runSequence(18);
+	sq.runSequence(18);
+	sq.fadeText();
+	sq.runSequence(18);
+	sq.runSequence(18);
+
+	sq.printText(15, 15);	// Take this coin
+	sq.runSequence(28);
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(18);
+	sq.runSequence(18);
+	sq.fadeText();
+
+	sq.loadScene(10, 2);
+	_screen->clearCurPage();
+	_screen->updateScreen();
+
+	sq.runSequence(37, 18);
+	sq.runSequence(36, 36);
+
+	sq.loadScene(12, 2);
+	_screen->clearCurPage();
+	sq.update(2);
+
+	sq.loadScene(11, 2);
+	sq.printText(16, 15);	// I will use it to contact you
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(20);
+	sq.runSequence(18);
+	sq.runSequence(18);
+	sq.fadeText();
+
+	sq.printText(17, 15);	// You must act quickly
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(19);
+	sq.runSequence(18);
+	sq.runSequence(18);
+	sq.fadeText();
+	sq.runSequence(18);
+
+	sq.printText(18, 15);	// I will teleport you near Darkmoon
+	sq.runSequence(20);
+	sq.runSequence(27);
+	sq.runSequence(20);
+	sq.runSequence(19);
+	sq.runSequence(18);
+	sq.runSequence(18);
+	sq.fadeText();
+	sq.runSequence(18);
+
+	sq.printText(19, 15);	// May luck be with you my friend
+	sq.runSequence(19);
+	sq.runSequence(19);
+	sq.runSequence(20);
+	sq.runSequence(18);
+	sq.fadeText();
+	sq.runSequence(29);
+
+	sq.waitForSongNotifier(7);
+
+	sq.runSequence(30);
+	sq.runSequence(31);
+
+	sq.waitForSongNotifier(8, true);
+
+	if (skipFlag() || shouldQuit()) {
+		_sound->playTrack(15);
+	} else {
+		_screen->setScreenDim(17);
+		_screen->clearCurDim();
+		_sound->playTrack(14);
+		sq.fadePalette(10, 1);
+		_screen->setClearScreenDim(18);
+		sq.delay(6);
+		sq.fadePalette(9, 1);
+		_screen->clearCurPage();
+	}
+
+	sq.fadePalette(9, 10);
+}
+
+void DarkMoonEngine::seq_playFinale() {
+	DarkmoonSequenceHelper sq(_system, this, _screen, DarkmoonSequenceHelper::kFinale, _finaleStrings, _cpsFilesFinale, _palFilesFinale, _shapesFinale, _seqFinale);
+
+	_screen->setCurPage(0);
+	_screen->setFont(Screen::FID_8_FNT);
+
+	_sound->loadSoundFile("FINALE1");
+	snd_stopSound();
+	sq.delay(3);
+
+	_screen->clearCurPage();
+	_screen->updateScreen();
+
+	sq.loadScene(0, 2);
+	sq.delay(18);
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(1);
+	sq.update(2);
+
+	sq.loadScene(1, 2);
+
+	sq.runSequence(0);
+	sq.runSequence(0);
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(2);
+	sq.runSequence(1);
+	sq.runSequence(2);
+	sq.runSequence(2);
+
+	sq.printText(0, 10);			// Finally, Dran has been defeated
+	for (int i = 0; i < 7; i++)
+		sq.runSequence(2);
+	sq.fadeText();
+	sq.runSequence(2);
+
+	sq.waitForSongNotifier(1);
+
+	sq.printText(1, 10);			// Suddenly, your friend Khelben appears
+	sq.runSequence(4);
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(2);
+	sq.fadeText();
+
+	sq.printText(2, 15);			// Greetings, my victorious friends
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+	sq.runSequence(6);
+
+	sq.printText(3, 15);			// You have defeated Dran
+	for (int i = 0; i < 5; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+
+	sq.printText(4, 15);			// I did not know Dran was a dragon
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+
+	sq.printText(5, 15);			// He must have been over 300 years old
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+
+	sq.printText(6, 15);			// His power is gone
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+
+	sq.printText(7, 15);			// But Darkmoon is still a source of great evil
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+
+	sq.printText(8, 15);			// And many of his minions remain
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(5);
+	sq.runSequence(2);
+	sq.runSequence(2);
+	sq.fadeText();
+
+	sq.loadScene(2, 2);
+	sq.update(2);
+	sq.loadScene(3, 2);
+	_screen->copyRegion(8, 8, 0, 0, 304, 128, 0, 2, Screen::CR_NO_P_CHECK);
+
+	sq.printText(9, 15);			// Now we must leave this place
+	sq.runSequence(7);
+	sq.runSequence(8);
+	sq.runSequence(7);
+	sq.runSequence(7, 36);
+	sq.fadeText();
+
+	sq.printText(10, 15);			// So my forces can destroy it..
+	for (int i = 0; i < 3; i++)
+		sq.runSequence(7);
+	sq.runSequence(8);
+	sq.runSequence(7);
+	sq.runSequence(7, 36);
+	sq.runSequence(8, 18);
+	sq.fadeText();
+
+	sq.printText(11, 15);			// Follow me
+	sq.runSequence(7, 18);
+	sq.runSequence(9, 18);
+	sq.runSequence(8, 18);
+	sq.fadeText();
+
+	sq.loadScene(7, 2);
+	sq.copyPalette(3, 0);
+	sq.loadScene(4, 2);
+
+	sq.waitForSongNotifier(2);
+
+	_screen->clearCurPage();
+	sq.update(2);
+
+	sq.loadScene(8, 2);
+	sq.loadScene(6, 6);
+	sq.delay(10);
+
+	sq.printText(12, 10);			// Powerful mages stand ready for the final assault...
+	sq.delay(90);
+	sq.fadeText();
+
+	sq.waitForSongNotifier(3);
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(7);
+	sq.delay(8);
+
+	sq.runSequence(10);
+	sq.runSequence(13);
+	sq.initDelayedPaletteFade(4, 1);
+
+	sq.runSequence(14);
+	sq.runSequence(13);
+	sq.runSequence(14);
+	sq.runSequence(14);
+	sq.runSequence(13);
+	sq.initDelayedPaletteFade(2, 1);
+
+	sq.runSequence(15);
+	sq.runSequence(14);
+	sq.runSequence(13);
+	sq.runSequence(15);
+	sq.runSequence(15);
+	sq.runSequence(11);
+
+	sq.printText(13, 10);			// The temple's evil is very strong
+	sq.delay(72);
+	sq.fadeText();
+
+	sq.printText(14, 10);			// It must not be allowed...
+	sq.delay(72);
+	sq.fadeText();
+
+	sq.waitForSongNotifier(4);
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(7);
+	sq.delay(8);
+
+	sq.runSequence(10);
+	sq.initDelayedPaletteFade(5, 1);
+	sq.runSequence(13);
+	sq.runSequence(14);
+	sq.runSequence(13);
+	sq.runSequence(14);
+	sq.runSequence(13);
+	sq.runSequence(13);
+	sq.runSequence(14);
+	sq.runSequence(14);
+	sq.runSequence(13);
+	sq.runSequence(12);
+	for (int i = 0; i < 4; i++)
+		sq.runSequence(16);
+	sq.runSequence(17);
+	sq.runSequence(18);
+
+	sq.printText(15, 10);			// The temple ceases to exist
+	sq.initDelayedPaletteFade(6, 1);
+	sq.delay(36);
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(11);
+
+	sq.delay(54);
+	sq.fadeText();
+	sq.loadScene(12, 2);
+
+	sq.waitForSongNotifier(5);
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(6);
+
+	if (!skipFlag() && !shouldQuit())
+		_screen->crossFadeRegion(0, 0, 8, 8, 304, 128, 2, 0);
+	sq.delay(18);
+
+	sq.printText(16, 15);			// My friends, our work is done
+	sq.runSequence(20);
+	sq.runSequence(19);
+	sq.runSequence(19, 36);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(12);
+	sq.fadeText();
+
+	sq.printText(17, 15);			// Thank you
+	sq.runSequence(19);
+	sq.runSequence(20, 36);
+	sq.fadeText();
+
+	sq.printText(18, 15);			// You have earned my deepest respect
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(11);
+	sq.runSequence(20);
+	sq.runSequence(19);
+	sq.runSequence(19);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(11);
+	sq.delay(36);
+	sq.fadeText();
+
+	sq.printText(19, 15);			// We will remember you always
+	sq.runSequence(19);
+	sq.runSequence(19, 18);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(11);
+	sq.runSequence(20, 18);
+	sq.fadeText();
+
+	sq.delay(28);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(12);
+	sq.delay(3);
+
+	sq.loadScene(5, 2);
+	if (skipFlag() || shouldQuit()) {
+		_screen->copyRegion(0, 0, 8, 8, 304, 128, 2, 0, Screen::CR_NO_P_CHECK);
+	} else {
+		_sound->playTrack(6);
+		_screen->crossFadeRegion(0, 0, 8, 8, 304, 128, 2, 0);
+	}
+
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(12);
+	sq.delay(5);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(11);
+	sq.delay(11);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(12);
+	sq.delay(7);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(11);
+	sq.delay(12);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(12);
+
+	removeInputTop();
+	resetSkipFlag(true);
+
+	sq.loadScene(10, 2);
+	sq.loadScene(9, 2);
+	snd_stopSound();
+	sq.delay(3);
+
+	_sound->loadSoundFile("FINALE2");
+
+	sq.delay(18);
+	if (!skipFlag() && !shouldQuit())
+		_sound->playTrack(1);
+
+	seq_playCredits(&sq, _creditsData, 18, 2, 6, 2);
+
+	sq.delay(90);
+
+	resetSkipFlag(true);
+
+	sq.setPalette(11);
+	sq.fadePalette(9, 10);
+
+	_screen->clearCurPage();
+	sq.loadScene(11, 2);
+
+	static const uint8 finPortraitPos[] = { 0x50, 0x50, 0xD0, 0x50, 0x50, 0x90, 0xD0, 0x90, 0x90, 0x50, 0x90, 0x90 };
+
+	for (int i = 0; i < 6; i++) {
+		if (!testCharacter(i, 1))
+			continue;
+		if (i > 3)
+			_screen->drawShape(2, sq._shapes[6 + i], finPortraitPos[i << 1] - 16, finPortraitPos[(i << 1) + 1] - 16, 0);
+		_screen->drawShape(2, _characters[i].faceShape, finPortraitPos[i << 1], finPortraitPos[(i << 1) + 1], 0);
+	}
+
+	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+
+	sq.setPalette(9);
+	sq.fadePalette(0, 18);
+
+	while (!skipFlag() && !shouldQuit())
+		delay(_tickLength);
+
+	snd_stopSound();
+	sq.fadePalette(9, 10);
+}
+
+void DarkMoonEngine::seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *data, int sd, int backupPage, int tempPage, int speed) {
+	if (!data)
+		return;
+
+	_screen->setScreenDim(sd);
+	const ScreenDim *dm = _screen->_curDim;
+
+	_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 0, backupPage, Screen::CR_NO_P_CHECK);
+
+	struct CreditsDataItem {
+		int16 x;
+		int16 y;
+		const void *data;
+		char *str;
+		uint8 crlf;
+		uint8 size;
+		uint8 dataType;
+	} items[36];
+	memset(items, 0, sizeof(items));
+
+	const char *pos = (const char *)data;
+	uint32 end = _system->getMillis();
+	uint32 cur = 0;
+	int i = 0;
+
+	do {
+		for (bool loop = true; loop; ) {
+			sq->processDelayedPaletteFade();
+			cur = _system->getMillis();
+			if (end <= cur)
+				break;
+			delay(MIN<uint32>(_tickLength, end - cur));
+		}
+
+		end = _system->getMillis() + speed * _tickLength;
+
+		for (; i < 35 && *pos; i++) {
+			int16 nextY = i ? items[i].y + items[i].size + (items[i].size >> 2) : dm->h;
+
+			const char *posOld = pos;
+			pos = strchr(pos, 0x0d);
+			if (!pos)
+				pos = strchr(posOld, 0x00);
+
+			items[i + 1].crlf = *pos++;
+
+			if (*posOld == 2) {
+				const uint8 *shp = sq->_shapes[(*++posOld) - 1];
+				items[i + 1].data = shp;
+				items[i + 1].size = shp[1];
+				items[i + 1].x = (dm->w - shp[2]) << 2 ;
+				items[i + 1].dataType = 1;
+				delete[] items[i + 1].str;
+				items[i + 1].str = 0;
+
+			} else {
+				if (*posOld == 1) {
+					posOld++;
+					items[i + 1].size = 6;
+				} else {
+					items[i + 1].size = _screen->getFontWidth();
+				}
+
+				items[i + 1].dataType = 0;
+
+				int l = pos - posOld;
+				if (items[i + 1].crlf != 0x0d)
+					l++;
+
+				delete[] items[i + 1].str;
+				items[i + 1].str = new char[l];
+				memcpy(items[i + 1].str, posOld, l);
+				items[i + 1].str[l - 1] = 0;
+				items[i + 1].data = 0;
+				items[i + 1].x = (((dm->w << 3) - (strlen(items[i + 1].str) * items[i + 1].size)) >> 1) + 1;
+			}
+
+			items[i + 1].y = nextY;
+		}
+
+		_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, backupPage, tempPage, Screen::CR_NO_P_CHECK);
+
+		for (int h = 0; h < i; h++) {
+			if (items[h + 1].y < dm->h) {
+				if (items[h + 1].dataType == 1) {
+					_screen->drawShape(tempPage, (const uint8*)items[h + 1].data, items[h + 1].x, items[h + 1].y, sd);
+				} else {
+					_screen->setCurPage(tempPage);
+
+					if (items[h + 1].size == 6)
+						_screen->setFont(Screen::FID_6_FNT);
+
+					_screen->printText(items[h + 1].str, (dm->sx << 3) + items[h + 1].x - 1, dm->sy + items[h + 1].y + 1, 12, 0);
+					_screen->printText(items[h + 1].str, (dm->sx << 3) + items[h + 1].x, dm->sy + items[h + 1].y, 240, 0);
+
+					if (items[h + 1].size == 6)
+						_screen->setFont(Screen::FID_8_FNT);
+
+					_screen->setCurPage(0);
+				}
+			}
+
+			items[h + 1].y -= 2;
+		}
+
+		_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, tempPage, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+
+		if (-items[1].size > items[1].y) {
+			delete[] items[1].str;
+			--i;
+			for (int t = 1; t <= i; t++)
+				memcpy(&items[t], &items[t + 1], sizeof(CreditsDataItem));
+			items[i + 1].str = 0;
+		}
+
+		if (i < 35 && ((items[i].y + items[i].size) < (dm->sy + dm->h))) {
+			resetSkipFlag(true);
+			break;
+		}
+
+		sq->processDelayedPaletteFade();
+	} while (!skipFlag() && i && !shouldQuit());
+
+	for (i = 0; i < 35; i++)
+		delete[] items[i].str;
+}
+
+DarkmoonSequenceHelper::DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_Eob *screen, Mode mode, const char *const *strings, const char *const *cpsFiles, const char *const *palFiles, const EobShapeDef **shapeDefList, const EobSequenceStep **seqList) :
+	_system(system), _vm(vm), _screen(screen), _mode(mode), _strings(strings), _cpsFiles(cpsFiles), _palFiles(palFiles), _shapeDefs(shapeDefList), _seqData(seqList) {
+
+	for (int i = 0; _palFiles[i]; i++) {
+		if (i < 4)
+			_palettes[i] = &_screen->getPalette(i);
+		else
+			_palettes[i] = new Palette(256);
+		_screen->loadPalette(_palFiles[i], *_palettes[i]);
+	}
+
+	_palettes[9] = new Palette(256);
+	_palettes[9]->fill(0, 256, 0);
+	_palettes[10] = new Palette(256);
+	_palettes[10]->fill(0, 256, 63);
+	_palettes[11] = new Palette(256);
+	_palettes[11]->fill(0, 256, 0);
+
+	_shapes = new const uint8*[30];
+	memset(_shapes, 0, 30 * sizeof(uint8*));
+
+	_fadePalTimer = 0;
+	_fadePalRate = 0;
+
+	_screen->setScreenPalette(*_palettes[0]);
+	_screen->setFont(Screen::FID_8_FNT);
+	_screen->hideMouse();
+
+	_vm->delay(150);
+	_vm->_eventList.clear();
+	_vm->_allowSkip = true;
+}
+
+DarkmoonSequenceHelper::~DarkmoonSequenceHelper() {
+	for (int i = 4; _palFiles[i]; i++)
+		delete _palettes[i];
+	delete _palettes[9];
+	delete _palettes[10];
+	delete _palettes[11];
+
+	for (int i = 0; i < 30; i++)
+		delete[] _shapes[i];
+	delete[] _shapes;
+
+	_screen->clearCurPage();
+	_screen->showMouse();
+	_screen->updateScreen();
+
+	_system->delayMillis(150);
+	_vm->resetSkipFlag(true);
+	_vm->_allowSkip = false;
+}
+
+void DarkmoonSequenceHelper::loadScene(int index, int pageNum) {
+	char file[13];
+	strcpy(file, _cpsFiles[index]);
+
+	Common::SeekableReadStream *s = _vm->resource()->createReadStream(file);
+	if (s && file[0] != 'X') {
+		delete s;
+		_screen->loadBitmap(_cpsFiles[index], pageNum | 1, pageNum | 1, _palettes[0]);
+	} else {
+		if (!s) {
+			file[0] = 'X';
+			s = _vm->resource()->createReadStream(file);
+		}
+
+		if (!s)
+			error("DarkmoonSequenceHelper::loadScene(): CPS file loading failure in scene %d", index);
+
+		if (_mode == kFinale)
+			s->read(_palettes[0]->getData(), 768);
+		else
+			s->seek(768);
+		_screen->loadFileDataToPage(s, 3, 64000);
+		delete s;
+	}
+
+	int cp = _screen->setCurPage(pageNum);
+
+	if (_shapeDefs[index]) {
+		for (const EobShapeDef *df = _shapeDefs[index]; df->w; df++ ) {
+			uint16 shapeIndex = (df->index < 0) ? df->index * -1 : df->index;
+			if (_shapes[shapeIndex])
+				delete[] _shapes[shapeIndex];
+			_shapes[shapeIndex] = _screen->encodeShape(df->x, df->y, df->w, df->h, (df->index >> 8) != 0);
+		}
+	}
+
+	_screen->setCurPage(cp);
+	_screen->copyPage(pageNum | 1, pageNum);
+
+	if ((pageNum == 0 || pageNum == 1) && !_vm->skipFlag() && !_vm->shouldQuit())
+		_screen->updateScreen();
+}
+
+void DarkmoonSequenceHelper::runSequence(int index, int del) {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	uint32 end = 0;
+
+	for (const EobSequenceStep *s = _seqData[index]; s->command != 0xff && !_vm->skipFlag() && !_vm->shouldQuit(); s++) {
+		int palIndex = _mode == kFinale ? (s->pal + 1) : s->pal;
+		int x = s->x1;
+		int y = s->y1;
+		int x2 = 0;
+		uint16 shapeW = 0;
+		uint16 shapeH = 0;
+
+		switch(s->command) {
+		case 0:
+			// flash palette
+			if (s->pal)
+				setPaletteWithoutTextColor(palIndex);
+			delay(s->delay);
+			if (_mode == kIntro && s->pal)
+				setPaletteWithoutTextColor(0);
+			break;
+
+		case 1:
+			// draw shape, then restore background
+			shapeW = _shapes[s->obj][2];
+			shapeH = _shapes[s->obj][3];
+
+			if (_mode == kFinale) {
+				_screen->setScreenDim(18);
+				x -= (_screen->_curDim->sx << 3);
+				y -= _screen->_curDim->sy;
+				if (x < 0)
+					shapeW -= ((-x >> 3) + 1);
+				else
+					x2 = x;
+			}
+
+			_screen->drawShape(0, _shapes[s->obj], x, y, _mode == kIntro ? 0 : 18);
+
+			if (s->pal)
+				setPaletteWithoutTextColor(palIndex);
+			else
+				_screen->updateScreen();
+
+			delay(s->delay);
+
+			if (_mode == kIntro) {
+				if (s->pal)
+					setPaletteWithoutTextColor(0);
+				_screen->copyRegion(x - 8, y - 8, x, y, (shapeW + 1) << 3, shapeH, 2, 0, Screen::CR_NO_P_CHECK);
+			} else {
+				_screen->copyRegion(x2, y, x2 + (_screen->_curDim->sx << 3), y + _screen->_curDim->sy, (shapeW + 1) << 3, shapeH, 2, 0, Screen::CR_NO_P_CHECK);
+			}
+
+			_screen->updateScreen();
+			break;
+
+		case 2:
+			// draw shape
+			_screen->drawShape(_screen->_curPage, _shapes[s->obj], x, y, 0);
+
+			if (s->pal)
+				setPaletteWithoutTextColor(palIndex);
+			else if(!_screen->_curPage)
+				_screen->updateScreen();
+
+			delay(s->delay);
+
+			if (_mode == kIntro && s->pal)
+				setPaletteWithoutTextColor(0);
+			break;
+
+		case 3:
+		case 4:
+			// fade shape in or out or restore background
+			if (_mode == kFinale)
+				break;
+
+			_screen->setShapeFadeMode(0, true);
+			_screen->setShapeFadeMode(1, true);
+
+			end = _system->getMillis() + s->delay * _vm->tickLength();
+
+			if (palIndex) {
+				_screen->setFadeTableIndex(palIndex - 1);
+
+				_screen->copyRegion(s->x1 - 8, s->y1 - 8, 0, 0, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 2, 4, Screen::CR_NO_P_CHECK);
+				_screen->drawShape(4, _shapes[s->obj], s->x1 & 7, 0, 0);
+				_screen->copyRegion(0, 0, s->x1, s->y1, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 4, 0, Screen::CR_NO_P_CHECK);
+			} else {
+				_screen->copyRegion(s->x1 - 8, s->y1 - 8, s->x1, s->y1, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 2, 0, Screen::CR_NO_P_CHECK);
+			}
+			_screen->updateScreen();
+
+			_vm->delayUntil(end);
+			_screen->setShapeFadeMode(0, false);
+			_screen->setShapeFadeMode(1, false);
+			break;
+
+		case 5:
+			// copy region
+			if (_mode == kFinale && s->pal)
+				setPaletteWithoutTextColor(palIndex);
+
+			_screen->copyRegion(s->x2 << 3, s->y2, s->x1, s->y1, s->w << 3, s->h, (s->obj && _mode == kFinale) ? 6 : 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->updateScreen();
+			delay(s->delay);
+			break;
+
+		case 6:
+			// play sound effect
+			if (s->obj != 0xff)
+				_vm->sound()->playSoundEffect(s->obj);
+			break;
+
+		default:
+			error("DarkmoonSequenceHelper::runSequence(): Unknown animation opcode encountered.");
+			break;
+		}
+	}
+
+	if (del > 0)
+		delay(del);
+}
+
+void DarkmoonSequenceHelper::printText(int index, int color) {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	_screen->setClearScreenDim(17);
+	_palettes[0]->copy(*_palettes[0], color, 1, 255);
+	setPalette(0);
+
+	char *temp = new char[strlen(_strings[index]) + 1];
+	char *str = temp;
+	strcpy(str, _strings[index]);
+
+	const ScreenDim *dm = _screen->_curDim;
+
+	for (int yOffs = 0; *str; yOffs += 9) {
+		char *cr = strchr(str, 13);
+
+		if (cr)
+			*cr = 0;
+
+		uint32 len = strlen(str);
+		_screen->printText(str, (dm->sx + ((dm->w - len) >> 1)) << 3, dm->sy + yOffs, 255, dm->unkA);
+
+		if (cr) {
+			*cr = 13;
+			str = cr + 1;
+		} else {
+			str += len;
+		}
+	}
+
+	delete[] temp;
+	_screen->updateScreen();
+}
+
+void DarkmoonSequenceHelper::fadeText() {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	_screen->fadeTextColor(_palettes[0], 255, 2);
+	_screen->clearCurDim();
+}
+
+void DarkmoonSequenceHelper::update(int srcPage) {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	_screen->copyRegion(0, 0, 8, 8, 304, 128, srcPage, 0, Screen::CR_NO_P_CHECK);
+	setPaletteWithoutTextColor(0);
+}
+
+void DarkmoonSequenceHelper::setPaletteWithoutTextColor(int index) {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	if (!memcmp(_palettes[11]->getData(), _palettes[index]->getData(), 765))
+		return;
+
+	_palettes[11]->copy(*_palettes[index], 0, 255);
+	_palettes[11]->copy(*_palettes[0], 255, 1, 255);
+	setPalette(11);
+
+	_screen->updateScreen();
+}
+
+void DarkmoonSequenceHelper::setPalette(int index) {
+	_screen->setScreenPalette(*_palettes[index]);
+}
+
+void DarkmoonSequenceHelper::fadePalette(int index, int del) {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	_screen->fadePalette(*_palettes[index], del * _vm->tickLength());
+}
+
+void DarkmoonSequenceHelper::copyPalette(int srcIndex, int destIndex) {
+	_palettes[destIndex]->copy(*_palettes[srcIndex]);
+}
+
+void DarkmoonSequenceHelper::initDelayedPaletteFade(int palIndex, int rate) {
+	_palettes[11]->copy(*_palettes[0]);
+
+	_fadePalIndex = palIndex;
+	_fadePalRate = rate;
+	_fadePalTimer = _system->getMillis() + 2 * _vm->_tickLength;
+}
+
+bool DarkmoonSequenceHelper::processDelayedPaletteFade() {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return true;
+
+	if (!_fadePalRate || (_system->getMillis() <= _fadePalTimer))
+		return false;
+
+	if (_screen->delayedFadePalStep(_palettes[_fadePalIndex], _palettes[0], _fadePalRate)) {
+		setPaletteWithoutTextColor(0);
+		_fadePalTimer = _system->getMillis() + 3 * _vm->_tickLength;
+	} else {
+		_fadePalRate = 0;
+	}
+
+	return false;
+}
+
+void DarkmoonSequenceHelper::delay(uint32 ticks) {
+	if (_vm->skipFlag() || _vm->shouldQuit())
+		return;
+
+	uint32 end = _system->getMillis() + ticks * _vm->_tickLength;
+
+	if (_mode == kFinale) {
+		do {
+			if (processDelayedPaletteFade())
+				break;
+			_vm->updateInput();
+		} while (end > _system->getMillis());
+		processDelayedPaletteFade();
+
+	} else {
+		_vm->delayUntil(end);
+	}
+}
+
+void DarkmoonSequenceHelper::waitForSongNotifier(int index, bool introUpdateAnim) {
+	int seq = 0;
+	while (_vm->sound()->checkTrigger() < index && !(_vm->skipFlag() || _vm->shouldQuit())) {
+		if (introUpdateAnim) {
+			runSequence(30 | seq);
+			seq ^= 1;
+		}
+
+		if (_mode == kFinale)
+			processDelayedPaletteFade();
+
+		_vm->updateInput();
+	}
+}
+
+void DarkMoonEngine::seq_nightmare() {
+	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
+	_screen->copyRegion(0, 0, 0, 120, 176, 24, 12, 2, Screen::CR_NO_P_CHECK);
+
+	initDialogueSequence();
+	gui_drawDialogueBox();
+
+	_txt->printDialogueText(99, 0);
+	snd_playSoundEffect(54);
+
+	static const uint8 seqX[] = { 0, 20, 0, 20 };
+	static const uint8 seqY[] = { 0, 0, 96, 96 };
+	static const uint8 seqDelay[] = { 12, 7, 7, 12 };
+
+	for (const int8 *i = _dreamSteps; *i != -1; ++i) {
+		drawSequenceBitmap("DREAM", 0, seqX[*i], seqY[*i], 0);
+		delay(seqDelay[*i] * _tickLength);
+	}
+
+	_txt->printDialogueText(20, _okStrings[0]);
+
+	restoreAfterDialogueSequence();
+
+	_screen->setFont(of);
+}
+
+void DarkMoonEngine::seq_kheldran() {
+	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
+
+	initDialogueSequence();
+	gui_drawDialogueBox();
+
+	static const char file[] = "KHELDRAN";
+	_txt->printDialogueText(_kheldranStrings[0]);
+	drawSequenceBitmap(file, 0, 0, 0, 0);
+	_txt->printDialogueText(20, _moreStrings[0]);
+	snd_playSoundEffect(56);
+	drawSequenceBitmap(file, 0, 20, 0, 0);
+	delay(10 * _tickLength);
+	drawSequenceBitmap(file, 0, 0, 96, 0);
+	delay(10 * _tickLength);
+	drawSequenceBitmap(file, 0, 20, 96, 0);
+	delay(7 * _tickLength);
+	_txt->printDialogueText(76, _okStrings[0]);
+
+	restoreAfterDialogueSequence();
+
+	_screen->setFont(of);
+}
+
+void DarkMoonEngine::seq_dranDragonTransformation() {
+	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
+
+	initDialogueSequence();
+	gui_drawDialogueBox();
+
+	static const char file[] = "DRANX";
+	drawSequenceBitmap(file, 0, 0, 0, 0);
+	_txt->printDialogueText(120, _moreStrings[0]);
+	snd_playSoundEffect(56);
+	drawSequenceBitmap(file, 0, 20, 0, 0);
+	delay(7 * _tickLength);
+	drawSequenceBitmap(file, 0, 0, 96, 0);
+	delay(7 * _tickLength);
+	drawSequenceBitmap(file, 0, 20, 96, 0);
+	delay(18 * _tickLength);
+
+	restoreAfterDialogueSequence();
+
+	_screen->setFont(of);
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
new file mode 100644
index 0000000000..e8526f2ba0
--- /dev/null
+++ b/engines/kyra/sequences_eob.cpp
@@ -0,0 +1,1071 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef ENABLE_EOB
+
+#include "kyra/eob.h"
+#include "kyra/screen_eob.h"
+#include "kyra/resource.h"
+#include "kyra/sound.h"
+
+#include "common/system.h"
+
+#include "base/version.h"
+
+namespace Kyra {
+
+int EobEngine::mainMenu() {
+	int menuChoice = _menuChoiceInit;
+	_menuChoiceInit = 0;
+
+	Screen::FontId of = _screen->_currentFont;
+
+	while (menuChoice >= 0 && !shouldQuit()) {
+		switch (menuChoice) {
+			case 0:
+				_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
+				_screen->loadEobBitmap("INTRO", 0, 5, 3, 2);
+				_screen->setScreenPalette(_screen->getPalette(0));
+				_screen->_curPage = 2;
+				of = _screen->setFont(Screen::FID_6_FNT);
+				_screen->printText(gScummVMVersion, 280 - strlen(gScummVMVersion) * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
+				_screen->setFont(of);
+				_screen->fillRect(0, 159, 319, 199, _screen->getPagePixel(2, 0, 0));
+				gui_drawBox(77, 165, 173, 29, 13, 14, 12);
+				gui_drawBox(76, 164, 175, 31, 13, 14, -1);
+				_screen->_curPage = 0;
+				_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+				_screen->updateScreen();
+				menuChoice = mainMenuLoop();
+				break;
+
+			case 1:
+				// load game in progress
+				//
+				menuChoice = -1;
+				break;
+
+			case 2:
+				// create new party
+				menuChoice = -2;
+				break;
+
+			case 3:
+				// quit
+				menuChoice = -5;
+				break;
+
+			case 4:
+				// intro
+				_sound->loadSoundFile("SOUND");
+				_screen->hideMouse();
+				seq_playOpeningCredits();
+				seq_playIntro();
+				_screen->showMouse();
+				_sound->loadSoundFile("ADLIB");
+				menuChoice = 0;
+				break;
+		}
+	}
+
+	return shouldQuit() ? -5 : menuChoice;
+}
+
+int EobEngine::mainMenuLoop() {
+	int sel = -1;
+	do {
+		_screen->setScreenDim(28);
+		_gui->simpleMenu_setup(8, 0, _mainMenuStrings, -1, 0, 0);
+
+		while (sel == -1 && !shouldQuit())
+			sel = _gui->simpleMenu_process(8, _mainMenuStrings, 0, -1, 0);
+	} while ((sel < 0 || sel > 5) && !shouldQuit());
+
+	return sel + 1;
+}
+
+void EobEngine::seq_playOpeningCredits() {
+	_allowSkip = true;
+
+	loadSetIntroPalette(_introFilesOpening[5]);
+	_screen->loadBitmap(_introFilesOpening[4], 5, 3, 0);
+	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+
+	_sound->playTrack(1);
+	delay(_introOpeningFrmDelay[0] * _tickLength);
+
+	for (int i = 0; i < 4 && !shouldQuit() && !skipFlag(); i++) {
+		_screen->loadBitmap(_introFilesOpening[i], 5, 3, 0);
+		uint32 nextFrameTimer = _system->getMillis() + _introOpeningFrmDelay[i + 1] * _tickLength;
+		_screen->crossFadeRegion(0, 50, 0, 50, 320, 102, 2, 0);
+		delayUntil(nextFrameTimer);
+	}
+
+	_allowSkip = false;
+}
+
+void EobEngine::seq_playIntro() {
+	_allowSkip = true;
+
+	if (!shouldQuit() && !skipFlag()) {
+		_sound->playTrack(2);
+		_screen->loadBitmap("TITLE-V.CMP", 5, 3, 0);
+		_screen->crossFadeRegion(0, 0, 0, 0, 320, 200, 2, 0);
+		delay(120 * _tickLength);
+	}
+
+	Common::SeekableReadStream *s = _res->createReadStream("TEXT.RAW");
+	if (s) {
+		s->seek(768);
+		_screen->loadFileDataToPage(s, 6, s->size() - 768);
+		delete s;
+	} else {
+		_screen->loadBitmap("TEXT.CMP", 3, 6, 0);
+	}
+
+	seq_tower();
+	seq_orb();
+	seq_waterdeepEntry();
+	seq_king();
+	seq_hands();
+	seq_waterdeepExit();
+	seq_tunnel();
+
+	whirlTransition();
+	_sound->haltTrack();
+	_allowSkip = false;
+}
+
+void EobEngine::seq_playFinale() {
+	Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
+	_screen->loadFileDataToPage(s, 5, 32000);
+	delete s;
+
+	snd_playSoundEffect(20);
+
+	_txt->resetPageBreakString();
+	_txt->setWaitButtonMode(1);
+	_txt->setupField(12, true);
+	gui_drawBox(0, 0, 176, 175, _color1_1, _color2_1, _bkgColor_1);
+	_txt->printDialogueText(51, _moreStrings[0]);
+
+	if (!checkScriptFlags(0x1ffe)) {
+		_screen->fadeToBlack();
+		return;
+	}
+
+	_txt->printDialogueText(_finBonusStrings[0]);
+	for (int i = 0; i < 6; i++) {
+		_txt->printDialogueText(_finBonusStrings[1]);
+		if (_characters[i].flags & 1)
+			_txt->printDialogueText(_characters[i].name);
+	}
+
+	uint32 password = 0;
+	for (int i = 0; i < 4; i++) {
+		if (!(_characters[i].flags & 1))
+			continue;
+
+		int len = strlen(_characters[i].name);
+		for (int ii = 0; ii < len; ii++) {
+			uint32 c = _characters[i].name[ii];
+			password += (c * c);
+		}
+	}
+
+	_txt->printDialogueText(Common::String::format(_finBonusStrings[2], password).c_str(), true);
+	_screen->fadeToBlack();
+}
+
+void EobEngine::seq_tower() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	_screen->loadBitmap(_introFilesTower[1], 5, 3, 0);
+	_screen->setCurPage(2);
+	uint8 *shp = _screen->encodeShape(0, 0, 16, 56, true);
+	_screen->copyPage(3, 4);
+	_screen->clearCurPage();
+
+	for (int i = 0; i < 200; i += 64)
+		_screen->copyRegion(128, 104, 96, i, 128, 64, 4, 2, Screen::CR_NO_P_CHECK);
+
+	_screen->fillRect(0, 184, 319, 199, 12);
+	int cp = _screen->setCurPage(0);
+	whirlTransition();
+	loadSetIntroPalette(_introFilesTower[0]);
+
+	_screen->setCurPage(cp);
+	_screen->clearCurPage();
+
+	for (int i = 0; i < 200; i += 64)
+		_screen->copyRegion(128, 104, 0, i, 128, 64, 4, 2, Screen::CR_NO_P_CHECK);
+
+	_screen->setCurPage(0);
+
+	for (int i = 0; i < 64 && !shouldQuit() && !skipFlag(); i += 2) {
+		uint32 end = _system->getMillis() + 2 * _tickLength;
+		_screen->copyRegion(0, 142 - i, 96, 0, 128, i + 1, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(0, 0, 96, i + 1, 128, 167 - i, 2, 0, Screen::CR_NO_P_CHECK);
+		if (!i)
+			_screen->copyRegion(0, 0, 0, 168, 320, 32, 6, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	for (int i = 0; i < 24 && !shouldQuit() && !skipFlag(); i += 2) {
+		uint32 end = _system->getMillis() + 2 * _tickLength;
+		_screen->copyRegion(0, 79 - i, 96, 0, 24, 65 + i, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(104, 79 - i, 200, 0, 24, 65 + i, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(24, 110, 120, i + 31, 80, 34, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(152, 0, 120, 32, 80, i + 1, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(0, 0, 96, 65 + i, 128, 103 - i, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	for (int i = 0; i < 56 && !shouldQuit() && !skipFlag(); i += 2) {
+		uint32 end = _system->getMillis() + 2 * _tickLength;
+		_screen->copyRegion(0, 56, 96, i, 24, 54, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(104, 56, 200, i, 24, 54, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(0, 110, 96, 54 + i, 128, 34, 4, 0, Screen::CR_NO_P_CHECK);
+
+		if (i < 32) {
+			_screen->fillRect(128, 0, 255, i + 1, 12, 2);
+			_screen->copyRegion(152, 0, 120, 32, 80, i + 25, 4, 0, Screen::CR_NO_P_CHECK);
+		} else {
+			_screen->fillRect(128, 0, 255, i + 1, 12, 2);
+			_screen->copyRegion(152, i + 1, 120, 32 + i + 1, 80, 23, 4, 0, Screen::CR_NO_P_CHECK);
+			_screen->copyRegion(152, 0, 152, 32, 80, i + 1, 4, 2, Screen::CR_NO_P_CHECK);
+		}
+
+		_screen->drawShape(2, shp, 128, i - 55, 0);
+		_screen->copyRegion(128, 0, 96, 0, 128, i + 1, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(0, 0, 96, i + 89, 128, 79 - i, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->copyRegion(0, 32, 0, 168, 320, 32, 6, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(65 * _tickLength);
+	delete[] shp;
+}
+
+void EobEngine::seq_orb() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	uint8 *shp[5];
+	_screen->loadBitmap(_introFilesOrb[0], 5, 3, 0);
+	_screen->setCurPage(2);
+	shp[4] = _screen->encodeShape(0, 0, 20, 136, true);
+	_screen->loadBitmap(_introFilesOrb[1], 5, 3, 0);
+	shp[3] = _screen->encodeShape(16, 0, 16, 104, true);
+
+	_screen->fillRect(0, 0, 127, 103, 12);
+	for (int i = 1; i < 4; i++) {
+		copyBlurRegion(128, 0, 0, 0, 128, 104, i);
+		shp[3 - i] = _screen->encodeShape(0, 0, 16, 104, true);
+	}
+
+	_screen->fillRect(0, 0, 159, 135, 12);
+	_screen->setCurPage(0);
+	_screen->copyPage(3, 4);
+	_screen->clearCurPage();
+
+	_sound->playTrack(6);
+
+	for (int i = -1; i < 4 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + 3 * _tickLength;
+		if (i >= 0)
+			_screen->drawShape(2, shp[i], 16, 16, 0);
+		_screen->drawShape(2, shp[4], 0, 0, 0);
+		_screen->copyRegion(0, 0, 80, 24, 160, 136, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->copyRegion(0, 64, 0, 168, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(40 * _tickLength);
+
+	_sound->playTrack(6);
+
+	for (int i = 3; i > -2 && !shouldQuit() && !skipFlag(); i--) {
+		uint32 end = _system->getMillis() + 3 * _tickLength;
+		_screen->fillRect(16, 16, 143, 119, 12, 2);
+		if (i >= 0)
+			_screen->drawShape(2, shp[i], 16, 16, 0);
+		_screen->drawShape(2, shp[4], 0, 0, 0);
+		_screen->copyRegion(0, 0, 80, 24, 160, 136, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	delay(40 * _tickLength);
+
+	for (int i = 0; i < 5; i++)
+		delete[] shp[i];
+}
+
+void EobEngine::seq_waterdeepEntry() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	uint8 *shp[4];
+	uint8 *shp2[31];
+	uint8 *shp3[3];
+
+	loadSetIntroPalette(_introFilesWdEntry[0]);
+	_screen->loadBitmap(_introFilesWdEntry[1], 5, 3, 0);
+	_screen->setCurPage(2);
+	shp[3] = _screen->encodeShape(0, 0, 20, 136, true);
+	for (int i = 1; i < 4; i++) {
+		copyBlurRegion(0, 0, 0, 0, 160, 136, i);
+		shp[3 - i] = _screen->encodeShape(0, 0, 20, 136, true);
+	}
+	_screen->setCurPage(0);
+
+	_screen->copyPage(3, 4);
+	_screen->fillRect(0, 168, 319, 199, 12, 0);
+	_sound->playTrack(6);
+
+	for (int i = 0; i < 4 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + 3 * _tickLength;
+		_screen->drawShape(0, shp[i], 80, 24, 0);
+		delete[] shp[i];
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->copyRegion(0, 80, 0, 168, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(50 * _tickLength);
+
+	_screen->setCurPage(2);
+	shp[0] = _screen->encodeShape(20, 0, 20, 136, true);
+	_screen->loadBitmap(_introFilesWdEntry[2], 5, 3, 0);
+	shp[1] = _screen->encodeShape(0, 0, 20, 136, true);
+	shp[2] = _screen->encodeShape(20, 0, 20, 136, true);
+	_screen->loadBitmap(_introFilesWdEntry[3], 5, 3, 0);
+
+	for (int i = 0; i < 31; i++)
+		shp2[i] = _screen->encodeShape(_introWdEncodeX[i], 136 + (_introWdEncodeY[i] << 3), _introWdEncodeWH[i], _introWdEncodeWH[i] << 3, true);
+	for (int i = 0; i < 3; i++)
+		shp3[i] = _screen->encodeShape(5 * i, 152, 5, 32, true);
+
+	_screen->copyPage(3, 4);
+
+	for (int i = 0; i < 3 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + 3 * _tickLength;
+		_screen->fillRect(0, 0, 159, 135, 12, 2);
+		_screen->drawShape(2, shp[i], 0, 0, 0);
+		_screen->copyRegion(0, 0, 80, 24, 160, 136, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->copyRegion(0, 0, 80, 24, 160, 136, 4, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(4 * _tickLength);
+	_screen->copyRegion(160, 0, 80, 24, 160, 136, 4, 0, Screen::CR_NO_P_CHECK);
+	_screen->fillRect(0, 168, 319, 199, 12, 0);
+	_screen->updateScreen();
+	delay(4 * _tickLength);
+	_screen->copyRegion(0, 184, 40, 184, 232, 16, 4, 0, Screen::CR_NO_P_CHECK);
+
+	int cx = 264;
+	int cy = 11;
+
+	for (int i = 0; i < 70 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + 3 * _tickLength;
+
+		_screen->copyRegion(cx - 2, cy - 2, 0, 0, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
+		_screen->drawShape(4, shp3[((i & 3) == 3) ? 1 : (i & 3)], cx, cy, 0);
+		_screen->copyRegion(cx - 2, cy - 2, cx - 82, cy + 22, 48, 36, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(0, 0, cx - 2, cy - 2, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
+		cx--;
+		cy++;
+
+		for (int ii = 0; ii < 5; ii++) {
+			int s = _rnd.getRandomNumber(255) % 31;
+			_screen->drawShape(0, shp2[s], _introWdDsX[s] - 80, _introWdDsY[s] + 24, 0);
+		}
+
+		if (!(_rnd.getRandomNumber(255) & 7))
+			_sound->playTrack(_rnd.getRandomBit() ? 5 : 14);
+
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	for (int i = 0; i < 3; i++) {
+		delete[] shp[i];
+		delete[] shp3[i];
+	}
+
+	for (int i = 0; i < 31; i++)
+		delete[] shp2[i];
+}
+
+void EobEngine::seq_king() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	_screen->loadBitmap(_introFilesKing[0], 5, 3, 0);
+	_screen->copyPage(3, 4);
+
+	int x = 15;
+	int y = 14;
+	int w = 1;
+	int h = 1;
+
+	for (int i = 0; i < 10 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->copyRegion(x << 3, y << 3, x << 3, y << 3, w << 3, h << 3, 4, 0, Screen::CR_NO_P_CHECK);
+		if (x > 6)
+			x --;
+		if (y > 0)
+			y -= 2;
+		w += 3;
+		if (x + w > 34)
+			w = 34 - x;
+		h += 3;
+		if (y + h > 23)
+			h = 23 - y;
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	delay(25 * _tickLength);
+
+	uint8 *shp[4];
+	int16 dy[4];
+	int16 stepY[4];
+
+	static const uint8 advEncX[] = { 0, 6, 12, 19 };
+	static const uint8 advEncW[] = { 6, 6, 7, 6 };
+	static const int8 modY[] = { -4, -8, -2, -2, 1, 0, 0, 0 };
+
+	_screen->loadBitmap(_introFilesKing[1], 5, 3, 0);
+	_screen->setCurPage(2);
+	for (int i = 0; i < 4; i++) {
+		shp[i] = _screen->encodeShape(advEncX[i], 0, advEncW[i], 98, true);
+		dy[i] = 180 + ((_rnd.getRandomNumber(255) & 3) << 3);
+		stepY[i] = (i * 5) & 3;
+	}
+
+	_screen->copyPage(0, 4);
+
+	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag(); ) {
+		runloop = false;
+		uint32 end = _system->getMillis() + 2 * _tickLength;
+
+		for (int i = 0; i < 4; i++) {
+			if (dy[i] <= 82)
+				continue;
+			stepY[i] = (stepY[i] + 1) & 7;
+			dy[i] += modY[stepY[i]];
+
+			if (dy[i] < 82)
+				dy[i] = 82;
+
+			if (dy[i] < 180) {
+				_screen->copyRegion((advEncX[i] + 8) << 3, dy[i] - 2, 0, dy[i] - 2, advEncW[i] << 3, 182 - dy[i], 4, 4, Screen::CR_NO_P_CHECK);
+				_screen->drawShape(4, shp[i], 0, dy[i], 0);
+				_screen->copyRegion(0, dy[i] - 2, (advEncX[i] + 8) << 3, dy[i] - 2, advEncW[i] << 3, 182 - dy[i], 4, 0, Screen::CR_NO_P_CHECK);
+			}
+
+			if (_rnd.getRandomNumber(255) & 3)
+				_sound->playTrack(7);
+
+			runloop = true;
+		}
+
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->copyRegion(0, 96, 0, 160, 320, 32, 6, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(70 * _tickLength);
+
+	for (int i = 0; i < 4; i++)
+		delete[] shp[i];
+}
+
+void EobEngine::seq_hands() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	_screen->setCurPage(2);
+	uint8 *shp1 = _screen->encodeShape(0, 140, 21, 60, true);
+	uint8 *shp2 = _screen->encodeShape(21, 140, 12, 60, true);
+	_screen->loadBitmap(_introFilesHands[0], 3, 5, 0);
+
+	_screen->fillRect(0, 160, 319, 199, 12, 0);
+	_screen->fillRect(0, 0, 191, 63, 157, 2);
+	_screen->drawShape(2, shp1, 0, 4, 0);
+	_screen->drawShape(2, shp2, 151, 4, 0);
+	boxMorphTransition(25, 8, 18, 4, 3, 0, 21, 8, 6, 0, 28, 23);
+	_screen->copyRegion(0, 128, 0, 176, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
+
+	_screen->updateScreen();
+	delay(15 * _tickLength);
+	_sound->playTrack(11);
+
+	for (int i = -22; i <= 20 && !shouldQuit() && !skipFlag(); i += 4) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->fillRect(0, 0, 167, 63, 157);
+		_screen->drawShape(2, shp1, i, 4, 0);
+		_screen->drawShape(2, shp1, 105 - i, 4, 0);
+		_screen->copyRegion(0, 0, 144, 32, 168, 64, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_sound->playTrack(10);
+
+	delete[] shp1;
+	delete[] shp2;
+	delay(15 * _tickLength);
+
+	_screen->setCurPage(4);
+	shp1 = _screen->encodeShape(17, 0, 11, 120, true);
+	shp2 = _screen->encodeShape(28, 112, 1, 31, true);
+	uint8 *shp3 = _screen->encodeShape(9, 138, 14, 54, true);
+
+	_screen->setCurPage(2);
+	_screen->fillRect(0, 0, 135, 63, 157);
+	_screen->drawShape(2, shp1, 32, -80, 0);
+	_screen->drawShape(2, shp2, 40, -16, 0);
+	boxMorphTransition(18, 16, 10, 12, 0, 0, 17, 8, 17, 3, 25, 10);
+	delay(15 * _tickLength);
+
+	for (int i = -80; i <= 0 && !shouldQuit() && !skipFlag(); i += 4) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->fillRect(0, 0, 135, 63, 157);
+		_screen->drawShape(2, shp1, 32, i, 0);
+		_screen->drawShape(2, shp2, 40, i + 64, 0);
+		_screen->copyRegion(0, 0, 80, 96, 136, 64, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_sound->playTrack(12);
+	delay(5 * _tickLength);
+
+	for (int i = 0; i > -54 && !shouldQuit() && !skipFlag(); i -= 4) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->fillRect(0, 0, 135, 63, 157);
+		_screen->drawShape(2, shp3, 12, 64 + i, 0);
+		_screen->drawShape(2, shp1, 32, i, 0);
+		_screen->copyRegion(0, 0, 80, 96, 136, 64, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	delete[] shp1;
+	delete[] shp2;
+	delete[] shp3;
+	delay(15 * _tickLength);
+
+	_screen->setCurPage(4);
+	shp1 = _screen->encodeShape(0, 0, 17, 136, true);
+	shp2 = _screen->encodeShape(0, 136, 9, 48, true);
+
+	_screen->setCurPage(2);
+	_screen->fillRect(0, 0, 143, 95, 157);
+	_screen->drawShape(2, shp1, -56, -56, 0);
+	_screen->drawShape(2, shp2, 52, 49, 0);
+	boxMorphTransition(9, 6, 0, 0, 0, 0, 18, 12, 8, 11, 21, 10);
+	delay(15 * _tickLength);
+	_sound->playTrack(11);
+
+	for (int i = -56; i <= -8 && !shouldQuit() && !skipFlag(); i += 4) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->fillRect(0, 0, 143, 95, 157);
+		_screen->drawShape(2, shp1, i, i, 0);
+		_screen->drawShape(2, shp2, (i == -8) ? 55 : 52, (i == -8) ? 52 : 49, 0);
+		_screen->copyRegion(0, 0, 0, 0, 144, 96, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_sound->playTrack(10);
+	delete[] shp1;
+	delete[] shp2;
+	delay(30 * _tickLength);
+
+	_screen->setCurPage(4);
+	shp1 = _screen->encodeShape(28, 0, 11, 40, true);
+	shp2 = _screen->encodeShape(28, 40, 10, 72, true);
+
+	_screen->setCurPage(2);
+	_screen->fillRect(0, 0, 87, 112, 157);
+	_screen->drawShape(2, shp2, 0, 90, 0);
+	boxMorphTransition(20, 13, 15, 6, 0, 0, 11, 14, 0, 0, 24, 16);
+	delay(15 * _tickLength);
+
+	int dy = 90;
+	for (int i = -40; i <= 0 && !shouldQuit() && !skipFlag(); i += 4) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->fillRect(0, 0, 87, 112, 157);
+		_screen->drawShape(2, shp2, 0, dy, 0);
+		_screen->copyRegion(0, 0, 120, 48, 88, 112, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+		dy -= 5;
+	}
+
+	_sound->playTrack(13);
+
+	for (int i = -40; i <= 0 && !shouldQuit() && !skipFlag(); i += 4) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->fillRect(0, 0, 87, 39, 157);
+		_screen->drawShape(2, shp1, 0, i, 0);
+		_screen->copyRegion(0, 0, 120, 48, 88, 112, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	delete[] shp1;
+	delete[] shp2;
+	delay(48 * _tickLength);
+}
+
+void EobEngine::seq_waterdeepExit() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	uint8 *shp2[31];
+	uint8 *shp3[3];
+
+	_screen->loadBitmap(_introFilesWdExit[0], 5, 3, 0);
+	_screen->setCurPage(2);
+	for (int i = 0; i < 31; i++)
+		shp2[i] = _screen->encodeShape(_introWdEncodeX[i], 136 + (_introWdEncodeY[i] << 3), _introWdEncodeWH[i], _introWdEncodeWH[i] << 3, true);
+	for (int i = 0; i < 3; i++)
+		shp3[i] = _screen->encodeShape(5 * i + 15, 152, 5, 32, true);
+	uint8 *shp1 = _screen->encodeShape(31, 136, 5, 32, true);
+	_screen->copyPage(3, 4);
+	_screen->copyRegion(0, 0, 0, 136, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
+	_screen->fillRect(0, 168, 319, 199, 12, 0);
+	_screen->copyRegion(160, 0, 80, 24, 160, 136, 4, 0, Screen::CR_NO_P_CHECK);
+
+	int cx = 140;
+	int cy = 128;
+
+	for (int i = 0; i < 70 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + 3 * _tickLength;
+		int fx = cx - 2;
+		if (fx < 160)
+			fx = 160;
+		int fy = cy - 2;
+		if (fy > 98)
+			fy = 98;
+
+		_screen->copyRegion(fx, fy, 0, 0, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
+		_screen->drawShape(4, shp3[((i & 3) == 3) ? 1 : (i & 3)], cx, cy, 0);
+		_screen->drawShape(4, shp1, 160, 104, 0);
+		_screen->copyRegion(fx, fy, fx - 80, fy + 24, 48, 36, 4, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(0, 0, fx, fy, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
+		cx++;
+		cy--;
+
+		for (int ii = 0; ii < 5; ii++) {
+			int s = _rnd.getRandomNumber(255) % 31;
+			_screen->drawShape(0, shp2[s], _introWdDsX[s] - 80, _introWdDsY[s] + 24, 0);
+		}
+
+		if (!(_rnd.getRandomNumber(255) & 7))
+			_sound->playTrack(_rnd.getRandomBit() ? 5 : 14);
+
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	for (int i = 0; i < 3; i++)
+		delete[] shp3[i];
+
+	for (int i = 0; i < 31; i++)
+		delete[] shp2[i];
+	delete[] shp1;
+
+	_screen->setCurPage(0);
+	_screen->fillRect(0, 168, 319, 199, 12, 0);
+	_screen->copyRegion(0, 136, 0, 0, 48, 36, 0, 4, Screen::CR_NO_P_CHECK);
+
+	loadSetIntroPalette(_introFilesWdExit[1]);
+	_screen->loadBitmap(_introFilesWdExit[2], 3, 5, 0);
+	_screen->copyPage(5, 2);
+	whirlTransition();
+	delay(6 * _tickLength);
+
+	_screen->copyRegion(0, 144, 0, 184, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
+
+	cx = 0;
+	cy = 136;
+	int dy = 0;
+	for (int i = 0; i < 19 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->copyRegion(cx, cy, 80, dy + 16, 160, 8, 2, 0, Screen::CR_NO_P_CHECK);
+		cy += 8;
+		dy += 8;
+		if (i == 6) {
+			cx = 160;
+			cy = 0;
+		}
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_sound->playTrack(3);
+	delay(60 * _tickLength);
+
+	for (int i = 0; i < 56 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->copyRegion(0, 136 + i, 80, 16, 160, 56 - i, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(160, 0, 80, 72 - i, 160, 96 + i, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	for (int i = 1; i < 48 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->copyRegion(160, i, 80, 16, 160, 152, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->loadBitmap(_introFilesWdExit[3], 3, 5, 0);
+	_screen->copyPage(5, 2);
+	delay(30 * _tickLength);
+	_screen->setCurPage(0);
+	_screen->fillRect(0, 16, 319, 31, 12);
+	_screen->fillRect(0, 136, 319, 199, 12);
+	_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
+	loadSetIntroPalette(_introFilesWdExit[4]);
+	_screen->updateScreen();
+	delay(50 * _tickLength);
+}
+
+void EobEngine::seq_tunnel() {
+	if (shouldQuit() || skipFlag())
+		return;
+
+	_screen->setCurPage(4);
+	uint8 *shp2 = _screen->encodeShape(20, 0, 20, 120, true);
+	uint8 *shp1 = _screen->encodeShape(0, 0, 20, 120, true);
+	drawBlockObject(1, 4, shp2, 160, 0, 0);
+	drawBlockObject(1, 4, shp1, 0, 0, 0);
+	delete[] shp1;
+	delete[] shp2;
+
+	for (int i = 0; i < 3 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + 8 * _tickLength;
+		_screen->copyRegion(0, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
+		_sound->playTrack(7);
+		_screen->updateScreen();
+		delayUntil(end);
+		_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
+		_sound->playTrack(7);
+		end = _system->getMillis() + 8 * _tickLength;
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_screen->copyRegion(0, 160, 0, 184, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(18 * _tickLength);
+	_screen->copyRegion(160, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(5 * _tickLength);
+	_screen->copyRegion(0, 122, 80, 32, 160, 60, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(160, 122, 80, 92, 160, 60, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(5 * _tickLength);
+	_screen->copyRegion(160, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
+	for (int i = 0; i < 6; i++)
+		_screen->copyRegion(i * 48, 185, 56, (i << 3) + 24, 48, 8, 2, 2, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(5 * _tickLength);
+	_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
+
+	_screen->loadBitmap(_introFilesTunnel[0], 5, 3, 0);
+	_screen->copyPage(3, 4);
+	_screen->updateScreen();
+	delay(40 * _tickLength);
+
+	_screen->copyRegion(264, 0, 136, 56, 48, 48, 4, 0, Screen::CR_NO_P_CHECK);
+	_sound->playTrack(8);
+	_screen->copyRegion(0, 0, 0, 0, 320, 184, 0, 2, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(16 * _tickLength);
+	_sound->playTrack(4);
+
+	for (int i = 0; i < 30 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + _tickLength;
+		if (i == 0)
+			_screen->fillRect(0, 168, 319, 199, 12, 0);
+		_screen->copyRegion(80, 25 + (_rnd.getRandomNumber(255) & 7), 80, 24, 160, 144, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+
+	_sound->playTrack(9);
+
+	for (int i = 0; i < 6 && !shouldQuit() && !skipFlag(); i++) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->copyRegion(_introTvlX1[i] << 3, _introTvlY1[i], _introTvlX2[i] << 3, _introTvlY2[i], _introTvlW[i] << 3, _introTvlH[i], 4, 2, Screen::CR_NO_P_CHECK);
+		for (int ii = 0; ii < 4 && !shouldQuit() && !skipFlag(); ii++) {
+			_screen->updateScreen();
+			delayUntil(end);
+			end = _system->getMillis() + _tickLength;
+			_screen->copyRegion(80, 25 + (_rnd.getRandomNumber(255) & 7), 80, 24, 160, 144, 2, 0, Screen::CR_NO_P_CHECK);
+		}
+	}
+	_screen->copyRegion(0, 0, 0, 0, 320, 168, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(40 * _tickLength);
+
+	_screen->loadBitmap(_introFilesTunnel[1], 5, 3, 0);
+	_screen->copyPage(3, 4);
+	_sound->playTrack(6);
+	_screen->copyRegion(0, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(2 * _tickLength);
+	_screen->copyRegion(160, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+	delay(2 * _tickLength);
+	_screen->copyRegion(0, 120, 80, 30, 160, 64, 4, 0, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(160, 120, 80, 94, 160, 64, 4, 0, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(0, 176, 0, 184, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
+	_screen->setCurPage(0);
+	_screen->updateScreen();
+	delay(50 * _tickLength);
+}
+
+void EobEngine::seq_xdeath() {
+	uint8 *shapes1[5];
+	uint8 *shapes2;
+
+	_screen->loadShapeSetBitmap("XDEATH2", 5, 3);
+	for (int i = 0; i < 4; i++)
+		shapes1[i] = _screen->encodeShape(i / 2 * 14, i / 2 * 88, 14, 88, true);
+	_screen->loadShapeSetBitmap("XDEATH3", 5, 3);
+	shapes2 = _screen->encodeShape(22, 0, 16, 95, true);
+	_screen->loadEobBitmap("XDEATH1", 0, 5, 3, -1);
+	_screen->setCurPage(0);
+
+	for (int i = 0; i < 10; i++) {
+		if (i == 2)
+			snd_playSoundEffect(72);
+		else if (i == 4 || i == 6)
+			snd_playSoundEffect(54);
+		else
+			snd_playSoundEffect(34);
+
+		if (i < 6) {
+			_screen->copyRegion((i % 3) * 104, i / 3 * 88, 32, 10, 104, 88, 2, 0, Screen::CR_NO_P_CHECK);
+		} else {
+			snd_playSoundEffect(42);
+			_screen->drawShape(0, shapes1[i - 6], 32, 10, 0);
+		}
+
+		_screen->updateScreen();
+		delay(4 * _tickLength);
+	}
+
+	const ScreenDim *dm = _screen->getScreenDim(5);
+	_screen->modifyScreenDim(5, dm->sx, 8, dm->w, dm->h);
+	_screen->copyRegion(0, 0, 0, 0, 176, 120, 0, 5, Screen::CR_NO_P_CHECK);
+
+	for (int i = 0; i < 19; i++) {
+		snd_playSoundEffect(119);
+		_screen->copyRegion(0, 0, 0, 0, 176, 120, 5, 2, Screen::CR_NO_P_CHECK);
+		_screen->drawShape(2, shapes2, 24, i * 5 - 90, 5);
+		_screen->copyRegion(0, 0, 0, 0, 176, 120, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delay(2 * _tickLength);
+	}
+
+	_screen->modifyScreenDim(5, dm->sx, 0, dm->w, dm->h);
+
+	snd_playSoundEffect(5);
+	delay(60 * _tickLength);
+
+	for (int i = 0; i < 4; i++)
+		delete[] shapes1[i];
+	delete[] shapes2;
+
+	gui_drawPlayField(false);
+	gui_drawAllCharPortraitsWithStats();
+}
+
+void EobEngine::loadSetIntroPalette(const char *filename) {
+	_screen->loadPalette(filename, _screen->getPalette(0));
+	_screen->getPalette(0).fill(0, 1, 0);
+	_screen->setScreenPalette(_screen->getPalette(0));
+}
+
+void EobEngine::copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step) {
+	const uint8 *ptr2 = _screen->getCPagePtr(3) + y1 * 320 + x1;
+
+	if (step == 1) {
+		while (h > 0) {
+			int dx = x2;
+			for (int i = 0; i < w; i += 2) {
+				_screen->setPagePixel(3, dx++, y2, ptr2[i]);
+				_screen->setPagePixel(3, dx++, y2, 0);
+			}
+			dx = x2;
+			y2++;
+			ptr2 += 320;
+			for (int i = 0; i < w; i += 2) {
+				_screen->setPagePixel(3, dx++, y2, 0);
+				_screen->setPagePixel(3, dx++, y2, ptr2[i + 1]);
+			}
+			y2++;
+			ptr2 += 320;
+			h -= 2;
+		}
+	} else if (step == 2) {
+		while (h > 0) {
+			int dx = x2;
+			for (int i = 0; i < w; i += 2) {
+				_screen->setPagePixel(3, dx++, y2, ptr2[i]);
+				_screen->setPagePixel(3, dx++, y2, 0);
+			}
+			dx = x2;
+			y2++;
+			ptr2 += 320;
+			for (int i = 0; i < w; i++)
+				_screen->setPagePixel(3, dx++, y2, 0);
+
+			y2++;
+			ptr2 += 320;
+			h -= 2;
+		}
+	} else if (step == 3) {
+		for (int i = 0; i < h; i++) {
+			int dx = x2;
+			if ((i % 3) == 0) {
+				int ii = 0;
+				for (; ii < w - 3; ii += 3) {
+					_screen->setPagePixel(3, dx++, y2, ptr2[ii]);
+					_screen->setPagePixel(3, dx++, y2, 0);
+					_screen->setPagePixel(3, dx++, y2, 0);
+				}
+				for (; ii < w; ii++)
+					_screen->setPagePixel(3, dx++, y2, 0);
+			} else {
+				for (int ii = 0; ii < w; ii++)
+					_screen->setPagePixel(3, dx++, y2, 0);
+			}
+			y2++;
+			ptr2 += 320;
+		}
+	}
+}
+
+void EobEngine::boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH) {
+	int originX2 = originX1 + originW;
+	int originY2 = originY1 + originH;
+	if (originY2 > 21)
+		originY2 = 21;
+
+	int w = 1;
+	int h = 1;
+	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag(); ) {
+		uint32 end = _system->getMillis() + _tickLength;
+		_screen->copyRegion(targetSrcX << 3, targetSrcY << 3, targetDestX << 3, targetDestY << 3, w << 3, h << 3, 2, 0, Screen::CR_NO_P_CHECK);
+		if (originX1 < targetDestX)
+			_screen->copyRegion(312, 0, originX1 << 3, 0, 8, 176, 0, 0, Screen::CR_NO_P_CHECK);
+		if (originY1 < targetDestY)
+			_screen->copyRegion(0, 192, 0, originY1 << 3, 320, 8, 0, 0, Screen::CR_NO_P_CHECK);
+		if ((targetFinalX + targetFinalW) <= originX2)
+			_screen->copyRegion(312, 0, originX2 << 3, 0, 8, 176, 0, 0, Screen::CR_NO_P_CHECK);
+		if ((targetFinalY + targetFinalH) <= originY2)
+			_screen->copyRegion(0, 192, 0, originY2 << 3, 320, 8, 0, 0, Screen::CR_NO_P_CHECK);
+
+		if (!(targetDestX != targetFinalX || targetDestY != targetFinalY || w != targetFinalW || h != targetFinalH || originX1 < targetFinalX || originY1 < targetFinalY || (targetFinalX + targetFinalW) < originX2 || (targetFinalY + targetFinalH) < originY2))
+			runloop = false;
+
+		int v = targetFinalX - targetDestX;
+		v = (v < 0) ? -1 : ((v > 0) ? 1 : 0);
+		targetDestX += v;
+		v = targetFinalY - targetDestY;
+		v = (v < 0) ? -1 : ((v > 0) ? 1 : 0);
+		targetDestY += v;
+
+		if (w != targetFinalW)
+			w += 2;
+		if (w > targetFinalW)
+			w = targetFinalW;
+
+		if (h != targetFinalH)
+			h += 2;
+		if (h > targetFinalH)
+			h = targetFinalH;
+
+		if (++originX1 > targetFinalX)
+			originX1 = targetFinalX;
+
+		if (++originY1 > targetFinalY)
+			originY1 = targetFinalY;
+
+		if ((targetFinalX + targetFinalW) < originX2)
+			originX2--;
+
+		if ((targetFinalY + targetFinalH) < originY2)
+			originY2--;
+
+		_screen->updateScreen();
+		delayUntil(end);
+	}
+}
+
+void EobEngine::whirlTransition() {
+	for (int i = 0; i < 2; i++) {
+		for (int ii = 0; ii < 8; ii++) {
+			uint32 e = _system->getMillis() + 3;
+			if (ii & 1) {
+				for (int iii = i + ii; iii < 320; iii += 8)
+					_screen->drawClippedLine(iii, 0, iii, 199, 12);
+			} else {
+				for (int iii = i + ii; iii < 200; iii += 8)
+					_screen->drawClippedLine(0, iii, 319, iii, 12);
+			}
+			_screen->updateScreen();
+			uint32 c = _system->getMillis();
+			if (e > c)
+				_system->delayMillis(e - c);
+		}
+	}
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB
diff --git a/engines/kyra/sequences_eob1.cpp b/engines/kyra/sequences_eob1.cpp
deleted file mode 100644
index b25de5ccd2..0000000000
--- a/engines/kyra/sequences_eob1.cpp
+++ /dev/null
@@ -1,1071 +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.
- *
- */
-
-#ifdef ENABLE_EOB
-
-#include "kyra/eob1.h"
-#include "kyra/screen_eob.h"
-#include "kyra/resource.h"
-#include "kyra/sound.h"
-
-#include "common/system.h"
-
-#include "base/version.h"
-
-namespace Kyra {
-
-int EobEngine::mainMenu() {
-	int menuChoice = _menuChoiceInit;
-	_menuChoiceInit = 0;
-
-	Screen::FontId of = _screen->_currentFont;
-
-	while (menuChoice >= 0 && !shouldQuit()) {
-		switch (menuChoice) {
-			case 0:
-				_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
-				_screen->loadEobBitmap("INTRO", 0, 5, 3, 2);
-				_screen->setScreenPalette(_screen->getPalette(0));
-				_screen->_curPage = 2;
-				of = _screen->setFont(Screen::FID_6_FNT);
-				_screen->printText(gScummVMVersion, 280 - strlen(gScummVMVersion) * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
-				_screen->setFont(of);
-				_screen->fillRect(0, 159, 319, 199, _screen->getPagePixel(2, 0, 0));
-				gui_drawBox(77, 165, 173, 29, 13, 14, 12);
-				gui_drawBox(76, 164, 175, 31, 13, 14, -1);
-				_screen->_curPage = 0;
-				_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
-				_screen->updateScreen();
-				menuChoice = mainMenuLoop();
-				break;
-
-			case 1:
-				// load game in progress
-				//
-				menuChoice = -1;
-				break;
-
-			case 2:
-				// create new party
-				menuChoice = -2;
-				break;
-
-			case 3:
-				// quit
-				menuChoice = -5;
-				break;
-
-			case 4:
-				// intro
-				_sound->loadSoundFile("SOUND");
-				_screen->hideMouse();
-				seq_playOpeningCredits();
-				seq_playIntro();
-				_screen->showMouse();
-				_sound->loadSoundFile("ADLIB");
-				menuChoice = 0;
-				break;
-		}
-	}
-
-	return shouldQuit() ? -5 : menuChoice;
-}
-
-int EobEngine::mainMenuLoop() {
-	int sel = -1;
-	do {
-		_screen->setScreenDim(28);
-		_gui->simpleMenu_setup(8, 0, _mainMenuStrings, -1, 0, 0);
-
-		while (sel == -1 && !shouldQuit())
-			sel = _gui->simpleMenu_process(8, _mainMenuStrings, 0, -1, 0);
-	} while ((sel < 0 || sel > 5) && !shouldQuit());
-
-	return sel + 1;
-}
-
-void EobEngine::seq_playOpeningCredits() {
-	_allowSkip = true;
-
-	loadSetIntroPalette(_introFilesOpening[5]);
-	_screen->loadBitmap(_introFilesOpening[4], 5, 3, 0);
-	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-
-	_sound->playTrack(1);
-	delay(_introOpeningFrmDelay[0] * _tickLength);
-
-	for (int i = 0; i < 4 && !shouldQuit() && !skipFlag(); i++) {
-		_screen->loadBitmap(_introFilesOpening[i], 5, 3, 0);
-		uint32 nextFrameTimer = _system->getMillis() + _introOpeningFrmDelay[i + 1] * _tickLength;
-		_screen->crossFadeRegion(0, 50, 0, 50, 320, 102, 2, 0);
-		delayUntil(nextFrameTimer);
-	}
-
-	_allowSkip = false;
-}
-
-void EobEngine::seq_playIntro() {
-	_allowSkip = true;
-
-	if (!shouldQuit() && !skipFlag()) {
-		_sound->playTrack(2);
-		_screen->loadBitmap("TITLE-V.CMP", 5, 3, 0);
-		_screen->crossFadeRegion(0, 0, 0, 0, 320, 200, 2, 0);
-		delay(120 * _tickLength);
-	}
-
-	Common::SeekableReadStream *s = _res->createReadStream("TEXT.RAW");
-	if (s) {
-		s->seek(768);
-		_screen->loadFileDataToPage(s, 6, s->size() - 768);
-		delete s;
-	} else {
-		_screen->loadBitmap("TEXT.CMP", 3, 6, 0);
-	}
-
-	seq_tower();
-	seq_orb();
-	seq_waterdeepEntry();
-	seq_king();
-	seq_hands();
-	seq_waterdeepExit();
-	seq_tunnel();
-
-	whirlTransition();
-	_sound->haltTrack();
-	_allowSkip = false;
-}
-
-void EobEngine::seq_playFinale() {
-	Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
-	_screen->loadFileDataToPage(s, 5, 32000);
-	delete s;
-
-	snd_playSoundEffect(20);
-
-	_txt->resetPageBreakString();
-	_txt->setWaitButtonMode(1);
-	_txt->setupField(12, true);
-	gui_drawBox(0, 0, 176, 175, _color1_1, _color2_1, _bkgColor_1);
-	_txt->printDialogueText(51, _moreStrings[0]);
-
-	if (!checkScriptFlags(0x1ffe)) {
-		_screen->fadeToBlack();
-		return;
-	}
-
-	_txt->printDialogueText(_finBonusStrings[0]);
-	for (int i = 0; i < 6; i++) {
-		_txt->printDialogueText(_finBonusStrings[1]);
-		if (_characters[i].flags & 1)
-			_txt->printDialogueText(_characters[i].name);
-	}
-
-	uint32 password = 0;
-	for (int i = 0; i < 4; i++) {
-		if (!(_characters[i].flags & 1))
-			continue;
-
-		int len = strlen(_characters[i].name);
-		for (int ii = 0; ii < len; ii++) {
-			uint32 c = _characters[i].name[ii];
-			password += (c * c);
-		}
-	}
-
-	_txt->printDialogueText(Common::String::format(_finBonusStrings[2], password).c_str(), true);
-	_screen->fadeToBlack();
-}
-
-void EobEngine::seq_tower() {
-	if (shouldQuit() || skipFlag())
-		return;
-
-	_screen->loadBitmap(_introFilesTower[1], 5, 3, 0);
-	_screen->setCurPage(2);
-	uint8 *shp = _screen->encodeShape(0, 0, 16, 56, true);
-	_screen->copyPage(3, 4);
-	_screen->clearCurPage();
-
-	for (int i = 0; i < 200; i += 64)
-		_screen->copyRegion(128, 104, 96, i, 128, 64, 4, 2, Screen::CR_NO_P_CHECK);
-
-	_screen->fillRect(0, 184, 319, 199, 12);
-	int cp = _screen->setCurPage(0);
-	whirlTransition();
-	loadSetIntroPalette(_introFilesTower[0]);
-
-	_screen->setCurPage(cp);
-	_screen->clearCurPage();
-
-	for (int i = 0; i < 200; i += 64)
-		_screen->copyRegion(128, 104, 0, i, 128, 64, 4, 2, Screen::CR_NO_P_CHECK);
-
-	_screen->setCurPage(0);
-
-	for (int i = 0; i < 64 && !shouldQuit() && !skipFlag(); i += 2) {
-		uint32 end = _system->getMillis() + 2 * _tickLength;
-		_screen->copyRegion(0, 142 - i, 96, 0, 128, i + 1, 4, 0, Screen::CR_NO_P_CHECK);
-		_screen->copyRegion(0, 0, 96, i + 1, 128, 167 - i, 2, 0, Screen::CR_NO_P_CHECK);
-		if (!i)
-			_screen->copyRegion(0, 0, 0, 168, 320, 32, 6, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	for (int i = 0; i < 24 && !shouldQuit() && !skipFlag(); i += 2) {
-		uint32 end = _system->getMillis() + 2 * _tickLength;
-		_screen->copyRegion(0, 79 - i, 96, 0, 24, 65 + i, 4, 0, Screen::CR_NO_P_CHECK);
-		_screen->copyRegion(104, 79 - i, 200, 0, 24, 65 + i, 4, 0, Screen::CR_NO_P_CHECK);
-		_screen->copyRegion(24, 110, 120, i + 31, 80, 34, 4, 0, Screen::CR_NO_P_CHECK);
-		_screen->copyRegion(152, 0, 120, 32, 80, i + 1, 4, 0, Screen::CR_NO_P_CHECK);
-		_screen->copyRegion(0, 0, 96, 65 + i, 128, 103 - i, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	for (int i = 0; i < 56 && !shouldQuit() && !skipFlag(); i += 2) {
-		uint32 end = _system->getMillis() + 2 * _tickLength;
-		_screen->copyRegion(0, 56, 96, i, 24, 54, 4, 0, Screen::CR_NO_P_CHECK);
-		_screen->copyRegion(104, 56, 200, i, 24, 54, 4, 0, Screen::CR_NO_P_CHECK);
-		_screen->copyRegion(0, 110, 96, 54 + i, 128, 34, 4, 0, Screen::CR_NO_P_CHECK);
-
-		if (i < 32) {
-			_screen->fillRect(128, 0, 255, i + 1, 12, 2);
-			_screen->copyRegion(152, 0, 120, 32, 80, i + 25, 4, 0, Screen::CR_NO_P_CHECK);
-		} else {
-			_screen->fillRect(128, 0, 255, i + 1, 12, 2);
-			_screen->copyRegion(152, i + 1, 120, 32 + i + 1, 80, 23, 4, 0, Screen::CR_NO_P_CHECK);
-			_screen->copyRegion(152, 0, 152, 32, 80, i + 1, 4, 2, Screen::CR_NO_P_CHECK);
-		}
-
-		_screen->drawShape(2, shp, 128, i - 55, 0);
-		_screen->copyRegion(128, 0, 96, 0, 128, i + 1, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->copyRegion(0, 0, 96, i + 89, 128, 79 - i, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	_screen->copyRegion(0, 32, 0, 168, 320, 32, 6, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-	delay(65 * _tickLength);
-	delete[] shp;
-}
-
-void EobEngine::seq_orb() {
-	if (shouldQuit() || skipFlag())
-		return;
-
-	uint8 *shp[5];
-	_screen->loadBitmap(_introFilesOrb[0], 5, 3, 0);
-	_screen->setCurPage(2);
-	shp[4] = _screen->encodeShape(0, 0, 20, 136, true);
-	_screen->loadBitmap(_introFilesOrb[1], 5, 3, 0);
-	shp[3] = _screen->encodeShape(16, 0, 16, 104, true);
-
-	_screen->fillRect(0, 0, 127, 103, 12);
-	for (int i = 1; i < 4; i++) {
-		copyBlurRegion(128, 0, 0, 0, 128, 104, i);
-		shp[3 - i] = _screen->encodeShape(0, 0, 16, 104, true);
-	}
-
-	_screen->fillRect(0, 0, 159, 135, 12);
-	_screen->setCurPage(0);
-	_screen->copyPage(3, 4);
-	_screen->clearCurPage();
-
-	_sound->playTrack(6);
-
-	for (int i = -1; i < 4 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + 3 * _tickLength;
-		if (i >= 0)
-			_screen->drawShape(2, shp[i], 16, 16, 0);
-		_screen->drawShape(2, shp[4], 0, 0, 0);
-		_screen->copyRegion(0, 0, 80, 24, 160, 136, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	_screen->copyRegion(0, 64, 0, 168, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-	delay(40 * _tickLength);
-
-	_sound->playTrack(6);
-
-	for (int i = 3; i > -2 && !shouldQuit() && !skipFlag(); i--) {
-		uint32 end = _system->getMillis() + 3 * _tickLength;
-		_screen->fillRect(16, 16, 143, 119, 12, 2);
-		if (i >= 0)
-			_screen->drawShape(2, shp[i], 16, 16, 0);
-		_screen->drawShape(2, shp[4], 0, 0, 0);
-		_screen->copyRegion(0, 0, 80, 24, 160, 136, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	delay(40 * _tickLength);
-
-	for (int i = 0; i < 5; i++)
-		delete[] shp[i];
-}
-
-void EobEngine::seq_waterdeepEntry() {
-	if (shouldQuit() || skipFlag())
-		return;
-
-	uint8 *shp[4];
-	uint8 *shp2[31];
-	uint8 *shp3[3];
-
-	loadSetIntroPalette(_introFilesWdEntry[0]);
-	_screen->loadBitmap(_introFilesWdEntry[1], 5, 3, 0);
-	_screen->setCurPage(2);
-	shp[3] = _screen->encodeShape(0, 0, 20, 136, true);
-	for (int i = 1; i < 4; i++) {
-		copyBlurRegion(0, 0, 0, 0, 160, 136, i);
-		shp[3 - i] = _screen->encodeShape(0, 0, 20, 136, true);
-	}
-	_screen->setCurPage(0);
-
-	_screen->copyPage(3, 4);
-	_screen->fillRect(0, 168, 319, 199, 12, 0);
-	_sound->playTrack(6);
-
-	for (int i = 0; i < 4 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + 3 * _tickLength;
-		_screen->drawShape(0, shp[i], 80, 24, 0);
-		delete[] shp[i];
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	_screen->copyRegion(0, 80, 0, 168, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-	delay(50 * _tickLength);
-
-	_screen->setCurPage(2);
-	shp[0] = _screen->encodeShape(20, 0, 20, 136, true);
-	_screen->loadBitmap(_introFilesWdEntry[2], 5, 3, 0);
-	shp[1] = _screen->encodeShape(0, 0, 20, 136, true);
-	shp[2] = _screen->encodeShape(20, 0, 20, 136, true);
-	_screen->loadBitmap(_introFilesWdEntry[3], 5, 3, 0);
-
-	for (int i = 0; i < 31; i++)
-		shp2[i] = _screen->encodeShape(_introWdEncodeX[i], 136 + (_introWdEncodeY[i] << 3), _introWdEncodeWH[i], _introWdEncodeWH[i] << 3, true);
-	for (int i = 0; i < 3; i++)
-		shp3[i] = _screen->encodeShape(5 * i, 152, 5, 32, true);
-
-	_screen->copyPage(3, 4);
-
-	for (int i = 0; i < 3 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + 3 * _tickLength;
-		_screen->fillRect(0, 0, 159, 135, 12, 2);
-		_screen->drawShape(2, shp[i], 0, 0, 0);
-		_screen->copyRegion(0, 0, 80, 24, 160, 136, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	_screen->copyRegion(0, 0, 80, 24, 160, 136, 4, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-	delay(4 * _tickLength);
-	_screen->copyRegion(160, 0, 80, 24, 160, 136, 4, 0, Screen::CR_NO_P_CHECK);
-	_screen->fillRect(0, 168, 319, 199, 12, 0);
-	_screen->updateScreen();
-	delay(4 * _tickLength);
-	_screen->copyRegion(0, 184, 40, 184, 232, 16, 4, 0, Screen::CR_NO_P_CHECK);
-
-	int cx = 264;
-	int cy = 11;
-
-	for (int i = 0; i < 70 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + 3 * _tickLength;
-
-		_screen->copyRegion(cx - 2, cy - 2, 0, 0, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
-		_screen->drawShape(4, shp3[((i & 3) == 3) ? 1 : (i & 3)], cx, cy, 0);
-		_screen->copyRegion(cx - 2, cy - 2, cx - 82, cy + 22, 48, 36, 4, 0, Screen::CR_NO_P_CHECK);
-		_screen->copyRegion(0, 0, cx - 2, cy - 2, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
-		cx--;
-		cy++;
-
-		for (int ii = 0; ii < 5; ii++) {
-			int s = _rnd.getRandomNumber(255) % 31;
-			_screen->drawShape(0, shp2[s], _introWdDsX[s] - 80, _introWdDsY[s] + 24, 0);
-		}
-
-		if (!(_rnd.getRandomNumber(255) & 7))
-			_sound->playTrack(_rnd.getRandomBit() ? 5 : 14);
-
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	for (int i = 0; i < 3; i++) {
-		delete[] shp[i];
-		delete[] shp3[i];
-	}
-
-	for (int i = 0; i < 31; i++)
-		delete[] shp2[i];
-}
-
-void EobEngine::seq_king() {
-	if (shouldQuit() || skipFlag())
-		return;
-
-	_screen->loadBitmap(_introFilesKing[0], 5, 3, 0);
-	_screen->copyPage(3, 4);
-
-	int x = 15;
-	int y = 14;
-	int w = 1;
-	int h = 1;
-
-	for (int i = 0; i < 10 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + _tickLength;
-		_screen->copyRegion(x << 3, y << 3, x << 3, y << 3, w << 3, h << 3, 4, 0, Screen::CR_NO_P_CHECK);
-		if (x > 6)
-			x --;
-		if (y > 0)
-			y -= 2;
-		w += 3;
-		if (x + w > 34)
-			w = 34 - x;
-		h += 3;
-		if (y + h > 23)
-			h = 23 - y;
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	delay(25 * _tickLength);
-
-	uint8 *shp[4];
-	int16 dy[4];
-	int16 stepY[4];
-
-	static const uint8 advEncX[] = { 0, 6, 12, 19 };
-	static const uint8 advEncW[] = { 6, 6, 7, 6 };
-	static const int8 modY[] = { -4, -8, -2, -2, 1, 0, 0, 0 };
-
-	_screen->loadBitmap(_introFilesKing[1], 5, 3, 0);
-	_screen->setCurPage(2);
-	for (int i = 0; i < 4; i++) {
-		shp[i] = _screen->encodeShape(advEncX[i], 0, advEncW[i], 98, true);
-		dy[i] = 180 + ((_rnd.getRandomNumber(255) & 3) << 3);
-		stepY[i] = (i * 5) & 3;
-	}
-
-	_screen->copyPage(0, 4);
-
-	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag(); ) {
-		runloop = false;
-		uint32 end = _system->getMillis() + 2 * _tickLength;
-
-		for (int i = 0; i < 4; i++) {
-			if (dy[i] <= 82)
-				continue;
-			stepY[i] = (stepY[i] + 1) & 7;
-			dy[i] += modY[stepY[i]];
-
-			if (dy[i] < 82)
-				dy[i] = 82;
-
-			if (dy[i] < 180) {
-				_screen->copyRegion((advEncX[i] + 8) << 3, dy[i] - 2, 0, dy[i] - 2, advEncW[i] << 3, 182 - dy[i], 4, 4, Screen::CR_NO_P_CHECK);
-				_screen->drawShape(4, shp[i], 0, dy[i], 0);
-				_screen->copyRegion(0, dy[i] - 2, (advEncX[i] + 8) << 3, dy[i] - 2, advEncW[i] << 3, 182 - dy[i], 4, 0, Screen::CR_NO_P_CHECK);
-			}
-
-			if (_rnd.getRandomNumber(255) & 3)
-				_sound->playTrack(7);
-
-			runloop = true;
-		}
-
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	_screen->copyRegion(0, 96, 0, 160, 320, 32, 6, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-	delay(70 * _tickLength);
-
-	for (int i = 0; i < 4; i++)
-		delete[] shp[i];
-}
-
-void EobEngine::seq_hands() {
-	if (shouldQuit() || skipFlag())
-		return;
-
-	_screen->setCurPage(2);
-	uint8 *shp1 = _screen->encodeShape(0, 140, 21, 60, true);
-	uint8 *shp2 = _screen->encodeShape(21, 140, 12, 60, true);
-	_screen->loadBitmap(_introFilesHands[0], 3, 5, 0);
-
-	_screen->fillRect(0, 160, 319, 199, 12, 0);
-	_screen->fillRect(0, 0, 191, 63, 157, 2);
-	_screen->drawShape(2, shp1, 0, 4, 0);
-	_screen->drawShape(2, shp2, 151, 4, 0);
-	boxMorphTransition(25, 8, 18, 4, 3, 0, 21, 8, 6, 0, 28, 23);
-	_screen->copyRegion(0, 128, 0, 176, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
-
-	_screen->updateScreen();
-	delay(15 * _tickLength);
-	_sound->playTrack(11);
-
-	for (int i = -22; i <= 20 && !shouldQuit() && !skipFlag(); i += 4) {
-		uint32 end = _system->getMillis() + _tickLength;
-		_screen->fillRect(0, 0, 167, 63, 157);
-		_screen->drawShape(2, shp1, i, 4, 0);
-		_screen->drawShape(2, shp1, 105 - i, 4, 0);
-		_screen->copyRegion(0, 0, 144, 32, 168, 64, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	_sound->playTrack(10);
-
-	delete[] shp1;
-	delete[] shp2;
-	delay(15 * _tickLength);
-
-	_screen->setCurPage(4);
-	shp1 = _screen->encodeShape(17, 0, 11, 120, true);
-	shp2 = _screen->encodeShape(28, 112, 1, 31, true);
-	uint8 *shp3 = _screen->encodeShape(9, 138, 14, 54, true);
-
-	_screen->setCurPage(2);
-	_screen->fillRect(0, 0, 135, 63, 157);
-	_screen->drawShape(2, shp1, 32, -80, 0);
-	_screen->drawShape(2, shp2, 40, -16, 0);
-	boxMorphTransition(18, 16, 10, 12, 0, 0, 17, 8, 17, 3, 25, 10);
-	delay(15 * _tickLength);
-
-	for (int i = -80; i <= 0 && !shouldQuit() && !skipFlag(); i += 4) {
-		uint32 end = _system->getMillis() + _tickLength;
-		_screen->fillRect(0, 0, 135, 63, 157);
-		_screen->drawShape(2, shp1, 32, i, 0);
-		_screen->drawShape(2, shp2, 40, i + 64, 0);
-		_screen->copyRegion(0, 0, 80, 96, 136, 64, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	_sound->playTrack(12);
-	delay(5 * _tickLength);
-
-	for (int i = 0; i > -54 && !shouldQuit() && !skipFlag(); i -= 4) {
-		uint32 end = _system->getMillis() + _tickLength;
-		_screen->fillRect(0, 0, 135, 63, 157);
-		_screen->drawShape(2, shp3, 12, 64 + i, 0);
-		_screen->drawShape(2, shp1, 32, i, 0);
-		_screen->copyRegion(0, 0, 80, 96, 136, 64, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	delete[] shp1;
-	delete[] shp2;
-	delete[] shp3;
-	delay(15 * _tickLength);
-
-	_screen->setCurPage(4);
-	shp1 = _screen->encodeShape(0, 0, 17, 136, true);
-	shp2 = _screen->encodeShape(0, 136, 9, 48, true);
-
-	_screen->setCurPage(2);
-	_screen->fillRect(0, 0, 143, 95, 157);
-	_screen->drawShape(2, shp1, -56, -56, 0);
-	_screen->drawShape(2, shp2, 52, 49, 0);
-	boxMorphTransition(9, 6, 0, 0, 0, 0, 18, 12, 8, 11, 21, 10);
-	delay(15 * _tickLength);
-	_sound->playTrack(11);
-
-	for (int i = -56; i <= -8 && !shouldQuit() && !skipFlag(); i += 4) {
-		uint32 end = _system->getMillis() + _tickLength;
-		_screen->fillRect(0, 0, 143, 95, 157);
-		_screen->drawShape(2, shp1, i, i, 0);
-		_screen->drawShape(2, shp2, (i == -8) ? 55 : 52, (i == -8) ? 52 : 49, 0);
-		_screen->copyRegion(0, 0, 0, 0, 144, 96, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	_sound->playTrack(10);
-	delete[] shp1;
-	delete[] shp2;
-	delay(30 * _tickLength);
-
-	_screen->setCurPage(4);
-	shp1 = _screen->encodeShape(28, 0, 11, 40, true);
-	shp2 = _screen->encodeShape(28, 40, 10, 72, true);
-
-	_screen->setCurPage(2);
-	_screen->fillRect(0, 0, 87, 112, 157);
-	_screen->drawShape(2, shp2, 0, 90, 0);
-	boxMorphTransition(20, 13, 15, 6, 0, 0, 11, 14, 0, 0, 24, 16);
-	delay(15 * _tickLength);
-
-	int dy = 90;
-	for (int i = -40; i <= 0 && !shouldQuit() && !skipFlag(); i += 4) {
-		uint32 end = _system->getMillis() + _tickLength;
-		_screen->fillRect(0, 0, 87, 112, 157);
-		_screen->drawShape(2, shp2, 0, dy, 0);
-		_screen->copyRegion(0, 0, 120, 48, 88, 112, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-		dy -= 5;
-	}
-
-	_sound->playTrack(13);
-
-	for (int i = -40; i <= 0 && !shouldQuit() && !skipFlag(); i += 4) {
-		uint32 end = _system->getMillis() + _tickLength;
-		_screen->fillRect(0, 0, 87, 39, 157);
-		_screen->drawShape(2, shp1, 0, i, 0);
-		_screen->copyRegion(0, 0, 120, 48, 88, 112, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	delete[] shp1;
-	delete[] shp2;
-	delay(48 * _tickLength);
-}
-
-void EobEngine::seq_waterdeepExit() {
-	if (shouldQuit() || skipFlag())
-		return;
-
-	uint8 *shp2[31];
-	uint8 *shp3[3];
-
-	_screen->loadBitmap(_introFilesWdExit[0], 5, 3, 0);
-	_screen->setCurPage(2);
-	for (int i = 0; i < 31; i++)
-		shp2[i] = _screen->encodeShape(_introWdEncodeX[i], 136 + (_introWdEncodeY[i] << 3), _introWdEncodeWH[i], _introWdEncodeWH[i] << 3, true);
-	for (int i = 0; i < 3; i++)
-		shp3[i] = _screen->encodeShape(5 * i + 15, 152, 5, 32, true);
-	uint8 *shp1 = _screen->encodeShape(31, 136, 5, 32, true);
-	_screen->copyPage(3, 4);
-	_screen->copyRegion(0, 0, 0, 136, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
-	_screen->fillRect(0, 168, 319, 199, 12, 0);
-	_screen->copyRegion(160, 0, 80, 24, 160, 136, 4, 0, Screen::CR_NO_P_CHECK);
-
-	int cx = 140;
-	int cy = 128;
-
-	for (int i = 0; i < 70 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + 3 * _tickLength;
-		int fx = cx - 2;
-		if (fx < 160)
-			fx = 160;
-		int fy = cy - 2;
-		if (fy > 98)
-			fy = 98;
-
-		_screen->copyRegion(fx, fy, 0, 0, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
-		_screen->drawShape(4, shp3[((i & 3) == 3) ? 1 : (i & 3)], cx, cy, 0);
-		_screen->drawShape(4, shp1, 160, 104, 0);
-		_screen->copyRegion(fx, fy, fx - 80, fy + 24, 48, 36, 4, 0, Screen::CR_NO_P_CHECK);
-		_screen->copyRegion(0, 0, fx, fy, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
-		cx++;
-		cy--;
-
-		for (int ii = 0; ii < 5; ii++) {
-			int s = _rnd.getRandomNumber(255) % 31;
-			_screen->drawShape(0, shp2[s], _introWdDsX[s] - 80, _introWdDsY[s] + 24, 0);
-		}
-
-		if (!(_rnd.getRandomNumber(255) & 7))
-			_sound->playTrack(_rnd.getRandomBit() ? 5 : 14);
-
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	for (int i = 0; i < 3; i++)
-		delete[] shp3[i];
-
-	for (int i = 0; i < 31; i++)
-		delete[] shp2[i];
-	delete[] shp1;
-
-	_screen->setCurPage(0);
-	_screen->fillRect(0, 168, 319, 199, 12, 0);
-	_screen->copyRegion(0, 136, 0, 0, 48, 36, 0, 4, Screen::CR_NO_P_CHECK);
-
-	loadSetIntroPalette(_introFilesWdExit[1]);
-	_screen->loadBitmap(_introFilesWdExit[2], 3, 5, 0);
-	_screen->copyPage(5, 2);
-	whirlTransition();
-	delay(6 * _tickLength);
-
-	_screen->copyRegion(0, 144, 0, 184, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
-
-	cx = 0;
-	cy = 136;
-	int dy = 0;
-	for (int i = 0; i < 19 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + _tickLength;
-		_screen->copyRegion(cx, cy, 80, dy + 16, 160, 8, 2, 0, Screen::CR_NO_P_CHECK);
-		cy += 8;
-		dy += 8;
-		if (i == 6) {
-			cx = 160;
-			cy = 0;
-		}
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	_sound->playTrack(3);
-	delay(60 * _tickLength);
-
-	for (int i = 0; i < 56 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + _tickLength;
-		_screen->copyRegion(0, 136 + i, 80, 16, 160, 56 - i, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->copyRegion(160, 0, 80, 72 - i, 160, 96 + i, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	for (int i = 1; i < 48 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + _tickLength;
-		_screen->copyRegion(160, i, 80, 16, 160, 152, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	_screen->loadBitmap(_introFilesWdExit[3], 3, 5, 0);
-	_screen->copyPage(5, 2);
-	delay(30 * _tickLength);
-	_screen->setCurPage(0);
-	_screen->fillRect(0, 16, 319, 31, 12);
-	_screen->fillRect(0, 136, 319, 199, 12);
-	_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
-	loadSetIntroPalette(_introFilesWdExit[4]);
-	_screen->updateScreen();
-	delay(50 * _tickLength);
-}
-
-void EobEngine::seq_tunnel() {
-	if (shouldQuit() || skipFlag())
-		return;
-
-	_screen->setCurPage(4);
-	uint8 *shp2 = _screen->encodeShape(20, 0, 20, 120, true);
-	uint8 *shp1 = _screen->encodeShape(0, 0, 20, 120, true);
-	drawBlockObject(1, 4, shp2, 160, 0, 0);
-	drawBlockObject(1, 4, shp1, 0, 0, 0);
-	delete[] shp1;
-	delete[] shp2;
-
-	for (int i = 0; i < 3 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + 8 * _tickLength;
-		_screen->copyRegion(0, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
-		_sound->playTrack(7);
-		_screen->updateScreen();
-		delayUntil(end);
-		_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
-		_sound->playTrack(7);
-		end = _system->getMillis() + 8 * _tickLength;
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	_screen->copyRegion(0, 160, 0, 184, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-	delay(18 * _tickLength);
-	_screen->copyRegion(160, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-	delay(5 * _tickLength);
-	_screen->copyRegion(0, 122, 80, 32, 160, 60, 2, 0, Screen::CR_NO_P_CHECK);
-	_screen->copyRegion(160, 122, 80, 92, 160, 60, 2, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-	delay(5 * _tickLength);
-	_screen->copyRegion(160, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
-	for (int i = 0; i < 6; i++)
-		_screen->copyRegion(i * 48, 185, 56, (i << 3) + 24, 48, 8, 2, 2, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-	delay(5 * _tickLength);
-	_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
-
-	_screen->loadBitmap(_introFilesTunnel[0], 5, 3, 0);
-	_screen->copyPage(3, 4);
-	_screen->updateScreen();
-	delay(40 * _tickLength);
-
-	_screen->copyRegion(264, 0, 136, 56, 48, 48, 4, 0, Screen::CR_NO_P_CHECK);
-	_sound->playTrack(8);
-	_screen->copyRegion(0, 0, 0, 0, 320, 184, 0, 2, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-	delay(16 * _tickLength);
-	_sound->playTrack(4);
-
-	for (int i = 0; i < 30 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + _tickLength;
-		if (i == 0)
-			_screen->fillRect(0, 168, 319, 199, 12, 0);
-		_screen->copyRegion(80, 25 + (_rnd.getRandomNumber(255) & 7), 80, 24, 160, 144, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-
-	_sound->playTrack(9);
-
-	for (int i = 0; i < 6 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + _tickLength;
-		_screen->copyRegion(_introTvlX1[i] << 3, _introTvlY1[i], _introTvlX2[i] << 3, _introTvlY2[i], _introTvlW[i] << 3, _introTvlH[i], 4, 2, Screen::CR_NO_P_CHECK);
-		for (int ii = 0; ii < 4 && !shouldQuit() && !skipFlag(); ii++) {
-			_screen->updateScreen();
-			delayUntil(end);
-			end = _system->getMillis() + _tickLength;
-			_screen->copyRegion(80, 25 + (_rnd.getRandomNumber(255) & 7), 80, 24, 160, 144, 2, 0, Screen::CR_NO_P_CHECK);
-		}
-	}
-	_screen->copyRegion(0, 0, 0, 0, 320, 168, 2, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-	delay(40 * _tickLength);
-
-	_screen->loadBitmap(_introFilesTunnel[1], 5, 3, 0);
-	_screen->copyPage(3, 4);
-	_sound->playTrack(6);
-	_screen->copyRegion(0, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-	delay(2 * _tickLength);
-	_screen->copyRegion(160, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-	delay(2 * _tickLength);
-	_screen->copyRegion(0, 120, 80, 30, 160, 64, 4, 0, Screen::CR_NO_P_CHECK);
-	_screen->copyRegion(160, 120, 80, 94, 160, 64, 4, 0, Screen::CR_NO_P_CHECK);
-	_screen->copyRegion(0, 176, 0, 184, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
-	_screen->setCurPage(0);
-	_screen->updateScreen();
-	delay(50 * _tickLength);
-}
-
-void EobEngine::seq_xdeath() {
-	uint8 *shapes1[5];
-	uint8 *shapes2;
-
-	_screen->loadShapeSetBitmap("XDEATH2", 5, 3);
-	for (int i = 0; i < 4; i++)
-		shapes1[i] = _screen->encodeShape(i / 2 * 14, i / 2 * 88, 14, 88, true);
-	_screen->loadShapeSetBitmap("XDEATH3", 5, 3);
-	shapes2 = _screen->encodeShape(22, 0, 16, 95, true);
-	_screen->loadEobBitmap("XDEATH1", 0, 5, 3, -1);
-	_screen->setCurPage(0);
-
-	for (int i = 0; i < 10; i++) {
-		if (i == 2)
-			snd_playSoundEffect(72);
-		else if (i == 4 || i == 6)
-			snd_playSoundEffect(54);
-		else
-			snd_playSoundEffect(34);
-
-		if (i < 6) {
-			_screen->copyRegion((i % 3) * 104, i / 3 * 88, 32, 10, 104, 88, 2, 0, Screen::CR_NO_P_CHECK);
-		} else {
-			snd_playSoundEffect(42);
-			_screen->drawShape(0, shapes1[i - 6], 32, 10, 0);
-		}
-
-		_screen->updateScreen();
-		delay(4 * _tickLength);
-	}
-
-	const ScreenDim *dm = _screen->getScreenDim(5);
-	_screen->modifyScreenDim(5, dm->sx, 8, dm->w, dm->h);
-	_screen->copyRegion(0, 0, 0, 0, 176, 120, 0, 5, Screen::CR_NO_P_CHECK);
-
-	for (int i = 0; i < 19; i++) {
-		snd_playSoundEffect(119);
-		_screen->copyRegion(0, 0, 0, 0, 176, 120, 5, 2, Screen::CR_NO_P_CHECK);
-		_screen->drawShape(2, shapes2, 24, i * 5 - 90, 5);
-		_screen->copyRegion(0, 0, 0, 0, 176, 120, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delay(2 * _tickLength);
-	}
-
-	_screen->modifyScreenDim(5, dm->sx, 0, dm->w, dm->h);
-
-	snd_playSoundEffect(5);
-	delay(60 * _tickLength);
-
-	for (int i = 0; i < 4; i++)
-		delete[] shapes1[i];
-	delete[] shapes2;
-
-	gui_drawPlayField(false);
-	gui_drawAllCharPortraitsWithStats();
-}
-
-void EobEngine::loadSetIntroPalette(const char *filename) {
-	_screen->loadPalette(filename, _screen->getPalette(0));
-	_screen->getPalette(0).fill(0, 1, 0);
-	_screen->setScreenPalette(_screen->getPalette(0));
-}
-
-void EobEngine::copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step) {
-	const uint8 *ptr2 = _screen->getCPagePtr(3) + y1 * 320 + x1;
-
-	if (step == 1) {
-		while (h > 0) {
-			int dx = x2;
-			for (int i = 0; i < w; i += 2) {
-				_screen->setPagePixel(3, dx++, y2, ptr2[i]);
-				_screen->setPagePixel(3, dx++, y2, 0);
-			}
-			dx = x2;
-			y2++;
-			ptr2 += 320;
-			for (int i = 0; i < w; i += 2) {
-				_screen->setPagePixel(3, dx++, y2, 0);
-				_screen->setPagePixel(3, dx++, y2, ptr2[i + 1]);
-			}
-			y2++;
-			ptr2 += 320;
-			h -= 2;
-		}
-	} else if (step == 2) {
-		while (h > 0) {
-			int dx = x2;
-			for (int i = 0; i < w; i += 2) {
-				_screen->setPagePixel(3, dx++, y2, ptr2[i]);
-				_screen->setPagePixel(3, dx++, y2, 0);
-			}
-			dx = x2;
-			y2++;
-			ptr2 += 320;
-			for (int i = 0; i < w; i++)
-				_screen->setPagePixel(3, dx++, y2, 0);
-
-			y2++;
-			ptr2 += 320;
-			h -= 2;
-		}
-	} else if (step == 3) {
-		for (int i = 0; i < h; i++) {
-			int dx = x2;
-			if ((i % 3) == 0) {
-				int ii = 0;
-				for (; ii < w - 3; ii += 3) {
-					_screen->setPagePixel(3, dx++, y2, ptr2[ii]);
-					_screen->setPagePixel(3, dx++, y2, 0);
-					_screen->setPagePixel(3, dx++, y2, 0);
-				}
-				for (; ii < w; ii++)
-					_screen->setPagePixel(3, dx++, y2, 0);
-			} else {
-				for (int ii = 0; ii < w; ii++)
-					_screen->setPagePixel(3, dx++, y2, 0);
-			}
-			y2++;
-			ptr2 += 320;
-		}
-	}
-}
-
-void EobEngine::boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH) {
-	int originX2 = originX1 + originW;
-	int originY2 = originY1 + originH;
-	if (originY2 > 21)
-		originY2 = 21;
-
-	int w = 1;
-	int h = 1;
-	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag(); ) {
-		uint32 end = _system->getMillis() + _tickLength;
-		_screen->copyRegion(targetSrcX << 3, targetSrcY << 3, targetDestX << 3, targetDestY << 3, w << 3, h << 3, 2, 0, Screen::CR_NO_P_CHECK);
-		if (originX1 < targetDestX)
-			_screen->copyRegion(312, 0, originX1 << 3, 0, 8, 176, 0, 0, Screen::CR_NO_P_CHECK);
-		if (originY1 < targetDestY)
-			_screen->copyRegion(0, 192, 0, originY1 << 3, 320, 8, 0, 0, Screen::CR_NO_P_CHECK);
-		if ((targetFinalX + targetFinalW) <= originX2)
-			_screen->copyRegion(312, 0, originX2 << 3, 0, 8, 176, 0, 0, Screen::CR_NO_P_CHECK);
-		if ((targetFinalY + targetFinalH) <= originY2)
-			_screen->copyRegion(0, 192, 0, originY2 << 3, 320, 8, 0, 0, Screen::CR_NO_P_CHECK);
-
-		if (!(targetDestX != targetFinalX || targetDestY != targetFinalY || w != targetFinalW || h != targetFinalH || originX1 < targetFinalX || originY1 < targetFinalY || (targetFinalX + targetFinalW) < originX2 || (targetFinalY + targetFinalH) < originY2))
-			runloop = false;
-
-		int v = targetFinalX - targetDestX;
-		v = (v < 0) ? -1 : ((v > 0) ? 1 : 0);
-		targetDestX += v;
-		v = targetFinalY - targetDestY;
-		v = (v < 0) ? -1 : ((v > 0) ? 1 : 0);
-		targetDestY += v;
-
-		if (w != targetFinalW)
-			w += 2;
-		if (w > targetFinalW)
-			w = targetFinalW;
-
-		if (h != targetFinalH)
-			h += 2;
-		if (h > targetFinalH)
-			h = targetFinalH;
-
-		if (++originX1 > targetFinalX)
-			originX1 = targetFinalX;
-
-		if (++originY1 > targetFinalY)
-			originY1 = targetFinalY;
-
-		if ((targetFinalX + targetFinalW) < originX2)
-			originX2--;
-
-		if ((targetFinalY + targetFinalH) < originY2)
-			originY2--;
-
-		_screen->updateScreen();
-		delayUntil(end);
-	}
-}
-
-void EobEngine::whirlTransition() {
-	for (int i = 0; i < 2; i++) {
-		for (int ii = 0; ii < 8; ii++) {
-			uint32 e = _system->getMillis() + 3;
-			if (ii & 1) {
-				for (int iii = i + ii; iii < 320; iii += 8)
-					_screen->drawClippedLine(iii, 0, iii, 199, 12);
-			} else {
-				for (int iii = i + ii; iii < 200; iii += 8)
-					_screen->drawClippedLine(0, iii, 319, iii, 12);
-			}
-			_screen->updateScreen();
-			uint32 c = _system->getMillis();
-			if (e > c)
-				_system->delayMillis(e - c);
-		}
-	}
-}
-
-}	// End of namespace Kyra
-
-#endif // ENABLE_EOB
diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_eob2.cpp
deleted file mode 100644
index 433ee4ae1f..0000000000
--- a/engines/kyra/sequences_eob2.cpp
+++ /dev/null
@@ -1,1349 +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.
- *
- */
-
-#ifdef ENABLE_EOB
-
-#include "kyra/eob2.h"
-#include "kyra/screen_eob.h"
-#include "kyra/resource.h"
-#include "kyra/sound.h"
-
-#include "common/system.h"
-
-#include "base/version.h"
-
-namespace Kyra {
-
-class DarkmoonSequenceHelper {
-friend class DarkMoonEngine;
-public:
-	enum Mode {
-		kIntro,
-		kFinale
-	};
-
-	DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_Eob *screen, Mode mode, const char *const *strings, const char *const *cpsFiles, const char *const *palFiles, const EobShapeDef **shapeDefList, const EobSequenceStep **seqList);
-	~DarkmoonSequenceHelper();
-
-	void loadScene(int index, int pageNum);
-	void runSequence(int index, int del = -1);
-
-	void printText(int index, int color);
-	void fadeText();
-
-	void update(int srcPage);
-
-	void setPalette(int index);
-	void fadePalette(int index, int del);
-	void copyPalette(int srcIndex, int destIndex);
-
-	void initDelayedPaletteFade(int palIndex, int rate);
-	bool processDelayedPaletteFade();
-
-	void delay(uint32 ticks);
-	void waitForSongNotifier(int index, bool introUpdateAnim = false);
-
-private:
-	void setPaletteWithoutTextColor(int index);
-
-	OSystem *_system;
-	DarkMoonEngine *_vm;
-	Screen_Eob *_screen;
-	Mode _mode;
-
-	const char *const *_strings;
-	const char *const *_cpsFiles;
-	const char *const *_palFiles;
-	const EobShapeDef **_shapeDefs;
-	const EobSequenceStep **_seqData;
-
-	Palette *_palettes[12];
-
-	const uint8 **_shapes;
-
-	uint32 _fadePalTimer;
-	int _fadePalRate;
-	int _fadePalIndex;
-};
-
-int DarkMoonEngine::mainMenu() {
-	int menuChoice = _menuChoiceInit;
-	_menuChoiceInit = 0;
-
-	_sound->loadSoundFile("INTRO");
-	Screen::FontId of = _screen->_currentFont;
-	int op = 0;
-	Common::SeekableReadStream *s = 0;
-
-	while (menuChoice >= 0 && !shouldQuit()) {
-		switch (menuChoice) {
-			case 0:
-				s = _res->createReadStream("XENU.CPS");
-				if (s) {
-					s->read(_screen->getPalette(0).getData(), 768);
-					_screen->loadFileDataToPage(s, 3, 64000);
-					delete s;
-				} else {
-					_screen->loadBitmap("MENU.CPS", 3, 2, &_screen->getPalette(0));
-				}
-
-				_screen->setScreenPalette(_screen->getPalette(0));
-
-				of = _screen->setFont(Screen::FID_6_FNT);
-				op = _screen->setCurPage(2);
-				_screen->printText(gScummVMVersion, 267 - strlen(gScummVMVersion) * 6, 160, 13, 0);
-				_screen->setFont(of);
-				_screen->_curPage = op;
-				_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
-				_screen->updateScreen();
-				menuChoice = mainMenuLoop();
-				break;
-
-			case 1:
-				// load game in progress
-				menuChoice = -1;
-				break;
-
-			case 2:
-				// create new party
-				menuChoice = -2;
-				break;
-
-			case 3:
-				// transfer party
-				//seq_playFinale();
-				menuChoice = -3;
-				break;
-
-			case 4:
-				// play intro
-				seq_playIntro();
-				menuChoice = 0;
-				break;
-
-			case 5:
-				// quit
-				menuChoice = -5;
-				break;
-		}
-	}
-
-	return shouldQuit() ? -5 : menuChoice;
-}
-
-int DarkMoonEngine::mainMenuLoop() {
-	int sel = -1;
-	do {
-		_screen->setScreenDim(6);
-		_gui->simpleMenu_setup(6, 0, _mainMenuStrings, -1, 0, 0);
-
-		while (sel == -1 && !shouldQuit())
-			sel = _gui->simpleMenu_process(6, _mainMenuStrings, 0, -1, 0);
-	} while ((sel < 0 || sel > 5) && !shouldQuit());
-
-	return sel + 1;
-}
-
-void DarkMoonEngine::seq_playIntro() {
-	DarkmoonSequenceHelper sq(_system, this, _screen, DarkmoonSequenceHelper::kIntro, _introStrings, _cpsFilesIntro, _palFilesIntro, _shapesIntro, _seqIntro);
-
-	_screen->setCurPage(0);
-	_screen->clearCurPage();
-
-	snd_stopSound();
-
-	sq.loadScene(4, 2);
-	sq.loadScene(0, 2);
-	sq.delay(1);
-
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(12);
-
-	_screen->copyRegion(0, 0, 8, 8, 304, 128, 2, 0, Screen::CR_NO_P_CHECK);
-	sq.setPalette(9);
-	sq.fadePalette(0, 3);
-
-	_screen->setCurPage(2);
-	_screen->setClearScreenDim(17);
-	_screen->setCurPage(0);
-
-	removeInputTop();
-	sq.delay(18);
-
-	sq.runSequence(3, 18);
-	sq.runSequence(6, 18);
-	sq.runSequence(0);
-
-	sq.waitForSongNotifier(1);
-
-	sq.runSequence(11);
-	sq.runSequence(7, 6);
-	sq.runSequence(2, 6);
-
-	sq.waitForSongNotifier(2);
-
-	sq.runSequence(38);
-	sq.runSequence(3);
-	sq.runSequence(8);
-	sq.runSequence(1, 10);
-	sq.runSequence(0, 6);
-	sq.runSequence(2);
-
-	sq.waitForSongNotifier(3);
-
-	_screen->setClearScreenDim(17);
-	_screen->setCurPage(2);
-	_screen->setClearScreenDim(17);
-	_screen->setCurPage(0);
-
-	sq.runSequence(40);
-	sq.runSequence(7, 18);
-
-	sq.printText(0, 16);	// You were settling...
-	sq.runSequence(7, 90);
-	sq.fadeText();
-
-	sq.printText(1, 16);	// Then a note was slipped to you
-	sq.runSequence(8);
-	sq.runSequence(2, 72);
-	sq.fadeText();
-
-	sq.printText(2, 16);	// It was from your friend Khelben Blackstaff...
-	sq.runSequence(2);
-	sq.runSequence(6, 36);
-	sq.runSequence(3);
-	sq.fadeText();
-
-	sq.printText(3, 16);	// The message was urgent.
-
-	sq.loadScene(1, 2);
-	sq.waitForSongNotifier(4);
-
-	// intro scroll
-	if (!skipFlag() && !shouldQuit()) {
-		for (int i = 0; i < 280; i += 3) {
-			uint32 endtime = _system->getMillis() + _tickLength;
-			_screen->copyRegion(11, 8, 8, 8, 301, 128, 0, 0, Screen::CR_NO_P_CHECK);
-			_screen->copyRegion(i, 0, 309, 8, 3, 128, 2, 0, Screen::CR_NO_P_CHECK);
-			_screen->updateScreen();
-			if (i == 96)
-				sq.runSequence(42);
-			delayUntil(endtime);
-		}
-	}
-
-	_screen->copyRegion(8, 8, 0, 0, 304, 128, 0, 2, Screen::CR_NO_P_CHECK);
-	sq.runSequence(4);
-	sq.fadeText();
-	sq.delay(10);
-
-	sq.loadScene(2, 2);
-	sq.update(2);
-	sq.delay(10);
-
-	sq.printText(4, 16);	// What could Khelben want?
-	sq.delay(25);
-
-	sq.loadScene(3, 2);
-	sq.delay(54);
-	sq.runSequence(13);
-	_screen->copyRegion(104, 16, 96, 8, 120, 100, 0, 2, Screen::CR_NO_P_CHECK);
-	sq.fadeText();
-
-	sq.printText(5, 15);	// Welcome, please come in
-	sq.runSequence(10);
-	sq.runSequence(10);
-	sq.runSequence(9);
-	sq.runSequence(9);
-	sq.fadeText();
-
-	sq.printText(6, 15);	// Khelben awaits you in his study
-	for (int i = 0; i < 3; i++)
-		sq.runSequence(10);
-	sq.runSequence(9);
-	sq.runSequence(14);
-	sq.loadScene(5, 2);
-
-	sq.waitForSongNotifier(5);
-
-	sq.fadeText();
-	_screen->clearCurPage();
-	_screen->updateScreen();
-
-	for (int i = 0; i < 6; i++)
-		sq.runSequence(15);
-
-	sq.loadScene(6, 2);
-	sq.loadScene(7, 2);
-	_screen->clearCurPage();
-	sq.update(2);
-
-	sq.runSequence(16);
-	sq.printText(7, 15);	// Thank you for coming so quickly
-	sq.runSequence(16);
-	sq.runSequence(17);
-	for (int i = 0; i < 3; i++)
-		sq.runSequence(16);
-	sq.fadeText();
-	sq.runSequence(16);
-
-	sq.loadScene(8, 2);
-	sq.update(2);
-	sq.runSequence(32);
-	sq.printText(8, 15);	// I am troubled my friend
-	sq.runSequence(33);
-	sq.runSequence(33);
-	for (int i = 0; i < 4; i++)
-		sq.runSequence(32);
-	sq.fadeText();
-
-	sq.printText(9, 15);	// Ancient evil stirs in the Temple Darkmoon
-	sq.runSequence(33);
-	sq.runSequence(43);
-	sq.runSequence(33);
-	for (int i = 0; i < 3; i++)
-		sq.runSequence(32);
-	sq.fadeText();
-
-	sq.printText(10, 15);	// I fear for the safety of our city
-	for (int i = 0; i < 4; i++)
-		sq.runSequence(33);
-	sq.runSequence(32);
-	sq.runSequence(32);
-
-	sq.loadScene(9, 2);
-	sq.fadeText();
-
-	sq.waitForSongNotifier(6);
-
-	sq.update(2);
-	sq.runSequence(34);
-
-	sq.printText(11, 15);	// I need your help
-	for (int i = 0; i < 3; i++)
-		sq.runSequence(34);
-	sq.runSequence(35);
-	for (int i = 0; i < 4; i++)
-		sq.runSequence(34);
-	sq.fadeText();
-
-	sq.loadScene(12, 2);
-	sq.update(2);
-	sq.loadScene(6, 2);
-	sq.runSequence(18);
-
-	sq.printText(12, 15);	// Three nights ago I sent forth a scout
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(22);
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(18);
-	sq.fadeText();
-
-	sq.printText(13, 15);	// She has not yet returned
-	sq.runSequence(20);
-	sq.runSequence(19);
-	sq.runSequence(23);
-	sq.runSequence(24);
-	sq.runSequence(20);
-	sq.runSequence(19);
-	sq.runSequence(17);
-	sq.runSequence(18);
-	sq.fadeText();
-
-	sq.printText(14, 15);	// I fear for her safety
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(20);
-	sq.runSequence(18);
-	sq.runSequence(25);
-	sq.runSequence(18);
-	sq.runSequence(18);
-	sq.fadeText();
-	sq.runSequence(18);
-	sq.runSequence(18);
-
-	sq.printText(15, 15);	// Take this coin
-	sq.runSequence(28);
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(18);
-	sq.runSequence(18);
-	sq.fadeText();
-
-	sq.loadScene(10, 2);
-	_screen->clearCurPage();
-	_screen->updateScreen();
-
-	sq.runSequence(37, 18);
-	sq.runSequence(36, 36);
-
-	sq.loadScene(12, 2);
-	_screen->clearCurPage();
-	sq.update(2);
-
-	sq.loadScene(11, 2);
-	sq.printText(16, 15);	// I will use it to contact you
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(20);
-	sq.runSequence(18);
-	sq.runSequence(18);
-	sq.fadeText();
-
-	sq.printText(17, 15);	// You must act quickly
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(19);
-	sq.runSequence(18);
-	sq.runSequence(18);
-	sq.fadeText();
-	sq.runSequence(18);
-
-	sq.printText(18, 15);	// I will teleport you near Darkmoon
-	sq.runSequence(20);
-	sq.runSequence(27);
-	sq.runSequence(20);
-	sq.runSequence(19);
-	sq.runSequence(18);
-	sq.runSequence(18);
-	sq.fadeText();
-	sq.runSequence(18);
-
-	sq.printText(19, 15);	// May luck be with you my friend
-	sq.runSequence(19);
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(18);
-	sq.fadeText();
-	sq.runSequence(29);
-
-	sq.waitForSongNotifier(7);
-
-	sq.runSequence(30);
-	sq.runSequence(31);
-
-	sq.waitForSongNotifier(8, true);
-
-	if (skipFlag() || shouldQuit()) {
-		_sound->playTrack(15);
-	} else {
-		_screen->setScreenDim(17);
-		_screen->clearCurDim();
-		_sound->playTrack(14);
-		sq.fadePalette(10, 1);
-		_screen->setClearScreenDim(18);
-		sq.delay(6);
-		sq.fadePalette(9, 1);
-		_screen->clearCurPage();
-	}
-
-	sq.fadePalette(9, 10);
-}
-
-void DarkMoonEngine::seq_playFinale() {
-	DarkmoonSequenceHelper sq(_system, this, _screen, DarkmoonSequenceHelper::kFinale, _finaleStrings, _cpsFilesFinale, _palFilesFinale, _shapesFinale, _seqFinale);
-
-	_screen->setCurPage(0);
-	_screen->setFont(Screen::FID_8_FNT);
-
-	_sound->loadSoundFile("FINALE1");
-	snd_stopSound();
-	sq.delay(3);
-
-	_screen->clearCurPage();
-	_screen->updateScreen();
-
-	sq.loadScene(0, 2);
-	sq.delay(18);
-
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(1);
-	sq.update(2);
-
-	sq.loadScene(1, 2);
-
-	sq.runSequence(0);
-	sq.runSequence(0);
-	for (int i = 0; i < 3; i++)
-		sq.runSequence(2);
-	sq.runSequence(1);
-	sq.runSequence(2);
-	sq.runSequence(2);
-
-	sq.printText(0, 10);			// Finally, Dran has been defeated
-	for (int i = 0; i < 7; i++)
-		sq.runSequence(2);
-	sq.fadeText();
-	sq.runSequence(2);
-
-	sq.waitForSongNotifier(1);
-
-	sq.printText(1, 10);			// Suddenly, your friend Khelben appears
-	sq.runSequence(4);
-	for (int i = 0; i < 3; i++)
-		sq.runSequence(2);
-	sq.fadeText();
-
-	sq.printText(2, 15);			// Greetings, my victorious friends
-	for (int i = 0; i < 4; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
-	sq.fadeText();
-	sq.runSequence(6);
-
-	sq.printText(3, 15);			// You have defeated Dran
-	for (int i = 0; i < 5; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
-	sq.fadeText();
-
-	sq.printText(4, 15);			// I did not know Dran was a dragon
-	for (int i = 0; i < 4; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
-	sq.fadeText();
-
-	sq.printText(5, 15);			// He must have been over 300 years old
-	for (int i = 0; i < 4; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
-	sq.fadeText();
-
-	sq.printText(6, 15);			// His power is gone
-	for (int i = 0; i < 3; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
-	sq.fadeText();
-
-	sq.printText(7, 15);			// But Darkmoon is still a source of great evil
-	for (int i = 0; i < 4; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
-	sq.fadeText();
-
-	sq.printText(8, 15);			// And many of his minions remain
-	for (int i = 0; i < 4; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
-	sq.fadeText();
-
-	sq.loadScene(2, 2);
-	sq.update(2);
-	sq.loadScene(3, 2);
-	_screen->copyRegion(8, 8, 0, 0, 304, 128, 0, 2, Screen::CR_NO_P_CHECK);
-
-	sq.printText(9, 15);			// Now we must leave this place
-	sq.runSequence(7);
-	sq.runSequence(8);
-	sq.runSequence(7);
-	sq.runSequence(7, 36);
-	sq.fadeText();
-
-	sq.printText(10, 15);			// So my forces can destroy it..
-	for (int i = 0; i < 3; i++)
-		sq.runSequence(7);
-	sq.runSequence(8);
-	sq.runSequence(7);
-	sq.runSequence(7, 36);
-	sq.runSequence(8, 18);
-	sq.fadeText();
-
-	sq.printText(11, 15);			// Follow me
-	sq.runSequence(7, 18);
-	sq.runSequence(9, 18);
-	sq.runSequence(8, 18);
-	sq.fadeText();
-
-	sq.loadScene(7, 2);
-	sq.copyPalette(3, 0);
-	sq.loadScene(4, 2);
-
-	sq.waitForSongNotifier(2);
-
-	_screen->clearCurPage();
-	sq.update(2);
-
-	sq.loadScene(8, 2);
-	sq.loadScene(6, 6);
-	sq.delay(10);
-
-	sq.printText(12, 10);			// Powerful mages stand ready for the final assault...
-	sq.delay(90);
-	sq.fadeText();
-
-	sq.waitForSongNotifier(3);
-
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(7);
-	sq.delay(8);
-
-	sq.runSequence(10);
-	sq.runSequence(13);
-	sq.initDelayedPaletteFade(4, 1);
-
-	sq.runSequence(14);
-	sq.runSequence(13);
-	sq.runSequence(14);
-	sq.runSequence(14);
-	sq.runSequence(13);
-	sq.initDelayedPaletteFade(2, 1);
-
-	sq.runSequence(15);
-	sq.runSequence(14);
-	sq.runSequence(13);
-	sq.runSequence(15);
-	sq.runSequence(15);
-	sq.runSequence(11);
-
-	sq.printText(13, 10);			// The temple's evil is very strong
-	sq.delay(72);
-	sq.fadeText();
-
-	sq.printText(14, 10);			// It must not be allowed...
-	sq.delay(72);
-	sq.fadeText();
-
-	sq.waitForSongNotifier(4);
-
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(7);
-	sq.delay(8);
-
-	sq.runSequence(10);
-	sq.initDelayedPaletteFade(5, 1);
-	sq.runSequence(13);
-	sq.runSequence(14);
-	sq.runSequence(13);
-	sq.runSequence(14);
-	sq.runSequence(13);
-	sq.runSequence(13);
-	sq.runSequence(14);
-	sq.runSequence(14);
-	sq.runSequence(13);
-	sq.runSequence(12);
-	for (int i = 0; i < 4; i++)
-		sq.runSequence(16);
-	sq.runSequence(17);
-	sq.runSequence(18);
-
-	sq.printText(15, 10);			// The temple ceases to exist
-	sq.initDelayedPaletteFade(6, 1);
-	sq.delay(36);
-
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(11);
-
-	sq.delay(54);
-	sq.fadeText();
-	sq.loadScene(12, 2);
-
-	sq.waitForSongNotifier(5);
-
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(6);
-
-	if (!skipFlag() && !shouldQuit())
-		_screen->crossFadeRegion(0, 0, 8, 8, 304, 128, 2, 0);
-	sq.delay(18);
-
-	sq.printText(16, 15);			// My friends, our work is done
-	sq.runSequence(20);
-	sq.runSequence(19);
-	sq.runSequence(19, 36);
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(12);
-	sq.fadeText();
-
-	sq.printText(17, 15);			// Thank you
-	sq.runSequence(19);
-	sq.runSequence(20, 36);
-	sq.fadeText();
-
-	sq.printText(18, 15);			// You have earned my deepest respect
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(11);
-	sq.runSequence(20);
-	sq.runSequence(19);
-	sq.runSequence(19);
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(11);
-	sq.delay(36);
-	sq.fadeText();
-
-	sq.printText(19, 15);			// We will remember you always
-	sq.runSequence(19);
-	sq.runSequence(19, 18);
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(11);
-	sq.runSequence(20, 18);
-	sq.fadeText();
-
-	sq.delay(28);
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(12);
-	sq.delay(3);
-
-	sq.loadScene(5, 2);
-	if (skipFlag() || shouldQuit()) {
-		_screen->copyRegion(0, 0, 8, 8, 304, 128, 2, 0, Screen::CR_NO_P_CHECK);
-	} else {
-		_sound->playTrack(6);
-		_screen->crossFadeRegion(0, 0, 8, 8, 304, 128, 2, 0);
-	}
-
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(12);
-	sq.delay(5);
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(11);
-	sq.delay(11);
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(12);
-	sq.delay(7);
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(11);
-	sq.delay(12);
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(12);
-
-	removeInputTop();
-	resetSkipFlag(true);
-
-	sq.loadScene(10, 2);
-	sq.loadScene(9, 2);
-	snd_stopSound();
-	sq.delay(3);
-
-	_sound->loadSoundFile("FINALE2");
-
-	sq.delay(18);
-	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(1);
-
-	seq_playCredits(&sq, _creditsData, 18, 2, 6, 2);
-
-	sq.delay(90);
-
-	resetSkipFlag(true);
-
-	sq.setPalette(11);
-	sq.fadePalette(9, 10);
-
-	_screen->clearCurPage();
-	sq.loadScene(11, 2);
-
-	static const uint8 finPortraitPos[] = { 0x50, 0x50, 0xD0, 0x50, 0x50, 0x90, 0xD0, 0x90, 0x90, 0x50, 0x90, 0x90 };
-
-	for (int i = 0; i < 6; i++) {
-		if (!testCharacter(i, 1))
-			continue;
-		if (i > 3)
-			_screen->drawShape(2, sq._shapes[6 + i], finPortraitPos[i << 1] - 16, finPortraitPos[(i << 1) + 1] - 16, 0);
-		_screen->drawShape(2, _characters[i].faceShape, finPortraitPos[i << 1], finPortraitPos[(i << 1) + 1], 0);
-	}
-
-	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
-
-	sq.setPalette(9);
-	sq.fadePalette(0, 18);
-
-	while (!skipFlag() && !shouldQuit())
-		delay(_tickLength);
-
-	snd_stopSound();
-	sq.fadePalette(9, 10);
-}
-
-void DarkMoonEngine::seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *data, int sd, int backupPage, int tempPage, int speed) {
-	if (!data)
-		return;
-
-	_screen->setScreenDim(sd);
-	const ScreenDim *dm = _screen->_curDim;
-
-	_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 0, backupPage, Screen::CR_NO_P_CHECK);
-
-	struct CreditsDataItem {
-		int16 x;
-		int16 y;
-		const void *data;
-		char *str;
-		uint8 crlf;
-		uint8 size;
-		uint8 dataType;
-	} items[36];
-	memset(items, 0, sizeof(items));
-
-	const char *pos = (const char *)data;
-	uint32 end = _system->getMillis();
-	uint32 cur = 0;
-	int i = 0;
-
-	do {
-		for (bool loop = true; loop; ) {
-			sq->processDelayedPaletteFade();
-			cur = _system->getMillis();
-			if (end <= cur)
-				break;
-			delay(MIN<uint32>(_tickLength, end - cur));
-		}
-
-		end = _system->getMillis() + speed * _tickLength;
-
-		for (; i < 35 && *pos; i++) {
-			int16 nextY = i ? items[i].y + items[i].size + (items[i].size >> 2) : dm->h;
-
-			const char *posOld = pos;
-			pos = strchr(pos, 0x0d);
-			if (!pos)
-				pos = strchr(posOld, 0x00);
-
-			items[i + 1].crlf = *pos++;
-
-			if (*posOld == 2) {
-				const uint8 *shp = sq->_shapes[(*++posOld) - 1];
-				items[i + 1].data = shp;
-				items[i + 1].size = shp[1];
-				items[i + 1].x = (dm->w - shp[2]) << 2 ;
-				items[i + 1].dataType = 1;
-				delete[] items[i + 1].str;
-				items[i + 1].str = 0;
-
-			} else {
-				if (*posOld == 1) {
-					posOld++;
-					items[i + 1].size = 6;
-				} else {
-					items[i + 1].size = _screen->getFontWidth();
-				}
-
-				items[i + 1].dataType = 0;
-
-				int l = pos - posOld;
-				if (items[i + 1].crlf != 0x0d)
-					l++;
-
-				delete[] items[i + 1].str;
-				items[i + 1].str = new char[l];
-				memcpy(items[i + 1].str, posOld, l);
-				items[i + 1].str[l - 1] = 0;
-				items[i + 1].data = 0;
-				items[i + 1].x = (((dm->w << 3) - (strlen(items[i + 1].str) * items[i + 1].size)) >> 1) + 1;
-			}
-
-			items[i + 1].y = nextY;
-		}
-
-		_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, backupPage, tempPage, Screen::CR_NO_P_CHECK);
-
-		for (int h = 0; h < i; h++) {
-			if (items[h + 1].y < dm->h) {
-				if (items[h + 1].dataType == 1) {
-					_screen->drawShape(tempPage, (const uint8*)items[h + 1].data, items[h + 1].x, items[h + 1].y, sd);
-				} else {
-					_screen->setCurPage(tempPage);
-
-					if (items[h + 1].size == 6)
-						_screen->setFont(Screen::FID_6_FNT);
-
-					_screen->printText(items[h + 1].str, (dm->sx << 3) + items[h + 1].x - 1, dm->sy + items[h + 1].y + 1, 12, 0);
-					_screen->printText(items[h + 1].str, (dm->sx << 3) + items[h + 1].x, dm->sy + items[h + 1].y, 240, 0);
-
-					if (items[h + 1].size == 6)
-						_screen->setFont(Screen::FID_8_FNT);
-
-					_screen->setCurPage(0);
-				}
-			}
-
-			items[h + 1].y -= 2;
-		}
-
-		_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, tempPage, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-
-		if (-items[1].size > items[1].y) {
-			delete[] items[1].str;
-			--i;
-			for (int t = 1; t <= i; t++)
-				memcpy(&items[t], &items[t + 1], sizeof(CreditsDataItem));
-			items[i + 1].str = 0;
-		}
-
-		if (i < 35 && ((items[i].y + items[i].size) < (dm->sy + dm->h))) {
-			resetSkipFlag(true);
-			break;
-		}
-
-		sq->processDelayedPaletteFade();
-	} while (!skipFlag() && i && !shouldQuit());
-
-	for (i = 0; i < 35; i++)
-		delete[] items[i].str;
-}
-
-DarkmoonSequenceHelper::DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_Eob *screen, Mode mode, const char *const *strings, const char *const *cpsFiles, const char *const *palFiles, const EobShapeDef **shapeDefList, const EobSequenceStep **seqList) :
-	_system(system), _vm(vm), _screen(screen), _mode(mode), _strings(strings), _cpsFiles(cpsFiles), _palFiles(palFiles), _shapeDefs(shapeDefList), _seqData(seqList) {
-
-	for (int i = 0; _palFiles[i]; i++) {
-		if (i < 4)
-			_palettes[i] = &_screen->getPalette(i);
-		else
-			_palettes[i] = new Palette(256);
-		_screen->loadPalette(_palFiles[i], *_palettes[i]);
-	}
-
-	_palettes[9] = new Palette(256);
-	_palettes[9]->fill(0, 256, 0);
-	_palettes[10] = new Palette(256);
-	_palettes[10]->fill(0, 256, 63);
-	_palettes[11] = new Palette(256);
-	_palettes[11]->fill(0, 256, 0);
-
-	_shapes = new const uint8*[30];
-	memset(_shapes, 0, 30 * sizeof(uint8*));
-
-	_fadePalTimer = 0;
-	_fadePalRate = 0;
-
-	_screen->setScreenPalette(*_palettes[0]);
-	_screen->setFont(Screen::FID_8_FNT);
-	_screen->hideMouse();
-
-	_vm->delay(150);
-	_vm->_eventList.clear();
-	_vm->_allowSkip = true;
-}
-
-DarkmoonSequenceHelper::~DarkmoonSequenceHelper() {
-	for (int i = 4; _palFiles[i]; i++)
-		delete _palettes[i];
-	delete _palettes[9];
-	delete _palettes[10];
-	delete _palettes[11];
-
-	for (int i = 0; i < 30; i++)
-		delete[] _shapes[i];
-	delete[] _shapes;
-
-	_screen->clearCurPage();
-	_screen->showMouse();
-	_screen->updateScreen();
-
-	_system->delayMillis(150);
-	_vm->resetSkipFlag(true);
-	_vm->_allowSkip = false;
-}
-
-void DarkmoonSequenceHelper::loadScene(int index, int pageNum) {
-	char file[13];
-	strcpy(file, _cpsFiles[index]);
-
-	Common::SeekableReadStream *s = _vm->resource()->createReadStream(file);
-	if (s && file[0] != 'X') {
-		delete s;
-		_screen->loadBitmap(_cpsFiles[index], pageNum | 1, pageNum | 1, _palettes[0]);
-	} else {
-		if (!s) {
-			file[0] = 'X';
-			s = _vm->resource()->createReadStream(file);
-		}
-
-		if (!s)
-			error("DarkmoonSequenceHelper::loadScene(): CPS file loading failure in scene %d", index);
-
-		if (_mode == kFinale)
-			s->read(_palettes[0]->getData(), 768);
-		else
-			s->seek(768);
-		_screen->loadFileDataToPage(s, 3, 64000);
-		delete s;
-	}
-
-	int cp = _screen->setCurPage(pageNum);
-
-	if (_shapeDefs[index]) {
-		for (const EobShapeDef *df = _shapeDefs[index]; df->w; df++ ) {
-			uint16 shapeIndex = (df->index < 0) ? df->index * -1 : df->index;
-			if (_shapes[shapeIndex])
-				delete[] _shapes[shapeIndex];
-			_shapes[shapeIndex] = _screen->encodeShape(df->x, df->y, df->w, df->h, (df->index >> 8) != 0);
-		}
-	}
-
-	_screen->setCurPage(cp);
-	_screen->copyPage(pageNum | 1, pageNum);
-
-	if ((pageNum == 0 || pageNum == 1) && !_vm->skipFlag() && !_vm->shouldQuit())
-		_screen->updateScreen();
-}
-
-void DarkmoonSequenceHelper::runSequence(int index, int del) {
-	if (_vm->skipFlag() || _vm->shouldQuit())
-		return;
-
-	uint32 end = 0;
-
-	for (const EobSequenceStep *s = _seqData[index]; s->command != 0xff && !_vm->skipFlag() && !_vm->shouldQuit(); s++) {
-		int palIndex = _mode == kFinale ? (s->pal + 1) : s->pal;
-		int x = s->x1;
-		int y = s->y1;
-		int x2 = 0;
-		uint16 shapeW = 0;
-		uint16 shapeH = 0;
-
-		switch(s->command) {
-		case 0:
-			// flash palette
-			if (s->pal)
-				setPaletteWithoutTextColor(palIndex);
-			delay(s->delay);
-			if (_mode == kIntro && s->pal)
-				setPaletteWithoutTextColor(0);
-			break;
-
-		case 1:
-			// draw shape, then restore background
-			shapeW = _shapes[s->obj][2];
-			shapeH = _shapes[s->obj][3];
-
-			if (_mode == kFinale) {
-				_screen->setScreenDim(18);
-				x -= (_screen->_curDim->sx << 3);
-				y -= _screen->_curDim->sy;
-				if (x < 0)
-					shapeW -= ((-x >> 3) + 1);
-				else
-					x2 = x;
-			}
-
-			_screen->drawShape(0, _shapes[s->obj], x, y, _mode == kIntro ? 0 : 18);
-
-			if (s->pal)
-				setPaletteWithoutTextColor(palIndex);
-			else
-				_screen->updateScreen();
-
-			delay(s->delay);
-
-			if (_mode == kIntro) {
-				if (s->pal)
-					setPaletteWithoutTextColor(0);
-				_screen->copyRegion(x - 8, y - 8, x, y, (shapeW + 1) << 3, shapeH, 2, 0, Screen::CR_NO_P_CHECK);
-			} else {
-				_screen->copyRegion(x2, y, x2 + (_screen->_curDim->sx << 3), y + _screen->_curDim->sy, (shapeW + 1) << 3, shapeH, 2, 0, Screen::CR_NO_P_CHECK);
-			}
-
-			_screen->updateScreen();
-			break;
-
-		case 2:
-			// draw shape
-			_screen->drawShape(_screen->_curPage, _shapes[s->obj], x, y, 0);
-
-			if (s->pal)
-				setPaletteWithoutTextColor(palIndex);
-			else if(!_screen->_curPage)
-				_screen->updateScreen();
-
-			delay(s->delay);
-
-			if (_mode == kIntro && s->pal)
-				setPaletteWithoutTextColor(0);
-			break;
-
-		case 3:
-		case 4:
-			// fade shape in or out or restore background
-			if (_mode == kFinale)
-				break;
-
-			_screen->setShapeFadeMode(0, true);
-			_screen->setShapeFadeMode(1, true);
-
-			end = _system->getMillis() + s->delay * _vm->tickLength();
-
-			if (palIndex) {
-				_screen->setFadeTableIndex(palIndex - 1);
-
-				_screen->copyRegion(s->x1 - 8, s->y1 - 8, 0, 0, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 2, 4, Screen::CR_NO_P_CHECK);
-				_screen->drawShape(4, _shapes[s->obj], s->x1 & 7, 0, 0);
-				_screen->copyRegion(0, 0, s->x1, s->y1, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 4, 0, Screen::CR_NO_P_CHECK);
-			} else {
-				_screen->copyRegion(s->x1 - 8, s->y1 - 8, s->x1, s->y1, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 2, 0, Screen::CR_NO_P_CHECK);
-			}
-			_screen->updateScreen();
-
-			_vm->delayUntil(end);
-			_screen->setShapeFadeMode(0, false);
-			_screen->setShapeFadeMode(1, false);
-			break;
-
-		case 5:
-			// copy region
-			if (_mode == kFinale && s->pal)
-				setPaletteWithoutTextColor(palIndex);
-
-			_screen->copyRegion(s->x2 << 3, s->y2, s->x1, s->y1, s->w << 3, s->h, (s->obj && _mode == kFinale) ? 6 : 2, 0, Screen::CR_NO_P_CHECK);
-			_screen->updateScreen();
-			delay(s->delay);
-			break;
-
-		case 6:
-			// play sound effect
-			if (s->obj != 0xff)
-				_vm->sound()->playSoundEffect(s->obj);
-			break;
-
-		default:
-			error("DarkmoonSequenceHelper::runSequence(): Unknown animation opcode encountered.");
-			break;
-		}
-	}
-
-	if (del > 0)
-		delay(del);
-}
-
-void DarkmoonSequenceHelper::printText(int index, int color) {
-	if (_vm->skipFlag() || _vm->shouldQuit())
-		return;
-
-	_screen->setClearScreenDim(17);
-	_palettes[0]->copy(*_palettes[0], color, 1, 255);
-	setPalette(0);
-
-	char *temp = new char[strlen(_strings[index]) + 1];
-	char *str = temp;
-	strcpy(str, _strings[index]);
-
-	const ScreenDim *dm = _screen->_curDim;
-
-	for (int yOffs = 0; *str; yOffs += 9) {
-		char *cr = strchr(str, 13);
-
-		if (cr)
-			*cr = 0;
-
-		uint32 len = strlen(str);
-		_screen->printText(str, (dm->sx + ((dm->w - len) >> 1)) << 3, dm->sy + yOffs, 255, dm->unkA);
-
-		if (cr) {
-			*cr = 13;
-			str = cr + 1;
-		} else {
-			str += len;
-		}
-	}
-
-	delete[] temp;
-	_screen->updateScreen();
-}
-
-void DarkmoonSequenceHelper::fadeText() {
-	if (_vm->skipFlag() || _vm->shouldQuit())
-		return;
-
-	_screen->fadeTextColor(_palettes[0], 255, 2);
-	_screen->clearCurDim();
-}
-
-void DarkmoonSequenceHelper::update(int srcPage) {
-	if (_vm->skipFlag() || _vm->shouldQuit())
-		return;
-
-	_screen->copyRegion(0, 0, 8, 8, 304, 128, srcPage, 0, Screen::CR_NO_P_CHECK);
-	setPaletteWithoutTextColor(0);
-}
-
-void DarkmoonSequenceHelper::setPaletteWithoutTextColor(int index) {
-	if (_vm->skipFlag() || _vm->shouldQuit())
-		return;
-
-	if (!memcmp(_palettes[11]->getData(), _palettes[index]->getData(), 765))
-		return;
-
-	_palettes[11]->copy(*_palettes[index], 0, 255);
-	_palettes[11]->copy(*_palettes[0], 255, 1, 255);
-	setPalette(11);
-
-	_screen->updateScreen();
-}
-
-void DarkmoonSequenceHelper::setPalette(int index) {
-	_screen->setScreenPalette(*_palettes[index]);
-}
-
-void DarkmoonSequenceHelper::fadePalette(int index, int del) {
-	if (_vm->skipFlag() || _vm->shouldQuit())
-		return;
-
-	_screen->fadePalette(*_palettes[index], del * _vm->tickLength());
-}
-
-void DarkmoonSequenceHelper::copyPalette(int srcIndex, int destIndex) {
-	_palettes[destIndex]->copy(*_palettes[srcIndex]);
-}
-
-void DarkmoonSequenceHelper::initDelayedPaletteFade(int palIndex, int rate) {
-	_palettes[11]->copy(*_palettes[0]);
-
-	_fadePalIndex = palIndex;
-	_fadePalRate = rate;
-	_fadePalTimer = _system->getMillis() + 2 * _vm->_tickLength;
-}
-
-bool DarkmoonSequenceHelper::processDelayedPaletteFade() {
-	if (_vm->skipFlag() || _vm->shouldQuit())
-		return true;
-
-	if (!_fadePalRate || (_system->getMillis() <= _fadePalTimer))
-		return false;
-
-	if (_screen->delayedFadePalStep(_palettes[_fadePalIndex], _palettes[0], _fadePalRate)) {
-		setPaletteWithoutTextColor(0);
-		_fadePalTimer = _system->getMillis() + 3 * _vm->_tickLength;
-	} else {
-		_fadePalRate = 0;
-	}
-
-	return false;
-}
-
-void DarkmoonSequenceHelper::delay(uint32 ticks) {
-	if (_vm->skipFlag() || _vm->shouldQuit())
-		return;
-
-	uint32 end = _system->getMillis() + ticks * _vm->_tickLength;
-
-	if (_mode == kFinale) {
-		do {
-			if (processDelayedPaletteFade())
-				break;
-			_vm->updateInput();
-		} while (end > _system->getMillis());
-		processDelayedPaletteFade();
-
-	} else {
-		_vm->delayUntil(end);
-	}
-}
-
-void DarkmoonSequenceHelper::waitForSongNotifier(int index, bool introUpdateAnim) {
-	int seq = 0;
-	while (_vm->sound()->checkTrigger() < index && !(_vm->skipFlag() || _vm->shouldQuit())) {
-		if (introUpdateAnim) {
-			runSequence(30 | seq);
-			seq ^= 1;
-		}
-
-		if (_mode == kFinale)
-			processDelayedPaletteFade();
-
-		_vm->updateInput();
-	}
-}
-
-void DarkMoonEngine::seq_nightmare() {
-	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
-	_screen->copyRegion(0, 0, 0, 120, 176, 24, 12, 2, Screen::CR_NO_P_CHECK);
-
-	initDialogueSequence();
-	gui_drawDialogueBox();
-
-	_txt->printDialogueText(99, 0);
-	snd_playSoundEffect(54);
-
-	static const uint8 seqX[] = { 0, 20, 0, 20 };
-	static const uint8 seqY[] = { 0, 0, 96, 96 };
-	static const uint8 seqDelay[] = { 12, 7, 7, 12 };
-
-	for (const int8 *i = _dreamSteps; *i != -1; ++i) {
-		drawSequenceBitmap("DREAM", 0, seqX[*i], seqY[*i], 0);
-		delay(seqDelay[*i] * _tickLength);
-	}
-
-	_txt->printDialogueText(20, _okStrings[0]);
-
-	restoreAfterDialogueSequence();
-
-	_screen->setFont(of);
-}
-
-void DarkMoonEngine::seq_kheldran() {
-	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
-
-	initDialogueSequence();
-	gui_drawDialogueBox();
-
-	static const char file[] = "KHELDRAN";
-	_txt->printDialogueText(_kheldranStrings[0]);
-	drawSequenceBitmap(file, 0, 0, 0, 0);
-	_txt->printDialogueText(20, _moreStrings[0]);
-	snd_playSoundEffect(56);
-	drawSequenceBitmap(file, 0, 20, 0, 0);
-	delay(10 * _tickLength);
-	drawSequenceBitmap(file, 0, 0, 96, 0);
-	delay(10 * _tickLength);
-	drawSequenceBitmap(file, 0, 20, 96, 0);
-	delay(7 * _tickLength);
-	_txt->printDialogueText(76, _okStrings[0]);
-
-	restoreAfterDialogueSequence();
-
-	_screen->setFont(of);
-}
-
-void DarkMoonEngine::seq_dranDragonTransformation() {
-	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
-
-	initDialogueSequence();
-	gui_drawDialogueBox();
-
-	static const char file[] = "DRANX";
-	drawSequenceBitmap(file, 0, 0, 0, 0);
-	_txt->printDialogueText(120, _moreStrings[0]);
-	snd_playSoundEffect(56);
-	drawSequenceBitmap(file, 0, 20, 0, 0);
-	delay(7 * _tickLength);
-	drawSequenceBitmap(file, 0, 0, 96, 0);
-	delay(7 * _tickLength);
-	drawSequenceBitmap(file, 0, 20, 96, 0);
-	delay(18 * _tickLength);
-
-	restoreAfterDialogueSequence();
-
-	_screen->setFont(of);
-}
-
-}	// End of namespace Kyra
-
-#endif // ENABLE_EOB
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index faa2591163..2594828fdf 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include "kyra/eob1.h"
+#include "kyra/eob.h"
 #include "kyra/resource.h"
 
 
-- 
cgit v1.2.3


From 4e4f4164be57d66610eac570e048c9ade07f42ea Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 12 Dec 2011 21:44:13 +0100
Subject: KYRA: (EOB) - fix eob2 sequence text fading

---
 engines/kyra/screen_eob.cpp         | 2 +-
 engines/kyra/sequences_darkmoon.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index ca44a8a771..36af074ee0 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -978,7 +978,7 @@ void Screen_Eob::fadeTextColor(Palette *pal, int color1, int rate) {
 
 	for (bool loop = true; loop; ) {
 		loop = true;
-		uint32 end = _system->getMillis() + 1;
+		uint32 end = _system->getMillis() + _vm->tickLength();
 
 		loop = false;
 		for (int ii = 0; ii < 3; ii++) {
diff --git a/engines/kyra/sequences_darkmoon.cpp b/engines/kyra/sequences_darkmoon.cpp
index 6b342adb50..66d5329be9 100644
--- a/engines/kyra/sequences_darkmoon.cpp
+++ b/engines/kyra/sequences_darkmoon.cpp
@@ -1172,7 +1172,7 @@ void DarkmoonSequenceHelper::fadeText() {
 	if (_vm->skipFlag() || _vm->shouldQuit())
 		return;
 
-	_screen->fadeTextColor(_palettes[0], 255, 2);
+	_screen->fadeTextColor(_palettes[0], 255, 8);
 	_screen->clearCurDim();
 }
 
-- 
cgit v1.2.3


From 0aa32385230dbe1ab62bb2d02d04ca5cc46d928c Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 12 Dec 2011 16:23:01 +0100
Subject: KYRA: (EOB/LOL) - rename some vars

(all cases of Eob to EoB, all cases of Lol to LoL, all cases of LolEobCommon to RpgCommon)
---
 engines/kyra/chargen.cpp            |  60 +--
 engines/kyra/darkmoon.cpp           |  14 +-
 engines/kyra/darkmoon.h             |  16 +-
 engines/kyra/debugger.cpp           |   2 +-
 engines/kyra/debugger.h             |   8 +-
 engines/kyra/detection.cpp          |   2 +-
 engines/kyra/eob.cpp                |  44 +-
 engines/kyra/eob.h                  |   8 +-
 engines/kyra/eobcommon.cpp          | 248 +++++-----
 engines/kyra/eobcommon.h            | 140 +++---
 engines/kyra/gui_eob.cpp            | 224 ++++-----
 engines/kyra/gui_eob.h              |  18 +-
 engines/kyra/items_eob.cpp          |  86 ++--
 engines/kyra/kyra_hof.cpp           |   2 +-
 engines/kyra/kyra_hof.h             |  24 +-
 engines/kyra/kyra_rpg.cpp           |   2 +-
 engines/kyra/kyra_rpg.h             |   2 +-
 engines/kyra/lol.cpp                |  26 +-
 engines/kyra/lol.h                  |  48 +-
 engines/kyra/magic_eob.cpp          | 256 +++++-----
 engines/kyra/resource.h             | 954 ++++++++++++++++++------------------
 engines/kyra/saveload_eob.cpp       |  56 +--
 engines/kyra/saveload_lol.cpp       |  16 +-
 engines/kyra/saveload_rpg.cpp       |  12 +-
 engines/kyra/scene_eob.cpp          |  60 +--
 engines/kyra/scene_lol.cpp          |   6 +-
 engines/kyra/screen_eob.cpp         |  72 +--
 engines/kyra/screen_eob.h           |  10 +-
 engines/kyra/script_eob.cpp         | 110 ++---
 engines/kyra/script_eob.h           |  12 +-
 engines/kyra/script_lol.cpp         |  16 +-
 engines/kyra/sequences_darkmoon.cpp |  14 +-
 engines/kyra/sequences_eob.cpp      |  38 +-
 engines/kyra/sequences_lol.cpp      |   6 +-
 engines/kyra/sound_adlib.cpp        |   4 +-
 engines/kyra/sprites_eob.cpp        | 128 ++---
 engines/kyra/sprites_lol.cpp        |  38 +-
 engines/kyra/staticres.cpp          |  42 +-
 engines/kyra/staticres_eob.cpp      | 704 +++++++++++++-------------
 engines/kyra/staticres_lol.cpp      | 152 +++---
 engines/kyra/staticres_rpg.cpp      |  28 +-
 engines/kyra/text_rpg.cpp           |  16 +-
 engines/kyra/timer_eob.cpp          |  42 +-
 43 files changed, 1883 insertions(+), 1883 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index b190e111c7..2990c6eca6 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -30,10 +30,10 @@ namespace Kyra {
 
 class CharacterGenerator {
 public:
-	CharacterGenerator(EobCoreEngine *vm, Screen_Eob *screen);
+	CharacterGenerator(EoBCoreEngine *vm, Screen_EoB *screen);
 	~CharacterGenerator();
 
-	bool start(EobCharacter *characters, uint8 ***faceShapes);
+	bool start(EoBCharacter *characters, uint8 ***faceShapes);
 
 private:
 	void init();
@@ -89,9 +89,9 @@ private:
 	const uint8 *_chargenRaceMinStats;
 	const uint16 *_chargenRaceMaxStats;
 
-	static const EobChargenButtonDef _chargenButtonDefs[];
+	static const EoBChargenButtonDef _chargenButtonDefs[];
 	static const CreatePartyModButton _chargenModButtons[];
-	static const EobRect8 _chargenButtonBodyCoords[];
+	static const EoBRect8 _chargenButtonBodyCoords[];
 	static const int16 _chargenBoxX[];
 	static const int16 _chargenBoxY[];
 	static const int16 _chargenNameFieldX[];
@@ -102,14 +102,14 @@ private:
 
 	static const int16 _raceModifiers[];
 
-	EobCharacter *_characters;
+	EoBCharacter *_characters;
 	uint8 **_faceShapes;
 
-	EobCoreEngine *_vm;
-	Screen_Eob *_screen;
+	EoBCoreEngine *_vm;
+	Screen_EoB *_screen;
 };
 
-CharacterGenerator::CharacterGenerator(EobCoreEngine *vm, Screen_Eob *screen) : _vm(vm), _screen(screen),
+CharacterGenerator::CharacterGenerator(EoBCoreEngine *vm, Screen_EoB *screen) : _vm(vm), _screen(screen),
 	_characters(0), _faceShapes(0), _chargenMagicShapes(0), _chargenButtonLabels(0), _chargenMagicShapeTimer(0),
 	_updateBoxShapesIndex(0), _lastUpdateBoxShapesIndex(0), _magicShapesBox(6), _activeBox(0) {
 
@@ -124,13 +124,13 @@ CharacterGenerator::CharacterGenerator(EobCoreEngine *vm, Screen_Eob *screen) :
 	memset(_chargenMaxStats, 0, sizeof(_chargenMaxStats));
 
 	int temp;
-	_chargenStrings1 = _vm->staticres()->loadStrings(kEobBaseChargenStrings1, temp);
-	_chargenStrings2 = _vm->staticres()->loadStrings(kEobBaseChargenStrings2, temp);
-	_chargenStartLevels = _vm->staticres()->loadRawData(kEobBaseChargenStartLevels, temp);
-	_chargenEnterGameStrings = _vm->staticres()->loadStrings(kEobBaseChargenEnterGameStrings, temp);
-	_chargenClassMinStats = _vm->staticres()->loadRawData(kEobBaseChargenClassMinStats, temp);
-	_chargenRaceMinStats = _vm->staticres()->loadRawData(kEobBaseChargenRaceMinStats, temp);
-	_chargenRaceMaxStats = _vm->staticres()->loadRawDataBe16(kEobBaseChargenRaceMaxStats, temp);
+	_chargenStrings1 = _vm->staticres()->loadStrings(kEoBBaseChargenStrings1, temp);
+	_chargenStrings2 = _vm->staticres()->loadStrings(kEoBBaseChargenStrings2, temp);
+	_chargenStartLevels = _vm->staticres()->loadRawData(kEoBBaseChargenStartLevels, temp);
+	_chargenEnterGameStrings = _vm->staticres()->loadStrings(kEoBBaseChargenEnterGameStrings, temp);
+	_chargenClassMinStats = _vm->staticres()->loadRawData(kEoBBaseChargenClassMinStats, temp);
+	_chargenRaceMinStats = _vm->staticres()->loadRawData(kEoBBaseChargenRaceMinStats, temp);
+	_chargenRaceMaxStats = _vm->staticres()->loadRawDataBe16(kEoBBaseChargenRaceMaxStats, temp);
 }
 
 CharacterGenerator::~CharacterGenerator() {
@@ -147,7 +147,7 @@ CharacterGenerator::~CharacterGenerator() {
 	}
 }
 
-bool CharacterGenerator::start(EobCharacter *characters, uint8 ***faceShapes) {
+bool CharacterGenerator::start(EoBCharacter *characters, uint8 ***faceShapes) {
 	if (!characters && !faceShapes)
 		return true;
 
@@ -244,7 +244,7 @@ void CharacterGenerator::init() {
 		_faceShapes[i] = _screen->encodeShape((i % 10) << 2, (i / 10) << 5, 4, 32, true);
 	_screen->_curPage = 0;
 
-	_screen->loadEobBitmap("CHARGEN", 0, 3, 3, 0);
+	_screen->loadEoBBitmap("CHARGEN", 0, 3, 3, 0);
 	_screen->loadShapeSetBitmap("CHARGENB", 3, 3);
 	if (_chargenMagicShapes) {
 		for (int i = 0; i < 10; i++)
@@ -272,7 +272,7 @@ void CharacterGenerator::initButtonsFromList(int first, int numButtons) {
 	_vm->gui_resetButtonList();
 
 	for (int i = 0; i < numButtons; i++) {
-		const EobChargenButtonDef *e = &_chargenButtonDefs[first + i];
+		const EoBChargenButtonDef *e = &_chargenButtonDefs[first + i];
 		initButton(i, e->x, e->y, e->w, e->h, e->keyCode);
 	}
 
@@ -343,7 +343,7 @@ void CharacterGenerator::toggleSpecialButton(int index, int bodyCustom, int page
 		return;
 
 	const CreatePartyModButton *c = &_chargenModButtons[index];
-	const EobRect8 *p = &_chargenButtonBodyCoords[c->bodyIndex + bodyCustom];
+	const EoBRect8 *p = &_chargenButtonBodyCoords[c->bodyIndex + bodyCustom];
 
 	int x2 = 20;
 	int y2 = 0;
@@ -627,7 +627,7 @@ void CharacterGenerator::updateMagicShapes() {
 }
 
 void CharacterGenerator::generateStats(int index) {
-	EobCharacter *c = &_characters[index];
+	EoBCharacter *c = &_characters[index];
 
 	for (int i = 0; i < 3; i++) {
 		c->level[i] = _chargenStartLevels[(c->cClass << 2) + i];
@@ -674,7 +674,7 @@ void CharacterGenerator::modifyMenu() {
 	_vm->removeInputTop();
 	printStats(_activeBox, 3);
 
-	EobCharacter *c = &_characters[_activeBox];
+	EoBCharacter *c = &_characters[_activeBox];
 	int8 hpLO = c->hitPointsCur;
 
 	for (int i = 0; i >= 0 && i < 7; ) {
@@ -874,7 +874,7 @@ void CharacterGenerator::printStats(int index, int mode) {
 	_screen->copyRegion(0, 0, 160, 0, 160, 128, 2, 2, Screen::CR_NO_P_CHECK);
 	_screen->_curPage = 2;
 
-	EobCharacter *c = &_characters[index];
+	EoBCharacter *c = &_characters[index];
 
 	if (mode != 4)
 		_screen->drawShape(2, c->faceShape, 224, 2, 0);
@@ -973,7 +973,7 @@ int CharacterGenerator::modifyStat(int index, int8 *stat1, int8 *stat2) {
 	_screen->printShadedText(statStr.c_str(), b->x + 32, b->y, 6, 0);
 	_screen->updateScreen();
 
-	EobCharacter *c = &_characters[_activeBox];
+	EoBCharacter *c = &_characters[_activeBox];
 
 	int ci = index;
 	uint8 v2 = s2 ? *s2 : 0;
@@ -1145,7 +1145,7 @@ void CharacterGenerator::finish() {
 		_characters[0].inventory[2] = _vm->duplicateItem(35);
 
 		for (int i = 0; i < 4; i++) {
-			EobCharacter *c = &_characters[i];
+			EoBCharacter *c = &_characters[i];
 			c->flags = 1;
 			c->food = 100;
 			c->id = i;
@@ -1193,7 +1193,7 @@ void CharacterGenerator::finish() {
 		static const int8 *itemList[] = { itemList0, itemList1, itemList2, itemList3 };
 
 		for (int i = 0; i < 4; i++) {
-			EobCharacter *c = &_characters[i];
+			EoBCharacter *c = &_characters[i];
 			c->flags = 1;
 			c->food = 100;
 			c->id = i;
@@ -1283,7 +1283,7 @@ void CharacterGenerator::finish() {
 	}
 
 	for (int i = 0; i < 4; i++) {
-		EobCharacter *c = &_characters[i];
+		EoBCharacter *c = &_characters[i];
 		c->strengthMax = c->strengthCur;
 		c->strengthExtMax = c->strengthExtCur;
 		c->intelligenceMax = c->intelligenceCur;
@@ -1325,7 +1325,7 @@ void CharacterGenerator::finish() {
 	}
 }
 
-const EobChargenButtonDef CharacterGenerator::_chargenButtonDefs[] = {
+const EoBChargenButtonDef CharacterGenerator::_chargenButtonDefs[] = {
 	{ 0x01, 0x37, 0x31, 0x32, 0x70 },
 	{ 0x09, 0x37, 0x31, 0x32, 0x71 },
 	{ 0x01, 0x77, 0x31, 0x32, 0x72 },
@@ -1389,7 +1389,7 @@ const CreatePartyModButton CharacterGenerator::_chargenModButtons[] = {
 	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x1C, 0xAC }
 };
 
-const EobRect8 CharacterGenerator::_chargenButtonBodyCoords[] = {
+const EoBRect8 CharacterGenerator::_chargenButtonBodyCoords[] = {
 	{ 0x00, 0x80, 0x04, 0x20 },
 	{ 0x04, 0x80, 0x04, 0x20 },
 	{ 0x08, 0x80, 0x04, 0x20 },
@@ -1426,11 +1426,11 @@ const int16 CharacterGenerator::_raceModifiers[] = {
 	0, 0, 0, 0,	1, -1, 0, 1, -1, 0, 0, 0, -1, 0, 0, 1, 0, 0
 };
 
-bool EobCoreEngine::startCharacterGeneration() {
+bool EoBCoreEngine::startCharacterGeneration() {
 	return CharacterGenerator(this, _screen).start(_characters, &_faceShapes);
 }
 
-bool EobCoreEngine::transferParty() {
+bool EoBCoreEngine::transferParty() {
 
 	return false;
 }
diff --git a/engines/kyra/darkmoon.cpp b/engines/kyra/darkmoon.cpp
index e44040b0d5..304e5c9537 100644
--- a/engines/kyra/darkmoon.cpp
+++ b/engines/kyra/darkmoon.cpp
@@ -28,7 +28,7 @@
 
 namespace Kyra {
 
-DarkMoonEngine::DarkMoonEngine(OSystem *system, const GameFlags &flags) : EobCoreEngine(system, flags) {
+DarkMoonEngine::DarkMoonEngine(OSystem *system, const GameFlags &flags) : EoBCoreEngine(system, flags) {
 	_seqIntro = _seqFinale = 0;
 	_shapesIntro = _shapesFinale = 0;
 	_dscDoorType5Offs = 0;
@@ -50,13 +50,13 @@ DarkMoonEngine::~DarkMoonEngine() {
 }
 
 Common::Error DarkMoonEngine::init() {
-	Common::Error err = EobCoreEngine::init();
+	Common::Error err = EoBCoreEngine::init();
 	if (err.getCode() != Common::kNoError)
 		return err;
 
 	initStaticResource();
 
-	_monsterProps = new EobMonsterProperty[10];
+	_monsterProps = new EoBMonsterProperty[10];
 
 	static const uint16 wX[] = { 221, 76 };
 	static const uint8 wY[] = { 189, 162 };
@@ -93,7 +93,7 @@ void DarkMoonEngine::startupNew() {
 	_currentBlock = 171;
 	_currentDirection = 2;
 	setHandItem(0);
-	EobCoreEngine::startupNew();
+	EoBCoreEngine::startupNew();
 }
 
 void DarkMoonEngine::drawNpcScene(int npcIndex) {
@@ -149,7 +149,7 @@ void DarkMoonEngine::runNpcDialogue(int npcIndex) {
 }
 
 void DarkMoonEngine::updateUsedCharacterHandItem(int charIndex, int slot) {
-	EobItem *itm = &_items[_characters[charIndex].inventory[slot]];
+	EoBItem *itm = &_items[_characters[charIndex].inventory[slot]];
 	if (itm->type == 48 || itm->type == 62) {
 		if (itm->value == 5)
 			return;
@@ -278,7 +278,7 @@ void DarkMoonEngine::replaceMonster(int unit, uint16 block, int pos, int dir, in
 	initMonster(index, unit, block, pos, dir, type, shpIndex, mode, h2, randItem, fixedItem);
 }
 
-bool DarkMoonEngine::killMonsterExtra(EobMonsterInPlay *m) {
+bool DarkMoonEngine::killMonsterExtra(EoBMonsterInPlay *m) {
 	if (_currentLevel == 16 && _currentSub == 1 && (_monsterProps[m->type].capsFlags & 4)) {
 		if (m->type) {
 			_playFinale = true;
@@ -464,7 +464,7 @@ int DarkMoonEngine::charSelectDialogue() {
 }
 
 void DarkMoonEngine::characterLevelGain(int charIndex) {
-	EobCharacter *c = &_characters[charIndex];
+	EoBCharacter *c = &_characters[charIndex];
 	int s = _numLevelsPerClass[c->cClass];
 	for (int i = 0; i < s; i++) {
 		uint32 er = getRequiredExperience(c->cClass, i, c->level[i] + 1);
diff --git a/engines/kyra/darkmoon.h b/engines/kyra/darkmoon.h
index 35eb90a9dc..590b2f4ea1 100644
--- a/engines/kyra/darkmoon.h
+++ b/engines/kyra/darkmoon.h
@@ -31,7 +31,7 @@ namespace Kyra {
 
 class DarkmoonSequenceHelper;
 
-struct EobSequenceStep {
+struct EoBSequenceStep {
 	uint8 command;
 	uint8 obj;
 	int16 x1;
@@ -44,8 +44,8 @@ struct EobSequenceStep {
 	uint8 h;
 };
 
-class DarkMoonEngine : public EobCoreEngine {
-friend class GUI_Eob;
+class DarkMoonEngine : public EoBCoreEngine {
+friend class GUI_EoB;
 friend class DarkmoonSequenceHelper;
 public:
 	DarkMoonEngine(OSystem *system, const GameFlags &flags);
@@ -74,14 +74,14 @@ private:
 
 	const char * const *_introStrings;
 	const char * const *_cpsFilesIntro;
-	const EobSequenceStep **_seqIntro;
-	const EobShapeDef **_shapesIntro;
+	const EoBSequenceStep **_seqIntro;
+	const EoBShapeDef **_shapesIntro;
 
 	const char * const *_finaleStrings;
 	const uint8 *_creditsData;
 	const char * const *_cpsFilesFinale;
-	const EobSequenceStep **_seqFinale;
-	const EobShapeDef **_shapesFinale;
+	const EoBSequenceStep **_seqFinale;
+	const EoBShapeDef **_shapesFinale;
 
 	static const char *_palFilesIntro[];
 	static const char *_palFilesFinale[];
@@ -108,7 +108,7 @@ private:
 	void generateMonsterPalettes(const char *file, int16 monsterIndex);
 	void loadMonsterDecoration(const char *file, int16 monsterIndex);
 	void replaceMonster(int unit, uint16 block, int d, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem);
-	bool killMonsterExtra(EobMonsterInPlay *m);
+	bool killMonsterExtra(EoBMonsterInPlay *m);
 
 	// Level
 	const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs);
diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index 6a4b88c77a..96003d9e99 100644
--- a/engines/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
@@ -472,7 +472,7 @@ Debugger_LoL::Debugger_LoL(LoLEngine *vm) : Debugger(vm), _vm(vm) {
 #endif // ENABLE_LOL
 
 #ifdef ENABLE_EOB
-Debugger_Eob::Debugger_Eob(EobCoreEngine *vm) : Debugger(vm), _vm(vm) {
+Debugger_EoB::Debugger_EoB(EoBCoreEngine *vm) : Debugger(vm), _vm(vm) {
 }
 #endif // ENABLE_EOB
 
diff --git a/engines/kyra/debugger.h b/engines/kyra/debugger.h
index 1bd8363612..77f1a9a550 100644
--- a/engines/kyra/debugger.h
+++ b/engines/kyra/debugger.h
@@ -109,14 +109,14 @@ protected:
 #endif // ENABLE_LOL
 
 #ifdef ENABLE_EOB
-class EobCoreEngine;
+class EoBCoreEngine;
 
-class Debugger_Eob : public Debugger {
+class Debugger_EoB : public Debugger {
 public:
-	Debugger_Eob(EobCoreEngine *vm);
+	Debugger_EoB(EoBCoreEngine *vm);
 
 protected:
-	EobCoreEngine *_vm;
+	EoBCoreEngine *_vm;
 };
 #endif // ENABLE_EOB
 
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index e021a3a4c2..56ad42773c 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -134,7 +134,7 @@ bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame
 #endif // ENABLE_LOL
 #ifdef ENABLE_EOB
 	case Kyra::GI_EOB1:
-		*engine = new Kyra::EobEngine(syst, flags);
+		*engine = new Kyra::EoBEngine(syst, flags);
 		break;
 	case Kyra::GI_EOB2:
 		*engine = new Kyra::DarkMoonEngine(syst, flags);
diff --git a/engines/kyra/eob.cpp b/engines/kyra/eob.cpp
index d90a3caa74..0010a51779 100644
--- a/engines/kyra/eob.cpp
+++ b/engines/kyra/eob.cpp
@@ -28,7 +28,7 @@
 
 namespace Kyra {
 
-EobEngine::EobEngine(OSystem *system, const GameFlags &flags) : EobCoreEngine(system, flags) {
+EoBEngine::EoBEngine(OSystem *system, const GameFlags &flags) : EoBCoreEngine(system, flags) {
 	_numSpells = 53;
 	_menuChoiceInit = 4;
 
@@ -42,12 +42,12 @@ EobEngine::EobEngine(OSystem *system, const GameFlags &flags) : EobCoreEngine(sy
 	_dscDoorCoordsExt = 0;
 }
 
-EobEngine::~EobEngine() {
+EoBEngine::~EoBEngine() {
 	delete[] _itemsOverlay;
 }
 
-Common::Error EobEngine::init() {
-	Common::Error err = EobCoreEngine::init();
+Common::Error EoBEngine::init() {
+	Common::Error err = EoBCoreEngine::init();
 	if (err.getCode() != Common::kNoError)
 		return err;
 
@@ -90,21 +90,21 @@ Common::Error EobEngine::init() {
 	return Common::kNoError;
 }
 
-void EobEngine::startupNew() {
+void EoBEngine::startupNew() {
 	_currentLevel = 1;
 	_currentSub = 0;
 	loadLevel(1, 0);
 	_currentBlock = 490;
 	_currentDirection = 0;
 	setHandItem(0);
-	EobCoreEngine::startupNew();
+	EoBCoreEngine::startupNew();
 }
 
-void EobEngine::startupLoad() {
+void EoBEngine::startupLoad() {
 	_sound->loadSoundFile("ADLIB");
 }
 
-void EobEngine::drawNpcScene(int npcIndex) {
+void EoBEngine::drawNpcScene(int npcIndex) {
 	_screen->copyRegion(0, 0, 0, 0, 176, 120, 6, 0, Screen::CR_NO_P_CHECK);
 	switch (npcIndex) {
 	case 0:
@@ -155,7 +155,7 @@ void EobEngine::drawNpcScene(int npcIndex) {
 	}
 }
 
-void EobEngine::encodeDrawNpcSeqShape(int npcIndex, int drawX, int drawY) {
+void EoBEngine::encodeDrawNpcSeqShape(int npcIndex, int drawX, int drawY) {
 	const uint8 *shpDef = &_npcShpData[npcIndex << 2];
 	_screen->_curPage = 2;
 	const uint8 *shp = _screen->encodeShape(shpDef[0], shpDef[1], shpDef[2], shpDef[3]);
@@ -169,7 +169,7 @@ void EobEngine::encodeDrawNpcSeqShape(int npcIndex, int drawX, int drawY) {
 #define DLG2A3(cond, txt, buttonstr1, buttonstr2) ((cond) ? (DLG2(txt, buttonstr1) ? 2 : 0) : DLG3(txt, buttonstr2))
 #define TXT(txt) _txt->printDialogueText(txt, _moreStrings[0])
 
-void EobEngine::runNpcDialogue(int npcIndex) {
+void EoBEngine::runNpcDialogue(int npcIndex) {
 	int r = 0;
 	int a = 0;
 	Item itm = 0;
@@ -327,8 +327,8 @@ void EobEngine::runNpcDialogue(int npcIndex) {
 #undef DLG3
 #undef DLG2A3
 
-void EobEngine::updateUsedCharacterHandItem(int charIndex, int slot) {
-	EobItem *itm = &_items[_characters[charIndex].inventory[slot]];
+void EoBEngine::updateUsedCharacterHandItem(int charIndex, int slot) {
+	EoBItem *itm = &_items[_characters[charIndex].inventory[slot]];
 	if (itm->type == 48) {
 		int charges = itm->flags & 0x3f;
 		if (--charges)
@@ -340,7 +340,7 @@ void EobEngine::updateUsedCharacterHandItem(int charIndex, int slot) {
 	}
 }
 
-void EobEngine::replaceMonster(int unit, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem) {
+void EoBEngine::replaceMonster(int unit, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem) {
 	if (_levelBlockProperties[block].flags & 7)
 		return;
 
@@ -352,7 +352,7 @@ void EobEngine::replaceMonster(int unit, uint16 block, int pos, int dir, int typ
 	}
 }
 
-void EobEngine::updateScriptTimersExtra() {
+void EoBEngine::updateScriptTimersExtra() {
 	int cnt = 0;
 	for (int i = 1; i < 30; i++) {
 		if (_monsters[i].hitPointsCur <= 0)
@@ -369,7 +369,7 @@ void EobEngine::updateScriptTimersExtra() {
 	}
 }
 
-void EobEngine::loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) {
+void EoBEngine::loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) {
 	_screen->loadShapeSetBitmap("DOOR", 5, 3);
 	_screen->_curPage = 2;
 
@@ -398,7 +398,7 @@ void EobEngine::loadDoorShapes(int doorType1, int shapeId1, int doorType2, int s
 	_screen->_curPage = 0;
 }
 
-void EobEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wall, int mDim, int16 y1, int16 y2) {
+void EoBEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wall, int mDim, int16 y1, int16 y2) {
 	int shapeIndex = type + 2 - mDim;
 	uint8 *shp = _doorShapes[shapeIndex];
 
@@ -467,7 +467,7 @@ void EobEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wal
 	}
 }
 
-void EobEngine::turnUndeadAuto() {
+void EoBEngine::turnUndeadAuto() {
 	if (_currentLevel != 2 && _currentLevel != 7)
 		return;
 
@@ -477,7 +477,7 @@ void EobEngine::turnUndeadAuto() {
 		if (!testCharacter(i, 0x0d))
 			continue;
 
-		EobCharacter *c = &_characters[i];
+		EoBCharacter *c = &_characters[i];
 
 		if (_itemTypes[_items[c->inventory[0]].type].extraProperties != 6 && _itemTypes[_items[c->inventory[1]].type].extraProperties != 6)
 			continue;
@@ -506,12 +506,12 @@ void EobEngine::turnUndeadAuto() {
 	_openBookCasterLevel = 0;
 }
 
-void EobEngine::turnUndeadAutoHit() {
+void EoBEngine::turnUndeadAutoHit() {
 	_txt->printMessage(_turnUndeadString[0], -1, _characters[_openBookChar].name);
 	sparkEffectOffensive();
 }
 
-bool EobEngine::checkPartyStatusExtra() {
+bool EoBEngine::checkPartyStatusExtra() {
 	_screen->copyPage(0, 10);
 	int cd = _screen->curDimIndex();
 	gui_drawBox(0, 121, 320, 80, _color1_1, _color2_1, _bkgColor_1);
@@ -529,7 +529,7 @@ bool EobEngine::checkPartyStatusExtra() {
 	return true;
 }
 
-int EobEngine::resurrectionSelectDialogue() {
+int EoBEngine::resurrectionSelectDialogue() {
 	gui_drawDialogueBox();
 	_txt->printDialogueText(_npcStrings[0][1]);
 
@@ -548,7 +548,7 @@ int EobEngine::resurrectionSelectDialogue() {
 	return 1;
 }
 
-void EobEngine::healParty() {
+void EoBEngine::healParty() {
 	int cnt = rollDice(1, 3, 2);
 	for (int i = 0; i < 6 && cnt; i++) {
 		if (testCharacter(i, 3))
diff --git a/engines/kyra/eob.h b/engines/kyra/eob.h
index 2dfccca94e..0f83c47b03 100644
--- a/engines/kyra/eob.h
+++ b/engines/kyra/eob.h
@@ -29,11 +29,11 @@
 
 namespace Kyra {
 
-class EobEngine : public EobCoreEngine {
-friend class GUI_Eob;
+class EoBEngine : public EoBCoreEngine {
+friend class GUI_EoB;
 public:
-	EobEngine(OSystem *system, const GameFlags &flags);
-	~EobEngine();
+	EoBEngine(OSystem *system, const GameFlags &flags);
+	~EoBEngine();
 
 private:
 	// Init / Release
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index dfa465c789..ebd26d3c18 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -36,7 +36,7 @@
 
 namespace Kyra {
 
-EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : KyraRpgEngine(system, flags), _numLargeItemShapes(flags.gameID == GI_EOB1 ? 14 : 11),
+EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags) : KyraRpgEngine(system, flags), _numLargeItemShapes(flags.gameID == GI_EOB1 ? 14 : 11),
 	_numSmallItemShapes(flags.gameID == GI_EOB1 ? 23 : 26), _numThrownItemShapes(flags.gameID == GI_EOB1 ? 12 : 9), _numItemIconShapes(flags.gameID == GI_EOB1 ? 89 : 112),
 	_teleporterWallId(flags.gameID == GI_EOB1 ? 52 : 44) {
 	_screen = 0;
@@ -212,7 +212,7 @@ EobCoreEngine::EobCoreEngine(OSystem *system, const GameFlags &flags) : KyraRpgE
 #undef DWM0
 }
 
-EobCoreEngine::~EobCoreEngine() {
+EoBCoreEngine::~EoBCoreEngine() {
 	releaseItemsAndDecorationsShapes();
 	releaseTempData();
 
@@ -292,12 +292,12 @@ EobCoreEngine::~EobCoreEngine() {
 	_txt = 0;
 }
 
-Common::Error EobCoreEngine::init() {
+Common::Error EoBCoreEngine::init() {
 	// In EOB the timer proc is directly invoked via interrupt 0x1c, 18.2 times per second.
 	// This makes a tick length of 54.94.
 	_tickLength = 55;
 
-	_screen = new Screen_Eob(this, _system);
+	_screen = new Screen_EoB(this, _system);
 
 	assert(_screen);
 	_screen->setResolution();
@@ -333,13 +333,13 @@ Common::Error EobCoreEngine::init() {
 	}
 
 	setupKeyMap();
-	_gui = new GUI_Eob(this);
+	_gui = new GUI_EoB(this);
 	assert(_gui);
 	_txt = new TextDisplayer_rpg(this, _screen);
 	assert(_txt);
-	_inf = new EobInfProcessor(this, _screen);
+	_inf = new EoBInfProcessor(this, _screen);
 	assert(_inf);
-	_debugger = new Debugger_Eob(this);
+	_debugger = new Debugger_EoB(this);
 	assert(_debugger);
 
 	_screen->loadFont(Screen::FID_6_FNT, "FONT6.FNT");
@@ -375,14 +375,14 @@ Common::Error EobCoreEngine::init() {
 
 	_wllVcnOffset = 16;
 
-	_monsters = new EobMonsterInPlay[30];
-	memset(_monsters, 0, 30 * sizeof(EobMonsterInPlay));
+	_monsters = new EoBMonsterInPlay[30];
+	memset(_monsters, 0, 30 * sizeof(EoBMonsterInPlay));
 
-	_characters = new EobCharacter[6];
-	memset(_characters, 0, sizeof(EobCharacter) * 6);
+	_characters = new EoBCharacter[6];
+	memset(_characters, 0, sizeof(EoBCharacter) * 6);
 
-	_items = new EobItem[600];
-	memset(_items, 0, sizeof(EobItem) * 600);
+	_items = new EoBItem[600];
+	memset(_items, 0, sizeof(EoBItem) * 600);
 
 	_itemNames = new char*[130];
 	for (int i = 0; i < 130; i++) {
@@ -390,9 +390,9 @@ Common::Error EobCoreEngine::init() {
 		memset(_itemNames[i], 0, 35);
 	}
 
-	_flyingObjects = new EobFlyingObject[_numFlyingObjects];
+	_flyingObjects = new EoBFlyingObject[_numFlyingObjects];
 	_flyingObjectsPtr = _flyingObjects;
-	memset(_flyingObjects, 0, _numFlyingObjects * sizeof(EobFlyingObject));
+	memset(_flyingObjects, 0, _numFlyingObjects * sizeof(EoBFlyingObject));
 
 	_spellAnimBuffer = new uint8[4096];
 	memset(_spellAnimBuffer, 0, 4096);
@@ -426,7 +426,7 @@ Common::Error EobCoreEngine::init() {
 	return Common::kNoError;
 }
 
-Common::Error EobCoreEngine::go() {
+Common::Error EoBCoreEngine::go() {
 	_txt->removePageBreakFlag();
 	_screen->loadPalette("palette.col", _screen->getPalette(0));
 	_screen->setScreenPalette(_screen->getPalette(0));
@@ -482,12 +482,12 @@ Common::Error EobCoreEngine::go() {
 	return Common::kNoError;
 }
 
-void EobCoreEngine::registerDefaultSettings() {
+void EoBCoreEngine::registerDefaultSettings() {
 	KyraEngine_v1::registerDefaultSettings();
 	ConfMan.registerDefault("hpbargraphs", true);
 }
 
-void EobCoreEngine::readSettings() {
+void EoBCoreEngine::readSettings() {
 	_configHpBarGraphs = ConfMan.getBool("hpbargraphs");
 	_configSounds = ConfMan.getBool("sfx_mute") ? 0 : 1;
 	_configMusic = _configSounds ? 1 : 0;
@@ -496,7 +496,7 @@ void EobCoreEngine::readSettings() {
 		_sound->enableSFX(_configSounds);
 }
 
-void EobCoreEngine::writeSettings() {
+void EoBCoreEngine::writeSettings() {
 	ConfMan.setBool("hpbargraphs", _configHpBarGraphs);
 	ConfMan.setBool("sfx_mute", _configSounds == 0);
 
@@ -510,7 +510,7 @@ void EobCoreEngine::writeSettings() {
 	ConfMan.flushToDisk();
 }
 
-void EobCoreEngine::startupNew() {
+void EoBCoreEngine::startupNew() {
 	gui_setPlayFieldButtons();
 	_screen->_curPage = 0;
 	gui_drawPlayField(false);
@@ -521,7 +521,7 @@ void EobCoreEngine::startupNew() {
 	_updateCharNum = 0;
 }
 
-void EobCoreEngine::runLoop() {
+void EoBCoreEngine::runLoop() {
 	_envAudioTimer = _system->getMillis() + (rollDice(1, 10, 3) * 18 * _tickLength);
 	_flashShapeTimer = 0;
 	_drawSceneTimer = _system->getMillis();
@@ -556,7 +556,7 @@ void EobCoreEngine::runLoop() {
 	}
 }
 
-bool EobCoreEngine::checkPartyStatus(bool handleDeath) {
+bool EoBCoreEngine::checkPartyStatus(bool handleDeath) {
 	int numChars = 0;
 	for (int i = 0; i < 6; i++)
 		numChars += testCharacter(i, 13);
@@ -582,7 +582,7 @@ bool EobCoreEngine::checkPartyStatus(bool handleDeath) {
 	return false;
 }
 
-void EobCoreEngine::loadItemsAndDecorationsShapes() {
+void EoBCoreEngine::loadItemsAndDecorationsShapes() {
 	releaseItemsAndDecorationsShapes();
 	_screen->setCurPage(2);
 
@@ -653,7 +653,7 @@ void EobCoreEngine::loadItemsAndDecorationsShapes() {
 	}
 }
 
-void EobCoreEngine::releaseItemsAndDecorationsShapes() {
+void EoBCoreEngine::releaseItemsAndDecorationsShapes() {
 	if (_largeItemShapes) {
 		for (int i = 0; i < _numLargeItemShapes; i++) {
 			if (_largeItemShapes[i])
@@ -745,7 +745,7 @@ void EobCoreEngine::releaseItemsAndDecorationsShapes() {
 	delete[] _lightningColumnShape;
 }
 
-void EobCoreEngine::setHandItem(Item itemIndex) {
+void EoBCoreEngine::setHandItem(Item itemIndex) {
 	if (itemIndex == -1)
 		return;
 
@@ -771,13 +771,13 @@ void EobCoreEngine::setHandItem(Item itemIndex) {
 	_screen->setMouseCursor(mouseOffs, mouseOffs, shp);
 }
 
-int EobCoreEngine::getDexterityArmorClassModifier(int dexterity) {
+int EoBCoreEngine::getDexterityArmorClassModifier(int dexterity) {
 	static const int8 mod[] = { 5, 5, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, -1, -2, -3, -4, -4, -5, -5, -5, -6, -6 };
 	return mod[dexterity];
 }
 
-int EobCoreEngine::generateCharacterHitpointsByLevel(int charIndex, int levelIndex) {
-	EobCharacter *c = &_characters[charIndex];
+int EoBCoreEngine::generateCharacterHitpointsByLevel(int charIndex, int levelIndex) {
+	EoBCharacter *c = &_characters[charIndex];
 	int m = getClassAndConstHitpointsModifier(c->cClass, c->constitutionCur);
 
 	int h = 0;
@@ -804,7 +804,7 @@ int EobCoreEngine::generateCharacterHitpointsByLevel(int charIndex, int levelInd
 	return h;
 }
 
-int EobCoreEngine::getClassAndConstHitpointsModifier(int cclass, int constitution) {
+int EoBCoreEngine::getClassAndConstHitpointsModifier(int cclass, int constitution) {
 	int res = _hpConstModifiers[constitution];
 	// This also applies to EOB1 despite being coded differently there
 	if (res <= 2 || (_classModifierFlags[cclass] & 0x31))
@@ -813,11 +813,11 @@ int EobCoreEngine::getClassAndConstHitpointsModifier(int cclass, int constitutio
 	return 2;
 }
 
-int EobCoreEngine::getCharacterClassType(int cclass, int levelIndex) {
+int EoBCoreEngine::getCharacterClassType(int cclass, int levelIndex) {
 	return _characterClassType[cclass * 3 + levelIndex];
 }
 
-int EobCoreEngine::getModifiedHpLimits(int hpModifier, int constModifier, int level, bool mode) {
+int EoBCoreEngine::getModifiedHpLimits(int hpModifier, int constModifier, int level, bool mode) {
 	int s = _hpIncrPerLevel[6 + hpModifier] > level ? level : _hpIncrPerLevel[6 + hpModifier];
 	int res = s;
 
@@ -835,7 +835,7 @@ int EobCoreEngine::getModifiedHpLimits(int hpModifier, int constModifier, int le
 	return res;
 }
 
-Common::String EobCoreEngine::getCharStrength(int str, int strExt) {
+Common::String EoBCoreEngine::getCharStrength(int str, int strExt) {
 	if (strExt) {
 		if (strExt == 100)
 			strExt = 0;
@@ -847,11 +847,11 @@ Common::String EobCoreEngine::getCharStrength(int str, int strExt) {
 	return _strenghtStr;
 }
 
-int EobCoreEngine::testCharacter(int index, int flags) {
+int EoBCoreEngine::testCharacter(int index, int flags) {
 	if (index == -1)
 		return 0;
 
-	EobCharacter *c = &_characters[index];
+	EoBCharacter *c = &_characters[index];
 	int res = 1;
 
 	if (flags & 1)
@@ -878,7 +878,7 @@ int EobCoreEngine::testCharacter(int index, int flags) {
 	return res;
 }
 
-int EobCoreEngine::getNextValidCharIndex(int curCharIndex, int searchStep) {
+int EoBCoreEngine::getNextValidCharIndex(int curCharIndex, int searchStep) {
 	do {
 		curCharIndex += searchStep;
 		if (curCharIndex < 0)
@@ -890,8 +890,8 @@ int EobCoreEngine::getNextValidCharIndex(int curCharIndex, int searchStep) {
 	return curCharIndex;
 }
 
-void EobCoreEngine::recalcArmorClass(int index) {
-	EobCharacter *c = &_characters[index];
+void EoBCoreEngine::recalcArmorClass(int index) {
+	EoBCharacter *c = &_characters[index];
 	int acm = getDexterityArmorClassModifier(c->dexterityCur);
 	c->armorClass = 10 + acm;
 
@@ -958,8 +958,8 @@ void EobCoreEngine::recalcArmorClass(int index) {
 		c->armorClass = -10;
 }
 
-int EobCoreEngine::validateWeaponSlotItem(int index, int slot) {
-	EobCharacter *c = &_characters[index];
+int EoBCoreEngine::validateWeaponSlotItem(int index, int slot) {
+	EoBCharacter *c = &_characters[index];
 	int itm1 = c->inventory[0];
 	int r = itemUsableByCharacter(index, itm1);
 	int tp1 = _items[itm1].type;
@@ -987,7 +987,7 @@ int EobCoreEngine::validateWeaponSlotItem(int index, int slot) {
 	return r;
 }
 
-int EobCoreEngine::getClericPaladinLevel(int index) {
+int EoBCoreEngine::getClericPaladinLevel(int index) {
 	if (_castScrollSlot)
 		return 9;
 
@@ -1007,7 +1007,7 @@ int EobCoreEngine::getClericPaladinLevel(int index) {
 	return 1;
 }
 
-int EobCoreEngine::getMageLevel(int index) {
+int EoBCoreEngine::getMageLevel(int index) {
 	if (_castScrollSlot)
 		return 9;
 
@@ -1018,7 +1018,7 @@ int EobCoreEngine::getMageLevel(int index) {
 	return (l > -1) ? _characters[index].level[l] : 1;
 }
 
-int EobCoreEngine::getCharacterLevelIndex(int type, int cClass) {
+int EoBCoreEngine::getCharacterLevelIndex(int type, int cClass) {
 	if (getCharacterClassType(cClass, 0) == type)
 		return 0;
 
@@ -1031,7 +1031,7 @@ int EobCoreEngine::getCharacterLevelIndex(int type, int cClass) {
 	return -1;
 }
 
-int EobCoreEngine::countCharactersWithSpecificItems(int16 itemType, int16 itemValue) {
+int EoBCoreEngine::countCharactersWithSpecificItems(int16 itemType, int16 itemValue) {
 	int res = 0;
 	for (int i = 0; i < 6; i++) {
 		if (!testCharacter(i, 1))
@@ -1042,7 +1042,7 @@ int EobCoreEngine::countCharactersWithSpecificItems(int16 itemType, int16 itemVa
 	return res;
 }
 
-int EobCoreEngine::checkInventoryForItem(int character, int16 itemType, int16 itemValue) {
+int EoBCoreEngine::checkInventoryForItem(int character, int16 itemType, int16 itemValue) {
 	for (int i = 0; i < 27; i++) {
 		uint16 inv = _characters[character].inventory[i];
 		if (!inv)
@@ -1055,11 +1055,11 @@ int EobCoreEngine::checkInventoryForItem(int character, int16 itemType, int16 it
 	return -1;
 }
 
-void EobCoreEngine::modifyCharacterHitpoints(int character, int16 points) {
+void EoBCoreEngine::modifyCharacterHitpoints(int character, int16 points) {
 	if (!testCharacter(character, 3))
 		return;
 
-	EobCharacter *c = &_characters[character];
+	EoBCharacter *c = &_characters[character];
 	c->hitPointsCur += points;
 	if (c->hitPointsCur > c->hitPointsMax)
 		c->hitPointsCur = c->hitPointsMax;
@@ -1068,14 +1068,14 @@ void EobCoreEngine::modifyCharacterHitpoints(int character, int16 points) {
 	gui_drawCharPortraitWithStats(character);
 }
 
-void EobCoreEngine::neutralizePoison(int character) {
+void EoBCoreEngine::neutralizePoison(int character) {
 	_characters[character].flags &= ~2;
 	_characters[character].effectFlags &= ~0x2000;
 	deleteCharEventTimer(character, -34);
 	gui_drawCharPortraitWithStats(character);
 }
 
-void EobCoreEngine::npcSequence(int npcIndex) {
+void EoBCoreEngine::npcSequence(int npcIndex) {
 	_screen->loadShapeSetBitmap("OUTTAKE", 5, 3);
 	_screen->copyRegion(0, 0, 0, 0, 176, 120, 0, 6, Screen::CR_NO_P_CHECK);
 
@@ -1095,8 +1095,8 @@ void EobCoreEngine::npcSequence(int npcIndex) {
 	gui_restorePlayField();
 }
 
-void EobCoreEngine::initNpc(int npcIndex) {
-	EobCharacter *c = _characters;
+void EoBCoreEngine::initNpc(int npcIndex) {
+	EoBCharacter *c = _characters;
 	int i = 0;
 	for (; i < 6; i++) {
 		if (!(_characters[i].flags & 1)) {
@@ -1106,7 +1106,7 @@ void EobCoreEngine::initNpc(int npcIndex) {
 	}
 
 	delete[] c->faceShape;
-	memcpy(c, &_npcPreset[npcIndex], sizeof(EobCharacter));
+	memcpy(c, &_npcPreset[npcIndex], sizeof(EoBCharacter));
 	recalcArmorClass(i);
 
 	for (i = 0; i < 25; i++) {
@@ -1121,7 +1121,7 @@ void EobCoreEngine::initNpc(int npcIndex) {
 	_screen->_curPage = 0;
 }
 
-int EobCoreEngine::npcJoinDialogue(int npcIndex, int queryJoinTextId, int confirmJoinTextId, int noJoinTextId) {
+int EoBCoreEngine::npcJoinDialogue(int npcIndex, int queryJoinTextId, int confirmJoinTextId, int noJoinTextId) {
 	gui_drawDialogueBox();
 	_txt->printDialogueText(queryJoinTextId, 0);
 
@@ -1144,7 +1144,7 @@ int EobCoreEngine::npcJoinDialogue(int npcIndex, int queryJoinTextId, int confir
 	return r ^ 1;
 }
 
-int EobCoreEngine::prepareForNewPartyMember(int16 itemType, int16 itemValue) {
+int EoBCoreEngine::prepareForNewPartyMember(int16 itemType, int16 itemValue) {
 	int numChars = 0;
 	for (int i = 0; i < 6; i++)
 		numChars += (_characters[i].flags & 1);
@@ -1167,7 +1167,7 @@ int EobCoreEngine::prepareForNewPartyMember(int16 itemType, int16 itemValue) {
 	return 1;
 }
 
-void EobCoreEngine::dropCharacter(int charIndex) {
+void EoBCoreEngine::dropCharacter(int charIndex) {
 	if (!testCharacter(charIndex, 1))
 		return;
 
@@ -1181,8 +1181,8 @@ void EobCoreEngine::dropCharacter(int charIndex) {
 	setupCharacterTimers();
 }
 
-void EobCoreEngine::removeCharacterFromParty(int charIndex) {
-	EobCharacter *c = &_characters[charIndex];
+void EoBCoreEngine::removeCharacterFromParty(int charIndex) {
+	EoBCharacter *c = &_characters[charIndex];
 	c->flags = 0;
 
 	for (int i = 0; i < 27; i++) {
@@ -1204,14 +1204,14 @@ void EobCoreEngine::removeCharacterFromParty(int charIndex) {
 	setupCharacterTimers();
 }
 
-void EobCoreEngine::exchangeCharacters(int charIndex1, int charIndex2) {
-	EobCharacter temp;
-	memcpy(&temp, &_characters[charIndex1], sizeof(EobCharacter));
-	memcpy(&_characters[charIndex1], &_characters[charIndex2], sizeof(EobCharacter));
-	memcpy(&_characters[charIndex2], &temp, sizeof(EobCharacter));
+void EoBCoreEngine::exchangeCharacters(int charIndex1, int charIndex2) {
+	EoBCharacter temp;
+	memcpy(&temp, &_characters[charIndex1], sizeof(EoBCharacter));
+	memcpy(&_characters[charIndex1], &_characters[charIndex2], sizeof(EoBCharacter));
+	memcpy(&_characters[charIndex2], &temp, sizeof(EoBCharacter));
 }
 
-void EobCoreEngine::increasePartyExperience(int16 points) {
+void EoBCoreEngine::increasePartyExperience(int16 points) {
 	int cnt = 0;
 	for (int i = 0; i < 6; i++) {
 		if (testCharacter(i, 3))
@@ -1230,7 +1230,7 @@ void EobCoreEngine::increasePartyExperience(int16 points) {
 	}
 }
 
-void EobCoreEngine::increaseCharacterExperience(int charIndex, int32 points) {
+void EoBCoreEngine::increaseCharacterExperience(int charIndex, int32 points) {
 	int cl = _characters[charIndex].cClass;
 	points /= _numLevelsPerClass[cl];
 
@@ -1248,7 +1248,7 @@ void EobCoreEngine::increaseCharacterExperience(int charIndex, int32 points) {
 	}
 }
 
-uint32 EobCoreEngine::getRequiredExperience(int cClass, int levelIndex, int level) {
+uint32 EoBCoreEngine::getRequiredExperience(int cClass, int levelIndex, int level) {
 	cClass = getCharacterClassType(cClass, levelIndex);
 	if (cClass == -1)
 		return 0xffffffff;
@@ -1257,7 +1257,7 @@ uint32 EobCoreEngine::getRequiredExperience(int cClass, int levelIndex, int leve
 	return tbl[level - 1];
 }
 
-void EobCoreEngine::increaseCharacterLevel(int charIndex, int levelIndex) {
+void EoBCoreEngine::increaseCharacterLevel(int charIndex, int levelIndex) {
 	_characters[charIndex].level[levelIndex]++;
 	int hpInc = generateCharacterHitpointsByLevel(charIndex, 1 << levelIndex);
 	_characters[charIndex].hitPointsCur += hpInc;
@@ -1268,7 +1268,7 @@ void EobCoreEngine::increaseCharacterLevel(int charIndex, int levelIndex) {
 	snd_playSoundEffect(23);
 }
 
-void EobCoreEngine::setWeaponSlotStatus(int charIndex, int mode, int slot) {
+void EoBCoreEngine::setWeaponSlotStatus(int charIndex, int mode, int slot) {
 	if (mode == 0 || mode == 2)
 		_characters[charIndex].disabledSlots ^= (1 << slot);
 	else if (mode != 1)
@@ -1278,7 +1278,7 @@ void EobCoreEngine::setWeaponSlotStatus(int charIndex, int mode, int slot) {
 	gui_drawCharPortraitWithStats(charIndex);
 }
 
-void EobCoreEngine::setupDialogueButtons(int presetfirst, int numStr, va_list &args) {
+void EoBCoreEngine::setupDialogueButtons(int presetfirst, int numStr, va_list &args) {
 	_dialogueNumButtons = numStr;
 	_dialogueHighlightedButton = 0;
 
@@ -1306,7 +1306,7 @@ void EobCoreEngine::setupDialogueButtons(int presetfirst, int numStr, va_list &a
 		removeInputTop();
 }
 
-void EobCoreEngine::initDialogueSequence() {
+void EoBCoreEngine::initDialogueSequence() {
 	_npcSequenceSub = -1;
 	_txt->setWaitButtonMode(0);
 	_dialogueField = true;
@@ -1324,7 +1324,7 @@ void EobCoreEngine::initDialogueSequence() {
 	delete s;
 }
 
-void EobCoreEngine::restoreAfterDialogueSequence() {
+void EoBCoreEngine::restoreAfterDialogueSequence() {
 	_txt->allowPageBreak(false);
 	_dialogueField = false;
 
@@ -1340,7 +1340,7 @@ void EobCoreEngine::restoreAfterDialogueSequence() {
 	_sceneUpdateRequired = true;
 }
 
-void EobCoreEngine::drawSequenceBitmap(const char *file, int destRect, int x1, int y1, int flags) {
+void EoBCoreEngine::drawSequenceBitmap(const char *file, int destRect, int x1, int y1, int flags) {
 	static const uint8 frameX[] = { 1, 0 };
 	static const uint8 frameY[] = { 8, 0 };
 	static const uint8 frameW[] = { 20, 40 };
@@ -1351,7 +1351,7 @@ void EobCoreEngine::drawSequenceBitmap(const char *file, int destRect, int x1, i
 	if (scumm_stricmp(_dialogueLastBitmap, file)) {
 		if (!destRect) {
 			if (!(flags & 1)) {
-				_screen->loadEobBitmap("BORDER", 0, 3, 3, 2);
+				_screen->loadEoBBitmap("BORDER", 0, 3, 3, 2);
 				_screen->copyRegion(0, 0, 0, 0, 184, 121, 2, page, Screen::CR_NO_P_CHECK);
 			} else {
 				_screen->copyRegion(0, 0, 0, 0, 184, 121, 0, page, Screen::CR_NO_P_CHECK);
@@ -1361,7 +1361,7 @@ void EobCoreEngine::drawSequenceBitmap(const char *file, int destRect, int x1, i
 				_screen->copyRegion(0, 0, 0, 0, 184, 121, 2, 6, Screen::CR_NO_P_CHECK);
 		}
 
-		_screen->loadEobBitmap(file, 0, 3, 3, 2);
+		_screen->loadEoBBitmap(file, 0, 3, 3, 2);
 		strcpy(_dialogueLastBitmap, file);
 	}
 
@@ -1376,7 +1376,7 @@ void EobCoreEngine::drawSequenceBitmap(const char *file, int destRect, int x1, i
 	_screen->updateScreen();
 }
 
-int EobCoreEngine::runDialogue(int dialogueTextId, int numStr, ...) {
+int EoBCoreEngine::runDialogue(int dialogueTextId, int numStr, ...) {
 	if (dialogueTextId != -1)
 		txt()->printDialogueText(dialogueTextId, 0);
 
@@ -1397,7 +1397,7 @@ int EobCoreEngine::runDialogue(int dialogueTextId, int numStr, ...) {
 	return res;
 }
 
-void EobCoreEngine::restParty_displayWarning(const char *str) {
+void EoBCoreEngine::restParty_displayWarning(const char *str) {
 	int od = _screen->curDimIndex();
 	_screen->setScreenDim(7);
 	Screen::FontId of = _screen->setFont(Screen::FID_6_FNT);
@@ -1409,7 +1409,7 @@ void EobCoreEngine::restParty_displayWarning(const char *str) {
 	_screen->setScreenDim(od);
 }
 
-bool EobCoreEngine::restParty_updateMonsters() {
+bool EoBCoreEngine::restParty_updateMonsters() {
 	bool sfxEnabled = _sound->sfxEnabled();
 	bool musicEnabled = _sound->musicEnabled();
 	_sound->enableSFX(false);
@@ -1445,7 +1445,7 @@ bool EobCoreEngine::restParty_updateMonsters() {
 	return false;
 }
 
-int EobCoreEngine::restParty_getCharacterWithLowestHp() {
+int EoBCoreEngine::restParty_getCharacterWithLowestHp() {
 	int lhp = 900;
 	int res = -1;
 
@@ -1463,7 +1463,7 @@ int EobCoreEngine::restParty_getCharacterWithLowestHp() {
 	return res + 1;
 }
 
-bool EobCoreEngine::restParty_checkHealSpells(int charIndex) {
+bool EoBCoreEngine::restParty_checkHealSpells(int charIndex) {
 	static const uint8 eob1healSpells[] = { 2, 15, 20 };
 	static const uint8 eob2healSpells[] = { 3, 16, 20 };
 	const uint8 *spells = _flags.gameID == GI_EOB1 ? eob1healSpells : eob2healSpells;
@@ -1478,7 +1478,7 @@ bool EobCoreEngine::restParty_checkHealSpells(int charIndex) {
 	return false;
 }
 
-bool EobCoreEngine::restParty_checkSpellsToLearn() {
+bool EoBCoreEngine::restParty_checkSpellsToLearn() {
 	for (int i = 0; i < 6; i++) {
 		if (!testCharacter(i, 0x43))
 			continue;
@@ -1501,11 +1501,11 @@ bool EobCoreEngine::restParty_checkSpellsToLearn() {
 	return false;
 }
 
-bool EobCoreEngine::restParty_extraAbortCondition() {
+bool EoBCoreEngine::restParty_extraAbortCondition() {
 	return false;
 }
 
-void EobCoreEngine::delay(uint32 millis, bool, bool) {
+void EoBCoreEngine::delay(uint32 millis, bool, bool) {
 	while (millis && !shouldQuit() && !(_allowSkip && skipFlag())) {
 		updateInput();
 		uint32 step = MIN<uint32>(millis, (_tickLength / 5));
@@ -1514,7 +1514,7 @@ void EobCoreEngine::delay(uint32 millis, bool, bool) {
 	}
 }
 
-void EobCoreEngine::displayParchment(int id) {
+void EoBCoreEngine::displayParchment(int id) {
 	_txt->setWaitButtonMode(1);
 	_txt->resetPageBreakString();
 	gui_updateControls();
@@ -1549,7 +1549,7 @@ void EobCoreEngine::displayParchment(int id) {
 	restoreAfterDialogueSequence();
 }
 
-int EobCoreEngine::countResurrectionCandidates() {
+int EoBCoreEngine::countResurrectionCandidates() {
 	_rrCount = 0;
 	memset(_rrNames, 0, 10 * sizeof(const char*));
 
@@ -1590,7 +1590,7 @@ int EobCoreEngine::countResurrectionCandidates() {
 	return _rrCount;
 }
 
-void EobCoreEngine::seq_portal() {
+void EoBCoreEngine::seq_portal() {
 	uint8 *shapes1[5];
 	uint8 *shapes2[5];
 	uint8 *shapes3[5];
@@ -1605,7 +1605,7 @@ void EobCoreEngine::seq_portal() {
 	}
 
 	shape0 = _screen->encodeShape(30, 0, 8, 77);
-	_screen->loadEobBitmap("PORTALB", 0, 5, 3, 2);
+	_screen->loadEoBBitmap("PORTALB", 0, 5, 3, 2);
 
 	snd_playSoundEffect(33);
 	snd_playSoundEffect(19);
@@ -1659,7 +1659,7 @@ void EobCoreEngine::seq_portal() {
 	}
 }
 
-bool EobCoreEngine::checkPassword() {
+bool EoBCoreEngine::checkPassword() {
 	char answ[20];
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
 	_screen->copyPage(0, 10);
@@ -1693,8 +1693,8 @@ bool EobCoreEngine::checkPassword() {
 	return true;
 }
 
-void EobCoreEngine::useSlotWeapon(int charIndex, int slotIndex, Item item) {
-	EobCharacter *c = &_characters[charIndex];
+void EoBCoreEngine::useSlotWeapon(int charIndex, int slotIndex, Item item) {
+	EoBCharacter *c = &_characters[charIndex];
 	int tp = item ? _items[item].type : 0;
 
 	if (c->effectFlags & 0x40)
@@ -1734,7 +1734,7 @@ void EobCoreEngine::useSlotWeapon(int charIndex, int slotIndex, Item item) {
 	setCharEventTimer(charIndex, 18, inflict >= -2 ? slotIndex + 2 : slotIndex, 1);
 }
 
-int EobCoreEngine::closeDistanceAttack(int charIndex, Item item) {
+int EoBCoreEngine::closeDistanceAttack(int charIndex, Item item) {
 	if (charIndex > 1)
 		return -3;
 
@@ -1784,7 +1784,7 @@ int EobCoreEngine::closeDistanceAttack(int charIndex, Item item) {
 	return 0;
 }
 
-int EobCoreEngine::thrownAttack(int charIndex, int slotIndex, Item item) {
+int EoBCoreEngine::thrownAttack(int charIndex, int slotIndex, Item item) {
 	int d = charIndex > 3 ? charIndex - 2 : charIndex;
 	if (!launchObject(charIndex, item, _currentBlock, _dropItemDirIndex[(_currentDirection << 2) + d], _currentDirection, _items[item].type))
 		return 0;
@@ -1796,7 +1796,7 @@ int EobCoreEngine::thrownAttack(int charIndex, int slotIndex, Item item) {
 	return 0;
 }
 
-int EobCoreEngine::projectileWeaponAttack(int charIndex, Item item) {
+int EoBCoreEngine::projectileWeaponAttack(int charIndex, Item item) {
 	int tp = _items[item].type;
 
 	if (_flags.gameID == GI_EOB1)
@@ -1839,7 +1839,7 @@ int EobCoreEngine::projectileWeaponAttack(int charIndex, Item item) {
 	return 0;
 }
 
-void EobCoreEngine::inflictMonsterDamage(EobMonsterInPlay *m, int damage, bool giveExperience) {
+void EoBCoreEngine::inflictMonsterDamage(EoBMonsterInPlay *m, int damage, bool giveExperience) {
 	m->hitPointsCur -= damage;
 	m->flags = (m->flags & 0xf7) | 1;
 
@@ -1862,21 +1862,21 @@ void EobCoreEngine::inflictMonsterDamage(EobMonsterInPlay *m, int damage, bool g
 		m->dest = _currentBlock;
 }
 
-void EobCoreEngine::calcAndInflictMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect) {
+void EoBCoreEngine::calcAndInflictMonsterDamage(EoBMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect) {
 	int dmg = calcMonsterDamage(m, times, pips, offs, flags, savingThrowType, savingThrowEffect);
 	if (dmg > 0)
 		inflictMonsterDamage(m, dmg, flags & 0x800 ? true : false);
 }
 
-void EobCoreEngine::calcAndInflictCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int savingThrowEffect) {
+void EoBCoreEngine::calcAndInflictCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int savingThrowEffect) {
 	int dmg = calcCharacterDamage(charIndex, times, itemOrPips, useStrModifierOrBase, flags, savingThrowType, savingThrowEffect);
 	if (dmg)
 		inflictCharacterDamage(charIndex, dmg);
 }
 
-int EobCoreEngine::calcCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int savingThrowEffect) {
+int EoBCoreEngine::calcCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int savingThrowEffect) {
 	int s = (flags & 0x100) ? calcDamageModifers(times, 0, itemOrPips, _items[itemOrPips].type, useStrModifierOrBase) : rollDice(times, itemOrPips, useStrModifierOrBase);
-	EobCharacter *c = &_characters[charIndex];
+	EoBCharacter *c = &_characters[charIndex];
 
 	if (savingThrowType != 5) {
 		if (trySavingThrow(c, _charClassModifier[c->cClass], c->level[0], savingThrowType, c->raceSex >> 1 /*fix bug in original code by adding a right shift*/))
@@ -1903,8 +1903,8 @@ int EobCoreEngine::calcCharacterDamage(int charIndex, int times, int itemOrPips,
 	return s;
 }
 
-void EobCoreEngine::inflictCharacterDamage(int charIndex, int damage) {
-	EobCharacter *c = &_characters[charIndex];
+void EoBCoreEngine::inflictCharacterDamage(int charIndex, int damage) {
+	EoBCharacter *c = &_characters[charIndex];
 	if (!testCharacter(charIndex, 3))
 		return;
 
@@ -1943,7 +1943,7 @@ void EobCoreEngine::inflictCharacterDamage(int charIndex, int damage) {
 	setCharEventTimer(charIndex, 18, 6, 1);
 }
 
-bool EobCoreEngine::characterAttackHitTest(int charIndex, int monsterIndex, int item, int attackType) {
+bool EoBCoreEngine::characterAttackHitTest(int charIndex, int monsterIndex, int item, int attackType) {
 	if (charIndex < 0)
 		return true;
 
@@ -1983,9 +1983,9 @@ bool EobCoreEngine::characterAttackHitTest(int charIndex, int monsterIndex, int
 	return s < m ? false : true;
 }
 
-bool EobCoreEngine::monsterAttackHitTest(EobMonsterInPlay *m, int charIndex) {
+bool EoBCoreEngine::monsterAttackHitTest(EoBMonsterInPlay *m, int charIndex) {
 	int tp = m->type;
-	EobMonsterProperty *p = &_monsterProps[tp];
+	EoBMonsterProperty *p = &_monsterProps[tp];
 
 	int r = rollDice(1, 20);
 	if (r != 20) {
@@ -2003,7 +2003,7 @@ bool EobCoreEngine::monsterAttackHitTest(EobMonsterInPlay *m, int charIndex) {
 	return ((r == 20) || (r >= (p->hitChance - _characters[charIndex].armorClass)));
 }
 
-bool EobCoreEngine::flyingObjectMonsterHit(EobFlyingObject *fo, int monsterIndex) {
+bool EoBCoreEngine::flyingObjectMonsterHit(EoBFlyingObject *fo, int monsterIndex) {
 	if (fo->attackerId != -1) {
 		if (!characterAttackHitTest(fo->attackerId, monsterIndex, fo->item, 0))
 			return false;
@@ -2012,7 +2012,7 @@ bool EobCoreEngine::flyingObjectMonsterHit(EobFlyingObject *fo, int monsterIndex
 	return true;
 }
 
-bool EobCoreEngine::flyingObjectPartyHit(EobFlyingObject *fo) {
+bool EoBCoreEngine::flyingObjectPartyHit(EoBFlyingObject *fo) {
 	int ps = _dscItemPosIndex[(_currentDirection << 2) + (_items[fo->item].pos & 3)];
 	bool res = false;
 
@@ -2037,7 +2037,7 @@ bool EobCoreEngine::flyingObjectPartyHit(EobFlyingObject *fo) {
 	return res;
 }
 
-void EobCoreEngine::monsterCloseAttack(EobMonsterInPlay *m) {
+void EoBCoreEngine::monsterCloseAttack(EoBMonsterInPlay *m) {
 	int first = _monsterCloseAttDstTable1[(_currentDirection << 2) + m->dir] * 12;
 	int v = (m->pos == 4) ? rollDice(1, 2, -1) : _monsterCloseAttChkTable2[(m->dir << 2) + m->pos];
 	if (!v)
@@ -2104,13 +2104,13 @@ void EobCoreEngine::monsterCloseAttack(EobMonsterInPlay *m) {
 	}
 }
 
-void EobCoreEngine::monsterSpellCast(EobMonsterInPlay *m, int type) {
+void EoBCoreEngine::monsterSpellCast(EoBMonsterInPlay *m, int type) {
 	launchMagicObject(-1, type, m->block, m->pos, m->dir);
 	snd_processEnvironmentalSoundEffect(_spells[_magicFlightObjectProperties[type << 2]].sound, m->block);
 }
 
-void EobCoreEngine::statusAttack(int charIndex, int attackStatusFlags, const char *attackStatusString, int savingThrowType, uint32 effectDuration, int restoreEvent, int noRefresh) {
-	EobCharacter *c = &_characters[charIndex];
+void EoBCoreEngine::statusAttack(int charIndex, int attackStatusFlags, const char *attackStatusString, int savingThrowType, uint32 effectDuration, int restoreEvent, int noRefresh) {
+	EoBCharacter *c = &_characters[charIndex];
 	if ((c->flags & attackStatusFlags) && noRefresh)
 		return;
 	if (!testCharacter(charIndex, 3))
@@ -2138,9 +2138,9 @@ void EobCoreEngine::statusAttack(int charIndex, int attackStatusFlags, const cha
 	_txt->printMessage(_characterStatusStrings13[0], -1, c->name, attackStatusString);
 }
 
-int EobCoreEngine::calcMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect) {
+int EoBCoreEngine::calcMonsterDamage(EoBMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect) {
 	int s = flags & 0x100 ? calcDamageModifers(times, m, pips, _items[pips].type, offs) : rollDice(times, pips, offs);
-	EobMonsterProperty *p = &_monsterProps[m->type];
+	EoBMonsterProperty *p = &_monsterProps[m->type];
 
 	if (savingThrowType != 5) {
 		if (trySavingThrow(m, 0, p->level, savingThrowType, 6))
@@ -2188,10 +2188,10 @@ int EobCoreEngine::calcMonsterDamage(EobMonsterInPlay *m, int times, int pips, i
 	return s;
 }
 
-int EobCoreEngine::calcDamageModifers(int charIndex, EobMonsterInPlay *m, int item, int itemType, int useStrModifier) {
+int EoBCoreEngine::calcDamageModifers(int charIndex, EoBMonsterInPlay *m, int item, int itemType, int useStrModifier) {
 	int s = (useStrModifier && (charIndex != -1)) ? getStrDamageModifier(charIndex) : 0;
 	if (item) {
-		EobItemType *p = &_itemTypes[itemType];
+		EoBItemType *p = &_itemTypes[itemType];
 		int t = m ? m->type : 0;
 		s += ((m && (_monsterProps[t].capsFlags & 1)) ?	rollDice(p->dmgNumDiceL, p->dmgNumPipsL, p->dmgIncS /* bug in original code ? */) :
 			rollDice(p->dmgNumDiceS, p->dmgNumPipsS, p->dmgIncS));
@@ -2203,7 +2203,7 @@ int EobCoreEngine::calcDamageModifers(int charIndex, EobMonsterInPlay *m, int it
 	return (s < 0) ? 0 : s;
 }
 
-bool EobCoreEngine::trySavingThrow(void *target, int hpModifier, int level, int type, int race) {
+bool EoBCoreEngine::trySavingThrow(void *target, int hpModifier, int level, int type, int race) {
 	static const int8 constMod[] = { 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5 };
 
 	if (type == 5)
@@ -2211,18 +2211,18 @@ bool EobCoreEngine::trySavingThrow(void *target, int hpModifier, int level, int
 
 	int s = getSaveThrowModifier(hpModifier, level, type);
 	if (((race == 3 || race == 5) && (type == 4 || type == 1 || type == 0)) || (race == 4 && (type == 4 || type == 1))) {
-		EobCharacter *c = (EobCharacter*)target;
+		EoBCharacter *c = (EoBCharacter*)target;
 		s -= constMod[c->constitutionCur];
 	}
 
 	return rollDice(1, 20) < s ? false : true;
 }
 
-bool EobCoreEngine::specialAttackSavingThrow(int charIndex, int type) {
+bool EoBCoreEngine::specialAttackSavingThrow(int charIndex, int type) {
 	return trySavingThrow(&_characters[charIndex], _charClassModifier[_characters[charIndex].cClass], _characters[charIndex].level[0], type, _characters[charIndex].raceSex >> 1);
 }
 
-int EobCoreEngine::getSaveThrowModifier(int hpModifier, int level, int type) {
+int EoBCoreEngine::getSaveThrowModifier(int hpModifier, int level, int type) {
 	const uint8 *tbl = _saveThrowTables[hpModifier];
 	if (_saveThrowLevelIndex[hpModifier] < level)
 		level = _saveThrowLevelIndex[hpModifier];
@@ -2232,12 +2232,12 @@ int EobCoreEngine::getSaveThrowModifier(int hpModifier, int level, int type) {
 	return tbl[level];
 }
 
-bool EobCoreEngine::calcDamageCheckItemType(int itemType) {
+bool EoBCoreEngine::calcDamageCheckItemType(int itemType) {
 	itemType = _itemTypes[itemType].extraProperties & 0x7f;
 	return (itemType == 2 || itemType == 3) ? true : false;
 }
 
-int EobCoreEngine::savingThrowReduceDamage(int savingThrowEffect, int damage) {
+int EoBCoreEngine::savingThrowReduceDamage(int savingThrowEffect, int damage) {
 	if (savingThrowEffect == 3)
 		return 0;
 
@@ -2247,11 +2247,11 @@ int EobCoreEngine::savingThrowReduceDamage(int savingThrowEffect, int damage) {
 	return damage;
 }
 
-bool EobCoreEngine::tryMonsterAttackEvasion(EobMonsterInPlay *m) {
+bool EoBCoreEngine::tryMonsterAttackEvasion(EoBMonsterInPlay *m) {
 	return rollDice(1, 100) < _monsterProps[m->type].dmgModifierEvade ? true : false;
 }
 
-int EobCoreEngine::getStrHitChanceModifier(int charIndex) {
+int EoBCoreEngine::getStrHitChanceModifier(int charIndex) {
 	static const int8 strExtLimit[] = { 1, 51, 76, 91, 100 };
 	static const int8 strExtMod[] = { 1, 2, 2, 2, 3 };
 	static const int8 strMod[] = { -4, -3, -3, -2, -2, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 3, 3, 4, 4, 5, 6, 7 };
@@ -2267,7 +2267,7 @@ int EobCoreEngine::getStrHitChanceModifier(int charIndex) {
 	return r;
 }
 
-int EobCoreEngine::getStrDamageModifier(int charIndex) {
+int EoBCoreEngine::getStrDamageModifier(int charIndex) {
 	static const int8 strExtLimit[] = { 1, 51, 76, 91, 100 };
 	static const int8 strExtMod[] = { 3, 3, 4, 5, 6 };
 	static const int8 strMod[] = { -3, -2, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 7, 8, 9, 10, 11, 12, 14 };
@@ -2283,12 +2283,12 @@ int EobCoreEngine::getStrDamageModifier(int charIndex) {
 	return r;
 }
 
-int EobCoreEngine::getDexHitChanceModifier(int charIndex) {
+int EoBCoreEngine::getDexHitChanceModifier(int charIndex) {
 	static const int8 dexMod[] = { -5, -4, -3, -2, -1, 0, 0, 0, 0, 0, 0, 1, 2, 2, 3, 3, 4, 4, 4 };
 	return dexMod[_characters[charIndex].dexterityCur - 1];
 }
 
-int EobCoreEngine::getMonsterAcHitChanceModifier(int charIndex, int monsterAc) {
+int EoBCoreEngine::getMonsterAcHitChanceModifier(int charIndex, int monsterAc) {
 	static const uint8 mod1[] = { 1, 3, 3, 2 };
 	static const uint8 mod2[] = { 1, 1, 2, 1 };
 
@@ -2298,7 +2298,7 @@ int EobCoreEngine::getMonsterAcHitChanceModifier(int charIndex, int monsterAc) {
 	return (20 - ((l / mod1[cm]) * mod2[cm])) - monsterAc;
 }
 
-void EobCoreEngine::explodeMonster(EobMonsterInPlay *m) {
+void EoBCoreEngine::explodeMonster(EoBMonsterInPlay *m) {
 	m->flags |= 2;
 	if (getBlockDistance(m->block, _currentBlock) < 2) {
 		explodeObject(0, _currentBlock, 2);
@@ -2310,14 +2310,14 @@ void EobCoreEngine::explodeMonster(EobMonsterInPlay *m) {
 	m->flags &= ~2;
 }
 
-void EobCoreEngine::snd_playSoundEffect(int id, int volume) {
+void EoBCoreEngine::snd_playSoundEffect(int id, int volume) {
 	if ((id < 1) || (_flags.gameID == GI_EOB2 && id > 119) || shouldQuit())
 		return;
 
 	_sound->playSoundEffect(id, volume);
 }
 
-void EobCoreEngine::snd_stopSound() {
+void EoBCoreEngine::snd_stopSound() {
 	_sound->playSoundEffect(0);
 }
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 3b1230830e..77a8198abd 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -31,7 +31,7 @@
 
 namespace Kyra {
 
-struct EobShapeDef {
+struct EoBShapeDef {
 	int16 index;
 	uint8 x, y, w, h;
 };
@@ -48,14 +48,14 @@ struct CreatePartyModButton {
 	uint8 destY;
 };
 
-struct EobRect8 {
+struct EoBRect8 {
 	uint8 x;
 	uint8 y;
 	uint8 w;
 	uint8 h;
 };
 
-struct EobChargenButtonDef {
+struct EoBChargenButtonDef {
 	uint8 x;
 	uint8 y;
 	uint8 w;
@@ -63,7 +63,7 @@ struct EobChargenButtonDef {
 	uint8 keyCode;
 };
 
-struct EobGuiButtonDef {
+struct EoBGuiButtonDef {
 	uint16 keyCode;
 	uint16 keyCode2;
 	uint16 flags;
@@ -74,7 +74,7 @@ struct EobGuiButtonDef {
 	uint16 arg;
 };
 
-struct EobCharacter {
+struct EoBCharacter {
 	uint8 id;
 	uint8 flags;
 	char name[11];
@@ -118,7 +118,7 @@ struct EobCharacter {
 	int8 slotStatus[5];
 };
 
-struct EobItem {
+struct EoBItem {
 	uint8 nameUnid;
 	uint8 nameId;
 	uint8 flags;
@@ -132,7 +132,7 @@ struct EobItem {
 	int8 value;
 };
 
-struct EobItemType {
+struct EoBItemType {
 	uint16 invFlags;
 	uint16 handFlags;
 	int8 armorClass;
@@ -154,7 +154,7 @@ struct SpriteDecoration {
 	int16 y;
 };
 
-struct EobMonsterProperty {
+struct EoBMonsterProperty {
 	int8 armorClass;
 	int8 hitChance;
 	int8 level;
@@ -187,7 +187,7 @@ struct EobMonsterProperty {
 	uint8 decorations[3];
 };
 
-struct EobMonsterInPlay {
+struct EoBMonsterInPlay {
 	uint8 type;
 	uint8 unit;
 	uint16 block;
@@ -220,14 +220,14 @@ struct ScriptTimer {
 	uint32 next;
 };
 
-struct EobMenuDef {
+struct EoBMenuDef {
 	int8 titleStrId;
 	uint8 dim;
 	uint8 firstButtonStrId;
 	int8 numButtons;
 	int8 titleCol;
 };
-struct EobMenuButtonDef {
+struct EoBMenuButtonDef {
 	int8 labelId;
 	int16 x;
 	int8 y;
@@ -237,17 +237,17 @@ struct EobMenuButtonDef {
 	int16 flags;
 };
 
-class EobInfProcessor;
+class EoBInfProcessor;
 
-class EobCoreEngine : public KyraRpgEngine {
+class EoBCoreEngine : public KyraRpgEngine {
 friend class TextDisplayer_rpg;
-friend class GUI_Eob;
-friend class EobInfProcessor;
+friend class GUI_EoB;
+friend class EoBInfProcessor;
 friend class DarkmoonSequenceHelper;
 friend class CharacterGenerator;
 public:
-	EobCoreEngine(OSystem *system, const GameFlags &flags);
-	virtual ~EobCoreEngine();
+	EoBCoreEngine(OSystem *system, const GameFlags &flags);
+	virtual ~EoBCoreEngine();
 
 	Screen *screen() { return _screen; }
 	GUI *gui() const { return _gui; }
@@ -397,7 +397,7 @@ protected:
 
 	void setWeaponSlotStatus(int charIndex, int mode, int slot);
 
-	EobCharacter *_characters;
+	EoBCharacter *_characters;
 	Common::String _strenghtStr;
 	int _castScrollSlot;
 	int _exchangeCharacterId;
@@ -410,7 +410,7 @@ protected:
 	const uint8 *_saveThrowModDiv;
 	const uint8 *_saveThrowModExt;
 
-	const EobCharacter *_npcPreset;
+	const EoBCharacter *_npcPreset;
 	int _npcSequenceSub;
 	bool _partyResting;
 	bool _loading;
@@ -420,7 +420,7 @@ protected:
 	Item duplicateItem(Item itemIndex);
 	void setItemPosition(Item *itemQueue, int block, Item item, int pos);
 	Item createItemOnCurrentBlock(Item itemIndex);
-	void createInventoryItem(EobCharacter *c, Item itemIndex, int16 itemValue, int preferedInventorySlot);
+	void createInventoryItem(EoBCharacter *c, Item itemIndex, int16 itemValue, int preferedInventorySlot);
 	int deleteInventoryItem(int charIndex, int slot);
 	void deleteBlockItem(uint16 block, int type);
 	int validateInventorySlotForItem(Item item, int charIndex, int slot);
@@ -439,17 +439,17 @@ protected:
 
 	bool launchObject(int charIndex, Item item, uint16 startBlock, int startPos, int dir, int type);
 	void launchMagicObject(int charIndex, int type, uint16 startBlock, int startPos, int dir);
-	bool updateObjectFlight(EobFlyingObject *fo, int block, int pos);
-	bool updateFlyingObjectHitTest(EobFlyingObject *fo, int block, int pos);
-	void explodeObject(EobFlyingObject *fo, int block, Item item);
-	void endObjectFlight(EobFlyingObject *fo);
+	bool updateObjectFlight(EoBFlyingObject *fo, int block, int pos);
+	bool updateFlyingObjectHitTest(EoBFlyingObject *fo, int block, int pos);
+	void explodeObject(EoBFlyingObject *fo, int block, Item item);
+	void endObjectFlight(EoBFlyingObject *fo);
 	void checkFlyingObjects();
 
 	void reloadWeaponSlot(int charIndex, int slotIndex, int itemType, int arrowOrDagger);
 
-	EobItem *_items;
+	EoBItem *_items;
 	uint16 _numItems;
-	EobItemType *_itemTypes;
+	EoBItemType *_itemTypes;
 	char **_itemNames;
 	uint16 _numItemNames;
 	uint32 _partyEffectFlags;
@@ -459,7 +459,7 @@ protected:
 	const int8 *_projectileWeaponAmmoTypes;
 	const uint8 *_wandTypes;
 
-	EobFlyingObject *_flyingObjects;
+	EoBFlyingObject *_flyingObjects;
 	const uint8 *_drawObjPosIndex;
 	const uint8 *_flightObjFlipIndex;
 	const int8 *_flightObjShpMap;
@@ -483,10 +483,10 @@ protected:
 	const uint8 *loadMonsterProperties(const uint8 *data);
 	const uint8 *loadActiveMonsterData(const uint8 *data, int level);
 	void initMonster(int index, int unit, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int i, int randItem, int fixedItem);
-	void placeMonster(EobMonsterInPlay *m, uint16 block, int dir);
+	void placeMonster(EoBMonsterInPlay *m, uint16 block, int dir);
 	virtual void replaceMonster(int b, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int h2, int randItem, int fixedItem) = 0;
-	void killMonster(EobMonsterInPlay *m, bool giveExperience);
-	virtual bool killMonsterExtra(EobMonsterInPlay *m);
+	void killMonster(EoBMonsterInPlay *m, bool giveExperience);
+	virtual bool killMonsterExtra(EoBMonsterInPlay *m);
 	int countSpecificMonsters(int type);
 	void updateAttackingMonsterFlags();
 
@@ -494,12 +494,12 @@ protected:
 	int getClosestMonster(int charIndex, int block);
 
 	bool blockHasMonsters(uint16 block);
-	bool isMonsterOnPos(EobMonsterInPlay *m, uint16 block, int pos, int checkPos4);
+	bool isMonsterOnPos(EoBMonsterInPlay *m, uint16 block, int pos, int checkPos4);
 	const int16 *findBlockMonsters(uint16 block, int pos, int dir, int blockDamage, int singleTargetCheckAdjacent);
 
 	void drawBlockObject(int flipped, int page, const uint8 *shape, int x, int y, int sd, uint8 *ovl = 0);
 	void drawMonsterShape(const uint8 *shape, int x, int y, int flipped, int flags, int palIndex);
-	void flashMonsterShape(EobMonsterInPlay *m);
+	void flashMonsterShape(EoBMonsterInPlay *m);
 	void updateAllMonsterShapes();
 	void drawBlockItems(int index);
 	void drawDoor(int index);
@@ -510,30 +510,30 @@ protected:
 	void drawTeleporter(int index);
 
 	void updateMonsters(int unit);
-	void updateMonsterDest(EobMonsterInPlay *m);
-	void updateMonsterAttackMode(EobMonsterInPlay *m);
+	void updateMonsterDest(EoBMonsterInPlay *m);
+	void updateMonsterAttackMode(EoBMonsterInPlay *m);
 	void updateAllMonsterDests();
 	void turnFriendlyMonstersHostile();
 	int getNextMonsterDirection(int curBlock, int destBlock);
-	int getNextMonsterPos(EobMonsterInPlay *m, int block);
+	int getNextMonsterPos(EoBMonsterInPlay *m, int block);
 	int findFreeMonsterPos(int block, int size);
-	void updateMoveMonster(EobMonsterInPlay *m);
-	bool updateMonsterTryDistanceAttack(EobMonsterInPlay *m);
-	bool updateMonsterTryCloseAttack(EobMonsterInPlay *m, int block);
-	void walkMonster(EobMonsterInPlay *m, int destBlock);
-	bool walkMonsterNextStep(EobMonsterInPlay *m, int destBlock, int direction);
-	void updateMonsterFollowPath(EobMonsterInPlay *m, int turnSteps);
-	void updateMonstersStraying(EobMonsterInPlay *m, int a);
-	void updateMonstersSpellStatus(EobMonsterInPlay *m);
+	void updateMoveMonster(EoBMonsterInPlay *m);
+	bool updateMonsterTryDistanceAttack(EoBMonsterInPlay *m);
+	bool updateMonsterTryCloseAttack(EoBMonsterInPlay *m, int block);
+	void walkMonster(EoBMonsterInPlay *m, int destBlock);
+	bool walkMonsterNextStep(EoBMonsterInPlay *m, int destBlock, int direction);
+	void updateMonsterFollowPath(EoBMonsterInPlay *m, int turnSteps);
+	void updateMonstersStraying(EoBMonsterInPlay *m, int a);
+	void updateMonstersSpellStatus(EoBMonsterInPlay *m);
 	void setBlockMonsterDirection(int block, int dir);
 
 	uint8 *_monsterOvl1;
 	uint8 *_monsterOvl2;
 
 	SpriteDecoration *_monsterDecorations;
-	EobMonsterProperty *_monsterProps;
+	EoBMonsterProperty *_monsterProps;
 
-	EobMonsterInPlay *_monsters;
+	EoBMonsterInPlay *_monsters;
 
 	const int8 *_monsterStepTable0;
 	const int8 *_monsterStepTable1;
@@ -608,7 +608,7 @@ protected:
 	int16 _doorType[2];
 	int16 _noDoorSwitch[2];
 
-	EobRect8 *_levelDecorationRects;
+	EoBRect8 *_levelDecorationRects;
 	SpriteDecoration *_doorSwitches;
 
 	int8 _currentSub;
@@ -651,7 +651,7 @@ protected:
 	void updateScriptTimers();
 	virtual void updateScriptTimersExtra() {}
 
-	EobInfProcessor *_inf;
+	EoBInfProcessor *_inf;
 	int _stepCounter;
 	int _stepsUntilScriptCall;
 	ScriptTimer _scriptTimers[5];
@@ -736,7 +736,7 @@ protected:
 	static const int16 _buttonList8[];
 	int _buttonList8Size;
 
-	const EobGuiButtonDef *_buttonDefs;
+	const EoBGuiButtonDef *_buttonDefs;
 
 	const char *const *_characterGuiStringsHp;
 	const char *const *_characterGuiStringsWp;
@@ -863,8 +863,8 @@ protected:
 
 	bool _allowSkip;
 
-	Screen_Eob *_screen;
-	GUI_Eob *_gui;
+	Screen_EoB *_screen;
+	GUI_EoB *_gui;
 
 	// fight
 	void useSlotWeapon(int charIndex, int slotIndex, Item item);
@@ -872,34 +872,34 @@ protected:
 	int thrownAttack(int charIndex, int slotIndex, Item item);
 	int projectileWeaponAttack(int charIndex, Item item);
 
-	void inflictMonsterDamage(EobMonsterInPlay *m, int damage, bool giveExperience);
-	void calcAndInflictMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect);
+	void inflictMonsterDamage(EoBMonsterInPlay *m, int damage, bool giveExperience);
+	void calcAndInflictMonsterDamage(EoBMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect);
 	void calcAndInflictCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int savingThrowEffect);
 	int calcCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int damageType) ;
 	void inflictCharacterDamage(int charIndex, int damage);
 
 	bool characterAttackHitTest(int charIndex, int monsterIndex, int item, int attackType);
-	bool monsterAttackHitTest(EobMonsterInPlay *m, int charIndex);
-	bool flyingObjectMonsterHit(EobFlyingObject *fo, int monsterIndex);
-	bool flyingObjectPartyHit(EobFlyingObject *fo);
+	bool monsterAttackHitTest(EoBMonsterInPlay *m, int charIndex);
+	bool flyingObjectMonsterHit(EoBFlyingObject *fo, int monsterIndex);
+	bool flyingObjectPartyHit(EoBFlyingObject *fo);
 
-	void monsterCloseAttack(EobMonsterInPlay *m);
-	void monsterSpellCast(EobMonsterInPlay *m, int type);
+	void monsterCloseAttack(EoBMonsterInPlay *m);
+	void monsterSpellCast(EoBMonsterInPlay *m, int type);
 	void statusAttack(int charIndex, int attackStatusFlags, const char *attackStatusString, int savingThrowType, uint32 effectDuration, int restoreEvent, int noRefresh);
 
-	int calcMonsterDamage(EobMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect);
-	int calcDamageModifers(int charIndex, EobMonsterInPlay *m, int item, int itemType, int useStrModifier);
+	int calcMonsterDamage(EoBMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect);
+	int calcDamageModifers(int charIndex, EoBMonsterInPlay *m, int item, int itemType, int useStrModifier);
 	bool trySavingThrow(void *target, int hpModifier, int level, int type, int race);
 	bool specialAttackSavingThrow(int charIndex, int type);
 	int getSaveThrowModifier(int hpModifier, int level, int type);
 	bool calcDamageCheckItemType(int itemType);
 	int savingThrowReduceDamage(int savingThrowEffect, int damage);
-	bool tryMonsterAttackEvasion(EobMonsterInPlay *m);
+	bool tryMonsterAttackEvasion(EoBMonsterInPlay *m);
 	int getStrHitChanceModifier(int charIndex);
 	int getStrDamageModifier(int charIndex);
 	int getDexHitChanceModifier(int charIndex);
 	int getMonsterAcHitChanceModifier(int charIndex, int monsterAc);
-	void explodeMonster(EobMonsterInPlay *m);
+	void explodeMonster(EoBMonsterInPlay *m);
 
 	int _dstMonsterIndex;
 	bool _preventMonsterFlash;
@@ -926,9 +926,9 @@ protected:
 	void setSpellEventTimer(int spell, int timerBaseFactor, int timerLength, int timerLevelFactor, int updateExistingTimer);
 	void sortCharacterSpellList(int charIndex);
 
-	bool magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level);
-	bool magicObjectStatusHit(EobMonsterInPlay *m, int type, bool tryEvade, int mod);
-	bool turnUndeadHit(EobMonsterInPlay *m, int hitChance, int casterLevel);
+	bool magicObjectDamageHit(EoBFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level);
+	bool magicObjectStatusHit(EoBMonsterInPlay *m, int type, bool tryEvade, int mod);
+	bool turnUndeadHit(EoBMonsterInPlay *m, int hitChance, int casterLevel);
 	void causeWounds(int dcTimes, int dcPips, int dcOffs);
 
 	int getMagicWeaponSlot(int charIndex);
@@ -1033,10 +1033,10 @@ protected:
 	int _characterSpellTarget;
 	bool _returnAfterSpellCallback;
 
-	typedef void (EobCoreEngine::*SpellStartCallback)();
-	typedef bool (EobCoreEngine::*SpellEndCallback)(void *obj);
+	typedef void (EoBCoreEngine::*SpellStartCallback)();
+	typedef bool (EoBCoreEngine::*SpellEndCallback)(void *obj);
 
-	struct EobSpell {
+	struct EoBSpell {
 		const char *name;
 		SpellStartCallback startCallback;
 		uint16 flags;
@@ -1047,7 +1047,7 @@ protected:
 		uint16 damageFlags;
 	};
 
-	EobSpell *_spells;
+	EoBSpell *_spells;
 	int _numSpells;
 
 	struct WallOfForce {
@@ -1096,8 +1096,8 @@ protected:
 	int _coneOfColdGfxTblSize;
 
 	// Menu
-	EobMenuDef *_menuDefs;
-	const EobMenuButtonDef *_menuButtonDefs;
+	EoBMenuDef *_menuDefs;
+	const EoBMenuButtonDef *_menuButtonDefs;
 
 	bool _configMouse;
 
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 6d13b17a5f..76b4b35b08 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -35,7 +35,7 @@
 
 namespace Kyra {
 
-Button *EobCoreEngine::gui_getButton(Button *buttonList, int index) {
+Button *EoBCoreEngine::gui_getButton(Button *buttonList, int index) {
 	while (buttonList) {
 		if (buttonList->index == index)
 			return buttonList;
@@ -45,8 +45,8 @@ Button *EobCoreEngine::gui_getButton(Button *buttonList, int index) {
 	return 0;
 }
 
-void EobCoreEngine::gui_drawPlayField(bool refresh) {
-	_screen->loadEobBitmap("PLAYFLD", 0, 5, 3, 2);
+void EoBCoreEngine::gui_drawPlayField(bool refresh) {
+	_screen->loadEoBBitmap("PLAYFLD", 0, 5, 3, 2);
 	int cp = _screen->setCurPage(2);
 	gui_drawCompass(true);
 
@@ -59,29 +59,29 @@ void EobCoreEngine::gui_drawPlayField(bool refresh) {
 	if (!_loading)
 		_screen->updateScreen();
 
-	_screen->loadEobBitmap("INVENT", 0, 5, 3, 2);
+	_screen->loadEoBBitmap("INVENT", 0, 5, 3, 2);
 }
 
-void EobCoreEngine::gui_restorePlayField() {
+void EoBCoreEngine::gui_restorePlayField() {
 	loadVcnData(0, 0);
 	_screen->_curPage = 0;
 	gui_drawPlayField(true);
 	gui_drawAllCharPortraitsWithStats();
 }
 
-void EobCoreEngine::gui_drawAllCharPortraitsWithStats() {
+void EoBCoreEngine::gui_drawAllCharPortraitsWithStats() {
 	for (int i = 0; i < 6; i++)
 		gui_drawCharPortraitWithStats(i);
 }
 
-void EobCoreEngine::gui_drawCharPortraitWithStats(int index) {
+void EoBCoreEngine::gui_drawCharPortraitWithStats(int index) {
 	if (!testCharacter(index, 1))
 		return;
 
 	static const uint16 charPortraitPosX[] = { 8, 80, 184, 256 };
 	static const uint16 charPortraitPosY[] = { 2, 54, 106 };
 
-	EobCharacter *c = &_characters[index];
+	EoBCharacter *c = &_characters[index];
 	int txtCol1 = 12;
 	int txtCol2 = 15;
 
@@ -200,7 +200,7 @@ void EobCoreEngine::gui_drawCharPortraitWithStats(int index) {
 	}
 }
 
-void EobCoreEngine::gui_drawFaceShape(int index) {
+void EoBCoreEngine::gui_drawFaceShape(int index) {
 	if (!testCharacter(index, 1))
 		return;
 
@@ -221,7 +221,7 @@ void EobCoreEngine::gui_drawFaceShape(int index) {
 		y = 3;
 	}
 
-	EobCharacter *c = &_characters[index];
+	EoBCharacter *c = &_characters[index];
 
 	if (c->hitPointsCur == -10) {
 		_screen->drawShape(_screen->_curPage, _deadCharShape, x, y, 0);
@@ -261,7 +261,7 @@ void EobCoreEngine::gui_drawFaceShape(int index) {
 	//}
 }
 
-void EobCoreEngine::gui_drawWeaponSlot(int charIndex, int slot) {
+void EoBCoreEngine::gui_drawWeaponSlot(int charIndex, int slot) {
 	static const uint8 xCoords[] = { 40, 112 };
 	static const uint8 yCoords[] = { 11, 27, 63, 79, 115, 131 };
 
@@ -290,7 +290,7 @@ void EobCoreEngine::gui_drawWeaponSlot(int charIndex, int slot) {
 		_screen->drawShape(_screen->_curPage, _weaponSlotGrid, x, y, 0);
 }
 
-void EobCoreEngine::gui_drawWeaponSlotStatus(int x, int y, int status) {
+void EoBCoreEngine::gui_drawWeaponSlotStatus(int x, int y, int status) {
 	Common::String tmpStr;
 	Common::String tmpStr2;
 
@@ -330,7 +330,7 @@ void EobCoreEngine::gui_drawWeaponSlotStatus(int x, int y, int status) {
 	}
 }
 
-void EobCoreEngine::gui_drawHitpoints(int index) {
+void EoBCoreEngine::gui_drawHitpoints(int index) {
 	if (!testCharacter(index, 1))
 		return;
 
@@ -356,7 +356,7 @@ void EobCoreEngine::gui_drawHitpoints(int index) {
 		h = 5;
 	}
 
-	EobCharacter *c = &_characters[index];
+	EoBCharacter *c = &_characters[index];
 
 	if (_configHpBarGraphs) {
 		int bgCur = c->hitPointsCur + 10;
@@ -383,14 +383,14 @@ void EobCoreEngine::gui_drawHitpoints(int index) {
 	}
 }
 
-void EobCoreEngine::gui_drawFoodStatusGraph(int index) {
+void EoBCoreEngine::gui_drawFoodStatusGraph(int index) {
 	if (!_currentControlMode)
 		return;
 
 	if (!testCharacter(index, 1))
 		return;
 
-	EobCharacter *c = &_characters[index];
+	EoBCharacter *c = &_characters[index];
 	if (!(c->flags & 1))
 		return;
 
@@ -401,12 +401,12 @@ void EobCoreEngine::gui_drawFoodStatusGraph(int index) {
 	gui_drawHorizontalBarGraph(250, 25, 51, 5, c->food, 100, col, _color5);
 }
 
-void EobCoreEngine::gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32 curVal, int32 maxVal, int col1, int col2) {
+void EoBCoreEngine::gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32 curVal, int32 maxVal, int col1, int col2) {
 	gui_drawBox(x - 1, y - 1, w + 3, h + 2, _color2_1, _color1_1, -1);
 	KyraRpgEngine::gui_drawHorizontalBarGraph(x, y, w + 2, h, curVal, maxVal, col1, col2);
 }
 
-void EobCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
+void EoBCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
 	uint8 redGreenColor = (_partyEffectFlags & 0x20000) ? 4 : 6;
 
 	static const uint8 xCoords[] = { 8, 80 };
@@ -417,7 +417,7 @@ void EobCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
 	if (!_screen->_curPage)
 		x += 176;
 
-	EobCharacter *c = &_characters[index];
+	EoBCharacter *c = &_characters[index];
 
 	bool redGreen = ((c->effectFlags & 0x4818) || (_partyEffectFlags & 0x20000) || c->effectsRemainder[0] || c->effectsRemainder[1]) ? true : false;
 	bool yellow = ((c->effectFlags & 0x13000) || (_partyEffectFlags & 0x8420)) ? true : false;
@@ -471,7 +471,7 @@ void EobCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
 	}
 }
 
-void EobCoreEngine::gui_drawInventoryItem(int slot, int special, int pageNum) {
+void EoBCoreEngine::gui_drawInventoryItem(int slot, int special, int pageNum) {
 	int x = _inventorySlotsX[slot];
 	int y = _inventorySlotsY[slot];
 
@@ -502,7 +502,7 @@ void EobCoreEngine::gui_drawInventoryItem(int slot, int special, int pageNum) {
 	_screen->updateScreen();
 }
 
-void EobCoreEngine::gui_drawCompass(bool force) {
+void EoBCoreEngine::gui_drawCompass(bool force) {
 	if (_currentDirection == _compassDirection && !force)
 		return;
 
@@ -516,12 +516,12 @@ void EobCoreEngine::gui_drawCompass(bool force) {
 	_compassDirection = _currentDirection;
 }
 
-void EobCoreEngine::gui_drawDialogueBox() {
+void EoBCoreEngine::gui_drawDialogueBox() {
 	gui_drawBox(0, 121, 320, 79, _color1_1, _color2_1, _bkgColor_1);
 	txt()->clearCurDim();
 }
 
-void EobCoreEngine::gui_drawSpellbook() {
+void EoBCoreEngine::gui_drawSpellbook() {
 	_screen->setCurPage(2);
 	int numTab = (_flags.gameID == GI_EOB1) ? 5 : 6;
 	_screen->copyRegion(64, 121, 64, 121, 112, 56, 0, 2, Screen::CR_NO_P_CHECK);
@@ -608,7 +608,7 @@ void EobCoreEngine::gui_drawSpellbook() {
 		_screen->updateScreen();
 }
 
-void EobCoreEngine::gui_drawSpellbookScrollArrow(int x, int y, int direction) {
+void EoBCoreEngine::gui_drawSpellbookScrollArrow(int x, int y, int direction) {
 	static const uint8 x1[] = { 0, 2, 1, 0, 2, 2 };
 	static const uint8 x2[] = { 2, 4, 5, 6, 4, 4 };
 	if (direction) {
@@ -622,7 +622,7 @@ void EobCoreEngine::gui_drawSpellbookScrollArrow(int x, int y, int direction) {
 	}
 }
 
-void EobCoreEngine::gui_updateSlotAfterScrollUse() {
+void EoBCoreEngine::gui_updateSlotAfterScrollUse() {
 	_characters[_openBookChar].disabledSlots ^= (1 << (--_castScrollSlot));
 	setCharEventTimer(_openBookChar, 18, _castScrollSlot + 2, 1);
 	gui_drawCharPortraitWithStats(_openBookChar);
@@ -632,7 +632,7 @@ void EobCoreEngine::gui_updateSlotAfterScrollUse() {
 	gui_toggleButtons();
 }
 
-void EobCoreEngine::gui_updateControls() {
+void EoBCoreEngine::gui_updateControls() {
 	Button b;
 	if (_currentControlMode)
 		clickedPortraitRestore(&b);
@@ -640,7 +640,7 @@ void EobCoreEngine::gui_updateControls() {
 		clickedSpellbookAbort(&b);
 }
 
-void EobCoreEngine::gui_toggleButtons() {
+void EoBCoreEngine::gui_toggleButtons() {
 	if (_currentControlMode == 0)
 		gui_setPlayFieldButtons();
 	else if (_currentControlMode == 1)
@@ -649,32 +649,32 @@ void EobCoreEngine::gui_toggleButtons() {
 		gui_setStatsListButtons();
 }
 
-void EobCoreEngine::gui_setPlayFieldButtons() {
+void EoBCoreEngine::gui_setPlayFieldButtons() {
 	gui_resetButtonList();
 	gui_initButtonsFromList(_updateFlags ? _buttonList2 : _buttonList1);
 }
 
-void EobCoreEngine::gui_setInventoryButtons() {
+void EoBCoreEngine::gui_setInventoryButtons() {
 	gui_resetButtonList();
 	gui_initButtonsFromList(_updateFlags ? _buttonList5 : _buttonList3);
 }
 
-void EobCoreEngine::gui_setStatsListButtons() {
+void EoBCoreEngine::gui_setStatsListButtons() {
 	gui_resetButtonList();
 	gui_initButtonsFromList(_updateFlags ? _buttonList6 : _buttonList4);
 }
 
-void EobCoreEngine::gui_setSwapCharacterButtons() {
+void EoBCoreEngine::gui_setSwapCharacterButtons() {
 	gui_resetButtonList();
 	gui_initButtonsFromList(_buttonList7);
 }
 
-void EobCoreEngine::gui_setCastOnWhomButtons() {
+void EoBCoreEngine::gui_setCastOnWhomButtons() {
 	gui_resetButtonList();
 	gui_initButtonsFromList(_buttonList8);
 }
 
-void EobCoreEngine::gui_initButton(int index, int, int, int) {
+void EoBCoreEngine::gui_initButton(int index, int, int, int) {
 	Button *b = 0;
 	int cnt = 1;
 
@@ -702,7 +702,7 @@ void EobCoreEngine::gui_initButton(int index, int, int, int) {
 
 	b->index = index + 1;
 
-	const EobGuiButtonDef *d = &_buttonDefs[index];
+	const EoBGuiButtonDef *d = &_buttonDefs[index];
 	b->buttonCallback = _buttonCallbacks[index];
 
 	if (_flags.gameID == GI_EOB1) {
@@ -731,7 +731,7 @@ void EobCoreEngine::gui_initButton(int index, int, int, int) {
 	b->arg = d->arg;
 }
 
-int EobCoreEngine::clickedCharPortraitDefault(Button *button) {
+int EoBCoreEngine::clickedCharPortraitDefault(Button *button) {
 	if (!testCharacter(button->arg, 1))
 		return 1;
 
@@ -739,7 +739,7 @@ int EobCoreEngine::clickedCharPortraitDefault(Button *button) {
 	return 0;
 }
 
-int EobCoreEngine::clickedCamp(Button *button) {
+int EoBCoreEngine::clickedCamp(Button *button) {
 	gui_updateControls();
 	disableSysTimer(2);
 	int cd = _screen->curDimIndex();
@@ -779,7 +779,7 @@ int EobCoreEngine::clickedCamp(Button *button) {
 	return button->arg;
 }
 
-int EobCoreEngine::clickedSceneDropPickupItem(Button *button) {
+int EoBCoreEngine::clickedSceneDropPickupItem(Button *button) {
 	uint16 block = _currentBlock;
 	if (button->arg > 1) {
 		block = calcNewBlockPosition(_currentBlock, _currentDirection);
@@ -805,7 +805,7 @@ int EobCoreEngine::clickedSceneDropPickupItem(Button *button) {
 	return 1;
 }
 
-int EobCoreEngine::clickedCharPortrait2(Button *button) {
+int EoBCoreEngine::clickedCharPortrait2(Button *button) {
 	if (!_gui->_progress) {
 		if (!testCharacter(button->arg, 1))
 			return button->index;
@@ -822,7 +822,7 @@ int EobCoreEngine::clickedCharPortrait2(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedWeaponSlot(Button *button) {
+int EoBCoreEngine::clickedWeaponSlot(Button *button) {
 	if (!testCharacter(button->arg, 1))
 		return 1;
 
@@ -840,7 +840,7 @@ int EobCoreEngine::clickedWeaponSlot(Button *button) {
 	return 1;
 }
 
-int EobCoreEngine::clickedCharNameLabelRight(Button *button) {
+int EoBCoreEngine::clickedCharNameLabelRight(Button *button) {
 	if (!testCharacter(button->arg, 1))
 		return button->index;
 
@@ -870,17 +870,17 @@ int EobCoreEngine::clickedCharNameLabelRight(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedInventorySlot(Button *button) {
+int EoBCoreEngine::clickedInventorySlot(Button *button) {
 	gui_processInventorySlotClick(button->arg);
 	return button->index;
 }
 
-int EobCoreEngine::clickedEatItem(Button *button) {
+int EoBCoreEngine::clickedEatItem(Button *button) {
 	eatItemInHand(_updateCharNum);
 	return button->index;
 }
 
-int EobCoreEngine::clickedInventoryPrevChar(Button *button) {
+int EoBCoreEngine::clickedInventoryPrevChar(Button *button) {
 	if (_gui->_progress == 1)
 		_updateCharNum = 0;
 	else if (_gui->_progress == 2)
@@ -892,7 +892,7 @@ int EobCoreEngine::clickedInventoryPrevChar(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedInventoryNextChar(Button *button) {
+int EoBCoreEngine::clickedInventoryNextChar(Button *button) {
 	int oldVal = _updateCharNum;
 	int v = button->arg == 2 ? 2 : 0;
 
@@ -912,7 +912,7 @@ int EobCoreEngine::clickedInventoryNextChar(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedSpellbookTab(Button *button) {
+int EoBCoreEngine::clickedSpellbookTab(Button *button) {
 	_openBookSpellLevel = button->arg;
 	_openBookSpellListOffset = 0;
 
@@ -930,7 +930,7 @@ int EobCoreEngine::clickedSpellbookTab(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedSpellbookList(Button *button) {
+int EoBCoreEngine::clickedSpellbookList(Button *button) {
 	int listIndex = button->arg;
 	bool spellLevelAvailable = false;
 
@@ -1006,7 +1006,7 @@ int EobCoreEngine::clickedSpellbookList(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedCastSpellOnCharacter(Button *button) {
+int EoBCoreEngine::clickedCastSpellOnCharacter(Button *button) {
 	_activeSpellCharId = button->arg & 0xff;
 
 	if (_activeSpellCharId == 0xff) {
@@ -1025,7 +1025,7 @@ int EobCoreEngine::clickedCastSpellOnCharacter(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedInventoryNextPage(Button *button) {
+int EoBCoreEngine::clickedInventoryNextPage(Button *button) {
 	if (_currentControlMode == 2) {
 		gui_setInventoryButtons();
 		_currentControlMode = 1;
@@ -1038,7 +1038,7 @@ int EobCoreEngine::clickedInventoryNextPage(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedPortraitRestore(Button *button) {
+int EoBCoreEngine::clickedPortraitRestore(Button *button) {
 	_currentControlMode = 0;
 	_screen->_curPage = 2;
 	_screen->copyRegion(0, 0, 0, 0, 144, 168, 5, _screen->_curPage, Screen::CR_NO_P_CHECK);
@@ -1050,7 +1050,7 @@ int EobCoreEngine::clickedPortraitRestore(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedUpArrow(Button *button) {
+int EoBCoreEngine::clickedUpArrow(Button *button) {
 	int b = calcNewBlockPositionAndTestPassability(_currentBlock, _currentDirection);
 
 	if (b == -1) {
@@ -1063,7 +1063,7 @@ int EobCoreEngine::clickedUpArrow(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedDownArrow(Button *button) {
+int EoBCoreEngine::clickedDownArrow(Button *button) {
 	int b = calcNewBlockPositionAndTestPassability(_currentBlock, (_currentDirection + 2) & 3);
 
 	if (b == -1) {
@@ -1076,7 +1076,7 @@ int EobCoreEngine::clickedDownArrow(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedLeftArrow(Button *button) {
+int EoBCoreEngine::clickedLeftArrow(Button *button) {
 	int b = calcNewBlockPositionAndTestPassability(_currentBlock, (_currentDirection - 1) & 3);
 
 	if (b == -1) {
@@ -1089,7 +1089,7 @@ int EobCoreEngine::clickedLeftArrow(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedRightArrow(Button *button) {
+int EoBCoreEngine::clickedRightArrow(Button *button) {
 	int b = calcNewBlockPositionAndTestPassability(_currentBlock, (_currentDirection + 1) & 3);
 
 	if (b == -1) {
@@ -1102,7 +1102,7 @@ int EobCoreEngine::clickedRightArrow(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedTurnLeftArrow(Button *button) {
+int EoBCoreEngine::clickedTurnLeftArrow(Button *button) {
 	_currentDirection = (_currentDirection - 1) & 3;
 	//_keybControlUnk = -1;
 	_sceneDefaultUpdate = 1;
@@ -1110,7 +1110,7 @@ int EobCoreEngine::clickedTurnLeftArrow(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedTurnRightArrow(Button *button) {
+int EoBCoreEngine::clickedTurnRightArrow(Button *button) {
 	_currentDirection = (_currentDirection + 1) & 3;
 	//_keybControlUnk = -1;
 	_sceneDefaultUpdate = 1;
@@ -1118,7 +1118,7 @@ int EobCoreEngine::clickedTurnRightArrow(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedAbortCharSwitch(Button *button) {
+int EoBCoreEngine::clickedAbortCharSwitch(Button *button) {
 	_timer->disable(0);
 	int c = _exchangeCharacterId;
 	_exchangeCharacterId = -1;
@@ -1127,7 +1127,7 @@ int EobCoreEngine::clickedAbortCharSwitch(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedSceneThrowItem(Button *button) {
+int EoBCoreEngine::clickedSceneThrowItem(Button *button) {
 	if (!_itemInHand)
 		return button->index;
 
@@ -1139,12 +1139,12 @@ int EobCoreEngine::clickedSceneThrowItem(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedSceneSpecial(Button *button) {
+int EoBCoreEngine::clickedSceneSpecial(Button *button) {
 	_clickedSpecialFlag = 0x40;
 	return specialWallAction(calcNewBlockPosition(_currentBlock, _currentDirection), _currentDirection);
 }
 
-int EobCoreEngine::clickedSpellbookAbort(Button *button) {
+int EoBCoreEngine::clickedSpellbookAbort(Button *button) {
 	_updateFlags = 0;
 	_screen->copyRegion(0, 0, 64, 121, 112, 56, 10, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
@@ -1153,7 +1153,7 @@ int EobCoreEngine::clickedSpellbookAbort(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedSpellbookScroll(Button *button) {
+int EoBCoreEngine::clickedSpellbookScroll(Button *button) {
 	if (_openBookAvailableSpells[_openBookSpellLevel * 10] > 0) {
 		_openBookSpellListOffset ^= 6;
 		_openBookSpellSelectedItem = 0;
@@ -1169,11 +1169,11 @@ int EobCoreEngine::clickedSpellbookScroll(Button *button) {
 	return button->index;
 }
 
-int EobCoreEngine::clickedUnk(Button *button) {
+int EoBCoreEngine::clickedUnk(Button *button) {
 	return button->index;
 }
 
-void EobCoreEngine::gui_processCharPortraitClick(int index) {
+void EoBCoreEngine::gui_processCharPortraitClick(int index) {
 	if (index == _updateCharNum)
 		return;
 
@@ -1184,7 +1184,7 @@ void EobCoreEngine::gui_processCharPortraitClick(int index) {
 	gui_drawCharPortraitWithStats(index);
 }
 
-void EobCoreEngine::gui_processWeaponSlotClickLeft(int charIndex, int slotIndex) {
+void EoBCoreEngine::gui_processWeaponSlotClickLeft(int charIndex, int slotIndex) {
 	int itm = _characters[charIndex].inventory[slotIndex];
 	if (_items[itm].flags & 0x20)
 		return;
@@ -1202,7 +1202,7 @@ void EobCoreEngine::gui_processWeaponSlotClickLeft(int charIndex, int slotIndex)
 	recalcArmorClass(charIndex);
 }
 
-void EobCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex) {
+void EoBCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex) {
 	if (!testCharacter(charIndex, 0x0d))
 		return;
 
@@ -1308,7 +1308,7 @@ void EobCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex
 	_lastUsedItem = 0;
 }
 
-void EobCoreEngine::gui_processInventorySlotClick(int slot) {
+void EoBCoreEngine::gui_processInventorySlotClick(int slot) {
 	int itm = _characters[_updateCharNum].inventory[slot];
 	int ih = _itemInHand;
 	if (!validateInventorySlotForItem(ih, _updateCharNum, slot))
@@ -1334,7 +1334,7 @@ void EobCoreEngine::gui_processInventorySlotClick(int slot) {
 	}
 }
 
-GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
+GUI_EoB::GUI_EoB(EoBCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 	_menuStringsPrefsTemp = new char*[4];
 	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char*));
 
@@ -1374,7 +1374,7 @@ GUI_Eob::GUI_Eob(EobCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 	_needRest = false;
 }
 
-GUI_Eob::~GUI_Eob() {
+GUI_EoB::~GUI_EoB() {
 	if (_menuStringsPrefsTemp) {
 		for (int i = 0; i < 4; i++)
 			delete[] _menuStringsPrefsTemp[i];
@@ -1392,7 +1392,7 @@ GUI_Eob::~GUI_Eob() {
 	delete[] _numAssignedSpellsOfType;
 }
 
-void GUI_Eob::processButton(Button *button) {
+void GUI_EoB::processButton(Button *button) {
 	if (!button->data0Val1 && !button->data2Val1 && !button->data1Val1)
 		return;
 
@@ -1496,7 +1496,7 @@ void GUI_Eob::processButton(Button *button) {
 	}
 }
 
-int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8 mouseWheel) {
+int GUI_EoB::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8 mouseWheel) {
 	_progress = 0;
 	uint16 in = inputFlags & 0xff;
 	uint16 buttonReleaseFlag = 0;
@@ -1878,7 +1878,7 @@ int GUI_Eob::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 	return result;
 }
 
-void GUI_Eob::simpleMenu_setup(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int itemOffset, int lineSpacing) {
+void GUI_EoB::simpleMenu_setup(int sd, int maxItem, const char *const *strings, int32 menuItemsMask, int itemOffset, int lineSpacing) {
 	simpleMenu_initMenuItemsMask(sd, maxItem, menuItemsMask, itemOffset);
 
 	const ScreenDim *dm = _screen->getScreenDim(19 + sd);
@@ -1901,7 +1901,7 @@ void GUI_Eob::simpleMenu_setup(int sd, int maxItem, const char *const *strings,
 	_vm->removeInputTop();
 }
 
-int GUI_Eob::simpleMenu_process(int sd, const char *const *strings, void *b, int32 menuItemsMask, int itemOffset) {
+int GUI_EoB::simpleMenu_process(int sd, const char *const *strings, void *b, int32 menuItemsMask, int itemOffset) {
 	const ScreenDim *dm = _screen->getScreenDim(19 + sd);
 	int h = _menuNumItems - 1;
 	int currentItem = _menuCur % _menuNumItems;
@@ -1958,7 +1958,7 @@ int GUI_Eob::simpleMenu_process(int sd, const char *const *strings, void *b, int
 	return result;
 }
 
-int GUI_Eob::simpleMenu_getMenuItem(int index, int32 menuItemsMask, int itemOffset) {
+int GUI_EoB::simpleMenu_getMenuItem(int index, int32 menuItemsMask, int itemOffset) {
 	if (menuItemsMask == -1)
 		return index;
 
@@ -1976,7 +1976,7 @@ int GUI_Eob::simpleMenu_getMenuItem(int index, int32 menuItemsMask, int itemOffs
 	return res;
 }
 
-void GUI_Eob::simpleMenu_flashSelection(const char *str, int x, int y, int color1, int color2, int color3) {
+void GUI_EoB::simpleMenu_flashSelection(const char *str, int x, int y, int color1, int color2, int color3) {
 	for (int i = 0; i < 3; i++) {
 		_screen->printText(str, x, y, color2, color3);
 		_screen->updateScreen();
@@ -1987,7 +1987,7 @@ void GUI_Eob::simpleMenu_flashSelection(const char *str, int x, int y, int color
 	}
 }
 
-void GUI_Eob::runCampMenu() {
+void GUI_EoB::runCampMenu() {
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
 
 	Button *highlightButton = 0;
@@ -2211,7 +2211,7 @@ void GUI_Eob::runCampMenu() {
 	_vm->writeSettings();
 }
 
-bool GUI_Eob::runLoadMenu(int x, int y) {
+bool GUI_EoB::runLoadMenu(int x, int y) {
 	const ScreenDim *dm = _screen->getScreenDim(11);
 	int xo = dm->sx;
 	int yo = dm->sy;
@@ -2239,7 +2239,7 @@ bool GUI_Eob::runLoadMenu(int x, int y) {
 	return result;
 }
 
-bool GUI_Eob::confirmDialogue2(int dim, int id, int deflt) {
+bool GUI_EoB::confirmDialogue2(int dim, int id, int deflt) {
 	int od = _screen->curDimIndex();
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
 	_screen->setScreenDim(dim);
@@ -2307,7 +2307,7 @@ bool GUI_Eob::confirmDialogue2(int dim, int id, int deflt) {
 	return newHighlight ? false : true;
 }
 
-void GUI_Eob::messageDialogue2(int dim, int id, int buttonTextCol) {
+void GUI_EoB::messageDialogue2(int dim, int id, int buttonTextCol) {
 	drawMenuButtonBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, false, false);
 
 	_screen->_curPage = 2;
@@ -2345,7 +2345,7 @@ void GUI_Eob::messageDialogue2(int dim, int id, int buttonTextCol) {
 
 }
 
-void GUI_Eob::updateBoxFrameHighLight(int box) {
+void GUI_EoB::updateBoxFrameHighLight(int box) {
 	static const uint8 colorTable[] = { 0x0F, 0xB0, 0xB2, 0xB4, 0xB6, 0xB8, 0xBA, 0xBC, 0x0C, 0xBC, 0xBA, 0xB8, 0xB6, 0xB4, 0xB2, 0xB0, 0x00 };
 
 	if (_updateBoxIndex == box) {
@@ -2358,7 +2358,7 @@ void GUI_Eob::updateBoxFrameHighLight(int box) {
 		if (!colorTable[_updateBoxColorIndex])
 			_updateBoxColorIndex = 0;
 
-		const EobRect16 *r = &_updateBoxFrameHighLights[_updateBoxIndex];
+		const EoBRect16 *r = &_updateBoxFrameHighLights[_updateBoxIndex];
 		_screen->drawBox(r->x1, r->y1, r->x2, r->y2, colorTable[_updateBoxColorIndex++]);
 		_screen->updateScreen();
 
@@ -2366,7 +2366,7 @@ void GUI_Eob::updateBoxFrameHighLight(int box) {
 
 	} else {
 		if (_updateBoxIndex != -1) {
-			const EobRect16 *r = &_updateBoxFrameHighLights[_updateBoxIndex];
+			const EoBRect16 *r = &_updateBoxFrameHighLights[_updateBoxIndex];
 			_screen->drawBox(r->x1, r->y1, r->x2, r->y2, 12);
 			_screen->updateScreen();
 		}
@@ -2377,7 +2377,7 @@ void GUI_Eob::updateBoxFrameHighLight(int box) {
 	}
 }
 
-int GUI_Eob::getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor) {
+int GUI_EoB::getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor) {
 	uint8 cursorState = 1;
 	char sufx[] = " ";
 
@@ -2495,14 +2495,14 @@ int GUI_Eob::getTextInput(char *dest, int x, int y, int destMaxLen, int textColo
 	return _keyPressed.keycode == Common::KEYCODE_ESCAPE ? -1 : len;
 }
 
-void GUI_Eob::createScreenThumbnail(Graphics::Surface &dst) {
+void GUI_EoB::createScreenThumbnail(Graphics::Surface &dst) {
 	uint8 *screenPal = new uint8[768];
 	_screen->getRealPalette(0, screenPal);
 	::createThumbnail(&dst, _screen->getCPagePtr(7), Screen::SCREEN_W, Screen::SCREEN_H, screenPal);
 	delete[] screenPal;
 }
 
-void GUI_Eob::simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int itemOffset) {
+void GUI_EoB::simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuItemsMask, int itemOffset) {
 	if (menuItemsMask == -1) {
 		_menuNumItems = _screen->getScreenDim(19 + menuId)->h;
 		_menuCur = _screen->getScreenDim(19 + menuId)->unk8;
@@ -2519,7 +2519,7 @@ void GUI_Eob::simpleMenu_initMenuItemsMask(int menuId, int maxItem, int32 menuIt
 	_menuCur = 0;
 }
 
-bool GUI_Eob::runSaveMenu(int x, int y) {
+bool GUI_EoB::runSaveMenu(int x, int y) {
 	const ScreenDim *dm = _screen->getScreenDim(11);
 	int xo = dm->sx;
 	int yo = dm->sy;
@@ -2574,7 +2574,7 @@ bool GUI_Eob::runSaveMenu(int x, int y) {
 	return result;
 }
 
-int GUI_Eob::selectSaveSlotDialogue(int x, int y, int id) {
+int GUI_EoB::selectSaveSlotDialogue(int x, int y, int id) {
 	assert (id < 2);
 
 	_saveSlotX = _saveSlotY = 0;
@@ -2685,7 +2685,7 @@ int GUI_Eob::selectSaveSlotDialogue(int x, int y, int id) {
 	return newHighlight;
 }
 
-void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
+void GUI_EoB::runMemorizePrayMenu(int charIndex, int spellType) {
 	if (charIndex == -1)
 		return;
 
@@ -2695,7 +2695,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 	int li = 0;
 	int lv = 0;
 
-	EobCharacter *c = &_vm->_characters[charIndex];
+	EoBCharacter *c = &_vm->_characters[charIndex];
 	int8 wm = c->wisdomCur - 12;
 	if (wm < 0)
 		wm = 0;
@@ -2963,7 +2963,7 @@ void GUI_Eob::runMemorizePrayMenu(int charIndex, int spellType) {
 }
 
 
-void GUI_Eob::scribeScrollDialogue() {
+void GUI_EoB::scribeScrollDialogue() {
 	int16 *scrollInvSlot = new int16[32];
 	int16 *scrollCharacter = new int16[32];
 	int16 *menuItems = new int16[6];
@@ -2984,7 +2984,7 @@ void GUI_Eob::scribeScrollDialogue() {
 		int csel = selectCharacterDialogue(49);
 		if (csel != -1) {
 
-			EobCharacter *c = &_vm->_characters[csel];
+			EoBCharacter *c = &_vm->_characters[csel];
 			int s = 0;
 
 			for (int i = 0; i < 32 && s < 6; i++) {
@@ -3085,7 +3085,7 @@ void GUI_Eob::scribeScrollDialogue() {
 	delete[] scrollInvSlot;
 }
 
-bool GUI_Eob::restParty() {
+bool GUI_EoB::restParty() {
 	static const int8 eob1healSpells[] = { 2, 15, 20, 24 };
 	static const int8 eob2healSpells[] = { 3, 16, 20, 28 };
 	const int8 *spells = _vm->game() == GI_EOB1 ? eob1healSpells : eob2healSpells;
@@ -3366,7 +3366,7 @@ bool GUI_Eob::restParty() {
 	return res;
 }
 
-bool GUI_Eob::confirmDialogue(int id) {
+bool GUI_EoB::confirmDialogue(int id) {
 	int od = _screen->curDimIndex();
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
 
@@ -3428,7 +3428,7 @@ bool GUI_Eob::confirmDialogue(int id) {
 	return result;
 }
 
-void GUI_Eob::messageDialogue(int dim, int id, int buttonTextCol) {
+void GUI_EoB::messageDialogue(int dim, int id, int buttonTextCol) {
 	int od = _screen->curDimIndex();
 	_screen->setScreenDim(dim);
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
@@ -3468,7 +3468,7 @@ void GUI_Eob::messageDialogue(int dim, int id, int buttonTextCol) {
 	dm = _screen->getScreenDim(dim);
 }
 
-int GUI_Eob::selectCharacterDialogue(int id) {
+int GUI_EoB::selectCharacterDialogue(int id) {
 	uint8 flags = (id == 26) ? (_vm->game() == GI_EOB1 ? 0x04 : 0x14) : 0x02;
 	_vm->removeInputTop();
 
@@ -3619,7 +3619,7 @@ int GUI_Eob::selectCharacterDialogue(int id) {
 	return result;
 }
 
-void GUI_Eob::displayTextBox(int id) {
+void GUI_EoB::displayTextBox(int id) {
 	int op = _screen->setCurPage(2);
 	int od = _screen->curDimIndex();
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
@@ -3644,10 +3644,10 @@ void GUI_Eob::displayTextBox(int id) {
 	_screen->setScreenDim(od);
 }
 
-Button *GUI_Eob::initMenu(int id) {
+Button *GUI_EoB::initMenu(int id) {
 	_screen->setCurPage(2);
 
-	EobMenuDef *m = &_vm->_menuDefs[id];
+	EoBMenuDef *m = &_vm->_menuDefs[id];
 
 	if (m->dim) {
 		const ScreenDim *dm = _screen->getScreenDim(m->dim);
@@ -3660,7 +3660,7 @@ Button *GUI_Eob::initMenu(int id) {
 
 	Button *buttons = 0;
 	for (int i = 0; i < m->numButtons; i++) {
-		const EobMenuButtonDef *df = &_vm->_menuButtonDefs[m->firstButtonStrId + i];
+		const EoBMenuButtonDef *df = &_vm->_menuButtonDefs[m->firstButtonStrId + i];
 		Button *b = new Button;
 		b->index = m->firstButtonStrId + i + 1;
 		if (id == 4 && _vm->game() == GI_EOB1)
@@ -3691,11 +3691,11 @@ Button *GUI_Eob::initMenu(int id) {
 	return buttons;
 }
 
-void GUI_Eob::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFill) {
+void GUI_EoB::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFill) {
 	if (!b)
 		return;
 
-	EobMenuButtonDef *d = (EobMenuButtonDef*)b->extButtonDef;
+	EoBMenuButtonDef *d = (EoBMenuButtonDef*)b->extButtonDef;
 
 	if (d->flags & 1)
 		drawMenuButtonBox(b->x, b->y, b->width, b->height, clicked, noFill);
@@ -3718,7 +3718,7 @@ void GUI_Eob::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFil
 	}
 }
 
-void GUI_Eob::drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool noFill) {
+void GUI_EoB::drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool noFill) {
 	uint8 col1 = _vm->_color1_1;
 	uint8 col2 = _vm->_color2_1;
 
@@ -3729,7 +3729,7 @@ void GUI_Eob::drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool n
 	_vm->gui_drawBox(x + 1, y + 1, w - 2, h - 2, _vm->_color1_1, _vm->_color2_1, noFill ? -1 : _vm->_bkgColor_1);
 }
 
-void GUI_Eob::drawTextBox(int dim, int id) {
+void GUI_EoB::drawTextBox(int dim, int id) {
 	int od = _screen->curDimIndex();
 	_screen->setScreenDim(dim);
 	const ScreenDim *dm = _screen->getScreenDim(dim);
@@ -3750,7 +3750,7 @@ void GUI_Eob::drawTextBox(int dim, int id) {
 	_screen->setFont(of);
 }
 
-void GUI_Eob::drawSaveSlotButton(int slot, int redrawBox, int textCol) {
+void GUI_EoB::drawSaveSlotButton(int slot, int redrawBox, int textCol) {
 	if (slot < 0)
 		return;
 
@@ -3771,7 +3771,7 @@ void GUI_Eob::drawSaveSlotButton(int slot, int redrawBox, int textCol) {
 	_screen->printShadedText(s, x + 4, y + 3, textCol, 0);
 }
 
-void GUI_Eob::memorizePrayMenuPrintString(int spellId, int bookPageIndex, int spellType, bool noFill, bool highLight) {
+void GUI_EoB::memorizePrayMenuPrintString(int spellId, int bookPageIndex, int spellType, bool noFill, bool highLight) {
 	if (bookPageIndex < 0)
 		return;
 
@@ -3789,7 +3789,7 @@ void GUI_Eob::memorizePrayMenuPrintString(int spellId, int bookPageIndex, int sp
 	}
 }
 
-void GUI_Eob::updateOptionsStrings() {
+void GUI_EoB::updateOptionsStrings() {
 	for (int i = 0; i < 4; i++) {
 		delete[] _menuStringsPrefsTemp[i];
 		_menuStringsPrefsTemp[i] = new char[strlen(_vm->_menuStringsPrefs[i]) + 8];
@@ -3801,7 +3801,7 @@ void GUI_Eob::updateOptionsStrings() {
 	Common::strlcpy(_menuStringsPrefsTemp[3], Common::String::format(_vm->_menuStringsPrefs[3], _vm->_menuStringsOnOff[_vm->_configMouse ? 0 : 1]).c_str(), strlen(_vm->_menuStringsPrefs[3]) + 8);
 }
 
-const char *GUI_Eob::getMenuString(int id) {
+const char *GUI_EoB::getMenuString(int id) {
 	static const char empty[] = "";
 
 	if (id >= 69)
@@ -3849,7 +3849,7 @@ const char *GUI_Eob::getMenuString(int id) {
 	return empty;
 }
 
-Button *GUI_Eob::linkButton(Button *list, Button *newbt) {
+Button *GUI_EoB::linkButton(Button *list, Button *newbt) {
 	if (!list) {
 		list = newbt;
 		return list;
@@ -3867,7 +3867,7 @@ Button *GUI_Eob::linkButton(Button *list, Button *newbt) {
 	return resList;
 }
 
-void GUI_Eob::releaseButtons(Button *list) {
+void GUI_EoB::releaseButtons(Button *list) {
 	while (list) {
 		Button *n = list->nextButton;
 		delete list;
@@ -3876,7 +3876,7 @@ void GUI_Eob::releaseButtons(Button *list) {
 	_vm->gui_notifyButtonListChanged();
 }
 
-void GUI_Eob::setupSaveMenuSlots() {
+void GUI_EoB::setupSaveMenuSlots() {
 	for (int i = 0; i < 6; ++i) {
 		if (_savegameOffset + i < _savegameListSize) {
 			if (_savegameList[i + _savegameOffset]) {
@@ -3890,7 +3890,7 @@ void GUI_Eob::setupSaveMenuSlots() {
 	}
 }
 
-int GUI_Eob::getHighlightSlot() {
+int GUI_EoB::getHighlightSlot() {
 	int res = -1;
 	Common::Point p = _vm->getMousePos();
 
@@ -3908,11 +3908,11 @@ int GUI_Eob::getHighlightSlot() {
 	return res;
 }
 
-void GUI_Eob::sortSaveSlots() {
+void GUI_EoB::sortSaveSlots() {
 	Common::sort(_saveSlots.begin(), _saveSlots.end(), Common::Less<int>());
 }
 
-void GUI_Eob::restParty_updateRestTime(int hours, bool init) {
+void GUI_EoB::restParty_updateRestTime(int hours, bool init) {
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
 	int od = _screen->curDimIndex();
 	_screen->setScreenDim(10);
@@ -3937,7 +3937,7 @@ void GUI_Eob::restParty_updateRestTime(int hours, bool init) {
 	_screen->setFont(of);
 }
 
-const EobRect16 GUI_Eob::_updateBoxFrameHighLights[] = {
+const EoBRect16 GUI_EoB::_updateBoxFrameHighLights[] = {
 	{ 0x00B7, 0x0001, 0x00F7, 0x0034 },
 	{ 0x00FF, 0x0001, 0x013F, 0x0034 },
 	{ 0x00B7, 0x0035, 0x00F7, 0x0068 },
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index 46d36b97b7..95dedcf418 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -31,7 +31,7 @@
 
 namespace Kyra {
 
-struct EobRect16 {
+struct EoBRect16 {
 	int16 x1;
 	int16 y1;
 	uint16 x2;
@@ -39,14 +39,14 @@ struct EobRect16 {
 };
 
 class DarkMoonEngine;
-class Screen_Eob;
+class Screen_EoB;
 
-class GUI_Eob : public GUI {
-	friend class EobCoreEngine;
+class GUI_EoB : public GUI {
+	friend class EoBCoreEngine;
 	friend class CharacterGenerator;
 public:
-	GUI_Eob(EobCoreEngine *vm);
-	virtual ~GUI_Eob();
+	GUI_EoB(EoBCoreEngine *vm);
+	virtual ~GUI_EoB();
 
 	void initStaticData() {}
 
@@ -113,8 +113,8 @@ private:
 	int16 _saveSlotX;
 	int16 _saveSlotY;
 
-	EobCoreEngine *_vm;
-	Screen_Eob *_screen;
+	EoBCoreEngine *_vm;
+	Screen_EoB *_screen;
 
 	bool _pressFlag;
 
@@ -145,7 +145,7 @@ private:
 	int _updateBoxColorIndex;
 	uint32 _highLightBoxTimer;
 
-	static const EobRect16 _updateBoxFrameHighLights[];
+	static const EoBRect16 _updateBoxFrameHighLights[];
 };
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index 454e56a845..8ade6e1935 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -28,7 +28,7 @@
 
 namespace Kyra {
 
-void EobCoreEngine::loadItemDefs() {
+void EoBCoreEngine::loadItemDefs() {
 	Common::SeekableReadStream *s = _res->createReadStream("item.dat");
 	_numItems = s->readUint16LE();
 
@@ -58,8 +58,8 @@ void EobCoreEngine::loadItemDefs() {
 	s = _res->createReadStream("itemtype.dat");
 	uint16 numTypes = s->readUint16LE();
 
-	_itemTypes = new EobItemType[65];
-	memset(_itemTypes, 0, sizeof(EobItemType) * 65);
+	_itemTypes = new EoBItemType[65];
+	memset(_itemTypes, 0, sizeof(EoBItemType) * 65);
 
 	for (int i = 0; i < numTypes; i++) {
 		_itemTypes[i].invFlags = s->readUint16LE();
@@ -80,8 +80,8 @@ void EobCoreEngine::loadItemDefs() {
 	delete s;
 }
 
-Kyra::Item EobCoreEngine::duplicateItem(Item itemIndex) {
-	EobItem *itm = &_items[itemIndex];
+Kyra::Item EoBCoreEngine::duplicateItem(Item itemIndex) {
+	EoBItem *itm = &_items[itemIndex];
 
 	if (itm->block == -1)
 		return 0;
@@ -99,21 +99,21 @@ Kyra::Item EobCoreEngine::duplicateItem(Item itemIndex) {
 	if (!foundSlot)
 		return 0;
 
-	memcpy(&_items[i], itm, sizeof(EobItem));
+	memcpy(&_items[i], itm, sizeof(EoBItem));
 	return i;
 }
 
-Item EobCoreEngine::createItemOnCurrentBlock(Item itemIndex) {
+Item EoBCoreEngine::createItemOnCurrentBlock(Item itemIndex) {
 	Item itm = duplicateItem(itemIndex);
 	setItemPosition((Item*)&_levelBlockProperties[_currentBlock].drawObjects, _currentBlock, itm, _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
 	return itm;
 }
 
-void EobCoreEngine::setItemPosition(Item *itemQueue, int block, Item item, int pos) {
+void EoBCoreEngine::setItemPosition(Item *itemQueue, int block, Item item, int pos) {
 	if (!item)
 		return;
 
-	EobItem *itm = &_items[item];
+	EoBItem *itm = &_items[item];
 	itm->pos = pos;
 	itm->block = block;
 	itm->level = block < 0 ? 0xff : _currentLevel;
@@ -121,15 +121,15 @@ void EobCoreEngine::setItemPosition(Item *itemQueue, int block, Item item, int p
 	if (!*itemQueue) {
 		*itemQueue = itm->next = itm->prev = item;
 	} else {
-		EobItem *itmQ = &_items[*itemQueue];
-		EobItem *itmQN = &_items[itmQ->next];
+		EoBItem *itmQ = &_items[*itemQueue];
+		EoBItem *itmQN = &_items[itmQ->next];
 		itm->prev = itmQN->prev;
 		itm->next = itmQ->next;
 		*itemQueue = itmQN->prev = itmQ->next = item;
 	}
 }
 
-void EobCoreEngine::createInventoryItem(EobCharacter *c, Item itemIndex, int16 itemValue, int preferedInventorySlot) {
+void EoBCoreEngine::createInventoryItem(EoBCharacter *c, Item itemIndex, int16 itemValue, int preferedInventorySlot) {
 	if (itemIndex <= 0)
 		return;
 
@@ -154,7 +154,7 @@ void EobCoreEngine::createInventoryItem(EobCharacter *c, Item itemIndex, int16 i
 	}
 }
 
-int EobCoreEngine::deleteInventoryItem(int charIndex, int slot) {
+int EoBCoreEngine::deleteInventoryItem(int charIndex, int slot) {
 	int itm = (slot == -1) ? _itemInHand : _characters[charIndex].inventory[slot];
 	_items[itm].block = -1;
 
@@ -173,7 +173,7 @@ int EobCoreEngine::deleteInventoryItem(int charIndex, int slot) {
 	return _items[itm].value;
 }
 
-void EobCoreEngine::deleteBlockItem(uint16 block, int type) {
+void EoBCoreEngine::deleteBlockItem(uint16 block, int type) {
 	uint16 itm = _levelBlockProperties[block].drawObjects;
 	if (!itm)
 		return;
@@ -196,7 +196,7 @@ void EobCoreEngine::deleteBlockItem(uint16 block, int type) {
 	}
 }
 
-int EobCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int slot) {
+int EoBCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int slot) {
 	if (item < 0)
 		return 0;
 
@@ -222,7 +222,7 @@ int EobCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int sl
 	return 0;
 }
 
-int EobCoreEngine::stripPartyItems(int16 itemType, int16 itemValue, int handleValueMode, int numItems) {
+int EoBCoreEngine::stripPartyItems(int16 itemType, int16 itemValue, int handleValueMode, int numItems) {
 	int itemsLeft = numItems;
 
 	for (bool runloop = true; runloop && itemsLeft; ) {
@@ -249,13 +249,13 @@ int EobCoreEngine::stripPartyItems(int16 itemType, int16 itemValue, int handleVa
 	return numItems - itemsLeft;
 }
 
-bool EobCoreEngine::deletePartyItems(int16 itemType, int16 itemValue) {
+bool EoBCoreEngine::deletePartyItems(int16 itemType, int16 itemValue) {
 	bool res = false;
 	for (int i = 0; i < 6; i++) {
 		if (!testCharacter(i, 1))
 			continue;
 
-		EobCharacter *c = &_characters[i];
+		EoBCharacter *c = &_characters[i];
 		for (int slot = checkInventoryForItem(i, itemType, itemValue); slot != -1; slot = checkInventoryForItem(i, itemType, itemValue)) {
 			int itm = c->inventory[slot];
 			_items[itm].block = -1;
@@ -283,14 +283,14 @@ bool EobCoreEngine::deletePartyItems(int16 itemType, int16 itemValue) {
 	return res;
 }
 
-int EobCoreEngine::itemUsableByCharacter(int charIndex, Item item) {
+int EoBCoreEngine::itemUsableByCharacter(int charIndex, Item item) {
 	if (!item)
 		return 1;
 
 	return (_itemTypes[_items[item].type].allowedClasses & _classModifierFlags[_characters[charIndex].cClass]);
 }
 
-int EobCoreEngine::countQueuedItems(Item itemQueue, int16 id, int16 type, int count, int includeFlyingItems) {
+int EoBCoreEngine::countQueuedItems(Item itemQueue, int16 id, int16 type, int count, int includeFlyingItems) {
 	uint16 o1 = itemQueue;
 	uint16 o2 = o1;
 
@@ -300,7 +300,7 @@ int EobCoreEngine::countQueuedItems(Item itemQueue, int16 id, int16 type, int co
 	int res = 0;
 
 	for (bool forceLoop = true; o1 != o2 || forceLoop; o1 = _items[o1].prev) {
-		EobItem *itm = &_items[o1];
+		EoBItem *itm = &_items[o1];
 		forceLoop = false;
 		if (id != -1 || type != -1) {
 			if (((id != -1) || (id == -1 && type != itm->type)) && ((type != -1) || (type == -1 && id != o1)))
@@ -321,14 +321,14 @@ int EobCoreEngine::countQueuedItems(Item itemQueue, int16 id, int16 type, int co
 	return res;
 }
 
-int EobCoreEngine::getQueuedItem(Item *items, int pos, int id) {
+int EoBCoreEngine::getQueuedItem(Item *items, int pos, int id) {
 	Item o1 = *items;
 	Item o2 = o1;
 
 	if (!o1)
 		return 0;
 
-	EobItem *itm = &_items[o1];
+	EoBItem *itm = &_items[o1];
 
 	for (bool forceLoop = true; o1 != o2 || forceLoop; o1 = itm->prev) {
 		itm = &_items[o1];
@@ -353,8 +353,8 @@ int EobCoreEngine::getQueuedItem(Item *items, int pos, int id) {
 	return 0;
 }
 
-void EobCoreEngine::printFullItemName(Item item) {
-	EobItem *itm = &_items[item];
+void EoBCoreEngine::printFullItemName(Item item) {
+	EoBItem *itm = &_items[item];
 	const char *nameUnid = _itemNames[itm->nameUnid];
 	const char *nameId = _itemNames[itm->nameId];
 	uint8 f = _itemTypes[itm->type].extraProperties & 0x7f;
@@ -445,7 +445,7 @@ void EobCoreEngine::printFullItemName(Item item) {
 	_txt->printMessage(tmpString.c_str());
 }
 
-void EobCoreEngine::identifyQueuedItems(Item itemQueue) {
+void EoBCoreEngine::identifyQueuedItems(Item itemQueue) {
 	if (!itemQueue)
 		return;
 
@@ -457,7 +457,7 @@ void EobCoreEngine::identifyQueuedItems(Item itemQueue) {
 	} while (first != itemQueue);
 }
 
-void EobCoreEngine::drawItemIconShape(int pageNum, Item itemId, int x, int y) {
+void EoBCoreEngine::drawItemIconShape(int pageNum, Item itemId, int x, int y) {
 	int icn = _items[itemId].icon;
 	bool applyBluePal = ((_partyEffectFlags & 2) && (_items[itemId].flags & 0x80)) ? true : false;
 
@@ -480,11 +480,11 @@ void EobCoreEngine::drawItemIconShape(int pageNum, Item itemId, int x, int y) {
 	}
 }
 
-bool EobCoreEngine::isMagicEffectItem(Item itemIndex) {
+bool EoBCoreEngine::isMagicEffectItem(Item itemIndex) {
 	return (itemIndex > 10 && itemIndex < 18);
 }
 
-bool EobCoreEngine::checkInventoryForRings(int charIndex, int itemValue) {
+bool EoBCoreEngine::checkInventoryForRings(int charIndex, int itemValue) {
 	for (int i = 25; i <= 26; i++) {
 		int itm = _characters[charIndex].inventory[i];
 		if (itm && _items[itm].type == 47 && _items[itm].value == itemValue)
@@ -493,8 +493,8 @@ bool EobCoreEngine::checkInventoryForRings(int charIndex, int itemValue) {
 	return false;
 }
 
-void EobCoreEngine::eatItemInHand(int charIndex) {
-	EobCharacter *c = &_characters[charIndex];
+void EoBCoreEngine::eatItemInHand(int charIndex) {
+	EoBCharacter *c = &_characters[charIndex];
 	if (!testCharacter(charIndex, 5)) {
 		_txt->printMessage(_warningStrings[1], -1, c->name);
 	} else if (_itemInHand && _items[_itemInHand].type != 31 && !(_flags.gameID == GI_EOB1 && _items[_itemInHand].type == 49)) {
@@ -514,8 +514,8 @@ void EobCoreEngine::eatItemInHand(int charIndex) {
 	}
 }
 
-bool EobCoreEngine::launchObject(int charIndex, Item item, uint16 startBlock, int startPos, int dir, int type) {
-	EobFlyingObject *t = _flyingObjects;
+bool EoBCoreEngine::launchObject(int charIndex, Item item, uint16 startBlock, int startPos, int dir, int type) {
+	EoBFlyingObject *t = _flyingObjects;
 	int slot = 0;
 	for (; slot < 10; slot++) {
 		if (!t->enable)
@@ -544,8 +544,8 @@ bool EobCoreEngine::launchObject(int charIndex, Item item, uint16 startBlock, in
 	return true;
 }
 
-void EobCoreEngine::launchMagicObject(int charIndex, int type, uint16 startBlock, int startPos, int dir) {
-	EobFlyingObject *t = _flyingObjects;
+void EoBCoreEngine::launchMagicObject(int charIndex, int type, uint16 startBlock, int startPos, int dir) {
+	EoBFlyingObject *t = _flyingObjects;
 	int slot = 0;
 	for (; slot < 10; slot++) {
 		if (!t->enable)
@@ -571,7 +571,7 @@ void EobCoreEngine::launchMagicObject(int charIndex, int type, uint16 startBlock
 	_sceneUpdateRequired = true;
 }
 
-bool EobCoreEngine::updateObjectFlight(EobFlyingObject *fo, int block, int pos) {
+bool EoBCoreEngine::updateObjectFlight(EoBFlyingObject *fo, int block, int pos) {
 	uint8 wallFlags = _wllWallFlags[_levelBlockProperties[block].walls[fo->direction ^ 2]];
 	if (fo->enable == 1) {
 		if ((wallFlags & 1) || (fo->u2) || ((wallFlags & 2) && (_dscItemShapeMap[_items[fo->item].icon] >= 15))) {
@@ -599,7 +599,7 @@ bool EobCoreEngine::updateObjectFlight(EobFlyingObject *fo, int block, int pos)
 	return true;
 }
 
-bool EobCoreEngine::updateFlyingObjectHitTest(EobFlyingObject *fo, int block, int pos) {
+bool EoBCoreEngine::updateFlyingObjectHitTest(EoBFlyingObject *fo, int block, int pos) {
 	if (fo->u2 && (fo->curBlock != _currentBlock || fo->attackerId >= 0) && (!blockHasMonsters(block) || fo->attackerId < 0))
 		return false;
 
@@ -623,7 +623,7 @@ bool EobCoreEngine::updateFlyingObjectHitTest(EobFlyingObject *fo, int block, in
 	return false;
 }
 
-void EobCoreEngine::explodeObject(EobFlyingObject *fo, int block, Item item) {
+void EoBCoreEngine::explodeObject(EoBFlyingObject *fo, int block, Item item) {
 	if (_partyResting) {
 		snd_processEnvironmentalSoundEffect(35, _currentBlock);
 		return;
@@ -688,21 +688,21 @@ void EobCoreEngine::explodeObject(EobFlyingObject *fo, int block, Item item) {
 	enableSysTimer(2);
 }
 
-void EobCoreEngine::endObjectFlight(EobFlyingObject *fo) {
+void EoBCoreEngine::endObjectFlight(EoBFlyingObject *fo) {
 	if (fo->enable == 1) {
 		_items[fo->item].pos &= 3;
 		runLevelScript(fo->curBlock, 4);
 		updateEnvironmentalSfx(18);
 	}
-	memset(fo, 0, sizeof(EobFlyingObject));
+	memset(fo, 0, sizeof(EoBFlyingObject));
 }
 
-void EobCoreEngine::checkFlyingObjects() {
+void EoBCoreEngine::checkFlyingObjects() {
 	if (!_runFlag)
 		return;
 
 	for (int i = 0; i < 10; i++) {
-		EobFlyingObject *fo = &_flyingObjects[i];
+		EoBFlyingObject *fo = &_flyingObjects[i];
 		if (!fo->enable)
 			continue;
 		if (updateFlyingObjectHitTest(fo, fo->curBlock, fo->curPos))
@@ -710,7 +710,7 @@ void EobCoreEngine::checkFlyingObjects() {
 	}
 }
 
-void EobCoreEngine::reloadWeaponSlot(int charIndex, int slotIndex, int itemType, int arrowOrDagger) {
+void EoBCoreEngine::reloadWeaponSlot(int charIndex, int slotIndex, int itemType, int arrowOrDagger) {
 	if (arrowOrDagger && _characters[charIndex].inventory[16]) {
 		_characters[charIndex].inventory[slotIndex] = getQueuedItem(&_characters[charIndex].inventory[16], 0, -1);
 	} else {
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index df595b6ffa..c3c4e6083c 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -286,7 +286,7 @@ Common::Error KyraEngine_HoF::go() {
 		if (_flags.isDemo && !_flags.isTalkie) {
 #ifdef ENABLE_LOL
 			if (_flags.gameID == GI_LOL)
-				seq_playSequences(kSequenceLolDemoScene1, kSequenceLolDemoScene6);
+				seq_playSequences(kSequenceLoLDemoScene1, kSequenceLoLDemoScene6);
 			else
 #endif // ENABLE_LOL
 				seq_playSequences(kSequenceDemoVirgin, kSequenceDemoFisher);
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index a6add505cb..4b8303b2e4 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -95,18 +95,18 @@ enum NestedSequencesDemo {
 };
 
 #ifdef ENABLE_LOL
-enum SequencesLolDemo {
-	kSequenceLolDemoScene1 = 0,
-	kSequenceLolDemoText1,
-	kSequenceLolDemoScene2,
-	kSequenceLolDemoText2,
-	kSequenceLolDemoScene3,
-	kSequenceLolDemoText3,
-	kSequenceLolDemoScene4,
-	kSequenceLolDemoText4,
-	kSequenceLolDemoScene5,
-	kSequenceLolDemoText5,
-	kSequenceLolDemoScene6
+enum SequencesLoLDemo {
+	kSequenceLoLDemoScene1 = 0,
+	kSequenceLoLDemoText1,
+	kSequenceLoLDemoScene2,
+	kSequenceLoLDemoText2,
+	kSequenceLoLDemoScene3,
+	kSequenceLoLDemoText3,
+	kSequenceLoLDemoScene4,
+	kSequenceLoLDemoText4,
+	kSequenceLoLDemoScene5,
+	kSequenceLoLDemoText5,
+	kSequenceLoLDemoScene6
 };
 #endif // ENABLE_LOL
 
diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp
index 4a0db7b78d..a4c92b6125 100644
--- a/engines/kyra/kyra_rpg.cpp
+++ b/engines/kyra/kyra_rpg.cpp
@@ -78,7 +78,7 @@ KyraRpgEngine::KyraRpgEngine(OSystem *system, const GameFlags &flags) : KyraEngi
 	_sceneUpdateRequired = false;
 
 	_flyingObjectsPtr = 0;
-	_flyingObjectStructSize = sizeof(EobFlyingObject);
+	_flyingObjectStructSize = sizeof(EoBFlyingObject);
 
 	_clickedShapeXOffs = _clickedShapeYOffs = 0;
 
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index 9acc6ff0dc..31fb9bc8d7 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -64,7 +64,7 @@ struct LevelTempData {
 	uint8 monsterDifficulty;
 };
 
-struct EobFlyingObject {
+struct EoBFlyingObject {
 	uint8 enable;
 	uint8 objectType;
 	int16 attackerId;
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 8561b5e071..01b1bdf065 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -414,10 +414,10 @@ Common::Error LoLEngine::init() {
 	_wllAutomapData = new uint8[80];
 	memset(_wllAutomapData, 0, 80);
 
-	_monsters = new LolMonsterInPlay[30];
-	memset(_monsters, 0, 30 * sizeof(LolMonsterInPlay));
-	_monsterProperties = new LolMonsterProperty[5];
-	memset(_monsterProperties, 0, 5 * sizeof(LolMonsterProperty));
+	_monsters = new LoLMonsterInPlay[30];
+	memset(_monsters, 0, 30 * sizeof(LoLMonsterInPlay));
+	_monsterProperties = new LoLMonsterProperty[5];
+	memset(_monsterProperties, 0, 5 * sizeof(LoLMonsterProperty));
 
 	_tempBuffer5120 = new uint8[5120];
 	memset(_tempBuffer5120, 0, 5120);
@@ -1956,7 +1956,7 @@ void LoLEngine::setupDialogueButtons(int numStr, const char *s1, const char *s2,
 		removeInputTop();
 }
 
-void LoLEngine::giveItemToMonster(LolMonsterInPlay *monster, Item item) {
+void LoLEngine::giveItemToMonster(LoLMonsterInPlay *monster, Item item) {
 	uint16 *c = &monster->assignedItems;
 	while (*c)
 		c = &_itemsInPlay[*c].nextAssignedObject;
@@ -2403,7 +2403,7 @@ int LoLEngine::processMagicIce(int charNum, int spellLevel) {
 			int might = rollDice(iceDamageMin[spellLevel], iceDamageMax[spellLevel]) + iceDamageAdd[spellLevel];
 			int dmg = calcInflictableDamagePerItem(charNum, 0, might, 3, 2);
 
-			LolMonsterInPlay *m = &_monsters[o & 0x7fff];
+			LoLMonsterInPlay *m = &_monsters[o & 0x7fff];
 			if (m->hitPoints <= dmg) {
 				increaseExperience(charNum, 2, m->hitPoints);
 				o = m->nextAssignedObject;
@@ -2482,7 +2482,7 @@ int LoLEngine::processMagicFireball(int charNum, int spellLevel) {
 			while (o & 0x8000) {
 				static const uint8 fireballDamage[] = { 20, 40, 80, 100 };
 				int dmg = calcInflictableDamagePerItem(charNum, o, fireballDamage[spellLevel], 4, 1);
-				LolMonsterInPlay *m = &_monsters[o & 0x7fff];
+				LoLMonsterInPlay *m = &_monsters[o & 0x7fff];
 				o = m->nextAssignedObject;
 				_envSfxUseQueue = true;
 				inflictDamage(m->id | 0x8000, dmg, charNum, 2, 4);
@@ -2647,7 +2647,7 @@ int LoLEngine::processMagicHandOfFate(int spellLevel) {
 				uint16 o = _levelBlockProperties[b1].assignedObjects;
 				while (o & 0x8000) {
 					uint16 o2 = o;
-					LolMonsterInPlay *m = &_monsters[o & 0x7fff];
+					LoLMonsterInPlay *m = &_monsters[o & 0x7fff];
 					o = findObject(o)->nextAssignedObject;
 					int nX = 0;
 					int nY = 0;
@@ -2916,7 +2916,7 @@ int LoLEngine::processMagicVaelansCube() {
 
 	uint16 o = _levelBlockProperties[bl].assignedObjects;
 	while (o & 0x8000) {
-		LolMonsterInPlay *m = &_monsters[o & 0x7fff];
+		LoLMonsterInPlay *m = &_monsters[o & 0x7fff];
 		if (m->properties->flags & 0x1000) {
 			inflictDamage(o, 100, 0xffff, 0, 0x80);
 			v = 1;
@@ -3396,7 +3396,7 @@ int LoLEngine::calcInflictableDamage(int16 attacker, int16 target, int hitType)
 }
 
 int LoLEngine::inflictDamage(uint16 target, int damage, uint16 attacker, int skill, int flags) {
-	LolMonsterInPlay *m = 0;
+	LoLMonsterInPlay *m = 0;
 	LoLCharacter *c = 0;
 
 	if (target & 0x8000) {
@@ -3613,7 +3613,7 @@ void LoLEngine::checkForPartyDeath() {
 	}
 }
 
-void LoLEngine::applyMonsterAttackSkill(LolMonsterInPlay *monster, int16 target, int16 damage) {
+void LoLEngine::applyMonsterAttackSkill(LoLMonsterInPlay *monster, int16 target, int16 damage) {
 	if (rollDice(1, 100) > monster->properties->attackSkillChance)
 		return;
 
@@ -3683,7 +3683,7 @@ void LoLEngine::applyMonsterAttackSkill(LolMonsterInPlay *monster, int16 target,
 	}
 }
 
-void LoLEngine::applyMonsterDefenseSkill(LolMonsterInPlay *monster, int16 attacker, int flags, int skill, int damage) {
+void LoLEngine::applyMonsterDefenseSkill(LoLMonsterInPlay *monster, int16 attacker, int flags, int skill, int damage) {
 	if (rollDice(1, 100) > monster->properties->defenseSkillChance)
 		return;
 
@@ -3942,7 +3942,7 @@ uint16 LoLEngine::getNearestMonsterFromCharacterForBlock(uint16 block, int charN
 	int o = _levelBlockProperties[block].assignedObjects;
 
 	while (o & 0x8000) {
-		LolMonsterInPlay *m = &_monsters[o & 0x7fff];
+		LoLMonsterInPlay *m = &_monsters[o & 0x7fff];
 		if (m->mode >= 13) {
 			o = m->nextAssignedObject;
 			continue;
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index dabc141775..eeaa1b51ad 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -86,7 +86,7 @@ struct SpellProperty {
 	uint16 flags;
 };
 
-struct LolMonsterProperty {
+struct LoLMonsterProperty {
 	uint8 shapeIndex;
 	uint8 maxWidth;
 	uint16 fightingStats[9];
@@ -108,7 +108,7 @@ struct LolMonsterProperty {
 	uint8 sounds[3];
 };
 
-struct LolMonsterInPlay {
+struct LoLMonsterInPlay {
 	uint16 nextAssignedObject;
 	uint16 nextDrawObject;
 	uint8 flyingHeight;
@@ -134,7 +134,7 @@ struct LolMonsterInPlay {
 	int16 hitPoints;
 	uint8 speedTick;
 	uint8 type;
-	LolMonsterProperty *properties;
+	LoLMonsterProperty *properties;
 	uint8 numDistAttacks;
 	uint8 curDistWeapon;
 	int8 distAttackTick;
@@ -1089,16 +1089,16 @@ private:
 	void loadMonsterShapes(const char *file, int monsterIndex, int b);
 	void releaseMonsterShapes(int monsterIndex);
 	int deleteMonstersFromBlock(int block);
-	void setMonsterMode(LolMonsterInPlay *monster, int mode);
-	bool updateMonsterAdjustBlocks(LolMonsterInPlay *monster);
-	void placeMonster(LolMonsterInPlay *monster, uint16 x, uint16 y);
+	void setMonsterMode(LoLMonsterInPlay *monster, int mode);
+	bool updateMonsterAdjustBlocks(LoLMonsterInPlay *monster);
+	void placeMonster(LoLMonsterInPlay *monster, uint16 x, uint16 y);
 	int calcMonsterDirection(uint16 x1, uint16 y1, uint16 x2, uint16 y2);
-	void setMonsterDirection(LolMonsterInPlay *monster, int dir);
-	void monsterDropItems(LolMonsterInPlay *monster);
+	void setMonsterDirection(LoLMonsterInPlay *monster, int dir);
+	void monsterDropItems(LoLMonsterInPlay *monster);
 	void removeAssignedObjectFromBlock(LevelBlockProperty *l, uint16 id);
 	void removeDrawObjectFromBlock(LevelBlockProperty *l, uint16 id);
 	void assignMonsterToBlock(uint16 *assignedBlockObjects, uint16 id);
-	void giveItemToMonster(LolMonsterInPlay *monster, Item item);
+	void giveItemToMonster(LoLMonsterInPlay *monster, Item item);
 	int checkBlockBeforeObjectPlacement(uint16 x, uint16 y, uint16 objectWidth, uint16 testFlag, uint16 wallFlag);
 	int checkBlockForWallsAndSufficientSpace(int block, int x, int y, int objectWidth, int testFlag, int wallFlag);
 	int calcMonsterSkillLevel(int id, int a);
@@ -1109,7 +1109,7 @@ private:
 
 	void drawBlockObjects(int blockArrayIndex);
 	void drawMonster(uint16 id);
-	int getMonsterCurFrame(LolMonsterInPlay *m, uint16 dirFlags);
+	int getMonsterCurFrame(LoLMonsterInPlay *m, uint16 dirFlags);
 	void reassignDrawObjects(uint16 direction, uint16 itemIndex, LevelBlockProperty *l, bool flag);
 	void redrawSceneItem();
 	int calcItemMonsterPosition(ItemInPlay *i, uint16 direction);
@@ -1119,21 +1119,21 @@ private:
 	uint8 *drawItemOrMonster(uint8 *shape, uint8 *monsterPalette, int x, int y, int fineX, int fineY, int flags, int tblValue, bool vflip);
 	int calcDrawingLayerParameters(int srcX, int srcY, int &x2, int &y2, uint16 &w, uint16 &h, uint8 *shape, int vflip);
 
-	void updateMonster(LolMonsterInPlay *monster);
-	void moveMonster(LolMonsterInPlay *monster);
-	void walkMonster(LolMonsterInPlay *monster);
-	bool chasePartyWithDistanceAttacks(LolMonsterInPlay *monster);
-	void chasePartyWithCloseAttacks(LolMonsterInPlay *monster);
-	int walkMonsterCalcNextStep(LolMonsterInPlay *monster);
+	void updateMonster(LoLMonsterInPlay *monster);
+	void moveMonster(LoLMonsterInPlay *monster);
+	void walkMonster(LoLMonsterInPlay *monster);
+	bool chasePartyWithDistanceAttacks(LoLMonsterInPlay *monster);
+	void chasePartyWithCloseAttacks(LoLMonsterInPlay *monster);
+	int walkMonsterCalcNextStep(LoLMonsterInPlay *monster);
 	int checkForPossibleDistanceAttack(uint16 monsterBlock, int direction, int distance, uint16 curBlock);
-	int walkMonsterCheckDest(int x, int y, LolMonsterInPlay *monster, int unk);
+	int walkMonsterCheckDest(int x, int y, LoLMonsterInPlay *monster, int unk);
 	void getNextStepCoords(int16 monsterX, int16 monsterY, int &newX, int &newY, uint16 direction);
-	void rearrangeAttackingMonster(LolMonsterInPlay *monster);
-	void moveStrayingMonster(LolMonsterInPlay *monster);
-	void killMonster(LolMonsterInPlay *monster);
+	void rearrangeAttackingMonster(LoLMonsterInPlay *monster);
+	void moveStrayingMonster(LoLMonsterInPlay *monster);
+	void killMonster(LoLMonsterInPlay *monster);
 
-	LolMonsterInPlay *_monsters;
-	LolMonsterProperty *_monsterProperties;
+	LoLMonsterInPlay *_monsters;
+	LoLMonsterProperty *_monsterProperties;
 	uint8 **_monsterDecorationShapes;
 	uint8 _monsterAnimType[3];
 	uint16 _monsterCurBlock;
@@ -1242,8 +1242,8 @@ private:
 	int calcInflictableDamagePerItem(int16 attacker, int16 target, uint16 itemMight, int index, int hitType);
 	void checkForPartyDeath();
 
-	void applyMonsterAttackSkill(LolMonsterInPlay *monster, int16 target, int16 damage);
-	void applyMonsterDefenseSkill(LolMonsterInPlay *monster, int16 attacker, int flags, int skill, int damage);
+	void applyMonsterAttackSkill(LoLMonsterInPlay *monster, int16 target, int16 damage);
+	void applyMonsterDefenseSkill(LoLMonsterInPlay *monster, int16 attacker, int flags, int skill, int damage);
 	int removeCharacterItem(int charNum, int itemFlags);
 	int paralyzePoisonCharacter(int charNum, int typeFlag, int immunityFlags, int hitChance, int redraw);
 	void paralyzePoisonAllCharacters(int typeFlag, int immunityFlags, int hitChance);
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index e3428fb3c7..c1b0327df2 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -28,8 +28,8 @@
 
 namespace Kyra {
 
-void EobCoreEngine::useMagicBookOrSymbol(int charIndex, int type) {
-	EobCharacter *c = &_characters[charIndex];
+void EoBCoreEngine::useMagicBookOrSymbol(int charIndex, int type) {
+	EoBCharacter *c = &_characters[charIndex];
 	_openBookSpellLevel = c->slotStatus[3];
 	_openBookSpellSelectedItem = c->slotStatus[2];
 	_openBookSpellListOffset = c->slotStatus[4];
@@ -66,7 +66,7 @@ void EobCoreEngine::useMagicBookOrSymbol(int charIndex, int type) {
 	gui_drawSpellbook();
 }
 
-void EobCoreEngine::useMagicScroll(int charIndex, int type, int weaponSlot) {
+void EoBCoreEngine::useMagicScroll(int charIndex, int type, int weaponSlot) {
 	_openBookCharBackup = _openBookChar;
 	_openBookTypeBackup = _openBookType;
 	_castScrollSlot = weaponSlot + 1;
@@ -75,8 +75,8 @@ void EobCoreEngine::useMagicScroll(int charIndex, int type, int weaponSlot) {
 	castSpell(type, weaponSlot);
 }
 
-void EobCoreEngine::usePotion(int charIndex, int weaponSlot) {
-	EobCharacter *c = &_characters[charIndex];
+void EoBCoreEngine::usePotion(int charIndex, int weaponSlot) {
+	EoBCharacter *c = &_characters[charIndex];
 
 	int val = deleteInventoryItem(charIndex, weaponSlot);
 	snd_playSoundEffect(10);
@@ -142,7 +142,7 @@ void EobCoreEngine::usePotion(int charIndex, int weaponSlot) {
 	_txt->printMessage(_potionStrings[1], -1, c->name, _potionEffectStrings[val]);
 }
 
-void EobCoreEngine::useWand(int charIndex, int weaponSlot) {
+void EoBCoreEngine::useWand(int charIndex, int weaponSlot) {
 	int v = _items[_characters[charIndex].inventory[weaponSlot]].value;
 	if (!v) {
 		_txt->printMessage(_wandStrings[0]);
@@ -172,9 +172,9 @@ void EobCoreEngine::useWand(int charIndex, int weaponSlot) {
 	}
 }
 
-void EobCoreEngine::castSpell(int spell, int weaponSlot) {
-	EobSpell *s = &_spells[spell];
-	EobCharacter *c = &_characters[_openBookChar];
+void EoBCoreEngine::castSpell(int spell, int weaponSlot) {
+	EoBSpell *s = &_spells[spell];
+	EoBCharacter *c = &_characters[_openBookChar];
 	_activeSpell = spell;
 
 	if ((s->flags & 0x100) && (c->effectFlags & 0x40))
@@ -231,10 +231,10 @@ void EobCoreEngine::castSpell(int spell, int weaponSlot) {
 	startSpell(spell);
 }
 
-void EobCoreEngine::removeCharacterEffect(int spell, int charIndex, int showWarning) {
+void EoBCoreEngine::removeCharacterEffect(int spell, int charIndex, int showWarning) {
 	assert(spell >= 0);
-	EobCharacter *c = &_characters[charIndex];
-	EobSpell *s = &_spells[spell];
+	EoBCharacter *c = &_characters[charIndex];
+	EoBSpell *s = &_spells[spell];
 
 	if (showWarning) {
 		int od = _screen->curDimIndex();
@@ -275,8 +275,8 @@ void EobCoreEngine::removeCharacterEffect(int spell, int charIndex, int showWarn
 	}
 }
 
-void EobCoreEngine::removeAllCharacterEffects(int charIndex) {
-	EobCharacter *c = &_characters[charIndex];
+void EoBCoreEngine::removeAllCharacterEffects(int charIndex) {
+	EoBCharacter *c = &_characters[charIndex];
 	c->effectFlags = 0;
 	memset(c->effectsRemainder, 0, 4);
 
@@ -298,14 +298,14 @@ void EobCoreEngine::removeAllCharacterEffects(int charIndex) {
 	gui_drawAllCharPortraitsWithStats();
 }
 
-void EobCoreEngine::castOnWhomDialogue() {
+void EoBCoreEngine::castOnWhomDialogue() {
 	printWarning(_magicStrings3[0]);
 	gui_setCastOnWhomButtons();
 }
 
-void EobCoreEngine::startSpell(int spell) {
-	EobSpell *s = &_spells[spell];
-	EobCharacter *c = &_characters[_activeSpellCharId];
+void EoBCoreEngine::startSpell(int spell) {
+	EoBSpell *s = &_spells[spell];
+	EoBCharacter *c = &_characters[_activeSpellCharId];
 	snd_playSoundEffect(s->sound);
 
 	if (s->flags & 0xa0)
@@ -379,7 +379,7 @@ void EobCoreEngine::startSpell(int spell) {
 	}
 }
 
-void EobCoreEngine::sparkEffectDefensive(int charIndex) {
+void EoBCoreEngine::sparkEffectDefensive(int charIndex) {
 	int first = charIndex;
 	int last = charIndex;
 	if (charIndex == -1) {
@@ -418,7 +418,7 @@ void EobCoreEngine::sparkEffectDefensive(int charIndex) {
 		gui_drawCharPortraitWithStats(i);
 }
 
-void EobCoreEngine::sparkEffectOffensive() {
+void EoBCoreEngine::sparkEffectOffensive() {
 	disableSysTimer(2);
 	_screen->copyRegion(0, 0, 0, 0, 176, 120, 0, 2, Screen::CR_NO_P_CHECK);
 
@@ -447,14 +447,14 @@ void EobCoreEngine::sparkEffectOffensive() {
 	enableSysTimer(2);
 }
 
-void EobCoreEngine::setSpellEventTimer(int spell, int timerBaseFactor, int timerLength, int timerLevelFactor, int updateExistingTimer) {
+void EoBCoreEngine::setSpellEventTimer(int spell, int timerBaseFactor, int timerLength, int timerLevelFactor, int updateExistingTimer) {
 	assert (spell >= 0);
 	int l = _openBookType == 1 ? getClericPaladinLevel(_openBookChar) : getMageLevel(_openBookChar);
 	uint32 countdown = timerLength * timerBaseFactor + timerLength * l * timerLevelFactor;
 	setCharEventTimer(_activeSpellCharId, countdown, -spell, updateExistingTimer);
 }
 
-void EobCoreEngine::sortCharacterSpellList(int charIndex) {
+void EoBCoreEngine::sortCharacterSpellList(int charIndex) {
 	int8 *list = _characters[charIndex].mageSpells;
 
 	for (int i = 0; i < 16; ) {
@@ -490,7 +490,7 @@ void EobCoreEngine::sortCharacterSpellList(int charIndex) {
 	}
 }
 
-bool EobCoreEngine::magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level) {
+bool EoBCoreEngine::magicObjectDamageHit(EoBFlyingObject *fo, int dcTimes, int dcPips, int dcOffs, int level) {
 	int ignoreAttackerId = fo->flags & 0x10;
 	int singleTargetCheckAdjacent = fo->flags & 1;
 	int blockDamage = fo->flags & 2;
@@ -565,8 +565,8 @@ bool EobCoreEngine::magicObjectDamageHit(EobFlyingObject *fo, int dcTimes, int d
 	return res;
 }
 
-bool EobCoreEngine::magicObjectStatusHit(EobMonsterInPlay *m, int type, bool tryEvade, int mod) {
-	EobMonsterProperty *p = &_monsterProps[m->type];
+bool EoBCoreEngine::magicObjectStatusHit(EoBMonsterInPlay *m, int type, bool tryEvade, int mod) {
+	EoBMonsterProperty *p = &_monsterProps[m->type];
 	if (tryEvade) {
 		if (tryMonsterAttackEvasion(m) || (p->immunityFlags & 0x10))
 			return true;
@@ -619,7 +619,7 @@ bool EobCoreEngine::magicObjectStatusHit(EobMonsterInPlay *m, int type, bool try
 	return true;
 }
 
-bool EobCoreEngine::turnUndeadHit(EobMonsterInPlay *m, int hitChance, int casterLevel) {
+bool EoBCoreEngine::turnUndeadHit(EoBMonsterInPlay *m, int hitChance, int casterLevel) {
 	assert(_monsterProps[m->type].tuResist > 0);
 	uint8 e = _turnUndeadEffect[_monsterProps[m->type].tuResist * 14 + MIN(casterLevel, 14)];
 
@@ -637,11 +637,11 @@ bool EobCoreEngine::turnUndeadHit(EobMonsterInPlay *m, int hitChance, int caster
 	return true;
 }
 
-int EobCoreEngine::getMagicWeaponSlot(int charIndex) {
+int EoBCoreEngine::getMagicWeaponSlot(int charIndex) {
 	return _characters[charIndex].inventory[1] ? 0 : 1;
 }
 
-void EobCoreEngine::causeWounds(int dcTimes, int dcPips, int dcOffs) {
+void EoBCoreEngine::causeWounds(int dcTimes, int dcPips, int dcOffs) {
 	if (_openBookChar == 0 || _openBookChar == 1) {
 		int d = getClosestMonster(_openBookChar, calcNewBlockPosition(_currentBlock, _currentDirection));
 		if (d != -1) {
@@ -661,7 +661,7 @@ void EobCoreEngine::causeWounds(int dcTimes, int dcPips, int dcOffs) {
 	}
 }
 
-int EobCoreEngine::createMagicWeaponType(int invFlags, int handFlags, int armorClass, int allowedClasses, int dmgNumDice, int dmgPips, int dmgInc, int extraProps) {
+int EoBCoreEngine::createMagicWeaponType(int invFlags, int handFlags, int armorClass, int allowedClasses, int dmgNumDice, int dmgPips, int dmgInc, int extraProps) {
 	int i = 51;
 	for (; i < 57; i++) {
 		if (_itemTypes[i].armorClass == -30)
@@ -671,7 +671,7 @@ int EobCoreEngine::createMagicWeaponType(int invFlags, int handFlags, int armorC
 	if (i == 57)
 		return -1;
 
-	EobItemType *tp = &_itemTypes[i];
+	EoBItemType *tp = &_itemTypes[i];
 	tp->invFlags = invFlags;
 	tp->requiredHands = 0;
 	tp->handFlags = handFlags;
@@ -685,7 +685,7 @@ int EobCoreEngine::createMagicWeaponType(int invFlags, int handFlags, int armorC
 	return i;
 }
 
-Item EobCoreEngine::createMagicWeaponItem(int flags, int icon, int value, int type) {
+Item EoBCoreEngine::createMagicWeaponItem(int flags, int icon, int value, int type) {
 	Item i = 11;
 	for (; i < 17; i++) {
 		if (_items[i].block == -2)
@@ -695,7 +695,7 @@ Item EobCoreEngine::createMagicWeaponItem(int flags, int icon, int value, int ty
 	if (i == 17)
 		return -1;
 
-	EobItem *itm = &_items[i];
+	EoBItem *itm = &_items[i];
 	itm->flags = 0x20 | flags;
 	itm->icon = icon;
 	itm->value = value;
@@ -708,13 +708,13 @@ Item EobCoreEngine::createMagicWeaponItem(int flags, int icon, int value, int ty
 	return i;
 }
 
-void EobCoreEngine::removeMagicWeaponItem(Item item) {
+void EoBCoreEngine::removeMagicWeaponItem(Item item) {
 	_itemTypes[_items[item].type].armorClass = -30;
 	_items[item].block = -2;
 	_items[item].level = -1;
 }
 
-void EobCoreEngine::updateWallOfForceTimers() {
+void EoBCoreEngine::updateWallOfForceTimers() {
 	uint32 ct = _system->getMillis();
 	for (int i = 0; i < 5; i++) {
 		if (!_wallsOfForce[i].block)
@@ -724,13 +724,13 @@ void EobCoreEngine::updateWallOfForceTimers() {
 	}
 }
 
-void EobCoreEngine::destroyWallOfForce(int index) {
+void EoBCoreEngine::destroyWallOfForce(int index) {
 	memset(_levelBlockProperties[_wallsOfForce[index].block].walls, 0, 4);
 	_wallsOfForce[index].block = 0;
 	_sceneUpdateRequired = true;
 }
 
-int EobCoreEngine::findSingleSpellTarget(int dist) {
+int EoBCoreEngine::findSingleSpellTarget(int dist) {
 	uint16 bl = _currentBlock;
 	int res = -1;
 
@@ -746,7 +746,7 @@ int EobCoreEngine::findSingleSpellTarget(int dist) {
 	return res;
 }
 
-int EobCoreEngine::findFirstCharacterSpellTarget() {
+int EoBCoreEngine::findFirstCharacterSpellTarget() {
 	int curCharIndex = rollDice(1, 6, -1);
 	for (_characterSpellTarget = 0; _characterSpellTarget < 6; _characterSpellTarget++) {
 		if (testCharacter(curCharIndex, 3))
@@ -757,7 +757,7 @@ int EobCoreEngine::findFirstCharacterSpellTarget() {
 	return -1;
 }
 
-int EobCoreEngine::findNextCharacterSpellTarget(int curCharIndex) {
+int EoBCoreEngine::findNextCharacterSpellTarget(int curCharIndex) {
 	for (_characterSpellTarget++; _characterSpellTarget < 6; ) {
 		if (++curCharIndex == 6)
 			curCharIndex = 0;
@@ -767,7 +767,7 @@ int EobCoreEngine::findNextCharacterSpellTarget(int curCharIndex) {
 	return -1;
 }
 
-int EobCoreEngine::charDeathSavingThrow(int charIndex, int div) {
+int EoBCoreEngine::charDeathSavingThrow(int charIndex, int div) {
 	bool _beholderOrgBhv = true;
 	// Due to a bug in the original code the saving throw result is completely ignored
 	// here. The Beholders' disintegrate spell will alway succeed while their flesh to
@@ -779,22 +779,22 @@ int EobCoreEngine::charDeathSavingThrow(int charIndex, int div) {
 	return div;
 }
 
-void EobCoreEngine::printWarning(const char *str) {
+void EoBCoreEngine::printWarning(const char *str) {
 	_txt->printMessage(str);
 	snd_playSoundEffect(79);
 }
 
-void EobCoreEngine::printNoEffectWarning() {
+void EoBCoreEngine::printNoEffectWarning() {
 	printWarning(_magicStrings4[0]);
 }
 
-void EobCoreEngine::spellCallback_start_armor() {
+void EoBCoreEngine::spellCallback_start_armor() {
 	_characters[_activeSpellCharId].effectsRemainder[0] = getMageLevel(_openBookChar) + 8;
 	if ((getDexterityArmorClassModifier(_characters[_activeSpellCharId].dexterityCur) + 6) >= _characters[_activeSpellCharId].armorClass)
 		printWarning(Common::String::format(_magicStrings6[0], _characters[_activeSpellCharId].name).c_str());
 }
 
-void EobCoreEngine::spellCallback_start_burningHands() {
+void EoBCoreEngine::spellCallback_start_burningHands() {
 	static const int16 bX[] = { 0, 152, 24, 120, 56, 88 };
 	static const int8 bY[] = { 64, 64, 56, 56, 56, 56 };
 
@@ -822,25 +822,25 @@ void EobCoreEngine::spellCallback_start_burningHands() {
 	_sceneUpdateRequired = true;
 }
 
-void EobCoreEngine::spellCallback_start_detectMagic() {
+void EoBCoreEngine::spellCallback_start_detectMagic() {
 	setHandItem(_itemInHand);
 }
 
-bool EobCoreEngine::spellCallback_end_detectMagic(void*) {
+bool EoBCoreEngine::spellCallback_end_detectMagic(void*) {
 	setHandItem(_itemInHand);
 	return true;
 }
 
-void EobCoreEngine::spellCallback_start_magicMissile() {
+void EoBCoreEngine::spellCallback_start_magicMissile() {
 	launchMagicObject(_openBookChar, 0, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_magicMissile(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_magicMissile(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	return magicObjectDamageHit(fo, 1, 4, 1, (getMageLevel(fo->attackerId) - 1) >> 1);
 }
 
-void EobCoreEngine::spellCallback_start_shockingGrasp() {
+void EoBCoreEngine::spellCallback_start_shockingGrasp() {
 	int t = createMagicWeaponType(0, 0, 0, 0x0f, 1, 8, getMageLevel(_openBookChar), 1);
 	Item i = (t != -1) ? createMagicWeaponItem(0x10, 82, 0, t) : -1;
 	if (t == -1 || i == -1) {
@@ -854,8 +854,8 @@ void EobCoreEngine::spellCallback_start_shockingGrasp() {
 	}
 }
 
-bool EobCoreEngine::spellCallback_end_shockingGraspFlameBlade(void *obj) {
-	EobCharacter *c = (EobCharacter*)obj;
+bool EoBCoreEngine::spellCallback_end_shockingGraspFlameBlade(void *obj) {
+	EoBCharacter *c = (EoBCharacter*)obj;
 	for (int i = 0; i < 2; i++) {
 		if (isMagicEffectItem(c->inventory[i])) {
 			removeMagicWeaponItem(c->inventory[i]);
@@ -865,7 +865,7 @@ bool EobCoreEngine::spellCallback_end_shockingGraspFlameBlade(void *obj) {
 	return true;
 }
 
-void EobCoreEngine::spellCallback_start_improvedIdentify() {
+void EoBCoreEngine::spellCallback_start_improvedIdentify() {
 	for (int i = 0; i < 2; i++) {
 		Item itm = _characters[_activeSpellCharId].inventory[i];
 		if (itm)
@@ -873,47 +873,47 @@ void EobCoreEngine::spellCallback_start_improvedIdentify() {
 	}
 }
 
-void EobCoreEngine::spellCallback_start_melfsAcidArrow() {
+void EoBCoreEngine::spellCallback_start_melfsAcidArrow() {
 	launchMagicObject(_openBookChar, 1, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_melfsAcidArrow(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_melfsAcidArrow(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	assert(fo);
 	return magicObjectDamageHit(fo, 2, 4, 0, getMageLevel(fo->attackerId) / 3);
 }
 
-void EobCoreEngine::spellCallback_start_dispelMagic() {
+void EoBCoreEngine::spellCallback_start_dispelMagic() {
 	for (int i = 0; i < 6; i++) {
 		if (testCharacter(i, 1))
 			removeAllCharacterEffects(i);
 	}
 }
 
-void EobCoreEngine::spellCallback_start_fireball() {
+void EoBCoreEngine::spellCallback_start_fireball() {
 	launchMagicObject(_openBookChar, 2, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_fireball(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_fireball(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	return magicObjectDamageHit(fo, 1, 6, 0, getMageLevel(fo->attackerId));
 }
 
-void EobCoreEngine::spellCallback_start_flameArrow() {
+void EoBCoreEngine::spellCallback_start_flameArrow() {
 	launchMagicObject(_openBookChar, 3, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_flameArrow(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_flameArrow(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	return magicObjectDamageHit(fo, 5, 6, 0, getMageLevel(fo->attackerId));
 }
 
-void EobCoreEngine::spellCallback_start_holdPerson() {
+void EoBCoreEngine::spellCallback_start_holdPerson() {
 	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 4 : 3, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_holdPerson(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_holdPerson(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	bool res = false;
 
 	if (_flags.gameID == GI_EOB2 && fo->curBlock == _currentBlock) {
@@ -938,16 +938,16 @@ bool EobCoreEngine::spellCallback_end_holdPerson(void *obj) {
 	return res;
 }
 
-void EobCoreEngine::spellCallback_start_lightningBolt() {
+void EoBCoreEngine::spellCallback_start_lightningBolt() {
 	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 5 : 4, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_lightningBolt(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_lightningBolt(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	return magicObjectDamageHit(fo, 1, 6, 0, getMageLevel(fo->attackerId));
 }
 
-void EobCoreEngine::spellCallback_start_vampiricTouch() {
+void EoBCoreEngine::spellCallback_start_vampiricTouch() {
 	int t = createMagicWeaponType(0, 0, 0, 0x0f, getMageLevel(_openBookChar) >> 1, 6, 0, 1);
 	Item i = (t != -1) ? createMagicWeaponItem(0x18, 83, 0, t) : -1;
 	if (t == -1 || i == -1) {
@@ -961,15 +961,15 @@ void EobCoreEngine::spellCallback_start_vampiricTouch() {
 	}
 }
 
-bool EobCoreEngine::spellCallback_end_vampiricTouch(void *obj) {
-	EobCharacter *c = (EobCharacter*)obj;
+bool EoBCoreEngine::spellCallback_end_vampiricTouch(void *obj) {
+	EoBCharacter *c = (EoBCharacter*)obj;
 	if (c->hitPointsCur > c->hitPointsMax)
 		c->hitPointsCur = c->hitPointsMax;
 	spellCallback_end_shockingGraspFlameBlade(obj);
 	return true;
 }
 
-void EobCoreEngine::spellCallback_start_fear() {
+void EoBCoreEngine::spellCallback_start_fear() {
 	sparkEffectOffensive();
 	uint16 bl = calcNewBlockPosition(_currentBlock, _currentDirection);
 	for (int i = 0; i < 30; i++) {
@@ -978,12 +978,12 @@ void EobCoreEngine::spellCallback_start_fear() {
 	}
 }
 
-void EobCoreEngine::spellCallback_start_iceStorm() {
+void EoBCoreEngine::spellCallback_start_iceStorm() {
 	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 6 : 5, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_iceStorm(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_iceStorm(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	static int8 blockAdv[] = { -32, 32, 1, -1 };
 	bool res = magicObjectDamageHit(fo, 1, 6, 0, getMageLevel(fo->attackerId));
 	if (res) {
@@ -997,11 +997,11 @@ bool EobCoreEngine::spellCallback_end_iceStorm(void *obj) {
 	return res;
 }
 
-void EobCoreEngine::spellCallback_start_stoneSkin() {
+void EoBCoreEngine::spellCallback_start_stoneSkin() {
 	_characters[_activeSpellCharId].effectsRemainder[1] = (getMageLevel(_openBookChar) >> 1) + rollDice(1, 4);
 }
 
-void EobCoreEngine::spellCallback_start_removeCurse() {
+void EoBCoreEngine::spellCallback_start_removeCurse() {
 	for (int i = 0; i < 27; i++) {
 		Item itm = _characters[_activeSpellCharId].inventory[i];
 		if (itm && (_items[itm].flags & 0x20) && !isMagicEffectItem(itm))
@@ -1009,7 +1009,7 @@ void EobCoreEngine::spellCallback_start_removeCurse() {
 	}
 }
 
-void EobCoreEngine::spellCallback_start_coneOfCold() {
+void EoBCoreEngine::spellCallback_start_coneOfCold() {
 	const int8 *dirTables[] = { _coneOfColdDest1, _coneOfColdDest2, _coneOfColdDest3, _coneOfColdDest4 };
 
 	int cl = getMageLevel(_openBookChar);
@@ -1034,19 +1034,19 @@ void EobCoreEngine::spellCallback_start_coneOfCold() {
 	updateAllMonsterShapes();
 }
 
-void EobCoreEngine::spellCallback_start_holdMonster() {
+void EoBCoreEngine::spellCallback_start_holdMonster() {
 	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 7 : 6, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_holdMonster(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_holdMonster(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	bool res = false;
 	for (const int16 *m = findBlockMonsters(fo->curBlock, fo->curPos, fo->direction, 1, 1); *m != -1; m++)
 		res |= magicObjectStatusHit(&_monsters[*m], 1, true, 4);
 	return res;
 }
 
-void EobCoreEngine::spellCallback_start_wallOfForce() {
+void EoBCoreEngine::spellCallback_start_wallOfForce() {
 	uint16 bl = calcNewBlockPosition(_currentBlock, _currentDirection);
 	LevelBlockProperty *l = &_levelBlockProperties[bl];
 	if (l->walls[0] || l->walls[1] || l->walls[2] || l->walls[3] || (l->flags & 7)) {
@@ -1076,7 +1076,7 @@ void EobCoreEngine::spellCallback_start_wallOfForce() {
 	_sceneUpdateRequired = true;
 }
 
-void EobCoreEngine::spellCallback_start_disintegrate() {
+void EoBCoreEngine::spellCallback_start_disintegrate() {
 	int d = findSingleSpellTarget(1);
 	if (d != -1)
 		magicObjectStatusHit(&_monsters[d], 4, true, 4);
@@ -1084,7 +1084,7 @@ void EobCoreEngine::spellCallback_start_disintegrate() {
 	_sceneUpdateRequired = true;
 }
 
-void EobCoreEngine::spellCallback_start_fleshToStone() {
+void EoBCoreEngine::spellCallback_start_fleshToStone() {
 	sparkEffectOffensive();
 	int t = getClosestMonster(_openBookChar, calcNewBlockPosition(_currentBlock, _currentDirection));
 	if (t != -1)
@@ -1093,23 +1093,23 @@ void EobCoreEngine::spellCallback_start_fleshToStone() {
 		printWarning(_magicStrings8[4]);
 }
 
-void EobCoreEngine::spellCallback_start_stoneToFlesh() {
+void EoBCoreEngine::spellCallback_start_stoneToFlesh() {
 	if (_characters[_activeSpellCharId].flags & 8)
 		_characters[_activeSpellCharId].flags &= ~8;
 	else
 		printNoEffectWarning();
 }
 
-void EobCoreEngine::spellCallback_start_trueSeeing() {
+void EoBCoreEngine::spellCallback_start_trueSeeing() {
 	_wllVmpMap[46] = 0;
 }
 
-bool EobCoreEngine::spellCallback_end_trueSeeing(void*) {
+bool EoBCoreEngine::spellCallback_end_trueSeeing(void*) {
 	_wllVmpMap[46] = 1;
 	return true;
 }
 
-void EobCoreEngine::spellCallback_start_slayLiving() {
+void EoBCoreEngine::spellCallback_start_slayLiving() {
 	int d = findSingleSpellTarget(2);
 	if (d != -1) {
 		if (!magicObjectStatusHit(&_monsters[d], 3, true, 4))
@@ -1117,7 +1117,7 @@ void EobCoreEngine::spellCallback_start_slayLiving() {
 	}
 }
 
-void EobCoreEngine::spellCallback_start_powerWordStun() {
+void EoBCoreEngine::spellCallback_start_powerWordStun() {
 	int d = findSingleSpellTarget(2);
 	if (d != -1) {
 		if (_monsters[d].hitPointsCur < 90)
@@ -1125,15 +1125,15 @@ void EobCoreEngine::spellCallback_start_powerWordStun() {
 	}
 }
 
-void EobCoreEngine::spellCallback_start_causeLightWounds() {
+void EoBCoreEngine::spellCallback_start_causeLightWounds() {
 	causeWounds(1, 8, 0);
 }
 
-void EobCoreEngine::spellCallback_start_cureLightWounds() {
+void EoBCoreEngine::spellCallback_start_cureLightWounds() {
 	modifyCharacterHitpoints(_activeSpellCharId, rollDice(1, 8));
 }
 
-void EobCoreEngine::spellCallback_start_aid() {
+void EoBCoreEngine::spellCallback_start_aid() {
 	if (!testCharacter(_activeSpellCharId, 3)) {
 		printNoEffectWarning();
 	} else if (_characters[_activeSpellCharId].effectsRemainder[3]) {
@@ -1149,15 +1149,15 @@ void EobCoreEngine::spellCallback_start_aid() {
 	deleteCharEventTimer(_activeSpellCharId, -_activeSpell);
 }
 
-bool EobCoreEngine::spellCallback_end_aid(void *obj) {
-	EobCharacter *c = (EobCharacter*)obj;
+bool EoBCoreEngine::spellCallback_end_aid(void *obj) {
+	EoBCharacter *c = (EoBCharacter*)obj;
 	c->hitPointsCur -= c->effectsRemainder[3];
 	c->effectsRemainder[3] = 0;
 	c->effectFlags &= ~0x1000;
 	return true;
 }
 
-void EobCoreEngine::spellCallback_start_flameBlade() {
+void EoBCoreEngine::spellCallback_start_flameBlade() {
 	int t = createMagicWeaponType(0, 0, 0, 0x0f, 1, 4, 4, 1);
 	Item i = (t != -1) ? createMagicWeaponItem(0, 84, 0, t) : -1;
 	if (t == -1 || i == -1) {
@@ -1171,7 +1171,7 @@ void EobCoreEngine::spellCallback_start_flameBlade() {
 	}
 }
 
-void EobCoreEngine::spellCallback_start_slowPoison() {
+void EoBCoreEngine::spellCallback_start_slowPoison() {
 	if (_characters[_activeSpellCharId].flags & 2) {
 		_characters[_activeSpellCharId].effectFlags |= 0x2000;
 		setSpellEventTimer(_activeSpell, 1, 32760, 1, 1);
@@ -1180,13 +1180,13 @@ void EobCoreEngine::spellCallback_start_slowPoison() {
 	}
 }
 
-bool EobCoreEngine::spellCallback_end_slowPoison(void *obj) {
-	EobCharacter *c = (EobCharacter*)obj;
+bool EoBCoreEngine::spellCallback_end_slowPoison(void *obj) {
+	EoBCharacter *c = (EoBCharacter*)obj;
 	c->effectFlags &= ~0x2000;
 	return true;
 }
 
-void EobCoreEngine::spellCallback_start_createFood() {
+void EoBCoreEngine::spellCallback_start_createFood() {
 	for (int i = 0; i < 6; i++) {
 		if (!testCharacter(i, 3))
 			continue;
@@ -1194,7 +1194,7 @@ void EobCoreEngine::spellCallback_start_createFood() {
 	}
 }
 
-void EobCoreEngine::spellCallback_start_removeParalysis() {
+void EoBCoreEngine::spellCallback_start_removeParalysis() {
 	int numChar = 4;
 	for (int i = 0; i < 6; i++) {
 		if (!(_characters[i].flags & 4) || !numChar)
@@ -1204,39 +1204,39 @@ void EobCoreEngine::spellCallback_start_removeParalysis() {
 	}
 }
 
-void EobCoreEngine::spellCallback_start_causeSeriousWounds() {
+void EoBCoreEngine::spellCallback_start_causeSeriousWounds() {
 	causeWounds(2, 8, 1);
 }
 
-void EobCoreEngine::spellCallback_start_cureSeriousWounds() {
+void EoBCoreEngine::spellCallback_start_cureSeriousWounds() {
 	modifyCharacterHitpoints(_activeSpellCharId, rollDice(2, 8, 1));
 }
 
-void EobCoreEngine::spellCallback_start_neutralizePoison() {
+void EoBCoreEngine::spellCallback_start_neutralizePoison() {
 	if (_characters[_activeSpellCharId].flags & 2)
 		neutralizePoison(_activeSpellCharId);
 	else
 		printNoEffectWarning();
 }
 
-void EobCoreEngine::spellCallback_start_causeCriticalWounds() {
+void EoBCoreEngine::spellCallback_start_causeCriticalWounds() {
 	causeWounds(3, 8, 3);
 }
 
-void EobCoreEngine::spellCallback_start_cureCriticalWounds() {
+void EoBCoreEngine::spellCallback_start_cureCriticalWounds() {
 	modifyCharacterHitpoints(_activeSpellCharId, rollDice(3, 8, 3));
 }
 
-void EobCoreEngine::spellCallback_start_flameStrike() {
+void EoBCoreEngine::spellCallback_start_flameStrike() {
 	launchMagicObject(_openBookChar, _flags.gameID == GI_EOB1 ? 8 : 7, _currentBlock, _activeSpellCharacterPos, _currentDirection);
 }
 
-bool EobCoreEngine::spellCallback_end_flameStrike(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_flameStrike(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	return magicObjectDamageHit(fo, 6, 8, 0, 0);
 }
 
-void EobCoreEngine::spellCallback_start_raiseDead() {
+void EoBCoreEngine::spellCallback_start_raiseDead() {
 	if (_characters[_activeSpellCharId].hitPointsCur == -10 && ((_characters[_activeSpellCharId].raceSex >> 1) != 1)) {
 		_characters[_activeSpellCharId].hitPointsCur = 1;
 		gui_drawCharPortraitWithStats(_activeSpellCharId);
@@ -1245,23 +1245,23 @@ void EobCoreEngine::spellCallback_start_raiseDead() {
 	}
 }
 
-void EobCoreEngine::spellCallback_start_harm() {
+void EoBCoreEngine::spellCallback_start_harm() {
 	causeWounds(-1, -1, -1);
 }
 
-void EobCoreEngine::spellCallback_start_heal() {
-	EobCharacter *c = &_characters[_activeSpellCharId];
+void EoBCoreEngine::spellCallback_start_heal() {
+	EoBCharacter *c = &_characters[_activeSpellCharId];
 	if (c->hitPointsMax <= c->hitPointsCur)
 		printWarning(_magicStrings4[0]);
 	else
 		modifyCharacterHitpoints(_activeSpellCharId, c->hitPointsMax - c->hitPointsCur);
 }
 
-void EobCoreEngine::spellCallback_start_layOnHands() {
+void EoBCoreEngine::spellCallback_start_layOnHands() {
 	modifyCharacterHitpoints(_activeSpellCharId, _characters[_openBookChar].level[0] << 1);
 }
 
-void EobCoreEngine::spellCallback_start_turnUndead() {
+void EoBCoreEngine::spellCallback_start_turnUndead() {
 	uint16 bl = calcNewBlockPosition(_currentBlock, _currentDirection);
 	if (!(_levelBlockProperties[bl].flags & 7))
 		return;
@@ -1287,13 +1287,13 @@ void EobCoreEngine::spellCallback_start_turnUndead() {
 	_preventMonsterFlash = false;
 }
 
-bool EobCoreEngine::spellCallback_end_monster_lightningBolt(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_monster_lightningBolt(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	return magicObjectDamageHit(fo, 0, 0, 12, 1);
 }
 
-bool EobCoreEngine::spellCallback_end_monster_fireball1(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_monster_fireball1(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	bool res = false;
 	if (_partyEffectFlags & 0x20000) {
 		res = magicObjectDamageHit(fo, 4, 10, 6, 0);
@@ -1307,13 +1307,13 @@ bool EobCoreEngine::spellCallback_end_monster_fireball1(void *obj) {
 	return res;
 }
 
-bool EobCoreEngine::spellCallback_end_monster_fireball2(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_monster_fireball2(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	return magicObjectDamageHit(fo, 0, 0, 18, 0);
 }
 
-bool EobCoreEngine::spellCallback_end_monster_deathSpell(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_monster_deathSpell(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
 
@@ -1329,8 +1329,8 @@ bool EobCoreEngine::spellCallback_end_monster_deathSpell(void *obj) {
 	return true;
 }
 
-bool EobCoreEngine::spellCallback_end_monster_disintegrate(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_monster_disintegrate(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
 
@@ -1345,8 +1345,8 @@ bool EobCoreEngine::spellCallback_end_monster_disintegrate(void *obj) {
 	return true;
 }
 
-bool EobCoreEngine::spellCallback_end_monster_causeCriticalWounds(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_monster_causeCriticalWounds(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
 
@@ -1359,8 +1359,8 @@ bool EobCoreEngine::spellCallback_end_monster_causeCriticalWounds(void *obj) {
 	return true;
 }
 
-bool EobCoreEngine::spellCallback_end_monster_fleshToStone(void *obj) {
-	EobFlyingObject *fo = (EobFlyingObject*)obj;
+bool EoBCoreEngine::spellCallback_end_monster_fleshToStone(void *obj) {
+	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
 
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 072b4187c1..f5d70e084c 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -252,464 +252,464 @@ enum KyraResources {
 	k3ItemStringMap,
 
 #if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-	kLolEobCommonMoreStrings,
-	kLolEobCommonDscShapeIndex,
-	kLolEobCommonDscX,
-	kLolEobCommonDscTileIndex,
-	kLolEobCommonDscUnk2,
-	kLolEobCommonDscDoorShapeIndex,
-	kLolEobCommonDscDimData1,
-	kLolEobCommonDscDimData2,
-	kLolEobCommonDscBlockMap,
-	kLolEobCommonDscDimMap,
-	kLolEobCommonDscDoorY2,
-	kLolEobCommonDscBlockIndex,
-
-	kEobBaseChargenStrings1,
-	kEobBaseChargenStrings2,
-	kEobBaseChargenStartLevels,
-	kEobBaseChargenStatStrings,
-	kEobBaseChargenRaceSexStrings,
-	kEobBaseChargenClassStrings,
-	kEobBaseChargenAlignmentStrings,
-	kEobBaseChargenEnterGameStrings,
-	kEobBaseChargenClassMinStats,
-	kEobBaseChargenRaceMinStats,
-	kEobBaseChargenRaceMaxStats,
-
-	kEobBaseSaveThrowTable1,
-	kEobBaseSaveThrowTable2,
-	kEobBaseSaveThrowTable3,
-	kEobBaseSaveThrowTable4,
-	kEobBaseSaveThrwLvlIndex,
-	kEobBaseSaveThrwModDiv,
-	kEobBaseSaveThrwModExt,
-
-	kEobBasePryDoorStrings,
-	kEobBaseWarningStrings,
-
-	kEobBaseItemSuffixStringsRings,
-	kEobBaseItemSuffixStringsPotions,
-	kEobBaseItemSuffixStringsWands,
+	kRpgCommonMoreStrings,
+	kRpgCommonDscShapeIndex,
+	kRpgCommonDscX,
+	kRpgCommonDscTileIndex,
+	kRpgCommonDscUnk2,
+	kRpgCommonDscDoorShapeIndex,
+	kRpgCommonDscDimData1,
+	kRpgCommonDscDimData2,
+	kRpgCommonDscBlockMap,
+	kRpgCommonDscDimMap,
+	kRpgCommonDscDoorY2,
+	kRpgCommonDscBlockIndex,
+
+	kEoBBaseChargenStrings1,
+	kEoBBaseChargenStrings2,
+	kEoBBaseChargenStartLevels,
+	kEoBBaseChargenStatStrings,
+	kEoBBaseChargenRaceSexStrings,
+	kEoBBaseChargenClassStrings,
+	kEoBBaseChargenAlignmentStrings,
+	kEoBBaseChargenEnterGameStrings,
+	kEoBBaseChargenClassMinStats,
+	kEoBBaseChargenRaceMinStats,
+	kEoBBaseChargenRaceMaxStats,
+
+	kEoBBaseSaveThrowTable1,
+	kEoBBaseSaveThrowTable2,
+	kEoBBaseSaveThrowTable3,
+	kEoBBaseSaveThrowTable4,
+	kEoBBaseSaveThrwLvlIndex,
+	kEoBBaseSaveThrwModDiv,
+	kEoBBaseSaveThrwModExt,
+
+	kEoBBasePryDoorStrings,
+	kEoBBaseWarningStrings,
+
+	kEoBBaseItemSuffixStringsRings,
+	kEoBBaseItemSuffixStringsPotions,
+	kEoBBaseItemSuffixStringsWands,
 	
-	kEobBaseRipItemStrings,
-	kEobBaseCursedString,
-	kEobBaseEnchantedString,
-	kEobBaseMagicObjectStrings,
-	kEobBaseMagicObjectString5,
-	kEobBasePatternSuffix,
-	kEobBasePatternGrFix1,
-	kEobBasePatternGrFix2,
-	kEobBaseValidateArmorString,
-	kEobBaseValidateCursedString,
-	kEobBaseValidateNoDropString,
-	kEobBasePotionStrings,
-	kEobBaseWandStrings,
-	kEobBaseItemMisuseStrings,
-
-	kEobBaseTakenStrings,
-	kEobBasePotionEffectStrings,
-
-	kEobBaseYesNoStrings,
-	kEobBaseNpcMaxStrings,
-	kEobBaseOkStrings,
-	kEobBaseNpcJoinStrings,
-	kEobBaseCancelStrings,
-	kEobBaseAbortStrings,
-
-	kEobBaseMenuStringsMain,
-	kEobBaseMenuStringsSaveLoad,
-	kEobBaseMenuStringsOnOff,
-	kEobBaseMenuStringsSpells,
-	kEobBaseMenuStringsRest,
-	kEobBaseMenuStringsDrop,
-	kEobBaseMenuStringsExit,
-	kEobBaseMenuStringsStarve,
-	kEobBaseMenuStringsScribe,
-	kEobBaseMenuStringsDrop2,
-	kEobBaseMenuStringsHead,
-	kEobBaseMenuStringsPoison,
-	kEobBaseMenuStringsMgc,
-	kEobBaseMenuStringsPrefs,
-	kEobBaseMenuStringsRest2,
-	kEobBaseMenuStringsRest3,
-	kEobBaseMenuStringsRest4,
-	kEobBaseMenuStringsDefeat,
-	kEobBaseMenuStringsTransfer,
-	kEobBaseMenuStringsSpec,
-	kEobBaseMenuStringsSpellNo,
-	kEobBaseMenuYesNoStrings,
-
-	kEobBaseSpellLevelsMage,
-	kEobBaseSpellLevelsCleric,
-	kEobBaseNumSpellsCleric,
-	kEobBaseNumSpellsWisAdj,
-	kEobBaseNumSpellsPal,
-	kEobBaseNumSpellsMage,
-
-	kEobBaseCharGuiStringsHp,
-	kEobBaseCharGuiStringsWp1,
-	kEobBaseCharGuiStringsWp2,
-	kEobBaseCharGuiStringsWr,
-	kEobBaseCharGuiStringsSt1,
-	kEobBaseCharGuiStringsSt2,
-	kEobBaseCharGuiStringsIn,
-
-	kEobBaseCharStatusStrings7,
-	kEobBaseCharStatusStrings81,
-	kEobBaseCharStatusStrings82,
-	kEobBaseCharStatusStrings9,
-	kEobBaseCharStatusStrings12,
-	kEobBaseCharStatusStrings131,
-	kEobBaseCharStatusStrings132,
-
-	kEobBaseLevelGainStrings,
-	kEobBaseExperienceTable0,
-	kEobBaseExperienceTable1,
-	kEobBaseExperienceTable2,
-	kEobBaseExperienceTable3,
-	kEobBaseExperienceTable4,
-
-	kEobBaseClassModifierFlags,
-
-	kEobBaseMonsterStepTable01,
-	kEobBaseMonsterStepTable02,
-	kEobBaseMonsterStepTable1,
-	kEobBaseMonsterStepTable2,
-	kEobBaseMonsterStepTable3,
-	kEobBaseMonsterCloseAttPosTable1,
-	kEobBaseMonsterCloseAttPosTable21,
-	kEobBaseMonsterCloseAttPosTable22,
-	kEobBaseMonsterCloseAttUnkTable,
-	kEobBaseMonsterCloseAttChkTable1,
-	kEobBaseMonsterCloseAttChkTable2,
-	kEobBaseMonsterCloseAttDstTable1,
-	kEobBaseMonsterCloseAttDstTable2,
-
-	kEobBaseMonsterProximityTable,
-	kEobBaseFindBlockMonstersTable,
-	kEobBaseMonsterDirChangeTable,
-	kEobBaseMonsterDistAttStrings,
-
-	kEobBaseEncodeMonsterDefs,
-	kEobBaseNpcPresets,
-
-	kEobBaseWllFlagPreset,
-	kEobBaseDscShapeCoords,
-
-	kEobBaseDscDoorScaleOffs,
-	kEobBaseDscDoorScaleMult1,
-	kEobBaseDscDoorScaleMult2,
-	kEobBaseDscDoorScaleMult3,
-	kEobBaseDscDoorScaleMult4,
-	kEobBaseDscDoorScaleMult5,
-	kEobBaseDscDoorScaleMult6,
-	kEobBaseDscDoorType5Offs,
-	kEobBaseDscDoorXE,
-	kEobBaseDscDoorY1,
-	kEobBaseDscDoorY3,
-	kEobBaseDscDoorY4,
-	kEobBaseDscDoorY5,
-	kEobBaseDscDoorY6,
-	kEobBaseDscDoorY7,
-	kEobBaseDscDoorCoordsExt,
-
-	kEobBaseDscItemPosIndex,
-	kEobBaseDscItemShpX,
-	kEobBaseDscItemScaleIndex,
-	kEobBaseDscItemTileIndex,
-	kEobBaseDscItemShapeMap,
-
-	kEobBaseDscMonsterFrmOffsTbl1,
-	kEobBaseDscMonsterFrmOffsTbl2,
-
-	kEobBaseInvSlotX,
-	kEobBaseInvSlotY,
-	kEobBaseSlotValidationFlags,
-
-	kEobBaseProjectileWeaponTypes,
-	kEobBaseWandTypes,
-
-	kEobBaseDrawObjPosIndex,
-	kEobBaseFlightObjFlipIndex,
-	kEobBaseFlightObjShpMap,
-	kEobBaseFlightObjSclIndex,
-
-	kEobBaseDscTelptrShpCoords,
-
-	kEobBasePortalSeqData,
-	kEobBaseManDef,
-	kEobBaseManWord,
-	kEobBaseManPrompt,
-
-	kEobBaseBookNumbers,
-	kEobBaseMageSpellsList,
-	kEobBaseClericSpellsList,
-	kEobBaseSpellNames,
-	kEobBaseMagicStrings1,
-	kEobBaseMagicStrings2,
-	kEobBaseMagicStrings3,
-	kEobBaseMagicStrings4,
-	kEobBaseMagicStrings6,
-	kEobBaseMagicStrings7,
-	kEobBaseMagicStrings8,
-
-	kEobBaseExpObjectTlMode,
-	kEobBaseExpObjectTblIndex,
-	kEobBaseExpObjectShpStart,
-	kEobBaseExpObjectTbl1,
-	kEobBaseExpObjectTbl2,
-	kEobBaseExpObjectTbl3,
-	kEobBaseExpObjectY,
-
-	kEobBaseSparkDefSteps,
-	kEobBaseSparkDefSubSteps,
-	kEobBaseSparkDefShift,
-	kEobBaseSparkDefAdd,
-	kEobBaseSparkDefX,
-	kEobBaseSparkDefY,
-	kEobBaseSparkOfFlags1,
-	kEobBaseSparkOfFlags2,
-	kEobBaseSparkOfShift,
-	kEobBaseSparkOfX,
-	kEobBaseSparkOfY,
-
-	kEobBaseSpellProperties,
-	kEobBaseMagicFlightProps,
-	kEobBaseTurnUndeadEffect,
-	kEobBaseBurningHandsDest,
-	kEobBaseConeOfColdDest1,
-	kEobBaseConeOfColdDest2,
-	kEobBaseConeOfColdDest3,
-	kEobBaseConeOfColdDest4,
-	kEobBaseConeOfColdGfxTbl,
-
-	kEob1MainMenuStrings,
-	kEob1BonusStrings,
-
-	kEob1IntroFilesOpening,
-	kEob1IntroFilesTower,
-	kEob1IntroFilesOrb,
-	kEob1IntroFilesWdEntry,
-	kEob1IntroFilesKing,
-	kEob1IntroFilesHands,
-	kEob1IntroFilesWdExit,
-	kEob1IntroFilesTunnel,
-	kEob1IntroOpeningFrmDelay,
-	kEob1IntroWdEncodeX,
-	kEob1IntroWdEncodeY,
-	kEob1IntroWdEncodeWH,
-	kEob1IntroWdDsX,
-	kEob1IntroWdDsY,
-	kEob1IntroTvlX1,
-	kEob1IntroTvlY1,
-	kEob1IntroTvlX2,
-	kEob1IntroTvlY2,
-	kEob1IntroTvlW,
-	kEob1IntroTvlH,
-
-	kEob1DoorShapeDefs,
-	kEob1DoorSwitchShapeDefs,
-	kEob1DoorSwitchCoords,
-	kEob1MonsterProperties,
-
-	kEob1EnemyMageSpellList,
-	kEob1EnemyMageSfx,
-	kEob1BeholderSpellList,
-	kEob1BeholderSfx,
-
-	kEob1TurnUndeadString,
-
-	kEob1NpcShpData,
-	kEob1NpcSubShpIndex1,
-	kEob1NpcSubShpIndex2,
-	kEob1NpcSubShpY,
-	kEob1Npc0Strings,
-	kEob1Npc11Strings,
-	kEob1Npc12Strings,
-	kEob1Npc21Strings,
-	kEob1Npc22Strings,
-	kEob1Npc31Strings,
-	kEob1Npc32Strings,
-	kEob1Npc4Strings,
-	kEob1Npc5Strings,
-	kEob1Npc6Strings,
-	kEob1Npc7Strings,
-
-	kEob2MainMenuStrings,
-	kEob2TransferConvertTable,
-	kEob2TransferExpTable,
-
-	kEob2IntroStrings,
-	kEob2IntroCPSFiles,
-	kEob2IntroSeqData00,
- 	kEob2IntroSeqData01,
- 	kEob2IntroSeqData02,
- 	kEob2IntroSeqData03,
- 	kEob2IntroSeqData04,
- 	kEob2IntroSeqData05,
- 	kEob2IntroSeqData06,
- 	kEob2IntroSeqData07,
- 	kEob2IntroSeqData08,
- 	kEob2IntroSeqData09,
- 	kEob2IntroSeqData10,
- 	kEob2IntroSeqData11,
- 	kEob2IntroSeqData12,
- 	kEob2IntroSeqData13,
- 	kEob2IntroSeqData14,
- 	kEob2IntroSeqData15,
- 	kEob2IntroSeqData16,
- 	kEob2IntroSeqData17,
- 	kEob2IntroSeqData18,
- 	kEob2IntroSeqData19,
- 	kEob2IntroSeqData20,
- 	kEob2IntroSeqData21,
- 	kEob2IntroSeqData22,
- 	kEob2IntroSeqData23,
- 	kEob2IntroSeqData24,
- 	kEob2IntroSeqData25,
- 	kEob2IntroSeqData26,
- 	kEob2IntroSeqData27,
- 	kEob2IntroSeqData28,
- 	kEob2IntroSeqData29,
- 	kEob2IntroSeqData30,
- 	kEob2IntroSeqData31,
- 	kEob2IntroSeqData32,
- 	kEob2IntroSeqData33,
- 	kEob2IntroSeqData34,
- 	kEob2IntroSeqData35,
- 	kEob2IntroSeqData36,
- 	kEob2IntroSeqData37,
- 	kEob2IntroSeqData38,
- 	kEob2IntroSeqData39,
- 	kEob2IntroSeqData40,
- 	kEob2IntroSeqData41,
- 	kEob2IntroSeqData42,
- 	kEob2IntroSeqData43,
-	kEob2IntroShapes00,
- 	kEob2IntroShapes01,
- 	kEob2IntroShapes04,
- 	kEob2IntroShapes07,
-
-	kEob2FinaleStrings,
-	kEob2CreditsData,
-	kEob2FinaleCPSFiles,
-	kEob2FinaleSeqData00,
- 	kEob2FinaleSeqData01,
- 	kEob2FinaleSeqData02,
- 	kEob2FinaleSeqData03,
- 	kEob2FinaleSeqData04,
- 	kEob2FinaleSeqData05,
- 	kEob2FinaleSeqData06,
- 	kEob2FinaleSeqData07,
- 	kEob2FinaleSeqData08,
- 	kEob2FinaleSeqData09,
- 	kEob2FinaleSeqData10,
- 	kEob2FinaleSeqData11,
- 	kEob2FinaleSeqData12,
- 	kEob2FinaleSeqData13,
- 	kEob2FinaleSeqData14,
- 	kEob2FinaleSeqData15,
- 	kEob2FinaleSeqData16,
- 	kEob2FinaleSeqData17,
- 	kEob2FinaleSeqData18,
- 	kEob2FinaleSeqData19,
- 	kEob2FinaleSeqData20,
-	kEob2FinaleShapes00,
- 	kEob2FinaleShapes03,
- 	kEob2FinaleShapes07,
- 	kEob2FinaleShapes09,
- 	kEob2FinaleShapes10,
-
-	kEob2NpcShapeData,
-	kEob2Npc1Strings,
-	kEob2Npc2Strings,
-	kEob2MonsterDustStrings,
-
-	kEob2DreamSteps,
-	kEob2KheldranStrings,
-	kEob2HornStrings,
-	kEob2HornSounds,
-
-	kEob2WallOfForceDsX,
-	kEob2WallOfForceDsY,
-	kEob2WallOfForceNumW,
-	kEob2WallOfForceNumH,
-	kEob2WallOfForceShpId,
-
-	kLolIngamePakFiles,
-	kLolCharacterDefs,
-	kLolIngameSfxFiles,
-	kLolIngameSfxIndex,
-	kLolMusicTrackMap,
-	kLolIngameGMSfxIndex,
-	kLolIngameMT32SfxIndex,
-	kLolIngamePcSpkSfxIndex,
-	kLolSpellProperties,
-	kLolGameShapeMap,
-	kLolSceneItemOffs,
-	kLolCharInvIndex,
-	kLolCharInvDefs,
-	kLolCharDefsMan,
-	kLolCharDefsWoman,
-	kLolCharDefsKieran,
-	kLolCharDefsAkshel,
-	kLolExpRequirements,
-	kLolMonsterModifiers,
-	kLolMonsterShiftOffsets,
-	kLolMonsterDirFlags,
-	kLolMonsterScaleY,
-	kLolMonsterScaleX,
-	kLolMonsterScaleWH,
-	kLolFlyingObjectShp,
-	kLolInventoryDesc,
-
-	kLolLevelShpList,
-	kLolLevelDatList,
-	kLolCompassDefs,
-	kLolItemPrices,
-	kLolStashSetup,
-
-	kLolDscWalls,
-	kLolDscOvlMap,
-	kLolDscScaleWidthData,
-	kLolDscScaleHeightData,
-	kLolBaseDscY,
-
-	kLolDscDoorScale,
-	kLolDscDoor4,
-	kLolDscDoorX,
-	kLolDscDoorY,
-	kLolDscOvlIndex,
-
-	kLolScrollXTop,
-	kLolScrollYTop,
-	kLolScrollXBottom,
-	kLolScrollYBottom,
-
-	kLolButtonDefs,
-	kLolButtonList1,
-	kLolButtonList2,
-	kLolButtonList3,
-	kLolButtonList4,
-	kLolButtonList5,
-	kLolButtonList6,
-	kLolButtonList7,
-	kLolButtonList8,
-
-	kLolLegendData,
-	kLolMapCursorOvl,
-	kLolMapStringId,
-
-	kLolSpellbookAnim,
-	kLolSpellbookCoords,
-	kLolHealShapeFrames,
-	kLolLightningDefs,
-	kLolFireballCoords,
-
-	kLolCredits,
-
-	kLolHistory,
+	kEoBBaseRipItemStrings,
+	kEoBBaseCursedString,
+	kEoBBaseEnchantedString,
+	kEoBBaseMagicObjectStrings,
+	kEoBBaseMagicObjectString5,
+	kEoBBasePatternSuffix,
+	kEoBBasePatternGrFix1,
+	kEoBBasePatternGrFix2,
+	kEoBBaseValidateArmorString,
+	kEoBBaseValidateCursedString,
+	kEoBBaseValidateNoDropString,
+	kEoBBasePotionStrings,
+	kEoBBaseWandStrings,
+	kEoBBaseItemMisuseStrings,
+
+	kEoBBaseTakenStrings,
+	kEoBBasePotionEffectStrings,
+
+	kEoBBaseYesNoStrings,
+	kEoBBaseNpcMaxStrings,
+	kEoBBaseOkStrings,
+	kEoBBaseNpcJoinStrings,
+	kEoBBaseCancelStrings,
+	kEoBBaseAbortStrings,
+
+	kEoBBaseMenuStringsMain,
+	kEoBBaseMenuStringsSaveLoad,
+	kEoBBaseMenuStringsOnOff,
+	kEoBBaseMenuStringsSpells,
+	kEoBBaseMenuStringsRest,
+	kEoBBaseMenuStringsDrop,
+	kEoBBaseMenuStringsExit,
+	kEoBBaseMenuStringsStarve,
+	kEoBBaseMenuStringsScribe,
+	kEoBBaseMenuStringsDrop2,
+	kEoBBaseMenuStringsHead,
+	kEoBBaseMenuStringsPoison,
+	kEoBBaseMenuStringsMgc,
+	kEoBBaseMenuStringsPrefs,
+	kEoBBaseMenuStringsRest2,
+	kEoBBaseMenuStringsRest3,
+	kEoBBaseMenuStringsRest4,
+	kEoBBaseMenuStringsDefeat,
+	kEoBBaseMenuStringsTransfer,
+	kEoBBaseMenuStringsSpec,
+	kEoBBaseMenuStringsSpellNo,
+	kEoBBaseMenuYesNoStrings,
+
+	kEoBBaseSpellLevelsMage,
+	kEoBBaseSpellLevelsCleric,
+	kEoBBaseNumSpellsCleric,
+	kEoBBaseNumSpellsWisAdj,
+	kEoBBaseNumSpellsPal,
+	kEoBBaseNumSpellsMage,
+
+	kEoBBaseCharGuiStringsHp,
+	kEoBBaseCharGuiStringsWp1,
+	kEoBBaseCharGuiStringsWp2,
+	kEoBBaseCharGuiStringsWr,
+	kEoBBaseCharGuiStringsSt1,
+	kEoBBaseCharGuiStringsSt2,
+	kEoBBaseCharGuiStringsIn,
+
+	kEoBBaseCharStatusStrings7,
+	kEoBBaseCharStatusStrings81,
+	kEoBBaseCharStatusStrings82,
+	kEoBBaseCharStatusStrings9,
+	kEoBBaseCharStatusStrings12,
+	kEoBBaseCharStatusStrings131,
+	kEoBBaseCharStatusStrings132,
+
+	kEoBBaseLevelGainStrings,
+	kEoBBaseExperienceTable0,
+	kEoBBaseExperienceTable1,
+	kEoBBaseExperienceTable2,
+	kEoBBaseExperienceTable3,
+	kEoBBaseExperienceTable4,
+
+	kEoBBaseClassModifierFlags,
+
+	kEoBBaseMonsterStepTable01,
+	kEoBBaseMonsterStepTable02,
+	kEoBBaseMonsterStepTable1,
+	kEoBBaseMonsterStepTable2,
+	kEoBBaseMonsterStepTable3,
+	kEoBBaseMonsterCloseAttPosTable1,
+	kEoBBaseMonsterCloseAttPosTable21,
+	kEoBBaseMonsterCloseAttPosTable22,
+	kEoBBaseMonsterCloseAttUnkTable,
+	kEoBBaseMonsterCloseAttChkTable1,
+	kEoBBaseMonsterCloseAttChkTable2,
+	kEoBBaseMonsterCloseAttDstTable1,
+	kEoBBaseMonsterCloseAttDstTable2,
+
+	kEoBBaseMonsterProximityTable,
+	kEoBBaseFindBlockMonstersTable,
+	kEoBBaseMonsterDirChangeTable,
+	kEoBBaseMonsterDistAttStrings,
+
+	kEoBBaseEncodeMonsterDefs,
+	kEoBBaseNpcPresets,
+
+	kEoBBaseWllFlagPreset,
+	kEoBBaseDscShapeCoords,
+
+	kEoBBaseDscDoorScaleOffs,
+	kEoBBaseDscDoorScaleMult1,
+	kEoBBaseDscDoorScaleMult2,
+	kEoBBaseDscDoorScaleMult3,
+	kEoBBaseDscDoorScaleMult4,
+	kEoBBaseDscDoorScaleMult5,
+	kEoBBaseDscDoorScaleMult6,
+	kEoBBaseDscDoorType5Offs,
+	kEoBBaseDscDoorXE,
+	kEoBBaseDscDoorY1,
+	kEoBBaseDscDoorY3,
+	kEoBBaseDscDoorY4,
+	kEoBBaseDscDoorY5,
+	kEoBBaseDscDoorY6,
+	kEoBBaseDscDoorY7,
+	kEoBBaseDscDoorCoordsExt,
+
+	kEoBBaseDscItemPosIndex,
+	kEoBBaseDscItemShpX,
+	kEoBBaseDscItemScaleIndex,
+	kEoBBaseDscItemTileIndex,
+	kEoBBaseDscItemShapeMap,
+
+	kEoBBaseDscMonsterFrmOffsTbl1,
+	kEoBBaseDscMonsterFrmOffsTbl2,
+
+	kEoBBaseInvSlotX,
+	kEoBBaseInvSlotY,
+	kEoBBaseSlotValidationFlags,
+
+	kEoBBaseProjectileWeaponTypes,
+	kEoBBaseWandTypes,
+
+	kEoBBaseDrawObjPosIndex,
+	kEoBBaseFlightObjFlipIndex,
+	kEoBBaseFlightObjShpMap,
+	kEoBBaseFlightObjSclIndex,
+
+	kEoBBaseDscTelptrShpCoords,
+
+	kEoBBasePortalSeqData,
+	kEoBBaseManDef,
+	kEoBBaseManWord,
+	kEoBBaseManPrompt,
+
+	kEoBBaseBookNumbers,
+	kEoBBaseMageSpellsList,
+	kEoBBaseClericSpellsList,
+	kEoBBaseSpellNames,
+	kEoBBaseMagicStrings1,
+	kEoBBaseMagicStrings2,
+	kEoBBaseMagicStrings3,
+	kEoBBaseMagicStrings4,
+	kEoBBaseMagicStrings6,
+	kEoBBaseMagicStrings7,
+	kEoBBaseMagicStrings8,
+
+	kEoBBaseExpObjectTlMode,
+	kEoBBaseExpObjectTblIndex,
+	kEoBBaseExpObjectShpStart,
+	kEoBBaseExpObjectTbl1,
+	kEoBBaseExpObjectTbl2,
+	kEoBBaseExpObjectTbl3,
+	kEoBBaseExpObjectY,
+
+	kEoBBaseSparkDefSteps,
+	kEoBBaseSparkDefSubSteps,
+	kEoBBaseSparkDefShift,
+	kEoBBaseSparkDefAdd,
+	kEoBBaseSparkDefX,
+	kEoBBaseSparkDefY,
+	kEoBBaseSparkOfFlags1,
+	kEoBBaseSparkOfFlags2,
+	kEoBBaseSparkOfShift,
+	kEoBBaseSparkOfX,
+	kEoBBaseSparkOfY,
+
+	kEoBBaseSpellProperties,
+	kEoBBaseMagicFlightProps,
+	kEoBBaseTurnUndeadEffect,
+	kEoBBaseBurningHandsDest,
+	kEoBBaseConeOfColdDest1,
+	kEoBBaseConeOfColdDest2,
+	kEoBBaseConeOfColdDest3,
+	kEoBBaseConeOfColdDest4,
+	kEoBBaseConeOfColdGfxTbl,
+
+	kEoB1MainMenuStrings,
+	kEoB1BonusStrings,
+
+	kEoB1IntroFilesOpening,
+	kEoB1IntroFilesTower,
+	kEoB1IntroFilesOrb,
+	kEoB1IntroFilesWdEntry,
+	kEoB1IntroFilesKing,
+	kEoB1IntroFilesHands,
+	kEoB1IntroFilesWdExit,
+	kEoB1IntroFilesTunnel,
+	kEoB1IntroOpeningFrmDelay,
+	kEoB1IntroWdEncodeX,
+	kEoB1IntroWdEncodeY,
+	kEoB1IntroWdEncodeWH,
+	kEoB1IntroWdDsX,
+	kEoB1IntroWdDsY,
+	kEoB1IntroTvlX1,
+	kEoB1IntroTvlY1,
+	kEoB1IntroTvlX2,
+	kEoB1IntroTvlY2,
+	kEoB1IntroTvlW,
+	kEoB1IntroTvlH,
+
+	kEoB1DoorShapeDefs,
+	kEoB1DoorSwitchShapeDefs,
+	kEoB1DoorSwitchCoords,
+	kEoB1MonsterProperties,
+
+	kEoB1EnemyMageSpellList,
+	kEoB1EnemyMageSfx,
+	kEoB1BeholderSpellList,
+	kEoB1BeholderSfx,
+
+	kEoB1TurnUndeadString,
+
+	kEoB1NpcShpData,
+	kEoB1NpcSubShpIndex1,
+	kEoB1NpcSubShpIndex2,
+	kEoB1NpcSubShpY,
+	kEoB1Npc0Strings,
+	kEoB1Npc11Strings,
+	kEoB1Npc12Strings,
+	kEoB1Npc21Strings,
+	kEoB1Npc22Strings,
+	kEoB1Npc31Strings,
+	kEoB1Npc32Strings,
+	kEoB1Npc4Strings,
+	kEoB1Npc5Strings,
+	kEoB1Npc6Strings,
+	kEoB1Npc7Strings,
+
+	kEoB2MainMenuStrings,
+	kEoB2TransferConvertTable,
+	kEoB2TransferExpTable,
+
+	kEoB2IntroStrings,
+	kEoB2IntroCPSFiles,
+	kEoB2IntroSeqData00,
+ 	kEoB2IntroSeqData01,
+ 	kEoB2IntroSeqData02,
+ 	kEoB2IntroSeqData03,
+ 	kEoB2IntroSeqData04,
+ 	kEoB2IntroSeqData05,
+ 	kEoB2IntroSeqData06,
+ 	kEoB2IntroSeqData07,
+ 	kEoB2IntroSeqData08,
+ 	kEoB2IntroSeqData09,
+ 	kEoB2IntroSeqData10,
+ 	kEoB2IntroSeqData11,
+ 	kEoB2IntroSeqData12,
+ 	kEoB2IntroSeqData13,
+ 	kEoB2IntroSeqData14,
+ 	kEoB2IntroSeqData15,
+ 	kEoB2IntroSeqData16,
+ 	kEoB2IntroSeqData17,
+ 	kEoB2IntroSeqData18,
+ 	kEoB2IntroSeqData19,
+ 	kEoB2IntroSeqData20,
+ 	kEoB2IntroSeqData21,
+ 	kEoB2IntroSeqData22,
+ 	kEoB2IntroSeqData23,
+ 	kEoB2IntroSeqData24,
+ 	kEoB2IntroSeqData25,
+ 	kEoB2IntroSeqData26,
+ 	kEoB2IntroSeqData27,
+ 	kEoB2IntroSeqData28,
+ 	kEoB2IntroSeqData29,
+ 	kEoB2IntroSeqData30,
+ 	kEoB2IntroSeqData31,
+ 	kEoB2IntroSeqData32,
+ 	kEoB2IntroSeqData33,
+ 	kEoB2IntroSeqData34,
+ 	kEoB2IntroSeqData35,
+ 	kEoB2IntroSeqData36,
+ 	kEoB2IntroSeqData37,
+ 	kEoB2IntroSeqData38,
+ 	kEoB2IntroSeqData39,
+ 	kEoB2IntroSeqData40,
+ 	kEoB2IntroSeqData41,
+ 	kEoB2IntroSeqData42,
+ 	kEoB2IntroSeqData43,
+	kEoB2IntroShapes00,
+ 	kEoB2IntroShapes01,
+ 	kEoB2IntroShapes04,
+ 	kEoB2IntroShapes07,
+
+	kEoB2FinaleStrings,
+	kEoB2CreditsData,
+	kEoB2FinaleCPSFiles,
+	kEoB2FinaleSeqData00,
+ 	kEoB2FinaleSeqData01,
+ 	kEoB2FinaleSeqData02,
+ 	kEoB2FinaleSeqData03,
+ 	kEoB2FinaleSeqData04,
+ 	kEoB2FinaleSeqData05,
+ 	kEoB2FinaleSeqData06,
+ 	kEoB2FinaleSeqData07,
+ 	kEoB2FinaleSeqData08,
+ 	kEoB2FinaleSeqData09,
+ 	kEoB2FinaleSeqData10,
+ 	kEoB2FinaleSeqData11,
+ 	kEoB2FinaleSeqData12,
+ 	kEoB2FinaleSeqData13,
+ 	kEoB2FinaleSeqData14,
+ 	kEoB2FinaleSeqData15,
+ 	kEoB2FinaleSeqData16,
+ 	kEoB2FinaleSeqData17,
+ 	kEoB2FinaleSeqData18,
+ 	kEoB2FinaleSeqData19,
+ 	kEoB2FinaleSeqData20,
+	kEoB2FinaleShapes00,
+ 	kEoB2FinaleShapes03,
+ 	kEoB2FinaleShapes07,
+ 	kEoB2FinaleShapes09,
+ 	kEoB2FinaleShapes10,
+
+	kEoB2NpcShapeData,
+	kEoB2Npc1Strings,
+	kEoB2Npc2Strings,
+	kEoB2MonsterDustStrings,
+
+	kEoB2DreamSteps,
+	kEoB2KheldranStrings,
+	kEoB2HornStrings,
+	kEoB2HornSounds,
+
+	kEoB2WallOfForceDsX,
+	kEoB2WallOfForceDsY,
+	kEoB2WallOfForceNumW,
+	kEoB2WallOfForceNumH,
+	kEoB2WallOfForceShpId,
+
+	kLoLIngamePakFiles,
+	kLoLCharacterDefs,
+	kLoLIngameSfxFiles,
+	kLoLIngameSfxIndex,
+	kLoLMusicTrackMap,
+	kLoLIngameGMSfxIndex,
+	kLoLIngameMT32SfxIndex,
+	kLoLIngamePcSpkSfxIndex,
+	kLoLSpellProperties,
+	kLoLGameShapeMap,
+	kLoLSceneItemOffs,
+	kLoLCharInvIndex,
+	kLoLCharInvDefs,
+	kLoLCharDefsMan,
+	kLoLCharDefsWoman,
+	kLoLCharDefsKieran,
+	kLoLCharDefsAkshel,
+	kLoLExpRequirements,
+	kLoLMonsterModifiers,
+	kLoLMonsterShiftOffsets,
+	kLoLMonsterDirFlags,
+	kLoLMonsterScaleY,
+	kLoLMonsterScaleX,
+	kLoLMonsterScaleWH,
+	kLoLFlyingObjectShp,
+	kLoLInventoryDesc,
+
+	kLoLLevelShpList,
+	kLoLLevelDatList,
+	kLoLCompassDefs,
+	kLoLItemPrices,
+	kLoLStashSetup,
+
+	kLoLDscWalls,
+	kLoLDscOvlMap,
+	kLoLDscScaleWidthData,
+	kLoLDscScaleHeightData,
+	kLoLBaseDscY,
+
+	kLoLDscDoorScale,
+	kLoLDscDoor4,
+	kLoLDscDoorX,
+	kLoLDscDoorY,
+	kLoLDscOvlIndex,
+
+	kLoLScrollXTop,
+	kLoLScrollYTop,
+	kLoLScrollXBottom,
+	kLoLScrollYBottom,
+
+	kLoLButtonDefs,
+	kLoLButtonList1,
+	kLoLButtonList2,
+	kLoLButtonList3,
+	kLoLButtonList4,
+	kLoLButtonList5,
+	kLoLButtonList6,
+	kLoLButtonList7,
+	kLoLButtonList8,
+
+	kLoLLegendData,
+	kLoLMapCursorOvl,
+	kLoLMapStringId,
+
+	kLoLSpellbookAnim,
+	kLoLSpellbookCoords,
+	kLoLHealShapeFrames,
+	kLoLLightningDefs,
+	kLoLFireballCoords,
+
+	kLoLCredits,
+
+	kLoLHistory,
 #endif // ENABLE_EOB || ENABLE_LOL
 
 	kMaxResIDs
@@ -751,9 +751,9 @@ public:
 	const LoLButtonDef *loadButtonDefs(int id, int &entries);
 #endif // ENABLE_LOL
 #ifdef ENABLE_EOB
-	const EobSequenceStep *loadEob2SeqData(int id, int &entries);
-	const EobShapeDef *loadEob2ShapeData(int id, int &entries);
-	const EobCharacter *loadEobNpcData(int id, int &entries);
+	const EoBSequenceStep *loadEoB2SeqData(int id, int &entries);
+	const EoBShapeDef *loadEoB2ShapeData(int id, int &entries);
+	const EoBCharacter *loadEoBNpcData(int id, int &entries);
 #endif // ENABLE_EOB
 
 	// use '-1' to prefetch/unload all ids
@@ -794,9 +794,9 @@ private:
 	bool loadButtonDefs(Common::SeekableReadStream &stream, void *&ptr, int &size);
 #endif // ENABLE_LOL
 #ifdef ENABLE_EOB
-	bool loadEob2SeqData(Common::SeekableReadStream &stream, void *&ptr, int &size);
-	bool loadEob2ShapeData(Common::SeekableReadStream &stream, void *&ptr, int &size);
-	bool loadEobNpcData(Common::SeekableReadStream &stream, void *&ptr, int &size);
+	bool loadEoB2SeqData(Common::SeekableReadStream &stream, void *&ptr, int &size);
+	bool loadEoB2ShapeData(Common::SeekableReadStream &stream, void *&ptr, int &size);
+	bool loadEoBNpcData(Common::SeekableReadStream &stream, void *&ptr, int &size);
 #endif // ENABLE_EOB
 
 	void freeDummy(void *&ptr, int &size);
@@ -820,9 +820,9 @@ private:
 	void freeButtonDefs(void *&ptr, int &size);
 #endif // ENABLE_LOL
 #ifdef ENABLE_EOB
-	void freeEob2SeqData(void *&ptr, int &size);
-	void freeEob2ShapeData(void *&ptr, int &size);
-	void freeEobNpcData(void *&ptr, int &size);
+	void freeEoB2SeqData(void *&ptr, int &size);
+	void freeEoB2ShapeData(void *&ptr, int &size);
+	void freeEoBNpcData(void *&ptr, int &size);
 #endif // ENABLE_EOB
 
 	enum ResTypes {
@@ -836,17 +836,17 @@ private:
 		k2ShpAnimDataV1 = 6,
 		k2ShpAnimDataV2 = 7,
 
-		kLolCharData = 8,
-		kLolSpellData = 9,
-		kLolCompassData = 10,
-		kLolFlightShpData = 11,
-		kLolButtonData = 12,
-		kLolRawDataBe16 = 13,
-		kLolRawDataBe32 = 14,
-
-		kEob2SequenceData = 15,
-		kEob2ShapeData = 16,
-		kEobNpcData = 17
+		kLoLCharData = 8,
+		kLoLSpellData = 9,
+		kLoLCompassData = 10,
+		kLoLFlightShpData = 11,
+		kLoLButtonData = 12,
+		kLoLRawDataBe16 = 13,
+		kLoLRawDataBe32 = 14,
+
+		kEoB2SequenceData = 15,
+		kEoB2ShapeData = 16,
+		kEoBNpcData = 17
 	};
 
 	struct FileType {
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 091b3201bd..31f202362a 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -31,7 +31,7 @@
 
 namespace Kyra {
 
-Common::Error EobCoreEngine::loadGameState(int slot) {
+Common::Error EoBCoreEngine::loadGameState(int slot) {
 	const char *fileName = 0;
 
 	if (slot == -1) {
@@ -51,7 +51,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 	_screen->fadeToBlack(10);
 
 	for (int i = 0; i < 6; i++) {
-		EobCharacter *c = &_characters[i];
+		EoBCharacter *c = &_characters[i];
 		c->id = in.readByte();
 		c->flags = in.readByte();
 		in.read(c->name, 11);
@@ -105,7 +105,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 
 	_screen->loadShapeSetBitmap("CHARGENA", 3, 3);
 	for (int i = 0; i < 6; i++) {
-		EobCharacter *c = &_characters[i];
+		EoBCharacter *c = &_characters[i];
 		if (!c->flags || c->portrait < 0)
 			continue;
 		c->faceShape = _screen->encodeShape((c->portrait % 10) << 2, (c->portrait / 10) << 5, 4, 32, true);
@@ -113,7 +113,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 
 	_screen->loadShapeSetBitmap(_flags.gameID == GI_EOB2 ? "OUTPORTS" : "OUTTAKE", 3, 3);
 	for (int i = 0; i < 6; i++) {
-		EobCharacter *c = &_characters[i];
+		EoBCharacter *c = &_characters[i];
 		if (!c->flags || c->portrait >= 0)
 			continue;
 		c->faceShape = _screen->encodeShape((-(c->portrait + 1)) << 2, _flags.gameID == GI_EOB2 ? 0 : 160, 4, 32, true);
@@ -147,7 +147,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 	_inf->loadState(in);
 
 	for (int i = 0; i < 600; i++) {
-		EobItem *t = &_items[i];
+		EoBItem *t = &_items[i];
 		t->nameUnid = in.readByte();
 		t->nameId = in.readByte();
 		t->flags = in.readByte();
@@ -162,7 +162,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 	}
 
 	for (int i = 51; i < 65; i++) {
-		EobItemType *t = &_itemTypes[i];
+		EoBItemType *t = &_itemTypes[i];
 		t->invFlags = in.readUint16BE();
 		t->handFlags = in.readUint16BE();
 		t->armorClass = in.readSByte();
@@ -195,9 +195,9 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 		LevelTempData *l = _lvlTempData[i];
 		l->wallsXorData = new uint8[4096];
 		l->flags = new uint16[1024];
-		EobMonsterInPlay *lm = new EobMonsterInPlay[30];
+		EoBMonsterInPlay *lm = new EoBMonsterInPlay[30];
 		l->monsters = lm;
-		EobFlyingObject *lf = new EobFlyingObject[_numFlyingObjects];
+		EoBFlyingObject *lf = new EoBFlyingObject[_numFlyingObjects];
 		l->flyingObjects = lf;
 		WallOfForce *lw = new WallOfForce[5];
 		l->wallsOfForce = lw;
@@ -207,7 +207,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 			l->flags[ii] = in.readByte();
 
 		for (int ii = 0; ii < 30; ii++) {
-			EobMonsterInPlay *m = &lm[ii];
+			EoBMonsterInPlay *m = &lm[ii];
 			m->type = in.readByte();
 			m->unit = in.readByte();
 			m->block = in.readUint16BE();
@@ -235,7 +235,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 		}
 
 		for (int ii = 0; ii < _numFlyingObjects; ii++) {
-			EobFlyingObject *m = &lf[ii];
+			EoBFlyingObject *m = &lf[ii];
 			m->enable = in.readByte();
 			m->objectType = in.readByte();
 			m->attackerId = in.readSint16BE();
@@ -299,7 +299,7 @@ Common::Error EobCoreEngine::loadGameState(int slot) {
 	return Common::kNoError;
 }
 
-Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail) {
+Common::Error EoBCoreEngine::saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail) {
 	Common::String saveNameTmp;
 	const char *fileName = 0;
 
@@ -326,7 +326,7 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 		timerSpecialCharacterUpdate(0x30 + i);
 
 	for (int i = 0; i < 6; i++) {
-		EobCharacter *c = &_characters[i];
+		EoBCharacter *c = &_characters[i];
 
 		out->writeByte(c->id);
 		out->writeByte(c->flags);
@@ -400,7 +400,7 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 	_inf->saveState(out);
 
 	for (int i = 0; i < 600; i++) {
-		EobItem *t = &_items[i];
+		EoBItem *t = &_items[i];
 		out->writeByte(t->nameUnid);
 		out->writeByte(t->nameId);
 		out->writeByte(t->flags);
@@ -415,7 +415,7 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 	}
 
 	for (int i = 51; i < 65; i++) {
-		EobItemType *t = &_itemTypes[i];
+		EoBItemType *t = &_itemTypes[i];
 		out->writeUint16BE(t->invFlags);
 		out->writeUint16BE(t->handFlags);
 		out->writeSByte(t->armorClass);
@@ -440,12 +440,12 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 		for (int ii = 0; ii < 1024; ii++)
 			out->writeByte(l->flags[ii] & 0xff);
 
-		EobMonsterInPlay *lm = (EobMonsterInPlay*)_lvlTempData[i]->monsters;
-		EobFlyingObject *lf = (EobFlyingObject*)_lvlTempData[i]->flyingObjects;
+		EoBMonsterInPlay *lm = (EoBMonsterInPlay*)_lvlTempData[i]->monsters;
+		EoBFlyingObject *lf = (EoBFlyingObject*)_lvlTempData[i]->flyingObjects;
 		WallOfForce *lw = (WallOfForce*)_lvlTempData[i]->wallsOfForce;
 
 		for (int ii = 0; ii < 30; ii++) {
-			EobMonsterInPlay *m = &lm[ii];
+			EoBMonsterInPlay *m = &lm[ii];
 			out->writeByte(m->type);
 			out->writeByte(m->unit);
 			out->writeUint16BE(m->block);
@@ -473,7 +473,7 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 		}
 
 		for (int ii = 0; ii < _numFlyingObjects; ii++) {
-			EobFlyingObject *m = &lf[ii];
+			EoBFlyingObject *m = &lf[ii];
 			out->writeByte(m->enable);
 			out->writeByte(m->objectType);
 			out->writeSint16BE(m->attackerId);
@@ -513,22 +513,22 @@ Common::Error EobCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 	return Common::kNoError;
 }
 
-void *EobCoreEngine::generateMonsterTempData(LevelTempData *tmp) {
-	EobMonsterInPlay *m = new EobMonsterInPlay[30];
-	memcpy(m, _monsters,  sizeof(EobMonsterInPlay) * 30);
+void *EoBCoreEngine::generateMonsterTempData(LevelTempData *tmp) {
+	EoBMonsterInPlay *m = new EoBMonsterInPlay[30];
+	memcpy(m, _monsters,  sizeof(EoBMonsterInPlay) * 30);
 	return m;
 }
 
-void EobCoreEngine::restoreMonsterTempData(LevelTempData *tmp) {
-	memcpy(_monsters, tmp->monsters, sizeof(EobMonsterInPlay) * 30);
+void EoBCoreEngine::restoreMonsterTempData(LevelTempData *tmp) {
+	memcpy(_monsters, tmp->monsters, sizeof(EoBMonsterInPlay) * 30);
 }
 
-void EobCoreEngine::releaseMonsterTempData(LevelTempData *tmp) {
-	EobMonsterInPlay *p = (EobMonsterInPlay*)tmp->monsters;
+void EoBCoreEngine::releaseMonsterTempData(LevelTempData *tmp) {
+	EoBMonsterInPlay *p = (EoBMonsterInPlay*)tmp->monsters;
 	delete[] p;
 }
 
-void *EobCoreEngine::generateWallOfForceTempData(LevelTempData *tmp) {
+void *EoBCoreEngine::generateWallOfForceTempData(LevelTempData *tmp) {
 	WallOfForce *w = new WallOfForce[5];
 	memcpy(w, _wallsOfForce,  sizeof(WallOfForce) * 5);
 	uint32 ct = _system->getMillis();
@@ -537,14 +537,14 @@ void *EobCoreEngine::generateWallOfForceTempData(LevelTempData *tmp) {
 	return w;
 }
 
-void EobCoreEngine::restoreWallOfForceTempData(LevelTempData *tmp) {
+void EoBCoreEngine::restoreWallOfForceTempData(LevelTempData *tmp) {
 	memcpy(_wallsOfForce, tmp->wallsOfForce,  sizeof(WallOfForce) * 5);
 	uint32 ct = _system->getMillis();
 	for (int i = 0; i < 5; i++)
 		_wallsOfForce[i].duration += ct;
 }
 
-void EobCoreEngine::releaseWallOfForceTempData(LevelTempData *tmp) {
+void EoBCoreEngine::releaseWallOfForceTempData(LevelTempData *tmp) {
 	WallOfForce *p = (WallOfForce*)tmp->wallsOfForce;
 	delete[] p;
 }
diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp
index c7fb107f35..c4262c0edd 100644
--- a/engines/kyra/saveload_lol.cpp
+++ b/engines/kyra/saveload_lol.cpp
@@ -194,7 +194,7 @@ Common::Error LoLEngine::loadGameState(int slot) {
 		_lvlTempData[i] = new LevelTempData;
 		_lvlTempData[i]->wallsXorData = new uint8[4096];
 		_lvlTempData[i]->flags = new uint16[1024];
-		LolMonsterInPlay *lm = new LolMonsterInPlay[30];
+		LoLMonsterInPlay *lm = new LoLMonsterInPlay[30];
 		 _lvlTempData[i]->monsters = lm;
 		FlyingObject *lf = new FlyingObject[_numFlyingObjects];
 		_lvlTempData[i]->flyingObjects = lf;
@@ -205,7 +205,7 @@ Common::Error LoLEngine::loadGameState(int slot) {
 			l->flags[ii] = in.readByte();
 
 		for (int ii = 0; ii < 30; ii++) {
-			LolMonsterInPlay *m = &lm[ii];
+			LoLMonsterInPlay *m = &lm[ii];
 			m->nextAssignedObject = in.readUint16BE();
 			m->nextDrawObject = in.readUint16BE();
 			m->flyingHeight = in.readByte();
@@ -386,11 +386,11 @@ Common::Error LoLEngine::saveGameStateIntern(int slot, const char *saveName, con
 		for (int ii = 0; ii < 1024; ii++)
 			out->writeByte(l->flags[ii] & 0xff);
 
-		LolMonsterInPlay *lm = (LolMonsterInPlay*)_lvlTempData[i]->monsters;
+		LoLMonsterInPlay *lm = (LoLMonsterInPlay*)_lvlTempData[i]->monsters;
 		FlyingObject *lf = (FlyingObject*)_lvlTempData[i]->flyingObjects;
 
 		for (int ii = 0; ii < 30; ii++) {
-			LolMonsterInPlay *m = &lm[ii];
+			LoLMonsterInPlay *m = &lm[ii];
 			out->writeUint16BE(m->nextAssignedObject);
 			out->writeUint16BE(m->nextDrawObject);
 			out->writeByte(m->flyingHeight);
@@ -484,8 +484,8 @@ void LoLEngine::restoreBlockTempData(int levelIndex) {
 }
 
 void *LoLEngine::generateMonsterTempData(LevelTempData *tmp) {
-	LolMonsterInPlay *m = new LolMonsterInPlay[30];
-	memcpy(m, _monsters,  sizeof(LolMonsterInPlay) * 30);
+	LoLMonsterInPlay *m = new LoLMonsterInPlay[30];
+	memcpy(m, _monsters,  sizeof(LoLMonsterInPlay) * 30);
 	tmp->monsterDifficulty = _monsterDifficulty;
 	return m;
 }
@@ -509,7 +509,7 @@ void LoLEngine::restoreTempDataAdjustMonsterStrength(int index) {
 }
 
 void LoLEngine::restoreMonsterTempData(LevelTempData *tmp) {
-	memcpy(_monsters, tmp->monsters, sizeof(LolMonsterInPlay) * 30);
+	memcpy(_monsters, tmp->monsters, sizeof(LoLMonsterInPlay) * 30);
 
 	for (int i = 0; i < 30; i++) {
 		if (_monsters[i].block) {
@@ -521,7 +521,7 @@ void LoLEngine::restoreMonsterTempData(LevelTempData *tmp) {
 }
 
 void LoLEngine::releaseMonsterTempData(LevelTempData *tmp) {
-	LolMonsterInPlay *p = (LolMonsterInPlay*)tmp->monsters;
+	LoLMonsterInPlay *p = (LoLMonsterInPlay*)tmp->monsters;
 	delete[] p;
 }
 
diff --git a/engines/kyra/saveload_rpg.cpp b/engines/kyra/saveload_rpg.cpp
index 4553570f46..2e9f0228cf 100644
--- a/engines/kyra/saveload_rpg.cpp
+++ b/engines/kyra/saveload_rpg.cpp
@@ -106,19 +106,19 @@ void KyraRpgEngine::releaseTempData() {
 }
 
 void *KyraRpgEngine::generateFlyingObjectTempData(LevelTempData *tmp) {
-	assert(_flyingObjectStructSize == sizeof(EobFlyingObject));
-	EobFlyingObject *f = new EobFlyingObject[_numFlyingObjects];
-	memcpy(f, _flyingObjectsPtr,  sizeof(EobFlyingObject) * _numFlyingObjects);
+	assert(_flyingObjectStructSize == sizeof(EoBFlyingObject));
+	EoBFlyingObject *f = new EoBFlyingObject[_numFlyingObjects];
+	memcpy(f, _flyingObjectsPtr,  sizeof(EoBFlyingObject) * _numFlyingObjects);
 	return f;
 }
 
 void KyraRpgEngine::restoreFlyingObjectTempData(LevelTempData *tmp) {
-	assert(_flyingObjectStructSize == sizeof(EobFlyingObject));
-	memcpy(_flyingObjectsPtr, tmp->flyingObjects, sizeof(EobFlyingObject) * _numFlyingObjects);
+	assert(_flyingObjectStructSize == sizeof(EoBFlyingObject));
+	memcpy(_flyingObjectsPtr, tmp->flyingObjects, sizeof(EoBFlyingObject) * _numFlyingObjects);
 }
 
 void KyraRpgEngine::releaseFlyingObjectTempData(LevelTempData *tmp) {
-	EobFlyingObject *p = (EobFlyingObject*)tmp->flyingObjects;
+	EoBFlyingObject *p = (EoBFlyingObject*)tmp->flyingObjects;
 	delete[] p;
 }
 
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 1927df79c1..e82442a117 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -33,7 +33,7 @@
 
 namespace Kyra {
 
-void EobCoreEngine::loadLevel(int level, int sub) {
+void EoBCoreEngine::loadLevel(int level, int sub) {
 	_currentLevel = level;
 	_currentSub = sub;
 	uint32 end = _system->getMillis() + 500;
@@ -80,7 +80,7 @@ void EobCoreEngine::loadLevel(int level, int sub) {
 		if (*pos++ == 0xEC)
 			pos = loadActiveMonsterData(pos, level);
 		else if (!(_hasTempDataFlags & (1 << (level - 1))))
-			memset(_monsters, 0, 30 * sizeof(EobMonsterInPlay));
+			memset(_monsters, 0, 30 * sizeof(EoBMonsterInPlay));
 
 		len2 = len - (pos - data);
 		_inf->loadData(pos, len2);
@@ -111,7 +111,7 @@ void EobCoreEngine::loadLevel(int level, int sub) {
 	}
 
 	loadVcnData(gfxFile.c_str(), 0);
-	_screen->loadEobBitmap("INVENT", 0, 5, 3, 2);
+	_screen->loadEoBBitmap("INVENT", 0, 5, 3, 2);
 	delayUntil(end);
 	snd_stopSound();
 
@@ -121,7 +121,7 @@ void EobCoreEngine::loadLevel(int level, int sub) {
 	_screen->setCurPage(0);
 }
 
-Common::String EobCoreEngine::initLevelData(int sub){
+Common::String EoBCoreEngine::initLevelData(int sub){
 	const uint8 *data = _screen->getCPagePtr(5) + 2;
 	const uint8 *pos = data;
 
@@ -252,7 +252,7 @@ Common::String EobCoreEngine::initLevelData(int sub){
 	return _curGfxFile;
 }
 
-void EobCoreEngine::addLevelItems() {
+void EoBCoreEngine::addLevelItems() {
 	for (int i = 0; i < 1024; i++)
 		_levelBlockProperties[i].drawObjects = 0;
 
@@ -263,7 +263,7 @@ void EobCoreEngine::addLevelItems() {
 	}
 }
 
-void EobCoreEngine::loadVcnData(const char *file, const char*/*nextFile*/) {
+void EoBCoreEngine::loadVcnData(const char *file, const char*/*nextFile*/) {
 	if (file)
 		strcpy(_lastBlockDataFile, file);
 
@@ -278,7 +278,7 @@ void EobCoreEngine::loadVcnData(const char *file, const char*/*nextFile*/) {
 	memcpy(_vcnBlocks, v, tlen);
 }
 
-void EobCoreEngine::loadBlockProperties(const char *mazFile) {
+void EoBCoreEngine::loadBlockProperties(const char *mazFile) {
 	memset(_levelBlockProperties, 0, 1024 * sizeof(LevelBlockProperty));
 	const uint8 *p = getBlockFileData(mazFile) + 6;
 
@@ -293,19 +293,19 @@ void EobCoreEngine::loadBlockProperties(const char *mazFile) {
 	}
 }
 
-const uint8 *EobCoreEngine::getBlockFileData(int) {
+const uint8 *EoBCoreEngine::getBlockFileData(int) {
 	Common::SeekableReadStream *s = _res->createReadStream(_curBlockFile);
 	_screen->loadFileDataToPage(s, 15, s->size());
 	delete s;
 	return _screen->getCPagePtr(14);
 }
 
-const uint8 *EobCoreEngine::getBlockFileData(const char *mazFile) {
+const uint8 *EoBCoreEngine::getBlockFileData(const char *mazFile) {
 	_curBlockFile = mazFile;
 	return getBlockFileData(0);
 }
 
-void EobCoreEngine::loadDecorations(const char *cpsFile, const char *decFile) {
+void EoBCoreEngine::loadDecorations(const char *cpsFile, const char *decFile) {
 	_screen->loadShapeSetBitmap(cpsFile, 3, 3);
 	Common::SeekableReadStream *s = _res->createReadStream(decFile);
 
@@ -331,9 +331,9 @@ void EobCoreEngine::loadDecorations(const char *cpsFile, const char *decFile) {
 
 	int len = s->readUint16LE();
 	delete[] _levelDecorationRects;
-	_levelDecorationRects = new EobRect8[len];
+	_levelDecorationRects = new EoBRect8[len];
 	for (int i = 0; i < len; i++) {
-		EobRect8 *l = &_levelDecorationRects[i];
+		EoBRect8 *l = &_levelDecorationRects[i];
 		l->x = s->readUint16LE();
 		l->y = s->readUint16LE();
 		l->w = s->readUint16LE();
@@ -343,7 +343,7 @@ void EobCoreEngine::loadDecorations(const char *cpsFile, const char *decFile) {
 	delete s;
 }
 
-void EobCoreEngine::assignWallsAndDecorations(int wallIndex, int vmpIndex, int decIndex, int specialType, int flags) {
+void EoBCoreEngine::assignWallsAndDecorations(int wallIndex, int vmpIndex, int decIndex, int specialType, int flags) {
 	_wllVmpMap[wallIndex] = vmpIndex;
 	for (int i = 0; i < 6; i++) {
 		for (int ii = 0; ii < 10; ii++) {
@@ -372,7 +372,7 @@ void EobCoreEngine::assignWallsAndDecorations(int wallIndex, int vmpIndex, int d
 			if (_levelDecorationShapes[t])
 				continue;
 
-			EobRect8 *r = &_levelDecorationRects[t];
+			EoBRect8 *r = &_levelDecorationRects[t];
 			if (r->w == 0 || r->h == 0)
 				error("Error trying to make decoration %d (x: %d, y: %d, w: %d, h: %d)", decIndex, r->x, r->y, r->w, r->h);
 
@@ -389,7 +389,7 @@ void EobCoreEngine::assignWallsAndDecorations(int wallIndex, int vmpIndex, int d
 	} while (decIndex != -1);
 }
 
-void EobCoreEngine::releaseDecorations() {
+void EoBCoreEngine::releaseDecorations() {
 	if (_levelDecorationShapes) {
 		for (int i = 0; i < 400; i++) {
 			delete[] _levelDecorationShapes[i];
@@ -399,7 +399,7 @@ void EobCoreEngine::releaseDecorations() {
 	_mappedDecorationsCount = 0;
 }
 
-void EobCoreEngine::releaseDoorShapes() {
+void EoBCoreEngine::releaseDoorShapes() {
 	for (int i = 0; i < 6; i++) {
 		delete[] _doorShapes[i];
 		_doorShapes[i] = 0;
@@ -408,7 +408,7 @@ void EobCoreEngine::releaseDoorShapes() {
 	}
 }
 
-void EobCoreEngine::toggleWallState(int wall, int toggle) {
+void EoBCoreEngine::toggleWallState(int wall, int toggle) {
 	wall = wall * 10 + 3;
 
 	for (int i = 0; i < 9 ; i++) {
@@ -422,7 +422,7 @@ void EobCoreEngine::toggleWallState(int wall, int toggle) {
 	}
 }
 
-void EobCoreEngine::drawScene(int refresh) {
+void EoBCoreEngine::drawScene(int refresh) {
 	generateBlockDrawingBuffer();
 	drawVcnBlocks();
 	drawSceneShapes();
@@ -470,7 +470,7 @@ void EobCoreEngine::drawScene(int refresh) {
 	_sceneUpdateRequired = false;
 }
 
-void EobCoreEngine::drawSceneShapes(int start) {
+void EoBCoreEngine::drawSceneShapes(int start) {
 	for (int i = start; i < 18; i++) {
 		uint8 t = _dscTileIndex[i];
 		uint8 s = _visibleBlocks[t]->walls[_sceneDrawVarDown];
@@ -512,7 +512,7 @@ void EobCoreEngine::drawSceneShapes(int start) {
 	}
 }
 
-void EobCoreEngine::drawDecorations(int index) {
+void EoBCoreEngine::drawDecorations(int index) {
 	for (int i = 1; i >= 0; i--) {
 		int s = index * 2 + i;
 		if (_dscWallMapping[s]) {
@@ -563,7 +563,7 @@ void EobCoreEngine::drawDecorations(int index) {
 	}
 }
 
-int EobCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint16 direction) {
+int EoBCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint16 direction) {
 	uint16 b = calcNewBlockPosition(curBlock, direction);
 	int w = _levelBlockProperties[b].walls[direction ^ 2];
 	int f = _wllWallFlags[w];
@@ -585,13 +585,13 @@ int EobCoreEngine::calcNewBlockPositionAndTestPassability(uint16 curBlock, uint1
 	return b;
 }
 
-void EobCoreEngine::notifyBlockNotPassable() {
+void EoBCoreEngine::notifyBlockNotPassable() {
 	_txt->printMessage(_warningStrings[0]);
 	snd_playSoundEffect(29);
 	removeInputTop();
 }
 
-void EobCoreEngine::moveParty(uint16 block) {
+void EoBCoreEngine::moveParty(uint16 block) {
 	updateAllMonsterDests();
 	uint16 old = _currentBlock;
 	_currentBlock = block;
@@ -616,7 +616,7 @@ void EobCoreEngine::moveParty(uint16 block) {
 	checkFlyingObjects();
 }
 
-int EobCoreEngine::clickedDoorSwitch(uint16 block, uint16 direction) {
+int EoBCoreEngine::clickedDoorSwitch(uint16 block, uint16 direction) {
 	uint8 v = _visibleBlocks[13]->walls[_sceneDrawVarDown];
 	SpriteDecoration *d = &_doorSwitches[((v > 12 && v < 23) || v == 31) ? 3 : 0];
 	int x1 = d->x + _dscShapeCoords[138] - 4;
@@ -638,7 +638,7 @@ int EobCoreEngine::clickedDoorSwitch(uint16 block, uint16 direction) {
 	return 1;
 }
 
-int EobCoreEngine::clickedNiche(uint16 block, uint16 direction) {
+int EoBCoreEngine::clickedNiche(uint16 block, uint16 direction) {
 	uint8 v = _wllShapeMap[_levelBlockProperties[block].walls[direction]];
 	if (!clickedShape(v))
 		return 0;
@@ -664,7 +664,7 @@ int EobCoreEngine::clickedNiche(uint16 block, uint16 direction) {
 	return 1;
 }
 
-int EobCoreEngine::clickedDoorPry(uint16 block, uint16 direction) {
+int EoBCoreEngine::clickedDoorPry(uint16 block, uint16 direction) {
 	if (!posWithinRect(_mouseX, _mouseY, 40, 16, 136, 88) && (_clickedSpecialFlag == 0x40))
 		return 0;
 
@@ -702,7 +702,7 @@ int EobCoreEngine::clickedDoorPry(uint16 block, uint16 direction) {
 	return 1;
 }
 
-int EobCoreEngine::clickedDoorNoPry(uint16 block, uint16 direction) {
+int EoBCoreEngine::clickedDoorNoPry(uint16 block, uint16 direction) {
 	if (!posWithinRect(_mouseX, _mouseY, 40, 16, 136, 88) && (_clickedSpecialFlag == 0x40))
 		return 0;
 
@@ -712,7 +712,7 @@ int EobCoreEngine::clickedDoorNoPry(uint16 block, uint16 direction) {
 	return 1;
 }
 
-int EobCoreEngine::specialWallAction(int block, int direction) {
+int EoBCoreEngine::specialWallAction(int block, int direction) {
 	direction ^= 2;
 	uint8 type = _specialWallTypes[_levelBlockProperties[block].walls[direction]];
 	if (!type || !(_clickedSpecialFlag & (((_levelBlockProperties[block].flags & 0xf8) >> 3) | 0xe0)))
@@ -764,11 +764,11 @@ int EobCoreEngine::specialWallAction(int block, int direction) {
 	return res;
 }
 
-void EobCoreEngine::openDoor(int block) {
+void EoBCoreEngine::openDoor(int block) {
 	openCloseDoor(block, 1);
 }
 
-void EobCoreEngine::closeDoor(int block) {
+void EoBCoreEngine::closeDoor(int block) {
 	if (block == _currentBlock || _levelBlockProperties[block].flags & 7)
 		return;
 	openCloseDoor(block, -1);
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index e38e5ebc22..d8fb70a55f 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -474,10 +474,10 @@ void LoLEngine::resetItems(int flag) {
 	for (int i = 0; i < 1024; i++) {
 		_levelBlockProperties[i].direction = 5;
 		uint16 id = _levelBlockProperties[i].assignedObjects;
-		LolMonsterInPlay *r = 0;
+		LoLMonsterInPlay *r = 0;
 
 		while (id & 0x8000) {
-			r = (LolMonsterInPlay *)findObject(id);
+			r = (LoLMonsterInPlay *)findObject(id);
 			id = r->nextAssignedObject;
 		}
 
@@ -496,7 +496,7 @@ void LoLEngine::resetItems(int flag) {
 }
 
 void LoLEngine::disableMonsters() {
-	memset(_monsters, 0, 30 * sizeof(LolMonsterInPlay));
+	memset(_monsters, 0, 30 * sizeof(LoLMonsterInPlay));
 	for (int i = 0; i < 30; i++)
 		_monsters[i].mode = 0x10;
 }
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 36af074ee0..869f4375ae 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -36,7 +36,7 @@
 
 namespace Kyra {
 
-Screen_Eob::Screen_Eob(EobCoreEngine *vm, OSystem *system) : Screen(vm, system) {
+Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system) {
 	_shapeFadeMode[0] = _shapeFadeMode[1] = 0;
 	_shapeFadeInternal = 0;
 	_fadeData = 0;
@@ -53,7 +53,7 @@ Screen_Eob::Screen_Eob(EobCoreEngine *vm, OSystem *system) : Screen(vm, system)
 	_gfxMaxY = 0;
 }
 
-Screen_Eob::~Screen_Eob() {
+Screen_EoB::~Screen_EoB() {
 	delete[] _fadeData;
 	if (_customDimTable) {
 		for (int i = 0; i < _screenDimTableCount; i++)
@@ -63,13 +63,13 @@ Screen_Eob::~Screen_Eob() {
 	delete[] _dsTempPage;
 }
 
-bool Screen_Eob::init() {
+bool Screen_EoB::init() {
 	if (Screen::init()) {
 		_customDimTable = new ScreenDim*[_screenDimTableCount];
 		memset(_customDimTable, 0, sizeof(ScreenDim*) * _screenDimTableCount);
 
 		int temp;
-		_gfxMaxY = _vm->staticres()->loadRawData(kEobBaseExpObjectY, temp);
+		_gfxMaxY = _vm->staticres()->loadRawData(kEoBBaseExpObjectY, temp);
 		_fadeData = _vm->resource()->fileData("FADING.DAT", 0);
 
 		if (!_fadeData) {
@@ -88,18 +88,18 @@ bool Screen_Eob::init() {
 	return false;
 }
 
-void Screen_Eob::setScreenDim(int dim) {
+void Screen_EoB::setScreenDim(int dim) {
 	assert(dim < _screenDimTableCount);
 	_curDim = _customDimTable[dim] ? (const ScreenDim *)_customDimTable[dim] : &_screenDimTable[dim];
 	_curDimIndex = dim;
 }
 
-const ScreenDim *Screen_Eob::getScreenDim(int dim) {
+const ScreenDim *Screen_EoB::getScreenDim(int dim) {
 	assert(dim < _screenDimTableCount);
 	return _customDimTable[dim] ? (const ScreenDim *)_customDimTable[dim] : &_screenDimTable[dim];
 }
 
-void Screen_Eob::modifyScreenDim(int dim, int x, int y, int w, int h) {
+void Screen_EoB::modifyScreenDim(int dim, int x, int y, int w, int h) {
 	if (!_customDimTable[dim])
 		_customDimTable[dim] = new ScreenDim;
 
@@ -112,16 +112,16 @@ void Screen_Eob::modifyScreenDim(int dim, int x, int y, int w, int h) {
 		setScreenDim(dim);
 }
 
-void Screen_Eob::setClearScreenDim(int dim) {
+void Screen_EoB::setClearScreenDim(int dim) {
 	setScreenDim(dim);
 	clearCurDim();
 }
 
-void Screen_Eob::clearCurDim() {
+void Screen_EoB::clearCurDim() {
 	fillRect(_curDim->sx << 3, _curDim->sy, ((_curDim->sx + _curDim->w) << 3) - 1, (_curDim->sy + _curDim->h) - 1, _curDim->unkA);
 }
 
-void Screen_Eob::setMouseCursor(int x, int y, const byte *shape) {
+void Screen_EoB::setMouseCursor(int x, int y, const byte *shape) {
 	if (!shape)
 		return;
 	int mouseW = shape[2] << 3;
@@ -143,23 +143,23 @@ void Screen_Eob::setMouseCursor(int x, int y, const byte *shape) {
 	_system->updateScreen();
 }
 
-void Screen_Eob::loadFileDataToPage(Common::SeekableReadStream *s, int pageNum, uint32 size) {
+void Screen_EoB::loadFileDataToPage(Common::SeekableReadStream *s, int pageNum, uint32 size) {
 	s->read(_pagePtrs[pageNum], size);
 }
 
-void Screen_Eob::printShadedText(const char *string, int x, int y, int col1, int col2) {
+void Screen_EoB::printShadedText(const char *string, int x, int y, int col1, int col2) {
 	printText(string, x - 1, y, 12, col2);
 	printText(string, x, y + 1, 12, 0);
 	printText(string, x - 1, y + 1, 12, 0);
 	printText(string, x, y, col1, 0);
 }
 
-void Screen_Eob::loadShapeSetBitmap(const char *file, int tempPage, int destPage) {
-	loadEobBitmap(file, 0, tempPage, destPage, -1);
+void Screen_EoB::loadShapeSetBitmap(const char *file, int tempPage, int destPage) {
+	loadEoBBitmap(file, 0, tempPage, destPage, -1);
 	_curPage = 2;
 }
 
-void Screen_Eob::loadEobBitmap(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage) {
+void Screen_EoB::loadEoBBitmap(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage) {
 	Common::String tmp = Common::String::format("%s.CPS", file);
 	Common::SeekableReadStream *s = _vm->resource()->createReadStream(tmp);
 	bool loadAlternative = false;
@@ -183,7 +183,7 @@ void Screen_Eob::loadEobBitmap(const char *file, const uint8 *ditheringData, int
 			tmp.setChar('X', 0);
 			s = _vm->resource()->createReadStream(tmp);
 			if (!s)
-				error("Screen_Eob::loadEobBitmap(): CPS file loading failed.");
+				error("Screen_EoB::loadEoBBitmap(): CPS file loading failed.");
 			s->seek(768);
 			loadFileDataToPage(s, destPage, 64000);
 			delete s;
@@ -200,7 +200,7 @@ void Screen_Eob::loadEobBitmap(const char *file, const uint8 *ditheringData, int
 	}
 }
 
-uint8 *Screen_Eob::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4bitEncoding) {
+uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4bitEncoding) {
 	uint8 *shp = 0;
 	uint16 shapesize = 0;
 
@@ -325,7 +325,7 @@ uint8 *Screen_Eob::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 	return shp;
 }
 
-void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd, int flags, ...) {
+void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd, int flags, ...) {
 	uint8 *dst = getPagePtr(pageNum);
 	const uint8 *src = shapeData;
 
@@ -642,7 +642,7 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 	}
 }
 
-const uint8 *Screen_Eob::scaleShape(const uint8 *shapeData, int steps) {
+const uint8 *Screen_EoB::scaleShape(const uint8 *shapeData, int steps) {
 	setShapeFadeMode(1, steps ? true : false);
 
 	while (shapeData && steps--)
@@ -651,7 +651,7 @@ const uint8 *Screen_Eob::scaleShape(const uint8 *shapeData, int steps) {
 	return shapeData;
 }
 
-const uint8 *Screen_Eob::scaleShapeStep(const uint8 *shp) {
+const uint8 *Screen_EoB::scaleShapeStep(const uint8 *shp) {
 	uint8 *d = _dsTempPage;
 	*d++ = *shp++;
 
@@ -701,14 +701,14 @@ const uint8 *Screen_Eob::scaleShapeStep(const uint8 *shp) {
 	return (const uint8 *) _dsTempPage;
 }
 
-void Screen_Eob::replaceShapePalette(uint8 *shp, const uint8 *pal) {
+void Screen_EoB::replaceShapePalette(uint8 *shp, const uint8 *pal) {
 	if (*shp != 1)
 		return;
 	shp += 4;
 	memcpy(shp, pal, 16);
 }
 
-void Screen_Eob::applyShapeOverlay(uint8 *shp, int ovlIndex) {
+void Screen_EoB::applyShapeOverlay(uint8 *shp, int ovlIndex) {
 	if (*shp != 1)
 		return;
 	shp += 4;
@@ -717,25 +717,25 @@ void Screen_Eob::applyShapeOverlay(uint8 *shp, int ovlIndex) {
 		shp[i] = ovl[shp[i]];
 }
 
-void Screen_Eob::setShapeFrame(int x1, int y1, int x2, int y2) {
+void Screen_EoB::setShapeFrame(int x1, int y1, int x2, int y2) {
 	_dsX1 = x1;
 	_dsY1 = y1;
 	_dsX2 = x2;
 	_dsY2 = y2;
 }
 
-void Screen_Eob::setShapeFadeMode (uint8 i, bool b) {
+void Screen_EoB::setShapeFadeMode (uint8 i, bool b) {
 	if (!i || i == 1)
 		_shapeFadeMode[i] = b;
 }
 
-void Screen_Eob::setGfxParameters(int x, int y, int col) {
+void Screen_EoB::setGfxParameters(int x, int y, int col) {
 	_gfxX = x;
 	_gfxY = y;
 	_gfxCol = col;
 }
 
-void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepSize, int aspectRatio, const uint8 *colorTable, int colorTableSize) {
+void Screen_EoB::drawExplosion(int scale, int radius, int numElements, int stepSize, int aspectRatio, const uint8 *colorTable, int colorTableSize) {
 	int ymin = 0;
 	int ymax = _gfxMaxY[scale];
 	int xmin = -100;
@@ -837,7 +837,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepS
 	showMouse();
 }
 
-void Screen_Eob::drawVortex(int numElements, int radius, int stepSize, int, int disorder, const uint8 *colorTable, int colorTableSize) {
+void Screen_EoB::drawVortex(int numElements, int radius, int stepSize, int, int disorder, const uint8 *colorTable, int colorTableSize) {
 	int16 *xCoords = (int16*)_dsTempPage;
 	int16 *yCoords = (int16*)&_dsTempPage[300];
 	int16 *xMod = (int16*)&_dsTempPage[600];
@@ -973,7 +973,7 @@ void Screen_Eob::drawVortex(int numElements, int radius, int stepSize, int, int
 	showMouse();
 }
 
-void Screen_Eob::fadeTextColor(Palette *pal, int color1, int rate) {
+void Screen_EoB::fadeTextColor(Palette *pal, int color1, int rate) {
 	uint8 *col = pal->getData();
 
 	for (bool loop = true; loop; ) {
@@ -1002,7 +1002,7 @@ void Screen_Eob::fadeTextColor(Palette *pal, int color1, int rate) {
 	}
 }
 
-bool Screen_Eob::delayedFadePalStep(Palette *fadePal, Palette *destPal, int rate) {
+bool Screen_EoB::delayedFadePalStep(Palette *fadePal, Palette *destPal, int rate) {
 	bool res = false;
 
 	uint8 *s = fadePal->getData();
@@ -1031,15 +1031,15 @@ bool Screen_Eob::delayedFadePalStep(Palette *fadePal, Palette *destPal, int rate
 	return res;
 }
 
-int Screen_Eob::getRectSize(int w, int h) {
+int Screen_EoB::getRectSize(int w, int h) {
 	return w * h;
 }
 
-void Screen_Eob::setFadeTableIndex(int index) {
+void Screen_EoB::setFadeTableIndex(int index) {
 	_fadeDataIndex = (CLIP(index, 0, 7) << 8);
 }
 
-void Screen_Eob::createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, uint8 weight) {
+void Screen_EoB::createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, uint8 weight) {
 	if (!palData)
 		return;
 
@@ -1082,11 +1082,11 @@ void Screen_Eob::createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, ui
 	}
 }
 
-uint8 *Screen_Eob::getFadeTable(int index) {
+uint8 *Screen_EoB::getFadeTable(int index) {
 	return (index >= 0 && index < 5) ? &_fadeData[index << 8] : 0;
 }
 
-void Screen_Eob::drawShapeSetPixel(uint8 * dst, uint8 c) {
+void Screen_EoB::drawShapeSetPixel(uint8 * dst, uint8 c) {
 	if (_shapeFadeMode[0]) {
 		if (_shapeFadeMode[1]) {
 			c = *dst;
@@ -1105,7 +1105,7 @@ void Screen_Eob::drawShapeSetPixel(uint8 * dst, uint8 c) {
 	*dst = c;
 }
 
-void Screen_Eob::scaleShapeProcessLine(uint8 *&dst, const uint8 *&src) {
+void Screen_EoB::scaleShapeProcessLine(uint8 *&dst, const uint8 *&src) {
 	for (int i = 0; i < _dsDiv; i++) {
 		*dst++ = *src++;
 		*dst++ = (READ_BE_UINT16(src) >> 4) & 0xff;
@@ -1124,7 +1124,7 @@ void Screen_Eob::scaleShapeProcessLine(uint8 *&dst, const uint8 *&src) {
 	}
 }
 
-bool Screen_Eob::posWithinRect(int posX, int posY, int x1, int y1, int x2, int y2) {
+bool Screen_EoB::posWithinRect(int posX, int posY, int x1, int y1, int x2, int y2) {
 	if (posX < x1 || posX > x2 || posY < y1 || posY > y2)
 		return false;
 	return true;
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index 78361ebaa6..6406587980 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -29,11 +29,11 @@
 
 namespace Kyra {
 
-class EobCoreEngine;
-class Screen_Eob : public Screen{
+class EoBCoreEngine;
+class Screen_EoB : public Screen{
 public:
-	Screen_Eob(EobCoreEngine *vm, OSystem *system);
-	virtual ~Screen_Eob();
+	Screen_EoB(EoBCoreEngine *vm, OSystem *system);
+	virtual ~Screen_EoB();
 
 	bool init();
 
@@ -51,7 +51,7 @@ public:
 	void loadFileDataToPage(Common::SeekableReadStream *s, int pageNum, uint32 size);
 
 	void printShadedText(const char *string, int x, int y, int col1, int col2);
-	void loadEobBitmap(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage);
+	void loadEoBBitmap(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage);
 	void loadShapeSetBitmap(const char *file, int tempPage, int destPage);
 
 	uint8 *encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4bitEncoding = false);
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index c59c66b04f..ab22b4f0b6 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -32,23 +32,23 @@
 
 namespace Kyra {
 
-void EobCoreEngine::runLevelScript(int block, int flags) {
+void EoBCoreEngine::runLevelScript(int block, int flags) {
 	_inf->run(block, flags);
 }
 
-void EobCoreEngine::setScriptFlags(uint32 flags) {
+void EoBCoreEngine::setScriptFlags(uint32 flags) {
 	_inf->setFlags(flags);
 }
 
-void EobCoreEngine::clearScriptFlags(uint32 flags) {
+void EoBCoreEngine::clearScriptFlags(uint32 flags) {
 	_inf->clearFlags(flags);
 }
 
-bool EobCoreEngine::checkScriptFlags(uint32 flags) {
+bool EoBCoreEngine::checkScriptFlags(uint32 flags) {
 	return _inf->checkFlags(flags);
 }
 
-const uint8 *EobCoreEngine::initScriptTimers(const uint8 *pos) {
+const uint8 *EoBCoreEngine::initScriptTimers(const uint8 *pos) {
 	_scriptTimersCount = 0;
 
 	while (((int16)READ_LE_UINT16(pos)) != -1) {
@@ -63,7 +63,7 @@ const uint8 *EobCoreEngine::initScriptTimers(const uint8 *pos) {
 	return pos;
 }
 
-void EobCoreEngine::updateScriptTimers() {
+void EoBCoreEngine::updateScriptTimers() {
 	bool timerUpdate = false;
 	if ((_scriptTimersMode & 2) && _stepsUntilScriptCall && _stepCounter > _stepsUntilScriptCall) {
 		_inf->run(0, 0x20);
@@ -86,10 +86,10 @@ void EobCoreEngine::updateScriptTimers() {
 		updateScriptTimersExtra();
 }
 
-EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _vm(engine), _screen(screen),
+EoBInfProcessor::EoBInfProcessor(EoBCoreEngine *engine, Screen_EoB *screen) : _vm(engine), _screen(screen),
 	_commandMin(engine->game() == GI_EOB1 ? -27 : -31) {
 
-#define Opcode(x) _opcodes.push_back(new InfOpcode(new InfProc(this, &EobInfProcessor::x), #x))
+#define Opcode(x) _opcodes.push_back(new InfOpcode(new InfProc(this, &EoBInfProcessor::x), #x))
 #define OpcodeAlt(x) if (_vm->game() == GI_EOB1) { Opcode(x##_v1); } else { Opcode(x##_v2); }
 	Opcode(oeob_setWallType);
 	Opcode(oeob_toggleWallState);
@@ -152,7 +152,7 @@ EobInfProcessor::EobInfProcessor(EobCoreEngine *engine, Screen_Eob *screen) : _v
 	_activeCharacter = -1;
 }
 
-EobInfProcessor::~EobInfProcessor() {
+EoBInfProcessor::~EoBInfProcessor() {
 	delete[] _subroutineStack;
 	delete[] _flagTable;
 	delete[] _stack;
@@ -164,14 +164,14 @@ EobInfProcessor::~EobInfProcessor() {
 	_opcodes.clear();
 }
 
-void EobInfProcessor::loadData(const uint8 *data, uint32 dataSize) {
+void EoBInfProcessor::loadData(const uint8 *data, uint32 dataSize) {
 	delete[] _scriptData;
 	_scriptSize = dataSize;
 	_scriptData = new int8[_scriptSize];
 	memcpy(_scriptData, data, _scriptSize);
 }
 
-void EobInfProcessor::run(int func, int flags) {
+void EoBInfProcessor::run(int func, int flags) {
 	int o = _vm->_levelBlockProperties[func].assignedObjects;
 	if (!o)
 		return;
@@ -196,40 +196,40 @@ void EobInfProcessor::run(int func, int flags) {
 		int8 cmd = *pos++;
 		if (cmd <= _commandMin || cmd >= 0)
 			continue;
-		debugC(3, kDebugLevelScript, "[0x%.04X] EobInfProcessor::%s()", (uint32)(pos - _scriptData), _opcodes[-(cmd + 1)]->desc.c_str());
+		debugC(3, kDebugLevelScript, "[0x%.04X] EoBInfProcessor::%s()", (uint32)(pos - _scriptData), _opcodes[-(cmd + 1)]->desc.c_str());
 		pos += (*_opcodes[-(cmd + 1)]->proc)(pos);
 	} while (!_abortScript && !_abortAfterSubroutine);
 }
 
-void EobInfProcessor::setFlags(uint32 flags) {
+void EoBInfProcessor::setFlags(uint32 flags) {
 	_flagTable[17] |= flags;
 }
 
-void EobInfProcessor::clearFlags(uint32 flags) {
+void EoBInfProcessor::clearFlags(uint32 flags) {
 	_flagTable[17] &= ~flags;
 }
 
-bool EobInfProcessor::checkFlags(uint32 flags) const {
+bool EoBInfProcessor::checkFlags(uint32 flags) const {
 	return ((_flagTable[17] & flags) == flags) ? true : false;
 }
 
-bool EobInfProcessor::preventRest() const {
+bool EoBInfProcessor::preventRest() const {
 	return _preventRest ? true : false;
 }
 
-void EobInfProcessor::loadState(Common::SeekableSubReadStreamEndian &in) {
+void EoBInfProcessor::loadState(Common::SeekableSubReadStreamEndian &in) {
 	_preventRest = in.readByte();
 	for (int i = 0; i < 18; i++)
 		_flagTable[i] = in.readUint32BE();
 }
 
-void EobInfProcessor::saveState(Common::OutSaveFile *out) {
+void EoBInfProcessor::saveState(Common::OutSaveFile *out) {
 	out->writeByte(_preventRest);
 	for (int i = 0; i < 18; i++)
 		out->writeUint32BE(_flagTable[i]);
 }
 
-const char *EobInfProcessor::getString(uint16 index) {
+const char *EoBInfProcessor::getString(uint16 index) {
 	if (index == 0xffff)
 		return 0;
 
@@ -244,7 +244,7 @@ const char *EobInfProcessor::getString(uint16 index) {
 	return (const char*)res;
 }
 
-int EobInfProcessor::oeob_setWallType(int8 *data) {
+int EoBInfProcessor::oeob_setWallType(int8 *data) {
 	int8 *pos = data;
 
 	uint16 block = 0;
@@ -278,7 +278,7 @@ int EobInfProcessor::oeob_setWallType(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_toggleWallState(int8 *data) {
+int EoBInfProcessor::oeob_toggleWallState(int8 *data) {
 	int8 *pos = data;
 
 	uint16 block = 0;
@@ -320,28 +320,28 @@ int EobInfProcessor::oeob_toggleWallState(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_openDoor(int8 *data) {
+int EoBInfProcessor::oeob_openDoor(int8 *data) {
 	int8 *pos = data;
 	_vm->openDoor(READ_LE_UINT16(pos));
 	pos += 2;
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_closeDoor(int8 *data) {
+int EoBInfProcessor::oeob_closeDoor(int8 *data) {
 	int8 *pos = data;
 	_vm->closeDoor(READ_LE_UINT16(pos));
 	pos += 2;
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_replaceMonster(int8 *data) {
+int EoBInfProcessor::oeob_replaceMonster(int8 *data) {
 	int8 *pos = data;
 	_vm->replaceMonster(pos[1], READ_LE_UINT16(pos + 2), pos[4], pos[5], pos[6], pos[7], pos[8], pos[9], READ_LE_UINT16(pos + 10), READ_LE_UINT16(pos + 12));
 	pos += 14;
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_movePartyOrObject(int8 *data) {
+int EoBInfProcessor::oeob_movePartyOrObject(int8 *data) {
 	int8 *pos = data;
 
 	int8 a = *pos++;
@@ -454,7 +454,7 @@ int EobInfProcessor::oeob_movePartyOrObject(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_moveInventoryItemToBlock(int8 *data) {
+int EoBInfProcessor::oeob_moveInventoryItemToBlock(int8 *data) {
 	int8 *pos = data;
 	int8 c = *pos++;
 	uint16 block = READ_LE_UINT16(pos);
@@ -500,7 +500,7 @@ int EobInfProcessor::oeob_moveInventoryItemToBlock(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_printMessage_v1(int8 *data) {
+int EoBInfProcessor::oeob_printMessage_v1(int8 *data) {
 	static const char colorConfig[] = "\x6\x21\x2\x21";
 	char col[5];
 	int8 *pos = data;
@@ -522,7 +522,7 @@ int EobInfProcessor::oeob_printMessage_v1(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_printMessage_v2(int8 *data) {
+int EoBInfProcessor::oeob_printMessage_v2(int8 *data) {
 	int8 *pos = data;
 	uint16 str = READ_LE_UINT16(pos);
 	pos += 2;
@@ -544,7 +544,7 @@ int EobInfProcessor::oeob_printMessage_v2(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_setFlags(int8 *data) {
+int EoBInfProcessor::oeob_setFlags(int8 *data) {
 	int8 *pos = data;
 	int8 b = 0;
 
@@ -583,7 +583,7 @@ int EobInfProcessor::oeob_setFlags(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_playSoundEffect(int8 *data) {
+int EoBInfProcessor::oeob_playSoundEffect(int8 *data) {
 	int8 *pos = data;
 	uint16 block = READ_LE_UINT16(pos + 1);
 
@@ -597,7 +597,7 @@ int EobInfProcessor::oeob_playSoundEffect(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_removeFlags(int8 *data) {
+int EoBInfProcessor::oeob_removeFlags(int8 *data) {
 	int8 *pos = data;
 	int8 a = *pos++;
 
@@ -629,7 +629,7 @@ int EobInfProcessor::oeob_removeFlags(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_modifyCharacterHitPoints(int8 *data) {
+int EoBInfProcessor::oeob_modifyCharacterHitPoints(int8 *data) {
 	int8 *pos = data;
 	int8 c = *pos++;
 	int8 p = *pos++;
@@ -644,7 +644,7 @@ int EobInfProcessor::oeob_modifyCharacterHitPoints(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_calcAndInflictCharacterDamage(int8 *data) {
+int EoBInfProcessor::oeob_calcAndInflictCharacterDamage(int8 *data) {
 	int8 *pos = data;
 	int charIndex = *pos++;
 	int times = *pos++;
@@ -673,19 +673,19 @@ int EobInfProcessor::oeob_calcAndInflictCharacterDamage(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_jump(int8 *data) {
+int EoBInfProcessor::oeob_jump(int8 *data) {
 	int8 *pos = data;
 	pos = _scriptData + READ_LE_UINT16(pos);
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_end(int8 *data) {
+int EoBInfProcessor::oeob_end(int8 *data) {
 	_abortScript = 1;
 	_subroutineStackPos = 0;
 	return 0;
 }
 
-int EobInfProcessor::oeob_returnFromSubroutine(int8 *data) {
+int EoBInfProcessor::oeob_returnFromSubroutine(int8 *data) {
 	int8 *pos = data;
 
 	if (_subroutineStackPos)
@@ -696,7 +696,7 @@ int EobInfProcessor::oeob_returnFromSubroutine(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_callSubroutine(int8 *data) {
+int EoBInfProcessor::oeob_callSubroutine(int8 *data) {
 	int8 *pos = data;
 	uint16 offs = READ_LE_UINT16(pos);
 	assert(offs < _scriptSize);
@@ -710,14 +710,14 @@ int EobInfProcessor::oeob_callSubroutine(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_eval_v1(int8 *data) {
+int EoBInfProcessor::oeob_eval_v1(int8 *data) {
 	int8 *pos = data;
 	int8 cmd = *pos++;
 
 	int a = 0;
 	int b = 0;
 	int i = 0;
-	EobItem *itm = &_vm->_items[_vm->_itemInHand];
+	EoBItem *itm = &_vm->_items[_vm->_itemInHand];
 	Common::String tempString1;
 	Common::String tempString2;
 
@@ -930,14 +930,14 @@ int EobInfProcessor::oeob_eval_v1(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_eval_v2(int8 *data) {
+int EoBInfProcessor::oeob_eval_v2(int8 *data) {
 	int8 *pos = data;
 	int8 cmd = *pos++;
 
 	int a = 0;
 	int b = 0;
 	int i = 0;
-	EobItem *itm = (_vm->_itemInHand != -1) ? &_vm->_items[_vm->_itemInHand] : 0;
+	EoBItem *itm = (_vm->_itemInHand != -1) ? &_vm->_items[_vm->_itemInHand] : 0;
 	Common::String tempString1;
 	Common::String tempString2;
 
@@ -1227,7 +1227,7 @@ int EobInfProcessor::oeob_eval_v2(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_deleteItem(int8 *data) {
+int EoBInfProcessor::oeob_deleteItem(int8 *data) {
 	int8 *pos = data;
 	int8 c = *pos++;
 
@@ -1243,7 +1243,7 @@ int EobInfProcessor::oeob_deleteItem(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_loadNewLevelOrMonsters(int8 *data) {
+int EoBInfProcessor::oeob_loadNewLevelOrMonsters(int8 *data) {
 	int8 *pos = data;
 	_vm->gui_updateControls();
 
@@ -1264,7 +1264,7 @@ int EobInfProcessor::oeob_loadNewLevelOrMonsters(int8 *data) {
 			_vm->_monsters[i].curAttackFrame = 0;
 
 		for (int i = 0; i < 10; i++) {
-			EobFlyingObject *fo = &_vm->_flyingObjects[i];
+			EoBFlyingObject *fo = &_vm->_flyingObjects[i];
 			if (fo->enable == 1) {
 				_vm->_items[fo->item].pos &= 3;
 				run(_vm->_items[fo->item].block, 4);
@@ -1306,7 +1306,7 @@ int EobInfProcessor::oeob_loadNewLevelOrMonsters(int8 *data) {
 	return res;
 }
 
-int EobInfProcessor::oeob_increasePartyExperience(int8 *data) {
+int EoBInfProcessor::oeob_increasePartyExperience(int8 *data) {
 	int8 *pos = data;
 	if (*pos++ == -30) {
 		_vm->increasePartyExperience((int16)READ_LE_UINT16(pos));
@@ -1316,7 +1316,7 @@ int EobInfProcessor::oeob_increasePartyExperience(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_createItem_v1(int8 *data) {
+int EoBInfProcessor::oeob_createItem_v1(int8 *data) {
 	int8 *pos = data;
 	uint16 itm = _vm->duplicateItem(READ_LE_UINT16(pos));
 	pos += 2;
@@ -1337,7 +1337,7 @@ int EobInfProcessor::oeob_createItem_v1(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_createItem_v2(int8 *data) {
+int EoBInfProcessor::oeob_createItem_v2(int8 *data) {
 	static const uint8 _itemPos[] = { 0, 1, 2, 3, 1, 3, 0, 2, 3, 2, 1, 0, 2, 0, 3, 1 };
 	int8 *pos = data;
 
@@ -1379,7 +1379,7 @@ int EobInfProcessor::oeob_createItem_v2(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_launchObject(int8 *data) {
+int EoBInfProcessor::oeob_launchObject(int8 *data) {
 	static const uint8 startPos[] = { 2, 3, 0, 2, 1, 0, 3, 1 };
 
 	int8 *pos = data;
@@ -1407,7 +1407,7 @@ int EobInfProcessor::oeob_launchObject(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_changeDirection(int8 *data) {
+int EoBInfProcessor::oeob_changeDirection(int8 *data) {
 	int8 *pos = data;
 
 	int8 cmd = *pos++;
@@ -1428,7 +1428,7 @@ int EobInfProcessor::oeob_changeDirection(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_identifyItems(int8 *data) {
+int EoBInfProcessor::oeob_identifyItems(int8 *data) {
 	int8 *pos = data;
 	uint16 block = READ_LE_UINT16(pos);
 
@@ -1451,7 +1451,7 @@ int EobInfProcessor::oeob_identifyItems(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_sequence(int8 *data) {
+int EoBInfProcessor::oeob_sequence(int8 *data) {
 	int8 *pos = data;
 	_vm->_npcSequenceSub = -1;
 	_vm->txt()->setWaitButtonMode(0);
@@ -1493,19 +1493,19 @@ int EobInfProcessor::oeob_sequence(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_delay(int8 *data) {
+int EoBInfProcessor::oeob_delay(int8 *data) {
 	int8 *pos = data;
 	_vm->delay(READ_LE_UINT16(pos) * _vm->tickLength());
 	pos += 2;
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_drawScene(int8 *data) {
+int EoBInfProcessor::oeob_drawScene(int8 *data) {
 	_vm->drawScene(1);
 	return 0;
 }
 
-int EobInfProcessor::oeob_dialogue(int8 *data) {
+int EoBInfProcessor::oeob_dialogue(int8 *data) {
 	int8 *pos = data;
 
 	switch (*pos++) {
@@ -1543,7 +1543,7 @@ int EobInfProcessor::oeob_dialogue(int8 *data) {
 	return pos - data;
 }
 
-int EobInfProcessor::oeob_specialEvent(int8 *data) {
+int EoBInfProcessor::oeob_specialEvent(int8 *data) {
 	int8 *pos = data;
 	uint16 cmd = READ_LE_UINT16(pos);
 	pos += 2;
diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h
index a561568336..3804db07c6 100644
--- a/engines/kyra/script_eob.h
+++ b/engines/kyra/script_eob.h
@@ -34,10 +34,10 @@ namespace Kyra {
 
 class KyraRpgEngine;
 
-class EobInfProcessor {
+class EoBInfProcessor {
 public:
-	EobInfProcessor(EobCoreEngine *engine, Screen_Eob *_screen);
-	~EobInfProcessor();
+	EoBInfProcessor(EoBCoreEngine *engine, Screen_EoB *_screen);
+	~EoBInfProcessor();
 
 	void loadData(const uint8 *data, uint32 dataSize);
 	void run(int func, int flags);
@@ -87,10 +87,10 @@ private:
 	int oeob_dialogue(int8 *data);
 	int oeob_specialEvent(int8 *data);
 
-	EobCoreEngine *_vm;
-	Screen_Eob *_screen;
+	EoBCoreEngine *_vm;
+	Screen_EoB *_screen;
 
-	typedef Common::Functor1Mem<int8*, int, EobInfProcessor> InfProc;
+	typedef Common::Functor1Mem<int8*, int, EoBInfProcessor> InfProc;
 	struct InfOpcode {
 		InfOpcode(InfProc *p, const char *d) : proc(p), desc(d) {}
 		InfProc *proc;
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp
index ead7e17f4c..342014bfed 100644
--- a/engines/kyra/script_lol.cpp
+++ b/engines/kyra/script_lol.cpp
@@ -811,11 +811,11 @@ int LoLEngine::olol_initMonster(EMCState *script) {
 		return -1;
 
 	for (uint8 i = 0; i < 30; i++) {
-		LolMonsterInPlay *l = &_monsters[i];
+		LoLMonsterInPlay *l = &_monsters[i];
 		if (l->hitPoints || l->mode == 13)
 			continue;
 
-		memset(l, 0, sizeof(LolMonsterInPlay));
+		memset(l, 0, sizeof(LoLMonsterInPlay));
 		l->id = i;
 		l->x = x;
 		l->y = y;
@@ -926,7 +926,7 @@ int LoLEngine::olol_loadMonsterProperties(EMCState *script) {
 		stackPos(28), stackPos(29), stackPos(30), stackPos(31), stackPos(32), stackPos(33), stackPos(34),
 		stackPos(35), stackPos(36), stackPos(37), stackPos(38), stackPos(39), stackPos(40), stackPos(41));
 
-	LolMonsterProperty *l = &_monsterProperties[stackPos(0)];
+	LoLMonsterProperty *l = &_monsterProperties[stackPos(0)];
 	l->shapeIndex = stackPos(1) & 0xff;
 
 	int shpWidthMax = 0;
@@ -998,7 +998,7 @@ int LoLEngine::olol_inflictDamage(EMCState *script) {
 
 int LoLEngine::olol_moveMonster(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_moveMonster(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
-	LolMonsterInPlay *m = &_monsters[stackPos(0)];
+	LoLMonsterInPlay *m = &_monsters[stackPos(0)];
 
 	if (m->mode == 1 || m->mode == 2) {
 		calcCoordinates(m->destX, m->destY, stackPos(1), stackPos(2), stackPos(3));
@@ -1193,7 +1193,7 @@ int LoLEngine::olol_changeMonsterStat(EMCState *script) {
 	if (stackPos(0) == -1)
 		return 1;
 
-	LolMonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
+	LoLMonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
 
 	int16 d = stackPos(2);
 	uint16 x = 0;
@@ -1234,7 +1234,7 @@ int LoLEngine::olol_getMonsterStat(EMCState *script) {
 	if (stackPos(0) == -1)
 		return 0;
 
-	LolMonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
+	LoLMonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
 	int d = stackPos(1);
 
 	switch (d) {
@@ -1547,7 +1547,7 @@ int LoLEngine::olol_moveBlockObjects(EMCState *script) {
 
 			l &= 0x7fff;
 
-			LolMonsterInPlay *m = &_monsters[l];
+			LoLMonsterInPlay *m = &_monsters[l];
 
 			setMonsterMode(m, 14);
 			checkSceneUpdateNeed(m->block);
@@ -1618,7 +1618,7 @@ int LoLEngine::olol_dummy1(EMCState *script) {
 
 int LoLEngine::olol_suspendMonster(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_suspendMonster(%p) (%d)", (const void *)script, stackPos(0));
-	LolMonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
+	LoLMonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
 	setMonsterMode(m, 14);
 	checkSceneUpdateNeed(m->block);
 	placeMonster(m, 0, 0);
diff --git a/engines/kyra/sequences_darkmoon.cpp b/engines/kyra/sequences_darkmoon.cpp
index 66d5329be9..fbe892120c 100644
--- a/engines/kyra/sequences_darkmoon.cpp
+++ b/engines/kyra/sequences_darkmoon.cpp
@@ -41,7 +41,7 @@ public:
 		kFinale
 	};
 
-	DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_Eob *screen, Mode mode, const char *const *strings, const char *const *cpsFiles, const char *const *palFiles, const EobShapeDef **shapeDefList, const EobSequenceStep **seqList);
+	DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_EoB *screen, Mode mode, const char *const *strings, const char *const *cpsFiles, const char *const *palFiles, const EoBShapeDef **shapeDefList, const EoBSequenceStep **seqList);
 	~DarkmoonSequenceHelper();
 
 	void loadScene(int index, int pageNum);
@@ -67,14 +67,14 @@ private:
 
 	OSystem *_system;
 	DarkMoonEngine *_vm;
-	Screen_Eob *_screen;
+	Screen_EoB *_screen;
 	Mode _mode;
 
 	const char *const *_strings;
 	const char *const *_cpsFiles;
 	const char *const *_palFiles;
-	const EobShapeDef **_shapeDefs;
-	const EobSequenceStep **_seqData;
+	const EoBShapeDef **_shapeDefs;
+	const EoBSequenceStep **_seqData;
 
 	Palette *_palettes[12];
 
@@ -910,7 +910,7 @@ void DarkMoonEngine::seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *da
 		delete[] items[i].str;
 }
 
-DarkmoonSequenceHelper::DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_Eob *screen, Mode mode, const char *const *strings, const char *const *cpsFiles, const char *const *palFiles, const EobShapeDef **shapeDefList, const EobSequenceStep **seqList) :
+DarkmoonSequenceHelper::DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_EoB *screen, Mode mode, const char *const *strings, const char *const *cpsFiles, const char *const *palFiles, const EoBShapeDef **shapeDefList, const EoBSequenceStep **seqList) :
 	_system(system), _vm(vm), _screen(screen), _mode(mode), _strings(strings), _cpsFiles(cpsFiles), _palFiles(palFiles), _shapeDefs(shapeDefList), _seqData(seqList) {
 
 	for (int i = 0; _palFiles[i]; i++) {
@@ -991,7 +991,7 @@ void DarkmoonSequenceHelper::loadScene(int index, int pageNum) {
 	int cp = _screen->setCurPage(pageNum);
 
 	if (_shapeDefs[index]) {
-		for (const EobShapeDef *df = _shapeDefs[index]; df->w; df++ ) {
+		for (const EoBShapeDef *df = _shapeDefs[index]; df->w; df++ ) {
 			uint16 shapeIndex = (df->index < 0) ? df->index * -1 : df->index;
 			if (_shapes[shapeIndex])
 				delete[] _shapes[shapeIndex];
@@ -1012,7 +1012,7 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 
 	uint32 end = 0;
 
-	for (const EobSequenceStep *s = _seqData[index]; s->command != 0xff && !_vm->skipFlag() && !_vm->shouldQuit(); s++) {
+	for (const EoBSequenceStep *s = _seqData[index]; s->command != 0xff && !_vm->skipFlag() && !_vm->shouldQuit(); s++) {
 		int palIndex = _mode == kFinale ? (s->pal + 1) : s->pal;
 		int x = s->x1;
 		int y = s->y1;
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index e8526f2ba0..29386894f3 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -33,7 +33,7 @@
 
 namespace Kyra {
 
-int EobEngine::mainMenu() {
+int EoBEngine::mainMenu() {
 	int menuChoice = _menuChoiceInit;
 	_menuChoiceInit = 0;
 
@@ -43,7 +43,7 @@ int EobEngine::mainMenu() {
 		switch (menuChoice) {
 			case 0:
 				_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
-				_screen->loadEobBitmap("INTRO", 0, 5, 3, 2);
+				_screen->loadEoBBitmap("INTRO", 0, 5, 3, 2);
 				_screen->setScreenPalette(_screen->getPalette(0));
 				_screen->_curPage = 2;
 				of = _screen->setFont(Screen::FID_6_FNT);
@@ -90,7 +90,7 @@ int EobEngine::mainMenu() {
 	return shouldQuit() ? -5 : menuChoice;
 }
 
-int EobEngine::mainMenuLoop() {
+int EoBEngine::mainMenuLoop() {
 	int sel = -1;
 	do {
 		_screen->setScreenDim(28);
@@ -103,7 +103,7 @@ int EobEngine::mainMenuLoop() {
 	return sel + 1;
 }
 
-void EobEngine::seq_playOpeningCredits() {
+void EoBEngine::seq_playOpeningCredits() {
 	_allowSkip = true;
 
 	loadSetIntroPalette(_introFilesOpening[5]);
@@ -124,7 +124,7 @@ void EobEngine::seq_playOpeningCredits() {
 	_allowSkip = false;
 }
 
-void EobEngine::seq_playIntro() {
+void EoBEngine::seq_playIntro() {
 	_allowSkip = true;
 
 	if (!shouldQuit() && !skipFlag()) {
@@ -156,7 +156,7 @@ void EobEngine::seq_playIntro() {
 	_allowSkip = false;
 }
 
-void EobEngine::seq_playFinale() {
+void EoBEngine::seq_playFinale() {
 	Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
 	_screen->loadFileDataToPage(s, 5, 32000);
 	delete s;
@@ -197,7 +197,7 @@ void EobEngine::seq_playFinale() {
 	_screen->fadeToBlack();
 }
 
-void EobEngine::seq_tower() {
+void EoBEngine::seq_tower() {
 	if (shouldQuit() || skipFlag())
 		return;
 
@@ -272,7 +272,7 @@ void EobEngine::seq_tower() {
 	delete[] shp;
 }
 
-void EobEngine::seq_orb() {
+void EoBEngine::seq_orb() {
 	if (shouldQuit() || skipFlag())
 		return;
 
@@ -329,7 +329,7 @@ void EobEngine::seq_orb() {
 		delete[] shp[i];
 }
 
-void EobEngine::seq_waterdeepEntry() {
+void EoBEngine::seq_waterdeepEntry() {
 	if (shouldQuit() || skipFlag())
 		return;
 
@@ -429,7 +429,7 @@ void EobEngine::seq_waterdeepEntry() {
 		delete[] shp2[i];
 }
 
-void EobEngine::seq_king() {
+void EoBEngine::seq_king() {
 	if (shouldQuit() || skipFlag())
 		return;
 
@@ -515,7 +515,7 @@ void EobEngine::seq_king() {
 		delete[] shp[i];
 }
 
-void EobEngine::seq_hands() {
+void EoBEngine::seq_hands() {
 	if (shouldQuit() || skipFlag())
 		return;
 
@@ -655,7 +655,7 @@ void EobEngine::seq_hands() {
 	delay(48 * _tickLength);
 }
 
-void EobEngine::seq_waterdeepExit() {
+void EoBEngine::seq_waterdeepExit() {
 	if (shouldQuit() || skipFlag())
 		return;
 
@@ -771,7 +771,7 @@ void EobEngine::seq_waterdeepExit() {
 	delay(50 * _tickLength);
 }
 
-void EobEngine::seq_tunnel() {
+void EoBEngine::seq_tunnel() {
 	if (shouldQuit() || skipFlag())
 		return;
 
@@ -867,7 +867,7 @@ void EobEngine::seq_tunnel() {
 	delay(50 * _tickLength);
 }
 
-void EobEngine::seq_xdeath() {
+void EoBEngine::seq_xdeath() {
 	uint8 *shapes1[5];
 	uint8 *shapes2;
 
@@ -876,7 +876,7 @@ void EobEngine::seq_xdeath() {
 		shapes1[i] = _screen->encodeShape(i / 2 * 14, i / 2 * 88, 14, 88, true);
 	_screen->loadShapeSetBitmap("XDEATH3", 5, 3);
 	shapes2 = _screen->encodeShape(22, 0, 16, 95, true);
-	_screen->loadEobBitmap("XDEATH1", 0, 5, 3, -1);
+	_screen->loadEoBBitmap("XDEATH1", 0, 5, 3, -1);
 	_screen->setCurPage(0);
 
 	for (int i = 0; i < 10; i++) {
@@ -924,13 +924,13 @@ void EobEngine::seq_xdeath() {
 	gui_drawAllCharPortraitsWithStats();
 }
 
-void EobEngine::loadSetIntroPalette(const char *filename) {
+void EoBEngine::loadSetIntroPalette(const char *filename) {
 	_screen->loadPalette(filename, _screen->getPalette(0));
 	_screen->getPalette(0).fill(0, 1, 0);
 	_screen->setScreenPalette(_screen->getPalette(0));
 }
 
-void EobEngine::copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step) {
+void EoBEngine::copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step) {
 	const uint8 *ptr2 = _screen->getCPagePtr(3) + y1 * 320 + x1;
 
 	if (step == 1) {
@@ -990,7 +990,7 @@ void EobEngine::copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int
 	}
 }
 
-void EobEngine::boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH) {
+void EoBEngine::boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH) {
 	int originX2 = originX1 + originW;
 	int originY2 = originY1 + originH;
 	if (originY2 > 21)
@@ -1047,7 +1047,7 @@ void EobEngine::boxMorphTransition(int targetDestX, int targetDestY, int targetF
 	}
 }
 
-void EobEngine::whirlTransition() {
+void EoBEngine::whirlTransition() {
 	for (int i = 0; i < 2; i++) {
 		for (int ii = 0; ii < 8; ii++) {
 			uint32 e = _system->getMillis() + 3;
diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp
index 01db92c225..d5b3dd97c4 100644
--- a/engines/kyra/sequences_lol.cpp
+++ b/engines/kyra/sequences_lol.cpp
@@ -752,7 +752,7 @@ HistoryPlayer::~HistoryPlayer() {
 
 void HistoryPlayer::play() {
 	int dataSize = 0;
-	const char *data = (const char *)_vm->staticres()->loadRawData(kLolHistory, dataSize);
+	const char *data = (const char *)_vm->staticres()->loadRawData(kLoLHistory, dataSize);
 
 	if (!data)
 		error("Could not load history data");
@@ -1195,14 +1195,14 @@ void LoLEngine::showCredits() {
 
 	if (_flags.platform == Common::kPlatformPC98) {
 		int size = 0;
-		const uint8 *internCredits = _staticres->loadRawData(kLolCredits, size);
+		const uint8 *internCredits = _staticres->loadRawData(kLoLCredits, size);
 		assert(size > 0);
 
 		credits = new char[size];
 		assert(credits);
 
 		memcpy(credits, internCredits, size);
-		_staticres->unloadId(kLolCredits);
+		_staticres->unloadId(kLoLCredits);
 	} else {
 		credits = (char *)_res->fileData("CREDITS.TXT", 0);
 	}
diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index e99990e1e0..cce18b5ea4 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -479,7 +479,7 @@ void AdLibDriver::setMusicVolume(uint8 volume) {
 		writeOPL(0x43 + regOffset, calculateOpLevel2(chan));
 	}
 
-	// For now we use the music volume for both sfx and music in Kyra1 and Eob
+	// For now we use the music volume for both sfx and music in Kyra1 and EoB
 	if (_version < 4) {
 		_sfxVolume = volume;
 
@@ -545,7 +545,7 @@ void AdLibDriver::queueTrack(int track, int volume) {
 	if (!trackData)
 		return;
 
-	// Don't drop tracks in Eob. The queue is always full there if a couple of monsters are around.
+	// Don't drop tracks in EoB. The queue is always full there if a couple of monsters are around.
 	// If we drop the incoming tracks we get no sound effects, but tons of warnings instead.
 	if (_version >= 3 && _programQueueEnd == _programQueueStart && _programQueue[_programQueueEnd].data != 0) {
 		warning("AdLibDriver: Program queue full, dropping track %d", track);
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 9adf84d1ad..e3cc8ebec2 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -32,7 +32,7 @@
 
 namespace Kyra {
 
-void EobCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex) {
+void EoBCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex) {
 	_screen->loadShapeSetBitmap(filename, 3, 3);
 	const uint16 *enc = &_encodeMonsterShpTable[encodeTableIndex << 2];
 
@@ -47,7 +47,7 @@ void EobCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bo
 	_screen->_curPage = 0;
 }
 
-void EobCoreEngine::releaseMonsterShapes(int first, int num) {
+void EoBCoreEngine::releaseMonsterShapes(int first, int num) {
 	for (int i = first; i < first + num; i++) {
 		delete[] _monsterShapes[i];
 		_monsterShapes[i] = 0;
@@ -56,10 +56,10 @@ void EobCoreEngine::releaseMonsterShapes(int first, int num) {
 	}
 }
 
-const uint8 *EobCoreEngine::loadMonsterProperties(const uint8 *data) {
+const uint8 *EoBCoreEngine::loadMonsterProperties(const uint8 *data) {
 	uint8 cmd = *data++;
 	while (cmd != 0xff) {
-		EobMonsterProperty *d = &_monsterProps[cmd];
+		EoBMonsterProperty *d = &_monsterProps[cmd];
 		d->armorClass = (int8)*data++;
 		d->hitChance = (int8)*data++;
 		d->level = (int8)*data++;
@@ -112,7 +112,7 @@ const uint8 *EobCoreEngine::loadMonsterProperties(const uint8 *data) {
 	return data;
 }
 
-const uint8 *EobCoreEngine::loadActiveMonsterData(const uint8 *data, int level) {
+const uint8 *EoBCoreEngine::loadActiveMonsterData(const uint8 *data, int level) {
 	for (uint8 p = *data++; p != 0xff; p = *data++) {
 		uint8 v = *data++;
 		_timer->setCountdown(0x20 + (p << 1), v);
@@ -129,7 +129,7 @@ const uint8 *EobCoreEngine::loadActiveMonsterData(const uint8 *data, int level)
 	if (_hasTempDataFlags & (1 << (level - 1)))
 		return data + 420;
 
-	memset(_monsters, 0, 30 * sizeof(EobMonsterInPlay));
+	memset(_monsters, 0, 30 * sizeof(EoBMonsterInPlay));
 
 	for (int i = 0; i < 30; i++, data += 14) {
 		if (*data == 0xff)
@@ -142,10 +142,10 @@ const uint8 *EobCoreEngine::loadActiveMonsterData(const uint8 *data, int level)
 	return data;
 }
 
-void EobCoreEngine::initMonster(int index, int unit, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int i, int randItem, int fixedItem) {
-	EobMonsterInPlay *m = &_monsters[index];
-	EobMonsterProperty *p = &_monsterProps[type];
-	memset(m, 0, sizeof(EobMonsterInPlay));
+void EoBCoreEngine::initMonster(int index, int unit, uint16 block, int pos, int dir, int type, int shpIndex, int mode, int i, int randItem, int fixedItem) {
+	EoBMonsterInPlay *m = &_monsters[index];
+	EoBMonsterProperty *p = &_monsterProps[type];
+	memset(m, 0, sizeof(EoBMonsterInPlay));
 
 	if (!block)
 		return;
@@ -173,7 +173,7 @@ void EobCoreEngine::initMonster(int index, int unit, uint16 block, int pos, int
 	placeMonster(m, block, dir);
 }
 
-void EobCoreEngine::placeMonster(EobMonsterInPlay *m, uint16 block, int dir) {
+void EoBCoreEngine::placeMonster(EoBMonsterInPlay *m, uint16 block, int dir) {
 	if (block != 0xffff){
 		checkSceneUpdateNeed(m->block);
 		if (_levelBlockProperties[m->block].flags & 7) {
@@ -195,7 +195,7 @@ void EobCoreEngine::placeMonster(EobMonsterInPlay *m, uint16 block, int dir) {
 	checkSceneUpdateNeed(block);
 }
 
-void EobCoreEngine::killMonster(EobMonsterInPlay *m, bool giveExperience) {
+void EoBCoreEngine::killMonster(EoBMonsterInPlay *m, bool giveExperience) {
 	m->hitPointsCur = -1;
 	int pos = (m->pos == 4) ? rollDice(1, 4, -1) : m->pos;
 
@@ -223,11 +223,11 @@ void EobCoreEngine::killMonster(EobMonsterInPlay *m, bool giveExperience) {
 	}
 }
 
-bool EobCoreEngine::killMonsterExtra(EobMonsterInPlay*) {
+bool EoBCoreEngine::killMonsterExtra(EoBMonsterInPlay*) {
 	return true;
 }
 
-int EobCoreEngine::countSpecificMonsters(int type) {
+int EoBCoreEngine::countSpecificMonsters(int type) {
 	int res = 0;
 	for (int i = 0; i < 30; i++) {
 		if (_monsters[i].type != type || _monsters[i].sub != _currentSub || _monsters[i].hitPointsCur < 0)
@@ -237,9 +237,9 @@ int EobCoreEngine::countSpecificMonsters(int type) {
 	return res;
 }
 
-void EobCoreEngine::updateAttackingMonsterFlags() {
-	EobMonsterInPlay *m2 = 0;
-	for (EobMonsterInPlay *m = _monsters; m < &_monsters[30]; m++) {
+void EoBCoreEngine::updateAttackingMonsterFlags() {
+	EoBMonsterInPlay *m2 = 0;
+	for (EoBMonsterInPlay *m = _monsters; m < &_monsters[30]; m++) {
 		if (m->mode != 8)
 			continue;
 		m->mode = 0;
@@ -254,7 +254,7 @@ void EobCoreEngine::updateAttackingMonsterFlags() {
 		setScriptFlags(0x800);
 }
 
-const int8 *EobCoreEngine::getMonstersOnBlockPositions(uint16 block) {
+const int8 *EoBCoreEngine::getMonstersOnBlockPositions(uint16 block) {
 	memset(_monsterBlockPosArray, -1, sizeof(_monsterBlockPosArray));
 	for (int8 i = 0; i < 30; i++) {
 		if (_monsters[i].block != block)
@@ -265,7 +265,7 @@ const int8 *EobCoreEngine::getMonstersOnBlockPositions(uint16 block) {
 	return _monsterBlockPosArray;
 }
 
-int EobCoreEngine::getClosestMonster(int charIndex, int block) {
+int EoBCoreEngine::getClosestMonster(int charIndex, int block) {
 	const int8 *pos = getMonstersOnBlockPositions(block);
 	if (pos[4] != -1)
 		return pos[4];
@@ -278,15 +278,15 @@ int EobCoreEngine::getClosestMonster(int charIndex, int block) {
 	return -1;
 }
 
-bool EobCoreEngine::blockHasMonsters(uint16 block) {
+bool EoBCoreEngine::blockHasMonsters(uint16 block) {
 	return _levelBlockProperties[block].flags & 7 ? true : false;
 }
 
-bool EobCoreEngine::isMonsterOnPos(EobMonsterInPlay *m, uint16 block, int pos, int checkPos4) {
+bool EoBCoreEngine::isMonsterOnPos(EoBMonsterInPlay *m, uint16 block, int pos, int checkPos4) {
 	return (m->block == block && (m->pos == pos || (m->pos == 4 && checkPos4))) ? true : false;
 }
 
-const int16 *EobCoreEngine::findBlockMonsters(uint16 block, int pos, int dir, int blockDamage, int singleTargetCheckAdjacent) {
+const int16 *EoBCoreEngine::findBlockMonsters(uint16 block, int pos, int dir, int blockDamage, int singleTargetCheckAdjacent) {
 	static const uint8 cpos4[] = { 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1 };
 	int include4 = (pos < 4) ? cpos4[(dir << 2) + pos] : 1;
 	int16 *dst = _foundMonstersArray;
@@ -333,12 +333,12 @@ const int16 *EobCoreEngine::findBlockMonsters(uint16 block, int pos, int dir, in
 	return _foundMonstersArray;
 }
 
-void EobCoreEngine::drawBlockObject(int flipped, int page, const uint8 *shape, int x, int y, int sd, uint8 *ovl) {
+void EoBCoreEngine::drawBlockObject(int flipped, int page, const uint8 *shape, int x, int y, int sd, uint8 *ovl) {
 	const ScreenDim *d = _screen->getScreenDim(sd);
 	_screen->drawShape(page, shape, x - (d->sx << 3), y - d->sy, sd, flipped | (ovl ? 2 : 0), ovl);
 }
 
-void EobCoreEngine::drawMonsterShape(const uint8 *shape, int x, int y, int flipped, int flags, int palIndex) {
+void EoBCoreEngine::drawMonsterShape(const uint8 *shape, int x, int y, int flipped, int flags, int palIndex) {
 	uint8 *ovl = 0;
 
 	if (flags & 2)
@@ -351,7 +351,7 @@ void EobCoreEngine::drawMonsterShape(const uint8 *shape, int x, int y, int flipp
 	drawBlockObject(flipped, 2, shape, x, y, 5, ovl);
 }
 
-void EobCoreEngine::flashMonsterShape(EobMonsterInPlay *m) {
+void EoBCoreEngine::flashMonsterShape(EoBMonsterInPlay *m) {
 	disableSysTimer(2);
 	_flashShapeTimer = 0;
 	drawScene(1);
@@ -362,11 +362,11 @@ void EobCoreEngine::flashMonsterShape(EobMonsterInPlay *m) {
 	_sceneUpdateRequired = true;
 }
 
-void EobCoreEngine::updateAllMonsterShapes() {
+void EoBCoreEngine::updateAllMonsterShapes() {
 	drawScene(1);
 	bool updateShp = false;
 
-	for (EobMonsterInPlay *m = _monsters; m < &_monsters[30]; m++) {
+	for (EoBMonsterInPlay *m = _monsters; m < &_monsters[30]; m++) {
 		if (m->flags & 2) {
 			m->flags &= ~2;
 			updateShp = true;
@@ -384,7 +384,7 @@ void EobCoreEngine::updateAllMonsterShapes() {
 	_preventMonsterFlash = false;
 }
 
-void EobCoreEngine::drawBlockItems(int index) {
+void EoBCoreEngine::drawBlockItems(int index) {
 	uint16 o = _visibleBlocks[index]->drawObjects;
 	uint8 w = _visibleBlocks[index]->walls[_sceneDrawVarDown];
 	uint8 flg = (index == 16) ? 0x80 : _wllWallFlags[w];
@@ -399,7 +399,7 @@ void EobCoreEngine::drawBlockItems(int index) {
 	int tile2 = 0;
 
 	while (o != o2 || forceLoop) {
-		EobItem *itm = &_items[o];
+		EoBItem *itm = &_items[o];
 		if (itm->pos == 8 || itm->pos < 4) {
 			tile2 = -1;
 
@@ -444,7 +444,7 @@ void EobCoreEngine::drawBlockItems(int index) {
 	}
 }
 
-void EobCoreEngine::drawDoor(int index) {
+void EoBCoreEngine::drawDoor(int index) {
 	int s = _visibleBlocks[index]->walls[_sceneDrawVarDown];
 
 	if (_flags.gameID == GI_EOB1 && s == 0x85)
@@ -467,7 +467,7 @@ void EobCoreEngine::drawDoor(int index) {
 	drawLevelModifyScreenDim(5, _shpDmX1, 0, _shpDmX2, 15);
 }
 
-void EobCoreEngine::drawMonsters(int index) {
+void EoBCoreEngine::drawMonsters(int index) {
 	static const uint8 distMap[] = { 2, 1, 0, 4 };
 	static const uint8 yAdd[] = { 20, 12, 4, 4, 2, 0, 0 };
 
@@ -480,8 +480,8 @@ void EobCoreEngine::drawMonsters(int index) {
 	int drawObjDirIndex = _currentDirection * 5;
 	int cDirOffs = _currentDirection << 2;
 
-	EobMonsterInPlay *drawObj[5];
-	memset(drawObj, 0, 5 * sizeof(EobMonsterInPlay*));
+	EoBMonsterInPlay *drawObj[5];
+	memset(drawObj, 0, 5 * sizeof(EoBMonsterInPlay*));
 
 	for (int i = 0; i < 30; i++) {
 		if (_monsters[i].block != bl)
@@ -490,11 +490,11 @@ void EobCoreEngine::drawMonsters(int index) {
 	}
 
 	for (int i = 0; i < 5; i++) {
-		EobMonsterInPlay *d = drawObj[i];
+		EoBMonsterInPlay *d = drawObj[i];
 		if (!d)
 			continue;
 
-		EobMonsterProperty *p = &_monsterProps[d->type];
+		EoBMonsterProperty *p = &_monsterProps[d->type];
 
 		if (_flags.gameID == GI_EOB2 && (p->capsFlags & 0x100) && !(_partyEffectFlags & 0x220) && !(d->flags & 2))
 			continue;
@@ -569,7 +569,7 @@ void EobCoreEngine::drawMonsters(int index) {
 	}
 }
 
-void EobCoreEngine::drawWallOfForce(int index) {
+void EoBCoreEngine::drawWallOfForce(int index) {
 	int d = _dscDimMap[index];
 	assert(d < 3);
 	int dH = _wallOfForceDsNumH[d];
@@ -590,7 +590,7 @@ void EobCoreEngine::drawWallOfForce(int index) {
 	}
 }
 
-void EobCoreEngine::drawFlyingObjects(int index) {
+void EoBCoreEngine::drawFlyingObjects(int index) {
 	LevelBlockProperty *bl = _visibleBlocks[index];
 	int blockIndex = _visibleBlockIndex[index];
 	int w = bl->walls[_sceneDrawVarDown];
@@ -598,8 +598,8 @@ void EobCoreEngine::drawFlyingObjects(int index) {
 	if (_wllVmpMap[w] && !(_wllWallFlags[w] & 0x80))
 		return;
 
-	EobFlyingObject *drawObj[5];
-	memset(drawObj, 0, 5 * sizeof(EobFlyingObject*));
+	EoBFlyingObject *drawObj[5];
+	memset(drawObj, 0, 5 * sizeof(EoBFlyingObject*));
 
 	for (int i = 0; i < 10; i++) {
 		if (!_flyingObjects[i].enable || blockIndex != _flyingObjects[i].curBlock)
@@ -608,7 +608,7 @@ void EobCoreEngine::drawFlyingObjects(int index) {
 	}
 
 	for (int i = 0; i < 5; i++) {
-		EobFlyingObject *fo = drawObj[i];
+		EoBFlyingObject *fo = drawObj[i];
 		if (!fo)
 			continue;
 
@@ -665,7 +665,7 @@ void EobCoreEngine::drawFlyingObjects(int index) {
 	}
 }
 
-void EobCoreEngine::drawTeleporter(int index) {
+void EoBCoreEngine::drawTeleporter(int index) {
 	static const uint8 telprtX[] = { 0x28, 0x1C, 0x12 };
 	static const uint8 telprtY[] = { 0x0D, 0x15, 0x1A };
 
@@ -691,9 +691,9 @@ void EobCoreEngine::drawTeleporter(int index) {
 	}
 }
 
-void EobCoreEngine::updateMonsters(int unit) {
+void EoBCoreEngine::updateMonsters(int unit) {
 	for (int i = 0; i < 30; i++) {
-		EobMonsterInPlay *m = &_monsters[i];
+		EoBMonsterInPlay *m = &_monsters[i];
 		if (m->unit == unit) {
 			if (m->hitPointsCur <= 0 || m->flags & 0x20)
 				continue;
@@ -744,7 +744,7 @@ void EobCoreEngine::updateMonsters(int unit) {
 	checkFlyingObjects();
 }
 
-void EobCoreEngine::updateMonsterDest(EobMonsterInPlay *m) {
+void EoBCoreEngine::updateMonsterDest(EoBMonsterInPlay *m) {
 	if (m->mode >= 7 && m->mode <= 10)
 		return;
 	int dist = getBlockDistance(m->block, _currentBlock);
@@ -763,7 +763,7 @@ void EobCoreEngine::updateMonsterDest(EobMonsterInPlay *m) {
 	m->dest = _currentBlock;
 }
 
-void EobCoreEngine::updateMonsterAttackMode(EobMonsterInPlay *m) {
+void EoBCoreEngine::updateMonsterAttackMode(EoBMonsterInPlay *m) {
 	if (!(m->flags & 1) || m->mode == 10)
 		return;
 	if (m->mode == 8) {
@@ -774,13 +774,13 @@ void EobCoreEngine::updateMonsterAttackMode(EobMonsterInPlay *m) {
 	m->dest = _currentBlock;
 }
 
-void EobCoreEngine::updateAllMonsterDests() {
+void EoBCoreEngine::updateAllMonsterDests() {
 	for (int i = 0; i < 30; i++)
 		updateMonsterDest(&_monsters[i]);
 }
 
-void EobCoreEngine::turnFriendlyMonstersHostile() {
-	EobMonsterInPlay *m = 0;
+void EoBCoreEngine::turnFriendlyMonstersHostile() {
+	EoBMonsterInPlay *m = 0;
 	for (int i = 0; i < 30; i++) {
 		if (_monsters[i].mode == 8) {
 			_monsters[i].mode = 0;
@@ -797,7 +797,7 @@ void EobCoreEngine::turnFriendlyMonstersHostile() {
 	}
 }
 
-int EobCoreEngine::getNextMonsterDirection(int curBlock, int destBlock) {
+int EoBCoreEngine::getNextMonsterDirection(int curBlock, int destBlock) {
 	uint8 c = destBlock % 32;
 	uint8 d = destBlock / 32;
 	uint8 e = curBlock % 32;
@@ -824,7 +824,7 @@ int EobCoreEngine::getNextMonsterDirection(int curBlock, int destBlock) {
 	return _monsterDirChangeTable[r];
 }
 
-int EobCoreEngine::getNextMonsterPos(EobMonsterInPlay *m, int block) {
+int EoBCoreEngine::getNextMonsterPos(EoBMonsterInPlay *m, int block) {
 	if ((_flags.gameID == GI_EOB1 && _monsterProps[m->type].u30 != 0) || (_flags.gameID == GI_EOB2 && _monsterProps[m->type].u30 == 2))
 		return -1;
 	int d = findFreeMonsterPos(block, _monsterProps[m->type].u30);
@@ -856,7 +856,7 @@ int EobCoreEngine::getNextMonsterPos(EobMonsterInPlay *m, int block) {
 	return -1;
 }
 
-int EobCoreEngine::findFreeMonsterPos(int block, int size) {
+int EoBCoreEngine::findFreeMonsterPos(int block, int size) {
 	int nm = _levelBlockProperties[block].flags & 7;
 	if (nm == 4)
 		return -2;
@@ -864,7 +864,7 @@ int EobCoreEngine::findFreeMonsterPos(int block, int size) {
 	int res = 0;
 
 	for (int i = 0; i < 30; i++) {
-		EobMonsterInPlay *m = &_monsters[i];
+		EoBMonsterInPlay *m = &_monsters[i];
 		if (m->block != block)
 			continue;
 		if (_monsterProps[m->type].u30 != size)
@@ -881,8 +881,8 @@ int EobCoreEngine::findFreeMonsterPos(int block, int size) {
 	return res;
 }
 
-void EobCoreEngine::updateMoveMonster(EobMonsterInPlay *m) {
-	EobMonsterProperty *p = &_monsterProps[m->type];
+void EoBCoreEngine::updateMoveMonster(EoBMonsterInPlay *m) {
+	EoBMonsterProperty *p = &_monsterProps[m->type];
 	int d = getNextMonsterDirection(m->block, _currentBlock);
 
 	if ((_flags.gameID == GI_EOB2) && (p->capsFlags & 0x800) && !(d & 1))
@@ -910,8 +910,8 @@ void EobCoreEngine::updateMoveMonster(EobMonsterInPlay *m) {
 		updateMonsterTryCloseAttack(m, -1);
 }
 
-bool EobCoreEngine::updateMonsterTryDistanceAttack(EobMonsterInPlay *m) {
-	EobMonsterProperty *p = &_monsterProps[m->type];
+bool EoBCoreEngine::updateMonsterTryDistanceAttack(EoBMonsterInPlay *m) {
+	EoBMonsterProperty *p = &_monsterProps[m->type];
 	if (!m->numRemoteAttacks || ((_flags.gameID == GI_EOB1) && !(p->capsFlags & 0x40)))
 		return false;
 
@@ -1014,7 +1014,7 @@ bool EobCoreEngine::updateMonsterTryDistanceAttack(EobMonsterInPlay *m) {
 	return true;
 }
 
-bool EobCoreEngine::updateMonsterTryCloseAttack(EobMonsterInPlay *m, int block) {
+bool EoBCoreEngine::updateMonsterTryCloseAttack(EoBMonsterInPlay *m, int block) {
 	if (block == -1)
 		block = calcNewBlockPosition(m->block, m->dir);
 
@@ -1070,7 +1070,7 @@ bool EobCoreEngine::updateMonsterTryCloseAttack(EobMonsterInPlay *m, int block)
 	return true;
 }
 
-void EobCoreEngine::walkMonster(EobMonsterInPlay *m, int destBlock) {
+void EoBCoreEngine::walkMonster(EoBMonsterInPlay *m, int destBlock) {
 	if (++_monsterStepCounter > 10) {
 		_monsterStepCounter = 0;
 		_monsterStepMode ^= 1;
@@ -1141,8 +1141,8 @@ void EobCoreEngine::walkMonster(EobMonsterInPlay *m, int destBlock) {
 	}
 }
 
-bool EobCoreEngine::walkMonsterNextStep(EobMonsterInPlay *m, int destBlock, int direction) {
-	EobMonsterProperty *p = &_monsterProps[m->type];
+bool EoBCoreEngine::walkMonsterNextStep(EoBMonsterInPlay *m, int destBlock, int direction) {
+	EoBMonsterProperty *p = &_monsterProps[m->type];
 	int obl = m->block;
 
 	if (destBlock != m->block && destBlock != -1) {
@@ -1199,14 +1199,14 @@ bool EobCoreEngine::walkMonsterNextStep(EobMonsterInPlay *m, int destBlock, int
 	return true;
 }
 
-void EobCoreEngine::updateMonsterFollowPath(EobMonsterInPlay *m, int turnSteps) {
+void EoBCoreEngine::updateMonsterFollowPath(EoBMonsterInPlay *m, int turnSteps) {
 	if (!walkMonsterNextStep(m, calcNewBlockPosition(m->block, m->dir), -1)) {
 		m->dir = (m->dir + turnSteps) & 3;
 		walkMonsterNextStep(m, -1, m->dir);
 	}
 }
 
-void EobCoreEngine::updateMonstersStraying(EobMonsterInPlay *m, int a) {
+void EoBCoreEngine::updateMonstersStraying(EoBMonsterInPlay *m, int a) {
 	if (m->f_9 >= 0) {
 		if (m->f_9 == 0)
 			updateMonsterFollowPath(m, -a);
@@ -1236,14 +1236,14 @@ void EobCoreEngine::updateMonstersStraying(EobMonsterInPlay *m, int a) {
 	}
 }
 
-void EobCoreEngine::updateMonstersSpellStatus(EobMonsterInPlay *m) {
+void EoBCoreEngine::updateMonstersSpellStatus(EoBMonsterInPlay *m) {
 	if (m->spellStatusLeft) {
 		if (!--m->spellStatusLeft)
 			m->mode = 0;
 	}
 }
 
-void EobCoreEngine::setBlockMonsterDirection(int block, int dir) {
+void EoBCoreEngine::setBlockMonsterDirection(int block, int dir) {
 	for (int i = 0; i < 30; i++) {
 		if (_monsters[i].block != block || _monsters[i].dir == dir)
 			continue;
diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp
index 9f7e05627b..06d781328e 100644
--- a/engines/kyra/sprites_lol.cpp
+++ b/engines/kyra/sprites_lol.cpp
@@ -159,7 +159,7 @@ int LoLEngine::deleteMonstersFromBlock(int block) {
 			continue;
 		}
 
-		LolMonsterInPlay *m = &_monsters[i & 0x7fff];
+		LoLMonsterInPlay *m = &_monsters[i & 0x7fff];
 
 		cnt++;
 		setMonsterMode(m, 14);
@@ -173,7 +173,7 @@ int LoLEngine::deleteMonstersFromBlock(int block) {
 	return cnt;
 }
 
-void LoLEngine::setMonsterMode(LolMonsterInPlay *monster, int mode) {
+void LoLEngine::setMonsterMode(LoLMonsterInPlay *monster, int mode) {
 	if (monster->mode == 13 && mode != 14)
 		return;
 
@@ -210,7 +210,7 @@ void LoLEngine::setMonsterMode(LolMonsterInPlay *monster, int mode) {
 	}
 }
 
-bool LoLEngine::updateMonsterAdjustBlocks(LolMonsterInPlay *monster) {
+bool LoLEngine::updateMonsterAdjustBlocks(LoLMonsterInPlay *monster) {
 	static const uint8 dims[] = { 0, 13, 9, 3 };
 	if (monster->properties->flags & 8)
 		return true;
@@ -251,7 +251,7 @@ bool LoLEngine::updateMonsterAdjustBlocks(LolMonsterInPlay *monster) {
 	return (fx1 >= fx2) ? false : true;
 }
 
-void LoLEngine::placeMonster(LolMonsterInPlay *monster, uint16 x, uint16 y) {
+void LoLEngine::placeMonster(LoLMonsterInPlay *monster, uint16 x, uint16 y) {
 	bool cont = true;
 	int t = monster->block;
 	if (monster->block) {
@@ -329,7 +329,7 @@ int LoLEngine::calcMonsterDirection(uint16 x1, uint16 y1, uint16 x2, uint16 y2)
 	return retVal[r];
 }
 
-void LoLEngine::setMonsterDirection(LolMonsterInPlay *monster, int dir) {
+void LoLEngine::setMonsterDirection(LoLMonsterInPlay *monster, int dir) {
 	monster->direction = dir;
 
 	if (!(dir & 1) || ((monster->direction - (monster->facing << 1)) >= 2))
@@ -338,7 +338,7 @@ void LoLEngine::setMonsterDirection(LolMonsterInPlay *monster, int dir) {
 	checkSceneUpdateNeed(monster->block);
 }
 
-void LoLEngine::monsterDropItems(LolMonsterInPlay *monster) {
+void LoLEngine::monsterDropItems(LoLMonsterInPlay *monster) {
 	uint16 a = monster->assignedItems;
 	while (a) {
 		uint16 b = a;
@@ -503,7 +503,7 @@ int LoLEngine::checkBlockForWallsAndSufficientSpace(int block, int x, int y, int
 
 	uint16 b = _levelBlockProperties[block].assignedObjects;
 	while (b & 0x8000) {
-		LolMonsterInPlay *monster = &_monsters[b & 0x7fff];
+		LoLMonsterInPlay *monster = &_monsters[b & 0x7fff];
 
 		if (monster->mode < 13) {
 			int r = checkDrawObjectSpace(x, y, monster->x, monster->y);
@@ -645,7 +645,7 @@ void LoLEngine::drawBlockObjects(int blockArrayIndex) {
 }
 
 void LoLEngine::drawMonster(uint16 id) {
-	LolMonsterInPlay *m = &_monsters[id];
+	LoLMonsterInPlay *m = &_monsters[id];
 	int16 flg = _monsterDirFlags[(_currentDirection << 2) + m->facing];
 	int curFrm = getMonsterCurFrame(m, flg & 0xffef);
 	uint8 *shp = 0;
@@ -721,7 +721,7 @@ void LoLEngine::drawMonster(uint16 id) {
 	delete[] tbl;
 }
 
-int LoLEngine::getMonsterCurFrame(LolMonsterInPlay *m, uint16 dirFlags) {
+int LoLEngine::getMonsterCurFrame(LoLMonsterInPlay *m, uint16 dirFlags) {
 	int tmp = 0;
 	switch (_monsterAnimType[m->properties->shapeIndex]) {
 	case 0:
@@ -1080,7 +1080,7 @@ int LoLEngine::calcDrawingLayerParameters(int x1, int y1, int &x2, int &y2, uint
 	return l;
 }
 
-void LoLEngine::updateMonster(LolMonsterInPlay *monster) {
+void LoLEngine::updateMonster(LoLMonsterInPlay *monster) {
 	static const uint8 flags[] = { 1, 0, 1, 3, 3, 0, 0, 3, 4, 1, 0, 0, 4, 0, 0 };
 	if (monster->mode > 14)
 		return;
@@ -1228,7 +1228,7 @@ void LoLEngine::updateMonster(LolMonsterInPlay *monster) {
 	monster->flags &= 0xffef;
 }
 
-void LoLEngine::moveMonster(LolMonsterInPlay *monster) {
+void LoLEngine::moveMonster(LoLMonsterInPlay *monster) {
 	static const int8 turnPos[] = { 0, 2, 6, 6, 0, 2, 4, 4, 2, 2, 4, 6, 0, 0, 4, 6, 0 };
 	if (monster->x != monster->destX || monster->y != monster->destY) {
 		walkMonster(monster);
@@ -1238,7 +1238,7 @@ void LoLEngine::moveMonster(LolMonsterInPlay *monster) {
 	}
 }
 
-void LoLEngine::walkMonster(LolMonsterInPlay *monster) {
+void LoLEngine::walkMonster(LoLMonsterInPlay *monster) {
 	if (monster->properties->flags & 0x400)
 		return;
 
@@ -1269,7 +1269,7 @@ void LoLEngine::walkMonster(LolMonsterInPlay *monster) {
 	placeMonster(monster, fx, fy);
 }
 
-bool LoLEngine::chasePartyWithDistanceAttacks(LolMonsterInPlay *monster) {
+bool LoLEngine::chasePartyWithDistanceAttacks(LoLMonsterInPlay *monster) {
 	if (!monster->numDistAttacks)
 		return false;
 
@@ -1347,7 +1347,7 @@ bool LoLEngine::chasePartyWithDistanceAttacks(LolMonsterInPlay *monster) {
 	return true;
 }
 
-void LoLEngine::chasePartyWithCloseAttacks(LolMonsterInPlay *monster) {
+void LoLEngine::chasePartyWithCloseAttacks(LoLMonsterInPlay *monster) {
 	if (!(monster->flags & 8)) {
 		int dir = calcMonsterDirection(monster->x & 0xff00, monster->y & 0xff00, _partyPosX & 0xff00, _partyPosY & 0xff00);
 		int x1 = _partyPosX;
@@ -1389,7 +1389,7 @@ void LoLEngine::chasePartyWithCloseAttacks(LolMonsterInPlay *monster) {
 	}
 }
 
-int LoLEngine::walkMonsterCalcNextStep(LolMonsterInPlay *monster) {
+int LoLEngine::walkMonsterCalcNextStep(LoLMonsterInPlay *monster) {
 	static const int8 walkMonsterTable1[] = { 7, -6, 5, -4, 3, -2, 1, 0 };
 	static const int8 walkMonsterTable2[] = { -7, 6, -5, 4, -3, 2, -1, 0 };
 
@@ -1479,7 +1479,7 @@ int LoLEngine::checkForPossibleDistanceAttack(uint16 monsterBlock, int direction
 	return 5;
 }
 
-int LoLEngine::walkMonsterCheckDest(int x, int y, LolMonsterInPlay *monster, int unk) {
+int LoLEngine::walkMonsterCheckDest(int x, int y, LoLMonsterInPlay *monster, int unk) {
 	uint8 m = monster->mode;
 	monster->mode = 15;
 
@@ -1497,7 +1497,7 @@ void LoLEngine::getNextStepCoords(int16 srcX, int16 srcY, int &newX, int &newY,
 	newY = (srcY + shiftTableY[direction]) & 0x1fff;
 }
 
-void LoLEngine::rearrangeAttackingMonster(LolMonsterInPlay *monster) {
+void LoLEngine::rearrangeAttackingMonster(LoLMonsterInPlay *monster) {
 	int t = (monster->direction >> 1);
 	uint16 mx = monster->x;
 	uint16 my = monster->y;
@@ -1564,7 +1564,7 @@ void LoLEngine::rearrangeAttackingMonster(LolMonsterInPlay *monster) {
 	placeMonster(monster, mx, my);
 }
 
-void LoLEngine::moveStrayingMonster(LolMonsterInPlay *monster) {
+void LoLEngine::moveStrayingMonster(LoLMonsterInPlay *monster) {
 	int x = 0;
 	int y = 0;
 
@@ -1601,7 +1601,7 @@ void LoLEngine::moveStrayingMonster(LolMonsterInPlay *monster) {
 	}
 }
 
-void LoLEngine::killMonster(LolMonsterInPlay *monster) {
+void LoLEngine::killMonster(LoLMonsterInPlay *monster) {
 	setMonsterMode(monster, 14);
 	monsterDropItems(monster);
 	checkSceneUpdateNeed(monster->block);
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 092a4cc1e9..888b515fd9 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -250,27 +250,27 @@ bool StaticResource::init() {
 		{ k2ShpAnimDataV2, proc(loadShapeAnimData_v2), proc(freeHofShapeAnimDataV2) },
 
 #ifdef ENABLE_LOL
-		{ kLolCharData, proc(loadCharData), proc(freeCharData) },
-		{ kLolSpellData, proc(loadSpellData), proc(freeSpellData) },
-		{ kLolCompassData, proc(loadCompassData), proc(freeCompassData) },
-		{ kLolFlightShpData, proc(loadFlyingObjectData), proc(freeFlyingObjectData) },
-		{ kLolRawDataBe16, proc(loadRawDataBe16), proc(freeRawDataBe16) },
-		{ kLolRawDataBe32, proc(loadRawDataBe32), proc(freeRawDataBe32) },
-		{ kLolButtonData, proc(loadButtonDefs), proc(freeButtonDefs) },
+		{ kLoLCharData, proc(loadCharData), proc(freeCharData) },
+		{ kLoLSpellData, proc(loadSpellData), proc(freeSpellData) },
+		{ kLoLCompassData, proc(loadCompassData), proc(freeCompassData) },
+		{ kLoLFlightShpData, proc(loadFlyingObjectData), proc(freeFlyingObjectData) },
+		{ kLoLRawDataBe16, proc(loadRawDataBe16), proc(freeRawDataBe16) },
+		{ kLoLRawDataBe32, proc(loadRawDataBe32), proc(freeRawDataBe32) },
+		{ kLoLButtonData, proc(loadButtonDefs), proc(freeButtonDefs) },
 #else
-		{ kLolCharData, proc(loadDummy), proc(freeDummy) },
-		{ kLolSpellData, proc(loadDummy), proc(freeDummy) },
-		{ kLolCompassData, proc(loadDummy), proc(freeDummy) },
-		{ kLolFlightShpData, proc(loadDummy), proc(freeDummy) },
-		{ kLolRawDataBe16, proc(loadDummy), proc(freeDummy) },
-		{ kLolRawDataBe32, proc(loadDummy), proc(freeDummy) },
-		{ kLolButtonData, proc(loadDummy), proc(freeDummy) },
+		{ kLoLCharData, proc(loadDummy), proc(freeDummy) },
+		{ kLoLSpellData, proc(loadDummy), proc(freeDummy) },
+		{ kLoLCompassData, proc(loadDummy), proc(freeDummy) },
+		{ kLoLFlightShpData, proc(loadDummy), proc(freeDummy) },
+		{ kLoLRawDataBe16, proc(loadDummy), proc(freeDummy) },
+		{ kLoLRawDataBe32, proc(loadDummy), proc(freeDummy) },
+		{ kLoLButtonData, proc(loadDummy), proc(freeDummy) },
 #endif // ENABLE_LOL
 
 #ifdef ENABLE_EOB
-		{ kEob2SequenceData, proc(loadEob2SeqData), proc(freeEob2SeqData) },
-		{ kEob2ShapeData, proc(loadEob2ShapeData), proc(freeEob2ShapeData) },
-		{ kEobNpcData, proc(loadEobNpcData), proc(freeEobNpcData) },
+		{ kEoB2SequenceData, proc(loadEoB2SeqData), proc(freeEoB2SeqData) },
+		{ kEoB2ShapeData, proc(loadEoB2ShapeData), proc(freeEoB2ShapeData) },
+		{ kEoBNpcData, proc(loadEoBNpcData), proc(freeEoBNpcData) },
 #endif // ENABLE_EOB
 
 		{ 0, 0, 0 }
@@ -1110,24 +1110,24 @@ void KyraEngine_HoF::initStaticResource() {
 	};
 
 #ifdef ENABLE_LOL
-	static const SeqProc kLolDemoSequenceCallbacks[] = {
+	static const SeqProc kLoLDemoSequenceCallbacks[] = {
 		&KyraEngine_HoF::seq_lolDemoScene1, 0, &KyraEngine_HoF::seq_lolDemoScene2, 0,
 		&KyraEngine_HoF::seq_lolDemoScene3, 0, &KyraEngine_HoF::seq_lolDemoScene4, 0,
 		&KyraEngine_HoF::seq_lolDemoScene5, &KyraEngine_HoF::seq_lolDemoText5,
 		&KyraEngine_HoF::seq_lolDemoScene6, 0
 	};
 
-	static const SeqProc kLolDemoNestedSequenceCallbacks[] = { 0 };
+	static const SeqProc kLoLDemoNestedSequenceCallbacks[] = { 0 };
 #endif // ENABLE_LOL
 
 	_callbackS =
 #ifdef ENABLE_LOL
-		_flags.gameID == GI_LOL ? kLolDemoSequenceCallbacks :
+		_flags.gameID == GI_LOL ? kLoLDemoSequenceCallbacks :
 #endif // ENABLE_LOL
 		((_flags.isDemo && !_flags.isTalkie) ? hofDemoSequenceCallbacks : hofSequenceCallbacks);
 	_callbackN =
 #ifdef ENABLE_LOL
-		_flags.gameID == GI_LOL ? kLolDemoNestedSequenceCallbacks :
+		_flags.gameID == GI_LOL ? kLoLDemoNestedSequenceCallbacks :
 #endif // ENABLE_LOL
 		((_flags.isDemo && !_flags.isTalkie) ? hofDemoNestedSequenceCallbacks : hofNestedSequenceCallbacks);
 }
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 2594828fdf..f3460bc9c5 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -28,22 +28,22 @@
 namespace Kyra {
 
 #ifdef ENABLE_EOB
-const EobSequenceStep *StaticResource::loadEob2SeqData(int id, int &entries) {
-	return (const EobSequenceStep *)getData(id, kEob2SequenceData, entries);
+const EoBSequenceStep *StaticResource::loadEoB2SeqData(int id, int &entries) {
+	return (const EoBSequenceStep *)getData(id, kEoB2SequenceData, entries);
 }
 
-const EobShapeDef *StaticResource::loadEob2ShapeData(int id, int &entries) {
-	return (const EobShapeDef *)getData(id, kEob2ShapeData, entries);
+const EoBShapeDef *StaticResource::loadEoB2ShapeData(int id, int &entries) {
+	return (const EoBShapeDef *)getData(id, kEoB2ShapeData, entries);
 }
 
-const EobCharacter *StaticResource::loadEobNpcData(int id, int &entries) {
-	return (const EobCharacter *)getData(id, kEobNpcData, entries);
+const EoBCharacter *StaticResource::loadEoBNpcData(int id, int &entries) {
+	return (const EoBCharacter *)getData(id, kEoBNpcData, entries);
 }
 
-bool StaticResource::loadEob2SeqData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
+bool StaticResource::loadEoB2SeqData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
 	size = stream.size() / 11;
 
-	EobSequenceStep *s = new EobSequenceStep[size];
+	EoBSequenceStep *s = new EoBSequenceStep[size];
 
 	for (int i = 0; i < size; i++) {
 		s[i].command = stream.readByte();
@@ -62,10 +62,10 @@ bool StaticResource::loadEob2SeqData(Common::SeekableReadStream &stream, void *&
 	return true;
 }
 
-bool StaticResource::loadEob2ShapeData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
+bool StaticResource::loadEoB2ShapeData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
 	size = stream.size() / 6;
 
-	EobShapeDef *s = new EobShapeDef[size];
+	EoBShapeDef *s = new EoBShapeDef[size];
 
 	for (int i = 0; i < size; i++) {
 		s[i].index = stream.readSint16BE();
@@ -79,12 +79,12 @@ bool StaticResource::loadEob2ShapeData(Common::SeekableReadStream &stream, void
 	return true;
 }
 
-bool StaticResource::loadEobNpcData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
+bool StaticResource::loadEoBNpcData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
 	size = stream.readUint16BE();
 
-	EobCharacter *e = new EobCharacter[size];
-	memset(e, 0, size * sizeof(EobCharacter));
-	EobCharacter *s = e;
+	EoBCharacter *e = new EoBCharacter[size];
+	memset(e, 0, size * sizeof(EoBCharacter));
+	EoBCharacter *s = e;
 
 	for (int i = 0; i < size; i++, s++) {
 		s->id = stream.readByte();
@@ -126,28 +126,28 @@ bool StaticResource::loadEobNpcData(Common::SeekableReadStream &stream, void *&p
 	return true;
 }
 
-void StaticResource::freeEob2SeqData(void *&ptr, int &size) {
-	EobSequenceStep *d = (EobSequenceStep *)ptr;
+void StaticResource::freeEoB2SeqData(void *&ptr, int &size) {
+	EoBSequenceStep *d = (EoBSequenceStep *)ptr;
 	delete[] d;
 	ptr = 0;
 	size = 0;
 }
 
-void StaticResource::freeEob2ShapeData(void *&ptr, int &size) {
-	EobShapeDef *d = (EobShapeDef *)ptr;
+void StaticResource::freeEoB2ShapeData(void *&ptr, int &size) {
+	EoBShapeDef *d = (EoBShapeDef *)ptr;
 	delete[] d;
 	ptr = 0;
 	size = 0;
 }
 
-void StaticResource::freeEobNpcData(void *&ptr, int &size) {
-	EobCharacter *d = (EobCharacter *)ptr;
+void StaticResource::freeEoBNpcData(void *&ptr, int &size) {
+	EoBCharacter *d = (EoBCharacter *)ptr;
 	delete[] d;
 	ptr = 0;
 	size = 0;
 }
 
-const ScreenDim Screen_Eob::_screenDimTable[] = {
+const ScreenDim Screen_EoB::_screenDimTable[] = {
 	{ 0x00, 0x00, 0x28, 0xC8, 0x0F, 0x0C, 0x00, 0x00 },
 	{ 0x08, 0x48, 0x18, 0x38, 0x0E, 0x0C, 0x00, 0x00 },
 	{ 0x13, 0x40, 0x14, 0x80, 0x06, 0x0C, 0x00, 0x00 },
@@ -179,26 +179,26 @@ const ScreenDim Screen_Eob::_screenDimTable[] = {
 	{ 0x0A, 0xA8, 0x15, 0x18, 0x0F, 0x0C, 0x00, 0x00 }
 };
 
-const int Screen_Eob::_screenDimTableCount = ARRAYSIZE(Screen_Eob::_screenDimTable);
+const int Screen_EoB::_screenDimTableCount = ARRAYSIZE(Screen_EoB::_screenDimTable);
 
-const uint8 EobCoreEngine::_hpIncrPerLevel[] = { 10, 4, 8, 6, 10, 10, 9, 10, 9, 10, 9, 9, 3, 1, 2, 2, 3, 3 };
+const uint8 EoBCoreEngine::_hpIncrPerLevel[] = { 10, 4, 8, 6, 10, 10, 9, 10, 9, 10, 9, 9, 3, 1, 2, 2, 3, 3 };
 
-const uint8 EobCoreEngine::_numLevelsPerClass[] = { 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 2, 2, 3, 2, 2 };
+const uint8 EoBCoreEngine::_numLevelsPerClass[] = { 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 2, 2, 3, 2, 2 };
 
-const int8 EobCoreEngine::_characterClassType[] = {
+const int8 EoBCoreEngine::_characterClassType[] = {
 	0, -1, -1, 5, -1, -1, 4, -1, -1, 1, -1, -1, 2, -1, -1, 3, -1, -1,  0,
 	2, -1, 0, 3, -1, 0, 1, -1, 0, 1, 3, 3, 1, -1, 2, 3, -1, 0, 2,  1,  5,
 	2, -1, 2, 1, -1
 };
 
-const int16 EobCoreEngine::_hpConstModifiers[] = { -1, -3, -2, -2, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 6, 6, 7, 7 };
+const int16 EoBCoreEngine::_hpConstModifiers[] = { -1, -3, -2, -2, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 6, 6, 7, 7 };
 
-const uint8 EobCoreEngine::_charClassModifier[] = {
+const uint8 EoBCoreEngine::_charClassModifier[] = {
 	0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02,
 	0x00, 0x00, 0x02
 };
 
-const uint8 EobCoreEngine::_teleporterShapeDefs[] = {
+const uint8 EoBCoreEngine::_teleporterShapeDefs[] = {
 	0x0C, 0x58, 0x02, 0x0E,
 	0x0C, 0x67, 0x01, 0x07,
 	0x0C, 0x6F, 0x01, 0x07,
@@ -207,7 +207,7 @@ const uint8 EobCoreEngine::_teleporterShapeDefs[] = {
 	0x0C, 0x83, 0x01, 0x03
 };
 
-const uint8 EobCoreEngine::_wallOfForceShapeDefs[] = {
+const uint8 EoBCoreEngine::_wallOfForceShapeDefs[] = {
 	0x00, 0x00, 0x04, 0x08,
 	0x00, 0x08,	0x04, 0x08,
 	0x04, 0x00, 0x04, 0x08,
@@ -216,246 +216,246 @@ const uint8 EobCoreEngine::_wallOfForceShapeDefs[] = {
 	0x0C, 0x00,	0x05, 0x10
 };
 
-const int16 EobCoreEngine::_buttonList1[] = {
+const int16 EoBCoreEngine::_buttonList1[] = {
 	58, 0, 1, 2, 3, 90, 91, 4, 5, 6, 7, 8, 9, 10, 11, 12, 78, 79, 13, 14,  15,  16,
 	80, 81, 17, 18, 19, 20, 82, 83, 49, 50, 51, 52, 53, 54, 56, 57, -1
 };
 
-const int16 EobCoreEngine::_buttonList2[] = {
+const int16 EoBCoreEngine::_buttonList2[] = {
 	58, 61, 62, 63,	64, 65, 93, 94, 66, 67, 68, 69, 70, 71, 76, 77, 88, 0, 1, 2, 3,
 	90, 91,  4,  5,	6, 7, 8, 9, 10, 11, 12, 78, 79, 13, 14, 15, 16, 80, 81, 17, 18,
 	19, 20, 82, 83,	49, 50, 51, 52, 53, 54, 56, 57, -1
 };
 
-const int16 EobCoreEngine::_buttonList3[] = {
+const int16 EoBCoreEngine::_buttonList3[] = {
 	58, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,	32, 33, 34, 35, 36, 37, 38, 39,
 	40, 41, 42, 43, 44, 45, 84, 85, 46, 47, 48, 60,	59, 92, 4, 5, 6, 7, 8, 49,  50,
 	51, 52, 53, 54, 56, 57, -1
 };
 
-const int16 EobCoreEngine::_buttonList4[] = {
+const int16 EoBCoreEngine::_buttonList4[] = {
 	58, 47, 48, 60, 59, 92, 4, 5, 6, 7, 8, 49, 50, 51, 52, 53, 54, 56, 57, -1
 };
 
-const int16 EobCoreEngine::_buttonList5[] = {
+const int16 EoBCoreEngine::_buttonList5[] = {
 	58, 61, 62, 63, 64, 65, 93, 66,	67, 68, 69, 70, 71, 88, 21, 22, 23, 24, 25, 26,
 	27, 28, 29, 30, 31, 32, 33, 34,	35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 84,
 	85, 46, 47, 48, 60, 59, 92, 4, 5, 6, 7, 8, 49, 50, 51, 52, 53, 54, 56, 57, -1
 };
 
-const int16 EobCoreEngine::_buttonList6[] = {
+const int16 EoBCoreEngine::_buttonList6[] = {
 	58, 61, 62, 63, 64, 65, 93, 66, 67, 68, 69, 70, 71, 88, 46, 47, 48, 60, 59, 92,
 	4, 5, 6, 7, 8, 49, 50, 51, 52, 53, 54, 56, 57, -1
 };
 
-const int16 EobCoreEngine::_buttonList7[] = {
+const int16 EoBCoreEngine::_buttonList7[] = {
 	17, 18, 19, 20, 82, 83, 55, -1
 };
 
-const int16 EobCoreEngine::_buttonList8[] = {
+const int16 EoBCoreEngine::_buttonList8[] = {
 	72, 73, 74, 75, 86, 87, 89, -1
 };
 
-const uint8 EobCoreEngine::_clock2Timers[] = {
+const uint8 EoBCoreEngine::_clock2Timers[] = {
 	0x00, 0x01, 0x20, 0x21, 0x22, 0x22,
 	0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
 	0x04, 0x05, 0x06, 0x07
 };
 
-const uint8 EobCoreEngine::_numClock2Timers = ARRAYSIZE(EobCoreEngine::_clock2Timers);
+const uint8 EoBCoreEngine::_numClock2Timers = ARRAYSIZE(EoBCoreEngine::_clock2Timers);
 
-void EobCoreEngine::initStaticResource() {
+void EoBCoreEngine::initStaticResource() {
 	int temp;
-	_chargenStatStrings = _staticres->loadStrings(kEobBaseChargenStatStrings, temp);
-	_chargenRaceSexStrings = _staticres->loadStrings(kEobBaseChargenRaceSexStrings, temp);
-	_chargenClassStrings = _staticres->loadStrings(kEobBaseChargenClassStrings, temp);
-	_chargenAlignmentStrings = _staticres->loadStrings(kEobBaseChargenAlignmentStrings, temp);
-
-	_pryDoorStrings = _staticres->loadStrings(kEobBasePryDoorStrings, temp);
-	_warningStrings = _staticres->loadStrings(kEobBaseWarningStrings, temp);
-
-	_suffixStringsRings = _staticres->loadStrings(kEobBaseItemSuffixStringsRings, temp);
-	_suffixStringsPotions = _staticres->loadStrings(kEobBaseItemSuffixStringsPotions, temp);
-	_suffixStringsWands = _staticres->loadStrings(kEobBaseItemSuffixStringsWands, temp);
-
-	_ripItemStrings = _staticres->loadStrings(kEobBaseRipItemStrings, temp);
-	_cursedString = _staticres->loadStrings(kEobBaseCursedString, temp);
-	_enchantedString = _staticres->loadStrings(kEobBaseEnchantedString, temp);
-	_magicObjectStrings = _staticres->loadStrings(kEobBaseMagicObjectStrings, temp);
-	_magicObjectString5 = _staticres->loadStrings(kEobBaseMagicObjectString5, temp);
-	_patternSuffix = _staticres->loadStrings(kEobBasePatternSuffix, temp);
-	_patternGrFix1 = _staticres->loadStrings(kEobBasePatternGrFix1, temp);
-	_patternGrFix2 = _staticres->loadStrings(kEobBasePatternGrFix2, temp);
-	_validateArmorString = _staticres->loadStrings(kEobBaseValidateArmorString, temp);
-	_validateCursedString = _staticres->loadStrings(kEobBaseValidateCursedString, temp);
-	_validateNoDropString = _staticres->loadStrings(kEobBaseValidateNoDropString, temp);
-	_potionStrings = _staticres->loadStrings(kEobBasePotionStrings, temp);
-	_wandStrings = _staticres->loadStrings(kEobBaseWandStrings, temp);
-	_itemMisuseStrings = _staticres->loadStrings(kEobBaseItemMisuseStrings, temp);
-
-	_takenStrings = _staticres->loadStrings(kEobBaseTakenStrings, temp);
-	_potionEffectStrings = _staticres->loadStrings(kEobBasePotionEffectStrings, temp);
-
-	_yesNoStrings = _staticres->loadStrings(kEobBaseYesNoStrings, temp);
-	_npcMaxStrings = _staticres->loadStrings(kEobBaseNpcMaxStrings, temp);
-	_okStrings = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseOkStrings : kLolEobCommonMoreStrings, temp);
-	_npcJoinStrings = _staticres->loadStrings(kEobBaseNpcJoinStrings, temp);
-	_cancelStrings = _staticres->loadStrings(kEobBaseCancelStrings, temp);
-	_abortStrings = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseAbortStrings : kEobBaseCancelStrings, temp);
-
-	_menuStringsMain = _staticres->loadStrings(kEobBaseMenuStringsMain, temp);
-	_menuStringsSaveLoad = _staticres->loadStrings(kEobBaseMenuStringsSaveLoad, temp);
-	_menuStringsOnOff = _staticres->loadStrings(kEobBaseMenuStringsOnOff, temp);
-	_menuStringsSpells = _staticres->loadStrings(kEobBaseMenuStringsSpells, temp);
-	_menuStringsRest = _staticres->loadStrings(kEobBaseMenuStringsRest, temp);
-	_menuStringsDrop = _staticres->loadStrings(kEobBaseMenuStringsDrop, temp);
-	_menuStringsExit = _staticres->loadStrings(kEobBaseMenuStringsExit, temp);
-	_menuStringsStarve = _staticres->loadStrings(kEobBaseMenuStringsStarve, temp);
-	_menuStringsScribe = _staticres->loadStrings(kEobBaseMenuStringsScribe, temp);
-	_menuStringsDrop2 = _staticres->loadStrings(kEobBaseMenuStringsDrop2, temp);
-	_menuStringsHead = _staticres->loadStrings(kEobBaseMenuStringsHead, temp);
-	_menuStringsPoison = _staticres->loadStrings(kEobBaseMenuStringsPoison, temp);
-	_menuStringsMgc = _staticres->loadStrings(kEobBaseMenuStringsMgc, temp);
-	_menuStringsPrefs = _staticres->loadStrings(kEobBaseMenuStringsPrefs, temp);
-	_menuStringsRest2 = _staticres->loadStrings(kEobBaseMenuStringsRest2, temp);
-	_menuStringsRest3 = _staticres->loadStrings(kEobBaseMenuStringsRest3, temp);
-	_menuStringsRest4 = _staticres->loadStrings(kEobBaseMenuStringsRest4, temp);
-	_menuStringsDefeat = _staticres->loadStrings(kEobBaseMenuStringsDefeat, temp);
-	_menuStringsTransfer = _staticres->loadStrings(kEobBaseMenuStringsTransfer, temp);
-	_menuStringsSpec = _staticres->loadStrings(kEobBaseMenuStringsSpec, temp);
-	_menuStringsSpellNo = _staticres->loadStrings(kEobBaseMenuStringsSpellNo, temp);
-	_menuYesNoStrings = _staticres->loadStrings(kEobBaseMenuYesNoStrings, temp);
-
-	_spellLevelsMage = _staticres->loadRawData(kEobBaseSpellLevelsMage, _spellLevelsMageSize);
-	_spellLevelsCleric = _staticres->loadRawData(kEobBaseSpellLevelsCleric, _spellLevelsClericSize);
-	_numSpellsCleric = _staticres->loadRawData(kEobBaseNumSpellsCleric, temp);
-	_numSpellsWisAdj = _staticres->loadRawData(kEobBaseNumSpellsWisAdj, temp);
-	_numSpellsPal = _staticres->loadRawData(kEobBaseNumSpellsPal, temp);
-	_numSpellsMage = _staticres->loadRawData(kEobBaseNumSpellsMage, temp);
-
-	_characterGuiStringsHp = _staticres->loadStrings(kEobBaseCharGuiStringsHp, temp);
-	_characterGuiStringsWp = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharGuiStringsWp2 : kEobBaseCharGuiStringsWp1, temp);
-	_characterGuiStringsWr = _staticres->loadStrings(kEobBaseCharGuiStringsWr, temp);
-	_characterGuiStringsSt = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharGuiStringsSt2 : kEobBaseCharGuiStringsSt1, temp);
-	_characterGuiStringsIn = _staticres->loadStrings(kEobBaseCharGuiStringsIn, temp);
-
-	_characterStatusStrings7 = _staticres->loadStrings(kEobBaseCharStatusStrings7, temp);
-	_characterStatusStrings8 = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharStatusStrings82 : kEobBaseCharStatusStrings81, temp);
-	_characterStatusStrings9 = _staticres->loadStrings(kEobBaseCharStatusStrings9, temp);
-	_characterStatusStrings12 = _staticres->loadStrings(kEobBaseCharStatusStrings12, temp);
-	_characterStatusStrings13 = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEobBaseCharStatusStrings132 : kEobBaseCharStatusStrings131, temp);
-
-	_levelGainStrings = _staticres->loadStrings(kEobBaseLevelGainStrings, temp);
+	_chargenStatStrings = _staticres->loadStrings(kEoBBaseChargenStatStrings, temp);
+	_chargenRaceSexStrings = _staticres->loadStrings(kEoBBaseChargenRaceSexStrings, temp);
+	_chargenClassStrings = _staticres->loadStrings(kEoBBaseChargenClassStrings, temp);
+	_chargenAlignmentStrings = _staticres->loadStrings(kEoBBaseChargenAlignmentStrings, temp);
+
+	_pryDoorStrings = _staticres->loadStrings(kEoBBasePryDoorStrings, temp);
+	_warningStrings = _staticres->loadStrings(kEoBBaseWarningStrings, temp);
+
+	_suffixStringsRings = _staticres->loadStrings(kEoBBaseItemSuffixStringsRings, temp);
+	_suffixStringsPotions = _staticres->loadStrings(kEoBBaseItemSuffixStringsPotions, temp);
+	_suffixStringsWands = _staticres->loadStrings(kEoBBaseItemSuffixStringsWands, temp);
+
+	_ripItemStrings = _staticres->loadStrings(kEoBBaseRipItemStrings, temp);
+	_cursedString = _staticres->loadStrings(kEoBBaseCursedString, temp);
+	_enchantedString = _staticres->loadStrings(kEoBBaseEnchantedString, temp);
+	_magicObjectStrings = _staticres->loadStrings(kEoBBaseMagicObjectStrings, temp);
+	_magicObjectString5 = _staticres->loadStrings(kEoBBaseMagicObjectString5, temp);
+	_patternSuffix = _staticres->loadStrings(kEoBBasePatternSuffix, temp);
+	_patternGrFix1 = _staticres->loadStrings(kEoBBasePatternGrFix1, temp);
+	_patternGrFix2 = _staticres->loadStrings(kEoBBasePatternGrFix2, temp);
+	_validateArmorString = _staticres->loadStrings(kEoBBaseValidateArmorString, temp);
+	_validateCursedString = _staticres->loadStrings(kEoBBaseValidateCursedString, temp);
+	_validateNoDropString = _staticres->loadStrings(kEoBBaseValidateNoDropString, temp);
+	_potionStrings = _staticres->loadStrings(kEoBBasePotionStrings, temp);
+	_wandStrings = _staticres->loadStrings(kEoBBaseWandStrings, temp);
+	_itemMisuseStrings = _staticres->loadStrings(kEoBBaseItemMisuseStrings, temp);
+
+	_takenStrings = _staticres->loadStrings(kEoBBaseTakenStrings, temp);
+	_potionEffectStrings = _staticres->loadStrings(kEoBBasePotionEffectStrings, temp);
+
+	_yesNoStrings = _staticres->loadStrings(kEoBBaseYesNoStrings, temp);
+	_npcMaxStrings = _staticres->loadStrings(kEoBBaseNpcMaxStrings, temp);
+	_okStrings = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEoBBaseOkStrings : kRpgCommonMoreStrings, temp);
+	_npcJoinStrings = _staticres->loadStrings(kEoBBaseNpcJoinStrings, temp);
+	_cancelStrings = _staticres->loadStrings(kEoBBaseCancelStrings, temp);
+	_abortStrings = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEoBBaseAbortStrings : kEoBBaseCancelStrings, temp);
+
+	_menuStringsMain = _staticres->loadStrings(kEoBBaseMenuStringsMain, temp);
+	_menuStringsSaveLoad = _staticres->loadStrings(kEoBBaseMenuStringsSaveLoad, temp);
+	_menuStringsOnOff = _staticres->loadStrings(kEoBBaseMenuStringsOnOff, temp);
+	_menuStringsSpells = _staticres->loadStrings(kEoBBaseMenuStringsSpells, temp);
+	_menuStringsRest = _staticres->loadStrings(kEoBBaseMenuStringsRest, temp);
+	_menuStringsDrop = _staticres->loadStrings(kEoBBaseMenuStringsDrop, temp);
+	_menuStringsExit = _staticres->loadStrings(kEoBBaseMenuStringsExit, temp);
+	_menuStringsStarve = _staticres->loadStrings(kEoBBaseMenuStringsStarve, temp);
+	_menuStringsScribe = _staticres->loadStrings(kEoBBaseMenuStringsScribe, temp);
+	_menuStringsDrop2 = _staticres->loadStrings(kEoBBaseMenuStringsDrop2, temp);
+	_menuStringsHead = _staticres->loadStrings(kEoBBaseMenuStringsHead, temp);
+	_menuStringsPoison = _staticres->loadStrings(kEoBBaseMenuStringsPoison, temp);
+	_menuStringsMgc = _staticres->loadStrings(kEoBBaseMenuStringsMgc, temp);
+	_menuStringsPrefs = _staticres->loadStrings(kEoBBaseMenuStringsPrefs, temp);
+	_menuStringsRest2 = _staticres->loadStrings(kEoBBaseMenuStringsRest2, temp);
+	_menuStringsRest3 = _staticres->loadStrings(kEoBBaseMenuStringsRest3, temp);
+	_menuStringsRest4 = _staticres->loadStrings(kEoBBaseMenuStringsRest4, temp);
+	_menuStringsDefeat = _staticres->loadStrings(kEoBBaseMenuStringsDefeat, temp);
+	_menuStringsTransfer = _staticres->loadStrings(kEoBBaseMenuStringsTransfer, temp);
+	_menuStringsSpec = _staticres->loadStrings(kEoBBaseMenuStringsSpec, temp);
+	_menuStringsSpellNo = _staticres->loadStrings(kEoBBaseMenuStringsSpellNo, temp);
+	_menuYesNoStrings = _staticres->loadStrings(kEoBBaseMenuYesNoStrings, temp);
+
+	_spellLevelsMage = _staticres->loadRawData(kEoBBaseSpellLevelsMage, _spellLevelsMageSize);
+	_spellLevelsCleric = _staticres->loadRawData(kEoBBaseSpellLevelsCleric, _spellLevelsClericSize);
+	_numSpellsCleric = _staticres->loadRawData(kEoBBaseNumSpellsCleric, temp);
+	_numSpellsWisAdj = _staticres->loadRawData(kEoBBaseNumSpellsWisAdj, temp);
+	_numSpellsPal = _staticres->loadRawData(kEoBBaseNumSpellsPal, temp);
+	_numSpellsMage = _staticres->loadRawData(kEoBBaseNumSpellsMage, temp);
+
+	_characterGuiStringsHp = _staticres->loadStrings(kEoBBaseCharGuiStringsHp, temp);
+	_characterGuiStringsWp = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEoBBaseCharGuiStringsWp2 : kEoBBaseCharGuiStringsWp1, temp);
+	_characterGuiStringsWr = _staticres->loadStrings(kEoBBaseCharGuiStringsWr, temp);
+	_characterGuiStringsSt = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEoBBaseCharGuiStringsSt2 : kEoBBaseCharGuiStringsSt1, temp);
+	_characterGuiStringsIn = _staticres->loadStrings(kEoBBaseCharGuiStringsIn, temp);
+
+	_characterStatusStrings7 = _staticres->loadStrings(kEoBBaseCharStatusStrings7, temp);
+	_characterStatusStrings8 = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEoBBaseCharStatusStrings82 : kEoBBaseCharStatusStrings81, temp);
+	_characterStatusStrings9 = _staticres->loadStrings(kEoBBaseCharStatusStrings9, temp);
+	_characterStatusStrings12 = _staticres->loadStrings(kEoBBaseCharStatusStrings12, temp);
+	_characterStatusStrings13 = _staticres->loadStrings(_flags.gameID == GI_EOB2 ? kEoBBaseCharStatusStrings132 : kEoBBaseCharStatusStrings131, temp);
+
+	_levelGainStrings = _staticres->loadStrings(kEoBBaseLevelGainStrings, temp);
 	for (int i = 0; i < 5; i++)
-		_expRequirementTables[i] = _staticres->loadRawDataBe32(kEobBaseExperienceTable0 + i, temp);
-	_expRequirementTables[5] = _staticres->loadRawDataBe32(kEobBaseExperienceTable4, temp);
-
-	_classModifierFlags = _staticres->loadRawData(kEobBaseClassModifierFlags, temp);
-
-	_saveThrowTables[0] = _saveThrowTables[4] = _saveThrowTables[5] = _staticres->loadRawData(kEobBaseSaveThrowTable1, temp);
-	_saveThrowTables[1] = _staticres->loadRawData(kEobBaseSaveThrowTable2, temp);
-	_saveThrowTables[2] = _staticres->loadRawData(kEobBaseSaveThrowTable3, temp);
-	_saveThrowTables[3] = _staticres->loadRawData(kEobBaseSaveThrowTable4, temp);
-	_saveThrowLevelIndex = _staticres->loadRawData(kEobBaseSaveThrwLvlIndex, temp);
-	_saveThrowModDiv = _staticres->loadRawData(kEobBaseSaveThrwModDiv, temp);
-	_saveThrowModExt = _staticres->loadRawData(kEobBaseSaveThrwModExt, temp);
-
-	_encodeMonsterShpTable = _staticres->loadRawDataBe16(kEobBaseEncodeMonsterDefs, temp);
-	_npcPreset = _staticres->loadEobNpcData(kEobBaseNpcPresets, temp);
-
-	_teleporterShapeCoords = _staticres->loadRawData(kEobBaseDscTelptrShpCoords, temp);
-	_portalSeq = (const int8*)_staticres->loadRawData(kEobBasePortalSeqData, temp);
-	_mnDef = _staticres->loadRawData(kEobBaseManDef, temp);
-	_mnWord = _staticres->loadStrings(kEobBaseManWord, _mnNumWord);
-	_mnPrompt = _staticres->loadStrings(kEobBaseManPrompt, temp);
-
-	_monsterStepTable0 = (int8*) _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEobBaseMonsterStepTable02 : kEobBaseMonsterStepTable01, temp);
-	_monsterStepTable1 = (int8*)_staticres->loadRawData(kEobBaseMonsterStepTable1, temp);
-	_monsterStepTable2 = (int8*)_staticres->loadRawData(kEobBaseMonsterStepTable2, temp);
-	_monsterStepTable3 = (int8*)_staticres->loadRawData(kEobBaseMonsterStepTable3, temp);
-	_monsterCloseAttPosTable1 = _staticres->loadRawData(kEobBaseMonsterCloseAttPosTable1, temp);
-	_monsterCloseAttPosTable2 = _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEobBaseMonsterCloseAttPosTable22 : kEobBaseMonsterCloseAttPosTable21, temp);
-	_monsterCloseAttUnkTable = (int8*)_staticres->loadRawData(kEobBaseMonsterCloseAttUnkTable, temp);
-	_monsterCloseAttChkTable1 = _staticres->loadRawData(kEobBaseMonsterCloseAttChkTable1, temp);
-	_monsterCloseAttChkTable2 = _staticres->loadRawData(kEobBaseMonsterCloseAttChkTable2, temp);
-	_monsterCloseAttDstTable1 = _staticres->loadRawData(kEobBaseMonsterCloseAttDstTable1, temp);
-	_monsterCloseAttDstTable2 = _staticres->loadRawData(kEobBaseMonsterCloseAttDstTable2, temp);
-
-	_monsterProximityTable = _staticres->loadRawData(kEobBaseMonsterProximityTable, temp);
-	_findBlockMonstersTable = _staticres->loadRawData(kEobBaseFindBlockMonstersTable, temp);
-	_monsterDirChangeTable = (const int8*)_staticres->loadRawData(kEobBaseMonsterDirChangeTable, temp);
-	_monsterSpecAttStrings = _staticres->loadStrings(kEobBaseMonsterDistAttStrings, temp);
-
-	_monsterFrmOffsTable1 = (const int8*)_staticres->loadRawData(kEobBaseDscMonsterFrmOffsTbl1, temp);
-	_monsterFrmOffsTable2 = (const int8*)_staticres->loadRawData(kEobBaseDscMonsterFrmOffsTbl2, temp);
-
-	_inventorySlotsX = _staticres->loadRawDataBe16(kEobBaseInvSlotX, temp);
-	_inventorySlotsY = _staticres->loadRawData(kEobBaseInvSlotY, temp);
-	_slotValidationFlags = _staticres->loadRawDataBe16(kEobBaseSlotValidationFlags, temp);
-
-	_projectileWeaponAmmoTypes = (const int8*)_staticres->loadRawData(kEobBaseProjectileWeaponTypes, temp);
-	_wandTypes = _staticres->loadRawData(kEobBaseWandTypes, temp);
-
-	_drawObjPosIndex = _staticres->loadRawData(kEobBaseDrawObjPosIndex, temp);
-	_flightObjFlipIndex = _staticres->loadRawData(kEobBaseFlightObjFlipIndex, temp);
-	_flightObjShpMap = (const int8*)_staticres->loadRawData(kEobBaseFlightObjShpMap, temp);
-	_flightObjSclIndex = (const int8*)_staticres->loadRawData(kEobBaseFlightObjSclIndex, temp);
-
-	_wllFlagPreset = _staticres->loadRawData(kEobBaseWllFlagPreset, _wllFlagPresetSize);
-	_dscShapeCoords = (const int16*)_staticres->loadRawDataBe16(kEobBaseDscShapeCoords, temp);
-
-	_dscDoorScaleOffs = _staticres->loadRawData(kEobBaseDscDoorScaleOffs, temp);
-	_dscDoorScaleMult1 = _staticres->loadRawData(kEobBaseDscDoorScaleMult1, temp);
-	_dscDoorScaleMult2 = _staticres->loadRawData(kEobBaseDscDoorScaleMult2, temp);
-	_dscDoorScaleMult3 = _staticres->loadRawData(kEobBaseDscDoorScaleMult3, temp);
-	_dscDoorY1 = _staticres->loadRawData(kEobBaseDscDoorY1, temp);
-	_dscDoorXE = _staticres->loadRawData(kEobBaseDscDoorXE, temp);
-
-	_dscItemPosIndex= _staticres->loadRawData(kEobBaseDscItemPosIndex, temp);
-	_dscItemShpX = (const int16*)_staticres->loadRawDataBe16(kEobBaseDscItemShpX, temp);
-	_dscItemScaleIndex = _staticres->loadRawData(kEobBaseDscItemScaleIndex, temp);
-	_dscItemTileIndex = _staticres->loadRawData(kEobBaseDscItemTileIndex, temp);
-	_dscItemShapeMap = _staticres->loadRawData(kEobBaseDscItemShapeMap, temp);
-
-	_bookNumbers = _staticres->loadStrings(kEobBaseBookNumbers, temp);
-	_mageSpellList = _staticres->loadStrings(kEobBaseMageSpellsList, _mageSpellListSize);
-	_clericSpellList = _staticres->loadStrings(kEobBaseClericSpellsList, temp);
-	_spellNames = _staticres->loadStrings(kEobBaseSpellNames, temp);
-
-	_magicStrings1 = _staticres->loadStrings(kEobBaseMagicStrings1, temp);
-	_magicStrings2 = _staticres->loadStrings(kEobBaseMagicStrings2, temp);
-	_magicStrings3 = _staticres->loadStrings(kEobBaseMagicStrings3, temp);
-	_magicStrings4 = _staticres->loadStrings(kEobBaseMagicStrings4, temp);
-	_magicStrings6 = _staticres->loadStrings(kEobBaseMagicStrings6, temp);
-	_magicStrings7 = _staticres->loadStrings(kEobBaseMagicStrings7, temp);
-	_magicStrings8 = _staticres->loadStrings(kEobBaseMagicStrings8, temp);
-
-	_expObjectTlMode = _staticres->loadRawData(kEobBaseExpObjectTlMode, temp);
-	_expObjectTblIndex = _staticres->loadRawData(kEobBaseExpObjectTblIndex, temp);
-	_expObjectShpStart = _staticres->loadRawData(kEobBaseExpObjectShpStart, temp);
-	_expObjectAnimTbl1 = _staticres->loadRawData(kEobBaseExpObjectTbl1, _expObjectAnimTbl1Size);
-	_expObjectAnimTbl2 = _staticres->loadRawData(kEobBaseExpObjectTbl2, _expObjectAnimTbl2Size);
-	_expObjectAnimTbl3 = _staticres->loadRawData(kEobBaseExpObjectTbl3, _expObjectAnimTbl3Size);
-
-	_sparkEffectDefSteps = _staticres->loadRawData(kEobBaseSparkDefSteps, temp);
-	_sparkEffectDefSubSteps = _staticres->loadRawData(kEobBaseSparkDefSubSteps, temp);
-	_sparkEffectDefShift = _staticres->loadRawData(kEobBaseSparkDefShift, temp);
-	_sparkEffectDefAdd = _staticres->loadRawData(kEobBaseSparkDefAdd, temp);
-	_sparkEffectDefX = _staticres->loadRawData(kEobBaseSparkDefX, temp);
-	_sparkEffectDefY = _staticres->loadRawData(kEobBaseSparkDefY, temp);
-	_sparkEffectOfFlags1 = _staticres->loadRawDataBe32(kEobBaseSparkOfFlags1, temp);
-	_sparkEffectOfFlags2 = _staticres->loadRawDataBe32(kEobBaseSparkOfFlags2, temp);
-	_sparkEffectOfShift = _staticres->loadRawData(kEobBaseSparkOfShift, temp);
-	_sparkEffectOfX = _staticres->loadRawData(kEobBaseSparkOfX, temp);
-	_sparkEffectOfY = _staticres->loadRawData(kEobBaseSparkOfY, temp);
-	_magicFlightObjectProperties = _staticres->loadRawData(kEobBaseMagicFlightProps, temp);
-	_turnUndeadEffect = _staticres->loadRawData(kEobBaseTurnUndeadEffect, temp);
-	_burningHandsDest = _staticres->loadRawData(kEobBaseBurningHandsDest, temp);
-	_coneOfColdDest1 = (const int8*)_staticres->loadRawData(kEobBaseConeOfColdDest1, temp);
-	_coneOfColdDest2 = (const int8*)_staticres->loadRawData(kEobBaseConeOfColdDest2, temp);
-	_coneOfColdDest3 = (const int8*)_staticres->loadRawData(kEobBaseConeOfColdDest3, temp);
-	_coneOfColdDest4 = (const int8*)_staticres->loadRawData(kEobBaseConeOfColdDest4, temp);
-	_coneOfColdGfxTbl = _staticres->loadRawData(kEobBaseConeOfColdGfxTbl, _coneOfColdGfxTblSize);
+		_expRequirementTables[i] = _staticres->loadRawDataBe32(kEoBBaseExperienceTable0 + i, temp);
+	_expRequirementTables[5] = _staticres->loadRawDataBe32(kEoBBaseExperienceTable4, temp);
+
+	_classModifierFlags = _staticres->loadRawData(kEoBBaseClassModifierFlags, temp);
+
+	_saveThrowTables[0] = _saveThrowTables[4] = _saveThrowTables[5] = _staticres->loadRawData(kEoBBaseSaveThrowTable1, temp);
+	_saveThrowTables[1] = _staticres->loadRawData(kEoBBaseSaveThrowTable2, temp);
+	_saveThrowTables[2] = _staticres->loadRawData(kEoBBaseSaveThrowTable3, temp);
+	_saveThrowTables[3] = _staticres->loadRawData(kEoBBaseSaveThrowTable4, temp);
+	_saveThrowLevelIndex = _staticres->loadRawData(kEoBBaseSaveThrwLvlIndex, temp);
+	_saveThrowModDiv = _staticres->loadRawData(kEoBBaseSaveThrwModDiv, temp);
+	_saveThrowModExt = _staticres->loadRawData(kEoBBaseSaveThrwModExt, temp);
+
+	_encodeMonsterShpTable = _staticres->loadRawDataBe16(kEoBBaseEncodeMonsterDefs, temp);
+	_npcPreset = _staticres->loadEoBNpcData(kEoBBaseNpcPresets, temp);
+
+	_teleporterShapeCoords = _staticres->loadRawData(kEoBBaseDscTelptrShpCoords, temp);
+	_portalSeq = (const int8*)_staticres->loadRawData(kEoBBasePortalSeqData, temp);
+	_mnDef = _staticres->loadRawData(kEoBBaseManDef, temp);
+	_mnWord = _staticres->loadStrings(kEoBBaseManWord, _mnNumWord);
+	_mnPrompt = _staticres->loadStrings(kEoBBaseManPrompt, temp);
+
+	_monsterStepTable0 = (int8*) _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterStepTable02 : kEoBBaseMonsterStepTable01, temp);
+	_monsterStepTable1 = (int8*)_staticres->loadRawData(kEoBBaseMonsterStepTable1, temp);
+	_monsterStepTable2 = (int8*)_staticres->loadRawData(kEoBBaseMonsterStepTable2, temp);
+	_monsterStepTable3 = (int8*)_staticres->loadRawData(kEoBBaseMonsterStepTable3, temp);
+	_monsterCloseAttPosTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttPosTable1, temp);
+	_monsterCloseAttPosTable2 = _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterCloseAttPosTable22 : kEoBBaseMonsterCloseAttPosTable21, temp);
+	_monsterCloseAttUnkTable = (int8*)_staticres->loadRawData(kEoBBaseMonsterCloseAttUnkTable, temp);
+	_monsterCloseAttChkTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttChkTable1, temp);
+	_monsterCloseAttChkTable2 = _staticres->loadRawData(kEoBBaseMonsterCloseAttChkTable2, temp);
+	_monsterCloseAttDstTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttDstTable1, temp);
+	_monsterCloseAttDstTable2 = _staticres->loadRawData(kEoBBaseMonsterCloseAttDstTable2, temp);
+
+	_monsterProximityTable = _staticres->loadRawData(kEoBBaseMonsterProximityTable, temp);
+	_findBlockMonstersTable = _staticres->loadRawData(kEoBBaseFindBlockMonstersTable, temp);
+	_monsterDirChangeTable = (const int8*)_staticres->loadRawData(kEoBBaseMonsterDirChangeTable, temp);
+	_monsterSpecAttStrings = _staticres->loadStrings(kEoBBaseMonsterDistAttStrings, temp);
+
+	_monsterFrmOffsTable1 = (const int8*)_staticres->loadRawData(kEoBBaseDscMonsterFrmOffsTbl1, temp);
+	_monsterFrmOffsTable2 = (const int8*)_staticres->loadRawData(kEoBBaseDscMonsterFrmOffsTbl2, temp);
+
+	_inventorySlotsX = _staticres->loadRawDataBe16(kEoBBaseInvSlotX, temp);
+	_inventorySlotsY = _staticres->loadRawData(kEoBBaseInvSlotY, temp);
+	_slotValidationFlags = _staticres->loadRawDataBe16(kEoBBaseSlotValidationFlags, temp);
+
+	_projectileWeaponAmmoTypes = (const int8*)_staticres->loadRawData(kEoBBaseProjectileWeaponTypes, temp);
+	_wandTypes = _staticres->loadRawData(kEoBBaseWandTypes, temp);
+
+	_drawObjPosIndex = _staticres->loadRawData(kEoBBaseDrawObjPosIndex, temp);
+	_flightObjFlipIndex = _staticres->loadRawData(kEoBBaseFlightObjFlipIndex, temp);
+	_flightObjShpMap = (const int8*)_staticres->loadRawData(kEoBBaseFlightObjShpMap, temp);
+	_flightObjSclIndex = (const int8*)_staticres->loadRawData(kEoBBaseFlightObjSclIndex, temp);
+
+	_wllFlagPreset = _staticres->loadRawData(kEoBBaseWllFlagPreset, _wllFlagPresetSize);
+	_dscShapeCoords = (const int16*)_staticres->loadRawDataBe16(kEoBBaseDscShapeCoords, temp);
+
+	_dscDoorScaleOffs = _staticres->loadRawData(kEoBBaseDscDoorScaleOffs, temp);
+	_dscDoorScaleMult1 = _staticres->loadRawData(kEoBBaseDscDoorScaleMult1, temp);
+	_dscDoorScaleMult2 = _staticres->loadRawData(kEoBBaseDscDoorScaleMult2, temp);
+	_dscDoorScaleMult3 = _staticres->loadRawData(kEoBBaseDscDoorScaleMult3, temp);
+	_dscDoorY1 = _staticres->loadRawData(kEoBBaseDscDoorY1, temp);
+	_dscDoorXE = _staticres->loadRawData(kEoBBaseDscDoorXE, temp);
+
+	_dscItemPosIndex= _staticres->loadRawData(kEoBBaseDscItemPosIndex, temp);
+	_dscItemShpX = (const int16*)_staticres->loadRawDataBe16(kEoBBaseDscItemShpX, temp);
+	_dscItemScaleIndex = _staticres->loadRawData(kEoBBaseDscItemScaleIndex, temp);
+	_dscItemTileIndex = _staticres->loadRawData(kEoBBaseDscItemTileIndex, temp);
+	_dscItemShapeMap = _staticres->loadRawData(kEoBBaseDscItemShapeMap, temp);
+
+	_bookNumbers = _staticres->loadStrings(kEoBBaseBookNumbers, temp);
+	_mageSpellList = _staticres->loadStrings(kEoBBaseMageSpellsList, _mageSpellListSize);
+	_clericSpellList = _staticres->loadStrings(kEoBBaseClericSpellsList, temp);
+	_spellNames = _staticres->loadStrings(kEoBBaseSpellNames, temp);
+
+	_magicStrings1 = _staticres->loadStrings(kEoBBaseMagicStrings1, temp);
+	_magicStrings2 = _staticres->loadStrings(kEoBBaseMagicStrings2, temp);
+	_magicStrings3 = _staticres->loadStrings(kEoBBaseMagicStrings3, temp);
+	_magicStrings4 = _staticres->loadStrings(kEoBBaseMagicStrings4, temp);
+	_magicStrings6 = _staticres->loadStrings(kEoBBaseMagicStrings6, temp);
+	_magicStrings7 = _staticres->loadStrings(kEoBBaseMagicStrings7, temp);
+	_magicStrings8 = _staticres->loadStrings(kEoBBaseMagicStrings8, temp);
+
+	_expObjectTlMode = _staticres->loadRawData(kEoBBaseExpObjectTlMode, temp);
+	_expObjectTblIndex = _staticres->loadRawData(kEoBBaseExpObjectTblIndex, temp);
+	_expObjectShpStart = _staticres->loadRawData(kEoBBaseExpObjectShpStart, temp);
+	_expObjectAnimTbl1 = _staticres->loadRawData(kEoBBaseExpObjectTbl1, _expObjectAnimTbl1Size);
+	_expObjectAnimTbl2 = _staticres->loadRawData(kEoBBaseExpObjectTbl2, _expObjectAnimTbl2Size);
+	_expObjectAnimTbl3 = _staticres->loadRawData(kEoBBaseExpObjectTbl3, _expObjectAnimTbl3Size);
+
+	_sparkEffectDefSteps = _staticres->loadRawData(kEoBBaseSparkDefSteps, temp);
+	_sparkEffectDefSubSteps = _staticres->loadRawData(kEoBBaseSparkDefSubSteps, temp);
+	_sparkEffectDefShift = _staticres->loadRawData(kEoBBaseSparkDefShift, temp);
+	_sparkEffectDefAdd = _staticres->loadRawData(kEoBBaseSparkDefAdd, temp);
+	_sparkEffectDefX = _staticres->loadRawData(kEoBBaseSparkDefX, temp);
+	_sparkEffectDefY = _staticres->loadRawData(kEoBBaseSparkDefY, temp);
+	_sparkEffectOfFlags1 = _staticres->loadRawDataBe32(kEoBBaseSparkOfFlags1, temp);
+	_sparkEffectOfFlags2 = _staticres->loadRawDataBe32(kEoBBaseSparkOfFlags2, temp);
+	_sparkEffectOfShift = _staticres->loadRawData(kEoBBaseSparkOfShift, temp);
+	_sparkEffectOfX = _staticres->loadRawData(kEoBBaseSparkOfX, temp);
+	_sparkEffectOfY = _staticres->loadRawData(kEoBBaseSparkOfY, temp);
+	_magicFlightObjectProperties = _staticres->loadRawData(kEoBBaseMagicFlightProps, temp);
+	_turnUndeadEffect = _staticres->loadRawData(kEoBBaseTurnUndeadEffect, temp);
+	_burningHandsDest = _staticres->loadRawData(kEoBBaseBurningHandsDest, temp);
+	_coneOfColdDest1 = (const int8*)_staticres->loadRawData(kEoBBaseConeOfColdDest1, temp);
+	_coneOfColdDest2 = (const int8*)_staticres->loadRawData(kEoBBaseConeOfColdDest2, temp);
+	_coneOfColdDest3 = (const int8*)_staticres->loadRawData(kEoBBaseConeOfColdDest3, temp);
+	_coneOfColdDest4 = (const int8*)_staticres->loadRawData(kEoBBaseConeOfColdDest4, temp);
+	_coneOfColdGfxTbl = _staticres->loadRawData(kEoBBaseConeOfColdGfxTbl, _coneOfColdGfxTblSize);
 
 	// Hard code the following strings, since EOB I doesn't have them in the original.
 	// EOB I doesn't have load and save menus, because there is only one single
@@ -485,8 +485,8 @@ void EobCoreEngine::initStaticResource() {
 	_menuOkString = "OK";
 }
 
-void EobCoreEngine::initButtonData() {
-	static const EobGuiButtonDef buttonDefs[] = {
+void EoBCoreEngine::initButtonData() {
+	static const EoBGuiButtonDef buttonDefs[] = {
 		{ 112, 0, 0x1100, 184, 2, 63, 50, 0 },
 		{ 113, 0, 0x1100, 256, 2, 63, 50, 1 },
 		{ 114, 0, 0x1100, 184, 54, 63, 50, 2 },
@@ -596,7 +596,7 @@ void EobCoreEngine::initButtonData() {
 	_buttonCallbacks.clear();
 	_buttonCallbacks.reserve(ARRAYSIZE(buttonDefs));
 
-#define EOB_CBN(x, y) _buttonCallbacks.push_back(BUTTON_FUNCTOR(EobCoreEngine, this, &EobCoreEngine::y)); for (int l = 0; l < (x - 1); l++) { _buttonCallbacks.push_back(_buttonCallbacks[_buttonCallbacks.size() - 1 - l]); }
+#define EOB_CBN(x, y) _buttonCallbacks.push_back(BUTTON_FUNCTOR(EoBCoreEngine, this, &EoBCoreEngine::y)); for (int l = 0; l < (x - 1); l++) { _buttonCallbacks.push_back(_buttonCallbacks[_buttonCallbacks.size() - 1 - l]); }
 #define EOB_CBI(x, y) for (int l = x; l; l--) { _buttonCallbacks.push_back(_buttonCallbacks[y]); }
 	EOB_CBN(4, clickedCharPortraitDefault);
 	EOB_CBN(1, clickedCamp);
@@ -640,8 +640,8 @@ void EobCoreEngine::initButtonData() {
 #undef EOB_CBN
 }
 
-void EobCoreEngine::initMenus() {
-	static const EobMenuButtonDef buttonDefs[] = {
+void EoBCoreEngine::initMenus() {
+	static const EoBMenuButtonDef buttonDefs[] = {
 		{  2,   12,  20, 158,  14,  20,  3  },
 		{  3,   12,  37, 158,  14,  52,  3  },
 		{  4,   12,  54, 158,  14,  26,  3  },
@@ -691,7 +691,7 @@ void EobCoreEngine::initMenus() {
 
 	_menuButtonDefs = buttonDefs;
 
-	static const EobMenuDef menuDefs[] = {
+	static const EoBMenuDef menuDefs[] = {
 		{  1, 10,  0, 7,  9 },
 		{  1, 10,  7, 5,  9 },
 		{  1, 10, 12, 3,  9 },
@@ -702,7 +702,7 @@ void EobCoreEngine::initMenus() {
 	};
 
 	delete[] _menuDefs;
-	_menuDefs = new EobMenuDef[ARRAYSIZE(menuDefs)];
+	_menuDefs = new EoBMenuDef[ARRAYSIZE(menuDefs)];
 	memcpy(_menuDefs, menuDefs, sizeof(menuDefs));
 
 	if (_flags.gameID == GI_EOB1) {
@@ -713,7 +713,7 @@ void EobCoreEngine::initMenus() {
 }
 
 
-void EobCoreEngine::initSpells() {
+void EoBCoreEngine::initSpells() {
 #define mpn magicTimingParaAssign.push_back(0);
 #define mp1n if (_flags.gameID == GI_EOB1) magicTimingParaAssign.push_back(0);
 #define mp2n if (_flags.gameID == GI_EOB2) magicTimingParaAssign.push_back(0);
@@ -721,12 +721,12 @@ void EobCoreEngine::initSpells() {
 #define mp1(x) if (_flags.gameID == GI_EOB1) magicTimingParaAssign.push_back(&magicTimingPara[x << 2]);
 #define mp2(x) if (_flags.gameID == GI_EOB2) magicTimingParaAssign.push_back(&magicTimingPara[x << 2]);
 
-#define sc(x) startCallback.push_back(&EobCoreEngine::spellCallback_start_##x);
-#define sc1(x) if (_flags.gameID == GI_EOB1) startCallback.push_back(&EobCoreEngine::spellCallback_start_##x);
-#define sc2(x) if (_flags.gameID == GI_EOB2) startCallback.push_back(&EobCoreEngine::spellCallback_start_##x);
-#define ec(x) endCallback.push_back(&EobCoreEngine::spellCallback_end_##x);
-#define ec1(x) if (_flags.gameID == GI_EOB1) endCallback.push_back(&EobCoreEngine::spellCallback_end_##x);
-#define ec2(x) if (_flags.gameID == GI_EOB2) endCallback.push_back(&EobCoreEngine::spellCallback_end_##x);
+#define sc(x) startCallback.push_back(&EoBCoreEngine::spellCallback_start_##x);
+#define sc1(x) if (_flags.gameID == GI_EOB1) startCallback.push_back(&EoBCoreEngine::spellCallback_start_##x);
+#define sc2(x) if (_flags.gameID == GI_EOB2) startCallback.push_back(&EoBCoreEngine::spellCallback_start_##x);
+#define ec(x) endCallback.push_back(&EoBCoreEngine::spellCallback_end_##x);
+#define ec1(x) if (_flags.gameID == GI_EOB1) endCallback.push_back(&EoBCoreEngine::spellCallback_end_##x);
+#define ec2(x) if (_flags.gameID == GI_EOB2) endCallback.push_back(&EoBCoreEngine::spellCallback_end_##x);
 
 	static const uint16 magicTimingPara[] = {
 		0, 546, 2, 1, // 0 detect magic
@@ -979,13 +979,13 @@ void EobCoreEngine::initSpells() {
 	ec2(monster_causeCriticalWounds);
 	ec2(monster_fleshToStone);
 
-	_spells = new EobSpell[_numSpells];
-	memset(_spells, 0, _numSpells * sizeof(EobSpell));
+	_spells = new EoBSpell[_numSpells];
+	memset(_spells, 0, _numSpells * sizeof(EoBSpell));
 
 	for (int i = 0, n = 0; i < _numSpells; i++, n++) {
-		EobSpell *s = &_spells[i];
+		EoBSpell *s = &_spells[i];
 
-		// Fix Eob 1 spell names
+		// Fix EoB 1 spell names
 		bool skip = false;
 		if (i == 5 || i == 9) {
 			n--;
@@ -1018,67 +1018,67 @@ void EobCoreEngine::initSpells() {
 #undef ec2
 }
 
-void EobEngine::initStaticResource() {
+void EoBEngine::initStaticResource() {
 	int temp;
-	_mainMenuStrings = _staticres->loadStrings(kEob1MainMenuStrings, temp);
-	_finBonusStrings = _staticres->loadStrings(kEob1BonusStrings, temp);
-
-	_introFilesOpening = _staticres->loadStrings(kEob1IntroFilesOpening, temp);
-	_introFilesTower = _staticres->loadStrings(kEob1IntroFilesTower, temp);
-	_introFilesOrb = _staticres->loadStrings(kEob1IntroFilesOrb, temp);
-	_introFilesWdEntry = _staticres->loadStrings(kEob1IntroFilesWdEntry, temp);
-	_introFilesKing = _staticres->loadStrings(kEob1IntroFilesKing, temp);
-	_introFilesHands = _staticres->loadStrings(kEob1IntroFilesHands, temp);
-	_introFilesWdExit = _staticres->loadStrings(kEob1IntroFilesWdExit, temp);
-	_introFilesTunnel = _staticres->loadStrings(kEob1IntroFilesTunnel, temp);
-	_introOpeningFrmDelay = _staticres->loadRawData(kEob1IntroOpeningFrmDelay, temp);
-	_introWdEncodeX = _staticres->loadRawData(kEob1IntroWdEncodeX, temp);
-	_introWdEncodeY = _staticres->loadRawData(kEob1IntroWdEncodeY, temp);
-	_introWdEncodeWH = _staticres->loadRawData(kEob1IntroWdEncodeWH, temp);
-	_introWdDsX = _staticres->loadRawDataBe16(kEob1IntroWdDsX, temp);
-	_introWdDsY = _staticres->loadRawData(kEob1IntroWdDsY, temp);
-	_introTvlX1 = _staticres->loadRawData(kEob1IntroTvlX1, temp);
-	_introTvlY1 = _staticres->loadRawData(kEob1IntroTvlY1, temp);
-	_introTvlX2 = _staticres->loadRawData(kEob1IntroTvlX2, temp);
-	_introTvlY2 = _staticres->loadRawData(kEob1IntroTvlY2, temp);
-	_introTvlW = _staticres->loadRawData(kEob1IntroTvlW, temp);
-	_introTvlH = _staticres->loadRawData(kEob1IntroTvlH, temp);
-
-	_doorShapeEncodeDefs = _staticres->loadRawData(kEob1DoorShapeDefs, temp);
-	_doorSwitchShapeEncodeDefs = _staticres->loadRawData(kEob1DoorSwitchShapeDefs, temp);
-	_doorSwitchCoords = _staticres->loadRawData(kEob1DoorSwitchCoords, temp);
-
-	_dscDoorScaleMult4 = _staticres->loadRawData(kEobBaseDscDoorScaleMult4, temp);
-	_dscDoorScaleMult5 = _staticres->loadRawData(kEobBaseDscDoorScaleMult5, temp);
-	_dscDoorScaleMult6 = _staticres->loadRawData(kEobBaseDscDoorScaleMult6, temp);
-	_dscDoorY3 = _staticres->loadRawData(kEobBaseDscDoorY3, temp);
-	_dscDoorY4 = _staticres->loadRawData(kEobBaseDscDoorY4, temp);
-	_dscDoorY5 = _staticres->loadRawData(kEobBaseDscDoorY5, temp);
-	_dscDoorY6 = _staticres->loadRawData(kEobBaseDscDoorY6, temp);
-	_dscDoorY7 = _staticres->loadRawData(kEobBaseDscDoorY7, temp);
-	_dscDoorCoordsExt = (const int16*)_staticres->loadRawDataBe16(kEobBaseDscDoorCoordsExt, temp);
-
-	_enemyMageSpellList = _staticres->loadRawData(kEob1EnemyMageSpellList, temp);
-	_enemyMageSfx = _staticres->loadRawData(kEob1EnemyMageSfx, temp);
-	_beholderSpellList = _staticres->loadRawData(kEob1BeholderSpellList, temp);
-	_beholderSfx = _staticres->loadRawData(kEob1BeholderSfx, temp);
-
-	_turnUndeadString = _staticres->loadStrings(kEob1TurnUndeadString, temp);
-
-	_npcShpData = _staticres->loadRawData(kEob1NpcShpData, temp);
-	_npcSubShpIndex1 = _staticres->loadRawData(kEob1NpcSubShpIndex1, temp);
-	_npcSubShpIndex2 = _staticres->loadRawData(kEob1NpcSubShpIndex2, temp);
-	_npcSubShpY = _staticres->loadRawData(kEob1NpcSubShpY, temp);
+	_mainMenuStrings = _staticres->loadStrings(kEoB1MainMenuStrings, temp);
+	_finBonusStrings = _staticres->loadStrings(kEoB1BonusStrings, temp);
+
+	_introFilesOpening = _staticres->loadStrings(kEoB1IntroFilesOpening, temp);
+	_introFilesTower = _staticres->loadStrings(kEoB1IntroFilesTower, temp);
+	_introFilesOrb = _staticres->loadStrings(kEoB1IntroFilesOrb, temp);
+	_introFilesWdEntry = _staticres->loadStrings(kEoB1IntroFilesWdEntry, temp);
+	_introFilesKing = _staticres->loadStrings(kEoB1IntroFilesKing, temp);
+	_introFilesHands = _staticres->loadStrings(kEoB1IntroFilesHands, temp);
+	_introFilesWdExit = _staticres->loadStrings(kEoB1IntroFilesWdExit, temp);
+	_introFilesTunnel = _staticres->loadStrings(kEoB1IntroFilesTunnel, temp);
+	_introOpeningFrmDelay = _staticres->loadRawData(kEoB1IntroOpeningFrmDelay, temp);
+	_introWdEncodeX = _staticres->loadRawData(kEoB1IntroWdEncodeX, temp);
+	_introWdEncodeY = _staticres->loadRawData(kEoB1IntroWdEncodeY, temp);
+	_introWdEncodeWH = _staticres->loadRawData(kEoB1IntroWdEncodeWH, temp);
+	_introWdDsX = _staticres->loadRawDataBe16(kEoB1IntroWdDsX, temp);
+	_introWdDsY = _staticres->loadRawData(kEoB1IntroWdDsY, temp);
+	_introTvlX1 = _staticres->loadRawData(kEoB1IntroTvlX1, temp);
+	_introTvlY1 = _staticres->loadRawData(kEoB1IntroTvlY1, temp);
+	_introTvlX2 = _staticres->loadRawData(kEoB1IntroTvlX2, temp);
+	_introTvlY2 = _staticres->loadRawData(kEoB1IntroTvlY2, temp);
+	_introTvlW = _staticres->loadRawData(kEoB1IntroTvlW, temp);
+	_introTvlH = _staticres->loadRawData(kEoB1IntroTvlH, temp);
+
+	_doorShapeEncodeDefs = _staticres->loadRawData(kEoB1DoorShapeDefs, temp);
+	_doorSwitchShapeEncodeDefs = _staticres->loadRawData(kEoB1DoorSwitchShapeDefs, temp);
+	_doorSwitchCoords = _staticres->loadRawData(kEoB1DoorSwitchCoords, temp);
+
+	_dscDoorScaleMult4 = _staticres->loadRawData(kEoBBaseDscDoorScaleMult4, temp);
+	_dscDoorScaleMult5 = _staticres->loadRawData(kEoBBaseDscDoorScaleMult5, temp);
+	_dscDoorScaleMult6 = _staticres->loadRawData(kEoBBaseDscDoorScaleMult6, temp);
+	_dscDoorY3 = _staticres->loadRawData(kEoBBaseDscDoorY3, temp);
+	_dscDoorY4 = _staticres->loadRawData(kEoBBaseDscDoorY4, temp);
+	_dscDoorY5 = _staticres->loadRawData(kEoBBaseDscDoorY5, temp);
+	_dscDoorY6 = _staticres->loadRawData(kEoBBaseDscDoorY6, temp);
+	_dscDoorY7 = _staticres->loadRawData(kEoBBaseDscDoorY7, temp);
+	_dscDoorCoordsExt = (const int16*)_staticres->loadRawDataBe16(kEoBBaseDscDoorCoordsExt, temp);
+
+	_enemyMageSpellList = _staticres->loadRawData(kEoB1EnemyMageSpellList, temp);
+	_enemyMageSfx = _staticres->loadRawData(kEoB1EnemyMageSfx, temp);
+	_beholderSpellList = _staticres->loadRawData(kEoB1BeholderSpellList, temp);
+	_beholderSfx = _staticres->loadRawData(kEoB1BeholderSfx, temp);
+
+	_turnUndeadString = _staticres->loadStrings(kEoB1TurnUndeadString, temp);
+
+	_npcShpData = _staticres->loadRawData(kEoB1NpcShpData, temp);
+	_npcSubShpIndex1 = _staticres->loadRawData(kEoB1NpcSubShpIndex1, temp);
+	_npcSubShpIndex2 = _staticres->loadRawData(kEoB1NpcSubShpIndex2, temp);
+	_npcSubShpY = _staticres->loadRawData(kEoB1NpcSubShpY, temp);
 	for (int i = 0; i < 11; i++)
-		_npcStrings[i] = _staticres->loadStrings(kEob1Npc0Strings + i, temp);
+		_npcStrings[i] = _staticres->loadStrings(kEoB1Npc0Strings + i, temp);
 
-	const uint8 *ps = _staticres->loadRawData(kEob1MonsterProperties, temp);
+	const uint8 *ps = _staticres->loadRawData(kEoB1MonsterProperties, temp);
 	temp /= 27;
-	_monsterProps = new EobMonsterProperty[temp];
-	memset(_monsterProps, 0, temp * sizeof(EobMonsterProperty));
+	_monsterProps = new EoBMonsterProperty[temp];
+	memset(_monsterProps, 0, temp * sizeof(EoBMonsterProperty));
 	// Convert EOB1 (hard coded) monster properties to EOB2 type monster properties.
 	for (int i = 0; i < temp; i++) {
-		EobMonsterProperty *p = &_monsterProps[i];
+		EoBMonsterProperty *p = &_monsterProps[i];
 		p->armorClass = (int8)*ps++;
 		p->hitChance = (int8)*ps++;
 		p->level = (int8)*ps++;
@@ -1109,8 +1109,8 @@ void EobEngine::initStaticResource() {
 	}
 }
 
-void EobEngine::initSpells() {
-	EobCoreEngine::initSpells();
+void EoBEngine::initSpells() {
+	EoBCoreEngine::initSpells();
 
 	struct FlagTableEntry {
 		uint16 typeFlag;
@@ -1175,11 +1175,11 @@ void EobEngine::initSpells() {
 	};
 
 	int temp;
-	const uint8 *src = _staticres->loadRawData(kEobBaseSpellProperties, temp);
+	const uint8 *src = _staticres->loadRawData(kEoBBaseSpellProperties, temp);
 	_clericSpellOffset -= 1;
 
 	for (int i = 0; i < _numSpells; i++) {
-		EobSpell *s = &_spells[i];
+		EoBSpell *s = &_spells[i];
 		src += 4;
 		s->flags = flagTable[i].typeFlag;
 		s->damageFlags = flagTable[i].damageFlag;
@@ -1191,66 +1191,66 @@ void EobEngine::initSpells() {
 
 void DarkMoonEngine::initStaticResource() {
 	int temp;
-	_mainMenuStrings = _staticres->loadStrings(kEob2MainMenuStrings, temp);
-	_transferConvertTable = _staticres->loadRawData(kEob2TransferConvertTable, temp);
-	_transferExpTable = _staticres->loadRawDataBe32(kEob2TransferExpTable, temp);
+	_mainMenuStrings = _staticres->loadStrings(kEoB2MainMenuStrings, temp);
+	_transferConvertTable = _staticres->loadRawData(kEoB2TransferConvertTable, temp);
+	_transferExpTable = _staticres->loadRawDataBe32(kEoB2TransferExpTable, temp);
 
-	_introStrings = _staticres->loadStrings(kEob2IntroStrings, temp);
-	_cpsFilesIntro = _staticres->loadStrings(kEob2IntroCPSFiles, temp);
+	_introStrings = _staticres->loadStrings(kEoB2IntroStrings, temp);
+	_cpsFilesIntro = _staticres->loadStrings(kEoB2IntroCPSFiles, temp);
 
-	_seqIntro = new const EobSequenceStep*[44];
+	_seqIntro = new const EoBSequenceStep*[44];
 	for (int i = 0; i < 44; i++)
-		_seqIntro[i] = _staticres->loadEob2SeqData(kEob2IntroSeqData00 + i, temp);
+		_seqIntro[i] = _staticres->loadEoB2SeqData(kEoB2IntroSeqData00 + i, temp);
 
-	_shapesIntro = new const EobShapeDef*[13];
-	memset(_shapesIntro, 0, sizeof(EobShapeDef*) * 13);
- 	_shapesIntro[0] = _staticres->loadEob2ShapeData(kEob2IntroShapes00, temp);
- 	_shapesIntro[1] = _staticres->loadEob2ShapeData(kEob2IntroShapes01, temp);
- 	_shapesIntro[4] = _staticres->loadEob2ShapeData(kEob2IntroShapes04, temp);
- 	_shapesIntro[7] = _staticres->loadEob2ShapeData(kEob2IntroShapes07, temp);
+	_shapesIntro = new const EoBShapeDef*[13];
+	memset(_shapesIntro, 0, sizeof(EoBShapeDef*) * 13);
+ 	_shapesIntro[0] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes00, temp);
+ 	_shapesIntro[1] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes01, temp);
+ 	_shapesIntro[4] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes04, temp);
+ 	_shapesIntro[7] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes07, temp);
 
-	_finaleStrings = _staticres->loadStrings(kEob2FinaleStrings, temp);
-	_creditsData = _staticres->loadRawData(kEob2CreditsData, temp);
-	_cpsFilesFinale = _staticres->loadStrings(kEob2FinaleCPSFiles, temp);
+	_finaleStrings = _staticres->loadStrings(kEoB2FinaleStrings, temp);
+	_creditsData = _staticres->loadRawData(kEoB2CreditsData, temp);
+	_cpsFilesFinale = _staticres->loadStrings(kEoB2FinaleCPSFiles, temp);
 
-	_seqFinale = new const EobSequenceStep*[21];
+	_seqFinale = new const EoBSequenceStep*[21];
 	for (int i = 0; i < 21; i++)
-		_seqFinale[i] = _staticres->loadEob2SeqData(kEob2FinaleSeqData00 + i, temp);
-
-	_shapesFinale = new const EobShapeDef*[13];
-	memset(_shapesFinale, 0, sizeof(EobShapeDef*) * 13);
-	_shapesFinale[0] = _staticres->loadEob2ShapeData(kEob2FinaleShapes00, temp);
- 	_shapesFinale[3] = _staticres->loadEob2ShapeData(kEob2FinaleShapes03, temp);
- 	_shapesFinale[7] = _staticres->loadEob2ShapeData(kEob2FinaleShapes07, temp);
- 	_shapesFinale[9] = _staticres->loadEob2ShapeData(kEob2FinaleShapes09, temp);
- 	_shapesFinale[10] = _staticres->loadEob2ShapeData(kEob2FinaleShapes10, temp);
-
-	_dscDoorType5Offs = _staticres->loadRawData(kEobBaseDscDoorType5Offs, temp);
-
-	_npcShpData = _staticres->loadRawData(kEob2NpcShapeData, temp);
-	_npcStrings[0] = _staticres->loadStrings(kEob2Npc1Strings, temp);
-	_npcStrings[1] = _staticres->loadStrings(kEob2Npc2Strings, temp);
-	_monsterDustStrings = _staticres->loadStrings(kEob2MonsterDustStrings, temp);
-	_dreamSteps = (const int8*)_staticres->loadRawData(kEob2DreamSteps, temp);
-	_kheldranStrings = _staticres->loadStrings(kEob2KheldranStrings, temp);
-	_hornStrings = _staticres->loadStrings(kEob2HornStrings, temp);
-	_hornSounds = _staticres->loadRawData(kEob2HornSounds, temp);
-
-	_wallOfForceDsX = (const int16*)_staticres->loadRawDataBe16(kEob2WallOfForceDsX, temp);
-	_wallOfForceDsY = _staticres->loadRawData(kEob2WallOfForceDsY, temp);
-	_wallOfForceDsNumW = _staticres->loadRawData(kEob2WallOfForceNumW, temp);
-	_wallOfForceDsNumH = _staticres->loadRawData(kEob2WallOfForceNumH, temp);
-	_wallOfForceShpId = _staticres->loadRawData(kEob2WallOfForceShpId, temp);
+		_seqFinale[i] = _staticres->loadEoB2SeqData(kEoB2FinaleSeqData00 + i, temp);
+
+	_shapesFinale = new const EoBShapeDef*[13];
+	memset(_shapesFinale, 0, sizeof(EoBShapeDef*) * 13);
+	_shapesFinale[0] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes00, temp);
+ 	_shapesFinale[3] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes03, temp);
+ 	_shapesFinale[7] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes07, temp);
+ 	_shapesFinale[9] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes09, temp);
+ 	_shapesFinale[10] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes10, temp);
+
+	_dscDoorType5Offs = _staticres->loadRawData(kEoBBaseDscDoorType5Offs, temp);
+
+	_npcShpData = _staticres->loadRawData(kEoB2NpcShapeData, temp);
+	_npcStrings[0] = _staticres->loadStrings(kEoB2Npc1Strings, temp);
+	_npcStrings[1] = _staticres->loadStrings(kEoB2Npc2Strings, temp);
+	_monsterDustStrings = _staticres->loadStrings(kEoB2MonsterDustStrings, temp);
+	_dreamSteps = (const int8*)_staticres->loadRawData(kEoB2DreamSteps, temp);
+	_kheldranStrings = _staticres->loadStrings(kEoB2KheldranStrings, temp);
+	_hornStrings = _staticres->loadStrings(kEoB2HornStrings, temp);
+	_hornSounds = _staticres->loadRawData(kEoB2HornSounds, temp);
+
+	_wallOfForceDsX = (const int16*)_staticres->loadRawDataBe16(kEoB2WallOfForceDsX, temp);
+	_wallOfForceDsY = _staticres->loadRawData(kEoB2WallOfForceDsY, temp);
+	_wallOfForceDsNumW = _staticres->loadRawData(kEoB2WallOfForceNumW, temp);
+	_wallOfForceDsNumH = _staticres->loadRawData(kEoB2WallOfForceNumH, temp);
+	_wallOfForceShpId = _staticres->loadRawData(kEoB2WallOfForceShpId, temp);
 }
 
 void DarkMoonEngine::initSpells() {
-	EobCoreEngine::initSpells();
+	EoBCoreEngine::initSpells();
 
 	int temp;
-	const uint8 *src = _staticres->loadRawData(kEobBaseSpellProperties, temp);
+	const uint8 *src = _staticres->loadRawData(kEoBBaseSpellProperties, temp);
 
 	for (int i = 0; i < _numSpells; i++) {
-		EobSpell *s = &_spells[i];
+		EoBSpell *s = &_spells[i];
 		src += 8;
 		s->flags = READ_LE_UINT16(src);
 		src += 10;
diff --git a/engines/kyra/staticres_lol.cpp b/engines/kyra/staticres_lol.cpp
index 44b82ceb00..3faef7b981 100644
--- a/engines/kyra/staticres_lol.cpp
+++ b/engines/kyra/staticres_lol.cpp
@@ -30,23 +30,23 @@
 namespace Kyra {
 
 const LoLCharacter *StaticResource::loadCharData(int id, int &entries) {
-	return (const LoLCharacter *)getData(id, kLolCharData, entries);
+	return (const LoLCharacter *)getData(id, kLoLCharData, entries);
 }
 
 const SpellProperty *StaticResource::loadSpellData(int id, int &entries) {
-	return (const SpellProperty *)getData(id, kLolSpellData, entries);
+	return (const SpellProperty *)getData(id, kLoLSpellData, entries);
 }
 
 const CompassDef *StaticResource::loadCompassData(int id, int &entries) {
-	return (const CompassDef *)getData(id, kLolCompassData, entries);
+	return (const CompassDef *)getData(id, kLoLCompassData, entries);
 }
 
 const FlyingObjectShape *StaticResource::loadFlyingObjectData(int id, int &entries) {
-	return (const FlyingObjectShape *)getData(id, kLolFlightShpData, entries);
+	return (const FlyingObjectShape *)getData(id, kLoLFlightShpData, entries);
 }
 
 const LoLButtonDef *StaticResource::loadButtonDefs(int id, int &entries) {
-	return (const LoLButtonDef *)getData(id, kLolButtonData, entries);
+	return (const LoLButtonDef *)getData(id, kLoLButtonData, entries);
 }
 
 bool StaticResource::loadCharData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
@@ -243,78 +243,78 @@ void LoLEngine::initStaticResource() {
 		return;
 
 	int tempSize;
-	_pakFileList = _staticres->loadStrings(kLolIngamePakFiles, _pakFileListSize);
-	_charDefaults = _staticres->loadCharData(kLolCharacterDefs, _charDefaultsSize);
-	_ingameSoundIndex = (const uint16 *)_staticres->loadRawData(kLolIngameSfxIndex, tempSize);
-	_musicTrackMap = _staticres->loadRawData(kLolMusicTrackMap, tempSize);
-	_ingameGMSoundIndex = _staticres->loadRawData(kLolIngameGMSfxIndex, _ingameGMSoundIndexSize);
-	_ingameMT32SoundIndex = _staticres->loadRawData(kLolIngameMT32SfxIndex, _ingameMT32SoundIndexSize);
-	_ingamePCSpeakerSoundIndex = _staticres->loadRawData(kLolIngamePcSpkSfxIndex, _ingamePCSpeakerSoundIndexSize);
-	_spellProperties = _staticres->loadSpellData(kLolSpellProperties, tempSize);
-	_gameShapeMap = (const int8 *)_staticres->loadRawData(kLolGameShapeMap, tempSize);
-	_sceneItemOffs = (const int8 *)_staticres->loadRawData(kLolSceneItemOffs, tempSize);
-	_charInvIndex = _staticres->loadRawData(kLolCharInvIndex, tempSize);
-	_charInvDefs = _staticres->loadRawData(kLolCharInvDefs, tempSize);
-	_charDefsMan = _staticres->loadRawDataBe16(kLolCharDefsMan, tempSize);
-	_charDefsWoman = _staticres->loadRawDataBe16(kLolCharDefsWoman, tempSize);
-	_charDefsKieran = _staticres->loadRawDataBe16(kLolCharDefsKieran, tempSize);
-	_charDefsAkshel = _staticres->loadRawDataBe16(kLolCharDefsAkshel, tempSize);
-	_expRequirements = (const int32 *)_staticres->loadRawDataBe32(kLolExpRequirements, tempSize);
-	_monsterModifiers = _staticres->loadRawDataBe16(kLolMonsterModifiers, tempSize);
-	_monsterShiftOffs = (const int8 *)_staticres->loadRawData(kLolMonsterShiftOffsets, tempSize);
-	_monsterDirFlags = _staticres->loadRawData(kLolMonsterDirFlags, tempSize);
-	_monsterScaleX = _staticres->loadRawData(kLolMonsterScaleX, tempSize);
-	_monsterScaleY = _staticres->loadRawData(kLolMonsterScaleY, tempSize);
-	_monsterScaleWH = _staticres->loadRawDataBe16(kLolMonsterScaleWH, tempSize);
-	_inventorySlotDesc = _staticres->loadRawDataBe16(kLolInventoryDesc, tempSize);
-	_levelShpList = _staticres->loadStrings(kLolLevelShpList, tempSize);
-	_levelDatList = _staticres->loadStrings(kLolLevelDatList, tempSize);
-	_compassDefs = _staticres->loadCompassData(kLolCompassDefs, tempSize);
-	_flyingItemShapes = _staticres->loadFlyingObjectData(kLolFlyingObjectShp, tempSize);
-	_itemCost = _staticres->loadRawDataBe16(kLolItemPrices, tempSize);
-	_stashSetupData = _staticres->loadRawData(kLolStashSetup, tempSize);
-
-	_dscWalls = (const int8 *)_staticres->loadRawData(kLolDscWalls, tempSize);
-
-	_dscOvlMap = _staticres->loadRawData(kLolDscOvlMap, tempSize);
-	_dscShapeOvlIndex = _staticres->loadRawData(kLolDscOvlIndex, tempSize);
-	_dscShapeScaleW = _staticres->loadRawDataBe16(kLolDscScaleWidthData, tempSize);
-	_dscShapeScaleH = _staticres->loadRawDataBe16(kLolDscScaleHeightData, tempSize);
-	_dscShapeY = (const int8 *)_staticres->loadRawData(kLolBaseDscY, tempSize);
-
-	_dscDoorMonsterScaleTable = _staticres->loadRawDataBe16(kLolDscDoorScale, tempSize);
-	_dscDoor4 = _staticres->loadRawDataBe16(kLolDscDoor4, tempSize);
-	_dscDoorMonsterX = (const int16 *)_staticres->loadRawDataBe16(kLolDscDoorX, tempSize);
-	_dscDoorMonsterY = (const int16 *)_staticres->loadRawDataBe16(kLolDscDoorY, tempSize);
-
-	_scrollXTop = _staticres->loadRawData(kLolScrollXTop, tempSize);
-	_scrollYTop = _staticres->loadRawData(kLolScrollYTop, tempSize);
-	_scrollXBottom = _staticres->loadRawData(kLolScrollXBottom, tempSize);
-	_scrollYBottom = _staticres->loadRawData(kLolScrollYBottom, tempSize);
-
-	const char *const *tmpSndList = _staticres->loadStrings(kLolIngameSfxFiles, _ingameSoundListSize);
+	_pakFileList = _staticres->loadStrings(kLoLIngamePakFiles, _pakFileListSize);
+	_charDefaults = _staticres->loadCharData(kLoLCharacterDefs, _charDefaultsSize);
+	_ingameSoundIndex = (const uint16 *)_staticres->loadRawData(kLoLIngameSfxIndex, tempSize);
+	_musicTrackMap = _staticres->loadRawData(kLoLMusicTrackMap, tempSize);
+	_ingameGMSoundIndex = _staticres->loadRawData(kLoLIngameGMSfxIndex, _ingameGMSoundIndexSize);
+	_ingameMT32SoundIndex = _staticres->loadRawData(kLoLIngameMT32SfxIndex, _ingameMT32SoundIndexSize);
+	_ingamePCSpeakerSoundIndex = _staticres->loadRawData(kLoLIngamePcSpkSfxIndex, _ingamePCSpeakerSoundIndexSize);
+	_spellProperties = _staticres->loadSpellData(kLoLSpellProperties, tempSize);
+	_gameShapeMap = (const int8 *)_staticres->loadRawData(kLoLGameShapeMap, tempSize);
+	_sceneItemOffs = (const int8 *)_staticres->loadRawData(kLoLSceneItemOffs, tempSize);
+	_charInvIndex = _staticres->loadRawData(kLoLCharInvIndex, tempSize);
+	_charInvDefs = _staticres->loadRawData(kLoLCharInvDefs, tempSize);
+	_charDefsMan = _staticres->loadRawDataBe16(kLoLCharDefsMan, tempSize);
+	_charDefsWoman = _staticres->loadRawDataBe16(kLoLCharDefsWoman, tempSize);
+	_charDefsKieran = _staticres->loadRawDataBe16(kLoLCharDefsKieran, tempSize);
+	_charDefsAkshel = _staticres->loadRawDataBe16(kLoLCharDefsAkshel, tempSize);
+	_expRequirements = (const int32 *)_staticres->loadRawDataBe32(kLoLExpRequirements, tempSize);
+	_monsterModifiers = _staticres->loadRawDataBe16(kLoLMonsterModifiers, tempSize);
+	_monsterShiftOffs = (const int8 *)_staticres->loadRawData(kLoLMonsterShiftOffsets, tempSize);
+	_monsterDirFlags = _staticres->loadRawData(kLoLMonsterDirFlags, tempSize);
+	_monsterScaleX = _staticres->loadRawData(kLoLMonsterScaleX, tempSize);
+	_monsterScaleY = _staticres->loadRawData(kLoLMonsterScaleY, tempSize);
+	_monsterScaleWH = _staticres->loadRawDataBe16(kLoLMonsterScaleWH, tempSize);
+	_inventorySlotDesc = _staticres->loadRawDataBe16(kLoLInventoryDesc, tempSize);
+	_levelShpList = _staticres->loadStrings(kLoLLevelShpList, tempSize);
+	_levelDatList = _staticres->loadStrings(kLoLLevelDatList, tempSize);
+	_compassDefs = _staticres->loadCompassData(kLoLCompassDefs, tempSize);
+	_flyingItemShapes = _staticres->loadFlyingObjectData(kLoLFlyingObjectShp, tempSize);
+	_itemCost = _staticres->loadRawDataBe16(kLoLItemPrices, tempSize);
+	_stashSetupData = _staticres->loadRawData(kLoLStashSetup, tempSize);
+
+	_dscWalls = (const int8 *)_staticres->loadRawData(kLoLDscWalls, tempSize);
+
+	_dscOvlMap = _staticres->loadRawData(kLoLDscOvlMap, tempSize);
+	_dscShapeOvlIndex = _staticres->loadRawData(kLoLDscOvlIndex, tempSize);
+	_dscShapeScaleW = _staticres->loadRawDataBe16(kLoLDscScaleWidthData, tempSize);
+	_dscShapeScaleH = _staticres->loadRawDataBe16(kLoLDscScaleHeightData, tempSize);
+	_dscShapeY = (const int8 *)_staticres->loadRawData(kLoLBaseDscY, tempSize);
+
+	_dscDoorMonsterScaleTable = _staticres->loadRawDataBe16(kLoLDscDoorScale, tempSize);
+	_dscDoor4 = _staticres->loadRawDataBe16(kLoLDscDoor4, tempSize);
+	_dscDoorMonsterX = (const int16 *)_staticres->loadRawDataBe16(kLoLDscDoorX, tempSize);
+	_dscDoorMonsterY = (const int16 *)_staticres->loadRawDataBe16(kLoLDscDoorY, tempSize);
+
+	_scrollXTop = _staticres->loadRawData(kLoLScrollXTop, tempSize);
+	_scrollYTop = _staticres->loadRawData(kLoLScrollYTop, tempSize);
+	_scrollXBottom = _staticres->loadRawData(kLoLScrollXBottom, tempSize);
+	_scrollYBottom = _staticres->loadRawData(kLoLScrollYBottom, tempSize);
+
+	const char *const *tmpSndList = _staticres->loadStrings(kLoLIngameSfxFiles, _ingameSoundListSize);
 	if (tmpSndList) {
 		_ingameSoundList = new char*[_ingameSoundListSize];
 		for (int i = 0; i < _ingameSoundListSize; i++) {
 			_ingameSoundList[i] = new char[strlen(tmpSndList[i]) + 1];
 			strcpy(_ingameSoundList[i], tmpSndList[i]);
 		}
-		_staticres->unloadId(kLolIngameSfxFiles);
+		_staticres->unloadId(kLoLIngameSfxFiles);
 	}
 
-	_buttonData = _staticres->loadButtonDefs(kLolButtonDefs, tempSize);
-	_buttonList1 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList1, tempSize);
-	_buttonList2 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList2, tempSize);
-	_buttonList3 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList3, tempSize);
-	_buttonList4 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList4, tempSize);
-	_buttonList5 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList5, tempSize);
-	_buttonList6 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList6, tempSize);
-	_buttonList7 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList7, tempSize);
-	_buttonList8 = (const int16 *)_staticres->loadRawDataBe16(kLolButtonList8, tempSize);
+	_buttonData = _staticres->loadButtonDefs(kLoLButtonDefs, tempSize);
+	_buttonList1 = (const int16 *)_staticres->loadRawDataBe16(kLoLButtonList1, tempSize);
+	_buttonList2 = (const int16 *)_staticres->loadRawDataBe16(kLoLButtonList2, tempSize);
+	_buttonList3 = (const int16 *)_staticres->loadRawDataBe16(kLoLButtonList3, tempSize);
+	_buttonList4 = (const int16 *)_staticres->loadRawDataBe16(kLoLButtonList4, tempSize);
+	_buttonList5 = (const int16 *)_staticres->loadRawDataBe16(kLoLButtonList5, tempSize);
+	_buttonList6 = (const int16 *)_staticres->loadRawDataBe16(kLoLButtonList6, tempSize);
+	_buttonList7 = (const int16 *)_staticres->loadRawDataBe16(kLoLButtonList7, tempSize);
+	_buttonList8 = (const int16 *)_staticres->loadRawDataBe16(kLoLButtonList8, tempSize);
 
-	_autoMapStrings = _staticres->loadRawDataBe16(kLolMapStringId, tempSize);
+	_autoMapStrings = _staticres->loadRawDataBe16(kLoLMapStringId, tempSize);
 
-	const uint8 *tmp = _staticres->loadRawData(kLolLegendData, tempSize);
+	const uint8 *tmp = _staticres->loadRawData(kLoLLegendData, tempSize);
 	uint8 entrySize = tempSize / 12;
 	tempSize /= entrySize;
 	if (tempSize) {
@@ -326,21 +326,21 @@ void LoLEngine::initStaticResource() {
 			_defaultLegendData[i].stringId = READ_LE_UINT16(tmp);
 			tmp += 2;
 		}
-		_staticres->unloadId(kLolLegendData);
+		_staticres->unloadId(kLoLLegendData);
 	}
 
-	tmp = _staticres->loadRawData(kLolMapCursorOvl, tempSize);
+	tmp = _staticres->loadRawData(kLoLMapCursorOvl, tempSize);
 	if (tmp) {
 		_mapCursorOverlay = new uint8[tempSize];
 		memcpy(_mapCursorOverlay, tmp, tempSize);
-		_staticres->unloadId(kLolMapCursorOvl);
+		_staticres->unloadId(kLoLMapCursorOvl);
 	}
 
-	_updateSpellBookCoords = _staticres->loadRawData(kLolSpellbookCoords, tempSize);
-	_updateSpellBookAnimData = _staticres->loadRawData(kLolSpellbookAnim, tempSize);
-	_healShapeFrames = _staticres->loadRawData(kLolHealShapeFrames, tempSize);
+	_updateSpellBookCoords = _staticres->loadRawData(kLoLSpellbookCoords, tempSize);
+	_updateSpellBookAnimData = _staticres->loadRawData(kLoLSpellbookAnim, tempSize);
+	_healShapeFrames = _staticres->loadRawData(kLoLHealShapeFrames, tempSize);
 
-	tmp = _staticres->loadRawData(kLolLightningDefs, tempSize);
+	tmp = _staticres->loadRawData(kLoLLightningDefs, tempSize);
 	if (tmp) {
 		_lightningProps = new LightningProperty[5];
 		for (int i = 0; i < 5; i++) {
@@ -348,10 +348,10 @@ void LoLEngine::initStaticResource() {
 			_lightningProps[i].frameDiv = tmp[(i << 2) + 1];
 			_lightningProps[i].sfxId = READ_LE_UINT16(&tmp[(i << 2) + 2]);
 		}
-		_staticres->unloadId(kLolLightningDefs);
+		_staticres->unloadId(kLoLLightningDefs);
 	}
 
-	_fireBallCoords = (const int16*)_staticres->loadRawDataBe16(kLolFireballCoords, tempSize);
+	_fireBallCoords = (const int16*)_staticres->loadRawDataBe16(kLoLFireballCoords, tempSize);
 
 	_buttonCallbacks.clear();
 	_buttonCallbacks.reserve(95);
diff --git a/engines/kyra/staticres_rpg.cpp b/engines/kyra/staticres_rpg.cpp
index 49a55fc9b8..0dfdb381ed 100644
--- a/engines/kyra/staticres_rpg.cpp
+++ b/engines/kyra/staticres_rpg.cpp
@@ -28,11 +28,11 @@ namespace Kyra {
 
 #if defined(ENABLE_EOB) || defined(ENABLE_LOL)
 const uint16 *StaticResource::loadRawDataBe16(int id, int &entries) {
-	return (const uint16 *)getData(id, kLolRawDataBe16, entries);
+	return (const uint16 *)getData(id, kLoLRawDataBe16, entries);
 }
 
 const uint32 *StaticResource::loadRawDataBe32(int id, int &entries) {
-	return (const uint32 *)getData(id, kLolRawDataBe32, entries);
+	return (const uint32 *)getData(id, kLoLRawDataBe32, entries);
 }
 
 bool StaticResource::loadRawDataBe16(Common::SeekableReadStream &stream, void *&ptr, int &size) {
@@ -77,18 +77,18 @@ const uint8 KyraRpgEngine::_dropItemDirIndex[] = { 0, 1, 2, 3, 1, 3, 0, 2, 3, 2,
 
 void KyraRpgEngine::initStaticResource() {
 	int temp;
-	_dscShapeX = (const int16 *)_staticres->loadRawDataBe16(kLolEobCommonDscX, temp);
-	_dscShapeIndex = (const int8 *)_staticres->loadRawData(kLolEobCommonDscShapeIndex, temp);
-	_dscTileIndex = _staticres->loadRawData(kLolEobCommonDscTileIndex, temp);
-	_dscDim1 = (const int8 *)_staticres->loadRawData(kLolEobCommonDscDimData1, temp);
-	_dscDim2 = (const int8 *)_staticres->loadRawData(kLolEobCommonDscDimData2, temp);
-	_dscUnk2 = _staticres->loadRawData(kLolEobCommonDscUnk2, temp);
-	_dscBlockMap = _staticres->loadRawData(kLolEobCommonDscBlockMap, temp);
-	_dscBlockIndex = (const int8 *)_staticres->loadRawData(kLolEobCommonDscBlockIndex, temp);
-	_dscDimMap = _staticres->loadRawData(kLolEobCommonDscDimMap, temp);
-	_dscDoorShpIndex = _staticres->loadRawData(kLolEobCommonDscDoorShapeIndex, _dscDoorShpIndexSize);
-	_dscDoorY2 = _staticres->loadRawData(kLolEobCommonDscDoorY2, temp);
-	_moreStrings = _staticres->loadStrings(kLolEobCommonMoreStrings, temp);
+	_dscShapeX = (const int16 *)_staticres->loadRawDataBe16(kRpgCommonDscX, temp);
+	_dscShapeIndex = (const int8 *)_staticres->loadRawData(kRpgCommonDscShapeIndex, temp);
+	_dscTileIndex = _staticres->loadRawData(kRpgCommonDscTileIndex, temp);
+	_dscDim1 = (const int8 *)_staticres->loadRawData(kRpgCommonDscDimData1, temp);
+	_dscDim2 = (const int8 *)_staticres->loadRawData(kRpgCommonDscDimData2, temp);
+	_dscUnk2 = _staticres->loadRawData(kRpgCommonDscUnk2, temp);
+	_dscBlockMap = _staticres->loadRawData(kRpgCommonDscBlockMap, temp);
+	_dscBlockIndex = (const int8 *)_staticres->loadRawData(kRpgCommonDscBlockIndex, temp);
+	_dscDimMap = _staticres->loadRawData(kRpgCommonDscDimMap, temp);
+	_dscDoorShpIndex = _staticres->loadRawData(kRpgCommonDscDoorShapeIndex, _dscDoorShpIndexSize);
+	_dscDoorY2 = _staticres->loadRawData(kRpgCommonDscDoorY2, temp);
+	_moreStrings = _staticres->loadStrings(kRpgCommonMoreStrings, temp);
 }
 
 #endif // (ENABLE_EOB || ENABLE_LOL)
diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text_rpg.cpp
index bbc3cdbd98..1201cdcb45 100644
--- a/engines/kyra/text_rpg.cpp
+++ b/engines/kyra/text_rpg.cpp
@@ -32,15 +32,15 @@
 namespace Kyra {
 
 enum {
-	kEobTextBufferSize = 2048
+	kEoBTextBufferSize = 2048
 };
 
 TextDisplayer_rpg::TextDisplayer_rpg(KyraRpgEngine *engine, Screen *sScreen) : _vm(engine), _screen(sScreen),
 	_lineCount(0), _printFlag(false), _lineWidth(0), _numCharsTotal(0), _allowPageBreak(true),
 	_numCharsLeft(0), _numCharsPrinted(0), _sjisLineBreakFlag(false), _waitButtonMode(1) {
 
-	_dialogueBuffer = new char[kEobTextBufferSize];
-	memset(_dialogueBuffer, 0, kEobTextBufferSize);
+	_dialogueBuffer = new char[kEoBTextBufferSize];
+	memset(_dialogueBuffer, 0, kEoBTextBufferSize);
 
 	_currentLine = new char[85];
 	memset(_currentLine, 0, 85);
@@ -463,8 +463,8 @@ void TextDisplayer_rpg::printLine(char *str) {
 
 void TextDisplayer_rpg::printDialogueText(int stringId, const char *pageBreakString) {
 	const char * str = (const char *)(screen()->getCPagePtr(5) + READ_LE_UINT16(&screen()->getCPagePtr(5)[(stringId - 1) << 1]));
-	assert (strlen(str) < kEobTextBufferSize);
-	Common::strlcpy(_dialogueBuffer, str, kEobTextBufferSize);
+	assert (strlen(str) < kEoBTextBufferSize);
+	Common::strlcpy(_dialogueBuffer, str, kEoBTextBufferSize);
 
 	displayText(_dialogueBuffer);
 
@@ -478,8 +478,8 @@ void TextDisplayer_rpg::printDialogueText(int stringId, const char *pageBreakStr
 }
 
 void TextDisplayer_rpg::printDialogueText(const char *str, bool wait) {
-	assert (strlen(str) < kEobTextBufferSize);
-	Common::strlcpy(_dialogueBuffer, str, kEobTextBufferSize);
+	assert (strlen(str) < kEoBTextBufferSize);
+	Common::strlcpy(_dialogueBuffer, str, kEoBTextBufferSize);
 
 	strcpy(_dialogueBuffer, str);
 	displayText(_dialogueBuffer);
@@ -495,7 +495,7 @@ void TextDisplayer_rpg::printMessage(const char *str, int textColor, ...) {
 
 	va_list args;
 	va_start(args, textColor);
-	vsnprintf(_dialogueBuffer, kEobTextBufferSize - 1, str, args);
+	vsnprintf(_dialogueBuffer, kEoBTextBufferSize - 1, str, args);
 	va_end(args);
 
 	displayText(_dialogueBuffer);
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index b80563bd11..9cc08b9a78 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -29,9 +29,9 @@
 
 namespace Kyra {
 
-#define TimerV2(x) new Common::Functor1Mem<int, void, EobCoreEngine>(this, &EobCoreEngine::x)
+#define TimerV2(x) new Common::Functor1Mem<int, void, EoBCoreEngine>(this, &EoBCoreEngine::x)
 
-void EobCoreEngine::setupTimers() {
+void EoBCoreEngine::setupTimers() {
 	_timer->addTimer(0, TimerV2(timerProcessCharacterExchange), 9, false);
 	_timer->addTimer(1, TimerV2(timerProcessFlyingObjects), 3, true);
 	_timer->addTimer(0x20, TimerV2(timerProcessMonsters), 20, true);
@@ -55,10 +55,10 @@ void EobCoreEngine::setupTimers() {
 	_timer->resetNextRun();
 }
 
-void EobCoreEngine::setCharEventTimer(int charIndex, uint32 countdown, int evnt, int updateExistingTimer) {
+void EoBCoreEngine::setCharEventTimer(int charIndex, uint32 countdown, int evnt, int updateExistingTimer) {
 	uint32 ntime = _system->getMillis() + countdown * _tickLength;
 	uint8 timerId = 0x30 | (charIndex & 0x0f);
-	EobCharacter *c = &_characters[charIndex];
+	EoBCharacter *c = &_characters[charIndex];
 
 	if (!_timer->isEnabled(timerId)) {
 		c->timers[0] = ntime;
@@ -101,8 +101,8 @@ void EobCoreEngine::setCharEventTimer(int charIndex, uint32 countdown, int evnt,
 	}
 }
 
-void EobCoreEngine::deleteCharEventTimer(int charIndex, int evnt) {
-	EobCharacter *c = &_characters[charIndex];
+void EoBCoreEngine::deleteCharEventTimer(int charIndex, int evnt) {
+	EoBCharacter *c = &_characters[charIndex];
 	for (int i = 0; i < 10; i++) {
 		if (c->events[i] == evnt) {
 			c->events[i] = 0;
@@ -112,9 +112,9 @@ void EobCoreEngine::deleteCharEventTimer(int charIndex, int evnt) {
 	setupCharacterTimers();
 }
 
-void EobCoreEngine::setupCharacterTimers() {
+void EoBCoreEngine::setupCharacterTimers() {
 	for (int i = 0; i < 6; i++) {
-		EobCharacter *c = &_characters[i];
+		EoBCharacter *c = &_characters[i];
 		if (!testCharacter(i, 1))
 			continue;
 
@@ -136,10 +136,10 @@ void EobCoreEngine::setupCharacterTimers() {
 	_timer->resetNextRun();
 }
 
-void EobCoreEngine::advanceTimers(uint32 millis) {
+void EoBCoreEngine::advanceTimers(uint32 millis) {
 	uint32 ct = _system->getMillis();
 	for (int i = 0; i < 6; i++) {
-		EobCharacter *c = &_characters[i];
+		EoBCharacter *c = &_characters[i];
 		for (int ii = 0; ii < 10; ii++) {
 			if (c->timers[ii] > ct) {
 				uint32 chrt = c->timers[ii] - ct;
@@ -167,7 +167,7 @@ void EobCoreEngine::advanceTimers(uint32 millis) {
 	}
 }
 
-void EobCoreEngine::timerProcessCharacterExchange(int timerNum) {
+void EoBCoreEngine::timerProcessCharacterExchange(int timerNum) {
 	_charExchangeSwap ^= 1;
 	if (_charExchangeSwap) {
 		int index = _exchangeCharacterId;
@@ -179,10 +179,10 @@ void EobCoreEngine::timerProcessCharacterExchange(int timerNum) {
 	}
 }
 
-void EobCoreEngine::timerProcessFlyingObjects(int timerNum) {
+void EoBCoreEngine::timerProcessFlyingObjects(int timerNum) {
 	static const uint8 dirPosIndex[] = { 0x82, 0x83, 0x00, 0x01, 0x01, 0x80, 0x03, 0x82, 0x02, 0x03, 0x80, 0x81, 0x81, 0x00, 0x83, 0x02 };
 	for (int i = 0; i < 10; i++) {
-		EobFlyingObject *fo = &_flyingObjects[i];
+		EoBFlyingObject *fo = &_flyingObjects[i];
 		if (!fo->enable)
 			continue;
 
@@ -218,13 +218,13 @@ void EobCoreEngine::timerProcessFlyingObjects(int timerNum) {
 	}
 }
 
-void EobCoreEngine::timerProcessMonsters(int timerNum) {
+void EoBCoreEngine::timerProcessMonsters(int timerNum) {
 	updateMonsters(timerNum & 0x0f);
 }
 
-void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
+void EoBCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
 	int charIndex = timerNum & 0x0f;
-	EobCharacter *c = &_characters[charIndex];
+	EoBCharacter *c = &_characters[charIndex];
 	uint32 ctime =  _system->getMillis();
 
 	for (int i = 0; i < 10; i++) {
@@ -321,7 +321,7 @@ void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) {
 		_timer->setCountdown(timerNum, (nextTimer - ctime) / _tickLength);
 }
 
-void EobCoreEngine::timerUpdateTeleporters(int timerNum) {
+void EoBCoreEngine::timerUpdateTeleporters(int timerNum) {
 	_teleporterPulse ^= 1;
 	for (int i = 0; i < 18; i++) {
 		uint8 w = _visibleBlocks[i]->walls[_sceneDrawVarDown];
@@ -332,12 +332,12 @@ void EobCoreEngine::timerUpdateTeleporters(int timerNum) {
 	}
 }
 
-void EobCoreEngine::timerUpdateFoodStatus(int timerNum) {
+void EoBCoreEngine::timerUpdateFoodStatus(int timerNum) {
 	for (int i = 0; i < 6; i++) {
 		// Ring of Sustenance check
 		if (checkInventoryForRings(i, 2))
 			continue;
-		EobCharacter *c = &_characters[i];
+		EoBCharacter *c = &_characters[i];
 		if (c->food != 0 && c->flags & 1 && c->hitPointsCur > -10) {
 			c->food--;
 			gui_drawFoodStatusGraph(i);
@@ -345,9 +345,9 @@ void EobCoreEngine::timerUpdateFoodStatus(int timerNum) {
 	}
 }
 
-void EobCoreEngine::timerUpdateMonsterIdleAnim(int timerNum) {
+void EoBCoreEngine::timerUpdateMonsterIdleAnim(int timerNum) {
 	for (int i = 0; i < 18; i++) {
-		EobMonsterInPlay *m = &_monsters[i];
+		EoBMonsterInPlay *m = &_monsters[i];
 		if (m->mode == 7 || m->mode == 10 || (m->flags & 0x20) || (rollDice(1, 2, 0) != 1))
 			continue;
 		m->idleAnimState = (rollDice(1, 2, 0) << 4) | rollDice(1, 2, 0);
-- 
cgit v1.2.3


From 8716ed1703f55b4c0e33a87cf40b65d06151c641 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 12 Dec 2011 20:03:35 +0100
Subject: KYRA: (EOB/LOL) - again fix static resource loading for EOB when LOL
 is disabled

---
 engines/kyra/resource.h        |  4 ++--
 engines/kyra/staticres.cpp     | 17 ++++++++++-------
 engines/kyra/staticres_rpg.cpp |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index f5d70e084c..30cf17dc1a 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -841,8 +841,8 @@ private:
 		kLoLCompassData = 10,
 		kLoLFlightShpData = 11,
 		kLoLButtonData = 12,
-		kLoLRawDataBe16 = 13,
-		kLoLRawDataBe32 = 14,
+		kRawDataBe16 = 13,
+		kRawDataBe32 = 14,
 
 		kEoB2SequenceData = 15,
 		kEoB2ShapeData = 16,
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 888b515fd9..cd49b03b53 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -254,24 +254,27 @@ bool StaticResource::init() {
 		{ kLoLSpellData, proc(loadSpellData), proc(freeSpellData) },
 		{ kLoLCompassData, proc(loadCompassData), proc(freeCompassData) },
 		{ kLoLFlightShpData, proc(loadFlyingObjectData), proc(freeFlyingObjectData) },
-		{ kLoLRawDataBe16, proc(loadRawDataBe16), proc(freeRawDataBe16) },
-		{ kLoLRawDataBe32, proc(loadRawDataBe32), proc(freeRawDataBe32) },
-		{ kLoLButtonData, proc(loadButtonDefs), proc(freeButtonDefs) },
 #else
 		{ kLoLCharData, proc(loadDummy), proc(freeDummy) },
 		{ kLoLSpellData, proc(loadDummy), proc(freeDummy) },
 		{ kLoLCompassData, proc(loadDummy), proc(freeDummy) },
 		{ kLoLFlightShpData, proc(loadDummy), proc(freeDummy) },
-		{ kLoLRawDataBe16, proc(loadDummy), proc(freeDummy) },
-		{ kLoLRawDataBe32, proc(loadDummy), proc(freeDummy) },
+#endif
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+		{ kRawDataBe16, proc(loadRawDataBe16), proc(freeRawDataBe16) },
+		{ kRawDataBe32, proc(loadRawDataBe32), proc(freeRawDataBe32) },
+#endif
+#ifdef ENABLE_LOL
+		{ kLoLButtonData, proc(loadButtonDefs), proc(freeButtonDefs) },
+#else
 		{ kLoLButtonData, proc(loadDummy), proc(freeDummy) },
-#endif // ENABLE_LOL
+#endif
 
 #ifdef ENABLE_EOB
 		{ kEoB2SequenceData, proc(loadEoB2SeqData), proc(freeEoB2SeqData) },
 		{ kEoB2ShapeData, proc(loadEoB2ShapeData), proc(freeEoB2ShapeData) },
 		{ kEoBNpcData, proc(loadEoBNpcData), proc(freeEoBNpcData) },
-#endif // ENABLE_EOB
+#endif
 
 		{ 0, 0, 0 }
 	};
diff --git a/engines/kyra/staticres_rpg.cpp b/engines/kyra/staticres_rpg.cpp
index 0dfdb381ed..efee3bed78 100644
--- a/engines/kyra/staticres_rpg.cpp
+++ b/engines/kyra/staticres_rpg.cpp
@@ -28,11 +28,11 @@ namespace Kyra {
 
 #if defined(ENABLE_EOB) || defined(ENABLE_LOL)
 const uint16 *StaticResource::loadRawDataBe16(int id, int &entries) {
-	return (const uint16 *)getData(id, kLoLRawDataBe16, entries);
+	return (const uint16 *)getData(id, kRawDataBe16, entries);
 }
 
 const uint32 *StaticResource::loadRawDataBe32(int id, int &entries) {
-	return (const uint32 *)getData(id, kLoLRawDataBe32, entries);
+	return (const uint32 *)getData(id, kRawDataBe32, entries);
 }
 
 bool StaticResource::loadRawDataBe16(Common::SeekableReadStream &stream, void *&ptr, int &size) {
-- 
cgit v1.2.3


From 60330556ff5bf319db7815e6f3c635bc98edecc5 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sat, 17 Dec 2011 22:39:11 +0100
Subject: KYRA: (EOB/LOL) - move eob/lol specific screen code to new class

---
 engines/kyra/eobcommon.h    |   1 +
 engines/kyra/kyra_rpg.h     |   1 +
 engines/kyra/lol.cpp        |   4 ++
 engines/kyra/lol.h          |   1 +
 engines/kyra/module.mk      |   1 +
 engines/kyra/scene_rpg.cpp  |   5 +-
 engines/kyra/screen.h       |   2 -
 engines/kyra/screen_eob.cpp |  36 +------------
 engines/kyra/screen_eob.h   |  11 +---
 engines/kyra/screen_hof.cpp |   2 +-
 engines/kyra/screen_lol.cpp |  41 +-------------
 engines/kyra/screen_lol.h   |  12 +----
 engines/kyra/screen_mr.cpp  |   2 +-
 engines/kyra/screen_rpg.cpp | 126 ++++++++++++++++++++++++++++++++++++++++++++
 engines/kyra/screen_rpg.h   |  61 +++++++++++++++++++++
 engines/kyra/screen_v2.h    |   2 +-
 engines/kyra/text_lol.cpp   |   4 +-
 engines/kyra/text_lol.h     |   2 +-
 engines/kyra/text_rpg.cpp   |  48 ++++++++---------
 engines/kyra/text_rpg.h     |   8 +--
 20 files changed, 238 insertions(+), 132 deletions(-)
 create mode 100644 engines/kyra/screen_rpg.cpp
 create mode 100644 engines/kyra/screen_rpg.h

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 77a8198abd..18fe893d80 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -250,6 +250,7 @@ public:
 	virtual ~EoBCoreEngine();
 
 	Screen *screen() { return _screen; }
+	Screen_Rpg *screen_rpg() { return _screen; }
 	GUI *gui() const { return _gui; }
 
 protected:
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index 31fb9bc8d7..5d217b6f28 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -87,6 +87,7 @@ public:
 	virtual ~KyraRpgEngine();
 
 	virtual Screen *screen() = 0;
+	virtual Screen_Rpg *screen_rpg() = 0;
 	virtual GUI *gui() const = 0;
 
 protected:
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 01b1bdf065..d90b5c9523 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -361,6 +361,10 @@ Screen *LoLEngine::screen() {
 	return _screen;
 }
 
+Screen_Rpg *LoLEngine::screen_rpg() {
+	return _screen;
+}
+
 GUI *LoLEngine::gui() const {
 	return _gui;
 }
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index eeaa1b51ad..3a6486b30e 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -279,6 +279,7 @@ public:
 	virtual void initKeymap();
 
 	Screen *screen();
+	Screen_Rpg *screen_rpg();
 	GUI *gui() const;
 
 private:
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
index 21e3ba3dff..edadcdbcbb 100644
--- a/engines/kyra/module.mk
+++ b/engines/kyra/module.mk
@@ -78,6 +78,7 @@ KYRARPG_COMMON_OBJ = \
 	kyra_rpg.o \
 	saveload_rpg.o \
 	scene_rpg.o \
+	screen_rpg.o \
 	sprites_rpg.o \
 	staticres_rpg.o \
 	text_rpg.o \
diff --git a/engines/kyra/scene_rpg.cpp b/engines/kyra/scene_rpg.cpp
index 07a7a879b1..88e992ff0c 100644
--- a/engines/kyra/scene_rpg.cpp
+++ b/engines/kyra/scene_rpg.cpp
@@ -23,6 +23,7 @@
 #if defined(ENABLE_EOB) || defined(ENABLE_LOL)
 
 #include "kyra/kyra_rpg.h"
+#include "kyra/screen_rpg.h"
 #include "kyra/resource.h"
 #include "kyra/timer.h"
 #include "kyra/sound.h"
@@ -117,11 +118,11 @@ void KyraRpgEngine::scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim
 
 	const ScreenDim *cDim = screen()->getScreenDim(dim);
 
-	screen()->modifyScreenDim(dim, cDim->sx, y1, cDim->w, y2 - y1);
+	screen_rpg()->modifyScreenDim(dim, cDim->sx, y1, cDim->w, y2 - y1);
 }
 
 void KyraRpgEngine::drawLevelModifyScreenDim(int dim, int16 x1, int16 y1, int16 x2, int16 y2) {
-	screen()->modifyScreenDim(dim, x1, y1 << 3, x2 - x1, (y2 - y1) << 3);
+	screen_rpg()->modifyScreenDim(dim, x1, y1 << 3, x2 - x1, (y2 - y1) << 3);
 }
 
 void KyraRpgEngine::generateBlockDrawingBuffer() {
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index 192e267014..f58a072869 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -458,8 +458,6 @@ public:
 
 	virtual void setScreenDim(int dim) = 0;
 	virtual const ScreenDim *getScreenDim(int dim) = 0;
-	virtual int curDimIndex() const { return 0; }
-	virtual void modifyScreenDim(int dim, int x, int y, int w, int h) {}
 	virtual int screenDimTableCount() const = 0;
 
 	const ScreenDim *_curDim;
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 869f4375ae..15a9fefc37 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -36,7 +36,7 @@
 
 namespace Kyra {
 
-Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system) {
+Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system), Screen_Rpg(vm, system, _screenDimTable, _screenDimTableCount) {
 	_shapeFadeMode[0] = _shapeFadeMode[1] = 0;
 	_shapeFadeInternal = 0;
 	_fadeData = 0;
@@ -44,9 +44,7 @@ Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system)
 	_dsX1 = _dsX2 = _dsY1 = _dsY2 = 0;
 	_gfxX = _gfxY = 0;
 	_gfxCol = 0;
-	_customDimTable = 0;
 	_dsTempPage = 0;
-	_curDimIndex = 0;
 	_dsDiv = 0;
 	_dsRem = 0;
 	_dsScaleTmp = 0;
@@ -55,19 +53,11 @@ Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system)
 
 Screen_EoB::~Screen_EoB() {
 	delete[] _fadeData;
-	if (_customDimTable) {
-		for (int i = 0; i < _screenDimTableCount; i++)
-			delete _customDimTable[i];
-	}
-	delete[] _customDimTable;
 	delete[] _dsTempPage;
 }
 
 bool Screen_EoB::init() {
 	if (Screen::init()) {
-		_customDimTable = new ScreenDim*[_screenDimTableCount];
-		memset(_customDimTable, 0, sizeof(ScreenDim*) * _screenDimTableCount);
-
 		int temp;
 		_gfxMaxY = _vm->staticres()->loadRawData(kEoBBaseExpObjectY, temp);
 		_fadeData = _vm->resource()->fileData("FADING.DAT", 0);
@@ -88,30 +78,6 @@ bool Screen_EoB::init() {
 	return false;
 }
 
-void Screen_EoB::setScreenDim(int dim) {
-	assert(dim < _screenDimTableCount);
-	_curDim = _customDimTable[dim] ? (const ScreenDim *)_customDimTable[dim] : &_screenDimTable[dim];
-	_curDimIndex = dim;
-}
-
-const ScreenDim *Screen_EoB::getScreenDim(int dim) {
-	assert(dim < _screenDimTableCount);
-	return _customDimTable[dim] ? (const ScreenDim *)_customDimTable[dim] : &_screenDimTable[dim];
-}
-
-void Screen_EoB::modifyScreenDim(int dim, int x, int y, int w, int h) {
-	if (!_customDimTable[dim])
-		_customDimTable[dim] = new ScreenDim;
-
-	memcpy(_customDimTable[dim], &_screenDimTable[dim], sizeof(ScreenDim));
-	_customDimTable[dim]->sx = x;
-	_customDimTable[dim]->sy = y;
-	_customDimTable[dim]->w = w;
-	_customDimTable[dim]->h = h;
-	if (dim == _curDimIndex)
-		setScreenDim(dim);
-}
-
 void Screen_EoB::setClearScreenDim(int dim) {
 	setScreenDim(dim);
 	clearCurDim();
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index 6406587980..2ede813cd6 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -25,22 +25,18 @@
 
 #ifdef ENABLE_EOB
 
-#include "kyra/screen.h"
+#include "kyra/screen_rpg.h"
 
 namespace Kyra {
 
 class EoBCoreEngine;
-class Screen_EoB : public Screen{
+class Screen_EoB : public Screen_Rpg{
 public:
 	Screen_EoB(EoBCoreEngine *vm, OSystem *system);
 	virtual ~Screen_EoB();
 
 	bool init();
 
-	void setScreenDim(int dim);
-	const ScreenDim *getScreenDim(int dim);
-	int curDimIndex() const { return _curDimIndex; }
-	void modifyScreenDim(int dim, int x, int y, int w, int h);
 	int screenDimTableCount() const { return _screenDimTableCount; }
 
 	void setClearScreenDim(int dim);
@@ -98,9 +94,6 @@ private:
 
 	static const ScreenDim _screenDimTable[];
 	static const int _screenDimTableCount;
-
-	ScreenDim **_customDimTable;
-	int _curDimIndex;
 };
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/screen_hof.cpp b/engines/kyra/screen_hof.cpp
index 24e0751c0e..7d4d0744a8 100644
--- a/engines/kyra/screen_hof.cpp
+++ b/engines/kyra/screen_hof.cpp
@@ -26,7 +26,7 @@
 namespace Kyra {
 
 Screen_HoF::Screen_HoF(KyraEngine_HoF *vm, OSystem *system)
-	: Screen_v2(vm, system), _vm(vm) {
+	: Screen(vm, system), Screen_v2(vm, system), _vm(vm) {
 }
 
 void Screen_HoF::setScreenDim(int dim) {
diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp
index 0f02165ac5..bef83f419e 100644
--- a/engines/kyra/screen_lol.cpp
+++ b/engines/kyra/screen_lol.cpp
@@ -31,7 +31,7 @@
 
 namespace Kyra {
 
-Screen_LoL::Screen_LoL(LoLEngine *vm, OSystem *system) : Screen_v2(vm, system), _vm(vm) {
+Screen_LoL::Screen_LoL(LoLEngine *vm, OSystem *system) : Screen(vm, system), Screen_v2(vm, system), Screen_Rpg(vm, system, _screenDimTable = vm->gameFlags().use16ColorMode ? _screenDimTable16C : _screenDimTable256C, _screenDimTableCount), _vm(vm) {
 	_paletteOverlay1 = new uint8[0x100];
 	_paletteOverlay2 = new uint8[0x100];
 	_grayOverlay = new uint8[0x100];
@@ -43,16 +43,10 @@ Screen_LoL::Screen_LoL(LoLEngine *vm, OSystem *system) : Screen_v2(vm, system),
 		_levelOverlays[i] = new uint8[256];
 
 	_screenDimTable = 0;
-	_customDimTable = 0;
-	_curDimIndex = 0;
 	_fadeFlag = 2;
 }
 
 Screen_LoL::~Screen_LoL() {
-	for (int i = 0; i < _screenDimTableCount; i++)
-		delete _customDimTable[i];
-	delete[] _customDimTable;
-
 	for (int i = 0; i < 8; i++)
 		delete[] _levelOverlays[i];
 
@@ -61,39 +55,6 @@ Screen_LoL::~Screen_LoL() {
 	delete[] _grayOverlay;
 }
 
-bool Screen_LoL::init() {
-	if (Screen::init()) {
-		_screenDimTable = _use16ColorMode ? _screenDimTable16C : _screenDimTable256C;
-		_customDimTable = new ScreenDim*[_screenDimTableCount];
-		memset(_customDimTable, 0, sizeof(ScreenDim *)* _screenDimTableCount);
-		return true;
-	}
-	return false;
-}
-
-
-void Screen_LoL::setScreenDim(int dim) {
-	assert(dim < _screenDimTableCount);
-	_curDim = _customDimTable[dim] ? (const ScreenDim *)_customDimTable[dim] : &_screenDimTable[dim];
-	_curDimIndex = dim;
-}
-
-const ScreenDim *Screen_LoL::getScreenDim(int dim) {
-	assert(dim < _screenDimTableCount);
-	return _customDimTable[dim] ? (const ScreenDim *)_customDimTable[dim] : &_screenDimTable[dim];
-}
-
-void Screen_LoL::modifyScreenDim(int dim, int x, int y, int w, int h) {
-	delete _customDimTable[dim];
-	_customDimTable[dim] = new ScreenDim;
-	memcpy(_customDimTable[dim], &_screenDimTable[dim], sizeof(ScreenDim));
-	_customDimTable[dim]->sx = x;
-	_customDimTable[dim]->sy = y;
-	_customDimTable[dim]->w = w;
-	_customDimTable[dim]->h = h;
-	setScreenDim(dim);
-}
-
 void Screen_LoL::fprintString(const char *format, int x, int y, uint8 col1, uint8 col2, uint16 flags, ...) {
 	if (!format)
 		return;
diff --git a/engines/kyra/screen_lol.h b/engines/kyra/screen_lol.h
index 02b78606b9..eb025fb1cf 100644
--- a/engines/kyra/screen_lol.h
+++ b/engines/kyra/screen_lol.h
@@ -26,22 +26,17 @@
 #define KYRA_SCREEN_LOL_H
 
 #include "kyra/screen_v2.h"
+#include "kyra/screen_rpg.h"
 
 namespace Kyra {
 
 class LoLEngine;
 
-class Screen_LoL : public Screen_v2 {
+class Screen_LoL : public Screen_v2, public Screen_Rpg {
 public:
 	Screen_LoL(LoLEngine *vm, OSystem *system);
 	~Screen_LoL();
 
-	bool init();
-
-	void setScreenDim(int dim);
-	const ScreenDim *getScreenDim(int dim);
-	int curDimIndex() const { return _curDimIndex; }
-	void modifyScreenDim(int dim, int x, int y, int w, int h);
 	int screenDimTableCount() const { return _screenDimTableCount; }
 
 	void fprintString(const char *format, int x, int y, uint8 col1, uint8 col2, uint16 flags, ...) GCC_PRINTF(2, 8);
@@ -105,9 +100,6 @@ private:
 	static const ScreenDim _screenDimTable256C[];
 	static const ScreenDim _screenDimTable16C[];
 
-	ScreenDim **_customDimTable;
-	int _curDimIndex;
-
 	uint8 *_levelOverlays[8];
 
 	void mergeOverlay(int x, int y, int w, int h);
diff --git a/engines/kyra/screen_mr.cpp b/engines/kyra/screen_mr.cpp
index 2687dc8041..d4446c6d91 100644
--- a/engines/kyra/screen_mr.cpp
+++ b/engines/kyra/screen_mr.cpp
@@ -25,7 +25,7 @@
 
 namespace Kyra {
 
-Screen_MR::Screen_MR(KyraEngine_MR *vm, OSystem *system) : Screen_v2(vm, system) {
+Screen_MR::Screen_MR(KyraEngine_MR *vm, OSystem *system) : Screen(vm, system), Screen_v2(vm, system) {
 }
 
 Screen_MR::~Screen_MR() {
diff --git a/engines/kyra/screen_rpg.cpp b/engines/kyra/screen_rpg.cpp
new file mode 100644
index 0000000000..3b29f0adb5
--- /dev/null
+++ b/engines/kyra/screen_rpg.cpp
@@ -0,0 +1,126 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/screen_rpg.h"
+#include "kyra/kyra_v1.h"
+
+#include "common/endian.h"
+
+namespace Kyra {
+
+Screen_Rpg::Screen_Rpg(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, int dimTableSize) : Screen(vm, system), _screenDimTable(dimTable), _screenDimTableCount(dimTableSize) {
+	_customDimTable = new ScreenDim*[_screenDimTableCount];
+	memset(_customDimTable, 0, sizeof(ScreenDim *)* _screenDimTableCount);
+	_curDimIndex = 0;
+}
+
+Screen_Rpg::~Screen_Rpg() {
+	for (int i = 0; i < _screenDimTableCount; i++)
+		delete _customDimTable[i];
+	delete[] _customDimTable;
+}
+
+void Screen_Rpg::setScreenDim(int dim) {
+	assert(dim < _screenDimTableCount);
+	_curDim = _customDimTable[dim] ? (const ScreenDim *)_customDimTable[dim] : &_screenDimTable[dim];
+	_curDimIndex = dim;
+}
+
+const ScreenDim *Screen_Rpg::getScreenDim(int dim) {
+	assert(dim < _screenDimTableCount);
+	return _customDimTable[dim] ? (const ScreenDim *)_customDimTable[dim] : &_screenDimTable[dim];
+}
+
+void Screen_Rpg::modifyScreenDim(int dim, int x, int y, int w, int h) {
+	if (!_customDimTable[dim])
+		_customDimTable[dim] = new ScreenDim;
+
+	memcpy(_customDimTable[dim], &_screenDimTable[dim], sizeof(ScreenDim));
+	_customDimTable[dim]->sx = x;
+	_customDimTable[dim]->sy = y;
+	_customDimTable[dim]->w = w;
+	_customDimTable[dim]->h = h;
+	if (dim == _curDimIndex || _vm->game() == GI_LOL)
+		setScreenDim(dim);
+}
+
+void Screen_Rpg::crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage) {
+	if (srcPage > 13 || dstPage > 13)
+		error("Screen_Rpg::crossFadeRegion(): attempting to use temp page as source or dest page.");
+
+	hideMouse();
+
+	uint16 *wB = (uint16*)_pagePtrs[14];
+	uint8 *hB = _pagePtrs[14] + 640;
+
+	for (int i = 0; i < w; i++)
+		wB[i] = i;
+
+	for (int i = 0; i < h; i++)
+		hB[i] = i;
+
+	for (int i = 0; i < w; i++)
+		SWAP(wB[_vm->_rnd.getRandomNumberRng(0, w - 1)], wB[i]);
+
+	for (int i = 0; i < h; i++)
+		SWAP(hB[_vm->_rnd.getRandomNumberRng(0, h - 1)], hB[i]);
+
+	uint8 *s = _pagePtrs[srcPage];
+	uint8 *d = _pagePtrs[dstPage];
+
+	for (int i = 0; i < h; i++) {
+		int iH = i;
+		uint32 end = _system->getMillis() + 3;
+		for (int ii = 0; ii < w; ii++) {
+			int sX = x1 + wB[ii];
+			int sY = y1 + hB[iH];
+			int dX = x2 + wB[ii];
+			int dY = y2 + hB[iH];
+
+			if (++iH >= h)
+				iH = 0;
+
+			d[dY * 320 + dX] = s[sY * 320 + sX];
+			addDirtyRect(dX, dY, 1, 1);
+		}
+
+		// This tries to speed things up, to get similiar speeds as in DOSBox etc.
+		// We can't write single pixels directly into the video memory like the original did.
+		// We also (unlike the original) want to aim at similiar speeds for all platforms.
+		if (!(i % 10))
+			updateScreen();
+
+		uint32 cur = _system->getMillis();
+		if (end > cur)
+			_system->delayMillis(end - cur);
+	}
+
+	updateScreen();
+	showMouse();
+}
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/screen_rpg.h b/engines/kyra/screen_rpg.h
new file mode 100644
index 0000000000..e9b15c25ef
--- /dev/null
+++ b/engines/kyra/screen_rpg.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 KYRA_SCREEN_RPG_H
+#define KYRA_SCREEN_RPG_H
+
+#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
+
+#include "kyra/screen.h"
+#include "common/system.h"
+
+namespace Kyra {
+
+class Screen;
+class KyraEngine_v1;
+
+class Screen_Rpg : virtual public Screen {
+public:
+	Screen_Rpg(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, int dimTableSize);
+	virtual ~Screen_Rpg();
+
+	virtual void setScreenDim(int dim);
+	virtual const ScreenDim *getScreenDim(int dim);
+	virtual int screenDimTableCount() const = 0;
+
+	void modifyScreenDim(int dim, int x, int y, int w, int h);
+	int curDimIndex() const { return _curDimIndex; }
+
+	void crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage);
+
+private:
+	int _curDimIndex;
+	int _screenDimTableCount;
+	ScreenDim **_customDimTable;
+	const ScreenDim *_screenDimTable;
+};
+
+}	// End of namespace Kyra
+
+#endif // ENABLE_EOB || ENABLE_LOL
+
+#endif
diff --git a/engines/kyra/screen_v2.h b/engines/kyra/screen_v2.h
index d85c762038..f50c81e912 100644
--- a/engines/kyra/screen_v2.h
+++ b/engines/kyra/screen_v2.h
@@ -28,7 +28,7 @@
 
 namespace Kyra {
 
-class Screen_v2 : public Screen {
+class Screen_v2 : virtual public Screen {
 public:
 	Screen_v2(KyraEngine_v1 *vm, OSystem *system);
 	~Screen_v2();
diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp
index d07956b3ff..8535516bf9 100644
--- a/engines/kyra/text_lol.cpp
+++ b/engines/kyra/text_lol.cpp
@@ -32,7 +32,7 @@
 
 namespace Kyra {
 
-TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *engine, Screen_LoL *screenLoL) : TextDisplayer_rpg(engine, engine->screen()),
+TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *engine, Screen_LoL *screenLoL) : TextDisplayer_rpg(engine, engine->screen_rpg()),
 	_vm(engine), _screen(screenLoL), _scriptTextParameter(0) {
 
 	memset(_stringParameters, 0, 15 * sizeof(char *));
@@ -337,7 +337,7 @@ KyraRpgEngine *TextDisplayer_LoL::vm() {
 	return _vm;
 }
 
-Screen *TextDisplayer_LoL::screen() {
+Screen_Rpg *TextDisplayer_LoL::screen() {
 	return _screen;
 }
 
diff --git a/engines/kyra/text_lol.h b/engines/kyra/text_lol.h
index 6da217e30e..baf0f2f2c5 100644
--- a/engines/kyra/text_lol.h
+++ b/engines/kyra/text_lol.h
@@ -51,7 +51,7 @@ public:
 
 private:
 	KyraRpgEngine *vm();
-	Screen *screen();
+	Screen_Rpg *screen();
 
 	void preprocessString(char *str, EMCState *script, const uint16 *paramList, int16 paramIndex);
 	void textPageBreak();
diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text_rpg.cpp
index 1201cdcb45..ca1fd04269 100644
--- a/engines/kyra/text_rpg.cpp
+++ b/engines/kyra/text_rpg.cpp
@@ -24,7 +24,7 @@
 #if defined(ENABLE_EOB) || defined(ENABLE_LOL)
 
 #include "kyra/kyra_rpg.h"
-#include "kyra/screen.h"
+#include "kyra/screen_rpg.h"
 #include "kyra/timer.h"
 
 #include "common/system.h"
@@ -35,7 +35,7 @@ enum {
 	kEoBTextBufferSize = 2048
 };
 
-TextDisplayer_rpg::TextDisplayer_rpg(KyraRpgEngine *engine, Screen *sScreen) : _vm(engine), _screen(sScreen),
+TextDisplayer_rpg::TextDisplayer_rpg(KyraRpgEngine *engine, Screen_Rpg *scr) : _vm(engine), _screen(scr),
 	_lineCount(0), _printFlag(false), _lineWidth(0), _numCharsTotal(0), _allowPageBreak(true),
 	_numCharsLeft(0), _numCharsPrinted(0), _sjisLineBreakFlag(false), _waitButtonMode(1) {
 
@@ -462,7 +462,7 @@ void TextDisplayer_rpg::printLine(char *str) {
 }
 
 void TextDisplayer_rpg::printDialogueText(int stringId, const char *pageBreakString) {
-	const char * str = (const char *)(screen()->getCPagePtr(5) + READ_LE_UINT16(&screen()->getCPagePtr(5)[(stringId - 1) << 1]));
+	const char * str = (const char *)(_screen->getCPagePtr(5) + READ_LE_UINT16(&_screen->getCPagePtr(5)[(stringId - 1) << 1]));
 	assert (strlen(str) < kEoBTextBufferSize);
 	Common::strlcpy(_dialogueBuffer, str, kEoBTextBufferSize);
 
@@ -488,10 +488,10 @@ void TextDisplayer_rpg::printDialogueText(const char *str, bool wait) {
 }
 
 void TextDisplayer_rpg::printMessage(const char *str, int textColor, ...) {
-	int tc = _textDimData[screen()->curDimIndex()].color1;
+	int tc = _textDimData[_screen->curDimIndex()].color1;
 
 	if (textColor != -1)
-		_textDimData[screen()->curDimIndex()].color1 = textColor;
+		_textDimData[_screen->curDimIndex()].color1 = textColor;
 
 	va_list args;
 	va_start(args, textColor);
@@ -501,28 +501,28 @@ void TextDisplayer_rpg::printMessage(const char *str, int textColor, ...) {
 	displayText(_dialogueBuffer);
 
 	if (vm()->game() != GI_EOB1)
-		_textDimData[screen()->curDimIndex()].color1 = tc;
+		_textDimData[_screen->curDimIndex()].color1 = tc;
 
-	if (!screen()->_curPage)
-		screen()->updateScreen();
+	if (!_screen->_curPage)
+		_screen->updateScreen();
 }
 
 int TextDisplayer_rpg::clearDim(int dim) {
-	int res = screen()->curDimIndex();
-	screen()->setScreenDim(dim);
-	_textDimData[dim].color1 = screen()->_curDim->unk8;
-	_textDimData[dim].color2 = vm()->game() == GI_LOL ? screen()->_curDim->unkA : vm()->_bkgColor_1;
+	int res = _screen->curDimIndex();
+	_screen->setScreenDim(dim);
+	_textDimData[dim].color1 = _screen->_curDim->unk8;
+	_textDimData[dim].color2 = vm()->game() == GI_LOL ? _screen->_curDim->unkA : vm()->_bkgColor_1;
 	clearCurDim();
 	return res;
 }
 
 void TextDisplayer_rpg::clearCurDim() {
-	int d = screen()->curDimIndex();
-	const ScreenDim *tmp = screen()->getScreenDim(d);
+	int d = _screen->curDimIndex();
+	const ScreenDim *tmp = _screen->getScreenDim(d);
 	if (vm()->gameFlags().use16ColorMode) {
-		screen()->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 2, (tmp->sy + tmp->h) - 2, _textDimData[d].color2);
+		_screen->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 2, (tmp->sy + tmp->h) - 2, _textDimData[d].color2);
 	} else
-		screen()->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 1, (tmp->sy + tmp->h) - 1, _textDimData[d].color2);
+		_screen->fillRect(tmp->sx << 3, tmp->sy, ((tmp->sx + tmp->w) << 3) - 1, (tmp->sy + tmp->h) - 1, _textDimData[d].color2);
 
 	_lineCount = 0;
 	_textDimData[d].column = _textDimData[d].line = 0;
@@ -533,7 +533,7 @@ void TextDisplayer_rpg::textPageBreak() {
 		SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
 
 	int cp = _screen->setCurPage(0);
-	Screen::FontId cf = screen()->setFont(vm()->gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
+	Screen::FontId cf = _screen->setFont(vm()->gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
 
 	if (vm()->game() == GI_LOL)
 		vm()->_timer->pauseSingleTimer(11, true);
@@ -554,7 +554,7 @@ void TextDisplayer_rpg::textPageBreak() {
 	if (vm()->speechEnabled() && vm()->_activeVoiceFileTotalTime && _numCharsTotal)
 		speechPartTime = vm()->_system->getMillis() + ((_numCharsPrinted * vm()->_activeVoiceFileTotalTime) / _numCharsTotal);
 
-	const ScreenDim *dim = screen()->getScreenDim(screen()->curDimIndex());
+	const ScreenDim *dim = _screen->getScreenDim(_screen->curDimIndex());
 
 	int x = ((dim->sx + dim->w) << 3) - (_vm->_dialogueButtonW + 3);
 	int y = 0;
@@ -579,10 +579,10 @@ void TextDisplayer_rpg::textPageBreak() {
 
 	if (vm()->gameFlags().use16ColorMode) {
 		vm()->gui_drawBox(x + 8, (y & ~7) - 1, 66, 10, 0xee, 0xcc, -1);
-		screen()->printText(_pageBreakString, (x + 37 - (strlen(_pageBreakString) << 1) + 4) & ~3, (y + 2) & ~7, 0xc1, 0);
+		_screen->printText(_pageBreakString, (x + 37 - (strlen(_pageBreakString) << 1) + 4) & ~3, (y + 2) & ~7, 0xc1, 0);
 	} else {
 		vm()->gui_drawBox(x, y, w, vm()->_dialogueButtonH, vm()->_color1_1, vm()->_color2_1, vm()->_bkgColor_1);
-		screen()->printText(_pageBreakString, x + (w >> 1) - (vm()->screen()->getTextWidth(_pageBreakString) >> 1), y + 2, vm()->_dialogueButtonLabelCol1, 0);
+		_screen->printText(_pageBreakString, x + (w >> 1) - (vm()->screen()->getTextWidth(_pageBreakString) >> 1), y + 2, vm()->_dialogueButtonLabelCol1, 0);
 	}
 
 	vm()->removeInputTop();
@@ -627,9 +627,9 @@ void TextDisplayer_rpg::textPageBreak() {
 	} while (loop && !_vm->shouldQuit());
 
 	if (vm()->gameFlags().use16ColorMode)
-		screen()->fillRect(x + 8, y, x + 57, y + 9, _textDimData[screen()->curDimIndex()].color2);
+		_screen->fillRect(x + 8, y, x + 57, y + 9, _textDimData[_screen->curDimIndex()].color2);
 	else
-		screen()->fillRect(x, y, x + w - 1, y + 8, _textDimData[screen()->curDimIndex()].color2);
+		_screen->fillRect(x, y, x + w - 1, y + 8, _textDimData[_screen->curDimIndex()].color2);
 
 	clearCurDim();
 	_screen->updateScreen();
@@ -647,8 +647,8 @@ void TextDisplayer_rpg::textPageBreak() {
 		vm()->_updatePortraitSpeechAnimDuration = updatePortraitSpeechAnimDuration;
 	}
 
-	screen()->setFont(cf);
-	screen()->setCurPage(cp);
+	_screen->setFont(cf);
+	_screen->setCurPage(cp);
 
 	if (vm()->game() != GI_LOL)
 		SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
diff --git a/engines/kyra/text_rpg.h b/engines/kyra/text_rpg.h
index fcafcc0f4d..ff3473dc56 100644
--- a/engines/kyra/text_rpg.h
+++ b/engines/kyra/text_rpg.h
@@ -29,12 +29,12 @@
 
 namespace Kyra {
 
-class Screen;
+class Screen_Rpg;
 class KyraRpgEngine;
 
 class TextDisplayer_rpg {
 public:
-	TextDisplayer_rpg(KyraRpgEngine *engine, Screen *sScreen);
+	TextDisplayer_rpg(KyraRpgEngine *engine, Screen_Rpg *scr);
 	virtual ~TextDisplayer_rpg();
 
 	virtual void setupField(int dim, bool mode);
@@ -57,7 +57,7 @@ public:
 
 protected:
 	virtual KyraRpgEngine *vm() { return _vm; }
-	virtual Screen *screen() { return _screen; }
+	virtual Screen_Rpg *screen() { return _screen; }
 
 	void displayText(char *str, ...);
 	char parseCommand();
@@ -102,7 +102,7 @@ protected:
 
 private:
 	KyraRpgEngine *_vm;
-	Screen *_screen;
+	Screen_Rpg *_screen;
 
 	char *_table1;
 	char *_table2;
-- 
cgit v1.2.3


From 0c7fbd788b2dbcded5114ec8c15efcab5072d9e9 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 12 Dec 2011 18:54:41 +0100
Subject: KYRA: (EOB) - remove unneeded virtual declarations in screen.h

---
 engines/kyra/scene_lol.cpp | 14 +++++++-------
 engines/kyra/screen.h      |  4 ----
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index d8fb70a55f..8610d20d02 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -262,7 +262,7 @@ void LoLEngine::loadBlockProperties(const char *cmzFile) {
 
 const uint8 *LoLEngine::getBlockFileData(int levelIndex) {
 	_screen->loadBitmap(Common::String::format("LEVEL%d.CMZ", levelIndex).c_str(), 15, 15, 0);
-	return screen()->getCPagePtr(14);
+	return _screen->getCPagePtr(14);
 }
 
 void LoLEngine::loadLevelShpDat(const char *shpFile, const char *datFile, bool flag) {
@@ -1490,7 +1490,7 @@ void LoLEngine::drawDecorations(int index) {
 					else
 						ov = 0;
 				}
-				ovl = screen()->getLevelOverlay(ov);
+				ovl = _screen->getLevelOverlay(ov);
 			} else if (_levelDecorationProperties[l].shapeIndex[shpIx] != 0xffff) {
 				scaleW = scaleH = 0x100;
 				int ov = 7;
@@ -1501,7 +1501,7 @@ void LoLEngine::drawDecorations(int index) {
 					else
 						ov = 0;
 				}
-				ovl = screen()->getLevelOverlay(ov);
+				ovl = _screen->getLevelOverlay(ov);
 			}
 
 			if (_levelDecorationProperties[l].shapeIndex[shpIx] != 0xffff) {
@@ -1511,7 +1511,7 @@ void LoLEngine::drawDecorations(int index) {
 						x = _dscShapeX[s] + xOffs + ((_levelDecorationProperties[l].shapeX[shpIx] * scaleW) >> 8);
 						if (ix == _dscShapeIndex[s]) {
 							x = _dscShapeX[s] - ((_levelDecorationProperties[l].shapeX[shpIx] * scaleW) >> 8) -
-								screen()->getShapeScaledWidth(shapeData, scaleW) - xOffs;
+								_screen->getShapeScaledWidth(shapeData, scaleW) - xOffs;
 						}
 						flags = 0x105;
 					} else {
@@ -1520,13 +1520,13 @@ void LoLEngine::drawDecorations(int index) {
 					}
 
 					y = _dscShapeY[s] + yOffs + ((_levelDecorationProperties[l].shapeY[shpIx] * scaleH) >> 8);
-					screen()->drawShape(_sceneDrawPage1, shapeData, x + 112, y, _sceneShpDim, flags, ovl, 1, scaleW, scaleH);
+					_screen->drawShape(_sceneDrawPage1, shapeData, x + 112, y, _sceneShpDim, flags, ovl, 1, scaleW, scaleH);
 
 					if ((_levelDecorationProperties[l].flags & 1) && shpIx < 4) {
 						//draw shadow
-						x += (screen()->getShapeScaledWidth(shapeData, scaleW));
+						x += (_screen->getShapeScaledWidth(shapeData, scaleW));
 						flags ^= 1;
-						screen()->drawShape(_sceneDrawPage1, shapeData, x + 112, y, _sceneShpDim, flags, ovl, 1, scaleW, scaleH);
+						_screen->drawShape(_sceneDrawPage1, shapeData, x + 112, y, _sceneShpDim, flags, ovl, 1, scaleW, scaleH);
 					}
 				}
 			}
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index f58a072869..2db84157b3 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -468,8 +468,6 @@ public:
 	int setNewShapeHeight(uint8 *shape, int height);
 	int resetShapeHeight(uint8 *shape);
 
-	virtual int getShapeScaledWidth( const uint8*, int) { return 0; }
-
 	virtual void drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd, int flags, ...);
 
 	// mouse handling
@@ -503,8 +501,6 @@ public:
 	void blockInRegion(int x, int y, int width, int height);
 	void blockOutRegion(int x, int y, int width, int height);
 
-	virtual uint8 *getLevelOverlay(int) { return 0; }
-
 	int _charWidth;
 	int _charOffset;
 	int _curPage;
-- 
cgit v1.2.3


From 692f9ee6d524752bf1b1d169f81f68309901187a Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 12 Dec 2011 19:05:29 +0100
Subject: KYRA: whitespace cleanup

---
 engines/kyra/detection.cpp     |   2 +-
 engines/kyra/eobcommon.h       |   2 +-
 engines/kyra/gui.cpp           |   2 -
 engines/kyra/gui_eob.cpp       |   3 +-
 engines/kyra/gui_rpg.cpp       |   1 -
 engines/kyra/gui_v1.cpp        |   1 -
 engines/kyra/gui_v1.h          |   1 -
 engines/kyra/items_eob.cpp     |   1 -
 engines/kyra/items_lok.cpp     |   2 +-
 engines/kyra/kyra_rpg.h        |   2 +-
 engines/kyra/kyra_v1.cpp       |   2 +-
 engines/kyra/resource.h        | 142 ++++++++++++++++++++---------------------
 engines/kyra/screen.cpp        |   6 +-
 engines/kyra/screen_eob.cpp    |   2 +-
 engines/kyra/screen_eob.h      |   2 -
 engines/kyra/staticres_eob.cpp |  17 +++--
 engines/kyra/staticres_rpg.cpp |   1 -
 engines/kyra/text_lol.h        |   1 -
 engines/kyra/wsamovie.cpp      |   2 +-
 19 files changed, 90 insertions(+), 102 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 56ad42773c..ceb3ef6728 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -84,7 +84,7 @@ bool KyraMetaEngine::hasFeature(MetaEngineFeature f) const {
 		(f == kSupportsListSaves) ||
 		(f == kSupportsLoadingDuringStartup) ||
 		(f == kSupportsDeleteSave) ||
-	  	(f == kSavesSupportMetaInfo) ||
+		(f == kSavesSupportMetaInfo) ||
 		(f == kSavesSupportThumbnail);
 }
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 18fe893d80..af16df7f44 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -1147,4 +1147,4 @@ protected:
 
 #endif // ENABLE_EOB
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index 9c0adf159b..e2195cad17 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -139,5 +139,3 @@ void GUI::updateSaveSlotsList() {
 }
 
 } // End of namespace Kyra
-
-
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 76b4b35b08..1930ab1e59 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -3632,7 +3632,7 @@ void GUI_EoB::displayTextBox(int id) {
 	_screen->updateScreen();
 
 	for (uint32 timeOut = _vm->_system->getMillis() + 1440; _vm->_system->getMillis() < timeOut && !_vm->shouldQuit(); ) {
-	 	int in = _vm->checkInput(0, false, 0);
+		int in = _vm->checkInput(0, false, 0);
 		_vm->removeInputTop();
 		if (in && !(in & 0x800))
 			break;
@@ -3963,4 +3963,3 @@ const EoBRect16 GUI_EoB::_updateBoxFrameHighLights[] = {
 }	// End of namespace Kyra
 
 #endif // ENABLE_EOB
-
diff --git a/engines/kyra/gui_rpg.cpp b/engines/kyra/gui_rpg.cpp
index 8b2a593d6b..718722f58d 100644
--- a/engines/kyra/gui_rpg.cpp
+++ b/engines/kyra/gui_rpg.cpp
@@ -131,4 +131,3 @@ bool KyraRpgEngine::clickedShape(int shapeIndex) {
 }	// End of namespace Kyra
 
 #endif // defined(ENABLE_EOB) || defined(ENABLE_LOL)
-
diff --git a/engines/kyra/gui_v1.cpp b/engines/kyra/gui_v1.cpp
index c38c828ff0..ab441878a6 100644
--- a/engines/kyra/gui_v1.cpp
+++ b/engines/kyra/gui_v1.cpp
@@ -627,4 +627,3 @@ void MainMenu::printString(const char *format, int x, int y, int col1, int col2,
 }
 
 } // End of namespace Kyra
-
diff --git a/engines/kyra/gui_v1.h b/engines/kyra/gui_v1.h
index ec0d577982..260edae8e5 100644
--- a/engines/kyra/gui_v1.h
+++ b/engines/kyra/gui_v1.h
@@ -195,4 +195,3 @@ private:
 } // end of namesapce Kyra
 
 #endif
-
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index 8ade6e1935..28764dfe20 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -729,4 +729,3 @@ void EoBCoreEngine::reloadWeaponSlot(int charIndex, int slotIndex, int itemType,
 } // End of namespace Kyra
 
 #endif // ENABLE_EOB
-
diff --git a/engines/kyra/items_lok.cpp b/engines/kyra/items_lok.cpp
index d598a17cf1..7e41811441 100644
--- a/engines/kyra/items_lok.cpp
+++ b/engines/kyra/items_lok.cpp
@@ -575,7 +575,7 @@ void KyraEngine_LoK::dropItem(int unk1, int item, int x, int y, int unk2) {
 	if (processItemDrop(_currentCharacter->sceneId, item, x, y, unk1, unk2))
 		return;
 	snd_playSoundEffect(54);
-	
+
 	// Old floppy versions don't print warning messages and don't have the necessary string resources.
 	// These versions will only play the warning sound effect.
 	if (_flags.isOldFloppy && !_noDropList)
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index 5d217b6f28..13a67c6d56 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -353,4 +353,4 @@ protected:
 
 #endif // ENABLE_EOB || ENABLE_LOL
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index c1b9f2a453..b818243a08 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -406,7 +406,7 @@ void KyraEngine_v1::setupKeyMap() {
 		{ KC(s), 32, 32 },
 		{ KC(w), 18, 18 },
 		{ KC(y), 22, 22 },
-		{ KC(z), 46, 46 },		
+		{ KC(z), 46, 46 },
 		{ KC(1), 2, 0/*unknown*/ },
 		{ KC(2), 3, 0/*unknown*/ },
 		{ KC(3), 4, 0/*unknown*/ },
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 30cf17dc1a..45c18517a9 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -291,7 +291,7 @@ enum KyraResources {
 	kEoBBaseItemSuffixStringsRings,
 	kEoBBaseItemSuffixStringsPotions,
 	kEoBBaseItemSuffixStringsWands,
-	
+
 	kEoBBaseRipItemStrings,
 	kEoBBaseCursedString,
 	kEoBBaseEnchantedString,
@@ -543,83 +543,83 @@ enum KyraResources {
 	kEoB2IntroStrings,
 	kEoB2IntroCPSFiles,
 	kEoB2IntroSeqData00,
- 	kEoB2IntroSeqData01,
- 	kEoB2IntroSeqData02,
- 	kEoB2IntroSeqData03,
- 	kEoB2IntroSeqData04,
- 	kEoB2IntroSeqData05,
- 	kEoB2IntroSeqData06,
- 	kEoB2IntroSeqData07,
- 	kEoB2IntroSeqData08,
- 	kEoB2IntroSeqData09,
- 	kEoB2IntroSeqData10,
- 	kEoB2IntroSeqData11,
- 	kEoB2IntroSeqData12,
- 	kEoB2IntroSeqData13,
- 	kEoB2IntroSeqData14,
- 	kEoB2IntroSeqData15,
- 	kEoB2IntroSeqData16,
- 	kEoB2IntroSeqData17,
- 	kEoB2IntroSeqData18,
- 	kEoB2IntroSeqData19,
- 	kEoB2IntroSeqData20,
- 	kEoB2IntroSeqData21,
- 	kEoB2IntroSeqData22,
- 	kEoB2IntroSeqData23,
- 	kEoB2IntroSeqData24,
- 	kEoB2IntroSeqData25,
- 	kEoB2IntroSeqData26,
- 	kEoB2IntroSeqData27,
- 	kEoB2IntroSeqData28,
- 	kEoB2IntroSeqData29,
- 	kEoB2IntroSeqData30,
- 	kEoB2IntroSeqData31,
- 	kEoB2IntroSeqData32,
- 	kEoB2IntroSeqData33,
- 	kEoB2IntroSeqData34,
- 	kEoB2IntroSeqData35,
- 	kEoB2IntroSeqData36,
- 	kEoB2IntroSeqData37,
- 	kEoB2IntroSeqData38,
- 	kEoB2IntroSeqData39,
- 	kEoB2IntroSeqData40,
- 	kEoB2IntroSeqData41,
- 	kEoB2IntroSeqData42,
- 	kEoB2IntroSeqData43,
+	kEoB2IntroSeqData01,
+	kEoB2IntroSeqData02,
+	kEoB2IntroSeqData03,
+	kEoB2IntroSeqData04,
+	kEoB2IntroSeqData05,
+	kEoB2IntroSeqData06,
+	kEoB2IntroSeqData07,
+	kEoB2IntroSeqData08,
+	kEoB2IntroSeqData09,
+	kEoB2IntroSeqData10,
+	kEoB2IntroSeqData11,
+	kEoB2IntroSeqData12,
+	kEoB2IntroSeqData13,
+	kEoB2IntroSeqData14,
+	kEoB2IntroSeqData15,
+	kEoB2IntroSeqData16,
+	kEoB2IntroSeqData17,
+	kEoB2IntroSeqData18,
+	kEoB2IntroSeqData19,
+	kEoB2IntroSeqData20,
+	kEoB2IntroSeqData21,
+	kEoB2IntroSeqData22,
+	kEoB2IntroSeqData23,
+	kEoB2IntroSeqData24,
+	kEoB2IntroSeqData25,
+	kEoB2IntroSeqData26,
+	kEoB2IntroSeqData27,
+	kEoB2IntroSeqData28,
+	kEoB2IntroSeqData29,
+	kEoB2IntroSeqData30,
+	kEoB2IntroSeqData31,
+	kEoB2IntroSeqData32,
+	kEoB2IntroSeqData33,
+	kEoB2IntroSeqData34,
+	kEoB2IntroSeqData35,
+	kEoB2IntroSeqData36,
+	kEoB2IntroSeqData37,
+	kEoB2IntroSeqData38,
+	kEoB2IntroSeqData39,
+	kEoB2IntroSeqData40,
+	kEoB2IntroSeqData41,
+	kEoB2IntroSeqData42,
+	kEoB2IntroSeqData43,
 	kEoB2IntroShapes00,
- 	kEoB2IntroShapes01,
- 	kEoB2IntroShapes04,
- 	kEoB2IntroShapes07,
+	kEoB2IntroShapes01,
+	kEoB2IntroShapes04,
+	kEoB2IntroShapes07,
 
 	kEoB2FinaleStrings,
 	kEoB2CreditsData,
 	kEoB2FinaleCPSFiles,
 	kEoB2FinaleSeqData00,
- 	kEoB2FinaleSeqData01,
- 	kEoB2FinaleSeqData02,
- 	kEoB2FinaleSeqData03,
- 	kEoB2FinaleSeqData04,
- 	kEoB2FinaleSeqData05,
- 	kEoB2FinaleSeqData06,
- 	kEoB2FinaleSeqData07,
- 	kEoB2FinaleSeqData08,
- 	kEoB2FinaleSeqData09,
- 	kEoB2FinaleSeqData10,
- 	kEoB2FinaleSeqData11,
- 	kEoB2FinaleSeqData12,
- 	kEoB2FinaleSeqData13,
- 	kEoB2FinaleSeqData14,
- 	kEoB2FinaleSeqData15,
- 	kEoB2FinaleSeqData16,
- 	kEoB2FinaleSeqData17,
- 	kEoB2FinaleSeqData18,
- 	kEoB2FinaleSeqData19,
- 	kEoB2FinaleSeqData20,
+	kEoB2FinaleSeqData01,
+	kEoB2FinaleSeqData02,
+	kEoB2FinaleSeqData03,
+	kEoB2FinaleSeqData04,
+	kEoB2FinaleSeqData05,
+	kEoB2FinaleSeqData06,
+	kEoB2FinaleSeqData07,
+	kEoB2FinaleSeqData08,
+	kEoB2FinaleSeqData09,
+	kEoB2FinaleSeqData10,
+	kEoB2FinaleSeqData11,
+	kEoB2FinaleSeqData12,
+	kEoB2FinaleSeqData13,
+	kEoB2FinaleSeqData14,
+	kEoB2FinaleSeqData15,
+	kEoB2FinaleSeqData16,
+	kEoB2FinaleSeqData17,
+	kEoB2FinaleSeqData18,
+	kEoB2FinaleSeqData19,
+	kEoB2FinaleSeqData20,
 	kEoB2FinaleShapes00,
- 	kEoB2FinaleShapes03,
- 	kEoB2FinaleShapes07,
- 	kEoB2FinaleShapes09,
- 	kEoB2FinaleShapes10,
+	kEoB2FinaleShapes03,
+	kEoB2FinaleShapes07,
+	kEoB2FinaleShapes09,
+	kEoB2FinaleShapes10,
 
 	kEoB2NpcShapeData,
 	kEoB2Npc1Strings,
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index e4613e2634..9a8bff6346 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -2062,7 +2062,7 @@ void Screen::decodeFrame1(const uint8 *src, uint8 *dst, uint32 size) {
 
 	Pattern *patterns = new Pattern[3840];
 	uint16 numPatterns = 0;
-	uint8 nib = 0;	
+	uint8 nib = 0;
 
 	uint16 code = decodeEGAGetCode(src, nib);
 	uint8 last = code & 0xff;
@@ -2125,7 +2125,7 @@ void Screen::decodeFrame1(const uint8 *src, uint8 *dst, uint32 size) {
 uint16 Screen::decodeEGAGetCode(const uint8 *&pos, uint8 &nib) {
 	uint16 res = READ_BE_UINT16(pos++);
 	if ((++nib) & 1) {
-		res >>= 4;		
+		res >>= 4;
 	} else {
 		pos++;
 		res &= 0xfff;
@@ -3057,7 +3057,7 @@ bool Screen::loadPalette(const char *filename, Palette &pal) {
 	} else if (_vm->gameFlags().platform == Common::kPlatformPC98 && _use16ColorMode) {
 		numCols = stream->size() / Palette::kPC98BytesPerColor;
 		pal.loadPC98Palette(*stream, 0, MIN(maxCols, numCols));
-	} else if (_vm->gameFlags().gameID == GI_EOB1) {		
+	} else if (_vm->gameFlags().gameID == GI_EOB1) {
 		numCols = stream->size() / Palette::kVGABytesPerColor;
 		pal.loadVGAPalette7bit(*stream, 0, MIN(maxCols, numCols));
 	} else {
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 15a9fefc37..62d8bca201 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -285,7 +285,7 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 			srcPage += 320;
 			src = srcPage;
 		}
-    	delete [] colorMap;
+		delete [] colorMap;
 	}
 
 	return shp;
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index 2ede813cd6..2efed83c0c 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -101,5 +101,3 @@ private:
 #endif // ENABLE_EOB
 
 #endif
-
-
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index f3460bc9c5..c99e0a8234 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -1204,10 +1204,10 @@ void DarkMoonEngine::initStaticResource() {
 
 	_shapesIntro = new const EoBShapeDef*[13];
 	memset(_shapesIntro, 0, sizeof(EoBShapeDef*) * 13);
- 	_shapesIntro[0] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes00, temp);
- 	_shapesIntro[1] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes01, temp);
- 	_shapesIntro[4] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes04, temp);
- 	_shapesIntro[7] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes07, temp);
+	_shapesIntro[0] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes00, temp);
+	_shapesIntro[1] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes01, temp);
+	_shapesIntro[4] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes04, temp);
+	_shapesIntro[7] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes07, temp);
 
 	_finaleStrings = _staticres->loadStrings(kEoB2FinaleStrings, temp);
 	_creditsData = _staticres->loadRawData(kEoB2CreditsData, temp);
@@ -1220,10 +1220,10 @@ void DarkMoonEngine::initStaticResource() {
 	_shapesFinale = new const EoBShapeDef*[13];
 	memset(_shapesFinale, 0, sizeof(EoBShapeDef*) * 13);
 	_shapesFinale[0] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes00, temp);
- 	_shapesFinale[3] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes03, temp);
- 	_shapesFinale[7] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes07, temp);
- 	_shapesFinale[9] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes09, temp);
- 	_shapesFinale[10] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes10, temp);
+	_shapesFinale[3] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes03, temp);
+	_shapesFinale[7] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes07, temp);
+	_shapesFinale[9] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes09, temp);
+	_shapesFinale[10] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes10, temp);
 
 	_dscDoorType5Offs = _staticres->loadRawData(kEoBBaseDscDoorType5Offs, temp);
 
@@ -1286,4 +1286,3 @@ const char *DarkMoonEngine::_palFilesFinale[] = {
 #endif // ENABLE_EOB
 
 } // End of namespace Kyra
-
diff --git a/engines/kyra/staticres_rpg.cpp b/engines/kyra/staticres_rpg.cpp
index efee3bed78..cc75ae3442 100644
--- a/engines/kyra/staticres_rpg.cpp
+++ b/engines/kyra/staticres_rpg.cpp
@@ -94,4 +94,3 @@ void KyraRpgEngine::initStaticResource() {
 #endif // (ENABLE_EOB || ENABLE_LOL)
 
 } // End of namespace Kyra
-
diff --git a/engines/kyra/text_lol.h b/engines/kyra/text_lol.h
index baf0f2f2c5..a5eebd67c4 100644
--- a/engines/kyra/text_lol.h
+++ b/engines/kyra/text_lol.h
@@ -68,4 +68,3 @@ private:
 #endif // ENABLE_LOL
 
 #endif
-
diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp
index 21ff80f033..076c5861a2 100644
--- a/engines/kyra/wsamovie.cpp
+++ b/engines/kyra/wsamovie.cpp
@@ -95,7 +95,7 @@ int WSAMovie_v1::open(const char *filename, int offscreenDecode, Palette *palBuf
 
 	for (int i = 1; i < _numFrames + 2; ++i) {
 		_frameOffsTable[i] = READ_LE_UINT32(wsaData);
-	   	if (_frameOffsTable[i])
+		if (_frameOffsTable[i])
 			_frameOffsTable[i] -= frameDataOffs;
 		wsaData += 4;
 	}
-- 
cgit v1.2.3


From 40b1b794ae1cdc8524271f5cc522c82cb5a7fd59 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 12 Dec 2011 22:23:30 +0100
Subject: KYRA: make bool variable const (again)

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

(limited to 'engines')

diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index ceb3ef6728..56687d60b3 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -202,7 +202,7 @@ void KyraMetaEngine::removeSaveState(const char *target, int slot) const {
 SaveStateDescriptor KyraMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
 	Common::String filename = Kyra::KyraEngine_v1::getSavegameFilename(target, slot);
 	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename);
-	bool nonKyraGame = ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("lol") || ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("eob") || ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("eob2");
+	const bool nonKyraGame = ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("lol") || ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("eob") || ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("eob2");
 
 	if (in) {
 		Kyra::KyraEngine_v1::SaveHeader header;
-- 
cgit v1.2.3


From 53e1bf21ecced447192f75067f0232c08d24d647 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Wed, 14 Dec 2011 00:44:12 +0100
Subject: KYRA: (EOB) - get rid of loadVGAPalette7bit()

(slightly change VGA palette loader to accomodate EOB1 palettes)
---
 engines/kyra/screen.cpp | 17 ++---------------
 engines/kyra/screen.h   |  5 -----
 2 files changed, 2 insertions(+), 20 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 9a8bff6346..8dc53baa2f 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -3057,9 +3057,6 @@ bool Screen::loadPalette(const char *filename, Palette &pal) {
 	} else if (_vm->gameFlags().platform == Common::kPlatformPC98 && _use16ColorMode) {
 		numCols = stream->size() / Palette::kPC98BytesPerColor;
 		pal.loadPC98Palette(*stream, 0, MIN(maxCols, numCols));
-	} else if (_vm->gameFlags().gameID == GI_EOB1) {
-		numCols = stream->size() / Palette::kVGABytesPerColor;
-		pal.loadVGAPalette7bit(*stream, 0, MIN(maxCols, numCols));
 	} else {
 		numCols = stream->size() / Palette::kVGABytesPerColor;
 		pal.loadVGAPalette(*stream, 0, MIN(maxCols, numCols));
@@ -3524,19 +3521,9 @@ Palette::~Palette() {
 void Palette::loadVGAPalette(Common::ReadStream &stream, int startIndex, int colors) {
 	assert(startIndex + colors <= _numColors);
 
-	stream.read(_palData + startIndex * 3, colors * 3);
-}
-
-void Palette::loadVGAPalette7bit(Common::ReadStream &stream, int startIndex, int colors) {
-	assert(startIndex + colors <= _numColors);
-
-	stream.read(_palData + startIndex * 3, colors * 3);
 	uint8 *pos = _palData + startIndex * 3;
-	for (int i = 0 ; i < colors; i++) {
-		*pos++ &= 0x3f;
-		*pos++ &= 0x3f;
-		*pos++ &= 0x3f;
-	}
+	for (int i = 0 ; i < colors * 3; i++)
+		*pos++ = stream.readByte() & 0x3f;
 }
 
 void Palette::loadAmigaPalette(Common::ReadStream &stream, int startIndex, int colors) {
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index 2db84157b3..7912e59973 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -251,11 +251,6 @@ public:
 	 */
 	void loadVGAPalette(Common::ReadStream &stream, int startIndex, int colors);
 
-	/**
-	 * Load a VGA palette from the given stream masking out the upper bit.
-	 */
-	void loadVGAPalette7bit(Common::ReadStream &stream, int startIndex, int colors);
-
 	/**
 	 * Load a AMIGA palette from the given stream.
 	 */
-- 
cgit v1.2.3


From c0e782fd0b2ba9de69563e8bcb4fb43e2f311b35 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 13 Dec 2011 22:04:06 +0100
Subject: KYRA: (EOB) - Start implementing EOB1 party transfer (not working
 yet)

(ScummVM specific solution which allows the selection of save files of all configured EOB1 targets)
---
 engines/kyra/chargen.cpp       | 157 +++++++++++++++++++++++++++++++++++++++--
 engines/kyra/eobcommon.cpp     |   3 +-
 engines/kyra/eobcommon.h       |   4 +-
 engines/kyra/gui.cpp           |  12 ++--
 engines/kyra/gui.h             |   4 +-
 engines/kyra/gui_eob.cpp       |  76 ++++++++++++++++++--
 engines/kyra/gui_eob.h         |   4 ++
 engines/kyra/gui_hof.cpp       |   2 +-
 engines/kyra/gui_lok.cpp       |   4 +-
 engines/kyra/gui_lol.cpp       |   2 +-
 engines/kyra/gui_mr.cpp        |   2 +-
 engines/kyra/gui_v2.cpp        |   4 +-
 engines/kyra/kyra_v1.h         |   2 +-
 engines/kyra/saveload.cpp      |   4 +-
 engines/kyra/saveload_eob.cpp  |  23 +++---
 engines/kyra/staticres_eob.cpp |  41 +++++++++--
 16 files changed, 297 insertions(+), 47 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 2990c6eca6..b326f92caf 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -26,8 +26,13 @@
 #include "kyra/resource.h"
 #include "kyra/sound_intern.h"
 
+#include "common/savefile.h"
+#include "common/str-array.h"
+
 namespace Kyra {
 
+// Character Generator
+
 class CharacterGenerator {
 public:
 	CharacterGenerator(EoBCoreEngine *vm, Screen_EoB *screen);
@@ -191,7 +196,7 @@ bool CharacterGenerator::start(EoBCharacter *characters, uint8 ***faceShapes) {
 				loop = false;
 			} else {
 				_activeBox = inputFlag;
-				inputFlag = 43;
+				inputFlag = _vm->_keyMap[Common::KEYCODE_RETURN];
 			}
 		}
 
@@ -1426,13 +1431,157 @@ const int16 CharacterGenerator::_raceModifiers[] = {
 	0, 0, 0, 0,	1, -1, 0, 1, -1, 0, 0, 0, -1, 0, 0, 1, 0, 0
 };
 
+// Transfer Party
+
+class TransferPartyWiz {
+public:
+	TransferPartyWiz(EoBCoreEngine *vm, Screen_EoB *screen);
+	~TransferPartyWiz();
+
+	bool start();
+
+private:
+	bool selectAndLoadTransferFile();
+	Common::String transferFileDialogue();
+
+	void convertStats();
+
+	EoBCoreEngine *_vm;
+	Screen_EoB *_screen;
+};
+
+TransferPartyWiz::TransferPartyWiz(EoBCoreEngine *vm, Screen_EoB *screen) : _vm(vm), _screen(screen) {
+}
+
+TransferPartyWiz::~TransferPartyWiz() {
+
+}
+
+bool TransferPartyWiz::start() {
+	_screen->copyPage(0, 12);
+
+	if (!selectAndLoadTransferFile())
+		return false;
+
+	convertStats();
+
+	return true;
+}
+
+bool TransferPartyWiz::selectAndLoadTransferFile() {
+	for (int numLoops = 1; numLoops; numLoops--)  {
+		_screen->copyPage(12, 0);
+		_vm->_savegameFilename = transferFileDialogue();
+		if (_vm->_savegameFilename.empty()) {
+			if (_vm->_gui->confirmDialogue2(15, 68, 1))
+				numLoops++;
+		}
+	}
+
+	if (_vm->_savegameFilename.equals(_vm->_saveLoadStrings[1]))
+		return false;
+
+	if (_vm->loadGameState(-1).getCode() != Common::kNoError)
+		return false;
+
+	return true;
+}
+
+Common::String TransferPartyWiz::transferFileDialogue() {
+	Common::StringArray saveFileList = _vm->_saveFileMan->listSavefiles("*.*");
+	Common::StringArray targets;
+	Common::String tfile;
+
+	KyraEngine_v1::SaveHeader header;
+	Common::InSaveFile *in;
+
+	for (Common::StringArray::iterator i = saveFileList.begin(); i != saveFileList.end(); ++i) {
+		if (!(in = _vm->_saveFileMan->openForLoading(*i)))
+			continue;
+
+		if (KyraEngine_v1::readSaveHeader(in, false, header)) {
+			delete in;
+			continue;
+		}
+
+		delete in;
+
+		if (header.gameID != GI_EOB1)
+			continue;
+
+		i->insertChar('\0', i->size() - 4);
+
+		Common::StringArray::iterator ii = targets.begin();
+		for (; ii != targets.end(); ++ii) {
+			if (!i->compareToIgnoreCase(*ii))
+				break;
+		}
+
+		if (ii == targets.end())
+			targets.push_back(*i);
+	}
+
+	if (targets.begin() == targets.end())
+		return tfile;
+
+	Common::String target = _vm->_gui->transferTargetMenu(targets);
+	_screen->copyPage(12, 0);
+
+	if (target.equals(_vm->_saveLoadStrings[1]))
+		return target;
+
+	tfile = target + ".fin";
+	in = _vm->_saveFileMan->openForLoading(tfile);
+	if (in) {
+		delete in;
+		if (_vm->_gui->confirmDialogue2(15, -2, 1))
+			return tfile;
+	}
+
+	_screen->copyPage(12, 0);
+
+	tfile = _vm->_gui->transferFileMenu(target);
+	_screen->copyPage(12, 0);
+
+	return tfile;
+}
+
+void TransferPartyWiz::convertStats() {
+	for (int i = 0; i < 6; i++) {
+		EoBCharacter *c = &_vm->_characters[i];
+		uint32 aflags = 0;
+
+		for (int ii = 0; ii < 25; ii++) {
+			if (c->mageSpellsAvailableFlags & (1 << ii)) {
+				int8 f = (int8)_vm->_transferConvertTable[i + 1] - 1;
+				if (f != -1)
+					aflags |= (1 << f);
+			}
+		}
+		c->mageSpellsAvailableFlags = aflags;
+
+		c->flags &= 1;
+		c->hitPointsCur = c->hitPointsMax;
+		c->food = 100;
+
+		for (int ii = 0; ii < 3; ii++) {
+			int t = _vm->getCharacterClassType(c->cClass, ii);
+			if (t == -1)
+				continue;
+			if (c->experience[ii] < _vm->_transferExpTable[t])
+				c->experience[ii] = _vm->_transferExpTable[t];
+		}
+	}
+}
+
+// Start functions
+
 bool EoBCoreEngine::startCharacterGeneration() {
 	return CharacterGenerator(this, _screen).start(_characters, &_faceShapes);
 }
 
-bool EoBCoreEngine::transferParty() {
-
-	return false;
+bool EoBCoreEngine::startPartyTransfer() {
+	return TransferPartyWiz(this, _screen).start();
 }
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index ebd26d3c18..c64f60b3fd 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -167,6 +167,7 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags) : KyraRpgE
 	_expObjectAnimTbl1Size = _expObjectAnimTbl2Size = _expObjectAnimTbl3Size = _wllFlagPresetSize = _scriptTimersCount = _buttonList1Size = _buttonList2Size =
 		_buttonList3Size = _buttonList4Size = _buttonList5Size = _buttonList6Size = _buttonList7Size = _buttonList8Size = 0;
 	_inventorySlotsY = _mnDef = 0;
+	_transferStringsScummVM = 0;
 	_buttonDefs = 0;
 	_npcPreset = 0;
 	_chargenStatStrings	= _chargenRaceSexStrings = _chargenClassStrings = _chargenAlignmentStrings = _pryDoorStrings = _warningStrings = _ripItemStrings =
@@ -463,7 +464,7 @@ Common::Error EoBCoreEngine::go() {
 				startupNew();
 		} else if (action == -3) {
 			// transfer party
-			repeatLoop = transferParty();
+			repeatLoop = startPartyTransfer();
 			if (repeatLoop && !shouldQuit())
 				startupNew();
 		}
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index af16df7f44..f489f8742b 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -245,6 +245,7 @@ friend class GUI_EoB;
 friend class EoBInfProcessor;
 friend class DarkmoonSequenceHelper;
 friend class CharacterGenerator;
+friend class TransferPartyWiz;
 public:
 	EoBCoreEngine(OSystem *system, const GameFlags &flags);
 	virtual ~EoBCoreEngine();
@@ -318,7 +319,7 @@ protected:
 
 	// Character generation / party transfer
 	bool startCharacterGeneration();
-	bool transferParty();
+	bool startPartyTransfer();
 
 	uint8 **_faceShapes;
 
@@ -1125,6 +1126,7 @@ protected:
 	const char *_menuOkString;
 
 	const char *const *_menuStringsTransfer;
+	const char *const *_transferStringsScummVM;
 	const char *const *_menuStringsSpec;
 	const char *const *_menuStringsSpellNo;
 	const char *const *_menuYesNoStrings;
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index e2195cad17..cc32a9785a 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -46,8 +46,8 @@ GUI::~GUI() {
 	}
 }
 
-void GUI::updateSaveFileList(bool excludeQuickSaves) {
-	Common::String pattern = _vm->_targetName + ".???";
+void GUI::updateSaveFileList(Common::String targetName, bool excludeQuickSaves) {
+	Common::String pattern = targetName + ".???";
 	Common::StringArray saveFileList = _vm->_saveFileMan->listSavefiles(pattern);
 	_saveSlots.clear();
 
@@ -93,8 +93,8 @@ int GUI::getNextSavegameSlot() {
 	return 0;
 }
 
-void GUI::updateSaveSlotsList() {
-	if (!_saveSlotsListUpdateNeeded)
+void GUI::updateSaveSlotsList(Common::String targetName, bool force) {
+	if (!_saveSlotsListUpdateNeeded && !force)
 		return;
 
 	_saveSlotsListUpdateNeeded = false;
@@ -105,7 +105,7 @@ void GUI::updateSaveSlotsList() {
 		delete[] _savegameList;
 	}
 
-	updateSaveFileList(true);
+	updateSaveFileList(targetName, true);
 	int numSaves = _savegameListSize = _saveSlots.size();
 	bool allowEmptySlots = (_vm->game() == GI_EOB1 || _vm->game() == GI_EOB2);
 
@@ -120,7 +120,7 @@ void GUI::updateSaveSlotsList() {
 		memset(_savegameList, 0, _savegameListSize * sizeof(char*));
 
 		for (int i = 0; i < numSaves; i++) {
-			in = _vm->openSaveForReading(_vm->getSavegameFilename(_saveSlots[i]), header);
+			in = _vm->openSaveForReading(_vm->getSavegameFilename(targetName, _saveSlots[i]).c_str(), header, targetName == _vm->_targetName);
 			char **listEntry = &_savegameList[allowEmptySlots? _saveSlots[i] : i];
 			if (in) {
 				*listEntry = new char[header.description.size() + 1];
diff --git a/engines/kyra/gui.h b/engines/kyra/gui.h
index 2b32bf38f6..854f10e85d 100644
--- a/engines/kyra/gui.h
+++ b/engines/kyra/gui.h
@@ -118,9 +118,9 @@ protected:
 	// Since ScummVM's savegame indices aren't, we re-index them.
 	// The integers stored in _saveSlots are ScummVM savegame indices.
 	Common::Array<int> _saveSlots;
-	void updateSaveFileList(bool excludeQuickSaves = false);
+	void updateSaveFileList(Common::String targetName, bool excludeQuickSaves = false);
 	int getNextSavegameSlot();
-	void updateSaveSlotsList();
+	void updateSaveSlotsList(Common::String targetName, bool force = false);
 
 	virtual void sortSaveSlots();
 
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 1930ab1e59..ab92e08046 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -2220,6 +2220,7 @@ bool GUI_EoB::runLoadMenu(int x, int y) {
 	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
 
 	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+		updateSaveSlotsList(_vm->_targetName);
 		int slot = selectSaveSlotDialogue(x, y, 1);
 		if (slot > 5) {
 			runLoop = result = false;
@@ -2495,6 +2496,66 @@ int GUI_EoB::getTextInput(char *dest, int x, int y, int destMaxLen, int textColo
 	return _keyPressed.keycode == Common::KEYCODE_ESCAPE ? -1 : len;
 }
 
+Common::String GUI_EoB::transferTargetMenu(Common::Array<Common::String> &targets) {
+	_savegameListSize = targets.size();
+	if (_savegameList) {
+		for (int i = 0; i < _savegameListSize; i++)
+			delete[] _savegameList[i];
+		delete[] _savegameList;
+	}
+	_savegameList = new char*[_savegameListSize];
+	memset(_savegameList, 0, _savegameListSize * sizeof(char*));
+
+	Common::StringArray::iterator ii = targets.begin();
+	for (int i = 0; i < _savegameListSize; ++i) {
+		_savegameList[i] = new char[(*ii).size() + 1];
+		strcpy(_savegameList[i], (*ii++).c_str());
+	}
+
+	const ScreenDim *dm = _screen->getScreenDim(11);
+	int xo = dm->sx;
+	int yo = dm->sy;
+	_screen->modifyScreenDim(11, dm->sx + 9, dm->sy + 14, dm->w, dm->h);
+
+	int slot = 0;
+	do {
+		slot = selectSaveSlotDialogue(72, 14, 2);
+		if (slot == 6)
+			break;
+	} while (_saveSlotIdTemp[slot] == -1);
+
+	_screen->copyRegion(72, 14, 72, 14, 176, 144, 12, 0, Screen::CR_NO_P_CHECK);
+	_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
+
+	return (slot < 6) ? _savegameList[_savegameOffset + slot] : _vm->_saveLoadStrings[1];
+}
+
+Common::String GUI_EoB::transferFileMenu(Common::String &target) {
+	updateSaveSlotsList(target, true);
+	_saveSlotsListUpdateNeeded = true;
+
+	const ScreenDim *dm = _screen->getScreenDim(11);
+	int xo = dm->sx;
+	int yo = dm->sy;
+	_screen->modifyScreenDim(11, dm->sx + 9, dm->sy + 14, dm->w, dm->h);
+
+	int slot = 0;
+	do {
+		slot = selectSaveSlotDialogue(72, 14, 4);
+		if (slot < 6) {
+			if (_saveSlotIdTemp[slot] == -1)
+				messageDialogue(11, 65, 6);
+			else {
+				_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
+				return _vm->getSavegameFilename(target, _saveSlotIdTemp[slot]);
+			}
+		}
+	} while (_saveSlotIdTemp[slot] == -1);
+
+	_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
+	return _vm->_saveLoadStrings[1];
+}
+
 void GUI_EoB::createScreenThumbnail(Graphics::Surface &dst) {
 	uint8 *screenPal = new uint8[768];
 	_screen->getRealPalette(0, screenPal);
@@ -2528,6 +2589,7 @@ bool GUI_EoB::runSaveMenu(int x, int y) {
 	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
 
 	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+		updateSaveSlotsList(_vm->_targetName);
 		int slot = selectSaveSlotDialogue(x, y, 0);
 		if (slot > 5) {
 			runLoop = result = false;
@@ -2575,16 +2637,14 @@ bool GUI_EoB::runSaveMenu(int x, int y) {
 }
 
 int GUI_EoB::selectSaveSlotDialogue(int x, int y, int id) {
-	assert (id < 2);
-
 	_saveSlotX = _saveSlotY = 0;
 	_screen->setCurPage(2);
 
-	updateSaveSlotsList();
 	_savegameOffset = 0;
 
 	drawMenuButtonBox(0, 0, 176, 144, false, false);
-	_screen->printShadedText(_vm->_saveLoadStrings[2 + id], 52, 5, 15, 0);
+	const char *title = (id < 2) ? _vm->_saveLoadStrings[2 + id] : _vm->_transferStringsScummVM[id - 1];
+	_screen->printShadedText(title, 52, 5, 15, 0);
 
 	_screen->copyRegion(0, 0, x, y, 176, 144, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->setCurPage(0);
@@ -3806,8 +3866,10 @@ const char *GUI_EoB::getMenuString(int id) {
 
 	if (id >= 69)
 		return _vm->_menuStringsTransfer[id - 69];
-	else if (id >= 67)
-		return _vm->_menuStringsDefeat[id - 67];
+	else  if (id == 68)
+		return _vm->_transferStringsScummVM[0];
+	else if (id == 67)
+		return _vm->_menuStringsDefeat[0];
 	else if (id == 66)
 		return _vm->_errorSlotEmptyString;
 	else if (id == 65)
@@ -3846,6 +3908,8 @@ const char *GUI_EoB::getMenuString(int id) {
 		return _vm->_menuStringsSaveLoad[id - 9];
 	else if (id >= 1)
 		return _vm->_menuStringsMain[id - 1];
+	else if (id < 0)
+		return _vm->_transferStringsScummVM[-id];
 	return empty;
 }
 
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index 95dedcf418..d8ce9bd234 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -69,6 +69,10 @@ public:
 
 	int getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor);
 
+	// Transfer party
+	Common::String transferTargetMenu(Common::Array<Common::String> &targets);
+	Common::String transferFileMenu(Common::String &target);
+
 	// utilities for thumbnail creation
 	void createScreenThumbnail(Graphics::Surface &dst);
 
diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui_hof.cpp
index 8d968ec58c..c1bfee066f 100644
--- a/engines/kyra/gui_hof.cpp
+++ b/engines/kyra/gui_hof.cpp
@@ -1148,7 +1148,7 @@ int GUI_HoF::sliderHandler(Button *caller) {
 }
 
 int GUI_HoF::loadMenu(Button *caller) {
-	updateSaveFileList();
+	updateSaveFileList(_vm->_targetName);
 
 	if (!_vm->_menuDirectlyToLoad) {
 		updateMenuButton(caller);
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp
index e66b3cec51..2a2828d45a 100644
--- a/engines/kyra/gui_lok.cpp
+++ b/engines/kyra/gui_lok.cpp
@@ -596,7 +596,7 @@ void GUI_LoK::setupSavegames(Menu &menu, int num) {
 }
 
 int GUI_LoK::saveGameMenu(Button *button) {
-	updateSaveFileList();
+	updateSaveFileList(_vm->_targetName);
 
 	updateMenuButton(button);
 	_menu[2].item[5].enabled = true;
@@ -636,7 +636,7 @@ int GUI_LoK::saveGameMenu(Button *button) {
 }
 
 int GUI_LoK::loadGameMenu(Button *button) {
-	updateSaveFileList();
+	updateSaveFileList(_vm->_targetName);
 
 	if (_vm->_menuDirectlyToLoad) {
 		_menu[2].item[5].enabled = false;
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index 6a8e6e13b7..249471315d 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -2228,7 +2228,7 @@ int GUI_LoL::runMenu(Menu &menu) {
 		_vm->_mouseX = _vm->_mouseY = 0;
 
 		if (_currentMenu == &_loadMenu || _currentMenu == &_saveMenu || _currentMenu == &_deleteMenu) {
-			updateSaveSlotsList();
+			updateSaveSlotsList(_vm->_targetName);
 			setupSaveMenuSlots(*_currentMenu, 4);
 		}
 
diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp
index b8bf8f43e2..e88b7fdffb 100644
--- a/engines/kyra/gui_mr.cpp
+++ b/engines/kyra/gui_mr.cpp
@@ -1277,7 +1277,7 @@ int GUI_MR::optionsButton(Button *button) {
 }
 
 int GUI_MR::loadMenu(Button *caller) {
-	updateSaveFileList();
+	updateSaveFileList(_vm->_targetName);
 
 	if (!_vm->_menuDirectlyToLoad) {
 		updateMenuButton(caller);
diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp
index 27b329c25a..0e19d48196 100644
--- a/engines/kyra/gui_v2.cpp
+++ b/engines/kyra/gui_v2.cpp
@@ -594,7 +594,7 @@ int GUI_v2::cancelLoadMenu(Button *caller) {
 }
 
 int GUI_v2::saveMenu(Button *caller) {
-	updateSaveFileList();
+	updateSaveFileList(_vm->_targetName);
 
 	updateMenuButton(caller);
 
@@ -690,7 +690,7 @@ int GUI_v2::cancelSaveMenu(Button *caller) {
 }
 
 int GUI_v2::deleteMenu(Button *caller) {
-	updateSaveFileList();
+	updateSaveFileList(_vm->_targetName);
 
 	updateMenuButton(caller);
 	if (_saveSlots.size() < 2) {
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index f530c02980..e66f0fb5d7 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -424,7 +424,7 @@ protected:
 	Common::Error saveGameState(int slot, const Common::String &desc) { return saveGameStateIntern(slot, desc.c_str(), 0); }
 	virtual Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail) = 0;
 
-	Common::SeekableReadStream *openSaveForReading(const char *filename, SaveHeader &header);
+	Common::SeekableReadStream *openSaveForReading(const char *filename, SaveHeader &header, bool checkID = true);
 	Common::WriteStream *openSaveForWriting(const char *filename, const char *saveName, const Graphics::Surface *thumbnail) const;
 
 	// TODO: Consider moving this to Screen
diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index 42c5d3e8a8..e9c61b0761 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -122,7 +122,7 @@ KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::Seekab
 	return ((in->err() || in->eos()) ? kRSHEIoError : kRSHENoError);
 }
 
-Common::SeekableReadStream *KyraEngine_v1::openSaveForReading(const char *filename, SaveHeader &header) {
+Common::SeekableReadStream *KyraEngine_v1::openSaveForReading(const char *filename, SaveHeader &header, bool checkID) {
 	Common::SeekableReadStream *in = 0;
 	if (!(in = _saveFileMan->openForLoading(filename)))
 		return 0;
@@ -142,7 +142,7 @@ Common::SeekableReadStream *KyraEngine_v1::openSaveForReading(const char *filena
 
 	if (!header.originalSave) {
 		if (!header.oldHeader) {
-			if (header.gameID != _flags.gameID) {
+			if (header.gameID != _flags.gameID && checkID) {
 				warning("Trying to load game state from other game (save game: %u, running game: %u)", header.gameID, _flags.gameID);
 				delete in;
 				return 0;
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 31f202362a..714033b569 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -32,23 +32,19 @@
 namespace Kyra {
 
 Common::Error EoBCoreEngine::loadGameState(int slot) {
-	const char *fileName = 0;
-
-	if (slot == -1) {
-		_savegameFilename = /*_targetName + */Common::String("eob.fin");
-		fileName = _savegameFilename.c_str();
-	} else {
-		fileName = getSavegameFilename(slot);
-	}
+	// Special slot id -1 for EOB1 party transfer
+	const char *fileName = (slot == -1) ? _savegameFilename.c_str() : getSavegameFilename(slot);
 
 	SaveHeader header;
-	Common::InSaveFile *saveFile = openSaveForReading(fileName, header);
+	Common::InSaveFile *saveFile = openSaveForReading(fileName, header, (slot != -1));
 	if (!saveFile)
 		return Common::Error(Common::kReadingFailed);
 
 	Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, DisposeAfterUse::YES);
 	_loading = true;
-	_screen->fadeToBlack(10);
+
+	if (slot != -1)
+		_screen->fadeToBlack(10);
 
 	for (int i = 0; i < 6; i++) {
 		EoBCharacter *c = &_characters[i];
@@ -77,6 +73,8 @@ Common::Error EoBCoreEngine::loadGameState(int slot) {
 		c->cClass = in.readByte();
 		c->alignment = in.readByte();
 		c->portrait = in.readSByte();
+		if (slot == -1 && c->portrait < 0)
+			c->portrait += 43;
 		c->food = in.readByte();
 		in.read(c->level, 3);
 		for (int ii = 0; ii < 3; ii++)
@@ -120,6 +118,10 @@ Common::Error EoBCoreEngine::loadGameState(int slot) {
 	}
 	_screen->_curPage = 0;
 
+	// No more data required for party transfer
+	if (slot == -1)
+		return Common::kNoError;
+
 	_currentLevel = in.readByte();
 	_currentSub = in.readSByte();
 	_currentBlock = in.readUint16BE();
@@ -303,6 +305,7 @@ Common::Error EoBCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 	Common::String saveNameTmp;
 	const char *fileName = 0;
 
+	// Special slot id -1 to create final save for party transfer
 	if (slot == -1) {
 		_savegameFilename = _targetName + Common::String(".fin");
 		fileName = _savegameFilename.c_str();
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index c99e0a8234..8ab16f5da9 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -473,15 +473,8 @@ void EoBCoreEngine::initStaticResource() {
 		0
 	};
 
-	static const char *errorSlotNoNameString[3] = {
-		" You must specify\r a name for your\r save game!",
-		" Spielstände müssen\r einen Namen haben!",
-		0
-	};
-
 	_saveLoadStrings = saveLoadStrings[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
 	_errorSlotEmptyString = errorSlotEmptyString[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
-	_errorSlotNoNameString = errorSlotNoNameString[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
 	_menuOkString = "OK";
 }
 
@@ -1107,6 +1100,14 @@ void EoBEngine::initStaticResource() {
 		p->tuResist = (int8)*ps++;
 		p->dmgModifierEvade = *ps++;
 	}
+
+	static const char *errorSlotNoNameString[3] = {
+		" You must specify\r a name for your\r save game!",
+		" Spielstaende mues-\r sen einen Namen\r haben!",
+		0
+	};
+
+	_errorSlotNoNameString = errorSlotNoNameString[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
 }
 
 void EoBEngine::initSpells() {
@@ -1241,6 +1242,32 @@ void DarkMoonEngine::initStaticResource() {
 	_wallOfForceDsNumW = _staticres->loadRawData(kEoB2WallOfForceNumW, temp);
 	_wallOfForceDsNumH = _staticres->loadRawData(kEoB2WallOfForceNumH, temp);
 	_wallOfForceShpId = _staticres->loadRawData(kEoB2WallOfForceShpId, temp);
+
+	static const char *errorSlotNoNameString[3] = {
+		" You must specify\r a name for your\r save game!",
+		" Spielst[nde m]ssen\r einen Namen haben!",
+		0
+	};
+
+	_errorSlotNoNameString = errorSlotNoNameString[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
+
+	// ScummVM specific
+	static const char *transferStringsScummVM[3][4] = {
+		{	"\r We cannot find any EOB save game\r file. Please make sure that the\r save game file with the party\r you wish to transfer is located\r in your ScummVM save game\r directory. If you have set up\r multiple save directories you\r have to copy the EOB save file\r into your EOB II save directory.\r Do you wish to try again?",
+			"Game ID",
+			"\r It seems that you have already\r defeated Xanathar here. Do you\r wish to transfer the party that\r finished the game? If not, you\r will be able to select a save\r game from the save game\r dialogue.",
+			"Select File"
+		},
+		{	"\r Kein EOB-Spielstand zu finden.\r Bitte Spielstandsdatei mit der\r zu ]bernehmenden Gruppe in das\r ScummVM Spielstands-Verzeichnis\r kopieren. Bei mehreren Spiel-\r stands-Verzeichnissen bitte\r den EOB-Spielstand in das\r EOB II-Spielstands-Verzeichnis\r kopieren. Nochmal versuchen?",
+			"Game ID",
+			"\r Wie es scheint, wurde Xanathar\r hier bereits besiegt. Soll die\r Gruppe, mit der das Spiel be-\r endet wurde, ]bernommen werden?\r Falls nicht, kann ein Spielstand\r aus der Spielstandsliste gew[hlt\r werden.",
+			"Spiel W[hlen"
+		},
+		{	0, 0, 0, 0
+		}
+	};
+
+	_transferStringsScummVM = transferStringsScummVM[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
 }
 
 void DarkMoonEngine::initSpells() {
-- 
cgit v1.2.3


From d807b3d42b4a49dfe8262f496f9b341aef3c8bdd Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sat, 17 Dec 2011 22:55:19 +0100
Subject: KYRA: (EOB) - implement EOB1 party transfer

---
 engines/kyra/chargen.cpp       | 412 +++++++++++++++++++++++++++++++++++++++--
 engines/kyra/eobcommon.cpp     |   5 +-
 engines/kyra/eobcommon.h       |   3 -
 engines/kyra/gui_eob.cpp       | 104 ++++++-----
 engines/kyra/gui_eob.h         |   3 +-
 engines/kyra/items_eob.cpp     |   2 +
 engines/kyra/resource.h        |   6 +
 engines/kyra/saveload_eob.cpp  |  68 ++++---
 engines/kyra/staticres_eob.cpp |  11 +-
 9 files changed, 504 insertions(+), 110 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index b326f92caf..16911a3ddd 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -69,7 +69,7 @@ private:
 	void finish();
 
 	uint8 **_chargenMagicShapes;
-	uint8 **_chargenButtonLabels;
+	uint8 *_chargenButtonLabels[17];
 	int _activeBox;
 	int _magicShapesBox;
 	int _updateBoxShapesIndex;
@@ -115,7 +115,7 @@ private:
 };
 
 CharacterGenerator::CharacterGenerator(EoBCoreEngine *vm, Screen_EoB *screen) : _vm(vm), _screen(screen),
-	_characters(0), _faceShapes(0), _chargenMagicShapes(0), _chargenButtonLabels(0), _chargenMagicShapeTimer(0),
+	_characters(0), _faceShapes(0), _chargenMagicShapes(0), _chargenMagicShapeTimer(0),
 	_updateBoxShapesIndex(0), _lastUpdateBoxShapesIndex(0), _magicShapesBox(6), _activeBox(0) {
 
 	_chargenStatStrings = _vm->_chargenStatStrings;
@@ -145,11 +145,8 @@ CharacterGenerator::~CharacterGenerator() {
 		delete[] _chargenMagicShapes;
 	}
 
-	if (_chargenButtonLabels) {
-		for (int i = 0; i < 17; i++)
-			delete[] _chargenButtonLabels[i];
-		delete[] _chargenButtonLabels;
-	}
+	for (int i = 0; i < 17; i++)
+		delete[] _chargenButtonLabels[i];
 }
 
 bool CharacterGenerator::start(EoBCharacter *characters, uint8 ***faceShapes) {
@@ -261,7 +258,6 @@ void CharacterGenerator::init() {
 	for (int i = 0; i < 10; i++)
 		_chargenMagicShapes[i] = _screen->encodeShape(i << 2, 0, 4, 32, true);
 
-	_chargenButtonLabels = new uint8*[17];
 	for (int i = 0; i < 17; i++) {
 		const CreatePartyModButton *c = &_chargenModButtons[i];
 		_chargenButtonLabels[i] = c->labelW? _screen->encodeShape(c->encodeLabelX, c->encodeLabelY, c->labelW, c->labelH, true) : 0;
@@ -1322,12 +1318,8 @@ void CharacterGenerator::finish() {
 		_chargenMagicShapes = 0;
 	}
 
-	if (_chargenButtonLabels) {
-		for (int i = 0; i < 17; i++)
-			delete[] _chargenButtonLabels[i];
-		delete[] _chargenButtonLabels;
-		_chargenButtonLabels = 0;
-	}
+	for (int i = 0; i < 17; i++)
+		delete[] _chargenButtonLabels[i];
 }
 
 const EoBChargenButtonDef CharacterGenerator::_chargenButtonDefs[] = {
@@ -1444,17 +1436,45 @@ private:
 	bool selectAndLoadTransferFile();
 	Common::String transferFileDialogue();
 
+	int selectCharactersMenu();
+	void drawCharPortraitWithStats(int charIndex, bool enabled);
+	void updateHighlight(int index);
+
 	void convertStats();
+	void convertInventory();
+	Item convertItem(Item eob1Item);
+	void giveKhelbensCoin();
 
 	EoBCoreEngine *_vm;
 	Screen_EoB *_screen;
+
+	int _highlight;
+	EoBItem *_oldItems;
+
+	const uint16 *_portraitFrames;
+	const uint8 *_convertTable;
+	const uint8 *_itemTable;
+	const uint32 *_expTable;
+	const char *const *_strings1;
+	const char *const *_strings2;
+	const char *const *_labels;
 };
 
 TransferPartyWiz::TransferPartyWiz(EoBCoreEngine *vm, Screen_EoB *screen) : _vm(vm), _screen(screen) {
+	int temp;
+	_portraitFrames = _vm->staticres()->loadRawDataBe16(kEoB2TransferPortraitFrames, temp);
+	_convertTable = _vm->staticres()->loadRawData(kEoB2TransferConvertTable, temp);
+	_itemTable = _vm->staticres()->loadRawData(kEoB2TransferItemTable, temp);
+	_expTable = _vm->staticres()->loadRawDataBe32(kEoB2TransferExpTable, temp);
+	_strings1 = _vm->staticres()->loadStrings(kEoB2TransferStrings1, temp);
+	_strings2 = _vm->staticres()->loadStrings(kEoB2TransferStrings2, temp);
+	_labels = _vm->staticres()->loadStrings(kEoB2TransferLabels, temp);
+	_highlight = -1;
+	_oldItems = 0;
 }
 
 TransferPartyWiz::~TransferPartyWiz() {
-
+	delete[] _oldItems;
 }
 
 bool TransferPartyWiz::start() {
@@ -1465,11 +1485,39 @@ bool TransferPartyWiz::start() {
 
 	convertStats();
 
+	_oldItems = new EoBItem[600];
+	memcpy(_oldItems, _vm->_items, sizeof(EoBItem) * 600);
+	_vm->loadItemDefs();
+
+	int selection = selectCharactersMenu();
+	if (selection == 0) {
+		for (int i = 0; i < 6; i++)
+			delete[] _vm->_characters[i].faceShape;
+		memset(_vm->_characters, 0, sizeof(EoBCharacter) * 6);
+		return false;
+	}
+
+	int ch = 0;
+	for (int i = 0; i < 6; i++) {
+		if (selection & (1 << i)) {
+			if (ch != i) {
+				delete[] _vm->_characters[ch].faceShape;
+				memcpy(&_vm->_characters[ch], &_vm->_characters[i], sizeof(EoBCharacter));
+				_vm->_characters[i].faceShape = 0;
+			}
+			ch++;
+		}
+	}
+	memset(&_vm->_characters[4], 0, sizeof(EoBCharacter) * 2);
+
+	convertInventory();
+	giveKhelbensCoin();
+
 	return true;
 }
 
 bool TransferPartyWiz::selectAndLoadTransferFile() {
-	for (int numLoops = 1; numLoops; numLoops--)  {
+	for (int numLoops = 1; numLoops; numLoops--) {
 		_screen->copyPage(12, 0);
 		_vm->_savegameFilename = transferFileDialogue();
 		if (_vm->_savegameFilename.empty()) {
@@ -1493,9 +1541,14 @@ Common::String TransferPartyWiz::transferFileDialogue() {
 	Common::String tfile;
 
 	KyraEngine_v1::SaveHeader header;
+	memset(&header, 0, sizeof(KyraEngine_v1::SaveHeader));
 	Common::InSaveFile *in;
 
+	_vm->_gui->transferWaitBox();
+
 	for (Common::StringArray::iterator i = saveFileList.begin(); i != saveFileList.end(); ++i) {
+		_vm->updateInput();
+
 		if (!(in = _vm->_saveFileMan->openForLoading(*i)))
 			continue;
 
@@ -1546,6 +1599,170 @@ Common::String TransferPartyWiz::transferFileDialogue() {
 	return tfile;
 }
 
+int TransferPartyWiz::selectCharactersMenu() {
+	_screen->setCurPage(2);
+	_screen->setFont(Screen::FID_6_FNT);
+	_screen->clearCurPage();
+
+	_vm->gui_drawBox(0, 0, 320, 163, _vm->_color1_1, _vm->_color2_1, _vm->_bkgColor_1);
+	_screen->printText(_strings2[0], 5, 3, 15, 0);
+	_screen->printText(_strings2[1], 5, 10, 15, 0);
+
+	for (int i = 0; i < 6; i++)
+		drawCharPortraitWithStats(i, 0);
+
+	_vm->gui_drawBox(4, 148, 43, 12, _vm->_color1_1, _vm->_color2_1, _vm->_bkgColor_1);
+	_vm->gui_drawBox(272, 148, 43, 12, _vm->_color1_1, _vm->_color2_1, _vm->_bkgColor_1);
+
+	_screen->printShadedText(_labels[0], 9, 151, 15, 0);
+	_screen->printShadedText(_labels[1], 288, 151, 15, 0);
+
+	_screen->setCurPage(0);
+	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
+
+	int selection = 0;
+	int highlight = 0;
+	bool update = false;
+
+	for (bool loop = true; loop && (!_vm->shouldQuit()); ) {
+		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
+		_vm->removeInputTop();
+
+		if (inputFlag) {
+			if (inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT]) {
+				highlight ^= 1;
+			} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_UP]) {
+				highlight -= 2;
+				if (highlight < 0)
+					highlight += 8;
+			} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_DOWN]) {
+				highlight += 2;
+				if (highlight >= 8)
+					highlight -= 8;
+			} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE]) {
+				update = true;
+			} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE]) {
+				update = true;
+				highlight = 6;
+			} else if (inputFlag == 199) {
+				for (int i = 0; i < 8; i++) {
+					int t = i << 2;
+					if (_vm->posWithinRect(_vm->_mouseX, _vm->_mouseY, _portraitFrames[t], _portraitFrames[t + 1], _portraitFrames[t + 2], _portraitFrames[t + 3])) {
+						highlight = i;
+						update = true;
+						break;
+					}
+				}
+			}
+		}
+
+		updateHighlight(highlight);
+
+		if (!update)
+			continue;
+
+		update = false;
+
+		if (highlight < 6) {
+			if (_vm->_characters[highlight].flags & 1) {
+				selection ^= (1 << highlight);
+				drawCharPortraitWithStats(highlight, (selection & (1 << highlight)) ? true : false);
+				_screen->updateScreen();
+			}
+			continue;
+		}
+
+		int x = (highlight - 6) * 268 + 4;
+		_vm->gui_drawBox(x, 148, 43, 12, _vm->_bkgColor_1, _vm->_bkgColor_1, -1);
+		_screen->updateScreen();
+		_vm->_system->delayMillis(80);
+		_vm->gui_drawBox(x, 148, 43, 12, _vm->_color1_1, _vm->_color2_1, -1);
+		_screen->updateScreen();
+
+		if (highlight == 6 || _vm->shouldQuit()) {
+			_screen->setFont(Screen::FID_8_FNT);
+			return 0;
+		}
+
+		int count = 0;
+		for (int i = 0; i < 6; i++) {
+			if (selection & (1 << i))
+				count++;
+		}
+
+		if (count == 4 || _vm->shouldQuit())
+			loop = false;
+		else
+			_vm->_gui->messageDialogue(16, count < 4 ? 69 : 70, 6);
+
+		_screen->updateScreen();
+	}
+
+	_screen->setFont(Screen::FID_8_FNT);
+	if (_vm->shouldQuit())
+		return 0;
+	else
+		_vm->_gui->messageDialogue(16, 71, 6);
+
+	return selection;
+}
+
+void TransferPartyWiz::drawCharPortraitWithStats(int charIndex, bool enabled) {
+	int16 x = (charIndex % 2) * 159;
+	int16 y = (charIndex / 2) * 40;
+	EoBCharacter *c = &_vm->_characters[charIndex];
+
+	_screen->fillRect(x + 4, y + 24, x + 36, y + 57, 12);
+	_vm->gui_drawBox(x + 40, y + 24, 118, 34, _vm->_color1_1, _vm->_color2_1, _vm->_bkgColor_1);
+
+	if (!(c->flags & 1))
+		return;
+
+	_screen->drawShape(_screen->_curPage, c->faceShape, x + 4, y + 25, 0);
+
+	int color1 = 15;
+	int color2 = 12;
+
+	if (enabled) {
+		color1 = 6;
+		color2 = 15;
+	} else {
+		_screen->drawShape(_screen->_curPage, _vm->_disabledCharGrid, x + 4, y + 25, 0);
+	}
+
+	_screen->printShadedText(c->name, x + 44, y + 27, color1, 0);
+	_screen->printText(_vm->_chargenRaceSexStrings[c->raceSex], x + 43, y + 36, color2, 0);
+	_screen->printText(_vm->_chargenClassStrings[c->cClass], x + 43, y + 43, color2, 0);
+
+	Common::String tmp = Common::String::format(_strings1[0], c->level[0]);
+	for (int i = 1; i < _vm->_numLevelsPerClass[c->cClass]; i++)
+		tmp += Common::String::format(_strings1[1], c->level[i]);
+	_screen->printText(tmp.c_str(), x + 43, y + 50, color2, 0);
+}
+
+void TransferPartyWiz::updateHighlight(int index) {
+	static const int16 xPos[] = { 9, 288 };
+	if (_highlight > 5 && _highlight != index)
+		_screen->printText(_labels[_highlight - 6], xPos[_highlight - 6], 151, 15, 0);
+
+	if (index < 6) {
+		_vm->_gui->updateBoxFrameHighLight(14 + index);
+		_highlight = index;
+		return;
+	}
+
+	if (_highlight == index)
+		return;
+
+	if (_highlight < 6)
+		_vm->_gui->updateBoxFrameHighLight(-1);
+
+	_screen->printText(_labels[index - 6], xPos[index - 6], 151, 6, 0);
+	_screen->updateScreen();
+	_highlight = index;
+}
+
 void TransferPartyWiz::convertStats() {
 	for (int i = 0; i < 6; i++) {
 		EoBCharacter *c = &_vm->_characters[i];
@@ -1553,25 +1770,182 @@ void TransferPartyWiz::convertStats() {
 
 		for (int ii = 0; ii < 25; ii++) {
 			if (c->mageSpellsAvailableFlags & (1 << ii)) {
-				int8 f = (int8)_vm->_transferConvertTable[i + 1] - 1;
+				int8 f = (int8)_convertTable[ii + 1] - 1;
 				if (f != -1)
 					aflags |= (1 << f);
 			}
 		}
 		c->mageSpellsAvailableFlags = aflags;
 
+		c->armorClass = 0;
+		c->disabledSlots = 0;
 		c->flags &= 1;
 		c->hitPointsCur = c->hitPointsMax;
 		c->food = 100;
 
+		c->effectFlags = 0;
+		c->damageTaken = 0;
+		memset(c->clericSpells, 0, sizeof(int8) * 80);
+		memset(c->mageSpells, 0, sizeof(int8) * 80);
+		memset(c->timers, 0, sizeof(uint32) * 10);
+		memset(c->events, 0, sizeof(int8) * 10);
+		memset(c->effectsRemainder, 0, sizeof(uint8) * 4);
+		memset(c->slotStatus, 0, sizeof(int8) * 5);
+
 		for (int ii = 0; ii < 3; ii++) {
 			int t = _vm->getCharacterClassType(c->cClass, ii);
 			if (t == -1)
 				continue;
-			if (c->experience[ii] < _vm->_transferExpTable[t])
-				c->experience[ii] = _vm->_transferExpTable[t];
+			if (c->experience[ii] > _expTable[t])
+				c->experience[ii] = _expTable[t];
+		}
+	}
+}
+
+void TransferPartyWiz::convertInventory() {
+	for (int i = 0; i < 4; i++) {
+		EoBCharacter *c = &_vm->_characters[i];
+
+		for (int slot = 0; slot < 27; slot++) {
+			Item itm = c->inventory[slot];
+			if (slot == 16) {
+				Item first = itm;
+				c->inventory[slot] = 0;
+
+				for (bool forceLoop = true; (itm && (itm != first)) || forceLoop; itm = _oldItems[itm].prev) {
+					forceLoop = false;
+					_vm->setItemPosition(&c->inventory[slot], -2, convertItem(itm), 0);
+				}
+			} else {
+				c->inventory[slot] = convertItem(itm);
+			}
+		}
+	}
+}
+
+Item TransferPartyWiz::convertItem(Item eob1Item) {
+	if (!eob1Item)
+		return 0;
+
+	EoBItem *itm1 = &_oldItems[eob1Item];
+
+	if (!_itemTable[itm1->type])
+		return 0;
+
+	Item newItem = _vm->duplicateItem(1);
+	EoBItem *itm2 = &_vm->_items[newItem];
+	bool match = false;
+
+	itm2->flags = itm1->flags | 0x40;
+	itm2->icon = itm1->icon;
+	itm2->type = itm1->type;
+	itm2->level = 0xff;
+
+	switch(itm2->type) {
+	case 35:
+		itm1->value += 25;
+		// fall through
+	case 34:
+		itm2->value = _convertTable[itm1->value];
+		if (!itm2->value) {
+			itm2->block = -1;
+			return 0;
+		}
+		break;
+	case 39:
+		itm2->value = itm1->value - 1;
+		break;
+	case 48:
+		if (itm1->value == 5) {
+			memset(itm2, 0, sizeof(EoBItem));
+			itm2->block = -1;
+			return 0;
+		}
+		itm2->value = itm1->value;
+		itm2->flags = ((itm1->flags & 0x3f) + 3) | 0x40;
+		break;
+	case 18:
+		itm2->icon = 19;
+		// fall through
+	default:
+		itm2->value = itm1->value;
+		break;
+	}
+
+	switch ((_vm->_itemTypes[itm2->type].extraProperties & 0x7f) - 1) {
+	case 0:
+	case 1:
+	case 2:
+		if (itm2->value)
+			itm2->flags |= 0x80;
+		break;
+	case 4:
+	case 5:
+	case 8:
+	case 9:
+	case 13:
+	case 15:
+	case 17:
+		itm2->flags |= 0x80;
+		break;
+	default:
+		break;
+	}
+
+	for (int i = 1; i < 600; i++) {
+		if (i == 60 || i == 62 || i == 63 || i == 83)
+			continue;
+		EoBItem *tmp = &_vm->_items[i];
+		if (tmp->level || tmp->block == -2 || tmp->type != itm2->type || tmp->icon != itm2->icon)
+			continue;
+		itm2->nameUnid = tmp->nameUnid;
+		itm2->nameId = tmp->nameId;
+		match = true;
+		break;
+	}
+
+	if (!match) {
+		for (int i = 1; i < 600; i++) {
+			if (i == 60 || i == 62 || i == 63 || i == 83)
+				continue;
+			EoBItem *tmp = &_vm->_items[i];
+			if (tmp->level || tmp->block == -2 || tmp->type != itm2->type)
+				continue;
+			itm2->nameUnid = tmp->nameUnid;
+			itm2->nameId = tmp->nameId;
+			match = true;
+			break;
 		}
 	}
+
+	if (!match) {
+		memset(itm2, 0, sizeof(EoBItem));
+		itm2->block = -1;
+		return 0;
+	}
+
+	itm2->level = 0;
+	return newItem;
+}
+
+void TransferPartyWiz::giveKhelbensCoin() {
+	bool success = false;
+	for (int i = 0; i < 4 && !success; i++) {
+		EoBCharacter *c = &_vm->_characters[i];
+
+		for (int slot = 2; slot < 16; slot++) {
+			if (c->inventory[slot])
+				continue;
+			_vm->createInventoryItem(c, 93, -1, slot);
+			success = true;
+			break;
+		}
+	}
+
+	if (!success) {
+		_vm->_characters[0].inventory[2] = 0;
+		_vm->createInventoryItem(&_vm->_characters[0], 93, -1, 2);
+	}
 }
 
 // Start functions
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index c64f60b3fd..f3e644b89d 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -64,9 +64,6 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags) : KyraRpgE
 	_beholderSpellList = 0;
 	_beholderSfx = 0;
 
-	_transferConvertTable = 0;
-	_transferExpTable = 0;
-
 	_faceShapes = 0;
 	_characters = 0;
 	_items = 0;
@@ -470,7 +467,7 @@ Common::Error EoBCoreEngine::go() {
 		}
 	}
 
-	if (!shouldQuit() && action > -3) {
+	if (!shouldQuit() && action >= -3) {
 		runLoop();
 
 		if (_playFinale) {
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index f489f8742b..399eff7775 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -331,9 +331,6 @@ protected:
 
 	const uint8 *_classModifierFlags;
 
-	const uint8 *_transferConvertTable;
-	const uint32 *_transferExpTable;
-
 	// timers
 	void setupTimers();
 	void setCharEventTimer(int charIndex, uint32 countdown, int evnt, int updateExistingTimer);
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index ab92e08046..080af941df 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -2308,6 +2308,46 @@ bool GUI_EoB::confirmDialogue2(int dim, int id, int deflt) {
 	return newHighlight ? false : true;
 }
 
+void GUI_EoB::messageDialogue(int dim, int id, int buttonTextCol) {
+	int od = _screen->curDimIndex();
+	_screen->setScreenDim(dim);
+	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
+
+	drawTextBox(dim, id);
+	const ScreenDim *dm = _screen->getScreenDim(dim);
+
+	int bx = ((dm->sx + dm->w) << 3) - ((strlen(_vm->_menuOkString) << 3) + 16);
+	int by = dm->sy + dm->h - 19;
+	int bw = (strlen(_vm->_menuOkString) << 3) + 7;
+
+	drawMenuButtonBox(bx, by, bw, 14, false, false);
+	_screen->printShadedText(_vm->_menuOkString, bx + 4, by + 3, buttonTextCol, 0);
+	_screen->updateScreen();
+
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
+		_vm->removeInputTop();
+
+		if (inputFlag == 199 || inputFlag == 201) {
+			if (_vm->posWithinRect(_vm->_mouseX, _vm->_mouseY, bx, by, bx + bw, by + 14))
+				runLoop = false;
+		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inputFlag == _vm->_keyMap[Common::KEYCODE_o]) {
+			runLoop = false;
+		}
+	}
+
+	drawMenuButtonBox(bx, by, bw, 14, true, true);
+	_screen->updateScreen();
+	_vm->_system->delayMillis(80);
+	drawMenuButtonBox(bx, by, bw, 14, false, true);
+	_screen->updateScreen();
+
+	_screen->copyRegion(0, dm->h, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->setScreenDim(od);
+	_screen->setFont(of);
+	dm = _screen->getScreenDim(dim);
+}
+
 void GUI_EoB::messageDialogue2(int dim, int id, int buttonTextCol) {
 	drawMenuButtonBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, false, false);
 
@@ -2496,6 +2536,15 @@ int GUI_EoB::getTextInput(char *dest, int x, int y, int destMaxLen, int textColo
 	return _keyPressed.keycode == Common::KEYCODE_ESCAPE ? -1 : len;
 }
 
+void GUI_EoB::transferWaitBox() {
+	const ScreenDim *dm = _screen->getScreenDim(11);
+	int xo = dm->sx;
+	int yo = dm->sy;
+	_screen->modifyScreenDim(11, dm->sx + 9, dm->sy + 24, dm->w, dm->h);
+	displayTextBox(-4);
+	_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
+}
+
 Common::String GUI_EoB::transferTargetMenu(Common::Array<Common::String> &targets) {
 	_savegameListSize = targets.size();
 	if (_savegameList) {
@@ -2542,13 +2591,14 @@ Common::String GUI_EoB::transferFileMenu(Common::String &target) {
 	int slot = 0;
 	do {
 		slot = selectSaveSlotDialogue(72, 14, 4);
-		if (slot < 6) {
-			if (_saveSlotIdTemp[slot] == -1)
-				messageDialogue(11, 65, 6);
-			else {
-				_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
-				return _vm->getSavegameFilename(target, _saveSlotIdTemp[slot]);
-			}
+		if (slot == 6)
+			break;
+		
+		if (_saveSlotIdTemp[slot] == -1)
+			messageDialogue(11, 65, 6);
+		else {
+			_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
+			return _vm->getSavegameFilename(target, _saveSlotIdTemp[slot]);
 		}
 	} while (_saveSlotIdTemp[slot] == -1);
 
@@ -3488,46 +3538,6 @@ bool GUI_EoB::confirmDialogue(int id) {
 	return result;
 }
 
-void GUI_EoB::messageDialogue(int dim, int id, int buttonTextCol) {
-	int od = _screen->curDimIndex();
-	_screen->setScreenDim(dim);
-	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
-
-	drawTextBox(dim, id);
-	const ScreenDim *dm = _screen->getScreenDim(dim);
-
-	int bx = ((dm->sx + dm->w) << 3) - ((strlen(_vm->_menuOkString) << 3) + 16);
-	int by = dm->sy + dm->h - 19;
-	int bw = (strlen(_vm->_menuOkString) << 3) + 7;
-
-	drawMenuButtonBox(bx, by, bw, 14, false, false);
-	_screen->printShadedText(_vm->_menuOkString, bx + 4, by + 3, buttonTextCol, 0);
-	_screen->updateScreen();
-
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
-		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
-		_vm->removeInputTop();
-
-		if (inputFlag == 199 || inputFlag == 201) {
-			if (_vm->posWithinRect(_vm->_mouseX, _vm->_mouseY, bx, by, bx + bw, by + 14))
-				runLoop = false;
-		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN] || inputFlag == _vm->_keyMap[Common::KEYCODE_o]) {
-			runLoop = false;
-		}
-	}
-
-	drawMenuButtonBox(bx, by, bw, 14, true, true);
-	_screen->updateScreen();
-	_vm->_system->delayMillis(80);
-	drawMenuButtonBox(bx, by, bw, 14, false, true);
-	_screen->updateScreen();
-
-	_screen->copyRegion(0, dm->h, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 2, 0, Screen::CR_NO_P_CHECK);
-	_screen->setScreenDim(od);
-	_screen->setFont(of);
-	dm = _screen->getScreenDim(dim);
-}
-
 int GUI_EoB::selectCharacterDialogue(int id) {
 	uint8 flags = (id == 26) ? (_vm->game() == GI_EOB1 ? 0x04 : 0x14) : 0x02;
 	_vm->removeInputTop();
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index d8ce9bd234..ec4000e52a 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -63,6 +63,7 @@ public:
 	bool runLoadMenu(int x, int y);
 
 	bool confirmDialogue2(int dim, int id, int deflt);
+	void messageDialogue(int dim, int id, int buttonTextCol);
 	void messageDialogue2(int dim, int id, int buttonTextCol);
 
 	void updateBoxFrameHighLight(int box);
@@ -70,6 +71,7 @@ public:
 	int getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor);
 
 	// Transfer party
+	void transferWaitBox();
 	Common::String transferTargetMenu(Common::Array<Common::String> &targets);
 	Common::String transferFileMenu(Common::String &target);
 
@@ -88,7 +90,6 @@ private:
 	bool restParty();
 
 	bool confirmDialogue(int id);
-	void messageDialogue(int dim, int id, int buttonTextCol);
 	int selectCharacterDialogue(int id);
 	void displayTextBox(int id);
 
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index 28764dfe20..c58fd0835c 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -30,6 +30,7 @@ namespace Kyra {
 
 void EoBCoreEngine::loadItemDefs() {
 	Common::SeekableReadStream *s = _res->createReadStream("item.dat");
+	memset(_items, 0, sizeof(EoBItem) * 600);
 	_numItems = s->readUint16LE();
 
 	for (int i = 0; i < 600; i++)
@@ -58,6 +59,7 @@ void EoBCoreEngine::loadItemDefs() {
 	s = _res->createReadStream("itemtype.dat");
 	uint16 numTypes = s->readUint16LE();
 
+	delete[] _itemTypes;
 	_itemTypes = new EoBItemType[65];
 	memset(_itemTypes, 0, sizeof(EoBItemType) * 65);
 
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 45c18517a9..5b0af9840d 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -537,8 +537,14 @@ enum KyraResources {
 	kEoB1Npc7Strings,
 
 	kEoB2MainMenuStrings,
+
+	kEoB2TransferPortraitFrames,
 	kEoB2TransferConvertTable,
+	kEoB2TransferItemTable,
 	kEoB2TransferExpTable,
+	kEoB2TransferStrings1,
+	kEoB2TransferStrings2,
+	kEoB2TransferLabels,
 
 	kEoB2IntroStrings,
 	kEoB2IntroCPSFiles,
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 714033b569..1f982aa3ab 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -74,7 +74,7 @@ Common::Error EoBCoreEngine::loadGameState(int slot) {
 		c->alignment = in.readByte();
 		c->portrait = in.readSByte();
 		if (slot == -1 && c->portrait < 0)
-			c->portrait += 43;
+			c->portrait = -c->portrait + 43;
 		c->food = in.readByte();
 		in.read(c->level, 3);
 		for (int ii = 0; ii < 3; ii++)
@@ -118,35 +118,37 @@ Common::Error EoBCoreEngine::loadGameState(int slot) {
 	}
 	_screen->_curPage = 0;
 
-	// No more data required for party transfer
-	if (slot == -1)
-		return Common::kNoError;
-
-	_currentLevel = in.readByte();
-	_currentSub = in.readSByte();
-	_currentBlock = in.readUint16BE();
-	_currentDirection = in.readUint16BE();
-	_itemInHand = in.readSint16BE();
-	_hasTempDataFlags = in.readUint32BE();
-	_partyEffectFlags = in.readUint32BE();
-
-	_updateFlags = in.readUint16BE();
-	_compassDirection = in.readUint16BE();
-	_currentControlMode = in.readUint16BE();
-	_updateCharNum = in.readUint16BE();
-	_openBookSpellLevel = in.readSByte();
-	_openBookSpellSelectedItem  = in.readSByte();
-	_openBookSpellListOffset = in.readSByte();
-	_openBookChar = in.readByte();
-	_openBookType = in.readByte();
-	_openBookCharBackup = in.readByte();
-	_openBookTypeBackup = in.readByte();
-	_activeSpellCharId = in.readByte();
-	_activeSpellCharacterPos = in.readByte();
-	_activeSpell = in.readByte();
-	_returnAfterSpellCallback = in.readByte() ? true : false;
-
-	_inf->loadState(in);
+	if (slot == -1) {
+		// Skip all settings which aren't necessary for party transfer.
+		// Jump directly to the items list.
+		in.skip(108);
+	} else {
+		_currentLevel = in.readByte();
+		_currentSub = in.readSByte();
+		_currentBlock = in.readUint16BE();
+		_currentDirection = in.readUint16BE();
+		_itemInHand = in.readSint16BE();
+		_hasTempDataFlags = in.readUint32BE();
+		_partyEffectFlags = in.readUint32BE();
+
+		_updateFlags = in.readUint16BE();
+		_compassDirection = in.readUint16BE();
+		_currentControlMode = in.readUint16BE();
+		_updateCharNum = in.readUint16BE();
+		_openBookSpellLevel = in.readSByte();
+		_openBookSpellSelectedItem  = in.readSByte();
+		_openBookSpellListOffset = in.readSByte();
+		_openBookChar = in.readByte();
+		_openBookType = in.readByte();
+		_openBookCharBackup = in.readByte();
+		_openBookTypeBackup = in.readByte();
+		_activeSpellCharId = in.readByte();
+		_activeSpellCharacterPos = in.readByte();
+		_activeSpell = in.readByte();
+		_returnAfterSpellCallback = in.readByte() ? true : false;
+
+		_inf->loadState(in);
+	}
 
 	for (int i = 0; i < 600; i++) {
 		EoBItem *t = &_items[i];
@@ -163,6 +165,12 @@ Common::Error EoBCoreEngine::loadGameState(int slot) {
 		t->value = in.readSByte();
 	}
 
+	// No more data needed for party transfer
+	if (slot == -1) {
+		_loading = false;
+		return Common::kNoError;
+	}
+
 	for (int i = 51; i < 65; i++) {
 		EoBItemType *t = &_itemTypes[i];
 		t->invFlags = in.readUint16BE();
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 8ab16f5da9..7bbe9f528f 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -1193,9 +1193,6 @@ void EoBEngine::initSpells() {
 void DarkMoonEngine::initStaticResource() {
 	int temp;
 	_mainMenuStrings = _staticres->loadStrings(kEoB2MainMenuStrings, temp);
-	_transferConvertTable = _staticres->loadRawData(kEoB2TransferConvertTable, temp);
-	_transferExpTable = _staticres->loadRawDataBe32(kEoB2TransferExpTable, temp);
-
 	_introStrings = _staticres->loadStrings(kEoB2IntroStrings, temp);
 	_cpsFilesIntro = _staticres->loadStrings(kEoB2IntroCPSFiles, temp);
 
@@ -1252,16 +1249,18 @@ void DarkMoonEngine::initStaticResource() {
 	_errorSlotNoNameString = errorSlotNoNameString[(_flags.lang == Common::EN_ANY) ? 0 : ((_flags.lang == Common::DE_DEU) ? 1 : 2)];
 
 	// ScummVM specific
-	static const char *transferStringsScummVM[3][4] = {
+	static const char *transferStringsScummVM[3][5] = {
 		{	"\r We cannot find any EOB save game\r file. Please make sure that the\r save game file with the party\r you wish to transfer is located\r in your ScummVM save game\r directory. If you have set up\r multiple save directories you\r have to copy the EOB save file\r into your EOB II save directory.\r Do you wish to try again?",
 			"Game ID",
 			"\r It seems that you have already\r defeated Xanathar here. Do you\r wish to transfer the party that\r finished the game? If not, you\r will be able to select a save\r game from the save game\r dialogue.",
-			"Select File"
+			"Select File",
+			"\r\r   Please wait..."
 		},
 		{	"\r Kein EOB-Spielstand zu finden.\r Bitte Spielstandsdatei mit der\r zu ]bernehmenden Gruppe in das\r ScummVM Spielstands-Verzeichnis\r kopieren. Bei mehreren Spiel-\r stands-Verzeichnissen bitte\r den EOB-Spielstand in das\r EOB II-Spielstands-Verzeichnis\r kopieren. Nochmal versuchen?",
 			"Game ID",
 			"\r Wie es scheint, wurde Xanathar\r hier bereits besiegt. Soll die\r Gruppe, mit der das Spiel be-\r endet wurde, ]bernommen werden?\r Falls nicht, kann ein Spielstand\r aus der Spielstandsliste gew[hlt\r werden.",
-			"Spiel W[hlen"
+			"Spiel W[hlen",
+			"\r\r  Bitte warten..."
 		},
 		{	0, 0, 0, 0
 		}
-- 
cgit v1.2.3


From 2e517cc9ec65a535d580fee607b9b920e41a3019 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 18 Dec 2011 21:08:31 +0100
Subject: KYRA: (EOB) - add EOB copyright strings to
 KyraMetaEngine::getOriginalCopyright()

---
 engines/kyra/detection.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 56687d60b3..74c949b1d5 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -67,6 +67,9 @@ public:
 		return "The Legend of Kyrandia (C) Westwood Studios"
 #ifdef ENABLE_LOL
 				"\nLands of Lore (C) Westwood Studios"
+#endif
+#ifdef ENABLE_EOB
+				"\nEye of the Beholder (C) TSR, Inc., (C) Strategic Simulations, Inc."
 #endif
 		    ;
 	}
-- 
cgit v1.2.3


From 4106ae7d2dcb38895385f5125bd8ff152023565e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 17:49:42 +0200
Subject: DREAMWEB: Port 'dircom' to C++, move rootdir out of the data blob and
 fix a regression in searchForFiles()

---
 engines/dreamweb/dreamgen.cpp | 63 ++++++++++---------------------------------
 engines/dreamweb/dreamgen.h   | 12 ++++-----
 engines/dreamweb/monitor.cpp  | 31 ++++++++++++++++++---
 engines/dreamweb/stubs.h      |  3 ++-
 4 files changed, 48 insertions(+), 61 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 77af051122..0004c4fa3b 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -142,39 +142,6 @@ void DreamGenContext::transferConToEx() {
 	ds.byte(si+2) = 255;
 }
 
-void DreamGenContext::dirCom() {
-	STACK_CHECK;
-	cx = 30;
-	randomAccess();
-	parser();
-	_cmp(es.byte(di+1), 0);
-	if (flags.z())
-		goto dirroot;
-	dirFile();
-	return;
-dirroot:
-	data.byte(kLogonum) = 0;
-	ds = cs;
-	si = offset_rootdir;
-	_inc(si);
-	es = cs;
-	di = 436;
-	_inc(di);
-	cx = 12;
-	_movsb(cx, true);
-	monitorLogo();
-	scrollMonitor();
-	al = 9;
-	monMessage();
-	es = data.word(kTextfile1);
-	searchForFiles();
-	es = data.word(kTextfile2);
-	searchForFiles();
-	es = data.word(kTextfile3);
-	searchForFiles();
-	scrollMonitor();
-}
-
 void DreamGenContext::read() {
 	STACK_CHECK;
 	cx = 40;
@@ -187,7 +154,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 436;
+	di = 422;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -317,7 +284,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 436+1;
+	di = 422+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -399,7 +366,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 511;
+	si = 497;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -481,16 +448,16 @@ void DreamGenContext::__start() {
 		//0x0180: .... .... ...D REAM
 		0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
 		//0x0190: WEB. V99.          
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x01a0:       ."R OOT      
-		0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x01b0:    . "             
-		0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 
-		//0x01c0:  ... ..$. .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 
-		//0x01d0: .... .... .... ...D
-		0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01e0: :... .... .... ....
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x01a0:       ."           
+		0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 
+		//0x01b0:    . .... $... ....
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+		//0x01c0: .... .... .... ....
+		0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x01d0: .D:. .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x01e0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x01f0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -507,9 +474,7 @@ void DreamGenContext::__start() {
 		//0x0250: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0260: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0270: .... .... .... ....
-		0x00, 0x00, };
+		0x00, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d3bb80da1a..82550fe4ce 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,7 +32,6 @@
 
 namespace DreamGen {
 
-static const uint16 offset_rootdir = 0x01a6;
 static const uint16 offset_operand1 = 0x0198;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
@@ -321,11 +320,11 @@ static const uint16 kSoundbufferwrite = 391;
 static const uint16 kCurrentsample = 393;
 static const uint16 kRoomssample = 394;
 static const uint16 kBasicsample = 395;
-static const uint16 kCurrentfile = 436;
-static const uint16 kInputline = 511;
-static const uint16 kQuitrequested = 639;
-static const uint16 kSubtitles = 640;
-static const uint16 kForeignrelease = 641;
+static const uint16 kCurrentfile = 422;
+static const uint16 kInputline = 497;
+static const uint16 kQuitrequested = 625;
+static const uint16 kSubtitles = 626;
+static const uint16 kForeignrelease = 627;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -427,7 +426,6 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
-	void dirCom();
 	void dirFile();
 	void pickupConts();
 	void transferMap();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 81c0f7e168..e586999129 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -456,6 +456,25 @@ void DreamGenContext::getKeyAndLogo() {
 	}
 }
 
+void DreamGenContext::dirCom() {
+	randomAccess(30);
+	parser();
+	if (es.byte(di + 1)) {
+		dirFile();
+		return;
+	}
+
+	data.byte(kLogonum) = 0;
+	memcpy(data.ptr(kCurrentfile+1, 0), "ROOT        ", 12);
+	monitorLogo();
+	scrollMonitor();
+	monMessage(9);
+	searchForFiles(data.word(kTextfile1));
+	searchForFiles(data.word(kTextfile2));
+	searchForFiles(data.word(kTextfile3));
+	scrollMonitor();
+}
+
 void DreamGenContext::signOn() {
 	parser();
 
@@ -514,17 +533,21 @@ void DreamGenContext::signOn() {
 	}
 }
 
-void DreamGenContext::searchForFiles() {
+void DreamGenContext::searchForFiles(uint16 segment) {
 	uint16 offset = kTextstart;
 	byte curChar;
 
 	while (true) {
-		curChar = es.byte(offset);
+		curChar = getSegment(segment).byte(offset);
 		offset++;
 		if (curChar == '*')
 			return; // "endofdir"
-		if (curChar == 34)
-			monPrint();
+		if (curChar == 34) {
+			uint16 originalOffset = offset;
+			const char *string = (const char *)getSegment(segment).ptr(offset, 0);
+			const char *nextString = monPrint(string);
+			offset = originalOffset + (nextString - string);
+		}
 	}
 }
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 9ab025fb3e..14b8accea0 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -134,7 +134,8 @@
 	void outOfOpen();
 	void swapWithOpen();
 	void swapWithInv();
-	void searchForFiles();
+	void searchForFiles(uint16 segment);
 	byte transferToEx();
+	void dirCom();
 
 #endif
-- 
cgit v1.2.3


From 3cd4d1493a2bea9fcb2a9cf2df9ec5c007483334 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 26 Dec 2011 17:07:04 +0100
Subject: KYRA: Unconfuse some MSVC versions by adding a space before a
 comment.

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

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 399eff7775..dfc99ea13a 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -574,7 +574,7 @@ protected:
 	void loadLevel(int level, int sub);
 	Common::String initLevelData(int sub);
 	void addLevelItems();
-	void loadVcnData(const char *file, const char */*nextFile*/);
+	void loadVcnData(const char *file, const char * /*nextFile*/);
 	void loadBlockProperties(const char *mazFile);
 	const uint8 *getBlockFileData(int levelIndex);
 	const uint8 *getBlockFileData(const char *mazFile);
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index e82442a117..b44feaf013 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -263,7 +263,7 @@ void EoBCoreEngine::addLevelItems() {
 	}
 }
 
-void EoBCoreEngine::loadVcnData(const char *file, const char*/*nextFile*/) {
+void EoBCoreEngine::loadVcnData(const char *file, const char * /*nextFile*/) {
 	if (file)
 		strcpy(_lastBlockDataFile, file);
 
-- 
cgit v1.2.3


From c60ce59aa443471f22f9254dd6bc3810324cd672 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 26 Dec 2011 17:26:35 +0100
Subject: DREAMWEB: Fix regression in transferToEx

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

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index a7a7814db3..b246323e9d 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -1052,7 +1052,7 @@ byte DreamGenContext::transferToEx() {
 	freeObject = getFreeAd(data.byte(kItemframe));
 	freeObject->mapad[0] = 254;
 	ds = data.word(kFreedat);
-	si = data.byte(kItemframe);
+	si = data.byte(kItemframe) * sizeof(DynObject);
 	pickupConts();
 	return pos;
 }
-- 
cgit v1.2.3


From 017c1ed993ed8852d51c5e4ce54a868dc2f91e6b Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 26 Dec 2011 17:39:52 +0100
Subject: DREAMWEB: Update deallocatemem for moved sprite table

---
 engines/dreamweb/stubs.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 7c4bfe8a92..65c9d73ecd 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -950,18 +950,15 @@ void DreamBase::deallocateMem(uint16 segment) {
 	debug(1, "deallocating segment %04x", segment);
 	deallocateSegment(segment);
 
-	uint tsize = 16 * 32;
-	uint16 bseg = data.word(kBuffers);
-	if (!bseg)
-		return;
-	MutableSegmentRef buffers(this);
-	buffers = bseg;
-	uint8 *ptr = buffers.ptr(kSpritetable, tsize);
-	for (uint i = 0; i < tsize; i += 32) {
-		uint16 seg = READ_LE_UINT16(ptr + i + 6);
-		//debug(1, "sprite segment = %04x", seg);
-		if (seg == segment)
-			memset(ptr + i, 0xff, 32);
+	// CHECKME: Do we really need this? From brief testing it appears
+	// the sprite table is cleared entirely shortly after this happens
+	// anyway.
+	Common::List<Sprite>::iterator i;
+	for (i = _spriteTable.begin(); i != _spriteTable.end(); ) {
+		if (i->_frameData == segment)
+			i = _spriteTable.erase(i);
+		else
+			++i;
 	}
 }
 
-- 
cgit v1.2.3


From c86a830c4a299b45549ee3a6f242995790013853 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 26 Dec 2011 16:57:27 +0100
Subject: DREAMWEB: Move openInvList, ryanInvList out of buffers

---
 engines/dreamweb/dreambase.h  |  10 +-
 engines/dreamweb/dreamgen.cpp |  46 ++---
 engines/dreamweb/dreamgen.h   | 439 +++++++++++++++++++++---------------------
 engines/dreamweb/object.cpp   | 221 ++++++++++-----------
 engines/dreamweb/structs.h    |  12 ++
 engines/dreamweb/stubs.h      |   2 -
 6 files changed, 366 insertions(+), 364 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 3f667e8757..4b9919de7a 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -69,6 +69,7 @@ protected:
 
 	// from object.cpp
 	uint16 _openChangeSize;
+	ObjectRef _oldSubject;
 
 	// from pathfind.cpp
 	Common::Point _lineData[200];		// Output of Bresenham
@@ -86,8 +87,8 @@ protected:
 
 	// from Buffers
 	uint8 _textUnder[kUnderTextBufSize];
-	// _openInvList (see fillOpen/findOpenPos)
-	// _ryanInvList (see findInvPos/findInvPosCPP)
+	ObjectRef _openInvList[16];
+	ObjectRef _ryanInvList[30];
 	uint8 _pointerBack[32*32];
 	uint8 _mapFlags[11*10*3];
 	uint8 _startPal[3*256];
@@ -199,7 +200,7 @@ public:
 	// from object.cpp
 	void obIcons();
 	void fillRyan();
-	void findAllRyan(uint8 *inv);
+	void findAllRyan();
 	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y);
 	void obPicture();
 	void removeObFromInv();
@@ -211,12 +212,13 @@ public:
 	void wornError();
 	void makeWorn(DynObject *object);
 	void dropObject();
-	uint16 findOpenPos();
+	ObjectRef findOpenPos();
 	byte getOpenedSlotSize();
 	byte getOpenedSlotCount();
 	void openOb();
 	void findAllOpen();
 	void fillOpen();
+	ObjectRef findInvPos();
 
 	// from pathfind.cpp
 	void turnPathOn(uint8 param);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 0004c4fa3b..eeb2d346d9 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -154,7 +154,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 422;
+	di = 420;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -284,7 +284,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 422+1;
+	di = 420+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -366,7 +366,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 497;
+	si = 495;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -410,18 +410,18 @@ void DreamGenContext::__start() {
 		//0x0050: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0060: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0070: .... ...h .&.. ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0070: .... .h.& .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0080: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0090: .... .... .... ....
-		0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00a0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00b0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x00c0: .... ..   .... ....
+		0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x00c0: ....   .. .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00d0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -436,26 +436,26 @@ void DreamGenContext::__start() {
 		//0x0120: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0130: .... .... .... ....
-		0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0140: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0150: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0170: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 
-		//0x0180: .... .... ...D REAM
-		0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0190: WEB. V99.          
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x01a0:       ."           
-		0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 
-		//0x01b0:    . .... $... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-		//0x01c0: .... .... .... ....
-		0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01d0: .D:. .... .... ....
+		0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 
+		//0x0180: .... .... .DRE AMWE
+		0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0190: B.V9 9.            
+		0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x01a0:    . "             
+		0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 
+		//0x01b0:  ... ..$. .... ....
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 
+		//0x01c0: .... .... .... ...D
+		0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x01d0: :... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x01e0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -474,7 +474,7 @@ void DreamGenContext::__start() {
 		//0x0250: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0260: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, };
+		0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 82550fe4ce..155c24d721 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,7 +32,7 @@
 
 namespace DreamGen {
 
-static const uint16 offset_operand1 = 0x0198;
+static const uint16 offset_operand1 = 0x0196;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -106,225 +106,224 @@ static const uint16 kIconleft = 86;
 static const uint16 kItemframe = 88;
 static const uint16 kItemtotran = 89;
 static const uint16 kRoomad = 90;
-static const uint16 kOldsubject = 92;
-static const uint16 kWithobject = 94;
-static const uint16 kWithtype = 95;
-static const uint16 kLookcounter = 96;
-static const uint16 kCommand = 98;
-static const uint16 kCommandtype = 99;
-static const uint16 kOldcommandtype = 100;
-static const uint16 kObjecttype = 101;
-static const uint16 kGetback = 102;
-static const uint16 kInvopen = 103;
-static const uint16 kMainmode = 104;
-static const uint16 kPickup = 105;
-static const uint16 kLastinvpos = 106;
-static const uint16 kExamagain = 107;
-static const uint16 kNewtextline = 108;
-static const uint16 kOpenedob = 109;
-static const uint16 kOpenedtype = 110;
-static const uint16 kOldmapadx = 111;
-static const uint16 kOldmapady = 113;
-static const uint16 kMapadx = 115;
-static const uint16 kMapady = 117;
-static const uint16 kMapoffsetx = 119;
-static const uint16 kMapoffsety = 121;
-static const uint16 kMapxstart = 123;
-static const uint16 kMapystart = 125;
-static const uint16 kMapxsize = 127;
-static const uint16 kMapysize = 128;
-static const uint16 kHavedoneobs = 129;
-static const uint16 kManisoffscreen = 130;
-static const uint16 kRainspace = 131;
-static const uint16 kFacing = 132;
-static const uint16 kLeavedirection = 133;
-static const uint16 kTurntoface = 134;
-static const uint16 kTurndirection = 135;
-static const uint16 kMaintimer = 136;
-static const uint16 kIntrocount = 138;
-static const uint16 kArrowad = 139;
-static const uint16 kCurrentkey = 141;
-static const uint16 kOldkey = 142;
-static const uint16 kUseddirection = 143;
-static const uint16 kTimercount = 144;
-static const uint16 kOldtimercount = 145;
-static const uint16 kMapx = 146;
-static const uint16 kMapy = 147;
-static const uint16 kNewscreen = 148;
-static const uint16 kRyanx = 149;
-static const uint16 kRyany = 150;
-static const uint16 kLastflag = 151;
-static const uint16 kOffsetx = 152;
-static const uint16 kOffsety = 154;
-static const uint16 kCurrentob = 156;
-static const uint16 kDestpos = 157;
-static const uint16 kReallocation = 158;
-static const uint16 kRoomnum = 159;
-static const uint16 kNowinnewroom = 160;
-static const uint16 kResetmanxy = 161;
-static const uint16 kNewlocation = 162;
-static const uint16 kAutolocation = 163;
-static const uint16 kDoorcheck1 = 164;
-static const uint16 kDoorcheck2 = 165;
-static const uint16 kDoorcheck3 = 166;
-static const uint16 kDoorcheck4 = 167;
-static const uint16 kMousex = 168;
-static const uint16 kMousey = 170;
-static const uint16 kMousebutton = 172;
-static const uint16 kMousebutton1 = 174;
-static const uint16 kMousebutton2 = 176;
-static const uint16 kMousebutton3 = 178;
-static const uint16 kMousebutton4 = 180;
-static const uint16 kOldbutton = 182;
-static const uint16 kOldx = 184;
-static const uint16 kOldy = 186;
-static const uint16 kLastbutton = 188;
-static const uint16 kOldpointerx = 190;
-static const uint16 kOldpointery = 192;
-static const uint16 kDelherex = 194;
-static const uint16 kDelherey = 196;
-static const uint16 kPointerxs = 198;
-static const uint16 kPointerys = 199;
-static const uint16 kDelxs = 200;
-static const uint16 kDelys = 201;
-static const uint16 kPointerframe = 202;
-static const uint16 kPointerpower = 203;
-static const uint16 kAuxpointerframe = 204;
-static const uint16 kPointermode = 205;
-static const uint16 kPointerspeed = 206;
-static const uint16 kPointercount = 207;
-static const uint16 kInmaparea = 208;
-static const uint16 kTalkmode = 209;
-static const uint16 kTalkpos = 210;
-static const uint16 kCharacter = 211;
-static const uint16 kWatchdump = 212;
-static const uint16 kLogonum = 213;
-static const uint16 kOldlogonum = 214;
-static const uint16 kNetseg = 215;
-static const uint16 kNetpoint = 217;
-static const uint16 kCursorstate = 219;
-static const uint16 kPressed = 220;
-static const uint16 kPresspointer = 221;
-static const uint16 kGraphicpress = 223;
-static const uint16 kPresscount = 224;
-static const uint16 kLightcount = 225;
-static const uint16 kFolderpage = 226;
-static const uint16 kDiarypage = 227;
-static const uint16 kMenucount = 228;
-static const uint16 kSymboltopx = 229;
-static const uint16 kSymboltopnum = 230;
-static const uint16 kSymboltopdir = 231;
-static const uint16 kSymbolbotx = 232;
-static const uint16 kSymbolbotnum = 233;
-static const uint16 kSymbolbotdir = 234;
-static const uint16 kSymboltolight = 235;
-static const uint16 kSymbol1 = 236;
-static const uint16 kSymbol2 = 237;
-static const uint16 kSymbol3 = 238;
-static const uint16 kSymbolnum = 239;
-static const uint16 kDumpx = 240;
-static const uint16 kDumpy = 242;
-static const uint16 kWalkandexam = 244;
-static const uint16 kWalkexamtype = 245;
-static const uint16 kWalkexamnum = 246;
-static const uint16 kCurslocx = 247;
-static const uint16 kCurslocy = 249;
-static const uint16 kCurpos = 251;
-static const uint16 kMonadx = 253;
-static const uint16 kMonady = 255;
-static const uint16 kMonsource = 257;
-static const uint16 kNumtodo = 259;
-static const uint16 kTimecount = 261;
-static const uint16 kCounttotimed = 263;
-static const uint16 kTimedseg = 265;
-static const uint16 kTimedoffset = 267;
-static const uint16 kTimedy = 269;
-static const uint16 kTimedx = 270;
-static const uint16 kNeedtodumptimed = 271;
-static const uint16 kLoadingorsave = 272;
-static const uint16 kCurrentslot = 273;
-static const uint16 kCursorpos = 274;
-static const uint16 kColourpos = 275;
-static const uint16 kFadedirection = 276;
-static const uint16 kNumtofade = 277;
-static const uint16 kFadecount = 278;
-static const uint16 kAddtogreen = 279;
-static const uint16 kAddtored = 280;
-static const uint16 kAddtoblue = 281;
-static const uint16 kLastsoundreel = 282;
-static const uint16 kSpeechloaded = 284;
-static const uint16 kSpeechlength = 285;
-static const uint16 kVolume = 287;
-static const uint16 kVolumeto = 288;
-static const uint16 kVolumedirection = 289;
-static const uint16 kVolumecount = 290;
-static const uint16 kWongame = 291;
-static const uint16 kLasthardkey = 292;
-static const uint16 kBufferin = 293;
-static const uint16 kBufferout = 295;
-static const uint16 kExtras = 297;
-static const uint16 kWorkspace = 299;
-static const uint16 kMapstore = 301;
-static const uint16 kCharset1 = 303;
-static const uint16 kBuffers = 305;
-static const uint16 kMainsprites = 307;
-static const uint16 kBackdrop = 309;
-static const uint16 kMapdata = 311;
-static const uint16 kSounddata = 313;
-static const uint16 kSounddata2 = 315;
-static const uint16 kRecordspace = 317;
-static const uint16 kFreedat = 319;
-static const uint16 kSetdat = 321;
-static const uint16 kReel1 = 323;
-static const uint16 kReel2 = 325;
-static const uint16 kReel3 = 327;
-static const uint16 kRoomdesc = 329;
-static const uint16 kFreedesc = 331;
-static const uint16 kSetdesc = 333;
-static const uint16 kBlockdesc = 335;
-static const uint16 kSetframes = 337;
-static const uint16 kFreeframes = 339;
-static const uint16 kPeople = 341;
-static const uint16 kReels = 343;
-static const uint16 kCommandtext = 345;
-static const uint16 kPuzzletext = 347;
-static const uint16 kTraveltext = 349;
-static const uint16 kTempgraphics = 351;
-static const uint16 kTempgraphics2 = 353;
-static const uint16 kTempgraphics3 = 355;
-static const uint16 kTempsprites = 357;
-static const uint16 kTextfile1 = 359;
-static const uint16 kTextfile2 = 361;
-static const uint16 kTextfile3 = 363;
-static const uint16 kBlinkframe = 365;
-static const uint16 kBlinkcount = 366;
-static const uint16 kReasseschanges = 367;
-static const uint16 kPointerspath = 368;
-static const uint16 kManspath = 369;
-static const uint16 kPointerfirstpath = 370;
-static const uint16 kFinaldest = 371;
-static const uint16 kDestination = 372;
-static const uint16 kLinestartx = 373;
-static const uint16 kLinestarty = 375;
-static const uint16 kLineendx = 377;
-static const uint16 kLineendy = 379;
-static const uint16 kLinepointer = 381;
-static const uint16 kLinedirection = 382;
-static const uint16 kLinelength = 383;
-static const uint16 kCh0blockstocopy = 384;
-static const uint16 kCh0playing = 386;
-static const uint16 kCh0repeat = 387;
-static const uint16 kCh1playing = 388;
-static const uint16 kCh1blockstocopy = 389;
-static const uint16 kSoundbufferwrite = 391;
-static const uint16 kCurrentsample = 393;
-static const uint16 kRoomssample = 394;
-static const uint16 kBasicsample = 395;
-static const uint16 kCurrentfile = 422;
-static const uint16 kInputline = 497;
-static const uint16 kQuitrequested = 625;
-static const uint16 kSubtitles = 626;
-static const uint16 kForeignrelease = 627;
+static const uint16 kWithobject = 92;
+static const uint16 kWithtype = 93;
+static const uint16 kLookcounter = 94;
+static const uint16 kCommand = 96;
+static const uint16 kCommandtype = 97;
+static const uint16 kOldcommandtype = 98;
+static const uint16 kObjecttype = 99;
+static const uint16 kGetback = 100;
+static const uint16 kInvopen = 101;
+static const uint16 kMainmode = 102;
+static const uint16 kPickup = 103;
+static const uint16 kLastinvpos = 104;
+static const uint16 kExamagain = 105;
+static const uint16 kNewtextline = 106;
+static const uint16 kOpenedob = 107;
+static const uint16 kOpenedtype = 108;
+static const uint16 kOldmapadx = 109;
+static const uint16 kOldmapady = 111;
+static const uint16 kMapadx = 113;
+static const uint16 kMapady = 115;
+static const uint16 kMapoffsetx = 117;
+static const uint16 kMapoffsety = 119;
+static const uint16 kMapxstart = 121;
+static const uint16 kMapystart = 123;
+static const uint16 kMapxsize = 125;
+static const uint16 kMapysize = 126;
+static const uint16 kHavedoneobs = 127;
+static const uint16 kManisoffscreen = 128;
+static const uint16 kRainspace = 129;
+static const uint16 kFacing = 130;
+static const uint16 kLeavedirection = 131;
+static const uint16 kTurntoface = 132;
+static const uint16 kTurndirection = 133;
+static const uint16 kMaintimer = 134;
+static const uint16 kIntrocount = 136;
+static const uint16 kArrowad = 137;
+static const uint16 kCurrentkey = 139;
+static const uint16 kOldkey = 140;
+static const uint16 kUseddirection = 141;
+static const uint16 kTimercount = 142;
+static const uint16 kOldtimercount = 143;
+static const uint16 kMapx = 144;
+static const uint16 kMapy = 145;
+static const uint16 kNewscreen = 146;
+static const uint16 kRyanx = 147;
+static const uint16 kRyany = 148;
+static const uint16 kLastflag = 149;
+static const uint16 kOffsetx = 150;
+static const uint16 kOffsety = 152;
+static const uint16 kCurrentob = 154;
+static const uint16 kDestpos = 155;
+static const uint16 kReallocation = 156;
+static const uint16 kRoomnum = 157;
+static const uint16 kNowinnewroom = 158;
+static const uint16 kResetmanxy = 159;
+static const uint16 kNewlocation = 160;
+static const uint16 kAutolocation = 161;
+static const uint16 kDoorcheck1 = 162;
+static const uint16 kDoorcheck2 = 163;
+static const uint16 kDoorcheck3 = 164;
+static const uint16 kDoorcheck4 = 165;
+static const uint16 kMousex = 166;
+static const uint16 kMousey = 168;
+static const uint16 kMousebutton = 170;
+static const uint16 kMousebutton1 = 172;
+static const uint16 kMousebutton2 = 174;
+static const uint16 kMousebutton3 = 176;
+static const uint16 kMousebutton4 = 178;
+static const uint16 kOldbutton = 180;
+static const uint16 kOldx = 182;
+static const uint16 kOldy = 184;
+static const uint16 kLastbutton = 186;
+static const uint16 kOldpointerx = 188;
+static const uint16 kOldpointery = 190;
+static const uint16 kDelherex = 192;
+static const uint16 kDelherey = 194;
+static const uint16 kPointerxs = 196;
+static const uint16 kPointerys = 197;
+static const uint16 kDelxs = 198;
+static const uint16 kDelys = 199;
+static const uint16 kPointerframe = 200;
+static const uint16 kPointerpower = 201;
+static const uint16 kAuxpointerframe = 202;
+static const uint16 kPointermode = 203;
+static const uint16 kPointerspeed = 204;
+static const uint16 kPointercount = 205;
+static const uint16 kInmaparea = 206;
+static const uint16 kTalkmode = 207;
+static const uint16 kTalkpos = 208;
+static const uint16 kCharacter = 209;
+static const uint16 kWatchdump = 210;
+static const uint16 kLogonum = 211;
+static const uint16 kOldlogonum = 212;
+static const uint16 kNetseg = 213;
+static const uint16 kNetpoint = 215;
+static const uint16 kCursorstate = 217;
+static const uint16 kPressed = 218;
+static const uint16 kPresspointer = 219;
+static const uint16 kGraphicpress = 221;
+static const uint16 kPresscount = 222;
+static const uint16 kLightcount = 223;
+static const uint16 kFolderpage = 224;
+static const uint16 kDiarypage = 225;
+static const uint16 kMenucount = 226;
+static const uint16 kSymboltopx = 227;
+static const uint16 kSymboltopnum = 228;
+static const uint16 kSymboltopdir = 229;
+static const uint16 kSymbolbotx = 230;
+static const uint16 kSymbolbotnum = 231;
+static const uint16 kSymbolbotdir = 232;
+static const uint16 kSymboltolight = 233;
+static const uint16 kSymbol1 = 234;
+static const uint16 kSymbol2 = 235;
+static const uint16 kSymbol3 = 236;
+static const uint16 kSymbolnum = 237;
+static const uint16 kDumpx = 238;
+static const uint16 kDumpy = 240;
+static const uint16 kWalkandexam = 242;
+static const uint16 kWalkexamtype = 243;
+static const uint16 kWalkexamnum = 244;
+static const uint16 kCurslocx = 245;
+static const uint16 kCurslocy = 247;
+static const uint16 kCurpos = 249;
+static const uint16 kMonadx = 251;
+static const uint16 kMonady = 253;
+static const uint16 kMonsource = 255;
+static const uint16 kNumtodo = 257;
+static const uint16 kTimecount = 259;
+static const uint16 kCounttotimed = 261;
+static const uint16 kTimedseg = 263;
+static const uint16 kTimedoffset = 265;
+static const uint16 kTimedy = 267;
+static const uint16 kTimedx = 268;
+static const uint16 kNeedtodumptimed = 269;
+static const uint16 kLoadingorsave = 270;
+static const uint16 kCurrentslot = 271;
+static const uint16 kCursorpos = 272;
+static const uint16 kColourpos = 273;
+static const uint16 kFadedirection = 274;
+static const uint16 kNumtofade = 275;
+static const uint16 kFadecount = 276;
+static const uint16 kAddtogreen = 277;
+static const uint16 kAddtored = 278;
+static const uint16 kAddtoblue = 279;
+static const uint16 kLastsoundreel = 280;
+static const uint16 kSpeechloaded = 282;
+static const uint16 kSpeechlength = 283;
+static const uint16 kVolume = 285;
+static const uint16 kVolumeto = 286;
+static const uint16 kVolumedirection = 287;
+static const uint16 kVolumecount = 288;
+static const uint16 kWongame = 289;
+static const uint16 kLasthardkey = 290;
+static const uint16 kBufferin = 291;
+static const uint16 kBufferout = 293;
+static const uint16 kExtras = 295;
+static const uint16 kWorkspace = 297;
+static const uint16 kMapstore = 299;
+static const uint16 kCharset1 = 301;
+static const uint16 kBuffers = 303;
+static const uint16 kMainsprites = 305;
+static const uint16 kBackdrop = 307;
+static const uint16 kMapdata = 309;
+static const uint16 kSounddata = 311;
+static const uint16 kSounddata2 = 313;
+static const uint16 kRecordspace = 315;
+static const uint16 kFreedat = 317;
+static const uint16 kSetdat = 319;
+static const uint16 kReel1 = 321;
+static const uint16 kReel2 = 323;
+static const uint16 kReel3 = 325;
+static const uint16 kRoomdesc = 327;
+static const uint16 kFreedesc = 329;
+static const uint16 kSetdesc = 331;
+static const uint16 kBlockdesc = 333;
+static const uint16 kSetframes = 335;
+static const uint16 kFreeframes = 337;
+static const uint16 kPeople = 339;
+static const uint16 kReels = 341;
+static const uint16 kCommandtext = 343;
+static const uint16 kPuzzletext = 345;
+static const uint16 kTraveltext = 347;
+static const uint16 kTempgraphics = 349;
+static const uint16 kTempgraphics2 = 351;
+static const uint16 kTempgraphics3 = 353;
+static const uint16 kTempsprites = 355;
+static const uint16 kTextfile1 = 357;
+static const uint16 kTextfile2 = 359;
+static const uint16 kTextfile3 = 361;
+static const uint16 kBlinkframe = 363;
+static const uint16 kBlinkcount = 364;
+static const uint16 kReasseschanges = 365;
+static const uint16 kPointerspath = 366;
+static const uint16 kManspath = 367;
+static const uint16 kPointerfirstpath = 368;
+static const uint16 kFinaldest = 369;
+static const uint16 kDestination = 370;
+static const uint16 kLinestartx = 371;
+static const uint16 kLinestarty = 373;
+static const uint16 kLineendx = 375;
+static const uint16 kLineendy = 377;
+static const uint16 kLinepointer = 379;
+static const uint16 kLinedirection = 380;
+static const uint16 kLinelength = 381;
+static const uint16 kCh0blockstocopy = 382;
+static const uint16 kCh0playing = 384;
+static const uint16 kCh0repeat = 385;
+static const uint16 kCh1playing = 386;
+static const uint16 kCh1blockstocopy = 387;
+static const uint16 kSoundbufferwrite = 389;
+static const uint16 kCurrentsample = 391;
+static const uint16 kRoomssample = 392;
+static const uint16 kBasicsample = 393;
+static const uint16 kCurrentfile = 420;
+static const uint16 kInputline = 495;
+static const uint16 kQuitrequested = 623;
+static const uint16 kSubtitles = 624;
+static const uint16 kForeignrelease = 625;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index b246323e9d..2ca7305493 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -29,30 +29,28 @@ void DreamBase::showRyanPage() {
 	showFrame(engine->icons1(), kInventx + 167 + 18 * data.byte(kRyanpage), kInventy - 12, 13 + data.byte(kRyanpage), 0);
 }
 
-void DreamBase::findAllRyan(uint8 *inv) {
-	memset(inv, 0xff, 60);
+void DreamBase::findAllRyan() {
+	memset(_ryanInvList, 0xff, 60);
 	for (size_t i = 0; i < kNumexobjects; ++i) {
-		DynObject *extra = getExAd(i);
-		if (extra->mapad[0] != 4)
+		const DynObject *extra = getExAd(i);
+		if (extra->mapad[0] != kExObjectType)
 			continue;
 		if (extra->mapad[1] != 0xff)
 			continue;
 		uint8 slot = extra->mapad[2];
 		assert(slot < 30);
-		inv[2 * slot + 0] = i;
-		inv[2 * slot + 1] = 4;
+		_ryanInvList[slot]._index = i;
+		_ryanInvList[slot]._type = kExObjectType;
 	}
 }
 
 void DreamBase::fillRyan() {
-	uint8 *inv = getSegment(data.word(kBuffers)).ptr(kRyaninvlist, 60);
-	findAllRyan(inv);
-	inv += data.byte(kRyanpage) * 2 * 10;
+	ObjectRef *inv = &_ryanInvList[data.byte(kRyanpage) * 10];
+	findAllRyan();
 	for (size_t i = 0; i < 2; ++i) {
 		for (size_t j = 0; j < 5; ++j) {
-			uint8 objIndex = *inv++;
-			uint8 objType = *inv++;
-			obToInv(objIndex, objType, kInventx + j * kItempicsize, kInventy + i * kItempicsize);
+			obToInv(inv->_index, inv->_type, kInventx + j * kItempicsize, kInventy + i * kItempicsize);
+			++inv;
 		}
 	}
 	showRyanPage();
@@ -350,35 +348,30 @@ void DreamGenContext::identifyOb() {
 		blank();
 }
 
-uint16 DreamGenContext::findInvPosCPP() {
+ObjectRef DreamBase::findInvPos() {
 	uint16 x = data.word(kMousex) - kInventx;
 	uint16 y = data.word(kMousey) - kInventy;
-	uint16 pos = (x / kItempicsize) + (y / kItempicsize) * 5;
-	uint16 invPos = data.byte(kRyanpage) * 10 + pos;
-	data.byte(kLastinvpos) = invPos & 0xFF;
-	return invPos * 2 + kRyaninvlist;
-}
-
-void DreamGenContext::findInvPos() {
-	bx = findInvPosCPP();
-	es = data.word(kBuffers);
+	uint8 pos = (x / kItempicsize) + (y / kItempicsize) * 5;
+	uint8 invPos = data.byte(kRyanpage) * 10 + pos;
+	data.byte(kLastinvpos) = invPos;
+	return _ryanInvList[invPos];
 }
 
 void DreamGenContext::selectOb() {
-	uint16 objectId = getSegment(data.word(kBuffers)).word(findInvPosCPP());
-	if ((objectId & 0xFF) == 255) {
+	ObjectRef objectId = findInvPos();
+	if (objectId._index == 255) {
 		blank();
 		return;
 	}
 
-	data.byte(kWithobject) = objectId & 0x00FF;
-	data.byte(kWithtype)   = objectId >> 8;
+	data.byte(kWithobject) = objectId._index;
+	data.byte(kWithtype)   = objectId._type;
 
-	if (objectId != data.word(kOldsubject) || data.byte(kCommandtype) != 221) {
-		if (objectId == data.word(kOldsubject))
+	if (objectId != _oldSubject || data.byte(kCommandtype) != 221) {
+		if (objectId == _oldSubject)
 			data.byte(kCommandtype) = 221;
-		data.word(kOldsubject) = objectId;
-		commandWithOb(0, data.byte(kWithtype), data.byte(kWithobject));
+		_oldSubject = objectId;
+		commandWithOb(0, objectId._type, objectId._index);
 	}
 
 	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
@@ -514,20 +507,21 @@ void DreamGenContext::inToInv() {
 		return;
 	}
 
-	uint16 subject = getSegment(data.word(kBuffers)).word(findInvPosCPP());
+	ObjectRef subject = findInvPos();
 
-	if ((subject & 0xFF) != 255) {
+	if (subject._index != 255) {
 		swapWithInv();
 		return;
 	}
 
-	subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
+	subject._type = data.byte(kObjecttype);
+	subject._index = data.byte(kItemframe);
 
-	if (subject != data.word(kOldsubject) || data.byte(kCommandtype) != 220) {
-		if (subject == data.word(kOldsubject))
+	if (subject != _oldSubject || data.byte(kCommandtype) != 220) {
+		if (subject == _oldSubject)
 			data.byte(kCommandtype) = 220;
-		data.word(kOldsubject) = subject;
-		commandWithOb(35, data.byte(kObjecttype), data.byte(kItemframe));
+		_oldSubject = subject;
+		commandWithOb(35, subject._type, subject._index);
 	}
 
 	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
@@ -548,9 +542,9 @@ void DreamGenContext::inToInv() {
 }
 
 void DreamGenContext::outOfInv() {
-	uint16 subject = getSegment(data.word(kBuffers)).word(findInvPosCPP());
+	ObjectRef subject = findInvPos();
 
-	if ((subject & 0xFF) == 255) {
+	if (subject._index == 255) {
 		blank();
 		return;
 	}
@@ -560,13 +554,11 @@ void DreamGenContext::outOfInv() {
 		return;
 	}
 
-	if (subject != data.word(kOldsubject) || data.byte(kCommandtype) != 221) {
-		if (subject == data.word(kOldsubject))
+	if (subject != _oldSubject || data.byte(kCommandtype) != 221) {
+		if (subject == _oldSubject)
 			data.byte(kCommandtype) = 221;
-		data.word(kOldsubject) = subject;
-		byte type = subject >> 8;
-		byte frame = subject & 0xFF;
-		commandWithOb(36, type, frame);
+		_oldSubject = subject;
+		commandWithOb(36, subject._type, subject._index);
 	}
 
 	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
@@ -574,10 +566,11 @@ void DreamGenContext::outOfInv() {
 
 	delPointer();
 	data.byte(kPickup) = 1;
-	subject = getSegment(data.word(kBuffers)).word(findInvPosCPP());
-	data.byte(kObjecttype) = subject >> 8;
-	data.byte(kItemframe) = subject & 0xFF;
-	DynObject *object = getExAd(data.byte(kItemframe));
+	subject = findInvPos();
+	data.byte(kObjecttype) = subject._type;
+	data.byte(kItemframe) = subject._index;
+	assert(subject._type == kExObjectType);
+	DynObject *object = getExAd(subject._index);
 	object->mapad[0] = 20;
 	object->mapad[1] = 255;
 	fillRyan();
@@ -782,24 +775,26 @@ void DreamGenContext::selectOpenOb() {
 }
 
 void DreamGenContext::reExFromInv() {
-	uint16 objectId = getSegment(data.word(kBuffers)).word(findInvPosCPP());
-	data.byte(kCommandtype) = objectId >> 8;
-	data.byte(kCommand)     = objectId & 0x00FF;
+	ObjectRef objectId = findInvPos();
+	data.byte(kCommandtype) = objectId._type;
+	data.byte(kCommand)     = objectId._index;
 	data.byte(kExamagain) = 1;
 	data.byte(kPointermode) = 0;
 }
 
 void DreamGenContext::swapWithInv() {
-	uint16 subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
-	if (subject == data.word(kOldsubject)) {
+	ObjectRef subject;
+	subject._type = data.byte(kObjecttype);
+	subject._index = data.byte(kItemframe);
+	if (subject == _oldSubject) {
 		if (data.byte(kCommandtype) != 243) {
 			data.byte(kCommandtype) = 243;
-			data.word(kOldsubject) = subject;
-			commandWithOb(34, data.byte(kObjecttype), data.byte(kItemframe));
+			_oldSubject = subject;
+			commandWithOb(34, subject._type, subject._index);
 		}
 	} else {
-		data.word(kOldsubject) = subject;
-		commandWithOb(34, data.byte(kObjecttype), data.byte(kItemframe));
+		_oldSubject = subject;
+		commandWithOb(34, subject._type, subject._index);
 	}
 
 	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
@@ -807,9 +802,9 @@ void DreamGenContext::swapWithInv() {
 
 	byte prevType = data.byte(kObjecttype);
 	byte prevFrame = data.byte(kItemframe);
-	uint16 objectId = getSegment(data.word(kBuffers)).word(findInvPosCPP());
-	data.byte(kItemframe)  = objectId & 0x00FF;
-	data.byte(kObjecttype) = objectId >> 8;
+	ObjectRef objectId = findInvPos();
+	data.byte(kItemframe) = objectId._index;
+	data.byte(kObjecttype) = objectId._type;
 	DynObject *object = getEitherAdCPP();
 	object->mapad[0] = 20;
 	object->mapad[1] = 255;
@@ -817,7 +812,6 @@ void DreamGenContext::swapWithInv() {
 	byte prevFrame2 = data.byte(kItemframe);
 	data.byte(kObjecttype) = prevType;
 	data.byte(kItemframe) = prevFrame;
-	//findInvPosCPP();	// found in the original source, but it seems to be useless
 	delPointer();
 	object = getEitherAdCPP();
 	object->mapad[0] = 4;
@@ -841,9 +835,9 @@ void DreamGenContext::useOpened() {
 		return;
 	}
 
-	uint16 objectId = getSegment(data.word(kBuffers)).word(findOpenPos());
+	ObjectRef objectId = findOpenPos();
 
-	if ((objectId & 0x00FF) != 255) {
+	if (objectId._index != 255) {
 		swapWithOpen();
 		return;
 	}
@@ -853,16 +847,17 @@ void DreamGenContext::useOpened() {
 		return;
 	}
 
-	objectId = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
-	if (objectId == data.word(kOldsubject)) {
+	objectId._type = data.byte(kObjecttype);
+	objectId._index = data.byte(kItemframe);
+	if (objectId == _oldSubject) {
 		if (data.byte(kCommandtype) != 227) {
 			data.byte(kCommandtype) = 227;
-			data.word(kOldsubject) = objectId;
-			commandWithOb(35, data.byte(kObjecttype), data.byte(kItemframe));
+			_oldSubject = objectId;
+			commandWithOb(35, objectId._type, objectId._index);
 		}
 	} else {
-		data.word(kOldsubject) = objectId;
-		commandWithOb(35, data.byte(kObjecttype), data.byte(kItemframe));
+		_oldSubject = objectId;
+		commandWithOb(35, objectId._type, objectId._index);
 	}
 
 	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
@@ -903,22 +898,22 @@ void DreamGenContext::outOfOpen() {
 	if (data.byte(kOpenedob) == 255)
 		return;	// cannot use opened object
 
-	uint16 objectId = getSegment(data.word(kBuffers)).word(findOpenPos());
+	ObjectRef objectId = findOpenPos();
 
-	if ((objectId & 0x00FF) == 255) {
+	if (objectId._index == 255) {
 		blank();
 		return;
 	}
 
-	if (objectId == data.word(kOldsubject)) {
+	if (objectId == _oldSubject) {
 		if (data.byte(kCommandtype) != 228) {
 			data.byte(kCommandtype) = 228;
-			data.word(kOldsubject) = objectId;
-			commandWithOb(36, objectId >> 8, objectId & 0x00FF);
+			_oldSubject = objectId;
+			commandWithOb(36, objectId._type, objectId._index);
 		}
 	} else {
-		data.word(kOldsubject) = objectId;
-		commandWithOb(36, objectId >> 8, objectId & 0x00FF);
+		_oldSubject = objectId;
+		commandWithOb(36, objectId._type, objectId._index);
 	}
 
 	if (data.word(kMousebutton) == data.word(kOldbutton))
@@ -934,13 +929,13 @@ void DreamGenContext::outOfOpen() {
 
 	delPointer();
 	data.byte(kPickup) = 1;
-	objectId = getSegment(data.word(kBuffers)).word(findOpenPos());
-	data.byte(kObjecttype) = objectId >> 8;
-	data.byte(kItemframe)  = objectId & 0xFF;
+	objectId = findOpenPos();
+	data.byte(kObjecttype) = objectId._type;
+	data.byte(kItemframe) = objectId._index;
 
-	if (data.byte(kObjecttype) != 4) {
+	if (data.byte(kObjecttype) != kExObjectType) {
 		data.byte(kItemframe) = transferToEx();
-		data.byte(kObjecttype) = 4;
+		data.byte(kObjecttype) = kExObjectType;
 	}
 
 	DynObject *object = getEitherAdCPP();
@@ -957,16 +952,18 @@ void DreamGenContext::outOfOpen() {
 }
 
 void DreamGenContext::swapWithOpen() {
-	uint16 subject = (data.byte(kObjecttype) << 8) | data.byte(kItemframe);
-	if (subject == data.word(kOldsubject)) {
+	ObjectRef subject;
+	subject._type = data.byte(kObjecttype);
+	subject._index = data.byte(kItemframe);
+	if (subject == _oldSubject) {
 		if (data.byte(kCommandtype) != 242) {
 			data.byte(kCommandtype) = 242;
-			data.word(kOldsubject) = subject;
-			commandWithOb(34, data.byte(kObjecttype), data.byte(kItemframe));
+			_oldSubject = subject;
+			commandWithOb(34, subject._type, subject._index);
 		}
 	} else {
-		data.word(kOldsubject) = subject;
-		commandWithOb(34, data.byte(kObjecttype), data.byte(kItemframe));
+		_oldSubject = subject;
+		commandWithOb(34, subject._type, subject._index);
 	}
 
 	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
@@ -990,13 +987,13 @@ void DreamGenContext::swapWithOpen() {
 
 	byte prevType = data.byte(kObjecttype);
 	byte prevFrame = data.byte(kItemframe);
-	uint16 objectId = getSegment(data.word(kBuffers)).word(findOpenPos());
-	data.byte(kObjecttype) = objectId >> 8;
-	data.byte(kItemframe)  = objectId & 0xFF;
+	ObjectRef objectId = findOpenPos();
+	data.byte(kObjecttype) = objectId._type;
+	data.byte(kItemframe)  = objectId._index;
 
-	if (data.byte(kObjecttype) != 4) {
+	if (data.byte(kObjecttype) != kExObjectType) {
 		data.byte(kItemframe) = transferToEx();
-		data.byte(kObjecttype) = 4;
+		data.byte(kObjecttype) = kExObjectType;
 	}
 
 	DynObject *object = getEitherAdCPP();
@@ -1007,7 +1004,6 @@ void DreamGenContext::swapWithOpen() {
 	byte prevFrame2 = data.byte(kItemframe);
 	data.byte(kObjecttype) = prevType;
 	data.byte(kItemframe) = prevFrame;
-	//findOpenPos();	// was in the original source, looks to be unused
 	object = getEitherAdCPP();
 	object->mapad[0] = data.byte(kOpenedtype);
 	object->mapad[1] = data.byte(kOpenedob);
@@ -1025,11 +1021,11 @@ void DreamGenContext::swapWithOpen() {
 	delPointer();
 }
 
-uint16 DreamBase::findOpenPos() {
-	uint16 pos = (data.word(kMousex) - kInventx) / kItempicsize;
-	data.byte(kLastinvpos) = pos & 0xFF;
+ObjectRef DreamBase::findOpenPos() {
+	uint8 pos = (data.word(kMousex) - kInventx) / kItempicsize;
+	data.byte(kLastinvpos) = pos;
 
-	return pos * 2 + kOpeninvlist;	// return the object position in the inventory data
+	return _openInvList[pos];
 }
 
 byte DreamGenContext::transferToEx() {
@@ -1063,24 +1059,19 @@ void DreamBase::fillOpen() {
 	if (size > 4)
 		size = 4;
 	findAllOpen();
-	uint8 *openInvList = getSegment(data.word(kBuffers)).ptr(kOpeninvlist, 32);
 	for (uint8 i = 0; i < size; ++i) {
-		uint8 index = openInvList[2*i]; 
-		uint8 type = openInvList[2*i + 1];
+		uint8 index = _openInvList[i]._index; 
+		uint8 type = _openInvList[i]._type;
 		obToInv(index, type, kInventx + i * kItempicsize, kInventy + 96);
 	}
 	underTextLine();
 }
 
 void DreamBase::findAllOpen() {
-	uint8 *openInvList = getSegment(data.word(kBuffers)).ptr(kOpeninvlist, 32);
-
-	memset(openInvList, 0xFF, 32);
-
-	const DynObject *obj;
+	memset(_openInvList, 0xFF, 32);
 
-	obj = (const DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, 0);
-	for (uint8 i = 0; i < kNumexobjects; ++i, ++obj) {
+	for (uint8 i = 0; i < kNumexobjects; ++i) {
+		const DynObject *obj = getExAd(i);
 		if (obj->mapad[1] != data.byte(kOpenedob))
 			continue;
 		if (obj->mapad[0] != data.byte(kOpenedtype))
@@ -1089,19 +1080,19 @@ void DreamBase::findAllOpen() {
 			continue;
 		uint8 slot = obj->mapad[2];
 		assert(slot < 16);
-		openInvList[2*slot] = i;
-		openInvList[2*slot + 1] = kExObjectType;
+		_openInvList[slot]._index = i;
+		_openInvList[slot]._type = kExObjectType;
 	}
 
-	obj = (const DynObject *)getSegment(data.word(kFreedat)).ptr(0, 0);
-	for (uint8 i = 0; i < 80; ++i, ++obj) {
+	for (uint8 i = 0; i < 80; ++i) {
+		const DynObject *obj = getFreeAd(i);
 		if (obj->mapad[1] != data.byte(kOpenedob))
 			continue;
 		if (obj->mapad[0] != data.byte(kOpenedtype))
 			continue;
-		uint8 index = obj->mapad[2];
-		openInvList[2*index] = i;
-		openInvList[2*index + 1] = kFreeObjectType;
+		uint8 slot = obj->mapad[2];
+		_openInvList[slot]._index = i;
+		_openInvList[slot]._type = kFreeObjectType;
 	}
 }
 
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index b0a168930b..fdc84536c0 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -281,6 +281,18 @@ enum ObjectTypes {
 	kExObjectType = 4
 };
 
+struct ObjectRef {
+	uint8 _index;
+	uint8 _type; // enum ObjectTypes
+
+	bool operator==(const ObjectRef &r) const {
+		return _index == r._index && _type == r._type;
+	}
+	bool operator!=(const ObjectRef &r) const {
+		return _index != r._index || _type != r._type;
+	}
+};
+
 } // End of namespace DreamWeb
 
 #endif
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 14b8accea0..5577c772d5 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -121,8 +121,6 @@
 	bool checkObjectSizeCPP();
 	void identifyOb();
 	void selectOb();
-	void findInvPos();
-	uint16 findInvPosCPP();
 	void setPickup();
 	void getKeyAndLogo();
 	void signOn();
-- 
cgit v1.2.3


From 15bb44dda15bfeb0762fe39be7b25ab7fcdd0267 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 26 Dec 2011 17:40:32 +0100
Subject: DREAMWEB: Remove now unused Buffers segment

---
 engines/dreamweb/dreamgen.cpp |  38 +++++++-------
 engines/dreamweb/dreamgen.h   | 119 +++++++++++++++++++++---------------------
 engines/dreamweb/stubs.cpp    |   3 --
 3 files changed, 78 insertions(+), 82 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index eeb2d346d9..424c4ab71e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -154,7 +154,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 420;
+	di = 418;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -284,7 +284,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 420+1;
+	di = 418+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -366,7 +366,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 495;
+	si = 493;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -434,28 +434,28 @@ void DreamGenContext::__start() {
 		//0x0110: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0120: .... .... .... ....
-		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, 0xff, 
 		//0x0130: .... .... .... ....
-		0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0140: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0150: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0170: .... .... .... ....
-		0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 
-		//0x0180: .... .... .DRE AMWE
-		0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0190: B.V9 9.            
-		0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x01a0:    . "             
-		0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 
-		//0x01b0:  ... ..$. .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 
-		//0x01c0: .... .... .... ...D
-		0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01d0: :... .... .... ....
+		0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 
+		//0x0180: .... ...D REAM WEB.
+		0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0190: V99.               
+		0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
+		//0x01a0:  ."               .
+		0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 
+		//0x01b0: .... $... .... ....
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 
+		//0x01c0: .... .... .... .D:.
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x01d0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x01e0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -474,7 +474,7 @@ void DreamGenContext::__start() {
 		//0x0250: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0260: .... .... .... ....
-		0x00, 0x00, };
+		};
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 155c24d721..41c252ed72 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,7 +32,7 @@
 
 namespace DreamGen {
 
-static const uint16 offset_operand1 = 0x0196;
+static const uint16 offset_operand1 = 0x0194;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -265,65 +265,64 @@ static const uint16 kExtras = 295;
 static const uint16 kWorkspace = 297;
 static const uint16 kMapstore = 299;
 static const uint16 kCharset1 = 301;
-static const uint16 kBuffers = 303;
-static const uint16 kMainsprites = 305;
-static const uint16 kBackdrop = 307;
-static const uint16 kMapdata = 309;
-static const uint16 kSounddata = 311;
-static const uint16 kSounddata2 = 313;
-static const uint16 kRecordspace = 315;
-static const uint16 kFreedat = 317;
-static const uint16 kSetdat = 319;
-static const uint16 kReel1 = 321;
-static const uint16 kReel2 = 323;
-static const uint16 kReel3 = 325;
-static const uint16 kRoomdesc = 327;
-static const uint16 kFreedesc = 329;
-static const uint16 kSetdesc = 331;
-static const uint16 kBlockdesc = 333;
-static const uint16 kSetframes = 335;
-static const uint16 kFreeframes = 337;
-static const uint16 kPeople = 339;
-static const uint16 kReels = 341;
-static const uint16 kCommandtext = 343;
-static const uint16 kPuzzletext = 345;
-static const uint16 kTraveltext = 347;
-static const uint16 kTempgraphics = 349;
-static const uint16 kTempgraphics2 = 351;
-static const uint16 kTempgraphics3 = 353;
-static const uint16 kTempsprites = 355;
-static const uint16 kTextfile1 = 357;
-static const uint16 kTextfile2 = 359;
-static const uint16 kTextfile3 = 361;
-static const uint16 kBlinkframe = 363;
-static const uint16 kBlinkcount = 364;
-static const uint16 kReasseschanges = 365;
-static const uint16 kPointerspath = 366;
-static const uint16 kManspath = 367;
-static const uint16 kPointerfirstpath = 368;
-static const uint16 kFinaldest = 369;
-static const uint16 kDestination = 370;
-static const uint16 kLinestartx = 371;
-static const uint16 kLinestarty = 373;
-static const uint16 kLineendx = 375;
-static const uint16 kLineendy = 377;
-static const uint16 kLinepointer = 379;
-static const uint16 kLinedirection = 380;
-static const uint16 kLinelength = 381;
-static const uint16 kCh0blockstocopy = 382;
-static const uint16 kCh0playing = 384;
-static const uint16 kCh0repeat = 385;
-static const uint16 kCh1playing = 386;
-static const uint16 kCh1blockstocopy = 387;
-static const uint16 kSoundbufferwrite = 389;
-static const uint16 kCurrentsample = 391;
-static const uint16 kRoomssample = 392;
-static const uint16 kBasicsample = 393;
-static const uint16 kCurrentfile = 420;
-static const uint16 kInputline = 495;
-static const uint16 kQuitrequested = 623;
-static const uint16 kSubtitles = 624;
-static const uint16 kForeignrelease = 625;
+static const uint16 kMainsprites = 303;
+static const uint16 kBackdrop = 305;
+static const uint16 kMapdata = 307;
+static const uint16 kSounddata = 309;
+static const uint16 kSounddata2 = 311;
+static const uint16 kRecordspace = 313;
+static const uint16 kFreedat = 315;
+static const uint16 kSetdat = 317;
+static const uint16 kReel1 = 319;
+static const uint16 kReel2 = 321;
+static const uint16 kReel3 = 323;
+static const uint16 kRoomdesc = 325;
+static const uint16 kFreedesc = 327;
+static const uint16 kSetdesc = 329;
+static const uint16 kBlockdesc = 331;
+static const uint16 kSetframes = 333;
+static const uint16 kFreeframes = 335;
+static const uint16 kPeople = 337;
+static const uint16 kReels = 339;
+static const uint16 kCommandtext = 341;
+static const uint16 kPuzzletext = 343;
+static const uint16 kTraveltext = 345;
+static const uint16 kTempgraphics = 347;
+static const uint16 kTempgraphics2 = 349;
+static const uint16 kTempgraphics3 = 351;
+static const uint16 kTempsprites = 353;
+static const uint16 kTextfile1 = 355;
+static const uint16 kTextfile2 = 357;
+static const uint16 kTextfile3 = 359;
+static const uint16 kBlinkframe = 361;
+static const uint16 kBlinkcount = 362;
+static const uint16 kReasseschanges = 363;
+static const uint16 kPointerspath = 364;
+static const uint16 kManspath = 365;
+static const uint16 kPointerfirstpath = 366;
+static const uint16 kFinaldest = 367;
+static const uint16 kDestination = 368;
+static const uint16 kLinestartx = 369;
+static const uint16 kLinestarty = 371;
+static const uint16 kLineendx = 373;
+static const uint16 kLineendy = 375;
+static const uint16 kLinepointer = 377;
+static const uint16 kLinedirection = 378;
+static const uint16 kLinelength = 379;
+static const uint16 kCh0blockstocopy = 380;
+static const uint16 kCh0playing = 382;
+static const uint16 kCh0repeat = 383;
+static const uint16 kCh1playing = 384;
+static const uint16 kCh1blockstocopy = 385;
+static const uint16 kSoundbufferwrite = 387;
+static const uint16 kCurrentsample = 389;
+static const uint16 kRoomssample = 390;
+static const uint16 kBasicsample = 391;
+static const uint16 kCurrentfile = 418;
+static const uint16 kInputline = 493;
+static const uint16 kQuitrequested = 621;
+static const uint16 kSubtitles = 622;
+static const uint16 kForeignrelease = 623;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 65c9d73ecd..87bca3d67c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2474,7 +2474,6 @@ void DreamBase::drawFloor() {
 void DreamBase::allocateBuffers() {
 	data.word(kExtras) = allocateMem(kLengthofextra/16);
 	data.word(kMapdata) = allocateMem(kLengthofmap/16);
-	data.word(kBuffers) = allocateMem(kLengthofbuffer/16);
 	data.word(kFreedat) = allocateMem(kFreedatlen/16);
 	data.word(kSetdat) = allocateMem(kSetdatlen/16);
 	data.word(kMapstore) = allocateMem(kLenofmapstore/16);
@@ -3592,8 +3591,6 @@ void DreamBase::lookAtCard() {
 }
 
 void DreamBase::clearBuffers() {
-	memset(getSegment(data.word(kBuffers)).ptr(0, kLengthofbuffer), 0, kLengthofbuffer);
-
 	memset(getSegment(data.word(kExtras)).ptr(0, kLengthofextra), 0xFF, kLengthofextra);
 
 	memcpy(_initialVars, data.ptr(kStartvars, kLengthofvars), kLengthofvars);
-- 
cgit v1.2.3


From 12370047567e5b1404aafe4c0f37d44bdba8c0b0 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 26 Dec 2011 17:53:04 +0100
Subject: DREAMWEB: Minor cleanup

---
 engines/dreamweb/object.cpp | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 2ca7305493..5d0fbab7ee 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -786,13 +786,9 @@ void DreamGenContext::swapWithInv() {
 	ObjectRef subject;
 	subject._type = data.byte(kObjecttype);
 	subject._index = data.byte(kItemframe);
-	if (subject == _oldSubject) {
-		if (data.byte(kCommandtype) != 243) {
+	if (subject != _oldSubject || data.byte(kCommandtype) != 243) {
+		if (subject == _oldSubject)
 			data.byte(kCommandtype) = 243;
-			_oldSubject = subject;
-			commandWithOb(34, subject._type, subject._index);
-		}
-	} else {
 		_oldSubject = subject;
 		commandWithOb(34, subject._type, subject._index);
 	}
@@ -849,13 +845,9 @@ void DreamGenContext::useOpened() {
 
 	objectId._type = data.byte(kObjecttype);
 	objectId._index = data.byte(kItemframe);
-	if (objectId == _oldSubject) {
-		if (data.byte(kCommandtype) != 227) {
+	if (objectId != _oldSubject || data.byte(kCommandtype) != 227) {
+		if (objectId == _oldSubject)
 			data.byte(kCommandtype) = 227;
-			_oldSubject = objectId;
-			commandWithOb(35, objectId._type, objectId._index);
-		}
-	} else {
 		_oldSubject = objectId;
 		commandWithOb(35, objectId._type, objectId._index);
 	}
@@ -905,13 +897,9 @@ void DreamGenContext::outOfOpen() {
 		return;
 	}
 
-	if (objectId == _oldSubject) {
-		if (data.byte(kCommandtype) != 228) {
+	if (objectId != _oldSubject || data.byte(kCommandtype) != 228) {
+		if (objectId == _oldSubject)
 			data.byte(kCommandtype) = 228;
-			_oldSubject = objectId;
-			commandWithOb(36, objectId._type, objectId._index);
-		}
-	} else {
 		_oldSubject = objectId;
 		commandWithOb(36, objectId._type, objectId._index);
 	}
@@ -920,10 +908,8 @@ void DreamGenContext::outOfOpen() {
 		return;	// notletgo4
 
 	if (data.word(kMousebutton) != 1) {
-		if (data.word(kMousebutton) != 2)
-			return;	// notletgo4
-
-		reExFromOpen();
+		if (data.word(kMousebutton) == 2)
+			reExFromOpen();
 		return;
 	}
 
@@ -955,13 +941,9 @@ void DreamGenContext::swapWithOpen() {
 	ObjectRef subject;
 	subject._type = data.byte(kObjecttype);
 	subject._index = data.byte(kItemframe);
-	if (subject == _oldSubject) {
-		if (data.byte(kCommandtype) != 242) {
+	if (subject != _oldSubject || data.byte(kCommandtype) != 242) {
+		if (subject == _oldSubject)
 			data.byte(kCommandtype) = 242;
-			_oldSubject = subject;
-			commandWithOb(34, subject._type, subject._index);
-		}
-	} else {
 		_oldSubject = subject;
 		commandWithOb(34, subject._type, subject._index);
 	}
-- 
cgit v1.2.3


From 6ca8d9ffe33cea03c4f8371cc3f1aef349f6f380 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 26 Dec 2011 17:54:38 +0100
Subject: KYRA: Remove unused/obsolete function.

---
 engines/kyra/screen.cpp | 52 -------------------------------------------------
 engines/kyra/screen.h   |  2 --
 2 files changed, 54 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 8dc53baa2f..3d94189fc9 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -978,58 +978,6 @@ void Screen::fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum,
 	}
 }
 
-void Screen::crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage) {
-	if (srcPage > 13 || dstPage > 13)
-		error("Screen::crossFadeRegion: attempting to use temp page as source or dest page.");
-
-	hideMouse();
-
-	uint16 *wB = (uint16*)_pagePtrs[14];
-	uint8 *hB = _pagePtrs[14] + 640;
-
-	for (int i = 0; i < w; i++)
-		wB[i] = i;
-
-	for (int i = 0; i < h; i++)
-		hB[i] = i;
-
-	for (int i = 0; i < w; i++)
-		SWAP(wB[_vm->_rnd.getRandomNumberRng(0, w - 1)], wB[i]);
-
-	for (int i = 0; i < h; i++)
-		SWAP(hB[_vm->_rnd.getRandomNumberRng(0, h - 1)], hB[i]);
-
-	uint8 *s = _pagePtrs[srcPage];
-	uint8 *d = _pagePtrs[dstPage];
-
-	for (int i = 0; i < h; i++) {
-		int iH = i;
-		uint32 end = _system->getMillis() + 1;
-		for (int ii = 0; ii < w; ii++) {
-			int sX = x1 + wB[ii];
-			int sY = y1 + hB[iH];
-			int dX = x2 + wB[ii];
-			int dY = y2 + hB[iH];
-
-			if (++iH >= h)
-				iH = 0;
-
-			d[dY * 320 + dX] = s[sY * 320 + sX];
-			addDirtyRect(dX, dY, 1, 1);
-		}
-
-		// This tries to speed things up, to get similiar speeds as in DOSBox etc.
-		if ((i & 5) == 5)
-			updateScreen();
-
-		uint32 cur = _system->getMillis();
-		if (end > cur)
-			_system->delayMillis(end - cur);
-	}
-
-	showMouse();
-}
-
 void Screen::drawBox(int x1, int y1, int x2, int y2, int color) {
 	drawClippedLine(x1, y1, x2, y1, color);
 	drawClippedLine(x1, y1, x1, y2, color);
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index 7912e59973..1118c97d93 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -400,8 +400,6 @@ public:
 	void shuffleScreen(int sx, int sy, int w, int h, int srcPage, int dstPage, int ticks, bool transparent);
 	void fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum = -1, bool xored = false);
 
-	void crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage);
-
 	void clearPage(int pageNum);
 
 	uint8 getPagePixel(int pageNum, int x, int y);
-- 
cgit v1.2.3


From 82b6f6c97b6c0ce3811fed0a51c20ddad77b09a4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 19:01:09 +0200
Subject: DREAMWEB: Cleanup searchForFiles()

---
 engines/dreamweb/monitor.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index e586999129..a877f17b8a 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -534,20 +534,16 @@ void DreamGenContext::signOn() {
 }
 
 void DreamGenContext::searchForFiles(uint16 segment) {
-	uint16 offset = kTextstart;
+	const char *filesString = (const char *)getSegment(segment).ptr(kTextstart, 0);
 	byte curChar;
 
 	while (true) {
-		curChar = getSegment(segment).byte(offset);
-		offset++;
+		curChar = filesString[0];
+		filesString++;
 		if (curChar == '*')
 			return; // "endofdir"
-		if (curChar == 34) {
-			uint16 originalOffset = offset;
-			const char *string = (const char *)getSegment(segment).ptr(offset, 0);
-			const char *nextString = monPrint(string);
-			offset = originalOffset + (nextString - string);
-		}
+		if (curChar == 34)
+			filesString = monPrint(filesString);
 	}
 }
 
-- 
cgit v1.2.3


From c2a94132c8adf8bec5914ca6fa2e312248e1c2bd Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 26 Dec 2011 18:42:28 +0100
Subject: DREAMWEB: Convert pickupConts

---
 engines/dreamweb/dreambase.h  |  2 ++
 engines/dreamweb/dreamgen.cpp | 69 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  2 --
 engines/dreamweb/object.cpp   | 50 +++++++++++++++++++++++++------
 engines/dreamweb/stubs.cpp    |  7 +++--
 engines/dreamweb/stubs.h      |  7 ++---
 6 files changed, 50 insertions(+), 87 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 4b9919de7a..b134159a2e 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -219,6 +219,8 @@ public:
 	void findAllOpen();
 	void fillOpen();
 	ObjectRef findInvPos();
+	void reExFromInv();
+	void swapWithInv();
 
 	// from pathfind.cpp
 	void turnPathOn(uint8 param);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 424c4ab71e..356ebc8d36 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -73,75 +73,6 @@ void DreamGenContext::transferMap() {
 	_add(data.word(kExframepos), cx);
 }
 
-void DreamGenContext::pickupConts() {
-	STACK_CHECK;
-	al = ds.byte(si+7);
-	_cmp(al, 255);
-	if (flags.z())
-		return /* (notopenable) */;
-	al = data.byte(kItemframe);
-	ah = data.byte(kObjecttype);
-	dl = data.byte(kExpos);
-	es = data.word(kFreedat);
-	bx = 0;
-	cx = 0;
-pickupcontloop:
-	push(cx);
-	push(es);
-	push(bx);
-	push(dx);
-	push(ax);
-	_cmp(es.byte(bx+2), ah);
-	if (!flags.z())
-		goto notinsidethis;
-	_cmp(es.byte(bx+3), al);
-	if (!flags.z())
-		goto notinsidethis;
-	data.byte(kItemtotran) = cl;
-	transferConToEx();
-notinsidethis:
-	ax = pop();
-	dx = pop();
-	bx = pop();
-	es = pop();
-	cx = pop();
-	_add(bx, 16);
-	_inc(cx);
-	_cmp(cx, 80);
-	if (!flags.z())
-		goto pickupcontloop;
-}
-
-void DreamGenContext::transferConToEx() {
-	STACK_CHECK;
-	push(es);
-	push(bx);
-	push(dx);
-	push(es);
-	push(bx);
-	getExPos();
-	si = pop();
-	ds = pop();
-	push(di);
-	cx = 8;
-	_movsw(cx, true);
-	di = pop();
-	dx = pop();
-	al = data.byte(kReallocation);
-	es.byte(di) = al;
-	es.byte(di+11) = al;
-	al = data.byte(kItemtotran);
-	es.byte(di+1) = al;
-	es.byte(di+3) = dl;
-	es.byte(di+2) = 4;
-	transferMap();
-	transferInv();
-	transferText();
-	si = pop();
-	ds = pop();
-	ds.byte(si+2) = 255;
-}
-
 void DreamGenContext::read() {
 	STACK_CHECK;
 	cx = 40;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 41c252ed72..0c61a60a6e 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -425,13 +425,11 @@ public:
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
 	void dirFile();
-	void pickupConts();
 	void transferMap();
 	void dreamweb();
 	void read();
 	void searchForString();
 	void parser();
-	void transferConToEx();
 };
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 5d0fbab7ee..9799ca4726 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -712,7 +712,7 @@ void DreamBase::dropObject() {
 	object->currentLocation = data.byte(kReallocation);
 }
 
-bool DreamGenContext::checkObjectSizeCPP() {
+bool DreamGenContext::checkObjectSize() {
 	byte containerSize = getOpenedSlotSize();
 	DynObject *object = getEitherAdCPP();
 	// If there is no size defined for the object in the editor, set its size
@@ -774,7 +774,7 @@ void DreamGenContext::selectOpenOb() {
 	delPointer();
 }
 
-void DreamGenContext::reExFromInv() {
+void DreamBase::reExFromInv() {
 	ObjectRef objectId = findInvPos();
 	data.byte(kCommandtype) = objectId._type;
 	data.byte(kCommand)     = objectId._index;
@@ -782,7 +782,7 @@ void DreamGenContext::reExFromInv() {
 	data.byte(kPointermode) = 0;
 }
 
-void DreamGenContext::swapWithInv() {
+void DreamBase::swapWithInv() {
 	ObjectRef subject;
 	subject._type = data.byte(kObjecttype);
 	subject._index = data.byte(kItemframe);
@@ -868,7 +868,7 @@ void DreamGenContext::useOpened() {
 		return;
 	}
 
-	if (!checkObjectSizeCPP())
+	if (!checkObjectSize())
 		return;
 
 	data.byte(kPickup) = 0;
@@ -964,7 +964,7 @@ void DreamGenContext::swapWithOpen() {
 		return;
 	}
 
-	if (!checkObjectSizeCPP())
+	if (!checkObjectSize())
 		return;
 
 	byte prevType = data.byte(kObjecttype);
@@ -1012,9 +1012,8 @@ ObjectRef DreamBase::findOpenPos() {
 
 byte DreamGenContext::transferToEx() {
 	emergencyPurge();
-	getExPos();
+	DynObject *exObject = getExPos(); // Also sets es:di
 	byte pos = data.byte(kExpos);
-	DynObject *exObject = getExAd(pos);
 	DynObject *freeObject = getFreeAd(data.byte(kItemframe));
 	memcpy(exObject, freeObject, sizeof(DynObject));
 	exObject->currentLocation = data.byte(kReallocation);
@@ -1029,8 +1028,6 @@ byte DreamGenContext::transferToEx() {
 	transferText();
 	freeObject = getFreeAd(data.byte(kItemframe));
 	freeObject->mapad[0] = 254;
-	ds = data.word(kFreedat);
-	si = data.byte(kItemframe) * sizeof(DynObject);
 	pickupConts();
 	return pos;
 }
@@ -1078,4 +1075,39 @@ void DreamBase::findAllOpen() {
 	}
 }
 
+void DreamGenContext::pickupConts() {
+	assert(data.byte(kObjecttype) == kFreeObjectType);
+	const DynObject *obj = getFreeAd(data.byte(kItemframe));
+
+	if (obj->slotCount == 255)
+		return; // not openable
+
+	uint8 expos = data.byte(kExpos);
+
+	for (uint16 index = 0; index < 80; ++index) {
+		DynObject *freeObj = getFreeAd(index);
+
+		if (freeObj->mapad[0] != data.byte(kObjecttype))
+			continue;
+		if (freeObj->mapad[1] != data.byte(kItemframe))
+			continue;
+		data.byte(kItemtotran) = index;
+
+		DynObject *exObj = getExPos(); // Also sets es:di to exObj
+
+		memcpy(exObj, freeObj, sizeof(DynObject));
+		exObj->currentLocation = data.byte(kReallocation);
+		exObj->initialLocation = data.byte(kReallocation);
+		exObj->index = index;
+		exObj->mapad[0] = 4; // kExObjectType?
+		exObj->mapad[1] = expos;
+
+		transferMap();
+		transferInv();
+		transferText();
+
+		freeObj->mapad[0] = 0xFF;
+	}
+}
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 87bca3d67c..9351a01bb5 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1364,18 +1364,19 @@ void DreamBase::deleteTaken() {
 	}
 }
 
-void DreamGenContext::getExPos() {
+DynObject *DreamGenContext::getExPos() {
 	es = data.word(kExtras);
-	const DynObject *objects = (const DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, sizeof(DynObject));
+	DynObject *objects = (DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, sizeof(DynObject));
 	for (size_t i = 0; i < kNumexobjects; ++i) {
 		if (objects[i].mapad[0] == 0xff) {
 			data.byte(kExpos) = i;
 			di = kExdata + i * sizeof(DynObject);
-			return;
+			return &objects[i];
 		}
 	}
 	data.byte(kExpos) = kNumexobjects;
 	di = kExdata + kNumexobjects * sizeof(DynObject);
+	return 0;
 }
 
 void DreamBase::placeSetObject(uint8 index) {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 5577c772d5..8bdc0b11c0 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -66,7 +66,7 @@
 	void walkAndExamine();
 	void obName(uint8 command, uint8 commandType);
 
-	void getExPos();
+	DynObject *getExPos();
 	bool checkIfSet(uint8 x, uint8 y);
 	void obToInv();
 	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
@@ -118,7 +118,7 @@
 	void triggerMessage(uint16 index);
 	void processTrigger();
 	bool execCommand();
-	bool checkObjectSizeCPP();
+	bool checkObjectSize();
 	void identifyOb();
 	void selectOb();
 	void setPickup();
@@ -127,13 +127,12 @@
 	void inToInv();
 	void outOfInv();
 	void selectOpenOb();
-	void reExFromInv();
 	void useOpened();
 	void outOfOpen();
 	void swapWithOpen();
-	void swapWithInv();
 	void searchForFiles(uint16 segment);
 	byte transferToEx();
 	void dirCom();
+	void pickupConts();
 
 #endif
-- 
cgit v1.2.3


From 487e73bd218775dec22818477ad75dd230d97052 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 26 Dec 2011 19:27:20 +0100
Subject: KYRA: Merge Screen_Rpg with Screen (for now).

This should(!) fix ARM compilation issues due to virtual inheritance.
---
 engines/kyra/eobcommon.h    |   1 -
 engines/kyra/kyra_rpg.h     |   1 -
 engines/kyra/lol.cpp        |   4 --
 engines/kyra/lol.h          |   1 -
 engines/kyra/module.mk      |   1 -
 engines/kyra/scene_rpg.cpp  |   5 +-
 engines/kyra/screen.cpp     |  90 ++++++++++++++++++++++++++++++-
 engines/kyra/screen.h       |  20 +++++--
 engines/kyra/screen_eob.cpp |   2 +-
 engines/kyra/screen_eob.h   |   6 +--
 engines/kyra/screen_hof.cpp |  12 +----
 engines/kyra/screen_hof.h   |   4 --
 engines/kyra/screen_lok.cpp |  12 +----
 engines/kyra/screen_lok.h   |   4 --
 engines/kyra/screen_lol.cpp |   3 +-
 engines/kyra/screen_lol.h   |   9 +---
 engines/kyra/screen_mr.cpp  |  13 +----
 engines/kyra/screen_mr.h    |   4 --
 engines/kyra/screen_rpg.cpp | 126 --------------------------------------------
 engines/kyra/screen_rpg.h   |  61 ---------------------
 engines/kyra/screen_v2.cpp  |   3 +-
 engines/kyra/screen_v2.h    |   4 +-
 engines/kyra/text_lol.cpp   |   4 +-
 engines/kyra/text_lol.h     |   4 +-
 engines/kyra/text_rpg.cpp   |   3 +-
 engines/kyra/text_rpg.h     |   8 +--
 26 files changed, 129 insertions(+), 276 deletions(-)
 delete mode 100644 engines/kyra/screen_rpg.cpp
 delete mode 100644 engines/kyra/screen_rpg.h

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index dfc99ea13a..fa65c93a4e 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -251,7 +251,6 @@ public:
 	virtual ~EoBCoreEngine();
 
 	Screen *screen() { return _screen; }
-	Screen_Rpg *screen_rpg() { return _screen; }
 	GUI *gui() const { return _gui; }
 
 protected:
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index 13a67c6d56..1a5acb8e63 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -87,7 +87,6 @@ public:
 	virtual ~KyraRpgEngine();
 
 	virtual Screen *screen() = 0;
-	virtual Screen_Rpg *screen_rpg() = 0;
 	virtual GUI *gui() const = 0;
 
 protected:
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index d90b5c9523..01b1bdf065 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -361,10 +361,6 @@ Screen *LoLEngine::screen() {
 	return _screen;
 }
 
-Screen_Rpg *LoLEngine::screen_rpg() {
-	return _screen;
-}
-
 GUI *LoLEngine::gui() const {
 	return _gui;
 }
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index 3a6486b30e..eeaa1b51ad 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -279,7 +279,6 @@ public:
 	virtual void initKeymap();
 
 	Screen *screen();
-	Screen_Rpg *screen_rpg();
 	GUI *gui() const;
 
 private:
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
index edadcdbcbb..21e3ba3dff 100644
--- a/engines/kyra/module.mk
+++ b/engines/kyra/module.mk
@@ -78,7 +78,6 @@ KYRARPG_COMMON_OBJ = \
 	kyra_rpg.o \
 	saveload_rpg.o \
 	scene_rpg.o \
-	screen_rpg.o \
 	sprites_rpg.o \
 	staticres_rpg.o \
 	text_rpg.o \
diff --git a/engines/kyra/scene_rpg.cpp b/engines/kyra/scene_rpg.cpp
index 88e992ff0c..07a7a879b1 100644
--- a/engines/kyra/scene_rpg.cpp
+++ b/engines/kyra/scene_rpg.cpp
@@ -23,7 +23,6 @@
 #if defined(ENABLE_EOB) || defined(ENABLE_LOL)
 
 #include "kyra/kyra_rpg.h"
-#include "kyra/screen_rpg.h"
 #include "kyra/resource.h"
 #include "kyra/timer.h"
 #include "kyra/sound.h"
@@ -118,11 +117,11 @@ void KyraRpgEngine::scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim
 
 	const ScreenDim *cDim = screen()->getScreenDim(dim);
 
-	screen_rpg()->modifyScreenDim(dim, cDim->sx, y1, cDim->w, y2 - y1);
+	screen()->modifyScreenDim(dim, cDim->sx, y1, cDim->w, y2 - y1);
 }
 
 void KyraRpgEngine::drawLevelModifyScreenDim(int dim, int16 x1, int16 y1, int16 x2, int16 y2) {
-	screen_rpg()->modifyScreenDim(dim, x1, y1 << 3, x2 - x1, (y2 - y1) << 3);
+	screen()->modifyScreenDim(dim, x1, y1 << 3, x2 - x1, (y2 - y1) << 3);
 }
 
 void KyraRpgEngine::generateBlockDrawingBuffer() {
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 3d94189fc9..fa1daa2b1a 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -36,8 +36,8 @@
 
 namespace Kyra {
 
-Screen::Screen(KyraEngine_v1 *vm, OSystem *system)
-	: _system(system), _vm(vm), _sjisInvisibleColor(0),
+Screen::Screen(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, const int dimTableSize)
+	: _system(system), _vm(vm), _sjisInvisibleColor(0), _dimTable(dimTable), _dimTableCount(dimTableSize),
 	_cursorColorKey((vm->game() == GI_KYRA1) ? 0xFF : 0x00) {
 	_debugEnabled = false;
 	_maskMinY = _maskMaxY = -1;
@@ -70,6 +70,10 @@ Screen::~Screen() {
 
 	for (uint i = 0; i < _palettes.size(); ++i)
 		delete _palettes[i];
+
+	for (int i = 0; i < _dimTableCount; ++i)
+		delete _customDimTable[i];
+	delete[] _customDimTable;
 }
 
 bool Screen::init() {
@@ -146,6 +150,10 @@ bool Screen::init() {
 		_system->getPaletteManager()->setPalette(palette, 16, 8);
 	}
 
+	_customDimTable = new ScreenDim *[_dimTableCount];
+	memset(_customDimTable, 0, sizeof(ScreenDim *) * _dimTableCount);
+
+	_curDimIndex = -1;
 	_curDim = 0;
 	_charWidth = 0;
 	_charOffset = 0;
@@ -375,6 +383,29 @@ void Screen::mergeOverlay(int x, int y, int w, int h) {
 	}
 }
 
+const ScreenDim *Screen::getScreenDim(int dim) const {
+	assert(dim < _dimTableCount);
+	return _customDimTable[dim] ? _customDimTable[dim] : &_dimTable[dim];
+}
+
+void Screen::modifyScreenDim(int dim, int x, int y, int w, int h) {
+	if (!_customDimTable[dim])
+		_customDimTable[dim] = new ScreenDim;
+
+	memcpy(_customDimTable[dim], &_dimTable[dim], sizeof(ScreenDim));
+	_customDimTable[dim]->sx = x;
+	_customDimTable[dim]->sy = y;
+	_customDimTable[dim]->w = w;
+	_customDimTable[dim]->h = h;
+	if (dim == _curDimIndex || _vm->game() == GI_LOL)
+		setScreenDim(dim);
+}
+
+void Screen::setScreenDim(int dim) {
+	_curDim = getScreenDim(dim);
+	_curDimIndex = dim;
+}
+
 uint8 *Screen::getPagePtr(int pageNum) {
 	assert(pageNum < SCREEN_PAGE_NUM);
 	return _pagePtrs[pageNum];
@@ -3170,6 +3201,61 @@ void Screen::copyOverlayRegion(int x, int y, int x2, int y2, int w, int h, int s
 	}
 }
 
+void Screen::crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage) {
+	if (srcPage > 13 || dstPage > 13)
+		error("Screen::crossFadeRegion(): attempting to use temp page as source or dest page.");
+
+	hideMouse();
+
+	uint16 *wB = (uint16*)_pagePtrs[14];
+	uint8 *hB = _pagePtrs[14] + 640;
+
+	for (int i = 0; i < w; i++)
+		wB[i] = i;
+
+	for (int i = 0; i < h; i++)
+		hB[i] = i;
+
+	for (int i = 0; i < w; i++)
+		SWAP(wB[_vm->_rnd.getRandomNumberRng(0, w - 1)], wB[i]);
+
+	for (int i = 0; i < h; i++)
+		SWAP(hB[_vm->_rnd.getRandomNumberRng(0, h - 1)], hB[i]);
+
+	uint8 *s = _pagePtrs[srcPage];
+	uint8 *d = _pagePtrs[dstPage];
+
+	for (int i = 0; i < h; i++) {
+		int iH = i;
+		uint32 end = _system->getMillis() + 3;
+		for (int ii = 0; ii < w; ii++) {
+			int sX = x1 + wB[ii];
+			int sY = y1 + hB[iH];
+			int dX = x2 + wB[ii];
+			int dY = y2 + hB[iH];
+
+			if (++iH >= h)
+				iH = 0;
+
+			d[dY * 320 + dX] = s[sY * 320 + sX];
+			addDirtyRect(dX, dY, 1, 1);
+		}
+
+		// This tries to speed things up, to get similiar speeds as in DOSBox etc.
+		// We can't write single pixels directly into the video memory like the original did.
+		// We also (unlike the original) want to aim at similiar speeds for all platforms.
+		if (!(i % 10))
+			updateScreen();
+
+		uint32 cur = _system->getMillis();
+		if (end > cur)
+			_system->delayMillis(end - cur);
+	}
+
+	updateScreen();
+	showMouse();
+}
+
 #pragma mark -
 
 DOSFont::DOSFont() {
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index 1118c97d93..dd74692a5d 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -366,7 +366,7 @@ public:
 		FID_NUM
 	};
 
-	Screen(KyraEngine_v1 *vm, OSystem *system);
+	Screen(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, const int dimTableSize);
 	virtual ~Screen();
 
 	// init
@@ -449,9 +449,12 @@ public:
 	virtual void setTextColorMap(const uint8 *cmap) = 0;
 	void setTextColor(const uint8 *cmap, int a, int b);
 
-	virtual void setScreenDim(int dim) = 0;
-	virtual const ScreenDim *getScreenDim(int dim) = 0;
-	virtual int screenDimTableCount() const = 0;
+	const ScreenDim *getScreenDim(int dim) const;
+	void modifyScreenDim(int dim, int x, int y, int w, int h);
+	int screenDimTableCount() const { return _dimTableCount; }
+
+	void setScreenDim(int dim);
+	int curDimIndex() const { return _curDimIndex; }
 
 	const ScreenDim *_curDim;
 
@@ -513,6 +516,9 @@ public:
 	static void convertAmigaGfx(uint8 *data, int w, int h, int depth = 5, bool wsa = false, int bytesPerPlane = -1);
 	static void convertAmigaMsc(uint8 *data);
 
+	// RPG specific, this does not belong here
+	void crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage);
+
 protected:
 	uint8 *getPagePtr(int pageNum);
 	void updateDirtyRects();
@@ -560,6 +566,12 @@ protected:
 	uint8 *_animBlockPtr;
 	int _animBlockSize;
 
+	// dimension handling
+	const ScreenDim * const _dimTable;
+	ScreenDim **_customDimTable;
+	const int _dimTableCount;
+	int _curDimIndex;
+
 	// mouse handling
 	int _mouseLockCount;
 	const uint8 _cursorColorKey;
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 62d8bca201..7061ada4ac 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -36,7 +36,7 @@
 
 namespace Kyra {
 
-Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system), Screen_Rpg(vm, system, _screenDimTable, _screenDimTableCount) {
+Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system, _screenDimTable, _screenDimTableCount) {
 	_shapeFadeMode[0] = _shapeFadeMode[1] = 0;
 	_shapeFadeInternal = 0;
 	_fadeData = 0;
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index 2efed83c0c..7040177266 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -25,20 +25,18 @@
 
 #ifdef ENABLE_EOB
 
-#include "kyra/screen_rpg.h"
+#include "kyra/screen.h"
 
 namespace Kyra {
 
 class EoBCoreEngine;
-class Screen_EoB : public Screen_Rpg{
+class Screen_EoB : public Screen {
 public:
 	Screen_EoB(EoBCoreEngine *vm, OSystem *system);
 	virtual ~Screen_EoB();
 
 	bool init();
 
-	int screenDimTableCount() const { return _screenDimTableCount; }
-
 	void setClearScreenDim(int dim);
 	void clearCurDim();
 
diff --git a/engines/kyra/screen_hof.cpp b/engines/kyra/screen_hof.cpp
index 7d4d0744a8..ac6ee5eb77 100644
--- a/engines/kyra/screen_hof.cpp
+++ b/engines/kyra/screen_hof.cpp
@@ -26,17 +26,7 @@
 namespace Kyra {
 
 Screen_HoF::Screen_HoF(KyraEngine_HoF *vm, OSystem *system)
-	: Screen(vm, system), Screen_v2(vm, system), _vm(vm) {
-}
-
-void Screen_HoF::setScreenDim(int dim) {
-	assert(dim < _screenDimTableCount);
-	_curDim = &_screenDimTable[dim];
-}
-
-const ScreenDim *Screen_HoF::getScreenDim(int dim) {
-	assert(dim < _screenDimTableCount);
-	return &_screenDimTable[dim];
+	: Screen_v2(vm, system, _screenDimTable, _screenDimTableCount), _vm(vm) {
 }
 
 void Screen_HoF::generateGrayOverlay(const Palette &srcPal, uint8 *grayOverlay, int factor, int addR, int addG, int addB, int lastColor, bool flag) {
diff --git a/engines/kyra/screen_hof.h b/engines/kyra/screen_hof.h
index edcb339da9..51c6a001fa 100644
--- a/engines/kyra/screen_hof.h
+++ b/engines/kyra/screen_hof.h
@@ -34,10 +34,6 @@ friend class Debugger_v2;
 public:
 	Screen_HoF(KyraEngine_HoF *vm, OSystem *system);
 
-	void setScreenDim(int dim);
-	const ScreenDim *getScreenDim(int dim);
-	int screenDimTableCount() const { return _screenDimTableCount; }
-
 	// sequence player
 	void generateGrayOverlay(const Palette &pal, uint8 *grayOverlay, int factor, int addR, int addG, int addB, int lastColor, bool flag);
 	void cmpFadeFrameStep(int srcPage, int srcW, int srcH, int srcX, int srcY, int dstPage,	int dstW, int dstH, int dstX, int dstY, int cmpW, int cmpH, int cmpPage);
diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp
index 106ef5df29..447e1428be 100644
--- a/engines/kyra/screen_lok.cpp
+++ b/engines/kyra/screen_lok.cpp
@@ -30,7 +30,7 @@
 namespace Kyra {
 
 Screen_LoK::Screen_LoK(KyraEngine_LoK *vm, OSystem *system)
-	: Screen(vm, system) {
+	: Screen(vm, system, _screenDimTable, _screenDimTableCount) {
 	_vm = vm;
 	_unkPtr1 = _unkPtr2 = 0;
 	_bitBlitNum = 0;
@@ -70,16 +70,6 @@ bool Screen_LoK::init() {
 	return true;
 }
 
-void Screen_LoK::setScreenDim(int dim) {
-	assert(dim < _screenDimTableCount);
-	_curDim = &_screenDimTable[dim];
-}
-
-const ScreenDim *Screen_LoK::getScreenDim(int dim) {
-	assert(dim < _screenDimTableCount);
-	return &_screenDimTable[dim];
-}
-
 void Screen_LoK::fadeSpecialPalette(int palIndex, int startIndex, int size, int fadeTime) {
 	if (_vm->gameFlags().platform == Common::kPlatformAmiga)
 		return;
diff --git a/engines/kyra/screen_lok.h b/engines/kyra/screen_lok.h
index 3b74912986..3cb92543e5 100644
--- a/engines/kyra/screen_lok.h
+++ b/engines/kyra/screen_lok.h
@@ -38,10 +38,6 @@ public:
 
 	int getRectSize(int w, int h);
 
-	void setScreenDim(int dim);
-	const ScreenDim *getScreenDim(int dim);
-	int screenDimTableCount() const { return _screenDimTableCount; }
-
 	void setTextColorMap(const uint8 *cmap);
 
 	void fadeSpecialPalette(int palIndex, int startIndex, int size, int fadeTime);
diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp
index bef83f419e..4b8b443bd9 100644
--- a/engines/kyra/screen_lol.cpp
+++ b/engines/kyra/screen_lol.cpp
@@ -31,7 +31,7 @@
 
 namespace Kyra {
 
-Screen_LoL::Screen_LoL(LoLEngine *vm, OSystem *system) : Screen(vm, system), Screen_v2(vm, system), Screen_Rpg(vm, system, _screenDimTable = vm->gameFlags().use16ColorMode ? _screenDimTable16C : _screenDimTable256C, _screenDimTableCount), _vm(vm) {
+Screen_LoL::Screen_LoL(LoLEngine *vm, OSystem *system) : Screen_v2(vm, system,  vm->gameFlags().use16ColorMode ? _screenDimTable16C : _screenDimTable256C, _screenDimTableCount), _vm(vm) {
 	_paletteOverlay1 = new uint8[0x100];
 	_paletteOverlay2 = new uint8[0x100];
 	_grayOverlay = new uint8[0x100];
@@ -42,7 +42,6 @@ Screen_LoL::Screen_LoL(LoLEngine *vm, OSystem *system) : Screen(vm, system), Scr
 	for (int i = 0; i < 8; i++)
 		_levelOverlays[i] = new uint8[256];
 
-	_screenDimTable = 0;
 	_fadeFlag = 2;
 }
 
diff --git a/engines/kyra/screen_lol.h b/engines/kyra/screen_lol.h
index eb025fb1cf..3bba9f8b70 100644
--- a/engines/kyra/screen_lol.h
+++ b/engines/kyra/screen_lol.h
@@ -26,19 +26,16 @@
 #define KYRA_SCREEN_LOL_H
 
 #include "kyra/screen_v2.h"
-#include "kyra/screen_rpg.h"
 
 namespace Kyra {
 
 class LoLEngine;
 
-class Screen_LoL : public Screen_v2, public Screen_Rpg {
+class Screen_LoL : public Screen_v2 {
 public:
 	Screen_LoL(LoLEngine *vm, OSystem *system);
 	~Screen_LoL();
 
-	int screenDimTableCount() const { return _screenDimTableCount; }
-
 	void fprintString(const char *format, int x, int y, uint8 col1, uint8 col2, uint16 flags, ...) GCC_PRINTF(2, 8);
 	void fprintStringIntro(const char *format, int x, int y, uint8 c1, uint8 c2, uint8 c3, uint16 flags, ...) GCC_PRINTF(2, 9);
 
@@ -94,11 +91,9 @@ public:
 private:
 	LoLEngine *_vm;
 
-	const ScreenDim *_screenDimTable;
-	static const int _screenDimTableCount;
-
 	static const ScreenDim _screenDimTable256C[];
 	static const ScreenDim _screenDimTable16C[];
+	static const int _screenDimTableCount;
 
 	uint8 *_levelOverlays[8];
 
diff --git a/engines/kyra/screen_mr.cpp b/engines/kyra/screen_mr.cpp
index d4446c6d91..337860db30 100644
--- a/engines/kyra/screen_mr.cpp
+++ b/engines/kyra/screen_mr.cpp
@@ -25,22 +25,13 @@
 
 namespace Kyra {
 
-Screen_MR::Screen_MR(KyraEngine_MR *vm, OSystem *system) : Screen(vm, system), Screen_v2(vm, system) {
+Screen_MR::Screen_MR(KyraEngine_MR *vm, OSystem *system)
+    : Screen_v2(vm, system, _screenDimTable, _screenDimTableCount) {
 }
 
 Screen_MR::~Screen_MR() {
 }
 
-void Screen_MR::setScreenDim(int dim) {
-	assert(dim < _screenDimTableCount);
-	_curDim = &_screenDimTable[dim];
-}
-
-const ScreenDim *Screen_MR::getScreenDim(int dim) {
-	assert(dim < _screenDimTableCount);
-	return &_screenDimTable[dim];
-}
-
 int Screen_MR::getLayer(int x, int y) {
 	if (x < 0)
 		x = 0;
diff --git a/engines/kyra/screen_mr.h b/engines/kyra/screen_mr.h
index 0cb3240954..e10afcc5d2 100644
--- a/engines/kyra/screen_mr.h
+++ b/engines/kyra/screen_mr.h
@@ -34,10 +34,6 @@ public:
 	Screen_MR(KyraEngine_MR *vm, OSystem *system);
 	~Screen_MR();
 
-	void setScreenDim(int dim);
-	const ScreenDim *getScreenDim(int dim);
-	int screenDimTableCount() const { return _screenDimTableCount; }
-
 	int getLayer(int x, int y);
 
 	byte getShapeFlag1(int x, int y);
diff --git a/engines/kyra/screen_rpg.cpp b/engines/kyra/screen_rpg.cpp
deleted file mode 100644
index 3b29f0adb5..0000000000
--- a/engines/kyra/screen_rpg.cpp
+++ /dev/null
@@ -1,126 +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.
- *
- */
-
-
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-
-#include "kyra/screen_rpg.h"
-#include "kyra/kyra_v1.h"
-
-#include "common/endian.h"
-
-namespace Kyra {
-
-Screen_Rpg::Screen_Rpg(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, int dimTableSize) : Screen(vm, system), _screenDimTable(dimTable), _screenDimTableCount(dimTableSize) {
-	_customDimTable = new ScreenDim*[_screenDimTableCount];
-	memset(_customDimTable, 0, sizeof(ScreenDim *)* _screenDimTableCount);
-	_curDimIndex = 0;
-}
-
-Screen_Rpg::~Screen_Rpg() {
-	for (int i = 0; i < _screenDimTableCount; i++)
-		delete _customDimTable[i];
-	delete[] _customDimTable;
-}
-
-void Screen_Rpg::setScreenDim(int dim) {
-	assert(dim < _screenDimTableCount);
-	_curDim = _customDimTable[dim] ? (const ScreenDim *)_customDimTable[dim] : &_screenDimTable[dim];
-	_curDimIndex = dim;
-}
-
-const ScreenDim *Screen_Rpg::getScreenDim(int dim) {
-	assert(dim < _screenDimTableCount);
-	return _customDimTable[dim] ? (const ScreenDim *)_customDimTable[dim] : &_screenDimTable[dim];
-}
-
-void Screen_Rpg::modifyScreenDim(int dim, int x, int y, int w, int h) {
-	if (!_customDimTable[dim])
-		_customDimTable[dim] = new ScreenDim;
-
-	memcpy(_customDimTable[dim], &_screenDimTable[dim], sizeof(ScreenDim));
-	_customDimTable[dim]->sx = x;
-	_customDimTable[dim]->sy = y;
-	_customDimTable[dim]->w = w;
-	_customDimTable[dim]->h = h;
-	if (dim == _curDimIndex || _vm->game() == GI_LOL)
-		setScreenDim(dim);
-}
-
-void Screen_Rpg::crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage) {
-	if (srcPage > 13 || dstPage > 13)
-		error("Screen_Rpg::crossFadeRegion(): attempting to use temp page as source or dest page.");
-
-	hideMouse();
-
-	uint16 *wB = (uint16*)_pagePtrs[14];
-	uint8 *hB = _pagePtrs[14] + 640;
-
-	for (int i = 0; i < w; i++)
-		wB[i] = i;
-
-	for (int i = 0; i < h; i++)
-		hB[i] = i;
-
-	for (int i = 0; i < w; i++)
-		SWAP(wB[_vm->_rnd.getRandomNumberRng(0, w - 1)], wB[i]);
-
-	for (int i = 0; i < h; i++)
-		SWAP(hB[_vm->_rnd.getRandomNumberRng(0, h - 1)], hB[i]);
-
-	uint8 *s = _pagePtrs[srcPage];
-	uint8 *d = _pagePtrs[dstPage];
-
-	for (int i = 0; i < h; i++) {
-		int iH = i;
-		uint32 end = _system->getMillis() + 3;
-		for (int ii = 0; ii < w; ii++) {
-			int sX = x1 + wB[ii];
-			int sY = y1 + hB[iH];
-			int dX = x2 + wB[ii];
-			int dY = y2 + hB[iH];
-
-			if (++iH >= h)
-				iH = 0;
-
-			d[dY * 320 + dX] = s[sY * 320 + sX];
-			addDirtyRect(dX, dY, 1, 1);
-		}
-
-		// This tries to speed things up, to get similiar speeds as in DOSBox etc.
-		// We can't write single pixels directly into the video memory like the original did.
-		// We also (unlike the original) want to aim at similiar speeds for all platforms.
-		if (!(i % 10))
-			updateScreen();
-
-		uint32 cur = _system->getMillis();
-		if (end > cur)
-			_system->delayMillis(end - cur);
-	}
-
-	updateScreen();
-	showMouse();
-}
-
-}	// End of namespace Kyra
-
-#endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/screen_rpg.h b/engines/kyra/screen_rpg.h
deleted file mode 100644
index e9b15c25ef..0000000000
--- a/engines/kyra/screen_rpg.h
+++ /dev/null
@@ -1,61 +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 KYRA_SCREEN_RPG_H
-#define KYRA_SCREEN_RPG_H
-
-#if defined(ENABLE_EOB) || defined(ENABLE_LOL)
-
-#include "kyra/screen.h"
-#include "common/system.h"
-
-namespace Kyra {
-
-class Screen;
-class KyraEngine_v1;
-
-class Screen_Rpg : virtual public Screen {
-public:
-	Screen_Rpg(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, int dimTableSize);
-	virtual ~Screen_Rpg();
-
-	virtual void setScreenDim(int dim);
-	virtual const ScreenDim *getScreenDim(int dim);
-	virtual int screenDimTableCount() const = 0;
-
-	void modifyScreenDim(int dim, int x, int y, int w, int h);
-	int curDimIndex() const { return _curDimIndex; }
-
-	void crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage);
-
-private:
-	int _curDimIndex;
-	int _screenDimTableCount;
-	ScreenDim **_customDimTable;
-	const ScreenDim *_screenDimTable;
-};
-
-}	// End of namespace Kyra
-
-#endif // ENABLE_EOB || ENABLE_LOL
-
-#endif
diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp
index 57581fa750..c608c6e683 100644
--- a/engines/kyra/screen_v2.cpp
+++ b/engines/kyra/screen_v2.cpp
@@ -26,7 +26,8 @@
 
 namespace Kyra {
 
-Screen_v2::Screen_v2(KyraEngine_v1 *vm, OSystem *system) : Screen(vm, system), _wsaFrameAnimBuffer(0) {
+Screen_v2::Screen_v2(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, const int dimTableSize)
+    : Screen(vm, system, dimTable, dimTableSize), _wsaFrameAnimBuffer(0) {
 	_wsaFrameAnimBuffer = new uint8[1024];
 	assert(_wsaFrameAnimBuffer);
 }
diff --git a/engines/kyra/screen_v2.h b/engines/kyra/screen_v2.h
index f50c81e912..f84c923128 100644
--- a/engines/kyra/screen_v2.h
+++ b/engines/kyra/screen_v2.h
@@ -28,9 +28,9 @@
 
 namespace Kyra {
 
-class Screen_v2 : virtual public Screen {
+class Screen_v2 : public Screen {
 public:
-	Screen_v2(KyraEngine_v1 *vm, OSystem *system);
+	Screen_v2(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, const int dimTableSize);
 	~Screen_v2();
 
 	// screen page handling
diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp
index 8535516bf9..ee42d6db92 100644
--- a/engines/kyra/text_lol.cpp
+++ b/engines/kyra/text_lol.cpp
@@ -32,7 +32,7 @@
 
 namespace Kyra {
 
-TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *engine, Screen_LoL *screenLoL) : TextDisplayer_rpg(engine, engine->screen_rpg()),
+TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *engine, Screen_LoL *screenLoL) : TextDisplayer_rpg(engine, screenLoL),
 	_vm(engine), _screen(screenLoL), _scriptTextParameter(0) {
 
 	memset(_stringParameters, 0, 15 * sizeof(char *));
@@ -337,7 +337,7 @@ KyraRpgEngine *TextDisplayer_LoL::vm() {
 	return _vm;
 }
 
-Screen_Rpg *TextDisplayer_LoL::screen() {
+Screen *TextDisplayer_LoL::screen() {
 	return _screen;
 }
 
diff --git a/engines/kyra/text_lol.h b/engines/kyra/text_lol.h
index a5eebd67c4..e2b10e8d4d 100644
--- a/engines/kyra/text_lol.h
+++ b/engines/kyra/text_lol.h
@@ -50,8 +50,8 @@ public:
 	int16 _scriptTextParameter;
 
 private:
-	KyraRpgEngine *vm();
-	Screen_Rpg *screen();
+	virtual KyraRpgEngine *vm();
+	virtual Screen *screen();
 
 	void preprocessString(char *str, EMCState *script, const uint16 *paramList, int16 paramIndex);
 	void textPageBreak();
diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text_rpg.cpp
index ca1fd04269..78206d3a06 100644
--- a/engines/kyra/text_rpg.cpp
+++ b/engines/kyra/text_rpg.cpp
@@ -24,7 +24,6 @@
 #if defined(ENABLE_EOB) || defined(ENABLE_LOL)
 
 #include "kyra/kyra_rpg.h"
-#include "kyra/screen_rpg.h"
 #include "kyra/timer.h"
 
 #include "common/system.h"
@@ -35,7 +34,7 @@ enum {
 	kEoBTextBufferSize = 2048
 };
 
-TextDisplayer_rpg::TextDisplayer_rpg(KyraRpgEngine *engine, Screen_Rpg *scr) : _vm(engine), _screen(scr),
+TextDisplayer_rpg::TextDisplayer_rpg(KyraRpgEngine *engine, Screen *scr) : _vm(engine), _screen(scr),
 	_lineCount(0), _printFlag(false), _lineWidth(0), _numCharsTotal(0), _allowPageBreak(true),
 	_numCharsLeft(0), _numCharsPrinted(0), _sjisLineBreakFlag(false), _waitButtonMode(1) {
 
diff --git a/engines/kyra/text_rpg.h b/engines/kyra/text_rpg.h
index ff3473dc56..8ef8fdd0ca 100644
--- a/engines/kyra/text_rpg.h
+++ b/engines/kyra/text_rpg.h
@@ -29,12 +29,12 @@
 
 namespace Kyra {
 
-class Screen_Rpg;
+class Screen;
 class KyraRpgEngine;
 
 class TextDisplayer_rpg {
 public:
-	TextDisplayer_rpg(KyraRpgEngine *engine, Screen_Rpg *scr);
+	TextDisplayer_rpg(KyraRpgEngine *engine, Screen *scr);
 	virtual ~TextDisplayer_rpg();
 
 	virtual void setupField(int dim, bool mode);
@@ -57,7 +57,7 @@ public:
 
 protected:
 	virtual KyraRpgEngine *vm() { return _vm; }
-	virtual Screen_Rpg *screen() { return _screen; }
+	virtual Screen *screen() { return _screen; }
 
 	void displayText(char *str, ...);
 	char parseCommand();
@@ -102,7 +102,7 @@ protected:
 
 private:
 	KyraRpgEngine *_vm;
-	Screen_Rpg *_screen;
+	Screen *_screen;
 
 	char *_table1;
 	char *_table2;
-- 
cgit v1.2.3


From 463aa52ac6bad2f5d15c1daed613396e5c0e149b Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 26 Dec 2011 19:31:28 +0100
Subject: KYRA: Cleanup va_arg use in drawShape.

Thanks to wjp for noticing this.
---
 engines/kyra/screen.cpp | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index fa1daa2b1a..b6383c82cc 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -1335,6 +1335,8 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int
 	if ((flags & 0x2000) && _vm->game() != GI_KYRA1)
 		_dsTable5 = va_arg(args, uint8 *);
 
+	va_end(args);
+
 	static const DsMarginSkipFunc dsMarginFunc[] = {
 		&Screen::drawShapeMarginNoScaleUpwind,
 		&Screen::drawShapeMarginNoScaleDownwind,
@@ -1420,7 +1422,6 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int
 			warning("Missing drawShape plotting method type %d", ppc);
 		if (dsPlot3 != dsPlot2 && !dsPlot3)
 			warning("Missing drawShape plotting method type %d", (((flags >> 8) & 0xF7) & 0x3F));
-		va_end(args);
 		return;
 	}
 
@@ -1453,10 +1454,8 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int
 		shapeHeight = (shapeHeight * _dsScaleH) >> 8;
 		shpWidthScaled1 = shpWidthScaled2 = (shapeWidth * _dsScaleW) >> 8;
 
-		if (!shapeHeight || !shpWidthScaled1) {
-			va_end(args);
+		if (!shapeHeight || !shpWidthScaled1)
 			return;
-		}
 	}
 
 	if (flags & DSF_CENTER) {
@@ -1486,7 +1485,6 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int
 	if (t < 0) {
 		shapeHeight += t;
 		if (shapeHeight <= 0) {
-			va_end(args);
 			return;
 		}
 
@@ -1520,10 +1518,8 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int
 	}
 
 	t = (flags & 2) ? y + shapeHeight - y1 : y2 - y;
-	if (t <= 0) {
-		va_end(args);
+	if (t <= 0)
 		return;
-	}
 
 	if (t < shapeHeight) {
 		shapeHeight = t;
@@ -1535,20 +1531,16 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int
 	if (x < 0) {
 		shpWidthScaled1 += x;
 		_dsOffscreenLeft = -x;
-		if (_dsOffscreenLeft >= shpWidthScaled2) {
-			va_end(args);
+		if (_dsOffscreenLeft >= shpWidthScaled2)
 			return;
-		}
 		x = 0;
 	}
 
 	_dsOffscreenRight = 0;
 	t = x2 - x;
 
-	if (t <= 0) {
-		va_end(args);
+	if (t <= 0)
 		return;
-	}
 
 	if (t < shpWidthScaled1) {
 		shpWidthScaled1 = t;
@@ -1628,8 +1620,6 @@ void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int
 			scaleCounterV -= 0x100;
 		} while (scaleCounterV & 0xFF00);
 	}
-
-	va_end(args);
 }
 
 int Screen::drawShapeMarginNoScaleUpwind(uint8 *&dst, const uint8 *&src, int &cnt) {
-- 
cgit v1.2.3


From 6f85de6b6e9b2af820d0294db16881d41368d693 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 26 Dec 2011 19:35:47 +0100
Subject: DREAMWEB: Combine transferMap and transferInv

---
 engines/dreamweb/dreambase.h  |   3 +-
 engines/dreamweb/dreamgen.cpp |  95 +++------
 engines/dreamweb/dreamgen.h   | 440 +++++++++++++++++++++---------------------
 engines/dreamweb/object.cpp   |  32 +--
 engines/dreamweb/stubs.h      |   1 -
 engines/dreamweb/vgagrafx.cpp |  38 ++--
 6 files changed, 284 insertions(+), 325 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index b134159a2e..ef08738cf6 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -221,6 +221,7 @@ public:
 	ObjectRef findInvPos();
 	void reExFromInv();
 	void swapWithInv();
+	void transferText(uint8 from, uint8 to);
 
 	// from pathfind.cpp
 	void turnPathOn(uint8 param);
@@ -726,7 +727,7 @@ public:
 	void panelToMap();
 	void mapToPanel();
 	void dumpMap();
-	void transferInv();
+	void transferFrame(uint8 from, uint8 to, uint8 offset);
 	void zoom();
 	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height);
 	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 356ebc8d36..a0e255547b 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -26,53 +26,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::transferMap() {
-	STACK_CHECK;
-	di = data.word(kExframepos);
-	push(di);
-	al = data.byte(kExpos);
-	ah = 0;
-	bx = ax;
-	_add(ax, ax);
-	_add(ax, bx);
-	cx = 6;
-	_mul(cx);
-	es = data.word(kExtras);
-	bx = (0);
-	_add(bx, ax);
-	_add(di, (0+2080));
-	push(bx);
-	al = data.byte(kItemtotran);
-	ah = 0;
-	bx = ax;
-	_add(ax, ax);
-	_add(ax, bx);
-	cx = 6;
-	_mul(cx);
-	ds = data.word(kFreeframes);
-	bx = (0);
-	_add(bx, ax);
-	si = (0+2080);
-	al = ds.byte(bx);
-	ah = 0;
-	cl = ds.byte(bx+1);
-	ch = 0;
-	_add(si, ds.word(bx+2));
-	dx = ds.word(bx+4);
-	bx = pop();
-	es.byte(bx+0) = al;
-	es.byte(bx+1) = cl;
-	es.word(bx+4) = dx;
-	_mul(cx);
-	cx = ax;
-	push(cx);
-	_movsb(cx, true);
-	cx = pop();
-	ax = pop();
-	es.word(bx+2) = ax;
-	_add(data.word(kExframepos), cx);
-}
-
 void DreamGenContext::read() {
 	STACK_CHECK;
 	cx = 40;
@@ -85,7 +38,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 418;
+	di = 417;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -215,7 +168,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 418+1;
+	di = 417+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -297,7 +250,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 493;
+	si = 492;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -341,18 +294,18 @@ void DreamGenContext::__start() {
 		//0x0050: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0060: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0070: .... .h.& .... ....
+		0x00, 0x00, 0x00, 0x00, 0x68, 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x0070: .... h.&. .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0080: .... .... .... ....
-		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, 0xff, 
 		//0x0090: .... .... .... ....
-		0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00a0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00b0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x00c0: ....   .. .... ....
+		0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x00c0: ...   ... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x00d0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -365,26 +318,26 @@ void DreamGenContext::__start() {
 		//0x0110: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0120: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 
 		//0x0130: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0140: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0150: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		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, 0xff, 
 		//0x0170: .... .... .... ....
-		0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 
-		//0x0180: .... ...D REAM WEB.
-		0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0190: V99.               
-		0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
-		//0x01a0:  ."               .
-		0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 
-		//0x01b0: .... $... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 
-		//0x01c0: .... .... .... .D:.
+		0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 
+		//0x0180: .... ..DR EAMW EB.V
+		0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0190: 99.                
+		0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 
+		//0x01a0: ."               ..
+		0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 
+		//0x01b0: ...$ .... .... ....
+		0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 
+		//0x01c0: .... .... .... D:..
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x01d0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -403,9 +356,7 @@ void DreamGenContext::__start() {
 		//0x0240: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0250: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0260: .... .... .... ....
-		};
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 0c61a60a6e..492a8b3d02 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,7 +32,7 @@
 
 namespace DreamGen {
 
-static const uint16 offset_operand1 = 0x0194;
+static const uint16 offset_operand1 = 0x0193;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -104,225 +104,224 @@ static const uint16 kLastxpos = 82;
 static const uint16 kIcontop = 84;
 static const uint16 kIconleft = 86;
 static const uint16 kItemframe = 88;
-static const uint16 kItemtotran = 89;
-static const uint16 kRoomad = 90;
-static const uint16 kWithobject = 92;
-static const uint16 kWithtype = 93;
-static const uint16 kLookcounter = 94;
-static const uint16 kCommand = 96;
-static const uint16 kCommandtype = 97;
-static const uint16 kOldcommandtype = 98;
-static const uint16 kObjecttype = 99;
-static const uint16 kGetback = 100;
-static const uint16 kInvopen = 101;
-static const uint16 kMainmode = 102;
-static const uint16 kPickup = 103;
-static const uint16 kLastinvpos = 104;
-static const uint16 kExamagain = 105;
-static const uint16 kNewtextline = 106;
-static const uint16 kOpenedob = 107;
-static const uint16 kOpenedtype = 108;
-static const uint16 kOldmapadx = 109;
-static const uint16 kOldmapady = 111;
-static const uint16 kMapadx = 113;
-static const uint16 kMapady = 115;
-static const uint16 kMapoffsetx = 117;
-static const uint16 kMapoffsety = 119;
-static const uint16 kMapxstart = 121;
-static const uint16 kMapystart = 123;
-static const uint16 kMapxsize = 125;
-static const uint16 kMapysize = 126;
-static const uint16 kHavedoneobs = 127;
-static const uint16 kManisoffscreen = 128;
-static const uint16 kRainspace = 129;
-static const uint16 kFacing = 130;
-static const uint16 kLeavedirection = 131;
-static const uint16 kTurntoface = 132;
-static const uint16 kTurndirection = 133;
-static const uint16 kMaintimer = 134;
-static const uint16 kIntrocount = 136;
-static const uint16 kArrowad = 137;
-static const uint16 kCurrentkey = 139;
-static const uint16 kOldkey = 140;
-static const uint16 kUseddirection = 141;
-static const uint16 kTimercount = 142;
-static const uint16 kOldtimercount = 143;
-static const uint16 kMapx = 144;
-static const uint16 kMapy = 145;
-static const uint16 kNewscreen = 146;
-static const uint16 kRyanx = 147;
-static const uint16 kRyany = 148;
-static const uint16 kLastflag = 149;
-static const uint16 kOffsetx = 150;
-static const uint16 kOffsety = 152;
-static const uint16 kCurrentob = 154;
-static const uint16 kDestpos = 155;
-static const uint16 kReallocation = 156;
-static const uint16 kRoomnum = 157;
-static const uint16 kNowinnewroom = 158;
-static const uint16 kResetmanxy = 159;
-static const uint16 kNewlocation = 160;
-static const uint16 kAutolocation = 161;
-static const uint16 kDoorcheck1 = 162;
-static const uint16 kDoorcheck2 = 163;
-static const uint16 kDoorcheck3 = 164;
-static const uint16 kDoorcheck4 = 165;
-static const uint16 kMousex = 166;
-static const uint16 kMousey = 168;
-static const uint16 kMousebutton = 170;
-static const uint16 kMousebutton1 = 172;
-static const uint16 kMousebutton2 = 174;
-static const uint16 kMousebutton3 = 176;
-static const uint16 kMousebutton4 = 178;
-static const uint16 kOldbutton = 180;
-static const uint16 kOldx = 182;
-static const uint16 kOldy = 184;
-static const uint16 kLastbutton = 186;
-static const uint16 kOldpointerx = 188;
-static const uint16 kOldpointery = 190;
-static const uint16 kDelherex = 192;
-static const uint16 kDelherey = 194;
-static const uint16 kPointerxs = 196;
-static const uint16 kPointerys = 197;
-static const uint16 kDelxs = 198;
-static const uint16 kDelys = 199;
-static const uint16 kPointerframe = 200;
-static const uint16 kPointerpower = 201;
-static const uint16 kAuxpointerframe = 202;
-static const uint16 kPointermode = 203;
-static const uint16 kPointerspeed = 204;
-static const uint16 kPointercount = 205;
-static const uint16 kInmaparea = 206;
-static const uint16 kTalkmode = 207;
-static const uint16 kTalkpos = 208;
-static const uint16 kCharacter = 209;
-static const uint16 kWatchdump = 210;
-static const uint16 kLogonum = 211;
-static const uint16 kOldlogonum = 212;
-static const uint16 kNetseg = 213;
-static const uint16 kNetpoint = 215;
-static const uint16 kCursorstate = 217;
-static const uint16 kPressed = 218;
-static const uint16 kPresspointer = 219;
-static const uint16 kGraphicpress = 221;
-static const uint16 kPresscount = 222;
-static const uint16 kLightcount = 223;
-static const uint16 kFolderpage = 224;
-static const uint16 kDiarypage = 225;
-static const uint16 kMenucount = 226;
-static const uint16 kSymboltopx = 227;
-static const uint16 kSymboltopnum = 228;
-static const uint16 kSymboltopdir = 229;
-static const uint16 kSymbolbotx = 230;
-static const uint16 kSymbolbotnum = 231;
-static const uint16 kSymbolbotdir = 232;
-static const uint16 kSymboltolight = 233;
-static const uint16 kSymbol1 = 234;
-static const uint16 kSymbol2 = 235;
-static const uint16 kSymbol3 = 236;
-static const uint16 kSymbolnum = 237;
-static const uint16 kDumpx = 238;
-static const uint16 kDumpy = 240;
-static const uint16 kWalkandexam = 242;
-static const uint16 kWalkexamtype = 243;
-static const uint16 kWalkexamnum = 244;
-static const uint16 kCurslocx = 245;
-static const uint16 kCurslocy = 247;
-static const uint16 kCurpos = 249;
-static const uint16 kMonadx = 251;
-static const uint16 kMonady = 253;
-static const uint16 kMonsource = 255;
-static const uint16 kNumtodo = 257;
-static const uint16 kTimecount = 259;
-static const uint16 kCounttotimed = 261;
-static const uint16 kTimedseg = 263;
-static const uint16 kTimedoffset = 265;
-static const uint16 kTimedy = 267;
-static const uint16 kTimedx = 268;
-static const uint16 kNeedtodumptimed = 269;
-static const uint16 kLoadingorsave = 270;
-static const uint16 kCurrentslot = 271;
-static const uint16 kCursorpos = 272;
-static const uint16 kColourpos = 273;
-static const uint16 kFadedirection = 274;
-static const uint16 kNumtofade = 275;
-static const uint16 kFadecount = 276;
-static const uint16 kAddtogreen = 277;
-static const uint16 kAddtored = 278;
-static const uint16 kAddtoblue = 279;
-static const uint16 kLastsoundreel = 280;
-static const uint16 kSpeechloaded = 282;
-static const uint16 kSpeechlength = 283;
-static const uint16 kVolume = 285;
-static const uint16 kVolumeto = 286;
-static const uint16 kVolumedirection = 287;
-static const uint16 kVolumecount = 288;
-static const uint16 kWongame = 289;
-static const uint16 kLasthardkey = 290;
-static const uint16 kBufferin = 291;
-static const uint16 kBufferout = 293;
-static const uint16 kExtras = 295;
-static const uint16 kWorkspace = 297;
-static const uint16 kMapstore = 299;
-static const uint16 kCharset1 = 301;
-static const uint16 kMainsprites = 303;
-static const uint16 kBackdrop = 305;
-static const uint16 kMapdata = 307;
-static const uint16 kSounddata = 309;
-static const uint16 kSounddata2 = 311;
-static const uint16 kRecordspace = 313;
-static const uint16 kFreedat = 315;
-static const uint16 kSetdat = 317;
-static const uint16 kReel1 = 319;
-static const uint16 kReel2 = 321;
-static const uint16 kReel3 = 323;
-static const uint16 kRoomdesc = 325;
-static const uint16 kFreedesc = 327;
-static const uint16 kSetdesc = 329;
-static const uint16 kBlockdesc = 331;
-static const uint16 kSetframes = 333;
-static const uint16 kFreeframes = 335;
-static const uint16 kPeople = 337;
-static const uint16 kReels = 339;
-static const uint16 kCommandtext = 341;
-static const uint16 kPuzzletext = 343;
-static const uint16 kTraveltext = 345;
-static const uint16 kTempgraphics = 347;
-static const uint16 kTempgraphics2 = 349;
-static const uint16 kTempgraphics3 = 351;
-static const uint16 kTempsprites = 353;
-static const uint16 kTextfile1 = 355;
-static const uint16 kTextfile2 = 357;
-static const uint16 kTextfile3 = 359;
-static const uint16 kBlinkframe = 361;
-static const uint16 kBlinkcount = 362;
-static const uint16 kReasseschanges = 363;
-static const uint16 kPointerspath = 364;
-static const uint16 kManspath = 365;
-static const uint16 kPointerfirstpath = 366;
-static const uint16 kFinaldest = 367;
-static const uint16 kDestination = 368;
-static const uint16 kLinestartx = 369;
-static const uint16 kLinestarty = 371;
-static const uint16 kLineendx = 373;
-static const uint16 kLineendy = 375;
-static const uint16 kLinepointer = 377;
-static const uint16 kLinedirection = 378;
-static const uint16 kLinelength = 379;
-static const uint16 kCh0blockstocopy = 380;
-static const uint16 kCh0playing = 382;
-static const uint16 kCh0repeat = 383;
-static const uint16 kCh1playing = 384;
-static const uint16 kCh1blockstocopy = 385;
-static const uint16 kSoundbufferwrite = 387;
-static const uint16 kCurrentsample = 389;
-static const uint16 kRoomssample = 390;
-static const uint16 kBasicsample = 391;
-static const uint16 kCurrentfile = 418;
-static const uint16 kInputline = 493;
-static const uint16 kQuitrequested = 621;
-static const uint16 kSubtitles = 622;
-static const uint16 kForeignrelease = 623;
+static const uint16 kRoomad = 89;
+static const uint16 kWithobject = 91;
+static const uint16 kWithtype = 92;
+static const uint16 kLookcounter = 93;
+static const uint16 kCommand = 95;
+static const uint16 kCommandtype = 96;
+static const uint16 kOldcommandtype = 97;
+static const uint16 kObjecttype = 98;
+static const uint16 kGetback = 99;
+static const uint16 kInvopen = 100;
+static const uint16 kMainmode = 101;
+static const uint16 kPickup = 102;
+static const uint16 kLastinvpos = 103;
+static const uint16 kExamagain = 104;
+static const uint16 kNewtextline = 105;
+static const uint16 kOpenedob = 106;
+static const uint16 kOpenedtype = 107;
+static const uint16 kOldmapadx = 108;
+static const uint16 kOldmapady = 110;
+static const uint16 kMapadx = 112;
+static const uint16 kMapady = 114;
+static const uint16 kMapoffsetx = 116;
+static const uint16 kMapoffsety = 118;
+static const uint16 kMapxstart = 120;
+static const uint16 kMapystart = 122;
+static const uint16 kMapxsize = 124;
+static const uint16 kMapysize = 125;
+static const uint16 kHavedoneobs = 126;
+static const uint16 kManisoffscreen = 127;
+static const uint16 kRainspace = 128;
+static const uint16 kFacing = 129;
+static const uint16 kLeavedirection = 130;
+static const uint16 kTurntoface = 131;
+static const uint16 kTurndirection = 132;
+static const uint16 kMaintimer = 133;
+static const uint16 kIntrocount = 135;
+static const uint16 kArrowad = 136;
+static const uint16 kCurrentkey = 138;
+static const uint16 kOldkey = 139;
+static const uint16 kUseddirection = 140;
+static const uint16 kTimercount = 141;
+static const uint16 kOldtimercount = 142;
+static const uint16 kMapx = 143;
+static const uint16 kMapy = 144;
+static const uint16 kNewscreen = 145;
+static const uint16 kRyanx = 146;
+static const uint16 kRyany = 147;
+static const uint16 kLastflag = 148;
+static const uint16 kOffsetx = 149;
+static const uint16 kOffsety = 151;
+static const uint16 kCurrentob = 153;
+static const uint16 kDestpos = 154;
+static const uint16 kReallocation = 155;
+static const uint16 kRoomnum = 156;
+static const uint16 kNowinnewroom = 157;
+static const uint16 kResetmanxy = 158;
+static const uint16 kNewlocation = 159;
+static const uint16 kAutolocation = 160;
+static const uint16 kDoorcheck1 = 161;
+static const uint16 kDoorcheck2 = 162;
+static const uint16 kDoorcheck3 = 163;
+static const uint16 kDoorcheck4 = 164;
+static const uint16 kMousex = 165;
+static const uint16 kMousey = 167;
+static const uint16 kMousebutton = 169;
+static const uint16 kMousebutton1 = 171;
+static const uint16 kMousebutton2 = 173;
+static const uint16 kMousebutton3 = 175;
+static const uint16 kMousebutton4 = 177;
+static const uint16 kOldbutton = 179;
+static const uint16 kOldx = 181;
+static const uint16 kOldy = 183;
+static const uint16 kLastbutton = 185;
+static const uint16 kOldpointerx = 187;
+static const uint16 kOldpointery = 189;
+static const uint16 kDelherex = 191;
+static const uint16 kDelherey = 193;
+static const uint16 kPointerxs = 195;
+static const uint16 kPointerys = 196;
+static const uint16 kDelxs = 197;
+static const uint16 kDelys = 198;
+static const uint16 kPointerframe = 199;
+static const uint16 kPointerpower = 200;
+static const uint16 kAuxpointerframe = 201;
+static const uint16 kPointermode = 202;
+static const uint16 kPointerspeed = 203;
+static const uint16 kPointercount = 204;
+static const uint16 kInmaparea = 205;
+static const uint16 kTalkmode = 206;
+static const uint16 kTalkpos = 207;
+static const uint16 kCharacter = 208;
+static const uint16 kWatchdump = 209;
+static const uint16 kLogonum = 210;
+static const uint16 kOldlogonum = 211;
+static const uint16 kNetseg = 212;
+static const uint16 kNetpoint = 214;
+static const uint16 kCursorstate = 216;
+static const uint16 kPressed = 217;
+static const uint16 kPresspointer = 218;
+static const uint16 kGraphicpress = 220;
+static const uint16 kPresscount = 221;
+static const uint16 kLightcount = 222;
+static const uint16 kFolderpage = 223;
+static const uint16 kDiarypage = 224;
+static const uint16 kMenucount = 225;
+static const uint16 kSymboltopx = 226;
+static const uint16 kSymboltopnum = 227;
+static const uint16 kSymboltopdir = 228;
+static const uint16 kSymbolbotx = 229;
+static const uint16 kSymbolbotnum = 230;
+static const uint16 kSymbolbotdir = 231;
+static const uint16 kSymboltolight = 232;
+static const uint16 kSymbol1 = 233;
+static const uint16 kSymbol2 = 234;
+static const uint16 kSymbol3 = 235;
+static const uint16 kSymbolnum = 236;
+static const uint16 kDumpx = 237;
+static const uint16 kDumpy = 239;
+static const uint16 kWalkandexam = 241;
+static const uint16 kWalkexamtype = 242;
+static const uint16 kWalkexamnum = 243;
+static const uint16 kCurslocx = 244;
+static const uint16 kCurslocy = 246;
+static const uint16 kCurpos = 248;
+static const uint16 kMonadx = 250;
+static const uint16 kMonady = 252;
+static const uint16 kMonsource = 254;
+static const uint16 kNumtodo = 256;
+static const uint16 kTimecount = 258;
+static const uint16 kCounttotimed = 260;
+static const uint16 kTimedseg = 262;
+static const uint16 kTimedoffset = 264;
+static const uint16 kTimedy = 266;
+static const uint16 kTimedx = 267;
+static const uint16 kNeedtodumptimed = 268;
+static const uint16 kLoadingorsave = 269;
+static const uint16 kCurrentslot = 270;
+static const uint16 kCursorpos = 271;
+static const uint16 kColourpos = 272;
+static const uint16 kFadedirection = 273;
+static const uint16 kNumtofade = 274;
+static const uint16 kFadecount = 275;
+static const uint16 kAddtogreen = 276;
+static const uint16 kAddtored = 277;
+static const uint16 kAddtoblue = 278;
+static const uint16 kLastsoundreel = 279;
+static const uint16 kSpeechloaded = 281;
+static const uint16 kSpeechlength = 282;
+static const uint16 kVolume = 284;
+static const uint16 kVolumeto = 285;
+static const uint16 kVolumedirection = 286;
+static const uint16 kVolumecount = 287;
+static const uint16 kWongame = 288;
+static const uint16 kLasthardkey = 289;
+static const uint16 kBufferin = 290;
+static const uint16 kBufferout = 292;
+static const uint16 kExtras = 294;
+static const uint16 kWorkspace = 296;
+static const uint16 kMapstore = 298;
+static const uint16 kCharset1 = 300;
+static const uint16 kMainsprites = 302;
+static const uint16 kBackdrop = 304;
+static const uint16 kMapdata = 306;
+static const uint16 kSounddata = 308;
+static const uint16 kSounddata2 = 310;
+static const uint16 kRecordspace = 312;
+static const uint16 kFreedat = 314;
+static const uint16 kSetdat = 316;
+static const uint16 kReel1 = 318;
+static const uint16 kReel2 = 320;
+static const uint16 kReel3 = 322;
+static const uint16 kRoomdesc = 324;
+static const uint16 kFreedesc = 326;
+static const uint16 kSetdesc = 328;
+static const uint16 kBlockdesc = 330;
+static const uint16 kSetframes = 332;
+static const uint16 kFreeframes = 334;
+static const uint16 kPeople = 336;
+static const uint16 kReels = 338;
+static const uint16 kCommandtext = 340;
+static const uint16 kPuzzletext = 342;
+static const uint16 kTraveltext = 344;
+static const uint16 kTempgraphics = 346;
+static const uint16 kTempgraphics2 = 348;
+static const uint16 kTempgraphics3 = 350;
+static const uint16 kTempsprites = 352;
+static const uint16 kTextfile1 = 354;
+static const uint16 kTextfile2 = 356;
+static const uint16 kTextfile3 = 358;
+static const uint16 kBlinkframe = 360;
+static const uint16 kBlinkcount = 361;
+static const uint16 kReasseschanges = 362;
+static const uint16 kPointerspath = 363;
+static const uint16 kManspath = 364;
+static const uint16 kPointerfirstpath = 365;
+static const uint16 kFinaldest = 366;
+static const uint16 kDestination = 367;
+static const uint16 kLinestartx = 368;
+static const uint16 kLinestarty = 370;
+static const uint16 kLineendx = 372;
+static const uint16 kLineendy = 374;
+static const uint16 kLinepointer = 376;
+static const uint16 kLinedirection = 377;
+static const uint16 kLinelength = 378;
+static const uint16 kCh0blockstocopy = 379;
+static const uint16 kCh0playing = 381;
+static const uint16 kCh0repeat = 382;
+static const uint16 kCh1playing = 383;
+static const uint16 kCh1blockstocopy = 384;
+static const uint16 kSoundbufferwrite = 386;
+static const uint16 kCurrentsample = 388;
+static const uint16 kRoomssample = 389;
+static const uint16 kBasicsample = 390;
+static const uint16 kCurrentfile = 417;
+static const uint16 kInputline = 492;
+static const uint16 kQuitrequested = 620;
+static const uint16 kSubtitles = 621;
+static const uint16 kForeignrelease = 622;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -425,7 +424,6 @@ public:
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
 	void dirFile();
-	void transferMap();
 	void dreamweb();
 	void read();
 	void searchForString();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 9799ca4726..0f0599b7f6 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -255,10 +255,11 @@ void DreamGenContext::inventory() {
 	examineOb(false);
 }
 
-void DreamGenContext::transferText() {
-	getSegment(data.word(kExtras)).word(kExtextdat + data.byte(kExpos) * 2) = data.word(kExtextpos);
-	uint16 freeTextOffset = data.byte(kItemtotran) * 2;
+void DreamBase::transferText(uint8 from, uint8 to) {
+	getSegment(data.word(kExtras)).word(kExtextdat + 2*to) = data.word(kExtextpos);
+	uint16 freeTextOffset = 2*from;
 	uint16 srcOffset = getSegment(data.word(kFreedesc)).word(kFreetextdat + freeTextOffset);
+
 	const char *src = (const char *)getSegment(data.word(kFreedesc)).ptr(kFreetext + srcOffset, 0);
 	char *dst = (char *)getSegment(data.word(kExtras)).ptr(kExtext + data.word(kExtextpos), 0);
 
@@ -1012,23 +1013,29 @@ ObjectRef DreamBase::findOpenPos() {
 
 byte DreamGenContext::transferToEx() {
 	emergencyPurge();
+
 	DynObject *exObject = getExPos(); // Also sets es:di
 	byte pos = data.byte(kExpos);
+
 	DynObject *freeObject = getFreeAd(data.byte(kItemframe));
+
 	memcpy(exObject, freeObject, sizeof(DynObject));
+
 	exObject->currentLocation = data.byte(kReallocation);
 	exObject->initialLocation = data.byte(kReallocation);
 	exObject->index = data.byte(kItemframe);
 	exObject->mapad[0] = 4;
 	exObject->mapad[1] = 255;
 	exObject->mapad[2] = data.byte(kLastinvpos);
-	data.byte(kItemtotran) = data.byte(kItemframe);
-	transferMap();
-	transferInv();
-	transferText();
-	freeObject = getFreeAd(data.byte(kItemframe));
+
+	transferFrame(data.byte(kItemframe), pos, 0);
+	transferFrame(data.byte(kItemframe), pos, 1);
+	transferText(data.byte(kItemframe), pos);
+
 	freeObject->mapad[0] = 254;
+
 	pickupConts();
+
 	return pos;
 }
 
@@ -1084,14 +1091,13 @@ void DreamGenContext::pickupConts() {
 
 	uint8 expos = data.byte(kExpos);
 
-	for (uint16 index = 0; index < 80; ++index) {
+	for (uint8 index = 0; index < 80; ++index) {
 		DynObject *freeObj = getFreeAd(index);
 
 		if (freeObj->mapad[0] != data.byte(kObjecttype))
 			continue;
 		if (freeObj->mapad[1] != data.byte(kItemframe))
 			continue;
-		data.byte(kItemtotran) = index;
 
 		DynObject *exObj = getExPos(); // Also sets es:di to exObj
 
@@ -1102,9 +1108,9 @@ void DreamGenContext::pickupConts() {
 		exObj->mapad[0] = 4; // kExObjectType?
 		exObj->mapad[1] = expos;
 
-		transferMap();
-		transferInv();
-		transferText();
+		transferFrame(index, data.byte(kExpos), 0);
+		transferFrame(index, data.byte(kExpos), 1);
+		transferText(index, data.byte(kExpos));
 
 		freeObj->mapad[0] = 0xFF;
 	}
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 8bdc0b11c0..0c62abdc1b 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -75,7 +75,6 @@
 	void useRoutine();
 	void examineOb(bool examineAgain = true);
 	void dumpWatch();
-	void transferText();
 	void watchCount();
 	void readSetData();
 	void useMon();
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index ce89711f87..ecb295a353 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -401,23 +401,6 @@ void DreamBase::dumpMap() {
 	multiDump(data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
 }
 
-void DreamBase::transferInv() {
-	const Frame *freeFrames = (const Frame *)getSegment(data.word(kFreeframes)).ptr(kFrframedata, 0);
-	const Frame *freeFrame = freeFrames + (3 * data.byte(kItemtotran) + 1);
-	Frame *exFrames = (Frame *)getSegment(data.word(kExtras)).ptr(kExframedata, 0);
-	Frame *exFrame = exFrames + (3 * data.byte(kExpos) + 1);
-	exFrame->width = freeFrame->width;
-	exFrame->height = freeFrame->height;
-	exFrame->x = freeFrame->x;
-	exFrame->y = freeFrame->y;
-	uint16 byteCount = freeFrame->width * freeFrame->height;
-	const uint8 *src = getSegment(data.word(kFreeframes)).ptr(kFrframes + freeFrame->ptr(), byteCount);
-	uint8 *dst = getSegment(data.word(kExtras)).ptr(kExframes + data.word(kExframepos), byteCount);
-	memcpy(dst, src, byteCount);
-	exFrame->setPtr(data.word(kExframepos));
-	data.word(kExframepos) += byteCount;
-}
-
 bool DreamBase::pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y) {
 	x -= pos->xMin;
 	y -= pos->yMin;
@@ -466,4 +449,25 @@ void DreamBase::showPanel() {
 	showFrame(engine->icons1(), 192, 0, 19, 0);
 }
 
+void DreamBase::transferFrame(uint8 from, uint8 to, uint8 offset) {
+	const Frame *freeFrames = (const Frame *)getSegment(data.word(kFreeframes)).ptr(kFrframedata, 0);
+	const Frame &freeFrame = freeFrames[3*from + offset];
+
+	Frame *exFrames = (Frame *)getSegment(data.word(kExtras)).ptr(kExframedata, 0);
+	Frame &exFrame = exFrames[3*to + offset];
+
+	exFrame.width = freeFrame.width;
+	exFrame.height = freeFrame.height;
+	exFrame.x = freeFrame.x;
+	exFrame.y = freeFrame.y;
+	uint16 byteCount = freeFrame.width * freeFrame.height;
+
+	const uint8 *src = getSegment(data.word(kFreeframes)).ptr(kFrframes + freeFrame.ptr(), byteCount);
+	uint8 *dst = getSegment(data.word(kExtras)).ptr(kExframes + data.word(kExframepos), byteCount);
+	memcpy(dst, src, byteCount);
+
+	exFrame.setPtr(data.word(kExframepos));
+	data.word(kExframepos) += byteCount;
+}
+
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From cb3eee86358e73251081d0d285ac2303db5aa775 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 26 Dec 2011 19:48:47 +0100
Subject: DREAMWEB: Reduce dependency on globals and move functions to
 DreamBase

---
 engines/dreamweb/dreambase.h | 15 ++++++++
 engines/dreamweb/object.cpp  | 82 ++++++++++++++++++++++----------------------
 engines/dreamweb/stubs.cpp   | 25 +++++---------
 engines/dreamweb/stubs.h     | 15 --------
 4 files changed, 65 insertions(+), 72 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index ef08738cf6..3fe00ad847 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -222,6 +222,16 @@ public:
 	void reExFromInv();
 	void swapWithInv();
 	void transferText(uint8 from, uint8 to);
+	void pickupConts(uint8 from, uint8 containerEx);
+	byte transferToEx(uint8 from);
+	void swapWithOpen();
+	void outOfOpen();
+	void inToInv();
+	void outOfInv();
+	bool checkObjectSize();
+	void useOpened();
+	void setPickup();
+	void selectOpenOb();
 
 	// from pathfind.cpp
 	void turnPathOn(uint8 param);
@@ -576,6 +586,10 @@ public:
 	void showSymbol();
 	void updateSymbolTop();
 	void updateSymbolBot();
+	void pickupOb(uint8 command, uint8 pos);
+	void errorMessage1();
+	void errorMessage2();
+	void errorMessage3();
 
 	// from talk.cpp
 	void talk();
@@ -600,6 +614,7 @@ public:
 	void loadIntroRoom();
 	void set16ColPalette();
 	void realCredits();
+	uint8 getExPos();
 
 	// from use.cpp
 	void placeFreeObject(uint8 index);
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 0f0599b7f6..4fa21e7618 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -163,8 +163,8 @@ void DreamGenContext::examineOb(bool examineAgain) {
 			RectWithCallback<DreamGenContext> examList[] = {
 				{ 273,320,157,198,&DreamBase::getBackFromOb },
 				{ 260,300,0,44,&DreamGenContext::useObject },
-				{ 210,254,0,44,&DreamGenContext::selectOpenOb },
-				{ 144,176,64,96,&DreamGenContext::setPickup },
+				{ 210,254,0,44,&DreamBase::selectOpenOb },
+				{ 144,176,64,96,&DreamBase::setPickup },
 				{ 0,50,50,200,&DreamBase::examineInventory },
 				{ 0,320,0,200,&DreamBase::blank },
 				{ 0xFFFF,0,0,0,0 }
@@ -174,12 +174,12 @@ void DreamGenContext::examineOb(bool examineAgain) {
 		}
 		case 1: {
 			// Note: This table contains the non-constant _openChangeSize!
-			RectWithCallback<DreamGenContext> invList1[] = {
+			RectWithCallback<DreamBase> invList1[] = {
 				{ 273,320,157,198,&DreamBase::getBackFromOb },
-				{ 255,294,0,24,&DreamGenContext::dropObject },
-				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage },
-				{ kInventx,_openChangeSize,kInventy+100,kInventy+100+kItempicsize,&DreamGenContext::useOpened },
-				{ kInventx,kInventx+(5*kItempicsize),kInventy,kInventy+(2*kItempicsize),&DreamGenContext::inToInv },
+				{ 255,294,0,24,&DreamBase::dropObject },
+				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamBase::incRyanPage },
+				{ kInventx,_openChangeSize,kInventy+100,kInventy+100+kItempicsize,&DreamBase::useOpened },
+				{ kInventx,kInventx+(5*kItempicsize),kInventy,kInventy+(2*kItempicsize),&DreamBase::inToInv },
 				{ 0,320,0,200,&DreamBase::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
@@ -189,7 +189,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 		default: {
 			RectWithCallback<DreamGenContext> withList1[] = {
 				{ 273,320,157,198,&DreamBase::getBackFromOb },
-				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage },
+				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamBase::incRyanPage },
 				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamGenContext::selectOb },
 				{ 0,320,0,200,&DreamBase::blank },
 				{ 0xFFFF,0,0,0,0 }
@@ -383,7 +383,7 @@ void DreamGenContext::selectOb() {
 	useRoutine();
 }
 
-void DreamGenContext::setPickup() {
+void DreamBase::setPickup() {
 	if (data.byte(kObjecttype) != kSetObjectType1 && data.byte(kObjecttype) != kSetObjectType3) {
 		// Object types 1 and 3 are excluded, so the resulting object is a DynObject
 		uint8 dummy;
@@ -414,9 +414,9 @@ void DreamGenContext::setPickup() {
 	data.byte(kInvopen) = 2;
 
 	if (data.byte(kObjecttype) != kExObjectType) {
-		data.byte(kItemframe) = data.byte(kCommand);
+		assert(data.byte(kObjecttype) == kFreeObjectType);
 		data.byte(kOpenedob) = 255;
-		data.byte(kItemframe) = transferToEx();
+		data.byte(kItemframe) = transferToEx(data.byte(kCommand));
 		data.byte(kObjecttype) = kExObjectType;
 		DynObject *object = getExAd(data.byte(kItemframe));
 		object->mapad[0] = 20;
@@ -502,7 +502,7 @@ void DreamBase::removeObFromInv() {
 	deleteExObject(data.byte(kCommand));
 }
 
-void DreamGenContext::inToInv() {
+void DreamBase::inToInv() {
 	if (!data.byte(kPickup)) {
 		outOfInv();
 		return;
@@ -542,7 +542,7 @@ void DreamGenContext::inToInv() {
 	delPointer();
 }
 
-void DreamGenContext::outOfInv() {
+void DreamBase::outOfInv() {
 	ObjectRef subject = findInvPos();
 
 	if (subject._index == 255) {
@@ -713,7 +713,7 @@ void DreamBase::dropObject() {
 	object->currentLocation = data.byte(kReallocation);
 }
 
-bool DreamGenContext::checkObjectSize() {
+bool DreamBase::checkObjectSize() {
 	byte containerSize = getOpenedSlotSize();
 	DynObject *object = getEitherAdCPP();
 	// If there is no size defined for the object in the editor, set its size
@@ -742,7 +742,7 @@ bool DreamGenContext::checkObjectSize() {
 	return false;
 }
 
-void DreamGenContext::selectOpenOb() {
+void DreamBase::selectOpenOb() {
 	uint8 slotSize, slotCount;
 	getAnyAd(&slotSize, &slotCount);
 	if (slotCount == 255) {
@@ -823,7 +823,7 @@ void DreamBase::swapWithInv() {
 	delPointer();
 }
 
-void DreamGenContext::useOpened() {
+void DreamBase::useOpened() {
 	if (data.byte(kOpenedob) == 255)
 		return;	// cannot use opened object
 
@@ -887,7 +887,7 @@ void DreamGenContext::useOpened() {
 	delPointer();
 }
 
-void DreamGenContext::outOfOpen() {
+void DreamBase::outOfOpen() {
 	if (data.byte(kOpenedob) == 255)
 		return;	// cannot use opened object
 
@@ -921,7 +921,8 @@ void DreamGenContext::outOfOpen() {
 	data.byte(kItemframe) = objectId._index;
 
 	if (data.byte(kObjecttype) != kExObjectType) {
-		data.byte(kItemframe) = transferToEx();
+		assert(objectId._type == kFreeObjectType);
+		data.byte(kItemframe) = transferToEx(objectId._index);
 		data.byte(kObjecttype) = kExObjectType;
 	}
 
@@ -938,7 +939,7 @@ void DreamGenContext::outOfOpen() {
 	delPointer();
 }
 
-void DreamGenContext::swapWithOpen() {
+void DreamBase::swapWithOpen() {
 	ObjectRef subject;
 	subject._type = data.byte(kObjecttype);
 	subject._index = data.byte(kItemframe);
@@ -975,7 +976,8 @@ void DreamGenContext::swapWithOpen() {
 	data.byte(kItemframe)  = objectId._index;
 
 	if (data.byte(kObjecttype) != kExObjectType) {
-		data.byte(kItemframe) = transferToEx();
+		assert(objectId._type == kFreeObjectType);
+		data.byte(kItemframe) = transferToEx(objectId._index);
 		data.byte(kObjecttype) = kExObjectType;
 	}
 
@@ -1011,30 +1013,30 @@ ObjectRef DreamBase::findOpenPos() {
 	return _openInvList[pos];
 }
 
-byte DreamGenContext::transferToEx() {
+byte DreamBase::transferToEx(uint8 from) {
 	emergencyPurge();
 
-	DynObject *exObject = getExPos(); // Also sets es:di
-	byte pos = data.byte(kExpos);
+	byte pos = getExPos();
+	DynObject *exObject = getExAd(pos);
 
-	DynObject *freeObject = getFreeAd(data.byte(kItemframe));
+	DynObject *freeObject = getFreeAd(from);
 
 	memcpy(exObject, freeObject, sizeof(DynObject));
 
 	exObject->currentLocation = data.byte(kReallocation);
 	exObject->initialLocation = data.byte(kReallocation);
-	exObject->index = data.byte(kItemframe);
+	exObject->index = from;
 	exObject->mapad[0] = 4;
 	exObject->mapad[1] = 255;
 	exObject->mapad[2] = data.byte(kLastinvpos);
 
-	transferFrame(data.byte(kItemframe), pos, 0);
-	transferFrame(data.byte(kItemframe), pos, 1);
-	transferText(data.byte(kItemframe), pos);
+	transferFrame(from, pos, 0);
+	transferFrame(from, pos, 1);
+	transferText(from, pos);
 
 	freeObject->mapad[0] = 254;
 
-	pickupConts();
+	pickupConts(from, pos);
 
 	return pos;
 }
@@ -1082,35 +1084,33 @@ void DreamBase::findAllOpen() {
 	}
 }
 
-void DreamGenContext::pickupConts() {
-	assert(data.byte(kObjecttype) == kFreeObjectType);
-	const DynObject *obj = getFreeAd(data.byte(kItemframe));
+void DreamBase::pickupConts(uint8 from, uint8 containerEx) {
+	const DynObject *obj = getFreeAd(from);
 
 	if (obj->slotCount == 255)
 		return; // not openable
 
-	uint8 expos = data.byte(kExpos);
-
 	for (uint8 index = 0; index < 80; ++index) {
 		DynObject *freeObj = getFreeAd(index);
 
-		if (freeObj->mapad[0] != data.byte(kObjecttype))
+		if (freeObj->mapad[0] != kFreeObjectType)
 			continue;
-		if (freeObj->mapad[1] != data.byte(kItemframe))
+		if (freeObj->mapad[1] != from)
 			continue;
 
-		DynObject *exObj = getExPos(); // Also sets es:di to exObj
+		uint8 pos = getExPos();
+		DynObject *exObj = getExAd(pos);
 
 		memcpy(exObj, freeObj, sizeof(DynObject));
 		exObj->currentLocation = data.byte(kReallocation);
 		exObj->initialLocation = data.byte(kReallocation);
 		exObj->index = index;
 		exObj->mapad[0] = 4; // kExObjectType?
-		exObj->mapad[1] = expos;
+		exObj->mapad[1] = containerEx;
 
-		transferFrame(index, data.byte(kExpos), 0);
-		transferFrame(index, data.byte(kExpos), 1);
-		transferText(index, data.byte(kExpos));
+		transferFrame(index, pos, 0);
+		transferFrame(index, pos, 1);
+		transferText(index, pos);
 
 		freeObj->mapad[0] = 0xFF;
 	}
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 9351a01bb5..55e61101e1 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1364,19 +1364,13 @@ void DreamBase::deleteTaken() {
 	}
 }
 
-DynObject *DreamGenContext::getExPos() {
-	es = data.word(kExtras);
+uint8 DreamBase::getExPos() {
 	DynObject *objects = (DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, sizeof(DynObject));
 	for (size_t i = 0; i < kNumexobjects; ++i) {
-		if (objects[i].mapad[0] == 0xff) {
-			data.byte(kExpos) = i;
-			di = kExdata + i * sizeof(DynObject);
-			return &objects[i];
-		}
+		if (objects[i].mapad[0] == 0xff)
+			return i;
 	}
-	data.byte(kExpos) = kNumexobjects;
-	di = kExdata + kNumexobjects * sizeof(DynObject);
-	return 0;
+	error("Out of Ex object positions");
 }
 
 void DreamBase::placeSetObject(uint8 index) {
@@ -2717,14 +2711,14 @@ void DreamBase::newGame() {
 		data.byte(kGetback) = 3;
 }
 
-void DreamGenContext::pickupOb(uint8 command, uint8 pos) {
+void DreamBase::pickupOb(uint8 command, uint8 pos) {
 	data.byte(kLastinvpos) = pos;
 	data.byte(kObjecttype) = kFreeObjectType;
 	data.byte(kItemframe) = command;
 	data.byte(kCommand) = command;
 	//uint8 dummy;
 	//getAnyAd(&dummy, &dummy);	// was in the original source, seems useless here
-	transferToEx();
+	transferToEx(command);
 }
 
 void DreamGenContext::initialInv() {
@@ -2870,7 +2864,7 @@ void DreamBase::delEverything() {
 	}
 }
 
-void DreamGenContext::errorMessage1() {
+void DreamBase::errorMessage1() {
 	delPointer();
 	printMessage(76, 21, 58, 240, (240 & 1));
 	readMouse();
@@ -2888,7 +2882,7 @@ void DreamGenContext::errorMessage1() {
 	delPointer();
 }
 
-void DreamGenContext::errorMessage2() {
+void DreamBase::errorMessage2() {
 	data.byte(kCommandtype) = 255;
 	delPointer();
 	printMessage(76, 21, 59, 240, (240 & 1));
@@ -2907,7 +2901,7 @@ void DreamGenContext::errorMessage2() {
 	delPointer();
 }
 
-void DreamGenContext::errorMessage3() {
+void DreamBase::errorMessage3() {
 	delPointer();
 	printMessage(76, 21, 60, 240, (240 & 1));
 	workToScreenM();
@@ -3606,7 +3600,6 @@ void DreamBase::clearChanges() {
 
 	memcpy(data.ptr(kStartvars, kLengthofvars), _initialVars, kLengthofvars);
 
-	data.byte(kExpos) = 0;
 	data.word(kExframepos) = 0;
 	data.word(kExtextpos) = 0;
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 0c62abdc1b..feedef9aae 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -66,7 +66,6 @@
 	void walkAndExamine();
 	void obName(uint8 command, uint8 commandType);
 
-	DynObject *getExPos();
 	bool checkIfSet(uint8 x, uint8 y);
 	void obToInv();
 	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
@@ -103,13 +102,9 @@
 	void inventory();
 	void mainScreen();
 	void zoomOnOff();
-	void pickupOb(uint8 command, uint8 pos);
 	void initialInv();
 	void walkIntoRoom();
 	void allPointer();
-	void errorMessage1();
-	void errorMessage2();
-	void errorMessage3();
 	void afterNewRoom();
 	void madmanRun();
 	void decide();
@@ -117,21 +112,11 @@
 	void triggerMessage(uint16 index);
 	void processTrigger();
 	bool execCommand();
-	bool checkObjectSize();
 	void identifyOb();
 	void selectOb();
-	void setPickup();
 	void getKeyAndLogo();
 	void signOn();
-	void inToInv();
-	void outOfInv();
-	void selectOpenOb();
-	void useOpened();
-	void outOfOpen();
-	void swapWithOpen();
 	void searchForFiles(uint16 segment);
-	byte transferToEx();
 	void dirCom();
-	void pickupConts();
 
 #endif
-- 
cgit v1.2.3


From f5da710da4583624d81721f33bf0506edff0417d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 21:30:02 +0200
Subject: DREAMWEB: Remove more unused global variables

---
 engines/dreamweb/dreamgen.cpp |  36 ++++----
 engines/dreamweb/dreamgen.h   | 209 ++++++++++++++++++++----------------------
 2 files changed, 119 insertions(+), 126 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index a0e255547b..220304c405 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -38,7 +38,7 @@ void DreamGenContext::read() {
 	return;
 okcom:
 	es = cs;
-	di = 417;
+	di = 408;
 	ax = data.word(kTextfile1);
 	data.word(kMonsource) = ax;
 	ds = ax;
@@ -168,7 +168,7 @@ keyok2:
 	ds = cs;
 	si = offset_operand1+1;
 	es = cs;
-	di = 417+1;
+	di = 408+1;
 	cx = 12;
 	_movsb(cx, true);
 	monitorLogo();
@@ -250,7 +250,7 @@ void DreamGenContext::parser() {
 	al = '=';
 	_stosb();
 	ds = cs;
-	si = 492;
+	si = 483;
 notspace1:
 	_lodsw();
 	_cmp(al, 32);
@@ -318,26 +318,26 @@ void DreamGenContext::__start() {
 		//0x0110: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0120: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0130: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0140: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0150: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
-		//0x0170: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 
-		//0x0180: .... ..DR EAMW EB.V
-		0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0190: 99.                
-		0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 
-		//0x01a0: ."               ..
-		0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 
-		//0x01b0: ...$ .... .... ....
-		0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 
-		//0x01c0: .... .... .... D:..
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 
+		//0x0170: .... .... .... .DRE
+		0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0180: AMWE B.V9 9.       
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0190:         . "        
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 
+		//0x01a0:       ... ..$. ....
+		0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 
+		//0x01b0: .... .... .... ....
+		0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x01c0: ...D :... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x01d0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -356,7 +356,7 @@ void DreamGenContext::__start() {
 		//0x0240: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0250: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 492a8b3d02..6ee65ada68 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,7 +32,7 @@
 
 namespace DreamGen {
 
-static const uint16 offset_operand1 = 0x0193;
+static const uint16 offset_operand1 = 0x018a;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -215,113 +215,106 @@ static const uint16 kSymboltopdir = 228;
 static const uint16 kSymbolbotx = 229;
 static const uint16 kSymbolbotnum = 230;
 static const uint16 kSymbolbotdir = 231;
-static const uint16 kSymboltolight = 232;
-static const uint16 kSymbol1 = 233;
-static const uint16 kSymbol2 = 234;
-static const uint16 kSymbol3 = 235;
-static const uint16 kSymbolnum = 236;
-static const uint16 kDumpx = 237;
-static const uint16 kDumpy = 239;
-static const uint16 kWalkandexam = 241;
-static const uint16 kWalkexamtype = 242;
-static const uint16 kWalkexamnum = 243;
-static const uint16 kCurslocx = 244;
-static const uint16 kCurslocy = 246;
-static const uint16 kCurpos = 248;
-static const uint16 kMonadx = 250;
-static const uint16 kMonady = 252;
-static const uint16 kMonsource = 254;
-static const uint16 kNumtodo = 256;
-static const uint16 kTimecount = 258;
-static const uint16 kCounttotimed = 260;
-static const uint16 kTimedseg = 262;
-static const uint16 kTimedoffset = 264;
-static const uint16 kTimedy = 266;
-static const uint16 kTimedx = 267;
-static const uint16 kNeedtodumptimed = 268;
-static const uint16 kLoadingorsave = 269;
-static const uint16 kCurrentslot = 270;
-static const uint16 kCursorpos = 271;
-static const uint16 kColourpos = 272;
-static const uint16 kFadedirection = 273;
-static const uint16 kNumtofade = 274;
-static const uint16 kFadecount = 275;
-static const uint16 kAddtogreen = 276;
-static const uint16 kAddtored = 277;
-static const uint16 kAddtoblue = 278;
-static const uint16 kLastsoundreel = 279;
-static const uint16 kSpeechloaded = 281;
-static const uint16 kSpeechlength = 282;
-static const uint16 kVolume = 284;
-static const uint16 kVolumeto = 285;
-static const uint16 kVolumedirection = 286;
-static const uint16 kVolumecount = 287;
-static const uint16 kWongame = 288;
-static const uint16 kLasthardkey = 289;
-static const uint16 kBufferin = 290;
-static const uint16 kBufferout = 292;
-static const uint16 kExtras = 294;
-static const uint16 kWorkspace = 296;
-static const uint16 kMapstore = 298;
-static const uint16 kCharset1 = 300;
-static const uint16 kMainsprites = 302;
-static const uint16 kBackdrop = 304;
-static const uint16 kMapdata = 306;
-static const uint16 kSounddata = 308;
-static const uint16 kSounddata2 = 310;
-static const uint16 kRecordspace = 312;
-static const uint16 kFreedat = 314;
-static const uint16 kSetdat = 316;
-static const uint16 kReel1 = 318;
-static const uint16 kReel2 = 320;
-static const uint16 kReel3 = 322;
-static const uint16 kRoomdesc = 324;
-static const uint16 kFreedesc = 326;
-static const uint16 kSetdesc = 328;
-static const uint16 kBlockdesc = 330;
-static const uint16 kSetframes = 332;
-static const uint16 kFreeframes = 334;
-static const uint16 kPeople = 336;
-static const uint16 kReels = 338;
-static const uint16 kCommandtext = 340;
-static const uint16 kPuzzletext = 342;
-static const uint16 kTraveltext = 344;
-static const uint16 kTempgraphics = 346;
-static const uint16 kTempgraphics2 = 348;
-static const uint16 kTempgraphics3 = 350;
-static const uint16 kTempsprites = 352;
-static const uint16 kTextfile1 = 354;
-static const uint16 kTextfile2 = 356;
-static const uint16 kTextfile3 = 358;
-static const uint16 kBlinkframe = 360;
-static const uint16 kBlinkcount = 361;
-static const uint16 kReasseschanges = 362;
-static const uint16 kPointerspath = 363;
-static const uint16 kManspath = 364;
-static const uint16 kPointerfirstpath = 365;
-static const uint16 kFinaldest = 366;
-static const uint16 kDestination = 367;
-static const uint16 kLinestartx = 368;
-static const uint16 kLinestarty = 370;
-static const uint16 kLineendx = 372;
-static const uint16 kLineendy = 374;
-static const uint16 kLinepointer = 376;
-static const uint16 kLinedirection = 377;
-static const uint16 kLinelength = 378;
-static const uint16 kCh0blockstocopy = 379;
-static const uint16 kCh0playing = 381;
-static const uint16 kCh0repeat = 382;
-static const uint16 kCh1playing = 383;
-static const uint16 kCh1blockstocopy = 384;
-static const uint16 kSoundbufferwrite = 386;
-static const uint16 kCurrentsample = 388;
-static const uint16 kRoomssample = 389;
-static const uint16 kBasicsample = 390;
-static const uint16 kCurrentfile = 417;
-static const uint16 kInputline = 492;
-static const uint16 kQuitrequested = 620;
-static const uint16 kSubtitles = 621;
-static const uint16 kForeignrelease = 622;
+static const uint16 kDumpx = 232;
+static const uint16 kDumpy = 234;
+static const uint16 kWalkandexam = 236;
+static const uint16 kWalkexamtype = 237;
+static const uint16 kWalkexamnum = 238;
+static const uint16 kCurslocx = 239;
+static const uint16 kCurslocy = 241;
+static const uint16 kCurpos = 243;
+static const uint16 kMonadx = 245;
+static const uint16 kMonady = 247;
+static const uint16 kMonsource = 249;
+static const uint16 kNumtodo = 251;
+static const uint16 kTimecount = 253;
+static const uint16 kCounttotimed = 255;
+static const uint16 kTimedseg = 257;
+static const uint16 kTimedoffset = 259;
+static const uint16 kTimedy = 261;
+static const uint16 kTimedx = 262;
+static const uint16 kNeedtodumptimed = 263;
+static const uint16 kLoadingorsave = 264;
+static const uint16 kCurrentslot = 265;
+static const uint16 kCursorpos = 266;
+static const uint16 kColourpos = 267;
+static const uint16 kFadedirection = 268;
+static const uint16 kNumtofade = 269;
+static const uint16 kFadecount = 270;
+static const uint16 kAddtogreen = 271;
+static const uint16 kAddtored = 272;
+static const uint16 kAddtoblue = 273;
+static const uint16 kLastsoundreel = 274;
+static const uint16 kSpeechloaded = 276;
+static const uint16 kVolume = 277;
+static const uint16 kVolumeto = 278;
+static const uint16 kVolumedirection = 279;
+static const uint16 kVolumecount = 280;
+static const uint16 kWongame = 281;
+static const uint16 kLasthardkey = 282;
+static const uint16 kBufferin = 283;
+static const uint16 kBufferout = 285;
+static const uint16 kExtras = 287;
+static const uint16 kWorkspace = 289;
+static const uint16 kMapstore = 291;
+static const uint16 kCharset1 = 293;
+static const uint16 kMainsprites = 295;
+static const uint16 kBackdrop = 297;
+static const uint16 kMapdata = 299;
+static const uint16 kSounddata = 301;
+static const uint16 kSounddata2 = 303;
+static const uint16 kRecordspace = 305;
+static const uint16 kFreedat = 307;
+static const uint16 kSetdat = 309;
+static const uint16 kReel1 = 311;
+static const uint16 kReel2 = 313;
+static const uint16 kReel3 = 315;
+static const uint16 kRoomdesc = 317;
+static const uint16 kFreedesc = 319;
+static const uint16 kSetdesc = 321;
+static const uint16 kBlockdesc = 323;
+static const uint16 kSetframes = 325;
+static const uint16 kFreeframes = 327;
+static const uint16 kPeople = 329;
+static const uint16 kReels = 331;
+static const uint16 kCommandtext = 333;
+static const uint16 kPuzzletext = 335;
+static const uint16 kTraveltext = 337;
+static const uint16 kTempgraphics = 339;
+static const uint16 kTempgraphics2 = 341;
+static const uint16 kTempgraphics3 = 343;
+static const uint16 kTempsprites = 345;
+static const uint16 kTextfile1 = 347;
+static const uint16 kTextfile2 = 349;
+static const uint16 kTextfile3 = 351;
+static const uint16 kBlinkframe = 353;
+static const uint16 kBlinkcount = 354;
+static const uint16 kReasseschanges = 355;
+static const uint16 kPointerspath = 356;
+static const uint16 kManspath = 357;
+static const uint16 kPointerfirstpath = 358;
+static const uint16 kFinaldest = 359;
+static const uint16 kDestination = 360;
+static const uint16 kLinestartx = 361;
+static const uint16 kLinestarty = 363;
+static const uint16 kLineendx = 365;
+static const uint16 kLineendy = 367;
+static const uint16 kLinepointer = 369;
+static const uint16 kLinedirection = 370;
+static const uint16 kLinelength = 371;
+static const uint16 kCh0blockstocopy = 372;
+static const uint16 kCh0playing = 374;
+static const uint16 kCh0repeat = 375;
+static const uint16 kCh1playing = 376;
+static const uint16 kCh1blockstocopy = 377;
+static const uint16 kCurrentsample = 379;
+static const uint16 kRoomssample = 380;
+static const uint16 kBasicsample = 381;
+static const uint16 kCurrentfile = 408;
+static const uint16 kInputline = 483;
+static const uint16 kQuitrequested = 611;
+static const uint16 kSubtitles = 612;
+static const uint16 kForeignrelease = 613;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
-- 
cgit v1.2.3


From bd70cd9dff5666d7bcca69960ef4271c519d04f3 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Mon, 26 Dec 2011 20:45:39 +0000
Subject: DREAMWEB: Ported 'read' to C++

---
 engines/dreamweb/dreamgen.cpp | 91 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/monitor.cpp  | 76 ++++++++++++++++++++++++++++++++++++
 engines/dreamweb/stubs.h      |  1 +
 4 files changed, 77 insertions(+), 92 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 220304c405..b44efe9d0e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -26,97 +26,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::read() {
-	STACK_CHECK;
-	cx = 40;
-	randomAccess();
-	parser();
-	_cmp(es.byte(di+1), 0);
-	if (!flags.z())
-		goto okcom;
-	netError();
-	return;
-okcom:
-	es = cs;
-	di = 408;
-	ax = data.word(kTextfile1);
-	data.word(kMonsource) = ax;
-	ds = ax;
-	si = (66*2);
-	searchForString();
-	_cmp(al, 0);
-	if (flags.z())
-		goto foundfile2;
-	ax = data.word(kTextfile2);
-	data.word(kMonsource) = ax;
-	ds = ax;
-	si = (66*2);
-	searchForString();
-	_cmp(al, 0);
-	if (flags.z())
-		goto foundfile2;
-	ax = data.word(kTextfile3);
-	data.word(kMonsource) = ax;
-	ds = ax;
-	si = (66*2);
-	searchForString();
-	_cmp(al, 0);
-	if (flags.z())
-		goto foundfile2;
-	al = 7;
-	monMessage();
-	return;
-foundfile2:
-	getKeyAndLogo();
-	_cmp(al, 0);
-	if (flags.z())
-		goto keyok1;
-	return;
-keyok1:
-	es = cs;
-	di = offset_operand1;
-	ds = data.word(kMonsource);
-	searchForString();
-	_cmp(al, 0);
-	if (flags.z())
-		goto findtopictext;
-	al = data.byte(kOldlogonum);
-	data.byte(kLogonum) = al;
-	al = 11;
-	monMessage();
-	return;
-findtopictext:
-	_inc(bx);
-	push(es);
-	push(bx);
-	monitorLogo();
-	scrollMonitor();
-	bx = pop();
-	es = pop();
-moretopic:
-	monPrint();
-	al = es.byte(bx);
-	_cmp(al, 34);
-	if (flags.z())
-		goto endoftopic;
-	_cmp(al, '=');
-	if (flags.z())
-		goto endoftopic;
-	_cmp(al, '*');
-	if (flags.z())
-		goto endoftopic;
-	push(es);
-	push(bx);
-	processTrigger();
-	cx = 24;
-	randomAccess();
-	bx = pop();
-	es = pop();
-	goto moretopic;
-endoftopic:
-	scrollMonitor();
-}
-
 void DreamGenContext::dirFile() {
 	STACK_CHECK;
 	al = 34;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 6ee65ada68..6ec194618a 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -418,7 +418,6 @@ public:
 
 	void dirFile();
 	void dreamweb();
-	void read();
 	void searchForString();
 	void parser();
 };
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index a877f17b8a..953d1cb6a1 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -475,6 +475,82 @@ void DreamGenContext::dirCom() {
 	scrollMonitor();
 }
 
+void DreamGenContext::read() {
+	bool foundFile = false;
+
+	randomAccess(40);
+	parser();
+	if (es.byte(di+1) == 0) {
+		netError();
+		return;
+	}
+
+	es = cs;
+	di = kCurrentfile;
+
+	data.word(kMonsource) = data.word(kTextfile1);
+	ds = data.word(kMonsource);
+	si = kTextstart;
+	searchForString();
+	if (al == 0) {
+		foundFile = true;
+	} else {
+		data.word(kMonsource) = data.word(kTextfile2);
+		ds = data.word(kMonsource);
+		si = kTextstart;
+		searchForString();
+		if (al == 0) {
+			foundFile = true;
+		} else {
+			data.word(kMonsource) = data.word(kTextfile3);
+			ds = data.word(kMonsource);
+			si = kTextstart;
+			searchForString();
+			if (al == 0)
+				foundFile = true;
+		}
+	}
+
+	if (!foundFile) {
+		monMessage(7);
+		return;
+	}
+
+	// "foundfile2"
+	getKeyAndLogo();
+	if (al != 0)
+		return;
+
+	// "keyok1"
+	es = cs;
+	di = offset_operand1;
+	ds = data.word(kMonsource);
+	searchForString();
+	if (al != 0) {
+		data.byte(kLogonum) = data.byte(kOldlogonum);
+		monMessage(11);
+		return;
+	}
+
+	// "findtopictext"
+	bx++;
+
+	monitorLogo();
+	scrollMonitor();
+
+	while (true) {
+		monPrint();
+		if (es.byte(bx) == 34 || es.byte(bx) == '=' || es.byte(bx) == '*') {
+			// "endoftopic"
+			scrollMonitor();
+			return;
+		}
+
+		processTrigger();
+		randomAccess(24);
+	}
+}
+
 void DreamGenContext::signOn() {
 	parser();
 
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index feedef9aae..bda2be634e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -117,6 +117,7 @@
 	void getKeyAndLogo();
 	void signOn();
 	void searchForFiles(uint16 segment);
+	void read();
 	void dirCom();
 
 #endif
-- 
cgit v1.2.3


From b08804f360d7561ca1014445aa7eeb257297f8ed Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 26 Dec 2011 20:35:20 +0100
Subject: DREAMWEB: Convert 'parser'

---
 engines/dreamweb/dreambase.h  |  2 ++
 engines/dreamweb/dreamgen.cpp | 39 ------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/monitor.cpp  | 55 ++++++++++++++++++++++++++++++++++++++-----
 engines/dreamweb/stubs.cpp    |  6 ++---
 engines/dreamweb/stubs.h      |  1 -
 6 files changed, 54 insertions(+), 50 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 3fe00ad847..0ee14bbd42 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -177,6 +177,7 @@ public:
 	void loadNews();
 	void loadCart();
 	void showKeys();
+	const char *parser();
 
 	// from newplace.cpp
 	void getUnderCentre();
@@ -590,6 +591,7 @@ public:
 	void errorMessage1();
 	void errorMessage2();
 	void errorMessage3();
+	void decide();
 
 	// from talk.cpp
 	void talk();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index b44efe9d0e..13067db073 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -148,45 +148,6 @@ notfound:
 	al = 1;
 }
 
-void DreamGenContext::parser() {
-	STACK_CHECK;
-	es = cs;
-	di = offset_operand1;
-	cx = 13;
-	al = 0;
-	_stosb(cx, true);
-	di = offset_operand1;
-	al = '=';
-	_stosb();
-	ds = cs;
-	si = 483;
-notspace1:
-	_lodsw();
-	_cmp(al, 32);
-	if (flags.z())
-		goto stillspace1;
-	_cmp(al, 0);
-	if (!flags.z())
-		goto notspace1;
-	goto finishpars;
-stillspace1:
-	_lodsw();
-	_cmp(al, 32);
-	if (flags.z())
-		goto stillspace1;
-copyin1:
-	_stosb();
-	_lodsw();
-	_cmp(al, 0);
-	if (flags.z())
-		goto finishpars;
-	_cmp(al, 32);
-	if (!flags.z())
-		goto copyin1;
-finishpars:
-	di = offset_operand1;
-}
-
 void DreamGenContext::__start() { 
 	static const uint8 src[] = {
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x13, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 6ec194618a..6d2e2eb5af 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -419,7 +419,6 @@ public:
 	void dirFile();
 	void dreamweb();
 	void searchForString();
-	void parser();
 };
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 953d1cb6a1..3b9b96e2b9 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -458,8 +458,11 @@ void DreamGenContext::getKeyAndLogo() {
 
 void DreamGenContext::dirCom() {
 	randomAccess(30);
-	parser();
-	if (es.byte(di + 1)) {
+
+	const char *dirname = parser();
+	if (dirname[1]) {
+		es = cs;
+		di = offset_operand1; // cs:operand1 == dirname
 		dirFile();
 		return;
 	}
@@ -479,8 +482,8 @@ void DreamGenContext::read() {
 	bool foundFile = false;
 
 	randomAccess(40);
-	parser();
-	if (es.byte(di+1) == 0) {
+	const char *name = parser();
+	if (name[1] == 0) {
 		netError();
 		return;
 	}
@@ -552,10 +555,10 @@ void DreamGenContext::read() {
 }
 
 void DreamGenContext::signOn() {
-	parser();
+	const char *name = parser();
 
 	int8 foundIndex = -1;
-	Common::String inputLine = (const char *)data.ptr(offset_operand1 + 1, 0);
+	Common::String inputLine = name + 1;
 	inputLine.trim();
 
 	for (byte i = 0; i < 4; i++) {
@@ -623,4 +626,44 @@ void DreamGenContext::searchForFiles(uint16 segment) {
 	}
 }
 
+const char *DreamBase::parser() {
+	char *output = (char *)data.ptr(offset_operand1, 13);
+
+	memset(output, 0, 13);
+
+	char *p = output;
+	*p++ = '=';
+
+	const char *in = (const char *)data.ptr(kInputline, 0);
+
+	uint8 c;
+
+	// skip command
+	do {
+		c = *in++;
+		in++;
+
+		if (!c)
+			return output;
+	} while (c != 32);
+
+	// skip spaces between command and operand
+	do {
+		c = *in++;
+		in++;
+	} while (c == 32);
+
+	// copy first operand
+	do {
+		*p++ = c;
+		c = *in++;
+		in++;
+		if (!c)
+			return output;
+	} while (c != 32);
+
+	return output;
+}
+
+
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 55e61101e1..ca98337261 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3101,7 +3101,7 @@ void DreamGenContext::madmanRun() {
 }
 
 
-void DreamGenContext::decide() {
+void DreamBase::decide() {
 	setMode();
 	loadPalFromIFF();
 	clearPalette();
@@ -3118,10 +3118,10 @@ void DreamGenContext::decide() {
 	fadeScreenUp();
 	data.byte(kGetback) = 0;
 
-	RectWithCallback<DreamGenContext> decideList[] = {
+	RectWithCallback<DreamBase> decideList[] = {
 		{ kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamBase::newGame },
 		{ kOpsx+20,kOpsx+87,kOpsy+10,kOpsy+59,&DreamBase::DOSReturn },
-		{ kOpsx+123,kOpsx+190,kOpsy+10,kOpsy+59,&DreamGenContext::loadOld },
+		{ kOpsx+123,kOpsx+190,kOpsy+10,kOpsy+59,&DreamBase::loadOld },
 		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index bda2be634e..7fa403bbb7 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -107,7 +107,6 @@
 	void allPointer();
 	void afterNewRoom();
 	void madmanRun();
-	void decide();
 	void showGun();
 	void triggerMessage(uint16 index);
 	void processTrigger();
-- 
cgit v1.2.3


From b5ad84a05d7ad56118794efe071fe20c35ef4821 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 26 Dec 2011 20:54:33 +0100
Subject: DREAMWEB: Move inputline out of data blob

---
 engines/dreamweb/dreambase.h  |  3 +++
 engines/dreamweb/dreamgen.cpp | 16 ----------------
 engines/dreamweb/dreamgen.h   |  7 +++----
 engines/dreamweb/monitor.cpp  | 21 +++++++++------------
 4 files changed, 15 insertions(+), 32 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 0ee14bbd42..c17a15e34a 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -64,6 +64,9 @@ protected:
 	// from keypad.cpp
 	uint8 _pressList[6];
 
+	// from monitor.cpp
+	char _inputLine[64];
+
 	// from newplace.cpp
 	uint8 _roomsCanGo[16];
 
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 13067db073..a4eeeacd2f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -210,22 +210,6 @@ void DreamGenContext::__start() {
 		//0x01c0: ...D :... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x01d0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01e0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01f0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0200: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0210: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0220: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0230: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0240: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0250: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 6d2e2eb5af..48b413807c 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -311,10 +311,9 @@ static const uint16 kCurrentsample = 379;
 static const uint16 kRoomssample = 380;
 static const uint16 kBasicsample = 381;
 static const uint16 kCurrentfile = 408;
-static const uint16 kInputline = 483;
-static const uint16 kQuitrequested = 611;
-static const uint16 kSubtitles = 612;
-static const uint16 kForeignrelease = 613;
+static const uint16 kQuitrequested = 483;
+static const uint16 kSubtitles = 484;
+static const uint16 kForeignrelease = 485;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 3b9b96e2b9..0caf4b7c25 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -111,8 +111,7 @@ bool DreamGenContext::execCommand() {
 		"KEYS"
 	};
 
-	const char *inputLine = (const char *)data.ptr(kInputline, 64);
-	if (*inputLine == 0) {
+	if (_inputLine[0] == 0) {
 		// No input
 		scrollMonitor();
 		return false;
@@ -123,7 +122,7 @@ bool DreamGenContext::execCommand() {
 	// Loop over all commands in the list and see if we get a match
 	for (cmd = 0; cmd < ARRAYSIZE(comlist); ++cmd) {
 		const char *cmdStr = comlist[cmd];
-		const char *inputStr = inputLine;
+		const char *inputStr = _inputLine;
 		// Compare the command, char by char, to see if we get a match.
 		// We only care about the prefix matching, though.
 		char inputChar, cmdChar;
@@ -191,8 +190,7 @@ void DreamBase::printLogo() {
 }
 
 void DreamBase::input() {
-	char *inputLine = (char *)data.ptr(kInputline, 64);
-	memset(inputLine, 0, 64);
+	memset(_inputLine, 0, 64);
 	data.word(kCurpos) = 0;
 	printChar(engine->tempCharset(), data.word(kMonadx), data.word(kMonady), '>', 0, NULL, NULL);
 	multiDump(data.word(kMonadx), data.word(kMonady), 6, 8);
@@ -221,13 +219,13 @@ void DreamBase::input() {
 		if ((currentKey == 32) && (data.word(kCurpos) == 0))
 			continue;
 		currentKey = makeCaps(currentKey);
-		inputLine[data.word(kCurpos) * 2 + 0] = currentKey;
+		_inputLine[data.word(kCurpos) * 2 + 0] = currentKey;
 		if (currentKey > 'Z')
 			continue;
 		multiGet(mapStore() + data.word(kCurpos) * 256, data.word(kMonadx), data.word(kMonady), 8, 8);
 		uint8 charWidth;
 		printChar(engine->tempCharset(), data.word(kMonadx), data.word(kMonady), currentKey, 0, &charWidth, NULL);
-		inputLine[data.word(kCurpos) * 2 + 1] = charWidth;
+		_inputLine[data.word(kCurpos) * 2 + 1] = charWidth;
 		data.word(kMonadx) += charWidth;
 		++data.word(kCurpos);
 		data.word(kCurslocx) += charWidth;
@@ -246,10 +244,9 @@ byte DreamBase::makeCaps(byte c) {
 }
 
 void DreamBase::delChar() {
-	char *inputLine = (char *)data.ptr(kInputline, 0);
 	--data.word(kCurpos);
-	inputLine[data.word(kCurpos) * 2] = 0;
-	uint8 width = inputLine[data.word(kCurpos) * 2 + 1];
+	_inputLine[data.word(kCurpos) * 2] = 0;
+	uint8 width = _inputLine[data.word(kCurpos) * 2 + 1];
 	data.word(kMonadx) -= width;
 	data.word(kCurslocx) -= width;
 	uint16 offset = data.word(kCurpos);
@@ -587,7 +584,7 @@ void DreamGenContext::signOn() {
 	data.word(kMonadx) = prevX;
 	data.word(kMonady) = prevY;
 
-	inputLine = (const char *)data.ptr(kInputline, 0);
+	inputLine = (const char *)_inputLine;
 	inputLine.toUppercase();
 
 	// The entered line has zeroes in-between each character
@@ -634,7 +631,7 @@ const char *DreamBase::parser() {
 	char *p = output;
 	*p++ = '=';
 
-	const char *in = (const char *)data.ptr(kInputline, 0);
+	const char *in = _inputLine;
 
 	uint8 c;
 
-- 
cgit v1.2.3


From 0117fc415e9c35e9a721c2b4118f106ba9e56b57 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 26 Dec 2011 21:01:34 +0100
Subject: SCUMM: Make SampleBuffer::write non-virtual to silence a g++ warning.

No class inherits from SampleBuffer, thus it should be safe to do so.
---
 engines/scumm/player_apple2.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/player_apple2.h b/engines/scumm/player_apple2.h
index 9e97ab0c89..d9345a7113 100644
--- a/engines/scumm/player_apple2.h
+++ b/engines/scumm/player_apple2.h
@@ -103,7 +103,7 @@ public:
 		return _writePos - _readPos;
 	}
 
-	virtual uint32 write(const void *dataPtr, uint32 dataSize) {
+	uint32 write(const void *dataPtr, uint32 dataSize) {
 		ensureFree(dataSize);
 		memcpy(_data + _writePos, dataPtr, dataSize);
 		_writePos += dataSize;
-- 
cgit v1.2.3


From 4c66f74b58e9a2c191f22a37f485047dd19be131 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 22:09:47 +0200
Subject: DREAMWEB: Remove dead code and move most functions to DreamBase

---
 engines/dreamweb/dreambase.h  | 35 ++++++++++++++++
 engines/dreamweb/monitor.cpp  | 12 ++----
 engines/dreamweb/object.cpp   | 10 ++---
 engines/dreamweb/print.cpp    | 11 +----
 engines/dreamweb/stubs.cpp    | 54 ++++++++++++------------
 engines/dreamweb/stubs.h      | 95 ++++---------------------------------------
 engines/dreamweb/use.cpp      |  3 +-
 engines/dreamweb/vgagrafx.cpp | 21 ----------
 8 files changed, 79 insertions(+), 162 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index c17a15e34a..a4e3adfe42 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -595,6 +595,41 @@ public:
 	void errorMessage2();
 	void errorMessage3();
 	void decide();
+	void screenUpdate();
+	void mainScreen();
+	void walkAndExamine();
+	void autoLook();
+	void dumpWatch();
+	void watchCount();
+	void afterNewRoom();
+	void examineOb(bool examineAgain = true);
+	void walkIntoRoom();
+	void doLook();
+	void startup1();
+	void quickQuit();
+	void readOneBlock();
+	void seeCommandTail();
+	void quickQuit2();
+	void width160();
+	bool checkIfPerson(uint8 x, uint8 y);
+	bool checkIfFree(uint8 x, uint8 y);
+	bool checkIfEx(uint8 x, uint8 y);
+	void obName(uint8 command, uint8 commandType);
+	bool checkIfSet(uint8 x, uint8 y);
+	void readSetData();
+	void look();
+	void useKey();
+	void inventory();
+	void zoomOnOff();
+	void initialInv();
+	void allPointer();
+	void madmanRun();
+	void showGun();
+	void triggerMessage(uint16 index);
+	void processTrigger();
+	void identifyOb();
+	void signOn();
+	void searchForFiles(uint16 segment);
 
 	// from talk.cpp
 	void talk();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 0caf4b7c25..5e84c82962 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -233,7 +233,7 @@ void DreamBase::input() {
 }
 
 void DreamGenContext::makeCaps() {
-	al = makeCaps(al);
+	al = DreamBase::makeCaps(al);
 }
 
 byte DreamBase::makeCaps(byte c) {
@@ -312,10 +312,6 @@ void DreamBase::accessLightOff() {
 	multiDump(74, 182, 12, 8);
 }
 
-void DreamGenContext::randomAccess() {
-	randomAccess(cx);
-}
-
 void DreamBase::randomAccess(uint16 count) {
 	for (uint16 i = 0; i < count; ++i) {
 		vSync();
@@ -330,7 +326,7 @@ void DreamBase::randomAccess(uint16 count) {
 }
 
 void DreamGenContext::monMessage() {
-	monMessage(al);
+	DreamBase::monMessage(al);
 }
 
 void DreamBase::monMessage(uint8 index) {
@@ -551,7 +547,7 @@ void DreamGenContext::read() {
 	}
 }
 
-void DreamGenContext::signOn() {
+void DreamBase::signOn() {
 	const char *name = parser();
 
 	int8 foundIndex = -1;
@@ -609,7 +605,7 @@ void DreamGenContext::signOn() {
 	}
 }
 
-void DreamGenContext::searchForFiles(uint16 segment) {
+void DreamBase::searchForFiles(uint16 segment) {
 	const char *filesString = (const char *)getSegment(segment).ptr(kTextstart, 0);
 	byte curChar;
 
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 4fa21e7618..124a4f908d 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -78,10 +78,6 @@ void DreamBase::makeWorn(DynObject *object) {
 	object->id[1] = 'E'-'A';
 }
 
-void DreamGenContext::obToInv() {
-	obToInv(al, ah, di, bx);
-}
-
 void DreamBase::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 	showFrame(engine->icons1(), x - 2, y - 1, 10, 0);
 	if (index == 0xff)
@@ -120,7 +116,7 @@ void DreamBase::obIcons() {
 	showFrame(engine->icons2(), 260, 1, 1, 0);
 }
 
-void DreamGenContext::examineOb(bool examineAgain) {
+void DreamBase::examineOb(bool examineAgain) {
 	data.byte(kPointermode) = 0;
 	data.word(kTimecount) = 0;
 
@@ -217,7 +213,7 @@ void DreamGenContext::examineOb(bool examineAgain) {
 	data.byte(kOpenedob) = 255;
 }
 
-void DreamGenContext::inventory() {
+void DreamBase::inventory() {
 	if (data.byte(kMandead) == 1 || data.word(kWatchingtime) != 0) {
 		blank();
 		return;
@@ -312,7 +308,7 @@ void DreamBase::openOb() {
 	_openChangeSize = getOpenedSlotCount() * kItempicsize + kInventx;
 }
 
-void DreamGenContext::identifyOb() {
+void DreamBase::identifyOb() {
 	if (data.word(kWatchingtime) != 0) {
 		blank();
 		return;
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 0191aa8860..d19a1931d2 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -120,15 +120,6 @@ uint8 DreamBase::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWid
 	} while (true);
 }
 
-void DreamGenContext::printDirect() {
-	uint16 y = bx;
-	const uint8 *initialString = es.ptr(si, 0);
-	const uint8 *string = initialString;
-	al = DreamBase::printDirect(&string, di, &y, dl, (bool)(dl & 1));
-	si += (string - initialString);
-	bx = y;
-}
-
 uint8 DreamBase::printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 	return printDirect(&string, x, &y, maxWidth, centered);
 }
@@ -216,7 +207,7 @@ uint16 DreamBase::waitFrames() {
 void DreamGenContext::monPrint() {
 	uint16 originalBx = bx;
 	const char *string = (const char *)es.ptr(bx, 0);
-	const char *nextString = monPrint(string);
+	const char *nextString = DreamBase::monPrint(string);
 	bx = originalBx + (nextString - string);
 }
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index ca98337261..759f608cb3 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -651,7 +651,7 @@ bool DreamBase::quitRequested() {
 	return data.byte(kQuitrequested);
 }
 
-void DreamGenContext::screenUpdate() {
+void DreamBase::screenUpdate() {
 	newPlace();
 	mainScreen();
 	if (quitRequested())
@@ -722,7 +722,7 @@ void DreamBase::startup() {
 	atmospheres();
 }
 
-void DreamGenContext::startup1() {
+void DreamBase::startup1() {
 	clearPalette();
 	data.byte(kThroughdoor) = 0;
 
@@ -789,15 +789,15 @@ void DreamBase::hangOnCurs(uint16 frameCount) {
 	}
 }
 
-void DreamGenContext::seeCommandTail() {
+void DreamBase::seeCommandTail() {
 	data.byte(kBrightness) = 1;
 }
 
-void DreamGenContext::quickQuit() {
+void DreamBase::quickQuit() {
 	engine->quit();
 }
 
-void DreamGenContext::quickQuit2() {
+void DreamBase::quickQuit2() {
 	engine->quit();
 }
 
@@ -842,7 +842,7 @@ void DreamBase::putUnderTimed() {
 		multiPut(_underTimedText, data.byte(kTimedx), data.byte(kTimedy), 240, kUnderTimedTextSizeY);
 }
 
-void DreamGenContext::triggerMessage(uint16 index) {
+void DreamBase::triggerMessage(uint16 index) {
 	multiGet(mapStore(), 174, 153, 200, 63);
 	uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(index * 2);
 	const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
@@ -856,7 +856,7 @@ void DreamGenContext::triggerMessage(uint16 index) {
 	data.byte(kLasttrigger) = 0;
 }
 
-void DreamGenContext::processTrigger() {
+void DreamBase::processTrigger() {
 	if (data.byte(kLasttrigger) == '1') {
 		setLocation(8);
 		triggerMessage(45);
@@ -1145,7 +1145,7 @@ void DreamBase::commandOnly(uint8 command) {
 	data.byte(kNewtextline) = 1;
 }
 
-bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
+bool DreamBase::checkIfPerson(uint8 x, uint8 y) {
 	Common::List<People>::iterator i;
 	for (i = _peopleList.begin(); i != _peopleList.end(); ++i) {
 		People &people = *i;
@@ -1172,7 +1172,7 @@ bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
 	return false;
 }
 
-bool DreamGenContext::checkIfFree(uint8 x, uint8 y) {
+bool DreamBase::checkIfFree(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _freeList.reverse_begin(); i != _freeList.end(); --i) {
 		const ObjPos &pos = *i;
@@ -1185,7 +1185,7 @@ bool DreamGenContext::checkIfFree(uint8 x, uint8 y) {
 	return false;
 }
 
-bool DreamGenContext::checkIfEx(uint8 x, uint8 y) {
+bool DreamBase::checkIfEx(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _exList.reverse_begin(); i != _exList.end(); --i) {
 		const ObjPos &pos = *i;
@@ -1393,7 +1393,7 @@ void DreamBase::getFlagUnderP(uint8 *flag, uint8 *flagEx) {
 	data.byte(kLastflag) = *flag;
 }
 
-void DreamGenContext::walkAndExamine() {
+void DreamBase::walkAndExamine() {
 	if (!finishedWalking())
 		return;
 	data.byte(kCommandtype) = data.byte(kWalkexamtype);
@@ -1403,7 +1403,7 @@ void DreamGenContext::walkAndExamine() {
 		examineOb();
 }
 
-void DreamGenContext::obName(uint8 command, uint8 commandType) {
+void DreamBase::obName(uint8 command, uint8 commandType) {
 	if (data.byte(kReasseschanges) == 0) {
 		if ((commandType == data.byte(kCommandtype)) && (command == data.byte(kCommand))) {
 			if (data.byte(kWalkandexam) == 1) {
@@ -1723,7 +1723,7 @@ void DreamBase::showIcon() {
 	}
 }
 
-bool DreamGenContext::checkIfSet(uint8 x, uint8 y) {
+bool DreamBase::checkIfSet(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _setList.reverse_begin(); i != _setList.end(); --i) {
 		const ObjPos &pos = *i;
@@ -1862,7 +1862,7 @@ void DreamBase::enterSymbol() {
 	}
 }
 
-void DreamGenContext::zoomOnOff() {
+void DreamBase::zoomOnOff() {
 	if (data.word(kWatchingtime) != 0 || data.byte(kPointermode) == 2) {
 		blank();
 		return;
@@ -1900,7 +1900,7 @@ void DreamBase::sortOutMap() {
 	}
 }
 
-void DreamGenContext::mainScreen() {
+void DreamBase::mainScreen() {
 	data.byte(kInmaparea) = 0;
 	if (data.byte(kWatchon) == 1) {
 		RectWithCallback<DreamGenContext> mainList[] = {
@@ -1937,7 +1937,7 @@ void DreamBase::showWatch() {
 	}
 }
 
-void DreamGenContext::dumpWatch() {
+void DreamBase::dumpWatch() {
 	if (data.byte(kWatchdump) != 1)
 		return;
 	multiDump(256, 21, 40, 12);
@@ -1965,7 +1965,7 @@ void DreamBase::showTime() {
 	showFrame(charset, 267+5, 21, 91*3+20, 0);
 }
 
-void DreamGenContext::watchCount() {
+void DreamBase::watchCount() {
 	if (data.byte(kWatchon) == 0)
 		return;
 	++data.byte(kTimercount);
@@ -2031,7 +2031,7 @@ void DreamBase::loadRoom() {
 	getDimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
 }
 
-void DreamGenContext::readSetData() {
+void DreamBase::readSetData() {
 	data.word(kCharset1) = standardLoad("DREAMWEB.C00");
 
 	void *icons1Buffer = standardLoadCPP("DREAMWEB.G00");
@@ -2070,7 +2070,7 @@ void DreamBase::findRoomInLoc() {
 	data.byte(kRoomnum) = roomNum;
 }
 
-void DreamGenContext::autoLook() {
+void DreamBase::autoLook() {
 	if ((data.word(kMousex) != data.word(kOldx)) || (data.word(kMousey) != data.word(kOldy))) {
 		data.word(kLookcounter) = 1000;
 		return;
@@ -2084,7 +2084,7 @@ void DreamGenContext::autoLook() {
 	doLook();
 }
 
-void DreamGenContext::look() {
+void DreamBase::look() {
 	if (data.word(kWatchingtime) || (data.byte(kPointermode) == 2)) {
 		blank();
 		return;
@@ -2097,7 +2097,7 @@ void DreamGenContext::look() {
 		doLook();
 }
 
-void DreamGenContext::doLook() {
+void DreamBase::doLook() {
 	createPanel();
 	showIcon();
 	underTextLine();
@@ -2721,7 +2721,7 @@ void DreamBase::pickupOb(uint8 command, uint8 pos) {
 	transferToEx(command);
 }
 
-void DreamGenContext::initialInv() {
+void DreamBase::initialInv() {
 	if (data.byte(kReallocation) != 24)
 		return;
 
@@ -2741,7 +2741,7 @@ void DreamGenContext::initialInv() {
 	switchRyanOff();
 }
 
-void DreamGenContext::walkIntoRoom() {
+void DreamBase::walkIntoRoom() {
 	if (data.byte(kLocation) == 14 && data.byte(kMapx) == 22) {
 		data.byte(kDestination) = 1;
 		data.byte(kFinaldest) = 1;
@@ -2785,7 +2785,7 @@ void DreamBase::blank() {
 	}
 }
 
-void DreamGenContext::allPointer() {
+void DreamBase::allPointer() {
 	readMouse();
 	showPointer();
 	dumpPointer();
@@ -3050,7 +3050,7 @@ void DreamBase::watchReel() {
 	plotReel(reelPointer);
 }
 
-void DreamGenContext::afterNewRoom() {
+void DreamBase::afterNewRoom() {
 	if (data.byte(kNowinnewroom) == 0)
 		return; // notnew
 
@@ -3081,7 +3081,7 @@ void DreamGenContext::afterNewRoom() {
 	atmospheres();
 }
 
-void DreamGenContext::madmanRun() {
+void DreamBase::madmanRun() {
 	if (data.byte(kLocation)    != 14 ||
 		data.byte(kMapx)        != 22 ||
 		data.byte(kPointermode) !=  2 ||
@@ -3147,7 +3147,7 @@ void DreamBase::decide() {
 	data.byte(kTextlen) = 240;
 }
 
-void DreamGenContext::showGun() {
+void DreamBase::showGun() {
 	data.byte(kAddtored) = 0;
 	data.byte(kAddtogreen) = 0;
 	data.byte(kAddtoblue) = 0;
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 7fa403bbb7..c464163f68 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -22,101 +22,22 @@
 #ifndef DREAMWEB_STUBS_H
 #define DREAMWEB_STUBS_H
 
-	void screenUpdate();
-	void startup1();
-	void multiGet();
-	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height) {
-		DreamBase::multiGet(dst, x, y, width, height);
-	}
-	void multiPut();
-	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height) {
-		DreamBase::multiPut(src, x, y, width, height);
-	}
-	void multiDump();
-	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
-		DreamBase::multiDump(x, y, width, height);
-	}
-	void quickQuit();
-	void readOneBlock();
-	void seeCommandTail();
-	void quickQuit2();
-	void printDirect();
-	uint8 printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered) {
-		return DreamBase::printDirect(string, x, y, maxWidth, centered);
-	}
-	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
-		return DreamBase::printDirect(string, x, y, maxWidth, centered);
-	}
-	void width160();
-	bool checkIfPerson(uint8 x, uint8 y);
-	bool checkIfFree(uint8 x, uint8 y);
-	bool checkIfEx(uint8 x, uint8 y);
-	DynObject *getFreeAd(uint8 index) {
-		return DreamBase::getFreeAd(index);
-	}
-	DynObject *getExAd(uint8 index) {
-		return DreamBase::getExAd(index);
-	}
-	void *getAnyAd(uint8 *slotSize, uint8 *slotCount) {
-		return DreamBase::getAnyAd(slotSize, slotCount);
-	}
-	SetObject *getSetAd(uint8 index) {
-		return DreamBase::getSetAd(index);
-	}
-	void walkAndExamine();
-	void obName(uint8 command, uint8 commandType);
-
-	bool checkIfSet(uint8 x, uint8 y);
-	void obToInv();
-	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
-		DreamBase::obToInv(index, flag, x, y);
-	}
-	void useRoutine();
-	void examineOb(bool examineAgain = true);
-	void dumpWatch();
-	void watchCount();
-	void readSetData();
-	void useMon();
-	void makeCaps();
-	byte makeCaps(byte c) {
-		return DreamBase::makeCaps(c);
+	void monMessage();
+	void monMessage(uint8 index) {
+		DreamBase::monMessage(index);
 	}
 	void monPrint();
 	const char *monPrint(const char *string) {
 		return DreamBase::monPrint(string);
 	}
-	void randomAccess();
-	void randomAccess(uint16 count) {
-		DreamBase::randomAccess(count);
-	}
-	void monMessage();
-	void monMessage(uint8 index) {
-		DreamBase::monMessage(index);
-	}
-	void look();
-	void autoLook();
-	void doLook();
-	void useKey();
+	void useRoutine();
 	void useObject();
-	void singleKey(uint8 key, uint16 x, uint16 y);
-	void inventory();
-	void mainScreen();
-	void zoomOnOff();
-	void initialInv();
-	void walkIntoRoom();
-	void allPointer();
-	void afterNewRoom();
-	void madmanRun();
-	void showGun();
-	void triggerMessage(uint16 index);
-	void processTrigger();
-	bool execCommand();
-	void identifyOb();
+	void makeCaps();
+	void useMon();
 	void selectOb();
-	void getKeyAndLogo();
-	void signOn();
-	void searchForFiles(uint16 segment);
+	bool execCommand();
 	void read();
 	void dirCom();
+	void getKeyAndLogo();
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 25ed8d50e5..0f31c766b5 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1494,7 +1494,7 @@ void DreamBase::useAxe() {
 	removeObFromInv();
 }
 
-void DreamGenContext::useKey() {
+void DreamBase::useKey() {
 	switch(data.byte(kLocation)) {
 	case 5:
 	case 30:
@@ -1512,7 +1512,6 @@ void DreamGenContext::useKey() {
 		if (data.byte(kMapx) == 11 && data.byte(kMapy) == 10) {
 			showPuzText(3, 300);
 			data.byte(kNewlocation) = 30;
-			al = 2;
 			fadeScreenDown();
 			showFirstUse();
 			putBackObStuff();
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index ecb295a353..06743ed3bb 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -27,13 +27,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::multiGet() {
-	multiGet(ds.ptr(si, 0), di, bx, cl, ch);
-	si += cl * ch;
-	di += bx * kScreenwidth + kScreenwidth * ch;
-	cx = 0;
-}
-
 void DreamBase::multiGet(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
 	assert(x < 320);
 	assert(y < 200);
@@ -50,13 +43,6 @@ void DreamBase::multiGet(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
 	}
 }
 
-void DreamGenContext::multiPut() {
-	multiPut(ds.ptr(si, 0), di, bx, cl, ch);
-	si += cl * ch;
-	di += bx * kScreenwidth + kScreenwidth * ch;
-	cx = 0;
-}
-
 void DreamBase::multiPut(const uint8 *src, uint16 x, uint16 y, uint8 w, uint8 h) {
 	assert(x < 320);
 	assert(y < 200);
@@ -73,13 +59,6 @@ void DreamBase::multiPut(const uint8 *src, uint16 x, uint16 y, uint8 w, uint8 h)
 	}
 }
 
-void DreamGenContext::multiDump() {
-	multiDump(di, bx, cl, ch);
-	unsigned offset = di + bx * kScreenwidth;
-	si = di = offset + ch * kScreenwidth;
-	cx = 0;
-}
-
 void DreamBase::multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
 	unsigned offset = x + y * kScreenwidth;
 	//debug(1, "multiDump %ux%u(segment: %04x) -> %d,%d(address: %d)", w, h, (uint16)ds, x, y, offset);
-- 
cgit v1.2.3


From 1ba4f0a1a8965ee141987693770d2bcd3b74c292 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 22:31:50 +0200
Subject: Revert "DREAMWEB: Remove dead code and move most functions to
 DreamBase"

This reverts commit 4c66f74b58e9a2c191f22a37f485047dd19be131.

These functions aren't ready to be moved yet till the remaining two are
finished, and they're so crossreferenced that the safest thing to do is
revert this commit and break it down to smaller chunks
---
 engines/dreamweb/dreambase.h  | 35 ----------------
 engines/dreamweb/monitor.cpp  | 12 ++++--
 engines/dreamweb/object.cpp   | 10 +++--
 engines/dreamweb/print.cpp    | 11 ++++-
 engines/dreamweb/stubs.cpp    | 54 ++++++++++++------------
 engines/dreamweb/stubs.h      | 95 +++++++++++++++++++++++++++++++++++++++----
 engines/dreamweb/use.cpp      |  3 +-
 engines/dreamweb/vgagrafx.cpp | 21 ++++++++++
 8 files changed, 162 insertions(+), 79 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index a4e3adfe42..c17a15e34a 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -595,41 +595,6 @@ public:
 	void errorMessage2();
 	void errorMessage3();
 	void decide();
-	void screenUpdate();
-	void mainScreen();
-	void walkAndExamine();
-	void autoLook();
-	void dumpWatch();
-	void watchCount();
-	void afterNewRoom();
-	void examineOb(bool examineAgain = true);
-	void walkIntoRoom();
-	void doLook();
-	void startup1();
-	void quickQuit();
-	void readOneBlock();
-	void seeCommandTail();
-	void quickQuit2();
-	void width160();
-	bool checkIfPerson(uint8 x, uint8 y);
-	bool checkIfFree(uint8 x, uint8 y);
-	bool checkIfEx(uint8 x, uint8 y);
-	void obName(uint8 command, uint8 commandType);
-	bool checkIfSet(uint8 x, uint8 y);
-	void readSetData();
-	void look();
-	void useKey();
-	void inventory();
-	void zoomOnOff();
-	void initialInv();
-	void allPointer();
-	void madmanRun();
-	void showGun();
-	void triggerMessage(uint16 index);
-	void processTrigger();
-	void identifyOb();
-	void signOn();
-	void searchForFiles(uint16 segment);
 
 	// from talk.cpp
 	void talk();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 5e84c82962..0caf4b7c25 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -233,7 +233,7 @@ void DreamBase::input() {
 }
 
 void DreamGenContext::makeCaps() {
-	al = DreamBase::makeCaps(al);
+	al = makeCaps(al);
 }
 
 byte DreamBase::makeCaps(byte c) {
@@ -312,6 +312,10 @@ void DreamBase::accessLightOff() {
 	multiDump(74, 182, 12, 8);
 }
 
+void DreamGenContext::randomAccess() {
+	randomAccess(cx);
+}
+
 void DreamBase::randomAccess(uint16 count) {
 	for (uint16 i = 0; i < count; ++i) {
 		vSync();
@@ -326,7 +330,7 @@ void DreamBase::randomAccess(uint16 count) {
 }
 
 void DreamGenContext::monMessage() {
-	DreamBase::monMessage(al);
+	monMessage(al);
 }
 
 void DreamBase::monMessage(uint8 index) {
@@ -547,7 +551,7 @@ void DreamGenContext::read() {
 	}
 }
 
-void DreamBase::signOn() {
+void DreamGenContext::signOn() {
 	const char *name = parser();
 
 	int8 foundIndex = -1;
@@ -605,7 +609,7 @@ void DreamBase::signOn() {
 	}
 }
 
-void DreamBase::searchForFiles(uint16 segment) {
+void DreamGenContext::searchForFiles(uint16 segment) {
 	const char *filesString = (const char *)getSegment(segment).ptr(kTextstart, 0);
 	byte curChar;
 
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 124a4f908d..4fa21e7618 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -78,6 +78,10 @@ void DreamBase::makeWorn(DynObject *object) {
 	object->id[1] = 'E'-'A';
 }
 
+void DreamGenContext::obToInv() {
+	obToInv(al, ah, di, bx);
+}
+
 void DreamBase::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 	showFrame(engine->icons1(), x - 2, y - 1, 10, 0);
 	if (index == 0xff)
@@ -116,7 +120,7 @@ void DreamBase::obIcons() {
 	showFrame(engine->icons2(), 260, 1, 1, 0);
 }
 
-void DreamBase::examineOb(bool examineAgain) {
+void DreamGenContext::examineOb(bool examineAgain) {
 	data.byte(kPointermode) = 0;
 	data.word(kTimecount) = 0;
 
@@ -213,7 +217,7 @@ void DreamBase::examineOb(bool examineAgain) {
 	data.byte(kOpenedob) = 255;
 }
 
-void DreamBase::inventory() {
+void DreamGenContext::inventory() {
 	if (data.byte(kMandead) == 1 || data.word(kWatchingtime) != 0) {
 		blank();
 		return;
@@ -308,7 +312,7 @@ void DreamBase::openOb() {
 	_openChangeSize = getOpenedSlotCount() * kItempicsize + kInventx;
 }
 
-void DreamBase::identifyOb() {
+void DreamGenContext::identifyOb() {
 	if (data.word(kWatchingtime) != 0) {
 		blank();
 		return;
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index d19a1931d2..0191aa8860 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -120,6 +120,15 @@ uint8 DreamBase::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWid
 	} while (true);
 }
 
+void DreamGenContext::printDirect() {
+	uint16 y = bx;
+	const uint8 *initialString = es.ptr(si, 0);
+	const uint8 *string = initialString;
+	al = DreamBase::printDirect(&string, di, &y, dl, (bool)(dl & 1));
+	si += (string - initialString);
+	bx = y;
+}
+
 uint8 DreamBase::printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 	return printDirect(&string, x, &y, maxWidth, centered);
 }
@@ -207,7 +216,7 @@ uint16 DreamBase::waitFrames() {
 void DreamGenContext::monPrint() {
 	uint16 originalBx = bx;
 	const char *string = (const char *)es.ptr(bx, 0);
-	const char *nextString = DreamBase::monPrint(string);
+	const char *nextString = monPrint(string);
 	bx = originalBx + (nextString - string);
 }
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 759f608cb3..ca98337261 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -651,7 +651,7 @@ bool DreamBase::quitRequested() {
 	return data.byte(kQuitrequested);
 }
 
-void DreamBase::screenUpdate() {
+void DreamGenContext::screenUpdate() {
 	newPlace();
 	mainScreen();
 	if (quitRequested())
@@ -722,7 +722,7 @@ void DreamBase::startup() {
 	atmospheres();
 }
 
-void DreamBase::startup1() {
+void DreamGenContext::startup1() {
 	clearPalette();
 	data.byte(kThroughdoor) = 0;
 
@@ -789,15 +789,15 @@ void DreamBase::hangOnCurs(uint16 frameCount) {
 	}
 }
 
-void DreamBase::seeCommandTail() {
+void DreamGenContext::seeCommandTail() {
 	data.byte(kBrightness) = 1;
 }
 
-void DreamBase::quickQuit() {
+void DreamGenContext::quickQuit() {
 	engine->quit();
 }
 
-void DreamBase::quickQuit2() {
+void DreamGenContext::quickQuit2() {
 	engine->quit();
 }
 
@@ -842,7 +842,7 @@ void DreamBase::putUnderTimed() {
 		multiPut(_underTimedText, data.byte(kTimedx), data.byte(kTimedy), 240, kUnderTimedTextSizeY);
 }
 
-void DreamBase::triggerMessage(uint16 index) {
+void DreamGenContext::triggerMessage(uint16 index) {
 	multiGet(mapStore(), 174, 153, 200, 63);
 	uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(index * 2);
 	const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
@@ -856,7 +856,7 @@ void DreamBase::triggerMessage(uint16 index) {
 	data.byte(kLasttrigger) = 0;
 }
 
-void DreamBase::processTrigger() {
+void DreamGenContext::processTrigger() {
 	if (data.byte(kLasttrigger) == '1') {
 		setLocation(8);
 		triggerMessage(45);
@@ -1145,7 +1145,7 @@ void DreamBase::commandOnly(uint8 command) {
 	data.byte(kNewtextline) = 1;
 }
 
-bool DreamBase::checkIfPerson(uint8 x, uint8 y) {
+bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
 	Common::List<People>::iterator i;
 	for (i = _peopleList.begin(); i != _peopleList.end(); ++i) {
 		People &people = *i;
@@ -1172,7 +1172,7 @@ bool DreamBase::checkIfPerson(uint8 x, uint8 y) {
 	return false;
 }
 
-bool DreamBase::checkIfFree(uint8 x, uint8 y) {
+bool DreamGenContext::checkIfFree(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _freeList.reverse_begin(); i != _freeList.end(); --i) {
 		const ObjPos &pos = *i;
@@ -1185,7 +1185,7 @@ bool DreamBase::checkIfFree(uint8 x, uint8 y) {
 	return false;
 }
 
-bool DreamBase::checkIfEx(uint8 x, uint8 y) {
+bool DreamGenContext::checkIfEx(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _exList.reverse_begin(); i != _exList.end(); --i) {
 		const ObjPos &pos = *i;
@@ -1393,7 +1393,7 @@ void DreamBase::getFlagUnderP(uint8 *flag, uint8 *flagEx) {
 	data.byte(kLastflag) = *flag;
 }
 
-void DreamBase::walkAndExamine() {
+void DreamGenContext::walkAndExamine() {
 	if (!finishedWalking())
 		return;
 	data.byte(kCommandtype) = data.byte(kWalkexamtype);
@@ -1403,7 +1403,7 @@ void DreamBase::walkAndExamine() {
 		examineOb();
 }
 
-void DreamBase::obName(uint8 command, uint8 commandType) {
+void DreamGenContext::obName(uint8 command, uint8 commandType) {
 	if (data.byte(kReasseschanges) == 0) {
 		if ((commandType == data.byte(kCommandtype)) && (command == data.byte(kCommand))) {
 			if (data.byte(kWalkandexam) == 1) {
@@ -1723,7 +1723,7 @@ void DreamBase::showIcon() {
 	}
 }
 
-bool DreamBase::checkIfSet(uint8 x, uint8 y) {
+bool DreamGenContext::checkIfSet(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _setList.reverse_begin(); i != _setList.end(); --i) {
 		const ObjPos &pos = *i;
@@ -1862,7 +1862,7 @@ void DreamBase::enterSymbol() {
 	}
 }
 
-void DreamBase::zoomOnOff() {
+void DreamGenContext::zoomOnOff() {
 	if (data.word(kWatchingtime) != 0 || data.byte(kPointermode) == 2) {
 		blank();
 		return;
@@ -1900,7 +1900,7 @@ void DreamBase::sortOutMap() {
 	}
 }
 
-void DreamBase::mainScreen() {
+void DreamGenContext::mainScreen() {
 	data.byte(kInmaparea) = 0;
 	if (data.byte(kWatchon) == 1) {
 		RectWithCallback<DreamGenContext> mainList[] = {
@@ -1937,7 +1937,7 @@ void DreamBase::showWatch() {
 	}
 }
 
-void DreamBase::dumpWatch() {
+void DreamGenContext::dumpWatch() {
 	if (data.byte(kWatchdump) != 1)
 		return;
 	multiDump(256, 21, 40, 12);
@@ -1965,7 +1965,7 @@ void DreamBase::showTime() {
 	showFrame(charset, 267+5, 21, 91*3+20, 0);
 }
 
-void DreamBase::watchCount() {
+void DreamGenContext::watchCount() {
 	if (data.byte(kWatchon) == 0)
 		return;
 	++data.byte(kTimercount);
@@ -2031,7 +2031,7 @@ void DreamBase::loadRoom() {
 	getDimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
 }
 
-void DreamBase::readSetData() {
+void DreamGenContext::readSetData() {
 	data.word(kCharset1) = standardLoad("DREAMWEB.C00");
 
 	void *icons1Buffer = standardLoadCPP("DREAMWEB.G00");
@@ -2070,7 +2070,7 @@ void DreamBase::findRoomInLoc() {
 	data.byte(kRoomnum) = roomNum;
 }
 
-void DreamBase::autoLook() {
+void DreamGenContext::autoLook() {
 	if ((data.word(kMousex) != data.word(kOldx)) || (data.word(kMousey) != data.word(kOldy))) {
 		data.word(kLookcounter) = 1000;
 		return;
@@ -2084,7 +2084,7 @@ void DreamBase::autoLook() {
 	doLook();
 }
 
-void DreamBase::look() {
+void DreamGenContext::look() {
 	if (data.word(kWatchingtime) || (data.byte(kPointermode) == 2)) {
 		blank();
 		return;
@@ -2097,7 +2097,7 @@ void DreamBase::look() {
 		doLook();
 }
 
-void DreamBase::doLook() {
+void DreamGenContext::doLook() {
 	createPanel();
 	showIcon();
 	underTextLine();
@@ -2721,7 +2721,7 @@ void DreamBase::pickupOb(uint8 command, uint8 pos) {
 	transferToEx(command);
 }
 
-void DreamBase::initialInv() {
+void DreamGenContext::initialInv() {
 	if (data.byte(kReallocation) != 24)
 		return;
 
@@ -2741,7 +2741,7 @@ void DreamBase::initialInv() {
 	switchRyanOff();
 }
 
-void DreamBase::walkIntoRoom() {
+void DreamGenContext::walkIntoRoom() {
 	if (data.byte(kLocation) == 14 && data.byte(kMapx) == 22) {
 		data.byte(kDestination) = 1;
 		data.byte(kFinaldest) = 1;
@@ -2785,7 +2785,7 @@ void DreamBase::blank() {
 	}
 }
 
-void DreamBase::allPointer() {
+void DreamGenContext::allPointer() {
 	readMouse();
 	showPointer();
 	dumpPointer();
@@ -3050,7 +3050,7 @@ void DreamBase::watchReel() {
 	plotReel(reelPointer);
 }
 
-void DreamBase::afterNewRoom() {
+void DreamGenContext::afterNewRoom() {
 	if (data.byte(kNowinnewroom) == 0)
 		return; // notnew
 
@@ -3081,7 +3081,7 @@ void DreamBase::afterNewRoom() {
 	atmospheres();
 }
 
-void DreamBase::madmanRun() {
+void DreamGenContext::madmanRun() {
 	if (data.byte(kLocation)    != 14 ||
 		data.byte(kMapx)        != 22 ||
 		data.byte(kPointermode) !=  2 ||
@@ -3147,7 +3147,7 @@ void DreamBase::decide() {
 	data.byte(kTextlen) = 240;
 }
 
-void DreamBase::showGun() {
+void DreamGenContext::showGun() {
 	data.byte(kAddtored) = 0;
 	data.byte(kAddtogreen) = 0;
 	data.byte(kAddtoblue) = 0;
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index c464163f68..7fa403bbb7 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -22,22 +22,101 @@
 #ifndef DREAMWEB_STUBS_H
 #define DREAMWEB_STUBS_H
 
-	void monMessage();
-	void monMessage(uint8 index) {
-		DreamBase::monMessage(index);
+	void screenUpdate();
+	void startup1();
+	void multiGet();
+	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height) {
+		DreamBase::multiGet(dst, x, y, width, height);
+	}
+	void multiPut();
+	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height) {
+		DreamBase::multiPut(src, x, y, width, height);
+	}
+	void multiDump();
+	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
+		DreamBase::multiDump(x, y, width, height);
+	}
+	void quickQuit();
+	void readOneBlock();
+	void seeCommandTail();
+	void quickQuit2();
+	void printDirect();
+	uint8 printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered) {
+		return DreamBase::printDirect(string, x, y, maxWidth, centered);
+	}
+	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
+		return DreamBase::printDirect(string, x, y, maxWidth, centered);
+	}
+	void width160();
+	bool checkIfPerson(uint8 x, uint8 y);
+	bool checkIfFree(uint8 x, uint8 y);
+	bool checkIfEx(uint8 x, uint8 y);
+	DynObject *getFreeAd(uint8 index) {
+		return DreamBase::getFreeAd(index);
+	}
+	DynObject *getExAd(uint8 index) {
+		return DreamBase::getExAd(index);
+	}
+	void *getAnyAd(uint8 *slotSize, uint8 *slotCount) {
+		return DreamBase::getAnyAd(slotSize, slotCount);
+	}
+	SetObject *getSetAd(uint8 index) {
+		return DreamBase::getSetAd(index);
+	}
+	void walkAndExamine();
+	void obName(uint8 command, uint8 commandType);
+
+	bool checkIfSet(uint8 x, uint8 y);
+	void obToInv();
+	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
+		DreamBase::obToInv(index, flag, x, y);
+	}
+	void useRoutine();
+	void examineOb(bool examineAgain = true);
+	void dumpWatch();
+	void watchCount();
+	void readSetData();
+	void useMon();
+	void makeCaps();
+	byte makeCaps(byte c) {
+		return DreamBase::makeCaps(c);
 	}
 	void monPrint();
 	const char *monPrint(const char *string) {
 		return DreamBase::monPrint(string);
 	}
-	void useRoutine();
+	void randomAccess();
+	void randomAccess(uint16 count) {
+		DreamBase::randomAccess(count);
+	}
+	void monMessage();
+	void monMessage(uint8 index) {
+		DreamBase::monMessage(index);
+	}
+	void look();
+	void autoLook();
+	void doLook();
+	void useKey();
 	void useObject();
-	void makeCaps();
-	void useMon();
-	void selectOb();
+	void singleKey(uint8 key, uint16 x, uint16 y);
+	void inventory();
+	void mainScreen();
+	void zoomOnOff();
+	void initialInv();
+	void walkIntoRoom();
+	void allPointer();
+	void afterNewRoom();
+	void madmanRun();
+	void showGun();
+	void triggerMessage(uint16 index);
+	void processTrigger();
 	bool execCommand();
+	void identifyOb();
+	void selectOb();
+	void getKeyAndLogo();
+	void signOn();
+	void searchForFiles(uint16 segment);
 	void read();
 	void dirCom();
-	void getKeyAndLogo();
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 0f31c766b5..25ed8d50e5 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1494,7 +1494,7 @@ void DreamBase::useAxe() {
 	removeObFromInv();
 }
 
-void DreamBase::useKey() {
+void DreamGenContext::useKey() {
 	switch(data.byte(kLocation)) {
 	case 5:
 	case 30:
@@ -1512,6 +1512,7 @@ void DreamBase::useKey() {
 		if (data.byte(kMapx) == 11 && data.byte(kMapy) == 10) {
 			showPuzText(3, 300);
 			data.byte(kNewlocation) = 30;
+			al = 2;
 			fadeScreenDown();
 			showFirstUse();
 			putBackObStuff();
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 06743ed3bb..ecb295a353 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -27,6 +27,13 @@
 
 namespace DreamGen {
 
+void DreamGenContext::multiGet() {
+	multiGet(ds.ptr(si, 0), di, bx, cl, ch);
+	si += cl * ch;
+	di += bx * kScreenwidth + kScreenwidth * ch;
+	cx = 0;
+}
+
 void DreamBase::multiGet(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
 	assert(x < 320);
 	assert(y < 200);
@@ -43,6 +50,13 @@ void DreamBase::multiGet(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
 	}
 }
 
+void DreamGenContext::multiPut() {
+	multiPut(ds.ptr(si, 0), di, bx, cl, ch);
+	si += cl * ch;
+	di += bx * kScreenwidth + kScreenwidth * ch;
+	cx = 0;
+}
+
 void DreamBase::multiPut(const uint8 *src, uint16 x, uint16 y, uint8 w, uint8 h) {
 	assert(x < 320);
 	assert(y < 200);
@@ -59,6 +73,13 @@ void DreamBase::multiPut(const uint8 *src, uint16 x, uint16 y, uint8 w, uint8 h)
 	}
 }
 
+void DreamGenContext::multiDump() {
+	multiDump(di, bx, cl, ch);
+	unsigned offset = di + bx * kScreenwidth;
+	si = di = offset + ch * kScreenwidth;
+	cx = 0;
+}
+
 void DreamBase::multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
 	unsigned offset = x + y * kScreenwidth;
 	//debug(1, "multiDump %ux%u(segment: %04x) -> %d,%d(address: %d)", w, h, (uint16)ds, x, y, offset);
-- 
cgit v1.2.3


From 9b51b138db7ccc8dbc55ca200f1a4aff688f6d89 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 26 Dec 2011 21:19:29 +0100
Subject: KYRA: Some formatting fixes.

---
 engines/kyra/animator_lok.cpp    |  22 +++---
 engines/kyra/debugger.cpp        |  52 +++++++-------
 engines/kyra/detection.cpp       |  32 +++++----
 engines/kyra/gui_lok.cpp         |  42 +++++------
 engines/kyra/gui_v1.cpp          |  16 ++---
 engines/kyra/items_lok.cpp       |  46 ++++++------
 engines/kyra/kyra_lok.cpp        |  52 +++++++-------
 engines/kyra/kyra_v1.cpp         |  24 +++----
 engines/kyra/resource.cpp        |  16 ++---
 engines/kyra/resource_intern.cpp |  10 +--
 engines/kyra/saveload_lok.cpp    |   2 +-
 engines/kyra/scene_lok.cpp       |  42 +++++------
 engines/kyra/scene_v1.cpp        |  14 ++--
 engines/kyra/screen_lok.cpp      |  62 ++++++++---------
 engines/kyra/script_lok.cpp      |  30 ++++----
 engines/kyra/script_v1.cpp       |   4 +-
 engines/kyra/seqplayer.cpp       |  17 +++--
 engines/kyra/sequences_lok.cpp   |   8 +--
 engines/kyra/staticres.cpp       | 147 ++++++++++++++++++++-------------------
 engines/kyra/text_lok.cpp        |  21 +++---
 engines/kyra/timer_lok.cpp       |   2 +-
 engines/kyra/wsamovie.cpp        |  10 +--
 22 files changed, 337 insertions(+), 334 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/animator_lok.cpp b/engines/kyra/animator_lok.cpp
index 4126681bbe..c246eebd46 100644
--- a/engines/kyra/animator_lok.cpp
+++ b/engines/kyra/animator_lok.cpp
@@ -100,7 +100,7 @@ void Animator_LoK::initAnimStateList() {
 	for (int i = 16; i < 28; ++i) {
 		animStates[i].index = i;
 		animStates[i].flags = 0;
-		animStates[i].background = _vm->_shapes[345+i];
+		animStates[i].background = _vm->_shapes[345 + i];
 		animStates[i].rectSize = _screen->getRectSize(3, 24);
 		animStates[i].width = 3;
 		animStates[i].height = 16;
@@ -352,10 +352,10 @@ void Animator_LoK::copyChangedObjectsForward(int refreshFlag) {
 		if (curObject->active) {
 			if (curObject->refreshFlag || refreshFlag) {
 				int xpos = 0, ypos = 0, width = 0, height = 0;
-				xpos = (curObject->x1>>3) - (curObject->width2>>3) - 1;
+				xpos = (curObject->x1 >> 3) - (curObject->width2 >> 3) - 1;
 				ypos = curObject->y1 - curObject->height2;
-				width = curObject->width + (curObject->width2>>3) + 2;
-				height = curObject->height + curObject->height2*2;
+				width = curObject->width + (curObject->width2 >> 3) + 2;
+				height = curObject->height + curObject->height2 * 2;
 
 				if (xpos < 1)
 					xpos = 1;
@@ -412,7 +412,7 @@ void Animator_LoK::animAddGameItem(int index, uint16 sceneId) {
 	animObj->refreshFlag = 1;
 	animObj->bkgdChangeFlag = 1;
 	animObj->drawY = currentRoom->itemsYPos[index];
-	animObj->sceneAnimPtr = _vm->_shapes[216+currentRoom->itemsTable[index]];
+	animObj->sceneAnimPtr = _vm->_shapes[216 + currentRoom->itemsTable[index]];
 	animObj->animFrameNumber = -1;
 	animObj->x1 = currentRoom->itemsXPos[index];
 	animObj->y1 = currentRoom->itemsYPos[index];
@@ -438,8 +438,8 @@ void Animator_LoK::animAddNPC(int character) {
 	animObj->bkgdChangeFlag = 1;
 	animObj->drawY = ch->y1;
 	animObj->sceneAnimPtr = _vm->_shapes[ch->currentAnimFrame];
-	animObj->x1 = animObj->x2 = ch->x1 + _vm->_defaultShapeTable[ch->currentAnimFrame-7].xOffset;
-	animObj->y1 = animObj->y2 = ch->y1 + _vm->_defaultShapeTable[ch->currentAnimFrame-7].yOffset;
+	animObj->x1 = animObj->x2 = ch->x1 + _vm->_defaultShapeTable[ch->currentAnimFrame - 7].xOffset;
+	animObj->y1 = animObj->y2 = ch->y1 + _vm->_defaultShapeTable[ch->currentAnimFrame - 7].yOffset;
 
 	if (ch->facing >= 1 && ch->facing <= 3)
 		animObj->flags |= 1;
@@ -543,13 +543,13 @@ void Animator_LoK::makeBrandonFaceMouse() {
 int16 Animator_LoK::fetchAnimWidth(const uint8 *shape, int16 mult) {
 	if (_vm->gameFlags().useAltShapeHeader)
 		shape += 2;
-	return (((int16)READ_LE_UINT16((shape+3))) * mult) >> 8;
+	return (((int16)READ_LE_UINT16((shape + 3))) * mult) >> 8;
 }
 
 int16 Animator_LoK::fetchAnimHeight(const uint8 *shape, int16 mult) {
 	if (_vm->gameFlags().useAltShapeHeader)
 		shape += 2;
-	return (int16)(((int8)*(shape+2)) * mult) >> 8;
+	return (int16)(((int8)*(shape + 2)) * mult) >> 8;
 }
 
 void Animator_LoK::setBrandonAnimSeqSize(int width, int height) {
@@ -603,8 +603,8 @@ void Animator_LoK::animRefreshNPC(int character) {
 		}
 	}
 
-	int xOffset = _vm->_defaultShapeTable[ch->currentAnimFrame-7].xOffset;
-	int yOffset = _vm->_defaultShapeTable[ch->currentAnimFrame-7].yOffset;
+	int xOffset = _vm->_defaultShapeTable[ch->currentAnimFrame - 7].xOffset;
+	int yOffset = _vm->_defaultShapeTable[ch->currentAnimFrame - 7].yOffset;
 
 	if (_vm->_scaleMode) {
 		animObj->x1 = ch->x1;
diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index 96003d9e99..95c6162c36 100644
--- a/engines/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
@@ -37,16 +37,16 @@ Debugger::Debugger(KyraEngine_v1 *vm)
 }
 
 void Debugger::initialize() {
-	DCmd_Register("continue",			WRAP_METHOD(Debugger, Cmd_Exit));
-	DCmd_Register("screen_debug_mode",	WRAP_METHOD(Debugger, cmd_setScreenDebug));
-	DCmd_Register("load_palette",		WRAP_METHOD(Debugger, cmd_loadPalette));
-	DCmd_Register("facings",			WRAP_METHOD(Debugger, cmd_showFacings));
-	DCmd_Register("gamespeed",			WRAP_METHOD(Debugger, cmd_gameSpeed));
-	DCmd_Register("flags",				WRAP_METHOD(Debugger, cmd_listFlags));
-	DCmd_Register("toggleflag",			WRAP_METHOD(Debugger, cmd_toggleFlag));
-	DCmd_Register("queryflag",			WRAP_METHOD(Debugger, cmd_queryFlag));
-	DCmd_Register("timers",				WRAP_METHOD(Debugger, cmd_listTimers));
-	DCmd_Register("settimercountdown",	WRAP_METHOD(Debugger, cmd_setTimerCountdown));
+	DCmd_Register("continue",           WRAP_METHOD(Debugger, Cmd_Exit));
+	DCmd_Register("screen_debug_mode",  WRAP_METHOD(Debugger, cmd_setScreenDebug));
+	DCmd_Register("load_palette",       WRAP_METHOD(Debugger, cmd_loadPalette));
+	DCmd_Register("facings",            WRAP_METHOD(Debugger, cmd_showFacings));
+	DCmd_Register("gamespeed",          WRAP_METHOD(Debugger, cmd_gameSpeed));
+	DCmd_Register("flags",              WRAP_METHOD(Debugger, cmd_listFlags));
+	DCmd_Register("toggleflag",         WRAP_METHOD(Debugger, cmd_toggleFlag));
+	DCmd_Register("queryflag",          WRAP_METHOD(Debugger, cmd_queryFlag));
+	DCmd_Register("timers",             WRAP_METHOD(Debugger, cmd_listTimers));
+	DCmd_Register("settimercountdown",  WRAP_METHOD(Debugger, cmd_setTimerCountdown));
 }
 
 bool Debugger::cmd_setScreenDebug(int argc, const char **argv) {
@@ -136,7 +136,7 @@ bool Debugger::cmd_gameSpeed(int argc, const char **argv) {
 }
 
 bool Debugger::cmd_listFlags(int argc, const char **argv) {
-	for (int i = 0, p = 0; i < (int)sizeof(_vm->_flagsTable)*8; i++, ++p) {
+	for (int i = 0, p = 0; i < (int)sizeof(_vm->_flagsTable) * 8; i++, ++p) {
 		DebugPrintf("(%-3i): %-2i", i, _vm->queryGameFlag(i));
 		if (p == 5) {
 			DebugPrintf("\n");
@@ -201,10 +201,10 @@ Debugger_LoK::Debugger_LoK(KyraEngine_LoK *vm)
 }
 
 void Debugger_LoK::initialize() {
-	DCmd_Register("enter",				WRAP_METHOD(Debugger_LoK, cmd_enterRoom));
-	DCmd_Register("scenes",				WRAP_METHOD(Debugger_LoK, cmd_listScenes));
-	DCmd_Register("give",				WRAP_METHOD(Debugger_LoK, cmd_giveItem));
-	DCmd_Register("birthstones",		WRAP_METHOD(Debugger_LoK, cmd_listBirthstones));
+	DCmd_Register("enter",              WRAP_METHOD(Debugger_LoK, cmd_enterRoom));
+	DCmd_Register("scenes",             WRAP_METHOD(Debugger_LoK, cmd_listScenes));
+	DCmd_Register("give",               WRAP_METHOD(Debugger_LoK, cmd_giveItem));
+	DCmd_Register("birthstones",        WRAP_METHOD(Debugger_LoK, cmd_listBirthstones));
 }
 
 bool Debugger_LoK::cmd_enterRoom(int argc, const char **argv) {
@@ -214,7 +214,7 @@ bool Debugger_LoK::cmd_enterRoom(int argc, const char **argv) {
 
 		// game will crash if entering a non-existent room
 		if (room >= _vm->_roomTableSize) {
-			DebugPrintf("room number must be any value between (including) 0 and %d\n", _vm->_roomTableSize-1);
+			DebugPrintf("room number must be any value between (including) 0 and %d\n", _vm->_roomTableSize - 1);
 			return true;
 		}
 
@@ -289,12 +289,12 @@ Debugger_v2::Debugger_v2(KyraEngine_v2 *vm) : Debugger(vm), _vm(vm) {
 }
 
 void Debugger_v2::initialize() {
-	DCmd_Register("character_info",		WRAP_METHOD(Debugger_v2, cmd_characterInfo));
-	DCmd_Register("enter",				WRAP_METHOD(Debugger_v2, cmd_enterScene));
-	DCmd_Register("scenes",				WRAP_METHOD(Debugger_v2, cmd_listScenes));
-	DCmd_Register("scene_info",			WRAP_METHOD(Debugger_v2, cmd_sceneInfo));
-	DCmd_Register("scene_to_facing",	WRAP_METHOD(Debugger_v2, cmd_sceneToFacing));
-	DCmd_Register("give",				WRAP_METHOD(Debugger_v2, cmd_giveItem));
+	DCmd_Register("character_info",     WRAP_METHOD(Debugger_v2, cmd_characterInfo));
+	DCmd_Register("enter",              WRAP_METHOD(Debugger_v2, cmd_enterScene));
+	DCmd_Register("scenes",             WRAP_METHOD(Debugger_v2, cmd_listScenes));
+	DCmd_Register("scene_info",         WRAP_METHOD(Debugger_v2, cmd_sceneInfo));
+	DCmd_Register("scene_to_facing",    WRAP_METHOD(Debugger_v2, cmd_sceneToFacing));
+	DCmd_Register("give",               WRAP_METHOD(Debugger_v2, cmd_giveItem));
 }
 
 bool Debugger_v2::cmd_enterScene(int argc, const char **argv) {
@@ -304,7 +304,7 @@ bool Debugger_v2::cmd_enterScene(int argc, const char **argv) {
 
 		// game will crash if entering a non-existent scene
 		if (scene >= _vm->_sceneListSize) {
-			DebugPrintf("scene number must be any value between (including) 0 and %d\n", _vm->_sceneListSize-1);
+			DebugPrintf("scene number must be any value between (including) 0 and %d\n", _vm->_sceneListSize - 1);
 			return true;
 		}
 
@@ -366,8 +366,8 @@ bool Debugger_v2::cmd_sceneInfo(int argc, const char **argv) {
 		DebugPrintf("This scene has %d special exits.\n", _vm->_specialExitCount);
 		for (int i = 0; i < _vm->_specialExitCount; ++i) {
 			DebugPrintf("SpecialExit%d: facing %d, position (x1/y1/x2/y2): %d/%d/%d/%d\n", i,
-					_vm->_specialExitTable[20+i], _vm->_specialExitTable[0+i], _vm->_specialExitTable[5+i],
-					_vm->_specialExitTable[10+i], _vm->_specialExitTable[15+i]);
+			            _vm->_specialExitTable[20 + i], _vm->_specialExitTable[0 + i], _vm->_specialExitTable[5 + i],
+			            _vm->_specialExitTable[10 + i], _vm->_specialExitTable[15 + i]);
 		}
 	}
 
@@ -444,7 +444,7 @@ Debugger_HoF::Debugger_HoF(KyraEngine_HoF *vm) : Debugger_v2(vm), _vm(vm) {
 }
 
 void Debugger_HoF::initialize() {
-	DCmd_Register("pass_codes",			WRAP_METHOD(Debugger_HoF, cmd_passcodes));
+	DCmd_Register("pass_codes",         WRAP_METHOD(Debugger_HoF, cmd_passcodes));
 }
 
 bool Debugger_HoF::cmd_passcodes(int argc, const char **argv) {
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 74c949b1d5..1a4fd3bd9d 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -45,7 +45,7 @@ struct KYRAGameDescription {
 
 namespace {
 
-const char * const directoryGlobs[] = {
+const char *const directoryGlobs[] = {
 	"malcolm",
 	0
 };
@@ -66,12 +66,12 @@ public:
 	const char *getOriginalCopyright() const {
 		return "The Legend of Kyrandia (C) Westwood Studios"
 #ifdef ENABLE_LOL
-				"\nLands of Lore (C) Westwood Studios"
+		       "\nLands of Lore (C) Westwood Studios"
 #endif
 #ifdef ENABLE_EOB
-				"\nEye of the Beholder (C) TSR, Inc., (C) Strategic Simulations, Inc."
+		       "\nEye of the Beholder (C) TSR, Inc., (C) Strategic Simulations, Inc."
 #endif
-		    ;
+		       ;
 	}
 
 	bool hasFeature(MetaEngineFeature f) const;
@@ -84,19 +84,19 @@ public:
 
 bool KyraMetaEngine::hasFeature(MetaEngineFeature f) const {
 	return
-		(f == kSupportsListSaves) ||
-		(f == kSupportsLoadingDuringStartup) ||
-		(f == kSupportsDeleteSave) ||
-		(f == kSavesSupportMetaInfo) ||
-		(f == kSavesSupportThumbnail);
+	    (f == kSupportsListSaves) ||
+	    (f == kSupportsLoadingDuringStartup) ||
+	    (f == kSupportsDeleteSave) ||
+	    (f == kSavesSupportMetaInfo) ||
+	    (f == kSavesSupportThumbnail);
 }
 
 bool Kyra::KyraEngine_v1::hasFeature(EngineFeature f) const {
 	return
-		(f == kSupportsRTL) ||
-		(f == kSupportsLoadingDuringRuntime) ||
-		(f == kSupportsSavingDuringRuntime) ||
-		(f == kSupportsSubtitleOptions);
+	    (f == kSupportsRTL) ||
+	    (f == kSupportsLoadingDuringRuntime) ||
+	    (f == kSupportsSavingDuringRuntime) ||
+	    (f == kSupportsSubtitleOptions);
 }
 
 bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
@@ -159,7 +159,7 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const {
 
 	Common::StringArray filenames;
 	filenames = saveFileMan->listSavefiles(pattern);
-	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) {
@@ -189,7 +189,9 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const {
 	return saveList;
 }
 
-int KyraMetaEngine::getMaximumSaveSlot() const { return 999; }
+int KyraMetaEngine::getMaximumSaveSlot() const {
+	return 999;
+}
 
 void KyraMetaEngine::removeSaveState(const char *target, int slot) const {
 	// In Kyra games slot 0 can't be deleted, it's for restarting the game(s).
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp
index 2a2828d45a..18470e5d76 100644
--- a/engines/kyra/gui_lok.cpp
+++ b/engines/kyra/gui_lok.cpp
@@ -62,7 +62,7 @@ int KyraEngine_LoK::buttonInventoryCallback(Button *caller) {
 			snd_playSoundEffect(0x35);
 			_screen->hideMouse();
 			_screen->fillRect(_itemPosX[itemOffset], _itemPosY[itemOffset], _itemPosX[itemOffset] + 15, _itemPosY[itemOffset] + 15, _flags.platform == Common::kPlatformAmiga ? 19 : 12);
-			_screen->drawShape(0, _shapes[216+_itemInHand], _itemPosX[itemOffset], _itemPosY[itemOffset], 0, 0);
+			_screen->drawShape(0, _shapes[216 + _itemInHand], _itemPosX[itemOffset], _itemPosY[itemOffset], 0, 0);
 			setMouseItem(inventoryItem);
 			// TODO: Proper support for both taken strings in Amiga version
 			if (_flags.platform == Common::kPlatformAmiga)
@@ -75,7 +75,7 @@ int KyraEngine_LoK::buttonInventoryCallback(Button *caller) {
 		} else {
 			snd_playSoundEffect(0x32);
 			_screen->hideMouse();
-			_screen->drawShape(0, _shapes[216+_itemInHand], _itemPosX[itemOffset], _itemPosY[itemOffset], 0, 0);
+			_screen->drawShape(0, _shapes[216 + _itemInHand], _itemPosX[itemOffset], _itemPosY[itemOffset], 0, 0);
 			_screen->setMouseCursor(1, 1, _shapes[0]);
 			updateSentenceCommand(_itemList[getItemListIndex(_itemInHand)], _placedList[0], 179);
 			_screen->showMouse();
@@ -107,7 +107,7 @@ int KyraEngine_LoK::buttonAmuletCallback(Button *caller) {
 		characterSays(2001, _waitForAmulet[0], 0, -2);
 		return 1;
 	}
-	if (!queryGameFlag(0x55+jewel)) {
+	if (!queryGameFlag(0x55 + jewel)) {
 		assert(_blackJewel);
 		_animator->makeBrandonFaceMouse();
 		drawJewelPress(jewel, 1);
@@ -130,7 +130,7 @@ int KyraEngine_LoK::buttonAmuletCallback(Button *caller) {
 		return 1;
 
 	_unkAmuletVar = 1;
-	switch (jewel-1) {
+	switch (jewel - 1) {
 	case 0:
 		if (_brandonStatusBit & 1) {
 			seq_brandonHealing2();
@@ -198,7 +198,7 @@ GUI_LoK::~GUI_LoK() {
 }
 
 void GUI_LoK::createScreenThumbnail(Graphics::Surface &dst) {
-	uint8 *screen = new uint8[Screen::SCREEN_W*Screen::SCREEN_H];
+	uint8 *screen = new uint8[Screen::SCREEN_W * Screen::SCREEN_H];
 	if (screen) {
 		_screen->queryPageFromDisk("SEENPAGE.TMP", 0, screen);
 		uint8 screenPal[768];
@@ -579,7 +579,7 @@ void GUI_LoK::setupSavegames(Menu &menu, int num) {
 			// Trim long GMM save descriptions to fit our save slots
 			_screen->_charWidth = -2;
 			int fC = _screen->getTextWidth(_savegameNames[i]);
-			while (_savegameNames[i][0] && (fC > 240 )) {
+			while (_savegameNames[i][0] && (fC > 240)) {
 				_savegameNames[i][strlen(_savegameNames[i]) - 1] = 0;
 				fC = _screen->getTextWidth(_savegameNames[i]);
 			}
@@ -605,7 +605,7 @@ int GUI_LoK::saveGameMenu(Button *button) {
 	_screen->savePageToDisk("SEENPAGE.TMP", 0);
 
 	_menu[2].menuNameString = _vm->_guiStrings[8]; // Select a position to save to:
-	_specialSavegameString = _vm->_guiStrings[_vm->gameFlags().platform == Common::kPlatformPC98 ? 10: 9]; // [ EMPTY SLOT ]
+	_specialSavegameString = _vm->_guiStrings[_vm->gameFlags().platform == Common::kPlatformPC98 ? 10 : 9]; // [ EMPTY SLOT ]
 	for (int i = 0; i < 5; i++)
 		_menu[2].item[i].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::saveGame);
 
@@ -710,15 +710,15 @@ void GUI_LoK::updateSavegameString() {
 		Util::convertISOToDOS(inputKey);
 
 		if ((uint8)inputKey > 31 && (uint8)inputKey < (_vm->gameFlags().lang == Common::JA_JPN ? 128 : 226)) {
-			if ((length < ARRAYSIZE(_savegameName)-1) && (width <= 240)) {
+			if ((length < ARRAYSIZE(_savegameName) - 1) && (width <= 240)) {
 				_savegameName[length] = inputKey;
-				_savegameName[length+1] = 0;
+				_savegameName[length + 1] = 0;
 				redrawTextfield();
 			}
 		} else if (_keyPressed.keycode == Common::KEYCODE_BACKSPACE ||
 		           _keyPressed.keycode == Common::KEYCODE_DELETE) {
 			if (length > 0) {
-				_savegameName[length-1] = 0;
+				_savegameName[length - 1] = 0;
 				redrawTextfield();
 			}
 		} else if (_keyPressed.keycode == Common::KEYCODE_RETURN ||
@@ -733,7 +733,7 @@ void GUI_LoK::updateSavegameString() {
 int GUI_LoK::saveGame(Button *button) {
 	g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
 	updateMenuButton(button);
-	_vm->_gameToLoad = _menu[2].item[button->index-0xC].saveSlot;
+	_vm->_gameToLoad = _menu[2].item[button->index - 0xC].saveSlot;
 
 	_screen->loadPageFromDisk("SEENPAGE.TMP", 0);
 	_screen->savePageToDisk("SEENPAGE.TMP", 0);
@@ -800,7 +800,7 @@ int GUI_LoK::savegameConfirm(Button *button) {
 int GUI_LoK::loadGame(Button *button) {
 	updateMenuButton(button);
 	_displaySubMenu = false;
-	_vm->_gameToLoad = _menu[2].item[button->index-0xC].saveSlot;
+	_vm->_gameToLoad = _menu[2].item[button->index - 0xC].saveSlot;
 
 	return 0;
 }
@@ -914,15 +914,15 @@ int GUI_LoK::gameControlsMenu(Button *button) {
 
 void GUI_LoK::setupControls(Menu &menu) {
 	switch (_vm->_configMusic) {
-		case 0:
-			menu.item[0].itemString = _offString; //"Off"
-			break;
-		case 1:
-			menu.item[0].itemString = _onString; //"On"
-			break;
-		case 2:
-			menu.item[0].itemString = _onCDString; //"On + CD"
-			break;
+	case 0:
+		menu.item[0].itemString = _offString; //"Off"
+		break;
+	case 1:
+		menu.item[0].itemString = _onString; //"On"
+		break;
+	case 2:
+		menu.item[0].itemString = _onCDString; //"On + CD"
+		break;
 	}
 
 	if (_vm->_configSounds)
diff --git a/engines/kyra/gui_v1.cpp b/engines/kyra/gui_v1.cpp
index ab441878a6..f3459ddfe3 100644
--- a/engines/kyra/gui_v1.cpp
+++ b/engines/kyra/gui_v1.cpp
@@ -224,7 +224,7 @@ void GUI_v1::processHighlights(Menu &menu) {
 		y2 = y1 + menu.item[i].height;
 
 		if (mouseX > x1 && mouseX < x2 &&
-			mouseY > y1 && mouseY < y2) {
+		        mouseY > y1 && mouseY < y2) {
 
 			if (menu.highlightedItem != i || _vm->game() == GI_LOL) {
 				if (_vm->game() != GI_LOL) {
@@ -584,15 +584,15 @@ void MainMenu::drawBox(int x, int y, int w, int h, int fill) {
 	--w; --h;
 
 	if (fill)
-		_screen->fillRect(x, y, x+w, y+h, _static.colorTable[0]);
+		_screen->fillRect(x, y, x + w, y + h, _static.colorTable[0]);
 
-	_screen->drawClippedLine(x, y+h, x+w, y+h, _static.colorTable[1]);
-	_screen->drawClippedLine(x+w, y, x+w, y+h, _static.colorTable[1]);
-	_screen->drawClippedLine(x, y, x+w, y, _static.colorTable[2]);
-	_screen->drawClippedLine(x, y, x, y+h, _static.colorTable[2]);
+	_screen->drawClippedLine(x, y + h, x + w, y + h, _static.colorTable[1]);
+	_screen->drawClippedLine(x + w, y, x + w, y + h, _static.colorTable[1]);
+	_screen->drawClippedLine(x, y, x + w, y, _static.colorTable[2]);
+	_screen->drawClippedLine(x, y, x, y + h, _static.colorTable[2]);
 
-	_screen->setPagePixel(_screen->_curPage, x, y+h, _static.colorTable[3]);
-	_screen->setPagePixel(_screen->_curPage, x+w, y, _static.colorTable[3]);
+	_screen->setPagePixel(_screen->_curPage, x, y + h, _static.colorTable[3]);
+	_screen->setPagePixel(_screen->_curPage, x + w, y, _static.colorTable[3]);
 }
 
 void MainMenu::printString(const char *format, int x, int y, int col1, int col2, int flags, ...) {
diff --git a/engines/kyra/items_lok.cpp b/engines/kyra/items_lok.cpp
index 7e41811441..2937038463 100644
--- a/engines/kyra/items_lok.cpp
+++ b/engines/kyra/items_lok.cpp
@@ -38,7 +38,7 @@ int KyraEngine_LoK::findDuplicateItemShape(int shape) {
 
 	while (dupTable[i] != 0xFF) {
 		if (dupTable[i] == shape)
-			return dupTable[i+1];
+			return dupTable[i + 1];
 		i += 2;
 	}
 	return -1;
@@ -180,7 +180,7 @@ void KyraEngine_LoK::setMouseItem(Item item) {
 	if (item == kItemNone)
 		_screen->setMouseCursor(1, 1, _shapes[6]);
 	else
-		_screen->setMouseCursor(8, 15, _shapes[216+item]);
+		_screen->setMouseCursor(8, 15, _shapes[216 + item]);
 }
 
 void KyraEngine_LoK::wipeDownMouseItem(int xpos, int ypos) {
@@ -196,16 +196,16 @@ void KyraEngine_LoK::wipeDownMouseItem(int xpos, int ypos) {
 
 	while (height >= 0) {
 		restoreItemRect1(xpos, ypos);
-		_screen->setNewShapeHeight(_shapes[216+_itemInHand], height);
+		_screen->setNewShapeHeight(_shapes[216 + _itemInHand], height);
 		uint32 nextTime = _system->getMillis() + 1 * _tickLength;
-		_screen->drawShape(0, _shapes[216+_itemInHand], xpos, y, 0, 0);
+		_screen->drawShape(0, _shapes[216 + _itemInHand], xpos, y, 0, 0);
 		_screen->updateScreen();
 		y += 2;
 		height -= 2;
 		delayUntil(nextTime);
 	}
 	restoreItemRect1(xpos, ypos);
-	_screen->resetShapeHeight(_shapes[216+_itemInHand]);
+	_screen->resetShapeHeight(_shapes[216 + _itemInHand]);
 	removeHandItem();
 	_screen->showMouse();
 }
@@ -517,7 +517,7 @@ void KyraEngine_LoK::itemDropDown(int x, int y, int destX, int destY, byte freeI
 			drawY = tempY - 16;
 			backUpItemRect0(drawX, drawY);
 			uint32 nextTime = _system->getMillis() + 1 * _tickLength;
-			_screen->drawShape(0, _shapes[216+item], drawX, drawY, 0, 0);
+			_screen->drawShape(0, _shapes[216 + item], drawX, drawY, 0, 0);
 			_screen->updateScreen();
 			delayUntil(nextTime);
 		}
@@ -554,7 +554,7 @@ void KyraEngine_LoK::itemDropDown(int x, int y, int destX, int destY, byte freeI
 				drawY = tempY - 16;
 				backUpItemRect0(drawX, drawY);
 				uint32 nextTime = _system->getMillis() + 1 * _tickLength;
-				_screen->drawShape(0, _shapes[216+item], drawX, drawY, 0, 0);
+				_screen->drawShape(0, _shapes[216 + item], drawX, drawY, 0, 0);
 				_screen->updateScreen();
 				delayUntil(nextTime);
 			}
@@ -597,7 +597,7 @@ void KyraEngine_LoK::itemSpecialFX(int x, int y, int item) {
 }
 
 void KyraEngine_LoK::itemSpecialFX1(int x, int y, int item) {
-	uint8 *shape = _shapes[216+item];
+	uint8 *shape = _shapes[216 + item];
 	x -= 8;
 	int startY = y;
 	y -= 15;
@@ -635,7 +635,7 @@ void KyraEngine_LoK::itemSpecialFX2(int x, int y, int item) {
 	for (int i = 204; i >= 201; --i) {
 		restoreItemRect0(x, y);
 		uint32 nextTime = _system->getMillis() + 3 * _tickLength;
-		_screen->drawShape(0, _shapes[216+item], x, y, 0, 0);
+		_screen->drawShape(0, _shapes[216 + item], x, y, 0, 0);
 		_screen->drawShape(0, _shapes[i], x, y + yAdd, 0, 0);
 		_screen->updateScreen();
 		delayUntil(nextTime);
@@ -687,7 +687,7 @@ void KyraEngine_LoK::magicOutMouseItem(int animIndex, int itemPos) {
 	for (int shape = _magicMouseItemStartFrame[animIndex]; shape <= _magicMouseItemEndFrame[animIndex]; ++shape) {
 		restoreItemRect1(x, y);
 		uint32 nextTime = _system->getMillis() + 4 * _tickLength;
-		_screen->drawShape(0, _shapes[216+_itemInHand], x + 4, y + 3, 0, 0);
+		_screen->drawShape(0, _shapes[216 + _itemInHand], x + 4, y + 3, 0, 0);
 		if (tableIndex == -1)
 			_screen->drawShape(0, _shapes[shape], x, y, 0, 0);
 		else
@@ -705,7 +705,7 @@ void KyraEngine_LoK::magicOutMouseItem(int animIndex, int itemPos) {
 	for (int shape = _magicMouseItemStartFrame2[animIndex]; shape <= _magicMouseItemEndFrame2[animIndex]; ++shape) {
 		restoreItemRect1(x, y);
 		uint32 nextTime = _system->getMillis() + 4 * _tickLength;
-		_screen->drawShape(0, _shapes[216+_itemInHand], x + 4, y + 3, 0, 0);
+		_screen->drawShape(0, _shapes[216 + _itemInHand], x + 4, y + 3, 0, 0);
 		if (tableIndex == -1)
 			_screen->drawShape(0, _shapes[shape], x, y, 0, 0);
 		else
@@ -789,12 +789,12 @@ void KyraEngine_LoK::magicInMouseItem(int animIndex, int item, int itemPos) {
 	}
 	restoreItemRect1(x, y);
 	if (itemPos == -1) {
-		_screen->setMouseCursor(8, 15, _shapes[216+item]);
+		_screen->setMouseCursor(8, 15, _shapes[216 + item]);
 		_itemInHand = item;
 	} else {
 		_characterList[0].inventoryItems[itemPos] = item;
 		_screen->hideMouse();
-		_screen->drawShape(0, _shapes[216+item], _itemPosX[itemPos], _itemPosY[itemPos], 0, 0);
+		_screen->drawShape(0, _shapes[216 + item], _itemPosX[itemPos], _itemPosY[itemPos], 0, 0);
 		_screen->showMouse();
 	}
 	_screen->showMouse();
@@ -847,7 +847,7 @@ void KyraEngine_LoK::updatePlayerItemsForScene() {
 		if (_itemInHand > 33)
 			_itemInHand = 33;
 		_screen->hideMouse();
-		_screen->setMouseCursor(8, 15, _shapes[216+_itemInHand]);
+		_screen->setMouseCursor(8, 15, _shapes[216 + _itemInHand]);
 		_screen->showMouse();
 	}
 
@@ -890,7 +890,7 @@ void KyraEngine_LoK::redrawInventory(int page) {
 
 		if (_currentCharacter->inventoryItems[i] != kItemNone) {
 			uint8 item = _currentCharacter->inventoryItems[i];
-			_screen->drawShape(page, _shapes[216+item], _itemPosX[i], _itemPosY[i], 0, 0);
+			_screen->drawShape(page, _shapes[216 + item], _itemPosX[i], _itemPosY[i], 0, 0);
 		}
 	}
 	_screen->showMouse();
@@ -899,23 +899,23 @@ void KyraEngine_LoK::redrawInventory(int page) {
 }
 
 void KyraEngine_LoK::backUpItemRect0(int xpos, int ypos) {
-	_screen->rectClip(xpos, ypos, 3<<3, 24);
-	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 3<<3, 24, _itemBkgBackUp[0]);
+	_screen->rectClip(xpos, ypos, 3 << 3, 24);
+	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 3 << 3, 24, _itemBkgBackUp[0]);
 }
 
 void KyraEngine_LoK::restoreItemRect0(int xpos, int ypos) {
-	_screen->rectClip(xpos, ypos, 3<<3, 24);
-	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 3<<3, 24, _itemBkgBackUp[0]);
+	_screen->rectClip(xpos, ypos, 3 << 3, 24);
+	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 3 << 3, 24, _itemBkgBackUp[0]);
 }
 
 void KyraEngine_LoK::backUpItemRect1(int xpos, int ypos) {
-	_screen->rectClip(xpos, ypos, 4<<3, 32);
-	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 4<<3, 32, _itemBkgBackUp[1]);
+	_screen->rectClip(xpos, ypos, 4 << 3, 32);
+	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 4 << 3, 32, _itemBkgBackUp[1]);
 }
 
 void KyraEngine_LoK::restoreItemRect1(int xpos, int ypos) {
-	_screen->rectClip(xpos, ypos, 4<<3, 32);
-	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 4<<3, 32, _itemBkgBackUp[1]);
+	_screen->rectClip(xpos, ypos, 4 << 3, 32);
+	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 4 << 3, 32, _itemBkgBackUp[1]);
 }
 
 int KyraEngine_LoK::getItemListIndex(Item item) {
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index 84990bcfb8..c195f0275a 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -40,8 +40,8 @@ namespace Kyra {
 KyraEngine_LoK::KyraEngine_LoK(OSystem *system, const GameFlags &flags)
 	: KyraEngine_v1(system, flags) {
 
-	_seq_Forest = _seq_KallakWriting = _seq_KyrandiaLogo = _seq_KallakMalcolm =
-	_seq_MalcolmTree = _seq_WestwoodLogo = _seq_Demo1 = _seq_Demo2 = _seq_Demo3 =
+	_seq_Forest = _seq_KallakWriting = _seq_KyrandiaLogo = _seq_KallakMalcolm = 0;
+	_seq_MalcolmTree = _seq_WestwoodLogo = _seq_Demo1 = _seq_Demo2 = _seq_Demo3 = 0;
 	_seq_Demo4 = 0;
 
 	_seq_WSATable = _seq_CPSTable = _seq_COLTable = _seq_textsTable = 0;
@@ -215,7 +215,7 @@ Common::Error KyraEngine_LoK::init() {
 	_currentCharacter = 0;
 	_characterList = new Character[11];
 	assert(_characterList);
-	memset(_characterList, 0, sizeof(Character)*11);
+	memset(_characterList, 0, sizeof(Character) * 11);
 
 	for (int i = 0; i < 11; ++i)
 		memset(_characterList[i].inventoryItems, 0xFF, sizeof(_characterList[i].inventoryItems));
@@ -370,7 +370,7 @@ void KyraEngine_LoK::startup() {
 	// XXX
 	for (int i = 0; i < 12; ++i) {
 		int size = _screen->getRectSize(3, 24);
-		_shapes[361+i] = new byte[size];
+		_shapes[361 + i] = new byte[size];
 	}
 
 	_itemBkgBackUp[0] = new uint8[_screen->getRectSize(3, 24)];
@@ -582,23 +582,23 @@ void KyraEngine_LoK::setupShapes123(const Shape *shapeTable, int endShape, int f
 
 	uint8 curImage = 0xFF;
 	int curPageBackUp = _screen->_curPage;
-	_screen->_curPage = 8;	// we are using page 8 here in the original page 2 was backuped and then used for this stuff
+	_screen->_curPage = 8;  // we are using page 8 here in the original page 2 was backuped and then used for this stuff
 	int shapeFlags = 2;
 	if (flags)
 		shapeFlags = 3;
-	for (int i = 123; i < 123+endShape; ++i) {
-		uint8 newImage = shapeTable[i-123].imageIndex;
+	for (int i = 123; i < 123 + endShape; ++i) {
+		uint8 newImage = shapeTable[i - 123].imageIndex;
 		if (newImage != curImage && newImage != 0xFF) {
 			assert(_characterImageTable);
 			_screen->loadBitmap(_characterImageTable[newImage], 8, 8, 0);
 			curImage = newImage;
 		}
-		_shapes[i] = _screen->encodeShape(shapeTable[i-123].x<<3, shapeTable[i-123].y, shapeTable[i-123].w<<3, shapeTable[i-123].h, shapeFlags);
-		assert(i-7 < _defaultShapeTableSize);
-		_defaultShapeTable[i-7].xOffset = shapeTable[i-123].xOffset;
-		_defaultShapeTable[i-7].yOffset = shapeTable[i-123].yOffset;
-		_defaultShapeTable[i-7].w = shapeTable[i-123].w;
-		_defaultShapeTable[i-7].h = shapeTable[i-123].h;
+		_shapes[i] = _screen->encodeShape(shapeTable[i - 123].x << 3, shapeTable[i - 123].y, shapeTable[i - 123].w << 3, shapeTable[i - 123].h, shapeFlags);
+		assert(i - 7 < _defaultShapeTableSize);
+		_defaultShapeTable[i - 7].xOffset = shapeTable[i - 123].xOffset;
+		_defaultShapeTable[i - 7].yOffset = shapeTable[i - 123].yOffset;
+		_defaultShapeTable[i - 7].w = shapeTable[i - 123].w;
+		_defaultShapeTable[i - 7].h = shapeTable[i - 123].h;
 	}
 	_screen->_curPage = curPageBackUp;
 }
@@ -788,7 +788,7 @@ void KyraEngine_LoK::updateMousePointer(bool forceUpdate) {
 	}
 
 	if (mouse.x >= _entranceMouseCursorTracks[0] && mouse.y >= _entranceMouseCursorTracks[1]
-		&& mouse.x <= _entranceMouseCursorTracks[2] && mouse.y <= _entranceMouseCursorTracks[3]) {
+	        && mouse.x <= _entranceMouseCursorTracks[2] && mouse.y <= _entranceMouseCursorTracks[3]) {
 		switch (_entranceMouseCursorTracks[4]) {
 		case 0:
 			newMouseState = -6;
@@ -844,7 +844,7 @@ void KyraEngine_LoK::updateMousePointer(bool forceUpdate) {
 				if (_itemInHand == kItemNone)
 					_screen->setMouseCursor(1, 1, _shapes[0]);
 				else
-					_screen->setMouseCursor(8, 15, _shapes[216+_itemInHand]);
+					_screen->setMouseCursor(8, 15, _shapes[216 + _itemInHand]);
 				_screen->showMouse();
 			}
 		}
@@ -884,8 +884,8 @@ int KyraEngine_LoK::checkForNPCScriptRun(int xpos, int ypos) {
 	int charLeft = 0, charRight = 0, charTop = 0, charBottom = 0;
 
 	int scaleFactor = _scaleTable[currentChar->y1];
-	int addX = (((scaleFactor*8)*3)>>8)>>1;
-	int addY = ((scaleFactor*3)<<4)>>8;
+	int addX = (((scaleFactor * 8) * 3) >> 8) >> 1;
+	int addY = ((scaleFactor * 3) << 4) >> 8;
 
 	charLeft = currentChar->x1 - addX;
 	charRight = currentChar->x1 + addX;
@@ -908,7 +908,7 @@ int KyraEngine_LoK::checkForNPCScriptRun(int xpos, int ypos) {
 		charRight = currentChar->x1 + 11;
 		charTop = currentChar->y1 - 48;
 		// if (!i)
-		//	charBottom = currentChar->y2 - 16;
+		//  charBottom = currentChar->y2 - 16;
 		// else
 		charBottom = currentChar->y1;
 
@@ -968,13 +968,13 @@ void KyraEngine_LoK::readSettings() {
 	// The default talk speed is 60. This should be mapped to "Normal".
 
 	if (talkspeed == 0)
-		_configTextspeed = 3;	// Clickable
+		_configTextspeed = 3;   // Clickable
 	if (talkspeed <= 50)
-		_configTextspeed = 0;	// Slow
+		_configTextspeed = 0;   // Slow
 	else if (talkspeed <= 150)
-		_configTextspeed = 1;	// Normal
+		_configTextspeed = 1;   // Normal
 	else
-		_configTextspeed = 2;	// Fast
+		_configTextspeed = 2;   // Fast
 
 	KyraEngine_v1::readSettings();
 }
@@ -983,16 +983,16 @@ void KyraEngine_LoK::writeSettings() {
 	int talkspeed;
 
 	switch (_configTextspeed) {
-	case 0:		// Slow
+	case 0:     // Slow
 		talkspeed = 1;
 		break;
-	case 1:		// Normal
+	case 1:     // Normal
 		talkspeed = 60;
 		break;
-	case 2:		// Fast
+	case 2:     // Fast
 		talkspeed = 255;
 		break;
-	default:	// Clickable
+	default:    // Clickable
 		talkspeed = 0;
 	}
 
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index b818243a08..e60913ca6e 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -211,7 +211,7 @@ Common::Error KyraEngine_v1::init() {
 }
 
 KyraEngine_v1::~KyraEngine_v1() {
-	for (Common::Array<const Opcode*>::iterator i = _opcodes.begin(); i != _opcodes.end(); ++i)
+	for (Common::Array<const Opcode *>::iterator i = _opcodes.begin(); i != _opcodes.end(); ++i)
 		delete *i;
 	_opcodes.clear();
 	_keyMap.clear();
@@ -262,7 +262,7 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
 		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
 			if (event.kbd.keycode >= Common::KEYCODE_1 && event.kbd.keycode <= Common::KEYCODE_9 &&
-					(event.kbd.hasFlags(Common::KBD_CTRL) || event.kbd.hasFlags(Common::KBD_ALT)) && mainLoop) {
+			        (event.kbd.hasFlags(Common::KBD_CTRL) || event.kbd.hasFlags(Common::KBD_ALT)) && mainLoop) {
 				int saveLoadSlot = 9 - (event.kbd.keycode - Common::KEYCODE_0) + 990;
 
 				if (event.kbd.hasFlags(Common::KBD_CTRL)) {
@@ -440,10 +440,10 @@ void KyraEngine_v1::updateInput() {
 		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
 			if (event.kbd.keycode == Common::KEYCODE_PERIOD || event.kbd.keycode == Common::KEYCODE_ESCAPE ||
-				event.kbd.keycode == Common::KEYCODE_SPACE || event.kbd.keycode == Common::KEYCODE_RETURN ||
-				event.kbd.keycode == Common::KEYCODE_UP || event.kbd.keycode == Common::KEYCODE_RIGHT ||
-				event.kbd.keycode == Common::KEYCODE_DOWN || event.kbd.keycode == Common::KEYCODE_LEFT)
-					_eventList.push_back(Event(event, true));
+			        event.kbd.keycode == Common::KEYCODE_SPACE || event.kbd.keycode == Common::KEYCODE_RETURN ||
+			        event.kbd.keycode == Common::KEYCODE_UP || event.kbd.keycode == Common::KEYCODE_RIGHT ||
+			        event.kbd.keycode == Common::KEYCODE_DOWN || event.kbd.keycode == Common::KEYCODE_LEFT)
+				_eventList.push_back(Event(event, true));
 			else if (event.kbd.keycode == Common::KEYCODE_q && event.kbd.hasFlags(Common::KBD_CTRL))
 				quitGame();
 			else
@@ -574,11 +574,11 @@ void KyraEngine_v1::readSettings() {
 	bool subtitles = ConfMan.getBool("subtitles");
 
 	if (!speechMute && subtitles)
-		_configVoice = 2;	// Voice & Text
+		_configVoice = 2;   // Voice & Text
 	else if (!speechMute && !subtitles)
-		_configVoice = 1;	// Voice only
+		_configVoice = 1;   // Voice only
 	else
-		_configVoice = 0;	// Text only
+		_configVoice = 0;   // Text only
 
 	setWalkspeed(_configWalkspeed);
 }
@@ -593,15 +593,15 @@ void KyraEngine_v1::writeSettings() {
 	ConfMan.setBool("sfx_mute", _configSounds == 0);
 
 	switch (_configVoice) {
-	case 0:		// Text only
+	case 0:     // Text only
 		speechMute = true;
 		subtitles = true;
 		break;
-	case 1:		// Voice only
+	case 1:     // Voice only
 		speechMute = false;
 		subtitles = false;
 		break;
-	default:	// Voice & Text
+	default:    // Voice & Text
 		speechMute = false;
 		subtitles = true;
 	}
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index e1b72275c3..adb3063344 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -66,7 +66,7 @@ bool Resource::reset() {
 
 		if (!_vm->gameFlags().isDemo && _vm->gameFlags().isTalkie) {
 			// List of files in the talkie version, which can never be unload.
-			static const char * const list[] = {
+			static const char *const list[] = {
 				"ADL.PAK", "CHAPTER1.VRM", "COL.PAK", "FINALE.PAK", "INTRO1.PAK", "INTRO2.PAK",
 				"INTRO3.PAK", "INTRO4.PAK", "MISC.PAK", "SND.PAK", "STARTUP.PAK", "XMI.PAK",
 				"CAVE.APK", "DRAGON1.APK", "DRAGON2.APK", "LAGOON.APK", 0
@@ -122,7 +122,7 @@ bool Resource::reset() {
 			_files.add("installer", loadInstallerArchive("WESTWOOD", "%d", 0), 2, false);
 
 		if (!_vm->gameFlags().isTalkie && !_vm->gameFlags().isDemo) {
-			static const char * const list[] = {
+			static const char *const list[] = {
 				"GENERAL.PAK", 0
 			};
 
@@ -130,7 +130,7 @@ bool Resource::reset() {
 		}
 	} else if (_vm->game() != GI_EOB2) {
 		error("Unknown game id: %d", _vm->game());
-		return false;	// for compilers that don't support NORETURN
+		return false;   // for compilers that don't support NORETURN
 	}
 
 	return true;
@@ -173,7 +173,7 @@ bool Resource::loadFileList(const Common::String &filedata) {
 		f->seek(filenameOffset, SEEK_SET);
 
 		uint8 buffer[13];
-		f->read(buffer, sizeof(buffer)-1);
+		f->read(buffer, sizeof(buffer) - 1);
 		buffer[12] = 0;
 		f->seek(offset + 16, SEEK_SET);
 
@@ -189,7 +189,7 @@ bool Resource::loadFileList(const Common::String &filedata) {
 			} else if (!loadPakFile(filename)) {
 				delete f;
 				error("couldn't load file '%s'", filename.c_str());
-				return false;	// for compilers that don't support NORETURN
+				return false;   // for compilers that don't support NORETURN
 			}
 		}
 	}
@@ -198,21 +198,21 @@ bool Resource::loadFileList(const Common::String &filedata) {
 	return true;
 }
 
-bool Resource::loadFileList(const char * const *filelist, uint32 numFiles) {
+bool Resource::loadFileList(const char *const *filelist, uint32 numFiles) {
 	if (!filelist)
 		return false;
 
 	while (numFiles--) {
 		if (!loadPakFile(filelist[numFiles])) {
 			error("couldn't load file '%s'", filelist[numFiles]);
-			return false;	// for compilers that don't support NORETURN
+			return false;   // for compilers that don't support NORETURN
 		}
 	}
 
 	return true;
 }
 
-bool Resource::loadProtectedFiles(const char * const * list) {
+bool Resource::loadProtectedFiles(const char *const *list) {
 	for (uint i = 0; list[i]; ++i) {
 		Common::ArchiveMemberPtr file = _files.getMember(list[i]);
 		if (!file)
diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp
index af050b12e7..6f7591ccf1 100644
--- a/engines/kyra/resource_intern.cpp
+++ b/engines/kyra/resource_intern.cpp
@@ -356,7 +356,7 @@ Common::Archive *ResLoaderPak::load(Common::ArchiveMemberPtr memberFile, Common:
 
 		const uint32 magic = stream.readUint32BE();
 
-		if (magic != MKTAG('S','C','V','M'))
+		if (magic != MKTAG('S', 'C', 'V', 'M'))
 			error("LINKLIST file does not contain 'SCVM' header");
 
 		const uint32 links = stream.readUint32BE();
@@ -391,10 +391,10 @@ bool ResLoaderInsMalcolm::isLoadable(const Common::String &filename, Common::See
 	stream.seek(3, SEEK_SET);
 	int32 size = stream.readUint32LE();
 
-	if (size+7 > stream.size())
+	if (size + 7 > stream.size())
 		return false;
 
-	stream.seek(size+5, SEEK_SET);
+	stream.seek(size + 5, SEEK_SET);
 	uint8 buffer[2];
 	stream.read(&buffer, 2);
 
@@ -700,7 +700,7 @@ bool FileExpander::process(uint8 *dst, const uint8 *src, uint32 outsize, uint32
 			_src->copyBytes(d);
 			postprocess = false;
 			needrefresh = true;
-		} else if (mode == 0){
+		} else if (mode == 0) {
 			uint8 *d2 = _tables[0];
 			memset(d2, 8, 144);
 			memset(d2 + 144, 9, 112);
@@ -844,7 +844,7 @@ void FileExpander::generateTables(uint8 srcIndex, uint8 dstIndex, uint8 dstIndex
 	cnt--;
 	s = tbl1 + cnt;
 	d = &_tables16[2][cnt];
-	uint16 * bt = (uint16 *)tbl3;
+	uint16 *bt = (uint16 *)tbl3;
 	uint16 inc = 0;
 	uint16 cnt2 = 0;
 
diff --git a/engines/kyra/saveload_lok.cpp b/engines/kyra/saveload_lok.cpp
index 22d412e7f6..b76d1da52a 100644
--- a/engines/kyra/saveload_lok.cpp
+++ b/engines/kyra/saveload_lok.cpp
@@ -163,7 +163,7 @@ Common::Error KyraEngine_LoK::loadGameState(int slot) {
 		if (!queryGameFlag(0xF1)) {
 			for (int i = 0x55; i <= 0x5A; ++i) {
 				if (queryGameFlag(i))
-					seq_createAmuletJewel(i-0x55, 10, 1, 1);
+					seq_createAmuletJewel(i - 0x55, 10, 1, 1);
 			}
 		}
 
diff --git a/engines/kyra/scene_lok.cpp b/engines/kyra/scene_lok.cpp
index ab1670ea6e..ea09091af7 100644
--- a/engines/kyra/scene_lok.cpp
+++ b/engines/kyra/scene_lok.cpp
@@ -158,7 +158,7 @@ void KyraEngine_LoK::enterNewScene(int sceneId, int facing, int unk1, int unk2,
 	_walkBlockWest = currentRoom->westExit;
 
 	if (_walkBlockNorth == 0xFFFF)
-		_screen->blockOutRegion(0, 0, 320, (_northExitHeight & 0xFF)+3);
+		_screen->blockOutRegion(0, 0, 320, (_northExitHeight & 0xFF) + 3);
 	if (_walkBlockEast == 0xFFFF)
 		_screen->blockOutRegion(312, 0, 8, 139);
 	if (_walkBlockSouth == 0xFFFF)
@@ -348,22 +348,22 @@ void KyraEngine_LoK::setCharacterPositionHelper(int character, int *facingTable)
 	};
 
 	if (facing == 0) {
-		if (maxAnimationFrame[36+character] > ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[36+character];
-		if (maxAnimationFrame[30+character] < ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[36+character];
+		if (maxAnimationFrame[36 + character] > ch->currentAnimFrame)
+			ch->currentAnimFrame = maxAnimationFrame[36 + character];
+		if (maxAnimationFrame[30 + character] < ch->currentAnimFrame)
+			ch->currentAnimFrame = maxAnimationFrame[36 + character];
 	} else if (facing == 4) {
-		if (maxAnimationFrame[18+character] > ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[18+character];
-		if (maxAnimationFrame[12+character] < ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[18+character];
+		if (maxAnimationFrame[18 + character] > ch->currentAnimFrame)
+			ch->currentAnimFrame = maxAnimationFrame[18 + character];
+		if (maxAnimationFrame[12 + character] < ch->currentAnimFrame)
+			ch->currentAnimFrame = maxAnimationFrame[18 + character];
 	} else {
-		if (maxAnimationFrame[18+character] < ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[30+character];
+		if (maxAnimationFrame[18 + character] < ch->currentAnimFrame)
+			ch->currentAnimFrame = maxAnimationFrame[30 + character];
 		if (maxAnimationFrame[character] == ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[6+character];
+			ch->currentAnimFrame = maxAnimationFrame[6 + character];
 		if (maxAnimationFrame[character] < ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[6+character]+2;
+			ch->currentAnimFrame = maxAnimationFrame[6 + character] + 2;
 	}
 
 	if (character == 0 && (_brandonStatusBit & 0x10))
@@ -596,7 +596,7 @@ void KyraEngine_LoK::initSceneObjectList(int brandonAlive) {
 	curAnimState->drawY = _currentCharacter->y1;
 	curAnimState->sceneAnimPtr = _shapes[_currentCharacter->currentAnimFrame];
 	curAnimState->animFrameNumber = _currentCharacter->currentAnimFrame;
-	startAnimFrame = _currentCharacter->currentAnimFrame-7;
+	startAnimFrame = _currentCharacter->currentAnimFrame - 7;
 	int xOffset = _defaultShapeTable[startAnimFrame].xOffset;
 	int yOffset = _defaultShapeTable[startAnimFrame].yOffset;
 
@@ -638,7 +638,7 @@ void KyraEngine_LoK::initSceneObjectList(int brandonAlive) {
 		curAnimState->drawY = ch->y1;
 		curAnimState->sceneAnimPtr = _shapes[ch->currentAnimFrame];
 		curAnimState->animFrameNumber = ch->currentAnimFrame;
-		startAnimFrame = ch->currentAnimFrame-7;
+		startAnimFrame = ch->currentAnimFrame - 7;
 		xOffset = _defaultShapeTable[startAnimFrame].xOffset;
 		yOffset = _defaultShapeTable[startAnimFrame].yOffset;
 		if (_scaleMode) {
@@ -714,7 +714,7 @@ void KyraEngine_LoK::initSceneObjectList(int brandonAlive) {
 		byte curItem = curRoom->itemsTable[i];
 		if (curItem != 0xFF) {
 			curAnimState->drawY = curRoom->itemsYPos[i];
-			curAnimState->sceneAnimPtr = _shapes[216+curItem];
+			curAnimState->sceneAnimPtr = _shapes[216 + curItem];
 			curAnimState->animFrameNumber = (int16)0xFFFF;
 			curAnimState->y1 = curRoom->itemsYPos[i];
 			curAnimState->x1 = curRoom->itemsXPos[i];
@@ -780,10 +780,10 @@ void KyraEngine_LoK::initSceneScreen(int brandonAlive) {
 	} else {
 		if (_unkScreenVar1 && !queryGameFlag(0xA0)) {
 			for (int i = 0; i < 60; ++i) {
-				uint16 col = _screen->getPalette(0)[684+i];
-				col += _screen->getPalette(1)[684+i] << 1;
+				uint16 col = _screen->getPalette(0)[684 + i];
+				col += _screen->getPalette(1)[684 + i] << 1;
 				col >>= 2;
-				_screen->getPalette(0)[684+i] = col;
+				_screen->getPalette(0)[684 + i] = col;
 			}
 			_screen->setScreenPalette(_screen->getPalette(0));
 		}
@@ -847,7 +847,7 @@ int KyraEngine_LoK::handleSceneChange(int xpos, int ypos, int unk1, int frameRes
 		}
 	}
 
-	if (ypos <= (_northExitHeight&0xFF)+2) {
+	if (ypos <= (_northExitHeight & 0xFF) + 2) {
 		if (_roomTable[sceneId].northExit != 0xFFFF) {
 			xpos = _sceneExits.northXPos;
 			ypos = _northExitHeight & 0xFF;
@@ -1093,7 +1093,7 @@ void KyraEngine_LoK::setCharactersInDefaultScene() {
 		Character *cur = &_characterList[i];
 		//cur->field_20 = 0;
 
-		const uint32 *curTable = defaultSceneTable[i-1];
+		const uint32 *curTable = defaultSceneTable[i - 1];
 		cur->sceneId = curTable[0];
 
 		if (cur->sceneId == _currentCharacter->sceneId)
diff --git a/engines/kyra/scene_v1.cpp b/engines/kyra/scene_v1.cpp
index bc90f49002..36798970e3 100644
--- a/engines/kyra/scene_v1.cpp
+++ b/engines/kyra/scene_v1.cpp
@@ -115,7 +115,7 @@ int KyraEngine_v1::findWay(int x, int y, int toX, int toY, int *moveTable, int m
 				delete[] pathTable2;
 				return 0x7D00;
 			}
-			memcpy(&moveTable[lastUsedEntry], pathTable1, temp*sizeof(int));
+			memcpy(&moveTable[lastUsedEntry], pathTable1, temp * sizeof(int));
 			lastUsedEntry += temp;
 		} else {
 			if (lastUsedEntry + tempValue > moveTableSize) {
@@ -123,7 +123,7 @@ int KyraEngine_v1::findWay(int x, int y, int toX, int toY, int *moveTable, int m
 				delete[] pathTable2;
 				return 0x7D00;
 			}
-			memcpy(&moveTable[lastUsedEntry], pathTable2, tempValue*sizeof(int));
+			memcpy(&moveTable[lastUsedEntry], pathTable2, tempValue * sizeof(int));
 			lastUsedEntry += tempValue;
 		}
 		x = curX;
@@ -161,16 +161,16 @@ int KyraEngine_v1::findSubPath(int x, int y, int toX, int toY, int *moveTable, i
 	while (position != end) {
 		int newFacing2 = newFacing;
 		while (true) {
-			changePosTowardsFacing(xpos1, ypos1, facingTable1[start*8 + newFacing2]);
+			changePosTowardsFacing(xpos1, ypos1, facingTable1[start * 8 + newFacing2]);
 			if (!lineIsPassable(xpos1, ypos1)) {
-				if (facingTable1[start*8 + newFacing2] == newFacing)
+				if (facingTable1[start * 8 + newFacing2] == newFacing)
 					return 0x7D00;
-				newFacing2 = facingTable1[start*8 + newFacing2];
+				newFacing2 = facingTable1[start * 8 + newFacing2];
 				xpos1 = x;
 				ypos1 = y;
 				continue;
 			}
-			newFacing = facingTable1[start*8 + newFacing2];
+			newFacing = facingTable1[start * 8 + newFacing2];
 			break;
 		}
 		// debug drawing
@@ -200,7 +200,7 @@ int KyraEngine_v1::findSubPath(int x, int y, int toX, int toY, int *moveTable, i
 		if (xpos1 == xpos2 && ypos1 == ypos2)
 			break;
 
-		newFacing = facingTable3[start*8 + newFacing];
+		newFacing = facingTable3[start * 8 + newFacing];
 	}
 
 	return 0x7D00;
diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp
index 447e1428be..f32a898dd9 100644
--- a/engines/kyra/screen_lok.cpp
+++ b/engines/kyra/screen_lok.cpp
@@ -80,7 +80,7 @@ void Screen_LoK::fadeSpecialPalette(int palIndex, int startIndex, int size, int
 	tempPal.copy(getPalette(0));
 	tempPal.copy(_vm->palTable1()[palIndex], 0, size, startIndex);
 
-	fadePalette(tempPal, fadeTime*18);
+	fadePalette(tempPal, fadeTime * 18);
 
 	getPalette(0).copy(tempPal, startIndex, size);
 	setScreenPalette(getPalette(0));
@@ -108,16 +108,16 @@ void Screen_LoK::bitBlitRects() {
 }
 
 void Screen_LoK::savePageToDisk(const char *file, int page) {
-	if (!_saveLoadPage[page/2]) {
-		_saveLoadPage[page/2] = new uint8[SCREEN_W * SCREEN_H];
-		assert(_saveLoadPage[page/2]);
+	if (!_saveLoadPage[page / 2]) {
+		_saveLoadPage[page / 2] = new uint8[SCREEN_W * SCREEN_H];
+		assert(_saveLoadPage[page / 2]);
 	}
-	memcpy(_saveLoadPage[page/2], getPagePtr(page), SCREEN_W * SCREEN_H);
+	memcpy(_saveLoadPage[page / 2], getPagePtr(page), SCREEN_W * SCREEN_H);
 
 	if (_useOverlays) {
-		if (!_saveLoadPageOvl[page/2]) {
-			_saveLoadPageOvl[page/2] = new uint8[SCREEN_OVL_SJIS_SIZE];
-			assert(_saveLoadPageOvl[page/2]);
+		if (!_saveLoadPageOvl[page / 2]) {
+			_saveLoadPageOvl[page / 2] = new uint8[SCREEN_OVL_SJIS_SIZE];
+			assert(_saveLoadPageOvl[page / 2]);
 		}
 
 		uint8 *srcPage = getOverlayPtr(page);
@@ -126,49 +126,49 @@ void Screen_LoK::savePageToDisk(const char *file, int page) {
 			return;
 		}
 
-		memcpy(_saveLoadPageOvl[page/2], srcPage, SCREEN_OVL_SJIS_SIZE);
+		memcpy(_saveLoadPageOvl[page / 2], srcPage, SCREEN_OVL_SJIS_SIZE);
 	}
 }
 
 void Screen_LoK::loadPageFromDisk(const char *file, int page) {
-	if (!_saveLoadPage[page/2]) {
+	if (!_saveLoadPage[page / 2]) {
 		warning("trying to restore page %d, but no backup found", page);
 		return;
 	}
 
-	copyBlockToPage(page, 0, 0, SCREEN_W, SCREEN_H, _saveLoadPage[page/2]);
-	delete[] _saveLoadPage[page/2];
-	_saveLoadPage[page/2] = 0;
+	copyBlockToPage(page, 0, 0, SCREEN_W, SCREEN_H, _saveLoadPage[page / 2]);
+	delete[] _saveLoadPage[page / 2];
+	_saveLoadPage[page / 2] = 0;
 
-	if (_saveLoadPageOvl[page/2]) {
+	if (_saveLoadPageOvl[page / 2]) {
 		uint8 *dstPage = getOverlayPtr(page);
 		if (!dstPage) {
 			warning("trying to restore unsupported overlay page %d", page);
 			return;
 		}
 
-		memcpy(dstPage, _saveLoadPageOvl[page/2], SCREEN_OVL_SJIS_SIZE);
-		delete[] _saveLoadPageOvl[page/2];
-		_saveLoadPageOvl[page/2] = 0;
+		memcpy(dstPage, _saveLoadPageOvl[page / 2], SCREEN_OVL_SJIS_SIZE);
+		delete[] _saveLoadPageOvl[page / 2];
+		_saveLoadPageOvl[page / 2] = 0;
 	}
 }
 
 void Screen_LoK::queryPageFromDisk(const char *file, int page, uint8 *buffer) {
-	if (!_saveLoadPage[page/2]) {
+	if (!_saveLoadPage[page / 2]) {
 		warning("trying to query page %d, but no backup found", page);
 		return;
 	}
 
-	memcpy(buffer, _saveLoadPage[page/2], SCREEN_W*SCREEN_H);
+	memcpy(buffer, _saveLoadPage[page / 2], SCREEN_W * SCREEN_H);
 }
 
 void Screen_LoK::deletePageFromDisk(int page) {
-	delete[] _saveLoadPage[page/2];
-	_saveLoadPage[page/2] = 0;
+	delete[] _saveLoadPage[page / 2];
+	_saveLoadPage[page / 2] = 0;
 
-	if (_saveLoadPageOvl[page/2]) {
-		delete[] _saveLoadPageOvl[page/2];
-		_saveLoadPageOvl[page/2] = 0;
+	if (_saveLoadPageOvl[page / 2]) {
+		delete[] _saveLoadPageOvl[page / 2];
+		_saveLoadPageOvl[page / 2] = 0;
 	}
 }
 
@@ -194,16 +194,16 @@ void Screen_LoK::copyBackgroundBlock(int x, int page, int flag) {
 	copyRegionToBuffer(_curPage, 8, 8, 8, height, ptr2);
 	for (int i = 0; i < 19; ++i) {
 		int tempX = curX + 1;
-		copyRegionToBuffer(_curPage, tempX<<3, 8, 8, height, ptr1);
-		copyBlockToPage(_curPage, tempX<<3, 8, 8, height, ptr2);
+		copyRegionToBuffer(_curPage, tempX << 3, 8, 8, height, ptr1);
+		copyBlockToPage(_curPage, tempX << 3, 8, 8, height, ptr2);
 		int newXPos = curX + x;
 		if (newXPos > 37)
 			newXPos = newXPos % 38;
 
 		tempX = newXPos + 1;
-		copyRegionToBuffer(_curPage, tempX<<3, 8, 8, height, ptr2);
-		copyBlockToPage(_curPage, tempX<<3, 8, 8, height, ptr1);
-		curX += x*2;
+		copyRegionToBuffer(_curPage, tempX << 3, 8, 8, height, ptr2);
+		copyBlockToPage(_curPage, tempX << 3, 8, 8, height, ptr1);
+		curX += x * 2;
 		if (curX > 37) {
 			curX = curX % 38;
 		}
@@ -231,7 +231,7 @@ int Screen_LoK::getRectSize(int x, int y) {
 	else if (y > 200)
 		y = 200;
 
-	return ((x*y) << 3);
+	return ((x * y) << 3);
 }
 
 void Screen_LoK::postProcessCursor(uint8 *data, int width, int height, int pitch) {
@@ -332,7 +332,7 @@ void Screen_LoK_16::getFadeParams(const Palette &pal, int delay, int &delayInc,
 
 int Screen_LoK_16::fadePalStep(const Palette &pal, int diff) {
 	error("Screen_LoK_16::fadePalStep called");
-	return 0;	// for compilers that don't support NORETURN
+	return 0;   // for compilers that don't support NORETURN
 }
 
 void Screen_LoK_16::paletteMap(uint8 idx, int r, int g, int b) {
diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp
index ae6fb4b5e5..135925afd9 100644
--- a/engines/kyra/script_lok.cpp
+++ b/engines/kyra/script_lok.cpp
@@ -326,7 +326,7 @@ int KyraEngine_LoK::o1_delaySecs(EMCState *script) {
 	} else {
 		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_delaySecs(%p) (%d)", (const void *)script, stackPos(0));
 		if (stackPos(0) >= 0 && !skipFlag())
-			delay(stackPos(0)*1000, true);
+			delay(stackPos(0) * 1000, true);
 	}
 
 	resetSkipFlag();
@@ -689,7 +689,7 @@ int KyraEngine_LoK::o1_displayWSASequentialFrames(EMCState *script) {
 		if (specialTime) {
 			uint32 voiceTime = snd_getVoicePlayTime();
 			if (voiceTime) {
-				int displayFrames = ABS(endFrame-startFrame)+1;
+				int displayFrames = ABS(endFrame - startFrame) + 1;
 				displayFrames *= maxTime;
 				assert(displayFrames != 0);
 
@@ -1085,7 +1085,7 @@ int KyraEngine_LoK::o1_sceneAnimationActive(EMCState *script) {
 
 int KyraEngine_LoK::o1_setCharacterMovementDelay(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCharacterMovementDelay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
-	_timer->setDelay(stackPos(0)+5, stackPos(1));
+	_timer->setDelay(stackPos(0) + 5, stackPos(1));
 	return 0;
 }
 
@@ -1124,7 +1124,7 @@ int KyraEngine_LoK::o1_findBrightestFireberry(EMCState *script) {
 	// return a glow value of "29" over here, when we are running a CD version.
 	if (_flags.isTalkie) {
 		if (_currentCharacter->sceneId == 133 || _currentCharacter->sceneId == 137 ||
-			_currentCharacter->sceneId == 165 || _currentCharacter->sceneId == 173)
+		        _currentCharacter->sceneId == 165 || _currentCharacter->sceneId == 173)
 			return 29;
 	}
 
@@ -1173,7 +1173,7 @@ int KyraEngine_LoK::o1_setFireberryGlowPalette(EMCState *script) {
 		case -1:
 			// The original seemed to draw some lines on page 2 here, which looks strange...
 			//if (!(_brandonStatusBit & 2))
-			//	warning("Unimplemented case for o1_setFireberryGlowPalette");
+			//  warning("Unimplemented case for o1_setFireberryGlowPalette");
 			palIndex = 9;
 			break;
 
@@ -1190,7 +1190,7 @@ int KyraEngine_LoK::o1_setFireberryGlowPalette(EMCState *script) {
 			palIndex = 9;
 			break;
 
-		case 28: case 29: default:
+	case 28: case 29: default:
 			palIndex = 6;
 		}
 
@@ -1227,8 +1227,8 @@ int KyraEngine_LoK::o1_setFireberryGlowPalette(EMCState *script) {
 
 		if (_brandonStatusBit & 2) {
 			if (_currentCharacter->sceneId != 133 && _currentCharacter->sceneId != 137 &&
-				_currentCharacter->sceneId != 165 && _currentCharacter->sceneId != 173 &&
-				(_currentCharacter->sceneId < 187 || _currentCharacter->sceneId > 198)) {
+			        _currentCharacter->sceneId != 165 && _currentCharacter->sceneId != 173 &&
+			        (_currentCharacter->sceneId < 187 || _currentCharacter->sceneId > 198)) {
 				palIndex = 14;
 			}
 		}
@@ -1291,12 +1291,12 @@ int KyraEngine_LoK::o1_drawItemShapeIntoScene(EMCState *script) {
 		flags = 1;
 
 	if (onlyHidPage) {
-		_screen->drawShape(2, _shapes[216+item], x, y, 0, flags);
+		_screen->drawShape(2, _shapes[216 + item], x, y, 0, flags);
 	} else {
 		_screen->hideMouse();
 		_animator->restoreAllObjectBackgrounds();
-		_screen->drawShape(2, _shapes[216+item], x, y, 0, flags);
-		_screen->drawShape(0, _shapes[216+item], x, y, 0, flags);
+		_screen->drawShape(2, _shapes[216 + item], x, y, 0, flags);
+		_screen->drawShape(0, _shapes[216 + item], x, y, 0, flags);
 		_animator->flagAllObjectsForBkgdChange();
 		_animator->preserveAnyChangedBackgrounds();
 		_animator->flagAllObjectsForRefresh();
@@ -1409,7 +1409,7 @@ int KyraEngine_LoK::o1_fillFlaskWithWater(EMCState *script) {
 
 int KyraEngine_LoK::o1_getCharacterMovementDelay(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getCharacterMovementDelay(%p) (%d)", (const void *)script, stackPos(0));
-	return _timer->getDelay(stackPos(0)+5);
+	return _timer->getDelay(stackPos(0) + 5);
 }
 
 int KyraEngine_LoK::o1_getBirthstoneGem(EMCState *script) {
@@ -1715,13 +1715,13 @@ int KyraEngine_LoK::o1_pauseMusicSeconds(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_pauseMusicSeconds(%p) ()", (const void *)script);
 	// if music disabled
 	//     return
-	delay(stackPos(0)*1000, true);
+	delay(stackPos(0) * 1000, true);
 	return 0;
 }
 
 int KyraEngine_LoK::o1_resetMaskRegion(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_resetMaskRegion(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
-	_screen->fillRect(stackPos(1), stackPos(2), stackPos(1)+stackPos(3), stackPos(2)+stackPos(4), 0, 5);
+	_screen->fillRect(stackPos(1), stackPos(2), stackPos(1) + stackPos(3), stackPos(2) + stackPos(4), 0, 5);
 	return 0;
 }
 
@@ -1754,7 +1754,7 @@ typedef Common::Functor1Mem<EMCState *, int, KyraEngine_LoK> OpcodeV1;
 #define SetOpcodeTable(x) table = &x;
 #define Opcode(x) table->push_back(new OpcodeV1(this, &KyraEngine_LoK::x))
 void KyraEngine_LoK::setupOpcodeTable() {
-	Common::Array<const Opcode*> *table = 0;
+	Common::Array<const Opcode *> *table = 0;
 
 	_opcodes.reserve(157);
 	SetOpcodeTable(_opcodes);
diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp
index 4cfbdf8ab8..aaa07e6d61 100644
--- a/engines/kyra/script_v1.cpp
+++ b/engines/kyra/script_v1.cpp
@@ -106,13 +106,13 @@ int KyraEngine_v1::o1_fillRect(EMCState *script) {
 
 int KyraEngine_v1::o1_blockInWalkableRegion(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_blockInWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
-	screen()->blockInRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
+	screen()->blockInRegion(stackPos(0), stackPos(1), stackPos(2) - stackPos(0) + 1, stackPos(3) - stackPos(1) + 1);
 	return 0;
 }
 
 int KyraEngine_v1::o1_blockOutWalkableRegion(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_blockOutWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
-	screen()->blockOutRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
+	screen()->blockOutRegion(stackPos(0), stackPos(1), stackPos(2) - stackPos(0) + 1, stackPos(3) - stackPos(1) + 1);
 	return 0;
 }
 
diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp
index 1bdcde5177..1f9097d09d 100644
--- a/engines/kyra/seqplayer.cpp
+++ b/engines/kyra/seqplayer.cpp
@@ -375,15 +375,14 @@ void SeqPlayer::s1_copyRegionSpecial() {
 		_screen->copyRegion(152, 56, 152, 56, 48, 48, 2, 0);
 		break;
 	case 4: {
-			_screen->_charWidth = -2;
-			const int x = (Screen::SCREEN_W - _screen->getTextWidth(copyStr)) / 2;
-			const int y = 179;
-			_screen->setTextColorMap(colorMap);
-			if (_vm->gameFlags().platform != Common::kPlatformAmiga)
-				_screen->printText(copyStr, x + 1, y + 1, 0xB, 0xC);
-			_screen->printText(copyStr, x, y, 0xF, 0xC);
-		}
-		break;
+		_screen->_charWidth = -2;
+		const int x = (Screen::SCREEN_W - _screen->getTextWidth(copyStr)) / 2;
+		const int y = 179;
+		_screen->setTextColorMap(colorMap);
+		if (_vm->gameFlags().platform != Common::kPlatformAmiga)
+			_screen->printText(copyStr, x + 1, y + 1, 0xB, 0xC);
+		_screen->printText(copyStr, x, y, 0xF, 0xC);
+		} break;
 	case 5:
 		_screen->_curPage = 2;
 		break;
diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp
index 99ae2ad7b3..3475402a98 100644
--- a/engines/kyra/sequences_lok.cpp
+++ b/engines/kyra/sequences_lok.cpp
@@ -381,10 +381,10 @@ void KyraEngine_LoK::seq_createAmuletJewel(int jewel, int page, int noSound, int
 			}
 		}
 	}
-	_screen->drawShape(page, _shapes[323+jewel], _amuletX2[jewel], _amuletY2[jewel], 0, 0);
+	_screen->drawShape(page, _shapes[323 + jewel], _amuletX2[jewel], _amuletY2[jewel], 0, 0);
 	_screen->updateScreen();
 	_screen->showMouse();
-	setGameFlag(0x55+jewel);
+	setGameFlag(0x55 + jewel);
 }
 
 void KyraEngine_LoK::seq_brandonHealing() {
@@ -764,7 +764,7 @@ void KyraEngine_LoK::seq_makeBrandonWisp() {
 
 	if (_flags.platform == Common::kPlatformAmiga) {
 		if ((_currentCharacter->sceneId >= 229 && _currentCharacter->sceneId <= 245) ||
-			(_currentCharacter->sceneId >= 118 && _currentCharacter->sceneId <= 186))
+		        (_currentCharacter->sceneId >= 118 && _currentCharacter->sceneId <= 186))
 			_screen->fadePalette(_screen->getPalette(10), 0x54);
 	} else {
 		if (_currentCharacter->sceneId >= 229 && _currentCharacter->sceneId <= 245)
@@ -1730,7 +1730,7 @@ int KyraEngine_LoK::handleBeadState() {
 			if (_system->getMillis() > _beadStateTimer2 && _malcolmFlag == 7 && !_unkAmuletVar && !_text->printed()) {
 				snd_playSoundEffect(0x0B);
 				if (_currentCharacter->x1 > 233 && _currentCharacter->x1 < 305 && _currentCharacter->y1 > 85 && _currentCharacter->y1 < 105 &&
-					(_brandonStatusBit & 0x20)) {
+				        (_brandonStatusBit & 0x20)) {
 					_beadState1.unk8 = 290;
 					_beadState1.unk9 = 40;
 					_beadStateVar = 5;
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index cd49b03b53..e2a86d7194 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -288,7 +288,7 @@ void StaticResource::deinit() {
 	unloadId(-1);
 }
 
-const char * const *StaticResource::loadStrings(int id, int &strings) {
+const char *const *StaticResource::loadStrings(int id, int &strings) {
 	return (const char * const *)getData(id, kStringList, strings);
 }
 
@@ -438,7 +438,7 @@ bool StaticResource::loadStringTable(Common::SeekableReadStream &stream, void *&
 		while ((c = (char)stream.readByte()) != 0)
 			string += c;
 
-		output[i] = new char[string.size()+1];
+		output[i] = new char[string.size() + 1];
 		strcpy(output[i], string.c_str());
 	}
 
@@ -502,10 +502,10 @@ bool StaticResource::loadRoomTable(Common::SeekableReadStream &stream, void *&pt
 		loadTo[i].eastExit = stream.readUint16BE();
 		loadTo[i].southExit = stream.readUint16BE();
 		loadTo[i].westExit = stream.readUint16BE();
-		memset(&loadTo[i].itemsTable[0], 0xFF, sizeof(byte)*6);
-		memset(&loadTo[i].itemsTable[6], 0, sizeof(byte)*6);
-		memset(loadTo[i].itemsXPos, 0, sizeof(uint16)*12);
-		memset(loadTo[i].itemsYPos, 0, sizeof(uint8)*12);
+		memset(&loadTo[i].itemsTable[0], 0xFF, sizeof(byte) * 6);
+		memset(&loadTo[i].itemsTable[6], 0, sizeof(byte) * 6);
+		memset(loadTo[i].itemsXPos, 0, sizeof(uint16) * 12);
+		memset(loadTo[i].itemsYPos, 0, sizeof(uint8) * 12);
 		memset(loadTo[i].needInit, 0, sizeof(loadTo[i].needInit));
 	}
 
@@ -526,9 +526,9 @@ bool StaticResource::loadHofSequenceData(Common::SeekableReadStream &stream, voi
 
 		tmp_s[i].flags = stream.readUint16BE();
 		tmp_s[i].wsaFile = new char[14];
-		stream.read(const_cast<char*>(tmp_s[i].wsaFile), 14);
+		stream.read(const_cast<char *>(tmp_s[i].wsaFile), 14);
 		tmp_s[i].cpsFile = new char[14];
-		stream.read(const_cast<char*>(tmp_s[i].cpsFile), 14);
+		stream.read(const_cast<char *>(tmp_s[i].cpsFile), 14);
 		tmp_s[i].startupCommand = stream.readByte();
 		tmp_s[i].finalCommand = stream.readByte();
 		tmp_s[i].stringIndex1 = stream.readUint16BE();
@@ -552,7 +552,7 @@ bool StaticResource::loadHofSequenceData(Common::SeekableReadStream &stream, voi
 
 		tmp_n[i].flags = stream.readUint16BE();
 		tmp_n[i].wsaFile = new char[14];
-		stream.read(const_cast<char*>(tmp_n[i].wsaFile), 14);
+		stream.read(const_cast<char *>(tmp_n[i].wsaFile), 14);
 		tmp_n[i].startframe = stream.readUint16BE();
 		tmp_n[i].endFrame = stream.readUint16BE();
 		tmp_n[i].frameDelay = stream.readUint16BE();
@@ -691,7 +691,7 @@ void StaticResource::freeHofSequenceData(void *&ptr, int &size) {
 }
 
 void StaticResource::freeHofShapeAnimDataV1(void *&ptr, int &size) {
-	ItemAnimData_v1 *d= (ItemAnimData_v1 *)ptr;
+	ItemAnimData_v1 *d = (ItemAnimData_v1 *)ptr;
 	for (int i = 0; i < size; i++)
 		delete[] d[i].frames;
 	delete[] d;
@@ -700,7 +700,7 @@ void StaticResource::freeHofShapeAnimDataV1(void *&ptr, int &size) {
 }
 
 void StaticResource::freeHofShapeAnimDataV2(void *&ptr, int &size) {
-	ItemAnimData_v2 *d= (ItemAnimData_v2 *)ptr;
+	ItemAnimData_v2 *d = (ItemAnimData_v2 *)ptr;
 	for (int i = 0; i < size; i++)
 		delete[] d[i].frames;
 	delete[] d;
@@ -800,7 +800,7 @@ void KyraEngine_LoK::initStaticResource() {
 		_roomTable = new Room[_roomTableSize];
 		assert(_roomTable);
 
-		memcpy(_roomTable, tempRoomList, _roomTableSize*sizeof(Room));
+		memcpy(_roomTable, tempRoomList, _roomTableSize * sizeof(Room));
 		tempRoomList = 0;
 
 		_staticres->unloadId(k1RoomList);
@@ -813,7 +813,7 @@ void KyraEngine_LoK::initStaticResource() {
 		_defaultShapeTable = new Shape[_defaultShapeTableSize];
 		assert(_defaultShapeTable);
 
-		memcpy(_defaultShapeTable, tempShapeTable, _defaultShapeTableSize*sizeof(Shape));
+		memcpy(_defaultShapeTable, tempShapeTable, _defaultShapeTableSize * sizeof(Shape));
 		tempShapeTable = 0;
 
 		_staticres->unloadId(k1DefaultShapes);
@@ -874,7 +874,7 @@ void KyraEngine_LoK::loadCharacterShapes() {
 		assert(i < _defaultShapeTableSize);
 		Shape *shape = &_defaultShapeTable[i];
 		if (shape->imageIndex == 0xFF) {
-			_shapes[i+7] = 0;
+			_shapes[i + 7] = 0;
 			continue;
 		}
 		if (shape->imageIndex != curImage) {
@@ -882,7 +882,7 @@ void KyraEngine_LoK::loadCharacterShapes() {
 			_screen->loadBitmap(_characterImageTable[shape->imageIndex], 3, 3, 0);
 			curImage = shape->imageIndex;
 		}
-		_shapes[i+7] = _screen->encodeShape(shape->x<<3, shape->y, shape->w<<3, shape->h, 1);
+		_shapes[i + 7] = _screen->encodeShape(shape->x << 3, shape->y, shape->w << 3, shape->h, 1);
 	}
 	_screen->_curPage = videoPage;
 }
@@ -893,16 +893,16 @@ void KyraEngine_LoK::loadSpecialEffectShapes() {
 
 	int currShape;
 	for (currShape = 173; currShape < 183; currShape++)
-		_shapes[currShape] = _screen->encodeShape((currShape-173) * 24, 0, 24, 24, 1);
+		_shapes[currShape] = _screen->encodeShape((currShape - 173) * 24, 0, 24, 24, 1);
 
 	for (currShape = 183; currShape < 190; currShape++)
-		_shapes[currShape] = _screen->encodeShape((currShape-183) * 24, 24, 24, 24, 1);
+		_shapes[currShape] = _screen->encodeShape((currShape - 183) * 24, 24, 24, 24, 1);
 
 	for (currShape = 190; currShape < 201; currShape++)
-		_shapes[currShape] = _screen->encodeShape((currShape-190) * 24, 48, 24, 24, 1);
+		_shapes[currShape] = _screen->encodeShape((currShape - 190) * 24, 48, 24, 24, 1);
 
 	for (currShape = 201; currShape < 206; currShape++)
-		_shapes[currShape] = _screen->encodeShape((currShape-201) * 16, 106, 16, 16, 1);
+		_shapes[currShape] = _screen->encodeShape((currShape - 201) * 16, 106, 16, 16, 1);
 }
 
 void KyraEngine_LoK::loadItems() {
@@ -917,22 +917,22 @@ void KyraEngine_LoK::loadItems() {
 		_shapes[323 + shape] = _screen->encodeShape((shape - 1) * 32, 0, 32, 17, 0);
 
 	for (shape = 330; shape <= 334; shape++)
-		_shapes[shape] = _screen->encodeShape((shape-330) * 32, 102, 32, 17, 0);
+		_shapes[shape] = _screen->encodeShape((shape - 330) * 32, 102, 32, 17, 0);
 
 	for (shape = 335; shape <= 339; shape++)
-		_shapes[shape] = _screen->encodeShape((shape-335) * 32, 17,  32, 17, 0);
+		_shapes[shape] = _screen->encodeShape((shape - 335) * 32, 17,  32, 17, 0);
 
 	for (shape = 340; shape <= 344; shape++)
-		_shapes[shape] = _screen->encodeShape((shape-340) * 32, 34,  32, 17, 0);
+		_shapes[shape] = _screen->encodeShape((shape - 340) * 32, 34,  32, 17, 0);
 
 	for (shape = 345; shape <= 349; shape++)
-		_shapes[shape] = _screen->encodeShape((shape-345) * 32, 51,  32, 17, 0);
+		_shapes[shape] = _screen->encodeShape((shape - 345) * 32, 51,  32, 17, 0);
 
 	for (shape = 350; shape <= 354; shape++)
-		_shapes[shape] = _screen->encodeShape((shape-350) * 32, 68,  32, 17, 0);
+		_shapes[shape] = _screen->encodeShape((shape - 350) * 32, 68,  32, 17, 0);
 
 	for (shape = 355; shape <= 359; shape++)
-		_shapes[shape] = _screen->encodeShape((shape-355) * 32, 85,  32, 17, 0);
+		_shapes[shape] = _screen->encodeShape((shape - 355) * 32, 85,  32, 17, 0);
 
 
 	_screen->loadBitmap("ITEMS.CPS", 3, 3, 0);
@@ -944,7 +944,7 @@ void KyraEngine_LoK::loadItems() {
 		if (shape != -1)
 			_shapes[216 + i] = _shapes[216 + shape];
 		else
-			_shapes[216 + i] = _screen->encodeShape( (i % 20) * 16, i/20 * 16, 16, 16, 0);
+			_shapes[216 + i] = _screen->encodeShape((i % 20) * 16, i / 20 * 16, 16, 16, 0);
 	}
 
 	_res->loadFileToBuf("_ITEM_HT.DAT", &_itemHtDat, sizeof(_itemHtDat));
@@ -1023,7 +1023,7 @@ void KyraEngine_HoF::initStaticResource() {
 		if (tlkfiles && len > 1) {
 			for (int ii = 0; ii < tmpSize; ii++) {
 				if (strlen(tlkfiles[ii]) > 1 && !scumm_stricmp(&seqSoundList[i][1], &tlkfiles[ii][1]))
-						strcpy(tmpSndLst[i], tlkfiles[ii]);
+					strcpy(tmpSndLst[i], tlkfiles[ii]);
 			}
 		}
 
@@ -1078,8 +1078,8 @@ void KyraEngine_HoF::initStaticResource() {
 	// setup sequence data
 	_sequences = _staticres->loadHofSequenceData(k2SeqplaySeqData, tmpSize);
 
-	static const SeqProc hofSequenceCallbacks[] = { 0,
-		&KyraEngine_HoF::seq_introWestwood,
+	static const SeqProc hofSequenceCallbacks[] = {
+		0, &KyraEngine_HoF::seq_introWestwood,
 		&KyraEngine_HoF::seq_introTitle, &KyraEngine_HoF::seq_introOverview,
 		&KyraEngine_HoF::seq_introLibrary, &KyraEngine_HoF::seq_introHand,
 		&KyraEngine_HoF::seq_introPoint, &KyraEngine_HoF::seq_introZanfaun,
@@ -1125,14 +1125,15 @@ void KyraEngine_HoF::initStaticResource() {
 
 	_callbackS =
 #ifdef ENABLE_LOL
-		_flags.gameID == GI_LOL ? kLoLDemoSequenceCallbacks :
+	    _flags.gameID == GI_LOL ? kLoLDemoSequenceCallbacks :
 #endif // ENABLE_LOL
-		((_flags.isDemo && !_flags.isTalkie) ? hofDemoSequenceCallbacks : hofSequenceCallbacks);
+	    ((_flags.isDemo && !_flags.isTalkie) ? hofDemoSequenceCallbacks : hofSequenceCallbacks);
+
 	_callbackN =
 #ifdef ENABLE_LOL
-		_flags.gameID == GI_LOL ? kLoLDemoNestedSequenceCallbacks :
+	    _flags.gameID == GI_LOL ? kLoLDemoNestedSequenceCallbacks :
 #endif // ENABLE_LOL
-		((_flags.isDemo && !_flags.isTalkie) ? hofDemoNestedSequenceCallbacks : hofNestedSequenceCallbacks);
+	    ((_flags.isDemo && !_flags.isTalkie) ? hofDemoNestedSequenceCallbacks : hofNestedSequenceCallbacks);
 }
 
 void KyraEngine_MR::initStaticResource() {
@@ -1184,7 +1185,7 @@ const ScreenDim Screen_HoF::_screenDimTable[] = {
 	{ 0x00, 0x00, 0x28, 0x88, 0xC7, 0xCF, 0x00, 0x00 },
 	{ 0x00, 0x08, 0x28, 0xB8, 0xC7, 0xCF, 0x00, 0x00 },
 	{ 0x01, 0x28, 0x26, 0x46, 0xC7, 0xCC, 0x00, 0x00 },
-	{ 0x0A, 0x96, 0x14, 0x30, 0x19, 0xF0, 0x00, 0x00 }	// menu, just present for current menu code
+	{ 0x0A, 0x96, 0x14, 0x30, 0x19, 0xF0, 0x00, 0x00 }  // menu, just present for current menu code
 };
 
 const int Screen_HoF::_screenDimTableCount = ARRAYSIZE(Screen_HoF::_screenDimTable);
@@ -1253,7 +1254,7 @@ void GUI_LoK::initStaticResource() {
 	_menu[0].item[3].callback = quitPlayingFunctor;
 	_menu[0].item[4].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::resumeGame);
 
-	GUI_V1_MENU(_menu[1], -1, -1, 0x140, 0x38, 248, 249, 250, 0, 254,-1, 8, 0, 2, -1, -1, -1, -1);
+	GUI_V1_MENU(_menu[1], -1, -1, 0x140, 0x38, 248, 249, 250, 0, 254, -1, 8, 0, 2, -1, -1, -1, -1);
 	GUI_V1_MENU_ITEM(_menu[1].item[0], 1, 0, 0, 0, 0x18, 0, 0x1E, 0x48, 0x0F, 252, 253, -1, 255, 248, 249, 250, -1, 0, 0, 0, 0, 0);
 	GUI_V1_MENU_ITEM(_menu[1].item[1], 1, 0, 0, 0, 0xD8, 0, 0x1E, 0x48, 0x0F, 252, 253, -1, 255, 248, 249, 250, -1, 0, 0, 0, 0, 0);
 	_menu[1].item[0].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::quitConfirmYes);
@@ -1346,7 +1347,7 @@ void KyraEngine_LoK::setupButtonData() {
 		_buttonData[i].buttonCallback = amuletFunctor;
 
 	for (int i = 1; i < 15; ++i)
-		_buttonDataListPtr[i-1] = &_buttonData[i];
+		_buttonDataListPtr[i - 1] = &_buttonData[i];
 	_buttonDataListPtr[14] = 0;
 }
 
@@ -1417,7 +1418,7 @@ const char *const KyraEngine_HoF::_languageExtension[] = {
 	"ENG",
 	"FRE",
 	"GER",/*,
-	"ITA",		Italian and Spanish were never included
+	"ITA",      Italian and Spanish were never included
 	"SPA"*/
 	"JPN",
 };
@@ -1426,7 +1427,7 @@ const char *const KyraEngine_HoF::_scriptLangExt[] = {
 	"EMC",
 	"FMC",
 	"GMC",/*,
-	"IMC",		Italian and Spanish were never included
+	"IMC",      Italian and Spanish were never included
 	"SMC"*/
 	"JMC"
 };
@@ -1605,7 +1606,7 @@ void KyraEngine_HoF::initInventoryButtonList() {
 	GUI_V2_BUTTON(_inventoryButtons[1], 0x2, 0x00, 0, 1, 1, 1, 0x4487, 0, 0x104, 0x90, 0x3C, 0x2C, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 	_inventoryButtons[1].buttonCallback = BUTTON_FUNCTOR(KyraEngine_HoF, this, &KyraEngine_HoF::cauldronButton);
 
-	GUI_V2_BUTTON(_inventoryButtons[2],	0x5, 0x00, 0, 1, 1, 1, 0x4487, 0, 0x0FA, 0x90, 0x0A, 0x2C, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
+	GUI_V2_BUTTON(_inventoryButtons[2], 0x5, 0x00, 0, 1, 1, 1, 0x4487, 0, 0x0FA, 0x90, 0x0A, 0x2C, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 	_inventoryButtons[2].buttonCallback = BUTTON_FUNCTOR(KyraEngine_HoF, this, &KyraEngine_HoF::cauldronClearButton);
 
 	GUI_V2_BUTTON(_inventoryButtons[3], 0x3, 0x00, 0, 1, 1, 1, 0x4487, 0, 0x0CE, 0x90, 0x2C, 0x2C, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
@@ -1639,14 +1640,14 @@ void GUI_HoF::initStaticData() {
 	GUI_V2_BUTTON(_scrollDownButton, 0x18, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x18, 0x0F, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 
 	for (int i = 0; i < 4; ++i)
-		GUI_V2_BUTTON(_sliderButtons[0][i], 0x18+i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
+		GUI_V2_BUTTON(_sliderButtons[0][i], 0x18 + i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 	for (int i = 0; i < 4; ++i)
-		GUI_V2_BUTTON(_sliderButtons[1][i], 0x1C+i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
+		GUI_V2_BUTTON(_sliderButtons[1][i], 0x1C + i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 	for (int i = 0; i < 4; ++i)
-		GUI_V2_BUTTON(_sliderButtons[2][i], 0x20+i, 0, 0, 0, 0, 0, 0x2200, 0, 0, 0, 0x6E, 0x0E, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
+		GUI_V2_BUTTON(_sliderButtons[2][i], 0x20 + i, 0, 0, 0, 0, 0, 0x2200, 0, 0, 0, 0x6E, 0x0E, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 
 	for (uint i = 0; i < ARRAYSIZE(_menuButtons); ++i)
-		GUI_V2_BUTTON(_menuButtons[i], 0x10+i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0, 0, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
+		GUI_V2_BUTTON(_menuButtons[i], 0x10 + i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0, 0, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 
 	Button::Callback clickLoadSlotFunctor = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::clickLoadSlot);
 	Button::Callback clickSaveSlotFunctor = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::clickSaveSlot);
@@ -1679,7 +1680,7 @@ void GUI_HoF::initStaticData() {
 		_mainMenu.numberOfItems = 6;
 		_mainMenu.item[6].enabled = false;
 		for (int i = 4; i < 6; ++i)
-			_mainMenu.item[i].callback = _mainMenu.item[i+1].callback;
+			_mainMenu.item[i].callback = _mainMenu.item[i + 1].callback;
 		_mainMenu.item[3].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::gameOptions);
 		_mainMenu.item[6].callback = Button::Callback();
 		_mainMenu.item[5].y = 0x7F;
@@ -1781,25 +1782,25 @@ void GUI_HoF::initStaticData() {
 }
 
 const uint16 GUI_HoF::_menuStringsTalkie[] = {
-	0x001, 0x002, 0x003, 0x023, 0x004, 0x025, 0x005, 0x006,	// Main Menu String IDs
-	0x025, 0x000, 0x000, 0x000, 0x010, 0x000, 0x000, 0x000,	// Options Menu String IDs
-	0x007, 0x000, 0x000, 0x000, 0x010, 0x000, 0x000, 0x000,	// Audio Menu String IDs
-	0x000, 0x014, 0x013, 0x000, 0x000, 0x000, 0x000, 0x000,	// Menu3 Menu String IDs
-	0x008, 0x029, 0x02A, 0x02B, 0x02C, 0x02D, 0x00B, 0x000,	// Load Menu String IDs
-	0x009, 0x029, 0x02A, 0x02B, 0x02C, 0x02D, 0x00B, 0x000,	// Save Menu String IDs
-	0x00C, 0x00D, 0x00B, 0x000, 0x000, 0x000, 0x000, 0x000,	// Menu6 Menu String IDs
-	0x00E, 0x002, 0x005, 0x000, 0x000, 0x000, 0x000, 0x000	// Death Menu String IDs
+	0x001, 0x002, 0x003, 0x023, 0x004, 0x025, 0x005, 0x006, // Main Menu String IDs
+	0x025, 0x000, 0x000, 0x000, 0x010, 0x000, 0x000, 0x000, // Options Menu String IDs
+	0x007, 0x000, 0x000, 0x000, 0x010, 0x000, 0x000, 0x000, // Audio Menu String IDs
+	0x000, 0x014, 0x013, 0x000, 0x000, 0x000, 0x000, 0x000, // Menu3 Menu String IDs
+	0x008, 0x029, 0x02A, 0x02B, 0x02C, 0x02D, 0x00B, 0x000, // Load Menu String IDs
+	0x009, 0x029, 0x02A, 0x02B, 0x02C, 0x02D, 0x00B, 0x000, // Save Menu String IDs
+	0x00C, 0x00D, 0x00B, 0x000, 0x000, 0x000, 0x000, 0x000, // Menu6 Menu String IDs
+	0x00E, 0x002, 0x005, 0x000, 0x000, 0x000, 0x000, 0x000  // Death Menu String IDs
 };
 
 const uint16 GUI_HoF::_menuStringsOther[] = {
-	0x009, 0x00A, 0x00B, 0x001, 0x00C, 0x00D, 0x00E, 0x000,	// Main Menu String IDs
-	0x00F, 0x02B, 0x02C, 0x02D, 0x02E, 0x018, 0x000, 0x000,	// Options Menu String IDs
-	0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,	// Dummy
-	0x000, 0x01C, 0x01B, 0x000, 0x000, 0x000, 0x000, 0x000,	// Menu3 Menu String IDs
-	0x010, 0x02F, 0x030, 0x031, 0x032, 0x033, 0x013, 0x000,	// Load Menu String IDs
-	0x011, 0x02F, 0x030, 0x031, 0x032, 0x033, 0x013, 0x000,	// Save Menu String IDs
-	0x014, 0x015, 0x013, 0x3E8, 0x000, 0x000, 0x000, 0x000,	// Menu6 String IDs
-	0x016, 0x00A, 0x00D, 0x000, 0x000, 0x000, 0x000, 0x000	// Death Menu String IDs
+	0x009, 0x00A, 0x00B, 0x001, 0x00C, 0x00D, 0x00E, 0x000, // Main Menu String IDs
+	0x00F, 0x02B, 0x02C, 0x02D, 0x02E, 0x018, 0x000, 0x000, // Options Menu String IDs
+	0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, // Dummy
+	0x000, 0x01C, 0x01B, 0x000, 0x000, 0x000, 0x000, 0x000, // Menu3 Menu String IDs
+	0x010, 0x02F, 0x030, 0x031, 0x032, 0x033, 0x013, 0x000, // Load Menu String IDs
+	0x011, 0x02F, 0x030, 0x031, 0x032, 0x033, 0x013, 0x000, // Save Menu String IDs
+	0x014, 0x015, 0x013, 0x3E8, 0x000, 0x000, 0x000, 0x000, // Menu6 String IDs
+	0x016, 0x00A, 0x00D, 0x000, 0x000, 0x000, 0x000, 0x000  // Death Menu String IDs
 };
 
 const uint16 KyraEngine_HoF::_itemMagicTable[] = {
@@ -1915,20 +1916,20 @@ const char *const KyraEngine_MR::_languageExtension[] = {
 	"TRE",
 	"TRF",
 	"TRG"/*,
-	"TRI",		Italian and Spanish were never included, the supported fan translations are using
-	"TRS"		English/French extensions thus overwriting these languages */
+	"TRI",      Italian and Spanish were never included, the supported fan translations are using
+	"TRS"       English/French extensions thus overwriting these languages */
 };
 
 const int KyraEngine_MR::_languageExtensionSize = ARRAYSIZE(KyraEngine_MR::_languageExtension);
 
-const char * const KyraEngine_MR::_mainMenuSpanishFan[] = {
+const char *const KyraEngine_MR::_mainMenuSpanishFan[] = {
 	"Nueva Partida",
 	"Ver Intro",
 	"Restaurar",
 	"Finalizar"
 };
 
-const char * const KyraEngine_MR::_mainMenuItalianFan[] = {
+const char *const KyraEngine_MR::_mainMenuItalianFan[] = {
 	"Nuova Partita",
 	"Introduzione",
 	"Carica una partita",
@@ -2024,13 +2025,13 @@ void KyraEngine_MR::initMainButtonList(bool disable) {
 
 		Button::Callback buttonInventoryFunctor = BUTTON_FUNCTOR(KyraEngine_MR, this, &KyraEngine_MR::buttonInventory);
 		for (int i = 0; i < 5; ++i) {
-			GUI_V2_BUTTON(_mainButtonData[i+4], i+5, 0, 0, 0, 0, 0, 0x1100, 0, 67+i*28, 155, 27, 21, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
-			_mainButtonData[i+4].buttonCallback = buttonInventoryFunctor;
+			GUI_V2_BUTTON(_mainButtonData[i + 4], i + 5, 0, 0, 0, 0, 0, 0x1100, 0, 67 + i * 28, 155, 27, 21, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
+			_mainButtonData[i + 4].buttonCallback = buttonInventoryFunctor;
 		}
 
 		for (int i = 0; i < 5; ++i) {
-			GUI_V2_BUTTON(_mainButtonData[i+9], i+10, 0, 0, 0, 0, 0, 0x1100, 0, 67+i*28, 177, 27, 21, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
-			_mainButtonData[i+9].buttonCallback = buttonInventoryFunctor;
+			GUI_V2_BUTTON(_mainButtonData[i + 9], i + 10, 0, 0, 0, 0, 0, 0x1100, 0, 67 + i * 28, 177, 27, 21, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
+			_mainButtonData[i + 9].buttonCallback = buttonInventoryFunctor;
 		}
 
 		for (int i = 0; i < 14; ++i)
@@ -2052,14 +2053,14 @@ void GUI_MR::initStaticData() {
 	GUI_V2_BUTTON(_scrollDownButton, 23, 0, 0, 4, 4, 4, 0x4487, 0, 0, 0, 0x18, 0x0F, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
 
 	for (int i = 0; i < 4; ++i)
-		GUI_V2_BUTTON(_sliderButtons[0][i], 0x18+i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
+		GUI_V2_BUTTON(_sliderButtons[0][i], 0x18 + i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
 	for (int i = 0; i < 4; ++i)
-		GUI_V2_BUTTON(_sliderButtons[1][i], 0x1C+i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
+		GUI_V2_BUTTON(_sliderButtons[1][i], 0x1C + i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
 	for (int i = 0; i < 4; ++i)
-		GUI_V2_BUTTON(_sliderButtons[2][i], 0x20+i, 0, 0, 0, 0, 0, 0x2200, 0, 0, 0, 0x6E, 0x0E, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
+		GUI_V2_BUTTON(_sliderButtons[2][i], 0x20 + i, 0, 0, 0, 0, 0, 0x2200, 0, 0, 0, 0x6E, 0x0E, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
 
 	for (uint i = 0; i < ARRAYSIZE(_menuButtons); ++i)
-		GUI_V2_BUTTON(_menuButtons[i], 0x0F+i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0, 0, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
+		GUI_V2_BUTTON(_menuButtons[i], 0x0F + i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0, 0, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
 
 	Button::Callback clickLoadSlotFunctor = BUTTON_FUNCTOR(GUI_MR, this, &GUI_MR::clickLoadSlot);
 	Button::Callback clickSaveSlotFunctor = BUTTON_FUNCTOR(GUI_MR, this, &GUI_MR::clickSaveSlot);
@@ -2158,7 +2159,7 @@ void GUI_MR::initStaticData() {
 }
 
 const int8 KyraEngine_MR::_albumWSAX[] = {
-	  0, 77, -50, 99, -61, 82, -58, 85,
+	 0, 77, -50, 99, -61, 82, -58, 85,
 	-64, 80, -63, 88, -63, 88, -64,  0
 };
 
diff --git a/engines/kyra/text_lok.cpp b/engines/kyra/text_lok.cpp
index 0ee3574903..62bdf18816 100644
--- a/engines/kyra/text_lok.cpp
+++ b/engines/kyra/text_lok.cpp
@@ -188,7 +188,7 @@ int8 KyraEngine_LoK::getChatPartnerNum() {
 
 	for (int i = 1; i < 6; i++) {
 		if (_currentCharacter->sceneId == sceneTable[pos]) {
-			partner = sceneTable[pos+1];
+			partner = sceneTable[pos + 1];
 			break;
 		}
 		pos += 2;
@@ -342,12 +342,12 @@ void KyraEngine_LoK::drawSentenceCommand(const char *sentence, int color) {
 			_currSentenceColor[2] = 0x3F;
 
 			_screen->setInterfacePalette(_screen->getPalette(1),
-					_currSentenceColor[0], _currSentenceColor[1], _currSentenceColor[2]);
+			                             _currSentenceColor[0], _currSentenceColor[1], _currSentenceColor[2]);
 		}
 	} else if (_startSentencePalIndex != color || _fadeText != false) {
-		_currSentenceColor[0] = _screen->getPalette(0)[765] = _screen->getPalette(0)[color*3+0];
-		_currSentenceColor[1] = _screen->getPalette(0)[766] = _screen->getPalette(0)[color*3+1];
-		_currSentenceColor[2] = _screen->getPalette(0)[767] = _screen->getPalette(0)[color*3+2];
+		_currSentenceColor[0] = _screen->getPalette(0)[765] = _screen->getPalette(0)[color * 3 + 0];
+		_currSentenceColor[1] = _screen->getPalette(0)[766] = _screen->getPalette(0)[color * 3 + 1];
+		_currSentenceColor[2] = _screen->getPalette(0)[767] = _screen->getPalette(0)[color * 3 + 2];
 
 		_screen->setScreenPalette(_screen->getPalette(0));
 		_startSentencePalIndex = color;
@@ -377,16 +377,15 @@ void KyraEngine_LoK::updateTextFade() {
 	for (int i = 0; i < 3; i++) {
 		if (_currSentenceColor[i] > 4)
 			_currSentenceColor[i] -= 4;
-		else
-			if (_currSentenceColor[i]) {
-				_currSentenceColor[i] = 0;
-				finished = true;
-			}
+		else if (_currSentenceColor[i]) {
+			_currSentenceColor[i] = 0;
+			finished = true;
+		}
 	}
 
 	if (_flags.platform == Common::kPlatformAmiga) {
 		_screen->setInterfacePalette(_screen->getPalette(1),
-				_currSentenceColor[0], _currSentenceColor[1], _currSentenceColor[2]);
+		                             _currSentenceColor[0], _currSentenceColor[1], _currSentenceColor[2]);
 	} else {
 		_screen->getPalette(0)[765] = _currSentenceColor[0];
 		_screen->getPalette(0)[766] = _currSentenceColor[1];
diff --git a/engines/kyra/timer_lok.cpp b/engines/kyra/timer_lok.cpp
index 555b3680e2..13f5403618 100644
--- a/engines/kyra/timer_lok.cpp
+++ b/engines/kyra/timer_lok.cpp
@@ -155,7 +155,7 @@ void KyraEngine_LoK::setTextFadeTimerCountdown(int16 countdown) {
 	if (countdown == -1)
 		countdown = 32000;
 
-	_timer->setCountdown(31, countdown*60);
+	_timer->setCountdown(31, countdown * 60);
 }
 
 void KyraEngine_LoK::timerAsInvisibleTimeout(int timerNum) {
diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp
index 076c5861a2..f6aca2bb82 100644
--- a/engines/kyra/wsamovie.cpp
+++ b/engines/kyra/wsamovie.cpp
@@ -28,10 +28,12 @@
 namespace Kyra {
 
 WSAMovie_v1::WSAMovie_v1(KyraEngine_v1 *vm)
-    : Movie(vm), _frameData(0), _frameOffsTable(0), _offscreenBuffer(0), _deltaBuffer(0) {
+	: Movie(vm), _frameData(0), _frameOffsTable(0), _offscreenBuffer(0), _deltaBuffer(0) {
 }
 
-WSAMovie_v1::~WSAMovie_v1() { close(); }
+WSAMovie_v1::~WSAMovie_v1() {
+	close();
+}
 
 int WSAMovie_v1::open(const char *filename, int offscreenDecode, Palette *palBuf) {
 	close();
@@ -251,7 +253,7 @@ void WSAMovieAmiga::displayFrame(int frameNum, int pageNum, int x, int y, uint16
 
 	uint8 *dst;
 	dst = _buffer;
-	memset(_buffer, 0, _width*_height);
+	memset(_buffer, 0, _width * _height);
 
 	if (_currentFrame == _numFrames) {
 		if (!(_flags & WF_NO_FIRST_FRAME)) {
@@ -330,7 +332,7 @@ void WSAMovieAmiga::processFrame(int frameNum, uint8 *dst) {
 		return;
 	assert(frameNum <= _numFrames);
 
-	memset(dst, 0, _width*_height);
+	memset(dst, 0, _width * _height);
 
 	const uint8 *src = _frameData + _frameOffsTable[frameNum];
 	Screen::decodeFrame4(src, _deltaBuffer, _deltaBufferSize);
-- 
cgit v1.2.3


From fb074000869310cbc949deeb14d8380aa0f93e0d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 22:34:35 +0200
Subject: DREAMWEB: Remove dead code

---
 engines/dreamweb/print.cpp    |  9 ---------
 engines/dreamweb/stubs.h      |  4 ----
 engines/dreamweb/vgagrafx.cpp | 21 ---------------------
 3 files changed, 34 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 0191aa8860..6cb25412dd 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -120,15 +120,6 @@ uint8 DreamBase::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWid
 	} while (true);
 }
 
-void DreamGenContext::printDirect() {
-	uint16 y = bx;
-	const uint8 *initialString = es.ptr(si, 0);
-	const uint8 *string = initialString;
-	al = DreamBase::printDirect(&string, di, &y, dl, (bool)(dl & 1));
-	si += (string - initialString);
-	bx = y;
-}
-
 uint8 DreamBase::printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 	return printDirect(&string, x, &y, maxWidth, centered);
 }
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 7fa403bbb7..3536b7d07c 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -24,15 +24,12 @@
 
 	void screenUpdate();
 	void startup1();
-	void multiGet();
 	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height) {
 		DreamBase::multiGet(dst, x, y, width, height);
 	}
-	void multiPut();
 	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height) {
 		DreamBase::multiPut(src, x, y, width, height);
 	}
-	void multiDump();
 	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
 		DreamBase::multiDump(x, y, width, height);
 	}
@@ -40,7 +37,6 @@
 	void readOneBlock();
 	void seeCommandTail();
 	void quickQuit2();
-	void printDirect();
 	uint8 printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered) {
 		return DreamBase::printDirect(string, x, y, maxWidth, centered);
 	}
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index ecb295a353..06743ed3bb 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -27,13 +27,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::multiGet() {
-	multiGet(ds.ptr(si, 0), di, bx, cl, ch);
-	si += cl * ch;
-	di += bx * kScreenwidth + kScreenwidth * ch;
-	cx = 0;
-}
-
 void DreamBase::multiGet(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
 	assert(x < 320);
 	assert(y < 200);
@@ -50,13 +43,6 @@ void DreamBase::multiGet(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
 	}
 }
 
-void DreamGenContext::multiPut() {
-	multiPut(ds.ptr(si, 0), di, bx, cl, ch);
-	si += cl * ch;
-	di += bx * kScreenwidth + kScreenwidth * ch;
-	cx = 0;
-}
-
 void DreamBase::multiPut(const uint8 *src, uint16 x, uint16 y, uint8 w, uint8 h) {
 	assert(x < 320);
 	assert(y < 200);
@@ -73,13 +59,6 @@ void DreamBase::multiPut(const uint8 *src, uint16 x, uint16 y, uint8 w, uint8 h)
 	}
 }
 
-void DreamGenContext::multiDump() {
-	multiDump(di, bx, cl, ch);
-	unsigned offset = di + bx * kScreenwidth;
-	si = di = offset + ch * kScreenwidth;
-	cx = 0;
-}
-
 void DreamBase::multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
 	unsigned offset = x + y * kScreenwidth;
 	//debug(1, "multiDump %ux%u(segment: %04x) -> %d,%d(address: %d)", w, h, (uint16)ds, x, y, offset);
-- 
cgit v1.2.3


From a75d39895b882a2bcc1b6469b1e75265bab2ac6c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 26 Dec 2011 22:47:14 +0200
Subject: DREAMWEB: Move some functions to DreamBase, remove dead code

---
 engines/dreamweb/dreambase.h |  7 +++++++
 engines/dreamweb/monitor.cpp |  4 ++--
 engines/dreamweb/object.cpp  |  4 ----
 engines/dreamweb/stubs.cpp   | 10 +++++-----
 engines/dreamweb/stubs.h     | 21 ---------------------
 5 files changed, 14 insertions(+), 32 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index c17a15e34a..1502e391fa 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -595,6 +595,13 @@ public:
 	void errorMessage2();
 	void errorMessage3();
 	void decide();
+	void allPointer();
+	void dumpWatch();
+	void watchCount();
+	void signOn();
+	void searchForFiles(uint16 segment);
+	void triggerMessage(uint16 index);
+	void processTrigger();
 
 	// from talk.cpp
 	void talk();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 0caf4b7c25..db3401e078 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -551,7 +551,7 @@ void DreamGenContext::read() {
 	}
 }
 
-void DreamGenContext::signOn() {
+void DreamBase::signOn() {
 	const char *name = parser();
 
 	int8 foundIndex = -1;
@@ -609,7 +609,7 @@ void DreamGenContext::signOn() {
 	}
 }
 
-void DreamGenContext::searchForFiles(uint16 segment) {
+void DreamBase::searchForFiles(uint16 segment) {
 	const char *filesString = (const char *)getSegment(segment).ptr(kTextstart, 0);
 	byte curChar;
 
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 4fa21e7618..31a5af0bb5 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -78,10 +78,6 @@ void DreamBase::makeWorn(DynObject *object) {
 	object->id[1] = 'E'-'A';
 }
 
-void DreamGenContext::obToInv() {
-	obToInv(al, ah, di, bx);
-}
-
 void DreamBase::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 	showFrame(engine->icons1(), x - 2, y - 1, 10, 0);
 	if (index == 0xff)
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index ca98337261..c8aac95e72 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -842,7 +842,7 @@ void DreamBase::putUnderTimed() {
 		multiPut(_underTimedText, data.byte(kTimedx), data.byte(kTimedy), 240, kUnderTimedTextSizeY);
 }
 
-void DreamGenContext::triggerMessage(uint16 index) {
+void DreamBase::triggerMessage(uint16 index) {
 	multiGet(mapStore(), 174, 153, 200, 63);
 	uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(index * 2);
 	const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
@@ -856,7 +856,7 @@ void DreamGenContext::triggerMessage(uint16 index) {
 	data.byte(kLasttrigger) = 0;
 }
 
-void DreamGenContext::processTrigger() {
+void DreamBase::processTrigger() {
 	if (data.byte(kLasttrigger) == '1') {
 		setLocation(8);
 		triggerMessage(45);
@@ -1937,7 +1937,7 @@ void DreamBase::showWatch() {
 	}
 }
 
-void DreamGenContext::dumpWatch() {
+void DreamBase::dumpWatch() {
 	if (data.byte(kWatchdump) != 1)
 		return;
 	multiDump(256, 21, 40, 12);
@@ -1965,7 +1965,7 @@ void DreamBase::showTime() {
 	showFrame(charset, 267+5, 21, 91*3+20, 0);
 }
 
-void DreamGenContext::watchCount() {
+void DreamBase::watchCount() {
 	if (data.byte(kWatchon) == 0)
 		return;
 	++data.byte(kTimercount);
@@ -2785,7 +2785,7 @@ void DreamBase::blank() {
 	}
 }
 
-void DreamGenContext::allPointer() {
+void DreamBase::allPointer() {
 	readMouse();
 	showPointer();
 	dumpPointer();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 3536b7d07c..24a7c081b5 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -47,30 +47,15 @@
 	bool checkIfPerson(uint8 x, uint8 y);
 	bool checkIfFree(uint8 x, uint8 y);
 	bool checkIfEx(uint8 x, uint8 y);
-	DynObject *getFreeAd(uint8 index) {
-		return DreamBase::getFreeAd(index);
-	}
-	DynObject *getExAd(uint8 index) {
-		return DreamBase::getExAd(index);
-	}
-	void *getAnyAd(uint8 *slotSize, uint8 *slotCount) {
-		return DreamBase::getAnyAd(slotSize, slotCount);
-	}
-	SetObject *getSetAd(uint8 index) {
-		return DreamBase::getSetAd(index);
-	}
 	void walkAndExamine();
 	void obName(uint8 command, uint8 commandType);
 
 	bool checkIfSet(uint8 x, uint8 y);
-	void obToInv();
 	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 		DreamBase::obToInv(index, flag, x, y);
 	}
 	void useRoutine();
 	void examineOb(bool examineAgain = true);
-	void dumpWatch();
-	void watchCount();
 	void readSetData();
 	void useMon();
 	void makeCaps();
@@ -94,24 +79,18 @@
 	void doLook();
 	void useKey();
 	void useObject();
-	void singleKey(uint8 key, uint16 x, uint16 y);
 	void inventory();
 	void mainScreen();
 	void zoomOnOff();
 	void initialInv();
 	void walkIntoRoom();
-	void allPointer();
 	void afterNewRoom();
 	void madmanRun();
 	void showGun();
-	void triggerMessage(uint16 index);
-	void processTrigger();
 	bool execCommand();
 	void identifyOb();
 	void selectOb();
 	void getKeyAndLogo();
-	void signOn();
-	void searchForFiles(uint16 segment);
 	void read();
 	void dirCom();
 
-- 
cgit v1.2.3


From 2ec65882e885730e05b074063ce71caaba7cd2fc Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Mon, 26 Dec 2011 14:46:56 -0600
Subject: KYRA: (EOB) Flag eob and eob2 with ADGF_UNSTABLE

---
 engines/kyra/detection_tables.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index 50a154dcf3..ea950112ad 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -1454,7 +1454,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			ADGF_NO_FLAGS,
+			ADGF_UNSTABLE,
 			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
 		},
 		EOB_FLAGS
@@ -1470,7 +1470,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			ADGF_NO_FLAGS,
+			ADGF_UNSTABLE,
 			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
 		},
 		EOB_FLAGS
@@ -1486,7 +1486,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			ADGF_NO_FLAGS,
+			ADGF_UNSTABLE,
 			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
 		},
 		EOB2_FLAGS
@@ -1502,7 +1502,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			ADGF_NO_FLAGS,
+			ADGF_UNSTABLE,
 			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
 		},
 		EOB2_FLAGS
-- 
cgit v1.2.3


From 2cd0b29de182be4f01caddaa4e66582ab780bcd4 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 26 Dec 2011 21:56:40 +0100
Subject: DREAMWEB: Convert searchForString

---
 engines/dreamweb/dreambase.h  |  1 +
 engines/dreamweb/dreamgen.cpp | 44 -------------------------------------------
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/monitor.cpp  | 40 +++++++++++++++++++++++++++++++++++++++
 engines/dreamweb/stubs.h      |  4 ++++
 5 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 1502e391fa..d9b77c1ec0 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -181,6 +181,7 @@ public:
 	void loadCart();
 	void showKeys();
 	const char *parser();
+	const char *searchForString(const char *topic, const char *text);
 
 	// from newplace.cpp
 	void getUnderCentre();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index a4eeeacd2f..4a0611d594 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -104,50 +104,6 @@ endofdir2:
 	scrollMonitor();
 }
 
-void DreamGenContext::searchForString() {
-	STACK_CHECK;
-	dl = es.byte(di);
-	cx = di;
-restartlook:
-	di = cx;
-	bx = si;
-	dh = 0;
-keeplooking:
-	_lodsb();
-	makeCaps();
-	_cmp(al, '*');
-	if (flags.z())
-		goto notfound;
-	_cmp(dl, '=');
-	if (!flags.z())
-		goto nofindingtopic;
-	_cmp(al, 34);
-	if (flags.z())
-		goto notfound;
-nofindingtopic:
-	ah = es.byte(di);
-	_cmp(al, dl);
-	if (!flags.z())
-		goto notbracket;
-	_inc(dh);
-	_cmp(dh, 2);
-	if (flags.z())
-		goto complete;
-notbracket:
-	_cmp(al, ah);
-	if (!flags.z())
-		goto restartlook;
-	_inc(di);
-	goto keeplooking;
-complete:
-	es = ds;
-	al = 0;
-	bx = si;
-	return;
-notfound:
-	al = 1;
-}
-
 void DreamGenContext::__start() { 
 	static const uint8 src[] = {
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x13, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 48b413807c..d4778693b1 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -417,7 +417,6 @@ public:
 
 	void dirFile();
 	void dreamweb();
-	void searchForString();
 };
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index db3401e078..f1b870d9c0 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -662,5 +662,45 @@ const char *DreamBase::parser() {
 	return output;
 }
 
+void DreamGenContext::searchForString() {
+	const char *topic = (const char*)es.ptr(di, 0);
+	const char *text =  (const char*)ds.ptr(si, 0);
+	const char *found = searchForString(topic, text);
+	if (!found) {
+		al = 1;
+	} else {
+		es = ds;
+		bx = si + (found - text);
+		si = bx;
+		al = 0;
+	}
+}
+
+// input: es:di : topic
+//        ds:si : monitor text
+const char *DreamBase::searchForString(const char *topic, const char *text) {
+	char delim = *topic;
+
+	while (true) {
+		const char *s = topic;
+		int delimCount = 0;
+
+		char c;
+		do {
+			c = makeCaps(*text++);
+
+			if (c == '*' || (delim == '=' && c == 34))
+				return 0;
+
+			if (c == delim) {
+				delimCount++;
+				if (delimCount == 2)
+					return text;
+			}
+
+		} while (c == *s++);
+	}
+}
+
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 24a7c081b5..9cbb286022 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -93,5 +93,9 @@
 	void getKeyAndLogo();
 	void read();
 	void dirCom();
+	void searchForString();
+	const char *searchForString(const char *topic, const char *text) {
+		return DreamBase::searchForString(topic, text);
+	}
 
 #endif
-- 
cgit v1.2.3


From b3b904ddabcda8c39c5b40eec1e2c6c0e14e4ef3 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 26 Dec 2011 22:13:26 +0100
Subject: KYRA: Avoid deleting pointer twice after creating EOB2 party

It probably happened in EOB as well, but I only actually observed
it in EOB2.
---
 engines/kyra/chargen.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 16911a3ddd..e0f1ac37d9 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -1318,8 +1318,10 @@ void CharacterGenerator::finish() {
 		_chargenMagicShapes = 0;
 	}
 
-	for (int i = 0; i < 17; i++)
+	for (int i = 0; i < 17; i++) {
 		delete[] _chargenButtonLabels[i];
+		_chargenButtonLabels[i] = 0;
+	}
 }
 
 const EoBChargenButtonDef CharacterGenerator::_chargenButtonDefs[] = {
-- 
cgit v1.2.3


From 6a7e798f465afb0f188b85664dee5ae2cda93a4a Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Mon, 26 Dec 2011 21:23:38 +0000
Subject: DREAMWEB: Ported 'dirfile' to C++

Needs some checking of es:di usage and work to remove _operand1 to
dreambase.h
---
 engines/dreamweb/dreamgen.cpp | 77 -------------------------------------------
 engines/dreamweb/monitor.cpp  | 55 +++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 77 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 4a0611d594..13cb4253ae 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -26,83 +26,6 @@
 
 namespace DreamGen {
 
-void DreamGenContext::dirFile() {
-	STACK_CHECK;
-	al = 34;
-	es.byte(di) = al;
-	push(es);
-	push(di);
-	ds = data.word(kTextfile1);
-	si = (66*2);
-	searchForString();
-	_cmp(al, 0);
-	if (flags.z())
-		goto foundfile;
-	di = pop();
-	es = pop();
-	push(es);
-	push(di);
-	ds = data.word(kTextfile2);
-	si = (66*2);
-	searchForString();
-	_cmp(al, 0);
-	if (flags.z())
-		goto foundfile;
-	di = pop();
-	es = pop();
-	push(es);
-	push(di);
-	ds = data.word(kTextfile3);
-	si = (66*2);
-	searchForString();
-	_cmp(al, 0);
-	if (flags.z())
-		goto foundfile;
-	di = pop();
-	es = pop();
-	al = 7;
-	monMessage();
-	return;
-foundfile:
-	ax = pop();
-	ax = pop();
-	getKeyAndLogo();
-	_cmp(al, 0);
-	if (flags.z())
-		goto keyok2;
-	return;
-keyok2:
-	push(es);
-	push(bx);
-	ds = cs;
-	si = offset_operand1+1;
-	es = cs;
-	di = 408+1;
-	cx = 12;
-	_movsb(cx, true);
-	monitorLogo();
-	scrollMonitor();
-	al = 10;
-	monMessage();
-	bx = pop();
-	es = pop();
-directloop2:
-	al = es.byte(bx);
-	_inc(bx);
-	_cmp(al, 34);
-	if (flags.z())
-		goto endofdir2;
-	_cmp(al, '*');
-	if (flags.z())
-		goto endofdir2;
-	_cmp(al, '=');
-	if (!flags.z())
-		goto directloop2;
-	monPrint();
-	goto directloop2;
-endofdir2:
-	scrollMonitor();
-}
 
 void DreamGenContext::__start() { 
 	static const uint8 src[] = {
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index f1b870d9c0..7e88838a7d 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -453,6 +453,61 @@ void DreamGenContext::getKeyAndLogo() {
 	}
 }
 
+void DreamGenContext::dirFile() {
+	bool foundFile = false;
+
+	es.byte(di) = 34;
+
+	ds = data.word(kTextfile1);
+	si = kTextstart;
+	searchForString();
+	if (al == 0) {
+		foundFile = true;
+	} else {
+		ds = data.word(kTextfile2);
+		si = kTextstart;
+		searchForString();
+		if (al == 0) {
+			foundFile = true;
+		} else {
+			ds = data.word(kTextfile3);
+			si = kTextstart;
+			searchForString();
+			if (al == 0)
+				foundFile = true;
+		}
+	}
+
+	if (!foundFile) {
+		monMessage(7);
+		return;
+	}
+
+	// "foundfile"
+	getKeyAndLogo();
+	if (al != 0)
+		return;
+
+	// "keyok2"
+	memcpy(data.ptr(kCurrentfile+1, 0), data.ptr(offset_operand1+1, 0), 12);
+	monitorLogo();
+	scrollMonitor();
+	monMessage(10);
+
+	while (true) {
+		al = es.byte(bx);
+		bx++;
+		if (al == 34 || al == '*') {
+			// "endofdir2"
+			scrollMonitor();
+			return;
+		}
+
+		if (al == '=')
+			monPrint();
+	}
+}
+
 void DreamGenContext::dirCom() {
 	randomAccess(30);
 
-- 
cgit v1.2.3


From 72800fac9dab26d1a774a7a76ddc3b7c3c870ccf Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Mon, 26 Dec 2011 23:06:49 +0000
Subject: DREAMWEB: Improved 'getKeyAndLogo' function signature.

This removes a remaining al usage.
---
 engines/dreamweb/monitor.cpp | 12 +++++-------
 engines/dreamweb/stubs.h     |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 7e88838a7d..72cb4a3735 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -436,7 +436,7 @@ void DreamBase::showKeys() {
 	scrollMonitor();
 }
 
-void DreamGenContext::getKeyAndLogo() {
+bool DreamGenContext::getKeyAndLogo() {
 	byte newLogo = es.byte(bx + 1) - 48;
 	byte keyNum = es.byte(bx + 1 + 2) - 48;
 	bx += 1 + 2 + 1;
@@ -444,12 +444,12 @@ void DreamGenContext::getKeyAndLogo() {
 	if (monitorKeyEntries[keyNum].keyAssigned == 1) {
 		// Key OK
 		data.byte(kLogonum) = newLogo;
-		al = 0;
+		return false;
 	} else {
 		monMessage(12);	// "Access denied, key required -"
 		monPrint(monitorKeyEntries[keyNum].username);
 		scrollMonitor();
-		al = 1;
+		return true;
 	}
 }
 
@@ -484,8 +484,7 @@ void DreamGenContext::dirFile() {
 	}
 
 	// "foundfile"
-	getKeyAndLogo();
-	if (al != 0)
+	if (getKeyAndLogo())
 		return;
 
 	// "keyok2"
@@ -572,8 +571,7 @@ void DreamGenContext::read() {
 	}
 
 	// "foundfile2"
-	getKeyAndLogo();
-	if (al != 0)
+	if (getKeyAndLogo())
 		return;
 
 	// "keyok1"
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 9cbb286022..ce2fefb615 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -90,7 +90,7 @@
 	bool execCommand();
 	void identifyOb();
 	void selectOb();
-	void getKeyAndLogo();
+	bool getKeyAndLogo();
 	void read();
 	void dirCom();
 	void searchForString();
-- 
cgit v1.2.3


From b4062765293df384f8db8633bd1cd8bd88f79e95 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 27 Dec 2011 01:48:25 +0200
Subject: DREAMWEB: Cleanup of getKeyAndLogo(), dirFile() and read()

---
 engines/dreamweb/monitor.cpp | 219 +++++++++++++++++--------------------------
 engines/dreamweb/stubs.h     |   3 +-
 2 files changed, 89 insertions(+), 133 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 72cb4a3735..ddf12777e5 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -436,74 +436,43 @@ void DreamBase::showKeys() {
 	scrollMonitor();
 }
 
-bool DreamGenContext::getKeyAndLogo() {
-	byte newLogo = es.byte(bx + 1) - 48;
-	byte keyNum = es.byte(bx + 1 + 2) - 48;
-	bx += 1 + 2 + 1;
+bool DreamGenContext::getKeyAndLogo(const char *foundString) {
+	byte newLogo = foundString[1] - 48;
+	byte keyNum = foundString[3] - 48;
 
 	if (monitorKeyEntries[keyNum].keyAssigned == 1) {
 		// Key OK
 		data.byte(kLogonum) = newLogo;
-		return false;
+		return true;
 	} else {
 		monMessage(12);	// "Access denied, key required -"
 		monPrint(monitorKeyEntries[keyNum].username);
 		scrollMonitor();
-		return true;
+		return false;
 	}
 }
 
-void DreamGenContext::dirFile() {
-	bool foundFile = false;
-
-	es.byte(di) = 34;
-
-	ds = data.word(kTextfile1);
-	si = kTextstart;
-	searchForString();
-	if (al == 0) {
-		foundFile = true;
-	} else {
-		ds = data.word(kTextfile2);
-		si = kTextstart;
-		searchForString();
-		if (al == 0) {
-			foundFile = true;
-		} else {
-			ds = data.word(kTextfile3);
-			si = kTextstart;
-			searchForString();
-			if (al == 0)
-				foundFile = true;
-		}
-	}
+const char *DreamBase::searchForString(const char *topic, const char *text) {
+	char delim = *topic;
 
-	if (!foundFile) {
-		monMessage(7);
-		return;
-	}
+	while (true) {
+		const char *s = topic;
+		int delimCount = 0;
 
-	// "foundfile"
-	if (getKeyAndLogo())
-		return;
+		char c;
+		do {
+			c = makeCaps(*text++);
 
-	// "keyok2"
-	memcpy(data.ptr(kCurrentfile+1, 0), data.ptr(offset_operand1+1, 0), 12);
-	monitorLogo();
-	scrollMonitor();
-	monMessage(10);
+			if (c == '*' || (delim == '=' && c == 34))
+				return 0;
 
-	while (true) {
-		al = es.byte(bx);
-		bx++;
-		if (al == 34 || al == '*') {
-			// "endofdir2"
-			scrollMonitor();
-			return;
-		}
+			if (c == delim) {
+				delimCount++;
+				if (delimCount == 2)
+					return text;
+			}
 
-		if (al == '=')
-			monPrint();
+		} while (c == *s++);
 	}
 }
 
@@ -529,9 +498,54 @@ void DreamGenContext::dirCom() {
 	scrollMonitor();
 }
 
-void DreamGenContext::read() {
-	bool foundFile = false;
+void DreamGenContext::dirFile() {
+	es.byte(di) = 34;
 
+	const char *topic = (const char*)es.ptr(di, 0);
+
+	const char *text = (const char *)getSegment(data.word(kTextfile1)).ptr(kTextstart, 0);
+	const char *found = searchForString(topic, text);
+	if (!found) {
+		text = (const char *)getSegment(data.word(kTextfile2)).ptr(kTextstart, 0);
+		found = searchForString(topic, text);
+		if (!found) {
+			text = (const char *)getSegment(data.word(kTextfile3)).ptr(kTextstart, 0);
+			found = searchForString(topic, text);
+		}
+	}
+
+	if (found) {
+		if (!getKeyAndLogo(found))
+			return;
+	} else {
+		monMessage(7);
+		return;
+	}
+
+	// "keyok2"
+	memcpy(data.ptr(kCurrentfile+1, 0), data.ptr(offset_operand1+1, 0), 12);
+	monitorLogo();
+	scrollMonitor();
+	monMessage(10);
+
+	byte curChar;
+	found += 1 + 2 + 1;
+
+	while (true) {
+		curChar = found[0];
+		found++;
+		if (curChar == 34 || curChar == '*') {
+			// "endofdir2"
+			scrollMonitor();
+			return;
+		}
+
+		if (curChar == '=')
+			found = monPrint(found);
+	}
+}
+
+void DreamGenContext::read() {
 	randomAccess(40);
 	const char *name = parser();
 	if (name[1] == 0) {
@@ -539,61 +553,45 @@ void DreamGenContext::read() {
 		return;
 	}
 
-	es = cs;
-	di = kCurrentfile;
+	const char *topic = (const char*)cs.ptr(kCurrentfile, 0);
 
-	data.word(kMonsource) = data.word(kTextfile1);
-	ds = data.word(kMonsource);
-	si = kTextstart;
-	searchForString();
-	if (al == 0) {
-		foundFile = true;
-	} else {
-		data.word(kMonsource) = data.word(kTextfile2);
-		ds = data.word(kMonsource);
-		si = kTextstart;
-		searchForString();
-		if (al == 0) {
-			foundFile = true;
-		} else {
-			data.word(kMonsource) = data.word(kTextfile3);
-			ds = data.word(kMonsource);
-			si = kTextstart;
-			searchForString();
-			if (al == 0)
-				foundFile = true;
+	const char *text = (const char *)getSegment(data.word(kTextfile1)).ptr(kTextstart, 0);
+	const char *found = searchForString(topic, text);
+	if (!found) {
+		text = (const char *)getSegment(data.word(kTextfile2)).ptr(kTextstart, 0);
+		found = searchForString(topic, text);
+		if (!found) {
+			text = (const char *)getSegment(data.word(kTextfile3)).ptr(kTextstart, 0);
+			found = searchForString(topic, text);
 		}
 	}
 
-	if (!foundFile) {
+	if (found) {
+		if (!getKeyAndLogo(found))
+			return;
+	} else {
 		monMessage(7);
 		return;
 	}
 
-	// "foundfile2"
-	if (getKeyAndLogo())
-		return;
-
 	// "keyok1"
-	es = cs;
-	di = offset_operand1;
-	ds = data.word(kMonsource);
-	searchForString();
-	if (al != 0) {
+	topic = (const char*)cs.ptr(offset_operand1, 0);
+	found = searchForString(topic, found);
+	if (!found) {
 		data.byte(kLogonum) = data.byte(kOldlogonum);
 		monMessage(11);
 		return;
 	}
 
 	// "findtopictext"
-	bx++;
-
 	monitorLogo();
 	scrollMonitor();
 
+	found++;
+
 	while (true) {
-		monPrint();
-		if (es.byte(bx) == 34 || es.byte(bx) == '=' || es.byte(bx) == '*') {
+		found = monPrint(found);
+		if (found[0] == 34 || found[0] == '=' || found[0] == '*') {
 			// "endoftopic"
 			scrollMonitor();
 			return;
@@ -715,45 +713,4 @@ const char *DreamBase::parser() {
 	return output;
 }
 
-void DreamGenContext::searchForString() {
-	const char *topic = (const char*)es.ptr(di, 0);
-	const char *text =  (const char*)ds.ptr(si, 0);
-	const char *found = searchForString(topic, text);
-	if (!found) {
-		al = 1;
-	} else {
-		es = ds;
-		bx = si + (found - text);
-		si = bx;
-		al = 0;
-	}
-}
-
-// input: es:di : topic
-//        ds:si : monitor text
-const char *DreamBase::searchForString(const char *topic, const char *text) {
-	char delim = *topic;
-
-	while (true) {
-		const char *s = topic;
-		int delimCount = 0;
-
-		char c;
-		do {
-			c = makeCaps(*text++);
-
-			if (c == '*' || (delim == '=' && c == 34))
-				return 0;
-
-			if (c == delim) {
-				delimCount++;
-				if (delimCount == 2)
-					return text;
-			}
-
-		} while (c == *s++);
-	}
-}
-
-
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index ce2fefb615..79b708d7b3 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -90,10 +90,9 @@
 	bool execCommand();
 	void identifyOb();
 	void selectOb();
-	bool getKeyAndLogo();
+	bool getKeyAndLogo(const char *foundString);
 	void read();
 	void dirCom();
-	void searchForString();
 	const char *searchForString(const char *topic, const char *text) {
 		return DreamBase::searchForString(topic, text);
 	}
-- 
cgit v1.2.3


From 74537d9eee171a1b7b02922320eae0252e6ed514 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 27 Dec 2011 02:08:15 +0200
Subject: DREAMWEB: The monsource global is no longer used. Also, added a
 missing comment in dirFile()

---
 engines/dreamweb/dreamgen.cpp |  30 +++----
 engines/dreamweb/dreamgen.h   | 179 +++++++++++++++++++++---------------------
 engines/dreamweb/monitor.cpp  |   2 +-
 3 files changed, 105 insertions(+), 106 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 13cb4253ae..1f8d25fef6 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -67,29 +67,29 @@ void DreamGenContext::__start() {
 		//0x0110: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0120: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0130: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0140: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 
 		//0x0150: .... .... .... ....
-		0xff, 0x17, 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, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 
-		//0x0170: .... .... .... .DRE
-		0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0180: AMWE B.V9 9.       
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0190:         . "        
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 
-		//0x01a0:       ... ..$. ....
-		0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 
+		//0x0170: .... .... ...D REAM
+		0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0180: WEB. V99.          
+		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+		//0x0190:       ."           
+		0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 
+		//0x01a0:    . .... $... ....
+		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
 		//0x01b0: .... .... .... ....
-		0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01c0: ...D :... .... ....
+		0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x01c0: .D:. .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x01d0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+		0x00, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d4778693b1..a5d504bdc5 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,7 +32,7 @@
 
 namespace DreamGen {
 
-static const uint16 offset_operand1 = 0x018a;
+static const uint16 offset_operand1 = 0x0188;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -225,95 +225,94 @@ static const uint16 kCurslocy = 241;
 static const uint16 kCurpos = 243;
 static const uint16 kMonadx = 245;
 static const uint16 kMonady = 247;
-static const uint16 kMonsource = 249;
-static const uint16 kNumtodo = 251;
-static const uint16 kTimecount = 253;
-static const uint16 kCounttotimed = 255;
-static const uint16 kTimedseg = 257;
-static const uint16 kTimedoffset = 259;
-static const uint16 kTimedy = 261;
-static const uint16 kTimedx = 262;
-static const uint16 kNeedtodumptimed = 263;
-static const uint16 kLoadingorsave = 264;
-static const uint16 kCurrentslot = 265;
-static const uint16 kCursorpos = 266;
-static const uint16 kColourpos = 267;
-static const uint16 kFadedirection = 268;
-static const uint16 kNumtofade = 269;
-static const uint16 kFadecount = 270;
-static const uint16 kAddtogreen = 271;
-static const uint16 kAddtored = 272;
-static const uint16 kAddtoblue = 273;
-static const uint16 kLastsoundreel = 274;
-static const uint16 kSpeechloaded = 276;
-static const uint16 kVolume = 277;
-static const uint16 kVolumeto = 278;
-static const uint16 kVolumedirection = 279;
-static const uint16 kVolumecount = 280;
-static const uint16 kWongame = 281;
-static const uint16 kLasthardkey = 282;
-static const uint16 kBufferin = 283;
-static const uint16 kBufferout = 285;
-static const uint16 kExtras = 287;
-static const uint16 kWorkspace = 289;
-static const uint16 kMapstore = 291;
-static const uint16 kCharset1 = 293;
-static const uint16 kMainsprites = 295;
-static const uint16 kBackdrop = 297;
-static const uint16 kMapdata = 299;
-static const uint16 kSounddata = 301;
-static const uint16 kSounddata2 = 303;
-static const uint16 kRecordspace = 305;
-static const uint16 kFreedat = 307;
-static const uint16 kSetdat = 309;
-static const uint16 kReel1 = 311;
-static const uint16 kReel2 = 313;
-static const uint16 kReel3 = 315;
-static const uint16 kRoomdesc = 317;
-static const uint16 kFreedesc = 319;
-static const uint16 kSetdesc = 321;
-static const uint16 kBlockdesc = 323;
-static const uint16 kSetframes = 325;
-static const uint16 kFreeframes = 327;
-static const uint16 kPeople = 329;
-static const uint16 kReels = 331;
-static const uint16 kCommandtext = 333;
-static const uint16 kPuzzletext = 335;
-static const uint16 kTraveltext = 337;
-static const uint16 kTempgraphics = 339;
-static const uint16 kTempgraphics2 = 341;
-static const uint16 kTempgraphics3 = 343;
-static const uint16 kTempsprites = 345;
-static const uint16 kTextfile1 = 347;
-static const uint16 kTextfile2 = 349;
-static const uint16 kTextfile3 = 351;
-static const uint16 kBlinkframe = 353;
-static const uint16 kBlinkcount = 354;
-static const uint16 kReasseschanges = 355;
-static const uint16 kPointerspath = 356;
-static const uint16 kManspath = 357;
-static const uint16 kPointerfirstpath = 358;
-static const uint16 kFinaldest = 359;
-static const uint16 kDestination = 360;
-static const uint16 kLinestartx = 361;
-static const uint16 kLinestarty = 363;
-static const uint16 kLineendx = 365;
-static const uint16 kLineendy = 367;
-static const uint16 kLinepointer = 369;
-static const uint16 kLinedirection = 370;
-static const uint16 kLinelength = 371;
-static const uint16 kCh0blockstocopy = 372;
-static const uint16 kCh0playing = 374;
-static const uint16 kCh0repeat = 375;
-static const uint16 kCh1playing = 376;
-static const uint16 kCh1blockstocopy = 377;
-static const uint16 kCurrentsample = 379;
-static const uint16 kRoomssample = 380;
-static const uint16 kBasicsample = 381;
-static const uint16 kCurrentfile = 408;
-static const uint16 kQuitrequested = 483;
-static const uint16 kSubtitles = 484;
-static const uint16 kForeignrelease = 485;
+static const uint16 kNumtodo = 249;
+static const uint16 kTimecount = 251;
+static const uint16 kCounttotimed = 253;
+static const uint16 kTimedseg = 255;
+static const uint16 kTimedoffset = 257;
+static const uint16 kTimedy = 259;
+static const uint16 kTimedx = 260;
+static const uint16 kNeedtodumptimed = 261;
+static const uint16 kLoadingorsave = 262;
+static const uint16 kCurrentslot = 263;
+static const uint16 kCursorpos = 264;
+static const uint16 kColourpos = 265;
+static const uint16 kFadedirection = 266;
+static const uint16 kNumtofade = 267;
+static const uint16 kFadecount = 268;
+static const uint16 kAddtogreen = 269;
+static const uint16 kAddtored = 270;
+static const uint16 kAddtoblue = 271;
+static const uint16 kLastsoundreel = 272;
+static const uint16 kSpeechloaded = 274;
+static const uint16 kVolume = 275;
+static const uint16 kVolumeto = 276;
+static const uint16 kVolumedirection = 277;
+static const uint16 kVolumecount = 278;
+static const uint16 kWongame = 279;
+static const uint16 kLasthardkey = 280;
+static const uint16 kBufferin = 281;
+static const uint16 kBufferout = 283;
+static const uint16 kExtras = 285;
+static const uint16 kWorkspace = 287;
+static const uint16 kMapstore = 289;
+static const uint16 kCharset1 = 291;
+static const uint16 kMainsprites = 293;
+static const uint16 kBackdrop = 295;
+static const uint16 kMapdata = 297;
+static const uint16 kSounddata = 299;
+static const uint16 kSounddata2 = 301;
+static const uint16 kRecordspace = 303;
+static const uint16 kFreedat = 305;
+static const uint16 kSetdat = 307;
+static const uint16 kReel1 = 309;
+static const uint16 kReel2 = 311;
+static const uint16 kReel3 = 313;
+static const uint16 kRoomdesc = 315;
+static const uint16 kFreedesc = 317;
+static const uint16 kSetdesc = 319;
+static const uint16 kBlockdesc = 321;
+static const uint16 kSetframes = 323;
+static const uint16 kFreeframes = 325;
+static const uint16 kPeople = 327;
+static const uint16 kReels = 329;
+static const uint16 kCommandtext = 331;
+static const uint16 kPuzzletext = 333;
+static const uint16 kTraveltext = 335;
+static const uint16 kTempgraphics = 337;
+static const uint16 kTempgraphics2 = 339;
+static const uint16 kTempgraphics3 = 341;
+static const uint16 kTempsprites = 343;
+static const uint16 kTextfile1 = 345;
+static const uint16 kTextfile2 = 347;
+static const uint16 kTextfile3 = 349;
+static const uint16 kBlinkframe = 351;
+static const uint16 kBlinkcount = 352;
+static const uint16 kReasseschanges = 353;
+static const uint16 kPointerspath = 354;
+static const uint16 kManspath = 355;
+static const uint16 kPointerfirstpath = 356;
+static const uint16 kFinaldest = 357;
+static const uint16 kDestination = 358;
+static const uint16 kLinestartx = 359;
+static const uint16 kLinestarty = 361;
+static const uint16 kLineendx = 363;
+static const uint16 kLineendy = 365;
+static const uint16 kLinepointer = 367;
+static const uint16 kLinedirection = 368;
+static const uint16 kLinelength = 369;
+static const uint16 kCh0blockstocopy = 370;
+static const uint16 kCh0playing = 372;
+static const uint16 kCh0repeat = 373;
+static const uint16 kCh1playing = 374;
+static const uint16 kCh1blockstocopy = 375;
+static const uint16 kCurrentsample = 377;
+static const uint16 kRoomssample = 378;
+static const uint16 kBasicsample = 379;
+static const uint16 kCurrentfile = 406;
+static const uint16 kQuitrequested = 481;
+static const uint16 kSubtitles = 482;
+static const uint16 kForeignrelease = 483;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index ddf12777e5..eca0ff52aa 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -529,7 +529,7 @@ void DreamGenContext::dirFile() {
 	monMessage(10);
 
 	byte curChar;
-	found += 1 + 2 + 1;
+	found += 4;	// originally adjusted in getKeyAndLogo()
 
 	while (true) {
 		curChar = found[0];
-- 
cgit v1.2.3


From 20ac0d8b5e9467f86fa07c1d1ff10f86c6c3bdee Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 27 Dec 2011 01:30:51 +0100
Subject: KYRA: Mark EoB games with ADGF_TESTING instead of ADGF_UNSTABLE.

ADGF_UNSTABLE makes an confusing dialog appear about the support of the games.
EoB 1+2 should be completable so they are fit for public testing, which
ADGF_TESTING is used for as far as it is documented. This does *not* imply
that we directly want them in the next release though.
---
 engines/kyra/detection_tables.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index ea950112ad..31d7d6e0f3 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -1454,7 +1454,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
 		},
 		EOB_FLAGS
@@ -1470,7 +1470,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
 		},
 		EOB_FLAGS
@@ -1486,7 +1486,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::EN_ANY,
 			Common::kPlatformPC,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
 		},
 		EOB2_FLAGS
@@ -1502,7 +1502,7 @@ const KYRAGameDescription adGameDescs[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformPC,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
 		},
 		EOB2_FLAGS
-- 
cgit v1.2.3


From 2bbc1cbd6ae367eb2e36813fd8617b2c1751585c Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 01:19:19 +0100
Subject: DREAMWEB: Clean up monitor functions

---
 engines/dreamweb/dreambase.h |  6 +++++
 engines/dreamweb/monitor.cpp | 55 +++++++++++++++-----------------------------
 engines/dreamweb/print.cpp   |  7 ------
 engines/dreamweb/stubs.h     | 24 -------------------
 engines/dreamweb/use.cpp     |  4 ++--
 5 files changed, 27 insertions(+), 69 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index d9b77c1ec0..340ecbb390 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -182,6 +182,12 @@ public:
 	void showKeys();
 	const char *parser();
 	const char *searchForString(const char *topic, const char *text);
+	const char *getKeyAndLogo(const char *foundString);
+	void read();
+	void dirFile(const char *dirName);
+	void dirCom();
+	void useMon();
+	bool execCommand();
 
 	// from newplace.cpp
 	void getUnderCentre();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index eca0ff52aa..3d66a49420 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -38,7 +38,7 @@ static MonitorKeyEntry monitorKeyEntries[4] = {
 	{ 0, "BECKETT", "SEPTIMUS"    }
 };
 
-void DreamGenContext::useMon() {
+void DreamBase::useMon() {
 	data.byte(kLasttrigger) = 0;
 	memset(data.ptr(kCurrentfile+1, 0), ' ', 12);
 	memset(data.ptr(offset_operand1+1, 0), ' ', 12);
@@ -101,7 +101,7 @@ void DreamGenContext::useMon() {
 	workToScreenM();
 }
 
-bool DreamGenContext::execCommand() {
+bool DreamBase::execCommand() {
 	static const char *comlist[] = {
 		"EXIT",
 		"HELP",
@@ -232,10 +232,6 @@ void DreamBase::input() {
 	}
 }
 
-void DreamGenContext::makeCaps() {
-	al = makeCaps(al);
-}
-
 byte DreamBase::makeCaps(byte c) {
 	// TODO: Replace calls to this by toupper() ?
 	if (c >= 'a')
@@ -312,10 +308,6 @@ void DreamBase::accessLightOff() {
 	multiDump(74, 182, 12, 8);
 }
 
-void DreamGenContext::randomAccess() {
-	randomAccess(cx);
-}
-
 void DreamBase::randomAccess(uint16 count) {
 	for (uint16 i = 0; i < count; ++i) {
 		vSync();
@@ -329,10 +321,6 @@ void DreamBase::randomAccess(uint16 count) {
 	accessLightOff();
 }
 
-void DreamGenContext::monMessage() {
-	monMessage(al);
-}
-
 void DreamBase::monMessage(uint8 index) {
 	assert(index > 0);
 	const char *string = (const char *)getSegment(data.word(kTextfile1)).ptr(kTextstart, 0);
@@ -436,19 +424,19 @@ void DreamBase::showKeys() {
 	scrollMonitor();
 }
 
-bool DreamGenContext::getKeyAndLogo(const char *foundString) {
+const char *DreamBase::getKeyAndLogo(const char *foundString) {
 	byte newLogo = foundString[1] - 48;
 	byte keyNum = foundString[3] - 48;
 
 	if (monitorKeyEntries[keyNum].keyAssigned == 1) {
 		// Key OK
 		data.byte(kLogonum) = newLogo;
-		return true;
+		return foundString + 4;
 	} else {
 		monMessage(12);	// "Access denied, key required -"
 		monPrint(monitorKeyEntries[keyNum].username);
 		scrollMonitor();
-		return false;
+		return 0;
 	}
 }
 
@@ -476,14 +464,12 @@ const char *DreamBase::searchForString(const char *topic, const char *text) {
 	}
 }
 
-void DreamGenContext::dirCom() {
+void DreamBase::dirCom() {
 	randomAccess(30);
 
 	const char *dirname = parser();
 	if (dirname[1]) {
-		es = cs;
-		di = offset_operand1; // cs:operand1 == dirname
-		dirFile();
+		dirFile(dirname);
 		return;
 	}
 
@@ -498,10 +484,11 @@ void DreamGenContext::dirCom() {
 	scrollMonitor();
 }
 
-void DreamGenContext::dirFile() {
-	es.byte(di) = 34;
+void DreamBase::dirFile(const char *dirName) {
+	char topic[13];
 
-	const char *topic = (const char*)es.ptr(di, 0);
+	memcpy(topic, dirName, 13);
+	topic[0] = 34;
 
 	const char *text = (const char *)getSegment(data.word(kTextfile1)).ptr(kTextstart, 0);
 	const char *found = searchForString(topic, text);
@@ -515,25 +502,22 @@ void DreamGenContext::dirFile() {
 	}
 
 	if (found) {
-		if (!getKeyAndLogo(found))
-			return;
+		found = getKeyAndLogo(found);
+		if (!found)
+			return; // not logged in
 	} else {
 		monMessage(7);
 		return;
 	}
 
 	// "keyok2"
-	memcpy(data.ptr(kCurrentfile+1, 0), data.ptr(offset_operand1+1, 0), 12);
+	memcpy(data.ptr(kCurrentfile+1, 0), dirName+1, 12);
 	monitorLogo();
 	scrollMonitor();
 	monMessage(10);
 
-	byte curChar;
-	found += 4;	// originally adjusted in getKeyAndLogo()
-
 	while (true) {
-		curChar = found[0];
-		found++;
+		byte curChar = *found++;
 		if (curChar == 34 || curChar == '*') {
 			// "endofdir2"
 			scrollMonitor();
@@ -545,7 +529,7 @@ void DreamGenContext::dirFile() {
 	}
 }
 
-void DreamGenContext::read() {
+void DreamBase::read() {
 	randomAccess(40);
 	const char *name = parser();
 	if (name[1] == 0) {
@@ -553,7 +537,7 @@ void DreamGenContext::read() {
 		return;
 	}
 
-	const char *topic = (const char*)cs.ptr(kCurrentfile, 0);
+	const char *topic = (const char*)data.ptr(kCurrentfile, 0);
 
 	const char *text = (const char *)getSegment(data.word(kTextfile1)).ptr(kTextstart, 0);
 	const char *found = searchForString(topic, text);
@@ -575,8 +559,7 @@ void DreamGenContext::read() {
 	}
 
 	// "keyok1"
-	topic = (const char*)cs.ptr(offset_operand1, 0);
-	found = searchForString(topic, found);
+	found = searchForString(name, found);
 	if (!found) {
 		data.byte(kLogonum) = data.byte(kOldlogonum);
 		monMessage(11);
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 6cb25412dd..7edf44443f 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -204,13 +204,6 @@ uint16 DreamBase::waitFrames() {
 	return data.word(kMousebutton);
 }
 
-void DreamGenContext::monPrint() {
-	uint16 originalBx = bx;
-	const char *string = (const char *)es.ptr(bx, 0);
-	const char *nextString = monPrint(string);
-	bx = originalBx + (nextString - string);
-}
-
 const char *DreamBase::monPrint(const char *string) {
 	data.byte(kKerning) = 1;
 	uint16 x = data.word(kMonadx);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 79b708d7b3..ea3c17157d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -57,23 +57,6 @@
 	void useRoutine();
 	void examineOb(bool examineAgain = true);
 	void readSetData();
-	void useMon();
-	void makeCaps();
-	byte makeCaps(byte c) {
-		return DreamBase::makeCaps(c);
-	}
-	void monPrint();
-	const char *monPrint(const char *string) {
-		return DreamBase::monPrint(string);
-	}
-	void randomAccess();
-	void randomAccess(uint16 count) {
-		DreamBase::randomAccess(count);
-	}
-	void monMessage();
-	void monMessage(uint8 index) {
-		DreamBase::monMessage(index);
-	}
 	void look();
 	void autoLook();
 	void doLook();
@@ -87,14 +70,7 @@
 	void afterNewRoom();
 	void madmanRun();
 	void showGun();
-	bool execCommand();
 	void identifyOb();
 	void selectOb();
-	bool getKeyAndLogo(const char *foundString);
-	void read();
-	void dirCom();
-	const char *searchForString(const char *topic, const char *text) {
-		return DreamBase::searchForString(topic, text);
-	}
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 25ed8d50e5..3e38215cca 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -25,7 +25,7 @@
 namespace DreamGen {
 
 
-typedef void (DreamGenContext::*UseCallback)(void);
+typedef void (DreamBase::*UseCallback)(void);
 
 // Note: The callback pointer has been placed before the
 // ID to keep MSVC happy (otherwise, it throws warnings
@@ -38,7 +38,7 @@ struct UseListEntry {
 void DreamGenContext::useRoutine() {
 
 	static const UseListEntry kUseList[] = {
-		{ &DreamGenContext::useMon,            "NETW" },
+		{ &DreamBase::useMon,                  "NETW" },
 		{ &DreamBase::useElevator1,            "ELVA" },
 		{ &DreamBase::useElevator2,            "ELVB" },
 		{ &DreamBase::useElevator3,            "ELVC" },
-- 
cgit v1.2.3


From e10d2bffa07221601fd8414a1e7e12904cea19ad Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 01:37:16 +0100
Subject: DREAMWEB: Move operand1, currentfile out of data

---
 engines/dreamweb/dreambase.h  |  2 ++
 engines/dreamweb/dreamgen.cpp | 20 ++++++++------------
 engines/dreamweb/dreamgen.h   |  9 +++------
 engines/dreamweb/monitor.cpp  | 30 +++++++++++++++---------------
 4 files changed, 28 insertions(+), 33 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 340ecbb390..e22a2777d9 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -66,6 +66,8 @@ protected:
 
 	// from monitor.cpp
 	char _inputLine[64];
+	char _operand1[14];
+	char _currentFile[14];
 
 	// from newplace.cpp
 	uint8 _roomsCanGo[16];
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 1f8d25fef6..28d196bdbb 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -77,19 +77,15 @@ void DreamGenContext::__start() {
 		//0x0160: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 
 		//0x0170: .... .... ...D REAM
-		0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0180: WEB. V99.          
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-		//0x0190:       ."           
-		0x20, 0x20, 0x20, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 
-		//0x01a0:    . .... $... ....
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
-		//0x01b0: .... .... .... ....
-		0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01c0: .D:. .... .... ....
+		0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 
+		//0x0180: WEB. V99. .... $...
+		0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 
+		//0x0190: .... .... .... ....
+		0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		//0x01a0: .... .D:. .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01d0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, };
+		//0x01b0: .... .... .... ....
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index a5d504bdc5..629dde26a2 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,7 +32,6 @@
 
 namespace DreamGen {
 
-static const uint16 offset_operand1 = 0x0188;
 static const uint16 kStartvars = 0;
 static const uint16 kProgresspoints = 1;
 static const uint16 kWatchon = 2;
@@ -309,10 +308,9 @@ static const uint16 kCh1blockstocopy = 375;
 static const uint16 kCurrentsample = 377;
 static const uint16 kRoomssample = 378;
 static const uint16 kBasicsample = 379;
-static const uint16 kCurrentfile = 406;
-static const uint16 kQuitrequested = 481;
-static const uint16 kSubtitles = 482;
-static const uint16 kForeignrelease = 483;
+static const uint16 kQuitrequested = 453;
+static const uint16 kSubtitles = 454;
+static const uint16 kForeignrelease = 455;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -414,7 +412,6 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
-	void dirFile();
 	void dreamweb();
 };
 
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 3d66a49420..eb6d876ca4 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -40,8 +40,9 @@ static MonitorKeyEntry monitorKeyEntries[4] = {
 
 void DreamBase::useMon() {
 	data.byte(kLasttrigger) = 0;
-	memset(data.ptr(kCurrentfile+1, 0), ' ', 12);
-	memset(data.ptr(offset_operand1+1, 0), ' ', 12);
+	_currentFile[0] = 34;
+	memset(_currentFile+1, ' ', 12);
+	_currentFile[13] = 0;
 
 	monitorKeyEntries[0].keyAssigned = 1;
 	monitorKeyEntries[1].keyAssigned = 0;
@@ -290,7 +291,7 @@ void DreamBase::scrollMonitor() {
 
 void DreamBase::showCurrentFile() {
 	uint16 x = 178; // TODO: Looks like this hardcoded constant in the asm doesn't match the frame
-	const char *currentFile = (const char *)data.ptr(kCurrentfile+1, 0);
+	const char *currentFile = _currentFile + 1;
 	while (*currentFile) {
 		char c = *currentFile++;
 		c = engine->modifyChar(c);
@@ -474,7 +475,7 @@ void DreamBase::dirCom() {
 	}
 
 	data.byte(kLogonum) = 0;
-	memcpy(data.ptr(kCurrentfile+1, 0), "ROOT        ", 12);
+	memcpy(_currentFile+1, "ROOT        ", 12);
 	monitorLogo();
 	scrollMonitor();
 	monMessage(9);
@@ -485,9 +486,9 @@ void DreamBase::dirCom() {
 }
 
 void DreamBase::dirFile(const char *dirName) {
-	char topic[13];
+	char topic[14];
 
-	memcpy(topic, dirName, 13);
+	memcpy(topic, dirName, 14);
 	topic[0] = 34;
 
 	const char *text = (const char *)getSegment(data.word(kTextfile1)).ptr(kTextstart, 0);
@@ -511,7 +512,7 @@ void DreamBase::dirFile(const char *dirName) {
 	}
 
 	// "keyok2"
-	memcpy(data.ptr(kCurrentfile+1, 0), dirName+1, 12);
+	memcpy(_currentFile+1, dirName+1, 12);
 	monitorLogo();
 	scrollMonitor();
 	monMessage(10);
@@ -537,7 +538,7 @@ void DreamBase::read() {
 		return;
 	}
 
-	const char *topic = (const char*)data.ptr(kCurrentfile, 0);
+	const char *topic = _currentFile;
 
 	const char *text = (const char *)getSegment(data.word(kTextfile1)).ptr(kTextstart, 0);
 	const char *found = searchForString(topic, text);
@@ -658,12 +659,11 @@ void DreamBase::searchForFiles(uint16 segment) {
 }
 
 const char *DreamBase::parser() {
-	char *output = (char *)data.ptr(offset_operand1, 13);
+	char *output = _operand1;
 
-	memset(output, 0, 13);
+	memset(output, 0, 14);
 
-	char *p = output;
-	*p++ = '=';
+	*output++ = '=';
 
 	const char *in = _inputLine;
 
@@ -686,14 +686,14 @@ const char *DreamBase::parser() {
 
 	// copy first operand
 	do {
-		*p++ = c;
+		*output++ = c;
 		c = *in++;
 		in++;
 		if (!c)
-			return output;
+			return _operand1;
 	} while (c != 32);
 
-	return output;
+	return _operand1;
 }
 
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 4027e635d50b510e322480c039bcc39449d096df Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 27 Dec 2011 02:42:33 +0200
Subject: DREAMWEB: Remove dead code

---
 engines/dreamweb/stubs.cpp |  2 --
 engines/dreamweb/stubs.h   |  2 --
 engines/dreamweb/use.cpp   | 34 ----------------------------------
 3 files changed, 38 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index c8aac95e72..dd4911618c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -457,8 +457,6 @@ static const Atmosphere g_atmosphereList[] = {
 };
 
 void DreamGenContext::dreamweb() {
-	STACK_CHECK;
-
 	switch(engine->getLanguage()) {
 	case Common::EN_ANY:
 	case Common::EN_GRB:
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index ea3c17157d..c749693b60 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -43,7 +43,6 @@
 	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 		return DreamBase::printDirect(string, x, y, maxWidth, centered);
 	}
-	void width160();
 	bool checkIfPerson(uint8 x, uint8 y);
 	bool checkIfFree(uint8 x, uint8 y);
 	bool checkIfEx(uint8 x, uint8 y);
@@ -60,7 +59,6 @@
 	void look();
 	void autoLook();
 	void doLook();
-	void useKey();
 	void useObject();
 	void inventory();
 	void mainScreen();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 3e38215cca..34c68cfd34 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1494,40 +1494,6 @@ void DreamBase::useAxe() {
 	removeObFromInv();
 }
 
-void DreamGenContext::useKey() {
-	switch(data.byte(kLocation)) {
-	case 5:
-	case 30:
-		if (data.byte(kMapx) == 22 && data.byte(kMapy) == 10) {
-			showPuzText(0, 300);
-			data.byte(kCounttoclose) = 100;
-			data.byte(kGetback) = 1;
-		} else {
-			// Wrong room
-			showPuzText(2, 200);
-			putBackObStuff();
-		}
-		break;
-	case 21:
-		if (data.byte(kMapx) == 11 && data.byte(kMapy) == 10) {
-			showPuzText(3, 300);
-			data.byte(kNewlocation) = 30;
-			al = 2;
-			fadeScreenDown();
-			showFirstUse();
-			putBackObStuff();
-		} else {
-			// Wrong room
-			showPuzText(2, 200);
-			putBackObStuff();
-		}
-	default:
-		showPuzText(1, 200);
-		putBackObStuff();
-		break;
-	}
-}
-
 void DreamBase::useHandle() {
 	SetObject *object = getSetAd(findSetObject("CUTW"));
 	if (object->mapad[0] == 255) {
-- 
cgit v1.2.3


From 0be53a88d626b484b9db30f3d89534d5d237a073 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 01:43:54 +0100
Subject: DREAMWEB: Move remaining use functions to DreamBase

---
 engines/dreamweb/dreambase.h |  4 ++++
 engines/dreamweb/object.cpp  | 12 ++++++------
 engines/dreamweb/stubs.h     |  4 ----
 engines/dreamweb/use.cpp     |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index e22a2777d9..5625b28215 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -245,6 +245,8 @@ public:
 	void useOpened();
 	void setPickup();
 	void selectOpenOb();
+	void examineOb(bool examineAgain = true);
+	void selectOb();
 
 	// from pathfind.cpp
 	void turnPathOn(uint8 param);
@@ -638,6 +640,8 @@ public:
 	uint8 getExPos();
 
 	// from use.cpp
+	void useRoutine();
+	void useObject();
 	void placeFreeObject(uint8 index);
 	void removeFreeObject(uint8 index);
 	void setupTimedUse(uint16 offset, uint16 countToTimed, uint16 timeCount, byte x, byte y);
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 31a5af0bb5..65f45bd499 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -116,7 +116,7 @@ void DreamBase::obIcons() {
 	showFrame(engine->icons2(), 260, 1, 1, 0);
 }
 
-void DreamGenContext::examineOb(bool examineAgain) {
+void DreamBase::examineOb(bool examineAgain) {
 	data.byte(kPointermode) = 0;
 	data.word(kTimecount) = 0;
 
@@ -156,9 +156,9 @@ void DreamGenContext::examineOb(bool examineAgain) {
 
 		switch (data.byte(kInvopen)) {
 		case 0: {
-			RectWithCallback<DreamGenContext> examList[] = {
+			RectWithCallback<DreamBase> examList[] = {
 				{ 273,320,157,198,&DreamBase::getBackFromOb },
-				{ 260,300,0,44,&DreamGenContext::useObject },
+				{ 260,300,0,44,&DreamBase::useObject },
 				{ 210,254,0,44,&DreamBase::selectOpenOb },
 				{ 144,176,64,96,&DreamBase::setPickup },
 				{ 0,50,50,200,&DreamBase::examineInventory },
@@ -183,10 +183,10 @@ void DreamGenContext::examineOb(bool examineAgain) {
 			break;
 		}
 		default: {
-			RectWithCallback<DreamGenContext> withList1[] = {
+			RectWithCallback<DreamBase> withList1[] = {
 				{ 273,320,157,198,&DreamBase::getBackFromOb },
 				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamBase::incRyanPage },
-				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamGenContext::selectOb },
+				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamBase::selectOb },
 				{ 0,320,0,200,&DreamBase::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
@@ -354,7 +354,7 @@ ObjectRef DreamBase::findInvPos() {
 	return _ryanInvList[invPos];
 }
 
-void DreamGenContext::selectOb() {
+void DreamBase::selectOb() {
 	ObjectRef objectId = findInvPos();
 	if (objectId._index == 255) {
 		blank();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index c749693b60..785e737310 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -53,13 +53,10 @@
 	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 		DreamBase::obToInv(index, flag, x, y);
 	}
-	void useRoutine();
-	void examineOb(bool examineAgain = true);
 	void readSetData();
 	void look();
 	void autoLook();
 	void doLook();
-	void useObject();
 	void inventory();
 	void mainScreen();
 	void zoomOnOff();
@@ -69,6 +66,5 @@
 	void madmanRun();
 	void showGun();
 	void identifyOb();
-	void selectOb();
 
 #endif
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 34c68cfd34..dc76cf30fd 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -35,7 +35,7 @@ struct UseListEntry {
 	const char *id;
 };
 
-void DreamGenContext::useRoutine() {
+void DreamBase::useRoutine() {
 
 	static const UseListEntry kUseList[] = {
 		{ &DreamBase::useMon,                  "NETW" },
@@ -973,7 +973,7 @@ void DreamBase::useElvDoor() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useObject() {
+void DreamBase::useObject() {
 	data.byte(kWithobject) = 255;
 
 	if (data.byte(kCommandtype) != 229) {
-- 
cgit v1.2.3


From 9bf5a1930de387c32bce788a8ccdc1f9db5b3681 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 01:48:40 +0100
Subject: DREAMWEB: Blacklist the main dreamweb function

---
 engines/dreamweb/dreamgen.h | 1 -
 engines/dreamweb/stubs.h    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 629dde26a2..a68c5cdef8 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -412,7 +412,6 @@ public:
 	void __start();
 #include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
 
-	void dreamweb();
 };
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 785e737310..c9eaf2699a 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -22,6 +22,7 @@
 #ifndef DREAMWEB_STUBS_H
 #define DREAMWEB_STUBS_H
 
+	void dreamweb();
 	void screenUpdate();
 	void startup1();
 	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height) {
-- 
cgit v1.2.3


From 3ff26ba84fd298886c6515407c61751984e05f68 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 27 Dec 2011 03:00:00 +0200
Subject: DREAMWEB: Move all of the functions to DreamBase and remove stubs.h

---
 engines/dreamweb/dreambase.h  | 26 +++++++++++++++
 engines/dreamweb/dreamgen.h   |  2 --
 engines/dreamweb/object.cpp   |  4 +--
 engines/dreamweb/saveload.cpp |  6 ++--
 engines/dreamweb/stubs.cpp    | 74 +++++++++++++++++++++----------------------
 engines/dreamweb/stubs.h      | 71 -----------------------------------------
 engines/dreamweb/talk.cpp     |  2 +-
 engines/dreamweb/vgagrafx.cpp |  1 -
 8 files changed, 69 insertions(+), 117 deletions(-)
 delete mode 100644 engines/dreamweb/stubs.h

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 5625b28215..fb06309f15 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -247,6 +247,8 @@ public:
 	void selectOpenOb();
 	void examineOb(bool examineAgain = true);
 	void selectOb();
+	void inventory();
+	void identifyOb();
 
 	// from pathfind.cpp
 	void turnPathOn(uint8 param);
@@ -613,6 +615,30 @@ public:
 	void searchForFiles(uint16 segment);
 	void triggerMessage(uint16 index);
 	void processTrigger();
+	void dreamweb();
+	void screenUpdate();
+	void startup1();
+	void quickQuit();
+	void readOneBlock();
+	void seeCommandTail();
+	void quickQuit2();
+	bool checkIfPerson(uint8 x, uint8 y);
+	bool checkIfFree(uint8 x, uint8 y);
+	bool checkIfEx(uint8 x, uint8 y);
+	void walkAndExamine();
+	void obName(uint8 command, uint8 commandType);
+	bool checkIfSet(uint8 x, uint8 y);
+	void readSetData();
+	void look();
+	void autoLook();
+	void doLook();
+	void mainScreen();
+	void zoomOnOff();
+	void initialInv();
+	void walkIntoRoom();
+	void afterNewRoom();
+	void madmanRun();
+	void showGun();
 
 	// from talk.cpp
 	void talk();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index a68c5cdef8..102b3822ca 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -410,8 +410,6 @@ public:
 	DreamGenContext(DreamWeb::DreamWebEngine *en) : DreamBase(en), Context(this) {}
 
 	void __start();
-#include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
-
 };
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 65f45bd499..8152394de0 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -213,7 +213,7 @@ void DreamBase::examineOb(bool examineAgain) {
 	data.byte(kOpenedob) = 255;
 }
 
-void DreamGenContext::inventory() {
+void DreamBase::inventory() {
 	if (data.byte(kMandead) == 1 || data.word(kWatchingtime) != 0) {
 		blank();
 		return;
@@ -308,7 +308,7 @@ void DreamBase::openOb() {
 	_openChangeSize = getOpenedSlotCount() * kItempicsize + kInventx;
 }
 
-void DreamGenContext::identifyOb() {
+void DreamBase::identifyOb() {
 	if (data.word(kWatchingtime) != 0) {
 		blank();
 		return;
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 4fa8cf33fe..c879afe034 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -267,10 +267,10 @@ void DreamBase::doSaveLoad() {
 	showMainOps();
 	workToScreen();
 
-	RectWithCallback<DreamGenContext> opsList[] = {
+	RectWithCallback<DreamBase> opsList[] = {
 		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamBase::getBackFromOps },
 		{ kOpsx+10,kOpsx+77,kOpsy+10,kOpsy+59,&DreamBase::DOSReturn },
-		{ kOpsx+128,kOpsx+190,kOpsy+16,kOpsy+100,&DreamGenContext::discOps },
+		{ kOpsx+128,kOpsx+190,kOpsy+16,kOpsy+100,&DreamBase::discOps },
 		{ 0,320,0,200,&DreamBase::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
@@ -367,7 +367,7 @@ void DreamBase::discOps() {
 	workToScreenM();
 	data.byte(kGetback) = 0;
 
-	RectWithCallback<DreamGenContext> discOpsList[] = {
+	RectWithCallback<DreamBase> discOpsList[] = {
 		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamBase::loadGame },
 		{ kOpsx+10,kOpsx+79,kOpsy+10,kOpsy+59,&DreamBase::saveGame },
 		{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps },
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index dd4911618c..ebc2580158 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -456,7 +456,7 @@ static const Atmosphere g_atmosphereList[] = {
 
 };
 
-void DreamGenContext::dreamweb() {
+void DreamBase::dreamweb() {
 	switch(engine->getLanguage()) {
 	case Common::EN_ANY:
 	case Common::EN_GRB:
@@ -649,7 +649,7 @@ bool DreamBase::quitRequested() {
 	return data.byte(kQuitrequested);
 }
 
-void DreamGenContext::screenUpdate() {
+void DreamBase::screenUpdate() {
 	newPlace();
 	mainScreen();
 	if (quitRequested())
@@ -720,7 +720,7 @@ void DreamBase::startup() {
 	atmospheres();
 }
 
-void DreamGenContext::startup1() {
+void DreamBase::startup1() {
 	clearPalette();
 	data.byte(kThroughdoor) = 0;
 
@@ -787,15 +787,15 @@ void DreamBase::hangOnCurs(uint16 frameCount) {
 	}
 }
 
-void DreamGenContext::seeCommandTail() {
+void DreamBase::seeCommandTail() {
 	data.byte(kBrightness) = 1;
 }
 
-void DreamGenContext::quickQuit() {
+void DreamBase::quickQuit() {
 	engine->quit();
 }
 
-void DreamGenContext::quickQuit2() {
+void DreamBase::quickQuit2() {
 	engine->quit();
 }
 
@@ -1143,7 +1143,7 @@ void DreamBase::commandOnly(uint8 command) {
 	data.byte(kNewtextline) = 1;
 }
 
-bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
+bool DreamBase::checkIfPerson(uint8 x, uint8 y) {
 	Common::List<People>::iterator i;
 	for (i = _peopleList.begin(); i != _peopleList.end(); ++i) {
 		People &people = *i;
@@ -1170,7 +1170,7 @@ bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
 	return false;
 }
 
-bool DreamGenContext::checkIfFree(uint8 x, uint8 y) {
+bool DreamBase::checkIfFree(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _freeList.reverse_begin(); i != _freeList.end(); --i) {
 		const ObjPos &pos = *i;
@@ -1183,7 +1183,7 @@ bool DreamGenContext::checkIfFree(uint8 x, uint8 y) {
 	return false;
 }
 
-bool DreamGenContext::checkIfEx(uint8 x, uint8 y) {
+bool DreamBase::checkIfEx(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _exList.reverse_begin(); i != _exList.end(); --i) {
 		const ObjPos &pos = *i;
@@ -1391,7 +1391,7 @@ void DreamBase::getFlagUnderP(uint8 *flag, uint8 *flagEx) {
 	data.byte(kLastflag) = *flag;
 }
 
-void DreamGenContext::walkAndExamine() {
+void DreamBase::walkAndExamine() {
 	if (!finishedWalking())
 		return;
 	data.byte(kCommandtype) = data.byte(kWalkexamtype);
@@ -1401,7 +1401,7 @@ void DreamGenContext::walkAndExamine() {
 		examineOb();
 }
 
-void DreamGenContext::obName(uint8 command, uint8 commandType) {
+void DreamBase::obName(uint8 command, uint8 commandType) {
 	if (data.byte(kReasseschanges) == 0) {
 		if ((commandType == data.byte(kCommandtype)) && (command == data.byte(kCommand))) {
 			if (data.byte(kWalkandexam) == 1) {
@@ -1721,7 +1721,7 @@ void DreamBase::showIcon() {
 	}
 }
 
-bool DreamGenContext::checkIfSet(uint8 x, uint8 y) {
+bool DreamBase::checkIfSet(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _setList.reverse_begin(); i != _setList.end(); --i) {
 		const ObjPos &pos = *i;
@@ -1860,7 +1860,7 @@ void DreamBase::enterSymbol() {
 	}
 }
 
-void DreamGenContext::zoomOnOff() {
+void DreamBase::zoomOnOff() {
 	if (data.word(kWatchingtime) != 0 || data.byte(kPointermode) == 2) {
 		blank();
 		return;
@@ -1898,27 +1898,27 @@ void DreamBase::sortOutMap() {
 	}
 }
 
-void DreamGenContext::mainScreen() {
+void DreamBase::mainScreen() {
 	data.byte(kInmaparea) = 0;
 	if (data.byte(kWatchon) == 1) {
-		RectWithCallback<DreamGenContext> mainList[] = {
-			{ 44,70,32,46,&DreamGenContext::look },
-			{ 0,50,0,180,&DreamGenContext::inventory },
-			{ 226,244,10,26,&DreamGenContext::zoomOnOff },
-			{ 226,244,26,40,&DreamGenContext::saveLoad },
-			{ 240,260,100,124,&DreamGenContext::madmanRun },
-			{ 0,320,0,200,&DreamGenContext::identifyOb },
+		RectWithCallback<DreamBase> mainList[] = {
+			{ 44,70,32,46,&DreamBase::look },
+			{ 0,50,0,180,&DreamBase::inventory },
+			{ 226,244,10,26,&DreamBase::zoomOnOff },
+			{ 226,244,26,40,&DreamBase::saveLoad },
+			{ 240,260,100,124,&DreamBase::madmanRun },
+			{ 0,320,0,200,&DreamBase::identifyOb },
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(mainList);
 	} else {
-		RectWithCallback<DreamGenContext> mainList2[] = {
-			{ 44,70,32,46,&DreamGenContext::look },
-			{ 0,50,0,180,&DreamGenContext::inventory },
-			{ 226+48,244+48,10,26,&DreamGenContext::zoomOnOff },
-			{ 226+48,244+48,26,40,&DreamGenContext::saveLoad },
-			{ 240,260,100,124,&DreamGenContext::madmanRun },
-			{ 0,320,0,200,&DreamGenContext::identifyOb },
+		RectWithCallback<DreamBase> mainList2[] = {
+			{ 44,70,32,46,&DreamBase::look },
+			{ 0,50,0,180,&DreamBase::inventory },
+			{ 226+48,244+48,10,26,&DreamBase::zoomOnOff },
+			{ 226+48,244+48,26,40,&DreamBase::saveLoad },
+			{ 240,260,100,124,&DreamBase::madmanRun },
+			{ 0,320,0,200,&DreamBase::identifyOb },
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(mainList2);
@@ -2029,7 +2029,7 @@ void DreamBase::loadRoom() {
 	getDimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
 }
 
-void DreamGenContext::readSetData() {
+void DreamBase::readSetData() {
 	data.word(kCharset1) = standardLoad("DREAMWEB.C00");
 
 	void *icons1Buffer = standardLoadCPP("DREAMWEB.G00");
@@ -2068,7 +2068,7 @@ void DreamBase::findRoomInLoc() {
 	data.byte(kRoomnum) = roomNum;
 }
 
-void DreamGenContext::autoLook() {
+void DreamBase::autoLook() {
 	if ((data.word(kMousex) != data.word(kOldx)) || (data.word(kMousey) != data.word(kOldy))) {
 		data.word(kLookcounter) = 1000;
 		return;
@@ -2082,7 +2082,7 @@ void DreamGenContext::autoLook() {
 	doLook();
 }
 
-void DreamGenContext::look() {
+void DreamBase::look() {
 	if (data.word(kWatchingtime) || (data.byte(kPointermode) == 2)) {
 		blank();
 		return;
@@ -2095,7 +2095,7 @@ void DreamGenContext::look() {
 		doLook();
 }
 
-void DreamGenContext::doLook() {
+void DreamBase::doLook() {
 	createPanel();
 	showIcon();
 	underTextLine();
@@ -2719,7 +2719,7 @@ void DreamBase::pickupOb(uint8 command, uint8 pos) {
 	transferToEx(command);
 }
 
-void DreamGenContext::initialInv() {
+void DreamBase::initialInv() {
 	if (data.byte(kReallocation) != 24)
 		return;
 
@@ -2739,7 +2739,7 @@ void DreamGenContext::initialInv() {
 	switchRyanOff();
 }
 
-void DreamGenContext::walkIntoRoom() {
+void DreamBase::walkIntoRoom() {
 	if (data.byte(kLocation) == 14 && data.byte(kMapx) == 22) {
 		data.byte(kDestination) = 1;
 		data.byte(kFinaldest) = 1;
@@ -3048,7 +3048,7 @@ void DreamBase::watchReel() {
 	plotReel(reelPointer);
 }
 
-void DreamGenContext::afterNewRoom() {
+void DreamBase::afterNewRoom() {
 	if (data.byte(kNowinnewroom) == 0)
 		return; // notnew
 
@@ -3079,7 +3079,7 @@ void DreamGenContext::afterNewRoom() {
 	atmospheres();
 }
 
-void DreamGenContext::madmanRun() {
+void DreamBase::madmanRun() {
 	if (data.byte(kLocation)    != 14 ||
 		data.byte(kMapx)        != 22 ||
 		data.byte(kPointermode) !=  2 ||
@@ -3145,7 +3145,7 @@ void DreamBase::decide() {
 	data.byte(kTextlen) = 240;
 }
 
-void DreamGenContext::showGun() {
+void DreamBase::showGun() {
 	data.byte(kAddtored) = 0;
 	data.byte(kAddtogreen) = 0;
 	data.byte(kAddtoblue) = 0;
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
deleted file mode 100644
index c9eaf2699a..0000000000
--- a/engines/dreamweb/stubs.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 DREAMWEB_STUBS_H
-#define DREAMWEB_STUBS_H
-
-	void dreamweb();
-	void screenUpdate();
-	void startup1();
-	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height) {
-		DreamBase::multiGet(dst, x, y, width, height);
-	}
-	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height) {
-		DreamBase::multiPut(src, x, y, width, height);
-	}
-	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
-		DreamBase::multiDump(x, y, width, height);
-	}
-	void quickQuit();
-	void readOneBlock();
-	void seeCommandTail();
-	void quickQuit2();
-	uint8 printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered) {
-		return DreamBase::printDirect(string, x, y, maxWidth, centered);
-	}
-	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
-		return DreamBase::printDirect(string, x, y, maxWidth, centered);
-	}
-	bool checkIfPerson(uint8 x, uint8 y);
-	bool checkIfFree(uint8 x, uint8 y);
-	bool checkIfEx(uint8 x, uint8 y);
-	void walkAndExamine();
-	void obName(uint8 command, uint8 commandType);
-
-	bool checkIfSet(uint8 x, uint8 y);
-	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
-		DreamBase::obToInv(index, flag, x, y);
-	}
-	void readSetData();
-	void look();
-	void autoLook();
-	void doLook();
-	void inventory();
-	void mainScreen();
-	void zoomOnOff();
-	void initialInv();
-	void walkIntoRoom();
-	void afterNewRoom();
-	void madmanRun();
-	void showGun();
-	void identifyOb();
-
-#endif
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index a73a5091c0..aacd2d2980 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -40,7 +40,7 @@ void DreamBase::talk() {
 	showPointer();
 	workToScreen();
 
-	RectWithCallback<DreamGenContext> talkList[] = {
+	RectWithCallback<DreamBase> talkList[] = {
 		{ 273,320,157,198,&DreamBase::getBack1 },
 		{ 240,290,2,44,&DreamBase::moreTalk },
 		{ 0,320,0,200,&DreamBase::blank },
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 06743ed3bb..33a1770d93 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "dreamweb/dreamweb.h"
-#include "dreamweb/stubs.h"
 #include "engines/util.h"
 #include "graphics/surface.h"
 
-- 
cgit v1.2.3


From 5dd3e1f6dc0ba3b81b7c32bb0edab734925e7ca5 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 01:50:15 +0100
Subject: DREAMWEB: Remove more unused data from blob

---
 engines/dreamweb/dreamgen.cpp | 12 +-----------
 engines/dreamweb/dreamgen.h   |  7 +++----
 2 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 28d196bdbb..37ef12efa8 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -75,17 +75,7 @@ void DreamGenContext::__start() {
 		//0x0150: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 
-		//0x0170: .... .... ...D REAM
-		0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x10, 0x12, 0x12, 
-		//0x0180: WEB. V99. .... $...
-		0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 
-		//0x0190: .... .... .... ....
-		0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01a0: .... .D:. .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x01b0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 102b3822ca..28a40187f7 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -307,10 +307,9 @@ static const uint16 kCh1playing = 374;
 static const uint16 kCh1blockstocopy = 375;
 static const uint16 kCurrentsample = 377;
 static const uint16 kRoomssample = 378;
-static const uint16 kBasicsample = 379;
-static const uint16 kQuitrequested = 453;
-static const uint16 kSubtitles = 454;
-static const uint16 kForeignrelease = 455;
+static const uint16 kQuitrequested = 379;
+static const uint16 kSubtitles = 380;
+static const uint16 kForeignrelease = 381;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
-- 
cgit v1.2.3


From a95f34bc64ada8f1d35466a0e4cb10c96ba95580 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 27 Dec 2011 02:02:19 +0100
Subject: KYRA: Some formatting fixes.

---
 engines/kyra/eob.cpp           | 134 ++++++++--------
 engines/kyra/gui_eob.cpp       | 264 +++++++++++++++----------------
 engines/kyra/items_eob.cpp     | 110 ++++++-------
 engines/kyra/magic_eob.cpp     |  54 +++----
 engines/kyra/saveload_eob.cpp  |  12 +-
 engines/kyra/scene_eob.cpp     |  40 ++---
 engines/kyra/screen_eob.cpp    |  76 ++++-----
 engines/kyra/script_eob.cpp    | 158 +++++++++----------
 engines/kyra/sequences_eob.cpp |  92 +++++------
 engines/kyra/sprites_eob.cpp   |  16 +-
 engines/kyra/staticres_eob.cpp | 349 +++++++++++++++++++++--------------------
 engines/kyra/timer_eob.cpp     |   2 +-
 12 files changed, 658 insertions(+), 649 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob.cpp b/engines/kyra/eob.cpp
index 0010a51779..96eb388699 100644
--- a/engines/kyra/eob.cpp
+++ b/engines/kyra/eob.cpp
@@ -28,16 +28,22 @@
 
 namespace Kyra {
 
-EoBEngine::EoBEngine(OSystem *system, const GameFlags &flags) : EoBCoreEngine(system, flags) {
+EoBEngine::EoBEngine(OSystem *system, const GameFlags &flags)
+	: EoBCoreEngine(system, flags) {
 	_numSpells = 53;
 	_menuChoiceInit = 4;
 
-	_turnUndeadString = _introFilesOpening = _introFilesTower = _introFilesOrb = _introFilesWdEntry	= _introFilesKing = _introFilesHands = _introFilesWdExit =
-		_introFilesTunnel = _finBonusStrings = _npcStrings[1] = _npcStrings[2] = _npcStrings[3] = _npcStrings[4] = _npcStrings[5] = _npcStrings[6] = _npcStrings[7]	=
-		_npcStrings[8] = _npcStrings[9]	= _npcStrings[10] = 0;
-	_introOpeningFrmDelay = _introWdEncodeX	= _introWdEncodeY = _introWdEncodeWH = _npcShpData = _npcSubShpIndex1 = _npcSubShpIndex2 = _npcSubShpY = _introWdDsY =
-		_introTvlX1 = _introTvlY1 = _introTvlX2	= _introTvlY2 = _introTvlW = _introTvlH = _dscDoorScaleMult4 = _dscDoorScaleMult5 = _dscDoorScaleMult6 =
-		_dscDoorY3 = _dscDoorY4 = _dscDoorY5 = _dscDoorY6 = _dscDoorY7 = _doorShapeEncodeDefs = _doorSwitchShapeEncodeDefs = _doorSwitchCoords = 0;
+	_turnUndeadString = _introFilesOpening = _introFilesTower = _introFilesOrb = 0;
+	_introFilesWdEntry = _introFilesKing = _introFilesHands = _introFilesWdExit = 0;
+	_introFilesTunnel = _finBonusStrings = _npcStrings[1] = _npcStrings[2] = 0;
+	_npcStrings[3] = _npcStrings[4] = _npcStrings[5] = _npcStrings[6] = 0;
+	_npcStrings[7] = _npcStrings[8] = _npcStrings[9] = _npcStrings[10] = 0;
+	_introOpeningFrmDelay = _introWdEncodeX = _introWdEncodeY = _introWdEncodeWH = 0;
+	_npcShpData = _npcSubShpIndex1 = _npcSubShpIndex2 = _npcSubShpY = _introWdDsY = 0;
+	_introTvlX1 = _introTvlY1 = _introTvlX2 = _introTvlY2 = _introTvlW = _introTvlH = 0;
+	_dscDoorScaleMult4 = _dscDoorScaleMult5 = _dscDoorScaleMult6 = _dscDoorY3 = 0;
+	_dscDoorY4 = _dscDoorY5 = _dscDoorY6 = _dscDoorY7 = _doorShapeEncodeDefs = 0;
+	_doorSwitchShapeEncodeDefs = _doorSwitchCoords = 0;
 	_introWdDsX = 0;
 	_dscDoorCoordsExt = 0;
 }
@@ -176,7 +182,7 @@ void EoBEngine::runNpcDialogue(int npcIndex) {
 
 	switch (npcIndex) {
 	case 0:
-		for (r = 1; r == 1; ) {
+		for (r = 1; r == 1;) {
 			gui_drawDialogueBox();
 			r = DLG2A3(checkScriptFlags(0x2000), 8, 2, 1);
 			if (r == 1) {
@@ -238,7 +244,7 @@ void EoBEngine::runNpcDialogue(int npcIndex) {
 		}
 
 		if (!r)
-			 _txt->printDialogueText(_npcStrings[0][0], true);
+			_txt->printDialogueText(_npcStrings[0][0], true);
 
 		break;
 
@@ -293,7 +299,7 @@ void EoBEngine::runNpcDialogue(int npcIndex) {
 					itm = _characters[a].inventory[r];
 					if (itm && (_items[itm].type < 51 || _items[itm].type > 56)) {
 						_characters[a].inventory[r] = 0;
-						setItemPosition((Item*)&_levelBlockProperties[_currentBlock].drawObjects, _currentBlock, itm, _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
+						setItemPosition((Item *)&_levelBlockProperties[_currentBlock].drawObjects, _currentBlock, itm, _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
 					}
 				}
 			}
@@ -391,7 +397,7 @@ void EoBEngine::loadDoorShapes(int doorType1, int shapeId1, int doorType2, int s
 			enc = &_doorSwitchShapeEncodeDefs[(doorType2 * 3 + i) << 2];
 			_doorSwitches[shapeId2 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
 			_doorSwitches[shapeId2 + i].x = _doorSwitchCoords[doorType2 * 6 + i * 2];
-			_doorSwitches[shapeId2 + i].y = _doorSwitchCoords[doorType2 * 6 + i * 2+ 1];
+			_doorSwitches[shapeId2 + i].y = _doorSwitchCoords[doorType2 * 6 + i * 2 + 1];
 		}
 	}
 
@@ -408,62 +414,62 @@ void EoBEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wal
 	const ScreenDim *td = _screen->getScreenDim(5);
 
 	switch (_currentLevel) {
-		case 4:
-		case 5:
-		case 6:
-			y = _dscDoorY6[mDim] - shp[1];
-			d1 = _dscDoorCoordsExt[index << 1] >> 3;
-			d2 = _dscDoorCoordsExt[(index << 1) + 1] >> 3;
-			if (_shpDmX1 > d1)
-				d1 = _shpDmX1;
-			if (_shpDmX2 < d2)
-				d2 = _shpDmX2;
-			_screen->modifyScreenDim(5, d1, td->sy, d2 - d1, td->h);
-			v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult3[mDim] : _dscDoorScaleMult4[mDim]) * -1;
-			v -= (shp[2] << 3);
-			drawBlockObject(0, 2, shp, x + v, y, 5);
-			v += (shp[2] << 3);
-			drawBlockObject(1, 2, shp, x - v, y, 5);
-			if (_wllShapeMap[wall] == -1)
-				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w - v, _doorSwitches[shapeIndex].y, 5);
-			break;
+	case 4:
+	case 5:
+	case 6:
+		y = _dscDoorY6[mDim] - shp[1];
+		d1 = _dscDoorCoordsExt[index << 1] >> 3;
+		d2 = _dscDoorCoordsExt[(index << 1) + 1] >> 3;
+		if (_shpDmX1 > d1)
+			d1 = _shpDmX1;
+		if (_shpDmX2 < d2)
+			d2 = _shpDmX2;
+		_screen->modifyScreenDim(5, d1, td->sy, d2 - d1, td->h);
+		v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult3[mDim] : _dscDoorScaleMult4[mDim]) * -1;
+		v -= (shp[2] << 3);
+		drawBlockObject(0, 2, shp, x + v, y, 5);
+		v += (shp[2] << 3);
+		drawBlockObject(1, 2, shp, x - v, y, 5);
+		if (_wllShapeMap[wall] == -1)
+			drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w - v, _doorSwitches[shapeIndex].y, 5);
+		break;
 
-		case 7:
-		case 8:
-		case 9:
-			y = _dscDoorY3[mDim] - _doorShapes[shapeIndex + 3][1];
-			d1 = x - (_doorShapes[shapeIndex + 3][2] << 2);
-			x -= (shp[2] << 2);
-			drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], d1, y, 5);
-			scaleLevelShapesDim(index, y1, y2, 5);
-			y = _dscDoorY3[mDim] - ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim] : _dscDoorScaleMult2[mDim]);
-			drawBlockObject(0, 2, shp, x, y, 5);
-			if (_wllShapeMap[wall] == -1)
-				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
-			break;
+	case 7:
+	case 8:
+	case 9:
+		y = _dscDoorY3[mDim] - _doorShapes[shapeIndex + 3][1];
+		d1 = x - (_doorShapes[shapeIndex + 3][2] << 2);
+		x -= (shp[2] << 2);
+		drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], d1, y, 5);
+		scaleLevelShapesDim(index, y1, y2, 5);
+		y = _dscDoorY3[mDim] - ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim] : _dscDoorScaleMult2[mDim]);
+		drawBlockObject(0, 2, shp, x, y, 5);
+		if (_wllShapeMap[wall] == -1)
+			drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+		break;
 
-		case 10:
-		case 11:
-			v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult5[mDim] : _dscDoorScaleMult6[mDim]) * -1;
-			x -= (shp[2] << 2);
-			y = _dscDoorY4[mDim] + v;
-			drawBlockObject(0, 2, shp, x, y + v, 5);
-			v = (v >> 3) + (v >> 2);
-			y = _dscDoorY5[mDim];
-			drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], x, y - v, 5);
-			if (_wllShapeMap[wall] == -1)
-				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
-			break;
+	case 10:
+	case 11:
+		v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult5[mDim] : _dscDoorScaleMult6[mDim]) * -1;
+		x -= (shp[2] << 2);
+		y = _dscDoorY4[mDim] + v;
+		drawBlockObject(0, 2, shp, x, y + v, 5);
+		v = (v >> 3) + (v >> 2);
+		y = _dscDoorY5[mDim];
+		drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], x, y - v, 5);
+		if (_wllShapeMap[wall] == -1)
+			drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+		break;
 
-		default:
-			y = (_currentLevel == 12 ? _dscDoorY6[mDim] : _dscDoorY1[mDim]) - shp[1];
-			x -= (shp[2] << 2);
-			y -= (wall >= 30 ? _dscDoorScaleMult2[mDim] : (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim]);
-			drawBlockObject(0, 2, shp, x, y, 5);
+	default:
+		y = (_currentLevel == 12 ? _dscDoorY6[mDim] : _dscDoorY1[mDim]) - shp[1];
+		x -= (shp[2] << 2);
+		y -= (wall >= 30 ? _dscDoorScaleMult2[mDim] : (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim]);
+		drawBlockObject(0, 2, shp, x, y, 5);
 
-			if (_wllShapeMap[wall] == -1)
-				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
-			break;
+		if (_wllShapeMap[wall] == -1)
+			drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+		break;
 	}
 }
 
@@ -567,6 +573,6 @@ void EoBEngine::healParty() {
 	}
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 080af941df..51a9e52266 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -300,26 +300,26 @@ void EoBCoreEngine::gui_drawWeaponSlotStatus(int x, int y, int status) {
 		gui_drawBox(x, y, 31, 16, _color9, _color10, _color11);
 
 	switch (status + 5) {
-		case 0:
-			tmpStr = _characterGuiStringsWp[2];
-			break;
-		case 1:
-			tmpStr = _characterGuiStringsWr[2];
-			tmpStr2 = _characterGuiStringsWr[3];
-			break;
-		case 2:
-			tmpStr = _characterGuiStringsWr[0];
-			tmpStr2 = _characterGuiStringsWr[1];
-			break;
-		case 3:
-			tmpStr = _characterGuiStringsWp[1];
-			break;
-		case 4:
-			tmpStr = _characterGuiStringsWp[0];
-			break;
-		default:
-			tmpStr = Common::String::format("%d", status);
-			break;
+	case 0:
+		tmpStr = _characterGuiStringsWp[2];
+		break;
+	case 1:
+		tmpStr = _characterGuiStringsWr[2];
+		tmpStr2 = _characterGuiStringsWr[3];
+		break;
+	case 2:
+		tmpStr = _characterGuiStringsWr[0];
+		tmpStr2 = _characterGuiStringsWr[1];
+		break;
+	case 3:
+		tmpStr = _characterGuiStringsWp[1];
+		break;
+	case 4:
+		tmpStr = _characterGuiStringsWp[0];
+		break;
+	default:
+		tmpStr = Common::String::format("%d", status);
+		break;
 	}
 
 	if (!tmpStr2.empty()) {
@@ -433,8 +433,8 @@ void EoBCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
 			return;
 		}
 
-		int iX= x;
-		int iY= y;
+		int iX = x;
+		int iY = y;
 
 		for (int i = 0; i < 64; i += 16) {
 			x = iX + i;
@@ -790,11 +790,11 @@ int EoBCoreEngine::clickedSceneDropPickupItem(Button *button) {
 	int d = _dropItemDirIndex[(_currentDirection << 2) + button->arg];
 
 	if (_itemInHand) {
-		setItemPosition((Item*)&_levelBlockProperties[block & 0x3ff].drawObjects, block, _itemInHand, d);
+		setItemPosition((Item *)&_levelBlockProperties[block & 0x3ff].drawObjects, block, _itemInHand, d);
 		setHandItem(0);
 		runLevelScript(block, 4);
 	} else {
-		d = getQueuedItem((Item*)&_levelBlockProperties[block].drawObjects, d, -1);
+		d = getQueuedItem((Item *)&_levelBlockProperties[block].drawObjects, d, -1);
 		if (!d)
 			return 1;
 		setHandItem(d);
@@ -975,7 +975,7 @@ int EoBCoreEngine::clickedSpellbookList(Button *button) {
 		if (listIndex == 7 || _openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellListOffset + listIndex] > 0) {
 			if (listIndex < 6) {
 				if (_openBookSpellListOffset + listIndex < 9)
-					_openBookSpellSelectedItem= listIndex;
+					_openBookSpellSelectedItem = listIndex;
 				else if (listIndex != 7)
 					return button->index;
 			} else if (listIndex != 7) {
@@ -994,7 +994,7 @@ int EoBCoreEngine::clickedSpellbookList(Button *button) {
 
 				castSpell(s, 0);
 
-			} else if ((_openBookSpellSelectedItem == 6 && listIndex == 7) || (_openBookSpellSelectedItem != 6 && listIndex == 6) ) {
+			} else if ((_openBookSpellSelectedItem == 6 && listIndex == 7) || (_openBookSpellSelectedItem != 6 && listIndex == 6)) {
 				Button b;
 				clickedSpellbookAbort(&b);
 			}
@@ -1223,81 +1223,81 @@ void EoBCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex
 	uint8 ep = _itemTypes[tp].extraProperties & 0x7f;
 
 	switch (ep) {
-		case 0:
-		case 16:
-			// Item automatically used when worn
-			_txt->printMessage(_itemMisuseStrings[1]);
-			break;
-
-		case 1:
-		case 2:
-		case 3:
-			// Weapons
-			if (!_currentControlMode)
-				useSlotWeapon(charIndex, slotIndex, itm);
-			break;
-
-		case 4:
-		case 8:
-		case 12:
-		case 13:
-		case 15:
-			// Item not used that way
-			_txt->printMessage(_itemMisuseStrings[2]);
-			break;
-
-		case 5:
-		case 6:
-			// Cleric holy symbol / mage spell book
-			if (!_currentControlMode)
-				useMagicBookOrSymbol(charIndex, ep == 6 ? 1 : 0);
-			break;
-
-		case 7:
-			// Food ration
-			// Don't do anything if mouse control is enabled (we don't support anything else)
-			// eatItemInHand(charIndex);
-			break;
-
-		case 10:
-			if (_flags.gameID == GI_EOB1)
-				vl += _clericSpellOffset;
-			// drop through
-		case 9:
-			// Mage/Cleric Scroll
-			if (!_currentControlMode)
-				useMagicScroll(charIndex, vl, wslot);
-			break;
-
-		case 11:
-			// Letters, Notes, Maps
-			displayParchment(vl);
-			break;
-
-		case 14:
-			// Potion
-			usePotion(charIndex, wslot);
-			break;
-
-		case 18:
-			useWand(charIndex, wslot);
-			break;
-
-		case 19:
-			// eob2 horn
-			useHorn(charIndex, wslot);
-			break;
-
-		case 20:
-			if (vl == 1)
-				inflictCharacterDamage(charIndex, 200);
-			else
-				useMagicScroll(charIndex, 55, wslot);
-			deleteInventoryItem(charIndex, wslot);
-			break;
+	case 0:
+	case 16:
+		// Item automatically used when worn
+		_txt->printMessage(_itemMisuseStrings[1]);
+		break;
+
+	case 1:
+	case 2:
+	case 3:
+		// Weapons
+		if (!_currentControlMode)
+			useSlotWeapon(charIndex, slotIndex, itm);
+		break;
+
+	case 4:
+	case 8:
+	case 12:
+	case 13:
+	case 15:
+		// Item not used that way
+		_txt->printMessage(_itemMisuseStrings[2]);
+		break;
+
+	case 5:
+	case 6:
+		// Cleric holy symbol / mage spell book
+		if (!_currentControlMode)
+			useMagicBookOrSymbol(charIndex, ep == 6 ? 1 : 0);
+		break;
+
+	case 7:
+		// Food ration
+		// Don't do anything if mouse control is enabled (we don't support anything else)
+		// eatItemInHand(charIndex);
+		break;
+
+	case 10:
+		if (_flags.gameID == GI_EOB1)
+			vl += _clericSpellOffset;
+		// drop through
+	case 9:
+		// Mage/Cleric Scroll
+		if (!_currentControlMode)
+			useMagicScroll(charIndex, vl, wslot);
+		break;
+
+	case 11:
+		// Letters, Notes, Maps
+		displayParchment(vl);
+		break;
+
+	case 14:
+		// Potion
+		usePotion(charIndex, wslot);
+		break;
+
+	case 18:
+		useWand(charIndex, wslot);
+		break;
+
+	case 19:
+		// eob2 horn
+		useHorn(charIndex, wslot);
+		break;
+
+	case 20:
+		if (vl == 1)
+			inflictCharacterDamage(charIndex, 200);
+		else
+			useMagicScroll(charIndex, 55, wslot);
+		deleteInventoryItem(charIndex, wslot);
+		break;
 
-		default:
-			break;
+	default:
+		break;
 	}
 
 	if (_flags.gameID == GI_EOB1 || (ep == 1 && charIndex >= 2))
@@ -1336,7 +1336,7 @@ void EoBCoreEngine::gui_processInventorySlotClick(int slot) {
 
 GUI_EoB::GUI_EoB(EoBCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 	_menuStringsPrefsTemp = new char*[4];
-	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char*));
+	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char *));
 
 	_saveSlotStringsTemp = new char*[6];
 	for (int i = 0; i < 6; i++) {
@@ -1429,7 +1429,7 @@ void GUI_EoB::processButton(Button *button) {
 				_screen->drawShape(_screen->_curPage, button->data1ShapePtr, fx, fy, sd);
 			} else if (button->data0Val1 == 2) {
 				if (!(button->flags2 & 4))
-					_screen->printText((const char*) button->data1ShapePtr, sx, sy, col1, col2);
+					_screen->printText((const char *)button->data1ShapePtr, sx, sy, col1, col2);
 			} else if (button->data0Val1 == 3) {
 				// nullsub (at least EOBII)
 			} else if (button->data0Val1 == 4) {
@@ -1453,9 +1453,9 @@ void GUI_EoB::processButton(Button *button) {
 				_screen->drawShape(_screen->_curPage, button->data2ShapePtr, fx, fy, sd);
 			} else if (button->data0Val1 == 2) {
 				if (button->flags2 & 1)
-					_screen->printText((const char*) button->data2ShapePtr, sx, sy, button->data3Val2, button->data3Val3);
+					_screen->printText((const char *)button->data2ShapePtr, sx, sy, button->data3Val2, button->data3Val3);
 				else
-					_screen->printText((const char*) button->data2ShapePtr, sx, sy, button->data2Val2, button->data2Val3);
+					_screen->printText((const char *)button->data2ShapePtr, sx, sy, button->data2Val2, button->data2Val3);
 			} else if (button->data0Val1 == 3) {
 				// nullsub (at least EOBII)
 			} else if (button->data0Val1 == 4) {
@@ -1476,7 +1476,7 @@ void GUI_EoB::processButton(Button *button) {
 		if (button->data0Val1 == 1) {
 			_screen->drawShape(_screen->_curPage, button->data0ShapePtr, fx, fy, sd);
 		} else if (button->data0Val1 == 2) {
-			_screen->printText((const char*) button->data0ShapePtr, sx, sy, button->data0Val2, button->data0Val3);
+			_screen->printText((const char *)button->data0ShapePtr, sx, sy, button->data0Val2, button->data0Val3);
 		} else if (button->data0Val1 == 3) {
 			// nullsub (at least EOBII)
 		} else if (button->data0Val1 == 4) {
@@ -1486,7 +1486,7 @@ void GUI_EoB::processButton(Button *button) {
 			_screen->drawBox(sx, sy, fx2, fy2, button->data0Val2);
 		} else {
 			if (!button->data0Val1) {
-				if(button->data1Val1 == 2 || button->data2Val1 == 2) {
+				if (button->data1Val1 == 2 || button->data2Val1 == 2) {
 					_screen->drawBox(sx, sy, fx2, fy2, button->data0Val2);
 				} else {
 					// nullsub (at least EOBII)
@@ -1542,7 +1542,7 @@ int GUI_EoB::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 
 			// UNUSED
 			//if (buttonList->flags2 & 0x20) {
-				// if (_processButtonListExtraCallback)
+				//if (_processButtonListExtraCallback)
 				//	this->*_processButtonListExtraCallback(buttonList);
 			//}
 
@@ -2001,7 +2001,7 @@ void GUI_EoB::runCampMenu() {
 	_needRest = false;
 	Button *buttonList = 0;
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		if (newMenu == 2)
 			updateOptionsStrings();
 
@@ -2067,7 +2067,7 @@ void GUI_EoB::runCampMenu() {
 					if (_vm->_menuButtonDefs[s - 1].flags & 2)
 						break;
 					s += dir;
-				} while(!_vm->shouldQuit());
+				} while (!_vm->shouldQuit());
 
 				highlightButton = _vm->gui_getButton(buttonList, s);
 			}
@@ -2219,7 +2219,7 @@ bool GUI_EoB::runLoadMenu(int x, int y) {
 
 	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		updateSaveSlotsList(_vm->_targetName);
 		int slot = selectSaveSlotDialogue(x, y, 1);
 		if (slot > 5) {
@@ -2257,7 +2257,7 @@ bool GUI_EoB::confirmDialogue2(int dim, int id, int deflt) {
 	for (int i = 0; i < 2; i++)
 		drawMenuButtonBox(x[i], y, 32, 14, false, false);
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		Common::Point p = _vm->getMousePos();
 		if (_vm->posWithinRect(p.x, p.y, x[0], y, x[0] + 32, y + 14))
 			newHighlight = 0;
@@ -2324,7 +2324,7 @@ void GUI_EoB::messageDialogue(int dim, int id, int buttonTextCol) {
 	_screen->printShadedText(_vm->_menuOkString, bx + 4, by + 3, buttonTextCol, 0);
 	_screen->updateScreen();
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
 		_vm->removeInputTop();
 
@@ -2365,7 +2365,7 @@ void GUI_EoB::messageDialogue2(int dim, int id, int buttonTextCol) {
 	_screen->printShadedText(_vm->_menuOkString, x + 4, y + 3, buttonTextCol, 0);
 	_screen->updateScreen();
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
 		_vm->removeInputTop();
 
@@ -2492,7 +2492,7 @@ int GUI_EoB::getTextInput(char *dest, int x, int y, int destMaxLen, int textColo
 		} else if (in > 31 && in < 126) {
 			if (!(in == 32 && pos == 0)) {
 				if (in >= 97 && in <= 122)
-					in -=32;
+					in -= 32;
 
 				if (pos < len) {
 					for (int i = destMaxLen - 1; i >= pos; i--)
@@ -2553,7 +2553,7 @@ Common::String GUI_EoB::transferTargetMenu(Common::Array<Common::String> &target
 		delete[] _savegameList;
 	}
 	_savegameList = new char*[_savegameListSize];
-	memset(_savegameList, 0, _savegameListSize * sizeof(char*));
+	memset(_savegameList, 0, _savegameListSize * sizeof(char *));
 
 	Common::StringArray::iterator ii = targets.begin();
 	for (int i = 0; i < _savegameListSize; ++i) {
@@ -2593,7 +2593,7 @@ Common::String GUI_EoB::transferFileMenu(Common::String &target) {
 		slot = selectSaveSlotDialogue(72, 14, 4);
 		if (slot == 6)
 			break;
-		
+
 		if (_saveSlotIdTemp[slot] == -1)
 			messageDialogue(11, 65, 6);
 		else {
@@ -2638,7 +2638,7 @@ bool GUI_EoB::runSaveMenu(int x, int y) {
 
 	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		updateSaveSlotsList(_vm->_targetName);
 		int slot = selectSaveSlotDialogue(x, y, 0);
 		if (slot > 5) {
@@ -2656,7 +2656,7 @@ bool GUI_EoB::runSaveMenu(int x, int y) {
 			int fx = (x + 1) << 3;
 			int fy = y + slot * 17 + 23;
 
-			for (int in = -1; in == -1 && !_vm->shouldQuit(); ) {
+			for (int in = -1; in == -1 && !_vm->shouldQuit();) {
 				_screen->fillRect(fx - 2, fy, fx + 160, fy + 8, _vm->_bkgColor_1);
 				in = getTextInput(_saveSlotStringsTemp[slot], x + 1, fy, 19, 2, 0, 8);
 				if (!strlen(_saveSlotStringsTemp[slot])) {
@@ -2707,7 +2707,7 @@ int GUI_EoB::selectSaveSlotDialogue(int x, int y, int id) {
 	int newHighlight = 0;
 	int slot = -1;
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
 		_vm->removeInputTop();
 
@@ -2904,7 +2904,7 @@ void GUI_EoB::runMemorizePrayMenu(int charIndex, int spellType) {
 	bool updateDesc = true;
 	bool updateList = true;
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		updateBoxFrameHighLight(charIndex);
 
 		if (newHighLightButton < 0)
@@ -2964,7 +2964,7 @@ void GUI_EoB::runMemorizePrayMenu(int charIndex, int spellType) {
 		} else {
 			Common::Point p = _vm->getMousePos();
 			if (_vm->posWithinRect(p.x, p.y, 8, 50, 168, 122)) {
-				newHighLightText = (p.y - 50 ) / 9;
+				newHighLightText = (p.y - 50) / 9;
 				if (menuSpellMap[lastHighLightButton * 11] - 1 < newHighLightText)
 					newHighLightText = menuSpellMap[lastHighLightButton * 11] - 1;
 			}
@@ -3257,7 +3257,7 @@ bool GUI_EoB::restParty() {
 
 	restParty_updateRestTime(hours, true);
 
-	for (int l = 0; !res && restLoop && !_vm->shouldQuit(); ) {
+	for (int l = 0; !res && restLoop && !_vm->shouldQuit();) {
 		l++;
 
 		// Regenerate spells
@@ -3321,7 +3321,7 @@ bool GUI_EoB::restParty() {
 				list = 0;
 				if (crs[i] >= 48) {
 					for (int ii = 0; !list && ii < 3; ii++)
-						list = (int8*)memchr(_vm->_characters[i].clericSpells, -spells[ii], 80);
+						list = (int8 *)memchr(_vm->_characters[i].clericSpells, -spells[ii], 80);
 				}
 
 				if (list)
@@ -3380,15 +3380,15 @@ bool GUI_EoB::restParty() {
 				for (int i = 0; i < 6; i++) {
 					// Add Lay On Hands spell
 					if (_vm->_characters[i].cClass == 2) {
-						list = (int8*)memchr(_vm->_characters[i].clericSpells, spells[3], 10);
+						list = (int8 *)memchr(_vm->_characters[i].clericSpells, spells[3], 10);
 						if (list) {
 							*list = spells[3];
 						} else {
-							list = (int8*)memchr(_vm->_characters[i].clericSpells, -spells[3], 10);
+							list = (int8 *)memchr(_vm->_characters[i].clericSpells, -spells[3], 10);
 							if (list) {
 								*list = spells[3];
 							} else if (!memchr(_vm->_characters[i].clericSpells, spells[3], 10)) {
-								list = (int8*)memchr(_vm->_characters[i].clericSpells, 0, 10);
+								list = (int8 *)memchr(_vm->_characters[i].clericSpells, 0, 10);
 								*list = spells[3];
 							}
 						}
@@ -3488,7 +3488,7 @@ bool GUI_EoB::confirmDialogue(int id) {
 	int lastHighlight = -1;
 	bool result = false;
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		if (newHighlight != lastHighlight) {
 			if (lastHighlight != -1)
 				drawMenuButton(_vm->gui_getButton(buttonList, lastHighlight + 33), false, false, true);
@@ -3701,7 +3701,7 @@ void GUI_EoB::displayTextBox(int id) {
 	_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
 
-	for (uint32 timeOut = _vm->_system->getMillis() + 1440; _vm->_system->getMillis() < timeOut && !_vm->shouldQuit(); ) {
+	for (uint32 timeOut = _vm->_system->getMillis() + 1440; _vm->_system->getMillis() < timeOut && !_vm->shouldQuit();) {
 		int in = _vm->checkInput(0, false, 0);
 		_vm->removeInputTop();
 		if (in && !(in & 0x800))
@@ -3765,7 +3765,7 @@ void GUI_EoB::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFil
 	if (!b)
 		return;
 
-	EoBMenuButtonDef *d = (EoBMenuButtonDef*)b->extButtonDef;
+	EoBMenuButtonDef *d = (EoBMenuButtonDef *)b->extButtonDef;
 
 	if (d->flags & 1)
 		drawMenuButtonBox(b->x, b->y, b->width, b->height, clicked, noFill);
@@ -3827,9 +3827,9 @@ void GUI_EoB::drawSaveSlotButton(int slot, int redrawBox, int textCol) {
 	int x = _saveSlotX + 4;
 	int y = _saveSlotY + slot * 17 + 20;
 	int w = 167;
-	const char *s = (slot < 6) ?_saveSlotStringsTemp[slot] : _vm->_saveLoadStrings[0];
+	const char *s = (slot < 6) ? _saveSlotStringsTemp[slot] : _vm->_saveLoadStrings[0];
 
-	if (slot >= 6 ) {
+	if (slot >= 6) {
 		x = _saveSlotX + 118;
 		y = _saveSlotY + 126;
 		w = 53;
@@ -4034,6 +4034,6 @@ const EoBRect16 GUI_EoB::_updateBoxFrameHighLights[] = {
 	{ 0x00A3, 0x0068, 0x00C3, 0x0089 }
 };
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index c58fd0835c..33b47c12e7 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -107,7 +107,7 @@ Kyra::Item EoBCoreEngine::duplicateItem(Item itemIndex) {
 
 Item EoBCoreEngine::createItemOnCurrentBlock(Item itemIndex) {
 	Item itm = duplicateItem(itemIndex);
-	setItemPosition((Item*)&_levelBlockProperties[_currentBlock].drawObjects, _currentBlock, itm, _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
+	setItemPosition((Item *)&_levelBlockProperties[_currentBlock].drawObjects, _currentBlock, itm, _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
 	return itm;
 }
 
@@ -182,7 +182,7 @@ void EoBCoreEngine::deleteBlockItem(uint16 block, int type) {
 
 	_levelBlockProperties[block].drawObjects = 0;
 
-	for (uint16 i2 = itm, i = 0; itm != i2 || !i; i++ ) {
+	for (uint16 i2 = itm, i = 0; itm != i2 || !i; i++) {
 		if (type == _items[itm].type || type == -1) {
 			_items[itm].block = -1;
 			_items[itm].level = 0;
@@ -193,7 +193,7 @@ void EoBCoreEngine::deleteBlockItem(uint16 block, int type) {
 			uint16 i3 = itm;
 			itm = _items[itm].prev;
 			_items[i3].prev = _items[i3].next = 0;
-			setItemPosition((Item*)&_levelBlockProperties[block].drawObjects, block, i3, _items[i3].pos);
+			setItemPosition((Item *)&_levelBlockProperties[block].drawObjects, block, i3, _items[i3].pos);
 		}
 	}
 }
@@ -227,7 +227,7 @@ int EoBCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int sl
 int EoBCoreEngine::stripPartyItems(int16 itemType, int16 itemValue, int handleValueMode, int numItems) {
 	int itemsLeft = numItems;
 
-	for (bool runloop = true; runloop && itemsLeft; ) {
+	for (bool runloop = true; runloop && itemsLeft;) {
 		runloop = false;
 		for (int i = 0; i < 6 && itemsLeft; i++) {
 			if (!testCharacter(i, 1))
@@ -371,58 +371,58 @@ void EoBCoreEngine::printFullItemName(Item item) {
 
 	if ((itm->flags & 0x40) && !strlen(nameId)) {
 		switch (f) {
-			case 0:
-			case 1:
-			case 2:
-			case 3:
-				if (v == 0)
-					tmpString = nameUnid;
-				else if (v < 0)
-					tmpString = _flags.gameID == GI_EOB1 ? Common::String::format(_cursedString[0], nameUnid, v) : Common::String::format(_cursedString[0], v, nameUnid);
-				else
-					tmpString = _flags.gameID == GI_EOB1 ? Common::String::format(_enchantedString[0], nameUnid, v) : Common::String::format(_enchantedString[0], v, nameUnid);
-				break;
+		case 0:
+		case 1:
+		case 2:
+		case 3:
+			if (v == 0)
+				tmpString = nameUnid;
+			else if (v < 0)
+				tmpString = _flags.gameID == GI_EOB1 ? Common::String::format(_cursedString[0], nameUnid, v) : Common::String::format(_cursedString[0], v, nameUnid);
+			else
+				tmpString = _flags.gameID == GI_EOB1 ? Common::String::format(_enchantedString[0], nameUnid, v) : Common::String::format(_enchantedString[0], v, nameUnid);
+			break;
 
-			case 9:
-				tstr2 = _magicObjectStrings[0];
-				tstr3 = _spells[v].name;
-				correctSuffixCase = true;
-				break;
+		case 9:
+			tstr2 = _magicObjectStrings[0];
+			tstr3 = _spells[v].name;
+			correctSuffixCase = true;
+			break;
+
+		case 10:
+			tstr2 = _magicObjectStrings[1];
+			tstr3 = _spells[_flags.gameID == GI_EOB1 ? (_clericSpellOffset + v) : v].name;
+			correctSuffixCase = true;
+			break;
+
+		case 14:
+			tstr2 = _magicObjectStrings[3];
+			if (_flags.gameID == GI_EOB1)
+				v--;
+			tstr3 = _suffixStringsPotions[v];
+			break;
+
+		case 16:
+			tstr2 = _magicObjectStrings[2];
+			tstr3 = _suffixStringsRings[v];
+			break;
 
-			case 10:
-				tstr2 = _magicObjectStrings[1];
-				tstr3 = _spells[_flags.gameID == GI_EOB1 ? (_clericSpellOffset + v) : v].name;
+		case 18:
+			if (_flags.gameID == GI_EOB2 && v == 5) {
+				if (_flags.lang == Common::DE_DEU)
+					tstr2 = _magicObjectString5[0];
+				else
+					tstr3 = _magicObjectString5[0];
 				correctSuffixCase = true;
-				break;
-
-			case 14:
-				tstr2 = _magicObjectStrings[3];
-				if (_flags.gameID == GI_EOB1)
-					v--;
-				tstr3 = _suffixStringsPotions[v];
-				break;
-
-			case 16:
-				tstr2 = _magicObjectStrings[2];
-				tstr3 = _suffixStringsRings[v];
-				break;
-
-			case 18:
-				if (_flags.gameID == GI_EOB2 && v == 5) {
-					if (_flags.lang == Common::DE_DEU)
-						tstr2 = _magicObjectString5[0];
-					else
-						tstr3 = _magicObjectString5[0];
-					correctSuffixCase = true;
-				} else {
-					tstr2 = _magicObjectStrings[4];
-				}
-				tstr3 = _suffixStringsWands[v];
-				break;
+			} else {
+				tstr2 = _magicObjectStrings[4];
+			}
+			tstr3 = _suffixStringsWands[v];
+			break;
 
-			default:
-				tmpString = nameUnid;
-				break;
+		default:
+			tmpString = nameUnid;
+			break;
 		}
 
 
@@ -528,7 +528,7 @@ bool EoBCoreEngine::launchObject(int charIndex, Item item, uint16 startBlock, in
 	if (slot == 10)
 		return false;
 
-	setItemPosition((Item*)&_levelBlockProperties[startBlock].drawObjects, startBlock, item, startPos | 4);
+	setItemPosition((Item *)&_levelBlockProperties[startBlock].drawObjects, startBlock, item, startPos | 4);
 
 	t->enable = 1;
 	t->u2 = 1;
@@ -577,8 +577,8 @@ bool EoBCoreEngine::updateObjectFlight(EoBFlyingObject *fo, int block, int pos)
 	uint8 wallFlags = _wllWallFlags[_levelBlockProperties[block].walls[fo->direction ^ 2]];
 	if (fo->enable == 1) {
 		if ((wallFlags & 1) || (fo->u2) || ((wallFlags & 2) && (_dscItemShapeMap[_items[fo->item].icon] >= 15))) {
-			getQueuedItem((Item*)&_levelBlockProperties[fo->curBlock].drawObjects, 0, fo->item);
-			setItemPosition((Item*)&_levelBlockProperties[block].drawObjects, block, fo->item, pos | 4);
+			getQueuedItem((Item *)&_levelBlockProperties[fo->curBlock].drawObjects, 0, fo->item);
+			setItemPosition((Item *)&_levelBlockProperties[block].drawObjects, block, fo->item, pos | 4);
 			fo->curBlock = block;
 			fo->curPos = pos;
 			fo->distance--;
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index c1b0327df2..1c29206982 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -40,7 +40,7 @@ void EoBCoreEngine::useMagicBookOrSymbol(int charIndex, int type) {
 	int8 *tmp = _openBookAvailableSpells + _openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem;
 
 	if (*tmp <= 0) {
-		for (bool loop = true; loop && _openBookSpellSelectedItem < 10; ) {
+		for (bool loop = true; loop && _openBookSpellSelectedItem < 10;) {
 			tmp = _openBookAvailableSpells + _openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem;
 			if (*tmp > 0) {
 				if (_openBookSpellSelectedItem > 5) {
@@ -448,7 +448,7 @@ void EoBCoreEngine::sparkEffectOffensive() {
 }
 
 void EoBCoreEngine::setSpellEventTimer(int spell, int timerBaseFactor, int timerLength, int timerLevelFactor, int updateExistingTimer) {
-	assert (spell >= 0);
+	assert(spell >= 0);
 	int l = _openBookType == 1 ? getClericPaladinLevel(_openBookChar) : getMageLevel(_openBookChar);
 	uint32 countdown = timerLength * timerBaseFactor + timerLength * l * timerLevelFactor;
 	setCharEventTimer(_activeSpellCharId, countdown, -spell, updateExistingTimer);
@@ -457,7 +457,7 @@ void EoBCoreEngine::setSpellEventTimer(int spell, int timerBaseFactor, int timer
 void EoBCoreEngine::sortCharacterSpellList(int charIndex) {
 	int8 *list = _characters[charIndex].mageSpells;
 
-	for (int i = 0; i < 16; ) {
+	for (int i = 0; i < 16;) {
 		bool p = false;
 		for (int ii = 0; ii < 9; ii++) {
 			int8 *pos = &list[ii];
@@ -758,7 +758,7 @@ int EoBCoreEngine::findFirstCharacterSpellTarget() {
 }
 
 int EoBCoreEngine::findNextCharacterSpellTarget(int curCharIndex) {
-	for (_characterSpellTarget++; _characterSpellTarget < 6; ) {
+	for (_characterSpellTarget++; _characterSpellTarget < 6;) {
 		if (++curCharIndex == 6)
 			curCharIndex = 0;
 		if (testCharacter(curCharIndex, 3))
@@ -826,7 +826,7 @@ void EoBCoreEngine::spellCallback_start_detectMagic() {
 	setHandItem(_itemInHand);
 }
 
-bool EoBCoreEngine::spellCallback_end_detectMagic(void*) {
+bool EoBCoreEngine::spellCallback_end_detectMagic(void *) {
 	setHandItem(_itemInHand);
 	return true;
 }
@@ -836,7 +836,7 @@ void EoBCoreEngine::spellCallback_start_magicMissile() {
 }
 
 bool EoBCoreEngine::spellCallback_end_magicMissile(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 1, 4, 1, (getMageLevel(fo->attackerId) - 1) >> 1);
 }
 
@@ -855,7 +855,7 @@ void EoBCoreEngine::spellCallback_start_shockingGrasp() {
 }
 
 bool EoBCoreEngine::spellCallback_end_shockingGraspFlameBlade(void *obj) {
-	EoBCharacter *c = (EoBCharacter*)obj;
+	EoBCharacter *c = (EoBCharacter *)obj;
 	for (int i = 0; i < 2; i++) {
 		if (isMagicEffectItem(c->inventory[i])) {
 			removeMagicWeaponItem(c->inventory[i]);
@@ -878,7 +878,7 @@ void EoBCoreEngine::spellCallback_start_melfsAcidArrow() {
 }
 
 bool EoBCoreEngine::spellCallback_end_melfsAcidArrow(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	assert(fo);
 	return magicObjectDamageHit(fo, 2, 4, 0, getMageLevel(fo->attackerId) / 3);
 }
@@ -895,7 +895,7 @@ void EoBCoreEngine::spellCallback_start_fireball() {
 }
 
 bool EoBCoreEngine::spellCallback_end_fireball(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 1, 6, 0, getMageLevel(fo->attackerId));
 }
 
@@ -904,7 +904,7 @@ void EoBCoreEngine::spellCallback_start_flameArrow() {
 }
 
 bool EoBCoreEngine::spellCallback_end_flameArrow(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 5, 6, 0, getMageLevel(fo->attackerId));
 }
 
@@ -913,7 +913,7 @@ void EoBCoreEngine::spellCallback_start_holdPerson() {
 }
 
 bool EoBCoreEngine::spellCallback_end_holdPerson(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	bool res = false;
 
 	if (_flags.gameID == GI_EOB2 && fo->curBlock == _currentBlock) {
@@ -943,7 +943,7 @@ void EoBCoreEngine::spellCallback_start_lightningBolt() {
 }
 
 bool EoBCoreEngine::spellCallback_end_lightningBolt(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 1, 6, 0, getMageLevel(fo->attackerId));
 }
 
@@ -962,7 +962,7 @@ void EoBCoreEngine::spellCallback_start_vampiricTouch() {
 }
 
 bool EoBCoreEngine::spellCallback_end_vampiricTouch(void *obj) {
-	EoBCharacter *c = (EoBCharacter*)obj;
+	EoBCharacter *c = (EoBCharacter *)obj;
 	if (c->hitPointsCur > c->hitPointsMax)
 		c->hitPointsCur = c->hitPointsMax;
 	spellCallback_end_shockingGraspFlameBlade(obj);
@@ -983,7 +983,7 @@ void EoBCoreEngine::spellCallback_start_iceStorm() {
 }
 
 bool EoBCoreEngine::spellCallback_end_iceStorm(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	static int8 blockAdv[] = { -32, 32, 1, -1 };
 	bool res = magicObjectDamageHit(fo, 1, 6, 0, getMageLevel(fo->attackerId));
 	if (res) {
@@ -1039,7 +1039,7 @@ void EoBCoreEngine::spellCallback_start_holdMonster() {
 }
 
 bool EoBCoreEngine::spellCallback_end_holdMonster(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	bool res = false;
 	for (const int16 *m = findBlockMonsters(fo->curBlock, fo->curPos, fo->direction, 1, 1); *m != -1; m++)
 		res |= magicObjectStatusHit(&_monsters[*m], 1, true, 4);
@@ -1104,7 +1104,7 @@ void EoBCoreEngine::spellCallback_start_trueSeeing() {
 	_wllVmpMap[46] = 0;
 }
 
-bool EoBCoreEngine::spellCallback_end_trueSeeing(void*) {
+bool EoBCoreEngine::spellCallback_end_trueSeeing(void *) {
 	_wllVmpMap[46] = 1;
 	return true;
 }
@@ -1150,7 +1150,7 @@ void EoBCoreEngine::spellCallback_start_aid() {
 }
 
 bool EoBCoreEngine::spellCallback_end_aid(void *obj) {
-	EoBCharacter *c = (EoBCharacter*)obj;
+	EoBCharacter *c = (EoBCharacter *)obj;
 	c->hitPointsCur -= c->effectsRemainder[3];
 	c->effectsRemainder[3] = 0;
 	c->effectFlags &= ~0x1000;
@@ -1181,7 +1181,7 @@ void EoBCoreEngine::spellCallback_start_slowPoison() {
 }
 
 bool EoBCoreEngine::spellCallback_end_slowPoison(void *obj) {
-	EoBCharacter *c = (EoBCharacter*)obj;
+	EoBCharacter *c = (EoBCharacter *)obj;
 	c->effectFlags &= ~0x2000;
 	return true;
 }
@@ -1232,7 +1232,7 @@ void EoBCoreEngine::spellCallback_start_flameStrike() {
 }
 
 bool EoBCoreEngine::spellCallback_end_flameStrike(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 6, 8, 0, 0);
 }
 
@@ -1288,12 +1288,12 @@ void EoBCoreEngine::spellCallback_start_turnUndead() {
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_lightningBolt(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 0, 0, 12, 1);
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_fireball1(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	bool res = false;
 	if (_partyEffectFlags & 0x20000) {
 		res = magicObjectDamageHit(fo, 4, 10, 6, 0);
@@ -1308,12 +1308,12 @@ bool EoBCoreEngine::spellCallback_end_monster_fireball1(void *obj) {
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_fireball2(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 0, 0, 18, 0);
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_deathSpell(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
 
@@ -1330,7 +1330,7 @@ bool EoBCoreEngine::spellCallback_end_monster_deathSpell(void *obj) {
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_disintegrate(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
 
@@ -1346,7 +1346,7 @@ bool EoBCoreEngine::spellCallback_end_monster_disintegrate(void *obj) {
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_causeCriticalWounds(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
 
@@ -1360,7 +1360,7 @@ bool EoBCoreEngine::spellCallback_end_monster_causeCriticalWounds(void *obj) {
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_fleshToStone(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
 
@@ -1377,6 +1377,6 @@ bool EoBCoreEngine::spellCallback_end_monster_fleshToStone(void *obj) {
 	return true;
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 1f982aa3ab..ef5e8dc7a4 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -451,9 +451,9 @@ Common::Error EoBCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 		for (int ii = 0; ii < 1024; ii++)
 			out->writeByte(l->flags[ii] & 0xff);
 
-		EoBMonsterInPlay *lm = (EoBMonsterInPlay*)_lvlTempData[i]->monsters;
-		EoBFlyingObject *lf = (EoBFlyingObject*)_lvlTempData[i]->flyingObjects;
-		WallOfForce *lw = (WallOfForce*)_lvlTempData[i]->wallsOfForce;
+		EoBMonsterInPlay *lm = (EoBMonsterInPlay *)_lvlTempData[i]->monsters;
+		EoBFlyingObject *lf = (EoBFlyingObject *)_lvlTempData[i]->flyingObjects;
+		WallOfForce *lw = (WallOfForce *)_lvlTempData[i]->wallsOfForce;
 
 		for (int ii = 0; ii < 30; ii++) {
 			EoBMonsterInPlay *m = &lm[ii];
@@ -535,7 +535,7 @@ void EoBCoreEngine::restoreMonsterTempData(LevelTempData *tmp) {
 }
 
 void EoBCoreEngine::releaseMonsterTempData(LevelTempData *tmp) {
-	EoBMonsterInPlay *p = (EoBMonsterInPlay*)tmp->monsters;
+	EoBMonsterInPlay *p = (EoBMonsterInPlay *)tmp->monsters;
 	delete[] p;
 }
 
@@ -556,10 +556,10 @@ void EoBCoreEngine::restoreWallOfForceTempData(LevelTempData *tmp) {
 }
 
 void EoBCoreEngine::releaseWallOfForceTempData(LevelTempData *tmp) {
-	WallOfForce *p = (WallOfForce*)tmp->wallsOfForce;
+	WallOfForce *p = (WallOfForce *)tmp->wallsOfForce;
 	delete[] p;
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index b44feaf013..982191b359 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -121,7 +121,7 @@ void EoBCoreEngine::loadLevel(int level, int sub) {
 	_screen->setCurPage(0);
 }
 
-Common::String EoBCoreEngine::initLevelData(int sub){
+Common::String EoBCoreEngine::initLevelData(int sub) {
 	const uint8 *data = _screen->getCPagePtr(5) + 2;
 	const uint8 *pos = data;
 
@@ -135,10 +135,10 @@ Common::String EoBCoreEngine::initLevelData(int sub){
 		if (_flags.gameID == GI_EOB1)
 			pos -= 3;
 
-		loadBlockProperties((const char*)pos);
+		loadBlockProperties((const char *)pos);
 		pos += slen;
 
-		Common::SeekableReadStream *s = _res->createReadStream(Common::String::format("%s.VMP", (const char*)pos));
+		Common::SeekableReadStream *s = _res->createReadStream(Common::String::format("%s.VMP", (const char *)pos));
 		uint16 size = s->readUint16LE();
 		delete[] _vmpPtr;
 		_vmpPtr = new uint16[size];
@@ -146,12 +146,12 @@ Common::String EoBCoreEngine::initLevelData(int sub){
 			_vmpPtr[i] = s->readUint16LE();
 		delete s;
 
-		Common::String tmpStr = Common::String::format("%s.PAL", (const char*) pos);
-		_curGfxFile = (const char*) pos;
+		Common::String tmpStr = Common::String::format("%s.PAL", (const char *)pos);
+		_curGfxFile = (const char *)pos;
 		pos += slen;
 
 		if (*pos++ != 0xff && _flags.gameID == GI_EOB2) {
-			tmpStr = Common::String::format("%s.PAL", (const char*) pos);
+			tmpStr = Common::String::format("%s.PAL", (const char *)pos);
 			pos += 13;
 		}
 
@@ -168,19 +168,19 @@ Common::String EoBCoreEngine::initLevelData(int sub){
 		_screen->getPalette(0).fill(224, 32, 0x3f);
 		uint8 *src = _screen->getPalette(0).getData();
 
-		_screen->createFadeTable(src, _screen->getFadeTable(0), 4, 75);		// green
-		_screen->createFadeTable(src, _screen->getFadeTable(1), 12, 200);	// black
-		_screen->createFadeTable(src, _screen->getFadeTable(2), 10, 85);	// blue
-		_screen->createFadeTable(src, _screen->getFadeTable(3), 11, 125);	// light blue
+		_screen->createFadeTable(src, _screen->getFadeTable(0), 4, 75);     // green
+		_screen->createFadeTable(src, _screen->getFadeTable(1), 12, 200);   // black
+		_screen->createFadeTable(src, _screen->getFadeTable(2), 10, 85);    // blue
+		_screen->createFadeTable(src, _screen->getFadeTable(3), 11, 125);   // light blue
 
 		_screen->getPalette(0).copy(backupPal, 224, 32, 224);
-		_screen->createFadeTable(src, _screen->getFadeTable(4), 12, 85);	// grey (shadow)
+		_screen->createFadeTable(src, _screen->getFadeTable(4), 12, 85);    // grey (shadow)
 		_screen->setFadeTableIndex(4);
 	}
 
 	if (_flags.gameID == GI_EOB2) {
 		delay(3 * _tickLength);
-		_sound->loadSoundFile((const char*) pos);
+		_sound->loadSoundFile((const char *)pos);
 		pos += 13;
 	}
 
@@ -195,7 +195,7 @@ Common::String EoBCoreEngine::initLevelData(int sub){
 		_scriptTimers[0].ticks = READ_LE_UINT16(pos);
 		_scriptTimers[0].func = 0;
 		_scriptTimers[0].next = _system->getMillis() + _scriptTimers[0].ticks * _tickLength;
-		pos+= 2;
+		pos += 2;
 	} else {
 		for (int i = 0; i < 2; i++) {
 			int a = (*pos == 0xEC) ? 0 : ((*pos == 0xEA) ? 1 : -1);
@@ -205,12 +205,12 @@ Common::String EoBCoreEngine::initLevelData(int sub){
 			toggleWallState(pos[13], a);
 			_doorType[pos[13]] = pos[14];
 			_noDoorSwitch[pos[13]] = pos[15];
-			pos = loadDoorShapes((const char*)pos, pos[13], pos + 16);
+			pos = loadDoorShapes((const char *)pos, pos[13], pos + 16);
 		}
 	}
 
 	_stepsUntilScriptCall = READ_LE_UINT16(pos);
-	pos+= 2;
+	pos += 2;
 	_stepCounter = 0;
 
 	for (int i = 0; i < 2; i++) {
@@ -237,7 +237,7 @@ Common::String EoBCoreEngine::initLevelData(int sub){
 
 		for (int i = 0; i < num; i++) {
 			if (*pos++ == 0xEC) {
-				loadDecorations((const char*)pos, (const char*)(pos + slen));
+				loadDecorations((const char *)pos, (const char *)(pos + slen));
 				pos += (slen << 1);
 			} else {
 				assignWallsAndDecorations(pos[0], pos[1], (int8)pos[2], pos[3], pos[4]);
@@ -259,7 +259,7 @@ void EoBCoreEngine::addLevelItems() {
 	for (int i = 0; i < 600; i++) {
 		if (_items[i].level != _currentLevel || _items[i].block <= 0)
 			continue;
-		setItemPosition((Item*)&_levelBlockProperties[_items[i].block & 0x3ff].drawObjects, _items[i].block, i, _items[i].pos);
+		setItemPosition((Item *)&_levelBlockProperties[_items[i].block & 0x3ff].drawObjects, _items[i].block, i, _items[i].pos);
 	}
 }
 
@@ -647,13 +647,13 @@ int EoBCoreEngine::clickedNiche(uint16 block, uint16 direction) {
 		if (_dscItemShapeMap[_items[_itemInHand].icon] <= 14) {
 			_txt->printMessage(_pryDoorStrings[5]);
 		} else {
-			setItemPosition((Item*)&_levelBlockProperties[block & 0x3ff].drawObjects, block, _itemInHand, 8);
+			setItemPosition((Item *)&_levelBlockProperties[block & 0x3ff].drawObjects, block, _itemInHand, 8);
 			runLevelScript(block, 4);
 			setHandItem(0);
 			_sceneUpdateRequired = true;
 		}
 	} else {
-		int d = getQueuedItem((Item*)&_levelBlockProperties[block].drawObjects, 8, -1);
+		int d = getQueuedItem((Item *)&_levelBlockProperties[block].drawObjects, 8, -1);
 		if (!d)
 			return 1;
 		runLevelScript(block, 8);
@@ -693,7 +693,7 @@ int EoBCoreEngine::clickedDoorPry(uint16 block, uint16 direction) {
 	if (rollDice(1, 20) < forceDoorChanceTable[s]) {
 		_txt->printMessage(_pryDoorStrings[_flags.gameID == GI_EOB2 ? 2 : 1]);
 		_levelBlockProperties[block].walls[direction] = _levelBlockProperties[block].walls[direction ^ 2] =
-			(_levelBlockProperties[block].walls[direction] == (_flags.gameID == GI_EOB2 ? 51 : 30)) ? 8 : 18;
+		            (_levelBlockProperties[block].walls[direction] == (_flags.gameID == GI_EOB2 ? 51 : 30)) ? 8 : 18;
 		openDoor(block);
 	} else {
 		_txt->printMessage(_pryDoorStrings[3]);
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 7061ada4ac..6b1128bdfd 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -198,7 +198,7 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 		shapesize += 4;
 
 		shp = new uint8[shapesize];
-		memset (shp, 0, shapesize);
+		memset(shp, 0, shapesize);
 		uint8 *dst = shp;
 
 		*dst++ = 0;
@@ -239,18 +239,18 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 	} else {
 		uint8 nib = 0, col = 0;
 		uint8 *colorMap = new uint8[0x100];
-		memset (colorMap, 0xff, 0x100);
+		memset(colorMap, 0xff, 0x100);
 
 		shapesize = h * (w << 2) + 20;
 		shp = new uint8[shapesize];
-		memset (shp, 0, shapesize);
+		memset(shp, 0, shapesize);
 		uint8 *dst = shp;
 
 		*dst++ = 1;
 		*dst++ = (h & 0xff);
 		*dst++ = (w & 0xff);
 		*dst++ = (h & 0xff);
-		memset (dst, 0xff, 0x10);
+		memset(dst, 0xff, 0x10);
 
 		uint8 *pal = dst;
 		dst += 0x10;
@@ -276,7 +276,7 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 					}
 				}
 
-				if(++nib & 1) {
+				if (++nib & 1) {
 					*dst = c << 4;
 				} else {
 					*dst++ |= c;
@@ -300,7 +300,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 
 	va_list args;
 	va_start(args, flags);
-	uint8 *ovl = (flags & 2) ? va_arg(args, uint8*) : 0;
+	uint8 *ovl = (flags & 2) ? va_arg(args, uint8 *) : 0;
 	va_end(args);
 
 	if (sd != -1) {
@@ -340,7 +340,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 				return;
 			src += (d * (width >> 1));
 			d = dY + dH - _dsY1;
-			if (d >=0) {
+			if (d >= 0) {
 				dH = d;
 				dY = _dsY1;
 				d = _dsY2 - dY;
@@ -355,7 +355,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 		if (d < dH)
 			dH = d;
 
-        int16 cnt1 = 0;
+		int16 cnt1 = 0;
 		int16 cnt2 = 0;
 		int16 dXbit1 = dX & 1;
 
@@ -488,7 +488,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 						marginLeft = marginLeft + 1 - *src++;
 				}
 			}
-            dY = _dsY1;
+			dY = _dsY1;
 		}
 
 		d = _dsY2 - dY;
@@ -523,7 +523,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 		}
 
 		dst += (dY * 320 + dX);
-		uint8 * dstL = dst;
+		uint8 *dstL = dst;
 
 		if (pageNum == 0 || pageNum == 1)
 			addDirtyRect(rX, rY, rW, rH);
@@ -664,7 +664,7 @@ const uint8 *Screen_EoB::scaleShapeStep(const uint8 *shp) {
 		shp += w2;
 	}
 
-	return (const uint8 *) _dsTempPage;
+	return (const uint8 *)_dsTempPage;
 }
 
 void Screen_EoB::replaceShapePalette(uint8 *shp, const uint8 *pal) {
@@ -690,7 +690,7 @@ void Screen_EoB::setShapeFrame(int x1, int y1, int x2, int y2) {
 	_dsY2 = y2;
 }
 
-void Screen_EoB::setShapeFadeMode (uint8 i, bool b) {
+void Screen_EoB::setShapeFadeMode(uint8 i, bool b) {
 	if (!i || i == 1)
 		_shapeFadeMode[i] = b;
 }
@@ -721,13 +721,13 @@ void Screen_EoB::drawExplosion(int scale, int radius, int numElements, int stepS
 	int16 gx2 = _gfxX;
 	int16 gy2 = _gfxY;
 
-	int16 *ptr2 = (int16*)_dsTempPage;
-	int16 *ptr3 = (int16*)&_dsTempPage[300];
-	int16 *ptr4 = (int16*)&_dsTempPage[600];
-	int16 *ptr5 = (int16*)&_dsTempPage[900];
-	int16 *ptr6 = (int16*)&_dsTempPage[1200];
-	int16 *ptr7 = (int16*)&_dsTempPage[1500];
-	int16 *ptr8 = (int16*)&_dsTempPage[1800];
+	int16 *ptr2 = (int16 *)_dsTempPage;
+	int16 *ptr3 = (int16 *)&_dsTempPage[300];
+	int16 *ptr4 = (int16 *)&_dsTempPage[600];
+	int16 *ptr5 = (int16 *)&_dsTempPage[900];
+	int16 *ptr6 = (int16 *)&_dsTempPage[1200];
+	int16 *ptr7 = (int16 *)&_dsTempPage[1500];
+	int16 *ptr8 = (int16 *)&_dsTempPage[1800];
 
 	if (numElements > 150)
 		numElements = 150;
@@ -804,14 +804,14 @@ void Screen_EoB::drawExplosion(int scale, int radius, int numElements, int stepS
 }
 
 void Screen_EoB::drawVortex(int numElements, int radius, int stepSize, int, int disorder, const uint8 *colorTable, int colorTableSize) {
-	int16 *xCoords = (int16*)_dsTempPage;
-	int16 *yCoords = (int16*)&_dsTempPage[300];
-	int16 *xMod = (int16*)&_dsTempPage[600];
-	int16 *yMod = (int16*)&_dsTempPage[900];
-	int16 *pixBackup = (int16*)&_dsTempPage[1200];
-	int16 *colTableStep = (int16*)&_dsTempPage[1500];
-	int16 *colTableIndex = (int16*)&_dsTempPage[1800];
-	int16 *pixDelay = (int16*)&_dsTempPage[2100];
+	int16 *xCoords = (int16 *)_dsTempPage;
+	int16 *yCoords = (int16 *)&_dsTempPage[300];
+	int16 *xMod = (int16 *)&_dsTempPage[600];
+	int16 *yMod = (int16 *)&_dsTempPage[900];
+	int16 *pixBackup = (int16 *)&_dsTempPage[1200];
+	int16 *colTableStep = (int16 *)&_dsTempPage[1500];
+	int16 *colTableIndex = (int16 *)&_dsTempPage[1800];
+	int16 *pixDelay = (int16 *)&_dsTempPage[2100];
 
 	hideMouse();
 	int cp = _curPage;
@@ -873,7 +873,7 @@ void Screen_EoB::drawVortex(int numElements, int radius, int stepSize, int, int
 	}
 
 	int d = 0;
-	for (int i = 2; i; ) {
+	for (int i = 2; i;) {
 		if (i != 2) {
 			for (int ii = numElements - 1; ii >= 0; ii--) {
 				int16 px = CLIP((xCoords[ii] >> 6) + cx, 0, SCREEN_W - 1);
@@ -911,7 +911,7 @@ void Screen_EoB::drawVortex(int numElements, int radius, int stepSize, int, int
 			int16 px = CLIP((xCoords[ii] >> 6) + cx, 0, SCREEN_W - 1);
 			int16 py = CLIP((yCoords[ii] >> 6) + cy, 0, SCREEN_H - 1);
 
-			uint8 tc1 =  ((disorder >> 2) <= d) ? getPagePixel(2, px, py) : 0;
+			uint8 tc1 = ((disorder >> 2) <= d) ? getPagePixel(2, px, py) : 0;
 			pixBackup[ii] = getPagePixel(0, px, py);
 			uint8 tblIndex = CLIP(colTableIndex[ii] >> 8, 0, colorTableSize - 1);
 			uint8 tc2 = colorTable[tblIndex];
@@ -942,7 +942,7 @@ void Screen_EoB::drawVortex(int numElements, int radius, int stepSize, int, int
 void Screen_EoB::fadeTextColor(Palette *pal, int color1, int rate) {
 	uint8 *col = pal->getData();
 
-	for (bool loop = true; loop; ) {
+	for (bool loop = true; loop;) {
 		loop = true;
 		uint32 end = _system->getMillis() + _vm->tickLength();
 
@@ -1027,7 +1027,7 @@ void Screen_EoB::createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, ui
 		tmp = (uint16)((*src - b) * weight) << 1;
 		tb = *src++ - ((tmp >> 8) & 0xff);
 
-		uint8 * d = palData + 3;
+		uint8 *d = palData + 3;
 		uint16 v = 0xffff;
 		uint8 col = rootColor;
 
@@ -1044,7 +1044,7 @@ void Screen_EoB::createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, ui
 				col = ii ;
 			}
 		}
-        *dst++ = col;
+		*dst++ = col;
 	}
 }
 
@@ -1052,13 +1052,13 @@ uint8 *Screen_EoB::getFadeTable(int index) {
 	return (index >= 0 && index < 5) ? &_fadeData[index << 8] : 0;
 }
 
-void Screen_EoB::drawShapeSetPixel(uint8 * dst, uint8 c) {
+void Screen_EoB::drawShapeSetPixel(uint8 *dst, uint8 c) {
 	if (_shapeFadeMode[0]) {
 		if (_shapeFadeMode[1]) {
 			c = *dst;
 		} else {
 			_shapeFadeInternal &= 7;
-            c = *(dst + _shapeFadeInternal++);
+			c = *(dst + _shapeFadeInternal++);
 		}
 	}
 
@@ -1134,7 +1134,7 @@ int OldDOSFont::getCharWidth(uint16 c) const {
 }
 
 void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
-	static const uint8 renderMaskTable6[] = { 0xFC, 0x00, 0x7E, 0x00, 0x3F, 0x00, 0x1F, 0x80, 0x0F, 0xC0, 0x07, 0xE0, 0x03, 0xF0, 0x01, 0xF8	};
+	static const uint8 renderMaskTable6[] = { 0xFC, 0x00, 0x7E, 0x00, 0x3F, 0x00, 0x1F, 0x80, 0x0F, 0xC0, 0x07, 0xE0, 0x03, 0xF0, 0x01, 0xF8 };
 	static const uint8 renderMaskTable8[] = { 0xFF, 0x00, 0x7F, 0x80, 0x3F, 0xC0, 0x1F, 0xE0, 0x0F, 0xF0, 0x07, 0xF8, 0x03, 0xFC, 0x01, 0xFE };
 
 	if (_width != 8 && _width != 6)
@@ -1157,7 +1157,7 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 			// TODO: recheck this: no conversion for 'ß' ?
 			break;
 		}
-	} else if (_width == 8){
+	} else if (_width == 8) {
 		switch (c) {
 		case 0x81:
 		case 0x9a:
@@ -1197,7 +1197,7 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 		int cW = w;
 		const uint8 *mtbl = _width == 8 ? renderMaskTable8 : renderMaskTable6;
 
-		for (bool runWidthLoop = true; runWidthLoop; ) {
+		for (bool runWidthLoop = true; runWidthLoop;) {
 			uint8 s = *src++;
 			uint8 m = *mtbl++;
 
@@ -1233,6 +1233,6 @@ void OldDOSFont::unload() {
 	_bitmapOffsets = 0;
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index ab22b4f0b6..e5f26be210 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -136,7 +136,7 @@ EoBInfProcessor::EoBInfProcessor(EoBCoreEngine *engine, Screen_EoB *screen) : _v
 	_lastScriptFlags = 0;
 
 	_subroutineStack = new int8*[10];
-	memset(_subroutineStack, 0, 10 * sizeof(int8*));
+	memset(_subroutineStack, 0, 10 * sizeof(int8 *));
 	_subroutineStackPos = 0;
 
 	_flagTable = new uint32[18];
@@ -157,8 +157,8 @@ EoBInfProcessor::~EoBInfProcessor() {
 	delete[] _flagTable;
 	delete[] _stack;
 	delete[] _scriptData;
-	for (Common::Array<const InfOpcode*>::const_iterator a = _opcodes.begin(); a != _opcodes.end(); ++a) {
-		delete (*a)->proc;
+	for (Common::Array<const InfOpcode *>::const_iterator a = _opcodes.begin(); a != _opcodes.end(); ++a) {
+		delete(*a)->proc;
 		delete *a;
 	}
 	_opcodes.clear();
@@ -190,7 +190,7 @@ void EoBInfProcessor::run(int func, int flags) {
 	_lastScriptFunc = func;
 	_lastScriptFlags = flags;
 
-	int8 *pos = (int8*)(_scriptData + o);
+	int8 *pos = (int8 *)(_scriptData + o);
 
 	do {
 		int8 cmd = *pos++;
@@ -236,12 +236,12 @@ const char *EoBInfProcessor::getString(uint16 index) {
 	int8 *res = _scriptData + READ_LE_UINT16(_scriptData);
 
 	while (index) {
-		if(*res++)
+		if (*res++)
 			continue;
 		index--;
 	}
 
-	return (const char*)res;
+	return (const char *)res;
 }
 
 int EoBInfProcessor::oeob_setWallType(int8 *data) {
@@ -418,9 +418,9 @@ int EoBInfProcessor::oeob_movePartyOrObject(int8 *data) {
 			int i = _vm->countQueuedItems(_vm->_levelBlockProperties[c].drawObjects, -1, (int16)b, 0, 1);
 			while (i) {
 				int p = _vm->_items[i].pos;
-				_vm->getQueuedItem((Item*)&_vm->_levelBlockProperties[c].drawObjects, 0, i);
+				_vm->getQueuedItem((Item *)&_vm->_levelBlockProperties[c].drawObjects, 0, i);
 				if (_vm->_currentLevel == f) {
-					_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[d].drawObjects, d, i, p);
+					_vm->setItemPosition((Item *)&_vm->_levelBlockProperties[d].drawObjects, d, i, p);
 				} else {
 					_vm->_items[i].level = f;
 					_vm->_items[i].block = d;
@@ -494,7 +494,7 @@ int EoBInfProcessor::oeob_moveInventoryItemToBlock(int8 *data) {
 
 	if (i < 27 && itm) {
 		_vm->_characters[c].inventory[slot] = 0;
-		_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[block].drawObjects, block, itm, p);
+		_vm->setItemPosition((Item *)&_vm->_levelBlockProperties[block].drawObjects, block, itm, p);
 	}
 
 	return pos - data;
@@ -506,7 +506,7 @@ int EoBInfProcessor::oeob_printMessage_v1(int8 *data) {
 	int8 *pos = data;
 
 	strcpy(col, colorConfig);
-	const char *str = (const char*) pos;
+	const char *str = (const char *)pos;
 	pos += (strlen(str) + 1);
 
 	col[1] = *pos++;
@@ -1057,7 +1057,7 @@ int EoBInfProcessor::oeob_eval_v2(int8 *data) {
 				a = *pos++;
 				tempString1 = _vm->_itemNames[itm->nameId];
 				tempString1.toUppercase();
-				tempString2 = (const char*)pos;
+				tempString2 = (const char *)pos;
 				tempString2.toUppercase();
 				pos += a;
 				_stack[_stackIndex++] = tempString1.contains(tempString2) ? 1 : 0;
@@ -1067,7 +1067,7 @@ int EoBInfProcessor::oeob_eval_v2(int8 *data) {
 				a = *pos++;
 				tempString1 = _vm->_itemNames[itm->nameUnid];
 				tempString1.toUppercase();
-				tempString2 = (const char*)pos;
+				tempString2 = (const char *)pos;
 				tempString2.toUppercase();
 				pos += a;
 				_stack[_stackIndex++] = tempString1.contains(tempString2) ? 1 : 0;
@@ -1296,8 +1296,8 @@ int EoBInfProcessor::oeob_loadNewLevelOrMonsters(int8 *data) {
 	} else {
 		cmd = *pos++;
 		_vm->releaseMonsterShapes(cmd * 18, 18);
-		_vm->loadMonsterShapes((const char*)pos, cmd * 18, true, index * 18);
-		debugC(5, kDebugLevelScript, "         - loading monster shapes '%s', monster number '%d', encode type '%d'", (const char*)pos, cmd, index);
+		_vm->loadMonsterShapes((const char *)pos, cmd * 18, true, index * 18);
+		debugC(5, kDebugLevelScript, "         - loading monster shapes '%s', monster number '%d', encode type '%d'", (const char *)pos, cmd, index);
 		pos += 13;
 		_vm->gui_restorePlayField();
 		res = pos - data;
@@ -1329,7 +1329,7 @@ int EoBInfProcessor::oeob_createItem_v1(int8 *data) {
 			_vm->setHandItem(itm);
 			debugC(5, kDebugLevelScript, "         - create hand item '%d'", itm);
 		} else if (block != 0xffff) {
-			_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[block & 0x3ff].drawObjects, block, itm, itmPos);
+			_vm->setItemPosition((Item *)&_vm->_levelBlockProperties[block & 0x3ff].drawObjects, block, itm, itmPos);
 			debugC(5, kDebugLevelScript, "         - create item '%d' on block '0x%.04X', position '%d'", itm, block, itmPos);
 		}
 	}
@@ -1365,14 +1365,14 @@ int EoBInfProcessor::oeob_createItem_v2(int8 *data) {
 			_vm->setHandItem(itm);
 			debugC(5, kDebugLevelScript, "         - create hand item '%d' (value '%d', flags '0x%X', icon number '%d')", itm, _vm->_items[itm].value, _vm->_items[itm].flags, _vm->_items[itm].icon);
 		} else {
-			_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[_vm->_currentBlock & 0x3ff].drawObjects, _vm->_currentBlock, itm, _itemPos[_vm->rollDice(1, 2, -1)]);
+			_vm->setItemPosition((Item *)&_vm->_levelBlockProperties[_vm->_currentBlock & 0x3ff].drawObjects, _vm->_currentBlock, itm, _itemPos[_vm->rollDice(1, 2, -1)]);
 			debugC(5, kDebugLevelScript, "         - create item '%d' (value '%d', flags '0x%X', icon number '%d') on current block", itm, _vm->_items[itm].value, _vm->_items[itm].flags, _vm->_items[itm].icon);
 		}
 	} else if (block == 0xfffe) {
-		_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[_vm->_currentBlock & 0x3ff].drawObjects, _vm->_currentBlock, itm, _itemPos[(_vm->_currentDirection << 2) + _vm->rollDice(1, 2, -1)]);
+		_vm->setItemPosition((Item *)&_vm->_levelBlockProperties[_vm->_currentBlock & 0x3ff].drawObjects, _vm->_currentBlock, itm, _itemPos[(_vm->_currentDirection << 2) + _vm->rollDice(1, 2, -1)]);
 		debugC(5, kDebugLevelScript, "         - create item '%d' (value '%d', flags '0x%X', icon number '%d') on current block", itm, _vm->_items[itm].value, _vm->_items[itm].flags, _vm->_items[itm].icon);
 	} else {
-		_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[block & 0x3ff].drawObjects, block, itm, itmPos);
+		_vm->setItemPosition((Item *)&_vm->_levelBlockProperties[block & 0x3ff].drawObjects, block, itm, itmPos);
 		debugC(5, kDebugLevelScript, "         - create item '%d' (value '%d', flags '0x%X', icon number '%d') on block '0x%.04X', position '%d'", itm, _vm->_items[itm].value, _vm->_items[itm].flags, _vm->_items[itm].icon, block, itmPos);
 	}
 
@@ -1509,35 +1509,35 @@ int EoBInfProcessor::oeob_dialogue(int8 *data) {
 	int8 *pos = data;
 
 	switch (*pos++) {
-		case -45:
-			_vm->drawSequenceBitmap((const char*)pos, pos[13], READ_LE_UINT16(pos + 14), READ_LE_UINT16(pos + 16), READ_LE_UINT16(pos + 18));
-			pos += 20;
-			break;
+	case -45:
+		_vm->drawSequenceBitmap((const char *)pos, pos[13], READ_LE_UINT16(pos + 14), READ_LE_UINT16(pos + 16), READ_LE_UINT16(pos + 18));
+		pos += 20;
+		break;
 
-		case -44:
-			_vm->restoreAfterDialogueSequence();
-			break;
+	case -44:
+		_vm->restoreAfterDialogueSequence();
+		break;
 
-		case -43:
-			_vm->initDialogueSequence();
-			break;
+	case -43:
+		_vm->initDialogueSequence();
+		break;
 
-		case -42:
-			_vm->gui_drawDialogueBox();
-			break;
+	case -42:
+		_vm->gui_drawDialogueBox();
+		break;
 
-		case -40:
-			_dlgResult = _vm->runDialogue(READ_LE_UINT16(pos), READ_LE_UINT16(pos + 6) == 0xffff ? 2 : 3, getString(READ_LE_UINT16(pos + 2)), getString(READ_LE_UINT16(pos + 4)), getString(READ_LE_UINT16(pos + 6)));
-			pos += 8;
-			break;
+	case -40:
+		_dlgResult = _vm->runDialogue(READ_LE_UINT16(pos), READ_LE_UINT16(pos + 6) == 0xffff ? 2 : 3, getString(READ_LE_UINT16(pos + 2)), getString(READ_LE_UINT16(pos + 4)), getString(READ_LE_UINT16(pos + 6)));
+		pos += 8;
+		break;
 
-		case -8:
-			_vm->txt()->printDialogueText(READ_LE_UINT16(pos), getString(READ_LE_UINT16(pos + 2)));
-			pos += 4;
-			break;
+	case -8:
+		_vm->txt()->printDialogueText(READ_LE_UINT16(pos), getString(READ_LE_UINT16(pos + 2)));
+		pos += 4;
+		break;
 
-		default:
-			break;
+	default:
+		break;
 	}
 
 	return pos - data;
@@ -1552,52 +1552,52 @@ int EoBInfProcessor::oeob_specialEvent(int8 *data) {
 	int i = 0;
 
 	switch (cmd) {
-		case 0:
-			_vm->drawScene(1);
-			_screen->_curPage = 2;
-			_screen->copyRegion(72, 0, 0, 0, 32, 120, 2, 12, Screen::CR_NO_P_CHECK);
-
-			for (; i < 4; i++) {
-				endTime = _vm->_system->getMillis() + _vm->_tickLength;
-				_vm->drawLightningColumn();
-				_screen->copyRegion(72, 0, 72, 0, 32, 120, 2, 0, Screen::CR_NO_P_CHECK);
-				_screen->updateScreen();
-				_screen->copyRegion(0, 0, 72, 0, 32, 120, 12, 2, Screen::CR_NO_P_CHECK);
-				_vm->delayUntil(endTime);
-			}
+	case 0:
+		_vm->drawScene(1);
+		_screen->_curPage = 2;
+		_screen->copyRegion(72, 0, 0, 0, 32, 120, 2, 12, Screen::CR_NO_P_CHECK);
+
+		for (; i < 4; i++) {
+			endTime = _vm->_system->getMillis() + _vm->_tickLength;
+			_vm->drawLightningColumn();
+			_screen->copyRegion(72, 0, 72, 0, 32, 120, 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->updateScreen();
+			_screen->copyRegion(0, 0, 72, 0, 32, 120, 12, 2, Screen::CR_NO_P_CHECK);
+			_vm->delayUntil(endTime);
+		}
 
-			_screen->_curPage = 0;
-			_vm->_sceneUpdateRequired = true;
-			break;
+		_screen->_curPage = 0;
+		_vm->_sceneUpdateRequired = true;
+		break;
 
-		case 1:
-			_dlgResult = _vm->charSelectDialogue();
-			break;
+	case 1:
+		_dlgResult = _vm->charSelectDialogue();
+		break;
 
-		case 2:
-			_vm->characterLevelGain(_dlgResult);
-			break;
+	case 2:
+		_vm->characterLevelGain(_dlgResult);
+		break;
 
-		case 3:
-			_dlgResult = _vm->resurrectionSelectDialogue();
-			break;
+	case 3:
+		_dlgResult = _vm->resurrectionSelectDialogue();
+		break;
 
-		case 4:
-			if (_vm->prepareForNewPartyMember(33, 5))
-				_vm->initNpc(4);
-			break;
+	case 4:
+		if (_vm->prepareForNewPartyMember(33, 5))
+			_vm->initNpc(4);
+		break;
 
-		case 5:
-			_vm->deletePartyItems(46, 5);
-			_vm->deletePartyItems(46, 6);
-			break;
+	case 5:
+		_vm->deletePartyItems(46, 5);
+		_vm->deletePartyItems(46, 6);
+		break;
 
-		case 6:
-			_vm->loadVcnData(0, 0);
-			break;
+	case 6:
+		_vm->loadVcnData(0, 0);
+		break;
 
-		default:
-			break;
+	default:
+		break;
 	}
 
 	return pos - data;
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index 29386894f3..8fdd8680b1 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -41,49 +41,49 @@ int EoBEngine::mainMenu() {
 
 	while (menuChoice >= 0 && !shouldQuit()) {
 		switch (menuChoice) {
-			case 0:
-				_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
-				_screen->loadEoBBitmap("INTRO", 0, 5, 3, 2);
-				_screen->setScreenPalette(_screen->getPalette(0));
-				_screen->_curPage = 2;
-				of = _screen->setFont(Screen::FID_6_FNT);
-				_screen->printText(gScummVMVersion, 280 - strlen(gScummVMVersion) * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
-				_screen->setFont(of);
-				_screen->fillRect(0, 159, 319, 199, _screen->getPagePixel(2, 0, 0));
-				gui_drawBox(77, 165, 173, 29, 13, 14, 12);
-				gui_drawBox(76, 164, 175, 31, 13, 14, -1);
-				_screen->_curPage = 0;
-				_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
-				_screen->updateScreen();
-				menuChoice = mainMenuLoop();
-				break;
-
-			case 1:
-				// load game in progress
-				//
-				menuChoice = -1;
-				break;
-
-			case 2:
-				// create new party
-				menuChoice = -2;
-				break;
-
-			case 3:
-				// quit
-				menuChoice = -5;
-				break;
-
-			case 4:
-				// intro
-				_sound->loadSoundFile("SOUND");
-				_screen->hideMouse();
-				seq_playOpeningCredits();
-				seq_playIntro();
-				_screen->showMouse();
-				_sound->loadSoundFile("ADLIB");
-				menuChoice = 0;
-				break;
+		case 0:
+			_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
+			_screen->loadEoBBitmap("INTRO", 0, 5, 3, 2);
+			_screen->setScreenPalette(_screen->getPalette(0));
+			_screen->_curPage = 2;
+			of = _screen->setFont(Screen::FID_6_FNT);
+			_screen->printText(gScummVMVersion, 280 - strlen(gScummVMVersion) * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
+			_screen->setFont(of);
+			_screen->fillRect(0, 159, 319, 199, _screen->getPagePixel(2, 0, 0));
+			gui_drawBox(77, 165, 173, 29, 13, 14, 12);
+			gui_drawBox(76, 164, 175, 31, 13, 14, -1);
+			_screen->_curPage = 0;
+			_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->updateScreen();
+			menuChoice = mainMenuLoop();
+			break;
+
+		case 1:
+			// load game in progress
+			//
+			menuChoice = -1;
+			break;
+
+		case 2:
+			// create new party
+			menuChoice = -2;
+			break;
+
+		case 3:
+			// quit
+			menuChoice = -5;
+			break;
+
+		case 4:
+			// intro
+			_sound->loadSoundFile("SOUND");
+			_screen->hideMouse();
+			seq_playOpeningCredits();
+			seq_playIntro();
+			_screen->showMouse();
+			_sound->loadSoundFile("ADLIB");
+			menuChoice = 0;
+			break;
 		}
 	}
 
@@ -478,7 +478,7 @@ void EoBEngine::seq_king() {
 
 	_screen->copyPage(0, 4);
 
-	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag(); ) {
+	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag();) {
 		runloop = false;
 		uint32 end = _system->getMillis() + 2 * _tickLength;
 
@@ -998,7 +998,7 @@ void EoBEngine::boxMorphTransition(int targetDestX, int targetDestY, int targetF
 
 	int w = 1;
 	int h = 1;
-	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag(); ) {
+	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag();) {
 		uint32 end = _system->getMillis() + _tickLength;
 		_screen->copyRegion(targetSrcX << 3, targetSrcY << 3, targetDestX << 3, targetDestY << 3, w << 3, h << 3, 2, 0, Screen::CR_NO_P_CHECK);
 		if (originX1 < targetDestX)
@@ -1066,6 +1066,6 @@ void EoBEngine::whirlTransition() {
 	}
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index e3cc8ebec2..dd49735271 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -174,7 +174,7 @@ void EoBCoreEngine::initMonster(int index, int unit, uint16 block, int pos, int
 }
 
 void EoBCoreEngine::placeMonster(EoBMonsterInPlay *m, uint16 block, int dir) {
-	if (block != 0xffff){
+	if (block != 0xffff) {
 		checkSceneUpdateNeed(m->block);
 		if (_levelBlockProperties[m->block].flags & 7) {
 			_levelBlockProperties[m->block].flags--;
@@ -201,11 +201,11 @@ void EoBCoreEngine::killMonster(EoBMonsterInPlay *m, bool giveExperience) {
 
 	if (m->randItem) {
 		if (rollDice(1, 10, 0) == 1)
-			setItemPosition((Item*)&_levelBlockProperties[m->block & 0x3ff].drawObjects, m->block, duplicateItem(m->randItem), pos);
+			setItemPosition((Item *)&_levelBlockProperties[m->block & 0x3ff].drawObjects, m->block, duplicateItem(m->randItem), pos);
 	}
 
 	if (m->fixedItem)
-		setItemPosition((Item*)&_levelBlockProperties[m->block & 0x3ff].drawObjects, m->block, duplicateItem(m->fixedItem), pos);
+		setItemPosition((Item *)&_levelBlockProperties[m->block & 0x3ff].drawObjects, m->block, duplicateItem(m->fixedItem), pos);
 
 	if (giveExperience)
 		increasePartyExperience(_monsterProps[m->type].experience);
@@ -223,7 +223,7 @@ void EoBCoreEngine::killMonster(EoBMonsterInPlay *m, bool giveExperience) {
 	}
 }
 
-bool EoBCoreEngine::killMonsterExtra(EoBMonsterInPlay*) {
+bool EoBCoreEngine::killMonsterExtra(EoBMonsterInPlay *) {
 	return true;
 }
 
@@ -439,7 +439,7 @@ void EoBCoreEngine::drawBlockItems(int index) {
 
 		o = itm->next;
 		forceLoop = false;
-		if(tile2 != -1)
+		if (tile2 != -1)
 			setLevelShapesDim(index, _shpDmX1, _shpDmX2, 5);
 	}
 }
@@ -481,7 +481,7 @@ void EoBCoreEngine::drawMonsters(int index) {
 	int cDirOffs = _currentDirection << 2;
 
 	EoBMonsterInPlay *drawObj[5];
-	memset(drawObj, 0, 5 * sizeof(EoBMonsterInPlay*));
+	memset(drawObj, 0, 5 * sizeof(EoBMonsterInPlay *));
 
 	for (int i = 0; i < 30; i++) {
 		if (_monsters[i].block != bl)
@@ -599,7 +599,7 @@ void EoBCoreEngine::drawFlyingObjects(int index) {
 		return;
 
 	EoBFlyingObject *drawObj[5];
-	memset(drawObj, 0, 5 * sizeof(EoBFlyingObject*));
+	memset(drawObj, 0, 5 * sizeof(EoBFlyingObject *));
 
 	for (int i = 0; i < 10; i++) {
 		if (!_flyingObjects[i].enable || blockIndex != _flyingObjects[i].curBlock)
@@ -1087,7 +1087,7 @@ void EoBCoreEngine::walkMonster(EoBMonsterInPlay *m, int destBlock) {
 	if (m->flags & 8) {
 		// Interestingly, the fear spell in EOB 1 does not expire.
 		// I don't know whether this is intended or not.
-		if (_flags.gameID == GI_EOB1 ) {
+		if (_flags.gameID == GI_EOB1) {
 			d ^= 4;
 		} else if (m->spellStatusLeft > 0) {
 			if (--m->spellStatusLeft == 0)
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 7bbe9f528f..d51bf4eee3 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -209,11 +209,11 @@ const uint8 EoBCoreEngine::_teleporterShapeDefs[] = {
 
 const uint8 EoBCoreEngine::_wallOfForceShapeDefs[] = {
 	0x00, 0x00, 0x04, 0x08,
-	0x00, 0x08,	0x04, 0x08,
+	0x00, 0x08, 0x04, 0x08,
 	0x04, 0x00, 0x04, 0x08,
 	0x04, 0x08, 0x04, 0x08,
 	0x08, 0x00, 0x05, 0x10,
-	0x0C, 0x00,	0x05, 0x10
+	0x0C, 0x00, 0x05, 0x10
 };
 
 const int16 EoBCoreEngine::_buttonList1[] = {
@@ -222,14 +222,14 @@ const int16 EoBCoreEngine::_buttonList1[] = {
 };
 
 const int16 EoBCoreEngine::_buttonList2[] = {
-	58, 61, 62, 63,	64, 65, 93, 94, 66, 67, 68, 69, 70, 71, 76, 77, 88, 0, 1, 2, 3,
-	90, 91,  4,  5,	6, 7, 8, 9, 10, 11, 12, 78, 79, 13, 14, 15, 16, 80, 81, 17, 18,
-	19, 20, 82, 83,	49, 50, 51, 52, 53, 54, 56, 57, -1
+	58, 61, 62, 63, 64, 65, 93, 94, 66, 67, 68, 69, 70, 71, 76, 77, 88, 0, 1, 2, 3,
+	90, 91,  4,  5, 6, 7, 8, 9, 10, 11, 12, 78, 79, 13, 14, 15, 16, 80, 81, 17, 18,
+	19, 20, 82, 83, 49, 50, 51, 52, 53, 54, 56, 57, -1
 };
 
 const int16 EoBCoreEngine::_buttonList3[] = {
-	58, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,	32, 33, 34, 35, 36, 37, 38, 39,
-	40, 41, 42, 43, 44, 45, 84, 85, 46, 47, 48, 60,	59, 92, 4, 5, 6, 7, 8, 49,  50,
+	58, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+	40, 41, 42, 43, 44, 45, 84, 85, 46, 47, 48, 60, 59, 92, 4, 5, 6, 7, 8, 49,  50,
 	51, 52, 53, 54, 56, 57, -1
 };
 
@@ -238,8 +238,8 @@ const int16 EoBCoreEngine::_buttonList4[] = {
 };
 
 const int16 EoBCoreEngine::_buttonList5[] = {
-	58, 61, 62, 63, 64, 65, 93, 66,	67, 68, 69, 70, 71, 88, 21, 22, 23, 24, 25, 26,
-	27, 28, 29, 30, 31, 32, 33, 34,	35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 84,
+	58, 61, 62, 63, 64, 65, 93, 66, 67, 68, 69, 70, 71, 88, 21, 22, 23, 24, 25, 26,
+	27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 84,
 	85, 46, 47, 48, 60, 59, 92, 4, 5, 6, 7, 8, 49, 50, 51, 52, 53, 54, 56, 57, -1
 };
 
@@ -364,18 +364,18 @@ void EoBCoreEngine::initStaticResource() {
 	_npcPreset = _staticres->loadEoBNpcData(kEoBBaseNpcPresets, temp);
 
 	_teleporterShapeCoords = _staticres->loadRawData(kEoBBaseDscTelptrShpCoords, temp);
-	_portalSeq = (const int8*)_staticres->loadRawData(kEoBBasePortalSeqData, temp);
+	_portalSeq = (const int8 *)_staticres->loadRawData(kEoBBasePortalSeqData, temp);
 	_mnDef = _staticres->loadRawData(kEoBBaseManDef, temp);
 	_mnWord = _staticres->loadStrings(kEoBBaseManWord, _mnNumWord);
 	_mnPrompt = _staticres->loadStrings(kEoBBaseManPrompt, temp);
 
-	_monsterStepTable0 = (int8*) _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterStepTable02 : kEoBBaseMonsterStepTable01, temp);
-	_monsterStepTable1 = (int8*)_staticres->loadRawData(kEoBBaseMonsterStepTable1, temp);
-	_monsterStepTable2 = (int8*)_staticres->loadRawData(kEoBBaseMonsterStepTable2, temp);
-	_monsterStepTable3 = (int8*)_staticres->loadRawData(kEoBBaseMonsterStepTable3, temp);
+	_monsterStepTable0 = (int8 *)_staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterStepTable02 : kEoBBaseMonsterStepTable01, temp);
+	_monsterStepTable1 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable1, temp);
+	_monsterStepTable2 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable2, temp);
+	_monsterStepTable3 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable3, temp);
 	_monsterCloseAttPosTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttPosTable1, temp);
 	_monsterCloseAttPosTable2 = _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterCloseAttPosTable22 : kEoBBaseMonsterCloseAttPosTable21, temp);
-	_monsterCloseAttUnkTable = (int8*)_staticres->loadRawData(kEoBBaseMonsterCloseAttUnkTable, temp);
+	_monsterCloseAttUnkTable = (int8 *)_staticres->loadRawData(kEoBBaseMonsterCloseAttUnkTable, temp);
 	_monsterCloseAttChkTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttChkTable1, temp);
 	_monsterCloseAttChkTable2 = _staticres->loadRawData(kEoBBaseMonsterCloseAttChkTable2, temp);
 	_monsterCloseAttDstTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttDstTable1, temp);
@@ -383,26 +383,26 @@ void EoBCoreEngine::initStaticResource() {
 
 	_monsterProximityTable = _staticres->loadRawData(kEoBBaseMonsterProximityTable, temp);
 	_findBlockMonstersTable = _staticres->loadRawData(kEoBBaseFindBlockMonstersTable, temp);
-	_monsterDirChangeTable = (const int8*)_staticres->loadRawData(kEoBBaseMonsterDirChangeTable, temp);
+	_monsterDirChangeTable = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterDirChangeTable, temp);
 	_monsterSpecAttStrings = _staticres->loadStrings(kEoBBaseMonsterDistAttStrings, temp);
 
-	_monsterFrmOffsTable1 = (const int8*)_staticres->loadRawData(kEoBBaseDscMonsterFrmOffsTbl1, temp);
-	_monsterFrmOffsTable2 = (const int8*)_staticres->loadRawData(kEoBBaseDscMonsterFrmOffsTbl2, temp);
+	_monsterFrmOffsTable1 = (const int8 *)_staticres->loadRawData(kEoBBaseDscMonsterFrmOffsTbl1, temp);
+	_monsterFrmOffsTable2 = (const int8 *)_staticres->loadRawData(kEoBBaseDscMonsterFrmOffsTbl2, temp);
 
 	_inventorySlotsX = _staticres->loadRawDataBe16(kEoBBaseInvSlotX, temp);
 	_inventorySlotsY = _staticres->loadRawData(kEoBBaseInvSlotY, temp);
 	_slotValidationFlags = _staticres->loadRawDataBe16(kEoBBaseSlotValidationFlags, temp);
 
-	_projectileWeaponAmmoTypes = (const int8*)_staticres->loadRawData(kEoBBaseProjectileWeaponTypes, temp);
+	_projectileWeaponAmmoTypes = (const int8 *)_staticres->loadRawData(kEoBBaseProjectileWeaponTypes, temp);
 	_wandTypes = _staticres->loadRawData(kEoBBaseWandTypes, temp);
 
 	_drawObjPosIndex = _staticres->loadRawData(kEoBBaseDrawObjPosIndex, temp);
 	_flightObjFlipIndex = _staticres->loadRawData(kEoBBaseFlightObjFlipIndex, temp);
-	_flightObjShpMap = (const int8*)_staticres->loadRawData(kEoBBaseFlightObjShpMap, temp);
-	_flightObjSclIndex = (const int8*)_staticres->loadRawData(kEoBBaseFlightObjSclIndex, temp);
+	_flightObjShpMap = (const int8 *)_staticres->loadRawData(kEoBBaseFlightObjShpMap, temp);
+	_flightObjSclIndex = (const int8 *)_staticres->loadRawData(kEoBBaseFlightObjSclIndex, temp);
 
 	_wllFlagPreset = _staticres->loadRawData(kEoBBaseWllFlagPreset, _wllFlagPresetSize);
-	_dscShapeCoords = (const int16*)_staticres->loadRawDataBe16(kEoBBaseDscShapeCoords, temp);
+	_dscShapeCoords = (const int16 *)_staticres->loadRawDataBe16(kEoBBaseDscShapeCoords, temp);
 
 	_dscDoorScaleOffs = _staticres->loadRawData(kEoBBaseDscDoorScaleOffs, temp);
 	_dscDoorScaleMult1 = _staticres->loadRawData(kEoBBaseDscDoorScaleMult1, temp);
@@ -411,8 +411,8 @@ void EoBCoreEngine::initStaticResource() {
 	_dscDoorY1 = _staticres->loadRawData(kEoBBaseDscDoorY1, temp);
 	_dscDoorXE = _staticres->loadRawData(kEoBBaseDscDoorXE, temp);
 
-	_dscItemPosIndex= _staticres->loadRawData(kEoBBaseDscItemPosIndex, temp);
-	_dscItemShpX = (const int16*)_staticres->loadRawDataBe16(kEoBBaseDscItemShpX, temp);
+	_dscItemPosIndex = _staticres->loadRawData(kEoBBaseDscItemPosIndex, temp);
+	_dscItemShpX = (const int16 *)_staticres->loadRawDataBe16(kEoBBaseDscItemShpX, temp);
 	_dscItemScaleIndex = _staticres->loadRawData(kEoBBaseDscItemScaleIndex, temp);
 	_dscItemTileIndex = _staticres->loadRawData(kEoBBaseDscItemTileIndex, temp);
 	_dscItemShapeMap = _staticres->loadRawData(kEoBBaseDscItemShapeMap, temp);
@@ -451,10 +451,10 @@ void EoBCoreEngine::initStaticResource() {
 	_magicFlightObjectProperties = _staticres->loadRawData(kEoBBaseMagicFlightProps, temp);
 	_turnUndeadEffect = _staticres->loadRawData(kEoBBaseTurnUndeadEffect, temp);
 	_burningHandsDest = _staticres->loadRawData(kEoBBaseBurningHandsDest, temp);
-	_coneOfColdDest1 = (const int8*)_staticres->loadRawData(kEoBBaseConeOfColdDest1, temp);
-	_coneOfColdDest2 = (const int8*)_staticres->loadRawData(kEoBBaseConeOfColdDest2, temp);
-	_coneOfColdDest3 = (const int8*)_staticres->loadRawData(kEoBBaseConeOfColdDest3, temp);
-	_coneOfColdDest4 = (const int8*)_staticres->loadRawData(kEoBBaseConeOfColdDest4, temp);
+	_coneOfColdDest1 = (const int8 *)_staticres->loadRawData(kEoBBaseConeOfColdDest1, temp);
+	_coneOfColdDest2 = (const int8 *)_staticres->loadRawData(kEoBBaseConeOfColdDest2, temp);
+	_coneOfColdDest3 = (const int8 *)_staticres->loadRawData(kEoBBaseConeOfColdDest3, temp);
+	_coneOfColdDest4 = (const int8 *)_staticres->loadRawData(kEoBBaseConeOfColdDest4, temp);
 	_coneOfColdGfxTbl = _staticres->loadRawData(kEoBBaseConeOfColdGfxTbl, _coneOfColdGfxTblSize);
 
 	// Hard code the following strings, since EOB I doesn't have them in the original.
@@ -462,9 +462,9 @@ void EoBCoreEngine::initStaticResource() {
 	// save slot. Instead of emulating this we provide a menu similiar to EOB II.
 
 	static const char *saveLoadStrings[3][4] = {
-		{	"Cancel",	"Empty Slot",	"Save Game",	"Load Game"		},
-		{	"Abbr.",	"Leerer Slot",	"Speichern",	"  Laden"		},
-		{	0,			0,				0,				0				}
+		{   "Cancel",   "Empty Slot",   "Save Game",    "Load Game"     },
+		{   "Abbr.",    "Leerer Slot",  "Speichern",    "  Laden"       },
+		{   0,          0,              0,              0               }
 	};
 
 	static const char *errorSlotEmptyString[3] = {
@@ -735,84 +735,84 @@ void EoBCoreEngine::initSpells() {
 		1, 546, 0, 1, // 10 mystic defense
 	};
 
-	Common::Array<const uint16*> magicTimingParaAssign;
+	Common::Array<const uint16 *> magicTimingParaAssign;
 	mpn;
 	mpn;
 	mpn;
-	mp(0);	// Detect Magic
-	mpn;	// Magic Missile
+	mp(0);  // Detect Magic
+	mpn;    // Magic Missile
 	mp1n;
-	mp(1);	// Shield
-	mp(2);	// Shocking Grasp
-	mp2(3);	// Blur
-	mp2(1);	// Detect Invis
-	mp2n;	// Imp Identify
-	mpn;	// Invis
+	mp(1);  // Shield
+	mp(2);  // Shocking Grasp
+	mp2(3); // Blur
+	mp2(1); // Detect Invis
+	mp2n;   // Imp Identify
+	mpn;    // Invis
 	mp1n;
-	mpn;	// Melf
-	mp1n;	// Stinking Cloud
-	mpn;	// Dispel Magic
-	mpn;	// Fireball
-	mp1n;	// Flame Arrow
-	mp(3);	// Haste
-	mpn;	// Hold Person
-	mpn;	// Invisibility
-	mpn;	// Lightning Bolt
-	mp(2);	// Vampiric Touch
-	mpn;	// Fear
-	mpn;	// Ice Storm
-	mp1n;	// Stone Skin
-	mp1n;	// Cloud Kill
-	mp2(4);	// Improved Invisibility
-	mp2n;	// remove Curse
-	mpn;	// Cone of Cold
-	mpn;	// Hold Monster
-	mp2n;	// Wall of Force
-	mp2n;	// Disintegrate
-	mp2n;	// Flesh To Stone
-	mp2n;	// Stone To Flesh
-	mp2(2);	// True Seeing
-	mp2n;	// Finger of Death
-	mp2n;	// Power Word Stun
-	mp2n;	// Bigby's Fist
-	mp2n;	// empty
-	mp(5);	// Bless
-	mpn;						// EOB1: cure, EOB2: cause
-	mpn;						// EOB1: cause, EOB2: cure
-	mp(0);	// Detect Magic
-	mp(6);	// Prot from Evil
-	mp(7);	// Aid
-	mp(8);	// Flame Blad
-	mpn;	// Hold Person
-	mp(9);	// Slow Poison
-	mpn;	// Create Food
-	mpn;	// Dispel Magic
-	mp(1);	// Magical Vestment
-	mp(2);	// Prayer
-	mpn;	// Remove Paralysis
-	mpn;						// EOB1: cure, EOB2: cause
-	mpn;						// EOB1: cause, EOB2: cure
-	mpn;	// Neutral Poison
-	mp(6);	// Prot From Evil 10'
-	mp1n;	// Prot From Lightning
-	mpn;						// EOB1: cure, EOB2: cause
-	mpn;						// EOB1: cause, EOB2: cure
-	mpn;	// Flame Strike
-	mpn;	// Raise Dead
-	mp2n;	// Slay Living
-	mp2(2);	// True Seeing
-	mp2n;	// Harm
-	mp2n;	// Heal
-	mp2n;	// Resurrect
-	mpn;	// Lay on Hands
-	mp2n;	// Turn Undead
-	mpn;	// Lightning Bolt (EOB1) / Fireball 1(EOB2) passive
+	mpn;    // Melf
+	mp1n;   // Stinking Cloud
+	mpn;    // Dispel Magic
+	mpn;    // Fireball
+	mp1n;   // Flame Arrow
+	mp(3);  // Haste
+	mpn;    // Hold Person
+	mpn;    // Invisibility
+	mpn;    // Lightning Bolt
+	mp(2);  // Vampiric Touch
+	mpn;    // Fear
+	mpn;    // Ice Storm
+	mp1n;   // Stone Skin
+	mp1n;   // Cloud Kill
+	mp2(4); // Improved Invisibility
+	mp2n;   // remove Curse
+	mpn;    // Cone of Cold
+	mpn;    // Hold Monster
+	mp2n;   // Wall of Force
+	mp2n;   // Disintegrate
+	mp2n;   // Flesh To Stone
+	mp2n;   // Stone To Flesh
+	mp2(2); // True Seeing
+	mp2n;   // Finger of Death
+	mp2n;   // Power Word Stun
+	mp2n;   // Bigby's Fist
+	mp2n;   // empty
+	mp(5);  // Bless
+	mpn;                        // EOB1: cure, EOB2: cause
+	mpn;                        // EOB1: cause, EOB2: cure
+	mp(0);  // Detect Magic
+	mp(6);  // Prot from Evil
+	mp(7);  // Aid
+	mp(8);  // Flame Blad
+	mpn;    // Hold Person
+	mp(9);  // Slow Poison
+	mpn;    // Create Food
+	mpn;    // Dispel Magic
+	mp(1);  // Magical Vestment
+	mp(2);  // Prayer
+	mpn;    // Remove Paralysis
+	mpn;                        // EOB1: cure, EOB2: cause
+	mpn;                        // EOB1: cause, EOB2: cure
+	mpn;    // Neutral Poison
+	mp(6);  // Prot From Evil 10'
+	mp1n;   // Prot From Lightning
+	mpn;                        // EOB1: cure, EOB2: cause
+	mpn;                        // EOB1: cause, EOB2: cure
+	mpn;    // Flame Strike
+	mpn;    // Raise Dead
+	mp2n;   // Slay Living
+	mp2(2); // True Seeing
+	mp2n;   // Harm
+	mp2n;   // Heal
+	mp2n;   // Resurrect
+	mpn;    // Lay on Hands
+	mp2n;   // Turn Undead
+	mpn;    // Lightning Bolt (EOB1) / Fireball 1(EOB2) passive
 	mp2(10);// Mystic Defense
-	mp2n;	// Fireball 2 passive
-	mpn;	// death spell passive
-	mpn;	// disintegrate passive
-	mp2n;	// cause critical passive
-	mp2n;	// flesh to stone passive
+	mp2n;   // Fireball 2 passive
+	mpn;    // death spell passive
+	mpn;    // disintegrate passive
+	mp2n;   // cause critical passive
+	mp2n;   // flesh to stone passive
 
 	Common::Array<SpellStartCallback> startCallback;
 	sc(empty);
@@ -828,7 +828,7 @@ void EoBCoreEngine::initSpells() {
 	sc2(improvedIdentify);
 	sc(empty);
 	sc(melfsAcidArrow);
-	sc1(empty);		// Stinking Cloud
+	sc1(empty);     // Stinking Cloud
 	sc(dispelMagic);
 	sc(fireball);
 	sc1(flameArrow);
@@ -839,7 +839,7 @@ void EoBCoreEngine::initSpells() {
 	sc(vampiricTouch);
 	sc(fear);
 	sc(iceStorm);
-	sc1(stoneSkin);	// stone skin
+	sc1(stoneSkin); // stone skin
 	sc2(empty); // imp invisibility
 	sc1(empty); // Cloudkill
 	sc2(removeCurse);
@@ -854,7 +854,7 @@ void EoBCoreEngine::initSpells() {
 	sc2(powerWordStun);
 	sc2(empty);
 	sc2(empty);
-	sc(empty);	// Bless
+	sc(empty);  // Bless
 	sc2(causeLightWounds);
 	sc(cureLightWounds);
 	sc1(causeLightWounds);
@@ -909,7 +909,7 @@ void EoBCoreEngine::initSpells() {
 	ec2(empty);
 	ec2(empty);
 	ec(melfsAcidArrow);
-	ec1(empty);		// Stinking Cloud
+	ec1(empty);     // Stinking Cloud
 	ec(empty);
 	ec(fireball);
 	ec1(flameArrow);
@@ -920,8 +920,8 @@ void EoBCoreEngine::initSpells() {
 	ec(vampiricTouch);
 	ec(empty);
 	ec(iceStorm);
-	ec(empty);		// EOB1: stone skin, EOB2: imp invisibility
-	ec(empty);		// EOB1: cloud kill, EOB2: remove curse
+	ec(empty);      // EOB1: stone skin, EOB2: imp invisibility
+	ec(empty);      // EOB1: cloud kill, EOB2: remove curse
 	ec(empty);
 	ec(holdMonster);
 	ec2(empty);
@@ -933,7 +933,7 @@ void EoBCoreEngine::initSpells() {
 	ec2(empty);
 	ec2(empty);
 	ec2(empty);
-	ec(empty);	// Bless
+	ec(empty);  // Bless
 	ec(empty);
 	ec(empty);
 	ec(detectMagic);
@@ -951,7 +951,7 @@ void EoBCoreEngine::initSpells() {
 	ec(empty);
 	ec(empty);
 	ec(empty);
-	ec1(empty);	// Prot from Lightning
+	ec1(empty); // Prot from Lightning
 	ec(empty);
 	ec(empty);
 	ec(flameStrike);
@@ -1049,7 +1049,7 @@ void EoBEngine::initStaticResource() {
 	_dscDoorY5 = _staticres->loadRawData(kEoBBaseDscDoorY5, temp);
 	_dscDoorY6 = _staticres->loadRawData(kEoBBaseDscDoorY6, temp);
 	_dscDoorY7 = _staticres->loadRawData(kEoBBaseDscDoorY7, temp);
-	_dscDoorCoordsExt = (const int16*)_staticres->loadRawDataBe16(kEoBBaseDscDoorCoordsExt, temp);
+	_dscDoorCoordsExt = (const int16 *)_staticres->loadRawDataBe16(kEoBBaseDscDoorCoordsExt, temp);
 
 	_enemyMageSpellList = _staticres->loadRawData(kEoB1EnemyMageSpellList, temp);
 	_enemyMageSfx = _staticres->loadRawData(kEoB1EnemyMageSfx, temp);
@@ -1081,7 +1081,7 @@ void EoBEngine::initStaticResource() {
 		p->dmgDc[0].base = (int8)*ps++;
 		p->dmgDc[1].times = *ps++;
 		p->dmgDc[1].pips = *ps++;
-		p->dmgDc[1].base =(int8) *ps++;
+		p->dmgDc[1].base = (int8)*ps++;
 		p->dmgDc[2].times = *ps++;
 		p->dmgDc[2].pips = *ps++;
 		p->dmgDc[2].base = (int8)*ps++;
@@ -1120,59 +1120,59 @@ void EoBEngine::initSpells() {
 	};
 
 	static const FlagTableEntry flagTable[] = {
-		{ 0x0000, 0x000000, 0x00 },	// dummy
-		{ 0x0033, 0x000001, 0x00 },	// armor
-		{ 0x0100, 0x000000, 0x21 },	// burning hands
-		{ 0x004c, 0x000002, 0x00 },	// detect magic
-		{ 0x0100, 0x000000, 0x01 },	// magic missile
-		{ 0x0000, 0x000000, 0x00 },	// dummy
-		{ 0x008b, 0x000008, 0x00 },	// shield
-		{ 0x0488, 0x000000, 0x03 },	// shocking grasp
-		{ 0x0021, 0x000040, 0x00 },	// invisibility
-		{ 0x0000, 0x000000, 0x00 },	// dummy
-		{ 0x0100, 0x000000, 0x11 },	// melf's acid arrow
-		{ 0x0000, 0x000000, 0x00 },	// STINKING CLOUD
-		{ 0x1000, 0x000000, 0x00 },	// dispel magic
-		{ 0x0100, 0x000000, 0x21 },	// fireball
-		{ 0x0100, 0x000000, 0x11 },	// FLAME ARROW
-		{ 0x0248, 0x010000, 0x00 },	// haste
-		{ 0x0100, 0x000000, 0x00 },	// hold person
-		{ 0x0240, 0x000040, 0x00 },	// inv 10'
-		{ 0x0100, 0x000000, 0x03 },	// lightning bolt
-		{ 0x0488, 0x000000, 0x01 },	// vampiric touch
-		{ 0x0100, 0x000000, 0x00 },	// fear
-		{ 0x0100, 0x000000, 0x41 },	// ice storm
-		{ 0x0033, 0x000001, 0x00 },	// STONE SKIN
-		{ 0x0000, 0x000000, 0x00 },	// CLOUD KILL
-		{ 0x0100, 0x000000, 0x41 },	// cone of cold
-		{ 0x0100, 0x000000, 0x00 },	// hold monster
-		{ 0x005c, 0x000400, 0x00 },	// bless
-		{ 0x0020, 0x000000, 0x00 },	// cure light wounds
-		{ 0x0100, 0x000000, 0x01 },	// cause light wounds
-		{ 0x004c, 0x000002, 0x00 },	// detect magic
-		{ 0x0029, 0x000800, 0x00 },	// prot from evil
-		{ 0x0039, 0x000000, 0x00 },	// aid
-		{ 0x2408, 0x000000, 0x21 },	// flame blade
-		{ 0x0100, 0x000000, 0x00 },	// hold person
-		{ 0x0028, 0x002000, 0x00 },	// slow poison
-		{ 0x0040, 0x000000, 0x00 },	// create food
-		{ 0x1000, 0x000000, 0x00 },	// dispel magic
-		{ 0x0099, 0x004000, 0x00 },	// magical vestment
-		{ 0x004c, 0x008000, 0x00 },	// prayer
-		{ 0x0040, 0x000000, 0x00 },	// remove paralysis
-		{ 0x0020, 0x000000, 0x00 },	// cure serious
-		{ 0x0100, 0x000000, 0x01 },	// cause serious
-		{ 0x0020, 0x000000, 0x00 },	// neutralize poison
-		{ 0x0248, 0x000800, 0x00 },	// prot from evil 10'
-		{ 0x0000, 0x000000, 0x00 },	// PROT FROM LIGHTNING
-		{ 0x0020, 0x000000, 0x00 },	// cure critical
-		{ 0x0100, 0x000000, 0x01 },	// cause critical
-		{ 0x0100, 0x000000, 0x21 },	// flame strike
-		{ 0x0020, 0x000000, 0x00 },	// raise dead
-		{ 0x0020, 0x000000, 0x00 },	// lay on hands
-		{ 0x0000, 0x000000, 0x00 },	// obj hit passive
-		{ 0x0000, 0x000000, 0x00 },	// disintegrate passive
-		{ 0x0000, 0x000000, 0x00 }	// death spell passive
+		{ 0x0000, 0x000000, 0x00 }, // dummy
+		{ 0x0033, 0x000001, 0x00 }, // armor
+		{ 0x0100, 0x000000, 0x21 }, // burning hands
+		{ 0x004c, 0x000002, 0x00 }, // detect magic
+		{ 0x0100, 0x000000, 0x01 }, // magic missile
+		{ 0x0000, 0x000000, 0x00 }, // dummy
+		{ 0x008b, 0x000008, 0x00 }, // shield
+		{ 0x0488, 0x000000, 0x03 }, // shocking grasp
+		{ 0x0021, 0x000040, 0x00 }, // invisibility
+		{ 0x0000, 0x000000, 0x00 }, // dummy
+		{ 0x0100, 0x000000, 0x11 }, // melf's acid arrow
+		{ 0x0000, 0x000000, 0x00 }, // STINKING CLOUD
+		{ 0x1000, 0x000000, 0x00 }, // dispel magic
+		{ 0x0100, 0x000000, 0x21 }, // fireball
+		{ 0x0100, 0x000000, 0x11 }, // FLAME ARROW
+		{ 0x0248, 0x010000, 0x00 }, // haste
+		{ 0x0100, 0x000000, 0x00 }, // hold person
+		{ 0x0240, 0x000040, 0x00 }, // inv 10'
+		{ 0x0100, 0x000000, 0x03 }, // lightning bolt
+		{ 0x0488, 0x000000, 0x01 }, // vampiric touch
+		{ 0x0100, 0x000000, 0x00 }, // fear
+		{ 0x0100, 0x000000, 0x41 }, // ice storm
+		{ 0x0033, 0x000001, 0x00 }, // STONE SKIN
+		{ 0x0000, 0x000000, 0x00 }, // CLOUD KILL
+		{ 0x0100, 0x000000, 0x41 }, // cone of cold
+		{ 0x0100, 0x000000, 0x00 }, // hold monster
+		{ 0x005c, 0x000400, 0x00 }, // bless
+		{ 0x0020, 0x000000, 0x00 }, // cure light wounds
+		{ 0x0100, 0x000000, 0x01 }, // cause light wounds
+		{ 0x004c, 0x000002, 0x00 }, // detect magic
+		{ 0x0029, 0x000800, 0x00 }, // prot from evil
+		{ 0x0039, 0x000000, 0x00 }, // aid
+		{ 0x2408, 0x000000, 0x21 }, // flame blade
+		{ 0x0100, 0x000000, 0x00 }, // hold person
+		{ 0x0028, 0x002000, 0x00 }, // slow poison
+		{ 0x0040, 0x000000, 0x00 }, // create food
+		{ 0x1000, 0x000000, 0x00 }, // dispel magic
+		{ 0x0099, 0x004000, 0x00 }, // magical vestment
+		{ 0x004c, 0x008000, 0x00 }, // prayer
+		{ 0x0040, 0x000000, 0x00 }, // remove paralysis
+		{ 0x0020, 0x000000, 0x00 }, // cure serious
+		{ 0x0100, 0x000000, 0x01 }, // cause serious
+		{ 0x0020, 0x000000, 0x00 }, // neutralize poison
+		{ 0x0248, 0x000800, 0x00 }, // prot from evil 10'
+		{ 0x0000, 0x000000, 0x00 }, // PROT FROM LIGHTNING
+		{ 0x0020, 0x000000, 0x00 }, // cure critical
+		{ 0x0100, 0x000000, 0x01 }, // cause critical
+		{ 0x0100, 0x000000, 0x21 }, // flame strike
+		{ 0x0020, 0x000000, 0x00 }, // raise dead
+		{ 0x0020, 0x000000, 0x00 }, // lay on hands
+		{ 0x0000, 0x000000, 0x00 }, // obj hit passive
+		{ 0x0000, 0x000000, 0x00 }, // disintegrate passive
+		{ 0x0000, 0x000000, 0x00 }  // death spell passive
 	};
 
 	int temp;
@@ -1201,7 +1201,7 @@ void DarkMoonEngine::initStaticResource() {
 		_seqIntro[i] = _staticres->loadEoB2SeqData(kEoB2IntroSeqData00 + i, temp);
 
 	_shapesIntro = new const EoBShapeDef*[13];
-	memset(_shapesIntro, 0, sizeof(EoBShapeDef*) * 13);
+	memset(_shapesIntro, 0, sizeof(EoBShapeDef *) * 13);
 	_shapesIntro[0] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes00, temp);
 	_shapesIntro[1] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes01, temp);
 	_shapesIntro[4] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes04, temp);
@@ -1216,7 +1216,7 @@ void DarkMoonEngine::initStaticResource() {
 		_seqFinale[i] = _staticres->loadEoB2SeqData(kEoB2FinaleSeqData00 + i, temp);
 
 	_shapesFinale = new const EoBShapeDef*[13];
-	memset(_shapesFinale, 0, sizeof(EoBShapeDef*) * 13);
+	memset(_shapesFinale, 0, sizeof(EoBShapeDef *) * 13);
 	_shapesFinale[0] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes00, temp);
 	_shapesFinale[3] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes03, temp);
 	_shapesFinale[7] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes07, temp);
@@ -1229,12 +1229,12 @@ void DarkMoonEngine::initStaticResource() {
 	_npcStrings[0] = _staticres->loadStrings(kEoB2Npc1Strings, temp);
 	_npcStrings[1] = _staticres->loadStrings(kEoB2Npc2Strings, temp);
 	_monsterDustStrings = _staticres->loadStrings(kEoB2MonsterDustStrings, temp);
-	_dreamSteps = (const int8*)_staticres->loadRawData(kEoB2DreamSteps, temp);
+	_dreamSteps = (const int8 *)_staticres->loadRawData(kEoB2DreamSteps, temp);
 	_kheldranStrings = _staticres->loadStrings(kEoB2KheldranStrings, temp);
 	_hornStrings = _staticres->loadStrings(kEoB2HornStrings, temp);
 	_hornSounds = _staticres->loadRawData(kEoB2HornSounds, temp);
 
-	_wallOfForceDsX = (const int16*)_staticres->loadRawDataBe16(kEoB2WallOfForceDsX, temp);
+	_wallOfForceDsX = (const int16 *)_staticres->loadRawDataBe16(kEoB2WallOfForceDsX, temp);
 	_wallOfForceDsY = _staticres->loadRawData(kEoB2WallOfForceDsY, temp);
 	_wallOfForceDsNumW = _staticres->loadRawData(kEoB2WallOfForceNumW, temp);
 	_wallOfForceDsNumH = _staticres->loadRawData(kEoB2WallOfForceNumH, temp);
@@ -1250,19 +1250,22 @@ void DarkMoonEngine::initStaticResource() {
 
 	// ScummVM specific
 	static const char *transferStringsScummVM[3][5] = {
-		{	"\r We cannot find any EOB save game\r file. Please make sure that the\r save game file with the party\r you wish to transfer is located\r in your ScummVM save game\r directory. If you have set up\r multiple save directories you\r have to copy the EOB save file\r into your EOB II save directory.\r Do you wish to try again?",
+		{
+			"\r We cannot find any EOB save game\r file. Please make sure that the\r save game file with the party\r you wish to transfer is located\r in your ScummVM save game\r directory. If you have set up\r multiple save directories you\r have to copy the EOB save file\r into your EOB II save directory.\r Do you wish to try again?",
 			"Game ID",
 			"\r It seems that you have already\r defeated Xanathar here. Do you\r wish to transfer the party that\r finished the game? If not, you\r will be able to select a save\r game from the save game\r dialogue.",
 			"Select File",
 			"\r\r   Please wait..."
 		},
-		{	"\r Kein EOB-Spielstand zu finden.\r Bitte Spielstandsdatei mit der\r zu ]bernehmenden Gruppe in das\r ScummVM Spielstands-Verzeichnis\r kopieren. Bei mehreren Spiel-\r stands-Verzeichnissen bitte\r den EOB-Spielstand in das\r EOB II-Spielstands-Verzeichnis\r kopieren. Nochmal versuchen?",
+		{
+			"\r Kein EOB-Spielstand zu finden.\r Bitte Spielstandsdatei mit der\r zu ]bernehmenden Gruppe in das\r ScummVM Spielstands-Verzeichnis\r kopieren. Bei mehreren Spiel-\r stands-Verzeichnissen bitte\r den EOB-Spielstand in das\r EOB II-Spielstands-Verzeichnis\r kopieren. Nochmal versuchen?",
 			"Game ID",
 			"\r Wie es scheint, wurde Xanathar\r hier bereits besiegt. Soll die\r Gruppe, mit der das Spiel be-\r endet wurde, ]bernommen werden?\r Falls nicht, kann ein Spielstand\r aus der Spielstandsliste gew[hlt\r werden.",
 			"Spiel W[hlen",
 			"\r\r  Bitte warten..."
 		},
-		{	0, 0, 0, 0
+		{
+			0, 0, 0, 0
 		}
 	};
 
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 9cc08b9a78..8ad28c2ec4 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -355,6 +355,6 @@ void EoBCoreEngine::timerUpdateMonsterIdleAnim(int timerNum) {
 	}
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
-- 
cgit v1.2.3


From 107805c34309401ac1367b8739a358dd2aaabf55 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 27 Dec 2011 03:10:53 +0200
Subject: DREAMWEB: Remove almost all of the ASM runtime

---
 engines/dreamweb/runtime.h | 374 +--------------------------------------------
 1 file changed, 1 insertion(+), 373 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/runtime.h b/engines/dreamweb/runtime.h
index 9b70d164a6..0bbef5028e 100644
--- a/engines/dreamweb/runtime.h
+++ b/engines/dreamweb/runtime.h
@@ -32,387 +32,15 @@
 
 namespace DreamGen {
 
-struct Register {
-	union {
-		uint16 _value;
-		uint8 _part[2];
-	};
-	inline Register(): _value() {}
-	inline Register& operator=(uint16 v) { _value = v; return *this; }
-	inline operator uint16&() { return _value; }
-};
-
-template<int kIndex> //from low to high
-struct RegisterPart {
-	uint8			&_value;
-
-	explicit inline RegisterPart(Register &reg) : _value(reg._part[kIndex]) {}
-
-	inline operator uint8&() {
-		return _value;
-	}
-
-	inline RegisterPart& operator=(const RegisterPart& o) {
-		_value = o._value;
-		return *this;
-	}
-
-	inline RegisterPart& operator=(uint8 v) {
-		_value = v;
-		return *this;
-	}
-};
-
-#ifdef SCUMM_LITTLE_ENDIAN
-	typedef RegisterPart<0> LowPartOfRegister;
-	typedef RegisterPart<1> HighPartOfRegister;
-#else
-	typedef RegisterPart<1> LowPartOfRegister;
-	typedef RegisterPart<0> HighPartOfRegister;
-#endif
-
-struct Flags {
-	bool _z, _c, _s, _o;
-	inline Flags(): _z(true), _c(false), _s(false), _o(false) {}
-
-	inline bool z() const	{ return _z; }
-	inline bool c() const	{ return _c; }
-	inline bool s() const	{ return _s; }
-
-	inline bool l() const	{ return _o != _s; }
-	inline bool le() const	{ return _o != _s|| _z; }
-
-	inline void update_zs(uint8 v) {
-		_s = v & 0x80;
-		_z = v == 0;
-	}
-
-	inline void update_zs(uint16 v) {
-		_s = v & 0x8000;
-		_z = v == 0;
-	}
-
-	inline void update_o(uint8 v, uint8 a, uint8 b) {
-		uint8 s1 = a & 0x80, s2 = b & 0x80;
-		_o = (s1 == s2) && (v & 0x80) != s1;
-	}
-
-	inline void update_o(uint16 v, uint16 a, uint16 b) {
-		uint16 s1 = a & 0x8000, s2 = b & 0x8000;
-		_o = (s1 == s2) && (v & 0x8000) != s1;
-	}
-};
-
 class Context {
 public:
-	Register ax, dx, bx, cx, si, di;
-	LowPartOfRegister	al;
-	HighPartOfRegister	ah;
-	LowPartOfRegister	bl;
-	HighPartOfRegister	bh;
-	LowPartOfRegister	cl;
-	HighPartOfRegister	ch;
-	LowPartOfRegister	dl;
-	HighPartOfRegister	dh;
-
-	SegmentRef cs;
 	MutableSegmentRef ds;
-	MutableSegmentRef es;
-	Flags flags;
-
-	Context(SegmentManager *segMan): al(ax), ah(ax), bl(bx), bh(bx), cl(cx), ch(cx), dl(dx), dh(dx),
-		cs(segMan->data),
-		ds(segMan, segMan->data),
-		es(segMan, segMan->data) {
-
-	}
-
-	inline void _cmp(uint8 a, uint8 b) {
-		_sub(a, b);
-	}
-
-	inline void _cmp(uint16 a, uint16 b) {
-		_sub(a, b);
-	}
-
-	inline void _test(uint8 a, uint8 b) {
-		_and(a, b);
-	}
-
-	inline void _test(uint16 a, uint16 b) {
-		_and(a, b);
-	}
-
-	inline void _add(uint8 &dst, uint8 src) {
-		unsigned r = (unsigned)dst + src;
-		flags.update_o((uint8)r, dst, src);
-		flags._c = r >= 0x100;
-		dst = r;
-		flags.update_zs(dst);
-	}
-
-	inline void _add(uint16 &dst, uint16 src) {
-		unsigned r = (unsigned)dst + src;
-		flags.update_o((uint16)r, dst, src);
-		flags._c = r >= 0x10000;
-		dst = r;
-		flags.update_zs(dst);
-	}
-
-	inline void _sub(uint8 &dst, uint8 src) {
-		flags.update_o(uint8(dst - src), dst, (uint8)-src);
-		flags._c = dst < src;
-		dst -= src;
-		flags.update_zs(dst);
-	}
-
-	inline void _sub(uint16 &dst, uint16 src) {
-		flags.update_o(uint16(dst - src), dst, (uint16)-src);
-		flags._c = dst < src;
-		dst -= src;
-		flags.update_zs(dst);
-	}
-
-	inline void _inc(uint8 &dst) {
-		flags.update_o((uint8)(dst + 1), dst, 1);
-		++dst;
-		flags.update_zs(dst);
-	}
-
-	inline void _inc(uint16 &dst) {
-		flags.update_o((uint16)(dst + 1), dst, 1);
-		++dst;
-		flags.update_zs(dst);
-	}
 
-	inline void _dec(uint8 &dst) {
-		flags.update_o(uint8(dst - 1), dst, 1);
-		--dst;
-		flags.update_zs(dst);
-	}
-
-	inline void _dec(uint16 &dst) {
-		flags.update_o(uint16(dst - 1), dst, 1);
-		--dst;
-		flags.update_zs(dst);
-	}
-
-	inline void _and(uint8 &dst, uint8 src) {
-		dst &= src;
-		flags.update_zs(dst);
-		flags._c = flags._o = false;
-	}
-
-	inline void _and(uint16 &dst, uint16 src) {
-		dst &= src;
-		flags.update_zs(dst);
-		flags._c = flags._o = false;
-	}
+	Context(SegmentManager *segMan): ds(segMan, segMan->data) {
 
-	inline void _or(uint8 &dst, uint8 src) {
-		dst |= src;
-		flags.update_zs(dst);
-		flags._c = flags._o = false;
-	}
-
-	inline void _or(uint16 &dst, uint16 src) {
-		dst |= src;
-		flags.update_zs(dst);
-		flags._c = flags._o = false;
-	}
-
-	inline void _xor(uint8 &dst, uint8 src) {
-		dst ^= src;
-		flags.update_zs(dst);
-		flags._c = flags._o = false;
-	}
-
-	inline void _xor(uint16 &dst, uint16 src) {
-		dst ^= src;
-		flags.update_zs(dst);
-		flags._c = flags._o = false;
-	}
-
-	inline void _shr(uint8 &dst, uint8 src) {
-		src &= 0x1f;
-		if (src > 0) {
-			dst >>= (src - 1);
-			flags._c = dst & 1;
-			dst >>= 1;
-			flags.update_zs(dst);
-		}
-		if (src == 1)
-			flags._o = dst & 0x80;
-	}
-
-	inline void _shr(uint16 &dst, uint8 src) {
-		src &= 0x1f;
-		if (src > 0) {
-			dst >>= (src - 1);
-			flags._c = dst & 1;
-			dst >>= 1;
-			flags.update_zs(dst);
-		}
-		if (src == 1)
-			flags._o = dst & 0x8000;
-	}
-
-	inline void _shl(uint8 &dst, uint8 src) {
-		src &= 0x1f;
-		if (src > 0) {
-			dst <<= (src - 1);
-			flags._c = dst & 0x80;
-			dst <<= 1;
-			flags.update_zs(dst);
-		}
-		if (src == 1)
-			flags._o = ((dst & 0x80) != 0) == flags._c;
-	}
-	inline void _shl(uint16 &dst, uint8 src) {
-		src &= 0x1f;
-		if (src > 0) {
-			dst <<= (src - 1);
-			flags._c = dst & 0x8000;
-			dst <<= 1;
-			flags.update_zs(dst);
-		}
-		if (src == 1)
-			flags._o = ((dst & 0x8000) != 0) == flags._c;
-	}
-
-	inline void _mul(uint8 src) {
-		unsigned r = unsigned(al) * src;
-		ax = (uint16)r;
-		flags._c = r >= 0x10000;
-		flags._z = r == 0;
-		flags._s = r & 0x8000;
-		flags._o = ah != 0;
-	}
-
-	inline void _mul(uint16 src) {
-		unsigned r = unsigned(ax) * src; //assuming here that we have at least 32 bits
-		dx = (r >> 16) & 0xffff;
-		ax = r & 0xffff;
-		flags._c = false;
-		flags._z = r == 0;
-		flags._s = r & 0x80000000;
-		flags._o = dx != 0;
-	}
-
-	inline void _neg(uint8 &src) {
-		uint8 r = 0;
-		_sub(r, src);
-		src = r;
-	}
-
-	inline void _neg(uint16 &src) {
-		uint16 r = 0;
-		_sub(r, src);
-		src = r;
-	}
-
-	inline void _lodsb() {
-		al = ds.byte(si++);
-	}
-
-	inline void _lodsw() {
-		ax = ds.word(si);
-		si += 2;
-	}
-
-	inline void _movsb() {
-		es.byte(di++) = ds.byte(si++);
-	}
-
-	inline void _movsb(uint size, bool clear_cx = false) {
-		assert(size != 0xffff);
-		//fixme: add overlap and segment boundary check and rewrite
-		while (size--)
-			_movsb();
-		if (clear_cx)
-			cx = 0;
-	}
-
-	inline void _movsw() {
-		_movsb();
-		_movsb();
-	}
-
-	inline void _movsw(uint size, bool clear_cx = false) {
-		assert(size != 0xffff);
-		_movsb(size * 2, clear_cx);
-	}
-
-	inline void _stosb() {
-		es.byte(di++) = al;
-	}
-
-	inline void _stosb(uint size, bool clear_cx = false) {
-		assert(size != 0xffff);
-		uint8 *dst = es.ptr(di, size);
-		memset(dst, al, size);
-		di += size;
-		if (clear_cx)
-			cx = 0;
-	}
-
-	inline void _stosw() {
-		es.byte(di++) = al;
-		es.byte(di++) = ah;
-	}
-
-	inline void _stosw(uint size, bool clear_cx = false) {
-		assert(size != 0xffff);
-		uint8 *dst = es.ptr(di, size * 2);
-		di += 2 * size;
-		while (size--) {
-			*dst++ = al;
-			*dst++ = ah;
-		}
-		if (clear_cx)
-			cx = 0;
-	}
-
-	inline void _xchg(uint16 &a, uint16 &b) {
-		uint16 x = a;
-		a = b;
-		b = x;
-	}
-
-	inline void _xchg(uint8 &a, uint8 &b) {
-		uint8 t = a;
-		a = b;
-		b = t;
-	}
-
-	Common::Array<uint16> stack;
-	inline void push(uint16 v) {
-		stack.push_back(v);
-	}
-
-	inline uint16 pop() {
-		assert(!stack.empty());
-		uint16 v = stack.back();
-		stack.pop_back();
-		return v;
 	}
 };
 
-class StackChecker {
-	const Context	&_context;
-	const uint		_stackDepth;
-
-public:
-	StackChecker(const Context &context): _context(context), _stackDepth(context.stack.size()) {}
-	~StackChecker() { assert(_context.stack.size() == _stackDepth); }
-};
-
-#ifndef NDEBUG
-#	define STACK_CHECK  StackChecker checker(*this)
-#else
-#	define STACK_CHECK  do {} while (0)
-#endif
-
 } // End of namespace DreamGen
 
 #endif
-- 
cgit v1.2.3


From 1a5026570af441dd4e9e95ba507a9f6b3e0bebbf Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 27 Dec 2011 02:13:20 +0100
Subject: KYRA: Slight cleanup.

---
 engines/kyra/script_eob.cpp | 6 +++---
 engines/kyra/script_eob.h   | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index e5f26be210..ffdb717484 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -157,10 +157,10 @@ EoBInfProcessor::~EoBInfProcessor() {
 	delete[] _flagTable;
 	delete[] _stack;
 	delete[] _scriptData;
-	for (Common::Array<const InfOpcode *>::const_iterator a = _opcodes.begin(); a != _opcodes.end(); ++a) {
-		delete(*a)->proc;
+
+	for (Common::Array<const InfOpcode *>::const_iterator a = _opcodes.begin(); a != _opcodes.end(); ++a)
 		delete *a;
-	}
+
 	_opcodes.clear();
 }
 
diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h
index 3804db07c6..66323d6846 100644
--- a/engines/kyra/script_eob.h
+++ b/engines/kyra/script_eob.h
@@ -91,8 +91,10 @@ private:
 	Screen_EoB *_screen;
 
 	typedef Common::Functor1Mem<int8*, int, EoBInfProcessor> InfProc;
-	struct InfOpcode {
+	struct InfOpcode : private Common::NonCopyable {
 		InfOpcode(InfProc *p, const char *d) : proc(p), desc(d) {}
+		~InfOpcode() { delete proc; }
+
 		InfProc *proc;
 		Common::String desc;
 	};
-- 
cgit v1.2.3


From c96e5de291ed686ea49ba312113d2fc0d343302d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 27 Dec 2011 02:23:49 +0100
Subject: KYRA: Some formatting fixes.

---
 engines/kyra/animator_v2.cpp |   4 +-
 engines/kyra/chargen.cpp     |  52 ++++++++++-------
 engines/kyra/eobcommon.cpp   | 136 +++++++++++++++++++++++++------------------
 engines/kyra/gui.cpp         |  14 ++---
 engines/kyra/gui_v2.cpp      |  10 ++--
 engines/kyra/kyra_v2.cpp     |   6 +-
 engines/kyra/saveload.cpp    |  16 ++---
 engines/kyra/scene_v2.cpp    |  40 ++++++-------
 engines/kyra/screen_v2.cpp   |  14 ++---
 engines/kyra/script_v2.cpp   |  22 +++----
 10 files changed, 173 insertions(+), 141 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/animator_v2.cpp b/engines/kyra/animator_v2.cpp
index 334356e261..f7ae6749cf 100644
--- a/engines/kyra/animator_v2.cpp
+++ b/engines/kyra/animator_v2.cpp
@@ -26,10 +26,10 @@
 namespace Kyra {
 
 void KyraEngine_v2::allocAnimObjects(int actors, int anims, int items) {
-	_animObjects = new AnimObj[actors+anims+items];
+	_animObjects = new AnimObj[actors + anims + items];
 	assert(_animObjects);
 
-	memset(_animObjects, 0, sizeof(AnimObj)*(actors+anims+items));
+	memset(_animObjects, 0, sizeof(AnimObj) * (actors + anims + items));
 
 	_animActor = _animObjects;
 	_animAnims = _animObjects + actors;
diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index e0f1ac37d9..e4b89c9a99 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -169,7 +169,7 @@ bool CharacterGenerator::start(EoBCharacter *characters, uint8 ***faceShapes) {
 	_vm->sound()->playTrack(_vm->game() == GI_EOB1 ? 20 : 13);
 	_activeBox = 0;
 
-	for (bool loop = true; loop && (!_vm->shouldQuit()); ) {
+	for (bool loop = true; loop && (!_vm->shouldQuit());) {
 		_vm->_gui->updateBoxFrameHighLight(_activeBox + 6);
 		int inputFlag = getInput(_vm->_activeButtons);
 		_vm->removeInputTop();
@@ -260,7 +260,7 @@ void CharacterGenerator::init() {
 
 	for (int i = 0; i < 17; i++) {
 		const CreatePartyModButton *c = &_chargenModButtons[i];
-		_chargenButtonLabels[i] = c->labelW? _screen->encodeShape(c->encodeLabelX, c->encodeLabelY, c->labelW, c->labelH, true) : 0;
+		_chargenButtonLabels[i] = c->labelW ? _screen->encodeShape(c->encodeLabelX, c->encodeLabelY, c->labelW, c->labelH, true) : 0;
 	}
 
 	_screen->copyPage(3, 2);
@@ -380,7 +380,7 @@ int CharacterGenerator::viewDeleteCharacter() {
 	printStats(_activeBox, 2);
 
 	int res = 0;
-	for (bool loop = true; loop && _characters[_activeBox].name[0] && !_vm->shouldQuit(); ) {
+	for (bool loop = true; loop && _characters[_activeBox].name[0] && !_vm->shouldQuit();) {
 		_vm->_gui->updateBoxFrameHighLight(_activeBox + 6);
 		int inputFlag = getInput(_vm->_activeButtons);
 		int cbx = _activeBox;
@@ -467,7 +467,7 @@ void CharacterGenerator::createPartyMember() {
 		generateStats(_activeBox);
 		statsAndFacesMenu();
 
-		for (_characters[_activeBox].name[0] = 0; _characters[_activeBox].name[0] == 0 && !_vm->shouldQuit(); ) {
+		for (_characters[_activeBox].name[0] = 0; _characters[_activeBox].name[0] == 0 && !_vm->shouldQuit();) {
 			processFaceMenuSelection(_chargenMinStats[6]);
 			printStats(_activeBox, 0);
 			_screen->printShadedText(_chargenStrings2[11], 149, 100, 9, 0);
@@ -594,10 +594,10 @@ int CharacterGenerator::getInput(Button *buttonList) {
 	if (_vm->game() == GI_EOB1 && _vm->sound()->checkTrigger()) {
 		_vm->sound()->resetTrigger();
 		_vm->sound()->playTrack(20);
-	// WORKAROUND for EOB II: The original implements the same sound trigger check as in EOB I.
-	// However, Westwood seems to have forgotten to set the trigger at the end of the AdLib song,
-	// so that the music will not loop. We simply check whether the sound driver is still playing.
 	} else if (_vm->game() == GI_EOB2 && !_vm->sound()->isPlaying()) {
+		// WORKAROUND for EOB II: The original implements the same sound trigger check as in EOB I.
+		// However, Westwood seems to have forgotten to set the trigger at the end of the AdLib song,
+		// so that the music will not loop. We simply check whether the sound driver is still playing.
 		_vm->delay(3 * _vm->_tickLength);
 		_vm->sound()->playTrack(13);
 	}
@@ -678,7 +678,7 @@ void CharacterGenerator::modifyMenu() {
 	EoBCharacter *c = &_characters[_activeBox];
 	int8 hpLO = c->hitPointsCur;
 
-	for (int i = 0; i >= 0 && i < 7; ) {
+	for (int i = 0; i >= 0 && i < 7;) {
 		switch (i) {
 		case 0:
 			i = modifyStat(i, &c->strengthCur, &c->strengthExtCur);
@@ -959,8 +959,8 @@ int CharacterGenerator::rollDice() {
 }
 
 int CharacterGenerator::modifyStat(int index, int8 *stat1, int8 *stat2) {
-	uint8 *s1 = (uint8*) stat1;
-	uint8 *s2 = (uint8*) stat2;
+	uint8 *s1 = (uint8 *)stat1;
+	uint8 *s2 = (uint8 *)stat2;
 
 	initButtonsFromList(31, 10);
 	Button *b = _vm->gui_getButton(_vm->_activeButtons, index + 1);
@@ -984,10 +984,10 @@ int CharacterGenerator::modifyStat(int index, int8 *stat1, int8 *stat2) {
 		_chargenMinStats[6] = getMinHp(c->cClass, c->constitutionCur, c->level[0], c->level[1], c->level[2]);
 	}
 
-	for (bool loop = true; loop && !_vm->shouldQuit(); ) {
+	for (bool loop = true; loop && !_vm->shouldQuit();) {
 		uint8 v1 = *s1;
 		updateMagicShapes();
-		int	inputFlag = getInput(_vm->_activeButtons);
+		int inputFlag = getInput(_vm->_activeButtons);
 		_vm->removeInputTop();
 
 		if (inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_MINUS] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP_MINUS] || inputFlag == 0x8009) {
@@ -1139,9 +1139,19 @@ void CharacterGenerator::finish() {
 	_screen->updateScreen();
 
 	if (_vm->game() == GI_EOB1) {
-		static const int8 classDefaultItemsList[] = { 1, 17, 2, 17, 46, -1, 4, -1, 5, -1, 6, 2, 7, -1, 8, -1, 9, 21, 10, 2, 31, 2 };
-		static const int8 classDefaultItemsListIndex[] = { 4, 8, 0, -1, 4, 3, 0, -1, 4, 10, 0, 8, 3, 6, 1, -1, 2, 7, 0, -1,
-			4, 5, 0, -1, 4, 7, 0, 8, 4, 5, 0, 8, 4, 6, 8, 8, 4, 6, 5, 8, 3, 6, 5, -1, 2, 7, 5, 0, 4, 6, 7, 0, 4, 3, 7, 0, 2, 6, 7, 1 };
+		static const int8 classDefaultItemsList[] = {
+			 1, 17,  2, 17, 46, -1,  4, -1,  5, -1,  6,
+			 2,  7, -1,  8, -1,  9, 21, 10,  2, 31,  2
+		};
+
+		static const int8 classDefaultItemsListIndex[] = {
+			 4,  8,  0, -1,  4,  3,  0, -1,  4, 10,
+			 0,  8,  3,  6,  1, -1,  2,  7,  0, -1,
+			 4,  5,  0, -1,  4,  7,  0,  8,  4,  5,
+			 0,  8,  4,  6,  8,  8,  4,  6,  5,  8,
+			 3,  6,  5, -1,  2,  7,  5,  0,  4,  6,
+			 7,  0,  4,  3,  7,  0,  2,  6,  7,  1
+		};
 
 		_characters[0].inventory[2] = _vm->duplicateItem(35);
 
@@ -1416,13 +1426,13 @@ const int32 CharacterGenerator::_classMenuMasks[] = {
 };
 
 const int32 CharacterGenerator::_alignmentMenuMasks[] = {
-	0x01FF, 0x0007, 0x0001, 0x01FF,	0x01FF, 0x01FE, 0x01FF, 0x01FE,
-	0x01FF, 0x01FE, 0x01FE, 0x01FE, 0x01FF,	0x0007,	0x01FF
+	0x01FF, 0x0007, 0x0001, 0x01FF, 0x01FF, 0x01FE, 0x01FF, 0x01FE,
+	0x01FF, 0x01FE, 0x01FE, 0x01FE, 0x01FF, 0x0007, 0x01FF
 };
 
 const int16 CharacterGenerator::_raceModifiers[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0,	1, -1, 0, 1, -1, 0, 0, 0, -1, 0, 0, 1, 0, 0
+	0, 0, 0, 0, 1, -1, 0, 1, -1, 0, 0, 0, -1, 0, 0, 1, 0, 0
 };
 
 // Transfer Party
@@ -1627,7 +1637,7 @@ int TransferPartyWiz::selectCharactersMenu() {
 	int highlight = 0;
 	bool update = false;
 
-	for (bool loop = true; loop && (!_vm->shouldQuit()); ) {
+	for (bool loop = true; loop && (!_vm->shouldQuit());) {
 		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
 		_vm->removeInputTop();
 
@@ -1843,7 +1853,7 @@ Item TransferPartyWiz::convertItem(Item eob1Item) {
 	itm2->type = itm1->type;
 	itm2->level = 0xff;
 
-	switch(itm2->type) {
+	switch (itm2->type) {
 	case 35:
 		itm1->value += 25;
 		// fall through
@@ -1960,6 +1970,6 @@ bool EoBCoreEngine::startPartyTransfer() {
 	return TransferPartyWiz(this, _screen).start();
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index f3e644b89d..8e14b895a0 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -36,9 +36,12 @@
 
 namespace Kyra {
 
-EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags) : KyraRpgEngine(system, flags), _numLargeItemShapes(flags.gameID == GI_EOB1 ? 14 : 11),
-	_numSmallItemShapes(flags.gameID == GI_EOB1 ? 23 : 26), _numThrownItemShapes(flags.gameID == GI_EOB1 ? 12 : 9), _numItemIconShapes(flags.gameID == GI_EOB1 ? 89 : 112),
-	_teleporterWallId(flags.gameID == GI_EOB1 ? 52 : 44) {
+EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags)
+	: KyraRpgEngine(system, flags), _numLargeItemShapes(flags.gameID == GI_EOB1 ? 14 : 11),
+	  _numSmallItemShapes(flags.gameID == GI_EOB1 ? 23 : 26),
+	  _numThrownItemShapes(flags.gameID == GI_EOB1 ? 12 : 9),
+	  _numItemIconShapes(flags.gameID == GI_EOB1 ? 89 : 112),
+	  _teleporterWallId(flags.gameID == GI_EOB1 ? 52 : 44) {
 	_screen = 0;
 	_gui = 0;
 	_debugger = 0;
@@ -52,10 +55,10 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags) : KyraRpgE
 	_flashShapeTimer = 0;
 	_drawSceneTimer = 0;
 
-	_largeItemShapes = _smallItemShapes = _thrownItemShapes = _spellShapes = _firebeamShapes = _itemIconShapes =
-		_wallOfForceShapes = _teleporterShapes = _sparkShapes = _compassShapes = 0;
-	_redSplatShape = _greenSplatShape = _deadCharShape = _disabledCharGrid = _blackBoxSmallGrid =
-		_weaponSlotGrid = _blackBoxWideGrid = _lightningColumnShape = 0;
+	_largeItemShapes = _smallItemShapes = _thrownItemShapes = _spellShapes = _firebeamShapes = 0;
+	_itemIconShapes = _wallOfForceShapes = _teleporterShapes = _sparkShapes = _compassShapes = 0;
+	_redSplatShape = _greenSplatShape = _deadCharShape = _disabledCharGrid = 0;
+	_blackBoxSmallGrid = _weaponSlotGrid = _blackBoxWideGrid = _lightningColumnShape = 0;
 	_tempIconShape = 0;
 
 	_monsterDustStrings = 0;
@@ -149,42 +152,62 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags) : KyraRpgE
 	_wallsOfForce = 0;
 
 	_rrCount = 0;
-	memset(_rrNames, 0, 10 * sizeof(const char*));
+	memset(_rrNames, 0, 10 * sizeof(const char *));
 	memset(_rrId, 0, 10 * sizeof(int8));
 
-	_mainMenuStrings = _levelGainStrings = _monsterSpecAttStrings = _characterGuiStringsHp = _characterGuiStringsWp = _characterGuiStringsWr = _characterGuiStringsSt =
-		_characterGuiStringsIn = _characterStatusStrings7 = _characterStatusStrings8 = _characterStatusStrings9 = _characterStatusStrings12 = _characterStatusStrings13 = 0;
-	_classModifierFlags = _saveThrowLevelIndex = _saveThrowModDiv = _saveThrowModExt = _wandTypes = _drawObjPosIndex = _flightObjFlipIndex = _expObjectTblIndex =
-		_expObjectShpStart = _expObjectTlMode = _expObjectAnimTbl1 = _expObjectAnimTbl2 = _expObjectAnimTbl3 = 0;
-	_monsterStepTable0 = _monsterStepTable1 = _monsterStepTable2 = _monsterStepTable3 = _projectileWeaponAmmoTypes = _flightObjShpMap = _flightObjSclIndex = 0;
-	_monsterCloseAttPosTable1 = _monsterCloseAttPosTable2 = _monsterCloseAttChkTable1 = _monsterCloseAttChkTable2 = _monsterCloseAttDstTable1 = _monsterCloseAttDstTable2 = 0;
-	_monsterProximityTable = _findBlockMonstersTable = _wallOfForceDsY = _wallOfForceDsNumW = _wallOfForceDsNumH = _wallOfForceShpId = _wllFlagPreset = _teleporterShapeCoords = 0;
-		_monsterCloseAttUnkTable = _monsterFrmOffsTable1 = _monsterFrmOffsTable2 = _monsterDirChangeTable = _portalSeq = 0;
+	_mainMenuStrings = _levelGainStrings = _monsterSpecAttStrings = _characterGuiStringsHp = 0;
+	_characterGuiStringsWp = _characterGuiStringsWr = _characterGuiStringsSt = 0;
+	_characterGuiStringsIn = _characterStatusStrings7 = _characterStatusStrings8 = 0;
+	_characterStatusStrings9 = _characterStatusStrings12 = _characterStatusStrings13 = 0;
+	_classModifierFlags = _saveThrowLevelIndex = _saveThrowModDiv = _saveThrowModExt = 0;
+	_wandTypes = _drawObjPosIndex = _flightObjFlipIndex = _expObjectTblIndex = 0;
+	_expObjectShpStart = _expObjectTlMode = _expObjectAnimTbl1 = _expObjectAnimTbl2 = _expObjectAnimTbl3 = 0;
+	_monsterStepTable0 = _monsterStepTable1 = _monsterStepTable2 = _monsterStepTable3 = 0;
+	_projectileWeaponAmmoTypes = _flightObjShpMap = _flightObjSclIndex = 0;
+	_monsterCloseAttPosTable1 = _monsterCloseAttPosTable2 = _monsterCloseAttChkTable1 = 0;
+	_monsterCloseAttChkTable2 = _monsterCloseAttDstTable1 = _monsterCloseAttDstTable2 = 0;
+	_monsterProximityTable = _findBlockMonstersTable = _wallOfForceDsY = _wallOfForceDsNumW = 0;
+	_wallOfForceDsNumH = _wallOfForceShpId = _wllFlagPreset = _teleporterShapeCoords = 0;
+	_monsterCloseAttUnkTable = _monsterFrmOffsTable1 = _monsterFrmOffsTable2 = 0;
+	_monsterDirChangeTable = _portalSeq = 0;
 	_wallOfForceDsX = 0;
-	_expObjectAnimTbl1Size = _expObjectAnimTbl2Size = _expObjectAnimTbl3Size = _wllFlagPresetSize = _scriptTimersCount = _buttonList1Size = _buttonList2Size =
-		_buttonList3Size = _buttonList4Size = _buttonList5Size = _buttonList6Size = _buttonList7Size = _buttonList8Size = 0;
+	_expObjectAnimTbl1Size = _expObjectAnimTbl2Size = _expObjectAnimTbl3Size = 0;
+	_wllFlagPresetSize = _scriptTimersCount = _buttonList1Size = _buttonList2Size = 0;
+	_buttonList3Size = _buttonList4Size = _buttonList5Size = _buttonList6Size = 0;
+	_buttonList7Size = _buttonList8Size = 0;
 	_inventorySlotsY = _mnDef = 0;
 	_transferStringsScummVM = 0;
 	_buttonDefs = 0;
 	_npcPreset = 0;
-	_chargenStatStrings	= _chargenRaceSexStrings = _chargenClassStrings = _chargenAlignmentStrings = _pryDoorStrings = _warningStrings = _ripItemStrings =
-		_cursedString = _enchantedString = _magicObjectStrings = _magicObjectString5 = _patternSuffix = _patternGrFix1 = _patternGrFix2 = _validateArmorString =
-		_validateCursedString = _validateNoDropString = _potionStrings = _wandStrings = _itemMisuseStrings = _suffixStringsRings = _suffixStringsPotions =
-		_suffixStringsWands	= _takenStrings	= _potionEffectStrings = _yesNoStrings = _npcMaxStrings = _okStrings = _npcJoinStrings = _cancelStrings	=
-		_abortStrings = _saveLoadStrings = _mnWord = _mnPrompt = _bookNumbers = _mageSpellList = _clericSpellList = _spellNames = _magicStrings1 = _magicStrings2 =
-		_magicStrings3 = _magicStrings4 = _magicStrings6 = _magicStrings7 = _magicStrings8 = 0;
+	_chargenStatStrings = _chargenRaceSexStrings = _chargenClassStrings = 0;
+	_chargenAlignmentStrings = _pryDoorStrings = _warningStrings = _ripItemStrings = 0;
+	_cursedString = _enchantedString = _magicObjectStrings = _magicObjectString5 = 0;
+	_patternSuffix = _patternGrFix1 = _patternGrFix2 = _validateArmorString = 0;
+	_validateCursedString = _validateNoDropString = _potionStrings = _wandStrings = 0;
+	_itemMisuseStrings = _suffixStringsRings = _suffixStringsPotions = 0;
+	_suffixStringsWands = _takenStrings = _potionEffectStrings = _yesNoStrings = 0;
+	_npcMaxStrings = _okStrings = _npcJoinStrings = _cancelStrings = 0;
+	_abortStrings = _saveLoadStrings = _mnWord = _mnPrompt = _bookNumbers = 0;
+	_mageSpellList = _clericSpellList = _spellNames = _magicStrings1 = 0;
+	_magicStrings2 = _magicStrings3 = _magicStrings4 = _magicStrings6 = 0;
+	_magicStrings7 = _magicStrings8 = 0;
 	_spellAnimBuffer = 0;
-	_sparkEffectDefSteps = _sparkEffectDefSubSteps = _sparkEffectDefShift = _sparkEffectDefAdd = _sparkEffectDefX = _sparkEffectDefY = _sparkEffectOfShift =
-		_sparkEffectOfX	= _sparkEffectOfY = _magicFlightObjectProperties = _turnUndeadEffect = _burningHandsDest = _coneOfColdGfxTbl = 0;
+	_sparkEffectDefSteps = _sparkEffectDefSubSteps = _sparkEffectDefShift = 0;
+	_sparkEffectDefAdd = _sparkEffectDefX = _sparkEffectDefY = _sparkEffectOfShift = 0;
+	_sparkEffectOfX = _sparkEffectOfY = _magicFlightObjectProperties = 0;
+	_turnUndeadEffect = _burningHandsDest = _coneOfColdGfxTbl = 0;
 	_sparkEffectOfFlags1 = _sparkEffectOfFlags2 = 0;
 	_coneOfColdDest1 = _coneOfColdDest2 = _coneOfColdDest3 = _coneOfColdDest4 = 0;
 	_coneOfColdGfxTblSize = 0;
 	_menuButtonDefs = 0;
-	_menuStringsMain = _menuStringsSaveLoad	= _menuStringsOnOff	= _menuStringsSpells = _menuStringsRest	= _menuStringsDrop = _menuStringsExit = _menuStringsStarve =
-		_menuStringsScribe = _menuStringsDrop2 = _menuStringsHead = _menuStringsPoison = _menuStringsMgc = _menuStringsPrefs = _menuStringsRest2 = _menuStringsRest3 =
-		_menuStringsRest4 = _menuStringsDefeat = _menuStringsTransfer = _menuStringsSpec = _menuStringsSpellNo = _menuYesNoStrings = 0;
+	_menuStringsMain = _menuStringsSaveLoad = _menuStringsOnOff = _menuStringsSpells = 0;
+	_menuStringsRest = _menuStringsDrop = _menuStringsExit = _menuStringsStarve = 0;
+	_menuStringsScribe = _menuStringsDrop2 = _menuStringsHead = _menuStringsPoison = 0;
+	_menuStringsMgc = _menuStringsPrefs = _menuStringsRest2 = _menuStringsRest3 = 0;
+	_menuStringsRest4 = _menuStringsDefeat = _menuStringsTransfer = _menuStringsSpec = 0;
+	_menuStringsSpellNo = _menuYesNoStrings = 0;
 	_errorSlotEmptyString = _errorSlotNoNameString = _menuOkString = 0;
-	_spellLevelsMage = _spellLevelsCleric = _numSpellsCleric = _numSpellsWisAdj	= _numSpellsPal	= _numSpellsMage = 0;
+	_spellLevelsMage = _spellLevelsCleric = _numSpellsCleric = _numSpellsWisAdj = _numSpellsPal = _numSpellsMage = 0;
 	_mnNumWord = _numSpells = _mageSpellListSize = _spellLevelsMageSize = _spellLevelsClericSize = 0;
 	_inventorySlotsX = _slotValidationFlags = _encodeMonsterShpTable = 0;
 	memset(_expRequirementTables, 0, sizeof(_expRequirementTables));
@@ -197,15 +220,15 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags) : KyraRpgE
 
 #define DWM0 _dscWallMapping.push_back(0)
 #define DWM(x) _dscWallMapping.push_back(&_sceneDrawVar##x)
-	DWM0;		DWM0;		DWM(Down);	DWM(Right);
-	DWM(Down);	DWM(Right);	DWM(Down);	DWM0;
-	DWM(Down);	DWM(Left);	DWM(Down);	DWM(Left);
-	DWM0;		DWM0;		DWM(Down);	DWM(Right);
-	DWM(Down);	DWM(Right);	DWM(Down);	DWM0;
-	DWM(Down);	DWM(Left);	DWM(Down);	DWM(Left);
-	DWM(Down);	DWM(Right);	DWM(Down);	DWM0;
-	DWM(Down);	DWM(Left);	DWM0;		DWM(Right);
-	DWM(Down);	DWM0;		DWM0;		DWM(Left);
+	DWM0;       DWM0;       DWM(Down);  DWM(Right);
+	DWM(Down);  DWM(Right); DWM(Down);  DWM0;
+	DWM(Down);  DWM(Left);  DWM(Down);  DWM(Left);
+	DWM0;       DWM0;       DWM(Down);  DWM(Right);
+	DWM(Down);  DWM(Right); DWM(Down);  DWM0;
+	DWM(Down);  DWM(Left);  DWM(Down);  DWM(Left);
+	DWM(Down);  DWM(Right); DWM(Down);  DWM0;
+	DWM(Down);  DWM(Left);  DWM0;       DWM(Right);
+	DWM(Down);  DWM0;       DWM0;       DWM(Left);
 #undef DWM
 #undef DWM0
 }
@@ -402,7 +425,7 @@ Common::Error EoBCoreEngine::init() {
 	memset(_noDoorSwitch, 0, sizeof(_noDoorSwitch));
 
 	_monsterShapes = new uint8*[36];
-	memset(_monsterShapes, 0, 36 * sizeof(uint8*));
+	memset(_monsterShapes, 0, 36 * sizeof(uint8 *));
 	_monsterDecorations = new SpriteDecoration[36];
 	memset(_monsterDecorations, 0, 36 * sizeof(SpriteDecoration));
 	_monsterPalettes = new uint8*[24];
@@ -1153,7 +1176,7 @@ int EoBCoreEngine::prepareForNewPartyMember(int16 itemType, int16 itemValue) {
 		gui_drawDialogueBox();
 		_txt->printDialogueText(_npcMaxStrings[0]);
 		int r = runDialogue(-1, 7, _characters[0].name, _characters[1].name, _characters[2].name, _characters[3].name,
-			_characters[4].name, _characters[5].name, _abortStrings[0]) - 1;
+		                    _characters[4].name, _characters[5].name, _abortStrings[0]) - 1;
 
 		if (r == 6)
 			return 0;
@@ -1187,12 +1210,12 @@ void EoBCoreEngine::removeCharacterFromParty(int charIndex) {
 		if (i == 16 || !c->inventory[i])
 			continue;
 
-		setItemPosition((Item*)&_levelBlockProperties[_currentBlock & 0x3ff].drawObjects, _currentBlock, c->inventory[i], _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
+		setItemPosition((Item *)&_levelBlockProperties[_currentBlock & 0x3ff].drawObjects, _currentBlock, c->inventory[i], _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
 		c->inventory[i] = 0;
 	}
 
 	while (c->inventory[16])
-		setItemPosition((Item*)&_levelBlockProperties[_currentBlock & 0x3ff].drawObjects, _currentBlock, getQueuedItem(&c->inventory[16], 0, -1), _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
+		setItemPosition((Item *)&_levelBlockProperties[_currentBlock & 0x3ff].drawObjects, _currentBlock, getQueuedItem(&c->inventory[16], 0, -1), _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
 
 	c->inventory[16] = 0;
 
@@ -1281,7 +1304,7 @@ void EoBCoreEngine::setupDialogueButtons(int presetfirst, int numStr, va_list &a
 	_dialogueHighlightedButton = 0;
 
 	for (int i = 0; i < numStr; i++) {
-		const char *s = va_arg(args, const char*);
+		const char *s = va_arg(args, const char *);
 		if (s)
 			_dialogueButtonString[i] = s;
 		else
@@ -1549,7 +1572,7 @@ void EoBCoreEngine::displayParchment(int id) {
 
 int EoBCoreEngine::countResurrectionCandidates() {
 	_rrCount = 0;
-	memset(_rrNames, 0, 10 * sizeof(const char*));
+	memset(_rrNames, 0, 10 * sizeof(const char *));
 
 	for (int i = 0; i < 6; i++) {
 		if (!testCharacter(i, 1))
@@ -1617,7 +1640,7 @@ void EoBCoreEngine::seq_portal() {
 	_screen->copyRegion(24, 0, 24, 0, 144, 104, 5, 2, Screen::CR_NO_P_CHECK);
 	delay(30 * _tickLength);
 
-	for (const int8 *pos = _portalSeq; *pos > -1 && !shouldQuit(); ) {
+	for (const int8 *pos = _portalSeq; *pos > -1 && !shouldQuit();) {
 		int s = *pos++;
 		_screen->drawShape(0, shapes3[s], 28, 9, 0);
 		_screen->drawShape(0, shapes1[s], 34, 28, 0);
@@ -1814,7 +1837,7 @@ int EoBCoreEngine::projectileWeaponAttack(int charIndex, Item item) {
 	} else {
 		for (int i = 0; i < 27; i++) {
 			if (_items[_characters[charIndex].inventory[i]].type == t) {
-				SWAP(ammoItem, _characters[charIndex].inventory[i] );
+				SWAP(ammoItem, _characters[charIndex].inventory[i]);
 				if (i < 2)
 					gui_drawCharPortraitWithStats(charIndex);
 				break;
@@ -1954,7 +1977,7 @@ bool EoBCoreEngine::characterAttackHitTest(int charIndex, int monsterIndex, int
 	int d = (p < 1 || p > 3) ? 0 : _items[item].value;
 
 	if (_flags.gameID == GI_EOB2) {
-		if ((p > 0 && p < 4) || !item ){
+		if ((p > 0 && p < 4) || !item) {
 			if (((_monsterProps[t].immunityFlags & 0x200) && (d <= 0)) || ((_monsterProps[t].immunityFlags & 0x1000) && (d <= 1)))
 				return false;
 		}
@@ -2006,7 +2029,7 @@ bool EoBCoreEngine::flyingObjectMonsterHit(EoBFlyingObject *fo, int monsterIndex
 		if (!characterAttackHitTest(fo->attackerId, monsterIndex, fo->item, 0))
 			return false;
 	}
-	calcAndInflictMonsterDamage(&_monsters[monsterIndex], fo->attackerId, fo->item, 0, (fo->attackerId == -1) ? 0x110: 0x910, 5, 3);
+	calcAndInflictMonsterDamage(&_monsters[monsterIndex], fo->attackerId, fo->item, 0, (fo->attackerId == -1) ? 0x110 : 0x910, 5, 3);
 	return true;
 }
 
@@ -2150,10 +2173,9 @@ int EoBCoreEngine::calcMonsterDamage(EoBMonsterInPlay *m, int times, int pips, i
 			s = 1;
 	}
 
-	if ((flags & 0x100) && (!(_itemTypes[_items[pips].type].allowedClasses & 4 /* bug in original code ??*/)) &&
-		((_flags.gameID == GI_EOB2 && (p->immunityFlags & 0x100)) ||
-		(_flags.gameID == GI_EOB1 && (p->capsFlags & 4))))
-			s >>= 1;
+	if ((flags & 0x100) && (!(_itemTypes[_items[pips].type].allowedClasses & 4 /* bug in original code ??*/))
+	    && ((_flags.gameID == GI_EOB2 && (p->immunityFlags & 0x100)) || (_flags.gameID == GI_EOB1 && (p->capsFlags & 4))))
+		s >>= 1;
 
 	if (p->immunityFlags & 0x2000) {
 		if (flags & 0x100) {
@@ -2191,8 +2213,8 @@ int EoBCoreEngine::calcDamageModifers(int charIndex, EoBMonsterInPlay *m, int it
 	if (item) {
 		EoBItemType *p = &_itemTypes[itemType];
 		int t = m ? m->type : 0;
-		s += ((m && (_monsterProps[t].capsFlags & 1)) ?	rollDice(p->dmgNumDiceL, p->dmgNumPipsL, p->dmgIncS /* bug in original code ? */) :
-			rollDice(p->dmgNumDiceS, p->dmgNumPipsS, p->dmgIncS));
+		s += ((m && (_monsterProps[t].capsFlags & 1)) ? rollDice(p->dmgNumDiceL, p->dmgNumPipsL, p->dmgIncS /* bug in original code ? */) :
+		      rollDice(p->dmgNumDiceS, p->dmgNumPipsS, p->dmgIncS));
 		s += _items[item].value;
 	} else {
 		s += rollDice(1, 2);
@@ -2209,7 +2231,7 @@ bool EoBCoreEngine::trySavingThrow(void *target, int hpModifier, int level, int
 
 	int s = getSaveThrowModifier(hpModifier, level, type);
 	if (((race == 3 || race == 5) && (type == 4 || type == 1 || type == 0)) || (race == 4 && (type == 4 || type == 1))) {
-		EoBCharacter *c = (EoBCharacter*)target;
+		EoBCharacter *c = (EoBCharacter *)target;
 		s -= constMod[c->constitutionCur];
 	}
 
@@ -2319,6 +2341,6 @@ void EoBCoreEngine::snd_stopSound() {
 	_sound->playSoundEffect(0);
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index cc32a9785a..9e08ae0fb9 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -53,9 +53,9 @@ void GUI::updateSaveFileList(Common::String targetName, bool excludeQuickSaves)
 
 	for (Common::StringArray::const_iterator i = saveFileList.begin(); i != saveFileList.end(); ++i) {
 		char s1 = 0, s2 = 0, s3 = 0;
-		s1 = (*i)[i->size()-3];
-		s2 = (*i)[i->size()-2];
-		s3 = (*i)[i->size()-1];
+		s1 = (*i)[i->size() - 3];
+		s2 = (*i)[i->size() - 2];
+		s3 = (*i)[i->size() - 1];
 		if (!isdigit(static_cast<unsigned char>(s1)) || !isdigit(static_cast<unsigned char>(s2)) || !isdigit(static_cast<unsigned char>(s3)))
 			continue;
 		s1 -= '0';
@@ -63,7 +63,7 @@ void GUI::updateSaveFileList(Common::String targetName, bool excludeQuickSaves)
 		s3 -= '0';
 		if (excludeQuickSaves && s1 == 9 && s2 == 9)
 			continue;
-		_saveSlots.push_back(s1*100+s2*10+s3);
+		_saveSlots.push_back(s1 * 100 + s2 * 10 + s3);
 	}
 
 	if (_saveSlots.begin() == _saveSlots.end())
@@ -75,7 +75,7 @@ void GUI::updateSaveFileList(Common::String targetName, bool excludeQuickSaves)
 void GUI::sortSaveSlots() {
 	Common::sort(_saveSlots.begin(), _saveSlots.end(), Common::Less<int>());
 	if (_saveSlots.size() > 2)
-		Common::sort(_saveSlots.begin()+1, _saveSlots.end(), Common::Greater<int>());
+		Common::sort(_saveSlots.begin() + 1, _saveSlots.end(), Common::Greater<int>());
 }
 
 int GUI::getNextSavegameSlot() {
@@ -117,11 +117,11 @@ void GUI::updateSaveSlotsList(Common::String targetName, bool force) {
 		Common::InSaveFile *in;
 
 		_savegameList = new char*[_savegameListSize];
-		memset(_savegameList, 0, _savegameListSize * sizeof(char*));
+		memset(_savegameList, 0, _savegameListSize * sizeof(char *));
 
 		for (int i = 0; i < numSaves; i++) {
 			in = _vm->openSaveForReading(_vm->getSavegameFilename(targetName, _saveSlots[i]).c_str(), header, targetName == _vm->_targetName);
-			char **listEntry = &_savegameList[allowEmptySlots? _saveSlots[i] : i];
+			char **listEntry = &_savegameList[allowEmptySlots ? _saveSlots[i] : i];
 			if (in) {
 				*listEntry = new char[header.description.size() + 1];
 				Common::strlcpy(*listEntry, header.description.c_str(), header.description.size() + 1);
diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp
index 0e19d48196..580adb0e5d 100644
--- a/engines/kyra/gui_v2.cpp
+++ b/engines/kyra/gui_v2.cpp
@@ -211,7 +211,7 @@ int GUI_v2::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseWh
 
 		bool progress = false;
 
-		if (mouseX >= x && mouseY >= y && mouseX <= x+buttonList->width && mouseY <= y+buttonList->height)
+		if (mouseX >= x && mouseY >= y && mouseX <= x + buttonList->width && mouseY <= y + buttonList->height)
 			progress = true;
 
 		buttonList->flags2 &= ~0x80;
@@ -425,7 +425,7 @@ void GUI_v2::renewHighlight(Menu &menu) {
 	int x = item.x + menu.x; int y = item.y + menu.y;
 	int x2 = x + item.width - 1; int y2 = y + item.height - 1;
 	redrawText(menu);
-	_screen->fillRect(x+2, y+2, x2-2, y2-2, item.bkgdColor);
+	_screen->fillRect(x + 2, y + 2, x2 - 2, y2 - 2, item.bkgdColor);
 	redrawHighlight(menu);
 	_screen->updateScreen();
 }
@@ -736,10 +736,10 @@ int GUI_v2::deleteMenu(Button *caller) {
 			break;
 		// We are only renaming all savefiles until we get some slots missing
 		// Also not rename quicksave slot filenames
-		if (*(i-1) != *i || *i >= 990)
+		if (*(i - 1) != *i || *i >= 990)
 			break;
 		Common::String oldName = _vm->getSavegameFilename(*i);
-		Common::String newName = _vm->getSavegameFilename(*i-1);
+		Common::String newName = _vm->getSavegameFilename(*i - 1);
 		_vm->_saveFileMan->renameSavefile(oldName, newName);
 	}
 	_saveMenu.menuNameId = _vm->gameFlags().isTalkie ? 9 : 17;
@@ -845,7 +845,7 @@ int GUI_v2::getCharWidth(uint8 c) {
 }
 
 void GUI_v2::drawTextfieldBlock(int x, int y, uint8 c) {
-	_screen->fillRect(x+1, y+1, x+7, y+8, c);
+	_screen->fillRect(x + 1, y + 1, x + 7, y + 8, c);
 }
 
 bool GUI_v2::choiceDialog(int name, bool type) {
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index e8cb9b4370..75b568a00a 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -121,7 +121,7 @@ KyraEngine_v2::~KyraEngine_v2() {
 
 	delete[] _animObjects;
 
-	for (Common::Array<const Opcode*>::iterator i = _opcodesAnimation.begin(); i != _opcodesAnimation.end(); ++i)
+	for (Common::Array<const Opcode *>::iterator i = _opcodesAnimation.begin(); i != _opcodesAnimation.end(); ++i)
 		delete *i;
 	_opcodesAnimation.clear();
 
@@ -162,8 +162,8 @@ void KyraEngine_v2::delay(uint32 amount, bool updateGame, bool isMainLoop) {
 }
 
 bool KyraEngine_v2::checkSpecialSceneExit(int num, int x, int y) {
-	if (_specialExitTable[0+num] > x || _specialExitTable[5+num] > y ||
-		_specialExitTable[10+num] < x || _specialExitTable[15+num] < y)
+	if (_specialExitTable[0 + num] > x || _specialExitTable[5 + num] > y ||
+	        _specialExitTable[10 + num] < x || _specialExitTable[15 + num] < y)
 		return false;
 	return true;
 }
diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index e9c61b0761..3bca6b0e3c 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -44,13 +44,13 @@ KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::Seekab
 	header.flags = 0;
 	header.thumbnail = 0;
 
-	if (type == MKTAG('K','Y','R','A') || type == MKTAG('A','R','Y','K')) { // old Kyra1 header ID
+	if (type == MKTAG('K', 'Y', 'R', 'A') || type == MKTAG('A', 'R', 'Y', 'K')) { // old Kyra1 header ID
 		header.gameID = GI_KYRA1;
 		header.oldHeader = true;
-	} else if (type == MKTAG('H','O','F','S')) { // old Kyra2 header ID
+	} else if (type == MKTAG('H', 'O', 'F', 'S')) { // old Kyra2 header ID
 		header.gameID = GI_KYRA2;
 		header.oldHeader = true;
-	} else if (type == MKTAG('W','W','S','V')) {
+	} else if (type == MKTAG('W', 'W', 'S', 'V')) {
 		header.gameID = in->readByte();
 	} else {
 		// try checking for original save header
@@ -68,12 +68,12 @@ KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::Seekab
 
 			type = in->readUint32BE();
 			header.version = in->readUint16LE();
-			if (type == MKTAG('M','B','L','3') && header.version == 100) {
+			if (type == MKTAG('M', 'B', 'L', '3') && header.version == 100) {
 				saveOk = true;
 				header.description = descriptionBuffer;
 				header.gameID = GI_KYRA2;
 				break;
-			} else if (type == MKTAG('M','B','L','4') && header.version == 102) {
+			} else if (type == MKTAG('M', 'B', 'L', '4') && header.version == 102) {
 				saveOk = true;
 				header.description = descriptionBuffer;
 				header.gameID = GI_KYRA3;
@@ -91,7 +91,7 @@ KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::Seekab
 	}
 
 	header.version = in->readUint32BE();
-	if (header.version > CURRENT_SAVE_VERSION || (header.oldHeader && header.version > 8) || (type == MKTAG('A','R','Y','K') && header.version > 3))
+	if (header.version > CURRENT_SAVE_VERSION || (header.oldHeader && header.version > 8) || (type == MKTAG('A', 'R', 'Y', 'K') && header.version > 3))
 		return kRSHEInvalidVersion;
 
 	// Versions prior to 9 are using a fixed length description field
@@ -182,10 +182,10 @@ Common::WriteStream *KyraEngine_v1::openSaveForWriting(const char *filename, con
 	}
 
 	// Savegame version
-	out->writeUint32BE(MKTAG('W','W','S','V'));
+	out->writeUint32BE(MKTAG('W', 'W', 'S', 'V'));
 	out->writeByte(_flags.gameID);
 	out->writeUint32BE(CURRENT_SAVE_VERSION);
-	out->write(saveName, strlen(saveName)+1);
+	out->write(saveName, strlen(saveName) + 1);
 	if (_flags.isTalkie)
 		out->writeUint32BE(GF_TALKIE);
 	else if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98)
diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/scene_v2.cpp
index 061ce4c21a..9b6897f2ab 100644
--- a/engines/kyra/scene_v2.cpp
+++ b/engines/kyra/scene_v2.cpp
@@ -42,7 +42,7 @@ void KyraEngine_v2::updateSpecialSceneScripts() {
 
 	while (_system->getMillis() <= nextTime) {
 		if (_sceneSpecialScriptsTimer[_lastProcessedSceneScript] <= _system->getMillis() &&
-			!_specialSceneScriptState[_lastProcessedSceneScript]) {
+		        !_specialSceneScriptState[_lastProcessedSceneScript]) {
 			_specialSceneScriptRunFlag = true;
 
 			while (_specialSceneScriptRunFlag && _sceneSpecialScriptsTimer[_lastProcessedSceneScript] <= _system->getMillis()) {
@@ -52,7 +52,7 @@ void KyraEngine_v2::updateSpecialSceneScripts() {
 		}
 
 		if (!_emc->isValid(&_sceneSpecialScripts[_lastProcessedSceneScript])) {
-			_emc->start(&_sceneSpecialScripts[_lastProcessedSceneScript], _desc.firstAnimSceneScript+_lastProcessedSceneScript);
+			_emc->start(&_sceneSpecialScripts[_lastProcessedSceneScript], _desc.firstAnimSceneScript + _lastProcessedSceneScript);
 			_specialSceneScriptRunFlag = false;
 		}
 
@@ -155,14 +155,14 @@ int KyraEngine_v2::pathfinderInitPositionTable(int *moveTable) {
 	}
 
 	lastEntry = pathfinderAddToPositionTable(lastEntry, newX, newY);
-	_pathfinderPositionTable[lastEntry*2+0] = -1;
-	_pathfinderPositionTable[lastEntry*2+1] = -1;
+	_pathfinderPositionTable[lastEntry * 2 + 0] = -1;
+	_pathfinderPositionTable[lastEntry * 2 + 1] = -1;
 	return lastEntry;
 }
 
 int KyraEngine_v2::pathfinderAddToPositionTable(int index, int v1, int v2) {
-	_pathfinderPositionTable[index<<1] = v1;
-	_pathfinderPositionTable[(index<<1)+1] = v2;
+	_pathfinderPositionTable[index << 1] = v1;
+	_pathfinderPositionTable[(index << 1) + 1] = v2;
 	++index;
 	if (index >= 199)
 		--index;
@@ -173,23 +173,23 @@ int KyraEngine_v2::pathfinderInitPositionIndexTable(int tableLen, int x, int y)
 	int x1 = 0, y1 = 0;
 	int x2 = 0, y2 = 0;
 	int lastEntry = 0;
-	int index2 = tableLen-1, index1 = 0;
+	int index2 = tableLen - 1, index1 = 0;
 	while (index2 > index1) {
-		x1 = _pathfinderPositionTable[index1*2+0] + x;
-		y1 = _pathfinderPositionTable[index1*2+1] + y;
-		x2 = _pathfinderPositionTable[index2*2+0] + x;
-		y2 = _pathfinderPositionTable[index2*2+1] + y;
+		x1 = _pathfinderPositionTable[index1 * 2 + 0] + x;
+		y1 = _pathfinderPositionTable[index1 * 2 + 1] + y;
+		x2 = _pathfinderPositionTable[index2 * 2 + 0] + x;
+		y2 = _pathfinderPositionTable[index2 * 2 + 1] + y;
 
 		if (directLinePassable(x1, y1, x2, y2)) {
 			lastEntry = pathfinderAddToPositionIndexTable(lastEntry, index2);
-			if (tableLen-1 == index2)
+			if (tableLen - 1 == index2)
 				break;
 			index1 = index2;
-			index2 = tableLen-1;
-		} else if (index1+1 == index2) {
+			index2 = tableLen - 1;
+		} else if (index1 + 1 == index2) {
 			lastEntry = pathfinderAddToPositionIndexTable(lastEntry, index2);
 			index1 = index2;
-			index2 = tableLen-1;
+			index2 = tableLen - 1;
 		} else {
 			--index2;
 		}
@@ -212,14 +212,14 @@ void KyraEngine_v2::pathfinderFinializePath(int *moveTable, int tableLen, int x,
 	int sizeLeft = moveTableSize;
 	for (int i = 0; i < tableLen; ++i) {
 		index2 = _pathfinderPositionIndexTable[i];
-		x1 = _pathfinderPositionTable[index1*2+0] + x;
-		y1 = _pathfinderPositionTable[index1*2+1] + y;
-		x2 = _pathfinderPositionTable[index2*2+0] + x;
-		y2 = _pathfinderPositionTable[index2*2+1] + y;
+		x1 = _pathfinderPositionTable[index1 * 2 + 0] + x;
+		y1 = _pathfinderPositionTable[index1 * 2 + 1] + y;
+		x2 = _pathfinderPositionTable[index2 * 2 + 0] + x;
+		y2 = _pathfinderPositionTable[index2 * 2 + 1] + y;
 
 		int wayLen = findWay(x1, y1, x2, y2, moveTable, sizeLeft);
 		moveTable += wayLen;
-		sizeLeft -= wayLen;	// unlike the original we want to be sure that the size left is correct
+		sizeLeft -= wayLen; // unlike the original we want to be sure that the size left is correct
 		index1 = index2;
 	}
 }
diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp
index c608c6e683..dde22498eb 100644
--- a/engines/kyra/screen_v2.cpp
+++ b/engines/kyra/screen_v2.cpp
@@ -27,7 +27,7 @@
 namespace Kyra {
 
 Screen_v2::Screen_v2(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, const int dimTableSize)
-    : Screen(vm, system, dimTable, dimTableSize), _wsaFrameAnimBuffer(0) {
+	: Screen(vm, system, dimTable, dimTableSize), _wsaFrameAnimBuffer(0) {
 	_wsaFrameAnimBuffer = new uint8[1024];
 	assert(_wsaFrameAnimBuffer);
 }
@@ -187,7 +187,7 @@ uint8 *Screen_v2::getPtrToShape(uint8 *shpFile, int shape) {
 int Screen_v2::getShapeScaledWidth(const uint8 *shpFile, int scale) {
 	if (!shpFile)
 		return 0;
-	int width = READ_LE_UINT16(shpFile+3);
+	int width = READ_LE_UINT16(shpFile + 3);
 	return (width * scale) >> 8;
 }
 
@@ -201,7 +201,7 @@ int Screen_v2::getShapeScaledHeight(const uint8 *shpFile, int scale) {
 uint16 Screen_v2::getShapeSize(const uint8 *shp) {
 	if (!shp)
 		return 0;
-	return READ_LE_UINT16(shp+6);
+	return READ_LE_UINT16(shp + 6);
 }
 
 uint8 *Screen_v2::makeShapeCopy(const uint8 *src, int index) {
@@ -242,7 +242,7 @@ int Screen_v2::getLayer(int x, int y) {
 int Screen_v2::getRectSize(int w, int h) {
 	if (w > 320 || h > 200)
 		return 0;
-	return w*h;
+	return w * h;
 }
 
 void Screen_v2::setTextColorMap(const uint8 *cmap) {
@@ -250,7 +250,7 @@ void Screen_v2::setTextColorMap(const uint8 *cmap) {
 }
 
 void Screen_v2::wsaFrameAnimationStep(int x1, int y1, int x2, int y2,
-	int w1, int h1, int w2, int h2, int srcPage, int dstPage, int dim) {
+                                      int w1, int h1, int w2, int h2, int srcPage, int dstPage, int dim) {
 
 	if (!(w1 || h1 || w2 || h2))
 		return;
@@ -281,7 +281,7 @@ void Screen_v2::wsaFrameAnimationStep(int x1, int y1, int x2, int y2,
 				memcpy(dt, s, w2);
 			} else if (t > 0) {
 				if (w1 == 1) {
-                    memset(dt, *s, w2);
+					memset(dt, *s, w2);
 				} else {
 					t = ((((((w2 - w1 + 1) & 0xffff) << 8) / w1) + 0x100) & 0xffff) << 8;
 					int bp = 0;
@@ -353,7 +353,7 @@ bool Screen_v2::calcBounds(int w0, int h0, int &x1, int &y1, int &w1, int &h1, i
 					h1 = t;
 					y1 = 0;
 				}
-                t = h0 - y1;
+				t = h0 - y1;
 				if (t < 1) {
 					w1 = h1 = -1;
 				} else {
diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp
index e42cdf9ff4..c38a144537 100644
--- a/engines/kyra/script_v2.cpp
+++ b/engines/kyra/script_v2.cpp
@@ -57,7 +57,7 @@ int KyraEngine_v2::o2_setCharacterFacingOverwrite(EMCState *script) {
 
 int KyraEngine_v2::o2_trySceneChange(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_trySceneChange(%p) (%d, %d, %d, %d)", (const void *)script,
-			stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	       stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 
 	_unkHandleSceneChangeFlag = 1;
 	int success = inputSceneChange(stackPos(0), stackPos(1), stackPos(2), stackPos(3));
@@ -87,7 +87,7 @@ int KyraEngine_v2::o2_checkForItem(EMCState *script) {
 
 int KyraEngine_v2::o2_defineItem(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_defineItem(%p) (%d, %d, %d, %d)", (const void *)script,
-			stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+	       stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int freeItem = findFreeItem();
 
 	if (freeItem >= 0) {
@@ -102,13 +102,13 @@ int KyraEngine_v2::o2_defineItem(EMCState *script) {
 
 int KyraEngine_v2::o2_addSpecialExit(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_addSpecialExit(%p) (%d, %d, %d, %d, %d)", (const void *)script,
-		stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+	       stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	if (_specialExitCount < 5) {
-		_specialExitTable[_specialExitCount+0] = stackPos(0);
-		_specialExitTable[_specialExitCount+5] = stackPos(1);
-		_specialExitTable[_specialExitCount+10] = stackPos(2) + stackPos(0) - 1;
-		_specialExitTable[_specialExitCount+15] = stackPos(3) + stackPos(1) - 1;
-		_specialExitTable[_specialExitCount+20] = stackPos(4);
+		_specialExitTable[_specialExitCount + 0] = stackPos(0);
+		_specialExitTable[_specialExitCount + 5] = stackPos(1);
+		_specialExitTable[_specialExitCount + 10] = stackPos(2) + stackPos(0) - 1;
+		_specialExitTable[_specialExitCount + 15] = stackPos(3) + stackPos(1) - 1;
+		_specialExitTable[_specialExitCount + 20] = stackPos(4);
 		++_specialExitCount;
 	}
 	return 0;
@@ -226,7 +226,7 @@ int KyraEngine_v2::o2_defineRoomEntrance(EMCState *script) {
 
 int KyraEngine_v2::o2_runAnimationScript(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_runAnimationScript(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1),
-			stackPos(2), stackPos(3));
+	       stackPos(2), stackPos(3));
 
 	runAnimationScript(stackPosString(0), stackPos(3), stackPos(2) ? 1 : 0, stackPos(1), stackPos(2));
 	return 0;
@@ -241,7 +241,7 @@ int KyraEngine_v2::o2_setSpecialSceneScriptRunTime(EMCState *script) {
 
 int KyraEngine_v2::o2_defineScene(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_defineScene(%p) (%d, '%s', %d, %d, %d, %d, %d, %d)",
-		(const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7));
+	       (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7));
 	const int scene = stackPos(0);
 	strcpy(_sceneList[scene].filename1, stackPosString(1));
 	strcpy(_sceneList[scene].filename2, stackPosString(1));
@@ -323,7 +323,7 @@ int KyraEngine_v2::o2_getVocHigh(EMCState *script) {
 
 int KyraEngine_v2::o2a_setAnimationShapes(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2a_setAnimationShapes(%p) ('%s', %d, %d, %d, %d, %d)", (const void *)script,
-			stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+	       stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
 	strcpy(_animShapeFilename, stackPosString(0));
 	_animShapeLastEntry = stackPos(1);
 	_animShapeWidth = stackPos(2);
-- 
cgit v1.2.3


From 5fc80f99d9daf07d037397fb32ed1bb828f02f50 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 27 Dec 2011 02:51:14 +0100
Subject: KYRA: Fix compilation with clang.

---
 engines/kyra/kyra_v1.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines')

diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index e66f0fb5d7..67332eccdb 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -185,7 +185,9 @@ friend class Debugger;
 friend class ::KyraMetaEngine;
 friend class GUI;
 friend class GUI_v1;
+friend class GUI_EoB;
 friend class SoundMidiPC;    // For _eventMan
+friend class TransferPartyWiz; // For save state API
 public:
 	KyraEngine_v1(OSystem *system, const GameFlags &flags);
 	virtual ~KyraEngine_v1();
-- 
cgit v1.2.3


From c211ec8c163480837ee75045436a20130180ebe6 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 27 Dec 2011 03:00:27 +0100
Subject: KYRA: Remove unused/duplicated code.

---
 engines/kyra/script_eob.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index ffdb717484..267966dde2 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -146,9 +146,6 @@ EoBInfProcessor::EoBInfProcessor(EoBCoreEngine *engine, Screen_EoB *screen) : _v
 	memset(_stack, 0, 30 * sizeof(int16));
 	_stackIndex = 0;
 
-	memset(_subroutineStack, 0, sizeof(_subroutineStack));
-	_subroutineStackPos = 0;
-
 	_activeCharacter = -1;
 }
 
-- 
cgit v1.2.3


From 551177908510bad6257bec76859bc5d4de8bc932 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Tue, 27 Dec 2011 02:18:52 +0000
Subject: DREAMWEB: Minor removal of runtime residue in vgagrafx.cpp

Also, minor formatting fixes.
---
 engines/dreamweb/vgagrafx.cpp | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 33a1770d93..7e74264dd7 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -281,13 +281,13 @@ void DreamBase::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 fra
 		return;
 	}
 
-//notBlankShow:
+	// "notBlankShow"
 	if ((effectsFlag & 128) == 0) {
 		x += frame->x;
 		y += frame->y;
 	}
-//skipOffsets:
 
+	// "skipOffsets"
 	*width = frame->width;
 	*height = frame->height;
 	const uint8 *pSrc = ((const uint8 *)frameData) + frame->ptr() + 2080;
@@ -297,27 +297,21 @@ void DreamBase::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 fra
 			x -= *width / 2;
 			y -= *height / 2;
 		}
-		if (effectsFlag & 64) { //diffDest
+		if (effectsFlag & 64) { // diffDest
 			error("Unsupported DreamBase::showFrame effectsFlag %d", effectsFlag);
 			/*
 			frameOutFx(es.ptr(0, dx * *height), pSrc, dx, *width, *height, x, y);
 			return;
 			*/
 		}
-		if (effectsFlag & 8) { //printList
-			/*
-			push(ax);
-			al = x - data.word(kMapadx);
-			ah = y - data.word(kMapady);
-			//addToPrintList(); // NB: Commented in the original asm
-			ax = pop();
-			*/
+		if (effectsFlag & 8) { // printList
+			//addToPrintList(x - data.word(kMapadx), y - data.word(kMapady)); // NB: Commented in the original asm
 		}
-		if (effectsFlag & 4) { //flippedX
+		if (effectsFlag & 4) { // flippedX
 			frameOutFx(workspace(), pSrc, 320, *width, *height, x, y);
 			return;
 		}
-		if (effectsFlag & 2) { //noMask
+		if (effectsFlag & 2) { // noMask
 			frameOutNm(workspace(), pSrc, 320, *width, *height, x, y);
 			return;
 		}
@@ -326,7 +320,7 @@ void DreamBase::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 fra
 			return;
 		}
 	}
-//noEffects:
+	// "noEffects"
 	frameOutV(workspace(), pSrc, 320, *width, *height, x, y);
 	return;
 }
-- 
cgit v1.2.3


From 5cfa1899bdea96a2e1dc505b4cfdbbe96ae13c02 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Tue, 27 Dec 2011 03:08:43 +0000
Subject: DREAMWEB: Move kQuitRequested out of data blob.

---
 engines/dreamweb/dreambase.h  |  4 ++--
 engines/dreamweb/dreamgen.cpp |  2 +-
 engines/dreamweb/dreamgen.h   |  5 ++---
 engines/dreamweb/dreamweb.cpp |  5 +++--
 engines/dreamweb/keypad.cpp   |  2 +-
 engines/dreamweb/monitor.cpp  |  4 ++--
 engines/dreamweb/newplace.cpp |  4 ++--
 engines/dreamweb/object.cpp   |  2 +-
 engines/dreamweb/print.cpp    |  2 +-
 engines/dreamweb/saveload.cpp | 10 +++++-----
 engines/dreamweb/stubs.cpp    | 31 +++++++++++++------------------
 engines/dreamweb/talk.cpp     |  4 ++--
 engines/dreamweb/use.cpp      |  4 ++--
 13 files changed, 37 insertions(+), 42 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index fb06309f15..6c09d41f1c 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -114,7 +114,8 @@ protected:
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
 
-public:
+	bool _quitRequested;
+
 	// from backdrop.cpp
 	void doBlocks();
 	uint8 getXAd(const uint8 *setData, uint8 *result);
@@ -446,7 +447,6 @@ public:
 	void readMouse();
 	uint16 readMouseState();
 	void hangOn(uint16 frameCount);
-	bool quitRequested();
 	void lockMon();
 	uint8 *textUnder();
 	void readKey();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 37ef12efa8..ce871c4b71 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -75,7 +75,7 @@ void DreamGenContext::__start() {
 		//0x0150: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 28a40187f7..66c6aef806 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -307,9 +307,8 @@ static const uint16 kCh1playing = 374;
 static const uint16 kCh1blockstocopy = 375;
 static const uint16 kCurrentsample = 377;
 static const uint16 kRoomssample = 378;
-static const uint16 kQuitrequested = 379;
-static const uint16 kSubtitles = 380;
-static const uint16 kForeignrelease = 381;
+static const uint16 kSubtitles = 379;
+static const uint16 kForeignrelease = 380;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 997f36438e..f1d5c5415c 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -102,7 +102,7 @@ void DreamWebEngine::waitForVSync() {
 }
 
 void DreamWebEngine::quit() {
-	_base.data.byte(DreamGen::kQuitrequested) = 1;
+	_base._quitRequested = true;
 	_base.data.byte(DreamGen::kLasthardkey) = 1;
 }
 
@@ -213,7 +213,7 @@ Common::Error DreamWebEngine::run() {
 
 	_timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync");
 	_context.__start();
-	_base.data.byte(DreamGen::kQuitrequested) = 0;
+	_base._quitRequested = false;
 
 	_timer->removeTimerProc(vSyncInterrupt);
 
@@ -417,6 +417,7 @@ namespace DreamGen {
 // FIXME/TODO: Move this to a better place.
 DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) : engine(en) {
 	_openChangeSize = kInventx+(4*kItempicsize);
+	_quitRequested = false;
 }
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index b165c00394..c3db72f282 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -139,7 +139,7 @@ void DreamBase::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3
 		dumpKeypad();
 		dumpTextLine();
 		checkCoords(keypadList);
-		if (quitRequested() || (data.byte(kGetback) == 1))
+		if (_quitRequested || (data.byte(kGetback) == 1))
 			break;
 		if (data.byte(kLightcount) == 1) {
 			if (data.byte(kLockstatus) == 0)
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index eb6d876ca4..69a46d725f 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -86,7 +86,7 @@ void DreamBase::useMon() {
 		data.word(kMonadx) = oldMonadx;
 		data.word(kMonady) = oldMonady;
 		stop = execCommand();
-		if (quitRequested()) //TODO : Check why it crashes when put before the execcommand
+		if (_quitRequested) //TODO : Check why it crashes when put before the execcommand
 			break;
 	} while (!stop);
 	getRidOfTemp();
@@ -203,7 +203,7 @@ void DreamBase::input() {
 		vSync();
 		delCurs();
 		readKey();
-		if (quitRequested())
+		if (_quitRequested)
 			return;
 		uint8 currentKey = data.byte(kCurrentkey);
 		if (currentKey == 0)
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index efcffef82a..3c50eb7b12 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -59,7 +59,7 @@ void DreamBase::selectLocation() {
 	data.byte(kNewlocation) = 255;
 
 	while (data.byte(kNewlocation) == 255) {
-		if (quitRequested())
+		if (_quitRequested)
 			break;
 
 		delPointer();
@@ -84,7 +84,7 @@ void DreamBase::selectLocation() {
 		checkCoords(destList);
 	}
 
-	if (quitRequested() || data.byte(kGetback) == 1 || data.byte(kNewlocation) == data.byte(kLocation)) {
+	if (_quitRequested || data.byte(kGetback) == 1 || data.byte(kNewlocation) == data.byte(kLocation)) {
 		data.byte(kNewlocation) = data.byte(kReallocation);
 		data.byte(kGetback) = 0;
 	}
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 8152394de0..cb105c7798 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -195,7 +195,7 @@ void DreamBase::examineOb(bool examineAgain) {
 		}
 		}
 
-		if (data.byte(kQuitrequested) != 0)
+		if (_quitRequested)
 			break;
 		if (data.byte(kExamagain) != 0)
 			examineAgain = true;
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 7edf44443f..7bd090d3ee 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -103,7 +103,7 @@ uint8 DreamBase::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWid
 				data.word(kCharshift) = 0;
 				for (int i=0; i<2; ++i) {
 					uint16 mouseState = waitFrames();
-					if (data.byte(kQuitrequested))
+					if (_quitRequested)
 						return 0;
 					if (mouseState == 0)
 						continue;
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index c879afe034..525c48e4d4 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -72,7 +72,7 @@ void DreamBase::doLoad(int savegameId) {
 		data.byte(kGetback) = 0;
 
 		while (data.byte(kGetback) == 0) {
-			if (quitRequested())
+			if (_quitRequested)
 				return;
 			delPointer();
 			readMouse();
@@ -166,7 +166,7 @@ void DreamBase::saveGame() {
 		data.byte(kGetback) = 0;
 
 		while (data.byte(kGetback) == 0) {
-			if (quitRequested())
+			if (_quitRequested)
 				return;
 			delPointer();
 			checkInput();
@@ -288,7 +288,7 @@ void DreamBase::doSaveLoad() {
 		data.byte(kGetback) = 0;
 
 		do {	// wait ops
-			if (data.byte(kQuitrequested)) {
+			if (_quitRequested) {
 				data.byte(kManisoffscreen) = 0;
 				return;
 			}
@@ -376,7 +376,7 @@ void DreamBase::discOps() {
 	};
 
 	do {
-		if (data.byte(kQuitrequested) != 0)
+		if (_quitRequested)
 			return; // quitdiscops
 
 		delPointer();
@@ -637,7 +637,7 @@ void DreamBase::loadOld() {
 
 	doLoad(-1);
 
-	if (data.byte(kGetback) == 4 || quitRequested())
+	if (data.byte(kGetback) == 4 || _quitRequested)
 		return;
 
 	showDecisions();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index ebc2580158..1ef1e5e588 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -527,7 +527,7 @@ void DreamBase::dreamweb() {
 			cls();
 			setMode();
 			decide();
-			if (quitRequested())
+			if (_quitRequested)
 				goto done;
 
 			if (data.byte(kGetback) == 4)
@@ -544,17 +544,17 @@ void DreamBase::dreamweb() {
 			// TODO: In the demo version, titles() did nothing
 			clearPalette();
 			bibleQuote();
-			if (!quitRequested()) // "titlesearly"
+			if (!_quitRequested) // "titlesearly"
 				intro();
 
-			if (quitRequested())
+			if (_quitRequested)
 				goto done;
 
 			// "credits"
 			clearPalette();
 			realCredits();
 
-			if (quitRequested())
+			if (_quitRequested)
 				goto done;
 
 			clearChanges();
@@ -581,13 +581,12 @@ void DreamBase::dreamweb() {
 
 		// main loop
 		while (true) {
-
-			if (quitRequested())
+			if (_quitRequested)
 				goto done;
 
 			screenUpdate();
 
-			if (quitRequested())
+			if (_quitRequested)
 				goto done;
 
 			if (data.byte(kWongame) != 0) {
@@ -645,14 +644,10 @@ done: // The engine will need some cleaner finalization, let's put it here for n
 	engine->freeIcons2();
 }
 
-bool DreamBase::quitRequested() {
-	return data.byte(kQuitrequested);
-}
-
 void DreamBase::screenUpdate() {
 	newPlace();
 	mainScreen();
-	if (quitRequested())
+	if (_quitRequested)
 		return;
 	animPointer();
 
@@ -1742,7 +1737,7 @@ void DreamBase::hangOn(uint16 frameCount) {
 	while (frameCount) {
 		vSync();
 		--frameCount;
-		if (quitRequested())
+		if (_quitRequested)
 			break;
 	}
 }
@@ -1756,7 +1751,7 @@ void DreamBase::hangOnW(uint16 frameCount) {
 		vSync();
 		dumpPointer();
 		--frameCount;
-		if (quitRequested())
+		if (_quitRequested)
 			break;
 	}
 }
@@ -1782,7 +1777,7 @@ void DreamBase::hangOnP(uint16 count) {
 		showPointer();
 		vSync();
 		dumpPointer();
-		if (quitRequested())
+		if (_quitRequested)
 			break;
 		if (data.word(kMousebutton) != 0 && data.word(kMousebutton) != data.word(kOldbutton))
 			break;
@@ -1837,7 +1832,7 @@ void DreamBase::enterSymbol() {
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(symbolList);
-	} while ((data.byte(kGetback) == 0) && !quitRequested());
+	} while ((data.byte(kGetback) == 0) && !_quitRequested);
 	if ((data.byte(kSymbolbotnum) == 3) && (data.byte(kSymboltopnum) == 5)) {
 		removeSetObject(43);
 		placeSetObject(46);
@@ -2529,7 +2524,7 @@ void DreamBase::useMenu() {
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(menuList);
-	} while ((data.byte(kGetback) != 1) && !quitRequested());
+	} while ((data.byte(kGetback) != 1) && !_quitRequested);
 	data.byte(kManisoffscreen) = 0;
 	redrawMainScrn();
 	getRidOfTemp();
@@ -3125,7 +3120,7 @@ void DreamBase::decide() {
 	};
 
 	do {
-		if (data.byte(kQuitrequested) != 0)
+		if (_quitRequested)
 			return;
 
 		readMouse();
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index aacd2d2980..74357f395f 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -57,7 +57,7 @@ void DreamBase::talk() {
 		dumpTextLine();
 		data.byte(kGetback) = 0;
 		checkCoords(talkList);
-		if (data.byte(kQuitrequested))
+		if (_quitRequested)
 			break;
 	} while (!data.byte(kGetback));
 
@@ -216,7 +216,7 @@ bool DreamBase::hangOnPQ() {
 		dumpTextLine();
 		checkCoords(quitList);
 
-		if (data.byte(kGetback) == 1 || data.byte(kQuitrequested)) {
+		if (data.byte(kGetback) == 1 || _quitRequested) {
 			// Quit conversation
 			delPointer();
 			data.byte(kPointermode) = 0;
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index dc76cf30fd..a7d80b8a03 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -199,7 +199,7 @@ void DreamBase::viewFolder() {
 	workToScreenM();
 	data.byte(kGetback) = 0;
 	do {
-		if (quitRequested())
+		if (_quitRequested)
 			break;
 		delPointer();
 		readMouse();
@@ -1288,7 +1288,7 @@ void DreamBase::useDiary() {
 		dumpDiaryKeys();
 		dumpTextLine();
 		checkCoords(diaryList);
-	} while (!data.byte(kGetback) && !quitRequested());
+	} while (!data.byte(kGetback) && !_quitRequested);
 
 
 	getRidOfTemp();
-- 
cgit v1.2.3


From 7db571812ac5786d6e5a676a4b792ff440d79cbe Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Tue, 27 Dec 2011 03:34:54 +0000
Subject: DREAMWEB: Move kSubtitles out of data blob.

---
 engines/dreamweb/dreambase.h  | 1 +
 engines/dreamweb/dreamgen.cpp | 2 +-
 engines/dreamweb/dreamgen.h   | 3 +--
 engines/dreamweb/sound.cpp    | 2 +-
 engines/dreamweb/stubs.cpp    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 6c09d41f1c..23714ad801 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -115,6 +115,7 @@ public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
 
 	bool _quitRequested;
+	bool _subtitles;
 
 	// from backdrop.cpp
 	void doBlocks();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index ce871c4b71..eda7dce35a 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -75,7 +75,7 @@ void DreamGenContext::__start() {
 		//0x0150: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 66c6aef806..b608cfa967 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -307,8 +307,7 @@ static const uint16 kCh1playing = 374;
 static const uint16 kCh1blockstocopy = 375;
 static const uint16 kCurrentsample = 377;
 static const uint16 kRoomssample = 378;
-static const uint16 kSubtitles = 379;
-static const uint16 kForeignrelease = 380;
+static const uint16 kForeignrelease = 379;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index 247935b8f8..289bca9aea 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -204,7 +204,7 @@ bool DreamWebEngine::loadSpeech(const Common::String &filename) {
 }
 
 void DreamWebEngine::soundHandler() {
-	_base.data.byte(DreamGen::kSubtitles) = ConfMan.getBool("subtitles");
+	_base._subtitles = ConfMan.getBool("subtitles");
 	_base.volumeAdjust();
 
 	uint volume = _base.data.byte(DreamGen::kVolume);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 1ef1e5e588..2b9103408a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -893,7 +893,7 @@ void DreamBase::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8
 		// FIXME: This fallthrough does not properly support subtitles+speech
 		// mode. The parameters to setuptimedtemp() are sometimes different
 		// for speech and for subtitles. See e.g., madmantext()
-		if ((data.byte(kSpeechloaded) == 1) && (data.byte(kSubtitles) != 1))
+		if ((data.byte(kSpeechloaded) == 1) && !_subtitles)
 			return;
 	}
 #endif
-- 
cgit v1.2.3


From 52569194347516f855f3d35003949b6557dfa1f2 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Tue, 27 Dec 2011 04:12:16 +0000
Subject: DREAMWEB: Move kSubtitles out of data blob.

---
 engines/dreamweb/dreambase.h  |  1 +
 engines/dreamweb/dreamgen.cpp |  2 +-
 engines/dreamweb/dreamgen.h   |  1 -
 engines/dreamweb/monitor.cpp  |  4 ++--
 engines/dreamweb/newplace.cpp |  4 ++--
 engines/dreamweb/print.cpp    |  2 +-
 engines/dreamweb/sprite.cpp   |  2 +-
 engines/dreamweb/stubs.cpp    | 20 ++++++++++----------
 engines/dreamweb/use.cpp      |  2 +-
 9 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 23714ad801..c9bb2dfd86 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -116,6 +116,7 @@ public:
 
 	bool _quitRequested;
 	bool _subtitles;
+	bool _foreignRelease;
 
 	// from backdrop.cpp
 	void doBlocks();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index eda7dce35a..331122ea05 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -75,7 +75,7 @@ void DreamGenContext::__start() {
 		//0x0150: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index b608cfa967..5a0100dcd9 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -307,7 +307,6 @@ static const uint16 kCh1playing = 374;
 static const uint16 kCh1blockstocopy = 375;
 static const uint16 kCurrentsample = 377;
 static const uint16 kRoomssample = 378;
-static const uint16 kForeignrelease = 379;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 69a46d725f..7419bcfdd8 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -256,7 +256,7 @@ void DreamBase::printCurs() {
 	uint16 x = data.word(kCurslocx);
 	uint16 y = data.word(kCurslocy);
 	uint16 height;
-	if (data.byte(kForeignrelease)) {
+	if (_foreignRelease) {
 		y -= 3;
 		height = 11;
 	} else
@@ -273,7 +273,7 @@ void DreamBase::delCurs() {
 	uint16 y = data.word(kCurslocy);
 	uint16 width = 6;
 	uint16 height;
-	if (data.byte(kForeignrelease)) {
+	if (_foreignRelease) {
 		y -= 3;
 		height = 11;
 	} else
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 3c50eb7b12..8c94b3f9cf 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -117,13 +117,13 @@ void DreamBase::lookAtPlace() {
 	getUnderCentre();
 	showFrame(tempGraphics3(), 60, 72, 0, 0);
 	showFrame(tempGraphics3(), 60, 72 + 55, 4, 0);
-	if (data.byte(kForeignrelease))
+	if (_foreignRelease)
 		showFrame(tempGraphics3(), 60, 72+55+21, 4, 0);
 
 	uint16 offset = kTextstart + getSegment(data.word(kTraveltext)).word(data.byte(kDestpos) * 2);
 	const uint8 *string = getSegment(data.word(kTraveltext)).ptr(offset, 0);
 	findNextColon(&string);
-	uint16 y = (data.byte(kForeignrelease)) ? 84 + 4 : 84;
+	uint16 y = (_foreignRelease) ? 84 + 4 : 84;
 	printDirect(&string, 63, &y, 191, 191 & 1);
 	workToScreenM();
 	hangOnP(500);
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 7bd090d3ee..9cd7b46d50 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -66,7 +66,7 @@ void DreamBase::printChar(const Frame *charSet, uint16* x, uint16 y, uint8 c, ui
 		width = &dummyWidth;
 	if (height == NULL)
 		height = &dummyHeight;
-	if (data.byte(kForeignrelease))
+	if (_foreignRelease)
 		y -= 3;
 	uint16 tmp = c - 32 + data.word(kCharshift);
 	showFrame(charSet, *x, y, tmp & 0x1ff, (tmp >> 8) & 0xfe, width, height);
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index f23804b395..bc2fc60b32 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -809,7 +809,7 @@ void DreamBase::reconstruct() {
 	drawFloor();
 	spriteUpdate();
 	printSprites();
-	if ((data.byte(kForeignrelease) != 0) && (data.byte(kReallocation) == 20))
+	if (_foreignRelease && (data.byte(kReallocation) == 20))
 		underTextLine();
 	data.byte(kHavedoneobs) = 0;
 }
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 2b9103408a..6a7516bf82 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -461,10 +461,10 @@ void DreamBase::dreamweb() {
 	case Common::EN_ANY:
 	case Common::EN_GRB:
 	case Common::EN_USA:
-		// Implicit data.byte(kForeignrelease) = 0
+		_foreignRelease = false;
 		break;
 	default:
-		data.byte(kForeignrelease) = 1;
+		_foreignRelease = true;
 		break;
 	}
 
@@ -816,20 +816,20 @@ void DreamBase::dumpTextLine() {
 	data.byte(kNewtextline) = 0;
 	uint16 x = data.word(kTextaddressx);
 	uint16 y = data.word(kTextaddressy);
-	if (data.byte(kForeignrelease) != 0)
+	if (_foreignRelease)
 		y -= 3;
 	multiDump(x, y, 228, 13);
 }
 
 void DreamBase::getUnderTimed() {
-	if (data.byte(kForeignrelease))
+	if (_foreignRelease)
 		multiGet(_underTimedText, data.byte(kTimedx), data.byte(kTimedy) - 3, 240, kUnderTimedTextSizeY_f);
 	else
 		multiGet(_underTimedText, data.byte(kTimedx), data.byte(kTimedy), 240, kUnderTimedTextSizeY);
 }
 
 void DreamBase::putUnderTimed() {
-	if (data.byte(kForeignrelease))
+	if (_foreignRelease)
 		multiPut(_underTimedText, data.byte(kTimedx), data.byte(kTimedy) - 3, 240, kUnderTimedTextSizeY_f);
 	else
 		multiPut(_underTimedText, data.byte(kTimedx), data.byte(kTimedy), 240, kUnderTimedTextSizeY);
@@ -914,7 +914,7 @@ void DreamBase::dumpTimedText() {
 	if (data.byte(kNeedtodumptimed) != 1)
 		return;
 	uint8 y = data.byte(kTimedy);
-	if (data.byte(kForeignrelease) != 0)
+	if (_foreignRelease)
 		y -= 3;
 
 	multiDump(data.byte(kTimedx), y, 240, kUndertimedysize);
@@ -1122,7 +1122,7 @@ void DreamBase::crosshair() {
 }
 
 void DreamBase::delTextLine() {
-	if (data.byte(kForeignrelease))
+	if (_foreignRelease)
 		multiPut(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy) - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
 	else
 		multiPut(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy), kUnderTextSizeX, kUnderTextSizeY);
@@ -2821,13 +2821,13 @@ void DreamBase::obsThatDoThings() {
 void DreamBase::describeOb() {
 	const uint8 *obText = getObTextStart();
 	uint16 y = 92;
-	if (data.byte(kForeignrelease) && data.byte(kObjecttype) == kSetObjectType1)
+	if (_foreignRelease && data.byte(kObjecttype) == kSetObjectType1)
 		y = 82;
 	data.word(kCharshift) = 91 + 91;
 	printDirect(&obText, 33, &y, 241, 241 & 1);
 	data.word(kCharshift) = 0;
 	y = 104;
-	if (data.byte(kForeignrelease) && data.byte(kObjecttype) == kSetObjectType1)
+	if (_foreignRelease && data.byte(kObjecttype) == kSetObjectType1)
 		y = 94;
 	printDirect(&obText, 36, &y, 241, 241 & 1);
 	obsThatDoThings();
@@ -2972,7 +2972,7 @@ void DreamBase::showDiary() {
 }
 
 void DreamBase::underTextLine() {
-	if (data.byte(kForeignrelease))
+	if (_foreignRelease)
 		multiGet(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy) - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
 	else
 		multiGet(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy), kUnderTextSizeX, kUnderTextSizeY);
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index a7d80b8a03..280d78ba55 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1575,7 +1575,7 @@ void DreamBase::useCashCard() {
 	showPanel();
 	showExit();
 	showMan();
-	uint16 y = (!data.byte(kForeignrelease)) ? 120 : 120 - 3;
+	uint16 y = (!_foreignRelease) ? 120 : 120 - 3;
 	showFrame(tempGraphics(), 114, y, 39, 0);
 	const uint8 *obText = getObTextStart();
 	findNextColon(&obText);
-- 
cgit v1.2.3


From 0155e88d1054301dd2dcbd4d63c1c67f0e9e0f65 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Tue, 27 Dec 2011 04:39:50 +0000
Subject: DREAMWEB: Move kRoomssample out of data blob.

N.B. Last commit was kForeignRelease, not kSubtitles.
---
 engines/dreamweb/dreambase.h  | 2 ++
 engines/dreamweb/dreamgen.cpp | 2 +-
 engines/dreamweb/dreamgen.h   | 1 -
 engines/dreamweb/saveload.cpp | 2 +-
 engines/dreamweb/sound.cpp    | 2 +-
 engines/dreamweb/stubs.cpp    | 4 ++--
 engines/dreamweb/titles.cpp   | 4 ++--
 7 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index c9bb2dfd86..14e3349448 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -118,6 +118,8 @@ public:
 	bool _subtitles;
 	bool _foreignRelease;
 
+	uint8 _roomsSample;
+
 	// from backdrop.cpp
 	void doBlocks();
 	uint8 getXAd(const uint8 *setData, uint8 *result);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 331122ea05..7c4d9baa2b 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -75,7 +75,7 @@ void DreamGenContext::__start() {
 		//0x0150: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 5a0100dcd9..65293fa8f3 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -306,7 +306,6 @@ static const uint16 kCh0repeat = 373;
 static const uint16 kCh1playing = 374;
 static const uint16 kCh1blockstocopy = 375;
 static const uint16 kCurrentsample = 377;
-static const uint16 kRoomssample = 378;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 525c48e4d4..159f8865f0 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -440,7 +440,7 @@ void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 	const Room &currentRoom = g_roomData[data.byte(kLocation)];
 
 	Room madeUpRoom = currentRoom;
-	madeUpRoom.roomsSample = data.byte(kRoomssample);
+	madeUpRoom.roomsSample = _roomsSample;
 	madeUpRoom.mapX = data.byte(kMapx);
 	madeUpRoom.mapY = data.byte(kMapy);
 	madeUpRoom.liftFlag = data.byte(kLiftflag);
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index 289bca9aea..83482194b7 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -97,7 +97,7 @@ void DreamBase::cancelCh1() {
 }
 
 void DreamBase::loadRoomsSample() {
-	uint8 sample = data.byte(kRoomssample);
+	uint8 sample = _roomsSample;
 
 	if (sample == 255 || data.byte(kCurrentsample) == sample)
 		return; // loaded already
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 6a7516bf82..8ad7b3d114 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1034,7 +1034,7 @@ void DreamBase::clearAndLoad(uint16 seg, uint8 c,
 
 void DreamBase::startLoading(const Room &room) {
 	data.byte(kCombatcount) = 0;
-	data.byte(kRoomssample) = room.roomsSample;
+	_roomsSample = room.roomsSample;
 	data.byte(kMapx) = room.mapX;
 	data.byte(kMapy) = room.mapY;
 	data.byte(kLiftflag) = room.liftFlag;
@@ -3159,7 +3159,7 @@ void DreamBase::showGun() {
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 128;
 	hangOn(200);
-	data.byte(kRoomssample) = 34;
+	_roomsSample = 34;
 	loadRoomsSample();
 	data.byte(kVolume) = 0;
 	loadIntoTemp("DREAMWEB.G13");
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index a521036202..ed54c4b09e 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -38,7 +38,7 @@ void DreamBase::endGame() {
 void DreamBase::monkSpeaking() {
 	// FIXME: This is the CD version only.
 
-	data.byte(kRoomssample) = 35;
+	_roomsSample = 35;
 	loadRoomsSample();
 	loadIntoTemp("DREAMWEB.G15");
 	clearWork();
@@ -263,7 +263,7 @@ void DreamBase::set16ColPalette() {
 }
 
 void DreamBase::realCredits() {
-	data.byte(kRoomssample) = 33;
+	_roomsSample = 33;
 	loadRoomsSample();
 	data.byte(kVolume) = 0;
 
-- 
cgit v1.2.3


From ead3089fa2aa0f6743872c891c5eb71db1e640bd Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Tue, 27 Dec 2011 04:59:56 +0000
Subject: DREAMWEB: Move kCurrentsample out of data blob.

---
 engines/dreamweb/dreambase.h  | 1 +
 engines/dreamweb/dreamgen.cpp | 2 +-
 engines/dreamweb/dreamgen.h   | 1 -
 engines/dreamweb/dreamweb.cpp | 2 ++
 engines/dreamweb/sound.cpp    | 4 ++--
 5 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 14e3349448..44d62db9c8 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -119,6 +119,7 @@ public:
 	bool _foreignRelease;
 
 	uint8 _roomsSample;
+	uint8 _currentSample;
 
 	// from backdrop.cpp
 	void doBlocks();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 7c4d9baa2b..2b5c36cb34 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -75,7 +75,7 @@ void DreamGenContext::__start() {
 		//0x0150: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 65293fa8f3..e40acf1e71 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -305,7 +305,6 @@ static const uint16 kCh0playing = 372;
 static const uint16 kCh0repeat = 373;
 static const uint16 kCh1playing = 374;
 static const uint16 kCh1blockstocopy = 375;
-static const uint16 kCurrentsample = 377;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index f1d5c5415c..fa9bece268 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -418,6 +418,8 @@ namespace DreamGen {
 DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) : engine(en) {
 	_openChangeSize = kInventx+(4*kItempicsize);
 	_quitRequested = false;
+
+	_currentSample = 0xff;
 }
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index 83482194b7..e99c7daa43 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -99,12 +99,12 @@ void DreamBase::cancelCh1() {
 void DreamBase::loadRoomsSample() {
 	uint8 sample = _roomsSample;
 
-	if (sample == 255 || data.byte(kCurrentsample) == sample)
+	if (sample == 255 || _currentSample == sample)
 		return; // loaded already
 
 	assert(sample < 100);
 	Common::String sampleName = Common::String::format("DREAMWEB.V%02d", sample);
-	data.byte(kCurrentsample) = sample;
+	_currentSample = sample;
 
 	uint8 ch0 = data.byte(kCh0playing);
 	if (ch0 >= 12 && ch0 != 255)
-- 
cgit v1.2.3


From e63baf15211dd7c1026fd570d0220984dbfdc8eb Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 27 Dec 2011 10:06:19 +0200
Subject: DREAMWEB: Remove unused global variables

---
 engines/dreamweb/dreamgen.cpp |   6 +-
 engines/dreamweb/dreamgen.h   | 213 +++++++++++++++++++++---------------------
 2 files changed, 108 insertions(+), 111 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 2b5c36cb34..ad4b505289 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -67,15 +67,15 @@ void DreamGenContext::__start() {
 		//0x0110: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0120: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0130: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0140: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0150: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0160: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, };
+		0x00, 0xff, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index e40acf1e71..b217b4e683 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -197,114 +197,111 @@ static const uint16 kCharacter = 208;
 static const uint16 kWatchdump = 209;
 static const uint16 kLogonum = 210;
 static const uint16 kOldlogonum = 211;
-static const uint16 kNetseg = 212;
-static const uint16 kNetpoint = 214;
-static const uint16 kCursorstate = 216;
-static const uint16 kPressed = 217;
-static const uint16 kPresspointer = 218;
-static const uint16 kGraphicpress = 220;
-static const uint16 kPresscount = 221;
-static const uint16 kLightcount = 222;
-static const uint16 kFolderpage = 223;
-static const uint16 kDiarypage = 224;
-static const uint16 kMenucount = 225;
-static const uint16 kSymboltopx = 226;
-static const uint16 kSymboltopnum = 227;
-static const uint16 kSymboltopdir = 228;
-static const uint16 kSymbolbotx = 229;
-static const uint16 kSymbolbotnum = 230;
-static const uint16 kSymbolbotdir = 231;
-static const uint16 kDumpx = 232;
-static const uint16 kDumpy = 234;
-static const uint16 kWalkandexam = 236;
-static const uint16 kWalkexamtype = 237;
-static const uint16 kWalkexamnum = 238;
-static const uint16 kCurslocx = 239;
-static const uint16 kCurslocy = 241;
-static const uint16 kCurpos = 243;
-static const uint16 kMonadx = 245;
-static const uint16 kMonady = 247;
-static const uint16 kNumtodo = 249;
-static const uint16 kTimecount = 251;
-static const uint16 kCounttotimed = 253;
-static const uint16 kTimedseg = 255;
-static const uint16 kTimedoffset = 257;
-static const uint16 kTimedy = 259;
-static const uint16 kTimedx = 260;
-static const uint16 kNeedtodumptimed = 261;
-static const uint16 kLoadingorsave = 262;
-static const uint16 kCurrentslot = 263;
-static const uint16 kCursorpos = 264;
-static const uint16 kColourpos = 265;
-static const uint16 kFadedirection = 266;
-static const uint16 kNumtofade = 267;
-static const uint16 kFadecount = 268;
-static const uint16 kAddtogreen = 269;
-static const uint16 kAddtored = 270;
-static const uint16 kAddtoblue = 271;
-static const uint16 kLastsoundreel = 272;
-static const uint16 kSpeechloaded = 274;
-static const uint16 kVolume = 275;
-static const uint16 kVolumeto = 276;
-static const uint16 kVolumedirection = 277;
-static const uint16 kVolumecount = 278;
-static const uint16 kWongame = 279;
-static const uint16 kLasthardkey = 280;
-static const uint16 kBufferin = 281;
-static const uint16 kBufferout = 283;
-static const uint16 kExtras = 285;
-static const uint16 kWorkspace = 287;
-static const uint16 kMapstore = 289;
-static const uint16 kCharset1 = 291;
-static const uint16 kMainsprites = 293;
-static const uint16 kBackdrop = 295;
-static const uint16 kMapdata = 297;
-static const uint16 kSounddata = 299;
-static const uint16 kSounddata2 = 301;
-static const uint16 kRecordspace = 303;
-static const uint16 kFreedat = 305;
-static const uint16 kSetdat = 307;
-static const uint16 kReel1 = 309;
-static const uint16 kReel2 = 311;
-static const uint16 kReel3 = 313;
-static const uint16 kRoomdesc = 315;
-static const uint16 kFreedesc = 317;
-static const uint16 kSetdesc = 319;
-static const uint16 kBlockdesc = 321;
-static const uint16 kSetframes = 323;
-static const uint16 kFreeframes = 325;
-static const uint16 kPeople = 327;
-static const uint16 kReels = 329;
-static const uint16 kCommandtext = 331;
-static const uint16 kPuzzletext = 333;
-static const uint16 kTraveltext = 335;
-static const uint16 kTempgraphics = 337;
-static const uint16 kTempgraphics2 = 339;
-static const uint16 kTempgraphics3 = 341;
-static const uint16 kTempsprites = 343;
-static const uint16 kTextfile1 = 345;
-static const uint16 kTextfile2 = 347;
-static const uint16 kTextfile3 = 349;
-static const uint16 kBlinkframe = 351;
-static const uint16 kBlinkcount = 352;
-static const uint16 kReasseschanges = 353;
-static const uint16 kPointerspath = 354;
-static const uint16 kManspath = 355;
-static const uint16 kPointerfirstpath = 356;
-static const uint16 kFinaldest = 357;
-static const uint16 kDestination = 358;
-static const uint16 kLinestartx = 359;
-static const uint16 kLinestarty = 361;
-static const uint16 kLineendx = 363;
-static const uint16 kLineendy = 365;
-static const uint16 kLinepointer = 367;
-static const uint16 kLinedirection = 368;
-static const uint16 kLinelength = 369;
-static const uint16 kCh0blockstocopy = 370;
-static const uint16 kCh0playing = 372;
-static const uint16 kCh0repeat = 373;
-static const uint16 kCh1playing = 374;
-static const uint16 kCh1blockstocopy = 375;
+static const uint16 kPressed = 212;
+static const uint16 kPresspointer = 213;
+static const uint16 kGraphicpress = 215;
+static const uint16 kPresscount = 216;
+static const uint16 kLightcount = 217;
+static const uint16 kFolderpage = 218;
+static const uint16 kDiarypage = 219;
+static const uint16 kMenucount = 220;
+static const uint16 kSymboltopx = 221;
+static const uint16 kSymboltopnum = 222;
+static const uint16 kSymboltopdir = 223;
+static const uint16 kSymbolbotx = 224;
+static const uint16 kSymbolbotnum = 225;
+static const uint16 kSymbolbotdir = 226;
+static const uint16 kDumpx = 227;
+static const uint16 kDumpy = 229;
+static const uint16 kWalkandexam = 231;
+static const uint16 kWalkexamtype = 232;
+static const uint16 kWalkexamnum = 233;
+static const uint16 kCurslocx = 234;
+static const uint16 kCurslocy = 236;
+static const uint16 kCurpos = 238;
+static const uint16 kMonadx = 240;
+static const uint16 kMonady = 242;
+static const uint16 kNumtodo = 244;
+static const uint16 kTimecount = 246;
+static const uint16 kCounttotimed = 248;
+static const uint16 kTimedseg = 250;
+static const uint16 kTimedoffset = 252;
+static const uint16 kTimedy = 254;
+static const uint16 kTimedx = 255;
+static const uint16 kNeedtodumptimed = 256;
+static const uint16 kLoadingorsave = 257;
+static const uint16 kCurrentslot = 258;
+static const uint16 kCursorpos = 259;
+static const uint16 kColourpos = 260;
+static const uint16 kFadedirection = 261;
+static const uint16 kNumtofade = 262;
+static const uint16 kFadecount = 263;
+static const uint16 kAddtogreen = 264;
+static const uint16 kAddtored = 265;
+static const uint16 kAddtoblue = 266;
+static const uint16 kLastsoundreel = 267;
+static const uint16 kSpeechloaded = 269;
+static const uint16 kVolume = 270;
+static const uint16 kVolumeto = 271;
+static const uint16 kVolumedirection = 272;
+static const uint16 kVolumecount = 273;
+static const uint16 kWongame = 274;
+static const uint16 kLasthardkey = 275;
+static const uint16 kBufferin = 276;
+static const uint16 kBufferout = 278;
+static const uint16 kExtras = 280;
+static const uint16 kWorkspace = 282;
+static const uint16 kMapstore = 284;
+static const uint16 kCharset1 = 286;
+static const uint16 kMainsprites = 288;
+static const uint16 kBackdrop = 290;
+static const uint16 kMapdata = 292;
+static const uint16 kSounddata = 294;
+static const uint16 kSounddata2 = 296;
+static const uint16 kRecordspace = 298;
+static const uint16 kFreedat = 300;
+static const uint16 kSetdat = 302;
+static const uint16 kReel1 = 304;
+static const uint16 kReel2 = 306;
+static const uint16 kReel3 = 308;
+static const uint16 kRoomdesc = 310;
+static const uint16 kFreedesc = 312;
+static const uint16 kSetdesc = 314;
+static const uint16 kBlockdesc = 316;
+static const uint16 kSetframes = 318;
+static const uint16 kFreeframes = 320;
+static const uint16 kPeople = 322;
+static const uint16 kReels = 324;
+static const uint16 kCommandtext = 326;
+static const uint16 kPuzzletext = 328;
+static const uint16 kTraveltext = 330;
+static const uint16 kTempgraphics = 332;
+static const uint16 kTempgraphics2 = 334;
+static const uint16 kTempgraphics3 = 336;
+static const uint16 kTempsprites = 338;
+static const uint16 kTextfile1 = 340;
+static const uint16 kTextfile2 = 342;
+static const uint16 kTextfile3 = 344;
+static const uint16 kBlinkframe = 346;
+static const uint16 kBlinkcount = 347;
+static const uint16 kReasseschanges = 348;
+static const uint16 kPointerspath = 349;
+static const uint16 kManspath = 350;
+static const uint16 kPointerfirstpath = 351;
+static const uint16 kFinaldest = 352;
+static const uint16 kDestination = 353;
+static const uint16 kLinestartx = 354;
+static const uint16 kLinestarty = 356;
+static const uint16 kLineendx = 358;
+static const uint16 kLineendy = 360;
+static const uint16 kLinepointer = 362;
+static const uint16 kLinedirection = 363;
+static const uint16 kLinelength = 364;
+static const uint16 kCh0blockstocopy = 365;
+static const uint16 kCh0playing = 367;
+static const uint16 kCh0repeat = 368;
+static const uint16 kCh1playing = 369;
+static const uint16 kCh1blockstocopy = 370;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
-- 
cgit v1.2.3


From bda312b61b2fa4ce8c7e728f3bf0f603fd839e3d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 27 Dec 2011 10:16:06 +0200
Subject: DREAMWEB: Remove more unused/unnecessary variables

---
 engines/dreamweb/dreamgen.cpp | 4 ++--
 engines/dreamweb/dreamgen.h   | 8 +++-----
 engines/dreamweb/sound.cpp    | 5 -----
 engines/dreamweb/sprite.cpp   | 2 +-
 engines/dreamweb/structs.h    | 8 ++++----
 5 files changed, 10 insertions(+), 17 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index ad4b505289..f3b9851db6 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -73,9 +73,9 @@ void DreamGenContext::__start() {
 		//0x0140: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0150: .... .... .... ....
-		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, 0xff, 
 		//0x0160: .... .... .... ....
-		0x00, 0xff, 0x00, 0x00, };
+		};
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index b217b4e683..e5887c7fde 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -297,11 +297,9 @@ static const uint16 kLineendy = 360;
 static const uint16 kLinepointer = 362;
 static const uint16 kLinedirection = 363;
 static const uint16 kLinelength = 364;
-static const uint16 kCh0blockstocopy = 365;
-static const uint16 kCh0playing = 367;
-static const uint16 kCh0repeat = 368;
-static const uint16 kCh1playing = 369;
-static const uint16 kCh1blockstocopy = 370;
+static const uint16 kCh0playing = 365;
+static const uint16 kCh0repeat = 366;
+static const uint16 kCh1playing = 367;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index e99c7daa43..23a12c2b30 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -65,7 +65,6 @@ void DreamBase::playChannel0(uint8 index, uint8 repeat) {
 		soundBank = (Sound *)getSegment(data.word(kSounddata)).ptr(0, 0);
 
 	data.byte(kCh0repeat) = repeat;
-	data.word(kCh0blockstocopy) = soundBank[index].blockCount();
 }
 
 void DreamBase::playChannel1(uint8 index) {
@@ -79,19 +78,15 @@ void DreamBase::playChannel1(uint8 index) {
 		index -= 12;
 	} else
 		soundBank = (Sound *)getSegment(data.word(kSounddata)).ptr(0, 0);
-
-	data.word(kCh1blockstocopy) = soundBank[index].blockCount();
 }
 
 void DreamBase::cancelCh0() {
 	data.byte(kCh0repeat) = 0;
-	data.word(kCh0blockstocopy) = 0;
 	data.byte(kCh0playing) = 255;
 	engine->stopSound(0);
 }
 
 void DreamBase::cancelCh1() {
-	data.word(kCh1blockstocopy) = 0;
 	data.byte(kCh1playing) = 255;
 	engine->stopSound(1);
 }
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index bc2fc60b32..2cb57bd324 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -497,7 +497,7 @@ void DreamBase::showRain() {
 		}
 	}
 
-	if (data.word(kCh1blockstocopy) != 0)
+	if (data.word(kCh1playing) != 255)
 		return;
 	if (data.byte(kReallocation) == 2 && data.byte(kBeenmugged) != 1)
 		return;
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index fdc84536c0..7a9db54051 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -244,10 +244,10 @@ struct Sound {
 	uint8 w1_hi;
 	uint16 offset() const { return READ_LE_UINT16(&w1_lo); }
 	void setOffset(uint16 v) { WRITE_LE_UINT16(&w1_lo, v); }
-	uint8 w3_lo;
-	uint8 w3_hi;
-	uint16 blockCount() const { return READ_LE_UINT16(&w3_lo); }
-	void setBlockCount(uint16 v) { WRITE_LE_UINT16(&w3_lo, v); }
+	uint8 w3_lo;	// block count (low byte) - unused in ScummVM
+	uint8 w3_hi;	// block count (high byte) - unused in ScummVM
+	//uint16 blockCount() const { return READ_LE_UINT16(&w3_lo); }
+	//void setBlockCount(uint16 v) { WRITE_LE_UINT16(&w3_lo, v); }
 	uint8 b5;
 };
 
-- 
cgit v1.2.3


From 51d0a07902fa994f929d3dd9350a2ecd40330823 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 27 Dec 2011 10:43:10 +0200
Subject: DREAMWEB: Fix a regression in showRain()

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

(limited to 'engines')

diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 2cb57bd324..3c1ba6be2f 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -497,7 +497,7 @@ void DreamBase::showRain() {
 		}
 	}
 
-	if (data.word(kCh1playing) != 255)
+	if (data.byte(kCh1playing) != 255)
 		return;
 	if (data.byte(kReallocation) == 2 && data.byte(kBeenmugged) != 1)
 		return;
-- 
cgit v1.2.3


From 4c9a6006180c5fc8df1887b96cea2eacc321bc73 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 27 Dec 2011 10:43:44 +0200
Subject: DREAMWEB: Remove dead code

---
 engines/dreamweb/dreamgen.cpp |  8 ++--
 engines/dreamweb/dreamgen.h   | 86 +++++++++++++++++++++----------------------
 engines/dreamweb/sound.cpp    | 12 +-----
 engines/dreamweb/structs.h    | 12 ------
 engines/dreamweb/stubs.cpp    |  2 -
 5 files changed, 47 insertions(+), 73 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index f3b9851db6..777961fcef 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -65,17 +65,15 @@ void DreamGenContext::__start() {
 		//0x0100: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0110: .... .... .... ....
-		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, 0xff, 0xff, 0xff, 0xff, 
 		//0x0120: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0130: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0140: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0150: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
-		//0x0160: .... .... .... ....
-		};
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index e5887c7fde..b736c3c9cb 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -256,50 +256,48 @@ static const uint16 kCharset1 = 286;
 static const uint16 kMainsprites = 288;
 static const uint16 kBackdrop = 290;
 static const uint16 kMapdata = 292;
-static const uint16 kSounddata = 294;
-static const uint16 kSounddata2 = 296;
-static const uint16 kRecordspace = 298;
-static const uint16 kFreedat = 300;
-static const uint16 kSetdat = 302;
-static const uint16 kReel1 = 304;
-static const uint16 kReel2 = 306;
-static const uint16 kReel3 = 308;
-static const uint16 kRoomdesc = 310;
-static const uint16 kFreedesc = 312;
-static const uint16 kSetdesc = 314;
-static const uint16 kBlockdesc = 316;
-static const uint16 kSetframes = 318;
-static const uint16 kFreeframes = 320;
-static const uint16 kPeople = 322;
-static const uint16 kReels = 324;
-static const uint16 kCommandtext = 326;
-static const uint16 kPuzzletext = 328;
-static const uint16 kTraveltext = 330;
-static const uint16 kTempgraphics = 332;
-static const uint16 kTempgraphics2 = 334;
-static const uint16 kTempgraphics3 = 336;
-static const uint16 kTempsprites = 338;
-static const uint16 kTextfile1 = 340;
-static const uint16 kTextfile2 = 342;
-static const uint16 kTextfile3 = 344;
-static const uint16 kBlinkframe = 346;
-static const uint16 kBlinkcount = 347;
-static const uint16 kReasseschanges = 348;
-static const uint16 kPointerspath = 349;
-static const uint16 kManspath = 350;
-static const uint16 kPointerfirstpath = 351;
-static const uint16 kFinaldest = 352;
-static const uint16 kDestination = 353;
-static const uint16 kLinestartx = 354;
-static const uint16 kLinestarty = 356;
-static const uint16 kLineendx = 358;
-static const uint16 kLineendy = 360;
-static const uint16 kLinepointer = 362;
-static const uint16 kLinedirection = 363;
-static const uint16 kLinelength = 364;
-static const uint16 kCh0playing = 365;
-static const uint16 kCh0repeat = 366;
-static const uint16 kCh1playing = 367;
+static const uint16 kRecordspace = 294;
+static const uint16 kFreedat = 296;
+static const uint16 kSetdat = 298;
+static const uint16 kReel1 = 300;
+static const uint16 kReel2 = 302;
+static const uint16 kReel3 = 304;
+static const uint16 kRoomdesc = 306;
+static const uint16 kFreedesc = 308;
+static const uint16 kSetdesc = 310;
+static const uint16 kBlockdesc = 312;
+static const uint16 kSetframes = 314;
+static const uint16 kFreeframes = 316;
+static const uint16 kPeople = 318;
+static const uint16 kReels = 320;
+static const uint16 kCommandtext = 322;
+static const uint16 kPuzzletext = 324;
+static const uint16 kTraveltext = 326;
+static const uint16 kTempgraphics = 328;
+static const uint16 kTempgraphics2 = 330;
+static const uint16 kTempgraphics3 = 332;
+static const uint16 kTempsprites = 334;
+static const uint16 kTextfile1 = 336;
+static const uint16 kTextfile2 = 338;
+static const uint16 kTextfile3 = 340;
+static const uint16 kBlinkframe = 342;
+static const uint16 kBlinkcount = 343;
+static const uint16 kReasseschanges = 344;
+static const uint16 kPointerspath = 345;
+static const uint16 kManspath = 346;
+static const uint16 kPointerfirstpath = 347;
+static const uint16 kFinaldest = 348;
+static const uint16 kDestination = 349;
+static const uint16 kLinestartx = 350;
+static const uint16 kLinestarty = 352;
+static const uint16 kLineendx = 354;
+static const uint16 kLineendy = 356;
+static const uint16 kLinepointer = 358;
+static const uint16 kLinedirection = 359;
+static const uint16 kLinelength = 360;
+static const uint16 kCh0playing = 361;
+static const uint16 kCh0repeat = 362;
+static const uint16 kCh1playing = 363;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index 23a12c2b30..1eefedaae2 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -57,12 +57,8 @@ void DreamBase::volumeAdjust() {
 
 void DreamBase::playChannel0(uint8 index, uint8 repeat) {
 	data.byte(kCh0playing) = index;
-	Sound *soundBank;
-	if (index >= 12) {
-		soundBank = (Sound *)getSegment(data.word(kSounddata2)).ptr(0, 0);
+	if (index >= 12)
 		index -= 12;
-	} else
-		soundBank = (Sound *)getSegment(data.word(kSounddata)).ptr(0, 0);
 
 	data.byte(kCh0repeat) = repeat;
 }
@@ -72,12 +68,8 @@ void DreamBase::playChannel1(uint8 index) {
 		return;
 
 	data.byte(kCh1playing) = index;
-	Sound *soundBank;
-	if (index >= 12) {
-		soundBank = (Sound *)getSegment(data.word(kSounddata2)).ptr(0, 0);
+	if (index >= 12)
 		index -= 12;
-	} else
-		soundBank = (Sound *)getSegment(data.word(kSounddata)).ptr(0, 0);
 }
 
 void DreamBase::cancelCh0() {
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 7a9db54051..af8b3e9f00 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -239,18 +239,6 @@ struct RoomPaths {
 	PathSegment segments[24];
 };
 
-struct Sound {
-	uint8 w1_lo;
-	uint8 w1_hi;
-	uint16 offset() const { return READ_LE_UINT16(&w1_lo); }
-	void setOffset(uint16 v) { WRITE_LE_UINT16(&w1_lo, v); }
-	uint8 w3_lo;	// block count (low byte) - unused in ScummVM
-	uint8 w3_hi;	// block count (high byte) - unused in ScummVM
-	//uint16 blockCount() const { return READ_LE_UINT16(&w3_lo); }
-	//void setBlockCount(uint16 v) { WRITE_LE_UINT16(&w3_lo, v); }
-	uint8 b5;
-};
-
 struct FileHeader {
 	char _desc[50];
 	uint16 _len[20];
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 8ad7b3d114..1392d16dd7 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2465,8 +2465,6 @@ void DreamBase::allocateBuffers() {
 	data.word(kFreedat) = allocateMem(kFreedatlen/16);
 	data.word(kSetdat) = allocateMem(kSetdatlen/16);
 	data.word(kMapstore) = allocateMem(kLenofmapstore/16);
-	data.word(kSounddata) = allocateMem(2048/16);
-	data.word(kSounddata2) = allocateMem(2048/16);
 }
 
 void DreamBase::workToScreenM() {
-- 
cgit v1.2.3


From 5c6e1f168ca9ce975cf1bd321d3dfcc75334751f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 27 Dec 2011 20:13:50 +1100
Subject: TSAGE: Centralised all the setDetails methods in the various games

This puts them all in the common SceneHotspot class, rather than each game having their own repeated implementations of them.
---
 engines/tsage/blue_force/blueforce_logic.cpp  | 81 ---------------------------
 engines/tsage/blue_force/blueforce_logic.h    |  6 --
 engines/tsage/core.cpp                        | 29 ++++++++++
 engines/tsage/core.h                          |  2 +
 engines/tsage/ringworld/ringworld_logic.cpp   | 52 -----------------
 engines/tsage/ringworld/ringworld_logic.h     |  3 -
 engines/tsage/ringworld2/ringworld2_logic.cpp | 29 ----------
 engines/tsage/ringworld2/ringworld2_logic.h   |  3 -
 8 files changed, 31 insertions(+), 174 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index 91cba43e1d..eef48ad58e 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -553,35 +553,6 @@ bool NamedObject::startAction(CursorType action, Event &event) {
 	return handled;
 }
 
-void NamedObject::setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item) {
-	_resNum = resNum;
-	_lookLineNum = lookLineNum;
-	_talkLineNum = talkLineNum;
-	_useLineNum = useLineNum;
-
-	switch (mode) {
-	case 2:
-		g_globals->_sceneItems.push_front(this);
-		break;
-	case 4:
-		g_globals->_sceneItems.addBefore(item, this);
-		break;
-	case 5:
-		g_globals->_sceneItems.addAfter(item, this);
-		break;
-	default:
-		g_globals->_sceneItems.push_back(this);
-		break;
-	}
-}
-
-void NamedObject::setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
-	_resNum = resNum;
-	_lookLineNum = lookLineNum;
-	_talkLineNum = talkLineNum;
-	_useLineNum = useLineNum;
-}
-
 /*--------------------------------------------------------------------------*/
 
 CountdownObject::CountdownObject(): NamedObject() {
@@ -1397,58 +1368,6 @@ bool NamedHotspot::startAction(CursorType action, Event &event) {
 	}
 }
 
-void NamedHotspot::setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum) {
-	setBounds(ys, xe, ye, xs);
-	_resNum = resnum;
-	_lookLineNum = lookLineNum;
-	_useLineNum = useLineNum;
-	_talkLineNum = -1;
-	g_globals->_sceneItems.addItems(this, NULL);
-}
-
-void NamedHotspot::setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item) {
-	setBounds(bounds);
-	_resNum = resNum;
-	_lookLineNum = lookLineNum;
-	_talkLineNum = talkLineNum;
-	_useLineNum = useLineNum;
-
-	switch (mode) {
-	case 2:
-		g_globals->_sceneItems.push_front(this);
-		break;
-	case 4:
-		g_globals->_sceneItems.addBefore(item, this);
-		break;
-	case 5:
-		g_globals->_sceneItems.addAfter(item, this);
-		break;
-	default:
-		g_globals->_sceneItems.push_back(this);
-		break;
-	}
-}
-
-void NamedHotspot::setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode) {
-	_sceneRegionId = sceneRegionId;
-	_resNum = resNum;
-	_lookLineNum = lookLineNum;
-	_talkLineNum = talkLineNum;
-	_useLineNum = useLineNum;
-
-	// Handle adding hotspot to scene items list as necessary
-	switch (mode) {
-	case 2:
-		GLOBALS._sceneItems.push_front(this);
-		break;
-	case 3:
-		break;
-	default:
-		GLOBALS._sceneItems.push_back(this);
-		break;
-	}
-}
-
 void NamedHotspot::synchronize(Serializer &s) {
 	SceneHotspot::synchronize(s);
 	s.syncAsSint16LE(_resNum);
diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h
index 65cea8efae..04c6e9bdc2 100644
--- a/engines/tsage/blue_force/blueforce_logic.h
+++ b/engines/tsage/blue_force/blueforce_logic.h
@@ -126,9 +126,6 @@ public:
 	virtual void synchronize(Serializer &s);
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual bool startAction(CursorType action, Event &event);
-
-	void setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
-	void setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
 };
 
 class NamedObjectExt: public NamedObject {
@@ -343,9 +340,6 @@ public:
 	virtual bool startAction(CursorType action, Event &event);
 	virtual Common::String getClassName() { return "NamedHotspot"; }
 	virtual void synchronize(Serializer &s);
-	virtual void setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum);
-	virtual void setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
-	virtual void setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode);
 };
 
 class NamedHotspotExt : public NamedHotspot {
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index f894d2d33a..33badf389b 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1905,6 +1905,35 @@ void SceneHotspot::setDetails(int sceneRegionId, int resNum, int lookLineNum, in
 	}
 }
 
+void SceneHotspot::setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item) {
+	_resNum = resNum;
+	_lookLineNum = lookLineNum;
+	_talkLineNum = talkLineNum;
+	_useLineNum = useLineNum;
+
+	switch (mode) {
+	case 2:
+		g_globals->_sceneItems.push_front(this);
+		break;
+	case 4:
+		g_globals->_sceneItems.addBefore(item, this);
+		break;
+	case 5:
+		g_globals->_sceneItems.addAfter(item, this);
+		break;
+	default:
+		g_globals->_sceneItems.push_back(this);
+		break;
+	}
+}
+
+void SceneHotspot::setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
+	_resNum = resNum;
+	_lookLineNum = lookLineNum;
+	_talkLineNum = talkLineNum;
+	_useLineNum = useLineNum;
+}
+
 /*--------------------------------------------------------------------------*/
 
 void SceneObjectWrapper::setSceneObject(SceneObject *so) {
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index bd27a942a4..c04045e83a 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -454,6 +454,8 @@ public:
 	virtual void setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum);
 	virtual void setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
 	virtual void setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode = 0);
+	virtual void setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
+	virtual void setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
 };
 
 enum AnimateMode {ANIM_MODE_NONE = 0, ANIM_MODE_1 = 1, ANIM_MODE_2 = 2, ANIM_MODE_3 = 3,
diff --git a/engines/tsage/ringworld/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index 2497327a01..2ee4f99267 100644
--- a/engines/tsage/ringworld/ringworld_logic.cpp
+++ b/engines/tsage/ringworld/ringworld_logic.cpp
@@ -626,58 +626,6 @@ void NamedHotspot::doAction(int action) {
 	SceneHotspot::doAction(action);
 }
 
-void NamedHotspot::setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum) {
-	setBounds(ys, xe, ye, xs);
-	_resNum = resnum;
-	_lookLineNum = lookLineNum;
-	_useLineNum = useLineNum;
-	_talkLineNum = -1;
-	g_globals->_sceneItems.addItems(this, NULL);
-}
-
-void NamedHotspot::setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item) {
-	setBounds(bounds);
-	_resNum = resNum;
-	_lookLineNum = lookLineNum;
-	_talkLineNum = talkLineNum;
-	_useLineNum = useLineNum;
-
-	switch (mode) {
-	case 2:
-		g_globals->_sceneItems.push_front(this);
-		break;
-	case 4:
-		g_globals->_sceneItems.addBefore(item, this);
-		break;
-	case 5:
-		g_globals->_sceneItems.addAfter(item, this);
-		break;
-	default:
-		g_globals->_sceneItems.push_back(this);
-		break;
-	}
-}
-
-void NamedHotspot::setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode) {
-	_sceneRegionId = sceneRegionId;
-	_resNum = resNum;
-	_lookLineNum = lookLineNum;
-	_talkLineNum = talkLineNum;
-	_useLineNum = useLineNum;
-
-	// Handle adding hotspot to scene items list as necessary
-	switch (mode) {
-	case 2:
-		GLOBALS._sceneItems.push_front(this);
-		break;
-	case 3:
-		break;
-	default:
-		GLOBALS._sceneItems.push_back(this);
-		break;
-	}
-}
-
 void NamedHotspot::synchronize(Serializer &s) {
 	SceneHotspot::synchronize(s);
 	s.syncAsSint16LE(_resNum);
diff --git a/engines/tsage/ringworld/ringworld_logic.h b/engines/tsage/ringworld/ringworld_logic.h
index b3f103f293..e902ac127f 100644
--- a/engines/tsage/ringworld/ringworld_logic.h
+++ b/engines/tsage/ringworld/ringworld_logic.h
@@ -166,9 +166,6 @@ public:
 	virtual void doAction(int action);
 	virtual Common::String getClassName() { return "NamedHotspot"; }
 	virtual void synchronize(Serializer &s);
-	virtual void setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum);
-	virtual void setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
-	virtual void setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode);
 };
 
 class NamedHotspotExt : public NamedHotspot {
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 4462122a4d..dfa135be6c 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -936,35 +936,6 @@ bool SceneActor::startAction(CursorType action, Event &event) {
 	return handled;
 }
 
-void SceneActor::setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item) {
-	_resNum = resNum;
-	_lookLineNum = lookLineNum;
-	_talkLineNum = talkLineNum;
-	_useLineNum = useLineNum;
-
-	switch (mode) {
-	case 2:
-		g_globals->_sceneItems.push_front(this);
-		break;
-	case 4:
-		g_globals->_sceneItems.addBefore(item, this);
-		break;
-	case 5:
-		g_globals->_sceneItems.addAfter(item, this);
-		break;
-	default:
-		g_globals->_sceneItems.push_back(this);
-		break;
-	}
-}
-
-void SceneActor::setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
-	_resNum = resNum;
-	_lookLineNum = lookLineNum;
-	_talkLineNum = talkLineNum;
-	_useLineNum = useLineNum;
-}
-
 /*--------------------------------------------------------------------------*/
 
 SceneArea::SceneArea(): EventHandler() {
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 67346bcc80..2d7a81cd2f 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -260,9 +260,6 @@ public:
 	virtual void synchronize(Serializer &s);
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual bool startAction(CursorType action, Event &event);
-
-	void setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
-	void setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
 };
 
 class SceneActorExt: public SceneActor {
-- 
cgit v1.2.3


From fb67e4ab1145fef48fe88ca85c04d8035806eff0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 27 Dec 2011 20:16:37 +1100
Subject: TSAGE: Ensure correct setDetails version is called in R2R
 Scene825::Button::setButton

---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index a58740394b..225e4f3e0b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -3265,7 +3265,7 @@ void Scene825::Button::setButton(int buttonId) {
 		break;
 	}
 
-	setDetails(825, 6, 7, -1, 2, NULL);
+	setDetails(825, 6, 7, -1, 2, (SceneItem *)NULL);
 }
 
 void Scene825::Button::setText(int textId) {
-- 
cgit v1.2.3


From 364bc93918c2e21c9b45c6229e2dbae1487f4a18 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 27 Dec 2011 20:24:53 +1100
Subject: TSAGE: Change R2R AUTODOC_ITEMS to truly be a constant array.

Hopefully this will stop it being a globally constructed object.
---
 engines/tsage/staticres.cpp | 2 +-
 engines/tsage/staticres.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index 3be719887f..c7ec1c579a 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -205,7 +205,7 @@ const char *ACCESS_CODE_REQUIRED = "access code required";
 const char *INVALID_ACCESS_CODE = "invalid access code";
 const char *FOREIGN_OBJECT_EXTRACTED = "foreign object extracted";
 
-const char *AUTODOC_ITEMS[11] = { 
+const char *const AUTODOC_ITEMS[11] = { 
 	MAIN_MENU, DIAGNOSIS, ADVANCED_PROCEDURES, VITAL_SIGNS, OPEN_DOOR, TREATMENTS,
 	NO_MALADY_DETECTED, NO_TREATMENT_REQUIRED, ACCESS_CODE_REQUIRED, INVALID_ACCESS_CODE,
 	FOREIGN_OBJECT_EXTRACTED
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index e2afb65b34..eee6a29a99 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -161,7 +161,7 @@ extern const char *NO_TREATMENT_REQUIRED;
 extern const char *ACCESS_CODE_REQUIRED;
 extern const char *INVALID_ACCESS_CODE;
 extern const char *FOREIGN_OBJECT_EXTRACTED;
-extern const char *AUTODOC_ITEMS[11];
+extern const char *const AUTODOC_ITEMS[11];
 
 // Dialog messages
 extern const char *HELP_MSG;
-- 
cgit v1.2.3


From 9fdba870c92c50ba828b9a70ade377c683549d9f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 27 Dec 2011 20:39:04 +1100
Subject: TSAGE: Moved the R2R AUTODOC_ITEMS array to be part of the scene 825.

Since this is the only scene that uses it, it makes as much sense to have it as part of the scene than part of the staticres file.
---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 17 ++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  1 +
 engines/tsage/staticres.cpp                     |  7 -------
 engines/tsage/staticres.h                       |  1 -
 4 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 225e4f3e0b..9eb3e2b713 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -3269,18 +3269,33 @@ void Scene825::Button::setButton(int buttonId) {
 }
 
 void Scene825::Button::setText(int textId) {
+	Scene825 *scene = (Scene825 *)R2_GLOBALS._sceneManager._scene;
+
 	_buttonId = textId;
 	_lookLineNum = textId;
 
 	_sceneText.remove();
 	if (_buttonId != 0)
-		_sceneText.setup(AUTODOC_ITEMS[textId - 1]);
+		_sceneText.setup(scene->_autodocItems[textId - 1]);
 }
 
 /*--------------------------------------------------------------------------*/
 
 Scene825::Scene825(): SceneExt() {
 	_menuId = _frame1 = _frame2 = 0;
+
+	// Setup Autodoc items list
+	_autodocItems[0] = MAIN_MENU;
+	_autodocItems[1] = DIAGNOSIS;
+	_autodocItems[2] = ADVANCED_PROCEDURES;
+	_autodocItems[3] = VITAL_SIGNS;
+	_autodocItems[4] = OPEN_DOOR;
+	_autodocItems[5] = TREATMENTS;
+	_autodocItems[6] = NO_MALADY_DETECTED;
+	_autodocItems[7] = NO_TREATMENT_REQUIRED;
+	_autodocItems[8] = ACCESS_CODE_REQUIRED;
+	_autodocItems[9] = INVALID_ACCESS_CODE;
+	_autodocItems[10] = FOREIGN_OBJECT_EXTRACTED;
 }
 
 void Scene825::postInit(SceneObjectList *OwnerList) {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 7a36b8f15f..8ee8c09873 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -443,6 +443,7 @@ public:
 	SequenceManager _sequenceManager1;
 	SceneText _sceneText;
 	int _menuId, _frame1, _frame2;
+	const char *_autodocItems[11];
 public:
 	Scene825();
 	virtual void synchronize(Serializer &s);
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index c7ec1c579a..1f963f13fb 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -205,13 +205,6 @@ const char *ACCESS_CODE_REQUIRED = "access code required";
 const char *INVALID_ACCESS_CODE = "invalid access code";
 const char *FOREIGN_OBJECT_EXTRACTED = "foreign object extracted";
 
-const char *const AUTODOC_ITEMS[11] = { 
-	MAIN_MENU, DIAGNOSIS, ADVANCED_PROCEDURES, VITAL_SIGNS, OPEN_DOOR, TREATMENTS,
-	NO_MALADY_DETECTED, NO_TREATMENT_REQUIRED, ACCESS_CODE_REQUIRED, INVALID_ACCESS_CODE,
-	FOREIGN_OBJECT_EXTRACTED
-};
-	
-
 const char *HELP_MSG = "\x1\rRETURN TO\r RINGWORLD\x14";
 const char *CHAR_TITLE = "\x01Select Character:";
 const char *CHAR_QUINN_MSG = "  Quinn  ";
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index eee6a29a99..90f5d3687f 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -161,7 +161,6 @@ extern const char *NO_TREATMENT_REQUIRED;
 extern const char *ACCESS_CODE_REQUIRED;
 extern const char *INVALID_ACCESS_CODE;
 extern const char *FOREIGN_OBJECT_EXTRACTED;
-extern const char *const AUTODOC_ITEMS[11];
 
 // Dialog messages
 extern const char *HELP_MSG;
-- 
cgit v1.2.3


From 539a42d2efc46c629ecc9849e8029d9cf0796598 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 27 Dec 2011 20:44:56 +1100
Subject: TSAGE: Add explicit prefixes to NULL's used in various setDetails
 calls

---
 engines/tsage/blue_force/blueforce_scenes1.cpp | 14 ++++++------
 engines/tsage/blue_force/blueforce_scenes2.cpp | 30 +++++++++++++-------------
 2 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index f17f2d7c83..c067cd87ea 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -921,7 +921,7 @@ void Scene114::postInit(SceneObjectList *OwnerList) {
 	_lyle._moveDiff.x = 2;
 	_lyle._moveDiff.y = 1;
 	_lyle.hide();
-	_lyle.setDetails(114, 2, -1, -1, 1, NULL);
+	_lyle.setDetails(114, 2, -1, -1, 1, (SceneItem *)NULL);
 
 	_vechile.postInit();
 	if (BF_GLOBALS.getFlag(fWithLyle)) {
@@ -962,7 +962,7 @@ void Scene114::postInit(SceneObjectList *OwnerList) {
 		BF_GLOBALS._player.enableControl();
 	}
 
-	_item1.setDetails(Rect(0, 0, 320, 200), 114, 3, -1, -1, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 320, 200), 114, 3, -1, -1, 1, (SceneItem *)NULL);
 }
 
 void Scene114::signal() {
@@ -2830,7 +2830,7 @@ void Scene180::postInit(SceneObjectList *OwnerList) {
 		_vechile.setStrip(2);
 		_vechile.setPosition(Common::Point(262, 131));
 		_vechile.setZoom(65);
-		_vechile.setDetails(180, 33, 34, 35, 1, NULL);
+		_vechile.setDetails(180, 33, 34, 35, 1, (SceneItem *)NULL);
 
 		_object1.postInit();
 		_object1.setVisage(182);
@@ -2845,7 +2845,7 @@ void Scene180::postInit(SceneObjectList *OwnerList) {
 		BF_GLOBALS._player.disableControl();
 
 		_vechile.postInit();
-		_vechile.setDetails(180, 33, 34, 35, 1, NULL);
+		_vechile.setDetails(180, 33, 34, 35, 1, (SceneItem *)NULL);
 
 		_object1.postInit();
 
@@ -2997,7 +2997,7 @@ void Scene180::signal() {
 		BF_GLOBALS._player.disableControl();
 
 		_vechile.postInit();
-		_vechile.setDetails(180, 33, 34, 35, 1, NULL);
+		_vechile.setDetails(180, 33, 34, 35, 1, (SceneItem *)NULL);
 
 		_object1.postInit();
 		_sceneMode = 1801;
@@ -3249,7 +3249,7 @@ void Scene190::postInit(SceneObjectList *OwnerList) {
 	_flag.fixPriority(200);
 	_flag.setPosition(Common::Point(170, 31));
 	_flag.animate(ANIM_MODE_7, 0, NULL);
-	_flag.setDetails(190, 8, 26, 19, 1, NULL);
+	_flag.setDetails(190, 8, 26, 19, 1, (SceneItem *)NULL);
 
 	_fieldB52 = true;
 
@@ -3263,7 +3263,7 @@ void Scene190::postInit(SceneObjectList *OwnerList) {
 		_lyleCar.setVisage(444);
 		_lyleCar.setFrame(2);
 		_lyleCar.setPosition(Common::Point(54, 114));
-		_lyleCar.setDetails(190, -1, -1, -1, 1, NULL);
+		_lyleCar.setDetails(190, -1, -1, -1, 1, (SceneItem *)NULL);
 
 		switch (BF_GLOBALS._sceneManager._previousScene) {
 		case 300: {
diff --git a/engines/tsage/blue_force/blueforce_scenes2.cpp b/engines/tsage/blue_force/blueforce_scenes2.cpp
index 5a181af927..340baae6a9 100644
--- a/engines/tsage/blue_force/blueforce_scenes2.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes2.cpp
@@ -983,17 +983,17 @@ void Scene270::postInit(SceneObjectList *OwnerList) {
 	_fireplace.animate(ANIM_MODE_2, NULL);
 
 	_fridge.setDetails(Rect(0, 56, 56, 130), 270, 9, 10, 11, 1, NULL);
-	_object3.setDetails(270, 12, 13, 14, 1, NULL);
-	_laura.setDetails(270, 15, -1, -1, 1, NULL);
-	_skip.setDetails(270, 14, -1, -1, 1, NULL);
-	_lyle.setDetails(270, 34, 35, 36, 1, NULL);
-	_tv.setDetails(270, 3, 4, 5, 1, NULL);
-	_fireplace.setDetails(270, 6, 7, 8, 1, NULL);
+	_object3.setDetails(270, 12, 13, 14, 1, (SceneItem *)NULL);
+	_laura.setDetails(270, 15, -1, -1, 1, (SceneItem *)NULL);
+	_skip.setDetails(270, 14, -1, -1, 1, (SceneItem *)NULL);
+	_lyle.setDetails(270, 34, 35, 36, 1, (SceneItem *)NULL);
+	_tv.setDetails(270, 3, 4, 5, 1, (SceneItem *)NULL);
+	_fireplace.setDetails(270, 6, 7, 8, 1, (SceneItem *)NULL);
 
 	if ((BF_GLOBALS._sceneManager._previousScene == 710) && (BF_GLOBALS._bookmark == bTalkedToGrannyAboutSkipsCard)) {
-		_grandma.setDetails(270, 15, 16, 17, 1, NULL);
+		_grandma.setDetails(270, 15, 16, 17, 1, (SceneItem *)NULL);
 	} else {
-		_grandma.setDetails(270, 40, 16, 17, 1, NULL);
+		_grandma.setDetails(270, 40, 16, 17, 1, (SceneItem *)NULL);
 	}
 
 	_afgan.setDetails(4, 270, 27, 28, 29, 1);
@@ -1420,13 +1420,13 @@ void Scene271::postInit(SceneObjectList *OwnerList) {
 	_object5.hide();
 
 	_item5.setDetails(Rect(0, 56, 56, 130), 270, 9, 10, 11, 1, NULL);
-	_object6.setDetails(270, 12, 13, 14, 1, NULL);
-	_object7.setDetails(270, 15, -1, -1, 1, NULL);
-	_object8.setDetails(270, 14, -1, -1, 1, NULL);
-	_object11.setDetails(270, -1, -1, -1, 1, NULL);
-	_tv.setDetails(270, 3, 4, 5, 1, NULL);
-	_object10.setDetails(270, 6, 7, 8, 1, NULL);
-	_object12.setDetails(270, 15, 16, 17, 1, NULL);
+	_object6.setDetails(270, 12, 13, 14, 1, (SceneItem *)NULL);
+	_object7.setDetails(270, 15, -1, -1, 1, (SceneItem *)NULL);
+	_object8.setDetails(270, 14, -1, -1, 1, (SceneItem *)NULL);
+	_object11.setDetails(270, -1, -1, -1, 1, (SceneItem *)NULL);
+	_tv.setDetails(270, 3, 4, 5, 1, (SceneItem *)NULL);
+	_object10.setDetails(270, 6, 7, 8, 1, (SceneItem *)NULL);
+	_object12.setDetails(270, 15, 16, 17, 1, (SceneItem *)NULL);
 	_item3.setDetails(4, 270, 27, 28, 29, 1);
 	_item1.setDetails(1, 270, 18, 19, 20, 1);
 	_item6.setDetails(Rect(278, 50, 318, 72), 270, 21, 22, 23, 1, NULL);
-- 
cgit v1.2.3


From 5d195fe3294e782259922425ffac445cf15ab87c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 27 Dec 2011 20:57:50 +1100
Subject: TSAGE: Added explicit prefixes to more NULL's used in setDetails
 calls

---
 engines/tsage/blue_force/blueforce_scenes3.cpp | 46 +++++++++++++-------------
 engines/tsage/blue_force/blueforce_scenes4.cpp | 24 +++++++-------
 engines/tsage/blue_force/blueforce_scenes5.cpp | 38 ++++++++++-----------
 engines/tsage/blue_force/blueforce_scenes6.cpp | 12 +++----
 engines/tsage/blue_force/blueforce_scenes7.cpp |  8 ++---
 engines/tsage/blue_force/blueforce_scenes8.cpp | 42 +++++++++++------------
 engines/tsage/blue_force/blueforce_scenes9.cpp | 24 +++++++-------
 7 files changed, 97 insertions(+), 97 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index a63f45d8df..8955199286 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -269,20 +269,20 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 		_object17.setVisage(301);
 		_object17.setStrip(1);
 		_object17.setPosition(Common::Point(87, 88));
-		_object17.setDetails(300, 11, 13, 2, 1, NULL);
+		_object17.setDetails(300, 11, 13, 2, 1, (SceneItem *)NULL);
 
 		_object18.postInit();
 		_object18.setVisage(301);
 		_object18.setStrip(1);
 		_object18.setPosition(Common::Point(137, 92));
-		_object18.setDetails(300, 11, 13, 3, 1, NULL);
+		_object18.setDetails(300, 11, 13, 3, 1, (SceneItem *)NULL);
 	}
 
 	_object19.postInit();
 	_object19.setVisage(301);
 	_object19.setStrip(1);
 	_object19.setPosition(Common::Point(175, 99));
-	_object19.setDetails(300, 11, 13, 34, 1, NULL);
+	_object19.setDetails(300, 11, 13, 34, 1, (SceneItem *)NULL);
 
 	_object11.postInit();
 	_object11.setVisage(301);
@@ -1015,7 +1015,7 @@ void Scene315::postInit(SceneObjectList *OwnerList) {
 		_atfMemo.setStrip(4);
 		_atfMemo.setFrame(4);
 		_atfMemo.fixPriority(82);
-		_atfMemo.setDetails(315, -1, -1, -1, 1, NULL);
+		_atfMemo.setDetails(315, -1, -1, -1, 1, (SceneItem *)NULL);
 	}
 
 	if (BF_GLOBALS._dayNumber == 1) {
@@ -1026,7 +1026,7 @@ void Scene315::postInit(SceneObjectList *OwnerList) {
 			_bulletinMemo.setStrip(4);
 			_bulletinMemo.setFrame(2);
 			_bulletinMemo.fixPriority(82);
-			_bulletinMemo.setDetails(315, -1, -1, -1, 1, NULL);
+			_bulletinMemo.setDetails(315, -1, -1, -1, 1, (SceneItem *)NULL);
 		}
 	} else if ((BF_INVENTORY._daNote._sceneNumber != 1) && (BF_GLOBALS._dayNumber < 3)) {
 		_object2.postInit();
@@ -1035,7 +1035,7 @@ void Scene315::postInit(SceneObjectList *OwnerList) {
 		_object2.setFrame(2);
 		_object2.setPosition(Common::Point(304, 31));
 		_object2.fixPriority(70);
-		_object2.setDetails(315, 3, 4, -1, 1, NULL);
+		_object2.setDetails(315, 3, 4, -1, 1, (SceneItem *)NULL);
 	}
 
 	_sutterSlot.setDetails(12, 315, 35, -1, 36, 1);
@@ -2686,7 +2686,7 @@ void Scene350::postInit(SceneObjectList *OwnerList) {
 			_harrison.setObjectWrapper(new SceneObjectWrapper());
 			_harrison.animate(ANIM_MODE_1, NULL);
 			_harrison.changeZoom(-1);
-			_harrison.setDetails(350, 12, 13, 14, 1, NULL);
+			_harrison.setDetails(350, 12, 13, 14, 1, (SceneItem *)NULL);
 			_harrison._moveDiff = Common::Point(2, 1);
 
 			_stripManager.addSpeaker(&_harrisonSpeaker);
@@ -3586,7 +3586,7 @@ void Scene355::postInit(SceneObjectList *OwnerList) {
 			_lyle.setStrip(1);
 			_lyle.setAction(&_action1);
 			_lyle._flag = BF_GLOBALS.getFlag(fTookTrailerAmmo) ? 1 : 0;
-			_lyle.setDetails(355, 40, 42, 41, 1, NULL);
+			_lyle.setDetails(355, 40, 42, 41, 1, (SceneItem *)NULL);
 		}
 
 		if ((BF_INVENTORY.getObjectScene(INV_RAGS) == 0) && (BF_INVENTORY.getObjectScene(INV_JAR) == 0) &&
@@ -3671,7 +3671,7 @@ void Scene355::postInit(SceneObjectList *OwnerList) {
 	}
 
 	_item3._sceneRegionId = 18;
-	_harrison.setDetails(355, 18, 20, 19, 1, NULL);
+	_harrison.setDetails(355, 18, 20, 19, 1, (SceneItem *)NULL);
 	_item6.setDetails(10, 355, 2, -1, 14, 1);
 	_item7.setDetails(11, 355, 3, -1, 15, 1);
 	_item8.setDetails(12, 355, 4, -1, 8, 1);
@@ -4944,7 +4944,7 @@ void Scene370::signal() {
 	case 3:
 		break;
 	case 3707:
-		_object5.setDetails(370, 6, -1, 7, 1, NULL);
+		_object5.setDetails(370, 6, -1, 7, 1, (SceneItem *)NULL);
 		BF_GLOBALS._sceneItems.push_back(&_object5);
 		// Deliberate fall-through
 	case 3700:
@@ -5138,7 +5138,7 @@ void Scene380::postInit(SceneObjectList *OwnerList) {
 	_door.setVisage(380);
 	_door.setStrip(4);
 	_door.setPosition(Common::Point(132, 66));
-	_door.setDetails(380, 12, 13, -1, 1, NULL);
+	_door.setDetails(380, 12, 13, -1, 1, (SceneItem *)NULL);
 
 	BF_GLOBALS._player.postInit();
 	BF_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper());
@@ -5153,7 +5153,7 @@ void Scene380::postInit(SceneObjectList *OwnerList) {
 		// Show vechile as car
 		_vechile.setStrip(3);
 		_vechile.setPosition(Common::Point(273, 125));
-		_vechile.setDetails(580, 2, 3, -1, 1, NULL);
+		_vechile.setDetails(580, 2, 3, -1, 1, (SceneItem *)NULL);
 
 		BF_GLOBALS._player.setVisage(129);
 		BF_GLOBALS._walkRegions.disableRegion(12);
@@ -5166,14 +5166,14 @@ void Scene380::postInit(SceneObjectList *OwnerList) {
 	} else if (BF_GLOBALS.getFlag(onDuty)) {
 		// Show on duty motorcycle
 		_vechile.setStrip(2);
-		_vechile.setDetails(300, 11, 13, -1, 1, NULL);
+		_vechile.setDetails(300, 11, 13, -1, 1, (SceneItem *)NULL);
 		_vechile.setPosition(Common::Point(252, 115));
 
 		BF_GLOBALS._player.setVisage(1341);
 	} else {
 		// Show off duty motorcycle
 		_vechile.setStrip(1);
-		_vechile.setDetails(580, 0, 1, -1, 1, NULL);
+		_vechile.setDetails(580, 0, 1, -1, 1, (SceneItem *)NULL);
 		_vechile.setPosition(Common::Point(249, 110));
 
 		BF_GLOBALS._player.setVisage(129);
@@ -5479,19 +5479,19 @@ void Scene385::postInit(SceneObjectList *OwnerList) {
 	_jim.setVisage(385);
 	_jim.setStrip(3);
 	_jim.setPosition(Common::Point(304, 113));
-	_jim.setDetails(385, 1, -1, 2, 1, NULL);
+	_jim.setDetails(385, 1, -1, 2, 1, (SceneItem *)NULL);
 
 	_dezi.postInit();
 	_dezi.setVisage(385);
 	_dezi.setStrip(2);
 	_dezi.setPosition(Common::Point(235, 93));
 	_dezi.fixPriority(120);
-	_dezi.setDetails(385, 3, -1, 2, 1, NULL);
+	_dezi.setDetails(385, 3, -1, 2, 1, (SceneItem *)NULL);
 
 	_door.postInit();
 	_door.setVisage(385);
 	_door.setPosition(Common::Point(107, 27));
-	_door.setDetails(385, 0, -1, -1, 1, NULL);
+	_door.setDetails(385, 0, -1, -1, 1, (SceneItem *)NULL);
 
 	BF_GLOBALS._walkRegions.disableRegion(6);
 
@@ -5875,13 +5875,13 @@ void Scene390::postInit(TsAGE::SceneObjectList *OwnerList) {
 	_object2.setPosition(Common::Point(38, 84));
 	_object2.fixPriority(50);
 	_object2._flag = 0;
-	_object2.setDetails(390, 10, 17, 10, 1, NULL);
+	_object2.setDetails(390, 10, 17, 10, 1, (SceneItem *)NULL);
 
 	_door.postInit();
 	_door.setVisage(390);
 	_door.setStrip(2);
 	_door.setPosition(Common::Point(151, 18));
-	_door.setDetails(390, 5, -1, -1, 1, NULL);
+	_door.setDetails(390, 5, -1, -1, 1, (SceneItem *)NULL);
 
 	BF_GLOBALS._player.disableControl();
 	_sceneMode = 3901;
@@ -5892,7 +5892,7 @@ void Scene390::postInit(TsAGE::SceneObjectList *OwnerList) {
 		_green.setVisage(392);
 		_green.setPosition(Common::Point(241, 164));
 		_green.fixPriority(153);
-		_green.setDetails(390, 12, -1, 13, 1, NULL);
+		_green.setDetails(390, 12, -1, 13, 1, (SceneItem *)NULL);
 		_green._flag = 0;
 	}
 
@@ -5902,7 +5902,7 @@ void Scene390::postInit(TsAGE::SceneObjectList *OwnerList) {
 		_gangMember1.setPosition(Common::Point(273, 169));
 		_gangMember1.fixPriority(152);
 		_gangMember1._flag = 0;
-		_gangMember1.setDetails(390, 19, -1, 20, 1, NULL);
+		_gangMember1.setDetails(390, 19, -1, 20, 1, (SceneItem *)NULL);
 
 		_gangMember2.postInit();
 		_gangMember2.setVisage(396);
@@ -5910,7 +5910,7 @@ void Scene390::postInit(TsAGE::SceneObjectList *OwnerList) {
 		_gangMember2.setPosition(Common::Point(241, 153));
 		_gangMember2.fixPriority(152);
 		_gangMember2._flag = 0;
-		_gangMember2.setDetails(390, 19, -1, 20, 1, NULL);
+		_gangMember2.setDetails(390, 19, -1, 20, 1, (SceneItem *)NULL);
 	}
 
 	_item1.setDetails(Rect(22, 40, 77, 67), 390, 0, -1, 1, 1, NULL);
@@ -5944,7 +5944,7 @@ void Scene390::signal() {
 		_object3.setVisage(390);
 		_object3.setPosition(Common::Point(250, 60));
 		_object3.fixPriority(255);
-		_object3.setDetails(390, 8, -1, 9, 2, NULL);
+		_object3.setDetails(390, 8, -1, 9, 2, (SceneItem *)NULL);
 
 		BF_GLOBALS._player.enableControl();
 		break;
diff --git a/engines/tsage/blue_force/blueforce_scenes4.cpp b/engines/tsage/blue_force/blueforce_scenes4.cpp
index deff4f2518..e966daf34e 100644
--- a/engines/tsage/blue_force/blueforce_scenes4.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes4.cpp
@@ -547,13 +547,13 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
 	_passenger.setVisage(415);
 	_passenger.setStrip(1);
 	_passenger.setPosition(Common::Point(278, 92));
-	_passenger.setDetails(410, 4, -1, 5, 1, NULL);
+	_passenger.setDetails(410, 4, -1, 5, 1, (SceneItem *)NULL);
 
 	_driver.postInit();
 	_driver.setVisage(416);
 	_driver.setStrip(2);
 	_driver.setPosition(Common::Point(244, 85));
-	_driver.setDetails(410, 6, -1, 7, 1, NULL);
+	_driver.setDetails(410, 6, -1, 7, 1, (SceneItem *)NULL);
 	_driver.changeZoom(-1);
 
 	_object5.postInit();
@@ -583,13 +583,13 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
 		_harrison.setVisage(343);
 		_harrison.setObjectWrapper(new SceneObjectWrapper());
 		_harrison.animate(ANIM_MODE_1, NULL);
-		_harrison.setDetails(350, 12, 13, 14, 1, NULL);
+		_harrison.setDetails(350, 12, 13, 14, 1, (SceneItem *)NULL);
 		_harrison.setPosition(Common::Point(97, 185));
 		_harrison.changeZoom(-1);
 
 		_patrolCar.postInit();
 		_patrolCar.setVisage(410);
-		_patrolCar.setDetails(410, 8, 9, 10, 1, NULL);
+		_patrolCar.setDetails(410, 8, 9, 10, 1, (SceneItem *)NULL);
 		_patrolCar.fixPriority(148);
 		_patrolCar.setPosition(Common::Point(39, 168));
 
@@ -640,7 +640,7 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
 				_harrison.setVisage(343);
 				_harrison.setObjectWrapper(new SceneObjectWrapper());
 				_harrison.animate(ANIM_MODE_1, NULL);
-				_harrison.setDetails(350, 12, 13, 14, 1, NULL);
+				_harrison.setDetails(350, 12, 13, 14, 1, (SceneItem *)NULL);
 				BF_GLOBALS._sceneItems.addBefore(&_driver, &_harrison);
 
 				_harrison.setPosition(Common::Point(-10, 124));
@@ -648,7 +648,7 @@ void Scene410::postInit(SceneObjectList *OwnerList) {
 
 				_patrolCar.postInit();
 				_patrolCar.setVisage(410);
-				_patrolCar.setDetails(410, 8, 9, 10, 1, NULL);
+				_patrolCar.setDetails(410, 8, 9, 10, 1, (SceneItem *)NULL);
 				_patrolCar.fixPriority(148);
 
 				if (_field1FC4) {
@@ -1076,7 +1076,7 @@ void Scene415::postInit(SceneObjectList *OwnerList) {
 	_dashDrawer.setVisage(411);
 	_dashDrawer.setStrip(3);
 	_dashDrawer.setPosition(Common::Point(151, 97));
-	_dashDrawer.setDetails(415, 22, -1, -1, 1, NULL);
+	_dashDrawer.setDetails(415, 22, -1, -1, 1, (SceneItem *)NULL);
 
 	_animatedSeat.postInit();
 	_animatedSeat.setVisage(419);
@@ -1140,7 +1140,7 @@ void Scene415::showBullets() {
 	_theBullets.setFrame(2);
 	_theBullets.setPosition(Common::Point(184, 86));
 	_theBullets.fixPriority(105);
-	_theBullets.setDetails(415, 16, 17, 18, 1, NULL);
+	_theBullets.setDetails(415, 16, 17, 18, 1, (SceneItem *)NULL);
 	BF_GLOBALS._sceneItems.remove(&_theBullets);
 	BF_GLOBALS._sceneItems.push_front(&_theBullets);
 }
@@ -1158,7 +1158,7 @@ void Scene415::showGunAndWig() {
 	_gunAndWig.setFrame(2);
 	_gunAndWig.setPosition(Common::Point(159, 88));
 	_gunAndWig.fixPriority(105);
-	_gunAndWig.setDetails(415, 13, 14, 15, 1, NULL);
+	_gunAndWig.setDetails(415, 13, 14, 15, 1, (SceneItem *)NULL);
 
 	BF_GLOBALS._sceneItems.remove(&_gunAndWig);
 	BF_GLOBALS._sceneItems.push_front(&_gunAndWig);
@@ -1559,13 +1559,13 @@ void Scene450::postInit(SceneObjectList *OwnerList) {
 	_door.setVisage(450);
 	_door.setStrip(2);
 	_door.setPosition(Common::Point(72, 80));
-	_door.setDetails(450, 15, -1, 13, 1, NULL);
+	_door.setDetails(450, 15, -1, 13, 1, (SceneItem *)NULL);
 
 	_counterDoor.postInit();
 	_counterDoor.setVisage(450);
 	_counterDoor.setPosition(Common::Point(39, 104));
 	_counterDoor.fixPriority(100);
-	_counterDoor.setDetails(450, 12, -1, 13, 1, NULL);
+	_counterDoor.setDetails(450, 12, -1, 13, 1, (SceneItem *)NULL);
 
 	if (BF_GLOBALS._dayNumber != 3) {
 		_pinBoy.postInit();
@@ -1598,7 +1598,7 @@ void Scene450::postInit(SceneObjectList *OwnerList) {
 			_object2.setPosition(Common::Point(-30, 126));
 			ADD_MOVER_NULL(_object2, 27, 126);
 			_object2.changeZoom(-1);
-			_object2.setDetails(450, 2, 18, 3, 1, NULL);
+			_object2.setDetails(450, 2, 18, 3, 1, (SceneItem *)NULL);
 
 			BF_GLOBALS._walkRegions.disableRegion(4);
 
diff --git a/engines/tsage/blue_force/blueforce_scenes5.cpp b/engines/tsage/blue_force/blueforce_scenes5.cpp
index 7a250e2233..692e142f55 100644
--- a/engines/tsage/blue_force/blueforce_scenes5.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes5.cpp
@@ -201,7 +201,7 @@ void Scene550::postInit(SceneObjectList *OwnerList) {
 		_lyle.postInit();
 		_lyle.setVisage(835);
 		_lyle.setPosition(Common::Point(139, 83));
-		_lyle.setDetails(550, 29, 30, 31, 1, NULL);
+		_lyle.setDetails(550, 29, 30, 31, 1, (SceneItem *)NULL);
 		_lyle.setStrip(8);
 
 		BF_GLOBALS._player.setVisage(303);
@@ -702,14 +702,14 @@ void Scene551::postInit(SceneObjectList *OwnerList) {
 	_object13.setStrip(2);
 	_object13.setPosition(Common::Point(29, 92));
 	_object13.fixPriority(82);
-	_object13.setDetails(550, 8, -1, 9, 1, NULL);
+	_object13.setDetails(550, 8, -1, 9, 1, (SceneItem *)NULL);
 
 	if (BF_GLOBALS.getFlag(didDrunk)) {
 		_drunk._flag = 3;
 		_drunk.setStrip(3);
 
 		_object12.show();
-		_object12.setDetails(550, 25, -1, 26, 1, NULL);
+		_object12.setDetails(550, 25, -1, 26, 1, (SceneItem *)NULL);
 		BF_GLOBALS._sceneItems.push_front(&_object12);
 		
 		_harrison.postInit();
@@ -733,7 +733,7 @@ void Scene551::postInit(SceneObjectList *OwnerList) {
 		_object11.setFrame(2);
 		_object11.setPosition(Common::Point(116, 84));
 		_object11.fixPriority(77);
-		_object11.setDetails(550, 32, -1, 10, 1, NULL);
+		_object11.setDetails(550, 32, -1, 10, 1, (SceneItem *)NULL);
 
 		_drunkStanding.postInit();
 		_drunkStanding._flag = 0;
@@ -764,7 +764,7 @@ void Scene551::postInit(SceneObjectList *OwnerList) {
 		_patrolCarTrunk.setFrame(1);
 		_patrolCarTrunk.setPosition(Common::Point(149, 69));
 		_patrolCarTrunk.fixPriority(79);
-		_patrolCarTrunk.setDetails(550, 18, -1, 9, 1, NULL);
+		_patrolCarTrunk.setDetails(550, 18, -1, 9, 1, (SceneItem *)NULL);
 
 		_object11.postInit();
 		_object11.setVisage(550);
@@ -772,7 +772,7 @@ void Scene551::postInit(SceneObjectList *OwnerList) {
 		_object11.setFrame(2);
 		_object11.setPosition(Common::Point(116, 84));
 		_object11.fixPriority(77);
-		_object11.setDetails(550, 32, -1, 10, 1, NULL);
+		_object11.setDetails(550, 32, -1, 10, 1, (SceneItem *)NULL);
 
 		_drunkStanding.postInit();
 		_drunkStanding._flag = 0;
@@ -842,7 +842,7 @@ void Scene551::signal() {
 		ADD_PLAYER_MOVER_NULL(_harrison, 88, 91);
 
 		_object12.show();
-		_object12.setDetails(550, 25, -1, 26, 1, NULL);
+		_object12.setDetails(550, 25, -1, 26, 1, (SceneItem *)NULL);
 		BF_GLOBALS._sceneItems.push_front(&_object12);
 		BF_GLOBALS._player.enableControl();
 
@@ -1064,7 +1064,7 @@ void Scene560::SafeInset::postInit(SceneObjectList *OwnerList) {
 			scene->_nickel.setFrame(3);
 			scene->_nickel.fixPriority(252);
 			scene->_nickel.setPosition(Common::Point(181, 140));
-			scene->_nickel.setDetails(560, 47, 48, -1, 1, NULL);
+			scene->_nickel.setDetails(560, 47, 48, -1, 1, (SceneItem *)NULL);
 			BF_GLOBALS._sceneItems.remove(&scene->_nickel);
 			BF_GLOBALS._sceneItems.push_front(&scene->_nickel);
 		}
@@ -1201,7 +1201,7 @@ void Scene560::SafeInset::signal() {
 			scene->_nickel.setFrame(3);
 			scene->_nickel.fixPriority(252);
 			scene->_nickel.setPosition(Common::Point(181, 140));
-			scene->_nickel.setDetails(560, 47, 48, -1, 1, NULL);
+			scene->_nickel.setDetails(560, 47, 48, -1, 1, (SceneItem *)NULL);
 			BF_GLOBALS._sceneItems.remove(&scene->_nickel);
 			BF_GLOBALS._sceneItems.push_front(&scene->_nickel);
 		}
@@ -1405,7 +1405,7 @@ void Scene560::postInit(SceneObjectList *OwnerList) {
 		_box.setStrip(4);
 		_box.setFrame(1);
 		_box.setPosition(Common::Point(295, 37));
-		_box.setDetails(560, 41, 42, -1, 1, NULL);
+		_box.setDetails(560, 41, 42, -1, 1, (SceneItem *)NULL);
 	}
 
 	_deskChair.postInit();
@@ -1454,7 +1454,7 @@ void Scene560::postInit(SceneObjectList *OwnerList) {
 	}
 
 	_computer.setDetails(Rect(16, 77, 58, 107), 560, 2, -1, -1, 1, NULL);
-	_deskChair.setDetails(560, 3, -1, -1, 1, NULL);
+	_deskChair.setDetails(560, 3, -1, -1, 1, (SceneItem *)NULL);
 	_chair.setDetails(Rect(163, 64, 196, 102), 560, 13, 25, 36, 1, NULL);
 	_lamp.setDetails(Rect(197, 43, 214, 56), 560, 7, 19, 30, 1, NULL);
 	_item4.setDetails(Rect(121, 18, 156, 54), 560, 8, 20, 31, 1, NULL);
@@ -2039,7 +2039,7 @@ void Scene570::postInit(SceneObjectList *OwnerList) {
 	_powerSwitch.setStrip(4);
 	_powerSwitch.setFrame(1);
 	_powerSwitch.setPosition(Common::Point(163, 131));
-	_powerSwitch.setDetails(570, 1, 15, -1, 1, NULL);
+	_powerSwitch.setDetails(570, 1, 15, -1, 1, (SceneItem *)NULL);
 
 	_floppyDrive.setDetails(Rect(258, 111, 303, 120), 570, 0, 15, -1, 1, NULL);
 	_item11.setDetails(0, 570, 15, 15, 15, 1);
@@ -2070,7 +2070,7 @@ void Scene570::signal() {
 		_printerIcon.setFrame(3);
 		_printerIcon.setPosition(Common::Point(172, 71));
 		_printerIcon.fixPriority(2);
-		_printerIcon.setDetails(570, 14, 15, -1, 2, NULL);
+		_printerIcon.setDetails(570, 14, 15, -1, 2, (SceneItem *)NULL);
 
 		_iconManager.setup(2);
 		_folder1.setDetails(1, 1, 0, 2, SCENE570_C_DRIVE);
@@ -2201,7 +2201,7 @@ void Scene580::postInit(SceneObjectList *OwnerList) {
 	_door.setStrip(4);
 	_door.setPosition(Common::Point(168, 41));
 	_door.hide();
-	_door.setDetails(580, 5, -1, -1, 1, NULL);
+	_door.setDetails(580, 5, -1, -1, 1, (SceneItem *)NULL);
 
 	_vechile.postInit();
 	_vechile.setVisage(580);
@@ -2219,7 +2219,7 @@ void Scene580::postInit(SceneObjectList *OwnerList) {
 		_vechile.changeZoom(90);
 		_vechile.setStrip(3);
 		_vechile.setPosition(Common::Point(165, 76));
-		_vechile.setDetails(580, 2, 3, -1, 1, NULL);
+		_vechile.setDetails(580, 2, 3, -1, 1, (SceneItem *)NULL);
 
 		BF_GLOBALS._player.setVisage(303);
 
@@ -2233,13 +2233,13 @@ void Scene580::postInit(SceneObjectList *OwnerList) {
 		if (BF_GLOBALS.getFlag(onDuty)) {
 			_vechile.setStrip(1);
 			_vechile.setFrame(2);
-			_vechile.setDetails(300, 11, 13, -1, 1, NULL);
+			_vechile.setDetails(300, 11, 13, -1, 1, (SceneItem *)NULL);
 
 			BF_GLOBALS._player.setVisage(304);
 		} else {
 			_vechile.setStrip(2);
 			_vechile.setFrame(3);
-			_vechile.setDetails(580, 0, 1, -1, 1, NULL);
+			_vechile.setDetails(580, 0, 1, -1, 1, (SceneItem *)NULL);
 
 			BF_GLOBALS._player.setVisage(303);
 		}
@@ -2468,12 +2468,12 @@ void Scene590::postInit(SceneObjectList *OwnerList) {
 			_skip.postInit();
 			_skip.setVisage(693);
 			_skip.setPosition(Common::Point(271, 117));
-			_skip.setDetails(590, 26, -1, 27, 1, NULL);
+			_skip.setDetails(590, 26, -1, 27, 1, (SceneItem *)NULL);
 
 			_laura.postInit();
 			_laura.setVisage(692);
 			_laura.setPosition(Common::Point(248, 115));
-			_laura.setDetails(590, 24, -1, 25, 1, NULL);
+			_laura.setDetails(590, 24, -1, 25, 1, (SceneItem *)NULL);
 		}
 	}
 
diff --git a/engines/tsage/blue_force/blueforce_scenes6.cpp b/engines/tsage/blue_force/blueforce_scenes6.cpp
index 5fb1b562e0..e5e7c71bef 100644
--- a/engines/tsage/blue_force/blueforce_scenes6.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes6.cpp
@@ -410,7 +410,7 @@ bool Scene690::Object2::startAction(CursorType action, Event &event) {
 			scene->_object6.postInit();
 			scene->_object6.hide();
 			scene->_object6.fixPriority(1);
-			scene->_object6.setDetails(690, 21, 17, 23, 1, NULL);
+			scene->_object6.setDetails(690, 21, 17, 23, 1, (SceneItem *)NULL);
 
 			BF_GLOBALS._player.disableControl();
 			scene->_sceneMode = 6902;
@@ -447,30 +447,30 @@ void Scene690::postInit(SceneObjectList *OwnerList) {
 	_object1.setStrip2(2);
 	_object1.fixPriority(188);
 	_object1.setPosition(Common::Point(50, 166));
-	_object1.setDetails(690, 4, 17, 26, 1, NULL);
+	_object1.setDetails(690, 4, 17, 26, 1, (SceneItem *)NULL);
 
 	_object3.postInit();
 	_object3.setVisage(690);
 	_object3.fixPriority(100);
 	_object3.setPosition(Common::Point(238, 125));
-	_object3.setDetails(690, 7, 17, 28, 1, NULL);
+	_object3.setDetails(690, 7, 17, 28, 1, (SceneItem *)NULL);
 
 	_object2.postInit();
 	_object2.setVisage(694);
 	_object2.setStrip2(3);
 	_object2.fixPriority(125);
 	_object2.setPosition(Common::Point(100, 134));
-	_object2.setDetails(690, 12, -1, 11, 1, NULL);
+	_object2.setDetails(690, 12, -1, 11, 1, (SceneItem *)NULL);
 
 	BF_GLOBALS._player.postInit();
 	BF_GLOBALS._player.disableControl();
 	BF_GLOBALS._player._moveDiff.x = 8;
 
 	_object4.postInit();
-	_object4.setDetails(690, 13, -1, -1, 1, NULL);
+	_object4.setDetails(690, 13, -1, -1, 1, (SceneItem *)NULL);
 
 	_object5.postInit();
-	_object5.setDetails(690, 14, -1, -1, 1, NULL);
+	_object5.setDetails(690, 14, -1, -1, 1, (SceneItem *)NULL);
 
 	_sceneMode = 6903;
 	setAction(&_sequenceManager, this, 6903, &BF_GLOBALS._player, &_object3, &_object4, &_object5, NULL);
diff --git a/engines/tsage/blue_force/blueforce_scenes7.cpp b/engines/tsage/blue_force/blueforce_scenes7.cpp
index 7b84e3ccdd..bb29ad1f34 100644
--- a/engines/tsage/blue_force/blueforce_scenes7.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes7.cpp
@@ -172,10 +172,10 @@ void Scene710::postInit(SceneObjectList *OwnerList) {
 	_stick.animate(ANIM_MODE_2, NULL);
 	_stick.setPosition(Common::Point(650, 160));
 	_stick._moveDiff.x = 16;
-	_stick.setDetails(710, 4, -1, -1, 1, NULL);
-	_laura.setDetails(710, 2, -1, -1, 1, NULL);
-	_kid.setDetails(710, 6, -1, -1, 1, NULL);
-	_dog.setDetails(710, 0, -1, -1, 1, NULL);
+	_stick.setDetails(710, 4, -1, -1, 1, (SceneItem *)NULL);
+	_laura.setDetails(710, 2, -1, -1, 1, (SceneItem *)NULL);
+	_kid.setDetails(710, 6, -1, -1, 1, (SceneItem *)NULL);
+	_dog.setDetails(710, 0, -1, -1, 1, (SceneItem *)NULL);
 
 	_item1.setDetails(Rect(555, 68, 583, 101), 710, 7,  23, -1, 1, NULL);
 	_item2.setDetails(Rect(583, 46, 611,  78), 710, 7,  23, -1, 1, NULL);
diff --git a/engines/tsage/blue_force/blueforce_scenes8.cpp b/engines/tsage/blue_force/blueforce_scenes8.cpp
index 32cd376891..ceee748374 100644
--- a/engines/tsage/blue_force/blueforce_scenes8.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes8.cpp
@@ -1672,12 +1672,12 @@ void Scene830::postInit(SceneObjectList *OwnerList) {
 		_rentalBoat.setStrip(1);
 		_rentalBoat.setPosition(Common::Point(271, 146));
 		_rentalBoat.fixPriority(90);
-		_rentalBoat.setDetails(830, 0, 1, 2, 1, NULL);
+		_rentalBoat.setDetails(830, 0, 1, 2, 1, (SceneItem *)NULL);
 	}
 
 	_door.postInit();
 	_door.setVisage(830);
-	_door.setDetails(830, 3, 4, -1, 1, NULL);
+	_door.setDetails(830, 3, 4, -1, 1, (SceneItem *)NULL);
 	_door.setStrip((BF_GLOBALS._dayNumber == 2) ? 4 : 3);
 	_door.setPosition(Common::Point(182, 97));
 
@@ -1702,7 +1702,7 @@ void Scene830::postInit(SceneObjectList *OwnerList) {
 			_object5.setStrip(2);
 			_object5.setFrame(2);
 			_object5.setPosition(Common::Point(126, 133));
-			_object5.setDetails(830, 7, 8, -1, 1, NULL);
+			_object5.setDetails(830, 7, 8, -1, 1, (SceneItem *)NULL);
 		}
 		break;
 	case 5:
@@ -1718,7 +1718,7 @@ void Scene830::postInit(SceneObjectList *OwnerList) {
 			_lyle.setStrip(4);
 			_lyle.setPosition(Common::Point(180, 154));
 			_lyle._moveDiff = Common::Point(2, 0);
-			_lyle.setDetails(830, 28, -1, 29, 1, NULL);
+			_lyle.setDetails(830, 28, -1, 29, 1, (SceneItem *)NULL);
 
 			_field18AC = 1;
 		}
@@ -1950,7 +1950,7 @@ void Scene840::BoatKeysInset::postInit(SceneObjectList *OwnerList) {
 		_rentalKeys.setFrame(3);
 		_rentalKeys.setPosition(Common::Point(120, 132));
 		_rentalKeys.fixPriority(255);
-		_rentalKeys.setDetails(840, 52, 8, -1, 2, NULL);
+		_rentalKeys.setDetails(840, 52, 8, -1, 2, (SceneItem *)NULL);
 	}
 
 	if (BF_INVENTORY.getObjectScene(INV_WAVE_KEYS) != 1) {
@@ -1960,7 +1960,7 @@ void Scene840::BoatKeysInset::postInit(SceneObjectList *OwnerList) {
 		_waveKeys.setFrame(2);
 		_waveKeys.setPosition(Common::Point(201, 91));
 		_waveKeys.fixPriority(255);
-		_waveKeys.setDetails(840, 53, 8, -1, 2, NULL);
+		_waveKeys.setDetails(840, 53, 8, -1, 2, (SceneItem *)NULL);
 	}
 
 	_v1B4 = _v1B6 = 0;
@@ -2035,7 +2035,7 @@ bool Scene840::BoatKeysInset::startAction(CursorType action, Event &event) {
 				_rentalKeys.setFrame(3);
 				_rentalKeys.setPosition(Common::Point(120, 132));
 				_rentalKeys.fixPriority(255);
-				_rentalKeys.setDetails(840, 52, 8, -1, 2, NULL);
+				_rentalKeys.setDetails(840, 52, 8, -1, 2, (SceneItem *)NULL);
 			}
 
 			if (BF_INVENTORY.getObjectScene(INV_WAVE_KEYS) == 1) {
@@ -2046,7 +2046,7 @@ bool Scene840::BoatKeysInset::startAction(CursorType action, Event &event) {
 				_waveKeys.setFrame(2);
 				_waveKeys.setPosition(Common::Point(201, 91));
 				_waveKeys.fixPriority(255);
-				_waveKeys.setDetails(840, 53, 8, -1, 2, NULL);
+				_waveKeys.setDetails(840, 53, 8, -1, 2, (SceneItem *)NULL);
 			}
 
 			BF_INVENTORY.setObjectScene(INV_WAVE_KEYS, 0);
@@ -2259,7 +2259,7 @@ void Scene840::postInit(SceneObjectList *OwnerList) {
 	_doors.setVisage(840);
 	_doors.setStrip(3);
 	_doors.setPosition(Common::Point(157, 81));
-	_doors.setDetails(840, 0, 1, 2, 1, NULL);
+	_doors.setDetails(840, 0, 1, 2, 1, (SceneItem *)NULL);
 
 	_carter.postInit();
 	_carter.setVisage(843);
@@ -2279,7 +2279,7 @@ void Scene840::postInit(SceneObjectList *OwnerList) {
 	_item10.setDetails(Rect(199, 56, 236, 80), 840, 24, 14, 12, 1, NULL);
 	_item11.setDetails(Rect(256, 94, 319, 118), 840, 25, 15, 13, 1, NULL);
 	_item18.setDetails(6, 840, 38, 39, 40, 1);
-	_carter.setDetails(840, 3, 4, 5, 1, NULL);
+	_carter.setDetails(840, 3, 4, 5, 1, (SceneItem *)NULL);
 	_item8.setDetails(Rect(259, 4, 319, 87), 840, 22, 15, 13, 1, NULL);
 	_item15.setDetails(2, 840, 32, 33, 34, 1);
 	_coins.setDetails(3, 840, -1, 6, 7, 1);
@@ -2295,7 +2295,7 @@ void Scene840::postInit(SceneObjectList *OwnerList) {
 		_boatKeys.setFrame(1);
 		_boatKeys.setPosition(Common::Point(250, 83));
 		_boatKeys.fixPriority(120);
-		_boatKeys.setDetails(840, -1, 8, 9, 2, NULL);
+		_boatKeys.setDetails(840, -1, 8, 9, 2, (SceneItem *)NULL);
 		_field1AC0 = 1;
 	}
 
@@ -2387,7 +2387,7 @@ void Scene840::signal() {
 	case 4:
 		_sceneMode = 8403;
 		_boatKeys.postInit();
-		_boatKeys.setDetails(840, -1, 8, 9, 2, NULL);
+		_boatKeys.setDetails(840, -1, 8, 9, 2, (SceneItem *)NULL);
 		setAction(&_sequenceManager1, this, 8403, &_carter, &_boatKeys, NULL);
 		break;
 	case 5:
@@ -2679,7 +2679,7 @@ void Scene860::postInit(SceneObjectList *OwnerList) {
 		_object2.setVisage(880);
 		_object2.setPosition(Common::Point(196, 81));
 		BF_GLOBALS._sceneItems.push_back(&_object2);
-		_object2.setDetails(860, 0, 1, -1, 1, NULL);
+		_object2.setDetails(860, 0, 1, -1, 1, (SceneItem *)NULL);
 		_object2.fixPriority(20);
 
 		_neRect = Rect(0, 0, 0, 0);
@@ -2876,7 +2876,7 @@ void Scene870::CrateInset::initContents() {
 		_jar.setPosition(Common::Point(scene->_crateInset._position.x + 5,
 			scene->_crateInset._position.y - 26));
 		_jar.fixPriority(251);
-		_jar.setDetails(870, 39, 40, 41, 1, NULL);
+		_jar.setDetails(870, 39, 40, 41, 1, (SceneItem *)NULL);
 		BF_GLOBALS._sceneItems.remove(&_jar);
 		BF_GLOBALS._sceneItems.push_front(&_jar);
 	}
@@ -2890,7 +2890,7 @@ void Scene870::CrateInset::initContents() {
 		_rags.setPosition(Common::Point(scene->_crateInset._position.x - 18,
 			scene->_crateInset._position.y - 18));
 		_rags.fixPriority(251);
-		_rags.setDetails(870, 42, 43, 44, 1, NULL);
+		_rags.setDetails(870, 42, 43, 44, 1, (SceneItem *)NULL);
 		BF_GLOBALS._sceneItems.remove(&_rags);
 		BF_GLOBALS._sceneItems.push_front(&_rags);
 	}
@@ -3063,7 +3063,7 @@ void Scene870::postInit(SceneObjectList *OwnerList) {
 			_lyle.setObjectWrapper(new SceneObjectWrapper());
 			_lyle.animate(ANIM_MODE_1, NULL);
 			_lyle._moveDiff = Common::Point(2, 1);
-			_lyle.setDetails(870, 27, 28, 29, 1, NULL);
+			_lyle.setDetails(870, 27, 28, 29, 1, (SceneItem *)NULL);
 		}
 
 		_yacht.postInit();
@@ -3071,7 +3071,7 @@ void Scene870::postInit(SceneObjectList *OwnerList) {
 		_yacht.setStrip(4);
 		_yacht.setFrame(4);
 		_yacht.setPosition(Common::Point(232, 19));
-		_yacht.setDetails(870, 30, 31, 32, 1, NULL);
+		_yacht.setDetails(870, 30, 31, 32, 1, (SceneItem *)NULL);
 
 		if ((BF_INVENTORY.getObjectScene(INV_RAGS) == 0) && (BF_INVENTORY.getObjectScene(INV_FLARE) == 0) &&
 				(BF_INVENTORY.getObjectScene(INV_HANDCUFFS) == 355)) {
@@ -3081,9 +3081,9 @@ void Scene870::postInit(SceneObjectList *OwnerList) {
 			_green.setPosition(Common::Point(127, 109));
 
 			if (BF_GLOBALS._bookmark == bFinishedWGreen) {
-				_green.setDetails(870, 51, 54, 53, 1, NULL);
+				_green.setDetails(870, 51, 54, 53, 1, (SceneItem *)NULL);
 			} else {
-				_green.setDetails(870, 51, 52, 53, 1, NULL);
+				_green.setDetails(870, 51, 52, 53, 1, (SceneItem *)NULL);
 			}
 		}
 	}
@@ -3358,11 +3358,11 @@ void Scene880::postInit(SceneObjectList *OwnerList) {
 		_object2.postInit();
 		_object2.setVisage(880);
 		_object2.setPosition(Common::Point(209, 76));
-		_object2.setDetails(880, 4, 5, 6, 1, NULL);
+		_object2.setDetails(880, 4, 5, 6, 1, (SceneItem *)NULL);
 
 		_object4.postInit();
 		_object4.setVisage(875);
-		_object4.setDetails(880, 7, -1, 9, 1, NULL);
+		_object4.setDetails(880, 7, -1, 9, 1, (SceneItem *)NULL);
 
 		_object5.postInit();
 		_object5.setVisage(874);
diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index ea54bf6b1d..f5705eb471 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -442,7 +442,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 		_body.fixPriority(120);
 		_body.setVisage(901);
 		_body.setPosition(Common::Point(159,128));
-		_body.setDetails(900, 15, 16, 17, ANIM_MODE_1, NULL);
+		_body.setDetails(900, 15, 16, 17, ANIM_MODE_1, (SceneItem *)NULL);
 	}
 	if (BF_GLOBALS._sceneManager._previousScene == 910) {
 		_sceneBounds.moveTo(639, 0);
@@ -465,7 +465,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 	_dog.setVisage(902);
 	_dog.setPosition(Common::Point(845, 135));
 	_dog.fixPriority(122);
-	_dog.setDetails(900, 8, -1, 9, 1, NULL);
+	_dog.setDetails(900, 8, -1, 9, 1, (SceneItem *)NULL);
 
 	if (_dog._flag == 0) {
 		_dog.animate(ANIM_MODE_1, NULL);
@@ -524,7 +524,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 			_lyle.postInit();
 			_lyle._moveDiff.y = 7;
 			_lyle._flags |= OBJFLAG_CHECK_REGION;
-			_lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, NULL);
+			_lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, (SceneItem *)NULL);
 			_lyleHatSpeaker._xp = 210;
 			_jakeJacketSpeaker._xp = 75;
 			setAction(&_sequenceManager1, this, 9013, &BF_GLOBALS._player, &_lyle, NULL);
@@ -537,7 +537,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 				_lyle.setPosition(Common::Point(780, 153));
 				_lyle._moveDiff.y = 7;
 				_lyle._flags |= 0x1000;
-				_lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, NULL);
+				_lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, (SceneItem *)NULL);
 				_lyle.animate(ANIM_MODE_1, NULL);
 				_lyle.setObjectWrapper(new SceneObjectWrapper());
 			} 
@@ -553,7 +553,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 		if (BF_GLOBALS.getFlag(fWithLyle)) {
 			_lyle.postInit();
 			_lyle._flags |= 0x1000;
-			_lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, NULL);
+			_lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, (SceneItem *)NULL);
 			setAction(&_sequenceManager1, this, 9014, &BF_GLOBALS._player, &_door, &_lyle, NULL);
 		} else
 			setAction(&_sequenceManager1, this, 9002, &BF_GLOBALS._player, &_door, NULL);
@@ -2019,10 +2019,10 @@ void Scene910::postInit(SceneObjectList *OwnerList) {
 	if (BF_GLOBALS._v4CEE2 == 0)
 		_item16.setDetails(Rect(265, 18, 319, 102), 910, -1, -1, -1, 1, NULL);
 
-	_breakerBox.setDetails(910, 6, -1, -1, 1, NULL);
+	_breakerBox.setDetails(910, 6, -1, -1, 1, (SceneItem *)NULL);
 	_item15.setDetails(Rect(0, 0, 320, 170), 910, 0, 1, 2, 1, NULL);
-	_yellowCord.setDetails(910, 52, 53, -1, 1, NULL);
-	_blackCord.setDetails(910, 54, 55, -1, 1, NULL);
+	_yellowCord.setDetails(910, 52, 53, -1, 1, (SceneItem *)NULL);
+	_blackCord.setDetails(910, 54, 55, -1, 1, (SceneItem *)NULL);
 	_item2.setDetails(3, 910, 22, -1, 24, 1);
 	_item4.setDetails(1, 910, 16, 17, 18, 1);
 	_item8.setDetails(4, 910, 25, 26, 27, 1);
@@ -2032,7 +2032,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) {
 	_item9.setDetails(Rect(266, 39, 274, 70), 910, 43, 44, 45, 1, NULL);
 	_item10.setDetails(Rect(276, 27, 288, 83), 910, 46, 47, 48, 1, NULL);
 	_item11.setDetails(Rect(295, 42, 312, 87), 910, 49, 50, 51, 1, NULL);
-	_fakeWall.setDetails(910, 28, -1, 30, 1, NULL);
+	_fakeWall.setDetails(910, 28, -1, 30, 1, (SceneItem *)NULL);
 	_item3.setDetails(7, 910, 59, 60, 61, 1);
 	_item5.setDetails(2, 910, 19, 20, 21, 1);
 	_backWall.setDetails(6, 910, 28, 29, 30, 1);
@@ -2600,7 +2600,7 @@ void Scene910::signal() {
 		BF_GLOBALS.setFlag(fBackupAt340);
 		BF_GLOBALS._v4CEE2 = 4;
 		_stuart.postInit();
-		_nico.setDetails(910, 72, 73, 74, 3, NULL);
+		_nico.setDetails(910, 72, 73, 74, 3, (SceneItem *)NULL);
 		_stuart.setDetails(910, 66, 67, 68, 5, &_nico);
 		BF_GLOBALS._v4CEE8 = 0;
 		_sceneMode = 9121;
@@ -3358,14 +3358,14 @@ void Scene930::postInit(SceneObjectList *OwnerList) {
 		_box.setVisage(930);
 		_box.setStrip(1);
 		_box.setPosition(Common::Point(223, 21));
-		_box.setDetails(930, 66, 67, 68, 1, NULL);
+		_box.setDetails(930, 66, 67, 68, 1, (SceneItem *)NULL);
 	}
 	_boots.postInit();
 	_boots.setVisage(930);
 	_boots.setStrip(2);
 	_boots.setPosition(Common::Point(9, 161));
 	_boots.fixPriority(120);
-	_boots.setDetails(930, 62, 63, 64, 1, NULL);
+	_boots.setDetails(930, 62, 63, 64, 1, (SceneItem *)NULL);
 
 	BF_GLOBALS._player.postInit();
 	BF_GLOBALS._player.setVisage(368);
-- 
cgit v1.2.3


From 880fcf11b5659634f890b19279d8254595c07a1d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 27 Dec 2011 21:08:37 +1100
Subject: TSAGE: Fixed ambiguity with NULL parameters in R2R setDetails calls

---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp |  76 +++++++-------
 engines/tsage/ringworld2/ringworld2_scenes2.cpp | 132 ++++++++++++------------
 engines/tsage/ringworld2/ringworld2_scenes3.cpp |  80 +++++++-------
 3 files changed, 144 insertions(+), 144 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 9eb3e2b713..8252584b1c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -121,7 +121,7 @@ bool Scene100::Table::startAction(CursorType action, Event &event) {
 				scene->_stasisNegator.setup(100, 7, 2);
 			} else {
 				scene->_stasisNegator.setup(100, 7, 1);
-				scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, NULL);
+				scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, (SceneItem *)NULL);
 			}
 
 			scene->setAction(&scene->_sequenceManager2, scene, 108, this, &scene->_object3, 
@@ -145,7 +145,7 @@ bool Scene100::Table::startAction(CursorType action, Event &event) {
 				scene->_stasisNegator.setup(100, 7, 2);
 			} else {
 				scene->_stasisNegator.setup(100, 7, 1);
-				scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, NULL);
+				scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, (SceneItem *)NULL);
 			}
 
 			scene->setAction(&scene->_sequenceManager2, scene, 102, this, &scene->_object3, 
@@ -240,17 +240,17 @@ void Scene100::postInit(SceneObjectList *OwnerList) {
 	_door._state = 0;
 	_door.setVisage(100);
 	_door.setPosition(Common::Point(160, 84));
-	_door.setDetails(100, 3, 4, 5, 1, NULL);
+	_door.setDetails(100, 3, 4, 5, 1, (SceneItem *)NULL);
 
 	_doorDisplay.postInit();
 	_doorDisplay.setup(100, 2, 1);
 	_doorDisplay.setPosition(Common::Point(202, 53));
-	_doorDisplay.setDetails(100, -1, -1, -1, 1, NULL);
+	_doorDisplay.setDetails(100, -1, -1, -1, 1, (SceneItem *)NULL);
 
 	_table.postInit();
 	_table.setup(100, 2, 3);
 	_table.setPosition(Common::Point(175, 157));
-	_table.setDetails(100, 17, 18, 20, 1, NULL);
+	_table.setDetails(100, 17, 18, 20, 1, (SceneItem *)NULL);
 
 	_bedLights1.postInit();
 	_bedLights1.setup(100, 3, 1);
@@ -270,13 +270,13 @@ void Scene100::postInit(SceneObjectList *OwnerList) {
 	_wardrobe.setVisage(101);
 	_wardrobe.setPosition(Common::Point(231, 126));
 	_wardrobe.fixPriority(10);
-	_wardrobe.setDetails(100, 37, -1, 39, 1, NULL);
+	_wardrobe.setDetails(100, 37, -1, 39, 1, (SceneItem *)NULL);
 
 	if (R2_INVENTORY.getObjectScene(R2_STEPPING_DISKS) == 100) {
 		_steppingDisks.postInit();
 		_steppingDisks.setup(100, 8, 1);
 		_steppingDisks.setPosition(Common::Point(274, 130));
-		_steppingDisks.setDetails(100, 40, -1, 42, 1, NULL);
+		_steppingDisks.setDetails(100, 40, -1, 42, 1, (SceneItem *)NULL);
 	}
 
 	_terminal.setDetails(11, 100, 14, 15, 16);
@@ -1212,25 +1212,25 @@ void Scene150::postInit(SceneObjectList *OwnerList) {
 	_door._state = 0;
 	_door.setVisage(100);
 	_door.setPosition(Common::Point(160, 84));
-	_door.setDetails(100, 3, -1, -1, 1, NULL);
+	_door.setDetails(100, 3, -1, -1, 1, (SceneItem *)NULL);
 
 	_doorDisplay.postInit();
 	_doorDisplay.setup(100, 2, 1);
 	_doorDisplay.setPosition(Common::Point(202, 53));
-	_doorDisplay.setDetails(100, -1, -1, -1, 1, NULL);
+	_doorDisplay.setDetails(100, -1, -1, -1, 1, (SceneItem *)NULL);
 
 	_emptyRoomTable.postInit();
 	_emptyRoomTable.setVisage(100);
 	_emptyRoomTable.setStrip(4);
 	_emptyRoomTable.setFrame(1);
 	_emptyRoomTable.setPosition(Common::Point(175, 157));
-	_emptyRoomTable.setDetails(150, 3, 4, 5, 1, NULL);
+	_emptyRoomTable.setDetails(150, 3, 4, 5, 1, (SceneItem *)NULL);
 
 	_wardrobe.postInit();
 	_wardrobe.setVisage(101);
 	_wardrobe.setPosition(Common::Point(231, 126));
 	_wardrobe.fixPriority(10);
-	_wardrobe.setDetails(100, 37, -1, 39, 1, NULL);
+	_wardrobe.setDetails(100, 37, -1, 39, 1, (SceneItem *)NULL);
 
 	_terminal.setDetails(11, 100, 14, 15, 16);
 	_desk.setDetails(12, 100, 11, -1, 13);
@@ -1367,19 +1367,19 @@ void Scene200::postInit(SceneObjectList *OwnerList) {
 	_northDoor.postInit();
 	_northDoor.setVisage(200);
 	_northDoor.setPosition(Common::Point(188, 79));
-	_northDoor.setDetails(200, 3, -1, -1, 1, NULL);
+	_northDoor.setDetails(200, 3, -1, -1, 1, (SceneItem *)NULL);
 
 	_eastDoor.postInit();
 	_eastDoor.setVisage(200);
 	_eastDoor.setStrip(2);
 	_eastDoor.setPosition(Common::Point(305, 124));
-	_eastDoor.setDetails(200, 6, -1, -1, 1, NULL);
+	_eastDoor.setDetails(200, 6, -1, -1, 1, (SceneItem *)NULL);
 
 	_westDoor.postInit();
 	_westDoor.setVisage(200);
 	_westDoor.setStrip(3);
 	_westDoor.setPosition(Common::Point(62, 84));
-	_westDoor.setDetails(200, 9, -1, -1, 1, NULL);
+	_westDoor.setDetails(200, 9, -1, -1, 1, (SceneItem *)NULL);
 
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.setVisage(10);
@@ -1533,7 +1533,7 @@ void Scene250::Button::setFloor(int floorNumber) {
 
 		setPosition(Common::Point(111, (_floorNumber - 1) * 12 + 43));
 		fixPriority(10);
-		setDetails(250, -1, -1, -1, 1, NULL);
+		setDetails(250, -1, -1, -1, 1, (SceneItem *)NULL);
 	}
 }
 
@@ -1565,12 +1565,12 @@ void Scene250::postInit(SceneObjectList *OwnerList) {
 
 	_currentFloor.setFloor(10);
 	_currentFloor.setup(250, 1, 5);
-	_currentFloor.setDetails(250, 13, -1, -1, 1, NULL);
+	_currentFloor.setDetails(250, 13, -1, -1, 1, (SceneItem *)NULL);
 
 	_button1.setFloor(11);
 	_button1.setup(250, 1, 3);
 	_button1.setPosition(Common::Point(400, 100));
-	_button1.setDetails(250, 14, -1, -1, 1, NULL);
+	_button1.setDetails(250, 14, -1, -1, 1, (SceneItem *)NULL);
 	_button1.fixPriority(190);
 	_button1.hide();
 
@@ -2229,7 +2229,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 		_miranda.setup(302, 2, 1);
 		_miranda.setPosition(Common::Point(47, 128));
 		_miranda.setAction(&_action3);
-		_miranda.setDetails(300, 39, 40, 41, 1, NULL);
+		_miranda.setDetails(300, 39, 40, 41, 1, (SceneItem *)NULL);
 
 		if ((R2_GLOBALS._player._characterScene[2] == 300) || (R2_GLOBALS._player._characterScene[2] == 325)) {
 			_seeker.postInit();
@@ -2237,7 +2237,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 			_seeker.setPosition(Common::Point(158, 108));
 			_seeker.fixPriority(130);
 			_seeker.setAction(&_action2);
-			_seeker.setDetails(300, 42, 43, 44, 1, NULL);
+			_seeker.setDetails(300, 42, 43, 44, 1, (SceneItem *)NULL);
 		}
 
 		R2_GLOBALS._player.postInit();
@@ -2251,14 +2251,14 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 		_miranda.setup(302, 2, 1);
 		_miranda.setPosition(Common::Point(47, 128));
 		_miranda.setAction(&_action3);
-		_miranda.setDetails(300, 39, 40, 41, 1, NULL);
+		_miranda.setDetails(300, 39, 40, 41, 1, (SceneItem *)NULL);
 
 		if ((R2_GLOBALS._player._characterScene[1] == 300) || (R2_GLOBALS._player._characterScene[1] == 325)) {
 			_quinn.postInit();
 			_quinn.setup(302, 3, 1);
 			_quinn.setPosition(Common::Point(271, 150));
 			_quinn.setAction(&_action1);
-			_quinn.setDetails(300, 50, 51, 52, 1, NULL);
+			_quinn.setDetails(300, 50, 51, 52, 1, (SceneItem *)NULL);
 		}
 
 		R2_GLOBALS._player.postInit();
@@ -2275,7 +2275,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 			_seeker.setPosition(Common::Point(158, 108));
 			_seeker.fixPriority(130);
 			_seeker.setAction(&_action2);
-			_seeker.setDetails(300, 42, 43, 44, 1, NULL);
+			_seeker.setDetails(300, 42, 43, 44, 1, (SceneItem *)NULL);
 		}
 
 		if ((R2_GLOBALS._player._characterScene[1] == 300) || (R2_GLOBALS._player._characterScene[1] == 325)) {
@@ -2283,7 +2283,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 			_quinn.setup(302, 3, 1);
 			_quinn.setPosition(Common::Point(271, 150));
 			_quinn.setAction(&_action1);
-			_quinn.setDetails(300, 50, 51, 52, 1, NULL);
+			_quinn.setDetails(300, 50, 51, 52, 1, (SceneItem *)NULL);
 		}
 
 		R2_GLOBALS._player.postInit();
@@ -2305,11 +2305,11 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 	_manualOverrides.setDetails(14, 300, 15, -1, 17);
 	_scanners1.setDetails(Rect(126, 15, 183, 25), 300, 18, -1, 20, 1, NULL);
 	_scanners2.setDetails(Rect(126, 80, 183, 90), 300, 18, -1, 20, 1, NULL);
-	_protocolDisplay.setDetails(300, 27, -1, 29, 1, NULL);
+	_protocolDisplay.setDetails(300, 27, -1, 29, 1, (SceneItem *)NULL);
 	_indirectLighting1.setDetails(Rect(74, 71, 122, 89), 300, 21, -1, -1, 1, NULL);
 	_indirectLighting2.setDetails(Rect(197, 71, 245, 89), 300, 21, -1, -1, 1, NULL);
 	_lighting.setDetails(Rect(129, 3, 190, 14), 300, 24, -1, -1, 1, NULL);
-	_doorway.setDetails(300, 3, -1, 5, 1, NULL);
+	_doorway.setDetails(300, 3, -1, 5, 1, (SceneItem *)NULL);
 	_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 300, 0, -1, -1, 1, NULL);
 
 	switch (R2_GLOBALS._player._characterIndex) {
@@ -2753,7 +2753,7 @@ void Scene400::postInit(SceneObjectList *OwnerList) {
 	_door.postInit();
 	_door.setVisage(100);
 	_door.setPosition(Common::Point(123, 84));
-	_door.setDetails(400, 24, -1, 26, 1, NULL);
+	_door.setDetails(400, 24, -1, 26, 1, (SceneItem *)NULL);
 
 	_consoleDisplay.postInit();
 	_consoleDisplay.setup(400, 4, 1);
@@ -2772,7 +2772,7 @@ void Scene400::postInit(SceneObjectList *OwnerList) {
 		_reader.postInit();
 		_reader.setup(400, 5, 2);
 		_reader.setPosition(Common::Point(301, 95));
-		_reader.setDetails(400, 54, -1, 56, 1, NULL);
+		_reader.setDetails(400, 54, -1, 56, 1, (SceneItem *)NULL);
 	}
 
 	if (R2_INVENTORY.getObjectScene(R2_SENSOR_PROBE) == 400) {
@@ -2780,14 +2780,14 @@ void Scene400::postInit(SceneObjectList *OwnerList) {
 		_sensorProbe.setup(400, 5, 1);
 		_sensorProbe.setPosition(Common::Point(251, 104));
 		_sensorProbe.fixPriority(121);
-		_sensorProbe.setDetails(400, 57, -1, 59, 1, NULL);
+		_sensorProbe.setDetails(400, 57, -1, 59, 1, (SceneItem *)NULL);
 	}
 
 	if (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_UNIT) == 400) {
 		_attractorUnit.postInit();
 		_attractorUnit.setup(400, 5, 3);
 		_attractorUnit.setPosition(Common::Point(265, 129));
-		_attractorUnit.setDetails(400, 60, -1, 62, 1, NULL);
+		_attractorUnit.setDetails(400, 60, -1, 62, 1, (SceneItem *)NULL);
 	}
 
 	R2_GLOBALS._player.postInit();
@@ -3052,12 +3052,12 @@ void Scene800::postInit(SceneObjectList *OwnerList) {
 	_door.setVisage(800);
 	_door.setPosition(Common::Point(286, 108));
 	_door.fixPriority(50);
-	_door.setDetails(800, 3, -1, -1, 1, NULL);
+	_door.setDetails(800, 3, -1, -1, 1, (SceneItem *)NULL);
 
 	_autodocCover.postInit();
 	_autodocCover.setup(800, 2, 1);
 	_autodocCover.setPosition(Common::Point(119, 161));
-	_autodocCover.setDetails(800, 6, 7, -1, 1, NULL);
+	_autodocCover.setDetails(800, 6, 7, -1, 1, (SceneItem *)NULL);
 
 	if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) {
 		_opticalFibre.postInit();
@@ -3087,13 +3087,13 @@ void Scene800::postInit(SceneObjectList *OwnerList) {
 	_cabinet.postInit();
 	_cabinet.setup(801, 1, R2_GLOBALS.getFlag(56) ? 6 : 1);
 	_cabinet.setPosition(Common::Point(169, 79));
-	_cabinet.setDetails(800, 41, -1, -1, 1, NULL);
+	_cabinet.setDetails(800, 41, -1, -1, 1, (SceneItem *)NULL);
 
 	if (R2_INVENTORY.getObjectScene(R2_9) == 800) {
 		_comScanner.postInit();
 		_comScanner.setup(801, 2, 1);
 		_comScanner.setPosition(Common::Point(174, 73));
-		_comScanner.setDetails(800, 34, 35, -1, 1, NULL);
+		_comScanner.setDetails(800, 34, 35, -1, 1, (SceneItem *)NULL);
 	}
 
 	_tray.postInit();
@@ -3101,7 +3101,7 @@ void Scene800::postInit(SceneObjectList *OwnerList) {
 	if (R2_GLOBALS.getFlag(10))
 		_tray.setFrame(5);
 	_tray.setPosition(Common::Point(203, 144));
-	_tray.setDetails(800, 12, -1, 14, 1, NULL);
+	_tray.setDetails(800, 12, -1, 14, 1, (SceneItem *)NULL);
 
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.setVisage(10);
@@ -3641,12 +3641,12 @@ void Scene850::postInit(SceneObjectList *OwnerList) {
 	_liftDoor.postInit();
 	_liftDoor.setup(850, 2, 1);
 	_liftDoor.setPosition(Common::Point(188, 79));
-	_liftDoor.setDetails(850, 3, -1, -1, 1, NULL);
+	_liftDoor.setDetails(850, 3, -1, -1, 1, (SceneItem *)NULL);
 
 	_sickBayDoor.postInit();
 	_sickBayDoor.setup(850, 3, 1);
 	_sickBayDoor.setPosition(Common::Point(62, 84));
-	_sickBayDoor.setDetails(850, 9, -1, -1, 1, NULL);
+	_sickBayDoor.setDetails(850, 9, -1, -1, 1, (SceneItem *)NULL);
 
 	if (R2_INVENTORY.getObjectScene(R2_CLAMP) == 850) {
 		_clamp.postInit();
@@ -3654,7 +3654,7 @@ void Scene850::postInit(SceneObjectList *OwnerList) {
 		_clamp.setPosition(Common::Point(242, 93));
 		_clamp.fixPriority(81);
 		_clamp.animate(ANIM_MODE_2, NULL);
-		_clamp.setDetails(850, 27, -1, -1, 1, NULL);
+		_clamp.setDetails(850, 27, -1, -1, 1, (SceneItem *)NULL);
 	}
 
 	_panel.postInit();
@@ -3665,7 +3665,7 @@ void Scene850::postInit(SceneObjectList *OwnerList) {
 
 	_panel.setPosition(Common::Point(232, 119));
 	_panel.fixPriority(82);
-	_panel.setDetails(850, 24, -1, -1, 1, NULL);
+	_panel.setDetails(850, 24, -1, -1, 1, (SceneItem *)NULL);
 
 	if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 850) {
 		_fibre.postInit();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 1fe920e65c..ef2d0526ae 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -137,10 +137,10 @@ void Scene2000::initPlayer() {
 		_object1.postInit();
 		if (R2_GLOBALS._player._characterIndex == 1) {
 			_object1.setup(20, 5, 1);
-			_object1.setDetails(9002, 0, 4, 3, 1, NULL);
+			_object1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
 			_object1.setup(2008, 5, 1);
-			_object1.setDetails(9001, 0, 5, 3, 1, NULL);
+			_object1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL);
 		}
 		if (_exit1._enabled) {
 			if (_exit2._enabled)
@@ -806,47 +806,47 @@ void Scene2000::postInit(SceneObjectList *OwnerList) {
 
 	_objList1[0].setVisage(2000);
 	_objList1[0].setStrip(2);
-	_objList1[0].setDetails(2001, 0, -1, -1, 1, NULL);
+	_objList1[0].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL);
 
 	_objList1[1].setVisage(2001);
 	_objList1[1].setStrip(2);
-	_objList1[1].setDetails(2001, 0, -1, -1, 1, NULL);
+	_objList1[1].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL);
 
 	_objList1[2].setVisage(2003);
 	_objList1[2].setStrip(1);
-	_objList1[2].setDetails(2001, 0, -1, -1, 1, NULL);
+	_objList1[2].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL);
 
 	_objList1[3].setVisage(2007);
 	_objList1[3].setStrip(2);
-	_objList1[3].setDetails(2001, 12, -1, -1, 1, NULL);
+	_objList1[3].setDetails(2001, 12, -1, -1, 1, (SceneItem *)NULL);
 
 	_objList1[4].setVisage(2004);
 	_objList1[4].setStrip(2);
-	_objList1[4].setDetails(2001, 19, -1, -1, 1, NULL);
+	_objList1[4].setDetails(2001, 19, -1, -1, 1, (SceneItem *)NULL);
 
 	_objList1[5].setVisage(2003);
 	_objList1[5].setStrip(2);
-	_objList1[5].setDetails(2001, 0, -1, -1, 1, NULL);
+	_objList1[5].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL);
 
 	_objList1[6].setVisage(2000);
 	_objList1[6].setStrip(1);
-	_objList1[6].setDetails(2001, 0, -1, -1, 1, NULL);
+	_objList1[6].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL);
 
 	_objList1[7].setVisage(2000);
 	_objList1[7].setStrip(2);
-	_objList1[7].setDetails(2001, 0, -1, -1, 1, NULL);
+	_objList1[7].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL);
 
 	_objList1[8].setVisage(2000);
 	_objList1[8].setStrip(2);
-	_objList1[8].setDetails(2001, 0, -1, -1, 1, NULL);
+	_objList1[8].setDetails(2001, 0, -1, -1, 1, (SceneItem *)NULL);
 
 	_objList1[9].setVisage(2006);
 	_objList1[9].setStrip(1);
-	_objList1[9].setDetails(2001, 6, -1, -1, 1, NULL);
+	_objList1[9].setDetails(2001, 6, -1, -1, 1, (SceneItem *)NULL);
 
 	_objList1[10].setVisage(2007);
 	_objList1[10].setStrip(1);
-	_objList1[10].setDetails(2001, 12, -1, -1, 1, NULL);
+	_objList1[10].setDetails(2001, 12, -1, -1, 1, (SceneItem *)NULL);
 
 	for (int i = 0; i < 11; i++) {
 		_objList1[i].animate(ANIM_MODE_1, NULL);
@@ -1099,10 +1099,10 @@ void Scene2350::postInit(SceneObjectList *OwnerList) {
 		_actor2.postInit();
 		if (R2_GLOBALS._player._characterIndex == 1) {
 			_actor2.setup(20, 5, 1);
-			_actor2.setDetails(9002, 0, 4, 3, 1, NULL);
+			_actor2.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
 			_actor2.setup(2008, 5, 1);
-			_actor2.setDetails(9001, 0, 5, 3, 1,  NULL);
+			_actor2.setDetails(9001, 0, 5, 3, 1,  (SceneItem *)NULL);
 		}
 		_actor2.setPosition(Common::Point(135, 128));
 	}
@@ -1115,11 +1115,11 @@ void Scene2350::postInit(SceneObjectList *OwnerList) {
 	} else {
 		_actor3.setup(2350, 0, 1);
 		_actor3.setPosition(Common::Point(197, 101));
-		_actor3.setDetails(2000, 12, -1, -1, 1, NULL);
+		_actor3.setDetails(2000, 12, -1, -1, 1, (SceneItem *)NULL);
 		_actor3.fixPriority(10);
 		_actor4.setup(2350, 1, 2);
 		_actor4.setPosition(Common::Point(199, 129));
-		_actor4.setDetails(2000, 12, -1, -1, 1, NULL);
+		_actor4.setDetails(2000, 12, -1, -1, 1, (SceneItem *)NULL);
 		_actor4.fixPriority(10);
 	}
 	_item1.setDetails(Rect(0, 0, 320, 200), 2000, 9, -1, -1, 1, NULL);
@@ -1392,10 +1392,10 @@ void Scene2425::postInit(SceneObjectList *OwnerList) {
 		_actor2.postInit();
 		if (R2_GLOBALS._player._characterIndex == 1) {
 			_actor2.setup(20, 5, 1);
-			_actor2.setDetails(9002, 0, 4, 3, 1, NULL);
+			_actor2.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
 			_actor2.setup(2008, 5, 1);
-			_actor2.setDetails(9001, 0, 5, 3, 1, NULL);
+			_actor2.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL);
 		}
 		_actor2.setPosition(Common::Point(250, 185));
 	}
@@ -1408,7 +1408,7 @@ void Scene2425::postInit(SceneObjectList *OwnerList) {
 	
 	_actor1.setPosition(Common::Point(290, 9));
 	_actor1.fixPriority(20);
-	_actor1.setDetails(2455, 12, -1, -1, 1, NULL);
+	_actor1.setDetails(2455, 12, -1, -1, 1, (SceneItem *)NULL);
 	_item1.setDetails(Rect(225, 52, 248, 65), 2425, -1, -1, -1, 1, NULL);
 	_item2.setDetails(Rect(292, 81, 316, 94), 2425, -1, -1, -1, 1, NULL);
 
@@ -1532,14 +1532,14 @@ void Scene2430::postInit(SceneObjectList *OwnerList) {
 		_actor2.setup(2435, 1, 5);
 		_actor2.setPosition(Common::Point(205, 119));
 		_actor2.fixPriority(152);
-		_actor2.setDetails(2430, 51, -1, 53, 1, NULL);
+		_actor2.setDetails(2430, 51, -1, 53, 1, (SceneItem *)NULL);
 	}
 
 	if (R2_INVENTORY.getObjectScene(50) == 2435) {
 		_actor3.postInit();
 		_actor3.setup(2435, 1, 1);
 		_actor3.setPosition(Common::Point(31, 65));
-		_actor3.setDetails(2430, 48, -1, -1, 1, NULL);
+		_actor3.setDetails(2430, 48, -1, -1, 1, (SceneItem *)NULL);
 	}
 
 	R2_GLOBALS._player.postInit();
@@ -1557,10 +1557,10 @@ void Scene2430::postInit(SceneObjectList *OwnerList) {
 		_actor1.postInit();
 		if (R2_GLOBALS._player._characterIndex == 1) {
 			_actor1.setup(20, 5, 1);
-			_actor1.setDetails(9002, 0, 4, 3, 1, NULL);
+			_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
 			_actor1.setup(2008, 5, 1);
-			_actor1.setDetails(9001, 0, 5, 3, 1, NULL);
+			_actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL);
 		}
 		_actor1.setPosition(Common::Point(189, 137));
 		R2_GLOBALS._walkRegions.enableRegion(4);
@@ -1685,7 +1685,7 @@ void Scene2435::postInit(SceneObjectList *OwnerList) {
 	_actor2.postInit();
 	_actor2.setup(2005, 3, 1);
 	_actor2.setPosition(Common::Point(219, 106));
-	_actor2.setDetails(2001, 25, 26, -1, 1, NULL);
+	_actor2.setDetails(2001, 25, 26, -1, 1, (SceneItem *)NULL);
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 	if (R2_GLOBALS._player._characterIndex == 1) {
@@ -1700,10 +1700,10 @@ void Scene2435::postInit(SceneObjectList *OwnerList) {
 		_actor1.postInit();
 		if (R2_GLOBALS._player._characterIndex == 1) {
 			_actor1.setup(20, 5, 1);
-			_actor1.setDetails(9002, 0, 4, 3, 1, NULL);
+			_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
 			_actor1.setup(2008, 5, 1);
-			_actor1.setDetails(9001, 0, 5, 3, 1, NULL);
+			_actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL);
 		}
 		_actor1.setPosition(Common::Point(107, 145));
 		R2_GLOBALS._walkRegions.enableRegion(2);
@@ -1818,7 +1818,7 @@ void Scene2440::postInit(SceneObjectList *OwnerList) {
 		_actor2.setup(2435, 1, 1);
 		_actor2.setPosition(Common::Point(94, 80));
 		_actor2.fixPriority(106);
-		_actor2.setDetails(2430, 48, -1, -1, 1, NULL);
+		_actor2.setDetails(2430, 48, -1, -1, 1, (SceneItem *)NULL);
 	}
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.enableControl();
@@ -1836,10 +1836,10 @@ void Scene2440::postInit(SceneObjectList *OwnerList) {
 		_actor1.postInit();
 		if (R2_GLOBALS._player._characterIndex == 1) {
 			_actor1.setup(20, 5, 1);
-			_actor1.setDetails(9002, 0, 4, 3, 1, NULL);
+			_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
 			_actor1.setup(2008, 5, 1);
-			_actor1.setDetails(9002, 0, 5, 3, 1, NULL);
+			_actor1.setDetails(9002, 0, 5, 3, 1, (SceneItem *)NULL);
 		}
 		_actor1.setPosition(Common::Point(38, 119));
 	}
@@ -1983,7 +1983,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) {
 		_actor2.setVisage(2009);
 		_actor2.setPosition(Common::Point(190, 119));
 		_actor2.fixPriority(50);
-		_actor2.setDetails(2450, 0, -1, -1, 1, NULL);
+		_actor2.setDetails(2450, 0, -1, -1, 1, (SceneItem *)NULL);
 	}
 
 	R2_GLOBALS._player.postInit();
@@ -2006,7 +2006,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) {
 				_actor1.postInit();
 				_actor1.setup(20, 6, 1);
 				_actor1.setPosition(Common::Point(240, 120));
-				_actor1.setDetails(9002, 0, 4, 3, 1, NULL);
+				_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 			}
 			setAction(&_sequenceManager, this, 2451, &R2_GLOBALS._player, NULL);
 		} else {
@@ -2018,7 +2018,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) {
 					_actor1.setup(2008, 6, 1);
 				else
 					_actor1.setup(10, 6, 1);
-				_actor1.setDetails(9001, 0, 5, 3, 1, NULL);
+				_actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL);
 				_actor1.setPosition(Common::Point(106, 111));
 			}
 			setAction(&_sequenceManager, this, 2456, &R2_GLOBALS._player, NULL);
@@ -2039,18 +2039,18 @@ void Scene2450::postInit(SceneObjectList *OwnerList) {
 					_actor1.postInit();
 					_actor1.setup(20, 6, 1);
 					_actor1.setPosition(Common::Point(240, 120));
-					_actor1.setDetails(9002, 0, 4, 3, 1, NULL);
+					_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 				}
 			} else {
 				_actor1.postInit();
 				_actor1.setup(20, 8, 1);
 				_actor1.setPosition(Common::Point(93, 158));
-				_actor1.setDetails(9002, 0, 4, 3, 1, NULL);
+				_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 
 				_actor3.postInit();
 				_actor3.setup(2001, 7, 1);
 				_actor3.setPosition(Common::Point(34, 153));
-				_actor3.setDetails(2001, 40, -1, -1, 1, NULL);
+				_actor3.setDetails(2001, 40, -1, -1, 1, (SceneItem *)NULL);
 
 				_exit1._enabled = false;
 			}
@@ -2068,7 +2068,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) {
 						_actor1.setup(10, 6, 1);
 					}
 					_actor1.setPosition(Common::Point(106, 111));
-					_actor1.setDetails(9001, 0, 5, 3, 1, NULL);
+					_actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL);
 				}
 			} else {
 				_actor1.postInit();
@@ -2078,12 +2078,12 @@ void Scene2450::postInit(SceneObjectList *OwnerList) {
 					_actor1.setup(10, 6, 1);
 				}
 				_actor1.setPosition(Common::Point(106, 111));
-				_actor1.setDetails(9001, 0, 5, 3, 1, NULL);
+				_actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL);
 
 				_actor3.postInit();
 				_actor3.setup(2001, 7, 1);
 				_actor3.setPosition(Common::Point(34, 153));
-				_actor3.setDetails(2001, 40, -1, -1, 1, NULL);
+				_actor3.setDetails(2001, 40, -1, -1, 1, (SceneItem *)NULL);
 
 				_exit1._enabled = false;
 			}
@@ -2187,9 +2187,9 @@ void Scene2450::signal() {
 		break;
 	default:
 		_actor1.postInit();
-		_actor1.setDetails(9002, 0, 4, 3, 2, NULL);
+		_actor1.setDetails(9002, 0, 4, 3, 2, (SceneItem *)NULL);
 		_actor3.postInit();
-		_actor3.setDetails(2001, 40, -1, -1, 2, NULL);
+		_actor3.setDetails(2001, 40, -1, -1, 2, (SceneItem *)NULL);
 		_sceneMode = 2453;
 		setAction(&_sequenceManager, this, 2453, &_actor3, &_actor1, NULL);
 		break;
@@ -2211,7 +2211,7 @@ bool Scene2455::Actor1::startAction(CursorType action, Event &event) {
 			scene->_actor2._lookLineNum = 9;
 			scene->_actor1.remove();
 			scene->_actor3.postInit();
-			scene->_actor3.setDetails(2455, 16, 1, -1, 2, NULL);
+			scene->_actor3.setDetails(2455, 16, 1, -1, 2, (SceneItem *)NULL);
 			scene->setAction(&scene->_sequenceManager, scene, 2458, &R2_GLOBALS._player, &scene->_actor2, &scene->_actor3, NULL);
 			return true;
 		}
@@ -2230,7 +2230,7 @@ bool Scene2455::Actor2::startAction(CursorType action, Event &event) {
 			scene->_actor1.postInit();
 			scene->_actor1.setup(2456, 3, 3);
 			scene->_actor1.setPosition(Common::Point(162, 165));
-			scene->_actor1.setDetails(2455, 15, 1, -1, 2, NULL);
+			scene->_actor1.setDetails(2455, 15, 1, -1, 2, (SceneItem *)NULL);
 			scene->_sceneMode = 11;
 			scene->setAction(&scene->_sequenceManager, scene, 2457, &R2_GLOBALS._player, &scene->_actor2, NULL);
 			return true;
@@ -2242,7 +2242,7 @@ bool Scene2455::Actor2::startAction(CursorType action, Event &event) {
 			scene->_actor1.postInit();
 			scene->_actor1.setup(2456, 3, 3);
 			scene->_actor1.setPosition(Common::Point(162, 165));
-			scene->_actor1.setDetails(2455, 15, 1, -1, 2, NULL);
+			scene->_actor1.setDetails(2455, 15, 1, -1, 2, (SceneItem *)NULL);
 			scene->_sceneMode = 12;
 			scene->setAction(&scene->_sequenceManager, scene, 2457, &R2_GLOBALS._player, &scene->_actor2, NULL);
 			return true;
@@ -2295,25 +2295,25 @@ void Scene2455::postInit(SceneObjectList *OwnerList) {
 			_actor1.postInit();
 			_actor1.setup(2456, 3, 3);
 			_actor1.setPosition(Common::Point(162, 165));
-			_actor1.setDetails(2455, 15, 1, -1, 1, NULL);
+			_actor1.setDetails(2455, 15, 1, -1, 1, (SceneItem *)NULL);
 		}	
 	} else {
 		_actor3.postInit();
 		_actor3.setup(2456, 3, 1);
 		_actor3.setPosition(Common::Point(176, 165));
-		_actor3.setDetails(2455, 16, 1, -1, 1, NULL);
+		_actor3.setDetails(2455, 16, 1, -1, 1, (SceneItem *)NULL);
 	}
 
 	_actor2.postInit();
 	if (R2_INVENTORY.getObjectScene(29) == 2455) {
 		_actor2.setup(2456, 3, 2);
-		_actor2.setDetails(2455, 9, 1, -1, 1, NULL);
+		_actor2.setDetails(2455, 9, 1, -1, 1, (SceneItem *)NULL);
 	} else {
 		if ((R2_INVENTORY.getObjectScene(50) != 2455) && (R2_INVENTORY.getObjectScene(49) != 2455)) 
 			_actor2.setup(2455, 1, 1);
 		else 
 			_actor2.setup(2456, 1, 1);
-		_actor2.setDetails(2455, 3, 1, -1, 1, NULL);
+		_actor2.setDetails(2455, 3, 1, -1, 1, (SceneItem *)NULL);
 	}
 	_actor2.setPosition(Common::Point(162, 165));
 	_actor2.fixPriority(20);
@@ -2426,11 +2426,11 @@ void Scene2500::postInit(SceneObjectList *OwnerList) {
 		_actor1.postInit();
 		if (R2_GLOBALS._player._characterIndex == 1) {
 			_actor1.setup(21, 3, 1);
-			_actor1.setDetails(9002, 1, -1, -1, 1, NULL);
+			_actor1.setDetails(9002, 1, -1, -1, 1, (SceneItem *)NULL);
 		} else {
 			_actor1.setup(2008, 3, 1);
 			_actor1.changeZoom(50);
-			_actor1.setDetails(9001, 0, -1, -1, 1, NULL);
+			_actor1.setDetails(9001, 0, -1, -1, 1, (SceneItem *)NULL);
 		}
 		_actor1.setPosition(Common::Point(141, 94));
 	}
@@ -2540,13 +2540,13 @@ void Scene2525::postInit(SceneObjectList *OwnerList) {
 		_actor3.setup(2435, 1, 2);
 		_actor3.setPosition(Common::Point(78, 155));
 		_actor3.fixPriority(155);
-		_actor3.setDetails(2525, 27, -1, -1, 1, NULL);
+		_actor3.setDetails(2525, 27, -1, -1, 1, (SceneItem *)NULL);
 	}
 
 	_actor2.postInit();
 	_actor2.setup(2525, 1, 1);
 	_actor2.setPosition(Common::Point(183, 114));
-	_actor2.setDetails(2525, 15, -1, -1, 1, NULL);
+	_actor2.setDetails(2525, 15, -1, -1, 1, (SceneItem *)NULL);
 	_actor2.animate(ANIM_MODE_2, NULL);
 	_actor2._numFrames = 3;
 
@@ -2564,10 +2564,10 @@ void Scene2525::postInit(SceneObjectList *OwnerList) {
 		_actor1.postInit();
 		if (R2_GLOBALS._player._characterIndex == 1) {
 			_actor1.setup(20, 5, 1);
-			_actor1.setDetails(9002, 0, 4, 3, 1, NULL);
+			_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
 			_actor1.setup(2008, 5, 1);
-			_actor1.setDetails(9001, 0, 5, 3, 1, NULL);
+			_actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL);
 		}
 		_actor1.setPosition(Common::Point(209, 162));
 
@@ -2696,7 +2696,7 @@ void Scene2530::postInit(SceneObjectList *OwnerList) {
 		_actor2.setup(2435, 1, 3);
 		_actor2.setPosition(Common::Point(299, 80));
 		_actor2.fixPriority(80);
-		_actor2.setDetails(2530, 28, -1, -1, 1, NULL);
+		_actor2.setDetails(2530, 28, -1, -1, 1, (SceneItem *)NULL);
 	}
 
 	_actor3.postInit();
@@ -2707,7 +2707,7 @@ void Scene2530::postInit(SceneObjectList *OwnerList) {
 		_actor3.setup(2531, 4, 1);
 		_actor3.setPosition(Common::Point(173, 131));
 	}
-	_actor3.setDetails(2530, 22, -1, -1, 1, NULL);
+	_actor3.setDetails(2530, 22, -1, -1, 1, (SceneItem *)NULL);
 
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
@@ -2725,10 +2725,10 @@ void Scene2530::postInit(SceneObjectList *OwnerList) {
 		_actor1.postInit();
 		if (R2_GLOBALS._player._characterIndex == 1) {
 			_actor1.setup(20, 5, 1);
-			_actor1.setDetails(9002, 0, 4, 3, 1, NULL);
+			_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
 			_actor1.setup(2008, 5, 1);
-			_actor1.setDetails(9001, 0, 5, 3, 1, NULL);
+			_actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL);
 		}
 		_actor1.setPosition(Common::Point(20, 130));
 		R2_GLOBALS._walkRegions.enableRegion(1);
@@ -2849,14 +2849,14 @@ void Scene2535::postInit(SceneObjectList *OwnerList) {
 		_actor4.setup(2435, 1, 4);
 		_actor4.setPosition(Common::Point(47, 74));
 		_actor4.fixPriority(74);
-		_actor4.setDetails(2535, 21, -1, -1, 1, NULL);
+		_actor4.setDetails(2535, 21, -1, -1, 1, (SceneItem *)NULL);
 	}
 
 	if (R2_INVENTORY.getObjectScene(20) == 2535) {
 		_actor3.postInit();
 		_actor3.setup(2535, 3, 1);
 		_actor3.setPosition(Common::Point(203, 131));
-		_actor3.setDetails(3, 20, -1, -1, 1, NULL);
+		_actor3.setDetails(3, 20, -1, -1, 1, (SceneItem *)NULL);
 		R2_GLOBALS._walkRegions.enableRegion(6);
 	}
 
@@ -2864,7 +2864,7 @@ void Scene2535::postInit(SceneObjectList *OwnerList) {
 		_actor3.postInit();
 		_actor3.setup(2536, 1, 2);
 		_actor3.setPosition(Common::Point(164, 133));
-		_actor3.setDetails(3, 20, -1, -1, 1, NULL);
+		_actor3.setDetails(3, 20, -1, -1, 1, (SceneItem *)NULL);
 	}
 
 	if (R2_GLOBALS.getFlag(73)) {
@@ -2872,7 +2872,7 @@ void Scene2535::postInit(SceneObjectList *OwnerList) {
 		_actor2.setup(2536, 1, 1);
 		_actor2.setPosition(Common::Point(160, 130));
 		_actor2.fixPriority(122);
-		_actor2.setDetails(2535, 37, -1, -1, 1, NULL);
+		_actor2.setDetails(2535, 37, -1, -1, 1, (SceneItem *)NULL);
 	}
 
 	R2_GLOBALS._player.postInit();
@@ -2890,10 +2890,10 @@ void Scene2535::postInit(SceneObjectList *OwnerList) {
 		_actor1.postInit();
 		if (R2_GLOBALS._player._characterIndex == 1) {
 			_actor1.setup(20, 5, 1);
-			_actor1.setDetails(9002, 0, 4, 3, 1, NULL);
+			_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
 			_actor1.setup(2008, 5, 1);
-			_actor1.setDetails(9001, 0, 5, 3, 1, NULL);
+			_actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *)NULL);
 		}
 		_actor1.setPosition(Common::Point(245, 115));
 		R2_GLOBALS._walkRegions.enableRegion(2);
@@ -2940,7 +2940,7 @@ void Scene2535::signal() {
 			_sceneMode = 20;
 			_actor3.show();
 			_actor3.setup(2536, 1, 2);
-			_actor3.setDetails(3, 20, -1, -1, 3, NULL);
+			_actor3.setDetails(3, 20, -1, -1, 3, (SceneItem *)NULL);
 			_actor3.setPosition(Common::Point(164, 150));
 			_actor3.fixPriority(130);
 			_actor3._moveDiff.y = 1;
@@ -4430,7 +4430,7 @@ void Scene2800::postInit(SceneObjectList *OwnerList) {
 		_actor1._moveDiff = Common::Point(2, 1);
 		_actor1.setPosition(Common::Point(122, 82));
 		_actor1.animate(ANIM_MODE_NONE, NULL);
-		_actor1.setDetails(2800, -1, -1, -1, 1, NULL);
+		_actor1.setDetails(2800, -1, -1, -1, 1, (SceneItem *)NULL);
 	}
 	
 	_item1.setDetails(Rect(0, 0, 320, 200), 2800, -1, -1, -1, 1, NULL);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index adcd86e391..85e1f7760b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -102,16 +102,16 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 			_guard.setup(3110, 5, 1);
 			_guard.changeZoom(50);
 			_guard.setPosition(Common::Point(10, 149));
-			_guard.setDetails(3100, 6, -1, -1, 2, NULL);
+			_guard.setDetails(3100, 6, -1, -1, 2, (SceneItem *)NULL);
 
 			_actor4.postInit();
 			_actor4.setup(3103, 1, 1);
 			_actor4.setPosition(Common::Point(278, 113));
-			_actor4.setDetails(3100, 9, -1, -1, 2, NULL);
+			_actor4.setDetails(3100, 9, -1, -1, 2, (SceneItem *)NULL);
 			_actor4.animate(ANIM_MODE_2, NULL);
 
 			_field412 = 1;
-			_actor1.setDetails(3100, 3, -1, -1, 2, NULL);
+			_actor1.setDetails(3100, 3, -1, -1, 2, (SceneItem *)NULL);
 			R2_GLOBALS._sound1.play(243);
 			R2_GLOBALS._sound2.play(130);
 			_sceneMode = 3100;
@@ -130,18 +130,18 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 		_guard.setup(3110, 5, 1);
 		_guard.changeZoom(50);
 		_guard.setPosition(Common::Point(10, 149));
-		_guard.setDetails(3100, 6, -1, -1, 2, NULL);
+		_guard.setDetails(3100, 6, -1, -1, 2, (SceneItem *)NULL);
 		
 		_actor4.postInit();
 		_actor4.setup(3103, 1, 1);
 		_actor4.setPosition(Common::Point(278, 113));
-		_actor4.setDetails(3100, 9, -1, -1, 2, NULL);
+		_actor4.setDetails(3100, 9, -1, -1, 2, (SceneItem *)NULL);
 		_actor4.animate(ANIM_MODE_2, NULL);
 
 		_actor1.postInit();
 		_actor1.setup(3104, 4, 1);
 		_actor1.setPosition(Common::Point(143, 104));
-		_actor1.setDetails(3100, 3, -1, -1, 2, NULL);
+		_actor1.setDetails(3100, 3, -1, -1, 2, (SceneItem *)NULL);
 
 		R2_GLOBALS._player.setup(3110, 3, 1);
 		R2_GLOBALS._player.changeZoom(50);
@@ -306,7 +306,7 @@ void Scene3125::postInit(SceneObjectList *OwnerList) {
 	_actor1.postInit();
 	_actor1.setup(3175, 1, 1);
 	_actor1.setPosition(Common::Point(35, 72));
-	_actor1.setDetails(3125, 12, 13, -1, 1, NULL);
+	_actor1.setDetails(3125, 12, 13, -1, 1, (SceneItem *)NULL);
 
 	_actor2.postInit();
 	_actor2.setup(3126, 4, 1);
@@ -421,7 +421,7 @@ bool Scene3150::Item6::startAction(CursorType action, Event &event) {
 			scene->_actor5.postInit();
 			scene->_actor5._effect = 6;
 			scene->_actor5._shade = 3;
-			scene->_actor5.setDetails(3150, 30, -1, -1, 2, NULL);
+			scene->_actor5.setDetails(3150, 30, -1, -1, 2, (SceneItem *)NULL);
 
 			R2_GLOBALS._player.disableControl();
 			scene->_sceneMode = 3159;
@@ -562,7 +562,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
 		_actor2.fixPriority(125);
 	} else {
 		_actor2.setup(3151, 1, 1);
-		_actor2.setDetails(3150, 8, -1, 9, 1, NULL);
+		_actor2.setDetails(3150, 8, -1, 9, 1, (SceneItem *)NULL);
 	}
 
 	if (R2_GLOBALS.getFlag(78)) {
@@ -571,7 +571,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
 		_actor1.setPosition(Common::Point(104, 129));
 		_actor1._effect = 6;
 		_actor1._shade = 3;
-		_actor1.setDetails(3150, 24, -1, -1, -1, NULL);
+		_actor1.setDetails(3150, 24, -1, -1, -1, (SceneItem *)NULL);
 	}
 
 	_actor7.postInit();
@@ -581,7 +581,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
 	else
 		_actor7.setPosition(Common::Point(264, 58));
 	_actor7.fixPriority(50);
-	_actor7.setDetails(3150, 17, -1, 19, 1, NULL);
+	_actor7.setDetails(3150, 17, -1, 19, 1, (SceneItem *)NULL);
 
 	if (R2_INVENTORY.getObjectScene(41) == 3150) {
 		_actor4.postInit();
@@ -592,10 +592,10 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
 				R2_GLOBALS._walkRegions.enableRegion(5);
 				R2_GLOBALS._walkRegions.enableRegion(6);
 				_actor4.setup(3152, 4, 10);
-				_actor4.setDetails(3150, 14, -1, -1, 1, NULL);
+				_actor4.setDetails(3150, 14, -1, -1, 1, (SceneItem *)NULL);
 			} else {
 				_actor4.setup(3152, 7, 4);
-				_actor4.setDetails(3150, 13, -1, -1, 1, NULL);
+				_actor4.setDetails(3150, 13, -1, -1, 1, (SceneItem *)NULL);
 			}
 			_actor4.fixPriority(110);
 			_actor4.setPosition(Common::Point(83, 88));
@@ -604,7 +604,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
 		} else {
 			_actor4.setup(3152, 7, 3);
 			_actor4.setPosition(Common::Point(143, 70));
-			_actor4.setDetails(3150, 15, -1, -1, 1, NULL);
+			_actor4.setDetails(3150, 15, -1, -1, 1, (SceneItem *)NULL);
 		}
 	}
 
@@ -635,13 +635,13 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
 			_actor5.setup(3152, 7, 7);
 			_actor5.setPosition(Common::Point(155, 79));
 		}
-		_actor5.setDetails(3150, 30, -1, -1, 2, NULL);
+		_actor5.setDetails(3150, 30, -1, -1, 2, (SceneItem *)NULL);
 	}
 
 	_actor6.postInit();
 	_actor6.setup(3152, 7, 6);
 	_actor6.setPosition(Common::Point(98, 73));
-	_actor6.setDetails(3150, 43, -1, -1, 1, NULL);
+	_actor6.setDetails(3150, 43, -1, -1, 1, (SceneItem *)NULL);
 
 	_item2.setDetails(12, 3150, 10, -1, 12);
 	_item3.setDetails(Rect(186, 17, 210, 36), 3150, 6, -1, -1, 1, NULL);
@@ -718,9 +718,9 @@ void Scene3150::signal() {
 		break;
 	case 3153:
 		R2_GLOBALS.setFlag(76);
-		_actor4.setDetails(3150, 14, -1, -1, 3, NULL);
+		_actor4.setDetails(3150, 14, -1, -1, 3, (SceneItem *)NULL);
 		_actor1.postInit();
-		_actor1.setDetails(3150, 24, -1, -1, 2, NULL);
+		_actor1.setDetails(3150, 24, -1, -1, 2, (SceneItem *)NULL);
 		_sceneMode = 3161;
 		setAction(&_sequenceManager, this, 3161, &_actor1, &_actor2, NULL);
 		break;
@@ -734,7 +734,7 @@ void Scene3150::signal() {
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 3156:
-		_actor5.setDetails(3150, 30, -1, -1, 2, NULL);
+		_actor5.setDetails(3150, 30, -1, -1, 2, (SceneItem *)NULL);
 		R2_INVENTORY.setObjectScene(42, 3150);
 		R2_GLOBALS._player.enableControl();
 		break;
@@ -747,7 +747,7 @@ void Scene3150::signal() {
 		R2_GLOBALS.setFlag(75);
 		R2_INVENTORY.setObjectScene(41, 3150);
 		_actor4.fixPriority(110);
-		_actor4.setDetails(3150, 13, -1, -1, 2, NULL);
+		_actor4.setDetails(3150, 13, -1, -1, 2, (SceneItem *)NULL);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 3159:
@@ -884,7 +884,7 @@ void Scene3175::postInit(SceneObjectList *OwnerList) {
 	_actor1.postInit();
 	_actor1.setup(3175, 1, 1);
 	_actor1.setPosition(Common::Point(35, 72));
-	_actor1.setDetails(3175, 9, 10, -1, 1, NULL);
+	_actor1.setDetails(3175, 9, 10, -1, 1, (SceneItem *)NULL);
 
 	_actor2.postInit();
 	_actor2.setup(3175, 2, 1);
@@ -893,7 +893,7 @@ void Scene3175::postInit(SceneObjectList *OwnerList) {
 	_actor3.postInit();
 	_actor3.setup(3175, 3, 1);
 	_actor3.setPosition(Common::Point(199, 117));
-	_actor3.setDetails(3175, 15, 16, 17, 1, NULL);
+	_actor3.setDetails(3175, 15, 16, 17, 1, (SceneItem *)NULL);
 
 	_item2.setDetails(12, 3175, 3, 1, 5);
 	_item3.setDetails(11, 3175, 6, 7, 8);
@@ -1162,19 +1162,19 @@ void Scene3250::postInit(SceneObjectList *OwnerList) {
 	_actor1.setup(3250, 6, 1);
 	_actor1.setPosition(Common::Point(25, 148));
 	_actor1.fixPriority(10);
-	_actor1.setDetails(3250, 9, 10, -1, 1, NULL);
+	_actor1.setDetails(3250, 9, 10, -1, 1, (SceneItem *)NULL);
 
 	_actor2.postInit();
 	_actor2.setup(3250, 4, 1);
 	_actor2.setPosition(Common::Point(259, 126));
 	_actor2.fixPriority(10);
-	_actor2.setDetails(3250, 9, 10, -1, 1, NULL);
+	_actor2.setDetails(3250, 9, 10, -1, 1, (SceneItem *)NULL);
 
 	_actor3.postInit();
 	_actor3.setup(3250, 5, 1);
 	_actor3.setPosition(Common::Point(302, 138));
 	_actor3.fixPriority(10);
-	_actor3.setDetails(3250, 9, 10, -1, 1, NULL);
+	_actor3.setDetails(3250, 9, 10, -1, 1, (SceneItem *)NULL);
 
 	_item3.setDetails(Rect(119, 111, 149, 168), 3250, 6, 7, 2, 1, NULL);
 	_item2.setDetails(Rect(58, 85, 231, 138), 3250, 12, 7, 2, 1, NULL);
@@ -1405,67 +1405,67 @@ void Scene3260::postInit(SceneObjectList *OwnerList) {
 	_actor13.postInit();
 	_actor13.setup(3260, 6, 1);
 	_actor13.setPosition(Common::Point(40, 106));
-	_actor13.setDetails(3260, 18, 1, -1, 1, NULL);
+	_actor13.setDetails(3260, 18, 1, -1, 1, (SceneItem *)NULL);
 
 	if (R2_INVENTORY.getObjectScene(52) == 3260) {
 		_actor14.postInit();
 		_actor14.setup(3260, 7, 1);
 		_actor14.setPosition(Common::Point(202, 66));
-		_actor14.setDetails(3260, 12, 1, -1, 1, NULL);
+		_actor14.setDetails(3260, 12, 1, -1, 1, (SceneItem *)NULL);
 	}
 
 	_actor1.postInit();
 	_actor1.setup(3260, 1, 1);
 	_actor1.setPosition(Common::Point(93, 73));
-	_actor1.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor1.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL);
 	_actor1.setAction(&_action1, &_actor1);
 
 	_actor2.postInit();
 	_actor2.setup(3260, 2, 1);
 	_actor2.setPosition(Common::Point(142, 63));
-	_actor2.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor2.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL);
 	_actor2.setAction(&_action2, &_actor2);
 
 	_actor3.postInit();
 	_actor3.setup(3260, 2, 1);
 	_actor3.setPosition(Common::Point(166, 54));
-	_actor3.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor3.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL);
 	_actor3.setAction(&_action3, &_actor3);
 
 	_actor4.postInit();
 	_actor4.setup(3260, 2, 1);
 	_actor4.setPosition(Common::Point(190, 46));
-	_actor4.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor4.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL);
 	_actor4.setAction(&_action4, &_actor4);
 
 	_actor5.postInit();
 	_actor5.setup(3260, 2, 1);
 	_actor5.setPosition(Common::Point(142, 39));
-	_actor5.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor5.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL);
 	_actor5.setAction(&_action5, &_actor5);
 
 	_actor6.postInit();
 	_actor6.setup(3260, 2, 1);
 	_actor6.setPosition(Common::Point(166, 30));
-	_actor6.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor6.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL);
 	_actor6.setAction(&_action6, &_actor6);
 
 	_actor7.postInit();
 	_actor7.setup(3260, 2, 1);
 	_actor7.setPosition(Common::Point(190, 22));
-	_actor7.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor7.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL);
 	_actor7.setAction(&_action7, &_actor7);
 
 	_actor8.postInit();
 	_actor8.setup(3260, 2, 1);
 	_actor8.setPosition(Common::Point(142, 14));
-	_actor8.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor8.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL);
 	_actor8.setAction(&_action8, &_actor8);
 
 	_actor9.postInit();
 	_actor9.setup(3260, 2, 1);
 	_actor9.setPosition(Common::Point(166, 6));
-	_actor9.setDetails(3260, 3, 1, 5, 1, NULL);
+	_actor9.setDetails(3260, 3, 1, 5, 1, (SceneItem *)NULL);
 	_actor9.setAction(&_action9, &_actor9);
 
 	_actor10.postInit();
@@ -1473,7 +1473,7 @@ void Scene3260::postInit(SceneObjectList *OwnerList) {
 	_actor10.setPosition(Common::Point(265, 163));
 	_actor10.fixPriority(180);
 	_actor10._numFrames = 10;
-	_actor10.setDetails(3260, 6, 1, 8, 1, NULL);
+	_actor10.setDetails(3260, 6, 1, 8, 1, (SceneItem *)NULL);
 	_actor10.animate(ANIM_MODE_2, NULL);
 
 	_actor11.postInit();
@@ -1482,7 +1482,7 @@ void Scene3260::postInit(SceneObjectList *OwnerList) {
 	_actor11.fixPriority(120);
 	_actor11.setAction(&_action11, &_actor11);
 	_actor11._numFrames = 15;
-	_actor11.setDetails(3260, 6, 1, 8, 1, NULL);
+	_actor11.setDetails(3260, 6, 1, 8, 1, (SceneItem *)NULL);
 	_actor11.animate(ANIM_MODE_2, NULL);
 
 	_actor12.postInit();
@@ -1490,7 +1490,7 @@ void Scene3260::postInit(SceneObjectList *OwnerList) {
 	_actor12.setPosition(Common::Point(274, 65));
 	_actor12.setAction(&_action12, &_actor12);
 	_actor12._numFrames = 5;
-	_actor12.setDetails(3260, 9, 1, 11, 1, NULL);
+	_actor12.setDetails(3260, 9, 1, 11, 1, (SceneItem *)NULL);
 	_actor12.animate(ANIM_MODE_2, NULL);
 
 	_item1.setDetails(Rect(0, 0, 320, 200), 3260, 0, 1, 2, 1, NULL);
@@ -1588,7 +1588,7 @@ void Scene3275::postInit(SceneObjectList *OwnerList) {
 	_actor2.postInit();
 	_actor2.setup(3275, 2, 1);
 	_actor2.setPosition(Common::Point(56, 118));
-	_actor2.setDetails(3275, 3, 4, -1, 1, NULL);
+	_actor2.setDetails(3275, 3, 4, -1, 1, (SceneItem *)NULL);
 
 	_item2.setDetails(Rect(153, 58, 200, 120), 3275, 6, 7, 8, 1, NULL);
 	_item3.setDetails(Rect(275, 58, 331, 120), 3275, 6, 7, 8, 1, NULL);
-- 
cgit v1.2.3


From f9bdde939bc0cae15f821f78f95100b566e69c6a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 27 Dec 2011 21:11:49 +1100
Subject: TSAGE: Added missing NULL prefix to one of the R2R setDetails calls

---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 8252584b1c..0ef3a68549 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -423,7 +423,7 @@ void Scene125::Icon::postInit(SceneObjectList *OwnerList) {
 	_sceneText2._color1 = 0;
 	_sceneText2._color2 = 0;
 	_sceneText2._width = 200;
-	setDetails(125, -1, -1, -1, 2, NULL);
+	setDetails(125, -1, -1, -1, 2, (SceneItem *)NULL);
 }
 
 void Scene125::Icon::synchronize(Serializer &s) {
-- 
cgit v1.2.3


From c261cbd02b0d4f19e2a8a384004bb0e1cbe56fde Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Tue, 27 Dec 2011 12:05:06 +0100
Subject: TSAGE: Make lots of globals const.

---
 engines/tsage/staticres.cpp | 240 +++++++++++++++++++++----------------------
 engines/tsage/staticres.h   | 242 ++++++++++++++++++++++----------------------
 2 files changed, 241 insertions(+), 241 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index 1f963f13fb..7d9247b4a3 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -64,126 +64,126 @@ const byte CURSOR_WALK_DATA[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09
 };
 
-const char *LOOK_SCENE_HOTSPOT = "You see nothing special.";
-const char *USE_SCENE_HOTSPOT = "That accomplishes nothing.";
-const char *TALK_SCENE_HOTSPOT = "Yak, yak.";
-const char *SPECIAL_SCENE_HOTSPOT = "That is a unique use for that.";
-const char *DEFAULT_SCENE_HOTSPOT = "That accomplishes nothing.";
-const char *SAVE_ERROR_MSG = "Error occurred saving game. Please do not try to restore this game!";
-const char *SAVING_NOT_ALLOWED_MSG = "Saving is not allowed at this time.";
-const char *RESTORING_NOT_ALLOWED_MSG = "Restoring is not allowed at this time.";
-const char *INV_EMPTY_MSG = "You have nothing in your possesion.";
-
-const char *QUIT_CONFIRM_MSG = "Do you want to quit playing this game?";
-const char *RESTART_MSG = "Do you want to restart this game?";
-const char *GAME_PAUSED_MSG = "Game is paused.";
-const char *OK_BTN_STRING = " Ok ";
-const char *CANCEL_BTN_STRING = "Cancel";
-const char *QUIT_BTN_STRING = " Quit ";
-const char *RESTART_BTN_STRING = "Restart";
-const char *SAVE_BTN_STRING = "Save";
-const char *RESTORE_BTN_STRING = "Restore";
-const char *SOUND_BTN_STRING = "Sound";
-const char *RESUME_BTN_STRING = " Resume \rplay";
-const char *LOOK_BTN_STRING = "Look";
-const char *PICK_BTN_STRING = "Pick";
+char const *const LOOK_SCENE_HOTSPOT = "You see nothing special.";
+char const *const USE_SCENE_HOTSPOT = "That accomplishes nothing.";
+char const *const TALK_SCENE_HOTSPOT = "Yak, yak.";
+char const *const SPECIAL_SCENE_HOTSPOT = "That is a unique use for that.";
+char const *const DEFAULT_SCENE_HOTSPOT = "That accomplishes nothing.";
+char const *const SAVE_ERROR_MSG = "Error occurred saving game. Please do not try to restore this game!";
+char const *const SAVING_NOT_ALLOWED_MSG = "Saving is not allowed at this time.";
+char const *const RESTORING_NOT_ALLOWED_MSG = "Restoring is not allowed at this time.";
+char const *const INV_EMPTY_MSG = "You have nothing in your possesion.";
+
+char const *const QUIT_CONFIRM_MSG = "Do you want to quit playing this game?";
+char const *const RESTART_MSG = "Do you want to restart this game?";
+char const *const GAME_PAUSED_MSG = "Game is paused.";
+char const *const OK_BTN_STRING = " Ok ";
+char const *const CANCEL_BTN_STRING = "Cancel";
+char const *const QUIT_BTN_STRING = " Quit ";
+char const *const RESTART_BTN_STRING = "Restart";
+char const *const SAVE_BTN_STRING = "Save";
+char const *const RESTORE_BTN_STRING = "Restore";
+char const *const SOUND_BTN_STRING = "Sound";
+char const *const RESUME_BTN_STRING = " Resume \rplay";
+char const *const LOOK_BTN_STRING = "Look";
+char const *const PICK_BTN_STRING = "Pick";
 
 
 namespace Ringworld {
 
 // Dialog resources
-const char *HELP_MSG = "Ringworld\rRevenge of the Patriarch\x14\rScummVM Version\r\r\
+char const *const HELP_MSG = "Ringworld\rRevenge of the Patriarch\x14\rScummVM Version\r\r\
 \x01 Keyboard shortcuts...\rF2 - Sound options\rF3 - Quit\r\
 F4 - Restart\rF5 - Save game\rF7 - Restore Game\rF10 - Pause game";
-const char *WATCH_INTRO_MSG = "Do you wish to watch the introduction?";
-const char *START_PLAY_BTN_STRING = " Start Play ";
-const char *INTRODUCTION_BTN_STRING = "Introduction";
-const char *OPTIONS_MSG = "\x01Options...";
+char const *const WATCH_INTRO_MSG = "Do you wish to watch the introduction?";
+char const *const START_PLAY_BTN_STRING = " Start Play ";
+char const *const INTRODUCTION_BTN_STRING = "Introduction";
+char const *const OPTIONS_MSG = "\x01Options...";
 
 // Scene specific resources
-const char *EXIT_MSG = "   EXIT   ";
-const char *SCENE6100_CAREFUL = "Be careful! The probe cannot handle too much of that.";
-const char *SCENE6100_TOUGHER = "Hey! This is tougher than it looks!";
-const char *SCENE6100_ONE_MORE_HIT = "You had better be more careful. One more hit like that \
+char const *const EXIT_MSG = "   EXIT   ";
+char const *const SCENE6100_CAREFUL = "Be careful! The probe cannot handle too much of that.";
+char const *const SCENE6100_TOUGHER = "Hey! This is tougher than it looks!";
+char const *const SCENE6100_ONE_MORE_HIT = "You had better be more careful. One more hit like that \
 and the probe may be destroyed.";
-const char *SCENE6100_DOING_BEST = "I'm doing the best I can. I just hope it holds together!";
-const char *SCENE6100_REPAIR = "\r\rQuinn and Seeker repair the probe....";
-const char *SCENE6100_ROCKY_AREA = "The rocky area should be directly ahead of you. Do you see it?";
-const char *SCENE6100_REPLY = "Yes. Now if I can just avoid those sunbeams.";
-const char *SCENE6100_TAKE_CONTROLS = "You had better take the controls Seeker. My hands are sweating.";
-const char *SCENE6100_SURPRISE = "You surprise me Quinn. I would have thought you of hardier stock.";
-const char *SCENE6100_SWEAT = "Humans sweat, Kzin twitch their tail. What's the difference?";
-const char *SCENE6100_VERY_WELL = "Very well. I will retrieve the stasis box and return the probe. \
+char const *const SCENE6100_DOING_BEST = "I'm doing the best I can. I just hope it holds together!";
+char const *const SCENE6100_REPAIR = "\r\rQuinn and Seeker repair the probe....";
+char const *const SCENE6100_ROCKY_AREA = "The rocky area should be directly ahead of you. Do you see it?";
+char const *const SCENE6100_REPLY = "Yes. Now if I can just avoid those sunbeams.";
+char const *const SCENE6100_TAKE_CONTROLS = "You had better take the controls Seeker. My hands are sweating.";
+char const *const SCENE6100_SURPRISE = "You surprise me Quinn. I would have thought you of hardier stock.";
+char const *const SCENE6100_SWEAT = "Humans sweat, Kzin twitch their tail. What's the difference?";
+char const *const SCENE6100_VERY_WELL = "Very well. I will retrieve the stasis box and return the probe. \
 Wait for it's return in the lander bay.";
 
-const char *DEMO_HELP_MSG = " Help...\rF2 - Sound Options\rF3 - Exit demo\r\rPress ENTER\rto continue";
-const char *DEMO_PAUSED_MSG = "Ringworld\x14 demo is paused";
-const char *DEMO_EXIT_MSG = "Press ENTER to resume the Ringworld\x14 demo. Press ESC to exit";
-const char *EXIT_BTN_STRING = "Exit";
-const char *DEMO_BTN_STRING = "Demo";
-const char *DEMO_RESUME_BTN_STRING = "Resume";
+char const *const DEMO_HELP_MSG = " Help...\rF2 - Sound Options\rF3 - Exit demo\r\rPress ENTER\rto continue";
+char const *const DEMO_PAUSED_MSG = "Ringworld\x14 demo is paused";
+char const *const DEMO_EXIT_MSG = "Press ENTER to resume the Ringworld\x14 demo. Press ESC to exit";
+char const *const EXIT_BTN_STRING = "Exit";
+char const *const DEMO_BTN_STRING = "Demo";
+char const *const DEMO_RESUME_BTN_STRING = "Resume";
 
 } // End of namespace Ringworld
 
 namespace BlueForce {
 
 // Dialog resources
-const char *HELP_MSG = "Blue Force\x14\rScummVM Version\r\r\
+char const *const HELP_MSG = "Blue Force\x14\rScummVM Version\r\r\
 Keyboard shortcuts...\rF2 - Sound options\rF3 - Quit\r\
 F4 - Restart\rF5 - Save game\rF7 - Restore Game\rF10 - Pause game";
-const char *WATCH_INTRO_MSG = "Do you wish to watch the introduction?";
-const char *START_PLAY_BTN_STRING = " Play ";
-const char *INTRODUCTION_BTN_STRING = " Watch ";
-const char *OPTIONS_MSG = "Options...";
+char const *const WATCH_INTRO_MSG = "Do you wish to watch the introduction?";
+char const *const START_PLAY_BTN_STRING = " Play ";
+char const *const INTRODUCTION_BTN_STRING = " Watch ";
+char const *const OPTIONS_MSG = "Options...";
 
 // Blue Force general messages
-const char *BF_NAME = "Blue Force";
-const char *BF_COPYRIGHT = " Copyright, 1993 Tsunami Media, Inc.";
-const char *BF_ALL_RIGHTS_RESERVED = "All Rights Reserved";
-const char *BF_19840518 = "May 18, 1984";
-const char *BF_19840515 = "May 15, 1984";
-const char *BF_3_DAYS = "Three days later";
-const char *BF_11_YEARS = "Eleven years later.";
-const char *BF_NEXT_DAY = "The Next Day";
-const char *BF_ACADEMY = "Here we are at the Academy";
+char const *const BF_NAME = "Blue Force";
+char const *const BF_COPYRIGHT = " Copyright, 1993 Tsunami Media, Inc.";
+char const *const BF_ALL_RIGHTS_RESERVED = "All Rights Reserved";
+char const *const BF_19840518 = "May 18, 1984";
+char const *const BF_19840515 = "May 15, 1984";
+char const *const BF_3_DAYS = "Three days later";
+char const *const BF_11_YEARS = "Eleven years later.";
+char const *const BF_NEXT_DAY = "The Next Day";
+char const *const BF_ACADEMY = "Here we are at the Academy";
 
 // Scene 50 hotspots
-const char *GRANDMA_FRANNIE = "Grandma Frannie";
-const char *MARINA = "Marina";
-const char *POLICE_DEPARTMENT = "Police Department";
-const char *TONYS_BAR = "Tony's Bar";
-const char *CHILD_PROTECTIVE_SERVICES = "Child Protective Services";
-const char *ALLEY_CAT = "Alley Cat";
-const char *CITY_HALL_JAIL = "City Hall & Jail";
-const char *JAMISON_RYAN = "Jamison & Ryan";
-const char *BIKINI_HUT = "Bikini Hut";
+char const *const GRANDMA_FRANNIE = "Grandma Frannie";
+char const *const MARINA = "Marina";
+char const *const POLICE_DEPARTMENT = "Police Department";
+char const *const TONYS_BAR = "Tony's Bar";
+char const *const CHILD_PROTECTIVE_SERVICES = "Child Protective Services";
+char const *const ALLEY_CAT = "Alley Cat";
+char const *const CITY_HALL_JAIL = "City Hall & Jail";
+char const *const JAMISON_RYAN = "Jamison & Ryan";
+char const *const BIKINI_HUT = "Bikini Hut";
 
 // Scene 60 radio messages
-const char *RADIO_BTN_LIST[8] = { "10-2 ", "10-4 ", "10-13", "10-15", "10-27", "10-35", "10-97", "10-98" };
+char const *const RADIO_BTN_LIST[8] = { "10-2 ", "10-4 ", "10-13", "10-15", "10-27", "10-35", "10-97", "10-98" };
 
 // Scene 570 computer messageS
-const char *SCENE570_PASSWORD = "PASSWORD -> ";
-const char *SCENE570_C_DRIVE = "C:\\";
-const char *SCENE570_RING = "RING";
-const char *SCENE570_PROTO = "PROTO";
-const char *SCENE570_WACKY = "WACKY";
-const char *SCENE570_COBB = "COBB";
-const char *SCENE570_LETTER = "LETTER";
-const char *SCENE570_RINGEXE = "RINGEXE";
-const char *SCENE570_RINGDATA = "RINGDATA";
-const char *SCENE570_PROTOEXE = "PROTOEXE";
-const char *SCENE570_PROTODATA = "PROTODATA";
-const char *SCENE570_WACKYEXE = "WACKYEXE";
-const char *SCENE570_WACKYDATA = "WACKYDATA";
+char const *const SCENE570_PASSWORD = "PASSWORD -> ";
+char const *const SCENE570_C_DRIVE = "C:\\";
+char const *const SCENE570_RING = "RING";
+char const *const SCENE570_PROTO = "PROTO";
+char const *const SCENE570_WACKY = "WACKY";
+char const *const SCENE570_COBB = "COBB";
+char const *const SCENE570_LETTER = "LETTER";
+char const *const SCENE570_RINGEXE = "RINGEXE";
+char const *const SCENE570_RINGDATA = "RINGDATA";
+char const *const SCENE570_PROTOEXE = "PROTOEXE";
+char const *const SCENE570_PROTODATA = "PROTODATA";
+char const *const SCENE570_WACKYEXE = "WACKYEXE";
+char const *const SCENE570_WACKYDATA = "WACKYDATA";
 
 // Scene 180 messages
-const char *THE_NEXT_DAY = "The Next Day";
+char const *const THE_NEXT_DAY = "The Next Day";
 
 } // End of namespace BlueForce
 
 namespace Ringworld2 {
 
-const char *CONSOLE_MESSAGES[] = {
+char const *const CONSOLE_MESSAGES[] = {
 	NULL, "Select Language", "Computer Services", "Food Services", "Entertainment Services",
 	"Main Menu", "Exit Menu", "Previous Menu", "Interworld", "Hero's Tongue", "Personal Log",
 	"Database", "Starchart", "Iso-Opto Disk Reader", "Eject Disk", "Meals", "Snacks",
@@ -193,41 +193,41 @@ const char *CONSOLE_MESSAGES[] = {
 };
 
 // Scene 825 Autodoc messages
-const char *MAIN_MENU = "main menu";
-const char *DIAGNOSIS = "diagnosis";
-const char *ADVANCED_PROCEDURES = "advanced procedures";
-const char *VITAL_SIGNS = "vital signs";
-const char *OPEN_DOOR = "open door";
-const char *TREATMENTS = "treatments";
-const char *NO_MALADY_DETECTED =  "no malady detected";
-const char *NO_TREATMENT_REQUIRED = "no treatment required";
-const char *ACCESS_CODE_REQUIRED = "access code required";
-const char *INVALID_ACCESS_CODE = "invalid access code";
-const char *FOREIGN_OBJECT_EXTRACTED = "foreign object extracted";
-
-const char *HELP_MSG = "\x1\rRETURN TO\r RINGWORLD\x14";
-const char *CHAR_TITLE = "\x01Select Character:";
-const char *CHAR_QUINN_MSG = "  Quinn  ";
-const char *CHAR_SEEKER_MSG = "  Seeker  ";
-const char *CHAR_MIRANDA_MSG = "Miranda";
-const char *CHAR_CANCEL_MSG = "  Cancel  ";
-
-const char *GAME_VERSION = "ScummVM Version";
-const char *SOUND_OPTIONS = "Sound options";
-const char *QUIT_GAME = "Quit";
-const char *RESTART_GAME = "Restart";
-const char *SAVE_GAME = "Save game";
-const char *RESTORE_GAME = "Restore game";
-const char *SHOW_CREDITS = "Show credits";
-const char *PAUSE_GAME = "Pause game";
-const char *RESUME_PLAY = "  Resume play  ";
-const char *F2 = "F2";
-const char *F3 = "F3";
-const char *F4 = "F4";
-const char *F5 = "F5";
-const char *F7 = "F7";
-const char *F8 = "F8";
-const char *F10 = "F10";
+char const *const MAIN_MENU = "main menu";
+char const *const DIAGNOSIS = "diagnosis";
+char const *const ADVANCED_PROCEDURES = "advanced procedures";
+char const *const VITAL_SIGNS = "vital signs";
+char const *const OPEN_DOOR = "open door";
+char const *const TREATMENTS = "treatments";
+char const *const NO_MALADY_DETECTED =  "no malady detected";
+char const *const NO_TREATMENT_REQUIRED = "no treatment required";
+char const *const ACCESS_CODE_REQUIRED = "access code required";
+char const *const INVALID_ACCESS_CODE = "invalid access code";
+char const *const FOREIGN_OBJECT_EXTRACTED = "foreign object extracted";
+
+char const *const HELP_MSG = "\x1\rRETURN TO\r RINGWORLD\x14";
+char const *const CHAR_TITLE = "\x01Select Character:";
+char const *const CHAR_QUINN_MSG = "  Quinn  ";
+char const *const CHAR_SEEKER_MSG = "  Seeker  ";
+char const *const CHAR_MIRANDA_MSG = "Miranda";
+char const *const CHAR_CANCEL_MSG = "  Cancel  ";
+
+char const *const GAME_VERSION = "ScummVM Version";
+char const *const SOUND_OPTIONS = "Sound options";
+char const *const QUIT_GAME = "Quit";
+char const *const RESTART_GAME = "Restart";
+char const *const SAVE_GAME = "Save game";
+char const *const RESTORE_GAME = "Restore game";
+char const *const SHOW_CREDITS = "Show credits";
+char const *const PAUSE_GAME = "Pause game";
+char const *const RESUME_PLAY = "  Resume play  ";
+char const *const F2 = "F2";
+char const *const F3 = "F3";
+char const *const F4 = "F4";
+char const *const F5 = "F5";
+char const *const F7 = "F7";
+char const *const F8 = "F8";
+char const *const F10 = "F10";
 
 } // End of namespace Ringworld2
 
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index 90f5d3687f..358ae9f8bb 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -31,161 +31,161 @@ extern const byte CURSOR_ARROW_DATA[];
 
 extern const byte CURSOR_WALK_DATA[];
 
-extern const char *LOOK_SCENE_HOTSPOT;
-extern const char *USE_SCENE_HOTSPOT;
-extern const char *TALK_SCENE_HOTSPOT;
-extern const char *SPECIAL_SCENE_HOTSPOT;
-extern const char *DEFAULT_SCENE_HOTSPOT;
-extern const char *SAVE_ERROR_MSG;
-extern const char *SAVING_NOT_ALLOWED_MSG;
-extern const char *RESTORING_NOT_ALLOWED_MSG;
+extern char const *const LOOK_SCENE_HOTSPOT;
+extern char const *const USE_SCENE_HOTSPOT;
+extern char const *const TALK_SCENE_HOTSPOT;
+extern char const *const SPECIAL_SCENE_HOTSPOT;
+extern char const *const DEFAULT_SCENE_HOTSPOT;
+extern char const *const SAVE_ERROR_MSG;
+extern char const *const SAVING_NOT_ALLOWED_MSG;
+extern char const *const RESTORING_NOT_ALLOWED_MSG;
 
 // Dialogs
-extern const char *QUIT_CONFIRM_MSG;
-extern const char *RESTART_MSG;
-extern const char *GAME_PAUSED_MSG;
-extern const char *OK_BTN_STRING;
-extern const char *CANCEL_BTN_STRING;
-extern const char *QUIT_BTN_STRING;
-extern const char *RESTART_BTN_STRING;
-extern const char *SAVE_BTN_STRING;
-extern const char *RESTORE_BTN_STRING;
-extern const char *SOUND_BTN_STRING;
-extern const char *RESUME_BTN_STRING;
-extern const char *LOOK_BTN_STRING;
-extern const char *PICK_BTN_STRING;
-extern const char *INV_EMPTY_MSG;
+extern char const *const QUIT_CONFIRM_MSG;
+extern char const *const RESTART_MSG;
+extern char const *const GAME_PAUSED_MSG;
+extern char const *const OK_BTN_STRING;
+extern char const *const CANCEL_BTN_STRING;
+extern char const *const QUIT_BTN_STRING;
+extern char const *const RESTART_BTN_STRING;
+extern char const *const SAVE_BTN_STRING;
+extern char const *const RESTORE_BTN_STRING;
+extern char const *const SOUND_BTN_STRING;
+extern char const *const RESUME_BTN_STRING;
+extern char const *const LOOK_BTN_STRING;
+extern char const *const PICK_BTN_STRING;
+extern char const *const INV_EMPTY_MSG;
 
 namespace Ringworld {
 
 // Dialog resources
-extern const char *HELP_MSG;
-extern const char *WATCH_INTRO_MSG;
-extern const char *START_PLAY_BTN_STRING;
-extern const char *INTRODUCTION_BTN_STRING;
-extern const char *OPTIONS_MSG;
+extern char const *const HELP_MSG;
+extern char const *const WATCH_INTRO_MSG;
+extern char const *const START_PLAY_BTN_STRING;
+extern char const *const INTRODUCTION_BTN_STRING;
+extern char const *const OPTIONS_MSG;
 
 // Scene specific resources
-extern const char *EXIT_MSG;
-extern const char *SCENE6100_CAREFUL;
-extern const char *SCENE6100_TOUGHER;
-extern const char *SCENE6100_ONE_MORE_HIT;
-extern const char *SCENE6100_DOING_BEST;
-extern const char *SCENE6100_REPAIR;
-extern const char *SCENE6100_ROCKY_AREA;
-extern const char *SCENE6100_REPLY;
-extern const char *SCENE6100_TAKE_CONTROLS;
-extern const char *SCENE6100_SURPRISE;
-extern const char *SCENE6100_SWEAT;
-extern const char *SCENE6100_VERY_WELL;
+extern char const *const EXIT_MSG;
+extern char const *const SCENE6100_CAREFUL;
+extern char const *const SCENE6100_TOUGHER;
+extern char const *const SCENE6100_ONE_MORE_HIT;
+extern char const *const SCENE6100_DOING_BEST;
+extern char const *const SCENE6100_REPAIR;
+extern char const *const SCENE6100_ROCKY_AREA;
+extern char const *const SCENE6100_REPLY;
+extern char const *const SCENE6100_TAKE_CONTROLS;
+extern char const *const SCENE6100_SURPRISE;
+extern char const *const SCENE6100_SWEAT;
+extern char const *const SCENE6100_VERY_WELL;
 
 // Demo messages
-extern const char *DEMO_HELP_MSG;
-extern const char *DEMO_PAUSED_MSG;
-extern const char *DEMO_HELP_MSG;
-extern const char *DEMO_PAUSED_MSG;
-extern const char *DEMO_EXIT_MSG;
-extern const char *EXIT_BTN_STRING;
-extern const char *DEMO_BTN_STRING;
-extern const char *DEMO_RESUME_BTN_STRING;
+extern char const *const DEMO_HELP_MSG;
+extern char const *const DEMO_PAUSED_MSG;
+extern char const *const DEMO_HELP_MSG;
+extern char const *const DEMO_PAUSED_MSG;
+extern char const *const DEMO_EXIT_MSG;
+extern char const *const EXIT_BTN_STRING;
+extern char const *const DEMO_BTN_STRING;
+extern char const *const DEMO_RESUME_BTN_STRING;
 
 } // End of namespace Ringworld
 
 namespace BlueForce {
 
 // Dialog resources
-extern const char *HELP_MSG;
-extern const char *WATCH_INTRO_MSG;
-extern const char *START_PLAY_BTN_STRING;
-extern const char *INTRODUCTION_BTN_STRING;
-extern const char *OPTIONS_MSG;
+extern char const *const HELP_MSG;
+extern char const *const WATCH_INTRO_MSG;
+extern char const *const START_PLAY_BTN_STRING;
+extern char const *const INTRODUCTION_BTN_STRING;
+extern char const *const OPTIONS_MSG;
 
 // Blue Force messages
-extern const char *BF_NAME;
-extern const char *BF_COPYRIGHT;
-extern const char *BF_ALL_RIGHTS_RESERVED;
-extern const char *BF_19840518;
-extern const char *BF_19840515;
-extern const char *BF_3_DAYS;
-extern const char *BF_11_YEARS;
-extern const char *BF_NEXT_DAY;
-extern const char *BF_ACADEMY;
+extern char const *const BF_NAME;
+extern char const *const BF_COPYRIGHT;
+extern char const *const BF_ALL_RIGHTS_RESERVED;
+extern char const *const BF_19840518;
+extern char const *const BF_19840515;
+extern char const *const BF_3_DAYS;
+extern char const *const BF_11_YEARS;
+extern char const *const BF_NEXT_DAY;
+extern char const *const BF_ACADEMY;
 
 // Scene 50 tooltips
-extern const char *GRANDMA_FRANNIE;
-extern const char *MARINA;
-extern const char *POLICE_DEPARTMENT;
-extern const char *TONYS_BAR;
-extern const char *CHILD_PROTECTIVE_SERVICES;
-extern const char *ALLEY_CAT;
-extern const char *CITY_HALL_JAIL;
-extern const char *JAMISON_RYAN;
-extern const char *BIKINI_HUT;
-
-extern const char *SCENE570_PASSWORD;
-extern const char *SCENE570_C_DRIVE;
-extern const char *SCENE570_RING;
-extern const char *SCENE570_PROTO;
-extern const char *SCENE570_WACKY;
-extern const char *SCENE570_COBB;
-extern const char *SCENE570_LETTER;
-extern const char *SCENE570_RINGEXE;
-extern const char *SCENE570_RINGDATA;
-extern const char *SCENE570_PROTOEXE;
-extern const char *SCENE570_PROTODATA;
-extern const char *SCENE570_WACKYEXE;
-extern const char *SCENE570_WACKYDATA;
+extern char const *const GRANDMA_FRANNIE;
+extern char const *const MARINA;
+extern char const *const POLICE_DEPARTMENT;
+extern char const *const TONYS_BAR;
+extern char const *const CHILD_PROTECTIVE_SERVICES;
+extern char const *const ALLEY_CAT;
+extern char const *const CITY_HALL_JAIL;
+extern char const *const JAMISON_RYAN;
+extern char const *const BIKINI_HUT;
+
+extern char const *const SCENE570_PASSWORD;
+extern char const *const SCENE570_C_DRIVE;
+extern char const *const SCENE570_RING;
+extern char const *const SCENE570_PROTO;
+extern char const *const SCENE570_WACKY;
+extern char const *const SCENE570_COBB;
+extern char const *const SCENE570_LETTER;
+extern char const *const SCENE570_RINGEXE;
+extern char const *const SCENE570_RINGDATA;
+extern char const *const SCENE570_PROTOEXE;
+extern char const *const SCENE570_PROTODATA;
+extern char const *const SCENE570_WACKYEXE;
+extern char const *const SCENE570_WACKYDATA;
 
 // Scene 60 radio dispatch buttons
-extern const char *RADIO_BTN_LIST[8];
+extern char const *const RADIO_BTN_LIST[8];
 
 // Scene 180 message
-extern const char *THE_NEXT_DAY;
+extern char const *const THE_NEXT_DAY;
 
 } // End of namespace BlueForce
 
 namespace Ringworld2 {
 
 // Scene 125 - Console messages
-extern const char *CONSOLE_MESSAGES[];
+extern char const *const CONSOLE_MESSAGES[];
 
 // Scene 825 - Autodoc Messages
-extern const char *MAIN_MENU;
-extern const char *DIAGNOSIS;
-extern const char *ADVANCED_PROCEDURES;
-extern const char *VITAL_SIGNS;
-extern const char *OPEN_DOOR;
-extern const char *TREATMENTS;
-extern const char *NO_MALADY_DETECTED;
-extern const char *NO_TREATMENT_REQUIRED;
-extern const char *ACCESS_CODE_REQUIRED;
-extern const char *INVALID_ACCESS_CODE;
-extern const char *FOREIGN_OBJECT_EXTRACTED;
+extern char const *const MAIN_MENU;
+extern char const *const DIAGNOSIS;
+extern char const *const ADVANCED_PROCEDURES;
+extern char const *const VITAL_SIGNS;
+extern char const *const OPEN_DOOR;
+extern char const *const TREATMENTS;
+extern char const *const NO_MALADY_DETECTED;
+extern char const *const NO_TREATMENT_REQUIRED;
+extern char const *const ACCESS_CODE_REQUIRED;
+extern char const *const INVALID_ACCESS_CODE;
+extern char const *const FOREIGN_OBJECT_EXTRACTED;
 
 // Dialog messages
-extern const char *HELP_MSG;
-extern const char *CHAR_TITLE;
-extern const char *CHAR_QUINN_MSG;
-extern const char *CHAR_SEEKER_MSG;
-extern const char *CHAR_MIRANDA_MSG;
-extern const char *CHAR_CANCEL_MSG;
-
-extern const char *GAME_VERSION;
-extern const char *SOUND_OPTIONS;
-extern const char *QUIT_GAME;
-extern const char *RESTART_GAME;
-extern const char *SAVE_GAME;
-extern const char *RESTORE_GAME;
-extern const char *SHOW_CREDITS;
-extern const char *PAUSE_GAME;
-extern const char *RESUME_PLAY;
-extern const char *F2;
-extern const char *F3;
-extern const char *F4;
-extern const char *F5;
-extern const char *F7;
-extern const char *F8;
-extern const char *F10;
+extern char const *const HELP_MSG;
+extern char const *const CHAR_TITLE;
+extern char const *const CHAR_QUINN_MSG;
+extern char const *const CHAR_SEEKER_MSG;
+extern char const *const CHAR_MIRANDA_MSG;
+extern char const *const CHAR_CANCEL_MSG;
+
+extern char const *const GAME_VERSION;
+extern char const *const SOUND_OPTIONS;
+extern char const *const QUIT_GAME;
+extern char const *const RESTART_GAME;
+extern char const *const SAVE_GAME;
+extern char const *const RESTORE_GAME;
+extern char const *const SHOW_CREDITS;
+extern char const *const PAUSE_GAME;
+extern char const *const RESUME_PLAY;
+extern char const *const F2;
+extern char const *const F3;
+extern char const *const F4;
+extern char const *const F5;
+extern char const *const F7;
+extern char const *const F8;
+extern char const *const F10;
 
 } // End of namespace Ringworld2
 
-- 
cgit v1.2.3


From 39a0153fbf503854011bc1947ef261e06868d971 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 13:52:13 +0100
Subject: DREAMWEB: Remove mapStore segment

---
 engines/dreamweb/dreambase.h  |  3 +-
 engines/dreamweb/dreamgen.cpp |  6 +--
 engines/dreamweb/dreamgen.h   | 93 +++++++++++++++++++++----------------------
 engines/dreamweb/monitor.cpp  |  4 +-
 engines/dreamweb/newplace.cpp |  4 +-
 engines/dreamweb/print.cpp    |  8 ++--
 engines/dreamweb/stubs.cpp    |  5 +--
 engines/dreamweb/vgagrafx.cpp | 15 ++++---
 8 files changed, 68 insertions(+), 70 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 44d62db9c8..ed384fae99 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -47,6 +47,7 @@ const unsigned int kUnderTextBufSize = kUnderTextSizeX_f * kUnderTextSizeY_f;
 const unsigned int kUnderTimedTextBufSize = 256 * kUnderTimedTextSizeY_f;
 const unsigned int kLengthOfVars = 68;
 const unsigned int kNumChanges = 250;
+const unsigned int kLenOfMapStore = 22*8*20*8;
 
 /**
  * This class is one of the parent classes of DreamGenContext. Its sole purpose
@@ -85,6 +86,7 @@ protected:
 
 	// from vgagrafx.cpp
 	uint8 _workspace[(0x1000 + 2) * 16];
+	uint8 _mapStore[kLenOfMapStore + 32];
 
 	// from people.cpp
 	ReelRoutine _reelRoutines[kNumReelRoutines+1];
@@ -794,7 +796,6 @@ public:
 	inline uint8 *workspace() { return _workspace; }
 	void clearWork();
 
-	uint8 *mapStore();
 	void panelToMap();
 	void mapToPanel();
 	void dumpMap();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 777961fcef..910fd8147d 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -65,15 +65,15 @@ void DreamGenContext::__start() {
 		//0x0100: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0110: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0120: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0130: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0140: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0150: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index b736c3c9cb..3ad9b1d186 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -251,53 +251,52 @@ static const uint16 kBufferin = 276;
 static const uint16 kBufferout = 278;
 static const uint16 kExtras = 280;
 static const uint16 kWorkspace = 282;
-static const uint16 kMapstore = 284;
-static const uint16 kCharset1 = 286;
-static const uint16 kMainsprites = 288;
-static const uint16 kBackdrop = 290;
-static const uint16 kMapdata = 292;
-static const uint16 kRecordspace = 294;
-static const uint16 kFreedat = 296;
-static const uint16 kSetdat = 298;
-static const uint16 kReel1 = 300;
-static const uint16 kReel2 = 302;
-static const uint16 kReel3 = 304;
-static const uint16 kRoomdesc = 306;
-static const uint16 kFreedesc = 308;
-static const uint16 kSetdesc = 310;
-static const uint16 kBlockdesc = 312;
-static const uint16 kSetframes = 314;
-static const uint16 kFreeframes = 316;
-static const uint16 kPeople = 318;
-static const uint16 kReels = 320;
-static const uint16 kCommandtext = 322;
-static const uint16 kPuzzletext = 324;
-static const uint16 kTraveltext = 326;
-static const uint16 kTempgraphics = 328;
-static const uint16 kTempgraphics2 = 330;
-static const uint16 kTempgraphics3 = 332;
-static const uint16 kTempsprites = 334;
-static const uint16 kTextfile1 = 336;
-static const uint16 kTextfile2 = 338;
-static const uint16 kTextfile3 = 340;
-static const uint16 kBlinkframe = 342;
-static const uint16 kBlinkcount = 343;
-static const uint16 kReasseschanges = 344;
-static const uint16 kPointerspath = 345;
-static const uint16 kManspath = 346;
-static const uint16 kPointerfirstpath = 347;
-static const uint16 kFinaldest = 348;
-static const uint16 kDestination = 349;
-static const uint16 kLinestartx = 350;
-static const uint16 kLinestarty = 352;
-static const uint16 kLineendx = 354;
-static const uint16 kLineendy = 356;
-static const uint16 kLinepointer = 358;
-static const uint16 kLinedirection = 359;
-static const uint16 kLinelength = 360;
-static const uint16 kCh0playing = 361;
-static const uint16 kCh0repeat = 362;
-static const uint16 kCh1playing = 363;
+static const uint16 kCharset1 = 284;
+static const uint16 kMainsprites = 286;
+static const uint16 kBackdrop = 288;
+static const uint16 kMapdata = 290;
+static const uint16 kRecordspace = 292;
+static const uint16 kFreedat = 294;
+static const uint16 kSetdat = 296;
+static const uint16 kReel1 = 298;
+static const uint16 kReel2 = 300;
+static const uint16 kReel3 = 302;
+static const uint16 kRoomdesc = 304;
+static const uint16 kFreedesc = 306;
+static const uint16 kSetdesc = 308;
+static const uint16 kBlockdesc = 310;
+static const uint16 kSetframes = 312;
+static const uint16 kFreeframes = 314;
+static const uint16 kPeople = 316;
+static const uint16 kReels = 318;
+static const uint16 kCommandtext = 320;
+static const uint16 kPuzzletext = 322;
+static const uint16 kTraveltext = 324;
+static const uint16 kTempgraphics = 326;
+static const uint16 kTempgraphics2 = 328;
+static const uint16 kTempgraphics3 = 330;
+static const uint16 kTempsprites = 332;
+static const uint16 kTextfile1 = 334;
+static const uint16 kTextfile2 = 336;
+static const uint16 kTextfile3 = 338;
+static const uint16 kBlinkframe = 340;
+static const uint16 kBlinkcount = 341;
+static const uint16 kReasseschanges = 342;
+static const uint16 kPointerspath = 343;
+static const uint16 kManspath = 344;
+static const uint16 kPointerfirstpath = 345;
+static const uint16 kFinaldest = 346;
+static const uint16 kDestination = 347;
+static const uint16 kLinestartx = 348;
+static const uint16 kLinestarty = 350;
+static const uint16 kLineendx = 352;
+static const uint16 kLineendy = 354;
+static const uint16 kLinepointer = 356;
+static const uint16 kLinedirection = 357;
+static const uint16 kLinelength = 358;
+static const uint16 kCh0playing = 359;
+static const uint16 kCh0repeat = 360;
+static const uint16 kCh1playing = 361;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 7419bcfdd8..4f037c6a58 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -223,7 +223,7 @@ void DreamBase::input() {
 		_inputLine[data.word(kCurpos) * 2 + 0] = currentKey;
 		if (currentKey > 'Z')
 			continue;
-		multiGet(mapStore() + data.word(kCurpos) * 256, data.word(kMonadx), data.word(kMonady), 8, 8);
+		multiGet(_mapStore + data.word(kCurpos) * 256, data.word(kMonadx), data.word(kMonady), 8, 8);
 		uint8 charWidth;
 		printChar(engine->tempCharset(), data.word(kMonadx), data.word(kMonady), currentKey, 0, &charWidth, NULL);
 		_inputLine[data.word(kCurpos) * 2 + 1] = charWidth;
@@ -248,7 +248,7 @@ void DreamBase::delChar() {
 	data.word(kCurslocx) -= width;
 	uint16 offset = data.word(kCurpos);
 	offset = ((offset & 0x00ff) << 8) | ((offset & 0xff00) >> 8);
-	multiPut(mapStore() + offset, data.word(kMonadx), data.word(kMonady), 8, 8);
+	multiPut(_mapStore + offset, data.word(kMonadx), data.word(kMonady), 8, 8);
 	multiDump(data.word(kMonadx), data.word(kMonady), 8, 8);
 }
 
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 8c94b3f9cf..4d82d7032f 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -134,11 +134,11 @@ void DreamBase::lookAtPlace() {
 }
 
 void DreamBase::getUnderCentre() {
-	multiGet(mapStore(), 58, 72, 254, 110);
+	multiGet(_mapStore, 58, 72, 254, 110);
 }
 
 void DreamBase::putUnderCentre() {
-	multiPut(mapStore(), 58, 72, 254, 110);
+	multiPut(_mapStore, 58, 72, 254, 110);
 }
 
 void DreamBase::locationPic() {
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 9cd7b46d50..f5f0dda43c 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -253,7 +253,7 @@ void DreamBase::rollEndCreditsGameWon() {
 	data.byte(kVolumeto) = 0;
 	data.byte(kVolumedirection) = (byte)-1;
 
-	multiGet(mapStore(), 75, 20, 160, 160);
+	multiGet(_mapStore, 75, 20, 160, 160);
 
 	const uint8 *string = getTextInFile1(3);
 	const int linespacing = data.word(kLinespacing);
@@ -264,7 +264,7 @@ void DreamBase::rollEndCreditsGameWon() {
 		// line of text.
 		for (int j = 0; j < linespacing; ++j) {
 			vSync();
-			multiPut(mapStore(), 75, 20, 160, 160);
+			multiPut(_mapStore, 75, 20, 160, 160);
 			vSync();
 
 			// Output up to 18 lines of text
@@ -292,7 +292,7 @@ void DreamBase::rollEndCreditsGameWon() {
 }
 
 void DreamBase::rollEndCreditsGameLost() {
-	multiGet(mapStore(), 25, 20, 160, 160);
+	multiGet(_mapStore, 25, 20, 160, 160);
 
 	const uint8 *string = getTextInFile1(49);
 	const int linespacing = data.word(kLinespacing);
@@ -303,7 +303,7 @@ void DreamBase::rollEndCreditsGameLost() {
 		// line of text.
 		for (int j = 0; j < linespacing; ++j) {
 			vSync();
-			multiPut(mapStore(), 25, 20, 160, 160);
+			multiPut(_mapStore, 25, 20, 160, 160);
 			vSync();
 
 			// Output up to 18 lines of text
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 1392d16dd7..772509b842 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -836,7 +836,7 @@ void DreamBase::putUnderTimed() {
 }
 
 void DreamBase::triggerMessage(uint16 index) {
-	multiGet(mapStore(), 174, 153, 200, 63);
+	multiGet(_mapStore, 174, 153, 200, 63);
 	uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(index * 2);
 	const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
 	uint16 y = 156;
@@ -844,7 +844,7 @@ void DreamBase::triggerMessage(uint16 index) {
 	hangOn(140);
 	workToScreen();
 	hangOn(340);
-	multiPut(mapStore(), 174, 153, 200, 63);
+	multiPut(_mapStore, 174, 153, 200, 63);
 	workToScreen();
 	data.byte(kLasttrigger) = 0;
 }
@@ -2464,7 +2464,6 @@ void DreamBase::allocateBuffers() {
 	data.word(kMapdata) = allocateMem(kLengthofmap/16);
 	data.word(kFreedat) = allocateMem(kFreedatlen/16);
 	data.word(kSetdat) = allocateMem(kSetdatlen/16);
-	data.word(kMapstore) = allocateMem(kLenofmapstore/16);
 }
 
 void DreamBase::workToScreenM() {
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 7e74264dd7..f611a79329 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -357,16 +357,12 @@ void DreamBase::zoom() {
 	data.byte(kDidzoom) = 1;
 }
 
-uint8 *DreamBase::mapStore() {
-	return getSegment(data.word(kMapstore)).ptr(0, 0);
-}
-
 void DreamBase::panelToMap() {
-	multiGet(mapStore(), data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
+	multiGet(_mapStore, data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
 }
 
 void DreamBase::mapToPanel() {
-	multiPut(mapStore(), data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
+	multiPut(_mapStore, data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
 }
 
 void DreamBase::dumpMap() {
@@ -384,11 +380,12 @@ bool DreamBase::pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y) {
 
 void DreamBase::loadPalFromIFF() {
 	Common::File palFile;
+	uint8* buf = new uint8[2000];
 	palFile.open("DREAMWEB.PAL");
-	palFile.read(mapStore(), 2000);
+	palFile.read(buf, 2000);
 	palFile.close();
 
-	const uint8 *src = mapStore() + 0x30;
+	const uint8 *src = buf + 0x30;
 	uint8 *dst = _mainPal;
 	for (size_t i = 0; i < 256*3; ++i) {
 		uint8 c = src[i] / 4;
@@ -401,6 +398,8 @@ void DreamBase::loadPalFromIFF() {
 		}
 		dst[i] = c;
 	}
+
+	delete[] buf;
 }
 
 void DreamBase::createPanel() {
-- 
cgit v1.2.3


From 7bae1022eddc9805bb9163c01676f02f50459c4f Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 14:09:29 +0100
Subject: DREAMWEB: Remove mapData segment

---
 engines/dreamweb/backdrop.cpp | 5 +++--
 engines/dreamweb/dreambase.h  | 6 ++++++
 engines/dreamweb/sprite.cpp   | 3 +--
 engines/dreamweb/stubs.cpp    | 3 +--
 4 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 875e16805e..e85889dae5 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -27,7 +27,7 @@ namespace DreamGen {
 void DreamBase::doBlocks() {
 	uint16 dstOffset = data.word(kMapady) * 320 + data.word(kMapadx);
 	uint16 mapOffset = kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx);
-	const uint8 *mapData = getSegment(data.word(kMapdata)).ptr(mapOffset, 0);
+	const uint8 *mapData = _mapData + mapOffset;
 	const uint8 *blocks = getSegment(data.word(kBackdrop)).ptr(kBlocks, 0);
 	uint8 *dstBuffer = workspace() + dstOffset;
 
@@ -242,7 +242,8 @@ void DreamBase::showAllFree() {
 
 void DreamBase::drawFlags() {
 	uint8 *mapFlags = _mapFlags;
-	const uint8 *mapData = getSegment(data.word(kMapdata)).ptr(kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx), 0);
+	uint16 mapOffset = kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx);
+	const uint8 *mapData = _mapData + mapOffset;
 	const uint8 *backdropFlags = getSegment(data.word(kBackdrop)).ptr(kFlags, 0);
 
 	for (size_t i = 0; i < 10; ++i) {
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index ed384fae99..b310bb3b46 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -48,6 +48,9 @@ const unsigned int kUnderTimedTextBufSize = 256 * kUnderTimedTextSizeY_f;
 const unsigned int kLengthOfVars = 68;
 const unsigned int kNumChanges = 250;
 const unsigned int kLenOfMapStore = 22*8*20*8;
+const unsigned int kMapWidth = 66;
+const unsigned int kMapHeight = 60;
+const unsigned int kLengthOfMap = kMapWidth * kMapHeight;
 
 /**
  * This class is one of the parent classes of DreamGenContext. Its sole purpose
@@ -62,6 +65,9 @@ class DreamBase : public SegmentManager {
 protected:
 	DreamWeb::DreamWebEngine *engine;
 
+	// from backdrop.cpp
+	uint8 _mapData[kLengthOfMap + 32];
+
 	// from keypad.cpp
 	uint8 _pressList[6];
 
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 3c1ba6be2f..244f6a32ae 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -1100,8 +1100,7 @@ void DreamBase::clearBeforeLoad() {
 	clearReels();
 
 	//clearRest
-	uint8 *dst = (uint8 *)getSegment(data.word(kMapdata)).ptr(0, 0);
-	memset(dst, 0, kMaplen);
+	memset(_mapData, 0, kMaplen);
 	deallocateMem(data.word(kBackdrop));
 	deallocateMem(data.word(kSetframes));
 	deallocateMem(data.word(kReels));
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 772509b842..e47e79250f 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1885,7 +1885,7 @@ void DreamBase::zoomOnOff() {
 
 void DreamBase::sortOutMap() {
 	const uint8 *src = workspace();
-	uint8 *dst = (uint8 *)getSegment(data.word(kMapdata)).ptr(0, 0);
+	uint8 *dst = _mapData;
 	for (uint16 y = 0; y < kMaplength; ++y) {
 		memcpy(dst, src, kMapwidth);
 		dst += kMapwidth;
@@ -2461,7 +2461,6 @@ void DreamBase::drawFloor() {
 
 void DreamBase::allocateBuffers() {
 	data.word(kExtras) = allocateMem(kLengthofextra/16);
-	data.word(kMapdata) = allocateMem(kLengthofmap/16);
 	data.word(kFreedat) = allocateMem(kFreedatlen/16);
 	data.word(kSetdat) = allocateMem(kSetdatlen/16);
 }
-- 
cgit v1.2.3


From df7bb24184ea599280640107c19f898c43d74ac3 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 17:56:37 +0100
Subject: DREAMWEB: Create MapFlags struct, remove backdrops segment

---
 engines/dreamweb/backdrop.cpp | 30 +++++++--------
 engines/dreamweb/dreambase.h  |  6 +--
 engines/dreamweb/dreamgen.cpp |  6 +--
 engines/dreamweb/dreamgen.h   | 85 +++++++++++++++++++++----------------------
 engines/dreamweb/sprite.cpp   | 10 ++---
 engines/dreamweb/structs.h    | 11 ++++++
 engines/dreamweb/stubs.cpp    |  8 +++-
 7 files changed, 84 insertions(+), 72 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index e85889dae5..553390fe70 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -28,7 +28,6 @@ void DreamBase::doBlocks() {
 	uint16 dstOffset = data.word(kMapady) * 320 + data.word(kMapadx);
 	uint16 mapOffset = kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx);
 	const uint8 *mapData = _mapData + mapOffset;
-	const uint8 *blocks = getSegment(data.word(kBackdrop)).ptr(kBlocks, 0);
 	uint8 *dstBuffer = workspace() + dstOffset;
 
 	for (size_t i = 0; i < 10; ++i) {
@@ -36,7 +35,7 @@ void DreamBase::doBlocks() {
 			uint16 blockType = mapData[j];
 			if (blockType != 0) {
 				uint8 *dst = dstBuffer + i * 320 * 16 + j * 16;
-				const uint8 *block = blocks + blockType * 256;
+				const uint8 *block = _backdropBlocks + blockType * 256;
 				for (size_t k = 0; k < 4; ++k) {
 					memcpy(dst, block, 16);
 					block += 16;
@@ -162,17 +161,17 @@ void DreamBase::showAllObs() {
 	}
 }
 
-bool DreamBase::addAlong(const uint8 *mapFlags) {
+static bool addAlong(const MapFlag *mapFlags) {
 	for (size_t i = 0; i < 11; ++i) {
-		if (mapFlags[3 * i] != 0)
+		if (mapFlags[i]._flag != 0)
 			return true;
 	}
 	return false;
 }
 
-bool DreamBase::addLength(const uint8 *mapFlags) {
+static bool addLength(const MapFlag *mapFlags) {
 	for (size_t i = 0; i < 10; ++i) {
-		if (mapFlags[3 * 11 * i] != 0)
+		if (mapFlags[11 * i]._flag != 0)
 			return true;
 	}
 	return false;
@@ -180,19 +179,19 @@ bool DreamBase::addLength(const uint8 *mapFlags) {
 
 void DreamBase::getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize) {
 	uint8 yStart = 0;
-	while (! addAlong(_mapFlags + 3 * 11 * yStart))
+	while (! addAlong(_mapFlags + 11 * yStart))
 		++yStart;
 
 	uint8 xStart = 0;
-	while (! addLength(_mapFlags + 3 * xStart))
+	while (! addLength(_mapFlags + xStart))
 		++xStart;
 
 	uint8 yEnd = 10;
-	while (! addAlong(_mapFlags + 3 * 11 * (yEnd - 1)))
+	while (! addAlong(_mapFlags + 11 * (yEnd - 1)))
 		--yEnd;
 
 	uint8 xEnd = 11;
-	while (! addLength(_mapFlags + 3 * (xEnd - 1)))
+	while (! addLength(_mapFlags + (xEnd - 1)))
 		--xEnd;
 
 	*mapXstart = xStart;
@@ -241,18 +240,17 @@ void DreamBase::showAllFree() {
 }
 
 void DreamBase::drawFlags() {
-	uint8 *mapFlags = _mapFlags;
+	MapFlag *mapFlag = _mapFlags;
 	uint16 mapOffset = kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx);
 	const uint8 *mapData = _mapData + mapOffset;
-	const uint8 *backdropFlags = getSegment(data.word(kBackdrop)).ptr(kFlags, 0);
 
 	for (size_t i = 0; i < 10; ++i) {
 		for (size_t j = 0; j < 11; ++j) {
 			uint8 tile = mapData[i * kMapwidth + j];
-			mapFlags[0] = backdropFlags[2 * tile + 0];
-			mapFlags[1] = backdropFlags[2 * tile + 1];
-			mapFlags[2] = tile;
-			mapFlags += 3;
+			mapFlag->_flag = _backdropFlags[tile]._flag;
+			mapFlag->_flagEx = _backdropFlags[tile]._flagEx;
+			mapFlag->_type = tile;
+			mapFlag++;
 		}
 	}
 }
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index b310bb3b46..21fd415052 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -66,6 +66,8 @@ protected:
 	DreamWeb::DreamWebEngine *engine;
 
 	// from backdrop.cpp
+	uint8 *_backdropBlocks;
+	BackdropMapFlag _backdropFlags[96];
 	uint8 _mapData[kLengthOfMap + 32];
 
 	// from keypad.cpp
@@ -103,7 +105,7 @@ protected:
 	ObjectRef _openInvList[16];
 	ObjectRef _ryanInvList[30];
 	uint8 _pointerBack[32*32];
-	uint8 _mapFlags[11*10*3];
+	MapFlag _mapFlags[11*10];
 	uint8 _startPal[3*256];
 	uint8 _endPal[3*256];
 	uint8 _mainPal[3*256];
@@ -137,8 +139,6 @@ public:
 	void calcFrFrame(const Frame *frameBase, uint16 frameNum, uint8* width, uint8* height, uint16 x, uint16 y, ObjPos *objPos);
 	void makeBackOb(SetObject *objData, uint16 x, uint16 y);
 	void showAllObs();
-	bool addAlong(const uint8 *mapFlags);
-	bool addLength(const uint8 *mapFlags);
 	void getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize);
 	void calcMapAd();
 	void showAllFree();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 910fd8147d..a0a3f0759b 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -65,15 +65,15 @@ void DreamGenContext::__start() {
 		//0x0100: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0110: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0120: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0130: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0140: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0150: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 3ad9b1d186..b7f3a5e452 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -254,49 +254,48 @@ static const uint16 kWorkspace = 282;
 static const uint16 kCharset1 = 284;
 static const uint16 kMainsprites = 286;
 static const uint16 kBackdrop = 288;
-static const uint16 kMapdata = 290;
-static const uint16 kRecordspace = 292;
-static const uint16 kFreedat = 294;
-static const uint16 kSetdat = 296;
-static const uint16 kReel1 = 298;
-static const uint16 kReel2 = 300;
-static const uint16 kReel3 = 302;
-static const uint16 kRoomdesc = 304;
-static const uint16 kFreedesc = 306;
-static const uint16 kSetdesc = 308;
-static const uint16 kBlockdesc = 310;
-static const uint16 kSetframes = 312;
-static const uint16 kFreeframes = 314;
-static const uint16 kPeople = 316;
-static const uint16 kReels = 318;
-static const uint16 kCommandtext = 320;
-static const uint16 kPuzzletext = 322;
-static const uint16 kTraveltext = 324;
-static const uint16 kTempgraphics = 326;
-static const uint16 kTempgraphics2 = 328;
-static const uint16 kTempgraphics3 = 330;
-static const uint16 kTempsprites = 332;
-static const uint16 kTextfile1 = 334;
-static const uint16 kTextfile2 = 336;
-static const uint16 kTextfile3 = 338;
-static const uint16 kBlinkframe = 340;
-static const uint16 kBlinkcount = 341;
-static const uint16 kReasseschanges = 342;
-static const uint16 kPointerspath = 343;
-static const uint16 kManspath = 344;
-static const uint16 kPointerfirstpath = 345;
-static const uint16 kFinaldest = 346;
-static const uint16 kDestination = 347;
-static const uint16 kLinestartx = 348;
-static const uint16 kLinestarty = 350;
-static const uint16 kLineendx = 352;
-static const uint16 kLineendy = 354;
-static const uint16 kLinepointer = 356;
-static const uint16 kLinedirection = 357;
-static const uint16 kLinelength = 358;
-static const uint16 kCh0playing = 359;
-static const uint16 kCh0repeat = 360;
-static const uint16 kCh1playing = 361;
+static const uint16 kRecordspace = 290;
+static const uint16 kFreedat = 292;
+static const uint16 kSetdat = 294;
+static const uint16 kReel1 = 296;
+static const uint16 kReel2 = 298;
+static const uint16 kReel3 = 300;
+static const uint16 kRoomdesc = 302;
+static const uint16 kFreedesc = 304;
+static const uint16 kSetdesc = 306;
+static const uint16 kBlockdesc = 308;
+static const uint16 kSetframes = 310;
+static const uint16 kFreeframes = 312;
+static const uint16 kPeople = 314;
+static const uint16 kReels = 316;
+static const uint16 kCommandtext = 318;
+static const uint16 kPuzzletext = 320;
+static const uint16 kTraveltext = 322;
+static const uint16 kTempgraphics = 324;
+static const uint16 kTempgraphics2 = 326;
+static const uint16 kTempgraphics3 = 328;
+static const uint16 kTempsprites = 330;
+static const uint16 kTextfile1 = 332;
+static const uint16 kTextfile2 = 334;
+static const uint16 kTextfile3 = 336;
+static const uint16 kBlinkframe = 338;
+static const uint16 kBlinkcount = 339;
+static const uint16 kReasseschanges = 340;
+static const uint16 kPointerspath = 341;
+static const uint16 kManspath = 342;
+static const uint16 kPointerfirstpath = 343;
+static const uint16 kFinaldest = 344;
+static const uint16 kDestination = 345;
+static const uint16 kLinestartx = 346;
+static const uint16 kLinestarty = 348;
+static const uint16 kLineendx = 350;
+static const uint16 kLineendy = 352;
+static const uint16 kLinepointer = 354;
+static const uint16 kLinedirection = 355;
+static const uint16 kLinelength = 356;
+static const uint16 kCh0playing = 357;
+static const uint16 kCh0repeat = 358;
+static const uint16 kCh1playing = 359;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 244f6a32ae..cd79d386fc 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -539,10 +539,10 @@ void DreamBase::moveMap(uint8 param) {
 void DreamBase::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY) {
 	*flagX = x / 16;
 	*flagY = y / 16;
-	const uint8 *tileData = &_mapFlags[(*flagY * 11 + *flagX) * 3];
-	*flag = tileData[0];
-	*flagEx = tileData[1];
-	*type = tileData[2];
+	const MapFlag &tileData = _mapFlags[*flagY * 11 + *flagX];
+	*flag = tileData._flag;
+	*flagEx = tileData._flagEx;
+	*type = tileData._type;
 }
 
 uint8 DreamBase::getBlockOfPixel(uint8 x, uint8 y) {
@@ -1101,7 +1101,7 @@ void DreamBase::clearBeforeLoad() {
 
 	//clearRest
 	memset(_mapData, 0, kMaplen);
-	deallocateMem(data.word(kBackdrop));
+	delete[] _backdropBlocks;
 	deallocateMem(data.word(kSetframes));
 	deallocateMem(data.word(kReels));
 	deallocateMem(data.word(kPeople));
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index af8b3e9f00..4e58988595 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -281,6 +281,17 @@ struct ObjectRef {
 	}
 };
 
+struct BackdropMapFlag {
+	uint8 _flag;
+	uint8 _flagEx;
+};
+
+struct MapFlag {
+	uint8 _flag;
+	uint8 _flagEx;
+	uint8 _type;
+};
+
 } // End of namespace DreamWeb
 
 #endif
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index e47e79250f..13f27406d8 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2148,7 +2148,7 @@ void DreamBase::getRidOfTempsP() {
 }
 
 void DreamBase::getRidOfAll() {
-	deallocateMem(data.word(kBackdrop));
+	delete[] _backdropBlocks;
 	deallocateMem(data.word(kSetframes));
 	deallocateMem(data.word(kReel1));
 	deallocateMem(data.word(kReel2));
@@ -2174,7 +2174,11 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	for (int i = 0; i < 15; ++i)
 		len[i] = header.len(i);
 
-	data.word(kBackdrop) = allocateAndLoad(len[0]);
+	assert(len[0] >= 192);
+	_backdropBlocks = new uint8[len[0] - 192];
+	engine->readFromFile((uint8 *)_backdropFlags, 192);
+	engine->readFromFile(_backdropBlocks, len[0] - 192);
+
 	clearAndLoad(workspace(), 0, len[1], 132*66); // 132*66 = maplen
 	sortOutMap();
 	data.word(kSetframes) = allocateAndLoad(len[2]);
-- 
cgit v1.2.3


From 08be0411b1bfba715d5c1b50b50a893a27e12f8c Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 18:34:23 +0100
Subject: DREAMWEB: Streamline text file handling

---
 engines/dreamweb/dreambase.h  | 13 ++++++-
 engines/dreamweb/dreamgen.cpp |  6 ++--
 engines/dreamweb/dreamgen.h   | 50 ++++++++++++---------------
 engines/dreamweb/monitor.cpp  | 53 ++++++++++++++--------------
 engines/dreamweb/newplace.cpp |  9 +++--
 engines/dreamweb/people.cpp   |  3 +-
 engines/dreamweb/structs.h    | 17 +++++++++
 engines/dreamweb/stubs.cpp    | 80 +++++++++++++++++++++----------------------
 engines/dreamweb/use.cpp      |  3 +-
 9 files changed, 126 insertions(+), 108 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 21fd415052..4727fc4a63 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -65,6 +65,8 @@ class DreamBase : public SegmentManager {
 protected:
 	DreamWeb::DreamWebEngine *engine;
 
+	const char *_timedString;
+
 	// from backdrop.cpp
 	uint8 *_backdropBlocks;
 	BackdropMapFlag _backdropFlags[96];
@@ -121,6 +123,14 @@ protected:
 	Common::List<Rain> _rainList;
 	uint8 _initialVars[kLengthOfVars]; // TODO: This shouldn't be necessary
 
+	// textfiles
+	TextFile _textFile1;
+	TextFile _textFile2;
+	TextFile _textFile3;
+	TextFile _travelText;
+	TextFile _puzzleText;
+	TextFile _commandText;
+
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
 
@@ -481,6 +491,7 @@ public:
 	uint16 allocateMem(uint16 paragraphs);
 	void deallocateMem(uint16 segment);
 	uint16 allocateAndLoad(unsigned int size);
+	void loadTextFile(TextFile &file, const char *fileName);
 	uint16 standardLoad(const char *fileName, uint16 *outSizeInBytes = NULL); // Returns a segment handle which needs to be freed with deallocatemem for symmetry
 	void *standardLoadCPP(const char *fileName, uint16 *outSizeInBytes = NULL); // And this one should be 'free'd
 	void loadIntoTemp(const char *fileName);
@@ -625,7 +636,7 @@ public:
 	void dumpWatch();
 	void watchCount();
 	void signOn();
-	void searchForFiles(uint16 segment);
+	void searchForFiles(const char *filesString);
 	void triggerMessage(uint16 index);
 	void processTrigger();
 	void dreamweb();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index a0a3f0759b..b0de4dfee9 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -69,11 +69,9 @@ void DreamGenContext::__start() {
 		//0x0120: .... .... .... ....
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0130: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0140: .... .... .... ....
-		0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0150: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index b7f3a5e452..132ae0fa7a 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -268,34 +268,28 @@ static const uint16 kSetframes = 310;
 static const uint16 kFreeframes = 312;
 static const uint16 kPeople = 314;
 static const uint16 kReels = 316;
-static const uint16 kCommandtext = 318;
-static const uint16 kPuzzletext = 320;
-static const uint16 kTraveltext = 322;
-static const uint16 kTempgraphics = 324;
-static const uint16 kTempgraphics2 = 326;
-static const uint16 kTempgraphics3 = 328;
-static const uint16 kTempsprites = 330;
-static const uint16 kTextfile1 = 332;
-static const uint16 kTextfile2 = 334;
-static const uint16 kTextfile3 = 336;
-static const uint16 kBlinkframe = 338;
-static const uint16 kBlinkcount = 339;
-static const uint16 kReasseschanges = 340;
-static const uint16 kPointerspath = 341;
-static const uint16 kManspath = 342;
-static const uint16 kPointerfirstpath = 343;
-static const uint16 kFinaldest = 344;
-static const uint16 kDestination = 345;
-static const uint16 kLinestartx = 346;
-static const uint16 kLinestarty = 348;
-static const uint16 kLineendx = 350;
-static const uint16 kLineendy = 352;
-static const uint16 kLinepointer = 354;
-static const uint16 kLinedirection = 355;
-static const uint16 kLinelength = 356;
-static const uint16 kCh0playing = 357;
-static const uint16 kCh0repeat = 358;
-static const uint16 kCh1playing = 359;
+static const uint16 kTempgraphics = 318;
+static const uint16 kTempgraphics2 = 320;
+static const uint16 kTempgraphics3 = 322;
+static const uint16 kTempsprites = 324;
+static const uint16 kBlinkframe = 326;
+static const uint16 kBlinkcount = 327;
+static const uint16 kReasseschanges = 328;
+static const uint16 kPointerspath = 329;
+static const uint16 kManspath = 330;
+static const uint16 kPointerfirstpath = 331;
+static const uint16 kFinaldest = 332;
+static const uint16 kDestination = 333;
+static const uint16 kLinestartx = 334;
+static const uint16 kLinestarty = 336;
+static const uint16 kLineendx = 338;
+static const uint16 kLineendy = 340;
+static const uint16 kLinepointer = 342;
+static const uint16 kLinedirection = 343;
+static const uint16 kLinelength = 344;
+static const uint16 kCh0playing = 345;
+static const uint16 kCh0repeat = 346;
+static const uint16 kCh1playing = 347;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 4f037c6a58..23c26f6b25 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -91,9 +91,11 @@ void DreamBase::useMon() {
 	} while (!stop);
 	getRidOfTemp();
 	getRidOfTempCharset();
-	deallocateMem(data.word(kTextfile1));
-	deallocateMem(data.word(kTextfile2));
-	deallocateMem(data.word(kTextfile3));
+
+	_textFile1.clear();
+	_textFile2.clear();
+	_textFile3.clear();
+
 	data.byte(kGetback) = 1;
 	playChannel1(26);
 	data.byte(kManisoffscreen) = 0;
@@ -324,7 +326,7 @@ void DreamBase::randomAccess(uint16 count) {
 
 void DreamBase::monMessage(uint8 index) {
 	assert(index > 0);
-	const char *string = (const char *)getSegment(data.word(kTextfile1)).ptr(kTextstart, 0);
+	const char *string = _textFile1._text;
 	for (uint8 i = 0; i < index; ++i) {
 		while (*string++ != '+') {
 		}
@@ -376,21 +378,21 @@ void DreamBase::printOuterMon() {
 
 void DreamBase::loadPersonal() {
 	if (data.byte(kLocation) == 0 || data.byte(kLocation) == 42)
-		data.word(kTextfile1) = standardLoad("DREAMWEB.T01"); // monitor file 1
+		loadTextFile(_textFile1, "DREAMWEB.T01"); // monitor file 1
 	else
-		data.word(kTextfile1) = standardLoad("DREAMWEB.T02"); // monitor file 2
+		loadTextFile(_textFile1, "DREAMWEB.T02"); // monitor file 2
 }
 
 void DreamBase::loadNews() {
 	// textfile2 holds information accessible by anyone
 	if (data.byte(kNewsitem) == 0)
-		data.word(kTextfile2) = standardLoad("DREAMWEB.T10"); // monitor file 10
+		loadTextFile(_textFile2, "DREAMWEB.T10"); // monitor file 10
 	else if (data.byte(kNewsitem) == 1)
-		data.word(kTextfile2) = standardLoad("DREAMWEB.T11"); // monitor file 11
+		loadTextFile(_textFile2, "DREAMWEB.T11"); // monitor file 11
 	else if (data.byte(kNewsitem) == 2)
-		data.word(kTextfile2) = standardLoad("DREAMWEB.T12"); // monitor file 12
+		loadTextFile(_textFile2, "DREAMWEB.T12"); // monitor file 12
 	else
-		data.word(kTextfile2) = standardLoad("DREAMWEB.T13"); // monitor file 13
+		loadTextFile(_textFile2, "DREAMWEB.T13"); // monitor file 13
 }
 
 void DreamBase::loadCart() {
@@ -401,15 +403,15 @@ void DreamBase::loadCart() {
 		cartridgeId = getExAd(cartridgeIndex)->id[3] + 1;
 
 	if (cartridgeId == 0)
-		data.word(kTextfile3) = standardLoad("DREAMWEB.T20"); // monitor file 20
+		loadTextFile(_textFile3, "DREAMWEB.T20"); // monitor file 20
 	else if (cartridgeId == 1)
-		data.word(kTextfile3) = standardLoad("DREAMWEB.T21"); // monitor file 21
+		loadTextFile(_textFile3, "DREAMWEB.T21"); // monitor file 21
 	else if (cartridgeId == 2)
-		data.word(kTextfile3) = standardLoad("DREAMWEB.T22"); // monitor file 22
+		loadTextFile(_textFile3, "DREAMWEB.T22"); // monitor file 22
 	else if (cartridgeId == 3)
-		data.word(kTextfile3) = standardLoad("DREAMWEB.T23"); // monitor file 23
+		loadTextFile(_textFile3, "DREAMWEB.T23"); // monitor file 23
 	else
-		data.word(kTextfile3) = standardLoad("DREAMWEB.T24"); // monitor file 24
+		loadTextFile(_textFile3, "DREAMWEB.T24"); // monitor file 24
 }
 
 void DreamBase::showKeys() {
@@ -479,9 +481,9 @@ void DreamBase::dirCom() {
 	monitorLogo();
 	scrollMonitor();
 	monMessage(9);
-	searchForFiles(data.word(kTextfile1));
-	searchForFiles(data.word(kTextfile2));
-	searchForFiles(data.word(kTextfile3));
+	searchForFiles(_textFile1._text);
+	searchForFiles(_textFile2._text);
+	searchForFiles(_textFile3._text);
 	scrollMonitor();
 }
 
@@ -491,13 +493,13 @@ void DreamBase::dirFile(const char *dirName) {
 	memcpy(topic, dirName, 14);
 	topic[0] = 34;
 
-	const char *text = (const char *)getSegment(data.word(kTextfile1)).ptr(kTextstart, 0);
+	const char *text = _textFile1._text;
 	const char *found = searchForString(topic, text);
 	if (!found) {
-		text = (const char *)getSegment(data.word(kTextfile2)).ptr(kTextstart, 0);
+		text = _textFile2._text;
 		found = searchForString(topic, text);
 		if (!found) {
-			text = (const char *)getSegment(data.word(kTextfile3)).ptr(kTextstart, 0);
+			text = _textFile3._text;
 			found = searchForString(topic, text);
 		}
 	}
@@ -540,13 +542,13 @@ void DreamBase::read() {
 
 	const char *topic = _currentFile;
 
-	const char *text = (const char *)getSegment(data.word(kTextfile1)).ptr(kTextstart, 0);
+	const char *text = _textFile1._text;
 	const char *found = searchForString(topic, text);
 	if (!found) {
-		text = (const char *)getSegment(data.word(kTextfile2)).ptr(kTextstart, 0);
+		text = _textFile2._text;
 		found = searchForString(topic, text);
 		if (!found) {
-			text = (const char *)getSegment(data.word(kTextfile3)).ptr(kTextstart, 0);
+			text = _textFile3._text;
 			found = searchForString(topic, text);
 		}
 	}
@@ -644,8 +646,7 @@ void DreamBase::signOn() {
 	}
 }
 
-void DreamBase::searchForFiles(uint16 segment) {
-	const char *filesString = (const char *)getSegment(segment).ptr(kTextstart, 0);
+void DreamBase::searchForFiles(const char *filesString) {
 	byte curChar;
 
 	while (true) {
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 4d82d7032f..21975eecd5 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -92,7 +92,8 @@ void DreamBase::selectLocation() {
 	getRidOfTemp();
 	getRidOfTemp2();
 	getRidOfTemp3();
-	deallocateMem(data.word(kTraveltext));
+
+	_travelText.clear();
 }
 
 void DreamBase::showCity() {
@@ -120,8 +121,7 @@ void DreamBase::lookAtPlace() {
 	if (_foreignRelease)
 		showFrame(tempGraphics3(), 60, 72+55+21, 4, 0);
 
-	uint16 offset = kTextstart + getSegment(data.word(kTraveltext)).word(data.byte(kDestpos) * 2);
-	const uint8 *string = getSegment(data.word(kTraveltext)).ptr(offset, 0);
+	const uint8 *string = (const uint8 *)_travelText.getString(data.byte(kDestpos));
 	findNextColon(&string);
 	uint16 y = (_foreignRelease) ? 84 + 4 : 84;
 	printDirect(&string, 63, &y, 191, 191 & 1);
@@ -153,8 +153,7 @@ void DreamBase::locationPic() {
 	if (data.byte(kDestpos) == data.byte(kReallocation))
 		showFrame(tempGraphics(), 104, 140 + 14, 3, 0);	// Currently in this location
 
-	uint16 offset = kTextstart + getSegment(data.word(kTraveltext)).word(data.byte(kDestpos) * 2);
-	const uint8 *string = getSegment(data.word(kTraveltext)).ptr(offset, 0);
+	const uint8 *string = (const uint8 *)_travelText.getString(data.byte(kDestpos));
 	DreamBase::printDirect(string, 50, 20, 241, 241 & 1);
 }
 
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index a6ebbcc1ec..7adc2b1220 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -917,8 +917,7 @@ void DreamBase::mugger(ReelRoutine &routine) {
 		createPanel2();
 		showIcon();
 
-		uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(41 * 2);
-		const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
+		const uint8 *string = (const uint8 *)_puzzleText.getString(41);
 		uint16 y = 104;
 		printDirect(&string, 33 + 20, &y, 241, 241 & 1);
 		workToScreen();
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 4e58988595..ce675fc816 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -292,6 +292,23 @@ struct MapFlag {
 	uint8 _type;
 };
 
+struct TextFile {
+	TextFile() : _text(0) { }
+
+	uint16 _offsetsLE[66];
+	char *_text;
+
+	const char *getString(unsigned int i) const {
+		assert(i < 66);
+		return _text + READ_LE_UINT16(&_offsetsLE[i]);
+	}
+	void clear() {
+		delete[] _text;
+		_text = 0;
+	}
+};
+
+
 } // End of namespace DreamWeb
 
 #endif
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 13f27406d8..1868c19d39 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -644,6 +644,23 @@ done: // The engine will need some cleaner finalization, let's put it here for n
 	engine->freeIcons2();
 }
 
+void DreamBase::loadTextFile(TextFile &file, const char *fileName)
+{
+	FileHeader header;
+
+	Common::File f;
+	f.open(fileName);
+	f.read((uint8 *)&header, sizeof(FileHeader));
+	uint16 sizeInBytes = header.len(0);
+	assert(sizeInBytes >= 2*66);
+
+	delete[] file._text;
+	file._text = new char[sizeInBytes - 2*66];
+
+	f.read(file._offsetsLE, 2*66);
+	f.read(file._text, sizeInBytes - 2*66);
+}
+
 void DreamBase::screenUpdate() {
 	newPlace();
 	mainScreen();
@@ -837,8 +854,7 @@ void DreamBase::putUnderTimed() {
 
 void DreamBase::triggerMessage(uint16 index) {
 	multiGet(_mapStore, 174, 153, 200, 63);
-	uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(index * 2);
-	const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
+	const uint8 *string = (const uint8 *)_puzzleText.getString(index);
 	uint16 y = 156;
 	printDirect(&string, 174, &y, 141, true);
 	hangOn(140);
@@ -877,9 +893,8 @@ void DreamBase::useTimedText() {
 	else if (data.word(kTimecount) > data.word(kCounttotimed))
 		return;
 
-	const uint8 *string = getSegment(data.word(kTimedseg)).ptr(data.word(kTimedoffset), 0);
-	uint16 y = data.byte(kTimedy);
-	printDirect(&string, data.byte(kTimedx), &y, 237, true);
+	const uint8 *string = (const uint8 *)_timedString;
+	printDirect(string, data.byte(kTimedx), data.byte(kTimedy), 237, true);
 	data.byte(kNeedtodumptimed) = 1;
 }
 
@@ -904,10 +919,8 @@ void DreamBase::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8
 	data.byte(kTimedx) = x;
 	data.word(kCounttotimed) = countToTimed;
 	data.word(kTimecount) = timeCount + countToTimed;
-	data.word(kTimedseg) = data.word(kTextfile1);
-	data.word(kTimedoffset) = kTextstart + getSegment(data.word(kTextfile1)).word(textIndex * 2);
-	const uint8 *string = getSegment(data.word(kTextfile1)).ptr(data.word(kTimedoffset), 0);
-	debug(1, "setupTimedTemp: (%d, %d) => '%s'", textIndex, voiceIndex, string);
+	_timedString = _textFile1.getString(textIndex);
+	debug(1, "setupTimedTemp: (%d, %d) => '%s'", textIndex, voiceIndex, _timedString);
 }
 
 void DreamBase::dumpTimedText() {
@@ -1130,11 +1143,8 @@ void DreamBase::delTextLine() {
 
 void DreamBase::commandOnly(uint8 command) {
 	delTextLine();
-	uint16 index = command * 2;
-	uint16 offset = kTextstart + getSegment(data.word(kCommandtext)).word(index);
-	uint16 y = data.word(kTextaddressy);
-	const uint8 *string = getSegment(data.word(kCommandtext)).ptr(offset, 0);
-	printDirect(&string, data.word(kTextaddressx), &y, data.byte(kTextlen), (bool)(data.byte(kTextlen) & 1));
+	const uint8 *string = (const uint8 *)_commandText.getString(command);
+	printDirect(string, data.word(kTextaddressx), data.word(kTextaddressy), data.byte(kTextlen), (bool)(data.byte(kTextlen) & 1));
 	data.byte(kNewtextline) = 1;
 }
 
@@ -1228,12 +1238,11 @@ void DreamBase::copyName(uint8 type, uint8 index, uint8 *dst) {
 void DreamBase::commandWithOb(uint8 command, uint8 type, uint8 index) {
 	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
 	delTextLine();
-	uint16 commandText = kTextstart + getSegment(data.word(kCommandtext)).word(command * 2);
 	uint8 textLen = data.byte(kTextlen);
-	{
-		const uint8 *string = getSegment(data.word(kCommandtext)).ptr(commandText, 0);
-		printDirect(string, data.word(kTextaddressx), data.word(kTextaddressy), textLen, (bool)(textLen & 1));
-	}
+
+	const uint8 *string = (const uint8 *)_commandText.getString(command);
+	printDirect(string, data.word(kTextaddressx), data.word(kTextaddressy), textLen, (bool)(textLen & 1));
+
 	copyName(type, index, commandLine);
 	uint16 x = data.word(kLastxpos);
 	if (command != 0)
@@ -1628,14 +1637,12 @@ void DreamBase::animPointer() {
 }
 
 void DreamBase::printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered) {
-	uint16 offset = kTextstart + getSegment(data.word(kCommandtext)).word(index * 2);
-	const uint8 *string = getSegment(data.word(kCommandtext)).ptr(offset, 0);
+	const uint8 *string = (const uint8 *)_commandText.getString(index);
 	printDirect(string, x, y, maxWidth, centered);
 }
 
 void DreamBase::printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count) {
-	uint16 offset = kTextstart + getSegment(data.word(kCommandtext)).word(index * 2);
-	const uint8 *string = getSegment(data.word(kCommandtext)).ptr(offset, 0);
+	const uint8 *string = (const uint8 *)_commandText.getString(index);
 	while (count--) {
 		findNextColon(&string);
 	}
@@ -2033,8 +2040,8 @@ void DreamBase::readSetData() {
 	engine->setIcons2(icons2Buffer);
 
 	data.word(kMainsprites) = standardLoad("DREAMWEB.S00");
-	data.word(kPuzzletext) = standardLoad("DREAMWEB.T80");
-	data.word(kCommandtext) = standardLoad("DREAMWEB.T84");
+	loadTextFile(_puzzleText, "DREAMWEB.T80");
+	loadTextFile(_commandText, "DREAMWEB.T84");
 	useCharset1();
 
 	// FIXME: Why is this commented out?
@@ -2128,7 +2135,7 @@ void DreamBase::getRidOfTemp() {
 }
 
 void DreamBase::getRidOfTempText() {
-	deallocateMem(data.word(kTextfile1));
+	_textFile1.clear();
 }
 
 void DreamBase::getRidOfTemp2() {
@@ -2359,10 +2366,7 @@ void DreamBase::examIcon() {
 }
 
 const uint8 *DreamBase::getTextInFile1(uint16 index) {
-	SegmentRef text = getSegment(data.word(kTextfile1));
-	uint16 offset = text.word(index * 2) + kTextstart;
-	const uint8 *string = text.ptr(offset, 0);
-	return string;
+	return (const uint8 *)_textFile1.getString(index);
 }
 
 void DreamBase::checkFolderCoords() {
@@ -2443,11 +2447,11 @@ void DreamBase::folderExit() {
 }
 
 void DreamBase::loadTravelText() {
-	data.word(kTraveltext) = standardLoad("DREAMWEB.T81"); // location descs
+	loadTextFile(_travelText, "DREAMWEB.T81"); // location descs
 }
 
 void DreamBase::loadTempText(const char *fileName) {
-	data.word(kTextfile1) = standardLoad(fileName);
+	loadTextFile(_textFile1, fileName);
 }
 
 void DreamBase::drawFloor() {
@@ -2835,13 +2839,11 @@ void DreamBase::describeOb() {
 	// Additional text
 	if (compare(data.byte(kCommand), data.byte(kObjecttype), "CUPE")) {
 		// Empty cup
-		uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(40 * 2);
-		const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
+		const uint8 *string = (const uint8 *)_puzzleText.getString(40);
 		printDirect(string, 36, y + 10, 241, 241 & 1);
 	} else if (compare(data.byte(kCommand), data.byte(kObjecttype), "CUPF")) {
 		// Full cup
-		uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(39 * 2);
-		const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
+		const uint8 *string = (const uint8 *)_puzzleText.getString(39);
 		printDirect(string, 36, y + 10, 241, 241 & 1);
 	}
 }
@@ -3325,10 +3327,8 @@ void DreamBase::setupTimedUse(uint16 textIndex, uint16 countToTimed, uint16 time
 	data.byte(kTimedx) = x;
 	data.word(kCounttotimed) = countToTimed;
 	data.word(kTimecount) = timeCount + countToTimed;
-	data.word(kTimedseg) = data.word(kPuzzletext);
-	data.word(kTimedoffset) = kTextstart + getSegment(data.word(kPuzzletext)).word(textIndex * 2);
-	const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(data.word(kTimedoffset), 0);
-	debug(1, "setupTimedUse: %d => '%s'", textIndex, string);
+	_timedString = _puzzleText.getString(textIndex);
+	debug(1, "setupTimedUse: %d => '%s'", textIndex, _timedString);
 }
 
 void DreamBase::entryTexts() {
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 280d78ba55..1b91cc8d7b 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1644,8 +1644,7 @@ void DreamBase::showPuzText(uint16 command, uint16 count) {
 	showMan();
 	showExit();
 	obIcons();
-	uint16 offset = kTextstart + getSegment(data.word(kPuzzletext)).word(command * 2);
-	const uint8 *string = getSegment(data.word(kPuzzletext)).ptr(offset, 0);
+	const uint8 *string = (const uint8 *)_puzzleText.getString(command);
 	printDirect(string, 36, 104, 241, 241 & 1);
 	workToScreenM();
 	hangOnP(count);
-- 
cgit v1.2.3


From d0a302fb064d1bdf12c5c06e077b9037155650bc Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 27 Dec 2011 19:53:41 +0200
Subject: DREAMWEB: Add the ability to blacklist unused constants in
 tasm-recover

---
 engines/dreamweb/dreamgen.h | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 132ae0fa7a..a35b405e25 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -310,26 +310,6 @@ static const uint16 kIntextdat = (0);
 static const uint16 kFreetextdat = (0);
 static const uint16 kFrframedata = (0);
 static const uint16 kSettext = (0+(130*2));
-static const uint16 kOpeninvlist = (0+(228*13));
-static const uint16 kRyaninvlist = (0+(228*13)+32);
-static const uint16 kPointerback = (0+(228*13)+32+60);
-static const uint16 kMapflags = (0+(228*13)+32+60+(32*32));
-static const uint16 kStartpal = (0+(228*13)+32+60+(32*32)+(11*10*3));
-static const uint16 kEndpal = (0+(228*13)+32+60+(32*32)+(11*10*3)+768);
-static const uint16 kMaingamepal = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768);
-static const uint16 kSpritetable = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768);
-static const uint16 kSetlist = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32));
-static const uint16 kFreelist = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5));
-static const uint16 kExlist = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5));
-static const uint16 kPeoplelist = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5));
-static const uint16 kZoomspace = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5));
-static const uint16 kPrintedlist = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40));
-static const uint16 kListofchanges = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80));
-static const uint16 kUndertimedtext = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4));
-static const uint16 kRainlist = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30));
-static const uint16 kInitialreelrouts = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64));
-static const uint16 kInitialvars = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+457);
-static const uint16 kLengthofbuffer = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+457+68-0);
 static const uint16 kReellist = (0+(36*144));
 static const uint16 kIntext = (0+(38*2));
 static const uint16 kLengthofmap = (0+(66*60));
@@ -345,7 +325,6 @@ static const uint16 kExtext = (0+2080+30000+(16*114)+((114+2)*2));
 static const uint16 kLengthofextra = (0+2080+30000+(16*114)+((114+2)*2)+18000);
 static const uint16 kPersontxtdat = (0+24);
 static const uint16 kPersontext = (0+24+(1026*2));
-static const uint16 kInputport = (0x63);
 static const uint16 kForeign = (1);
 static const uint16 kCd = (1);
 static const uint16 kNumexobjects = (114);
@@ -362,7 +341,6 @@ static const uint16 kTablesize = (32);
 static const uint16 kScreenwidth = (320);
 static const uint16 kKeypadx = (36+112);
 static const uint16 kItempicsize = (44);
-static const uint16 kLenofreelrouts = (457);
 static const uint16 kDiaryy = (48+12);
 static const uint16 kOpsy = (52);
 static const uint16 kSymboly = (56);
-- 
cgit v1.2.3


From 8ed39a2b9e54bb46973a2c9b7f8c5bfb4964bd5c Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 19:37:12 +0100
Subject: DREAMWEB: Fix uninitialized variable

---
 engines/dreamweb/dreamweb.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index fa9bece268..d90cd6aaca 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -420,6 +420,9 @@ DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) : engine(en) {
 	_quitRequested = false;
 
 	_currentSample = 0xff;
+
+	_oldSubject._type = 0;
+	_oldSubject._index = 0;
 }
 
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 90cb52b7f6364a0d4b83cdc91c76c7edf4fcf79d Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 19:37:22 +0100
Subject: DREAMWEB: Streamline graphics file access

---
 engines/dreamweb/backdrop.cpp |  29 +++--
 engines/dreamweb/dreambase.h  |  37 ++++--
 engines/dreamweb/dreamgen.cpp |   8 +-
 engines/dreamweb/dreamgen.h   |  73 ++++++------
 engines/dreamweb/dreamweb.cpp |  10 +-
 engines/dreamweb/dreamweb.h   |  19 ---
 engines/dreamweb/keypad.cpp   |   8 +-
 engines/dreamweb/monitor.cpp  |  30 ++---
 engines/dreamweb/newplace.cpp |  22 ++--
 engines/dreamweb/object.cpp   |  34 +++---
 engines/dreamweb/print.cpp    |  26 ++---
 engines/dreamweb/saveload.cpp |  36 +++---
 engines/dreamweb/sprite.cpp   |  14 +--
 engines/dreamweb/structs.h    |  22 +++-
 engines/dreamweb/stubs.cpp    | 263 +++++++++++++++++++++++-------------------
 engines/dreamweb/titles.cpp   |   2 +-
 engines/dreamweb/use.cpp      |   2 +-
 engines/dreamweb/vgagrafx.cpp | 104 +++++++++++------
 18 files changed, 398 insertions(+), 341 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 553390fe70..0dface9acb 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -99,15 +99,14 @@ uint8 DreamBase::getMapAd(const uint8 *setData, uint16 *x, uint16 *y) {
 	return 1;
 }
 
-void DreamBase::calcFrFrame(const Frame *frameBase, uint16 frameNum, uint8 *width, uint8 *height, uint16 x, uint16 y, ObjPos *objPos) {
-	const Frame *frame = frameBase + frameNum;
-	*width = frame->width;
-	*height = frame->height;
-
-	objPos->xMin = (x + frame->x) & 0xff;
-	objPos->yMin = (y + frame->y) & 0xff;
-	objPos->xMax = objPos->xMin + frame->width;
-	objPos->yMax = objPos->yMin + frame->height;
+void DreamBase::calcFrFrame(const Frame &frame, uint8 *width, uint8 *height, uint16 x, uint16 y, ObjPos *objPos) {
+	*width = frame.width;
+	*height = frame.height;
+
+	objPos->xMin = (x + frame.x) & 0xff;
+	objPos->yMin = (y + frame.y) & 0xff;
+	objPos->xMax = objPos->xMin + frame.width;
+	objPos->yMax = objPos->yMin + frame.height;
 }
 
 void DreamBase::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
@@ -115,7 +114,7 @@ void DreamBase::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
 		return;
 	uint8 priority = objData->priority;
 	uint8 type = objData->type;
-	Sprite *sprite = makeSprite(x, y, addr_backobject, data.word(kSetframes), 0);
+	Sprite *sprite = makeSprite(x, y, addr_backobject, &_setFrames, 0);
 
 	uint16 objDataOffset = (uint8 *)objData - getSegment(data.word(kSetdat)).ptr(0, 0);
 	assert(objDataOffset % sizeof(SetObject) == 0);
@@ -135,7 +134,7 @@ void DreamBase::showAllObs() {
 
 	_setList.clear();
 
-	const Frame *frameBase = (const Frame *)getSegment(data.word(kSetframes)).ptr(0, 0);
+	const GraphicsFile &frameBase = _setFrames;
 	SetObject *setEntries = (SetObject *)getSegment(data.word(kSetdat)).ptr(0, count * sizeof(SetObject));
 	for (size_t i = 0; i < count; ++i) {
 		SetObject *setEntry = setEntries + i;
@@ -147,7 +146,7 @@ void DreamBase::showAllObs() {
 			continue;
 		uint8 width, height;
 		ObjPos objPos;
-		calcFrFrame(frameBase, currentFrame, &width, &height, x, y, &objPos);
+		calcFrFrame(frameBase._frames[currentFrame], &width, &height, x, y, &objPos);
 		setEntry->index = setEntry->frames[0];
 		if ((setEntry->type == 0) && (setEntry->priority != 5) && (setEntry->priority != 6)) {
 			x += data.word(kMapadx);
@@ -218,7 +217,7 @@ void DreamBase::showAllFree() {
 	_freeList.clear();
 
 	const DynObject *freeObjects = (const DynObject *)getSegment(data.word(kFreedat)).ptr(0, 0);
-	const Frame *frameBase = (const Frame *)getSegment(data.word(kFreeframes)).ptr(0, 0);
+	const GraphicsFile &frameBase = _freeFrames;
 	for (size_t i = 0; i < count; ++i) {
 		uint16 x, y;
 		uint8 mapAd = getMapAd(freeObjects[i].mapad, &x, &y);
@@ -226,7 +225,7 @@ void DreamBase::showAllFree() {
 			uint8 width, height;
 			ObjPos objPos;
 			uint16 currentFrame = 3 * i;
-			calcFrFrame(frameBase, currentFrame, &width, &height, x, y, &objPos);
+			calcFrFrame(frameBase._frames[currentFrame], &width, &height, x, y, &objPos);
 			if ((width != 0) || (height != 0)) {
 				x += data.word(kMapadx);
 				y += data.word(kMapady);
@@ -274,7 +273,7 @@ void DreamBase::showAllEx() {
 		uint8 width, height;
 		ObjPos objPos;
 		uint16 currentFrame = 3 * i;
-		calcFrFrame(frameBase, currentFrame, &width, &height, x, y, &objPos);
+		calcFrFrame(frameBase[currentFrame], &width, &height, x, y, &objPos);
 		if ((width != 0) || (height != 0)) {
 			assert(currentFrame < 256);
 			showFrame(frameBase, x + data.word(kMapadx), y + data.word(kMapady), currentFrame, 0);
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 4727fc4a63..8dd80836e6 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -131,6 +131,21 @@ protected:
 	TextFile _puzzleText;
 	TextFile _commandText;
 
+	// graphics files
+	GraphicsFile _tempGraphics;
+	GraphicsFile _tempGraphics2;
+	GraphicsFile _tempGraphics3;
+	GraphicsFile _icons1;
+	GraphicsFile _icons2;
+	GraphicsFile _tempCharset;
+	GraphicsFile _charset1;
+	GraphicsFile _mainSprites;
+	const GraphicsFile *_currentCharset;
+
+	// room graphics files
+	GraphicsFile _setFrames;
+	GraphicsFile _freeFrames;
+
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
 
@@ -146,7 +161,7 @@ public:
 	uint8 getXAd(const uint8 *setData, uint8 *result);
 	uint8 getYAd(const uint8 *setData, uint8 *result);
 	uint8 getMapAd(const uint8 *setData, uint16 *x, uint16 *y);
-	void calcFrFrame(const Frame *frameBase, uint16 frameNum, uint8* width, uint8* height, uint16 x, uint16 y, ObjPos *objPos);
+	void calcFrFrame(const Frame &frame, uint8* width, uint8* height, uint16 x, uint16 y, ObjPos *objPos);
 	void makeBackOb(SetObject *objData, uint16 x, uint16 y);
 	void showAllObs();
 	void getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize);
@@ -348,13 +363,13 @@ public:
 	void poolGuard(ReelRoutine &routine);
 
 	// from print.cpp
-	uint8 getNextWord(const Frame *charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount);
-	void printChar(const Frame* charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
-	void printChar(const Frame* charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
-	void printBoth(const Frame* charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar);
+	uint8 getNextWord(const GraphicsFile &charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount);
+	void printChar(const GraphicsFile &charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
+	void printChar(const GraphicsFile &charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
+	void printBoth(const GraphicsFile &charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar);
 	uint8 printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered);
 	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
-	uint8 getNumber(const Frame *charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16 *offset);
+	uint8 getNumber(const GraphicsFile &charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16 *offset);
 	uint8 kernChars(uint8 firstChar, uint8 secondChar, uint8 width);
 	uint8 printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
 	uint16 waitFrames();
@@ -403,7 +418,7 @@ public:
 	void printSprites();
 	void printASprite(const Sprite *sprite);
 	void clearSprites();
-	Sprite *makeSprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi);
+	Sprite *makeSprite(uint8 x, uint8 y, uint16 updateCallback, const GraphicsFile *frameData, uint16 somethingInDi);
 	void initMan();
 	void walking(Sprite *sprite);
 	void aboutTurn(Sprite *sprite);
@@ -462,9 +477,6 @@ public:
 	void showRyanPage();
 	void switchRyanOn();
 	void switchRyanOff();
-	Frame *tempGraphics();
-	Frame *tempGraphics2();
-	Frame *tempGraphics3();
 	void middlePanel();
 	void showDiary();
 	void readMouse();
@@ -492,6 +504,7 @@ public:
 	void deallocateMem(uint16 segment);
 	uint16 allocateAndLoad(unsigned int size);
 	void loadTextFile(TextFile &file, const char *fileName);
+	void loadGraphicsFile(GraphicsFile &file, const char *fileName);
 	uint16 standardLoad(const char *fileName, uint16 *outSizeInBytes = NULL); // Returns a segment handle which needs to be freed with deallocatemem for symmetry
 	void *standardLoadCPP(const char *fileName, uint16 *outSizeInBytes = NULL); // And this one should be 'free'd
 	void loadIntoTemp(const char *fileName);
@@ -550,7 +563,6 @@ public:
 	void getRidOfTemp2();
 	void getRidOfTemp3();
 	void getRidOfTempCharset();
-	void getRidOfTempsP();
 	void getRidOfAll();
 	void placeSetObject(uint8 index);
 	void removeSetObject(uint8 index);
@@ -832,6 +844,9 @@ public:
 	void vSync();
 	void setMode();
 	void showPCX(const Common::String &name);
+	void showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 effectsFlag, uint8 width, uint8 height);
+	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
+	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
 	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
 	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
 	bool pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index b0de4dfee9..4378841d83 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -65,13 +65,13 @@ void DreamGenContext::__start() {
 		//0x0100: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0110: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0120: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 
 		//0x0130: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 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, 
 		//0x0140: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
+		0x00, 0xff, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index a35b405e25..41b30100ab 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -251,45 +251,40 @@ static const uint16 kBufferin = 276;
 static const uint16 kBufferout = 278;
 static const uint16 kExtras = 280;
 static const uint16 kWorkspace = 282;
-static const uint16 kCharset1 = 284;
-static const uint16 kMainsprites = 286;
-static const uint16 kBackdrop = 288;
-static const uint16 kRecordspace = 290;
-static const uint16 kFreedat = 292;
-static const uint16 kSetdat = 294;
-static const uint16 kReel1 = 296;
-static const uint16 kReel2 = 298;
-static const uint16 kReel3 = 300;
-static const uint16 kRoomdesc = 302;
-static const uint16 kFreedesc = 304;
-static const uint16 kSetdesc = 306;
-static const uint16 kBlockdesc = 308;
-static const uint16 kSetframes = 310;
-static const uint16 kFreeframes = 312;
-static const uint16 kPeople = 314;
-static const uint16 kReels = 316;
-static const uint16 kTempgraphics = 318;
-static const uint16 kTempgraphics2 = 320;
-static const uint16 kTempgraphics3 = 322;
-static const uint16 kTempsprites = 324;
-static const uint16 kBlinkframe = 326;
-static const uint16 kBlinkcount = 327;
-static const uint16 kReasseschanges = 328;
-static const uint16 kPointerspath = 329;
-static const uint16 kManspath = 330;
-static const uint16 kPointerfirstpath = 331;
-static const uint16 kFinaldest = 332;
-static const uint16 kDestination = 333;
-static const uint16 kLinestartx = 334;
-static const uint16 kLinestarty = 336;
-static const uint16 kLineendx = 338;
-static const uint16 kLineendy = 340;
-static const uint16 kLinepointer = 342;
-static const uint16 kLinedirection = 343;
-static const uint16 kLinelength = 344;
-static const uint16 kCh0playing = 345;
-static const uint16 kCh0repeat = 346;
-static const uint16 kCh1playing = 347;
+static const uint16 kMainsprites = 284;
+static const uint16 kBackdrop = 286;
+static const uint16 kRecordspace = 288;
+static const uint16 kFreedat = 290;
+static const uint16 kSetdat = 292;
+static const uint16 kReel1 = 294;
+static const uint16 kReel2 = 296;
+static const uint16 kReel3 = 298;
+static const uint16 kRoomdesc = 300;
+static const uint16 kFreedesc = 302;
+static const uint16 kSetdesc = 304;
+static const uint16 kBlockdesc = 306;
+static const uint16 kSetframes = 308;
+static const uint16 kFreeframes = 310;
+static const uint16 kPeople = 312;
+static const uint16 kReels = 314;
+static const uint16 kBlinkframe = 316;
+static const uint16 kBlinkcount = 317;
+static const uint16 kReasseschanges = 318;
+static const uint16 kPointerspath = 319;
+static const uint16 kManspath = 320;
+static const uint16 kPointerfirstpath = 321;
+static const uint16 kFinaldest = 322;
+static const uint16 kDestination = 323;
+static const uint16 kLinestartx = 324;
+static const uint16 kLinestarty = 326;
+static const uint16 kLineendx = 328;
+static const uint16 kLineendy = 330;
+static const uint16 kLinepointer = 332;
+static const uint16 kLinedirection = 333;
+static const uint16 kLinelength = 334;
+static const uint16 kCh0playing = 335;
+static const uint16 kCh0repeat = 336;
+static const uint16 kCh1playing = 337;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index d90cd6aaca..b31a85149a 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -58,18 +58,10 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_channel0 = 0;
 	_channel1 = 0;
 
-	_icons1 = NULL;
-	_icons2 = NULL;
-	_tempCharset = NULL;
-
 	_language = gameDesc->desc.language;
 }
 
 DreamWebEngine::~DreamWebEngine() {
-	assert(_icons1 == NULL);
-	assert(_icons2 == NULL);
-	assert(_tempCharset == NULL);
-
 	DebugMan.clearAllDebugChannels();
 	delete _console;
 }
@@ -421,6 +413,8 @@ DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) : engine(en) {
 
 	_currentSample = 0xff;
 
+	_backdropBlocks = 0;
+
 	_oldSubject._type = 0;
 	_oldSubject._index = 0;
 }
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 4d7bf5f0e4..58354a9516 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -125,20 +125,6 @@ public:
 
 	void stopSound(uint8 channel);
 
-	DreamGen::Frame *icons1() const { return (DreamGen::Frame *)_icons1; }
-	DreamGen::Frame *icons2() const { return (DreamGen::Frame *)_icons2; }
-	void setIcons1(void *frames) { assert(_icons1 == NULL); _icons1 = frames; }
-	void setIcons2(void *frames) { assert(_icons2 == NULL); _icons2 = frames; }
-	void freeIcons1() { free(_icons1); _icons1 = NULL; }
-	void freeIcons2() { free(_icons2); _icons2 = NULL; }
-
-	DreamGen::Frame *tempCharset() const { return (DreamGen::Frame *)_tempCharset; }
-	void setTempCharset(void *frames) { assert(_tempCharset == NULL); _tempCharset = frames; }
-	void freeTempCharset() { free(_tempCharset); _tempCharset = NULL; }
-
-	DreamGen::Frame *currentCharset() const { return _currentCharset; }
-	void setCurrentCharset(DreamGen::Frame *charset) { _currentCharset = charset; }
-
 private:
 	void keyPressed(uint16 ascii);
 	void setSpeed(uint speed);
@@ -173,11 +159,6 @@ private:
 	Audio::SoundHandle _channelHandle[2];
 	uint8 _channel0, _channel1;
 
-	void *_icons1;
-	void *_icons2;
-	void *_tempCharset;
-	DreamGen::Frame *_currentCharset;
-
 	DreamGen::DreamGenContext _context;
 	DreamGen::DreamBase &_base;
 };
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index c3db72f282..5f83ddbef5 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -39,7 +39,7 @@ void DreamBase::singleKey(uint8 key, uint16 x, uint16 y) {
 			key -= 11;
 	}
 	key -= 20;
-	showFrame(tempGraphics(), x, y, key, 0);
+	showFrame(_tempGraphics, x, y, key, 0);
 }
 
 void DreamBase::loadKeypad() {
@@ -71,7 +71,7 @@ void DreamBase::showKeypad() {
 		}
 		if ((data.byte(kLightcount) >= 60) && (data.byte(kLightcount) < 100))
 			--frameIndex;
-		showFrame(tempGraphics(), kKeypadx+60, y, frameIndex, 0);
+		showFrame(_tempGraphics, kKeypadx+60, y, frameIndex, 0);
 	}
 }
 
@@ -224,8 +224,8 @@ void DreamBase::buttonPress(uint8 buttonId) {
 }
 
 void DreamBase::showOuterPad() {
-	showFrame(tempGraphics(), kKeypadx-3, kKeypady-4, 1, 0);
-	showFrame(tempGraphics(), kKeypadx+74, kKeypady+76, 37, 0);
+	showFrame(_tempGraphics, kKeypadx-3, kKeypady-4, 1, 0);
+	showFrame(_tempGraphics, kKeypadx+74, kKeypady+76, 37, 0);
 }
 
 void DreamBase::dumpKeypad() {
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 23c26f6b25..471d5eca8b 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -188,14 +188,14 @@ void DreamBase::monitorLogo() {
 }
 
 void DreamBase::printLogo() {
-	showFrame(tempGraphics(), 56, 32, 0, 0);
+	showFrame(_tempGraphics, 56, 32, 0, 0);
 	showCurrentFile();
 }
 
 void DreamBase::input() {
 	memset(_inputLine, 0, 64);
 	data.word(kCurpos) = 0;
-	printChar(engine->tempCharset(), data.word(kMonadx), data.word(kMonady), '>', 0, NULL, NULL);
+	printChar(_tempCharset, data.word(kMonadx), data.word(kMonady), '>', 0, NULL, NULL);
 	multiDump(data.word(kMonadx), data.word(kMonady), 6, 8);
 	data.word(kMonadx) += 6;
 	data.word(kCurslocx) = data.word(kMonadx);
@@ -227,7 +227,7 @@ void DreamBase::input() {
 			continue;
 		multiGet(_mapStore + data.word(kCurpos) * 256, data.word(kMonadx), data.word(kMonady), 8, 8);
 		uint8 charWidth;
-		printChar(engine->tempCharset(), data.word(kMonadx), data.word(kMonady), currentKey, 0, &charWidth, NULL);
+		printChar(_tempCharset, data.word(kMonadx), data.word(kMonady), currentKey, 0, &charWidth, NULL);
 		_inputLine[data.word(kCurpos) * 2 + 1] = charWidth;
 		data.word(kMonadx) += charWidth;
 		++data.word(kCurpos);
@@ -266,7 +266,7 @@ void DreamBase::printCurs() {
 	multiGet(_textUnder, x, y, 6, height);
 	++data.word(kMaintimer);
 	if ((data.word(kMaintimer) & 16) == 0)
-		showFrame(engine->tempCharset(), x, y, '/' - 32, 0);
+		showFrame(_tempCharset, x, y, '/' - 32, 0);
 	multiDump(x - 6, y, 12, height);
 }
 
@@ -297,17 +297,17 @@ void DreamBase::showCurrentFile() {
 	while (*currentFile) {
 		char c = *currentFile++;
 		c = engine->modifyChar(c);
-		printChar(engine->tempCharset(), &x, 37, c, 0, NULL, NULL);
+		printChar(_tempCharset, &x, 37, c, 0, NULL, NULL);
 	}
 }
 
 void DreamBase::accessLightOn() {
-	showFrame(tempGraphics(), 74, 182, 8, 0);
+	showFrame(_tempGraphics, 74, 182, 8, 0);
 	multiDump(74, 182, 12, 8);
 }
 
 void DreamBase::accessLightOff() {
-	showFrame(tempGraphics(), 74, 182, 7, 0);
+	showFrame(_tempGraphics, 74, 182, 7, 0);
 	multiDump(74, 182, 12, 8);
 }
 
@@ -340,22 +340,22 @@ void DreamBase::netError() {
 }
 
 void DreamBase::powerLightOn() {
-	showFrame(tempGraphics(), 257+4, 182, 6, 0);
+	showFrame(_tempGraphics, 257+4, 182, 6, 0);
 	multiDump(257+4, 182, 12, 8);
 }
 
 void DreamBase::powerLightOff() {
-	showFrame(tempGraphics(), 257+4, 182, 5, 0);
+	showFrame(_tempGraphics, 257+4, 182, 5, 0);
 	multiDump(257+4, 182, 12, 8);
 }
 
 void DreamBase::lockLightOn() {
-	showFrame(tempGraphics(), 56, 182, 10, 0);
+	showFrame(_tempGraphics, 56, 182, 10, 0);
 	multiDump(58, 182, 12, 8);
 }
 
 void DreamBase::lockLightOff() {
-	showFrame(tempGraphics(), 56, 182, 9, 0);
+	showFrame(_tempGraphics, 56, 182, 9, 0);
 	multiDump(58, 182, 12, 8);
 }
 
@@ -370,10 +370,10 @@ void DreamBase::turnOnPower() {
 }
 
 void DreamBase::printOuterMon() {
-	showFrame(tempGraphics(), 40, 32, 1, 0);
-	showFrame(tempGraphics(), 264, 32, 2, 0);
-	showFrame(tempGraphics(), 40, 12, 3, 0);
-	showFrame(tempGraphics(), 40, 164, 4, 0);
+	showFrame(_tempGraphics, 40, 32, 1, 0);
+	showFrame(_tempGraphics, 264, 32, 2, 0);
+	showFrame(_tempGraphics, 40, 12, 3, 0);
+	showFrame(_tempGraphics, 40, 164, 4, 0);
 }
 
 void DreamBase::loadPersonal() {
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 21975eecd5..43b334ca3f 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -98,8 +98,8 @@ void DreamBase::selectLocation() {
 
 void DreamBase::showCity() {
 	clearWork();
-	showFrame(tempGraphics(), 57, 32, 0, 0);
-	showFrame(tempGraphics(), 120+57, 32, 1, 0);
+	showFrame(_tempGraphics, 57, 32, 0, 0);
+	showFrame(_tempGraphics, 120+57, 32, 1, 0);
 }
 
 void DreamBase::lookAtPlace() {
@@ -116,10 +116,10 @@ void DreamBase::lookAtPlace() {
 	delPointer();
 	delTextLine();
 	getUnderCentre();
-	showFrame(tempGraphics3(), 60, 72, 0, 0);
-	showFrame(tempGraphics3(), 60, 72 + 55, 4, 0);
+	showFrame(_tempGraphics3, 60, 72, 0, 0);
+	showFrame(_tempGraphics3, 60, 72 + 55, 4, 0);
 	if (_foreignRelease)
-		showFrame(tempGraphics3(), 60, 72+55+21, 4, 0);
+		showFrame(_tempGraphics3, 60, 72+55+21, 4, 0);
 
 	const uint8 *string = (const uint8 *)_travelText.getString(data.byte(kDestpos));
 	findNextColon(&string);
@@ -146,21 +146,21 @@ void DreamBase::locationPic() {
 	byte picture = roomPics[data.byte(kDestpos)];
 
 	if (picture >= 6)
-		showFrame(tempGraphics2(), 104, 138 + 14, picture - 6, 0);	// Second slot
+		showFrame(_tempGraphics2, 104, 138 + 14, picture - 6, 0);	// Second slot
 	else
-		showFrame(tempGraphics(),  104, 138 + 14, picture + 4, 0);
+		showFrame(_tempGraphics,  104, 138 + 14, picture + 4, 0);
 
 	if (data.byte(kDestpos) == data.byte(kReallocation))
-		showFrame(tempGraphics(), 104, 140 + 14, 3, 0);	// Currently in this location
+		showFrame(_tempGraphics, 104, 140 + 14, 3, 0);	// Currently in this location
 
 	const uint8 *string = (const uint8 *)_travelText.getString(data.byte(kDestpos));
 	DreamBase::printDirect(string, 50, 20, 241, 241 & 1);
 }
 
 void DreamBase::showArrows() {
-	showFrame(tempGraphics(), 116 - 12, 16, 0, 0);
-	showFrame(tempGraphics(), 226 + 12, 16, 1, 0);
-	showFrame(tempGraphics(), 280, 14, 2, 0);
+	showFrame(_tempGraphics, 116 - 12, 16, 0, 0);
+	showFrame(_tempGraphics, 226 + 12, 16, 1, 0);
+	showFrame(_tempGraphics, 280, 14, 2, 0);
 }
 
 void DreamBase::nextDest() {
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index cb105c7798..4f9d091da6 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -25,8 +25,8 @@
 namespace DreamGen {
 
 void DreamBase::showRyanPage() {
-	showFrame(engine->icons1(), kInventx + 167, kInventy - 12, 12, 0);
-	showFrame(engine->icons1(), kInventx + 167 + 18 * data.byte(kRyanpage), kInventy - 12, 13 + data.byte(kRyanpage), 0);
+	showFrame(_icons1, kInventx + 167, kInventy - 12, 12, 0);
+	showFrame(_icons1, kInventx + 167 + 18 * data.byte(kRyanpage), kInventy - 12, 13 + data.byte(kRyanpage), 0);
 }
 
 void DreamBase::findAllRyan() {
@@ -79,30 +79,32 @@ void DreamBase::makeWorn(DynObject *object) {
 }
 
 void DreamBase::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
-	showFrame(engine->icons1(), x - 2, y - 1, 10, 0);
+	showFrame(_icons1, x - 2, y - 1, 10, 0);
 	if (index == 0xff)
 		return;
 
-	Frame *extras = (Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
-	Frame *frees = (Frame *)getSegment(data.word(kFreeframes)).ptr(0, 0);
-	Frame *frames = (flag == 4) ? extras : frees;
-	showFrame(frames, x + 18, y + 19, 3 * index + 1, 128);
+	if (flag == kExObjectType) {
+		Frame *extras = (Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
+		showFrame(extras, x + 18, y + 19, 3 * index + 1, 128);
+	} else {
+		showFrame(_freeFrames, x + 18, y + 19, 3 * index + 1, 128);
+	}
 	const DynObject *object = (const DynObject *)getAnyAdDir(index, flag);
 	bool worn = isItWorn(object);
 	if (worn)
-		showFrame(engine->icons1(), x - 3, y - 2, 7, 0);
+		showFrame(_icons1, x - 3, y - 2, 7, 0);
 }
 
 void DreamBase::obPicture() {
 	if (data.byte(kObjecttype) == kSetObjectType1)
 		return;
-	Frame *frames;
-	if (data.byte(kObjecttype) == kExObjectType)
-		frames = (Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
-	else
-		frames = (Frame *)getSegment(data.word(kFreeframes)).ptr(0, 0);
 	uint8 frame = 3 * data.byte(kCommand) + 1;
-	showFrame(frames, 160, 68, frame, 0x80);
+	if (data.byte(kObjecttype) == kExObjectType) {
+		const Frame *frames = (const Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
+		showFrame(frames, 160, 68, frame, 0x80);
+	} else {
+		showFrame(_freeFrames, 160, 68, frame, 0x80);
+	}
 }
 
 void DreamBase::obIcons() {
@@ -110,10 +112,10 @@ void DreamBase::obIcons() {
 	getAnyAd(&value1, &value2);
 	if (value1 != 0xff) {
 		// can open it
-		showFrame(engine->icons2(), 210, 1, 4, 0);
+		showFrame(_icons2, 210, 1, 4, 0);
 	}
 
-	showFrame(engine->icons2(), 260, 1, 1, 0);
+	showFrame(_icons2, 260, 1, 1, 0);
 }
 
 void DreamBase::examineOb(bool examineAgain) {
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index f5f0dda43c..b20726dc44 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -24,7 +24,7 @@
 
 namespace DreamGen {
 
-void DreamBase::printBoth(const Frame *charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar) {
+void DreamBase::printBoth(const GraphicsFile &charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar) {
 	uint16 newX = *x;
 	uint8 width, height;
 	printChar(charSet, &newX, y, c, nextChar, &width, &height);
@@ -32,7 +32,7 @@ void DreamBase::printBoth(const Frame *charSet, uint16 *x, uint16 y, uint8 c, ui
 	*x = newX;
 }
 
-uint8 DreamBase::getNextWord(const Frame *charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount) {
+uint8 DreamBase::getNextWord(const GraphicsFile &charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount) {
 	*totalWidth = 0;
 	*charCount = 0;
 	while (true) {
@@ -50,14 +50,14 @@ uint8 DreamBase::getNextWord(const Frame *charSet, const uint8 *string, uint8 *t
 		firstChar = engine->modifyChar(firstChar);
 		if (firstChar != 255) {
 			uint8 secondChar = *string;
-			uint8 width = charSet[firstChar - 32 + data.word(kCharshift)].width;
+			uint8 width = charSet._frames[firstChar - 32 + data.word(kCharshift)].width;
 			width = kernChars(firstChar, secondChar, width);
 			*totalWidth += width;
 		}
 	}
 }
 
-void DreamBase::printChar(const Frame *charSet, uint16* x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) {
+void DreamBase::printChar(const GraphicsFile &charSet, uint16* x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) {
 	if (c == 255)
 		return;
 
@@ -75,23 +75,22 @@ void DreamBase::printChar(const Frame *charSet, uint16* x, uint16 y, uint8 c, ui
 	(*x) += *width;
 }
 
-void DreamBase::printChar(const Frame *charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) {
+void DreamBase::printChar(const GraphicsFile &charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) {
 	printChar(charSet, &x, y, c, nextChar, width, height);
 }
 
 uint8 DreamBase::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 	data.byte(kPointerframe) = 1;
 	data.byte(kPointermode) = 3;
-	const Frame* charSet = (const Frame *)getSegment(data.word(kCharset1)).ptr(0, 0);
 	do {
 		uint16 offset = x;
-		uint16 charCount = getNumber(charSet, string, maxWidth, centered, &offset);
+		uint16 charCount = getNumber(_charset1, string, maxWidth, centered, &offset);
 		do {
 			uint8 c0 = string[0];
 			uint8 c1 = string[1];
 			uint8 c2 = string[2];
 			c0 = engine->modifyChar(c0);
-			printBoth(charSet, &offset, y, c0, c1);
+			printBoth(_charset1, &offset, y, c0, c1);
 			if ((c1 == 0) || (c1 == ':')) {
 				return 0;
 			}
@@ -99,7 +98,7 @@ uint8 DreamBase::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWid
 				c1 = engine->modifyChar(c1);
 				data.word(kCharshift) = 91;
 				uint16 offset2 = offset;
-				printBoth(charSet, &offset2, y, c1, c2);
+				printBoth(_charset1, &offset2, y, c1, c2);
 				data.word(kCharshift) = 0;
 				for (int i=0; i<2; ++i) {
 					uint16 mouseState = waitFrames();
@@ -126,7 +125,7 @@ uint8 DreamBase::printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxW
 
 uint8 DreamBase::printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered) {
 	data.word(kLastxpos) = x;
-	const Frame *charSet = engine->currentCharset();
+	const GraphicsFile &charSet = *_currentCharset;
 	while (true) {
 		uint16 offset = x;
 		uint8 charCount = getNumber(charSet, *string, maxWidth, centered, &offset);
@@ -148,7 +147,7 @@ uint8 DreamBase::printDirect(const uint8** string, uint16 x, uint16 *y, uint8 ma
 	}
 }
 
-uint8 DreamBase::getNumber(const Frame *charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16* offset) {
+uint8 DreamBase::getNumber(const GraphicsFile &charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16* offset) {
 	uint8 totalWidth = 0;
 	uint8 charCount = 0;
 	while (true) {
@@ -207,12 +206,11 @@ uint16 DreamBase::waitFrames() {
 const char *DreamBase::monPrint(const char *string) {
 	data.byte(kKerning) = 1;
 	uint16 x = data.word(kMonadx);
-	Frame *charset = engine->tempCharset();
 	const char *iterator = string;
 	bool done = false;
 	while (!done) {
 
-		uint16 count = getNumber(charset, (const uint8 *)iterator, 166, false, &x);
+		uint16 count = getNumber(_tempCharset, (const uint8 *)iterator, 166, false, &x);
 		do {	
 			char c = *iterator++;
 			if (c == ':')
@@ -228,7 +226,7 @@ const char *DreamBase::monPrint(const char *string) {
 				break;
 			}
 			c = engine->modifyChar(c);
-			printChar(charset, &x, data.word(kMonady), c, 0, NULL, NULL);
+			printChar(_tempCharset, &x, data.word(kMonady), c, 0, NULL, NULL);
 			data.word(kCurslocx) = x;
 			data.word(kCurslocy) = data.word(kMonady);
 			data.word(kMaintimer) = 1;
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 159f8865f0..843bee77ac 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -118,9 +118,7 @@ void DreamBase::doLoad(int savegameId) {
 	// If we reach this point, loadPosition() has just been called.
 	// Among other things, it will have filled g_MadeUpRoomDat.
 
-	// kTempgraphics might not have been allocated if we bypassed all menus
-	if (data.word(kTempgraphics) != 0xFFFF)
-		getRidOfTemp();
+	getRidOfTemp();
 
 	startLoading(g_madeUpRoomDat);
 	loadRoomsSample();
@@ -338,16 +336,16 @@ void DreamBase::getBackToOps() {
 }
 
 void DreamBase::showMainOps() {
-	showFrame(tempGraphics(), kOpsx+10, kOpsy+10, 8, 0);
-	showFrame(tempGraphics(), kOpsx+59, kOpsy+30, 7, 0);
-	showFrame(tempGraphics(), kOpsx+128+4, kOpsy+12, 1, 0);
+	showFrame(_tempGraphics, kOpsx+10, kOpsy+10, 8, 0);
+	showFrame(_tempGraphics, kOpsx+59, kOpsy+30, 7, 0);
+	showFrame(_tempGraphics, kOpsx+128+4, kOpsy+12, 1, 0);
 }
 
 void DreamBase::showDiscOps() {
-	showFrame(tempGraphics(), kOpsx+128+4, kOpsy+12, 1, 0);
-	showFrame(tempGraphics(), kOpsx+10, kOpsy+10, 9, 0);
-	showFrame(tempGraphics(), kOpsx+59, kOpsy+30, 10, 0);
-	showFrame(tempGraphics(), kOpsx+176+2, kOpsy+60-4, 5, 0);
+	showFrame(_tempGraphics, kOpsx+128+4, kOpsy+12, 1, 0);
+	showFrame(_tempGraphics, kOpsx+10, kOpsy+10, 9, 0);
+	showFrame(_tempGraphics, kOpsx+59, kOpsy+30, 10, 0);
+	showFrame(_tempGraphics, kOpsx+176+2, kOpsy+60-4, 5, 0);
 }
 
 void DreamBase::discOps() {
@@ -648,7 +646,7 @@ void DreamBase::loadOld() {
 void DreamBase::showDecisions() {
 	createPanel2();
 	showOpBox();
-	showFrame(tempGraphics(), kOpsx + 17, kOpsy + 13, 6, 0);
+	showFrame(_tempGraphics, kOpsx + 17, kOpsy + 13, 6, 0);
 	underTextLine();
 }
 
@@ -750,35 +748,35 @@ void DreamBase::selectSlot() {
 }
 
 void DreamBase::showSlots() {
-	showFrame(tempGraphics(), kOpsx + 7, kOpsy + 8, 2, 0);
+	showFrame(_tempGraphics, kOpsx + 7, kOpsy + 8, 2, 0);
 
 	uint16 y = kOpsy + 11;
 
 	for (int slot = 0; slot < 7; slot++) {
 		if (slot == data.byte(kCurrentslot))
-			showFrame(tempGraphics(), kOpsx + 10, y, 3, 0);
+			showFrame(_tempGraphics, kOpsx + 10, y, 3, 0);
 
 		y += 10;
 	}
 }
 
 void DreamBase::showOpBox() {
-	showFrame(tempGraphics(), kOpsx, kOpsy, 0, 0);
+	showFrame(_tempGraphics, kOpsx, kOpsy, 0, 0);
 
 	// CHECKME: There seem to be versions of dreamweb in which this call
 	// should be removed. It displays a red dot on the ops dialogs if left in.
-	showFrame(tempGraphics(), kOpsx, kOpsy + 55, 4, 0);
+	showFrame(_tempGraphics, kOpsx, kOpsy + 55, 4, 0);
 }
 
 void DreamBase::showLoadOps() {
-	showFrame(tempGraphics(), kOpsx + 128 + 4, kOpsy + 12, 1, 0);
-	showFrame(tempGraphics(), kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
+	showFrame(_tempGraphics, kOpsx + 128 + 4, kOpsy + 12, 1, 0);
+	showFrame(_tempGraphics, kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
 	printMessage(kOpsx + 104, kOpsy + 14, 55, 101, (101 & 1));
 }
 
 void DreamBase::showSaveOps() {
-	showFrame(tempGraphics(), kOpsx + 128 + 4, kOpsy + 12, 1, 0);
-	showFrame(tempGraphics(), kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
+	showFrame(_tempGraphics, kOpsx + 128 + 4, kOpsy + 12, 1, 0);
+	showFrame(_tempGraphics, kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
 	printMessage(kOpsx + 104, kOpsy + 14, 54, 101, (101 & 1));
 }
 
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index cd79d386fc..31f7408a1c 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -58,14 +58,14 @@ void DreamBase::printASprite(const Sprite *sprite) {
 		c = 8;
 	else
 		c = 0;
-	showFrame((const Frame *)getSegment(sprite->_frameData).ptr(0, 0), x, y, sprite->frameNumber, c);
+	showFrame(*sprite->_frameData, x, y, sprite->frameNumber, c);
 }
 
 void DreamBase::clearSprites() {
 	_spriteTable.clear();
 }
 
-Sprite *DreamBase::makeSprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi) {
+Sprite *DreamBase::makeSprite(uint8 x, uint8 y, uint16 updateCallback, const GraphicsFile *frameData, uint16 somethingInDi) {
 	// Note: the original didn't append sprites here, but filled up the
 	// first unused entry. This can change the order of entries, but since they
 	// are drawn based on the priority field, this shouldn't matter.
@@ -109,7 +109,7 @@ void DreamBase::spriteUpdate() {
 }
 
 void DreamBase::initMan() {
-	Sprite *sprite = makeSprite(data.byte(kRyanx), data.byte(kRyany), addr_mainman, data.word(kMainsprites), 0);
+	Sprite *sprite = makeSprite(data.byte(kRyanx), data.byte(kRyany), addr_mainman, &_mainSprites, 0);
 	sprite->priority = 4;
 	sprite->speed = 0;
 	sprite->walkFrame = 0;
@@ -477,8 +477,7 @@ void DreamBase::showRain() {
 	if (_rainList.empty())
 		return;
 
-	const Frame *frame = (const Frame *)getSegment(data.word(kMainsprites)).ptr(58 * sizeof(Frame), sizeof(Frame));
-	const uint8 *frameData = getSegment(data.word(kMainsprites)).ptr(kFrframes + frame->ptr(), 512);
+	const uint8 *frameData = _mainSprites.getFrameData(58);
 
 	for (i = _rainList.begin(); i != _rainList.end(); ++i) {
 		Rain &rain = *i;
@@ -1102,13 +1101,14 @@ void DreamBase::clearBeforeLoad() {
 	//clearRest
 	memset(_mapData, 0, kMaplen);
 	delete[] _backdropBlocks;
-	deallocateMem(data.word(kSetframes));
+	_backdropBlocks = 0;
+	_setFrames.clear();
 	deallocateMem(data.word(kReels));
 	deallocateMem(data.word(kPeople));
 	deallocateMem(data.word(kSetdesc));
 	deallocateMem(data.word(kBlockdesc));
 	deallocateMem(data.word(kRoomdesc));
-	deallocateMem(data.word(kFreeframes));
+	_freeFrames.clear();
 	deallocateMem(data.word(kFreedesc));
 
 	data.byte(kRoomloaded) = 0;
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index ce675fc816..cf3e2ceb9f 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -28,11 +28,13 @@
 
 namespace DreamGen {
 
+struct GraphicsFile;
+
 struct Sprite {
 	uint16 _updateCallback;
 	uint16 w2;
 	uint16 w4;
-	uint16 _frameData;
+	const GraphicsFile *_frameData;
 	uint16 w8;
 	uint8  x;
 	uint8  y;
@@ -308,6 +310,24 @@ struct TextFile {
 	}
 };
 
+struct GraphicsFile {
+	GraphicsFile() : _data(0) { }
+
+	Frame _frames[347];
+	uint8 *_data;
+
+	const uint8 *getFrameData(unsigned int i) const {
+		// There is 2080 bytes of Frame data, but that is between 346 and 347
+		// frames
+		assert(i < 346);
+		return _data + _frames[i].ptr();
+	}
+	void clear() {
+		delete[] _data;
+		_data = 0;
+	}
+};
+
 
 } // End of namespace DreamWeb
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 1868c19d39..9ef7dda581 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -640,8 +640,22 @@ done: // The engine will need some cleaner finalization, let's put it here for n
 	// FIXME: This triggers "Deallocating non existent segment" errors when
 	// quitting from a menu.
 	getRidOfAll();
-	engine->freeIcons1();
-	engine->freeIcons2();
+
+	_icons1.clear();
+	_icons2.clear();
+	_charset1.clear();
+	_tempGraphics.clear();
+	_tempGraphics2.clear();
+	_tempGraphics3.clear();
+	_tempCharset.clear();
+	_mainSprites.clear();
+
+	_textFile1.clear();
+	_textFile2.clear();
+	_textFile3.clear();
+	_travelText.clear();
+	_puzzleText.clear();
+	_commandText.clear();
 }
 
 void DreamBase::loadTextFile(TextFile &file, const char *fileName)
@@ -775,20 +789,36 @@ void *DreamBase::standardLoadCPP(const char *fileName, uint16 *outSizeInBytes) {
 	return buffer;
 }
 
+void DreamBase::loadGraphicsFile(GraphicsFile &file, const char *fileName) {
+	FileHeader header;
+
+	Common::File f;
+	f.open(fileName);
+	f.read((uint8 *)&header, sizeof(FileHeader));
+	uint16 sizeInBytes = header.len(0);
+
+	assert(sizeInBytes >= 2080);
+	delete[] file._data;
+	file._data = new uint8[sizeInBytes - 2080];
+
+	f.read((uint8 *)file._frames, 2080);
+	f.read(file._data, sizeInBytes - 2080);
+}
+
 void DreamBase::loadIntoTemp(const char *fileName) {
-	data.word(kTempgraphics) = standardLoad(fileName);
+	loadGraphicsFile(_tempGraphics, fileName);
 }
 
 void DreamBase::loadIntoTemp2(const char *fileName) {
-	data.word(kTempgraphics2) = standardLoad(fileName);
+	loadGraphicsFile(_tempGraphics2, fileName);
 }
 
 void DreamBase::loadIntoTemp3(const char *fileName) {
-	data.word(kTempgraphics3) = standardLoad(fileName);
+	loadGraphicsFile(_tempGraphics3, fileName);
 }
 
 void DreamBase::loadTempCharset(const char *fileName) {
-	engine->setTempCharset(standardLoadCPP(fileName));
+	loadGraphicsFile(_tempCharset, fileName);
 }
 
 void DreamBase::hangOnCurs(uint16 frameCount) {
@@ -955,17 +985,6 @@ uint16 DreamBase::allocateMem(uint16 paragraphs) {
 void DreamBase::deallocateMem(uint16 segment) {
 	debug(1, "deallocating segment %04x", segment);
 	deallocateSegment(segment);
-
-	// CHECKME: Do we really need this? From brief testing it appears
-	// the sprite table is cleared entirely shortly after this happens
-	// anyway.
-	Common::List<Sprite>::iterator i;
-	for (i = _spriteTable.begin(); i != _spriteTable.end(); ) {
-		if (i->_frameData == segment)
-			i = _spriteTable.erase(i);
-		else
-			++i;
-	}
 }
 
 void DreamBase::DOSReturn() {
@@ -1131,7 +1150,7 @@ void DreamBase::crosshair() {
 	} else {
 		frame = 29;
 	}
-	showFrame(engine->icons1(), kZoomx + 24, kZoomy + 19, frame, 0);
+	showFrame(_icons1, kZoomx + 24, kZoomy + 19, frame, 0);
 }
 
 void DreamBase::delTextLine() {
@@ -1505,7 +1524,7 @@ void DreamBase::showBlink() {
 		blinkFrame = 6;
 	static const uint8 blinkTab[] = { 16,18,18,17,16,16,16 };
 	uint8 width, height;
-	showFrame(engine->icons1(), 44, 32, blinkTab[blinkFrame], 0, &width, &height);
+	showFrame(_icons1, 44, 32, blinkTab[blinkFrame], 0, &width, &height);
 }
 
 void DreamBase::dumpBlink() {
@@ -1546,12 +1565,13 @@ void DreamBase::showPointer() {
 	uint16 y = data.word(kMousey);
 	data.word(kOldpointery) = data.word(kMousey);
 	if (data.byte(kPickup) == 1) {
-		const Frame *frames;
-		if (data.byte(kObjecttype) != kExObjectType)
-			frames = (const Frame *)getSegment(data.word(kFreeframes)).ptr(0, 0);
-		else
-			frames = (const Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
-		const Frame *frame = frames + (3 * data.byte(kItemframe) + 1);
+		const Frame *frame;
+		if (data.byte(kObjecttype) != kExObjectType) {
+			frame = &_freeFrames._frames[(3 * data.byte(kItemframe) + 1)];
+		} else {
+			const Frame *frames = (const Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
+			frame = frames + (3 * data.byte(kItemframe) + 1);
+		}
 		uint8 width = frame->width;
 		uint8 height = frame->height;
 		if (width < 12)
@@ -1565,10 +1585,15 @@ void DreamBase::showPointer() {
 		data.word(kOldpointerx) = xMin;
 		data.word(kOldpointery) = yMin;
 		multiGet(_pointerBack, xMin, yMin, width, height);
-		showFrame(frames, x, y, 3 * data.byte(kItemframe) + 1, 128);
-		showFrame(engine->icons1(), x, y, 3, 128);
+		if (data.byte(kObjecttype) != kExObjectType) {
+			showFrame(_freeFrames, x, y, 3 * data.byte(kItemframe) + 1, 128);
+		} else {
+			const Frame *frames = (const Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
+			showFrame(frames, x, y, 3 * data.byte(kItemframe) + 1, 128);
+		}
+		showFrame(_icons1, x, y, 3, 128);
 	} else {
-		const Frame *frame = engine->icons1() + (data.byte(kPointerframe) + 20);
+		const Frame *frame = &_icons1._frames[data.byte(kPointerframe) + 20];
 		uint8 width = frame->width;
 		uint8 height = frame->height;
 		if (width < 12)
@@ -1578,7 +1603,7 @@ void DreamBase::showPointer() {
 		data.byte(kPointerxs) = width;
 		data.byte(kPointerys) = height;
 		multiGet(_pointerBack, x, y, width, height);
-		showFrame(engine->icons1(), x, y, data.byte(kPointerframe) + 20, 0);
+		showFrame(_icons1, x, y, data.byte(kPointerframe) + 20, 0);
 	}
 }
 
@@ -1712,6 +1737,9 @@ void DreamBase::showIcon() {
 		panelIcons1();
 		zoomIcon();
 	} else {
+		error("Unimplemented tempsprites code called");
+		// the tempsprites segment is never initialized, but used here.
+/*
 		Frame *tempSprites = (Frame *)getSegment(data.word(kTempsprites)).ptr(0, 0);
 		showFrame(tempSprites, 72, 2, 45, 0);
 		showFrame(tempSprites, 72+47, 2, 46, 0);
@@ -1719,7 +1747,13 @@ void DreamBase::showIcon() {
 		showFrame(tempSprites, 160+88, 2, 45, 4 & 0xfe);
 		showFrame(tempSprites, 160+43, 2, 46, 4 & 0xfe);
 		showFrame(tempSprites, 160+101, 21, 49, 4 & 0xfe);
-		middlePanel();
+
+		// middle panel
+		showFrame(tempSprites, 72 + 47 + 20, 0, 48, 0);
+		showFrame(tempSprites, 72 + 19, 21, 47, 0);
+		showFrame(tempSprites, 160 + 23, 0, 48, 4);
+		showFrame(tempSprites, 160 + 71, 21, 47, 4);
+*/
 	}
 }
 
@@ -1932,7 +1966,7 @@ void DreamBase::mainScreen() {
 
 void DreamBase::showWatch() {
 	if (data.byte(kWatchon)) {
-		showFrame(engine->icons1(), 250, 1, 6, 0);
+		showFrame(_icons1, 250, 1, 6, 0);
 		showTime();
 	}
 }
@@ -1947,22 +1981,21 @@ void DreamBase::dumpWatch() {
 void DreamBase::showTime() {
 	if (data.byte(kWatchon) == 0)
 		return;
-	Frame *charset = (Frame *)getSegment(data.word(kCharset1)).ptr(0, 0);
 
 	int seconds = data.byte(kSecondcount);
 	int minutes = data.byte(kMinutecount);
 	int hours = data.byte(kHourcount);
 
-	showFrame(charset, 282+5, 21, 91*3+10 + seconds / 10, 0);
-	showFrame(charset, 282+9, 21, 91*3+10 + seconds % 10, 0);
+	showFrame(_charset1, 282+5, 21, 91*3+10 + seconds / 10, 0);
+	showFrame(_charset1, 282+9, 21, 91*3+10 + seconds % 10, 0);
 
-	showFrame(charset, 270+5, 21, 91*3 + minutes / 10, 0);
-	showFrame(charset, 270+11, 21, 91*3 + minutes % 10, 0);
+	showFrame(_charset1, 270+5, 21, 91*3 + minutes / 10, 0);
+	showFrame(_charset1, 270+11, 21, 91*3 + minutes % 10, 0);
 
-	showFrame(charset, 256+5, 21, 91*3 + hours / 10, 0);
-	showFrame(charset, 256+11, 21, 91*3 + hours % 10, 0);
+	showFrame(_charset1, 256+5, 21, 91*3 + hours / 10, 0);
+	showFrame(_charset1, 256+11, 21, 91*3 + hours % 10, 0);
 
-	showFrame(charset, 267+5, 21, 91*3+20, 0);
+	showFrame(_charset1, 267+5, 21, 91*3+20, 0);
 }
 
 void DreamBase::watchCount() {
@@ -1970,7 +2003,7 @@ void DreamBase::watchCount() {
 		return;
 	++data.byte(kTimercount);
 	if (data.byte(kTimercount) == 9) {
-		showFrame((Frame *)getSegment(data.word(kCharset1)).ptr(0, 0), 268+4, 21, 91*3+21, 0);
+		showFrame(_charset1, 268+4, 21, 91*3+21, 0);
 		data.byte(kWatchdump) = 1;
 	} else if (data.byte(kTimercount) == 18) {
 		data.byte(kTimercount) = 0;
@@ -2007,7 +2040,7 @@ void DreamBase::roomName() {
 void DreamBase::zoomIcon() {
 	if (data.byte(kZoomon) == 0)
 		return;
-	showFrame(engine->icons1(), kZoomx, kZoomy-1, 8, 0);
+	showFrame(_icons1, kZoomx, kZoomy-1, 8, 0);
 }
 
 void DreamBase::loadRoom() {
@@ -2032,14 +2065,10 @@ void DreamBase::loadRoom() {
 }
 
 void DreamBase::readSetData() {
-	data.word(kCharset1) = standardLoad("DREAMWEB.C00");
-
-	void *icons1Buffer = standardLoadCPP("DREAMWEB.G00");
-	engine->setIcons1(icons1Buffer);
-	void *icons2Buffer = standardLoadCPP("DREAMWEB.G01");
-	engine->setIcons2(icons2Buffer);
-
-	data.word(kMainsprites) = standardLoad("DREAMWEB.S00");
+	loadGraphicsFile(_charset1, "DREAMWEB.C00");
+	loadGraphicsFile(_icons1, "DREAMWEB.G00");
+	loadGraphicsFile(_icons2, "DREAMWEB.G01");
+	loadGraphicsFile(_mainSprites, "DREAMWEB.S00");
 	loadTextFile(_puzzleText, "DREAMWEB.T80");
 	loadTextFile(_commandText, "DREAMWEB.T84");
 	useCharset1();
@@ -2051,18 +2080,6 @@ void DreamBase::readSetData() {
 	//engine->closeFile();
 }
 
-Frame * DreamBase::tempGraphics() {
-	return (Frame *)getSegment(data.word(kTempgraphics)).ptr(0, 0);
-}
-
-Frame * DreamBase::tempGraphics2() {
-	return (Frame *)getSegment(data.word(kTempgraphics2)).ptr(0, 0);
-}
-
-Frame * DreamBase::tempGraphics3() {
-	return (Frame *)getSegment(data.word(kTempgraphics3)).ptr(0, 0);
-}
-
 void DreamBase::findRoomInLoc() {
 	uint8 x = data.byte(kMapx) / 11;
 	uint8 y = data.byte(kMapy) / 10;
@@ -2123,15 +2140,15 @@ void DreamBase::doLook() {
 }
 
 void DreamBase::useCharset1() {
-	engine->setCurrentCharset((Frame *)getSegment(data.word(kCharset1)).ptr(0, 0));
+	_currentCharset = &_charset1;
 }
 
 void DreamBase::useTempCharset() {
-	engine->setCurrentCharset(engine->tempCharset());
+	_currentCharset = &_tempCharset;
 }
 
 void DreamBase::getRidOfTemp() {
-	deallocateMem(data.word(kTempgraphics));
+	_tempGraphics.clear();
 }
 
 void DreamBase::getRidOfTempText() {
@@ -2139,24 +2156,22 @@ void DreamBase::getRidOfTempText() {
 }
 
 void DreamBase::getRidOfTemp2() {
-	deallocateMem(data.word(kTempgraphics2));
+	_tempGraphics2.clear();
 }
 
 void DreamBase::getRidOfTemp3() {
-	deallocateMem(data.word(kTempgraphics3));
+	_tempGraphics3.clear();
 }
 
 void DreamBase::getRidOfTempCharset() {
-	engine->freeTempCharset();
-}
-
-void DreamBase::getRidOfTempsP() {
-	deallocateMem(data.word(kTempsprites));
+	_tempCharset.clear();
 }
 
 void DreamBase::getRidOfAll() {
 	delete[] _backdropBlocks;
-	deallocateMem(data.word(kSetframes));
+	_backdropBlocks = 0;
+
+	_setFrames.clear();
 	deallocateMem(data.word(kReel1));
 	deallocateMem(data.word(kReel2));
 	deallocateMem(data.word(kReel3));
@@ -2165,7 +2180,7 @@ void DreamBase::getRidOfAll() {
 	deallocateMem(data.word(kSetdesc));
 	deallocateMem(data.word(kBlockdesc));
 	deallocateMem(data.word(kRoomdesc));
-	deallocateMem(data.word(kFreeframes));
+	_freeFrames.clear();
 	deallocateMem(data.word(kFreedesc));
 }
 
@@ -2188,7 +2203,14 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 
 	clearAndLoad(workspace(), 0, len[1], 132*66); // 132*66 = maplen
 	sortOutMap();
-	data.word(kSetframes) = allocateAndLoad(len[2]);
+
+	// TODO: Create function for loading a GraphicsFile from a file segment
+	_setFrames.clear();
+	assert(len[2] >= 2080);
+	engine->readFromFile((uint8 *)_setFrames._frames, 2080);
+	_setFrames._data = new uint8[len[2] - 2080];
+	engine->readFromFile(_setFrames._data, len[2] - 2080);
+
 	if (!skipDat)
 		clearAndLoad(data.word(kSetdat), 255, len[3], kSetdatlen);
 	else
@@ -2196,6 +2218,7 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	// NB: The skipDat version of this function as called by restoreall
 	// had a 'call bloc' instead of 'call loadseg' for reel1,
 	// but 'bloc' was not defined.
+	// TODO: kReel1/2/3 are also GraphicsFiles?
 	data.word(kReel1) = allocateAndLoad(len[4]);
 	data.word(kReel2) = allocateAndLoad(len[5]);
 	data.word(kReel3) = allocateAndLoad(len[6]);
@@ -2204,7 +2227,14 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	data.word(kSetdesc) = allocateAndLoad(len[9]);
 	data.word(kBlockdesc) = allocateAndLoad(len[10]);
 	data.word(kRoomdesc) = allocateAndLoad(len[11]);
-	data.word(kFreeframes) = allocateAndLoad(len[12]);
+
+	// TODO: Create function for loading a GraphicsFile from a file segment
+	_freeFrames.clear();
+	assert(len[12] >= 2080);
+	engine->readFromFile((uint8 *)_freeFrames._frames, 2080);
+	_freeFrames._data = new uint8[len[12] - 2080];
+	engine->readFromFile(_freeFrames._data, len[12] - 2080);
+
 	if (!skipDat)
 		clearAndLoad(data.word(kFreedat), 255, len[13], kFreedatlen);
 	else
@@ -2260,10 +2290,10 @@ void DreamBase::showFolder() {
 	if (data.byte(kFolderpage)) {
 		useTempCharset();
 		createPanel2();
-		showFrame(tempGraphics(), 0, 0, 0, 0);
-		showFrame(tempGraphics(), 143, 0, 1, 0);
-		showFrame(tempGraphics(), 0, 92, 2, 0);
-		showFrame(tempGraphics(), 143, 92, 3, 0);
+		showFrame(_tempGraphics, 0, 0, 0, 0);
+		showFrame(_tempGraphics, 143, 0, 1, 0);
+		showFrame(_tempGraphics, 0, 92, 2, 0);
+		showFrame(_tempGraphics, 143, 92, 3, 0);
 		folderExit();
 		if (data.byte(kFolderpage) != 1)
 			showLeftPage();
@@ -2273,21 +2303,21 @@ void DreamBase::showFolder() {
 		underTextLine();
 	} else {
 		createPanel2();
-		showFrame(tempGraphics3(), 143-28, 0, 0, 0);
-		showFrame(tempGraphics3(), 143-28, 92, 1, 0);
+		showFrame(_tempGraphics3, 143-28, 0, 0, 0);
+		showFrame(_tempGraphics3, 143-28, 92, 1, 0);
 		folderExit();
 		underTextLine();
 	}
 }
 
 void DreamBase::showLeftPage() {
-	showFrame(tempGraphics2(), 0, 12, 3, 0);
+	showFrame(_tempGraphics2, 0, 12, 3, 0);
 	uint16 y = 12+5;
 	for (size_t i = 0; i < 9; ++i) {
-		showFrame(tempGraphics2(), 0, y, 4, 0);
+		showFrame(_tempGraphics2, 0, y, 4, 0);
 		y += 16;
 	}
-	showFrame(tempGraphics2(), 0, y, 5, 0);
+	showFrame(_tempGraphics2, 0, y, 5, 0);
 	data.word(kLinespacing) = 8;
 	data.word(kCharshift) = 91;
 	data.byte(kKerning) = 1;
@@ -2314,14 +2344,14 @@ void DreamBase::showLeftPage() {
 }
 
 void DreamBase::showRightPage() {
-	showFrame(tempGraphics2(), 143, 12, 0, 0);
+	showFrame(_tempGraphics2, 143, 12, 0, 0);
 	uint16 y = 12+37;
 	for (size_t i = 0; i < 7; ++i) {
-		showFrame(tempGraphics2(), 143, y, 1, 0);
+		showFrame(_tempGraphics2, 143, y, 1, 0);
 		y += 16;
 	}
 
-	showFrame(tempGraphics2(), 143, y, 2, 0);
+	showFrame(_tempGraphics2, 143, y, 2, 0);
 	data.word(kLinespacing) = 8;
 	data.byte(kKerning) = 1;
 	uint8 pageIndex = data.byte(kFolderpage) - 1;
@@ -2339,14 +2369,14 @@ void DreamBase::showRightPage() {
 }
 
 void DreamBase::showExit() {
-	showFrame(engine->icons1(), 274, 154, 11, 0);
+	showFrame(_icons1, 274, 154, 11, 0);
 }
 
 void DreamBase::showMan() {
-	showFrame(engine->icons1(), 0, 0, 0, 0);
-	showFrame(engine->icons1(), 0, 114, 1, 0);
+	showFrame(_icons1, 0, 0, 0, 0);
+	showFrame(_icons1, 0, 114, 1, 0);
 	if (data.byte(kShadeson))
-		showFrame(engine->icons1(), 28, 25, 2, 0);
+		showFrame(_icons1, 28, 25, 2, 0);
 }
 
 void DreamBase::panelIcons1() {
@@ -2355,14 +2385,14 @@ void DreamBase::panelIcons1() {
 		x = 48;
 	else
 		x = 0;
-	showFrame(engine->icons2(), 204 + x, 4, 2, 0);
+	showFrame(_icons2, 204 + x, 4, 2, 0);
 	if (data.byte(kZoomon) != 1)
-		showFrame(engine->icons1(), 228 + x, 8, 5, 0);
+		showFrame(_icons1, 228 + x, 8, 5, 0);
 	showWatch();
 }
 
 void DreamBase::examIcon() {
-	showFrame(engine->icons2(), 254, 5, 3, 0);
+	showFrame(_icons2, 254, 5, 3, 0);
 }
 
 const uint8 *DreamBase::getTextInFile1(uint16 index) {
@@ -2443,7 +2473,7 @@ void DreamBase::folderHints() {
 }
 
 void DreamBase::folderExit() {
-	showFrame(tempGraphics2(), 296, 178, 6, 0);
+	showFrame(_tempGraphics2, 296, 178, 6, 0);
 }
 
 void DreamBase::loadTravelText() {
@@ -2491,7 +2521,7 @@ void DreamBase::showMenu() {
 	++data.byte(kMenucount);
 	if (data.byte(kMenucount) == 37*2)
 		data.byte(kMenucount) = 0;
-	showFrame(tempGraphics(), kMenux, kMenuy, data.byte(kMenucount) / 2, 0);
+	showFrame(_tempGraphics, kMenux, kMenuy, data.byte(kMenucount) / 2, 0);
 }
 
 void DreamBase::dumpMenu() {
@@ -2507,9 +2537,9 @@ void DreamBase::useMenu() {
 	data.byte(kNewobs) = 0;
 	drawFloor();
 	printSprites();
-	showFrame(tempGraphics2(), kMenux-48, kMenuy-4, 4, 0);
+	showFrame(_tempGraphics2, kMenux-48, kMenuy-4, 4, 0);
 	getUnderMenu();
-	showFrame(tempGraphics2(), kMenux+54, kMenuy+72, 5, 0);
+	showFrame(_tempGraphics2, kMenux+54, kMenuy+72, 5, 0);
 	workToScreenM();
 	data.byte(kGetback) = 0;
 	do {
@@ -2609,19 +2639,19 @@ uint8 DreamBase::nextSymbol(uint8 symbol) {
 }
 
 void DreamBase::showSymbol() {
-	showFrame(tempGraphics(), kSymbolx, kSymboly, 12, 0);
+	showFrame(_tempGraphics, kSymbolx, kSymboly, 12, 0);
 
-	showFrame(tempGraphics(), data.byte(kSymboltopx) + kSymbolx-44, kSymboly+20, data.byte(kSymboltopnum), 32);
+	showFrame(_tempGraphics, data.byte(kSymboltopx) + kSymbolx-44, kSymboly+20, data.byte(kSymboltopnum), 32);
 	uint8 nextTopSymbol = nextSymbol(data.byte(kSymboltopnum));
-	showFrame(tempGraphics(), data.byte(kSymboltopx) + kSymbolx+5, kSymboly+20, nextTopSymbol, 32);
+	showFrame(_tempGraphics, data.byte(kSymboltopx) + kSymbolx+5, kSymboly+20, nextTopSymbol, 32);
 	uint8 nextNextTopSymbol = nextSymbol(nextTopSymbol);
-	showFrame(tempGraphics(), data.byte(kSymboltopx) + kSymbolx+54, kSymboly+20, nextNextTopSymbol, 32);
+	showFrame(_tempGraphics, data.byte(kSymboltopx) + kSymbolx+54, kSymboly+20, nextNextTopSymbol, 32);
 
-	showFrame(tempGraphics(), data.byte(kSymbolbotx) + kSymbolx-44, kSymboly+49, 6 + data.byte(kSymbolbotnum), 32);
+	showFrame(_tempGraphics, data.byte(kSymbolbotx) + kSymbolx-44, kSymboly+49, 6 + data.byte(kSymbolbotnum), 32);
 	uint8 nextBotSymbol = nextSymbol(data.byte(kSymbolbotnum));
-	showFrame(tempGraphics(), data.byte(kSymbolbotx) + kSymbolx+5, kSymboly+49, 6 + nextBotSymbol, 32);
+	showFrame(_tempGraphics, data.byte(kSymbolbotx) + kSymbolx+5, kSymboly+49, 6 + nextBotSymbol, 32);
 	uint8 nextNextBotSymbol = nextSymbol(nextBotSymbol);
-	showFrame(tempGraphics(), data.byte(kSymbolbotx) + kSymbolx+54, kSymboly+49, 6 + nextNextBotSymbol, 32);
+	showFrame(_tempGraphics, data.byte(kSymbolbotx) + kSymbolx+54, kSymboly+49, 6 + nextNextBotSymbol, 32);
 }
 
 void DreamBase::readKey() {
@@ -2961,16 +2991,11 @@ void DreamBase::examineInventory() {
 }
 
 void DreamBase::middlePanel() {
-	Frame *tempSprites = (Frame *)getSegment(data.word(kTempsprites)).ptr(0, 0);
-	showFrame(tempSprites, 72 + 47 + 20, 0, 48, 0);
-	showFrame(tempSprites, 72 + 19, 21, 47, 0);
-	showFrame(tempSprites, 160 + 23, 0, 48, 4);
-	showFrame(tempSprites, 160 + 71, 21, 47, 4);
 }
 
 void DreamBase::showDiary() {
-	showFrame(tempGraphics(), kDiaryx, kDiaryy + 37, 1, 0);
-	showFrame(tempGraphics(), kDiaryx + 176, kDiaryy + 108, 2, 0);
+	showFrame(_tempGraphics, kDiaryx, kDiaryy + 37, 1, 0);
+	showFrame(_tempGraphics, kDiaryx + 176, kDiaryy + 108, 2, 0);
 }
 
 void DreamBase::underTextLine() {
@@ -3166,8 +3191,8 @@ void DreamBase::showGun() {
 	data.byte(kVolume) = 0;
 	loadIntoTemp("DREAMWEB.G13");
 	createPanel2();
-	showFrame(tempGraphics(), 100, 4, 0, 0);
-	showFrame(tempGraphics(), 158, 106, 1, 0);
+	showFrame(_tempGraphics, 100, 4, 0, 0);
+	showFrame(_tempGraphics, 158, 106, 1, 0);
 	workToScreen();
 	getRidOfTemp();
 	fadeScreenUp();
@@ -3511,7 +3536,7 @@ void DreamBase::updateSymbolBot() {
 }
 
 void DreamBase::showDiaryPage() {
-	showFrame(tempGraphics(), kDiaryx, kDiaryy, 0, 0);
+	showFrame(_tempGraphics, kDiaryx, kDiaryy, 0, 0);
 	data.byte(kKerning) = 1;
 	useTempCharset();
 	data.word(kCharshift) = 91+91;
@@ -3558,7 +3583,7 @@ void DreamBase::lookAtCard() {
 	getRidOfReels();
 	loadKeypad();
 	createPanel2();
-	showFrame(tempGraphics(), 160, 80, 42, 128);
+	showFrame(_tempGraphics, 160, 80, 42, 128);
 	const uint8 *obText = getObTextStart();
 	findNextColon(&obText);
 	findNextColon(&obText);
@@ -3568,7 +3593,7 @@ void DreamBase::lookAtCard() {
 	workToScreenM();
 	hangOnW(280);
 	createPanel2();
-	showFrame(tempGraphics(), 160, 80, 42, 128);
+	showFrame(_tempGraphics, 160, 80, 42, 128);
 	printDirect(obText, 36, 130, 241, 241 & 1);
 	workToScreenM();
 	hangOnW(200);
@@ -3614,10 +3639,10 @@ void DreamBase::showDiaryKeys() {
 
 	if (data.byte(kPressed) == 'N') {
 		byte frame = (data.byte(kPresscount) == 1) ? 3 : 4;
-		showFrame(tempGraphics(), kDiaryx + 94, kDiaryy + 97, frame, 0);
+		showFrame(_tempGraphics, kDiaryx + 94, kDiaryy + 97, frame, 0);
 	} else {
 		byte frame = (data.byte(kPresscount) == 1) ? 5 : 6;
-		showFrame(tempGraphics(), kDiaryx + 151, kDiaryy + 71, frame, 0);
+		showFrame(_tempGraphics, kDiaryx + 151, kDiaryy + 71, frame, 0);
 	}
 
 	if (data.byte(kPresscount) == 1)
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index ed54c4b09e..8576fd4eb2 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -42,7 +42,7 @@ void DreamBase::monkSpeaking() {
 	loadRoomsSample();
 	loadIntoTemp("DREAMWEB.G15");
 	clearWork();
-	showFrame(tempGraphics(), 160, 72, 0, 128);	// show monk
+	showFrame(_tempGraphics, 160, 72, 0, 128);	// show monk
 	workToScreen();
 	data.byte(kVolume) = 7;
 	data.byte(kVolumedirection) = (byte)-1;
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 1b91cc8d7b..f2dce4d603 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1576,7 +1576,7 @@ void DreamBase::useCashCard() {
 	showExit();
 	showMan();
 	uint16 y = (!_foreignRelease) ? 120 : 120 - 3;
-	showFrame(tempGraphics(), 114, y, 39, 0);
+	showFrame(_tempGraphics, 114, y, 39, 0);
 	const uint8 *obText = getObTextStart();
 	findNextColon(&obText);
 	findNextColon(&obText);
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index f611a79329..19abc2b35d 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -273,29 +273,17 @@ void DreamBase::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 fra
 	showFrame(frameData, x, y, frameNumber, effectsFlag, &width, &height);
 }
 
-void DreamBase::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
-	const Frame *frame = frameData + frameNumber;
-	if ((frame->width == 0) && (frame->height == 0)) {
-		*width = 0;
-		*height = 0;
-		return;
-	}
 
-	// "notBlankShow"
-	if ((effectsFlag & 128) == 0) {
-		x += frame->x;
-		y += frame->y;
-	}
-
-	// "skipOffsets"
-	*width = frame->width;
-	*height = frame->height;
-	const uint8 *pSrc = ((const uint8 *)frameData) + frame->ptr() + 2080;
+void DreamBase::showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag) {
+	uint8 width, height;
+	showFrame(frameData, x, y, frameNumber, effectsFlag, &width, &height);
+}
 
+void DreamBase::showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 effectsFlag, uint8 width, uint8 height) {
 	if (effectsFlag) {
 		if (effectsFlag & 128) { //centred
-			x -= *width / 2;
-			y -= *height / 2;
+			x -= width / 2;
+			y -= height / 2;
 		}
 		if (effectsFlag & 64) { // diffDest
 			error("Unsupported DreamBase::showFrame effectsFlag %d", effectsFlag);
@@ -308,21 +296,64 @@ void DreamBase::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 fra
 			//addToPrintList(x - data.word(kMapadx), y - data.word(kMapady)); // NB: Commented in the original asm
 		}
 		if (effectsFlag & 4) { // flippedX
-			frameOutFx(workspace(), pSrc, 320, *width, *height, x, y);
+			frameOutFx(workspace(), pSrc, 320, width, height, x, y);
 			return;
 		}
 		if (effectsFlag & 2) { // noMask
-			frameOutNm(workspace(), pSrc, 320, *width, *height, x, y);
+			frameOutNm(workspace(), pSrc, 320, width, height, x, y);
 			return;
 		}
 		if (effectsFlag & 32) {
-			frameOutBh(workspace(), pSrc, 320, *width, *height, x, y);
+			frameOutBh(workspace(), pSrc, 320, width, height, x, y);
 			return;
 		}
 	}
 	// "noEffects"
-	frameOutV(workspace(), pSrc, 320, *width, *height, x, y);
-	return;
+	frameOutV(workspace(), pSrc, 320, width, height, x, y);
+}
+
+void DreamBase::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
+	const Frame *frame = frameData + frameNumber;
+	if ((frame->width == 0) && (frame->height == 0)) {
+		*width = 0;
+		*height = 0;
+		return;
+	}
+
+	// "notBlankShow"
+	if ((effectsFlag & 128) == 0) {
+		x += frame->x;
+		y += frame->y;
+	}
+
+	// "skipOffsets"
+	*width = frame->width;
+	*height = frame->height;
+	const uint8 *pSrc = ((const uint8 *)frameData) + frame->ptr() + 2080;
+
+	showFrameInternal(pSrc, x, y, effectsFlag, *width, *height);
+}
+
+void DreamBase::showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
+	const Frame *frame = &frameData._frames[frameNumber];
+	if ((frame->width == 0) && (frame->height == 0)) {
+		*width = 0;
+		*height = 0;
+		return;
+	}
+
+	// "notBlankShow"
+	if ((effectsFlag & 128) == 0) {
+		x += frame->x;
+		y += frame->y;
+	}
+
+	// "skipOffsets"
+	*width = frame->width;
+	*height = frame->height;
+	const uint8 *pSrc = frameData.getFrameData(frameNumber);
+
+	showFrameInternal(pSrc, x, y, effectsFlag, *width, *height);
 }
 
 void DreamBase::clearWork() {
@@ -373,8 +404,8 @@ bool DreamBase::pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y) {
 	x -= pos->xMin;
 	y -= pos->yMin;
 	SetObject *setObject = getSetAd(pos->index);
-	Frame *frame = (Frame *)getSegment(data.word(kSetframes)).ptr(kFramedata, 0) + setObject->index;
-	const uint8 *ptr = getSegment(data.word(kSetframes)).ptr(kFrames, 0) + frame->ptr() + y * frame->width + x;
+	const Frame &frame = _setFrames._frames[setObject->index];
+	const uint8 *ptr = _setFrames.getFrameData(setObject->index) + y * frame.width + x;
 	return *ptr != 0;
 }
 
@@ -403,26 +434,25 @@ void DreamBase::loadPalFromIFF() {
 }
 
 void DreamBase::createPanel() {
-	showFrame(engine->icons2(), 0, 8, 0, 2);
-	showFrame(engine->icons2(), 160, 8, 0, 2);
-	showFrame(engine->icons2(), 0, 104, 0, 2);
-	showFrame(engine->icons2(), 160, 104, 0, 2);
+	showFrame(_icons2, 0, 8, 0, 2);
+	showFrame(_icons2, 160, 8, 0, 2);
+	showFrame(_icons2, 0, 104, 0, 2);
+	showFrame(_icons2, 160, 104, 0, 2);
 }
 
 void DreamBase::createPanel2() {
 	createPanel();
-	showFrame(engine->icons2(), 0, 0, 5, 2);
-	showFrame(engine->icons2(), 160, 0, 5, 2);
+	showFrame(_icons2, 0, 0, 5, 2);
+	showFrame(_icons2, 160, 0, 5, 2);
 }
 
 void DreamBase::showPanel() {
-	showFrame(engine->icons1(), 72, 0, 19, 0);
-	showFrame(engine->icons1(), 192, 0, 19, 0);
+	showFrame(_icons1, 72, 0, 19, 0);
+	showFrame(_icons1, 192, 0, 19, 0);
 }
 
 void DreamBase::transferFrame(uint8 from, uint8 to, uint8 offset) {
-	const Frame *freeFrames = (const Frame *)getSegment(data.word(kFreeframes)).ptr(kFrframedata, 0);
-	const Frame &freeFrame = freeFrames[3*from + offset];
+	const Frame &freeFrame = _freeFrames._frames[3*from + offset];
 
 	Frame *exFrames = (Frame *)getSegment(data.word(kExtras)).ptr(kExframedata, 0);
 	Frame &exFrame = exFrames[3*to + offset];
@@ -433,7 +463,7 @@ void DreamBase::transferFrame(uint8 from, uint8 to, uint8 offset) {
 	exFrame.y = freeFrame.y;
 	uint16 byteCount = freeFrame.width * freeFrame.height;
 
-	const uint8 *src = getSegment(data.word(kFreeframes)).ptr(kFrframes + freeFrame.ptr(), byteCount);
+	const uint8 *src = _freeFrames.getFrameData(3*from + offset);
 	uint8 *dst = getSegment(data.word(kExtras)).ptr(kExframes + data.word(kExframepos), byteCount);
 	memcpy(dst, src, byteCount);
 
-- 
cgit v1.2.3


From e54196f37fbf918976f834680671c12bfce58d23 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 21:28:37 +0100
Subject: DREAMWEB: Remove Extras segment

---
 engines/dreamweb/backdrop.cpp |  6 ++--
 engines/dreamweb/dreambase.h  | 11 +++++--
 engines/dreamweb/dreamgen.cpp |  8 ++---
 engines/dreamweb/dreamgen.h   | 71 +++++++++++++++++++++----------------------
 engines/dreamweb/object.cpp   | 64 +++++++++++++++++++-------------------
 engines/dreamweb/saveload.cpp | 18 +++++++++--
 engines/dreamweb/stubs.cpp    | 48 +++++++++++++++--------------
 engines/dreamweb/vgagrafx.cpp |  6 ++--
 8 files changed, 127 insertions(+), 105 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 0dface9acb..e6f5e9ab42 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -259,8 +259,8 @@ void DreamBase::showAllEx() {
 
 	_exList.clear();
 
-	DynObject *objects = (DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, sizeof(DynObject));
-	const Frame *frameBase = (const Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
+	DynObject *objects = _exData;
+	const GraphicsFile &frameBase = _exFrames;
 	for (size_t i = 0; i < count; ++i) {
 		DynObject *object = objects + i;
 		if (object->mapad[0] == 0xff)
@@ -273,7 +273,7 @@ void DreamBase::showAllEx() {
 		uint8 width, height;
 		ObjPos objPos;
 		uint16 currentFrame = 3 * i;
-		calcFrFrame(frameBase[currentFrame], &width, &height, x, y, &objPos);
+		calcFrFrame(frameBase._frames[currentFrame], &width, &height, x, y, &objPos);
 		if ((width != 0) || (height != 0)) {
 			assert(currentFrame < 256);
 			showFrame(frameBase, x + data.word(kMapadx), y + data.word(kMapady), currentFrame, 0);
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 8dd80836e6..d07e74d3f0 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -51,6 +51,7 @@ const unsigned int kLenOfMapStore = 22*8*20*8;
 const unsigned int kMapWidth = 66;
 const unsigned int kMapHeight = 60;
 const unsigned int kLengthOfMap = kMapWidth * kMapHeight;
+const unsigned int kNumExObjects = 114;
 
 /**
  * This class is one of the parent classes of DreamGenContext. Its sole purpose
@@ -146,6 +147,12 @@ protected:
 	GraphicsFile _setFrames;
 	GraphicsFile _freeFrames;
 
+	// Extras segment (NB: this is saved)
+	GraphicsFile _exFrames;
+	DynObject _exData[kNumExObjects];
+	uint16 _exTextdatLE[kNumExObjects+2]; // TODO: Convert into TextFile
+	char _exText[18000];
+
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
 
@@ -845,10 +852,10 @@ public:
 	void setMode();
 	void showPCX(const Common::String &name);
 	void showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 effectsFlag, uint8 width, uint8 height);
-	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
-	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
 	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
 	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
+	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
+	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
 	bool pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y);
 	void loadPalFromIFF();
 	void createPanel();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 4378841d83..401140e4f3 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -65,13 +65,13 @@ void DreamGenContext::__start() {
 		//0x0100: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0110: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0120: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 
+		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0130: .... .... .... ....
-		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, 0xff, 
 		//0x0140: .... .... .... ....
-		0x00, 0xff, };
+		};
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 41b30100ab..673800774a 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -249,42 +249,41 @@ static const uint16 kWongame = 274;
 static const uint16 kLasthardkey = 275;
 static const uint16 kBufferin = 276;
 static const uint16 kBufferout = 278;
-static const uint16 kExtras = 280;
-static const uint16 kWorkspace = 282;
-static const uint16 kMainsprites = 284;
-static const uint16 kBackdrop = 286;
-static const uint16 kRecordspace = 288;
-static const uint16 kFreedat = 290;
-static const uint16 kSetdat = 292;
-static const uint16 kReel1 = 294;
-static const uint16 kReel2 = 296;
-static const uint16 kReel3 = 298;
-static const uint16 kRoomdesc = 300;
-static const uint16 kFreedesc = 302;
-static const uint16 kSetdesc = 304;
-static const uint16 kBlockdesc = 306;
-static const uint16 kSetframes = 308;
-static const uint16 kFreeframes = 310;
-static const uint16 kPeople = 312;
-static const uint16 kReels = 314;
-static const uint16 kBlinkframe = 316;
-static const uint16 kBlinkcount = 317;
-static const uint16 kReasseschanges = 318;
-static const uint16 kPointerspath = 319;
-static const uint16 kManspath = 320;
-static const uint16 kPointerfirstpath = 321;
-static const uint16 kFinaldest = 322;
-static const uint16 kDestination = 323;
-static const uint16 kLinestartx = 324;
-static const uint16 kLinestarty = 326;
-static const uint16 kLineendx = 328;
-static const uint16 kLineendy = 330;
-static const uint16 kLinepointer = 332;
-static const uint16 kLinedirection = 333;
-static const uint16 kLinelength = 334;
-static const uint16 kCh0playing = 335;
-static const uint16 kCh0repeat = 336;
-static const uint16 kCh1playing = 337;
+static const uint16 kWorkspace = 280;
+static const uint16 kMainsprites = 282;
+static const uint16 kBackdrop = 284;
+static const uint16 kRecordspace = 286;
+static const uint16 kFreedat = 288;
+static const uint16 kSetdat = 290;
+static const uint16 kReel1 = 292;
+static const uint16 kReel2 = 294;
+static const uint16 kReel3 = 296;
+static const uint16 kRoomdesc = 298;
+static const uint16 kFreedesc = 300;
+static const uint16 kSetdesc = 302;
+static const uint16 kBlockdesc = 304;
+static const uint16 kSetframes = 306;
+static const uint16 kFreeframes = 308;
+static const uint16 kPeople = 310;
+static const uint16 kReels = 312;
+static const uint16 kBlinkframe = 314;
+static const uint16 kBlinkcount = 315;
+static const uint16 kReasseschanges = 316;
+static const uint16 kPointerspath = 317;
+static const uint16 kManspath = 318;
+static const uint16 kPointerfirstpath = 319;
+static const uint16 kFinaldest = 320;
+static const uint16 kDestination = 321;
+static const uint16 kLinestartx = 322;
+static const uint16 kLinestarty = 324;
+static const uint16 kLineendx = 326;
+static const uint16 kLineendy = 328;
+static const uint16 kLinepointer = 330;
+static const uint16 kLinedirection = 331;
+static const uint16 kLinelength = 332;
+static const uint16 kCh0playing = 333;
+static const uint16 kCh0repeat = 334;
+static const uint16 kCh1playing = 335;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 4f9d091da6..3054a61d68 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -83,12 +83,11 @@ void DreamBase::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 	if (index == 0xff)
 		return;
 
-	if (flag == kExObjectType) {
-		Frame *extras = (Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
-		showFrame(extras, x + 18, y + 19, 3 * index + 1, 128);
-	} else {
+	if (flag == kExObjectType)
+		showFrame(_exFrames, x + 18, y + 19, 3 * index + 1, 128);
+	else
 		showFrame(_freeFrames, x + 18, y + 19, 3 * index + 1, 128);
-	}
+
 	const DynObject *object = (const DynObject *)getAnyAdDir(index, flag);
 	bool worn = isItWorn(object);
 	if (worn)
@@ -99,12 +98,10 @@ void DreamBase::obPicture() {
 	if (data.byte(kObjecttype) == kSetObjectType1)
 		return;
 	uint8 frame = 3 * data.byte(kCommand) + 1;
-	if (data.byte(kObjecttype) == kExObjectType) {
-		const Frame *frames = (const Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
-		showFrame(frames, 160, 68, frame, 0x80);
-	} else {
+	if (data.byte(kObjecttype) == kExObjectType)
+		showFrame(_exFrames, 160, 68, frame, 0x80);
+	else
 		showFrame(_freeFrames, 160, 68, frame, 0x80);
-	}
 }
 
 void DreamBase::obIcons() {
@@ -254,12 +251,12 @@ void DreamBase::inventory() {
 }
 
 void DreamBase::transferText(uint8 from, uint8 to) {
-	getSegment(data.word(kExtras)).word(kExtextdat + 2*to) = data.word(kExtextpos);
+	WRITE_LE_UINT16(&_exTextdatLE[to], data.word(kExtextpos));
 	uint16 freeTextOffset = 2*from;
 	uint16 srcOffset = getSegment(data.word(kFreedesc)).word(kFreetextdat + freeTextOffset);
 
 	const char *src = (const char *)getSegment(data.word(kFreedesc)).ptr(kFreetext + srcOffset, 0);
-	char *dst = (char *)getSegment(data.word(kExtras)).ptr(kExtext + data.word(kExtextpos), 0);
+	char *dst = _exText + data.word(kExtextpos);
 
 	size_t len = strlen(src);
 	memcpy(dst, src, len + 1);
@@ -429,47 +426,47 @@ void DreamBase::setPickup() {
 }
 
 void DreamBase::deleteExFrame(uint8 frameNum) {
-	Frame *frame = (Frame *)getSegment(data.word(kExtras)).ptr(kExframedata + sizeof(Frame)*frameNum, sizeof(Frame));
+	Frame *frame = &_exFrames._frames[frameNum];
 
 	uint16 frameSize = frame->width * frame->height;
 	// Note: the original asm didn't subtract frameSize from remainder
 	uint16 remainder = kExframeslen - frame->ptr() - frameSize;
-	uint16 startOff = kExframes + frame->ptr();
+	uint16 startOff = frame->ptr();
 	uint16 endOff = startOff + frameSize;
 
 	// Shift frame data after this one down
-	memmove(getSegment(data.word(kExtras)).ptr(startOff, remainder), getSegment(data.word(kExtras)).ptr(endOff, remainder), remainder);
+	memmove(&_exFrames._data[startOff], &_exFrames._data[endOff], remainder);
 
 	// Combined frame data is now frameSize smaller
 	data.word(kExframepos) -= frameSize;
 
 	// Adjust all frame pointers pointing into the shifted data
 	for (unsigned int i = 0; i < 3*kNumexobjects; ++i) {
-		frame = (Frame *)getSegment(data.word(kExtras)).ptr(kExframedata + sizeof(Frame)*i, sizeof(Frame));
+		frame = &_exFrames._frames[i];
 		if (frame->ptr() >= startOff)
 			frame->setPtr(frame->ptr() - frameSize);
 	}
 }
 
 void DreamBase::deleteExText(uint8 textNum) {
-	uint16 offset = getSegment(data.word(kExtras)).word(kExtextdat + 2*textNum);
+	uint16 offset = READ_LE_UINT16(&_exTextdatLE[textNum]);
 
-	uint16 startOff = kExtext + offset;
-	uint16 textSize = strlen((char *)getSegment(data.word(kExtras)).ptr(startOff, 0)) + 1;
+	uint16 startOff = offset;
+	uint16 textSize = strlen(&_exText[startOff]) + 1;
 	uint16 endOff = startOff + textSize;
 	uint16 remainder = kExtextlen - offset - textSize;
 
 	// Shift text data after this one down
-	memmove(getSegment(data.word(kExtras)).ptr(startOff, remainder), getSegment(data.word(kExtras)).ptr(endOff, remainder), remainder);
+	memmove(&_exText[startOff], &_exText[endOff], remainder);
 
 	// Combined text data is now frameSize smaller
 	data.word(kExtextpos) -= textSize;
 
 	// Adjust all text pointers pointing into the shifted data
 	for (unsigned int i = 0; i < kNumexobjects; ++i) {
-		uint16 t = getSegment(data.word(kExtras)).word(kExtextdat + 2*i);
+		uint16 t = READ_LE_UINT16(&_exTextdatLE[i]);
 		if (t >= offset + textSize)
-			getSegment(data.word(kExtras)).word(kExtextdat + 2*i) = t - textSize;
+			WRITE_LE_UINT16(&_exTextdatLE[i], t - textSize);
 	}
 }
 
@@ -591,22 +588,26 @@ void DreamBase::purgeALocation(uint8 index) {
 }
 
 const uint8 *DreamBase::getObTextStart() {
-	uint16 textSeg, textDatOff, textOff;
+	const uint8 *textBase;
+	const uint8 *text;
+	uint16 textOff;
 	if (data.byte(kObjecttype) == kFreeObjectType) {
-		textSeg = data.word(kFreedesc);
-		textDatOff = kFreetextdat;
+		uint16 textSeg = data.word(kFreedesc);
+		uint16 textDatOff = kFreetextdat;
 		textOff = kFreetext;
+		textBase = getSegment(textSeg).ptr(textOff, 0);
+		text = textBase + getSegment(textSeg).word(textDatOff + 2*data.byte(kCommand));
 	} else if (data.byte(kObjecttype) == kSetObjectType1) {
-		textSeg = data.word(kSetdesc);
-		textDatOff = kSettextdat;
+		uint16 textSeg = data.word(kSetdesc);
+		uint16 textDatOff = kSettextdat;
 		textOff = kSettext;
+		textBase = getSegment(textSeg).ptr(textOff, 0);
+		text = textBase + getSegment(textSeg).word(textDatOff + 2*data.byte(kCommand));
 	} else {
-		textSeg = data.word(kExtras);
-		textDatOff = kExtextdat;
+		textBase = (const uint8 *)_exText;
 		textOff = kExtext;
+		text = textBase + READ_LE_UINT16(&_exTextdatLE[data.byte(kCommand)]);
 	}
-	const uint8 *textBase = getSegment(textSeg).ptr(textOff, 0);
-	const uint8 *text = textBase + getSegment(textSeg).word(textDatOff + 2*data.byte(kCommand));
 
 	if (data.byte(kObjecttype) != kSetObjectType1)
 		return text;
@@ -635,6 +636,7 @@ const uint8 *DreamBase::getObTextStart() {
 				text++;
 
 				// arbitrary give-up counter
+				// FIXME: Make this more precise to avoid reading out of bounds
 				if (text - (textBase - textOff) >= 8000) {
 					warning("Object description for %d/%d not found", data.byte(kObjecttype), data.byte(kCommand));
 					return obname;
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 843bee77ac..2c659c4c6e 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -476,7 +476,14 @@ void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 	outSaveFile->write((const uint8 *)&header, sizeof(FileHeader));
 	outSaveFile->write(descbuf, len[0]);
 	outSaveFile->write(data.ptr(kStartvars, len[1]), len[1]);
-	outSaveFile->write(getSegment(data.word(kExtras)).ptr(kExframedata, len[2]), len[2]);
+
+	// the Extras segment:
+	outSaveFile->write((const uint8 *)_exFrames._frames, 2080);
+	outSaveFile->write((const uint8 *)_exFrames._data, kExframeslen);
+	outSaveFile->write((const uint8 *)_exData, sizeof(DynObject)*kNumexobjects);
+	outSaveFile->write((const uint8 *)_exTextdatLE, 2*(kNumExObjects+2));
+	outSaveFile->write((const uint8 *)_exText, kExtextlen);
+
 	outSaveFile->write(_listOfChanges, len[3]);
 
 	// len[4] == 48, which is sizeof(Room) plus 16 for 'Roomscango'
@@ -542,7 +549,14 @@ void DreamBase::loadPosition(unsigned int slot) {
 		inSaveFile->read(namebuf, 17);
 	}
 	inSaveFile->read(data.ptr(kStartvars, len[1]), len[1]);
-	inSaveFile->read(getSegment(data.word(kExtras)).ptr(kExframedata, len[2]), len[2]);
+
+	// the Extras segment:
+	inSaveFile->read((uint8 *)_exFrames._frames, 2080);
+	inSaveFile->read((uint8 *)_exFrames._data, kExframeslen);
+	inSaveFile->read((uint8 *)_exData, sizeof(DynObject)*kNumexobjects);
+	inSaveFile->read((uint8 *)_exTextdatLE, 2*(kNumExObjects+2));
+	inSaveFile->read((uint8 *)_exText, kExtextlen);
+
 	inSaveFile->read(_listOfChanges, len[3]);
 
 	// len[4] == 48, which is sizeof(Room) plus 16 for 'Roomscango'
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 9ef7dda581..084aa76da7 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -650,6 +650,10 @@ done: // The engine will need some cleaner finalization, let's put it here for n
 	_tempCharset.clear();
 	_mainSprites.clear();
 
+	_exFrames.clear();
+	_setFrames.clear();
+	_freeFrames.clear();
+
 	_textFile1.clear();
 	_textFile2.clear();
 	_textFile3.clear();
@@ -1226,8 +1230,8 @@ const uint8 *DreamBase::findObName(uint8 type, uint8 index) {
 		uint16 offset = getSegment(data.word(kPeople)).word(kPersontxtdat + i) + kPersontext;
 		return getSegment(data.word(kPeople)).ptr(offset, 0);
 	} else if (type == 4) {
-		uint16 offset = getSegment(data.word(kExtras)).word(kExtextdat + index * 2) + kExtext;
-		return getSegment(data.word(kExtras)).ptr(offset, 0);
+		uint16 offset = READ_LE_UINT16(&_exTextdatLE[index]);
+		return (const uint8 *)_exText + offset;
 	} else if (type == 2) {
 		uint16 offset = getSegment(data.word(kFreedesc)).word(kFreetextdat + index * 2) + kFreetext;
 		return getSegment(data.word(kFreedesc)).ptr(offset, 0);
@@ -1313,7 +1317,7 @@ DynObject *DreamBase::getFreeAd(uint8 index) {
 }
 
 DynObject *DreamBase::getExAd(uint8 index) {
-	return (DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, 0) + index;
+	return &_exData[index];
 }
 
 DynObject *DreamBase::getEitherAdCPP() {
@@ -1374,7 +1378,7 @@ void DreamBase::doChange(uint8 index, uint8 value, uint8 type) {
 }
 
 void DreamBase::deleteTaken() {
-	const DynObject *extraObjects = (const DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, 0);
+	const DynObject *extraObjects = _exData;
 	DynObject *freeObjects = (DynObject *)getSegment(data.word(kFreedat)).ptr(0, 0);
 	for (size_t i = 0; i < kNumexobjects; ++i) {
 		uint8 location = extraObjects[i].initialLocation;
@@ -1386,7 +1390,7 @@ void DreamBase::deleteTaken() {
 }
 
 uint8 DreamBase::getExPos() {
-	DynObject *objects = (DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, sizeof(DynObject));
+	DynObject *objects = _exData;
 	for (size_t i = 0; i < kNumexobjects; ++i) {
 		if (objects[i].mapad[0] == 0xff)
 			return i;
@@ -1565,13 +1569,13 @@ void DreamBase::showPointer() {
 	uint16 y = data.word(kMousey);
 	data.word(kOldpointery) = data.word(kMousey);
 	if (data.byte(kPickup) == 1) {
-		const Frame *frame;
-		if (data.byte(kObjecttype) != kExObjectType) {
-			frame = &_freeFrames._frames[(3 * data.byte(kItemframe) + 1)];
-		} else {
-			const Frame *frames = (const Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
-			frame = frames + (3 * data.byte(kItemframe) + 1);
-		}
+		const GraphicsFile *frames;
+		if (data.byte(kObjecttype) != kExObjectType)
+			frames = &_freeFrames;
+		else
+			frames = &_exFrames;
+		const Frame *frame = &frames->_frames[(3 * data.byte(kItemframe) + 1)];
+
 		uint8 width = frame->width;
 		uint8 height = frame->height;
 		if (width < 12)
@@ -1585,12 +1589,7 @@ void DreamBase::showPointer() {
 		data.word(kOldpointerx) = xMin;
 		data.word(kOldpointery) = yMin;
 		multiGet(_pointerBack, xMin, yMin, width, height);
-		if (data.byte(kObjecttype) != kExObjectType) {
-			showFrame(_freeFrames, x, y, 3 * data.byte(kItemframe) + 1, 128);
-		} else {
-			const Frame *frames = (const Frame *)getSegment(data.word(kExtras)).ptr(0, 0);
-			showFrame(frames, x, y, 3 * data.byte(kItemframe) + 1, 128);
-		}
+		showFrame(*frames, x, y, 3 * data.byte(kItemframe) + 1, 128);
 		showFrame(_icons1, x, y, 3, 128);
 	} else {
 		const Frame *frame = &_icons1._frames[data.byte(kPointerframe) + 20];
@@ -2498,7 +2497,8 @@ void DreamBase::drawFloor() {
 }
 
 void DreamBase::allocateBuffers() {
-	data.word(kExtras) = allocateMem(kLengthofextra/16);
+	_exFrames.clear();
+	_exFrames._data = new uint8[kExframeslen];
 	data.word(kFreedat) = allocateMem(kFreedatlen/16);
 	data.word(kSetdat) = allocateMem(kSetdatlen/16);
 }
@@ -3604,8 +3604,6 @@ void DreamBase::lookAtCard() {
 }
 
 void DreamBase::clearBuffers() {
-	memset(getSegment(data.word(kExtras)).ptr(0, kLengthofextra), 0xFF, kLengthofextra);
-
 	memcpy(_initialVars, data.ptr(kStartvars, kLengthofvars), kLengthofvars);
 
 	clearChanges();
@@ -3621,7 +3619,11 @@ void DreamBase::clearChanges() {
 	data.word(kExframepos) = 0;
 	data.word(kExtextpos) = 0;
 
-	memset(getSegment(data.word(kExtras)).ptr(0, kLengthofextra), 0xFF, kLengthofextra);
+	memset(_exFrames._frames, 0xFF, 2080);
+	memset(_exFrames._data, 0xFF, kExframeslen);
+	memset(_exData, 0xFF, sizeof(DynObject) * kNumexobjects);
+	memset(_exTextdatLE, 0xFF, 2*(kNumexobjects+2));
+	memset(_exText, 0xFF, kExtextlen);
 
 	const uint8 initialRoomsCanGo[] = { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
@@ -3710,7 +3712,7 @@ void DreamBase::emergencyPurge() {
 }
 
 void DreamBase::purgeAnItem() {
-	const DynObject *extraObjects = (const DynObject *)getSegment(data.word(kExtras)).ptr(kExdata, 0);
+	const DynObject *extraObjects = _exData;
 
 	for (size_t i = 0; i < kNumexobjects; ++i) {
 		if (extraObjects[i].mapad[0] && extraObjects[i].id[0] == 255 &&
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 19abc2b35d..417ccceab3 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -453,9 +453,7 @@ void DreamBase::showPanel() {
 
 void DreamBase::transferFrame(uint8 from, uint8 to, uint8 offset) {
 	const Frame &freeFrame = _freeFrames._frames[3*from + offset];
-
-	Frame *exFrames = (Frame *)getSegment(data.word(kExtras)).ptr(kExframedata, 0);
-	Frame &exFrame = exFrames[3*to + offset];
+	Frame &exFrame = _exFrames._frames[3*to + offset];
 
 	exFrame.width = freeFrame.width;
 	exFrame.height = freeFrame.height;
@@ -464,7 +462,7 @@ void DreamBase::transferFrame(uint8 from, uint8 to, uint8 offset) {
 	uint16 byteCount = freeFrame.width * freeFrame.height;
 
 	const uint8 *src = _freeFrames.getFrameData(3*from + offset);
-	uint8 *dst = getSegment(data.word(kExtras)).ptr(kExframes + data.word(kExframepos), byteCount);
+	uint8 *dst = _exFrames._data + data.word(kExframepos);
 	memcpy(dst, src, byteCount);
 
 	exFrame.setPtr(data.word(kExframepos));
-- 
cgit v1.2.3


From f729742f87648d6a5ebc1468e26e90ac1de1c2e0 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 21:42:38 +0100
Subject: DREAMWEB: Convert exText into TextFile

---
 engines/dreamweb/dreambase.h  |  3 +--
 engines/dreamweb/dreamweb.cpp |  2 +-
 engines/dreamweb/object.cpp   | 18 +++++++++---------
 engines/dreamweb/saveload.cpp |  8 ++++----
 engines/dreamweb/structs.h    | 22 ++++++++++++++++++----
 engines/dreamweb/stubs.cpp    | 12 ++++++++----
 6 files changed, 41 insertions(+), 24 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index d07e74d3f0..88dc96ece2 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -150,8 +150,7 @@ protected:
 	// Extras segment (NB: this is saved)
 	GraphicsFile _exFrames;
 	DynObject _exData[kNumExObjects];
-	uint16 _exTextdatLE[kNumExObjects+2]; // TODO: Convert into TextFile
-	char _exText[18000];
+	TextFile _exText;
 
 public:
 	DreamBase(DreamWeb::DreamWebEngine *en);
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index b31a85149a..1019abaf31 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -407,7 +407,7 @@ uint8 DreamWebEngine::modifyChar(uint8 c) const {
 namespace DreamGen {
 
 // FIXME/TODO: Move this to a better place.
-DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) : engine(en) {
+DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) : engine(en), _exText(kNumExObjects+2) {
 	_openChangeSize = kInventx+(4*kItempicsize);
 	_quitRequested = false;
 
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 3054a61d68..c78ec71561 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -251,12 +251,12 @@ void DreamBase::inventory() {
 }
 
 void DreamBase::transferText(uint8 from, uint8 to) {
-	WRITE_LE_UINT16(&_exTextdatLE[to], data.word(kExtextpos));
+	_exText.setOffset(to, data.word(kExtextpos));
 	uint16 freeTextOffset = 2*from;
 	uint16 srcOffset = getSegment(data.word(kFreedesc)).word(kFreetextdat + freeTextOffset);
 
 	const char *src = (const char *)getSegment(data.word(kFreedesc)).ptr(kFreetext + srcOffset, 0);
-	char *dst = _exText + data.word(kExtextpos);
+	char *dst = _exText._text + data.word(kExtextpos);
 
 	size_t len = strlen(src);
 	memcpy(dst, src, len + 1);
@@ -449,24 +449,24 @@ void DreamBase::deleteExFrame(uint8 frameNum) {
 }
 
 void DreamBase::deleteExText(uint8 textNum) {
-	uint16 offset = READ_LE_UINT16(&_exTextdatLE[textNum]);
+	uint16 offset = _exText.getOffset(textNum);
 
 	uint16 startOff = offset;
-	uint16 textSize = strlen(&_exText[startOff]) + 1;
+	uint16 textSize = strlen(_exText.getString(textNum)) + 1;
 	uint16 endOff = startOff + textSize;
 	uint16 remainder = kExtextlen - offset - textSize;
 
 	// Shift text data after this one down
-	memmove(&_exText[startOff], &_exText[endOff], remainder);
+	memmove(&_exText._text[startOff], &_exText._text[endOff], remainder);
 
 	// Combined text data is now frameSize smaller
 	data.word(kExtextpos) -= textSize;
 
 	// Adjust all text pointers pointing into the shifted data
 	for (unsigned int i = 0; i < kNumexobjects; ++i) {
-		uint16 t = READ_LE_UINT16(&_exTextdatLE[i]);
+		uint16 t = _exText.getOffset(i);
 		if (t >= offset + textSize)
-			WRITE_LE_UINT16(&_exTextdatLE[i], t - textSize);
+			_exText.setOffset(i, t - textSize);
 	}
 }
 
@@ -604,9 +604,9 @@ const uint8 *DreamBase::getObTextStart() {
 		textBase = getSegment(textSeg).ptr(textOff, 0);
 		text = textBase + getSegment(textSeg).word(textDatOff + 2*data.byte(kCommand));
 	} else {
-		textBase = (const uint8 *)_exText;
+		textBase = (const uint8 *)_exText._text;
 		textOff = kExtext;
-		text = textBase + READ_LE_UINT16(&_exTextdatLE[data.byte(kCommand)]);
+		text = (const uint8 *)_exText.getString(data.byte(kCommand));
 	}
 
 	if (data.byte(kObjecttype) != kSetObjectType1)
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 2c659c4c6e..e2af04df75 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -481,8 +481,8 @@ void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 	outSaveFile->write((const uint8 *)_exFrames._frames, 2080);
 	outSaveFile->write((const uint8 *)_exFrames._data, kExframeslen);
 	outSaveFile->write((const uint8 *)_exData, sizeof(DynObject)*kNumexobjects);
-	outSaveFile->write((const uint8 *)_exTextdatLE, 2*(kNumExObjects+2));
-	outSaveFile->write((const uint8 *)_exText, kExtextlen);
+	outSaveFile->write((const uint8 *)_exText._offsetsLE, 2*(kNumExObjects+2));
+	outSaveFile->write((const uint8 *)_exText._text, kExtextlen);
 
 	outSaveFile->write(_listOfChanges, len[3]);
 
@@ -554,8 +554,8 @@ void DreamBase::loadPosition(unsigned int slot) {
 	inSaveFile->read((uint8 *)_exFrames._frames, 2080);
 	inSaveFile->read((uint8 *)_exFrames._data, kExframeslen);
 	inSaveFile->read((uint8 *)_exData, sizeof(DynObject)*kNumexobjects);
-	inSaveFile->read((uint8 *)_exTextdatLE, 2*(kNumExObjects+2));
-	inSaveFile->read((uint8 *)_exText, kExtextlen);
+	inSaveFile->read((uint8 *)_exText._offsetsLE, 2*(kNumExObjects+2));
+	inSaveFile->read((uint8 *)_exText._text, kExtextlen);
 
 	inSaveFile->read(_listOfChanges, len[3]);
 
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index cf3e2ceb9f..0b7a81b6eb 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -295,14 +295,28 @@ struct MapFlag {
 };
 
 struct TextFile {
-	TextFile() : _text(0) { }
+	TextFile(unsigned int size = 66) : _size(size), _text(0) { _offsetsLE = new uint16[_size]; }
 
-	uint16 _offsetsLE[66];
+	~TextFile() {
+		delete[] _offsetsLE;
+		_offsetsLE = 0;
+		_size = 0;
+		clear();
+	}
+
+	uint16 *_offsetsLE;
+	unsigned int _size;
 	char *_text;
 
 	const char *getString(unsigned int i) const {
-		assert(i < 66);
-		return _text + READ_LE_UINT16(&_offsetsLE[i]);
+		assert(i < _size);
+		return _text + getOffset(i);
+	}
+	void setOffset(unsigned int i, uint16 offset) {
+		WRITE_LE_UINT16(&_offsetsLE[i], offset);
+	}
+	uint16 getOffset(unsigned int i) const {
+		return READ_LE_UINT16(&_offsetsLE[i]);
 	}
 	void clear() {
 		delete[] _text;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 084aa76da7..818e1a537b 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1230,8 +1230,7 @@ const uint8 *DreamBase::findObName(uint8 type, uint8 index) {
 		uint16 offset = getSegment(data.word(kPeople)).word(kPersontxtdat + i) + kPersontext;
 		return getSegment(data.word(kPeople)).ptr(offset, 0);
 	} else if (type == 4) {
-		uint16 offset = READ_LE_UINT16(&_exTextdatLE[index]);
-		return (const uint8 *)_exText + offset;
+		return (const uint8 *)_exText.getString(index);
 	} else if (type == 2) {
 		uint16 offset = getSegment(data.word(kFreedesc)).word(kFreetextdat + index * 2) + kFreetext;
 		return getSegment(data.word(kFreedesc)).ptr(offset, 0);
@@ -2223,6 +2222,7 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	data.word(kReel3) = allocateAndLoad(len[6]);
 	data.word(kReels) = allocateAndLoad(len[7]);
 	data.word(kPeople) = allocateAndLoad(len[8]);
+	// TODO: kSetdesc, kBlockdesc, kRoomdesc are also TextFiles?
 	data.word(kSetdesc) = allocateAndLoad(len[9]);
 	data.word(kBlockdesc) = allocateAndLoad(len[10]);
 	data.word(kRoomdesc) = allocateAndLoad(len[11]);
@@ -2238,6 +2238,7 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 		clearAndLoad(data.word(kFreedat), 255, len[13], kFreedatlen);
 	else
 		engine->skipBytes(len[13]);
+	// TODO: kFreedesc is also a TextFile?
 	data.word(kFreedesc) = allocateAndLoad(len[14]);
 
 	engine->closeFile();
@@ -2499,6 +2500,9 @@ void DreamBase::drawFloor() {
 void DreamBase::allocateBuffers() {
 	_exFrames.clear();
 	_exFrames._data = new uint8[kExframeslen];
+	_exText.clear();
+	_exText._text = new char[kExtextlen];
+
 	data.word(kFreedat) = allocateMem(kFreedatlen/16);
 	data.word(kSetdat) = allocateMem(kSetdatlen/16);
 }
@@ -3622,8 +3626,8 @@ void DreamBase::clearChanges() {
 	memset(_exFrames._frames, 0xFF, 2080);
 	memset(_exFrames._data, 0xFF, kExframeslen);
 	memset(_exData, 0xFF, sizeof(DynObject) * kNumexobjects);
-	memset(_exTextdatLE, 0xFF, 2*(kNumexobjects+2));
-	memset(_exText, 0xFF, kExtextlen);
+	memset(_exText._offsetsLE, 0xFF, 2*(kNumexobjects+2));
+	memset(_exText._text, 0xFF, kExtextlen);
 
 	const uint8 initialRoomsCanGo[] = { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-- 
cgit v1.2.3


From a7cdc342b36bce68e5cdabf6a682e38ea1b21e7b Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 22:00:27 +0100
Subject: DREAMWEB: Convert reel segments into GraphicsFiles

---
 engines/dreamweb/dreambase.h  |  7 +++++-
 engines/dreamweb/dreamgen.cpp |  6 ++---
 engines/dreamweb/dreamgen.h   | 53 ++++++++++++++++++---------------------
 engines/dreamweb/sprite.cpp   | 32 ++++++++++--------------
 engines/dreamweb/stubs.cpp    | 58 ++++++++++++++++++++++++-------------------
 engines/dreamweb/talk.cpp     |  4 +--
 6 files changed, 80 insertions(+), 80 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 88dc96ece2..1b48e07fb4 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -146,6 +146,9 @@ protected:
 	// room graphics files
 	GraphicsFile _setFrames;
 	GraphicsFile _freeFrames;
+	GraphicsFile _reel1;
+	GraphicsFile _reel2;
+	GraphicsFile _reel3;
 
 	// Extras segment (NB: this is saved)
 	GraphicsFile _exFrames;
@@ -439,7 +442,7 @@ public:
 	void liftSprite(Sprite *sprite, SetObject *objData);
 
 	Reel *getReelStart(uint16 reelPointer);
-	const Frame *findSource(uint16 &frame);
+	const GraphicsFile *findSource(uint16 &frame);
 	void showReelFrame(Reel *reel);
 	void showGameReel(ReelRoutine *routine);
 	const Frame *getReelFrameAX(uint16 frame);
@@ -511,6 +514,8 @@ public:
 	uint16 allocateAndLoad(unsigned int size);
 	void loadTextFile(TextFile &file, const char *fileName);
 	void loadGraphicsFile(GraphicsFile &file, const char *fileName);
+	void loadGraphicsSegment(GraphicsFile &file, unsigned int len);
+	void loadTextSegment(TextFile &file, unsigned int len);
 	uint16 standardLoad(const char *fileName, uint16 *outSizeInBytes = NULL); // Returns a segment handle which needs to be freed with deallocatemem for symmetry
 	void *standardLoadCPP(const char *fileName, uint16 *outSizeInBytes = NULL); // And this one should be 'free'd
 	void loadIntoTemp(const char *fileName);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 401140e4f3..4f2524ace6 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -67,11 +67,9 @@ void DreamGenContext::__start() {
 		//0x0110: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
 		//0x0120: .... .... .... ....
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0130: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
-		//0x0140: .... .... .... ....
-		};
+		0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 673800774a..75fef09741 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -255,35 +255,30 @@ static const uint16 kBackdrop = 284;
 static const uint16 kRecordspace = 286;
 static const uint16 kFreedat = 288;
 static const uint16 kSetdat = 290;
-static const uint16 kReel1 = 292;
-static const uint16 kReel2 = 294;
-static const uint16 kReel3 = 296;
-static const uint16 kRoomdesc = 298;
-static const uint16 kFreedesc = 300;
-static const uint16 kSetdesc = 302;
-static const uint16 kBlockdesc = 304;
-static const uint16 kSetframes = 306;
-static const uint16 kFreeframes = 308;
-static const uint16 kPeople = 310;
-static const uint16 kReels = 312;
-static const uint16 kBlinkframe = 314;
-static const uint16 kBlinkcount = 315;
-static const uint16 kReasseschanges = 316;
-static const uint16 kPointerspath = 317;
-static const uint16 kManspath = 318;
-static const uint16 kPointerfirstpath = 319;
-static const uint16 kFinaldest = 320;
-static const uint16 kDestination = 321;
-static const uint16 kLinestartx = 322;
-static const uint16 kLinestarty = 324;
-static const uint16 kLineendx = 326;
-static const uint16 kLineendy = 328;
-static const uint16 kLinepointer = 330;
-static const uint16 kLinedirection = 331;
-static const uint16 kLinelength = 332;
-static const uint16 kCh0playing = 333;
-static const uint16 kCh0repeat = 334;
-static const uint16 kCh1playing = 335;
+static const uint16 kRoomdesc = 292;
+static const uint16 kFreedesc = 294;
+static const uint16 kSetdesc = 296;
+static const uint16 kBlockdesc = 298;
+static const uint16 kPeople = 300;
+static const uint16 kReels = 302;
+static const uint16 kBlinkframe = 304;
+static const uint16 kBlinkcount = 305;
+static const uint16 kReasseschanges = 306;
+static const uint16 kPointerspath = 307;
+static const uint16 kManspath = 308;
+static const uint16 kPointerfirstpath = 309;
+static const uint16 kFinaldest = 310;
+static const uint16 kDestination = 311;
+static const uint16 kLinestartx = 312;
+static const uint16 kLinestarty = 314;
+static const uint16 kLineendx = 316;
+static const uint16 kLineendy = 318;
+static const uint16 kLinepointer = 320;
+static const uint16 kLinedirection = 321;
+static const uint16 kLinelength = 322;
+static const uint16 kCh0playing = 323;
+static const uint16 kCh0repeat = 324;
+static const uint16 kCh1playing = 325;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 31f7408a1c..4071c56f64 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -435,26 +435,24 @@ Reel *DreamBase::getReelStart(uint16 reelPointer) {
 
 // Locate the reel segment (reel1, reel2, reel3) this frame is stored in,
 // and adjust the frame number relative to this segment.
-const Frame *DreamBase::findSource(uint16 &frame) {
-	uint16 base;
+const GraphicsFile *DreamBase::findSource(uint16 &frame) {
 	if (frame < 160) {
-		base = data.word(kReel1);
+		return &_reel1;
 	} else if (frame < 320) {
 		frame -= 160;
-		base = data.word(kReel2);
+		return &_reel2;
 	} else {
 		frame -= 320;
-		base = data.word(kReel3);
+		return &_reel3;
 	}
-	return (const Frame *)getSegment(base).ptr(0, (frame+1)*sizeof(Frame));
 }
 
 void DreamBase::showReelFrame(Reel *reel) {
 	uint16 x = reel->x + data.word(kMapadx);
 	uint16 y = reel->y + data.word(kMapady);
 	uint16 frame = reel->frame();
-	const Frame *base = findSource(frame);
-	showFrame(base, x, y, frame, 8);
+	const GraphicsFile *base = findSource(frame);
+	showFrame(*base, x, y, frame, 8);
 }
 
 void DreamBase::showGameReel(ReelRoutine *routine) {
@@ -466,8 +464,8 @@ void DreamBase::showGameReel(ReelRoutine *routine) {
 }
 
 const Frame *DreamBase::getReelFrameAX(uint16 frame) {
-	const Frame *base = findSource(frame);
-	return base + frame;
+	const GraphicsFile *base = findSource(frame);
+	return &base->_frames[frame];
 }
 
 void DreamBase::showRain() {
@@ -1115,18 +1113,14 @@ void DreamBase::clearBeforeLoad() {
 }
 
 void DreamBase::clearReels() {
-	deallocateMem(data.word(kReel1));
-	deallocateMem(data.word(kReel2));
-	deallocateMem(data.word(kReel3));
+	_reel1.clear();
+	_reel2.clear();
+	_reel3.clear();
 }
 
 void DreamBase::getRidOfReels() {
-	if (data.byte(kRoomloaded) == 0)
-		return /* (dontgetrid) */;
-
-	deallocateMem(data.word(kReel1));
-	deallocateMem(data.word(kReel2));
-	deallocateMem(data.word(kReel3));
+	if (data.byte(kRoomloaded))
+		clearReels();
 }
 
 void DreamBase::liftNoise(uint8 index) {
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 818e1a537b..e9f1ea4f51 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -651,8 +651,13 @@ done: // The engine will need some cleaner finalization, let's put it here for n
 	_mainSprites.clear();
 
 	_exFrames.clear();
+	_exText.clear();
+
 	_setFrames.clear();
 	_freeFrames.clear();
+	_reel1.clear();
+	_reel2.clear();
+	_reel3.clear();
 
 	_textFile1.clear();
 	_textFile2.clear();
@@ -809,6 +814,23 @@ void DreamBase::loadGraphicsFile(GraphicsFile &file, const char *fileName) {
 	f.read(file._data, sizeInBytes - 2080);
 }
 
+void DreamBase::loadGraphicsSegment(GraphicsFile &file, unsigned int len) {
+	assert(len >= 2080);
+	delete[] file._data;
+	file._data = new uint8[len - 2080];
+	engine->readFromFile((uint8 *)file._frames, 2080);
+	engine->readFromFile(file._data, len - 2080);
+}
+
+void DreamBase::loadTextSegment(TextFile &file, unsigned int len) {
+	unsigned int headerSize = 2 * file._size;
+	assert(len >= headerSize);
+	delete[] file._text;
+	file._text = new char[len - headerSize];
+	engine->readFromFile((uint8 *)file._offsetsLE, headerSize);
+	engine->readFromFile((uint8 *)file._text, len - headerSize);
+}
+
 void DreamBase::loadIntoTemp(const char *fileName) {
 	loadGraphicsFile(_tempGraphics, fileName);
 }
@@ -2170,9 +2192,9 @@ void DreamBase::getRidOfAll() {
 	_backdropBlocks = 0;
 
 	_setFrames.clear();
-	deallocateMem(data.word(kReel1));
-	deallocateMem(data.word(kReel2));
-	deallocateMem(data.word(kReel3));
+	_reel1.clear();
+	_reel2.clear();
+	_reel3.clear();
 	deallocateMem(data.word(kReels));
 	deallocateMem(data.word(kPeople));
 	deallocateMem(data.word(kSetdesc));
@@ -2202,13 +2224,7 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	clearAndLoad(workspace(), 0, len[1], 132*66); // 132*66 = maplen
 	sortOutMap();
 
-	// TODO: Create function for loading a GraphicsFile from a file segment
-	_setFrames.clear();
-	assert(len[2] >= 2080);
-	engine->readFromFile((uint8 *)_setFrames._frames, 2080);
-	_setFrames._data = new uint8[len[2] - 2080];
-	engine->readFromFile(_setFrames._data, len[2] - 2080);
-
+	loadGraphicsSegment(_setFrames, len[2]);
 	if (!skipDat)
 		clearAndLoad(data.word(kSetdat), 255, len[3], kSetdatlen);
 	else
@@ -2216,24 +2232,16 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	// NB: The skipDat version of this function as called by restoreall
 	// had a 'call bloc' instead of 'call loadseg' for reel1,
 	// but 'bloc' was not defined.
-	// TODO: kReel1/2/3 are also GraphicsFiles?
-	data.word(kReel1) = allocateAndLoad(len[4]);
-	data.word(kReel2) = allocateAndLoad(len[5]);
-	data.word(kReel3) = allocateAndLoad(len[6]);
+	loadGraphicsSegment(_reel1, len[4]);
+	loadGraphicsSegment(_reel2, len[5]);
+	loadGraphicsSegment(_reel3, len[6]);
 	data.word(kReels) = allocateAndLoad(len[7]);
 	data.word(kPeople) = allocateAndLoad(len[8]);
 	// TODO: kSetdesc, kBlockdesc, kRoomdesc are also TextFiles?
 	data.word(kSetdesc) = allocateAndLoad(len[9]);
 	data.word(kBlockdesc) = allocateAndLoad(len[10]);
 	data.word(kRoomdesc) = allocateAndLoad(len[11]);
-
-	// TODO: Create function for loading a GraphicsFile from a file segment
-	_freeFrames.clear();
-	assert(len[12] >= 2080);
-	engine->readFromFile((uint8 *)_freeFrames._frames, 2080);
-	_freeFrames._data = new uint8[len[12] - 2080];
-	engine->readFromFile(_freeFrames._data, len[12] - 2080);
-
+	loadGraphicsSegment(_freeFrames, len[12]);
 	if (!skipDat)
 		clearAndLoad(data.word(kFreedat), 255, len[13], kFreedatlen);
 	else
@@ -2270,9 +2278,9 @@ void DreamBase::restoreReels() {
 	engine->skipBytes(len[1]);
 	engine->skipBytes(len[2]);
 	engine->skipBytes(len[3]);
-	data.word(kReel1) = allocateAndLoad(len[4]);
-	data.word(kReel2) = allocateAndLoad(len[5]);
-	data.word(kReel3) = allocateAndLoad(len[6]);
+	loadGraphicsSegment(_reel1, len[4]);
+	loadGraphicsSegment(_reel2, len[5]);
+	loadGraphicsSegment(_reel3, len[6]);
 
 	engine->closeFile();
 }
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 74357f395f..172a61fad1 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -76,8 +76,8 @@ void DreamBase::talk() {
 void DreamBase::convIcons() {
 	uint8 index = data.byte(kCharacter) & 127;
 	uint16 frame = getPersFrame(index);
-	const Frame *base = findSource(frame);
-	showFrame(base, 234, 2, frame, 0);
+	const GraphicsFile *base = findSource(frame);
+	showFrame(*base, 234, 2, frame, 0);
 }
 
 uint16 DreamBase::getPersFrame(uint8 index) {
-- 
cgit v1.2.3


From d9aed2e00bbb2dc54eb741affc1d978068175c04 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 22:21:43 +0100
Subject: DREAMWEB: Convert room text into TextFiles

---
 engines/dreamweb/dreambase.h  | 10 ++++--
 engines/dreamweb/dreamgen.cpp |  6 ++--
 engines/dreamweb/dreamgen.h   | 43 ++++++++++-------------
 engines/dreamweb/dreamweb.cpp |  5 ++-
 engines/dreamweb/object.cpp   | 17 +++------
 engines/dreamweb/sprite.cpp   | 10 +++---
 engines/dreamweb/stubs.cpp    | 81 +++++++++++++++----------------------------
 engines/dreamweb/talk.cpp     |  5 ++-
 8 files changed, 72 insertions(+), 105 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 1b48e07fb4..c62d202890 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -143,12 +143,18 @@ protected:
 	GraphicsFile _mainSprites;
 	const GraphicsFile *_currentCharset;
 
-	// room graphics files
+	// room files
 	GraphicsFile _setFrames;
 	GraphicsFile _freeFrames;
 	GraphicsFile _reel1;
 	GraphicsFile _reel2;
 	GraphicsFile _reel3;
+	TextFile _setDesc;
+	TextFile _blockDesc;
+	TextFile _roomDesc;
+	TextFile _freeDesc;
+	TextFile _personText;
+	uint16 _personFramesLE[12];
 
 	// Extras segment (NB: this is saved)
 	GraphicsFile _exFrames;
@@ -516,8 +522,6 @@ public:
 	void loadGraphicsFile(GraphicsFile &file, const char *fileName);
 	void loadGraphicsSegment(GraphicsFile &file, unsigned int len);
 	void loadTextSegment(TextFile &file, unsigned int len);
-	uint16 standardLoad(const char *fileName, uint16 *outSizeInBytes = NULL); // Returns a segment handle which needs to be freed with deallocatemem for symmetry
-	void *standardLoadCPP(const char *fileName, uint16 *outSizeInBytes = NULL); // And this one should be 'free'd
 	void loadIntoTemp(const char *fileName);
 	void loadIntoTemp2(const char *fileName);
 	void loadIntoTemp3(const char *fileName);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 4f2524ace6..de85b4c54e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -65,11 +65,9 @@ void DreamGenContext::__start() {
 		//0x0100: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0110: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+		0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0120: .... .... .... ....
-		0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0130: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 75fef09741..bbedcbcbb9 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -255,30 +255,25 @@ static const uint16 kBackdrop = 284;
 static const uint16 kRecordspace = 286;
 static const uint16 kFreedat = 288;
 static const uint16 kSetdat = 290;
-static const uint16 kRoomdesc = 292;
-static const uint16 kFreedesc = 294;
-static const uint16 kSetdesc = 296;
-static const uint16 kBlockdesc = 298;
-static const uint16 kPeople = 300;
-static const uint16 kReels = 302;
-static const uint16 kBlinkframe = 304;
-static const uint16 kBlinkcount = 305;
-static const uint16 kReasseschanges = 306;
-static const uint16 kPointerspath = 307;
-static const uint16 kManspath = 308;
-static const uint16 kPointerfirstpath = 309;
-static const uint16 kFinaldest = 310;
-static const uint16 kDestination = 311;
-static const uint16 kLinestartx = 312;
-static const uint16 kLinestarty = 314;
-static const uint16 kLineendx = 316;
-static const uint16 kLineendy = 318;
-static const uint16 kLinepointer = 320;
-static const uint16 kLinedirection = 321;
-static const uint16 kLinelength = 322;
-static const uint16 kCh0playing = 323;
-static const uint16 kCh0repeat = 324;
-static const uint16 kCh1playing = 325;
+static const uint16 kReels = 292;
+static const uint16 kBlinkframe = 294;
+static const uint16 kBlinkcount = 295;
+static const uint16 kReasseschanges = 296;
+static const uint16 kPointerspath = 297;
+static const uint16 kManspath = 298;
+static const uint16 kPointerfirstpath = 299;
+static const uint16 kFinaldest = 300;
+static const uint16 kDestination = 301;
+static const uint16 kLinestartx = 302;
+static const uint16 kLinestarty = 304;
+static const uint16 kLineendx = 306;
+static const uint16 kLineendy = 308;
+static const uint16 kLinepointer = 310;
+static const uint16 kLinedirection = 311;
+static const uint16 kLinelength = 312;
+static const uint16 kCh0playing = 313;
+static const uint16 kCh0repeat = 314;
+static const uint16 kCh1playing = 315;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 1019abaf31..539433dbb9 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -407,7 +407,10 @@ uint8 DreamWebEngine::modifyChar(uint8 c) const {
 namespace DreamGen {
 
 // FIXME/TODO: Move this to a better place.
-DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) : engine(en), _exText(kNumExObjects+2) {
+DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) :
+		engine(en), _exText(kNumExObjects+2),
+		_setDesc(130), _blockDesc(98), _roomDesc(38), _freeDesc(82), _personText(1026) {
+
 	_openChangeSize = kInventx+(4*kItempicsize);
 	_quitRequested = false;
 
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index c78ec71561..6e5ae8a813 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -252,10 +252,7 @@ void DreamBase::inventory() {
 
 void DreamBase::transferText(uint8 from, uint8 to) {
 	_exText.setOffset(to, data.word(kExtextpos));
-	uint16 freeTextOffset = 2*from;
-	uint16 srcOffset = getSegment(data.word(kFreedesc)).word(kFreetextdat + freeTextOffset);
-
-	const char *src = (const char *)getSegment(data.word(kFreedesc)).ptr(kFreetext + srcOffset, 0);
+	const char *src = _freeDesc.getString(from);
 	char *dst = _exText._text + data.word(kExtextpos);
 
 	size_t len = strlen(src);
@@ -592,17 +589,13 @@ const uint8 *DreamBase::getObTextStart() {
 	const uint8 *text;
 	uint16 textOff;
 	if (data.byte(kObjecttype) == kFreeObjectType) {
-		uint16 textSeg = data.word(kFreedesc);
-		uint16 textDatOff = kFreetextdat;
+		textBase = (const uint8 *)_freeDesc._text;
 		textOff = kFreetext;
-		textBase = getSegment(textSeg).ptr(textOff, 0);
-		text = textBase + getSegment(textSeg).word(textDatOff + 2*data.byte(kCommand));
+		text = (const uint8 *)_freeDesc.getString(data.byte(kCommand));
 	} else if (data.byte(kObjecttype) == kSetObjectType1) {
-		uint16 textSeg = data.word(kSetdesc);
-		uint16 textDatOff = kSettextdat;
+		textBase = (const uint8 *)_setDesc._text;
 		textOff = kSettext;
-		textBase = getSegment(textSeg).ptr(textOff, 0);
-		text = textBase + getSegment(textSeg).word(textDatOff + 2*data.byte(kCommand));
+		text = (const uint8 *)_setDesc.getString(data.byte(kCommand));
 	} else {
 		textBase = (const uint8 *)_exText._text;
 		textOff = kExtext;
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 4071c56f64..424d8d52b2 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -1102,12 +1102,12 @@ void DreamBase::clearBeforeLoad() {
 	_backdropBlocks = 0;
 	_setFrames.clear();
 	deallocateMem(data.word(kReels));
-	deallocateMem(data.word(kPeople));
-	deallocateMem(data.word(kSetdesc));
-	deallocateMem(data.word(kBlockdesc));
-	deallocateMem(data.word(kRoomdesc));
+	_personText.clear();
+	_setDesc.clear();
+	_blockDesc.clear();
+	_roomDesc.clear();
 	_freeFrames.clear();
-	deallocateMem(data.word(kFreedesc));
+	_freeDesc.clear();
 
 	data.byte(kRoomloaded) = 0;
 }
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index e9f1ea4f51..994111df04 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -658,6 +658,11 @@ done: // The engine will need some cleaner finalization, let's put it here for n
 	_reel1.clear();
 	_reel2.clear();
 	_reel3.clear();
+	_setDesc.clear();
+	_blockDesc.clear();
+	_roomDesc.clear();
+	_freeDesc.clear();
+	_personText.clear();
 
 	_textFile1.clear();
 	_textFile2.clear();
@@ -773,31 +778,6 @@ void DreamBase::switchRyanOff() {
 	data.byte(kRyanon) = 1;
 }
 
-uint16 DreamBase::standardLoad(const char *fileName, uint16 *outSizeInBytes) {
-	FileHeader header;
-
-	Common::File file;
-	file.open(fileName);
-	file.read((uint8 *)&header, sizeof(FileHeader));
-	uint16 sizeInBytes = header.len(0);
-	if (outSizeInBytes)
-		*outSizeInBytes = sizeInBytes;
-	uint16 result = allocateMem((sizeInBytes + 15) / 16);
-	file.read(getSegment(result).ptr(0, 0), sizeInBytes);
-	return result;
-}
-
-void *DreamBase::standardLoadCPP(const char *fileName, uint16 *outSizeInBytes) {
-	uint16 sizeInBytes;
-	uint16 seg = standardLoad(fileName, &sizeInBytes);
-	void *buffer = malloc(sizeInBytes);
-	memcpy(buffer, getSegment(seg).ptr(0, 0), sizeInBytes);
-	deallocateMem(seg);
-	if (outSizeInBytes)
-		*outSizeInBytes = sizeInBytes;
-	return buffer;
-}
-
 void DreamBase::loadGraphicsFile(GraphicsFile &file, const char *fileName) {
 	FileHeader header;
 
@@ -1248,20 +1228,16 @@ bool DreamBase::checkIfEx(uint8 x, uint8 y) {
 
 const uint8 *DreamBase::findObName(uint8 type, uint8 index) {
 	if (type == 5) {
-		uint16 i = 64 * 2 * (index & 127);
-		uint16 offset = getSegment(data.word(kPeople)).word(kPersontxtdat + i) + kPersontext;
-		return getSegment(data.word(kPeople)).ptr(offset, 0);
+		uint16 i = 64 * (index & 127);
+		return (const uint8 *)_personText.getString(i);
 	} else if (type == 4) {
 		return (const uint8 *)_exText.getString(index);
 	} else if (type == 2) {
-		uint16 offset = getSegment(data.word(kFreedesc)).word(kFreetextdat + index * 2) + kFreetext;
-		return getSegment(data.word(kFreedesc)).ptr(offset, 0);
+		return (const uint8 *)_freeDesc.getString(index);
 	} else if (type == 1) {
-		uint16 offset = getSegment(data.word(kSetdesc)).word(kSettextdat + index * 2) + kSettext;
-		return getSegment(data.word(kSetdesc)).ptr(offset, 0);
+		return (const uint8 *)_setDesc.getString(index);
 	} else {
-		uint16 offset = getSegment(data.word(kBlockdesc)).word(kBlocktextdat + index * 2) + kBlocktext;
-		return getSegment(data.word(kBlockdesc)).ptr(offset, 0);
+		return (const uint8 *)_blockDesc.getString(index);
 	}
 }
 
@@ -1736,9 +1712,8 @@ bool DreamBase::isRyanHolding(const char *id) {
 }
 
 bool DreamBase::isItDescribed(const ObjPos *pos) {
-	uint16 offset = getSegment(data.word(kSetdesc)).word(kSettextdat + pos->index * 2);
-	uint8 result = getSegment(data.word(kSetdesc)).byte(kSettext + offset);
-	return result != 0;
+	const char *string = _setDesc.getString(pos->index);
+	return string[0] != 0;
 }
 
 bool DreamBase::isCD() {
@@ -2050,8 +2025,7 @@ void DreamBase::roomName() {
 		textIndex -= 32;
 	data.word(kLinespacing) = 7;
 	uint8 maxWidth = (data.byte(kWatchon) == 1) ? 120 : 160;
-	uint16 descOffset = getSegment(data.word(kRoomdesc)).word(kIntextdat + textIndex * 2);
-	const uint8 *string = getSegment(data.word(kRoomdesc)).ptr(kIntext + descOffset, 0);
+	const uint8 *string = (const uint8 *)_roomDesc.getString(textIndex);
 	printDirect(string, 88, 25, maxWidth, false);
 	data.word(kLinespacing) = 10;
 	useCharset1();
@@ -2142,8 +2116,7 @@ void DreamBase::doLook() {
 	data.byte(kCommandtype) = 255;
 	dumpTextLine();
 	uint8 index = data.byte(kRoomnum) & 31;
-	uint16 offset = getSegment(data.word(kRoomdesc)).word(kIntextdat + index * 2);
-	const uint8 *string = getSegment(data.word(kRoomdesc)).ptr(kIntext, 0) + offset;
+	const uint8 *string = (const uint8 *)_roomDesc.getString(index);
 	findNextColon(&string);
 	uint16 x;
 	if (data.byte(kReallocation) < 50)
@@ -2196,12 +2169,12 @@ void DreamBase::getRidOfAll() {
 	_reel2.clear();
 	_reel3.clear();
 	deallocateMem(data.word(kReels));
-	deallocateMem(data.word(kPeople));
-	deallocateMem(data.word(kSetdesc));
-	deallocateMem(data.word(kBlockdesc));
-	deallocateMem(data.word(kRoomdesc));
+	_personText.clear();
+	_setDesc.clear();
+	_blockDesc.clear();
+	_roomDesc.clear();
 	_freeFrames.clear();
-	deallocateMem(data.word(kFreedesc));
+	_freeDesc.clear();
 }
 
 // if skipDat, skip clearing and loading Setdat and Freedat
@@ -2236,18 +2209,20 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	loadGraphicsSegment(_reel2, len[5]);
 	loadGraphicsSegment(_reel3, len[6]);
 	data.word(kReels) = allocateAndLoad(len[7]);
-	data.word(kPeople) = allocateAndLoad(len[8]);
-	// TODO: kSetdesc, kBlockdesc, kRoomdesc are also TextFiles?
-	data.word(kSetdesc) = allocateAndLoad(len[9]);
-	data.word(kBlockdesc) = allocateAndLoad(len[10]);
-	data.word(kRoomdesc) = allocateAndLoad(len[11]);
+
+	// segment 8 consists of 12 personFrames followed by a TextFile
+	engine->readFromFile((uint8 *)_personFramesLE, 24);
+	loadTextSegment(_personText, len[8] - 24);
+
+	loadTextSegment(_setDesc, len[9]);
+	loadTextSegment(_blockDesc, len[10]);
+	loadTextSegment(_roomDesc, len[11]);
 	loadGraphicsSegment(_freeFrames, len[12]);
 	if (!skipDat)
 		clearAndLoad(data.word(kFreedat), 255, len[13], kFreedatlen);
 	else
 		engine->skipBytes(len[13]);
-	// TODO: kFreedesc is also a TextFile?
-	data.word(kFreedesc) = allocateAndLoad(len[14]);
+	loadTextSegment(_freeDesc, len[14]);
 
 	engine->closeFile();
 }
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 172a61fad1..d27d920891 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -81,7 +81,7 @@ void DreamBase::convIcons() {
 }
 
 uint16 DreamBase::getPersFrame(uint8 index) {
-	return getSegment(data.word(kPeople)).word(kPersonframes + index * 2);
+	return READ_LE_UINT16(&_personFramesLE[index]);
 }
 
 void DreamBase::startTalk() {
@@ -108,8 +108,7 @@ void DreamBase::startTalk() {
 }
 
 const uint8 *DreamBase::getPersonText(uint8 index, uint8 talkPos) {
-	uint16 offset = kPersontext + getSegment(data.word(kPeople)).word(((index * 64 + talkPos) * 2) + kPersontxtdat);
-	return getSegment(data.word(kPeople)).ptr(offset, 0);
+	return (const uint8 *)_personText.getString(index*64 + talkPos);
 }
 
 void DreamBase::moreTalk() {
-- 
cgit v1.2.3


From 15a1f41e8a9ff22ba4ebb83c1a56d437ec518c2e Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 22:42:57 +0100
Subject: DREAMWEB: Remove reels segment

---
 engines/dreamweb/dreambase.h  |  3 ++-
 engines/dreamweb/dreamgen.cpp |  4 ++--
 engines/dreamweb/dreamgen.h   | 37 ++++++++++++++++++-------------------
 engines/dreamweb/dreamweb.cpp |  1 +
 engines/dreamweb/pathfind.cpp | 13 +++++--------
 engines/dreamweb/sprite.cpp   |  5 +++--
 engines/dreamweb/stubs.cpp    | 23 +++++++++++------------
 7 files changed, 42 insertions(+), 44 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index c62d202890..a9b0f57119 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -155,6 +155,8 @@ protected:
 	TextFile _freeDesc;
 	TextFile _personText;
 	uint16 _personFramesLE[12];
+	RoomPaths _pathData[36];
+	Reel *_reelList;
 
 	// Extras segment (NB: this is saved)
 	GraphicsFile _exFrames;
@@ -517,7 +519,6 @@ public:
 	void allocateBuffers();
 	uint16 allocateMem(uint16 paragraphs);
 	void deallocateMem(uint16 segment);
-	uint16 allocateAndLoad(unsigned int size);
 	void loadTextFile(TextFile &file, const char *fileName);
 	void loadGraphicsFile(GraphicsFile &file, const char *fileName);
 	void loadGraphicsSegment(GraphicsFile &file, unsigned int len);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index de85b4c54e..4dc099a0b9 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -65,9 +65,9 @@ void DreamGenContext::__start() {
 		//0x0100: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0110: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0120: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index bbedcbcbb9..1ea497281c 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -255,25 +255,24 @@ static const uint16 kBackdrop = 284;
 static const uint16 kRecordspace = 286;
 static const uint16 kFreedat = 288;
 static const uint16 kSetdat = 290;
-static const uint16 kReels = 292;
-static const uint16 kBlinkframe = 294;
-static const uint16 kBlinkcount = 295;
-static const uint16 kReasseschanges = 296;
-static const uint16 kPointerspath = 297;
-static const uint16 kManspath = 298;
-static const uint16 kPointerfirstpath = 299;
-static const uint16 kFinaldest = 300;
-static const uint16 kDestination = 301;
-static const uint16 kLinestartx = 302;
-static const uint16 kLinestarty = 304;
-static const uint16 kLineendx = 306;
-static const uint16 kLineendy = 308;
-static const uint16 kLinepointer = 310;
-static const uint16 kLinedirection = 311;
-static const uint16 kLinelength = 312;
-static const uint16 kCh0playing = 313;
-static const uint16 kCh0repeat = 314;
-static const uint16 kCh1playing = 315;
+static const uint16 kBlinkframe = 292;
+static const uint16 kBlinkcount = 293;
+static const uint16 kReasseschanges = 294;
+static const uint16 kPointerspath = 295;
+static const uint16 kManspath = 296;
+static const uint16 kPointerfirstpath = 297;
+static const uint16 kFinaldest = 298;
+static const uint16 kDestination = 299;
+static const uint16 kLinestartx = 300;
+static const uint16 kLinestarty = 302;
+static const uint16 kLineendx = 304;
+static const uint16 kLineendy = 306;
+static const uint16 kLinepointer = 308;
+static const uint16 kLinedirection = 309;
+static const uint16 kLinelength = 310;
+static const uint16 kCh0playing = 311;
+static const uint16 kCh0repeat = 312;
+static const uint16 kCh1playing = 313;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 539433dbb9..468999e1ba 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -417,6 +417,7 @@ DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) :
 	_currentSample = 0xff;
 
 	_backdropBlocks = 0;
+	_reelList = 0;
 
 	_oldSubject._type = 0;
 	_oldSubject._index = 0;
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index 4f887db251..8a0596149e 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -42,19 +42,16 @@ void DreamBase::turnPathOff(uint8 param) {
 
 void DreamBase::turnAnyPathOn(uint8 param, uint8 room) {
 	findOrMake(param, 0xff, room + 100);
-	PathNode *paths = (PathNode *)getSegment(data.word(kReels)).ptr(kPathdata + 144 * room, 0);
-	paths[param].on = 0xff;
+	_pathData[room].nodes[param].on = 0xff;
 }
 
 void DreamBase::turnAnyPathOff(uint8 param, uint8 room) {
 	findOrMake(param, 0x00, room + 100);
-	PathNode *paths = (PathNode *)getSegment(data.word(kReels)).ptr(kPathdata + 144 * room, 0);
-	paths[param].on = 0x00;
+	_pathData[room].nodes[param].on = 0x00;
 }
 
 RoomPaths *DreamBase::getRoomsPaths() {
-	void *result = getSegment(data.word(kReels)).ptr(data.byte(kRoomnum) * 144, 144);
-	return (RoomPaths *)result;
+	return &_pathData[data.byte(kRoomnum)];
 }
 
 void DreamBase::faceRightWay() {
@@ -310,7 +307,7 @@ void DreamBase::workoutFrames() {
 }
 
 byte DreamBase::findFirstPath(byte x, byte y) {
-	PathNode *paths = (PathNode *)getSegment(data.word(kReels)).ptr(kPathdata + 144 * data.byte(kRoomnum), 0);
+	PathNode *paths = _pathData[data.byte(kRoomnum)].nodes;
 
 	for (uint8 index = 0; index < 12; index++) {
 		if (paths[index].x1 == 0xff && paths[index].y1 == 0xff)
@@ -329,7 +326,7 @@ byte DreamBase::findFirstPath(byte x, byte y) {
 }
 
 byte DreamBase::findPathOfPoint(byte x, byte y) {
-	PathNode *paths = (PathNode *)getSegment(data.word(kReels)).ptr(kPathdata + 144 * data.byte(kRoomnum), 0);
+	PathNode *paths = _pathData[data.byte(kRoomnum)].nodes;
 
 	for (uint8 index = 0; index < 12; index++) {
 		if (paths[index].on != 0xff)
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 424d8d52b2..cc48ca13b2 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -429,7 +429,7 @@ void DreamBase::liftSprite(Sprite *sprite, SetObject *objData) {
 }
 
 Reel *DreamBase::getReelStart(uint16 reelPointer) {
-	Reel *reel = (Reel *)getSegment(data.word(kReels)).ptr(kReellist + reelPointer * sizeof(Reel) * 8, sizeof(Reel));
+	Reel *reel = &_reelList[reelPointer * 8];
 	return reel;
 }
 
@@ -1101,7 +1101,8 @@ void DreamBase::clearBeforeLoad() {
 	delete[] _backdropBlocks;
 	_backdropBlocks = 0;
 	_setFrames.clear();
-	deallocateMem(data.word(kReels));
+	delete[] _reelList;
+	_reelList = 0;
 	_personText.clear();
 	_setDesc.clear();
 	_blockDesc.clear();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 994111df04..0137fd2f85 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1049,13 +1049,6 @@ void DreamBase::lockMon() {
 	}
 }
 
-uint16 DreamBase::allocateAndLoad(unsigned int size) {
-	// allocatemem adds 32 bytes, so it doesn't matter that size/16 rounds down
-	uint16 result = allocateMem(size / 16);
-	engine->readFromFile(getSegment(result).ptr(0, size), size);
-	return result;
-}
-
 void DreamBase::clearAndLoad(uint8 *buf, uint8 c,
                                    unsigned int size, unsigned int maxSize) {
 	assert(size <= maxSize);
@@ -1368,9 +1361,7 @@ void DreamBase::doChange(uint8 index, uint8 value, uint8 type) {
 		if (freeObject->mapad[0] == 0xff)
 			freeObject->mapad[0] = value;
 	} else { //path
-//		getSegment(data.word(kReels)).byte(kPathdata + (type - 100) * 144 + index * 8 + 6) = value;
-		PathNode *paths = (PathNode *)getSegment(data.word(kReels)).ptr(kPathdata + 144 * (type - 100), 0);
-		paths[index].on = value;
+		_pathData[type - 100].nodes[index].on = value;
 	}
 }
 
@@ -2168,7 +2159,8 @@ void DreamBase::getRidOfAll() {
 	_reel1.clear();
 	_reel2.clear();
 	_reel3.clear();
-	deallocateMem(data.word(kReels));
+	delete[] _reelList;
+	_reelList = 0;
 	_personText.clear();
 	_setDesc.clear();
 	_blockDesc.clear();
@@ -2208,7 +2200,14 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	loadGraphicsSegment(_reel1, len[4]);
 	loadGraphicsSegment(_reel2, len[5]);
 	loadGraphicsSegment(_reel3, len[6]);
-	data.word(kReels) = allocateAndLoad(len[7]);
+
+	// segment 7 consists of 36*38 pathNodes followed by 'reelList'
+	engine->readFromFile((uint8 *)_pathData, 36*sizeof(RoomPaths));
+	unsigned int reelLen = len[7] - 36*sizeof(RoomPaths);
+	unsigned int reelCount = (reelLen + sizeof(Reel) - 1) / sizeof(Reel);
+	delete[] _reelList;
+	_reelList = new Reel[reelCount];
+	engine->readFromFile((uint8 *)_reelList, reelLen);
 
 	// segment 8 consists of 12 personFrames followed by a TextFile
 	engine->readFromFile((uint8 *)_personFramesLE, 24);
-- 
cgit v1.2.3


From 914bf3d5192c3ec3131ade9d22c5d5f5ccd18fc0 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 22:58:06 +0100
Subject: DREAMWEB: Remove setdat, freedat segments

---
 engines/dreamweb/backdrop.cpp | 10 +++-------
 engines/dreamweb/dreambase.h  |  3 ++-
 engines/dreamweb/dreamgen.cpp |  4 ++--
 engines/dreamweb/dreamgen.h   | 38 ++++++++++++++++++--------------------
 engines/dreamweb/sprite.cpp   |  3 ++-
 engines/dreamweb/structs.h    |  3 ++-
 engines/dreamweb/stubs.cpp    | 28 ++++++++--------------------
 7 files changed, 37 insertions(+), 52 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index e6f5e9ab42..295be471f0 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -116,10 +116,7 @@ void DreamBase::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
 	uint8 type = objData->type;
 	Sprite *sprite = makeSprite(x, y, addr_backobject, &_setFrames, 0);
 
-	uint16 objDataOffset = (uint8 *)objData - getSegment(data.word(kSetdat)).ptr(0, 0);
-	assert(objDataOffset % sizeof(SetObject) == 0);
-	assert(objDataOffset < 128 * sizeof(SetObject));
-	sprite->_objData = objDataOffset;
+	sprite->_objData = objData;
 	if (priority == 255)
 		priority = 0;
 	sprite->priority = priority;
@@ -135,9 +132,8 @@ void DreamBase::showAllObs() {
 	_setList.clear();
 
 	const GraphicsFile &frameBase = _setFrames;
-	SetObject *setEntries = (SetObject *)getSegment(data.word(kSetdat)).ptr(0, count * sizeof(SetObject));
 	for (size_t i = 0; i < count; ++i) {
-		SetObject *setEntry = setEntries + i;
+		SetObject *setEntry = &_setDat[i];
 		uint16 x, y;
 		if (getMapAd(setEntry->mapad, &x, &y) == 0)
 			continue;
@@ -216,7 +212,7 @@ void DreamBase::showAllFree() {
 
 	_freeList.clear();
 
-	const DynObject *freeObjects = (const DynObject *)getSegment(data.word(kFreedat)).ptr(0, 0);
+	const DynObject *freeObjects = _freeDat;
 	const GraphicsFile &frameBase = _freeFrames;
 	for (size_t i = 0; i < count; ++i) {
 		uint16 x, y;
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index a9b0f57119..77a32bbe60 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -157,6 +157,8 @@ protected:
 	uint16 _personFramesLE[12];
 	RoomPaths _pathData[36];
 	Reel *_reelList;
+	SetObject _setDat[128];
+	DynObject _freeDat[80];
 
 	// Extras segment (NB: this is saved)
 	GraphicsFile _exFrames;
@@ -530,7 +532,6 @@ public:
 	void loadTravelText();
 	void loadTempText(const char *fileName);
 	void clearAndLoad(uint8 *buf, uint8 c, unsigned int size, unsigned int maxSize);
-	void clearAndLoad(uint16 seg, uint8 c, unsigned int size, unsigned int maxSize);
 	void sortOutMap();
 	void loadRoomData(const Room &room, bool skipDat);
 	void useTempCharset();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 4dc099a0b9..8b69c84a1c 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -65,9 +65,9 @@ void DreamGenContext::__start() {
 		//0x0100: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0110: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+		0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0120: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 1ea497281c..d283cd1c35 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -253,26 +253,24 @@ static const uint16 kWorkspace = 280;
 static const uint16 kMainsprites = 282;
 static const uint16 kBackdrop = 284;
 static const uint16 kRecordspace = 286;
-static const uint16 kFreedat = 288;
-static const uint16 kSetdat = 290;
-static const uint16 kBlinkframe = 292;
-static const uint16 kBlinkcount = 293;
-static const uint16 kReasseschanges = 294;
-static const uint16 kPointerspath = 295;
-static const uint16 kManspath = 296;
-static const uint16 kPointerfirstpath = 297;
-static const uint16 kFinaldest = 298;
-static const uint16 kDestination = 299;
-static const uint16 kLinestartx = 300;
-static const uint16 kLinestarty = 302;
-static const uint16 kLineendx = 304;
-static const uint16 kLineendy = 306;
-static const uint16 kLinepointer = 308;
-static const uint16 kLinedirection = 309;
-static const uint16 kLinelength = 310;
-static const uint16 kCh0playing = 311;
-static const uint16 kCh0repeat = 312;
-static const uint16 kCh1playing = 313;
+static const uint16 kBlinkframe = 288;
+static const uint16 kBlinkcount = 289;
+static const uint16 kReasseschanges = 290;
+static const uint16 kPointerspath = 291;
+static const uint16 kManspath = 292;
+static const uint16 kPointerfirstpath = 293;
+static const uint16 kFinaldest = 294;
+static const uint16 kDestination = 295;
+static const uint16 kLinestartx = 296;
+static const uint16 kLinestarty = 298;
+static const uint16 kLineendx = 300;
+static const uint16 kLineendy = 302;
+static const uint16 kLinepointer = 304;
+static const uint16 kLinedirection = 305;
+static const uint16 kLinelength = 306;
+static const uint16 kCh0playing = 307;
+static const uint16 kCh0repeat = 308;
+static const uint16 kCh1playing = 309;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index cc48ca13b2..d1b7934a2e 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -82,6 +82,7 @@ Sprite *DreamBase::makeSprite(uint8 x, uint8 y, uint16 updateCallback, const Gra
 	sprite->w2 = 0xffff;
 	sprite->frameNumber = 0;
 	sprite->delay = 0;
+	sprite->_objData = 0;
 	return sprite;
 }
 
@@ -225,7 +226,7 @@ void DreamBase::aboutTurn(Sprite *sprite) {
 }
 
 void DreamBase::backObject(Sprite *sprite) {
-	SetObject *objData = (SetObject *)getSegment(data.word(kSetdat)).ptr(sprite->_objData, 0);
+	SetObject *objData = sprite->_objData;
 
 	if (sprite->delay != 0) {
 		--sprite->delay;
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 0b7a81b6eb..db1e51fafc 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -29,6 +29,7 @@
 namespace DreamGen {
 
 struct GraphicsFile;
+struct SetObject;
 
 struct Sprite {
 	uint16 _updateCallback;
@@ -45,7 +46,7 @@ struct Sprite {
 	uint8  b17;
 	uint8  delay;
 	uint8  animFrame; // index into SetObject::frames
-	uint16 _objData;
+	SetObject *_objData;
 	uint8  speed;
 	uint8  priority;
 	uint16 w24;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 0137fd2f85..f62e651b1b 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1016,7 +1016,7 @@ void DreamBase::eraseOldObs() {
 	Common::List<Sprite>::iterator i;
 	for (i = _spriteTable.begin(); i != _spriteTable.end(); ) {
 		Sprite &sprite = *i;
-		if (sprite._objData != 0xffff)
+		if (sprite._objData)
 			i = _spriteTable.erase(i);
 		else
 			++i;
@@ -1056,13 +1056,6 @@ void DreamBase::clearAndLoad(uint8 *buf, uint8 c,
 	engine->readFromFile(buf, size);
 }
 
-void DreamBase::clearAndLoad(uint16 seg, uint8 c,
-                                   unsigned int size, unsigned int maxSize) {
-	assert(size <= maxSize);
-	uint8 *buf = getSegment(seg).ptr(0, maxSize);
-	clearAndLoad(buf, c, size, maxSize);
-}
-
 void DreamBase::startLoading(const Room &room) {
 	data.byte(kCombatcount) = 0;
 	_roomsSample = room.roomsSample;
@@ -1303,7 +1296,7 @@ void DreamBase::setAllChanges() {
 }
 
 DynObject *DreamBase::getFreeAd(uint8 index) {
-	return (DynObject *)getSegment(data.word(kFreedat)).ptr(0, 0) + index;
+	return &_freeDat[index];
 }
 
 DynObject *DreamBase::getExAd(uint8 index) {
@@ -1350,7 +1343,7 @@ void *DreamBase::getAnyAdDir(uint8 index, uint8 flag) {
 }
 
 SetObject *DreamBase::getSetAd(uint8 index) {
-	return (SetObject *)getSegment(data.word(kSetdat)).ptr(0, 0) + index;
+	return &_setDat[index];
 }
 
 void DreamBase::doChange(uint8 index, uint8 value, uint8 type) {
@@ -1366,13 +1359,11 @@ void DreamBase::doChange(uint8 index, uint8 value, uint8 type) {
 }
 
 void DreamBase::deleteTaken() {
-	const DynObject *extraObjects = _exData;
-	DynObject *freeObjects = (DynObject *)getSegment(data.word(kFreedat)).ptr(0, 0);
 	for (size_t i = 0; i < kNumexobjects; ++i) {
-		uint8 location = extraObjects[i].initialLocation;
+		uint8 location = _exData[i].initialLocation;
 		if (location == data.byte(kReallocation)) {
-			uint8 index = extraObjects[i].index;
-			freeObjects[index].mapad[0] = 0xfe;
+			uint8 index = _exData[i].index;
+			_freeDat[index].mapad[0] = 0xfe;
 		}
 	}
 }
@@ -2191,7 +2182,7 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 
 	loadGraphicsSegment(_setFrames, len[2]);
 	if (!skipDat)
-		clearAndLoad(data.word(kSetdat), 255, len[3], kSetdatlen);
+		clearAndLoad((uint8 *)_setDat, 255, len[3], kSetdatlen);
 	else
 		engine->skipBytes(len[3]);
 	// NB: The skipDat version of this function as called by restoreall
@@ -2218,7 +2209,7 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	loadTextSegment(_roomDesc, len[11]);
 	loadGraphicsSegment(_freeFrames, len[12]);
 	if (!skipDat)
-		clearAndLoad(data.word(kFreedat), 255, len[13], kFreedatlen);
+		clearAndLoad((uint8 *)_freeDat, 255, len[13], kFreedatlen);
 	else
 		engine->skipBytes(len[13]);
 	loadTextSegment(_freeDesc, len[14]);
@@ -2484,9 +2475,6 @@ void DreamBase::allocateBuffers() {
 	_exFrames._data = new uint8[kExframeslen];
 	_exText.clear();
 	_exText._text = new char[kExtextlen];
-
-	data.word(kFreedat) = allocateMem(kFreedatlen/16);
-	data.word(kSetdat) = allocateMem(kSetdatlen/16);
 }
 
 void DreamBase::workToScreenM() {
-- 
cgit v1.2.3


From 5e915afcd4b410caadf6f17db45aa73352e3c07e Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 27 Dec 2011 23:09:47 +0100
Subject: DREAMWEB: Remove unused functions

---
 engines/dreamweb/dreambase.h  |  2 --
 engines/dreamweb/vgagrafx.cpp | 28 ----------------------------
 2 files changed, 30 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 77a32bbe60..b4159db26c 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -862,8 +862,6 @@ public:
 	void setMode();
 	void showPCX(const Common::String &name);
 	void showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 effectsFlag, uint8 width, uint8 height);
-	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
-	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
 	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
 	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
 	bool pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y);
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 417ccceab3..5096db8a00 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -268,12 +268,6 @@ void DreamBase::frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 wid
 	}
 }
 
-void DreamBase::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag) {
-	uint8 width, height;
-	showFrame(frameData, x, y, frameNumber, effectsFlag, &width, &height);
-}
-
-
 void DreamBase::showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag) {
 	uint8 width, height;
 	showFrame(frameData, x, y, frameNumber, effectsFlag, &width, &height);
@@ -312,28 +306,6 @@ void DreamBase::showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 e
 	frameOutV(workspace(), pSrc, 320, width, height, x, y);
 }
 
-void DreamBase::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
-	const Frame *frame = frameData + frameNumber;
-	if ((frame->width == 0) && (frame->height == 0)) {
-		*width = 0;
-		*height = 0;
-		return;
-	}
-
-	// "notBlankShow"
-	if ((effectsFlag & 128) == 0) {
-		x += frame->x;
-		y += frame->y;
-	}
-
-	// "skipOffsets"
-	*width = frame->width;
-	*height = frame->height;
-	const uint8 *pSrc = ((const uint8 *)frameData) + frame->ptr() + 2080;
-
-	showFrameInternal(pSrc, x, y, effectsFlag, *width, *height);
-}
-
 void DreamBase::showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
 	const Frame *frame = &frameData._frames[frameNumber];
 	if ((frame->width == 0) && (frame->height == 0)) {
-- 
cgit v1.2.3


From 411750ed4ac5e66fe154a946abb44149904b3947 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 27 Dec 2011 23:25:45 +0100
Subject: CRUISE: Fix cppcheck warning about possible NULL pointer use.

---
 engines/cruise/dataLoader.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp
index 66bc0fbf46..76479d7a10 100644
--- a/engines/cruise/dataLoader.cpp
+++ b/engines/cruise/dataLoader.cpp
@@ -369,14 +369,14 @@ int loadFNTSub(uint8 *ptr, int destIdx) {
 
 	destPtr = filesDatabase[fileIndex].subData.ptr;
 
-	memcpy(destPtr, ptr2, loadFileVar1);
-
-	//fontSize = READ_BE_UINT32(ptr2);
-
 	if (destPtr != NULL) {
 		int32 i;
 		uint8 *currentPtr;
 
+		memcpy(destPtr, ptr2, loadFileVar1);
+
+		//fontSize = READ_BE_UINT32(ptr2);
+
 		destPtr = filesDatabase[fileIndex].subData.ptr;
 
 		bigEndianLongToNative((int32 *) destPtr);
-- 
cgit v1.2.3


From 536abf6d3de82f67342d73eefea7b63e3172f4d0 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 27 Dec 2011 12:53:53 +0100
Subject: KYRA: (EOB) - fix signed/unsigned mismatch

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

(limited to 'engines')

diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index 1c29206982..fbddd620d1 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -711,7 +711,7 @@ Item EoBCoreEngine::createMagicWeaponItem(int flags, int icon, int value, int ty
 void EoBCoreEngine::removeMagicWeaponItem(Item item) {
 	_itemTypes[_items[item].type].armorClass = -30;
 	_items[item].block = -2;
-	_items[item].level = -1;
+	_items[item].level = 0xff;
 }
 
 void EoBCoreEngine::updateWallOfForceTimers() {
-- 
cgit v1.2.3


From 4fef4743fd5a2000a96c55c7b961d60e53562504 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 27 Dec 2011 13:52:19 +0100
Subject: KYRA: (EOB) - fix 2 gcc (-Woverloaded-virtual) warnings

---
 engines/kyra/kyra_rpg.cpp | 2 +-
 engines/kyra/kyra_rpg.h   | 2 +-
 engines/kyra/text_rpg.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp
index a4c92b6125..92aa12bc7a 100644
--- a/engines/kyra/kyra_rpg.cpp
+++ b/engines/kyra/kyra_rpg.cpp
@@ -313,7 +313,7 @@ uint16 KyraRpgEngine::processDialogue() {
 	return res;
 }
 
-void KyraRpgEngine::delayUntil(uint32 time, bool doUpdate, bool isMainLoop) {
+void KyraRpgEngine::delayUntil(uint32 time, bool doUpdate, bool isMainLoop, bool) {
 	uint32 curTime = _system->getMillis();
 	if (time > curTime)
 		delay(time - curTime, doUpdate, isMainLoop);
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index 1a5acb8e63..678f8120b5 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -304,7 +304,7 @@ protected:
 
 	// misc
 	virtual void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false) = 0;
-	void delayUntil(uint32 time, bool doUpdate = false, bool isMainLoop = false);
+	void delayUntil(uint32 time, bool doUpdate = false, bool isMainLoop = false, bool unused = false);
 	int rollDice(int times, int pips, int inc = 0);
 
 	virtual Common::Error loadGameState(int slot) = 0;
diff --git a/engines/kyra/text_rpg.h b/engines/kyra/text_rpg.h
index 8ef8fdd0ca..5ad8899484 100644
--- a/engines/kyra/text_rpg.h
+++ b/engines/kyra/text_rpg.h
@@ -37,7 +37,7 @@ public:
 	TextDisplayer_rpg(KyraRpgEngine *engine, Screen *scr);
 	virtual ~TextDisplayer_rpg();
 
-	virtual void setupField(int dim, bool mode);
+	void setupField(int dim, bool mode);
 
 	void printDialogueText(int stringId, const char *pageBreakString);
 	void printDialogueText(const char *str, bool wait = false);
-- 
cgit v1.2.3


From 37c046339dfc70f29c163457c72158e02a6c1cdb Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 27 Dec 2011 16:42:05 +0100
Subject: KYRA: (EOB) - cleanup dialog settings a bit

---
 engines/kyra/chargen.cpp       |  12 ++--
 engines/kyra/darkmoon.cpp      |  29 ++-------
 engines/kyra/darkmoon.h        |   4 ++
 engines/kyra/eob.cpp           |  32 ++--------
 engines/kyra/eob.h             |   4 ++
 engines/kyra/eobcommon.cpp     |  23 +++-----
 engines/kyra/eobcommon.h       |  12 ----
 engines/kyra/gui_eob.cpp       | 130 ++++++++++++++++++++---------------------
 engines/kyra/kyra_rpg.cpp      |  23 +++-----
 engines/kyra/kyra_rpg.h        |  51 ++++++++++++----
 engines/kyra/lol.cpp           |  16 ++---
 engines/kyra/lol.h             |   4 ++
 engines/kyra/sequences_eob.cpp |   2 +-
 engines/kyra/staticres_eob.cpp |  10 ++++
 engines/kyra/staticres_lol.cpp |   5 ++
 engines/kyra/text_rpg.cpp      |  42 ++++++-------
 16 files changed, 191 insertions(+), 208 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index e4b89c9a99..50153d7de3 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -1616,15 +1616,15 @@ int TransferPartyWiz::selectCharactersMenu() {
 	_screen->setFont(Screen::FID_6_FNT);
 	_screen->clearCurPage();
 
-	_vm->gui_drawBox(0, 0, 320, 163, _vm->_color1_1, _vm->_color2_1, _vm->_bkgColor_1);
+	_vm->gui_drawBox(0, 0, 320, 163, _vm->guiSettings()->colors.frame1, _vm->guiSettings()->colors.frame2, _vm->guiSettings()->colors.fill);
 	_screen->printText(_strings2[0], 5, 3, 15, 0);
 	_screen->printText(_strings2[1], 5, 10, 15, 0);
 
 	for (int i = 0; i < 6; i++)
 		drawCharPortraitWithStats(i, 0);
 
-	_vm->gui_drawBox(4, 148, 43, 12, _vm->_color1_1, _vm->_color2_1, _vm->_bkgColor_1);
-	_vm->gui_drawBox(272, 148, 43, 12, _vm->_color1_1, _vm->_color2_1, _vm->_bkgColor_1);
+	_vm->gui_drawBox(4, 148, 43, 12, _vm->guiSettings()->colors.frame1, _vm->guiSettings()->colors.frame2, _vm->guiSettings()->colors.fill);
+	_vm->gui_drawBox(272, 148, 43, 12, _vm->guiSettings()->colors.frame1, _vm->guiSettings()->colors.frame2, _vm->guiSettings()->colors.fill);
 
 	_screen->printShadedText(_labels[0], 9, 151, 15, 0);
 	_screen->printShadedText(_labels[1], 288, 151, 15, 0);
@@ -1686,10 +1686,10 @@ int TransferPartyWiz::selectCharactersMenu() {
 		}
 
 		int x = (highlight - 6) * 268 + 4;
-		_vm->gui_drawBox(x, 148, 43, 12, _vm->_bkgColor_1, _vm->_bkgColor_1, -1);
+		_vm->gui_drawBox(x, 148, 43, 12, _vm->guiSettings()->colors.fill, _vm->guiSettings()->colors.fill, -1);
 		_screen->updateScreen();
 		_vm->_system->delayMillis(80);
-		_vm->gui_drawBox(x, 148, 43, 12, _vm->_color1_1, _vm->_color2_1, -1);
+		_vm->gui_drawBox(x, 148, 43, 12, _vm->guiSettings()->colors.frame1, _vm->guiSettings()->colors.frame2, -1);
 		_screen->updateScreen();
 
 		if (highlight == 6 || _vm->shouldQuit()) {
@@ -1726,7 +1726,7 @@ void TransferPartyWiz::drawCharPortraitWithStats(int charIndex, bool enabled) {
 	EoBCharacter *c = &_vm->_characters[charIndex];
 
 	_screen->fillRect(x + 4, y + 24, x + 36, y + 57, 12);
-	_vm->gui_drawBox(x + 40, y + 24, 118, 34, _vm->_color1_1, _vm->_color2_1, _vm->_bkgColor_1);
+	_vm->gui_drawBox(x + 40, y + 24, 118, 34, _vm->guiSettings()->colors.frame1, _vm->guiSettings()->colors.frame2, _vm->guiSettings()->colors.fill);
 
 	if (!(c->flags & 1))
 		return;
diff --git a/engines/kyra/darkmoon.cpp b/engines/kyra/darkmoon.cpp
index 304e5c9537..c12ef1050a 100644
--- a/engines/kyra/darkmoon.cpp
+++ b/engines/kyra/darkmoon.cpp
@@ -58,31 +58,6 @@ Common::Error DarkMoonEngine::init() {
 
 	_monsterProps = new EoBMonsterProperty[10];
 
-	static const uint16 wX[] = { 221, 76 };
-	static const uint8 wY[] = { 189, 162 };
-	static const uint16 wW[] = { 95, 95 };
-
-	_dialogueButtonLabelCol1 = 9;
-	_dialogueButtonLabelCol2 = 15;
-	_dialogueButtonW = 95;
-	_dialogueButtonH = 9;
-	_waitButtonPresX = wX;
-	_waitButtonPresY = wY;
-	_waitButtonPresW = wW;
-	_waitButtonReverveW = 7;
-
-	_bkgColor_1 = 183;
-	_color1_1 = 186;
-	_color2_1 = 181;
-	_color4 = 133;
-	_color5 = 184;
-	_color6 = 183;
-	_color7 = 181;
-	_color8 = 186;
-	_color12 = 180;
-	_color13 = 177;
-	_color14 = 182;
-
 	return Common::kNoError;
 }
 
@@ -475,6 +450,10 @@ void DarkMoonEngine::characterLevelGain(int charIndex) {
 	}
 }
 
+const KyraRpgGUISettings *DarkMoonEngine::guiSettings() {
+	return &_guiSettings;
+}
+
 }	// End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/darkmoon.h b/engines/kyra/darkmoon.h
index 590b2f4ea1..8abbc2bea2 100644
--- a/engines/kyra/darkmoon.h
+++ b/engines/kyra/darkmoon.h
@@ -128,8 +128,12 @@ private:
 	int charSelectDialogue();
 	void characterLevelGain(int charIndex);
 
+	const KyraRpgGUISettings *guiSettings();
+
 	const char *const *_hornStrings;
 	const uint8 *_hornSounds;
+
+	static const KyraRpgGUISettings _guiSettings;
 };
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/eob.cpp b/engines/kyra/eob.cpp
index 96eb388699..7524b077ff 100644
--- a/engines/kyra/eob.cpp
+++ b/engines/kyra/eob.cpp
@@ -61,32 +61,6 @@ Common::Error EoBEngine::init() {
 
 	_itemsOverlay = _res->fileData("ITEMRMP.VGA", 0);
 
-	static const uint16 wX[] = { 285, 139 };
-	static const uint8 wY[] = { 189, 162 };
-	static const uint16 wW[] = { 31, 31 };
-
-	_dialogueButtonLabelCol1 = 9;
-	_dialogueButtonLabelCol2 = 15;
-	_dialogueButtonW = 95;
-	_dialogueButtonH = 9;
-	_waitButtonPresX = wX;
-	_waitButtonPresY = wY;
-	_waitButtonPresW = wW;
-	_waitButtonReverveW = 7;
-
-	_bkgColor_1 = 132;
-	_color1_1 = 135;
-	_color2_1 = 130;
-	_color4 = 133;
-	_color5 = 133;
-	_color6 = 180;
-	_color7 = 177;
-	_color8 = 184;
-
-	_color14 = _color8;
-	_color13 = _color7;
-	_color12 = _color6;
-
 	_screen->modifyScreenDim(7, 0x01, 0xB3, 0x22, 0x12);
 	_screen->modifyScreenDim(9, 0x01, 0x7D, 0x26, 0x3F);
 	_screen->modifyScreenDim(12, 0x01, 0x04, 0x14, 0xA0);
@@ -520,7 +494,7 @@ void EoBEngine::turnUndeadAutoHit() {
 bool EoBEngine::checkPartyStatusExtra() {
 	_screen->copyPage(0, 10);
 	int cd = _screen->curDimIndex();
-	gui_drawBox(0, 121, 320, 80, _color1_1, _color2_1, _bkgColor_1);
+	gui_drawBox(0, 121, 320, 80, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
 	_txt->setupField(9, false);
 	_txt->printMessage(_menuStringsDefeat[0]);
 	while (!shouldQuit()) {
@@ -573,6 +547,10 @@ void EoBEngine::healParty() {
 	}
 }
 
+const KyraRpgGUISettings *EoBEngine::guiSettings() {
+	return &_guiSettings;
+}
+
 } // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/eob.h b/engines/kyra/eob.h
index 0f83c47b03..6123c26726 100644
--- a/engines/kyra/eob.h
+++ b/engines/kyra/eob.h
@@ -139,6 +139,10 @@ private:
 	bool checkPartyStatusExtra();
 	int resurrectionSelectDialogue();
 	void healParty();
+
+	const KyraRpgGUISettings *guiSettings();
+
+	static const KyraRpgGUISettings _guiSettings;
 };
 
 
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 8e14b895a0..bc01fead6b 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -107,11 +107,6 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags)
 	_dscDoorY1 = 0;
 	_dscDoorXE = 0;
 
-	_color9 = 17;
-	_color10 = 23;
-	_color11 = 20;
-	_color4 = _color5 = _color6 = _color7 = _color8 = _color12 = _color13 = _color14 = 0;
-
 	_menuDefs = 0;
 
 	_exchangeCharacterId = -1;
@@ -1106,7 +1101,7 @@ void EoBCoreEngine::npcSequence(int npcIndex) {
 	_screen->loadFileDataToPage(s, 5, 32000);
 	delete s;
 
-	gui_drawBox(0, 121, 320, 79, _color1_1, _color2_1, _bkgColor_1);
+	gui_drawBox(0, 121, 320, 79, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
 	_txt->setupField(9, true);
 	_txt->resetPageBreakString();
 
@@ -1544,7 +1539,7 @@ void EoBCoreEngine::displayParchment(int id) {
 		// display text
 		Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
 		_screen->loadFileDataToPage(s, 5, 32000);
-		gui_drawBox(0, 0, 176, 175, _color1_1, _color2_1, _bkgColor_1);
+		gui_drawBox(0, 0, 176, 175, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
 		_txt->setupField(12, 1);
 		if (_flags.gameID == GI_EOB2)
 			id++;
@@ -1686,21 +1681,21 @@ bool EoBCoreEngine::checkPassword() {
 	_screen->copyPage(0, 10);
 
 	_screen->setScreenDim(13);
-	gui_drawBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, _color1_1, _color2_1, -1);
-	gui_drawBox((_screen->_curDim->sx << 3) + 1, _screen->_curDim->sy + 1, (_screen->_curDim->w << 3) - 2, _screen->_curDim->h - 2, _color1_1, _color2_1, _bkgColor_1);
+	gui_drawBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, guiSettings()->colors.frame1, guiSettings()->colors.frame2, -1);
+	gui_drawBox((_screen->_curDim->sx << 3) + 1, _screen->_curDim->sy + 1, (_screen->_curDim->w << 3) - 2, _screen->_curDim->h - 2, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
 	_screen->modifyScreenDim(13, _screen->_curDim->sx + 1, _screen->_curDim->sy + 2, _screen->_curDim->w - 2, _screen->_curDim->h - 16);
 
 	for (int i = 0; i < 3; i++) {
-		_screen->fillRect(_screen->_curDim->sx << 3, _screen->_curDim->sy, ((_screen->_curDim->sx + _screen->_curDim->w) << 3) - 1, (_screen->_curDim->sy + _screen->_curDim->h) - 1, _bkgColor_1);
+		_screen->fillRect(_screen->_curDim->sx << 3, _screen->_curDim->sy, ((_screen->_curDim->sx + _screen->_curDim->w) << 3) - 1, (_screen->_curDim->sy + _screen->_curDim->h) - 1, guiSettings()->colors.fill);
 		int c = rollDice(1, _mnNumWord - 1, -1);
 		const uint8 *shp = (_mnDef[c << 2] < _numLargeItemShapes) ? _largeItemShapes[_mnDef[c << 2]] : (_mnDef[c << 2] < 15 ? 0 : _smallItemShapes[_mnDef[c << 2] - 15]);
 		assert(shp);
 		_screen->drawShape(0, shp, 100, 2, 13);
-		_screen->printShadedText(Common::String::format(_mnPrompt[0], _mnDef[(c << 2) + 1], _mnDef[(c << 2) + 2]).c_str(), (_screen->_curDim->sx + 1) << 3, _screen->_curDim->sy, _screen->_curDim->unk8, _bkgColor_1);
+		_screen->printShadedText(Common::String::format(_mnPrompt[0], _mnDef[(c << 2) + 1], _mnDef[(c << 2) + 2]).c_str(), (_screen->_curDim->sx + 1) << 3, _screen->_curDim->sy, _screen->_curDim->unk8, guiSettings()->colors.fill);
 		memset(answ, 0, 20);
-		gui_drawBox(76, 100, 133, 14, _color2_1, _color1_1, -1);
-		gui_drawBox(77, 101, 131, 12, _color2_1, _color1_1, -1);
-		if (_gui->getTextInput(answ, 10, 103, 15, _screen->_curDim->unk8, _bkgColor_1, 8) < 0)
+		gui_drawBox(76, 100, 133, 14, guiSettings()->colors.frame2, guiSettings()->colors.frame1, -1);
+		gui_drawBox(77, 101, 131, 12, guiSettings()->colors.frame2, guiSettings()->colors.frame1, -1);
+		if (_gui->getTextInput(answ, 10, 103, 15, _screen->_curDim->unk8, guiSettings()->colors.fill, 8) < 0)
 			i = 3;
 		if (!scumm_stricmp(_mnWord[c], answ))
 			break;
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index fa65c93a4e..9284a181b4 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -764,18 +764,6 @@ protected:
 	char _dialogueLastBitmap[13];
 	int _moveCounter;
 
-	uint8 _color4;
-	uint8 _color5;
-	uint8 _color6;
-	uint8 _color7;
-	uint8 _color8;
-	uint8 _color9;
-	uint8 _color10;
-	uint8 _color11;
-	uint8 _color12;
-	uint8 _color13;
-	uint8 _color14;
-
 	const char *const *_chargenStatStrings;
 	const char *const *_chargenRaceSexStrings;
 	const char *const *_chargenClassStrings;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 51a9e52266..1ccb60ada1 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -100,9 +100,9 @@ void EoBCoreEngine::gui_drawCharPortraitWithStats(int index) {
 		int cp = _screen->setCurPage(2);
 
 		if (index == _exchangeCharacterId)
-			_screen->printText(_characterGuiStringsSt[0], x2 + 2, y2 + 2, 8, _bkgColor_1);
+			_screen->printText(_characterGuiStringsSt[0], x2 + 2, y2 + 2, 8, guiSettings()->colors.fill);
 		else
-			_screen->printText(c->name, x2 + 2, y2 + 2, txtCol1, _bkgColor_1);
+			_screen->printText(c->name, x2 + 2, y2 + 2, txtCol1, guiSettings()->colors.fill);
 
 		gui_drawFaceShape(index);
 		gui_drawWeaponSlot(index, 0);
@@ -129,23 +129,23 @@ void EoBCoreEngine::gui_drawCharPortraitWithStats(int index) {
 		_screen->copyRegion(176, 0, 0, 0, 144, 168, 2, 2, Screen::CR_NO_P_CHECK);
 		_screen->_curPage = 2;
 		gui_drawFaceShape(index);
-		_screen->printShadedText(c->name, 219, 6, txtCol2, _bkgColor_1);
+		_screen->printShadedText(c->name, 219, 6, txtCol2, guiSettings()->colors.fill);
 		gui_drawHitpoints(index);
 		gui_drawFoodStatusGraph(index);
 
 		if (_currentControlMode == 1) {
 			if (c->hitPointsCur == -10)
-				_screen->printShadedText(_characterGuiStringsSt[1], 247, 158, 6, _color6);
+				_screen->printShadedText(_characterGuiStringsSt[1], 247, 158, 6, guiSettings()->colors.extraFill);
 			else if (c->hitPointsCur < 1)
-				_screen->printShadedText(_characterGuiStringsSt[2], 226, 158, 6, _color6);
+				_screen->printShadedText(_characterGuiStringsSt[2], 226, 158, 6, guiSettings()->colors.extraFill);
 			else if (c->effectFlags & (_flags.gameID == GI_EOB1 ? 0x80 : 0x2000))
-				_screen->printShadedText(_characterGuiStringsSt[3], 220, 158, 6, _color6);
+				_screen->printShadedText(_characterGuiStringsSt[3], 220, 158, 6, guiSettings()->colors.extraFill);
 			else if (c->flags & 2)
-				_screen->printShadedText(_characterGuiStringsSt[4], 235, 158, 6, _color6);
+				_screen->printShadedText(_characterGuiStringsSt[4], 235, 158, 6, guiSettings()->colors.extraFill);
 			else if (c->flags & 4)
-				_screen->printShadedText(_characterGuiStringsSt[5], 232, 158, 6, _color6);
+				_screen->printShadedText(_characterGuiStringsSt[5], 232, 158, 6, guiSettings()->colors.extraFill);
 			else if (c->flags & 8)
-				_screen->printShadedText(_characterGuiStringsSt[6], 232, 158, 6, _color6);
+				_screen->printShadedText(_characterGuiStringsSt[6], 232, 158, 6, guiSettings()->colors.extraFill);
 
 			for (int i = 0; i < 27; i++)
 				gui_drawInventoryItem(i, 0, 2);
@@ -158,38 +158,38 @@ void EoBCoreEngine::gui_drawCharPortraitWithStats(int index) {
 			static const uint16 cm2Y2[] = { 165, 165, 147 };
 
 			for (int i = 0; i < 3; i++)
-				_screen->fillRect(cm2X1[i], cm2Y1[i], cm2X2[i], cm2Y2[i], _color6);
+				_screen->fillRect(cm2X1[i], cm2Y1[i], cm2X2[i], cm2Y2[i], guiSettings()->colors.extraFill);
 
-			_screen->printShadedText(_characterGuiStringsIn[0], 183, 42, 15, _color6);
-			_screen->printText(_chargenClassStrings[c->cClass], 183, 55, 12, _color6);
-			_screen->printText(_chargenAlignmentStrings[c->alignment], 183, 62, 12, _color6);
-			_screen->printText(_chargenRaceSexStrings[c->raceSex], 183, 69, 12, _color6);
+			_screen->printShadedText(_characterGuiStringsIn[0], 183, 42, 15, guiSettings()->colors.extraFill);
+			_screen->printText(_chargenClassStrings[c->cClass], 183, 55, 12, guiSettings()->colors.extraFill);
+			_screen->printText(_chargenAlignmentStrings[c->alignment], 183, 62, 12, guiSettings()->colors.extraFill);
+			_screen->printText(_chargenRaceSexStrings[c->raceSex], 183, 69, 12, guiSettings()->colors.extraFill);
 
 			for (int i = 0; i < 6; i++)
-				_screen->printText(_chargenStatStrings[6 + i], 183, 82 + i * 7, 12, _color6);
+				_screen->printText(_chargenStatStrings[6 + i], 183, 82 + i * 7, 12, guiSettings()->colors.extraFill);
 
-			_screen->printText(_characterGuiStringsIn[1], 183, 124, 12, _color6);
-			_screen->printText(_characterGuiStringsIn[2], 239, 138, 12, _color6);
-			_screen->printText(_characterGuiStringsIn[3], 278, 138, 12, _color6);
+			_screen->printText(_characterGuiStringsIn[1], 183, 124, 12, guiSettings()->colors.extraFill);
+			_screen->printText(_characterGuiStringsIn[2], 239, 138, 12, guiSettings()->colors.extraFill);
+			_screen->printText(_characterGuiStringsIn[3], 278, 138, 12, guiSettings()->colors.extraFill);
 
-			_screen->printText(getCharStrength(c->strengthCur, c->strengthExtCur).c_str(), 275, 82, 15, _color6);
-			_screen->printText(Common::String::format("%d", c->intelligenceCur).c_str(), 275, 89, 15, _color6);
-			_screen->printText(Common::String::format("%d", c->wisdomCur).c_str(), 275, 96, 15, _color6);
-			_screen->printText(Common::String::format("%d", c->dexterityCur).c_str(), 275, 103, 15, _color6);
-			_screen->printText(Common::String::format("%d", c->constitutionCur).c_str(), 275, 110, 15, _color6);
-			_screen->printText(Common::String::format("%d", c->charismaCur).c_str(), 275, 117, 15, _color6);
-			_screen->printText(Common::String::format("%d", c->armorClass).c_str(), 275, 124, 15, _color6);
+			_screen->printText(getCharStrength(c->strengthCur, c->strengthExtCur).c_str(), 275, 82, 15, guiSettings()->colors.extraFill);
+			_screen->printText(Common::String::format("%d", c->intelligenceCur).c_str(), 275, 89, 15, guiSettings()->colors.extraFill);
+			_screen->printText(Common::String::format("%d", c->wisdomCur).c_str(), 275, 96, 15, guiSettings()->colors.extraFill);
+			_screen->printText(Common::String::format("%d", c->dexterityCur).c_str(), 275, 103, 15, guiSettings()->colors.extraFill);
+			_screen->printText(Common::String::format("%d", c->constitutionCur).c_str(), 275, 110, 15, guiSettings()->colors.extraFill);
+			_screen->printText(Common::String::format("%d", c->charismaCur).c_str(), 275, 117, 15, guiSettings()->colors.extraFill);
+			_screen->printText(Common::String::format("%d", c->armorClass).c_str(), 275, 124, 15, guiSettings()->colors.extraFill);
 
 			for (int i = 0; i < 3; i++) {
 				int t = getCharacterClassType(c->cClass, i);
 				if (t == -1)
 					continue;
 
-				_screen->printText(_chargenClassStrings[t + 15], 180, 145 + 7 * i, 12, _color6);
+				_screen->printText(_chargenClassStrings[t + 15], 180, 145 + 7 * i, 12, guiSettings()->colors.extraFill);
 				Common::String tmpStr = Common::String::format("%d", c->experience[i]);
-				_screen->printText(tmpStr.c_str(), 251 - tmpStr.size() * 3, 145 + 7 * i, 15, _color6);
+				_screen->printText(tmpStr.c_str(), 251 - tmpStr.size() * 3, 145 + 7 * i, 15, guiSettings()->colors.extraFill);
 				tmpStr = Common::String::format("%d", c->level[i]);
-				_screen->printText(tmpStr.c_str(), 286 - tmpStr.size() * 3, 145 + 7 * i, 15, _color6);
+				_screen->printText(tmpStr.c_str(), 286 - tmpStr.size() * 3, 145 + 7 * i, 15, guiSettings()->colors.extraFill);
 			}
 		}
 
@@ -272,7 +272,7 @@ void EoBCoreEngine::gui_drawWeaponSlot(int charIndex, int slot) {
 		x += 176;
 
 	int itm = _characters[charIndex].inventory[slot];
-	gui_drawBox(x, y, 31, 16, _color1_1, _color2_1, _bkgColor_1);
+	gui_drawBox(x, y, 31, 16, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
 
 	if (_characters[charIndex].slotStatus[slot]) {
 		gui_drawWeaponSlotStatus(x, y, _characters[charIndex].slotStatus[slot]);
@@ -297,7 +297,7 @@ void EoBCoreEngine::gui_drawWeaponSlotStatus(int x, int y, int status) {
 	if (status > -3 || status == -5)
 		_screen->drawShape(_screen->_curPage, _greenSplatShape, x - 1, y, 0);
 	else
-		gui_drawBox(x, y, 31, 16, _color9, _color10, _color11);
+		gui_drawBox(x, y, 31, 16, guiSettings()->colors.warningFrame1, guiSettings()->colors.warningFrame2, guiSettings()->colors.warningFill);
 
 	switch (status + 5) {
 	case 0:
@@ -369,7 +369,7 @@ void EoBCoreEngine::gui_drawHitpoints(int index) {
 			_screen->printText(_characterGuiStringsHp[0], x - 13, y - 1, 12, 0);
 
 
-		gui_drawHorizontalBarGraph(x, y, w, h, bgCur, bgMax, barColor[col], _color5);
+		gui_drawHorizontalBarGraph(x, y, w, h, bgCur, bgMax, barColor[col], guiSettings()->colors.barGraph);
 
 	} else {
 		Common::String tmpString = Common::String::format(_characterGuiStringsHp[1], c->hitPointsCur, c->hitPointsMax);
@@ -379,7 +379,7 @@ void EoBCoreEngine::gui_drawHitpoints(int index) {
 			y -= 1;
 		}
 
-		_screen->printText(tmpString.c_str(), x, y, 12, _bkgColor_1);
+		_screen->printText(tmpString.c_str(), x, y, 12, guiSettings()->colors.fill);
 	}
 }
 
@@ -398,11 +398,11 @@ void EoBCoreEngine::gui_drawFoodStatusGraph(int index) {
 		return;
 
 	uint8 col = c->food < 20 ? 8 : (c->food < 33 ? 5 : 3);
-	gui_drawHorizontalBarGraph(250, 25, 51, 5, c->food, 100, col, _color5);
+	gui_drawHorizontalBarGraph(250, 25, 51, 5, c->food, 100, col, guiSettings()->colors.barGraph);
 }
 
 void EoBCoreEngine::gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32 curVal, int32 maxVal, int col1, int col2) {
-	gui_drawBox(x - 1, y - 1, w + 3, h + 2, _color2_1, _color1_1, -1);
+	gui_drawBox(x - 1, y - 1, w + 3, h + 2, guiSettings()->colors.frame2, guiSettings()->colors.frame1, -1);
 	KyraRpgEngine::gui_drawHorizontalBarGraph(x, y, w + 2, h, curVal, maxVal, col1, col2);
 }
 
@@ -464,8 +464,8 @@ void EoBCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
 		}
 
 	} else {
-		_screen->drawClippedLine(x, y, x + 62, y, _color1_1);
-		_screen->drawClippedLine(x, y + 49, x + 62, y + 49, _color2_1);
+		_screen->drawClippedLine(x, y, x + 62, y, guiSettings()->colors.frame1);
+		_screen->drawClippedLine(x, y + 49, x + 62, y + 49, guiSettings()->colors.frame2);
 		_screen->drawClippedLine(x - 1, y, x - 1, y + 50, 12);
 		_screen->drawClippedLine(x + 63, y, x + 63, y + 50, 12);
 	}
@@ -480,7 +480,7 @@ void EoBCoreEngine::gui_drawInventoryItem(int slot, int special, int pageNum) {
 
 	if (special) {
 		int wh = (slot == 25 || slot == 26) ? 10 : 18;
-		gui_drawBox(x - 1, y - 1, wh, wh, _color1_1, _color2_1, slot == 16 ? -1 : _bkgColor_1);
+		gui_drawBox(x - 1, y - 1, wh, wh, guiSettings()->colors.frame1, guiSettings()->colors.frame2, slot == 16 ? -1 : guiSettings()->colors.fill);
 
 		if (slot == 16) {
 			_screen->fillRect(227, 65, 238, 69, 12);
@@ -517,7 +517,7 @@ void EoBCoreEngine::gui_drawCompass(bool force) {
 }
 
 void EoBCoreEngine::gui_drawDialogueBox() {
-	gui_drawBox(0, 121, 320, 79, _color1_1, _color2_1, _bkgColor_1);
+	gui_drawBox(0, 121, 320, 79, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
 	txt()->clearCurDim();
 }
 
@@ -527,14 +527,14 @@ void EoBCoreEngine::gui_drawSpellbook() {
 	_screen->copyRegion(64, 121, 64, 121, 112, 56, 0, 2, Screen::CR_NO_P_CHECK);
 
 	for (int i = 0; i < numTab; i++) {
-		int col1 = _color14;
-		int col2 = _color13;
-		int col3 = _color12;
+		int col1 = guiSettings()->colors.inactiveTabFrame1;
+		int col2 = guiSettings()->colors.inactiveTabFrame2;
+		int col3 = guiSettings()->colors.inactiveTabFill;
 
 		if (i == _openBookSpellLevel) {
-			col1 =  _color1_1;
-			col2 =  _color2_1;
-			col3 =  _bkgColor_1;
+			col1 =  guiSettings()->colors.frame1;
+			col2 =  guiSettings()->colors.frame2;
+			col3 =  guiSettings()->colors.fill;
 		}
 
 		if (_flags.gameID == GI_EOB1) {
@@ -547,12 +547,12 @@ void EoBCoreEngine::gui_drawSpellbook() {
 	}
 
 	if (_flags.gameID == GI_EOB1)
-		gui_drawBox(71, 131, 105, 44, _color1_1, _color2_1, _bkgColor_1);
+		gui_drawBox(71, 131, 105, 44, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
 	else {
-		gui_drawBox(68, 130, 108, 47, _color1_1, _color2_1, _bkgColor_1);
-		gui_drawBox(68, 168, 78, 9, _color8, _color7, _color6);
-		gui_drawBox(146, 168, 14, 9, _color8, _color7, _color6);
-		gui_drawBox(160, 168, 16, 9, _color8, _color7, _color6);
+		gui_drawBox(68, 130, 108, 47, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
+		gui_drawBox(68, 168, 78, 9, guiSettings()->colors.extraFrame1, guiSettings()->colors.extraFrame2, guiSettings()->colors.extraFill);
+		gui_drawBox(146, 168, 14, 9, guiSettings()->colors.extraFrame1, guiSettings()->colors.extraFrame2, guiSettings()->colors.extraFill);
+		gui_drawBox(160, 168, 16, 9, guiSettings()->colors.extraFrame1, guiSettings()->colors.extraFrame2, guiSettings()->colors.extraFill);
 		gui_drawSpellbookScrollArrow(150, 169, 0);
 		gui_drawSpellbookScrollArrow(165, 169, 1);
 	}
@@ -562,14 +562,14 @@ void EoBCoreEngine::gui_drawSpellbook() {
 	int textXa = 74;
 	int textXs = 71;
 	int textY = 170;
-	int col3 = _bkgColor_1;
-	int col4 = _color6;
+	int col3 = guiSettings()->colors.fill;
+	int col4 = guiSettings()->colors.extraFill;
 
 	if (_flags.gameID == GI_EOB1) {
 		textCol2 = 11;
 		textXa = textXs = 73;
 		textY = 168;
-		col4 = _bkgColor_1;
+		col4 = guiSettings()->colors.fill;
 	}
 
 	for (int i = 0; i < 7; i++) {
@@ -2377,7 +2377,7 @@ void GUI_EoB::messageDialogue2(int dim, int id, int buttonTextCol) {
 		}
 	}
 
-	_vm->gui_drawBox(x, y, w, 14, _vm->_color2_1, _vm->_bkgColor_1, -1);
+	_vm->gui_drawBox(x, y, w, 14, _vm->guiSettings()->colors.frame2, _vm->guiSettings()->colors.fill, -1);
 	_screen->updateScreen();
 	_vm->_system->delayMillis(80);
 	drawMenuButtonBox(x, y, w, 14, false, false);
@@ -2657,7 +2657,7 @@ bool GUI_EoB::runSaveMenu(int x, int y) {
 			int fy = y + slot * 17 + 23;
 
 			for (int in = -1; in == -1 && !_vm->shouldQuit();) {
-				_screen->fillRect(fx - 2, fy, fx + 160, fy + 8, _vm->_bkgColor_1);
+				_screen->fillRect(fx - 2, fy, fx + 160, fy + 8, _vm->guiSettings()->colors.fill);
 				in = getTextInput(_saveSlotStringsTemp[slot], x + 1, fy, 19, 2, 0, 8);
 				if (!strlen(_saveSlotStringsTemp[slot])) {
 					messageDialogue(11, 54, 6);
@@ -2665,7 +2665,7 @@ bool GUI_EoB::runSaveMenu(int x, int y) {
 				}
 			};
 
-			_screen->fillRect(fx - 2, fy, fx + 160, fy + 8, _vm->_bkgColor_1);
+			_screen->fillRect(fx - 2, fy, fx + 160, fy + 8, _vm->guiSettings()->colors.fill);
 			_screen->printShadedText(_saveSlotStringsTemp[slot], (x + 1) << 3, fy, 15, 0);
 
 			Graphics::Surface thumb;
@@ -2778,7 +2778,7 @@ int GUI_EoB::selectSaveSlotDialogue(int x, int y, int id) {
 			// Display highlighted slot index in the bottom left corner to avoid people getting lost with the 990 save slots
 			_screen->setFont(Screen::FID_6_FNT);
 			int sli = (newHighlight == 6) ?  _savegameOffset : (_savegameOffset + newHighlight);
-			_screen->printText(Common::String::format("%03d/989", sli).c_str(), _saveSlotX + 5, _saveSlotY + 135, _vm->_color2_1, _vm->_bkgColor_1);
+			_screen->printText(Common::String::format("%03d/989", sli).c_str(), _saveSlotX + 5, _saveSlotY + 135, _vm->guiSettings()->colors.frame2, _vm->guiSettings()->colors.fill);
 			_screen->setFont(Screen::FID_8_FNT);
 
 			_screen->updateScreen();
@@ -2937,7 +2937,7 @@ void GUI_EoB::runMemorizePrayMenu(int charIndex, int spellType) {
 
 		if (updateDesc) {
 			updateDesc = false;
-			_screen->printShadedText(Common::String::format(_vm->_menuStringsMgc[1], np[lastHighLightButton] - numAssignedSpellsPerBookPage[lastHighLightButton], np[lastHighLightButton]).c_str(), 8, 38, 9, _vm->_bkgColor_1);
+			_screen->printShadedText(Common::String::format(_vm->_menuStringsMgc[1], np[lastHighLightButton] - numAssignedSpellsPerBookPage[lastHighLightButton], np[lastHighLightButton]).c_str(), 8, 38, 9, _vm->guiSettings()->colors.fill);
 		}
 
 		if (newHighLightText < 0)
@@ -3721,7 +3721,7 @@ Button *GUI_EoB::initMenu(int id) {
 
 	if (m->dim) {
 		const ScreenDim *dm = _screen->getScreenDim(m->dim);
-		_screen->fillRect(dm->sx << 3, dm->sy, ((dm->sx + dm->w) << 3) - 1, (dm->sy + dm->h) - 1, _vm->_bkgColor_1);
+		_screen->fillRect(dm->sx << 3, dm->sy, ((dm->sx + dm->w) << 3) - 1, (dm->sy + dm->h) - 1, _vm->guiSettings()->colors.fill);
 		_screen->setScreenDim(m->dim);
 		drawMenuButtonBox(dm->sx << 3, dm->sy, dm->w << 3, dm->h, false, false);
 	}
@@ -3789,14 +3789,14 @@ void GUI_EoB::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFil
 }
 
 void GUI_EoB::drawMenuButtonBox(int x, int y, int w, int h, bool clicked, bool noFill) {
-	uint8 col1 = _vm->_color1_1;
-	uint8 col2 = _vm->_color2_1;
+	uint8 col1 = _vm->guiSettings()->colors.frame1;
+	uint8 col2 = _vm->guiSettings()->colors.frame2;
 
 	if (clicked)
-		col1 = col2 = _vm->_bkgColor_1;
+		col1 = col2 = _vm->guiSettings()->colors.fill;
 
 	_vm->gui_drawBox(x, y, w, h, col1, col2, -1);
-	_vm->gui_drawBox(x + 1, y + 1, w - 2, h - 2, _vm->_color1_1, _vm->_color2_1, noFill ? -1 : _vm->_bkgColor_1);
+	_vm->gui_drawBox(x + 1, y + 1, w - 2, h - 2, _vm->guiSettings()->colors.frame1, _vm->guiSettings()->colors.frame2, noFill ? -1 : _vm->guiSettings()->colors.fill);
 }
 
 void GUI_EoB::drawTextBox(int dim, int id) {
@@ -3852,10 +3852,10 @@ void GUI_EoB::memorizePrayMenuPrintString(int spellId, int bookPageIndex, int sp
 		if (noFill)
 			_screen->printText(s.c_str(), 8, y, highLight ? 6 : 15, 0);
 		else
-			_screen->printShadedText(s.c_str(), 8, y, highLight ? 6 : 15, _vm->_bkgColor_1);
+			_screen->printShadedText(s.c_str(), 8, y, highLight ? 6 : 15, _vm->guiSettings()->colors.fill);
 
 	} else {
-		_screen->fillRect(6, y, 168, y + 8,  _vm->_bkgColor_1);
+		_screen->fillRect(6, y, 168, y + 8,  _vm->guiSettings()->colors.fill);
 	}
 }
 
@@ -4000,7 +4000,7 @@ void GUI_EoB::restParty_updateRestTime(int hours, bool init) {
 	}
 
 	_screen->setCurPage(2);
-	_screen->printShadedText(Common::String::format(_vm->_menuStringsRest2[3], hours).c_str(), (_screen->_curDim->sx + 1) << 3, _screen->_curDim->sy + 20, 15, _vm->_bkgColor_1);
+	_screen->printShadedText(Common::String::format(_vm->_menuStringsRest2[3], hours).c_str(), (_screen->_curDim->sx + 1) << 3, _screen->_curDim->sy + 20, 15, _vm->guiSettings()->colors.fill);
 	_screen->setCurPage(0);
 	_screen->copyRegion(((_screen->_curDim->sx + 1) << 3) - 1, _screen->_curDim->sy + 20, ((_screen->_curDim->sx + 1) << 3) - 1, _screen->_curDim->sy + 20, 144, 8, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp
index 92aa12bc7a..4487290bf9 100644
--- a/engines/kyra/kyra_rpg.cpp
+++ b/engines/kyra/kyra_rpg.cpp
@@ -103,15 +103,6 @@ KyraRpgEngine::KyraRpgEngine(OSystem *system, const GameFlags &flags) : KyraEngi
 	_dialogueNumButtons = _dialogueButtonYoffs = _dialogueHighlightedButton = 0;
 	_currentControlMode = 0;
 	_specialSceneFlag = 0;
-	_dialogueButtonLabelCol1 = 0;
-	_dialogueButtonLabelCol2 = 0;
-	_dialogueButtonW = 0;
-	_dialogueButtonH = 0;
-	_waitButtonPresX = 0;
-	_waitButtonPresY = 0;
-	_waitButtonPresW = 0;
-	_waitButtonReverveW = 0;
-
 	_updateCharNum = -1;
 	_activeVoiceFileTotalTime = 0;
 	_updatePortraitSpeechAnimDuration = _resetPortraitAfterSpeechAnim = _needSceneRestore = 0;
@@ -193,6 +184,10 @@ Common::Error KyraRpgEngine::init() {
 
 	_envSfxDistThreshold = (_sound->getSfxType() == Sound::kAdLib || _sound->getSfxType() == Sound::kPCSpkr) ? 15 : 3;
 
+	_dialogueButtonLabelColor1 = guiSettings()->buttons.labelColor1;
+	_dialogueButtonLabelColor2 = guiSettings()->buttons.labelColor2;
+	_dialogueButtonWidth = guiSettings()->buttons.width;
+
 	return Common::kNoError;
 }
 
@@ -213,9 +208,9 @@ void KyraRpgEngine::drawDialogueButtons() {
 			screen()->printText(_dialogueButtonString[i], (x + 37 - (screen()->getTextWidth(_dialogueButtonString[i])) / 2) & ~3,
 				((_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2) & ~7, _dialogueHighlightedButton == i ? 0xc1 : 0xe1, 0);
 		} else {
-			gui_drawBox(x, (_dialogueButtonYoffs + _dialogueButtonPosY[i]), _dialogueButtonW, _dialogueButtonH, _color1_1, _color2_1, _bkgColor_1);
-			screen()->printText(_dialogueButtonString[i], x + (_dialogueButtonW >> 1) - (screen()->getTextWidth(_dialogueButtonString[i])) / 2,
-				(_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2, _dialogueHighlightedButton == i ? _dialogueButtonLabelCol1 : _dialogueButtonLabelCol2, 0);
+			gui_drawBox(x, (_dialogueButtonYoffs + _dialogueButtonPosY[i]), _dialogueButtonWidth, guiSettings()->buttons.height, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
+			screen()->printText(_dialogueButtonString[i], x + (_dialogueButtonWidth >> 1) - (screen()->getTextWidth(_dialogueButtonString[i])) / 2,
+				(_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2, _dialogueHighlightedButton == i ? _dialogueButtonLabelColor1 : _dialogueButtonLabelColor2, 0);
 		}
 	}
 	screen()->setFont(of);
@@ -230,7 +225,7 @@ uint16 KyraRpgEngine::processDialogue() {
 		int x = _dialogueButtonPosX[i];
 		int y = (gameFlags().use16ColorMode ? ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1 : (_dialogueButtonYoffs + _dialogueButtonPosY[i]));
 		Common::Point p = getMousePos();
-		if (posWithinRect(p.x, p.y, x, y, x + _dialogueButtonW, y + _dialogueButtonH)) {
+		if (posWithinRect(p.x, p.y, x, y, x + _dialogueButtonWidth, y + guiSettings()->buttons.height)) {
 			_dialogueHighlightedButton = i;
 			break;
 		}
@@ -266,7 +261,7 @@ uint16 KyraRpgEngine::processDialogue() {
 				int x = _dialogueButtonPosX[i];
 				int y = (gameFlags().use16ColorMode ? ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1 : (_dialogueButtonYoffs + _dialogueButtonPosY[i]));
 				Common::Point p = getMousePos();
-				if (posWithinRect(p.x, p.y, x, y, x + _dialogueButtonW, y + _dialogueButtonH)) {
+				if (posWithinRect(p.x, p.y, x, y, x + _dialogueButtonWidth, y + guiSettings()->buttons.height)) {
 					_dialogueHighlightedButton = i;
 					res = _dialogueHighlightedButton + 1;
 					break;
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index 678f8120b5..24c19105d9 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -80,6 +80,40 @@ struct EoBFlyingObject {
 	uint8 unused;
 };
 
+struct KyraRpgGUISettings {
+	struct DialogueButtons {
+		uint8 labelColor1;
+		uint8 labelColor2;
+		uint16 width;
+		uint16 height;
+		int waitReserve;
+		const uint16 waitX[2];
+		const uint8 waitY[2];
+		const uint16 waitWidth[2];
+	} buttons;
+
+	struct Colors {
+		uint8 frame1;
+		uint8 frame2;
+		int fill;
+
+		uint8 unused;
+		uint8 barGraph;
+
+		uint8 warningFrame1;
+		uint8 warningFrame2;
+		int warningFill;
+
+		uint8 extraFrame1;
+		uint8 extraFrame2;
+		int extraFill;
+
+		uint8 inactiveTabFrame1;
+		uint8 inactiveTabFrame2;
+		int inactiveTabFill;
+	} colors;
+};
+
 class KyraRpgEngine : public KyraEngine_v1 {
 friend class TextDisplayer_rpg;
 public:
@@ -251,6 +285,8 @@ protected:
 
 	bool clickedShape(int shapeIndex);
 
+	virtual const KyraRpgGUISettings *guiSettings() = 0;
+
 	int _clickedShapeXOffs;
 	int _clickedShapeYOffs;
 
@@ -283,22 +319,13 @@ protected:
 	const uint16 *_dialogueButtonPosX;
 	const uint8 *_dialogueButtonPosY;
 	int16 _dialogueButtonYoffs;
-	uint16 _dialogueButtonW;
-	uint16 _dialogueButtonH;
-	const uint16 *_waitButtonPresX;
-	const uint8 *_waitButtonPresY;
-	const uint16 *_waitButtonPresW;
-	int _waitButtonReverveW;
+	uint16 _dialogueButtonWidth;
 	int _dialogueNumButtons;
 	int _dialogueHighlightedButton;
 	int _currentControlMode;
 	int _specialSceneFlag;
-	uint8 _dialogueButtonLabelCol1;
-	uint8 _dialogueButtonLabelCol2;
-
-	int _bkgColor_1;
-	uint8 _color1_1;
-	uint8 _color2_1;
+	uint8 _dialogueButtonLabelColor1;
+	uint8 _dialogueButtonLabelColor2;
 
 	const char *const *_moreStrings;
 
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 01b1bdf065..a57fe4fdb8 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -380,18 +380,8 @@ Common::Error LoLEngine::init() {
 	assert(_gui);
 	_gui->initStaticData();
 
-	_dialogueButtonLabelCol1 = 144;
-	_dialogueButtonLabelCol2 = 254;
-	_dialogueButtonW = 74;
-	_dialogueButtonH = 9;
-	_waitButtonReverveW = 80;
-
 	_txt = new TextDisplayer_LoL(this, _screen);
 
-	_bkgColor_1 = -1;
-	_color1_1 = 136;
-	_color2_1 = 251;
-
 	_screen->setAnimBlockPtr(10000);
 	_screen->setScreenDim(0);
 
@@ -1941,7 +1931,7 @@ void LoLEngine::setupDialogueButtons(int numStr, const char *s1, const char *s2,
 		_dialogueButtonPosY = posY;
 
 		if (numStr == 1) {
-			posX[0] = posX[1] = posX[2] = d->sx + d->w - (_dialogueButtonW + 3);
+			posX[0] = posX[1] = posX[2] = d->sx + d->w - (_dialogueButtonWidth + 3);
 		} else {
 			int xOffs = d->w / numStr;
 			posX[0] = d->sx + (xOffs >> 1) - 37;
@@ -1989,6 +1979,10 @@ void LoLEngine::delay(uint32 millis, bool doUpdate, bool) {
 	}
 }
 
+const KyraRpgGUISettings *LoLEngine::guiSettings() {
+	return &_guiSettings;
+}
+
 // spells
 
 int LoLEngine::castSpell(int charNum, int spellType, int spellLevel) {
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index eeaa1b51ad..c6d05c45d1 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -1149,6 +1149,8 @@ private:
 	// misc
 	void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false);
 
+	const KyraRpgGUISettings *guiSettings();
+
 	uint8 _compassBroken;
 	uint8 _drainMagic;
 	uint16 _globalScriptVars2[8];
@@ -1156,6 +1158,8 @@ private:
 	uint8 *_pageBuffer1;
 	uint8 *_pageBuffer2;
 
+	static const KyraRpgGUISettings _guiSettings;
+
 	// spells
 	typedef Common::Functor1Mem<ActiveSpell *, int, LoLEngine> SpellProc;
 	Common::Array<const SpellProc*> _spellProcs;
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index 8fdd8680b1..2d8e85471b 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -166,7 +166,7 @@ void EoBEngine::seq_playFinale() {
 	_txt->resetPageBreakString();
 	_txt->setWaitButtonMode(1);
 	_txt->setupField(12, true);
-	gui_drawBox(0, 0, 176, 175, _color1_1, _color2_1, _bkgColor_1);
+	gui_drawBox(0, 0, 176, 175, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
 	_txt->printDialogueText(51, _moreStrings[0]);
 
 	if (!checkScriptFlags(0x1ffe)) {
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index d51bf4eee3..ce43d22362 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -1190,6 +1190,11 @@ void EoBEngine::initSpells() {
 	}
 }
 
+const KyraRpgGUISettings EoBEngine::_guiSettings = {
+	{ 9, 15, 95, 9, 7, { 285, 139 }, { 189, 162 }, { 31, 31 } },
+	{ 135, 130, 132, 133, 133, 17, 23, 20, 184, 177, 180, 184, 177, 180	}
+};
+
 void DarkMoonEngine::initStaticResource() {
 	int temp;
 	_mainMenuStrings = _staticres->loadStrings(kEoB2MainMenuStrings, temp);
@@ -1312,6 +1317,11 @@ const char *DarkMoonEngine::_palFilesFinale[] = {
 	0
 };
 
+const KyraRpgGUISettings DarkMoonEngine::_guiSettings = {
+	{ 9, 15, 95, 9, 7, { 221, 76 }, { 189, 162 }, { 95, 95 } },
+	{ 186, 181, 183, 133, 184, 17, 23, 20, 186, 181, 183, 182, 177, 180 }
+};
+
 #endif // ENABLE_EOB
 
 } // End of namespace Kyra
diff --git a/engines/kyra/staticres_lol.cpp b/engines/kyra/staticres_lol.cpp
index 3faef7b981..deb6355384 100644
--- a/engines/kyra/staticres_lol.cpp
+++ b/engines/kyra/staticres_lol.cpp
@@ -764,6 +764,11 @@ const int8 LoLEngine::_mapCoords[12][4] = {
 	{  3,  1,  3,  1 }, { -1,  6, -1, -8 }, { -7, -1,  5, -1 }
 };
 
+const KyraRpgGUISettings LoLEngine::_guiSettings = {
+	{ 144, 254, 74, 9, 80, { 0, 0 }, { 0, 0 }, { 0, 0 } },
+	{ 136, 251, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+};
+
 const MistOfDoomAnimData LoLEngine::_mistAnimData[] = {
 	{  0,   7,   7,  13, 155 },
 	{  0,  16,  16,  17, 155 },
diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text_rpg.cpp
index 78206d3a06..a78adb93d9 100644
--- a/engines/kyra/text_rpg.cpp
+++ b/engines/kyra/text_rpg.cpp
@@ -73,7 +73,7 @@ TextDisplayer_rpg::~TextDisplayer_rpg() {
 void TextDisplayer_rpg::setupField(int dim, bool mode) {
 	setPageBreakFlag();
 
-	_textDimData[dim].color2 = _vm->_bkgColor_1;
+	_textDimData[dim].color2 = _vm->guiSettings()->colors.fill;
 	_screen->setScreenDim(dim);
 
 	if (mode)
@@ -335,13 +335,13 @@ void TextDisplayer_rpg::printLine(char *str) {
 		if ((lw + _textDimData[sdx].column) > w) {
 			if ((lines - 1 - (_waitButtonSpace << 1)) <= _lineCount)
 				// cut off line to leave space for "MORE" button
-				w -= vm()->_waitButtonReverveW;
+				w -= vm()->guiSettings()->buttons.waitReserve;
 		} else {
 			if (!_sjisLineBreakFlag || (_lineCount + 1 < lines - 1))
 				ct = false;
 			else
 				// cut off line to leave space for "MORE" button
-				w -= vm()->_waitButtonReverveW;
+				w -= vm()->guiSettings()->buttons.waitReserve;
 		}
 
 		if (ct) {
@@ -363,7 +363,7 @@ void TextDisplayer_rpg::printLine(char *str) {
 		if ((lw + _textDimData[sdx].column) > w) {
 			if ((lines - 1) <= _lineCount && _allowPageBreak)
 				// cut off line to leave space for "MORE" button
-				w -= vm()->_waitButtonReverveW;
+				w -= vm()->guiSettings()->buttons.waitReserve;
 
 			w -= _textDimData[sdx].column;
 
@@ -510,7 +510,7 @@ int TextDisplayer_rpg::clearDim(int dim) {
 	int res = _screen->curDimIndex();
 	_screen->setScreenDim(dim);
 	_textDimData[dim].color1 = _screen->_curDim->unk8;
-	_textDimData[dim].color2 = vm()->game() == GI_LOL ? _screen->_curDim->unkA : vm()->_bkgColor_1;
+	_textDimData[dim].color2 = vm()->game() == GI_LOL ? _screen->_curDim->unkA : vm()->guiSettings()->colors.fill;
 	clearCurDim();
 	return res;
 }
@@ -529,7 +529,7 @@ void TextDisplayer_rpg::clearCurDim() {
 
 void TextDisplayer_rpg::textPageBreak() {
 	if (vm()->game() != GI_LOL)
-		SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
+		SWAP(vm()->_dialogueButtonLabelColor1, vm()->_dialogueButtonLabelColor2);
 
 	int cp = _screen->setCurPage(0);
 	Screen::FontId cf = _screen->setFont(vm()->gameFlags().use16ColorMode ? Screen::FID_SJIS_FNT : Screen::FID_6_FNT);
@@ -555,9 +555,9 @@ void TextDisplayer_rpg::textPageBreak() {
 
 	const ScreenDim *dim = _screen->getScreenDim(_screen->curDimIndex());
 
-	int x = ((dim->sx + dim->w) << 3) - (_vm->_dialogueButtonW + 3);
+	int x = ((dim->sx + dim->w) << 3) - (_vm->_dialogueButtonWidth + 3);
 	int y = 0;
-	int w = vm()->_dialogueButtonW;
+	int w = vm()->_dialogueButtonWidth;
 
 	if (vm()->game() == GI_LOL) {
 		if (vm()->_needSceneRestore && (vm()->_updateFlags & 2)) {
@@ -571,17 +571,17 @@ void TextDisplayer_rpg::textPageBreak() {
 			y = dim->sy + dim->h - 10;
 		}
 	} else {
-		y = vm()->_waitButtonPresY[_waitButtonMode];
-		x = vm()->_waitButtonPresX[_waitButtonMode];
-		w = vm()->_waitButtonPresW[_waitButtonMode];
+		y = vm()->guiSettings()->buttons.waitY[_waitButtonMode];
+		x = vm()->guiSettings()->buttons.waitX[_waitButtonMode];
+		w = vm()->guiSettings()->buttons.waitWidth[_waitButtonMode];
 	}
 
 	if (vm()->gameFlags().use16ColorMode) {
 		vm()->gui_drawBox(x + 8, (y & ~7) - 1, 66, 10, 0xee, 0xcc, -1);
 		_screen->printText(_pageBreakString, (x + 37 - (strlen(_pageBreakString) << 1) + 4) & ~3, (y + 2) & ~7, 0xc1, 0);
 	} else {
-		vm()->gui_drawBox(x, y, w, vm()->_dialogueButtonH, vm()->_color1_1, vm()->_color2_1, vm()->_bkgColor_1);
-		_screen->printText(_pageBreakString, x + (w >> 1) - (vm()->screen()->getTextWidth(_pageBreakString) >> 1), y + 2, vm()->_dialogueButtonLabelCol1, 0);
+		vm()->gui_drawBox(x, y, w, vm()->guiSettings()->buttons.height, vm()->guiSettings()->colors.frame1, vm()->guiSettings()->colors.frame2, vm()->guiSettings()->colors.fill);
+		_screen->printText(_pageBreakString, x + (w >> 1) - (vm()->screen()->getTextWidth(_pageBreakString) >> 1), y + 2, vm()->_dialogueButtonLabelColor1, 0);
 	}
 
 	vm()->removeInputTop();
@@ -650,7 +650,7 @@ void TextDisplayer_rpg::textPageBreak() {
 	_screen->setCurPage(cp);
 
 	if (vm()->game() != GI_LOL)
-		SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
+		SWAP(vm()->_dialogueButtonLabelColor1, vm()->_dialogueButtonLabelColor2);
 
 	vm()->removeInputTop();
 }
@@ -662,12 +662,12 @@ void TextDisplayer_rpg::displayWaitButton() {
 	vm()->_dialogueButtonString[2] = 0;
 	vm()->_dialogueHighlightedButton = 0;
 
-	vm()->_dialogueButtonPosX = &vm()->_waitButtonPresX[_waitButtonMode];
-	vm()->_dialogueButtonPosY = &vm()->_waitButtonPresY[_waitButtonMode];
-	vm()->_dialogueButtonW = vm()->_waitButtonPresW[_waitButtonMode];
+	vm()->_dialogueButtonPosX = &vm()->guiSettings()->buttons.waitX[_waitButtonMode];
+	vm()->_dialogueButtonPosY = &vm()->guiSettings()->buttons.waitY[_waitButtonMode];
+	vm()->_dialogueButtonWidth = vm()->guiSettings()->buttons.waitWidth[_waitButtonMode];
 	vm()->_dialogueButtonYoffs = 0;
 
-	SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
+	SWAP(vm()->_dialogueButtonLabelColor1, vm()->_dialogueButtonLabelColor2);
 	vm()->drawDialogueButtons();
 
 	if (!vm()->shouldQuit())
@@ -675,10 +675,10 @@ void TextDisplayer_rpg::displayWaitButton() {
 
 	while (!vm()->processDialogue() && !vm()->shouldQuit()) {}
 
-	_screen->fillRect(vm()->_dialogueButtonPosX[0], vm()->_dialogueButtonPosY[0], vm()->_dialogueButtonPosX[0] + vm()->_dialogueButtonW - 1, vm()->_dialogueButtonPosY[0] + vm()->_dialogueButtonH - 1, vm()->_bkgColor_1);
+	_screen->fillRect(vm()->_dialogueButtonPosX[0], vm()->_dialogueButtonPosY[0], vm()->_dialogueButtonPosX[0] + vm()->_dialogueButtonWidth - 1, vm()->_dialogueButtonPosY[0] + vm()->guiSettings()->buttons.height - 1, vm()->guiSettings()->colors.fill);
 	_screen->updateScreen();
-	vm()->_dialogueButtonW = 95;
-	SWAP(vm()->_dialogueButtonLabelCol1, vm()->_dialogueButtonLabelCol2);
+	vm()->_dialogueButtonWidth = 95;
+	SWAP(vm()->_dialogueButtonLabelColor1, vm()->_dialogueButtonLabelColor2);
 	clearCurDim();
 }
 
-- 
cgit v1.2.3


From e6b6099d54c05a95530125e95da69a90aff4863d Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 27 Dec 2011 20:57:58 +0100
Subject: KYRA: (EOB) - fix minor color glitch

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

(limited to 'engines')

diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 1ccb60ada1..a80ef03201 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -464,8 +464,8 @@ void EoBCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
 		}
 
 	} else {
-		_screen->drawClippedLine(x, y, x + 62, y, guiSettings()->colors.frame1);
-		_screen->drawClippedLine(x, y + 49, x + 62, y + 49, guiSettings()->colors.frame2);
+		_screen->drawClippedLine(x, y, x + 62, y, guiSettings()->colors.frame2);
+		_screen->drawClippedLine(x, y + 49, x + 62, y + 49, guiSettings()->colors.frame1);
 		_screen->drawClippedLine(x - 1, y, x - 1, y + 50, 12);
 		_screen->drawClippedLine(x + 63, y, x + 63, y + 50, 12);
 	}
-- 
cgit v1.2.3


From a35550d200a9e19894571758afe992185c6c6176 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 27 Dec 2011 21:50:07 +0100
Subject: KYRA: (EOB) - fix invalid string access in EOB 1

(when entering the memorize/pray menu without having a mage/cleric)
---
 engines/kyra/eobcommon.cpp | 3 +++
 engines/kyra/gui_eob.cpp   | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index bc01fead6b..304d1a4539 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -1059,6 +1059,9 @@ int EoBCoreEngine::countCharactersWithSpecificItems(int16 itemType, int16 itemVa
 }
 
 int EoBCoreEngine::checkInventoryForItem(int character, int16 itemType, int16 itemValue) {
+	if (character < 0 )
+		return -1;
+
 	for (int i = 0; i < 27; i++) {
 		uint16 inv = _characters[character].inventory[i];
 		if (!inv)
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index a80ef03201..512c13a977 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -3543,7 +3543,7 @@ int GUI_EoB::selectCharacterDialogue(int id) {
 	_vm->removeInputTop();
 
 	_charSelectRedraw = false;
-	bool abort = false;
+	bool starvedUnconscious = false;
 	int count = 0;
 	int result = -1;
 	int found[6];
@@ -3558,7 +3558,7 @@ int GUI_EoB::selectCharacterDialogue(int id) {
 			continue;
 
 		if (id != 53 && (!_vm->_characters[i].food || !_vm->testCharacter(i, 4))) {
-			abort = true;
+			starvedUnconscious = true;
 		} else {
 			found[i] = 0;
 			result = i;
@@ -3569,9 +3569,9 @@ int GUI_EoB::selectCharacterDialogue(int id) {
 	if (!count) {
 		int eid = 0;
 		if (id == 23)
-			eid = abort ? 28 : 72;
+			eid = (starvedUnconscious || _vm->game() == GI_EOB1) ? 28 : 72;
 		else if (id == 26)
-			eid = abort ? 27 : 73;
+			eid = (starvedUnconscious || _vm->game() == GI_EOB1) ? 27 : 73;
 		else if (id == 49)
 			eid = 52;
 
-- 
cgit v1.2.3


From 99b14c5dbc9414b46afffabafb4be9c9c4c51fd1 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 27 Dec 2011 23:59:16 +0100
Subject: KYRA: (EOB) - fix spell book tab 5 in EOB1

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

(limited to 'engines')

diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 512c13a977..a378fe1ea5 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -708,8 +708,8 @@ void EoBCoreEngine::gui_initButton(int index, int, int, int) {
 	if (_flags.gameID == GI_EOB1) {
 		// EOB1 spellbook modifications
 		if (index > 60 && index < 66) {
-			d = &_buttonDefs[index + 33];
-			b->buttonCallback = _buttonCallbacks[index + 33];
+			d = &_buttonDefs[index + 34];
+			b->buttonCallback = _buttonCallbacks[index + 34];
 		} else if (index == 88) {
 			d = &_buttonDefs[index + 12];
 			b->buttonCallback = _buttonCallbacks[index + 12];
-- 
cgit v1.2.3


From 75c0036925107a844d211854f7194aebcbedd718 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 13 Dec 2011 21:56:35 +0100
Subject: KYRA: (LOL) - add support for loading original DOS version save files

---
 engines/kyra/saveload.cpp     |  12 ++-
 engines/kyra/saveload_lol.cpp | 208 +++++++++++++++++++++++++++---------------
 2 files changed, 147 insertions(+), 73 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index 3bca6b0e3c..9fd470f740 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -54,7 +54,7 @@ KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::Seekab
 		header.gameID = in->readByte();
 	} else {
 		// try checking for original save header
-		const int descriptionSize[2] = { 30, 80 };
+		const int descriptionSize[3] = { 30, 80, 60 };
 		char descriptionBuffer[81];
 
 		bool saveOk = false;
@@ -78,6 +78,16 @@ KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::Seekab
 				header.description = descriptionBuffer;
 				header.gameID = GI_KYRA3;
 				break;
+			} else if (type == MKTAG('C','D','0','4')) {
+				header.version = in->readUint32BE();
+				// We don't check the minor version, since the original doesn't do that either and it isn't required.
+				if (header.version != MKTAG(' ','C','D','1'))
+					continue;
+				saveOk = true;
+				header.description = descriptionBuffer;
+				header.gameID = GI_LOL;
+				in->seek(6, SEEK_CUR);
+				break;
 			}
 		}
 
diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp
index c4262c0edd..2b7236f48b 100644
--- a/engines/kyra/saveload_lol.cpp
+++ b/engines/kyra/saveload_lol.cpp
@@ -27,6 +27,7 @@
 
 #include "common/savefile.h"
 #include "common/substream.h"
+#include "common/memstream.h"
 
 #include "graphics/scaler.h"
 
@@ -44,6 +45,9 @@ Common::Error LoLEngine::loadGameState(int slot) {
 		return Common::kNoError;
 	}
 
+	if (header.originalSave)
+		warning("Trying to load savegame from original interpreter, while this is possible, it is not officially supported");
+
 	_screen->fadeClearSceneWindow(10);
 	completeDoorOperations();
 	_screen->fillRect(112, 0, 287, 119, 0, 0);
@@ -53,38 +57,40 @@ Common::Error LoLEngine::loadGameState(int slot) {
 
 	for (int i = 0; i < 4; i++) {
 		LoLCharacter *c = &_characters[i];
-		c->flags = in.readUint16BE();
+		c->flags = in.readUint16();
 		in.read(c->name, 11);
 		c->raceClassSex = in.readByte();
-		c->id = in.readSint16BE();
+		c->id = in.readSint16();
 		c->curFaceFrame = in.readByte();
 		c->tempFaceFrame = in.readByte();
 		c->screamSfx = in.readByte();
+		if (header.originalSave)
+			in.skip(4);
 		for (int ii = 0; ii < 8; ii++)
-			c->itemsMight[ii] = in.readUint16BE();
+			c->itemsMight[ii] = in.readUint16();
 		for (int ii = 0; ii < 8; ii++)
-			c->protectionAgainstItems[ii] = in.readUint16BE();
-		c->itemProtection = in.readUint16BE();
-		c->hitPointsCur = in.readSint16BE();
-		c->hitPointsMax = in.readUint16BE();
-		c->magicPointsCur = in.readSint16BE();
-		c->magicPointsMax = in.readUint16BE();
+			c->protectionAgainstItems[ii] = in.readUint16();
+		c->itemProtection = in.readUint16();
+		c->hitPointsCur = in.readSint16();
+		c->hitPointsMax = in.readUint16();
+		c->magicPointsCur = in.readSint16();
+		c->magicPointsMax = in.readUint16();
 		c->field_41 = in.readByte();
-		c->damageSuffered = in.readUint16BE();
-		c->weaponHit = in.readUint16BE();
-		c->totalMightModifier = in.readUint16BE();
-		c->totalProtectionModifier = in.readUint16BE();
-		c->might = in.readUint16BE();
-		c->protection = in.readUint16BE();
-		c->nextAnimUpdateCountdown = in.readSint16BE();
+		c->damageSuffered = in.readUint16();
+		c->weaponHit = in.readUint16();
+		c->totalMightModifier = in.readUint16();
+		c->totalProtectionModifier = in.readUint16();
+		c->might = in.readUint16();
+		c->protection = in.readUint16();
+		c->nextAnimUpdateCountdown = in.readSint16();
 		for (int ii = 0; ii < 11; ii++)
-			c->items[ii] = in.readUint16BE();
+			c->items[ii] = in.readUint16();
 		for (int ii = 0; ii < 3; ii++)
 			c->skillLevels[ii] = in.readByte();
 		for (int ii = 0; ii < 3; ii++)
 			c->skillModifiers[ii] = in.readSByte();
 		for (int ii = 0; ii < 3; ii++)
-			c->experiencePts[ii] = in.readUint32BE();
+			c->experiencePts[ii] = in.readUint32();
 		for (int ii = 0; ii < 5; ii++)
 			c->characterUpdateEvents[ii] = in.readByte();
 		for (int ii = 0; ii < 5; ii++)
@@ -96,39 +102,48 @@ Common::Error LoLEngine::loadGameState(int slot) {
 		}
 	}
 
-	in.read(_wllAutomapData, 80);
+	if (!header.originalSave)
+		in.read(_wllAutomapData, 80);
 
-	_currentBlock = in.readUint16BE();
-	_partyPosX = in.readUint16BE();
-	_partyPosY = in.readUint16BE();
-	_updateFlags = in.readUint16BE();
+	_currentBlock = in.readUint16();
+	_partyPosX = in.readUint16();
+	_partyPosY = in.readUint16();
+	_updateFlags = in.readUint16();
 	_scriptDirection = in.readByte();
 	_selectedSpell = in.readByte();
+
+	if (header.originalSave)
+		in.skip(2);
+
 	_sceneDefaultUpdate = in.readByte();
 	_compassBroken = in.readByte();
 	_drainMagic = in.readByte();
-	_currentDirection = in.readUint16BE();
-	_compassDirection = in.readUint16BE();
+	_currentDirection = in.readUint16();
+	_compassDirection = in.readUint16();
 	_selectedCharacter = in.readSByte();
+
+	if (header.originalSave)
+		in.skip(1);
+
 	_currentLevel = in.readByte();
 	for (int i = 0; i < 48; i++)
-		_inventory[i] = in.readSint16BE();
-	_inventoryCurItem = in.readSint16BE();
-	_itemInHand = in.readSint16BE();
-	_lastMouseRegion = in.readSint16BE();
+		_inventory[i] = in.readSint16();
+	_inventoryCurItem = in.readSint16();
+	_itemInHand = in.readSint16();
+	_lastMouseRegion = in.readSint16();
 
-	if (header.version <= 15) {
+	if (header.originalSave || header.version <= 15) {
 		uint16 flags[40];
 		memset(flags, 0, sizeof(flags));
 
 		if (header.version == 14) {
 			for (int i = 0; i < 16; i++)
-				flags[i] = in.readUint16BE();
-			flags[26] = in.readUint16BE();
-			flags[36] = in.readUint16BE();
-		} else if (header.version == 15) {
+				flags[i] = in.readUint16();
+			flags[26] = in.readUint16();
+			flags[36] = in.readUint16();
+		} else if (header.originalSave || header.version == 15) {
 			for (int i = 0; i < 40; i++)
-				flags[i] = in.readUint16BE();
+				flags[i] = in.readUint16();
 		}
 
 		memset(_flagsTable, 0, sizeof(_flagsTable));
@@ -139,37 +154,56 @@ Common::Error LoLEngine::loadGameState(int slot) {
 			}
 		}
 	} else {
-		uint32 flagsSize = in.readUint32BE();
+		uint32 flagsSize = in.readUint32();
 		assert(flagsSize <= sizeof(_flagsTable));
 		in.read(_flagsTable, flagsSize);
 	}
 
+	if (header.originalSave)
+		in.skip(120);
+
 	for (int i = 0; i < 24; i++)
-		_globalScriptVars[i] = in.readUint16BE();
+		_globalScriptVars[i] = in.readUint16();
+
+	if (header.originalSave)
+		in.skip(152);
+
 	_brightness = in.readByte();
 	_lampOilStatus = in.readByte();
 	_lampEffect = in.readSByte();
-	_credits = in.readUint16BE();
+
+	if (header.originalSave)
+		in.skip(1);
+
+	_credits = in.readUint16();
 	for (int i = 0; i < 8; i++)
-		_globalScriptVars2[i] = in.readUint16BE();
+		_globalScriptVars2[i] = in.readUint16();
 	in.read(_availableSpells, 7);
-	_hasTempDataFlags = in.readUint32BE();
+	_hasTempDataFlags = in.readUint32();
+
+	uint8 *origCmp = 0;
+	if (header.originalSave) {
+		in.skip(6);
+		origCmp = new uint8[2496];
+	}
 
 	for (int i = 0; i < 400; i++) {
 		ItemInPlay *t = &_itemsInPlay[i];
-		t->nextAssignedObject = in.readUint16BE();
-		t->nextDrawObject = in.readUint16BE();
+		t->nextAssignedObject = in.readUint16();
+		t->nextDrawObject = in.readUint16();
 		t->flyingHeight = in.readByte();
-		t->block = in.readUint16BE();
-		t->x = in.readUint16BE();
-		t->y = in.readUint16BE();
+		t->block = in.readUint16();
+		t->x = in.readUint16();
+		t->y = in.readUint16();
 		t->level = in.readSByte();
-		t->itemPropertyIndex = in.readUint16BE();
-		t->shpCurFrame_flg = in.readUint16BE();
-		t->destDirection = in.readByte();
-		t->hitOffsX = in.readSByte();
-		t->hitOffsY = in.readSByte();
-		t->currentSubFrame = in.readByte();
+		t->itemPropertyIndex = in.readUint16();
+		t->shpCurFrame_flg = in.readUint16();
+		if (!header.originalSave) {
+			t->destDirection = in.readByte();		
+			t->hitOffsX = in.readSByte();
+			t->hitOffsY = in.readSByte();
+			t->currentSubFrame = in.readByte();
+		}
 	}
 
 	for (int i = 0; i < 1024; i++) {
@@ -179,8 +213,13 @@ Common::Error LoLEngine::loadGameState(int slot) {
 	}
 
 	for (int i = 0; i < 29; i++) {
-		if (!(_hasTempDataFlags & (1 << i)))
+		if (!(_hasTempDataFlags & (1 << i))) {
+			if (header.originalSave) {
+				if (in.size() - in.pos() >= 2500)
+					in.skip(2500);
+			}
 			continue;
+		}
 
 		if (_lvlTempData[i]) {
 			delete[] _lvlTempData[i]->wallsXorData;
@@ -195,26 +234,40 @@ Common::Error LoLEngine::loadGameState(int slot) {
 		_lvlTempData[i]->wallsXorData = new uint8[4096];
 		_lvlTempData[i]->flags = new uint16[1024];
 		LoLMonsterInPlay *lm = new LoLMonsterInPlay[30];
-		 _lvlTempData[i]->monsters = lm;
+		_lvlTempData[i]->monsters = lm;
 		FlyingObject *lf = new FlyingObject[_numFlyingObjects];
 		_lvlTempData[i]->flyingObjects = lf;
 		LevelTempData *l = _lvlTempData[i];
+		
+		uint32 next = in.pos() + 2500;
+
+		if (header.originalSave) {
+			in.skip(4);
+			in.read(origCmp, in.readUint16());
+			_screen->decodeFrame4(origCmp, _tempBuffer5120, 5120);
+			memcpy(l->wallsXorData, _tempBuffer5120, 4096);
+			for (int ii = 0; ii < 1024; ii++)
+				l->flags[ii] = _tempBuffer5120[4096 + ii];
+		} else {
+			in.read(l->wallsXorData, 4096);
+			for (int ii = 0; ii < 1024; ii++)
+				l->flags[ii] = in.readByte();
+		}
 
-		in.read(l->wallsXorData, 4096);
-		for (int ii = 0; ii < 1024; ii++)
-			l->flags[ii] = in.readByte();
+		if (header.originalSave)
+			l->monsterDifficulty =  in.readUint16();
 
 		for (int ii = 0; ii < 30; ii++) {
 			LoLMonsterInPlay *m = &lm[ii];
-			m->nextAssignedObject = in.readUint16BE();
-			m->nextDrawObject = in.readUint16BE();
+			m->nextAssignedObject = in.readUint16();
+			m->nextDrawObject = in.readUint16();
 			m->flyingHeight = in.readByte();
-			m->block = in.readUint16BE();
-			m->x = in.readUint16BE();
-			m->y = in.readUint16BE();
+			m->block = in.readUint16();
+			m->x = in.readUint16();
+			m->y = in.readUint16();
 			m->shiftStep = in.readSByte();
-			m->destX = in.readUint16BE();
-			m->destY = in.readUint16BE();
+			m->destX = in.readUint16();
+			m->destY = in.readUint16();
 			m->destDirection = in.readByte();
 			m->hitOffsX = in.readSByte();
 			m->hitOffsY = in.readSByte();
@@ -224,15 +277,19 @@ Common::Error LoLEngine::loadGameState(int slot) {
 			m->id = in.readByte();
 			m->direction = in.readByte();
 			m->facing = in.readByte();
-			m->flags = in.readUint16BE();
-			m->damageReceived = in.readUint16BE();
-			m->hitPoints = in.readSint16BE();
+			m->flags = in.readUint16();
+			m->damageReceived = in.readUint16();
+			m->hitPoints = in.readSint16();
 			m->speedTick = in.readByte();
 			m->type = in.readByte();
+
+			if (header.originalSave)
+				in.skip(4);
+
 			m->numDistAttacks = in.readByte();
 			m->curDistWeapon = in.readByte();
 			m->distAttackTick = in.readSByte();
-			m->assignedItems = in.readUint16BE();
+			m->assignedItems = in.readUint16();
 			m->properties = &_monsterProperties[m->type];
 			in.read(m->equipmentShapes, 4);
 		}
@@ -241,10 +298,10 @@ Common::Error LoLEngine::loadGameState(int slot) {
 			FlyingObject *m = &lf[ii];
 			m->enable = in.readByte();
 			m->objectType = in.readByte();
-			m->attackerId = in.readUint16BE();
-			m->item = in.readSint16BE();
-			m->x = in.readUint16BE();
-			m->y = in.readUint16BE();
+			m->attackerId = in.readUint16();
+			m->item = in.readSint16();
+			m->x = in.readUint16();
+			m->y = in.readUint16();
 			m->flyingHeight = in.readByte();
 			m->direction = in.readByte();
 			m->distance = in.readByte();
@@ -253,9 +310,15 @@ Common::Error LoLEngine::loadGameState(int slot) {
 			m->flags = in.readByte();
 			m->wallFlags = in.readByte();
 		}
-		l->monsterDifficulty = in.readByte();
+
+		if (header.originalSave)
+			in.seek(next, SEEK_SET);
+		else
+			l->monsterDifficulty =  in.readByte();
 	}
 
+	delete[] origCmp;
+
 	calcCharPortraitXpos();
 	memset(_moneyColumnHeight, 0, sizeof(_moneyColumnHeight));
 	int t = _credits;
@@ -369,6 +432,7 @@ Common::Error LoLEngine::saveGameStateIntern(int slot, const char *saveName, con
 		out->writeSByte(t->level);
 		out->writeUint16BE(t->itemPropertyIndex);
 		out->writeUint16BE(t->shpCurFrame_flg);
+		
 		out->writeByte(t->destDirection);
 		out->writeSByte(t->hitOffsX);
 		out->writeSByte(t->hitOffsY);
-- 
cgit v1.2.3


From cbfdd227a173238cd7069264c2f83bdf247ca1d6 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 13 Dec 2011 22:00:07 +0100
Subject: KYRA: (LOL) - minor reduction of save file size

---
 engines/kyra/lol.h            |  7 +------
 engines/kyra/saveload.cpp     |  2 +-
 engines/kyra/saveload_lol.cpp | 21 +++++----------------
 3 files changed, 7 insertions(+), 23 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index c6d05c45d1..e44857ec2b 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -118,11 +118,11 @@ struct LoLMonsterInPlay {
 	int8 shiftStep;
 	uint16 destX;
 	uint16 destY;
+
 	uint8 destDirection;
 	int8 hitOffsX;
 	int8 hitOffsY;
 	uint8 currentSubFrame;
-
 	uint8 mode;
 	int8 fightCurTick;
 	uint8 id;
@@ -130,7 +130,6 @@ struct LoLMonsterInPlay {
 	uint8 facing;
 	uint16 flags;
 	uint16 damageReceived;
-	//uint8 field_1C;
 	int16 hitPoints;
 	uint8 speedTick;
 	uint8 type;
@@ -152,10 +151,6 @@ struct ItemInPlay {
 	int8 level;
 	uint16 itemPropertyIndex;
 	uint16 shpCurFrame_flg;
-	uint8 destDirection;
-	int8 hitOffsX;
-	int8 hitOffsY;
-	uint8 currentSubFrame;
 };
 
 struct ItemProperty {
diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index 9fd470f740..f4fd4668ee 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -29,7 +29,7 @@
 #include "graphics/thumbnail.h"
 #include "graphics/surface.h"
 
-#define CURRENT_SAVE_VERSION 16
+#define CURRENT_SAVE_VERSION 17
 
 #define GF_FLOPPY  (1 <<  0)
 #define GF_TALKIE  (1 <<  1)
diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp
index 2b7236f48b..3edc4759ca 100644
--- a/engines/kyra/saveload_lol.cpp
+++ b/engines/kyra/saveload_lol.cpp
@@ -102,8 +102,8 @@ Common::Error LoLEngine::loadGameState(int slot) {
 		}
 	}
 
-	if (!header.originalSave)
-		in.read(_wllAutomapData, 80);
+	if (header.version < 17)
+		in.skip(80);
 
 	_currentBlock = in.readUint16();
 	_partyPosX = in.readUint16();
@@ -198,12 +198,8 @@ Common::Error LoLEngine::loadGameState(int slot) {
 		t->level = in.readSByte();
 		t->itemPropertyIndex = in.readUint16();
 		t->shpCurFrame_flg = in.readUint16();
-		if (!header.originalSave) {
-			t->destDirection = in.readByte();		
-			t->hitOffsX = in.readSByte();
-			t->hitOffsY = in.readSByte();
-			t->currentSubFrame = in.readByte();
-		}
+		if (header.version < 17)
+			in.skip(4);
 	}
 
 	for (int i = 0; i < 1024; i++) {
@@ -385,9 +381,7 @@ Common::Error LoLEngine::saveGameStateIntern(int slot, const char *saveName, con
 		for (int ii = 0; ii < 5; ii++)
 			out->writeByte(c->characterUpdateDelay[ii]);
 	}
-
-	out->write(_wllAutomapData, 80);
-
+	
 	out->writeUint16BE(_currentBlock);
 	out->writeUint16BE(_partyPosX);
 	out->writeUint16BE(_partyPosY);
@@ -432,11 +426,6 @@ Common::Error LoLEngine::saveGameStateIntern(int slot, const char *saveName, con
 		out->writeSByte(t->level);
 		out->writeUint16BE(t->itemPropertyIndex);
 		out->writeUint16BE(t->shpCurFrame_flg);
-		
-		out->writeByte(t->destDirection);
-		out->writeSByte(t->hitOffsX);
-		out->writeSByte(t->hitOffsY);
-		out->writeByte(t->currentSubFrame);
 	}
 
 	addLevelItems();
-- 
cgit v1.2.3


From 6786c41f4fd56d588e61f329b6d81f580e9b040f Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 12 Dec 2011 20:10:57 +0100
Subject: KYRA: (LOL) - refactor item/monster structs

---
 engines/kyra/items_lol.cpp    |  83 +++++++++++++++++++++++++-----
 engines/kyra/lol.cpp          |  28 +++++-----
 engines/kyra/lol.h            |  71 +++++++++++++-------------
 engines/kyra/saveload_lol.cpp |  24 ++++-----
 engines/kyra/scene_lol.cpp    |  16 +++---
 engines/kyra/script_lol.cpp   |  18 +++----
 engines/kyra/sprites_lol.cpp  | 115 +++++++++++-------------------------------
 7 files changed, 177 insertions(+), 178 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp
index 0d6e99a696..e6cd9355fc 100644
--- a/engines/kyra/items_lol.cpp
+++ b/engines/kyra/items_lol.cpp
@@ -27,6 +27,68 @@
 
 namespace Kyra {
 
+LoLObject *LoLEngine::findObject(uint16 index) {
+	if (index & 0x8000)
+		return &_monsters[index & 0x7fff];
+	else
+		return &_itemsInPlay[index];
+}
+
+int LoLEngine::calcObjectPosition(LoLObject *i, uint16 direction) {
+	int x = i->x;
+	int y = i->y;
+
+	calcSpriteRelPosition(_partyPosX, _partyPosY, x, y, direction);
+
+	if (y < 0)
+		y = 0;
+
+	int res = (i->flyingHeight << 12);
+	res |= (4095 - y);
+
+	return res;
+}
+
+void LoLEngine::removeAssignedObjectFromBlock(LevelBlockProperty *l, uint16 id) {
+	uint16 *blockItemIndex = &l->assignedObjects;
+	LoLObject *i = 0;
+
+	while (*blockItemIndex) {
+		if (*blockItemIndex == id) {
+			i = findObject(id);
+			*blockItemIndex = i->nextAssignedObject;
+			i->nextAssignedObject = 0;
+			return;
+		}
+
+		i = findObject(*blockItemIndex);
+		blockItemIndex = &i->nextAssignedObject;
+	}
+}
+
+void LoLEngine::removeDrawObjectFromBlock(LevelBlockProperty *l, uint16 id) {
+	uint16 *blockItemIndex = &l->drawObjects;
+	LoLObject *i = 0;
+
+	while (*blockItemIndex) {
+		if (*blockItemIndex == id) {
+			i = findObject(id);
+			*blockItemIndex = i->nextDrawObject;
+			i->nextDrawObject = 0;
+			return;
+		}
+
+		i = findObject(*blockItemIndex);
+		blockItemIndex = &i->nextDrawObject;
+	}
+}
+
+void LoLEngine::assignObjectToBlock(uint16 *assignedBlockObjects, uint16 id) {
+	LoLObject *t = findObject(id);
+	t->nextAssignedObject = *assignedBlockObjects;
+	*assignedBlockObjects = id;
+}
+
 void LoLEngine::giveCredits(int credits, int redraw) {
 	if (redraw)
 		snd_playSoundEffect(101, -1);
@@ -156,7 +218,7 @@ Item LoLEngine::makeItem(int itemType, int curFrame, int flags) {
 		}
 	}
 
-	memset(&_itemsInPlay[slot], 0, sizeof(ItemInPlay));
+	memset(&_itemsInPlay[slot], 0, sizeof(LoLItem));
 
 	_itemsInPlay[slot].itemPropertyIndex = itemType;
 	_itemsInPlay[slot].shpCurFrame_flg = (curFrame & 0x1fff) | flags;
@@ -221,17 +283,10 @@ bool LoLEngine::isItemMoveable(Item itemIndex) {
 }
 
 void LoLEngine::deleteItem(Item itemIndex) {
-	memset(&_itemsInPlay[itemIndex], 0, sizeof(ItemInPlay));
+	memset(&_itemsInPlay[itemIndex], 0, sizeof(LoLItem));
 	_itemsInPlay[itemIndex].shpCurFrame_flg |= 0x8000;
 }
 
-ItemInPlay *LoLEngine::findObject(uint16 index) {
-	if (index & 0x8000)
-		return (ItemInPlay *)&_monsters[index & 0x7fff];
-	else
-		return &_itemsInPlay[index];
-}
-
 void LoLEngine::runItemScript(int charNum, Item item, int flags, int next, int reg4) {
 	EMCState scriptState;
 	memset(&scriptState, 0, sizeof(EMCState));
@@ -443,7 +498,7 @@ void LoLEngine::objectFlightProcessHits(FlyingObject *t, int x, int y, int objec
 		if (_itemProperties[_itemsInPlay[t->item].itemPropertyIndex].flags & 0x4000) {
 			int o = _levelBlockProperties[_itemsInPlay[t->item].block].assignedObjects;
 			while (o & 0x8000) {
-				ItemInPlay *i = findObject(o);
+				LoLObject *i = findObject(o);
 				o = i->nextAssignedObject;
 				runItemScript(t->attackerId, t->item, 0x8000, o, 0);
 			}
@@ -502,13 +557,13 @@ void LoLEngine::updateFlyingObject(FlyingObject *t) {
 
 void LoLEngine::assignItemToBlock(uint16 *assignedBlockObjects, int id) {
 	while (*assignedBlockObjects & 0x8000) {
-		ItemInPlay *tmp = findObject(*assignedBlockObjects);
+		LoLObject *tmp = findObject(*assignedBlockObjects);
 		assignedBlockObjects = &tmp->nextAssignedObject;
 	}
 
-	ItemInPlay *newObject = findObject(id);
+	LoLObject *newObject = findObject(id);
 	newObject->nextAssignedObject = *assignedBlockObjects;
-	newObject->level = -1;
+	((LoLItem*)newObject)->level = -1;
 	*assignedBlockObjects = id;
 }
 
@@ -531,7 +586,7 @@ int LoLEngine::checkSceneForItems(uint16 *blockDrawObjects, int color) {
 				return *blockDrawObjects;
 		}
 
-		ItemInPlay *i = findObject(*blockDrawObjects);
+		LoLObject *i = findObject(*blockDrawObjects);
 		blockDrawObjects = &i->nextDrawObject;
 	}
 
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index a57fe4fdb8..62143e5f72 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -390,8 +390,8 @@ Common::Error LoLEngine::init() {
 	_pageBuffer2 = new uint8[0xfa00];
 	memset(_pageBuffer2, 0, 0xfa00);
 
-	_itemsInPlay = new ItemInPlay[400];
-	memset(_itemsInPlay, 0, sizeof(ItemInPlay) * 400);
+	_itemsInPlay = new LoLItem[400];
+	memset(_itemsInPlay, 0, sizeof(LoLItem) * 400);
 
 	_characters = new LoLCharacter[4];
 	memset(_characters, 0, sizeof(LoLCharacter) * 4);
@@ -404,8 +404,8 @@ Common::Error LoLEngine::init() {
 	_wllAutomapData = new uint8[80];
 	memset(_wllAutomapData, 0, 80);
 
-	_monsters = new LoLMonsterInPlay[30];
-	memset(_monsters, 0, 30 * sizeof(LoLMonsterInPlay));
+	_monsters = new LoLMonster[30];
+	memset(_monsters, 0, 30 * sizeof(LoLMonster));
 	_monsterProperties = new LoLMonsterProperty[5];
 	memset(_monsterProperties, 0, 5 * sizeof(LoLMonsterProperty));
 
@@ -821,7 +821,7 @@ void LoLEngine::startup() {
 	for (int i = 0; i < _numHealiShapes; i++)
 		_healiShapes[i] = _screen->makeShapeCopy(shp, i);
 
-	memset(_itemsInPlay, 0, 400 * sizeof(ItemInPlay));
+	memset(_itemsInPlay, 0, 400 * sizeof(LoLItem));
 	for (int i = 0; i < 400; i++)
 		_itemsInPlay[i].shpCurFrame_flg |= 0x8000;
 
@@ -1946,7 +1946,7 @@ void LoLEngine::setupDialogueButtons(int numStr, const char *s1, const char *s2,
 		removeInputTop();
 }
 
-void LoLEngine::giveItemToMonster(LoLMonsterInPlay *monster, Item item) {
+void LoLEngine::giveItemToMonster(LoLMonster *monster, Item item) {
 	uint16 *c = &monster->assignedItems;
 	while (*c)
 		c = &_itemsInPlay[*c].nextAssignedObject;
@@ -2397,7 +2397,7 @@ int LoLEngine::processMagicIce(int charNum, int spellLevel) {
 			int might = rollDice(iceDamageMin[spellLevel], iceDamageMax[spellLevel]) + iceDamageAdd[spellLevel];
 			int dmg = calcInflictableDamagePerItem(charNum, 0, might, 3, 2);
 
-			LoLMonsterInPlay *m = &_monsters[o & 0x7fff];
+			LoLMonster *m = &_monsters[o & 0x7fff];
 			if (m->hitPoints <= dmg) {
 				increaseExperience(charNum, 2, m->hitPoints);
 				o = m->nextAssignedObject;
@@ -2476,7 +2476,7 @@ int LoLEngine::processMagicFireball(int charNum, int spellLevel) {
 			while (o & 0x8000) {
 				static const uint8 fireballDamage[] = { 20, 40, 80, 100 };
 				int dmg = calcInflictableDamagePerItem(charNum, o, fireballDamage[spellLevel], 4, 1);
-				LoLMonsterInPlay *m = &_monsters[o & 0x7fff];
+				LoLMonster *m = &_monsters[o & 0x7fff];
 				o = m->nextAssignedObject;
 				_envSfxUseQueue = true;
 				inflictDamage(m->id | 0x8000, dmg, charNum, 2, 4);
@@ -2641,7 +2641,7 @@ int LoLEngine::processMagicHandOfFate(int spellLevel) {
 				uint16 o = _levelBlockProperties[b1].assignedObjects;
 				while (o & 0x8000) {
 					uint16 o2 = o;
-					LoLMonsterInPlay *m = &_monsters[o & 0x7fff];
+					LoLMonster *m = &_monsters[o & 0x7fff];
 					o = findObject(o)->nextAssignedObject;
 					int nX = 0;
 					int nY = 0;
@@ -2910,7 +2910,7 @@ int LoLEngine::processMagicVaelansCube() {
 
 	uint16 o = _levelBlockProperties[bl].assignedObjects;
 	while (o & 0x8000) {
-		LoLMonsterInPlay *m = &_monsters[o & 0x7fff];
+		LoLMonster *m = &_monsters[o & 0x7fff];
 		if (m->properties->flags & 0x1000) {
 			inflictDamage(o, 100, 0xffff, 0, 0x80);
 			v = 1;
@@ -3390,7 +3390,7 @@ int LoLEngine::calcInflictableDamage(int16 attacker, int16 target, int hitType)
 }
 
 int LoLEngine::inflictDamage(uint16 target, int damage, uint16 attacker, int skill, int flags) {
-	LoLMonsterInPlay *m = 0;
+	LoLMonster *m = 0;
 	LoLCharacter *c = 0;
 
 	if (target & 0x8000) {
@@ -3607,7 +3607,7 @@ void LoLEngine::checkForPartyDeath() {
 	}
 }
 
-void LoLEngine::applyMonsterAttackSkill(LoLMonsterInPlay *monster, int16 target, int16 damage) {
+void LoLEngine::applyMonsterAttackSkill(LoLMonster *monster, int16 target, int16 damage) {
 	if (rollDice(1, 100) > monster->properties->attackSkillChance)
 		return;
 
@@ -3677,7 +3677,7 @@ void LoLEngine::applyMonsterAttackSkill(LoLMonsterInPlay *monster, int16 target,
 	}
 }
 
-void LoLEngine::applyMonsterDefenseSkill(LoLMonsterInPlay *monster, int16 attacker, int flags, int skill, int damage) {
+void LoLEngine::applyMonsterDefenseSkill(LoLMonster *monster, int16 attacker, int flags, int skill, int damage) {
 	if (rollDice(1, 100) > monster->properties->defenseSkillChance)
 		return;
 
@@ -3936,7 +3936,7 @@ uint16 LoLEngine::getNearestMonsterFromCharacterForBlock(uint16 block, int charN
 	int o = _levelBlockProperties[block].assignedObjects;
 
 	while (o & 0x8000) {
-		LoLMonsterInPlay *m = &_monsters[o & 0x7fff];
+		LoLMonster *m = &_monsters[o & 0x7fff];
 		if (m->mode >= 13) {
 			o = m->nextAssignedObject;
 			continue;
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index e44857ec2b..bb8f24eb66 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -108,18 +108,21 @@ struct LoLMonsterProperty {
 	uint8 sounds[3];
 };
 
-struct LoLMonsterInPlay {
+struct LoLObject {
 	uint16 nextAssignedObject;
 	uint16 nextDrawObject;
 	uint8 flyingHeight;
 	uint16 block;
 	uint16 x;
 	uint16 y;
+};
+
+struct LoLMonster : public LoLObject {
+	uint8 destDirection;
 	int8 shiftStep;
 	uint16 destX;
 	uint16 destY;
 
-	uint8 destDirection;
 	int8 hitOffsX;
 	int8 hitOffsY;
 	uint8 currentSubFrame;
@@ -141,13 +144,7 @@ struct LoLMonsterInPlay {
 	uint8 equipmentShapes[4];
 };
 
-struct ItemInPlay {
-	uint16 nextAssignedObject;
-	uint16 nextDrawObject;
-	uint8 flyingHeight;
-	uint16 block;
-	uint16 x;
-	uint16 y;
+struct LoLItem : public LoLObject {
 	int8 level;
 	uint16 itemPropertyIndex;
 	uint16 shpCurFrame_flg;
@@ -906,7 +903,7 @@ private:
 	void loadLevel(int index);
 	void addLevelItems();
 	void loadLevelWallData(int fileIndex, bool mapShapes);
-	void assignBlockObject(LevelBlockProperty *l, uint16 item);
+	void assignBlockItem(LevelBlockProperty *l, uint16 item);
 	int assignLevelDecorationShapes(int index);
 	uint8 *getLevelDecorationShapes(int index);
 	void releaseDecorations(int first = 0, int num = 400);
@@ -1028,6 +1025,13 @@ private:
 	const int16 *_dscDoorMonsterX;
 	const int16 *_dscDoorMonsterY;
 
+	// objects (item/monster common)
+	LoLObject *findObject(uint16 index);
+	int calcObjectPosition(LoLObject *obj, uint16 direction);
+	void removeAssignedObjectFromBlock(LevelBlockProperty *l, uint16 id);
+	void removeDrawObjectFromBlock(LevelBlockProperty *l, uint16 id);
+	void assignObjectToBlock(uint16 *assignedBlockObjects, uint16 id);
+
 	// items
 	void giveCredits(int credits, int redraw);
 	void takeCredits(int credits, int redraw);
@@ -1036,7 +1040,6 @@ private:
 	bool addItemToInventory(Item itemIndex);
 	bool isItemMoveable(Item itemIndex);
 	void deleteItem(Item itemIndex);
-	ItemInPlay *findObject(uint16 index);
 	void runItemScript(int charNum, Item item, int flags, int next, int reg4);
 	void setHandItem(Item itemIndex);
 	bool itemEquipped(int charNum, uint16 itemType);
@@ -1057,7 +1060,7 @@ private:
 	uint8 _moneyColumnHeight[5];
 	uint16 _credits;
 
-	ItemInPlay *_itemsInPlay;
+	LoLItem *_itemsInPlay;
 	ItemProperty *_itemProperties;
 
 	Item _itemInHand;
@@ -1084,16 +1087,13 @@ private:
 	void loadMonsterShapes(const char *file, int monsterIndex, int b);
 	void releaseMonsterShapes(int monsterIndex);
 	int deleteMonstersFromBlock(int block);
-	void setMonsterMode(LoLMonsterInPlay *monster, int mode);
-	bool updateMonsterAdjustBlocks(LoLMonsterInPlay *monster);
-	void placeMonster(LoLMonsterInPlay *monster, uint16 x, uint16 y);
+	void setMonsterMode(LoLMonster *monster, int mode);
+	bool updateMonsterAdjustBlocks(LoLMonster *monster);
+	void placeMonster(LoLMonster *monster, uint16 x, uint16 y);
 	int calcMonsterDirection(uint16 x1, uint16 y1, uint16 x2, uint16 y2);
-	void setMonsterDirection(LoLMonsterInPlay *monster, int dir);
-	void monsterDropItems(LoLMonsterInPlay *monster);
-	void removeAssignedObjectFromBlock(LevelBlockProperty *l, uint16 id);
-	void removeDrawObjectFromBlock(LevelBlockProperty *l, uint16 id);
-	void assignMonsterToBlock(uint16 *assignedBlockObjects, uint16 id);
-	void giveItemToMonster(LoLMonsterInPlay *monster, Item item);
+	void setMonsterDirection(LoLMonster *monster, int dir);
+	void monsterDropItems(LoLMonster *monster);
+	void giveItemToMonster(LoLMonster *monster, Item item);
 	int checkBlockBeforeObjectPlacement(uint16 x, uint16 y, uint16 objectWidth, uint16 testFlag, uint16 wallFlag);
 	int checkBlockForWallsAndSufficientSpace(int block, int x, int y, int objectWidth, int testFlag, int wallFlag);
 	int calcMonsterSkillLevel(int id, int a);
@@ -1104,30 +1104,29 @@ private:
 
 	void drawBlockObjects(int blockArrayIndex);
 	void drawMonster(uint16 id);
-	int getMonsterCurFrame(LoLMonsterInPlay *m, uint16 dirFlags);
+	int getMonsterCurFrame(LoLMonster *m, uint16 dirFlags);
 	void reassignDrawObjects(uint16 direction, uint16 itemIndex, LevelBlockProperty *l, bool flag);
 	void redrawSceneItem();
-	int calcItemMonsterPosition(ItemInPlay *i, uint16 direction);
 	void calcSpriteRelPosition(uint16 x1, uint16 y1, int &x2, int &y2, uint16 direction);
 	void drawDoor(uint8 *shape, uint8 *doorPalette, int index, int unk2, int w, int h, int flags);
 	void drawDoorOrMonsterEquipment(uint8 *shape, uint8 *objectPalette, int x, int y, int flags, const uint8 *brightnessOverlay);
 	uint8 *drawItemOrMonster(uint8 *shape, uint8 *monsterPalette, int x, int y, int fineX, int fineY, int flags, int tblValue, bool vflip);
 	int calcDrawingLayerParameters(int srcX, int srcY, int &x2, int &y2, uint16 &w, uint16 &h, uint8 *shape, int vflip);
 
-	void updateMonster(LoLMonsterInPlay *monster);
-	void moveMonster(LoLMonsterInPlay *monster);
-	void walkMonster(LoLMonsterInPlay *monster);
-	bool chasePartyWithDistanceAttacks(LoLMonsterInPlay *monster);
-	void chasePartyWithCloseAttacks(LoLMonsterInPlay *monster);
-	int walkMonsterCalcNextStep(LoLMonsterInPlay *monster);
+	void updateMonster(LoLMonster *monster);
+	void moveMonster(LoLMonster *monster);
+	void walkMonster(LoLMonster *monster);
+	bool chasePartyWithDistanceAttacks(LoLMonster *monster);
+	void chasePartyWithCloseAttacks(LoLMonster *monster);
+	int walkMonsterCalcNextStep(LoLMonster *monster);
 	int checkForPossibleDistanceAttack(uint16 monsterBlock, int direction, int distance, uint16 curBlock);
-	int walkMonsterCheckDest(int x, int y, LoLMonsterInPlay *monster, int unk);
+	int walkMonsterCheckDest(int x, int y, LoLMonster *monster, int unk);
 	void getNextStepCoords(int16 monsterX, int16 monsterY, int &newX, int &newY, uint16 direction);
-	void rearrangeAttackingMonster(LoLMonsterInPlay *monster);
-	void moveStrayingMonster(LoLMonsterInPlay *monster);
-	void killMonster(LoLMonsterInPlay *monster);
+	void rearrangeAttackingMonster(LoLMonster *monster);
+	void moveStrayingMonster(LoLMonster *monster);
+	void killMonster(LoLMonster *monster);
 
-	LoLMonsterInPlay *_monsters;
+	LoLMonster *_monsters;
 	LoLMonsterProperty *_monsterProperties;
 	uint8 **_monsterDecorationShapes;
 	uint8 _monsterAnimType[3];
@@ -1241,8 +1240,8 @@ private:
 	int calcInflictableDamagePerItem(int16 attacker, int16 target, uint16 itemMight, int index, int hitType);
 	void checkForPartyDeath();
 
-	void applyMonsterAttackSkill(LoLMonsterInPlay *monster, int16 target, int16 damage);
-	void applyMonsterDefenseSkill(LoLMonsterInPlay *monster, int16 attacker, int flags, int skill, int damage);
+	void applyMonsterAttackSkill(LoLMonster *monster, int16 target, int16 damage);
+	void applyMonsterDefenseSkill(LoLMonster *monster, int16 attacker, int flags, int skill, int damage);
 	int removeCharacterItem(int charNum, int itemFlags);
 	int paralyzePoisonCharacter(int charNum, int typeFlag, int immunityFlags, int hitChance, int redraw);
 	void paralyzePoisonAllCharacters(int typeFlag, int immunityFlags, int hitChance);
diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp
index 3edc4759ca..7736d45540 100644
--- a/engines/kyra/saveload_lol.cpp
+++ b/engines/kyra/saveload_lol.cpp
@@ -188,7 +188,7 @@ Common::Error LoLEngine::loadGameState(int slot) {
 	}
 
 	for (int i = 0; i < 400; i++) {
-		ItemInPlay *t = &_itemsInPlay[i];
+		LoLItem *t = &_itemsInPlay[i];
 		t->nextAssignedObject = in.readUint16();
 		t->nextDrawObject = in.readUint16();
 		t->flyingHeight = in.readByte();
@@ -229,12 +229,12 @@ Common::Error LoLEngine::loadGameState(int slot) {
 		_lvlTempData[i] = new LevelTempData;
 		_lvlTempData[i]->wallsXorData = new uint8[4096];
 		_lvlTempData[i]->flags = new uint16[1024];
-		LoLMonsterInPlay *lm = new LoLMonsterInPlay[30];
+		LoLMonster *lm = new LoLMonster[30];
 		_lvlTempData[i]->monsters = lm;
 		FlyingObject *lf = new FlyingObject[_numFlyingObjects];
 		_lvlTempData[i]->flyingObjects = lf;
 		LevelTempData *l = _lvlTempData[i];
-		
+
 		uint32 next = in.pos() + 2500;
 
 		if (header.originalSave) {
@@ -254,7 +254,7 @@ Common::Error LoLEngine::loadGameState(int slot) {
 			l->monsterDifficulty =  in.readUint16();
 
 		for (int ii = 0; ii < 30; ii++) {
-			LoLMonsterInPlay *m = &lm[ii];
+			LoLMonster *m = &lm[ii];
 			m->nextAssignedObject = in.readUint16();
 			m->nextDrawObject = in.readUint16();
 			m->flyingHeight = in.readByte();
@@ -381,7 +381,7 @@ Common::Error LoLEngine::saveGameStateIntern(int slot, const char *saveName, con
 		for (int ii = 0; ii < 5; ii++)
 			out->writeByte(c->characterUpdateDelay[ii]);
 	}
-	
+
 	out->writeUint16BE(_currentBlock);
 	out->writeUint16BE(_partyPosX);
 	out->writeUint16BE(_partyPosY);
@@ -416,7 +416,7 @@ Common::Error LoLEngine::saveGameStateIntern(int slot, const char *saveName, con
 	resetItems(0);
 
 	for (int i = 0; i < 400; i++) {
-		ItemInPlay *t = &_itemsInPlay[i];
+		LoLItem *t = &_itemsInPlay[i];
 		out->writeUint16BE(t->nextAssignedObject);
 		out->writeUint16BE(t->nextDrawObject);
 		out->writeByte(t->flyingHeight);
@@ -439,11 +439,11 @@ Common::Error LoLEngine::saveGameStateIntern(int slot, const char *saveName, con
 		for (int ii = 0; ii < 1024; ii++)
 			out->writeByte(l->flags[ii] & 0xff);
 
-		LoLMonsterInPlay *lm = (LoLMonsterInPlay*)_lvlTempData[i]->monsters;
+		LoLMonster *lm = (LoLMonster*)_lvlTempData[i]->monsters;
 		FlyingObject *lf = (FlyingObject*)_lvlTempData[i]->flyingObjects;
 
 		for (int ii = 0; ii < 30; ii++) {
-			LoLMonsterInPlay *m = &lm[ii];
+			LoLMonster *m = &lm[ii];
 			out->writeUint16BE(m->nextAssignedObject);
 			out->writeUint16BE(m->nextDrawObject);
 			out->writeByte(m->flyingHeight);
@@ -537,8 +537,8 @@ void LoLEngine::restoreBlockTempData(int levelIndex) {
 }
 
 void *LoLEngine::generateMonsterTempData(LevelTempData *tmp) {
-	LoLMonsterInPlay *m = new LoLMonsterInPlay[30];
-	memcpy(m, _monsters,  sizeof(LoLMonsterInPlay) * 30);
+	LoLMonster *m = new LoLMonster[30];
+	memcpy(m, _monsters,  sizeof(LoLMonster) * 30);
 	tmp->monsterDifficulty = _monsterDifficulty;
 	return m;
 }
@@ -562,7 +562,7 @@ void LoLEngine::restoreTempDataAdjustMonsterStrength(int index) {
 }
 
 void LoLEngine::restoreMonsterTempData(LevelTempData *tmp) {
-	memcpy(_monsters, tmp->monsters, sizeof(LoLMonsterInPlay) * 30);
+	memcpy(_monsters, tmp->monsters, sizeof(LoLMonster) * 30);
 
 	for (int i = 0; i < 30; i++) {
 		if (_monsters[i].block) {
@@ -574,7 +574,7 @@ void LoLEngine::restoreMonsterTempData(LevelTempData *tmp) {
 }
 
 void LoLEngine::releaseMonsterTempData(LevelTempData *tmp) {
-	LoLMonsterInPlay *p = (LoLMonsterInPlay*)tmp->monsters;
+	LoLMonster *p = (LoLMonster*)tmp->monsters;
 	delete[] p;
 }
 
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index 8610d20d02..fea9b27bd1 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -105,16 +105,16 @@ void LoLEngine::addLevelItems() {
 		if (_itemsInPlay[i].level != _currentLevel)
 			continue;
 
-		assignBlockObject(&_levelBlockProperties[_itemsInPlay[i].block], i);
+		assignBlockItem(&_levelBlockProperties[_itemsInPlay[i].block], i);
 
 		_levelBlockProperties[_itemsInPlay[i].block].direction = 5;
 		_itemsInPlay[i].nextDrawObject = 0;
 	}
 }
 
-void LoLEngine::assignBlockObject(LevelBlockProperty *l, uint16 item) {
+void LoLEngine::assignBlockItem(LevelBlockProperty *l, uint16 item) {
 	uint16 *index = &l->assignedObjects;
-	ItemInPlay *tmp = 0;
+	LoLObject *tmp = 0;
 
 	while (*index & 0x8000) {
 		tmp = findObject(*index);
@@ -122,7 +122,7 @@ void LoLEngine::assignBlockObject(LevelBlockProperty *l, uint16 item) {
 	}
 
 	tmp = findObject(item);
-	tmp->level = -1;
+	((LoLItem*)tmp)->level = -1;
 
 	uint16 ix = *index;
 
@@ -474,17 +474,17 @@ void LoLEngine::resetItems(int flag) {
 	for (int i = 0; i < 1024; i++) {
 		_levelBlockProperties[i].direction = 5;
 		uint16 id = _levelBlockProperties[i].assignedObjects;
-		LoLMonsterInPlay *r = 0;
+		LoLObject *r = 0;
 
 		while (id & 0x8000) {
-			r = (LoLMonsterInPlay *)findObject(id);
+			r = findObject(id);
 			id = r->nextAssignedObject;
 		}
 
 		if (!id)
 			continue;
 
-		ItemInPlay *it = &_itemsInPlay[id];
+		LoLItem *it = &_itemsInPlay[id];
 		it->level = _currentLevel;
 		it->block = i;
 		if (r)
@@ -496,7 +496,7 @@ void LoLEngine::resetItems(int flag) {
 }
 
 void LoLEngine::disableMonsters() {
-	memset(_monsters, 0, 30 * sizeof(LoLMonsterInPlay));
+	memset(_monsters, 0, 30 * sizeof(LoLMonster));
 	for (int i = 0; i < 30; i++)
 		_monsters[i].mode = 0x10;
 }
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp
index 342014bfed..f81961a08b 100644
--- a/engines/kyra/script_lol.cpp
+++ b/engines/kyra/script_lol.cpp
@@ -286,7 +286,7 @@ int LoLEngine::olol_getItemPara(EMCState *script) {
 	if (!stackPos(0))
 		return 0;
 
-	ItemInPlay *i = &_itemsInPlay[stackPos(0)];
+	LoLItem *i = &_itemsInPlay[stackPos(0)];
 	ItemProperty *p = &_itemProperties[i->itemPropertyIndex];
 
 	switch (stackPos(1)) {
@@ -811,11 +811,11 @@ int LoLEngine::olol_initMonster(EMCState *script) {
 		return -1;
 
 	for (uint8 i = 0; i < 30; i++) {
-		LoLMonsterInPlay *l = &_monsters[i];
+		LoLMonster *l = &_monsters[i];
 		if (l->hitPoints || l->mode == 13)
 			continue;
 
-		memset(l, 0, sizeof(LoLMonsterInPlay));
+		memset(l, 0, sizeof(LoLMonster));
 		l->id = i;
 		l->x = x;
 		l->y = y;
@@ -998,7 +998,7 @@ int LoLEngine::olol_inflictDamage(EMCState *script) {
 
 int LoLEngine::olol_moveMonster(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_moveMonster(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
-	LoLMonsterInPlay *m = &_monsters[stackPos(0)];
+	LoLMonster *m = &_monsters[stackPos(0)];
 
 	if (m->mode == 1 || m->mode == 2) {
 		calcCoordinates(m->destX, m->destY, stackPos(1), stackPos(2), stackPos(3));
@@ -1193,7 +1193,7 @@ int LoLEngine::olol_changeMonsterStat(EMCState *script) {
 	if (stackPos(0) == -1)
 		return 1;
 
-	LoLMonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
+	LoLMonster *m = &_monsters[stackPos(0) & 0x7fff];
 
 	int16 d = stackPos(2);
 	uint16 x = 0;
@@ -1234,7 +1234,7 @@ int LoLEngine::olol_getMonsterStat(EMCState *script) {
 	if (stackPos(0) == -1)
 		return 0;
 
-	LoLMonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
+	LoLMonster *m = &_monsters[stackPos(0) & 0x7fff];
 	int d = stackPos(1);
 
 	switch (d) {
@@ -1547,7 +1547,7 @@ int LoLEngine::olol_moveBlockObjects(EMCState *script) {
 
 			l &= 0x7fff;
 
-			LoLMonsterInPlay *m = &_monsters[l];
+			LoLMonster *m = &_monsters[l];
 
 			setMonsterMode(m, 14);
 			checkSceneUpdateNeed(m->block);
@@ -1618,7 +1618,7 @@ int LoLEngine::olol_dummy1(EMCState *script) {
 
 int LoLEngine::olol_suspendMonster(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_suspendMonster(%p) (%d)", (const void *)script, stackPos(0));
-	LoLMonsterInPlay *m = &_monsters[stackPos(0) & 0x7fff];
+	LoLMonster *m = &_monsters[stackPos(0) & 0x7fff];
 	setMonsterMode(m, 14);
 	checkSceneUpdateNeed(m->block);
 	placeMonster(m, 0, 0);
@@ -2035,7 +2035,7 @@ int LoLEngine::olol_changeItemTypeOrFlag(EMCState *script) {
 	if (stackPos(0) < 1)
 		return 0;
 
-	ItemInPlay *i = &_itemsInPlay[stackPos(0)];
+	LoLItem *i = &_itemsInPlay[stackPos(0)];
 	int16 val = stackPos(2);
 
 	if (stackPos(1) == 4)
diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp
index 06d781328e..2fe896b085 100644
--- a/engines/kyra/sprites_lol.cpp
+++ b/engines/kyra/sprites_lol.cpp
@@ -159,7 +159,7 @@ int LoLEngine::deleteMonstersFromBlock(int block) {
 			continue;
 		}
 
-		LoLMonsterInPlay *m = &_monsters[i & 0x7fff];
+		LoLMonster *m = &_monsters[i & 0x7fff];
 
 		cnt++;
 		setMonsterMode(m, 14);
@@ -173,7 +173,7 @@ int LoLEngine::deleteMonstersFromBlock(int block) {
 	return cnt;
 }
 
-void LoLEngine::setMonsterMode(LoLMonsterInPlay *monster, int mode) {
+void LoLEngine::setMonsterMode(LoLMonster *monster, int mode) {
 	if (monster->mode == 13 && mode != 14)
 		return;
 
@@ -210,7 +210,7 @@ void LoLEngine::setMonsterMode(LoLMonsterInPlay *monster, int mode) {
 	}
 }
 
-bool LoLEngine::updateMonsterAdjustBlocks(LoLMonsterInPlay *monster) {
+bool LoLEngine::updateMonsterAdjustBlocks(LoLMonster *monster) {
 	static const uint8 dims[] = { 0, 13, 9, 3 };
 	if (monster->properties->flags & 8)
 		return true;
@@ -251,7 +251,7 @@ bool LoLEngine::updateMonsterAdjustBlocks(LoLMonsterInPlay *monster) {
 	return (fx1 >= fx2) ? false : true;
 }
 
-void LoLEngine::placeMonster(LoLMonsterInPlay *monster, uint16 x, uint16 y) {
+void LoLEngine::placeMonster(LoLMonster *monster, uint16 x, uint16 y) {
 	bool cont = true;
 	int t = monster->block;
 	if (monster->block) {
@@ -273,7 +273,7 @@ void LoLEngine::placeMonster(LoLMonsterInPlay *monster, uint16 x, uint16 y) {
 	if (monster->block == 0)
 		return;
 
-	assignMonsterToBlock(&_levelBlockProperties[monster->block].assignedObjects, ((uint16)monster->id) | 0x8000);
+	assignObjectToBlock(&_levelBlockProperties[monster->block].assignedObjects, ((uint16)monster->id) | 0x8000);
 	_levelBlockProperties[monster->block].direction = 5;
 	checkSceneUpdateNeed(monster->block);
 
@@ -329,7 +329,7 @@ int LoLEngine::calcMonsterDirection(uint16 x1, uint16 y1, uint16 x2, uint16 y2)
 	return retVal[r];
 }
 
-void LoLEngine::setMonsterDirection(LoLMonsterInPlay *monster, int dir) {
+void LoLEngine::setMonsterDirection(LoLMonster *monster, int dir) {
 	monster->direction = dir;
 
 	if (!(dir & 1) || ((monster->direction - (monster->facing << 1)) >= 2))
@@ -338,7 +338,7 @@ void LoLEngine::setMonsterDirection(LoLMonsterInPlay *monster, int dir) {
 	checkSceneUpdateNeed(monster->block);
 }
 
-void LoLEngine::monsterDropItems(LoLMonsterInPlay *monster) {
+void LoLEngine::monsterDropItems(LoLMonster *monster) {
 	uint16 a = monster->assignedItems;
 	while (a) {
 		uint16 b = a;
@@ -347,46 +347,6 @@ void LoLEngine::monsterDropItems(LoLMonsterInPlay *monster) {
 	}
 }
 
-void LoLEngine::removeAssignedObjectFromBlock(LevelBlockProperty *l, uint16 id) {
-	uint16 *blockItemIndex = &l->assignedObjects;
-	ItemInPlay *i = 0;
-
-	while (*blockItemIndex) {
-		if (*blockItemIndex == id) {
-			i = findObject(id);
-			*blockItemIndex = i->nextAssignedObject;
-			i->nextAssignedObject = 0;
-			return;
-		}
-
-		i = findObject(*blockItemIndex);
-		blockItemIndex = &i->nextAssignedObject;
-	}
-}
-
-void LoLEngine::removeDrawObjectFromBlock(LevelBlockProperty *l, uint16 id) {
-	uint16 *blockItemIndex = &l->drawObjects;
-	ItemInPlay *i = 0;
-
-	while (*blockItemIndex) {
-		if (*blockItemIndex == id) {
-			i = findObject(id);
-			*blockItemIndex = i->nextDrawObject;
-			i->nextDrawObject = 0;
-			return;
-		}
-
-		i = findObject(*blockItemIndex);
-		blockItemIndex = &i->nextDrawObject;
-	}
-}
-
-void LoLEngine::assignMonsterToBlock(uint16 *assignedBlockObjects, uint16 id) {
-	ItemInPlay *t = findObject(id);
-	t->nextAssignedObject = *assignedBlockObjects;
-	*assignedBlockObjects = id;
-}
-
 int LoLEngine::checkBlockBeforeObjectPlacement(uint16 x, uint16 y, uint16 objectWidth, uint16 testFlag, uint16 wallFlag) {
 	_objectLastDirection = 0;
 	uint16 x2 = 0;
@@ -503,7 +463,7 @@ int LoLEngine::checkBlockForWallsAndSufficientSpace(int block, int x, int y, int
 
 	uint16 b = _levelBlockProperties[block].assignedObjects;
 	while (b & 0x8000) {
-		LoLMonsterInPlay *monster = &_monsters[b & 0x7fff];
+		LoLMonster *monster = &_monsters[b & 0x7fff];
 
 		if (monster->mode < 13) {
 			int r = checkDrawObjectSpace(x, y, monster->x, monster->y);
@@ -554,7 +514,7 @@ int LoLEngine::checkBlockOccupiedByParty(int x, int y, int testFlag) {
 void LoLEngine::drawBlockObjects(int blockArrayIndex) {
 	LevelBlockProperty *l = _visibleBlocks[blockArrayIndex];
 	uint16 s = l->assignedObjects;
-	ItemInPlay *i = findObject(s);
+	LoLObject *obj = findObject(s);
 
 	if (l->direction != _currentDirection) {
 		l->drawObjects = 0;
@@ -562,8 +522,8 @@ void LoLEngine::drawBlockObjects(int blockArrayIndex) {
 
 		while (s) {
 			reassignDrawObjects(_currentDirection, s, l, true);
-			i = findObject(s);
-			s = i->nextAssignedObject;
+			obj = findObject(s);
+			s = obj->nextAssignedObject;
 		}
 	}
 
@@ -575,7 +535,7 @@ void LoLEngine::drawBlockObjects(int blockArrayIndex) {
 				drawMonster(s);
 			s = _monsters[s].nextDrawObject;
 		} else {
-			i = &_itemsInPlay[s];
+			LoLItem *i = &_itemsInPlay[s];
 			int fx = _sceneItemOffs[s & 7] << 1;
 			int fy = _sceneItemOffs[(s >> 1) & 7] + 5;
 
@@ -645,7 +605,7 @@ void LoLEngine::drawBlockObjects(int blockArrayIndex) {
 }
 
 void LoLEngine::drawMonster(uint16 id) {
-	LoLMonsterInPlay *m = &_monsters[id];
+	LoLMonster *m = &_monsters[id];
 	int16 flg = _monsterDirFlags[(_currentDirection << 2) + m->facing];
 	int curFrm = getMonsterCurFrame(m, flg & 0xffef);
 	uint8 *shp = 0;
@@ -721,7 +681,7 @@ void LoLEngine::drawMonster(uint16 id) {
 	delete[] tbl;
 }
 
-int LoLEngine::getMonsterCurFrame(LoLMonsterInPlay *m, uint16 dirFlags) {
+int LoLEngine::getMonsterCurFrame(LoLMonster *m, uint16 dirFlags) {
 	int tmp = 0;
 	switch (_monsterAnimType[m->properties->shapeIndex]) {
 	case 0:
@@ -796,19 +756,19 @@ void LoLEngine::reassignDrawObjects(uint16 direction, uint16 itemIndex, LevelBlo
 		return;
 	}
 
-	ItemInPlay *newObject = findObject(itemIndex);
-	int r = calcItemMonsterPosition(newObject, direction);
+	LoLObject *newObject = findObject(itemIndex);
+	int r = calcObjectPosition(newObject, direction);
 	uint16 *b = &l->drawObjects;
-	ItemInPlay *lastObject = 0;
+	LoLObject *lastObject = 0;
 
 	while (*b) {
 		lastObject = findObject(*b);
 
 		if (flag) {
-			if (calcItemMonsterPosition(lastObject, direction) >= r)
+			if (calcObjectPosition(lastObject, direction) >= r)
 				break;
 		} else {
-			if (calcItemMonsterPosition(lastObject, direction) > r)
+			if (calcObjectPosition(lastObject, direction) > r)
 				break;
 		}
 
@@ -838,7 +798,7 @@ void LoLEngine::redrawSceneItem() {
 			if (s & 0x8000) {
 				s = _monsters[s & 0x7fff].nextDrawObject;
 			} else {
-				ItemInPlay *item = &_itemsInPlay[s];
+				LoLItem *item = &_itemsInPlay[s];
 
 				if (item->shpCurFrame_flg & 0x4000) {
 					if (checkDrawObjectSpace(item->x, item->y, _partyPosX, _partyPosY) < 320) {
@@ -862,21 +822,6 @@ void LoLEngine::redrawSceneItem() {
 	}
 }
 
-int LoLEngine::calcItemMonsterPosition(ItemInPlay *i, uint16 direction) {
-	int x = i->x;
-	int y = i->y;
-
-	calcSpriteRelPosition(_partyPosX, _partyPosY, x, y, direction);
-
-	if (y < 0)
-		y = 0;
-
-	int res = (i->flyingHeight << 12);
-	res |= (4095 - y);
-
-	return res;
-}
-
 void LoLEngine::calcSpriteRelPosition(uint16 x1, uint16 y1, int &x2, int &y2, uint16 direction) {
 	int a = x2 - x1;
 	int b = y1 - y2;
@@ -1080,7 +1025,7 @@ int LoLEngine::calcDrawingLayerParameters(int x1, int y1, int &x2, int &y2, uint
 	return l;
 }
 
-void LoLEngine::updateMonster(LoLMonsterInPlay *monster) {
+void LoLEngine::updateMonster(LoLMonster *monster) {
 	static const uint8 flags[] = { 1, 0, 1, 3, 3, 0, 0, 3, 4, 1, 0, 0, 4, 0, 0 };
 	if (monster->mode > 14)
 		return;
@@ -1228,7 +1173,7 @@ void LoLEngine::updateMonster(LoLMonsterInPlay *monster) {
 	monster->flags &= 0xffef;
 }
 
-void LoLEngine::moveMonster(LoLMonsterInPlay *monster) {
+void LoLEngine::moveMonster(LoLMonster *monster) {
 	static const int8 turnPos[] = { 0, 2, 6, 6, 0, 2, 4, 4, 2, 2, 4, 6, 0, 0, 4, 6, 0 };
 	if (monster->x != monster->destX || monster->y != monster->destY) {
 		walkMonster(monster);
@@ -1238,7 +1183,7 @@ void LoLEngine::moveMonster(LoLMonsterInPlay *monster) {
 	}
 }
 
-void LoLEngine::walkMonster(LoLMonsterInPlay *monster) {
+void LoLEngine::walkMonster(LoLMonster *monster) {
 	if (monster->properties->flags & 0x400)
 		return;
 
@@ -1269,7 +1214,7 @@ void LoLEngine::walkMonster(LoLMonsterInPlay *monster) {
 	placeMonster(monster, fx, fy);
 }
 
-bool LoLEngine::chasePartyWithDistanceAttacks(LoLMonsterInPlay *monster) {
+bool LoLEngine::chasePartyWithDistanceAttacks(LoLMonster *monster) {
 	if (!monster->numDistAttacks)
 		return false;
 
@@ -1347,7 +1292,7 @@ bool LoLEngine::chasePartyWithDistanceAttacks(LoLMonsterInPlay *monster) {
 	return true;
 }
 
-void LoLEngine::chasePartyWithCloseAttacks(LoLMonsterInPlay *monster) {
+void LoLEngine::chasePartyWithCloseAttacks(LoLMonster *monster) {
 	if (!(monster->flags & 8)) {
 		int dir = calcMonsterDirection(monster->x & 0xff00, monster->y & 0xff00, _partyPosX & 0xff00, _partyPosY & 0xff00);
 		int x1 = _partyPosX;
@@ -1389,7 +1334,7 @@ void LoLEngine::chasePartyWithCloseAttacks(LoLMonsterInPlay *monster) {
 	}
 }
 
-int LoLEngine::walkMonsterCalcNextStep(LoLMonsterInPlay *monster) {
+int LoLEngine::walkMonsterCalcNextStep(LoLMonster *monster) {
 	static const int8 walkMonsterTable1[] = { 7, -6, 5, -4, 3, -2, 1, 0 };
 	static const int8 walkMonsterTable2[] = { -7, 6, -5, 4, -3, 2, -1, 0 };
 
@@ -1479,7 +1424,7 @@ int LoLEngine::checkForPossibleDistanceAttack(uint16 monsterBlock, int direction
 	return 5;
 }
 
-int LoLEngine::walkMonsterCheckDest(int x, int y, LoLMonsterInPlay *monster, int unk) {
+int LoLEngine::walkMonsterCheckDest(int x, int y, LoLMonster *monster, int unk) {
 	uint8 m = monster->mode;
 	monster->mode = 15;
 
@@ -1497,7 +1442,7 @@ void LoLEngine::getNextStepCoords(int16 srcX, int16 srcY, int &newX, int &newY,
 	newY = (srcY + shiftTableY[direction]) & 0x1fff;
 }
 
-void LoLEngine::rearrangeAttackingMonster(LoLMonsterInPlay *monster) {
+void LoLEngine::rearrangeAttackingMonster(LoLMonster *monster) {
 	int t = (monster->direction >> 1);
 	uint16 mx = monster->x;
 	uint16 my = monster->y;
@@ -1564,7 +1509,7 @@ void LoLEngine::rearrangeAttackingMonster(LoLMonsterInPlay *monster) {
 	placeMonster(monster, mx, my);
 }
 
-void LoLEngine::moveStrayingMonster(LoLMonsterInPlay *monster) {
+void LoLEngine::moveStrayingMonster(LoLMonster *monster) {
 	int x = 0;
 	int y = 0;
 
@@ -1601,7 +1546,7 @@ void LoLEngine::moveStrayingMonster(LoLMonsterInPlay *monster) {
 	}
 }
 
-void LoLEngine::killMonster(LoLMonsterInPlay *monster) {
+void LoLEngine::killMonster(LoLMonster *monster) {
 	setMonsterMode(monster, 14);
 	monsterDropItems(monster);
 	checkSceneUpdateNeed(monster->block);
-- 
cgit v1.2.3


From 0e2b8413e55eb9fa2839d89d7ff3e8270b8b8c29 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 25 Dec 2011 15:14:20 +0100
Subject: KYRA: add support for another Russian HOF fan translation

---
 engines/kyra/detection_tables.h | 14 ++++++++++++++
 engines/kyra/script.h           | 17 +++++++++++++++++
 engines/kyra/staticres.cpp      |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index 31d7d6e0f3..2b3708528c 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -645,6 +645,20 @@ const KYRAGameDescription adGameDescs[] = {
 		KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
 
+	// Russian fan translation
+	{ // CD version
+		{
+			"kyra2",
+			"CD",
+			AD_ENTRY1("FERRY.CPS", "763e2103858347d4ffffc329910d323f"),
+			Common::RU_RUS,
+			Common::kPlatformPC,
+			ADGF_DROPLANGUAGE | ADGF_CD,
+			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+		},
+		KYRA2_CD_FAN_FLAGS(Common::RU_RUS, Common::EN_ANY)
+	},
+
 	{ // Interactive Demo
 		{
 			"kyra2",
diff --git a/engines/kyra/script.h b/engines/kyra/script.h
index 858b2b11b8..dffb4e27f5 100644
--- a/engines/kyra/script.h
+++ b/engines/kyra/script.h
@@ -81,6 +81,23 @@ public:
 		// Both lead to some problems in our IFF parser, either reading after the end
 		// of file or producing a "Chunk overread" error message. To work around this
 		// we need to adjust the size field properly.
+
+		// Fix for certain Russian fan translations:
+		// Westwood's original code completely ignores the FORM chunk and its size
+		// setting. After opening a TIM or EMC file they just check whether the FORM
+		// chunk exists (as a kind of file type verification) and then immediately seek
+		// behind the FORM chunk.
+		// This means that their parser is immune to weird fan translation scripts
+		// where the file size doesn't match the form chunk size. In our implemetation
+		// this would produce "Chunk overread" errors.
+		// Westwood also always pads all chunk sizes to 2 byte alignment after reading
+		// them from the file (not with FORM though, since they completely ignore it).
+		// This seems to do the trick for our FORM chunk size issue with the Russian
+		// fan translations. Another method which I have tried and which seems to work
+		// well would be simply setting _formChunk.size to the file size (-12 for TIM).
+
+		_formChunk.size = (_formChunk.size + 1) & ~1;
+
 		if (_formType == MKTAG('E','M','C','2'))
 			_formChunk.size -= 8;
 		else if (_formType == MKTAG('A','V','F','S'))
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index e2a86d7194..6c95451c5f 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -38,7 +38,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 79
+#define RESFILE_VERSION 80
 
 namespace {
 bool checkKyraDat(Common::SeekableReadStream *file) {
-- 
cgit v1.2.3


From 56191e3928ef78a09ff3549f06d4e0ea795a5863 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Tue, 27 Dec 2011 23:49:35 +0000
Subject: DREAMWEB: Move 3 sound related variables out of data blob.

---
 engines/dreamweb/dreambase.h  |  4 ++++
 engines/dreamweb/dreamgen.cpp |  2 +-
 engines/dreamweb/dreamgen.h   |  3 ---
 engines/dreamweb/dreamweb.cpp |  3 +++
 engines/dreamweb/people.cpp   |  2 +-
 engines/dreamweb/sound.cpp    | 28 ++++++++++++++--------------
 engines/dreamweb/sprite.cpp   |  8 ++++----
 engines/dreamweb/stubs.cpp    |  2 +-
 engines/dreamweb/talk.cpp     |  4 ++--
 engines/dreamweb/titles.cpp   |  2 +-
 10 files changed, 31 insertions(+), 27 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index b4159db26c..a9f8ee7ec9 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -172,8 +172,12 @@ public:
 	bool _subtitles;
 	bool _foreignRelease;
 
+	// sound related
 	uint8 _roomsSample;
 	uint8 _currentSample;
+	uint8 _channel0Playing;
+	uint8 _channel0Repeat;
+	uint8 _channel1Playing;
 
 	// from backdrop.cpp
 	void doBlocks();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 8b69c84a1c..f9262fb126 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -67,7 +67,7 @@ void DreamGenContext::__start() {
 		//0x0110: .... .... .... ....
 		0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0120: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0xff, };
+		0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d283cd1c35..f999c6f6dc 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -268,9 +268,6 @@ static const uint16 kLineendy = 302;
 static const uint16 kLinepointer = 304;
 static const uint16 kLinedirection = 305;
 static const uint16 kLinelength = 306;
-static const uint16 kCh0playing = 307;
-static const uint16 kCh0repeat = 308;
-static const uint16 kCh1playing = 309;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 468999e1ba..39ef5eb301 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -415,6 +415,9 @@ DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) :
 	_quitRequested = false;
 
 	_currentSample = 0xff;
+	_channel0Playing = 0;
+	_channel0Repeat = 0;
+	_channel1Playing = 0xff;
 
 	_backdropBlocks = 0;
 	_reelList = 0;
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 7adc2b1220..ca7bf07866 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -148,7 +148,7 @@ void DreamBase::madmanText() {
 	if (isCD()) {
 		if (data.byte(kSpeechcount) >= 63)
 			return;
-		if (data.byte(kCh1playing) != 255)
+		if (_channel1Playing != 255)
 			return;
 		origCount = data.byte(kSpeechcount);
 		++data.byte(kSpeechcount);
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index 1eefedaae2..ac98ad21d5 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -56,30 +56,30 @@ void DreamBase::volumeAdjust() {
 }
 
 void DreamBase::playChannel0(uint8 index, uint8 repeat) {
-	data.byte(kCh0playing) = index;
+	_channel0Playing = index;
 	if (index >= 12)
 		index -= 12;
 
-	data.byte(kCh0repeat) = repeat;
+	_channel0Repeat = repeat;
 }
 
 void DreamBase::playChannel1(uint8 index) {
-	if (data.byte(kCh1playing) == 7)
+	if (_channel1Playing == 7)
 		return;
 
-	data.byte(kCh1playing) = index;
+	_channel1Playing = index;
 	if (index >= 12)
 		index -= 12;
 }
 
 void DreamBase::cancelCh0() {
-	data.byte(kCh0repeat) = 0;
-	data.byte(kCh0playing) = 255;
+	_channel0Repeat = 0;
+	_channel0Playing = 255;
 	engine->stopSound(0);
 }
 
 void DreamBase::cancelCh1() {
-	data.byte(kCh1playing) = 255;
+	_channel1Playing = 255;
 	engine->stopSound(1);
 }
 
@@ -93,10 +93,10 @@ void DreamBase::loadRoomsSample() {
 	Common::String sampleName = Common::String::format("DREAMWEB.V%02d", sample);
 	_currentSample = sample;
 
-	uint8 ch0 = data.byte(kCh0playing);
+	uint8 ch0 = _channel0Playing;
 	if (ch0 >= 12 && ch0 != 255)
 		cancelCh0();
-	uint8 ch1 = data.byte(kCh1playing);
+	uint8 ch1 = _channel1Playing;
 	if (ch1 >= 12)
 		cancelCh1();
 	engine->loadSounds(1, sampleName.c_str());
@@ -210,13 +210,13 @@ void DreamWebEngine::soundHandler() {
 	volume = (8 - volume) * Audio::Mixer::kMaxChannelVolume / 8;
 	_mixer->setChannelVolume(_channelHandle[0], volume);
 
-	uint8 ch0 = _base.data.byte(DreamGen::kCh0playing);
+	uint8 ch0 = _base._channel0Playing;
 	if (ch0 == 255)
 		ch0 = 0;
-	uint8 ch1 = _base.data.byte(DreamGen::kCh1playing);
+	uint8 ch1 = _base._channel1Playing;
 	if (ch1 == 255)
 		ch1 = 0;
-	uint8 ch0loop = _base.data.byte(DreamGen::kCh0repeat);
+	uint8 ch0loop = _base._channel0Repeat;
 
 	if (_channel0 != ch0) {
 		_channel0 = ch0;
@@ -231,11 +231,11 @@ void DreamWebEngine::soundHandler() {
 		}
 	}
 	if (!_mixer->isSoundHandleActive(_channelHandle[0])) {
-		_base.data.byte(DreamGen::kCh0playing) = 255;
+		_base._channel0Playing = 255;
 		_channel0 = 0;
 	}
 	if (!_mixer->isSoundHandleActive(_channelHandle[1])) {
-		_base.data.byte(DreamGen::kCh1playing) = 255;
+		_base._channel1Playing = 255;
 		_channel1 = 0;
 	}
 
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index d1b7934a2e..cc7631439a 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -495,7 +495,7 @@ void DreamBase::showRain() {
 		}
 	}
 
-	if (data.byte(kCh1playing) != 255)
+	if (_channel1Playing != 255)
 		return;
 	if (data.byte(kReallocation) == 2 && data.byte(kBeenmugged) != 1)
 		return;
@@ -506,7 +506,7 @@ void DreamBase::showRain() {
 		return;
 
 	uint8 soundIndex;
-	if (data.byte(kCh0playing) != 6)
+	if (_channel0Playing != 6)
 		soundIndex = 4;
 	else
 		soundIndex = 7;
@@ -677,7 +677,7 @@ void DreamBase::intro1Text() {
 	if (data.byte(kIntrocount) != 2 && data.byte(kIntrocount) != 4 && data.byte(kIntrocount) != 6)
 		return;
 
-	if (isCD() && data.byte(kCh1playing) != 255) {
+	if (isCD() && _channel1Playing != 255) {
 		data.byte(kIntrocount)--;
 	} else {
 		if (data.byte(kIntrocount) == 2)
@@ -750,7 +750,7 @@ void DreamBase::textForEnd() {
 }
 
 void DreamBase::textForMonkHelper(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
-	if (isCD() && data.byte(kCh1playing) != 255)
+	if (isCD() && _channel1Playing != 255)
 		data.byte(kIntrocount)--;
 	else
 		setupTimedTemp(textIndex, voiceIndex, x, y, countToTimed, timeCount);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index f62e651b1b..d61146e9c8 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2550,7 +2550,7 @@ void DreamBase::atmospheres() {
 			continue;
 		if (a->_mapX != data.byte(kMapx) || a->_mapY != data.byte(kMapy))
 			continue;
-		if (a->_sound != data.byte(kCh0playing)) {
+		if (a->_sound != _channel0Playing) {
 
 			if (data.byte(kLocation) == 45 && data.word(kReeltowatch) == 45)
 				continue; // "web"
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index d27d920891..992fea29a8 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -223,7 +223,7 @@ bool DreamBase::hangOnPQ() {
 			return true;
 		}
 
-		if (data.byte(kSpeechloaded) == 1 && data.byte(kCh1playing) == 255) {
+		if (data.byte(kSpeechloaded) == 1 && _channel1Playing == 255) {
 			speechFlag++;
 			if (speechFlag == 40)
 				break;
@@ -236,7 +236,7 @@ bool DreamBase::hangOnPQ() {
 }
 
 void DreamBase::redes() {
-	if (data.byte(kCh1playing) != 255 || data.byte(kTalkmode) != 2) {
+	if (_channel1Playing != 255 || data.byte(kTalkmode) != 2) {
 		blank();
 		return;
 	}
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index 8576fd4eb2..f30283e45a 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -58,7 +58,7 @@ void DreamBase::monkSpeaking() {
 
 		do {
 			engine->waitForVSync();
-		} while (data.byte(kCh1playing) != 255);
+		} while (_channel1Playing != 255);
 	}
 
 	data.byte(kVolumedirection) = 1;
-- 
cgit v1.2.3


From cc40a019e5f93f79d43b22773a04101006048e9f Mon Sep 17 00:00:00 2001
From: athrxx
Date: Wed, 28 Dec 2011 00:55:09 +0100
Subject: KYRA: (EOB) - fix EOB1 intro glitch

---
 engines/kyra/eobcommon.cpp     | 2 +-
 engines/kyra/sequences_eob.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 304d1a4539..15cabd9293 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -1059,7 +1059,7 @@ int EoBCoreEngine::countCharactersWithSpecificItems(int16 itemType, int16 itemVa
 }
 
 int EoBCoreEngine::checkInventoryForItem(int character, int16 itemType, int16 itemValue) {
-	if (character < 0 )
+	if (character < 0)
 		return -1;
 
 	for (int i = 0; i < 27; i++) {
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index 2d8e85471b..65c149ea8f 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -539,7 +539,7 @@ void EoBEngine::seq_hands() {
 		uint32 end = _system->getMillis() + _tickLength;
 		_screen->fillRect(0, 0, 167, 63, 157);
 		_screen->drawShape(2, shp1, i, 4, 0);
-		_screen->drawShape(2, shp1, 105 - i, 4, 0);
+		_screen->drawShape(2, shp2, 105 - i, 4, 0);
 		_screen->copyRegion(0, 0, 144, 32, 168, 64, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
 		delayUntil(end);
-- 
cgit v1.2.3


From 93173a11cad9f22978f573c9424b7e01971bf541 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Wed, 28 Dec 2011 00:04:12 +0000
Subject: DREAMWEB: Move 'wongame' flag out of data blob.

---
 engines/dreamweb/dreambase.h  |  2 ++
 engines/dreamweb/dreamgen.cpp |  6 +++---
 engines/dreamweb/dreamgen.h   | 45 +++++++++++++++++++++----------------------
 engines/dreamweb/people.cpp   |  4 ++--
 engines/dreamweb/stubs.cpp    |  6 +++---
 5 files changed, 32 insertions(+), 31 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index a9f8ee7ec9..b9eee14c42 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -172,6 +172,8 @@ public:
 	bool _subtitles;
 	bool _foreignRelease;
 
+	bool _wonGame;
+
 	// sound related
 	uint8 _roomsSample;
 	uint8 _currentSample;
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index f9262fb126..79c3672d90 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -63,11 +63,11 @@ void DreamGenContext::__start() {
 		//0x00f0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0100: .... .... .... ....
-		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, 0x17, 
 		//0x0110: .... .... .... ....
-		0x17, 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, 
 		//0x0120: .... .... .... ....
-		0x00, 0x00, 0x00, };
+		0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f999c6f6dc..9fada482be 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -245,29 +245,28 @@ static const uint16 kVolume = 270;
 static const uint16 kVolumeto = 271;
 static const uint16 kVolumedirection = 272;
 static const uint16 kVolumecount = 273;
-static const uint16 kWongame = 274;
-static const uint16 kLasthardkey = 275;
-static const uint16 kBufferin = 276;
-static const uint16 kBufferout = 278;
-static const uint16 kWorkspace = 280;
-static const uint16 kMainsprites = 282;
-static const uint16 kBackdrop = 284;
-static const uint16 kRecordspace = 286;
-static const uint16 kBlinkframe = 288;
-static const uint16 kBlinkcount = 289;
-static const uint16 kReasseschanges = 290;
-static const uint16 kPointerspath = 291;
-static const uint16 kManspath = 292;
-static const uint16 kPointerfirstpath = 293;
-static const uint16 kFinaldest = 294;
-static const uint16 kDestination = 295;
-static const uint16 kLinestartx = 296;
-static const uint16 kLinestarty = 298;
-static const uint16 kLineendx = 300;
-static const uint16 kLineendy = 302;
-static const uint16 kLinepointer = 304;
-static const uint16 kLinedirection = 305;
-static const uint16 kLinelength = 306;
+static const uint16 kLasthardkey = 274;
+static const uint16 kBufferin = 275;
+static const uint16 kBufferout = 277;
+static const uint16 kWorkspace = 279;
+static const uint16 kMainsprites = 281;
+static const uint16 kBackdrop = 283;
+static const uint16 kRecordspace = 285;
+static const uint16 kBlinkframe = 287;
+static const uint16 kBlinkcount = 288;
+static const uint16 kReasseschanges = 289;
+static const uint16 kPointerspath = 290;
+static const uint16 kManspath = 291;
+static const uint16 kPointerfirstpath = 292;
+static const uint16 kFinaldest = 293;
+static const uint16 kDestination = 294;
+static const uint16 kLinestartx = 295;
+static const uint16 kLinestarty = 297;
+static const uint16 kLineendx = 299;
+static const uint16 kLineendy = 301;
+static const uint16 kLinepointer = 303;
+static const uint16 kLinedirection = 304;
+static const uint16 kLinelength = 305;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index ca7bf07866..0e18303926 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -178,8 +178,8 @@ void DreamBase::madman(ReelRoutine &routine) {
 		}
 		++newReelPointer;
 		if (newReelPointer == 294) {
-			if (data.byte(kWongame) != 1) {
-				data.byte(kWongame) = 1;
+			if (!_wonGame) {
+				_wonGame = true;
 				getRidOfTempText();
 			}
 			return;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index d61146e9c8..8c4d7389ca 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -482,7 +482,7 @@ void DreamBase::dreamweb() {
 	clearPalette();
 	set16ColPalette();
 	readSetData();
-	data.byte(kWongame) = 0;
+	_wonGame = false;
 
 	engine->loadSounds(0, "DREAMWEB.V99"); // basic sample
 
@@ -589,7 +589,7 @@ void DreamBase::dreamweb() {
 			if (_quitRequested)
 				goto done;
 
-			if (data.byte(kWongame) != 0) {
+			if (_wonGame) {
 				// "endofgame"
 				clearBeforeLoad();
 				fadeScreenDowns();
@@ -712,7 +712,7 @@ void DreamBase::screenUpdate() {
 	zoom();
 
 	showPointer();
-	if (data.byte(kWongame))
+	if (_wonGame)
 		return;
 	vSync();
 	mouseState |= readMouseState();
-- 
cgit v1.2.3


From 4f5a708d7dc8d4040e866430df7ab019379f3e03 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 28 Dec 2011 01:17:34 +0100
Subject: TSAGE: R2R - Implement scene 3700

---
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   3 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  |  73 ++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h    |  17 ++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 217 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   |  26 +++
 5 files changed, 336 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index dfa135be6c..1b6c375b80 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -224,7 +224,10 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		return new Scene3400();
 	case 3500:
 	case 3600:
+		error("Missing scene %d from group 3", sceneNumber);
 	case 3700:
+		// Cutscene - Teleport outside
+		return new Scene3700();
 	case 3800:
 	case 3900:
 		error("Missing scene %d from group 3", sceneNumber);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 85e1f7760b..4c749a9166 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1945,5 +1945,78 @@ void Scene3400::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3700 - Cutscene - Teleport outside
+ *
+ *--------------------------------------------------------------------------*/
+void Scene3700::postInit(SceneObjectList *OwnerList) {
+	loadScene(3700);
+	R2_GLOBALS._v58CE2 = 0;
+	SceneExt::postInit();
+
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+	_stripManager.addSpeaker(&_mirandaSpeaker);
+
+	_actor1.postInit();
+	_actor1._moveDiff = Common::Point(3, 2);
+
+	_actor2.postInit();
+	_actor2._numFrames = 7;
+	_actor2._moveDiff = Common::Point(5, 3);
+	_actor2.hide();
+
+	_actor3.postInit();
+	_actor3._moveDiff = Common::Point(3, 2);
+	_actor3.hide();
+
+	_actor4.postInit();
+	_actor4._numFrames = 7;
+	_actor4._moveDiff = Common::Point(5, 3);
+	_actor4.hide();
+
+	_actor5.postInit();
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._sound1.play(332);
+
+	_sceneMode = 3700;
+	setAction(&_sequenceManager, this, 3700, &_actor1, &_actor2, &_actor3, &_actor4, &_actor5, NULL);
+}
+
+void Scene3700::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene3700::signal() {
+	switch (_sceneMode) {
+	case 3328:
+	// No break on purpose
+	case 3329:
+		warning("STUB: sub_1D227()");
+		setAction(&_sequenceManager, this, 3701, &_actor2, &_actor3, &_actor4, NULL);
+		break;
+	case 3700:
+		_actor1.setup(10, 6, 1);
+		_actor2.setup(20, 5, 1);
+		if (R2_GLOBALS.getFlag(71)) {
+			_sceneMode = 3329;
+			_stripManager.start(3329, this);
+		} else {
+			_sceneMode = 3328;
+			_stripManager.start(3328, this);
+		}
+	case 3701:
+		R2_GLOBALS._sceneManager.changeScene(1000);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 8968bddf1a..f83417e772 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -424,6 +424,23 @@ public:
 	virtual void signal();
 	virtual void synchronize(Serializer &s);
 };
+
+class Scene3700 : public SceneExt {
+public:
+	SpeakerQuinn3700 _quinnSpeaker;
+	SpeakerSeeker3700 _seekerSpeaker;
+	SpeakerMiranda3700 _mirandaSpeaker;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index edcf340e04..25ad156cd3 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1915,5 +1915,222 @@ void SpeakerTeal3400::proc15() {
 	}
 }
 
+SpeakerQuinn3700::SpeakerQuinn3700() {
+	_speakerName = "QUINN";
+	_color1 = 60;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerQuinn3700::setText(const Common::String &msg) {
+	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_fieldF6) {
+	case 2:
+		scene->_actor3.setup(30, 1, 1);
+		R2_GLOBALS._sound2.play(44);
+		break;
+	case 3:
+		scene->_actor3.setup(30, 1, 1);
+		break;
+	default:
+		scene->_actor3.setup(30, 7, 1);
+		break;
+	}
+	VisualSpeaker::setText(msg);
+}
+
+void SpeakerQuinn3700::proc15() {
+	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &scene->_actor1;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+
+	_object1.setPosition(_object2->_position);
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		R2_GLOBALS._sound2.stop();
+		scene->_actor1.setup(10, 4, 1);
+		scene->_actor3.setup(30, 7, 1);
+		_object1.setup(3701, 1, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		scene->_actor2.setup(20, 1, 1);
+		scene->_actor3.setup(30, 1, 1);
+		_object1.setup(3701, 2, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 3:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		scene->_actor1.setup(10, 2, 1);
+		scene->_actor3.setup(30, 1, 1);
+		_object1.setup(4011, 1, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
+SpeakerSeeker3700::SpeakerSeeker3700() {
+	_speakerName = "SEEKER";
+	_color1 = 35;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerSeeker3700::setText(const Common::String &msg) {
+	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
+
+	if (_fieldF6 == 1) {
+		R2_GLOBALS._sound2.play(44);
+		scene->_actor3.setup(30, 8, 1);
+	} else {
+		scene->_actor3.setup(30, 2, 1);
+	}
+	VisualSpeaker::setText(msg);
+}
+
+void SpeakerSeeker3700::proc15() {
+	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &scene->_actor2;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+
+	_object1.setPosition(_object2->_position);
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		R2_GLOBALS._sound2.stop();
+		scene->_actor1.setup(10, 8, 1);
+		scene->_actor2.setup(20, 7, 1);
+		scene->_actor3.setup(30, 8, 1);
+		_object1.setup(3701, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		scene->_actor1.setup(10, 2, 1);
+		scene->_actor2.setup(20, 1, 1);
+		scene->_actor3.setup(30, 1, 1);
+		_object1.setup(4031, 1, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
+SpeakerMiranda3700::SpeakerMiranda3700() {
+	_speakerName = "MIRANDA";
+	_color1 = 154;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerMiranda3700::proc15() {
+	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &scene->_actor3;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+
+	_object1.setPosition(_object2->_position);
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		scene->_actor1.setup(10, 6, 1);
+		scene->_actor2.setup(20, 5, 1);
+		_object2->setup(30, 1, 1);
+		scene->_actor4.setup(40, 1, 1);
+		_object1.setup(4050, 5, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		scene->_actor3.setup(30, 8, 1);
+		_object1.setup(4052, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 3:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		scene->_actor2.setup(20, 1, 1);
+		scene->_actor3.setup(30, 1, 1);
+		_object1.setup(4051, 7, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index f85b412f9c..e4ea036938 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -428,6 +428,32 @@ public:
 	virtual Common::String getClassName() { return "SpeakerTeal3400"; }
 	virtual void proc15();
 };
+
+class SpeakerQuinn3700 : public VisualSpeaker {
+public:
+	SpeakerQuinn3700();
+
+	virtual Common::String getClassName() { return "SpeakerQuinn3700"; }
+	virtual void setText(const Common::String &msg);
+	virtual void proc15();
+};
+
+class SpeakerSeeker3700 : public VisualSpeaker {
+public:
+	SpeakerSeeker3700();
+
+	virtual Common::String getClassName() { return "SpeakerSeeker3700"; }
+	virtual void setText(const Common::String &msg);
+	virtual void proc15();
+};
+
+class SpeakerMiranda3700 : public VisualSpeaker {
+public:
+	SpeakerMiranda3700();
+
+	virtual Common::String getClassName() { return "SpeakerMiranda3700"; }
+	virtual void proc15();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 5492307982b3af117f2314cc22c680b48afe9689 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Wed, 28 Dec 2011 00:40:00 +0000
Subject: DREAMWEB: Move 'speechloaded' flag out of data blob.

---
 engines/dreamweb/dreambase.h  |  2 ++
 engines/dreamweb/dreamgen.cpp |  4 ++--
 engines/dreamweb/dreamgen.h   | 53 +++++++++++++++++++++----------------------
 engines/dreamweb/dreamweb.cpp |  2 ++
 engines/dreamweb/sound.cpp    |  2 +-
 engines/dreamweb/stubs.cpp    |  4 ++--
 engines/dreamweb/talk.cpp     | 12 +++++-----
 7 files changed, 41 insertions(+), 38 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index b9eee14c42..07afc167c9 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -181,6 +181,8 @@ public:
 	uint8 _channel0Repeat;
 	uint8 _channel1Playing;
 
+	bool _speechLoaded;
+
 	// from backdrop.cpp
 	void doBlocks();
 	uint8 getXAd(const uint8 *setData, uint8 *result);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 79c3672d90..53d814eb46 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -63,11 +63,11 @@ void DreamGenContext::__start() {
 		//0x00f0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0100: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 
 		//0x0110: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0120: .... .... .... ....
-		0x00, 0x00, };
+		0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 9fada482be..f1f5f96a44 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -240,33 +240,32 @@ static const uint16 kAddtogreen = 264;
 static const uint16 kAddtored = 265;
 static const uint16 kAddtoblue = 266;
 static const uint16 kLastsoundreel = 267;
-static const uint16 kSpeechloaded = 269;
-static const uint16 kVolume = 270;
-static const uint16 kVolumeto = 271;
-static const uint16 kVolumedirection = 272;
-static const uint16 kVolumecount = 273;
-static const uint16 kLasthardkey = 274;
-static const uint16 kBufferin = 275;
-static const uint16 kBufferout = 277;
-static const uint16 kWorkspace = 279;
-static const uint16 kMainsprites = 281;
-static const uint16 kBackdrop = 283;
-static const uint16 kRecordspace = 285;
-static const uint16 kBlinkframe = 287;
-static const uint16 kBlinkcount = 288;
-static const uint16 kReasseschanges = 289;
-static const uint16 kPointerspath = 290;
-static const uint16 kManspath = 291;
-static const uint16 kPointerfirstpath = 292;
-static const uint16 kFinaldest = 293;
-static const uint16 kDestination = 294;
-static const uint16 kLinestartx = 295;
-static const uint16 kLinestarty = 297;
-static const uint16 kLineendx = 299;
-static const uint16 kLineendy = 301;
-static const uint16 kLinepointer = 303;
-static const uint16 kLinedirection = 304;
-static const uint16 kLinelength = 305;
+static const uint16 kVolume = 269;
+static const uint16 kVolumeto = 270;
+static const uint16 kVolumedirection = 271;
+static const uint16 kVolumecount = 272;
+static const uint16 kLasthardkey = 273;
+static const uint16 kBufferin = 274;
+static const uint16 kBufferout = 276;
+static const uint16 kWorkspace = 278;
+static const uint16 kMainsprites = 280;
+static const uint16 kBackdrop = 282;
+static const uint16 kRecordspace = 284;
+static const uint16 kBlinkframe = 286;
+static const uint16 kBlinkcount = 287;
+static const uint16 kReasseschanges = 288;
+static const uint16 kPointerspath = 289;
+static const uint16 kManspath = 290;
+static const uint16 kPointerfirstpath = 291;
+static const uint16 kFinaldest = 292;
+static const uint16 kDestination = 293;
+static const uint16 kLinestartx = 294;
+static const uint16 kLinestarty = 296;
+static const uint16 kLineendx = 298;
+static const uint16 kLineendy = 300;
+static const uint16 kLinepointer = 302;
+static const uint16 kLinedirection = 303;
+static const uint16 kLinelength = 304;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 39ef5eb301..c89da250aa 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -419,6 +419,8 @@ DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) :
 	_channel0Repeat = 0;
 	_channel1Playing = 0xff;
 
+	_speechLoaded = false;
+
 	_backdropBlocks = 0;
 	_reelList = 0;
 
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index ac98ad21d5..8985950d68 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -37,7 +37,7 @@ bool DreamBase::loadSpeech(byte type1, int idx1, byte type2, int idx2) {
 	//debug("name = %s", name.c_str());
 	bool result = engine->loadSpeech(name);
 
-	data.byte(kSpeechloaded) = result;
+	_speechLoaded = result;
 	return result;
 }
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 8c4d7389ca..44c5decd70 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -944,7 +944,7 @@ void DreamBase::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8
 		// FIXME: This fallthrough does not properly support subtitles+speech
 		// mode. The parameters to setuptimedtemp() are sometimes different
 		// for speech and for subtitles. See e.g., madmantext()
-		if ((data.byte(kSpeechloaded) == 1) && !_subtitles)
+		if (_speechLoaded && !_subtitles)
 			return;
 	}
 #endif
@@ -1703,7 +1703,7 @@ bool DreamBase::isCD() {
 	// This is a hack to guess which version to use with the assumption that if we have a cd version
 	// we managed to load the speech. At least it is isolated in this function and can be changed.
 	// Maybe detect the version during game id?
-	return (data.byte(kSpeechloaded) == 1);
+	return (_speechLoaded);
 }
 
 void DreamBase::showIcon() {
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 992fea29a8..ed52e76bd7 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -66,7 +66,7 @@ void DreamBase::talk() {
 
 	redrawMainScrn();
 	workToScreenM();
-	if (data.byte(kSpeechloaded) == 1) {
+	if (_speechLoaded) {
 		cancelCh1();
 		data.byte(kVolumedirection) = (byte)-1;
 		data.byte(kVolumeto) = 0;
@@ -98,9 +98,9 @@ void DreamBase::startTalk() {
 	y = 80;
 	printDirect(&str, 66, &y, 241, true);
 
-	data.byte(kSpeechloaded) = 0;
+	_speechLoaded = false;
 	loadSpeech('R', data.byte(kReallocation), 'C', 64*(data.byte(kCharacter) & 0x7F));
-	if (data.byte(kSpeechloaded) == 1) {
+	if (_speechLoaded) {
 		data.byte(kVolumedirection) = 1;
 		data.byte(kVolumeto) = 6;
 		playChannel1(50 + 12);
@@ -155,7 +155,7 @@ void DreamBase::doSomeTalk() {
 		printDirect(str, 164, 64, 144, false);
 
 		loadSpeech('R', data.byte(kReallocation), 'C', (64 * (data.byte(kCharacter) & 0x7F)) + data.byte(kTalkpos));
-		if (data.byte(kSpeechloaded) != 0)
+		if (_speechLoaded)
 			playChannel1(62);
 
 		data.byte(kPointermode) = 3;
@@ -181,7 +181,7 @@ void DreamBase::doSomeTalk() {
 			printDirect(str, 48, 128, 144, false);
 
 			loadSpeech('R', data.byte(kReallocation), 'C', (64 * (data.byte(kCharacter) & 0x7F)) + data.byte(kTalkpos));
-			if (data.byte(kSpeechloaded) != 0)
+			if (_speechLoaded)
 				playChannel1(62);
 
 			data.byte(kPointermode) = 3;
@@ -223,7 +223,7 @@ bool DreamBase::hangOnPQ() {
 			return true;
 		}
 
-		if (data.byte(kSpeechloaded) == 1 && _channel1Playing == 255) {
+		if (_speechLoaded && _channel1Playing == 255) {
 			speechFlag++;
 			if (speechFlag == 40)
 				break;
-- 
cgit v1.2.3


From ae8ab8d94e53ce94330987705da2353f7e146ba5 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 28 Dec 2011 01:39:01 +0100
Subject: KYRA: Silence some valgrind warnings by doing a slight sanity check
 on savefile size.

---
 engines/kyra/saveload.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index f4fd4668ee..41ba1e5e50 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -60,6 +60,9 @@ KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::Seekab
 		bool saveOk = false;
 
 		for (uint i = 0; i < ARRAYSIZE(descriptionSize) && !saveOk; ++i) {
+			if (in->size() < descriptionSize[i] + 6)
+				continue;
+
 			in->seek(0, SEEK_SET);
 			in->read(descriptionBuffer, descriptionSize[i]);
 			descriptionBuffer[descriptionSize[i]] = 0;
-- 
cgit v1.2.3


From db2e0fb0423b575151fde09256c9ccb10ee824e5 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 28 Dec 2011 01:51:09 +0100
Subject: KYRA: Slight cleanup in the transfer party code.

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

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 50153d7de3..1093bec079 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -1529,14 +1529,13 @@ bool TransferPartyWiz::start() {
 }
 
 bool TransferPartyWiz::selectAndLoadTransferFile() {
-	for (int numLoops = 1; numLoops; numLoops--) {
+	do {
 		_screen->copyPage(12, 0);
 		_vm->_savegameFilename = transferFileDialogue();
-		if (_vm->_savegameFilename.empty()) {
-			if (_vm->_gui->confirmDialogue2(15, 68, 1))
-				numLoops++;
-		}
-	}
+	} while (_vm->_savegameFilename.empty() && _vm->_gui->confirmDialogue2(15, 68, 1));
+
+	if (_vm->_savegameFilename.empty())
+		return false;
 
 	if (_vm->_savegameFilename.equals(_vm->_saveLoadStrings[1]))
 		return false;
@@ -1586,7 +1585,7 @@ Common::String TransferPartyWiz::transferFileDialogue() {
 			targets.push_back(*i);
 	}
 
-	if (targets.begin() == targets.end())
+	if (targets.empty())
 		return tfile;
 
 	Common::String target = _vm->_gui->transferTargetMenu(targets);
-- 
cgit v1.2.3


From a09fdaa0b1daca086bbe6083be6d335cac11ad24 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Wed, 28 Dec 2011 01:31:24 +0000
Subject: DREAMWEB: Move 4 volume related variables out of data blob.

---
 engines/dreamweb/dreambase.h  |  5 +++++
 engines/dreamweb/dreamgen.cpp |  6 ++----
 engines/dreamweb/dreamgen.h   | 48 ++++++++++++++++++++-----------------------
 engines/dreamweb/dreamweb.cpp |  5 +++++
 engines/dreamweb/people.cpp   |  4 ++--
 engines/dreamweb/print.cpp    |  6 +++---
 engines/dreamweb/sound.cpp    | 14 ++++++-------
 engines/dreamweb/sprite.cpp   |  4 ++--
 engines/dreamweb/stubs.cpp    | 20 +++++++++---------
 engines/dreamweb/talk.cpp     |  8 ++++----
 engines/dreamweb/titles.cpp   | 26 +++++++++++------------
 11 files changed, 75 insertions(+), 71 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 07afc167c9..47f0cec24f 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -181,6 +181,11 @@ public:
 	uint8 _channel0Repeat;
 	uint8 _channel1Playing;
 
+	uint8 _volume;
+	uint8 _volumeTo;
+	int8 _volumeDirection;
+	uint8 _volumeCount;
+
 	bool _speechLoaded;
 
 	// from backdrop.cpp
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 53d814eb46..239725c263 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -63,11 +63,9 @@ void DreamGenContext::__start() {
 		//0x00f0: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0100: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 
 		//0x0110: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0120: .... .... .... ....
-		0x00, };
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f1f5f96a44..fa13b47c2d 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -240,32 +240,28 @@ static const uint16 kAddtogreen = 264;
 static const uint16 kAddtored = 265;
 static const uint16 kAddtoblue = 266;
 static const uint16 kLastsoundreel = 267;
-static const uint16 kVolume = 269;
-static const uint16 kVolumeto = 270;
-static const uint16 kVolumedirection = 271;
-static const uint16 kVolumecount = 272;
-static const uint16 kLasthardkey = 273;
-static const uint16 kBufferin = 274;
-static const uint16 kBufferout = 276;
-static const uint16 kWorkspace = 278;
-static const uint16 kMainsprites = 280;
-static const uint16 kBackdrop = 282;
-static const uint16 kRecordspace = 284;
-static const uint16 kBlinkframe = 286;
-static const uint16 kBlinkcount = 287;
-static const uint16 kReasseschanges = 288;
-static const uint16 kPointerspath = 289;
-static const uint16 kManspath = 290;
-static const uint16 kPointerfirstpath = 291;
-static const uint16 kFinaldest = 292;
-static const uint16 kDestination = 293;
-static const uint16 kLinestartx = 294;
-static const uint16 kLinestarty = 296;
-static const uint16 kLineendx = 298;
-static const uint16 kLineendy = 300;
-static const uint16 kLinepointer = 302;
-static const uint16 kLinedirection = 303;
-static const uint16 kLinelength = 304;
+static const uint16 kLasthardkey = 269;
+static const uint16 kBufferin = 270;
+static const uint16 kBufferout = 272;
+static const uint16 kWorkspace = 274;
+static const uint16 kMainsprites = 276;
+static const uint16 kBackdrop = 278;
+static const uint16 kRecordspace = 280;
+static const uint16 kBlinkframe = 282;
+static const uint16 kBlinkcount = 283;
+static const uint16 kReasseschanges = 284;
+static const uint16 kPointerspath = 285;
+static const uint16 kManspath = 286;
+static const uint16 kPointerfirstpath = 287;
+static const uint16 kFinaldest = 288;
+static const uint16 kDestination = 289;
+static const uint16 kLinestartx = 290;
+static const uint16 kLinestarty = 292;
+static const uint16 kLineendx = 294;
+static const uint16 kLineendy = 296;
+static const uint16 kLinepointer = 298;
+static const uint16 kLinedirection = 299;
+static const uint16 kLinelength = 300;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index c89da250aa..de6a48170d 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -419,6 +419,11 @@ DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) :
 	_channel0Repeat = 0;
 	_channel1Playing = 0xff;
 
+	_volume = 0;
+	_volumeTo = 0;
+	_volumeDirection = 0;
+	_volumeCount = 0;
+
 	_speechLoaded = false;
 
 	_backdropBlocks = 0;
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 0e18303926..5b04e5be60 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -1016,8 +1016,8 @@ void DreamBase::endGameSeq(ReelRoutine &routine) {
 			fadeScreenDownHalf();
 		} else if (nextReelPointer == 324) {
 			fadeScreenDowns();
-			data.byte(kVolumeto) = 7;
-			data.byte(kVolumedirection) = 1;
+			_volumeTo = 7;
+			_volumeDirection = 1;
 		}
 
 		if (nextReelPointer == 340)
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index b20726dc44..9bdebc1e14 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -247,9 +247,9 @@ const char *DreamBase::monPrint(const char *string) {
 
 void DreamBase::rollEndCreditsGameWon() {
 	playChannel0(16, 255);
-	data.byte(kVolume) = 7;
-	data.byte(kVolumeto) = 0;
-	data.byte(kVolumedirection) = (byte)-1;
+	_volume = 7;
+	_volumeTo = 0;
+	_volumeDirection = -1;
 
 	multiGet(_mapStore, 75, 20, 160, 160);
 
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index 8985950d68..774f22a0b9 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -43,15 +43,15 @@ bool DreamBase::loadSpeech(byte type1, int idx1, byte type2, int idx2) {
 
 
 void DreamBase::volumeAdjust() {
-	if (data.byte(kVolumedirection) == 0)
+	if (_volumeDirection == 0)
 		return;
-	if (data.byte(kVolume) != data.byte(kVolumeto)) {
-		data.byte(kVolumecount) += 64;
+	if (_volume != _volumeTo) {
+		_volumeCount += 64;
 		// Only modify the volume every 256/64 = 4th time around
-		if (data.byte(kVolumecount) == 0)
-			data.byte(kVolume) += data.byte(kVolumedirection);
+		if (_volumeCount == 0)
+			_volume += _volumeDirection;
 	} else {
-		data.byte(kVolumedirection) = 0;
+		_volumeDirection = 0;
 	}
 }
 
@@ -194,7 +194,7 @@ void DreamWebEngine::soundHandler() {
 	_base._subtitles = ConfMan.getBool("subtitles");
 	_base.volumeAdjust();
 
-	uint volume = _base.data.byte(DreamGen::kVolume);
+	uint volume = _base._volume;
 	//.vol file loaded into soundbuf:0x4000
 	//volume table at (volume * 0x100 + 0x3f00)
 	//volume value could be from 1 to 7
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index cc7631439a..83a05b9bb0 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -786,8 +786,8 @@ void DreamBase::textForMonk() {
 	else if (data.byte(kIntrocount) == 53) {
 		fadeScreenDowns();
 		if (isCD()) {
-			data.byte(kVolumeto) = 7;
-			data.byte(kVolumedirection) = 1;
+			_volumeTo = 7;
+			_volumeDirection = 1;
 		}
 	}
 }
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 44c5decd70..0c7877f8e4 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -563,7 +563,7 @@ void DreamBase::dreamweb() {
 			data.byte(kLocation) = 255;
 			data.byte(kRoomafterdream) = 1;
 			data.byte(kNewlocation) = 35;
-			data.byte(kVolume) = 7;
+			_volume = 7;
 			loadRoom();
 			clearSprites();
 			initMan();
@@ -573,8 +573,8 @@ void DreamBase::dreamweb() {
 			initialInv();
 			data.byte(kLastflag) = 32;
 			startup1();
-			data.byte(kVolumeto) = 0;
-			data.byte(kVolumedirection) = (byte)-1;
+			_volumeTo = 0;
+			_volumeDirection = -1;
 			data.byte(kCommandtype) = 255;
 
 		}
@@ -2565,21 +2565,21 @@ void DreamBase::atmospheres() {
 			//  I'm interpreting this as if the cmp reallocation is below the jz
 
 			if (data.byte(kMapy) == 0) {
-				data.byte(kVolume) = 0; // "fullvol"
+				_volume = 0; // "fullvol"
 				return;
 			}
 
 			if (data.byte(kReallocation) == 2 && data.byte(kMapx) == 22 && data.byte(kMapy) == 10)
-				data.byte(kVolume) = 5; // "louisvol"
+				_volume = 5; // "louisvol"
 
 			if (isCD() && data.byte(kReallocation) == 14) {
 				if (data.byte(kMapx) == 33) {
-					data.byte(kVolume) = 0; // "ismad2"
+					_volume = 0; // "ismad2"
 					return;
 				}
 
 				if (data.byte(kMapx) == 22) {
-					data.byte(kVolume) = 5;
+					_volume = 5;
 					return;
 				}
 
@@ -2588,12 +2588,12 @@ void DreamBase::atmospheres() {
 
 		if (data.byte(kReallocation) == 2) {
 			if (data.byte(kMapx) == 22) {
-				data.byte(kVolume) = 5; // "louisvol"
+				_volume = 5; // "louisvol"
 				return;
 			}
 
 			if (data.byte(kMapx) == 11) {
-				data.byte(kVolume) = 0; // "fullvol"
+				_volume = 0; // "fullvol"
 				return;
 			}
 		}
@@ -3162,7 +3162,7 @@ void DreamBase::showGun() {
 	hangOn(200);
 	_roomsSample = 34;
 	loadRoomsSample();
-	data.byte(kVolume) = 0;
+	_volume = 0;
 	loadIntoTemp("DREAMWEB.G13");
 	createPanel2();
 	showFrame(_tempGraphics, 100, 4, 0, 0);
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index ed52e76bd7..5478a0f1f2 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -68,8 +68,8 @@ void DreamBase::talk() {
 	workToScreenM();
 	if (_speechLoaded) {
 		cancelCh1();
-		data.byte(kVolumedirection) = (byte)-1;
-		data.byte(kVolumeto) = 0;
+		_volumeDirection = -1;
+		_volumeTo = 0;
 	}
 }
 
@@ -101,8 +101,8 @@ void DreamBase::startTalk() {
 	_speechLoaded = false;
 	loadSpeech('R', data.byte(kReallocation), 'C', 64*(data.byte(kCharacter) & 0x7F));
 	if (_speechLoaded) {
-		data.byte(kVolumedirection) = 1;
-		data.byte(kVolumeto) = 6;
+		_volumeDirection = 1;
+		_volumeTo = 6;
 		playChannel1(50 + 12);
 	}
 }
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index f30283e45a..529f400ff6 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -30,8 +30,8 @@ void DreamBase::endGame() {
 	monkSpeaking();
 	gettingShot();
 	getRidOfTempText();
-	data.byte(kVolumeto) = 7;
-	data.byte(kVolumedirection) = 1;
+	_volumeTo = 7;
+	_volumeDirection = 1;
 	hangOn(200);
 }
 
@@ -44,9 +44,9 @@ void DreamBase::monkSpeaking() {
 	clearWork();
 	showFrame(_tempGraphics, 160, 72, 0, 128);	// show monk
 	workToScreen();
-	data.byte(kVolume) = 7;
-	data.byte(kVolumedirection) = (byte)-1;
-	data.byte(kVolumeto) = 5;
+	_volume = 7;
+	_volumeDirection = -1;
+	_volumeTo = 5;
 	playChannel0(12, 255);
 	fadeScreenUps();
 	hangOn(300);
@@ -61,8 +61,8 @@ void DreamBase::monkSpeaking() {
 		} while (_channel1Playing != 255);
 	}
 
-	data.byte(kVolumedirection) = 1;
-	data.byte(kVolumeto) = 7;
+	_volumeDirection = 1;
+	_volumeTo = 7;
 	fadeScreenDowns();
 	hangOn(300);
 	getRidOfTemp();
@@ -73,8 +73,8 @@ void DreamBase::gettingShot() {
 	clearPalette();
 	loadIntroRoom();
 	fadeScreenUps();
-	data.byte(kVolumeto) = 0;
-	data.byte(kVolumedirection) = (byte)-1;
+	_volumeTo = 0;
+	_volumeDirection = -1;
 	runEndSeq();
 	clearBeforeLoad();
 }
@@ -125,9 +125,9 @@ void DreamBase::intro() {
 	data.byte(kNewlocation) = 50;
 	clearPalette();
 	loadIntroRoom();
-	data.byte(kVolume) = 7;
-	data.byte(kVolumedirection) = (byte)-1;
-	data.byte(kVolumeto) = 4;
+	_volume = 7;
+	_volumeDirection = -1;
+	_volumeTo = 4;
 	playChannel0(12, 255);
 	fadeScreenUps();
 	runIntroSeq();
@@ -265,7 +265,7 @@ void DreamBase::set16ColPalette() {
 void DreamBase::realCredits() {
 	_roomsSample = 33;
 	loadRoomsSample();
-	data.byte(kVolume) = 0;
+	_volume = 0;
 
 	initGraphics(640, 480, true);
 	hangOn(35);
-- 
cgit v1.2.3


From 4c2d2684ea54d98828d44b18fb7b17ed84c7bf22 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 28 Dec 2011 02:28:27 +0100
Subject: DREAMWEB: Mass-move variables out of data

This has been done by an automated search/replace, culling unused
variables in the process. The remaining variables in data are all stored
in savegames.
---
 engines/dreamweb/backdrop.cpp |   38 +-
 engines/dreamweb/dreambase.h  |  143 ++++++
 engines/dreamweb/dreamgen.cpp |   30 +-
 engines/dreamweb/dreamgen.h   |  177 +------
 engines/dreamweb/dreamweb.cpp |  157 +++++-
 engines/dreamweb/keypad.cpp   |   76 +--
 engines/dreamweb/monitor.cpp  |  100 ++--
 engines/dreamweb/newplace.cpp |   90 ++--
 engines/dreamweb/object.cpp   |  410 ++++++++--------
 engines/dreamweb/pathfind.cpp |  112 ++---
 engines/dreamweb/people.cpp   |  132 +++---
 engines/dreamweb/print.cpp    |   50 +-
 engines/dreamweb/saveload.cpp |  234 ++++-----
 engines/dreamweb/sprite.cpp   |  274 +++++------
 engines/dreamweb/stubs.cpp    | 1052 ++++++++++++++++++++---------------------
 engines/dreamweb/talk.cpp     |   82 ++--
 engines/dreamweb/titles.cpp   |  142 +++---
 engines/dreamweb/use.cpp      |  456 +++++++++---------
 engines/dreamweb/vgafades.cpp |  106 ++---
 engines/dreamweb/vgagrafx.cpp |   16 +-
 20 files changed, 1981 insertions(+), 1896 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 295be471f0..e5c2f30abd 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -25,8 +25,8 @@
 namespace DreamGen {
 
 void DreamBase::doBlocks() {
-	uint16 dstOffset = data.word(kMapady) * 320 + data.word(kMapadx);
-	uint16 mapOffset = kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx);
+	uint16 dstOffset = _mapAdY * 320 + _mapAdX;
+	uint16 mapOffset = kMap + _mapY * kMapwidth + _mapX;
 	const uint8 *mapData = _mapData + mapOffset;
 	uint8 *dstBuffer = workspace() + dstOffset;
 
@@ -67,9 +67,9 @@ uint8 DreamBase::getXAd(const uint8 *setData, uint8 *result) {
 	uint8 v2 = setData[2];
 	if (v0 != 0)
 		return 0;
-	if (v1 < data.byte(kMapx))
+	if (v1 < _mapX)
 		return 0;
-	v1 -= data.byte(kMapx);
+	v1 -= _mapX;
 	if (v1 >= 11)
 		return 0;
 	*result = (v1 << 4) | v2;
@@ -79,9 +79,9 @@ uint8 DreamBase::getXAd(const uint8 *setData, uint8 *result) {
 uint8 DreamBase::getYAd(const uint8 *setData, uint8 *result) {
 	uint8 v0 = setData[3];
 	uint8 v1 = setData[4];
-	if (v0 < data.byte(kMapy))
+	if (v0 < _mapY)
 		return 0;
-	v0 -= data.byte(kMapy);
+	v0 -= _mapY;
 	if (v0 >= 10)
 		return 0;
 	*result = (v0 << 4) | v1;
@@ -145,8 +145,8 @@ void DreamBase::showAllObs() {
 		calcFrFrame(frameBase._frames[currentFrame], &width, &height, x, y, &objPos);
 		setEntry->index = setEntry->frames[0];
 		if ((setEntry->type == 0) && (setEntry->priority != 5) && (setEntry->priority != 6)) {
-			x += data.word(kMapadx);
-			y += data.word(kMapady);
+			x += _mapAdX;
+			y += _mapAdY;
 			showFrame(frameBase, x, y, currentFrame, 0);
 		} else
 			makeBackOb(setEntry, x, y);
@@ -193,18 +193,18 @@ void DreamBase::getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize
 	*mapYstart = yStart;
 	*mapXsize = xEnd - xStart;
 	*mapYsize = yEnd - yStart;
-	data.word(kMapxstart) = xStart << 4;
-	data.word(kMapystart) = yStart << 4;
-	data.byte(kMapxsize) = *mapXsize << 4;
-	data.byte(kMapysize) = *mapYsize << 4;
+	_mapXStart = xStart << 4;
+	_mapYStart = yStart << 4;
+	_mapXSize = *mapXsize << 4;
+	_mapYSize = *mapYsize << 4;
 }
 
 void DreamBase::calcMapAd() {
 	uint8 mapXstart, mapYstart;
 	uint8 mapXsize, mapYsize;
 	getDimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
-	data.word(kMapadx) = data.word(kMapoffsetx) - 8 * (mapXsize + 2 * mapXstart - 11);
-	data.word(kMapady) = data.word(kMapoffsety) - 8 * (mapYsize + 2 * mapYstart - 10);
+	_mapAdX = _mapOffsetX - 8 * (mapXsize + 2 * mapXstart - 11);
+	_mapAdY = _mapOffsetY - 8 * (mapYsize + 2 * mapYstart - 10);
 }
 
 void DreamBase::showAllFree() {
@@ -223,8 +223,8 @@ void DreamBase::showAllFree() {
 			uint16 currentFrame = 3 * i;
 			calcFrFrame(frameBase._frames[currentFrame], &width, &height, x, y, &objPos);
 			if ((width != 0) || (height != 0)) {
-				x += data.word(kMapadx);
-				y += data.word(kMapady);
+				x += _mapAdX;
+				y += _mapAdY;
 				assert(currentFrame < 256);
 				showFrame(frameBase, x, y, currentFrame, 0);
 				objPos.index = i;
@@ -236,7 +236,7 @@ void DreamBase::showAllFree() {
 
 void DreamBase::drawFlags() {
 	MapFlag *mapFlag = _mapFlags;
-	uint16 mapOffset = kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx);
+	uint16 mapOffset = kMap + _mapY * kMapwidth + _mapX;
 	const uint8 *mapData = _mapData + mapOffset;
 
 	for (size_t i = 0; i < 10; ++i) {
@@ -261,7 +261,7 @@ void DreamBase::showAllEx() {
 		DynObject *object = objects + i;
 		if (object->mapad[0] == 0xff)
 			continue;
-		if (object->currentLocation != data.byte(kReallocation))
+		if (object->currentLocation != _realLocation)
 			continue;
 		uint16 x, y;
 		if (getMapAd(object->mapad, &x, &y) == 0)
@@ -272,7 +272,7 @@ void DreamBase::showAllEx() {
 		calcFrFrame(frameBase._frames[currentFrame], &width, &height, x, y, &objPos);
 		if ((width != 0) || (height != 0)) {
 			assert(currentFrame < 256);
-			showFrame(frameBase, x + data.word(kMapadx), y + data.word(kMapady), currentFrame, 0);
+			showFrame(frameBase, x + _mapAdX, y + _mapAdY, currentFrame, 0);
 			objPos.index = i;
 			_exList.push_back(objPos);
 		}
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 47f0cec24f..9d59c3fc6f 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -188,6 +188,149 @@ public:
 
 	bool _speechLoaded;
 
+	// misc variables
+	uint8 _speechCount;
+	uint16 _charShift;
+	uint8 _kerning;
+	uint8 _brightness;
+	uint8 _roomLoaded;
+	uint8 _didZoom;
+	uint16 _lineSpacing;
+	uint16 _textAddressX;
+	uint16 _textAddressY;
+	uint8 _textLen;
+	uint16 _lastXPos;
+	uint8 _itemFrame;
+	uint8 _withObject;
+	uint8 _withType;
+	uint16 _lookCounter;
+	uint8 _command;
+	uint8 _commandType;
+	uint8 _objectType;
+	uint8 _getBack;
+	uint8 _invOpen;
+	uint8 _mainMode;
+	uint8 _pickUp;
+	uint8 _lastInvPos;
+	uint8 _examAgain;
+	uint8 _newTextLine;
+	uint8 _openedOb;
+	uint8 _openedType;
+	uint16 _mapAdX;
+	uint16 _mapAdY;
+	uint16 _mapOffsetX;
+	uint16 _mapOffsetY;
+	uint16 _mapXStart;
+	uint16 _mapYStart;
+	uint8 _mapXSize;
+	uint8 _mapYSize;
+	uint8 _haveDoneObs;
+	uint8 _manIsOffScreen;
+	uint8 _facing;
+	uint8 _leaveDirection;
+	uint8 _turnToFace;
+	uint8 _turnDirection;
+	uint16 _mainTimer;
+	uint8 _introCount;
+	uint8 _currentKey;
+	uint8 _timerCount;
+	uint8 _mapX;
+	uint8 _mapY;
+	uint8 _ryanX;
+	uint8 _ryanY;
+	uint8 _lastFlag;
+	uint8 _destPos;
+	uint8 _realLocation;
+	uint8 _roomNum;
+	uint8 _nowInNewRoom;
+	uint8 _resetManXY;
+	uint8 _newLocation;
+	uint8 _autoLocation;
+	uint16 _mouseX;
+	uint16 _mouseY;
+	uint16 _mouseButton;
+	uint16 _oldButton;
+	uint16 _oldX;
+	uint16 _oldY;
+	uint16 _oldPointerX;
+	uint16 _oldPointerY;
+	uint16 _delHereX;
+	uint16 _delHereY;
+	uint8 _pointerXS;
+	uint8 _pointerYS;
+	uint8 _delXS;
+	uint8 _delYS;
+	uint8 _pointerFrame;
+	uint8 _pointerPower;
+	uint8 _pointerMode;
+	uint8 _pointerSpeed;
+	uint8 _pointerCount;
+	uint8 _inMapArea;
+	uint8 _talkMode;
+	uint8 _talkPos;
+	uint8 _character;
+	uint8 _watchDump;
+	uint8 _logoNum;
+	uint8 _oldLogoNum;
+	uint8 _pressed;
+	uint16 _pressPointer;
+	uint8 _graphicPress;
+	uint8 _pressCount;
+	uint8 _lightCount;
+	uint8 _folderPage;
+	uint8 _diaryPage;
+	uint8 _menuCount;
+	uint8 _symbolTopX;
+	uint8 _symbolTopNum;
+	uint8 _symbolTopDir;
+	uint8 _symbolBotX;
+	uint8 _symbolBotNum;
+	uint8 _symbolBotDir;
+	uint16 _dumpX;
+	uint16 _dumpY;
+	uint8 _walkAndExam;
+	uint8 _walkExamType;
+	uint8 _walkExamNum;
+	uint16 _cursLocX;
+	uint16 _cursLocY;
+	uint16 _curPos;
+	uint16 _monAdX;
+	uint16 _monAdY;
+	uint16 _timeCount;
+	uint16 _countToTimed;
+	uint8 _timedY;
+	uint8 _timedX;
+	uint8 _needToDumpTimed;
+	uint8 _loadingOrSave;
+	uint8 _currentSlot;
+	uint8 _cursorPos;
+	uint8 _colourPos;
+	uint8 _fadeDirection;
+	uint8 _numToFade;
+	uint8 _fadeCount;
+	uint8 _addToGreen;
+	uint8 _addToRed;
+	uint8 _addToBlue;
+	uint16 _lastSoundReel;
+	uint8 _lastHardKey;
+	uint16 _bufferIn;
+	uint16 _bufferOut;
+	uint8 _blinkFrame;
+	uint8 _blinkCount;
+	uint8 _reAssesChanges;
+	uint8 _pointersPath;
+	uint8 _mansPath;
+	uint8 _pointerFirstPath;
+	uint8 _finalDest;
+	uint8 _destination;
+	uint16 _lineStartX;
+	uint16 _lineStartY;
+	uint16 _lineEndX;
+	uint16 _lineEndY;
+	uint8 _linePointer;
+	uint8 _lineDirection;
+	uint8 _lineLength;
+
 	// from backdrop.cpp
 	void doBlocks();
 	uint8 getXAd(const uint8 *setData, uint8 *result);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 239725c263..7f4c8e437a 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -37,35 +37,7 @@ void DreamGenContext::__start() {
 		//0x0020: .... .... .... ....
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0xff, 0x00, 
 		//0x0030: .... .... .... ....
-		0xff, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x0d, 0x00, 0xb6, 
-		//0x0040: ...0 .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0050: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0060: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x68, 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0070: .... h.&. .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0080: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
-		//0x0090: .... .... .... ....
-		0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x00a0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x00b0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x00c0: ...   ... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x00d0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x00e0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x00f0: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0100: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0110: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
+		0xff, 0x00, 0x00, 0x30, };
 	ds.assign(src, src + sizeof(src));
 	dreamweb(); 
 }
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index fa13b47c2d..e47c44a83a 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -89,179 +89,6 @@ static const uint16 kLastweapon = 64;
 static const uint16 kDreamnumber = 65;
 static const uint16 kRoomafterdream = 66;
 static const uint16 kShakecounter = 67;
-static const uint16 kSpeechcount = 68;
-static const uint16 kCharshift = 69;
-static const uint16 kKerning = 71;
-static const uint16 kBrightness = 72;
-static const uint16 kRoomloaded = 73;
-static const uint16 kDidzoom = 74;
-static const uint16 kLinespacing = 75;
-static const uint16 kTextaddressx = 77;
-static const uint16 kTextaddressy = 79;
-static const uint16 kTextlen = 81;
-static const uint16 kLastxpos = 82;
-static const uint16 kIcontop = 84;
-static const uint16 kIconleft = 86;
-static const uint16 kItemframe = 88;
-static const uint16 kRoomad = 89;
-static const uint16 kWithobject = 91;
-static const uint16 kWithtype = 92;
-static const uint16 kLookcounter = 93;
-static const uint16 kCommand = 95;
-static const uint16 kCommandtype = 96;
-static const uint16 kOldcommandtype = 97;
-static const uint16 kObjecttype = 98;
-static const uint16 kGetback = 99;
-static const uint16 kInvopen = 100;
-static const uint16 kMainmode = 101;
-static const uint16 kPickup = 102;
-static const uint16 kLastinvpos = 103;
-static const uint16 kExamagain = 104;
-static const uint16 kNewtextline = 105;
-static const uint16 kOpenedob = 106;
-static const uint16 kOpenedtype = 107;
-static const uint16 kOldmapadx = 108;
-static const uint16 kOldmapady = 110;
-static const uint16 kMapadx = 112;
-static const uint16 kMapady = 114;
-static const uint16 kMapoffsetx = 116;
-static const uint16 kMapoffsety = 118;
-static const uint16 kMapxstart = 120;
-static const uint16 kMapystart = 122;
-static const uint16 kMapxsize = 124;
-static const uint16 kMapysize = 125;
-static const uint16 kHavedoneobs = 126;
-static const uint16 kManisoffscreen = 127;
-static const uint16 kRainspace = 128;
-static const uint16 kFacing = 129;
-static const uint16 kLeavedirection = 130;
-static const uint16 kTurntoface = 131;
-static const uint16 kTurndirection = 132;
-static const uint16 kMaintimer = 133;
-static const uint16 kIntrocount = 135;
-static const uint16 kArrowad = 136;
-static const uint16 kCurrentkey = 138;
-static const uint16 kOldkey = 139;
-static const uint16 kUseddirection = 140;
-static const uint16 kTimercount = 141;
-static const uint16 kOldtimercount = 142;
-static const uint16 kMapx = 143;
-static const uint16 kMapy = 144;
-static const uint16 kNewscreen = 145;
-static const uint16 kRyanx = 146;
-static const uint16 kRyany = 147;
-static const uint16 kLastflag = 148;
-static const uint16 kOffsetx = 149;
-static const uint16 kOffsety = 151;
-static const uint16 kCurrentob = 153;
-static const uint16 kDestpos = 154;
-static const uint16 kReallocation = 155;
-static const uint16 kRoomnum = 156;
-static const uint16 kNowinnewroom = 157;
-static const uint16 kResetmanxy = 158;
-static const uint16 kNewlocation = 159;
-static const uint16 kAutolocation = 160;
-static const uint16 kDoorcheck1 = 161;
-static const uint16 kDoorcheck2 = 162;
-static const uint16 kDoorcheck3 = 163;
-static const uint16 kDoorcheck4 = 164;
-static const uint16 kMousex = 165;
-static const uint16 kMousey = 167;
-static const uint16 kMousebutton = 169;
-static const uint16 kMousebutton1 = 171;
-static const uint16 kMousebutton2 = 173;
-static const uint16 kMousebutton3 = 175;
-static const uint16 kMousebutton4 = 177;
-static const uint16 kOldbutton = 179;
-static const uint16 kOldx = 181;
-static const uint16 kOldy = 183;
-static const uint16 kLastbutton = 185;
-static const uint16 kOldpointerx = 187;
-static const uint16 kOldpointery = 189;
-static const uint16 kDelherex = 191;
-static const uint16 kDelherey = 193;
-static const uint16 kPointerxs = 195;
-static const uint16 kPointerys = 196;
-static const uint16 kDelxs = 197;
-static const uint16 kDelys = 198;
-static const uint16 kPointerframe = 199;
-static const uint16 kPointerpower = 200;
-static const uint16 kAuxpointerframe = 201;
-static const uint16 kPointermode = 202;
-static const uint16 kPointerspeed = 203;
-static const uint16 kPointercount = 204;
-static const uint16 kInmaparea = 205;
-static const uint16 kTalkmode = 206;
-static const uint16 kTalkpos = 207;
-static const uint16 kCharacter = 208;
-static const uint16 kWatchdump = 209;
-static const uint16 kLogonum = 210;
-static const uint16 kOldlogonum = 211;
-static const uint16 kPressed = 212;
-static const uint16 kPresspointer = 213;
-static const uint16 kGraphicpress = 215;
-static const uint16 kPresscount = 216;
-static const uint16 kLightcount = 217;
-static const uint16 kFolderpage = 218;
-static const uint16 kDiarypage = 219;
-static const uint16 kMenucount = 220;
-static const uint16 kSymboltopx = 221;
-static const uint16 kSymboltopnum = 222;
-static const uint16 kSymboltopdir = 223;
-static const uint16 kSymbolbotx = 224;
-static const uint16 kSymbolbotnum = 225;
-static const uint16 kSymbolbotdir = 226;
-static const uint16 kDumpx = 227;
-static const uint16 kDumpy = 229;
-static const uint16 kWalkandexam = 231;
-static const uint16 kWalkexamtype = 232;
-static const uint16 kWalkexamnum = 233;
-static const uint16 kCurslocx = 234;
-static const uint16 kCurslocy = 236;
-static const uint16 kCurpos = 238;
-static const uint16 kMonadx = 240;
-static const uint16 kMonady = 242;
-static const uint16 kNumtodo = 244;
-static const uint16 kTimecount = 246;
-static const uint16 kCounttotimed = 248;
-static const uint16 kTimedseg = 250;
-static const uint16 kTimedoffset = 252;
-static const uint16 kTimedy = 254;
-static const uint16 kTimedx = 255;
-static const uint16 kNeedtodumptimed = 256;
-static const uint16 kLoadingorsave = 257;
-static const uint16 kCurrentslot = 258;
-static const uint16 kCursorpos = 259;
-static const uint16 kColourpos = 260;
-static const uint16 kFadedirection = 261;
-static const uint16 kNumtofade = 262;
-static const uint16 kFadecount = 263;
-static const uint16 kAddtogreen = 264;
-static const uint16 kAddtored = 265;
-static const uint16 kAddtoblue = 266;
-static const uint16 kLastsoundreel = 267;
-static const uint16 kLasthardkey = 269;
-static const uint16 kBufferin = 270;
-static const uint16 kBufferout = 272;
-static const uint16 kWorkspace = 274;
-static const uint16 kMainsprites = 276;
-static const uint16 kBackdrop = 278;
-static const uint16 kRecordspace = 280;
-static const uint16 kBlinkframe = 282;
-static const uint16 kBlinkcount = 283;
-static const uint16 kReasseschanges = 284;
-static const uint16 kPointerspath = 285;
-static const uint16 kManspath = 286;
-static const uint16 kPointerfirstpath = 287;
-static const uint16 kFinaldest = 288;
-static const uint16 kDestination = 289;
-static const uint16 kLinestartx = 290;
-static const uint16 kLinestarty = 292;
-static const uint16 kLineendx = 294;
-static const uint16 kLineendy = 296;
-static const uint16 kLinepointer = 298;
-static const uint16 kLinedirection = 299;
-static const uint16 kLinelength = 300;
 static const uint16 kBlocktextdat = (0);
 static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
@@ -269,14 +96,14 @@ static const uint16 kDebuglevel2 = (0);
 static const uint16 kPlayback = (0);
 static const uint16 kMap = (0);
 static const uint16 kSettextdat = (0);
+static const uint16 kTextunder = (0);
 static const uint16 kSpanish = (0);
 static const uint16 kRecording = (0);
-static const uint16 kFlags = (0);
 static const uint16 kGerman = (0);
-static const uint16 kTextunder = (0);
 static const uint16 kPathdata = (0);
 static const uint16 kDemo = (0);
 static const uint16 kFramedata = (0);
+static const uint16 kFlags = (0);
 static const uint16 kExframedata = (0);
 static const uint16 kIntextdat = (0);
 static const uint16 kFreetextdat = (0);
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index de6a48170d..4e7257bcd3 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -95,7 +95,7 @@ void DreamWebEngine::waitForVSync() {
 
 void DreamWebEngine::quit() {
 	_base._quitRequested = true;
-	_base.data.byte(DreamGen::kLasthardkey) = 1;
+	_base._lastHardKey = 1;
 }
 
 void DreamWebEngine::processEvents() {
@@ -130,8 +130,8 @@ void DreamWebEngine::processEvents() {
 					break;
 
 				case Common::KEYCODE_c: //skip statue puzzle
-					_base.data.byte(DreamGen::kSymbolbotnum) = 3;
-					_base.data.byte(DreamGen::kSymboltopnum) = 5;
+					_base._symbolBotNum = 3;
+					_base._symbolTopNum = 5;
 					break;
 
 				default:
@@ -161,7 +161,7 @@ void DreamWebEngine::processEvents() {
 				break;
 			}
 
-			_base.data.byte(DreamGen::kLasthardkey) = hardKey;
+			_base._lastHardKey = hardKey;
 
 			// The rest of the keys are converted to ASCII. This
 			// is fairly restrictive, and eventually we may want
@@ -267,13 +267,13 @@ Common::String DreamWebEngine::getSavegameFilename(int slot) const {
 
 void DreamWebEngine::keyPressed(uint16 ascii) {
 	debug(2, "key pressed = %04x", ascii);
-	uint16 in = (_base.data.word(DreamGen::kBufferin) + 1) & 0x0f;
-	uint16 out = _base.data.word(DreamGen::kBufferout);
+	uint16 in = (_base._bufferIn + 1) & 0x0f;
+	uint16 out = _base._bufferOut;
 	if (in == out) {
 		warning("keyboard buffer is full");
 		return;
 	}
-	_base.data.word(DreamGen::kBufferin) = in;
+	_base._bufferIn = in;
 	DreamGen::g_keyBuffer[in] = ascii;
 }
 
@@ -431,6 +431,149 @@ DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) :
 
 	_oldSubject._type = 0;
 	_oldSubject._index = 0;
+
+	// misc variables
+	_speechCount = 0;
+	_charShift = 0;
+	_kerning = 0;
+	_brightness = 0;
+	_roomLoaded = 0;
+	_didZoom = 0;
+	_lineSpacing = 10;
+	_textAddressX = 13;
+	_textAddressY = 182;
+	_textLen = 0;
+	_lastXPos = 0;
+	_itemFrame = 0;
+	_withObject = 0;
+	_withType = 0;
+	_lookCounter = 0;
+	_command = 0;
+	_commandType = 0;
+	_objectType = 0;
+	_getBack = 0;
+	_invOpen = 0;
+	_mainMode = 0;
+	_pickUp = 0;
+	_lastInvPos = 0;
+	_examAgain = 0;
+	_newTextLine = 0;
+	_openedOb = 0;
+	_openedType = 0;
+	_mapAdX = 0;
+	_mapAdY = 0;
+	_mapOffsetX = 104;
+	_mapOffsetY = 38;
+	_mapXStart = 0;
+	_mapYStart = 0;
+	_mapXSize = 0;
+	_mapYSize = 0;
+	_haveDoneObs = 0;
+	_manIsOffScreen = 0;
+	_facing = 0;
+	_leaveDirection = 0;
+	_turnToFace = 0;
+	_turnDirection = 0;
+	_mainTimer = 0;
+	_introCount = 0;
+	_currentKey = 0;
+	_timerCount = 0;
+	_mapX = 0;
+	_mapY = 0;
+	_ryanX = 0;
+	_ryanY = 0;
+	_lastFlag = 0;
+	_destPos = 0;
+	_realLocation = 0;
+	_roomNum = 0;
+	_nowInNewRoom = 0;
+	_resetManXY = 0;
+	_newLocation = 0xFF;
+	_autoLocation = 0xFF;
+	_mouseX = 0;
+	_mouseY = 0;
+	_mouseButton = 0;
+	_oldButton = 0;
+	_oldX = 0;
+	_oldY = 0;
+	_oldPointerX = 0;
+	_oldPointerY = 0;
+	_delHereX = 0;
+	_delHereY = 0;
+	_pointerXS = 32;
+	_pointerYS = 32;
+	_delXS = 0;
+	_delYS = 0;
+	_pointerFrame = 0;
+	_pointerPower = 0;
+	_pointerMode = 0;
+	_pointerSpeed = 0;
+	_pointerCount = 0;
+	_inMapArea = 0;
+	_talkMode = 0;
+	_talkPos = 0;
+	_character = 0;
+	_watchDump = 0;
+	_logoNum = 0;
+	_oldLogoNum = 0;
+	_pressed = 0;
+	_pressPointer = 0;
+	_graphicPress = 0;
+	_pressCount = 0;
+	_lightCount = 0;
+	_folderPage = 0;
+	_diaryPage = 0;
+	_menuCount = 0;
+	_symbolTopX = 0;
+	_symbolTopNum = 0;
+	_symbolTopDir = 0;
+	_symbolBotX = 0;
+	_symbolBotNum = 0;
+	_symbolBotDir = 0;
+	_dumpX = 0;
+	_dumpY = 0;
+	_walkAndExam = 0;
+	_walkExamType = 0;
+	_walkExamNum = 0;
+	_cursLocX = 0;
+	_cursLocY = 0;
+	_curPos = 0;
+	_monAdX = 0;
+	_monAdY = 0;
+	_timeCount = 0;
+	_countToTimed = 0;
+	_timedY = 0;
+	_timedX = 0;
+	_needToDumpTimed = 0;
+	_loadingOrSave = 0;
+	_currentSlot = 0;
+	_cursorPos = 0;
+	_colourPos = 0;
+	_fadeDirection = 0;
+	_numToFade = 0;
+	_fadeCount = 0;
+	_addToGreen = 0;
+	_addToRed = 0;
+	_addToBlue = 0;
+	_lastSoundReel = 0;
+	_lastHardKey = 0;
+	_bufferIn = 0;
+	_bufferOut = 0;
+	_blinkFrame = 23;
+	_blinkCount = 0;
+	_reAssesChanges = 0;
+	_pointersPath = 0;
+	_mansPath = 0;
+	_pointerFirstPath = 0;
+	_finalDest = 0;
+	_destination = 0;
+	_lineStartX = 0;
+	_lineStartY = 0;
+	_lineEndX = 0;
+	_lineEndY = 0;
+	_linePointer = 0;
+	_lineDirection = 0;
+	_lineLength = 0;
 }
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 5f83ddbef5..5ef6ba70d4 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -33,9 +33,9 @@ void DreamBase::putUnderMenu() {
 }
 
 void DreamBase::singleKey(uint8 key, uint16 x, uint16 y) {
-	if (key == data.byte(kGraphicpress)) {
+	if (key == _graphicPress) {
 		key += 11;
-		if (data.byte(kPresscount) < 8)
+		if (_pressCount < 8)
 			key -= 11;
 	}
 	key -= 20;
@@ -58,8 +58,8 @@ void DreamBase::showKeypad() {
 	singleKey(30, kKeypadx+53, kKeypady+41);
 	singleKey(31, kKeypadx+9,  kKeypady+59);
 	singleKey(32, kKeypadx+31, kKeypady+59);
-	if (data.byte(kLightcount)) {
-		--data.byte(kLightcount);
+	if (_lightCount) {
+		--_lightCount;
 		uint8 frameIndex;
 		uint16 y;
 		if (data.byte(kLockstatus)) {
@@ -69,7 +69,7 @@ void DreamBase::showKeypad() {
 			frameIndex = 41;
 			y = kKeypady+4+63;
 		}
-		if ((data.byte(kLightcount) >= 60) && (data.byte(kLightcount) < 100))
+		if ((_lightCount >= 60) && (_lightCount < 100))
 			--frameIndex;
 		showFrame(_tempGraphics, kKeypadx+60, y, frameIndex, 0);
 	}
@@ -82,14 +82,14 @@ bool DreamBase::isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3
 }
 
 void DreamBase::addToPressList() {
-	if (data.word(kPresspointer) == 5)
+	if (_pressPointer == 5)
 		return;
-	uint8 pressed = data.byte(kPressed);
+	uint8 pressed = _pressed;
 	if (pressed == 10)
 		pressed = 0;
 
-	_pressList[data.word(kPresspointer)] = pressed;
-	++data.word(kPresspointer);
+	_pressList[_pressPointer] = pressed;
+	++_pressPointer;
 }
 
 void DreamBase::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
@@ -120,44 +120,44 @@ void DreamBase::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3
 	showPointer();
 	workToScreen();
 	delPointer();
-	data.word(kPresspointer) = 0;
-	data.byte(kGetback) = 0;
+	_pressPointer = 0;
+	_getBack = 0;
 	while (true) {
 		delPointer();
 		readMouse();
 		showKeypad();
 		showPointer();
 		vSync();
-		if (data.byte(kPresscount) == 0) {
-			data.byte(kPressed) = 255;
-			data.byte(kGraphicpress) = 255;
+		if (_pressCount == 0) {
+			_pressed = 255;
+			_graphicPress = 255;
 			vSync();
 		} else
-			--data.byte(kPresscount);
+			--_pressCount;
 
 		dumpPointer();
 		dumpKeypad();
 		dumpTextLine();
 		checkCoords(keypadList);
-		if (_quitRequested || (data.byte(kGetback) == 1))
+		if (_quitRequested || (_getBack == 1))
 			break;
-		if (data.byte(kLightcount) == 1) {
+		if (_lightCount == 1) {
 			if (data.byte(kLockstatus) == 0)
 				break;
 		} else {
-			if (data.byte(kPresscount) == 40) {
+			if (_pressCount == 40) {
 				addToPressList();
-				if (data.byte(kPressed) == 11) {
+				if (_pressed == 11) {
 					if (isItRight(digit0, digit1, digit2, digit3))
 						data.byte(kLockstatus) = 0;
 					playChannel1(11);
-					data.byte(kLightcount) = 120;
-					data.word(kPresspointer) = 0;
+					_lightCount = 120;
+					_pressPointer = 0;
 				}
 			}
 		}
 	}
-	data.byte(kManisoffscreen) = 0;
+	_manIsOffScreen = 0;
 	getRidOfTemp();
 	restoreReels();
 	redrawMainScrn();
@@ -210,14 +210,14 @@ void DreamBase::buttonEnter() {
 
 void DreamBase::buttonPress(uint8 buttonId) {
 	uint8 commandType = 100 + buttonId;
-	if (data.byte(kCommandtype) != commandType) {
-		data.byte(kCommandtype) = commandType;
+	if (_commandType != commandType) {
+		_commandType = commandType;
 		commandOnly(buttonId + 4);
 	}
-	if ((data.word(kMousebutton) & 1) && (data.word(kMousebutton) != data.word(kOldbutton))) {
-		data.byte(kPressed) = buttonId;
-		data.byte(kGraphicpress) = buttonId + 21;
-		data.byte(kPresscount) = 40;
+	if ((_mouseButton & 1) && (_mouseButton != _oldButton)) {
+		_pressed = buttonId;
+		_graphicPress = buttonId + 21;
+		_pressCount = 40;
 		if (buttonId != 11)
 			playChannel1(10);
 	}
@@ -233,35 +233,35 @@ void DreamBase::dumpKeypad() {
 }
 
 void DreamBase::dumpSymbol() {
-	data.byte(kNewtextline) = 0;
+	_newTextLine = 0;
 	multiDump(kSymbolx, kSymboly + 20, 104, 60);
 }
 
 void DreamBase::dumpSymBox() {
-	if (data.word(kDumpx) != 0xFFFF) {
-		multiDump(data.word(kDumpx), data.word(kDumpy), 30, 77);
-		data.word(kDumpx) = 0xFFFF;
+	if (_dumpX != 0xFFFF) {
+		multiDump(_dumpX, _dumpY, 30, 77);
+		_dumpX = 0xFFFF;
 	}
 }
 
 void DreamBase::quitSymbol() {
-	if (data.byte(kSymboltopx) != 24 || data.byte(kSymbolbotx) != 24) {
+	if (_symbolTopX != 24 || _symbolBotX != 24) {
 		blank();
 		return;
 	};
 
-	if (data.byte(kCommandtype) != 222) {
-		data.byte(kCommandtype) = 222;
+	if (_commandType != 222) {
+		_commandType = 222;
 		commandOnly(18);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton))
+	if (_mouseButton == _oldButton)
 		return;	// notqs
 
-	if (!(data.word(kMousebutton) & 1))
+	if (!(_mouseButton & 1))
 		return;
 
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 471d5eca8b..375ab9fcdd 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -66,8 +66,8 @@ void DreamBase::useMon() {
 	turnOnPower();
 	fadeUpYellows();
 	fadeUpMonFirst();
-	data.word(kMonadx) = 76;
-	data.word(kMonady) = 141;
+	_monAdX = 76;
+	_monAdY = 141;
 	monMessage(1);
 	hangOnCurs(120);
 	monMessage(2);
@@ -76,15 +76,15 @@ void DreamBase::useMon() {
 	hangOnCurs(100);
 	printLogo();
 	scrollMonitor();
-	data.word(kBufferin) = 0;
-	data.word(kBufferout) = 0;
+	_bufferIn = 0;
+	_bufferOut = 0;
 	bool stop = false;
 	do {
-		uint16 oldMonadx = data.word(kMonadx);
-		uint16 oldMonady = data.word(kMonady);
+		uint16 oldMonadx = _monAdX;
+		uint16 oldMonady = _monAdY;
 		input();
-		data.word(kMonadx) = oldMonadx;
-		data.word(kMonady) = oldMonady;
+		_monAdX = oldMonadx;
+		_monAdY = oldMonady;
 		stop = execCommand();
 		if (_quitRequested) //TODO : Check why it crashes when put before the execcommand
 			break;
@@ -96,9 +96,9 @@ void DreamBase::useMon() {
 	_textFile2.clear();
 	_textFile3.clear();
 
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 	playChannel1(26);
-	data.byte(kManisoffscreen) = 0;
+	_manIsOffScreen = 0;
 	restoreAll();
 	redrawMainScrn();
 	workToScreenM();
@@ -171,8 +171,8 @@ bool DreamBase::execCommand() {
 
 
 void DreamBase::monitorLogo() {
-	if (data.byte(kLogonum) != data.byte(kOldlogonum)) {
-		data.byte(kOldlogonum) = data.byte(kLogonum);
+	if (_logoNum != _oldLogoNum) {
+		_oldLogoNum = _logoNum;
 		//fadeDownMon(); // FIXME: Commented out in ASM
 		printLogo();
 		printUnderMon();
@@ -194,12 +194,12 @@ void DreamBase::printLogo() {
 
 void DreamBase::input() {
 	memset(_inputLine, 0, 64);
-	data.word(kCurpos) = 0;
-	printChar(_tempCharset, data.word(kMonadx), data.word(kMonady), '>', 0, NULL, NULL);
-	multiDump(data.word(kMonadx), data.word(kMonady), 6, 8);
-	data.word(kMonadx) += 6;
-	data.word(kCurslocx) = data.word(kMonadx);
-	data.word(kCurslocy) = data.word(kMonady);
+	_curPos = 0;
+	printChar(_tempCharset, _monAdX, _monAdY, '>', 0, NULL, NULL);
+	multiDump(_monAdX, _monAdY, 6, 8);
+	_monAdX += 6;
+	_cursLocX = _monAdX;
+	_cursLocY = _monAdY;
 	while (true) {
 		printCurs();
 		vSync();
@@ -207,31 +207,31 @@ void DreamBase::input() {
 		readKey();
 		if (_quitRequested)
 			return;
-		uint8 currentKey = data.byte(kCurrentkey);
+		uint8 currentKey = _currentKey;
 		if (currentKey == 0)
 			continue;
 		if (currentKey == 13)
 			return;
 		if (currentKey == 8) {
-			if (data.word(kCurpos) > 0)
+			if (_curPos > 0)
 				delChar();
 			continue;
 		}
-		if (data.word(kCurpos) == 28)
+		if (_curPos == 28)
 			continue;
-		if ((currentKey == 32) && (data.word(kCurpos) == 0))
+		if ((currentKey == 32) && (_curPos == 0))
 			continue;
 		currentKey = makeCaps(currentKey);
-		_inputLine[data.word(kCurpos) * 2 + 0] = currentKey;
+		_inputLine[_curPos * 2 + 0] = currentKey;
 		if (currentKey > 'Z')
 			continue;
-		multiGet(_mapStore + data.word(kCurpos) * 256, data.word(kMonadx), data.word(kMonady), 8, 8);
+		multiGet(_mapStore + _curPos * 256, _monAdX, _monAdY, 8, 8);
 		uint8 charWidth;
-		printChar(_tempCharset, data.word(kMonadx), data.word(kMonady), currentKey, 0, &charWidth, NULL);
-		_inputLine[data.word(kCurpos) * 2 + 1] = charWidth;
-		data.word(kMonadx) += charWidth;
-		++data.word(kCurpos);
-		data.word(kCurslocx) += charWidth;
+		printChar(_tempCharset, _monAdX, _monAdY, currentKey, 0, &charWidth, NULL);
+		_inputLine[_curPos * 2 + 1] = charWidth;
+		_monAdX += charWidth;
+		++_curPos;
+		_cursLocX += charWidth;
 	}
 }
 
@@ -243,20 +243,20 @@ byte DreamBase::makeCaps(byte c) {
 }
 
 void DreamBase::delChar() {
-	--data.word(kCurpos);
-	_inputLine[data.word(kCurpos) * 2] = 0;
-	uint8 width = _inputLine[data.word(kCurpos) * 2 + 1];
-	data.word(kMonadx) -= width;
-	data.word(kCurslocx) -= width;
-	uint16 offset = data.word(kCurpos);
+	--_curPos;
+	_inputLine[_curPos * 2] = 0;
+	uint8 width = _inputLine[_curPos * 2 + 1];
+	_monAdX -= width;
+	_cursLocX -= width;
+	uint16 offset = _curPos;
 	offset = ((offset & 0x00ff) << 8) | ((offset & 0xff00) >> 8);
-	multiPut(_mapStore + offset, data.word(kMonadx), data.word(kMonady), 8, 8);
-	multiDump(data.word(kMonadx), data.word(kMonady), 8, 8);
+	multiPut(_mapStore + offset, _monAdX, _monAdY, 8, 8);
+	multiDump(_monAdX, _monAdY, 8, 8);
 }
 
 void DreamBase::printCurs() {
-	uint16 x = data.word(kCurslocx);
-	uint16 y = data.word(kCurslocy);
+	uint16 x = _cursLocX;
+	uint16 y = _cursLocY;
 	uint16 height;
 	if (_foreignRelease) {
 		y -= 3;
@@ -264,15 +264,15 @@ void DreamBase::printCurs() {
 	} else
 		height = 8;
 	multiGet(_textUnder, x, y, 6, height);
-	++data.word(kMaintimer);
-	if ((data.word(kMaintimer) & 16) == 0)
+	++_mainTimer;
+	if ((_mainTimer & 16) == 0)
 		showFrame(_tempCharset, x, y, '/' - 32, 0);
 	multiDump(x - 6, y, 12, height);
 }
 
 void DreamBase::delCurs() {
-	uint16 x = data.word(kCurslocx);
-	uint16 y = data.word(kCurslocy);
+	uint16 x = _cursLocX;
+	uint16 y = _cursLocY;
 	uint16 width = 6;
 	uint16 height;
 	if (_foreignRelease) {
@@ -433,7 +433,7 @@ const char *DreamBase::getKeyAndLogo(const char *foundString) {
 
 	if (monitorKeyEntries[keyNum].keyAssigned == 1) {
 		// Key OK
-		data.byte(kLogonum) = newLogo;
+		_logoNum = newLogo;
 		return foundString + 4;
 	} else {
 		monMessage(12);	// "Access denied, key required -"
@@ -476,7 +476,7 @@ void DreamBase::dirCom() {
 		return;
 	}
 
-	data.byte(kLogonum) = 0;
+	_logoNum = 0;
 	memcpy(_currentFile+1, "ROOT        ", 12);
 	monitorLogo();
 	scrollMonitor();
@@ -564,7 +564,7 @@ void DreamBase::read() {
 	// "keyok1"
 	found = searchForString(name, found);
 	if (!found) {
-		data.byte(kLogonum) = data.byte(kOldlogonum);
+		_logoNum = _oldLogoNum;
 		monMessage(11);
 		return;
 	}
@@ -615,11 +615,11 @@ void DreamBase::signOn() {
 
 	monMessage(15);
 
-	uint16 prevX = data.word(kMonadx);
-	uint16 prevY = data.word(kMonady);
+	uint16 prevX = _monAdX;
+	uint16 prevY = _monAdY;
 	input();	// password input
-	data.word(kMonadx) = prevX;
-	data.word(kMonady) = prevY;
+	_monAdX = prevX;
+	_monAdY = prevY;
 
 	inputLine = (const char *)_inputLine;
 	inputLine.toUppercase();
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 43b334ca3f..3093968969 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -28,17 +28,17 @@ void DreamBase::newPlace() {
 	if (data.byte(kNeedtotravel) == 1) {
 		data.byte(kNeedtotravel) = 0;
 		selectLocation();
-	} else if (data.byte(kAutolocation) != 0xFF) {
-		data.byte(kNewlocation) = data.byte(kAutolocation);
-		data.byte(kAutolocation) = 0xFF;
+	} else if (_autoLocation != 0xFF) {
+		_newLocation = _autoLocation;
+		_autoLocation = 0xFF;
 	}
 }
 
 void DreamBase::selectLocation() {
-	data.byte(kInmaparea) = 0;
+	_inMapArea = 0;
 	clearBeforeLoad();
-	data.byte(kGetback) = 0;
-	data.byte(kPointerframe) = 22;
+	_getBack = 0;
+	_pointerFrame = 22;
 	readCityPic();
 	showCity();
 	getRidOfTemp();
@@ -50,15 +50,15 @@ void DreamBase::selectLocation() {
 	showExit();
 	locationPic();
 	underTextLine();
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 	readMouse();
-	data.byte(kPointerframe) = 0;
+	_pointerFrame = 0;
 	showPointer();
 	workToScreen();
 	playChannel0(9, 255);
-	data.byte(kNewlocation) = 255;
+	_newLocation = 255;
 
-	while (data.byte(kNewlocation) == 255) {
+	while (_newLocation == 255) {
 		if (_quitRequested)
 			break;
 
@@ -69,7 +69,7 @@ void DreamBase::selectLocation() {
 		dumpPointer();
 		dumpTextLine();
 
-		if (data.byte(kGetback) == 1)
+		if (_getBack == 1)
 			break;
 
 		RectWithCallback<DreamBase> destList[] = {
@@ -84,9 +84,9 @@ void DreamBase::selectLocation() {
 		checkCoords(destList);
 	}
 
-	if (_quitRequested || data.byte(kGetback) == 1 || data.byte(kNewlocation) == data.byte(kLocation)) {
-		data.byte(kNewlocation) = data.byte(kReallocation);
-		data.byte(kGetback) = 0;
+	if (_quitRequested || _getBack == 1 || _newLocation == data.byte(kLocation)) {
+		_newLocation = _realLocation;
+		_getBack = 0;
 	}
 
 	getRidOfTemp();
@@ -103,14 +103,14 @@ void DreamBase::showCity() {
 }
 
 void DreamBase::lookAtPlace() {
-	if (data.byte(kCommandtype) != 224) {
-		data.byte(kCommandtype) = 224;
+	if (_commandType != 224) {
+		_commandType = 224;
 		commandOnly(27);
 	}
 
-	if (!(data.word(kMousebutton) & 1) ||
-		data.word(kMousebutton) == data.word(kOldbutton) ||
-		data.byte(kDestpos) >= 15)
+	if (!(_mouseButton & 1) ||
+		_mouseButton == _oldButton ||
+		_destPos >= 15)
 		return; // noinfo
 
 	delPointer();
@@ -121,14 +121,14 @@ void DreamBase::lookAtPlace() {
 	if (_foreignRelease)
 		showFrame(_tempGraphics3, 60, 72+55+21, 4, 0);
 
-	const uint8 *string = (const uint8 *)_travelText.getString(data.byte(kDestpos));
+	const uint8 *string = (const uint8 *)_travelText.getString(_destPos);
 	findNextColon(&string);
 	uint16 y = (_foreignRelease) ? 84 + 4 : 84;
 	printDirect(&string, 63, &y, 191, 191 & 1);
 	workToScreenM();
 	hangOnP(500);
-	data.byte(kPointermode) = 0;
-	data.byte(kPointerframe) = 0;
+	_pointerMode = 0;
+	_pointerFrame = 0;
 	putUnderCentre();
 	workToScreenM();
 }
@@ -143,17 +143,17 @@ void DreamBase::putUnderCentre() {
 
 void DreamBase::locationPic() {
 	const int roomPics[] = { 5, 0, 3, 2, 4, 1, 10, 9, 8, 6, 11, 4, 7, 7, 0 };
-	byte picture = roomPics[data.byte(kDestpos)];
+	byte picture = roomPics[_destPos];
 
 	if (picture >= 6)
 		showFrame(_tempGraphics2, 104, 138 + 14, picture - 6, 0);	// Second slot
 	else
 		showFrame(_tempGraphics,  104, 138 + 14, picture + 4, 0);
 
-	if (data.byte(kDestpos) == data.byte(kReallocation))
+	if (_destPos == _realLocation)
 		showFrame(_tempGraphics, 104, 140 + 14, 3, 0);	// Currently in this location
 
-	const uint8 *string = (const uint8 *)_travelText.getString(data.byte(kDestpos));
+	const uint8 *string = (const uint8 *)_travelText.getString(_destPos);
 	DreamBase::printDirect(string, 50, 20, 241, 241 & 1);
 }
 
@@ -164,21 +164,21 @@ void DreamBase::showArrows() {
 }
 
 void DreamBase::nextDest() {
-	if (data.byte(kCommandtype) != 218) {
-		data.byte(kCommandtype) = 218;
+	if (_commandType != 218) {
+		_commandType = 218;
 		commandOnly(28);
 	}
 
-	if (!(data.word(kMousebutton) & 1) || data.word(kOldbutton) == 1)
+	if (!(_mouseButton & 1) || _oldButton == 1)
 		return;	// nodu
 
 	do {
-		data.byte(kDestpos)++;
-		if (data.byte(kDestpos) == 15)
-			data.byte(kDestpos) = 0;	// last destination
-	} while (!getLocation(data.byte(kDestpos)));
+		_destPos++;
+		if (_destPos == 15)
+			_destPos = 0;	// last destination
+	} while (!getLocation(_destPos));
 
-	data.byte(kNewtextline) = 1;
+	_newTextLine = 1;
 	delTextLine();
 	delPointer();
 	showPanel();
@@ -193,21 +193,21 @@ void DreamBase::nextDest() {
 }
 
 void DreamBase::lastDest() {
-	if (data.byte(kCommandtype) != 219) {
-		data.byte(kCommandtype) = 219;
+	if (_commandType != 219) {
+		_commandType = 219;
 		commandOnly(29);
 	}
 
-	if (!(data.word(kMousebutton) & 1) || data.word(kOldbutton) == 1)
+	if (!(_mouseButton & 1) || _oldButton == 1)
 		return;	// nodd
 
 	do {
-		data.byte(kDestpos)--;
-		if (data.byte(kDestpos) == 0xFF)
-			data.byte(kDestpos) = 15;	// first destination
-	} while (!getLocation(data.byte(kDestpos)));
+		_destPos--;
+		if (_destPos == 0xFF)
+			_destPos = 15;	// first destination
+	} while (!getLocation(_destPos));
 
-	data.byte(kNewtextline) = 1;
+	_newTextLine = 1;
 	delTextLine();
 	delPointer();
 	showPanel();
@@ -222,15 +222,15 @@ void DreamBase::lastDest() {
 }
 
 void DreamBase::destSelect() {
-	if (data.byte(kCommandtype) != 222) {
-		data.byte(kCommandtype) = 222;
+	if (_commandType != 222) {
+		_commandType = 222;
 		commandOnly(30);
 	}
 
-	if (!(data.word(kMousebutton) & 1) || data.word(kOldbutton) == 1)
+	if (!(_mouseButton & 1) || _oldButton == 1)
 		return;	// notrav
 
-	data.byte(kNewlocation) = data.byte(kDestpos);
+	_newLocation = _destPos;
 }
 
 uint8 DreamBase::getLocation(uint8 index) {
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 6e5ae8a813..57e9c9c10e 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -61,7 +61,7 @@ bool DreamBase::isItWorn(const DynObject *object) {
 }
 
 void DreamBase::wornError() {
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 	delPointer();
 	printMessage(76, 21, 57, 240, false);
 	workToScreenM();
@@ -69,7 +69,7 @@ void DreamBase::wornError() {
 	showPanel();
 	showMan();
 	examIcon();
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 	workToScreenM();
 }
 
@@ -95,10 +95,10 @@ void DreamBase::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 }
 
 void DreamBase::obPicture() {
-	if (data.byte(kObjecttype) == kSetObjectType1)
+	if (_objectType == kSetObjectType1)
 		return;
-	uint8 frame = 3 * data.byte(kCommand) + 1;
-	if (data.byte(kObjecttype) == kExObjectType)
+	uint8 frame = 3 * _command + 1;
+	if (_objectType == kExObjectType)
 		showFrame(_exFrames, 160, 68, frame, 0x80);
 	else
 		showFrame(_freeFrames, 160, 68, frame, 0x80);
@@ -116,19 +116,19 @@ void DreamBase::obIcons() {
 }
 
 void DreamBase::examineOb(bool examineAgain) {
-	data.byte(kPointermode) = 0;
-	data.word(kTimecount) = 0;
+	_pointerMode = 0;
+	_timeCount = 0;
 
 	while (true) {
 		if (examineAgain) {
-			data.byte(kInmaparea) = 0;
-			data.byte(kExamagain) = 0;
-			data.byte(kOpenedob) = 255;
-			data.byte(kOpenedtype) = 255;
-			data.byte(kInvopen) = 0;
-			data.byte(kObjecttype) = data.byte(kCommandtype);
-			data.byte(kItemframe) = 0;
-			data.byte(kPointerframe) = 0;
+			_inMapArea = 0;
+			_examAgain = 0;
+			_openedOb = 255;
+			_openedType = 255;
+			_invOpen = 0;
+			_objectType = _commandType;
+			_itemFrame = 0;
+			_pointerFrame = 0;
 			createPanel();
 			showPanel();
 			showMan();
@@ -137,7 +137,7 @@ void DreamBase::examineOb(bool examineAgain) {
 			obPicture();
 			describeOb();
 			underTextLine();
-			data.byte(kCommandtype) = 255;
+			_commandType = 255;
 			readMouse();
 			showPointer();
 			workToScreen();
@@ -151,9 +151,9 @@ void DreamBase::examineOb(bool examineAgain) {
 		dumpPointer();
 		dumpTextLine();
 		delPointer();
-		data.byte(kGetback) = 0;
+		_getBack = 0;
 
-		switch (data.byte(kInvopen)) {
+		switch (_invOpen) {
 		case 0: {
 			RectWithCallback<DreamBase> examList[] = {
 				{ 273,320,157,198,&DreamBase::getBackFromOb },
@@ -196,20 +196,20 @@ void DreamBase::examineOb(bool examineAgain) {
 
 		if (_quitRequested)
 			break;
-		if (data.byte(kExamagain) != 0)
+		if (_examAgain != 0)
 			examineAgain = true;
-		else if (data.byte(kGetback) != 0)
+		else if (_getBack != 0)
 			break;
 	}
 
-	data.byte(kPickup) = 0;
-	if (data.word(kWatchingtime) != 0 || data.byte(kNewlocation) == 255) {
+	_pickUp = 0;
+	if (data.word(kWatchingtime) != 0 || _newLocation == 255) {
 		// isWatching
 		makeMainScreen();
 	}
 
-	data.byte(kInvopen) = 0;
-	data.byte(kOpenedob) = 255;
+	_invOpen = 0;
+	_openedOb = 255;
 }
 
 void DreamBase::inventory() {
@@ -218,20 +218,20 @@ void DreamBase::inventory() {
 		return;
 	}
 
-	if (data.byte(kCommandtype) != 239) {
-		data.byte(kCommandtype) = 239;
+	if (_commandType != 239) {
+		_commandType = 239;
 		commandOnly(32);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton))
+	if (_mouseButton == _oldButton)
 		return;
-	if (!(data.word(kMousebutton) & 1)) // only on left mouse button
+	if (!(_mouseButton & 1)) // only on left mouse button
 		return;
 
 
-	data.word(kTimecount) = 0;
-	data.byte(kPointermode) = 0;
-	data.byte(kInmaparea) = 0;
+	_timeCount = 0;
+	_pointerMode = 0;
+	_inMapArea = 0;
 	animPointer();
 	createPanel();
 	showPanel();
@@ -239,14 +239,14 @@ void DreamBase::inventory() {
 	showMan();
 	showExit();
 	underTextLine();
-	data.byte(kPickup) = 0;
-	data.byte(kInvopen) = 2;
+	_pickUp = 0;
+	_invOpen = 2;
 	openInv();
 	readMouse();
 	showPointer();
 	workToScreen();
 	delPointer();
-	data.byte(kOpenedob) = 255;
+	_openedOb = 255;
 	examineOb(false);
 }
 
@@ -261,15 +261,15 @@ void DreamBase::transferText(uint8 from, uint8 to) {
 }
 
 void DreamBase::getBackFromOb() {
-	if (data.byte(kPickup) != 1)
+	if (_pickUp != 1)
 		getBack1();
 	else
 		blank();
 }
 
 byte DreamBase::getOpenedSlotCount() {
-	byte obj = data.byte(kOpenedob);
-	switch (data.byte(kOpenedtype)) {
+	byte obj = _openedOb;
+	switch (_openedType) {
 	case 4:
 		return getExAd(obj)->slotCount;
 	case 2:
@@ -280,8 +280,8 @@ byte DreamBase::getOpenedSlotCount() {
 }
 
 byte DreamBase::getOpenedSlotSize() {
-	byte obj = data.byte(kOpenedob);
-	switch (data.byte(kOpenedtype)) {
+	byte obj = _openedOb;
+	switch (_openedType) {
 	case 4:
 		return getExAd(obj)->slotSize;
 	case 2:
@@ -294,11 +294,11 @@ byte DreamBase::getOpenedSlotSize() {
 void DreamBase::openOb() {
 	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
 
-	copyName(data.byte(kOpenedtype), data.byte(kOpenedob), commandLine);
+	copyName(_openedType, _openedOb, commandLine);
 
 	printMessage(kInventx, kInventy+86, 62, 240, false);
 
-	printDirect(commandLine, data.word(kLastxpos) + 5, kInventy+86, 220, false);
+	printDirect(commandLine, _lastXPos + 5, kInventy+86, 220, false);
 
 	fillOpen();
 	_openChangeSize = getOpenedSlotCount() * kItempicsize + kInventx;
@@ -310,8 +310,8 @@ void DreamBase::identifyOb() {
 		return;
 	}
 
-	uint16 initialX = data.word(kMousex) - data.word(kMapadx);
-	uint16 initialY = data.word(kMousey) - data.word(kMapady);
+	uint16 initialX = _mouseX - _mapAdX;
+	uint16 initialY = _mouseY - _mapAdY;
 
 	if (initialX >= 22 * 8 || initialY >= 20 * 8) {
 		blank();
@@ -321,16 +321,16 @@ void DreamBase::identifyOb() {
 	byte x = initialX & 0xFF;
 	byte y = initialY & 0xFF;
 
-	data.byte(kInmaparea) = 1;
-	data.byte(kPointerspath) = findPathOfPoint(x, y);
-	data.byte(kPointerfirstpath) = findFirstPath(x, y);
+	_inMapArea = 1;
+	_pointersPath = findPathOfPoint(x, y);
+	_pointerFirstPath = findFirstPath(x, y);
 
 	if (checkIfEx(x, y) || checkIfFree(x, y) ||
 		checkIfPerson(x, y) || checkIfSet(x, y))
 		return; // finishidentify
 
-	x = (data.word(kMousex) - data.word(kMapadx)) & 0xFF;
-	y = (data.word(kMousey) - data.word(kMapady)) & 0xFF;
+	x = (_mouseX - _mapAdX) & 0xFF;
+	y = (_mouseY - _mapAdY) & 0xFF;
 	byte flag, flagEx, type, flagX, flagY;
 
 	checkOne(x, y, &flag, &flagEx, &type, &flagX, &flagY);
@@ -342,11 +342,11 @@ void DreamBase::identifyOb() {
 }
 
 ObjectRef DreamBase::findInvPos() {
-	uint16 x = data.word(kMousex) - kInventx;
-	uint16 y = data.word(kMousey) - kInventy;
+	uint16 x = _mouseX - kInventx;
+	uint16 y = _mouseY - kInventy;
 	uint8 pos = (x / kItempicsize) + (y / kItempicsize) * 5;
 	uint8 invPos = data.byte(kRyanpage) * 10 + pos;
-	data.byte(kLastinvpos) = invPos;
+	_lastInvPos = invPos;
 	return _ryanInvList[invPos];
 }
 
@@ -357,26 +357,26 @@ void DreamBase::selectOb() {
 		return;
 	}
 
-	data.byte(kWithobject) = objectId._index;
-	data.byte(kWithtype)   = objectId._type;
+	_withObject = objectId._index;
+	_withType   = objectId._type;
 
-	if (objectId != _oldSubject || data.byte(kCommandtype) != 221) {
+	if (objectId != _oldSubject || _commandType != 221) {
 		if (objectId == _oldSubject)
-			data.byte(kCommandtype) = 221;
+			_commandType = 221;
 		_oldSubject = objectId;
 		commandWithOb(0, objectId._type, objectId._index);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
 	delPointer();
-	data.byte(kInvopen) = 0;
+	_invOpen = 0;
 	useRoutine();
 }
 
 void DreamBase::setPickup() {
-	if (data.byte(kObjecttype) != kSetObjectType1 && data.byte(kObjecttype) != kSetObjectType3) {
+	if (_objectType != kSetObjectType1 && _objectType != kSetObjectType3) {
 		// Object types 1 and 3 are excluded, so the resulting object is a DynObject
 		uint8 dummy;
 		DynObject *object = (DynObject *)getAnyAd(&dummy, &dummy);
@@ -389,12 +389,12 @@ void DreamBase::setPickup() {
 		return;
 	}
 
-	if (data.byte(kCommandtype) != 209) {
-		data.byte(kCommandtype) = 209;
-		commandWithOb(33, data.byte(kObjecttype), data.byte(kCommand));
+	if (_commandType != 209) {
+		_commandType = 209;
+		commandWithOb(33, _objectType, _command);
 	}
 
-	if (data.word(kMousebutton) != 1 || data.word(kMousebutton) == data.word(kOldbutton))
+	if (_mouseButton != 1 || _mouseButton == _oldButton)
 		return;
 
 	createPanel();
@@ -402,20 +402,20 @@ void DreamBase::setPickup() {
 	showMan();
 	showExit();
 	examIcon();
-	data.byte(kPickup) = 1;
-	data.byte(kInvopen) = 2;
-
-	if (data.byte(kObjecttype) != kExObjectType) {
-		assert(data.byte(kObjecttype) == kFreeObjectType);
-		data.byte(kOpenedob) = 255;
-		data.byte(kItemframe) = transferToEx(data.byte(kCommand));
-		data.byte(kObjecttype) = kExObjectType;
-		DynObject *object = getExAd(data.byte(kItemframe));
+	_pickUp = 1;
+	_invOpen = 2;
+
+	if (_objectType != kExObjectType) {
+		assert(_objectType == kFreeObjectType);
+		_openedOb = 255;
+		_itemFrame = transferToEx(_command);
+		_objectType = kExObjectType;
+		DynObject *object = getExAd(_itemFrame);
 		object->mapad[0] = 20;
 		object->mapad[1] = 255;
 	} else {
-		data.byte(kItemframe) = data.byte(kCommand);
-		data.byte(kOpenedob) = 255;
+		_itemFrame = _command;
+		_openedOb = 255;
 	}
 
 	openInv();
@@ -486,16 +486,16 @@ void DreamBase::deleteExObject(uint8 index) {
 }
 
 void DreamBase::removeObFromInv() {
-	if (data.byte(kCommand) == 100)
+	if (_command == 100)
 		return; // object doesn't exist
 
-	assert(data.byte(kObjecttype) == kExObjectType);
+	assert(_objectType == kExObjectType);
 
-	deleteExObject(data.byte(kCommand));
+	deleteExObject(_command);
 }
 
 void DreamBase::inToInv() {
-	if (!data.byte(kPickup)) {
+	if (!_pickUp) {
 		outOfInv();
 		return;
 	}
@@ -507,25 +507,25 @@ void DreamBase::inToInv() {
 		return;
 	}
 
-	subject._type = data.byte(kObjecttype);
-	subject._index = data.byte(kItemframe);
+	subject._type = _objectType;
+	subject._index = _itemFrame;
 
-	if (subject != _oldSubject || data.byte(kCommandtype) != 220) {
+	if (subject != _oldSubject || _commandType != 220) {
 		if (subject == _oldSubject)
-			data.byte(kCommandtype) = 220;
+			_commandType = 220;
 		_oldSubject = subject;
 		commandWithOb(35, subject._type, subject._index);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return; // notletgo2
 	
 	delPointer();
-	DynObject *object = getExAd(data.byte(kItemframe));
+	DynObject *object = getExAd(_itemFrame);
 	object->mapad[0] = 4;
 	object->mapad[1] = 255;
-	object->mapad[2] = data.byte(kLastinvpos);
-	data.byte(kPickup) = 0;
+	object->mapad[2] = _lastInvPos;
+	_pickUp = 0;
 	fillRyan();
 	readMouse();
 	showPointer();
@@ -542,26 +542,26 @@ void DreamBase::outOfInv() {
 		return;
 	}
 
-	if (data.word(kMousebutton) == 2) {
+	if (_mouseButton == 2) {
 		reExFromInv();
 		return;
 	}
 
-	if (subject != _oldSubject || data.byte(kCommandtype) != 221) {
+	if (subject != _oldSubject || _commandType != 221) {
 		if (subject == _oldSubject)
-			data.byte(kCommandtype) = 221;
+			_commandType = 221;
 		_oldSubject = subject;
 		commandWithOb(36, subject._type, subject._index);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
 	delPointer();
-	data.byte(kPickup) = 1;
+	_pickUp = 1;
 	subject = findInvPos();
-	data.byte(kObjecttype) = subject._type;
-	data.byte(kItemframe) = subject._index;
+	_objectType = subject._type;
+	_itemFrame = subject._index;
 	assert(subject._type == kExObjectType);
 	DynObject *object = getExAd(subject._index);
 	object->mapad[0] = 20;
@@ -588,21 +588,21 @@ const uint8 *DreamBase::getObTextStart() {
 	const uint8 *textBase;
 	const uint8 *text;
 	uint16 textOff;
-	if (data.byte(kObjecttype) == kFreeObjectType) {
+	if (_objectType == kFreeObjectType) {
 		textBase = (const uint8 *)_freeDesc._text;
 		textOff = kFreetext;
-		text = (const uint8 *)_freeDesc.getString(data.byte(kCommand));
-	} else if (data.byte(kObjecttype) == kSetObjectType1) {
+		text = (const uint8 *)_freeDesc.getString(_command);
+	} else if (_objectType == kSetObjectType1) {
 		textBase = (const uint8 *)_setDesc._text;
 		textOff = kSettext;
-		text = (const uint8 *)_setDesc.getString(data.byte(kCommand));
+		text = (const uint8 *)_setDesc.getString(_command);
 	} else {
 		textBase = (const uint8 *)_exText._text;
 		textOff = kExtext;
-		text = (const uint8 *)_exText.getString(data.byte(kCommand));
+		text = (const uint8 *)_exText.getString(_command);
 	}
 
-	if (data.byte(kObjecttype) != kSetObjectType1)
+	if (_objectType != kSetObjectType1)
 		return text;
 
 	const uint8 *obname = text;
@@ -631,7 +631,7 @@ const uint8 *DreamBase::getObTextStart() {
 				// arbitrary give-up counter
 				// FIXME: Make this more precise to avoid reading out of bounds
 				if (text - (textBase - textOff) >= 8000) {
-					warning("Object description for %d/%d not found", data.byte(kObjecttype), data.byte(kCommand));
+					warning("Object description for %d/%d not found", _objectType, _command);
 					return obname;
 				}
 			}
@@ -654,16 +654,16 @@ const uint8 *DreamBase::getObTextStart() {
 }
 
 void DreamBase::dropObject() {
-	if (data.byte(kCommandtype) != 223) {
-		data.byte(kCommandtype) = 223;
-		if (!data.byte(kPickup)) {
+	if (_commandType != 223) {
+		_commandType = 223;
+		if (!_pickUp) {
 			blank();
 			return;
 		}
-		commandWithOb(37, data.byte(kObjecttype), data.byte(kItemframe));
+		commandWithOb(37, _objectType, _itemFrame);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
 	if (isItWorn(getEitherAdCPP())) {
@@ -671,9 +671,9 @@ void DreamBase::dropObject() {
 		return;
 	}
 
-	if (data.byte(kReallocation) != 47) {
+	if (_realLocation != 47) {
 		byte flag, flagEx, type, flagX, flagY;
-		checkOne(data.byte(kRyanx) + 12, data.byte(kRyany) + 12, &flag, &flagEx, &type, &flagX, &flagY);
+		checkOne(_ryanX + 12, _ryanY + 12, &flag, &flagEx, &type, &flagX, &flagY);
 
 		if (flag >= 2) {
 			dropError();
@@ -684,26 +684,26 @@ void DreamBase::dropObject() {
 		return;
 	}
 
-	if (data.byte(kMapxsize) == 64 && data.byte(kMapysize) == 64) {
+	if (_mapXSize == 64 && _mapYSize == 64) {
 		// Inside lift
 		dropError();
 		return;
 	}
 
-	if (compare(data.byte(kItemframe), 4, "GUNA") || compare(data.byte(kItemframe), 4, "SHLD")) {
+	if (compare(_itemFrame, 4, "GUNA") || compare(_itemFrame, 4, "SHLD")) {
 		cantDrop();
 		return;
 	}
 
-	data.byte(kObjecttype) = 4;
-	DynObject *object = getExAd(data.byte(kItemframe));
+	_objectType = 4;
+	DynObject *object = getExAd(_itemFrame);
 	object->mapad[0] = 0;
-	object->mapad[1] = ((data.byte(kRyanx) + 4) >> 4) + data.byte(kMapx);
-	object->mapad[2] = (data.byte(kRyanx) + 4) & 0xF;
-	object->mapad[3] = ((data.byte(kRyany) + 8) >> 4) + data.byte(kMapy);
-	object->mapad[4] = (data.byte(kRyany) + 8) & 0xF;
-	data.byte(kPickup) = 0;
-	object->currentLocation = data.byte(kReallocation);
+	object->mapad[1] = ((_ryanX + 4) >> 4) + _mapX;
+	object->mapad[2] = (_ryanX + 4) & 0xF;
+	object->mapad[3] = ((_ryanY + 8) >> 4) + _mapY;
+	object->mapad[4] = (_ryanY + 8) & 0xF;
+	_pickUp = 0;
+	object->currentLocation = _realLocation;
 }
 
 bool DreamBase::checkObjectSize() {
@@ -744,16 +744,16 @@ void DreamBase::selectOpenOb() {
 		return;
 	}
 
-	if (data.byte(kCommandtype) != 224) {
-		data.byte(kCommandtype) = 224;
-		commandWithOb(38, data.byte(kObjecttype), data.byte(kCommand));
+	if (_commandType != 224) {
+		_commandType = 224;
+		commandWithOb(38, _objectType, _command);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
-	data.byte(kOpenedob) = data.byte(kCommand);
-	data.byte(kOpenedtype) = data.byte(kObjecttype);
+	_openedOb = _command;
+	_openedType = _objectType;
 	createPanel();
 	showPanel();
 	showMan();
@@ -770,45 +770,45 @@ void DreamBase::selectOpenOb() {
 
 void DreamBase::reExFromInv() {
 	ObjectRef objectId = findInvPos();
-	data.byte(kCommandtype) = objectId._type;
-	data.byte(kCommand)     = objectId._index;
-	data.byte(kExamagain) = 1;
-	data.byte(kPointermode) = 0;
+	_commandType = objectId._type;
+	_command     = objectId._index;
+	_examAgain = 1;
+	_pointerMode = 0;
 }
 
 void DreamBase::swapWithInv() {
 	ObjectRef subject;
-	subject._type = data.byte(kObjecttype);
-	subject._index = data.byte(kItemframe);
-	if (subject != _oldSubject || data.byte(kCommandtype) != 243) {
+	subject._type = _objectType;
+	subject._index = _itemFrame;
+	if (subject != _oldSubject || _commandType != 243) {
 		if (subject == _oldSubject)
-			data.byte(kCommandtype) = 243;
+			_commandType = 243;
 		_oldSubject = subject;
 		commandWithOb(34, subject._type, subject._index);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
-	byte prevType = data.byte(kObjecttype);
-	byte prevFrame = data.byte(kItemframe);
+	byte prevType = _objectType;
+	byte prevFrame = _itemFrame;
 	ObjectRef objectId = findInvPos();
-	data.byte(kItemframe) = objectId._index;
-	data.byte(kObjecttype) = objectId._type;
+	_itemFrame = objectId._index;
+	_objectType = objectId._type;
 	DynObject *object = getEitherAdCPP();
 	object->mapad[0] = 20;
 	object->mapad[1] = 255;
-	byte prevType2 = data.byte(kObjecttype);
-	byte prevFrame2 = data.byte(kItemframe);
-	data.byte(kObjecttype) = prevType;
-	data.byte(kItemframe) = prevFrame;
+	byte prevType2 = _objectType;
+	byte prevFrame2 = _itemFrame;
+	_objectType = prevType;
+	_itemFrame = prevFrame;
 	delPointer();
 	object = getEitherAdCPP();
 	object->mapad[0] = 4;
 	object->mapad[1] = 255;
-	object->mapad[2] = data.byte(kLastinvpos);
-	data.byte(kObjecttype) = prevType2;
-	data.byte(kItemframe) = prevFrame2;
+	object->mapad[2] = _lastInvPos;
+	_objectType = prevType2;
+	_itemFrame = prevFrame2;
 	fillRyan();
 	readMouse();
 	showPointer();
@@ -817,10 +817,10 @@ void DreamBase::swapWithInv() {
 }
 
 void DreamBase::useOpened() {
-	if (data.byte(kOpenedob) == 255)
+	if (_openedOb == 255)
 		return;	// cannot use opened object
 
-	if (!data.byte(kPickup)) {
+	if (!_pickUp) {
 		outOfOpen();
 		return;
 	}
@@ -832,21 +832,21 @@ void DreamBase::useOpened() {
 		return;
 	}
 
-	if (data.byte(kPickup) != 1) {
+	if (_pickUp != 1) {
 		blank();
 		return;
 	}
 
-	objectId._type = data.byte(kObjecttype);
-	objectId._index = data.byte(kItemframe);
-	if (objectId != _oldSubject || data.byte(kCommandtype) != 227) {
+	objectId._type = _objectType;
+	objectId._index = _itemFrame;
+	if (objectId != _oldSubject || _commandType != 227) {
 		if (objectId == _oldSubject)
-			data.byte(kCommandtype) = 227;
+			_commandType = 227;
 		_oldSubject = objectId;
 		commandWithOb(35, objectId._type, objectId._index);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
 	if (isItWorn(getEitherAdCPP())) {
@@ -856,8 +856,8 @@ void DreamBase::useOpened() {
 
 	delPointer();
 
-	if (data.byte(kItemframe) == data.byte(kOpenedob) &&
-		data.byte(kObjecttype) == data.byte(kOpenedtype)) {
+	if (_itemFrame == _openedOb &&
+		_objectType == _openedType) {
 		errorMessage1();
 		return;
 	}
@@ -865,12 +865,12 @@ void DreamBase::useOpened() {
 	if (!checkObjectSize())
 		return;
 
-	data.byte(kPickup) = 0;
+	_pickUp = 0;
 	DynObject *object = getEitherAdCPP();
-	object->mapad[0] = data.byte(kOpenedtype);
-	object->mapad[1] = data.byte(kOpenedob);
-	object->mapad[2] = data.byte(kLastinvpos);
-	object->mapad[3] = data.byte(kReallocation);
+	object->mapad[0] = _openedType;
+	object->mapad[1] = _openedOb;
+	object->mapad[2] = _lastInvPos;
+	object->mapad[3] = _realLocation;
 	fillOpen();
 	underTextLine();
 	readMouse();
@@ -881,7 +881,7 @@ void DreamBase::useOpened() {
 }
 
 void DreamBase::outOfOpen() {
-	if (data.byte(kOpenedob) == 255)
+	if (_openedOb == 255)
 		return;	// cannot use opened object
 
 	ObjectRef objectId = findOpenPos();
@@ -891,32 +891,32 @@ void DreamBase::outOfOpen() {
 		return;
 	}
 
-	if (objectId != _oldSubject || data.byte(kCommandtype) != 228) {
+	if (objectId != _oldSubject || _commandType != 228) {
 		if (objectId == _oldSubject)
-			data.byte(kCommandtype) = 228;
+			_commandType = 228;
 		_oldSubject = objectId;
 		commandWithOb(36, objectId._type, objectId._index);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton))
+	if (_mouseButton == _oldButton)
 		return;	// notletgo4
 
-	if (data.word(kMousebutton) != 1) {
-		if (data.word(kMousebutton) == 2)
+	if (_mouseButton != 1) {
+		if (_mouseButton == 2)
 			reExFromOpen();
 		return;
 	}
 
 	delPointer();
-	data.byte(kPickup) = 1;
+	_pickUp = 1;
 	objectId = findOpenPos();
-	data.byte(kObjecttype) = objectId._type;
-	data.byte(kItemframe) = objectId._index;
+	_objectType = objectId._type;
+	_itemFrame = objectId._index;
 
-	if (data.byte(kObjecttype) != kExObjectType) {
+	if (_objectType != kExObjectType) {
 		assert(objectId._type == kFreeObjectType);
-		data.byte(kItemframe) = transferToEx(objectId._index);
-		data.byte(kObjecttype) = kExObjectType;
+		_itemFrame = transferToEx(objectId._index);
+		_objectType = kExObjectType;
 	}
 
 	DynObject *object = getEitherAdCPP();
@@ -934,16 +934,16 @@ void DreamBase::outOfOpen() {
 
 void DreamBase::swapWithOpen() {
 	ObjectRef subject;
-	subject._type = data.byte(kObjecttype);
-	subject._index = data.byte(kItemframe);
-	if (subject != _oldSubject || data.byte(kCommandtype) != 242) {
+	subject._type = _objectType;
+	subject._index = _itemFrame;
+	if (subject != _oldSubject || _commandType != 242) {
 		if (subject == _oldSubject)
-			data.byte(kCommandtype) = 242;
+			_commandType = 242;
 		_oldSubject = subject;
 		commandWithOb(34, subject._type, subject._index);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
 	if (isItWorn(getEitherAdCPP())) {
@@ -953,8 +953,8 @@ void DreamBase::swapWithOpen() {
 
 	delPointer();
 
-	if (data.byte(kItemframe) == data.byte(kOpenedob) &&
-		data.byte(kObjecttype) == data.byte(kOpenedtype)) {
+	if (_itemFrame == _openedOb &&
+		_objectType == _openedType) {
 		errorMessage1();
 		return;
 	}
@@ -962,33 +962,33 @@ void DreamBase::swapWithOpen() {
 	if (!checkObjectSize())
 		return;
 
-	byte prevType = data.byte(kObjecttype);
-	byte prevFrame = data.byte(kItemframe);
+	byte prevType = _objectType;
+	byte prevFrame = _itemFrame;
 	ObjectRef objectId = findOpenPos();
-	data.byte(kObjecttype) = objectId._type;
-	data.byte(kItemframe)  = objectId._index;
+	_objectType = objectId._type;
+	_itemFrame  = objectId._index;
 
-	if (data.byte(kObjecttype) != kExObjectType) {
+	if (_objectType != kExObjectType) {
 		assert(objectId._type == kFreeObjectType);
-		data.byte(kItemframe) = transferToEx(objectId._index);
-		data.byte(kObjecttype) = kExObjectType;
+		_itemFrame = transferToEx(objectId._index);
+		_objectType = kExObjectType;
 	}
 
 	DynObject *object = getEitherAdCPP();
 	object->mapad[0] = 20;
 	object->mapad[1] = 255;
 
-	byte prevType2 = data.byte(kObjecttype);
-	byte prevFrame2 = data.byte(kItemframe);
-	data.byte(kObjecttype) = prevType;
-	data.byte(kItemframe) = prevFrame;
+	byte prevType2 = _objectType;
+	byte prevFrame2 = _itemFrame;
+	_objectType = prevType;
+	_itemFrame = prevFrame;
 	object = getEitherAdCPP();
-	object->mapad[0] = data.byte(kOpenedtype);
-	object->mapad[1] = data.byte(kOpenedob);
-	object->mapad[2] = data.byte(kLastinvpos);
-	object->mapad[3] = data.byte(kReallocation);
-	data.byte(kObjecttype) = prevType2;
-	data.byte(kItemframe) = prevFrame2;
+	object->mapad[0] = _openedType;
+	object->mapad[1] = _openedOb;
+	object->mapad[2] = _lastInvPos;
+	object->mapad[3] = _realLocation;
+	_objectType = prevType2;
+	_itemFrame = prevFrame2;
 	fillOpen();
 	fillRyan();
 	underTextLine();
@@ -1000,8 +1000,8 @@ void DreamBase::swapWithOpen() {
 }
 
 ObjectRef DreamBase::findOpenPos() {
-	uint8 pos = (data.word(kMousex) - kInventx) / kItempicsize;
-	data.byte(kLastinvpos) = pos;
+	uint8 pos = (_mouseX - kInventx) / kItempicsize;
+	_lastInvPos = pos;
 
 	return _openInvList[pos];
 }
@@ -1016,12 +1016,12 @@ byte DreamBase::transferToEx(uint8 from) {
 
 	memcpy(exObject, freeObject, sizeof(DynObject));
 
-	exObject->currentLocation = data.byte(kReallocation);
-	exObject->initialLocation = data.byte(kReallocation);
+	exObject->currentLocation = _realLocation;
+	exObject->initialLocation = _realLocation;
 	exObject->index = from;
 	exObject->mapad[0] = 4;
 	exObject->mapad[1] = 255;
-	exObject->mapad[2] = data.byte(kLastinvpos);
+	exObject->mapad[2] = _lastInvPos;
 
 	transferFrame(from, pos, 0);
 	transferFrame(from, pos, 1);
@@ -1053,11 +1053,11 @@ void DreamBase::findAllOpen() {
 
 	for (uint8 i = 0; i < kNumexobjects; ++i) {
 		const DynObject *obj = getExAd(i);
-		if (obj->mapad[1] != data.byte(kOpenedob))
+		if (obj->mapad[1] != _openedOb)
 			continue;
-		if (obj->mapad[0] != data.byte(kOpenedtype))
+		if (obj->mapad[0] != _openedType)
 			continue;
-		if (data.byte(kOpenedtype) != kExObjectType && obj->mapad[3] != data.byte(kReallocation))
+		if (_openedType != kExObjectType && obj->mapad[3] != _realLocation)
 			continue;
 		uint8 slot = obj->mapad[2];
 		assert(slot < 16);
@@ -1067,9 +1067,9 @@ void DreamBase::findAllOpen() {
 
 	for (uint8 i = 0; i < 80; ++i) {
 		const DynObject *obj = getFreeAd(i);
-		if (obj->mapad[1] != data.byte(kOpenedob))
+		if (obj->mapad[1] != _openedOb)
 			continue;
-		if (obj->mapad[0] != data.byte(kOpenedtype))
+		if (obj->mapad[0] != _openedType)
 			continue;
 		uint8 slot = obj->mapad[2];
 		_openInvList[slot]._index = i;
@@ -1095,8 +1095,8 @@ void DreamBase::pickupConts(uint8 from, uint8 containerEx) {
 		DynObject *exObj = getExAd(pos);
 
 		memcpy(exObj, freeObj, sizeof(DynObject));
-		exObj->currentLocation = data.byte(kReallocation);
-		exObj->initialLocation = data.byte(kReallocation);
+		exObj->currentLocation = _realLocation;
+		exObj->initialLocation = _realLocation;
 		exObj->index = index;
 		exObj->mapad[0] = 4; // kExObjectType?
 		exObj->mapad[1] = containerEx;
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index 8a0596149e..6254fe7755 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -25,7 +25,7 @@
 namespace DreamGen {
 
 void DreamBase::turnPathOn(uint8 param) {
-	findOrMake(param, 0xff, data.byte(kRoomnum) + 100);
+	findOrMake(param, 0xff, _roomNum + 100);
 	PathNode *roomsPaths = getRoomsPaths()->nodes;
 	if (param == 0xff)
 		return;
@@ -33,7 +33,7 @@ void DreamBase::turnPathOn(uint8 param) {
 }
 
 void DreamBase::turnPathOff(uint8 param) {
-	findOrMake(param, 0x00, data.byte(kRoomnum) + 100);
+	findOrMake(param, 0x00, _roomNum + 100);
 	PathNode *roomsPaths = getRoomsPaths()->nodes;
 	if (param == 0xff)
 		return;
@@ -51,84 +51,84 @@ void DreamBase::turnAnyPathOff(uint8 param, uint8 room) {
 }
 
 RoomPaths *DreamBase::getRoomsPaths() {
-	return &_pathData[data.byte(kRoomnum)];
+	return &_pathData[_roomNum];
 }
 
 void DreamBase::faceRightWay() {
 	PathNode *paths = getRoomsPaths()->nodes;
-	uint8 dir = paths[data.byte(kManspath)].dir;
-	data.byte(kTurntoface) = dir;
-	data.byte(kLeavedirection) = dir;
+	uint8 dir = paths[_mansPath].dir;
+	_turnToFace = dir;
+	_leaveDirection = dir;
 }
 
 void DreamBase::setWalk() {
-	if (data.byte(kLinepointer) != 254) {
+	if (_linePointer != 254) {
 		// Already walking
-		data.byte(kFinaldest) = data.byte(kPointerspath);
-	} else if (data.byte(kPointerspath) == data.byte(kManspath)) {
+		_finalDest = _pointersPath;
+	} else if (_pointersPath == _mansPath) {
 		// Can't walk
 		faceRightWay();
 	} else if (data.byte(kWatchmode) == 1) {
 		// Holding reel
-		data.byte(kDestafterhold) = data.byte(kPointerspath);
+		data.byte(kDestafterhold) = _pointersPath;
 		data.byte(kWatchmode) = 2;
 	} else if (data.byte(kWatchmode) == 2) {
 		// Can't walk
 	} else {
-		data.byte(kDestination) = data.byte(kPointerspath);
-		data.byte(kFinaldest) = data.byte(kPointerspath);
-		if (data.word(kMousebutton) != 2 || data.word(kCommandtype) == 3) {
+		_destination = _pointersPath;
+		_finalDest = _pointersPath;
+		if (_mouseButton != 2 || _commandType == 3) {
 			autoSetWalk();
 		} else {
-			data.byte(kWalkandexam) = 1;
-			data.byte(kWalkexamtype) = data.byte(kCommandtype);
-			data.byte(kWalkexamnum) = data.byte(kCommand);
+			_walkAndExam = 1;
+			_walkExamType = _commandType;
+			_walkExamNum = _command;
 			autoSetWalk();
 		}
 	}
 }
 
 void DreamBase::autoSetWalk() {
-	if (data.byte(kFinaldest) == data.byte(kManspath))
+	if (_finalDest == _mansPath)
 		return;
 	const RoomPaths *roomsPaths = getRoomsPaths();
 	checkDest(roomsPaths);
-	data.word(kLinestartx) = roomsPaths->nodes[data.byte(kManspath)].x - 12;
-	data.word(kLinestarty) = roomsPaths->nodes[data.byte(kManspath)].y - 12;
-	data.word(kLineendx) = roomsPaths->nodes[data.byte(kDestination)].x - 12;
-	data.word(kLineendy) = roomsPaths->nodes[data.byte(kDestination)].y - 12;
+	_lineStartX = roomsPaths->nodes[_mansPath].x - 12;
+	_lineStartY = roomsPaths->nodes[_mansPath].y - 12;
+	_lineEndX = roomsPaths->nodes[_destination].x - 12;
+	_lineEndY = roomsPaths->nodes[_destination].y - 12;
 	bresenhams();
-	if (data.byte(kLinedirection) != 0) {
-		data.byte(kLinepointer) = data.byte(kLinelength) - 1;
-		data.byte(kLinedirection) = 1;
+	if (_lineDirection != 0) {
+		_linePointer = _lineLength - 1;
+		_lineDirection = 1;
 		return;
 	}
-	data.byte(kLinepointer) = 0;
+	_linePointer = 0;
 }
 
 void DreamBase::checkDest(const RoomPaths *roomsPaths) {
 	const PathSegment *segments = roomsPaths->segments;
-	const uint8 tmp = data.byte(kManspath) << 4;
-	uint8 destination = data.byte(kDestination);
+	const uint8 tmp = _mansPath << 4;
+	uint8 destination = _destination;
 	for (size_t i = 0; i < 24; ++i) {
 		if ((segments[i].b0 & 0xf0) == tmp &&
-		    (segments[i].b0 & 0x0f) == data.byte(kDestination)) {
-			data.byte(kDestination) = segments[i].b1 & 0x0f;
+		    (segments[i].b0 & 0x0f) == _destination) {
+			_destination = segments[i].b1 & 0x0f;
 			return;
 		}
 
 		if (((segments[i].b0 & 0x0f) << 4) == tmp &&
-		    ((segments[i].b0 & 0xf0) >> 4) == data.byte(kDestination)) {
+		    ((segments[i].b0 & 0xf0) >> 4) == _destination) {
 			destination = segments[i].b1 & 0x0f;
 		}
 	}
-	data.byte(kDestination) = destination;
+	_destination = destination;
 }
 
 void DreamBase::findXYFromPath() {
 	const PathNode *roomsPaths = getRoomsPaths()->nodes;
-	data.byte(kRyanx) = roomsPaths[data.byte(kManspath)].x - 12;
-	data.byte(kRyany) = roomsPaths[data.byte(kManspath)].y - 12;
+	_ryanX = roomsPaths[_mansPath].x - 12;
+	_ryanY = roomsPaths[_mansPath].y - 12;
 }
 
 bool DreamBase::checkIfPathIsOn(uint8 index) {
@@ -140,10 +140,10 @@ bool DreamBase::checkIfPathIsOn(uint8 index) {
 void DreamBase::bresenhams() {
 	workoutFrames();
 	Common::Point *lineData = &_lineData[0];
-	int16 startX = (int16)data.word(kLinestartx);
-	int16 startY = (int16)data.word(kLinestarty);
-	int16 endX = (int16)data.word(kLineendx);
-	int16 endY = (int16)data.word(kLineendy);
+	int16 startX = (int16)_lineStartX;
+	int16 startY = (int16)_lineStartY;
+	int16 endX = (int16)_lineEndX;
+	int16 endY = (int16)_lineEndY;
 
 	if (endX == startX) {
 		uint16 deltaY;
@@ -151,15 +151,15 @@ void DreamBase::bresenhams() {
 		if (endY < startY) {
 			deltaY = startY - endY;
 			y = (int8)endY;
-			data.byte(kLinedirection) = 1;
+			_lineDirection = 1;
 		} else {
 			deltaY = endY - startY;
 			y = (int8)startY;
-			data.byte(kLinedirection) = 0;
+			_lineDirection = 0;
 		}
 		++deltaY;
 		int8 x = (int8)startX;
-		data.byte(kLinelength) = deltaY;
+		_lineLength = deltaY;
 		for (; deltaY; --deltaY) {
 			lineData->x = x;
 			lineData->y = y;
@@ -173,14 +173,14 @@ void DreamBase::bresenhams() {
 		deltaX = startX - endX;
 		SWAP(startX, endX);
 		SWAP(startY, endY);
-		data.word(kLinestartx) = (uint16)startX;
-		data.word(kLinestarty) = (uint16)startY;
-		data.word(kLineendx) = (uint16)endX;
-		data.word(kLineendy) = (uint16)endY;
-		data.byte(kLinedirection) = 1;
+		_lineStartX = (uint16)startX;
+		_lineStartY = (uint16)startY;
+		_lineEndX = (uint16)endX;
+		_lineEndY = (uint16)endY;
+		_lineDirection = 1;
 	} else {
 		deltaX = endX - startX;
-		data.byte(kLinedirection) = 0;
+		_lineDirection = 0;
 	}
 
 	int16 increment;
@@ -188,7 +188,7 @@ void DreamBase::bresenhams() {
 		int8 x = (int8)startX;
 		int8 y = (int8)startY;
 		++deltaX;
-		data.byte(kLinelength) = deltaX;
+		_lineLength = deltaX;
 		for (; deltaX; --deltaX) {
 			lineData->x = x;
 			lineData->y = y;
@@ -225,7 +225,7 @@ void DreamBase::bresenhams() {
 	++delta1;
 	int8 x = (int8)startX;
 	int8 y = (int8)startY;
-	data.byte(kLinelength) = delta1;
+	_lineLength = delta1;
 	if (lineRoutine != 1) {
 		for (; delta1; --delta1) {
 			lineData->x = x;
@@ -261,10 +261,10 @@ void DreamBase::workoutFrames() {
 
 	// We have to use signed arithmetic here because these values can
 	// be slightly negative when walking off-screen
-	int lineStartX = (int16)data.word(kLinestartx);
-	int lineStartY = (int16)data.word(kLinestarty);
-	int lineEndX = (int16)data.word(kLineendx);
-	int lineEndY = (int16)data.word(kLineendy);
+	int lineStartX = (int16)_lineStartX;
+	int lineStartY = (int16)_lineStartY;
+	int lineEndX = (int16)_lineEndX;
+	int lineEndY = (int16)_lineEndY;
 
 
 	diffx = ABS(lineStartX - lineEndX);
@@ -302,12 +302,12 @@ void DreamBase::workoutFrames() {
 		}
 	}
 
-	data.byte(kTurntoface) = tmp & 7;
-	data.byte(kTurndirection) = 0;
+	_turnToFace = tmp & 7;
+	_turnDirection = 0;
 }
 
 byte DreamBase::findFirstPath(byte x, byte y) {
-	PathNode *paths = _pathData[data.byte(kRoomnum)].nodes;
+	PathNode *paths = _pathData[_roomNum].nodes;
 
 	for (uint8 index = 0; index < 12; index++) {
 		if (paths[index].x1 == 0xff && paths[index].y1 == 0xff)
@@ -326,7 +326,7 @@ byte DreamBase::findFirstPath(byte x, byte y) {
 }
 
 byte DreamBase::findPathOfPoint(byte x, byte y) {
-	PathNode *paths = _pathData[data.byte(kRoomnum)].nodes;
+	PathNode *paths = _pathData[_roomNum].nodes;
 
 	for (uint8 index = 0; index < 12; index++) {
 		if (paths[index].on != 0xff)
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 5b04e5be60..0ab39eea9f 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -130,12 +130,12 @@ void DreamBase::setupInitialReelRoutines() {
 
 void DreamBase::updatePeople() {
 	_peopleList.clear();
-	++data.word(kMaintimer);
+	++_mainTimer;
 
 	for (int i = 0; _reelRoutines[i].reallocation != 255; ++i) {
-		if (_reelRoutines[i].reallocation == data.byte(kReallocation) &&
-		        _reelRoutines[i].mapX == data.byte(kMapx) &&
-		        _reelRoutines[i].mapY == data.byte(kMapy)) {
+		if (_reelRoutines[i].reallocation == _realLocation &&
+		        _reelRoutines[i].mapX == _mapX &&
+		        _reelRoutines[i].mapY == _mapY) {
 			assert(reelCallbacks[i]);
 			(this->*(reelCallbacks[i]))(_reelRoutines[i]);
 		}
@@ -146,12 +146,12 @@ void DreamBase::madmanText() {
 	byte origCount;
 
 	if (isCD()) {
-		if (data.byte(kSpeechcount) >= 63)
+		if (_speechCount >= 63)
 			return;
 		if (_channel1Playing != 255)
 			return;
-		origCount = data.byte(kSpeechcount);
-		++data.byte(kSpeechcount);
+		origCount = _speechCount;
+		++_speechCount;
 	} else {
 		if (data.byte(kCombatcount) >= 61)
 			return;
@@ -174,7 +174,7 @@ void DreamBase::madman(ReelRoutine &routine) {
 		if (newReelPointer == 10) {
 			loadTempText("DREAMWEB.T82");
 			data.byte(kCombatcount) = (uint8)-1;
-			data.byte(kSpeechcount) = 0;
+			_speechCount = 0;
 		}
 		++newReelPointer;
 		if (newReelPointer == 294) {
@@ -204,18 +204,18 @@ void DreamBase::madman(ReelRoutine &routine) {
 		routine.setReelPointer(newReelPointer);
 	}
 	showGameReel(&routine);
-	routine.mapX = data.byte(kMapx);
+	routine.mapX = _mapX;
 	madMode();
 }
 
 void DreamBase::madMode() {
 	data.word(kWatchingtime) = 2;
-	data.byte(kPointermode) = 0;
+	_pointerMode = 0;
 	if (data.byte(kCombatcount) < (isCD() ? 65 : 63))
 		return;
 	if (data.byte(kCombatcount) >= (isCD() ? 70 : 68))
 		return;
-	data.byte(kPointermode) = 2;
+	_pointerMode = 2;
 }
 
 void DreamBase::addToPeopleList(ReelRoutine *routine) {
@@ -291,7 +291,7 @@ void DreamBase::sparky(ReelRoutine &routine) {
 
 void DreamBase::rockstar(ReelRoutine &routine) {
 	if ((routine.reelPointer() == 303) || (routine.reelPointer() == 118)) {
-		data.byte(kNewlocation) = 45;
+		_newLocation = 45;
 		showGameReel(&routine);
 		return;
 	}
@@ -317,12 +317,12 @@ void DreamBase::rockstar(ReelRoutine &routine) {
 	showGameReel(&routine);
 	if (routine.reelPointer() == 78) {
 		addToPeopleList(&routine);
-		data.byte(kPointermode) = 2;
+		_pointerMode = 2;
 		data.word(kWatchingtime) = 0;
 	} else {
 		data.word(kWatchingtime) = 2;
-		data.byte(kPointermode) = 0;
-		routine.mapY = data.byte(kMapy);
+		_pointerMode = 0;
+		routine.mapY = _mapY;
 	}
 }
 
@@ -433,11 +433,11 @@ void DreamBase::introMagic1(ReelRoutine &routine) {
 			nextReelPointer = 121;
 		routine.setReelPointer(nextReelPointer);
 		if (nextReelPointer == 121) {
-			++data.byte(kIntrocount);
+			++_introCount;
 			intro1Text();
-			if (data.byte(kIntrocount) == 8) {
-				data.byte(kMapy) += 10;
-				data.byte(kNowinnewroom) = 1;
+			if (_introCount == 8) {
+				_mapY += 10;
+				_nowInNewRoom = 1;
 			}
 		}
 	}
@@ -458,11 +458,11 @@ void DreamBase::introMagic3(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 218)
-			data.byte(kGetback) = 1;
+			_getBack = 1;
 		routine.setReelPointer(nextReelPointer);
 	}
 	showGameReel(&routine);
-	routine.mapX = data.byte(kMapx);
+	routine.mapX = _mapX;
 }
 
 void DreamBase::candles1(ReelRoutine &routine) {
@@ -516,7 +516,7 @@ void DreamBase::gates(ReelRoutine &routine) {
 		if (nextReelPointer >= 110)
 			routine.period = 2;
 		if (nextReelPointer == 120) {
-			data.byte(kGetback) = 1;
+			_getBack = 1;
 			nextReelPointer = 119;
 		}
 		routine.setReelPointer(nextReelPointer);
@@ -529,7 +529,7 @@ void DreamBase::security(ReelRoutine &routine) {
 	if (routine.reelPointer() == 32) {
 		if (data.byte(kLastweapon) == 1) {
 			data.word(kWatchingtime) = 10;
-			if ((data.byte(kManspath) == 9) && (data.byte(kFacing) == 0)) {
+			if ((_mansPath == 9) && (_facing == 0)) {
 				data.byte(kLastweapon) = (uint8)-1;
 				routine.incReelPointer();
 			}
@@ -632,7 +632,7 @@ void DreamBase::priest(ReelRoutine &routine) {
 	if (routine.reelPointer() == 8)
 		return; // priestspoken
 
-	data.byte(kPointermode) = 0;
+	_pointerMode = 0;
 	data.word(kWatchingtime) = 2;
 
 	if (checkSpeed(routine)) {
@@ -653,12 +653,12 @@ void DreamBase::monkAndRyan(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 83) {
-			data.byte(kIntrocount)++;
+			_introCount++;
 			textForMonk();
 			nextReelPointer = 77;
 
-			if (data.byte(kIntrocount) == 57) {
-				data.byte(kGetback) = 1;
+			if (_introCount == 57) {
+				_getBack = 1;
 				return;
 			}
 		}
@@ -692,13 +692,13 @@ void DreamBase::introMonks1(ReelRoutine &routine) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 
 		if (nextReelPointer == 80) {
-			data.byte(kMapy) += 10;
-			data.byte(kNowinnewroom) = 1;
+			_mapY += 10;
+			_nowInNewRoom = 1;
 			showGameReel(&routine);
 			return;
 		} else if (nextReelPointer == 30) {
-			data.byte(kMapy) -= 10;
-			data.byte(kNowinnewroom) = 1;
+			_mapY -= 10;
+			_nowInNewRoom = 1;
 			nextReelPointer = 51;
 		}
 
@@ -714,32 +714,32 @@ void DreamBase::introMonks1(ReelRoutine &routine) {
 	}
 
 	showGameReel(&routine);
-	routine.mapY = data.byte(kMapy);
+	routine.mapY = _mapY;
 }
 
 void DreamBase::introMonks2(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 87) {
-			data.byte(kIntrocount)++;
+			_introCount++;
 			monks2text();
 
-			if (data.byte(kIntrocount), 19)
+			if (_introCount == 19)
 				nextReelPointer = 87;
 			else
 				nextReelPointer = 74;
 		}
 
 		if (nextReelPointer == 110) {
-			data.byte(kIntrocount)++;
+			_introCount++;
 			monks2text();
 		
-			if (data.byte(kIntrocount) == 35)
+			if (_introCount == 35)
 				nextReelPointer = 111;
 			else
 				nextReelPointer = 98;
 		} else if (nextReelPointer == 176) {
-			data.byte(kGetback) = 1;
+			_getBack = 1;
 		} else if (nextReelPointer == 125) {
 			nextReelPointer = 140;
 		}
@@ -763,7 +763,7 @@ void DreamBase::soldier1(ReelRoutine &routine) {
 		}
 	} else if (data.byte(kLastweapon) == 1) {
 		data.word(kWatchingtime) = 10;
-		if (data.byte(kManspath) == 2 && data.byte(kFacing) == 4)
+		if (_mansPath == 2 && _facing == 4)
 			routine.incReelPointer();
 		data.byte(kLastweapon) = 0xFF;
 		data.byte(kCombatcount) = 0;
@@ -844,7 +844,7 @@ void DreamBase::heavy(ReelRoutine &routine) {
 			if (checkSpeed(routine))
 				routine.incReelPointer();
 		}
-	} else if (data.byte(kLastweapon) == 1 && data.byte(kManspath) == 5 && data.byte(kFacing) == 4) {
+	} else if (data.byte(kLastweapon) == 1 && _mansPath == 5 && _facing == 4) {
 		// Heavy wait
 		data.byte(kLastweapon) = (byte)-1;
 		routine.incReelPointer();
@@ -858,7 +858,7 @@ void DreamBase::heavy(ReelRoutine &routine) {
 void DreamBase::helicopter(ReelRoutine &routine) {
 	if (routine.reelPointer() == 203) {
 		// Won helicopter
-		data.byte(kPointermode) = 0;
+		_pointerMode = 0;
 		return;
 	}
 
@@ -889,13 +889,13 @@ void DreamBase::helicopter(ReelRoutine &routine) {
 	}
 
 	showGameReel(&routine);
-	routine.mapX = data.byte(kMapx);
+	routine.mapX = _mapX;
 	if (routine.reelPointer() < 9 && data.byte(kCombatcount) >= 7) {
-		data.byte(kPointermode) = 2;
+		_pointerMode = 2;
 		data.word(kWatchingtime) = 0;
 	} else {
 		// Not waiting helicopter
-		data.byte(kPointermode) = 0;
+		_pointerMode = 0;
 		data.word(kWatchingtime) = 2;
 	}
 }
@@ -912,7 +912,7 @@ void DreamBase::mugger(ReelRoutine &routine) {
 			routine.incReelPointer();
 
 		showGameReel(&routine);
-		routine.mapX = data.byte(kMapx);
+		routine.mapX = _mapX;
 	} else {
 		createPanel2();
 		showIcon();
@@ -923,15 +923,15 @@ void DreamBase::mugger(ReelRoutine &routine) {
 		workToScreen();
 		hangOn(300);
 		routine.setReelPointer(140);
-		data.byte(kManspath) = 2;
-		data.byte(kFinaldest) = 2;
+		_mansPath = 2;
+		_finalDest = 2;
 		findXYFromPath();
-		data.byte(kResetmanxy) = 1;
-		data.byte(kCommand) = findExObject("WETA");
-		data.byte(kObjecttype) = kExObjectType;
+		_resetManXY = 1;
+		_command = findExObject("WETA");
+		_objectType = kExObjectType;
 		removeObFromInv();
-		data.byte(kCommand) = findExObject("WETB");
-		data.byte(kObjecttype) = kExObjectType;
+		_command = findExObject("WETB");
+		_objectType = kExObjectType;
 		removeObFromInv();
 		makeMainScreen();
 		DreamBase::setupTimedUse(48, 70, 10, 68 - 32, 54 + 64);
@@ -942,14 +942,14 @@ void DreamBase::mugger(ReelRoutine &routine) {
 // Exiting the elevator of Sartain's industries, Sartain (the businessman) and
 // two bodyguards are expecting Ryan.
 void DreamBase::businessMan(ReelRoutine &routine) {
-	data.byte(kPointermode) = 0;
+	_pointerMode = 0;
 	data.word(kWatchingtime) = 2;
 	if (routine.reelPointer() == 2)
 		DreamBase::setupTimedUse(49, 30, 1, 68, 174);	// First
 
 	if (routine.reelPointer() == 95) {
 		// Businessman combat won - end
-		data.byte(kPointermode) = 0;
+		_pointerMode = 0;
 		data.word(kWatchingtime) = 0;
 		return;
 	}
@@ -983,10 +983,10 @@ void DreamBase::businessMan(ReelRoutine &routine) {
 				turnPathOn(1);
 				turnPathOn(2);
 				turnPathOff(3);
-				data.byte(kManspath) = 5;
-				data.byte(kFinaldest) = 5;
+				_mansPath = 5;
+				_finalDest = 5;
 				findXYFromPath();
-				data.byte(kResetmanxy) = 1;
+				_resetManXY = 1;
 				nextReelPointer = 92;
 			}
 		}
@@ -995,18 +995,18 @@ void DreamBase::businessMan(ReelRoutine &routine) {
 	}
 
 	showGameReel(&routine);
-	routine.mapY = data.byte(kMapy);
+	routine.mapY = _mapY;
 	if (routine.reelPointer() == 14) {
 		data.word(kWatchingtime) = 0;
-		data.byte(kPointermode) = 2;
+		_pointerMode = 2;
 	}
 }
 
 void DreamBase::endGameSeq(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
-		if (nextReelPointer == 51 && data.byte(kIntrocount) != 140) {
-			data.byte(kIntrocount)++;
+		if (nextReelPointer == 51 && _introCount != 140) {
+			_introCount++;
 			textForEnd();
 			nextReelPointer = 50;
 		}
@@ -1021,11 +1021,11 @@ void DreamBase::endGameSeq(ReelRoutine &routine) {
 		}
 
 		if (nextReelPointer == 340)
-			data.byte(kGetback) = 1;
+			_getBack = 1;
 	}
 
 	showGameReel(&routine);
-	routine.mapY = data.byte(kMapy);
+	routine.mapY = _mapY;
 	
 	if (routine.reelPointer() == 145) {
 		routine.setReelPointer(146);
@@ -1038,7 +1038,7 @@ void DreamBase::poolGuard(ReelRoutine &routine) {
 		// Combat over 2
 		showGameReel(&routine);
 		data.word(kWatchingtime) = 2;
-		data.byte(kPointermode) = 0;
+		_pointerMode = 0;
 		data.byte(kCombatcount)++;
 		if (data.byte(kCombatcount) < 100)
 			return; // doneover2
@@ -1048,7 +1048,7 @@ void DreamBase::poolGuard(ReelRoutine &routine) {
 	} else if (routine.reelPointer() == 185) {
 		// Combat over 1
 		data.word(kWatchingtime) = 0;
-		data.byte(kPointermode) = 0;
+		_pointerMode = 0;
 		turnPathOn(0);
 		turnPathOff(1);
 		return;
@@ -1099,10 +1099,10 @@ void DreamBase::poolGuard(ReelRoutine &routine) {
 	showGameReel(&routine);
 	
 	if (routine.reelPointer() != 121 && routine.reelPointer() != 146) {
-		data.byte(kPointermode) = 0;
+		_pointerMode = 0;
 		data.word(kWatchingtime) = 2;
 	} else {
-		data.byte(kPointermode) = 2;
+		_pointerMode = 2;
 		data.word(kWatchingtime) = 0;
 	}
 }
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 9bdebc1e14..3a27b7e05f 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -50,7 +50,7 @@ uint8 DreamBase::getNextWord(const GraphicsFile &charSet, const uint8 *string, u
 		firstChar = engine->modifyChar(firstChar);
 		if (firstChar != 255) {
 			uint8 secondChar = *string;
-			uint8 width = charSet._frames[firstChar - 32 + data.word(kCharshift)].width;
+			uint8 width = charSet._frames[firstChar - 32 + _charShift].width;
 			width = kernChars(firstChar, secondChar, width);
 			*totalWidth += width;
 		}
@@ -68,9 +68,9 @@ void DreamBase::printChar(const GraphicsFile &charSet, uint16* x, uint16 y, uint
 		height = &dummyHeight;
 	if (_foreignRelease)
 		y -= 3;
-	uint16 tmp = c - 32 + data.word(kCharshift);
+	uint16 tmp = c - 32 + _charShift;
 	showFrame(charSet, *x, y, tmp & 0x1ff, (tmp >> 8) & 0xfe, width, height);
-	if (data.byte(kKerning), 0)
+	if (_kerning == 0)
 		*width = kernChars(c, nextChar, *width);
 	(*x) += *width;
 }
@@ -80,8 +80,8 @@ void DreamBase::printChar(const GraphicsFile &charSet, uint16 x, uint16 y, uint8
 }
 
 uint8 DreamBase::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
-	data.byte(kPointerframe) = 1;
-	data.byte(kPointermode) = 3;
+	_pointerFrame = 1;
+	_pointerMode = 3;
 	do {
 		uint16 offset = x;
 		uint16 charCount = getNumber(_charset1, string, maxWidth, centered, &offset);
@@ -96,17 +96,17 @@ uint8 DreamBase::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWid
 			}
 			if (charCount != 1) {
 				c1 = engine->modifyChar(c1);
-				data.word(kCharshift) = 91;
+				_charShift = 91;
 				uint16 offset2 = offset;
 				printBoth(_charset1, &offset2, y, c1, c2);
-				data.word(kCharshift) = 0;
+				_charShift = 0;
 				for (int i=0; i<2; ++i) {
 					uint16 mouseState = waitFrames();
 					if (_quitRequested)
 						return 0;
 					if (mouseState == 0)
 						continue;
-					if (mouseState != data.word(kOldbutton)) {
+					if (mouseState != _oldButton) {
 						return 1;
 					}
 				}
@@ -124,7 +124,7 @@ uint8 DreamBase::printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxW
 }
 
 uint8 DreamBase::printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered) {
-	data.word(kLastxpos) = x;
+	_lastXPos = x;
 	const GraphicsFile &charSet = *_currentCharset;
 	while (true) {
 		uint16 offset = x;
@@ -140,10 +140,10 @@ uint8 DreamBase::printDirect(const uint8** string, uint16 x, uint16 *y, uint8 ma
 			c = engine->modifyChar(c);
 			uint8 width, height;
 			printChar(charSet, &i, *y, c, nextChar, &width, &height);
-			data.word(kLastxpos) = i;
+			_lastXPos = i;
 			--charCount;
 		} while (charCount);
-		*y += data.word(kLinespacing);
+		*y += _lineSpacing;
 	}
 }
 
@@ -200,12 +200,12 @@ uint16 DreamBase::waitFrames() {
 	vSync();
 	dumpPointer();
 	delPointer();
-	return data.word(kMousebutton);
+	return _mouseButton;
 }
 
 const char *DreamBase::monPrint(const char *string) {
-	data.byte(kKerning) = 1;
-	uint16 x = data.word(kMonadx);
+	_kerning = 1;
+	uint16 x = _monAdX;
 	const char *iterator = string;
 	bool done = false;
 	while (!done) {
@@ -226,22 +226,22 @@ const char *DreamBase::monPrint(const char *string) {
 				break;
 			}
 			c = engine->modifyChar(c);
-			printChar(_tempCharset, &x, data.word(kMonady), c, 0, NULL, NULL);
-			data.word(kCurslocx) = x;
-			data.word(kCurslocy) = data.word(kMonady);
-			data.word(kMaintimer) = 1;
+			printChar(_tempCharset, &x, _monAdY, c, 0, NULL, NULL);
+			_cursLocX = x;
+			_cursLocY = _monAdY;
+			_mainTimer = 1;
 			printCurs();
 			vSync();
 			lockMon();
 			delCurs();
 		} while (--count);
 
-		x = data.word(kMonadx);
+		x = _monAdX;
 		scrollMonitor();
-		data.word(kCurslocx) = data.word(kMonadx);
+		_cursLocX = _monAdX;
 	}
 
-	data.byte(kKerning) = 0;
+	_kerning = 0;
 	return iterator;
 }
 
@@ -254,7 +254,7 @@ void DreamBase::rollEndCreditsGameWon() {
 	multiGet(_mapStore, 75, 20, 160, 160);
 
 	const uint8 *string = getTextInFile1(3);
-	const int linespacing = data.word(kLinespacing);
+	const int linespacing = _lineSpacing;
 
 	for (int i = 0; i < 254; ++i) {
 		// Output the text, initially with an offset of 10 pixels,
@@ -293,7 +293,7 @@ void DreamBase::rollEndCreditsGameLost() {
 	multiGet(_mapStore, 25, 20, 160, 160);
 
 	const uint8 *string = getTextInFile1(49);
-	const int linespacing = data.word(kLinespacing);
+	const int linespacing = _lineSpacing;
 
 	for (int i = 0; i < 80; ++i) {
 		// Output the text, initially with an offset of 10 pixels,
@@ -315,7 +315,7 @@ void DreamBase::rollEndCreditsGameLost() {
 			vSync();
 			multiDump(25, 20, 160, 160);
 
-			if (data.byte(kLasthardkey) == 1)
+			if (_lastHardKey == 1)
 				return;
 		}
 
@@ -325,7 +325,7 @@ void DreamBase::rollEndCreditsGameLost() {
 			c = *string++;
 		} while (c != ':' && c != 0);
 
-		if (data.byte(kLasthardkey) == 1)
+		if (_lastHardKey == 1)
 			return;
 	}
 
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index e2af04df75..9faf93ae8e 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -45,33 +45,33 @@ void syncReelRoutine(Common::Serializer &s, ReelRoutine *reel) {
 }
 
 void DreamBase::loadGame() {
-	if (data.byte(kCommandtype) != 246) {
-		data.byte(kCommandtype) = 246;
+	if (_commandType != 246) {
+		_commandType = 246;
 		commandOnly(41);
 	}
-	if (data.word(kMousebutton) == data.word(kOldbutton))
+	if (_mouseButton == _oldButton)
 		return; // "noload"
-	if (data.word(kMousebutton) == 1)
+	if (_mouseButton == 1)
 		doLoad(-1);
 }
 
 // if -1, open menu to ask for slot to load
 // if >= 0, directly load from that slot
 void DreamBase::doLoad(int savegameId) {
-	data.byte(kLoadingorsave) = 1;
+	_loadingOrSave = 1;
 
 	if (ConfMan.getBool("dreamweb_originalsaveload") && savegameId == -1) {
 		showOpBox();
 		showLoadOps();
-		data.byte(kCurrentslot) = 0;
+		_currentSlot = 0;
 		showSlots();
 		showNames();
-		data.byte(kPointerframe) = 0;
+		_pointerFrame = 0;
 		workToScreenM();
 		namesToOld();
-		data.byte(kGetback) = 0;
+		_getBack = 0;
 
-		while (data.byte(kGetback) == 0) {
+		while (_getBack == 0) {
 			if (_quitRequested)
 				return;
 			delPointer();
@@ -88,7 +88,7 @@ void DreamBase::doLoad(int savegameId) {
 				{ 0xFFFF,0,0,0,0 }
 			};
 			checkCoords(loadlist);
-			if (data.byte(kGetback) == 2)
+			if (_getBack == 2)
 				return; // "quitloaded"
 		}
 	} else {
@@ -106,13 +106,13 @@ void DreamBase::doLoad(int savegameId) {
 		}
 
 		if (savegameId < 0) {
-			data.byte(kGetback) = 0;
+			_getBack = 0;
 			return;
 		}
 
 		loadPosition(savegameId);
 
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 	}
 
 	// If we reach this point, loadPosition() has just been called.
@@ -122,17 +122,17 @@ void DreamBase::doLoad(int savegameId) {
 
 	startLoading(g_madeUpRoomDat);
 	loadRoomsSample();
-	data.byte(kRoomloaded) = 1;
-	data.byte(kNewlocation) = 255;
+	_roomLoaded = 1;
+	_newLocation = 255;
 	clearSprites();
 	initMan();
 	initRain();
-	data.word(kTextaddressx) = 13;
-	data.word(kTextaddressy) = 182;
-	data.byte(kTextlen) = 240;
+	_textAddressX = 13;
+	_textAddressY = 182;
+	_textLen = 240;
 	startup();
 	workToScreen();
-	data.byte(kGetback) = 4;
+	_getBack = 4;
 }
 
 
@@ -142,28 +142,28 @@ void DreamBase::saveGame() {
 		return;
 	}
 
-	if (data.byte(kCommandtype) != 247) {
-		data.byte(kCommandtype) = 247;
+	if (_commandType != 247) {
+		_commandType = 247;
 		commandOnly(44);
 	}
-	if (data.word(kMousebutton) != 1)
+	if (_mouseButton != 1)
 		return;
 
-	data.byte(kLoadingorsave) = 2;
+	_loadingOrSave = 2;
 
 	if (ConfMan.getBool("dreamweb_originalsaveload")) {
 		showOpBox();
 		showSaveOps();
-		data.byte(kCurrentslot) = 0;
+		_currentSlot = 0;
 		showSlots();
 		showNames();
 		workToScreenM();
 		namesToOld();
-		data.word(kBufferin) = 0;
-		data.word(kBufferout) = 0;
-		data.byte(kGetback) = 0;
+		_bufferIn = 0;
+		_bufferOut = 0;
+		_getBack = 0;
 
-		while (data.byte(kGetback) == 0) {
+		while (_getBack == 0) {
 			if (_quitRequested)
 				return;
 			delPointer();
@@ -197,7 +197,7 @@ void DreamBase::saveGame() {
 		delete dialog;
 
 		if (savegameId < 0) {
-			data.byte(kGetback) = 0;
+			_getBack = 0;
 			return;
 		}
 
@@ -214,9 +214,9 @@ void DreamBase::saveGame() {
 		// TODO: The below is copied from actualsave
 		getRidOfTemp();
 		restoreAll(); // reels
-		data.word(kTextaddressx) = 13;
-		data.word(kTextaddressy) = 182;
-		data.byte(kTextlen) = 240;
+		_textAddressX = 13;
+		_textAddressY = 182;
+		_textLen = 240;
 		redrawMainScrn();
 		workToScreen();	// show the main screen without the mouse pointer
 
@@ -225,7 +225,7 @@ void DreamBase::saveGame() {
 		savePosition(savegameId, descbuf);
 
 		workToScreenM();
-		data.byte(kGetback) = 4;
+		_getBack = 4;
 	}
 }
 
@@ -238,24 +238,24 @@ void DreamBase::oldToNames() {
 }
 
 void DreamBase::saveLoad() {
-	if (data.word(kWatchingtime) || (data.byte(kPointermode) == 2)) {
+	if (data.word(kWatchingtime) || (_pointerMode == 2)) {
 		blank();
 		return;
 	}
-	if (data.byte(kCommandtype) != 253) {
-		data.byte(kCommandtype) = 253;
+	if (_commandType != 253) {
+		_commandType = 253;
 		commandOnly(43);
 	}
-	if ((data.word(kMousebutton) != data.word(kOldbutton)) && (data.word(kMousebutton) & 1))
+	if ((_mouseButton != _oldButton) && (_mouseButton & 1))
 		doSaveLoad();
 }
 
 void DreamBase::doSaveLoad() {
-	data.byte(kPointerframe) = 0;
-	data.word(kTextaddressx) = 70;
-	data.word(kTextaddressy) = 182-8;
-	data.byte(kTextlen) = 181;
-	data.byte(kManisoffscreen) = 1;
+	_pointerFrame = 0;
+	_textAddressX = 70;
+	_textAddressY = 182-8;
+	_textLen = 181;
+	_manIsOffScreen = 1;
 	clearWork();
 	createPanel2();
 	underTextLine();
@@ -283,11 +283,11 @@ void DreamBase::doSaveLoad() {
 			showMainOps();
 			workToScreenM();
 		}
-		data.byte(kGetback) = 0;
+		_getBack = 0;
 
 		do {	// wait ops
 			if (_quitRequested) {
-				data.byte(kManisoffscreen) = 0;
+				_manIsOffScreen = 0;
 				return;
 			}
 
@@ -298,20 +298,20 @@ void DreamBase::doSaveLoad() {
 			dumpTextLine();
 			delPointer();
 			checkCoords(opsList);
-		} while (!data.byte(kGetback));
-	} while (data.byte(kGetback) == 2);
+		} while (!_getBack);
+	} while (_getBack == 2);
 
-	data.word(kTextaddressx) = 13;
-	data.word(kTextaddressy) = 182;
-	data.byte(kTextlen) = 240;
-	if (data.byte(kGetback) != 4) {
+	_textAddressX = 13;
+	_textAddressY = 182;
+	_textLen = 240;
+	if (_getBack != 4) {
 		getRidOfTemp();
 		restoreAll();
 		redrawMainScrn();
 		workToScreenM();
-		data.byte(kCommandtype) = 200;
+		_commandType = 200;
 	}
-	data.byte(kManisoffscreen) = 0;
+	_manIsOffScreen = 0;
 }
 
 void DreamBase::getBackFromOps() {
@@ -322,15 +322,15 @@ void DreamBase::getBackFromOps() {
 }
 
 void DreamBase::getBackToOps() {
-	if (data.byte(kCommandtype) != 201) {
-		data.byte(kCommandtype) = 201;
+	if (_commandType != 201) {
+		_commandType = 201;
 		commandOnly(42);
 	}
 
-	if (data.word(kMousebutton) != data.word(kOldbutton)) {
-		if (data.word(kMousebutton) & 1) {
+	if (_mouseButton != _oldButton) {
+		if (_mouseButton & 1) {
 			oldToNames();
-			data.byte(kGetback) = 2;
+			_getBack = 2;
 		}
 	}
 }
@@ -349,21 +349,21 @@ void DreamBase::showDiscOps() {
 }
 
 void DreamBase::discOps() {
-	if (data.byte(kCommandtype) != 249) {
-		data.byte(kCommandtype) = 249;
+	if (_commandType != 249) {
+		_commandType = 249;
 		commandOnly(43);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
 	scanForNames();
-	data.byte(kLoadingorsave) = 2;
+	_loadingOrSave = 2;
 	showOpBox();
 	showDiscOps();
-	data.byte(kCurrentslot) = 0;
+	_currentSlot = 0;
 	workToScreenM();
-	data.byte(kGetback) = 0;
+	_getBack = 0;
 
 	RectWithCallback<DreamBase> discOpsList[] = {
 		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamBase::loadGame },
@@ -384,19 +384,19 @@ void DreamBase::discOps() {
 		dumpPointer();
 		dumpTextLine();
 		checkCoords(discOpsList);
-	} while (!data.byte(kGetback));
+	} while (!_getBack);
 }
 
 void DreamBase::actualSave() {
-	if (data.byte(kCommandtype) != 222) {
-		data.byte(kCommandtype) = 222;
+	if (_commandType != 222) {
+		_commandType = 222;
 		commandOnly(44);
 	}
 
-	if (!(data.word(kMousebutton) & 1))
+	if (!(_mouseButton & 1))
 		return;
 
-	unsigned int slot = data.byte(kCurrentslot);
+	unsigned int slot = _currentSlot;
 
 	const char *desc = &_saveNames[17*slot];
 	if (desc[1] == 0) // The actual description string starts at desc[1]
@@ -406,31 +406,31 @@ void DreamBase::actualSave() {
 
 	getRidOfTemp();
 	restoreAll(); // reels
-	data.word(kTextaddressx) = 13;
-	data.word(kTextaddressy) = 182;
-	data.byte(kTextlen) = 240;
+	_textAddressX = 13;
+	_textAddressY = 182;
+	_textLen = 240;
 	redrawMainScrn();
 	workToScreenM();
-	data.byte(kGetback) = 4;
+	_getBack = 4;
 }
 
 void DreamBase::actualLoad() {
-	if (data.byte(kCommandtype) != 221) {
-		data.byte(kCommandtype) = 221;
+	if (_commandType != 221) {
+		_commandType = 221;
 		commandOnly(41);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton) || data.word(kMousebutton) != 1)
+	if (_mouseButton == _oldButton || _mouseButton != 1)
 		return;
 
-	unsigned int slot = data.byte(kCurrentslot);
+	unsigned int slot = _currentSlot;
 
 	const char *desc = &_saveNames[17*slot];
 	if (desc[1] == 0) // The actual description string starts at desc[1]
 		return;
 
-	loadPosition(data.byte(kCurrentslot));
-	data.byte(kGetback) = 1;
+	loadPosition(_currentSlot);
+	_getBack = 1;
 }
 
 void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
@@ -439,11 +439,11 @@ void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 
 	Room madeUpRoom = currentRoom;
 	madeUpRoom.roomsSample = _roomsSample;
-	madeUpRoom.mapX = data.byte(kMapx);
-	madeUpRoom.mapY = data.byte(kMapy);
+	madeUpRoom.mapX = _mapX;
+	madeUpRoom.mapY = _mapY;
 	madeUpRoom.liftFlag = data.byte(kLiftflag);
-	madeUpRoom.b21 = data.byte(kManspath);
-	madeUpRoom.facing = data.byte(kFacing);
+	madeUpRoom.b21 = _mansPath;
+	madeUpRoom.facing = _facing;
 	madeUpRoom.b27 = 255;
 
 	Common::String filename = engine->getSavegameFilename(slot);
@@ -521,7 +521,7 @@ void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 }
 
 void DreamBase::loadPosition(unsigned int slot) {
-	data.word(kTimecount) = 0;
+	_timeCount = 0;
 	clearChanges();
 
 	Common::String filename = engine->getSavegameFilename(slot);
@@ -639,22 +639,22 @@ uint DreamBase::scanForNames() {
 }
 
 void DreamBase::loadOld() {
-	if (data.byte(kCommandtype) != 252) {
-		data.byte(kCommandtype) = 252;
+	if (_commandType != 252) {
+		_commandType = 252;
 		commandOnly(48);
 	}
 
-	if (!(data.word(kMousebutton) & 1))
+	if (!(_mouseButton & 1))
 		return;
 
 	doLoad(-1);
 
-	if (data.byte(kGetback) == 4 || _quitRequested)
+	if (_getBack == 4 || _quitRequested)
 		return;
 
 	showDecisions();
 	workToScreenM();
-	data.byte(kGetback) = 0;
+	_getBack = 0;
 }
 
 void DreamBase::showDecisions() {
@@ -674,52 +674,52 @@ void DreamBase::showNames() {
 		// The first character of the savegame name is unused
 		Common::String name(&_saveNames[17*slot + 1]);
 
-		if (slot != data.byte(kCurrentslot)) {
+		if (slot != _currentSlot) {
 			printDirect((const uint8 *)name.c_str(), kOpsx + 21, kOpsy + 10*slot + 10, 200, false);
 			continue;
 		}
-		if (data.byte(kLoadingorsave) != 2) {
-			data.word(kCharshift) = 91;
+		if (_loadingOrSave != 2) {
+			_charShift = 91;
 			printDirect((const uint8 *)name.c_str(), kOpsx + 21, kOpsy + 10*slot + 10, 200, false);
-			data.word(kCharshift) = 0;
+			_charShift = 0;
 			continue;
 		}
 
 		int pos = name.size();
-		data.byte(kCursorpos) = pos;
+		_cursorPos = pos;
 		name += '/'; // cursor character
 		printDirect((const uint8 *)name.c_str(), kOpsx + 21, kOpsy + 10*slot + 10, 200, false);
 	}
 }
 
 void DreamBase::checkInput() {
-	if (data.byte(kLoadingorsave) == 3)
+	if (_loadingOrSave == 3)
 		return;
 
 	readKey();
 
 	// The first character of the savegame name is unused
-	char *name = &_saveNames[17*data.byte(kCurrentslot) + 1];
+	char *name = &_saveNames[17*_currentSlot + 1];
 
-	if (data.byte(kCurrentkey) == 0) {
+	if (_currentKey == 0) {
 		return;
-	} else if (data.byte(kCurrentkey) == 13) {
-		data.byte(kLoadingorsave) = 3;
-	} else if (data.byte(kCurrentkey) == 8) {
-		if (data.byte(kCursorpos) == 0)
+	} else if (_currentKey == 13) {
+		_loadingOrSave = 3;
+	} else if (_currentKey == 8) {
+		if (_cursorPos == 0)
 			return;
 
-		--data.byte(kCursorpos);
-		name[data.byte(kCursorpos)] = 0;
-		name[data.byte(kCursorpos)+1] = 1;
+		--_cursorPos;
+		name[_cursorPos] = 0;
+		name[_cursorPos+1] = 1;
 	} else {
-		if (data.byte(kCursorpos) == 14)
+		if (_cursorPos == 14)
 			return;
 
-		name[data.byte(kCursorpos)] = data.byte(kCurrentkey);
-		name[data.byte(kCursorpos)+1] = 0;
-		name[data.byte(kCursorpos)+2] = 1;
-		++data.byte(kCursorpos);
+		name[_cursorPos] = _currentKey;
+		name[_cursorPos+1] = 0;
+		name[_cursorPos+2] = 1;
+		++_cursorPos;
 	}
 
 	showOpBox();
@@ -730,28 +730,28 @@ void DreamBase::checkInput() {
 }
 
 void DreamBase::selectSlot() {
-	if (data.byte(kCommandtype) != 244) {
-		data.byte(kCommandtype) = 244;
+	if (_commandType != 244) {
+		_commandType = 244;
 		commandOnly(45);
 	}
 
-	if (data.word(kMousebutton) != 1 || data.word(kMousebutton) == data.word(kOldbutton))
+	if (_mouseButton != 1 || _mouseButton == _oldButton)
 		return; // noselslot
-	if (data.byte(kLoadingorsave) == 3)
-		data.byte(kLoadingorsave)--;
+	if (_loadingOrSave == 3)
+		_loadingOrSave--;
 
 	oldToNames();
-	int y = data.word(kMousey) - (kOpsy + 4);
+	int y = _mouseY - (kOpsy + 4);
 	if (y < 11)
-		data.byte(kCurrentslot) = 0;
+		_currentSlot = 0;
 	else
-		data.byte(kCurrentslot) = y / 11;
+		_currentSlot = y / 11;
 
 	delPointer();
 	showOpBox();
 	showSlots();
 	showNames();
-	if (data.byte(kLoadingorsave) == 1)
+	if (_loadingOrSave == 1)
 		showLoadOps();
 	else
 		showSaveOps();
@@ -767,7 +767,7 @@ void DreamBase::showSlots() {
 	uint16 y = kOpsy + 11;
 
 	for (int slot = 0; slot < 7; slot++) {
-		if (slot == data.byte(kCurrentslot))
+		if (slot == _currentSlot)
 			showFrame(_tempGraphics, kOpsx + 10, y, 3, 0);
 
 		y += 10;
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 83a05b9bb0..096333f4b6 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -42,15 +42,15 @@ void DreamBase::printSprites() {
 void DreamBase::printASprite(const Sprite *sprite) {
 	uint16 x, y;
 	if (sprite->y >= 220) {
-		y = data.word(kMapady) - (256 - sprite->y);
+		y = _mapAdY - (256 - sprite->y);
 	} else {
-		y = sprite->y + data.word(kMapady);
+		y = sprite->y + _mapAdY;
 	}
 
 	if (sprite->x >= 220) {
-		x = data.word(kMapadx) - (256 - sprite->x);
+		x = _mapAdX - (256 - sprite->x);
 	} else {
-		x = sprite->x + data.word(kMapadx);
+		x = sprite->x + _mapAdX;
 	}
 	
 	uint8 c;
@@ -104,23 +104,23 @@ void DreamBase::spriteUpdate() {
 			backObject(&sprite);
 		}
 	
-		if (data.byte(kNowinnewroom) == 1)
+		if (_nowInNewRoom == 1)
 			break;
 	}
 }
 
 void DreamBase::initMan() {
-	Sprite *sprite = makeSprite(data.byte(kRyanx), data.byte(kRyany), addr_mainman, &_mainSprites, 0);
+	Sprite *sprite = makeSprite(_ryanX, _ryanY, addr_mainman, &_mainSprites, 0);
 	sprite->priority = 4;
 	sprite->speed = 0;
 	sprite->walkFrame = 0;
 }
 
 void DreamBase::mainMan(Sprite *sprite) {
-	if (data.byte(kResetmanxy) == 1) {
-		data.byte(kResetmanxy) = 0;
-		sprite->x = data.byte(kRyanx);
-		sprite->y = data.byte(kRyany);
+	if (_resetManXY == 1) {
+		_resetManXY = 0;
+		sprite->x = _ryanX;
+		sprite->y = _ryanY;
 		sprite->walkFrame = 0;
 	}
 
@@ -129,84 +129,84 @@ void DreamBase::mainMan(Sprite *sprite) {
 		return;
 	sprite->speed = 0;
 
-	if (data.byte(kTurntoface) != data.byte(kFacing)) {
+	if (_turnToFace != _facing) {
 		aboutTurn(sprite);
 	} else {
-		if ((data.byte(kTurndirection) != 0) && (data.byte(kLinepointer) == 254)) {
-			data.byte(kReasseschanges) = 1;
-			if (data.byte(kFacing) == data.byte(kLeavedirection))
+		if ((_turnDirection != 0) && (_linePointer == 254)) {
+			_reAssesChanges = 1;
+			if (_facing == _leaveDirection)
 				checkForExit(sprite);
 		}
-		data.byte(kTurndirection) = 0;
-		if (data.byte(kLinepointer) == 254) {
+		_turnDirection = 0;
+		if (_linePointer == 254) {
 			sprite->walkFrame = 0;
 		} else {
 			++sprite->walkFrame;
 			if (sprite->walkFrame == 11)
 				sprite->walkFrame = 1;
 			walking(sprite);
-			if (data.byte(kLinepointer) != 254) {
-				if ((data.byte(kFacing) & 1) == 0)
+			if (_linePointer != 254) {
+				if ((_facing & 1) == 0)
 					walking(sprite);
 				else if ((sprite->walkFrame != 2) && (sprite->walkFrame != 7))
 					walking(sprite);
 			}
-			if (data.byte(kLinepointer) == 254) {
-				if (data.byte(kTurntoface) == data.byte(kFacing)) {
-					data.byte(kReasseschanges) = 1;
-					if (data.byte(kFacing) == data.byte(kLeavedirection))
+			if (_linePointer == 254) {
+				if (_turnToFace == _facing) {
+					_reAssesChanges = 1;
+					if (_facing == _leaveDirection)
 						checkForExit(sprite);
 				}
 			}
 		}
 	}
 	static const uint8 facelist[] = { 0,60,33,71,11,82,22,93 };
-	sprite->frameNumber = sprite->walkFrame + facelist[data.byte(kFacing)];
-	data.byte(kRyanx) = sprite->x;
-	data.byte(kRyany) = sprite->y;
+	sprite->frameNumber = sprite->walkFrame + facelist[_facing];
+	_ryanX = sprite->x;
+	_ryanY = sprite->y;
 }
 
 void DreamBase::walking(Sprite *sprite) {
 	uint8 comp;
-	if (data.byte(kLinedirection) != 0) {
-		--data.byte(kLinepointer);
+	if (_lineDirection != 0) {
+		--_linePointer;
 		comp = 200;
 	} else {
-		++data.byte(kLinepointer);
-		comp = data.byte(kLinelength);
+		++_linePointer;
+		comp = _lineLength;
 	}
-	if (data.byte(kLinepointer) < comp) {
-		sprite->x = (uint8)_lineData[data.byte(kLinepointer)].x;
-		sprite->y = (uint8)_lineData[data.byte(kLinepointer)].y;
+	if (_linePointer < comp) {
+		sprite->x = (uint8)_lineData[_linePointer].x;
+		sprite->y = (uint8)_lineData[_linePointer].y;
 		return;
 	}
 
-	data.byte(kLinepointer) = 254;
-	data.byte(kManspath) = data.byte(kDestination);
-	if (data.byte(kDestination) == data.byte(kFinaldest)) {
+	_linePointer = 254;
+	_mansPath = _destination;
+	if (_destination == _finalDest) {
 		faceRightWay();
 		return;
 	}
-	data.byte(kDestination) = data.byte(kFinaldest);
+	_destination = _finalDest;
 	autoSetWalk();
 }
 
 void DreamBase::aboutTurn(Sprite *sprite) {
 	bool incdir = true;
 
-	if (data.byte(kTurndirection) == 1)
+	if (_turnDirection == 1)
 		incdir = true;
-	else if ((int8)data.byte(kTurndirection) == -1)
+	else if ((int8)_turnDirection == -1)
 		incdir = false;
 	else {
-		if (data.byte(kFacing) < data.byte(kTurntoface)) {
-			uint8 delta = data.byte(kTurntoface) - data.byte(kFacing);
+		if (_facing < _turnToFace) {
+			uint8 delta = _turnToFace - _facing;
 			if (delta >= 4)
 				incdir = false;
 			else
 				incdir = true;
 		} else {
-			uint8 delta = data.byte(kFacing) - data.byte(kTurntoface);
+			uint8 delta = _facing - _turnToFace;
 			if (delta >= 4)
 				incdir = true;
 			else
@@ -215,12 +215,12 @@ void DreamBase::aboutTurn(Sprite *sprite) {
 	}
 
 	if (incdir) {
-		data.byte(kTurndirection) = 1;
-		data.byte(kFacing) = (data.byte(kFacing) + 1) & 7;
+		_turnDirection = 1;
+		_facing = (_facing + 1) & 7;
 		sprite->walkFrame = 0;
 	} else {
-		data.byte(kTurndirection) = (uint8)-1;
-		data.byte(kFacing) = (data.byte(kFacing) - 1) & 7;
+		_turnDirection = (uint8)-1;
+		_facing = (_facing - 1) & 7;
 		sprite->walkFrame = 0;
 	}
 }
@@ -276,8 +276,8 @@ void DreamBase::wideDoor(Sprite *sprite, SetObject *objData) {
 }
 
 void DreamBase::doDoor(Sprite *sprite, SetObject *objData, Common::Rect check) {
-	int ryanx = data.byte(kRyanx);
-	int ryany = data.byte(kRyany);
+	int ryanx = _ryanX;
+	int ryany = _ryanY;
 
 	// Automatically opening doors: check if Ryan is in range
 
@@ -292,7 +292,7 @@ void DreamBase::doDoor(Sprite *sprite, SetObject *objData, Common::Rect check) {
 		++sprite->animFrame;
 		if (sprite->animFrame == 1) { // doorsound2
 			uint8 soundIndex;
-			if (data.byte(kReallocation) == 5) // hoteldoor2
+			if (_realLocation == 5) // hoteldoor2
 				soundIndex = 13;
 			else
 				soundIndex = 0;
@@ -309,7 +309,7 @@ void DreamBase::doDoor(Sprite *sprite, SetObject *objData, Common::Rect check) {
 
 		if (sprite->animFrame == 5) { // doorsound1;
 			uint8 soundIndex;
-			if (data.byte(kReallocation) == 5) // hoteldoor1
+			if (_realLocation == 5) // hoteldoor1
 				soundIndex = 13;
 			else
 				soundIndex = 1;
@@ -331,8 +331,8 @@ void DreamBase::steady(Sprite *sprite, SetObject *objData) {
 }
 
 void DreamBase::lockedDoorway(Sprite *sprite, SetObject *objData) {
-	int ryanx = data.byte(kRyanx);
-	int ryany = data.byte(kRyany);
+	int ryanx = _ryanX;
+	int ryany = _ryanY;
 
 	Common::Rect check(-24, -30, 10, 12);
 	check.translate(sprite->x, sprite->y);
@@ -449,8 +449,8 @@ const GraphicsFile *DreamBase::findSource(uint16 &frame) {
 }
 
 void DreamBase::showReelFrame(Reel *reel) {
-	uint16 x = reel->x + data.word(kMapadx);
-	uint16 y = reel->y + data.word(kMapady);
+	uint16 x = reel->x + _mapAdX;
+	uint16 y = reel->y + _mapAdY;
 	uint16 frame = reel->frame();
 	const GraphicsFile *base = findSource(frame);
 	showFrame(*base, x, y, frame, 8);
@@ -480,8 +480,8 @@ void DreamBase::showRain() {
 
 	for (i = _rainList.begin(); i != _rainList.end(); ++i) {
 		Rain &rain = *i;
-		uint16 y = rain.y + data.word(kMapady) + data.word(kMapystart);
-		uint16 x = rain.x + data.word(kMapadx) + data.word(kMapxstart);
+		uint16 y = rain.y + _mapAdY + _mapYStart;
+		uint16 x = rain.x + _mapAdX + _mapXStart;
 		uint16 size = rain.size;
 		uint16 offset = (rain.w3 - rain.b5) & 511;
 		rain.w3 = offset;
@@ -497,9 +497,9 @@ void DreamBase::showRain() {
 
 	if (_channel1Playing != 255)
 		return;
-	if (data.byte(kReallocation) == 2 && data.byte(kBeenmugged) != 1)
+	if (_realLocation == 2 && data.byte(kBeenmugged) != 1)
 		return;
-	if (data.byte(kReallocation) == 55)
+	if (_realLocation == 55)
 		return;
 
 	if (engine->randomNumber() >= 1) // play thunder with 1 in 256 chance
@@ -516,22 +516,22 @@ void DreamBase::showRain() {
 void DreamBase::moveMap(uint8 param) {
 	switch (param) {
 	case 32:
-		data.byte(kMapy) -= 20;
+		_mapY -= 20;
 		break;
 	case 16:
-		data.byte(kMapy) -= 10;
+		_mapY -= 10;
 		break;
 	case 8:
-		data.byte(kMapy) += 10;
+		_mapY += 10;
 		break;
 	case 2:
-		data.byte(kMapx) += 11;
+		_mapX += 11;
 		break;
 	default:
-		data.byte(kMapx) -= 11;
+		_mapX -= 11;
 		break;
 	}
-	data.byte(kNowinnewroom) = 1;
+	_nowInNewRoom = 1;
 }
 
 void DreamBase::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY) {
@@ -545,7 +545,7 @@ void DreamBase::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *ty
 
 uint8 DreamBase::getBlockOfPixel(uint8 x, uint8 y) {
 	uint8 flag, flagEx, type, flagX, flagY;
-	checkOne(x + data.word(kMapxstart), y + data.word(kMapystart), &flag, &flagEx, &type, &flagX, &flagY);
+	checkOne(x + _mapXStart, y + _mapYStart, &flag, &flagEx, &type, &flagX, &flagY);
 	if (flag & 1)
 		return 0;
 	else
@@ -560,7 +560,7 @@ void DreamBase::splitIntoLines(uint8 x, uint8 y) {
 		while (!getBlockOfPixel(x, y)) {
 			--x;
 			++y;
-			if (x == 0 || y >= data.byte(kMapysize))
+			if (x == 0 || y >= _mapYSize)
 				return;
 		}
 
@@ -573,7 +573,7 @@ void DreamBase::splitIntoLines(uint8 x, uint8 y) {
 		while (getBlockOfPixel(x, y)) {
 			--x;
 			++y;
-			if (x == 0 || y >= data.byte(kMapysize))
+			if (x == 0 || y >= _mapYSize)
 				break;
 			++length;
 		}
@@ -582,7 +582,7 @@ void DreamBase::splitIntoLines(uint8 x, uint8 y) {
 		rain.w3 = (engine->randomNumber() << 8) | engine->randomNumber();
 		rain.b5 = (engine->randomNumber() & 3) + 4;
 		_rainList.push_back(rain);
-	} while (x > 0 && y < data.byte(kMapysize));
+	} while (x > 0 && y < _mapYSize);
 }
 
 struct RainLocation {
@@ -630,8 +630,8 @@ void DreamBase::initRain() {
 
 	// look up location in rainLocationList to determine rainSpacing
 	for (r = rainLocationList; r->location != 0xff; ++r) {
-		if (r->location == data.byte(kReallocation) &&
-		        r->x == data.byte(kMapx) && r->y == data.byte(kMapy)) {
+		if (r->location == _realLocation &&
+		        r->x == _mapX && r->y == _mapY) {
 			rainSpacing = r->rainSpacing;
 			break;
 		}
@@ -651,7 +651,7 @@ void DreamBase::initRain() {
 		} while (delta >= rainSpacing);
 
 		x += delta;
-		if (x >= data.byte(kMapxsize))
+		if (x >= _mapXSize)
 			break;
 
 		splitIntoLines(x, 0);
@@ -666,25 +666,25 @@ void DreamBase::initRain() {
 		} while (delta >= rainSpacing);
 
 		y += delta;
-		if (y >= data.byte(kMapysize))
+		if (y >= _mapYSize)
 			break;
 
-		splitIntoLines(data.byte(kMapxsize) - 1, y);
+		splitIntoLines(_mapXSize - 1, y);
 	} while (true);
 }
 
 void DreamBase::intro1Text() {
-	if (data.byte(kIntrocount) != 2 && data.byte(kIntrocount) != 4 && data.byte(kIntrocount) != 6)
+	if (_introCount != 2 && _introCount != 4 && _introCount != 6)
 		return;
 
 	if (isCD() && _channel1Playing != 255) {
-		data.byte(kIntrocount)--;
+		_introCount--;
 	} else {
-		if (data.byte(kIntrocount) == 2)
+		if (_introCount == 2)
 			setupTimedTemp(40, 82, 34, 130, 90, 1);
-		else if (data.byte(kIntrocount) == 4)
+		else if (_introCount == 4)
 			setupTimedTemp(41, 82, 34, 130, 90, 1);
-		else if (data.byte(kIntrocount) == 6)
+		else if (_introCount == 6)
 			setupTimedTemp(42, 82, 34, 130, 90, 1);
 	}
 }
@@ -706,84 +706,84 @@ void DreamBase::intro3Text(uint16 nextReelPointer) {
 void DreamBase::monks2text() {
 	bool isGermanCD = isCD() && engine->getLanguage() == Common::DE_DEU;
 
-	if (data.byte(kIntrocount) == 1)
+	if (_introCount == 1)
 		setupTimedTemp(8, 82, 36, 160, 120, 1);
-	else if (data.byte(kIntrocount) == (isGermanCD ? 5 : 4))
+	else if (_introCount == (isGermanCD ? 5 : 4))
 		setupTimedTemp(9, 82, 36, 160, 120, 1);
-	else if (data.byte(kIntrocount) == (isGermanCD ? 9 : 7))
+	else if (_introCount == (isGermanCD ? 9 : 7))
 		setupTimedTemp(10, 82, 36, 160, 120, 1);
-	else if (data.byte(kIntrocount) == 10 && !isGermanCD) {
+	else if (_introCount == 10 && !isGermanCD) {
 		if (isCD())
-			data.byte(kIntrocount) = 12;
+			_introCount = 12;
 		setupTimedTemp(11, 82, 0, 105, 120, 1);
-	} else if (data.byte(kIntrocount) == 13 && isGermanCD) {
-		data.byte(kIntrocount) = 14;
+	} else if (_introCount == 13 && isGermanCD) {
+		_introCount = 14;
 		setupTimedTemp(11, 82, 0, 105, 120, 1);
-	} else if (data.byte(kIntrocount) == 13 && !isGermanCD) {
+	} else if (_introCount == 13 && !isGermanCD) {
 		if (isCD())
-			data.byte(kIntrocount) = 17;
+			_introCount = 17;
 		else
 			setupTimedTemp(12, 82, 0, 120, 120, 1);
-	} else if (data.byte(kIntrocount) == 16 && !isGermanCD)
+	} else if (_introCount == 16 && !isGermanCD)
 		setupTimedTemp(13, 82, 0, 135, 120, 1);
-	else if (data.byte(kIntrocount) == 19)
+	else if (_introCount == 19)
 		setupTimedTemp(14, 82, 36, 160, 100, 1);
-	else if (data.byte(kIntrocount) == (isGermanCD ? 23 : 22))
+	else if (_introCount == (isGermanCD ? 23 : 22))
 		setupTimedTemp(15, 82, 36, 160, 120, 1);
-	else if (data.byte(kIntrocount) == (isGermanCD ? 27 : 25))
+	else if (_introCount == (isGermanCD ? 27 : 25))
 		setupTimedTemp(16, 82, 36, 160, 120, 1);
-	else if (data.byte(kIntrocount) == (isCD() ? 27 : 28) && !isGermanCD)
+	else if (_introCount == (isCD() ? 27 : 28) && !isGermanCD)
 		setupTimedTemp(17, 82, 36, 160, 120, 1);
-	else if (data.byte(kIntrocount) == 30 && isGermanCD)
+	else if (_introCount == 30 && isGermanCD)
 		setupTimedTemp(17, 82, 36, 160, 120, 1);
-	else if (data.byte(kIntrocount) == (isGermanCD ? 35 : 31))
+	else if (_introCount == (isGermanCD ? 35 : 31))
 		setupTimedTemp(18, 82, 36, 160, 120, 1);
 }
 
 void DreamBase::textForEnd() {
-	if (data.byte(kIntrocount) == 20)
+	if (_introCount == 20)
 		setupTimedTemp(0, 83, 34, 20, 60, 1);
-	else if (data.byte(kIntrocount) == (isCD() ? 50 : 65))
+	else if (_introCount == (isCD() ? 50 : 65))
 		setupTimedTemp(1, 83, 34, 20, 60, 1);
-	else if (data.byte(kIntrocount) == (isCD() ? 85 : 110))
+	else if (_introCount == (isCD() ? 85 : 110))
 		setupTimedTemp(2, 83, 34, 20, 60, 1);
 }
 
 void DreamBase::textForMonkHelper(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
 	if (isCD() && _channel1Playing != 255)
-		data.byte(kIntrocount)--;
+		_introCount--;
 	else
 		setupTimedTemp(textIndex, voiceIndex, x, y, countToTimed, timeCount);
 }
 
 void DreamBase::textForMonk() {
-	if (data.byte(kIntrocount) == 1)
+	if (_introCount == 1)
 		textForMonkHelper(19, 82, 68, 154, 120, 1);
-	else if (data.byte(kIntrocount) == 5)
+	else if (_introCount == 5)
 		textForMonkHelper(20, 82, 68, 38, 120, 1);
-	else if (data.byte(kIntrocount) == 9)
+	else if (_introCount == 9)
 		textForMonkHelper(21, 82, 48, 154, 120, 1);
-	else if (data.byte(kIntrocount) == 13)
+	else if (_introCount == 13)
 		textForMonkHelper(22, 82, 68, 38, 120, 1);
-	else if (data.byte(kIntrocount) == (isCD() ? 15 : 17))
+	else if (_introCount == (isCD() ? 15 : 17))
 		textForMonkHelper(23, 82, 68, 154, 120, 1);
-	else if (data.byte(kIntrocount) == 21)
+	else if (_introCount == 21)
 		textForMonkHelper(24, 82, 68, 38, 120, 1);
-	else if (data.byte(kIntrocount) == 25)
+	else if (_introCount == 25)
 		textForMonkHelper(25, 82, 68, 154, 120, 1);
-	else if (data.byte(kIntrocount) == 29)
+	else if (_introCount == 29)
 		textForMonkHelper(26, 82, 68, 38, 120, 1);
-	else if (data.byte(kIntrocount) == 33)
+	else if (_introCount == 33)
 		textForMonkHelper(27, 82, 68, 154, 120, 1);
-	else if (data.byte(kIntrocount) == 37)
+	else if (_introCount == 37)
 		textForMonkHelper(28, 82, 68, 154, 120, 1);
-	else if (data.byte(kIntrocount) == 41)
+	else if (_introCount == 41)
 		textForMonkHelper(29, 82, 68, 38, 120, 1);
-	else if (data.byte(kIntrocount) == 45)
+	else if (_introCount == 45)
 		textForMonkHelper(30, 82, 68, 154, 120, 1);
-	else if (data.byte(kIntrocount) == (isCD() ? 52 : 49))
+	else if (_introCount == (isCD() ? 52 : 49))
 		textForMonkHelper(31, 82, 68, 154, 220, 1);
-	else if (data.byte(kIntrocount) == 53) {
+	else if (_introCount == 53) {
 		fadeScreenDowns();
 		if (isCD()) {
 			_volumeTo = 7;
@@ -801,15 +801,15 @@ void DreamBase::reelsOnScreen() {
 }
 
 void DreamBase::reconstruct() {
-	if (data.byte(kHavedoneobs) == 0)
+	if (_haveDoneObs == 0)
 		return;
 	data.byte(kNewobs) = 1;
 	drawFloor();
 	spriteUpdate();
 	printSprites();
-	if (_foreignRelease && (data.byte(kReallocation) == 20))
+	if (_foreignRelease && (_realLocation == 20))
 		underTextLine();
-	data.byte(kHavedoneobs) = 0;
+	_haveDoneObs = 0;
 }
 
 
@@ -1065,7 +1065,7 @@ static const ReelSound *g_roomByRoom[] = {
 
 
 void DreamBase::soundOnReels(uint16 reelPointer) {
-	const ReelSound *r = g_roomByRoom[data.byte(kReallocation)];
+	const ReelSound *r = g_roomByRoom[_realLocation];
 
 	if (engine->getLanguage() == Common::DE_DEU && r == g_roomSound29)
 		r = g_roomSound29_German;
@@ -1073,9 +1073,9 @@ void DreamBase::soundOnReels(uint16 reelPointer) {
 	for (; r->_sample != 255; ++r) {
 		if (r->_reelPointer != reelPointer)
 			continue;
-		if (r->_reelPointer == data.word(kLastsoundreel))
+		if (r->_reelPointer == _lastSoundReel)
 			continue;
-		data.word(kLastsoundreel) = r->_reelPointer;
+		_lastSoundReel = r->_reelPointer;
 		if (r->_sample < 64) {
 			playChannel1(r->_sample);
 			return;
@@ -1087,12 +1087,12 @@ void DreamBase::soundOnReels(uint16 reelPointer) {
 		playChannel0(r->_sample & 63, 255);
 	}
 
-	if (data.word(kLastsoundreel) != reelPointer)
-		data.word(kLastsoundreel) = (uint16)-1;
+	if (_lastSoundReel != reelPointer)
+		_lastSoundReel = (uint16)-1;
 }
 
 void DreamBase::clearBeforeLoad() {
-	if (data.byte(kRoomloaded) != 1)
+	if (_roomLoaded != 1)
 		return /* (noclear) */;
 
 	clearReels();
@@ -1111,7 +1111,7 @@ void DreamBase::clearBeforeLoad() {
 	_freeFrames.clear();
 	_freeDesc.clear();
 
-	data.byte(kRoomloaded) = 0;
+	_roomLoaded = 0;
 }
 
 void DreamBase::clearReels() {
@@ -1121,12 +1121,12 @@ void DreamBase::clearReels() {
 }
 
 void DreamBase::getRidOfReels() {
-	if (data.byte(kRoomloaded))
+	if (_roomLoaded)
 		clearReels();
 }
 
 void DreamBase::liftNoise(uint8 index) {
-	if (data.byte(kReallocation) == 5 || data.byte(kReallocation) == 21)
+	if (_realLocation == 5 || _realLocation == 21)
 		playChannel1(13);	// hiss noise
 	else
 		playChannel1(index);
@@ -1134,42 +1134,42 @@ void DreamBase::liftNoise(uint8 index) {
 
 void DreamBase::checkForExit(Sprite *sprite) {
 	uint8 flag, flagEx, type, flagX, flagY;
-	checkOne(data.byte(kRyanx) + 12, data.byte(kRyany) + 12, &flag, &flagEx, &type, &flagX, &flagY);
-	data.byte(kLastflag) = flag;
+	checkOne(_ryanX + 12, _ryanY + 12, &flag, &flagEx, &type, &flagX, &flagY);
+	_lastFlag = flag;
 
 	if (flag & 64) {
-		data.byte(kAutolocation) = flagEx;
+		_autoLocation = flagEx;
 		return;
 	}
 
 	if (!(flag & 32)) {
 		if (flag & 4) {
 			// adjust left
-			data.byte(kLastflag) = 0;
-			data.byte(kMapx) -= 11;
+			_lastFlag = 0;
+			_mapX -= 11;
 			sprite->x = 16 * flagEx;
-			data.byte(kNowinnewroom) = 1;
+			_nowInNewRoom = 1;
 		} else if (flag & 2) {
 			// adjust right
-			data.byte(kMapx) += 11;
+			_mapX += 11;
 			sprite->x = 16 * flagEx - 2;
-			data.byte(kNowinnewroom) = 1;
+			_nowInNewRoom = 1;
 		} else if (flag & 8) {
 			// adjust down
-			data.byte(kMapy) += 10;
+			_mapY += 10;
 			sprite->y = 16 * flagEx;
-			data.byte(kNowinnewroom) = 1;
+			_nowInNewRoom = 1;
 		} else if (flag & 16) {
 			// adjust up
-			data.byte(kMapy) -= 10;
+			_mapY -= 10;
 			sprite->y = 16 * flagEx;
-			data.byte(kNowinnewroom) = 1;
+			_nowInNewRoom = 1;
 		}
 
 		return;
 	}
 
-	if (data.byte(kReallocation) == 2) {
+	if (_realLocation == 2) {
 		// Can't leave Louis' until you found shoes
 
 		int shoeCount = 0;
@@ -1180,7 +1180,7 @@ void DreamBase::checkForExit(Sprite *sprite) {
 			uint8 text = shoeCount ? 43 : 42;
 			setupTimedUse(text, 80, 10, 68, 64);
 
-			data.byte(kTurntoface) = (data.byte(kFacing) + 4) & 7;
+			_turnToFace = (_facing + 4) & 7;
 			return;
 		}
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 0c7877f8e4..10f8ea18cc 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -25,7 +25,7 @@
 
 namespace DreamGen {
 
-// Keyboard buffer. data.word(kBufferin) and data.word(kBufferout) are indexes
+// Keyboard buffer. _bufferIn and _bufferOut are indexes
 // into this, making it a ring buffer
 uint8 g_keyBuffer[16];
 
@@ -474,7 +474,7 @@ void DreamBase::dreamweb() {
 	allocateBuffers();
 
 	// setMouse
-	data.word(kOldpointerx) = 0xffff;
+	_oldPointerX = 0xffff;
 
 	fadeDOS();
 	getTime();
@@ -530,7 +530,7 @@ void DreamBase::dreamweb() {
 			if (_quitRequested)
 				goto done;
 
-			if (data.byte(kGetback) == 4)
+			if (_getBack == 4)
 				startNewGame = false; // savegame has been loaded
 
 		}
@@ -562,20 +562,20 @@ void DreamBase::dreamweb() {
 			loadPalFromIFF();
 			data.byte(kLocation) = 255;
 			data.byte(kRoomafterdream) = 1;
-			data.byte(kNewlocation) = 35;
+			_newLocation = 35;
 			_volume = 7;
 			loadRoom();
 			clearSprites();
 			initMan();
 			entryTexts();
 			entryAnims();
-			data.byte(kDestpos) = 3;
+			_destPos = 3;
 			initialInv();
-			data.byte(kLastflag) = 32;
+			_lastFlag = 32;
 			startup1();
 			_volumeTo = 0;
 			_volumeDirection = -1;
-			data.byte(kCommandtype) = 255;
+			_commandType = 255;
 
 		}
 
@@ -603,7 +603,7 @@ void DreamBase::dreamweb() {
 				break;
 
 			if (data.word(kWatchingtime) > 0) {
-				if (data.byte(kFinaldest) == data.byte(kManspath))
+				if (_finalDest == _mansPath)
 					data.word(kWatchingtime)--;
 			}
 
@@ -613,7 +613,7 @@ void DreamBase::dreamweb() {
 				if (data.byte(kMandead) == 4)
 					break;
 
-				if (data.byte(kNewlocation) != 255) {
+				if (_newLocation != 255) {
 					// "loadNew"
 					clearBeforeLoad();
 					loadRoom();
@@ -621,9 +621,9 @@ void DreamBase::dreamweb() {
 					initMan();
 					entryTexts();
 					entryAnims();
-					data.byte(kNewlocation) = 255;
+					_newLocation = 255;
 					startup();
-					data.byte(kCommandtype) = 255;
+					_commandType = 255;
 					workToScreenM();
 				}
 			}
@@ -697,7 +697,7 @@ void DreamBase::screenUpdate() {
 	animPointer();
 
 	showPointer();
-	if ((data.word(kWatchingtime) == 0) && (data.byte(kNewlocation) != 0xff))
+	if ((data.word(kWatchingtime) == 0) && (_newLocation != 0xff))
 		return;
 	vSync();
 	uint16 mouseState = 0;
@@ -736,9 +736,9 @@ void DreamBase::screenUpdate() {
 
 	showPointer();
 	vSync();
-	data.word(kOldbutton) = data.word(kMousebutton);
+	_oldButton = _mouseButton;
 	mouseState |= readMouseState();
-	data.word(kMousebutton) = mouseState;
+	_mouseButton = mouseState;
 	dumpPointer();
 
 	dumpWatch();
@@ -746,8 +746,8 @@ void DreamBase::screenUpdate() {
 }
 
 void DreamBase::startup() {
-	data.byte(kCurrentkey) = 0;
-	data.byte(kMainmode) = 0;
+	_currentKey = 0;
+	_mainMode = 0;
 	createPanel();
 	data.byte(kNewobs) = 1;
 	drawFloor();
@@ -836,7 +836,7 @@ void DreamBase::hangOnCurs(uint16 frameCount) {
 }
 
 void DreamBase::seeCommandTail() {
-	data.byte(kBrightness) = 1;
+	_brightness = 1;
 }
 
 void DreamBase::quickQuit() {
@@ -848,27 +848,27 @@ void DreamBase::quickQuit2() {
 }
 
 void DreamBase::readMouse() {
-	data.word(kOldbutton) = data.word(kMousebutton);
+	_oldButton = _mouseButton;
 	uint16 state = readMouseState();
-	data.word(kMousebutton) = state;
+	_mouseButton = state;
 }
 
 uint16 DreamBase::readMouseState() {
-	data.word(kOldx) = data.word(kMousex);
-	data.word(kOldy) = data.word(kMousey);
+	_oldX = _mouseX;
+	_oldY = _mouseY;
 	uint16 x, y, state;
 	engine->mouseCall(&x, &y, &state);
-	data.word(kMousex) = x;
-	data.word(kMousey) = y;
+	_mouseX = x;
+	_mouseY = y;
 	return state;
 }
 
 void DreamBase::dumpTextLine() {
-	if (data.byte(kNewtextline) != 1)
+	if (_newTextLine != 1)
 		return;
-	data.byte(kNewtextline) = 0;
-	uint16 x = data.word(kTextaddressx);
-	uint16 y = data.word(kTextaddressy);
+	_newTextLine = 0;
+	uint16 x = _textAddressX;
+	uint16 y = _textAddressY;
 	if (_foreignRelease)
 		y -= 3;
 	multiDump(x, y, 228, 13);
@@ -876,16 +876,16 @@ void DreamBase::dumpTextLine() {
 
 void DreamBase::getUnderTimed() {
 	if (_foreignRelease)
-		multiGet(_underTimedText, data.byte(kTimedx), data.byte(kTimedy) - 3, 240, kUnderTimedTextSizeY_f);
+		multiGet(_underTimedText, _timedX, _timedY - 3, 240, kUnderTimedTextSizeY_f);
 	else
-		multiGet(_underTimedText, data.byte(kTimedx), data.byte(kTimedy), 240, kUnderTimedTextSizeY);
+		multiGet(_underTimedText, _timedX, _timedY, 240, kUnderTimedTextSizeY);
 }
 
 void DreamBase::putUnderTimed() {
 	if (_foreignRelease)
-		multiPut(_underTimedText, data.byte(kTimedx), data.byte(kTimedy) - 3, 240, kUnderTimedTextSizeY_f);
+		multiPut(_underTimedText, _timedX, _timedY - 3, 240, kUnderTimedTextSizeY_f);
 	else
-		multiPut(_underTimedText, data.byte(kTimedx), data.byte(kTimedy), 240, kUnderTimedTextSizeY);
+		multiPut(_underTimedText, _timedX, _timedY, 240, kUnderTimedTextSizeY);
 }
 
 void DreamBase::triggerMessage(uint16 index) {
@@ -915,23 +915,23 @@ void DreamBase::processTrigger() {
 }
 
 void DreamBase::useTimedText() {
-	if (data.word(kTimecount) == 0)
+	if (_timeCount == 0)
 		return;
-	--data.word(kTimecount);
-	if (data.word(kTimecount) == 0) {
+	--_timeCount;
+	if (_timeCount == 0) {
 		putUnderTimed();
-		data.byte(kNeedtodumptimed) = 1;
+		_needToDumpTimed = 1;
 		return;
 	}
 
-	if (data.word(kTimecount) == data.word(kCounttotimed))
+	if (_timeCount == _countToTimed)
 		getUnderTimed();
-	else if (data.word(kTimecount) > data.word(kCounttotimed))
+	else if (_timeCount > _countToTimed)
 		return;
 
 	const uint8 *string = (const uint8 *)_timedString;
-	printDirect(string, data.byte(kTimedx), data.byte(kTimedy), 237, true);
-	data.byte(kNeedtodumptimed) = 1;
+	printDirect(string, _timedX, _timedY, 237, true);
+	_needToDumpTimed = 1;
 }
 
 void DreamBase::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
@@ -949,25 +949,25 @@ void DreamBase::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8
 	}
 #endif
 
-	if (data.word(kTimecount) != 0)
+	if (_timeCount != 0)
 		return;
-	data.byte(kTimedy) = y;
-	data.byte(kTimedx) = x;
-	data.word(kCounttotimed) = countToTimed;
-	data.word(kTimecount) = timeCount + countToTimed;
+	_timedY = y;
+	_timedX = x;
+	_countToTimed = countToTimed;
+	_timeCount = timeCount + countToTimed;
 	_timedString = _textFile1.getString(textIndex);
 	debug(1, "setupTimedTemp: (%d, %d) => '%s'", textIndex, voiceIndex, _timedString);
 }
 
 void DreamBase::dumpTimedText() {
-	if (data.byte(kNeedtodumptimed) != 1)
+	if (_needToDumpTimed != 1)
 		return;
-	uint8 y = data.byte(kTimedy);
+	uint8 y = _timedY;
 	if (_foreignRelease)
 		y -= 3;
 
-	multiDump(data.byte(kTimedx), y, 240, kUndertimedysize);
-	data.byte(kNeedtodumptimed) = 0;
+	multiDump(_timedX, y, 240, kUndertimedysize);
+	_needToDumpTimed = 0;
 }
 
 void DreamBase::getTime() {
@@ -994,13 +994,13 @@ void DreamBase::deallocateMem(uint16 segment) {
 }
 
 void DreamBase::DOSReturn() {
-	if (data.byte(kCommandtype) != 250) {
-		data.byte(kCommandtype) = 250;
+	if (_commandType != 250) {
+		_commandType = 250;
 		commandOnly(46);
 	}
 
-	if (data.word(kMousebutton) & 1) {
-		data.word(kMousebutton) = 0;
+	if (_mouseButton & 1) {
+		_mouseButton = 0;
 		engine->quit();
 	}
 }
@@ -1028,23 +1028,23 @@ void DreamBase::lockMon() {
 	// key because calling readkey() drains characters from the input
 	// buffer, we we want the user to be able to type ahead while the text
 	// is being printed.
-	if (data.byte(kLasthardkey) == 57) {
+	if (_lastHardKey == 57) {
 		// Clear the keyboard buffer. Otherwise the space that caused
 		// the pause will be read immediately unpause the game.
 		do {
 			readKey();
-		} while (data.byte(kCurrentkey) != 0);
+		} while (_currentKey != 0);
 
 		lockLightOn();
 		while (!engine->shouldQuit()) {
 			engine->waitForVSync();
 			readKey();
-			if (data.byte(kCurrentkey) == ' ')
+			if (_currentKey == ' ')
 				break;
 		}
 		// Forget the last "hard" key, otherwise the space that caused
 		// the unpausing will immediately re-pause the game.
-		data.byte(kLasthardkey) = 0;
+		_lastHardKey = 0;
 		lockLightOff();
 	}
 }
@@ -1059,19 +1059,19 @@ void DreamBase::clearAndLoad(uint8 *buf, uint8 c,
 void DreamBase::startLoading(const Room &room) {
 	data.byte(kCombatcount) = 0;
 	_roomsSample = room.roomsSample;
-	data.byte(kMapx) = room.mapX;
-	data.byte(kMapy) = room.mapY;
+	_mapX = room.mapX;
+	_mapY = room.mapY;
 	data.byte(kLiftflag) = room.liftFlag;
-	data.byte(kManspath) = room.b21;
-	data.byte(kDestination) = room.b21;
-	data.byte(kFinaldest) = room.b21;
-	data.byte(kFacing) = room.facing;
-	data.byte(kTurntoface) = room.facing;
+	_mansPath = room.b21;
+	_destination = room.b21;
+	_finalDest = room.b21;
+	_facing = room.facing;
+	_turnToFace = room.facing;
 	data.byte(kCounttoopen) = room.countToOpen;
 	data.byte(kLiftpath) = room.liftPath;
 	data.byte(kDoorpath) = room.doorPath;
 	data.byte(kLastweapon) = (uint8)-1;
-	data.byte(kReallocation) = room.realLocation;
+	_realLocation = room.realLocation;
 
 	loadRoomData(room, false);
 
@@ -1079,14 +1079,14 @@ void DreamBase::startLoading(const Room &room) {
 	deleteTaken();
 	setAllChanges();
 	autoAppear();
-//	const Room &newRoom = g_roomData[data.byte(kNewlocation)];
+//	const Room &newRoom = g_roomData[_newLocation];
 	data.byte(kLastweapon) = (uint8)-1;
 	data.byte(kMandead) = 0;
-	data.word(kLookcounter) = 160;
-	data.byte(kNewlocation) = 255;
-	data.byte(kLinepointer) = 254;
+	_lookCounter = 160;
+	_newLocation = 255;
+	_linePointer = 254;
 	if (room.b27 != 255) {
-		data.byte(kManspath) = room.b27;
+		_mansPath = room.b27;
 		autoSetWalk();
 	}
 	findXYFromPath();
@@ -1096,24 +1096,24 @@ void DreamBase::dealWithSpecial(uint8 firstParam, uint8 secondParam) {
 	uint8 type = firstParam - 220;
 	if (type == 0) {
 		placeSetObject(secondParam);
-		data.byte(kHavedoneobs) = 1;
+		_haveDoneObs = 1;
 	} else if (type == 1) {
 		removeSetObject(secondParam);
-		data.byte(kHavedoneobs) = 1;
+		_haveDoneObs = 1;
 	} else if (type == 2) {
 		placeFreeObject(secondParam);
-		data.byte(kHavedoneobs) = 1;
+		_haveDoneObs = 1;
 	} else if (type == 3) {
 		removeFreeObject(secondParam);
-		data.byte(kHavedoneobs) = 1;
+		_haveDoneObs = 1;
 	} else if (type == 4) {
 		switchRyanOff();
 	} else if (type == 5) {
-		data.byte(kTurntoface) = secondParam;
-		data.byte(kFacing) = secondParam;
+		_turnToFace = secondParam;
+		_facing = secondParam;
 		switchRyanOn();
 	} else if (type == 6) {
-		data.byte(kNewlocation) = secondParam;
+		_newLocation = secondParam;
 	} else {
 		moveMap(secondParam);
 	}
@@ -1137,7 +1137,7 @@ void DreamBase::plotReel(uint16 &reelPointer) {
 
 void DreamBase::crosshair() {
 	uint8 frame;
-	if ((data.byte(kCommandtype) != 3) && (data.byte(kCommandtype) < 10)) {
+	if ((_commandType != 3) && (_commandType < 10)) {
 		frame = 9;
 	} else {
 		frame = 29;
@@ -1147,16 +1147,16 @@ void DreamBase::crosshair() {
 
 void DreamBase::delTextLine() {
 	if (_foreignRelease)
-		multiPut(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy) - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
+		multiPut(_textUnder, _textAddressX, _textAddressY - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
 	else
-		multiPut(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy), kUnderTextSizeX, kUnderTextSizeY);
+		multiPut(_textUnder, _textAddressX, _textAddressY, kUnderTextSizeX, kUnderTextSizeY);
 }
 
 void DreamBase::commandOnly(uint8 command) {
 	delTextLine();
 	const uint8 *string = (const uint8 *)_commandText.getString(command);
-	printDirect(string, data.word(kTextaddressx), data.word(kTextaddressy), data.byte(kTextlen), (bool)(data.byte(kTextlen) & 1));
-	data.byte(kNewtextline) = 1;
+	printDirect(string, _textAddressX, _textAddressY, _textLen, (bool)(_textLen & 1));
+	_newTextLine = 1;
 }
 
 bool DreamBase::checkIfPerson(uint8 x, uint8 y) {
@@ -1244,46 +1244,46 @@ void DreamBase::copyName(uint8 type, uint8 index, uint8 *dst) {
 void DreamBase::commandWithOb(uint8 command, uint8 type, uint8 index) {
 	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
 	delTextLine();
-	uint8 textLen = data.byte(kTextlen);
+	uint8 textLen = _textLen;
 
 	const uint8 *string = (const uint8 *)_commandText.getString(command);
-	printDirect(string, data.word(kTextaddressx), data.word(kTextaddressy), textLen, (bool)(textLen & 1));
+	printDirect(string, _textAddressX, _textAddressY, textLen, (bool)(textLen & 1));
 
 	copyName(type, index, commandLine);
-	uint16 x = data.word(kLastxpos);
+	uint16 x = _lastXPos;
 	if (command != 0)
 		x += 5;
-	printDirect(commandLine, x, data.word(kTextaddressy), textLen, (bool)(textLen & 1));
-	data.byte(kNewtextline) = 1;
+	printDirect(commandLine, x, _textAddressY, textLen, (bool)(textLen & 1));
+	_newTextLine = 1;
 }
 
 void DreamBase::examineObText() {
-	commandWithOb(1, data.byte(kCommandtype), data.byte(kCommand));
+	commandWithOb(1, _commandType, _command);
 }
 
 void DreamBase::blockNameText() {
-	commandWithOb(0, data.byte(kCommandtype), data.byte(kCommand));
+	commandWithOb(0, _commandType, _command);
 }
 
 void DreamBase::personNameText() {
-	commandWithOb(2, data.byte(kCommandtype), data.byte(kCommand) & 127);
+	commandWithOb(2, _commandType, _command & 127);
 }
 
 void DreamBase::walkToText() {
-	commandWithOb(3, data.byte(kCommandtype), data.byte(kCommand));
+	commandWithOb(3, _commandType, _command);
 }
 
 void DreamBase::findOrMake(uint8 index, uint8 value, uint8 type) {
 	Change *change = _listOfChanges;
 	for (; change->index != 0xff; ++change) {
-		if (index == change->index && data.byte(kReallocation) == change->location && type == change->type) {
+		if (index == change->index && _realLocation == change->location && type == change->type) {
 			change->value = value;
 			return;
 		}
 	}
 
 	change->index = index;
-	change->location = data.byte(kReallocation);
+	change->location = _realLocation;
 	change->value = value;
 	change->type = type;
 }
@@ -1291,7 +1291,7 @@ void DreamBase::findOrMake(uint8 index, uint8 value, uint8 type) {
 void DreamBase::setAllChanges() {
 	Change *change = _listOfChanges;
 	for (; change->index != 0xff; ++change)
-		if (change->location == data.byte(kReallocation))
+		if (change->location == _realLocation)
 			doChange(change->index, change->value, change->type);
 }
 
@@ -1304,25 +1304,25 @@ DynObject *DreamBase::getExAd(uint8 index) {
 }
 
 DynObject *DreamBase::getEitherAdCPP() {
-	if (data.byte(kObjecttype) == kExObjectType)
-		return getExAd(data.byte(kItemframe));
+	if (_objectType == kExObjectType)
+		return getExAd(_itemFrame);
 	else
-		return getFreeAd(data.byte(kItemframe));
+		return getFreeAd(_itemFrame);
 }
 
 void *DreamBase::getAnyAd(uint8 *slotSize, uint8 *slotCount) {
-	if (data.byte(kObjecttype) == kExObjectType) {
-		DynObject *exObject = getExAd(data.byte(kCommand));
+	if (_objectType == kExObjectType) {
+		DynObject *exObject = getExAd(_command);
 		*slotSize = exObject->slotSize;
 		*slotCount = exObject->slotCount;
 		return exObject;
-	} else if (data.byte(kObjecttype) == kFreeObjectType) {
-		DynObject *freeObject = getFreeAd(data.byte(kCommand));
+	} else if (_objectType == kFreeObjectType) {
+		DynObject *freeObject = getFreeAd(_command);
 		*slotSize = freeObject->slotSize;
 		*slotCount = freeObject->slotCount;
 		return freeObject;
 	} else {	// 1 or 3. 0 should never happen
-		SetObject *setObject = getSetAd(data.byte(kCommand));
+		SetObject *setObject = getSetAd(_command);
 		// Note: the original returned slotCount/priority (bytes 4 and 5)
 		// instead of slotSize/slotCount (bytes 3 and 4).
 		// Changed this for consistency with the Ex/Free cases, and also
@@ -1361,7 +1361,7 @@ void DreamBase::doChange(uint8 index, uint8 value, uint8 type) {
 void DreamBase::deleteTaken() {
 	for (size_t i = 0; i < kNumexobjects; ++i) {
 		uint8 location = _exData[i].initialLocation;
-		if (location == data.byte(kReallocation)) {
+		if (location == _realLocation) {
 			uint8 index = _exData[i].index;
 			_freeDat[index].mapad[0] = 0xfe;
 		}
@@ -1388,42 +1388,42 @@ void DreamBase::removeSetObject(uint8 index) {
 }
 
 bool DreamBase::finishedWalking() {
-	return (data.byte(kLinepointer) == 254) && (data.byte(kFacing) == data.byte(kTurntoface));
+	return (_linePointer == 254) && (_facing == _turnToFace);
 }
 
 void DreamBase::getFlagUnderP(uint8 *flag, uint8 *flagEx) {
 	uint8 type, flagX, flagY;
-	checkOne(data.word(kMousex) - data.word(kMapadx), data.word(kMousey) - data.word(kMapady), flag, flagEx, &type, &flagX, &flagY);
-	data.byte(kLastflag) = *flag;
+	checkOne(_mouseX - _mapAdX, _mouseY - _mapAdY, flag, flagEx, &type, &flagX, &flagY);
+	_lastFlag = *flag;
 }
 
 void DreamBase::walkAndExamine() {
 	if (!finishedWalking())
 		return;
-	data.byte(kCommandtype) = data.byte(kWalkexamtype);
-	data.byte(kCommand) = data.byte(kWalkexamnum);
-	data.byte(kWalkandexam) = 0;
-	if (data.byte(kCommandtype) != 5)
+	_commandType = _walkExamType;
+	_command = _walkExamNum;
+	_walkAndExam = 0;
+	if (_commandType != 5)
 		examineOb();
 }
 
 void DreamBase::obName(uint8 command, uint8 commandType) {
-	if (data.byte(kReasseschanges) == 0) {
-		if ((commandType == data.byte(kCommandtype)) && (command == data.byte(kCommand))) {
-			if (data.byte(kWalkandexam) == 1) {
+	if (_reAssesChanges == 0) {
+		if ((commandType == _commandType) && (command == _command)) {
+			if (_walkAndExam == 1) {
 				walkAndExamine();
 				return;
-			} else if (data.word(kMousebutton) == 0)
+			} else if (_mouseButton == 0)
 				return;
-			else if ((data.byte(kCommandtype) == 3) && (data.byte(kLastflag) < 2))
+			else if ((_commandType == 3) && (_lastFlag < 2))
 				return;
-			else if ((data.byte(kManspath) != data.byte(kPointerspath)) || (data.byte(kCommandtype) == 3)) {
+			else if ((_mansPath != _pointersPath) || (_commandType == 3)) {
 				setWalk();
-				data.byte(kReasseschanges) = 1;
+				_reAssesChanges = 1;
 				return;
 			} else if (!finishedWalking())
 				return;
-			else if (data.byte(kCommandtype) == 5) {
+			else if (_commandType == 5) {
 				if (data.word(kWatchingtime) == 0)
 					talk();
 				return;
@@ -1434,21 +1434,21 @@ void DreamBase::obName(uint8 command, uint8 commandType) {
 			}
 		}
 	} else
-		data.byte(kReasseschanges) = 0;
+		_reAssesChanges = 0;
 
-	data.byte(kCommand) = command;
-	data.byte(kCommandtype) = commandType;
-	if ((data.byte(kLinepointer) != 254) || (data.word(kWatchingtime) != 0) || (data.byte(kFacing) != data.byte(kTurntoface))) {
+	_command = command;
+	_commandType = commandType;
+	if ((_linePointer != 254) || (data.word(kWatchingtime) != 0) || (_facing != _turnToFace)) {
 		blockNameText();
 		return;
-	} else if (data.byte(kCommandtype) != 3) {
-		if (data.byte(kManspath) != data.byte(kPointerspath)) {
+	} else if (_commandType != 3) {
+		if (_mansPath != _pointersPath) {
 			walkToText();
 			return;
-		} else if (data.byte(kCommandtype) == 3) {
+		} else if (_commandType == 3) {
 			blockNameText();
 			return;
-		} else if (data.byte(kCommandtype) == 5) {
+		} else if (_commandType == 5) {
 			personNameText();
 			return;
 		} else {
@@ -1456,9 +1456,9 @@ void DreamBase::obName(uint8 command, uint8 commandType) {
 			return;
 		}
 	}
-	if (data.byte(kManspath) == data.byte(kPointerspath)) {
+	if (_mansPath == _pointersPath) {
 		uint8 flag, flagEx, type, flagX, flagY;
-		checkOne(data.byte(kRyanx) + 12, data.byte(kRyany) + 12, &flag, &flagEx, &type, &flagX, &flagY);
+		checkOne(_ryanX + 12, _ryanY + 12, &flag, &flagEx, &type, &flagX, &flagY);
 		if (flag < 2) {
 			blockNameText();
 			return;
@@ -1467,10 +1467,10 @@ void DreamBase::obName(uint8 command, uint8 commandType) {
 
 	uint8 flag, flagEx;
 	getFlagUnderP(&flag, &flagEx);
-	if (data.byte(kLastflag) < 2) {
+	if (_lastFlag < 2) {
 		blockNameText();
 		return;
-	} else if (data.byte(kLastflag) >= 128) {
+	} else if (_lastFlag >= 128) {
 		blockNameText();
 		return;
 	} else {
@@ -1480,29 +1480,29 @@ void DreamBase::obName(uint8 command, uint8 commandType) {
 }
 
 void DreamBase::delPointer() {
-	if (data.word(kOldpointerx) == 0xffff)
+	if (_oldPointerX == 0xffff)
 		return;
-	data.word(kDelherex) = data.word(kOldpointerx);
-	data.word(kDelherey) = data.word(kOldpointery);
-	data.byte(kDelxs) = data.byte(kPointerxs);
-	data.byte(kDelys) = data.byte(kPointerys);
-	multiPut(_pointerBack, data.word(kDelherex), data.word(kDelherey), data.byte(kPointerxs), data.byte(kPointerys));
+	_delHereX = _oldPointerX;
+	_delHereY = _oldPointerY;
+	_delXS = _pointerXS;
+	_delYS = _pointerYS;
+	multiPut(_pointerBack, _delHereX, _delHereY, _pointerXS, _pointerYS);
 }
 
 void DreamBase::showBlink() {
-	if (data.byte(kManisoffscreen) == 1)
+	if (_manIsOffScreen == 1)
 		return;
-	++data.byte(kBlinkcount);
+	++_blinkCount;
 	if (data.byte(kShadeson) != 0)
 		return;
-	if (data.byte(kReallocation) >= 50) // eyesshut
+	if (_realLocation >= 50) // eyesshut
 		return;
-	if (data.byte(kBlinkcount) != 3)
+	if (_blinkCount != 3)
 		return;
-	data.byte(kBlinkcount) = 0;
-	uint8 blinkFrame = data.byte(kBlinkframe);
+	_blinkCount = 0;
+	uint8 blinkFrame = _blinkFrame;
 	++blinkFrame; // Implicit %256
-	data.byte(kBlinkframe) = blinkFrame;
+	_blinkFrame = blinkFrame;
 	if (blinkFrame > 6)
 		blinkFrame = 6;
 	static const uint8 blinkTab[] = { 16,18,18,17,16,16,16 };
@@ -1513,28 +1513,28 @@ void DreamBase::showBlink() {
 void DreamBase::dumpBlink() {
 	if (data.byte(kShadeson) != 0)
 		return;
-	if (data.byte(kBlinkcount) != 0)
+	if (_blinkCount != 0)
 		return;
-	if (data.byte(kBlinkframe) >= 6)
+	if (_blinkFrame >= 6)
 		return;
 	multiDump(44, 32, 16, 12);
 }
 
 void DreamBase::dumpPointer() {
 	dumpBlink();
-	multiDump(data.word(kDelherex), data.word(kDelherey), data.byte(kDelxs), data.byte(kDelys));
-	if ((data.word(kOldpointerx) != data.word(kDelherex)) || (data.word(kOldpointery) != data.word(kDelherey)))
-		multiDump(data.word(kOldpointerx), data.word(kOldpointery), data.byte(kPointerxs), data.byte(kPointerys));
+	multiDump(_delHereX, _delHereY, _delXS, _delYS);
+	if ((_oldPointerX != _delHereX) || (_oldPointerY != _delHereY))
+		multiDump(_oldPointerX, _oldPointerY, _pointerXS, _pointerYS);
 }
 
 template <class T>
 void DreamBase::checkCoords(const RectWithCallback<T> *rectWithCallbacks) {
-	if (data.byte(kNewlocation) != 0xff)
+	if (_newLocation != 0xff)
 		return;
 
 	const RectWithCallback<T> *r;
 	for (r = rectWithCallbacks; r->_xMin != 0xffff; ++r) {
-		if (r->contains(data.word(kMousex), data.word(kMousey))) {
+		if (r->contains(_mouseX, _mouseY)) {
 			(((T *)this)->*(r->_callback))();
 			return;
 		}
@@ -1543,17 +1543,17 @@ void DreamBase::checkCoords(const RectWithCallback<T> *rectWithCallbacks) {
 
 void DreamBase::showPointer() {
 	showBlink();
-	uint16 x = data.word(kMousex);
-	data.word(kOldpointerx) = data.word(kMousex);
-	uint16 y = data.word(kMousey);
-	data.word(kOldpointery) = data.word(kMousey);
-	if (data.byte(kPickup) == 1) {
+	uint16 x = _mouseX;
+	_oldPointerX = _mouseX;
+	uint16 y = _mouseY;
+	_oldPointerY = _mouseY;
+	if (_pickUp == 1) {
 		const GraphicsFile *frames;
-		if (data.byte(kObjecttype) != kExObjectType)
+		if (_objectType != kExObjectType)
 			frames = &_freeFrames;
 		else
 			frames = &_exFrames;
-		const Frame *frame = &frames->_frames[(3 * data.byte(kItemframe) + 1)];
+		const Frame *frame = &frames->_frames[(3 * _itemFrame + 1)];
 
 		uint8 width = frame->width;
 		uint8 height = frame->height;
@@ -1561,58 +1561,58 @@ void DreamBase::showPointer() {
 			width = 12;
 		if (height < 12)
 			height = 12;
-		data.byte(kPointerxs) = width;
-		data.byte(kPointerys) = height;
+		_pointerXS = width;
+		_pointerYS = height;
 		uint16 xMin = (x >= width / 2) ? x - width / 2 : 0;
 		uint16 yMin = (y >= height / 2) ? y - height / 2 : 0;
-		data.word(kOldpointerx) = xMin;
-		data.word(kOldpointery) = yMin;
+		_oldPointerX = xMin;
+		_oldPointerY = yMin;
 		multiGet(_pointerBack, xMin, yMin, width, height);
-		showFrame(*frames, x, y, 3 * data.byte(kItemframe) + 1, 128);
+		showFrame(*frames, x, y, 3 * _itemFrame + 1, 128);
 		showFrame(_icons1, x, y, 3, 128);
 	} else {
-		const Frame *frame = &_icons1._frames[data.byte(kPointerframe) + 20];
+		const Frame *frame = &_icons1._frames[_pointerFrame + 20];
 		uint8 width = frame->width;
 		uint8 height = frame->height;
 		if (width < 12)
 			width = 12;
 		if (height < 12)
 			height = 12;
-		data.byte(kPointerxs) = width;
-		data.byte(kPointerys) = height;
+		_pointerXS = width;
+		_pointerYS = height;
 		multiGet(_pointerBack, x, y, width, height);
-		showFrame(_icons1, x, y, data.byte(kPointerframe) + 20, 0);
+		showFrame(_icons1, x, y, _pointerFrame + 20, 0);
 	}
 }
 
 void DreamBase::animPointer() {
 
-	if (data.byte(kPointermode) == 2) {
-		data.byte(kPointerframe) = 0;
-		if ((data.byte(kReallocation) == 14) && (data.byte(kCommandtype) == 211))
-			data.byte(kPointerframe) = 5;
+	if (_pointerMode == 2) {
+		_pointerFrame = 0;
+		if ((_realLocation == 14) && (_commandType == 211))
+			_pointerFrame = 5;
 		return;
-	} else if (data.byte(kPointermode) == 3) {
-		if (data.byte(kPointerspeed) != 0) {
-			--data.byte(kPointerspeed);
+	} else if (_pointerMode == 3) {
+		if (_pointerSpeed != 0) {
+			--_pointerSpeed;
 		} else {
-			data.byte(kPointerspeed) = 5;
-			++data.byte(kPointercount);
-			if (data.byte(kPointercount) == 16)
-				data.byte(kPointercount) = 0;
+			_pointerSpeed = 5;
+			++_pointerCount;
+			if (_pointerCount == 16)
+				_pointerCount = 0;
 		}
 		static const uint8 flashMouseTab[] = { 1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2 };
-		data.byte(kPointerframe) = flashMouseTab[data.byte(kPointercount)];
+		_pointerFrame = flashMouseTab[_pointerCount];
 		return;
 	}
 	if (data.word(kWatchingtime) != 0) {
-		data.byte(kPointerframe) = 11;
+		_pointerFrame = 11;
 		return;
 	}
-	data.byte(kPointerframe) = 0;
-	if (data.byte(kInmaparea) == 0)
+	_pointerFrame = 0;
+	if (_inMapArea == 0)
 		return;
-	if (data.byte(kPointerfirstpath) == 0)
+	if (_pointerFirstPath == 0)
 		return;
 	uint8 flag, flagEx;
 	getFlagUnderP(&flag, &flagEx);
@@ -1621,22 +1621,22 @@ void DreamBase::animPointer() {
 	if (flag >= 128)
 		return;
 	if (flag & 4) {
-		data.byte(kPointerframe) = 3;
+		_pointerFrame = 3;
 		return;
 	}
 	if (flag & 16) {
-		data.byte(kPointerframe) = 4;
+		_pointerFrame = 4;
 		return;
 	}
 	if (flag & 2) {
-		data.byte(kPointerframe) = 5;
+		_pointerFrame = 5;
 		return;
 	}
 	if (flag & 8) {
-		data.byte(kPointerframe) = 6;
+		_pointerFrame = 6;
 		return;
 	}
-	data.byte(kPointerframe) = 8;
+	_pointerFrame = 8;
 }
 
 void DreamBase::printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered) {
@@ -1707,7 +1707,7 @@ bool DreamBase::isCD() {
 }
 
 void DreamBase::showIcon() {
-	if (data.byte(kReallocation) < 50) {
+	if (_realLocation < 50) {
 		showPanel();
 		showMan();
 		roomName();
@@ -1775,12 +1775,12 @@ void DreamBase::hangOnW(uint16 frameCount) {
 }
 
 void DreamBase::hangOnP(uint16 count) {
-	data.word(kMaintimer) = 0;
-	uint8 pointerFrame = data.byte(kPointerframe);
-	uint8 pickup = data.byte(kPickup);
-	data.byte(kPointermode) = 3;
-	data.byte(kPickup) = 0;
-	data.byte(kCommandtype) = 255;
+	_mainTimer = 0;
+	uint8 pointerFrame = _pointerFrame;
+	uint8 pickup = _pickUp;
+	_pointerMode = 3;
+	_pickUp = 0;
+	_commandType = 255;
 	readMouse();
 	animPointer();
 	showPointer();
@@ -1797,14 +1797,14 @@ void DreamBase::hangOnP(uint16 count) {
 		dumpPointer();
 		if (_quitRequested)
 			break;
-		if (data.word(kMousebutton) != 0 && data.word(kMousebutton) != data.word(kOldbutton))
+		if (_mouseButton != 0 && _mouseButton != _oldButton)
 			break;
 	}
 
 	delPointer();
-	data.byte(kPointerframe) = pointerFrame;
-	data.byte(kPickup) = pickup;
-	data.byte(kPointermode) = 0;
+	_pointerFrame = pointerFrame;
+	_pickUp = pickup;
+	_pointerMode = 0;
 }
 
 uint8 DreamBase::findNextColon(const uint8 **string) {
@@ -1817,18 +1817,18 @@ uint8 DreamBase::findNextColon(const uint8 **string) {
 }
 
 void DreamBase::enterSymbol() {
-	data.byte(kManisoffscreen) = 1;
+	_manIsOffScreen = 1;
 	getRidOfReels();
 	loadIntoTemp("DREAMWEB.G12"); // symbol graphics
-	data.byte(kSymboltopx) = 24;
-	data.byte(kSymboltopdir) = 0;
-	data.byte(kSymbolbotx) = 24;
-	data.byte(kSymbolbotdir) = 0;
+	_symbolTopX = 24;
+	_symbolTopDir = 0;
+	_symbolBotX = 24;
+	_symbolBotDir = 0;
 	redrawMainScrn();
 	showSymbol();
 	underTextLine();
 	workToScreenM();
-	data.byte(kGetback) = 0;
+	_getBack = 0;
 	do {
 		delPointer();
 		updateSymbolTop();
@@ -1850,12 +1850,12 @@ void DreamBase::enterSymbol() {
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(symbolList);
-	} while ((data.byte(kGetback) == 0) && !_quitRequested);
-	if ((data.byte(kSymbolbotnum) == 3) && (data.byte(kSymboltopnum) == 5)) {
+	} while ((_getBack == 0) && !_quitRequested);
+	if ((_symbolBotNum == 3) && (_symbolTopNum == 5)) {
 		removeSetObject(43);
 		placeSetObject(46);
-		turnAnyPathOn(0, data.byte(kRoomnum) + 12);
-		data.byte(kManisoffscreen) = 0;
+		turnAnyPathOn(0, _roomNum + 12);
+		_manIsOffScreen = 0;
 		redrawMainScrn();
 		getRidOfTemp();
 		restoreReels();
@@ -1864,8 +1864,8 @@ void DreamBase::enterSymbol() {
 	} else {
 		removeSetObject(46);
 		placeSetObject(43);
-		turnAnyPathOff(0, data.byte(kRoomnum) + 12);
-		data.byte(kManisoffscreen) = 0;
+		turnAnyPathOff(0, _roomNum + 12);
+		_manIsOffScreen = 0;
 		redrawMainScrn();
 		getRidOfTemp();
 		restoreReels();
@@ -1874,17 +1874,17 @@ void DreamBase::enterSymbol() {
 }
 
 void DreamBase::zoomOnOff() {
-	if (data.word(kWatchingtime) != 0 || data.byte(kPointermode) == 2) {
+	if (data.word(kWatchingtime) != 0 || _pointerMode == 2) {
 		blank();
 		return;
 	}
 
-	if (data.byte(kCommandtype) != 222) {
-		data.byte(kCommandtype) = 222;
+	if (_commandType != 222) {
+		_commandType = 222;
 		commandOnly(39);
 	}
 
-	if (!(data.word(kMousebutton) & 1) || (data.word(kMousebutton) == data.word(kOldbutton)))
+	if (!(_mouseButton & 1) || (_mouseButton == _oldButton))
 		return;
 
 	data.byte(kZoomon) ^= 1;
@@ -1912,7 +1912,7 @@ void DreamBase::sortOutMap() {
 }
 
 void DreamBase::mainScreen() {
-	data.byte(kInmaparea) = 0;
+	_inMapArea = 0;
 	if (data.byte(kWatchon) == 1) {
 		RectWithCallback<DreamBase> mainList[] = {
 			{ 44,70,32,46,&DreamBase::look },
@@ -1937,7 +1937,7 @@ void DreamBase::mainScreen() {
 		checkCoords(mainList2);
 	}
 
-	if (data.byte(kWalkandexam) != 0)
+	if (_walkAndExam != 0)
 		walkAndExamine();
 }
 
@@ -1949,10 +1949,10 @@ void DreamBase::showWatch() {
 }
 
 void DreamBase::dumpWatch() {
-	if (data.byte(kWatchdump) != 1)
+	if (_watchDump != 1)
 		return;
 	multiDump(256, 21, 40, 12);
-	data.byte(kWatchdump) = 0;
+	_watchDump = 0;
 }
 
 void DreamBase::showTime() {
@@ -1978,12 +1978,12 @@ void DreamBase::showTime() {
 void DreamBase::watchCount() {
 	if (data.byte(kWatchon) == 0)
 		return;
-	++data.byte(kTimercount);
-	if (data.byte(kTimercount) == 9) {
+	++_timerCount;
+	if (_timerCount == 9) {
 		showFrame(_charset1, 268+4, 21, 91*3+21, 0);
-		data.byte(kWatchdump) = 1;
-	} else if (data.byte(kTimercount) == 18) {
-		data.byte(kTimercount) = 0;
+		_watchDump = 1;
+	} else if (_timerCount == 18) {
+		_timerCount = 0;
 		++data.byte(kSecondcount);
 		if (data.byte(kSecondcount) == 60) {
 			data.byte(kSecondcount) = 0;
@@ -1996,20 +1996,20 @@ void DreamBase::watchCount() {
 			}
 		}
 		showTime();
-		data.byte(kWatchdump) = 1;
+		_watchDump = 1;
 	}
 }
 
 void DreamBase::roomName() {
 	printMessage(88, 18, 53, 240, false);
-	uint16 textIndex = data.byte(kRoomnum);
+	uint16 textIndex = _roomNum;
 	if (textIndex >= 32)
 		textIndex -= 32;
-	data.word(kLinespacing) = 7;
+	_lineSpacing = 7;
 	uint8 maxWidth = (data.byte(kWatchon) == 1) ? 120 : 160;
 	const uint8 *string = (const uint8 *)_roomDesc.getString(textIndex);
 	printDirect(string, 88, 25, maxWidth, false);
-	data.word(kLinespacing) = 10;
+	_lineSpacing = 10;
 	useCharset1();
 }
 
@@ -2020,16 +2020,16 @@ void DreamBase::zoomIcon() {
 }
 
 void DreamBase::loadRoom() {
-	data.byte(kRoomloaded) = 1;
-	data.word(kTimecount) = 0;
-	data.word(kMaintimer) = 0;
-	data.word(kMapoffsetx) = 104;
-	data.word(kMapoffsety) = 38;
-	data.word(kTextaddressx) = 13;
-	data.word(kTextaddressy) = 182;
-	data.byte(kTextlen) = 240;
-	data.byte(kLocation) = data.byte(kNewlocation);
-	const Room &room = g_roomData[data.byte(kNewlocation)];
+	_roomLoaded = 1;
+	_timeCount = 0;
+	_mainTimer = 0;
+	_mapOffsetX = 104;
+	_mapOffsetY = 38;
+	_textAddressX = 13;
+	_textAddressY = 182;
+	_textLen = 240;
+	data.byte(kLocation) = _newLocation;
+	const Room &room = g_roomData[_newLocation];
 	startLoading(room);
 	loadRoomsSample();
 	switchRyanOn();
@@ -2057,20 +2057,20 @@ void DreamBase::readSetData() {
 }
 
 void DreamBase::findRoomInLoc() {
-	uint8 x = data.byte(kMapx) / 11;
-	uint8 y = data.byte(kMapy) / 10;
+	uint8 x = _mapX / 11;
+	uint8 y = _mapY / 10;
 	uint8 roomNum = y * 6 + x;
-	data.byte(kRoomnum) = roomNum;
+	_roomNum = roomNum;
 }
 
 void DreamBase::autoLook() {
-	if ((data.word(kMousex) != data.word(kOldx)) || (data.word(kMousey) != data.word(kOldy))) {
-		data.word(kLookcounter) = 1000;
+	if ((_mouseX != _oldX) || (_mouseY != _oldY)) {
+		_lookCounter = 1000;
 		return;
 	}
 
-	--data.word(kLookcounter);
-	if (data.word(kLookcounter))
+	--_lookCounter;
+	if (_lookCounter)
 		return;
 	if (data.word(kWatchingtime))
 		return;
@@ -2078,15 +2078,15 @@ void DreamBase::autoLook() {
 }
 
 void DreamBase::look() {
-	if (data.word(kWatchingtime) || (data.byte(kPointermode) == 2)) {
+	if (data.word(kWatchingtime) || (_pointerMode == 2)) {
 		blank();
 		return;
 	}
-	if (data.byte(kCommandtype) != 241) {
-		data.byte(kCommandtype) = 241;
+	if (_commandType != 241) {
+		_commandType = 241;
 		commandOnly(25);
 	}
-	if ((data.word(kMousebutton) == 1) && (data.word(kMousebutton) != data.word(kOldbutton)))
+	if ((_mouseButton == 1) && (_mouseButton != _oldButton))
 		doLook();
 }
 
@@ -2095,21 +2095,21 @@ void DreamBase::doLook() {
 	showIcon();
 	underTextLine();
 	workToScreenM();
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 	dumpTextLine();
-	uint8 index = data.byte(kRoomnum) & 31;
+	uint8 index = _roomNum & 31;
 	const uint8 *string = (const uint8 *)_roomDesc.getString(index);
 	findNextColon(&string);
 	uint16 x;
-	if (data.byte(kReallocation) < 50)
+	if (_realLocation < 50)
 		x = 66;
 	else
 		x = 40;
 	if (printSlow(string, x, 80, 241, true) != 1)
 		hangOnP(400);
 
-	data.byte(kPointermode) = 0;
-	data.byte(kCommandtype) = 0;
+	_pointerMode = 0;
+	_commandType = 0;
 	redrawMainScrn();
 	workToScreenM();
 }
@@ -2224,10 +2224,10 @@ void DreamBase::restoreAll() {
 }
 
 void DreamBase::restoreReels() {
-	if (data.byte(kRoomloaded) == 0)
+	if (_roomLoaded == 0)
 		return;
 
-	const Room &room = g_roomData[data.byte(kReallocation)];
+	const Room &room = g_roomData[_realLocation];
 
 	engine->openFile(room.name);
 
@@ -2259,8 +2259,8 @@ void DreamBase::loadFolder() {
 }
 
 void DreamBase::showFolder() {
-	data.byte(kCommandtype) = 255;
-	if (data.byte(kFolderpage)) {
+	_commandType = 255;
+	if (_folderPage) {
 		useTempCharset();
 		createPanel2();
 		showFrame(_tempGraphics, 0, 0, 0, 0);
@@ -2268,9 +2268,9 @@ void DreamBase::showFolder() {
 		showFrame(_tempGraphics, 0, 92, 2, 0);
 		showFrame(_tempGraphics, 143, 92, 3, 0);
 		folderExit();
-		if (data.byte(kFolderpage) != 1)
+		if (_folderPage != 1)
 			showLeftPage();
-		if (data.byte(kFolderpage) != 12)
+		if (_folderPage != 12)
 			showRightPage();
 		useCharset1();
 		underTextLine();
@@ -2291,22 +2291,22 @@ void DreamBase::showLeftPage() {
 		y += 16;
 	}
 	showFrame(_tempGraphics2, 0, y, 5, 0);
-	data.word(kLinespacing) = 8;
-	data.word(kCharshift) = 91;
-	data.byte(kKerning) = 1;
-	uint8 pageIndex = data.byte(kFolderpage) - 2;
+	_lineSpacing = 8;
+	_charShift = 91;
+	_kerning = 1;
+	uint8 pageIndex = _folderPage - 2;
 	const uint8 *string = getTextInFile1(pageIndex * 2);
 	y = 48;
 	for (size_t i = 0; i < 2; ++i) {
 		uint8 lastChar;
 		do {
 			lastChar = printDirect(&string, 2, &y, 140, false);
-			y += data.word(kLinespacing);
+			y += _lineSpacing;
 		} while (lastChar != '\0');
 	}
-	data.byte(kKerning) = 0;
-	data.word(kCharshift) = 0;
-	data.word(kLinespacing) = 10;
+	_kerning = 0;
+	_charShift = 0;
+	_lineSpacing = 10;
 	uint8 *bufferToSwap = workspace() + (48*320)+2;
 	for (size_t i = 0; i < 120; ++i) {
 		for (size_t j = 0; j < 65; ++j) {
@@ -2325,20 +2325,20 @@ void DreamBase::showRightPage() {
 	}
 
 	showFrame(_tempGraphics2, 143, y, 2, 0);
-	data.word(kLinespacing) = 8;
-	data.byte(kKerning) = 1;
-	uint8 pageIndex = data.byte(kFolderpage) - 1;
+	_lineSpacing = 8;
+	_kerning = 1;
+	uint8 pageIndex = _folderPage - 1;
 	const uint8 *string = getTextInFile1(pageIndex * 2);
 	y = 48;
 	for (size_t i = 0; i < 2; ++i) {
 		uint8 lastChar;
 		do {
 			lastChar = printDirect(&string, 152, &y, 140, false);
-			y += data.word(kLinespacing);
+			y += _lineSpacing;
 		} while (lastChar != '\0');
 	}
-	data.byte(kKerning) = 0;
-	data.word(kLinespacing) = 10;
+	_kerning = 0;
+	_lineSpacing = 10;
 }
 
 void DreamBase::showExit() {
@@ -2384,47 +2384,47 @@ void DreamBase::checkFolderCoords() {
 }
 
 void DreamBase::nextFolder() {
-	if (data.byte(kFolderpage) == 12) {
+	if (_folderPage == 12) {
 		blank();
 		return;
 	}
-	if (data.byte(kCommandtype) != 201) {
-		data.byte(kCommandtype) = 201;
+	if (_commandType != 201) {
+		_commandType = 201;
 		commandOnly(16);
 	}
-	if ((data.word(kMousebutton) == 1) && (data.word(kMousebutton) != data.word(kOldbutton))) {
-		++data.byte(kFolderpage);
+	if ((_mouseButton == 1) && (_mouseButton != _oldButton)) {
+		++_folderPage;
 		folderHints();
 		delPointer();
 		showFolder();
-		data.word(kMousebutton) = 0;
+		_mouseButton = 0;
 		checkFolderCoords();
 		workToScreenM();
 	}
 }
 
 void DreamBase::lastFolder() {
-	if (data.byte(kFolderpage) == 0) {
+	if (_folderPage == 0) {
 		blank();
 		return;
 	}
-	if (data.byte(kCommandtype) != 202) {
-		data.byte(kCommandtype) = 202;
+	if (_commandType != 202) {
+		_commandType = 202;
 		commandOnly(17);
 	}
 
-	if ((data.word(kMousebutton) == 1) && (data.word(kMousebutton) != data.word(kOldbutton))) {
-		--data.byte(kFolderpage);
+	if ((_mouseButton == 1) && (_mouseButton != _oldButton)) {
+		--_folderPage;
 		delPointer();
 		showFolder();
-		data.word(kMousebutton) = 0;
+		_mouseButton = 0;
 		checkFolderCoords();
 		workToScreenM();
 	}
 }
 
 void DreamBase::folderHints() {
-	if (data.byte(kFolderpage) == 5) {
+	if (_folderPage == 5) {
 		if ((data.byte(kAidedead) != 1) && (getLocation(13) != 1)) {
 			setLocation(13);
 			showFolder();
@@ -2433,7 +2433,7 @@ void DreamBase::folderHints() {
 			workToScreenM();
 			hangOnP(200);
 		}
-	} else if (data.byte(kFolderpage) == 9) {
+	} else if (_folderPage == 9) {
 		if (getLocation(7) != 1) {
 			setLocation(7);
 			showFolder();
@@ -2492,10 +2492,10 @@ void DreamBase::loadMenu() {
 }
 
 void DreamBase::showMenu() {
-	++data.byte(kMenucount);
-	if (data.byte(kMenucount) == 37*2)
-		data.byte(kMenucount) = 0;
-	showFrame(_tempGraphics, kMenux, kMenuy, data.byte(kMenucount) / 2, 0);
+	++_menuCount;
+	if (_menuCount == 37*2)
+		_menuCount = 0;
+	showFrame(_tempGraphics, kMenux, kMenuy, _menuCount / 2, 0);
 }
 
 void DreamBase::dumpMenu() {
@@ -2515,7 +2515,7 @@ void DreamBase::useMenu() {
 	getUnderMenu();
 	showFrame(_tempGraphics2, kMenux+54, kMenuy+72, 5, 0);
 	workToScreenM();
-	data.byte(kGetback) = 0;
+	_getBack = 0;
 	do {
 		delPointer();
 		putUnderMenu();
@@ -2532,8 +2532,8 @@ void DreamBase::useMenu() {
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(menuList);
-	} while ((data.byte(kGetback) != 1) && !_quitRequested);
-	data.byte(kManisoffscreen) = 0;
+	} while ((_getBack != 1) && !_quitRequested);
+	_manIsOffScreen = 0;
 	redrawMainScrn();
 	getRidOfTemp();
 	getRidOfTemp2();
@@ -2546,9 +2546,9 @@ void DreamBase::atmospheres() {
 	const Atmosphere *a = &g_atmosphereList[0];
 
 	for (; a->_location != 255; ++a) {
-		if (a->_location != data.byte(kReallocation))
+		if (a->_location != _realLocation)
 			continue;
-		if (a->_mapX != data.byte(kMapx) || a->_mapY != data.byte(kMapy))
+		if (a->_mapX != _mapX || a->_mapY != _mapY)
 			continue;
 		if (a->_sound != _channel0Playing) {
 
@@ -2564,21 +2564,21 @@ void DreamBase::atmospheres() {
 			//  jnz notlouisvol
 			//  I'm interpreting this as if the cmp reallocation is below the jz
 
-			if (data.byte(kMapy) == 0) {
+			if (_mapY == 0) {
 				_volume = 0; // "fullvol"
 				return;
 			}
 
-			if (data.byte(kReallocation) == 2 && data.byte(kMapx) == 22 && data.byte(kMapy) == 10)
+			if (_realLocation == 2 && _mapX == 22 && _mapY == 10)
 				_volume = 5; // "louisvol"
 
-			if (isCD() && data.byte(kReallocation) == 14) {
-				if (data.byte(kMapx) == 33) {
+			if (isCD() && _realLocation == 14) {
+				if (_mapX == 33) {
 					_volume = 0; // "ismad2"
 					return;
 				}
 
-				if (data.byte(kMapx) == 22) {
+				if (_mapX == 22) {
 					_volume = 5;
 					return;
 				}
@@ -2586,13 +2586,13 @@ void DreamBase::atmospheres() {
 			}
 		}
 
-		if (data.byte(kReallocation) == 2) {
-			if (data.byte(kMapx) == 22) {
+		if (_realLocation == 2) {
+			if (_mapX == 22) {
 				_volume = 5; // "louisvol"
 				return;
 			}
 
-			if (data.byte(kMapx) == 11) {
+			if (_mapX == 11) {
 				_volume = 0; // "fullvol"
 				return;
 			}
@@ -2615,115 +2615,115 @@ uint8 DreamBase::nextSymbol(uint8 symbol) {
 void DreamBase::showSymbol() {
 	showFrame(_tempGraphics, kSymbolx, kSymboly, 12, 0);
 
-	showFrame(_tempGraphics, data.byte(kSymboltopx) + kSymbolx-44, kSymboly+20, data.byte(kSymboltopnum), 32);
-	uint8 nextTopSymbol = nextSymbol(data.byte(kSymboltopnum));
-	showFrame(_tempGraphics, data.byte(kSymboltopx) + kSymbolx+5, kSymboly+20, nextTopSymbol, 32);
+	showFrame(_tempGraphics, _symbolTopX + kSymbolx-44, kSymboly+20, _symbolTopNum, 32);
+	uint8 nextTopSymbol = nextSymbol(_symbolTopNum);
+	showFrame(_tempGraphics, _symbolTopX + kSymbolx+5, kSymboly+20, nextTopSymbol, 32);
 	uint8 nextNextTopSymbol = nextSymbol(nextTopSymbol);
-	showFrame(_tempGraphics, data.byte(kSymboltopx) + kSymbolx+54, kSymboly+20, nextNextTopSymbol, 32);
+	showFrame(_tempGraphics, _symbolTopX + kSymbolx+54, kSymboly+20, nextNextTopSymbol, 32);
 
-	showFrame(_tempGraphics, data.byte(kSymbolbotx) + kSymbolx-44, kSymboly+49, 6 + data.byte(kSymbolbotnum), 32);
-	uint8 nextBotSymbol = nextSymbol(data.byte(kSymbolbotnum));
-	showFrame(_tempGraphics, data.byte(kSymbolbotx) + kSymbolx+5, kSymboly+49, 6 + nextBotSymbol, 32);
+	showFrame(_tempGraphics, _symbolBotX + kSymbolx-44, kSymboly+49, 6 + _symbolBotNum, 32);
+	uint8 nextBotSymbol = nextSymbol(_symbolBotNum);
+	showFrame(_tempGraphics, _symbolBotX + kSymbolx+5, kSymboly+49, 6 + nextBotSymbol, 32);
 	uint8 nextNextBotSymbol = nextSymbol(nextBotSymbol);
-	showFrame(_tempGraphics, data.byte(kSymbolbotx) + kSymbolx+54, kSymboly+49, 6 + nextNextBotSymbol, 32);
+	showFrame(_tempGraphics, _symbolBotX + kSymbolx+54, kSymboly+49, 6 + nextNextBotSymbol, 32);
 }
 
 void DreamBase::readKey() {
-	uint16 bufOut = data.word(kBufferout);
+	uint16 bufOut = _bufferOut;
 
-	if (bufOut == data.word(kBufferin)) {
+	if (bufOut == _bufferIn) {
 		// empty buffer
-		data.byte(kCurrentkey) = 0;
+		_currentKey = 0;
 		return;
 	}
 
 	bufOut = (bufOut + 1) & 15; // The buffer has size 16
-	data.byte(kCurrentkey) = g_keyBuffer[bufOut];
-	data.word(kBufferout) = bufOut;
+	_currentKey = g_keyBuffer[bufOut];
+	_bufferOut = bufOut;
 }
 
 void DreamBase::setTopLeft() {
-	if (data.byte(kSymboltopdir) != 0) {
+	if (_symbolTopDir != 0) {
 		blank();
 		return;
 	}
 
-	if (data.byte(kCommandtype) != 210) {
-		data.byte(kCommandtype) = 210;
+	if (_commandType != 210) {
+		_commandType = 210;
 		commandOnly(19);
 	}
 
-	if (data.word(kMousebutton) != 0)
-		data.byte(kSymboltopdir) = 0xFF;
+	if (_mouseButton != 0)
+		_symbolTopDir = 0xFF;
 }
 
 void DreamBase::setTopRight() {
-	if (data.byte(kSymboltopdir) != 0) {
+	if (_symbolTopDir != 0) {
 		blank();
 		return;
 	}
 
-	if (data.byte(kCommandtype) != 211) {
-		data.byte(kCommandtype) = 211;
+	if (_commandType != 211) {
+		_commandType = 211;
 		commandOnly(20);
 	}
 
-	if (data.word(kMousebutton) != 0)
-		data.byte(kSymboltopdir) = 1;
+	if (_mouseButton != 0)
+		_symbolTopDir = 1;
 }
 
 void DreamBase::setBotLeft() {
-	if (data.byte(kSymbolbotdir) != 0) {
+	if (_symbolBotDir != 0) {
 		blank();
 		return;
 	}
 
-	if (data.byte(kCommandtype) != 212) {
-		data.byte(kCommandtype) = 212;
+	if (_commandType != 212) {
+		_commandType = 212;
 		commandOnly(21);
 	}
 
-	if (data.word(kMousebutton) != 0)
-		data.byte(kSymbolbotdir) = 0xFF;
+	if (_mouseButton != 0)
+		_symbolBotDir = 0xFF;
 }
 
 void DreamBase::setBotRight() {
-	if (data.byte(kSymbolbotdir) != 0) {
+	if (_symbolBotDir != 0) {
 		blank();
 		return;
 	}
 
-	if (data.byte(kCommandtype) != 213) {
-		data.byte(kCommandtype) = 213;
+	if (_commandType != 213) {
+		_commandType = 213;
 		commandOnly(22);
 	}
 
-	if (data.word(kMousebutton) != 0)
-		data.byte(kSymbolbotdir) = 1;
+	if (_mouseButton != 0)
+		_symbolBotDir = 1;
 }
 
 void DreamBase::newGame() {
-	if (data.byte(kCommandtype) != 251) {
-		data.byte(kCommandtype) = 251;
+	if (_commandType != 251) {
+		_commandType = 251;
 		commandOnly(47);
 	}
 
-	if (data.word(kMousebutton) == 1)
-		data.byte(kGetback) = 3;
+	if (_mouseButton == 1)
+		_getBack = 3;
 }
 
 void DreamBase::pickupOb(uint8 command, uint8 pos) {
-	data.byte(kLastinvpos) = pos;
-	data.byte(kObjecttype) = kFreeObjectType;
-	data.byte(kItemframe) = command;
-	data.byte(kCommand) = command;
+	_lastInvPos = pos;
+	_objectType = kFreeObjectType;
+	_itemFrame = command;
+	_command = command;
 	//uint8 dummy;
 	//getAnyAd(&dummy, &dummy);	// was in the original source, seems useless here
 	transferToEx(command);
 }
 
 void DreamBase::initialInv() {
-	if (data.byte(kReallocation) != 24)
+	if (_realLocation != 24)
 		return;
 
 	pickupOb(11, 5);
@@ -2743,15 +2743,15 @@ void DreamBase::initialInv() {
 }
 
 void DreamBase::walkIntoRoom() {
-	if (data.byte(kLocation) == 14 && data.byte(kMapx) == 22) {
-		data.byte(kDestination) = 1;
-		data.byte(kFinaldest) = 1;
+	if (data.byte(kLocation) == 14 && _mapX == 22) {
+		_destination = 1;
+		_finalDest = 1;
 		autoSetWalk();
 	}
 }
 
 void DreamBase::afterIntroRoom() {
-	if (data.byte(kNowinnewroom) == 0)
+	if (_nowInNewRoom == 0)
 		return; // notnewintro
 
 	clearWork();
@@ -2762,11 +2762,11 @@ void DreamBase::afterIntroRoom() {
 	spriteUpdate();
 	printSprites();
 	workToScreen();
-	data.byte(kNowinnewroom) = 0;
+	_nowInNewRoom = 0;
 }
 
 void DreamBase::redrawMainScrn() {
-	data.word(kTimecount) = 0;
+	_timeCount = 0;
 	createPanel();
 	data.byte(kNewobs) = 0;
 	drawFloor();
@@ -2776,12 +2776,12 @@ void DreamBase::redrawMainScrn() {
 	getUnderZoom();
 	underTextLine();
 	readMouse();
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 }
 
 void DreamBase::blank() {
-	if (data.byte(kCommandtype) != 199) {
-		data.byte(kCommandtype) = 199;
+	if (_commandType != 199) {
+		_commandType = 199;
 		commandOnly(0);
 	}
 }
@@ -2802,22 +2802,22 @@ void DreamBase::makeMainScreen() {
 	showIcon();
 	getUnderZoom();
 	underTextLine();
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 	animPointer();
 	workToScreenM();
-	data.byte(kCommandtype) = 200;
-	data.byte(kManisoffscreen) = 0;
+	_commandType = 200;
+	_manIsOffScreen = 0;
 }
 
 void DreamBase::openInv() {
-	data.byte(kInvopen) = 1;
+	_invOpen = 1;
 	printMessage(80, 58 - 10, 61, 240, (240 & 1));
 	fillRyan();
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 }
 
 void DreamBase::obsThatDoThings() {
-	if (!compare(data.byte(kCommand), data.byte(kObjecttype), "MEMB"))
+	if (!compare(_command, _objectType, "MEMB"))
 		return; // notlouiscard
 
 	if (getLocation(4) != 1) {
@@ -2829,23 +2829,23 @@ void DreamBase::obsThatDoThings() {
 void DreamBase::describeOb() {
 	const uint8 *obText = getObTextStart();
 	uint16 y = 92;
-	if (_foreignRelease && data.byte(kObjecttype) == kSetObjectType1)
+	if (_foreignRelease && _objectType == kSetObjectType1)
 		y = 82;
-	data.word(kCharshift) = 91 + 91;
+	_charShift = 91 + 91;
 	printDirect(&obText, 33, &y, 241, 241 & 1);
-	data.word(kCharshift) = 0;
+	_charShift = 0;
 	y = 104;
-	if (_foreignRelease && data.byte(kObjecttype) == kSetObjectType1)
+	if (_foreignRelease && _objectType == kSetObjectType1)
 		y = 94;
 	printDirect(&obText, 36, &y, 241, 241 & 1);
 	obsThatDoThings();
 
 	// Additional text
-	if (compare(data.byte(kCommand), data.byte(kObjecttype), "CUPE")) {
+	if (compare(_command, _objectType, "CUPE")) {
 		// Empty cup
 		const uint8 *string = (const uint8 *)_puzzleText.getString(40);
 		printDirect(string, 36, y + 10, 241, 241 & 1);
-	} else if (compare(data.byte(kCommand), data.byte(kObjecttype), "CUPF")) {
+	} else if (compare(_command, _objectType, "CUPF")) {
 		// Full cup
 		const uint8 *string = (const uint8 *)_puzzleText.getString(39);
 		printDirect(string, 36, y + 10, 241, 241 & 1);
@@ -2853,13 +2853,13 @@ void DreamBase::describeOb() {
 }
 
 void DreamBase::delEverything() {
-	if (data.byte(kMapysize) + data.word(kMapoffsety) < 182) {
+	if (_mapYSize + _mapOffsetY < 182) {
 		mapToPanel();
 	} else {
 		// Big room
-		data.byte(kMapysize) -= 8;
+		_mapYSize -= 8;
 		mapToPanel();
-		data.byte(kMapysize) += 8;
+		_mapYSize += 8;
 	}
 }
 
@@ -2882,7 +2882,7 @@ void DreamBase::errorMessage1() {
 }
 
 void DreamBase::errorMessage2() {
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 	delPointer();
 	printMessage(76, 21, 59, 240, (240 & 1));
 	readMouse();
@@ -2928,7 +2928,7 @@ void DreamBase::putBackObStuff() {
 	obPicture();
 	describeOb();
 	underTextLine();
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 	readMouse();
 	showPointer();
 	workToScreen();
@@ -2945,12 +2945,12 @@ void DreamBase::dumpZoom() {
 }
 
 void DreamBase::examineInventory() {
-	if (data.byte(kCommandtype) != 249) {
-		data.byte(kCommandtype) = 249;
+	if (_commandType != 249) {
+		_commandType = 249;
 		commandOnly(32);
 	}
 
-	if (!(data.word(kMousebutton) & 1))
+	if (!(_mouseButton & 1))
 		return;
 
 	createPanel();
@@ -2958,8 +2958,8 @@ void DreamBase::examineInventory() {
 	showMan();
 	showExit();
 	examIcon();
-	data.byte(kPickup) = 0;
-	data.byte(kInvopen) = 2;
+	_pickUp = 0;
+	_invOpen = 2;
 	openInv();
 	workToScreenM();
 }
@@ -2974,9 +2974,9 @@ void DreamBase::showDiary() {
 
 void DreamBase::underTextLine() {
 	if (_foreignRelease)
-		multiGet(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy) - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
+		multiGet(_textUnder, _textAddressX, _textAddressY - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
 	else
-		multiGet(_textUnder, data.byte(kTextaddressx), data.word(kTextaddressy), kUnderTextSizeX, kUnderTextSizeY);
+		multiGet(_textUnder, _textAddressX, _textAddressY, kUnderTextSizeX, kUnderTextSizeY);
 }
 
 void DreamBase::getUnderZoom() {
@@ -2993,15 +2993,15 @@ void DreamBase::showWatchReel() {
 	data.word(kReeltowatch) = reelPointer;
 
 	// check for shake
-	if (data.byte(kReallocation) == 26 && reelPointer == 104)
+	if (_realLocation == 26 && reelPointer == 104)
 		data.byte(kShakecounter) = 0xFF;
 }
 
 void DreamBase::watchReel() {
 	if (data.word(kReeltowatch) != 0xFFFF) {
-		if (data.byte(kManspath) != data.byte(kFinaldest))
+		if (_mansPath != _finalDest)
 			return; // Wait until stopped walking
-		if (data.byte(kTurntoface) != data.byte(kFacing))
+		if (_turnToFace != _facing)
 			return;
 
 		if (--data.byte(kSpeedcount) != 0xFF) {
@@ -3033,8 +3033,8 @@ void DreamBase::watchReel() {
 		if (data.word(kReeltohold) == data.word(kEndofholdreel)) {
 			data.word(kReeltohold) = 0xFFFF;
 			data.byte(kWatchmode) = 0xFF;
-			data.byte(kDestination) = data.byte(kDestafterhold);
-			data.byte(kFinaldest) = data.byte(kDestafterhold);
+			_destination = data.byte(kDestafterhold);
+			_finalDest = data.byte(kDestafterhold);
 			autoSetWalk();
 			return;
 		}
@@ -3045,22 +3045,22 @@ void DreamBase::watchReel() {
 }
 
 void DreamBase::afterNewRoom() {
-	if (data.byte(kNowinnewroom) == 0)
+	if (_nowInNewRoom == 0)
 		return; // notnew
 
-	data.word(kTimecount) = 0;
+	_timeCount = 0;
 	createPanel();
-	data.byte(kCommandtype) = 0;
+	_commandType = 0;
 	findRoomInLoc();
 	if (data.byte(kRyanon) != 1) {
-		data.byte(kManspath) = findPathOfPoint(data.byte(kRyanx) + 12, data.byte(kRyany) + 12);
+		_mansPath = findPathOfPoint(_ryanX + 12, _ryanY + 12);
 		findXYFromPath();
-		data.byte(kResetmanxy) = 1;
+		_resetManXY = 1;
 	}
 	data.byte(kNewobs) = 1;
 	drawFloor();
-	data.word(kLookcounter) = 160;
-	data.byte(kNowinnewroom) = 0;
+	_lookCounter = 160;
+	_nowInNewRoom = 0;
 	showIcon();
 	spriteUpdate();
 	printSprites();
@@ -3077,20 +3077,20 @@ void DreamBase::afterNewRoom() {
 
 void DreamBase::madmanRun() {
 	if (data.byte(kLocation)    != 14 ||
-		data.byte(kMapx)        != 22 ||
-		data.byte(kPointermode) !=  2 ||
+		_mapX        != 22 ||
+		_pointerMode !=  2 ||
 		data.byte(kMadmanflag)  !=  0) {
 		identifyOb();
 		return;
 	}
 
-	if (data.byte(kCommandtype) != 211) {
-		data.byte(kCommandtype) = 211;
+	if (_commandType != 211) {
+		_commandType = 211;
 		commandOnly(52);
 	}
 
-	if (data.word(kMousebutton) == 1 &&
-		data.word(kMousebutton) != data.word(kOldbutton))
+	if (_mouseButton == 1 &&
+		_mouseButton != _oldButton)
 		data.byte(kLastweapon) = 8;
 }
 
@@ -3099,18 +3099,18 @@ void DreamBase::decide() {
 	setMode();
 	loadPalFromIFF();
 	clearPalette();
-	data.byte(kPointermode) = 0;
+	_pointerMode = 0;
 	data.word(kWatchingtime) = 0;
-	data.byte(kPointerframe) = 0;
-	data.word(kTextaddressx) = 70;
-	data.word(kTextaddressy) = 182 - 8;
-	data.byte(kTextlen) = 181;
-	data.byte(kManisoffscreen) = 1;
+	_pointerFrame = 0;
+	_textAddressX = 70;
+	_textAddressY = 182 - 8;
+	_textLen = 181;
+	_manIsOffScreen = 1;
 	loadSaveBox();
 	showDecisions();
 	workToScreen();
 	fadeScreenUp();
-	data.byte(kGetback) = 0;
+	_getBack = 0;
 
 	RectWithCallback<DreamBase> decideList[] = {
 		{ kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamBase::newGame },
@@ -3131,34 +3131,34 @@ void DreamBase::decide() {
 		dumpTextLine();
 		delPointer();
 		checkCoords(decideList);
-	} while (!data.byte(kGetback));
+	} while (!_getBack);
 
-	if (data.byte(kGetback) != 4)
+	if (_getBack != 4)
 		getRidOfTemp();	// room not loaded
 
-	data.word(kTextaddressx) = 13;
-	data.word(kTextaddressy) = 182;
-	data.byte(kTextlen) = 240;
+	_textAddressX = 13;
+	_textAddressY = 182;
+	_textLen = 240;
 }
 
 void DreamBase::showGun() {
-	data.byte(kAddtored) = 0;
-	data.byte(kAddtogreen) = 0;
-	data.byte(kAddtoblue) = 0;
+	_addToRed = 0;
+	_addToGreen = 0;
+	_addToBlue = 0;
 	palToStartPal();
 	palToEndPal();
 	greyscaleSum();
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 63;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 128;
+	_fadeDirection = 1;
+	_fadeCount = 63;
+	_colourPos = 0;
+	_numToFade = 128;
 	hangOn(130);
 	endPalToStart();
 	clearEndPal();
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 63;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 128;
+	_fadeDirection = 1;
+	_fadeCount = 63;
+	_colourPos = 0;
+	_numToFade = 128;
 	hangOn(200);
 	_roomsSample = 34;
 	loadRoomsSample();
@@ -3178,47 +3178,47 @@ void DreamBase::showGun() {
 }
 
 void DreamBase::diaryKeyP() {
-	if (data.byte(kCommandtype) != 214) {
-		data.byte(kCommandtype) = 214;
+	if (_commandType != 214) {
+		_commandType = 214;
 		commandOnly(23);
 	}
 
-	if (!data.word(kMousebutton) ||
-		data.word(kOldbutton) == data.word(kMousebutton) ||
-		data.byte(kPresscount))
+	if (!_mouseButton ||
+		_oldButton == _mouseButton ||
+		_pressCount)
 		return; // notkeyp
 
 	playChannel1(16);
-	data.byte(kPresscount) = 12;
-	data.byte(kPressed) = 'P';
-	data.byte(kDiarypage)--;
+	_pressCount = 12;
+	_pressed = 'P';
+	_diaryPage--;
 
-	if (data.byte(kDiarypage) == 0xFF)
-		data.byte(kDiarypage) = 11;
+	if (_diaryPage == 0xFF)
+		_diaryPage = 11;
 }
 
 void DreamBase::diaryKeyN() {
-	if (data.byte(kCommandtype) != 213) {
-		data.byte(kCommandtype) = 213;
+	if (_commandType != 213) {
+		_commandType = 213;
 		commandOnly(23);
 	}
 
-	if (!data.word(kMousebutton) ||
-		data.word(kOldbutton) == data.word(kMousebutton) ||
-		data.byte(kPresscount))
+	if (!_mouseButton ||
+		_oldButton == _mouseButton ||
+		_pressCount)
 		return; // notkeyn
 
 	playChannel1(16);
-	data.byte(kPresscount) = 12;
-	data.byte(kPressed) = 'N';
-	data.byte(kDiarypage)++;
+	_pressCount = 12;
+	_pressed = 'N';
+	_diaryPage++;
 
-	if (data.byte(kDiarypage) == 12)
-		data.byte(kDiarypage) = 0;
+	if (_diaryPage == 12)
+		_diaryPage = 0;
 }
 
 void DreamBase::dropError() {
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 	delPointer();
 	printMessage(76, 21, 56, 240, 240 & 1);
 	workToScreenM();
@@ -3226,12 +3226,12 @@ void DreamBase::dropError() {
 	showPanel();
 	showMan();
 	examIcon();
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 	workToScreenM();
 }
 
 void DreamBase::cantDrop() {
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 	delPointer();
 	printMessage(76, 21, 24, 240, 240 & 1);
 	workToScreenM();
@@ -3239,29 +3239,29 @@ void DreamBase::cantDrop() {
 	showPanel();
 	showMan();
 	examIcon();
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 	workToScreenM();
 }
 
 void DreamBase::getBack1() {
-	if (data.byte(kPickup) != 0) {
+	if (_pickUp != 0) {
 		blank();
 		return;
 	}
 
 
-	if (data.byte(kCommandtype) != 202) {
-		data.byte(kCommandtype) = 202;
+	if (_commandType != 202) {
+		_commandType = 202;
 		commandOnly(26);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton))
+	if (_mouseButton == _oldButton)
 		return;
 
-	if (data.word(kMousebutton) & 1) {
+	if (_mouseButton & 1) {
 		// Get back
-		data.byte(kGetback) = 1;
-		data.byte(kPickup) = 0;
+		_getBack = 1;
+		_pickUp = 0;
 	}
 }
 
@@ -3270,11 +3270,11 @@ void DreamBase::autoAppear() {
 		// In alley
 		resetLocation(5);
 		setLocation(10);
-		data.byte(kDestpos) = 10;
+		_destPos = 10;
 		return;
 	}
 
-	if (data.byte(kReallocation) == 24) {
+	if (_realLocation == 24) {
 		// In Eden's apartment
 		if (data.byte(kGeneraldead) == 1) {
 			data.byte(kGeneraldead)++;
@@ -3295,37 +3295,37 @@ void DreamBase::autoAppear() {
 		}
 	} else {
 		// Not in Eden's
-		if (data.byte(kReallocation) == 25) {
+		if (_realLocation == 25) {
 			// Sart roof
 			data.byte(kNewsitem) = 3;
 			resetLocation(6);
 			setLocation(11);
-			data.byte(kDestpos) = 11;
+			_destPos = 11;
 		} else {
-			if (data.byte(kReallocation) == 2 && data.byte(kRockstardead) != 0)
+			if (_realLocation == 2 && data.byte(kRockstardead) != 0)
 				placeSetObject(23);
 		}
 	}
 }
 
 void DreamBase::quitKey() {
-	if (data.byte(kCommandtype) != 222) {
-		data.byte(kCommandtype) = 222;
+	if (_commandType != 222) {
+		_commandType = 222;
 		commandOnly(4);
 	}
 
-	if (data.word(kMousebutton) != data.word(kOldbutton) && (data.word(kMousebutton) & 1))
-		data.byte(kGetback) = 1;
+	if (_mouseButton != _oldButton && (_mouseButton & 1))
+		_getBack = 1;
 }
 
 void DreamBase::setupTimedUse(uint16 textIndex, uint16 countToTimed, uint16 timeCount, byte x, byte y) {
-	if (data.word(kTimecount) != 0)
+	if (_timeCount != 0)
 		return; // can't setup
 
-	data.byte(kTimedy) = y;
-	data.byte(kTimedx) = x;
-	data.word(kCounttotimed) = countToTimed;
-	data.word(kTimecount) = timeCount + countToTimed;
+	_timedY = y;
+	_timedX = x;
+	_countToTimed = countToTimed;
+	_timeCount = timeCount + countToTimed;
 	_timedString = _puzzleText.getString(textIndex);
 	debug(1, "setupTimedUse: %d => '%s'", textIndex, _timedString);
 }
@@ -3389,8 +3389,8 @@ void DreamBase::entryAnims() {
 		switchRyanOff();
 		break;
 	case 26:	// under church
-		data.byte(kSymboltopnum) = 2;
-		data.byte(kSymbolbotnum) = 1;
+		_symbolTopNum = 2;
+		_symbolBotNum = 1;
 		break;
 	case 45:	// entered Dreamweb
 		data.byte(kKeeperflag) = 0;
@@ -3402,7 +3402,7 @@ void DreamBase::entryAnims() {
 		switchRyanOff();
 		break;
 	default:
-		if (data.byte(kReallocation) == 46 && data.byte(kSartaindead) == 1) {	// Crystal
+		if (_realLocation == 46 && data.byte(kSartaindead) == 1) {	// Crystal
 			removeFreeObject(0);
 		} else if (data.byte(kLocation) == 9 && !checkIfPathIsOn(2) && data.byte(kAidedead) != 0) {
 			// Top of church
@@ -3430,105 +3430,105 @@ void DreamBase::entryAnims() {
 			data.byte(kSpeedcount) = 1;
 			switchRyanOff();
 		} else if (data.byte(kLocation) == 24) {	// Eden's again
-			turnAnyPathOn(2, data.byte(kRoomnum) - 1);
+			turnAnyPathOn(2, _roomNum - 1);
 		}
 	}
 }
 
 void DreamBase::updateSymbolTop() {
-	if (!data.byte(kSymboltopdir))
+	if (!_symbolTopDir)
 		return; // topfinished
 
-	if (data.byte(kSymboltopdir) == (byte)-1) {
+	if (_symbolTopDir == (byte)-1) {
 		// Backward
-		data.byte(kSymboltopx)--;
-		if (data.byte(kSymboltopx) != (byte)-1) {
+		_symbolTopX--;
+		if (_symbolTopX != (byte)-1) {
 			// Not wrapping
-			if (data.byte(kSymboltopx) != 24)
+			if (_symbolTopX != 24)
 				return; // topfinished
-			data.byte(kSymboltopdir) = 0;
+			_symbolTopDir = 0;
 		} else {
-			data.byte(kSymboltopx) = 48;
-			data.byte(kSymboltopnum)++;
-			if (data.byte(kSymboltopnum) != 6)
+			_symbolTopX = 48;
+			_symbolTopNum++;
+			if (_symbolTopNum != 6)
 				return; // topfinished
-			data.byte(kSymboltopnum) = 0;
+			_symbolTopNum = 0;
 		}
 	} else {
 		// Forward
-		data.byte(kSymboltopx)++;
-		if (data.byte(kSymboltopx) != 49) {
+		_symbolTopX++;
+		if (_symbolTopX != 49) {
 			// Not wrapping
-			if (data.byte(kSymboltopx) != 24)
+			if (_symbolTopX != 24)
 				return; // topfinished
-			data.byte(kSymboltopdir) = 0;
+			_symbolTopDir = 0;
 		} else {
-			data.byte(kSymboltopx) = 0;
-			data.byte(kSymboltopnum)--;
-			if (data.byte(kSymboltopnum) != (byte)-1)
+			_symbolTopX = 0;
+			_symbolTopNum--;
+			if (_symbolTopNum != (byte)-1)
 				return; // topfinished
-			data.byte(kSymboltopnum) = 5;
+			_symbolTopNum = 5;
 		}
 	}
 }
 
 void DreamBase::updateSymbolBot() {
-	if (!data.byte(kSymbolbotdir))
+	if (!_symbolBotDir)
 		return; // botfinished
 
-	if (data.byte(kSymbolbotdir) == (byte)-1) {
+	if (_symbolBotDir == (byte)-1) {
 		// Backward
-		data.byte(kSymbolbotx)--;
-		if (data.byte(kSymbolbotx) != (byte)-1) {
+		_symbolBotX--;
+		if (_symbolBotX != (byte)-1) {
 			// Not wrapping
-			if (data.byte(kSymbolbotx) != 24)
+			if (_symbolBotX != 24)
 				return; // botfinished
-			data.byte(kSymbolbotdir) = 0;
+			_symbolBotDir = 0;
 		} else {
-			data.byte(kSymbolbotx) = 48;
-			data.byte(kSymbolbotnum)++;
-			if (data.byte(kSymbolbotnum) != 6)
+			_symbolBotX = 48;
+			_symbolBotNum++;
+			if (_symbolBotNum != 6)
 				return; // botfinished
-			data.byte(kSymbolbotnum) = 0;
+			_symbolBotNum = 0;
 		}
 	} else {
 		// Forward
-		data.byte(kSymbolbotx)++;
-		if (data.byte(kSymbolbotx) != 49) {
+		_symbolBotX++;
+		if (_symbolBotX != 49) {
 			// Not wrapping
-			if (data.byte(kSymbolbotx) != 24)
+			if (_symbolBotX != 24)
 				return; // botfinished
-			data.byte(kSymbolbotdir) = 0;
+			_symbolBotDir = 0;
 		} else {
-			data.byte(kSymbolbotx) = 0;
-			data.byte(kSymbolbotnum)--;
-			if (data.byte(kSymbolbotnum) != (byte)-1)
+			_symbolBotX = 0;
+			_symbolBotNum--;
+			if (_symbolBotNum != (byte)-1)
 				return; // botfinished
-			data.byte(kSymbolbotnum) = 5;
+			_symbolBotNum = 5;
 		}
 	}
 }
 
 void DreamBase::showDiaryPage() {
 	showFrame(_tempGraphics, kDiaryx, kDiaryy, 0, 0);
-	data.byte(kKerning) = 1;
+	_kerning = 1;
 	useTempCharset();
-	data.word(kCharshift) = 91+91;
-	const uint8 *string = getTextInFile1(data.byte(kDiarypage));
+	_charShift = 91+91;
+	const uint8 *string = getTextInFile1(_diaryPage);
 	uint16 y = kDiaryy + 16;
 	printDirect(&string, kDiaryx + 48, &y, 240, 240 & 1);
 	y = kDiaryy + 16;
 	printDirect(&string, kDiaryx + 129, &y, 240, 240 & 1);
 	y = kDiaryy + 23;
 	printDirect(&string, kDiaryx + 48, &y, 240, 240 & 1);
-	data.byte(kKerning) = 0;
-	data.word(kCharshift) = 0;
+	_kerning = 0;
+	_charShift = 0;
 	useCharset1();
 }
 
 void DreamBase::dumpDiaryKeys() {
-	if (data.byte(kPresscount) == 1) {
-		if (data.byte(kSartaindead) != 1 && data.byte(kDiarypage) == 5 && getLocation(6) != 1) {
+	if (_pressCount == 1) {
+		if (data.byte(kSartaindead) != 1 && _diaryPage == 5 && getLocation(6) != 1) {
 			// Add Sartain Industries note
 			setLocation(6);
 			delPointer();
@@ -3553,7 +3553,7 @@ void DreamBase::dumpDiaryKeys() {
 }
 
 void DreamBase::lookAtCard() {
-	data.byte(kManisoffscreen) = 1;
+	_manIsOffScreen = 1;
 	getRidOfReels();
 	loadKeypad();
 	createPanel2();
@@ -3571,7 +3571,7 @@ void DreamBase::lookAtCard() {
 	printDirect(obText, 36, 130, 241, 241 & 1);
 	workToScreenM();
 	hangOnW(200);
-	data.byte(kManisoffscreen) = 0;
+	_manIsOffScreen = 0;
 	getRidOfTemp();
 	restoreReels();
 	putBackObStuff();
@@ -3605,28 +3605,28 @@ void DreamBase::clearChanges() {
 }
 
 void DreamBase::showDiaryKeys() {
-	if (!data.byte(kPresscount))
+	if (!_pressCount)
 		return; // nokeyatall
 
-	data.byte(kPresscount)--;
+	_pressCount--;
 
-	if (!data.byte(kPresscount))
+	if (!_pressCount)
 		return; // nokeyatall
 
-	if (data.byte(kPressed) == 'N') {
-		byte frame = (data.byte(kPresscount) == 1) ? 3 : 4;
+	if (_pressed == 'N') {
+		byte frame = (_pressCount == 1) ? 3 : 4;
 		showFrame(_tempGraphics, kDiaryx + 94, kDiaryy + 97, frame, 0);
 	} else {
-		byte frame = (data.byte(kPresscount) == 1) ? 5 : 6;
+		byte frame = (_pressCount == 1) ? 5 : 6;
 		showFrame(_tempGraphics, kDiaryx + 151, kDiaryy + 71, frame, 0);
 	}
 
-	if (data.byte(kPresscount) == 1)
+	if (_pressCount == 1)
 		showDiaryPage();
 }
 
 void DreamBase::edensFlatReminders() {
-	if (data.byte(kReallocation) != 24 || data.byte(kMapx) != 44)
+	if (_realLocation != 24 || _mapX != 44)
 		return; // not in Eden's lift
 
 	if (data.byte(kProgresspoints))
@@ -3654,15 +3654,15 @@ void DreamBase::edensFlatReminders() {
 }
 
 void DreamBase::incRyanPage() {
-	if (data.byte(kCommandtype) != 222) {
-		data.byte(kCommandtype) = 222;
+	if (_commandType != 222) {
+		_commandType = 222;
 		commandOnly(31);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton) || !(data.word(kMousebutton) & 1))
+	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
-	data.byte(kRyanpage) = (data.word(kMousex) - (kInventx + 167)) / 18;
+	data.byte(kRyanpage) = (_mouseX - (kInventx + 167)) / 18;
 
 	delPointer();
 	fillRyan();
@@ -3690,7 +3690,7 @@ void DreamBase::purgeAnItem() {
 
 	for (size_t i = 0; i < kNumexobjects; ++i) {
 		if (extraObjects[i].mapad[0] && extraObjects[i].id[0] == 255 &&
-			extraObjects[i].initialLocation != data.byte(kReallocation)) {
+			extraObjects[i].initialLocation != _realLocation) {
 			deleteExObject(i);
 			return;
 		}
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 5478a0f1f2..a1bbbe51da 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -25,9 +25,9 @@
 namespace DreamGen {
 
 void DreamBase::talk() {
-	data.byte(kTalkpos) = 0;
-	data.byte(kInmaparea) = 0;
-	data.byte(kCharacter) = data.byte(kCommand);
+	_talkPos = 0;
+	_inMapArea = 0;
+	_character = _command;
 	createPanel();
 	showPanel();
 	showMan();
@@ -35,7 +35,7 @@ void DreamBase::talk() {
 	underTextLine();
 	convIcons();
 	startTalk();
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 	readMouse();
 	showPointer();
 	workToScreen();
@@ -55,13 +55,13 @@ void DreamBase::talk() {
 		vSync();
 		dumpPointer();
 		dumpTextLine();
-		data.byte(kGetback) = 0;
+		_getBack = 0;
 		checkCoords(talkList);
 		if (_quitRequested)
 			break;
-	} while (!data.byte(kGetback));
+	} while (!_getBack);
 
-	if (data.byte(kTalkpos) >= 4)
+	if (_talkPos >= 4)
 		_personData->b7 |= 128;
 
 	redrawMainScrn();
@@ -74,7 +74,7 @@ void DreamBase::talk() {
 }
 
 void DreamBase::convIcons() {
-	uint8 index = data.byte(kCharacter) & 127;
+	uint8 index = _character & 127;
 	uint16 frame = getPersFrame(index);
 	const GraphicsFile *base = findSource(frame);
 	showFrame(*base, 234, 2, frame, 0);
@@ -85,21 +85,21 @@ uint16 DreamBase::getPersFrame(uint8 index) {
 }
 
 void DreamBase::startTalk() {
-	data.byte(kTalkmode) = 0;
+	_talkMode = 0;
 
-	const uint8 *str = getPersonText(data.byte(kCharacter) & 0x7F, 0);
+	const uint8 *str = getPersonText(_character & 0x7F, 0);
 	uint16 y;
 
-	data.word(kCharshift) = 91+91;
+	_charShift = 91+91;
 	y = 64;
 	printDirect(&str, 66, &y, 241, true);
 
-	data.word(kCharshift) = 0;
+	_charShift = 0;
 	y = 80;
 	printDirect(&str, 66, &y, 241, true);
 
 	_speechLoaded = false;
-	loadSpeech('R', data.byte(kReallocation), 'C', 64*(data.byte(kCharacter) & 0x7F));
+	loadSpeech('R', _realLocation, 'C', 64*(_character & 0x7F));
 	if (_speechLoaded) {
 		_volumeDirection = 1;
 		_volumeTo = 6;
@@ -112,37 +112,37 @@ const uint8 *DreamBase::getPersonText(uint8 index, uint8 talkPos) {
 }
 
 void DreamBase::moreTalk() {
-	if (data.byte(kTalkmode) != 0) {
+	if (_talkMode != 0) {
 		redes();
 		return;
 	}
 
-	if (data.byte(kCommandtype) != 215) {
-		data.byte(kCommandtype) = 215;
+	if (_commandType != 215) {
+		_commandType = 215;
 		commandOnly(49);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton))
+	if (_mouseButton == _oldButton)
 		return;	// nomore
 
-	if (!(data.word(kMousebutton) & 1))
+	if (!(_mouseButton & 1))
 		return;
 
-	data.byte(kTalkmode) = 2;
-	data.byte(kTalkpos) = 4;
+	_talkMode = 2;
+	_talkPos = 4;
 
-	if (data.byte(kCharacter) >= 100)
-		data.byte(kTalkpos) = 48; // second part
+	if (_character >= 100)
+		_talkPos = 48; // second part
 	doSomeTalk();
 }
 
 void DreamBase::doSomeTalk() {
 	while (true) {
-		const uint8 *str = getPersonText(data.byte(kCharacter) & 0x7F, data.byte(kTalkpos));
+		const uint8 *str = getPersonText(_character & 0x7F, _talkPos);
 
 		if (*str == 0) {
 			// endheartalk
-			data.byte(kPointermode) = 0;
+			_pointerMode = 0;
 			return;
 		}
 
@@ -154,21 +154,21 @@ void DreamBase::doSomeTalk() {
 
 		printDirect(str, 164, 64, 144, false);
 
-		loadSpeech('R', data.byte(kReallocation), 'C', (64 * (data.byte(kCharacter) & 0x7F)) + data.byte(kTalkpos));
+		loadSpeech('R', _realLocation, 'C', (64 * (_character & 0x7F)) + _talkPos);
 		if (_speechLoaded)
 			playChannel1(62);
 
-		data.byte(kPointermode) = 3;
+		_pointerMode = 3;
 		workToScreenM();
 		if (hangOnPQ())
 			return;
 
-		data.byte(kTalkpos)++;
+		_talkPos++;
 
-		str = getPersonText(data.byte(kCharacter) & 0x7F, data.byte(kTalkpos));
+		str = getPersonText(_character & 0x7F, _talkPos);
 		if (*str == 0) {
 			// endheartalk
-			data.byte(kPointermode) = 0;
+			_pointerMode = 0;
 			return;
 		}
 
@@ -180,22 +180,22 @@ void DreamBase::doSomeTalk() {
 			convIcons();
 			printDirect(str, 48, 128, 144, false);
 
-			loadSpeech('R', data.byte(kReallocation), 'C', (64 * (data.byte(kCharacter) & 0x7F)) + data.byte(kTalkpos));
+			loadSpeech('R', _realLocation, 'C', (64 * (_character & 0x7F)) + _talkPos);
 			if (_speechLoaded)
 				playChannel1(62);
 
-			data.byte(kPointermode) = 3;
+			_pointerMode = 3;
 			workToScreenM();
 			if (hangOnPQ())
 				return;
 		}
 
-		data.byte(kTalkpos)++;
+		_talkPos++;
 	}
 }
 
 bool DreamBase::hangOnPQ() {
-	data.byte(kGetback) = 0;
+	_getBack = 0;
 
 	RectWithCallback<DreamBase> quitList[] = {
 		{ 273,320,157,198,&DreamBase::getBack1 },
@@ -215,10 +215,10 @@ bool DreamBase::hangOnPQ() {
 		dumpTextLine();
 		checkCoords(quitList);
 
-		if (data.byte(kGetback) == 1 || _quitRequested) {
+		if (_getBack == 1 || _quitRequested) {
 			// Quit conversation
 			delPointer();
-			data.byte(kPointermode) = 0;
+			_pointerMode = 0;
 			cancelCh1();
 			return true;
 		}
@@ -228,25 +228,25 @@ bool DreamBase::hangOnPQ() {
 			if (speechFlag == 40)
 				break;
 		}
-	} while (!data.word(kMousebutton) || data.word(kOldbutton));
+	} while (!_mouseButton || _oldButton);
 
 	delPointer();
-	data.byte(kPointermode) = 0;
+	_pointerMode = 0;
 	return false;
 }
 
 void DreamBase::redes() {
-	if (_channel1Playing != 255 || data.byte(kTalkmode) != 2) {
+	if (_channel1Playing != 255 || _talkMode != 2) {
 		blank();
 		return;
 	}
 
-	if (data.byte(kCommandtype) != 217) {
-		data.byte(kCommandtype) = 217;
+	if (_commandType != 217) {
+		_commandType = 217;
 		commandOnly(50);
 	}
 
-	if (!(data.word(kMousebutton) & 1))
+	if (!(_mouseButton & 1))
 		return;
 
 	delPointer();
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index 529f400ff6..ff3566f5d7 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -69,7 +69,7 @@ void DreamBase::monkSpeaking() {
 }
 
 void DreamBase::gettingShot() {
-	data.byte(kNewlocation) = 55;
+	_newLocation = 55;
 	clearPalette();
 	loadIntroRoom();
 	fadeScreenUps();
@@ -86,34 +86,34 @@ void DreamBase::bibleQuote() {
 	fadeScreenUps();
 
 	hangOne(80);
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) = 0;
+	if (_lastHardKey == 1) {
+		_lastHardKey = 0;
 		return; // "biblequotearly"
 	}
 
 	hangOne(560);
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) = 0;
+	if (_lastHardKey == 1) {
+		_lastHardKey = 0;
 		return; // "biblequotearly"
 	}
 
 	fadeScreenDowns();
 
 	hangOne(200);
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) = 0;
+	if (_lastHardKey == 1) {
+		_lastHardKey = 0;
 		return; // "biblequotearly"
 	}
 
 	cancelCh0();
 
-	data.byte(kLasthardkey) = 0;
+	_lastHardKey = 0;
 }
 
 void DreamBase::hangOne(uint16 delay) {
 	do {
 		vSync();
-		if (data.byte(kLasthardkey) == 1)
+		if (_lastHardKey == 1)
 			return; // "hangonearly"
 	} while	(--delay);
 }
@@ -122,7 +122,7 @@ void DreamBase::intro() {
 	loadTempText("DREAMWEB.T82");
 	loadPalFromIFF();
 	setMode();
-	data.byte(kNewlocation) = 50;
+	_newLocation = 50;
 	clearPalette();
 	loadIntroRoom();
 	_volume = 7;
@@ -132,61 +132,61 @@ void DreamBase::intro() {
 	fadeScreenUps();
 	runIntroSeq();
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "introearly"
 	}
 
 	clearBeforeLoad();
-	data.byte(kNewlocation) = 52;
+	_newLocation = 52;
 	loadIntroRoom();
 	runIntroSeq();
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "introearly"
 	}
 
 	clearBeforeLoad();
-	data.byte(kNewlocation) = 53;
+	_newLocation = 53;
 	loadIntroRoom();
 	runIntroSeq();
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "introearly"
 	}
 
 	clearBeforeLoad();
 	allPalette();
-	data.byte(kNewlocation) = 54;
+	_newLocation = 54;
 	loadIntroRoom();
 	runIntroSeq();
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "introearly"
 	}
 
 	getRidOfTempText();
 	clearBeforeLoad();
 
-	data.byte(kLasthardkey) =  0;
+	_lastHardKey =  0;
 }
 
 void DreamBase::runIntroSeq() {
-	data.byte(kGetback) = 0;
+	_getBack = 0;
 
 	do {
 		vSync();
 
-		if (data.byte(kLasthardkey) == 1)
+		if (_lastHardKey == 1)
 			break;
 
 		spriteUpdate();
 		vSync();
 
-		if (data.byte(kLasthardkey) == 1)
+		if (_lastHardKey == 1)
 			break;
 
 		delEverything();
@@ -196,20 +196,20 @@ void DreamBase::runIntroSeq() {
 		useTimedText();
 		vSync();
 
-		if (data.byte(kLasthardkey) == 1)
+		if (_lastHardKey == 1)
 			break;
 
 		dumpMap();
 		dumpTimedText();
 		vSync();
 
-		if (data.byte(kLasthardkey) == 1)
+		if (_lastHardKey == 1)
 			break;
 
-	} while (data.byte(kGetback) != 1);
+	} while (_getBack != 1);
 
 
-	if (data.byte(kLasthardkey) == 1) {
+	if (_lastHardKey == 1) {
 		getRidOfTempText();
 		clearBeforeLoad();
 	}
@@ -222,7 +222,7 @@ void DreamBase::runIntroSeq() {
 
 void DreamBase::runEndSeq() {
 	atmospheres();
-	data.byte(kGetback) = 0;
+	_getBack = 0;
 
 	do {
 		vSync();
@@ -237,19 +237,19 @@ void DreamBase::runEndSeq() {
 		dumpMap();
 		dumpTimedText();
 		vSync();
-	} while (data.byte(kGetback) != 1);
+	} while (_getBack != 1);
 }
 
 void DreamBase::loadIntroRoom() {
-	data.byte(kIntrocount) = 0;
+	_introCount = 0;
 	data.byte(kLocation) = 255;
 	loadRoom();
-	data.word(kMapoffsetx) = 72;
-	data.word(kMapoffsety) = 16;
+	_mapOffsetX = 72;
+	_mapOffsetY = 16;
 	clearSprites();
 	data.byte(kThroughdoor) = 0;
-	data.byte(kCurrentkey) = '0';
-	data.byte(kMainmode) = 0;
+	_currentKey = '0';
+	_mainMode = 0;
 	clearWork();
 	data.byte(kNewobs) = 1;
 	drawFloor();
@@ -275,24 +275,24 @@ void DreamBase::realCredits() {
 
 	hangOne(2);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
 	allPalette();
 	hangOne(80);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
 	fadeScreenDowns();
 	hangOne(256);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
@@ -300,24 +300,24 @@ void DreamBase::realCredits() {
 	playChannel0(12, 0);
 	hangOne(2);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
 	allPalette();
 	hangOne(80);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
 	fadeScreenDowns();
 	hangOne(256);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
@@ -325,24 +325,24 @@ void DreamBase::realCredits() {
 	playChannel0(12, 0);
 	hangOne(2);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
 	allPalette();
 	hangOne(80);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
 	fadeScreenDowns();
 	hangOne(256);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
@@ -350,24 +350,24 @@ void DreamBase::realCredits() {
 	playChannel0(12, 0);
 	hangOne(2);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
 	allPalette();
 	hangOne(80);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
 	fadeScreenDowns();
 	hangOne(256);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
@@ -375,24 +375,24 @@ void DreamBase::realCredits() {
 	playChannel0(12, 0);
 	hangOne(2);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
 	allPalette();
 	hangOne(80);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
 	fadeScreenDowns();
 	hangOne(256);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
@@ -400,23 +400,23 @@ void DreamBase::realCredits() {
 	fadeScreenUps();
 	hangOne(60);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
 	playChannel0(13, 0);
 	hangOne(350);
 
-	if (data.byte(kLasthardkey) == 1) {
-		data.byte(kLasthardkey) =  0;
+	if (_lastHardKey == 1) {
+		_lastHardKey =  0;
 		return; // "realcreditsearly"
 	}
 
 	fadeScreenDowns();
 	hangOne(256);
 
-	data.byte(kLasthardkey) =  0;
+	_lastHardKey =  0;
 }
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index f2dce4d603..94c9d20ea7 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -121,10 +121,10 @@ void DreamBase::useRoutine() {
 		{ &DreamBase::hotelBell,               "BELL" },
 	};
 
-	if (data.byte(kReallocation) >= 50) {
-		if (data.byte(kPointerpower) == 0)
+	if (_realLocation >= 50) {
+		if (_pointerPower == 0)
 			return;
-		data.byte(kPointerpower) = 0;
+		_pointerPower = 0;
 	}
 
 	uint8 dummy;
@@ -160,7 +160,7 @@ void DreamBase::useRoutine() {
 	workToScreenM();
 	hangOnP(50);
 	putBackObStuff();
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 }
 
 void DreamBase::useText(const uint8 *string) {
@@ -191,13 +191,13 @@ void DreamBase::showSecondUse() {
 }
 
 void DreamBase::viewFolder() {
-	data.byte(kManisoffscreen) = 1;
+	_manIsOffScreen = 1;
 	getRidOfAll();
 	loadFolder();
-	data.byte(kFolderpage) = 0;
+	_folderPage = 0;
 	showFolder();
 	workToScreenM();
-	data.byte(kGetback) = 0;
+	_getBack = 0;
 	do {
 		if (_quitRequested)
 			break;
@@ -208,8 +208,8 @@ void DreamBase::viewFolder() {
 		dumpPointer();
 		dumpTextLine();
 		checkFolderCoords();
-	} while (data.byte(kGetback) == 0);
-	data.byte(kManisoffscreen) = 0;
+	} while (_getBack == 0);
+	_manIsOffScreen = 0;
 	getRidOfTemp();
 	getRidOfTemp2();
 	getRidOfTemp3();
@@ -226,7 +226,7 @@ void DreamBase::edensCDPlayer() {
 	data.word(kEndwatchreel) = 42;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::hotelBell() {
@@ -244,33 +244,33 @@ void DreamBase::playGuitar() {
 void DreamBase::useElevator1() {
 	showFirstUse();
 	selectLocation();
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::useElevator2() {
 	showFirstUse();
 
 	if (data.byte(kLocation) == 23)	// In pool hall
-		data.byte(kNewlocation) = 31;
+		_newLocation = 31;
 	else
-		data.byte(kNewlocation) = 23;
+		_newLocation = 23;
 
 	data.byte(kCounttoclose) = 20;
 	data.byte(kCounttoopen) = 0;
 	data.word(kWatchingtime) = 80;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::useElevator3() {
 	showFirstUse();
 	data.byte(kCounttoclose) = 20;
-	data.byte(kNewlocation) = 34;
+	_newLocation = 34;
 	data.word(kReeltowatch) = 46;
 	data.word(kEndwatchreel) = 63;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
 	data.word(kWatchingtime) = 80;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::useElevator4() {
@@ -281,24 +281,24 @@ void DreamBase::useElevator4() {
 	data.byte(kSpeedcount) = 1;
 	data.byte(kCounttoclose) = 20;
 	data.word(kWatchingtime) = 80;
-	data.byte(kGetback) = 1;
-	data.byte(kNewlocation) = 24;
+	_getBack = 1;
+	_newLocation = 24;
 }
 
 void DreamBase::useElevator5() {
 	placeSetObject(4);
 	removeSetObject(0);
-	data.byte(kNewlocation) = 20;
+	_newLocation = 20;
 	data.word(kWatchingtime) = 80;
 	data.byte(kLiftflag) = 1;
 	data.byte(kCounttoclose) = 8;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::useHatch() {
 	showFirstUse();
-	data.byte(kNewlocation) = 40;
-	data.byte(kGetback) = 1;
+	_newLocation = 40;
+	_getBack = 1;
 }
 
 void DreamBase::wheelSound() {
@@ -311,22 +311,22 @@ void DreamBase::callHotelLift() {
 	playChannel1(12);
 	showFirstUse();
 	data.byte(kCounttoopen) = 8;
-	data.byte(kGetback) = 1;
-	data.byte(kDestination) = 5;
-	data.byte(kFinaldest) = 5;
+	_getBack = 1;
+	_destination = 5;
+	_finalDest = 5;
 	autoSetWalk();
 	turnPathOn(4);
 }
 
 void DreamBase::useShield() {
-	if (data.byte(kReallocation) != 20 || data.byte(kCombatcount) == 0) {
+	if (_realLocation != 20 || data.byte(kCombatcount) == 0) {
 		// Not in Sart room
 		showFirstUse();
 		putBackObStuff();
 	} else {
 		data.byte(kLastweapon) = 3;
 		showSecondUse();
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		data.byte(kProgresspoints)++;
 		removeObFromInv();
 	}
@@ -340,7 +340,7 @@ void DreamBase::useCoveredBox() {
 	data.word(kEndwatchreel) = 66;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::useRailing() {
@@ -350,7 +350,7 @@ void DreamBase::useRailing() {
 	data.word(kEndwatchreel) = 30;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 	data.byte(kMandead) = 4;
 }
 
@@ -362,7 +362,7 @@ void DreamBase::wearWatch() {
 	} else {
 		showFirstUse();
 		data.byte(kWatchon) = 1;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		uint8 dummy;
 		makeWorn((DynObject *)getAnyAd(&dummy, &dummy));
 	}
@@ -376,7 +376,7 @@ void DreamBase::wearShades() {
 	} else {
 		data.byte(kShadeson) = 1;
 		showFirstUse();
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		uint8 dummy;
 		makeWorn((DynObject *)getAnyAd(&dummy, &dummy));
 	}
@@ -384,7 +384,7 @@ void DreamBase::wearShades() {
 
 void DreamBase::useChurchHole() {
 	showFirstUse();
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 	data.word(kWatchingtime) = 28;
 	data.word(kReeltowatch) = 13;
 	data.word(kEndwatchreel) = 26;
@@ -406,14 +406,14 @@ void DreamBase::sitDownInBar() {
 		data.word(kEndofholdreel) = 83;
 		data.byte(kWatchspeed) = 1;
 		data.byte(kSpeedcount) = 1;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 	}
 }
 
 void DreamBase::useDryer() {
 	playChannel1(12);
 	showFirstUse();
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::useBalcony() {
@@ -426,30 +426,30 @@ void DreamBase::useBalcony() {
 	turnPathOff(4);
 	turnPathOff(5);
 	data.byte(kProgresspoints)++;
-	data.byte(kManspath) = 6;
-	data.byte(kDestination) = 6;
-	data.byte(kFinaldest) = 6;
+	_mansPath = 6;
+	_destination = 6;
+	_finalDest = 6;
 	findXYFromPath();
 	switchRyanOff();
-	data.byte(kResetmanxy) = 1;
+	_resetManXY = 1;
 	data.word(kWatchingtime) = 30 * 2;
 	data.word(kReeltowatch) = 183;
 	data.word(kEndwatchreel) = 212;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::useWindow() {
-	if (data.byte(kManspath) != 6) {
+	if (_mansPath != 6) {
 		// Not on balcony
 		showSecondUse();
 		putBackObStuff();
 	} else {
 		data.byte(kProgresspoints)++;
 		showFirstUse();
-		data.byte(kNewlocation) = 29;
-		data.byte(kGetback) = 1;
+		_newLocation = 29;
+		_getBack = 1;
 	}
 }
 
@@ -460,16 +460,16 @@ void DreamBase::trapDoor() {
 	data.word(kWatchingtime) = 20 * 2;
 	data.word(kReeltowatch) = 181;
 	data.word(kEndwatchreel) = 197;
-	data.byte(kNewlocation) = 26;
+	_newLocation = 26;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::callEdensLift() {
 	showFirstUse();
 	data.byte(kCounttoopen) = 8;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 	turnPathOn(2);
 }
 
@@ -481,62 +481,62 @@ void DreamBase::callEdensDLift() {
 	} else {
 		showFirstUse();
 		data.byte(kCounttoopen) = 8;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		turnPathOn(2);
 	}
 }
 
 void DreamBase::openYourNeighbour() {
 	enterCode(255, 255, 255, 255);
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::openRyan() {
 	enterCode(5, 1, 0, 6);
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::openPoolBoss() {
 	enterCode(5, 2, 2, 2);
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::openEden() {
 	enterCode(2, 8, 6, 5);
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::openSarters() {
 	enterCode(7, 8, 3, 3);
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::openLouis() {
 	enterCode(5, 2, 3, 8);
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 
 void DreamBase::useWall() {
 	showFirstUse();
 
-	if (data.byte(kManspath) != 3) {
+	if (_mansPath != 3) {
 		data.word(kWatchingtime) = 30*2;
 		data.word(kReeltowatch) = 2;
 		data.word(kEndwatchreel) = 31;
 		data.byte(kWatchspeed) = 1;
 		data.byte(kSpeedcount) = 1;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		turnPathOn(3);
 		turnPathOn(4);
 		turnPathOff(0);
 		turnPathOff(1);
 		turnPathOff(2);
 		turnPathOff(5);
-		data.byte(kManspath) = 3;
-		data.byte(kFinaldest) = 3;
+		_mansPath = 3;
+		_finalDest = 3;
 		findXYFromPath();
-		data.byte(kResetmanxy) = 1;
+		_resetManXY = 1;
 		switchRyanOff();
 	} else {
 		// Go back over
@@ -545,52 +545,52 @@ void DreamBase::useWall() {
 		data.word(kEndwatchreel) = 60;
 		data.byte(kWatchspeed) = 1;
 		data.byte(kSpeedcount) = 1;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		turnPathOff(3);
 		turnPathOff(4);
 		turnPathOn(0);
 		turnPathOn(1);
 		turnPathOn(2);
 		turnPathOn(5);
-		data.byte(kManspath) = 5;
-		data.byte(kFinaldest) = 5;
+		_mansPath = 5;
+		_finalDest = 5;
 		findXYFromPath();
-		data.byte(kResetmanxy) = 1;
+		_resetManXY = 1;
 		switchRyanOff();
 	}
 }
 
 void DreamBase::useLadder() {
 	showFirstUse();
-	data.byte(kMapx) = data.byte(kMapx) - 11;
+	_mapX = _mapX - 11;
 	findRoomInLoc();
-	data.byte(kFacing) = 6;
-	data.byte(kTurntoface) = 6;
-	data.byte(kManspath) = 0;
-	data.byte(kDestination) = 0;
-	data.byte(kFinaldest) = 0;
+	_facing = 6;
+	_turnToFace = 6;
+	_mansPath = 0;
+	_destination = 0;
+	_finalDest = 0;
 	findXYFromPath();
-	data.byte(kResetmanxy) = 1;
-	data.byte(kGetback) = 1;
+	_resetManXY = 1;
+	_getBack = 1;
 }
 
 void DreamBase::useLadderB() {
 	showFirstUse();
-	data.byte(kMapx) = data.byte(kMapx) + 11;
+	_mapX = _mapX + 11;
 	findRoomInLoc();
-	data.byte(kFacing) = 2;
-	data.byte(kTurntoface) = 2;
-	data.byte(kManspath) = 1;
-	data.byte(kDestination) = 1;
-	data.byte(kFinaldest) = 1;
+	_facing = 2;
+	_turnToFace = 2;
+	_mansPath = 1;
+	_destination = 1;
+	_finalDest = 1;
 	findXYFromPath();
-	data.byte(kResetmanxy) = 1;
-	data.byte(kGetback) = 1;
+	_resetManXY = 1;
+	_getBack = 1;
 }
 
 void DreamBase::slabDoorA() {
 	showFirstUse();
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
 	data.word(kReeltowatch) = 13;
@@ -604,7 +604,7 @@ void DreamBase::slabDoorA() {
 		data.byte(kProgresspoints)++;
 		data.word(kWatchingtime) = 60;
 		data.word(kEndwatchreel) = 42;
-		data.byte(kNewlocation) = 47;
+		_newLocation = 47;
 	}
 }
 
@@ -612,7 +612,7 @@ void DreamBase::slabDoorB() {
 	if (data.byte(kDreamnumber) != 1) {
 		// Wrong
 		showFirstUse();
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		data.byte(kWatchspeed) = 1;
 		data.byte(kSpeedcount) = 1;
 		data.word(kReeltowatch) = 44;
@@ -629,20 +629,20 @@ void DreamBase::slabDoorB() {
 			// Got crystal
 			showFirstUse();
 			data.byte(kProgresspoints)++;
-			data.byte(kGetback) = 1;
+			_getBack = 1;
 			data.byte(kWatchspeed) = 1;
 			data.byte(kSpeedcount) = 1;
 			data.word(kReeltowatch) = 44;
 			data.word(kWatchingtime) = 60;
 			data.word(kEndwatchreel) = 71;
-			data.byte(kNewlocation) = 47;
+			_newLocation = 47;
 		}
 	}
 }
 
 void DreamBase::slabDoorC() {
 	showFirstUse();
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
 	data.word(kReeltowatch) = 108;
@@ -656,13 +656,13 @@ void DreamBase::slabDoorC() {
 		data.byte(kProgresspoints)++;
 		data.word(kWatchingtime) = 60;
 		data.word(kEndwatchreel) = 135;
-		data.byte(kNewlocation) = 47;
+		_newLocation = 47;
 	}
 }
 
 void DreamBase::slabDoorD() {
 	showFirstUse();
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
 	data.word(kReeltowatch) = 75;
@@ -676,13 +676,13 @@ void DreamBase::slabDoorD() {
 		data.byte(kProgresspoints)++;
 		data.word(kWatchingtime) = 60;
 		data.word(kEndwatchreel) = 102;
-		data.byte(kNewlocation) = 47;
+		_newLocation = 47;
 	}
 }
 
 void DreamBase::slabDoorE() {
 	showFirstUse();
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
 	data.word(kReeltowatch) = 141;
@@ -696,13 +696,13 @@ void DreamBase::slabDoorE() {
 		data.byte(kProgresspoints)++;
 		data.word(kWatchingtime) = 60;
 		data.word(kEndwatchreel) = 168;
-		data.byte(kNewlocation) = 47;
+		_newLocation = 47;
 	}
 }
 
 void DreamBase::slabDoorF() {
 	showFirstUse();
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
 	data.word(kReeltowatch) = 171;
@@ -716,17 +716,17 @@ void DreamBase::slabDoorF() {
 		data.byte(kProgresspoints)++;
 		data.word(kWatchingtime) = 60;
 		data.word(kEndwatchreel) = 197;
-		data.byte(kNewlocation) = 47;
+		_newLocation = 47;
 	}
 }
 
 bool DreamBase::defaultUseHandler(const char *id) {
-	if (data.byte(kWithobject) == 255) {
+	if (_withObject == 255) {
 		withWhat();
 		return true;	// event handled
 	}
 
-	if (!compare(data.byte(kWithobject), data.byte(kWithtype), id)) {
+	if (!compare(_withObject, _withType, id)) {
 		// Wrong item
 		showPuzText(14, 300);
 		putBackObStuff();
@@ -747,7 +747,7 @@ void DreamBase::useChurchGate() {
 	data.word(kEndwatchreel) = 70;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 	data.byte(kProgresspoints)++;
 	turnPathOn(3);
 	if (data.byte(kAidedead) != 0)
@@ -756,78 +756,78 @@ void DreamBase::useChurchGate() {
 
 void DreamBase::useGun() {
 
-	if (data.byte(kObjecttype) != kExObjectType) {
+	if (_objectType != kExObjectType) {
 		// gun is not taken
 		showSecondUse();
 		putBackObStuff();
 
-	} else if (data.byte(kReallocation) == 22) {
+	} else if (_realLocation == 22) {
 		// in pool room
 		showPuzText(34, 300);
 		data.byte(kLastweapon) = 1;
 		data.byte(kCombatcount) = 39;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		data.byte(kProgresspoints)++;
 
-	} else if (data.byte(kReallocation) == 25) {
+	} else if (_realLocation == 25) {
 		// helicopter
 		showPuzText(34, 300);
 		data.byte(kLastweapon) = 1;
 		data.byte(kCombatcount) = 19;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		data.byte(kDreamnumber) = 2;
 		data.byte(kRoomafterdream) = 38;
 		data.byte(kSartaindead) = 1;
 		data.byte(kProgresspoints)++;
 
-	} else if (data.byte(kReallocation) == 27) {
+	} else if (_realLocation == 27) {
 		// in rock room
 		showPuzText(46, 300);
-		data.byte(kPointermode) = 2;
+		_pointerMode = 2;
 		data.byte(kRockstardead) = 1;
 		data.byte(kLastweapon) = 1;
 		data.byte(kNewsitem) = 1;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		data.byte(kRoomafterdream) = 32;
 		data.byte(kDreamnumber) = 0;
 		data.byte(kProgresspoints)++;
 
-	} else if (data.byte(kReallocation) == 8 && data.byte(kMapx) == 22 && data.byte(kMapy) == 40
-	    && !isSetObOnMap(92) && data.byte(kManspath) != 9) {
+	} else if (_realLocation == 8 && _mapX == 22 && _mapY == 40
+	    && !isSetObOnMap(92) && _mansPath != 9) {
 		// by studio
-		data.byte(kDestination) = 9;
-		data.byte(kFinaldest) = 9;
+		_destination = 9;
+		_finalDest = 9;
 		autoSetWalk();
 		data.byte(kLastweapon) = 1;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		data.byte(kProgresspoints)++;
 
-	} else if (data.byte(kReallocation) == 6 && data.byte(kMapx) == 11 && data.byte(kMapy) == 20
+	} else if (_realLocation == 6 && _mapX == 11 && _mapY == 20
 	    && isSetObOnMap(5)) {
 		// sarters
-		data.byte(kDestination) = 1;
-		data.byte(kFinaldest) = 1;
+		_destination = 1;
+		_finalDest = 1;
 		autoSetWalk();
 		removeSetObject(5);
 		placeSetObject(6);
-		turnAnyPathOn(1, data.byte(kRoomnum) - 1);
+		turnAnyPathOn(1, _roomNum - 1);
 		data.byte(kLiftflag) = 1;
 		data.word(kWatchingtime) = 40*2;
 		data.word(kReeltowatch) = 4;
 		data.word(kEndwatchreel) = 43;
 		data.byte(kWatchspeed) = 1;
 		data.byte(kSpeedcount) = 1;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		data.byte(kProgresspoints)++;
 
-	} else if (data.byte(kReallocation) == 29) {
+	} else if (_realLocation == 29) {
 		// aide
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		resetLocation(13);
 		setLocation(12);
-		data.byte(kDestpos) = 12;
-		data.byte(kDestination) = 2;
-		data.byte(kFinaldest) = 2;
+		_destPos = 12;
+		_destination = 2;
+		_finalDest = 2;
 		autoSetWalk();
 		data.word(kWatchingtime) = 164*2;
 		data.word(kReeltowatch) = 3;
@@ -839,25 +839,25 @@ void DreamBase::useGun() {
 		data.byte(kRoomafterdream) = 33;
 		data.byte(kProgresspoints)++;
 
-	} else if (data.byte(kReallocation) == 23 && data.byte(kMapx) == 0 && data.byte(kMapy) == 50) {
+	} else if (_realLocation == 23 && _mapX == 0 && _mapY == 50) {
 		// with boss
-		if (data.byte(kManspath) != 5) {
-			data.byte(kDestination) = 5;
-			data.byte(kFinaldest) = 5;
+		if (_mansPath != 5) {
+			_destination = 5;
+			_finalDest = 5;
 			autoSetWalk();
 		}
 		data.byte(kLastweapon) = 1;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 
-	} else if (data.byte(kReallocation) == 8 && data.byte(kMapx) == 11 && data.byte(kMapy) == 10) {
+	} else if (_realLocation == 8 && _mapX == 11 && _mapY == 10) {
 		// tv soldier
-		if (data.byte(kManspath) != 2) {
-			data.byte(kDestination) = 2;
-			data.byte(kFinaldest) = 2;
+		if (_mansPath != 2) {
+			_destination = 2;
+			_finalDest = 2;
 			autoSetWalk();
 		}
 		data.byte(kLastweapon) = 1;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 
 	} else {
 		showFirstUse();
@@ -867,20 +867,20 @@ void DreamBase::useGun() {
 
 void DreamBase::useFullCart() {
 	data.byte(kProgresspoints)++;
-	turnAnyPathOn(2, data.byte(kRoomnum) + 6);
-	data.byte(kManspath) = 4;
-	data.byte(kFacing) = 4;
-	data.byte(kTurntoface) = 4;
-	data.byte(kFinaldest) = 4;
+	turnAnyPathOn(2, _roomNum + 6);
+	_mansPath = 4;
+	_facing = 4;
+	_turnToFace = 4;
+	_finalDest = 4;
 	findXYFromPath();
-	data.byte(kResetmanxy) = 1;
+	_resetManXY = 1;
 	showFirstUse();
 	data.word(kWatchingtime) = 72 * 2;
 	data.word(kReeltowatch) = 58;
 	data.word(kEndwatchreel) = 142;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::useClearBox() {
@@ -895,7 +895,7 @@ void DreamBase::useClearBox() {
 	data.word(kEndwatchreel) = 105;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::openTVDoor() {
@@ -905,16 +905,16 @@ void DreamBase::openTVDoor() {
 	// Key on TV
 	showFirstUse();
 	data.byte(kLockstatus) = 0;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::usePlate() {
-	if (data.byte(kWithobject) == 255) {
+	if (_withObject == 255) {
 		withWhat();
 		return;
 	}
 
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), "SCRW")) {
+	if (compare(_withObject, _withType, "SCRW")) {
 		// Unscrew plate
 		playChannel1(20);
 		showFirstUse();
@@ -923,8 +923,8 @@ void DreamBase::usePlate() {
 		removeSetObject(25);
 		placeFreeObject(0);
 		data.byte(kProgresspoints)++;
-		data.byte(kGetback) = 1;
-	} else if (compare(data.byte(kWithobject), data.byte(kWithtype), "KNFE")) {
+		_getBack = 1;
+	} else if (compare(_withObject, _withType, "KNFE")) {
 		// Tried knife
 		showPuzText(54, 300);
 		putBackObStuff();
@@ -936,12 +936,12 @@ void DreamBase::usePlate() {
 }
 
 void DreamBase::usePlinth() {
-	if (data.byte(kWithobject) == 255) {
+	if (_withObject == 255) {
 		withWhat();
 		return;
 	}
 
-	if (!compare(data.byte(kWithobject), data.byte(kWithtype), "DKEY")) {
+	if (!compare(_withObject, _withType, "DKEY")) {
 		// Wrong key
 		showFirstUse();
 		putBackObStuff();
@@ -953,8 +953,8 @@ void DreamBase::usePlinth() {
 		data.word(kEndwatchreel) = 104;
 		data.byte(kWatchspeed) = 1;
 		data.byte(kSpeedcount) = 1;
-		data.byte(kGetback) = 1;
-		data.byte(kNewlocation) = data.byte(kRoomafterdream);
+		_getBack = 1;
+		_newLocation = data.byte(kRoomafterdream);
 	}
 }
 
@@ -970,21 +970,21 @@ void DreamBase::useElvDoor() {
 	data.word(kEndwatchreel) = 77;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::useObject() {
-	data.byte(kWithobject) = 255;
+	_withObject = 255;
 
-	if (data.byte(kCommandtype) != 229) {
-		data.byte(kCommandtype) = 229;
-		commandWithOb(51, data.byte(kObjecttype), data.byte(kCommand));
+	if (_commandType != 229) {
+		_commandType = 229;
+		commandWithOb(51, _objectType, _command);
 	}
 
-	if (data.word(kMousebutton) == data.word(kOldbutton))
+	if (_mouseButton == _oldButton)
 		return;	// nouse
 
-	if (data.word(kMousebutton) & 1)
+	if (_mouseButton & 1)
 		useRoutine();
 }
 
@@ -1002,13 +1002,13 @@ void DreamBase::useWinch() {
 	data.word(kEndwatchreel) = 217;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	data.byte(kDestpos) = 1;
-	data.byte(kNewlocation) = 45;
+	_destPos = 1;
+	_newLocation = 45;
 	data.byte(kDreamnumber) = 1;
 	data.byte(kRoomafterdream) = 44;
 	data.byte(kGeneraldead) = 1;
 	data.byte(kNewsitem) = 2;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 	data.byte(kProgresspoints)++;
 }
 
@@ -1016,14 +1016,14 @@ void DreamBase::useCart() {
 	if (defaultUseHandler("ROCK"))
 		return;
 
-	DynObject *exObject = getExAd(data.byte(kWithobject));
+	DynObject *exObject = getExAd(_withObject);
 	exObject->mapad[0] = 0;
-	removeSetObject(data.byte(kCommand));
-	placeSetObject(data.byte(kCommand) + 1);
+	removeSetObject(_command);
+	placeSetObject(_command + 1);
 	data.byte(kProgresspoints)++;
 	playChannel1(17);
 	showFirstUse();
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::useTrainer() {
@@ -1045,7 +1045,7 @@ void DreamBase::chewy() {
 	uint8 dummy;
 	DynObject *object = (DynObject *)getAnyAd(&dummy, &dummy);
 	object->mapad[0] = 255;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::useHole() {
@@ -1054,10 +1054,10 @@ void DreamBase::useHole() {
 
 	showFirstUse();
 	removeSetObject(86);
-	DynObject *exObject = getExAd(data.byte(kWithobject));
+	DynObject *exObject = getExAd(_withObject);
 	exObject->mapad[0] = 255;
 	data.byte(kCanmovealtar) = 1;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::openHotelDoor() {
@@ -1067,7 +1067,7 @@ void DreamBase::openHotelDoor() {
 	playChannel1(16);
 	showFirstUse();
 	data.byte(kLockstatus) = 0;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::openHotelDoor2() {
@@ -1099,7 +1099,7 @@ void DreamBase::usePoolReader() {
 		playChannel1(17);
 		showFirstUse();
 		data.byte(kCounttoopen) = 6;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 	}
 }
 
@@ -1121,7 +1121,7 @@ void DreamBase::useCardReader1() {
 		showPuzText(18, 300);
 		data.byte(kProgresspoints)++;
 		data.word(kCard1money) = 12432;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 	}
 }
 
@@ -1148,7 +1148,7 @@ void DreamBase::useCardReader2() {
 		data.byte(kGunpassflag) = 1;
 		data.word(kCard1money) -= 2000;
 		data.byte(kProgresspoints)++;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 	}
 }
 
@@ -1170,43 +1170,43 @@ void DreamBase::useCardReader3() {
 		data.byte(kProgresspoints)++;
 		data.word(kCard1money) -= 8300;
 		data.byte(kCardpassflag) = 1;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 	}
 }
 
 void DreamBase::useLighter() {
-	if (data.byte(kWithobject) == 255) {
+	if (_withObject == 255) {
 		withWhat();
 		return;
 	}
 
-	if (!compare(data.byte(kWithobject), data.byte(kWithtype), "SMKE")) {
+	if (!compare(_withObject, _withType, "SMKE")) {
 		showFirstUse();
 		putBackObStuff();
 	} else {
 		showPuzText(9, 300);
-		DynObject *withObj = getExAd(data.byte(kWithobject));
+		DynObject *withObj = getExAd(_withObject);
 		withObj->mapad[0] = 255;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 	}
 }
 
 void DreamBase::useWire() {
-	if (data.byte(kWithobject) == 255) {
+	if (_withObject == 255) {
 		withWhat();
 		return;
 	}
 
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), "KNFE")) {
+	if (compare(_withObject, _withType, "KNFE")) {
 		removeSetObject(51);
 		placeSetObject(52);
 		showPuzText(11, 300);
 		data.byte(kProgresspoints)++;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		return;
 	}
 
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), "AXED")) {
+	if (compare(_withObject, _withType, "AXED")) {
 		showPuzText(16, 300);
 		putBackObStuff();
 		return;
@@ -1224,11 +1224,11 @@ void DreamBase::openTomb() {
 	data.word(kEndwatchreel) = 33;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::hotelControl() {
-	if (data.byte(kReallocation) != 21 || data.byte(kMapx) != 33)
+	if (_realLocation != 21 || _mapX != 33)
 		showSecondUse();	// Not right control
 	else
 		showFirstUse();
@@ -1237,7 +1237,7 @@ void DreamBase::hotelControl() {
 }
 
 void DreamBase::useCooker() {
-	if (checkInside(data.byte(kCommand), data.byte(kObjecttype)) == kNumexobjects)
+	if (checkInside(_command, _objectType) == kNumexobjects)
 		showFirstUse();
 	else
 		showSecondUse();	// Food inside
@@ -1268,7 +1268,7 @@ void DreamBase::useDiary() {
 	showPointer();
 	workToScreen();
 	delPointer();
-	data.byte(kGetback) = 0;
+	_getBack = 0;
 
 	RectWithCallback<DreamBase> diaryList[] = {
 		{ kDiaryx+94,kDiaryx+110,kDiaryy+97,kDiaryy+113,&DreamBase::diaryKeyN },
@@ -1288,43 +1288,43 @@ void DreamBase::useDiary() {
 		dumpDiaryKeys();
 		dumpTextLine();
 		checkCoords(diaryList);
-	} while (!data.byte(kGetback) && !_quitRequested);
+	} while (!_getBack && !_quitRequested);
 
 
 	getRidOfTemp();
 	getRidOfTempText();
 	getRidOfTempCharset();
 	restoreReels();
-	data.byte(kManisoffscreen) = 0;
+	_manIsOffScreen = 0;
 	redrawMainScrn();
 	workToScreenM();
 }
 
 void DreamBase::useControl() {
-	if (data.byte(kWithobject) == 255) {
+	if (_withObject == 255) {
 		withWhat();
 		return;
 	}
 
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), "KEYA")) {	// Right key
+	if (compare(_withObject, _withType, "KEYA")) {	// Right key
 		playChannel1(16);
 		if (data.byte(kLocation) == 21) {	// Going down
 			showPuzText(3, 300);
-			data.byte(kNewlocation) = 30;
+			_newLocation = 30;
 		} else {
 			showPuzText(0, 300);
-			data.byte(kNewlocation) = 21;
+			_newLocation = 21;
 		}
 
 		data.byte(kCounttoclose) = 8;
 		data.byte(kCounttoopen) = 0;
 		data.word(kWatchingtime) = 80;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		return;
 	}
 
-	if (data.byte(kReallocation) == 21) {
-		if (compare(data.byte(kWithobject), data.byte(kWithtype), "KNFE")) {
+	if (_realLocation == 21) {
+		if (compare(_withObject, _withType, "KNFE")) {
 			// Jimmy controls
 			placeSetObject(50);
 			placeSetObject(51);
@@ -1335,8 +1335,8 @@ void DreamBase::useControl() {
 			playChannel1(14);
 			showPuzText(10, 300);
 			data.byte(kProgresspoints)++;
-			data.byte(kGetback) = 1;
-		} else if (compare(data.byte(kWithobject), data.byte(kWithtype), "AXED")) {
+			_getBack = 1;
+		} else if (compare(_withObject, _withType, "AXED")) {
 			// Axe on controls
 			showPuzText(16, 300);
 			data.byte(kProgresspoints)++;
@@ -1354,23 +1354,23 @@ void DreamBase::useControl() {
 }
 
 void DreamBase::useSlab() {
-	if (data.byte(kWithobject) == 255) {
+	if (_withObject == 255) {
 		withWhat();
 		return;
 	}
 
-	if (!compare(data.byte(kWithobject), data.byte(kWithtype), "JEWL")) {
+	if (!compare(_withObject, _withType, "JEWL")) {
 		showPuzText(14, 300);
 		putBackObStuff();
 		return;
 	}
 
-	DynObject *exObject = getExAd(data.byte(kWithobject));
+	DynObject *exObject = getExAd(_withObject);
 	exObject->mapad[0] = 0;
 
-	removeSetObject(data.byte(kCommand));
-	placeSetObject(data.byte(kCommand) + 1);
-	if (data.byte(kCommand) + 1 == 54) {
+	removeSetObject(_command);
+	placeSetObject(_command + 1);
+	if (_command + 1 == 54) {
 		// Last slab
 		turnPathOn(0);
 		data.word(kWatchingtime) = 22;
@@ -1382,23 +1382,23 @@ void DreamBase::useSlab() {
 
 	data.byte(kProgresspoints)++;
 	showFirstUse();
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::usePipe() {
-	if (data.byte(kWithobject) == 255) {
+	if (_withObject == 255) {
 		withWhat();
 		return;
 	}
 
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), "CUPE")) {
+	if (compare(_withObject, _withType, "CUPE")) {
 		// Fill cup
 		showPuzText(36, 300);
 		putBackObStuff();
-		DynObject *exObject = getExAd(data.byte(kWithobject));
+		DynObject *exObject = getExAd(_withObject);
 		exObject->id[3] = 'F'-'A';	// CUPE (empty cup) -> CUPF (full cup)
 		return;
-	} else if (compare(data.byte(kWithobject), data.byte(kWithtype), "CUPF")) {
+	} else if (compare(_withObject, _withType, "CUPF")) {
 		// Already full
 		showPuzText(35, 300);
 		putBackObStuff();
@@ -1409,16 +1409,16 @@ void DreamBase::usePipe() {
 }
 
 void DreamBase::useOpenBox() {
-	if (data.byte(kWithobject) == 255) {
+	if (_withObject == 255) {
 		withWhat();
 		return;
 	}
 
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), "CUPF")) {
+	if (compare(_withObject, _withType, "CUPF")) {
 		// Destroy open box
 		data.byte(kProgresspoints)++;
 		showPuzText(37, 300);
-		DynObject *exObject = getExAd(data.byte(kWithobject));
+		DynObject *exObject = getExAd(_withObject);
 		exObject->id[3] = 'E'-'A';	// CUPF (full cup) -> CUPE (empty cup)
 		data.word(kWatchingtime) = 140;
 		data.word(kReeltowatch) = 105;
@@ -1426,11 +1426,11 @@ void DreamBase::useOpenBox() {
 		data.byte(kWatchspeed) = 1;
 		data.byte(kSpeedcount) = 1;
 		turnPathOn(4);
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		return;
 	}
 
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), "CUPE")) {
+	if (compare(_withObject, _withType, "CUPE")) {
 		// Open box wrong
 		showPuzText(38, 300);
 		putBackObStuff();
@@ -1441,14 +1441,14 @@ void DreamBase::useOpenBox() {
 }
 
 void DreamBase::runTap() {
-	if (data.byte(kWithobject) == 255) {
+	if (_withObject == 255) {
 		withWhat();
 		return;
 	}
 
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), "CUPE")) {
+	if (compare(_withObject, _withType, "CUPE")) {
 		// Fill cup from tap
-		DynObject *exObject = getExAd(data.byte(kWithobject));
+		DynObject *exObject = getExAd(_withObject);
 		exObject->id[3] = 'F'-'A';	// CUPE (empty cup) -> CUPF (full cup)
 		playChannel1(8);
 		showPuzText(57, 300);
@@ -1456,7 +1456,7 @@ void DreamBase::runTap() {
 		return;
 	}
 
-	if (compare(data.byte(kWithobject), data.byte(kWithtype), "CUPF")) {
+	if (compare(_withObject, _withType, "CUPF")) {
 		// Cup from tap full
 		showPuzText(58, 300);
 		putBackObStuff();
@@ -1468,13 +1468,13 @@ void DreamBase::runTap() {
 }
 
 void DreamBase::useAxe() {
-	if (data.byte(kReallocation) != 22) {
+	if (_realLocation != 22) {
 		// Not in pool
 		showFirstUse();
 		return;
 	}
 
-	if (data.byte(kMapy) == 10) {
+	if (_mapY == 10) {
 		// Axe on door
 		showPuzText(15, 300);
 		data.byte(kProgresspoints)++;
@@ -1483,14 +1483,14 @@ void DreamBase::useAxe() {
 		data.word(kEndwatchreel) = 77;
 		data.byte(kWatchspeed) = 1;
 		data.byte(kSpeedcount) = 1;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		return;
 	}
 
 	showSecondUse();
 	data.byte(kProgresspoints)++;
 	data.byte(kLastweapon) = 2;
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 	removeObFromInv();
 }
 
@@ -1502,17 +1502,17 @@ void DreamBase::useHandle() {
 	} else {
 		// Wire has been cut
 		showPuzText(13, 300);
-		data.byte(kNewlocation) = 22;
+		_newLocation = 22;
 	}
 
-	data.byte(kGetback) = 1;
+	_getBack = 1;
 }
 
 void DreamBase::useAltar() {
 	if (findExObject("CNDA") == 114 || findExObject("CNDB") == 114) {
 		// Things on altar
 		showFirstUse();
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		return;
 	}
 
@@ -1526,10 +1526,10 @@ void DreamBase::useAltar() {
 		data.byte(kWatchspeed) = 1;
 		data.byte(kSpeedcount) = 1;
 		DreamBase::setupTimedUse(47, 32, 98, 52, 76);
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 	} else {
 		showPuzText(23, 300);
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 	}
 }
 
@@ -1541,19 +1541,19 @@ void DreamBase::withWhat() {
 	showMan();
 	showExit();
 
-	copyName(data.byte(kObjecttype), data.byte(kCommand), commandLine);
+	copyName(_objectType, _command, commandLine);
 	printMessage2(100, 21, 63, 200, false, 2);
-	uint16 x = data.word(kLastxpos) + 5;
+	uint16 x = _lastXPos + 5;
 	printDirect(commandLine, x, 21, 220, false);
-	printMessage2(data.word(kLastxpos) + 5, 21, 63, 200, false, 3);
+	printMessage2(_lastXPos + 5, 21, 63, 200, false, 3);
 
 	fillRyan();
-	data.byte(kCommandtype) = 255;
+	_commandType = 255;
 	readMouse();
 	showPointer();
 	workToScreen();
 	delPointer();
-	data.byte(kInvopen) = 2;
+	_invOpen = 2;
 }
 
 void DreamBase::notHeldError() {
@@ -1584,12 +1584,12 @@ void DreamBase::useCashCard() {
 	printDirect(&obText, 36, &y, 36, 36 & 1);
 	char amountStr[10];
 	sprintf(amountStr, "%04d", data.word(kCard1money) / 10);
-	data.word(kCharshift) = 91 * 2 + 75;
+	_charShift = 91 * 2 + 75;
 	printDirect((const uint8 *)amountStr, 160, 155, 240, 240 & 1);
 	sprintf(amountStr, "%02d", (data.word(kCard1money) % 10) * 10);
-	data.word(kCharshift) = 91 * 2 + 85;
+	_charShift = 91 * 2 + 85;
 	printDirect((const uint8 *)amountStr, 187, 155, 240, 240 & 1);
-	data.word(kCharshift) = 0;
+	_charShift = 0;
 	workToScreenM();
 	hangOnP(400);
 	getRidOfTemp();
@@ -1604,7 +1604,7 @@ void DreamBase::useStereo() {
 	if (data.byte(kLocation) != 0) {
 		showPuzText(4, 400);
 		putBackObStuff();
-	} else if (data.byte(kMapx) != 11) {
+	} else if (_mapX != 11) {
 		showPuzText(5, 400);
 		putBackObStuff();
 	} else if (checkInside(findSetObject("CDPL"), 1) == kNumexobjects) {
@@ -1653,7 +1653,7 @@ void DreamBase::showPuzText(uint16 command, uint16 count) {
 void DreamBase::useButtonA() {
 	if (!isSetObOnMap(95)) {
 		showFirstUse();
-		turnAnyPathOn(0, data.byte(kRoomnum) - 1);
+		turnAnyPathOn(0, _roomNum - 1);
 		removeSetObject(9);
 		placeSetObject(95);
 		data.word(kWatchingtime) = 15 * 2;
@@ -1661,7 +1661,7 @@ void DreamBase::useButtonA() {
 		data.word(kEndwatchreel) = 85;
 		data.byte(kWatchspeed) = 1;
 		data.byte(kSpeedcount) = 1;
-		data.byte(kGetback) = 1;
+		_getBack = 1;
 		data.byte(kProgresspoints)++;
 	} else {
 		// Done this bit
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index 3833050003..8359518f61 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -67,21 +67,21 @@ void DreamBase::fadeDOS() {
 }
 
 void DreamBase::doFade() {
-	if (data.byte(kFadedirection) == 0)
+	if (_fadeDirection == 0)
 		return;
 
 	engine->processEvents();
-	uint8 *src = _startPal + 3 * data.byte(kColourpos);
-	engine->setPalette(src, data.byte(kColourpos), data.byte(kNumtofade));
+	uint8 *src = _startPal + 3 * _colourPos;
+	engine->setPalette(src, _colourPos, _numToFade);
 
-	data.byte(kColourpos) += data.byte(kNumtofade);
-	if (data.byte(kColourpos) == 0)
+	_colourPos += _numToFade;
+	if (_colourPos == 0)
 		fadeCalculation();
 }
 
 void DreamBase::fadeCalculation() {
-	if (data.byte(kFadecount) == 0) {
-		data.byte(kFadedirection) = 0;
+	if (_fadeCount == 0) {
+		_fadeDirection = 0;
 		return;
 	}
 
@@ -95,21 +95,21 @@ void DreamBase::fadeCalculation() {
 		else if (s > e)
 			--startPal[i];
 		else {
-			if (data.byte(kFadecount) <= e)
+			if (_fadeCount <= e)
 				++startPal[i];
 		}
 	}
-	--data.byte(kFadecount);
+	--_fadeCount;
 }
 
 void DreamBase::fadeUpYellows() {
 	palToEndPal();
 	memset(_endPal + 231 * 3, 0, 8 * 3);
 	memset(_endPal + 246 * 3, 0, 1 * 3);
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 63;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 128;
+	_fadeDirection = 1;
+	_fadeCount = 63;
+	_colourPos = 0;
+	_numToFade = 128;
 	hangOn(128);
 }
 
@@ -118,10 +118,10 @@ void DreamBase::fadeUpMonFirst() {
 	palToEndPal();
 	memset(_startPal + 231 * 3, 0, 8 * 3);
 	memset(_startPal + 246 * 3, 0, 1 * 3);
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 63;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 128;
+	_fadeDirection = 1;
+	_fadeCount = 63;
+	_colourPos = 0;
+	_numToFade = 128;
 	hangOn(64);
 	playChannel1(26);
 	hangOn(64);
@@ -133,10 +133,10 @@ void DreamBase::fadeDownMon() {
 	palToEndPal();
 	memset(_endPal + 231 * 3, 0, 8 * 3);
 	memset(_endPal + 246 * 3, 0, 1 * 3);
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 63;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 128;
+	_fadeDirection = 1;
+	_fadeCount = 63;
+	_colourPos = 0;
+	_numToFade = 128;
 	hangOn(64);
 }
 
@@ -145,10 +145,10 @@ void DreamBase::fadeUpMon() {
 	palToEndPal();
 	memset(_startPal + 231 * 3, 0, 8 * 3);
 	memset(_startPal + 246 * 3, 0, 1 * 3);
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 63;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 128;
+	_fadeDirection = 1;
+	_fadeCount = 63;
+	_colourPos = 0;
+	_numToFade = 128;
 	hangOn(128);
 }
 
@@ -163,46 +163,46 @@ void DreamBase::initialMonCols() {
 void DreamBase::fadeScreenUp() {
 	clearStartPal();
 	palToEndPal();
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 63;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 128;
+	_fadeDirection = 1;
+	_fadeCount = 63;
+	_colourPos = 0;
+	_numToFade = 128;
 }
 
 void DreamBase::fadeScreenUps() {
 	clearStartPal();
 	palToEndPal();
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 63;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 64;
+	_fadeDirection = 1;
+	_fadeCount = 63;
+	_colourPos = 0;
+	_numToFade = 64;
 }
 
 void DreamBase::fadeScreenUpHalf() {
 	endPalToStart();
 	palToEndPal();
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 31;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 32;
+	_fadeDirection = 1;
+	_fadeCount = 31;
+	_colourPos = 0;
+	_numToFade = 32;
 }
 
 void DreamBase::fadeScreenDown() {
 	palToStartPal();
 	clearEndPal();
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 63;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 128;
+	_fadeDirection = 1;
+	_fadeCount = 63;
+	_colourPos = 0;
+	_numToFade = 128;
 }
 
 void DreamBase::fadeScreenDowns() {
 	palToStartPal();
 	clearEndPal();
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 63;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 64;
+	_fadeDirection = 1;
+	_fadeCount = 63;
+	_colourPos = 0;
+	_numToFade = 64;
 }
 
 void DreamBase::fadeScreenDownHalf() {
@@ -219,15 +219,15 @@ void DreamBase::fadeScreenDownHalf() {
 	memcpy(endPal + (56*3), startPal + (56*3), 3*5);
 	memcpy(endPal + (77*3), startPal + (77*3), 3*2);
 
-	data.byte(kFadedirection) = 1;
-	data.byte(kFadecount) = 31;
-	data.byte(kColourpos) = 0;
-	data.byte(kNumtofade) = 32;
+	_fadeDirection = 1;
+	_fadeCount = 31;
+	_colourPos = 0;
+	_numToFade = 32;
 }
 
 
 void DreamBase::clearPalette() {
-	data.byte(kFadedirection) = 0;
+	_fadeDirection = 0;
 	clearStartPal();
 	dumpCurrent();
 }
@@ -247,17 +247,17 @@ void DreamBase::greyscaleSum() {
 
 		tmp = grey;
 		//if (tmp != 0)	// FIXME: The assembler code has this check commented out. Bug or feature?
-			tmp += data.byte(kAddtored);
+			tmp += _addToRed;
 		*dst++ = tmp;
 
 		tmp = grey;
 		if (tmp != 0)
-			tmp += data.byte(kAddtogreen);
+			tmp += _addToGreen;
 		*dst++ = tmp;
 
 		tmp = grey;
 		if (tmp != 0)
-			tmp += data.byte(kAddtoblue);
+			tmp += _addToBlue;
 		*dst++ = tmp;
 	}
 }
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 5096db8a00..ad5fd34d58 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -287,7 +287,7 @@ void DreamBase::showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 e
 			*/
 		}
 		if (effectsFlag & 8) { // printList
-			//addToPrintList(x - data.word(kMapadx), y - data.word(kMapady)); // NB: Commented in the original asm
+			//addToPrintList(x - _mapAdX, y - _mapAdY); // NB: Commented in the original asm
 		}
 		if (effectsFlag & 4) { // flippedX
 			frameOutFx(workspace(), pSrc, 320, width, height, x, y);
@@ -337,11 +337,11 @@ void DreamBase::zoom() {
 		return;
 	if (data.byte(kZoomon) != 1)
 		return;
-	if (data.byte(kCommandtype) >= 199) {
+	if (_commandType >= 199) {
 		putUnderZoom();
 		return;
 	}
-	uint16 srcOffset = (data.word(kOldpointery) - 9) * 320 + (data.word(kOldpointerx) - 11);
+	uint16 srcOffset = (_oldPointerY - 9) * 320 + (_oldPointerX - 11);
 	uint16 dstOffset = (kZoomy + 4) * 320 + (kZoomx + 5);
 	const uint8 *src = workspace() + srcOffset;
 	uint8 *dst = workspace() + dstOffset;
@@ -357,19 +357,19 @@ void DreamBase::zoom() {
 		dst += 320*2;
 	}
 	crosshair();
-	data.byte(kDidzoom) = 1;
+	_didZoom = 1;
 }
 
 void DreamBase::panelToMap() {
-	multiGet(_mapStore, data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
+	multiGet(_mapStore, _mapXStart + _mapAdX, _mapYStart + _mapAdY, _mapXSize, _mapYSize);
 }
 
 void DreamBase::mapToPanel() {
-	multiPut(_mapStore, data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
+	multiPut(_mapStore, _mapXStart + _mapAdX, _mapYStart + _mapAdY, _mapXSize, _mapYSize);
 }
 
 void DreamBase::dumpMap() {
-	multiDump(data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
+	multiDump(_mapXStart + _mapAdX, _mapYStart + _mapAdY, _mapXSize, _mapYSize);
 }
 
 bool DreamBase::pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y) {
@@ -392,7 +392,7 @@ void DreamBase::loadPalFromIFF() {
 	uint8 *dst = _mainPal;
 	for (size_t i = 0; i < 256*3; ++i) {
 		uint8 c = src[i] / 4;
-		if (data.byte(kBrightness) == 1) {
+		if (_brightness == 1) {
 			if (c) {
 				c = c + c / 2 + c / 4;
 				if (c > 63)
-- 
cgit v1.2.3


From 1ff19e19e760fa610150b1a5b68011f9833580ce Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Wed, 28 Dec 2011 02:49:27 +0000
Subject: DREAMWEB: Move checkCoords templated implementation to Dreambase
 header.

The PSP (MIPS) toolchain generates differing symbols for this template
and thus fails to link. By moving the implementation to the defining
header, this should fix this.
---
 engines/dreamweb/dreambase.h | 16 +++++++++++++++-
 engines/dreamweb/stubs.cpp   | 14 --------------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 9d59c3fc6f..671664c05b 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -778,7 +778,21 @@ public:
 	void setAllChanges();
 	void restoreAll();
 	void redrawMainScrn();
-	template <class T> void checkCoords(const RectWithCallback<T> *rectWithCallbacks);
+
+	template <class T>
+	void checkCoords(const RectWithCallback<T> *rectWithCallbacks) {
+		if (_newLocation != 0xff)
+			return;
+
+		const RectWithCallback<T> *r;
+		for (r = rectWithCallbacks; r->_xMin != 0xffff; ++r) {
+			if (r->contains(_mouseX, _mouseY)) {
+				(((T *)this)->*(r->_callback))();
+				return;
+			}
+		}
+	}
+
 	void newGame();
 	void deleteTaken();
 	void autoAppear();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 10f8ea18cc..6eaf8fb23a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1527,20 +1527,6 @@ void DreamBase::dumpPointer() {
 		multiDump(_oldPointerX, _oldPointerY, _pointerXS, _pointerYS);
 }
 
-template <class T>
-void DreamBase::checkCoords(const RectWithCallback<T> *rectWithCallbacks) {
-	if (_newLocation != 0xff)
-		return;
-
-	const RectWithCallback<T> *r;
-	for (r = rectWithCallbacks; r->_xMin != 0xffff; ++r) {
-		if (r->contains(_mouseX, _mouseY)) {
-			(((T *)this)->*(r->_callback))();
-			return;
-		}
-	}
-}
-
 void DreamBase::showPointer() {
 	showBlink();
 	uint16 x = _mouseX;
-- 
cgit v1.2.3


From 1d4337ebb5ca48ea031641533225d0e0b286d8c6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 05:27:16 +0200
Subject: DREAMWEB: Remove some unused globals

---
 engines/dreamweb/dreamgen.h | 15 ---------------
 engines/dreamweb/keypad.cpp |  3 +++
 2 files changed, 3 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index e47c44a83a..e27fc111c1 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -109,36 +109,22 @@ static const uint16 kIntextdat = (0);
 static const uint16 kFreetextdat = (0);
 static const uint16 kFrframedata = (0);
 static const uint16 kSettext = (0+(130*2));
-static const uint16 kReellist = (0+(36*144));
-static const uint16 kIntext = (0+(38*2));
-static const uint16 kLengthofmap = (0+(66*60));
 static const uint16 kFreetext = (0+(82*2));
-static const uint16 kBlocktext = (0+(98*2));
-static const uint16 kBlocks = (0+192);
-static const uint16 kFrframes = (0+2080);
 static const uint16 kExframes = (0+2080);
-static const uint16 kFrames = (0+2080);
 static const uint16 kExdata = (0+2080+30000);
 static const uint16 kExtextdat = (0+2080+30000+(16*114));
 static const uint16 kExtext = (0+2080+30000+(16*114)+((114+2)*2));
 static const uint16 kLengthofextra = (0+2080+30000+(16*114)+((114+2)*2)+18000);
-static const uint16 kPersontxtdat = (0+24);
-static const uint16 kPersontext = (0+24+(1026*2));
 static const uint16 kForeign = (1);
 static const uint16 kCd = (1);
 static const uint16 kNumexobjects = (114);
-static const uint16 kUndertextsizey = (13);
 static const uint16 kZoomy = (132);
 static const uint16 kFreedatlen = (16*80);
 static const uint16 kExtextlen = (18000);
-static const uint16 kLenofmapstore = (22*8*20*8);
-static const uint16 kUndertextsizex = (228);
 static const uint16 kNumchanges = (250);
 static const uint16 kUndertimedysize = (30);
 static const uint16 kExframeslen = (30000);
-static const uint16 kTablesize = (32);
 static const uint16 kScreenwidth = (320);
-static const uint16 kKeypadx = (36+112);
 static const uint16 kItempicsize = (44);
 static const uint16 kDiaryy = (48+12);
 static const uint16 kOpsy = (52);
@@ -154,7 +140,6 @@ static const uint16 kTextstart = (66*2);
 static const uint16 kMaplen = (66*60);
 static const uint16 kDiaryx = (68+24);
 static const uint16 kLengthofvars = (68-0);
-static const uint16 kKeypady = (72);
 static const uint16 kZoomx = (8);
 static const uint16 kInventx = (80);
 static const uint16 kMenux = (80+40);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 5ef6ba70d4..34f33ae128 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -24,6 +24,9 @@
 
 namespace DreamGen {
 
+const uint16 kKeypadx = 36+112;
+const uint16 kKeypady = 72;
+
 void DreamBase::getUnderMenu() {
 	multiGet(_underTimedText, kMenux, kMenuy, 48, 48);
 }
-- 
cgit v1.2.3


From ed72efe05bab195fcc9f637018c7b73316fb1a58 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 05:47:09 +0200
Subject: DREAMWEB: Remove more global variables

---
 engines/dreamweb/dreamgen.h | 9 +--------
 engines/dreamweb/object.cpp | 3 +++
 engines/dreamweb/sprite.cpp | 3 ++-
 engines/dreamweb/stubs.cpp  | 4 ++++
 4 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index e27fc111c1..7d8e2ea63b 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -99,17 +99,15 @@ static const uint16 kSettextdat = (0);
 static const uint16 kTextunder = (0);
 static const uint16 kSpanish = (0);
 static const uint16 kRecording = (0);
+static const uint16 kExframedata = (0);
 static const uint16 kGerman = (0);
 static const uint16 kPathdata = (0);
 static const uint16 kDemo = (0);
 static const uint16 kFramedata = (0);
 static const uint16 kFlags = (0);
-static const uint16 kExframedata = (0);
 static const uint16 kIntextdat = (0);
 static const uint16 kFreetextdat = (0);
 static const uint16 kFrframedata = (0);
-static const uint16 kSettext = (0+(130*2));
-static const uint16 kFreetext = (0+(82*2));
 static const uint16 kExframes = (0+2080);
 static const uint16 kExdata = (0+2080+30000);
 static const uint16 kExtextdat = (0+2080+30000+(16*114));
@@ -122,7 +120,6 @@ static const uint16 kZoomy = (132);
 static const uint16 kFreedatlen = (16*80);
 static const uint16 kExtextlen = (18000);
 static const uint16 kNumchanges = (250);
-static const uint16 kUndertimedysize = (30);
 static const uint16 kExframeslen = (30000);
 static const uint16 kScreenwidth = (320);
 static const uint16 kItempicsize = (44);
@@ -132,12 +129,8 @@ static const uint16 kSymboly = (56);
 static const uint16 kInventy = (58);
 static const uint16 kMenuy = (60);
 static const uint16 kOpsx = (60);
-static const uint16 kMaplength = (60);
 static const uint16 kSymbolx = (64);
-static const uint16 kSetdatlen = (64*128);
 static const uint16 kMapwidth = (66);
-static const uint16 kTextstart = (66*2);
-static const uint16 kMaplen = (66*60);
 static const uint16 kDiaryx = (68+24);
 static const uint16 kLengthofvars = (68-0);
 static const uint16 kZoomx = (8);
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 57e9c9c10e..7dc605c032 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -585,6 +585,9 @@ void DreamBase::purgeALocation(uint8 index) {
 }
 
 const uint8 *DreamBase::getObTextStart() {
+	const uint16 kSettext = 130*2;
+	const uint16 kFreetext = 82*2;
+
 	const uint8 *textBase;
 	const uint8 *text;
 	uint16 textOff;
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 096333f4b6..d5617dabc2 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -1092,8 +1092,9 @@ void DreamBase::soundOnReels(uint16 reelPointer) {
 }
 
 void DreamBase::clearBeforeLoad() {
+	const uint16 kMaplen = 66*60;
 	if (_roomLoaded != 1)
-		return /* (noclear) */;
+		return; // noclear
 
 	clearReels();
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 6eaf8fb23a..edd41beb3a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -960,6 +960,7 @@ void DreamBase::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8
 }
 
 void DreamBase::dumpTimedText() {
+	const uint16 kUndertimedysize = 30;
 	if (_needToDumpTimed != 1)
 		return;
 	uint8 y = _timedY;
@@ -1888,6 +1889,7 @@ void DreamBase::zoomOnOff() {
 }
 
 void DreamBase::sortOutMap() {
+	const uint16 kMaplength = 60;
 	const uint8 *src = workspace();
 	uint8 *dst = _mapData;
 	for (uint16 y = 0; y < kMaplength; ++y) {
@@ -2148,6 +2150,8 @@ void DreamBase::getRidOfAll() {
 
 // if skipDat, skip clearing and loading Setdat and Freedat
 void DreamBase::loadRoomData(const Room &room, bool skipDat) {
+	const uint16 kSetdatlen = 64*128;
+
 	engine->openFile(room.name);
 
 	FileHeader header;
-- 
cgit v1.2.3


From 826769f8b8937f6d78c213d477a2a1b84be48b6a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 28 Dec 2011 07:52:12 +0100
Subject: TSAGE: R2R - Fix a bug in scene 3700

---
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 4c749a9166..a42bbcb08c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -2009,6 +2009,7 @@ void Scene3700::signal() {
 			_sceneMode = 3328;
 			_stripManager.start(3328, this);
 		}
+		break;
 	case 3701:
 		R2_GLOBALS._sceneManager.changeScene(1000);
 		break;
-- 
cgit v1.2.3


From fe98fbe972b4d1a2942bdc8a784f8205ba32fbdd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 11:37:46 +0200
Subject: DREAMWEB: Move all zoom-related functions to vgagrafx.cpp, and remove
 a lot of unused global constants

---
 engines/dreamweb/backdrop.cpp |  4 ++--
 engines/dreamweb/dreamgen.h   | 13 -------------
 engines/dreamweb/stubs.cpp    | 29 -----------------------------
 engines/dreamweb/vgagrafx.cpp | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 34 insertions(+), 44 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index e5c2f30abd..2a17a7a1cf 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -26,7 +26,7 @@ namespace DreamGen {
 
 void DreamBase::doBlocks() {
 	uint16 dstOffset = _mapAdY * 320 + _mapAdX;
-	uint16 mapOffset = kMap + _mapY * kMapwidth + _mapX;
+	uint16 mapOffset = _mapY * kMapwidth + _mapX;
 	const uint8 *mapData = _mapData + mapOffset;
 	uint8 *dstBuffer = workspace() + dstOffset;
 
@@ -236,7 +236,7 @@ void DreamBase::showAllFree() {
 
 void DreamBase::drawFlags() {
 	MapFlag *mapFlag = _mapFlags;
-	uint16 mapOffset = kMap + _mapY * kMapwidth + _mapX;
+	uint16 mapOffset = _mapY * kMapwidth + _mapX;
 	const uint8 *mapData = _mapData + mapOffset;
 
 	for (size_t i = 0; i < 10; ++i) {
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7d8e2ea63b..bee03f993f 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -89,25 +89,14 @@ static const uint16 kLastweapon = 64;
 static const uint16 kDreamnumber = 65;
 static const uint16 kRoomafterdream = 66;
 static const uint16 kShakecounter = 67;
-static const uint16 kBlocktextdat = (0);
-static const uint16 kPersonframes = (0);
 static const uint16 kDebuglevel1 = (0);
 static const uint16 kDebuglevel2 = (0);
 static const uint16 kPlayback = (0);
-static const uint16 kMap = (0);
-static const uint16 kSettextdat = (0);
-static const uint16 kTextunder = (0);
 static const uint16 kSpanish = (0);
 static const uint16 kRecording = (0);
 static const uint16 kExframedata = (0);
 static const uint16 kGerman = (0);
-static const uint16 kPathdata = (0);
 static const uint16 kDemo = (0);
-static const uint16 kFramedata = (0);
-static const uint16 kFlags = (0);
-static const uint16 kIntextdat = (0);
-static const uint16 kFreetextdat = (0);
-static const uint16 kFrframedata = (0);
 static const uint16 kExframes = (0+2080);
 static const uint16 kExdata = (0+2080+30000);
 static const uint16 kExtextdat = (0+2080+30000+(16*114));
@@ -116,7 +105,6 @@ static const uint16 kLengthofextra = (0+2080+30000+(16*114)+((114+2)*2)+18000);
 static const uint16 kForeign = (1);
 static const uint16 kCd = (1);
 static const uint16 kNumexobjects = (114);
-static const uint16 kZoomy = (132);
 static const uint16 kFreedatlen = (16*80);
 static const uint16 kExtextlen = (18000);
 static const uint16 kNumchanges = (250);
@@ -133,7 +121,6 @@ static const uint16 kSymbolx = (64);
 static const uint16 kMapwidth = (66);
 static const uint16 kDiaryx = (68+24);
 static const uint16 kLengthofvars = (68-0);
-static const uint16 kZoomx = (8);
 static const uint16 kInventx = (80);
 static const uint16 kMenux = (80+40);
 static const uint16 kHeaderlen = (96);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index edd41beb3a..dfc39f8667 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1136,16 +1136,6 @@ void DreamBase::plotReel(uint16 &reelPointer) {
 	soundOnReels(reelPointer);
 }
 
-void DreamBase::crosshair() {
-	uint8 frame;
-	if ((_commandType != 3) && (_commandType < 10)) {
-		frame = 9;
-	} else {
-		frame = 29;
-	}
-	showFrame(_icons1, kZoomx + 24, kZoomy + 19, frame, 0);
-}
-
 void DreamBase::delTextLine() {
 	if (_foreignRelease)
 		multiPut(_textUnder, _textAddressX, _textAddressY - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
@@ -2001,12 +1991,6 @@ void DreamBase::roomName() {
 	useCharset1();
 }
 
-void DreamBase::zoomIcon() {
-	if (data.byte(kZoomon) == 0)
-		return;
-	showFrame(_icons1, kZoomx, kZoomy-1, 8, 0);
-}
-
 void DreamBase::loadRoom() {
 	_roomLoaded = 1;
 	_timeCount = 0;
@@ -2929,11 +2913,6 @@ bool DreamBase::isSetObOnMap(uint8 index) {
 	return (getSetAd(index)->mapad[0] == 0);
 }
 
-void DreamBase::dumpZoom() {
-	if (data.byte(kZoomon) == 1)
-		multiDump(kZoomx + 5, kZoomy + 4, 46, 40);
-}
-
 void DreamBase::examineInventory() {
 	if (_commandType != 249) {
 		_commandType = 249;
@@ -2969,14 +2948,6 @@ void DreamBase::underTextLine() {
 		multiGet(_textUnder, _textAddressX, _textAddressY, kUnderTextSizeX, kUnderTextSizeY);
 }
 
-void DreamBase::getUnderZoom() {
-	multiGet(_zoomSpace, kZoomx + 5, kZoomy + 4, 46, 40);
-}
-
-void DreamBase::putUnderZoom() {
-	multiPut(_zoomSpace, kZoomx + 5, kZoomy + 4, 46, 40);
-}
-
 void DreamBase::showWatchReel() {
 	uint16 reelPointer = data.word(kReeltowatch);
 	plotReel(reelPointer);
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index ad5fd34d58..13defb46a2 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -26,6 +26,9 @@
 
 namespace DreamGen {
 
+const uint16 kZoomx = 8;
+const uint16 kZoomy = 132;
+
 void DreamBase::multiGet(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
 	assert(x < 320);
 	assert(y < 200);
@@ -332,6 +335,35 @@ void DreamBase::clearWork() {
 	memset(workspace(), 0, 320*200);
 }
 
+void DreamBase::dumpZoom() {
+	if (data.byte(kZoomon) == 1)
+		multiDump(kZoomx + 5, kZoomy + 4, 46, 40);
+}
+
+void DreamBase::crosshair() {
+	uint8 frame;
+	if ((_commandType != 3) && (_commandType < 10)) {
+		frame = 9;
+	} else {
+		frame = 29;
+	}
+	showFrame(_icons1, kZoomx + 24, kZoomy + 19, frame, 0);
+}
+
+void DreamBase::getUnderZoom() {
+	multiGet(_zoomSpace, kZoomx + 5, kZoomy + 4, 46, 40);
+}
+
+void DreamBase::putUnderZoom() {
+	multiPut(_zoomSpace, kZoomx + 5, kZoomy + 4, 46, 40);
+}
+
+void DreamBase::zoomIcon() {
+	if (data.byte(kZoomon) == 0)
+		return;
+	showFrame(_icons1, kZoomx, kZoomy-1, 8, 0);
+}
+
 void DreamBase::zoom() {
 	if (data.word(kWatchingtime) != 0)
 		return;
-- 
cgit v1.2.3


From 096c020e7af1b03bf8394d40cb3c6da98f01ae49 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 28 Dec 2011 20:52:17 +1100
Subject: TSAGE: Removed virtual keyword from setDetails methods

The methods are never overriden, so there's no point in the methods being virtual
---
 engines/tsage/core.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index c04045e83a..98606dc64d 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -451,11 +451,11 @@ public:
 	virtual Common::String getClassName() { return "SceneHotspot"; }
 	virtual void doAction(int action);
 
-	virtual void setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum);
-	virtual void setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
-	virtual void setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode = 0);
-	virtual void setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
-	virtual void setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
+	void setDetails(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum);
+	void setDetails(const Rect &bounds, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
+	void setDetails(int sceneRegionId, int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode = 0);
+	void setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum, int mode, SceneItem *item);
+	void setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
 };
 
 enum AnimateMode {ANIM_MODE_NONE = 0, ANIM_MODE_1 = 1, ANIM_MODE_2 = 2, ANIM_MODE_3 = 3,
-- 
cgit v1.2.3


From 26f1643e8646cac71b0adb7b88876674134f3613 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 12:15:23 +0200
Subject: DREAMWEB: Remove a lot of unused/duplicate constants and move some of
 them to dreambase.h

---
 engines/dreamweb/backdrop.cpp |  8 ++++----
 engines/dreamweb/dreambase.h  | 11 +++++++++++
 engines/dreamweb/dreamgen.h   | 15 ---------------
 engines/dreamweb/saveload.cpp |  4 ++--
 engines/dreamweb/sprite.cpp   |  3 +--
 engines/dreamweb/stubs.cpp    | 10 +++++-----
 6 files changed, 23 insertions(+), 28 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 2a17a7a1cf..7c0713c0c4 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -26,7 +26,7 @@ namespace DreamGen {
 
 void DreamBase::doBlocks() {
 	uint16 dstOffset = _mapAdY * 320 + _mapAdX;
-	uint16 mapOffset = _mapY * kMapwidth + _mapX;
+	uint16 mapOffset = _mapY * kMapWidth + _mapX;
 	const uint8 *mapData = _mapData + mapOffset;
 	uint8 *dstBuffer = workspace() + dstOffset;
 
@@ -57,7 +57,7 @@ void DreamBase::doBlocks() {
 				memset(dst, 0xdf, 16);
 			}
 		}
-		mapData += kMapwidth;
+		mapData += kMapWidth;
 	}
 }
 
@@ -236,12 +236,12 @@ void DreamBase::showAllFree() {
 
 void DreamBase::drawFlags() {
 	MapFlag *mapFlag = _mapFlags;
-	uint16 mapOffset = _mapY * kMapwidth + _mapX;
+	uint16 mapOffset = _mapY * kMapWidth + _mapX;
 	const uint8 *mapData = _mapData + mapOffset;
 
 	for (size_t i = 0; i < 10; ++i) {
 		for (size_t j = 0; j < 11; ++j) {
-			uint8 tile = mapData[i * kMapwidth + j];
+			uint8 tile = mapData[i * kMapWidth + j];
 			mapFlag->_flag = _backdropFlags[tile]._flag;
 			mapFlag->_flagEx = _backdropFlags[tile]._flagEx;
 			mapFlag->_type = tile;
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index 671664c05b..e9bf6641af 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -52,6 +52,17 @@ const unsigned int kMapWidth = 66;
 const unsigned int kMapHeight = 60;
 const unsigned int kLengthOfMap = kMapWidth * kMapHeight;
 const unsigned int kNumExObjects = 114;
+const unsigned int kScreenwidth = 320;
+const unsigned int kDiaryx = (68+24);
+const unsigned int kDiaryy = (48+12);
+const unsigned int kInventx = 80;
+const unsigned int kInventy = 58;
+const unsigned int kMenux = (80+40);
+const unsigned int kMenuy = 60;
+const unsigned int kOpsx = 60;
+const unsigned int kOpsy = 52;
+const unsigned int kSymbolx = 64;
+const unsigned int kSymboly = 56;
 
 /**
  * This class is one of the parent classes of DreamGenContext. Its sole purpose
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index bee03f993f..d53353858b 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -105,25 +105,10 @@ static const uint16 kLengthofextra = (0+2080+30000+(16*114)+((114+2)*2)+18000);
 static const uint16 kForeign = (1);
 static const uint16 kCd = (1);
 static const uint16 kNumexobjects = (114);
-static const uint16 kFreedatlen = (16*80);
 static const uint16 kExtextlen = (18000);
-static const uint16 kNumchanges = (250);
 static const uint16 kExframeslen = (30000);
-static const uint16 kScreenwidth = (320);
 static const uint16 kItempicsize = (44);
-static const uint16 kDiaryy = (48+12);
-static const uint16 kOpsy = (52);
-static const uint16 kSymboly = (56);
-static const uint16 kInventy = (58);
-static const uint16 kMenuy = (60);
-static const uint16 kOpsx = (60);
-static const uint16 kSymbolx = (64);
-static const uint16 kMapwidth = (66);
-static const uint16 kDiaryx = (68+24);
 static const uint16 kLengthofvars = (68-0);
-static const uint16 kInventx = (80);
-static const uint16 kMenux = (80+40);
-static const uint16 kHeaderlen = (96);
 
 
 class DreamGenContext : public DreamBase, public Context {
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 9faf93ae8e..06cf7e0012 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -464,7 +464,7 @@ void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 
 	// fill length fields in savegame file header
 	uint16 len[6] = { 17, kLengthofvars, kLengthofextra,
-	                  4*kNumchanges, 48, kNumReelRoutines*8+1 };
+	                  4*kNumChanges, 48, kNumReelRoutines*8+1 };
 	for (int i = 0; i < 6; ++i)
 		header.setLen(i, len[i]);
 
@@ -551,7 +551,7 @@ void DreamBase::loadPosition(unsigned int slot) {
 	inSaveFile->read(data.ptr(kStartvars, len[1]), len[1]);
 
 	// the Extras segment:
-	inSaveFile->read((uint8 *)_exFrames._frames, 2080);
+	inSaveFile->read((uint8 *)_exFrames._frames, kExframes);
 	inSaveFile->read((uint8 *)_exFrames._data, kExframeslen);
 	inSaveFile->read((uint8 *)_exData, sizeof(DynObject)*kNumexobjects);
 	inSaveFile->read((uint8 *)_exText._offsetsLE, 2*(kNumExObjects+2));
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index d5617dabc2..c2646d6588 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -1092,14 +1092,13 @@ void DreamBase::soundOnReels(uint16 reelPointer) {
 }
 
 void DreamBase::clearBeforeLoad() {
-	const uint16 kMaplen = 66*60;
 	if (_roomLoaded != 1)
 		return; // noclear
 
 	clearReels();
 
 	//clearRest
-	memset(_mapData, 0, kMaplen);
+	memset(_mapData, 0, kLengthOfMap);
 	delete[] _backdropBlocks;
 	_backdropBlocks = 0;
 	_setFrames.clear();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index dfc39f8667..59fb00e3e6 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1879,12 +1879,11 @@ void DreamBase::zoomOnOff() {
 }
 
 void DreamBase::sortOutMap() {
-	const uint16 kMaplength = 60;
 	const uint8 *src = workspace();
 	uint8 *dst = _mapData;
-	for (uint16 y = 0; y < kMaplength; ++y) {
-		memcpy(dst, src, kMapwidth);
-		dst += kMapwidth;
+	for (uint16 y = 0; y < kMapHeight; ++y) {
+		memcpy(dst, src, kMapWidth);
+		dst += kMapWidth;
 		src += 132;
 	}
 }
@@ -2135,6 +2134,7 @@ void DreamBase::getRidOfAll() {
 // if skipDat, skip clearing and loading Setdat and Freedat
 void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	const uint16 kSetdatlen = 64*128;
+	const uint16 kFreedatlen = 16*80;
 
 	engine->openFile(room.name);
 
@@ -3545,7 +3545,7 @@ void DreamBase::clearBuffers() {
 }
 
 void DreamBase::clearChanges() {
-	memset(_listOfChanges, 0xFF, 4*kNumchanges);
+	memset(_listOfChanges, 0xFF, 4*kNumChanges);
 
 	setupInitialReelRoutines();
 
-- 
cgit v1.2.3


From 8496b5c4d8134c86735edd90e598d7d94a37bf32 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 13:07:14 +0200
Subject: SCI: Rename _bMultiMidi to _useDigitalSFX and only initialize it
 inside SoundCommandParser

---
 engines/sci/sound/music.cpp    | 10 ++++------
 engines/sci/sound/music.h      |  7 +++----
 engines/sci/sound/soundcmd.cpp | 14 ++++++++------
 engines/sci/sound/soundcmd.h   |  4 +++-
 4 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 4ffa8d7590..09cab75c39 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -37,8 +37,8 @@
 
 namespace Sci {
 
-SciMusic::SciMusic(SciVersion soundVersion)
-	: _soundVersion(soundVersion), _soundOn(true), _masterVolume(0), _globalReverb(0) {
+SciMusic::SciMusic(SciVersion soundVersion, bool useDigitalSFX)
+	: _soundVersion(soundVersion), _soundOn(true), _masterVolume(0), _globalReverb(0), _useDigitalSFX(useDigitalSFX) {
 
 	// Reserve some space in the playlist, to avoid expensive insertion
 	// operations
@@ -122,8 +122,6 @@ void SciMusic::init() {
 		error("Failed to initialize sound driver");
 	}
 
-	_bMultiMidi = ConfMan.getBool("multi_midi");
-
 	// Find out what the first possible channel is (used, when doing channel
 	// remapping).
 	_driverFirstChannel = _pMidiDrv->getFirstChannel();
@@ -285,10 +283,10 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
 	SoundResource::Track *track = pSnd->soundRes->getTrackByType(_pMidiDrv->getPlayId());
 
 	// If MIDI device is selected but there is no digital track in sound
-	// resource try to use adlib's digital sample if possible. Also, if the
+	// resource try to use Adlib's digital sample if possible. Also, if the
 	// track couldn't be found, load the digital track, as some games depend on
 	// this (e.g. the Longbow demo).
-	if (!track || (_bMultiMidi && track->digitalChannelNr == -1)) {
+	if (!track || (_useDigitalSFX && track->digitalChannelNr == -1)) {
 		SoundResource::Track *digital = pSnd->soundRes->getDigitalTrack();
 		if (digital)
 			track = digital;
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index fa6f538a7e..1f798c90d7 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -120,7 +120,7 @@ typedef Common::Array<uint32> MidiCommandQueue;
 class SciMusic : public Common::Serializable {
 
 public:
-	SciMusic(SciVersion soundVersion);
+	SciMusic(SciVersion soundVersion, bool useDigitalSFX);
 	~SciMusic();
 
 	void init();
@@ -210,9 +210,8 @@ protected:
 	MidiPlayer *_pMidiDrv;
 
 	uint32 _dwTempo;
-	// Mixed AdLib/MIDI mode: when enabled from the ScummVM sound options screen,
-	// and a sound has a digital track, the sound from the AdLib track is played
-	bool _bMultiMidi;
+	// If true and a sound has a digital track, the sound from the AdLib track is played
+	bool _useDigitalSFX;
 
 private:
 	MusicList _playList;
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 274c532779..4b05a7fb11 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -35,17 +35,19 @@ namespace Sci {
 SoundCommandParser::SoundCommandParser(ResourceManager *resMan, SegManager *segMan, Kernel *kernel, AudioPlayer *audio, SciVersion soundVersion) :
 	_resMan(resMan), _segMan(segMan), _kernel(kernel), _audio(audio), _soundVersion(soundVersion) {
 
-	_music = new SciMusic(_soundVersion);
-	_music->init();
 	// Check if the user wants synthesized or digital sound effects in SCI1.1
 	// or later games
-	_bMultiMidi = ConfMan.getBool("multi_midi");
+	_useDigitalSFX = ConfMan.getBool("multi_midi");
+
 	// In SCI2 and later games, this check should always be true - there was
 	// always only one version of each sound effect or digital music track
 	// (e.g. the menu music in GK1 - there is a sound effect with the same
 	// resource number, but it's totally unrelated to the menu music).
 	if (getSciVersion() >= SCI_VERSION_2)
-		_bMultiMidi = true;
+		_useDigitalSFX = true;
+
+	_music = new SciMusic(_soundVersion, _useDigitalSFX);
+	_music->init();
 }
 
 SoundCommandParser::~SoundCommandParser() {
@@ -93,7 +95,7 @@ void SoundCommandParser::initSoundResource(MusicEntry *newSound) {
 		// Found a relevant audio resource, create an audio stream if there is
 		// no associated sound resource, or if both resources exist and the
 		// user wants the digital version.
-		if (_bMultiMidi || !newSound->soundRes) {
+		if (_useDigitalSFX || !newSound->soundRes) {
 			int sampleLen;
 			newSound->pStreamAud = _audio->getAudioStream(newSound->resourceId, 65535, &sampleLen);
 			newSound->soundType = Audio::Mixer::kSpeechSoundType;
@@ -485,7 +487,7 @@ void SoundCommandParser::processUpdateCues(reg_t obj) {
 	} else {
 		// Slot actually has no data (which would mean that a sound-resource w/
 		// unsupported data is used.
-		//  (example lsl5 - sound resource 744 - it's roland exclusive
+		//  (example lsl5 - sound resource 744 - it's Roland exclusive
 		writeSelectorValue(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET);
 		// If we don't set signal here, at least the switch to the mud wrestling
 		// room in lsl5 will not work.
diff --git a/engines/sci/sound/soundcmd.h b/engines/sci/sound/soundcmd.h
index c1dce014d2..d76f969c7d 100644
--- a/engines/sci/sound/soundcmd.h
+++ b/engines/sci/sound/soundcmd.h
@@ -111,7 +111,9 @@ private:
 	SciMusic *_music;
 	AudioPlayer *_audio;
 	SciVersion _soundVersion;
-	bool _bMultiMidi;
+	// If true and an alternative digital sound effect exists, the digital
+	// sound effect is preferred instead
+	bool _useDigitalSFX;
 
 	void processInitSound(reg_t obj);
 	void processDisposeSound(reg_t obj);
-- 
cgit v1.2.3


From 3752396aefc43beba2df6a47221407d805cb3a7b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 13:21:19 +0200
Subject: SCI: Always prefer digital sound effects to prevent confusion to
 users

This toggle will be enabled again when a more user-friendly GUI option
is possible
---
 engines/sci/sound/soundcmd.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'engines')

diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 4b05a7fb11..3306a76605 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -32,9 +32,12 @@
 
 namespace Sci {
 
+//#define ENABLE_SFX_TYPE_SELECTION
+
 SoundCommandParser::SoundCommandParser(ResourceManager *resMan, SegManager *segMan, Kernel *kernel, AudioPlayer *audio, SciVersion soundVersion) :
 	_resMan(resMan), _segMan(segMan), _kernel(kernel), _audio(audio), _soundVersion(soundVersion) {
 
+#ifdef ENABLE_SFX_TYPE_SELECTION
 	// Check if the user wants synthesized or digital sound effects in SCI1.1
 	// or later games
 	_useDigitalSFX = ConfMan.getBool("multi_midi");
@@ -45,6 +48,10 @@ SoundCommandParser::SoundCommandParser(ResourceManager *resMan, SegManager *segM
 	// resource number, but it's totally unrelated to the menu music).
 	if (getSciVersion() >= SCI_VERSION_2)
 		_useDigitalSFX = true;
+#else
+	// Always prefer digital sound effects
+	_useDigitalSFX = true;
+#endif
 
 	_music = new SciMusic(_soundVersion, _useDigitalSFX);
 	_music->init();
-- 
cgit v1.2.3


From 57e940f67896e0f085de23088754fe1682cd49db Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 28 Dec 2011 13:10:22 +0100
Subject: DREAMWEB: Move all saved variables to a GameVars struct

The data segment is now completely unused.
---
 engines/dreamweb/backdrop.cpp |   2 +-
 engines/dreamweb/dreambase.h  |   4 +-
 engines/dreamweb/dreamgen.cpp |  45 ----
 engines/dreamweb/dreamgen.h   |  60 +----
 engines/dreamweb/dreamweb.cpp |   2 +-
 engines/dreamweb/keypad.cpp   |   6 +-
 engines/dreamweb/module.mk    |   1 -
 engines/dreamweb/monitor.cpp  |  10 +-
 engines/dreamweb/newplace.cpp |   6 +-
 engines/dreamweb/object.cpp   |  24 +-
 engines/dreamweb/pathfind.cpp |   8 +-
 engines/dreamweb/people.cpp   | 218 +++++++--------
 engines/dreamweb/print.cpp    |   2 +-
 engines/dreamweb/saveload.cpp |  85 +++++-
 engines/dreamweb/sprite.cpp   |  54 ++--
 engines/dreamweb/structs.h    |  62 +++++
 engines/dreamweb/stubs.cpp    | 386 +++++++++++++++------------
 engines/dreamweb/titles.cpp   |   6 +-
 engines/dreamweb/use.cpp      | 602 +++++++++++++++++++++---------------------
 engines/dreamweb/vgagrafx.cpp |  16 +-
 20 files changed, 841 insertions(+), 758 deletions(-)
 delete mode 100644 engines/dreamweb/dreamgen.cpp

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 7c0713c0c4..528a6c4fd1 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -110,7 +110,7 @@ void DreamBase::calcFrFrame(const Frame &frame, uint8 *width, uint8 *height, uin
 }
 
 void DreamBase::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
-	if (data.byte(kNewobs) == 0)
+	if (_vars._newObs == 0)
 		return;
 	uint8 priority = objData->priority;
 	uint8 type = objData->type;
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index e9bf6641af..ebbe24c9cc 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -63,6 +63,7 @@ const unsigned int kOpsx = 60;
 const unsigned int kOpsy = 52;
 const unsigned int kSymbolx = 64;
 const unsigned int kSymboly = 56;
+const unsigned int kLengthofvars = 68;
 
 /**
  * This class is one of the parent classes of DreamGenContext. Its sole purpose
@@ -78,6 +79,7 @@ protected:
 	DreamWeb::DreamWebEngine *engine;
 
 	const char *_timedString;
+	GameVars _vars; // saved variables
 
 	// from backdrop.cpp
 	uint8 *_backdropBlocks;
@@ -133,7 +135,6 @@ protected:
 	Change _listOfChanges[kNumChanges]; // Note: this array is saved
 	uint8 _underTimedText[kUnderTimedTextBufSize];
 	Common::List<Rain> _rainList;
-	uint8 _initialVars[kLengthOfVars]; // TODO: This shouldn't be necessary
 
 	// textfiles
 	TextFile _textFile1;
@@ -652,6 +653,7 @@ public:
 	void reelsOnScreen();
 
 	// from stubs.cpp
+	void setupInitialVars();
 	bool isCD();
 	void crosshair();
 	void delTextLine();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
deleted file mode 100644
index 7f4c8e437a..0000000000
--- a/engines/dreamweb/dreamgen.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/* PLEASE DO NOT MODIFY THIS FILE. ALL CHANGES WILL BE LOST! LOOK FOR README FOR DETAILS */
-
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public 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 "dreamgen.h"
-
-namespace DreamGen {
-
-
-void DreamGenContext::__start() { 
-	static const uint8 src[] = {
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x13, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0000: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 
-		//0x0010: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-		//0x0020: .... .... .... ....
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0xff, 0x00, 
-		//0x0030: .... .... .... ....
-		0xff, 0x00, 0x00, 0x30, };
-	ds.assign(src, src + sizeof(src));
-	dreamweb(); 
-}
-
-} // End of namespace DreamGen
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index d53353858b..dfec45d069 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -32,71 +32,14 @@
 
 namespace DreamGen {
 
-static const uint16 kStartvars = 0;
-static const uint16 kProgresspoints = 1;
-static const uint16 kWatchon = 2;
-static const uint16 kShadeson = 3;
-static const uint16 kSecondcount = 4;
-static const uint16 kMinutecount = 5;
-static const uint16 kHourcount = 6;
-static const uint16 kZoomon = 7;
-static const uint16 kLocation = 8;
-static const uint16 kExpos = 9;
-static const uint16 kExframepos = 10;
-static const uint16 kExtextpos = 12;
-static const uint16 kCard1money = 14;
-static const uint16 kListpos = 16;
-static const uint16 kRyanpage = 18;
-static const uint16 kWatchingtime = 19;
-static const uint16 kReeltowatch = 21;
-static const uint16 kEndwatchreel = 23;
-static const uint16 kSpeedcount = 25;
-static const uint16 kWatchspeed = 26;
-static const uint16 kReeltohold = 27;
-static const uint16 kEndofholdreel = 29;
-static const uint16 kWatchmode = 31;
-static const uint16 kDestafterhold = 32;
-static const uint16 kNewsitem = 33;
-static const uint16 kLiftflag = 34;
-static const uint16 kLiftpath = 35;
-static const uint16 kLockstatus = 36;
-static const uint16 kDoorpath = 37;
-static const uint16 kCounttoopen = 38;
-static const uint16 kCounttoclose = 39;
-static const uint16 kRockstardead = 40;
-static const uint16 kGeneraldead = 41;
-static const uint16 kSartaindead = 42;
-static const uint16 kAidedead = 43;
-static const uint16 kBeenmugged = 44;
-static const uint16 kGunpassflag = 45;
-static const uint16 kCanmovealtar = 46;
-static const uint16 kTalkedtoattendant = 47;
-static const uint16 kTalkedtosparky = 48;
-static const uint16 kTalkedtoboss = 49;
-static const uint16 kTalkedtorecep = 50;
-static const uint16 kCardpassflag = 51;
-static const uint16 kMadmanflag = 52;
-static const uint16 kKeeperflag = 53;
-static const uint16 kLasttrigger = 54;
-static const uint16 kMandead = 55;
-static const uint16 kSeed = 56;
-static const uint16 kNeedtotravel = 59;
-static const uint16 kThroughdoor = 60;
-static const uint16 kNewobs = 61;
-static const uint16 kRyanon = 62;
-static const uint16 kCombatcount = 63;
-static const uint16 kLastweapon = 64;
-static const uint16 kDreamnumber = 65;
-static const uint16 kRoomafterdream = 66;
-static const uint16 kShakecounter = 67;
 static const uint16 kDebuglevel1 = (0);
 static const uint16 kDebuglevel2 = (0);
 static const uint16 kPlayback = (0);
 static const uint16 kSpanish = (0);
 static const uint16 kRecording = (0);
-static const uint16 kExframedata = (0);
 static const uint16 kGerman = (0);
 static const uint16 kDemo = (0);
+static const uint16 kExframedata = (0);
 static const uint16 kExframes = (0+2080);
 static const uint16 kExdata = (0+2080+30000);
 static const uint16 kExtextdat = (0+2080+30000+(16*114));
@@ -108,7 +51,6 @@ static const uint16 kNumexobjects = (114);
 static const uint16 kExtextlen = (18000);
 static const uint16 kExframeslen = (30000);
 static const uint16 kItempicsize = (44);
-static const uint16 kLengthofvars = (68-0);
 
 
 class DreamGenContext : public DreamBase, public Context {
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 4e7257bcd3..8bc4975f69 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -204,7 +204,7 @@ Common::Error DreamWebEngine::run() {
 	ConfMan.registerDefault("dreamweb_originalsaveload", "false");
 
 	_timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync");
-	_context.__start();
+	_context.dreamweb();
 	_base._quitRequested = false;
 
 	_timer->removeTimerProc(vSyncInterrupt);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 34f33ae128..864cc8e8fa 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -65,7 +65,7 @@ void DreamBase::showKeypad() {
 		--_lightCount;
 		uint8 frameIndex;
 		uint16 y;
-		if (data.byte(kLockstatus)) {
+		if (_vars._lockStatus) {
 			frameIndex = 36;
 			y = kKeypady-1+63;
 		} else {
@@ -145,14 +145,14 @@ void DreamBase::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3
 		if (_quitRequested || (_getBack == 1))
 			break;
 		if (_lightCount == 1) {
-			if (data.byte(kLockstatus) == 0)
+			if (_vars._lockStatus == 0)
 				break;
 		} else {
 			if (_pressCount == 40) {
 				addToPressList();
 				if (_pressed == 11) {
 					if (isItRight(digit0, digit1, digit2, digit3))
-						data.byte(kLockstatus) = 0;
+						_vars._lockStatus = 0;
 					playChannel1(11);
 					_lightCount = 120;
 					_pressPointer = 0;
diff --git a/engines/dreamweb/module.mk b/engines/dreamweb/module.mk
index 88dfdeea53..661a9b973a 100644
--- a/engines/dreamweb/module.mk
+++ b/engines/dreamweb/module.mk
@@ -5,7 +5,6 @@ MODULE_OBJS := \
 	console.o \
 	detection.o \
 	dreamweb.o \
-	dreamgen.o \
 	keypad.o \
 	monitor.o \
 	newplace.o \
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 375ab9fcdd..0f6d42040d 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -39,7 +39,7 @@ static MonitorKeyEntry monitorKeyEntries[4] = {
 };
 
 void DreamBase::useMon() {
-	data.byte(kLasttrigger) = 0;
+	_vars._lastTrigger = 0;
 	_currentFile[0] = 34;
 	memset(_currentFile+1, ' ', 12);
 	_currentFile[13] = 0;
@@ -377,7 +377,7 @@ void DreamBase::printOuterMon() {
 }
 
 void DreamBase::loadPersonal() {
-	if (data.byte(kLocation) == 0 || data.byte(kLocation) == 42)
+	if (_vars._location == 0 || _vars._location == 42)
 		loadTextFile(_textFile1, "DREAMWEB.T01"); // monitor file 1
 	else
 		loadTextFile(_textFile1, "DREAMWEB.T02"); // monitor file 2
@@ -385,11 +385,11 @@ void DreamBase::loadPersonal() {
 
 void DreamBase::loadNews() {
 	// textfile2 holds information accessible by anyone
-	if (data.byte(kNewsitem) == 0)
+	if (_vars._newsItem == 0)
 		loadTextFile(_textFile2, "DREAMWEB.T10"); // monitor file 10
-	else if (data.byte(kNewsitem) == 1)
+	else if (_vars._newsItem == 1)
 		loadTextFile(_textFile2, "DREAMWEB.T11"); // monitor file 11
-	else if (data.byte(kNewsitem) == 2)
+	else if (_vars._newsItem == 2)
 		loadTextFile(_textFile2, "DREAMWEB.T12"); // monitor file 12
 	else
 		loadTextFile(_textFile2, "DREAMWEB.T13"); // monitor file 13
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 3093968969..a460d2879e 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -25,8 +25,8 @@
 namespace DreamGen {
 
 void DreamBase::newPlace() {
-	if (data.byte(kNeedtotravel) == 1) {
-		data.byte(kNeedtotravel) = 0;
+	if (_vars._needToTravel == 1) {
+		_vars._needToTravel = 0;
 		selectLocation();
 	} else if (_autoLocation != 0xFF) {
 		_newLocation = _autoLocation;
@@ -84,7 +84,7 @@ void DreamBase::selectLocation() {
 		checkCoords(destList);
 	}
 
-	if (_quitRequested || _getBack == 1 || _newLocation == data.byte(kLocation)) {
+	if (_quitRequested || _getBack == 1 || _newLocation == _vars._location) {
 		_newLocation = _realLocation;
 		_getBack = 0;
 	}
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 7dc605c032..555125e9e7 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -26,7 +26,7 @@ namespace DreamGen {
 
 void DreamBase::showRyanPage() {
 	showFrame(_icons1, kInventx + 167, kInventy - 12, 12, 0);
-	showFrame(_icons1, kInventx + 167 + 18 * data.byte(kRyanpage), kInventy - 12, 13 + data.byte(kRyanpage), 0);
+	showFrame(_icons1, kInventx + 167 + 18 * _vars._ryanPage, kInventy - 12, 13 + _vars._ryanPage, 0);
 }
 
 void DreamBase::findAllRyan() {
@@ -45,7 +45,7 @@ void DreamBase::findAllRyan() {
 }
 
 void DreamBase::fillRyan() {
-	ObjectRef *inv = &_ryanInvList[data.byte(kRyanpage) * 10];
+	ObjectRef *inv = &_ryanInvList[_vars._ryanPage * 10];
 	findAllRyan();
 	for (size_t i = 0; i < 2; ++i) {
 		for (size_t j = 0; j < 5; ++j) {
@@ -203,7 +203,7 @@ void DreamBase::examineOb(bool examineAgain) {
 	}
 
 	_pickUp = 0;
-	if (data.word(kWatchingtime) != 0 || _newLocation == 255) {
+	if (_vars._watchingTime != 0 || _newLocation == 255) {
 		// isWatching
 		makeMainScreen();
 	}
@@ -213,7 +213,7 @@ void DreamBase::examineOb(bool examineAgain) {
 }
 
 void DreamBase::inventory() {
-	if (data.byte(kMandead) == 1 || data.word(kWatchingtime) != 0) {
+	if (_vars._manDead == 1 || _vars._watchingTime != 0) {
 		blank();
 		return;
 	}
@@ -251,13 +251,13 @@ void DreamBase::inventory() {
 }
 
 void DreamBase::transferText(uint8 from, uint8 to) {
-	_exText.setOffset(to, data.word(kExtextpos));
+	_exText.setOffset(to, _vars._exTextPos);
 	const char *src = _freeDesc.getString(from);
-	char *dst = _exText._text + data.word(kExtextpos);
+	char *dst = _exText._text + _vars._exTextPos;
 
 	size_t len = strlen(src);
 	memcpy(dst, src, len + 1);
-	data.word(kExtextpos) += len + 1;
+	_vars._exTextPos += len + 1;
 }
 
 void DreamBase::getBackFromOb() {
@@ -305,7 +305,7 @@ void DreamBase::openOb() {
 }
 
 void DreamBase::identifyOb() {
-	if (data.word(kWatchingtime) != 0) {
+	if (_vars._watchingTime != 0) {
 		blank();
 		return;
 	}
@@ -335,7 +335,7 @@ void DreamBase::identifyOb() {
 
 	checkOne(x, y, &flag, &flagEx, &type, &flagX, &flagY);
 
-	if (type != 0 && data.byte(kMandead) != 1)
+	if (type != 0 && _vars._manDead != 1)
 		obName(type, 3);
 	else
 		blank();
@@ -345,7 +345,7 @@ ObjectRef DreamBase::findInvPos() {
 	uint16 x = _mouseX - kInventx;
 	uint16 y = _mouseY - kInventy;
 	uint8 pos = (x / kItempicsize) + (y / kItempicsize) * 5;
-	uint8 invPos = data.byte(kRyanpage) * 10 + pos;
+	uint8 invPos = _vars._ryanPage * 10 + pos;
 	_lastInvPos = invPos;
 	return _ryanInvList[invPos];
 }
@@ -435,7 +435,7 @@ void DreamBase::deleteExFrame(uint8 frameNum) {
 	memmove(&_exFrames._data[startOff], &_exFrames._data[endOff], remainder);
 
 	// Combined frame data is now frameSize smaller
-	data.word(kExframepos) -= frameSize;
+	_vars._exFramePos -= frameSize;
 
 	// Adjust all frame pointers pointing into the shifted data
 	for (unsigned int i = 0; i < 3*kNumexobjects; ++i) {
@@ -457,7 +457,7 @@ void DreamBase::deleteExText(uint8 textNum) {
 	memmove(&_exText._text[startOff], &_exText._text[endOff], remainder);
 
 	// Combined text data is now frameSize smaller
-	data.word(kExtextpos) -= textSize;
+	_vars._exTextPos -= textSize;
 
 	// Adjust all text pointers pointing into the shifted data
 	for (unsigned int i = 0; i < kNumexobjects; ++i) {
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index 6254fe7755..908ac001bb 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -68,11 +68,11 @@ void DreamBase::setWalk() {
 	} else if (_pointersPath == _mansPath) {
 		// Can't walk
 		faceRightWay();
-	} else if (data.byte(kWatchmode) == 1) {
+	} else if (_vars._watchMode == 1) {
 		// Holding reel
-		data.byte(kDestafterhold) = _pointersPath;
-		data.byte(kWatchmode) = 2;
-	} else if (data.byte(kWatchmode) == 2) {
+		_vars._destAfterHold = _pointersPath;
+		_vars._watchMode = 2;
+	} else if (_vars._watchMode == 2) {
 		// Can't walk
 	} else {
 		_destination = _pointersPath;
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 0ab39eea9f..cecb6ee9dd 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -153,27 +153,27 @@ void DreamBase::madmanText() {
 		origCount = _speechCount;
 		++_speechCount;
 	} else {
-		if (data.byte(kCombatcount) >= 61)
+		if (_vars._combatCount >= 61)
 			return;
-		if (data.byte(kCombatcount) & 3)
+		if (_vars._combatCount & 3)
 			return;
-		origCount = data.byte(kCombatcount) / 4;
+		origCount = _vars._combatCount / 4;
 	}
 	setupTimedTemp(47 + origCount, 82, 72, 80, 90, 1);
 }
 
 void DreamBase::madman(ReelRoutine &routine) {
-	data.word(kWatchingtime) = 2;
+	_vars._watchingTime = 2;
 	if (checkSpeed(routine)) {
 		uint16 newReelPointer = routine.reelPointer();
 		if (newReelPointer >= 364) {
-			data.byte(kMandead) = 2;
+			_vars._manDead = 2;
 			showGameReel(&routine);
 			return;
 		}
 		if (newReelPointer == 10) {
 			loadTempText("DREAMWEB.T82");
-			data.byte(kCombatcount) = (uint8)-1;
+			_vars._combatCount = (uint8)-1;
 			_speechCount = 0;
 		}
 		++newReelPointer;
@@ -185,17 +185,17 @@ void DreamBase::madman(ReelRoutine &routine) {
 			return;
 		}
 		if (newReelPointer == 66) {
-			++data.byte(kCombatcount);
+			++_vars._combatCount;
 			madmanText();
 			newReelPointer = 53;
-			if (data.byte(kCombatcount) >= (isCD() ? 64 : 62)) {
-				if (data.byte(kCombatcount) == (isCD() ? 70 : 68))
+			if (_vars._combatCount >= (isCD() ? 64 : 62)) {
+				if (_vars._combatCount == (isCD() ? 70 : 68))
 					newReelPointer = 310;
 				else {
-					if (data.byte(kLastweapon) == 8) {
-						data.byte(kCombatcount) = isCD() ? 72 : 70;
-						data.byte(kLastweapon) = (uint8)-1;
-						data.byte(kMadmanflag) = 1;
+					if (_vars._lastWeapon == 8) {
+						_vars._combatCount = isCD() ? 72 : 70;
+						_vars._lastWeapon = (uint8)-1;
+						_vars._madmanFlag = 1;
 						newReelPointer = 67;
 					}
 				}
@@ -209,11 +209,11 @@ void DreamBase::madman(ReelRoutine &routine) {
 }
 
 void DreamBase::madMode() {
-	data.word(kWatchingtime) = 2;
+	_vars._watchingTime = 2;
 	_pointerMode = 0;
-	if (data.byte(kCombatcount) < (isCD() ? 65 : 63))
+	if (_vars._combatCount < (isCD() ? 65 : 63))
 		return;
-	if (data.byte(kCombatcount) >= (isCD() ? 70 : 68))
+	if (_vars._combatCount >= (isCD() ? 70 : 68))
 		return;
 	_pointerMode = 2;
 }
@@ -228,7 +228,7 @@ void DreamBase::addToPeopleList(ReelRoutine *routine) {
 }
 
 bool DreamBase::checkSpeed(ReelRoutine &routine) {
-	if (data.byte(kLastweapon) != (uint8)-1)
+	if (_vars._lastWeapon != (uint8)-1)
 		return true;
 	++routine.counter;
 	if (routine.counter != routine.period)
@@ -261,14 +261,14 @@ void DreamBase::gamer(ReelRoutine &routine) {
 }
 
 void DreamBase::eden(ReelRoutine &routine) {
-	if (data.byte(kGeneraldead))
+	if (_vars._generalDead)
 		return;
 	showGameReel(&routine);
 	addToPeopleList(&routine);
 }
 
 void DreamBase::sparky(ReelRoutine &routine) {
-	if (data.word(kCard1money))
+	if (_vars._card1Money)
 		routine.b7 = 3;
 	if (checkSpeed(routine)) {
 		if (routine.reelPointer() == 34) {
@@ -286,7 +286,7 @@ void DreamBase::sparky(ReelRoutine &routine) {
 	showGameReel(&routine);
 	addToPeopleList(&routine);
 	if (routine.b7 & 128)
-		data.byte(kTalkedtosparky) = 1;
+		_vars._talkedToSparky = 1;
 }
 
 void DreamBase::rockstar(ReelRoutine &routine) {
@@ -298,17 +298,17 @@ void DreamBase::rockstar(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 118) {
-			data.byte(kMandead) = 2;
+			_vars._manDead = 2;
 		} else if (nextReelPointer == 79) {
 			--nextReelPointer;
-			if (data.byte(kLastweapon) != 1) {
-				++data.byte(kCombatcount);
-				if (data.byte(kCombatcount) == 40) {
-					data.byte(kCombatcount) = 0;
+			if (_vars._lastWeapon != 1) {
+				++_vars._combatCount;
+				if (_vars._combatCount == 40) {
+					_vars._combatCount = 0;
 					nextReelPointer = 79;
 				}
 			} else {
-				data.byte(kLastweapon) = (uint8)-1;
+				_vars._lastWeapon = (uint8)-1;
 				nextReelPointer = 123;
 			}
 		}
@@ -318,9 +318,9 @@ void DreamBase::rockstar(ReelRoutine &routine) {
 	if (routine.reelPointer() == 78) {
 		addToPeopleList(&routine);
 		_pointerMode = 2;
-		data.word(kWatchingtime) = 0;
+		_vars._watchingTime = 0;
 	} else {
-		data.word(kWatchingtime) = 2;
+		_vars._watchingTime = 2;
 		_pointerMode = 0;
 		routine.mapY = _mapY;
 	}
@@ -336,7 +336,7 @@ void DreamBase::madmansTelly(ReelRoutine &routine) {
 
 
 void DreamBase::smokeBloke(ReelRoutine &routine) {
-	if (data.byte(kRockstardead) == 0) {
+	if (_vars._rockstarDead == 0) {
 		if (routine.b7 & 128)
 			DreamBase::setLocation(5);
 	}
@@ -365,28 +365,28 @@ void DreamBase::attendant(ReelRoutine &routine) {
 	showGameReel(&routine);
 	addToPeopleList(&routine);
 	if (routine.b7 & 128)
-		data.byte(kTalkedtoattendant) = 1;
+		_vars._talkedToAttendant = 1;
 }
 
 void DreamBase::keeper(ReelRoutine &routine) {
-	if (data.byte(kKeeperflag) != 0) {
+	if (_vars._keeperFlag != 0) {
 		// Not waiting
 		addToPeopleList(&routine);
 		showGameReel(&routine);
 		return;
 	}
 
-	if (data.word(kReeltowatch) < 190)
+	if (_vars._reelToWatch < 190)
 		return; // waiting
 
-	data.byte(kKeeperflag)++;
+	_vars._keeperFlag++;
 
-	if ((routine.b7 & 127) != data.byte(kDreamnumber))
-		routine.b7 = data.byte(kDreamnumber);
+	if ((routine.b7 & 127) != _vars._dreamNumber)
+		routine.b7 = _vars._dreamNumber;
 }
 
 void DreamBase::drunk(ReelRoutine &routine) {
-	if (data.byte(kGeneraldead))
+	if (_vars._generalDead)
 		return;
 	routine.b7 &= 127;
 	showGameReel(&routine);
@@ -394,7 +394,7 @@ void DreamBase::drunk(ReelRoutine &routine) {
 }
 
 void DreamBase::interviewer(ReelRoutine &routine) {
-	if (data.word(kReeltowatch) == 68)
+	if (_vars._reelToWatch == 68)
 		routine.incReelPointer();
 
 	if (routine.reelPointer() != 250 && routine.reelPointer() != 259 && checkSpeed(routine))
@@ -527,17 +527,17 @@ void DreamBase::gates(ReelRoutine &routine) {
 
 void DreamBase::security(ReelRoutine &routine) {
 	if (routine.reelPointer() == 32) {
-		if (data.byte(kLastweapon) == 1) {
-			data.word(kWatchingtime) = 10;
+		if (_vars._lastWeapon == 1) {
+			_vars._watchingTime = 10;
 			if ((_mansPath == 9) && (_facing == 0)) {
-				data.byte(kLastweapon) = (uint8)-1;
+				_vars._lastWeapon = (uint8)-1;
 				routine.incReelPointer();
 			}
 		}
 	} else if (routine.reelPointer() == 69)
 		return;
 	else {
-		data.word(kWatchingtime) = 10;
+		_vars._watchingTime = 10;
 		if (checkSpeed(routine))
 			routine.incReelPointer();
 	}
@@ -546,7 +546,7 @@ void DreamBase::security(ReelRoutine &routine) {
 }
 
 void DreamBase::edenInBath(ReelRoutine &routine) {
-	if (data.byte(kGeneraldead) == 0 || data.byte(kSartaindead) != 0)
+	if (_vars._generalDead == 0 || _vars._sartainDead != 0)
 		return;
 
 	showGameReel(&routine);
@@ -554,7 +554,7 @@ void DreamBase::edenInBath(ReelRoutine &routine) {
 }
 
 void DreamBase::louis(ReelRoutine &routine) {
-	if (data.byte(kRockstardead) != 0)
+	if (_vars._rockstarDead != 0)
 		return;
 
 	showGameReel(&routine);
@@ -581,7 +581,7 @@ void DreamBase::train(ReelRoutine &routine) {
 }
 
 void DreamBase::louisChair(ReelRoutine &routine) {
-	if (data.byte(kRockstardead) == 0)
+	if (_vars._rockstarDead == 0)
 		return; // notlouis2
 
 	if (checkSpeed(routine)) {
@@ -607,14 +607,14 @@ void DreamBase::bossMan(ReelRoutine &routine) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 
 		if (nextReelPointer == 4) {
-			if (data.byte(kGunpassflag) != 1 && engine->randomNumber() >= 10)
+			if (_vars._gunPassFlag != 1 && engine->randomNumber() >= 10)
 				nextReelPointer = 0;
 		} else if (nextReelPointer == 20) {
-			if (data.byte(kGunpassflag) != 1)
+			if (_vars._gunPassFlag != 1)
 				nextReelPointer = 0;
 		} else if (nextReelPointer == 41) {
 			nextReelPointer = 0;
-			data.byte(kGunpassflag)++;
+			_vars._gunPassFlag++;
 			routine.b7 = 10;
 		}
 
@@ -625,7 +625,7 @@ void DreamBase::bossMan(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 
 	if (routine.b7 & 128)
-		data.byte(kTalkedtoboss) = 1;
+		_vars._talkedToBoss = 1;
 }
 
 void DreamBase::priest(ReelRoutine &routine) {
@@ -633,7 +633,7 @@ void DreamBase::priest(ReelRoutine &routine) {
 		return; // priestspoken
 
 	_pointerMode = 0;
-	data.word(kWatchingtime) = 2;
+	_vars._watchingTime = 2;
 
 	if (checkSpeed(routine)) {
 		routine.incReelPointer();
@@ -752,21 +752,21 @@ void DreamBase::introMonks2(ReelRoutine &routine) {
 
 void DreamBase::soldier1(ReelRoutine &routine) {
 	if (routine.reelPointer() != 0) {
-		data.word(kWatchingtime) = 10;
+		_vars._watchingTime = 10;
 		if (routine.reelPointer() == 30) {
-			data.byte(kCombatcount)++;
-			if (data.byte(kCombatcount) == 40)
-				data.byte(kMandead) = 2;
+			_vars._combatCount++;
+			if (_vars._combatCount == 40)
+				_vars._manDead = 2;
 		} else if (checkSpeed(routine)) {
 			// Not after shot
 			routine.incReelPointer();
 		}
-	} else if (data.byte(kLastweapon) == 1) {
-		data.word(kWatchingtime) = 10;
+	} else if (_vars._lastWeapon == 1) {
+		_vars._watchingTime = 10;
 		if (_mansPath == 2 && _facing == 4)
 			routine.incReelPointer();
-		data.byte(kLastweapon) = 0xFF;
-		data.byte(kCombatcount) = 0;
+		_vars._lastWeapon = 0xFF;
+		_vars._combatCount = 0;
 	}
 
 	showGameReel(&routine);
@@ -775,9 +775,9 @@ void DreamBase::soldier1(ReelRoutine &routine) {
 
 void DreamBase::receptionist(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
-		if (data.byte(kCardpassflag) == 1) {
+		if (_vars._cardPassFlag == 1) {
 			// Set card
-			data.byte(kCardpassflag)++;
+			_vars._cardPassFlag++;
 			routine.b7 = 1;
 			routine.setReelPointer(64);
 		}
@@ -807,7 +807,7 @@ void DreamBase::receptionist(ReelRoutine &routine) {
 	showGameReel(&routine);
 	addToPeopleList(&routine);
 	if (routine.b7 & 128)
-		data.byte(kTalkedtorecep) = 1;
+		_vars._talkedToRecep = 1;
 }
 
 void DreamBase::bartender(ReelRoutine &routine) {
@@ -825,7 +825,7 @@ void DreamBase::bartender(ReelRoutine &routine) {
 	}
 
 	showGameReel(&routine);
-	if (data.byte(kGunpassflag) == 1)
+	if (_vars._gunPassFlag == 1)
 		routine.b7 = 9;	// got gun
 
 	addToPeopleList(&routine);
@@ -834,21 +834,21 @@ void DreamBase::bartender(ReelRoutine &routine) {
 void DreamBase::heavy(ReelRoutine &routine) {
 	routine.b7 &= 127;
 	if (routine.reelPointer() != 43) {
-		data.word(kWatchingtime) = 10;
+		_vars._watchingTime = 10;
 		if (routine.reelPointer() == 70) {
 			// After shot
-			data.byte(kCombatcount)++;
-			if (data.byte(kCombatcount) == 80)
-				data.byte(kMandead) = 2;
+			_vars._combatCount++;
+			if (_vars._combatCount == 80)
+				_vars._manDead = 2;
 		} else {
 			if (checkSpeed(routine))
 				routine.incReelPointer();
 		}
-	} else if (data.byte(kLastweapon) == 1 && _mansPath == 5 && _facing == 4) {
+	} else if (_vars._lastWeapon == 1 && _mansPath == 5 && _facing == 4) {
 		// Heavy wait
-		data.byte(kLastweapon) = (byte)-1;
+		_vars._lastWeapon = (byte)-1;
 		routine.incReelPointer();
-		data.byte(kCombatcount) = 0;
+		_vars._combatCount = 0;
 	}
 
 	showGameReel(&routine);
@@ -866,20 +866,20 @@ void DreamBase::helicopter(ReelRoutine &routine) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 53) {
 			// Before killing helicopter
-			data.byte(kCombatcount)++;
-			if (data.byte(kCombatcount) >= 8)
-				data.byte(kMandead) = 2;
+			_vars._combatCount++;
+			if (_vars._combatCount >= 8)
+				_vars._manDead = 2;
 			nextReelPointer = 49;
 		} else if (nextReelPointer == 9) {
 			nextReelPointer--;
-			if (data.byte(kLastweapon) == 1) {
-				data.byte(kLastweapon) = (byte)-1;
+			if (_vars._lastWeapon == 1) {
+				_vars._lastWeapon = (byte)-1;
 				nextReelPointer = 55;
 			} else {
 				nextReelPointer = 5;
-				data.byte(kCombatcount)++;
-				if (data.byte(kCombatcount) == 20) {
-					data.byte(kCombatcount) = 0;
+				_vars._combatCount++;
+				if (_vars._combatCount == 20) {
+					_vars._combatCount = 0;
 					nextReelPointer = 9;
 				}
 			}
@@ -890,13 +890,13 @@ void DreamBase::helicopter(ReelRoutine &routine) {
 
 	showGameReel(&routine);
 	routine.mapX = _mapX;
-	if (routine.reelPointer() < 9 && data.byte(kCombatcount) >= 7) {
+	if (routine.reelPointer() < 9 && _vars._combatCount >= 7) {
 		_pointerMode = 2;
-		data.word(kWatchingtime) = 0;
+		_vars._watchingTime = 0;
 	} else {
 		// Not waiting helicopter
 		_pointerMode = 0;
-		data.word(kWatchingtime) = 2;
+		_vars._watchingTime = 2;
 	}
 }
 
@@ -906,7 +906,7 @@ void DreamBase::mugger(ReelRoutine &routine) {
 			return; // endmugger2
 
 		if (routine.reelPointer() == 2)
-			data.word(kWatchingtime) = 175 * 2;	// set watch
+			_vars._watchingTime = 175 * 2;	// set watch
 
 		if (checkSpeed(routine))
 			routine.incReelPointer();
@@ -935,7 +935,7 @@ void DreamBase::mugger(ReelRoutine &routine) {
 		removeObFromInv();
 		makeMainScreen();
 		DreamBase::setupTimedUse(48, 70, 10, 68 - 32, 54 + 64);
-		data.byte(kBeenmugged) = 1;
+		_vars._beenMugged = 1;
 	}
 }
 
@@ -943,14 +943,14 @@ void DreamBase::mugger(ReelRoutine &routine) {
 // two bodyguards are expecting Ryan.
 void DreamBase::businessMan(ReelRoutine &routine) {
 	_pointerMode = 0;
-	data.word(kWatchingtime) = 2;
+	_vars._watchingTime = 2;
 	if (routine.reelPointer() == 2)
 		DreamBase::setupTimedUse(49, 30, 1, 68, 174);	// First
 
 	if (routine.reelPointer() == 95) {
 		// Businessman combat won - end
 		_pointerMode = 0;
-		data.word(kWatchingtime) = 0;
+		_vars._watchingTime = 0;
 		return;
 	}
 
@@ -960,19 +960,19 @@ void DreamBase::businessMan(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 48) {
-			data.byte(kMandead) = 2;	// before dead body
+			_vars._manDead = 2;	// before dead body
 		} else if (nextReelPointer == 15) {
 			nextReelPointer--;
-			if (data.byte(kLastweapon) == 3) {
+			if (_vars._lastWeapon == 3) {
 				// Shield on bus
-				data.byte(kLastweapon) = (byte)-1;
-				data.byte(kCombatcount) = 0;
+				_vars._lastWeapon = (byte)-1;
+				_vars._combatCount = 0;
 				nextReelPointer = 51;
 			} else {
 				// No shield on businessman
-				data.byte(kCombatcount)++;
-				if (data.byte(kCombatcount) == 20) {
-					data.byte(kCombatcount) = 0;
+				_vars._combatCount++;
+				if (_vars._combatCount == 20) {
+					_vars._combatCount = 0;
 					nextReelPointer = 15;
 				}
 			}
@@ -997,7 +997,7 @@ void DreamBase::businessMan(ReelRoutine &routine) {
 	showGameReel(&routine);
 	routine.mapY = _mapY;
 	if (routine.reelPointer() == 14) {
-		data.word(kWatchingtime) = 0;
+		_vars._watchingTime = 0;
 		_pointerMode = 2;
 	}
 }
@@ -1037,17 +1037,17 @@ void DreamBase::poolGuard(ReelRoutine &routine) {
 	if (routine.reelPointer() == 214 || routine.reelPointer() == 258) {
 		// Combat over 2
 		showGameReel(&routine);
-		data.word(kWatchingtime) = 2;
+		_vars._watchingTime = 2;
 		_pointerMode = 0;
-		data.byte(kCombatcount)++;
-		if (data.byte(kCombatcount) < 100)
+		_vars._combatCount++;
+		if (_vars._combatCount < 100)
 			return; // doneover2
-		data.word(kWatchingtime) = 0;
-		data.byte(kMandead) = 2;
+		_vars._watchingTime = 0;
+		_vars._manDead = 2;
 		return;
 	} else if (routine.reelPointer() == 185) {
 		// Combat over 1
-		data.word(kWatchingtime) = 0;
+		_vars._watchingTime = 0;
 		_pointerMode = 0;
 		turnPathOn(0);
 		turnPathOff(1);
@@ -1064,15 +1064,15 @@ void DreamBase::poolGuard(ReelRoutine &routine) {
 			// Not end guard 1
 			if (nextReelPointer == 147) {
 				nextReelPointer--;
-				if (data.byte(kLastweapon) == 1) {
+				if (_vars._lastWeapon == 1) {
 					// Gun on pool
-					data.byte(kLastweapon) = (byte)-1;
+					_vars._lastWeapon = (byte)-1;
 					nextReelPointer = 147;
 				} else {
 					// Gun not on pool
-					data.byte(kCombatcount)++;
-					if (data.byte(kCombatcount) == 40) {
-						data.byte(kCombatcount) = 0;
+					_vars._combatCount++;
+					if (_vars._combatCount == 40) {
+						_vars._combatCount = 0;
 						nextReelPointer = 220;
 					}
 				}
@@ -1080,14 +1080,14 @@ void DreamBase::poolGuard(ReelRoutine &routine) {
 		} else {
 			nextReelPointer--;
 
-			if (data.byte(kLastweapon) == 2) {
+			if (_vars._lastWeapon == 2) {
 				// Axe on pool
-				data.byte(kLastweapon) = (byte)-1;
+				_vars._lastWeapon = (byte)-1;
 				nextReelPointer = 122;
 			} else {
-				data.byte(kCombatcount)++;
-				if (data.byte(kCombatcount) == 40) {
-					data.byte(kCombatcount) = 0;
+				_vars._combatCount++;
+				if (_vars._combatCount == 40) {
+					_vars._combatCount = 0;
 					nextReelPointer = 195;
 				}
 			}
@@ -1100,10 +1100,10 @@ void DreamBase::poolGuard(ReelRoutine &routine) {
 	
 	if (routine.reelPointer() != 121 && routine.reelPointer() != 146) {
 		_pointerMode = 0;
-		data.word(kWatchingtime) = 2;
+		_vars._watchingTime = 2;
 	} else {
 		_pointerMode = 2;
-		data.word(kWatchingtime) = 0;
+		_vars._watchingTime = 0;
 	}
 }
 
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 3a27b7e05f..04e7a22ef8 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -220,7 +220,7 @@ const char *DreamBase::monPrint(const char *string) {
 				break;
 			}
 			if (c == '%') {
-				data.byte(kLasttrigger) = *iterator;
+				_vars._lastTrigger = *iterator;
 				iterator += 2;
 				done = true;
 				break;
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 06cf7e0012..95f1b3694d 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -44,6 +44,68 @@ void syncReelRoutine(Common::Serializer &s, ReelRoutine *reel) {
 	s.syncAsByte(reel->b7);
 }
 
+void syncGameVars(Common::Serializer &s, GameVars &vars) {
+	s.syncAsByte(vars._startVars);
+	s.syncAsByte(vars._progressPoints);
+	s.syncAsByte(vars._watchOn);
+	s.syncAsByte(vars._shadesOn);
+	s.syncAsByte(vars._secondCount);
+	s.syncAsByte(vars._minuteCount);
+	s.syncAsByte(vars._hourCount);
+	s.syncAsByte(vars._zoomOn);
+	s.syncAsByte(vars._location);
+	s.syncAsByte(vars._exPos);
+	s.syncAsUint16LE(vars._exFramePos);
+	s.syncAsUint16LE(vars._exTextPos);
+	s.syncAsUint16LE(vars._card1Money);
+	s.syncAsUint16LE(vars._listPos);
+	s.syncAsByte(vars._ryanPage);
+	s.syncAsUint16LE(vars._watchingTime);
+	s.syncAsUint16LE(vars._reelToWatch);
+	s.syncAsUint16LE(vars._endWatchReel);
+	s.syncAsByte(vars._speedCount);
+	s.syncAsByte(vars._watchSpeed);
+	s.syncAsUint16LE(vars._reelToHold);
+	s.syncAsUint16LE(vars._endOfHoldReel);
+	s.syncAsByte(vars._watchMode);
+	s.syncAsByte(vars._destAfterHold);
+	s.syncAsByte(vars._newsItem);
+	s.syncAsByte(vars._liftFlag);
+	s.syncAsByte(vars._liftPath);
+	s.syncAsByte(vars._lockStatus);
+	s.syncAsByte(vars._doorPath);
+	s.syncAsByte(vars._countToOpen);
+	s.syncAsByte(vars._countToClose);
+	s.syncAsByte(vars._rockstarDead);
+	s.syncAsByte(vars._generalDead);
+	s.syncAsByte(vars._sartainDead);
+	s.syncAsByte(vars._aideDead);
+	s.syncAsByte(vars._beenMugged);
+	s.syncAsByte(vars._gunPassFlag);
+	s.syncAsByte(vars._canMoveAltar);
+	s.syncAsByte(vars._talkedToAttendant);
+	s.syncAsByte(vars._talkedToSparky);
+	s.syncAsByte(vars._talkedToBoss);
+	s.syncAsByte(vars._talkedToRecep);
+	s.syncAsByte(vars._cardPassFlag);
+	s.syncAsByte(vars._madmanFlag);
+	s.syncAsByte(vars._keeperFlag);
+	s.syncAsByte(vars._lastTrigger);
+	s.syncAsByte(vars._manDead);
+	s.syncAsByte(vars._seed1);
+	s.syncAsByte(vars._seed2);
+	s.syncAsByte(vars._seed3);
+	s.syncAsByte(vars._needToTravel);
+	s.syncAsByte(vars._throughDoor);
+	s.syncAsByte(vars._newObs);
+	s.syncAsByte(vars._ryanOn);
+	s.syncAsByte(vars._combatCount);
+	s.syncAsByte(vars._lastWeapon);
+	s.syncAsByte(vars._dreamNumber);
+	s.syncAsByte(vars._roomAfterDream);
+	s.syncAsByte(vars._shakeCounter);
+}
+
 void DreamBase::loadGame() {
 	if (_commandType != 246) {
 		_commandType = 246;
@@ -137,7 +199,7 @@ void DreamBase::doLoad(int savegameId) {
 
 
 void DreamBase::saveGame() {
-	if (data.byte(kMandead) == 2) {
+	if (_vars._manDead == 2) {
 		blank();
 		return;
 	}
@@ -238,7 +300,7 @@ void DreamBase::oldToNames() {
 }
 
 void DreamBase::saveLoad() {
-	if (data.word(kWatchingtime) || (_pointerMode == 2)) {
+	if (_vars._watchingTime || (_pointerMode == 2)) {
 		blank();
 		return;
 	}
@@ -315,7 +377,7 @@ void DreamBase::doSaveLoad() {
 }
 
 void DreamBase::getBackFromOps() {
-	if (data.byte(kMandead) == 2)
+	if (_vars._manDead == 2)
 		blank();
 	else
 		getBack1();
@@ -435,13 +497,13 @@ void DreamBase::actualLoad() {
 
 void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 
-	const Room &currentRoom = g_roomData[data.byte(kLocation)];
+	const Room &currentRoom = g_roomData[_vars._location];
 
 	Room madeUpRoom = currentRoom;
 	madeUpRoom.roomsSample = _roomsSample;
 	madeUpRoom.mapX = _mapX;
 	madeUpRoom.mapY = _mapY;
-	madeUpRoom.liftFlag = data.byte(kLiftflag);
+	madeUpRoom.liftFlag = _vars._liftFlag;
 	madeUpRoom.b21 = _mansPath;
 	madeUpRoom.facing = _facing;
 	madeUpRoom.b27 = 255;
@@ -475,7 +537,9 @@ void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 
 	outSaveFile->write((const uint8 *)&header, sizeof(FileHeader));
 	outSaveFile->write(descbuf, len[0]);
-	outSaveFile->write(data.ptr(kStartvars, len[1]), len[1]);
+	// TODO: Convert more to serializer?
+	Common::Serializer s(0, outSaveFile);
+	syncGameVars(s, _vars);
 
 	// the Extras segment:
 	outSaveFile->write((const uint8 *)_exFrames._frames, 2080);
@@ -490,8 +554,6 @@ void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 	outSaveFile->write((const uint8 *)&madeUpRoom, sizeof(Room));
 	outSaveFile->write(_roomsCanGo, 16);
 
-	// TODO: Convert more to serializer?
-	Common::Serializer s(0, outSaveFile);
 	for (unsigned int i = 0; i < kNumReelRoutines; ++i) {
 		syncReelRoutine(s, &_reelRoutines[i]);
 	}
@@ -548,7 +610,10 @@ void DreamBase::loadPosition(unsigned int slot) {
 		uint8 namebuf[17];
 		inSaveFile->read(namebuf, 17);
 	}
-	inSaveFile->read(data.ptr(kStartvars, len[1]), len[1]);
+
+	// TODO: Use serializer for more?
+	Common::Serializer s(inSaveFile, 0);
+	syncGameVars(s, _vars);
 
 	// the Extras segment:
 	inSaveFile->read((uint8 *)_exFrames._frames, kExframes);
@@ -565,8 +630,6 @@ void DreamBase::loadPosition(unsigned int slot) {
 	inSaveFile->read((uint8 *)&g_madeUpRoomDat, sizeof(Room));
 	inSaveFile->read(_roomsCanGo, 16);
 
-	// TODO: Use serializer for more
-	Common::Serializer s(inSaveFile, 0);
 	for (unsigned int i = 0; i < kNumReelRoutines; ++i) {
 		syncReelRoutine(s, &_reelRoutines[i]);
 	}
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index c2646d6588..a04f877f2c 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -89,7 +89,7 @@ Sprite *DreamBase::makeSprite(uint8 x, uint8 y, uint16 updateCallback, const Gra
 void DreamBase::spriteUpdate() {
 	// During the intro the sprite table can be empty
 	if (!_spriteTable.empty())
-		_spriteTable.front().hidden = data.byte(kRyanon);
+		_spriteTable.front().hidden = _vars._ryanOn;
 
 	Common::List<Sprite>::iterator i;
 	for (i = _spriteTable.begin(); i != _spriteTable.end(); ++i) {
@@ -286,7 +286,7 @@ void DreamBase::doDoor(Sprite *sprite, SetObject *objData, Common::Rect check) {
 
 	if (openDoor) {
 
-		if ((data.byte(kThroughdoor) == 1) && (sprite->animFrame == 0))
+		if ((_vars._throughDoor == 1) && (sprite->animFrame == 0))
 			sprite->animFrame = 6;
 
 		++sprite->animFrame;
@@ -302,7 +302,7 @@ void DreamBase::doDoor(Sprite *sprite, SetObject *objData, Common::Rect check) {
 			--sprite->animFrame;
 
 		sprite->frameNumber = objData->index = objData->frames[sprite->animFrame];
-		data.byte(kThroughdoor) = 1;
+		_vars._throughDoor = 1;
 
 	} else {
 		// shut door
@@ -320,7 +320,7 @@ void DreamBase::doDoor(Sprite *sprite, SetObject *objData, Common::Rect check) {
 
 		sprite->frameNumber = objData->index = objData->frames[sprite->animFrame];
 		if (sprite->animFrame == 5) // nearly
-			data.byte(kThroughdoor) = 0;
+			_vars._throughDoor = 0;
 	}
 }
 
@@ -338,7 +338,7 @@ void DreamBase::lockedDoorway(Sprite *sprite, SetObject *objData) {
 	check.translate(sprite->x, sprite->y);
 	bool openDoor = check.contains(ryanx, ryany);
 
-	if (data.byte(kThroughdoor) != 1 && data.byte(kLockstatus) == 1)
+	if (_vars._throughDoor != 1 && _vars._lockStatus == 1)
 		openDoor = false;
 
 	if (openDoor) {
@@ -348,9 +348,9 @@ void DreamBase::lockedDoorway(Sprite *sprite, SetObject *objData) {
 		}
 
 		if (sprite->animFrame == 6)
-			turnPathOn(data.byte(kDoorpath));
+			turnPathOn(_vars._doorPath);
 
-		if (data.byte(kThroughdoor) == 1 && sprite->animFrame == 0)
+		if (_vars._throughDoor == 1 && sprite->animFrame == 0)
 			sprite->animFrame = 6;
 
 		++sprite->animFrame;
@@ -359,7 +359,7 @@ void DreamBase::lockedDoorway(Sprite *sprite, SetObject *objData) {
 
 		sprite->frameNumber = objData->index = objData->frames[sprite->animFrame];
 		if (sprite->animFrame == 5)
-			data.byte(kThroughdoor) = 1;
+			_vars._throughDoor = 1;
 
 	} else {
 		// shut door
@@ -371,43 +371,43 @@ void DreamBase::lockedDoorway(Sprite *sprite, SetObject *objData) {
 		if (sprite->animFrame != 0)
 			--sprite->animFrame;
 	
-		data.byte(kThroughdoor) = 0;
+		_vars._throughDoor = 0;
 		sprite->frameNumber = objData->index = objData->frames[sprite->animFrame];
 
 		if (sprite->animFrame == 0) {
-			turnPathOff(data.byte(kDoorpath));
-			data.byte(kLockstatus) = 1;
+			turnPathOff(_vars._doorPath);
+			_vars._lockStatus = 1;
 		}
 	}
 }
 
 void DreamBase::liftSprite(Sprite *sprite, SetObject *objData) {
-	uint8 liftFlag = data.byte(kLiftflag);
+	uint8 liftFlag = _vars._liftFlag;
 	if (liftFlag == 0) { //liftclosed
-		turnPathOff(data.byte(kLiftpath));
+		turnPathOff(_vars._liftPath);
 
-		if (data.byte(kCounttoopen) != 0) {
-			data.byte(kCounttoopen)--;
-			if (data.byte(kCounttoopen) == 0)
-				data.byte(kLiftflag) = 3;
+		if (_vars._countToOpen != 0) {
+			_vars._countToOpen--;
+			if (_vars._countToOpen == 0)
+				_vars._liftFlag = 3;
 		}
 		sprite->animFrame = 0;
 		sprite->frameNumber = objData->index = objData->frames[sprite->animFrame];
 	}
 	else if (liftFlag == 1) {  //liftopen
-		turnPathOn(data.byte(kLiftpath));
+		turnPathOn(_vars._liftPath);
 
-		if (data.byte(kCounttoclose) != 0) {
-			data.byte(kCounttoclose)--;
-			if (data.byte(kCounttoclose) == 0)
-				data.byte(kLiftflag) = 2;
+		if (_vars._countToClose != 0) {
+			_vars._countToClose--;
+			if (_vars._countToClose == 0)
+				_vars._liftFlag = 2;
 		}
 		sprite->animFrame = 12;
 		sprite->frameNumber = objData->index = objData->frames[sprite->animFrame];
 	}	
 	else if (liftFlag == 3) { //openlift
 		if (sprite->animFrame == 12) {
-			data.byte(kLiftflag) = 1;
+			_vars._liftFlag = 1;
 			return;
 		}
 		++sprite->animFrame;
@@ -418,7 +418,7 @@ void DreamBase::liftSprite(Sprite *sprite, SetObject *objData) {
 	} else { //closeLift
 		assert(liftFlag == 2);
 		if (sprite->animFrame == 0) {
-			data.byte(kLiftflag) = 0;
+			_vars._liftFlag = 0;
 			return;
 		}
 		--sprite->animFrame;
@@ -497,7 +497,7 @@ void DreamBase::showRain() {
 
 	if (_channel1Playing != 255)
 		return;
-	if (_realLocation == 2 && data.byte(kBeenmugged) != 1)
+	if (_realLocation == 2 && _vars._beenMugged != 1)
 		return;
 	if (_realLocation == 55)
 		return;
@@ -803,7 +803,7 @@ void DreamBase::reelsOnScreen() {
 void DreamBase::reconstruct() {
 	if (_haveDoneObs == 0)
 		return;
-	data.byte(kNewobs) = 1;
+	_vars._newObs = 1;
 	drawFloor();
 	spriteUpdate();
 	printSprites();
@@ -1186,7 +1186,7 @@ void DreamBase::checkForExit(Sprite *sprite) {
 
 	}
 
-	data.byte(kNeedtotravel) = 1;
+	_vars._needToTravel = 1;
 }
 
 } // End of namespace DreamGen
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index db1e51fafc..defc6850d0 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -343,6 +343,68 @@ struct GraphicsFile {
 	}
 };
 
+struct GameVars {
+	uint8 _startVars;
+	uint8 _progressPoints;
+	uint8 _watchOn;
+	uint8 _shadesOn;
+	uint8 _secondCount;
+	uint8 _minuteCount;
+	uint8 _hourCount;
+	uint8 _zoomOn;
+	uint8 _location;
+	uint8 _exPos;
+	uint16 _exFramePos;
+	uint16 _exTextPos;
+	uint16 _card1Money;
+	uint16 _listPos;
+	uint8 _ryanPage;
+	uint16 _watchingTime;
+	uint16 _reelToWatch; // reel plays from here in mode 0
+	uint16 _endWatchReel; // and stops here. Mode set to 1
+	uint8 _speedCount;
+	uint8 _watchSpeed;
+	uint16 _reelToHold; // if mode is 1 hold on this reel
+	uint16 _endOfHoldReel; // if mode is 2 then play to endOfHoldReel and reset mode to -1
+	uint8 _watchMode;
+	uint8 _destAfterHold; // set walking destination
+	uint8 _newsItem;
+	uint8 _liftFlag;
+	uint8 _liftPath;
+	uint8 _lockStatus;
+	uint8 _doorPath;
+	uint8 _countToOpen;
+	uint8 _countToClose;
+	uint8 _rockstarDead;
+	uint8 _generalDead;
+	uint8 _sartainDead;
+	uint8 _aideDead;
+	uint8 _beenMugged;
+	uint8 _gunPassFlag;
+	uint8 _canMoveAltar;
+	uint8 _talkedToAttendant;
+	uint8 _talkedToSparky;
+	uint8 _talkedToBoss;
+	uint8 _talkedToRecep;
+	uint8 _cardPassFlag;
+	uint8 _madmanFlag;
+	uint8 _keeperFlag;
+	uint8 _lastTrigger;
+	uint8 _manDead;
+	uint8 _seed1;
+	uint8 _seed2;
+	uint8 _seed3;
+	uint8 _needToTravel;
+	uint8 _throughDoor;
+	uint8 _newObs;
+	uint8 _ryanOn;
+	uint8 _combatCount;
+	uint8 _lastWeapon;
+	uint8 _dreamNumber;
+	uint8 _roomAfterDream;
+	uint8 _shakeCounter;
+};
+
 
 } // End of namespace DreamWeb
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 59fb00e3e6..b0b4e621c8 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -560,8 +560,8 @@ void DreamBase::dreamweb() {
 			clearChanges();
 			setMode();
 			loadPalFromIFF();
-			data.byte(kLocation) = 255;
-			data.byte(kRoomafterdream) = 1;
+			_vars._location = 255;
+			_vars._roomAfterDream = 1;
 			_newLocation = 35;
 			_volume = 7;
 			loadRoom();
@@ -599,18 +599,18 @@ void DreamBase::dreamweb() {
 				goto done;
 			}
 
-			if (data.byte(kMandead) == 1 || data.byte(kMandead) == 2)
+			if (_vars._manDead == 1 || _vars._manDead == 2)
 				break;
 
-			if (data.word(kWatchingtime) > 0) {
+			if (_vars._watchingTime > 0) {
 				if (_finalDest == _mansPath)
-					data.word(kWatchingtime)--;
+					_vars._watchingTime--;
 			}
 
-			if (data.word(kWatchingtime) == 0) {
+			if (_vars._watchingTime == 0) {
 				// "notWatching"
 
-				if (data.byte(kMandead) == 4)
+				if (_vars._manDead == 4)
 					break;
 
 				if (_newLocation != 255) {
@@ -697,7 +697,7 @@ void DreamBase::screenUpdate() {
 	animPointer();
 
 	showPointer();
-	if ((data.word(kWatchingtime) == 0) && (_newLocation != 0xff))
+	if ((_vars._watchingTime == 0) && (_newLocation != 0xff))
 		return;
 	vSync();
 	uint16 mouseState = 0;
@@ -749,7 +749,7 @@ void DreamBase::startup() {
 	_currentKey = 0;
 	_mainMode = 0;
 	createPanel();
-	data.byte(kNewobs) = 1;
+	_vars._newObs = 1;
 	drawFloor();
 	showIcon();
 	getUnderZoom();
@@ -762,7 +762,7 @@ void DreamBase::startup() {
 
 void DreamBase::startup1() {
 	clearPalette();
-	data.byte(kThroughdoor) = 0;
+	_vars._throughDoor = 0;
 
 	startup();
 
@@ -771,11 +771,11 @@ void DreamBase::startup1() {
 }
 
 void DreamBase::switchRyanOn() {
-	data.byte(kRyanon) = 255;
+	_vars._ryanOn = 255;
 }
 
 void DreamBase::switchRyanOff() {
-	data.byte(kRyanon) = 1;
+	_vars._ryanOn = 1;
 }
 
 void DreamBase::loadGraphicsFile(GraphicsFile &file, const char *fileName) {
@@ -898,17 +898,17 @@ void DreamBase::triggerMessage(uint16 index) {
 	hangOn(340);
 	multiPut(_mapStore, 174, 153, 200, 63);
 	workToScreen();
-	data.byte(kLasttrigger) = 0;
+	_vars._lastTrigger = 0;
 }
 
 void DreamBase::processTrigger() {
-	if (data.byte(kLasttrigger) == '1') {
+	if (_vars._lastTrigger == '1') {
 		setLocation(8);
 		triggerMessage(45);
-	} else if (data.byte(kLasttrigger) == '2') {
+	} else if (_vars._lastTrigger == '2') {
 		setLocation(9);
 		triggerMessage(55);
-	} else if (data.byte(kLasttrigger) == '3') {
+	} else if (_vars._lastTrigger == '3') {
 		setLocation(2);
 		triggerMessage(59);
 	}
@@ -975,9 +975,9 @@ void DreamBase::getTime() {
 	TimeDate t;
 	g_system->getTimeAndDate(t);
 	debug(1, "\tgettime: %02d:%02d:%02d", t.tm_hour, t.tm_min, t.tm_sec);
-	data.byte(kSecondcount) = t.tm_sec;
-	data.byte(kMinutecount) = t.tm_min;
-	data.byte(kHourcount) = t.tm_hour;
+	_vars._secondCount = t.tm_sec;
+	_vars._minuteCount = t.tm_min;
+	_vars._hourCount = t.tm_hour;
 }
 
 uint16 DreamBase::allocateMem(uint16 paragraphs) {
@@ -1007,7 +1007,7 @@ void DreamBase::DOSReturn() {
 }
 
 void DreamBase::eraseOldObs() {
-	if (data.byte(kNewobs) == 0)
+	if (_vars._newObs == 0)
 		return;
 
 	// Note: the original didn't delete sprites here, but marked the
@@ -1058,20 +1058,20 @@ void DreamBase::clearAndLoad(uint8 *buf, uint8 c,
 }
 
 void DreamBase::startLoading(const Room &room) {
-	data.byte(kCombatcount) = 0;
+	_vars._combatCount = 0;
 	_roomsSample = room.roomsSample;
 	_mapX = room.mapX;
 	_mapY = room.mapY;
-	data.byte(kLiftflag) = room.liftFlag;
+	_vars._liftFlag = room.liftFlag;
 	_mansPath = room.b21;
 	_destination = room.b21;
 	_finalDest = room.b21;
 	_facing = room.facing;
 	_turnToFace = room.facing;
-	data.byte(kCounttoopen) = room.countToOpen;
-	data.byte(kLiftpath) = room.liftPath;
-	data.byte(kDoorpath) = room.doorPath;
-	data.byte(kLastweapon) = (uint8)-1;
+	_vars._countToOpen = room.countToOpen;
+	_vars._liftPath = room.liftPath;
+	_vars._doorPath = room.doorPath;
+	_vars._lastWeapon = (uint8)-1;
 	_realLocation = room.realLocation;
 
 	loadRoomData(room, false);
@@ -1081,8 +1081,8 @@ void DreamBase::startLoading(const Room &room) {
 	setAllChanges();
 	autoAppear();
 //	const Room &newRoom = g_roomData[_newLocation];
-	data.byte(kLastweapon) = (uint8)-1;
-	data.byte(kMandead) = 0;
+	_vars._lastWeapon = (uint8)-1;
+	_vars._manDead = 0;
 	_lookCounter = 160;
 	_newLocation = 255;
 	_linePointer = 254;
@@ -1415,11 +1415,11 @@ void DreamBase::obName(uint8 command, uint8 commandType) {
 			} else if (!finishedWalking())
 				return;
 			else if (_commandType == 5) {
-				if (data.word(kWatchingtime) == 0)
+				if (_vars._watchingTime == 0)
 					talk();
 				return;
 			} else {
-				if (data.word(kWatchingtime) == 0)
+				if (_vars._watchingTime == 0)
 					examineOb();
 				return;
 			}
@@ -1429,7 +1429,7 @@ void DreamBase::obName(uint8 command, uint8 commandType) {
 
 	_command = command;
 	_commandType = commandType;
-	if ((_linePointer != 254) || (data.word(kWatchingtime) != 0) || (_facing != _turnToFace)) {
+	if ((_linePointer != 254) || (_vars._watchingTime != 0) || (_facing != _turnToFace)) {
 		blockNameText();
 		return;
 	} else if (_commandType != 3) {
@@ -1484,7 +1484,7 @@ void DreamBase::showBlink() {
 	if (_manIsOffScreen == 1)
 		return;
 	++_blinkCount;
-	if (data.byte(kShadeson) != 0)
+	if (_vars._shadesOn != 0)
 		return;
 	if (_realLocation >= 50) // eyesshut
 		return;
@@ -1502,7 +1502,7 @@ void DreamBase::showBlink() {
 }
 
 void DreamBase::dumpBlink() {
-	if (data.byte(kShadeson) != 0)
+	if (_vars._shadesOn != 0)
 		return;
 	if (_blinkCount != 0)
 		return;
@@ -1582,7 +1582,7 @@ void DreamBase::animPointer() {
 		_pointerFrame = flashMouseTab[_pointerCount];
 		return;
 	}
-	if (data.word(kWatchingtime) != 0) {
+	if (_vars._watchingTime != 0) {
 		_pointerFrame = 11;
 		return;
 	}
@@ -1851,7 +1851,7 @@ void DreamBase::enterSymbol() {
 }
 
 void DreamBase::zoomOnOff() {
-	if (data.word(kWatchingtime) != 0 || _pointerMode == 2) {
+	if (_vars._watchingTime != 0 || _pointerMode == 2) {
 		blank();
 		return;
 	}
@@ -1864,9 +1864,9 @@ void DreamBase::zoomOnOff() {
 	if (!(_mouseButton & 1) || (_mouseButton == _oldButton))
 		return;
 
-	data.byte(kZoomon) ^= 1;
+	_vars._zoomOn ^= 1;
 	createPanel();
-	data.byte(kNewobs) = 0;
+	_vars._newObs = 0;
 	drawFloor();
 	printSprites();
 	reelsOnScreen();
@@ -1890,7 +1890,7 @@ void DreamBase::sortOutMap() {
 
 void DreamBase::mainScreen() {
 	_inMapArea = 0;
-	if (data.byte(kWatchon) == 1) {
+	if (_vars._watchOn == 1) {
 		RectWithCallback<DreamBase> mainList[] = {
 			{ 44,70,32,46,&DreamBase::look },
 			{ 0,50,0,180,&DreamBase::inventory },
@@ -1919,7 +1919,7 @@ void DreamBase::mainScreen() {
 }
 
 void DreamBase::showWatch() {
-	if (data.byte(kWatchon)) {
+	if (_vars._watchOn) {
 		showFrame(_icons1, 250, 1, 6, 0);
 		showTime();
 	}
@@ -1933,12 +1933,12 @@ void DreamBase::dumpWatch() {
 }
 
 void DreamBase::showTime() {
-	if (data.byte(kWatchon) == 0)
+	if (_vars._watchOn == 0)
 		return;
 
-	int seconds = data.byte(kSecondcount);
-	int minutes = data.byte(kMinutecount);
-	int hours = data.byte(kHourcount);
+	int seconds = _vars._secondCount;
+	int minutes = _vars._minuteCount;
+	int hours = _vars._hourCount;
 
 	showFrame(_charset1, 282+5, 21, 91*3+10 + seconds / 10, 0);
 	showFrame(_charset1, 282+9, 21, 91*3+10 + seconds % 10, 0);
@@ -1953,7 +1953,7 @@ void DreamBase::showTime() {
 }
 
 void DreamBase::watchCount() {
-	if (data.byte(kWatchon) == 0)
+	if (_vars._watchOn == 0)
 		return;
 	++_timerCount;
 	if (_timerCount == 9) {
@@ -1961,15 +1961,15 @@ void DreamBase::watchCount() {
 		_watchDump = 1;
 	} else if (_timerCount == 18) {
 		_timerCount = 0;
-		++data.byte(kSecondcount);
-		if (data.byte(kSecondcount) == 60) {
-			data.byte(kSecondcount) = 0;
-			++data.byte(kMinutecount);
-			if (data.byte(kMinutecount) == 60) {
-				data.byte(kMinutecount) = 0;
-				++data.byte(kHourcount);
-				if (data.byte(kHourcount) == 24)
-					data.byte(kHourcount) = 0;
+		++_vars._secondCount;
+		if (_vars._secondCount == 60) {
+			_vars._secondCount = 0;
+			++_vars._minuteCount;
+			if (_vars._minuteCount == 60) {
+				_vars._minuteCount = 0;
+				++_vars._hourCount;
+				if (_vars._hourCount == 24)
+					_vars._hourCount = 0;
 			}
 		}
 		showTime();
@@ -1983,7 +1983,7 @@ void DreamBase::roomName() {
 	if (textIndex >= 32)
 		textIndex -= 32;
 	_lineSpacing = 7;
-	uint8 maxWidth = (data.byte(kWatchon) == 1) ? 120 : 160;
+	uint8 maxWidth = (_vars._watchOn == 1) ? 120 : 160;
 	const uint8 *string = (const uint8 *)_roomDesc.getString(textIndex);
 	printDirect(string, 88, 25, maxWidth, false);
 	_lineSpacing = 10;
@@ -1999,7 +1999,7 @@ void DreamBase::loadRoom() {
 	_textAddressX = 13;
 	_textAddressY = 182;
 	_textLen = 240;
-	data.byte(kLocation) = _newLocation;
+	_vars._location = _newLocation;
 	const Room &room = g_roomData[_newLocation];
 	startLoading(room);
 	loadRoomsSample();
@@ -2043,13 +2043,13 @@ void DreamBase::autoLook() {
 	--_lookCounter;
 	if (_lookCounter)
 		return;
-	if (data.word(kWatchingtime))
+	if (_vars._watchingTime)
 		return;
 	doLook();
 }
 
 void DreamBase::look() {
-	if (data.word(kWatchingtime) || (_pointerMode == 2)) {
+	if (_vars._watchingTime || (_pointerMode == 2)) {
 		blank();
 		return;
 	}
@@ -2192,7 +2192,7 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 }
 
 void DreamBase::restoreAll() {
-	const Room &room = g_roomData[data.byte(kLocation)];
+	const Room &room = g_roomData[_vars._location];
 	loadRoomData(room, true);
 	setAllChanges();
 }
@@ -2322,18 +2322,18 @@ void DreamBase::showExit() {
 void DreamBase::showMan() {
 	showFrame(_icons1, 0, 0, 0, 0);
 	showFrame(_icons1, 0, 114, 1, 0);
-	if (data.byte(kShadeson))
+	if (_vars._shadesOn)
 		showFrame(_icons1, 28, 25, 2, 0);
 }
 
 void DreamBase::panelIcons1() {
 	uint16 x;
-	if (data.byte(kWatchon) != 1)
+	if (_vars._watchOn != 1)
 		x = 48;
 	else
 		x = 0;
 	showFrame(_icons2, 204 + x, 4, 2, 0);
-	if (data.byte(kZoomon) != 1)
+	if (_vars._zoomOn != 1)
 		showFrame(_icons1, 228 + x, 8, 5, 0);
 	showWatch();
 }
@@ -2399,7 +2399,7 @@ void DreamBase::lastFolder() {
 
 void DreamBase::folderHints() {
 	if (_folderPage == 5) {
-		if ((data.byte(kAidedead) != 1) && (getLocation(13) != 1)) {
+		if ((_vars._aideDead != 1) && (getLocation(13) != 1)) {
 			setLocation(13);
 			showFolder();
 			const uint8 *string = getTextInFile1(30);
@@ -2441,7 +2441,7 @@ void DreamBase::drawFloor() {
 	showAllEx();
 	panelToMap();
 	initRain();
-	data.byte(kNewobs) = 0;
+	_vars._newObs = 0;
 }
 
 void DreamBase::allocateBuffers() {
@@ -2482,7 +2482,7 @@ void DreamBase::useMenu() {
 	createPanel();
 	showPanel();
 	showIcon();
-	data.byte(kNewobs) = 0;
+	_vars._newObs = 0;
 	drawFloor();
 	printSprites();
 	showFrame(_tempGraphics2, kMenux-48, kMenuy-4, 4, 0);
@@ -2526,7 +2526,7 @@ void DreamBase::atmospheres() {
 			continue;
 		if (a->_sound != _channel0Playing) {
 
-			if (data.byte(kLocation) == 45 && data.word(kReeltowatch) == 45)
+			if (_vars._location == 45 && _vars._reelToWatch == 45)
 				continue; // "web"
 
 			playChannel0(a->_sound, a->_repeat);
@@ -2708,16 +2708,16 @@ void DreamBase::initialInv() {
 	pickupOb(19, 1);
 	pickupOb(20, 9);
 	pickupOb(16, 2);
-	data.byte(kWatchmode) = 1;
-	data.word(kReeltohold) = 0;
-	data.word(kEndofholdreel) = 6;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
+	_vars._watchMode = 1;
+	_vars._reelToHold = 0;
+	_vars._endOfHoldReel = 6;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
 	switchRyanOff();
 }
 
 void DreamBase::walkIntoRoom() {
-	if (data.byte(kLocation) == 14 && _mapX == 22) {
+	if (_vars._location == 14 && _mapX == 22) {
 		_destination = 1;
 		_finalDest = 1;
 		autoSetWalk();
@@ -2730,7 +2730,7 @@ void DreamBase::afterIntroRoom() {
 
 	clearWork();
 	findRoomInLoc();
-	data.byte(kNewobs) = 1;
+	_vars._newObs = 1;
 	drawFloor();
 	reelsOnScreen();
 	spriteUpdate();
@@ -2742,7 +2742,7 @@ void DreamBase::afterIntroRoom() {
 void DreamBase::redrawMainScrn() {
 	_timeCount = 0;
 	createPanel();
-	data.byte(kNewobs) = 0;
+	_vars._newObs = 0;
 	drawFloor();
 	printSprites();
 	reelsOnScreen();
@@ -2768,7 +2768,7 @@ void DreamBase::allPointer() {
 
 void DreamBase::makeMainScreen() {
 	createPanel();
-	data.byte(kNewobs) = 1;
+	_vars._newObs = 1;
 	drawFloor();
 	spriteUpdate();
 	printSprites();
@@ -2949,59 +2949,59 @@ void DreamBase::underTextLine() {
 }
 
 void DreamBase::showWatchReel() {
-	uint16 reelPointer = data.word(kReeltowatch);
+	uint16 reelPointer = _vars._reelToWatch;
 	plotReel(reelPointer);
-	data.word(kReeltowatch) = reelPointer;
+	_vars._reelToWatch = reelPointer;
 
 	// check for shake
 	if (_realLocation == 26 && reelPointer == 104)
-		data.byte(kShakecounter) = 0xFF;
+		_vars._shakeCounter = 0xFF;
 }
 
 void DreamBase::watchReel() {
-	if (data.word(kReeltowatch) != 0xFFFF) {
+	if (_vars._reelToWatch != 0xFFFF) {
 		if (_mansPath != _finalDest)
 			return; // Wait until stopped walking
 		if (_turnToFace != _facing)
 			return;
 
-		if (--data.byte(kSpeedcount) != 0xFF) {
+		if (--_vars._speedCount != 0xFF) {
 			showWatchReel();
 			return;
 		}
-		data.byte(kSpeedcount) = data.byte(kWatchspeed);
-		if (data.word(kReeltowatch) != data.word(kEndwatchreel)) {
-			++data.word(kReeltowatch);
+		_vars._speedCount = _vars._watchSpeed;
+		if (_vars._reelToWatch != _vars._endWatchReel) {
+			++_vars._reelToWatch;
 			showWatchReel();
 			return;
 		}
-		if (data.word(kWatchingtime)) {
+		if (_vars._watchingTime) {
 			showWatchReel();
 			return;
 		}
-		data.word(kReeltowatch) = 0xFFFF;
-		data.byte(kWatchmode) = 0xFF;
-		if (data.word(kReeltohold) == 0xFFFF)
+		_vars._reelToWatch = 0xFFFF;
+		_vars._watchMode = 0xFF;
+		if (_vars._reelToHold == 0xFFFF)
 			return; // No more reel
-		data.byte(kWatchmode) = 1;
-	} else if (data.byte(kWatchmode) != 1) {
-		if (data.byte(kWatchmode) != 2)
+		_vars._watchMode = 1;
+	} else if (_vars._watchMode != 1) {
+		if (_vars._watchMode != 2)
 			return; // "notreleasehold"
-		if (--data.byte(kSpeedcount) == 0xFF) {
-			data.byte(kSpeedcount) = data.byte(kWatchspeed);
-			++data.word(kReeltohold);
+		if (--_vars._speedCount == 0xFF) {
+			_vars._speedCount = _vars._watchSpeed;
+			++_vars._reelToHold;
 		}
-		if (data.word(kReeltohold) == data.word(kEndofholdreel)) {
-			data.word(kReeltohold) = 0xFFFF;
-			data.byte(kWatchmode) = 0xFF;
-			_destination = data.byte(kDestafterhold);
-			_finalDest = data.byte(kDestafterhold);
+		if (_vars._reelToHold == _vars._endOfHoldReel) {
+			_vars._reelToHold = 0xFFFF;
+			_vars._watchMode = 0xFF;
+			_destination = _vars._destAfterHold;
+			_finalDest = _vars._destAfterHold;
 			autoSetWalk();
 			return;
 		}
 	}
 
-	uint16 reelPointer = data.word(kReeltohold);
+	uint16 reelPointer = _vars._reelToHold;
 	plotReel(reelPointer);
 }
 
@@ -3013,12 +3013,12 @@ void DreamBase::afterNewRoom() {
 	createPanel();
 	_commandType = 0;
 	findRoomInLoc();
-	if (data.byte(kRyanon) != 1) {
+	if (_vars._ryanOn != 1) {
 		_mansPath = findPathOfPoint(_ryanX + 12, _ryanY + 12);
 		findXYFromPath();
 		_resetManXY = 1;
 	}
-	data.byte(kNewobs) = 1;
+	_vars._newObs = 1;
 	drawFloor();
 	_lookCounter = 160;
 	_nowInNewRoom = 0;
@@ -3037,10 +3037,10 @@ void DreamBase::afterNewRoom() {
 }
 
 void DreamBase::madmanRun() {
-	if (data.byte(kLocation)    != 14 ||
+	if (_vars._location    != 14 ||
 		_mapX        != 22 ||
 		_pointerMode !=  2 ||
-		data.byte(kMadmanflag)  !=  0) {
+		_vars._madmanFlag  !=  0) {
 		identifyOb();
 		return;
 	}
@@ -3052,7 +3052,7 @@ void DreamBase::madmanRun() {
 
 	if (_mouseButton == 1 &&
 		_mouseButton != _oldButton)
-		data.byte(kLastweapon) = 8;
+		_vars._lastWeapon = 8;
 }
 
 
@@ -3061,7 +3061,7 @@ void DreamBase::decide() {
 	loadPalFromIFF();
 	clearPalette();
 	_pointerMode = 0;
-	data.word(kWatchingtime) = 0;
+	_vars._watchingTime = 0;
 	_pointerFrame = 0;
 	_textAddressX = 70;
 	_textAddressY = 182 - 8;
@@ -3227,7 +3227,7 @@ void DreamBase::getBack1() {
 }
 
 void DreamBase::autoAppear() {
-	if (data.byte(kLocation) == 32) {
+	if (_vars._location == 32) {
 		// In alley
 		resetLocation(5);
 		setLocation(10);
@@ -3237,8 +3237,8 @@ void DreamBase::autoAppear() {
 
 	if (_realLocation == 24) {
 		// In Eden's apartment
-		if (data.byte(kGeneraldead) == 1) {
-			data.byte(kGeneraldead)++;
+		if (_vars._generalDead == 1) {
+			_vars._generalDead++;
 			placeSetObject(44);
 			placeSetObject(18);
 			placeSetObject(93);
@@ -3247,23 +3247,23 @@ void DreamBase::autoAppear() {
 			removeSetObject(75);
 			removeSetObject(84);
 			removeSetObject(85);
-		} else if (data.byte(kSartaindead) == 1) {
+		} else if (_vars._sartainDead == 1) {
 			// Eden's part 2
 			removeSetObject(44);
 			removeSetObject(93);
 			placeSetObject(55);
-			data.byte(kSartaindead)++;
+			_vars._sartainDead++;
 		}
 	} else {
 		// Not in Eden's
 		if (_realLocation == 25) {
 			// Sart roof
-			data.byte(kNewsitem) = 3;
+			_vars._newsItem = 3;
 			resetLocation(6);
 			setLocation(11);
 			_destPos = 11;
 		} else {
-			if (_realLocation == 2 && data.byte(kRockstardead) != 0)
+			if (_realLocation == 2 && _vars._rockstarDead != 0)
 				placeSetObject(23);
 		}
 	}
@@ -3292,7 +3292,7 @@ void DreamBase::setupTimedUse(uint16 textIndex, uint16 countToTimed, uint16 time
 }
 
 void DreamBase::entryTexts() {
-	switch (data.byte(kLocation)) {
+	switch (_vars._location) {
 	case 21:
 		setupTimedUse(28, 60, 11, 68, 64);
 		break;
@@ -3320,33 +3320,33 @@ void DreamBase::entryTexts() {
 }
 
 void DreamBase::entryAnims() {
-	data.word(kReeltowatch) = 0xFFFF;
-	data.byte(kWatchmode) = (byte)-1;
+	_vars._reelToWatch = 0xFFFF;
+	_vars._watchMode = (byte)-1;
 
-	switch (data.byte(kLocation)) {
+	switch (_vars._location) {
 	case 33:	// beach
 		switchRyanOff();
-		data.word(kWatchingtime) = 76 * 2;
-		data.word(kReeltowatch) = 0;
-		data.word(kEndwatchreel) = 76;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 76 * 2;
+		_vars._reelToWatch = 0;
+		_vars._endWatchReel = 76;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 		break;
 	case 44:	// Sparky's
 		resetLocation(8);
-		data.word(kWatchingtime) = 50*2;
-		data.word(kReeltowatch) = 247;
-		data.word(kEndwatchreel) = 297;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 50*2;
+		_vars._reelToWatch = 247;
+		_vars._endWatchReel = 297;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 		switchRyanOff();
 		break;
 	case 22:	// lift
-		data.word(kWatchingtime) = 31 * 2;
-		data.word(kReeltowatch) = 0;
-		data.word(kEndwatchreel) = 30;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 31 * 2;
+		_vars._reelToWatch = 0;
+		_vars._endWatchReel = 30;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 		switchRyanOff();
 		break;
 	case 26:	// under church
@@ -3354,18 +3354,18 @@ void DreamBase::entryAnims() {
 		_symbolBotNum = 1;
 		break;
 	case 45:	// entered Dreamweb
-		data.byte(kKeeperflag) = 0;
-		data.word(kWatchingtime) = 296;
-		data.word(kReeltowatch) = 45;
-		data.word(kEndwatchreel) = 198;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._keeperFlag = 0;
+		_vars._watchingTime = 296;
+		_vars._reelToWatch = 45;
+		_vars._endWatchReel = 198;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 		switchRyanOff();
 		break;
 	default:
-		if (_realLocation == 46 && data.byte(kSartaindead) == 1) {	// Crystal
+		if (_realLocation == 46 && _vars._sartainDead == 1) {	// Crystal
 			removeFreeObject(0);
-		} else if (data.byte(kLocation) == 9 && !checkIfPathIsOn(2) && data.byte(kAidedead) != 0) {
+		} else if (_vars._location == 9 && !checkIfPathIsOn(2) && _vars._aideDead != 0) {
 			// Top of church
 			if (checkIfPathIsOn(3))
 				turnPathOn(2);
@@ -3373,24 +3373,24 @@ void DreamBase::entryAnims() {
 			// Make doors open
 			removeSetObject(4);
 			placeSetObject(5);
-		} else if (data.byte(kLocation) == 47) {	// Dream centre
+		} else if (_vars._location == 47) {	// Dream centre
 			placeSetObject(4);
 			placeSetObject(5);
-		} else if (data.byte(kLocation) == 38) {	// Car park
-			data.word(kWatchingtime) = 57 * 2;
-			data.word(kReeltowatch) = 4;
-			data.word(kEndwatchreel) = 57;
-			data.byte(kWatchspeed) = 1;
-			data.byte(kSpeedcount) = 1;
+		} else if (_vars._location == 38) {	// Car park
+			_vars._watchingTime = 57 * 2;
+			_vars._reelToWatch = 4;
+			_vars._endWatchReel = 57;
+			_vars._watchSpeed = 1;
+			_vars._speedCount = 1;
 			switchRyanOff();
-		} else if (data.byte(kLocation) == 32) {	// Alley
-			data.word(kWatchingtime) = 66 * 2;
-			data.word(kReeltowatch) = 0;
-			data.word(kEndwatchreel) = 66;
-			data.byte(kWatchspeed) = 1;
-			data.byte(kSpeedcount) = 1;
+		} else if (_vars._location == 32) {	// Alley
+			_vars._watchingTime = 66 * 2;
+			_vars._reelToWatch = 0;
+			_vars._endWatchReel = 66;
+			_vars._watchSpeed = 1;
+			_vars._speedCount = 1;
 			switchRyanOff();
-		} else if (data.byte(kLocation) == 24) {	// Eden's again
+		} else if (_vars._location == 24) {	// Eden's again
 			turnAnyPathOn(2, _roomNum - 1);
 		}
 	}
@@ -3489,7 +3489,7 @@ void DreamBase::showDiaryPage() {
 
 void DreamBase::dumpDiaryKeys() {
 	if (_pressCount == 1) {
-		if (data.byte(kSartaindead) != 1 && _diaryPage == 5 && getLocation(6) != 1) {
+		if (_vars._sartainDead != 1 && _diaryPage == 5 && getLocation(6) != 1) {
 			// Add Sartain Industries note
 			setLocation(6);
 			delPointer();
@@ -3539,8 +3539,6 @@ void DreamBase::lookAtCard() {
 }
 
 void DreamBase::clearBuffers() {
-	memcpy(_initialVars, data.ptr(kStartvars, kLengthofvars), kLengthofvars);
-
 	clearChanges();
 }
 
@@ -3549,10 +3547,10 @@ void DreamBase::clearChanges() {
 
 	setupInitialReelRoutines();
 
-	memcpy(data.ptr(kStartvars, kLengthofvars), _initialVars, kLengthofvars);
+	setupInitialVars();
 
-	data.word(kExframepos) = 0;
-	data.word(kExtextpos) = 0;
+	_vars._exFramePos = 0;
+	_vars._exTextPos = 0;
 
 	memset(_exFrames._frames, 0xFF, 2080);
 	memset(_exFrames._data, 0xFF, kExframeslen);
@@ -3565,6 +3563,68 @@ void DreamBase::clearChanges() {
 	memcpy(_roomsCanGo, initialRoomsCanGo, 16);
 }
 
+void DreamBase::setupInitialVars() {
+	_vars._startVars = 0;
+	_vars._progressPoints = 0;
+	_vars._watchOn = 0;
+	_vars._shadesOn = 0;
+	_vars._secondCount = 0;
+	_vars._minuteCount = 30;
+	_vars._hourCount = 19;
+	_vars._zoomOn = 1;
+	_vars._location = 0;
+	_vars._exPos = 0;
+	_vars._exFramePos = 0;
+	_vars._exTextPos = 0;
+	_vars._card1Money = 0;
+	_vars._listPos = 0;
+	_vars._ryanPage = 0;
+	_vars._watchingTime = 0;
+	_vars._reelToWatch = (uint16)-1;
+	_vars._endWatchReel = 0;
+	_vars._speedCount = 0;
+	_vars._watchSpeed = 0;
+	_vars._reelToHold = (uint16)-1;
+	_vars._endOfHoldReel = (uint16)-1;
+	_vars._watchMode = (uint8)-1;
+	_vars._destAfterHold = 0;
+	_vars._newsItem = 0;
+	_vars._liftFlag = 0;
+	_vars._liftPath = 0;
+	_vars._lockStatus = 1;
+	_vars._doorPath = 0;
+	_vars._countToOpen = 0;
+	_vars._countToClose = 0;
+	_vars._rockstarDead = 0;
+	_vars._generalDead = 0;
+	_vars._sartainDead = 0;
+	_vars._aideDead = 0;
+	_vars._beenMugged = 0;
+	_vars._gunPassFlag = 0;
+	_vars._canMoveAltar = 0;
+	_vars._talkedToAttendant = 0;
+	_vars._talkedToSparky = 0;
+	_vars._talkedToBoss = 0;
+	_vars._talkedToRecep = 0;
+	_vars._cardPassFlag = 0;
+	_vars._madmanFlag = 0;
+	_vars._keeperFlag = 0;
+	_vars._lastTrigger = 0;
+	_vars._manDead = 0;
+	_vars._seed1 = 1;
+	_vars._seed2 = 2;
+	_vars._seed3 = 3;
+	_vars._needToTravel = 0;
+	_vars._throughDoor = 0;
+	_vars._newObs = 0;
+	_vars._ryanOn = 255;
+	_vars._combatCount = 0;
+	_vars._lastWeapon = (uint8)-1;
+	_vars._dreamNumber = 0;
+	_vars._roomAfterDream = 0;
+	_vars._shakeCounter = 48;
+}
+
 void DreamBase::showDiaryKeys() {
 	if (!_pressCount)
 		return; // nokeyatall
@@ -3590,7 +3650,7 @@ void DreamBase::edensFlatReminders() {
 	if (_realLocation != 24 || _mapX != 44)
 		return; // not in Eden's lift
 
-	if (data.byte(kProgresspoints))
+	if (_vars._progressPoints)
 		return; // not the first time in Eden's apartment
 
 	uint16 exObjextIndex = findExObject("CSHR");
@@ -3611,7 +3671,7 @@ void DreamBase::edensFlatReminders() {
 		}
 	}
 
-	data.byte(kProgresspoints)++;	// got card
+	_vars._progressPoints++;	// got card
 }
 
 void DreamBase::incRyanPage() {
@@ -3623,7 +3683,7 @@ void DreamBase::incRyanPage() {
 	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
-	data.byte(kRyanpage) = (_mouseX - (kInventx + 167)) / 18;
+	_vars._ryanPage = (_mouseX - (kInventx + 167)) / 18;
 
 	delPointer();
 	fillRyan();
@@ -3636,9 +3696,9 @@ void DreamBase::incRyanPage() {
 
 void DreamBase::emergencyPurge() {
 	while (true) {
-		if (data.word(kExframepos) + 4000 < kExframeslen) {
+		if (_vars._exFramePos + 4000 < kExframeslen) {
 			// Not near frame end
-			if (data.word(kExtextpos) + 400 < kExtextlen)
+			if (_vars._exTextPos + 400 < kExtextlen)
 				return;	// notneartextend
 		}
 
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index ff3566f5d7..37cdd70e9a 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -242,16 +242,16 @@ void DreamBase::runEndSeq() {
 
 void DreamBase::loadIntroRoom() {
 	_introCount = 0;
-	data.byte(kLocation) = 255;
+	_vars._location = 255;
 	loadRoom();
 	_mapOffsetX = 72;
 	_mapOffsetY = 16;
 	clearSprites();
-	data.byte(kThroughdoor) = 0;
+	_vars._throughDoor = 0;
 	_currentKey = '0';
 	_mainMode = 0;
 	clearWork();
-	data.byte(kNewobs) = 1;
+	_vars._newObs = 1;
 	drawFloor();
 	reelsOnScreen();
 	spriteUpdate();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 94c9d20ea7..ebebc45ad5 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -221,11 +221,11 @@ void DreamBase::viewFolder() {
 
 void DreamBase::edensCDPlayer() {
 	showFirstUse();
-	data.word(kWatchingtime) = 18 * 2;
-	data.word(kReeltowatch) = 25;
-	data.word(kEndwatchreel) = 42;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
+	_vars._watchingTime = 18 * 2;
+	_vars._reelToWatch = 25;
+	_vars._endWatchReel = 42;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
 	_getBack = 1;
 }
 
@@ -250,37 +250,37 @@ void DreamBase::useElevator1() {
 void DreamBase::useElevator2() {
 	showFirstUse();
 
-	if (data.byte(kLocation) == 23)	// In pool hall
+	if (_vars._location == 23)	// In pool hall
 		_newLocation = 31;
 	else
 		_newLocation = 23;
 
-	data.byte(kCounttoclose) = 20;
-	data.byte(kCounttoopen) = 0;
-	data.word(kWatchingtime) = 80;
+	_vars._countToClose = 20;
+	_vars._countToOpen = 0;
+	_vars._watchingTime = 80;
 	_getBack = 1;
 }
 
 void DreamBase::useElevator3() {
 	showFirstUse();
-	data.byte(kCounttoclose) = 20;
+	_vars._countToClose = 20;
 	_newLocation = 34;
-	data.word(kReeltowatch) = 46;
-	data.word(kEndwatchreel) = 63;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.word(kWatchingtime) = 80;
+	_vars._reelToWatch = 46;
+	_vars._endWatchReel = 63;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
+	_vars._watchingTime = 80;
 	_getBack = 1;
 }
 
 void DreamBase::useElevator4() {
 	showFirstUse();
-	data.word(kReeltowatch) = 0;
-	data.word(kEndwatchreel) = 11;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.byte(kCounttoclose) = 20;
-	data.word(kWatchingtime) = 80;
+	_vars._reelToWatch = 0;
+	_vars._endWatchReel = 11;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
+	_vars._countToClose = 20;
+	_vars._watchingTime = 80;
 	_getBack = 1;
 	_newLocation = 24;
 }
@@ -289,9 +289,9 @@ void DreamBase::useElevator5() {
 	placeSetObject(4);
 	removeSetObject(0);
 	_newLocation = 20;
-	data.word(kWatchingtime) = 80;
-	data.byte(kLiftflag) = 1;
-	data.byte(kCounttoclose) = 8;
+	_vars._watchingTime = 80;
+	_vars._liftFlag = 1;
+	_vars._countToClose = 8;
 	_getBack = 1;
 }
 
@@ -310,7 +310,7 @@ void DreamBase::wheelSound() {
 void DreamBase::callHotelLift() {
 	playChannel1(12);
 	showFirstUse();
-	data.byte(kCounttoopen) = 8;
+	_vars._countToOpen = 8;
 	_getBack = 1;
 	_destination = 5;
 	_finalDest = 5;
@@ -319,49 +319,49 @@ void DreamBase::callHotelLift() {
 }
 
 void DreamBase::useShield() {
-	if (_realLocation != 20 || data.byte(kCombatcount) == 0) {
+	if (_realLocation != 20 || _vars._combatCount == 0) {
 		// Not in Sart room
 		showFirstUse();
 		putBackObStuff();
 	} else {
-		data.byte(kLastweapon) = 3;
+		_vars._lastWeapon = 3;
 		showSecondUse();
 		_getBack = 1;
-		data.byte(kProgresspoints)++;
+		_vars._progressPoints++;
 		removeObFromInv();
 	}
 }
 
 void DreamBase::useCoveredBox() {
-	data.byte(kProgresspoints)++;
+	_vars._progressPoints++;
 	showFirstUse();
-	data.word(kWatchingtime) = 50;
-	data.word(kReeltowatch) = 41;
-	data.word(kEndwatchreel) = 66;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
+	_vars._watchingTime = 50;
+	_vars._reelToWatch = 41;
+	_vars._endWatchReel = 66;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
 	_getBack = 1;
 }
 
 void DreamBase::useRailing() {
 	showFirstUse();
-	data.word(kWatchingtime) = 80;
-	data.word(kReeltowatch) = 0;
-	data.word(kEndwatchreel) = 30;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
+	_vars._watchingTime = 80;
+	_vars._reelToWatch = 0;
+	_vars._endWatchReel = 30;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
 	_getBack = 1;
-	data.byte(kMandead) = 4;
+	_vars._manDead = 4;
 }
 
 void DreamBase::wearWatch() {
-	if (data.byte(kWatchon) == 1) {
+	if (_vars._watchOn == 1) {
 		// Already wearing watch
 		showSecondUse();
 		putBackObStuff();
 	} else {
 		showFirstUse();
-		data.byte(kWatchon) = 1;
+		_vars._watchOn = 1;
 		_getBack = 1;
 		uint8 dummy;
 		makeWorn((DynObject *)getAnyAd(&dummy, &dummy));
@@ -369,12 +369,12 @@ void DreamBase::wearWatch() {
 }
 
 void DreamBase::wearShades() {
-	if (data.byte(kShadeson) == 1) {
+	if (_vars._shadesOn == 1) {
 		// Already wearing shades
 		showSecondUse();
 		putBackObStuff();
 	} else {
-		data.byte(kShadeson) = 1;
+		_vars._shadesOn = 1;
 		showFirstUse();
 		_getBack = 1;
 		uint8 dummy;
@@ -385,27 +385,27 @@ void DreamBase::wearShades() {
 void DreamBase::useChurchHole() {
 	showFirstUse();
 	_getBack = 1;
-	data.word(kWatchingtime) = 28;
-	data.word(kReeltowatch) = 13;
-	data.word(kEndwatchreel) = 26;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
+	_vars._watchingTime = 28;
+	_vars._reelToWatch = 13;
+	_vars._endWatchReel = 26;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
 }
 
 void DreamBase::sitDownInBar() {
-	if (data.byte(kWatchmode) != 0xFF) {
+	if (_vars._watchMode != 0xFF) {
 		// Sat down
 		showSecondUse();
 		putBackObStuff();
 	} else {
 		showFirstUse();
-		data.word(kWatchingtime) = 50;
-		data.word(kReeltowatch) = 55;
-		data.word(kEndwatchreel) = 71;
-		data.word(kReeltohold) = 73;
-		data.word(kEndofholdreel) = 83;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 50;
+		_vars._reelToWatch = 55;
+		_vars._endWatchReel = 71;
+		_vars._reelToHold = 73;
+		_vars._endOfHoldReel = 83;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 		_getBack = 1;
 	}
 }
@@ -425,18 +425,18 @@ void DreamBase::useBalcony() {
 	turnPathOff(3);
 	turnPathOff(4);
 	turnPathOff(5);
-	data.byte(kProgresspoints)++;
+	_vars._progressPoints++;
 	_mansPath = 6;
 	_destination = 6;
 	_finalDest = 6;
 	findXYFromPath();
 	switchRyanOff();
 	_resetManXY = 1;
-	data.word(kWatchingtime) = 30 * 2;
-	data.word(kReeltowatch) = 183;
-	data.word(kEndwatchreel) = 212;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
+	_vars._watchingTime = 30 * 2;
+	_vars._reelToWatch = 183;
+	_vars._endWatchReel = 212;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
 	_getBack = 1;
 }
 
@@ -446,7 +446,7 @@ void DreamBase::useWindow() {
 		showSecondUse();
 		putBackObStuff();
 	} else {
-		data.byte(kProgresspoints)++;
+		_vars._progressPoints++;
 		showFirstUse();
 		_newLocation = 29;
 		_getBack = 1;
@@ -454,33 +454,33 @@ void DreamBase::useWindow() {
 }
 
 void DreamBase::trapDoor() {
-	data.byte(kProgresspoints)++;
+	_vars._progressPoints++;
 	showFirstUse();
 	switchRyanOff();
-	data.word(kWatchingtime) = 20 * 2;
-	data.word(kReeltowatch) = 181;
-	data.word(kEndwatchreel) = 197;
+	_vars._watchingTime = 20 * 2;
+	_vars._reelToWatch = 181;
+	_vars._endWatchReel = 197;
 	_newLocation = 26;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
 	_getBack = 1;
 }
 
 void DreamBase::callEdensLift() {
 	showFirstUse();
-	data.byte(kCounttoopen) = 8;
+	_vars._countToOpen = 8;
 	_getBack = 1;
 	turnPathOn(2);
 }
 
 void DreamBase::callEdensDLift() {
-	if (data.byte(kLiftflag) == 1) {
+	if (_vars._liftFlag == 1) {
 		// Eden's D here
 		showSecondUse();
 		putBackObStuff();
 	} else {
 		showFirstUse();
-		data.byte(kCounttoopen) = 8;
+		_vars._countToOpen = 8;
 		_getBack = 1;
 		turnPathOn(2);
 	}
@@ -521,11 +521,11 @@ void DreamBase::useWall() {
 	showFirstUse();
 
 	if (_mansPath != 3) {
-		data.word(kWatchingtime) = 30*2;
-		data.word(kReeltowatch) = 2;
-		data.word(kEndwatchreel) = 31;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 30*2;
+		_vars._reelToWatch = 2;
+		_vars._endWatchReel = 31;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 		_getBack = 1;
 		turnPathOn(3);
 		turnPathOn(4);
@@ -540,11 +540,11 @@ void DreamBase::useWall() {
 		switchRyanOff();
 	} else {
 		// Go back over
-		data.word(kWatchingtime) = 30 * 2;
-		data.word(kReeltowatch) = 34;
-		data.word(kEndwatchreel) = 60;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 30 * 2;
+		_vars._reelToWatch = 34;
+		_vars._endWatchReel = 60;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 		_getBack = 1;
 		turnPathOff(3);
 		turnPathOff(4);
@@ -591,35 +591,35 @@ void DreamBase::useLadderB() {
 void DreamBase::slabDoorA() {
 	showFirstUse();
 	_getBack = 1;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.word(kReeltowatch) = 13;
-	if (data.byte(kDreamnumber) != 3) {
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
+	_vars._reelToWatch = 13;
+	if (_vars._dreamNumber != 3) {
 		// Wrong
-		data.word(kWatchingtime) = 40;
-		data.word(kEndwatchreel) = 34;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 40;
+		_vars._endWatchReel = 34;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 	} else {
-		data.byte(kProgresspoints)++;
-		data.word(kWatchingtime) = 60;
-		data.word(kEndwatchreel) = 42;
+		_vars._progressPoints++;
+		_vars._watchingTime = 60;
+		_vars._endWatchReel = 42;
 		_newLocation = 47;
 	}
 }
 
 void DreamBase::slabDoorB() {
-	if (data.byte(kDreamnumber) != 1) {
+	if (_vars._dreamNumber != 1) {
 		// Wrong
 		showFirstUse();
 		_getBack = 1;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
-		data.word(kReeltowatch) = 44;
-		data.word(kWatchingtime) = 40;
-		data.word(kEndwatchreel) = 63;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
+		_vars._reelToWatch = 44;
+		_vars._watchingTime = 40;
+		_vars._endWatchReel = 63;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 	} else {
 		if (!isRyanHolding("SHLD")) {
 			// No crystal
@@ -628,13 +628,13 @@ void DreamBase::slabDoorB() {
 		} else {
 			// Got crystal
 			showFirstUse();
-			data.byte(kProgresspoints)++;
+			_vars._progressPoints++;
 			_getBack = 1;
-			data.byte(kWatchspeed) = 1;
-			data.byte(kSpeedcount) = 1;
-			data.word(kReeltowatch) = 44;
-			data.word(kWatchingtime) = 60;
-			data.word(kEndwatchreel) = 71;
+			_vars._watchSpeed = 1;
+			_vars._speedCount = 1;
+			_vars._reelToWatch = 44;
+			_vars._watchingTime = 60;
+			_vars._endWatchReel = 71;
 			_newLocation = 47;
 		}
 	}
@@ -643,19 +643,19 @@ void DreamBase::slabDoorB() {
 void DreamBase::slabDoorC() {
 	showFirstUse();
 	_getBack = 1;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.word(kReeltowatch) = 108;
-	if (data.byte(kDreamnumber) != 4) {
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
+	_vars._reelToWatch = 108;
+	if (_vars._dreamNumber != 4) {
 		// Wrong
-		data.word(kWatchingtime) = 40;
-		data.word(kEndwatchreel) = 127;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 40;
+		_vars._endWatchReel = 127;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 	} else {
-		data.byte(kProgresspoints)++;
-		data.word(kWatchingtime) = 60;
-		data.word(kEndwatchreel) = 135;
+		_vars._progressPoints++;
+		_vars._watchingTime = 60;
+		_vars._endWatchReel = 135;
 		_newLocation = 47;
 	}
 }
@@ -663,19 +663,19 @@ void DreamBase::slabDoorC() {
 void DreamBase::slabDoorD() {
 	showFirstUse();
 	_getBack = 1;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.word(kReeltowatch) = 75;
-	if (data.byte(kDreamnumber) != 0) {
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
+	_vars._reelToWatch = 75;
+	if (_vars._dreamNumber != 0) {
 		// Wrong
-		data.word(kWatchingtime) = 40;
-		data.word(kEndwatchreel) = 94;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 40;
+		_vars._endWatchReel = 94;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 	} else {
-		data.byte(kProgresspoints)++;
-		data.word(kWatchingtime) = 60;
-		data.word(kEndwatchreel) = 102;
+		_vars._progressPoints++;
+		_vars._watchingTime = 60;
+		_vars._endWatchReel = 102;
 		_newLocation = 47;
 	}
 }
@@ -683,19 +683,19 @@ void DreamBase::slabDoorD() {
 void DreamBase::slabDoorE() {
 	showFirstUse();
 	_getBack = 1;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.word(kReeltowatch) = 141;
-	if (data.byte(kDreamnumber) != 5) {
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
+	_vars._reelToWatch = 141;
+	if (_vars._dreamNumber != 5) {
 		// Wrong
-		data.word(kWatchingtime) = 40;
-		data.word(kEndwatchreel) = 160;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 40;
+		_vars._endWatchReel = 160;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 	} else {
-		data.byte(kProgresspoints)++;
-		data.word(kWatchingtime) = 60;
-		data.word(kEndwatchreel) = 168;
+		_vars._progressPoints++;
+		_vars._watchingTime = 60;
+		_vars._endWatchReel = 168;
 		_newLocation = 47;
 	}
 }
@@ -703,19 +703,19 @@ void DreamBase::slabDoorE() {
 void DreamBase::slabDoorF() {
 	showFirstUse();
 	_getBack = 1;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
-	data.word(kReeltowatch) = 171;
-	if (data.byte(kDreamnumber) != 2) {
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
+	_vars._reelToWatch = 171;
+	if (_vars._dreamNumber != 2) {
 		// Wrong
-		data.word(kWatchingtime) = 40;
-		data.word(kEndwatchreel) = 189;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 40;
+		_vars._endWatchReel = 189;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 	} else {
-		data.byte(kProgresspoints)++;
-		data.word(kWatchingtime) = 60;
-		data.word(kEndwatchreel) = 197;
+		_vars._progressPoints++;
+		_vars._watchingTime = 60;
+		_vars._endWatchReel = 197;
 		_newLocation = 47;
 	}
 }
@@ -742,15 +742,15 @@ void DreamBase::useChurchGate() {
 
 	// Cut gate
 	showFirstUse();
-	data.word(kWatchingtime) = 64 * 2;
-	data.word(kReeltowatch) = 4;
-	data.word(kEndwatchreel) = 70;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
+	_vars._watchingTime = 64 * 2;
+	_vars._reelToWatch = 4;
+	_vars._endWatchReel = 70;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
 	_getBack = 1;
-	data.byte(kProgresspoints)++;
+	_vars._progressPoints++;
 	turnPathOn(3);
-	if (data.byte(kAidedead) != 0)
+	if (_vars._aideDead != 0)
 		turnPathOn(2);	// Open church
 }
 
@@ -764,33 +764,33 @@ void DreamBase::useGun() {
 	} else if (_realLocation == 22) {
 		// in pool room
 		showPuzText(34, 300);
-		data.byte(kLastweapon) = 1;
-		data.byte(kCombatcount) = 39;
+		_vars._lastWeapon = 1;
+		_vars._combatCount = 39;
 		_getBack = 1;
-		data.byte(kProgresspoints)++;
+		_vars._progressPoints++;
 
 	} else if (_realLocation == 25) {
 		// helicopter
 		showPuzText(34, 300);
-		data.byte(kLastweapon) = 1;
-		data.byte(kCombatcount) = 19;
+		_vars._lastWeapon = 1;
+		_vars._combatCount = 19;
 		_getBack = 1;
-		data.byte(kDreamnumber) = 2;
-		data.byte(kRoomafterdream) = 38;
-		data.byte(kSartaindead) = 1;
-		data.byte(kProgresspoints)++;
+		_vars._dreamNumber = 2;
+		_vars._roomAfterDream = 38;
+		_vars._sartainDead = 1;
+		_vars._progressPoints++;
 
 	} else if (_realLocation == 27) {
 		// in rock room
 		showPuzText(46, 300);
 		_pointerMode = 2;
-		data.byte(kRockstardead) = 1;
-		data.byte(kLastweapon) = 1;
-		data.byte(kNewsitem) = 1;
+		_vars._rockstarDead = 1;
+		_vars._lastWeapon = 1;
+		_vars._newsItem = 1;
 		_getBack = 1;
-		data.byte(kRoomafterdream) = 32;
-		data.byte(kDreamnumber) = 0;
-		data.byte(kProgresspoints)++;
+		_vars._roomAfterDream = 32;
+		_vars._dreamNumber = 0;
+		_vars._progressPoints++;
 
 	} else if (_realLocation == 8 && _mapX == 22 && _mapY == 40
 	    && !isSetObOnMap(92) && _mansPath != 9) {
@@ -798,9 +798,9 @@ void DreamBase::useGun() {
 		_destination = 9;
 		_finalDest = 9;
 		autoSetWalk();
-		data.byte(kLastweapon) = 1;
+		_vars._lastWeapon = 1;
 		_getBack = 1;
-		data.byte(kProgresspoints)++;
+		_vars._progressPoints++;
 
 	} else if (_realLocation == 6 && _mapX == 11 && _mapY == 20
 	    && isSetObOnMap(5)) {
@@ -811,14 +811,14 @@ void DreamBase::useGun() {
 		removeSetObject(5);
 		placeSetObject(6);
 		turnAnyPathOn(1, _roomNum - 1);
-		data.byte(kLiftflag) = 1;
-		data.word(kWatchingtime) = 40*2;
-		data.word(kReeltowatch) = 4;
-		data.word(kEndwatchreel) = 43;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._liftFlag = 1;
+		_vars._watchingTime = 40*2;
+		_vars._reelToWatch = 4;
+		_vars._endWatchReel = 43;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 		_getBack = 1;
-		data.byte(kProgresspoints)++;
+		_vars._progressPoints++;
 
 	} else if (_realLocation == 29) {
 		// aide
@@ -829,15 +829,15 @@ void DreamBase::useGun() {
 		_destination = 2;
 		_finalDest = 2;
 		autoSetWalk();
-		data.word(kWatchingtime) = 164*2;
-		data.word(kReeltowatch) = 3;
-		data.word(kEndwatchreel) = 164;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
-		data.byte(kAidedead) = 1;
-		data.byte(kDreamnumber) = 3;
-		data.byte(kRoomafterdream) = 33;
-		data.byte(kProgresspoints)++;
+		_vars._watchingTime = 164*2;
+		_vars._reelToWatch = 3;
+		_vars._endWatchReel = 164;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
+		_vars._aideDead = 1;
+		_vars._dreamNumber = 3;
+		_vars._roomAfterDream = 33;
+		_vars._progressPoints++;
 
 	} else if (_realLocation == 23 && _mapX == 0 && _mapY == 50) {
 		// with boss
@@ -846,7 +846,7 @@ void DreamBase::useGun() {
 			_finalDest = 5;
 			autoSetWalk();
 		}
-		data.byte(kLastweapon) = 1;
+		_vars._lastWeapon = 1;
 		_getBack = 1;
 
 	} else if (_realLocation == 8 && _mapX == 11 && _mapY == 10) {
@@ -856,7 +856,7 @@ void DreamBase::useGun() {
 			_finalDest = 2;
 			autoSetWalk();
 		}
-		data.byte(kLastweapon) = 1;
+		_vars._lastWeapon = 1;
 		_getBack = 1;
 
 	} else {
@@ -866,7 +866,7 @@ void DreamBase::useGun() {
 }
 
 void DreamBase::useFullCart() {
-	data.byte(kProgresspoints)++;
+	_vars._progressPoints++;
 	turnAnyPathOn(2, _roomNum + 6);
 	_mansPath = 4;
 	_facing = 4;
@@ -875,11 +875,11 @@ void DreamBase::useFullCart() {
 	findXYFromPath();
 	_resetManXY = 1;
 	showFirstUse();
-	data.word(kWatchingtime) = 72 * 2;
-	data.word(kReeltowatch) = 58;
-	data.word(kEndwatchreel) = 142;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
+	_vars._watchingTime = 72 * 2;
+	_vars._reelToWatch = 58;
+	_vars._endWatchReel = 142;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
 	_getBack = 1;
 }
 
@@ -888,13 +888,13 @@ void DreamBase::useClearBox() {
 		return;
 
 	// Open box
-	data.byte(kProgresspoints)++;
+	_vars._progressPoints++;
 	showFirstUse();
-	data.word(kWatchingtime) = 80;
-	data.word(kReeltowatch) = 67;
-	data.word(kEndwatchreel) = 105;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
+	_vars._watchingTime = 80;
+	_vars._reelToWatch = 67;
+	_vars._endWatchReel = 105;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
 	_getBack = 1;
 }
 
@@ -904,7 +904,7 @@ void DreamBase::openTVDoor() {
 
 	// Key on TV
 	showFirstUse();
-	data.byte(kLockstatus) = 0;
+	_vars._lockStatus = 0;
 	_getBack = 1;
 }
 
@@ -922,7 +922,7 @@ void DreamBase::usePlate() {
 		placeSetObject(24);
 		removeSetObject(25);
 		placeFreeObject(0);
-		data.byte(kProgresspoints)++;
+		_vars._progressPoints++;
 		_getBack = 1;
 	} else if (compare(_withObject, _withType, "KNFE")) {
 		// Tried knife
@@ -946,15 +946,15 @@ void DreamBase::usePlinth() {
 		showFirstUse();
 		putBackObStuff();
 	} else {
-		data.byte(kProgresspoints)++;
+		_vars._progressPoints++;
 		showSecondUse();
-		data.word(kWatchingtime) = 220;
-		data.word(kReeltowatch) = 0;
-		data.word(kEndwatchreel) = 104;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 220;
+		_vars._reelToWatch = 0;
+		_vars._endWatchReel = 104;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 		_getBack = 1;
-		_newLocation = data.byte(kRoomafterdream);
+		_newLocation = _vars._roomAfterDream;
 	}
 }
 
@@ -964,12 +964,12 @@ void DreamBase::useElvDoor() {
 
 	// Axe on door
 	showPuzText(15, 300);
-	data.byte(kProgresspoints)++;
-	data.word(kWatchingtime) = 46 * 2;
-	data.word(kReeltowatch) = 31;
-	data.word(kEndwatchreel) = 77;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
+	_vars._progressPoints++;
+	_vars._watchingTime = 46 * 2;
+	_vars._reelToWatch = 31;
+	_vars._endWatchReel = 77;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
 	_getBack = 1;
 }
 
@@ -997,19 +997,19 @@ void DreamBase::useWinch() {
 		return;
 	}
 
-	data.word(kWatchingtime) = 217 * 2;
-	data.word(kReeltowatch) = 0;
-	data.word(kEndwatchreel) = 217;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
+	_vars._watchingTime = 217 * 2;
+	_vars._reelToWatch = 0;
+	_vars._endWatchReel = 217;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
 	_destPos = 1;
 	_newLocation = 45;
-	data.byte(kDreamnumber) = 1;
-	data.byte(kRoomafterdream) = 44;
-	data.byte(kGeneraldead) = 1;
-	data.byte(kNewsitem) = 2;
+	_vars._dreamNumber = 1;
+	_vars._roomAfterDream = 44;
+	_vars._generalDead = 1;
+	_vars._newsItem = 2;
 	_getBack = 1;
-	data.byte(kProgresspoints)++;
+	_vars._progressPoints++;
 }
 
 void DreamBase::useCart() {
@@ -1020,7 +1020,7 @@ void DreamBase::useCart() {
 	exObject->mapad[0] = 0;
 	removeSetObject(_command);
 	placeSetObject(_command + 1);
-	data.byte(kProgresspoints)++;
+	_vars._progressPoints++;
 	playChannel1(17);
 	showFirstUse();
 	_getBack = 1;
@@ -1032,7 +1032,7 @@ void DreamBase::useTrainer() {
 	if (object->mapad[0] != 4) {
 		notHeldError();
 	} else {
-		data.byte(kProgresspoints)++;
+		_vars._progressPoints++;
 		makeWorn(object);
 		showSecondUse();
 		putBackObStuff();
@@ -1056,7 +1056,7 @@ void DreamBase::useHole() {
 	removeSetObject(86);
 	DynObject *exObject = getExAd(_withObject);
 	exObject->mapad[0] = 255;
-	data.byte(kCanmovealtar) = 1;
+	_vars._canMoveAltar = 1;
 	_getBack = 1;
 }
 
@@ -1066,7 +1066,7 @@ void DreamBase::openHotelDoor() {
 
 	playChannel1(16);
 	showFirstUse();
-	data.byte(kLockstatus) = 0;
+	_vars._lockStatus = 0;
 	_getBack = 1;
 }
 
@@ -1091,14 +1091,14 @@ void DreamBase::usePoolReader() {
 	if (defaultUseHandler("MEMB"))
 		return;
 
-	if (data.byte(kTalkedtoattendant) != 1) {
+	if (_vars._talkedToAttendant != 1) {
 		// Can't open pool
 		showSecondUse();
 		putBackObStuff();
 	} else {
 		playChannel1(17);
 		showFirstUse();
-		data.byte(kCounttoopen) = 6;
+		_vars._countToOpen = 6;
 		_getBack = 1;
 	}
 }
@@ -1107,11 +1107,11 @@ void DreamBase::useCardReader1() {
 	if (defaultUseHandler("CSHR"))
 		return;
 
-	if (data.byte(kTalkedtosparky) == 0) {
+	if (_vars._talkedToSparky == 0) {
 		// Not yet
 		showFirstUse();
 		putBackObStuff();
-	} else if (data.word(kCard1money) != 0) {
+	} else if (_vars._card1Money != 0) {
 		// No cash
 		showPuzText(17, 300);
 		putBackObStuff();
@@ -1119,8 +1119,8 @@ void DreamBase::useCardReader1() {
 		// Get cash
 		playChannel1(16);
 		showPuzText(18, 300);
-		data.byte(kProgresspoints)++;
-		data.word(kCard1money) = 12432;
+		_vars._progressPoints++;
+		_vars._card1Money = 12432;
 		_getBack = 1;
 	}
 }
@@ -1129,15 +1129,15 @@ void DreamBase::useCardReader2() {
 	if (defaultUseHandler("CSHR"))
 		return;
 
-	if (data.byte(kTalkedtoboss) == 0) {
+	if (_vars._talkedToBoss == 0) {
 		// Haven't talked to boss
 		showFirstUse();
 		putBackObStuff();
-	} else if (data.byte(kCard1money) == 0) {
+	} else if (_vars._card1Money == 0) {
 		// No cash
 		showPuzText(20, 300);
 		putBackObStuff();
-	} else if (data.byte(kGunpassflag) == 2) {
+	} else if (_vars._gunPassFlag == 2) {
 		// Already got new
 		showPuzText(22, 300);
 		putBackObStuff();
@@ -1145,9 +1145,9 @@ void DreamBase::useCardReader2() {
 		playChannel1(18);
 		showPuzText(19, 300);
 		placeSetObject(94);
-		data.byte(kGunpassflag) = 1;
-		data.word(kCard1money) -= 2000;
-		data.byte(kProgresspoints)++;
+		_vars._gunPassFlag = 1;
+		_vars._card1Money -= 2000;
+		_vars._progressPoints++;
 		_getBack = 1;
 	}
 }
@@ -1156,20 +1156,20 @@ void DreamBase::useCardReader3() {
 	if (defaultUseHandler("CSHR"))
 		return;
 
-	if (data.byte(kTalkedtorecep) == 0) {
+	if (_vars._talkedToRecep == 0) {
 		// Haven't talked to receptionist
 		showFirstUse();
 		putBackObStuff();
-	} else if (data.byte(kCardpassflag) != 0) {
+	} else if (_vars._cardPassFlag != 0) {
 		// Already used it
 		showPuzText(26, 300);
 		putBackObStuff();
 	} else {
 		playChannel1(16);
 		showPuzText(25, 300);
-		data.byte(kProgresspoints)++;
-		data.word(kCard1money) -= 8300;
-		data.byte(kCardpassflag) = 1;
+		_vars._progressPoints++;
+		_vars._card1Money -= 8300;
+		_vars._cardPassFlag = 1;
 		_getBack = 1;
 	}
 }
@@ -1201,7 +1201,7 @@ void DreamBase::useWire() {
 		removeSetObject(51);
 		placeSetObject(52);
 		showPuzText(11, 300);
-		data.byte(kProgresspoints)++;
+		_vars._progressPoints++;
 		_getBack = 1;
 		return;
 	}
@@ -1217,13 +1217,13 @@ void DreamBase::useWire() {
 }
 
 void DreamBase::openTomb() {
-	data.byte(kProgresspoints)++;
+	_vars._progressPoints++;
 	showFirstUse();
-	data.word(kWatchingtime) = 35 * 2;
-	data.word(kReeltowatch) = 1;
-	data.word(kEndwatchreel) = 33;
-	data.byte(kWatchspeed) = 1;
-	data.byte(kSpeedcount) = 1;
+	_vars._watchingTime = 35 * 2;
+	_vars._reelToWatch = 1;
+	_vars._endWatchReel = 33;
+	_vars._watchSpeed = 1;
+	_vars._speedCount = 1;
 	_getBack = 1;
 }
 
@@ -1308,7 +1308,7 @@ void DreamBase::useControl() {
 
 	if (compare(_withObject, _withType, "KEYA")) {	// Right key
 		playChannel1(16);
-		if (data.byte(kLocation) == 21) {	// Going down
+		if (_vars._location == 21) {	// Going down
 			showPuzText(3, 300);
 			_newLocation = 30;
 		} else {
@@ -1316,9 +1316,9 @@ void DreamBase::useControl() {
 			_newLocation = 21;
 		}
 
-		data.byte(kCounttoclose) = 8;
-		data.byte(kCounttoopen) = 0;
-		data.word(kWatchingtime) = 80;
+		_vars._countToClose = 8;
+		_vars._countToOpen = 0;
+		_vars._watchingTime = 80;
 		_getBack = 1;
 		return;
 	}
@@ -1334,12 +1334,12 @@ void DreamBase::useControl() {
 			removeSetObject(17);
 			playChannel1(14);
 			showPuzText(10, 300);
-			data.byte(kProgresspoints)++;
+			_vars._progressPoints++;
 			_getBack = 1;
 		} else if (compare(_withObject, _withType, "AXED")) {
 			// Axe on controls
 			showPuzText(16, 300);
-			data.byte(kProgresspoints)++;
+			_vars._progressPoints++;
 			putBackObStuff();
 		} else {
 			// Balls
@@ -1373,14 +1373,14 @@ void DreamBase::useSlab() {
 	if (_command + 1 == 54) {
 		// Last slab
 		turnPathOn(0);
-		data.word(kWatchingtime) = 22;
-		data.word(kReeltowatch) = 35;
-		data.word(kEndwatchreel) = 48;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 22;
+		_vars._reelToWatch = 35;
+		_vars._endWatchReel = 48;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 	}
 
-	data.byte(kProgresspoints)++;
+	_vars._progressPoints++;
 	showFirstUse();
 	_getBack = 1;
 }
@@ -1416,15 +1416,15 @@ void DreamBase::useOpenBox() {
 
 	if (compare(_withObject, _withType, "CUPF")) {
 		// Destroy open box
-		data.byte(kProgresspoints)++;
+		_vars._progressPoints++;
 		showPuzText(37, 300);
 		DynObject *exObject = getExAd(_withObject);
 		exObject->id[3] = 'E'-'A';	// CUPF (full cup) -> CUPE (empty cup)
-		data.word(kWatchingtime) = 140;
-		data.word(kReeltowatch) = 105;
-		data.word(kEndwatchreel) = 181;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 140;
+		_vars._reelToWatch = 105;
+		_vars._endWatchReel = 181;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 		turnPathOn(4);
 		_getBack = 1;
 		return;
@@ -1477,19 +1477,19 @@ void DreamBase::useAxe() {
 	if (_mapY == 10) {
 		// Axe on door
 		showPuzText(15, 300);
-		data.byte(kProgresspoints)++;
-		data.word(kWatchingtime) = 46*2;
-		data.word(kReeltowatch) = 31;
-		data.word(kEndwatchreel) = 77;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._progressPoints++;
+		_vars._watchingTime = 46*2;
+		_vars._reelToWatch = 31;
+		_vars._endWatchReel = 77;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 		_getBack = 1;
 		return;
 	}
 
 	showSecondUse();
-	data.byte(kProgresspoints)++;
-	data.byte(kLastweapon) = 2;
+	_vars._progressPoints++;
+	_vars._lastWeapon = 2;
 	_getBack = 1;
 	removeObFromInv();
 }
@@ -1516,15 +1516,15 @@ void DreamBase::useAltar() {
 		return;
 	}
 
-	if (data.byte(kCanmovealtar) == 1) {
+	if (_vars._canMoveAltar == 1) {
 		// Move altar
-		data.byte(kProgresspoints)++;
+		_vars._progressPoints++;
 		showSecondUse();
-		data.word(kWatchingtime) = 160;
-		data.word(kReeltowatch) = 81;
-		data.word(kEndwatchreel) = 174;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 160;
+		_vars._reelToWatch = 81;
+		_vars._endWatchReel = 174;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 		DreamBase::setupTimedUse(47, 32, 98, 52, 76);
 		_getBack = 1;
 	} else {
@@ -1583,10 +1583,10 @@ void DreamBase::useCashCard() {
 	y = 98;
 	printDirect(&obText, 36, &y, 36, 36 & 1);
 	char amountStr[10];
-	sprintf(amountStr, "%04d", data.word(kCard1money) / 10);
+	sprintf(amountStr, "%04d", _vars._card1Money / 10);
 	_charShift = 91 * 2 + 75;
 	printDirect((const uint8 *)amountStr, 160, 155, 240, 240 & 1);
-	sprintf(amountStr, "%02d", (data.word(kCard1money) % 10) * 10);
+	sprintf(amountStr, "%02d", (_vars._card1Money % 10) * 10);
 	_charShift = 91 * 2 + 85;
 	printDirect((const uint8 *)amountStr, 187, 155, 240, 240 & 1);
 	_charShift = 0;
@@ -1601,7 +1601,7 @@ void DreamBase::useStereo() {
 	// Handles the stereo in Ryan's apartment (accessible from the remote on
 	// the couch)
 
-	if (data.byte(kLocation) != 0) {
+	if (_vars._location != 0) {
 		showPuzText(4, 400);
 		putBackObStuff();
 	} else if (_mapX != 11) {
@@ -1656,13 +1656,13 @@ void DreamBase::useButtonA() {
 		turnAnyPathOn(0, _roomNum - 1);
 		removeSetObject(9);
 		placeSetObject(95);
-		data.word(kWatchingtime) = 15 * 2;
-		data.word(kReeltowatch) = 71;
-		data.word(kEndwatchreel) = 85;
-		data.byte(kWatchspeed) = 1;
-		data.byte(kSpeedcount) = 1;
+		_vars._watchingTime = 15 * 2;
+		_vars._reelToWatch = 71;
+		_vars._endWatchReel = 85;
+		_vars._watchSpeed = 1;
+		_vars._speedCount = 1;
 		_getBack = 1;
-		data.byte(kProgresspoints)++;
+		_vars._progressPoints++;
 	} else {
 		// Done this bit
 		showSecondUse();
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 13defb46a2..c1a860e184 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -123,7 +123,7 @@ void DreamBase::frameOutFx(uint8 *dst, const uint8 *src, uint16 pitch, uint16 wi
 }
 
 void DreamBase::doShake() {
-	uint8 &counter = data.byte(kShakecounter);
+	uint8 &counter = _vars._shakeCounter;
 	if (counter == 48)
 		return;
 
@@ -336,7 +336,7 @@ void DreamBase::clearWork() {
 }
 
 void DreamBase::dumpZoom() {
-	if (data.byte(kZoomon) == 1)
+	if (_vars._zoomOn == 1)
 		multiDump(kZoomx + 5, kZoomy + 4, 46, 40);
 }
 
@@ -359,15 +359,15 @@ void DreamBase::putUnderZoom() {
 }
 
 void DreamBase::zoomIcon() {
-	if (data.byte(kZoomon) == 0)
+	if (_vars._zoomOn == 0)
 		return;
 	showFrame(_icons1, kZoomx, kZoomy-1, 8, 0);
 }
 
 void DreamBase::zoom() {
-	if (data.word(kWatchingtime) != 0)
+	if (_vars._watchingTime != 0)
 		return;
-	if (data.byte(kZoomon) != 1)
+	if (_vars._zoomOn != 1)
 		return;
 	if (_commandType >= 199) {
 		putUnderZoom();
@@ -466,11 +466,11 @@ void DreamBase::transferFrame(uint8 from, uint8 to, uint8 offset) {
 	uint16 byteCount = freeFrame.width * freeFrame.height;
 
 	const uint8 *src = _freeFrames.getFrameData(3*from + offset);
-	uint8 *dst = _exFrames._data + data.word(kExframepos);
+	uint8 *dst = _exFrames._data + _vars._exFramePos;
 	memcpy(dst, src, byteCount);
 
-	exFrame.setPtr(data.word(kExframepos));
-	data.word(kExframepos) += byteCount;
+	exFrame.setPtr(_vars._exFramePos);
+	_vars._exFramePos += byteCount;
 }
 
 } // End of namespace DreamGen
-- 
cgit v1.2.3


From 279746fcf0a3aac428e75bf7ca7e043cb0572aa6 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 15:07:17 +0200
Subject: DREAMWEB: Completely remove all of the runtime, and move everything
 into DreamWebEngine

Also, remove dead code (allocateMem/deallocateMem)
---
 engines/dreamweb/backdrop.cpp  |   28 +-
 engines/dreamweb/detection.cpp |    4 +-
 engines/dreamweb/dreambase.h   | 1060 ----------------------------------------
 engines/dreamweb/dreamgen.h    |   65 ---
 engines/dreamweb/dreamweb.cpp  |  374 +++++++-------
 engines/dreamweb/dreamweb.h    | 1028 +++++++++++++++++++++++++++++++++++++-
 engines/dreamweb/keypad.cpp    |   82 ++--
 engines/dreamweb/monitor.cpp   |   76 +--
 engines/dreamweb/newplace.cpp  |   54 +-
 engines/dreamweb/object.cpp    |  124 ++---
 engines/dreamweb/pathfind.cpp  |   34 +-
 engines/dreamweb/people.cpp    |  206 ++++----
 engines/dreamweb/print.cpp     |   44 +-
 engines/dreamweb/runtime.h     |   46 --
 engines/dreamweb/saveload.cpp  |  108 ++--
 engines/dreamweb/segment.h     |  232 ---------
 engines/dreamweb/sound.cpp     |   43 +-
 engines/dreamweb/sprite.cpp    |  108 ++--
 engines/dreamweb/structs.h     |    6 +-
 engines/dreamweb/stubs.cpp     |  542 ++++++++++----------
 engines/dreamweb/talk.cpp      |   36 +-
 engines/dreamweb/titles.cpp    |   28 +-
 engines/dreamweb/use.cpp       |  358 +++++++-------
 engines/dreamweb/vgafades.cpp  |   80 +--
 engines/dreamweb/vgagrafx.cpp  |   86 ++--
 25 files changed, 2215 insertions(+), 2637 deletions(-)
 delete mode 100644 engines/dreamweb/dreambase.h
 delete mode 100644 engines/dreamweb/dreamgen.h
 delete mode 100644 engines/dreamweb/runtime.h
 delete mode 100644 engines/dreamweb/segment.h

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 528a6c4fd1..f2356eb0b0 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -22,9 +22,9 @@
 
 #include "dreamweb/dreamweb.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
-void DreamBase::doBlocks() {
+void DreamWebEngine::doBlocks() {
 	uint16 dstOffset = _mapAdY * 320 + _mapAdX;
 	uint16 mapOffset = _mapY * kMapWidth + _mapX;
 	const uint8 *mapData = _mapData + mapOffset;
@@ -61,7 +61,7 @@ void DreamBase::doBlocks() {
 	}
 }
 
-uint8 DreamBase::getXAd(const uint8 *setData, uint8 *result) {
+uint8 DreamWebEngine::getXAd(const uint8 *setData, uint8 *result) {
 	uint8 v0 = setData[0];
 	uint8 v1 = setData[1];
 	uint8 v2 = setData[2];
@@ -76,7 +76,7 @@ uint8 DreamBase::getXAd(const uint8 *setData, uint8 *result) {
 	return 1;
 }
 
-uint8 DreamBase::getYAd(const uint8 *setData, uint8 *result) {
+uint8 DreamWebEngine::getYAd(const uint8 *setData, uint8 *result) {
 	uint8 v0 = setData[3];
 	uint8 v1 = setData[4];
 	if (v0 < _mapY)
@@ -88,7 +88,7 @@ uint8 DreamBase::getYAd(const uint8 *setData, uint8 *result) {
 	return 1;
 }
 
-uint8 DreamBase::getMapAd(const uint8 *setData, uint16 *x, uint16 *y) {
+uint8 DreamWebEngine::getMapAd(const uint8 *setData, uint16 *x, uint16 *y) {
 	uint8 xad, yad;
 	if (getXAd(setData, &xad) == 0)
 		return 0;
@@ -99,7 +99,7 @@ uint8 DreamBase::getMapAd(const uint8 *setData, uint16 *x, uint16 *y) {
 	return 1;
 }
 
-void DreamBase::calcFrFrame(const Frame &frame, uint8 *width, uint8 *height, uint16 x, uint16 y, ObjPos *objPos) {
+void DreamWebEngine::calcFrFrame(const Frame &frame, uint8 *width, uint8 *height, uint16 x, uint16 y, ObjPos *objPos) {
 	*width = frame.width;
 	*height = frame.height;
 
@@ -109,7 +109,7 @@ void DreamBase::calcFrFrame(const Frame &frame, uint8 *width, uint8 *height, uin
 	objPos->yMax = objPos->yMin + frame.height;
 }
 
-void DreamBase::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
+void DreamWebEngine::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
 	if (_vars._newObs == 0)
 		return;
 	uint8 priority = objData->priority;
@@ -126,7 +126,7 @@ void DreamBase::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
 	sprite->animFrame = 0;
 }
 
-void DreamBase::showAllObs() {
+void DreamWebEngine::showAllObs() {
 	const unsigned int count = 128;
 
 	_setList.clear();
@@ -172,7 +172,7 @@ static bool addLength(const MapFlag *mapFlags) {
 	return false;
 }
 
-void DreamBase::getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize) {
+void DreamWebEngine::getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize) {
 	uint8 yStart = 0;
 	while (! addAlong(_mapFlags + 11 * yStart))
 		++yStart;
@@ -199,7 +199,7 @@ void DreamBase::getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize
 	_mapYSize = *mapYsize << 4;
 }
 
-void DreamBase::calcMapAd() {
+void DreamWebEngine::calcMapAd() {
 	uint8 mapXstart, mapYstart;
 	uint8 mapXsize, mapYsize;
 	getDimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
@@ -207,7 +207,7 @@ void DreamBase::calcMapAd() {
 	_mapAdY = _mapOffsetY - 8 * (mapYsize + 2 * mapYstart - 10);
 }
 
-void DreamBase::showAllFree() {
+void DreamWebEngine::showAllFree() {
 	const unsigned int count = 80;
 
 	_freeList.clear();
@@ -234,7 +234,7 @@ void DreamBase::showAllFree() {
 	}
 }
 
-void DreamBase::drawFlags() {
+void DreamWebEngine::drawFlags() {
 	MapFlag *mapFlag = _mapFlags;
 	uint16 mapOffset = _mapY * kMapWidth + _mapX;
 	const uint8 *mapData = _mapData + mapOffset;
@@ -250,7 +250,7 @@ void DreamBase::drawFlags() {
 	}
 }
 
-void DreamBase::showAllEx() {
+void DreamWebEngine::showAllEx() {
 	const unsigned int count = 100;
 
 	_exList.clear();
@@ -279,4 +279,4 @@ void DreamBase::showAllEx() {
 	}
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index 3a5c28a104..b891c2a3ea 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -133,8 +133,8 @@ SaveStateDescriptor DreamWebMetaEngine::querySaveMetaInfos(const char *target, i
 	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str());
 
 	if (in) {
-		DreamGen::FileHeader header;
-		in->read((uint8 *)&header, sizeof(DreamGen::FileHeader));
+		DreamWeb::FileHeader header;
+		in->read((uint8 *)&header, sizeof(DreamWeb::FileHeader));
 
 		Common::String saveName;
 		byte descSize = header.len(0);
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
deleted file mode 100644
index ebbe24c9cc..0000000000
--- a/engines/dreamweb/dreambase.h
+++ /dev/null
@@ -1,1060 +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 DREAMBASE_H
-#define DREAMBASE_H
-
-#include "common/scummsys.h"
-#include "common/list.h"
-
-#include "dreamweb/segment.h"
-
-namespace DreamWeb {
-	class DreamWebEngine;
-}
-
-
-namespace DreamGen {
-
- // Note: duplication from dreamgen.h
-const unsigned int kNumReelRoutines = 57;
-const unsigned int kUnderTextSizeX = 180;
-const unsigned int kUnderTextSizeY = 10;
-const unsigned int kUnderTimedTextSizeY = 24;
-const unsigned int kUnderTextSizeX_f = 228; // foreign version
-const unsigned int kUnderTextSizeY_f = 13; // foreign version
-const unsigned int kUnderTimedTextSizeY_f = 30;
-const unsigned int kUnderTextBufSize = kUnderTextSizeX_f * kUnderTextSizeY_f;
-const unsigned int kUnderTimedTextBufSize = 256 * kUnderTimedTextSizeY_f;
-const unsigned int kLengthOfVars = 68;
-const unsigned int kNumChanges = 250;
-const unsigned int kLenOfMapStore = 22*8*20*8;
-const unsigned int kMapWidth = 66;
-const unsigned int kMapHeight = 60;
-const unsigned int kLengthOfMap = kMapWidth * kMapHeight;
-const unsigned int kNumExObjects = 114;
-const unsigned int kScreenwidth = 320;
-const unsigned int kDiaryx = (68+24);
-const unsigned int kDiaryy = (48+12);
-const unsigned int kInventx = 80;
-const unsigned int kInventy = 58;
-const unsigned int kMenux = (80+40);
-const unsigned int kMenuy = 60;
-const unsigned int kOpsx = 60;
-const unsigned int kOpsy = 52;
-const unsigned int kSymbolx = 64;
-const unsigned int kSymboly = 56;
-const unsigned int kLengthofvars = 68;
-
-/**
- * This class is one of the parent classes of DreamGenContext. Its sole purpose
- * is to allow us to incrementally move things out of DreamGenContext into this
- * base class, as soon as they don't modify any context registers (ax, bx, cx, ...)
- * anymore.
- * Ultimately, DreamGenContext should be empty, at which point it can be removed
- * together with class Context. When that happens, we can probably merge
- * DreamBase into DreamWebEngine.
- */
-class DreamBase : public SegmentManager {
-protected:
-	DreamWeb::DreamWebEngine *engine;
-
-	const char *_timedString;
-	GameVars _vars; // saved variables
-
-	// from backdrop.cpp
-	uint8 *_backdropBlocks;
-	BackdropMapFlag _backdropFlags[96];
-	uint8 _mapData[kLengthOfMap + 32];
-
-	// from keypad.cpp
-	uint8 _pressList[6];
-
-	// from monitor.cpp
-	char _inputLine[64];
-	char _operand1[14];
-	char _currentFile[14];
-
-	// from newplace.cpp
-	uint8 _roomsCanGo[16];
-
-	// from object.cpp
-	uint16 _openChangeSize;
-	ObjectRef _oldSubject;
-
-	// from pathfind.cpp
-	Common::Point _lineData[200];		// Output of Bresenham
-
-	// from saveload.cpp
-	char _saveNames[17*7];
-	char _saveNamesOld[17*7];
-
-	// from vgagrafx.cpp
-	uint8 _workspace[(0x1000 + 2) * 16];
-	uint8 _mapStore[kLenOfMapStore + 32];
-
-	// from people.cpp
-	ReelRoutine _reelRoutines[kNumReelRoutines+1];
-	ReelRoutine *_personData;
-
-	// from Buffers
-	uint8 _textUnder[kUnderTextBufSize];
-	ObjectRef _openInvList[16];
-	ObjectRef _ryanInvList[30];
-	uint8 _pointerBack[32*32];
-	MapFlag _mapFlags[11*10];
-	uint8 _startPal[3*256];
-	uint8 _endPal[3*256];
-	uint8 _mainPal[3*256];
-	Common::List<Sprite> _spriteTable;
-	Common::List<ObjPos> _setList;
-	Common::List<ObjPos> _freeList;
-	Common::List<ObjPos> _exList;
-	Common::List<People> _peopleList;
-	uint8 _zoomSpace[46*40];
-	// _printedList (unused?)
-	Change _listOfChanges[kNumChanges]; // Note: this array is saved
-	uint8 _underTimedText[kUnderTimedTextBufSize];
-	Common::List<Rain> _rainList;
-
-	// textfiles
-	TextFile _textFile1;
-	TextFile _textFile2;
-	TextFile _textFile3;
-	TextFile _travelText;
-	TextFile _puzzleText;
-	TextFile _commandText;
-
-	// graphics files
-	GraphicsFile _tempGraphics;
-	GraphicsFile _tempGraphics2;
-	GraphicsFile _tempGraphics3;
-	GraphicsFile _icons1;
-	GraphicsFile _icons2;
-	GraphicsFile _tempCharset;
-	GraphicsFile _charset1;
-	GraphicsFile _mainSprites;
-	const GraphicsFile *_currentCharset;
-
-	// room files
-	GraphicsFile _setFrames;
-	GraphicsFile _freeFrames;
-	GraphicsFile _reel1;
-	GraphicsFile _reel2;
-	GraphicsFile _reel3;
-	TextFile _setDesc;
-	TextFile _blockDesc;
-	TextFile _roomDesc;
-	TextFile _freeDesc;
-	TextFile _personText;
-	uint16 _personFramesLE[12];
-	RoomPaths _pathData[36];
-	Reel *_reelList;
-	SetObject _setDat[128];
-	DynObject _freeDat[80];
-
-	// Extras segment (NB: this is saved)
-	GraphicsFile _exFrames;
-	DynObject _exData[kNumExObjects];
-	TextFile _exText;
-
-public:
-	DreamBase(DreamWeb::DreamWebEngine *en);
-
-	bool _quitRequested;
-	bool _subtitles;
-	bool _foreignRelease;
-
-	bool _wonGame;
-
-	// sound related
-	uint8 _roomsSample;
-	uint8 _currentSample;
-	uint8 _channel0Playing;
-	uint8 _channel0Repeat;
-	uint8 _channel1Playing;
-
-	uint8 _volume;
-	uint8 _volumeTo;
-	int8 _volumeDirection;
-	uint8 _volumeCount;
-
-	bool _speechLoaded;
-
-	// misc variables
-	uint8 _speechCount;
-	uint16 _charShift;
-	uint8 _kerning;
-	uint8 _brightness;
-	uint8 _roomLoaded;
-	uint8 _didZoom;
-	uint16 _lineSpacing;
-	uint16 _textAddressX;
-	uint16 _textAddressY;
-	uint8 _textLen;
-	uint16 _lastXPos;
-	uint8 _itemFrame;
-	uint8 _withObject;
-	uint8 _withType;
-	uint16 _lookCounter;
-	uint8 _command;
-	uint8 _commandType;
-	uint8 _objectType;
-	uint8 _getBack;
-	uint8 _invOpen;
-	uint8 _mainMode;
-	uint8 _pickUp;
-	uint8 _lastInvPos;
-	uint8 _examAgain;
-	uint8 _newTextLine;
-	uint8 _openedOb;
-	uint8 _openedType;
-	uint16 _mapAdX;
-	uint16 _mapAdY;
-	uint16 _mapOffsetX;
-	uint16 _mapOffsetY;
-	uint16 _mapXStart;
-	uint16 _mapYStart;
-	uint8 _mapXSize;
-	uint8 _mapYSize;
-	uint8 _haveDoneObs;
-	uint8 _manIsOffScreen;
-	uint8 _facing;
-	uint8 _leaveDirection;
-	uint8 _turnToFace;
-	uint8 _turnDirection;
-	uint16 _mainTimer;
-	uint8 _introCount;
-	uint8 _currentKey;
-	uint8 _timerCount;
-	uint8 _mapX;
-	uint8 _mapY;
-	uint8 _ryanX;
-	uint8 _ryanY;
-	uint8 _lastFlag;
-	uint8 _destPos;
-	uint8 _realLocation;
-	uint8 _roomNum;
-	uint8 _nowInNewRoom;
-	uint8 _resetManXY;
-	uint8 _newLocation;
-	uint8 _autoLocation;
-	uint16 _mouseX;
-	uint16 _mouseY;
-	uint16 _mouseButton;
-	uint16 _oldButton;
-	uint16 _oldX;
-	uint16 _oldY;
-	uint16 _oldPointerX;
-	uint16 _oldPointerY;
-	uint16 _delHereX;
-	uint16 _delHereY;
-	uint8 _pointerXS;
-	uint8 _pointerYS;
-	uint8 _delXS;
-	uint8 _delYS;
-	uint8 _pointerFrame;
-	uint8 _pointerPower;
-	uint8 _pointerMode;
-	uint8 _pointerSpeed;
-	uint8 _pointerCount;
-	uint8 _inMapArea;
-	uint8 _talkMode;
-	uint8 _talkPos;
-	uint8 _character;
-	uint8 _watchDump;
-	uint8 _logoNum;
-	uint8 _oldLogoNum;
-	uint8 _pressed;
-	uint16 _pressPointer;
-	uint8 _graphicPress;
-	uint8 _pressCount;
-	uint8 _lightCount;
-	uint8 _folderPage;
-	uint8 _diaryPage;
-	uint8 _menuCount;
-	uint8 _symbolTopX;
-	uint8 _symbolTopNum;
-	uint8 _symbolTopDir;
-	uint8 _symbolBotX;
-	uint8 _symbolBotNum;
-	uint8 _symbolBotDir;
-	uint16 _dumpX;
-	uint16 _dumpY;
-	uint8 _walkAndExam;
-	uint8 _walkExamType;
-	uint8 _walkExamNum;
-	uint16 _cursLocX;
-	uint16 _cursLocY;
-	uint16 _curPos;
-	uint16 _monAdX;
-	uint16 _monAdY;
-	uint16 _timeCount;
-	uint16 _countToTimed;
-	uint8 _timedY;
-	uint8 _timedX;
-	uint8 _needToDumpTimed;
-	uint8 _loadingOrSave;
-	uint8 _currentSlot;
-	uint8 _cursorPos;
-	uint8 _colourPos;
-	uint8 _fadeDirection;
-	uint8 _numToFade;
-	uint8 _fadeCount;
-	uint8 _addToGreen;
-	uint8 _addToRed;
-	uint8 _addToBlue;
-	uint16 _lastSoundReel;
-	uint8 _lastHardKey;
-	uint16 _bufferIn;
-	uint16 _bufferOut;
-	uint8 _blinkFrame;
-	uint8 _blinkCount;
-	uint8 _reAssesChanges;
-	uint8 _pointersPath;
-	uint8 _mansPath;
-	uint8 _pointerFirstPath;
-	uint8 _finalDest;
-	uint8 _destination;
-	uint16 _lineStartX;
-	uint16 _lineStartY;
-	uint16 _lineEndX;
-	uint16 _lineEndY;
-	uint8 _linePointer;
-	uint8 _lineDirection;
-	uint8 _lineLength;
-
-	// from backdrop.cpp
-	void doBlocks();
-	uint8 getXAd(const uint8 *setData, uint8 *result);
-	uint8 getYAd(const uint8 *setData, uint8 *result);
-	uint8 getMapAd(const uint8 *setData, uint16 *x, uint16 *y);
-	void calcFrFrame(const Frame &frame, uint8* width, uint8* height, uint16 x, uint16 y, ObjPos *objPos);
-	void makeBackOb(SetObject *objData, uint16 x, uint16 y);
-	void showAllObs();
-	void getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize);
-	void calcMapAd();
-	void showAllFree();
-	void drawFlags();
-	void showAllEx();
-
-	// from keypad.cpp
-	void getUnderMenu();
-	void putUnderMenu();
-	void singleKey(uint8 key, uint16 x, uint16 y);
-	void loadKeypad();
-	void showKeypad();
-	bool isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
-	void addToPressList();
-	void buttonOne();
-	void buttonTwo();
-	void buttonThree();
-	void buttonFour();
-	void buttonFive();
-	void buttonSix();
-	void buttonSeven();
-	void buttonEight();
-	void buttonNine();
-	void buttonNought();
-	void buttonEnter();
-	void buttonPress(uint8 buttonId);
-	void showOuterPad();
-	void dumpKeypad();
-	void dumpSymbol();
-	void dumpSymBox();
-	void quitSymbol();
-	void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
-
-	// from monitor.cpp
-	void input();
-	byte makeCaps(byte c);
-	void delChar();
-	void monMessage(uint8 index);
-	void netError();
-	void monitorLogo();
-	void randomAccess(uint16 count);
-	void printOuterMon();
-	void showCurrentFile();
-	void accessLightOn();
-	void accessLightOff();
-	void turnOnPower();
-	void powerLightOn();
-	void powerLightOff();
-	void printLogo();
-	void scrollMonitor();
-	const char *monPrint(const char *string);
-	void lockLightOn();
-	void lockLightOff();
-	void loadPersonal();
-	void loadNews();
-	void loadCart();
-	void showKeys();
-	const char *parser();
-	const char *searchForString(const char *topic, const char *text);
-	const char *getKeyAndLogo(const char *foundString);
-	void read();
-	void dirFile(const char *dirName);
-	void dirCom();
-	void useMon();
-	bool execCommand();
-
-	// from newplace.cpp
-	void getUnderCentre();
-	void putUnderCentre();
-	void showArrows();
-	uint8 getLocation(uint8 index);
-	void setLocation(uint8 index);
-	void clearLocation(uint8 index);
-	void resetLocation(uint8 index);
-	void readCityPic();
-	void readDestIcon();
-	void showCity();
-	void locationPic();
-	void selectLocation();
-	void newPlace();
-	void nextDest();
-	void lastDest();
-	void destSelect();
-	void lookAtPlace();
-
-	// from object.cpp
-	void obIcons();
-	void fillRyan();
-	void findAllRyan();
-	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y);
-	void obPicture();
-	void removeObFromInv();
-	void deleteExObject(uint8 index);
-	void deleteExFrame(uint8 frameNum);
-	void deleteExText(uint8 textNum);
-	void purgeALocation(uint8 index);
-	const uint8 *getObTextStart();
-	void wornError();
-	void makeWorn(DynObject *object);
-	void dropObject();
-	ObjectRef findOpenPos();
-	byte getOpenedSlotSize();
-	byte getOpenedSlotCount();
-	void openOb();
-	void findAllOpen();
-	void fillOpen();
-	ObjectRef findInvPos();
-	void reExFromInv();
-	void swapWithInv();
-	void transferText(uint8 from, uint8 to);
-	void pickupConts(uint8 from, uint8 containerEx);
-	byte transferToEx(uint8 from);
-	void swapWithOpen();
-	void outOfOpen();
-	void inToInv();
-	void outOfInv();
-	bool checkObjectSize();
-	void useOpened();
-	void setPickup();
-	void selectOpenOb();
-	void examineOb(bool examineAgain = true);
-	void selectOb();
-	void inventory();
-	void identifyOb();
-
-	// from pathfind.cpp
-	void turnPathOn(uint8 param);
-	void turnPathOff(uint8 param);
-	void turnAnyPathOn(uint8 param, uint8 room);
-	void turnAnyPathOff(uint8 param, uint8 room);
-	RoomPaths *getRoomsPaths();
-	void faceRightWay();
-	void setWalk();
-	void autoSetWalk();
-	void checkDest(const RoomPaths *roomsPaths);
-	void findXYFromPath();
-	bool checkIfPathIsOn(uint8 index);
-	void bresenhams();
-	void workoutFrames();
-	byte findFirstPath(byte x, byte y);
-	byte findPathOfPoint(byte x, byte y);
-
-	// from people.cpp
-	void setupInitialReelRoutines();
-	void updatePeople();
-	void madmanText();
-	void madman(ReelRoutine &routine);
-	void madMode();
-	void addToPeopleList(ReelRoutine *routine);
-	bool checkSpeed(ReelRoutine &routine);
-	void sparkyDrip(ReelRoutine &routine);
-	void genericPerson(ReelRoutine &routine);
-	void gamer(ReelRoutine &routine);
-	void eden(ReelRoutine &routine);
-	void sparky(ReelRoutine &routine);
-	void rockstar(ReelRoutine &routine);
-	void madmansTelly(ReelRoutine &routine);
-	void smokeBloke(ReelRoutine &routine);
-	void manAsleep(ReelRoutine &routine);
-	void drunk(ReelRoutine &routine);
-	void introMagic1(ReelRoutine &routine);
-	void introMagic2(ReelRoutine &routine);
-	void introMagic3(ReelRoutine &routine);
-	void introMusic(ReelRoutine &routine);
-	void candles(ReelRoutine &routine);
-	void candles1(ReelRoutine &routine);
-	void candles2(ReelRoutine &routine);
-	void smallCandle(ReelRoutine &routine);
-	void gates(ReelRoutine &routine);
-	void security(ReelRoutine &routine);
-	void edenInBath(ReelRoutine &routine);
-	void louis(ReelRoutine &routine);
-	void handClap(ReelRoutine &routine);
-	void carParkDrip(ReelRoutine &routine);
-	void foghornSound(ReelRoutine &routine);
-	void train(ReelRoutine &routine);
-	void attendant(ReelRoutine &routine);
-	void keeper(ReelRoutine &routine);
-	void interviewer(ReelRoutine &routine);
-	void drinker(ReelRoutine &routine);
-	void alleyBarkSound(ReelRoutine &routine);
-	void louisChair(ReelRoutine &routine);
-	void bossMan(ReelRoutine &routine);
-	void priest(ReelRoutine &routine);
-	void monkAndRyan(ReelRoutine &routine);
-	void copper(ReelRoutine &routine);
-	void introMonks1(ReelRoutine &routine);
-	void introMonks2(ReelRoutine &routine);
-	void soldier1(ReelRoutine &routine);
-	void receptionist(ReelRoutine &routine);
-	void bartender(ReelRoutine &routine);
-	void heavy(ReelRoutine &routine);
-	void helicopter(ReelRoutine &routine);
-	void mugger(ReelRoutine &routine);
-	void businessMan(ReelRoutine &routine);
-	void endGameSeq(ReelRoutine &routine);
-	void poolGuard(ReelRoutine &routine);
-
-	// from print.cpp
-	uint8 getNextWord(const GraphicsFile &charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount);
-	void printChar(const GraphicsFile &charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
-	void printChar(const GraphicsFile &charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
-	void printBoth(const GraphicsFile &charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar);
-	uint8 printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered);
-	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
-	uint8 getNumber(const GraphicsFile &charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16 *offset);
-	uint8 kernChars(uint8 firstChar, uint8 secondChar, uint8 width);
-	uint8 printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
-	uint16 waitFrames();
-	void printCurs();
-	void delCurs();
-	void rollEndCreditsGameWon();
-	void rollEndCreditsGameLost();
-
-	// from saveload.cpp
-	void loadGame();
-	void doLoad(int slot);
-	void saveGame();
-	void namesToOld();
-	void oldToNames();
-	void saveLoad();
-	void doSaveLoad();
-	void showMainOps();
-	void showDiscOps();
-	void discOps();
-	void actualSave();
-	void actualLoad();
-	void loadPosition(unsigned int slot);
-	void savePosition(unsigned int slot, const char *descbuf);
-	uint scanForNames();
-	void loadOld();
-	void showDecisions();
-	void loadSaveBox();
-	void showNames();
-	void checkInput();
-	void selectSlot();
-	void showSlots();
-	void showOpBox();
-	void showSaveOps();
-	void showLoadOps();
-
-	// from sound.cpp
-	bool loadSpeech(byte type1, int idx1, byte type2, int idx2);
-	void volumeAdjust();
-	void cancelCh0();
-	void cancelCh1();
-	void loadRoomsSample();
-	void playChannel0(uint8 index, uint8 repeat);
-	void playChannel1(uint8 index);
-
-	// from sprite.cpp
-	void printSprites();
-	void printASprite(const Sprite *sprite);
-	void clearSprites();
-	Sprite *makeSprite(uint8 x, uint8 y, uint16 updateCallback, const GraphicsFile *frameData, uint16 somethingInDi);
-	void initMan();
-	void walking(Sprite *sprite);
-	void aboutTurn(Sprite *sprite);
-	void backObject(Sprite *sprite);
-	void constant(Sprite *sprite, SetObject *objData);
-	void randomSprite(Sprite *sprite, SetObject *objData);
-	void doorway(Sprite *sprite, SetObject *objData);
-	void wideDoor(Sprite *sprite, SetObject *objData);
-	void doDoor(Sprite *sprite, SetObject *objData, Common::Rect check);
-	void steady(Sprite *sprite, SetObject *objData);
-	void lockedDoorway(Sprite *sprite, SetObject *objData);
-	void liftSprite(Sprite *sprite, SetObject *objData);
-
-	Reel *getReelStart(uint16 reelPointer);
-	const GraphicsFile *findSource(uint16 &frame);
-	void showReelFrame(Reel *reel);
-	void showGameReel(ReelRoutine *routine);
-	const Frame *getReelFrameAX(uint16 frame);
-	void moveMap(uint8 param);
-	void checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY);
-
-	uint8 getBlockOfPixel(uint8 x, uint8 y);
-	void splitIntoLines(uint8 x, uint8 y);
-	void initRain();
-
-	void intro1Text();
-	void intro2Text(uint16 nextReelPointer);
-	void intro3Text(uint16 nextReelPointer);
-
-	void monks2text();
-	void textForEnd();
-	void textForMonkHelper(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
-	void textForMonk();
-	void priestText(ReelRoutine &routine);
-	void soundOnReels(uint16 reelPointer);
-	void clearBeforeLoad();
-	void clearReels();
-	void getRidOfReels();
-	void liftNoise(uint8 index);
-	void checkForExit(Sprite *sprite);
-	void mainMan(Sprite *sprite);
-	void spriteUpdate();
-	void showRain();
-	void reconstruct();
-	void reelsOnScreen();
-
-	// from stubs.cpp
-	void setupInitialVars();
-	bool isCD();
-	void crosshair();
-	void delTextLine();
-	void showBlink();
-	void dumpBlink();
-	void dumpPointer();
-	void showPointer();
-	void delPointer();
-	void showRyanPage();
-	void switchRyanOn();
-	void switchRyanOff();
-	void middlePanel();
-	void showDiary();
-	void readMouse();
-	uint16 readMouseState();
-	void hangOn(uint16 frameCount);
-	void lockMon();
-	uint8 *textUnder();
-	void readKey();
-	void findOrMake(uint8 index, uint8 value, uint8 type);
-	DynObject *getFreeAd(uint8 index);
-	DynObject *getExAd(uint8 index);
-	DynObject *getEitherAdCPP();
-	void *getAnyAdDir(uint8 index, uint8 flag);
-	void showWatch();
-	void showTime();
-	void showExit();
-	void showMan();
-	void panelIcons1();
-	SetObject *getSetAd(uint8 index);
-	void *getAnyAd(uint8 *slotSize, uint8 *slotCount);
-	const uint8 *getTextInFile1(uint16 index);
-	uint8 findNextColon(const uint8 **string);
-	void allocateBuffers();
-	uint16 allocateMem(uint16 paragraphs);
-	void deallocateMem(uint16 segment);
-	void loadTextFile(TextFile &file, const char *fileName);
-	void loadGraphicsFile(GraphicsFile &file, const char *fileName);
-	void loadGraphicsSegment(GraphicsFile &file, unsigned int len);
-	void loadTextSegment(TextFile &file, unsigned int len);
-	void loadIntoTemp(const char *fileName);
-	void loadIntoTemp2(const char *fileName);
-	void loadIntoTemp3(const char *fileName);
-	void loadTempCharset(const char *fileName);
-	void loadTravelText();
-	void loadTempText(const char *fileName);
-	void clearAndLoad(uint8 *buf, uint8 c, unsigned int size, unsigned int maxSize);
-	void sortOutMap();
-	void loadRoomData(const Room &room, bool skipDat);
-	void useTempCharset();
-	void useCharset1();
-	void printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered);
-	void printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count);
-	bool isItDescribed(const ObjPos *objPos);
-	void zoomIcon();
-	void roomName();
-	void showIcon();
-	void eraseOldObs();
-	void commandOnly(uint8 command);
-	void blank();
-	void setTopLeft();
-	void setTopRight();
-	void setBotLeft();
-	void setBotRight();
-	void examIcon();
-	void animPointer();
-	void getFlagUnderP(uint8 *flag, uint8 *flagEx);
-	void workToScreenM();
-	void quitKey();
-	void restoreReels();
-	void loadFolder();
-	void folderHints();
-	void folderExit();
-	void showFolder();
-	void showLeftPage();
-	void showRightPage();
-	void underTextLine();
-	void hangOnP(uint16 count);
-	void getUnderZoom();
-	void putUnderZoom();
-	void examineInventory();
-	void openInv();
-	void getBack1();
-	void getBackFromOb();
-	void getBackFromOps();
-	void getBackToOps();
-	void DOSReturn();
-	bool isItWorn(const DynObject *object);
-	bool compare(uint8 index, uint8 flag, const char id[4]);
-	void hangOnW(uint16 frameCount);
-	void getRidOfTemp();
-	void getRidOfTempText();
-	void getRidOfTemp2();
-	void getRidOfTemp3();
-	void getRidOfTempCharset();
-	void getRidOfAll();
-	void placeSetObject(uint8 index);
-	void removeSetObject(uint8 index);
-	bool isSetObOnMap(uint8 index);
-	void dumpZoom();
-	void diaryKeyP();
-	void diaryKeyN();
-	void findRoomInLoc();
-	void loadMenu();
-	void showMenu();
-	void dumpMenu();
-	void dealWithSpecial(uint8 firstParam, uint8 secondParam);
-	void plotReel(uint16 &reelPointer);
-	void setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
-	void getUnderTimed();
-	void putUnderTimed();
-	void dumpTextLine();
-	void useTimedText();
-	void dumpTimedText();
-	void getTime();
-	void doChange(uint8 index, uint8 value, uint8 type);
-	bool isRyanHolding(const char *id);
-	void clearBuffers();
-	void clearChanges();
-	void drawFloor();
-	uint16 findSetObject(const char *id);
-	void hangOnCurs(uint16 frameCount);
-	const uint8 *findObName(uint8 type, uint8 index);
-	void copyName(uint8 type, uint8 index, uint8 *dst);
-	uint16 findExObject(const char *id);
-	void makeMainScreen();
-	void showWatchReel();
-	void watchReel();
-	void commandWithOb(uint8 command, uint8 type, uint8 index);
-	void examineObText();
-	void blockNameText();
-	void personNameText();
-	void walkToText();
-	void entryTexts();
-	void setAllChanges();
-	void restoreAll();
-	void redrawMainScrn();
-
-	template <class T>
-	void checkCoords(const RectWithCallback<T> *rectWithCallbacks) {
-		if (_newLocation != 0xff)
-			return;
-
-		const RectWithCallback<T> *r;
-		for (r = rectWithCallbacks; r->_xMin != 0xffff; ++r) {
-			if (r->contains(_mouseX, _mouseY)) {
-				(((T *)this)->*(r->_callback))();
-				return;
-			}
-		}
-	}
-
-	void newGame();
-	void deleteTaken();
-	void autoAppear();
-	void loadRoom();
-	void startLoading(const Room &room);
-	void startup();
-	void atmospheres();
-	bool objectMatches(void *object, const char *id);
-	void checkFolderCoords();
-	void nextFolder();
-	void lastFolder();
-	void lookAtCard();
-	void obsThatDoThings();
-	void describeOb();
-	void putBackObStuff();
-	void reExFromOpen();
-	void showDiaryPage();
-	void showDiaryKeys();
-	void dumpDiaryKeys();
-	void useMenu();
-	void incRyanPage();
-	void edensFlatReminders();
-	void dropError();
-	void cantDrop();
-	void entryAnims();
-	bool finishedWalking();
-	void emergencyPurge();
-	void purgeAnItem();
-	uint8 nextSymbol(uint8 symbol);
-	void enterSymbol();
-	void showSymbol();
-	void updateSymbolTop();
-	void updateSymbolBot();
-	void pickupOb(uint8 command, uint8 pos);
-	void errorMessage1();
-	void errorMessage2();
-	void errorMessage3();
-	void decide();
-	void allPointer();
-	void dumpWatch();
-	void watchCount();
-	void signOn();
-	void searchForFiles(const char *filesString);
-	void triggerMessage(uint16 index);
-	void processTrigger();
-	void dreamweb();
-	void screenUpdate();
-	void startup1();
-	void quickQuit();
-	void readOneBlock();
-	void seeCommandTail();
-	void quickQuit2();
-	bool checkIfPerson(uint8 x, uint8 y);
-	bool checkIfFree(uint8 x, uint8 y);
-	bool checkIfEx(uint8 x, uint8 y);
-	void walkAndExamine();
-	void obName(uint8 command, uint8 commandType);
-	bool checkIfSet(uint8 x, uint8 y);
-	void readSetData();
-	void look();
-	void autoLook();
-	void doLook();
-	void mainScreen();
-	void zoomOnOff();
-	void initialInv();
-	void walkIntoRoom();
-	void afterNewRoom();
-	void madmanRun();
-	void showGun();
-
-	// from talk.cpp
-	void talk();
-	void convIcons();
-	uint16 getPersFrame(uint8 index);
-	const uint8 *getPersonText(uint8 index, uint8 talkPos);
-	void startTalk();
-	void moreTalk();
-	void doSomeTalk();
-	bool hangOnPQ();
-	void redes();
-
-	// from titles.cpp
-	void endGame();
-	void monkSpeaking();
-	void gettingShot();
-	void bibleQuote();
-	void hangOne(uint16 delay);
-	void intro();
-	void runIntroSeq();
-	void runEndSeq();
-	void loadIntroRoom();
-	void set16ColPalette();
-	void realCredits();
-	uint8 getExPos();
-
-	// from use.cpp
-	void useRoutine();
-	void useObject();
-	void placeFreeObject(uint8 index);
-	void removeFreeObject(uint8 index);
-	void setupTimedUse(uint16 offset, uint16 countToTimed, uint16 timeCount, byte x, byte y);
-	void withWhat();
-	uint16 checkInside(uint16 command, uint16 type);
-	void showPuzText(uint16 command, uint16 count);
-	void useText(const uint8 *string);
-	void showFirstUse();
-	void showSecondUse();
-	void viewFolder();
-	void edensCDPlayer();
-	void hotelBell();
-	void playGuitar();
-	void useElevator1();
-	void useElevator2();
-	void useElevator3();
-	void useElevator4();
-	void useElevator5();
-	void useHatch();
-	void wheelSound();
-	void callHotelLift();
-	void useShield();
-	void useCoveredBox();
-	void useRailing();
-	void useChurchHole();
-	void sitDownInBar();
-	void useBalcony();
-	void useWindow();
-	void trapDoor();
-	void useDryer();
-	void callEdensDLift();
-	void callEdensLift();
-	void openYourNeighbour();
-	void openRyan();
-	void openPoolBoss();
-	void openEden();
-	void openSarters();
-	void openLouis();
-	void useWall();
-	void useChurchGate();
-	void useLadder();
-	void useLadderB();
-	bool defaultUseHandler(const char *id);
-	void slabDoorA();
-	void slabDoorB();
-	void slabDoorC();
-	void slabDoorE();
-	void slabDoorD();
-	void slabDoorF();
-	void useGun();
-	void useFullCart();
-	void useClearBox();
-	void openTVDoor();
-	void usePlate();
-	void usePlinth();
-	void useElvDoor();
-	void useWinch();
-	void useCart();
-	void useHole();
-	void openHotelDoor();
-	void openHotelDoor2();
-	void grafittiDoor();
-	void useCardReader1();
-	void useCardReader2();
-	void useCardReader3();
-	void usePoolReader();
-	void useLighter();
-	void useWire();
-	void openTomb();
-	void hotelControl();
-	void useCooker();
-	void useDiary();
-	void useControl();
-	void useSlab();
-	void usePipe();
-	void useOpenBox();
-	void runTap();
-	void useAxe();
-	void useHandle();
-	void useAltar();
-	void notHeldError();
-	void useCashCard();
-	void useButtonA();
-	void wearWatch();
-	void wearShades();
-	void useTrainer();
-	void useStereo();
-	void chewy();
-	void delEverything();
-	void afterIntroRoom();
-
-	// from vgafades.cpp
-	void clearStartPal();
-	void clearEndPal();
-	void palToStartPal();
-	void endPalToStart();
-	void startPalToEnd();
-	void palToEndPal();
-	void fadeDOS();
-	void doFade();
-	void fadeCalculation();
-	void fadeUpYellows();
-	void fadeUpMonFirst();
-	void fadeUpMon();
-	void fadeDownMon();
-	void initialMonCols();
-	void fadeScreenUp();
-	void fadeScreenUps();
-	void fadeScreenUpHalf();
-	void fadeScreenDown();
-	void fadeScreenDowns();
-	void fadeScreenDownHalf();
-	void clearPalette();
-	void greyscaleSum();
-	void allPalette();
-	void dumpCurrent();
-
-	// from vgagrafx.cpp
-	inline uint8 *workspace() { return _workspace; }
-	void clearWork();
-
-	void panelToMap();
-	void mapToPanel();
-	void dumpMap();
-	void transferFrame(uint8 from, uint8 to, uint8 offset);
-	void zoom();
-	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height);
-	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height);
-	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height);
-	void workToScreen();
-	void printUnderMon();
-	void cls();
-	void frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y);
-	void frameOutNm(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
-	void frameOutBh(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
-	void frameOutFx(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
-	void doShake();
-	void vSync();
-	void setMode();
-	void showPCX(const Common::String &name);
-	void showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 effectsFlag, uint8 width, uint8 height);
-	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
-	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
-	bool pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y);
-	void loadPalFromIFF();
-	void createPanel();
-	void createPanel2();
-	void showPanel();
-};
-
-
-} // End of namespace DreamGen
-
-#endif
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
deleted file mode 100644
index dfec45d069..0000000000
--- a/engines/dreamweb/dreamgen.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef TASMRECOVER_DREAMGEN_STUBS_H__
-#define TASMRECOVER_DREAMGEN_STUBS_H__
-
-/* PLEASE DO NOT MODIFY THIS FILE. ALL CHANGES WILL BE LOST! LOOK FOR README FOR DETAILS */
-
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public 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 "dreamweb/runtime.h"
-
-#include "dreamweb/structs.h"
-#include "dreamweb/dreambase.h"
-
-namespace DreamGen {
-
-static const uint16 kDebuglevel1 = (0);
-static const uint16 kDebuglevel2 = (0);
-static const uint16 kPlayback = (0);
-static const uint16 kSpanish = (0);
-static const uint16 kRecording = (0);
-static const uint16 kGerman = (0);
-static const uint16 kDemo = (0);
-static const uint16 kExframedata = (0);
-static const uint16 kExframes = (0+2080);
-static const uint16 kExdata = (0+2080+30000);
-static const uint16 kExtextdat = (0+2080+30000+(16*114));
-static const uint16 kExtext = (0+2080+30000+(16*114)+((114+2)*2));
-static const uint16 kLengthofextra = (0+2080+30000+(16*114)+((114+2)*2)+18000);
-static const uint16 kForeign = (1);
-static const uint16 kCd = (1);
-static const uint16 kNumexobjects = (114);
-static const uint16 kExtextlen = (18000);
-static const uint16 kExframeslen = (30000);
-static const uint16 kItempicsize = (44);
-
-
-class DreamGenContext : public DreamBase, public Context {
-public:
-	DreamGenContext(DreamWeb::DreamWebEngine *en) : DreamBase(en), Context(this) {}
-
-	void __start();
-};
-
-} // End of namespace DreamGen
-
-#endif
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 8bc4975f69..be620bfe3a 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -34,12 +34,13 @@
 #include "graphics/surface.h"
 
 #include "dreamweb/dreamweb.h"
-#include "dreamweb/dreamgen.h"
 
 namespace DreamWeb {
 
 DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gameDesc) :
-	Engine(syst), _gameDescription(gameDesc), _rnd("dreamweb"), _context(this), _base(_context) {
+	Engine(syst), _gameDescription(gameDesc), _rnd("dreamweb"),
+	_exText(kNumExObjects+2),
+	_setDesc(130), _blockDesc(98), _roomDesc(38), _freeDesc(82), _personText(1026) {
 
 	// Setup mixer
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
@@ -59,6 +60,170 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_channel1 = 0;
 
 	_language = gameDesc->desc.language;
+
+	_openChangeSize = kInventx+(4*kItempicsize);
+	_quitRequested = false;
+
+	_currentSample = 0xff;
+	_channel0Playing = 0;
+	_channel0Repeat = 0;
+	_channel1Playing = 0xff;
+
+	_volume = 0;
+	_volumeTo = 0;
+	_volumeDirection = 0;
+	_volumeCount = 0;
+
+	_speechLoaded = false;
+
+	_backdropBlocks = 0;
+	_reelList = 0;
+
+	_oldSubject._type = 0;
+	_oldSubject._index = 0;
+
+	// misc variables
+	_speechCount = 0;
+	_charShift = 0;
+	_kerning = 0;
+	_brightness = 0;
+	_roomLoaded = 0;
+	_didZoom = 0;
+	_lineSpacing = 10;
+	_textAddressX = 13;
+	_textAddressY = 182;
+	_textLen = 0;
+	_lastXPos = 0;
+	_itemFrame = 0;
+	_withObject = 0;
+	_withType = 0;
+	_lookCounter = 0;
+	_command = 0;
+	_commandType = 0;
+	_objectType = 0;
+	_getBack = 0;
+	_invOpen = 0;
+	_mainMode = 0;
+	_pickUp = 0;
+	_lastInvPos = 0;
+	_examAgain = 0;
+	_newTextLine = 0;
+	_openedOb = 0;
+	_openedType = 0;
+	_mapAdX = 0;
+	_mapAdY = 0;
+	_mapOffsetX = 104;
+	_mapOffsetY = 38;
+	_mapXStart = 0;
+	_mapYStart = 0;
+	_mapXSize = 0;
+	_mapYSize = 0;
+	_haveDoneObs = 0;
+	_manIsOffScreen = 0;
+	_facing = 0;
+	_leaveDirection = 0;
+	_turnToFace = 0;
+	_turnDirection = 0;
+	_mainTimer = 0;
+	_introCount = 0;
+	_currentKey = 0;
+	_timerCount = 0;
+	_mapX = 0;
+	_mapY = 0;
+	_ryanX = 0;
+	_ryanY = 0;
+	_lastFlag = 0;
+	_destPos = 0;
+	_realLocation = 0;
+	_roomNum = 0;
+	_nowInNewRoom = 0;
+	_resetManXY = 0;
+	_newLocation = 0xFF;
+	_autoLocation = 0xFF;
+	_mouseX = 0;
+	_mouseY = 0;
+	_mouseButton = 0;
+	_oldButton = 0;
+	_oldX = 0;
+	_oldY = 0;
+	_oldPointerX = 0;
+	_oldPointerY = 0;
+	_delHereX = 0;
+	_delHereY = 0;
+	_pointerXS = 32;
+	_pointerYS = 32;
+	_delXS = 0;
+	_delYS = 0;
+	_pointerFrame = 0;
+	_pointerPower = 0;
+	_pointerMode = 0;
+	_pointerSpeed = 0;
+	_pointerCount = 0;
+	_inMapArea = 0;
+	_talkMode = 0;
+	_talkPos = 0;
+	_character = 0;
+	_watchDump = 0;
+	_logoNum = 0;
+	_oldLogoNum = 0;
+	_pressed = 0;
+	_pressPointer = 0;
+	_graphicPress = 0;
+	_pressCount = 0;
+	_lightCount = 0;
+	_folderPage = 0;
+	_diaryPage = 0;
+	_menuCount = 0;
+	_symbolTopX = 0;
+	_symbolTopNum = 0;
+	_symbolTopDir = 0;
+	_symbolBotX = 0;
+	_symbolBotNum = 0;
+	_symbolBotDir = 0;
+	_dumpX = 0;
+	_dumpY = 0;
+	_walkAndExam = 0;
+	_walkExamType = 0;
+	_walkExamNum = 0;
+	_cursLocX = 0;
+	_cursLocY = 0;
+	_curPos = 0;
+	_monAdX = 0;
+	_monAdY = 0;
+	_timeCount = 0;
+	_countToTimed = 0;
+	_timedY = 0;
+	_timedX = 0;
+	_needToDumpTimed = 0;
+	_loadingOrSave = 0;
+	_currentSlot = 0;
+	_cursorPos = 0;
+	_colourPos = 0;
+	_fadeDirection = 0;
+	_numToFade = 0;
+	_fadeCount = 0;
+	_addToGreen = 0;
+	_addToRed = 0;
+	_addToBlue = 0;
+	_lastSoundReel = 0;
+	_lastHardKey = 0;
+	_bufferIn = 0;
+	_bufferOut = 0;
+	_blinkFrame = 23;
+	_blinkCount = 0;
+	_reAssesChanges = 0;
+	_pointersPath = 0;
+	_mansPath = 0;
+	_pointerFirstPath = 0;
+	_finalDest = 0;
+	_destination = 0;
+	_lineStartX = 0;
+	_lineStartY = 0;
+	_lineEndX = 0;
+	_lineEndY = 0;
+	_linePointer = 0;
+	_lineDirection = 0;
+	_lineLength = 0;
 }
 
 DreamWebEngine::~DreamWebEngine() {
@@ -88,14 +253,14 @@ void DreamWebEngine::waitForVSync() {
 		setVSyncInterrupt(false);
 	}
 
-	_base.doShake();
-	_base.doFade();
+	doShake();
+	doFade();
 	_system->updateScreen();
 }
 
 void DreamWebEngine::quit() {
-	_base._quitRequested = true;
-	_base._lastHardKey = 1;
+	_quitRequested = true;
+	_lastHardKey = 1;
 }
 
 void DreamWebEngine::processEvents() {
@@ -130,8 +295,8 @@ void DreamWebEngine::processEvents() {
 					break;
 
 				case Common::KEYCODE_c: //skip statue puzzle
-					_base._symbolBotNum = 3;
-					_base._symbolTopNum = 5;
+					_symbolBotNum = 3;
+					_symbolTopNum = 5;
 					break;
 
 				default:
@@ -161,7 +326,7 @@ void DreamWebEngine::processEvents() {
 				break;
 			}
 
-			_base._lastHardKey = hardKey;
+			_lastHardKey = hardKey;
 
 			// The rest of the keys are converted to ASCII. This
 			// is fairly restrictive, and eventually we may want
@@ -204,8 +369,8 @@ Common::Error DreamWebEngine::run() {
 	ConfMan.registerDefault("dreamweb_originalsaveload", "false");
 
 	_timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync");
-	_context.dreamweb();
-	_base._quitRequested = false;
+	dreamweb();
+	_quitRequested = false;
 
 	_timer->removeTimerProc(vSyncInterrupt);
 
@@ -267,14 +432,14 @@ Common::String DreamWebEngine::getSavegameFilename(int slot) const {
 
 void DreamWebEngine::keyPressed(uint16 ascii) {
 	debug(2, "key pressed = %04x", ascii);
-	uint16 in = (_base._bufferIn + 1) & 0x0f;
-	uint16 out = _base._bufferOut;
+	uint16 in = (_bufferIn + 1) & 0x0f;
+	uint16 out = _bufferOut;
 	if (in == out) {
 		warning("keyboard buffer is full");
 		return;
 	}
-	_base._bufferIn = in;
-	DreamGen::g_keyBuffer[in] = ascii;
+	_bufferIn = in;
+	DreamWeb::g_keyBuffer[in] = ascii;
 }
 
 void DreamWebEngine::mouseCall(uint16 *x, uint16 *y, uint16 *state) {
@@ -322,7 +487,7 @@ void DreamWebEngine::blit(const uint8 *src, int pitch, int x, int y, int w, int
 }
 
 void DreamWebEngine::printUnderMonitor() {
-	uint8 *dst = _base.workspace() + DreamGen::kScreenwidth * 43 + 76;
+	uint8 *dst = workspace() + DreamWeb::kScreenwidth * 43 + 76;
 
 	Graphics::Surface *s = _system->lockScreen();
 	if (!s)
@@ -337,7 +502,7 @@ void DreamWebEngine::printUnderMonitor() {
 				++dst; ++src;
 			}
 		}
-		dst += DreamGen::kScreenwidth - 170;
+		dst += DreamWeb::kScreenwidth - 170;
 	}
 	_system->unlockScreen();
 }
@@ -402,178 +567,3 @@ uint8 DreamWebEngine::modifyChar(uint8 c) const {
 }
 
 } // End of namespace DreamWeb
-
-
-namespace DreamGen {
-
-// FIXME/TODO: Move this to a better place.
-DreamBase::DreamBase(DreamWeb::DreamWebEngine *en) :
-		engine(en), _exText(kNumExObjects+2),
-		_setDesc(130), _blockDesc(98), _roomDesc(38), _freeDesc(82), _personText(1026) {
-
-	_openChangeSize = kInventx+(4*kItempicsize);
-	_quitRequested = false;
-
-	_currentSample = 0xff;
-	_channel0Playing = 0;
-	_channel0Repeat = 0;
-	_channel1Playing = 0xff;
-
-	_volume = 0;
-	_volumeTo = 0;
-	_volumeDirection = 0;
-	_volumeCount = 0;
-
-	_speechLoaded = false;
-
-	_backdropBlocks = 0;
-	_reelList = 0;
-
-	_oldSubject._type = 0;
-	_oldSubject._index = 0;
-
-	// misc variables
-	_speechCount = 0;
-	_charShift = 0;
-	_kerning = 0;
-	_brightness = 0;
-	_roomLoaded = 0;
-	_didZoom = 0;
-	_lineSpacing = 10;
-	_textAddressX = 13;
-	_textAddressY = 182;
-	_textLen = 0;
-	_lastXPos = 0;
-	_itemFrame = 0;
-	_withObject = 0;
-	_withType = 0;
-	_lookCounter = 0;
-	_command = 0;
-	_commandType = 0;
-	_objectType = 0;
-	_getBack = 0;
-	_invOpen = 0;
-	_mainMode = 0;
-	_pickUp = 0;
-	_lastInvPos = 0;
-	_examAgain = 0;
-	_newTextLine = 0;
-	_openedOb = 0;
-	_openedType = 0;
-	_mapAdX = 0;
-	_mapAdY = 0;
-	_mapOffsetX = 104;
-	_mapOffsetY = 38;
-	_mapXStart = 0;
-	_mapYStart = 0;
-	_mapXSize = 0;
-	_mapYSize = 0;
-	_haveDoneObs = 0;
-	_manIsOffScreen = 0;
-	_facing = 0;
-	_leaveDirection = 0;
-	_turnToFace = 0;
-	_turnDirection = 0;
-	_mainTimer = 0;
-	_introCount = 0;
-	_currentKey = 0;
-	_timerCount = 0;
-	_mapX = 0;
-	_mapY = 0;
-	_ryanX = 0;
-	_ryanY = 0;
-	_lastFlag = 0;
-	_destPos = 0;
-	_realLocation = 0;
-	_roomNum = 0;
-	_nowInNewRoom = 0;
-	_resetManXY = 0;
-	_newLocation = 0xFF;
-	_autoLocation = 0xFF;
-	_mouseX = 0;
-	_mouseY = 0;
-	_mouseButton = 0;
-	_oldButton = 0;
-	_oldX = 0;
-	_oldY = 0;
-	_oldPointerX = 0;
-	_oldPointerY = 0;
-	_delHereX = 0;
-	_delHereY = 0;
-	_pointerXS = 32;
-	_pointerYS = 32;
-	_delXS = 0;
-	_delYS = 0;
-	_pointerFrame = 0;
-	_pointerPower = 0;
-	_pointerMode = 0;
-	_pointerSpeed = 0;
-	_pointerCount = 0;
-	_inMapArea = 0;
-	_talkMode = 0;
-	_talkPos = 0;
-	_character = 0;
-	_watchDump = 0;
-	_logoNum = 0;
-	_oldLogoNum = 0;
-	_pressed = 0;
-	_pressPointer = 0;
-	_graphicPress = 0;
-	_pressCount = 0;
-	_lightCount = 0;
-	_folderPage = 0;
-	_diaryPage = 0;
-	_menuCount = 0;
-	_symbolTopX = 0;
-	_symbolTopNum = 0;
-	_symbolTopDir = 0;
-	_symbolBotX = 0;
-	_symbolBotNum = 0;
-	_symbolBotDir = 0;
-	_dumpX = 0;
-	_dumpY = 0;
-	_walkAndExam = 0;
-	_walkExamType = 0;
-	_walkExamNum = 0;
-	_cursLocX = 0;
-	_cursLocY = 0;
-	_curPos = 0;
-	_monAdX = 0;
-	_monAdY = 0;
-	_timeCount = 0;
-	_countToTimed = 0;
-	_timedY = 0;
-	_timedX = 0;
-	_needToDumpTimed = 0;
-	_loadingOrSave = 0;
-	_currentSlot = 0;
-	_cursorPos = 0;
-	_colourPos = 0;
-	_fadeDirection = 0;
-	_numToFade = 0;
-	_fadeCount = 0;
-	_addToGreen = 0;
-	_addToRed = 0;
-	_addToBlue = 0;
-	_lastSoundReel = 0;
-	_lastHardKey = 0;
-	_bufferIn = 0;
-	_bufferOut = 0;
-	_blinkFrame = 23;
-	_blinkCount = 0;
-	_reAssesChanges = 0;
-	_pointersPath = 0;
-	_mansPath = 0;
-	_pointerFirstPath = 0;
-	_finalDest = 0;
-	_destination = 0;
-	_lineStartX = 0;
-	_lineStartY = 0;
-	_lineEndX = 0;
-	_lineEndY = 0;
-	_linePointer = 0;
-	_lineDirection = 0;
-	_lineLength = 0;
-}
-
-} // End of namespace DreamGen
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 58354a9516..9e1341bfa2 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -37,7 +37,6 @@
 #include "engines/advancedDetector.h"
 #include "engines/engine.h"
 
-#include "dreamweb/dreamgen.h"
 #include "dreamweb/console.h"
 
 #include "dreamweb/structs.h"
@@ -46,8 +45,55 @@
 #define SCUMMVM_BLOCK_MAGIC_SIZE 0x1234
 #define SAVEGAME_VERSION 1
 
-namespace DreamGen {
+namespace DreamWeb {
 
+const unsigned int kNumReelRoutines = 57;
+const unsigned int kUnderTextSizeX = 180;
+const unsigned int kUnderTextSizeY = 10;
+const unsigned int kUnderTimedTextSizeY = 24;
+const unsigned int kUnderTextSizeX_f = 228; // foreign version
+const unsigned int kUnderTextSizeY_f = 13; // foreign version
+const unsigned int kUnderTimedTextSizeY_f = 30;
+const unsigned int kUnderTextBufSize = kUnderTextSizeX_f * kUnderTextSizeY_f;
+const unsigned int kUnderTimedTextBufSize = 256 * kUnderTimedTextSizeY_f;
+const unsigned int kLengthOfVars = 68;
+const unsigned int kNumChanges = 250;
+const unsigned int kLenOfMapStore = 22*8*20*8;
+const unsigned int kMapWidth = 66;
+const unsigned int kMapHeight = 60;
+const unsigned int kLengthOfMap = kMapWidth * kMapHeight;
+const unsigned int kNumExObjects = 114;
+const unsigned int kScreenwidth = 320;
+const unsigned int kDiaryx = (68+24);
+const unsigned int kDiaryy = (48+12);
+const unsigned int kInventx = 80;
+const unsigned int kInventy = 58;
+const unsigned int kMenux = (80+40);
+const unsigned int kMenuy = 60;
+const unsigned int kOpsx = 60;
+const unsigned int kOpsy = 52;
+const unsigned int kSymbolx = 64;
+const unsigned int kSymboly = 56;
+const unsigned int kLengthofvars = 68;
+const unsigned int kDebuglevel1 = (0);
+const unsigned int kDebuglevel2 = (0);
+const unsigned int kPlayback = (0);
+const unsigned int kSpanish = (0);
+const unsigned int kRecording = (0);
+const unsigned int kGerman = (0);
+const unsigned int kDemo = (0);
+const unsigned int kExframedata = (0);
+const unsigned int kExframes = (0+2080);
+const unsigned int kExdata = (0+2080+30000);
+const unsigned int kExtextdat = (0+2080+30000+(16*114));
+const unsigned int kExtext = (0+2080+30000+(16*114)+((114+2)*2));
+const unsigned int kLengthofextra = (0+2080+30000+(16*114)+((114+2)*2)+18000);
+const unsigned int kForeign = (1);
+const unsigned int kCd = (1);
+const unsigned int kNumexobjects = (114);
+const unsigned int kExtextlen = (18000);
+const unsigned int kExframeslen = (30000);
+const unsigned int kItempicsize = (44);
 // These are for ReelRoutine::reelPointer, which is a callback field.
 const uint16 addr_backobject = 0xc170;
 const uint16 addr_mainman = 0xc138;
@@ -56,10 +102,6 @@ const uint16 addr_mainman = 0xc138;
 // into this, making it a ring buffer
 extern uint8 g_keyBuffer[16];
 
-}
-
-namespace DreamWeb {
-
 // Engine Debug Flags
 enum {
 	kDebugAnimation = (1 << 0),
@@ -159,8 +201,978 @@ private:
 	Audio::SoundHandle _channelHandle[2];
 	uint8 _channel0, _channel1;
 
-	DreamGen::DreamGenContext _context;
-	DreamGen::DreamBase &_base;
+protected:
+	const char *_timedString;
+	GameVars _vars; // saved variables
+
+	// from backdrop.cpp
+	uint8 *_backdropBlocks;
+	BackdropMapFlag _backdropFlags[96];
+	uint8 _mapData[kLengthOfMap + 32];
+
+	// from keypad.cpp
+	uint8 _pressList[6];
+
+	// from monitor.cpp
+	char _inputLine[64];
+	char _operand1[14];
+	char _currentFile[14];
+
+	// from newplace.cpp
+	uint8 _roomsCanGo[16];
+
+	// from object.cpp
+	uint16 _openChangeSize;
+	ObjectRef _oldSubject;
+
+	// from pathfind.cpp
+	Common::Point _lineData[200];		// Output of Bresenham
+
+	// from saveload.cpp
+	char _saveNames[17*7];
+	char _saveNamesOld[17*7];
+
+	// from vgagrafx.cpp
+	uint8 _workspace[(0x1000 + 2) * 16];
+	uint8 _mapStore[kLenOfMapStore + 32];
+
+	// from people.cpp
+	ReelRoutine _reelRoutines[kNumReelRoutines+1];
+	ReelRoutine *_personData;
+
+	// from Buffers
+	uint8 _textUnder[kUnderTextBufSize];
+	ObjectRef _openInvList[16];
+	ObjectRef _ryanInvList[30];
+	uint8 _pointerBack[32*32];
+	MapFlag _mapFlags[11*10];
+	uint8 _startPal[3*256];
+	uint8 _endPal[3*256];
+	uint8 _mainPal[3*256];
+	Common::List<Sprite> _spriteTable;
+	Common::List<ObjPos> _setList;
+	Common::List<ObjPos> _freeList;
+	Common::List<ObjPos> _exList;
+	Common::List<People> _peopleList;
+	uint8 _zoomSpace[46*40];
+	// _printedList (unused?)
+	Change _listOfChanges[kNumChanges]; // Note: this array is saved
+	uint8 _underTimedText[kUnderTimedTextBufSize];
+	Common::List<Rain> _rainList;
+
+	// textfiles
+	TextFile _textFile1;
+	TextFile _textFile2;
+	TextFile _textFile3;
+	TextFile _travelText;
+	TextFile _puzzleText;
+	TextFile _commandText;
+
+	// graphics files
+	GraphicsFile _tempGraphics;
+	GraphicsFile _tempGraphics2;
+	GraphicsFile _tempGraphics3;
+	GraphicsFile _icons1;
+	GraphicsFile _icons2;
+	GraphicsFile _tempCharset;
+	GraphicsFile _charset1;
+	GraphicsFile _mainSprites;
+	const GraphicsFile *_currentCharset;
+
+	// room files
+	GraphicsFile _setFrames;
+	GraphicsFile _freeFrames;
+	GraphicsFile _reel1;
+	GraphicsFile _reel2;
+	GraphicsFile _reel3;
+	TextFile _setDesc;
+	TextFile _blockDesc;
+	TextFile _roomDesc;
+	TextFile _freeDesc;
+	TextFile _personText;
+	uint16 _personFramesLE[12];
+	RoomPaths _pathData[36];
+	Reel *_reelList;
+	SetObject _setDat[128];
+	DynObject _freeDat[80];
+
+	// Extras segment (NB: this is saved)
+	GraphicsFile _exFrames;
+	DynObject _exData[kNumExObjects];
+	TextFile _exText;
+
+public:
+	DreamWebEngine(/*DreamWeb::DreamWebEngine *en*/);
+
+	bool _quitRequested;
+	bool _subtitles;
+	bool _foreignRelease;
+
+	bool _wonGame;
+
+	// sound related
+	uint8 _roomsSample;
+	uint8 _currentSample;
+	uint8 _channel0Playing;
+	uint8 _channel0Repeat;
+	uint8 _channel1Playing;
+
+	uint8 _volume;
+	uint8 _volumeTo;
+	int8 _volumeDirection;
+	uint8 _volumeCount;
+
+	bool _speechLoaded;
+
+	// misc variables
+	uint8 _speechCount;
+	uint16 _charShift;
+	uint8 _kerning;
+	uint8 _brightness;
+	uint8 _roomLoaded;
+	uint8 _didZoom;
+	uint16 _lineSpacing;
+	uint16 _textAddressX;
+	uint16 _textAddressY;
+	uint8 _textLen;
+	uint16 _lastXPos;
+	uint8 _itemFrame;
+	uint8 _withObject;
+	uint8 _withType;
+	uint16 _lookCounter;
+	uint8 _command;
+	uint8 _commandType;
+	uint8 _objectType;
+	uint8 _getBack;
+	uint8 _invOpen;
+	uint8 _mainMode;
+	uint8 _pickUp;
+	uint8 _lastInvPos;
+	uint8 _examAgain;
+	uint8 _newTextLine;
+	uint8 _openedOb;
+	uint8 _openedType;
+	uint16 _mapAdX;
+	uint16 _mapAdY;
+	uint16 _mapOffsetX;
+	uint16 _mapOffsetY;
+	uint16 _mapXStart;
+	uint16 _mapYStart;
+	uint8 _mapXSize;
+	uint8 _mapYSize;
+	uint8 _haveDoneObs;
+	uint8 _manIsOffScreen;
+	uint8 _facing;
+	uint8 _leaveDirection;
+	uint8 _turnToFace;
+	uint8 _turnDirection;
+	uint16 _mainTimer;
+	uint8 _introCount;
+	uint8 _currentKey;
+	uint8 _timerCount;
+	uint8 _mapX;
+	uint8 _mapY;
+	uint8 _ryanX;
+	uint8 _ryanY;
+	uint8 _lastFlag;
+	uint8 _destPos;
+	uint8 _realLocation;
+	uint8 _roomNum;
+	uint8 _nowInNewRoom;
+	uint8 _resetManXY;
+	uint8 _newLocation;
+	uint8 _autoLocation;
+	uint16 _mouseX;
+	uint16 _mouseY;
+	uint16 _mouseButton;
+	uint16 _oldButton;
+	uint16 _oldX;
+	uint16 _oldY;
+	uint16 _oldPointerX;
+	uint16 _oldPointerY;
+	uint16 _delHereX;
+	uint16 _delHereY;
+	uint8 _pointerXS;
+	uint8 _pointerYS;
+	uint8 _delXS;
+	uint8 _delYS;
+	uint8 _pointerFrame;
+	uint8 _pointerPower;
+	uint8 _pointerMode;
+	uint8 _pointerSpeed;
+	uint8 _pointerCount;
+	uint8 _inMapArea;
+	uint8 _talkMode;
+	uint8 _talkPos;
+	uint8 _character;
+	uint8 _watchDump;
+	uint8 _logoNum;
+	uint8 _oldLogoNum;
+	uint8 _pressed;
+	uint16 _pressPointer;
+	uint8 _graphicPress;
+	uint8 _pressCount;
+	uint8 _lightCount;
+	uint8 _folderPage;
+	uint8 _diaryPage;
+	uint8 _menuCount;
+	uint8 _symbolTopX;
+	uint8 _symbolTopNum;
+	uint8 _symbolTopDir;
+	uint8 _symbolBotX;
+	uint8 _symbolBotNum;
+	uint8 _symbolBotDir;
+	uint16 _dumpX;
+	uint16 _dumpY;
+	uint8 _walkAndExam;
+	uint8 _walkExamType;
+	uint8 _walkExamNum;
+	uint16 _cursLocX;
+	uint16 _cursLocY;
+	uint16 _curPos;
+	uint16 _monAdX;
+	uint16 _monAdY;
+	uint16 _timeCount;
+	uint16 _countToTimed;
+	uint8 _timedY;
+	uint8 _timedX;
+	uint8 _needToDumpTimed;
+	uint8 _loadingOrSave;
+	uint8 _currentSlot;
+	uint8 _cursorPos;
+	uint8 _colourPos;
+	uint8 _fadeDirection;
+	uint8 _numToFade;
+	uint8 _fadeCount;
+	uint8 _addToGreen;
+	uint8 _addToRed;
+	uint8 _addToBlue;
+	uint16 _lastSoundReel;
+	uint8 _lastHardKey;
+	uint16 _bufferIn;
+	uint16 _bufferOut;
+	uint8 _blinkFrame;
+	uint8 _blinkCount;
+	uint8 _reAssesChanges;
+	uint8 _pointersPath;
+	uint8 _mansPath;
+	uint8 _pointerFirstPath;
+	uint8 _finalDest;
+	uint8 _destination;
+	uint16 _lineStartX;
+	uint16 _lineStartY;
+	uint16 _lineEndX;
+	uint16 _lineEndY;
+	uint8 _linePointer;
+	uint8 _lineDirection;
+	uint8 _lineLength;
+
+	// from backdrop.cpp
+	void doBlocks();
+	uint8 getXAd(const uint8 *setData, uint8 *result);
+	uint8 getYAd(const uint8 *setData, uint8 *result);
+	uint8 getMapAd(const uint8 *setData, uint16 *x, uint16 *y);
+	void calcFrFrame(const Frame &frame, uint8* width, uint8* height, uint16 x, uint16 y, ObjPos *objPos);
+	void makeBackOb(SetObject *objData, uint16 x, uint16 y);
+	void showAllObs();
+	void getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize);
+	void calcMapAd();
+	void showAllFree();
+	void drawFlags();
+	void showAllEx();
+
+	// from keypad.cpp
+	void getUnderMenu();
+	void putUnderMenu();
+	void singleKey(uint8 key, uint16 x, uint16 y);
+	void loadKeypad();
+	void showKeypad();
+	bool isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
+	void addToPressList();
+	void buttonOne();
+	void buttonTwo();
+	void buttonThree();
+	void buttonFour();
+	void buttonFive();
+	void buttonSix();
+	void buttonSeven();
+	void buttonEight();
+	void buttonNine();
+	void buttonNought();
+	void buttonEnter();
+	void buttonPress(uint8 buttonId);
+	void showOuterPad();
+	void dumpKeypad();
+	void dumpSymbol();
+	void dumpSymBox();
+	void quitSymbol();
+	void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
+
+	// from monitor.cpp
+	void input();
+	byte makeCaps(byte c);
+	void delChar();
+	void monMessage(uint8 index);
+	void netError();
+	void monitorLogo();
+	void randomAccess(uint16 count);
+	void printOuterMon();
+	void showCurrentFile();
+	void accessLightOn();
+	void accessLightOff();
+	void turnOnPower();
+	void powerLightOn();
+	void powerLightOff();
+	void printLogo();
+	void scrollMonitor();
+	const char *monPrint(const char *string);
+	void lockLightOn();
+	void lockLightOff();
+	void loadPersonal();
+	void loadNews();
+	void loadCart();
+	void showKeys();
+	const char *parser();
+	const char *searchForString(const char *topic, const char *text);
+	const char *getKeyAndLogo(const char *foundString);
+	void read();
+	void dirFile(const char *dirName);
+	void dirCom();
+	void useMon();
+	bool execCommand();
+
+	// from newplace.cpp
+	void getUnderCentre();
+	void putUnderCentre();
+	void showArrows();
+	uint8 getLocation(uint8 index);
+	void setLocation(uint8 index);
+	void clearLocation(uint8 index);
+	void resetLocation(uint8 index);
+	void readCityPic();
+	void readDestIcon();
+	void showCity();
+	void locationPic();
+	void selectLocation();
+	void newPlace();
+	void nextDest();
+	void lastDest();
+	void destSelect();
+	void lookAtPlace();
+
+	// from object.cpp
+	void obIcons();
+	void fillRyan();
+	void findAllRyan();
+	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y);
+	void obPicture();
+	void removeObFromInv();
+	void deleteExObject(uint8 index);
+	void deleteExFrame(uint8 frameNum);
+	void deleteExText(uint8 textNum);
+	void purgeALocation(uint8 index);
+	const uint8 *getObTextStart();
+	void wornError();
+	void makeWorn(DynObject *object);
+	void dropObject();
+	ObjectRef findOpenPos();
+	byte getOpenedSlotSize();
+	byte getOpenedSlotCount();
+	void openOb();
+	void findAllOpen();
+	void fillOpen();
+	ObjectRef findInvPos();
+	void reExFromInv();
+	void swapWithInv();
+	void transferText(uint8 from, uint8 to);
+	void pickupConts(uint8 from, uint8 containerEx);
+	byte transferToEx(uint8 from);
+	void swapWithOpen();
+	void outOfOpen();
+	void inToInv();
+	void outOfInv();
+	bool checkObjectSize();
+	void useOpened();
+	void setPickup();
+	void selectOpenOb();
+	void examineOb(bool examineAgain = true);
+	void selectOb();
+	void inventory();
+	void identifyOb();
+
+	// from pathfind.cpp
+	void turnPathOn(uint8 param);
+	void turnPathOff(uint8 param);
+	void turnAnyPathOn(uint8 param, uint8 room);
+	void turnAnyPathOff(uint8 param, uint8 room);
+	RoomPaths *getRoomsPaths();
+	void faceRightWay();
+	void setWalk();
+	void autoSetWalk();
+	void checkDest(const RoomPaths *roomsPaths);
+	void findXYFromPath();
+	bool checkIfPathIsOn(uint8 index);
+	void bresenhams();
+	void workoutFrames();
+	byte findFirstPath(byte x, byte y);
+	byte findPathOfPoint(byte x, byte y);
+
+	// from people.cpp
+	void setupInitialReelRoutines();
+	void updatePeople();
+	void madmanText();
+	void madman(ReelRoutine &routine);
+	void madMode();
+	void addToPeopleList(ReelRoutine *routine);
+	bool checkSpeed(ReelRoutine &routine);
+	void sparkyDrip(ReelRoutine &routine);
+	void genericPerson(ReelRoutine &routine);
+	void gamer(ReelRoutine &routine);
+	void eden(ReelRoutine &routine);
+	void sparky(ReelRoutine &routine);
+	void rockstar(ReelRoutine &routine);
+	void madmansTelly(ReelRoutine &routine);
+	void smokeBloke(ReelRoutine &routine);
+	void manAsleep(ReelRoutine &routine);
+	void drunk(ReelRoutine &routine);
+	void introMagic1(ReelRoutine &routine);
+	void introMagic2(ReelRoutine &routine);
+	void introMagic3(ReelRoutine &routine);
+	void introMusic(ReelRoutine &routine);
+	void candles(ReelRoutine &routine);
+	void candles1(ReelRoutine &routine);
+	void candles2(ReelRoutine &routine);
+	void smallCandle(ReelRoutine &routine);
+	void gates(ReelRoutine &routine);
+	void security(ReelRoutine &routine);
+	void edenInBath(ReelRoutine &routine);
+	void louis(ReelRoutine &routine);
+	void handClap(ReelRoutine &routine);
+	void carParkDrip(ReelRoutine &routine);
+	void foghornSound(ReelRoutine &routine);
+	void train(ReelRoutine &routine);
+	void attendant(ReelRoutine &routine);
+	void keeper(ReelRoutine &routine);
+	void interviewer(ReelRoutine &routine);
+	void drinker(ReelRoutine &routine);
+	void alleyBarkSound(ReelRoutine &routine);
+	void louisChair(ReelRoutine &routine);
+	void bossMan(ReelRoutine &routine);
+	void priest(ReelRoutine &routine);
+	void monkAndRyan(ReelRoutine &routine);
+	void copper(ReelRoutine &routine);
+	void introMonks1(ReelRoutine &routine);
+	void introMonks2(ReelRoutine &routine);
+	void soldier1(ReelRoutine &routine);
+	void receptionist(ReelRoutine &routine);
+	void bartender(ReelRoutine &routine);
+	void heavy(ReelRoutine &routine);
+	void helicopter(ReelRoutine &routine);
+	void mugger(ReelRoutine &routine);
+	void businessMan(ReelRoutine &routine);
+	void endGameSeq(ReelRoutine &routine);
+	void poolGuard(ReelRoutine &routine);
+
+	// from print.cpp
+	uint8 getNextWord(const GraphicsFile &charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount);
+	void printChar(const GraphicsFile &charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
+	void printChar(const GraphicsFile &charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
+	void printBoth(const GraphicsFile &charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar);
+	uint8 printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered);
+	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
+	uint8 getNumber(const GraphicsFile &charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16 *offset);
+	uint8 kernChars(uint8 firstChar, uint8 secondChar, uint8 width);
+	uint8 printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
+	uint16 waitFrames();
+	void printCurs();
+	void delCurs();
+	void rollEndCreditsGameWon();
+	void rollEndCreditsGameLost();
+
+	// from saveload.cpp
+	void loadGame();
+	void doLoad(int slot);
+	void saveGame();
+	void namesToOld();
+	void oldToNames();
+	void saveLoad();
+	void doSaveLoad();
+	void showMainOps();
+	void showDiscOps();
+	void discOps();
+	void actualSave();
+	void actualLoad();
+	void loadPosition(unsigned int slot);
+	void savePosition(unsigned int slot, const char *descbuf);
+	uint scanForNames();
+	void loadOld();
+	void showDecisions();
+	void loadSaveBox();
+	void showNames();
+	void checkInput();
+	void selectSlot();
+	void showSlots();
+	void showOpBox();
+	void showSaveOps();
+	void showLoadOps();
+
+	// from sound.cpp
+	bool loadSpeech(byte type1, int idx1, byte type2, int idx2);
+	void volumeAdjust();
+	void cancelCh0();
+	void cancelCh1();
+	void loadRoomsSample();
+	void playChannel0(uint8 index, uint8 repeat);
+	void playChannel1(uint8 index);
+
+	// from sprite.cpp
+	void printSprites();
+	void printASprite(const Sprite *sprite);
+	void clearSprites();
+	Sprite *makeSprite(uint8 x, uint8 y, uint16 updateCallback, const GraphicsFile *frameData, uint16 somethingInDi);
+	void initMan();
+	void walking(Sprite *sprite);
+	void aboutTurn(Sprite *sprite);
+	void backObject(Sprite *sprite);
+	void constant(Sprite *sprite, SetObject *objData);
+	void randomSprite(Sprite *sprite, SetObject *objData);
+	void doorway(Sprite *sprite, SetObject *objData);
+	void wideDoor(Sprite *sprite, SetObject *objData);
+	void doDoor(Sprite *sprite, SetObject *objData, Common::Rect check);
+	void steady(Sprite *sprite, SetObject *objData);
+	void lockedDoorway(Sprite *sprite, SetObject *objData);
+	void liftSprite(Sprite *sprite, SetObject *objData);
+
+	Reel *getReelStart(uint16 reelPointer);
+	const GraphicsFile *findSource(uint16 &frame);
+	void showReelFrame(Reel *reel);
+	void showGameReel(ReelRoutine *routine);
+	const Frame *getReelFrameAX(uint16 frame);
+	void moveMap(uint8 param);
+	void checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY);
+
+	uint8 getBlockOfPixel(uint8 x, uint8 y);
+	void splitIntoLines(uint8 x, uint8 y);
+	void initRain();
+
+	void intro1Text();
+	void intro2Text(uint16 nextReelPointer);
+	void intro3Text(uint16 nextReelPointer);
+
+	void monks2text();
+	void textForEnd();
+	void textForMonkHelper(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
+	void textForMonk();
+	void priestText(ReelRoutine &routine);
+	void soundOnReels(uint16 reelPointer);
+	void clearBeforeLoad();
+	void clearReels();
+	void getRidOfReels();
+	void liftNoise(uint8 index);
+	void checkForExit(Sprite *sprite);
+	void mainMan(Sprite *sprite);
+	void spriteUpdate();
+	void showRain();
+	void reconstruct();
+	void reelsOnScreen();
+
+	// from stubs.cpp
+	void setupInitialVars();
+	bool isCD();
+	void crosshair();
+	void delTextLine();
+	void showBlink();
+	void dumpBlink();
+	void dumpPointer();
+	void showPointer();
+	void delPointer();
+	void showRyanPage();
+	void switchRyanOn();
+	void switchRyanOff();
+	void middlePanel();
+	void showDiary();
+	void readMouse();
+	uint16 readMouseState();
+	void hangOn(uint16 frameCount);
+	void lockMon();
+	uint8 *textUnder();
+	void readKey();
+	void findOrMake(uint8 index, uint8 value, uint8 type);
+	DynObject *getFreeAd(uint8 index);
+	DynObject *getExAd(uint8 index);
+	DynObject *getEitherAdCPP();
+	void *getAnyAdDir(uint8 index, uint8 flag);
+	void showWatch();
+	void showTime();
+	void showExit();
+	void showMan();
+	void panelIcons1();
+	SetObject *getSetAd(uint8 index);
+	void *getAnyAd(uint8 *slotSize, uint8 *slotCount);
+	const uint8 *getTextInFile1(uint16 index);
+	uint8 findNextColon(const uint8 **string);
+	void allocateBuffers();
+	void loadTextFile(TextFile &file, const char *fileName);
+	void loadGraphicsFile(GraphicsFile &file, const char *fileName);
+	void loadGraphicsSegment(GraphicsFile &file, unsigned int len);
+	void loadTextSegment(TextFile &file, unsigned int len);
+	void loadIntoTemp(const char *fileName);
+	void loadIntoTemp2(const char *fileName);
+	void loadIntoTemp3(const char *fileName);
+	void loadTempCharset(const char *fileName);
+	void loadTravelText();
+	void loadTempText(const char *fileName);
+	void clearAndLoad(uint8 *buf, uint8 c, unsigned int size, unsigned int maxSize);
+	void sortOutMap();
+	void loadRoomData(const Room &room, bool skipDat);
+	void useTempCharset();
+	void useCharset1();
+	void printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered);
+	void printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count);
+	bool isItDescribed(const ObjPos *objPos);
+	void zoomIcon();
+	void roomName();
+	void showIcon();
+	void eraseOldObs();
+	void commandOnly(uint8 command);
+	void blank();
+	void setTopLeft();
+	void setTopRight();
+	void setBotLeft();
+	void setBotRight();
+	void examIcon();
+	void animPointer();
+	void getFlagUnderP(uint8 *flag, uint8 *flagEx);
+	void workToScreenM();
+	void quitKey();
+	void restoreReels();
+	void loadFolder();
+	void folderHints();
+	void folderExit();
+	void showFolder();
+	void showLeftPage();
+	void showRightPage();
+	void underTextLine();
+	void hangOnP(uint16 count);
+	void getUnderZoom();
+	void putUnderZoom();
+	void examineInventory();
+	void openInv();
+	void getBack1();
+	void getBackFromOb();
+	void getBackFromOps();
+	void getBackToOps();
+	void DOSReturn();
+	bool isItWorn(const DynObject *object);
+	bool compare(uint8 index, uint8 flag, const char id[4]);
+	void hangOnW(uint16 frameCount);
+	void getRidOfTemp();
+	void getRidOfTempText();
+	void getRidOfTemp2();
+	void getRidOfTemp3();
+	void getRidOfTempCharset();
+	void getRidOfAll();
+	void placeSetObject(uint8 index);
+	void removeSetObject(uint8 index);
+	bool isSetObOnMap(uint8 index);
+	void dumpZoom();
+	void diaryKeyP();
+	void diaryKeyN();
+	void findRoomInLoc();
+	void loadMenu();
+	void showMenu();
+	void dumpMenu();
+	void dealWithSpecial(uint8 firstParam, uint8 secondParam);
+	void plotReel(uint16 &reelPointer);
+	void setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
+	void getUnderTimed();
+	void putUnderTimed();
+	void dumpTextLine();
+	void useTimedText();
+	void dumpTimedText();
+	void getTime();
+	void doChange(uint8 index, uint8 value, uint8 type);
+	bool isRyanHolding(const char *id);
+	void clearBuffers();
+	void clearChanges();
+	void drawFloor();
+	uint16 findSetObject(const char *id);
+	void hangOnCurs(uint16 frameCount);
+	const uint8 *findObName(uint8 type, uint8 index);
+	void copyName(uint8 type, uint8 index, uint8 *dst);
+	uint16 findExObject(const char *id);
+	void makeMainScreen();
+	void showWatchReel();
+	void watchReel();
+	void commandWithOb(uint8 command, uint8 type, uint8 index);
+	void examineObText();
+	void blockNameText();
+	void personNameText();
+	void walkToText();
+	void entryTexts();
+	void setAllChanges();
+	void restoreAll();
+	void redrawMainScrn();
+
+	template <class T>
+	void checkCoords(const RectWithCallback<T> *rectWithCallbacks) {
+		if (_newLocation != 0xff)
+			return;
+
+		const RectWithCallback<T> *r;
+		for (r = rectWithCallbacks; r->_xMin != 0xffff; ++r) {
+			if (r->contains(_mouseX, _mouseY)) {
+				(((T *)this)->*(r->_callback))();
+				return;
+			}
+		}
+	}
+
+	void newGame();
+	void deleteTaken();
+	void autoAppear();
+	void loadRoom();
+	void startLoading(const Room &room);
+	void startup();
+	void atmospheres();
+	bool objectMatches(void *object, const char *id);
+	void checkFolderCoords();
+	void nextFolder();
+	void lastFolder();
+	void lookAtCard();
+	void obsThatDoThings();
+	void describeOb();
+	void putBackObStuff();
+	void reExFromOpen();
+	void showDiaryPage();
+	void showDiaryKeys();
+	void dumpDiaryKeys();
+	void useMenu();
+	void incRyanPage();
+	void edensFlatReminders();
+	void dropError();
+	void cantDrop();
+	void entryAnims();
+	bool finishedWalking();
+	void emergencyPurge();
+	void purgeAnItem();
+	uint8 nextSymbol(uint8 symbol);
+	void enterSymbol();
+	void showSymbol();
+	void updateSymbolTop();
+	void updateSymbolBot();
+	void pickupOb(uint8 command, uint8 pos);
+	void errorMessage1();
+	void errorMessage2();
+	void errorMessage3();
+	void decide();
+	void allPointer();
+	void dumpWatch();
+	void watchCount();
+	void signOn();
+	void searchForFiles(const char *filesString);
+	void triggerMessage(uint16 index);
+	void processTrigger();
+	void dreamweb();
+	void screenUpdate();
+	void startup1();
+	void quickQuit();
+	void readOneBlock();
+	void seeCommandTail();
+	void quickQuit2();
+	bool checkIfPerson(uint8 x, uint8 y);
+	bool checkIfFree(uint8 x, uint8 y);
+	bool checkIfEx(uint8 x, uint8 y);
+	void walkAndExamine();
+	void obName(uint8 command, uint8 commandType);
+	bool checkIfSet(uint8 x, uint8 y);
+	void readSetData();
+	void look();
+	void autoLook();
+	void doLook();
+	void mainScreen();
+	void zoomOnOff();
+	void initialInv();
+	void walkIntoRoom();
+	void afterNewRoom();
+	void madmanRun();
+	void showGun();
+
+	// from talk.cpp
+	void talk();
+	void convIcons();
+	uint16 getPersFrame(uint8 index);
+	const uint8 *getPersonText(uint8 index, uint8 talkPos);
+	void startTalk();
+	void moreTalk();
+	void doSomeTalk();
+	bool hangOnPQ();
+	void redes();
+
+	// from titles.cpp
+	void endGame();
+	void monkSpeaking();
+	void gettingShot();
+	void bibleQuote();
+	void hangOne(uint16 delay);
+	void intro();
+	void runIntroSeq();
+	void runEndSeq();
+	void loadIntroRoom();
+	void set16ColPalette();
+	void realCredits();
+	uint8 getExPos();
+
+	// from use.cpp
+	void useRoutine();
+	void useObject();
+	void placeFreeObject(uint8 index);
+	void removeFreeObject(uint8 index);
+	void setupTimedUse(uint16 offset, uint16 countToTimed, uint16 timeCount, byte x, byte y);
+	void withWhat();
+	uint16 checkInside(uint16 command, uint16 type);
+	void showPuzText(uint16 command, uint16 count);
+	void useText(const uint8 *string);
+	void showFirstUse();
+	void showSecondUse();
+	void viewFolder();
+	void edensCDPlayer();
+	void hotelBell();
+	void playGuitar();
+	void useElevator1();
+	void useElevator2();
+	void useElevator3();
+	void useElevator4();
+	void useElevator5();
+	void useHatch();
+	void wheelSound();
+	void callHotelLift();
+	void useShield();
+	void useCoveredBox();
+	void useRailing();
+	void useChurchHole();
+	void sitDownInBar();
+	void useBalcony();
+	void useWindow();
+	void trapDoor();
+	void useDryer();
+	void callEdensDLift();
+	void callEdensLift();
+	void openYourNeighbour();
+	void openRyan();
+	void openPoolBoss();
+	void openEden();
+	void openSarters();
+	void openLouis();
+	void useWall();
+	void useChurchGate();
+	void useLadder();
+	void useLadderB();
+	bool defaultUseHandler(const char *id);
+	void slabDoorA();
+	void slabDoorB();
+	void slabDoorC();
+	void slabDoorE();
+	void slabDoorD();
+	void slabDoorF();
+	void useGun();
+	void useFullCart();
+	void useClearBox();
+	void openTVDoor();
+	void usePlate();
+	void usePlinth();
+	void useElvDoor();
+	void useWinch();
+	void useCart();
+	void useHole();
+	void openHotelDoor();
+	void openHotelDoor2();
+	void grafittiDoor();
+	void useCardReader1();
+	void useCardReader2();
+	void useCardReader3();
+	void usePoolReader();
+	void useLighter();
+	void useWire();
+	void openTomb();
+	void hotelControl();
+	void useCooker();
+	void useDiary();
+	void useControl();
+	void useSlab();
+	void usePipe();
+	void useOpenBox();
+	void runTap();
+	void useAxe();
+	void useHandle();
+	void useAltar();
+	void notHeldError();
+	void useCashCard();
+	void useButtonA();
+	void wearWatch();
+	void wearShades();
+	void useTrainer();
+	void useStereo();
+	void chewy();
+	void delEverything();
+	void afterIntroRoom();
+
+	// from vgafades.cpp
+	void clearStartPal();
+	void clearEndPal();
+	void palToStartPal();
+	void endPalToStart();
+	void startPalToEnd();
+	void palToEndPal();
+	void fadeDOS();
+	void doFade();
+	void fadeCalculation();
+	void fadeUpYellows();
+	void fadeUpMonFirst();
+	void fadeUpMon();
+	void fadeDownMon();
+	void initialMonCols();
+	void fadeScreenUp();
+	void fadeScreenUps();
+	void fadeScreenUpHalf();
+	void fadeScreenDown();
+	void fadeScreenDowns();
+	void fadeScreenDownHalf();
+	void clearPalette();
+	void greyscaleSum();
+	void allPalette();
+	void dumpCurrent();
+
+	// from vgagrafx.cpp
+	inline uint8 *workspace() { return _workspace; }
+	void clearWork();
+
+	void panelToMap();
+	void mapToPanel();
+	void dumpMap();
+	void transferFrame(uint8 from, uint8 to, uint8 offset);
+	void zoom();
+	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height);
+	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height);
+	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height);
+	void workToScreen();
+	void printUnderMon();
+	void frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y);
+	void frameOutNm(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
+	void frameOutBh(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
+	void frameOutFx(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
+	void doShake();
+	void vSync();
+	void setMode();
+	void showPCX(const Common::String &name);
+	void showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 effectsFlag, uint8 width, uint8 height);
+	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
+	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
+	bool pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y);
+	void loadPalFromIFF();
+	void createPanel();
+	void createPanel2();
+	void showPanel();
 };
 
 } // End of namespace DreamWeb
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 864cc8e8fa..731c58f2f8 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -22,20 +22,20 @@
 
 #include "dreamweb/dreamweb.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
 const uint16 kKeypadx = 36+112;
 const uint16 kKeypady = 72;
 
-void DreamBase::getUnderMenu() {
+void DreamWebEngine::getUnderMenu() {
 	multiGet(_underTimedText, kMenux, kMenuy, 48, 48);
 }
 
-void DreamBase::putUnderMenu() {
+void DreamWebEngine::putUnderMenu() {
 	multiPut(_underTimedText, kMenux, kMenuy, 48, 48);
 }
 
-void DreamBase::singleKey(uint8 key, uint16 x, uint16 y) {
+void DreamWebEngine::singleKey(uint8 key, uint16 x, uint16 y) {
 	if (key == _graphicPress) {
 		key += 11;
 		if (_pressCount < 8)
@@ -45,11 +45,11 @@ void DreamBase::singleKey(uint8 key, uint16 x, uint16 y) {
 	showFrame(_tempGraphics, x, y, key, 0);
 }
 
-void DreamBase::loadKeypad() {
+void DreamWebEngine::loadKeypad() {
 	loadIntoTemp("DREAMWEB.G02");
 }
 
-void DreamBase::showKeypad() {
+void DreamWebEngine::showKeypad() {
 	singleKey(22, kKeypadx+9,  kKeypady+5);
 	singleKey(23, kKeypadx+31, kKeypady+5);
 	singleKey(24, kKeypadx+53, kKeypady+5);
@@ -78,13 +78,13 @@ void DreamBase::showKeypad() {
 	}
 }
 
-bool DreamBase::isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
+bool DreamWebEngine::isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
 	
 	return digit0 == _pressList[0] && digit1 == _pressList[1]
 		&& digit2 == _pressList[2] && digit3 == _pressList[3];
 }
 
-void DreamBase::addToPressList() {
+void DreamWebEngine::addToPressList() {
 	if (_pressPointer == 5)
 		return;
 	uint8 pressed = _pressed;
@@ -95,21 +95,21 @@ void DreamBase::addToPressList() {
 	++_pressPointer;
 }
 
-void DreamBase::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
-	RectWithCallback<DreamBase> keypadList[] = {
-		{ kKeypadx+9,kKeypadx+30,kKeypady+9,kKeypady+22,&DreamBase::buttonOne },
-		{ kKeypadx+31,kKeypadx+52,kKeypady+9,kKeypady+22,&DreamBase::buttonTwo },
-		{ kKeypadx+53,kKeypadx+74,kKeypady+9,kKeypady+22,&DreamBase::buttonThree },
-		{ kKeypadx+9,kKeypadx+30,kKeypady+23,kKeypady+40,&DreamBase::buttonFour },
-		{ kKeypadx+31,kKeypadx+52,kKeypady+23,kKeypady+40,&DreamBase::buttonFive },
-		{ kKeypadx+53,kKeypadx+74,kKeypady+23,kKeypady+40,&DreamBase::buttonSix },
-		{ kKeypadx+9,kKeypadx+30,kKeypady+41,kKeypady+58,&DreamBase::buttonSeven },
-		{ kKeypadx+31,kKeypadx+52,kKeypady+41,kKeypady+58,&DreamBase::buttonEight },
-		{ kKeypadx+53,kKeypadx+74,kKeypady+41,kKeypady+58,&DreamBase::buttonNine },
-		{ kKeypadx+9,kKeypadx+30,kKeypady+59,kKeypady+73,&DreamBase::buttonNought },
-		{ kKeypadx+31,kKeypadx+74,kKeypady+59,kKeypady+73,&DreamBase::buttonEnter },
-		{ kKeypadx+72,kKeypadx+86,kKeypady+80,kKeypady+94,&DreamBase::quitKey },
-		{ 0,320,0,200,&DreamBase::blank },
+void DreamWebEngine::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
+	RectWithCallback<DreamWebEngine> keypadList[] = {
+		{ kKeypadx+9,kKeypadx+30,kKeypady+9,kKeypady+22,&DreamWebEngine::buttonOne },
+		{ kKeypadx+31,kKeypadx+52,kKeypady+9,kKeypady+22,&DreamWebEngine::buttonTwo },
+		{ kKeypadx+53,kKeypadx+74,kKeypady+9,kKeypady+22,&DreamWebEngine::buttonThree },
+		{ kKeypadx+9,kKeypadx+30,kKeypady+23,kKeypady+40,&DreamWebEngine::buttonFour },
+		{ kKeypadx+31,kKeypadx+52,kKeypady+23,kKeypady+40,&DreamWebEngine::buttonFive },
+		{ kKeypadx+53,kKeypadx+74,kKeypady+23,kKeypady+40,&DreamWebEngine::buttonSix },
+		{ kKeypadx+9,kKeypadx+30,kKeypady+41,kKeypady+58,&DreamWebEngine::buttonSeven },
+		{ kKeypadx+31,kKeypadx+52,kKeypady+41,kKeypady+58,&DreamWebEngine::buttonEight },
+		{ kKeypadx+53,kKeypadx+74,kKeypady+41,kKeypady+58,&DreamWebEngine::buttonNine },
+		{ kKeypadx+9,kKeypadx+30,kKeypady+59,kKeypady+73,&DreamWebEngine::buttonNought },
+		{ kKeypadx+31,kKeypadx+74,kKeypady+59,kKeypady+73,&DreamWebEngine::buttonEnter },
+		{ kKeypadx+72,kKeypadx+86,kKeypady+80,kKeypady+94,&DreamWebEngine::quitKey },
+		{ 0,320,0,200,&DreamWebEngine::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
 
@@ -167,51 +167,51 @@ void DreamBase::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3
 	workToScreenM();
 }
 
-void DreamBase::buttonOne() {
+void DreamWebEngine::buttonOne() {
 	buttonPress(1);
 }
 
-void DreamBase::buttonTwo() {
+void DreamWebEngine::buttonTwo() {
 	buttonPress(2);
 }
 
-void DreamBase::buttonThree() {
+void DreamWebEngine::buttonThree() {
 	buttonPress(3);
 }
 
-void DreamBase::buttonFour() {
+void DreamWebEngine::buttonFour() {
 	buttonPress(4);
 }
 
-void DreamBase::buttonFive() {
+void DreamWebEngine::buttonFive() {
 	buttonPress(5);
 }
 
-void DreamBase::buttonSix() {
+void DreamWebEngine::buttonSix() {
 	buttonPress(6);
 }
 
-void DreamBase::buttonSeven() {
+void DreamWebEngine::buttonSeven() {
 	buttonPress(7);
 }
 
-void DreamBase::buttonEight() {
+void DreamWebEngine::buttonEight() {
 	buttonPress(8);
 }
 
-void DreamBase::buttonNine() {
+void DreamWebEngine::buttonNine() {
 	buttonPress(9);
 }
 
-void DreamBase::buttonNought() {
+void DreamWebEngine::buttonNought() {
 	buttonPress(10);
 }
 
-void DreamBase::buttonEnter() {
+void DreamWebEngine::buttonEnter() {
 	buttonPress(11);
 }
 
-void DreamBase::buttonPress(uint8 buttonId) {
+void DreamWebEngine::buttonPress(uint8 buttonId) {
 	uint8 commandType = 100 + buttonId;
 	if (_commandType != commandType) {
 		_commandType = commandType;
@@ -226,28 +226,28 @@ void DreamBase::buttonPress(uint8 buttonId) {
 	}
 }
 
-void DreamBase::showOuterPad() {
+void DreamWebEngine::showOuterPad() {
 	showFrame(_tempGraphics, kKeypadx-3, kKeypady-4, 1, 0);
 	showFrame(_tempGraphics, kKeypadx+74, kKeypady+76, 37, 0);
 }
 
-void DreamBase::dumpKeypad() {
+void DreamWebEngine::dumpKeypad() {
 	multiDump(kKeypadx - 3, kKeypady - 4, 120, 90);
 }
 
-void DreamBase::dumpSymbol() {
+void DreamWebEngine::dumpSymbol() {
 	_newTextLine = 0;
 	multiDump(kSymbolx, kSymboly + 20, 104, 60);
 }
 
-void DreamBase::dumpSymBox() {
+void DreamWebEngine::dumpSymBox() {
 	if (_dumpX != 0xFFFF) {
 		multiDump(_dumpX, _dumpY, 30, 77);
 		_dumpX = 0xFFFF;
 	}
 }
 
-void DreamBase::quitSymbol() {
+void DreamWebEngine::quitSymbol() {
 	if (_symbolTopX != 24 || _symbolBotX != 24) {
 		blank();
 		return;
@@ -267,4 +267,4 @@ void DreamBase::quitSymbol() {
 	_getBack = 1;
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 0f6d42040d..2464326e7d 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -22,7 +22,7 @@
 
 #include "dreamweb/dreamweb.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
 struct MonitorKeyEntry {
 	uint8 keyAssigned;
@@ -38,7 +38,7 @@ static MonitorKeyEntry monitorKeyEntries[4] = {
 	{ 0, "BECKETT", "SEPTIMUS"    }
 };
 
-void DreamBase::useMon() {
+void DreamWebEngine::useMon() {
 	_vars._lastTrigger = 0;
 	_currentFile[0] = 34;
 	memset(_currentFile+1, ' ', 12);
@@ -104,7 +104,7 @@ void DreamBase::useMon() {
 	workToScreenM();
 }
 
-bool DreamBase::execCommand() {
+bool DreamWebEngine::execCommand() {
 	static const char *comlist[] = {
 		"EXIT",
 		"HELP",
@@ -170,7 +170,7 @@ bool DreamBase::execCommand() {
 
 
 
-void DreamBase::monitorLogo() {
+void DreamWebEngine::monitorLogo() {
 	if (_logoNum != _oldLogoNum) {
 		_oldLogoNum = _logoNum;
 		//fadeDownMon(); // FIXME: Commented out in ASM
@@ -187,12 +187,12 @@ void DreamBase::monitorLogo() {
 	}
 }
 
-void DreamBase::printLogo() {
+void DreamWebEngine::printLogo() {
 	showFrame(_tempGraphics, 56, 32, 0, 0);
 	showCurrentFile();
 }
 
-void DreamBase::input() {
+void DreamWebEngine::input() {
 	memset(_inputLine, 0, 64);
 	_curPos = 0;
 	printChar(_tempCharset, _monAdX, _monAdY, '>', 0, NULL, NULL);
@@ -235,14 +235,14 @@ void DreamBase::input() {
 	}
 }
 
-byte DreamBase::makeCaps(byte c) {
+byte DreamWebEngine::makeCaps(byte c) {
 	// TODO: Replace calls to this by toupper() ?
 	if (c >= 'a')
 		c -= 'a' - 'A'; // = 32
 	return c;
 }
 
-void DreamBase::delChar() {
+void DreamWebEngine::delChar() {
 	--_curPos;
 	_inputLine[_curPos * 2] = 0;
 	uint8 width = _inputLine[_curPos * 2 + 1];
@@ -254,7 +254,7 @@ void DreamBase::delChar() {
 	multiDump(_monAdX, _monAdY, 8, 8);
 }
 
-void DreamBase::printCurs() {
+void DreamWebEngine::printCurs() {
 	uint16 x = _cursLocX;
 	uint16 y = _cursLocY;
 	uint16 height;
@@ -270,7 +270,7 @@ void DreamBase::printCurs() {
 	multiDump(x - 6, y, 12, height);
 }
 
-void DreamBase::delCurs() {
+void DreamWebEngine::delCurs() {
 	uint16 x = _cursLocX;
 	uint16 y = _cursLocY;
 	uint16 width = 6;
@@ -284,38 +284,38 @@ void DreamBase::delCurs() {
 	multiDump(x, y, width, height);
 }
 
-void DreamBase::scrollMonitor() {
+void DreamWebEngine::scrollMonitor() {
 	printLogo();
 	printUnderMon();
 	workToScreen();
 	playChannel1(25);
 }
 
-void DreamBase::showCurrentFile() {
+void DreamWebEngine::showCurrentFile() {
 	uint16 x = 178; // TODO: Looks like this hardcoded constant in the asm doesn't match the frame
 	const char *currentFile = _currentFile + 1;
 	while (*currentFile) {
 		char c = *currentFile++;
-		c = engine->modifyChar(c);
+		c = modifyChar(c);
 		printChar(_tempCharset, &x, 37, c, 0, NULL, NULL);
 	}
 }
 
-void DreamBase::accessLightOn() {
+void DreamWebEngine::accessLightOn() {
 	showFrame(_tempGraphics, 74, 182, 8, 0);
 	multiDump(74, 182, 12, 8);
 }
 
-void DreamBase::accessLightOff() {
+void DreamWebEngine::accessLightOff() {
 	showFrame(_tempGraphics, 74, 182, 7, 0);
 	multiDump(74, 182, 12, 8);
 }
 
-void DreamBase::randomAccess(uint16 count) {
+void DreamWebEngine::randomAccess(uint16 count) {
 	for (uint16 i = 0; i < count; ++i) {
 		vSync();
 		vSync();
-		uint16 v = engine->randomNumber() & 15;
+		uint16 v = randomNumber() & 15;
 		if (v < 10)
 			accessLightOff();
 		else
@@ -324,7 +324,7 @@ void DreamBase::randomAccess(uint16 count) {
 	accessLightOff();
 }
 
-void DreamBase::monMessage(uint8 index) {
+void DreamWebEngine::monMessage(uint8 index) {
 	assert(index > 0);
 	const char *string = _textFile1._text;
 	for (uint8 i = 0; i < index; ++i) {
@@ -334,32 +334,32 @@ void DreamBase::monMessage(uint8 index) {
 	monPrint(string);
 }
 
-void DreamBase::netError() {
+void DreamWebEngine::netError() {
 	monMessage(5);
 	scrollMonitor();
 }
 
-void DreamBase::powerLightOn() {
+void DreamWebEngine::powerLightOn() {
 	showFrame(_tempGraphics, 257+4, 182, 6, 0);
 	multiDump(257+4, 182, 12, 8);
 }
 
-void DreamBase::powerLightOff() {
+void DreamWebEngine::powerLightOff() {
 	showFrame(_tempGraphics, 257+4, 182, 5, 0);
 	multiDump(257+4, 182, 12, 8);
 }
 
-void DreamBase::lockLightOn() {
+void DreamWebEngine::lockLightOn() {
 	showFrame(_tempGraphics, 56, 182, 10, 0);
 	multiDump(58, 182, 12, 8);
 }
 
-void DreamBase::lockLightOff() {
+void DreamWebEngine::lockLightOff() {
 	showFrame(_tempGraphics, 56, 182, 9, 0);
 	multiDump(58, 182, 12, 8);
 }
 
-void DreamBase::turnOnPower() {
+void DreamWebEngine::turnOnPower() {
 	for (size_t i = 0; i < 3; ++i) {
 		powerLightOn();
 		hangOn(30);
@@ -369,21 +369,21 @@ void DreamBase::turnOnPower() {
 	powerLightOn();
 }
 
-void DreamBase::printOuterMon() {
+void DreamWebEngine::printOuterMon() {
 	showFrame(_tempGraphics, 40, 32, 1, 0);
 	showFrame(_tempGraphics, 264, 32, 2, 0);
 	showFrame(_tempGraphics, 40, 12, 3, 0);
 	showFrame(_tempGraphics, 40, 164, 4, 0);
 }
 
-void DreamBase::loadPersonal() {
+void DreamWebEngine::loadPersonal() {
 	if (_vars._location == 0 || _vars._location == 42)
 		loadTextFile(_textFile1, "DREAMWEB.T01"); // monitor file 1
 	else
 		loadTextFile(_textFile1, "DREAMWEB.T02"); // monitor file 2
 }
 
-void DreamBase::loadNews() {
+void DreamWebEngine::loadNews() {
 	// textfile2 holds information accessible by anyone
 	if (_vars._newsItem == 0)
 		loadTextFile(_textFile2, "DREAMWEB.T10"); // monitor file 10
@@ -395,7 +395,7 @@ void DreamBase::loadNews() {
 		loadTextFile(_textFile2, "DREAMWEB.T13"); // monitor file 13
 }
 
-void DreamBase::loadCart() {
+void DreamWebEngine::loadCart() {
 	byte cartridgeId = 0;
 	uint16 objectIndex = findSetObject("INTF");
 	uint16 cartridgeIndex = checkInside(objectIndex, 1);
@@ -414,7 +414,7 @@ void DreamBase::loadCart() {
 		loadTextFile(_textFile3, "DREAMWEB.T24"); // monitor file 24
 }
 
-void DreamBase::showKeys() {
+void DreamWebEngine::showKeys() {
 	randomAccess(10);
 	scrollMonitor();
 	monMessage(18);
@@ -427,7 +427,7 @@ void DreamBase::showKeys() {
 	scrollMonitor();
 }
 
-const char *DreamBase::getKeyAndLogo(const char *foundString) {
+const char *DreamWebEngine::getKeyAndLogo(const char *foundString) {
 	byte newLogo = foundString[1] - 48;
 	byte keyNum = foundString[3] - 48;
 
@@ -443,7 +443,7 @@ const char *DreamBase::getKeyAndLogo(const char *foundString) {
 	}
 }
 
-const char *DreamBase::searchForString(const char *topic, const char *text) {
+const char *DreamWebEngine::searchForString(const char *topic, const char *text) {
 	char delim = *topic;
 
 	while (true) {
@@ -467,7 +467,7 @@ const char *DreamBase::searchForString(const char *topic, const char *text) {
 	}
 }
 
-void DreamBase::dirCom() {
+void DreamWebEngine::dirCom() {
 	randomAccess(30);
 
 	const char *dirname = parser();
@@ -487,7 +487,7 @@ void DreamBase::dirCom() {
 	scrollMonitor();
 }
 
-void DreamBase::dirFile(const char *dirName) {
+void DreamWebEngine::dirFile(const char *dirName) {
 	char topic[14];
 
 	memcpy(topic, dirName, 14);
@@ -532,7 +532,7 @@ void DreamBase::dirFile(const char *dirName) {
 	}
 }
 
-void DreamBase::read() {
+void DreamWebEngine::read() {
 	randomAccess(40);
 	const char *name = parser();
 	if (name[1] == 0) {
@@ -588,7 +588,7 @@ void DreamBase::read() {
 	}
 }
 
-void DreamBase::signOn() {
+void DreamWebEngine::signOn() {
 	const char *name = parser();
 
 	int8 foundIndex = -1;
@@ -646,7 +646,7 @@ void DreamBase::signOn() {
 	}
 }
 
-void DreamBase::searchForFiles(const char *filesString) {
+void DreamWebEngine::searchForFiles(const char *filesString) {
 	byte curChar;
 
 	while (true) {
@@ -659,7 +659,7 @@ void DreamBase::searchForFiles(const char *filesString) {
 	}
 }
 
-const char *DreamBase::parser() {
+const char *DreamWebEngine::parser() {
 	char *output = _operand1;
 
 	memset(output, 0, 14);
@@ -697,4 +697,4 @@ const char *DreamBase::parser() {
 	return _operand1;
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index a460d2879e..6e8abca6ac 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -22,9 +22,9 @@
 
 #include "dreamweb/dreamweb.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
-void DreamBase::newPlace() {
+void DreamWebEngine::newPlace() {
 	if (_vars._needToTravel == 1) {
 		_vars._needToTravel = 0;
 		selectLocation();
@@ -34,7 +34,7 @@ void DreamBase::newPlace() {
 	}
 }
 
-void DreamBase::selectLocation() {
+void DreamWebEngine::selectLocation() {
 	_inMapArea = 0;
 	clearBeforeLoad();
 	_getBack = 0;
@@ -72,13 +72,13 @@ void DreamBase::selectLocation() {
 		if (_getBack == 1)
 			break;
 
-		RectWithCallback<DreamBase> destList[] = {
-			{ 238,258,4,44,&DreamBase::nextDest },
-			{ 104,124,4,44,&DreamBase::lastDest },
-			{ 280,308,4,44,&DreamBase::lookAtPlace },
-			{ 104,216,138,192,&DreamBase::destSelect },
-			{ 273,320,157,198,&DreamBase::getBack1 },
-			{ 0,320,0,200,&DreamBase::blank },
+		RectWithCallback<DreamWebEngine> destList[] = {
+			{ 238,258,4,44,&DreamWebEngine::nextDest },
+			{ 104,124,4,44,&DreamWebEngine::lastDest },
+			{ 280,308,4,44,&DreamWebEngine::lookAtPlace },
+			{ 104,216,138,192,&DreamWebEngine::destSelect },
+			{ 273,320,157,198,&DreamWebEngine::getBack1 },
+			{ 0,320,0,200,&DreamWebEngine::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(destList);
@@ -96,13 +96,13 @@ void DreamBase::selectLocation() {
 	_travelText.clear();
 }
 
-void DreamBase::showCity() {
+void DreamWebEngine::showCity() {
 	clearWork();
 	showFrame(_tempGraphics, 57, 32, 0, 0);
 	showFrame(_tempGraphics, 120+57, 32, 1, 0);
 }
 
-void DreamBase::lookAtPlace() {
+void DreamWebEngine::lookAtPlace() {
 	if (_commandType != 224) {
 		_commandType = 224;
 		commandOnly(27);
@@ -133,15 +133,15 @@ void DreamBase::lookAtPlace() {
 	workToScreenM();
 }
 
-void DreamBase::getUnderCentre() {
+void DreamWebEngine::getUnderCentre() {
 	multiGet(_mapStore, 58, 72, 254, 110);
 }
 
-void DreamBase::putUnderCentre() {
+void DreamWebEngine::putUnderCentre() {
 	multiPut(_mapStore, 58, 72, 254, 110);
 }
 
-void DreamBase::locationPic() {
+void DreamWebEngine::locationPic() {
 	const int roomPics[] = { 5, 0, 3, 2, 4, 1, 10, 9, 8, 6, 11, 4, 7, 7, 0 };
 	byte picture = roomPics[_destPos];
 
@@ -154,16 +154,16 @@ void DreamBase::locationPic() {
 		showFrame(_tempGraphics, 104, 140 + 14, 3, 0);	// Currently in this location
 
 	const uint8 *string = (const uint8 *)_travelText.getString(_destPos);
-	DreamBase::printDirect(string, 50, 20, 241, 241 & 1);
+	DreamWebEngine::printDirect(string, 50, 20, 241, 241 & 1);
 }
 
-void DreamBase::showArrows() {
+void DreamWebEngine::showArrows() {
 	showFrame(_tempGraphics, 116 - 12, 16, 0, 0);
 	showFrame(_tempGraphics, 226 + 12, 16, 1, 0);
 	showFrame(_tempGraphics, 280, 14, 2, 0);
 }
 
-void DreamBase::nextDest() {
+void DreamWebEngine::nextDest() {
 	if (_commandType != 218) {
 		_commandType = 218;
 		commandOnly(28);
@@ -192,7 +192,7 @@ void DreamBase::nextDest() {
 	delPointer();
 }
 
-void DreamBase::lastDest() {
+void DreamWebEngine::lastDest() {
 	if (_commandType != 219) {
 		_commandType = 219;
 		commandOnly(29);
@@ -221,7 +221,7 @@ void DreamBase::lastDest() {
 	delPointer();
 }
 
-void DreamBase::destSelect() {
+void DreamWebEngine::destSelect() {
 	if (_commandType != 222) {
 		_commandType = 222;
 		commandOnly(30);
@@ -233,19 +233,19 @@ void DreamBase::destSelect() {
 	_newLocation = _destPos;
 }
 
-uint8 DreamBase::getLocation(uint8 index) {
+uint8 DreamWebEngine::getLocation(uint8 index) {
 	return _roomsCanGo[index];
 }
 
-void DreamBase::setLocation(uint8 index) {
+void DreamWebEngine::setLocation(uint8 index) {
 	_roomsCanGo[index] = 1;
 }
 
-void DreamBase::clearLocation(uint8 index) {
+void DreamWebEngine::clearLocation(uint8 index) {
 	_roomsCanGo[index] = 0;
 }
 
-void DreamBase::resetLocation(uint8 index) {
+void DreamWebEngine::resetLocation(uint8 index) {
 	if (index == 5) {
 		// delete hotel
 		purgeALocation(5);
@@ -270,14 +270,14 @@ void DreamBase::resetLocation(uint8 index) {
 	clearLocation(index);
 }
 
-void DreamBase::readDestIcon() {
+void DreamWebEngine::readDestIcon() {
 	loadIntoTemp("DREAMWEB.G05");
 	loadIntoTemp2("DREAMWEB.G06");
 	loadIntoTemp3("DREAMWEB.G08");
 }
 
-void DreamBase::readCityPic() {
+void DreamWebEngine::readCityPic() {
 	loadIntoTemp("DREAMWEB.G04");
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 555125e9e7..a9cbadcc2c 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -22,14 +22,14 @@
 
 #include "dreamweb/dreamweb.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
-void DreamBase::showRyanPage() {
+void DreamWebEngine::showRyanPage() {
 	showFrame(_icons1, kInventx + 167, kInventy - 12, 12, 0);
 	showFrame(_icons1, kInventx + 167 + 18 * _vars._ryanPage, kInventy - 12, 13 + _vars._ryanPage, 0);
 }
 
-void DreamBase::findAllRyan() {
+void DreamWebEngine::findAllRyan() {
 	memset(_ryanInvList, 0xff, 60);
 	for (size_t i = 0; i < kNumexobjects; ++i) {
 		const DynObject *extra = getExAd(i);
@@ -44,7 +44,7 @@ void DreamBase::findAllRyan() {
 	}
 }
 
-void DreamBase::fillRyan() {
+void DreamWebEngine::fillRyan() {
 	ObjectRef *inv = &_ryanInvList[_vars._ryanPage * 10];
 	findAllRyan();
 	for (size_t i = 0; i < 2; ++i) {
@@ -56,11 +56,11 @@ void DreamBase::fillRyan() {
 	showRyanPage();
 }
 
-bool DreamBase::isItWorn(const DynObject *object) {
+bool DreamWebEngine::isItWorn(const DynObject *object) {
 	return (object->id[0] == 'W'-'A') && (object->id[1] == 'E'-'A');
 }
 
-void DreamBase::wornError() {
+void DreamWebEngine::wornError() {
 	_commandType = 255;
 	delPointer();
 	printMessage(76, 21, 57, 240, false);
@@ -73,12 +73,12 @@ void DreamBase::wornError() {
 	workToScreenM();
 }
 
-void DreamBase::makeWorn(DynObject *object) {
+void DreamWebEngine::makeWorn(DynObject *object) {
 	object->id[0] = 'W'-'A';
 	object->id[1] = 'E'-'A';
 }
 
-void DreamBase::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
+void DreamWebEngine::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 	showFrame(_icons1, x - 2, y - 1, 10, 0);
 	if (index == 0xff)
 		return;
@@ -94,7 +94,7 @@ void DreamBase::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 		showFrame(_icons1, x - 3, y - 2, 7, 0);
 }
 
-void DreamBase::obPicture() {
+void DreamWebEngine::obPicture() {
 	if (_objectType == kSetObjectType1)
 		return;
 	uint8 frame = 3 * _command + 1;
@@ -104,7 +104,7 @@ void DreamBase::obPicture() {
 		showFrame(_freeFrames, 160, 68, frame, 0x80);
 }
 
-void DreamBase::obIcons() {
+void DreamWebEngine::obIcons() {
 	uint8 value1, value2;
 	getAnyAd(&value1, &value2);
 	if (value1 != 0xff) {
@@ -115,7 +115,7 @@ void DreamBase::obIcons() {
 	showFrame(_icons2, 260, 1, 1, 0);
 }
 
-void DreamBase::examineOb(bool examineAgain) {
+void DreamWebEngine::examineOb(bool examineAgain) {
 	_pointerMode = 0;
 	_timeCount = 0;
 
@@ -155,13 +155,13 @@ void DreamBase::examineOb(bool examineAgain) {
 
 		switch (_invOpen) {
 		case 0: {
-			RectWithCallback<DreamBase> examList[] = {
-				{ 273,320,157,198,&DreamBase::getBackFromOb },
-				{ 260,300,0,44,&DreamBase::useObject },
-				{ 210,254,0,44,&DreamBase::selectOpenOb },
-				{ 144,176,64,96,&DreamBase::setPickup },
-				{ 0,50,50,200,&DreamBase::examineInventory },
-				{ 0,320,0,200,&DreamBase::blank },
+			RectWithCallback<DreamWebEngine> examList[] = {
+				{ 273,320,157,198,&DreamWebEngine::getBackFromOb },
+				{ 260,300,0,44,&DreamWebEngine::useObject },
+				{ 210,254,0,44,&DreamWebEngine::selectOpenOb },
+				{ 144,176,64,96,&DreamWebEngine::setPickup },
+				{ 0,50,50,200,&DreamWebEngine::examineInventory },
+				{ 0,320,0,200,&DreamWebEngine::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
 			checkCoords(examList);
@@ -169,24 +169,24 @@ void DreamBase::examineOb(bool examineAgain) {
 		}
 		case 1: {
 			// Note: This table contains the non-constant _openChangeSize!
-			RectWithCallback<DreamBase> invList1[] = {
-				{ 273,320,157,198,&DreamBase::getBackFromOb },
-				{ 255,294,0,24,&DreamBase::dropObject },
-				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamBase::incRyanPage },
-				{ kInventx,_openChangeSize,kInventy+100,kInventy+100+kItempicsize,&DreamBase::useOpened },
-				{ kInventx,kInventx+(5*kItempicsize),kInventy,kInventy+(2*kItempicsize),&DreamBase::inToInv },
-				{ 0,320,0,200,&DreamBase::blank },
+			RectWithCallback<DreamWebEngine> invList1[] = {
+				{ 273,320,157,198,&DreamWebEngine::getBackFromOb },
+				{ 255,294,0,24,&DreamWebEngine::dropObject },
+				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamWebEngine::incRyanPage },
+				{ kInventx,_openChangeSize,kInventy+100,kInventy+100+kItempicsize,&DreamWebEngine::useOpened },
+				{ kInventx,kInventx+(5*kItempicsize),kInventy,kInventy+(2*kItempicsize),&DreamWebEngine::inToInv },
+				{ 0,320,0,200,&DreamWebEngine::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
 			checkCoords(invList1);
 			break;
 		}
 		default: {
-			RectWithCallback<DreamBase> withList1[] = {
-				{ 273,320,157,198,&DreamBase::getBackFromOb },
-				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamBase::incRyanPage },
-				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamBase::selectOb },
-				{ 0,320,0,200,&DreamBase::blank },
+			RectWithCallback<DreamWebEngine> withList1[] = {
+				{ 273,320,157,198,&DreamWebEngine::getBackFromOb },
+				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamWebEngine::incRyanPage },
+				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamWebEngine::selectOb },
+				{ 0,320,0,200,&DreamWebEngine::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
 			checkCoords(withList1);
@@ -212,7 +212,7 @@ void DreamBase::examineOb(bool examineAgain) {
 	_openedOb = 255;
 }
 
-void DreamBase::inventory() {
+void DreamWebEngine::inventory() {
 	if (_vars._manDead == 1 || _vars._watchingTime != 0) {
 		blank();
 		return;
@@ -250,7 +250,7 @@ void DreamBase::inventory() {
 	examineOb(false);
 }
 
-void DreamBase::transferText(uint8 from, uint8 to) {
+void DreamWebEngine::transferText(uint8 from, uint8 to) {
 	_exText.setOffset(to, _vars._exTextPos);
 	const char *src = _freeDesc.getString(from);
 	char *dst = _exText._text + _vars._exTextPos;
@@ -260,14 +260,14 @@ void DreamBase::transferText(uint8 from, uint8 to) {
 	_vars._exTextPos += len + 1;
 }
 
-void DreamBase::getBackFromOb() {
+void DreamWebEngine::getBackFromOb() {
 	if (_pickUp != 1)
 		getBack1();
 	else
 		blank();
 }
 
-byte DreamBase::getOpenedSlotCount() {
+byte DreamWebEngine::getOpenedSlotCount() {
 	byte obj = _openedOb;
 	switch (_openedType) {
 	case 4:
@@ -279,7 +279,7 @@ byte DreamBase::getOpenedSlotCount() {
 	}
 }
 
-byte DreamBase::getOpenedSlotSize() {
+byte DreamWebEngine::getOpenedSlotSize() {
 	byte obj = _openedOb;
 	switch (_openedType) {
 	case 4:
@@ -291,7 +291,7 @@ byte DreamBase::getOpenedSlotSize() {
 	}
 }
 
-void DreamBase::openOb() {
+void DreamWebEngine::openOb() {
 	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
 
 	copyName(_openedType, _openedOb, commandLine);
@@ -304,7 +304,7 @@ void DreamBase::openOb() {
 	_openChangeSize = getOpenedSlotCount() * kItempicsize + kInventx;
 }
 
-void DreamBase::identifyOb() {
+void DreamWebEngine::identifyOb() {
 	if (_vars._watchingTime != 0) {
 		blank();
 		return;
@@ -341,7 +341,7 @@ void DreamBase::identifyOb() {
 		blank();
 }
 
-ObjectRef DreamBase::findInvPos() {
+ObjectRef DreamWebEngine::findInvPos() {
 	uint16 x = _mouseX - kInventx;
 	uint16 y = _mouseY - kInventy;
 	uint8 pos = (x / kItempicsize) + (y / kItempicsize) * 5;
@@ -350,7 +350,7 @@ ObjectRef DreamBase::findInvPos() {
 	return _ryanInvList[invPos];
 }
 
-void DreamBase::selectOb() {
+void DreamWebEngine::selectOb() {
 	ObjectRef objectId = findInvPos();
 	if (objectId._index == 255) {
 		blank();
@@ -375,7 +375,7 @@ void DreamBase::selectOb() {
 	useRoutine();
 }
 
-void DreamBase::setPickup() {
+void DreamWebEngine::setPickup() {
 	if (_objectType != kSetObjectType1 && _objectType != kSetObjectType3) {
 		// Object types 1 and 3 are excluded, so the resulting object is a DynObject
 		uint8 dummy;
@@ -422,7 +422,7 @@ void DreamBase::setPickup() {
 	workToScreenM();
 }
 
-void DreamBase::deleteExFrame(uint8 frameNum) {
+void DreamWebEngine::deleteExFrame(uint8 frameNum) {
 	Frame *frame = &_exFrames._frames[frameNum];
 
 	uint16 frameSize = frame->width * frame->height;
@@ -445,7 +445,7 @@ void DreamBase::deleteExFrame(uint8 frameNum) {
 	}
 }
 
-void DreamBase::deleteExText(uint8 textNum) {
+void DreamWebEngine::deleteExText(uint8 textNum) {
 	uint16 offset = _exText.getOffset(textNum);
 
 	uint16 startOff = offset;
@@ -467,7 +467,7 @@ void DreamBase::deleteExText(uint8 textNum) {
 	}
 }
 
-void DreamBase::deleteExObject(uint8 index) {
+void DreamWebEngine::deleteExObject(uint8 index) {
 	DynObject *obj = getExAd(index);
 
 	memset(obj, 0xFF, sizeof(DynObject));
@@ -485,7 +485,7 @@ void DreamBase::deleteExObject(uint8 index) {
 	}
 }
 
-void DreamBase::removeObFromInv() {
+void DreamWebEngine::removeObFromInv() {
 	if (_command == 100)
 		return; // object doesn't exist
 
@@ -494,7 +494,7 @@ void DreamBase::removeObFromInv() {
 	deleteExObject(_command);
 }
 
-void DreamBase::inToInv() {
+void DreamWebEngine::inToInv() {
 	if (!_pickUp) {
 		outOfInv();
 		return;
@@ -534,7 +534,7 @@ void DreamBase::inToInv() {
 	delPointer();
 }
 
-void DreamBase::outOfInv() {
+void DreamWebEngine::outOfInv() {
 	ObjectRef subject = findInvPos();
 
 	if (subject._index == 255) {
@@ -574,7 +574,7 @@ void DreamBase::outOfInv() {
 	delPointer();
 }
 
-void DreamBase::purgeALocation(uint8 index) {
+void DreamWebEngine::purgeALocation(uint8 index) {
 	// index == al
 	for (uint8 i = 0; i < kNumexobjects; ++i) {
 		DynObject *t = getExAd(i);
@@ -584,7 +584,7 @@ void DreamBase::purgeALocation(uint8 index) {
 	}
 }
 
-const uint8 *DreamBase::getObTextStart() {
+const uint8 *DreamWebEngine::getObTextStart() {
 	const uint16 kSettext = 130*2;
 	const uint16 kFreetext = 82*2;
 
@@ -656,7 +656,7 @@ const uint8 *DreamBase::getObTextStart() {
 	}
 }
 
-void DreamBase::dropObject() {
+void DreamWebEngine::dropObject() {
 	if (_commandType != 223) {
 		_commandType = 223;
 		if (!_pickUp) {
@@ -709,7 +709,7 @@ void DreamBase::dropObject() {
 	object->currentLocation = _realLocation;
 }
 
-bool DreamBase::checkObjectSize() {
+bool DreamWebEngine::checkObjectSize() {
 	byte containerSize = getOpenedSlotSize();
 	DynObject *object = getEitherAdCPP();
 	// If there is no size defined for the object in the editor, set its size
@@ -738,7 +738,7 @@ bool DreamBase::checkObjectSize() {
 	return false;
 }
 
-void DreamBase::selectOpenOb() {
+void DreamWebEngine::selectOpenOb() {
 	uint8 slotSize, slotCount;
 	getAnyAd(&slotSize, &slotCount);
 	if (slotCount == 255) {
@@ -771,7 +771,7 @@ void DreamBase::selectOpenOb() {
 	delPointer();
 }
 
-void DreamBase::reExFromInv() {
+void DreamWebEngine::reExFromInv() {
 	ObjectRef objectId = findInvPos();
 	_commandType = objectId._type;
 	_command     = objectId._index;
@@ -779,7 +779,7 @@ void DreamBase::reExFromInv() {
 	_pointerMode = 0;
 }
 
-void DreamBase::swapWithInv() {
+void DreamWebEngine::swapWithInv() {
 	ObjectRef subject;
 	subject._type = _objectType;
 	subject._index = _itemFrame;
@@ -819,7 +819,7 @@ void DreamBase::swapWithInv() {
 	delPointer();
 }
 
-void DreamBase::useOpened() {
+void DreamWebEngine::useOpened() {
 	if (_openedOb == 255)
 		return;	// cannot use opened object
 
@@ -883,7 +883,7 @@ void DreamBase::useOpened() {
 	delPointer();
 }
 
-void DreamBase::outOfOpen() {
+void DreamWebEngine::outOfOpen() {
 	if (_openedOb == 255)
 		return;	// cannot use opened object
 
@@ -935,7 +935,7 @@ void DreamBase::outOfOpen() {
 	delPointer();
 }
 
-void DreamBase::swapWithOpen() {
+void DreamWebEngine::swapWithOpen() {
 	ObjectRef subject;
 	subject._type = _objectType;
 	subject._index = _itemFrame;
@@ -1002,14 +1002,14 @@ void DreamBase::swapWithOpen() {
 	delPointer();
 }
 
-ObjectRef DreamBase::findOpenPos() {
+ObjectRef DreamWebEngine::findOpenPos() {
 	uint8 pos = (_mouseX - kInventx) / kItempicsize;
 	_lastInvPos = pos;
 
 	return _openInvList[pos];
 }
 
-byte DreamBase::transferToEx(uint8 from) {
+byte DreamWebEngine::transferToEx(uint8 from) {
 	emergencyPurge();
 
 	byte pos = getExPos();
@@ -1037,7 +1037,7 @@ byte DreamBase::transferToEx(uint8 from) {
 	return pos;
 }
 
-void DreamBase::fillOpen() {
+void DreamWebEngine::fillOpen() {
 	delTextLine();
 	uint8 size = getOpenedSlotCount();
 	if (size > 4)
@@ -1051,7 +1051,7 @@ void DreamBase::fillOpen() {
 	underTextLine();
 }
 
-void DreamBase::findAllOpen() {
+void DreamWebEngine::findAllOpen() {
 	memset(_openInvList, 0xFF, 32);
 
 	for (uint8 i = 0; i < kNumexobjects; ++i) {
@@ -1080,7 +1080,7 @@ void DreamBase::findAllOpen() {
 	}
 }
 
-void DreamBase::pickupConts(uint8 from, uint8 containerEx) {
+void DreamWebEngine::pickupConts(uint8 from, uint8 containerEx) {
 	const DynObject *obj = getFreeAd(from);
 
 	if (obj->slotCount == 255)
@@ -1112,4 +1112,4 @@ void DreamBase::pickupConts(uint8 from, uint8 containerEx) {
 	}
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index 908ac001bb..c39070532c 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -22,9 +22,9 @@
 
 #include "dreamweb/dreamweb.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
-void DreamBase::turnPathOn(uint8 param) {
+void DreamWebEngine::turnPathOn(uint8 param) {
 	findOrMake(param, 0xff, _roomNum + 100);
 	PathNode *roomsPaths = getRoomsPaths()->nodes;
 	if (param == 0xff)
@@ -32,7 +32,7 @@ void DreamBase::turnPathOn(uint8 param) {
 	roomsPaths[param].on = 0xff;
 }
 
-void DreamBase::turnPathOff(uint8 param) {
+void DreamWebEngine::turnPathOff(uint8 param) {
 	findOrMake(param, 0x00, _roomNum + 100);
 	PathNode *roomsPaths = getRoomsPaths()->nodes;
 	if (param == 0xff)
@@ -40,28 +40,28 @@ void DreamBase::turnPathOff(uint8 param) {
 	roomsPaths[param].on = 0x00;
 }
 
-void DreamBase::turnAnyPathOn(uint8 param, uint8 room) {
+void DreamWebEngine::turnAnyPathOn(uint8 param, uint8 room) {
 	findOrMake(param, 0xff, room + 100);
 	_pathData[room].nodes[param].on = 0xff;
 }
 
-void DreamBase::turnAnyPathOff(uint8 param, uint8 room) {
+void DreamWebEngine::turnAnyPathOff(uint8 param, uint8 room) {
 	findOrMake(param, 0x00, room + 100);
 	_pathData[room].nodes[param].on = 0x00;
 }
 
-RoomPaths *DreamBase::getRoomsPaths() {
+RoomPaths *DreamWebEngine::getRoomsPaths() {
 	return &_pathData[_roomNum];
 }
 
-void DreamBase::faceRightWay() {
+void DreamWebEngine::faceRightWay() {
 	PathNode *paths = getRoomsPaths()->nodes;
 	uint8 dir = paths[_mansPath].dir;
 	_turnToFace = dir;
 	_leaveDirection = dir;
 }
 
-void DreamBase::setWalk() {
+void DreamWebEngine::setWalk() {
 	if (_linePointer != 254) {
 		// Already walking
 		_finalDest = _pointersPath;
@@ -88,7 +88,7 @@ void DreamBase::setWalk() {
 	}
 }
 
-void DreamBase::autoSetWalk() {
+void DreamWebEngine::autoSetWalk() {
 	if (_finalDest == _mansPath)
 		return;
 	const RoomPaths *roomsPaths = getRoomsPaths();
@@ -106,7 +106,7 @@ void DreamBase::autoSetWalk() {
 	_linePointer = 0;
 }
 
-void DreamBase::checkDest(const RoomPaths *roomsPaths) {
+void DreamWebEngine::checkDest(const RoomPaths *roomsPaths) {
 	const PathSegment *segments = roomsPaths->segments;
 	const uint8 tmp = _mansPath << 4;
 	uint8 destination = _destination;
@@ -125,19 +125,19 @@ void DreamBase::checkDest(const RoomPaths *roomsPaths) {
 	_destination = destination;
 }
 
-void DreamBase::findXYFromPath() {
+void DreamWebEngine::findXYFromPath() {
 	const PathNode *roomsPaths = getRoomsPaths()->nodes;
 	_ryanX = roomsPaths[_mansPath].x - 12;
 	_ryanY = roomsPaths[_mansPath].y - 12;
 }
 
-bool DreamBase::checkIfPathIsOn(uint8 index) {
+bool DreamWebEngine::checkIfPathIsOn(uint8 index) {
 	RoomPaths *roomsPaths = getRoomsPaths();
 	uint8 pathOn = roomsPaths->nodes[index].on;
 	return pathOn == 0xff;
 }
 
-void DreamBase::bresenhams() {
+void DreamWebEngine::bresenhams() {
 	workoutFrames();
 	Common::Point *lineData = &_lineData[0];
 	int16 startX = (int16)_lineStartX;
@@ -255,7 +255,7 @@ void DreamBase::bresenhams() {
 	}
 }
 
-void DreamBase::workoutFrames() {
+void DreamWebEngine::workoutFrames() {
 	byte tmp;
 	int diffx, diffy;
 
@@ -306,7 +306,7 @@ void DreamBase::workoutFrames() {
 	_turnDirection = 0;
 }
 
-byte DreamBase::findFirstPath(byte x, byte y) {
+byte DreamWebEngine::findFirstPath(byte x, byte y) {
 	PathNode *paths = _pathData[_roomNum].nodes;
 
 	for (uint8 index = 0; index < 12; index++) {
@@ -325,7 +325,7 @@ byte DreamBase::findFirstPath(byte x, byte y) {
 	return 0;
 }
 
-byte DreamBase::findPathOfPoint(byte x, byte y) {
+byte DreamWebEngine::findPathOfPoint(byte x, byte y) {
 	PathNode *paths = _pathData[_roomNum].nodes;
 
 	for (uint8 index = 0; index < 12; index++) {
@@ -347,4 +347,4 @@ byte DreamBase::findPathOfPoint(byte x, byte y) {
 	return 0xff;
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index cecb6ee9dd..40084a28c4 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -22,38 +22,38 @@
 
 #include "dreamweb/dreamweb.h"
 
-namespace DreamGen {
-
-static void (DreamBase::*reelCallbacks[57])(ReelRoutine &) = {
-	&DreamBase::gamer, &DreamBase::sparkyDrip,
-	&DreamBase::eden, &DreamBase::edenInBath,
-	&DreamBase::sparky, &DreamBase::smokeBloke,
-	&DreamBase::manAsleep, &DreamBase::drunk,
-	&DreamBase::receptionist, &DreamBase::genericPerson /*maleFan*/,
-	&DreamBase::genericPerson /*femaleFan*/, &DreamBase::louis,
-	&DreamBase::louisChair, &DreamBase::soldier1,
-	&DreamBase::bossMan, &DreamBase::interviewer,
-	&DreamBase::heavy, &DreamBase::manAsleep /*manAsleep2*/,
-	&DreamBase::genericPerson /*manSatStill*/, &DreamBase::drinker,
-	&DreamBase::bartender, &DreamBase::genericPerson /*otherSmoker*/,
-	&DreamBase::genericPerson /*tattooMan*/, &DreamBase::attendant,
-	&DreamBase::keeper, &DreamBase::candles1,
-	&DreamBase::smallCandle, &DreamBase::security,
-	&DreamBase::copper, &DreamBase::poolGuard,
-	&DreamBase::rockstar, &DreamBase::businessMan,
-	&DreamBase::train, &DreamBase::genericPerson /*aide*/,
-	&DreamBase::mugger, &DreamBase::helicopter,
-	&DreamBase::introMagic1, &DreamBase::introMusic,
-	&DreamBase::introMagic2, &DreamBase::candles2,
-	&DreamBase::gates, &DreamBase::introMagic3,
-	&DreamBase::introMonks1, &DreamBase::candles,
-	&DreamBase::introMonks2, &DreamBase::handClap,
-	&DreamBase::monkAndRyan, &DreamBase::endGameSeq,
-	&DreamBase::priest, &DreamBase::madman,
-	&DreamBase::madmansTelly, &DreamBase::alleyBarkSound,
-	&DreamBase::foghornSound, &DreamBase::carParkDrip,
-	&DreamBase::carParkDrip, &DreamBase::carParkDrip,
-	&DreamBase::carParkDrip
+namespace DreamWeb {
+
+static void (DreamWebEngine::*reelCallbacks[57])(ReelRoutine &) = {
+	&DreamWebEngine::gamer, &DreamWebEngine::sparkyDrip,
+	&DreamWebEngine::eden, &DreamWebEngine::edenInBath,
+	&DreamWebEngine::sparky, &DreamWebEngine::smokeBloke,
+	&DreamWebEngine::manAsleep, &DreamWebEngine::drunk,
+	&DreamWebEngine::receptionist, &DreamWebEngine::genericPerson /*maleFan*/,
+	&DreamWebEngine::genericPerson /*femaleFan*/, &DreamWebEngine::louis,
+	&DreamWebEngine::louisChair, &DreamWebEngine::soldier1,
+	&DreamWebEngine::bossMan, &DreamWebEngine::interviewer,
+	&DreamWebEngine::heavy, &DreamWebEngine::manAsleep /*manAsleep2*/,
+	&DreamWebEngine::genericPerson /*manSatStill*/, &DreamWebEngine::drinker,
+	&DreamWebEngine::bartender, &DreamWebEngine::genericPerson /*otherSmoker*/,
+	&DreamWebEngine::genericPerson /*tattooMan*/, &DreamWebEngine::attendant,
+	&DreamWebEngine::keeper, &DreamWebEngine::candles1,
+	&DreamWebEngine::smallCandle, &DreamWebEngine::security,
+	&DreamWebEngine::copper, &DreamWebEngine::poolGuard,
+	&DreamWebEngine::rockstar, &DreamWebEngine::businessMan,
+	&DreamWebEngine::train, &DreamWebEngine::genericPerson /*aide*/,
+	&DreamWebEngine::mugger, &DreamWebEngine::helicopter,
+	&DreamWebEngine::introMagic1, &DreamWebEngine::introMusic,
+	&DreamWebEngine::introMagic2, &DreamWebEngine::candles2,
+	&DreamWebEngine::gates, &DreamWebEngine::introMagic3,
+	&DreamWebEngine::introMonks1, &DreamWebEngine::candles,
+	&DreamWebEngine::introMonks2, &DreamWebEngine::handClap,
+	&DreamWebEngine::monkAndRyan, &DreamWebEngine::endGameSeq,
+	&DreamWebEngine::priest, &DreamWebEngine::madman,
+	&DreamWebEngine::madmansTelly, &DreamWebEngine::alleyBarkSound,
+	&DreamWebEngine::foghornSound, &DreamWebEngine::carParkDrip,
+	&DreamWebEngine::carParkDrip, &DreamWebEngine::carParkDrip,
+	&DreamWebEngine::carParkDrip
 };
 
 static const ReelRoutine g_initialReelRoutines[] = {
@@ -120,15 +120,15 @@ static const ReelRoutine g_initialReelRoutines[] = {
 	{ 255,0,0, 0, 0,0,0 }
 };
 
-void DreamBase::setupInitialReelRoutines() {
+void DreamWebEngine::setupInitialReelRoutines() {
 	for (unsigned int i = 0; i < kNumReelRoutines + 1; ++i) {
 		_reelRoutines[i] = g_initialReelRoutines[i];
-		if (_reelRoutines[i].period == 55 && isCD() && engine->getLanguage() == Common::DE_DEU)
+		if (_reelRoutines[i].period == 55 && isCD() && getLanguage() == Common::DE_DEU)
 			_reelRoutines[i].period = 65;
 	}
 }
 
-void DreamBase::updatePeople() {
+void DreamWebEngine::updatePeople() {
 	_peopleList.clear();
 	++_mainTimer;
 
@@ -142,7 +142,7 @@ void DreamBase::updatePeople() {
 	}
 }
 
-void DreamBase::madmanText() {
+void DreamWebEngine::madmanText() {
 	byte origCount;
 
 	if (isCD()) {
@@ -162,7 +162,7 @@ void DreamBase::madmanText() {
 	setupTimedTemp(47 + origCount, 82, 72, 80, 90, 1);
 }
 
-void DreamBase::madman(ReelRoutine &routine) {
+void DreamWebEngine::madman(ReelRoutine &routine) {
 	_vars._watchingTime = 2;
 	if (checkSpeed(routine)) {
 		uint16 newReelPointer = routine.reelPointer();
@@ -208,7 +208,7 @@ void DreamBase::madman(ReelRoutine &routine) {
 	madMode();
 }
 
-void DreamBase::madMode() {
+void DreamWebEngine::madMode() {
 	_vars._watchingTime = 2;
 	_pointerMode = 0;
 	if (_vars._combatCount < (isCD() ? 65 : 63))
@@ -218,7 +218,7 @@ void DreamBase::madMode() {
 	_pointerMode = 2;
 }
 
-void DreamBase::addToPeopleList(ReelRoutine *routine) {
+void DreamWebEngine::addToPeopleList(ReelRoutine *routine) {
 	People people;
 	people._reelPointer = routine->reelPointer();
 	people._routinePointer = routine;
@@ -227,7 +227,7 @@ void DreamBase::addToPeopleList(ReelRoutine *routine) {
 	_peopleList.push_back(people);
 }
 
-bool DreamBase::checkSpeed(ReelRoutine &routine) {
+bool DreamWebEngine::checkSpeed(ReelRoutine &routine) {
 	if (_vars._lastWeapon != (uint8)-1)
 		return true;
 	++routine.counter;
@@ -237,21 +237,21 @@ bool DreamBase::checkSpeed(ReelRoutine &routine) {
 	return true;
 }
 
-void DreamBase::sparkyDrip(ReelRoutine &routine) {
+void DreamWebEngine::sparkyDrip(ReelRoutine &routine) {
 	if (checkSpeed(routine))
 		playChannel0(14, 0);
 }
 
-void DreamBase::genericPerson(ReelRoutine &routine) {
+void DreamWebEngine::genericPerson(ReelRoutine &routine) {
 	showGameReel(&routine);
 	addToPeopleList(&routine);
 }
 
-void DreamBase::gamer(ReelRoutine &routine) {
+void DreamWebEngine::gamer(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint8 v;
 		do {
-			v = 20 + engine->randomNumber() % 5;
+			v = 20 + randomNumber() % 5;
 		} while (v == routine.reelPointer());
 		routine.setReelPointer(v);
 	}
@@ -260,19 +260,19 @@ void DreamBase::gamer(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamBase::eden(ReelRoutine &routine) {
+void DreamWebEngine::eden(ReelRoutine &routine) {
 	if (_vars._generalDead)
 		return;
 	showGameReel(&routine);
 	addToPeopleList(&routine);
 }
 
-void DreamBase::sparky(ReelRoutine &routine) {
+void DreamWebEngine::sparky(ReelRoutine &routine) {
 	if (_vars._card1Money)
 		routine.b7 = 3;
 	if (checkSpeed(routine)) {
 		if (routine.reelPointer() == 34) {
-			if (engine->randomNumber() < 30)
+			if (randomNumber() < 30)
 				routine.incReelPointer();
 			else
 				routine.setReelPointer(27);
@@ -289,7 +289,7 @@ void DreamBase::sparky(ReelRoutine &routine) {
 		_vars._talkedToSparky = 1;
 }
 
-void DreamBase::rockstar(ReelRoutine &routine) {
+void DreamWebEngine::rockstar(ReelRoutine &routine) {
 	if ((routine.reelPointer() == 303) || (routine.reelPointer() == 118)) {
 		_newLocation = 45;
 		showGameReel(&routine);
@@ -326,7 +326,7 @@ void DreamBase::rockstar(ReelRoutine &routine) {
 	}
 }
 
-void DreamBase::madmansTelly(ReelRoutine &routine) {
+void DreamWebEngine::madmansTelly(ReelRoutine &routine) {
 	uint16 nextReelPointer = routine.reelPointer() + 1;
 	if (nextReelPointer == 307)
 		nextReelPointer = 300;
@@ -335,14 +335,14 @@ void DreamBase::madmansTelly(ReelRoutine &routine) {
 }
 
 
-void DreamBase::smokeBloke(ReelRoutine &routine) {
+void DreamWebEngine::smokeBloke(ReelRoutine &routine) {
 	if (_vars._rockstarDead == 0) {
 		if (routine.b7 & 128)
-			DreamBase::setLocation(5);
+			DreamWebEngine::setLocation(5);
 	}
 	if (checkSpeed(routine)) {
 		if (routine.reelPointer() == 100) {
-			if (engine->randomNumber() < 30)
+			if (randomNumber() < 30)
 				routine.incReelPointer();
 			else
 				routine.setReelPointer(96);
@@ -355,20 +355,20 @@ void DreamBase::smokeBloke(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamBase::manAsleep(ReelRoutine &routine) {
+void DreamWebEngine::manAsleep(ReelRoutine &routine) {
 	routine.b7 &= 127;
 	showGameReel(&routine);
 	addToPeopleList(&routine);
 }
 
-void DreamBase::attendant(ReelRoutine &routine) {
+void DreamWebEngine::attendant(ReelRoutine &routine) {
 	showGameReel(&routine);
 	addToPeopleList(&routine);
 	if (routine.b7 & 128)
 		_vars._talkedToAttendant = 1;
 }
 
-void DreamBase::keeper(ReelRoutine &routine) {
+void DreamWebEngine::keeper(ReelRoutine &routine) {
 	if (_vars._keeperFlag != 0) {
 		// Not waiting
 		addToPeopleList(&routine);
@@ -385,7 +385,7 @@ void DreamBase::keeper(ReelRoutine &routine) {
 		routine.b7 = _vars._dreamNumber;
 }
 
-void DreamBase::drunk(ReelRoutine &routine) {
+void DreamWebEngine::drunk(ReelRoutine &routine) {
 	if (_vars._generalDead)
 		return;
 	routine.b7 &= 127;
@@ -393,7 +393,7 @@ void DreamBase::drunk(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamBase::interviewer(ReelRoutine &routine) {
+void DreamWebEngine::interviewer(ReelRoutine &routine) {
 	if (_vars._reelToWatch == 68)
 		routine.incReelPointer();
 
@@ -403,12 +403,12 @@ void DreamBase::interviewer(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamBase::drinker(ReelRoutine &routine) {
+void DreamWebEngine::drinker(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		routine.incReelPointer();
 
 		if ( routine.reelPointer() == 115 ||
-			(routine.reelPointer() == 106 && engine->randomNumber() >= 3))
+			(routine.reelPointer() == 106 && randomNumber() >= 3))
 			routine.setReelPointer(105);
 	}
 
@@ -416,7 +416,7 @@ void DreamBase::drinker(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamBase::alleyBarkSound(ReelRoutine &routine) {
+void DreamWebEngine::alleyBarkSound(ReelRoutine &routine) {
 	uint16 prevReelPointer = routine.reelPointer() - 1;
 	if (prevReelPointer == 0) {
 		playChannel1(14);
@@ -426,7 +426,7 @@ void DreamBase::alleyBarkSound(ReelRoutine &routine) {
 	}
 }
 
-void DreamBase::introMagic1(ReelRoutine &routine) {
+void DreamWebEngine::introMagic1(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 145)
@@ -444,7 +444,7 @@ void DreamBase::introMagic1(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamBase::introMagic2(ReelRoutine &routine) {
+void DreamWebEngine::introMagic2(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 216)
@@ -454,7 +454,7 @@ void DreamBase::introMagic2(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamBase::introMagic3(ReelRoutine &routine) {
+void DreamWebEngine::introMagic3(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 218)
@@ -465,7 +465,7 @@ void DreamBase::introMagic3(ReelRoutine &routine) {
 	routine.mapX = _mapX;
 }
 
-void DreamBase::candles1(ReelRoutine &routine) {
+void DreamWebEngine::candles1(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 44)
@@ -475,7 +475,7 @@ void DreamBase::candles1(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamBase::candles2(ReelRoutine &routine) {
+void DreamWebEngine::candles2(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 238)
@@ -485,7 +485,7 @@ void DreamBase::candles2(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamBase::smallCandle(ReelRoutine &routine) {
+void DreamWebEngine::smallCandle(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 37)
@@ -495,10 +495,10 @@ void DreamBase::smallCandle(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamBase::introMusic(ReelRoutine &routine) {
+void DreamWebEngine::introMusic(ReelRoutine &routine) {
 }
 
-void DreamBase::candles(ReelRoutine &routine) {
+void DreamWebEngine::candles(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 167)
@@ -508,7 +508,7 @@ void DreamBase::candles(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamBase::gates(ReelRoutine &routine) {
+void DreamWebEngine::gates(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 116)
@@ -525,7 +525,7 @@ void DreamBase::gates(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamBase::security(ReelRoutine &routine) {
+void DreamWebEngine::security(ReelRoutine &routine) {
 	if (routine.reelPointer() == 32) {
 		if (_vars._lastWeapon == 1) {
 			_vars._watchingTime = 10;
@@ -545,7 +545,7 @@ void DreamBase::security(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamBase::edenInBath(ReelRoutine &routine) {
+void DreamWebEngine::edenInBath(ReelRoutine &routine) {
 	if (_vars._generalDead == 0 || _vars._sartainDead != 0)
 		return;
 
@@ -553,7 +553,7 @@ void DreamBase::edenInBath(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamBase::louis(ReelRoutine &routine) {
+void DreamWebEngine::louis(ReelRoutine &routine) {
 	if (_vars._rockstarDead != 0)
 		return;
 
@@ -561,26 +561,26 @@ void DreamBase::louis(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamBase::handClap(ReelRoutine &routine) {
+void DreamWebEngine::handClap(ReelRoutine &routine) {
 }
 
-void DreamBase::carParkDrip(ReelRoutine &routine) {
+void DreamWebEngine::carParkDrip(ReelRoutine &routine) {
 	if (!checkSpeed(routine))
 		return; // cantdrip2
 
 	playChannel1(14);
 }
 
-void DreamBase::foghornSound(ReelRoutine &routine) {
-	if (engine->randomNumber() == 198)
+void DreamWebEngine::foghornSound(ReelRoutine &routine) {
+	if (randomNumber() == 198)
 		playChannel1(13);
 }
 
-void DreamBase::train(ReelRoutine &routine) {
+void DreamWebEngine::train(ReelRoutine &routine) {
 	// The original code has logic for this, but it is disabled
 }
 
-void DreamBase::louisChair(ReelRoutine &routine) {
+void DreamWebEngine::louisChair(ReelRoutine &routine) {
 	if (_vars._rockstarDead == 0)
 		return; // notlouis2
 
@@ -591,7 +591,7 @@ void DreamBase::louisChair(ReelRoutine &routine) {
 		} else if (nextReelPointer != 185) {
 			routine.setReelPointer(nextReelPointer);
 		} else {
-			if (engine->randomNumber() < 245)
+			if (randomNumber() < 245)
 				routine.setReelPointer(182);	// Restart Louis
 			else
 				routine.setReelPointer(nextReelPointer);
@@ -602,12 +602,12 @@ void DreamBase::louisChair(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamBase::bossMan(ReelRoutine &routine) {
+void DreamWebEngine::bossMan(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 
 		if (nextReelPointer == 4) {
-			if (_vars._gunPassFlag != 1 && engine->randomNumber() >= 10)
+			if (_vars._gunPassFlag != 1 && randomNumber() >= 10)
 				nextReelPointer = 0;
 		} else if (nextReelPointer == 20) {
 			if (_vars._gunPassFlag != 1)
@@ -628,7 +628,7 @@ void DreamBase::bossMan(ReelRoutine &routine) {
 		_vars._talkedToBoss = 1;
 }
 
-void DreamBase::priest(ReelRoutine &routine) {
+void DreamWebEngine::priest(ReelRoutine &routine) {
 	if (routine.reelPointer() == 8)
 		return; // priestspoken
 
@@ -641,7 +641,7 @@ void DreamBase::priest(ReelRoutine &routine) {
 	}
 }
 
-void DreamBase::priestText(ReelRoutine &routine) {
+void DreamWebEngine::priestText(ReelRoutine &routine) {
 	uint16 reel = routine.reelPointer();
 	if (reel < 2 || reel >= 7 || (reel & 1))
 		return; // nopriesttext
@@ -649,7 +649,7 @@ void DreamBase::priestText(ReelRoutine &routine) {
 	setupTimedUse((reel >> 1) + 50, 54, 1, 72, 80);
 }
 
-void DreamBase::monkAndRyan(ReelRoutine &routine) {
+void DreamWebEngine::monkAndRyan(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 83) {
@@ -669,14 +669,14 @@ void DreamBase::monkAndRyan(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamBase::copper(ReelRoutine &routine) {
+void DreamWebEngine::copper(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 94) {
 			nextReelPointer = 64;
 		} else if (nextReelPointer == 81 || nextReelPointer == 66) {
 			// Might wait
-			if (engine->randomNumber() >= 7)
+			if (randomNumber() >= 7)
 				nextReelPointer--;
 		}
 
@@ -687,7 +687,7 @@ void DreamBase::copper(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamBase::introMonks1(ReelRoutine &routine) {
+void DreamWebEngine::introMonks1(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 
@@ -717,7 +717,7 @@ void DreamBase::introMonks1(ReelRoutine &routine) {
 	routine.mapY = _mapY;
 }
 
-void DreamBase::introMonks2(ReelRoutine &routine) {
+void DreamWebEngine::introMonks2(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 87) {
@@ -750,7 +750,7 @@ void DreamBase::introMonks2(ReelRoutine &routine) {
 	showGameReel(&routine);
 }
 
-void DreamBase::soldier1(ReelRoutine &routine) {
+void DreamWebEngine::soldier1(ReelRoutine &routine) {
 	if (routine.reelPointer() != 0) {
 		_vars._watchingTime = 10;
 		if (routine.reelPointer() == 30) {
@@ -773,7 +773,7 @@ void DreamBase::soldier1(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamBase::receptionist(ReelRoutine &routine) {
+void DreamWebEngine::receptionist(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		if (_vars._cardPassFlag == 1) {
 			// Set card
@@ -790,10 +790,10 @@ void DreamBase::receptionist(ReelRoutine &routine) {
 					routine.incReelPointer();	// not end card
 				else
 					routine.setReelPointer(53);
-			} else if (engine->randomNumber() >= 240) {
+			} else if (randomNumber() >= 240) {
 				routine.setReelPointer(53);
 			}
-		} else if (engine->randomNumber() >= 30) {
+		} else if (randomNumber() >= 30) {
 			routine.setReelPointer(55);
 		} else {
 			// notdes2
@@ -810,10 +810,10 @@ void DreamBase::receptionist(ReelRoutine &routine) {
 		_vars._talkedToRecep = 1;
 }
 
-void DreamBase::bartender(ReelRoutine &routine) {
+void DreamWebEngine::bartender(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		if (routine.reelPointer() == 86) {
-			if (engine->randomNumber() >= 18)
+			if (randomNumber() >= 18)
 				routine.setReelPointer(81);
 			else
 				routine.incReelPointer();	// notsmoket2
@@ -831,7 +831,7 @@ void DreamBase::bartender(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamBase::heavy(ReelRoutine &routine) {
+void DreamWebEngine::heavy(ReelRoutine &routine) {
 	routine.b7 &= 127;
 	if (routine.reelPointer() != 43) {
 		_vars._watchingTime = 10;
@@ -855,7 +855,7 @@ void DreamBase::heavy(ReelRoutine &routine) {
 	addToPeopleList(&routine);
 }
 
-void DreamBase::helicopter(ReelRoutine &routine) {
+void DreamWebEngine::helicopter(ReelRoutine &routine) {
 	if (routine.reelPointer() == 203) {
 		// Won helicopter
 		_pointerMode = 0;
@@ -900,7 +900,7 @@ void DreamBase::helicopter(ReelRoutine &routine) {
 	}
 }
 
-void DreamBase::mugger(ReelRoutine &routine) {
+void DreamWebEngine::mugger(ReelRoutine &routine) {
 	if (routine.reelPointer() != 138) {
 		if (routine.reelPointer() == 176)
 			return; // endmugger2
@@ -934,18 +934,18 @@ void DreamBase::mugger(ReelRoutine &routine) {
 		_objectType = kExObjectType;
 		removeObFromInv();
 		makeMainScreen();
-		DreamBase::setupTimedUse(48, 70, 10, 68 - 32, 54 + 64);
+		DreamWebEngine::setupTimedUse(48, 70, 10, 68 - 32, 54 + 64);
 		_vars._beenMugged = 1;
 	}
 }
 
 // Exiting the elevator of Sartain's industries, Sartain (the businessman) and
 // two bodyguards are expecting Ryan.
-void DreamBase::businessMan(ReelRoutine &routine) {
+void DreamWebEngine::businessMan(ReelRoutine &routine) {
 	_pointerMode = 0;
 	_vars._watchingTime = 2;
 	if (routine.reelPointer() == 2)
-		DreamBase::setupTimedUse(49, 30, 1, 68, 174);	// First
+		DreamWebEngine::setupTimedUse(49, 30, 1, 68, 174);	// First
 
 	if (routine.reelPointer() == 95) {
 		// Businessman combat won - end
@@ -1002,7 +1002,7 @@ void DreamBase::businessMan(ReelRoutine &routine) {
 	}
 }
 
-void DreamBase::endGameSeq(ReelRoutine &routine) {
+void DreamWebEngine::endGameSeq(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint16 nextReelPointer = routine.reelPointer() + 1;
 		if (nextReelPointer == 51 && _introCount != 140) {
@@ -1033,7 +1033,7 @@ void DreamBase::endGameSeq(ReelRoutine &routine) {
 	}
 }
 
-void DreamBase::poolGuard(ReelRoutine &routine) {
+void DreamWebEngine::poolGuard(ReelRoutine &routine) {
 	if (routine.reelPointer() == 214 || routine.reelPointer() == 258) {
 		// Combat over 2
 		showGameReel(&routine);
@@ -1107,4 +1107,4 @@ void DreamBase::poolGuard(ReelRoutine &routine) {
 	}
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 04e7a22ef8..a293aa74f9 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -22,9 +22,9 @@
 
 #include "dreamweb/dreamweb.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
-void DreamBase::printBoth(const GraphicsFile &charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar) {
+void DreamWebEngine::printBoth(const GraphicsFile &charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar) {
 	uint16 newX = *x;
 	uint8 width, height;
 	printChar(charSet, &newX, y, c, nextChar, &width, &height);
@@ -32,7 +32,7 @@ void DreamBase::printBoth(const GraphicsFile &charSet, uint16 *x, uint16 y, uint
 	*x = newX;
 }
 
-uint8 DreamBase::getNextWord(const GraphicsFile &charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount) {
+uint8 DreamWebEngine::getNextWord(const GraphicsFile &charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount) {
 	*totalWidth = 0;
 	*charCount = 0;
 	while (true) {
@@ -47,7 +47,7 @@ uint8 DreamBase::getNextWord(const GraphicsFile &charSet, const uint8 *string, u
 			*totalWidth += 6;
 			return 0;
 		}
-		firstChar = engine->modifyChar(firstChar);
+		firstChar = modifyChar(firstChar);
 		if (firstChar != 255) {
 			uint8 secondChar = *string;
 			uint8 width = charSet._frames[firstChar - 32 + _charShift].width;
@@ -57,7 +57,7 @@ uint8 DreamBase::getNextWord(const GraphicsFile &charSet, const uint8 *string, u
 	}
 }
 
-void DreamBase::printChar(const GraphicsFile &charSet, uint16* x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) {
+void DreamWebEngine::printChar(const GraphicsFile &charSet, uint16* x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) {
 	if (c == 255)
 		return;
 
@@ -75,11 +75,11 @@ void DreamBase::printChar(const GraphicsFile &charSet, uint16* x, uint16 y, uint
 	(*x) += *width;
 }
 
-void DreamBase::printChar(const GraphicsFile &charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) {
+void DreamWebEngine::printChar(const GraphicsFile &charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) {
 	printChar(charSet, &x, y, c, nextChar, width, height);
 }
 
-uint8 DreamBase::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
+uint8 DreamWebEngine::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 	_pointerFrame = 1;
 	_pointerMode = 3;
 	do {
@@ -89,13 +89,13 @@ uint8 DreamBase::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWid
 			uint8 c0 = string[0];
 			uint8 c1 = string[1];
 			uint8 c2 = string[2];
-			c0 = engine->modifyChar(c0);
+			c0 = modifyChar(c0);
 			printBoth(_charset1, &offset, y, c0, c1);
 			if ((c1 == 0) || (c1 == ':')) {
 				return 0;
 			}
 			if (charCount != 1) {
-				c1 = engine->modifyChar(c1);
+				c1 = modifyChar(c1);
 				_charShift = 91;
 				uint16 offset2 = offset;
 				printBoth(_charset1, &offset2, y, c1, c2);
@@ -119,11 +119,11 @@ uint8 DreamBase::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWid
 	} while (true);
 }
 
-uint8 DreamBase::printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
+uint8 DreamWebEngine::printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 	return printDirect(&string, x, &y, maxWidth, centered);
 }
 
-uint8 DreamBase::printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered) {
+uint8 DreamWebEngine::printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered) {
 	_lastXPos = x;
 	const GraphicsFile &charSet = *_currentCharset;
 	while (true) {
@@ -137,7 +137,7 @@ uint8 DreamBase::printDirect(const uint8** string, uint16 x, uint16 *y, uint8 ma
 			if ((c == 0) || (c == ':')) {
 				return c;
 			}
-			c = engine->modifyChar(c);
+			c = modifyChar(c);
 			uint8 width, height;
 			printChar(charSet, &i, *y, c, nextChar, &width, &height);
 			_lastXPos = i;
@@ -147,7 +147,7 @@ uint8 DreamBase::printDirect(const uint8** string, uint16 x, uint16 *y, uint8 ma
 	}
 }
 
-uint8 DreamBase::getNumber(const GraphicsFile &charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16* offset) {
+uint8 DreamWebEngine::getNumber(const GraphicsFile &charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16* offset) {
 	uint8 totalWidth = 0;
 	uint8 charCount = 0;
 	while (true) {
@@ -186,7 +186,7 @@ uint8 DreamBase::getNumber(const GraphicsFile &charSet, const uint8 *string, uin
 	}
 }
 
-uint8 DreamBase::kernChars(uint8 firstChar, uint8 secondChar, uint8 width) {
+uint8 DreamWebEngine::kernChars(uint8 firstChar, uint8 secondChar, uint8 width) {
 	if ((firstChar == 'a') || (firstChar == 'u')) {
 		if ((secondChar == 'n') || (secondChar == 't') || (secondChar == 'r') || (secondChar == 'i') || (secondChar == 'l'))
 			return width-1;
@@ -194,7 +194,7 @@ uint8 DreamBase::kernChars(uint8 firstChar, uint8 secondChar, uint8 width) {
 	return width;
 }
 
-uint16 DreamBase::waitFrames() {
+uint16 DreamWebEngine::waitFrames() {
 	readMouse();
 	showPointer();
 	vSync();
@@ -203,7 +203,7 @@ uint16 DreamBase::waitFrames() {
 	return _mouseButton;
 }
 
-const char *DreamBase::monPrint(const char *string) {
+const char *DreamWebEngine::monPrint(const char *string) {
 	_kerning = 1;
 	uint16 x = _monAdX;
 	const char *iterator = string;
@@ -225,7 +225,7 @@ const char *DreamBase::monPrint(const char *string) {
 				done = true;
 				break;
 			}
-			c = engine->modifyChar(c);
+			c = modifyChar(c);
 			printChar(_tempCharset, &x, _monAdY, c, 0, NULL, NULL);
 			_cursLocX = x;
 			_cursLocY = _monAdY;
@@ -245,7 +245,7 @@ const char *DreamBase::monPrint(const char *string) {
 	return iterator;
 }
 
-void DreamBase::rollEndCreditsGameWon() {
+void DreamWebEngine::rollEndCreditsGameWon() {
 	playChannel0(16, 255);
 	_volume = 7;
 	_volumeTo = 0;
@@ -269,7 +269,7 @@ void DreamBase::rollEndCreditsGameWon() {
 			uint16 y = 10 - j;
 			const uint8 *tmp_str = string;
 			for (int k = 0; k < 18; ++k) {
-				DreamBase::printDirect(&tmp_str, 75, &y, 160 + 1, true);
+				DreamWebEngine::printDirect(&tmp_str, 75, &y, 160 + 1, true);
 				y += linespacing;
 			}
 
@@ -289,7 +289,7 @@ void DreamBase::rollEndCreditsGameWon() {
 	fadeScreenUpHalf();
 }
 
-void DreamBase::rollEndCreditsGameLost() {
+void DreamWebEngine::rollEndCreditsGameLost() {
 	multiGet(_mapStore, 25, 20, 160, 160);
 
 	const uint8 *string = getTextInFile1(49);
@@ -308,7 +308,7 @@ void DreamBase::rollEndCreditsGameLost() {
 			uint16 y = 10 - j;
 			const uint8 *tmp_str = string;
 			for (int k = 0; k < 18; ++k) {
-				DreamBase::printDirect(&tmp_str, 25, &y, 160 + 1, true);
+				DreamWebEngine::printDirect(&tmp_str, 25, &y, 160 + 1, true);
 				y += linespacing;
 			}
 
@@ -332,4 +332,4 @@ void DreamBase::rollEndCreditsGameLost() {
 	hangOne(120);
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/runtime.h b/engines/dreamweb/runtime.h
deleted file mode 100644
index 0bbef5028e..0000000000
--- a/engines/dreamweb/runtime.h
+++ /dev/null
@@ -1,46 +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 DREAMGEN_RUNTIME_H
-#define DREAMGEN_RUNTIME_H
-
-#include <assert.h>
-#include "common/scummsys.h"
-#include "common/array.h"
-#include "common/debug.h"
-
-#include "dreamweb/segment.h"
-
-namespace DreamGen {
-
-class Context {
-public:
-	MutableSegmentRef ds;
-
-	Context(SegmentManager *segMan): ds(segMan, segMan->data) {
-
-	}
-};
-
-} // End of namespace DreamGen
-
-#endif
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 95f1b3694d..76770f060e 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -28,7 +28,7 @@
 #include "common/translation.h"
 #include "common/serializer.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
 // Temporary storage for loading the room from a savegame
 Room g_madeUpRoomDat;
@@ -106,7 +106,7 @@ void syncGameVars(Common::Serializer &s, GameVars &vars) {
 	s.syncAsByte(vars._shakeCounter);
 }
 
-void DreamBase::loadGame() {
+void DreamWebEngine::loadGame() {
 	if (_commandType != 246) {
 		_commandType = 246;
 		commandOnly(41);
@@ -119,7 +119,7 @@ void DreamBase::loadGame() {
 
 // if -1, open menu to ask for slot to load
 // if >= 0, directly load from that slot
-void DreamBase::doLoad(int savegameId) {
+void DreamWebEngine::doLoad(int savegameId) {
 	_loadingOrSave = 1;
 
 	if (ConfMan.getBool("dreamweb_originalsaveload") && savegameId == -1) {
@@ -142,11 +142,11 @@ void DreamBase::doLoad(int savegameId) {
 			vSync();
 			dumpPointer();
 			dumpTextLine();
-			RectWithCallback<DreamBase> loadlist[] = {
-				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps },
-				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamBase::actualLoad },
-				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamBase::selectSlot },
-				{ 0,320,0,200,&DreamBase::blank },
+			RectWithCallback<DreamWebEngine> loadlist[] = {
+				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamWebEngine::getBackToOps },
+				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamWebEngine::actualLoad },
+				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamWebEngine::selectSlot },
+				{ 0,320,0,200,&DreamWebEngine::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
 			checkCoords(loadlist);
@@ -198,7 +198,7 @@ void DreamBase::doLoad(int savegameId) {
 }
 
 
-void DreamBase::saveGame() {
+void DreamWebEngine::saveGame() {
 	if (_vars._manDead == 2) {
 		blank();
 		return;
@@ -236,11 +236,11 @@ void DreamBase::saveGame() {
 			dumpPointer();
 			dumpTextLine();
 
-			RectWithCallback<DreamBase> savelist[] = {
-				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps },
-				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamBase::actualSave },
-				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamBase::selectSlot },
-				{ 0,320,0,200,&DreamBase::blank },
+			RectWithCallback<DreamWebEngine> savelist[] = {
+				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamWebEngine::getBackToOps },
+				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamWebEngine::actualSave },
+				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamWebEngine::selectSlot },
+				{ 0,320,0,200,&DreamWebEngine::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
 			checkCoords(savelist);
@@ -291,15 +291,15 @@ void DreamBase::saveGame() {
 	}
 }
 
-void DreamBase::namesToOld() {
+void DreamWebEngine::namesToOld() {
 	memcpy(_saveNamesOld, _saveNames, 17*7);
 }
 
-void DreamBase::oldToNames() {
+void DreamWebEngine::oldToNames() {
 	memcpy(_saveNames, _saveNamesOld, 17*7);
 }
 
-void DreamBase::saveLoad() {
+void DreamWebEngine::saveLoad() {
 	if (_vars._watchingTime || (_pointerMode == 2)) {
 		blank();
 		return;
@@ -312,7 +312,7 @@ void DreamBase::saveLoad() {
 		doSaveLoad();
 }
 
-void DreamBase::doSaveLoad() {
+void DreamWebEngine::doSaveLoad() {
 	_pointerFrame = 0;
 	_textAddressX = 70;
 	_textAddressY = 182-8;
@@ -327,11 +327,11 @@ void DreamBase::doSaveLoad() {
 	showMainOps();
 	workToScreen();
 
-	RectWithCallback<DreamBase> opsList[] = {
-		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamBase::getBackFromOps },
-		{ kOpsx+10,kOpsx+77,kOpsy+10,kOpsy+59,&DreamBase::DOSReturn },
-		{ kOpsx+128,kOpsx+190,kOpsy+16,kOpsy+100,&DreamBase::discOps },
-		{ 0,320,0,200,&DreamBase::blank },
+	RectWithCallback<DreamWebEngine> opsList[] = {
+		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamWebEngine::getBackFromOps },
+		{ kOpsx+10,kOpsx+77,kOpsy+10,kOpsy+59,&DreamWebEngine::DOSReturn },
+		{ kOpsx+128,kOpsx+190,kOpsy+16,kOpsy+100,&DreamWebEngine::discOps },
+		{ 0,320,0,200,&DreamWebEngine::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
 
@@ -376,14 +376,14 @@ void DreamBase::doSaveLoad() {
 	_manIsOffScreen = 0;
 }
 
-void DreamBase::getBackFromOps() {
+void DreamWebEngine::getBackFromOps() {
 	if (_vars._manDead == 2)
 		blank();
 	else
 		getBack1();
 }
 
-void DreamBase::getBackToOps() {
+void DreamWebEngine::getBackToOps() {
 	if (_commandType != 201) {
 		_commandType = 201;
 		commandOnly(42);
@@ -397,20 +397,20 @@ void DreamBase::getBackToOps() {
 	}
 }
 
-void DreamBase::showMainOps() {
+void DreamWebEngine::showMainOps() {
 	showFrame(_tempGraphics, kOpsx+10, kOpsy+10, 8, 0);
 	showFrame(_tempGraphics, kOpsx+59, kOpsy+30, 7, 0);
 	showFrame(_tempGraphics, kOpsx+128+4, kOpsy+12, 1, 0);
 }
 
-void DreamBase::showDiscOps() {
+void DreamWebEngine::showDiscOps() {
 	showFrame(_tempGraphics, kOpsx+128+4, kOpsy+12, 1, 0);
 	showFrame(_tempGraphics, kOpsx+10, kOpsy+10, 9, 0);
 	showFrame(_tempGraphics, kOpsx+59, kOpsy+30, 10, 0);
 	showFrame(_tempGraphics, kOpsx+176+2, kOpsy+60-4, 5, 0);
 }
 
-void DreamBase::discOps() {
+void DreamWebEngine::discOps() {
 	if (_commandType != 249) {
 		_commandType = 249;
 		commandOnly(43);
@@ -427,11 +427,11 @@ void DreamBase::discOps() {
 	workToScreenM();
 	_getBack = 0;
 
-	RectWithCallback<DreamBase> discOpsList[] = {
-		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamBase::loadGame },
-		{ kOpsx+10,kOpsx+79,kOpsy+10,kOpsy+59,&DreamBase::saveGame },
-		{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamBase::getBackToOps },
-		{ 0,320,0,200,&DreamBase::blank },
+	RectWithCallback<DreamWebEngine> discOpsList[] = {
+		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamWebEngine::loadGame },
+		{ kOpsx+10,kOpsx+79,kOpsy+10,kOpsy+59,&DreamWebEngine::saveGame },
+		{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamWebEngine::getBackToOps },
+		{ 0,320,0,200,&DreamWebEngine::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
 
@@ -449,7 +449,7 @@ void DreamBase::discOps() {
 	} while (!_getBack);
 }
 
-void DreamBase::actualSave() {
+void DreamWebEngine::actualSave() {
 	if (_commandType != 222) {
 		_commandType = 222;
 		commandOnly(44);
@@ -476,7 +476,7 @@ void DreamBase::actualSave() {
 	_getBack = 4;
 }
 
-void DreamBase::actualLoad() {
+void DreamWebEngine::actualLoad() {
 	if (_commandType != 221) {
 		_commandType = 221;
 		commandOnly(41);
@@ -495,7 +495,7 @@ void DreamBase::actualLoad() {
 	_getBack = 1;
 }
 
-void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
+void DreamWebEngine::savePosition(unsigned int slot, const char *descbuf) {
 
 	const Room &currentRoom = g_roomData[_vars._location];
 
@@ -508,9 +508,9 @@ void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 	madeUpRoom.facing = _facing;
 	madeUpRoom.b27 = 255;
 
-	Common::String filename = engine->getSavegameFilename(slot);
+	Common::String filename = getSavegameFilename(slot);
 	debug(1, "savePosition: slot %d filename %s", slot, filename.c_str());
-	Common::OutSaveFile *outSaveFile = engine->getSaveFileManager()->openForSaving(filename);
+	Common::OutSaveFile *outSaveFile = getSaveFileManager()->openForSaving(filename);
 	if (!outSaveFile)	// TODO: Do proper error handling!
 		error("save could not be opened for writing");
 
@@ -582,13 +582,13 @@ void DreamBase::savePosition(unsigned int slot, const char *descbuf) {
 	delete outSaveFile;
 }
 
-void DreamBase::loadPosition(unsigned int slot) {
+void DreamWebEngine::loadPosition(unsigned int slot) {
 	_timeCount = 0;
 	clearChanges();
 
-	Common::String filename = engine->getSavegameFilename(slot);
+	Common::String filename = getSavegameFilename(slot);
 	debug(1, "loadPosition: slot %d filename %s", slot, filename.c_str());
-	Common::InSaveFile *inSaveFile = engine->getSaveFileManager()->openForLoading(filename);
+	Common::InSaveFile *inSaveFile = getSaveFileManager()->openForLoading(filename);
 	if (!inSaveFile)	// TODO: Do proper error handling!
 		error("save could not be opened for reading");
 
@@ -664,13 +664,13 @@ void DreamBase::loadPosition(unsigned int slot) {
 }
 
 // Count number of save files, and load their descriptions into _saveNames
-uint DreamBase::scanForNames() {
+uint DreamWebEngine::scanForNames() {
 	// Initialize the first 7 slots (like the original code expects)
 	for (unsigned int slot = 0; slot < 7; ++slot) {
 		_saveNames[17 * slot + 0] = 2;
 		_saveNames[17 * slot + 1] = 0;
 		for (int i = 2; i < 17; ++i)
-			_saveNames[17 * slot + i] = 1;	// initialize with 1's
+			_saveNames[17 * slot + i] = 1;	// initialize with 1'sdrea
 	}
 
 	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
@@ -701,7 +701,7 @@ uint DreamBase::scanForNames() {
 	return saveList.size();
 }
 
-void DreamBase::loadOld() {
+void DreamWebEngine::loadOld() {
 	if (_commandType != 252) {
 		_commandType = 252;
 		commandOnly(48);
@@ -720,19 +720,19 @@ void DreamBase::loadOld() {
 	_getBack = 0;
 }
 
-void DreamBase::showDecisions() {
+void DreamWebEngine::showDecisions() {
 	createPanel2();
 	showOpBox();
 	showFrame(_tempGraphics, kOpsx + 17, kOpsy + 13, 6, 0);
 	underTextLine();
 }
 
-void DreamBase::loadSaveBox() {
+void DreamWebEngine::loadSaveBox() {
 	loadIntoTemp("DREAMWEB.G08");
 }
 
 // show savegame names (original interface), and set kCursorpos
-void DreamBase::showNames() {
+void DreamWebEngine::showNames() {
 	for (int slot = 0; slot < 7; ++slot) {
 		// The first character of the savegame name is unused
 		Common::String name(&_saveNames[17*slot + 1]);
@@ -755,7 +755,7 @@ void DreamBase::showNames() {
 	}
 }
 
-void DreamBase::checkInput() {
+void DreamWebEngine::checkInput() {
 	if (_loadingOrSave == 3)
 		return;
 
@@ -792,7 +792,7 @@ void DreamBase::checkInput() {
 	workToScreenM();
 }
 
-void DreamBase::selectSlot() {
+void DreamWebEngine::selectSlot() {
 	if (_commandType != 244) {
 		_commandType = 244;
 		commandOnly(45);
@@ -824,7 +824,7 @@ void DreamBase::selectSlot() {
 	delPointer();
 }
 
-void DreamBase::showSlots() {
+void DreamWebEngine::showSlots() {
 	showFrame(_tempGraphics, kOpsx + 7, kOpsy + 8, 2, 0);
 
 	uint16 y = kOpsy + 11;
@@ -837,7 +837,7 @@ void DreamBase::showSlots() {
 	}
 }
 
-void DreamBase::showOpBox() {
+void DreamWebEngine::showOpBox() {
 	showFrame(_tempGraphics, kOpsx, kOpsy, 0, 0);
 
 	// CHECKME: There seem to be versions of dreamweb in which this call
@@ -845,16 +845,16 @@ void DreamBase::showOpBox() {
 	showFrame(_tempGraphics, kOpsx, kOpsy + 55, 4, 0);
 }
 
-void DreamBase::showLoadOps() {
+void DreamWebEngine::showLoadOps() {
 	showFrame(_tempGraphics, kOpsx + 128 + 4, kOpsy + 12, 1, 0);
 	showFrame(_tempGraphics, kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
 	printMessage(kOpsx + 104, kOpsy + 14, 55, 101, (101 & 1));
 }
 
-void DreamBase::showSaveOps() {
+void DreamWebEngine::showSaveOps() {
 	showFrame(_tempGraphics, kOpsx + 128 + 4, kOpsy + 12, 1, 0);
 	showFrame(_tempGraphics, kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
 	printMessage(kOpsx + 104, kOpsy + 14, 54, 101, (101 & 1));
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/segment.h b/engines/dreamweb/segment.h
deleted file mode 100644
index 65bc2335ea..0000000000
--- a/engines/dreamweb/segment.h
+++ /dev/null
@@ -1,232 +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 DREAMGEN_SEGMENT_H
-#define DREAMGEN_SEGMENT_H
-
-#include "common/array.h"
-#include "common/ptr.h"
-#include "common/hashmap.h"
-#include "common/list.h"
-
-namespace DreamGen {
-
-class WordRef {
-	uint8		*_data;
-	unsigned	_index;
-	uint16		_value;
-
-public:
-	inline WordRef(Common::Array<uint8> &data, unsigned index) : _data(data.begin() + index), _index(index) {
-		assert(index + 1 < data.size());
-		_value = _data[0] | (_data[1] << 8);
-	}
-
-	inline WordRef& operator=(const WordRef &ref) {
-		_value = ref._value;
-		return *this;
-	}
-
-	inline WordRef& operator=(uint16 v) {
-		_value = v;
-		return *this;
-	}
-
-	inline operator uint16&() {
-		return _value;
-	}
-
-	inline ~WordRef() {
-		// FIXME: This is _too late_ to write back the
-		// value. Example: in the call
-		// printDirect(data.word(kLastxpos), .....)
-		// the destructor isn't called until after printDirect returns. This
-		// destroys the modifications to lastXPos that printDirect makes.
-		_data[0] = _value & 0xff;
-		_data[1] = _value >> 8;
-		_value = _data[0] | (_data[1] << 8);
-	}
-};
-
-class Segment {
-	Common::Array<uint8> data;
-
-public:
-	Segment(uint size = 0) {
-		if (size > 0)
-			data.resize(size);
-	}
-
-	inline void assign(const uint8 *b, const uint8 *e) {
-		data.assign(b, e);
-	}
-
-	inline uint8 &byte(unsigned index) {
-		assert(index < data.size());
-		return data[index];
-	}
-
-	inline WordRef word(unsigned index) {
-		return WordRef(data, index);
-	}
-
-	inline uint8 *ptr(unsigned index, unsigned size) {
-		assert(index + size <= data.size());
-		return data.begin() + index;
-	}
-};
-
-typedef Common::SharedPtr<Segment> SegmentPtr;
-
-class SegmentRef {
-	uint16		_value;
-	SegmentPtr	_segment;
-
-public:
-	SegmentRef(uint16 value = 0, SegmentPtr segment = SegmentPtr())
-	: _value(value), _segment(segment) {
-	}
-
-	inline operator uint16() const {
-		return _value;
-	}
-
-	SegmentPtr getSegmentPtr() const {
-		return _segment;
-	}
-
-	inline uint8 &byte(unsigned index) {
-		assert(_segment != 0);
-		return _segment->byte(index);
-	}
-
-	inline WordRef word(unsigned index) {
-		//debug(1, "getting word ref for %04x:%d", _value, index);
-		assert(_segment != 0);
-		return _segment->word(index);
-	}
-
-	inline void assign(const uint8 *b, const uint8 *e) {
-		assert(_segment != 0);
-		_segment->assign(b, e);
-	}
-
-	inline uint8 *ptr(unsigned index, unsigned size) {
-		assert(_segment != 0);
-		return _segment->ptr(index, size);
-	}
-
-protected:
-	SegmentRef &operator=(const SegmentRef &seg) {
-		_value = seg._value;
-		_segment = seg._segment;
-		return *this;
-	}
-
-};
-
-class SegmentManager;
-
-class MutableSegmentRef : public SegmentRef {
-protected:
-	SegmentManager		*_segMan;
-
-public:
-	MutableSegmentRef(SegmentManager *segMan, uint16 value = 0, SegmentPtr segment = SegmentPtr())
-	: _segMan(segMan), SegmentRef(value, segment) {
-	}
-
-	MutableSegmentRef(SegmentManager *segMan, SegmentRef seg)
-	: _segMan(segMan), SegmentRef(seg) {
-	}
-
-	inline MutableSegmentRef& operator=(const uint16 id);
-
-};
-
-
-class SegmentManager {
-private:
-	typedef Common::HashMap<uint16, SegmentPtr> SegmentMap;
-	SegmentMap _segments;
-
-	typedef Common::List<uint16> FreeSegmentList;
-	FreeSegmentList _freeSegments;
-
-	enum { kDefaultDataSegment = 0x1000 };
-
-public:
-
-	SegmentPtr _realData;	///< the primary data segment, points to a huge blob of binary data
-	SegmentRef data;	///< fake segment register always pointing to data segment
-
-public:
-	SegmentManager() :
-		_realData(new Segment()),
-		data(kDefaultDataSegment, _realData) {
-
-		_segments[kDefaultDataSegment] = data.getSegmentPtr();
-	}
-
-	SegmentRef getSegment(uint16 value) {
-		SegmentMap::iterator i = _segments.find(value);
-		if (i != _segments.end())
-			return SegmentRef(value, i->_value);
-		else
-			return SegmentRef(value);
-	}
-
-	SegmentRef allocateSegment(uint size) {
-		unsigned id;
-		if (_freeSegments.empty())
-			id = kDefaultDataSegment + _segments.size();
-		else {
-			id = _freeSegments.front();
-			_freeSegments.pop_front();
-		}
-		assert(!_segments.contains(id));
-		SegmentPtr seg(new Segment(size));
-		_segments[id] = seg;
-		return SegmentRef(id, seg);
-	}
-
-	void deallocateSegment(uint16 id) {
-		SegmentMap::iterator i = _segments.find(id);
-		if(i != _segments.end()) {
-			_segments.erase(i);
-			_freeSegments.push_back(id);
-		} else {
-			debug("Deallocating non existent segment! Client code should be fixed.");
-		}
-	}
-
-};
-
-
-inline MutableSegmentRef& MutableSegmentRef::operator=(const uint16 id) {
-	SegmentRef::operator=(_segMan->getSegment(id));
-	return *this;
-}
-
-} // End of namespace DreamGen
-
-#endif
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index 774f22a0b9..8e125cc0e1 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -21,28 +21,27 @@
  */
 
 #include "dreamweb/dreamweb.h"
-#include "dreamweb/dreamgen.h"
 
 #include "audio/mixer.h"
 #include "audio/decoders/raw.h"
 
 #include "common/config-manager.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
-bool DreamBase::loadSpeech(byte type1, int idx1, byte type2, int idx2) {
+bool DreamWebEngine::loadSpeech(byte type1, int idx1, byte type2, int idx2) {
 	cancelCh1();
 
 	Common::String name = Common::String::format("%c%02d%c%04d.RAW", type1, idx1, type2, idx2);
 	//debug("name = %s", name.c_str());
-	bool result = engine->loadSpeech(name);
+	bool result = loadSpeech(name);
 
 	_speechLoaded = result;
 	return result;
 }
 
 
-void DreamBase::volumeAdjust() {
+void DreamWebEngine::volumeAdjust() {
 	if (_volumeDirection == 0)
 		return;
 	if (_volume != _volumeTo) {
@@ -55,7 +54,7 @@ void DreamBase::volumeAdjust() {
 	}
 }
 
-void DreamBase::playChannel0(uint8 index, uint8 repeat) {
+void DreamWebEngine::playChannel0(uint8 index, uint8 repeat) {
 	_channel0Playing = index;
 	if (index >= 12)
 		index -= 12;
@@ -63,7 +62,7 @@ void DreamBase::playChannel0(uint8 index, uint8 repeat) {
 	_channel0Repeat = repeat;
 }
 
-void DreamBase::playChannel1(uint8 index) {
+void DreamWebEngine::playChannel1(uint8 index) {
 	if (_channel1Playing == 7)
 		return;
 
@@ -72,18 +71,18 @@ void DreamBase::playChannel1(uint8 index) {
 		index -= 12;
 }
 
-void DreamBase::cancelCh0() {
+void DreamWebEngine::cancelCh0() {
 	_channel0Repeat = 0;
 	_channel0Playing = 255;
-	engine->stopSound(0);
+	stopSound(0);
 }
 
-void DreamBase::cancelCh1() {
+void DreamWebEngine::cancelCh1() {
 	_channel1Playing = 255;
-	engine->stopSound(1);
+	stopSound(1);
 }
 
-void DreamBase::loadRoomsSample() {
+void DreamWebEngine::loadRoomsSample() {
 	uint8 sample = _roomsSample;
 
 	if (sample == 255 || _currentSample == sample)
@@ -99,10 +98,10 @@ void DreamBase::loadRoomsSample() {
 	uint8 ch1 = _channel1Playing;
 	if (ch1 >= 12)
 		cancelCh1();
-	engine->loadSounds(1, sampleName.c_str());
+	loadSounds(1, sampleName.c_str());
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
 
 
 namespace DreamWeb {
@@ -191,10 +190,10 @@ bool DreamWebEngine::loadSpeech(const Common::String &filename) {
 }
 
 void DreamWebEngine::soundHandler() {
-	_base._subtitles = ConfMan.getBool("subtitles");
-	_base.volumeAdjust();
+	_subtitles = ConfMan.getBool("subtitles");
+	volumeAdjust();
 
-	uint volume = _base._volume;
+	uint volume = _volume;
 	//.vol file loaded into soundbuf:0x4000
 	//volume table at (volume * 0x100 + 0x3f00)
 	//volume value could be from 1 to 7
@@ -210,13 +209,13 @@ void DreamWebEngine::soundHandler() {
 	volume = (8 - volume) * Audio::Mixer::kMaxChannelVolume / 8;
 	_mixer->setChannelVolume(_channelHandle[0], volume);
 
-	uint8 ch0 = _base._channel0Playing;
+	uint8 ch0 = _channel0Playing;
 	if (ch0 == 255)
 		ch0 = 0;
-	uint8 ch1 = _base._channel1Playing;
+	uint8 ch1 = _channel1Playing;
 	if (ch1 == 255)
 		ch1 = 0;
-	uint8 ch0loop = _base._channel0Repeat;
+	uint8 ch0loop = _channel0Repeat;
 
 	if (_channel0 != ch0) {
 		_channel0 = ch0;
@@ -231,11 +230,11 @@ void DreamWebEngine::soundHandler() {
 		}
 	}
 	if (!_mixer->isSoundHandleActive(_channelHandle[0])) {
-		_base._channel0Playing = 255;
+		_channel0Playing = 255;
 		_channel0 = 0;
 	}
 	if (!_mixer->isSoundHandleActive(_channelHandle[1])) {
-		_base._channel1Playing = 255;
+		_channel1Playing = 255;
 		_channel1 = 0;
 	}
 
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index a04f877f2c..33dbc0f18b 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -22,9 +22,9 @@
 
 #include "dreamweb/dreamweb.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
-void DreamBase::printSprites() {
+void DreamWebEngine::printSprites() {
 	for (size_t priority = 0; priority < 7; ++priority) {
 		Common::List<Sprite>::const_iterator i;
 		for (i = _spriteTable.begin(); i != _spriteTable.end(); ++i) {
@@ -39,7 +39,7 @@ void DreamBase::printSprites() {
 	}
 }
 
-void DreamBase::printASprite(const Sprite *sprite) {
+void DreamWebEngine::printASprite(const Sprite *sprite) {
 	uint16 x, y;
 	if (sprite->y >= 220) {
 		y = _mapAdY - (256 - sprite->y);
@@ -61,11 +61,11 @@ void DreamBase::printASprite(const Sprite *sprite) {
 	showFrame(*sprite->_frameData, x, y, sprite->frameNumber, c);
 }
 
-void DreamBase::clearSprites() {
+void DreamWebEngine::clearSprites() {
 	_spriteTable.clear();
 }
 
-Sprite *DreamBase::makeSprite(uint8 x, uint8 y, uint16 updateCallback, const GraphicsFile *frameData, uint16 somethingInDi) {
+Sprite *DreamWebEngine::makeSprite(uint8 x, uint8 y, uint16 updateCallback, const GraphicsFile *frameData, uint16 somethingInDi) {
 	// Note: the original didn't append sprites here, but filled up the
 	// first unused entry. This can change the order of entries, but since they
 	// are drawn based on the priority field, this shouldn't matter.
@@ -86,7 +86,7 @@ Sprite *DreamBase::makeSprite(uint8 x, uint8 y, uint16 updateCallback, const Gra
 	return sprite;
 }
 
-void DreamBase::spriteUpdate() {
+void DreamWebEngine::spriteUpdate() {
 	// During the intro the sprite table can be empty
 	if (!_spriteTable.empty())
 		_spriteTable.front().hidden = _vars._ryanOn;
@@ -109,14 +109,14 @@ void DreamBase::spriteUpdate() {
 	}
 }
 
-void DreamBase::initMan() {
+void DreamWebEngine::initMan() {
 	Sprite *sprite = makeSprite(_ryanX, _ryanY, addr_mainman, &_mainSprites, 0);
 	sprite->priority = 4;
 	sprite->speed = 0;
 	sprite->walkFrame = 0;
 }
 
-void DreamBase::mainMan(Sprite *sprite) {
+void DreamWebEngine::mainMan(Sprite *sprite) {
 	if (_resetManXY == 1) {
 		_resetManXY = 0;
 		sprite->x = _ryanX;
@@ -166,7 +166,7 @@ void DreamBase::mainMan(Sprite *sprite) {
 	_ryanY = sprite->y;
 }
 
-void DreamBase::walking(Sprite *sprite) {
+void DreamWebEngine::walking(Sprite *sprite) {
 	uint8 comp;
 	if (_lineDirection != 0) {
 		--_linePointer;
@@ -191,7 +191,7 @@ void DreamBase::walking(Sprite *sprite) {
 	autoSetWalk();
 }
 
-void DreamBase::aboutTurn(Sprite *sprite) {
+void DreamWebEngine::aboutTurn(Sprite *sprite) {
 	bool incdir = true;
 
 	if (_turnDirection == 1)
@@ -225,7 +225,7 @@ void DreamBase::aboutTurn(Sprite *sprite) {
 	}
 }
 
-void DreamBase::backObject(Sprite *sprite) {
+void DreamWebEngine::backObject(Sprite *sprite) {
 	SetObject *objData = sprite->_objData;
 
 	if (sprite->delay != 0) {
@@ -250,7 +250,7 @@ void DreamBase::backObject(Sprite *sprite) {
 		steady(sprite, objData);
 }
 
-void DreamBase::constant(Sprite *sprite, SetObject *objData) {
+void DreamWebEngine::constant(Sprite *sprite, SetObject *objData) {
 	++sprite->animFrame;
 	if (objData->frames[sprite->animFrame] == 255) {
 		sprite->animFrame = 0;
@@ -260,22 +260,22 @@ void DreamBase::constant(Sprite *sprite, SetObject *objData) {
 	sprite->frameNumber = frame;
 }
 
-void DreamBase::randomSprite(Sprite *sprite, SetObject *objData) {
-	uint8 r = engine->randomNumber();
+void DreamWebEngine::randomSprite(Sprite *sprite, SetObject *objData) {
+	uint8 r = randomNumber();
 	sprite->frameNumber = objData->frames[r&7];
 }
 
-void DreamBase::doorway(Sprite *sprite, SetObject *objData) {
+void DreamWebEngine::doorway(Sprite *sprite, SetObject *objData) {
 	Common::Rect check(-24, -30, 10, 10);
 	doDoor(sprite, objData, check);
 }
 
-void DreamBase::wideDoor(Sprite *sprite, SetObject *objData) {
+void DreamWebEngine::wideDoor(Sprite *sprite, SetObject *objData) {
 	Common::Rect check(-24, -30, 24, 24);
 	doDoor(sprite, objData, check);
 }
 
-void DreamBase::doDoor(Sprite *sprite, SetObject *objData, Common::Rect check) {
+void DreamWebEngine::doDoor(Sprite *sprite, SetObject *objData, Common::Rect check) {
 	int ryanx = _ryanX;
 	int ryany = _ryanY;
 
@@ -324,13 +324,13 @@ void DreamBase::doDoor(Sprite *sprite, SetObject *objData, Common::Rect check) {
 	}
 }
 
-void DreamBase::steady(Sprite *sprite, SetObject *objData) {
+void DreamWebEngine::steady(Sprite *sprite, SetObject *objData) {
 	uint8 frame = objData->frames[0];
 	objData->index = frame;
 	sprite->frameNumber = frame;
 }
 
-void DreamBase::lockedDoorway(Sprite *sprite, SetObject *objData) {
+void DreamWebEngine::lockedDoorway(Sprite *sprite, SetObject *objData) {
 	int ryanx = _ryanX;
 	int ryany = _ryanY;
 
@@ -381,7 +381,7 @@ void DreamBase::lockedDoorway(Sprite *sprite, SetObject *objData) {
 	}
 }
 
-void DreamBase::liftSprite(Sprite *sprite, SetObject *objData) {
+void DreamWebEngine::liftSprite(Sprite *sprite, SetObject *objData) {
 	uint8 liftFlag = _vars._liftFlag;
 	if (liftFlag == 0) { //liftclosed
 		turnPathOff(_vars._liftPath);
@@ -429,14 +429,14 @@ void DreamBase::liftSprite(Sprite *sprite, SetObject *objData) {
 	}
 }
 
-Reel *DreamBase::getReelStart(uint16 reelPointer) {
+Reel *DreamWebEngine::getReelStart(uint16 reelPointer) {
 	Reel *reel = &_reelList[reelPointer * 8];
 	return reel;
 }
 
 // Locate the reel segment (reel1, reel2, reel3) this frame is stored in,
 // and adjust the frame number relative to this segment.
-const GraphicsFile *DreamBase::findSource(uint16 &frame) {
+const GraphicsFile *DreamWebEngine::findSource(uint16 &frame) {
 	if (frame < 160) {
 		return &_reel1;
 	} else if (frame < 320) {
@@ -448,7 +448,7 @@ const GraphicsFile *DreamBase::findSource(uint16 &frame) {
 	}
 }
 
-void DreamBase::showReelFrame(Reel *reel) {
+void DreamWebEngine::showReelFrame(Reel *reel) {
 	uint16 x = reel->x + _mapAdX;
 	uint16 y = reel->y + _mapAdY;
 	uint16 frame = reel->frame();
@@ -456,7 +456,7 @@ void DreamBase::showReelFrame(Reel *reel) {
 	showFrame(*base, x, y, frame, 8);
 }
 
-void DreamBase::showGameReel(ReelRoutine *routine) {
+void DreamWebEngine::showGameReel(ReelRoutine *routine) {
 	uint16 reelPointer = routine->reelPointer();
 	if (reelPointer >= 512)
 		return;
@@ -464,12 +464,12 @@ void DreamBase::showGameReel(ReelRoutine *routine) {
 	routine->setReelPointer(reelPointer);
 }
 
-const Frame *DreamBase::getReelFrameAX(uint16 frame) {
+const Frame *DreamWebEngine::getReelFrameAX(uint16 frame) {
 	const GraphicsFile *base = findSource(frame);
 	return &base->_frames[frame];
 }
 
-void DreamBase::showRain() {
+void DreamWebEngine::showRain() {
 	Common::List<Rain>::iterator i;
 
 	// Do nothing if there's no rain at all
@@ -502,7 +502,7 @@ void DreamBase::showRain() {
 	if (_realLocation == 55)
 		return;
 
-	if (engine->randomNumber() >= 1) // play thunder with 1 in 256 chance
+	if (randomNumber() >= 1) // play thunder with 1 in 256 chance
 		return;
 
 	uint8 soundIndex;
@@ -513,7 +513,7 @@ void DreamBase::showRain() {
 	playChannel1(soundIndex);
 }
 
-void DreamBase::moveMap(uint8 param) {
+void DreamWebEngine::moveMap(uint8 param) {
 	switch (param) {
 	case 32:
 		_mapY -= 20;
@@ -534,7 +534,7 @@ void DreamBase::moveMap(uint8 param) {
 	_nowInNewRoom = 1;
 }
 
-void DreamBase::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY) {
+void DreamWebEngine::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY) {
 	*flagX = x / 16;
 	*flagY = y / 16;
 	const MapFlag &tileData = _mapFlags[*flagY * 11 + *flagX];
@@ -543,7 +543,7 @@ void DreamBase::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *ty
 	*type = tileData._type;
 }
 
-uint8 DreamBase::getBlockOfPixel(uint8 x, uint8 y) {
+uint8 DreamWebEngine::getBlockOfPixel(uint8 x, uint8 y) {
 	uint8 flag, flagEx, type, flagX, flagY;
 	checkOne(x + _mapXStart, y + _mapYStart, &flag, &flagEx, &type, &flagX, &flagY);
 	if (flag & 1)
@@ -552,7 +552,7 @@ uint8 DreamBase::getBlockOfPixel(uint8 x, uint8 y) {
 		return type;
 }
 
-void DreamBase::splitIntoLines(uint8 x, uint8 y) {
+void DreamWebEngine::splitIntoLines(uint8 x, uint8 y) {
 	do {
 		Rain rain;
 
@@ -579,8 +579,8 @@ void DreamBase::splitIntoLines(uint8 x, uint8 y) {
 		}
 
 		rain.size = length;
-		rain.w3 = (engine->randomNumber() << 8) | engine->randomNumber();
-		rain.b5 = (engine->randomNumber() & 3) + 4;
+		rain.w3 = (randomNumber() << 8) | randomNumber();
+		rain.b5 = (randomNumber() & 3) + 4;
 		_rainList.push_back(rain);
 	} while (x > 0 && y < _mapYSize);
 }
@@ -622,7 +622,7 @@ static const RainLocation rainLocationList[] = {
 	{ 255,0,0,0 }
 };
 
-void DreamBase::initRain() {
+void DreamWebEngine::initRain() {
 	const RainLocation *r = rainLocationList;
 	_rainList.clear();
 
@@ -647,7 +647,7 @@ void DreamBase::initRain() {
 	do {
 		uint8 delta;
 		do {
-			delta = (engine->randomNumber() & 31) + 3;
+			delta = (randomNumber() & 31) + 3;
 		} while (delta >= rainSpacing);
 
 		x += delta;
@@ -662,7 +662,7 @@ void DreamBase::initRain() {
 	do {
 		uint8 delta;
 		do {
-			delta = (engine->randomNumber() & 31) + 3;
+			delta = (randomNumber() & 31) + 3;
 		} while (delta >= rainSpacing);
 
 		y += delta;
@@ -673,7 +673,7 @@ void DreamBase::initRain() {
 	} while (true);
 }
 
-void DreamBase::intro1Text() {
+void DreamWebEngine::intro1Text() {
 	if (_introCount != 2 && _introCount != 4 && _introCount != 6)
 		return;
 
@@ -689,22 +689,22 @@ void DreamBase::intro1Text() {
 	}
 }
 
-void DreamBase::intro2Text(uint16 nextReelPointer) {
+void DreamWebEngine::intro2Text(uint16 nextReelPointer) {
 	if (nextReelPointer == 5)
 		setupTimedTemp(43, 82, 34, 40, 90, 1);
 	else if (nextReelPointer == 15)
 		setupTimedTemp(44, 82, 34, 40, 90, 1);
 }
 
-void DreamBase::intro3Text(uint16 nextReelPointer) {
+void DreamWebEngine::intro3Text(uint16 nextReelPointer) {
 	if (nextReelPointer == 107)
 		setupTimedTemp(45, 82, 36, 56, 100, 1);
 	else if (nextReelPointer == (isCD() ? 108 : 109))
 		setupTimedTemp(46, 82, 36, 56, 100, 1);
 }
 
-void DreamBase::monks2text() {
-	bool isGermanCD = isCD() && engine->getLanguage() == Common::DE_DEU;
+void DreamWebEngine::monks2text() {
+	bool isGermanCD = isCD() && getLanguage() == Common::DE_DEU;
 
 	if (_introCount == 1)
 		setupTimedTemp(8, 82, 36, 160, 120, 1);
@@ -740,7 +740,7 @@ void DreamBase::monks2text() {
 		setupTimedTemp(18, 82, 36, 160, 120, 1);
 }
 
-void DreamBase::textForEnd() {
+void DreamWebEngine::textForEnd() {
 	if (_introCount == 20)
 		setupTimedTemp(0, 83, 34, 20, 60, 1);
 	else if (_introCount == (isCD() ? 50 : 65))
@@ -749,14 +749,14 @@ void DreamBase::textForEnd() {
 		setupTimedTemp(2, 83, 34, 20, 60, 1);
 }
 
-void DreamBase::textForMonkHelper(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
+void DreamWebEngine::textForMonkHelper(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
 	if (isCD() && _channel1Playing != 255)
 		_introCount--;
 	else
 		setupTimedTemp(textIndex, voiceIndex, x, y, countToTimed, timeCount);
 }
 
-void DreamBase::textForMonk() {
+void DreamWebEngine::textForMonk() {
 	if (_introCount == 1)
 		textForMonkHelper(19, 82, 68, 154, 120, 1);
 	else if (_introCount == 5)
@@ -792,7 +792,7 @@ void DreamBase::textForMonk() {
 	}
 }
 
-void DreamBase::reelsOnScreen() {
+void DreamWebEngine::reelsOnScreen() {
 	reconstruct();
 	updatePeople();
 	watchReel();
@@ -800,7 +800,7 @@ void DreamBase::reelsOnScreen() {
 	useTimedText();
 }
 
-void DreamBase::reconstruct() {
+void DreamWebEngine::reconstruct() {
 	if (_haveDoneObs == 0)
 		return;
 	_vars._newObs = 1;
@@ -1064,10 +1064,10 @@ static const ReelSound *g_roomByRoom[] = {
 };
 
 
-void DreamBase::soundOnReels(uint16 reelPointer) {
+void DreamWebEngine::soundOnReels(uint16 reelPointer) {
 	const ReelSound *r = g_roomByRoom[_realLocation];
 
-	if (engine->getLanguage() == Common::DE_DEU && r == g_roomSound29)
+	if (getLanguage() == Common::DE_DEU && r == g_roomSound29)
 		r = g_roomSound29_German;
 
 	for (; r->_sample != 255; ++r) {
@@ -1091,7 +1091,7 @@ void DreamBase::soundOnReels(uint16 reelPointer) {
 		_lastSoundReel = (uint16)-1;
 }
 
-void DreamBase::clearBeforeLoad() {
+void DreamWebEngine::clearBeforeLoad() {
 	if (_roomLoaded != 1)
 		return; // noclear
 
@@ -1114,25 +1114,25 @@ void DreamBase::clearBeforeLoad() {
 	_roomLoaded = 0;
 }
 
-void DreamBase::clearReels() {
+void DreamWebEngine::clearReels() {
 	_reel1.clear();
 	_reel2.clear();
 	_reel3.clear();
 }
 
-void DreamBase::getRidOfReels() {
+void DreamWebEngine::getRidOfReels() {
 	if (_roomLoaded)
 		clearReels();
 }
 
-void DreamBase::liftNoise(uint8 index) {
+void DreamWebEngine::liftNoise(uint8 index) {
 	if (_realLocation == 5 || _realLocation == 21)
 		playChannel1(13);	// hiss noise
 	else
 		playChannel1(index);
 }
 
-void DreamBase::checkForExit(Sprite *sprite) {
+void DreamWebEngine::checkForExit(Sprite *sprite) {
 	uint8 flag, flagEx, type, flagX, flagY;
 	checkOne(_ryanX + 12, _ryanY + 12, &flag, &flagEx, &type, &flagX, &flagY);
 	_lastFlag = flag;
@@ -1189,4 +1189,4 @@ void DreamBase::checkForExit(Sprite *sprite) {
 	_vars._needToTravel = 1;
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index defc6850d0..08aa9048b4 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -26,7 +26,7 @@
 #include "common/endian.h"
 #include "common/rect.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
 struct GraphicsFile;
 struct SetObject;
@@ -57,9 +57,7 @@ struct Sprite {
 	uint8  hidden;
 };
 
-class DreamGenContext;
-
-template <class T = DreamGenContext>
+template <class T = DreamWebEngine>
 struct RectWithCallback {
 	uint16 _xMin, _xMax;
 	uint16 _yMin, _yMax;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index b0b4e621c8..6067b20a22 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -23,7 +23,7 @@
 #include "dreamweb/dreamweb.h"
 #include "common/config-manager.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
 // Keyboard buffer. _bufferIn and _bufferOut are indexes
 // into this, making it a ring buffer
@@ -456,8 +456,8 @@ static const Atmosphere g_atmosphereList[] = {
 
 };
 
-void DreamBase::dreamweb() {
-	switch(engine->getLanguage()) {
+void DreamWebEngine::dreamweb() {
+	switch(getLanguage()) {
 	case Common::EN_ANY:
 	case Common::EN_GRB:
 	case Common::EN_USA:
@@ -484,7 +484,7 @@ void DreamBase::dreamweb() {
 	readSetData();
 	_wonGame = false;
 
-	engine->loadSounds(0, "DREAMWEB.V99"); // basic sample
+	loadSounds(0, "DREAMWEB.V99"); // basic sample
 
 	bool firstLoop = true;
 
@@ -672,7 +672,7 @@ done: // The engine will need some cleaner finalization, let's put it here for n
 	_commandText.clear();
 }
 
-void DreamBase::loadTextFile(TextFile &file, const char *fileName)
+void DreamWebEngine::loadTextFile(TextFile &file, const char *fileName)
 {
 	FileHeader header;
 
@@ -689,7 +689,7 @@ void DreamBase::loadTextFile(TextFile &file, const char *fileName)
 	f.read(file._text, sizeInBytes - 2*66);
 }
 
-void DreamBase::screenUpdate() {
+void DreamWebEngine::screenUpdate() {
 	newPlace();
 	mainScreen();
 	if (_quitRequested)
@@ -745,7 +745,7 @@ void DreamBase::screenUpdate() {
 	delPointer();
 }
 
-void DreamBase::startup() {
+void DreamWebEngine::startup() {
 	_currentKey = 0;
 	_mainMode = 0;
 	createPanel();
@@ -760,7 +760,7 @@ void DreamBase::startup() {
 	atmospheres();
 }
 
-void DreamBase::startup1() {
+void DreamWebEngine::startup1() {
 	clearPalette();
 	_vars._throughDoor = 0;
 
@@ -770,15 +770,15 @@ void DreamBase::startup1() {
 	fadeScreenUp();
 }
 
-void DreamBase::switchRyanOn() {
+void DreamWebEngine::switchRyanOn() {
 	_vars._ryanOn = 255;
 }
 
-void DreamBase::switchRyanOff() {
+void DreamWebEngine::switchRyanOff() {
 	_vars._ryanOn = 1;
 }
 
-void DreamBase::loadGraphicsFile(GraphicsFile &file, const char *fileName) {
+void DreamWebEngine::loadGraphicsFile(GraphicsFile &file, const char *fileName) {
 	FileHeader header;
 
 	Common::File f;
@@ -794,40 +794,40 @@ void DreamBase::loadGraphicsFile(GraphicsFile &file, const char *fileName) {
 	f.read(file._data, sizeInBytes - 2080);
 }
 
-void DreamBase::loadGraphicsSegment(GraphicsFile &file, unsigned int len) {
+void DreamWebEngine::loadGraphicsSegment(GraphicsFile &file, unsigned int len) {
 	assert(len >= 2080);
 	delete[] file._data;
 	file._data = new uint8[len - 2080];
-	engine->readFromFile((uint8 *)file._frames, 2080);
-	engine->readFromFile(file._data, len - 2080);
+	readFromFile((uint8 *)file._frames, 2080);
+	readFromFile(file._data, len - 2080);
 }
 
-void DreamBase::loadTextSegment(TextFile &file, unsigned int len) {
+void DreamWebEngine::loadTextSegment(TextFile &file, unsigned int len) {
 	unsigned int headerSize = 2 * file._size;
 	assert(len >= headerSize);
 	delete[] file._text;
 	file._text = new char[len - headerSize];
-	engine->readFromFile((uint8 *)file._offsetsLE, headerSize);
-	engine->readFromFile((uint8 *)file._text, len - headerSize);
+	readFromFile((uint8 *)file._offsetsLE, headerSize);
+	readFromFile((uint8 *)file._text, len - headerSize);
 }
 
-void DreamBase::loadIntoTemp(const char *fileName) {
+void DreamWebEngine::loadIntoTemp(const char *fileName) {
 	loadGraphicsFile(_tempGraphics, fileName);
 }
 
-void DreamBase::loadIntoTemp2(const char *fileName) {
+void DreamWebEngine::loadIntoTemp2(const char *fileName) {
 	loadGraphicsFile(_tempGraphics2, fileName);
 }
 
-void DreamBase::loadIntoTemp3(const char *fileName) {
+void DreamWebEngine::loadIntoTemp3(const char *fileName) {
 	loadGraphicsFile(_tempGraphics3, fileName);
 }
 
-void DreamBase::loadTempCharset(const char *fileName) {
+void DreamWebEngine::loadTempCharset(const char *fileName) {
 	loadGraphicsFile(_tempCharset, fileName);
 }
 
-void DreamBase::hangOnCurs(uint16 frameCount) {
+void DreamWebEngine::hangOnCurs(uint16 frameCount) {
 	for (uint16 i = 0; i < frameCount; ++i) {
 		printCurs();
 		vSync();
@@ -835,35 +835,35 @@ void DreamBase::hangOnCurs(uint16 frameCount) {
 	}
 }
 
-void DreamBase::seeCommandTail() {
+void DreamWebEngine::seeCommandTail() {
 	_brightness = 1;
 }
 
-void DreamBase::quickQuit() {
-	engine->quit();
+void DreamWebEngine::quickQuit() {
+	quit();
 }
 
-void DreamBase::quickQuit2() {
-	engine->quit();
+void DreamWebEngine::quickQuit2() {
+	quit();
 }
 
-void DreamBase::readMouse() {
+void DreamWebEngine::readMouse() {
 	_oldButton = _mouseButton;
 	uint16 state = readMouseState();
 	_mouseButton = state;
 }
 
-uint16 DreamBase::readMouseState() {
+uint16 DreamWebEngine::readMouseState() {
 	_oldX = _mouseX;
 	_oldY = _mouseY;
 	uint16 x, y, state;
-	engine->mouseCall(&x, &y, &state);
+	mouseCall(&x, &y, &state);
 	_mouseX = x;
 	_mouseY = y;
 	return state;
 }
 
-void DreamBase::dumpTextLine() {
+void DreamWebEngine::dumpTextLine() {
 	if (_newTextLine != 1)
 		return;
 	_newTextLine = 0;
@@ -874,21 +874,21 @@ void DreamBase::dumpTextLine() {
 	multiDump(x, y, 228, 13);
 }
 
-void DreamBase::getUnderTimed() {
+void DreamWebEngine::getUnderTimed() {
 	if (_foreignRelease)
 		multiGet(_underTimedText, _timedX, _timedY - 3, 240, kUnderTimedTextSizeY_f);
 	else
 		multiGet(_underTimedText, _timedX, _timedY, 240, kUnderTimedTextSizeY);
 }
 
-void DreamBase::putUnderTimed() {
+void DreamWebEngine::putUnderTimed() {
 	if (_foreignRelease)
 		multiPut(_underTimedText, _timedX, _timedY - 3, 240, kUnderTimedTextSizeY_f);
 	else
 		multiPut(_underTimedText, _timedX, _timedY, 240, kUnderTimedTextSizeY);
 }
 
-void DreamBase::triggerMessage(uint16 index) {
+void DreamWebEngine::triggerMessage(uint16 index) {
 	multiGet(_mapStore, 174, 153, 200, 63);
 	const uint8 *string = (const uint8 *)_puzzleText.getString(index);
 	uint16 y = 156;
@@ -901,7 +901,7 @@ void DreamBase::triggerMessage(uint16 index) {
 	_vars._lastTrigger = 0;
 }
 
-void DreamBase::processTrigger() {
+void DreamWebEngine::processTrigger() {
 	if (_vars._lastTrigger == '1') {
 		setLocation(8);
 		triggerMessage(45);
@@ -914,7 +914,7 @@ void DreamBase::processTrigger() {
 	}
 }
 
-void DreamBase::useTimedText() {
+void DreamWebEngine::useTimedText() {
 	if (_timeCount == 0)
 		return;
 	--_timeCount;
@@ -934,7 +934,7 @@ void DreamBase::useTimedText() {
 	_needToDumpTimed = 1;
 }
 
-void DreamBase::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
+void DreamWebEngine::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
 #if 1 // if cd
 	if (voiceIndex != 0) {
 		if (loadSpeech('T', voiceIndex, 'T', textIndex)) {
@@ -959,7 +959,7 @@ void DreamBase::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8
 	debug(1, "setupTimedTemp: (%d, %d) => '%s'", textIndex, voiceIndex, _timedString);
 }
 
-void DreamBase::dumpTimedText() {
+void DreamWebEngine::dumpTimedText() {
 	const uint16 kUndertimedysize = 30;
 	if (_needToDumpTimed != 1)
 		return;
@@ -971,7 +971,7 @@ void DreamBase::dumpTimedText() {
 	_needToDumpTimed = 0;
 }
 
-void DreamBase::getTime() {
+void DreamWebEngine::getTime() {
 	TimeDate t;
 	g_system->getTimeAndDate(t);
 	debug(1, "\tgettime: %02d:%02d:%02d", t.tm_hour, t.tm_min, t.tm_sec);
@@ -980,21 +980,7 @@ void DreamBase::getTime() {
 	_vars._hourCount = t.tm_hour;
 }
 
-uint16 DreamBase::allocateMem(uint16 paragraphs) {
-	uint size = (paragraphs + 2) * 16;
-	debug(1, "allocate mem, %u bytes", size);
-	SegmentRef seg = allocateSegment(size);
-	uint16 result = (uint16)seg;
-	debug(1, "\tsegment address -> %04x", result);
-	return result;
-}
-
-void DreamBase::deallocateMem(uint16 segment) {
-	debug(1, "deallocating segment %04x", segment);
-	deallocateSegment(segment);
-}
-
-void DreamBase::DOSReturn() {
+void DreamWebEngine::DOSReturn() {
 	if (_commandType != 250) {
 		_commandType = 250;
 		commandOnly(46);
@@ -1002,11 +988,11 @@ void DreamBase::DOSReturn() {
 
 	if (_mouseButton & 1) {
 		_mouseButton = 0;
-		engine->quit();
+		quit();
 	}
 }
 
-void DreamBase::eraseOldObs() {
+void DreamWebEngine::eraseOldObs() {
 	if (_vars._newObs == 0)
 		return;
 
@@ -1024,7 +1010,7 @@ void DreamBase::eraseOldObs() {
 	}
 }
 
-void DreamBase::lockMon() {
+void DreamWebEngine::lockMon() {
 	// Pressing space pauses text output in the monitor. We use the "hard"
 	// key because calling readkey() drains characters from the input
 	// buffer, we we want the user to be able to type ahead while the text
@@ -1037,8 +1023,8 @@ void DreamBase::lockMon() {
 		} while (_currentKey != 0);
 
 		lockLightOn();
-		while (!engine->shouldQuit()) {
-			engine->waitForVSync();
+		while (!shouldQuit()) {
+			waitForVSync();
 			readKey();
 			if (_currentKey == ' ')
 				break;
@@ -1050,14 +1036,14 @@ void DreamBase::lockMon() {
 	}
 }
 
-void DreamBase::clearAndLoad(uint8 *buf, uint8 c,
+void DreamWebEngine::clearAndLoad(uint8 *buf, uint8 c,
                                    unsigned int size, unsigned int maxSize) {
 	assert(size <= maxSize);
 	memset(buf, c, maxSize);
-	engine->readFromFile(buf, size);
+	readFromFile(buf, size);
 }
 
-void DreamBase::startLoading(const Room &room) {
+void DreamWebEngine::startLoading(const Room &room) {
 	_vars._combatCount = 0;
 	_roomsSample = room.roomsSample;
 	_mapX = room.mapX;
@@ -1093,7 +1079,7 @@ void DreamBase::startLoading(const Room &room) {
 	findXYFromPath();
 }
 
-void DreamBase::dealWithSpecial(uint8 firstParam, uint8 secondParam) {
+void DreamWebEngine::dealWithSpecial(uint8 firstParam, uint8 secondParam) {
 	uint8 type = firstParam - 220;
 	if (type == 0) {
 		placeSetObject(secondParam);
@@ -1120,7 +1106,7 @@ void DreamBase::dealWithSpecial(uint8 firstParam, uint8 secondParam) {
 	}
 }
 
-void DreamBase::plotReel(uint16 &reelPointer) {
+void DreamWebEngine::plotReel(uint16 &reelPointer) {
 	Reel *reel = getReelStart(reelPointer);
 	while (reel->x >= 220 && reel->x != 255) {
 		dealWithSpecial(reel->x, reel->y);
@@ -1136,21 +1122,21 @@ void DreamBase::plotReel(uint16 &reelPointer) {
 	soundOnReels(reelPointer);
 }
 
-void DreamBase::delTextLine() {
+void DreamWebEngine::delTextLine() {
 	if (_foreignRelease)
 		multiPut(_textUnder, _textAddressX, _textAddressY - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
 	else
 		multiPut(_textUnder, _textAddressX, _textAddressY, kUnderTextSizeX, kUnderTextSizeY);
 }
 
-void DreamBase::commandOnly(uint8 command) {
+void DreamWebEngine::commandOnly(uint8 command) {
 	delTextLine();
 	const uint8 *string = (const uint8 *)_commandText.getString(command);
 	printDirect(string, _textAddressX, _textAddressY, _textLen, (bool)(_textLen & 1));
 	_newTextLine = 1;
 }
 
-bool DreamBase::checkIfPerson(uint8 x, uint8 y) {
+bool DreamWebEngine::checkIfPerson(uint8 x, uint8 y) {
 	Common::List<People>::iterator i;
 	for (i = _peopleList.begin(); i != _peopleList.end(); ++i) {
 		People &people = *i;
@@ -1177,7 +1163,7 @@ bool DreamBase::checkIfPerson(uint8 x, uint8 y) {
 	return false;
 }
 
-bool DreamBase::checkIfFree(uint8 x, uint8 y) {
+bool DreamWebEngine::checkIfFree(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _freeList.reverse_begin(); i != _freeList.end(); --i) {
 		const ObjPos &pos = *i;
@@ -1190,7 +1176,7 @@ bool DreamBase::checkIfFree(uint8 x, uint8 y) {
 	return false;
 }
 
-bool DreamBase::checkIfEx(uint8 x, uint8 y) {
+bool DreamWebEngine::checkIfEx(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _exList.reverse_begin(); i != _exList.end(); --i) {
 		const ObjPos &pos = *i;
@@ -1203,7 +1189,7 @@ bool DreamBase::checkIfEx(uint8 x, uint8 y) {
 	return false;
 }
 
-const uint8 *DreamBase::findObName(uint8 type, uint8 index) {
+const uint8 *DreamWebEngine::findObName(uint8 type, uint8 index) {
 	if (type == 5) {
 		uint16 i = 64 * (index & 127);
 		return (const uint8 *)_personText.getString(i);
@@ -1218,7 +1204,7 @@ const uint8 *DreamBase::findObName(uint8 type, uint8 index) {
 	}
 }
 
-void DreamBase::copyName(uint8 type, uint8 index, uint8 *dst) {
+void DreamWebEngine::copyName(uint8 type, uint8 index, uint8 *dst) {
 	const uint8 *src = findObName(type, index);
 	size_t i;
 	for (i = 0; i < 28; ++i) {
@@ -1232,7 +1218,7 @@ void DreamBase::copyName(uint8 type, uint8 index, uint8 *dst) {
 	dst[i] = 0;
 }
 
-void DreamBase::commandWithOb(uint8 command, uint8 type, uint8 index) {
+void DreamWebEngine::commandWithOb(uint8 command, uint8 type, uint8 index) {
 	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
 	delTextLine();
 	uint8 textLen = _textLen;
@@ -1248,23 +1234,23 @@ void DreamBase::commandWithOb(uint8 command, uint8 type, uint8 index) {
 	_newTextLine = 1;
 }
 
-void DreamBase::examineObText() {
+void DreamWebEngine::examineObText() {
 	commandWithOb(1, _commandType, _command);
 }
 
-void DreamBase::blockNameText() {
+void DreamWebEngine::blockNameText() {
 	commandWithOb(0, _commandType, _command);
 }
 
-void DreamBase::personNameText() {
+void DreamWebEngine::personNameText() {
 	commandWithOb(2, _commandType, _command & 127);
 }
 
-void DreamBase::walkToText() {
+void DreamWebEngine::walkToText() {
 	commandWithOb(3, _commandType, _command);
 }
 
-void DreamBase::findOrMake(uint8 index, uint8 value, uint8 type) {
+void DreamWebEngine::findOrMake(uint8 index, uint8 value, uint8 type) {
 	Change *change = _listOfChanges;
 	for (; change->index != 0xff; ++change) {
 		if (index == change->index && _realLocation == change->location && type == change->type) {
@@ -1279,29 +1265,29 @@ void DreamBase::findOrMake(uint8 index, uint8 value, uint8 type) {
 	change->type = type;
 }
 
-void DreamBase::setAllChanges() {
+void DreamWebEngine::setAllChanges() {
 	Change *change = _listOfChanges;
 	for (; change->index != 0xff; ++change)
 		if (change->location == _realLocation)
 			doChange(change->index, change->value, change->type);
 }
 
-DynObject *DreamBase::getFreeAd(uint8 index) {
+DynObject *DreamWebEngine::getFreeAd(uint8 index) {
 	return &_freeDat[index];
 }
 
-DynObject *DreamBase::getExAd(uint8 index) {
+DynObject *DreamWebEngine::getExAd(uint8 index) {
 	return &_exData[index];
 }
 
-DynObject *DreamBase::getEitherAdCPP() {
+DynObject *DreamWebEngine::getEitherAdCPP() {
 	if (_objectType == kExObjectType)
 		return getExAd(_itemFrame);
 	else
 		return getFreeAd(_itemFrame);
 }
 
-void *DreamBase::getAnyAd(uint8 *slotSize, uint8 *slotCount) {
+void *DreamWebEngine::getAnyAd(uint8 *slotSize, uint8 *slotCount) {
 	if (_objectType == kExObjectType) {
 		DynObject *exObject = getExAd(_command);
 		*slotSize = exObject->slotSize;
@@ -1324,7 +1310,7 @@ void *DreamBase::getAnyAd(uint8 *slotSize, uint8 *slotCount) {
 	}
 }
 
-void *DreamBase::getAnyAdDir(uint8 index, uint8 flag) {
+void *DreamWebEngine::getAnyAdDir(uint8 index, uint8 flag) {
 	if (flag == 4)
 		return getExAd(index);
 	else if (flag == 2)
@@ -1333,11 +1319,11 @@ void *DreamBase::getAnyAdDir(uint8 index, uint8 flag) {
 		return getSetAd(index);
 }
 
-SetObject *DreamBase::getSetAd(uint8 index) {
+SetObject *DreamWebEngine::getSetAd(uint8 index) {
 	return &_setDat[index];
 }
 
-void DreamBase::doChange(uint8 index, uint8 value, uint8 type) {
+void DreamWebEngine::doChange(uint8 index, uint8 value, uint8 type) {
 	if (type == 0) { //object
 		getSetAd(index)->mapad[0] = value;
 	} else if (type == 1) { //freeObject
@@ -1349,7 +1335,7 @@ void DreamBase::doChange(uint8 index, uint8 value, uint8 type) {
 	}
 }
 
-void DreamBase::deleteTaken() {
+void DreamWebEngine::deleteTaken() {
 	for (size_t i = 0; i < kNumexobjects; ++i) {
 		uint8 location = _exData[i].initialLocation;
 		if (location == _realLocation) {
@@ -1359,7 +1345,7 @@ void DreamBase::deleteTaken() {
 	}
 }
 
-uint8 DreamBase::getExPos() {
+uint8 DreamWebEngine::getExPos() {
 	DynObject *objects = _exData;
 	for (size_t i = 0; i < kNumexobjects; ++i) {
 		if (objects[i].mapad[0] == 0xff)
@@ -1368,27 +1354,27 @@ uint8 DreamBase::getExPos() {
 	error("Out of Ex object positions");
 }
 
-void DreamBase::placeSetObject(uint8 index) {
+void DreamWebEngine::placeSetObject(uint8 index) {
 	findOrMake(index, 0, 0);
 	getSetAd(index)->mapad[0] = 0;
 }
 
-void DreamBase::removeSetObject(uint8 index) {
+void DreamWebEngine::removeSetObject(uint8 index) {
 	findOrMake(index, 0xff, 0);
 	getSetAd(index)->mapad[0] = 0xff;
 }
 
-bool DreamBase::finishedWalking() {
+bool DreamWebEngine::finishedWalking() {
 	return (_linePointer == 254) && (_facing == _turnToFace);
 }
 
-void DreamBase::getFlagUnderP(uint8 *flag, uint8 *flagEx) {
+void DreamWebEngine::getFlagUnderP(uint8 *flag, uint8 *flagEx) {
 	uint8 type, flagX, flagY;
 	checkOne(_mouseX - _mapAdX, _mouseY - _mapAdY, flag, flagEx, &type, &flagX, &flagY);
 	_lastFlag = *flag;
 }
 
-void DreamBase::walkAndExamine() {
+void DreamWebEngine::walkAndExamine() {
 	if (!finishedWalking())
 		return;
 	_commandType = _walkExamType;
@@ -1398,7 +1384,7 @@ void DreamBase::walkAndExamine() {
 		examineOb();
 }
 
-void DreamBase::obName(uint8 command, uint8 commandType) {
+void DreamWebEngine::obName(uint8 command, uint8 commandType) {
 	if (_reAssesChanges == 0) {
 		if ((commandType == _commandType) && (command == _command)) {
 			if (_walkAndExam == 1) {
@@ -1470,7 +1456,7 @@ void DreamBase::obName(uint8 command, uint8 commandType) {
 	}
 }
 
-void DreamBase::delPointer() {
+void DreamWebEngine::delPointer() {
 	if (_oldPointerX == 0xffff)
 		return;
 	_delHereX = _oldPointerX;
@@ -1480,7 +1466,7 @@ void DreamBase::delPointer() {
 	multiPut(_pointerBack, _delHereX, _delHereY, _pointerXS, _pointerYS);
 }
 
-void DreamBase::showBlink() {
+void DreamWebEngine::showBlink() {
 	if (_manIsOffScreen == 1)
 		return;
 	++_blinkCount;
@@ -1501,7 +1487,7 @@ void DreamBase::showBlink() {
 	showFrame(_icons1, 44, 32, blinkTab[blinkFrame], 0, &width, &height);
 }
 
-void DreamBase::dumpBlink() {
+void DreamWebEngine::dumpBlink() {
 	if (_vars._shadesOn != 0)
 		return;
 	if (_blinkCount != 0)
@@ -1511,14 +1497,14 @@ void DreamBase::dumpBlink() {
 	multiDump(44, 32, 16, 12);
 }
 
-void DreamBase::dumpPointer() {
+void DreamWebEngine::dumpPointer() {
 	dumpBlink();
 	multiDump(_delHereX, _delHereY, _delXS, _delYS);
 	if ((_oldPointerX != _delHereX) || (_oldPointerY != _delHereY))
 		multiDump(_oldPointerX, _oldPointerY, _pointerXS, _pointerYS);
 }
 
-void DreamBase::showPointer() {
+void DreamWebEngine::showPointer() {
 	showBlink();
 	uint16 x = _mouseX;
 	_oldPointerX = _mouseX;
@@ -1562,7 +1548,7 @@ void DreamBase::showPointer() {
 	}
 }
 
-void DreamBase::animPointer() {
+void DreamWebEngine::animPointer() {
 
 	if (_pointerMode == 2) {
 		_pointerFrame = 0;
@@ -1616,12 +1602,12 @@ void DreamBase::animPointer() {
 	_pointerFrame = 8;
 }
 
-void DreamBase::printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered) {
+void DreamWebEngine::printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered) {
 	const uint8 *string = (const uint8 *)_commandText.getString(index);
 	printDirect(string, x, y, maxWidth, centered);
 }
 
-void DreamBase::printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count) {
+void DreamWebEngine::printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count) {
 	const uint8 *string = (const uint8 *)_commandText.getString(index);
 	while (count--) {
 		findNextColon(&string);
@@ -1629,7 +1615,7 @@ void DreamBase::printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, b
 	printDirect(string, x, y, maxWidth, centered);
 }
 
-bool DreamBase::objectMatches(void *object, const char *id) {
+bool DreamWebEngine::objectMatches(void *object, const char *id) {
 	const char *objId = (const char *)object + 12; // whether it is a DynObject or a SetObject
 	for (size_t i = 0; i < 4; ++i) {
 		if (id[i] != objId[i] + 'A')
@@ -1638,11 +1624,11 @@ bool DreamBase::objectMatches(void *object, const char *id) {
 	return true;
 }
 
-bool DreamBase::compare(uint8 index, uint8 flag, const char id[4]) {
+bool DreamWebEngine::compare(uint8 index, uint8 flag, const char id[4]) {
 	return objectMatches(getAnyAdDir(index, flag), id);
 }
 
-uint16 DreamBase::findSetObject(const char *id) {
+uint16 DreamWebEngine::findSetObject(const char *id) {
 	for (uint16 index = 0; index < 128; index++) {
 		if (objectMatches(getSetAd(index), id))
 			return index;
@@ -1651,7 +1637,7 @@ uint16 DreamBase::findSetObject(const char *id) {
 	return 128;
 }
 
-uint16 DreamBase::findExObject(const char *id) {
+uint16 DreamWebEngine::findExObject(const char *id) {
 	for (uint16 index = 0; index < kNumexobjects; index++) {
 		if (objectMatches(getExAd(index), id))
 			return index;
@@ -1660,7 +1646,7 @@ uint16 DreamBase::findExObject(const char *id) {
 	return kNumexobjects;
 }
 
-bool DreamBase::isRyanHolding(const char *id) {
+bool DreamWebEngine::isRyanHolding(const char *id) {
 	for (uint16 index = 0; index < kNumexobjects; index++) {
 		DynObject *object = getExAd(index);
 		if (object->mapad[0] == 4 && objectMatches(object, id))
@@ -1670,12 +1656,12 @@ bool DreamBase::isRyanHolding(const char *id) {
 	return false;
 }
 
-bool DreamBase::isItDescribed(const ObjPos *pos) {
+bool DreamWebEngine::isItDescribed(const ObjPos *pos) {
 	const char *string = _setDesc.getString(pos->index);
 	return string[0] != 0;
 }
 
-bool DreamBase::isCD() {
+bool DreamWebEngine::isCD() {
 	// The original sources has two codepaths depending if the game is 'if cd' or not
 	// This is a hack to guess which version to use with the assumption that if we have a cd version
 	// we managed to load the speech. At least it is isolated in this function and can be changed.
@@ -1683,7 +1669,7 @@ bool DreamBase::isCD() {
 	return (_speechLoaded);
 }
 
-void DreamBase::showIcon() {
+void DreamWebEngine::showIcon() {
 	if (_realLocation < 50) {
 		showPanel();
 		showMan();
@@ -1711,7 +1697,7 @@ void DreamBase::showIcon() {
 	}
 }
 
-bool DreamBase::checkIfSet(uint8 x, uint8 y) {
+bool DreamWebEngine::checkIfSet(uint8 x, uint8 y) {
 	Common::List<ObjPos>::const_iterator i;
 	for (i = _setList.reverse_begin(); i != _setList.end(); --i) {
 		const ObjPos &pos = *i;
@@ -1728,7 +1714,7 @@ bool DreamBase::checkIfSet(uint8 x, uint8 y) {
 	return false;
 }
 
-void DreamBase::hangOn(uint16 frameCount) {
+void DreamWebEngine::hangOn(uint16 frameCount) {
 	while (frameCount) {
 		vSync();
 		--frameCount;
@@ -1737,7 +1723,7 @@ void DreamBase::hangOn(uint16 frameCount) {
 	}
 }
 
-void DreamBase::hangOnW(uint16 frameCount) {
+void DreamWebEngine::hangOnW(uint16 frameCount) {
 	while (frameCount) {
 		delPointer();
 		readMouse();
@@ -1751,7 +1737,7 @@ void DreamBase::hangOnW(uint16 frameCount) {
 	}
 }
 
-void DreamBase::hangOnP(uint16 count) {
+void DreamWebEngine::hangOnP(uint16 count) {
 	_mainTimer = 0;
 	uint8 pointerFrame = _pointerFrame;
 	uint8 pickup = _pickUp;
@@ -1784,7 +1770,7 @@ void DreamBase::hangOnP(uint16 count) {
 	_pointerMode = 0;
 }
 
-uint8 DreamBase::findNextColon(const uint8 **string) {
+uint8 DreamWebEngine::findNextColon(const uint8 **string) {
 	uint8 c;
 	do {
 		c = **string;
@@ -1793,7 +1779,7 @@ uint8 DreamBase::findNextColon(const uint8 **string) {
 	return c;
 }
 
-void DreamBase::enterSymbol() {
+void DreamWebEngine::enterSymbol() {
 	_manIsOffScreen = 1;
 	getRidOfReels();
 	loadIntoTemp("DREAMWEB.G12"); // symbol graphics
@@ -1817,13 +1803,13 @@ void DreamBase::enterSymbol() {
 		dumpPointer();
 		dumpTextLine();
 		dumpSymbol();
-		RectWithCallback<DreamBase> symbolList[] = {
-			{ kSymbolx+40,kSymbolx+64,kSymboly+2,kSymboly+16,&DreamBase::quitSymbol },
-			{ kSymbolx,kSymbolx+52,kSymboly+20,kSymboly+50,&DreamBase::setTopLeft },
-			{ kSymbolx+52,kSymbolx+104,kSymboly+20,kSymboly+50,&DreamBase::setTopRight },
-			{ kSymbolx,kSymbolx+52,kSymboly+50,kSymboly+80,&DreamBase::setBotLeft },
-			{ kSymbolx+52,kSymbolx+104,kSymboly+50,kSymboly+80,&DreamBase::setBotRight },
-			{ 0,320,0,200,&DreamBase::blank },
+		RectWithCallback<DreamWebEngine> symbolList[] = {
+			{ kSymbolx+40,kSymbolx+64,kSymboly+2,kSymboly+16,&DreamWebEngine::quitSymbol },
+			{ kSymbolx,kSymbolx+52,kSymboly+20,kSymboly+50,&DreamWebEngine::setTopLeft },
+			{ kSymbolx+52,kSymbolx+104,kSymboly+20,kSymboly+50,&DreamWebEngine::setTopRight },
+			{ kSymbolx,kSymbolx+52,kSymboly+50,kSymboly+80,&DreamWebEngine::setBotLeft },
+			{ kSymbolx+52,kSymbolx+104,kSymboly+50,kSymboly+80,&DreamWebEngine::setBotRight },
+			{ 0,320,0,200,&DreamWebEngine::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(symbolList);
@@ -1850,7 +1836,7 @@ void DreamBase::enterSymbol() {
 	}
 }
 
-void DreamBase::zoomOnOff() {
+void DreamWebEngine::zoomOnOff() {
 	if (_vars._watchingTime != 0 || _pointerMode == 2) {
 		blank();
 		return;
@@ -1878,7 +1864,7 @@ void DreamBase::zoomOnOff() {
 	workToScreenM();
 }
 
-void DreamBase::sortOutMap() {
+void DreamWebEngine::sortOutMap() {
 	const uint8 *src = workspace();
 	uint8 *dst = _mapData;
 	for (uint16 y = 0; y < kMapHeight; ++y) {
@@ -1888,27 +1874,27 @@ void DreamBase::sortOutMap() {
 	}
 }
 
-void DreamBase::mainScreen() {
+void DreamWebEngine::mainScreen() {
 	_inMapArea = 0;
 	if (_vars._watchOn == 1) {
-		RectWithCallback<DreamBase> mainList[] = {
-			{ 44,70,32,46,&DreamBase::look },
-			{ 0,50,0,180,&DreamBase::inventory },
-			{ 226,244,10,26,&DreamBase::zoomOnOff },
-			{ 226,244,26,40,&DreamBase::saveLoad },
-			{ 240,260,100,124,&DreamBase::madmanRun },
-			{ 0,320,0,200,&DreamBase::identifyOb },
+		RectWithCallback<DreamWebEngine> mainList[] = {
+			{ 44,70,32,46,&DreamWebEngine::look },
+			{ 0,50,0,180,&DreamWebEngine::inventory },
+			{ 226,244,10,26,&DreamWebEngine::zoomOnOff },
+			{ 226,244,26,40,&DreamWebEngine::saveLoad },
+			{ 240,260,100,124,&DreamWebEngine::madmanRun },
+			{ 0,320,0,200,&DreamWebEngine::identifyOb },
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(mainList);
 	} else {
-		RectWithCallback<DreamBase> mainList2[] = {
-			{ 44,70,32,46,&DreamBase::look },
-			{ 0,50,0,180,&DreamBase::inventory },
-			{ 226+48,244+48,10,26,&DreamBase::zoomOnOff },
-			{ 226+48,244+48,26,40,&DreamBase::saveLoad },
-			{ 240,260,100,124,&DreamBase::madmanRun },
-			{ 0,320,0,200,&DreamBase::identifyOb },
+		RectWithCallback<DreamWebEngine> mainList2[] = {
+			{ 44,70,32,46,&DreamWebEngine::look },
+			{ 0,50,0,180,&DreamWebEngine::inventory },
+			{ 226+48,244+48,10,26,&DreamWebEngine::zoomOnOff },
+			{ 226+48,244+48,26,40,&DreamWebEngine::saveLoad },
+			{ 240,260,100,124,&DreamWebEngine::madmanRun },
+			{ 0,320,0,200,&DreamWebEngine::identifyOb },
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(mainList2);
@@ -1918,21 +1904,21 @@ void DreamBase::mainScreen() {
 		walkAndExamine();
 }
 
-void DreamBase::showWatch() {
+void DreamWebEngine::showWatch() {
 	if (_vars._watchOn) {
 		showFrame(_icons1, 250, 1, 6, 0);
 		showTime();
 	}
 }
 
-void DreamBase::dumpWatch() {
+void DreamWebEngine::dumpWatch() {
 	if (_watchDump != 1)
 		return;
 	multiDump(256, 21, 40, 12);
 	_watchDump = 0;
 }
 
-void DreamBase::showTime() {
+void DreamWebEngine::showTime() {
 	if (_vars._watchOn == 0)
 		return;
 
@@ -1952,7 +1938,7 @@ void DreamBase::showTime() {
 	showFrame(_charset1, 267+5, 21, 91*3+20, 0);
 }
 
-void DreamBase::watchCount() {
+void DreamWebEngine::watchCount() {
 	if (_vars._watchOn == 0)
 		return;
 	++_timerCount;
@@ -1977,7 +1963,7 @@ void DreamBase::watchCount() {
 	}
 }
 
-void DreamBase::roomName() {
+void DreamWebEngine::roomName() {
 	printMessage(88, 18, 53, 240, false);
 	uint16 textIndex = _roomNum;
 	if (textIndex >= 32)
@@ -1990,7 +1976,7 @@ void DreamBase::roomName() {
 	useCharset1();
 }
 
-void DreamBase::loadRoom() {
+void DreamWebEngine::loadRoom() {
 	_roomLoaded = 1;
 	_timeCount = 0;
 	_mainTimer = 0;
@@ -2011,7 +1997,7 @@ void DreamBase::loadRoom() {
 	getDimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
 }
 
-void DreamBase::readSetData() {
+void DreamWebEngine::readSetData() {
 	loadGraphicsFile(_charset1, "DREAMWEB.C00");
 	loadGraphicsFile(_icons1, "DREAMWEB.G00");
 	loadGraphicsFile(_icons2, "DREAMWEB.G01");
@@ -2021,20 +2007,20 @@ void DreamBase::readSetData() {
 	useCharset1();
 
 	// FIXME: Why is this commented out?
-	//engine->openFile("DREAMWEB.VOL");
+	//openFile("DREAMWEB.VOL");
 	//uint8 *volumeTab = getSegment(data.word(kSoundbuffer)).ptr(16384, 0);
-	//engine->readFromFile(volumeTab, 2048-256);
-	//engine->closeFile();
+	//readFromFile(volumeTab, 2048-256);
+	//closeFile();
 }
 
-void DreamBase::findRoomInLoc() {
+void DreamWebEngine::findRoomInLoc() {
 	uint8 x = _mapX / 11;
 	uint8 y = _mapY / 10;
 	uint8 roomNum = y * 6 + x;
 	_roomNum = roomNum;
 }
 
-void DreamBase::autoLook() {
+void DreamWebEngine::autoLook() {
 	if ((_mouseX != _oldX) || (_mouseY != _oldY)) {
 		_lookCounter = 1000;
 		return;
@@ -2048,7 +2034,7 @@ void DreamBase::autoLook() {
 	doLook();
 }
 
-void DreamBase::look() {
+void DreamWebEngine::look() {
 	if (_vars._watchingTime || (_pointerMode == 2)) {
 		blank();
 		return;
@@ -2061,7 +2047,7 @@ void DreamBase::look() {
 		doLook();
 }
 
-void DreamBase::doLook() {
+void DreamWebEngine::doLook() {
 	createPanel();
 	showIcon();
 	underTextLine();
@@ -2085,35 +2071,35 @@ void DreamBase::doLook() {
 	workToScreenM();
 }
 
-void DreamBase::useCharset1() {
+void DreamWebEngine::useCharset1() {
 	_currentCharset = &_charset1;
 }
 
-void DreamBase::useTempCharset() {
+void DreamWebEngine::useTempCharset() {
 	_currentCharset = &_tempCharset;
 }
 
-void DreamBase::getRidOfTemp() {
+void DreamWebEngine::getRidOfTemp() {
 	_tempGraphics.clear();
 }
 
-void DreamBase::getRidOfTempText() {
+void DreamWebEngine::getRidOfTempText() {
 	_textFile1.clear();
 }
 
-void DreamBase::getRidOfTemp2() {
+void DreamWebEngine::getRidOfTemp2() {
 	_tempGraphics2.clear();
 }
 
-void DreamBase::getRidOfTemp3() {
+void DreamWebEngine::getRidOfTemp3() {
 	_tempGraphics3.clear();
 }
 
-void DreamBase::getRidOfTempCharset() {
+void DreamWebEngine::getRidOfTempCharset() {
 	_tempCharset.clear();
 }
 
-void DreamBase::getRidOfAll() {
+void DreamWebEngine::getRidOfAll() {
 	delete[] _backdropBlocks;
 	_backdropBlocks = 0;
 
@@ -2132,14 +2118,14 @@ void DreamBase::getRidOfAll() {
 }
 
 // if skipDat, skip clearing and loading Setdat and Freedat
-void DreamBase::loadRoomData(const Room &room, bool skipDat) {
+void DreamWebEngine::loadRoomData(const Room &room, bool skipDat) {
 	const uint16 kSetdatlen = 64*128;
 	const uint16 kFreedatlen = 16*80;
 
-	engine->openFile(room.name);
+	openFile(room.name);
 
 	FileHeader header;
-	engine->readFromFile((uint8 *)&header, sizeof(FileHeader));
+	readFromFile((uint8 *)&header, sizeof(FileHeader));
 
 	// read segment lengths from room file header
 	int len[15];
@@ -2148,8 +2134,8 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 
 	assert(len[0] >= 192);
 	_backdropBlocks = new uint8[len[0] - 192];
-	engine->readFromFile((uint8 *)_backdropFlags, 192);
-	engine->readFromFile(_backdropBlocks, len[0] - 192);
+	readFromFile((uint8 *)_backdropFlags, 192);
+	readFromFile(_backdropBlocks, len[0] - 192);
 
 	clearAndLoad(workspace(), 0, len[1], 132*66); // 132*66 = maplen
 	sortOutMap();
@@ -2158,7 +2144,7 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	if (!skipDat)
 		clearAndLoad((uint8 *)_setDat, 255, len[3], kSetdatlen);
 	else
-		engine->skipBytes(len[3]);
+		skipBytes(len[3]);
 	// NB: The skipDat version of this function as called by restoreall
 	// had a 'call bloc' instead of 'call loadseg' for reel1,
 	// but 'bloc' was not defined.
@@ -2167,15 +2153,15 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	loadGraphicsSegment(_reel3, len[6]);
 
 	// segment 7 consists of 36*38 pathNodes followed by 'reelList'
-	engine->readFromFile((uint8 *)_pathData, 36*sizeof(RoomPaths));
+	readFromFile((uint8 *)_pathData, 36*sizeof(RoomPaths));
 	unsigned int reelLen = len[7] - 36*sizeof(RoomPaths);
 	unsigned int reelCount = (reelLen + sizeof(Reel) - 1) / sizeof(Reel);
 	delete[] _reelList;
 	_reelList = new Reel[reelCount];
-	engine->readFromFile((uint8 *)_reelList, reelLen);
+	readFromFile((uint8 *)_reelList, reelLen);
 
 	// segment 8 consists of 12 personFrames followed by a TextFile
-	engine->readFromFile((uint8 *)_personFramesLE, 24);
+	readFromFile((uint8 *)_personFramesLE, 24);
 	loadTextSegment(_personText, len[8] - 24);
 
 	loadTextSegment(_setDesc, len[9]);
@@ -2185,46 +2171,46 @@ void DreamBase::loadRoomData(const Room &room, bool skipDat) {
 	if (!skipDat)
 		clearAndLoad((uint8 *)_freeDat, 255, len[13], kFreedatlen);
 	else
-		engine->skipBytes(len[13]);
+		skipBytes(len[13]);
 	loadTextSegment(_freeDesc, len[14]);
 
-	engine->closeFile();
+	closeFile();
 }
 
-void DreamBase::restoreAll() {
+void DreamWebEngine::restoreAll() {
 	const Room &room = g_roomData[_vars._location];
 	loadRoomData(room, true);
 	setAllChanges();
 }
 
-void DreamBase::restoreReels() {
+void DreamWebEngine::restoreReels() {
 	if (_roomLoaded == 0)
 		return;
 
 	const Room &room = g_roomData[_realLocation];
 
-	engine->openFile(room.name);
+	openFile(room.name);
 
 	FileHeader header;
-	engine->readFromFile((uint8 *)&header, sizeof(FileHeader));
+	readFromFile((uint8 *)&header, sizeof(FileHeader));
 
 	// read segment lengths from room file header
 	int len[15];
 	for (int i = 0; i < 15; ++i)
 		len[i] = header.len(i);
 
-	engine->skipBytes(len[0]);
-	engine->skipBytes(len[1]);
-	engine->skipBytes(len[2]);
-	engine->skipBytes(len[3]);
+	skipBytes(len[0]);
+	skipBytes(len[1]);
+	skipBytes(len[2]);
+	skipBytes(len[3]);
 	loadGraphicsSegment(_reel1, len[4]);
 	loadGraphicsSegment(_reel2, len[5]);
 	loadGraphicsSegment(_reel3, len[6]);
 
-	engine->closeFile();
+	closeFile();
 }
 
-void DreamBase::loadFolder() {
+void DreamWebEngine::loadFolder() {
 	loadIntoTemp("DREAMWEB.G09"); // folder graphics 1
 	loadIntoTemp2("DREAMWEB.G10"); // folder graphics 2
 	loadIntoTemp3("DREAMWEB.G11"); // folder graphics 3
@@ -2232,7 +2218,7 @@ void DreamBase::loadFolder() {
 	loadTempText("DREAMWEB.T50"); // folder text
 }
 
-void DreamBase::showFolder() {
+void DreamWebEngine::showFolder() {
 	_commandType = 255;
 	if (_folderPage) {
 		useTempCharset();
@@ -2257,7 +2243,7 @@ void DreamBase::showFolder() {
 	}
 }
 
-void DreamBase::showLeftPage() {
+void DreamWebEngine::showLeftPage() {
 	showFrame(_tempGraphics2, 0, 12, 3, 0);
 	uint16 y = 12+5;
 	for (size_t i = 0; i < 9; ++i) {
@@ -2290,7 +2276,7 @@ void DreamBase::showLeftPage() {
 	}
 }
 
-void DreamBase::showRightPage() {
+void DreamWebEngine::showRightPage() {
 	showFrame(_tempGraphics2, 143, 12, 0, 0);
 	uint16 y = 12+37;
 	for (size_t i = 0; i < 7; ++i) {
@@ -2315,18 +2301,18 @@ void DreamBase::showRightPage() {
 	_lineSpacing = 10;
 }
 
-void DreamBase::showExit() {
+void DreamWebEngine::showExit() {
 	showFrame(_icons1, 274, 154, 11, 0);
 }
 
-void DreamBase::showMan() {
+void DreamWebEngine::showMan() {
 	showFrame(_icons1, 0, 0, 0, 0);
 	showFrame(_icons1, 0, 114, 1, 0);
 	if (_vars._shadesOn)
 		showFrame(_icons1, 28, 25, 2, 0);
 }
 
-void DreamBase::panelIcons1() {
+void DreamWebEngine::panelIcons1() {
 	uint16 x;
 	if (_vars._watchOn != 1)
 		x = 48;
@@ -2338,26 +2324,26 @@ void DreamBase::panelIcons1() {
 	showWatch();
 }
 
-void DreamBase::examIcon() {
+void DreamWebEngine::examIcon() {
 	showFrame(_icons2, 254, 5, 3, 0);
 }
 
-const uint8 *DreamBase::getTextInFile1(uint16 index) {
+const uint8 *DreamWebEngine::getTextInFile1(uint16 index) {
 	return (const uint8 *)_textFile1.getString(index);
 }
 
-void DreamBase::checkFolderCoords() {
-	RectWithCallback<DreamBase> folderList[] = {
-		{ 280,320,160,200, &DreamBase::quitKey },
-		{ 143,300,6,194, &DreamBase::nextFolder },
-		{ 0,143,6,194, &DreamBase::lastFolder },
-		{ 0,320,0,200, &DreamBase::blank },
+void DreamWebEngine::checkFolderCoords() {
+	RectWithCallback<DreamWebEngine> folderList[] = {
+		{ 280,320,160,200, &DreamWebEngine::quitKey },
+		{ 143,300,6,194, &DreamWebEngine::nextFolder },
+		{ 0,143,6,194, &DreamWebEngine::lastFolder },
+		{ 0,320,0,200, &DreamWebEngine::blank },
 		{ 0xFFFF,0,0,0, 0 }
 	};
 	checkCoords(folderList);
 }
 
-void DreamBase::nextFolder() {
+void DreamWebEngine::nextFolder() {
 	if (_folderPage == 12) {
 		blank();
 		return;
@@ -2377,7 +2363,7 @@ void DreamBase::nextFolder() {
 	}
 }
 
-void DreamBase::lastFolder() {
+void DreamWebEngine::lastFolder() {
 	if (_folderPage == 0) {
 		blank();
 		return;
@@ -2397,7 +2383,7 @@ void DreamBase::lastFolder() {
 	}
 }
 
-void DreamBase::folderHints() {
+void DreamWebEngine::folderHints() {
 	if (_folderPage == 5) {
 		if ((_vars._aideDead != 1) && (getLocation(13) != 1)) {
 			setLocation(13);
@@ -2419,19 +2405,19 @@ void DreamBase::folderHints() {
 	}
 }
 
-void DreamBase::folderExit() {
+void DreamWebEngine::folderExit() {
 	showFrame(_tempGraphics2, 296, 178, 6, 0);
 }
 
-void DreamBase::loadTravelText() {
+void DreamWebEngine::loadTravelText() {
 	loadTextFile(_travelText, "DREAMWEB.T81"); // location descs
 }
 
-void DreamBase::loadTempText(const char *fileName) {
+void DreamWebEngine::loadTempText(const char *fileName) {
 	loadTextFile(_textFile1, fileName);
 }
 
-void DreamBase::drawFloor() {
+void DreamWebEngine::drawFloor() {
 	eraseOldObs();
 	drawFlags();
 	calcMapAd();
@@ -2444,14 +2430,14 @@ void DreamBase::drawFloor() {
 	_vars._newObs = 0;
 }
 
-void DreamBase::allocateBuffers() {
+void DreamWebEngine::allocateBuffers() {
 	_exFrames.clear();
 	_exFrames._data = new uint8[kExframeslen];
 	_exText.clear();
 	_exText._text = new char[kExtextlen];
 }
 
-void DreamBase::workToScreenM() {
+void DreamWebEngine::workToScreenM() {
 	animPointer();
 	readMouse();
 	showPointer();
@@ -2460,23 +2446,23 @@ void DreamBase::workToScreenM() {
 	delPointer();
 }
 
-void DreamBase::loadMenu() {
+void DreamWebEngine::loadMenu() {
 	loadIntoTemp("DREAMWEB.S02"); // sprite name 3
 	loadIntoTemp2("DREAMWEB.G07"); // mon. graphics 2
 }
 
-void DreamBase::showMenu() {
+void DreamWebEngine::showMenu() {
 	++_menuCount;
 	if (_menuCount == 37*2)
 		_menuCount = 0;
 	showFrame(_tempGraphics, kMenux, kMenuy, _menuCount / 2, 0);
 }
 
-void DreamBase::dumpMenu() {
+void DreamWebEngine::dumpMenu() {
 	multiDump(kMenux, kMenuy, 48, 48);
 }
 
-void DreamBase::useMenu() {
+void DreamWebEngine::useMenu() {
 	getRidOfReels();
 	loadMenu();
 	createPanel();
@@ -2500,9 +2486,9 @@ void DreamBase::useMenu() {
 		dumpPointer();
 		dumpMenu();
 		dumpTextLine();
-		RectWithCallback<DreamBase> menuList[] = {
-			{ kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamBase::quitKey },
-			{ 0,320,0,200,&DreamBase::blank },
+		RectWithCallback<DreamWebEngine> menuList[] = {
+			{ kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamWebEngine::quitKey },
+			{ 0,320,0,200,&DreamWebEngine::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
 		checkCoords(menuList);
@@ -2515,7 +2501,7 @@ void DreamBase::useMenu() {
 	workToScreenM();
 }
 
-void DreamBase::atmospheres() {
+void DreamWebEngine::atmospheres() {
 
 	const Atmosphere *a = &g_atmosphereList[0];
 
@@ -2577,7 +2563,7 @@ void DreamBase::atmospheres() {
 	cancelCh0();
 }
 
-uint8 DreamBase::nextSymbol(uint8 symbol) {
+uint8 DreamWebEngine::nextSymbol(uint8 symbol) {
 	uint8 result = symbol + 1;
 	if (result == 6)
 		return 0;
@@ -2586,7 +2572,7 @@ uint8 DreamBase::nextSymbol(uint8 symbol) {
 	return result;
 }
 
-void DreamBase::showSymbol() {
+void DreamWebEngine::showSymbol() {
 	showFrame(_tempGraphics, kSymbolx, kSymboly, 12, 0);
 
 	showFrame(_tempGraphics, _symbolTopX + kSymbolx-44, kSymboly+20, _symbolTopNum, 32);
@@ -2602,7 +2588,7 @@ void DreamBase::showSymbol() {
 	showFrame(_tempGraphics, _symbolBotX + kSymbolx+54, kSymboly+49, 6 + nextNextBotSymbol, 32);
 }
 
-void DreamBase::readKey() {
+void DreamWebEngine::readKey() {
 	uint16 bufOut = _bufferOut;
 
 	if (bufOut == _bufferIn) {
@@ -2616,7 +2602,7 @@ void DreamBase::readKey() {
 	_bufferOut = bufOut;
 }
 
-void DreamBase::setTopLeft() {
+void DreamWebEngine::setTopLeft() {
 	if (_symbolTopDir != 0) {
 		blank();
 		return;
@@ -2631,7 +2617,7 @@ void DreamBase::setTopLeft() {
 		_symbolTopDir = 0xFF;
 }
 
-void DreamBase::setTopRight() {
+void DreamWebEngine::setTopRight() {
 	if (_symbolTopDir != 0) {
 		blank();
 		return;
@@ -2646,7 +2632,7 @@ void DreamBase::setTopRight() {
 		_symbolTopDir = 1;
 }
 
-void DreamBase::setBotLeft() {
+void DreamWebEngine::setBotLeft() {
 	if (_symbolBotDir != 0) {
 		blank();
 		return;
@@ -2661,7 +2647,7 @@ void DreamBase::setBotLeft() {
 		_symbolBotDir = 0xFF;
 }
 
-void DreamBase::setBotRight() {
+void DreamWebEngine::setBotRight() {
 	if (_symbolBotDir != 0) {
 		blank();
 		return;
@@ -2676,7 +2662,7 @@ void DreamBase::setBotRight() {
 		_symbolBotDir = 1;
 }
 
-void DreamBase::newGame() {
+void DreamWebEngine::newGame() {
 	if (_commandType != 251) {
 		_commandType = 251;
 		commandOnly(47);
@@ -2686,7 +2672,7 @@ void DreamBase::newGame() {
 		_getBack = 3;
 }
 
-void DreamBase::pickupOb(uint8 command, uint8 pos) {
+void DreamWebEngine::pickupOb(uint8 command, uint8 pos) {
 	_lastInvPos = pos;
 	_objectType = kFreeObjectType;
 	_itemFrame = command;
@@ -2696,7 +2682,7 @@ void DreamBase::pickupOb(uint8 command, uint8 pos) {
 	transferToEx(command);
 }
 
-void DreamBase::initialInv() {
+void DreamWebEngine::initialInv() {
 	if (_realLocation != 24)
 		return;
 
@@ -2716,7 +2702,7 @@ void DreamBase::initialInv() {
 	switchRyanOff();
 }
 
-void DreamBase::walkIntoRoom() {
+void DreamWebEngine::walkIntoRoom() {
 	if (_vars._location == 14 && _mapX == 22) {
 		_destination = 1;
 		_finalDest = 1;
@@ -2724,7 +2710,7 @@ void DreamBase::walkIntoRoom() {
 	}
 }
 
-void DreamBase::afterIntroRoom() {
+void DreamWebEngine::afterIntroRoom() {
 	if (_nowInNewRoom == 0)
 		return; // notnewintro
 
@@ -2739,7 +2725,7 @@ void DreamBase::afterIntroRoom() {
 	_nowInNewRoom = 0;
 }
 
-void DreamBase::redrawMainScrn() {
+void DreamWebEngine::redrawMainScrn() {
 	_timeCount = 0;
 	createPanel();
 	_vars._newObs = 0;
@@ -2753,20 +2739,20 @@ void DreamBase::redrawMainScrn() {
 	_commandType = 255;
 }
 
-void DreamBase::blank() {
+void DreamWebEngine::blank() {
 	if (_commandType != 199) {
 		_commandType = 199;
 		commandOnly(0);
 	}
 }
 
-void DreamBase::allPointer() {
+void DreamWebEngine::allPointer() {
 	readMouse();
 	showPointer();
 	dumpPointer();
 }
 
-void DreamBase::makeMainScreen() {
+void DreamWebEngine::makeMainScreen() {
 	createPanel();
 	_vars._newObs = 1;
 	drawFloor();
@@ -2783,14 +2769,14 @@ void DreamBase::makeMainScreen() {
 	_manIsOffScreen = 0;
 }
 
-void DreamBase::openInv() {
+void DreamWebEngine::openInv() {
 	_invOpen = 1;
 	printMessage(80, 58 - 10, 61, 240, (240 & 1));
 	fillRyan();
 	_commandType = 255;
 }
 
-void DreamBase::obsThatDoThings() {
+void DreamWebEngine::obsThatDoThings() {
 	if (!compare(_command, _objectType, "MEMB"))
 		return; // notlouiscard
 
@@ -2800,7 +2786,7 @@ void DreamBase::obsThatDoThings() {
 	}
 }
 
-void DreamBase::describeOb() {
+void DreamWebEngine::describeOb() {
 	const uint8 *obText = getObTextStart();
 	uint16 y = 92;
 	if (_foreignRelease && _objectType == kSetObjectType1)
@@ -2826,7 +2812,7 @@ void DreamBase::describeOb() {
 	}
 }
 
-void DreamBase::delEverything() {
+void DreamWebEngine::delEverything() {
 	if (_mapYSize + _mapOffsetY < 182) {
 		mapToPanel();
 	} else {
@@ -2837,7 +2823,7 @@ void DreamBase::delEverything() {
 	}
 }
 
-void DreamBase::errorMessage1() {
+void DreamWebEngine::errorMessage1() {
 	delPointer();
 	printMessage(76, 21, 58, 240, (240 & 1));
 	readMouse();
@@ -2855,7 +2841,7 @@ void DreamBase::errorMessage1() {
 	delPointer();
 }
 
-void DreamBase::errorMessage2() {
+void DreamWebEngine::errorMessage2() {
 	_commandType = 255;
 	delPointer();
 	printMessage(76, 21, 59, 240, (240 & 1));
@@ -2874,7 +2860,7 @@ void DreamBase::errorMessage2() {
 	delPointer();
 }
 
-void DreamBase::errorMessage3() {
+void DreamWebEngine::errorMessage3() {
 	delPointer();
 	printMessage(76, 21, 60, 240, (240 & 1));
 	workToScreenM();
@@ -2889,11 +2875,11 @@ void DreamBase::errorMessage3() {
 	delPointer();
 }
 
-void DreamBase::reExFromOpen() {
+void DreamWebEngine::reExFromOpen() {
 
 }
 
-void DreamBase::putBackObStuff() {
+void DreamWebEngine::putBackObStuff() {
 	createPanel();
 	showPanel();
 	showMan();
@@ -2909,11 +2895,11 @@ void DreamBase::putBackObStuff() {
 	delPointer();
 }
 
-bool DreamBase::isSetObOnMap(uint8 index) {
+bool DreamWebEngine::isSetObOnMap(uint8 index) {
 	return (getSetAd(index)->mapad[0] == 0);
 }
 
-void DreamBase::examineInventory() {
+void DreamWebEngine::examineInventory() {
 	if (_commandType != 249) {
 		_commandType = 249;
 		commandOnly(32);
@@ -2933,22 +2919,22 @@ void DreamBase::examineInventory() {
 	workToScreenM();
 }
 
-void DreamBase::middlePanel() {
+void DreamWebEngine::middlePanel() {
 }
 
-void DreamBase::showDiary() {
+void DreamWebEngine::showDiary() {
 	showFrame(_tempGraphics, kDiaryx, kDiaryy + 37, 1, 0);
 	showFrame(_tempGraphics, kDiaryx + 176, kDiaryy + 108, 2, 0);
 }
 
-void DreamBase::underTextLine() {
+void DreamWebEngine::underTextLine() {
 	if (_foreignRelease)
 		multiGet(_textUnder, _textAddressX, _textAddressY - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
 	else
 		multiGet(_textUnder, _textAddressX, _textAddressY, kUnderTextSizeX, kUnderTextSizeY);
 }
 
-void DreamBase::showWatchReel() {
+void DreamWebEngine::showWatchReel() {
 	uint16 reelPointer = _vars._reelToWatch;
 	plotReel(reelPointer);
 	_vars._reelToWatch = reelPointer;
@@ -2958,7 +2944,7 @@ void DreamBase::showWatchReel() {
 		_vars._shakeCounter = 0xFF;
 }
 
-void DreamBase::watchReel() {
+void DreamWebEngine::watchReel() {
 	if (_vars._reelToWatch != 0xFFFF) {
 		if (_mansPath != _finalDest)
 			return; // Wait until stopped walking
@@ -3005,7 +2991,7 @@ void DreamBase::watchReel() {
 	plotReel(reelPointer);
 }
 
-void DreamBase::afterNewRoom() {
+void DreamWebEngine::afterNewRoom() {
 	if (_nowInNewRoom == 0)
 		return; // notnew
 
@@ -3036,7 +3022,7 @@ void DreamBase::afterNewRoom() {
 	atmospheres();
 }
 
-void DreamBase::madmanRun() {
+void DreamWebEngine::madmanRun() {
 	if (_vars._location    != 14 ||
 		_mapX        != 22 ||
 		_pointerMode !=  2 ||
@@ -3056,7 +3042,7 @@ void DreamBase::madmanRun() {
 }
 
 
-void DreamBase::decide() {
+void DreamWebEngine::decide() {
 	setMode();
 	loadPalFromIFF();
 	clearPalette();
@@ -3073,11 +3059,11 @@ void DreamBase::decide() {
 	fadeScreenUp();
 	_getBack = 0;
 
-	RectWithCallback<DreamBase> decideList[] = {
-		{ kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamBase::newGame },
-		{ kOpsx+20,kOpsx+87,kOpsy+10,kOpsy+59,&DreamBase::DOSReturn },
-		{ kOpsx+123,kOpsx+190,kOpsy+10,kOpsy+59,&DreamBase::loadOld },
-		{ 0,320,0,200,&DreamBase::blank },
+	RectWithCallback<DreamWebEngine> decideList[] = {
+		{ kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamWebEngine::newGame },
+		{ kOpsx+20,kOpsx+87,kOpsy+10,kOpsy+59,&DreamWebEngine::DOSReturn },
+		{ kOpsx+123,kOpsx+190,kOpsy+10,kOpsy+59,&DreamWebEngine::loadOld },
+		{ 0,320,0,200,&DreamWebEngine::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
 
@@ -3102,7 +3088,7 @@ void DreamBase::decide() {
 	_textLen = 240;
 }
 
-void DreamBase::showGun() {
+void DreamWebEngine::showGun() {
 	_addToRed = 0;
 	_addToGreen = 0;
 	_addToBlue = 0;
@@ -3138,7 +3124,7 @@ void DreamBase::showGun() {
 	getRidOfTempText();
 }
 
-void DreamBase::diaryKeyP() {
+void DreamWebEngine::diaryKeyP() {
 	if (_commandType != 214) {
 		_commandType = 214;
 		commandOnly(23);
@@ -3158,7 +3144,7 @@ void DreamBase::diaryKeyP() {
 		_diaryPage = 11;
 }
 
-void DreamBase::diaryKeyN() {
+void DreamWebEngine::diaryKeyN() {
 	if (_commandType != 213) {
 		_commandType = 213;
 		commandOnly(23);
@@ -3178,7 +3164,7 @@ void DreamBase::diaryKeyN() {
 		_diaryPage = 0;
 }
 
-void DreamBase::dropError() {
+void DreamWebEngine::dropError() {
 	_commandType = 255;
 	delPointer();
 	printMessage(76, 21, 56, 240, 240 & 1);
@@ -3191,7 +3177,7 @@ void DreamBase::dropError() {
 	workToScreenM();
 }
 
-void DreamBase::cantDrop() {
+void DreamWebEngine::cantDrop() {
 	_commandType = 255;
 	delPointer();
 	printMessage(76, 21, 24, 240, 240 & 1);
@@ -3204,7 +3190,7 @@ void DreamBase::cantDrop() {
 	workToScreenM();
 }
 
-void DreamBase::getBack1() {
+void DreamWebEngine::getBack1() {
 	if (_pickUp != 0) {
 		blank();
 		return;
@@ -3226,7 +3212,7 @@ void DreamBase::getBack1() {
 	}
 }
 
-void DreamBase::autoAppear() {
+void DreamWebEngine::autoAppear() {
 	if (_vars._location == 32) {
 		// In alley
 		resetLocation(5);
@@ -3269,7 +3255,7 @@ void DreamBase::autoAppear() {
 	}
 }
 
-void DreamBase::quitKey() {
+void DreamWebEngine::quitKey() {
 	if (_commandType != 222) {
 		_commandType = 222;
 		commandOnly(4);
@@ -3279,7 +3265,7 @@ void DreamBase::quitKey() {
 		_getBack = 1;
 }
 
-void DreamBase::setupTimedUse(uint16 textIndex, uint16 countToTimed, uint16 timeCount, byte x, byte y) {
+void DreamWebEngine::setupTimedUse(uint16 textIndex, uint16 countToTimed, uint16 timeCount, byte x, byte y) {
 	if (_timeCount != 0)
 		return; // can't setup
 
@@ -3291,7 +3277,7 @@ void DreamBase::setupTimedUse(uint16 textIndex, uint16 countToTimed, uint16 time
 	debug(1, "setupTimedUse: %d => '%s'", textIndex, _timedString);
 }
 
-void DreamBase::entryTexts() {
+void DreamWebEngine::entryTexts() {
 	switch (_vars._location) {
 	case 21:
 		setupTimedUse(28, 60, 11, 68, 64);
@@ -3319,7 +3305,7 @@ void DreamBase::entryTexts() {
 	}
 }
 
-void DreamBase::entryAnims() {
+void DreamWebEngine::entryAnims() {
 	_vars._reelToWatch = 0xFFFF;
 	_vars._watchMode = (byte)-1;
 
@@ -3396,7 +3382,7 @@ void DreamBase::entryAnims() {
 	}
 }
 
-void DreamBase::updateSymbolTop() {
+void DreamWebEngine::updateSymbolTop() {
 	if (!_symbolTopDir)
 		return; // topfinished
 
@@ -3433,7 +3419,7 @@ void DreamBase::updateSymbolTop() {
 	}
 }
 
-void DreamBase::updateSymbolBot() {
+void DreamWebEngine::updateSymbolBot() {
 	if (!_symbolBotDir)
 		return; // botfinished
 
@@ -3470,7 +3456,7 @@ void DreamBase::updateSymbolBot() {
 	}
 }
 
-void DreamBase::showDiaryPage() {
+void DreamWebEngine::showDiaryPage() {
 	showFrame(_tempGraphics, kDiaryx, kDiaryy, 0, 0);
 	_kerning = 1;
 	useTempCharset();
@@ -3487,7 +3473,7 @@ void DreamBase::showDiaryPage() {
 	useCharset1();
 }
 
-void DreamBase::dumpDiaryKeys() {
+void DreamWebEngine::dumpDiaryKeys() {
 	if (_pressCount == 1) {
 		if (_vars._sartainDead != 1 && _diaryPage == 5 && getLocation(6) != 1) {
 			// Add Sartain Industries note
@@ -3513,7 +3499,7 @@ void DreamBase::dumpDiaryKeys() {
 	multiDump(kDiaryx + 151, kDiaryy + 71, 16, 16);
 }
 
-void DreamBase::lookAtCard() {
+void DreamWebEngine::lookAtCard() {
 	_manIsOffScreen = 1;
 	getRidOfReels();
 	loadKeypad();
@@ -3538,11 +3524,11 @@ void DreamBase::lookAtCard() {
 	putBackObStuff();
 }
 
-void DreamBase::clearBuffers() {
+void DreamWebEngine::clearBuffers() {
 	clearChanges();
 }
 
-void DreamBase::clearChanges() {
+void DreamWebEngine::clearChanges() {
 	memset(_listOfChanges, 0xFF, 4*kNumChanges);
 
 	setupInitialReelRoutines();
@@ -3563,7 +3549,7 @@ void DreamBase::clearChanges() {
 	memcpy(_roomsCanGo, initialRoomsCanGo, 16);
 }
 
-void DreamBase::setupInitialVars() {
+void DreamWebEngine::setupInitialVars() {
 	_vars._startVars = 0;
 	_vars._progressPoints = 0;
 	_vars._watchOn = 0;
@@ -3625,7 +3611,7 @@ void DreamBase::setupInitialVars() {
 	_vars._shakeCounter = 48;
 }
 
-void DreamBase::showDiaryKeys() {
+void DreamWebEngine::showDiaryKeys() {
 	if (!_pressCount)
 		return; // nokeyatall
 
@@ -3646,7 +3632,7 @@ void DreamBase::showDiaryKeys() {
 		showDiaryPage();
 }
 
-void DreamBase::edensFlatReminders() {
+void DreamWebEngine::edensFlatReminders() {
 	if (_realLocation != 24 || _mapX != 44)
 		return; // not in Eden's lift
 
@@ -3674,7 +3660,7 @@ void DreamBase::edensFlatReminders() {
 	_vars._progressPoints++;	// got card
 }
 
-void DreamBase::incRyanPage() {
+void DreamWebEngine::incRyanPage() {
 	if (_commandType != 222) {
 		_commandType = 222;
 		commandOnly(31);
@@ -3694,7 +3680,7 @@ void DreamBase::incRyanPage() {
 
 }
 
-void DreamBase::emergencyPurge() {
+void DreamWebEngine::emergencyPurge() {
 	while (true) {
 		if (_vars._exFramePos + 4000 < kExframeslen) {
 			// Not near frame end
@@ -3706,7 +3692,7 @@ void DreamBase::emergencyPurge() {
 	}
 }
 
-void DreamBase::purgeAnItem() {
+void DreamWebEngine::purgeAnItem() {
 	const DynObject *extraObjects = _exData;
 
 	for (size_t i = 0; i < kNumexobjects; ++i) {
@@ -3725,4 +3711,4 @@ void DreamBase::purgeAnItem() {
 	}
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index a1bbbe51da..2ff2aa7881 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -22,9 +22,9 @@
 
 #include "dreamweb/dreamweb.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
-void DreamBase::talk() {
+void DreamWebEngine::talk() {
 	_talkPos = 0;
 	_inMapArea = 0;
 	_character = _command;
@@ -40,10 +40,10 @@ void DreamBase::talk() {
 	showPointer();
 	workToScreen();
 
-	RectWithCallback<DreamBase> talkList[] = {
-		{ 273,320,157,198,&DreamBase::getBack1 },
-		{ 240,290,2,44,&DreamBase::moreTalk },
-		{ 0,320,0,200,&DreamBase::blank },
+	RectWithCallback<DreamWebEngine> talkList[] = {
+		{ 273,320,157,198,&DreamWebEngine::getBack1 },
+		{ 240,290,2,44,&DreamWebEngine::moreTalk },
+		{ 0,320,0,200,&DreamWebEngine::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
 
@@ -73,18 +73,18 @@ void DreamBase::talk() {
 	}
 }
 
-void DreamBase::convIcons() {
+void DreamWebEngine::convIcons() {
 	uint8 index = _character & 127;
 	uint16 frame = getPersFrame(index);
 	const GraphicsFile *base = findSource(frame);
 	showFrame(*base, 234, 2, frame, 0);
 }
 
-uint16 DreamBase::getPersFrame(uint8 index) {
+uint16 DreamWebEngine::getPersFrame(uint8 index) {
 	return READ_LE_UINT16(&_personFramesLE[index]);
 }
 
-void DreamBase::startTalk() {
+void DreamWebEngine::startTalk() {
 	_talkMode = 0;
 
 	const uint8 *str = getPersonText(_character & 0x7F, 0);
@@ -107,11 +107,11 @@ void DreamBase::startTalk() {
 	}
 }
 
-const uint8 *DreamBase::getPersonText(uint8 index, uint8 talkPos) {
+const uint8 *DreamWebEngine::getPersonText(uint8 index, uint8 talkPos) {
 	return (const uint8 *)_personText.getString(index*64 + talkPos);
 }
 
-void DreamBase::moreTalk() {
+void DreamWebEngine::moreTalk() {
 	if (_talkMode != 0) {
 		redes();
 		return;
@@ -136,7 +136,7 @@ void DreamBase::moreTalk() {
 	doSomeTalk();
 }
 
-void DreamBase::doSomeTalk() {
+void DreamWebEngine::doSomeTalk() {
 	while (true) {
 		const uint8 *str = getPersonText(_character & 0x7F, _talkPos);
 
@@ -194,12 +194,12 @@ void DreamBase::doSomeTalk() {
 	}
 }
 
-bool DreamBase::hangOnPQ() {
+bool DreamWebEngine::hangOnPQ() {
 	_getBack = 0;
 
-	RectWithCallback<DreamBase> quitList[] = {
-		{ 273,320,157,198,&DreamBase::getBack1 },
-		{ 0,320,0,200,&DreamBase::blank },
+	RectWithCallback<DreamWebEngine> quitList[] = {
+		{ 273,320,157,198,&DreamWebEngine::getBack1 },
+		{ 0,320,0,200,&DreamWebEngine::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
 
@@ -235,7 +235,7 @@ bool DreamBase::hangOnPQ() {
 	return false;
 }
 
-void DreamBase::redes() {
+void DreamWebEngine::redes() {
 	if (_channel1Playing != 255 || _talkMode != 2) {
 		blank();
 		return;
@@ -262,4 +262,4 @@ void DreamBase::redes() {
 	delPointer();
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index 37cdd70e9a..56e3f9583f 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -23,9 +23,9 @@
 #include "dreamweb/dreamweb.h"
 #include "engines/util.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
-void DreamBase::endGame() {
+void DreamWebEngine::endGame() {
 	loadTempText("DREAMWEB.T83");
 	monkSpeaking();
 	gettingShot();
@@ -35,7 +35,7 @@ void DreamBase::endGame() {
 	hangOn(200);
 }
 
-void DreamBase::monkSpeaking() {
+void DreamWebEngine::monkSpeaking() {
 	// FIXME: This is the CD version only.
 
 	_roomsSample = 35;
@@ -57,7 +57,7 @@ void DreamBase::monkSpeaking() {
 		playChannel1(50 + 12);
 
 		do {
-			engine->waitForVSync();
+			waitForVSync();
 		} while (_channel1Playing != 255);
 	}
 
@@ -68,7 +68,7 @@ void DreamBase::monkSpeaking() {
 	getRidOfTemp();
 }
 
-void DreamBase::gettingShot() {
+void DreamWebEngine::gettingShot() {
 	_newLocation = 55;
 	clearPalette();
 	loadIntroRoom();
@@ -79,7 +79,7 @@ void DreamBase::gettingShot() {
 	clearBeforeLoad();
 }
 
-void DreamBase::bibleQuote() {
+void DreamWebEngine::bibleQuote() {
 	initGraphics(640, 480, true);
 
 	showPCX("DREAMWEB.I00");
@@ -110,7 +110,7 @@ void DreamBase::bibleQuote() {
 	_lastHardKey = 0;
 }
 
-void DreamBase::hangOne(uint16 delay) {
+void DreamWebEngine::hangOne(uint16 delay) {
 	do {
 		vSync();
 		if (_lastHardKey == 1)
@@ -118,7 +118,7 @@ void DreamBase::hangOne(uint16 delay) {
 	} while	(--delay);
 }
 
-void DreamBase::intro() {
+void DreamWebEngine::intro() {
 	loadTempText("DREAMWEB.T82");
 	loadPalFromIFF();
 	setMode();
@@ -174,7 +174,7 @@ void DreamBase::intro() {
 	_lastHardKey =  0;
 }
 
-void DreamBase::runIntroSeq() {
+void DreamWebEngine::runIntroSeq() {
 	_getBack = 0;
 
 	do {
@@ -220,7 +220,7 @@ void DreamBase::runIntroSeq() {
 	//clearBeforeLoad();
 }
 
-void DreamBase::runEndSeq() {
+void DreamWebEngine::runEndSeq() {
 	atmospheres();
 	_getBack = 0;
 
@@ -240,7 +240,7 @@ void DreamBase::runEndSeq() {
 	} while (_getBack != 1);
 }
 
-void DreamBase::loadIntroRoom() {
+void DreamWebEngine::loadIntroRoom() {
 	_introCount = 0;
 	_vars._location = 255;
 	loadRoom();
@@ -259,10 +259,10 @@ void DreamBase::loadIntroRoom() {
 	workToScreen();
 }
 
-void DreamBase::set16ColPalette() {
+void DreamWebEngine::set16ColPalette() {
 }
 
-void DreamBase::realCredits() {
+void DreamWebEngine::realCredits() {
 	_roomsSample = 33;
 	loadRoomsSample();
 	_volume = 0;
@@ -419,4 +419,4 @@ void DreamBase::realCredits() {
 	_lastHardKey =  0;
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index ebebc45ad5..6ab8422075 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -22,10 +22,10 @@
 
 #include "dreamweb/dreamweb.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
 
-typedef void (DreamBase::*UseCallback)(void);
+typedef void (DreamWebEngine::*UseCallback)(void);
 
 // Note: The callback pointer has been placed before the
 // ID to keep MSVC happy (otherwise, it throws warnings
@@ -35,90 +35,90 @@ struct UseListEntry {
 	const char *id;
 };
 
-void DreamBase::useRoutine() {
+void DreamWebEngine::useRoutine() {
 
 	static const UseListEntry kUseList[] = {
-		{ &DreamBase::useMon,                  "NETW" },
-		{ &DreamBase::useElevator1,            "ELVA" },
-		{ &DreamBase::useElevator2,            "ELVB" },
-		{ &DreamBase::useElevator3,            "ELVC" },
-		{ &DreamBase::useElevator4,            "ELVE" },
-		{ &DreamBase::useElevator5,            "ELVF" },
-		{ &DreamBase::useChurchGate,           "CGAT" },
-		{ &DreamBase::useStereo,               "REMO" },
-		{ &DreamBase::useButtonA,              "BUTA" },
-		{ &DreamBase::useWinch,                "CBOX" },
-		{ &DreamBase::useLighter,              "LITE" },
-		{ &DreamBase::usePlate,                "PLAT" },
-		{ &DreamBase::useControl,              "LIFT" },
-		{ &DreamBase::useWire,                 "WIRE" },
-		{ &DreamBase::useHandle,               "HNDL" },
-		{ &DreamBase::useHatch,                "HACH" },
-		{ &DreamBase::useElvDoor,              "DOOR" },
-		{ &DreamBase::useCashCard,             "CSHR" },
-		{ &DreamBase::useGun,                  "GUNA" },
-		{ &DreamBase::useCardReader1,          "CRAA" },
-		{ &DreamBase::useCardReader2,          "CRBB" },
-		{ &DreamBase::useCardReader3,          "CRCC" },
-		{ &DreamBase::sitDownInBar,            "SEAT" },
-		{ &DreamBase::useMenu,                 "MENU" },
-		{ &DreamBase::useCooker,               "COOK" },
-		{ &DreamBase::callHotelLift,           "ELCA" },
-		{ &DreamBase::callEdensLift,           "EDCA" },
-		{ &DreamBase::callEdensDLift,          "DDCA" },
-		{ &DreamBase::useAltar,                "ALTR" },
-		{ &DreamBase::openHotelDoor,           "LOKA" },
-		{ &DreamBase::openHotelDoor2,          "LOKB" },
-		{ &DreamBase::openLouis,               "ENTA" },
-		{ &DreamBase::openRyan,                "ENTB" },
-		{ &DreamBase::openPoolBoss,            "ENTE" },
-		{ &DreamBase::openYourNeighbour,       "ENTC" },
-		{ &DreamBase::openEden,                "ENTD" },
-		{ &DreamBase::openSarters,             "ENTH" },
-		{ &DreamBase::wearWatch,               "WWAT" },
-		{ &DreamBase::usePoolReader,           "POOL" },
-		{ &DreamBase::wearShades,              "WSHD" },
-		{ &DreamBase::grafittiDoor,            "GRAF" },
-		{ &DreamBase::trapDoor,                "TRAP" },
-		{ &DreamBase::edensCDPlayer,           "CDPE" },
-		{ &DreamBase::openTVDoor,              "DLOK" },
-		{ &DreamBase::useHole,                 "HOLE" },
-		{ &DreamBase::useDryer,                "DRYR" },
-		{ &DreamBase::useChurchHole,           "HOLY" },
-		{ &DreamBase::useWall,                 "WALL" },
-		{ &DreamBase::useDiary,                "BOOK" },
-		{ &DreamBase::useAxe,                  "AXED" },
-		{ &DreamBase::useShield,               "SHLD" },
-		{ &DreamBase::useRailing,              "BCNY" },
-		{ &DreamBase::useCoveredBox,           "LIDC" },
-		{ &DreamBase::useClearBox,             "LIDU" },
-		{ &DreamBase::useOpenBox,              "LIDO" },
-		{ &DreamBase::usePipe,                 "PIPE" },
-		{ &DreamBase::useBalcony,              "BALC" },
-		{ &DreamBase::useWindow,               "WIND" },
-		{ &DreamBase::viewFolder,              "PAPR" },
-		{ &DreamBase::useTrainer,              "UWTA" },
-		{ &DreamBase::useTrainer,              "UWTB" },
-		{ &DreamBase::enterSymbol,             "STAT" },
-		{ &DreamBase::openTomb,                "TLID" },
-		{ &DreamBase::useSlab,                 "SLAB" },
-		{ &DreamBase::useCart,                 "CART" },
-		{ &DreamBase::useFullCart,             "FCAR" },
-		{ &DreamBase::slabDoorA,               "SLBA" },
-		{ &DreamBase::slabDoorB,               "SLBB" },
-		{ &DreamBase::slabDoorC,               "SLBC" },
-		{ &DreamBase::slabDoorD,               "SLBD" },
-		{ &DreamBase::slabDoorE,               "SLBE" },
-		{ &DreamBase::slabDoorF,               "SLBF" },
-		{ &DreamBase::usePlinth,               "PLIN" },
-		{ &DreamBase::useLadder,               "LADD" },
-		{ &DreamBase::useLadderB,              "LADB" },
-		{ &DreamBase::chewy,                   "GUMA" },
-		{ &DreamBase::wheelSound,              "SQEE" },
-		{ &DreamBase::runTap,                  "TAPP" },
-		{ &DreamBase::playGuitar,              "GUIT" },
-		{ &DreamBase::hotelControl,            "CONT" },
-		{ &DreamBase::hotelBell,               "BELL" },
+		{ &DreamWebEngine::useMon,                  "NETW" },
+		{ &DreamWebEngine::useElevator1,            "ELVA" },
+		{ &DreamWebEngine::useElevator2,            "ELVB" },
+		{ &DreamWebEngine::useElevator3,            "ELVC" },
+		{ &DreamWebEngine::useElevator4,            "ELVE" },
+		{ &DreamWebEngine::useElevator5,            "ELVF" },
+		{ &DreamWebEngine::useChurchGate,           "CGAT" },
+		{ &DreamWebEngine::useStereo,               "REMO" },
+		{ &DreamWebEngine::useButtonA,              "BUTA" },
+		{ &DreamWebEngine::useWinch,                "CBOX" },
+		{ &DreamWebEngine::useLighter,              "LITE" },
+		{ &DreamWebEngine::usePlate,                "PLAT" },
+		{ &DreamWebEngine::useControl,              "LIFT" },
+		{ &DreamWebEngine::useWire,                 "WIRE" },
+		{ &DreamWebEngine::useHandle,               "HNDL" },
+		{ &DreamWebEngine::useHatch,                "HACH" },
+		{ &DreamWebEngine::useElvDoor,              "DOOR" },
+		{ &DreamWebEngine::useCashCard,             "CSHR" },
+		{ &DreamWebEngine::useGun,                  "GUNA" },
+		{ &DreamWebEngine::useCardReader1,          "CRAA" },
+		{ &DreamWebEngine::useCardReader2,          "CRBB" },
+		{ &DreamWebEngine::useCardReader3,          "CRCC" },
+		{ &DreamWebEngine::sitDownInBar,            "SEAT" },
+		{ &DreamWebEngine::useMenu,                 "MENU" },
+		{ &DreamWebEngine::useCooker,               "COOK" },
+		{ &DreamWebEngine::callHotelLift,           "ELCA" },
+		{ &DreamWebEngine::callEdensLift,           "EDCA" },
+		{ &DreamWebEngine::callEdensDLift,          "DDCA" },
+		{ &DreamWebEngine::useAltar,                "ALTR" },
+		{ &DreamWebEngine::openHotelDoor,           "LOKA" },
+		{ &DreamWebEngine::openHotelDoor2,          "LOKB" },
+		{ &DreamWebEngine::openLouis,               "ENTA" },
+		{ &DreamWebEngine::openRyan,                "ENTB" },
+		{ &DreamWebEngine::openPoolBoss,            "ENTE" },
+		{ &DreamWebEngine::openYourNeighbour,       "ENTC" },
+		{ &DreamWebEngine::openEden,                "ENTD" },
+		{ &DreamWebEngine::openSarters,             "ENTH" },
+		{ &DreamWebEngine::wearWatch,               "WWAT" },
+		{ &DreamWebEngine::usePoolReader,           "POOL" },
+		{ &DreamWebEngine::wearShades,              "WSHD" },
+		{ &DreamWebEngine::grafittiDoor,            "GRAF" },
+		{ &DreamWebEngine::trapDoor,                "TRAP" },
+		{ &DreamWebEngine::edensCDPlayer,           "CDPE" },
+		{ &DreamWebEngine::openTVDoor,              "DLOK" },
+		{ &DreamWebEngine::useHole,                 "HOLE" },
+		{ &DreamWebEngine::useDryer,                "DRYR" },
+		{ &DreamWebEngine::useChurchHole,           "HOLY" },
+		{ &DreamWebEngine::useWall,                 "WALL" },
+		{ &DreamWebEngine::useDiary,                "BOOK" },
+		{ &DreamWebEngine::useAxe,                  "AXED" },
+		{ &DreamWebEngine::useShield,               "SHLD" },
+		{ &DreamWebEngine::useRailing,              "BCNY" },
+		{ &DreamWebEngine::useCoveredBox,           "LIDC" },
+		{ &DreamWebEngine::useClearBox,             "LIDU" },
+		{ &DreamWebEngine::useOpenBox,              "LIDO" },
+		{ &DreamWebEngine::usePipe,                 "PIPE" },
+		{ &DreamWebEngine::useBalcony,              "BALC" },
+		{ &DreamWebEngine::useWindow,               "WIND" },
+		{ &DreamWebEngine::viewFolder,              "PAPR" },
+		{ &DreamWebEngine::useTrainer,              "UWTA" },
+		{ &DreamWebEngine::useTrainer,              "UWTB" },
+		{ &DreamWebEngine::enterSymbol,             "STAT" },
+		{ &DreamWebEngine::openTomb,                "TLID" },
+		{ &DreamWebEngine::useSlab,                 "SLAB" },
+		{ &DreamWebEngine::useCart,                 "CART" },
+		{ &DreamWebEngine::useFullCart,             "FCAR" },
+		{ &DreamWebEngine::slabDoorA,               "SLBA" },
+		{ &DreamWebEngine::slabDoorB,               "SLBB" },
+		{ &DreamWebEngine::slabDoorC,               "SLBC" },
+		{ &DreamWebEngine::slabDoorD,               "SLBD" },
+		{ &DreamWebEngine::slabDoorE,               "SLBE" },
+		{ &DreamWebEngine::slabDoorF,               "SLBF" },
+		{ &DreamWebEngine::usePlinth,               "PLIN" },
+		{ &DreamWebEngine::useLadder,               "LADD" },
+		{ &DreamWebEngine::useLadderB,              "LADB" },
+		{ &DreamWebEngine::chewy,                   "GUMA" },
+		{ &DreamWebEngine::wheelSound,              "SQEE" },
+		{ &DreamWebEngine::runTap,                  "TAPP" },
+		{ &DreamWebEngine::playGuitar,              "GUIT" },
+		{ &DreamWebEngine::hotelControl,            "CONT" },
+		{ &DreamWebEngine::hotelBell,               "BELL" },
 	};
 
 	if (_realLocation >= 50) {
@@ -163,7 +163,7 @@ void DreamBase::useRoutine() {
 	_commandType = 255;
 }
 
-void DreamBase::useText(const uint8 *string) {
+void DreamWebEngine::useText(const uint8 *string) {
 	createPanel();
 	showPanel();
 	showMan();
@@ -173,7 +173,7 @@ void DreamBase::useText(const uint8 *string) {
 	workToScreenM();
 }
 
-void DreamBase::showFirstUse() {
+void DreamWebEngine::showFirstUse() {
 	const uint8 *obText = getObTextStart();
 	findNextColon(&obText);
 	findNextColon(&obText);
@@ -181,7 +181,7 @@ void DreamBase::showFirstUse() {
 	hangOnP(400);
 }
 
-void DreamBase::showSecondUse() {
+void DreamWebEngine::showSecondUse() {
 	const uint8 *obText = getObTextStart();
 	findNextColon(&obText);
 	findNextColon(&obText);
@@ -190,7 +190,7 @@ void DreamBase::showSecondUse() {
 	hangOnP(400);
 }
 
-void DreamBase::viewFolder() {
+void DreamWebEngine::viewFolder() {
 	_manIsOffScreen = 1;
 	getRidOfAll();
 	loadFolder();
@@ -219,7 +219,7 @@ void DreamBase::viewFolder() {
 	workToScreenM();
 }
 
-void DreamBase::edensCDPlayer() {
+void DreamWebEngine::edensCDPlayer() {
 	showFirstUse();
 	_vars._watchingTime = 18 * 2;
 	_vars._reelToWatch = 25;
@@ -229,25 +229,25 @@ void DreamBase::edensCDPlayer() {
 	_getBack = 1;
 }
 
-void DreamBase::hotelBell() {
+void DreamWebEngine::hotelBell() {
 	playChannel1(12);
 	showFirstUse();
 	putBackObStuff();
 }
 
-void DreamBase::playGuitar() {
+void DreamWebEngine::playGuitar() {
 	playChannel1(14);
 	showFirstUse();
 	putBackObStuff();
 }
 
-void DreamBase::useElevator1() {
+void DreamWebEngine::useElevator1() {
 	showFirstUse();
 	selectLocation();
 	_getBack = 1;
 }
 
-void DreamBase::useElevator2() {
+void DreamWebEngine::useElevator2() {
 	showFirstUse();
 
 	if (_vars._location == 23)	// In pool hall
@@ -261,7 +261,7 @@ void DreamBase::useElevator2() {
 	_getBack = 1;
 }
 
-void DreamBase::useElevator3() {
+void DreamWebEngine::useElevator3() {
 	showFirstUse();
 	_vars._countToClose = 20;
 	_newLocation = 34;
@@ -273,7 +273,7 @@ void DreamBase::useElevator3() {
 	_getBack = 1;
 }
 
-void DreamBase::useElevator4() {
+void DreamWebEngine::useElevator4() {
 	showFirstUse();
 	_vars._reelToWatch = 0;
 	_vars._endWatchReel = 11;
@@ -285,7 +285,7 @@ void DreamBase::useElevator4() {
 	_newLocation = 24;
 }
 
-void DreamBase::useElevator5() {
+void DreamWebEngine::useElevator5() {
 	placeSetObject(4);
 	removeSetObject(0);
 	_newLocation = 20;
@@ -295,19 +295,19 @@ void DreamBase::useElevator5() {
 	_getBack = 1;
 }
 
-void DreamBase::useHatch() {
+void DreamWebEngine::useHatch() {
 	showFirstUse();
 	_newLocation = 40;
 	_getBack = 1;
 }
 
-void DreamBase::wheelSound() {
+void DreamWebEngine::wheelSound() {
 	playChannel1(17);
 	showFirstUse();
 	putBackObStuff();
 }
 
-void DreamBase::callHotelLift() {
+void DreamWebEngine::callHotelLift() {
 	playChannel1(12);
 	showFirstUse();
 	_vars._countToOpen = 8;
@@ -318,7 +318,7 @@ void DreamBase::callHotelLift() {
 	turnPathOn(4);
 }
 
-void DreamBase::useShield() {
+void DreamWebEngine::useShield() {
 	if (_realLocation != 20 || _vars._combatCount == 0) {
 		// Not in Sart room
 		showFirstUse();
@@ -332,7 +332,7 @@ void DreamBase::useShield() {
 	}
 }
 
-void DreamBase::useCoveredBox() {
+void DreamWebEngine::useCoveredBox() {
 	_vars._progressPoints++;
 	showFirstUse();
 	_vars._watchingTime = 50;
@@ -343,7 +343,7 @@ void DreamBase::useCoveredBox() {
 	_getBack = 1;
 }
 
-void DreamBase::useRailing() {
+void DreamWebEngine::useRailing() {
 	showFirstUse();
 	_vars._watchingTime = 80;
 	_vars._reelToWatch = 0;
@@ -354,7 +354,7 @@ void DreamBase::useRailing() {
 	_vars._manDead = 4;
 }
 
-void DreamBase::wearWatch() {
+void DreamWebEngine::wearWatch() {
 	if (_vars._watchOn == 1) {
 		// Already wearing watch
 		showSecondUse();
@@ -368,7 +368,7 @@ void DreamBase::wearWatch() {
 	}
 }
 
-void DreamBase::wearShades() {
+void DreamWebEngine::wearShades() {
 	if (_vars._shadesOn == 1) {
 		// Already wearing shades
 		showSecondUse();
@@ -382,7 +382,7 @@ void DreamBase::wearShades() {
 	}
 }
 
-void DreamBase::useChurchHole() {
+void DreamWebEngine::useChurchHole() {
 	showFirstUse();
 	_getBack = 1;
 	_vars._watchingTime = 28;
@@ -392,7 +392,7 @@ void DreamBase::useChurchHole() {
 	_vars._speedCount = 1;
 }
 
-void DreamBase::sitDownInBar() {
+void DreamWebEngine::sitDownInBar() {
 	if (_vars._watchMode != 0xFF) {
 		// Sat down
 		showSecondUse();
@@ -410,13 +410,13 @@ void DreamBase::sitDownInBar() {
 	}
 }
 
-void DreamBase::useDryer() {
+void DreamWebEngine::useDryer() {
 	playChannel1(12);
 	showFirstUse();
 	_getBack = 1;
 }
 
-void DreamBase::useBalcony() {
+void DreamWebEngine::useBalcony() {
 	showFirstUse();
 	turnPathOn(6);
 	turnPathOff(0);
@@ -440,7 +440,7 @@ void DreamBase::useBalcony() {
 	_getBack = 1;
 }
 
-void DreamBase::useWindow() {
+void DreamWebEngine::useWindow() {
 	if (_mansPath != 6) {
 		// Not on balcony
 		showSecondUse();
@@ -453,7 +453,7 @@ void DreamBase::useWindow() {
 	}
 }
 
-void DreamBase::trapDoor() {
+void DreamWebEngine::trapDoor() {
 	_vars._progressPoints++;
 	showFirstUse();
 	switchRyanOff();
@@ -466,14 +466,14 @@ void DreamBase::trapDoor() {
 	_getBack = 1;
 }
 
-void DreamBase::callEdensLift() {
+void DreamWebEngine::callEdensLift() {
 	showFirstUse();
 	_vars._countToOpen = 8;
 	_getBack = 1;
 	turnPathOn(2);
 }
 
-void DreamBase::callEdensDLift() {
+void DreamWebEngine::callEdensDLift() {
 	if (_vars._liftFlag == 1) {
 		// Eden's D here
 		showSecondUse();
@@ -486,38 +486,38 @@ void DreamBase::callEdensDLift() {
 	}
 }
 
-void DreamBase::openYourNeighbour() {
+void DreamWebEngine::openYourNeighbour() {
 	enterCode(255, 255, 255, 255);
 	_getBack = 1;
 }
 
-void DreamBase::openRyan() {
+void DreamWebEngine::openRyan() {
 	enterCode(5, 1, 0, 6);
 	_getBack = 1;
 }
 
-void DreamBase::openPoolBoss() {
+void DreamWebEngine::openPoolBoss() {
 	enterCode(5, 2, 2, 2);
 	_getBack = 1;
 }
 
-void DreamBase::openEden() {
+void DreamWebEngine::openEden() {
 	enterCode(2, 8, 6, 5);
 	_getBack = 1;
 }
 
-void DreamBase::openSarters() {
+void DreamWebEngine::openSarters() {
 	enterCode(7, 8, 3, 3);
 	_getBack = 1;
 }
 
-void DreamBase::openLouis() {
+void DreamWebEngine::openLouis() {
 	enterCode(5, 2, 3, 8);
 	_getBack = 1;
 }
 
 
-void DreamBase::useWall() {
+void DreamWebEngine::useWall() {
 	showFirstUse();
 
 	if (_mansPath != 3) {
@@ -560,7 +560,7 @@ void DreamBase::useWall() {
 	}
 }
 
-void DreamBase::useLadder() {
+void DreamWebEngine::useLadder() {
 	showFirstUse();
 	_mapX = _mapX - 11;
 	findRoomInLoc();
@@ -574,7 +574,7 @@ void DreamBase::useLadder() {
 	_getBack = 1;
 }
 
-void DreamBase::useLadderB() {
+void DreamWebEngine::useLadderB() {
 	showFirstUse();
 	_mapX = _mapX + 11;
 	findRoomInLoc();
@@ -588,7 +588,7 @@ void DreamBase::useLadderB() {
 	_getBack = 1;
 }
 
-void DreamBase::slabDoorA() {
+void DreamWebEngine::slabDoorA() {
 	showFirstUse();
 	_getBack = 1;
 	_vars._watchSpeed = 1;
@@ -608,7 +608,7 @@ void DreamBase::slabDoorA() {
 	}
 }
 
-void DreamBase::slabDoorB() {
+void DreamWebEngine::slabDoorB() {
 	if (_vars._dreamNumber != 1) {
 		// Wrong
 		showFirstUse();
@@ -640,7 +640,7 @@ void DreamBase::slabDoorB() {
 	}
 }
 
-void DreamBase::slabDoorC() {
+void DreamWebEngine::slabDoorC() {
 	showFirstUse();
 	_getBack = 1;
 	_vars._watchSpeed = 1;
@@ -660,7 +660,7 @@ void DreamBase::slabDoorC() {
 	}
 }
 
-void DreamBase::slabDoorD() {
+void DreamWebEngine::slabDoorD() {
 	showFirstUse();
 	_getBack = 1;
 	_vars._watchSpeed = 1;
@@ -680,7 +680,7 @@ void DreamBase::slabDoorD() {
 	}
 }
 
-void DreamBase::slabDoorE() {
+void DreamWebEngine::slabDoorE() {
 	showFirstUse();
 	_getBack = 1;
 	_vars._watchSpeed = 1;
@@ -700,7 +700,7 @@ void DreamBase::slabDoorE() {
 	}
 }
 
-void DreamBase::slabDoorF() {
+void DreamWebEngine::slabDoorF() {
 	showFirstUse();
 	_getBack = 1;
 	_vars._watchSpeed = 1;
@@ -720,7 +720,7 @@ void DreamBase::slabDoorF() {
 	}
 }
 
-bool DreamBase::defaultUseHandler(const char *id) {
+bool DreamWebEngine::defaultUseHandler(const char *id) {
 	if (_withObject == 255) {
 		withWhat();
 		return true;	// event handled
@@ -736,7 +736,7 @@ bool DreamBase::defaultUseHandler(const char *id) {
 	return false;	// continue with the original event
 }
 
-void DreamBase::useChurchGate() {
+void DreamWebEngine::useChurchGate() {
 	if (defaultUseHandler("CUTT"))
 		return;
 
@@ -754,7 +754,7 @@ void DreamBase::useChurchGate() {
 		turnPathOn(2);	// Open church
 }
 
-void DreamBase::useGun() {
+void DreamWebEngine::useGun() {
 
 	if (_objectType != kExObjectType) {
 		// gun is not taken
@@ -865,7 +865,7 @@ void DreamBase::useGun() {
 	}
 }
 
-void DreamBase::useFullCart() {
+void DreamWebEngine::useFullCart() {
 	_vars._progressPoints++;
 	turnAnyPathOn(2, _roomNum + 6);
 	_mansPath = 4;
@@ -883,7 +883,7 @@ void DreamBase::useFullCart() {
 	_getBack = 1;
 }
 
-void DreamBase::useClearBox() {
+void DreamWebEngine::useClearBox() {
 	if (defaultUseHandler("RAIL"))
 		return;
 
@@ -898,7 +898,7 @@ void DreamBase::useClearBox() {
 	_getBack = 1;
 }
 
-void DreamBase::openTVDoor() {
+void DreamWebEngine::openTVDoor() {
 	if (defaultUseHandler("ULOK"))
 		return;
 
@@ -908,7 +908,7 @@ void DreamBase::openTVDoor() {
 	_getBack = 1;
 }
 
-void DreamBase::usePlate() {
+void DreamWebEngine::usePlate() {
 	if (_withObject == 255) {
 		withWhat();
 		return;
@@ -935,7 +935,7 @@ void DreamBase::usePlate() {
 	}
 }
 
-void DreamBase::usePlinth() {
+void DreamWebEngine::usePlinth() {
 	if (_withObject == 255) {
 		withWhat();
 		return;
@@ -958,7 +958,7 @@ void DreamBase::usePlinth() {
 	}
 }
 
-void DreamBase::useElvDoor() {
+void DreamWebEngine::useElvDoor() {
 	if (defaultUseHandler("AXED"))
 		return;
 
@@ -973,7 +973,7 @@ void DreamBase::useElvDoor() {
 	_getBack = 1;
 }
 
-void DreamBase::useObject() {
+void DreamWebEngine::useObject() {
 	_withObject = 255;
 
 	if (_commandType != 229) {
@@ -988,7 +988,7 @@ void DreamBase::useObject() {
 		useRoutine();
 }
 
-void DreamBase::useWinch() {
+void DreamWebEngine::useWinch() {
 	uint16 contentIndex = checkInside(40, 1);
 	if (contentIndex == kNumexobjects || !compare(contentIndex, kExObjectType, "FUSE")) {
 		// No winch
@@ -1012,7 +1012,7 @@ void DreamBase::useWinch() {
 	_vars._progressPoints++;
 }
 
-void DreamBase::useCart() {
+void DreamWebEngine::useCart() {
 	if (defaultUseHandler("ROCK"))
 		return;
 
@@ -1026,7 +1026,7 @@ void DreamBase::useCart() {
 	_getBack = 1;
 }
 
-void DreamBase::useTrainer() {
+void DreamWebEngine::useTrainer() {
 	uint8 dummy;
 	DynObject *object = (DynObject *)getAnyAd(&dummy, &dummy);
 	if (object->mapad[0] != 4) {
@@ -1039,7 +1039,7 @@ void DreamBase::useTrainer() {
 	}
 }
 
-void DreamBase::chewy() {
+void DreamWebEngine::chewy() {
 	// Chewing a gum
 	showFirstUse();
 	uint8 dummy;
@@ -1048,7 +1048,7 @@ void DreamBase::chewy() {
 	_getBack = 1;
 }
 
-void DreamBase::useHole() {
+void DreamWebEngine::useHole() {
 	if (defaultUseHandler("HNDA"))
 		return;
 
@@ -1060,7 +1060,7 @@ void DreamBase::useHole() {
 	_getBack = 1;
 }
 
-void DreamBase::openHotelDoor() {
+void DreamWebEngine::openHotelDoor() {
 	if (defaultUseHandler("KEYA"))
 		return;
 
@@ -1070,7 +1070,7 @@ void DreamBase::openHotelDoor() {
 	_getBack = 1;
 }
 
-void DreamBase::openHotelDoor2() {
+void DreamWebEngine::openHotelDoor2() {
 	if (defaultUseHandler("KEYA"))
 		return;
 
@@ -1079,7 +1079,7 @@ void DreamBase::openHotelDoor2() {
 	putBackObStuff();
 }
 
-void DreamBase::grafittiDoor() {
+void DreamWebEngine::grafittiDoor() {
 	if (defaultUseHandler("APEN"))
 		return;
 
@@ -1087,7 +1087,7 @@ void DreamBase::grafittiDoor() {
 	putBackObStuff();
 }
 
-void DreamBase::usePoolReader() {
+void DreamWebEngine::usePoolReader() {
 	if (defaultUseHandler("MEMB"))
 		return;
 
@@ -1103,7 +1103,7 @@ void DreamBase::usePoolReader() {
 	}
 }
 
-void DreamBase::useCardReader1() {
+void DreamWebEngine::useCardReader1() {
 	if (defaultUseHandler("CSHR"))
 		return;
 
@@ -1125,7 +1125,7 @@ void DreamBase::useCardReader1() {
 	}
 }
 
-void DreamBase::useCardReader2() {
+void DreamWebEngine::useCardReader2() {
 	if (defaultUseHandler("CSHR"))
 		return;
 
@@ -1152,7 +1152,7 @@ void DreamBase::useCardReader2() {
 	}
 }
 
-void DreamBase::useCardReader3() {
+void DreamWebEngine::useCardReader3() {
 	if (defaultUseHandler("CSHR"))
 		return;
 
@@ -1174,7 +1174,7 @@ void DreamBase::useCardReader3() {
 	}
 }
 
-void DreamBase::useLighter() {
+void DreamWebEngine::useLighter() {
 	if (_withObject == 255) {
 		withWhat();
 		return;
@@ -1191,7 +1191,7 @@ void DreamBase::useLighter() {
 	}
 }
 
-void DreamBase::useWire() {
+void DreamWebEngine::useWire() {
 	if (_withObject == 255) {
 		withWhat();
 		return;
@@ -1216,7 +1216,7 @@ void DreamBase::useWire() {
 	putBackObStuff();
 }
 
-void DreamBase::openTomb() {
+void DreamWebEngine::openTomb() {
 	_vars._progressPoints++;
 	showFirstUse();
 	_vars._watchingTime = 35 * 2;
@@ -1227,7 +1227,7 @@ void DreamBase::openTomb() {
 	_getBack = 1;
 }
 
-void DreamBase::hotelControl() {
+void DreamWebEngine::hotelControl() {
 	if (_realLocation != 21 || _mapX != 33)
 		showSecondUse();	// Not right control
 	else
@@ -1236,7 +1236,7 @@ void DreamBase::hotelControl() {
 	putBackObStuff();
 }
 
-void DreamBase::useCooker() {
+void DreamWebEngine::useCooker() {
 	if (checkInside(_command, _objectType) == kNumexobjects)
 		showFirstUse();
 	else
@@ -1245,16 +1245,16 @@ void DreamBase::useCooker() {
 	putBackObStuff();
 }
 
-void DreamBase::placeFreeObject(uint8 index) {
+void DreamWebEngine::placeFreeObject(uint8 index) {
 	findOrMake(index, 0, 1);
 	getFreeAd(index)->mapad[0] = 0;
 }
 
-void DreamBase::removeFreeObject(uint8 index) {
+void DreamWebEngine::removeFreeObject(uint8 index) {
 	getFreeAd(index)->mapad[0] = 0xFF;
 }
 
-void DreamBase::useDiary() {
+void DreamWebEngine::useDiary() {
 	getRidOfReels();
 	loadIntoTemp("DREAMWEB.G14");
 	loadTempText("DREAMWEB.T51");
@@ -1270,11 +1270,11 @@ void DreamBase::useDiary() {
 	delPointer();
 	_getBack = 0;
 
-	RectWithCallback<DreamBase> diaryList[] = {
-		{ kDiaryx+94,kDiaryx+110,kDiaryy+97,kDiaryy+113,&DreamBase::diaryKeyN },
-		{ kDiaryx+151,kDiaryx+167,kDiaryy+71,kDiaryy+87,&DreamBase::diaryKeyP },
-		{ kDiaryx+176,kDiaryx+192,kDiaryy+108,kDiaryy+124,&DreamBase::quitKey },
-		{ 0,320,0,200,&DreamBase::blank },
+	RectWithCallback<DreamWebEngine> diaryList[] = {
+		{ kDiaryx+94,kDiaryx+110,kDiaryy+97,kDiaryy+113,&DreamWebEngine::diaryKeyN },
+		{ kDiaryx+151,kDiaryx+167,kDiaryy+71,kDiaryy+87,&DreamWebEngine::diaryKeyP },
+		{ kDiaryx+176,kDiaryx+192,kDiaryy+108,kDiaryy+124,&DreamWebEngine::quitKey },
+		{ 0,320,0,200,&DreamWebEngine::blank },
 		{ 0xFFFF,0,0,0,0 }
 	};
 	
@@ -1300,7 +1300,7 @@ void DreamBase::useDiary() {
 	workToScreenM();
 }
 
-void DreamBase::useControl() {
+void DreamWebEngine::useControl() {
 	if (_withObject == 255) {
 		withWhat();
 		return;
@@ -1353,7 +1353,7 @@ void DreamBase::useControl() {
 	}
 }
 
-void DreamBase::useSlab() {
+void DreamWebEngine::useSlab() {
 	if (_withObject == 255) {
 		withWhat();
 		return;
@@ -1385,7 +1385,7 @@ void DreamBase::useSlab() {
 	_getBack = 1;
 }
 
-void DreamBase::usePipe() {
+void DreamWebEngine::usePipe() {
 	if (_withObject == 255) {
 		withWhat();
 		return;
@@ -1408,7 +1408,7 @@ void DreamBase::usePipe() {
 	}
 }
 
-void DreamBase::useOpenBox() {
+void DreamWebEngine::useOpenBox() {
 	if (_withObject == 255) {
 		withWhat();
 		return;
@@ -1440,7 +1440,7 @@ void DreamBase::useOpenBox() {
 	showFirstUse();
 }
 
-void DreamBase::runTap() {
+void DreamWebEngine::runTap() {
 	if (_withObject == 255) {
 		withWhat();
 		return;
@@ -1467,7 +1467,7 @@ void DreamBase::runTap() {
 	putBackObStuff();
 }
 
-void DreamBase::useAxe() {
+void DreamWebEngine::useAxe() {
 	if (_realLocation != 22) {
 		// Not in pool
 		showFirstUse();
@@ -1494,7 +1494,7 @@ void DreamBase::useAxe() {
 	removeObFromInv();
 }
 
-void DreamBase::useHandle() {
+void DreamWebEngine::useHandle() {
 	SetObject *object = getSetAd(findSetObject("CUTW"));
 	if (object->mapad[0] == 255) {
 		// Wire not cut
@@ -1508,7 +1508,7 @@ void DreamBase::useHandle() {
 	_getBack = 1;
 }
 
-void DreamBase::useAltar() {
+void DreamWebEngine::useAltar() {
 	if (findExObject("CNDA") == 114 || findExObject("CNDB") == 114) {
 		// Things on altar
 		showFirstUse();
@@ -1525,7 +1525,7 @@ void DreamBase::useAltar() {
 		_vars._endWatchReel = 174;
 		_vars._watchSpeed = 1;
 		_vars._speedCount = 1;
-		DreamBase::setupTimedUse(47, 32, 98, 52, 76);
+		DreamWebEngine::setupTimedUse(47, 32, 98, 52, 76);
 		_getBack = 1;
 	} else {
 		showPuzText(23, 300);
@@ -1533,7 +1533,7 @@ void DreamBase::useAltar() {
 	}
 }
 
-void DreamBase::withWhat() {
+void DreamWebEngine::withWhat() {
 	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
 
 	createPanel();
@@ -1556,7 +1556,7 @@ void DreamBase::withWhat() {
 	_invOpen = 2;
 }
 
-void DreamBase::notHeldError() {
+void DreamWebEngine::notHeldError() {
 	createPanel();
 	showPanel();
 	showMan();
@@ -1568,7 +1568,7 @@ void DreamBase::notHeldError() {
 	putBackObStuff();
 }
 
-void DreamBase::useCashCard() {
+void DreamWebEngine::useCashCard() {
 	getRidOfReels();
 	loadKeypad();
 	createPanel();
@@ -1597,7 +1597,7 @@ void DreamBase::useCashCard() {
 	putBackObStuff();
 }
 
-void DreamBase::useStereo() {
+void DreamWebEngine::useStereo() {
 	// Handles the stereo in Ryan's apartment (accessible from the remote on
 	// the couch)
 
@@ -1628,7 +1628,7 @@ void DreamBase::useStereo() {
 	}
 }
 
-uint16 DreamBase::checkInside(uint16 command, uint16 type) {
+uint16 DreamWebEngine::checkInside(uint16 command, uint16 type) {
 	for (uint16 index = 0; index < kNumexobjects; index++) {
 		DynObject *object = getExAd(index);
 		if (object->mapad[1] == command && object->mapad[0] == type)
@@ -1638,7 +1638,7 @@ uint16 DreamBase::checkInside(uint16 command, uint16 type) {
 	return kNumexobjects;
 }
 
-void DreamBase::showPuzText(uint16 command, uint16 count) {
+void DreamWebEngine::showPuzText(uint16 command, uint16 count) {
 	createPanel();
 	showPanel();
 	showMan();
@@ -1650,7 +1650,7 @@ void DreamBase::showPuzText(uint16 command, uint16 count) {
 	hangOnP(count);
 }
 
-void DreamBase::useButtonA() {
+void DreamWebEngine::useButtonA() {
 	if (!isSetObOnMap(95)) {
 		showFirstUse();
 		turnAnyPathOn(0, _roomNum - 1);
@@ -1671,4 +1671,4 @@ void DreamBase::useButtonA() {
 }
 
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index 8359518f61..e8999ab18c 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -22,64 +22,64 @@
 
 #include "dreamweb/dreamweb.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
-void DreamBase::clearStartPal() {
+void DreamWebEngine::clearStartPal() {
 	memset(_startPal, 0, 256 * 3);
 }
 
-void DreamBase::clearEndPal() {
+void DreamWebEngine::clearEndPal() {
 	memset(_endPal, 0, 256 * 3);
 }
 
-void DreamBase::palToStartPal() {
+void DreamWebEngine::palToStartPal() {
 	memcpy(_startPal, _mainPal, 256 * 3);
 }
 
-void DreamBase::endPalToStart() {
+void DreamWebEngine::endPalToStart() {
 	memcpy(_startPal, _endPal, 256 * 3);
 }
 
-void DreamBase::startPalToEnd() {
+void DreamWebEngine::startPalToEnd() {
 	memcpy(_endPal, _startPal, 256 * 3);
 }
 
-void DreamBase::palToEndPal() {
+void DreamWebEngine::palToEndPal() {
 	memcpy(_endPal, _mainPal, 256 * 3);
 }
 
-void DreamBase::fadeDOS() {
+void DreamWebEngine::fadeDOS() {
 	return; // FIXME later
 
-	engine->waitForVSync();
+	waitForVSync();
 	//processEvents will be called from vsync
 	uint8 *dst = _startPal;
-	engine->getPalette(dst, 0, 64);
+	getPalette(dst, 0, 64);
 	for (int fade = 0; fade < 64; ++fade) {
 		for (int c = 0; c < 768; ++c) { //original sources decrement 768 values -> 256 colors
 			if (dst[c]) {
 				--dst[c];
 			}
 		}
-		engine->setPalette(dst, 0, 64);
-		engine->waitForVSync();
+		setPalette(dst, 0, 64);
+		waitForVSync();
 	}
 }
 
-void DreamBase::doFade() {
+void DreamWebEngine::doFade() {
 	if (_fadeDirection == 0)
 		return;
 
-	engine->processEvents();
+	processEvents();
 	uint8 *src = _startPal + 3 * _colourPos;
-	engine->setPalette(src, _colourPos, _numToFade);
+	setPalette(src, _colourPos, _numToFade);
 
 	_colourPos += _numToFade;
 	if (_colourPos == 0)
 		fadeCalculation();
 }
 
-void DreamBase::fadeCalculation() {
+void DreamWebEngine::fadeCalculation() {
 	if (_fadeCount == 0) {
 		_fadeDirection = 0;
 		return;
@@ -102,7 +102,7 @@ void DreamBase::fadeCalculation() {
 	--_fadeCount;
 }
 
-void DreamBase::fadeUpYellows() {
+void DreamWebEngine::fadeUpYellows() {
 	palToEndPal();
 	memset(_endPal + 231 * 3, 0, 8 * 3);
 	memset(_endPal + 246 * 3, 0, 1 * 3);
@@ -113,7 +113,7 @@ void DreamBase::fadeUpYellows() {
 	hangOn(128);
 }
 
-void DreamBase::fadeUpMonFirst() {
+void DreamWebEngine::fadeUpMonFirst() {
 	palToStartPal();
 	palToEndPal();
 	memset(_startPal + 231 * 3, 0, 8 * 3);
@@ -128,7 +128,7 @@ void DreamBase::fadeUpMonFirst() {
 }
 
 
-void DreamBase::fadeDownMon() {
+void DreamWebEngine::fadeDownMon() {
 	palToStartPal();
 	palToEndPal();
 	memset(_endPal + 231 * 3, 0, 8 * 3);
@@ -140,7 +140,7 @@ void DreamBase::fadeDownMon() {
 	hangOn(64);
 }
 
-void DreamBase::fadeUpMon() {
+void DreamWebEngine::fadeUpMon() {
 	palToStartPal();
 	palToEndPal();
 	memset(_startPal + 231 * 3, 0, 8 * 3);
@@ -152,15 +152,15 @@ void DreamBase::fadeUpMon() {
 	hangOn(128);
 }
 
-void DreamBase::initialMonCols() {
+void DreamWebEngine::initialMonCols() {
 	palToStartPal();
 	memset(_startPal + 230 * 3, 0, 9 * 3);
 	memset(_startPal + 246 * 3, 0, 1 * 3);
-	engine->processEvents();
-	engine->setPalette(_startPal + 230 * 3, 230, 18);
+	processEvents();
+	setPalette(_startPal + 230 * 3, 230, 18);
 }
 
-void DreamBase::fadeScreenUp() {
+void DreamWebEngine::fadeScreenUp() {
 	clearStartPal();
 	palToEndPal();
 	_fadeDirection = 1;
@@ -169,7 +169,7 @@ void DreamBase::fadeScreenUp() {
 	_numToFade = 128;
 }
 
-void DreamBase::fadeScreenUps() {
+void DreamWebEngine::fadeScreenUps() {
 	clearStartPal();
 	palToEndPal();
 	_fadeDirection = 1;
@@ -178,7 +178,7 @@ void DreamBase::fadeScreenUps() {
 	_numToFade = 64;
 }
 
-void DreamBase::fadeScreenUpHalf() {
+void DreamWebEngine::fadeScreenUpHalf() {
 	endPalToStart();
 	palToEndPal();
 	_fadeDirection = 1;
@@ -187,7 +187,7 @@ void DreamBase::fadeScreenUpHalf() {
 	_numToFade = 32;
 }
 
-void DreamBase::fadeScreenDown() {
+void DreamWebEngine::fadeScreenDown() {
 	palToStartPal();
 	clearEndPal();
 	_fadeDirection = 1;
@@ -196,7 +196,7 @@ void DreamBase::fadeScreenDown() {
 	_numToFade = 128;
 }
 
-void DreamBase::fadeScreenDowns() {
+void DreamWebEngine::fadeScreenDowns() {
 	palToStartPal();
 	clearEndPal();
 	_fadeDirection = 1;
@@ -205,7 +205,7 @@ void DreamBase::fadeScreenDowns() {
 	_numToFade = 64;
 }
 
-void DreamBase::fadeScreenDownHalf() {
+void DreamWebEngine::fadeScreenDownHalf() {
 	palToStartPal();
 	palToEndPal();
 
@@ -226,7 +226,7 @@ void DreamBase::fadeScreenDownHalf() {
 }
 
 
-void DreamBase::clearPalette() {
+void DreamWebEngine::clearPalette() {
 	_fadeDirection = 0;
 	clearStartPal();
 	dumpCurrent();
@@ -234,7 +234,7 @@ void DreamBase::clearPalette() {
 
 // Converts palette to grey scale, summed using formula
 // .20xred + .59xGreen + .11xBlue
-void DreamBase::greyscaleSum() {
+void DreamWebEngine::greyscaleSum() {
 	byte *src = _mainPal;
 	byte *dst = _endPal;
 
@@ -262,23 +262,23 @@ void DreamBase::greyscaleSum() {
 	}
 }
 
-void DreamBase::allPalette() {
+void DreamWebEngine::allPalette() {
 	memcpy(_startPal, _mainPal, 3 * 256);
 	dumpCurrent();
 }
 
-void DreamBase::dumpCurrent() {
+void DreamWebEngine::dumpCurrent() {
 	uint8 *pal = _startPal;
 
-	engine->waitForVSync();
-	engine->processEvents();
-	engine->setPalette(pal, 0, 128);
+	waitForVSync();
+	processEvents();
+	setPalette(pal, 0, 128);
 
 	pal += 128 * 3;
 
-	engine->waitForVSync();
-	engine->processEvents();
-	engine->setPalette(pal, 128, 128);
+	waitForVSync();
+	processEvents();
+	setPalette(pal, 128, 128);
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index c1a860e184..1e93c0f2fe 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -24,12 +24,12 @@
 #include "engines/util.h"
 #include "graphics/surface.h"
 
-namespace DreamGen {
+namespace DreamWeb {
 
 const uint16 kZoomx = 8;
 const uint16 kZoomy = 132;
 
-void DreamBase::multiGet(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
+void DreamWebEngine::multiGet(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
 	assert(x < 320);
 	assert(y < 200);
 	const uint8 *src = workspace() + x + y * kScreenwidth;
@@ -45,7 +45,7 @@ void DreamBase::multiGet(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
 	}
 }
 
-void DreamBase::multiPut(const uint8 *src, uint16 x, uint16 y, uint8 w, uint8 h) {
+void DreamWebEngine::multiPut(const uint8 *src, uint16 x, uint16 y, uint8 w, uint8 h) {
 	assert(x < 320);
 	assert(y < 200);
 	uint8 *dst = workspace() + x + y * kScreenwidth;
@@ -61,25 +61,21 @@ void DreamBase::multiPut(const uint8 *src, uint16 x, uint16 y, uint8 w, uint8 h)
 	}
 }
 
-void DreamBase::multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
+void DreamWebEngine::multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
 	unsigned offset = x + y * kScreenwidth;
 	//debug(1, "multiDump %ux%u(segment: %04x) -> %d,%d(address: %d)", w, h, (uint16)ds, x, y, offset);
-	engine->blit(workspace() + offset, kScreenwidth, x, y, width, height);
+	blit(workspace() + offset, kScreenwidth, x, y, width, height);
 }
 
-void DreamBase::workToScreen() {
-	engine->blit(workspace(), 320, 0, 0, 320, 200);
+void DreamWebEngine::workToScreen() {
+	blit(workspace(), 320, 0, 0, 320, 200);
 }
 
-void DreamBase::printUnderMon() {
-	engine->printUnderMonitor();
+void DreamWebEngine::printUnderMon() {
+	printUnderMonitor();
 }
 
-void DreamBase::cls() {
-	engine->cls();
-}
-
-void DreamBase::frameOutNm(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y) {
+void DreamWebEngine::frameOutNm(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y) {
 	dst += pitch * y + x;
 
 	for (uint16 j = 0; j < height; ++j) {
@@ -89,7 +85,7 @@ void DreamBase::frameOutNm(uint8 *dst, const uint8 *src, uint16 pitch, uint16 wi
 	}
 }
 
-void DreamBase::frameOutBh(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y) {
+void DreamWebEngine::frameOutBh(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y) {
 	uint16 stride = pitch - width;
 	dst += y * pitch + x;
 
@@ -105,7 +101,7 @@ void DreamBase::frameOutBh(uint8 *dst, const uint8 *src, uint16 pitch, uint16 wi
 	}
 }
 
-void DreamBase::frameOutFx(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y) {
+void DreamWebEngine::frameOutFx(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y) {
 	uint16 stride = pitch - width;
 	dst += y * pitch + x;
 	dst -= width;
@@ -122,7 +118,7 @@ void DreamBase::frameOutFx(uint8 *dst, const uint8 *src, uint16 pitch, uint16 wi
 	}
 }
 
-void DreamBase::doShake() {
+void DreamWebEngine::doShake() {
 	uint8 &counter = _vars._shakeCounter;
 	if (counter == 48)
 		return;
@@ -149,19 +145,19 @@ void DreamBase::doShake() {
 	};
 	assert(counter < ARRAYSIZE(shakeTable));
 	int offset = shakeTable[counter];
-	engine->setShakePos(offset >= 0 ? offset : -offset);
+	setShakePos(offset >= 0 ? offset : -offset);
 }
 
-void DreamBase::vSync() {
-	engine->waitForVSync();
+void DreamWebEngine::vSync() {
+	waitForVSync();
 }
 
-void DreamBase::setMode() {
-	engine->waitForVSync();
+void DreamWebEngine::setMode() {
+	waitForVSync();
 	initGraphics(320, 200, false);
 }
 
-void DreamBase::showPCX(const Common::String &name) {
+void DreamWebEngine::showPCX(const Common::String &name) {
 	Common::File pcxFile;
 
 	if (!pcxFile.open(name)) {
@@ -229,7 +225,7 @@ void DreamBase::showPCX(const Common::String &name) {
 	pcxFile.close();
 }
 
-void DreamBase::frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y) {
+void DreamWebEngine::frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y) {
 	// NB : These resilience checks were not in the original engine, but did they result in undefined behaviour
 	// or was something broken during porting to C++?
 	assert(pitch == 320);
@@ -271,19 +267,19 @@ void DreamBase::frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 wid
 	}
 }
 
-void DreamBase::showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag) {
+void DreamWebEngine::showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag) {
 	uint8 width, height;
 	showFrame(frameData, x, y, frameNumber, effectsFlag, &width, &height);
 }
 
-void DreamBase::showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 effectsFlag, uint8 width, uint8 height) {
+void DreamWebEngine::showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 effectsFlag, uint8 width, uint8 height) {
 	if (effectsFlag) {
 		if (effectsFlag & 128) { //centred
 			x -= width / 2;
 			y -= height / 2;
 		}
 		if (effectsFlag & 64) { // diffDest
-			error("Unsupported DreamBase::showFrame effectsFlag %d", effectsFlag);
+			error("Unsupported DreamWebEngine::showFrame effectsFlag %d", effectsFlag);
 			/*
 			frameOutFx(es.ptr(0, dx * *height), pSrc, dx, *width, *height, x, y);
 			return;
@@ -309,7 +305,7 @@ void DreamBase::showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 e
 	frameOutV(workspace(), pSrc, 320, width, height, x, y);
 }
 
-void DreamBase::showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
+void DreamWebEngine::showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
 	const Frame *frame = &frameData._frames[frameNumber];
 	if ((frame->width == 0) && (frame->height == 0)) {
 		*width = 0;
@@ -331,16 +327,16 @@ void DreamBase::showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uin
 	showFrameInternal(pSrc, x, y, effectsFlag, *width, *height);
 }
 
-void DreamBase::clearWork() {
+void DreamWebEngine::clearWork() {
 	memset(workspace(), 0, 320*200);
 }
 
-void DreamBase::dumpZoom() {
+void DreamWebEngine::dumpZoom() {
 	if (_vars._zoomOn == 1)
 		multiDump(kZoomx + 5, kZoomy + 4, 46, 40);
 }
 
-void DreamBase::crosshair() {
+void DreamWebEngine::crosshair() {
 	uint8 frame;
 	if ((_commandType != 3) && (_commandType < 10)) {
 		frame = 9;
@@ -350,21 +346,21 @@ void DreamBase::crosshair() {
 	showFrame(_icons1, kZoomx + 24, kZoomy + 19, frame, 0);
 }
 
-void DreamBase::getUnderZoom() {
+void DreamWebEngine::getUnderZoom() {
 	multiGet(_zoomSpace, kZoomx + 5, kZoomy + 4, 46, 40);
 }
 
-void DreamBase::putUnderZoom() {
+void DreamWebEngine::putUnderZoom() {
 	multiPut(_zoomSpace, kZoomx + 5, kZoomy + 4, 46, 40);
 }
 
-void DreamBase::zoomIcon() {
+void DreamWebEngine::zoomIcon() {
 	if (_vars._zoomOn == 0)
 		return;
 	showFrame(_icons1, kZoomx, kZoomy-1, 8, 0);
 }
 
-void DreamBase::zoom() {
+void DreamWebEngine::zoom() {
 	if (_vars._watchingTime != 0)
 		return;
 	if (_vars._zoomOn != 1)
@@ -392,19 +388,19 @@ void DreamBase::zoom() {
 	_didZoom = 1;
 }
 
-void DreamBase::panelToMap() {
+void DreamWebEngine::panelToMap() {
 	multiGet(_mapStore, _mapXStart + _mapAdX, _mapYStart + _mapAdY, _mapXSize, _mapYSize);
 }
 
-void DreamBase::mapToPanel() {
+void DreamWebEngine::mapToPanel() {
 	multiPut(_mapStore, _mapXStart + _mapAdX, _mapYStart + _mapAdY, _mapXSize, _mapYSize);
 }
 
-void DreamBase::dumpMap() {
+void DreamWebEngine::dumpMap() {
 	multiDump(_mapXStart + _mapAdX, _mapYStart + _mapAdY, _mapXSize, _mapYSize);
 }
 
-bool DreamBase::pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y) {
+bool DreamWebEngine::pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y) {
 	x -= pos->xMin;
 	y -= pos->yMin;
 	SetObject *setObject = getSetAd(pos->index);
@@ -413,7 +409,7 @@ bool DreamBase::pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y) {
 	return *ptr != 0;
 }
 
-void DreamBase::loadPalFromIFF() {
+void DreamWebEngine::loadPalFromIFF() {
 	Common::File palFile;
 	uint8* buf = new uint8[2000];
 	palFile.open("DREAMWEB.PAL");
@@ -437,25 +433,25 @@ void DreamBase::loadPalFromIFF() {
 	delete[] buf;
 }
 
-void DreamBase::createPanel() {
+void DreamWebEngine::createPanel() {
 	showFrame(_icons2, 0, 8, 0, 2);
 	showFrame(_icons2, 160, 8, 0, 2);
 	showFrame(_icons2, 0, 104, 0, 2);
 	showFrame(_icons2, 160, 104, 0, 2);
 }
 
-void DreamBase::createPanel2() {
+void DreamWebEngine::createPanel2() {
 	createPanel();
 	showFrame(_icons2, 0, 0, 5, 2);
 	showFrame(_icons2, 160, 0, 5, 2);
 }
 
-void DreamBase::showPanel() {
+void DreamWebEngine::showPanel() {
 	showFrame(_icons1, 72, 0, 19, 0);
 	showFrame(_icons1, 192, 0, 19, 0);
 }
 
-void DreamBase::transferFrame(uint8 from, uint8 to, uint8 offset) {
+void DreamWebEngine::transferFrame(uint8 from, uint8 to, uint8 offset) {
 	const Frame &freeFrame = _freeFrames._frames[3*from + offset];
 	Frame &exFrame = _exFrames._frames[3*to + offset];
 
@@ -473,4 +469,4 @@ void DreamBase::transferFrame(uint8 from, uint8 to, uint8 offset) {
 	_vars._exFramePos += byteCount;
 }
 
-} // End of namespace DreamGen
+} // End of namespace DreamWeb
-- 
cgit v1.2.3


From 198900069e8ecb7281c0faf50068f78a2817076e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 15:12:30 +0200
Subject: DREAMWEB: Remove some now-redundant references to the DreamWeb
 namespace

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

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index be620bfe3a..b752ae7433 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -487,7 +487,7 @@ void DreamWebEngine::blit(const uint8 *src, int pitch, int x, int y, int w, int
 }
 
 void DreamWebEngine::printUnderMonitor() {
-	uint8 *dst = workspace() + DreamWeb::kScreenwidth * 43 + 76;
+	uint8 *dst = workspace() + kScreenwidth * 43 + 76;
 
 	Graphics::Surface *s = _system->lockScreen();
 	if (!s)
@@ -502,7 +502,7 @@ void DreamWebEngine::printUnderMonitor() {
 				++dst; ++src;
 			}
 		}
-		dst += DreamWeb::kScreenwidth - 170;
+		dst += kScreenwidth - 170;
 	}
 	_system->unlockScreen();
 }
-- 
cgit v1.2.3


From 2f634e9b2ca59b05c442895289793f9aaad1913a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 15:15:31 +0200
Subject: DREAMWEB: Remove obsolete README

---
 engines/dreamweb/README | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 engines/dreamweb/README

(limited to 'engines')

diff --git a/engines/dreamweb/README b/engines/dreamweb/README
deleted file mode 100644
index d184613249..0000000000
--- a/engines/dreamweb/README
+++ /dev/null
@@ -1,12 +0,0 @@
-
-WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
-
-Some files(dreamgen.*) in this directory is auto-generated. This means
-(at least for some time) any changes to them will be lost.
-
-Please look into /devtools/tasmrecover directory, patch assembler source
-or translator and run ./tasm-recover script.
-
-Then copy dreamgen.cpp/dreamgen.h to engine/dreamweb and check the diffs.
-
-If you'd like to reimplement something, blacklist it, then run script.
-- 
cgit v1.2.3


From 89fb830be68e5a2bc50165f89d2ae2882167bf7e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 15:59:58 +0200
Subject: DREAMWEB: Implemented the floppy version of monkSpeaking()

---
 engines/dreamweb/titles.cpp | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index 56e3f9583f..3b78347fa7 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -36,8 +36,6 @@ void DreamWebEngine::endGame() {
 }
 
 void DreamWebEngine::monkSpeaking() {
-	// FIXME: This is the CD version only.
-
 	_roomsSample = 35;
 	loadRoomsSample();
 	loadIntoTemp("DREAMWEB.G15");
@@ -46,19 +44,35 @@ void DreamWebEngine::monkSpeaking() {
 	workToScreen();
 	_volume = 7;
 	_volumeDirection = -1;
-	_volumeTo = 5;
+	_volumeTo = isCD() ? 5 : 0;
 	playChannel0(12, 255);
 	fadeScreenUps();
 	hangOn(300);
 
-	for (int i = 40; i <= 48; i++) {
-		loadSpeech('T', 83, 'T', i);
-
-		playChannel1(50 + 12);
-
-		do {
-			waitForVSync();
-		} while (_channel1Playing != 255);
+	if (isCD()) {
+		for (int i = 40; i <= 48; i++) {
+			loadSpeech('T', 83, 'T', i);
+
+			playChannel1(50 + 12);
+
+			do {
+				waitForVSync();
+			} while (_channel1Playing != 255);
+		}
+	} else {
+		for (int i = 40; i <= 44; i++) {
+			uint8 printResult = 0;
+			const uint8 *string = getTextInFile1(i);
+			uint16 y = 140;
+
+			do {
+				printResult = printDirect(&string, 36, &y, 239, 239 & 1);
+				workToScreen();
+				clearWork();
+				showFrame(_tempGraphics, 160, 72, 0, 128);	// show monk
+				hangOnP(240);
+			} while (printResult != 0);
+		}
 	}
 
 	_volumeDirection = 1;
-- 
cgit v1.2.3


From 1c17b277eb930f89ef034ce4973c9fbf809d18f4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 16:16:41 +0200
Subject: DREAMWEB: Mark all of the differences between the floppy and CD
 versions

- Add TODOs for the CD checks in setupTimedTemp() and startTalk()
- The current doSomeTalk() is for the CD version only
- Implement a difference of the CD version in intro
---
 engines/dreamweb/stubs.cpp  | 2 +-
 engines/dreamweb/talk.cpp   | 4 ++++
 engines/dreamweb/titles.cpp | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 6067b20a22..f009bd5963 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -935,7 +935,7 @@ void DreamWebEngine::useTimedText() {
 }
 
 void DreamWebEngine::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
-#if 1 // if cd
+#if 1	// if cd - TODO: replace with a proper CD check
 	if (voiceIndex != 0) {
 		if (loadSpeech('T', voiceIndex, 'T', textIndex)) {
 			playChannel1(50+12);
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 2ff2aa7881..56826e70bb 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -98,6 +98,7 @@ void DreamWebEngine::startTalk() {
 	y = 80;
 	printDirect(&str, 66, &y, 241, true);
 
+#if 1	// if cd - TODO: replace with a proper CD check
 	_speechLoaded = false;
 	loadSpeech('R', _realLocation, 'C', 64*(_character & 0x7F));
 	if (_speechLoaded) {
@@ -105,6 +106,7 @@ void DreamWebEngine::startTalk() {
 		_volumeTo = 6;
 		playChannel1(50 + 12);
 	}
+#endif
 }
 
 const uint8 *DreamWebEngine::getPersonText(uint8 index, uint8 talkPos) {
@@ -137,6 +139,8 @@ void DreamWebEngine::moreTalk() {
 }
 
 void DreamWebEngine::doSomeTalk() {
+	// FIXME: This is for the CD version only
+
 	while (true) {
 		const uint8 *str = getPersonText(_character & 0x7F, _talkPos);
 
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index 3b78347fa7..7d32992d07 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -141,7 +141,7 @@ void DreamWebEngine::intro() {
 	loadIntroRoom();
 	_volume = 7;
 	_volumeDirection = -1;
-	_volumeTo = 4;
+	_volumeTo = isCD() ? 4 : 0;
 	playChannel0(12, 255);
 	fadeScreenUps();
 	runIntroSeq();
-- 
cgit v1.2.3


From 6e95c6d690cd2fc3e5e8de950ccab7be5e1f2794 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 16:18:08 +0200
Subject: DREAMWEB: Fix a regression in monkSpeaking (y should be unchanged)

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

(limited to 'engines')

diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index 7d32992d07..c57684c3a8 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -63,9 +63,9 @@ void DreamWebEngine::monkSpeaking() {
 		for (int i = 40; i <= 44; i++) {
 			uint8 printResult = 0;
 			const uint8 *string = getTextInFile1(i);
-			uint16 y = 140;
 
 			do {
+				uint16 y = 140;
 				printResult = printDirect(&string, 36, &y, 239, 239 & 1);
 				workToScreen();
 				clearWork();
-- 
cgit v1.2.3


From 4e207dbc7a374f47fd6c66e1a38e264e8787bd23 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 28 Dec 2011 14:58:44 +0100
Subject: DREAMWEB: Clean up Sprite::_updateCallback

---
 engines/dreamweb/backdrop.cpp |  2 +-
 engines/dreamweb/dreamweb.h   |  5 +----
 engines/dreamweb/sprite.cpp   | 12 ++++--------
 engines/dreamweb/structs.h    |  2 +-
 4 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index f2356eb0b0..9f47c72285 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -114,7 +114,7 @@ void DreamWebEngine::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
 		return;
 	uint8 priority = objData->priority;
 	uint8 type = objData->type;
-	Sprite *sprite = makeSprite(x, y, addr_backobject, &_setFrames, 0);
+	Sprite *sprite = makeSprite(x, y, false, &_setFrames, 0);
 
 	sprite->_objData = objData;
 	if (priority == 255)
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 9e1341bfa2..95f92960be 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -94,9 +94,6 @@ const unsigned int kNumexobjects = (114);
 const unsigned int kExtextlen = (18000);
 const unsigned int kExframeslen = (30000);
 const unsigned int kItempicsize = (44);
-// These are for ReelRoutine::reelPointer, which is a callback field.
-const uint16 addr_backobject = 0xc170;
-const uint16 addr_mainman = 0xc138;
 
 // Keyboard buffer. data.word(kBufferin) and data.word(kBufferout) are indexes
 // into this, making it a ring buffer
@@ -729,7 +726,7 @@ public:
 	void printSprites();
 	void printASprite(const Sprite *sprite);
 	void clearSprites();
-	Sprite *makeSprite(uint8 x, uint8 y, uint16 updateCallback, const GraphicsFile *frameData, uint16 somethingInDi);
+	Sprite *makeSprite(uint8 x, uint8 y, bool _mainManCallback, const GraphicsFile *frameData, uint16 somethingInDi);
 	void initMan();
 	void walking(Sprite *sprite);
 	void aboutTurn(Sprite *sprite);
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 33dbc0f18b..97d8d72b1f 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -29,7 +29,6 @@ void DreamWebEngine::printSprites() {
 		Common::List<Sprite>::const_iterator i;
 		for (i = _spriteTable.begin(); i != _spriteTable.end(); ++i) {
 			const Sprite &sprite = *i;
-			assert(sprite._updateCallback != 0x0ffff);
 			if (priority != sprite.priority)
 				continue;
 			if (sprite.hidden == 1)
@@ -65,7 +64,7 @@ void DreamWebEngine::clearSprites() {
 	_spriteTable.clear();
 }
 
-Sprite *DreamWebEngine::makeSprite(uint8 x, uint8 y, uint16 updateCallback, const GraphicsFile *frameData, uint16 somethingInDi) {
+Sprite *DreamWebEngine::makeSprite(uint8 x, uint8 y, bool mainManCallback, const GraphicsFile *frameData, uint16 somethingInDi) {
 	// Note: the original didn't append sprites here, but filled up the
 	// first unused entry. This can change the order of entries, but since they
 	// are drawn based on the priority field, this shouldn't matter.
@@ -74,7 +73,7 @@ Sprite *DreamWebEngine::makeSprite(uint8 x, uint8 y, uint16 updateCallback, cons
 
 	memset(sprite, 0xff, sizeof(Sprite));
 
-	sprite->_updateCallback = updateCallback;
+	sprite->_mainManCallback = mainManCallback;
 	sprite->x = x;
 	sprite->y = y;
 	sprite->_frameData = frameData;
@@ -94,13 +93,10 @@ void DreamWebEngine::spriteUpdate() {
 	Common::List<Sprite>::iterator i;
 	for (i = _spriteTable.begin(); i != _spriteTable.end(); ++i) {
 		Sprite &sprite = *i;
-		assert(sprite._updateCallback != 0xffff);
-
 		sprite.w24 = sprite.w2;
-		if (sprite._updateCallback == addr_mainman) // NB : Let's consider the callback as an enum while more code is not ported to C++
+		if (sprite._mainManCallback)
 			mainMan(&sprite);
 		else {
-			assert(sprite._updateCallback == addr_backobject);
 			backObject(&sprite);
 		}
 	
@@ -110,7 +106,7 @@ void DreamWebEngine::spriteUpdate() {
 }
 
 void DreamWebEngine::initMan() {
-	Sprite *sprite = makeSprite(_ryanX, _ryanY, addr_mainman, &_mainSprites, 0);
+	Sprite *sprite = makeSprite(_ryanX, _ryanY, true, &_mainSprites, 0);
 	sprite->priority = 4;
 	sprite->speed = 0;
 	sprite->walkFrame = 0;
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 08aa9048b4..55ed7bf3df 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -32,7 +32,7 @@ struct GraphicsFile;
 struct SetObject;
 
 struct Sprite {
-	uint16 _updateCallback;
+	bool _mainManCallback;
 	uint16 w2;
 	uint16 w4;
 	const GraphicsFile *_frameData;
-- 
cgit v1.2.3


From 77b8491b8b68674815019de3d3b12a4427ce68b0 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 28 Dec 2011 15:03:58 +0100
Subject: DREAMWEB: Remove unused Sprite fields

---
 engines/dreamweb/backdrop.cpp |  3 +--
 engines/dreamweb/dreamweb.h   |  2 +-
 engines/dreamweb/sprite.cpp   |  7 ++-----
 engines/dreamweb/structs.h    | 10 ----------
 4 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 9f47c72285..887da70539 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -114,14 +114,13 @@ void DreamWebEngine::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
 		return;
 	uint8 priority = objData->priority;
 	uint8 type = objData->type;
-	Sprite *sprite = makeSprite(x, y, false, &_setFrames, 0);
+	Sprite *sprite = makeSprite(x, y, false, &_setFrames);
 
 	sprite->_objData = objData;
 	if (priority == 255)
 		priority = 0;
 	sprite->priority = priority;
 	sprite->type = type;
-	sprite->b16 = 0;
 	sprite->delay = 0;
 	sprite->animFrame = 0;
 }
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 95f92960be..b7713352ff 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -726,7 +726,7 @@ public:
 	void printSprites();
 	void printASprite(const Sprite *sprite);
 	void clearSprites();
-	Sprite *makeSprite(uint8 x, uint8 y, bool _mainManCallback, const GraphicsFile *frameData, uint16 somethingInDi);
+	Sprite *makeSprite(uint8 x, uint8 y, bool _mainManCallback, const GraphicsFile *frameData);
 	void initMan();
 	void walking(Sprite *sprite);
 	void aboutTurn(Sprite *sprite);
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 97d8d72b1f..e662fa6ec3 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -64,7 +64,7 @@ void DreamWebEngine::clearSprites() {
 	_spriteTable.clear();
 }
 
-Sprite *DreamWebEngine::makeSprite(uint8 x, uint8 y, bool mainManCallback, const GraphicsFile *frameData, uint16 somethingInDi) {
+Sprite *DreamWebEngine::makeSprite(uint8 x, uint8 y, bool mainManCallback, const GraphicsFile *frameData) {
 	// Note: the original didn't append sprites here, but filled up the
 	// first unused entry. This can change the order of entries, but since they
 	// are drawn based on the priority field, this shouldn't matter.
@@ -77,8 +77,6 @@ Sprite *DreamWebEngine::makeSprite(uint8 x, uint8 y, bool mainManCallback, const
 	sprite->x = x;
 	sprite->y = y;
 	sprite->_frameData = frameData;
-	sprite->w8 = somethingInDi;
-	sprite->w2 = 0xffff;
 	sprite->frameNumber = 0;
 	sprite->delay = 0;
 	sprite->_objData = 0;
@@ -93,7 +91,6 @@ void DreamWebEngine::spriteUpdate() {
 	Common::List<Sprite>::iterator i;
 	for (i = _spriteTable.begin(); i != _spriteTable.end(); ++i) {
 		Sprite &sprite = *i;
-		sprite.w24 = sprite.w2;
 		if (sprite._mainManCallback)
 			mainMan(&sprite);
 		else {
@@ -106,7 +103,7 @@ void DreamWebEngine::spriteUpdate() {
 }
 
 void DreamWebEngine::initMan() {
-	Sprite *sprite = makeSprite(_ryanX, _ryanY, true, &_mainSprites, 0);
+	Sprite *sprite = makeSprite(_ryanX, _ryanY, true, &_mainSprites);
 	sprite->priority = 4;
 	sprite->speed = 0;
 	sprite->walkFrame = 0;
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 55ed7bf3df..b34715addf 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -33,25 +33,15 @@ struct SetObject;
 
 struct Sprite {
 	bool _mainManCallback;
-	uint16 w2;
-	uint16 w4;
 	const GraphicsFile *_frameData;
-	uint16 w8;
 	uint8  x;
 	uint8  y;
-	uint16 w12;
-	uint8  b14;
 	uint8  frameNumber;
-	uint8  b16;
-	uint8  b17;
 	uint8  delay;
 	uint8  animFrame; // index into SetObject::frames
 	SetObject *_objData;
 	uint8  speed;
 	uint8  priority;
-	uint16 w24;
-	uint16 w26;
-	uint8  b28;
 	uint8  walkFrame;
 	uint8  type;
 	uint8  hidden;
-- 
cgit v1.2.3


From c10ea611e8058958a606ff4478871e7909d882d9 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Dec 2011 15:55:47 +0100
Subject: DREAMWEB: Rename getEitherAdCPP to getEitherAd, use obj type enums

---
 engines/dreamweb/dreamweb.h |  2 +-
 engines/dreamweb/object.cpp | 34 +++++++++++++++++-----------------
 engines/dreamweb/stubs.cpp  |  6 +++---
 3 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index b7713352ff..2031e759cc 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -797,7 +797,7 @@ public:
 	void findOrMake(uint8 index, uint8 value, uint8 type);
 	DynObject *getFreeAd(uint8 index);
 	DynObject *getExAd(uint8 index);
-	DynObject *getEitherAdCPP();
+	DynObject *getEitherAd();
 	void *getAnyAdDir(uint8 index, uint8 flag);
 	void showWatch();
 	void showTime();
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index a9cbadcc2c..8e6436c100 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -105,9 +105,9 @@ void DreamWebEngine::obPicture() {
 }
 
 void DreamWebEngine::obIcons() {
-	uint8 value1, value2;
-	getAnyAd(&value1, &value2);
-	if (value1 != 0xff) {
+	uint8 slotSize, slotCount;
+	getAnyAd(&slotSize, &slotCount);
+	if (slotSize != 0xff) {
 		// can open it
 		showFrame(_icons2, 210, 1, 4, 0);
 	}
@@ -270,9 +270,9 @@ void DreamWebEngine::getBackFromOb() {
 byte DreamWebEngine::getOpenedSlotCount() {
 	byte obj = _openedOb;
 	switch (_openedType) {
-	case 4:
+	case kExObjectType:
 		return getExAd(obj)->slotCount;
-	case 2:
+	case kFreeObjectType:
 		return getFreeAd(obj)->slotCount;
 	default:
 		return getSetAd(obj)->slotCount;
@@ -282,9 +282,9 @@ byte DreamWebEngine::getOpenedSlotCount() {
 byte DreamWebEngine::getOpenedSlotSize() {
 	byte obj = _openedOb;
 	switch (_openedType) {
-	case 4:
+	case kExObjectType:
 		return getExAd(obj)->slotSize;
-	case 2:
+	case kFreeObjectType:
 		return getFreeAd(obj)->slotSize;
 	default:
 		return getSetAd(obj)->slotSize;
@@ -669,7 +669,7 @@ void DreamWebEngine::dropObject() {
 	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
-	if (isItWorn(getEitherAdCPP())) {
+	if (isItWorn(getEitherAd())) {
 		wornError();
 		return;
 	}
@@ -711,7 +711,7 @@ void DreamWebEngine::dropObject() {
 
 bool DreamWebEngine::checkObjectSize() {
 	byte containerSize = getOpenedSlotSize();
-	DynObject *object = getEitherAdCPP();
+	DynObject *object = getEitherAd();
 	// If there is no size defined for the object in the editor, set its size
 	// to 6. This could be a bad idea, according to the original source.
 	byte objectSize = (object->objectSize != 255) ? object->objectSize : 6;
@@ -798,7 +798,7 @@ void DreamWebEngine::swapWithInv() {
 	ObjectRef objectId = findInvPos();
 	_itemFrame = objectId._index;
 	_objectType = objectId._type;
-	DynObject *object = getEitherAdCPP();
+	DynObject *object = getEitherAd();
 	object->mapad[0] = 20;
 	object->mapad[1] = 255;
 	byte prevType2 = _objectType;
@@ -806,7 +806,7 @@ void DreamWebEngine::swapWithInv() {
 	_objectType = prevType;
 	_itemFrame = prevFrame;
 	delPointer();
-	object = getEitherAdCPP();
+	object = getEitherAd();
 	object->mapad[0] = 4;
 	object->mapad[1] = 255;
 	object->mapad[2] = _lastInvPos;
@@ -852,7 +852,7 @@ void DreamWebEngine::useOpened() {
 	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
-	if (isItWorn(getEitherAdCPP())) {
+	if (isItWorn(getEitherAd())) {
 		wornError();
 		return;
 	}
@@ -869,7 +869,7 @@ void DreamWebEngine::useOpened() {
 		return;
 
 	_pickUp = 0;
-	DynObject *object = getEitherAdCPP();
+	DynObject *object = getEitherAd();
 	object->mapad[0] = _openedType;
 	object->mapad[1] = _openedOb;
 	object->mapad[2] = _lastInvPos;
@@ -922,7 +922,7 @@ void DreamWebEngine::outOfOpen() {
 		_objectType = kExObjectType;
 	}
 
-	DynObject *object = getEitherAdCPP();
+	DynObject *object = getEitherAd();
 	object->mapad[0] = 20;
 	object->mapad[1] = 255;
 
@@ -949,7 +949,7 @@ void DreamWebEngine::swapWithOpen() {
 	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
 
-	if (isItWorn(getEitherAdCPP())) {
+	if (isItWorn(getEitherAd())) {
 		wornError();
 		return;
 	}
@@ -977,7 +977,7 @@ void DreamWebEngine::swapWithOpen() {
 		_objectType = kExObjectType;
 	}
 
-	DynObject *object = getEitherAdCPP();
+	DynObject *object = getEitherAd();
 	object->mapad[0] = 20;
 	object->mapad[1] = 255;
 
@@ -985,7 +985,7 @@ void DreamWebEngine::swapWithOpen() {
 	byte prevFrame2 = _itemFrame;
 	_objectType = prevType;
 	_itemFrame = prevFrame;
-	object = getEitherAdCPP();
+	object = getEitherAd();
 	object->mapad[0] = _openedType;
 	object->mapad[1] = _openedOb;
 	object->mapad[2] = _lastInvPos;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index f009bd5963..fb451893a3 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1280,7 +1280,7 @@ DynObject *DreamWebEngine::getExAd(uint8 index) {
 	return &_exData[index];
 }
 
-DynObject *DreamWebEngine::getEitherAdCPP() {
+DynObject *DreamWebEngine::getEitherAd() {
 	if (_objectType == kExObjectType)
 		return getExAd(_itemFrame);
 	else
@@ -1311,9 +1311,9 @@ void *DreamWebEngine::getAnyAd(uint8 *slotSize, uint8 *slotCount) {
 }
 
 void *DreamWebEngine::getAnyAdDir(uint8 index, uint8 flag) {
-	if (flag == 4)
+	if (flag == kExObjectType)
 		return getExAd(index);
-	else if (flag == 2)
+	else if (flag == kFreeObjectType)
 		return getFreeAd(index);
 	else
 		return getSetAd(index);
-- 
cgit v1.2.3


From ca7da4cffc7edacd90df408c441a6eca10cc0e55 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Dec 2011 16:21:30 +0100
Subject: DREAMWEB: Rename a member of SetObject & DynObject to objId

SetObject::name and DynObject::id are stored at the exact same offset,
and have the exact same meaning (see also objectMatches()). Now they
also have the same name, objId.
---
 engines/dreamweb/monitor.cpp | 2 +-
 engines/dreamweb/object.cpp  | 6 +++---
 engines/dreamweb/structs.h   | 4 ++--
 engines/dreamweb/stubs.cpp   | 4 ++--
 engines/dreamweb/use.cpp     | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 2464326e7d..256478d09b 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -400,7 +400,7 @@ void DreamWebEngine::loadCart() {
 	uint16 objectIndex = findSetObject("INTF");
 	uint16 cartridgeIndex = checkInside(objectIndex, 1);
 	if (cartridgeIndex != kNumexobjects)
-		cartridgeId = getExAd(cartridgeIndex)->id[3] + 1;
+		cartridgeId = getExAd(cartridgeIndex)->objId[3] + 1;
 
 	if (cartridgeId == 0)
 		loadTextFile(_textFile3, "DREAMWEB.T20"); // monitor file 20
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 8e6436c100..8d4f9bf84a 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -57,7 +57,7 @@ void DreamWebEngine::fillRyan() {
 }
 
 bool DreamWebEngine::isItWorn(const DynObject *object) {
-	return (object->id[0] == 'W'-'A') && (object->id[1] == 'E'-'A');
+	return (object->objId[0] == 'W'-'A') && (object->objId[1] == 'E'-'A');
 }
 
 void DreamWebEngine::wornError() {
@@ -74,8 +74,8 @@ void DreamWebEngine::wornError() {
 }
 
 void DreamWebEngine::makeWorn(DynObject *object) {
-	object->id[0] = 'W'-'A';
-	object->id[1] = 'E'-'A';
+	object->objId[0] = 'W'-'A';
+	object->objId[1] = 'E'-'A';
 }
 
 void DreamWebEngine::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index b34715addf..18b8b280ab 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -71,7 +71,7 @@ struct SetObject {
 	uint8 b9;
 	uint8 b10;
 	uint8 b11;
-	uint8 name[4];
+	uint8 objId[4];
 	uint8 b16;
 	uint8 index;
 	uint8 frames[13]; // Table mapping animFrame to sprite frame number
@@ -116,7 +116,7 @@ struct DynObject {
 	uint8 objectSize;	// the size of an object
 	uint8 turnedOn;
 	uint8 initialLocation;
-	uint8 id[4];
+	uint8 objId[4];
 };
 
 struct ObjPos {
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index fb451893a3..bd9de7a23c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3696,7 +3696,7 @@ void DreamWebEngine::purgeAnItem() {
 	const DynObject *extraObjects = _exData;
 
 	for (size_t i = 0; i < kNumexobjects; ++i) {
-		if (extraObjects[i].mapad[0] && extraObjects[i].id[0] == 255 &&
+		if (extraObjects[i].mapad[0] && extraObjects[i].objId[0] == 255 &&
 			extraObjects[i].initialLocation != _realLocation) {
 			deleteExObject(i);
 			return;
@@ -3704,7 +3704,7 @@ void DreamWebEngine::purgeAnItem() {
 	}
 
 	for (size_t i = 0; i < kNumexobjects; ++i) {
-		if (extraObjects[i].mapad[0] && extraObjects[i].id[0] == 255) {
+		if (extraObjects[i].mapad[0] && extraObjects[i].objId[0] == 255) {
 			deleteExObject(i);
 			return;
 		}
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 6ab8422075..4259d03657 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1396,7 +1396,7 @@ void DreamWebEngine::usePipe() {
 		showPuzText(36, 300);
 		putBackObStuff();
 		DynObject *exObject = getExAd(_withObject);
-		exObject->id[3] = 'F'-'A';	// CUPE (empty cup) -> CUPF (full cup)
+		exObject->objId[3] = 'F'-'A';	// CUPE (empty cup) -> CUPF (full cup)
 		return;
 	} else if (compare(_withObject, _withType, "CUPF")) {
 		// Already full
@@ -1419,7 +1419,7 @@ void DreamWebEngine::useOpenBox() {
 		_vars._progressPoints++;
 		showPuzText(37, 300);
 		DynObject *exObject = getExAd(_withObject);
-		exObject->id[3] = 'E'-'A';	// CUPF (full cup) -> CUPE (empty cup)
+		exObject->objId[3] = 'E'-'A';	// CUPF (full cup) -> CUPE (empty cup)
 		_vars._watchingTime = 140;
 		_vars._reelToWatch = 105;
 		_vars._endWatchReel = 181;
@@ -1449,7 +1449,7 @@ void DreamWebEngine::runTap() {
 	if (compare(_withObject, _withType, "CUPE")) {
 		// Fill cup from tap
 		DynObject *exObject = getExAd(_withObject);
-		exObject->id[3] = 'F'-'A';	// CUPE (empty cup) -> CUPF (full cup)
+		exObject->objId[3] = 'F'-'A';	// CUPE (empty cup) -> CUPF (full cup)
 		playChannel1(8);
 		showPuzText(57, 300);
 		putBackObStuff();
-- 
cgit v1.2.3


From 8f2b8e821fb9b5c03fdeb08977003f486ede092d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Dec 2011 16:23:16 +0100
Subject: DREAMWEB: Cleanup

---
 engines/dreamweb/backdrop.cpp |  4 +---
 engines/dreamweb/sprite.cpp   | 23 ++++++++++++++++-------
 engines/dreamweb/stubs.cpp    | 18 +++++++++---------
 3 files changed, 26 insertions(+), 19 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 887da70539..1db2663624 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -126,12 +126,10 @@ void DreamWebEngine::makeBackOb(SetObject *objData, uint16 x, uint16 y) {
 }
 
 void DreamWebEngine::showAllObs() {
-	const unsigned int count = 128;
-
 	_setList.clear();
 
 	const GraphicsFile &frameBase = _setFrames;
-	for (size_t i = 0; i < count; ++i) {
+	for (size_t i = 0; i < 128; ++i) {
 		SetObject *setEntry = &_setDat[i];
 		uint16 x, y;
 		if (getMapAd(setEntry->mapad, &x, &y) == 0)
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index e662fa6ec3..3ee73d23a3 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -227,20 +227,29 @@ void DreamWebEngine::backObject(Sprite *sprite) {
 	}
 
 	sprite->delay = objData->delay;
-	if (objData->type == 6)
+	switch (objData->type) {
+	case 6:
 		wideDoor(sprite, objData);
-	else if (objData->type == 5)
+		break;
+	case 5:
 		randomSprite(sprite, objData);
-	else if (objData->type == 4)
+		break;
+	case 4:
 		lockedDoorway(sprite, objData);
-	else if (objData->type == 3)
+		break;
+	case 3:
 		liftSprite(sprite, objData);
-	else if (objData->type == 2)
+		break;
+	case 2:
 		doorway(sprite, objData);
-	else if (objData->type == 1)
+		break;
+	case 1:
 		constant(sprite, objData);
-	else
+		break;
+	default:
 		steady(sprite, objData);
+		break;
+	}
 }
 
 void DreamWebEngine::constant(Sprite *sprite, SetObject *objData) {
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index bd9de7a23c..de42f54271 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1036,13 +1036,6 @@ void DreamWebEngine::lockMon() {
 	}
 }
 
-void DreamWebEngine::clearAndLoad(uint8 *buf, uint8 c,
-                                   unsigned int size, unsigned int maxSize) {
-	assert(size <= maxSize);
-	memset(buf, c, maxSize);
-	readFromFile(buf, size);
-}
-
 void DreamWebEngine::startLoading(const Room &room) {
 	_vars._combatCount = 0;
 	_roomsSample = room.roomsSample;
@@ -2117,10 +2110,17 @@ void DreamWebEngine::getRidOfAll() {
 	_freeDesc.clear();
 }
 
+void DreamWebEngine::clearAndLoad(uint8 *buf, uint8 c,
+                                   unsigned int size, unsigned int maxSize) {
+	assert(size <= maxSize);
+	memset(buf, c, maxSize);
+	readFromFile(buf, size);
+}
+
 // if skipDat, skip clearing and loading Setdat and Freedat
 void DreamWebEngine::loadRoomData(const Room &room, bool skipDat) {
-	const uint16 kSetdatlen = 64*128;
-	const uint16 kFreedatlen = 16*80;
+	const uint16 kSetdatlen = 64*128; // == sizeof(_setDat)
+	const uint16 kFreedatlen = 16*80; // == sizeof(_freeDat)
 
 	openFile(room.name);
 
-- 
cgit v1.2.3


From 13e252ebd09ca6d8ac557f0934c28650a797ffd9 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Dec 2011 16:32:34 +0100
Subject: DREAMWEB: Add 'packed' attribute to structs that need it

... and probably also to some that don't need it; since it seems better to
err on the wrong side here for now, I did not check every struct as to whether
it really needs this. On the long run, it would be better if the code did not
rely on any kind of packing anyway.
---
 engines/dreamweb/structs.h | 59 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 17 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index 18b8b280ab..fad2e1b5ae 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -58,6 +58,10 @@ struct RectWithCallback {
 	}
 };
 
+
+
+#include "common/pack-start.h"	// START STRUCT PACKING
+
 struct SetObject {
 	uint8 b0;
 	uint8 b1;
@@ -105,7 +109,7 @@ struct SetObject {
 	uint8 b57;
 	uint8 mapad[5];
 	uint8 b63;
-};
+} PACKED_STRUCT;
 
 struct DynObject {
 	uint8 currentLocation;
@@ -117,7 +121,7 @@ struct DynObject {
 	uint8 turnedOn;
 	uint8 initialLocation;
 	uint8 objId[4];
-};
+} PACKED_STRUCT;
 
 struct ObjPos {
 	uint8 xMin;
@@ -128,7 +132,7 @@ struct ObjPos {
 	bool contains(uint8 x, uint8 y) const {
 		return (x >= xMin) && (x < xMax) && (y >= yMin) && (y < yMax);
 	}
-};
+} PACKED_STRUCT;
 
 struct Frame {
 	uint8  width;
@@ -138,7 +142,7 @@ struct Frame {
 	void setPtr(uint16 v) { WRITE_LE_UINT16(&_ptr, v); }
 	uint8  x;
 	uint8  y;
-};
+} PACKED_STRUCT;
 
 struct Reel {
 	uint8 frame_lo;
@@ -148,7 +152,11 @@ struct Reel {
 	uint8 x;
 	uint8 y;
 	uint8 b4;
-};
+} PACKED_STRUCT;
+
+#include "common/pack-end.h"	// END STRUCT PACKING
+
+
 
 struct ReelRoutine {
 	uint8 reallocation;
@@ -167,9 +175,12 @@ struct People {
 	uint16 _reelPointer;
 	ReelRoutine *_routinePointer;
 	uint8 b4;
-
 };
 
+
+
+#include "common/pack-start.h"	// START STRUCT PACKING
+
 struct Room {
 	char  name[13];
 	uint8 roomsSample;
@@ -191,7 +202,8 @@ struct Room {
 	uint8 b29;
 	uint8 b30;
 	uint8 realLocation;
-};
+} PACKED_STRUCT;
+
 extern const Room g_roomData[];
 
 struct Rain {
@@ -200,14 +212,14 @@ struct Rain {
 	uint8 size;
 	uint16 w3;
 	uint8 b5;
-};
+} PACKED_STRUCT;
 
 struct Change {
 	uint8 index;
 	uint8 location;
 	uint8 value;
 	uint8 type;
-};
+} PACKED_STRUCT;
 
 struct PathNode {
 	uint8 x;
@@ -218,17 +230,17 @@ struct PathNode {
 	uint8 y2;
 	uint8 on;
 	uint8 dir;
-};
+} PACKED_STRUCT;
 
 struct PathSegment {
 	uint8 b0;
 	uint8 b1;
-};
+} PACKED_STRUCT;
 
 struct RoomPaths {
 	PathNode    nodes[12];
 	PathSegment segments[24];
-};
+} PACKED_STRUCT;
 
 struct FileHeader {
 	char _desc[50];
@@ -243,7 +255,7 @@ struct FileHeader {
 		assert(i < 20);
 		WRITE_LE_UINT16(&_len[i], length);
 	}
-};
+} PACKED_STRUCT;
 
 struct Atmosphere {
 	uint8 _location;
@@ -251,7 +263,11 @@ struct Atmosphere {
 	uint8 _mapY;
 	uint8 _sound;
 	uint8 _repeat;
-};
+} PACKED_STRUCT;
+
+#include "common/pack-end.h"	// END STRUCT PACKING
+
+
 
 enum ObjectTypes {
 	kSetObjectType1 = 1,
@@ -272,16 +288,26 @@ struct ObjectRef {
 	}
 };
 
+
+
+#include "common/pack-start.h"	// START STRUCT PACKING
+
 struct BackdropMapFlag {
 	uint8 _flag;
 	uint8 _flagEx;
-};
+} PACKED_STRUCT;
 
 struct MapFlag {
 	uint8 _flag;
 	uint8 _flagEx;
 	uint8 _type;
-};
+} PACKED_STRUCT;
+
+#include "common/pack-end.h"	// END STRUCT PACKING
+
+
+
+
 
 struct TextFile {
 	TextFile(unsigned int size = 66) : _size(size), _text(0) { _offsetsLE = new uint16[_size]; }
@@ -393,7 +419,6 @@ struct GameVars {
 	uint8 _shakeCounter;
 };
 
-
 } // End of namespace DreamWeb
 
 #endif
-- 
cgit v1.2.3


From 63da2ac271723a33839414827a2f01ef6185490e Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 28 Dec 2011 16:48:10 +0100
Subject: DREAMWEB: Clean up some constants

---
 engines/dreamweb/dreamweb.cpp |  6 ++++--
 engines/dreamweb/dreamweb.h   | 31 ++++++++++++-------------------
 engines/dreamweb/object.cpp   | 13 +++----------
 engines/dreamweb/saveload.cpp |  4 ++--
 engines/dreamweb/stubs.cpp    | 18 +++++++++---------
 5 files changed, 30 insertions(+), 42 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index b752ae7433..e91f5cbd41 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -39,8 +39,10 @@ namespace DreamWeb {
 
 DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gameDesc) :
 	Engine(syst), _gameDescription(gameDesc), _rnd("dreamweb"),
-	_exText(kNumExObjects+2),
-	_setDesc(130), _blockDesc(98), _roomDesc(38), _freeDesc(82), _personText(1026) {
+	_exText(kNumExTexts),
+	_setDesc(kNumSetTexts), _blockDesc(kNumBlockTexts),
+	_roomDesc(kNumRoomTexts), _freeDesc(kNumFreeTexts),
+	_personText(kNumPersonTexts) {
 
 	// Setup mixer
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index b7713352ff..4b84992d92 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -75,25 +75,18 @@ const unsigned int kOpsy = 52;
 const unsigned int kSymbolx = 64;
 const unsigned int kSymboly = 56;
 const unsigned int kLengthofvars = 68;
-const unsigned int kDebuglevel1 = (0);
-const unsigned int kDebuglevel2 = (0);
-const unsigned int kPlayback = (0);
-const unsigned int kSpanish = (0);
-const unsigned int kRecording = (0);
-const unsigned int kGerman = (0);
-const unsigned int kDemo = (0);
-const unsigned int kExframedata = (0);
-const unsigned int kExframes = (0+2080);
-const unsigned int kExdata = (0+2080+30000);
-const unsigned int kExtextdat = (0+2080+30000+(16*114));
-const unsigned int kExtext = (0+2080+30000+(16*114)+((114+2)*2));
-const unsigned int kLengthofextra = (0+2080+30000+(16*114)+((114+2)*2)+18000);
-const unsigned int kForeign = (1);
-const unsigned int kCd = (1);
-const unsigned int kNumexobjects = (114);
-const unsigned int kExtextlen = (18000);
-const unsigned int kExframeslen = (30000);
-const unsigned int kItempicsize = (44);
+const unsigned int kFrameBlocksize = 2080;
+const unsigned int kNumexobjects = 114;
+const unsigned int kNumExTexts = kNumexobjects + 2;
+const uint16 kExtextlen = 18000;
+const uint16 kExframeslen = 30000;
+const unsigned int kLengthofextra = kFrameBlocksize + kExframeslen + sizeof(DynObject)*kNumexobjects + sizeof(uint16)*kNumExTexts + kExtextlen;
+const unsigned int kItempicsize = 44;
+const unsigned int kNumSetTexts = 130;
+const unsigned int kNumBlockTexts = 98;
+const unsigned int kNumRoomTexts = 38;
+const unsigned int kNumFreeTexts = 82;
+const unsigned int kNumPersonTexts = 1026;
 
 // Keyboard buffer. data.word(kBufferin) and data.word(kBufferout) are indexes
 // into this, making it a ring buffer
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index a9cbadcc2c..b39be9cbe1 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -585,23 +585,16 @@ void DreamWebEngine::purgeALocation(uint8 index) {
 }
 
 const uint8 *DreamWebEngine::getObTextStart() {
-	const uint16 kSettext = 130*2;
-	const uint16 kFreetext = 82*2;
-
-	const uint8 *textBase;
+	const uint8 *textBase = 0;
 	const uint8 *text;
-	uint16 textOff;
+	uint16 textOff = 0;
 	if (_objectType == kFreeObjectType) {
-		textBase = (const uint8 *)_freeDesc._text;
-		textOff = kFreetext;
 		text = (const uint8 *)_freeDesc.getString(_command);
 	} else if (_objectType == kSetObjectType1) {
 		textBase = (const uint8 *)_setDesc._text;
-		textOff = kSettext;
+		textOff = kNumSetTexts * 2;
 		text = (const uint8 *)_setDesc.getString(_command);
 	} else {
-		textBase = (const uint8 *)_exText._text;
-		textOff = kExtext;
 		text = (const uint8 *)_exText.getString(_command);
 	}
 
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 76770f060e..9b16d14e7b 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -542,7 +542,7 @@ void DreamWebEngine::savePosition(unsigned int slot, const char *descbuf) {
 	syncGameVars(s, _vars);
 
 	// the Extras segment:
-	outSaveFile->write((const uint8 *)_exFrames._frames, 2080);
+	outSaveFile->write((const uint8 *)_exFrames._frames, kFrameBlocksize);
 	outSaveFile->write((const uint8 *)_exFrames._data, kExframeslen);
 	outSaveFile->write((const uint8 *)_exData, sizeof(DynObject)*kNumexobjects);
 	outSaveFile->write((const uint8 *)_exText._offsetsLE, 2*(kNumExObjects+2));
@@ -616,7 +616,7 @@ void DreamWebEngine::loadPosition(unsigned int slot) {
 	syncGameVars(s, _vars);
 
 	// the Extras segment:
-	inSaveFile->read((uint8 *)_exFrames._frames, kExframes);
+	inSaveFile->read((uint8 *)_exFrames._frames, kFrameBlocksize);
 	inSaveFile->read((uint8 *)_exFrames._data, kExframeslen);
 	inSaveFile->read((uint8 *)_exData, sizeof(DynObject)*kNumexobjects);
 	inSaveFile->read((uint8 *)_exText._offsetsLE, 2*(kNumExObjects+2));
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index f009bd5963..cf1eb4575e 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -786,20 +786,20 @@ void DreamWebEngine::loadGraphicsFile(GraphicsFile &file, const char *fileName)
 	f.read((uint8 *)&header, sizeof(FileHeader));
 	uint16 sizeInBytes = header.len(0);
 
-	assert(sizeInBytes >= 2080);
+	assert(sizeInBytes >= kFrameBlocksize);
 	delete[] file._data;
-	file._data = new uint8[sizeInBytes - 2080];
+	file._data = new uint8[sizeInBytes - kFrameBlocksize];
 
-	f.read((uint8 *)file._frames, 2080);
-	f.read(file._data, sizeInBytes - 2080);
+	f.read((uint8 *)file._frames, kFrameBlocksize);
+	f.read(file._data, sizeInBytes - kFrameBlocksize);
 }
 
 void DreamWebEngine::loadGraphicsSegment(GraphicsFile &file, unsigned int len) {
-	assert(len >= 2080);
+	assert(len >= kFrameBlocksize);
 	delete[] file._data;
-	file._data = new uint8[len - 2080];
-	readFromFile((uint8 *)file._frames, 2080);
-	readFromFile(file._data, len - 2080);
+	file._data = new uint8[len - kFrameBlocksize];
+	readFromFile((uint8 *)file._frames, kFrameBlocksize);
+	readFromFile(file._data, len - kFrameBlocksize);
 }
 
 void DreamWebEngine::loadTextSegment(TextFile &file, unsigned int len) {
@@ -3538,7 +3538,7 @@ void DreamWebEngine::clearChanges() {
 	_vars._exFramePos = 0;
 	_vars._exTextPos = 0;
 
-	memset(_exFrames._frames, 0xFF, 2080);
+	memset(_exFrames._frames, 0xFF, kFrameBlocksize);
 	memset(_exFrames._data, 0xFF, kExframeslen);
 	memset(_exData, 0xFF, sizeof(DynObject) * kNumexobjects);
 	memset(_exText._offsetsLE, 0xFF, 2*(kNumexobjects+2));
-- 
cgit v1.2.3


From eaed1b725a7720e5ca72d9c3d380c218c9e5ac6d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 18:53:45 +0200
Subject: DREAMWEB: Replaced most isCD calls with calls checking for speech

This is quite useful for devices with limited storage, where the user
can use the CD version without its speech files
---
 engines/dreamweb/dreamweb.cpp |  8 ++++++++
 engines/dreamweb/dreamweb.h   |  4 +++-
 engines/dreamweb/people.cpp   | 14 +++++++-------
 engines/dreamweb/saveload.cpp |  8 +++++---
 engines/dreamweb/sprite.cpp   | 24 ++++++++++++------------
 engines/dreamweb/stubs.cpp    | 14 ++------------
 engines/dreamweb/talk.cpp     | 16 ++++++++--------
 engines/dreamweb/titles.cpp   |  6 +++---
 8 files changed, 48 insertions(+), 46 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index e91f5cbd41..661981c377 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -369,6 +369,7 @@ Common::Error DreamWebEngine::run() {
 	_console = new DreamWebConsole(this);
 
 	ConfMan.registerDefault("dreamweb_originalsaveload", "false");
+	_hasSpeech = Common::File::exists("speech/r01c0000.raw");
 
 	_timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync");
 	dreamweb();
@@ -568,4 +569,11 @@ uint8 DreamWebEngine::modifyChar(uint8 c) const {
 	}
 }
 
+bool DreamWebEngine::isCD() {
+	return _gameDescription->desc.flags & ADGF_CD;
+}
+
+bool DreamWebEngine::hasSpeech() {
+	return isCD() && _hasSpeech;
+}
 } // End of namespace DreamWeb
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 4b84992d92..2de29491e5 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -136,6 +136,8 @@ public:
 	void processEvents();
 	void blit(const uint8 *src, int pitch, int x, int y, int w, int h);
 	void cls();
+	bool isCD();
+	bool hasSpeech();
 
 	void getPalette(uint8 *data, uint start, uint count);
 	void setPalette(const uint8 *data, uint start, uint count);
@@ -299,6 +301,7 @@ public:
 	bool _foreignRelease;
 
 	bool _wonGame;
+	bool _hasSpeech;
 
 	// sound related
 	uint8 _roomsSample;
@@ -768,7 +771,6 @@ public:
 
 	// from stubs.cpp
 	void setupInitialVars();
-	bool isCD();
 	void crosshair();
 	void delTextLine();
 	void showBlink();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 40084a28c4..6745a34453 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -123,7 +123,7 @@ static const ReelRoutine g_initialReelRoutines[] = {
 void DreamWebEngine::setupInitialReelRoutines() {
 	for (unsigned int i = 0; i < kNumReelRoutines + 1; ++i) {
 		_reelRoutines[i] = g_initialReelRoutines[i];
-		if (_reelRoutines[i].period == 55 && isCD() && getLanguage() == Common::DE_DEU)
+		if (_reelRoutines[i].period == 55 && hasSpeech() && getLanguage() == Common::DE_DEU)
 			_reelRoutines[i].period = 65;
 	}
 }
@@ -145,7 +145,7 @@ void DreamWebEngine::updatePeople() {
 void DreamWebEngine::madmanText() {
 	byte origCount;
 
-	if (isCD()) {
+	if (hasSpeech()) {
 		if (_speechCount >= 63)
 			return;
 		if (_channel1Playing != 255)
@@ -188,12 +188,12 @@ void DreamWebEngine::madman(ReelRoutine &routine) {
 			++_vars._combatCount;
 			madmanText();
 			newReelPointer = 53;
-			if (_vars._combatCount >= (isCD() ? 64 : 62)) {
-				if (_vars._combatCount == (isCD() ? 70 : 68))
+			if (_vars._combatCount >= (hasSpeech() ? 64 : 62)) {
+				if (_vars._combatCount == (hasSpeech() ? 70 : 68))
 					newReelPointer = 310;
 				else {
 					if (_vars._lastWeapon == 8) {
-						_vars._combatCount = isCD() ? 72 : 70;
+						_vars._combatCount = hasSpeech() ? 72 : 70;
 						_vars._lastWeapon = (uint8)-1;
 						_vars._madmanFlag = 1;
 						newReelPointer = 67;
@@ -211,9 +211,9 @@ void DreamWebEngine::madman(ReelRoutine &routine) {
 void DreamWebEngine::madMode() {
 	_vars._watchingTime = 2;
 	_pointerMode = 0;
-	if (_vars._combatCount < (isCD() ? 65 : 63))
+	if (_vars._combatCount < (hasSpeech() ? 65 : 63))
 		return;
-	if (_vars._combatCount >= (isCD() ? 70 : 68))
+	if (_vars._combatCount >= (hasSpeech() ? 70 : 68))
 		return;
 	_pointerMode = 2;
 }
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 9b16d14e7b..415f1a80ef 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -840,9 +840,11 @@ void DreamWebEngine::showSlots() {
 void DreamWebEngine::showOpBox() {
 	showFrame(_tempGraphics, kOpsx, kOpsy, 0, 0);
 
-	// CHECKME: There seem to be versions of dreamweb in which this call
-	// should be removed. It displays a red dot on the ops dialogs if left in.
-	showFrame(_tempGraphics, kOpsx, kOpsy + 55, 4, 0);
+	// This call displays half of the ops dialog in the CD version. It's not
+	// in the floppy version, and if it's called, a stray red dot is shown in
+	// the game dialogs.
+	if (isCD())
+		showFrame(_tempGraphics, kOpsx, kOpsy + 55, 4, 0);
 }
 
 void DreamWebEngine::showLoadOps() {
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index e662fa6ec3..07f391addc 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -670,7 +670,7 @@ void DreamWebEngine::intro1Text() {
 	if (_introCount != 2 && _introCount != 4 && _introCount != 6)
 		return;
 
-	if (isCD() && _channel1Playing != 255) {
+	if (hasSpeech() && _channel1Playing != 255) {
 		_introCount--;
 	} else {
 		if (_introCount == 2)
@@ -692,12 +692,12 @@ void DreamWebEngine::intro2Text(uint16 nextReelPointer) {
 void DreamWebEngine::intro3Text(uint16 nextReelPointer) {
 	if (nextReelPointer == 107)
 		setupTimedTemp(45, 82, 36, 56, 100, 1);
-	else if (nextReelPointer == (isCD() ? 108 : 109))
+	else if (nextReelPointer == (hasSpeech() ? 108 : 109))
 		setupTimedTemp(46, 82, 36, 56, 100, 1);
 }
 
 void DreamWebEngine::monks2text() {
-	bool isGermanCD = isCD() && getLanguage() == Common::DE_DEU;
+	bool isGermanCD = hasSpeech() && getLanguage() == Common::DE_DEU;
 
 	if (_introCount == 1)
 		setupTimedTemp(8, 82, 36, 160, 120, 1);
@@ -706,14 +706,14 @@ void DreamWebEngine::monks2text() {
 	else if (_introCount == (isGermanCD ? 9 : 7))
 		setupTimedTemp(10, 82, 36, 160, 120, 1);
 	else if (_introCount == 10 && !isGermanCD) {
-		if (isCD())
+		if (hasSpeech())
 			_introCount = 12;
 		setupTimedTemp(11, 82, 0, 105, 120, 1);
 	} else if (_introCount == 13 && isGermanCD) {
 		_introCount = 14;
 		setupTimedTemp(11, 82, 0, 105, 120, 1);
 	} else if (_introCount == 13 && !isGermanCD) {
-		if (isCD())
+		if (hasSpeech())
 			_introCount = 17;
 		else
 			setupTimedTemp(12, 82, 0, 120, 120, 1);
@@ -725,7 +725,7 @@ void DreamWebEngine::monks2text() {
 		setupTimedTemp(15, 82, 36, 160, 120, 1);
 	else if (_introCount == (isGermanCD ? 27 : 25))
 		setupTimedTemp(16, 82, 36, 160, 120, 1);
-	else if (_introCount == (isCD() ? 27 : 28) && !isGermanCD)
+	else if (_introCount == (hasSpeech() ? 27 : 28) && !isGermanCD)
 		setupTimedTemp(17, 82, 36, 160, 120, 1);
 	else if (_introCount == 30 && isGermanCD)
 		setupTimedTemp(17, 82, 36, 160, 120, 1);
@@ -736,14 +736,14 @@ void DreamWebEngine::monks2text() {
 void DreamWebEngine::textForEnd() {
 	if (_introCount == 20)
 		setupTimedTemp(0, 83, 34, 20, 60, 1);
-	else if (_introCount == (isCD() ? 50 : 65))
+	else if (_introCount == (hasSpeech() ? 50 : 65))
 		setupTimedTemp(1, 83, 34, 20, 60, 1);
-	else if (_introCount == (isCD() ? 85 : 110))
+	else if (_introCount == (hasSpeech() ? 85 : 110))
 		setupTimedTemp(2, 83, 34, 20, 60, 1);
 }
 
 void DreamWebEngine::textForMonkHelper(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
-	if (isCD() && _channel1Playing != 255)
+	if (hasSpeech() && _channel1Playing != 255)
 		_introCount--;
 	else
 		setupTimedTemp(textIndex, voiceIndex, x, y, countToTimed, timeCount);
@@ -758,7 +758,7 @@ void DreamWebEngine::textForMonk() {
 		textForMonkHelper(21, 82, 48, 154, 120, 1);
 	else if (_introCount == 13)
 		textForMonkHelper(22, 82, 68, 38, 120, 1);
-	else if (_introCount == (isCD() ? 15 : 17))
+	else if (_introCount == (hasSpeech() ? 15 : 17))
 		textForMonkHelper(23, 82, 68, 154, 120, 1);
 	else if (_introCount == 21)
 		textForMonkHelper(24, 82, 68, 38, 120, 1);
@@ -774,11 +774,11 @@ void DreamWebEngine::textForMonk() {
 		textForMonkHelper(29, 82, 68, 38, 120, 1);
 	else if (_introCount == 45)
 		textForMonkHelper(30, 82, 68, 154, 120, 1);
-	else if (_introCount == (isCD() ? 52 : 49))
+	else if (_introCount == (hasSpeech() ? 52 : 49))
 		textForMonkHelper(31, 82, 68, 154, 220, 1);
 	else if (_introCount == 53) {
 		fadeScreenDowns();
-		if (isCD()) {
+		if (hasSpeech()) {
 			_volumeTo = 7;
 			_volumeDirection = 1;
 		}
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index cf1eb4575e..d91eb242ff 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -935,8 +935,7 @@ void DreamWebEngine::useTimedText() {
 }
 
 void DreamWebEngine::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
-#if 1	// if cd - TODO: replace with a proper CD check
-	if (voiceIndex != 0) {
+	if (hasSpeech() && voiceIndex != 0) {
 		if (loadSpeech('T', voiceIndex, 'T', textIndex)) {
 			playChannel1(50+12);
 		}
@@ -947,7 +946,6 @@ void DreamWebEngine::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x,
 		if (_speechLoaded && !_subtitles)
 			return;
 	}
-#endif
 
 	if (_timeCount != 0)
 		return;
@@ -1661,14 +1659,6 @@ bool DreamWebEngine::isItDescribed(const ObjPos *pos) {
 	return string[0] != 0;
 }
 
-bool DreamWebEngine::isCD() {
-	// The original sources has two codepaths depending if the game is 'if cd' or not
-	// This is a hack to guess which version to use with the assumption that if we have a cd version
-	// we managed to load the speech. At least it is isolated in this function and can be changed.
-	// Maybe detect the version during game id?
-	return (_speechLoaded);
-}
-
 void DreamWebEngine::showIcon() {
 	if (_realLocation < 50) {
 		showPanel();
@@ -2532,7 +2522,7 @@ void DreamWebEngine::atmospheres() {
 			if (_realLocation == 2 && _mapX == 22 && _mapY == 10)
 				_volume = 5; // "louisvol"
 
-			if (isCD() && _realLocation == 14) {
+			if (hasSpeech() && _realLocation == 14) {
 				if (_mapX == 33) {
 					_volume = 0; // "ismad2"
 					return;
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 56826e70bb..2899e81d00 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -98,15 +98,15 @@ void DreamWebEngine::startTalk() {
 	y = 80;
 	printDirect(&str, 66, &y, 241, true);
 
-#if 1	// if cd - TODO: replace with a proper CD check
-	_speechLoaded = false;
-	loadSpeech('R', _realLocation, 'C', 64*(_character & 0x7F));
-	if (_speechLoaded) {
-		_volumeDirection = 1;
-		_volumeTo = 6;
-		playChannel1(50 + 12);
+	if (hasSpeech()) {
+		_speechLoaded = false;
+		loadSpeech('R', _realLocation, 'C', 64*(_character & 0x7F));
+		if (_speechLoaded) {
+			_volumeDirection = 1;
+			_volumeTo = 6;
+			playChannel1(50 + 12);
+		}
 	}
-#endif
 }
 
 const uint8 *DreamWebEngine::getPersonText(uint8 index, uint8 talkPos) {
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index c57684c3a8..8b56ffc57e 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -44,12 +44,12 @@ void DreamWebEngine::monkSpeaking() {
 	workToScreen();
 	_volume = 7;
 	_volumeDirection = -1;
-	_volumeTo = isCD() ? 5 : 0;
+	_volumeTo = hasSpeech() ? 5 : 0;
 	playChannel0(12, 255);
 	fadeScreenUps();
 	hangOn(300);
 
-	if (isCD()) {
+	if (hasSpeech()) {
 		for (int i = 40; i <= 48; i++) {
 			loadSpeech('T', 83, 'T', i);
 
@@ -141,7 +141,7 @@ void DreamWebEngine::intro() {
 	loadIntroRoom();
 	_volume = 7;
 	_volumeDirection = -1;
-	_volumeTo = isCD() ? 4 : 0;
+	_volumeTo = hasSpeech() ? 4 : 0;
 	playChannel0(12, 255);
 	fadeScreenUps();
 	runIntroSeq();
-- 
cgit v1.2.3


From 972ebc0c757ac76cd4fa7b742de0bbd5f9058a7a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 20:15:08 +0200
Subject: DREAMWEB: Allow skipping the mad man sequence with the ESC key

---
 engines/dreamweb/people.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'engines')

diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 6745a34453..98f36a90cc 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -186,8 +186,13 @@ void DreamWebEngine::madman(ReelRoutine &routine) {
 		}
 		if (newReelPointer == 66) {
 			++_vars._combatCount;
+
+			if (_lastHardKey == 1)	// ESC pressed, skip the mad man's speech
+				_vars._combatCount = _speechCount = (hasSpeech() ? 65 : 63);
+
 			madmanText();
 			newReelPointer = 53;
+
 			if (_vars._combatCount >= (hasSpeech() ? 64 : 62)) {
 				if (_vars._combatCount == (hasSpeech() ? 70 : 68))
 					newReelPointer = 310;
-- 
cgit v1.2.3


From 6a5c75a439ce2e909cd7088380ae9ca8d005b6c3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 20:26:15 +0200
Subject: DREAMWEB: Changed hasSpeech() to also take account of the audio
 settings

This fixes an assert in the madman sequence
---
 engines/dreamweb/dreamweb.cpp | 2 +-
 engines/dreamweb/sound.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 661981c377..f942b84f76 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -369,7 +369,7 @@ Common::Error DreamWebEngine::run() {
 	_console = new DreamWebConsole(this);
 
 	ConfMan.registerDefault("dreamweb_originalsaveload", "false");
-	_hasSpeech = Common::File::exists("speech/r01c0000.raw");
+	_hasSpeech = Common::File::exists("speech/r01c0000.raw") && !ConfMan.getBool("speech_mute");
 
 	_timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync");
 	dreamweb();
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index 8e125cc0e1..b79be28cea 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -173,7 +173,7 @@ void DreamWebEngine::stopSound(uint8 channel) {
 }
 
 bool DreamWebEngine::loadSpeech(const Common::String &filename) {
-	if (ConfMan.getBool("speech_mute"))
+	if (!hasSpeech())
 		return false;
 
 	Common::File file;
-- 
cgit v1.2.3


From c6dfac9b0aa2f2b891cc14feb7fc6085e40ffa5a Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Dec 2011 19:34:38 +0100
Subject: DREAMWEB: Move more methods to keypad.cpp, reorder them to match ASM

---
 engines/dreamweb/keypad.cpp | 787 +++++++++++++++++++++++++++++++++++++++-----
 engines/dreamweb/stubs.cpp  | 558 -------------------------------
 engines/dreamweb/use.cpp    |  77 +----
 3 files changed, 713 insertions(+), 709 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 731c58f2f8..4f34894dfa 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -27,74 +27,6 @@ namespace DreamWeb {
 const uint16 kKeypadx = 36+112;
 const uint16 kKeypady = 72;
 
-void DreamWebEngine::getUnderMenu() {
-	multiGet(_underTimedText, kMenux, kMenuy, 48, 48);
-}
-
-void DreamWebEngine::putUnderMenu() {
-	multiPut(_underTimedText, kMenux, kMenuy, 48, 48);
-}
-
-void DreamWebEngine::singleKey(uint8 key, uint16 x, uint16 y) {
-	if (key == _graphicPress) {
-		key += 11;
-		if (_pressCount < 8)
-			key -= 11;
-	}
-	key -= 20;
-	showFrame(_tempGraphics, x, y, key, 0);
-}
-
-void DreamWebEngine::loadKeypad() {
-	loadIntoTemp("DREAMWEB.G02");
-}
-
-void DreamWebEngine::showKeypad() {
-	singleKey(22, kKeypadx+9,  kKeypady+5);
-	singleKey(23, kKeypadx+31, kKeypady+5);
-	singleKey(24, kKeypadx+53, kKeypady+5);
-	singleKey(25, kKeypadx+9,  kKeypady+23);
-	singleKey(26, kKeypadx+31, kKeypady+23);
-	singleKey(27, kKeypadx+53, kKeypady+23);
-	singleKey(28, kKeypadx+9,  kKeypady+41);
-	singleKey(29, kKeypadx+31, kKeypady+41);
-	singleKey(30, kKeypadx+53, kKeypady+41);
-	singleKey(31, kKeypadx+9,  kKeypady+59);
-	singleKey(32, kKeypadx+31, kKeypady+59);
-	if (_lightCount) {
-		--_lightCount;
-		uint8 frameIndex;
-		uint16 y;
-		if (_vars._lockStatus) {
-			frameIndex = 36;
-			y = kKeypady-1+63;
-		} else {
-			frameIndex = 41;
-			y = kKeypady+4+63;
-		}
-		if ((_lightCount >= 60) && (_lightCount < 100))
-			--frameIndex;
-		showFrame(_tempGraphics, kKeypadx+60, y, frameIndex, 0);
-	}
-}
-
-bool DreamWebEngine::isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
-	
-	return digit0 == _pressList[0] && digit1 == _pressList[1]
-		&& digit2 == _pressList[2] && digit3 == _pressList[3];
-}
-
-void DreamWebEngine::addToPressList() {
-	if (_pressPointer == 5)
-		return;
-	uint8 pressed = _pressed;
-	if (pressed == 10)
-		pressed = 0;
-
-	_pressList[_pressPointer] = pressed;
-	++_pressPointer;
-}
-
 void DreamWebEngine::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
 	RectWithCallback<DreamWebEngine> keypadList[] = {
 		{ kKeypadx+9,kKeypadx+30,kKeypady+9,kKeypady+22,&DreamWebEngine::buttonOne },
@@ -167,6 +99,39 @@ void DreamWebEngine::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 d
 	workToScreenM();
 }
 
+// Note: isItRight comes from use.asm, but is only used by enterCode(),
+// so we place it here.
+bool DreamWebEngine::isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
+
+	return digit0 == _pressList[0] && digit1 == _pressList[1]
+		&& digit2 == _pressList[2] && digit3 == _pressList[3];
+}
+
+void DreamWebEngine::loadKeypad() {
+	loadIntoTemp("DREAMWEB.G02");
+}
+
+void DreamWebEngine::quitKey() {
+	if (_commandType != 222) {
+		_commandType = 222;
+		commandOnly(4);
+	}
+
+	if (_mouseButton != _oldButton && (_mouseButton & 1))
+		_getBack = 1;
+}
+
+void DreamWebEngine::addToPressList() {
+	if (_pressPointer == 5)
+		return;
+	uint8 pressed = _pressed;
+	if (pressed == 10)
+		pressed = 0;
+
+	_pressList[_pressPointer] = pressed;
+	++_pressPointer;
+}
+
 void DreamWebEngine::buttonOne() {
 	buttonPress(1);
 }
@@ -231,19 +196,365 @@ void DreamWebEngine::showOuterPad() {
 	showFrame(_tempGraphics, kKeypadx+74, kKeypady+76, 37, 0);
 }
 
+void DreamWebEngine::showKeypad() {
+	singleKey(22, kKeypadx+9,  kKeypady+5);
+	singleKey(23, kKeypadx+31, kKeypady+5);
+	singleKey(24, kKeypadx+53, kKeypady+5);
+	singleKey(25, kKeypadx+9,  kKeypady+23);
+	singleKey(26, kKeypadx+31, kKeypady+23);
+	singleKey(27, kKeypadx+53, kKeypady+23);
+	singleKey(28, kKeypadx+9,  kKeypady+41);
+	singleKey(29, kKeypadx+31, kKeypady+41);
+	singleKey(30, kKeypadx+53, kKeypady+41);
+	singleKey(31, kKeypadx+9,  kKeypady+59);
+	singleKey(32, kKeypadx+31, kKeypady+59);
+	if (_lightCount) {
+		--_lightCount;
+		uint8 frameIndex;
+		uint16 y;
+		if (_vars._lockStatus) {
+			frameIndex = 36;
+			y = kKeypady-1+63;
+		} else {
+			frameIndex = 41;
+			y = kKeypady+4+63;
+		}
+		if ((_lightCount >= 60) && (_lightCount < 100))
+			--frameIndex;
+		showFrame(_tempGraphics, kKeypadx+60, y, frameIndex, 0);
+	}
+}
+
+void DreamWebEngine::singleKey(uint8 key, uint16 x, uint16 y) {
+	if (key == _graphicPress) {
+		key += 11;
+		if (_pressCount < 8)
+			key -= 11;
+	}
+	key -= 20;
+	showFrame(_tempGraphics, x, y, key, 0);
+}
+
 void DreamWebEngine::dumpKeypad() {
 	multiDump(kKeypadx - 3, kKeypady - 4, 120, 90);
 }
 
-void DreamWebEngine::dumpSymbol() {
-	_newTextLine = 0;
-	multiDump(kSymbolx, kSymboly + 20, 104, 60);
+void DreamWebEngine::useMenu() {
+	getRidOfReels();
+	loadMenu();
+	createPanel();
+	showPanel();
+	showIcon();
+	_vars._newObs = 0;
+	drawFloor();
+	printSprites();
+	showFrame(_tempGraphics2, kMenux-48, kMenuy-4, 4, 0);
+	getUnderMenu();
+	showFrame(_tempGraphics2, kMenux+54, kMenuy+72, 5, 0);
+	workToScreenM();
+	_getBack = 0;
+	do {
+		delPointer();
+		putUnderMenu();
+		showMenu();
+		readMouse();
+		showPointer();
+		vSync();
+		dumpPointer();
+		dumpMenu();
+		dumpTextLine();
+		RectWithCallback<DreamWebEngine> menuList[] = {
+			{ kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamWebEngine::quitKey },
+			{ 0,320,0,200,&DreamWebEngine::blank },
+			{ 0xFFFF,0,0,0,0 }
+		};
+		checkCoords(menuList);
+	} while ((_getBack != 1) && !_quitRequested);
+	_manIsOffScreen = 0;
+	redrawMainScrn();
+	getRidOfTemp();
+	getRidOfTemp2();
+	restoreReels();
+	workToScreenM();
 }
 
-void DreamWebEngine::dumpSymBox() {
-	if (_dumpX != 0xFFFF) {
-		multiDump(_dumpX, _dumpY, 30, 77);
-		_dumpX = 0xFFFF;
+void DreamWebEngine::dumpMenu() {
+	multiDump(kMenux, kMenuy, 48, 48);
+}
+
+void DreamWebEngine::getUnderMenu() {
+	multiGet(_underTimedText, kMenux, kMenuy, 48, 48);
+}
+
+void DreamWebEngine::putUnderMenu() {
+	multiPut(_underTimedText, kMenux, kMenuy, 48, 48);
+}
+
+// Note: showoutermenu from the asm version was unused and thus not placed here
+
+void DreamWebEngine::showMenu() {
+	++_menuCount;
+	if (_menuCount == 37*2)
+		_menuCount = 0;
+	showFrame(_tempGraphics, kMenux, kMenuy, _menuCount / 2, 0);
+}
+
+void DreamWebEngine::loadMenu() {
+	loadIntoTemp("DREAMWEB.S02"); // sprite name 3
+	loadIntoTemp2("DREAMWEB.G07"); // mon. graphics 2
+}
+
+void DreamWebEngine::viewFolder() {
+	_manIsOffScreen = 1;
+	getRidOfAll();
+	loadFolder();
+	_folderPage = 0;
+	showFolder();
+	workToScreenM();
+	_getBack = 0;
+	do {
+		if (_quitRequested)
+			break;
+		delPointer();
+		readMouse();
+		showPointer();
+		vSync();
+		dumpPointer();
+		dumpTextLine();
+		checkFolderCoords();
+	} while (_getBack == 0);
+	_manIsOffScreen = 0;
+	getRidOfTemp();
+	getRidOfTemp2();
+	getRidOfTemp3();
+	getRidOfTempCharset();
+	restoreAll();
+	redrawMainScrn();
+	workToScreenM();
+}
+
+void DreamWebEngine::nextFolder() {
+	if (_folderPage == 12) {
+		blank();
+		return;
+	}
+	if (_commandType != 201) {
+		_commandType = 201;
+		commandOnly(16);
+	}
+	if ((_mouseButton == 1) && (_mouseButton != _oldButton)) {
+		++_folderPage;
+		folderHints();
+		delPointer();
+		showFolder();
+		_mouseButton = 0;
+		checkFolderCoords();
+		workToScreenM();
+	}
+}
+
+void DreamWebEngine::folderHints() {
+	if (_folderPage == 5) {
+		if ((_vars._aideDead != 1) && (getLocation(13) != 1)) {
+			setLocation(13);
+			showFolder();
+			const uint8 *string = getTextInFile1(30);
+			printDirect(string, 0, 86, 141, true);
+			workToScreenM();
+			hangOnP(200);
+		}
+	} else if (_folderPage == 9) {
+		if (getLocation(7) != 1) {
+			setLocation(7);
+			showFolder();
+			const uint8 *string = getTextInFile1(31);
+			printDirect(string, 0, 86, 141, true);
+			workToScreenM();
+			hangOnP(200);
+		}
+	}
+}
+
+void DreamWebEngine::lastFolder() {
+	if (_folderPage == 0) {
+		blank();
+		return;
+	}
+	if (_commandType != 202) {
+		_commandType = 202;
+		commandOnly(17);
+	}
+
+	if ((_mouseButton == 1) && (_mouseButton != _oldButton)) {
+		--_folderPage;
+		delPointer();
+		showFolder();
+		_mouseButton = 0;
+		checkFolderCoords();
+		workToScreenM();
+	}
+}
+
+void DreamWebEngine::checkFolderCoords() {
+	RectWithCallback<DreamWebEngine> folderList[] = {
+		{ 280,320,160,200, &DreamWebEngine::quitKey },
+		{ 143,300,6,194, &DreamWebEngine::nextFolder },
+		{ 0,143,6,194, &DreamWebEngine::lastFolder },
+		{ 0,320,0,200, &DreamWebEngine::blank },
+		{ 0xFFFF,0,0,0, 0 }
+	};
+	checkCoords(folderList);
+}
+
+void DreamWebEngine::loadFolder() {
+	loadIntoTemp("DREAMWEB.G09"); // folder graphics 1
+	loadIntoTemp2("DREAMWEB.G10"); // folder graphics 2
+	loadIntoTemp3("DREAMWEB.G11"); // folder graphics 3
+	loadTempCharset("DREAMWEB.C02"); // character set 3
+	loadTempText("DREAMWEB.T50"); // folder text
+}
+
+void DreamWebEngine::showFolder() {
+	_commandType = 255;
+	if (_folderPage) {
+		useTempCharset();
+		createPanel2();
+		showFrame(_tempGraphics, 0, 0, 0, 0);
+		showFrame(_tempGraphics, 143, 0, 1, 0);
+		showFrame(_tempGraphics, 0, 92, 2, 0);
+		showFrame(_tempGraphics, 143, 92, 3, 0);
+		folderExit();
+		if (_folderPage != 1)
+			showLeftPage();
+		if (_folderPage != 12)
+			showRightPage();
+		useCharset1();
+		underTextLine();
+	} else {
+		createPanel2();
+		showFrame(_tempGraphics3, 143-28, 0, 0, 0);
+		showFrame(_tempGraphics3, 143-28, 92, 1, 0);
+		folderExit();
+		underTextLine();
+	}
+}
+
+void DreamWebEngine::folderExit() {
+	showFrame(_tempGraphics2, 296, 178, 6, 0);
+}
+
+void DreamWebEngine::showLeftPage() {
+	showFrame(_tempGraphics2, 0, 12, 3, 0);
+	uint16 y = 12+5;
+	for (size_t i = 0; i < 9; ++i) {
+		showFrame(_tempGraphics2, 0, y, 4, 0);
+		y += 16;
+	}
+	showFrame(_tempGraphics2, 0, y, 5, 0);
+	_lineSpacing = 8;
+	_charShift = 91;
+	_kerning = 1;
+	uint8 pageIndex = _folderPage - 2;
+	const uint8 *string = getTextInFile1(pageIndex * 2);
+	y = 48;
+	for (size_t i = 0; i < 2; ++i) {
+		uint8 lastChar;
+		do {
+			lastChar = printDirect(&string, 2, &y, 140, false);
+			y += _lineSpacing;
+		} while (lastChar != '\0');
+	}
+	_kerning = 0;
+	_charShift = 0;
+	_lineSpacing = 10;
+	uint8 *bufferToSwap = workspace() + (48*320)+2;
+	for (size_t i = 0; i < 120; ++i) {
+		for (size_t j = 0; j < 65; ++j) {
+			SWAP(bufferToSwap[j], bufferToSwap[130 - j]);
+		}
+		bufferToSwap += 320;
+	}
+}
+
+void DreamWebEngine::showRightPage() {
+	showFrame(_tempGraphics2, 143, 12, 0, 0);
+	uint16 y = 12+37;
+	for (size_t i = 0; i < 7; ++i) {
+		showFrame(_tempGraphics2, 143, y, 1, 0);
+		y += 16;
+	}
+
+	showFrame(_tempGraphics2, 143, y, 2, 0);
+	_lineSpacing = 8;
+	_kerning = 1;
+	uint8 pageIndex = _folderPage - 1;
+	const uint8 *string = getTextInFile1(pageIndex * 2);
+	y = 48;
+	for (size_t i = 0; i < 2; ++i) {
+		uint8 lastChar;
+		do {
+			lastChar = printDirect(&string, 152, &y, 140, false);
+			y += _lineSpacing;
+		} while (lastChar != '\0');
+	}
+	_kerning = 0;
+	_lineSpacing = 10;
+}
+
+void DreamWebEngine::enterSymbol() {
+	_manIsOffScreen = 1;
+	getRidOfReels();
+	loadIntoTemp("DREAMWEB.G12"); // symbol graphics
+	_symbolTopX = 24;
+	_symbolTopDir = 0;
+	_symbolBotX = 24;
+	_symbolBotDir = 0;
+	redrawMainScrn();
+	showSymbol();
+	underTextLine();
+	workToScreenM();
+	_getBack = 0;
+	do {
+		delPointer();
+		updateSymbolTop();
+		updateSymbolBot();
+		showSymbol();
+		readMouse();
+		showPointer();
+		vSync();
+		dumpPointer();
+		dumpTextLine();
+		dumpSymbol();
+		RectWithCallback<DreamWebEngine> symbolList[] = {
+			{ kSymbolx+40,kSymbolx+64,kSymboly+2,kSymboly+16,&DreamWebEngine::quitSymbol },
+			{ kSymbolx,kSymbolx+52,kSymboly+20,kSymboly+50,&DreamWebEngine::setTopLeft },
+			{ kSymbolx+52,kSymbolx+104,kSymboly+20,kSymboly+50,&DreamWebEngine::setTopRight },
+			{ kSymbolx,kSymbolx+52,kSymboly+50,kSymboly+80,&DreamWebEngine::setBotLeft },
+			{ kSymbolx+52,kSymbolx+104,kSymboly+50,kSymboly+80,&DreamWebEngine::setBotRight },
+			{ 0,320,0,200,&DreamWebEngine::blank },
+			{ 0xFFFF,0,0,0,0 }
+		};
+		checkCoords(symbolList);
+	} while ((_getBack == 0) && !_quitRequested);
+	if ((_symbolBotNum == 3) && (_symbolTopNum == 5)) {
+		removeSetObject(43);
+		placeSetObject(46);
+		turnAnyPathOn(0, _roomNum + 12);
+		_manIsOffScreen = 0;
+		redrawMainScrn();
+		getRidOfTemp();
+		restoreReels();
+		workToScreenM();
+		playChannel1(13);
+	} else {
+		removeSetObject(46);
+		placeSetObject(43);
+		turnAnyPathOff(0, _roomNum + 12);
+		_manIsOffScreen = 0;
+		redrawMainScrn();
+		getRidOfTemp();
+		restoreReels();
+		workToScreenM();
 	}
 }
 
@@ -267,4 +578,330 @@ void DreamWebEngine::quitSymbol() {
 	_getBack = 1;
 }
 
+void DreamWebEngine::setTopLeft() {
+	if (_symbolTopDir != 0) {
+		blank();
+		return;
+	}
+
+	if (_commandType != 210) {
+		_commandType = 210;
+		commandOnly(19);
+	}
+
+	if (_mouseButton != 0)
+		_symbolTopDir = 0xFF;
+}
+
+void DreamWebEngine::setTopRight() {
+	if (_symbolTopDir != 0) {
+		blank();
+		return;
+	}
+
+	if (_commandType != 211) {
+		_commandType = 211;
+		commandOnly(20);
+	}
+
+	if (_mouseButton != 0)
+		_symbolTopDir = 1;
+}
+
+void DreamWebEngine::setBotLeft() {
+	if (_symbolBotDir != 0) {
+		blank();
+		return;
+	}
+
+	if (_commandType != 212) {
+		_commandType = 212;
+		commandOnly(21);
+	}
+
+	if (_mouseButton != 0)
+		_symbolBotDir = 0xFF;
+}
+
+void DreamWebEngine::setBotRight() {
+	if (_symbolBotDir != 0) {
+		blank();
+		return;
+	}
+
+	if (_commandType != 213) {
+		_commandType = 213;
+		commandOnly(22);
+	}
+
+	if (_mouseButton != 0)
+		_symbolBotDir = 1;
+}
+
+void DreamWebEngine::dumpSymbol() {
+	_newTextLine = 0;
+	multiDump(kSymbolx, kSymboly + 20, 104, 60);
+}
+
+void DreamWebEngine::showSymbol() {
+	showFrame(_tempGraphics, kSymbolx, kSymboly, 12, 0);
+
+	showFrame(_tempGraphics, _symbolTopX + kSymbolx-44, kSymboly+20, _symbolTopNum, 32);
+	uint8 nextTopSymbol = nextSymbol(_symbolTopNum);
+	showFrame(_tempGraphics, _symbolTopX + kSymbolx+5, kSymboly+20, nextTopSymbol, 32);
+	uint8 nextNextTopSymbol = nextSymbol(nextTopSymbol);
+	showFrame(_tempGraphics, _symbolTopX + kSymbolx+54, kSymboly+20, nextNextTopSymbol, 32);
+
+	showFrame(_tempGraphics, _symbolBotX + kSymbolx-44, kSymboly+49, 6 + _symbolBotNum, 32);
+	uint8 nextBotSymbol = nextSymbol(_symbolBotNum);
+	showFrame(_tempGraphics, _symbolBotX + kSymbolx+5, kSymboly+49, 6 + nextBotSymbol, 32);
+	uint8 nextNextBotSymbol = nextSymbol(nextBotSymbol);
+	showFrame(_tempGraphics, _symbolBotX + kSymbolx+54, kSymboly+49, 6 + nextNextBotSymbol, 32);
+}
+
+uint8 DreamWebEngine::nextSymbol(uint8 symbol) {
+	uint8 result = symbol + 1;
+	if (result == 6)
+		return 0;
+	if (result == 12)
+		return 6;
+	return result;
+}
+
+void DreamWebEngine::updateSymbolTop() {
+	if (!_symbolTopDir)
+		return; // topfinished
+
+	if (_symbolTopDir == (byte)-1) {
+		// Backward
+		_symbolTopX--;
+		if (_symbolTopX != (byte)-1) {
+			// Not wrapping
+			if (_symbolTopX != 24)
+				return; // topfinished
+			_symbolTopDir = 0;
+		} else {
+			_symbolTopX = 48;
+			_symbolTopNum++;
+			if (_symbolTopNum != 6)
+				return; // topfinished
+			_symbolTopNum = 0;
+		}
+	} else {
+		// Forward
+		_symbolTopX++;
+		if (_symbolTopX != 49) {
+			// Not wrapping
+			if (_symbolTopX != 24)
+				return; // topfinished
+			_symbolTopDir = 0;
+		} else {
+			_symbolTopX = 0;
+			_symbolTopNum--;
+			if (_symbolTopNum != (byte)-1)
+				return; // topfinished
+			_symbolTopNum = 5;
+		}
+	}
+}
+
+void DreamWebEngine::updateSymbolBot() {
+	if (!_symbolBotDir)
+		return; // botfinished
+
+	if (_symbolBotDir == (byte)-1) {
+		// Backward
+		_symbolBotX--;
+		if (_symbolBotX != (byte)-1) {
+			// Not wrapping
+			if (_symbolBotX != 24)
+				return; // botfinished
+			_symbolBotDir = 0;
+		} else {
+			_symbolBotX = 48;
+			_symbolBotNum++;
+			if (_symbolBotNum != 6)
+				return; // botfinished
+			_symbolBotNum = 0;
+		}
+	} else {
+		// Forward
+		_symbolBotX++;
+		if (_symbolBotX != 49) {
+			// Not wrapping
+			if (_symbolBotX != 24)
+				return; // botfinished
+			_symbolBotDir = 0;
+		} else {
+			_symbolBotX = 0;
+			_symbolBotNum--;
+			if (_symbolBotNum != (byte)-1)
+				return; // botfinished
+			_symbolBotNum = 5;
+		}
+	}
+}
+
+void DreamWebEngine::dumpSymBox() {
+	if (_dumpX != 0xFFFF) {
+		multiDump(_dumpX, _dumpY, 30, 77);
+		_dumpX = 0xFFFF;
+	}
+}
+
+void DreamWebEngine::useDiary() {
+	getRidOfReels();
+	loadIntoTemp("DREAMWEB.G14");
+	loadTempText("DREAMWEB.T51");
+	loadTempCharset("DREAMWEB.C02");
+	createPanel();
+	showIcon();
+	showDiary();
+	underTextLine();
+	showDiaryPage();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
+	_getBack = 0;
+
+	RectWithCallback<DreamWebEngine> diaryList[] = {
+		{ kDiaryx+94,kDiaryx+110,kDiaryy+97,kDiaryy+113,&DreamWebEngine::diaryKeyN },
+		{ kDiaryx+151,kDiaryx+167,kDiaryy+71,kDiaryy+87,&DreamWebEngine::diaryKeyP },
+		{ kDiaryx+176,kDiaryx+192,kDiaryy+108,kDiaryy+124,&DreamWebEngine::quitKey },
+		{ 0,320,0,200,&DreamWebEngine::blank },
+		{ 0xFFFF,0,0,0,0 }
+	};
+
+	do {
+		delPointer();
+		readMouse();
+		showDiaryKeys();
+		showPointer();
+		vSync();
+		dumpPointer();
+		dumpDiaryKeys();
+		dumpTextLine();
+		checkCoords(diaryList);
+	} while (!_getBack && !_quitRequested);
+
+
+	getRidOfTemp();
+	getRidOfTempText();
+	getRidOfTempCharset();
+	restoreReels();
+	_manIsOffScreen = 0;
+	redrawMainScrn();
+	workToScreenM();
+}
+
+void DreamWebEngine::showDiary() {
+	showFrame(_tempGraphics, kDiaryx, kDiaryy + 37, 1, 0);
+	showFrame(_tempGraphics, kDiaryx + 176, kDiaryy + 108, 2, 0);
+}
+
+void DreamWebEngine::showDiaryKeys() {
+	if (!_pressCount)
+		return; // nokeyatall
+
+	_pressCount--;
+
+	if (!_pressCount)
+		return; // nokeyatall
+
+	if (_pressed == 'N') {
+		byte frame = (_pressCount == 1) ? 3 : 4;
+		showFrame(_tempGraphics, kDiaryx + 94, kDiaryy + 97, frame, 0);
+	} else {
+		byte frame = (_pressCount == 1) ? 5 : 6;
+		showFrame(_tempGraphics, kDiaryx + 151, kDiaryy + 71, frame, 0);
+	}
+
+	if (_pressCount == 1)
+		showDiaryPage();
+}
+
+void DreamWebEngine::dumpDiaryKeys() {
+	if (_pressCount == 1) {
+		if (_vars._sartainDead != 1 && _diaryPage == 5 && getLocation(6) != 1) {
+			// Add Sartain Industries note
+			setLocation(6);
+			delPointer();
+			const uint8 *string = getTextInFile1(12);
+			printDirect(string, 70, 106, 241, 241 & 1);
+			workToScreenM();
+			hangOnP(200);
+			createPanel();
+			showIcon();
+			showDiary();
+			showDiaryPage();
+			workToScreenM();
+			showPointer();
+			return;
+		} else {
+			multiDump(kDiaryx + 48, kDiaryy + 15, 200, 16);
+		}
+	}
+
+	multiDump(kDiaryx + 94, kDiaryy + 97, 16, 16);
+	multiDump(kDiaryx + 151, kDiaryy + 71, 16, 16);
+}
+
+void DreamWebEngine::diaryKeyP() {
+	if (_commandType != 214) {
+		_commandType = 214;
+		commandOnly(23);
+	}
+
+	if (!_mouseButton ||
+		_oldButton == _mouseButton ||
+		_pressCount)
+		return; // notkeyp
+
+	playChannel1(16);
+	_pressCount = 12;
+	_pressed = 'P';
+	_diaryPage--;
+
+	if (_diaryPage == 0xFF)
+		_diaryPage = 11;
+}
+
+void DreamWebEngine::diaryKeyN() {
+	if (_commandType != 213) {
+		_commandType = 213;
+		commandOnly(23);
+	}
+
+	if (!_mouseButton ||
+		_oldButton == _mouseButton ||
+		_pressCount)
+		return; // notkeyn
+
+	playChannel1(16);
+	_pressCount = 12;
+	_pressed = 'N';
+	_diaryPage++;
+
+	if (_diaryPage == 12)
+		_diaryPage = 0;
+}
+
+void DreamWebEngine::showDiaryPage() {
+	showFrame(_tempGraphics, kDiaryx, kDiaryy, 0, 0);
+	_kerning = 1;
+	useTempCharset();
+	_charShift = 91+91;
+	const uint8 *string = getTextInFile1(_diaryPage);
+	uint16 y = kDiaryy + 16;
+	printDirect(&string, kDiaryx + 48, &y, 240, 240 & 1);
+	y = kDiaryy + 16;
+	printDirect(&string, kDiaryx + 129, &y, 240, 240 & 1);
+	y = kDiaryy + 23;
+	printDirect(&string, kDiaryx + 48, &y, 240, 240 & 1);
+	_kerning = 0;
+	_charShift = 0;
+	useCharset1();
+}
+
 } // End of namespace DreamWeb
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 5fbd601b81..990cb57e7a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1762,63 +1762,6 @@ uint8 DreamWebEngine::findNextColon(const uint8 **string) {
 	return c;
 }
 
-void DreamWebEngine::enterSymbol() {
-	_manIsOffScreen = 1;
-	getRidOfReels();
-	loadIntoTemp("DREAMWEB.G12"); // symbol graphics
-	_symbolTopX = 24;
-	_symbolTopDir = 0;
-	_symbolBotX = 24;
-	_symbolBotDir = 0;
-	redrawMainScrn();
-	showSymbol();
-	underTextLine();
-	workToScreenM();
-	_getBack = 0;
-	do {
-		delPointer();
-		updateSymbolTop();
-		updateSymbolBot();
-		showSymbol();
-		readMouse();
-		showPointer();
-		vSync();
-		dumpPointer();
-		dumpTextLine();
-		dumpSymbol();
-		RectWithCallback<DreamWebEngine> symbolList[] = {
-			{ kSymbolx+40,kSymbolx+64,kSymboly+2,kSymboly+16,&DreamWebEngine::quitSymbol },
-			{ kSymbolx,kSymbolx+52,kSymboly+20,kSymboly+50,&DreamWebEngine::setTopLeft },
-			{ kSymbolx+52,kSymbolx+104,kSymboly+20,kSymboly+50,&DreamWebEngine::setTopRight },
-			{ kSymbolx,kSymbolx+52,kSymboly+50,kSymboly+80,&DreamWebEngine::setBotLeft },
-			{ kSymbolx+52,kSymbolx+104,kSymboly+50,kSymboly+80,&DreamWebEngine::setBotRight },
-			{ 0,320,0,200,&DreamWebEngine::blank },
-			{ 0xFFFF,0,0,0,0 }
-		};
-		checkCoords(symbolList);
-	} while ((_getBack == 0) && !_quitRequested);
-	if ((_symbolBotNum == 3) && (_symbolTopNum == 5)) {
-		removeSetObject(43);
-		placeSetObject(46);
-		turnAnyPathOn(0, _roomNum + 12);
-		_manIsOffScreen = 0;
-		redrawMainScrn();
-		getRidOfTemp();
-		restoreReels();
-		workToScreenM();
-		playChannel1(13);
-	} else {
-		removeSetObject(46);
-		placeSetObject(43);
-		turnAnyPathOff(0, _roomNum + 12);
-		_manIsOffScreen = 0;
-		redrawMainScrn();
-		getRidOfTemp();
-		restoreReels();
-		workToScreenM();
-	}
-}
-
 void DreamWebEngine::zoomOnOff() {
 	if (_vars._watchingTime != 0 || _pointerMode == 2) {
 		blank();
@@ -2200,97 +2143,6 @@ void DreamWebEngine::restoreReels() {
 	closeFile();
 }
 
-void DreamWebEngine::loadFolder() {
-	loadIntoTemp("DREAMWEB.G09"); // folder graphics 1
-	loadIntoTemp2("DREAMWEB.G10"); // folder graphics 2
-	loadIntoTemp3("DREAMWEB.G11"); // folder graphics 3
-	loadTempCharset("DREAMWEB.C02"); // character set 3
-	loadTempText("DREAMWEB.T50"); // folder text
-}
-
-void DreamWebEngine::showFolder() {
-	_commandType = 255;
-	if (_folderPage) {
-		useTempCharset();
-		createPanel2();
-		showFrame(_tempGraphics, 0, 0, 0, 0);
-		showFrame(_tempGraphics, 143, 0, 1, 0);
-		showFrame(_tempGraphics, 0, 92, 2, 0);
-		showFrame(_tempGraphics, 143, 92, 3, 0);
-		folderExit();
-		if (_folderPage != 1)
-			showLeftPage();
-		if (_folderPage != 12)
-			showRightPage();
-		useCharset1();
-		underTextLine();
-	} else {
-		createPanel2();
-		showFrame(_tempGraphics3, 143-28, 0, 0, 0);
-		showFrame(_tempGraphics3, 143-28, 92, 1, 0);
-		folderExit();
-		underTextLine();
-	}
-}
-
-void DreamWebEngine::showLeftPage() {
-	showFrame(_tempGraphics2, 0, 12, 3, 0);
-	uint16 y = 12+5;
-	for (size_t i = 0; i < 9; ++i) {
-		showFrame(_tempGraphics2, 0, y, 4, 0);
-		y += 16;
-	}
-	showFrame(_tempGraphics2, 0, y, 5, 0);
-	_lineSpacing = 8;
-	_charShift = 91;
-	_kerning = 1;
-	uint8 pageIndex = _folderPage - 2;
-	const uint8 *string = getTextInFile1(pageIndex * 2);
-	y = 48;
-	for (size_t i = 0; i < 2; ++i) {
-		uint8 lastChar;
-		do {
-			lastChar = printDirect(&string, 2, &y, 140, false);
-			y += _lineSpacing;
-		} while (lastChar != '\0');
-	}
-	_kerning = 0;
-	_charShift = 0;
-	_lineSpacing = 10;
-	uint8 *bufferToSwap = workspace() + (48*320)+2;
-	for (size_t i = 0; i < 120; ++i) {
-		for (size_t j = 0; j < 65; ++j) {
-			SWAP(bufferToSwap[j], bufferToSwap[130 - j]);
-		}
-		bufferToSwap += 320;
-	}
-}
-
-void DreamWebEngine::showRightPage() {
-	showFrame(_tempGraphics2, 143, 12, 0, 0);
-	uint16 y = 12+37;
-	for (size_t i = 0; i < 7; ++i) {
-		showFrame(_tempGraphics2, 143, y, 1, 0);
-		y += 16;
-	}
-
-	showFrame(_tempGraphics2, 143, y, 2, 0);
-	_lineSpacing = 8;
-	_kerning = 1;
-	uint8 pageIndex = _folderPage - 1;
-	const uint8 *string = getTextInFile1(pageIndex * 2);
-	y = 48;
-	for (size_t i = 0; i < 2; ++i) {
-		uint8 lastChar;
-		do {
-			lastChar = printDirect(&string, 152, &y, 140, false);
-			y += _lineSpacing;
-		} while (lastChar != '\0');
-	}
-	_kerning = 0;
-	_lineSpacing = 10;
-}
-
 void DreamWebEngine::showExit() {
 	showFrame(_icons1, 274, 154, 11, 0);
 }
@@ -2322,83 +2174,6 @@ const uint8 *DreamWebEngine::getTextInFile1(uint16 index) {
 	return (const uint8 *)_textFile1.getString(index);
 }
 
-void DreamWebEngine::checkFolderCoords() {
-	RectWithCallback<DreamWebEngine> folderList[] = {
-		{ 280,320,160,200, &DreamWebEngine::quitKey },
-		{ 143,300,6,194, &DreamWebEngine::nextFolder },
-		{ 0,143,6,194, &DreamWebEngine::lastFolder },
-		{ 0,320,0,200, &DreamWebEngine::blank },
-		{ 0xFFFF,0,0,0, 0 }
-	};
-	checkCoords(folderList);
-}
-
-void DreamWebEngine::nextFolder() {
-	if (_folderPage == 12) {
-		blank();
-		return;
-	}
-	if (_commandType != 201) {
-		_commandType = 201;
-		commandOnly(16);
-	}
-	if ((_mouseButton == 1) && (_mouseButton != _oldButton)) {
-		++_folderPage;
-		folderHints();
-		delPointer();
-		showFolder();
-		_mouseButton = 0;
-		checkFolderCoords();
-		workToScreenM();
-	}
-}
-
-void DreamWebEngine::lastFolder() {
-	if (_folderPage == 0) {
-		blank();
-		return;
-	}
-	if (_commandType != 202) {
-		_commandType = 202;
-		commandOnly(17);
-	}
-
-	if ((_mouseButton == 1) && (_mouseButton != _oldButton)) {
-		--_folderPage;
-		delPointer();
-		showFolder();
-		_mouseButton = 0;
-		checkFolderCoords();
-		workToScreenM();
-	}
-}
-
-void DreamWebEngine::folderHints() {
-	if (_folderPage == 5) {
-		if ((_vars._aideDead != 1) && (getLocation(13) != 1)) {
-			setLocation(13);
-			showFolder();
-			const uint8 *string = getTextInFile1(30);
-			printDirect(string, 0, 86, 141, true);
-			workToScreenM();
-			hangOnP(200);
-		}
-	} else if (_folderPage == 9) {
-		if (getLocation(7) != 1) {
-			setLocation(7);
-			showFolder();
-			const uint8 *string = getTextInFile1(31);
-			printDirect(string, 0, 86, 141, true);
-			workToScreenM();
-			hangOnP(200);
-		}
-	}
-}
-
-void DreamWebEngine::folderExit() {
-	showFrame(_tempGraphics2, 296, 178, 6, 0);
-}
-
 void DreamWebEngine::loadTravelText() {
 	loadTextFile(_travelText, "DREAMWEB.T81"); // location descs
 }
@@ -2436,61 +2211,6 @@ void DreamWebEngine::workToScreenM() {
 	delPointer();
 }
 
-void DreamWebEngine::loadMenu() {
-	loadIntoTemp("DREAMWEB.S02"); // sprite name 3
-	loadIntoTemp2("DREAMWEB.G07"); // mon. graphics 2
-}
-
-void DreamWebEngine::showMenu() {
-	++_menuCount;
-	if (_menuCount == 37*2)
-		_menuCount = 0;
-	showFrame(_tempGraphics, kMenux, kMenuy, _menuCount / 2, 0);
-}
-
-void DreamWebEngine::dumpMenu() {
-	multiDump(kMenux, kMenuy, 48, 48);
-}
-
-void DreamWebEngine::useMenu() {
-	getRidOfReels();
-	loadMenu();
-	createPanel();
-	showPanel();
-	showIcon();
-	_vars._newObs = 0;
-	drawFloor();
-	printSprites();
-	showFrame(_tempGraphics2, kMenux-48, kMenuy-4, 4, 0);
-	getUnderMenu();
-	showFrame(_tempGraphics2, kMenux+54, kMenuy+72, 5, 0);
-	workToScreenM();
-	_getBack = 0;
-	do {
-		delPointer();
-		putUnderMenu();
-		showMenu();
-		readMouse();
-		showPointer();
-		vSync();
-		dumpPointer();
-		dumpMenu();
-		dumpTextLine();
-		RectWithCallback<DreamWebEngine> menuList[] = {
-			{ kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamWebEngine::quitKey },
-			{ 0,320,0,200,&DreamWebEngine::blank },
-			{ 0xFFFF,0,0,0,0 }
-		};
-		checkCoords(menuList);
-	} while ((_getBack != 1) && !_quitRequested);
-	_manIsOffScreen = 0;
-	redrawMainScrn();
-	getRidOfTemp();
-	getRidOfTemp2();
-	restoreReels();
-	workToScreenM();
-}
-
 void DreamWebEngine::atmospheres() {
 
 	const Atmosphere *a = &g_atmosphereList[0];
@@ -2553,31 +2273,6 @@ void DreamWebEngine::atmospheres() {
 	cancelCh0();
 }
 
-uint8 DreamWebEngine::nextSymbol(uint8 symbol) {
-	uint8 result = symbol + 1;
-	if (result == 6)
-		return 0;
-	if (result == 12)
-		return 6;
-	return result;
-}
-
-void DreamWebEngine::showSymbol() {
-	showFrame(_tempGraphics, kSymbolx, kSymboly, 12, 0);
-
-	showFrame(_tempGraphics, _symbolTopX + kSymbolx-44, kSymboly+20, _symbolTopNum, 32);
-	uint8 nextTopSymbol = nextSymbol(_symbolTopNum);
-	showFrame(_tempGraphics, _symbolTopX + kSymbolx+5, kSymboly+20, nextTopSymbol, 32);
-	uint8 nextNextTopSymbol = nextSymbol(nextTopSymbol);
-	showFrame(_tempGraphics, _symbolTopX + kSymbolx+54, kSymboly+20, nextNextTopSymbol, 32);
-
-	showFrame(_tempGraphics, _symbolBotX + kSymbolx-44, kSymboly+49, 6 + _symbolBotNum, 32);
-	uint8 nextBotSymbol = nextSymbol(_symbolBotNum);
-	showFrame(_tempGraphics, _symbolBotX + kSymbolx+5, kSymboly+49, 6 + nextBotSymbol, 32);
-	uint8 nextNextBotSymbol = nextSymbol(nextBotSymbol);
-	showFrame(_tempGraphics, _symbolBotX + kSymbolx+54, kSymboly+49, 6 + nextNextBotSymbol, 32);
-}
-
 void DreamWebEngine::readKey() {
 	uint16 bufOut = _bufferOut;
 
@@ -2592,66 +2287,6 @@ void DreamWebEngine::readKey() {
 	_bufferOut = bufOut;
 }
 
-void DreamWebEngine::setTopLeft() {
-	if (_symbolTopDir != 0) {
-		blank();
-		return;
-	}
-
-	if (_commandType != 210) {
-		_commandType = 210;
-		commandOnly(19);
-	}
-
-	if (_mouseButton != 0)
-		_symbolTopDir = 0xFF;
-}
-
-void DreamWebEngine::setTopRight() {
-	if (_symbolTopDir != 0) {
-		blank();
-		return;
-	}
-
-	if (_commandType != 211) {
-		_commandType = 211;
-		commandOnly(20);
-	}
-
-	if (_mouseButton != 0)
-		_symbolTopDir = 1;
-}
-
-void DreamWebEngine::setBotLeft() {
-	if (_symbolBotDir != 0) {
-		blank();
-		return;
-	}
-
-	if (_commandType != 212) {
-		_commandType = 212;
-		commandOnly(21);
-	}
-
-	if (_mouseButton != 0)
-		_symbolBotDir = 0xFF;
-}
-
-void DreamWebEngine::setBotRight() {
-	if (_symbolBotDir != 0) {
-		blank();
-		return;
-	}
-
-	if (_commandType != 213) {
-		_commandType = 213;
-		commandOnly(22);
-	}
-
-	if (_mouseButton != 0)
-		_symbolBotDir = 1;
-}
-
 void DreamWebEngine::newGame() {
 	if (_commandType != 251) {
 		_commandType = 251;
@@ -2912,11 +2547,6 @@ void DreamWebEngine::examineInventory() {
 void DreamWebEngine::middlePanel() {
 }
 
-void DreamWebEngine::showDiary() {
-	showFrame(_tempGraphics, kDiaryx, kDiaryy + 37, 1, 0);
-	showFrame(_tempGraphics, kDiaryx + 176, kDiaryy + 108, 2, 0);
-}
-
 void DreamWebEngine::underTextLine() {
 	if (_foreignRelease)
 		multiGet(_textUnder, _textAddressX, _textAddressY - 3, kUnderTextSizeX_f, kUnderTextSizeY_f);
@@ -3114,46 +2744,6 @@ void DreamWebEngine::showGun() {
 	getRidOfTempText();
 }
 
-void DreamWebEngine::diaryKeyP() {
-	if (_commandType != 214) {
-		_commandType = 214;
-		commandOnly(23);
-	}
-
-	if (!_mouseButton ||
-		_oldButton == _mouseButton ||
-		_pressCount)
-		return; // notkeyp
-
-	playChannel1(16);
-	_pressCount = 12;
-	_pressed = 'P';
-	_diaryPage--;
-
-	if (_diaryPage == 0xFF)
-		_diaryPage = 11;
-}
-
-void DreamWebEngine::diaryKeyN() {
-	if (_commandType != 213) {
-		_commandType = 213;
-		commandOnly(23);
-	}
-
-	if (!_mouseButton ||
-		_oldButton == _mouseButton ||
-		_pressCount)
-		return; // notkeyn
-
-	playChannel1(16);
-	_pressCount = 12;
-	_pressed = 'N';
-	_diaryPage++;
-
-	if (_diaryPage == 12)
-		_diaryPage = 0;
-}
-
 void DreamWebEngine::dropError() {
 	_commandType = 255;
 	delPointer();
@@ -3245,16 +2835,6 @@ void DreamWebEngine::autoAppear() {
 	}
 }
 
-void DreamWebEngine::quitKey() {
-	if (_commandType != 222) {
-		_commandType = 222;
-		commandOnly(4);
-	}
-
-	if (_mouseButton != _oldButton && (_mouseButton & 1))
-		_getBack = 1;
-}
-
 void DreamWebEngine::setupTimedUse(uint16 textIndex, uint16 countToTimed, uint16 timeCount, byte x, byte y) {
 	if (_timeCount != 0)
 		return; // can't setup
@@ -3372,123 +2952,6 @@ void DreamWebEngine::entryAnims() {
 	}
 }
 
-void DreamWebEngine::updateSymbolTop() {
-	if (!_symbolTopDir)
-		return; // topfinished
-
-	if (_symbolTopDir == (byte)-1) {
-		// Backward
-		_symbolTopX--;
-		if (_symbolTopX != (byte)-1) {
-			// Not wrapping
-			if (_symbolTopX != 24)
-				return; // topfinished
-			_symbolTopDir = 0;
-		} else {
-			_symbolTopX = 48;
-			_symbolTopNum++;
-			if (_symbolTopNum != 6)
-				return; // topfinished
-			_symbolTopNum = 0;
-		}
-	} else {
-		// Forward
-		_symbolTopX++;
-		if (_symbolTopX != 49) {
-			// Not wrapping
-			if (_symbolTopX != 24)
-				return; // topfinished
-			_symbolTopDir = 0;
-		} else {
-			_symbolTopX = 0;
-			_symbolTopNum--;
-			if (_symbolTopNum != (byte)-1)
-				return; // topfinished
-			_symbolTopNum = 5;
-		}
-	}
-}
-
-void DreamWebEngine::updateSymbolBot() {
-	if (!_symbolBotDir)
-		return; // botfinished
-
-	if (_symbolBotDir == (byte)-1) {
-		// Backward
-		_symbolBotX--;
-		if (_symbolBotX != (byte)-1) {
-			// Not wrapping
-			if (_symbolBotX != 24)
-				return; // botfinished
-			_symbolBotDir = 0;
-		} else {
-			_symbolBotX = 48;
-			_symbolBotNum++;
-			if (_symbolBotNum != 6)
-				return; // botfinished
-			_symbolBotNum = 0;
-		}
-	} else {
-		// Forward
-		_symbolBotX++;
-		if (_symbolBotX != 49) {
-			// Not wrapping
-			if (_symbolBotX != 24)
-				return; // botfinished
-			_symbolBotDir = 0;
-		} else {
-			_symbolBotX = 0;
-			_symbolBotNum--;
-			if (_symbolBotNum != (byte)-1)
-				return; // botfinished
-			_symbolBotNum = 5;
-		}
-	}
-}
-
-void DreamWebEngine::showDiaryPage() {
-	showFrame(_tempGraphics, kDiaryx, kDiaryy, 0, 0);
-	_kerning = 1;
-	useTempCharset();
-	_charShift = 91+91;
-	const uint8 *string = getTextInFile1(_diaryPage);
-	uint16 y = kDiaryy + 16;
-	printDirect(&string, kDiaryx + 48, &y, 240, 240 & 1);
-	y = kDiaryy + 16;
-	printDirect(&string, kDiaryx + 129, &y, 240, 240 & 1);
-	y = kDiaryy + 23;
-	printDirect(&string, kDiaryx + 48, &y, 240, 240 & 1);
-	_kerning = 0;
-	_charShift = 0;
-	useCharset1();
-}
-
-void DreamWebEngine::dumpDiaryKeys() {
-	if (_pressCount == 1) {
-		if (_vars._sartainDead != 1 && _diaryPage == 5 && getLocation(6) != 1) {
-			// Add Sartain Industries note
-			setLocation(6);
-			delPointer();
-			const uint8 *string = getTextInFile1(12);
-			printDirect(string, 70, 106, 241, 241 & 1);
-			workToScreenM();
-			hangOnP(200);
-			createPanel();
-			showIcon();
-			showDiary();
-			showDiaryPage();
-			workToScreenM();
-			showPointer();
-			return;
-		} else {
-			multiDump(kDiaryx + 48, kDiaryy + 15, 200, 16);
-		}
-	}
-
-	multiDump(kDiaryx + 94, kDiaryy + 97, 16, 16);
-	multiDump(kDiaryx + 151, kDiaryy + 71, 16, 16);
-}
-
 void DreamWebEngine::lookAtCard() {
 	_manIsOffScreen = 1;
 	getRidOfReels();
@@ -3601,27 +3064,6 @@ void DreamWebEngine::setupInitialVars() {
 	_vars._shakeCounter = 48;
 }
 
-void DreamWebEngine::showDiaryKeys() {
-	if (!_pressCount)
-		return; // nokeyatall
-
-	_pressCount--;
-
-	if (!_pressCount)
-		return; // nokeyatall
-
-	if (_pressed == 'N') {
-		byte frame = (_pressCount == 1) ? 3 : 4;
-		showFrame(_tempGraphics, kDiaryx + 94, kDiaryy + 97, frame, 0);
-	} else {
-		byte frame = (_pressCount == 1) ? 5 : 6;
-		showFrame(_tempGraphics, kDiaryx + 151, kDiaryy + 71, frame, 0);
-	}
-
-	if (_pressCount == 1)
-		showDiaryPage();
-}
-
 void DreamWebEngine::edensFlatReminders() {
 	if (_realLocation != 24 || _mapX != 44)
 		return; // not in Eden's lift
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 4259d03657..58210c1d85 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -190,35 +190,6 @@ void DreamWebEngine::showSecondUse() {
 	hangOnP(400);
 }
 
-void DreamWebEngine::viewFolder() {
-	_manIsOffScreen = 1;
-	getRidOfAll();
-	loadFolder();
-	_folderPage = 0;
-	showFolder();
-	workToScreenM();
-	_getBack = 0;
-	do {
-		if (_quitRequested)
-			break;
-		delPointer();
-		readMouse();
-		showPointer();
-		vSync();
-		dumpPointer();
-		dumpTextLine();
-		checkFolderCoords();
-	} while (_getBack == 0);
-	_manIsOffScreen = 0;
-	getRidOfTemp();
-	getRidOfTemp2();
-	getRidOfTemp3();
-	getRidOfTempCharset();
-	restoreAll();
-	redrawMainScrn();
-	workToScreenM();
-}
-
 void DreamWebEngine::edensCDPlayer() {
 	showFirstUse();
 	_vars._watchingTime = 18 * 2;
@@ -1241,7 +1212,7 @@ void DreamWebEngine::useCooker() {
 		showFirstUse();
 	else
 		showSecondUse();	// Food inside
-		
+
 	putBackObStuff();
 }
 
@@ -1254,52 +1225,6 @@ void DreamWebEngine::removeFreeObject(uint8 index) {
 	getFreeAd(index)->mapad[0] = 0xFF;
 }
 
-void DreamWebEngine::useDiary() {
-	getRidOfReels();
-	loadIntoTemp("DREAMWEB.G14");
-	loadTempText("DREAMWEB.T51");
-	loadTempCharset("DREAMWEB.C02");
-	createPanel();
-	showIcon();
-	showDiary();
-	underTextLine();
-	showDiaryPage();
-	readMouse();
-	showPointer();
-	workToScreen();
-	delPointer();
-	_getBack = 0;
-
-	RectWithCallback<DreamWebEngine> diaryList[] = {
-		{ kDiaryx+94,kDiaryx+110,kDiaryy+97,kDiaryy+113,&DreamWebEngine::diaryKeyN },
-		{ kDiaryx+151,kDiaryx+167,kDiaryy+71,kDiaryy+87,&DreamWebEngine::diaryKeyP },
-		{ kDiaryx+176,kDiaryx+192,kDiaryy+108,kDiaryy+124,&DreamWebEngine::quitKey },
-		{ 0,320,0,200,&DreamWebEngine::blank },
-		{ 0xFFFF,0,0,0,0 }
-	};
-	
-	do {
-		delPointer();
-		readMouse();
-		showDiaryKeys();
-		showPointer();
-		vSync();
-		dumpPointer();
-		dumpDiaryKeys();
-		dumpTextLine();
-		checkCoords(diaryList);
-	} while (!_getBack && !_quitRequested);
-
-
-	getRidOfTemp();
-	getRidOfTempText();
-	getRidOfTempCharset();
-	restoreReels();
-	_manIsOffScreen = 0;
-	redrawMainScrn();
-	workToScreenM();
-}
-
 void DreamWebEngine::useControl() {
 	if (_withObject == 255) {
 		withWhat();
-- 
cgit v1.2.3


From ea6546ae25226a22b14cbb847f13ea17a22cd22a Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 28 Dec 2011 16:55:03 +0100
Subject: DREAMWEB: Clean up checkCoords

---
 engines/dreamweb/dreamweb.h   | 16 +---------------
 engines/dreamweb/keypad.cpp   | 10 +++++-----
 engines/dreamweb/newplace.cpp |  2 +-
 engines/dreamweb/object.cpp   |  6 +++---
 engines/dreamweb/saveload.cpp |  8 ++++----
 engines/dreamweb/structs.h    |  3 +--
 engines/dreamweb/stubs.cpp    | 18 +++++++++++++++---
 engines/dreamweb/talk.cpp     |  4 ++--
 8 files changed, 32 insertions(+), 35 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 6ca49b9b6f..5200a1bb7e 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -905,21 +905,7 @@ public:
 	void setAllChanges();
 	void restoreAll();
 	void redrawMainScrn();
-
-	template <class T>
-	void checkCoords(const RectWithCallback<T> *rectWithCallbacks) {
-		if (_newLocation != 0xff)
-			return;
-
-		const RectWithCallback<T> *r;
-		for (r = rectWithCallbacks; r->_xMin != 0xffff; ++r) {
-			if (r->contains(_mouseX, _mouseY)) {
-				(((T *)this)->*(r->_callback))();
-				return;
-			}
-		}
-	}
-
+	void checkCoords(const RectWithCallback *rectWithCallbacks);
 	void newGame();
 	void deleteTaken();
 	void autoAppear();
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 4f34894dfa..30d44d3c73 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -28,7 +28,7 @@ const uint16 kKeypadx = 36+112;
 const uint16 kKeypady = 72;
 
 void DreamWebEngine::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3) {
-	RectWithCallback<DreamWebEngine> keypadList[] = {
+	RectWithCallback keypadList[] = {
 		{ kKeypadx+9,kKeypadx+30,kKeypady+9,kKeypady+22,&DreamWebEngine::buttonOne },
 		{ kKeypadx+31,kKeypadx+52,kKeypady+9,kKeypady+22,&DreamWebEngine::buttonTwo },
 		{ kKeypadx+53,kKeypadx+74,kKeypady+9,kKeypady+22,&DreamWebEngine::buttonThree },
@@ -263,7 +263,7 @@ void DreamWebEngine::useMenu() {
 		dumpPointer();
 		dumpMenu();
 		dumpTextLine();
-		RectWithCallback<DreamWebEngine> menuList[] = {
+		RectWithCallback menuList[] = {
 			{ kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamWebEngine::quitKey },
 			{ 0,320,0,200,&DreamWebEngine::blank },
 			{ 0xFFFF,0,0,0,0 }
@@ -396,7 +396,7 @@ void DreamWebEngine::lastFolder() {
 }
 
 void DreamWebEngine::checkFolderCoords() {
-	RectWithCallback<DreamWebEngine> folderList[] = {
+	RectWithCallback folderList[] = {
 		{ 280,320,160,200, &DreamWebEngine::quitKey },
 		{ 143,300,6,194, &DreamWebEngine::nextFolder },
 		{ 0,143,6,194, &DreamWebEngine::lastFolder },
@@ -525,7 +525,7 @@ void DreamWebEngine::enterSymbol() {
 		dumpPointer();
 		dumpTextLine();
 		dumpSymbol();
-		RectWithCallback<DreamWebEngine> symbolList[] = {
+		RectWithCallback symbolList[] = {
 			{ kSymbolx+40,kSymbolx+64,kSymboly+2,kSymboly+16,&DreamWebEngine::quitSymbol },
 			{ kSymbolx,kSymbolx+52,kSymboly+20,kSymboly+50,&DreamWebEngine::setTopLeft },
 			{ kSymbolx+52,kSymbolx+104,kSymboly+20,kSymboly+50,&DreamWebEngine::setTopRight },
@@ -765,7 +765,7 @@ void DreamWebEngine::useDiary() {
 	delPointer();
 	_getBack = 0;
 
-	RectWithCallback<DreamWebEngine> diaryList[] = {
+	RectWithCallback diaryList[] = {
 		{ kDiaryx+94,kDiaryx+110,kDiaryy+97,kDiaryy+113,&DreamWebEngine::diaryKeyN },
 		{ kDiaryx+151,kDiaryx+167,kDiaryy+71,kDiaryy+87,&DreamWebEngine::diaryKeyP },
 		{ kDiaryx+176,kDiaryx+192,kDiaryy+108,kDiaryy+124,&DreamWebEngine::quitKey },
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 6e8abca6ac..248f04a4d9 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -72,7 +72,7 @@ void DreamWebEngine::selectLocation() {
 		if (_getBack == 1)
 			break;
 
-		RectWithCallback<DreamWebEngine> destList[] = {
+		RectWithCallback destList[] = {
 			{ 238,258,4,44,&DreamWebEngine::nextDest },
 			{ 104,124,4,44,&DreamWebEngine::lastDest },
 			{ 280,308,4,44,&DreamWebEngine::lookAtPlace },
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 064e2cab4b..249c275a3f 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -155,7 +155,7 @@ void DreamWebEngine::examineOb(bool examineAgain) {
 
 		switch (_invOpen) {
 		case 0: {
-			RectWithCallback<DreamWebEngine> examList[] = {
+			RectWithCallback examList[] = {
 				{ 273,320,157,198,&DreamWebEngine::getBackFromOb },
 				{ 260,300,0,44,&DreamWebEngine::useObject },
 				{ 210,254,0,44,&DreamWebEngine::selectOpenOb },
@@ -169,7 +169,7 @@ void DreamWebEngine::examineOb(bool examineAgain) {
 		}
 		case 1: {
 			// Note: This table contains the non-constant _openChangeSize!
-			RectWithCallback<DreamWebEngine> invList1[] = {
+			RectWithCallback invList1[] = {
 				{ 273,320,157,198,&DreamWebEngine::getBackFromOb },
 				{ 255,294,0,24,&DreamWebEngine::dropObject },
 				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamWebEngine::incRyanPage },
@@ -182,7 +182,7 @@ void DreamWebEngine::examineOb(bool examineAgain) {
 			break;
 		}
 		default: {
-			RectWithCallback<DreamWebEngine> withList1[] = {
+			RectWithCallback withList1[] = {
 				{ 273,320,157,198,&DreamWebEngine::getBackFromOb },
 				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamWebEngine::incRyanPage },
 				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamWebEngine::selectOb },
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 415f1a80ef..29f1b916a4 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -142,7 +142,7 @@ void DreamWebEngine::doLoad(int savegameId) {
 			vSync();
 			dumpPointer();
 			dumpTextLine();
-			RectWithCallback<DreamWebEngine> loadlist[] = {
+			RectWithCallback loadlist[] = {
 				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamWebEngine::getBackToOps },
 				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamWebEngine::actualLoad },
 				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamWebEngine::selectSlot },
@@ -236,7 +236,7 @@ void DreamWebEngine::saveGame() {
 			dumpPointer();
 			dumpTextLine();
 
-			RectWithCallback<DreamWebEngine> savelist[] = {
+			RectWithCallback savelist[] = {
 				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamWebEngine::getBackToOps },
 				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamWebEngine::actualSave },
 				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamWebEngine::selectSlot },
@@ -327,7 +327,7 @@ void DreamWebEngine::doSaveLoad() {
 	showMainOps();
 	workToScreen();
 
-	RectWithCallback<DreamWebEngine> opsList[] = {
+	RectWithCallback opsList[] = {
 		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamWebEngine::getBackFromOps },
 		{ kOpsx+10,kOpsx+77,kOpsy+10,kOpsy+59,&DreamWebEngine::DOSReturn },
 		{ kOpsx+128,kOpsx+190,kOpsy+16,kOpsy+100,&DreamWebEngine::discOps },
@@ -427,7 +427,7 @@ void DreamWebEngine::discOps() {
 	workToScreenM();
 	_getBack = 0;
 
-	RectWithCallback<DreamWebEngine> discOpsList[] = {
+	RectWithCallback discOpsList[] = {
 		{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamWebEngine::loadGame },
 		{ kOpsx+10,kOpsx+79,kOpsy+10,kOpsy+59,&DreamWebEngine::saveGame },
 		{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamWebEngine::getBackToOps },
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index fad2e1b5ae..ddc027120d 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -47,11 +47,10 @@ struct Sprite {
 	uint8  hidden;
 };
 
-template <class T = DreamWebEngine>
 struct RectWithCallback {
 	uint16 _xMin, _xMax;
 	uint16 _yMin, _yMax;
-	void (T::*_callback)();
+	void (DreamWebEngine::*_callback)();
 
 	bool contains(uint16 x, uint16 y) const {
 		return (x >= _xMin) && (x < _xMax) && (y >= _yMin) && (y < _yMax);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 990cb57e7a..afa8cc0eab 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1803,7 +1803,7 @@ void DreamWebEngine::sortOutMap() {
 void DreamWebEngine::mainScreen() {
 	_inMapArea = 0;
 	if (_vars._watchOn == 1) {
-		RectWithCallback<DreamWebEngine> mainList[] = {
+		RectWithCallback mainList[] = {
 			{ 44,70,32,46,&DreamWebEngine::look },
 			{ 0,50,0,180,&DreamWebEngine::inventory },
 			{ 226,244,10,26,&DreamWebEngine::zoomOnOff },
@@ -1814,7 +1814,7 @@ void DreamWebEngine::mainScreen() {
 		};
 		checkCoords(mainList);
 	} else {
-		RectWithCallback<DreamWebEngine> mainList2[] = {
+		RectWithCallback mainList2[] = {
 			{ 44,70,32,46,&DreamWebEngine::look },
 			{ 0,50,0,180,&DreamWebEngine::inventory },
 			{ 226+48,244+48,10,26,&DreamWebEngine::zoomOnOff },
@@ -2679,7 +2679,7 @@ void DreamWebEngine::decide() {
 	fadeScreenUp();
 	_getBack = 0;
 
-	RectWithCallback<DreamWebEngine> decideList[] = {
+	RectWithCallback decideList[] = {
 		{ kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamWebEngine::newGame },
 		{ kOpsx+20,kOpsx+87,kOpsy+10,kOpsy+59,&DreamWebEngine::DOSReturn },
 		{ kOpsx+123,kOpsx+190,kOpsy+10,kOpsy+59,&DreamWebEngine::loadOld },
@@ -3143,4 +3143,16 @@ void DreamWebEngine::purgeAnItem() {
 	}
 }
 
+void DreamWebEngine::checkCoords(const RectWithCallback *rectWithCallbacks) {
+	if (_newLocation != 0xff)
+		return;
+	const RectWithCallback *r;
+	for (r = rectWithCallbacks; r->_xMin != 0xffff; ++r) {
+		if (r->contains(_mouseX, _mouseY)) {
+			(this->*(r->_callback))();
+			return;
+		}
+	}
+}
+
 } // End of namespace DreamWeb
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 2899e81d00..9a94f0f68d 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -40,7 +40,7 @@ void DreamWebEngine::talk() {
 	showPointer();
 	workToScreen();
 
-	RectWithCallback<DreamWebEngine> talkList[] = {
+	RectWithCallback talkList[] = {
 		{ 273,320,157,198,&DreamWebEngine::getBack1 },
 		{ 240,290,2,44,&DreamWebEngine::moreTalk },
 		{ 0,320,0,200,&DreamWebEngine::blank },
@@ -201,7 +201,7 @@ void DreamWebEngine::doSomeTalk() {
 bool DreamWebEngine::hangOnPQ() {
 	_getBack = 0;
 
-	RectWithCallback<DreamWebEngine> quitList[] = {
+	RectWithCallback quitList[] = {
 		{ 273,320,157,198,&DreamWebEngine::getBack1 },
 		{ 0,320,0,200,&DreamWebEngine::blank },
 		{ 0xFFFF,0,0,0,0 }
-- 
cgit v1.2.3


From e2c006f7935df5f6e1c37c62b5104d4e24ab4b61 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Dec 2011 17:48:33 +0100
Subject: DREAMWEB: Remove global file handle

---
 engines/dreamweb/dreamweb.cpp |  38 --------------
 engines/dreamweb/dreamweb.h   |  13 +----
 engines/dreamweb/stubs.cpp    | 117 ++++++++++++++++++++++--------------------
 3 files changed, 64 insertions(+), 104 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index f942b84f76..e790baa3e3 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -54,7 +54,6 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_console = 0;
 	DebugMan.addDebugChannel(kDebugAnimation, "Animation", "Animation Debug Flag");
 	DebugMan.addDebugChannel(kDebugSaveLoad, "SaveLoad", "Track Save/Load Function");
-	_inSaveFile = 0;
 	_speed = 1;
 	_turbo = false;
 	_oldMouseState = 0;
@@ -387,43 +386,6 @@ void DreamWebEngine::setSpeed(uint speed) {
 	_timer->installTimerProc(vSyncInterrupt, 1000000 / 70 / speed, this, "dreamwebVSync");
 }
 
-void DreamWebEngine::openFile(const Common::String &name) {
-	processEvents();
-	closeFile();
-	if (_file.open(name))
-		return;
-	// File not found? See if there is a save state with this name
-	// FIXME: Is this really needed? If yes, document why; if not,
-	// remove all traces of _inSaveFile.
-	_inSaveFile = _saveFileMan->openForLoading(name);
-	if (_inSaveFile)
-		return;
-	error("cannot open file %s", name.c_str());
-}
-
-uint32 DreamWebEngine::skipBytes(uint32 bytes) {
-	if (!_file.seek(bytes, SEEK_CUR))
-		error("seek failed");
-	return _file.pos();
-}
-
-uint32 DreamWebEngine::readFromFile(uint8 *dst, unsigned size) {
-	processEvents();
-	if (_file.isOpen())
-		return _file.read(dst, size);
-	if (_inSaveFile)
-		return _inSaveFile->read(dst, size);
-	error("file was not opened (read before open)");
-}
-
-void DreamWebEngine::closeFile() {
-	processEvents();
-	if (_file.isOpen())
-		_file.close();
-	delete _inSaveFile;
-	_inSaveFile = 0;
-}
-
 Common::String DreamWebEngine::getSavegameFilename(int slot) const {
 	// TODO: Are saves from all versions of Dreamweb compatible with each other?
 	// Then we can can consider keeping the filenames as DREAMWEB.Dnn.
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 5200a1bb7e..a38c08f3d0 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -127,11 +127,6 @@ public:
 
 	uint8 randomNumber() { return _rnd.getRandomNumber(255); }
 
-	void openFile(const Common::String &name);
-	uint32 readFromFile(uint8 *data, unsigned size);
-	uint32 skipBytes(uint32 bytes);
-	void closeFile();
-
 	void mouseCall(uint16 *x, uint16 *y, uint16 *state); //fill mouse pos and button state
 	void processEvents();
 	void blit(const uint8 *src, int pitch, int x, int y, int w, int h);
@@ -168,9 +163,6 @@ private:
 	const DreamWebGameDescription	*_gameDescription;
 	Common::RandomSource			_rnd;
 
-	Common::File _file;
-	Common::InSaveFile *_inSaveFile;
-
 	uint _speed;
 	bool _turbo;
 	uint _oldMouseState;
@@ -806,15 +798,14 @@ public:
 	void allocateBuffers();
 	void loadTextFile(TextFile &file, const char *fileName);
 	void loadGraphicsFile(GraphicsFile &file, const char *fileName);
-	void loadGraphicsSegment(GraphicsFile &file, unsigned int len);
-	void loadTextSegment(TextFile &file, unsigned int len);
+	void loadGraphicsSegment(GraphicsFile &file, Common::File &inFile, unsigned int len);
+	void loadTextSegment(TextFile &file, Common::File &inFile, unsigned int len);
 	void loadIntoTemp(const char *fileName);
 	void loadIntoTemp2(const char *fileName);
 	void loadIntoTemp3(const char *fileName);
 	void loadTempCharset(const char *fileName);
 	void loadTravelText();
 	void loadTempText(const char *fileName);
-	void clearAndLoad(uint8 *buf, uint8 c, unsigned int size, unsigned int maxSize);
 	void sortOutMap();
 	void loadRoomData(const Room &room, bool skipDat);
 	void useTempCharset();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index afa8cc0eab..94518e85f3 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -794,21 +794,21 @@ void DreamWebEngine::loadGraphicsFile(GraphicsFile &file, const char *fileName)
 	f.read(file._data, sizeInBytes - kFrameBlocksize);
 }
 
-void DreamWebEngine::loadGraphicsSegment(GraphicsFile &file, unsigned int len) {
+void DreamWebEngine::loadGraphicsSegment(GraphicsFile &file, Common::File &inFile, unsigned int len) {
 	assert(len >= kFrameBlocksize);
 	delete[] file._data;
 	file._data = new uint8[len - kFrameBlocksize];
-	readFromFile((uint8 *)file._frames, kFrameBlocksize);
-	readFromFile(file._data, len - kFrameBlocksize);
+	inFile.read((uint8 *)file._frames, kFrameBlocksize);
+	inFile.read(file._data, len - kFrameBlocksize);
 }
 
-void DreamWebEngine::loadTextSegment(TextFile &file, unsigned int len) {
-	unsigned int headerSize = 2 * file._size;
+void DreamWebEngine::loadTextSegment(TextFile &file, Common::File &inFile, unsigned int len) {
+	const uint headerSize = 2 * file._size;
 	assert(len >= headerSize);
 	delete[] file._text;
 	file._text = new char[len - headerSize];
-	readFromFile((uint8 *)file._offsetsLE, headerSize);
-	readFromFile((uint8 *)file._text, len - headerSize);
+	inFile.read((uint8 *)file._offsetsLE, headerSize);
+	inFile.read((uint8 *)file._text, len - headerSize);
 }
 
 void DreamWebEngine::loadIntoTemp(const char *fileName) {
@@ -2043,22 +2043,15 @@ void DreamWebEngine::getRidOfAll() {
 	_freeDesc.clear();
 }
 
-void DreamWebEngine::clearAndLoad(uint8 *buf, uint8 c,
-                                   unsigned int size, unsigned int maxSize) {
-	assert(size <= maxSize);
-	memset(buf, c, maxSize);
-	readFromFile(buf, size);
-}
-
 // if skipDat, skip clearing and loading Setdat and Freedat
 void DreamWebEngine::loadRoomData(const Room &room, bool skipDat) {
-	const uint16 kSetdatlen = 64*128; // == sizeof(_setDat)
-	const uint16 kFreedatlen = 16*80; // == sizeof(_freeDat)
-
-	openFile(room.name);
+	processEvents();
+	Common::File file;
+	if (!file.open(room.name))
+		error("cannot open file %s", room.name);
 
 	FileHeader header;
-	readFromFile((uint8 *)&header, sizeof(FileHeader));
+	file.read((uint8 *)&header, sizeof(FileHeader));
 
 	// read segment lengths from room file header
 	int len[15];
@@ -2067,47 +2060,58 @@ void DreamWebEngine::loadRoomData(const Room &room, bool skipDat) {
 
 	assert(len[0] >= 192);
 	_backdropBlocks = new uint8[len[0] - 192];
-	readFromFile((uint8 *)_backdropFlags, 192);
-	readFromFile(_backdropBlocks, len[0] - 192);
+	file.read((uint8 *)_backdropFlags, 192);
+	file.read(_backdropBlocks, len[0] - 192);
+
+	assert(len[1] <= 132*66); // 132*66 = maplen
+	memset(workspace(), 0, 132*66);
+	file.read(workspace(), len[1]);
 
-	clearAndLoad(workspace(), 0, len[1], 132*66); // 132*66 = maplen
 	sortOutMap();
 
-	loadGraphicsSegment(_setFrames, len[2]);
-	if (!skipDat)
-		clearAndLoad((uint8 *)_setDat, 255, len[3], kSetdatlen);
-	else
-		skipBytes(len[3]);
+	loadGraphicsSegment(_setFrames, file, len[2]);
+	if (!skipDat) {
+		const uint16 kSetdatlen = 64*128;
+		assert(len[3] <= kSetdatlen);
+		memset(_setDat, 255, kSetdatlen);
+		file.read(_setDat, len[3]);
+	} else {
+		file.skip(len[3]);
+	}
 	// NB: The skipDat version of this function as called by restoreall
 	// had a 'call bloc' instead of 'call loadseg' for reel1,
 	// but 'bloc' was not defined.
-	loadGraphicsSegment(_reel1, len[4]);
-	loadGraphicsSegment(_reel2, len[5]);
-	loadGraphicsSegment(_reel3, len[6]);
+	loadGraphicsSegment(_reel1, file, len[4]);
+	loadGraphicsSegment(_reel2, file, len[5]);
+	loadGraphicsSegment(_reel3, file, len[6]);
 
 	// segment 7 consists of 36*38 pathNodes followed by 'reelList'
-	readFromFile((uint8 *)_pathData, 36*sizeof(RoomPaths));
+	file.read((uint8 *)_pathData, 36*sizeof(RoomPaths));
 	unsigned int reelLen = len[7] - 36*sizeof(RoomPaths);
 	unsigned int reelCount = (reelLen + sizeof(Reel) - 1) / sizeof(Reel);
 	delete[] _reelList;
 	_reelList = new Reel[reelCount];
-	readFromFile((uint8 *)_reelList, reelLen);
+	file.read((uint8 *)_reelList, reelLen);
 
 	// segment 8 consists of 12 personFrames followed by a TextFile
-	readFromFile((uint8 *)_personFramesLE, 24);
-	loadTextSegment(_personText, len[8] - 24);
-
-	loadTextSegment(_setDesc, len[9]);
-	loadTextSegment(_blockDesc, len[10]);
-	loadTextSegment(_roomDesc, len[11]);
-	loadGraphicsSegment(_freeFrames, len[12]);
-	if (!skipDat)
-		clearAndLoad((uint8 *)_freeDat, 255, len[13], kFreedatlen);
-	else
-		skipBytes(len[13]);
-	loadTextSegment(_freeDesc, len[14]);
+	file.read((uint8 *)_personFramesLE, 24);
+	loadTextSegment(_personText, file, len[8] - 24);
+
+	loadTextSegment(_setDesc, file, len[9]);
+	loadTextSegment(_blockDesc, file, len[10]);
+	loadTextSegment(_roomDesc, file, len[11]);
+	loadGraphicsSegment(_freeFrames, file, len[12]);
+	if (!skipDat) {
+		const uint16 kFreedatlen = 16*80;
+		assert(len[13] <= kFreedatlen);
+		memset(_freeDat, 255, kFreedatlen);
+		file.read(_freeDat, len[13]);
+	} else {
+		file.skip(len[13]);
+	}
+	loadTextSegment(_freeDesc, file, len[14]);
 
-	closeFile();
+	processEvents();
 }
 
 void DreamWebEngine::restoreAll() {
@@ -2122,25 +2126,28 @@ void DreamWebEngine::restoreReels() {
 
 	const Room &room = g_roomData[_realLocation];
 
-	openFile(room.name);
+	processEvents();
+	Common::File file;
+	if (!file.open(room.name))
+		error("cannot open file %s", room.name);
 
 	FileHeader header;
-	readFromFile((uint8 *)&header, sizeof(FileHeader));
+	file.read((uint8 *)&header, sizeof(FileHeader));
 
 	// read segment lengths from room file header
 	int len[15];
 	for (int i = 0; i < 15; ++i)
 		len[i] = header.len(i);
 
-	skipBytes(len[0]);
-	skipBytes(len[1]);
-	skipBytes(len[2]);
-	skipBytes(len[3]);
-	loadGraphicsSegment(_reel1, len[4]);
-	loadGraphicsSegment(_reel2, len[5]);
-	loadGraphicsSegment(_reel3, len[6]);
+	file.skip(len[0]);
+	file.skip(len[1]);
+	file.skip(len[2]);
+	file.skip(len[3]);
+	loadGraphicsSegment(_reel1, file, len[4]);
+	loadGraphicsSegment(_reel2, file, len[5]);
+	loadGraphicsSegment(_reel3, file, len[6]);
 
-	closeFile();
+	processEvents();
 }
 
 void DreamWebEngine::showExit() {
-- 
cgit v1.2.3


From 32e5778d1f426c166774c05666691f64258b8420 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 28 Dec 2011 20:11:36 +0100
Subject: DREAMWEB: Fix crash when loading a room without reels

---
 engines/dreamweb/stubs.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 94518e85f3..ef10aad0dc 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2054,7 +2054,7 @@ void DreamWebEngine::loadRoomData(const Room &room, bool skipDat) {
 	file.read((uint8 *)&header, sizeof(FileHeader));
 
 	// read segment lengths from room file header
-	int len[15];
+	unsigned int len[15];
 	for (int i = 0; i < 15; ++i)
 		len[i] = header.len(i);
 
@@ -2085,13 +2085,18 @@ void DreamWebEngine::loadRoomData(const Room &room, bool skipDat) {
 	loadGraphicsSegment(_reel2, file, len[5]);
 	loadGraphicsSegment(_reel3, file, len[6]);
 
-	// segment 7 consists of 36*38 pathNodes followed by 'reelList'
-	file.read((uint8 *)_pathData, 36*sizeof(RoomPaths));
-	unsigned int reelLen = len[7] - 36*sizeof(RoomPaths);
-	unsigned int reelCount = (reelLen + sizeof(Reel) - 1) / sizeof(Reel);
+	// segment 7 consists of 36 RoomPaths followed by 'reelList'
 	delete[] _reelList;
-	_reelList = new Reel[reelCount];
-	file.read((uint8 *)_reelList, reelLen);
+	if (len[7] <= 36*sizeof(RoomPaths)) {
+		file.read((uint8 *)_pathData, len[7]);
+		_reelList = 0;
+	} else {
+		file.read((uint8 *)_pathData, 36*sizeof(RoomPaths));
+		unsigned int reelLen = len[7] - 36*sizeof(RoomPaths);
+		unsigned int reelCount = (reelLen + sizeof(Reel) - 1) / sizeof(Reel);
+		_reelList = new Reel[reelCount];
+		file.read((uint8 *)_reelList, reelLen);
+	}
 
 	// segment 8 consists of 12 personFrames followed by a TextFile
 	file.read((uint8 *)_personFramesLE, 24);
-- 
cgit v1.2.3


From bfd891d571bfad4d0e192a0db0b9b1bba4ffe4a7 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Dec 2011 20:20:59 +0100
Subject: DREAMWEB: Mark some member vars as only being used in keypad.cpp;
 cleanup

---
 engines/dreamweb/dreamweb.cpp |  2 --
 engines/dreamweb/dreamweb.h   | 31 ++++++++++++++-----------------
 engines/dreamweb/keypad.cpp   | 19 ++++++-------------
 3 files changed, 20 insertions(+), 32 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index e790baa3e3..67e72ebf7c 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -181,8 +181,6 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_symbolBotX = 0;
 	_symbolBotNum = 0;
 	_symbolBotDir = 0;
-	_dumpX = 0;
-	_dumpY = 0;
 	_walkAndExam = 0;
 	_walkExamType = 0;
 	_walkExamNum = 0;
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index a38c08f3d0..355c70715e 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -196,6 +196,20 @@ protected:
 
 	// from keypad.cpp
 	uint8 _pressList[6];
+	uint8 _pressed;
+	uint16 _pressPointer;
+	uint8 _graphicPress;
+	uint8 _pressCount;
+	uint8 _lightCount;
+	uint8 _folderPage;
+	uint8 _diaryPage;
+	uint8 _menuCount;
+	uint8 _symbolTopX;
+	uint8 _symbolTopNum;
+	int8 _symbolTopDir;
+	uint8 _symbolBotX;
+	uint8 _symbolBotNum;
+	int8 _symbolBotDir;
 
 	// from monitor.cpp
 	char _inputLine[64];
@@ -393,22 +407,6 @@ public:
 	uint8 _watchDump;
 	uint8 _logoNum;
 	uint8 _oldLogoNum;
-	uint8 _pressed;
-	uint16 _pressPointer;
-	uint8 _graphicPress;
-	uint8 _pressCount;
-	uint8 _lightCount;
-	uint8 _folderPage;
-	uint8 _diaryPage;
-	uint8 _menuCount;
-	uint8 _symbolTopX;
-	uint8 _symbolTopNum;
-	uint8 _symbolTopDir;
-	uint8 _symbolBotX;
-	uint8 _symbolBotNum;
-	uint8 _symbolBotDir;
-	uint16 _dumpX;
-	uint16 _dumpY;
 	uint8 _walkAndExam;
 	uint8 _walkExamType;
 	uint8 _walkExamNum;
@@ -489,7 +487,6 @@ public:
 	void showOuterPad();
 	void dumpKeypad();
 	void dumpSymbol();
-	void dumpSymBox();
 	void quitSymbol();
 	void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3);
 
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 30d44d3c73..eaffad822d 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -590,7 +590,7 @@ void DreamWebEngine::setTopLeft() {
 	}
 
 	if (_mouseButton != 0)
-		_symbolTopDir = 0xFF;
+		_symbolTopDir = -1;
 }
 
 void DreamWebEngine::setTopRight() {
@@ -605,7 +605,7 @@ void DreamWebEngine::setTopRight() {
 	}
 
 	if (_mouseButton != 0)
-		_symbolTopDir = 1;
+		_symbolTopDir = +1;
 }
 
 void DreamWebEngine::setBotLeft() {
@@ -620,7 +620,7 @@ void DreamWebEngine::setBotLeft() {
 	}
 
 	if (_mouseButton != 0)
-		_symbolBotDir = 0xFF;
+		_symbolBotDir = -1;
 }
 
 void DreamWebEngine::setBotRight() {
@@ -635,7 +635,7 @@ void DreamWebEngine::setBotRight() {
 	}
 
 	if (_mouseButton != 0)
-		_symbolBotDir = 1;
+		_symbolBotDir = +1;
 }
 
 void DreamWebEngine::dumpSymbol() {
@@ -672,7 +672,7 @@ void DreamWebEngine::updateSymbolTop() {
 	if (!_symbolTopDir)
 		return; // topfinished
 
-	if (_symbolTopDir == (byte)-1) {
+	if (_symbolTopDir == -1) {
 		// Backward
 		_symbolTopX--;
 		if (_symbolTopX != (byte)-1) {
@@ -709,7 +709,7 @@ void DreamWebEngine::updateSymbolBot() {
 	if (!_symbolBotDir)
 		return; // botfinished
 
-	if (_symbolBotDir == (byte)-1) {
+	if (_symbolBotDir == -1) {
 		// Backward
 		_symbolBotX--;
 		if (_symbolBotX != (byte)-1) {
@@ -742,13 +742,6 @@ void DreamWebEngine::updateSymbolBot() {
 	}
 }
 
-void DreamWebEngine::dumpSymBox() {
-	if (_dumpX != 0xFFFF) {
-		multiDump(_dumpX, _dumpY, 30, 77);
-		_dumpX = 0xFFFF;
-	}
-}
-
 void DreamWebEngine::useDiary() {
 	getRidOfReels();
 	loadIntoTemp("DREAMWEB.G14");
-- 
cgit v1.2.3


From dc4af2afc2013a0ab20955440221dc55332a0063 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Dec 2011 20:31:50 +0100
Subject: DREAMWEB: Added commandOnlyCond() method

---
 engines/dreamweb/dreamweb.h   |  3 ++-
 engines/dreamweb/keypad.cpp   | 56 +++++++++----------------------------------
 engines/dreamweb/newplace.cpp | 20 ++++------------
 engines/dreamweb/object.cpp   |  5 +---
 engines/dreamweb/saveload.cpp | 45 +++++++---------------------------
 engines/dreamweb/stubs.cpp    | 52 +++++++++++++---------------------------
 engines/dreamweb/talk.cpp     | 10 ++------
 7 files changed, 45 insertions(+), 146 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 355c70715e..7e6ca1ddd7 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -814,7 +814,9 @@ public:
 	void roomName();
 	void showIcon();
 	void eraseOldObs();
+	void commandOnlyCond(uint8 command, uint8 commandType);
 	void commandOnly(uint8 command);
+	void commandWithOb(uint8 command, uint8 type, uint8 index);
 	void blank();
 	void setTopLeft();
 	void setTopRight();
@@ -884,7 +886,6 @@ public:
 	void makeMainScreen();
 	void showWatchReel();
 	void watchReel();
-	void commandWithOb(uint8 command, uint8 type, uint8 index);
 	void examineObText();
 	void blockNameText();
 	void personNameText();
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index eaffad822d..2a31652ace 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -112,10 +112,7 @@ void DreamWebEngine::loadKeypad() {
 }
 
 void DreamWebEngine::quitKey() {
-	if (_commandType != 222) {
-		_commandType = 222;
-		commandOnly(4);
-	}
+	commandOnlyCond(4, 222);
 
 	if (_mouseButton != _oldButton && (_mouseButton & 1))
 		_getBack = 1;
@@ -177,11 +174,7 @@ void DreamWebEngine::buttonEnter() {
 }
 
 void DreamWebEngine::buttonPress(uint8 buttonId) {
-	uint8 commandType = 100 + buttonId;
-	if (_commandType != commandType) {
-		_commandType = commandType;
-		commandOnly(buttonId + 4);
-	}
+	commandOnlyCond(buttonId + 4, buttonId + 100);
 	if ((_mouseButton & 1) && (_mouseButton != _oldButton)) {
 		_pressed = buttonId;
 		_graphicPress = buttonId + 21;
@@ -338,10 +331,7 @@ void DreamWebEngine::nextFolder() {
 		blank();
 		return;
 	}
-	if (_commandType != 201) {
-		_commandType = 201;
-		commandOnly(16);
-	}
+	commandOnlyCond(16, 201);
 	if ((_mouseButton == 1) && (_mouseButton != _oldButton)) {
 		++_folderPage;
 		folderHints();
@@ -380,10 +370,7 @@ void DreamWebEngine::lastFolder() {
 		blank();
 		return;
 	}
-	if (_commandType != 202) {
-		_commandType = 202;
-		commandOnly(17);
-	}
+	commandOnlyCond(17, 202);
 
 	if ((_mouseButton == 1) && (_mouseButton != _oldButton)) {
 		--_folderPage;
@@ -564,10 +551,7 @@ void DreamWebEngine::quitSymbol() {
 		return;
 	};
 
-	if (_commandType != 222) {
-		_commandType = 222;
-		commandOnly(18);
-	}
+	commandOnlyCond(18, 222);
 
 	if (_mouseButton == _oldButton)
 		return;	// notqs
@@ -584,10 +568,7 @@ void DreamWebEngine::setTopLeft() {
 		return;
 	}
 
-	if (_commandType != 210) {
-		_commandType = 210;
-		commandOnly(19);
-	}
+	commandOnlyCond(19, 210);
 
 	if (_mouseButton != 0)
 		_symbolTopDir = -1;
@@ -599,10 +580,7 @@ void DreamWebEngine::setTopRight() {
 		return;
 	}
 
-	if (_commandType != 211) {
-		_commandType = 211;
-		commandOnly(20);
-	}
+	commandOnlyCond(20, 211);
 
 	if (_mouseButton != 0)
 		_symbolTopDir = +1;
@@ -614,10 +592,7 @@ void DreamWebEngine::setBotLeft() {
 		return;
 	}
 
-	if (_commandType != 212) {
-		_commandType = 212;
-		commandOnly(21);
-	}
+	commandOnlyCond(21, 212);
 
 	if (_mouseButton != 0)
 		_symbolBotDir = -1;
@@ -629,10 +604,7 @@ void DreamWebEngine::setBotRight() {
 		return;
 	}
 
-	if (_commandType != 213) {
-		_commandType = 213;
-		commandOnly(22);
-	}
+	commandOnlyCond(22, 213);
 
 	if (_mouseButton != 0)
 		_symbolBotDir = +1;
@@ -841,10 +813,7 @@ void DreamWebEngine::dumpDiaryKeys() {
 }
 
 void DreamWebEngine::diaryKeyP() {
-	if (_commandType != 214) {
-		_commandType = 214;
-		commandOnly(23);
-	}
+	commandOnlyCond(23, 214);
 
 	if (!_mouseButton ||
 		_oldButton == _mouseButton ||
@@ -861,10 +830,7 @@ void DreamWebEngine::diaryKeyP() {
 }
 
 void DreamWebEngine::diaryKeyN() {
-	if (_commandType != 213) {
-		_commandType = 213;
-		commandOnly(23);
-	}
+	commandOnlyCond(23, 213);
 
 	if (!_mouseButton ||
 		_oldButton == _mouseButton ||
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 248f04a4d9..0d7c5a18fe 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -103,10 +103,7 @@ void DreamWebEngine::showCity() {
 }
 
 void DreamWebEngine::lookAtPlace() {
-	if (_commandType != 224) {
-		_commandType = 224;
-		commandOnly(27);
-	}
+	commandOnlyCond(27, 224);
 
 	if (!(_mouseButton & 1) ||
 		_mouseButton == _oldButton ||
@@ -164,10 +161,7 @@ void DreamWebEngine::showArrows() {
 }
 
 void DreamWebEngine::nextDest() {
-	if (_commandType != 218) {
-		_commandType = 218;
-		commandOnly(28);
-	}
+	commandOnlyCond(28, 218);
 
 	if (!(_mouseButton & 1) || _oldButton == 1)
 		return;	// nodu
@@ -193,10 +187,7 @@ void DreamWebEngine::nextDest() {
 }
 
 void DreamWebEngine::lastDest() {
-	if (_commandType != 219) {
-		_commandType = 219;
-		commandOnly(29);
-	}
+	commandOnlyCond(29, 219);
 
 	if (!(_mouseButton & 1) || _oldButton == 1)
 		return;	// nodd
@@ -222,10 +213,7 @@ void DreamWebEngine::lastDest() {
 }
 
 void DreamWebEngine::destSelect() {
-	if (_commandType != 222) {
-		_commandType = 222;
-		commandOnly(30);
-	}
+	commandOnlyCond(30, 222);
 
 	if (!(_mouseButton & 1) || _oldButton == 1)
 		return;	// notrav
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 249c275a3f..bcdf2e5eb9 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -218,10 +218,7 @@ void DreamWebEngine::inventory() {
 		return;
 	}
 
-	if (_commandType != 239) {
-		_commandType = 239;
-		commandOnly(32);
-	}
+	commandOnlyCond(32, 239);
 
 	if (_mouseButton == _oldButton)
 		return;
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 29f1b916a4..386319db34 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -107,10 +107,7 @@ void syncGameVars(Common::Serializer &s, GameVars &vars) {
 }
 
 void DreamWebEngine::loadGame() {
-	if (_commandType != 246) {
-		_commandType = 246;
-		commandOnly(41);
-	}
+	commandOnlyCond(41, 246);
 	if (_mouseButton == _oldButton)
 		return; // "noload"
 	if (_mouseButton == 1)
@@ -204,10 +201,7 @@ void DreamWebEngine::saveGame() {
 		return;
 	}
 
-	if (_commandType != 247) {
-		_commandType = 247;
-		commandOnly(44);
-	}
+	commandOnlyCond(44, 247);
 	if (_mouseButton != 1)
 		return;
 
@@ -304,10 +298,7 @@ void DreamWebEngine::saveLoad() {
 		blank();
 		return;
 	}
-	if (_commandType != 253) {
-		_commandType = 253;
-		commandOnly(43);
-	}
+	commandOnlyCond(43, 253);
 	if ((_mouseButton != _oldButton) && (_mouseButton & 1))
 		doSaveLoad();
 }
@@ -384,10 +375,7 @@ void DreamWebEngine::getBackFromOps() {
 }
 
 void DreamWebEngine::getBackToOps() {
-	if (_commandType != 201) {
-		_commandType = 201;
-		commandOnly(42);
-	}
+	commandOnlyCond(42, 201);
 
 	if (_mouseButton != _oldButton) {
 		if (_mouseButton & 1) {
@@ -411,10 +399,7 @@ void DreamWebEngine::showDiscOps() {
 }
 
 void DreamWebEngine::discOps() {
-	if (_commandType != 249) {
-		_commandType = 249;
-		commandOnly(43);
-	}
+	commandOnlyCond(43, 249);
 
 	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
@@ -450,10 +435,7 @@ void DreamWebEngine::discOps() {
 }
 
 void DreamWebEngine::actualSave() {
-	if (_commandType != 222) {
-		_commandType = 222;
-		commandOnly(44);
-	}
+	commandOnlyCond(44, 222);
 
 	if (!(_mouseButton & 1))
 		return;
@@ -477,10 +459,7 @@ void DreamWebEngine::actualSave() {
 }
 
 void DreamWebEngine::actualLoad() {
-	if (_commandType != 221) {
-		_commandType = 221;
-		commandOnly(41);
-	}
+	commandOnlyCond(41, 221);
 
 	if (_mouseButton == _oldButton || _mouseButton != 1)
 		return;
@@ -702,10 +681,7 @@ uint DreamWebEngine::scanForNames() {
 }
 
 void DreamWebEngine::loadOld() {
-	if (_commandType != 252) {
-		_commandType = 252;
-		commandOnly(48);
-	}
+	commandOnlyCond(48, 252);
 
 	if (!(_mouseButton & 1))
 		return;
@@ -793,10 +769,7 @@ void DreamWebEngine::checkInput() {
 }
 
 void DreamWebEngine::selectSlot() {
-	if (_commandType != 244) {
-		_commandType = 244;
-		commandOnly(45);
-	}
+	commandOnlyCond(45, 244);
 
 	if (_mouseButton != 1 || _mouseButton == _oldButton)
 		return; // noselslot
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index ef10aad0dc..5bca846b36 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -979,10 +979,7 @@ void DreamWebEngine::getTime() {
 }
 
 void DreamWebEngine::DOSReturn() {
-	if (_commandType != 250) {
-		_commandType = 250;
-		commandOnly(46);
-	}
+	commandOnlyCond(46, 250);
 
 	if (_mouseButton & 1) {
 		_mouseButton = 0;
@@ -1120,6 +1117,13 @@ void DreamWebEngine::delTextLine() {
 		multiPut(_textUnder, _textAddressX, _textAddressY, kUnderTextSizeX, kUnderTextSizeY);
 }
 
+void DreamWebEngine::commandOnlyCond(uint8 command, uint8 commandType) {
+	if (_commandType != commandType) {
+		_commandType = commandType;
+		commandOnly(command);
+	}
+}
+
 void DreamWebEngine::commandOnly(uint8 command) {
 	delTextLine();
 	const uint8 *string = (const uint8 *)_commandText.getString(command);
@@ -1768,10 +1772,7 @@ void DreamWebEngine::zoomOnOff() {
 		return;
 	}
 
-	if (_commandType != 222) {
-		_commandType = 222;
-		commandOnly(39);
-	}
+	commandOnlyCond(39, 222);
 
 	if (!(_mouseButton & 1) || (_mouseButton == _oldButton))
 		return;
@@ -1965,10 +1966,7 @@ void DreamWebEngine::look() {
 		blank();
 		return;
 	}
-	if (_commandType != 241) {
-		_commandType = 241;
-		commandOnly(25);
-	}
+	commandOnlyCond(25, 241);
 	if ((_mouseButton == 1) && (_mouseButton != _oldButton))
 		doLook();
 }
@@ -2300,10 +2298,7 @@ void DreamWebEngine::readKey() {
 }
 
 void DreamWebEngine::newGame() {
-	if (_commandType != 251) {
-		_commandType = 251;
-		commandOnly(47);
-	}
+	commandOnlyCond(47, 251);
 
 	if (_mouseButton == 1)
 		_getBack = 3;
@@ -2377,10 +2372,7 @@ void DreamWebEngine::redrawMainScrn() {
 }
 
 void DreamWebEngine::blank() {
-	if (_commandType != 199) {
-		_commandType = 199;
-		commandOnly(0);
-	}
+	commandOnlyCond(0, 199);
 }
 
 void DreamWebEngine::allPointer() {
@@ -2537,10 +2529,7 @@ bool DreamWebEngine::isSetObOnMap(uint8 index) {
 }
 
 void DreamWebEngine::examineInventory() {
-	if (_commandType != 249) {
-		_commandType = 249;
-		commandOnly(32);
-	}
+	commandOnlyCond(32, 249);
 
 	if (!(_mouseButton & 1))
 		return;
@@ -2663,10 +2652,7 @@ void DreamWebEngine::madmanRun() {
 		return;
 	}
 
-	if (_commandType != 211) {
-		_commandType = 211;
-		commandOnly(52);
-	}
+	commandOnlyCond(52, 211);
 
 	if (_mouseButton == 1 &&
 		_mouseButton != _oldButton)
@@ -2789,10 +2775,7 @@ void DreamWebEngine::getBack1() {
 	}
 
 
-	if (_commandType != 202) {
-		_commandType = 202;
-		commandOnly(26);
-	}
+	commandOnlyCond(26, 202);
 
 	if (_mouseButton == _oldButton)
 		return;
@@ -3105,10 +3088,7 @@ void DreamWebEngine::edensFlatReminders() {
 }
 
 void DreamWebEngine::incRyanPage() {
-	if (_commandType != 222) {
-		_commandType = 222;
-		commandOnly(31);
-	}
+	commandOnlyCond(31, 222);
 
 	if (_mouseButton == _oldButton || !(_mouseButton & 1))
 		return;
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 9a94f0f68d..0f59cad895 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -119,10 +119,7 @@ void DreamWebEngine::moreTalk() {
 		return;
 	}
 
-	if (_commandType != 215) {
-		_commandType = 215;
-		commandOnly(49);
-	}
+	commandOnlyCond(49, 215);
 
 	if (_mouseButton == _oldButton)
 		return;	// nomore
@@ -245,10 +242,7 @@ void DreamWebEngine::redes() {
 		return;
 	}
 
-	if (_commandType != 217) {
-		_commandType = 217;
-		commandOnly(50);
-	}
+	commandOnlyCond(50, 217);
 
 	if (!(_mouseButton & 1))
 		return;
-- 
cgit v1.2.3


From a589f3d12f72c4f59a4c4bc5216f17adf60494d5 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Dec 2011 23:13:21 +0100
Subject: SCUMM: Fix warning due to implicit conversion to int

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

(limited to 'engines')

diff --git a/engines/scumm/player_apple2.h b/engines/scumm/player_apple2.h
index d9345a7113..4cbd24b81d 100644
--- a/engines/scumm/player_apple2.h
+++ b/engines/scumm/player_apple2.h
@@ -170,7 +170,7 @@ public:
 
 	void setSampleRate(int rate) {
 		/* ~46 CPU cycles per sample @ 22.05kHz */
-		_cyclesPerSampleFP = APPLEII_CPU_CLOCK * (1 << PREC_SHIFT) / rate;
+		_cyclesPerSampleFP = int(APPLEII_CPU_CLOCK * (1 << PREC_SHIFT) / rate);
 		reset();
 	}
 
-- 
cgit v1.2.3


From 9f99fb5f8a731adf9f1aa9d538029d18c78d99a8 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Dec 2011 23:06:22 +0100
Subject: DREAMWEB: Use ObjectType enums in more places

---
 engines/dreamweb/object.cpp |  6 +++---
 engines/dreamweb/stubs.cpp  | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index bcdf2e5eb9..443366561a 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -30,7 +30,7 @@ void DreamWebEngine::showRyanPage() {
 }
 
 void DreamWebEngine::findAllRyan() {
-	memset(_ryanInvList, 0xff, 60);
+	memset(_ryanInvList, 0xff, sizeof(_ryanInvList));
 	for (size_t i = 0; i < kNumexobjects; ++i) {
 		const DynObject *extra = getExAd(i);
 		if (extra->mapad[0] != kExObjectType)
@@ -683,12 +683,12 @@ void DreamWebEngine::dropObject() {
 		return;
 	}
 
-	if (compare(_itemFrame, 4, "GUNA") || compare(_itemFrame, 4, "SHLD")) {
+	if (compare(_itemFrame, kExObjectType, "GUNA") || compare(_itemFrame, kExObjectType, "SHLD")) {
 		cantDrop();
 		return;
 	}
 
-	_objectType = 4;
+	_objectType = kExObjectType;
 	DynObject *object = getExAd(_itemFrame);
 	object->mapad[0] = 0;
 	object->mapad[1] = ((_ryanX + 4) >> 4) + _mapX;
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 5bca846b36..4f18136dfc 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1185,16 +1185,16 @@ bool DreamWebEngine::checkIfEx(uint8 x, uint8 y) {
 }
 
 const uint8 *DreamWebEngine::findObName(uint8 type, uint8 index) {
-	if (type == 5) {
-		uint16 i = 64 * (index & 127);
-		return (const uint8 *)_personText.getString(i);
-	} else if (type == 4) {
+	switch (type) {
+	case 5:
+		return (const uint8 *)_personText.getString(64 * (index & 127));
+	case kExObjectType:
 		return (const uint8 *)_exText.getString(index);
-	} else if (type == 2) {
+	case kFreeObjectType:
 		return (const uint8 *)_freeDesc.getString(index);
-	} else if (type == 1) {
+	case kSetObjectType1:
 		return (const uint8 *)_setDesc.getString(index);
-	} else {
+	default:
 		return (const uint8 *)_blockDesc.getString(index);
 	}
 }
-- 
cgit v1.2.3


From 36778c8221e7a9994db8daf9ca5f90529f09d2d0 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Dec 2011 23:56:30 +0100
Subject: DREAMWEB: Remove unnecessary DreamWebEngine:: uses

---
 engines/dreamweb/newplace.cpp | 2 +-
 engines/dreamweb/people.cpp   | 6 +++---
 engines/dreamweb/print.cpp    | 4 ++--
 engines/dreamweb/use.cpp      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 0d7c5a18fe..8083055da6 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -151,7 +151,7 @@ void DreamWebEngine::locationPic() {
 		showFrame(_tempGraphics, 104, 140 + 14, 3, 0);	// Currently in this location
 
 	const uint8 *string = (const uint8 *)_travelText.getString(_destPos);
-	DreamWebEngine::printDirect(string, 50, 20, 241, 241 & 1);
+	printDirect(string, 50, 20, 241, 241 & 1);
 }
 
 void DreamWebEngine::showArrows() {
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 98f36a90cc..0f51adde17 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -343,7 +343,7 @@ void DreamWebEngine::madmansTelly(ReelRoutine &routine) {
 void DreamWebEngine::smokeBloke(ReelRoutine &routine) {
 	if (_vars._rockstarDead == 0) {
 		if (routine.b7 & 128)
-			DreamWebEngine::setLocation(5);
+			setLocation(5);
 	}
 	if (checkSpeed(routine)) {
 		if (routine.reelPointer() == 100) {
@@ -939,7 +939,7 @@ void DreamWebEngine::mugger(ReelRoutine &routine) {
 		_objectType = kExObjectType;
 		removeObFromInv();
 		makeMainScreen();
-		DreamWebEngine::setupTimedUse(48, 70, 10, 68 - 32, 54 + 64);
+		setupTimedUse(48, 70, 10, 68 - 32, 54 + 64);
 		_vars._beenMugged = 1;
 	}
 }
@@ -950,7 +950,7 @@ void DreamWebEngine::businessMan(ReelRoutine &routine) {
 	_pointerMode = 0;
 	_vars._watchingTime = 2;
 	if (routine.reelPointer() == 2)
-		DreamWebEngine::setupTimedUse(49, 30, 1, 68, 174);	// First
+		setupTimedUse(49, 30, 1, 68, 174);	// First
 
 	if (routine.reelPointer() == 95) {
 		// Businessman combat won - end
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index a293aa74f9..24e0183a07 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -269,7 +269,7 @@ void DreamWebEngine::rollEndCreditsGameWon() {
 			uint16 y = 10 - j;
 			const uint8 *tmp_str = string;
 			for (int k = 0; k < 18; ++k) {
-				DreamWebEngine::printDirect(&tmp_str, 75, &y, 160 + 1, true);
+				printDirect(&tmp_str, 75, &y, 160 + 1, true);
 				y += linespacing;
 			}
 
@@ -308,7 +308,7 @@ void DreamWebEngine::rollEndCreditsGameLost() {
 			uint16 y = 10 - j;
 			const uint8 *tmp_str = string;
 			for (int k = 0; k < 18; ++k) {
-				DreamWebEngine::printDirect(&tmp_str, 25, &y, 160 + 1, true);
+				printDirect(&tmp_str, 25, &y, 160 + 1, true);
 				y += linespacing;
 			}
 
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 58210c1d85..fc0398c7b9 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1450,7 +1450,7 @@ void DreamWebEngine::useAltar() {
 		_vars._endWatchReel = 174;
 		_vars._watchSpeed = 1;
 		_vars._speedCount = 1;
-		DreamWebEngine::setupTimedUse(47, 32, 98, 52, 76);
+		setupTimedUse(47, 32, 98, 52, 76);
 		_getBack = 1;
 	} else {
 		showPuzText(23, 300);
-- 
cgit v1.2.3


From 93ee179641122d47cda3483a85e39b3256f5ce92 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 29 Dec 2011 00:00:44 +0100
Subject: DREAMWEB: Minor cleanup

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

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 4f18136dfc..3602558b8b 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2977,7 +2977,7 @@ void DreamWebEngine::clearBuffers() {
 }
 
 void DreamWebEngine::clearChanges() {
-	memset(_listOfChanges, 0xFF, 4*kNumChanges);
+	memset(_listOfChanges, 0xFF, sizeof(_listOfChanges));
 
 	setupInitialReelRoutines();
 
@@ -2988,13 +2988,14 @@ void DreamWebEngine::clearChanges() {
 
 	memset(_exFrames._frames, 0xFF, kFrameBlocksize);
 	memset(_exFrames._data, 0xFF, kExframeslen);
-	memset(_exData, 0xFF, sizeof(DynObject) * kNumexobjects);
+	memset(_exData, 0xFF, sizeof(_exData));
 	memset(_exText._offsetsLE, 0xFF, 2*(kNumexobjects+2));
 	memset(_exText._text, 0xFF, kExtextlen);
 
-	const uint8 initialRoomsCanGo[] = { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+	const uint8 initialRoomsCanGo[16] = { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-	memcpy(_roomsCanGo, initialRoomsCanGo, 16);
+	assert(sizeof(_roomsCanGo) == sizeof(initialRoomsCanGo));
+	memcpy(_roomsCanGo, initialRoomsCanGo, sizeof(initialRoomsCanGo));
 }
 
 void DreamWebEngine::setupInitialVars() {
-- 
cgit v1.2.3


From 3539c5e981b2a07eba18c5c58a9a9b8215b0c4c3 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 28 Dec 2011 19:36:15 +0100
Subject: TSAGE: R2R - Partial implementation of scene 3375.

---
 engines/tsage/globals.cpp                        |   5 +-
 engines/tsage/globals.h                          |   2 +
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   1 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 410 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h    |  55 +++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 243 ++++++++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   |  32 ++
 7 files changed, 747 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index d30d585c09..2869b3b60e 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -387,6 +387,8 @@ void Ringworld2Globals::reset() {
 	_v565AE = 0;
 	for (int i = 0; i < 14; i++)
 		_v56605[i] = 0;
+	_v56A99 = 0;
+	_v56A9E = 0;
 	_v56AA0 = 0;
 	_v56AA1 = 0;
 	_v56AAB = 0;
@@ -424,6 +426,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 
 	s.syncAsSint16LE(_v5657C);
 	s.syncAsSint16LE(_v565F5);
+	s.syncAsSint16LE(_v56A9E);
 	s.syncAsSint16LE(_v56AAB);
 	s.syncAsSint16LE(_v57C2C);
 	s.syncAsSint16LE(_v58CE2);
@@ -438,7 +441,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 
 	for (i = 0; i < 14; ++i)
 		s.syncAsByte(_v56605[i]);
-
+	s.syncAsByte(_v56A99);
 	for (i = 0; i < 12; ++i)
 		s.syncAsByte(_stripManager_lookupList[i]);
 
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 498659d3ae..f50cb70773 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -253,6 +253,8 @@ public:
 	int _v5657C;
 	byte _v565AE;
 	byte _v56605[14];
+	byte _v56A99;
+	int _v56A9E;
 	byte _v56AA0;
 	byte _v56AA1;
 	int _v56AAB;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 1b6c375b80..0e387083a5 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -217,6 +217,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Cutscene - Ship landing
 		return new Scene3350();
 	case 3375:
+		return new Scene3375();
 	case 3385:
 	case 3395:
 		error("Missing scene %d from group 3", sceneNumber);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index a42bbcb08c..8c08299e6f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1698,6 +1698,416 @@ void Scene3350::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3375 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene3375::Scene3375() {
+	_field1488 = _field1492 = 0;
+	for (int i = 0; i < 4; ++i)
+		_field148A[i] = 0;
+}
+
+void Scene3375::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field1488);
+	s.syncAsSint16LE(_field1492);
+	for (int i = 0; i < 4; ++i)
+		s.syncAsSint16LE(_field148A[i]);
+}
+
+bool Scene3375::Actor1::startAction(CursorType action, Event &event) {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_TALK)
+		return SceneActor::startAction(action, event);
+	
+	scene->_sceneMode = 9999;
+	if (R2_GLOBALS._player._characterIndex == 2)
+		scene->_stripManager.start(3302, scene);
+	else
+		scene->_stripManager.start(3304, scene);
+	
+	return true;
+}
+
+bool Scene3375::Actor2::startAction(CursorType action, Event &event) {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_TALK)
+		return SceneActor::startAction(action, event);
+	
+	scene->_sceneMode = 9999;
+	if (R2_GLOBALS._player._characterIndex == 3)
+		scene->_stripManager.start(3302, scene);
+	else
+		scene->_stripManager.start(3301, scene);
+	
+	return true;
+}
+
+bool Scene3375::Actor3::startAction(CursorType action, Event &event) {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_TALK)
+		return SceneActor::startAction(action, event);
+	
+	scene->_sceneMode = 9999;
+	scene->_stripManager.start(3303, scene);
+	
+	return true;
+}
+
+bool Scene3375::Actor4::startAction(CursorType action, Event &event) {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+	
+	if (R2_GLOBALS._v56A9E != 0) {
+		R2_GLOBALS._walkRegions.disableRegion(2);
+		R2_GLOBALS._walkRegions.disableRegion(3);
+	} else {
+		R2_GLOBALS._walkRegions.disableRegion(1);
+		R2_GLOBALS._walkRegions.disableRegion(3);
+		R2_GLOBALS._walkRegions.disableRegion(4);
+	}
+	R2_GLOBALS._walkRegions.disableRegion(6);
+	R2_GLOBALS._walkRegions.disableRegion(7);
+	R2_GLOBALS._walkRegions.disableRegion(8);
+
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	
+	scene->_sceneMode = 3375;
+	scene->setAction(&scene->_sequenceManager, scene, 3375, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL);
+	
+	return true;
+}
+
+void Scene3375::Exit1::changeScene() {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+
+	_moving = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	scene->_sceneMode = 3376;
+	if (R2_GLOBALS._v56A9E != 0) {
+		R2_GLOBALS._walkRegions.disableRegion(2);
+		R2_GLOBALS._walkRegions.disableRegion(3);
+	} else {
+		R2_GLOBALS._walkRegions.disableRegion(1);
+		R2_GLOBALS._walkRegions.disableRegion(3);
+		R2_GLOBALS._walkRegions.disableRegion(4);
+	}
+	if (scene->_actor1._position.y != 163) {
+		R2_GLOBALS._player.setStrip(-1);
+		scene->_actor1.setStrip2(-1);
+		scene->_actor2.setStrip2(-1);
+		scene->_actor3.setStrip2(-1);
+		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, NULL);
+	} else {
+		R2_GLOBALS._player.setStrip2(2);
+		scene->_actor1.setStrip2(2);
+		scene->_actor2.setStrip2(2);
+		scene->_actor3.setStrip2(2);
+		R2_GLOBALS._sound2.play(314);
+
+		Common::Point pt(50, 150);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, scene);
+	}
+}
+
+void Scene3375::Exit2::changeScene() {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+
+	_moving = false;
+	R2_GLOBALS._player._effect = 6;
+	R2_GLOBALS._player._shade = 4;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+
+	scene->_sceneMode = 3377;
+	scene->_field1488 = 3381;
+
+	if (R2_GLOBALS._v56A9E != 0) {
+		R2_GLOBALS._walkRegions.disableRegion(2);
+		R2_GLOBALS._walkRegions.disableRegion(3);
+	} else {
+		R2_GLOBALS._walkRegions.disableRegion(1);
+		R2_GLOBALS._walkRegions.disableRegion(3);
+		R2_GLOBALS._walkRegions.disableRegion(4);
+	}
+	scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, NULL);
+}
+
+void Scene3375::Exit3::changeScene() {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+
+	_moving = false;
+	R2_GLOBALS._player._effect = 6;
+	R2_GLOBALS._player._shade = 4;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+
+	scene->_sceneMode = 3378;
+	scene->_field1488 = 3380;
+
+	if (R2_GLOBALS._v56A9E != 0) {
+		R2_GLOBALS._walkRegions.disableRegion(2);
+		R2_GLOBALS._walkRegions.disableRegion(3);
+	} else {
+		R2_GLOBALS._walkRegions.disableRegion(1);
+		R2_GLOBALS._walkRegions.disableRegion(3);
+		R2_GLOBALS._walkRegions.disableRegion(4);
+	}
+	scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, NULL);
+}
+
+void Scene3375::postInit(SceneObjectList *OwnerList) {
+	_field148A[0] = 3376;
+	_field148A[1] = 3377;
+	_field148A[2] = 3375;
+	_field148A[3] = 3378;
+	
+	loadScene(_field148A[R2_GLOBALS._v56A9E]);
+	SceneExt::postInit();
+	
+	R2_GLOBALS._sound1.play(313);
+
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+	_stripManager.addSpeaker(&_mirandaSpeaker);
+	_stripManager.addSpeaker(&_webbsterSpeaker);
+
+	R2_GLOBALS._player._characterScene[1] = 3375;
+	R2_GLOBALS._player._characterScene[2] = 3375;
+	R2_GLOBALS._player._characterScene[3] = 3375;
+
+	setZoomPercents(55, 126, 167, 200);
+	R2_GLOBALS._player.postInit();
+	
+	if (R2_GLOBALS._player._characterIndex == 2) {
+		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+	} else {
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+	}
+	R2_GLOBALS._player.changeZoom(-1);
+	
+	switch (R2_GLOBALS._player._characterIndex) {
+	case 2:
+		if (R2_GLOBALS._sceneManager._previousScene == 3385)
+			R2_GLOBALS._player.setup(20, 1, 1);
+		else
+			R2_GLOBALS._player.setup(20, 3, 1);
+		break;
+	case 3:
+		if (R2_GLOBALS._sceneManager._previousScene == 3385)
+			R2_GLOBALS._player.setup(30, 1, 1);
+		else
+			R2_GLOBALS._player.setup(30, 3, 1);
+		break;
+	default:
+		if (R2_GLOBALS._sceneManager._previousScene == 3385)
+			R2_GLOBALS._player.setup(10, 1, 1);
+		else
+			R2_GLOBALS._player.setup(10, 3, 1);
+		break;
+	}
+	
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.disableControl();
+
+	_actor1.postInit();
+	if (R2_GLOBALS._player._characterIndex == 2) {
+		_actor1._moveRate = 10;
+		_actor1._moveDiff = Common::Point(3, 2);
+	} else {
+		_actor1._moveRate = 7;
+		_actor1._moveDiff = Common::Point(5, 3);
+	}
+	_actor1.changeZoom(-1);
+	_actor1._effect = 1;
+	
+	int tmpStrip, tmpVisage;
+	if (R2_GLOBALS._sceneManager._previousScene == 3385)
+		tmpStrip = 1;
+	else
+		tmpStrip = 4;
+	
+	if (R2_GLOBALS._player._characterIndex == 2)
+		tmpVisage = 10;
+	else
+		tmpVisage = 20;
+	
+	_actor1.setup(tmpVisage, tmpStrip, 1);
+	_actor1.animate(ANIM_MODE_1, NULL);
+	
+	_actor2.postInit();
+	_actor2._moveDiff = Common::Point(3, 2);
+	_actor2.changeZoom(-1);
+	_actor2._effect = 1;
+	if (R2_GLOBALS._sceneManager._previousScene == 3385)
+		tmpStrip = 1;
+	else
+		tmpStrip = 8;
+
+	if (R2_GLOBALS._player._characterIndex == 3)
+		tmpVisage = 10;
+	else
+		tmpVisage = 30;
+	
+	_actor2.setup(tmpVisage, tmpStrip, 1);
+	_actor2.animate(ANIM_MODE_1, NULL);
+	
+	_actor3.postInit();
+	_actor3._moveRate = 7;
+	_actor3._moveDiff = Common::Point(5, 3);
+	_actor3.changeZoom(-1);
+	_actor3._effect = 1;
+	if (R2_GLOBALS._sceneManager._previousScene == 3385)
+		tmpStrip = 1;
+	else
+		tmpStrip = 4;
+
+	_actor3.setup(40, tmpStrip, 1);
+	_actor3.animate(ANIM_MODE_1, NULL);
+	
+	_actor2.setDetails(3375, -1, -1, -1, 1, NULL);
+	_actor3.setDetails(3375, 21, -1, -1, 1, NULL);
+	_actor1.setDetails(3375, -1, -1, -1, 1, NULL);
+	
+	_actor4.postInit();
+	_actor4.setup(3375, 1, 1);
+	_actor4.setPosition(Common::Point(254, 166));
+	_actor4.fixPriority(140);
+	_actor4.hide();
+	
+	_exit1.setDetails(Rect(0, 84, 24, 167), EXITCURSOR_W, 3375);
+	_exit1.setDest(Common::Point(65, 155));
+	_exit2.setDetails(Rect(103, 152, 183, 170), SHADECURSOR_DOWN, 3375);
+	_exit2.setDest(Common::Point(158, 151));
+	_exit3.setDetails(Rect(180, 75, 213, 132), EXITCURSOR_E, 3375);
+	_exit3.setDest(Common::Point(201, 131));
+		
+	for (int i = 0; i <= 12; ++i)
+		_itemArray[i].setDetails(i, 3375, 3, -1, -1);
+	
+	_item1.setDetails(Rect(0, 0, 320, 200), 3375, 0, -1, 1, 1, NULL);
+
+	if (R2_GLOBALS._sceneManager._previousScene == 3385)
+		_sceneMode = 3379;
+	else
+		_sceneMode = 0;
+	
+	warning("sub_FC696(_sceneMode)");
+}
+
+void Scene3375::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene3375::signalCase3379() {
+	switch (R2_GLOBALS._v56A9E) {
+	case 0:
+		_exit1._enabled = true;
+		if (R2_GLOBALS._sceneManager._previousScene == 3385)
+			R2_GLOBALS._walkRegions.enableRegion(1);
+		else {
+			R2_GLOBALS._walkRegions.enableRegion(3);
+			R2_GLOBALS._walkRegions.enableRegion(4);
+		}
+		R2_GLOBALS._walkRegions.enableRegion(6);
+		R2_GLOBALS._walkRegions.enableRegion(7);
+	case 2:
+		_exit1._enabled = false;
+		R2_GLOBALS._walkRegions.enableRegion(2);
+		R2_GLOBALS._walkRegions.enableRegion(3);
+		R2_GLOBALS._walkRegions.enableRegion(5);
+		R2_GLOBALS._walkRegions.enableRegion(6);
+		R2_GLOBALS._walkRegions.enableRegion(7);
+		R2_GLOBALS._walkRegions.enableRegion(8);
+		R2_GLOBALS._walkRegions.enableRegion(9);
+	default:
+		_exit1._enabled = false;
+		R2_GLOBALS._walkRegions.enableRegion(2);
+		R2_GLOBALS._walkRegions.enableRegion(3);
+		R2_GLOBALS._walkRegions.enableRegion(5);
+		R2_GLOBALS._walkRegions.enableRegion(6);
+		break;
+	}
+	R2_GLOBALS._sceneManager._previousScene = 3375;
+	R2_GLOBALS._player._effect = 1;
+	_actor1._effect = 1;
+	_actor2._effect = 1;
+	_actor3._effect = 1;
+	R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+}
+
+void Scene3375::signal() {
+	switch (_sceneMode) {
+	case 3375:
+		R2_GLOBALS._sceneManager.changeScene(3400);
+		break;
+	case 3376:
+		R2_GLOBALS._sceneManager.changeScene(3385);
+		break;
+	case 3377:
+		// No break on purpose
+	case 3378:
+		_sceneMode = _field1488;
+		_field1488 = 0;
+		_actor1._effect = 6;
+		_actor1._shade = 4;
+		_actor2._effect = 6;
+		_actor2._shade = 4;
+		_actor3._effect = 6;
+		_actor3._shade = 4;
+		warning("sub_FC696(_sceneMode)");
+		break;
+	case 3379:
+		signalCase3379();
+		break;
+	case 9999:
+		if (_actor1._position.y == 163)
+			R2_GLOBALS._player.setStrip(1);
+		else
+			R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.enableControl(CURSOR_TALK);
+	default:
+		_actor1.setPriority(130);
+		_actor2.setPriority(132);
+		_actor3.setPriority(134);
+		signalCase3379();
+		break;
+	}
+}
+
+void Scene3375::dispatch() {
+	if ((R2_GLOBALS._player._position.y >= 168) && (R2_GLOBALS._player._effect == 1))
+		R2_GLOBALS._player._effect = 6;
+	else if ((R2_GLOBALS._player._position.y < 168) && (R2_GLOBALS._player._effect == 6))
+		R2_GLOBALS._player._effect = 1;
+
+	if ((_actor1._position.y >= 168) && (_actor1._effect == 1))
+		_actor1._effect = 6;
+	else if ((_actor1._position.y < 168) && (_actor1._effect == 6))
+		_actor1._effect = 1;
+
+	if ((_actor2._position.y >= 168) && (_actor2._effect == 1))
+		_actor2._effect = 6;
+	else if ((_actor2._position.y < 168) && (_actor2._effect == 6))
+		_actor2._effect = 1;
+
+	if ((_actor3._position.y >= 168) && (_actor3._effect == 1))
+		_actor3._effect = 6;
+	else if ((_actor3._position.y < 168) && (_actor3._effect == 6))
+		_actor3._effect = 1;
+
+	Scene::dispatch();
+}
+
 /*--------------------------------------------------------------------------
  * Scene 3400 - 
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index f83417e772..3935a65084 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -400,6 +400,61 @@ public:
 	virtual void signal();
 };
 
+class Scene3375 : public SceneExt {
+	class Actor1 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor2 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor3 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor4 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit2 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit3 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+
+	void signalCase3379();
+public:
+	SpeakerQuinn3375 _quinnSpeaker;
+	SpeakerSeeker3375 _seekerSpeaker;
+	SpeakerMiranda3375 _mirandaSpeaker;
+	SpeakerWebbster3375 _webbsterSpeaker;
+	NamedHotspot _item1;
+	NamedHotspot _itemArray[13];
+	Actor1 _actor1;
+	Actor2 _actor2;
+	Actor3 _actor3;
+	Actor4 _actor4;
+	Exit1 _exit1;
+	Exit2 _exit2;
+	Exit3 _exit3;
+	SequenceManager _sequenceManager;
+	int _field1488;
+	int _field148A[4];
+	int _field1492;
+
+	Scene3375();
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void Scene3375::dispatch();
+	virtual void Scene3375::synchronize(Serializer &s);
+};
+
 class Scene3400 : public SceneExt {
 public:
 	SpeakerQuinn3400 _quinnSpeaker;
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 25ad156cd3..a07b689645 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1602,6 +1602,249 @@ void SpeakerMiranda3255::proc15() {
 	}
 }
 
+SpeakerQuinn3375::SpeakerQuinn3375() {
+	_speakerName = "QUINN";
+	_color1 = 60;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerQuinn3375::proc15() {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 1) 
+			_object2 = &R2_GLOBALS._player;
+		else if (R2_GLOBALS._player._characterIndex == 2) 
+			_object2 = &scene->_actor1;
+		else
+			_object2 = &scene->_actor2;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (scene->_actor1._position.y != 163)
+			R2_GLOBALS._player.setStrip(8);
+		else
+			R2_GLOBALS._player.setStrip(2);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+	
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4010, 5, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
+SpeakerSeeker3375::SpeakerSeeker3375() {
+	_speakerName = "SEEKER";
+	_color1 = 35;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerSeeker3375::proc15() {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 2) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor1;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (scene->_actor1._position.y != 163)
+			R2_GLOBALS._player.setStrip(8);
+		else
+			R2_GLOBALS._player.setStrip(2);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+	
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4031, 1, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
+SpeakerMiranda3375::SpeakerMiranda3375() {
+	_speakerName = "MIRANDA";
+	_color1 = 154;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerMiranda3375::proc15() {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 3) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor2;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (scene->_actor1._position.y != 163)
+			R2_GLOBALS._player.setStrip(8);
+		else
+			R2_GLOBALS._player.setStrip(2);
+
+		R2_GLOBALS._player.disableControl();
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+	
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4051, 5, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
+SpeakerWebbster3375::SpeakerWebbster3375() {
+	_speakerName = "WEBBSTER";
+	_color1 = 60;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerWebbster3375::proc15() {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &scene->_actor3;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (scene->_actor1._position.y != 163)
+			R2_GLOBALS._player.setStrip(8);
+		else
+			R2_GLOBALS._player.setStrip(2);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+	
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4110, 5, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 SpeakerQuinn3400::SpeakerQuinn3400() {
 	_speakerName = "QUINN";
 	_color1 = 60;
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index e4ea036938..2f289175e8 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -389,6 +389,38 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerQuinn3375 : public VisualSpeaker {
+public:
+	SpeakerQuinn3375();
+
+	virtual Common::String getClassName() { return "SpeakerQuinn3375"; }
+	virtual void proc15();
+};
+
+class SpeakerSeeker3375 : public VisualSpeaker {
+public:
+	SpeakerSeeker3375();
+
+	virtual Common::String getClassName() { return "SpeakerSeeker3375"; }
+	virtual void proc15();
+};
+
+class SpeakerMiranda3375 : public VisualSpeaker {
+public:
+	SpeakerMiranda3375();
+
+	virtual Common::String getClassName() { return "SpeakerMiranda3375"; }
+	virtual void proc15();
+};
+
+class SpeakerWebbster3375 : public VisualSpeaker {
+public:
+	SpeakerWebbster3375();
+
+	virtual Common::String getClassName() { return "SpeakerWebbster3375"; }
+	virtual void proc15();
+};
+
 class SpeakerQuinn3400 : public VisualSpeaker {
 public:
 	SpeakerQuinn3400();
-- 
cgit v1.2.3


From 529a3b8d8269ad5d3dbd04f7fe581844724a20dc Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 29 Dec 2011 00:19:56 +0100
Subject: TSAGE: R2R -Fix errors not detected by MSVC

---
 engines/tsage/ringworld2/ringworld2_scenes3.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 3935a65084..36e4ae83fc 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -451,8 +451,8 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void remove();
 	virtual void signal();
-	virtual void Scene3375::dispatch();
-	virtual void Scene3375::synchronize(Serializer &s);
+	virtual void dispatch();
+	virtual void synchronize(Serializer &s);
 };
 
 class Scene3400 : public SceneExt {
-- 
cgit v1.2.3


From ce0c4d31e071663abfe31440780c8ed353906782 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 29 Dec 2011 00:29:31 +0100
Subject: TSAGE: R2R - Fix bug in scene 3700

---
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 8c08299e6f..7261d6438f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -2407,6 +2407,7 @@ void Scene3700::signal() {
 	// No break on purpose
 	case 3329:
 		warning("STUB: sub_1D227()");
+		_sceneMode = 3701;
 		setAction(&_sequenceManager, this, 3701, &_actor2, &_actor3, &_actor4, NULL);
 		break;
 	case 3700:
-- 
cgit v1.2.3


From 311e1c495c323f4250bd890c769331ee2a707347 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Wed, 28 Dec 2011 23:37:16 +0000
Subject: DREAMWEB: Minor clean up and removal of goto usage in dreamweb().

---
 engines/dreamweb/dreamweb.h |   1 +
 engines/dreamweb/stubs.cpp  | 108 +++++++++++++++++++++++++-------------------
 2 files changed, 62 insertions(+), 47 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 7e6ca1ddd7..c0f518d823 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -940,6 +940,7 @@ public:
 	void searchForFiles(const char *filesString);
 	void triggerMessage(uint16 index);
 	void processTrigger();
+	void dreamwebFinalize();
 	void dreamweb();
 	void screenUpdate();
 	void startup1();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 3602558b8b..9aa61354fe 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -456,6 +456,44 @@ static const Atmosphere g_atmosphereList[] = {
 
 };
 
+void DreamWebEngine::dreamwebFinalize() {
+	// The engine will need some cleaner finalization (destructor?), let's put it here for now
+
+	// FIXME: This triggers "Deallocating non existent segment" errors when
+	// quitting from a menu.
+	getRidOfAll();
+
+	_icons1.clear();
+	_icons2.clear();
+	_charset1.clear();
+	_tempGraphics.clear();
+	_tempGraphics2.clear();
+	_tempGraphics3.clear();
+	_tempCharset.clear();
+	_mainSprites.clear();
+
+	_exFrames.clear();
+	_exText.clear();
+
+	_setFrames.clear();
+	_freeFrames.clear();
+	_reel1.clear();
+	_reel2.clear();
+	_reel3.clear();
+	_setDesc.clear();
+	_blockDesc.clear();
+	_roomDesc.clear();
+	_freeDesc.clear();
+	_personText.clear();
+
+	_textFile1.clear();
+	_textFile2.clear();
+	_textFile3.clear();
+	_travelText.clear();
+	_puzzleText.clear();
+	_commandText.clear();
+}
+
 void DreamWebEngine::dreamweb() {
 	switch(getLanguage()) {
 	case Common::EN_ANY:
@@ -491,13 +529,11 @@ void DreamWebEngine::dreamweb() {
 	int savegameId = Common::ConfigManager::instance().getInt("save_slot");
 
 	while (true) {
-
 		uint count = scanForNames();
 
 		bool startNewGame = true;
 
 		if (firstLoop && savegameId >= 0) {
-
 			// loading a savegame requested from launcher/command line
 
 			cls();
@@ -527,12 +563,13 @@ void DreamWebEngine::dreamweb() {
 			cls();
 			setMode();
 			decide();
-			if (_quitRequested)
-				goto done;
+			if (_quitRequested) {
+				dreamwebFinalize();
+				return;
+			}
 
 			if (_getBack == 4)
 				startNewGame = false; // savegame has been loaded
-
 		}
 
 		firstLoop = false;
@@ -547,15 +584,19 @@ void DreamWebEngine::dreamweb() {
 			if (!_quitRequested) // "titlesearly"
 				intro();
 
-			if (_quitRequested)
-				goto done;
+			if (_quitRequested) {
+				dreamwebFinalize();
+				return;
+			}
 
 			// "credits"
 			clearPalette();
 			realCredits();
 
-			if (_quitRequested)
-				goto done;
+			if (_quitRequested) {
+				dreamwebFinalize();
+				return;
+			}
 
 			clearChanges();
 			setMode();
@@ -581,13 +622,17 @@ void DreamWebEngine::dreamweb() {
 
 		// main loop
 		while (true) {
-			if (_quitRequested)
-				goto done;
+			if (_quitRequested) {
+				dreamwebFinalize();
+				return;
+			}
 
 			screenUpdate();
 
-			if (_quitRequested)
-				goto done;
+			if (_quitRequested) {
+				dreamwebFinalize();
+				return;
+			}
 
 			if (_wonGame) {
 				// "endofgame"
@@ -596,7 +641,8 @@ void DreamWebEngine::dreamweb() {
 				hangOn(200);
 				endGame();
 				quickQuit2();
-				goto done;
+				dreamwebFinalize();
+				return;
 			}
 
 			if (_vars._manDead == 1 || _vars._manDead == 2)
@@ -636,40 +682,8 @@ void DreamWebEngine::dreamweb() {
 		hangOn(100);
 
 	}
-done: // The engine will need some cleaner finalization, let's put it here for now
-	// FIXME: This triggers "Deallocating non existent segment" errors when
-	// quitting from a menu.
-	getRidOfAll();
-
-	_icons1.clear();
-	_icons2.clear();
-	_charset1.clear();
-	_tempGraphics.clear();
-	_tempGraphics2.clear();
-	_tempGraphics3.clear();
-	_tempCharset.clear();
-	_mainSprites.clear();
 
-	_exFrames.clear();
-	_exText.clear();
-
-	_setFrames.clear();
-	_freeFrames.clear();
-	_reel1.clear();
-	_reel2.clear();
-	_reel3.clear();
-	_setDesc.clear();
-	_blockDesc.clear();
-	_roomDesc.clear();
-	_freeDesc.clear();
-	_personText.clear();
-
-	_textFile1.clear();
-	_textFile2.clear();
-	_textFile3.clear();
-	_travelText.clear();
-	_puzzleText.clear();
-	_commandText.clear();
+	dreamwebFinalize();
 }
 
 void DreamWebEngine::loadTextFile(TextFile &file, const char *fileName)
-- 
cgit v1.2.3


From be9cc1dbe3fc986123b328ed5ce2ef2c4001df09 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 29 Dec 2011 01:15:15 +0100
Subject: TSAGE: R2R - Add missing function in scene 3375

---
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 81 ++++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes3.h   |  2 +
 2 files changed, 81 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 7261d6438f..7aa27e9330 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1717,6 +1717,83 @@ void Scene3375::synchronize(Serializer &s) {
 		s.syncAsSint16LE(_field148A[i]);
 }
 
+void Scene3375::subFC696(int sceneMode) {
+	switch (sceneMode) {
+	case 3379:
+		R2_GLOBALS._player.setPosition(Common::Point(0, 155));
+		_actor1.setPosition(Common::Point(-20, 163));
+		_actor2.setPosition(Common::Point(-5, 150));
+		_actor3.setPosition(Common::Point(-20, 152));
+		break;
+	case 3380:
+		++R2_GLOBALS._v56A9E;
+		if (R2_GLOBALS._v56A9E >= 4)
+			R2_GLOBALS._v56A9E = 0;
+
+		loadScene(_field148A[R2_GLOBALS._v56A9E]);
+
+		R2_GLOBALS._uiElements.show();
+		R2_GLOBALS._player.setStrip(4);
+		R2_GLOBALS._player.setPosition(Common::Point(148, 230));
+
+		_actor1.setPosition(Common::Point(191, 274));
+		_actor1._effect = 1;
+		_actor2.setPosition(Common::Point(124, 255));
+		_actor2._effect = 1;
+		_actor3.setPosition(Common::Point(155, 245));
+		_actor3._effect = 1;
+		break;
+	case 3381:
+		--R2_GLOBALS._v56A9E;
+		if (R2_GLOBALS._v56A9E < 0)
+			R2_GLOBALS._v56A9E = 3;
+
+		loadScene(_field148A[R2_GLOBALS._v56A9E]);
+
+		R2_GLOBALS._uiElements.show();
+		R2_GLOBALS._player.setStrip(6);
+		R2_GLOBALS._player.setPosition(Common::Point(201, 131));
+
+		_actor1.setPosition(Common::Point(231, 127));
+		_actor1._effect = 1;
+		_actor2.setPosition(Common::Point(231, 127));
+		_actor2._effect = 1;
+		_actor3.setPosition(Common::Point(231, 127));
+		_actor3._effect = 1;
+		break;
+	default:
+		R2_GLOBALS._player.setPosition(Common::Point(192, 155));
+
+		_actor1.setPosition(Common::Point(138, 134));
+		_actor2.setPosition(Common::Point(110, 139));
+		_actor3.setPosition(Common::Point(125, 142));
+		break;
+	}
+
+	if (R2_GLOBALS._v56A9E == 2) {
+		R2_GLOBALS._sceneItems.remove(&_actor4);
+		for (int i = 0; i <= 12; i++)
+			R2_GLOBALS._sceneItems.remove(&_itemArray[i]);
+		R2_GLOBALS._sceneItems.remove(&_item1);
+
+		_actor4.show();
+		_actor4.setDetails(3375, 9, 10, -1, 1, NULL);
+
+		for (int i = 0; i <= 12; i++)
+			_itemArray[i].setDetails(3375, 3, -1, -1);
+
+		_item1.setDetails(Rect(0, 0, 320, 200), 3375, 0, -1, -1, 1, NULL);
+	} else {
+		_actor4.hide();
+		R2_GLOBALS._sceneItems.remove(&_actor4);
+	}
+
+	if (_sceneMode == 0)
+		signal();
+	else
+		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL);
+}
+
 bool Scene3375::Actor1::startAction(CursorType action, Event &event) {
 	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
 
@@ -2000,7 +2077,7 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 	else
 		_sceneMode = 0;
 	
-	warning("sub_FC696(_sceneMode)");
+	subFC696(_sceneMode);
 }
 
 void Scene3375::remove() {
@@ -2064,7 +2141,7 @@ void Scene3375::signal() {
 		_actor2._shade = 4;
 		_actor3._effect = 6;
 		_actor3._shade = 4;
-		warning("sub_FC696(_sceneMode)");
+		subFC696(_sceneMode);
 		break;
 	case 3379:
 		signalCase3379();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 36e4ae83fc..d5e2e451f4 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -428,6 +428,8 @@ class Scene3375 : public SceneExt {
 	};
 
 	void signalCase3379();
+	void subFC696(int sceneMode);
+
 public:
 	SpeakerQuinn3375 _quinnSpeaker;
 	SpeakerSeeker3375 _seekerSpeaker;
-- 
cgit v1.2.3


From 496b776de8af82242850c5060a50a169bac20496 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 29 Dec 2011 01:21:34 +0100
Subject: TSAGE: R2R - Fixed ambiguity with NULL parameters in R2R setDetails
 calls

---
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 7aa27e9330..c10a9f63b9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -2050,9 +2050,9 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 	_actor3.setup(40, tmpStrip, 1);
 	_actor3.animate(ANIM_MODE_1, NULL);
 	
-	_actor2.setDetails(3375, -1, -1, -1, 1, NULL);
-	_actor3.setDetails(3375, 21, -1, -1, 1, NULL);
-	_actor1.setDetails(3375, -1, -1, -1, 1, NULL);
+	_actor2.setDetails(3375, -1, -1, -1, 1, (SceneItem *)NULL);
+	_actor3.setDetails(3375, 21, -1, -1, 1, (SceneItem *)NULL);
+	_actor1.setDetails(3375, -1, -1, -1, 1, (SceneItem *)NULL);
 	
 	_actor4.postInit();
 	_actor4.setup(3375, 1, 1);
-- 
cgit v1.2.3


From cb889a94892cf96528f11d90b24b2ab95421a59b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 29 Dec 2011 01:28:18 +0100
Subject: TSAGE: R2R - Fixed one more ambiguity with NULL parameters in R2R
 setDetails call

---
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index c10a9f63b9..29356ef024 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1777,7 +1777,7 @@ void Scene3375::subFC696(int sceneMode) {
 		R2_GLOBALS._sceneItems.remove(&_item1);
 
 		_actor4.show();
-		_actor4.setDetails(3375, 9, 10, -1, 1, NULL);
+		_actor4.setDetails(3375, 9, 10, -1, 1, (SceneItem *)NULL);
 
 		for (int i = 0; i <= 12; i++)
 			_itemArray[i].setDetails(3375, 3, -1, -1);
-- 
cgit v1.2.3


From 59458c9b155bb5144994c1442c5968b8d1873608 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 29 Dec 2011 02:58:19 +0000
Subject: DREAMWEB: Simplify finalization call in dreamweb main function.

Thanks to Fingolfin for the suggestion.
---
 engines/dreamweb/dreamweb.cpp |  1 +
 engines/dreamweb/stubs.cpp    | 26 +++++---------------------
 2 files changed, 6 insertions(+), 21 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 67e72ebf7c..91aabc89d9 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -370,6 +370,7 @@ Common::Error DreamWebEngine::run() {
 
 	_timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync");
 	dreamweb();
+	dreamwebFinalize();
 	_quitRequested = false;
 
 	_timer->removeTimerProc(vSyncInterrupt);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 9aa61354fe..b1e86d015a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -507,8 +507,6 @@ void DreamWebEngine::dreamweb() {
 	}
 
 	seeCommandTail();
-	// soundStartup used to be done here...
-	// setKeyboardInt used to be done here...
 	allocateBuffers();
 
 	// setMouse
@@ -563,10 +561,8 @@ void DreamWebEngine::dreamweb() {
 			cls();
 			setMode();
 			decide();
-			if (_quitRequested) {
-				dreamwebFinalize();
+			if (_quitRequested)
 				return;
-			}
 
 			if (_getBack == 4)
 				startNewGame = false; // savegame has been loaded
@@ -584,19 +580,15 @@ void DreamWebEngine::dreamweb() {
 			if (!_quitRequested) // "titlesearly"
 				intro();
 
-			if (_quitRequested) {
-				dreamwebFinalize();
+			if (_quitRequested)
 				return;
-			}
 
 			// "credits"
 			clearPalette();
 			realCredits();
 
-			if (_quitRequested) {
-				dreamwebFinalize();
+			if (_quitRequested)
 				return;
-			}
 
 			clearChanges();
 			setMode();
@@ -617,22 +609,17 @@ void DreamWebEngine::dreamweb() {
 			_volumeTo = 0;
 			_volumeDirection = -1;
 			_commandType = 255;
-
 		}
 
 		// main loop
 		while (true) {
-			if (_quitRequested) {
-				dreamwebFinalize();
+			if (_quitRequested)
 				return;
-			}
 
 			screenUpdate();
 
-			if (_quitRequested) {
-				dreamwebFinalize();
+			if (_quitRequested)
 				return;
-			}
 
 			if (_wonGame) {
 				// "endofgame"
@@ -641,7 +628,6 @@ void DreamWebEngine::dreamweb() {
 				hangOn(200);
 				endGame();
 				quickQuit2();
-				dreamwebFinalize();
 				return;
 			}
 
@@ -682,8 +668,6 @@ void DreamWebEngine::dreamweb() {
 		hangOn(100);
 
 	}
-
-	dreamwebFinalize();
 }
 
 void DreamWebEngine::loadTextFile(TextFile &file, const char *fileName)
-- 
cgit v1.2.3


From f5928496538100c793600575938f07d533d957b5 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 29 Dec 2011 08:09:29 +0000
Subject: DREAMWEB: Correct monitor header message alignment in floppy
 versions.

---
 engines/dreamweb/monitor.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 256478d09b..ab6dd9efcb 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -292,7 +292,12 @@ void DreamWebEngine::scrollMonitor() {
 }
 
 void DreamWebEngine::showCurrentFile() {
-	uint16 x = 178; // TODO: Looks like this hardcoded constant in the asm doesn't match the frame
+	uint16 x;
+	// Monitor Frame position differs between Floppy and CD version
+	if (isCD())
+		x = 178;
+	else
+		x = 199;
 	const char *currentFile = _currentFile + 1;
 	while (*currentFile) {
 		char c = *currentFile++;
-- 
cgit v1.2.3


From 73ebccc30a8cbfe0353efc8851e6c67fd62562ee Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Thu, 29 Dec 2011 14:39:43 +0100
Subject: DREAMWEB: Allow quit during ending

---
 engines/dreamweb/titles.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index 8b56ffc57e..aa0f3bd799 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -28,6 +28,8 @@ namespace DreamWeb {
 void DreamWebEngine::endGame() {
 	loadTempText("DREAMWEB.T83");
 	monkSpeaking();
+	if (_quitRequested)
+		return;
 	gettingShot();
 	getRidOfTempText();
 	_volumeTo = 7;
@@ -57,6 +59,8 @@ void DreamWebEngine::monkSpeaking() {
 
 			do {
 				waitForVSync();
+				if (_quitRequested)
+					return;
 			} while (_channel1Playing != 255);
 		}
 	} else {
@@ -71,6 +75,8 @@ void DreamWebEngine::monkSpeaking() {
 				clearWork();
 				showFrame(_tempGraphics, 160, 72, 0, 128);	// show monk
 				hangOnP(240);
+				if (_quitRequested)
+					return;
 			} while (printResult != 0);
 		}
 	}
@@ -251,7 +257,7 @@ void DreamWebEngine::runEndSeq() {
 		dumpMap();
 		dumpTimedText();
 		vSync();
-	} while (_getBack != 1);
+	} while (_getBack != 1 && !_quitRequested);
 }
 
 void DreamWebEngine::loadIntroRoom() {
-- 
cgit v1.2.3


From d09be37c69894929ed4925994cd41b4d72e412e0 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Thu, 29 Dec 2011 14:39:53 +0100
Subject: DREAMWEB: Minor clean up

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

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index c0f518d823..e261010902 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -944,10 +944,8 @@ public:
 	void dreamweb();
 	void screenUpdate();
 	void startup1();
-	void quickQuit();
 	void readOneBlock();
 	void seeCommandTail();
-	void quickQuit2();
 	bool checkIfPerson(uint8 x, uint8 y);
 	bool checkIfFree(uint8 x, uint8 y);
 	bool checkIfEx(uint8 x, uint8 y);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index b1e86d015a..5f05f290ad 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -457,10 +457,9 @@ static const Atmosphere g_atmosphereList[] = {
 };
 
 void DreamWebEngine::dreamwebFinalize() {
-	// The engine will need some cleaner finalization (destructor?), let's put it here for now
+	// The engine will need some cleaner finalization (destructor?), let's put
+	// it here for now
 
-	// FIXME: This triggers "Deallocating non existent segment" errors when
-	// quitting from a menu.
 	getRidOfAll();
 
 	_icons1.clear();
@@ -627,7 +626,6 @@ void DreamWebEngine::dreamweb() {
 				fadeScreenDowns();
 				hangOn(200);
 				endGame();
-				quickQuit2();
 				return;
 			}
 
@@ -837,14 +835,6 @@ void DreamWebEngine::seeCommandTail() {
 	_brightness = 1;
 }
 
-void DreamWebEngine::quickQuit() {
-	quit();
-}
-
-void DreamWebEngine::quickQuit2() {
-	quit();
-}
-
 void DreamWebEngine::readMouse() {
 	_oldButton = _mouseButton;
 	uint16 state = readMouseState();
-- 
cgit v1.2.3


From d6412130c0b3f5d9e77586f7d25e9390a21c4d57 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 29 Dec 2011 15:24:04 +0100
Subject: KYRA: Prefix version string in LoL, EoB, EoB 2 main menu with
 "ScummVM".

---
 engines/kyra/sequences_darkmoon.cpp | 7 ++++---
 engines/kyra/sequences_eob.cpp      | 7 ++++---
 engines/kyra/sequences_lol.cpp      | 6 ++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/sequences_darkmoon.cpp b/engines/kyra/sequences_darkmoon.cpp
index fbe892120c..6013492b5d 100644
--- a/engines/kyra/sequences_darkmoon.cpp
+++ b/engines/kyra/sequences_darkmoon.cpp
@@ -96,7 +96,7 @@ int DarkMoonEngine::mainMenu() {
 
 	while (menuChoice >= 0 && !shouldQuit()) {
 		switch (menuChoice) {
-			case 0:
+			case 0: {
 				s = _res->createReadStream("XENU.CPS");
 				if (s) {
 					s->read(_screen->getPalette(0).getData(), 768);
@@ -110,13 +110,14 @@ int DarkMoonEngine::mainMenu() {
 
 				of = _screen->setFont(Screen::FID_6_FNT);
 				op = _screen->setCurPage(2);
-				_screen->printText(gScummVMVersion, 267 - strlen(gScummVMVersion) * 6, 160, 13, 0);
+				Common::String versionString(Common::String::format("ScummVM %s", gScummVMVersion));
+				_screen->printText(versionString.c_str(), 267 - versionString.size() * 6, 160, 13, 0);
 				_screen->setFont(of);
 				_screen->_curPage = op;
 				_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
 				_screen->updateScreen();
 				menuChoice = mainMenuLoop();
-				break;
+				} break;
 
 			case 1:
 				// load game in progress
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index 65c149ea8f..4b094f4e9c 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -41,13 +41,14 @@ int EoBEngine::mainMenu() {
 
 	while (menuChoice >= 0 && !shouldQuit()) {
 		switch (menuChoice) {
-		case 0:
+		case 0: {
 			_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
 			_screen->loadEoBBitmap("INTRO", 0, 5, 3, 2);
 			_screen->setScreenPalette(_screen->getPalette(0));
 			_screen->_curPage = 2;
 			of = _screen->setFont(Screen::FID_6_FNT);
-			_screen->printText(gScummVMVersion, 280 - strlen(gScummVMVersion) * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
+			Common::String versionString(Common::String::format("ScummVM %s", gScummVMVersion));
+			_screen->printText(versionString.c_str(), 280 - versionString.size() * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
 			_screen->setFont(of);
 			_screen->fillRect(0, 159, 319, 199, _screen->getPagePixel(2, 0, 0));
 			gui_drawBox(77, 165, 173, 29, 13, 14, 12);
@@ -56,7 +57,7 @@ int EoBEngine::mainMenu() {
 			_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
 			_screen->updateScreen();
 			menuChoice = mainMenuLoop();
-			break;
+			} break;
 
 		case 1:
 			// load game in progress
diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp
index d5b3dd97c4..ba27ccff8e 100644
--- a/engines/kyra/sequences_lol.cpp
+++ b/engines/kyra/sequences_lol.cpp
@@ -55,6 +55,8 @@ int LoLEngine::processPrologue() {
 
 	preInit();
 
+	Common::String versionString(Common::String::format("ScummVM %s", gScummVMVersion));
+
 	int processSelection = -1;
 	while (!shouldQuit() && processSelection == -1) {
 		_screen->loadBitmap("TITLE.CPS", 2, 2, &_screen->getPalette(0));
@@ -62,8 +64,8 @@ int LoLEngine::processPrologue() {
 
 		_screen->setFont(Screen::FID_6_FNT);
 		// Original version: (260|193) "V CD1.02 D"
-		const int width = _screen->getTextWidth(gScummVMVersion);
-		_screen->fprintString("SVM %s", 300 - width, 193, 0x67, 0x00, 0x04, gScummVMVersion);
+		const int width = _screen->getTextWidth(versionString.c_str());
+		_screen->fprintString(versionString.c_str(), 320 - width, 193, 0x67, 0x00, 0x04, gScummVMVersion);
 		_screen->setFont(_flags.lang == Common::JA_JPN ? Screen::FID_SJIS_FNT : Screen::FID_9_FNT);
 
 		_screen->fadePalette(_screen->getPalette(0), 0x1E);
-- 
cgit v1.2.3


From d1a32facaeec548f098b7607141a1c1bcce94b2b Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 29 Dec 2011 15:27:17 +0100
Subject: KYRA: Some formatting fixes.

---
 engines/kyra/darkmoon.cpp           |   6 +-
 engines/kyra/sequences_darkmoon.cpp | 178 ++++++++++++++++++------------------
 2 files changed, 92 insertions(+), 92 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/darkmoon.cpp b/engines/kyra/darkmoon.cpp
index c12ef1050a..f63d49933b 100644
--- a/engines/kyra/darkmoon.cpp
+++ b/engines/kyra/darkmoon.cpp
@@ -284,7 +284,7 @@ const uint8 *DarkMoonEngine::loadDoorShapes(const char *filename, int doorIndex,
 		shapeDefs += 8;
 		_doorSwitches[doorIndex * 3 + i].x = *shapeDefs;
 		shapeDefs += 2;
-		_doorSwitches[doorIndex * 3 + i].y= *shapeDefs;
+		_doorSwitches[doorIndex * 3 + i].y = *shapeDefs;
 		shapeDefs += 2;
 	}
 	_screen->_curPage = 0;
@@ -415,7 +415,7 @@ int DarkMoonEngine::resurrectionSelectDialogue() {
 int DarkMoonEngine::charSelectDialogue() {
 	int cnt = 0;
 	const char *namesList[7];
-	memset(namesList, 0, 7 * sizeof(const char*));
+	memset(namesList, 0, 7 * sizeof(const char *));
 
 	for (int i = 0; i < 6; i++) {
 		if (!testCharacter(i, 3))
@@ -454,6 +454,6 @@ const KyraRpgGUISettings *DarkMoonEngine::guiSettings() {
 	return &_guiSettings;
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/sequences_darkmoon.cpp b/engines/kyra/sequences_darkmoon.cpp
index 6013492b5d..c72bf58f9b 100644
--- a/engines/kyra/sequences_darkmoon.cpp
+++ b/engines/kyra/sequences_darkmoon.cpp
@@ -96,55 +96,55 @@ int DarkMoonEngine::mainMenu() {
 
 	while (menuChoice >= 0 && !shouldQuit()) {
 		switch (menuChoice) {
-			case 0: {
-				s = _res->createReadStream("XENU.CPS");
-				if (s) {
-					s->read(_screen->getPalette(0).getData(), 768);
-					_screen->loadFileDataToPage(s, 3, 64000);
-					delete s;
-				} else {
-					_screen->loadBitmap("MENU.CPS", 3, 2, &_screen->getPalette(0));
-				}
+		case 0: {
+			s = _res->createReadStream("XENU.CPS");
+			if (s) {
+				s->read(_screen->getPalette(0).getData(), 768);
+				_screen->loadFileDataToPage(s, 3, 64000);
+				delete s;
+			} else {
+				_screen->loadBitmap("MENU.CPS", 3, 2, &_screen->getPalette(0));
+			}
 
-				_screen->setScreenPalette(_screen->getPalette(0));
+			_screen->setScreenPalette(_screen->getPalette(0));
 
-				of = _screen->setFont(Screen::FID_6_FNT);
-				op = _screen->setCurPage(2);
-				Common::String versionString(Common::String::format("ScummVM %s", gScummVMVersion));
-				_screen->printText(versionString.c_str(), 267 - versionString.size() * 6, 160, 13, 0);
-				_screen->setFont(of);
-				_screen->_curPage = op;
-				_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
-				_screen->updateScreen();
-				menuChoice = mainMenuLoop();
-				} break;
+			of = _screen->setFont(Screen::FID_6_FNT);
+			op = _screen->setCurPage(2);
+			Common::String versionString(Common::String::format("ScummVM %s", gScummVMVersion));
+			_screen->printText(versionString.c_str(), 267 - versionString.size() * 6, 160, 13, 0);
+			_screen->setFont(of);
+			_screen->_curPage = op;
+			_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->updateScreen();
+			menuChoice = mainMenuLoop();
+		} break;
 
-			case 1:
-				// load game in progress
-				menuChoice = -1;
-				break;
+		case 1:
+			// load game in progress
+			menuChoice = -1;
+			break;
 
-			case 2:
-				// create new party
-				menuChoice = -2;
-				break;
+		case 2:
+			// create new party
+			menuChoice = -2;
+			break;
 
-			case 3:
-				// transfer party
-				//seq_playFinale();
-				menuChoice = -3;
-				break;
+		case 3:
+			// transfer party
+			//seq_playFinale();
+			menuChoice = -3;
+			break;
 
-			case 4:
-				// play intro
-				seq_playIntro();
-				menuChoice = 0;
-				break;
+		case 4:
+			// play intro
+			seq_playIntro();
+			menuChoice = 0;
+			break;
 
-			case 5:
-				// quit
-				menuChoice = -5;
-				break;
+		case 5:
+			// quit
+			menuChoice = -5;
+			break;
 		}
 	}
 
@@ -219,22 +219,22 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.runSequence(40);
 	sq.runSequence(7, 18);
 
-	sq.printText(0, 16);	// You were settling...
+	sq.printText(0, 16);    // You were settling...
 	sq.runSequence(7, 90);
 	sq.fadeText();
 
-	sq.printText(1, 16);	// Then a note was slipped to you
+	sq.printText(1, 16);    // Then a note was slipped to you
 	sq.runSequence(8);
 	sq.runSequence(2, 72);
 	sq.fadeText();
 
-	sq.printText(2, 16);	// It was from your friend Khelben Blackstaff...
+	sq.printText(2, 16);    // It was from your friend Khelben Blackstaff...
 	sq.runSequence(2);
 	sq.runSequence(6, 36);
 	sq.runSequence(3);
 	sq.fadeText();
 
-	sq.printText(3, 16);	// The message was urgent.
+	sq.printText(3, 16);    // The message was urgent.
 
 	sq.loadScene(1, 2);
 	sq.waitForSongNotifier(4);
@@ -261,7 +261,7 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.update(2);
 	sq.delay(10);
 
-	sq.printText(4, 16);	// What could Khelben want?
+	sq.printText(4, 16);    // What could Khelben want?
 	sq.delay(25);
 
 	sq.loadScene(3, 2);
@@ -270,14 +270,14 @@ void DarkMoonEngine::seq_playIntro() {
 	_screen->copyRegion(104, 16, 96, 8, 120, 100, 0, 2, Screen::CR_NO_P_CHECK);
 	sq.fadeText();
 
-	sq.printText(5, 15);	// Welcome, please come in
+	sq.printText(5, 15);    // Welcome, please come in
 	sq.runSequence(10);
 	sq.runSequence(10);
 	sq.runSequence(9);
 	sq.runSequence(9);
 	sq.fadeText();
 
-	sq.printText(6, 15);	// Khelben awaits you in his study
+	sq.printText(6, 15);    // Khelben awaits you in his study
 	for (int i = 0; i < 3; i++)
 		sq.runSequence(10);
 	sq.runSequence(9);
@@ -299,7 +299,7 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.update(2);
 
 	sq.runSequence(16);
-	sq.printText(7, 15);	// Thank you for coming so quickly
+	sq.printText(7, 15);    // Thank you for coming so quickly
 	sq.runSequence(16);
 	sq.runSequence(17);
 	for (int i = 0; i < 3; i++)
@@ -310,14 +310,14 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.loadScene(8, 2);
 	sq.update(2);
 	sq.runSequence(32);
-	sq.printText(8, 15);	// I am troubled my friend
+	sq.printText(8, 15);    // I am troubled my friend
 	sq.runSequence(33);
 	sq.runSequence(33);
 	for (int i = 0; i < 4; i++)
 		sq.runSequence(32);
 	sq.fadeText();
 
-	sq.printText(9, 15);	// Ancient evil stirs in the Temple Darkmoon
+	sq.printText(9, 15);    // Ancient evil stirs in the Temple Darkmoon
 	sq.runSequence(33);
 	sq.runSequence(43);
 	sq.runSequence(33);
@@ -325,7 +325,7 @@ void DarkMoonEngine::seq_playIntro() {
 		sq.runSequence(32);
 	sq.fadeText();
 
-	sq.printText(10, 15);	// I fear for the safety of our city
+	sq.printText(10, 15);   // I fear for the safety of our city
 	for (int i = 0; i < 4; i++)
 		sq.runSequence(33);
 	sq.runSequence(32);
@@ -339,7 +339,7 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.update(2);
 	sq.runSequence(34);
 
-	sq.printText(11, 15);	// I need your help
+	sq.printText(11, 15);   // I need your help
 	for (int i = 0; i < 3; i++)
 		sq.runSequence(34);
 	sq.runSequence(35);
@@ -352,7 +352,7 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.loadScene(6, 2);
 	sq.runSequence(18);
 
-	sq.printText(12, 15);	// Three nights ago I sent forth a scout
+	sq.printText(12, 15);   // Three nights ago I sent forth a scout
 	sq.runSequence(19);
 	sq.runSequence(20);
 	sq.runSequence(22);
@@ -361,7 +361,7 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.runSequence(18);
 	sq.fadeText();
 
-	sq.printText(13, 15);	// She has not yet returned
+	sq.printText(13, 15);   // She has not yet returned
 	sq.runSequence(20);
 	sq.runSequence(19);
 	sq.runSequence(23);
@@ -372,7 +372,7 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.runSequence(18);
 	sq.fadeText();
 
-	sq.printText(14, 15);	// I fear for her safety
+	sq.printText(14, 15);   // I fear for her safety
 	sq.runSequence(19);
 	sq.runSequence(20);
 	sq.runSequence(20);
@@ -384,7 +384,7 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.runSequence(18);
 	sq.runSequence(18);
 
-	sq.printText(15, 15);	// Take this coin
+	sq.printText(15, 15);   // Take this coin
 	sq.runSequence(28);
 	sq.runSequence(19);
 	sq.runSequence(20);
@@ -404,7 +404,7 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.update(2);
 
 	sq.loadScene(11, 2);
-	sq.printText(16, 15);	// I will use it to contact you
+	sq.printText(16, 15);   // I will use it to contact you
 	sq.runSequence(19);
 	sq.runSequence(20);
 	sq.runSequence(20);
@@ -412,7 +412,7 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.runSequence(18);
 	sq.fadeText();
 
-	sq.printText(17, 15);	// You must act quickly
+	sq.printText(17, 15);   // You must act quickly
 	sq.runSequence(19);
 	sq.runSequence(20);
 	sq.runSequence(19);
@@ -421,7 +421,7 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.fadeText();
 	sq.runSequence(18);
 
-	sq.printText(18, 15);	// I will teleport you near Darkmoon
+	sq.printText(18, 15);   // I will teleport you near Darkmoon
 	sq.runSequence(20);
 	sq.runSequence(27);
 	sq.runSequence(20);
@@ -431,7 +431,7 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.fadeText();
 	sq.runSequence(18);
 
-	sq.printText(19, 15);	// May luck be with you my friend
+	sq.printText(19, 15);   // May luck be with you my friend
 	sq.runSequence(19);
 	sq.runSequence(19);
 	sq.runSequence(20);
@@ -492,7 +492,7 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.runSequence(2);
 	sq.runSequence(2);
 
-	sq.printText(0, 10);			// Finally, Dran has been defeated
+	sq.printText(0, 10);            // Finally, Dran has been defeated
 	for (int i = 0; i < 7; i++)
 		sq.runSequence(2);
 	sq.fadeText();
@@ -500,13 +500,13 @@ void DarkMoonEngine::seq_playFinale() {
 
 	sq.waitForSongNotifier(1);
 
-	sq.printText(1, 10);			// Suddenly, your friend Khelben appears
+	sq.printText(1, 10);            // Suddenly, your friend Khelben appears
 	sq.runSequence(4);
 	for (int i = 0; i < 3; i++)
 		sq.runSequence(2);
 	sq.fadeText();
 
-	sq.printText(2, 15);			// Greetings, my victorious friends
+	sq.printText(2, 15);            // Greetings, my victorious friends
 	for (int i = 0; i < 4; i++)
 		sq.runSequence(5);
 	sq.runSequence(2);
@@ -514,42 +514,42 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.fadeText();
 	sq.runSequence(6);
 
-	sq.printText(3, 15);			// You have defeated Dran
+	sq.printText(3, 15);            // You have defeated Dran
 	for (int i = 0; i < 5; i++)
 		sq.runSequence(5);
 	sq.runSequence(2);
 	sq.runSequence(2);
 	sq.fadeText();
 
-	sq.printText(4, 15);			// I did not know Dran was a dragon
+	sq.printText(4, 15);            // I did not know Dran was a dragon
 	for (int i = 0; i < 4; i++)
 		sq.runSequence(5);
 	sq.runSequence(2);
 	sq.runSequence(2);
 	sq.fadeText();
 
-	sq.printText(5, 15);			// He must have been over 300 years old
+	sq.printText(5, 15);            // He must have been over 300 years old
 	for (int i = 0; i < 4; i++)
 		sq.runSequence(5);
 	sq.runSequence(2);
 	sq.runSequence(2);
 	sq.fadeText();
 
-	sq.printText(6, 15);			// His power is gone
+	sq.printText(6, 15);            // His power is gone
 	for (int i = 0; i < 3; i++)
 		sq.runSequence(5);
 	sq.runSequence(2);
 	sq.runSequence(2);
 	sq.fadeText();
 
-	sq.printText(7, 15);			// But Darkmoon is still a source of great evil
+	sq.printText(7, 15);            // But Darkmoon is still a source of great evil
 	for (int i = 0; i < 4; i++)
 		sq.runSequence(5);
 	sq.runSequence(2);
 	sq.runSequence(2);
 	sq.fadeText();
 
-	sq.printText(8, 15);			// And many of his minions remain
+	sq.printText(8, 15);            // And many of his minions remain
 	for (int i = 0; i < 4; i++)
 		sq.runSequence(5);
 	sq.runSequence(2);
@@ -561,14 +561,14 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.loadScene(3, 2);
 	_screen->copyRegion(8, 8, 0, 0, 304, 128, 0, 2, Screen::CR_NO_P_CHECK);
 
-	sq.printText(9, 15);			// Now we must leave this place
+	sq.printText(9, 15);            // Now we must leave this place
 	sq.runSequence(7);
 	sq.runSequence(8);
 	sq.runSequence(7);
 	sq.runSequence(7, 36);
 	sq.fadeText();
 
-	sq.printText(10, 15);			// So my forces can destroy it..
+	sq.printText(10, 15);           // So my forces can destroy it..
 	for (int i = 0; i < 3; i++)
 		sq.runSequence(7);
 	sq.runSequence(8);
@@ -577,7 +577,7 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.runSequence(8, 18);
 	sq.fadeText();
 
-	sq.printText(11, 15);			// Follow me
+	sq.printText(11, 15);           // Follow me
 	sq.runSequence(7, 18);
 	sq.runSequence(9, 18);
 	sq.runSequence(8, 18);
@@ -596,7 +596,7 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.loadScene(6, 6);
 	sq.delay(10);
 
-	sq.printText(12, 10);			// Powerful mages stand ready for the final assault...
+	sq.printText(12, 10);           // Powerful mages stand ready for the final assault...
 	sq.delay(90);
 	sq.fadeText();
 
@@ -624,11 +624,11 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.runSequence(15);
 	sq.runSequence(11);
 
-	sq.printText(13, 10);			// The temple's evil is very strong
+	sq.printText(13, 10);           // The temple's evil is very strong
 	sq.delay(72);
 	sq.fadeText();
 
-	sq.printText(14, 10);			// It must not be allowed...
+	sq.printText(14, 10);           // It must not be allowed...
 	sq.delay(72);
 	sq.fadeText();
 
@@ -655,7 +655,7 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.runSequence(17);
 	sq.runSequence(18);
 
-	sq.printText(15, 10);			// The temple ceases to exist
+	sq.printText(15, 10);           // The temple ceases to exist
 	sq.initDelayedPaletteFade(6, 1);
 	sq.delay(36);
 
@@ -675,7 +675,7 @@ void DarkMoonEngine::seq_playFinale() {
 		_screen->crossFadeRegion(0, 0, 8, 8, 304, 128, 2, 0);
 	sq.delay(18);
 
-	sq.printText(16, 15);			// My friends, our work is done
+	sq.printText(16, 15);           // My friends, our work is done
 	sq.runSequence(20);
 	sq.runSequence(19);
 	sq.runSequence(19, 36);
@@ -683,12 +683,12 @@ void DarkMoonEngine::seq_playFinale() {
 		_sound->playTrack(12);
 	sq.fadeText();
 
-	sq.printText(17, 15);			// Thank you
+	sq.printText(17, 15);           // Thank you
 	sq.runSequence(19);
 	sq.runSequence(20, 36);
 	sq.fadeText();
 
-	sq.printText(18, 15);			// You have earned my deepest respect
+	sq.printText(18, 15);           // You have earned my deepest respect
 	if (!skipFlag() && !shouldQuit())
 		_sound->playTrack(11);
 	sq.runSequence(20);
@@ -699,7 +699,7 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.delay(36);
 	sq.fadeText();
 
-	sq.printText(19, 15);			// We will remember you always
+	sq.printText(19, 15);           // We will remember you always
 	sq.runSequence(19);
 	sq.runSequence(19, 18);
 	if (!skipFlag() && !shouldQuit())
@@ -809,7 +809,7 @@ void DarkMoonEngine::seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *da
 	int i = 0;
 
 	do {
-		for (bool loop = true; loop; ) {
+		for (bool loop = true; loop;) {
 			sq->processDelayedPaletteFade();
 			cur = _system->getMillis();
 			if (end <= cur)
@@ -868,7 +868,7 @@ void DarkMoonEngine::seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *da
 		for (int h = 0; h < i; h++) {
 			if (items[h + 1].y < dm->h) {
 				if (items[h + 1].dataType == 1) {
-					_screen->drawShape(tempPage, (const uint8*)items[h + 1].data, items[h + 1].x, items[h + 1].y, sd);
+					_screen->drawShape(tempPage, (const uint8 *)items[h + 1].data, items[h + 1].x, items[h + 1].y, sd);
 				} else {
 					_screen->setCurPage(tempPage);
 
@@ -930,7 +930,7 @@ DarkmoonSequenceHelper::DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *
 	_palettes[11]->fill(0, 256, 0);
 
 	_shapes = new const uint8*[30];
-	memset(_shapes, 0, 30 * sizeof(uint8*));
+	memset(_shapes, 0, 30 * sizeof(uint8 *));
 
 	_fadePalTimer = 0;
 	_fadePalRate = 0;
@@ -992,7 +992,7 @@ void DarkmoonSequenceHelper::loadScene(int index, int pageNum) {
 	int cp = _screen->setCurPage(pageNum);
 
 	if (_shapeDefs[index]) {
-		for (const EoBShapeDef *df = _shapeDefs[index]; df->w; df++ ) {
+		for (const EoBShapeDef *df = _shapeDefs[index]; df->w; df++) {
 			uint16 shapeIndex = (df->index < 0) ? df->index * -1 : df->index;
 			if (_shapes[shapeIndex])
 				delete[] _shapes[shapeIndex];
@@ -1021,7 +1021,7 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 		uint16 shapeW = 0;
 		uint16 shapeH = 0;
 
-		switch(s->command) {
+		switch (s->command) {
 		case 0:
 			// flash palette
 			if (s->pal)
@@ -1072,7 +1072,7 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 
 			if (s->pal)
 				setPaletteWithoutTextColor(palIndex);
-			else if(!_screen->_curPage)
+			else if (!_screen->_curPage)
 				_screen->updateScreen();
 
 			delay(s->delay);
@@ -1345,6 +1345,6 @@ void DarkMoonEngine::seq_dranDragonTransformation() {
 	_screen->setFont(of);
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
-- 
cgit v1.2.3


From 592e541e196378f1e038840701f583db36e3af31 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Thu, 29 Dec 2011 15:36:16 +0100
Subject: KYRA: Fix format string

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

(limited to 'engines')

diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp
index ba27ccff8e..512d28f084 100644
--- a/engines/kyra/sequences_lol.cpp
+++ b/engines/kyra/sequences_lol.cpp
@@ -65,7 +65,7 @@ int LoLEngine::processPrologue() {
 		_screen->setFont(Screen::FID_6_FNT);
 		// Original version: (260|193) "V CD1.02 D"
 		const int width = _screen->getTextWidth(versionString.c_str());
-		_screen->fprintString(versionString.c_str(), 320 - width, 193, 0x67, 0x00, 0x04, gScummVMVersion);
+		_screen->fprintString("%s", 320 - width, 193, 0x67, 0x00, 0x04, versionString.c_str());
 		_screen->setFont(_flags.lang == Common::JA_JPN ? Screen::FID_SJIS_FNT : Screen::FID_9_FNT);
 
 		_screen->fadePalette(_screen->getPalette(0), 0x1E);
-- 
cgit v1.2.3


From 79bdefccc4f493dc16d6cdf3c986452c84d3a33e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 29 Dec 2011 16:39:09 +0100
Subject: TSAGE: R2R - Fix bugs in scene 3375

---
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 2 +-
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 29356ef024..670143a70b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -1961,7 +1961,7 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player._characterScene[2] = 3375;
 	R2_GLOBALS._player._characterScene[3] = 3375;
 
-	setZoomPercents(55, 126, 167, 200);
+	setZoomPercents(126, 55, 200, 167);
 	R2_GLOBALS._player.postInit();
 	
 	if (R2_GLOBALS._player._characterIndex == 2) {
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index a07b689645..4deeb91c06 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1657,7 +1657,7 @@ void SpeakerQuinn3375::proc15() {
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
 		_object1.setup(4010, 5, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
+		_object1.animate(ANIM_MODE_5, this);
 		break;
 	default:
 		signal();
@@ -1718,7 +1718,7 @@ void SpeakerSeeker3375::proc15() {
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
 		_object1.setup(4031, 1, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
+		_object1.animate(ANIM_MODE_5, this);
 		break;
 	default:
 		signal();
@@ -1780,7 +1780,7 @@ void SpeakerMiranda3375::proc15() {
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
 		_object1.setup(4051, 5, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
+		_object1.animate(ANIM_MODE_5, this);
 		break;
 	default:
 		signal();
@@ -1837,7 +1837,7 @@ void SpeakerWebbster3375::proc15() {
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
 		_object1.setup(4110, 5, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
+		_object1.animate(ANIM_MODE_5, this);
 		break;
 	default:
 		signal();
-- 
cgit v1.2.3


From 44a8e4ac1d963ec31e233884fce83ffdb007898c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 29 Dec 2011 16:54:37 +0100
Subject: TSAGE: R2R - Implement Scene 3385

---
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   1 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 230 +++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h    |  47 +++++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 244 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   |  32 +++
 5 files changed, 554 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 0e387083a5..4952cf1831 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -219,6 +219,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 3375:
 		return new Scene3375();
 	case 3385:
+		return new Scene3385();
 	case 3395:
 		error("Missing scene %d from group 3", sceneNumber);
 	case 3400:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 670143a70b..db1b9b6c21 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -2185,6 +2185,236 @@ void Scene3375::dispatch() {
 	Scene::dispatch();
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3385 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene3385::Scene3385() {
+	_field11B2 = 0;
+}
+
+void Scene3385::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field11B2);
+}
+
+bool Scene3385::Actor1::startAction(CursorType action, Event &event) {
+	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_TALK)
+		return SceneActor::startAction(action, event);
+	
+	scene->_sceneMode = 9999;
+	if (R2_GLOBALS._player._characterIndex == 2)
+		scene->_stripManager.start(3302, scene);
+	else
+		scene->_stripManager.start(3304, scene);
+	
+	return true;
+}
+
+bool Scene3385::Actor2::startAction(CursorType action, Event &event) {
+	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_TALK)
+		return SceneActor::startAction(action, event);
+	
+	scene->_sceneMode = 9999;
+	if (R2_GLOBALS._player._characterIndex == 3)
+		scene->_stripManager.start(3302, scene);
+	else
+		scene->_stripManager.start(3301, scene);
+	
+	return true;
+}
+
+bool Scene3385::Actor3::startAction(CursorType action, Event &event) {
+	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_TALK)
+		return SceneActor::startAction(action, event);
+	
+	scene->_sceneMode = 9999;
+	scene->_stripManager.start(3303, scene);
+	
+	return true;
+}
+
+bool Scene3385::Actor4::startAction(CursorType action, Event &event) {
+	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	if (R2_GLOBALS._sceneManager._previousScene == 3375)
+		R2_GLOBALS._sound2.play(314);
+
+	scene->_sceneMode = 3386;
+	scene->setAction(&scene->_sequenceManager, scene, 3386, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL);
+	
+	return true;
+}
+
+void Scene3385::Exit1::changeScene() {
+	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	scene->_sceneMode = 3387;
+
+	if (R2_GLOBALS._sceneManager._previousScene == 3375)
+		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, NULL);
+	else
+		scene->signal();
+}
+
+void Scene3385::Action1::signal() {
+	++_actionIndex;
+	
+	if (_actionIndex == 0)
+		setDelay(1);
+	else if (_actionIndex == 1)
+		R2_GLOBALS._sound2.play(314);
+}
+
+void Scene3385::postInit(SceneObjectList *OwnerList) {
+	loadScene(3385);
+	SceneExt::postInit();
+
+	R2_GLOBALS._sound1.play(313);
+
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+	_stripManager.addSpeaker(&_mirandaSpeaker);
+	_stripManager.addSpeaker(&_webbsterSpeaker);
+
+	R2_GLOBALS._player._characterScene[1] = 3385;
+	R2_GLOBALS._player._characterScene[2] = 3385;
+	R2_GLOBALS._player._characterScene[3] = 3385;
+
+	if (R2_GLOBALS._sceneManager._previousScene == 3375)
+		_field11B2 = 3;
+	else
+		_field11B2 = 4;
+
+	setZoomPercents(102, 40, 200, 160);
+	R2_GLOBALS._player.postInit();
+	
+	if (R2_GLOBALS._player._characterIndex == 2)
+		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+	else
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+
+	R2_GLOBALS._player.changeZoom(-1);
+	
+	if (R2_GLOBALS._player._characterIndex == 2)
+		R2_GLOBALS._player.setup(20, _field11B2, 1);
+	else if (R2_GLOBALS._player._characterIndex == 3)
+		R2_GLOBALS._player.setup(30, _field11B2, 1);
+	else
+		R2_GLOBALS._player.setup(10, _field11B2, 1);
+	
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.disableControl();
+
+	_actor1.postInit();
+	if (R2_GLOBALS._player._characterIndex == 2) {
+		_actor1._moveRate = 10;
+		_actor1._moveDiff = Common::Point(3, 2);
+	} else {
+		_actor1._moveRate = 7;
+		_actor1._moveDiff = Common::Point(5, 3);
+	}
+	_actor1.changeZoom(-1);
+	_actor1._effect = 1;
+	if (R2_GLOBALS._player._characterIndex == 2)
+		_actor1.setup(10, _field11B2, 1);
+	else
+		_actor1.setup(20, _field11B2, 1);
+	_actor1.animate(ANIM_MODE_1, NULL);
+	_actor1.setDetails(3385, -1, -1, -1, 1, (SceneItem *) NULL);
+	
+	_actor2.postInit();
+	_actor2._moveDiff = Common::Point(3, 2);
+	_actor2.changeZoom(-1);
+	_actor2._effect = 1;
+	if (R2_GLOBALS._player._characterIndex == 2)
+		_actor2.setup(10, _field11B2, 1);
+	else
+		_actor2.setup(30, _field11B2, 1);
+	_actor2.animate(ANIM_MODE_1, NULL);
+	_actor2.setDetails(3385, -1, -1, -1, 1, (SceneItem *) NULL);
+
+	_actor3.postInit();
+	_actor3._moveDiff = Common::Point(3, 2);
+	_actor3.changeZoom(-1);
+	_actor3._effect = 1;
+	_actor3.setup(40, _field11B2, 1);
+	_actor3.animate(ANIM_MODE_1, NULL);
+	_actor3.setDetails(3385, 15, -1, -1, 1, (SceneItem *) NULL);
+	
+	_exit1.setDetails(Rect(103, 152, 217, 170), SHADECURSOR_DOWN, 3395);
+	_exit1.setDest(Common::Point(158, 151));
+	
+	_actor4.postInit();
+	_actor4.setPosition(Common::Point(160, 100));
+	_actor4.fixPriority(90);
+	_actor4.setDetails(3385, 3, 4, -1, 1, (SceneItem *) NULL);
+	
+	if (R2_GLOBALS._sceneManager._previousScene == 3375) {
+		R2_GLOBALS._player.setPosition(Common::Point(158, 102));
+		_actor1.setPosition(Common::Point(164, 100));
+		_actor1.fixPriority(98);
+		_actor2.setPosition(Common::Point(150, 100));
+		_actor2.fixPriority(97);
+		_actor3.setPosition(Common::Point(158, 100));
+		_actor3.fixPriority(96);
+		_sceneMode = 3384;
+		_actor4.setup(3385, 1, 6);
+		_actor4.animate(ANIM_MODE_6, this);
+		setAction(&_action1, &_actor4);
+	} else {
+		R2_GLOBALS._player.setPosition(Common::Point(158, 230));
+		_actor1.setPosition(Common::Point(191, 270));
+		_actor2.setPosition(Common::Point(124, 255));
+		_actor3.setPosition(Common::Point(155, 245));
+		_actor4.setup(3385, 1, 1);
+		_sceneMode = 3385;
+		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL);
+	}	
+
+	_item1.setDetails(Rect(0, 0, 320, 200), 3385, 0, -1, -1, 1, NULL);
+	R2_GLOBALS._v56A9E = 0;
+}
+
+void Scene3385::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene3385::signal() {
+	switch (_sceneMode) {
+	case 3386:
+		R2_GLOBALS._sceneManager.changeScene(3375);
+		break;
+	case 3387:
+		R2_GLOBALS._sceneManager.changeScene(3395);
+		break;
+	case 9999:
+		if (R2_GLOBALS._sceneManager._previousScene == 3375)
+			R2_GLOBALS._player.setStrip(3);
+		else
+			R2_GLOBALS._player.setStrip(4);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	}
+}
+
 /*--------------------------------------------------------------------------
  * Scene 3400 - 
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index d5e2e451f4..558acf62e9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -457,6 +457,53 @@ public:
 	virtual void synchronize(Serializer &s);
 };
 
+class Scene3385 : public SceneExt {
+	class Actor1 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor2 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor3 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor4 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+
+	class Action1: public Action {
+	public:
+		virtual void signal();
+	};
+
+public:
+	SpeakerQuinn3385 _quinnSpeaker;
+	SpeakerSeeker3385 _seekerSpeaker;
+	SpeakerMiranda3385 _mirandaSpeaker;
+	SpeakerWebbster3385 _webbsterSpeaker;
+	NamedHotspot _item1;
+	Actor1 _actor1;
+	Actor2 _actor2;
+	Actor3 _actor3;
+	Actor4 _actor4;
+	Exit1 _exit1;
+	Action1 _action1;
+	SequenceManager _sequenceManager;
+	
+	int _field11B2;
+
+	Scene3385();
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void synchronize(Serializer &s);
+};
+
 class Scene3400 : public SceneExt {
 public:
 	SpeakerQuinn3400 _quinnSpeaker;
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 4deeb91c06..b8773192b0 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1845,6 +1845,250 @@ void SpeakerWebbster3375::proc15() {
 	}
 }
 
+SpeakerQuinn3385::SpeakerQuinn3385() {
+	_speakerName = "QUINN";
+	_color1 = 60;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+void SpeakerQuinn3385::proc15() {
+	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 1) 
+			_object2 = &R2_GLOBALS._player;
+		else if (R2_GLOBALS._player._characterIndex == 2) 
+			_object2 = &scene->_actor1;
+		else
+			_object2 = &scene->_actor2;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (R2_GLOBALS._sceneManager._previousScene == 3375)
+			R2_GLOBALS._player.setStrip(4);
+		else
+			R2_GLOBALS._player.setStrip(3);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+	
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		if (R2_GLOBALS._player._characterIndex == 2)
+			_object1.setup(4010, 3, 1);
+		else
+			_object1.setup(4010, 5, 1);
+
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
+SpeakerSeeker3385::SpeakerSeeker3385() {
+	_speakerName = "SEEKER";
+	_color1 = 35;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerSeeker3385::proc15() {
+	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 2) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor1;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (R2_GLOBALS._sceneManager._previousScene == 3375)
+			R2_GLOBALS._player.setStrip(4);
+		else
+			R2_GLOBALS._player.setStrip(3);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+	
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4031, 3, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
+SpeakerMiranda3385::SpeakerMiranda3385() {
+	_speakerName = "MIRANDA";
+	_color1 = 154;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerMiranda3385::proc15() {
+	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 3) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor2;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (R2_GLOBALS._sceneManager._previousScene == 3375)
+			R2_GLOBALS._player.setStrip(4);
+		else
+			R2_GLOBALS._player.setStrip(3);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+	
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4051, 5, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
+SpeakerWebbster3385::SpeakerWebbster3385() {
+	_speakerName = "WEBBSTER";
+	_color1 = 60;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerWebbster3385::proc15() {
+	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &scene->_actor3;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (R2_GLOBALS._sceneManager._previousScene == 3375)
+			R2_GLOBALS._player.setStrip(4);
+		else
+			R2_GLOBALS._player.setStrip(3);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4110, 5, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 SpeakerQuinn3400::SpeakerQuinn3400() {
 	_speakerName = "QUINN";
 	_color1 = 60;
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 2f289175e8..c3de6a68a8 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -421,6 +421,38 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerQuinn3385 : public VisualSpeaker {
+public:
+	SpeakerQuinn3385();
+
+	virtual Common::String getClassName() { return "SpeakerQuinn3385"; }
+	virtual void proc15();
+};
+
+class SpeakerSeeker3385 : public VisualSpeaker {
+public:
+	SpeakerSeeker3385();
+
+	virtual Common::String getClassName() { return "SpeakerSeeker3385"; }
+	virtual void proc15();
+};
+
+class SpeakerMiranda3385 : public VisualSpeaker {
+public:
+	SpeakerMiranda3385();
+
+	virtual Common::String getClassName() { return "SpeakerMiranda3385"; }
+	virtual void proc15();
+};
+
+class SpeakerWebbster3385 : public VisualSpeaker {
+public:
+	SpeakerWebbster3385();
+
+	virtual Common::String getClassName() { return "SpeakerWebbster3385"; }
+	virtual void proc15();
+};
+
 class SpeakerQuinn3400 : public VisualSpeaker {
 public:
 	SpeakerQuinn3400();
-- 
cgit v1.2.3


From d0be9c0a583860058a5f7212d62a8c9a086329d5 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Wed, 28 Dec 2011 21:53:40 +0100
Subject: KYRA: (EOB) - fix some valgrind warnings

(overlapping source/dest)
---
 engines/kyra/screen.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index b6383c82cc..19314a5699 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -828,6 +828,9 @@ void Screen::copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPag
 	const uint8 *src = getPagePtr(srcPage) + y1 * SCREEN_W + x1;
 	uint8 *dst = getPagePtr(dstPage) + y2 * SCREEN_W + x2;
 
+	if (src == dst)
+		return;
+
 	if (dstPage == 0 || dstPage == 1)
 		addDirtyRect(x2, y2, w, h);
 
@@ -835,7 +838,7 @@ void Screen::copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPag
 
 	if (flags & CR_NO_P_CHECK) {
 		while (h--) {
-			memcpy(dst, src, w);
+			memmove(dst, src, w);
 			src += SCREEN_W;
 			dst += SCREEN_W;
 		}
-- 
cgit v1.2.3


From b4baac065df70999ed08017c89166f0fbe6164ea Mon Sep 17 00:00:00 2001
From: athrxx
Date: Wed, 28 Dec 2011 23:31:21 +0100
Subject: KYRA: (EOB) - fix EOB 1 intro sound bug

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

(limited to 'engines')

diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index 4b094f4e9c..dc479a8c30 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -498,12 +498,12 @@ void EoBEngine::seq_king() {
 				_screen->copyRegion(0, dy[i] - 2, (advEncX[i] + 8) << 3, dy[i] - 2, advEncW[i] << 3, 182 - dy[i], 4, 0, Screen::CR_NO_P_CHECK);
 			}
 
-			if (_rnd.getRandomNumber(255) & 3)
-				_sound->playTrack(7);
-
 			runloop = true;
 		}
 
+		if (!(_rnd.getRandomNumber(255) & 3))
+			_sound->playTrack(7);
+
 		_screen->updateScreen();
 		delayUntil(end);
 	}
-- 
cgit v1.2.3


From ef3b591b289136194cec9f8a209ff2645c98b576 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Thu, 29 Dec 2011 16:56:56 +0100
Subject: KYRA: (EOB) - fix warning about overloaded virtual function being
 only partially overridden

---
 engines/kyra/darkmoon.h  | 1 +
 engines/kyra/eob.h       | 1 +
 engines/kyra/eobcommon.h | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/darkmoon.h b/engines/kyra/darkmoon.h
index 8abbc2bea2..78413d2c38 100644
--- a/engines/kyra/darkmoon.h
+++ b/engines/kyra/darkmoon.h
@@ -111,6 +111,7 @@ private:
 	bool killMonsterExtra(EoBMonsterInPlay *m);
 
 	// Level
+	void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) {}
 	const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs);
 	void drawDoorIntern(int type, int, int x, int y, int w, int wall, int mDim, int16, int16);
 
diff --git a/engines/kyra/eob.h b/engines/kyra/eob.h
index 6123c26726..ce71c76af4 100644
--- a/engines/kyra/eob.h
+++ b/engines/kyra/eob.h
@@ -112,6 +112,7 @@ private:
 	void updateScriptTimersExtra();
 
 	// Level
+	const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs) { return 0; }
 	void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2);
 	void drawDoorIntern(int type, int index, int x, int y, int w, int wall, int mDim, int16 y1, int16 y2);
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 9284a181b4..f02b76d267 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -582,8 +582,8 @@ protected:
 	void releaseDecorations();
 	void releaseDoorShapes();
 	void toggleWallState(int wall, int flags);
-	virtual void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) {}
-	virtual const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8*shapeDefs) { return (const uint8*)filename; }
+	virtual void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) = 0;
+	virtual const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs) = 0;
 
 	void drawScene(int refresh);
 	void drawSceneShapes(int start = 0);
-- 
cgit v1.2.3


From adb53422471386b4eb3551fe15a489bcd88b6571 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 30 Dec 2011 01:52:41 +0100
Subject: TINSEL: Take advantage of KeyState::hasFlags.

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

(limited to 'engines')

diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index 635845ab26..cd0f9b9fa4 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -1177,7 +1177,7 @@ void TinselEngine::ProcessKeyEvent(const Common::Event &event) {
 	switch (event.kbd.keycode) {
 	case Common::KEYCODE_d:
 		// Checks for CTRL flag, ignoring all the sticky flags
-		if ((Common::KBD_CTRL == (event.kbd.flags & ~(Common::KBD_NUM|Common::KBD_CAPS|Common::KBD_SCRL))) && (event.type == Common::EVENT_KEYDOWN)) {
+		if (event.kbd.hasFlags(Common::KBD_CTRL) && event.type == Common::EVENT_KEYDOWN) {
 			// Activate the debugger
 			assert(_console);
 			_console->attach();
-- 
cgit v1.2.3


From 211eb00e8725e36b8c802a9b7b9b9812e9c3053e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 30 Dec 2011 12:08:41 +0100
Subject: TSAGE: R2R - Cleanup: reorganise speakers, add ancestor classes where
 speaker declaration is common to several speakers.

---
 engines/tsage/ringworld2/ringworld2_scenes2.h    |   11 +-
 engines/tsage/ringworld2/ringworld2_scenes3.h    |    4 +-
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 2306 +++++++++-------------
 engines/tsage/ringworld2/ringworld2_speakers.h   |  425 ++--
 4 files changed, 1157 insertions(+), 1589 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.h b/engines/tsage/ringworld2/ringworld2_scenes2.h
index d007f7e9f5..281d1da366 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.h
@@ -106,8 +106,8 @@ class Scene2350 : public SceneExt {
 	};
 public:
 
-	SpeakerQuinn2350 _quinnSpeaker;
-	SpeakerPharisha2350 _pharishaSpeaker;
+	SpeakerQuinn _quinnSpeaker;
+	SpeakerPharisha _pharishaSpeaker;
 	NamedHotspot _item1;
 	SceneActor _actor1;
 	Actor2 _actor2;
@@ -368,9 +368,9 @@ class Scene2500 : public SceneExt {
 		virtual void changeScene();
 	};
 public:
-	SpeakerQuinn2500 _quinnSpeaker;
-	SpeakerSeeker2500 _seekerSpeaker;
-	SpeakerMiranda2500 _mirandaSpeaker;
+	SpeakerQuinn _quinnSpeaker;
+	SpeakerSeeker _seekerSpeaker;
+	SpeakerMiranda _mirandaSpeaker;
 	SpeakerWebbster2500 _webbsterSpeaker;
 	NamedHotspot _item1;
 	SceneActor _actor1;
@@ -665,6 +665,7 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 };
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 558acf62e9..812ab800cc 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -47,7 +47,7 @@ class Scene3100 : public SceneExt {
 public:
 
 	int _field412;
-	SpeakerGuard3100 _guardSpeaker;
+	SpeakerGuard _guardSpeaker;
 	NamedHotspot _item1;
 	NamedHotspot _item2;
 	SceneActor _actor1;
@@ -241,7 +241,7 @@ class Scene3240 : public SceneExt {
 public:
 	SpeakerTeal3240 _tealSpeaker;
 	SpeakerWebbster3240 _webbsterSpeaker;
-	SpeakerMiranda2500 _mirandaSpeaker;
+	SpeakerMiranda _mirandaSpeaker;
 	SceneActor _actor1;
 	SceneActor _actor2;
 	SequenceManager _sequenceManager;
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index b8773192b0..7f5cdc1328 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -191,11 +191,13 @@ void VisualSpeaker::setDelay(int delay) {
 	_frameNumber = R2_GLOBALS._events.getFrameNumber();
 }
 
-/*--------------------------------------------------------------------------*/
+//----------------------------------------------------------------------------
+// Classes related to CAPTAIN
+//----------------------------------------------------------------------------
 
-SpeakerMiranda300::SpeakerMiranda300(): VisualSpeaker() {
-	_speakerName = "MIRANDA";
-	_color1 = 154;
+SpeakerCaptain3210::SpeakerCaptain3210() {
+	_speakerName = "Captain";
+	_color1 = 5;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -205,17 +207,12 @@ SpeakerMiranda300::SpeakerMiranda300(): VisualSpeaker() {
 	_numFrames = 0;
 }
 
-void SpeakerMiranda300::proc15() {
+void SpeakerCaptain3210::proc15() {
 	int v = _fieldF6;
+	Scene3210 *scene = (Scene3210 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) {
-			_object2 = &R2_GLOBALS._player;
-		} else {
-			Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
-			_object2 = &scene->_miranda;
-		}
-
+		_object2 = &scene->_actor1;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
@@ -226,30 +223,20 @@ void SpeakerMiranda300::proc15() {
 
 	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
-	} else if (v == 100) {
-		_numFrames = 0;
-		((SceneItem *)_action)->_sceneRegionId = 0;
-
-		_object1.setStrip(_object1._strip - 1);
-		_object1.setFrame(_object1.getFrameCount());
-		_object1.animate(ANIM_MODE_6, this);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-
-		if (v == 4) {
-			_object1.setup(304, 5, 1);
-		} else {
-			_object1.setup(305, v * 2 - 1, 1);
-		}
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-/*--------------------------------------------------------------------------*/
+//----------------------------------------------------------------------------
+// Classes related to CARETAKER
+//----------------------------------------------------------------------------
 
-SpeakerSeeker300::SpeakerSeeker300(): VisualSpeaker() {
-	_speakerName = "SEEKER";
-	_color1 = 35;
+SpeakerCaretaker2450::SpeakerCaretaker2450() {
+	_speakerName = "CARETAKER";
+	_color1 = 43;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -259,20 +246,30 @@ SpeakerSeeker300::SpeakerSeeker300(): VisualSpeaker() {
 	_numFrames = 0;
 }
 
-void SpeakerSeeker300::proc15() {
+//----------------------------------------------------------------------------
+// Classes related to GUARD
+//----------------------------------------------------------------------------
+
+SpeakerGuard::SpeakerGuard() {
+	_speakerName = "GUARD";
+	_color1 = 5;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerGuard2800::proc15() {
 	int v = _fieldF6;
+	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) {
-			_object2 = &R2_GLOBALS._player;
-		} else {
-			Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
-			_object2 = &scene->_seeker;
-		}
-
+		_object2 = &scene->_actor1;
 		_object2->hide();
 		_object1.postInit();
-		_object1.fixPriority(140);
 		_object1.setPosition(_object2->_position);
 
 		if (_object2->_mover) 
@@ -281,55 +278,21 @@ void SpeakerSeeker300::proc15() {
 
 	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
-	} else if (v == 100) {
-		_numFrames = 0;
-		((SceneItem *)_action)->_sceneRegionId = 0;
-
-		_object1.setStrip(_object1._strip - 1);
-		_object1.setFrame(_object1.getFrameCount());
-		_object1.animate(ANIM_MODE_6, this);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(306, v * 2 - 1, 1);
+		_object1.setZoom(75);
+		_object1.setup(4060, 3, 1);
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-/*--------------------------------------------------------------------------*/
-
-SpeakerSeekerL::SpeakerSeekerL(): VisualSpeaker() {
-	_speakerName = "SEEKERL";
-	_color1 = 35;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-	_fontNumber = 10;
-}
-
-/*--------------------------------------------------------------------------*/
-
-SpeakerQuinnL::SpeakerQuinnL(): VisualSpeaker() {
-	_speakerName = "QUINNL";
-	_color1 = 35;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-	_fontNumber = 10;
-}
-
-/*--------------------------------------------------------------------------*/
+//----------------------------------------------------------------------------
+// Classes related to JOCKO
+//----------------------------------------------------------------------------
 
-SpeakerQuinn300::SpeakerQuinn300(): VisualSpeaker() {
-	_speakerName = "QUINN";
-	_color1 = 60;
+SpeakerJocko::SpeakerJocko() {
+	_speakerName = "Jocko";
+	_color1 = 45;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -339,17 +302,12 @@ SpeakerQuinn300::SpeakerQuinn300(): VisualSpeaker() {
 	_numFrames = 0;
 }
 
-void SpeakerQuinn300::proc15() {
+void SpeakerJocko3200::proc15() {
 	int v = _fieldF6;
+	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) {
-			_object2 = &R2_GLOBALS._player;
-		} else {
-			Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
-			_object2 = &scene->_quinn;
-		}
-
+		_object2 = &scene->_actor2;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
@@ -360,54 +318,20 @@ void SpeakerQuinn300::proc15() {
 
 	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
-	} else if (v == 100) {
-		_numFrames = 0;
-		((SceneItem *)_action)->_sceneRegionId = 0;
-
-		_object1.setStrip(_object1._strip - 1);
-		_object1.setFrame(_object1.getFrameCount());
-		_object1.animate(ANIM_MODE_6, this);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		
-		switch (_object2->_visage) {
-		case 10:
-			_object1.setup((v - 1) / 4 + 4010, ((v - ((v - 1) / 4 * 4) - 1) % 8) * 2 + 1, 1);
-			break;
-		case 302:
-			_object1.setup(308, (v - 1) % 8 + 1, 1);
-			break;
-		case 308:
-			_object1.setup(308, 5, 1);
-			break;
-		}
-
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-/*--------------------------------------------------------------------------*/
-
-SpeakerTeal300::SpeakerTeal300(): VisualSpeaker() {
-	_speakerName = "TEAL";
-	_color1 = 22;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerTeal300::proc15() {
+void SpeakerJocko3220::proc15() {
 	int v = _fieldF6;
+	Scene3220 *scene = (Scene3220 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
-		_object2 = &scene->_teal;
+		_object2 = &scene->_actor2;
 		_object2->hide();
-
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
@@ -419,34 +343,18 @@ void SpeakerTeal300::proc15() {
 		_object1.animate(ANIM_MODE_2, NULL);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(303, 1, 1);
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-
-/*--------------------------------------------------------------------------*/
-
-SpeakerSoldier300::SpeakerSoldier300(): VisualSpeaker() {
-	_speakerName = "SOLDIER";
-	_color1 = 60;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerSoldier300::proc15() {
+void SpeakerJocko3230::proc15() {
 	int v = _fieldF6;
+	Scene3230 *scene = (Scene3230 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
-		_object2 = &scene->_teal;
+		_object2 = &scene->_actor2;
 		_object2->hide();
-
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
@@ -458,28 +366,18 @@ void SpeakerSoldier300::proc15() {
 		_object1.animate(ANIM_MODE_2, NULL);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(303, 3, 1);
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-/*--------------------------------------------------------------------------*/
-
-SpeakerQuinn2350::SpeakerQuinn2350(): VisualSpeaker() {
-	_speakerName = "QUINN";
-	_color1 = 60;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
+//----------------------------------------------------------------------------
+// Classes related to MIRANDA 
+//----------------------------------------------------------------------------
 
-SpeakerPharisha2350::SpeakerPharisha2350(): VisualSpeaker() {
-	_speakerName = "PHARISHA";
-	_color1 = 151;
+SpeakerMiranda::SpeakerMiranda(): VisualSpeaker() {
+	_speakerName = "MIRANDA";
+	_color1 = 154;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -489,70 +387,55 @@ SpeakerPharisha2350::SpeakerPharisha2350(): VisualSpeaker() {
 	_numFrames = 0;
 }
 
-/*--------------------------------------------------------------------------*/
-
-SpeakerQuinn2435::SpeakerQuinn2435() {
-	_speakerName = "QUINN";
-	_color1 = 60;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-void SpeakerQuinn2435::proc15() {
+void SpeakerMiranda300::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == 3) {
 			_object2 = &R2_GLOBALS._player;
 		} else {
-			Scene2435 *scene = (Scene2435 *)R2_GLOBALS._sceneManager._scene;
-			_object2 = &scene->_actor1;
+			Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
+			_object2 = &scene->_miranda;
 		}
 
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
 	}
 
 	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
+	} else if (v == 100) {
+		_numFrames = 0;
+		((SceneItem *)_action)->_sceneRegionId = 0;
+
+		_object1.setStrip(_object1._strip - 1);
+		_object1.setFrame(_object1.getFrameCount());
+		_object1.animate(ANIM_MODE_6, this);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object2->setStrip(7);
-		_object1.setup(2020, 5, 1);
+
+		if (v == 4) {
+			_object1.setup(304, 5, 1);
+		} else {
+			_object1.setup(305, v * 2 - 1, 1);
+		}
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerSeeker2435::SpeakerSeeker2435() {
-	_speakerName = "SEEKER";
-	_color1 = 35;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerSeeker2435::proc15() {
+void SpeakerMiranda3255::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2) {
-			_object2 = &R2_GLOBALS._player;
-		} else {
-			Scene2435 *scene = (Scene2435 *)R2_GLOBALS._sceneManager._scene;
-			_object2 = &scene->_actor1;
-		}
-
+		_object2 = &R2_GLOBALS._player;
 		_object2->hide();
 		_object1.postInit();
+		_object1._effect = _object2->_effect;
+		_object1._shade = _object2->_shade;
 		_object1.setPosition(_object2->_position);
 	}
 
@@ -560,572 +443,213 @@ void SpeakerSeeker2435::proc15() {
 		_object1.animate(ANIM_MODE_2, NULL);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object2->setStrip(7);
-		_object1.setup(4099, 1, 1);
+		_object1.setup(3257, 5, 1);
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerPharisha2435::SpeakerPharisha2435() {
-	_speakerName = "PHARISHA";
-	_color1 = 151;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerPharisha2435::proc15() {
-	int v = _fieldF6;
-	Scene2435 *scene = (Scene2435 *)R2_GLOBALS._sceneManager._scene;
-
-	if (!_object2) {
-		_object2 = &scene->_actor2;
-		_object2->hide();
-		_object1.postInit();
-		_object1.setPosition(_object2->_position);
-	}
-
-	if (v == 0) {
-		_object1.animate(ANIM_MODE_2, NULL);
-	} else {
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4098, 5, 1);
-		_object1.animate(ANIM_MODE_5, this);
-	}
-}
-
-/*--------------------------------------------------------------------------*/
-
-SpeakerQuinn2450::SpeakerQuinn2450() {
-	_speakerName = "QUINN";
-	_color1 = 60;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-void SpeakerQuinn2450::proc15() {
-	int v = _fieldF6;
-
-	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1) {
-			_object2 = &R2_GLOBALS._player;
-		} else {
-			Scene2435 *scene = (Scene2435 *)R2_GLOBALS._sceneManager._scene;
-			_object2 = &scene->_actor1;
-		}
-
-		_object2->hide();
-		_object1.postInit();
-		_object1.setPosition(_object2->_position);
-	}
-
-	if (v == 0) {
-		_object1.animate(ANIM_MODE_2, NULL);
-	} else {
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		if (R2_GLOBALS.getFlag(61))
-			_object1.setup(2020, 3, 1);
-		else
-			_object1.setup(2020, 1, 1);
-		_object1.animate(ANIM_MODE_5, this);
-	}
-}
-
-SpeakerSeeker2450::SpeakerSeeker2450() {
-	_speakerName = "SEEKER";
-	_color1 = 35;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerSeeker2450::proc15() {
-	int v = _fieldF6;
-
-	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2) {
-			_object2 = &R2_GLOBALS._player;
-		} else {
-			Scene2450 *scene = (Scene2450 *)R2_GLOBALS._sceneManager._scene;
-			_object2 = &scene->_actor1;
-		}
-
-		_object2->hide();
-		_object1.postInit();
-		_object1.setPosition(_object2->_position);
-	}
-
-	if (v == 0) {
-		_object1.animate(ANIM_MODE_2, NULL);
-	} else {
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4099, 3, 1);
-		_object1.animate(ANIM_MODE_5, this);
-	}
-}
-
-SpeakerCaretaker2450::SpeakerCaretaker2450() {
-	_speakerName = "CARETAKER";
-	_color1 = 43;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-/*--------------------------------------------------------------------------*/
-
-SpeakerQuinn2500::SpeakerQuinn2500() {
-	_speakerName = "QUINN";
-	_color1 = 60;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-SpeakerSeeker2500::SpeakerSeeker2500() {
-	_speakerName = "SEEKER";
-	_color1 = 35;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-SpeakerMiranda2500::SpeakerMiranda2500() {
-	// Not in uppercase in the original
-	_speakerName = "Miranda";
-	_color1 = 154;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-SpeakerWebbster2500::SpeakerWebbster2500() {
-	// Not in uppercase in the original
-	_speakerName = "Webbster";
-	_color1 = 27;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-SpeakerQuinn2700::SpeakerQuinn2700() {
-	_speakerName = "QUINN";
-	_color1 = 60;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerQuinn2700::proc15() {
-	int v = _fieldF6;
-
-	if (!_object2) {
-		_object2 = &R2_GLOBALS._player;
-		_object2->hide();
-		_object1.postInit();
-		_object1.setPosition(_object2->_position);
-
-		if (_object2->_mover) 
-			_object2->addMover(NULL);
-	}
-
-	if (v == 0) {
-		_object1.animate(ANIM_MODE_2, NULL);
-	} else {
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		switch (_object2->_visage) {
-		case 19:
-			_object1.setup(4022, 5, 1);
-			break;
-		case 2701:
-			_object1.setup(4022, 1, 1);
-			break;
-		default:
-			break;
-		}
-		_object1.animate(ANIM_MODE_5, this);
-	}
-}
-
-SpeakerNej2700::SpeakerNej2700() {
-	_speakerName = "NEJ";
-	_color1 = 171;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerNej2700::proc15() {
-	int v = _fieldF6;
-	Scene2700 *scene = (Scene2700 *)R2_GLOBALS._sceneManager._scene;
-
-	if (!_object2) {
-		_object2 = &scene->_actor1;
-		_object2->hide();
-		_object1.postInit();
-		_object1.setPosition(_object2->_position);
-
-		if (_object2->_mover) 
-			_object2->addMover(NULL);
-	}
-
-	if (v == 0) {
-		_object1.animate(ANIM_MODE_2, NULL);
-	} else {
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		switch (_object2->_visage) {
-		case 2701:
-			_object1.setup(4022, 3, 1);
-			_object1.setPosition(Common::Point(164, 163));
-			_object2->setPosition(Common::Point(-10, -10));
-			break;
-		case 2705:
-			_object1.setup(4022, 7, 1);
-			_object1.fixPriority(162);
-			break;
-		default:
-			break;
-		}
-		_object1.animate(ANIM_MODE_5, this);
-	}
-}
-
-SpeakerQuinn2750::SpeakerQuinn2750() {
-	_speakerName = "QUINN";
-	_color1 = 60;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerQuinn2750::proc15() {
-	int v = _fieldF6;
-
-	if (!_object2) {
-		_object2 = &R2_GLOBALS._player;
-		_object2->hide();
-		_object1.postInit();
-		_object1.setPosition(_object2->_position);
-
-		if (_object2->_mover) 
-			_object2->addMover(NULL);
-	}
-
-	if (v == 0) {
-		_object1.animate(ANIM_MODE_2, NULL);
-	} else {
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		switch (_object2->_visage) {
-		case 19:
-			_object1.setup(4022, 5, 1);
-			break;
-		case 2752:
-			_object1.setup(2752, 1, 1);
-			break;
-		default:
-			break;
-		}
-		_object1.animate(ANIM_MODE_5, this);
-	}
-}
-
-SpeakerNej2750::SpeakerNej2750() {
-	_speakerName = "NEJ";
-	_color1 = 171;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerNej2750::proc15() {
-	int v = _fieldF6;
-	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
-
-	if (!_object2) {
-		_object2 = &scene->_actor1;
-		_object2->hide();
-		_object1.postInit();
-		_object1.setPosition(_object2->_position);
-
-		if (_object2->_mover) 
-			_object2->addMover(NULL);
-	}
-
-	if (v == 0) {
-		_object1.animate(ANIM_MODE_2, NULL);
-	} else {
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		switch (_object2->_visage) {
-		case 2705:
-			_object1.setup(4022, 7, 1);
-			break;
-		case 2752:
-			_object1.setup(2752, 1, 1);
-			break;
-		default:
-			break;
-		}
-		_object1.animate(ANIM_MODE_5, this);
-	}
-}
-
-SpeakerQuinn2800::SpeakerQuinn2800() {
-	_speakerName = "QUINN";
-	_color1 = 60;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerQuinn2800::proc15() {
-	int v = _fieldF6;
-
-	if (!_object2) {
-		_object2 = &R2_GLOBALS._player;
-		_object2->hide();
-		_object1.postInit();
-		_object1.setPosition(_object2->_position);
-
-		if (_object2->_mover) 
-			_object2->addMover(NULL);
-	}
-
-	if (v == 0) {
-		_object1.animate(ANIM_MODE_2, NULL);
-	} else {
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		switch (_object2->_visage) {
-		case 16:
-			_object1.setZoom(75);
-			_object1.setup(4023, 5, 1);
-			break;
-		case 19:
-			_object1.setup(4023, 1, 1);
-			break;
-		case 3110:
-			_object1.setZoom(75);
-			if (_object2->_strip == 1)
-				_object1.setup(4061	, 1, 1);
-			else
-				_object1.setup(4061	, 3, 1);
-			break;
-		default:
-			break;
-		}
-		_object1.animate(ANIM_MODE_5, this);
-	}
-}
-
-SpeakerNej2800::SpeakerNej2800() {
-	_speakerName = "NEJ";
-	_color1 = 171;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
+void SpeakerMiranda3375::proc15() {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
 
-void SpeakerNej2800::proc15() {
 	int v = _fieldF6;
-	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor2;
+		if (R2_GLOBALS._player._characterIndex == 3) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor2;
+
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (scene->_actor1._position.y != 163)
+			R2_GLOBALS._player.setStrip(8);
+		else
+			R2_GLOBALS._player.setStrip(2);
 
-		if (_object2->_mover) 
+		R2_GLOBALS._player.disableControl();
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
+	
 
-	if (v == 0) {
+	switch (v) {
+	case 0:
 		_object1.animate(ANIM_MODE_2, NULL);
-	} else {
+		break;
+	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4023, 3, 1);
-		if (_object2->_visage == 2801)
-			_object1.setPosition(Common::Point(R2_GLOBALS._player._position.x - 12, R2_GLOBALS._player._position.y));
+		_object1.setup(4051, 5, 1);
 		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
 	}
 }
 
-SpeakerGuard2800::SpeakerGuard2800() {
-	_speakerName = "GUARD";
-	_color1 = 5;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
+void SpeakerMiranda3385::proc15() {
+	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
 
-void SpeakerGuard2800::proc15() {
 	int v = _fieldF6;
-	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor1;
+		if (R2_GLOBALS._player._characterIndex == 3) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor2;
+
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (R2_GLOBALS._sceneManager._previousScene == 3375)
+			R2_GLOBALS._player.setStrip(4);
+		else
+			R2_GLOBALS._player.setStrip(3);
 
-		if (_object2->_mover) 
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
+	
 
-	if (v == 0) {
+	switch (v) {
+	case 0:
 		_object1.animate(ANIM_MODE_2, NULL);
-	} else {
+		break;
+	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setZoom(75);
-		_object1.setup(4060, 3, 1);
+		_object1.setup(4051, 5, 1);
 		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
 	}
 }
 
-SpeakerGuard3100::SpeakerGuard3100() {
-	_speakerName = "GUARD";
-	_color1 = 5;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-SpeakerRocko3200::SpeakerRocko3200() {
-	_speakerName = "Rocko";
-	_color1 = 5;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
+void SpeakerMiranda3400::proc15() {
+	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
-void SpeakerRocko3200::proc15() {
 	int v = _fieldF6;
-	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor1;
+		if (R2_GLOBALS._player._characterIndex == 3) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor2;
+
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
-	if (v == 0) {
+	switch (v) {
+	case 0:
 		_object1.animate(ANIM_MODE_2, NULL);
-	} else {
+		break;
+	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
-		_object1.animate(ANIM_MODE_5, this);
+		_object1.setup(4051, 5, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4050, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
 	}
 }
 
-SpeakerJocko3200::SpeakerJocko3200() {
-	_speakerName = "Jocko";
-	_color1 = 45;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
+void SpeakerMiranda3700::proc15() {
+	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
 
-void SpeakerJocko3200::proc15() {
 	int v = _fieldF6;
-	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor2;
+		_object2 = &scene->_actor3;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
-	if (v == 0) {
+	_object1.setPosition(_object2->_position);
+
+	switch (v) {
+	case 0:
 		_object1.animate(ANIM_MODE_2, NULL);
-	} else {
+		break;
+	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
-		_object1.animate(ANIM_MODE_5, this);
+		scene->_actor1.setup(10, 6, 1);
+		scene->_actor2.setup(20, 5, 1);
+		_object2->setup(30, 1, 1);
+		scene->_actor4.setup(40, 1, 1);
+		_object1.setup(4050, 5, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		scene->_actor3.setup(30, 8, 1);
+		_object1.setup(4052, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 3:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		scene->_actor2.setup(20, 1, 1);
+		scene->_actor3.setup(30, 1, 1);
+		_object1.setup(4051, 7, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
 	}
 }
 
-SpeakerSocko3200::SpeakerSocko3200() {
-	_speakerName = "Socko";
-	_color1 = 10;
+//----------------------------------------------------------------------------
+// Classes related to NEJ
+//----------------------------------------------------------------------------
+
+SpeakerNej::SpeakerNej() {
+	_speakerName = "NEJ";
+	_color1 = 171;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -1135,12 +659,12 @@ SpeakerSocko3200::SpeakerSocko3200() {
 	_numFrames = 0;
 }
 
-void SpeakerSocko3200::proc15() {
+void SpeakerNej2700::proc15() {
 	int v = _fieldF6;
-	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
+	Scene2700 *scene = (Scene2700 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor3;
+		_object2 = &scene->_actor1;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
@@ -1153,26 +677,26 @@ void SpeakerSocko3200::proc15() {
 		_object1.animate(ANIM_MODE_2, NULL);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		switch (_object2->_visage) {
+		case 2701:
+			_object1.setup(4022, 3, 1);
+			_object1.setPosition(Common::Point(164, 163));
+			_object2->setPosition(Common::Point(-10, -10));
+			break;
+		case 2705:
+			_object1.setup(4022, 7, 1);
+			_object1.fixPriority(162);
+			break;
+		default:
+			break;
+		}
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerCaptain3210::SpeakerCaptain3210() {
-	_speakerName = "Captain";
-	_color1 = 5;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerCaptain3210::proc15() {
+void SpeakerNej2750::proc15() {
 	int v = _fieldF6;
-	Scene3210 *scene = (Scene3210 *)R2_GLOBALS._sceneManager._scene;
+	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
 		_object2 = &scene->_actor1;
@@ -1188,26 +712,23 @@ void SpeakerCaptain3210::proc15() {
 		_object1.animate(ANIM_MODE_2, NULL);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		switch (_object2->_visage) {
+		case 2705:
+			_object1.setup(4022, 7, 1);
+			break;
+		case 2752:
+			_object1.setup(2752, 1, 1);
+			break;
+		default:
+			break;
+		}
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerPrivate3210::SpeakerPrivate3210() {
-	_speakerName = "Private";
-	_color1 = 45;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerPrivate3210::proc15() {
+void SpeakerNej2800::proc15() {
 	int v = _fieldF6;
-	Scene3210 *scene = (Scene3210 *)R2_GLOBALS._sceneManager._scene;
+	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
 		_object2 = &scene->_actor2;
@@ -1223,14 +744,20 @@ void SpeakerPrivate3210::proc15() {
 		_object1.animate(ANIM_MODE_2, NULL);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		_object1.setup(4023, 3, 1);
+		if (_object2->_visage == 2801)
+			_object1.setPosition(Common::Point(R2_GLOBALS._player._position.x - 12, R2_GLOBALS._player._position.y));
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerRocko3220::SpeakerRocko3220() {
-	_speakerName = "Rocko";
-	_color1 = 5;
+//----------------------------------------------------------------------------
+// Classes related to PHARISHA
+//----------------------------------------------------------------------------
+
+SpeakerPharisha::SpeakerPharisha(): VisualSpeaker() {
+	_speakerName = "PHARISHA";
+	_color1 = 151;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -1240,31 +767,32 @@ SpeakerRocko3220::SpeakerRocko3220() {
 	_numFrames = 0;
 }
 
-void SpeakerRocko3220::proc15() {
+void SpeakerPharisha2435::proc15() {
 	int v = _fieldF6;
-	Scene3220 *scene = (Scene3220 *)R2_GLOBALS._sceneManager._scene;
+	Scene2435 *scene = (Scene2435 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor1;
+		_object2 = &scene->_actor2;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
-
-		if (_object2->_mover) 
-			_object2->addMover(NULL);
 	}
 
 	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		_object1.setup(4098, 5, 1);
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerJocko3220::SpeakerJocko3220() {
-	_speakerName = "Jocko";
+//----------------------------------------------------------------------------
+// Classes related to PRIVATE
+//----------------------------------------------------------------------------
+
+SpeakerPrivate3210::SpeakerPrivate3210() {
+	_speakerName = "Private";
 	_color1 = 45;
 	_color2 = 0;
 	_fieldF6 = 0;
@@ -1275,9 +803,9 @@ SpeakerJocko3220::SpeakerJocko3220() {
 	_numFrames = 0;
 }
 
-void SpeakerJocko3220::proc15() {
+void SpeakerPrivate3210::proc15() {
 	int v = _fieldF6;
-	Scene3220 *scene = (Scene3220 *)R2_GLOBALS._sceneManager._scene;
+	Scene3210 *scene = (Scene3210 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
 		_object2 = &scene->_actor2;
@@ -1298,9 +826,13 @@ void SpeakerJocko3220::proc15() {
 	}
 }
 
-SpeakerRocko3230::SpeakerRocko3230() {
-	_speakerName = "Rocko";
-	_color1 = 5;
+//----------------------------------------------------------------------------
+// Classes related to QUINN
+//----------------------------------------------------------------------------
+
+SpeakerQuinn::SpeakerQuinn(): VisualSpeaker() {
+	_speakerName = "QUINN";
+	_color1 = 60;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -1310,12 +842,17 @@ SpeakerRocko3230::SpeakerRocko3230() {
 	_numFrames = 0;
 }
 
-void SpeakerRocko3230::proc15() {
+void SpeakerQuinn300::proc15() {
 	int v = _fieldF6;
-	Scene3230 *scene = (Scene3230 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor1;
+		if (R2_GLOBALS._player._characterIndex == 3) {
+			_object2 = &R2_GLOBALS._player;
+		} else {
+			Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
+			_object2 = &scene->_quinn;
+		}
+
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
@@ -1326,101 +863,91 @@ void SpeakerRocko3230::proc15() {
 
 	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
+	} else if (v == 100) {
+		_numFrames = 0;
+		((SceneItem *)_action)->_sceneRegionId = 0;
+
+		_object1.setStrip(_object1._strip - 1);
+		_object1.setFrame(_object1.getFrameCount());
+		_object1.animate(ANIM_MODE_6, this);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4111, (_object2->_strip * 2) - 1, 1);
+		
+		switch (_object2->_visage) {
+		case 10:
+			_object1.setup((v - 1) / 4 + 4010, ((v - ((v - 1) / 4 * 4) - 1) % 8) * 2 + 1, 1);
+			break;
+		case 302:
+			_object1.setup(308, (v - 1) % 8 + 1, 1);
+			break;
+		case 308:
+			_object1.setup(308, 5, 1);
+			break;
+		}
+
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerJocko3230::SpeakerJocko3230() {
-	_speakerName = "Jocko";
-	_color1 = 45;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerJocko3230::proc15() {
+void SpeakerQuinn2435::proc15() {
 	int v = _fieldF6;
-	Scene3230 *scene = (Scene3230 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor2;
+		if (R2_GLOBALS._player._characterIndex == 1) {
+			_object2 = &R2_GLOBALS._player;
+		} else {
+			Scene2435 *scene = (Scene2435 *)R2_GLOBALS._sceneManager._scene;
+			_object2 = &scene->_actor1;
+		}
+
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
-
-		if (_object2->_mover) 
-			_object2->addMover(NULL);
 	}
 
 	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		_object2->setStrip(7);
+		_object1.setup(2020, 5, 1);
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerTeal3240::SpeakerTeal3240() {
-	_speakerName = "Teal";
-	_color1 = 22;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerTeal3240::proc15() {
+void SpeakerQuinn2450::proc15() {
 	int v = _fieldF6;
-	Scene3240 *scene = (Scene3240 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor1;
+		if (R2_GLOBALS._player._characterIndex == 1) {
+			_object2 = &R2_GLOBALS._player;
+		} else {
+			Scene2435 *scene = (Scene2435 *)R2_GLOBALS._sceneManager._scene;
+			_object2 = &scene->_actor1;
+		}
+
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
-
-		if (_object2->_mover) 
-			_object2->addMover(NULL);
 	}
 
 	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4070, (_object2->_strip * 2) - 1, 1);
+		if (R2_GLOBALS.getFlag(61))
+			_object1.setup(2020, 3, 1);
+		else
+			_object1.setup(2020, 1, 1);
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerWebbster3240::SpeakerWebbster3240() {
-	_speakerName = "Webbster";
-	_color1 = 10;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerWebbster3240::proc15() {
+void SpeakerQuinn2700::proc15() {
 	int v = _fieldF6;
-	Scene3240 *scene = (Scene3240 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor2;
+		_object2 = &R2_GLOBALS._player;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
@@ -1433,29 +960,25 @@ void SpeakerWebbster3240::proc15() {
 		_object1.animate(ANIM_MODE_2, NULL);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4110, 5, 1);
+		switch (_object2->_visage) {
+		case 19:
+			_object1.setup(4022, 5, 1);
+			break;
+		case 2701:
+			_object1.setup(4022, 1, 1);
+			break;
+		default:
+			break;
+		}
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerRalf3245::SpeakerRalf3245() {
-	_speakerName = "Ralf";
-	_color1 = 5;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerRalf3245::proc15() {
+void SpeakerQuinn2750::proc15() {
 	int v = _fieldF6;
-	Scene3245 *scene = (Scene3245 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor1;
+		_object2 = &R2_GLOBALS._player;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
@@ -1469,41 +992,24 @@ void SpeakerRalf3245::proc15() {
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
 		switch (_object2->_visage) {
-		case 3100:
-			_object1.setup(4105, (_object2->_strip * 2) - 1, 1);
-			break;
-		case 3101:
-			_object1.setup(4108, (_object2->_strip * 2) - 1, 1);
+		case 19:
+			_object1.setup(4022, 5, 1);
 			break;
-		case 3102:
-			_object1.setup(4109, (_object2->_strip * 2) - 1, 1);
+		case 2752:
+			_object1.setup(2752, 1, 1);
 			break;
 		default:
 			break;
 		}
-
 		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerTomko3245::SpeakerTomko3245() {
-	_speakerName = "Tomko";
-	_color1 = 10;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerTomko3245::proc15() {
+void SpeakerQuinn2800::proc15() {
 	int v = _fieldF6;
-	Scene3245 *scene = (Scene3245 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor2;
+		_object2 = &R2_GLOBALS._player;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
@@ -1517,33 +1023,25 @@ void SpeakerTomko3245::proc15() {
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
 		switch (_object2->_visage) {
-		case 3100:
-			_object1.setup(4105, (_object2->_strip * 2) - 1, 1);
+		case 16:
+			_object1.setZoom(75);
+			_object1.setup(4023, 5, 1);
 			break;
-		case 3101:
-			_object1.setup(4108, (_object2->_strip * 2) - 1, 1);
+		case 19:
+			_object1.setup(4023, 1, 1);
 			break;
-		case 3102:
-			_object1.setup(4109, (_object2->_strip * 2) - 1, 1);
+		case 3110:
+			_object1.setZoom(75);
+			if (_object2->_strip == 1)
+				_object1.setup(4061	, 1, 1);
+			else
+				_object1.setup(4061	, 3, 1);
 			break;
 		default:
 			break;
-		}
-
-		_object1.animate(ANIM_MODE_5, this);
-	}
-}
-
-SpeakerQuinn3255::SpeakerQuinn3255() {
-	_speakerName = "QUINN";
-	_color1 = 60;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
+		}
+		_object1.animate(ANIM_MODE_5, this);
+	}
 }
 
 void SpeakerQuinn3255::proc15() {
@@ -1569,53 +1067,59 @@ void SpeakerQuinn3255::proc15() {
 	}
 }
 
-SpeakerMiranda3255::SpeakerMiranda3255() {
-	_speakerName = "MIRANDA";
-	_color1 = 154;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
+void SpeakerQuinn3375::proc15() {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
 
-void SpeakerMiranda3255::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		_object2 = &R2_GLOBALS._player;
+		if (R2_GLOBALS._player._characterIndex == 1) 
+			_object2 = &R2_GLOBALS._player;
+		else if (R2_GLOBALS._player._characterIndex == 2) 
+			_object2 = &scene->_actor1;
+		else
+			_object2 = &scene->_actor2;
+
 		_object2->hide();
 		_object1.postInit();
-		_object1._effect = _object2->_effect;
-		_object1._shade = _object2->_shade;
 		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (scene->_actor1._position.y != 163)
+			R2_GLOBALS._player.setStrip(8);
+		else
+			R2_GLOBALS._player.setStrip(2);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
 	}
+	
 
-	if (v == 0) {
+	switch (v) {
+	case 0:
 		_object1.animate(ANIM_MODE_2, NULL);
-	} else {
+		break;
+	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(3257, 5, 1);
+		_object1.setup(4010, 5, 1);
 		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
 	}
 }
 
-SpeakerQuinn3375::SpeakerQuinn3375() {
-	_speakerName = "QUINN";
-	_color1 = 60;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerQuinn3375::proc15() {
-	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+void SpeakerQuinn3385::proc15() {
+	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _fieldF6;
 
@@ -1634,10 +1138,10 @@ void SpeakerQuinn3375::proc15() {
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
 		
-		if (scene->_actor1._position.y != 163)
-			R2_GLOBALS._player.setStrip(8);
+		if (R2_GLOBALS._sceneManager._previousScene == 3375)
+			R2_GLOBALS._player.setStrip(4);
 		else
-			R2_GLOBALS._player.setStrip(2);
+			R2_GLOBALS._player.setStrip(3);
 
 		if (R2_GLOBALS._player._mover)
 			R2_GLOBALS._player.addMover(NULL);
@@ -1656,7 +1160,11 @@ void SpeakerQuinn3375::proc15() {
 		break;
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4010, 5, 1);
+		if (R2_GLOBALS._player._characterIndex == 2)
+			_object1.setup(4010, 3, 1);
+		else
+			_object1.setup(4010, 5, 1);
+
 		_object1.animate(ANIM_MODE_5, this);
 		break;
 	default:
@@ -1665,28 +1173,18 @@ void SpeakerQuinn3375::proc15() {
 	}
 }
 
-SpeakerSeeker3375::SpeakerSeeker3375() {
-	_speakerName = "SEEKER";
-	_color1 = 35;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerSeeker3375::proc15() {
-	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
+void SpeakerQuinn3400::proc15() {
+	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2) 
+		if (R2_GLOBALS._player._characterIndex == 1) 
 			_object2 = &R2_GLOBALS._player;
-		else
+		else if (R2_GLOBALS._player._characterIndex == 2) 
 			_object2 = &scene->_actor1;
+		else
+			_object2 = &scene->_actor2;
 
 		_object2->hide();
 		_object1.postInit();
@@ -1694,22 +1192,73 @@ void SpeakerSeeker3375::proc15() {
 		_object1._numFrames = 7;
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
-		
-		if (scene->_actor1._position.y != 163)
-			R2_GLOBALS._player.setStrip(8);
-		else
-			R2_GLOBALS._player.setStrip(2);
+		R2_GLOBALS._player.disableControl();
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
 
-		if (R2_GLOBALS._player._mover)
-			R2_GLOBALS._player.addMover(NULL);
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4010, 5, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4010, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 3:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4012, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
 
-		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+void SpeakerQuinn3700::setText(const Common::String &msg) {
+	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_fieldF6) {
+	case 2:
+		scene->_actor3.setup(30, 1, 1);
+		R2_GLOBALS._sound2.play(44);
+		break;
+	case 3:
+		scene->_actor3.setup(30, 1, 1);
+		break;
+	default:
+		scene->_actor3.setup(30, 7, 1);
+		break;
+	}
+	VisualSpeaker::setText(msg);
+}
+
+void SpeakerQuinn3700::proc15() {
+	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &scene->_actor1;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 
 		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
-	
+
+	_object1.setPosition(_object2->_position);
 
 	switch (v) {
 	case 0:
@@ -1717,8 +1266,25 @@ void SpeakerSeeker3375::proc15() {
 		break;
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4031, 1, 1);
-		_object1.animate(ANIM_MODE_5, this);
+		R2_GLOBALS._sound2.stop();
+		scene->_actor1.setup(10, 4, 1);
+		scene->_actor3.setup(30, 7, 1);
+		_object1.setup(3701, 1, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		scene->_actor2.setup(20, 1, 1);
+		scene->_actor3.setup(30, 1, 1);
+		_object1.setup(3701, 2, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 3:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		scene->_actor1.setup(10, 2, 1);
+		scene->_actor3.setup(30, 1, 1);
+		_object1.setup(4011, 1, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
 		break;
 	default:
 		signal();
@@ -1726,9 +1292,82 @@ void SpeakerSeeker3375::proc15() {
 	}
 }
 
-SpeakerMiranda3375::SpeakerMiranda3375() {
-	_speakerName = "MIRANDA";
-	_color1 = 154;
+//----------------------------------------------------------------------------
+// Classes related to QUINNL
+//----------------------------------------------------------------------------
+
+SpeakerQuinnL::SpeakerQuinnL(): VisualSpeaker() {
+	_speakerName = "QUINNL";
+	_color1 = 35;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+	_fontNumber = 10;
+}
+
+//----------------------------------------------------------------------------
+// Classes related to RALF
+//----------------------------------------------------------------------------
+
+SpeakerRalf3245::SpeakerRalf3245() {
+	_speakerName = "Ralf";
+	_color1 = 5;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerRalf3245::proc15() {
+	int v = _fieldF6;
+	Scene3245 *scene = (Scene3245 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor1;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		switch (_object2->_visage) {
+		case 3100:
+			_object1.setup(4105, (_object2->_strip * 2) - 1, 1);
+			break;
+		case 3101:
+			_object1.setup(4108, (_object2->_strip * 2) - 1, 1);
+			break;
+		case 3102:
+			_object1.setup(4109, (_object2->_strip * 2) - 1, 1);
+			break;
+		default:
+			break;
+		}
+
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+//----------------------------------------------------------------------------
+// Classes related to ROCKO
+//----------------------------------------------------------------------------
+
+SpeakerRocko::SpeakerRocko() {
+	_speakerName = "Rocko";
+	_color1 = 5;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -1738,116 +1377,82 @@ SpeakerMiranda3375::SpeakerMiranda3375() {
 	_numFrames = 0;
 }
 
-void SpeakerMiranda3375::proc15() {
-	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
-
+void SpeakerRocko3200::proc15() {
 	int v = _fieldF6;
+	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) 
-			_object2 = &R2_GLOBALS._player;
-		else
-			_object2 = &scene->_actor2;
-
+		_object2 = &scene->_actor1;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
-		_object1._numFrames = 7;
-		_object1._effect = 1;
-		_object1.changeZoom(-1);
-		
-		if (scene->_actor1._position.y != 163)
-			R2_GLOBALS._player.setStrip(8);
-		else
-			R2_GLOBALS._player.setStrip(2);
 
-		R2_GLOBALS._player.disableControl();
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
 
-		if (R2_GLOBALS._player._mover)
-			R2_GLOBALS._player.addMover(NULL);
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
 
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+void SpeakerRocko3220::proc15() {
+	int v = _fieldF6;
+	Scene3220 *scene = (Scene3220 *)R2_GLOBALS._sceneManager._scene;
 
-		if (_object2->_mover)
+	if (!_object2) {
+		_object2 = &scene->_actor1;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
 			_object2->addMover(NULL);
 	}
-	
 
-	switch (v) {
-	case 0:
+	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
-		break;
-	case 1:
+	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4051, 5, 1);
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
 		_object1.animate(ANIM_MODE_5, this);
-		break;
-	default:
-		signal();
-		break;
 	}
 }
 
-SpeakerWebbster3375::SpeakerWebbster3375() {
-	_speakerName = "WEBBSTER";
-	_color1 = 60;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerWebbster3375::proc15() {
-	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
-
+void SpeakerRocko3230::proc15() {
 	int v = _fieldF6;
+	Scene3230 *scene = (Scene3230 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor3;
+		_object2 = &scene->_actor1;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
-		_object1._numFrames = 7;
-		_object1._effect = 1;
-		_object1.changeZoom(-1);
-		
-		if (scene->_actor1._position.y != 163)
-			R2_GLOBALS._player.setStrip(8);
-		else
-			R2_GLOBALS._player.setStrip(2);
-
-		if (R2_GLOBALS._player._mover)
-			R2_GLOBALS._player.addMover(NULL);
-
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 
-		if (_object2->_mover)
+		if (_object2->_mover) 
 			_object2->addMover(NULL);
 	}
-	
 
-	switch (v) {
-	case 0:
+	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
-		break;
-	case 1:
+	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4110, 5, 1);
+		_object1.setup(4111, (_object2->_strip * 2) - 1, 1);
 		_object1.animate(ANIM_MODE_5, this);
-		break;
-	default:
-		signal();
-		break;
 	}
 }
 
-SpeakerQuinn3385::SpeakerQuinn3385() {
-	_speakerName = "QUINN";
-	_color1 = 60;
+//----------------------------------------------------------------------------
+// Classes related to SEEKER
+//----------------------------------------------------------------------------
+
+SpeakerSeeker::SpeakerSeeker(): VisualSpeaker() {
+	_speakerName = "SEEKER";
+	_color1 = 35;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -1856,144 +1461,104 @@ SpeakerQuinn3385::SpeakerQuinn3385() {
 	_displayMode = 1;
 	_numFrames = 0;
 }
-void SpeakerQuinn3385::proc15() {
-	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
 
+void SpeakerSeeker300::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1) 
+		if (R2_GLOBALS._player._characterIndex == 3) {
 			_object2 = &R2_GLOBALS._player;
-		else if (R2_GLOBALS._player._characterIndex == 2) 
-			_object2 = &scene->_actor1;
-		else
-			_object2 = &scene->_actor2;
+		} else {
+			Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
+			_object2 = &scene->_seeker;
+		}
 
 		_object2->hide();
 		_object1.postInit();
+		_object1.fixPriority(140);
 		_object1.setPosition(_object2->_position);
-		_object1._numFrames = 7;
-		_object1._effect = 1;
-		_object1.changeZoom(-1);
-		
-		if (R2_GLOBALS._sceneManager._previousScene == 3375)
-			R2_GLOBALS._player.setStrip(4);
-		else
-			R2_GLOBALS._player.setStrip(3);
-
-		if (R2_GLOBALS._player._mover)
-			R2_GLOBALS._player.addMover(NULL);
-
-		R2_GLOBALS._player.disableControl(CURSOR_TALK);
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 
-		if (_object2->_mover)
+		if (_object2->_mover) 
 			_object2->addMover(NULL);
 	}
-	
 
-	switch (v) {
-	case 0:
+	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
-		break;
-	case 1:
+	} else if (v == 100) {
+		_numFrames = 0;
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		if (R2_GLOBALS._player._characterIndex == 2)
-			_object1.setup(4010, 3, 1);
-		else
-			_object1.setup(4010, 5, 1);
 
+		_object1.setStrip(_object1._strip - 1);
+		_object1.setFrame(_object1.getFrameCount());
+		_object1.animate(ANIM_MODE_6, this);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(306, v * 2 - 1, 1);
 		_object1.animate(ANIM_MODE_5, this);
-		break;
-	default:
-		signal();
-		break;
 	}
 }
 
-SpeakerSeeker3385::SpeakerSeeker3385() {
-	_speakerName = "SEEKER";
-	_color1 = 35;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerSeeker3385::proc15() {
-	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
-
+void SpeakerSeeker2435::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2) 
+		if (R2_GLOBALS._player._characterIndex == 2) {
 			_object2 = &R2_GLOBALS._player;
-		else
+		} else {
+			Scene2435 *scene = (Scene2435 *)R2_GLOBALS._sceneManager._scene;
 			_object2 = &scene->_actor1;
+		}
 
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
-		_object1._numFrames = 7;
-		_object1._effect = 1;
-		_object1.changeZoom(-1);
-		
-		if (R2_GLOBALS._sceneManager._previousScene == 3375)
-			R2_GLOBALS._player.setStrip(4);
-		else
-			R2_GLOBALS._player.setStrip(3);
+	}
 
-		if (R2_GLOBALS._player._mover)
-			R2_GLOBALS._player.addMover(NULL);
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object2->setStrip(7);
+		_object1.setup(4099, 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
 
-		R2_GLOBALS._player.disableControl(CURSOR_TALK);
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+void SpeakerSeeker2450::proc15() {
+	int v = _fieldF6;
 
-		if (_object2->_mover)
-			_object2->addMover(NULL);
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 2) {
+			_object2 = &R2_GLOBALS._player;
+		} else {
+			Scene2450 *scene = (Scene2450 *)R2_GLOBALS._sceneManager._scene;
+			_object2 = &scene->_actor1;
+		}
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
 	}
-	
 
-	switch (v) {
-	case 0:
+	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
-		break;
-	case 1:
+	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4031, 3, 1);
+		_object1.setup(4099, 3, 1);
 		_object1.animate(ANIM_MODE_5, this);
-		break;
-	default:
-		signal();
-		break;
 	}
 }
 
-SpeakerMiranda3385::SpeakerMiranda3385() {
-	_speakerName = "MIRANDA";
-	_color1 = 154;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerMiranda3385::proc15() {
-	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
+void SpeakerSeeker3375::proc15() {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) 
+		if (R2_GLOBALS._player._characterIndex == 2) 
 			_object2 = &R2_GLOBALS._player;
 		else
-			_object2 = &scene->_actor2;
+			_object2 = &scene->_actor1;
 
 		_object2->hide();
 		_object1.postInit();
@@ -2002,10 +1567,10 @@ void SpeakerMiranda3385::proc15() {
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
 		
-		if (R2_GLOBALS._sceneManager._previousScene == 3375)
-			R2_GLOBALS._player.setStrip(4);
+		if (scene->_actor1._position.y != 163)
+			R2_GLOBALS._player.setStrip(8);
 		else
-			R2_GLOBALS._player.setStrip(3);
+			R2_GLOBALS._player.setStrip(2);
 
 		if (R2_GLOBALS._player._mover)
 			R2_GLOBALS._player.addMover(NULL);
@@ -2024,7 +1589,7 @@ void SpeakerMiranda3385::proc15() {
 		break;
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4051, 5, 1);
+		_object1.setup(4031, 1, 1);
 		_object1.animate(ANIM_MODE_5, this);
 		break;
 	default:
@@ -2033,25 +1598,17 @@ void SpeakerMiranda3385::proc15() {
 	}
 }
 
-SpeakerWebbster3385::SpeakerWebbster3385() {
-	_speakerName = "WEBBSTER";
-	_color1 = 60;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
-void SpeakerWebbster3385::proc15() {
+void SpeakerSeeker3385::proc15() {
 	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _fieldF6;
 
 	if (!_object2) {
-		_object2 = &scene->_actor3;
+		if (R2_GLOBALS._player._characterIndex == 2) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor1;
+
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
@@ -2073,6 +1630,7 @@ void SpeakerWebbster3385::proc15() {
 		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
+	
 
 	switch (v) {
 	case 0:
@@ -2080,7 +1638,7 @@ void SpeakerWebbster3385::proc15() {
 		break;
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4110, 5, 1);
+		_object1.setup(4031, 3, 1);
 		_object1.animate(ANIM_MODE_5, this);
 		break;
 	default:
@@ -2089,29 +1647,16 @@ void SpeakerWebbster3385::proc15() {
 	}
 }
 
-SpeakerQuinn3400::SpeakerQuinn3400() {
-	_speakerName = "QUINN";
-	_color1 = 60;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-void SpeakerQuinn3400::proc15() {
+void SpeakerSeeker3400::proc15() {
 	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1) 
+		if (R2_GLOBALS._player._characterIndex == 2) 
 			_object2 = &R2_GLOBALS._player;
-		else if (R2_GLOBALS._player._characterIndex == 2) 
-			_object2 = &scene->_actor1;
 		else
-			_object2 = &scene->_actor2;
+			_object2 = &scene->_actor1;
 
 		_object2->hide();
 		_object1.postInit();
@@ -2120,6 +1665,8 @@ void SpeakerQuinn3400::proc15() {
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
 		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
 		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
@@ -2130,17 +1677,27 @@ void SpeakerQuinn3400::proc15() {
 		break;
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4010, 5, 1);
+		_object1.setup(4031, 1, 1);
 		_object1.animate(ANIM_MODE_5, NULL);
 		break;
 	case 2:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4010, 3, 1);
+		_object1.setup(4031, 3, 1);
 		_object1.animate(ANIM_MODE_5, NULL);
 		break;
 	case 3:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4012, 3, 1);
+		_object1.setup(4030, 3, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 4:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4031, 7, 1);
+		_object1.animate(ANIM_MODE_5, NULL);
+		break;
+	case 5:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4033, 1, 1);
 		_object1.animate(ANIM_MODE_5, NULL);
 		break;
 	default:
@@ -2149,35 +1706,29 @@ void SpeakerQuinn3400::proc15() {
 	}
 }
 
-SpeakerSeeker3400::SpeakerSeeker3400() {
-	_speakerName = "SEEKER";
-	_color1 = 35;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
+void SpeakerSeeker3700::setText(const Common::String &msg) {
+	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
+
+	if (_fieldF6 == 1) {
+		R2_GLOBALS._sound2.play(44);
+		scene->_actor3.setup(30, 8, 1);
+	} else {
+		scene->_actor3.setup(30, 2, 1);
+	}
+	VisualSpeaker::setText(msg);
 }
 
-void SpeakerSeeker3400::proc15() {
-	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
+void SpeakerSeeker3700::proc15() {
+	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2) 
-			_object2 = &R2_GLOBALS._player;
-		else
-			_object2 = &scene->_actor1;
-
+		_object2 = &scene->_actor2;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 		_object1._numFrames = 7;
-		_object1._effect = 1;
-		_object1.changeZoom(-1);
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 
@@ -2185,33 +1736,27 @@ void SpeakerSeeker3400::proc15() {
 			_object2->addMover(NULL);
 	}
 
+	_object1.setPosition(_object2->_position);
+
 	switch (v) {
 	case 0:
 		_object1.animate(ANIM_MODE_2, NULL);
 		break;
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4031, 1, 1);
+		R2_GLOBALS._sound2.stop();
+		scene->_actor1.setup(10, 8, 1);
+		scene->_actor2.setup(20, 7, 1);
+		scene->_actor3.setup(30, 8, 1);
+		_object1.setup(3701, 3, 1);
 		_object1.animate(ANIM_MODE_5, NULL);
 		break;
 	case 2:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4031, 3, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
-		break;
-	case 3:
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4030, 3, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
-		break;
-	case 4:
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4031, 7, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
-		break;
-	case 5:
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4033, 1, 1);
+		scene->_actor1.setup(10, 2, 1);
+		scene->_actor2.setup(20, 1, 1);
+		scene->_actor3.setup(30, 1, 1);
+		_object1.setup(4031, 1, 1);
 		_object1.animate(ANIM_MODE_5, NULL);
 		break;
 	default:
@@ -2220,9 +1765,13 @@ void SpeakerSeeker3400::proc15() {
 	}
 }
 
-SpeakerMiranda3400::SpeakerMiranda3400() {
-	_speakerName = "MIRANDA";
-	_color1 = 154;
+//----------------------------------------------------------------------------
+// Classes related to SEEKERL
+//----------------------------------------------------------------------------
+
+SpeakerSeekerL::SpeakerSeekerL(): VisualSpeaker() {
+	_speakerName = "SEEKERL";
+	_color1 = 35;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -2230,55 +1779,55 @@ SpeakerMiranda3400::SpeakerMiranda3400() {
 	_object2 = NULL;
 	_displayMode = 1;
 	_numFrames = 0;
+	_fontNumber = 10;
 }
 
-void SpeakerMiranda3400::proc15() {
-	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
+//----------------------------------------------------------------------------
+// Classes related to SOCKO
+//----------------------------------------------------------------------------
+
+SpeakerSocko3200::SpeakerSocko3200() {
+	_speakerName = "Socko";
+	_color1 = 10;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
 
+void SpeakerSocko3200::proc15() {
 	int v = _fieldF6;
+	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) 
-			_object2 = &R2_GLOBALS._player;
-		else
-			_object2 = &scene->_actor2;
-
+		_object2 = &scene->_actor3;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
-		_object1._numFrames = 7;
-		_object1._effect = 1;
-		_object1.changeZoom(-1);
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 
-		if (_object2->_mover)
+		if (_object2->_mover) 
 			_object2->addMover(NULL);
 	}
 
-	switch (v) {
-	case 0:
+	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
-		break;
-	case 1:
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4051, 5, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
-		break;
-	case 2:
+	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4050, 3, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
-		break;
-	default:
-		signal();
-		break;
+		_object1.setup(4060, (_object2->_strip * 2) - 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerWebbster3400::SpeakerWebbster3400() {
-	_speakerName = "WEBBSTER";
-	_color1 = 27;
+//----------------------------------------------------------------------------
+// Classes related to SOLDIER
+//----------------------------------------------------------------------------
+
+SpeakerSoldier300::SpeakerSoldier300(): VisualSpeaker() {
+	_speakerName = "SOLDIER";
+	_color1 = 60;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -2288,63 +1837,93 @@ SpeakerWebbster3400::SpeakerWebbster3400() {
 	_numFrames = 0;
 }
 
-void SpeakerWebbster3400::proc15() {
-	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
+void SpeakerSoldier300::proc15() {
+	int v = _fieldF6;
+
+	if (!_object2) {
+		Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
+		_object2 = &scene->_teal;
+		_object2->hide();
+
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(303, 3, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+//----------------------------------------------------------------------------
+// Classes related to TEAL
+//----------------------------------------------------------------------------
+
+SpeakerTeal::SpeakerTeal(): VisualSpeaker() {
+	_speakerName = "TEAL";
+	_color1 = 22;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
 
+void SpeakerTeal300::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		_object2 = &scene->_actor3;
+		Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
+		_object2 = &scene->_teal;
+		_object2->hide();
+
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(303, 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
+void SpeakerTeal3240::proc15() {
+	int v = _fieldF6;
+	Scene3240 *scene = (Scene3240 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor1;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
-		_object1._numFrames = 7;
-		_object1._effect = 1;
-		_object1.changeZoom(-1);
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 
-		if (_object2->_mover)
+		if (_object2->_mover) 
 			_object2->addMover(NULL);
 	}
 
-	switch (v) {
-	case 0:
+	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
-		break;
-	case 1:
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4110, 5, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
-		break;
-	case 2:
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4110, 7, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
-		break;
-	case 3:
+	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		_object1.setup(4110, 3, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
-		break;
-	default:
-		signal();
-		break;
+		_object1.setup(4070, (_object2->_strip * 2) - 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerTeal3400::SpeakerTeal3400() {
-	_speakerName = "TEAL";
-	_color1 = 22;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
-}
-
 void SpeakerTeal3400::proc15() {
 	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
@@ -2402,9 +1981,13 @@ void SpeakerTeal3400::proc15() {
 	}
 }
 
-SpeakerQuinn3700::SpeakerQuinn3700() {
-	_speakerName = "QUINN";
-	_color1 = 60;
+//----------------------------------------------------------------------------
+// Classes related to TOMKO
+//----------------------------------------------------------------------------
+
+SpeakerTomko3245::SpeakerTomko3245() {
+	_speakerName = "Tomko";
+	_color1 = 10;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -2414,79 +1997,49 @@ SpeakerQuinn3700::SpeakerQuinn3700() {
 	_numFrames = 0;
 }
 
-void SpeakerQuinn3700::setText(const Common::String &msg) {
-	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
-
-	switch (_fieldF6) {
-	case 2:
-		scene->_actor3.setup(30, 1, 1);
-		R2_GLOBALS._sound2.play(44);
-		break;
-	case 3:
-		scene->_actor3.setup(30, 1, 1);
-		break;
-	default:
-		scene->_actor3.setup(30, 7, 1);
-		break;
-	}
-	VisualSpeaker::setText(msg);
-}
-
-void SpeakerQuinn3700::proc15() {
-	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
-
+void SpeakerTomko3245::proc15() {
 	int v = _fieldF6;
+	Scene3245 *scene = (Scene3245 *)R2_GLOBALS._sceneManager._scene;
 
 	if (!_object2) {
-		_object2 = &scene->_actor1;
+		_object2 = &scene->_actor2;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
-		_object1._numFrames = 7;
-		R2_GLOBALS._player.disableControl();
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 
-		if (_object2->_mover)
+		if (_object2->_mover) 
 			_object2->addMover(NULL);
 	}
 
-	_object1.setPosition(_object2->_position);
-
-	switch (v) {
-	case 0:
+	if (v == 0) {
 		_object1.animate(ANIM_MODE_2, NULL);
-		break;
-	case 1:
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		R2_GLOBALS._sound2.stop();
-		scene->_actor1.setup(10, 4, 1);
-		scene->_actor3.setup(30, 7, 1);
-		_object1.setup(3701, 1, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
-		break;
-	case 2:
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		scene->_actor2.setup(20, 1, 1);
-		scene->_actor3.setup(30, 1, 1);
-		_object1.setup(3701, 2, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
-		break;
-	case 3:
+	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		scene->_actor1.setup(10, 2, 1);
-		scene->_actor3.setup(30, 1, 1);
-		_object1.setup(4011, 1, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
-		break;
-	default:
-		signal();
-		break;
+		switch (_object2->_visage) {
+		case 3100:
+			_object1.setup(4105, (_object2->_strip * 2) - 1, 1);
+			break;
+		case 3101:
+			_object1.setup(4108, (_object2->_strip * 2) - 1, 1);
+			break;
+		case 3102:
+			_object1.setup(4109, (_object2->_strip * 2) - 1, 1);
+			break;
+		default:
+			break;
+		}
+
+		_object1.animate(ANIM_MODE_5, this);
 	}
 }
 
-SpeakerSeeker3700::SpeakerSeeker3700() {
-	_speakerName = "SEEKER";
-	_color1 = 35;
+//----------------------------------------------------------------------------
+// Classes related to WEBBSTER
+//----------------------------------------------------------------------------
+
+SpeakerWebbster::SpeakerWebbster(int colour) {
+	_speakerName = "WEBBSTER";
+	_color1 = colour;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -2496,29 +2049,51 @@ SpeakerSeeker3700::SpeakerSeeker3700() {
 	_numFrames = 0;
 }
 
-void SpeakerSeeker3700::setText(const Common::String &msg) {
-	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
+void SpeakerWebbster3240::proc15() {
+	int v = _fieldF6;
+	Scene3240 *scene = (Scene3240 *)R2_GLOBALS._sceneManager._scene;
 
-	if (_fieldF6 == 1) {
-		R2_GLOBALS._sound2.play(44);
-		scene->_actor3.setup(30, 8, 1);
+	if (!_object2) {
+		_object2 = &scene->_actor2;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
 	} else {
-		scene->_actor3.setup(30, 2, 1);
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4110, 5, 1);
+		_object1.animate(ANIM_MODE_5, this);
 	}
-	VisualSpeaker::setText(msg);
 }
 
-void SpeakerSeeker3700::proc15() {
-	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
+void SpeakerWebbster3375::proc15() {
+	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _fieldF6;
 
 	if (!_object2) {
-		_object2 = &scene->_actor2;
+		_object2 = &scene->_actor3;
 		_object2->hide();
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (scene->_actor1._position.y != 163)
+			R2_GLOBALS._player.setStrip(8);
+		else
+			R2_GLOBALS._player.setStrip(2);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 
@@ -2526,28 +2101,14 @@ void SpeakerSeeker3700::proc15() {
 			_object2->addMover(NULL);
 	}
 
-	_object1.setPosition(_object2->_position);
-
 	switch (v) {
 	case 0:
 		_object1.animate(ANIM_MODE_2, NULL);
 		break;
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		R2_GLOBALS._sound2.stop();
-		scene->_actor1.setup(10, 8, 1);
-		scene->_actor2.setup(20, 7, 1);
-		scene->_actor3.setup(30, 8, 1);
-		_object1.setup(3701, 3, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
-		break;
-	case 2:
-		((SceneItem *)_action)->_sceneRegionId = 0;
-		scene->_actor1.setup(10, 2, 1);
-		scene->_actor2.setup(20, 1, 1);
-		scene->_actor3.setup(30, 1, 1);
-		_object1.setup(4031, 1, 1);
-		_object1.animate(ANIM_MODE_5, NULL);
+		_object1.setup(4110, 5, 1);
+		_object1.animate(ANIM_MODE_5, this);
 		break;
 	default:
 		signal();
@@ -2555,20 +2116,52 @@ void SpeakerSeeker3700::proc15() {
 	}
 }
 
-SpeakerMiranda3700::SpeakerMiranda3700() {
-	_speakerName = "MIRANDA";
-	_color1 = 154;
-	_color2 = 0;
-	_fieldF6 = 0;
-	_textWidth = 300;
-	_hideObjects = false;
-	_object2 = NULL;
-	_displayMode = 1;
-	_numFrames = 0;
+void SpeakerWebbster3385::proc15() {
+	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &scene->_actor3;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (R2_GLOBALS._sceneManager._previousScene == 3375)
+			R2_GLOBALS._player.setStrip(4);
+		else
+			R2_GLOBALS._player.setStrip(3);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4110, 5, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
 }
 
-void SpeakerMiranda3700::proc15() {
-	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
+void SpeakerWebbster3400::proc15() {
+	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _fieldF6;
 
@@ -2578,6 +2171,8 @@ void SpeakerMiranda3700::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 
@@ -2585,32 +2180,23 @@ void SpeakerMiranda3700::proc15() {
 			_object2->addMover(NULL);
 	}
 
-	_object1.setPosition(_object2->_position);
-
 	switch (v) {
 	case 0:
 		_object1.animate(ANIM_MODE_2, NULL);
 		break;
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		scene->_actor1.setup(10, 6, 1);
-		scene->_actor2.setup(20, 5, 1);
-		_object2->setup(30, 1, 1);
-		scene->_actor4.setup(40, 1, 1);
-		_object1.setup(4050, 5, 1);
+		_object1.setup(4110, 5, 1);
 		_object1.animate(ANIM_MODE_5, NULL);
 		break;
 	case 2:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		scene->_actor3.setup(30, 8, 1);
-		_object1.setup(4052, 3, 1);
+		_object1.setup(4110, 7, 1);
 		_object1.animate(ANIM_MODE_5, NULL);
 		break;
 	case 3:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		scene->_actor2.setup(20, 1, 1);
-		scene->_actor3.setup(30, 1, 1);
-		_object1.setup(4051, 7, 1);
+		_object1.setup(4110, 3, 1);
 		_object1.animate(ANIM_MODE_5, NULL);
 		break;
 	default:
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index c3de6a68a8..3020b19431 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -63,461 +63,442 @@ public:
 	void setDelay(int delay);
 };
 
-class SpeakerMiranda300 : public VisualSpeaker {
+// Classes related to Captain
+
+class SpeakerCaptain3210 : public VisualSpeaker {
 public:
-	SpeakerMiranda300();
+	SpeakerCaptain3210();
 
-	virtual Common::String getClassName() { return "SpeakerMiranda300"; }
+	virtual Common::String getClassName() { return "SpeakerCaptain3210"; }
 	virtual void proc15();
 };
 
-class SpeakerSeeker300 : public VisualSpeaker {
+// Classes related to Caretaker
+
+class SpeakerCaretaker2450 : public VisualSpeaker {
 public:
-	SpeakerSeeker300();
+	SpeakerCaretaker2450();
 
-	virtual Common::String getClassName() { return "SpeakerSeeker300"; }
-	virtual void proc15();
+	virtual Common::String getClassName() { return "SpeakerCaretaker2450"; }
 };
 
-class SpeakerSeekerL : public VisualSpeaker {
-public:
-	SpeakerSeekerL();
+// Classes related to Guard
 
-	virtual Common::String getClassName() { return "SpeakerSeekerL"; }
+class SpeakerGuard : public VisualSpeaker {
+public:
+	SpeakerGuard();
+	virtual Common::String getClassName() { return "SpeakerGuard"; }
 };
 
-class SpeakerQuinnL : public VisualSpeaker {
+class SpeakerGuard2800 : public SpeakerGuard {
 public:
-	SpeakerQuinnL();
-
-	virtual Common::String getClassName() { return "SpeakerQuinnL"; }
+	virtual Common::String getClassName() { return "SpeakerGuard2800"; }
+	virtual void proc15();
 };
 
-class SpeakerQuinn300 : public VisualSpeaker {
+// Classes related to Jocko
+
+class SpeakerJocko : public VisualSpeaker {
 public:
-	SpeakerQuinn300();
+	SpeakerJocko();
+	virtual Common::String getClassName() { return "SpeakerJocko"; }
+};
 
-	virtual Common::String getClassName() { return "SpeakerQuinn300"; }
+class SpeakerJocko3200 : public SpeakerJocko {
+public:
+	virtual Common::String getClassName() { return "SpeakerJocko3200"; }
 	virtual void proc15();
 };
 
-class SpeakerTeal300 : public VisualSpeaker {
+class SpeakerJocko3220 : public SpeakerJocko {
 public:
-	SpeakerTeal300();
-
-	virtual Common::String getClassName() { return "SpeakerTeal300"; }
+	virtual Common::String getClassName() { return "SpeakerJocko3220"; }
 	virtual void proc15();
 };
 
-class SpeakerSoldier300 : public VisualSpeaker {
+class SpeakerJocko3230 : public SpeakerJocko {
 public:
-	SpeakerSoldier300();
-
-	virtual Common::String getClassName() { return "SpeakerSoldier300"; }
+	virtual Common::String getClassName() { return "SpeakerJocko3230"; }
 	virtual void proc15();
 };
 
-class SpeakerQuinn2350 : public VisualSpeaker {
-public:
-	SpeakerQuinn2350();
+// Classes related to Miranda
 
-	virtual Common::String getClassName() { return "SpeakerQuinn2350"; }
+class SpeakerMiranda : public VisualSpeaker {
+public:
+	SpeakerMiranda();
+	virtual Common::String getClassName() { return "SpeakerMiranda"; }
 };
 
-class SpeakerPharisha2350 : public VisualSpeaker {
+class SpeakerMiranda300 : public SpeakerMiranda {
 public:
-	SpeakerPharisha2350();
-
-	virtual Common::String getClassName() { return "SpeakerPharisha2350"; }
+	virtual Common::String getClassName() { return "SpeakerMiranda300"; }
+	virtual void proc15();
 };
 
-class SpeakerQuinn2435 : public VisualSpeaker {
+class SpeakerMiranda3255 : public SpeakerMiranda {
 public:
-	SpeakerQuinn2435();
-
-	virtual Common::String getClassName() { return "SpeakerQuinn2435"; }
+	virtual Common::String getClassName() { return "SpeakerMiranda3255"; }
 	virtual void proc15();
 };
 
-class SpeakerSeeker2435 : public VisualSpeaker {
+class SpeakerMiranda3375 : public SpeakerMiranda {
 public:
-	SpeakerSeeker2435();
-
-	virtual Common::String getClassName() { return "SpeakerSeeker2435"; }
+	virtual Common::String getClassName() { return "SpeakerMiranda3375"; }
 	virtual void proc15();
 };
 
-class SpeakerPharisha2435 : public VisualSpeaker {
+class SpeakerMiranda3385 : public SpeakerMiranda {
 public:
-	SpeakerPharisha2435();
-
-	virtual Common::String getClassName() { return "SpeakerPharisha2435"; }
+	virtual Common::String getClassName() { return "SpeakerMiranda3385"; }
 	virtual void proc15();
 };
 
-class SpeakerQuinn2450 : public VisualSpeaker {
+class SpeakerMiranda3400 : public SpeakerMiranda {
 public:
-	SpeakerQuinn2450();
-
-	virtual Common::String getClassName() { return "SpeakerQuinn2450"; }
+	virtual Common::String getClassName() { return "SpeakerMiranda3400"; }
 	virtual void proc15();
 };
 
-class SpeakerSeeker2450 : public VisualSpeaker {
+class SpeakerMiranda3700 : public SpeakerMiranda {
 public:
-	SpeakerSeeker2450();
-
-	virtual Common::String getClassName() { return "SpeakerSeeker2450"; }
+	virtual Common::String getClassName() { return "SpeakerMiranda3700"; }
 	virtual void proc15();
 };
 
-class SpeakerCaretaker2450 : public VisualSpeaker {
-public:
-	SpeakerCaretaker2450();
+// Classes related to Nej
 
-	virtual Common::String getClassName() { return "SpeakerCaretaker2450"; }
+class SpeakerNej : public VisualSpeaker {
+public:
+	SpeakerNej();
+	virtual Common::String getClassName() { return "SpeakerNej"; }
 };
 
-class SpeakerQuinn2500 : public VisualSpeaker {
+class SpeakerNej2700 : public SpeakerNej {
 public:
-	SpeakerQuinn2500();
-
-	virtual Common::String getClassName() { return "SpeakerQuinn2500"; }
+	virtual Common::String getClassName() { return "SpeakerNej2700"; }
+	virtual void proc15();
 };
 
-class SpeakerSeeker2500 : public VisualSpeaker {
+class SpeakerNej2750 : public SpeakerNej {
 public:
-	SpeakerSeeker2500();
-
-	virtual Common::String getClassName() { return "SpeakerSeeker2500"; }
+	virtual Common::String getClassName() { return "SpeakerNej2750"; }
+	virtual void proc15();
 };
 
-class SpeakerMiranda2500 : public VisualSpeaker {
+class SpeakerNej2800 : public SpeakerNej {
 public:
-	SpeakerMiranda2500();
-
-	virtual Common::String getClassName() { return "SpeakerMiranda2500"; }
+	virtual Common::String getClassName() { return "SpeakerNej2800"; }
+	virtual void proc15();
 };
 
-class SpeakerWebbster2500 : public VisualSpeaker {
+// Classes related to Pharisha
+
+class SpeakerPharisha : public VisualSpeaker {
 public:
-	SpeakerWebbster2500();
+	SpeakerPharisha();
 
-	virtual Common::String getClassName() { return "SpeakerWebbster2500"; }
+	virtual Common::String getClassName() { return "SpeakerPharisha"; }
 };
 
-class SpeakerQuinn2700 : public VisualSpeaker {
+class SpeakerPharisha2435 : public SpeakerPharisha {
 public:
-	SpeakerQuinn2700();
-
-	virtual Common::String getClassName() { return "SpeakerQuinn2700"; }
+	virtual Common::String getClassName() { return "SpeakerPharisha2435"; }
 	virtual void proc15();
 };
 
-class SpeakerNej2700 : public VisualSpeaker {
+// Classes related to Private
+
+class SpeakerPrivate3210 : public VisualSpeaker {
 public:
-	SpeakerNej2700();
+	SpeakerPrivate3210();
 
-	virtual Common::String getClassName() { return "SpeakerNej2700"; }
+	virtual Common::String getClassName() { return "SpeakerPrivate3210"; }
 	virtual void proc15();
 };
 
-class SpeakerQuinn2750 : public VisualSpeaker {
-public:
-	SpeakerQuinn2750();
+// Classes related to Quinn
 
-	virtual Common::String getClassName() { return "SpeakerQuinn2750"; }
-	virtual void proc15();
+class SpeakerQuinn : public VisualSpeaker {
+public:
+	SpeakerQuinn();
+	virtual Common::String getClassName() { return "SpeakerQuinn"; }
 };
 
-class SpeakerNej2750 : public VisualSpeaker {
+class SpeakerQuinn300 : public SpeakerQuinn {
 public:
-	SpeakerNej2750();
-
-	virtual Common::String getClassName() { return "SpeakerNej2750"; }
+	virtual Common::String getClassName() { return "SpeakerQuinn300"; }
 	virtual void proc15();
 };
 
-class SpeakerQuinn2800 : public VisualSpeaker {
+class SpeakerQuinn2435 : public SpeakerQuinn {
 public:
-	SpeakerQuinn2800();
-
-	virtual Common::String getClassName() { return "SpeakerQuinn2800"; }
+	virtual Common::String getClassName() { return "SpeakerQuinn2435"; }
 	virtual void proc15();
 };
 
-class SpeakerNej2800 : public VisualSpeaker {
+class SpeakerQuinn2450 : public SpeakerQuinn {
 public:
-	SpeakerNej2800();
-
-	virtual Common::String getClassName() { return "SpeakerNej2800"; }
+	virtual Common::String getClassName() { return "SpeakerQuinn2450"; }
 	virtual void proc15();
 };
 
-class SpeakerGuard2800 : public VisualSpeaker {
+class SpeakerQuinn2700 : public SpeakerQuinn {
 public:
-	SpeakerGuard2800();
-
-	virtual Common::String getClassName() { return "SpeakerGuard2800"; }
+	virtual Common::String getClassName() { return "SpeakerQuinn2700"; }
 	virtual void proc15();
 };
 
-class SpeakerGuard3100 : public VisualSpeaker {
+class SpeakerQuinn2750 : public SpeakerQuinn {
 public:
-	SpeakerGuard3100();
-
-	virtual Common::String getClassName() { return "SpeakerGuard3100"; }
+	virtual Common::String getClassName() { return "SpeakerQuinn2750"; }
+	virtual void proc15();
 };
 
-class SpeakerRocko3200 : public VisualSpeaker {
+class SpeakerQuinn2800 : public SpeakerQuinn {
 public:
-	SpeakerRocko3200();
-
-	virtual Common::String getClassName() { return "SpeakerRocko3200"; }
+	virtual Common::String getClassName() { return "SpeakerQuinn2800"; }
 	virtual void proc15();
 };
 
-class SpeakerJocko3200 : public VisualSpeaker {
+class SpeakerQuinn3255 : public SpeakerQuinn {
 public:
-	SpeakerJocko3200();
-
-	virtual Common::String getClassName() { return "SpeakerJocko3200"; }
+	virtual Common::String getClassName() { return "SpeakerQuinn3255"; }
 	virtual void proc15();
 };
 
-class SpeakerSocko3200 : public VisualSpeaker {
+class SpeakerQuinn3375 : public SpeakerQuinn {
 public:
-	SpeakerSocko3200();
-
-	virtual Common::String getClassName() { return "SpeakerSocko3200"; }
+	virtual Common::String getClassName() { return "SpeakerQuinn3375"; }
 	virtual void proc15();
 };
 
-class SpeakerCaptain3210 : public VisualSpeaker {
+class SpeakerQuinn3385 : public SpeakerQuinn {
 public:
-	SpeakerCaptain3210();
-
-	virtual Common::String getClassName() { return "SpeakerCaptain3210"; }
+	virtual Common::String getClassName() { return "SpeakerQuinn3385"; }
 	virtual void proc15();
 };
 
-class SpeakerPrivate3210 : public VisualSpeaker {
+class SpeakerQuinn3400 : public SpeakerQuinn {
 public:
-	SpeakerPrivate3210();
-
-	virtual Common::String getClassName() { return "SpeakerPrivate3210"; }
+	virtual Common::String getClassName() { return "SpeakerQuinn3400"; }
 	virtual void proc15();
 };
 
-class SpeakerRocko3220 : public VisualSpeaker {
+class SpeakerQuinn3700 : public SpeakerQuinn {
 public:
-	SpeakerRocko3220();
-
-	virtual Common::String getClassName() { return "SpeakerRocko3220"; }
+	virtual Common::String getClassName() { return "SpeakerQuinn3700"; }
+	virtual void setText(const Common::String &msg);
 	virtual void proc15();
 };
 
-class SpeakerJocko3220 : public VisualSpeaker {
+// Classes related to QuinnL
+
+class SpeakerQuinnL : public VisualSpeaker {
 public:
-	SpeakerJocko3220();
+	SpeakerQuinnL();
 
-	virtual Common::String getClassName() { return "SpeakerJocko3220"; }
-	virtual void proc15();
+	virtual Common::String getClassName() { return "SpeakerQuinnL"; }
 };
 
-class SpeakerRocko3230 : public VisualSpeaker {
+// Classes related to Ralf
+
+class SpeakerRalf3245 : public VisualSpeaker {
 public:
-	SpeakerRocko3230();
+	SpeakerRalf3245();
 
-	virtual Common::String getClassName() { return "SpeakerRocko3230"; }
+	virtual Common::String getClassName() { return "SpeakerRalf3245"; }
 	virtual void proc15();
 };
 
-class SpeakerJocko3230 : public VisualSpeaker {
-public:
-	SpeakerJocko3230();
+// Classes related to Rocko
 
-	virtual Common::String getClassName() { return "SpeakerJocko3230"; }
-	virtual void proc15();
+class SpeakerRocko : public VisualSpeaker {
+public:
+	SpeakerRocko();
+	virtual Common::String getClassName() { return "SpeakerRocko"; }
 };
 
-class SpeakerTeal3240 : public VisualSpeaker {
+class SpeakerRocko3200 : public SpeakerRocko {
 public:
-	SpeakerTeal3240();
-
-	virtual Common::String getClassName() { return "SpeakerTeal3240"; }
+	virtual Common::String getClassName() { return "SpeakerRocko3200"; }
 	virtual void proc15();
 };
 
-class SpeakerWebbster3240 : public VisualSpeaker {
+class SpeakerRocko3220 : public SpeakerRocko {
 public:
-	SpeakerWebbster3240();
-
-	virtual Common::String getClassName() { return "SpeakerWebbster3240"; }
+	virtual Common::String getClassName() { return "SpeakerRocko3220"; }
 	virtual void proc15();
 };
 
-class SpeakerRalf3245 : public VisualSpeaker {
+class SpeakerRocko3230 : public SpeakerRocko {
 public:
-	SpeakerRalf3245();
-
-	virtual Common::String getClassName() { return "SpeakerRalf3245"; }
+	virtual Common::String getClassName() { return "SpeakerRocko3230"; }
 	virtual void proc15();
 };
 
-class SpeakerTomko3245 : public VisualSpeaker {
-public:
-	SpeakerTomko3245();
+// Classes related to Seeker
 
-	virtual Common::String getClassName() { return "SpeakerTomko3245"; }
-	virtual void proc15();
+class SpeakerSeeker : public VisualSpeaker {
+public:
+	SpeakerSeeker();
+	virtual Common::String getClassName() { return "SpeakerSeeker"; }
 };
 
-class SpeakerQuinn3255 : public VisualSpeaker {
+class SpeakerSeeker300 : public SpeakerSeeker {
 public:
-	SpeakerQuinn3255();
-
-	virtual Common::String getClassName() { return "SpeakerQuinn3255"; }
+	virtual Common::String getClassName() { return "SpeakerSeeker300"; }
 	virtual void proc15();
 };
 
-class SpeakerMiranda3255 : public VisualSpeaker {
+class SpeakerSeeker2435 : public SpeakerSeeker {
 public:
-	SpeakerMiranda3255();
-
-	virtual Common::String getClassName() { return "SpeakerMiranda3255"; }
+	virtual Common::String getClassName() { return "SpeakerSeeker2435"; }
 	virtual void proc15();
 };
 
-class SpeakerQuinn3375 : public VisualSpeaker {
+class SpeakerSeeker2450 : public SpeakerSeeker {
 public:
-	SpeakerQuinn3375();
-
-	virtual Common::String getClassName() { return "SpeakerQuinn3375"; }
+	virtual Common::String getClassName() { return "SpeakerSeeker2450"; }
 	virtual void proc15();
 };
 
-class SpeakerSeeker3375 : public VisualSpeaker {
+class SpeakerSeeker3375 : public SpeakerSeeker {
 public:
-	SpeakerSeeker3375();
-
 	virtual Common::String getClassName() { return "SpeakerSeeker3375"; }
 	virtual void proc15();
 };
 
-class SpeakerMiranda3375 : public VisualSpeaker {
+class SpeakerSeeker3385 : public SpeakerSeeker {
 public:
-	SpeakerMiranda3375();
-
-	virtual Common::String getClassName() { return "SpeakerMiranda3375"; }
+	virtual Common::String getClassName() { return "SpeakerSeeker3385"; }
 	virtual void proc15();
 };
 
-class SpeakerWebbster3375 : public VisualSpeaker {
+class SpeakerSeeker3400 : public SpeakerSeeker {
 public:
-	SpeakerWebbster3375();
-
-	virtual Common::String getClassName() { return "SpeakerWebbster3375"; }
+	virtual Common::String getClassName() { return "SpeakerSeeker3400"; }
 	virtual void proc15();
 };
 
-class SpeakerQuinn3385 : public VisualSpeaker {
+class SpeakerSeeker3700 : public SpeakerSeeker {
 public:
-	SpeakerQuinn3385();
-
-	virtual Common::String getClassName() { return "SpeakerQuinn3385"; }
+	virtual Common::String getClassName() { return "SpeakerSeeker3700"; }
+	virtual void setText(const Common::String &msg);
 	virtual void proc15();
 };
 
-class SpeakerSeeker3385 : public VisualSpeaker {
+// Classes related to SeekerL
+
+class SpeakerSeekerL : public VisualSpeaker {
 public:
-	SpeakerSeeker3385();
+	SpeakerSeekerL();
 
-	virtual Common::String getClassName() { return "SpeakerSeeker3385"; }
-	virtual void proc15();
+	virtual Common::String getClassName() { return "SpeakerSeekerL"; }
 };
 
-class SpeakerMiranda3385 : public VisualSpeaker {
+// Classes related to Socko
+
+class SpeakerSocko3200 : public VisualSpeaker {
 public:
-	SpeakerMiranda3385();
+	SpeakerSocko3200();
 
-	virtual Common::String getClassName() { return "SpeakerMiranda3385"; }
+	virtual Common::String getClassName() { return "SpeakerSocko3200"; }
 	virtual void proc15();
 };
 
-class SpeakerWebbster3385 : public VisualSpeaker {
+// Classes related to Soldier
+
+class SpeakerSoldier300 : public VisualSpeaker {
 public:
-	SpeakerWebbster3385();
+	SpeakerSoldier300();
 
-	virtual Common::String getClassName() { return "SpeakerWebbster3385"; }
+	virtual Common::String getClassName() { return "SpeakerSoldier300"; }
 	virtual void proc15();
 };
 
-class SpeakerQuinn3400 : public VisualSpeaker {
+// Classes related to Teal
+
+class SpeakerTeal : public VisualSpeaker {
 public:
-	SpeakerQuinn3400();
+	SpeakerTeal();
+	virtual Common::String getClassName() { return "SpeakerTeal"; }
+};
 
-	virtual Common::String getClassName() { return "SpeakerQuinn3400"; }
+class SpeakerTeal300 : public SpeakerTeal {
+public:
+	virtual Common::String getClassName() { return "SpeakerTeal300"; }
 	virtual void proc15();
 };
 
-class SpeakerSeeker3400 : public VisualSpeaker {
+class SpeakerTeal3240 : public SpeakerTeal {
 public:
-	SpeakerSeeker3400();
+	virtual Common::String getClassName() { return "SpeakerTeal3240"; }
+	virtual void proc15();
+};
 
-	virtual Common::String getClassName() { return "SpeakerSeeker3400"; }
+class SpeakerTeal3400 : public SpeakerTeal {
+public:
+	virtual Common::String getClassName() { return "SpeakerTeal3400"; }
 	virtual void proc15();
 };
 
-class SpeakerMiranda3400 : public VisualSpeaker {
+// Classes related to Tomko
+
+class SpeakerTomko3245 : public VisualSpeaker {
 public:
-	SpeakerMiranda3400();
+	SpeakerTomko3245();
 
-	virtual Common::String getClassName() { return "SpeakerMiranda3400"; }
+	virtual Common::String getClassName() { return "SpeakerTomko3245"; }
 	virtual void proc15();
 };
 
-class SpeakerWebbster3400 : public VisualSpeaker {
+// Classes related to Webbster
+
+class SpeakerWebbster : public VisualSpeaker {
 public:
-	SpeakerWebbster3400();
+	SpeakerWebbster(int colour);
+	virtual Common::String getClassName() { return "SpeakerWebbster"; }
+};
 
-	virtual Common::String getClassName() { return "SpeakerWebbster3400"; }
-	virtual void proc15();
+class SpeakerWebbster2500 : public SpeakerWebbster {
+public:
+	SpeakerWebbster2500() : SpeakerWebbster(27) {}
+	virtual Common::String getClassName() { return "SpeakerWebbster2500"; }
 };
 
-class SpeakerTeal3400 : public VisualSpeaker {
+class SpeakerWebbster3240 : public SpeakerWebbster {
 public:
-	SpeakerTeal3400();
+	SpeakerWebbster3240() : SpeakerWebbster(10) {};
 
-	virtual Common::String getClassName() { return "SpeakerTeal3400"; }
+	virtual Common::String getClassName() { return "SpeakerWebbster3240"; }
 	virtual void proc15();
 };
 
-class SpeakerQuinn3700 : public VisualSpeaker {
+class SpeakerWebbster3375 : public SpeakerWebbster {
 public:
-	SpeakerQuinn3700();
+	SpeakerWebbster3375() : SpeakerWebbster(60) {};
 
-	virtual Common::String getClassName() { return "SpeakerQuinn3700"; }
-	virtual void setText(const Common::String &msg);
+	virtual Common::String getClassName() { return "SpeakerWebbster3375"; }
 	virtual void proc15();
 };
 
-class SpeakerSeeker3700 : public VisualSpeaker {
+class SpeakerWebbster3385 : public SpeakerWebbster {
 public:
-	SpeakerSeeker3700();
+	SpeakerWebbster3385() : SpeakerWebbster(60) {};
 
-	virtual Common::String getClassName() { return "SpeakerSeeker3700"; }
-	virtual void setText(const Common::String &msg);
+	virtual Common::String getClassName() { return "SpeakerWebbster3385"; }
 	virtual void proc15();
 };
 
-class SpeakerMiranda3700 : public VisualSpeaker {
+class SpeakerWebbster3400 : public SpeakerWebbster {
 public:
-	SpeakerMiranda3700();
+	SpeakerWebbster3400() : SpeakerWebbster(27) {};
 
-	virtual Common::String getClassName() { return "SpeakerMiranda3700"; }
+	virtual Common::String getClassName() { return "SpeakerWebbster3400"; }
 	virtual void proc15();
 };
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 3234c3c1f3747f6eff5c55858c1fe02cf06a56f4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 30 Dec 2011 17:47:04 +0100
Subject: TSAGE: R2R - Implement scene 3395, fix some glitches in scene 3385

---
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   2 +-
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 230 ++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes3.h    |  42 +++++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 198 +++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   |  26 +++
 5 files changed, 493 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 4952cf1831..537b34b4bb 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -221,7 +221,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 3385:
 		return new Scene3385();
 	case 3395:
-		error("Missing scene %d from group 3", sceneNumber);
+		return new Scene3395();
 	case 3400:
 		return new Scene3400();
 	case 3500:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index db1b9b6c21..61fc6a7796 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -2270,11 +2270,12 @@ void Scene3385::Exit1::changeScene() {
 }
 
 void Scene3385::Action1::signal() {
+	int v = _actionIndex;
 	++_actionIndex;
-	
-	if (_actionIndex == 0)
+
+	if (v == 0)
 		setDelay(1);
-	else if (_actionIndex == 1)
+	else if (v == 1)
 		R2_GLOBALS._sound2.play(314);
 }
 
@@ -2341,7 +2342,7 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 	_actor2._moveDiff = Common::Point(3, 2);
 	_actor2.changeZoom(-1);
 	_actor2._effect = 1;
-	if (R2_GLOBALS._player._characterIndex == 2)
+	if (R2_GLOBALS._player._characterIndex == 3)
 		_actor2.setup(10, _field11B2, 1);
 	else
 		_actor2.setup(30, _field11B2, 1);
@@ -2408,6 +2409,227 @@ void Scene3385::signal() {
 			R2_GLOBALS._player.setStrip(3);
 		else
 			R2_GLOBALS._player.setStrip(4);
+		R2_GLOBALS._player.enableControl(CURSOR_TALK);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	}
+}
+
+/*--------------------------------------------------------------------------
+ * Scene 3395 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene3395::Scene3395() {
+	_field142E = 0;
+}
+
+void Scene3395::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field142E);
+}
+
+bool Scene3395::Actor1::startAction(CursorType action, Event &event) {
+	Scene3395 *scene = (Scene3395 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_TALK)
+		return SceneActor::startAction(action, event);
+	
+	scene->_sceneMode = 9999;
+	if (R2_GLOBALS._player._characterIndex == 2)
+		scene->_stripManager.start(3302, scene);
+	else
+		scene->_stripManager.start(3304, scene);
+	
+	return true;
+}
+
+bool Scene3395::Actor2::startAction(CursorType action, Event &event) {
+	Scene3395 *scene = (Scene3395 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_TALK)
+		return SceneActor::startAction(action, event);
+	
+	scene->_sceneMode = 9999;
+	if (R2_GLOBALS._player._characterIndex == 3)
+		scene->_stripManager.start(3302, scene);
+	else
+		scene->_stripManager.start(3301, scene);
+	
+	return true;
+}
+
+bool Scene3395::Actor3::startAction(CursorType action, Event &event) {
+	Scene3395 *scene = (Scene3395 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_TALK)
+		return SceneActor::startAction(action, event);
+	
+	scene->_sceneMode = 9999;
+	scene->_stripManager.start(3303, scene);
+	
+	return true;
+}
+
+bool Scene3395::Actor4::startAction(CursorType action, Event &event) {
+	Scene3395 *scene = (Scene3395 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	if (R2_GLOBALS._sceneManager._previousScene == 3385)
+		R2_GLOBALS._sound2.play(314);
+
+	scene->_sceneMode = 3396;
+	scene->setAction(&scene->_sequenceManager, scene, 3396, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL);
+	
+	return true;
+}
+
+void Scene3395::Action1::signal() {
+	int v = _actionIndex;
+	++_actionIndex;
+
+	if (v == 0)
+		setDelay(2);
+	else if (v == 1)
+		R2_GLOBALS._sound2.play(314);
+}
+
+void Scene3395::postInit(SceneObjectList *OwnerList) {
+	loadScene(3395);
+	SceneExt::postInit();
+
+	R2_GLOBALS._sound1.play(313);
+
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+	_stripManager.addSpeaker(&_mirandaSpeaker);
+	_stripManager.addSpeaker(&_webbsterSpeaker);
+
+	R2_GLOBALS._player._characterScene[1] = 3395;
+	R2_GLOBALS._player._characterScene[2] = 3395;
+	R2_GLOBALS._player._characterScene[3] = 3395;
+
+	if (R2_GLOBALS._sceneManager._previousScene == 3385)
+		_field142E = 3;
+	else
+		_field142E = 4;
+
+	setZoomPercents(51, 40, 200, 137);
+	R2_GLOBALS._player.postInit();
+	
+	if (R2_GLOBALS._player._characterIndex == 2)
+		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+	else
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+
+	R2_GLOBALS._player.changeZoom(-1);
+	
+	if (R2_GLOBALS._player._characterIndex == 2)
+		R2_GLOBALS._player.setup(20, _field142E, 1);
+	else if (R2_GLOBALS._player._characterIndex == 3)
+		R2_GLOBALS._player.setup(30, _field142E, 1);
+	else
+		R2_GLOBALS._player.setup(10, _field142E, 1);
+	
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.disableControl();
+
+	_actor1.postInit();
+	if (R2_GLOBALS._player._characterIndex == 2) {
+		_actor1._moveRate = 10;
+		_actor1._moveDiff = Common::Point(3, 2);
+	} else {
+		_actor1._moveRate = 7;
+		_actor1._moveDiff = Common::Point(5, 3);
+	}
+	_actor1.changeZoom(-1);
+	_actor1._effect = 1;
+	if (R2_GLOBALS._player._characterIndex == 2)
+		_actor1.setup(10, _field142E, 1);
+	else
+		_actor1.setup(20, _field142E, 1);
+	_actor1.animate(ANIM_MODE_1, NULL);
+	_actor1.setDetails(3395, -1, -1, -1, 1, (SceneItem *) NULL);
+
+	_actor2.postInit();
+	_actor2._moveDiff = Common::Point(3, 2);
+	_actor2.changeZoom(-1);
+	_actor2._effect = 1;
+	if (R2_GLOBALS._player._characterIndex == 3)
+		_actor2.setup(10, _field142E, 1);
+	else
+		_actor2.setup(30, _field142E, 1);
+	_actor2.animate(ANIM_MODE_1, NULL);
+	_actor2.setDetails(3395, -1, -1, -1, 1, (SceneItem *) NULL);
+
+	_actor3.postInit();
+	_actor3._moveDiff = Common::Point(3, 2);
+	_actor3.changeZoom(-1);
+	_actor3._effect = 1;
+	_actor3.setup(40, _field142E, 1);
+	_actor3.animate(ANIM_MODE_1, NULL);
+	_actor3.setDetails(3385, 18, -1, -1, 1, (SceneItem *) NULL);
+	
+	_actor4.postInit();
+	_actor4.setPosition(Common::Point(159, 50));
+	_actor4.fixPriority(40);
+	_actor4.setDetails(3395, 6, 7, -1, 1, (SceneItem *) NULL);
+
+	if (R2_GLOBALS._sceneManager._previousScene == 3385) {
+		R2_GLOBALS._player.setPosition(Common::Point(158, 53));
+		_actor1.setPosition(Common::Point(164, 51));
+		_actor1.fixPriority(48);
+		_actor2.setPosition(Common::Point(150, 51));
+		_actor2.fixPriority(47);
+		_actor3.setPosition(Common::Point(158, 51));
+		_actor3.fixPriority(46);
+		_sceneMode = 3394;
+		_actor4.setup(3395, 1, 7);
+		_actor4.animate(ANIM_MODE_6, this);
+		setAction(&_action1, &_actor4);
+	} else {
+		R2_GLOBALS._player.setPosition(Common::Point(158, 200));
+		_actor1.setPosition(Common::Point(191, 255));
+		_actor2.setPosition(Common::Point(124, 240));
+		_actor3.setPosition(Common::Point(155, 242));
+		_actor4.setup(3395, 1, 1);
+
+		R2_GLOBALS._walkRegions.enableRegion(1);
+
+		_sceneMode = 3395;
+		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL);
+	}
+
+	for (int i = 0; i <= 12; i++) {
+		_itemArray[i].setDetails(i, 3995, 0, -1, -1);
+	}
+
+	_item1.setDetails(Rect(0, 0, 320, 200), 3395, 3, -1, -1, 1, NULL);
+}
+
+void Scene3395::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene3395::signal() {
+	switch (_sceneMode) {
+	case 3396:
+		R2_GLOBALS._sceneManager.changeScene(3385);
+		break;
+	case 9999:
+		if (R2_GLOBALS._sceneManager._previousScene == 3385)
+			R2_GLOBALS._player.setStrip(3);
+		else
+			R2_GLOBALS._player.setStrip(4);
+		R2_GLOBALS._player.enableControl(CURSOR_TALK);
 		break;
 	default:
 		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 812ab800cc..4b336b2dde 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -504,6 +504,48 @@ public:
 	virtual void synchronize(Serializer &s);
 };
 
+class Scene3395 : public SceneExt {
+	class Actor1 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor2 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor3 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor4 : public SceneActor {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Action1: public Action {
+	public:
+		virtual void signal();
+	};
+
+public:
+	SpeakerQuinn3395 _quinnSpeaker;
+	SpeakerSeeker3395 _seekerSpeaker;
+	SpeakerMiranda3395 _mirandaSpeaker;
+	SpeakerWebbster3395 _webbsterSpeaker;
+	NamedHotspot _item1;
+	NamedHotspot _itemArray[13];
+	Actor1 _actor1;
+	Actor2 _actor2;
+	Actor3 _actor3;
+	Actor4 _actor4;
+	Action1 _action1;
+	SequenceManager _sequenceManager;
+	
+	int _field142E;
+
+	Scene3395();
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void synchronize(Serializer &s);
+};
+
 class Scene3400 : public SceneExt {
 public:
 	SpeakerQuinn3400 _quinnSpeaker;
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 7f5cdc1328..ab5868a409 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -547,6 +547,56 @@ void SpeakerMiranda3385::proc15() {
 	}
 }
 
+void SpeakerMiranda3395::proc15() {
+	Scene3395 *scene = (Scene3395 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 3) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor2;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (R2_GLOBALS._sceneManager._previousScene == 3385)
+			R2_GLOBALS._player.setStrip(4);
+		else
+			R2_GLOBALS._player.setStrip(3);
+
+		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+	
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4051, 5, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 void SpeakerMiranda3400::proc15() {
 	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1173,6 +1223,61 @@ void SpeakerQuinn3385::proc15() {
 	}
 }
 
+void SpeakerQuinn3395::proc15() {
+	Scene3395 *scene = (Scene3395 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 1) 
+			_object2 = &R2_GLOBALS._player;
+		else if (R2_GLOBALS._player._characterIndex == 2) 
+			_object2 = &scene->_actor1;
+		else
+			_object2 = &scene->_actor2;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (R2_GLOBALS._sceneManager._previousScene == 3385)
+			R2_GLOBALS._player.setStrip(4);
+		else
+			R2_GLOBALS._player.setStrip(3);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+	
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		if (R2_GLOBALS._player._characterIndex == 2)
+			_object1.setup(4010, 3, 1);
+		else
+			_object1.setup(4010, 5, 1);
+
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 void SpeakerQuinn3400::proc15() {
 	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1647,6 +1752,55 @@ void SpeakerSeeker3385::proc15() {
 	}
 }
 
+void SpeakerSeeker3395::proc15() {
+	Scene3395 *scene = (Scene3395 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 2) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor1;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (R2_GLOBALS._sceneManager._previousScene == 3385)
+			R2_GLOBALS._player.setStrip(4);
+		else
+			R2_GLOBALS._player.setStrip(3);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+	
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4031, 3, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 void SpeakerSeeker3400::proc15() {
 	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
@@ -2160,6 +2314,50 @@ void SpeakerWebbster3385::proc15() {
 	}
 }
 
+void SpeakerWebbster3395::proc15() {
+	Scene3395 *scene = (Scene3395 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &scene->_actor3;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		
+		if (R2_GLOBALS._sceneManager._previousScene == 3385)
+			R2_GLOBALS._player.setStrip(4);
+		else
+			R2_GLOBALS._player.setStrip(3);
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		R2_GLOBALS._player.disableControl(CURSOR_TALK);
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4110, 5, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 void SpeakerWebbster3400::proc15() {
 	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 3020b19431..3a58917c44 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -154,6 +154,12 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerMiranda3395 : public SpeakerMiranda {
+public:
+	virtual Common::String getClassName() { return "SpeakerMiranda3395"; }
+	virtual void proc15();
+};
+
 class SpeakerMiranda3400 : public SpeakerMiranda {
 public:
 	virtual Common::String getClassName() { return "SpeakerMiranda3400"; }
@@ -279,6 +285,12 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerQuinn3395 : public SpeakerQuinn {
+public:
+	virtual Common::String getClassName() { return "SpeakerQuinn3395"; }
+	virtual void proc15();
+};
+
 class SpeakerQuinn3400 : public SpeakerQuinn {
 public:
 	virtual Common::String getClassName() { return "SpeakerQuinn3400"; }
@@ -375,6 +387,12 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerSeeker3395 : public SpeakerSeeker {
+public:
+	virtual Common::String getClassName() { return "SpeakerSeeker3395"; }
+	virtual void proc15();
+};
+
 class SpeakerSeeker3400 : public SpeakerSeeker {
 public:
 	virtual Common::String getClassName() { return "SpeakerSeeker3400"; }
@@ -491,6 +509,14 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerWebbster3395 : public SpeakerWebbster {
+public:
+	SpeakerWebbster3395() : SpeakerWebbster(60) {};
+
+	virtual Common::String getClassName() { return "SpeakerWebbster3395"; }
+	virtual void proc15();
+};
+
 class SpeakerWebbster3400 : public SpeakerWebbster {
 public:
 	SpeakerWebbster3400() : SpeakerWebbster(27) {};
-- 
cgit v1.2.3


From 40b68b41c7a507dad5a1d38813bfa7f89e7c6551 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Fri, 30 Dec 2011 11:50:15 -0600
Subject: KEYMAPPER: Make engine keymap init and cleanup more generic

---
 engines/engine.cpp   |  8 ++++++++
 engines/engine.h     |  7 ++++++-
 engines/kyra/lol.cpp | 10 +++-------
 3 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/engine.cpp b/engines/engine.cpp
index e4e4630841..4811ba6917 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -45,6 +45,8 @@
 #include "common/textconsole.h"
 #include "common/translation.h"
 
+#include "backends/keymapper/keymapper.h"
+
 #include "gui/debugger.h"
 #include "gui/dialog.h"
 #include "gui/message.h"
@@ -499,6 +501,12 @@ void Engine::syncSoundSettings() {
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech);
 }
 
+void Engine::deinitKeymap() {
+#ifdef ENABLE_KEYMAPPER
+	_eventMan->getKeymapper()->cleanupGameKeymaps();
+#endif
+}
+
 void Engine::flipMute() {
 	// Mute will be set to true by default here. This has two reasons:
 	// - if the game already has an "mute" config entry, it will be overwritten anyway.
diff --git a/engines/engine.h b/engines/engine.h
index d508b4ed18..a020dc4951 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -181,10 +181,15 @@ public:
 	virtual void syncSoundSettings();
 
 	/*
-	 * Initialize the engine-specific keymap
+	 * Initialize any engine-specific keymaps.
 	 */
 	virtual void initKeymap() {}
 
+	/*
+	 * Cleanup any engine-specific keymaps.
+	 */
+	virtual void deinitKeymap();
+
 	/**
 	 * Flip mute all sound option.
 	 */
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 62143e5f72..db71b80611 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -212,10 +212,6 @@ LoLEngine::~LoLEngine() {
 	setupPrologueData(false);
 	releaseTempData();
 
-#ifdef ENABLE_KEYMAPPER
-	_eventMan->getKeymapper()->cleanupGameKeymaps();
-#endif
-
 	delete[] _landsFile;
 	delete[] _levelLangFile;
 
@@ -461,7 +457,9 @@ Common::Error LoLEngine::init() {
 	_spellProcs.push_back(new SpellProc(this, 0));
 	_spellProcs.push_back(new SpellProc(this, &LoLEngine::castGuardian));
 
-	initKeymap();
+#ifdef ENABLE_KEYMAPPER
+	_eventMan->getKeymapper()->pushKeymap(kKeymapName, true);
+#endif
 
 	return Common::kNoError;
 }
@@ -503,8 +501,6 @@ void LoLEngine::initKeymap() {
 
 	mapper->addGameKeymap(engineKeyMap);
 
-	mapper->pushKeymap(kKeymapName, true);
-
 #endif
 }
 
-- 
cgit v1.2.3


From 366a942a3a3dd9c3005c0f29d9e0b498eaf976ef Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Fri, 30 Dec 2011 13:03:39 -0600
Subject: KEYMAPPER: Simplify calling getKeymap

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

(limited to 'engines')

diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index db71b80611..b36f598649 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -467,11 +467,10 @@ Common::Error LoLEngine::init() {
 void LoLEngine::initKeymap() {
 #ifdef ENABLE_KEYMAPPER
 
-	bool tmp;
 	Common::Keymapper *mapper = _eventMan->getKeymapper();
 
 	// Do not try to recreate same keymap over again
-	if (mapper->getKeymap(kKeymapName, tmp) != 0)
+	if (mapper->getKeymap(kKeymapName) != 0)
 		return;
 
 	Common::Action *act;
-- 
cgit v1.2.3


From 7d00a997cd064469e975b3453974d811abb4127e Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Fri, 30 Dec 2011 13:20:39 -0600
Subject: KYRA: Fix typo bug and code cleanup in the keymapper game keymap

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

(limited to 'engines')

diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index b36f598649..290c3bad26 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -477,9 +477,9 @@ void LoLEngine::initKeymap() {
 	Common::Keymap *engineKeyMap = new Common::Keymap(kKeymapName);
 
 	const Common::KeyActionEntry keyActionEntries[] = {
-		{Common::KeyState(Common::KEYCODE_F1, Common::ASCII_F1, 0), "AT1", _("Attack 1")},
-		{Common::KeyState(Common::KEYCODE_F2, Common::ASCII_F2, 0), "AT2", _("Attack 2")},
-		{Common::KeyState(Common::KEYCODE_F3, Common::ASCII_F2, 0), "AT3", _("Attack 3")},
+		{Common::KeyState(Common::KEYCODE_F1, Common::ASCII_F1), "AT1", _("Attack 1")},
+		{Common::KeyState(Common::KEYCODE_F2, Common::ASCII_F2), "AT2", _("Attack 2")},
+		{Common::KeyState(Common::KEYCODE_F3, Common::ASCII_F3), "AT3", _("Attack 3")},
 		{Common::KeyState(Common::KEYCODE_UP), "MVF", _("Move Forward")},
 		{Common::KeyState(Common::KEYCODE_DOWN), "MVB", _("Move Back")},
 		{Common::KeyState(Common::KEYCODE_LEFT), "SLL", _("Slide Left")},
-- 
cgit v1.2.3


From 548a3e25342c44cd8ebaecf7a62968f8b62c15f7 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 30 Dec 2011 20:39:27 +0100
Subject: KYRA: Add basic keymapper support to EoB 1+2.

---
 engines/kyra/eobcommon.cpp | 53 ++++++++++++++++++++++++++++++++++++++++++++++
 engines/kyra/eobcommon.h   |  7 +++++-
 2 files changed, 59 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 15cabd9293..f1a6c5d699 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -30,12 +30,17 @@
 #include "kyra/debugger.h"
 
 #include "common/config-manager.h"
+#include "common/translation.h"
 
 #include "audio/mididrv.h"
 #include "audio/mixer.h"
 
+#include "backends/keymapper/keymapper.h"
+
 namespace Kyra {
 
+const char *const EoBCoreEngine::kKeymapName = "eob";
+
 EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags)
 	: KyraRpgEngine(system, flags), _numLargeItemShapes(flags.gameID == GI_EOB1 ? 14 : 11),
 	  _numSmallItemShapes(flags.gameID == GI_EOB1 ? 23 : 26),
@@ -308,6 +313,50 @@ EoBCoreEngine::~EoBCoreEngine() {
 	_txt = 0;
 }
 
+void EoBCoreEngine::initKeymap() {
+#ifdef ENABLE_KEYMAPPER
+	Common::Keymapper *const mapper = _eventMan->getKeymapper();
+
+	// Do not try to recreate same keymap over again
+	if (mapper->getKeymap(kKeymapName) != 0)
+		return;
+
+	Common::Keymap *const engineKeyMap = new Common::Keymap(kKeymapName);
+
+	const Common::KeyActionEntry keyActionEntries[] = {
+		{ Common::KeyState(Common::KEYCODE_UP), "MVF", _("Move Forward") },
+		{ Common::KeyState(Common::KEYCODE_DOWN), "MVB", _("Move Back") },
+		{ Common::KeyState(Common::KEYCODE_LEFT), "MVL", _("Move Left") },
+		{ Common::KeyState(Common::KEYCODE_RIGHT), "MVR", _("Move Right") },
+		{ Common::KeyState(Common::KEYCODE_HOME), "TL", _("Turn Left") },
+		{ Common::KeyState(Common::KEYCODE_PAGEUP), "TR", _("Turn Right") },
+		{ Common::KeyState(Common::KEYCODE_i), "INV", _("Open/Close Inventory") },
+		{ Common::KeyState(Common::KEYCODE_p), "SCE", _("Switch Inventory/Character screen") },
+		{ Common::KeyState(Common::KEYCODE_c), "CMP", _("Camp") },
+		{ Common::KeyState(Common::KEYCODE_SPACE), "CSP", _("Cast Spell") },
+		// TODO: Spell cursor, but this needs more thought, since different
+		// game versions use different keycodes.
+		{ Common::KeyState(Common::KEYCODE_1), "SL1", _("Spell Level 1") },
+		{ Common::KeyState(Common::KEYCODE_2), "SL2", _("Spell Level 2") },
+		{ Common::KeyState(Common::KEYCODE_3), "SL3", _("Spell Level 3") },
+		{ Common::KeyState(Common::KEYCODE_4), "SL4", _("Spell Level 4") },
+		{ Common::KeyState(Common::KEYCODE_5), "SL5", _("Spell Level 5") }
+	};
+
+	for (uint i = 0; i < ARRAYSIZE(keyActionEntries); ++i) {
+		Common::Action *const act = new Common::Action(engineKeyMap, keyActionEntries[i].id, keyActionEntries[i].description, Common::kGenericActionType, Common::kActionKeyType);
+		act->addKeyEvent(keyActionEntries[i].ks);
+	}
+	
+	if (_flags.gameID == GI_EOB2) {
+		Common::Action *const act = new Common::Action(engineKeyMap, "SL6", _("Spell Level 6"), Common::kGenericActionType, Common::kActionKeyType);
+		act->addKeyEvent(Common::KeyState(Common::KEYCODE_6));
+	}
+
+	mapper->addGameKeymap(engineKeyMap);
+#endif
+}
+
 Common::Error EoBCoreEngine::init() {
 	// In EOB the timer proc is directly invoked via interrupt 0x1c, 18.2 times per second.
 	// This makes a tick length of 54.94.
@@ -439,6 +488,10 @@ Common::Error EoBCoreEngine::init() {
 	// Prevent autosave on game startup
 	_lastAutosave = _system->getMillis();
 
+#ifdef ENABLE_KEYMAPPER
+	_eventMan->getKeymapper()->pushKeymap(kKeymapName, true);
+#endif
+
 	return Common::kNoError;
 }
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index f02b76d267..e7b3a7357a 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -250,6 +250,8 @@ public:
 	EoBCoreEngine(OSystem *system, const GameFlags &flags);
 	virtual ~EoBCoreEngine();
 
+	virtual void initKeymap();
+
 	Screen *screen() { return _screen; }
 	GUI *gui() const { return _gui; }
 
@@ -1127,9 +1129,12 @@ protected:
 	// sound
 	void snd_playSoundEffect(int id, int volume=0xFF);
 	void snd_stopSound();
+
+	// keymap
+	static const char *const kKeymapName;
 };
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
 
-- 
cgit v1.2.3


From 27e38d16ee66367f7589e545c1377825a36e8891 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 30 Dec 2011 20:41:47 +0100
Subject: KYRA: Clean up LoL keymap setup a bit.

---
 engines/kyra/lol.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 290c3bad26..b24ab4fca8 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -466,15 +466,13 @@ Common::Error LoLEngine::init() {
 
 void LoLEngine::initKeymap() {
 #ifdef ENABLE_KEYMAPPER
-
-	Common::Keymapper *mapper = _eventMan->getKeymapper();
+	Common::Keymapper *const mapper = _eventMan->getKeymapper();
 
 	// Do not try to recreate same keymap over again
 	if (mapper->getKeymap(kKeymapName) != 0)
 		return;
 
-	Common::Action *act;
-	Common::Keymap *engineKeyMap = new Common::Keymap(kKeymapName);
+	Common::Keymap *const engineKeyMap = new Common::Keymap(kKeymapName);
 
 	const Common::KeyActionEntry keyActionEntries[] = {
 		{Common::KeyState(Common::KEYCODE_F1, Common::ASCII_F1), "AT1", _("Attack 1")},
@@ -492,14 +490,12 @@ void LoLEngine::initKeymap() {
 		{Common::KeyState(), 0, 0}
 	};
 
-	const Common::KeyActionEntry *entry;
-	for (entry = keyActionEntries; entry->id; ++entry) {
-		act = new Common::Action(engineKeyMap, entry->id, Common::String(entry->description), Common::kGenericActionType, Common::kActionKeyType);
-		act->addKeyEvent(Common::KeyState(entry->ks));
+	for (const Common::KeyActionEntry *entry = keyActionEntries; entry->id; ++entry) {
+		Common::Action *const act = new Common::Action(engineKeyMap, entry->id, entry->description, Common::kGenericActionType, Common::kActionKeyType);
+		act->addKeyEvent(entry->ks);
 	}
 
 	mapper->addGameKeymap(engineKeyMap);
-
 #endif
 }
 
-- 
cgit v1.2.3


From b704e40bae69dcdc54b85e934ec3862d60bfdb5b Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Sat, 31 Dec 2011 00:28:27 +0000
Subject: TSAGE: Close memory leak in savegame thumbnail.

---
 engines/tsage/saveload.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/saveload.cpp b/engines/tsage/saveload.cpp
index e56968acdf..af2f3566ad 100644
--- a/engines/tsage/saveload.cpp
+++ b/engines/tsage/saveload.cpp
@@ -189,6 +189,8 @@ Common::Error Saver::restore(int slot) {
 	// Read in the savegame header
 	tSageSavegameHeader header;
 	readSavegameHeader(saveFile, header);
+	if (header.thumbnail)
+		header.thumbnail->free();
 	delete header.thumbnail;
 
 	serializer.setSaveVersion(header.version);
-- 
cgit v1.2.3


From c822a76a85f6a950d8e04f0c5c16973e2976bf7e Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 31 Dec 2011 04:55:46 +0100
Subject: KYRA: Little cleanup.

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

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index f1a6c5d699..4f169acabf 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -363,20 +363,15 @@ Common::Error EoBCoreEngine::init() {
 	_tickLength = 55;
 
 	_screen = new Screen_EoB(this, _system);
-
 	assert(_screen);
 	_screen->setResolution();
 
-	// Setup mixer
-	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
-
 	//MidiDriverType midiDriver = MidiDriver::detectDevice(MDT_PCSPK | MDT_ADLIB);
 	_sound = new SoundAdLibPC(this, _mixer);
 	assert(_sound);
 	_sound->init();
 
+	// Setup volume settings
 	syncSoundSettings();
 
 	_res = new Resource(this);
@@ -398,6 +393,7 @@ Common::Error EoBCoreEngine::init() {
 	}
 
 	setupKeyMap();
+
 	_gui = new GUI_EoB(this);
 	assert(_gui);
 	_txt = new TextDisplayer_rpg(this, _screen);
-- 
cgit v1.2.3


From a2221a8b9ee65cec914a106569bc8b2d0a03b3c8 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 31 Dec 2011 05:11:33 +0100
Subject: KYRA: Slight formatting fixes.

---
 engines/kyra/gui_lol.cpp       | 18 ++++++-------
 engines/kyra/items_lol.cpp     |  8 +++---
 engines/kyra/lol.cpp           | 42 +++++++++++++++--------------
 engines/kyra/saveload_lol.cpp  |  6 ++---
 engines/kyra/scene_lol.cpp     |  6 ++---
 engines/kyra/screen_lol.cpp    |  4 +--
 engines/kyra/script_lol.cpp    | 58 ++++++++++++++++++++--------------------
 engines/kyra/sequences_lol.cpp | 60 +++++++++++++++++++++---------------------
 engines/kyra/sprites_lol.cpp   | 14 +++++-----
 engines/kyra/staticres_lol.cpp |  8 +++---
 engines/kyra/timer_lol.cpp     |  2 +-
 11 files changed, 114 insertions(+), 112 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index 249471315d..80052c70f2 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -378,9 +378,9 @@ void LoLEngine::gui_drawCharPortraitWithStats(int charNum) {
 	int spellLevels = 0;
 	if (_availableSpells[_selectedSpell] != -1) {
 		for (int i = 0; i < 4; i++) {
-			if (_spellProperties[_availableSpells[_selectedSpell]].mpRequired[i] <= _characters[charNum].magicPointsCur &&
-				_spellProperties[_availableSpells[_selectedSpell]].hpRequired[i] <= _characters[charNum].hitPointsCur)
-					spellLevels++;
+			if (_spellProperties[_availableSpells[_selectedSpell]].mpRequired[i] <= _characters[charNum].magicPointsCur
+			    && _spellProperties[_availableSpells[_selectedSpell]].hpRequired[i] <= _characters[charNum].hitPointsCur)
+				spellLevels++;
 		}
 	}
 
@@ -1160,7 +1160,7 @@ int LoLEngine::clickedPortraitLeft(Button *button) {
 int LoLEngine::clickedLiveMagicBarsLeft(Button *button) {
 	gui_highlightPortraitFrame(button->arg);
 	_txt->printMessage(0, getLangString(0x4047), _characters[button->arg].name, _characters[button->arg].hitPointsCur,
-		_characters[button->arg].hitPointsMax, _characters[button->arg].magicPointsCur, _characters[button->arg].magicPointsMax);
+	                   _characters[button->arg].hitPointsMax, _characters[button->arg].magicPointsCur, _characters[button->arg].magicPointsMax);
 	return 1;
 }
 
@@ -1334,7 +1334,7 @@ int LoLEngine::clickedInventorySlot(Button *button) {
 	int hItem = _itemInHand;
 
 	if ((_itemsInPlay[hItem].itemPropertyIndex == 281 || _itemsInPlay[slotItem].itemPropertyIndex == 281) &&
-		(_itemsInPlay[hItem].itemPropertyIndex == 220 || _itemsInPlay[slotItem].itemPropertyIndex == 220)) {
+	        (_itemsInPlay[hItem].itemPropertyIndex == 220 || _itemsInPlay[slotItem].itemPropertyIndex == 220)) {
 		// merge ruby of truth
 
 		WSAMovie_v2 *wsa = new WSAMovie_v2(this);
@@ -2014,7 +2014,7 @@ int GUI_LoL::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseW
 
 		bool progress = false;
 
-		if (mouseX >= x && mouseY >= y && mouseX <= x+buttonList->width && mouseY <= y+buttonList->height)
+		if (mouseX >= x && mouseY >= y && mouseX <= x + buttonList->width && mouseY <= y + buttonList->height)
 			progress = true;
 
 		buttonList->flags2 &= ~0x80;
@@ -2564,7 +2564,7 @@ int GUI_LoL::getInput() {
 
 	int inputFlag = _vm->checkInput(_menuButtonList);
 
-	if (_currentMenu == &_savenameMenu && _keyPressed.ascii){
+	if (_currentMenu == &_savenameMenu && _keyPressed.ascii) {
 		char inputKey = _keyPressed.ascii;
 		Util::convertISOToDOS(inputKey);
 
@@ -2714,7 +2714,7 @@ int GUI_LoL::clickedOptionsMenu(Button *button) {
 		delete[] _vm->_landsFile;
 		_vm->_landsFile = _vm->resource()->fileData(filename.c_str(), 0);
 		_newMenu = _lastMenu;
-		} break;
+	} break;
 	default:
 		// TODO: Is there anything we should do if we hit this case?
 		break;
@@ -2833,7 +2833,7 @@ int GUI_LoL::clickedChoiceMenu(Button *button) {
 				if (*i >= 990)
 					break;
 				Common::String oldName = _vm->getSavegameFilename(*i);
-				Common::String newName = _vm->getSavegameFilename(*i-1);
+				Common::String newName = _vm->getSavegameFilename(*i - 1);
 				_vm->_saveFileMan->renameSavefile(oldName, newName);
 			}
 			_newMenu = &_mainMenu;
diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp
index e6cd9355fc..ea2acaf64d 100644
--- a/engines/kyra/items_lol.cpp
+++ b/engines/kyra/items_lol.cpp
@@ -397,7 +397,7 @@ bool LoLEngine::launchObject(int objectType, Item item, int startX, int startY,
 		}
 
 		int csp = checkDrawObjectSpace(_partyPosX, _partyPosY, t->x, t->y);
-		if (csp > sp){
+		if (csp > sp) {
 			sp = csp;
 			slot = i;
 		}
@@ -528,7 +528,7 @@ void LoLEngine::updateFlyingObject(FlyingObject *t) {
 	getNextStepCoords(t->x, t->y, x, y, t->direction);
 	/* WORKAROUND:
 	Large fireballs cast by the "birds" in white tower level 2 and by the "wraith knights" in castle cimmeria
-	level 1	(or possible other objects with flag 0x4000) could not fly through corridors in ScummVM and would
+	level 1 (or possible other objects with flag 0x4000) could not fly through corridors in ScummVM and would
 	be terminated prematurely. The original code (all versions) involuntarily circumvents this via a bug in the
 	next line of code.
 	The original checks for _itemProperties[t->item].flags instead of _itemProperties[_itemsInPlay[t->item].itemPropertyIndex].flags.
@@ -539,7 +539,7 @@ void LoLEngine::updateFlyingObject(FlyingObject *t) {
 	at least.
 
 	Other methods of working around this issue don't make too much sense. An object with a width of 256
-	could never	fly through corridors, since 256 is also the width of a block. Aligning the fireballs to the
+	could never fly through corridors, since 256 is also the width of a block. Aligning the fireballs to the
 	middle of a block (or making the monsters align to the middle before casting them) wouldn't help here
 	(and wouldn't be faithful to the original either).
 	*/
@@ -563,7 +563,7 @@ void LoLEngine::assignItemToBlock(uint16 *assignedBlockObjects, int id) {
 
 	LoLObject *newObject = findObject(id);
 	newObject->nextAssignedObject = *assignedBlockObjects;
-	((LoLItem*)newObject)->level = -1;
+	((LoLItem *)newObject)->level = -1;
 	*assignedBlockObjects = id;
 }
 
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index b24ab4fca8..258f53c602 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -300,15 +300,15 @@ LoLEngine::~LoLEngine() {
 
 	delete[] _automapShapes;
 
-	for (Common::Array<const TIMOpcode*>::iterator i = _timIntroOpcodes.begin(); i != _timIntroOpcodes.end(); ++i)
+	for (Common::Array<const TIMOpcode *>::iterator i = _timIntroOpcodes.begin(); i != _timIntroOpcodes.end(); ++i)
 		delete *i;
 	_timIntroOpcodes.clear();
 
-	for (Common::Array<const TIMOpcode*>::iterator i = _timOutroOpcodes.begin(); i != _timOutroOpcodes.end(); ++i)
+	for (Common::Array<const TIMOpcode *>::iterator i = _timOutroOpcodes.begin(); i != _timOutroOpcodes.end(); ++i)
 		delete *i;
 	_timOutroOpcodes.clear();
 
-	for (Common::Array<const TIMOpcode*>::iterator i = _timIngameOpcodes.begin(); i != _timIngameOpcodes.end(); ++i)
+	for (Common::Array<const TIMOpcode *>::iterator i = _timIngameOpcodes.begin(); i != _timIngameOpcodes.end(); ++i)
 		delete *i;
 	_timIngameOpcodes.clear();
 
@@ -341,7 +341,7 @@ LoLEngine::~LoLEngine() {
 	delete[] _mapCursorOverlay;
 	delete[] _mapOverlay;
 
-	for (Common::Array<const SpellProc*>::iterator i = _spellProcs.begin(); i != _spellProcs.end(); ++i)
+	for (Common::Array<const SpellProc *>::iterator i = _spellProcs.begin(); i != _spellProcs.end(); ++i)
 		delete *i;
 	_spellProcs.clear();
 
@@ -425,11 +425,11 @@ Common::Error LoLEngine::init() {
 	_clickedSpecialFlag = 0x40;
 
 	_monsterShapes = new uint8*[48];
-	memset(_monsterShapes, 0, 48 * sizeof(uint8*));
+	memset(_monsterShapes, 0, 48 * sizeof(uint8 *));
 	_monsterPalettes = new uint8*[48];
-	memset(_monsterPalettes, 0, 48 * sizeof(uint8*));
+	memset(_monsterPalettes, 0, 48 * sizeof(uint8 *));
 	_monsterDecorationShapes = new uint8*[576];
-	memset(_monsterDecorationShapes, 0, 576 * sizeof(uint8*));
+	memset(_monsterDecorationShapes, 0, 576 * sizeof(uint8 *));
 	memset(&_scriptData, 0, sizeof(EMCData));
 
 	_activeMagicMenu = -1;
@@ -1013,7 +1013,7 @@ uint8 *LoLEngine::getTableEntry(uint8 *buffer, uint16 id) {
 	if (!buffer)
 		return 0;
 
-	return buffer + READ_LE_UINT16(buffer + (id<<1));
+	return buffer + READ_LE_UINT16(buffer + (id << 1));
 }
 
 void LoLEngine::decodeSjis(const char *src, char *dst) {
@@ -1041,7 +1041,7 @@ void LoLEngine::decodeSjis(const char *src, char *dst) {
 
 int LoLEngine::decodeCyrillic(const char *src, char *dst) {
 	static const uint8 decodeTable1[] = {
-		0x20, 0xAE, 0xA5, 0xA0, 0xE2, 0xAD,	0xA8, 0xE0, 0xE1, 0xAB, 0xA2,
+		0x20, 0xAE, 0xA5, 0xA0, 0xE2, 0xAD, 0xA8, 0xE0, 0xE1, 0xAB, 0xA2,
 		0xA4, 0xAC, 0xAA, 0xE3, 0x2E
 	};
 
@@ -1088,8 +1088,10 @@ int LoLEngine::decodeCyrillic(const char *src, char *dst) {
 }
 
 bool LoLEngine::addCharacter(int id) {
-	const uint16 *cdf[] = { _charDefsMan, _charDefsMan, _charDefsMan, _charDefsWoman,
-		_charDefsMan, _charDefsMan, _charDefsWoman, _charDefsKieran, _charDefsAkshel };
+	const uint16 *cdf[] = {
+		_charDefsMan, _charDefsMan, _charDefsMan, _charDefsWoman,
+		_charDefsMan, _charDefsMan, _charDefsWoman, _charDefsKieran, _charDefsAkshel
+	};
 
 	int numChars = countActiveCharacters();
 	if (numChars == 4)
@@ -1803,7 +1805,7 @@ int LoLEngine::characterSays(int track, int charId, bool redraw) {
 		charId = 0;
 	} else {
 		int i = 0;
-		for (;i < 4; i++) {
+		for (; i < 4; i++) {
 			if (charId != _characters[i].id || !(_characters[i].flags & 1))
 				continue;
 			charId = i;
@@ -1946,7 +1948,7 @@ void LoLEngine::giveItemToMonster(LoLMonster *monster, Item item) {
 }
 
 const uint16 *LoLEngine::getCharacterOrMonsterStats(int id) {
-	return (id & 0x8000) ? (const uint16*)_monsters[id & 0x7fff].properties->fightingStats : _characters[id].defaultModifiers;
+	return (id & 0x8000) ? (const uint16 *)_monsters[id & 0x7fff].properties->fightingStats : _characters[id].defaultModifiers;
 }
 
 uint16 *LoLEngine::getCharacterOrMonsterItemsMight(int id) {
@@ -2204,7 +2206,7 @@ int LoLEngine::processMagicHeal(int charNum, int spellLevel) {
 	int ch = 0;
 	int n = 4;
 
-	if (charNum != -1){
+	if (charNum != -1) {
 		ch = charNum;
 		n = charNum + 1;
 	}
@@ -2865,7 +2867,7 @@ int LoLEngine::processMagicVaelansCube() {
 			uint16 a = sp1[i * 3 + 1] + 16;
 			tmpPal2[i * 3 + 1] = (a > 58) ? 58 : a;
 			tmpPal2[i * 3] = sp1[i * 3];
-			a =	sp1[i * 3 + 2] + 16;
+			a = sp1[i * 3 + 2] + 16;
 			tmpPal2[i * 3 + 2] = (a > 63) ? 63 : a;
 		}
 	} else {
@@ -2873,7 +2875,7 @@ int LoLEngine::processMagicVaelansCube() {
 			uint16 a = sp1[i * 3] + 16;
 			tmpPal2[i * 3] = (a > 60) ? 60 : a;
 			tmpPal2[i * 3 + 1] = sp1[i * 3 + 1];
-			a =	sp1[i * 3 + 2] + 19;
+			a = sp1[i * 3 + 2] + 19;
 			tmpPal2[i * 3 + 2] = (a > 60) ? 60 : a;
 		}
 	}
@@ -4057,7 +4059,7 @@ void LoLEngine::displayAutomap() {
 
 		if (f == 0x30) {
 			for (int i = 0; i < 1024; i++)
-				 _levelBlockProperties[i].flags |= 7;
+				_levelBlockProperties[i].flags |= 7;
 			_mapUpdateNeeded = true;
 		} else if (f == _keyMap[Common::KEYCODE_ESCAPE]) {
 			exitAutomap = true;
@@ -4138,7 +4140,7 @@ bool LoLEngine::updateAutoMapIntern(uint16 block, uint16 x, uint16 y, int16 xOff
 }
 
 void LoLEngine::loadMapLegendData(int level) {
-	uint16 *legendData= (uint16*)_tempBuffer5120;
+	uint16 *legendData = (uint16 *)_tempBuffer5120;
 	for (int i = 0; i < 32; i++) {
 		legendData[i * 6] = 0xffff;
 		legendData[i * 6 + 5] = 0xffff;
@@ -4192,7 +4194,7 @@ void LoLEngine::drawMapPage(int pageNum) {
 
 		for (; bl < 1024; bl++) {
 			uint8 *w = _levelBlockProperties[bl].walls;
-			if ((_levelBlockProperties[bl].flags & 7) == 7 && (!(_wllAutomapData[w[0]] & 0xc0)) && (!(_wllAutomapData[w[2]] & 0xc0)) && (!(_wllAutomapData[w[1]] & 0xc0))&& (!(_wllAutomapData[w[3]] & 0xc0))) {
+			if ((_levelBlockProperties[bl].flags & 7) == 7 && (!(_wllAutomapData[w[0]] & 0xc0)) && (!(_wllAutomapData[w[2]] & 0xc0)) && (!(_wllAutomapData[w[1]] & 0xc0)) && (!(_wllAutomapData[w[3]] & 0xc0))) {
 				uint16 b0 = calcNewBlockPosition(bl, 0);
 				uint16 b2 = calcNewBlockPosition(bl, 2);
 				uint16 b1 = calcNewBlockPosition(bl, 1);
@@ -4248,7 +4250,7 @@ void LoLEngine::drawMapPage(int pageNum) {
 		sx = mapGetStartPosX();
 		sy = mapGetStartPosY();
 
-		uint16 *legendData = (uint16*)_tempBuffer5120;
+		uint16 *legendData = (uint16 *)_tempBuffer5120;
 		uint8 yOffset = _flags.use16ColorMode ? 4 : 0;
 
 		for (int ii = 0; ii < 32; ii++)  {
diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp
index 7736d45540..b6840663e9 100644
--- a/engines/kyra/saveload_lol.cpp
+++ b/engines/kyra/saveload_lol.cpp
@@ -439,8 +439,8 @@ Common::Error LoLEngine::saveGameStateIntern(int slot, const char *saveName, con
 		for (int ii = 0; ii < 1024; ii++)
 			out->writeByte(l->flags[ii] & 0xff);
 
-		LoLMonster *lm = (LoLMonster*)_lvlTempData[i]->monsters;
-		FlyingObject *lf = (FlyingObject*)_lvlTempData[i]->flyingObjects;
+		LoLMonster *lm = (LoLMonster *)_lvlTempData[i]->monsters;
+		FlyingObject *lf = (FlyingObject *)_lvlTempData[i]->flyingObjects;
 
 		for (int ii = 0; ii < 30; ii++) {
 			LoLMonster *m = &lm[ii];
@@ -574,7 +574,7 @@ void LoLEngine::restoreMonsterTempData(LevelTempData *tmp) {
 }
 
 void LoLEngine::releaseMonsterTempData(LevelTempData *tmp) {
-	LoLMonster *p = (LoLMonster*)tmp->monsters;
+	LoLMonster *p = (LoLMonster *)tmp->monsters;
 	delete[] p;
 }
 
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index fea9b27bd1..796db9a340 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -122,7 +122,7 @@ void LoLEngine::assignBlockItem(LevelBlockProperty *l, uint16 item) {
 	}
 
 	tmp = findObject(item);
-	((LoLItem*)tmp)->level = -1;
+	((LoLItem *)tmp)->level = -1;
 
 	uint16 ix = *index;
 
@@ -277,7 +277,7 @@ void LoLEngine::loadLevelShpDat(const char *shpFile, const char *datFile, bool f
 	delete[] _levelDecorationData;
 	_levelDecorationData = new LevelDecorationProperty[_levelDecorationDataSize];
 	for (int i = 0; i < _levelDecorationDataSize; i++) {
-		LevelDecorationProperty * l = &_levelDecorationData[i];
+		LevelDecorationProperty *l = &_levelDecorationData[i];
 		for (int ii = 0; ii < 10; ii++)
 			l->shapeIndex[ii] = s->readUint16LE();
 		for (int ii = 0; ii < 10; ii++)
@@ -1511,7 +1511,7 @@ void LoLEngine::drawDecorations(int index) {
 						x = _dscShapeX[s] + xOffs + ((_levelDecorationProperties[l].shapeX[shpIx] * scaleW) >> 8);
 						if (ix == _dscShapeIndex[s]) {
 							x = _dscShapeX[s] - ((_levelDecorationProperties[l].shapeX[shpIx] * scaleW) >> 8) -
-								_screen->getShapeScaledWidth(shapeData, scaleW) - xOffs;
+							     _screen->getShapeScaledWidth(shapeData, scaleW) - xOffs;
 						}
 						flags = 0x105;
 					} else {
diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp
index 4b8b443bd9..08b232f400 100644
--- a/engines/kyra/screen_lol.cpp
+++ b/engines/kyra/screen_lol.cpp
@@ -104,8 +104,8 @@ void Screen_LoL::fprintStringIntro(const char *format, int x, int y, uint8 c1, u
 		x -= getTextWidth(buffer);
 
 	if ((flags & 0x00F0) == 0x20) {
-		printText(buffer, x-1, y, c3, c2);
-		printText(buffer, x, y+1, c3, c2);
+		printText(buffer, x - 1, y, c3, c2);
+		printText(buffer, x, y + 1, c3, c2);
 	}
 
 	printText(buffer, x, y, c1, c2);
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp
index f81961a08b..c5d1d49030 100644
--- a/engines/kyra/script_lol.cpp
+++ b/engines/kyra/script_lol.cpp
@@ -792,7 +792,7 @@ int LoLEngine::olol_resetBlockShapeAssignment(EMCState *script) {
 
 int LoLEngine::olol_copyRegion(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_copyRegion(%p) (%d, %d, %d, %d, %d, %d, %d, %d)",
-		(const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7));
+	       (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7));
 	_screen->copyRegion(stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), Screen::CR_NO_P_CHECK);
 	if (!stackPos(7))
 		_screen->updateScreen();
@@ -801,7 +801,7 @@ int LoLEngine::olol_copyRegion(EMCState *script) {
 
 int LoLEngine::olol_initMonster(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_initMonster(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script,
-		stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9), stackPos(10));
+	       stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9), stackPos(10));
 	uint16 x = 0;
 	uint16 y = 0;
 	calcCoordinates(x, y, stackPos(0), stackPos(1), stackPos(2));
@@ -919,12 +919,12 @@ int LoLEngine::olol_dummy0(EMCState *script) {
 
 int LoLEngine::olol_loadMonsterProperties(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_loadMonsterProperties(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d)",
-		(const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5),
-		stackPos(6), stackPos(7), stackPos(8), stackPos(9), stackPos(10), stackPos(11), stackPos(12), stackPos(13),
-		stackPos(14), stackPos(15), stackPos(16), stackPos(17), stackPos(18), stackPos(19), stackPos(20),
-		stackPos(21), stackPos(22), stackPos(23), stackPos(24), stackPos(25), stackPos(26),	stackPos(27),
-		stackPos(28), stackPos(29), stackPos(30), stackPos(31), stackPos(32), stackPos(33), stackPos(34),
-		stackPos(35), stackPos(36), stackPos(37), stackPos(38), stackPos(39), stackPos(40), stackPos(41));
+	       (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5),
+	       stackPos(6), stackPos(7), stackPos(8), stackPos(9), stackPos(10), stackPos(11), stackPos(12), stackPos(13),
+	       stackPos(14), stackPos(15), stackPos(16), stackPos(17), stackPos(18), stackPos(19), stackPos(20),
+	       stackPos(21), stackPos(22), stackPos(23), stackPos(24), stackPos(25), stackPos(26), stackPos(27),
+	       stackPos(28), stackPos(29), stackPos(30), stackPos(31), stackPos(32), stackPos(33), stackPos(34),
+	       stackPos(35), stackPos(36), stackPos(37), stackPos(38), stackPos(39), stackPos(40), stackPos(41));
 
 	LoLMonsterProperty *l = &_monsterProperties[stackPos(0)];
 	l->shapeIndex = stackPos(1) & 0xff;
@@ -939,14 +939,14 @@ int LoLEngine::olol_loadMonsterProperties(EMCState *script) {
 
 	l->maxWidth = shpWidthMax;
 
-	l->fightingStats[0] = (stackPos(2) << 8) / 100;		// hit chance
-	l->fightingStats[1] = 256;							//
-	l->fightingStats[2] = (stackPos(3) << 8) / 100;		// protection
-	l->fightingStats[3] = stackPos(4);					// evade chance
-	l->fightingStats[4] = (stackPos(5) << 8) / 100;		// speed
-	l->fightingStats[5] = (stackPos(6) << 8) / 100;		//
-	l->fightingStats[6] = (stackPos(7) << 8) / 100;		//
-	l->fightingStats[7] = (stackPos(8) << 8) / 100;		//
+	l->fightingStats[0] = (stackPos(2) << 8) / 100;     // hit chance
+	l->fightingStats[1] = 256;                          //
+	l->fightingStats[2] = (stackPos(3) << 8) / 100;     // protection
+	l->fightingStats[3] = stackPos(4);                  // evade chance
+	l->fightingStats[4] = (stackPos(5) << 8) / 100;     // speed
+	l->fightingStats[5] = (stackPos(6) << 8) / 100;     //
+	l->fightingStats[6] = (stackPos(7) << 8) / 100;     //
+	l->fightingStats[7] = (stackPos(8) << 8) / 100;     //
 	l->fightingStats[8] = 0;
 
 	for (int i = 0; i < 8; i++) {
@@ -1365,14 +1365,14 @@ int LoLEngine::olol_countBlockItems(EMCState *script) {
 	return res;
 }
 
-int LoLEngine::olol_characterSkillTest(EMCState *script){
+int LoLEngine::olol_characterSkillTest(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_characterSkillTest(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	int skill = stackPos(0);
 	int n = countActiveCharacters();
 	int m = 0;
 	int c = 0;
 
-	for	(int i = 0; i < n; i++) {
+	for (int i = 0; i < n; i++) {
 		int v = _characters[i].skillModifiers[skill] + _characters[i].skillLevels[skill] + 25;
 		if (v > m) {
 			m = v;
@@ -1383,7 +1383,7 @@ int LoLEngine::olol_characterSkillTest(EMCState *script){
 	return (rollDice(1, 100) > m) ? -1 : c;
 }
 
-int LoLEngine::olol_countAllMonsters(EMCState *script){
+int LoLEngine::olol_countAllMonsters(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_countAllMonsters(%p)", (const void *)script);
 	int res = 0;
 
@@ -1395,7 +1395,7 @@ int LoLEngine::olol_countAllMonsters(EMCState *script){
 	return res;
 }
 
-int LoLEngine::olol_playEndSequence(EMCState *script){
+int LoLEngine::olol_playEndSequence(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_playEndSequence(%p)", (const void *)script);
 
 	int c = 0;
@@ -1685,7 +1685,7 @@ int LoLEngine::olol_countSpecificMonsters(EMCState *script) {
 int LoLEngine::olol_updateBlockAnimations2(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_updateBlockAnimations2(%p) (%d, %d, %d, %d, ...)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int numFrames = stackPos(3);
-	assert (numFrames <= 97);
+	assert(numFrames <= 97);
 	int curFrame = stackPos(2) % numFrames;
 	setWallType(stackPos(0), stackPos(1), stackPos(4 + curFrame));
 	return 0;
@@ -1992,7 +1992,7 @@ int LoLEngine::olol_findInventoryItem(EMCState *script) {
 		cur = 0;
 		last = 4;
 	}
-	for (;cur < last; cur++) {
+	for (; cur < last; cur++) {
 		if (!(_characters[cur].flags & 1))
 			continue;
 		for (int i = 0; i < 11; i++) {
@@ -2356,7 +2356,7 @@ int LoLEngine::tlol_setupPaletteFade(const TIM *tim, const uint16 *param) {
 
 int LoLEngine::tlol_loadPalette(const TIM *tim, const uint16 *param) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::tlol_loadPalette(%p, %p) (%d)", (const void *)tim, (const void *)param, param[0]);
-	const char *palFile = (const char *)(tim->text + READ_LE_UINT16(tim->text + (param[0]<<1)));
+	const char *palFile = (const char *)(tim->text + READ_LE_UINT16(tim->text + (param[0] << 1)));
 	_screen->loadPalette(palFile, _screen->getPalette(0));
 	return 1;
 }
@@ -2372,7 +2372,7 @@ int LoLEngine::tlol_setupPaletteFadeEx(const TIM *tim, const uint16 *param) {
 
 int LoLEngine::tlol_processWsaFrame(const TIM *tim, const uint16 *param) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::tlol_processWsaFrame(%p, %p) (%d, %d, %d, %d, %d)",
-		(const void *)tim, (const void *)param, param[0], param[1], param[2], param[3], param[4]);
+	       (const void *)tim, (const void *)param, param[0], param[1], param[2], param[3], param[4]);
 
 	const int animIndex = tim->wsa[param[0]].anim - 1;
 	const int frame = param[1];
@@ -2570,8 +2570,8 @@ int LoLEngine::tlol_stopBackgroundAnimation(const TIM *tim, const uint16 *param)
 
 int LoLEngine::tlol_fadeInScene(const TIM *tim, const uint16 *param) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::tlol_fadeInScene(%p, %p) (%d, %d)", (const void *)tim, (const void *)param, param[0], param[1]);
-	const char *sceneFile = (const char *)(tim->text + READ_LE_UINT16(tim->text + (param[0]<<1)));
-	const char *overlayFile = (const char *)(tim->text + READ_LE_UINT16(tim->text + (param[1]<<1)));
+	const char *sceneFile = (const char *)(tim->text + READ_LE_UINT16(tim->text + (param[0] << 1)));
+	const char *overlayFile = (const char *)(tim->text + READ_LE_UINT16(tim->text + (param[1] << 1)));
 
 	_screen->copyRegion(0, 0, 0, 0, 320, 200, 0, 2, Screen::CR_NO_P_CHECK);
 
@@ -2622,7 +2622,7 @@ int LoLEngine::tlol_unusedResourceFunc(const TIM *tim, const uint16 *param) {
 
 int LoLEngine::tlol_fadeInPalette(const TIM *tim, const uint16 *param) {
 	debugC(3, kDebugLevelScriptFuncs, "LoLEngine::tlol_fadeInPalette(%p, %p) (%d, %d)", (const void *)tim, (const void *)param, param[0], param[1]);
-	const char *bitmap = (const char *)(tim->text + READ_LE_UINT16(tim->text + (param[0]<<1)));
+	const char *bitmap = (const char *)(tim->text + READ_LE_UINT16(tim->text + (param[0] << 1)));
 
 	Palette pal(_screen->getPalette(0).getNumColors());
 	_screen->loadBitmap(bitmap, 3, 3, &pal);
@@ -2680,7 +2680,7 @@ typedef Common::Functor2Mem<const TIM *, const uint16 *, int, LoLEngine> TIMOpco
 #define OpcodeTimUnImpl() timTable->push_back(new TIMOpcodeLoL(this, 0))
 
 void LoLEngine::setupOpcodeTable() {
-	Common::Array<const Opcode*> *table = 0;
+	Common::Array<const Opcode *> *table = 0;
 
 	_opcodes.reserve(192);
 	SetOpcodeTable(_opcodes);
@@ -2972,7 +2972,7 @@ void LoLEngine::setupOpcodeTable() {
 	Opcode(olol_getLanguage);
 	Opcode(olol_dummy0);
 
-	Common::Array<const TIMOpcode*> *timTable = 0;
+	Common::Array<const TIMOpcode *> *timTable = 0;
 
 	_timIntroOpcodes.reserve(8);
 	SetTimOpcodeTable(_timIntroOpcodes);
diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp
index 512d28f084..a06f2077ba 100644
--- a/engines/kyra/sequences_lol.cpp
+++ b/engines/kyra/sequences_lol.cpp
@@ -90,25 +90,25 @@ int LoLEngine::processPrologue() {
 			// quit instantly.
 			break;
 
-		case 0:		// New game
+		case 0:     // New game
 			processSelection = 0;
 			break;
 
-		case 1:		// Show intro
+		case 1:     // Show intro
 			showIntro();
 			break;
 
-		case 2: {	// "Lore of the Lands" (only CD version)
+		case 2: {   // "Lore of the Lands" (only CD version)
 			HistoryPlayer history(this);
 			history.play();
-			} break;
+		} break;
 
-		case 3:		// Load game
+		case 3:     // Load game
 			if (_gui->runMenu(_gui->_loadMenu))
 				processSelection = 3;
 			break;
 
-		case 4:		// Quit game
+		case 4:     // Quit game
 		default:
 			quitGame();
 			updateInput();
@@ -129,17 +129,17 @@ int LoLEngine::processPrologue() {
 }
 
 void LoLEngine::setupPrologueData(bool load) {
-	static const char * const fileListCD[] = {
+	static const char *const fileListCD[] = {
 		"GENERAL.PAK", "INTROVOC.PAK", "STARTUP.PAK", "INTRO1.PAK",
 		"INTRO2.PAK", "INTRO3.PAK", "INTRO4.PAK", "INTRO5.PAK",
 		"INTRO6.PAK", "INTRO7.PAK", "INTRO8.PAK", "INTRO9.PAK",
 		"HISTORY.PAK", 0
 	};
 
-	static const char * const fileListFloppy[] = {
+	static const char *const fileListFloppy[] = {
 		"INTRO.PAK", "INTROVOC.PAK", 0
 	};
-	const char * const *fileList = _flags.isTalkie ? fileListCD : fileListFloppy;
+	const char *const *fileList = _flags.isTalkie ? fileListCD : fileListFloppy;
 
 	char filename[32];
 	for (uint i = 0; fileList[i]; ++i) {
@@ -410,10 +410,10 @@ void LoLEngine::kingSelectionIntro() {
 		index = MAX(index, 4);
 
 		_chargenWSA->displayFrame(_chargenFrameTable[index], 0, 113, 0, 0, 0, 0);
-		_screen->copyRegion(_selectionPosTable[_selectionChar1IdxTable[index]*2+0], _selectionPosTable[_selectionChar1IdxTable[index]*2+1], _charPreviews[0].x, _charPreviews[0].y, 32, 32, 4, 0);
-		_screen->copyRegion(_selectionPosTable[_selectionChar2IdxTable[index]*2+0], _selectionPosTable[_selectionChar2IdxTable[index]*2+1], _charPreviews[1].x, _charPreviews[1].y, 32, 32, 4, 0);
-		_screen->copyRegion(_selectionPosTable[_selectionChar3IdxTable[index]*2+0], _selectionPosTable[_selectionChar3IdxTable[index]*2+1], _charPreviews[2].x, _charPreviews[2].y, 32, 32, 4, 0);
-		_screen->copyRegion(_selectionPosTable[_selectionChar4IdxTable[index]*2+0], _selectionPosTable[_selectionChar4IdxTable[index]*2+1], _charPreviews[3].x, _charPreviews[3].y, 32, 32, 4, 0);
+		_screen->copyRegion(_selectionPosTable[_selectionChar1IdxTable[index] * 2 + 0], _selectionPosTable[_selectionChar1IdxTable[index] * 2 + 1], _charPreviews[0].x, _charPreviews[0].y, 32, 32, 4, 0);
+		_screen->copyRegion(_selectionPosTable[_selectionChar2IdxTable[index] * 2 + 0], _selectionPosTable[_selectionChar2IdxTable[index] * 2 + 1], _charPreviews[1].x, _charPreviews[1].y, 32, 32, 4, 0);
+		_screen->copyRegion(_selectionPosTable[_selectionChar3IdxTable[index] * 2 + 0], _selectionPosTable[_selectionChar3IdxTable[index] * 2 + 1], _charPreviews[2].x, _charPreviews[2].y, 32, 32, 4, 0);
+		_screen->copyRegion(_selectionPosTable[_selectionChar4IdxTable[index] * 2 + 0], _selectionPosTable[_selectionChar4IdxTable[index] * 2 + 1], _charPreviews[3].x, _charPreviews[3].y, 32, 32, 4, 0);
 		_screen->updateScreen();
 
 		uint32 waitEnd = _system->getMillis() + 7 * _tickLength;
@@ -430,7 +430,7 @@ void LoLEngine::kingSelectionIntro() {
 
 	resetSkipFlag();
 
-	_chargenWSA->displayFrame(0x10, 0,113, 0, 0, 0, 0);
+	_chargenWSA->displayFrame(0x10, 0, 113, 0, 0, 0, 0);
 	_screen->updateScreen();
 	_sound->voiceStop(&_speechHandle);
 }
@@ -452,11 +452,11 @@ void LoLEngine::kingSelectionReminder() {
 
 	int index = 0;
 	while ((!speechEnabled() || (speechEnabled() && _sound->voiceIsPlaying(&_speechHandle))) && _charSelection == -1 && !shouldQuit() && index < 15) {
-		_chargenWSA->displayFrame(_chargenFrameTable[index+9], 0, 113, 0, 0, 0, 0);
-		_screen->copyRegion(_selectionPosTable[_reminderChar1IdxTable[index]*2+0], _selectionPosTable[_reminderChar1IdxTable[index]*2+1], _charPreviews[0].x, _charPreviews[0].y, 32, 32, 4, 0);
-		_screen->copyRegion(_selectionPosTable[_reminderChar2IdxTable[index]*2+0], _selectionPosTable[_reminderChar2IdxTable[index]*2+1], _charPreviews[1].x, _charPreviews[1].y, 32, 32, 4, 0);
-		_screen->copyRegion(_selectionPosTable[_reminderChar3IdxTable[index]*2+0], _selectionPosTable[_reminderChar3IdxTable[index]*2+1], _charPreviews[2].x, _charPreviews[2].y, 32, 32, 4, 0);
-		_screen->copyRegion(_selectionPosTable[_reminderChar4IdxTable[index]*2+0], _selectionPosTable[_reminderChar4IdxTable[index]*2+1], _charPreviews[3].x, _charPreviews[3].y, 32, 32, 4, 0);
+		_chargenWSA->displayFrame(_chargenFrameTable[index + 9], 0, 113, 0, 0, 0, 0);
+		_screen->copyRegion(_selectionPosTable[_reminderChar1IdxTable[index] * 2 + 0], _selectionPosTable[_reminderChar1IdxTable[index] * 2 + 1], _charPreviews[0].x, _charPreviews[0].y, 32, 32, 4, 0);
+		_screen->copyRegion(_selectionPosTable[_reminderChar2IdxTable[index] * 2 + 0], _selectionPosTable[_reminderChar2IdxTable[index] * 2 + 1], _charPreviews[1].x, _charPreviews[1].y, 32, 32, 4, 0);
+		_screen->copyRegion(_selectionPosTable[_reminderChar3IdxTable[index] * 2 + 0], _selectionPosTable[_reminderChar3IdxTable[index] * 2 + 1], _charPreviews[2].x, _charPreviews[2].y, 32, 32, 4, 0);
+		_screen->copyRegion(_selectionPosTable[_reminderChar4IdxTable[index] * 2 + 0], _selectionPosTable[_reminderChar4IdxTable[index] * 2 + 1], _charPreviews[3].x, _charPreviews[3].y, 32, 32, 4, 0);
 		_screen->updateScreen();
 
 		uint32 waitEnd = _system->getMillis() + 8 * _tickLength;
@@ -526,7 +526,7 @@ void LoLEngine::updateSelectionAnims() {
 			continue;
 
 		const int index = _selectionAnimIndexTable[_selectionAnimFrames[i] + i * 2];
-		_screen->copyRegion(_selectionPosTable[index*2+0], _selectionPosTable[index*2+1], _charPreviews[i].x, _charPreviews[i].y, 32, 32, 4, 0);
+		_screen->copyRegion(_selectionPosTable[index * 2 + 0], _selectionPosTable[index * 2 + 1], _charPreviews[i].x, _charPreviews[i].y, 32, 32, 4, 0);
 
 		int delayTime = 0;
 		if (_selectionAnimFrames[i] == 1)
@@ -583,12 +583,12 @@ int LoLEngine::selectionCharInfo(int character) {
 
 	if (_flags.platform == Common::kPlatformPC98) {
 		for (int i = 0; i < 5; ++i)
-			_screen->printText(_tim->getCTableEntry(idx+i), 60, 128 + i * 8, 0x41, 0x00);
+			_screen->printText(_tim->getCTableEntry(idx + i), 60, 128 + i * 8, 0x41, 0x00);
 
 		_screen->printText(_tim->getCTableEntry(69), 112, 168, 0x01, 0x00);
 	} else {
 		for (int i = 0; i < 5; ++i)
-			_screen->fprintStringIntro("%s", 50, 127 + i * 10, 0x53, 0x00, 0xCF, 0x20, _tim->getCTableEntry(idx+i));
+			_screen->fprintStringIntro("%s", 50, 127 + i * 10, 0x53, 0x00, 0xCF, 0x20, _tim->getCTableEntry(idx + i));
 
 		_screen->fprintStringIntro("%s", 100, 168, 0x32, 0x00, 0xCF, 0x20, _tim->getCTableEntry(69));
 	}
@@ -615,10 +615,10 @@ int LoLEngine::selectionCharInfo(int character) {
 
 	if (_flags.platform == Common::kPlatformPC98) {
 		for (int i = 0; i < 5; ++i)
-			_screen->printText(_tim->getCTableEntry(64+i), 16, 32 + i * 8, 0xC1, 0x00);
+			_screen->printText(_tim->getCTableEntry(64 + i), 16, 32 + i * 8, 0xC1, 0x00);
 	} else {
 		for (int i = 0; i < 5; ++i)
-			_screen->fprintStringIntro("%s", 3, 28 + i * 10, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(64+i));
+			_screen->fprintStringIntro("%s", 3, 28 + i * 10, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(64 + i));
 	}
 
 	resetSkipFlag();
@@ -670,7 +670,7 @@ int LoLEngine::getCharSelection() {
 	if (inputFlag == 200) {
 		for (int i = 0; i < 4; ++i) {
 			if (_charPreviews[i].x <= _mouseX && _mouseX <= _charPreviews[i].x + 31 &&
-				_charPreviews[i].y <= _mouseY && _mouseY <= _charPreviews[i].y + 31)
+			        _charPreviews[i].y <= _mouseY && _mouseY <= _charPreviews[i].y + 31)
 				return i;
 		}
 	}
@@ -1000,16 +1000,16 @@ void HistoryPlayer::updateFire() {
 // outro
 
 void LoLEngine::setupEpilogueData(bool load) {
-	static const char * const fileListCD[] = {
+	static const char *const fileListCD[] = {
 		"GENERAL.PAK", "INTROVOC.PAK", "STARTUP.PAK",
 		"FINALE.PAK", "FINALE1.PAK", "FINALE2.PAK", 0
 	};
 
-	static const char * const fileListFloppy[] = {
+	static const char *const fileListFloppy[] = {
 		"GENERAL.PAK", "INTRO.PAK", "FINALE1.PAK", "FINALE2.PAK", 0
 	};
 
-	const char * const *fileList = _flags.isTalkie ? fileListCD : fileListFloppy;
+	const char *const *fileList = _flags.isTalkie ? fileListCD : fileListFloppy;
 	assert(fileList);
 
 	char filename[32];
@@ -1448,7 +1448,7 @@ void LoLEngine::processCredits(char *t, int dimState, int page, int delayTime) {
 		}
 
 		for (int i = 0; i < countStrings; ++i) {
-			CreditsString &s = strings[i+1];
+			CreditsString &s = strings[i + 1];
 			int x = s.x, y = s.y;
 
 			if (y < _screen->_curDim->h) {
@@ -1514,7 +1514,7 @@ void LoLEngine::loadOutroShapes(int file, uint8 **storage) {
 		if (i < 8)
 			storage[i] = _screen->makeShapeCopy(_screen->getCPagePtr(5), i);
 		else
-			storage[i] = _screen->makeShapeCopy(_screen->getCPagePtr(5), i+4);
+			storage[i] = _screen->makeShapeCopy(_screen->getCPagePtr(5), i + 4);
 	}
 }
 
diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp
index 2fe896b085..5a05d81a22 100644
--- a/engines/kyra/sprites_lol.cpp
+++ b/engines/kyra/sprites_lol.cpp
@@ -97,7 +97,7 @@ void LoLEngine::loadMonsterShapes(const char *file, int monsterIndex, int animTy
 			uint8 *cl = (uint8 *)memchr(tmpPal1, tmpPal2[1 + ii], 64);
 			if (!cl)
 				continue;
-			tmpPal3[ii] = (uint16) (cl - tmpPal1);
+			tmpPal3[ii] = (uint16)(cl - tmpPal1);
 		}
 
 		for (int ii = 0; ii < 8; ii++) {
@@ -594,7 +594,7 @@ void LoLEngine::drawBlockObjects(int blockArrayIndex) {
 
 			} else {
 				shp = (_itemProperties[i->itemPropertyIndex].flags & 0x40) ? _gameShapes[_itemProperties[i->itemPropertyIndex].shpIndex] :
-					_itemShapes[_gameShapeMap[_itemProperties[i->itemPropertyIndex].shpIndex << 1]];
+				      _itemShapes[_gameShapeMap[_itemProperties[i->itemPropertyIndex].shpIndex << 1]];
 			}
 
 			if (shp)
@@ -625,7 +625,7 @@ void LoLEngine::drawMonster(uint16 id) {
 		uint8 *monsterPalette = d ? _monsterPalettes[(m->properties->shapeIndex << 4) + (curFrm & 0x0f)] + (shp[10] * (d - 1)) : 0;
 		uint8 *brightnessOverlay = drawItemOrMonster(shp, monsterPalette, m->x + _monsterShiftOffs[m->shiftStep << 1], m->y + _monsterShiftOffs[(m->shiftStep << 1) + 1], 0, 0, flg | 1, -1, flip);
 
-		for (int i = 0; i <	4; i++) {
+		for (int i = 0; i < 4; i++) {
 			int v = m->equipmentShapes[i] - 1;
 			if (v == -1)
 				break;
@@ -808,7 +808,7 @@ void LoLEngine::redrawSceneItem() {
 							fy -= ((item->flyingHeight - 1) * 6);
 
 						uint8 *shp = (_itemProperties[item->itemPropertyIndex].flags & 0x40) ? _gameShapes[_itemProperties[item->itemPropertyIndex].shpIndex] :
-							_itemShapes[_gameShapeMap[_itemProperties[item->itemPropertyIndex].shpIndex << 1]];
+						             _itemShapes[_gameShapeMap[_itemProperties[item->itemPropertyIndex].shpIndex << 1]];
 
 						drawItemOrMonster(shp, 0, item->x, item->y, fx, fy, 0, t, 0);
 						_screen->updateScreen();
@@ -855,7 +855,7 @@ void LoLEngine::drawDoor(uint8 *shape, uint8 *doorPalette, int index, int unk2,
 
 	if (flags & 1) {
 		// TODO / UNUSED
-		flags |=1;
+		flags |= 1;
 	}
 
 	int u = 0;
@@ -1127,7 +1127,7 @@ void LoLEngine::updateMonster(LoLMonster *monster) {
 		// first recovery phase after delivering an attack
 		if (++monster->fightCurTick > 2) {
 			setMonsterMode(monster, 5);
-			monster->fightCurTick = (int8) ((((8 << 8) / monster->properties->fightingStats[4]) * _monsterModifiers[6 + _monsterDifficulty]) >> 8);
+			monster->fightCurTick = (int8)((((8 << 8) / monster->properties->fightingStats[4]) * _monsterModifiers[6 + _monsterDifficulty]) >> 8);
 		}
 		checkSceneUpdateNeed(monster->block);
 		break;
@@ -1310,7 +1310,7 @@ void LoLEngine::chasePartyWithCloseAttacks(LoLMonster *monster) {
 
 				if (hit) {
 					int mx = calcInflictableDamage(m, dst, hit);
-					int dmg = rollDice(2, mx );
+					int dmg = rollDice(2, mx);
 					inflictDamage(dst, dmg, m, 0, 0);
 					applyMonsterAttackSkill(monster, dst, dmg);
 				}
diff --git a/engines/kyra/staticres_lol.cpp b/engines/kyra/staticres_lol.cpp
index deb6355384..63bc7fa99b 100644
--- a/engines/kyra/staticres_lol.cpp
+++ b/engines/kyra/staticres_lol.cpp
@@ -351,7 +351,7 @@ void LoLEngine::initStaticResource() {
 		_staticres->unloadId(kLoLLightningDefs);
 	}
 
-	_fireBallCoords = (const int16*)_staticres->loadRawDataBe16(kLoLFireballCoords, tempSize);
+	_fireBallCoords = (const int16 *)_staticres->loadRawDataBe16(kLoLFireballCoords, tempSize);
 
 	_buttonCallbacks.clear();
 	_buttonCallbacks.reserve(95);
@@ -465,7 +465,7 @@ void GUI_LoL::initStaticData() {
 
 	if (_vm->gameFlags().isTalkie)
 		GUI_LOL_MENU(_mainMenu, 9, 0x4000, 0, 7, -1, -1, -1, -1);
-	 else
+	else
 		GUI_LOL_MENU(_mainMenu, 17, 0x4000, 0, 6, -1, -1, -1, -1);
 
 	GUI_LOL_MENU_ITEM(_mainMenu.item[0], 0x4001, 16, 23, 176, 15, 0, 0);
@@ -627,7 +627,7 @@ const ScreenDim Screen_LoL::_screenDimTable16C[] = {
 
 const int Screen_LoL::_screenDimTableCount = ARRAYSIZE(Screen_LoL::_screenDimTable256C);
 
-const char * const LoLEngine::_languageExt[] = {
+const char *const LoLEngine::_languageExt[] = {
 	"ENG",
 	"FRE",
 	"GER"
@@ -777,7 +777,7 @@ const MistOfDoomAnimData LoLEngine::_mistAnimData[] = {
 	{  0,  16,  16,  17, 175 },
 };
 
-const char * const LoLEngine::_outroShapeFileTable[] = {
+const char *const LoLEngine::_outroShapeFileTable[] = {
 	"AMAZON.SHP", "ARCHRSLG.SHP", "AVIANWRM.SHP", "BANDIT.SHP", "BOAR.SHP", "CABAL.SHP",
 	"GUARD.SHP", "HAG.SHP", "HORNET.SHP", "HURZELL.SHP", "IRONGRZR.SHP", "KNOWLES.SHP",
 	"LIZARD.SHP", "MANTHA.SHP", "MINOTAUR.SHP", "MORIBUND.SHP", "ORC.SHP", "ORCLDR.SHP",
diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/timer_lol.cpp
index d0b4062a65..a3df8dbe00 100644
--- a/engines/kyra/timer_lol.cpp
+++ b/engines/kyra/timer_lol.cpp
@@ -158,7 +158,7 @@ void LoLEngine::timerRegeneratePoints(int timerNum) {
 		int hInc = (_characters[i].flags & 8) ? 0 : (itemEquipped(i, 228) ? 4 : 1);
 		// check for Talba ring
 		int mInc = _drainMagic ? ((_characters[i].magicPointsMax >> 5) * -1) :
-			((_characters[i].flags & 8) ? 0 : (itemEquipped(i, 227) ? (_characters[i].magicPointsMax / 10) : 1));
+		           ((_characters[i].flags & 8) ? 0 : (itemEquipped(i, 227) ? (_characters[i].magicPointsMax / 10) : 1));
 
 		_characters[i].magicPointsCur = CLIP<int16>(_characters[i].magicPointsCur + mInc, 0, _characters[i].magicPointsMax);
 
-- 
cgit v1.2.3


From b59b703f721d4a52b1e73084294d44976419fead Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 31 Dec 2011 11:26:42 +0100
Subject: TSAGE: BF - Fix for bug #3467502, crash when loading in map scene

---
 engines/tsage/blue_force/blueforce_scenes0.cpp | 17 +++++++++++++++++
 engines/tsage/blue_force/blueforce_scenes0.h   |  4 ++++
 engines/tsage/saveload.h                       |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_scenes0.cpp b/engines/tsage/blue_force/blueforce_scenes0.cpp
index 682e273716..95598babc6 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes0.cpp
@@ -209,6 +209,11 @@ void Scene50::Tooltip::synchronize(Serializer &s) {
 	SavedObject::synchronize(s);
 	_bounds.synchronize(s);
 	s.syncString(_msg);
+
+	if (s.getVersion() >= 10) {
+		s.syncAsSint16LE(_newSceneNumber);
+		s.syncAsSint16LE(_locationId);
+	}
 }
 
 void Scene50::Tooltip2::signal() {
@@ -323,6 +328,18 @@ void Scene50::Tooltip::highlight(bool btnDown) {
 
 /*--------------------------------------------------------------------------*/
 
+Scene50::Scene50() {
+	_sceneNumber = 0;
+}
+
+
+void Scene50::synchronize(Serializer &s) {
+	if (s.getVersion() >= 10) {
+		SceneExt::synchronize(s);
+		s.syncAsSint16LE(_sceneNumber);
+	}
+}
+
 void Scene50::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 
diff --git a/engines/tsage/blue_force/blueforce_scenes0.h b/engines/tsage/blue_force/blueforce_scenes0.h
index 9b0bf556f4..dd502c5f30 100644
--- a/engines/tsage/blue_force/blueforce_scenes0.h
+++ b/engines/tsage/blue_force/blueforce_scenes0.h
@@ -88,7 +88,11 @@ public:
 	Tooltip _location6, _location7, _location8, _location9;
 	Timer _timer;
 public:
+	Scene50();
+
 	virtual Common::String getClassName() { return "Scene50"; }
+	virtual void synchronize(Serializer &s);
+
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void remove();
 	virtual void signal();
diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h
index ff78abf52d..4126e31822 100644
--- a/engines/tsage/saveload.h
+++ b/engines/tsage/saveload.h
@@ -33,7 +33,7 @@ namespace TsAGE {
 
 typedef void (*SaveNotifierFn)(bool postFlag);
 
-#define TSAGE_SAVEGAME_VERSION 9
+#define TSAGE_SAVEGAME_VERSION 10
 
 class SavedObject;
 
-- 
cgit v1.2.3


From a837bb409a0235e4b459bfbdfb66684c8b5d33e3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 1 Jan 2012 16:12:07 +1100
Subject: TSAGE: Revert buggy implementation of dirty rects

This reverts commit f69dfba21a5d4be8cc60a20a0dd0628717fa5373.
---
 engines/tsage/blue_force/blueforce_dialogs.cpp  |   4 +-
 engines/tsage/converse.cpp                      |   2 +-
 engines/tsage/core.cpp                          |   4 +-
 engines/tsage/events.cpp                        |   6 +-
 engines/tsage/globals.cpp                       |   8 +-
 engines/tsage/graphics.cpp                      | 144 ++++--------------------
 engines/tsage/graphics.h                        |  14 +--
 engines/tsage/ringworld/ringworld_dialogs.cpp   |   4 +-
 engines/tsage/ringworld/ringworld_logic.cpp     |   2 +-
 engines/tsage/ringworld/ringworld_scenes3.cpp   |   6 +-
 engines/tsage/ringworld/ringworld_scenes5.cpp   |   4 +-
 engines/tsage/ringworld2/ringworld2_dialogs.cpp |   2 +-
 engines/tsage/scenes.cpp                        |   2 +-
 13 files changed, 46 insertions(+), 156 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp
index 11c0358aca..0aaae2fc29 100644
--- a/engines/tsage/blue_force/blueforce_dialogs.cpp
+++ b/engines/tsage/blue_force/blueforce_dialogs.cpp
@@ -163,7 +163,7 @@ void RightClickDialog::execute() {
 		}
 
 		g_system->delayMillis(10);
-		GLOBALS._screenSurface.copyToScreen();
+		g_system->updateScreen();
 	}
 
 	// Deactivate the graphics manager used for the dialog
@@ -244,7 +244,7 @@ void AmmoBeltDialog::execute() {
 		}
 
 		g_system->delayMillis(10);
-		GLOBALS._screenSurface.copyToScreen();
+		g_system->updateScreen();
 	}
 
 	_gfxManager.deactivate();
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 1542b0a8e3..a660c4b580 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -451,7 +451,7 @@ int ConversationChoiceDialog::execute(const Common::StringArray &choiceList) {
 		while (!g_globals->_events.getEvent(event, EVENT_KEYPRESS | EVENT_BUTTON_DOWN | EVENT_MOUSE_MOVE) &&
 				!g_vm->shouldQuit()) {
 			g_system->delayMillis(10);
-			GLOBALS._screenSurface.copyToScreen();
+			g_system->updateScreen();
 		}
 		if (g_vm->shouldQuit())
 			break;
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 33badf389b..73e7901fde 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1416,7 +1416,7 @@ void ScenePalette::fade(const byte *adjustData, bool fullAdjust, int percent) {
 
 	// Set the altered pale4tte
 	g_system->getPaletteManager()->setPalette((const byte *)&tempPalette[0], 0, 256);
-	GLOBALS._screenSurface.copyToScreen();
+	g_system->updateScreen();
 }
 
 PaletteRotation *ScenePalette::addRotation(int start, int end, int rotationMode, int duration, Action *action) {
@@ -1714,7 +1714,7 @@ void SceneItem::display(int resNum, int lineNum, ...) {
 		// Keep event on-screen until a mouse or keypress
 		while (!g_vm->shouldQuit() && !g_globals->_events.getEvent(event,
 				EVENT_BUTTON_DOWN | EVENT_KEYPRESS)) {
-			GLOBALS._screenSurface.copyToScreen();
+			g_system->updateScreen();
 			g_system->delayMillis(10);
 		}
 
diff --git a/engines/tsage/events.cpp b/engines/tsage/events.cpp
index 21dc86b8ec..152570b187 100644
--- a/engines/tsage/events.cpp
+++ b/engines/tsage/events.cpp
@@ -49,8 +49,8 @@ bool EventsClass::pollEvent() {
 		_priorFrameTime = milli;
 		++_frameNumber;
 
-		// Update the physical screen with any updates to the screen surface
-		GLOBALS._screenSurface.copyToScreen();
+		// Update screen
+		g_system->updateScreen();
 	}
 
 	if (!g_system->getEventManager()->pollEvent(_event)) return false;
@@ -395,7 +395,7 @@ void EventsClass::delay(int numFrames) {
 		_priorFrameTime = g_system->getMillis();
 	}
 
-	GLOBALS._screenSurface.copyToScreen();
+	g_system->updateScreen();
 	_prevDelayFrame = _frameNumber;
 	_priorFrameTime = g_system->getMillis();
 }
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 2869b3b60e..e18f3c12eb 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -108,15 +108,9 @@ Globals::Globals() : _dialogCenter(160, 140), _gfxManagerInstance(_screenSurface
 		_color2 = _gfxColors.foreground;
 		_color3 = _gfxColors.foreground;
 	}
-
-	// Set up a buffer for the screen surface
-	_screenSurface.create(SCREEN_WIDTH, SCREEN_HEIGHT);
-	_screenSurface.trackDirtyRects();
-
-	// Add the global graphics manager to the graphic manager list
+	_screenSurface.setScreenSurface();
 	_gfxManagers.push_back(&_gfxManagerInstance);
 
-	// Set up the global scene objects list
 	_sceneObjects = &_sceneObjectsInstance;
 	_sceneObjects_queue.push_front(_sceneObjects);
 
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index bc4ce75c22..171167c2ea 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -220,10 +220,11 @@ void Rect::synchronize(Serializer &s) {
 
 GfxSurface::GfxSurface() : _bounds(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT) {
 	_disableUpdates = false;
+	_screenSurface = false;
 	_lockSurfaceCtr = 0;
 	_customSurface = NULL;
+	_screenSurfaceP = NULL;
 	_transColor = -1;
-	_trackDirtyRects = false;
 }
 
 GfxSurface::GfxSurface(const GfxSurface &s) {
@@ -240,41 +241,12 @@ GfxSurface::~GfxSurface() {
 }
 
 /**
- * Turns on dirty rectangle tracking for the surface
+ * Specifies that the surface will encapsulate the ScummVM screen surface
  */
-void GfxSurface::trackDirtyRects() {
-	_trackDirtyRects = true;
-}
-
-void GfxSurface::addDirtyRect(const Rect &r) {
-	if (_trackDirtyRects)
-		_dirtyRects.push_back(Rect(r.left, r.top, 
-		MIN(r.right + 1, SCREEN_WIDTH), MIN(r.bottom + 1, SCREEN_HEIGHT)));
-}
-
-/**
- * Copies all areas specified by the dirty rect list to the screen
- */
-void GfxSurface::copyToScreen() {
-	assert(_trackDirtyRects);
-
-	// Merge any overlapping dirty rects
-	mergeDirtyRects();
-
-	// Loop through the dirty rect list to copy the affected areas to the sc
-	for (Common::List<Rect>::iterator i = _dirtyRects.begin(); i != _dirtyRects.end(); ++i) {
-		Rect r = *i;
-
-		const byte *srcP = (const byte *)_customSurface->getBasePtr(r.left, r.top);
-		g_system->copyRectToScreen(srcP, _customSurface->pitch, r.left, r.top, 
-			r.width(), r.height());
-	}
-
-	// Update the physical screen
-	g_system->updateScreen();
-
-	// Now that the dirty rects have been copied, clear the dirty rect list
-	_dirtyRects.clear();
+void GfxSurface::setScreenSurface() {
+	_screenSurface = true;
+	_customSurface = NULL;
+	_lockSurfaceCtr = 0;
 }
 
 /**
@@ -282,13 +254,11 @@ void GfxSurface::copyToScreen() {
  */
 void GfxSurface::create(int width, int height) {
 	assert((width >= 0) && (height >= 0));
-
-	// Delete any prior internal surface that may have been previously created
+	_screenSurface = false;
 	if (_customSurface) {
 		_customSurface->free();
 		delete _customSurface;
 	}
-
 	_customSurface = new Graphics::Surface();
 	_customSurface->create(width, height, Graphics::PixelFormat::createFormatCLUT8());
 	Common::fill((byte *)_customSurface->pixels, (byte *)_customSurface->pixels + (width * height), 0);
@@ -301,7 +271,13 @@ void GfxSurface::create(int width, int height) {
 Graphics::Surface GfxSurface::lockSurface() {
 	++_lockSurfaceCtr;
 
-	Graphics::Surface *src = _customSurface;
+	Graphics::Surface *src;
+	if (_screenSurface) {
+		if (_lockSurfaceCtr == 1)
+			_screenSurfaceP = g_system->lockScreen();
+		src = _screenSurfaceP;
+	} else
+		src = _customSurface;
 	assert(src);
 
 	// Setup the returned surface either as one pointing to the same pixels as the source, or
@@ -322,10 +298,15 @@ Graphics::Surface GfxSurface::lockSurface() {
 void GfxSurface::unlockSurface() {
 	assert(_lockSurfaceCtr > 0);
 	--_lockSurfaceCtr;
+
+	if ((_lockSurfaceCtr == 0) && _screenSurface) {
+		g_system->unlockScreen();
+	}
 }
 
 void GfxSurface::synchronize(Serializer &s) {
 	assert(!_lockSurfaceCtr);
+	assert(!_screenSurface);
 
 	s.syncAsByte(_disableUpdates);
 	_bounds.synchronize(s);
@@ -370,7 +351,6 @@ void GfxSurface::fillRect(const Rect &bounds, int color) {
 	Graphics::Surface surface = lockSurface();
 	surface.fillRect(bounds, color);
 	unlockSurface();
-	addDirtyRect(bounds);
 }
 
 GfxSurface &GfxSurface::operator=(const GfxSurface &s) {
@@ -383,6 +363,7 @@ GfxSurface &GfxSurface::operator=(const GfxSurface &s) {
 	}
 
 	_customSurface = s._customSurface;
+	_screenSurface = s._screenSurface;
 	_disableUpdates = s._disableUpdates;
 	_bounds = s._bounds;
 	_centroid = s._centroid;
@@ -586,17 +567,10 @@ void GfxSurface::copyFrom(GfxSurface &src, Rect srcBounds, Rect destBounds, Regi
 	if (destBounds.bottom > destSurface.h)
 		destBounds.bottom = destSurface.h;
 
-	if (destBounds.isValidRect() && (destBounds.left < SCREEN_WIDTH) && (destBounds.right >= 0) &&
-			(destBounds.top < SCREEN_HEIGHT) && (destBounds.bottom >= 0)) {
-		// Register the affected area as dirty
-		addDirtyRect(Rect(destBounds.left + _bounds.left, destBounds.top + _bounds.top,
-				destBounds.right + _bounds.left, destBounds.bottom + _bounds.top));
-
-		// Get pointers to the source and destination surface areas
+	if (destBounds.isValidRect()) {
 		const byte *pSrc = (const byte *)srcSurface.getBasePtr(srcX, srcY);
 		byte *pDest = (byte *)destSurface.getBasePtr(destBounds.left, destBounds.top);
 
-		// Loop through copying each row
 		for (int y = 0; y < destBounds.height(); ++y, pSrc += srcSurface.pitch, pDest += destSurface.pitch) {
 
 			if (!priorityRegion && (src._transColor == -1))
@@ -621,7 +595,6 @@ void GfxSurface::copyFrom(GfxSurface &src, Rect srcBounds, Rect destBounds, Regi
 		}
 	}
 
-	// Unlock the surfaces
 	unlockSurface();
 	srcImage.unlockSurface();
 }
@@ -640,68 +613,6 @@ void GfxSurface::draw(const Common::Point &pt, Rect *rect) {
 	}
 }
 
-/**
- * Merges any clipping rectangles that overlap to try and reduce
- * the total number of clip rectangles.
- */
-void GfxSurface::mergeDirtyRects() {
-	if (_dirtyRects.size() <= 1)
-		return;
-
-	Common::List<Rect>::iterator rOuter, rInner;
-
-	for (rOuter = _dirtyRects.begin(); rOuter != _dirtyRects.end(); ++rOuter) {
-		rInner = rOuter;
-		while (++rInner != _dirtyRects.end()) {
-
-			if (looseIntersectRectangle(*rOuter, *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;
-			}
-		}
-	}
-}
-
-/**
- * Check if the two rectangles are next to each other.
- * @param pSrc1			a source rectangle
- * @param pSrc2			a source rectangle
- */
-bool GfxSurface::looseIntersectRectangle(const Rect &src1, const Rect &src2) {
-	Rect destRect;
-
-	destRect.left   = MAX(src1.left, src2.left);
-	destRect.top    = MAX(src1.top, src2.top);
-	destRect.right  = MIN(src1.right, src2.right);
-	destRect.bottom = MIN(src1.bottom, src2.bottom);
-
-	return destRect.isValidRect();
-}
-
-/**
- * Creates the union of two rectangles.
- * Returns True if there is a union.
- * @param pDest			destination rectangle that is to receive the new union
- * @param pSrc1			a source rectangle
- * @param pSrc2			a source rectangle
- */
-bool GfxSurface::unionRectangle(Common::Rect &destRect, const Rect &src1, const Rect &src2) {
-	destRect.left   = MIN(src1.left, src2.left);
-	destRect.top    = MIN(src1.top, src2.top);
-	destRect.right  = MAX(src1.right, src2.right);
-	destRect.bottom = MAX(src1.bottom, src2.bottom);
-
-	return !destRect.isEmpty();
-}
-
 /*--------------------------------------------------------------------------*/
 
 GfxElement::GfxElement() {
@@ -728,9 +639,6 @@ void GfxElement::highlight() {
 	GfxManager &gfxManager = g_globals->gfxManager();
 	Graphics::Surface surface = gfxManager.lockSurface();
 
-	// Mark the area is dirty
-	gfxManager.addDirtyRect(_bounds);
-
 	// Scan through the contents of the element, switching any occurances of the foreground
 	// color with the background color and vice versa
 	Rect tempRect(_bounds);
@@ -826,7 +734,6 @@ void GfxElement::drawFrame() {
 	gfxManager.fillRect2(tempRect.right, tempRect.top + 2, 1, tempRect.height() - 3, 0);
 
 	gfxManager.unlockSurface();
-	gfxManager.addDirtyRect(_bounds);
 }
 
 /**
@@ -1183,7 +1090,7 @@ GfxButton *GfxDialog::execute(GfxButton *defaultButton) {
 		}
 
 		g_system->delayMillis(10);
-		GLOBALS._screenSurface.copyToScreen();
+		g_system->updateScreen();
 	}
 
 	_gfxManager.deactivate();
@@ -1267,11 +1174,6 @@ void GfxManager::fillArea(int xp, int yp, int color) {
 	_surface.fillRect(tempRect, color);
 }
 
-void GfxManager::addDirtyRect(const Rect &r) { 
-	_surface.addDirtyRect(Rect(r.left + _bounds.left, r.top + _bounds.top,
-		r.right + _bounds.left, r.bottom + _bounds.top));
-}
-
 void GfxManager::fillRect(const Rect &bounds, int color) {
 	_surface.setBounds(_bounds);
 	_surface.fillRect(bounds, color);
diff --git a/engines/tsage/graphics.h b/engines/tsage/graphics.h
index e32994505c..dba3401700 100644
--- a/engines/tsage/graphics.h
+++ b/engines/tsage/graphics.h
@@ -74,16 +74,12 @@ public:
 class GfxSurface {
 private:
 	Graphics::Surface *_customSurface;
+	Graphics::Surface *_screenSurfaceP;
 	int _lockSurfaceCtr;
+	bool _screenSurface;
 
 	bool _disableUpdates;
 	Rect _bounds;
-	bool _trackDirtyRects;
-	Common::List<Rect> _dirtyRects;
-
-	void mergeDirtyRects();
-	bool looseIntersectRectangle(const Rect &src1, const Rect &src2);
-	bool unionRectangle(Common::Rect &destRect, const Rect &src1, const Rect &src2);
 public:
 	Common::Point _centroid;
 	int _transColor;
@@ -92,9 +88,7 @@ public:
 	GfxSurface(const GfxSurface &s);
 	~GfxSurface();
 
-	void trackDirtyRects();
-	void addDirtyRect(const Rect &r);
-	void copyToScreen();
+	void setScreenSurface();
 	Graphics::Surface lockSurface();
 	void unlockSurface();
 	void synchronize(Serializer &s);
@@ -280,7 +274,6 @@ public:
 		return _surface.lockSurface();
 	}
 	void unlockSurface() { _surface.unlockSurface(); }
-	void addDirtyRect(const Rect &r);
 	void fillArea(int xp, int yp, int color);
 	void fillRect(const Rect &bounds, int color);
 	void fillRect2(int xs, int ys, int width, int height, int color);
@@ -308,6 +301,7 @@ public:
 	void copyFrom(GfxSurface &src, int destX, int destY) {
 		_surface.setBounds(_bounds);
 		_surface.copyFrom(src, destX, destY);
+		g_system->updateScreen();
 	}
 	GfxSurface &getSurface() {
 		_surface.setBounds(_bounds);
diff --git a/engines/tsage/ringworld/ringworld_dialogs.cpp b/engines/tsage/ringworld/ringworld_dialogs.cpp
index 0561a27055..233cbe5c4c 100644
--- a/engines/tsage/ringworld/ringworld_dialogs.cpp
+++ b/engines/tsage/ringworld/ringworld_dialogs.cpp
@@ -183,7 +183,7 @@ void RightClickDialog::execute() {
 		}
 
 		g_system->delayMillis(10);
-		GLOBALS._screenSurface.copyToScreen();
+		g_system->updateScreen();
 	}
 
 	_gfxManager.deactivate();
@@ -394,7 +394,7 @@ void InventoryDialog::execute() {
 		Event event;
 		while (!g_globals->_events.getEvent(event) && !g_vm->shouldQuit()) {
 			g_system->delayMillis(10);
-			GLOBALS._screenSurface.copyToScreen();
+			g_system->updateScreen();
 		}
 		if (g_vm->shouldQuit())
 			break;
diff --git a/engines/tsage/ringworld/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index 2ee4f99267..e37eddf80c 100644
--- a/engines/tsage/ringworld/ringworld_logic.cpp
+++ b/engines/tsage/ringworld/ringworld_logic.cpp
@@ -315,7 +315,7 @@ void SceneArea::wait() {
 	// Wait until a mouse or keypress
 	Event event;
 	while (!g_vm->shouldQuit() && !g_globals->_events.getEvent(event)) {
-		GLOBALS._screenSurface.copyToScreen();
+		g_system->updateScreen();
 		g_system->delayMillis(10);
 	}
 
diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp
index 6f3d1ed93a..81190aea7b 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes3.cpp
@@ -532,7 +532,7 @@ void Scene2100::Action1::signal() {
 			// Wait for an event
 			Event event;
 			if (!g_globals->_events.getEvent(event)) {
-				GLOBALS._screenSurface.copyToScreen();
+				g_system->updateScreen();
 				g_system->delayMillis(10);
 				continue;
 			}
@@ -2263,7 +2263,7 @@ void Scene2150::Action1::signal() {
 			// Wait for an event
 			Event event;
 			if (!g_globals->_events.getEvent(event)) {
-				GLOBALS._screenSurface.copyToScreen();
+				g_system->updateScreen();
 				g_system->delayMillis(10);
 				continue;
 			}
@@ -5118,7 +5118,7 @@ void Scene2320::Action3::signal() {
 			// Wait for an event
 			Event event;
 			if (!g_globals->_events.getEvent(event)) {
-				GLOBALS._screenSurface.copyToScreen();
+				g_system->updateScreen();
 				g_system->delayMillis(10);
 				continue;
 			}
diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index 7c8da54fac..49726eba2e 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes5.cpp
@@ -2810,7 +2810,7 @@ void Scene4150::Action1::signal() {
 	case 4: {
 		for (int idx = 100; idx >= 0; idx -= 5) {
 			g_globals->_scenePalette.fade(adjustData, false, idx);
-			GLOBALS._screenSurface.copyToScreen();
+			g_system->updateScreen();
 			g_system->delayMillis(10);
 		}
 
@@ -2838,7 +2838,7 @@ void Scene4150::Action1::signal() {
 	case 7:
 		for (int idx = 100; idx >= 0; idx -= 5) {
 			g_globals->_scenePalette.fade(adjustData, false, idx);
-			GLOBALS._screenSurface.copyToScreen();
+			g_system->updateScreen();
 			g_system->delayMillis(10);
 		}
 
diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
index 6035b37e19..ddb4eae9c4 100644
--- a/engines/tsage/ringworld2/ringworld2_dialogs.cpp
+++ b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
@@ -153,7 +153,7 @@ void RightClickDialog::execute() {
 		}
 
 		g_system->delayMillis(10);
-		GLOBALS._screenSurface.copyToScreen();
+		g_system->updateScreen();
 	}
 
 	// Execute the specified action
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 03c7d8d0ae..6362c63bc3 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -133,7 +133,7 @@ void SceneManager::fadeInIfNecessary() {
 				percent = 100;
 
 			g_globals->_scenePalette.fade((const byte *)&adjustData, false, percent);
-			GLOBALS._screenSurface.copyToScreen();
+			g_system->updateScreen();
 			g_system->delayMillis(10);
 		}
 
-- 
cgit v1.2.3


From 83acabfdbdf4a44ce94eb068574d9938df301b1f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 1 Jan 2012 16:31:56 +1100
Subject: TSAGE: Do all screen drawing in an intermediate temporary screen
 surface.

This will be the first half of properly handling on screen dirty rects.
---
 engines/tsage/blue_force/blueforce_dialogs.cpp  |  4 +--
 engines/tsage/converse.cpp                      |  2 +-
 engines/tsage/core.cpp                          |  4 +--
 engines/tsage/events.cpp                        |  4 +--
 engines/tsage/graphics.cpp                      | 34 ++++++++++---------------
 engines/tsage/graphics.h                        |  5 ++--
 engines/tsage/ringworld/ringworld_dialogs.cpp   |  4 +--
 engines/tsage/ringworld/ringworld_logic.cpp     |  2 +-
 engines/tsage/ringworld/ringworld_scenes3.cpp   |  6 ++---
 engines/tsage/ringworld/ringworld_scenes5.cpp   |  4 +--
 engines/tsage/ringworld2/ringworld2_dialogs.cpp |  2 +-
 engines/tsage/scenes.cpp                        |  2 +-
 12 files changed, 33 insertions(+), 40 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp
index 0aaae2fc29..a1ac19ecee 100644
--- a/engines/tsage/blue_force/blueforce_dialogs.cpp
+++ b/engines/tsage/blue_force/blueforce_dialogs.cpp
@@ -163,7 +163,7 @@ void RightClickDialog::execute() {
 		}
 
 		g_system->delayMillis(10);
-		g_system->updateScreen();
+		GLOBALS._screenSurface.updateScreen();
 	}
 
 	// Deactivate the graphics manager used for the dialog
@@ -244,7 +244,7 @@ void AmmoBeltDialog::execute() {
 		}
 
 		g_system->delayMillis(10);
-		g_system->updateScreen();
+		GLOBALS._screenSurface.updateScreen();
 	}
 
 	_gfxManager.deactivate();
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index a660c4b580..c3b48a7693 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -451,7 +451,7 @@ int ConversationChoiceDialog::execute(const Common::StringArray &choiceList) {
 		while (!g_globals->_events.getEvent(event, EVENT_KEYPRESS | EVENT_BUTTON_DOWN | EVENT_MOUSE_MOVE) &&
 				!g_vm->shouldQuit()) {
 			g_system->delayMillis(10);
-			g_system->updateScreen();
+			GLOBALS._screenSurface.updateScreen();
 		}
 		if (g_vm->shouldQuit())
 			break;
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 73e7901fde..7cbcb863c7 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1416,7 +1416,7 @@ void ScenePalette::fade(const byte *adjustData, bool fullAdjust, int percent) {
 
 	// Set the altered pale4tte
 	g_system->getPaletteManager()->setPalette((const byte *)&tempPalette[0], 0, 256);
-	g_system->updateScreen();
+	GLOBALS._screenSurface.updateScreen();
 }
 
 PaletteRotation *ScenePalette::addRotation(int start, int end, int rotationMode, int duration, Action *action) {
@@ -1714,7 +1714,7 @@ void SceneItem::display(int resNum, int lineNum, ...) {
 		// Keep event on-screen until a mouse or keypress
 		while (!g_vm->shouldQuit() && !g_globals->_events.getEvent(event,
 				EVENT_BUTTON_DOWN | EVENT_KEYPRESS)) {
-			g_system->updateScreen();
+			GLOBALS._screenSurface.updateScreen();
 			g_system->delayMillis(10);
 		}
 
diff --git a/engines/tsage/events.cpp b/engines/tsage/events.cpp
index 152570b187..8f07a8243b 100644
--- a/engines/tsage/events.cpp
+++ b/engines/tsage/events.cpp
@@ -50,7 +50,7 @@ bool EventsClass::pollEvent() {
 		++_frameNumber;
 
 		// Update screen
-		g_system->updateScreen();
+		GLOBALS._screenSurface.updateScreen();
 	}
 
 	if (!g_system->getEventManager()->pollEvent(_event)) return false;
@@ -395,7 +395,7 @@ void EventsClass::delay(int numFrames) {
 		_priorFrameTime = g_system->getMillis();
 	}
 
-	g_system->updateScreen();
+	GLOBALS._screenSurface.updateScreen();
 	_prevDelayFrame = _frameNumber;
 	_priorFrameTime = g_system->getMillis();
 }
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 171167c2ea..a22e0a80d1 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -220,10 +220,8 @@ void Rect::synchronize(Serializer &s) {
 
 GfxSurface::GfxSurface() : _bounds(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT) {
 	_disableUpdates = false;
-	_screenSurface = false;
 	_lockSurfaceCtr = 0;
 	_customSurface = NULL;
-	_screenSurfaceP = NULL;
 	_transColor = -1;
 }
 
@@ -244,9 +242,17 @@ GfxSurface::~GfxSurface() {
  * Specifies that the surface will encapsulate the ScummVM screen surface
  */
 void GfxSurface::setScreenSurface() {
-	_screenSurface = true;
-	_customSurface = NULL;
-	_lockSurfaceCtr = 0;
+	_trackDirtyRects = true;
+	create(SCREEN_WIDTH, SCREEN_HEIGHT);
+}
+
+/**
+ * Updates the physical screen with the screen surface buffer
+ */
+void GfxSurface::updateScreen() {
+	g_system->copyRectToScreen((const byte *)this->_customSurface->pixels,
+		SCREEN_WIDTH, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
+	g_system->updateScreen();
 }
 
 /**
@@ -254,7 +260,7 @@ void GfxSurface::setScreenSurface() {
  */
 void GfxSurface::create(int width, int height) {
 	assert((width >= 0) && (height >= 0));
-	_screenSurface = false;
+
 	if (_customSurface) {
 		_customSurface->free();
 		delete _customSurface;
@@ -271,13 +277,7 @@ void GfxSurface::create(int width, int height) {
 Graphics::Surface GfxSurface::lockSurface() {
 	++_lockSurfaceCtr;
 
-	Graphics::Surface *src;
-	if (_screenSurface) {
-		if (_lockSurfaceCtr == 1)
-			_screenSurfaceP = g_system->lockScreen();
-		src = _screenSurfaceP;
-	} else
-		src = _customSurface;
+	Graphics::Surface *src = _customSurface;
 	assert(src);
 
 	// Setup the returned surface either as one pointing to the same pixels as the source, or
@@ -298,15 +298,10 @@ Graphics::Surface GfxSurface::lockSurface() {
 void GfxSurface::unlockSurface() {
 	assert(_lockSurfaceCtr > 0);
 	--_lockSurfaceCtr;
-
-	if ((_lockSurfaceCtr == 0) && _screenSurface) {
-		g_system->unlockScreen();
-	}
 }
 
 void GfxSurface::synchronize(Serializer &s) {
 	assert(!_lockSurfaceCtr);
-	assert(!_screenSurface);
 
 	s.syncAsByte(_disableUpdates);
 	_bounds.synchronize(s);
@@ -363,7 +358,6 @@ GfxSurface &GfxSurface::operator=(const GfxSurface &s) {
 	}
 
 	_customSurface = s._customSurface;
-	_screenSurface = s._screenSurface;
 	_disableUpdates = s._disableUpdates;
 	_bounds = s._bounds;
 	_centroid = s._centroid;
@@ -1090,7 +1084,7 @@ GfxButton *GfxDialog::execute(GfxButton *defaultButton) {
 		}
 
 		g_system->delayMillis(10);
-		g_system->updateScreen();
+		GLOBALS._screenSurface.updateScreen();
 	}
 
 	_gfxManager.deactivate();
diff --git a/engines/tsage/graphics.h b/engines/tsage/graphics.h
index dba3401700..afc9ba8c52 100644
--- a/engines/tsage/graphics.h
+++ b/engines/tsage/graphics.h
@@ -74,9 +74,8 @@ public:
 class GfxSurface {
 private:
 	Graphics::Surface *_customSurface;
-	Graphics::Surface *_screenSurfaceP;
 	int _lockSurfaceCtr;
-	bool _screenSurface;
+	bool _trackDirtyRects;
 
 	bool _disableUpdates;
 	Rect _bounds;
@@ -89,6 +88,7 @@ public:
 	~GfxSurface();
 
 	void setScreenSurface();
+	void updateScreen();
 	Graphics::Surface lockSurface();
 	void unlockSurface();
 	void synchronize(Serializer &s);
@@ -301,7 +301,6 @@ public:
 	void copyFrom(GfxSurface &src, int destX, int destY) {
 		_surface.setBounds(_bounds);
 		_surface.copyFrom(src, destX, destY);
-		g_system->updateScreen();
 	}
 	GfxSurface &getSurface() {
 		_surface.setBounds(_bounds);
diff --git a/engines/tsage/ringworld/ringworld_dialogs.cpp b/engines/tsage/ringworld/ringworld_dialogs.cpp
index 233cbe5c4c..0e451b8429 100644
--- a/engines/tsage/ringworld/ringworld_dialogs.cpp
+++ b/engines/tsage/ringworld/ringworld_dialogs.cpp
@@ -183,7 +183,7 @@ void RightClickDialog::execute() {
 		}
 
 		g_system->delayMillis(10);
-		g_system->updateScreen();
+		GLOBALS._screenSurface.updateScreen();
 	}
 
 	_gfxManager.deactivate();
@@ -394,7 +394,7 @@ void InventoryDialog::execute() {
 		Event event;
 		while (!g_globals->_events.getEvent(event) && !g_vm->shouldQuit()) {
 			g_system->delayMillis(10);
-			g_system->updateScreen();
+			GLOBALS._screenSurface.updateScreen();
 		}
 		if (g_vm->shouldQuit())
 			break;
diff --git a/engines/tsage/ringworld/ringworld_logic.cpp b/engines/tsage/ringworld/ringworld_logic.cpp
index e37eddf80c..00c219f2ee 100644
--- a/engines/tsage/ringworld/ringworld_logic.cpp
+++ b/engines/tsage/ringworld/ringworld_logic.cpp
@@ -315,7 +315,7 @@ void SceneArea::wait() {
 	// Wait until a mouse or keypress
 	Event event;
 	while (!g_vm->shouldQuit() && !g_globals->_events.getEvent(event)) {
-		g_system->updateScreen();
+		GLOBALS._screenSurface.updateScreen();
 		g_system->delayMillis(10);
 	}
 
diff --git a/engines/tsage/ringworld/ringworld_scenes3.cpp b/engines/tsage/ringworld/ringworld_scenes3.cpp
index 81190aea7b..0e4ccd1269 100644
--- a/engines/tsage/ringworld/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes3.cpp
@@ -532,7 +532,7 @@ void Scene2100::Action1::signal() {
 			// Wait for an event
 			Event event;
 			if (!g_globals->_events.getEvent(event)) {
-				g_system->updateScreen();
+				GLOBALS._screenSurface.updateScreen();
 				g_system->delayMillis(10);
 				continue;
 			}
@@ -2263,7 +2263,7 @@ void Scene2150::Action1::signal() {
 			// Wait for an event
 			Event event;
 			if (!g_globals->_events.getEvent(event)) {
-				g_system->updateScreen();
+				GLOBALS._screenSurface.updateScreen();
 				g_system->delayMillis(10);
 				continue;
 			}
@@ -5118,7 +5118,7 @@ void Scene2320::Action3::signal() {
 			// Wait for an event
 			Event event;
 			if (!g_globals->_events.getEvent(event)) {
-				g_system->updateScreen();
+				GLOBALS._screenSurface.updateScreen();
 				g_system->delayMillis(10);
 				continue;
 			}
diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index 49726eba2e..3b415bdb6a 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes5.cpp
@@ -2810,7 +2810,7 @@ void Scene4150::Action1::signal() {
 	case 4: {
 		for (int idx = 100; idx >= 0; idx -= 5) {
 			g_globals->_scenePalette.fade(adjustData, false, idx);
-			g_system->updateScreen();
+			GLOBALS._screenSurface.updateScreen();
 			g_system->delayMillis(10);
 		}
 
@@ -2838,7 +2838,7 @@ void Scene4150::Action1::signal() {
 	case 7:
 		for (int idx = 100; idx >= 0; idx -= 5) {
 			g_globals->_scenePalette.fade(adjustData, false, idx);
-			g_system->updateScreen();
+			GLOBALS._screenSurface.updateScreen();
 			g_system->delayMillis(10);
 		}
 
diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
index ddb4eae9c4..5178fe6418 100644
--- a/engines/tsage/ringworld2/ringworld2_dialogs.cpp
+++ b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
@@ -153,7 +153,7 @@ void RightClickDialog::execute() {
 		}
 
 		g_system->delayMillis(10);
-		g_system->updateScreen();
+		GLOBALS._screenSurface.updateScreen();
 	}
 
 	// Execute the specified action
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 6362c63bc3..9d75808dbf 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -133,7 +133,7 @@ void SceneManager::fadeInIfNecessary() {
 				percent = 100;
 
 			g_globals->_scenePalette.fade((const byte *)&adjustData, false, percent);
-			g_system->updateScreen();
+			GLOBALS._screenSurface.updateScreen();
 			g_system->delayMillis(10);
 		}
 
-- 
cgit v1.2.3


From 54d0f8124e1a934e04cb71f48e189af535c63fa2 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 1 Jan 2012 16:35:10 +1100
Subject: TSAGE: Bugfix for #3467505 - crash viewing ammo belt when the clip is
 empty

---
 engines/tsage/blue_force/blueforce_dialogs.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_dialogs.cpp b/engines/tsage/blue_force/blueforce_dialogs.cpp
index a1ac19ecee..a76d5839a9 100644
--- a/engines/tsage/blue_force/blueforce_dialogs.cpp
+++ b/engines/tsage/blue_force/blueforce_dialogs.cpp
@@ -344,7 +344,7 @@ void AmmoBeltDialog::draw() {
 
 	// Draw the first clip if necessary
 	if (clip1) {
-		GfxSurface clipSurface = surfaceFromRes(9, 6, BF_GLOBALS._clip1Bullets);
+		GfxSurface clipSurface = surfaceFromRes(9, 6, BF_GLOBALS._clip1Bullets + 1);
 		_clip1Rect.resize(clipSurface, _clip1Rect.left, _clip1Rect.top, 100);
 		g_globals->gfxManager().copyFrom(clipSurface, bounds.left + _clip1Rect.left,
 			bounds.top + _clip1Rect.top);
@@ -352,7 +352,7 @@ void AmmoBeltDialog::draw() {
 
 	// Draw the second clip if necessary
 	if (clip2) {
-		GfxSurface clipSurface = surfaceFromRes(9, 6, BF_GLOBALS._clip2Bullets);
+		GfxSurface clipSurface = surfaceFromRes(9, 6, BF_GLOBALS._clip2Bullets + 1);
 		_clip2Rect.resize(clipSurface, _clip2Rect.left, _clip2Rect.top, 100);
 		g_globals->gfxManager().copyFrom(clipSurface, bounds.left + _clip2Rect.left,
 			bounds.top + _clip2Rect.top);
-- 
cgit v1.2.3


From be706b1846bd2bff802d3da9fc24a0feed2078e8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 1 Jan 2012 17:46:02 +1100
Subject: TSAGE: Implemented a cleaner version of dirty rect handling

---
 engines/tsage/graphics.cpp | 111 ++++++++++++++++++++++++++++++++++++++++++++-
 engines/tsage/graphics.h   |  10 +++-
 2 files changed, 118 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index a22e0a80d1..af3a2f9199 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -250,11 +250,44 @@ void GfxSurface::setScreenSurface() {
  * Updates the physical screen with the screen surface buffer
  */
 void GfxSurface::updateScreen() {
-	g_system->copyRectToScreen((const byte *)this->_customSurface->pixels,
-		SCREEN_WIDTH, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
+	assert(_trackDirtyRects);
+
+	// Merge any overlapping dirty rects
+	mergeDirtyRects();
+
+	// Loop through the dirty rect list to copy the affected areas to the sc
+	for (Common::List<Rect>::iterator i = _dirtyRects.begin(); i != _dirtyRects.end(); ++i) {
+		Rect r = *i;
+
+		const byte *srcP = (const byte *)_customSurface->getBasePtr(r.left, r.top);
+		g_system->copyRectToScreen(srcP, _customSurface->pitch, r.left, r.top, 
+			r.width(), r.height());
+	}
+
+	// Update the physical screen
 	g_system->updateScreen();
+
+	// Now that the dirty rects have been copied, clear the dirty rect list
+	_dirtyRects.clear();
 }
 
+/**
+ * Adds a rect to the dirty rect list
+ */
+void GfxSurface::addDirtyRect(const Rect &r) {
+	if (_trackDirtyRects) {
+		// Get the bounds and adjust to allow for sub-screen areas
+		Rect r2 = r;
+		r2.translate(_bounds.left, _bounds.top);
+
+		// Add to the dirty rect list
+		_dirtyRects.push_back(Rect(r2.left, r2.top, 
+		MIN(r2.right + 1, SCREEN_WIDTH), MIN(r2.bottom + 1, SCREEN_HEIGHT)));
+	}
+}
+
+
+
 /**
  * Specifies that the surface should maintain it's own internal surface
  */
@@ -346,6 +379,7 @@ void GfxSurface::fillRect(const Rect &bounds, int color) {
 	Graphics::Surface surface = lockSurface();
 	surface.fillRect(bounds, color);
 	unlockSurface();
+	addDirtyRect(bounds);
 }
 
 GfxSurface &GfxSurface::operator=(const GfxSurface &s) {
@@ -562,6 +596,9 @@ void GfxSurface::copyFrom(GfxSurface &src, Rect srcBounds, Rect destBounds, Regi
 		destBounds.bottom = destSurface.h;
 
 	if (destBounds.isValidRect()) {
+		// Register the affected area as dirty
+		addDirtyRect(destBounds);
+
 		const byte *pSrc = (const byte *)srcSurface.getBasePtr(srcX, srcY);
 		byte *pDest = (byte *)destSurface.getBasePtr(destBounds.left, destBounds.top);
 
@@ -607,6 +644,68 @@ void GfxSurface::draw(const Common::Point &pt, Rect *rect) {
 	}
 }
 
+/**
+ * Merges any clipping rectangles that overlap to try and reduce
+ * the total number of clip rectangles.
+ */
+void GfxSurface::mergeDirtyRects() {
+	if (_dirtyRects.size() <= 1)
+		return;
+
+	Common::List<Rect>::iterator rOuter, rInner;
+
+	for (rOuter = _dirtyRects.begin(); rOuter != _dirtyRects.end(); ++rOuter) {
+		rInner = rOuter;
+		while (++rInner != _dirtyRects.end()) {
+
+			if (looseIntersectRectangle(*rOuter, *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;
+			}
+		}
+	}
+}
+
+/**
+ * Check if the two rectangles are next to each other.
+ * @param pSrc1			a source rectangle
+ * @param pSrc2			a source rectangle
+ */
+bool GfxSurface::looseIntersectRectangle(const Rect &src1, const Rect &src2) {
+	Rect destRect;
+
+	destRect.left   = MAX(src1.left, src2.left);
+	destRect.top    = MAX(src1.top, src2.top);
+	destRect.right  = MIN(src1.right, src2.right);
+	destRect.bottom = MIN(src1.bottom, src2.bottom);
+
+	return destRect.isValidRect();
+}
+
+/**
+ * Creates the union of two rectangles.
+ * Returns True if there is a union.
+ * @param pDest			destination rectangle that is to receive the new union
+ * @param pSrc1			a source rectangle
+ * @param pSrc2			a source rectangle
+ */
+bool GfxSurface::unionRectangle(Common::Rect &destRect, const Rect &src1, const Rect &src2) {
+	destRect.left   = MIN(src1.left, src2.left);
+	destRect.top    = MIN(src1.top, src2.top);
+	destRect.right  = MAX(src1.right, src2.right);
+	destRect.bottom = MAX(src1.bottom, src2.bottom);
+
+	return !destRect.isEmpty();
+}
+
 /*--------------------------------------------------------------------------*/
 
 GfxElement::GfxElement() {
@@ -646,6 +745,9 @@ void GfxElement::highlight() {
 		}
 	}
 
+	// Mark the affected area as dirty
+	gfxManager.getSurface().addDirtyRect(tempRect);
+
 	// Release the surface
 	gfxManager.unlockSurface();
 }
@@ -1422,7 +1524,12 @@ int GfxFont::writeChar(const char ch) {
 		}
 	}
 
+	// Mark the affected area as dirty
+	_gfxManager->getSurface().addDirtyRect(charRect);
+
+	// Move the text writing position
 	_position.x += charWidth;
+
 	_gfxManager->unlockSurface();
 	return charWidth;
 }
diff --git a/engines/tsage/graphics.h b/engines/tsage/graphics.h
index afc9ba8c52..ba4090317b 100644
--- a/engines/tsage/graphics.h
+++ b/engines/tsage/graphics.h
@@ -75,10 +75,17 @@ class GfxSurface {
 private:
 	Graphics::Surface *_customSurface;
 	int _lockSurfaceCtr;
-	bool _trackDirtyRects;
 
 	bool _disableUpdates;
 	Rect _bounds;
+
+	bool _trackDirtyRects;
+	Common::List<Rect> _dirtyRects;
+
+	void mergeDirtyRects();
+	bool looseIntersectRectangle(const Rect &src1, const Rect &src2);
+	bool unionRectangle(Common::Rect &destRect, const Rect &src1, const Rect &src2);
+
 public:
 	Common::Point _centroid;
 	int _transColor;
@@ -89,6 +96,7 @@ public:
 
 	void setScreenSurface();
 	void updateScreen();
+	void addDirtyRect(const Rect &r);
 	Graphics::Surface lockSurface();
 	void unlockSurface();
 	void synchronize(Serializer &s);
-- 
cgit v1.2.3


From fe552696533e47b79d1299c831dfda98de884b01 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 1 Jan 2012 20:14:37 +1100
Subject: TSAGE: Bugfix for trying to draw off screen objects, which was
 causing invalid dirty rects

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

(limited to 'engines')

diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index af3a2f9199..4db898662f 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -595,7 +595,8 @@ void GfxSurface::copyFrom(GfxSurface &src, Rect srcBounds, Rect destBounds, Regi
 	if (destBounds.bottom > destSurface.h)
 		destBounds.bottom = destSurface.h;
 
-	if (destBounds.isValidRect()) {
+	if (destBounds.isValidRect() && !((destBounds.right < 0) || (destBounds.bottom < 0)
+			|| (destBounds.left >= SCREEN_WIDTH) || (destBounds.top >= SCREEN_HEIGHT))) {
 		// Register the affected area as dirty
 		addDirtyRect(destBounds);
 
-- 
cgit v1.2.3


From 2858328e2865da7271881dca80985c564ce1f317 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 1 Jan 2012 11:07:48 +0100
Subject: JANITORIAL: Remove SVN tags

---
 engines/sci/graphics/text32.cpp | 3 ---
 engines/sci/graphics/text32.h   | 3 ---
 2 files changed, 6 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/graphics/text32.cpp b/engines/sci/graphics/text32.cpp
index fd6637f313..000bb691dc 100644
--- a/engines/sci/graphics/text32.cpp
+++ b/engines/sci/graphics/text32.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/engines/sci/graphics/text16.cpp $
- * $Id: text16.cpp 55178 2011-01-08 23:16:44Z thebluegr $
- *
  */
 
 #include "common/util.h"
diff --git a/engines/sci/graphics/text32.h b/engines/sci/graphics/text32.h
index 3a411ce663..3c1898858b 100644
--- a/engines/sci/graphics/text32.h
+++ b/engines/sci/graphics/text32.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/engines/sci/graphics/text16.h $
- * $Id: text16.h 55178 2011-01-08 23:16:44Z thebluegr $
- *
  */
 
 #ifndef SCI_GRAPHICS_TEXT32_H
-- 
cgit v1.2.3


From 23a5bc61af0124bb3851d681957f2f094bc31a39 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sun, 1 Jan 2012 17:14:29 +0100
Subject: SCUMM: Don't hide scumm detector debug message for certain cases

---
 engines/scumm/detection.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 2ae994040b..d925cc9198 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -585,7 +585,6 @@ static void detectGames(const Common::FSList &fslist, Common::List<DetectorResul
 
 					// Print some debug info
 					int filesize = tmp->size();
-					if (d.md5Entry->filesize != filesize)
 					debug(1, "SCUMM detector found matching file '%s' with MD5 %s, size %d\n",
 						file.c_str(), md5str.c_str(), filesize);
 
-- 
cgit v1.2.3


From 5af464243ab1bde5f5b5e3a610825372394e1761 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sun, 1 Jan 2012 21:21:56 +0100
Subject: SCUMM: Add support for 2 Dutch/Mac spyfox demos (1 MD5, 1 filename
 pattern)

---
 engines/scumm/detection_tables.h | 2 +-
 engines/scumm/scumm-md5.h        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index c75089f8ca..bd2ff3062b 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -852,7 +852,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "spyfox", "JAMESDEM", kGenHEPC, Common::FR_FRA, UNK, 0 },
 	{ "spyfox", "renard", kGenHEPC, Common::FR_FRA, UNK, 0 },
 	{ "spyfox", "Spydemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
-	{ "spyfox", "Spydemo", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "spyfox", "Spydemo", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "spyfox", "SPYFox", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "spyfox", "SPYFoxDC", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "spyfox", "SPYFoxDC", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index cb36743ee2..06e779c164 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 Dec 22 23:21:30 2011
+  This file was generated by the md5table tool on Sun Jan  1 20:12:16 2012
   DO NOT EDIT MANUALLY!
  */
 
@@ -211,7 +211,7 @@ static const MD5Table md5table[] = {
 	{ "4dbff3787aedcd96b0b325f2d92d7ad9", "maze", "HE 100", "Updated", -1, Common::EN_USA, Common::kPlatformUnknown },
 	{ "4dc780f1bc587a193ce8a97652791438", "loom", "EGA", "EGA", -1, Common::EN_ANY, Common::kPlatformAmiga },
 	{ "4e5867848ee61bc30d157e2c94eee9b4", "PuttTime", "HE 90", "Demo", 18394, Common::EN_USA, Common::kPlatformUnknown },
-	{ "4edbf9d03550f7ba01e7f34d69b678dd", "spyfox", "HE 98.5", "Demo", -1, Common::NL_NLD, Common::kPlatformWindows },
+	{ "4edbf9d03550f7ba01e7f34d69b678dd", "spyfox", "HE 98.5", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "4f04b321a95d4315ce6d65f8e1dd0368", "maze", "HE 80", "", -1, Common::EN_USA, Common::kPlatformUnknown },
 	{ "4f138ac6f9b2ac5a41bc68b2c3296064", "freddi4", "HE 99", "", -1, Common::FR_FRA, Common::kPlatformWindows },
 	{ "4f1d6f8b38343dba405472538b5037ed", "fbear", "HE 62", "", 7717, Common::EN_ANY, Common::kPlatformPC },
@@ -610,6 +610,7 @@ static const MD5Table md5table[] = {
 	{ "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::kPlatformPC },
+	{ "f2ec78e50bdc63b70044e9758be10914", "spyfox", "HE 98.5", "Demo", -1, Common::NL_NLD, Common::kPlatformMacintosh },
 	{ "f3d55aea441e260e9e9c7d2a187097e0", "puttzoo", "", "Demo", 14337, Common::EN_ANY, Common::kPlatformWindows },
 	{ "f40a7f495f59188ca57a9d1d50301bb6", "puttputt", "HE 60", "Demo", -1, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "f5228b0cc1c19e6ea8268ba2eeb61f60", "freddi", "HE 73", "Demo", -1, Common::FR_FRA, Common::kPlatformWindows },
-- 
cgit v1.2.3


From 3f17a3ff252e802858912818f166539604d8fb86 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 2 Jan 2012 09:27:24 +1100
Subject: TSAGE: Simplified some of the dirty rect code to use existing Rect
 methods

---
 engines/tsage/graphics.cpp | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 4db898662f..4b9a4ad5ad 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -659,7 +659,7 @@ void GfxSurface::mergeDirtyRects() {
 		rInner = rOuter;
 		while (++rInner != _dirtyRects.end()) {
 
-			if (looseIntersectRectangle(*rOuter, *rInner)) {
+			if ((*rOuter).intersects(*rInner)) {
 				// these two rectangles overlap or
 				// are next to each other - merge them
 
@@ -675,22 +675,6 @@ void GfxSurface::mergeDirtyRects() {
 	}
 }
 
-/**
- * Check if the two rectangles are next to each other.
- * @param pSrc1			a source rectangle
- * @param pSrc2			a source rectangle
- */
-bool GfxSurface::looseIntersectRectangle(const Rect &src1, const Rect &src2) {
-	Rect destRect;
-
-	destRect.left   = MAX(src1.left, src2.left);
-	destRect.top    = MAX(src1.top, src2.top);
-	destRect.right  = MIN(src1.right, src2.right);
-	destRect.bottom = MIN(src1.bottom, src2.bottom);
-
-	return destRect.isValidRect();
-}
-
 /**
  * Creates the union of two rectangles.
  * Returns True if there is a union.
@@ -699,10 +683,8 @@ bool GfxSurface::looseIntersectRectangle(const Rect &src1, const Rect &src2) {
  * @param pSrc2			a source rectangle
  */
 bool GfxSurface::unionRectangle(Common::Rect &destRect, const Rect &src1, const Rect &src2) {
-	destRect.left   = MIN(src1.left, src2.left);
-	destRect.top    = MIN(src1.top, src2.top);
-	destRect.right  = MAX(src1.right, src2.right);
-	destRect.bottom = MAX(src1.bottom, src2.bottom);
+	destRect = src1;
+	destRect.extend(src2);
 
 	return !destRect.isEmpty();
 }
-- 
cgit v1.2.3


From 300a04700a94a3899f76300cfe7eda3a5756caef Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 2 Jan 2012 10:17:44 +1100
Subject: TSAGE: Implemented changes for dirty rect handling needed for R2R

---
 engines/tsage/graphics.cpp | 19 +++++++++++++++++++
 engines/tsage/graphics.h   | 12 +++---------
 2 files changed, 22 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 4b9a4ad5ad..8436afe2e8 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -1301,6 +1301,25 @@ int GfxManager::getAngle(const Common::Point &p1, const Common::Point &p2) {
 		return result;
 	}
 }
+
+
+void GfxManager::copyFrom(GfxSurface &src, Rect destBounds, Region *priorityRegion) {
+	if (&_surface == &(GLOBALS._screenSurface))
+		_surface.setBounds(Rect(0, 0, _bounds.width(), _bounds.height()));
+	else
+		_surface.setBounds(_bounds);
+
+	_surface.copyFrom(src, destBounds, priorityRegion);
+}
+void GfxManager::copyFrom(GfxSurface &src, int destX, int destY) {
+	if (&_surface == &(GLOBALS._screenSurface))
+		_surface.setBounds(Rect(0, 0, _bounds.width(), _bounds.height()));
+	else
+		_surface.setBounds(_bounds);
+
+	_surface.copyFrom(src, destX, destY);
+}
+
 /*--------------------------------------------------------------------------*/
 
 
diff --git a/engines/tsage/graphics.h b/engines/tsage/graphics.h
index ba4090317b..9c6f13e407 100644
--- a/engines/tsage/graphics.h
+++ b/engines/tsage/graphics.h
@@ -83,7 +83,6 @@ private:
 	Common::List<Rect> _dirtyRects;
 
 	void mergeDirtyRects();
-	bool looseIntersectRectangle(const Rect &src1, const Rect &src2);
 	bool unionRectangle(Common::Rect &destRect, const Rect &src1, const Rect &src2);
 
 public:
@@ -302,14 +301,9 @@ public:
 	virtual void set(byte *dest, int size, byte val) {
 		Common::fill(dest, dest + size, val);
 	}
-	void copyFrom(GfxSurface &src, Rect destBounds, Region *priorityRegion = NULL) {
-		_surface.setBounds(_bounds);
-		_surface.copyFrom(src, destBounds, priorityRegion);
-	}
-	void copyFrom(GfxSurface &src, int destX, int destY) {
-		_surface.setBounds(_bounds);
-		_surface.copyFrom(src, destX, destY);
-	}
+	void copyFrom(GfxSurface &src, Rect destBounds, Region *priorityRegion = NULL);
+	void copyFrom(GfxSurface &src, int destX, int destY);
+
 	GfxSurface &getSurface() {
 		_surface.setBounds(_bounds);
 		return _surface;
-- 
cgit v1.2.3


From 79328a393f9f42b006ab46b7da4a2919e710b539 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 3 Jan 2012 13:34:10 +0100
Subject: TSAGE: R2R - Preliminar implementation of scene 3600

---
 engines/tsage/globals.cpp                        |   2 +
 engines/tsage/globals.h                          |   1 +
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   3 +-
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 696 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h    |  69 +++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 201 +++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   |  30 +
 7 files changed, 1001 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index e18f3c12eb..2988a87861 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -376,6 +376,7 @@ void Ringworld2Globals::reset() {
 
 	// Reset fields
 	_v558B6.set(0, 0, 0, 0);
+	_v558C2 = 0;
 	_v5657C = 0;
 	_v565F5 = 0;
 	_v565AE = 0;
@@ -418,6 +419,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 
 	_v558B6.synchronize(s);
 
+	s.syncAsSint16LE(_v558C2);
 	s.syncAsSint16LE(_v5657C);
 	s.syncAsSint16LE(_v565F5);
 	s.syncAsSint16LE(_v56A9E);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index f50cb70773..8c84a4ecfd 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -249,6 +249,7 @@ public:
 	StripProxy _stripProxy;
 	int _insetUp;
 	Rect _v558B6;
+	int _v558C2;
 	int _v565F5;
 	int _v5657C;
 	byte _v565AE;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 537b34b4bb..0d8e5fda88 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -225,8 +225,9 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 3400:
 		return new Scene3400();
 	case 3500:
-	case 3600:
 		error("Missing scene %d from group 3", sceneNumber);
+	case 3600:
+		return new Scene3600();
 	case 3700:
 		// Cutscene - Teleport outside
 		return new Scene3700();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 61fc6a7796..a819f2708a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -2884,6 +2884,702 @@ void Scene3400::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3600 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene3600::Scene3600() {
+	_field2548 = 0;
+	_field254A = 0;
+	_field254C = 0;
+	_field254E = 0;
+	_field2550 = false;
+}
+void Scene3600::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field2548);
+	s.syncAsSint16LE(_field254A);
+	s.syncAsSint16LE(_field254C);
+	s.syncAsSint16LE(_field254E);
+	s.syncAsSint16LE(_field2550);
+}
+
+Scene3600::Action3600::Action3600() {
+	_field1E = 0;
+	_field20 = 0;
+}
+
+void Scene3600::Action3600::synchronize(Serializer &s) {
+	Action::synchronize(s);
+
+	s.syncAsSint16LE(_field1E);
+	s.syncAsSint16LE(_field20);
+}
+
+void Scene3600::Action3600::signal() {
+	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex) {
+	case 0:
+		++_actionIndex;
+		setDelay(60);
+		break;
+	case 1:
+		if (_field1E == 0) {
+			_field1E = 1;
+			scene->_actor2.setAction(NULL);
+			R2_GLOBALS._sound2.play(330, NULL, 0);
+			R2_GLOBALS._sound2.fade(127, 5, 10, false, NULL);
+		}
+		setDelay(1);
+		warning("TODO: Palette fader using parameter 2 = 256"); 
+		R2_GLOBALS._scenePalette.fade((const byte *)&scene->_palette1._palette, true, _field20);
+		if (_field20 > 0)
+			_field20 -= 2;
+		break;
+	case 2:
+		R2_GLOBALS._sound2.stop();
+		++_actionIndex;
+		setDelay(3);
+		break;
+	case 3:
+		R2_GLOBALS._sound2.play(330, this, 0);
+		R2_GLOBALS._sound2.fade(127, 5, 10, false, NULL);
+		_actionIndex = 1;
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene3600::Action2::signal() {
+	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex) {
+	case 3621:
+		R2_GLOBALS._events.proc1();
+		R2_GLOBALS._player.enableControl();
+		_actionIndex = 3619;
+		scene->_sequenceManager1._action = NULL;
+		warning("CHECKME: use of scene->_sequenceManager1._action");
+	// No break on purpose
+	case 3619: {
+		++_actionIndex;
+		scene->_actor13.setup(3127, 2, 1);
+		scene->_actor13.animate(ANIM_MODE_1, NULL);
+		Common::Point pt(226, 152);
+		warning("TODO: Fix use of SceneActor::_field8A and SceneActor::_field8C");
+		NpcMover *mover = new NpcMover();
+		scene->_actor13.addMover(mover, &scene->_actor13._position, scene);
+		}
+		break;
+	default:
+		_actionIndex = 3619;
+		setDelay(360);
+		break;
+	}
+}
+
+bool Scene3600::Item5::startAction(CursorType action, Event &event) {
+	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action != CURSOR_USE) || (scene->_action1._field1E == 0))
+		return SceneItem::startAction(action, event);
+
+	R2_GLOBALS._walkRegions.disableRegion(2);
+	R2_GLOBALS._walkRegions.disableRegion(7);
+
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 3624;
+	scene->_actor10.setStrip2(-1);
+	scene->_actor11.setStrip2(-1);
+	scene->_actor12.setStrip2(-1);
+	scene->_actor4.setStrip2(-1);
+
+	if (R2_GLOBALS._player._characterIndex == 2)
+		R2_GLOBALS._player.setAction(&scene->_sequenceManager3, scene, 3611, &R2_GLOBALS._player, NULL);
+	else if (R2_GLOBALS._player._characterIndex == 3)
+		R2_GLOBALS._player.setAction(&scene->_sequenceManager4, scene, 3612, &R2_GLOBALS._player, NULL);
+	else
+		R2_GLOBALS._player.setAction(&scene->_sequenceManager2, scene, 3610, &R2_GLOBALS._player, NULL);
+
+	return true;
+}
+
+bool Scene3600::Actor13::startAction(CursorType action, Event &event) {
+	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
+
+	switch(action) {
+	case CURSOR_TALK:
+		if (!_action)
+			return SceneActor::startAction(action, event);
+
+		scene->_protectorSpeaker._displayMode = 1;
+		if (!R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+		if (!scene->_actor10._mover)
+			scene->_actor10.addMover(NULL);
+		if (!scene->_actor11._mover)
+			scene->_actor11.addMover(NULL);
+		if (!scene->_actor12._mover)
+			scene->_actor12.addMover(NULL);
+		if (!scene->_actor4._mover)
+			scene->_actor4.addMover(NULL);
+
+		setup(3127, 2, 1);
+		scene->_sceneMode = 3327;
+		scene->_stripManager.start(3327, scene);
+
+		return true;
+	case R2_7:
+	// No break on purpose
+	case R2_44:
+		if (action == R2_7)
+			R2_GLOBALS._sound3.play(43);
+		else
+			R2_GLOBALS._sound3.play(99);
+		if (_state != 0) {
+			_state = 1;
+			setup(3128, 1, 1);
+			addMover(NULL);
+		}
+		scene->_action2.setActionIndex(3621);
+
+		if (!_action)
+			setAction(&scene->_action2, scene, NULL);
+
+		animate(ANIM_MODE_5, &scene->_action2);
+		R2_GLOBALS._player.disableControl();
+		return true;
+		break;
+	default:
+		return SceneActor::startAction(action, event);
+		break;
+	}
+}
+
+void Scene3600::postInit(SceneObjectList *OwnerList) {
+	if (R2_GLOBALS._sceneManager._previousScene == 3600) {
+		R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
+		R2_GLOBALS._v558B6.set(60, 0, 260, 200);
+	} else {
+		R2_GLOBALS._scrollFollower = &_actor2;
+		g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
+		R2_GLOBALS._v558B6.set(25, 0, 260, 200);
+	}
+	
+	loadScene(3600);
+	SceneExt::postInit();
+	_field254C = 0;
+
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+	_stripManager.addSpeaker(&_mirandaSpeaker);
+	_stripManager.addSpeaker(&_tealSpeaker);
+	_stripManager.addSpeaker(&_protectorSpeaker);
+
+	setZoomPercents(142, 80, 167, 105);
+	R2_GLOBALS._player._characterScene[1] = 3600;
+	R2_GLOBALS._player._characterScene[2] = 3600;
+	R2_GLOBALS._player._characterScene[3] = 3600;
+
+	_item2.setDetails(33, 3600, 6, -1, -1);
+	_item3.setDetails(Rect(3, 3, 22, 45), 3600, 9, -1, -1, 1, NULL);
+	_item4.setDetails(Rect(449, 3, 475, 45), 3600, 9, -1, -1, 1, NULL);
+
+	_actor10.postInit();
+	_actor10._moveDiff = Common::Point(3, 2);
+	_actor10.changeZoom(-1);
+	_actor10._effect = 1;
+
+	if (R2_GLOBALS._player._characterIndex != 1)
+		_actor10.setDetails(9001, 0, -1, -1, 1, (SceneItem *) NULL);
+
+	_actor11.postInit();
+	_actor11._numFrames = 7;
+	_actor11._moveDiff = Common::Point(5, 3);
+	_actor11.changeZoom(-1);
+	_actor11._effect = 1;
+
+	if (R2_GLOBALS._player._characterIndex != 2)
+		_actor11.setDetails(9002, 1, -1, -1, 1, (SceneItem *) NULL);
+
+	_actor12.postInit();
+	_actor12._moveDiff = Common::Point(3, 2);
+	_actor12.changeZoom(-1);
+	_actor12._effect = 1;
+
+	if (R2_GLOBALS._player._characterIndex != 3)
+		_actor12.setDetails(9003, 1, -1, -1, 1, (SceneItem *) NULL);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.changeZoom(-1);
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.disableControl();
+
+	_actor4.postInit();
+	_actor4._numFrames = 7;
+	_actor4._moveDiff = Common::Point(5, 3);
+	_actor4.changeZoom(-1);
+	_actor4._effect = 1;
+	_actor4.setDetails(3600, 27, -1, -1, 1, (SceneItem *) NULL);
+
+	_actor5.postInit();
+	_actor5._numFrames = 7;
+	_actor5._moveDiff = Common::Point(3, 2);
+	_actor5.changeZoom(-1);
+	_actor5._effect = 1;
+	_actor5.setDetails(3600, 12, -1, -1, 1, (SceneItem *) NULL);
+
+	_palette1.loadPalette(0);
+	_palette1.loadPalette(3601);
+
+	if (R2_GLOBALS._sceneManager._previousScene == 3600) {
+		_item5._sceneRegionId = 200;
+		_item5.setDetails(3600, 30, -1, -1, 5, &_actor4);
+		_field254A = 1;
+		_field2548 = 1;
+
+		R2_GLOBALS._walkRegions.enableRegion(2);
+		R2_GLOBALS._walkRegions.enableRegion(7);
+		R2_GLOBALS._walkRegions.enableRegion(14);
+		R2_GLOBALS._walkRegions.enableRegion(15);
+		R2_GLOBALS._walkRegions.enableRegion(16);
+
+		_actor10.setup(10, 5, 11);
+		_actor10.animate(ANIM_MODE_1, NULL);
+
+		_actor11.setup(20, 5, 11);
+		_actor11.animate(ANIM_MODE_1, NULL);
+
+		_actor12.setup(30, 5, 11);
+		_actor12.animate(ANIM_MODE_1, NULL);
+
+		if (R2_GLOBALS._player._characterIndex == 2) {
+			_actor10.setPosition(Common::Point(76, 148));
+			_actor11.setPosition(Common::Point(134, 148));
+			_actor12.setPosition(Common::Point(100, 148));
+			R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+			R2_GLOBALS._player.setup(20, _actor11._strip, 1);
+			R2_GLOBALS._player.setPosition(_actor11._position);
+			_actor11.hide();
+		} else if (R2_GLOBALS._player._characterIndex == 3) {
+			_actor10.setPosition(Common::Point(110, 148));
+			_actor11.setPosition(Common::Point(76, 148));
+			_actor12.setPosition(Common::Point(134, 148));
+			R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+			R2_GLOBALS._player.setup(30, _actor12._strip, 1);
+			R2_GLOBALS._player.setPosition(_actor12._position);
+			_actor12.hide();
+		} else {
+			_actor10.setPosition(Common::Point(134, 148));
+			_actor11.setPosition(Common::Point(76, 148));
+			_actor12.setPosition(Common::Point(110, 148));
+			R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+			R2_GLOBALS._player.setup(10, _actor10._strip, 1);
+			R2_GLOBALS._player.setPosition(_actor10._position);
+			_actor10.hide();
+		}
+		_actor4.setPosition(Common::Point(47, 149));
+		_actor4.setup(40, 1, 11);
+		_actor4.animate(ANIM_MODE_1, NULL);
+
+		_actor5.setPosition(Common::Point(367, 148));
+		_actor5.setup(3601, 7, 5);
+
+		if (!R2_GLOBALS.getFlag(71)) {
+			_actor13.postInit();
+			_actor13._state = 0;
+			warning("TODO: Fix use of SceneActor::_field8A and SceneActor::_field8C in postInit()");
+			_actor13._moveDiff = Common::Point(3, 2);
+			_actor13.setPosition(Common::Point(284, 152));
+			_actor13.setup(3127, 2, 1);
+			_actor13.changeZoom(-1);
+			_actor13.setDetails(3600, 15, -1, 17, 1, (SceneItem *) NULL);
+		}
+
+		R2_GLOBALS._sound2.play(330);
+		_actor3.postInit();
+		_actor3.setPosition(Common::Point(84, 156));
+		_actor3.fixPriority(158);
+		_actor3.setup(3601, 5, 1);
+		_actor3.animate(ANIM_MODE_2, NULL);
+
+		_action1._field1E = 1;
+		_action1._field20 = 0;
+		_action1.setActionIndex(1);
+	
+		_actor3.setAction(&_action1);
+		_sceneMode = 3623;
+
+		g_globals->_events.setCursor(CURSOR_ARROW);
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+	} else {
+		_field254A = 0;
+		_field2548 = 0;
+
+		R2_GLOBALS._walkRegions.enableRegion(17);
+		R2_GLOBALS._walkRegions.enableRegion(18);
+
+		_actor10.setPosition(Common::Point(393, 148));
+		_actor11.setPosition(Common::Point(364, 153));
+		_actor12.setPosition(Common::Point(413, 164));
+
+		R2_GLOBALS._player.hide();
+
+		_actor4.setPosition(Common::Point(373, 164));
+
+		_actor5.setup(3403, 8, 11);
+		_actor5.setPosition(Common::Point(403, 155));
+
+		_actor12.setup(3403, 7, 1);
+
+		_actor13.setPosition(Common::Point(405, 155));
+
+		_actor2.postInit();
+		_actor2.setup(3600, 2, 1);
+		_actor2.setPosition(Common::Point(403, 161));
+		_actor2.fixPriority(149);
+		_actor2.changeZoom(-1);
+
+		_action1._field1E = 0;
+		_action1._field20 = 90;
+
+		_sceneMode = 3600;
+		setAction(&_sequenceManager1, this, 3600, &_actor11, &_actor10, &_actor12, &_actor4, &_actor5, &_actor2, NULL);
+		_field254E = 0;
+	}
+	_field254E = 0;
+	_field2550 = R2_GLOBALS.getFlag(71);
+
+	R2_GLOBALS._sound1.play(326);
+	_item1.setDetails(Rect(0, 0, 480, 200), 3600, 0, -1, -1, 1, NULL);
+}
+
+void Scene3600::remove() {
+	_actor3.animate(ANIM_MODE_NONE, NULL);
+	_actor3.setAction(NULL);
+	R2_GLOBALS._sound2.fadeOut2(NULL);
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
+	SceneExt::remove();
+}
+
+void Scene3600::signal() {
+	switch (_sceneMode) {
+	case 3320:
+		warning("STUB: sub_1D227()");
+		R2_GLOBALS._walkRegions.enableRegion(14);
+		R2_GLOBALS._scrollFollower = &_actor11;
+		_tealSpeaker._object1.hide();
+		_actor5.show();
+		_actor5.setStrip(2);
+		if (R2_GLOBALS._player._characterIndex == 2)
+			_sceneMode = 3602;
+		else if (R2_GLOBALS._player._characterIndex == 3)
+			_sceneMode = 3603;
+		else
+			_sceneMode = 3601;
+		setAction(&_sequenceManager1, this, _sceneMode, &_actor11, &_actor10, &_actor12, &_actor4, &_actor5, NULL);
+		break;
+	case 3321:
+		warning("STUB: sub_1D227()");
+		R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
+		_tealSpeaker.proc16();
+		_actor5.show();
+		_actor5.setStrip(1);
+		_actor3.postInit();
+		_sceneMode = 3604;
+		setAction(&_sequenceManager1, this, _sceneMode, &_actor5, &_actor3, &_actor10, &_actor11, &_actor12, &_actor4, NULL);
+		break;
+	case 3322:
+		warning("STUB: sub_1D227()");
+		_quinnSpeaker.proc16();
+		_quinnSpeaker._displayMode = 1;
+		_tealSpeaker.proc16();
+		_tealSpeaker._displayMode = 7;
+		R2_GLOBALS._scrollFollower = &_actor5;
+		_sceneMode = 3605;
+		setAction(&_sequenceManager1, this, _sceneMode, &_actor5, &_actor13, &_actor2, NULL);
+		break;
+	case 3323:
+		if (_field254A == 0)
+			_field254A = 1;
+		else {
+			warning("STUB: sub_1D227()");
+			_protectorSpeaker.proc16();
+			_actor13.show();
+			_actor13.setup(3258, 6, 1);
+			_sceneMode = 3607;
+			_actor13.setAction(&_sequenceManager1, this, _sceneMode, &_actor13, NULL);
+			R2_GLOBALS._v558C2 = 1;
+			_protectorSpeaker.proc16();
+			_protectorSpeaker._displayMode = 1;
+			_quinnSpeaker._displayMode = 1;
+			_actor13.show();
+			R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
+			R2_GLOBALS._walkRegions.disableRegion(17);
+			R2_GLOBALS._walkRegions.disableRegion(18);
+			R2_GLOBALS._walkRegions.enableRegion(2);
+			R2_GLOBALS._walkRegions.enableRegion(7);
+			R2_GLOBALS._walkRegions.enableRegion(14);
+			R2_GLOBALS._walkRegions.enableRegion(15);
+			R2_GLOBALS._walkRegions.enableRegion(16);
+			_actor13.setAction(&_action1);
+		}
+		break;
+	case 3324:
+	// No break on purpose
+	case 3607:
+		g_globals->_events.setCursor(CURSOR_ARROW);
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		_actor13.fixPriority(-1);
+		_sceneMode = 3623;
+		_field2548 = 1;
+		break;
+	case 3327:
+		g_globals->_events.setCursor(CURSOR_ARROW);
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		_sceneMode = 3623;
+		break;
+	case 3450:
+		R2_GLOBALS._sound1.stop();
+		_actor1.hide();
+		_actor6.hide();
+		g_globals->gfxManager()._bounds.moveTo(Common::Point(40, 0));
+		setZoomPercents(142, 80, 167, 105);
+		loadScene(3600);
+		R2_GLOBALS._uiElements.show();
+		_item5._sceneRegionId = 200;
+		_item5.setDetails(3600, 30, -1, -1, 5, &_actor4);
+
+		_actor3.show();
+		_actor10.show();
+		_actor11.show();
+		_actor12.show();
+		_actor4.show();
+		_actor5.show();
+
+		_actor5.setPosition(Common::Point(298, 151));
+
+		_actor13.postInit();
+		_actor13._state = 0;
+		warning("_actor13._field8A = 226");
+		warning("_actor13._field8C = 152");
+		_actor13._moveDiff = Common::Point(5, 3);
+		_actor13.setup(3403, 7, 1);
+		_actor13.setPosition(Common::Point(405, 155));
+		_actor13.changeZoom(-1);
+		_actor13.addMover(NULL);
+		_actor13.animate(ANIM_MODE_NONE);
+		_actor13.hide();
+		_actor13.setDetails(3600, 15, -1, 17, 5, &_item5);
+
+		_actor2.setup(3600, 2, 1);
+		_actor2.setPosition(Common::Point(403, 161));
+		_actor2.fixPriority(149);
+		_actor2.changeZoom(-1);
+		_actor2.show();
+
+		_quinnSpeaker._displayMode = 2;
+		_tealSpeaker._displayMode = 2;
+
+		if (R2_GLOBALS._player._characterIndex == 2) {
+			R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+			R2_GLOBALS._player.setup(20, _actor11._strip, 1);
+			R2_GLOBALS._player.setPosition(_actor11._position);
+			_actor11.hide();
+		} else if (R2_GLOBALS._player._characterIndex == 3) {
+			R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+			R2_GLOBALS._player.setup(30, _actor12._strip, 1);
+			R2_GLOBALS._player.setPosition(_actor12._position);
+			_actor12.hide();
+		} else {
+			R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+			R2_GLOBALS._player.setup(10, _actor10._strip, 1);
+			R2_GLOBALS._player.setPosition(_actor10._position);
+			_actor10.hide();
+		}
+		R2_GLOBALS._player.show();
+		R2_GLOBALS._sound1.play(326);
+		_sceneMode = 3322;
+		_stripManager.start(3322, this);
+		R2_GLOBALS._sound2.play(329);
+		break;
+	case 3600:
+		_sceneMode = 3320;
+		_stripManager.start(3320, this);
+		break;
+	case 3601:
+	// No break on purpose
+	case 3602:
+	// No break on purpose
+	case 3603:
+		R2_GLOBALS._walkRegions.enableRegion(2);
+		R2_GLOBALS._walkRegions.enableRegion(7);
+		R2_GLOBALS._v558B6.set(60, 0, 260, 200);
+		_tealSpeaker._displayMode = 1;
+		_sceneMode = 3321;
+		_stripManager.start(3321, this);
+		break;
+	case 3604:
+		R2_GLOBALS._sound2.fadeOut2(NULL);
+		R2_GLOBALS._sound1.stop();
+		R2_GLOBALS._walkRegions.disableRegion(2);
+		R2_GLOBALS._walkRegions.disableRegion(7);
+
+		_actor2.hide();
+		_actor3.hide();
+		R2_GLOBALS._player.hide();
+		_actor10.hide();
+		_actor11.hide();
+		_actor12.hide();
+		_actor4.hide();
+		_actor5.hide();
+
+		g_globals->gfxManager()._bounds.moveTo(Common::Point(60, 0));
+		setZoomPercents(51, 46, 180, 200);
+
+		loadScene(3400);
+		R2_GLOBALS._uiElements.show();
+		_actor1.postInit();
+
+		_actor2.setup(3403, 1, 1);
+		_actor2.setPosition(Common::Point(190, 103));
+		_actor2.fixPriority(89);
+		_actor2.show();
+
+		_actor6.postInit();
+		_actor6.setup(3400, 1, 6);
+		_actor6.setPosition(Common::Point(236, 51));
+		_actor6.fixPriority(51);
+		R2_GLOBALS._scrollFollower = &_actor6;
+
+		R2_GLOBALS._sound1.play(323);
+		_sceneMode = 3450;
+		setAction(&_sequenceManager1, this, 3450, &_actor1, &_actor6, NULL);
+		break;
+	case 3605:
+		_actor13.setup(3258, 4, 1);
+		_actor13.setAction(&_sequenceManager1, this, 3606, &_actor5, &_actor13, &_actor2, NULL);
+		_sceneMode = 3323;
+		_stripManager.start(3323, this);
+
+		break;
+	case 3620:
+	// No break on purpose
+	case 3623:
+		if ((_actor13._position.x == 226) && (_actor13._position.y == 152) && (_action1._field1E != 0) && (_actor13._visage == 3127) && (!R2_GLOBALS.getFlag(71))) {
+			R2_GLOBALS._sound2.stop();
+			R2_GLOBALS._sound2.play(331);
+			R2_GLOBALS.setFlag(71);
+			_sceneMode = 3626;
+			setAction(&_sequenceManager1, this, 3626, &_actor13, NULL);
+		} 
+		break;
+	case 3624:
+		R2_GLOBALS._player.disableControl();
+		if ((_field254E != 0) && (_actor10._position.x == 229) && (_actor10._position.y == 154) && (_actor11._position.x == 181) && (_actor11._position.y == 154) && (_actor12._position.x == 207) && (_actor12._position.y == 154) && (_actor4._position.x == 155) && (_actor4._position.y == 154)) {
+			R2_GLOBALS._sound2.stop();
+			R2_GLOBALS._sound2.play(331);
+			_sceneMode = 3625;
+			setAction(&_sequenceManager1, this, 3625, &_actor10, &_actor11, &_actor12, &_actor4, NULL);
+		}
+		break;
+	case 3625:
+		R2_GLOBALS._sound2.stop();
+		R2_GLOBALS._sceneManager.changeScene(3700);
+		break;
+	case 3626:
+		_actor13.setPosition(Common::Point(0, 0));
+		_action1.setActionIndex(2);
+		if (R2_GLOBALS._events.getCursor() > R2_LAST_INVENT) {
+			R2_GLOBALS._events.setCursor(CURSOR_USE);
+			R2_GLOBALS._player.enableControl(CURSOR_USE);
+		} else {
+			R2_GLOBALS._player.enableControl();
+		}
+		R2_GLOBALS._sound2.stop();
+		_sceneMode = 3623;
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene3600::process(Event &event) {
+	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_ARROW) && (event.mousePos.x > 237) && (!R2_GLOBALS.getFlag(71))) {
+		SceneItem::display(3600, 17, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7 -999);
+		event.handled = true;
+	}
+	Scene::process(event);
+}
+
+void Scene3600::dispatch() {
+	if ((R2_GLOBALS._player.getRegionIndex() == 200) && (_action1._field1E != 0) && (_field254E == 0)){
+		R2_GLOBALS._sound2.fadeOut2(NULL);
+		if (_actor13._mover)
+			_actor13.addMover(NULL);
+		if (R2_GLOBALS._player._action)
+			R2_GLOBALS._player.setAction(NULL);
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+
+		_field254C = 0;
+		_field254E = 1;
+
+		R2_GLOBALS._walkRegions.disableRegion(2);
+		R2_GLOBALS._walkRegions.disableRegion(7);
+		R2_GLOBALS._player.disableControl();
+
+		_sceneMode = 3624;
+
+		_actor10.setStrip(-1);
+		_actor11.setStrip(-1);
+		_actor12.setStrip(-1);
+		_actor4.setStrip(-1);
+
+		R2_GLOBALS._player.hide();
+
+		if (R2_GLOBALS._player._characterIndex == 2) {
+			_actor11.setPosition(R2_GLOBALS._player._position);
+			_actor11.show();
+		} else if (R2_GLOBALS._player._characterIndex == 3) {
+			_actor12.setPosition(R2_GLOBALS._player._position);
+			_actor12.show();
+		} else {
+			_actor10.setPosition(R2_GLOBALS._player._position);
+			_actor10.show();
+		}
+		_actor10.setAction(&_sequenceManager2, this, 3610, &_actor10, NULL);
+		_actor11.setAction(&_sequenceManager3, this, 3611, &_actor11, NULL);
+		_actor12.setAction(&_sequenceManager4, this, 3612, &_actor12, NULL);
+		_actor4.setAction(&_sequenceManager1, this, 3613, &_actor4, NULL);
+	}
+
+	if ((_actor13.getRegionIndex() == 200) && (_action1._field1E != 0) && (_field254E == 0)){
+		R2_GLOBALS._sound2.fadeOut2(NULL);
+		_sceneMode = 3620;
+		_field2550 = 1;
+		R2_GLOBALS._player.disableControl();
+
+		if (R2_GLOBALS._player._mover)
+			R2_GLOBALS._player.addMover(NULL);
+		if (_actor10._mover)
+			_actor10.addMover(NULL);
+		if (_actor11._mover)
+			_actor11.addMover(NULL);
+		if (_actor12._mover)
+			_actor12.addMover(NULL);
+		if (_actor4._mover)
+			_actor4.addMover(NULL);
+	}
+	Scene::dispatch();
+}
+
 /*--------------------------------------------------------------------------
  * Scene 3700 - Cutscene - Teleport outside
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 4b336b2dde..cd8ebc87e4 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -571,6 +571,75 @@ public:
 	virtual void synchronize(Serializer &s);
 };
 
+class Scene3600 : public SceneExt {
+	class Action3600: public ActionExt {
+	public:
+		int _field1E, _field20;
+		
+		Action3600();
+		virtual void synchronize(Serializer &s);
+		virtual void signal();
+	};
+	class Action2: public Action {
+	public:
+		virtual void signal();
+	};
+
+	class Item5 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor13 : public SceneActorExt {
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+	Action3600 _action1;
+	Action2 _action2;
+	SpeakerQuinn3600 _quinnSpeaker;
+	SpeakerSeeker3600 _seekerSpeaker;
+	SpeakerMiranda3600 _mirandaSpeaker;
+	SpeakerTeal3600 _tealSpeaker;
+	VisualSpeaker _protectorSpeaker;
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	NamedHotspot _item3;
+	NamedHotspot _item4;
+	Item5 _item5;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	SceneActor _actor6;
+	SceneActor _actor7;
+	SceneActor _actor8;
+	SceneActor _actor9;
+	SceneActor _actor10;
+	SceneActor _actor11;
+	SceneActor _actor12;
+	Actor13 _actor13;
+	SequenceManager _sequenceManager1;
+	SequenceManager _sequenceManager2;
+	SequenceManager _sequenceManager3;
+	SequenceManager _sequenceManager4;
+	ScenePalette _palette1;
+
+	int _field2548;
+	int _field254A;
+	int _field254C;
+	int _field254E;
+	bool _field2550;
+
+	Scene3600();
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void process(Event &event);
+	virtual void dispatch();
+	virtual void synchronize(Serializer &s);
+};
+
 class Scene3700 : public SceneExt {
 public:
 	SpeakerQuinn3700 _quinnSpeaker;
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index ab5868a409..b6fed884ca 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -641,6 +641,52 @@ void SpeakerMiranda3400::proc15() {
 	}
 }
 
+void SpeakerMiranda3600::proc15() {
+	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 3) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor12;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+
+		_object1.setPosition(_object2->_position);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4051, 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4050, 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 void SpeakerMiranda3700::proc15() {
 	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1327,6 +1373,54 @@ void SpeakerQuinn3400::proc15() {
 	}
 }
 
+void SpeakerQuinn3600::proc15() {
+	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 1) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor10;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4021, 7, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4010, 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 3:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4012, 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 void SpeakerQuinn3700::setText(const Common::String &msg) {
 	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1860,6 +1954,53 @@ void SpeakerSeeker3400::proc15() {
 	}
 }
 
+void SpeakerSeeker3600::proc15() {
+	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 2) 
+			_object2 = &R2_GLOBALS._player;
+		else
+			_object2 = &scene->_actor11;
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+
+		_object1.setPosition(_object2->_position);
+
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4031, 5, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4030, 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 void SpeakerSeeker3700::setText(const Common::String &msg) {
 	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
 
@@ -2031,6 +2172,10 @@ SpeakerTeal::SpeakerTeal(): VisualSpeaker() {
 	_numFrames = 0;
 }
 
+SpeakerTealMode7::SpeakerTealMode7(): SpeakerTeal() {
+	_displayMode = 7;
+}
+
 void SpeakerTeal300::proc15() {
 	int v = _fieldF6;
 
@@ -2135,6 +2280,62 @@ void SpeakerTeal3400::proc15() {
 	}
 }
 
+void SpeakerTeal3600::proc15() {
+	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &scene->_actor5;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+	_object1.setPosition(_object2->_position);
+
+	if (scene ->_sceneMode == 3323) {
+		_object1.hide();
+		_object2->show();
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4107, 5, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4107, 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 3:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4107, 7, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 4:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4107, 3, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 //----------------------------------------------------------------------------
 // Classes related to TOMKO
 //----------------------------------------------------------------------------
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 3a58917c44..a4c93a131c 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -166,6 +166,12 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerMiranda3600 : public SpeakerMiranda {
+public:
+	virtual Common::String getClassName() { return "SpeakerMiranda3600"; }
+	virtual void proc15();
+};
+
 class SpeakerMiranda3700 : public SpeakerMiranda {
 public:
 	virtual Common::String getClassName() { return "SpeakerMiranda3700"; }
@@ -297,6 +303,12 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerQuinn3600 : public SpeakerQuinn {
+public:
+	virtual Common::String getClassName() { return "SpeakerQuinn3600"; }
+	virtual void proc15();
+};
+
 class SpeakerQuinn3700 : public SpeakerQuinn {
 public:
 	virtual Common::String getClassName() { return "SpeakerQuinn3700"; }
@@ -399,6 +411,12 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerSeeker3600 : public SpeakerSeeker {
+public:
+	virtual Common::String getClassName() { return "SpeakerSeeker3600"; }
+	virtual void proc15();
+};
+
 class SpeakerSeeker3700 : public SpeakerSeeker {
 public:
 	virtual Common::String getClassName() { return "SpeakerSeeker3700"; }
@@ -443,6 +461,12 @@ public:
 	virtual Common::String getClassName() { return "SpeakerTeal"; }
 };
 
+class SpeakerTealMode7 : public SpeakerTeal {
+public:
+	SpeakerTealMode7();
+	virtual Common::String getClassName() { return "SpeakerTealMode7"; }
+};
+
 class SpeakerTeal300 : public SpeakerTeal {
 public:
 	virtual Common::String getClassName() { return "SpeakerTeal300"; }
@@ -461,6 +485,12 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerTeal3600 : public SpeakerTealMode7 {
+public:
+	virtual Common::String getClassName() { return "SpeakerTeal3600"; }
+	virtual void proc15();
+};
+
 // Classes related to Tomko
 
 class SpeakerTomko3245 : public VisualSpeaker {
-- 
cgit v1.2.3


From 44b3120b81526f214818c4cdbed83a7260a1d60b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 3 Jan 2012 15:39:16 +0100
Subject: TSAGE: R2R - Add missing custom VisualSpeaker in scene 3600

---
 engines/tsage/ringworld2/ringworld2_scenes3.h    |  2 +-
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 61 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   | 10 ++++
 3 files changed, 72 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index cd8ebc87e4..163008739f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -600,7 +600,7 @@ public:
 	SpeakerSeeker3600 _seekerSpeaker;
 	SpeakerMiranda3600 _mirandaSpeaker;
 	SpeakerTeal3600 _tealSpeaker;
-	VisualSpeaker _protectorSpeaker;
+	SpeakerProtector3600 _protectorSpeaker;
 	NamedHotspot _item1;
 	NamedHotspot _item2;
 	NamedHotspot _item3;
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index b6fed884ca..26ed818819 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -922,6 +922,67 @@ void SpeakerPrivate3210::proc15() {
 	}
 }
 
+//----------------------------------------------------------------------------
+// Classes related to PROTECTOR
+//----------------------------------------------------------------------------
+
+SpeakerProtector3600::SpeakerProtector3600() {
+	_speakerName = "Protector";
+	_color1 = 170;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 7;
+	_numFrames = 0;
+}
+
+void SpeakerProtector3600::proc15() {
+	int v = _fieldF6;
+	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor13;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+		_object1._effect = 1;
+		_object1.changeZoom(-1);
+
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	_object1.setPosition(_object2->_position);
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		if (scene->_sceneMode != 3324) {
+			_object1.setup(4125, 3, 1);
+			_object1.animate(ANIM_MODE_5, this);
+		} else {
+			_object1.setup(3258, 6, 1);
+			_object1.animate(ANIM_MODE_2, NULL);
+			_object1.hide();
+			_object2->setup(3258, 6, 1);
+			_object2->show();
+		}
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 //----------------------------------------------------------------------------
 // Classes related to QUINN
 //----------------------------------------------------------------------------
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index a4c93a131c..cbd440e1a9 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -229,6 +229,16 @@ public:
 	virtual void proc15();
 };
 
+// Classes related to Protector
+
+class SpeakerProtector3600 : public VisualSpeaker {
+public:
+	SpeakerProtector3600();
+
+	virtual Common::String getClassName() { return "SpeakerProtector3600"; }
+	virtual void proc15();
+};
+
 // Classes related to Quinn
 
 class SpeakerQuinn : public VisualSpeaker {
-- 
cgit v1.2.3


From bda4e9ba9eed4d440661a321f527389d4d78bda7 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 3 Jan 2012 16:04:10 +0100
Subject: TSAGE: Add _field8A to SceneObject, use it in R2R scene 3600

---
 engines/tsage/core.cpp                          |  6 ++++++
 engines/tsage/core.h                            |  1 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 12 ++++--------
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 7cbcb863c7..331cac6c4b 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2022,6 +2022,8 @@ SceneObject::SceneObject() : SceneHotspot() {
 	_frame = 0;
 	_effect = 0;
 	_shade = 0;
+
+	_field8A = Common::Point(0, 0);
 }
 
 SceneObject::SceneObject(const SceneObject &so) : SceneHotspot() {
@@ -2396,6 +2398,10 @@ void SceneObject::synchronize(Serializer &s) {
 	SYNC_POINTER(_mover);
 	s.syncAsSint16LE(_moveDiff.x); s.syncAsSint16LE(_moveDiff.y);
 	s.syncAsSint32LE(_moveRate);
+	if (g_vm->getGameID() == GType_Ringworld2) {
+		s.syncAsSint16LE(_field8A.x);
+		s.syncAsSint16LE(_field8A.y);
+	}
 	SYNC_POINTER(_endAction);
 	s.syncAsUint32LE(_regionBitList);
 
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 98606dc64d..755964c84a 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -540,6 +540,7 @@ public:
 	EventHandler *_mover;
 	Common::Point _moveDiff;
 	int _moveRate;
+	Common::Point _field8A;
 	Action *_endAction;
 	uint32 _regionBitList;
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index a819f2708a..31723c658b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -2961,17 +2961,14 @@ void Scene3600::Action2::signal() {
 		R2_GLOBALS._events.proc1();
 		R2_GLOBALS._player.enableControl();
 		_actionIndex = 3619;
-		scene->_sequenceManager1._action = NULL;
-		warning("CHECKME: use of scene->_sequenceManager1._action");
+		scene->_actor13._state = 0;
 	// No break on purpose
 	case 3619: {
 		++_actionIndex;
 		scene->_actor13.setup(3127, 2, 1);
 		scene->_actor13.animate(ANIM_MODE_1, NULL);
-		Common::Point pt(226, 152);
-		warning("TODO: Fix use of SceneActor::_field8A and SceneActor::_field8C");
 		NpcMover *mover = new NpcMover();
-		scene->_actor13.addMover(mover, &scene->_actor13._position, scene);
+		scene->_actor13.addMover(mover, &scene->_actor13._field8A, scene);
 		}
 		break;
 	default:
@@ -3193,7 +3190,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) {
 		if (!R2_GLOBALS.getFlag(71)) {
 			_actor13.postInit();
 			_actor13._state = 0;
-			warning("TODO: Fix use of SceneActor::_field8A and SceneActor::_field8C in postInit()");
+			_actor13._field8A = Common::Point(226, 152);
 			_actor13._moveDiff = Common::Point(3, 2);
 			_actor13.setPosition(Common::Point(284, 152));
 			_actor13.setup(3127, 2, 1);
@@ -3367,8 +3364,7 @@ void Scene3600::signal() {
 
 		_actor13.postInit();
 		_actor13._state = 0;
-		warning("_actor13._field8A = 226");
-		warning("_actor13._field8C = 152");
+		_actor13._field8A = Common::Point(226, 152);
 		_actor13._moveDiff = Common::Point(5, 3);
 		_actor13.setup(3403, 7, 1);
 		_actor13.setPosition(Common::Point(405, 155));
-- 
cgit v1.2.3


From 4fd0e9e94ba5a4e4b11a9e993f69350f70564227 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 3 Jan 2012 08:38:14 +0100
Subject: KYRA: (EOB) - improve keyboard control for spell book cursor with non
 QWERTZ keyboards

---
 engines/kyra/kyra_v1.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index e60913ca6e..7167d41550 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -420,8 +420,18 @@ void KyraEngine_v1::setupKeyMap() {
 		{ KC(KP_MINUS), 105, 0/*unknown*/ },
 		{ KC(PLUS), 13, 0/*unknown*/ },
 		{ KC(KP_PLUS), 106, 0/*unknown*/ },
+
+		// Multiple mappings for the keys to the right of the 'M' key,
+		// since these are different for QWERTZ, QWERTY and AZERTY keyboards.
+		// QWERTZ
 		{ KC(COMMA), 53, 0/*unknown*/ },
-		{ KC(PERIOD), 54, 0/*unknown*/ }
+		{ KC(PERIOD), 54, 0/*unknown*/ },
+		// AZERTY
+		{ KC(SEMICOLON), 53, 0/*unknown*/ },
+		{ KC(COLON), 54, 0/*unknown*/ },
+		// QWERTY
+		{ KC(LESS), 53, 0/*unknown*/ },
+		{ KC(GREATER), 54, 0/*unknown*/ }
 	};
 #undef KC
 
-- 
cgit v1.2.3


From 76dec424696eacf2e9c1576d0580babb1a58e3f1 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 3 Jan 2012 17:25:10 +0100
Subject: KYRA: (EOB) - improved eob target detection in transfer party dialog

(parse domains instead of save files)
---
 engines/kyra/chargen.cpp | 77 +++++++++++++++++-------------------------------
 engines/kyra/gui_eob.cpp | 18 +++++++----
 engines/kyra/gui_eob.h   |  2 +-
 3 files changed, 40 insertions(+), 57 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 1093bec079..91a90407b1 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -29,6 +29,11 @@
 #include "common/savefile.h"
 #include "common/str-array.h"
 
+#include "common/config-manager.h"
+#include "base/plugins.h"
+#include "engines/metaengine.h"
+#include "engines/game.h"
+
 namespace Kyra {
 
 // Character Generator
@@ -1446,7 +1451,8 @@ public:
 
 private:
 	bool selectAndLoadTransferFile();
-	Common::String transferFileDialogue();
+	bool transferFileDialogue(Common::String &dest);
+
 
 	int selectCharactersMenu();
 	void drawCharPortraitWithStats(int charIndex, bool enabled);
@@ -1531,83 +1537,54 @@ bool TransferPartyWiz::start() {
 bool TransferPartyWiz::selectAndLoadTransferFile() {
 	do {
 		_screen->copyPage(12, 0);
-		_vm->_savegameFilename = transferFileDialogue();
-	} while (_vm->_savegameFilename.empty() && _vm->_gui->confirmDialogue2(15, 68, 1));
+		 if (transferFileDialogue(_vm->_savegameFilename))
+			 break;
+	} while (_vm->_gui->confirmDialogue2(15, 68, 1));
 
 	if (_vm->_savegameFilename.empty())
 		return false;
 
-	if (_vm->_savegameFilename.equals(_vm->_saveLoadStrings[1]))
-		return false;
-
 	if (_vm->loadGameState(-1).getCode() != Common::kNoError)
 		return false;
 
 	return true;
 }
 
-Common::String TransferPartyWiz::transferFileDialogue() {
-	Common::StringArray saveFileList = _vm->_saveFileMan->listSavefiles("*.*");
-	Common::StringArray targets;
-	Common::String tfile;
-
-	KyraEngine_v1::SaveHeader header;
-	memset(&header, 0, sizeof(KyraEngine_v1::SaveHeader));
-	Common::InSaveFile *in;
-
+ bool TransferPartyWiz::transferFileDialogue(Common::String &dest) {
 	_vm->_gui->transferWaitBox();
 
-	for (Common::StringArray::iterator i = saveFileList.begin(); i != saveFileList.end(); ++i) {
-		_vm->updateInput();
-
-		if (!(in = _vm->_saveFileMan->openForLoading(*i)))
-			continue;
-
-		if (KyraEngine_v1::readSaveHeader(in, false, header)) {
-			delete in;
-			continue;
-		}
-
-		delete in;
-
-		if (header.gameID != GI_EOB1)
-			continue;
-
-		i->insertChar('\0', i->size() - 4);
+	Common::Array<Common::String> eobTargets;
+	const Common::ConfigManager::DomainMap dom = ConfMan.getGameDomains();
 
-		Common::StringArray::iterator ii = targets.begin();
-		for (; ii != targets.end(); ++ii) {
-			if (!i->compareToIgnoreCase(*ii))
-				break;
-		}
-
-		if (ii == targets.end())
-			targets.push_back(*i);
+	for (Common::ConfigManager::DomainMap::const_iterator i = dom.begin(); i != dom.end(); ++i) {
+		if (ConfMan.get("gameid", i->_key).equals("eob"))
+			eobTargets.push_back(i->_key);
+		_vm->updateInput();
 	}
 
-	if (targets.empty())
-		return tfile;
+	if (eobTargets.empty())
+		return false;
 
-	Common::String target = _vm->_gui->transferTargetMenu(targets);
+	Common::String target = _vm->_gui->transferTargetMenu(eobTargets);
 	_screen->copyPage(12, 0);
 
-	if (target.equals(_vm->_saveLoadStrings[1]))
-		return target;
+	if (target.empty())
+		return true;
 
-	tfile = target + ".fin";
-	in = _vm->_saveFileMan->openForLoading(tfile);
+	dest = target + ".fin";
+	Common::InSaveFile *in = _vm->_saveFileMan->openForLoading(dest);
 	if (in) {
 		delete in;
 		if (_vm->_gui->confirmDialogue2(15, -2, 1))
-			return tfile;
+			return true;
 	}
 
 	_screen->copyPage(12, 0);
 
-	tfile = _vm->_gui->transferFileMenu(target);
+	bool result = _vm->_gui->transferFileMenu(target, dest);
 	_screen->copyPage(12, 0);
 
-	return tfile;
+	return result;
 }
 
 int TransferPartyWiz::selectCharactersMenu() {
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index a378fe1ea5..d60fa47571 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -2546,12 +2546,13 @@ void GUI_EoB::transferWaitBox() {
 }
 
 Common::String GUI_EoB::transferTargetMenu(Common::Array<Common::String> &targets) {
-	_savegameListSize = targets.size();
 	if (_savegameList) {
 		for (int i = 0; i < _savegameListSize; i++)
 			delete[] _savegameList[i];
 		delete[] _savegameList;
 	}
+
+	_savegameListSize = targets.size();
 	_savegameList = new char*[_savegameListSize];
 	memset(_savegameList, 0, _savegameListSize * sizeof(char *));
 
@@ -2576,12 +2577,16 @@ Common::String GUI_EoB::transferTargetMenu(Common::Array<Common::String> &target
 	_screen->copyRegion(72, 14, 72, 14, 176, 144, 12, 0, Screen::CR_NO_P_CHECK);
 	_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
 
-	return (slot < 6) ? _savegameList[_savegameOffset + slot] : _vm->_saveLoadStrings[1];
+	return (slot < 6) ? _savegameList[_savegameOffset + slot] : Common::String();
 }
 
-Common::String GUI_EoB::transferFileMenu(Common::String &target) {
-	updateSaveSlotsList(target, true);
+bool GUI_EoB::transferFileMenu(Common::String &targetName, Common::String &selection) {
+	updateSaveSlotsList(targetName, true);
 	_saveSlotsListUpdateNeeded = true;
+	selection.clear();
+
+	if (!_savegameListSize)
+		return false;
 
 	const ScreenDim *dm = _screen->getScreenDim(11);
 	int xo = dm->sx;
@@ -2598,12 +2603,13 @@ Common::String GUI_EoB::transferFileMenu(Common::String &target) {
 			messageDialogue(11, 65, 6);
 		else {
 			_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
-			return _vm->getSavegameFilename(target, _saveSlotIdTemp[slot]);
+			selection = _vm->getSavegameFilename(targetName, _saveSlotIdTemp[slot]);
+			return true;
 		}
 	} while (_saveSlotIdTemp[slot] == -1);
 
 	_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
-	return _vm->_saveLoadStrings[1];
+	return true;
 }
 
 void GUI_EoB::createScreenThumbnail(Graphics::Surface &dst) {
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index ec4000e52a..759ed641ce 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -73,7 +73,7 @@ public:
 	// Transfer party
 	void transferWaitBox();
 	Common::String transferTargetMenu(Common::Array<Common::String> &targets);
-	Common::String transferFileMenu(Common::String &target);
+	bool transferFileMenu(Common::String &targetName, Common::String &selection);
 
 	// utilities for thumbnail creation
 	void createScreenThumbnail(Graphics::Surface &dst);
-- 
cgit v1.2.3


From 3344cf424a90d22ab44c8b64b7ad598a53147e26 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 4 Jan 2012 21:16:32 +1100
Subject: TSAGE: Added needed speaker method call for R2R in
 StripManager::signal

---
 engines/tsage/converse.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index c3b48a7693..06fbffb751 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -25,6 +25,7 @@
 #include "tsage/tsage.h"
 #include "tsage/globals.h"
 #include "tsage/staticres.h"
+#include "ringworld2/ringworld2_speakers.h"
 
 namespace TsAGE {
 
@@ -836,6 +837,9 @@ void StripManager::signal() {
 			}
 		}
 
+		if ((g_vm->getGameID() == GType_Ringworld2) && (_obj44List.size() > 0))
+			static_cast<Ringworld2::VisualSpeaker *>(_activeSpeaker)->proc15();
+
 		_textShown = true;
 		_activeSpeaker->setText(choiceList[strIndex]);
 	}
-- 
cgit v1.2.3


From 0d3287671e3132d3d24ff2f87295a100b731c849 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 4 Jan 2012 21:52:21 +1100
Subject: TSAGE: Implemented the changes needed for R2R SceneActor::dispatch

---
 engines/tsage/core.cpp                        | 22 +++++++++++++++++++++-
 engines/tsage/core.h                          |  3 ++-
 engines/tsage/ringworld2/ringworld2_logic.cpp | 10 ++--------
 engines/tsage/ringworld2/ringworld2_logic.h   |  4 ----
 4 files changed, 25 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 331cac6c4b..8f4efafa01 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2021,7 +2021,8 @@ SceneObject::SceneObject() : SceneHotspot() {
 	_strip = 0;
 	_frame = 0;
 	_effect = 0;
-	_shade = 0;
+	_shade = _shade2 = 0;
+	_linkedActor = NULL;
 
 	_field8A = Common::Point(0, 0);
 }
@@ -2408,6 +2409,8 @@ void SceneObject::synchronize(Serializer &s) {
 	if (g_vm->getGameID() == GType_Ringworld2) {
 		s.syncAsSint16LE(_effect);
 		s.syncAsSint16LE(_shade);
+		s.syncAsSint16LE(_shade2);
+		SYNC_POINTER(_linkedActor);
 	}
 }
 
@@ -2451,6 +2454,12 @@ void SceneObject::remove() {
 }
 
 void SceneObject::dispatch() {
+	if (g_vm->getGameID() == GType_Ringworld2) {
+		if (_shade != _shade2)
+			_flags |= OBJFLAG_PANES;
+		_shade2 = _shade;
+	}
+
 	uint32 currTime = g_globals->_events.getFrameNumber();
 	if (_action)
 		_action->dispatch();
@@ -2558,6 +2567,17 @@ void SceneObject::dispatch() {
 	if (!(_flags & OBJFLAG_FIXED_PRIORITY)) {
 		setPriority(_position.y);
 	}
+
+	if (g_vm->getGameID() == GType_Ringworld2) {
+		if (_linkedActor) {
+			_linkedActor->setPosition(_position);
+			_linkedActor->setStrip(_strip);
+			_linkedActor->setFrame(_frame);
+		}
+
+		if ((_effect == 1) && (getRegionIndex() < 11))
+			_shade = 0;
+	}
 }
 
 void SceneObject::calcAngle(const Common::Point &pt) {
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 755964c84a..36071732cf 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -545,8 +545,9 @@ public:
 	uint32 _regionBitList;
 
 	// Ringworld 2 specific fields
-	int _shade;
+	int _shade, _shade2;
 	int _effect;
+	SceneObject *_linkedActor;
 public:
 	SceneObject();
 	SceneObject(const SceneObject &so);
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 0d8e5fda88..6c15e987e6 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -897,19 +897,13 @@ bool NamedHotspot::startAction(CursorType action, Event &event) {
 	}
 }
 
+/*--------------------------------------------------------------------------*/
+
 void SceneActor::postInit(SceneObjectList *OwnerList) {
 	_lookLineNum = _talkLineNum = _useLineNum = -1;
 	SceneObject::postInit();
 }
 
-void SceneActor::synchronize(Serializer &s) {
-	SceneObject::synchronize(s);
-	s.syncAsSint16LE(_resNum);
-	s.syncAsSint16LE(_lookLineNum);
-	s.syncAsSint16LE(_talkLineNum);
-	s.syncAsSint16LE(_useLineNum);
-}
-
 bool SceneActor::startAction(CursorType action, Event &event) {
 	bool handled = true;
 
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 2d7a81cd2f..535072f0b5 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -253,11 +253,7 @@ public:
 
 class SceneActor: public SceneObject {
 public:
-	int _resNum;
-	int _lookLineNum, _talkLineNum, _useLineNum;
-
 	virtual Common::String getClassName() { return "SceneActor"; }
-	virtual void synchronize(Serializer &s);
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual bool startAction(CursorType action, Event &event);
 };
-- 
cgit v1.2.3


From a9fa9e14cdf27c38352923235ae114004ea650dc Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 4 Jan 2012 15:04:55 +0100
Subject: TSAGE: R2R - Implement scene 3800.

sub1B007() is still stubbed as _field312 usage is conflicting with IDB structure
---
 engines/tsage/core.h                            |   1 +
 engines/tsage/globals.cpp                       |  14 +
 engines/tsage/globals.h                         |   6 +
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   3 +
 engines/tsage/ringworld2/ringworld2_logic.h     |   1 +
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 423 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h   |  46 +++
 7 files changed, 494 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 36071732cf..846dd3532c 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -545,6 +545,7 @@ public:
 	uint32 _regionBitList;
 
 	// Ringworld 2 specific fields
+	byte *_field9C;
 	int _shade, _shade2;
 	int _effect;
 	SceneObject *_linkedActor;
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 2988a87861..bae933a2c5 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -382,6 +382,13 @@ void Ringworld2Globals::reset() {
 	_v565AE = 0;
 	for (int i = 0; i < 14; i++)
 		_v56605[i] = 0;
+	_v566A6 = 3800;
+	_v566A8 = 0;
+	_v566A9 = 0;
+	_v566AA = 0;
+	for (int i = 0; i < 1000; i++)
+		_v566AB[i] = 0;
+	_v56A93 = 0;
 	_v56A99 = 0;
 	_v56A9E = 0;
 	_v56AA0 = 0;
@@ -422,6 +429,8 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_v558C2);
 	s.syncAsSint16LE(_v5657C);
 	s.syncAsSint16LE(_v565F5);
+	s.syncAsSint16LE(_v566A6);
+	s.syncAsSint16LE(_v56A93);
 	s.syncAsSint16LE(_v56A9E);
 	s.syncAsSint16LE(_v56AAB);
 	s.syncAsSint16LE(_v57C2C);
@@ -432,11 +441,16 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 		s.syncAsSint16LE(_v565F1[i]);
 	
 	s.syncAsByte(_v565AE);
+	s.syncAsByte(_v566A8);
+	s.syncAsByte(_v566A9);
+	s.syncAsByte(_v566AA);
 	s.syncAsByte(_v56AA0);
 	s.syncAsByte(_v56AA1);
 
 	for (i = 0; i < 14; ++i)
 		s.syncAsByte(_v56605[i]);
+	for (i = 0; i < 1000; ++i)
+		s.syncAsByte(_v566AB[i]);
 	s.syncAsByte(_v56A99);
 	for (i = 0; i < 12; ++i)
 		s.syncAsByte(_stripManager_lookupList[i]);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 8c84a4ecfd..23bb79b50f 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -254,6 +254,12 @@ public:
 	int _v5657C;
 	byte _v565AE;
 	byte _v56605[14];
+	int _v566A6;
+	byte _v566A8;
+	byte _v566A9;
+	byte _v566AA;
+	byte _v566AB[1000];
+	int _v56A93;
 	byte _v56A99;
 	int _v56A9E;
 	byte _v56AA0;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 6c15e987e6..1f046d1bff 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -232,6 +232,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Cutscene - Teleport outside
 		return new Scene3700();
 	case 3800:
+		return new Scene3800();
 	case 3900:
 		error("Missing scene %d from group 3", sceneNumber);
 	default:
@@ -262,6 +263,8 @@ SceneExt::SceneExt(): Scene() {
 	_stripManager._onBegin = SceneExt::startStrip;
 	_stripManager._onEnd = SceneExt::endStrip;
 
+	for (int i = 0; i < 44; i++)
+		_field312[i] = 0;
 	_field372 = _field37A = 0;
 	_savedPlayerEnabled = false;
 	_savedUiEnabled = false;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 535072f0b5..4805de48bb 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -79,6 +79,7 @@ private:
 	static void startStrip();
 	static void endStrip();
 public:
+	byte _field312[44];
 	int _field372;
 	bool _savedPlayerEnabled;
 	bool _savedUiEnabled;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 31723c658b..a8deb88829 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -3651,5 +3651,428 @@ void Scene3700::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3800 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene3800::Scene3800() {
+	_field412 = 0;
+}
+void Scene3800::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+}
+
+void Scene3800::Exit1::changeScene() {
+	Scene3800 *scene = (Scene3800 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	scene->_field412 = 1;
+
+	if (R2_GLOBALS.getFlag(46)) {
+		if (scene->_field412 == R2_GLOBALS._v566A9) {
+			R2_GLOBALS._v566AA = 3;
+			if (R2_GLOBALS._v56A93 + 1 == 0) {
+				R2_GLOBALS._v566A8--;
+				R2_GLOBALS._v566A9 = 0;
+			} else {
+				R2_GLOBALS._v566A9 = R2_GLOBALS._v566AB[R2_GLOBALS._v56A93];
+				R2_GLOBALS._v56A93--;
+			}
+		} else {
+			++R2_GLOBALS._v56A93;
+			if (R2_GLOBALS._v56A93 > 999)
+				R2_GLOBALS._v56A93 = 999;
+			R2_GLOBALS._v566AB[R2_GLOBALS._v56A93] = R2_GLOBALS._v566A9;
+			R2_GLOBALS._v566A9 = 3;
+		}
+	}
+
+	if (R2_GLOBALS._v566A8 == 0)
+		scene->_sceneMode = 16;
+	else
+		scene->_sceneMode = 11;
+
+	Common::Point pt(160, 115);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene3800::Exit2::changeScene() {
+	Scene3800 *scene = (Scene3800 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	scene->_field412 = 2;
+
+	if (R2_GLOBALS.getFlag(46)) {
+		if (scene->_field412 == R2_GLOBALS._v566A9) {
+			R2_GLOBALS._v566AA = 4;
+			if (R2_GLOBALS._v56A93 + 1 == 0) {
+				R2_GLOBALS._v566A8--;
+				R2_GLOBALS._v566A9 = 0;
+			} else {
+				R2_GLOBALS._v566A9 = R2_GLOBALS._v566AB[R2_GLOBALS._v56A93];
+				R2_GLOBALS._v56A93--;
+			}
+		} else {
+			++R2_GLOBALS._v56A93;
+			if (R2_GLOBALS._v56A93 > 999)
+				R2_GLOBALS._v56A93 = 999;
+			R2_GLOBALS._v566AB[R2_GLOBALS._v56A93] = R2_GLOBALS._v566A9;
+			R2_GLOBALS._v566A9 = 4;
+		}
+	}
+
+	if (R2_GLOBALS._v566A8 == 0)
+		scene->_sceneMode = 16;
+	else
+		scene->_sceneMode = 12;
+
+	Common::Point pt(330, 145);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene3800::Exit3::changeScene() {
+	Scene3800 *scene = (Scene3800 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	scene->_field412 = 3;
+
+	if (R2_GLOBALS.getFlag(46)) {
+		if (scene->_field412 == R2_GLOBALS._v566A9) {
+			R2_GLOBALS._v566AA = 1;
+			if (R2_GLOBALS._v56A93 + 1 == 0) {
+				R2_GLOBALS._v566A8--;
+				R2_GLOBALS._v566A9 = 0;
+			} else {
+				R2_GLOBALS._v566A9 = R2_GLOBALS._v566AB[R2_GLOBALS._v56A93];
+				R2_GLOBALS._v56A93--;
+			}
+		} else {
+			++R2_GLOBALS._v56A93;
+			if (R2_GLOBALS._v56A93 > 999)
+				R2_GLOBALS._v56A93 = 999;
+			R2_GLOBALS._v566AB[R2_GLOBALS._v56A93] = R2_GLOBALS._v566A9;
+			R2_GLOBALS._v566A9 = 1;
+		}
+	}
+
+	if (R2_GLOBALS._v566A8 == 0)
+		scene->_sceneMode = 16;
+	else
+		scene->_sceneMode = 13;
+
+	Common::Point pt(160, 220);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene3800::Exit4::changeScene() {
+	Scene3800 *scene = (Scene3800 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	scene->_field412 = 4;
+
+	if (R2_GLOBALS.getFlag(46)) {
+		if (scene->_field412 == R2_GLOBALS._v566A9) {
+			R2_GLOBALS._v566AA = 2;
+			if (R2_GLOBALS._v56A93 + 1 == 0) {
+				R2_GLOBALS._v566A8--;
+				R2_GLOBALS._v566A9 = 0;
+			} else {
+				R2_GLOBALS._v566A9 = R2_GLOBALS._v566AB[R2_GLOBALS._v56A93];
+				R2_GLOBALS._v56A93--;
+			}
+		} else {
+			++R2_GLOBALS._v56A93;
+			if (R2_GLOBALS._v56A93 > 999)
+				R2_GLOBALS._v56A93 = 999;
+			R2_GLOBALS._v566AB[R2_GLOBALS._v56A93] = R2_GLOBALS._v566A9;
+			R2_GLOBALS._v566A9 = 2;
+		}
+	}
+
+	if (R2_GLOBALS._v566A8 == 0)
+		scene->_sceneMode = 16;
+	else
+		scene->_sceneMode = 14;
+
+	Common::Point pt(-10, 145);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene3800::initScene3800() {
+	_exit1._enabled = true;
+	_exit2._enabled = true;
+	_exit3._enabled = true;
+	_exit4._enabled = true;
+	_exit1._insideArea = false;
+	_exit2._insideArea = false;
+	_exit3._insideArea = false;
+	_exit4._insideArea = false;
+	_exit1._moving = false;
+	_exit2._moving = false;
+	_exit3._moving = false;
+	_exit4._moving = false;
+
+	loadScene(R2_GLOBALS._v566A6);
+
+	R2_GLOBALS._uiElements.draw();
+}
+
+void Scene3800::sub110BBD() {
+	R2_GLOBALS._player.disableControl();
+	switch (_field412) {
+	case 0:
+		R2_GLOBALS._player.postInit();
+		R2_GLOBALS._player.setVisage(10);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setPosition(Common::Point(160, 145));
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.changeZoom(-1);
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+		_actor1.postInit();
+		_actor1.fixPriority(10);
+		_actor1.changeZoom(-1);
+		_actor1.setVisage(1110);
+		_actor1._effect = 5;
+		_actor1._field9C = this->_field312;
+		R2_GLOBALS._player._linkedActor = &_actor1;
+		switch (R2_GLOBALS._sceneManager._previousScene) {
+		case 2600:
+			_object1.postInit();
+			_object2.postInit();
+			_actor1.hide();
+			_sceneMode = 3800;
+			setAction(&_sequenceManager1, this, 3800, &R2_GLOBALS._player, &_object1, &_object2, NULL);
+			break;
+		case 3900:
+			_sceneMode = 15;
+			switch (R2_GLOBALS._v566AA - 1) {
+			case 0: {
+				R2_GLOBALS._player.setPosition(Common::Point(160, 220));
+				Common::Point pt(160, 160);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			case 1: {
+				R2_GLOBALS._player.setPosition(Common::Point(-10, 145));
+				Common::Point pt(19, 145);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			case 2: {
+				R2_GLOBALS._player.setPosition(Common::Point(160, 115));
+				Common::Point pt(160, 120);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			case 3: {
+				R2_GLOBALS._player.setPosition(Common::Point(330, 145));
+				Common::Point pt(300, 145);
+				NpcMover *mover = new NpcMover();
+				R2_GLOBALS._player.addMover(mover, &pt, this);
+				}
+				break;
+			default:
+				break;
+			}
+		default:
+			R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+			break;
+		}
+		break;
+	case 1: {
+		_sceneMode = 15;
+		R2_GLOBALS._player.setPosition(Common::Point(160, 220));
+		Common::Point pt(160, 160);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 2: {
+		_sceneMode = 15;
+		R2_GLOBALS._player.setPosition(Common::Point(-10, 145));
+		Common::Point pt(19, 145);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 3: {
+		_sceneMode = 15;
+		R2_GLOBALS._player.setPosition(Common::Point(160, 115));
+		Common::Point pt(160, 120);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 4: {
+		_sceneMode = 15;
+		R2_GLOBALS._player.setPosition(Common::Point(330, 145));
+		Common::Point pt(300, 145);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene3800::sub1B007(int arg1, int arg2, int arg3) {
+	byte *tmpPal = R2_GLOBALS._scenePalette._palette;
+	byte newR, newG, newB;
+	int tmp, varC, varD = 0;
+
+	for (int i = 0; i < 256; i++) {
+		newR = (arg1 * tmpPal[(3 * i)]) / 100;
+		newG = (arg2 * tmpPal[(3 * i) + 1]) / 100;
+		newB = (arg3 * tmpPal[(3 * i) + 2]) / 100;
+
+		varC = 769;
+		for (int j = 255; j >= 0; j--) {
+			tmp = abs(tmpPal[(3 * j)] - newR);
+			if (tmp >= varC)
+				continue;
+
+			tmp += abs(tmpPal[(3 * j) + 1] - newG);
+			if (tmp >= varC)
+				continue;
+
+			tmp += abs(tmpPal[(3 * j) + 2] - newB);
+			if (tmp >= varC)
+				continue;
+			
+			varC = tmp;
+			varD = j;
+		}
+		this->_field312[i] = varD;
+	}
+}
+
+void Scene3800::postInit(SceneObjectList *OwnerList) {
+	_field412 = 0;
+
+	initScene3800();
+	
+	SceneExt::postInit();
+	R2_GLOBALS._sound1.play(231);
+
+	warning("sub_1B007(65, 65, 65)");
+
+	setZoomPercents(87, 40, 144, 100);
+
+	_exit1.setDetails(Rect(14, 87, 305, 125), SHADECURSOR_UP, 3800);
+	_exit1.setDest(Common::Point(160, 126));
+	_exit2.setDetails(Rect(305, 87, 320, 128), EXITCURSOR_E, 3800);
+	_exit2.setDest(Common::Point(312, 145));
+	_exit3.setDetails(Rect(14, 160, 305, 168), SHADECURSOR_DOWN, 3800);
+	_exit3.setDest(Common::Point(160, 165));
+	_exit4.setDetails(Rect(0, 87, 14, 168), EXITCURSOR_W, 3800);
+	_exit4.setDest(Common::Point(7, 145));
+
+	_rect1.set(0, 0, 320, 87);
+	_item1.setDetails(Rect(0, 0, 320, 200), 3800, 0, 1, 2, 1, (SceneItem *) NULL);
+
+	sub110BBD();
+}
+
+void Scene3800::signal() {
+	switch (_sceneMode) {
+	case 11:
+		R2_GLOBALS._v566A6 += 15;
+		if (R2_GLOBALS._v566A6 > 3815)
+			R2_GLOBALS._v566A6 -= 20;
+		initScene3800();
+		sub110BBD();
+		break;
+	case 12:
+		R2_GLOBALS._v566A6 += 5;
+		if (R2_GLOBALS._v566A6 > 3815)
+			R2_GLOBALS._v566A6 = 3800;
+		initScene3800();
+		sub110BBD();
+		break;
+	case 13:
+		R2_GLOBALS._v566A6 -= 15;
+		if (R2_GLOBALS._v566A6 < 3800)
+			R2_GLOBALS._v566A6 += 20;
+		initScene3800();
+		sub110BBD();
+		break;
+	case 14:
+		R2_GLOBALS._v566A6 -= 5;
+		if (R2_GLOBALS._v566A6 < 3800)
+			R2_GLOBALS._v566A6 = 3815;
+		initScene3800();
+		sub110BBD();
+		break;
+	case 15:
+		R2_GLOBALS._v56AAB = 0;
+		R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+		break;
+	case 16:
+		g_globals->_sceneManager.changeScene(3900);
+		break;
+	case 3800:
+		_actor1.show();
+		_object1.remove();
+		_object2.remove();
+		R2_GLOBALS._v56AAB = 0;
+		R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+		break;
+	case 3805:
+		_exit1._enabled = false;
+		_exit2._enabled = false;
+		_exit3._enabled = false;
+		_exit4._enabled = false;
+		R2_GLOBALS._player._canWalk = false;
+		R2_GLOBALS._events.setCursor(CURSOR_USE);
+		break;
+	case 3806:
+		_exit1._enabled = true;
+		_exit2._enabled = true;
+		_exit3._enabled = true;
+		_exit4._enabled = true;
+		R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene3800::process(Event &event) {
+	if ((R2_GLOBALS._player._uiEnabled) && (event.eventType == 1) && (_rect1.contains(event.mousePos))) {
+		event.handled = true;
+		switch (R2_GLOBALS._events.getCursor()) {
+		case R2_NEGATOR_GUN:
+			R2_GLOBALS._player.addMover(NULL);
+			R2_GLOBALS._player.updateAngle(event.mousePos);
+			break;
+		case R2_STEPPING_DISKS:
+			SceneItem::display(3800, 5, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+			break;
+		case R2_ATTRACTOR_UNIT:
+			SceneItem::display(3800, 3, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+			break;
+		default:
+			event.handled = false;
+			break;
+		}
+	}
+
+	Scene::process(event);
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 163008739f..d5536791b1 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -656,6 +656,52 @@ public:
 	virtual void remove();
 	virtual void signal();
 };
+
+class Scene3800 : public SceneExt {
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+
+	class Exit2 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+
+	class Exit3 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+
+	class Exit4 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+
+public:
+	SceneObject _object1;
+	SceneObject _object2;
+	SceneActor _actor1;
+	NamedHotspot _item1;
+	Exit1 _exit1;
+	Exit2 _exit2;
+	Exit3 _exit3;
+	Exit4 _exit4;
+	Rect _rect1;
+	SequenceManager _sequenceManager1;
+
+	int _field412;
+
+	Scene3800();
+	void initScene3800();
+	void sub110BBD();
+	void sub1B007(int arg1, int arg2, int arg3);
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void process(Event &event);
+	virtual void synchronize(Serializer &s);
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 159fb89cfde1eaa764dfcf136fc06d0fd4780401 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 4 Jan 2012 15:46:58 +0100
Subject: TSAGE: Explain function of sub_F8E5_calculatePoint

---
 engines/tsage/core.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 8f4efafa01..fdd9feac03 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -941,6 +941,8 @@ int PlayerMover::findDistance(const Common::Point &pt1, const Common::Point &pt2
 	return (int)sqrt(xx + yy);
 }
 
+// Calculate intersection of the line segments pt1-pt2 and pt3-pt4.
+// Return true if they intersect, and return the intersection in ptOut.
 bool PlayerMover::sub_F8E5_calculatePoint(const Common::Point &pt1, const Common::Point &pt2, const Common::Point &pt3,
 						  const Common::Point &pt4, Common::Point *ptOut) {
 	double diffX1 = pt2.x - pt1.x;
-- 
cgit v1.2.3


From e914ec5d890dc742f40b19b127d2e9e44d418cd9 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 5 Jan 2012 15:19:55 +0100
Subject: TSAGE: R2R - Implement scene 3900

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +-
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 263 +++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes3.h   |  41 ++++
 3 files changed, 304 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 1f046d1bff..d39db9c2f8 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -234,7 +234,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 3800:
 		return new Scene3800();
 	case 3900:
-		error("Missing scene %d from group 3", sceneNumber);
+		return new Scene3900();
 	default:
 		error("Unknown scene number - %d", sceneNumber);
 		break;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index a8deb88829..5ae15d9c08 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -3968,7 +3968,7 @@ void Scene3800::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 	R2_GLOBALS._sound1.play(231);
 
-	warning("sub_1B007(65, 65, 65)");
+	warning("sub1B007(65, 65, 65)");
 
 	setZoomPercents(87, 40, 144, 100);
 
@@ -4074,5 +4074,266 @@ void Scene3800::process(Event &event) {
 	Scene::process(event);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3900 - 
+ *
+ *--------------------------------------------------------------------------*/
+void Scene3900::Exit1::changeScene() {
+	Scene3900 *scene = (Scene3900 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	R2_GLOBALS._v566A9 = 3;
+	R2_GLOBALS._v566AA = 1;
+	R2_GLOBALS._v566A8 = 1;
+	scene->_sceneMode = 14;
+	
+	Common::Point pt(160, 115);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene3900::Exit2::changeScene() {
+	Scene3900 *scene = (Scene3900 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	R2_GLOBALS._v566A9 = 4;
+	R2_GLOBALS._v566AA = 2;
+	R2_GLOBALS._v566A8 = 1;
+	scene->_sceneMode = 14;
+	
+	Common::Point pt(330, 145);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene3900::Exit3::changeScene() {
+	Scene3900 *scene = (Scene3900 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	R2_GLOBALS._v566A9 = 1;
+	R2_GLOBALS._v566AA = 3;
+	R2_GLOBALS._v566A8 = 1;
+	scene->_sceneMode = 14;
+	
+	Common::Point pt(160, 220);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene3900::Exit4::changeScene() {
+	Scene3900 *scene = (Scene3900 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	R2_GLOBALS._v566A9 = 2;
+	R2_GLOBALS._v566AA = 4;
+	R2_GLOBALS._v566A8 = 1;
+	scene->_sceneMode = 14;
+	
+	Common::Point pt(-10, 145);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene3900::Exit5::changeScene() {
+	Scene3900 *scene = (Scene3900 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	scene->_sceneMode = 13;
+	
+	if (R2_GLOBALS._v566A9 == 4) {
+		Common::Point pt(-10, 135);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, scene);
+	} else {
+		Common::Point pt(330, 135);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, scene);
+	}
+
+	R2_GLOBALS._v566A9 = 0;
+}
+
+void Scene3900::postInit(SceneObjectList *OwnerList) {
+	if ((R2_GLOBALS._v566AA == 2) && (R2_GLOBALS._sceneManager._previousScene != 2700))
+		loadScene(3825);
+	else
+		loadScene(3820);
+	SceneExt::postInit();
+	R2_GLOBALS._sound1.changeSound(231);
+	setZoomPercents(87, 40, 144, 100);
+	R2_GLOBALS._player.disableControl();
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setVisage(10);
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.setStrip(3);
+	R2_GLOBALS._player.changeZoom(-1);
+	R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+	_actor1.postInit();
+	_actor1.fixPriority(10);
+	_actor1.changeZoom(-1);
+	_actor1.setVisage(1110);
+	_actor1._effect = 5;
+	_actor1._field9C = _field312;
+	R2_GLOBALS._player._linkedActor = &_actor1;
+	if ((R2_GLOBALS._v566AA == 2) && (R2_GLOBALS._sceneManager._previousScene != 2700)) {
+//		loadScene(3825);
+		R2_GLOBALS._v566AA = 4;
+		_exit1.setDetails(Rect(29, 87, 305, 125), SHADECURSOR_UP, 3900);
+		_exit3.setDetails(Rect(29, 160, 305, 168), SHADECURSOR_DOWN, 3900);
+
+		_exit2.setDetails(Rect(305, 87, 320, 168), EXITCURSOR_E, 3900);
+		_exit2.setDest(Common::Point(312, 145));
+		_exit2._enabled = true;
+		_exit2._insideArea = false;
+		_exit2._moving = false;
+
+		_exit4._enabled = false;
+
+		_exit5.setDetails(Rect(0, 87, 29, 168), EXITCURSOR_W, 3900);
+		_exit5.setDest(Common::Point(24, 135));
+	} else {
+//		loadScene(3820);
+		R2_GLOBALS._v566AA = 2;
+		_exit1.setDetails(Rect(14, 87, 290, 125), SHADECURSOR_UP, 3900);
+		_exit3.setDetails(Rect(14, 160, 290, 168), SHADECURSOR_DOWN, 3900);
+
+
+		_exit2._enabled = false;
+
+		_exit4.setDetails(Rect(0, 87, 14, 168), EXITCURSOR_W, 3900);
+		_exit4.setDest(Common::Point(7, 145));
+		_exit4._enabled = true;
+		_exit4._insideArea = false;
+		_exit4._moving = false;
+
+		_exit5.setDetails(Rect(290, 87, 320, 168), EXITCURSOR_E, 3900);
+		_exit5.setDest(Common::Point(295, 135));
+	}
+	_exit5._enabled = true;
+	_exit5._insideArea = false;
+	_exit5._moving = false;
+
+	warning("sub1B007(65, 65, 65)");
+	_exit1.setDest(Common::Point(160, 126));
+	_exit1._enabled = true;
+	_exit1._insideArea = false;
+	_exit1._moving = false;
+
+	_exit3.setDest(Common::Point(160, 165));
+	_exit3._enabled = true;
+	_exit3._insideArea = false;
+	_exit3._moving = false;
+
+	R2_GLOBALS._uiElements.draw();
+
+	_rect1.set(0, 0, 320, 87);
+	_item1.setDetails(Rect(0, 0, 320, 200), 3800, 0, 1, 2, 1, (SceneItem *)NULL);
+	if (R2_GLOBALS._sceneManager._previousScene == 3800) {
+		_sceneMode = 11;
+		switch (R2_GLOBALS._v566AA - 1) {
+		case 0: {
+			R2_GLOBALS._player.setPosition(Common::Point(160, 115));
+			Common::Point pt(160, 120);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+			}
+			break;
+		case 1: {
+			R2_GLOBALS._player.setPosition(Common::Point(330, 145));
+			Common::Point pt(300, 145);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+			}
+			break;
+		case 2: {
+			R2_GLOBALS._player.setPosition(Common::Point(160, 220));
+			Common::Point pt(160, 160);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+			}
+			break;
+		case 3: {
+			R2_GLOBALS._player.setPosition(Common::Point(-10, 145));
+			Common::Point pt(19, 145);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+			}
+			break;
+		default:
+			break;
+		}
+	} else if (R2_GLOBALS._sceneManager._previousScene == 2700) {
+		_sceneMode = 12;
+		R2_GLOBALS._player.setPosition(Common::Point(330, 135));
+		Common::Point pt(265, 135);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+	} else {
+		R2_GLOBALS._player.setPosition(Common::Point(160, 145));
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+	}
+}
+
+void Scene3900::signal() {
+	switch (_sceneMode) {
+	case 11:
+	// No break on purpose
+	case 12:
+		R2_GLOBALS._v56AAB = 0;
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	case 13:
+		R2_GLOBALS._sceneManager.changeScene(2700);
+		break;
+	case 14:
+		R2_GLOBALS._sceneManager.changeScene(3800);
+		break;
+	case 3805:
+		_exit1._enabled = false;
+		_exit2._enabled = false;
+		_exit3._enabled = false;
+		_exit4._enabled = false;
+		R2_GLOBALS._player._canWalk = false;
+		R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
+		break;
+	case 3806:
+		_exit1._enabled = true;
+		_exit2._enabled = true;
+		_exit3._enabled = true;
+		_exit4._enabled = true;
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene3900::process(Event &event) {
+	if ((R2_GLOBALS._player._uiEnabled) && (event.eventType == 1) && (_rect1.contains(event.mousePos))) {
+		event.handled = true;
+		switch (R2_GLOBALS._events.getCursor()) {
+		case R2_NEGATOR_GUN:
+			R2_GLOBALS._player.addMover(NULL);
+			R2_GLOBALS._player.updateAngle(event.mousePos);
+			break;
+		case R2_STEPPING_DISKS:
+			SceneItem::display(3800, 5, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+			break;
+		case R2_ATTRACTOR_UNIT:
+			SceneItem::display(3800, 3, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+			break;
+		default:
+			event.handled = false;
+			break;
+		}
+	}
+	Scene::process(event);
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index d5536791b1..c925871747 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -702,6 +702,47 @@ public:
 	virtual void process(Event &event);
 	virtual void synchronize(Serializer &s);
 };
+
+class Scene3900 : public SceneExt {
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+
+	class Exit2 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+
+	class Exit3 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+
+	class Exit4 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+
+	class Exit5 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+public:
+	SceneActor _actor1;
+	NamedHotspot _item1;
+	Exit1 _exit1;
+	Exit2 _exit2;
+	Exit3 _exit3;
+	Exit4 _exit4;
+	Exit5 _exit5;
+	Rect _rect1;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void process(Event &event);
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 8e54ddfabf81d382c4e6f026611a7dabd90c9a51 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 5 Jan 2012 22:22:30 +0100
Subject: TSAGE: R2R - Implement scene 1010

---
 engines/tsage/module.mk                         |  1 +
 engines/tsage/ringworld2/ringworld2_logic.cpp   |  3 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 92 +++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h   | 53 ++++++++++++++
 4 files changed, 149 insertions(+)
 create mode 100644 engines/tsage/ringworld2/ringworld2_scenes1.cpp
 create mode 100644 engines/tsage/ringworld2/ringworld2_scenes1.h

(limited to 'engines')

diff --git a/engines/tsage/module.mk b/engines/tsage/module.mk
index 95a1a583dd..53c03e2e57 100644
--- a/engines/tsage/module.mk
+++ b/engines/tsage/module.mk
@@ -38,6 +38,7 @@ MODULE_OBJS := \
 	ringworld2/ringworld2_dialogs.o \
 	ringworld2/ringworld2_logic.o \
 	ringworld2/ringworld2_scenes0.o \
+	ringworld2/ringworld2_scenes1.o \
 	ringworld2/ringworld2_scenes2.o \
 	ringworld2/ringworld2_scenes3.o \
 	ringworld2/ringworld2_speakers.o \
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index d39db9c2f8..d906debf82 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -27,6 +27,7 @@
 #include "tsage/ringworld2/ringworld2_logic.h"
 #include "tsage/ringworld2/ringworld2_dialogs.h"
 #include "tsage/ringworld2/ringworld2_scenes0.h"
+#include "tsage/ringworld2/ringworld2_scenes1.h"
 #include "tsage/ringworld2/ringworld2_scenes2.h"
 #include "tsage/ringworld2/ringworld2_scenes3.h"
 
@@ -91,7 +92,9 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	/* Scene group #1 */
 	//
 	case 1000:
+		error("Missing scene %d from group 1", sceneNumber);
 	case 1010:
+		return new Scene1010();
 	case 1020:
 	case 1100:
 	case 1200:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
new file mode 100644
index 0000000000..e514155435
--- /dev/null
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -0,0 +1,92 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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/scenes.h"
+#include "tsage/tsage.h"
+#include "tsage/staticres.h"
+#include "tsage/ringworld2/ringworld2_scenes1.h"
+
+namespace TsAGE {
+
+namespace Ringworld2 {
+
+/*--------------------------------------------------------------------------
+ * Scene 1010 -
+ *
+ *--------------------------------------------------------------------------*/
+void Scene1010::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(1010);
+
+	R2_GLOBALS._v58CE2 = 0;
+	setZoomPercents(100, 1, 160, 100);
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setObjectWrapper(NULL);
+	R2_GLOBALS._player.setPosition(Common::Point(30, 264));
+	R2_GLOBALS._player.changeZoom(-1);
+	R2_GLOBALS._player.disableControl();
+
+	setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+
+	if (R2_GLOBALS.getFlag(57))
+		_sceneMode = 1;
+	else {
+		R2_GLOBALS._sound1.play(89);
+		_sceneMode = 0;
+	}
+}
+
+void Scene1010::signal() {
+	switch (_sceneMode) {
+	case 1: {
+		_sceneMode = 2;
+		R2_GLOBALS._player.setup(1010, 2, 1);
+		R2_GLOBALS._player.setPosition(Common::Point(297, 101));
+		Common::Point pt(30, 264);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 2:
+		_sceneMode = 3;
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		R2_GLOBALS._player.hide();
+		break;
+	case 3:
+		if (R2_GLOBALS.getFlag(57))
+			R2_GLOBALS._sceneManager.changeScene(1500);
+		else
+			R2_GLOBALS._sceneManager.changeScene(1000);
+		break;
+	default: {
+		_sceneMode = 2;
+		R2_GLOBALS._player.setup(1010, 1, 1);
+		Common::Point pt(297, 101);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	}
+}
+
+} // End of namespace Ringworld2
+} // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
new file mode 100644
index 0000000000..4ddd064325
--- /dev/null
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.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 TSAGE_RINGWORLD2_SCENES1_H
+#define TSAGE_RINGWORLD2_SCENES1_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 {
+
+namespace Ringworld2 {
+
+using namespace TsAGE;
+
+class Scene1010 : public SceneExt {
+public:
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
+
+} // End of namespace Ringworld2
+} // End of namespace TsAGE
+
+#endif
-- 
cgit v1.2.3


From f5c54bd9a36a106b05df0234c342d319f9307410 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 6 Jan 2012 00:19:28 +0100
Subject: TSAGE: R2R - Implement scene 1020

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 126 +++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h   |   9 ++
 3 files changed, 136 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index d906debf82..aa9e1dfe1e 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -94,8 +94,10 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1000:
 		error("Missing scene %d from group 1", sceneNumber);
 	case 1010:
+		// Cutscene - trip in space
 		return new Scene1010();
 	case 1020:
+		return new Scene1020();
 	case 1100:
 	case 1200:
 	case 1330:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index e514155435..1949d19d80 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -30,7 +30,7 @@ namespace TsAGE {
 namespace Ringworld2 {
 
 /*--------------------------------------------------------------------------
- * Scene 1010 -
+ * Scene 1010 - Cutscene: A pixel lost in space!
  *
  *--------------------------------------------------------------------------*/
 void Scene1010::postInit(SceneObjectList *OwnerList) {
@@ -88,5 +88,129 @@ void Scene1010::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1020 -
+ *
+ *--------------------------------------------------------------------------*/
+void Scene1020::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(1020);
+
+	if (R2_GLOBALS._sceneManager._previousScene == 1010)
+		g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
+
+	R2_GLOBALS._v558B6.set(160, 0, 160, 161);
+	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._player.postInit();
+
+	if (R2_GLOBALS._sceneManager._previousScene == 1010) {
+		R2_GLOBALS._player.setPosition(Common::Point(500, 100));
+		R2_GLOBALS._player.setup(1020, 1, 1);
+	} else {
+		R2_GLOBALS._player.setPosition(Common::Point(0, 100));
+		R2_GLOBALS._player.setup(1020, 2, 1);
+	}
+
+	R2_GLOBALS._player.setObjectWrapper(NULL);
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.disableControl();
+	setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+
+	if (R2_GLOBALS._sceneManager._previousScene == 1010)
+		_sceneMode = 0;
+	else 
+		_sceneMode = 10;
+}
+
+void Scene1020::signal() {
+	switch (_sceneMode) {
+	case 0: {
+		_sceneMode = 1;
+		R2_GLOBALS._player.show();
+		R2_GLOBALS._player.setPosition(Common::Point(347, 48));
+		R2_GLOBALS._player._moveDiff = Common::Point(2, 1);
+		R2_GLOBALS._player.setZoom(0);
+		Common::Point pt(392, 41);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 1:
+		_sceneMode = 2;
+		R2_GLOBALS._player.setZoom(100);
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 2: {
+		_sceneMode = 3;
+		R2_GLOBALS._player._moveDiff = Common::Point(30, 15);
+		Common::Point pt(-15, 149);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 3:
+		_sceneMode = 4;
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		break;
+	case 4:
+		R2_GLOBALS.setFlag(51);
+		R2_GLOBALS._sceneManager.changeScene(300);
+		break;
+	case 10: {
+		_sceneMode = 11;
+		R2_GLOBALS._player.setPosition(Common::Point(25, 133));
+		R2_GLOBALS._player._moveDiff = Common::Point(30, 15);
+		R2_GLOBALS._player.setZoom(100);
+		Common::Point pt(355, 60);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 11:
+		R2_GLOBALS._player.setPosition(Common::Point(355, 57));
+		_sceneMode = 12;
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 12: {
+		R2_GLOBALS._player.setPosition(Common::Point(355, 60));
+		_sceneMode = 13;
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 1);
+		Common::Point pt(347, 48);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 13:
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		if (R2_GLOBALS._player._percent < 1)
+			_sceneMode = 14;
+		break;
+	case 14:
+		R2_GLOBALS._sceneManager.changeScene(1010);
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1020::dispatch() {
+	if (_sceneMode == 1) {
+		R2_GLOBALS._player.setZoom(R2_GLOBALS._player._percent + 1);
+		if (R2_GLOBALS._player._percent > 10)
+			R2_GLOBALS._player._moveDiff.x = 3;
+		if (R2_GLOBALS._player._percent > 20)
+			R2_GLOBALS._player._moveDiff.x = 4;
+	}
+
+	if ((_sceneMode == 13) && (R2_GLOBALS._player._percent != 0)) {
+		R2_GLOBALS._player.setZoom(R2_GLOBALS._player._percent - 2);
+		if (R2_GLOBALS._player._percent < 80)
+			R2_GLOBALS._player._moveDiff.x = 2;
+		if (R2_GLOBALS._player._percent < 70)
+			R2_GLOBALS._player._moveDiff.x = 1;
+	}
+
+	Scene::dispatch();
+}
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 4ddd064325..f0444de70d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -47,6 +47,15 @@ public:
 	virtual void signal();
 };
 
+class Scene1020 : public SceneExt {
+public:
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void dispatch();
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 41ba2433f57f064f3119b5b5c1247eadb32d5977 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 6 Jan 2012 09:38:41 +0100
Subject: AGI: Fix predictive input binary search

Note that there are still issues with this input mode. If the binary
search hits a prefix match before finding the full match, it won't
recognize the full match. (Example: typing "buy" will show "buz"
because it's aiming for "buzzard" without realizing "buy" exists.)
---
 engines/agi/predictive.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp
index 3290068d5a..56d9190e7f 100644
--- a/engines/agi/predictive.cpp
+++ b/engines/agi/predictive.cpp
@@ -570,7 +570,7 @@ bool AgiEngine::matchWord() {
 	int hi = _predictiveDictLineCount - 1;
 	int lo = 0;
 	int line = 0;
-	while (lo < hi) {
+	while (lo <= hi) {
 		line = (lo + hi) / 2;
 		int cmpVal = strncmp(_predictiveDictLine[line], _currentCode.c_str(), _currentCode.size());
 		if (cmpVal > 0)
-- 
cgit v1.2.3


From 43e2fde7a951d362ab06f20bc043698f0e1e47c3 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 6 Jan 2012 11:20:46 +0100
Subject: AGI: Fix ignoring some exact matches in predictive input

The matcher now always tries an exact match before trying an inexact one.
Together with 41ba2433f, this fixes bug #3470080.
---
 engines/agi/agi.h          |  2 +-
 engines/agi/predictive.cpp | 25 ++++++++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index e9923aba2e..28403964dd 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -1085,7 +1085,7 @@ private:
 	void blitTextbox(const char *p, int y, int x, int len);
 	void eraseTextbox();
 	void loadDict();
-	bool matchWord();
+	bool matchWord(bool onlyExact = false);
 
 	// Predictive dialog
 	// TODO: Move this to a separate class
diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp
index 56d9190e7f..585a633bb0 100644
--- a/engines/agi/predictive.cpp
+++ b/engines/agi/predictive.cpp
@@ -556,7 +556,7 @@ void AgiEngine::loadDict() {
 	debug("Time to parse pred.dic: %d, total: %d", time3-time2, time3-time1);
 }
 
-bool AgiEngine::matchWord() {
+bool AgiEngine::matchWord(bool onlyExact) {
 	// If no text has been entered, then there is no match.
 	if (_currentCode.empty())
 		return false;
@@ -565,14 +565,29 @@ bool AgiEngine::matchWord() {
 	if (_currentCode.size() > MAXWORDLEN)
 		return false;
 
-	// Perform a binary search on the dictionary to find the first
-	// entry that has _currentCode as a prefix.
+	if (!onlyExact) {
+		// First always try an exact match.
+		bool ret = matchWord(true);
+		if (ret)
+			return true;
+	}
+
+	// The entries in the dictionary consist of a code, a space, and then
+	// a space-separated list of words matching this code.
+	// To exactly match a code, we therefore match the code plus the trailing
+	// space in the dictionary.
+	Common::String code = _currentCode;
+	if (onlyExact)
+		code += " ";
+
+	// Perform a binary search on the dictionary to find an entry that has
+	// _currentCode as a prefix.
 	int hi = _predictiveDictLineCount - 1;
 	int lo = 0;
 	int line = 0;
 	while (lo <= hi) {
 		line = (lo + hi) / 2;
-		int cmpVal = strncmp(_predictiveDictLine[line], _currentCode.c_str(), _currentCode.size());
+		int cmpVal = strncmp(_predictiveDictLine[line], code.c_str(), code.size());
 		if (cmpVal > 0)
 			hi = line - 1;
 		else if (cmpVal < 0)
@@ -585,7 +600,7 @@ bool AgiEngine::matchWord() {
 
 	_currentWord.clear();
 	_wordNumber = 0;
-	if (0 == strncmp(_predictiveDictLine[line], _currentCode.c_str(), _currentCode.size())) {
+	if (0 == strncmp(_predictiveDictLine[line], code.c_str(), code.size())) {
 		_predictiveDictActLine = _predictiveDictLine[line];
 		char tmp[MAXLINELEN];
 		strncpy(tmp, _predictiveDictActLine, MAXLINELEN);
-- 
cgit v1.2.3


From 6e45741b17ec17ec1c2081557df043d5d4f2ff73 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 3 Jan 2012 21:30:45 +0100
Subject: KYRA: (EOB) - cleanup eob/lol version of delayUntil()

---
 engines/kyra/eobcommon.cpp | 2 +-
 engines/kyra/kyra_rpg.cpp  | 2 +-
 engines/kyra/kyra_rpg.h    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 4f169acabf..c7d8ed566f 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -347,7 +347,7 @@ void EoBCoreEngine::initKeymap() {
 		Common::Action *const act = new Common::Action(engineKeyMap, keyActionEntries[i].id, keyActionEntries[i].description, Common::kGenericActionType, Common::kActionKeyType);
 		act->addKeyEvent(keyActionEntries[i].ks);
 	}
-	
+
 	if (_flags.gameID == GI_EOB2) {
 		Common::Action *const act = new Common::Action(engineKeyMap, "SL6", _("Spell Level 6"), Common::kGenericActionType, Common::kActionKeyType);
 		act->addKeyEvent(Common::KeyState(Common::KEYCODE_6));
diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp
index 4487290bf9..b8d56b3ecb 100644
--- a/engines/kyra/kyra_rpg.cpp
+++ b/engines/kyra/kyra_rpg.cpp
@@ -308,7 +308,7 @@ uint16 KyraRpgEngine::processDialogue() {
 	return res;
 }
 
-void KyraRpgEngine::delayUntil(uint32 time, bool doUpdate, bool isMainLoop, bool) {
+void KyraRpgEngine::delayUntil(uint32 time, bool, bool doUpdate, bool isMainLoop) {
 	uint32 curTime = _system->getMillis();
 	if (time > curTime)
 		delay(time - curTime, doUpdate, isMainLoop);
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index 24c19105d9..a1b9b4c332 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -331,7 +331,7 @@ protected:
 
 	// misc
 	virtual void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false) = 0;
-	void delayUntil(uint32 time, bool doUpdate = false, bool isMainLoop = false, bool unused = false);
+	void delayUntil(uint32 time, bool unused = false, bool doUpdate = false, bool isMainLoop = false);
 	int rollDice(int times, int pips, int inc = 0);
 
 	virtual Common::Error loadGameState(int slot) = 0;
-- 
cgit v1.2.3


From eaa5d50c3f66865a76a5d20f257061b6b79a88f6 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Wed, 4 Jan 2012 17:53:56 +0100
Subject: KYRA: (EOB) - add basic distinction between music and sound effects

(The original code of the DOS version does not distinguish here, but
we do it anyway so as to make more sense of the GMM volume settings)
---
 engines/kyra/chargen.cpp            | 12 +++++------
 engines/kyra/eobcommon.cpp          | 19 +++++++++++-----
 engines/kyra/eobcommon.h            |  2 ++
 engines/kyra/sequences_darkmoon.cpp | 43 ++++++++++++++++++-------------------
 engines/kyra/sequences_eob.cpp      | 42 ++++++++++++++++++------------------
 engines/kyra/sound_adlib.cpp        |  2 +-
 6 files changed, 65 insertions(+), 55 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 91a90407b1..ed761e53c6 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -171,7 +171,7 @@ bool CharacterGenerator::start(EoBCharacter *characters, uint8 ***faceShapes) {
 	checkForCompleteParty();
 	initButtonsFromList(0, 5);
 
-	_vm->sound()->playTrack(_vm->game() == GI_EOB1 ? 20 : 13);
+	_vm->snd_playSong(_vm->game() == GI_EOB1 ? 20 : 13);
 	_activeBox = 0;
 
 	for (bool loop = true; loop && (!_vm->shouldQuit());) {
@@ -186,7 +186,7 @@ bool CharacterGenerator::start(EoBCharacter *characters, uint8 ***faceShapes) {
 				_activeBox ^= 2;
 			} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE]) {
 				// Unlike the original we allow returning to the main menu
-				_vm->sound()->haltTrack();
+				_vm->snd_stopSound();
 				return false;
 			}
 			_vm->_gui->updateBoxFrameHighLight(-1);
@@ -232,7 +232,7 @@ bool CharacterGenerator::start(EoBCharacter *characters, uint8 ***faceShapes) {
 	}
 
 	if (_vm->game() == GI_EOB2)
-		_vm->sound()->playTrack(15);
+		_vm->snd_fadeOut();
 
 	*faceShapes = _faceShapes;
 	return true;
@@ -372,7 +372,7 @@ void CharacterGenerator::toggleSpecialButton(int index, int bodyCustom, int page
 
 void CharacterGenerator::processSpecialButton(int index) {
 	toggleSpecialButton(index, 1, 0);
-	_vm->sound()->playSoundEffect(76);
+	_vm->snd_playSoundEffect(76);
 	_vm->_system->delayMillis(80);
 	toggleSpecialButton(index, 0, 0);
 }
@@ -598,13 +598,13 @@ int CharacterGenerator::alignmentMenu(int cClass) {
 int CharacterGenerator::getInput(Button *buttonList) {
 	if (_vm->game() == GI_EOB1 && _vm->sound()->checkTrigger()) {
 		_vm->sound()->resetTrigger();
-		_vm->sound()->playTrack(20);
+		_vm->snd_playSong(20);
 	} else if (_vm->game() == GI_EOB2 && !_vm->sound()->isPlaying()) {
 		// WORKAROUND for EOB II: The original implements the same sound trigger check as in EOB I.
 		// However, Westwood seems to have forgotten to set the trigger at the end of the AdLib song,
 		// so that the music will not loop. We simply check whether the sound driver is still playing.
 		_vm->delay(3 * _vm->_tickLength);
-		_vm->sound()->playTrack(13);
+		_vm->snd_playSong(13);
 	}
 	return _vm->checkInput(buttonList, false, 0);
 }
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index c7d8ed566f..e45bad6d72 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -1403,7 +1403,7 @@ void EoBCoreEngine::restoreAfterDialogueSequence() {
 	_screen->setScreenDim(7);
 
 	if (_flags.gameID == GI_EOB2)
-		_sound->playTrack(2);
+		snd_playSoundEffect(2);
 
 	_sceneUpdateRequired = true;
 }
@@ -2377,15 +2377,24 @@ void EoBCoreEngine::explodeMonster(EoBMonsterInPlay *m) {
 	m->flags &= ~2;
 }
 
-void EoBCoreEngine::snd_playSoundEffect(int id, int volume) {
-	if ((id < 1) || (_flags.gameID == GI_EOB2 && id > 119) || shouldQuit())
+void EoBCoreEngine::snd_playSong(int track) {
+	_sound->playTrack(track);
+}
+
+void EoBCoreEngine::snd_playSoundEffect(int track, int volume) {
+	if ((track < 1) || (_flags.gameID == GI_EOB2 && track > 119) || shouldQuit())
 		return;
 
-	_sound->playSoundEffect(id, volume);
+	_sound->playSoundEffect(track, volume);
 }
 
 void EoBCoreEngine::snd_stopSound() {
-	_sound->playSoundEffect(0);
+	_sound->haltTrack();
+	_sound->stopAllSoundEffects();
+}
+
+void EoBCoreEngine::snd_fadeOut() {
+	_sound->beginFadeOut();
 }
 
 } // End of namespace Kyra
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index e7b3a7357a..851c52076b 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -1127,8 +1127,10 @@ protected:
 	const uint8 *_numSpellsMage;
 
 	// sound
+	void snd_playSong(int id);
 	void snd_playSoundEffect(int id, int volume=0xFF);
 	void snd_stopSound();
+	void snd_fadeOut();
 
 	// keymap
 	static const char *const kKeymapName;
diff --git a/engines/kyra/sequences_darkmoon.cpp b/engines/kyra/sequences_darkmoon.cpp
index c72bf58f9b..516c71e626 100644
--- a/engines/kyra/sequences_darkmoon.cpp
+++ b/engines/kyra/sequences_darkmoon.cpp
@@ -177,7 +177,7 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.delay(1);
 
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(12);
+		snd_playSong(12);
 
 	_screen->copyRegion(0, 0, 8, 8, 304, 128, 2, 0, Screen::CR_NO_P_CHECK);
 	sq.setPalette(9);
@@ -447,18 +447,17 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.waitForSongNotifier(8, true);
 
 	if (skipFlag() || shouldQuit()) {
-		_sound->playTrack(15);
+		snd_fadeOut();
 	} else {
 		_screen->setScreenDim(17);
 		_screen->clearCurDim();
-		_sound->playTrack(14);
+		snd_playSoundEffect(14);
 		sq.fadePalette(10, 1);
 		_screen->setClearScreenDim(18);
 		sq.delay(6);
 		sq.fadePalette(9, 1);
 		_screen->clearCurPage();
 	}
-
 	sq.fadePalette(9, 10);
 }
 
@@ -479,7 +478,7 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.delay(18);
 
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(1);
+		snd_playSong(1);
 	sq.update(2);
 
 	sq.loadScene(1, 2);
@@ -603,7 +602,7 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.waitForSongNotifier(3);
 
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(7);
+		snd_playSoundEffect(7);
 	sq.delay(8);
 
 	sq.runSequence(10);
@@ -635,7 +634,7 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.waitForSongNotifier(4);
 
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(7);
+		snd_playSoundEffect(7);
 	sq.delay(8);
 
 	sq.runSequence(10);
@@ -660,7 +659,7 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.delay(36);
 
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(11);
+		snd_playSoundEffect(11);
 
 	sq.delay(54);
 	sq.fadeText();
@@ -669,7 +668,7 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.waitForSongNotifier(5);
 
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(6);
+		snd_playSoundEffect(6);
 
 	if (!skipFlag() && !shouldQuit())
 		_screen->crossFadeRegion(0, 0, 8, 8, 304, 128, 2, 0);
@@ -680,7 +679,7 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.runSequence(19);
 	sq.runSequence(19, 36);
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(12);
+		snd_playSoundEffect(12);
 	sq.fadeText();
 
 	sq.printText(17, 15);           // Thank you
@@ -690,12 +689,12 @@ void DarkMoonEngine::seq_playFinale() {
 
 	sq.printText(18, 15);           // You have earned my deepest respect
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(11);
+		snd_playSoundEffect(11);
 	sq.runSequence(20);
 	sq.runSequence(19);
 	sq.runSequence(19);
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(11);
+		snd_playSoundEffect(11);
 	sq.delay(36);
 	sq.fadeText();
 
@@ -703,37 +702,37 @@ void DarkMoonEngine::seq_playFinale() {
 	sq.runSequence(19);
 	sq.runSequence(19, 18);
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(11);
+		snd_playSoundEffect(11);
 	sq.runSequence(20, 18);
 	sq.fadeText();
 
 	sq.delay(28);
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(12);
+		snd_playSoundEffect(12);
 	sq.delay(3);
 
 	sq.loadScene(5, 2);
 	if (skipFlag() || shouldQuit()) {
 		_screen->copyRegion(0, 0, 8, 8, 304, 128, 2, 0, Screen::CR_NO_P_CHECK);
 	} else {
-		_sound->playTrack(6);
+		snd_playSoundEffect(6);
 		_screen->crossFadeRegion(0, 0, 8, 8, 304, 128, 2, 0);
 	}
 
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(12);
+		snd_playSoundEffect(12);
 	sq.delay(5);
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(11);
+		snd_playSoundEffect(11);
 	sq.delay(11);
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(12);
+		snd_playSoundEffect(12);
 	sq.delay(7);
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(11);
+		snd_playSoundEffect(11);
 	sq.delay(12);
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(12);
+		snd_playSoundEffect(12);
 
 	removeInputTop();
 	resetSkipFlag(true);
@@ -747,7 +746,7 @@ void DarkMoonEngine::seq_playFinale() {
 
 	sq.delay(18);
 	if (!skipFlag() && !shouldQuit())
-		_sound->playTrack(1);
+		snd_playSong(1);
 
 	seq_playCredits(&sq, _creditsData, 18, 2, 6, 2);
 
@@ -1121,7 +1120,7 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 		case 6:
 			// play sound effect
 			if (s->obj != 0xff)
-				_vm->sound()->playSoundEffect(s->obj);
+				_vm->snd_playSoundEffect(s->obj);
 			break;
 
 		default:
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index dc479a8c30..9f54306d59 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -112,7 +112,7 @@ void EoBEngine::seq_playOpeningCredits() {
 	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
 
-	_sound->playTrack(1);
+	snd_playSong(1);
 	delay(_introOpeningFrmDelay[0] * _tickLength);
 
 	for (int i = 0; i < 4 && !shouldQuit() && !skipFlag(); i++) {
@@ -129,7 +129,7 @@ void EoBEngine::seq_playIntro() {
 	_allowSkip = true;
 
 	if (!shouldQuit() && !skipFlag()) {
-		_sound->playTrack(2);
+		snd_playSong(2);
 		_screen->loadBitmap("TITLE-V.CMP", 5, 3, 0);
 		_screen->crossFadeRegion(0, 0, 0, 0, 320, 200, 2, 0);
 		delay(120 * _tickLength);
@@ -295,7 +295,7 @@ void EoBEngine::seq_orb() {
 	_screen->copyPage(3, 4);
 	_screen->clearCurPage();
 
-	_sound->playTrack(6);
+	snd_playSoundEffect(6);
 
 	for (int i = -1; i < 4 && !shouldQuit() && !skipFlag(); i++) {
 		uint32 end = _system->getMillis() + 3 * _tickLength;
@@ -311,7 +311,7 @@ void EoBEngine::seq_orb() {
 	_screen->updateScreen();
 	delay(40 * _tickLength);
 
-	_sound->playTrack(6);
+	snd_playSoundEffect(6);
 
 	for (int i = 3; i > -2 && !shouldQuit() && !skipFlag(); i--) {
 		uint32 end = _system->getMillis() + 3 * _tickLength;
@@ -350,7 +350,7 @@ void EoBEngine::seq_waterdeepEntry() {
 
 	_screen->copyPage(3, 4);
 	_screen->fillRect(0, 168, 319, 199, 12, 0);
-	_sound->playTrack(6);
+	snd_playSoundEffect(6);
 
 	for (int i = 0; i < 4 && !shouldQuit() && !skipFlag(); i++) {
 		uint32 end = _system->getMillis() + 3 * _tickLength;
@@ -415,7 +415,7 @@ void EoBEngine::seq_waterdeepEntry() {
 		}
 
 		if (!(_rnd.getRandomNumber(255) & 7))
-			_sound->playTrack(_rnd.getRandomBit() ? 5 : 14);
+			snd_playSoundEffect(_rnd.getRandomBit() ? 5 : 14);
 
 		_screen->updateScreen();
 		delayUntil(end);
@@ -502,7 +502,7 @@ void EoBEngine::seq_king() {
 		}
 
 		if (!(_rnd.getRandomNumber(255) & 3))
-			_sound->playTrack(7);
+			snd_playSoundEffect(7);
 
 		_screen->updateScreen();
 		delayUntil(end);
@@ -534,7 +534,7 @@ void EoBEngine::seq_hands() {
 
 	_screen->updateScreen();
 	delay(15 * _tickLength);
-	_sound->playTrack(11);
+	snd_playSoundEffect(11);
 
 	for (int i = -22; i <= 20 && !shouldQuit() && !skipFlag(); i += 4) {
 		uint32 end = _system->getMillis() + _tickLength;
@@ -546,7 +546,7 @@ void EoBEngine::seq_hands() {
 		delayUntil(end);
 	}
 
-	_sound->playTrack(10);
+	snd_playSoundEffect(10);
 
 	delete[] shp1;
 	delete[] shp2;
@@ -574,7 +574,7 @@ void EoBEngine::seq_hands() {
 		delayUntil(end);
 	}
 
-	_sound->playTrack(12);
+	snd_playSoundEffect(12);
 	delay(5 * _tickLength);
 
 	for (int i = 0; i > -54 && !shouldQuit() && !skipFlag(); i -= 4) {
@@ -602,7 +602,7 @@ void EoBEngine::seq_hands() {
 	_screen->drawShape(2, shp2, 52, 49, 0);
 	boxMorphTransition(9, 6, 0, 0, 0, 0, 18, 12, 8, 11, 21, 10);
 	delay(15 * _tickLength);
-	_sound->playTrack(11);
+	snd_playSoundEffect(11);
 
 	for (int i = -56; i <= -8 && !shouldQuit() && !skipFlag(); i += 4) {
 		uint32 end = _system->getMillis() + _tickLength;
@@ -614,7 +614,7 @@ void EoBEngine::seq_hands() {
 		delayUntil(end);
 	}
 
-	_sound->playTrack(10);
+	snd_playSoundEffect(10);
 	delete[] shp1;
 	delete[] shp2;
 	delay(30 * _tickLength);
@@ -640,7 +640,7 @@ void EoBEngine::seq_hands() {
 		dy -= 5;
 	}
 
-	_sound->playTrack(13);
+	snd_playSoundEffect(13);
 
 	for (int i = -40; i <= 0 && !shouldQuit() && !skipFlag(); i += 4) {
 		uint32 end = _system->getMillis() + _tickLength;
@@ -701,7 +701,7 @@ void EoBEngine::seq_waterdeepExit() {
 		}
 
 		if (!(_rnd.getRandomNumber(255) & 7))
-			_sound->playTrack(_rnd.getRandomBit() ? 5 : 14);
+			snd_playSoundEffect(_rnd.getRandomBit() ? 5 : 14);
 
 		_screen->updateScreen();
 		delayUntil(end);
@@ -742,7 +742,7 @@ void EoBEngine::seq_waterdeepExit() {
 		delayUntil(end);
 	}
 
-	_sound->playTrack(3);
+	snd_playSong(3);
 	delay(60 * _tickLength);
 
 	for (int i = 0; i < 56 && !shouldQuit() && !skipFlag(); i++) {
@@ -787,11 +787,11 @@ void EoBEngine::seq_tunnel() {
 	for (int i = 0; i < 3 && !shouldQuit() && !skipFlag(); i++) {
 		uint32 end = _system->getMillis() + 8 * _tickLength;
 		_screen->copyRegion(0, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
-		_sound->playTrack(7);
+		snd_playSoundEffect(7);
 		_screen->updateScreen();
 		delayUntil(end);
 		_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
-		_sound->playTrack(7);
+		snd_playSoundEffect(7);
 		end = _system->getMillis() + 8 * _tickLength;
 		_screen->updateScreen();
 		delayUntil(end);
@@ -820,11 +820,11 @@ void EoBEngine::seq_tunnel() {
 	delay(40 * _tickLength);
 
 	_screen->copyRegion(264, 0, 136, 56, 48, 48, 4, 0, Screen::CR_NO_P_CHECK);
-	_sound->playTrack(8);
+	snd_playSoundEffect(8);
 	_screen->copyRegion(0, 0, 0, 0, 320, 184, 0, 2, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
 	delay(16 * _tickLength);
-	_sound->playTrack(4);
+	snd_playSoundEffect(4);
 
 	for (int i = 0; i < 30 && !shouldQuit() && !skipFlag(); i++) {
 		uint32 end = _system->getMillis() + _tickLength;
@@ -835,7 +835,7 @@ void EoBEngine::seq_tunnel() {
 		delayUntil(end);
 	}
 
-	_sound->playTrack(9);
+	snd_playSoundEffect(9);
 
 	for (int i = 0; i < 6 && !shouldQuit() && !skipFlag(); i++) {
 		uint32 end = _system->getMillis() + _tickLength;
@@ -853,7 +853,7 @@ void EoBEngine::seq_tunnel() {
 
 	_screen->loadBitmap(_introFilesTunnel[1], 5, 3, 0);
 	_screen->copyPage(3, 4);
-	_sound->playTrack(6);
+	snd_playSoundEffect(6);
 	_screen->copyRegion(0, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
 	delay(2 * _tickLength);
diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index cce18b5ea4..668e662413 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -2405,7 +2405,7 @@ void SoundAdLibPC::play(uint8 track, uint8 volume) {
 }
 
 void SoundAdLibPC::beginFadeOut() {
-	play(1, 0xff);
+	play(_version > 2 ? 1 : 15, 0xff);
 }
 
 int SoundAdLibPC::checkTrigger() {
-- 
cgit v1.2.3


From 8c7cd344c7560e655c0cee3136905f64a0e9ac47 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 6 Jan 2012 23:26:08 +0100
Subject: AGI: Clean up predictive matching

Specifically:
* Don't enable the 'next' button in predictive mode when we don't have a
  full match. Doing this didn't make sense since you'd iterate over a
  seemingly arbitrary set of completions instead of all possible ones.
* Do only a single binary search.
* Fix the width of the mode button for mouse press detections.
---
 engines/agi/agi.h          |  2 +-
 engines/agi/predictive.cpp | 36 +++++++++++++++++-------------------
 2 files changed, 18 insertions(+), 20 deletions(-)

(limited to 'engines')

diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 28403964dd..e9923aba2e 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -1085,7 +1085,7 @@ private:
 	void blitTextbox(const char *p, int y, int x, int len);
 	void eraseTextbox();
 	void loadDict();
-	bool matchWord(bool onlyExact = false);
+	bool matchWord();
 
 	// Predictive dialog
 	// TODO: Move this to a separate class
diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp
index 585a633bb0..e27a2e81f8 100644
--- a/engines/agi/predictive.cpp
+++ b/engines/agi/predictive.cpp
@@ -112,7 +112,7 @@ bool AgiEngine::predictiveDialog() {
 		"(#)next",    "add",
 		"<",
 		"Cancel",  "OK",
-		"Pre", "(0) ", NULL
+		"(*)Pre", "(0) ", NULL
 	};
 	const int colors[] = {
 		15, 0, 15, 0, 15, 0,
@@ -556,7 +556,7 @@ void AgiEngine::loadDict() {
 	debug("Time to parse pred.dic: %d, total: %d", time3-time2, time3-time1);
 }
 
-bool AgiEngine::matchWord(bool onlyExact) {
+bool AgiEngine::matchWord() {
 	// If no text has been entered, then there is no match.
 	if (_currentCode.empty())
 		return false;
@@ -565,23 +565,13 @@ bool AgiEngine::matchWord(bool onlyExact) {
 	if (_currentCode.size() > MAXWORDLEN)
 		return false;
 
-	if (!onlyExact) {
-		// First always try an exact match.
-		bool ret = matchWord(true);
-		if (ret)
-			return true;
-	}
-
 	// The entries in the dictionary consist of a code, a space, and then
 	// a space-separated list of words matching this code.
 	// To exactly match a code, we therefore match the code plus the trailing
 	// space in the dictionary.
-	Common::String code = _currentCode;
-	if (onlyExact)
-		code += " ";
+	Common::String code = _currentCode + " ";
 
-	// Perform a binary search on the dictionary to find an entry that has
-	// _currentCode as a prefix.
+	// Perform a binary search on the dictionary.
 	int hi = _predictiveDictLineCount - 1;
 	int lo = 0;
 	int line = 0;
@@ -593,24 +583,32 @@ bool AgiEngine::matchWord(bool onlyExact) {
 		else if (cmpVal < 0)
 			lo = line + 1;
 		else {
-			hi = line;
 			break;
 		}
 	}
 
+	bool partial = hi < lo;
+	if (partial) {
+		// Didn't find an exact match, but 'lo' now points to the first entry
+		// lexicographically greater than the current code, so that will
+		// be the first entry with the current code as a prefix, if it exists.
+		line = lo;
+		_predictiveDictActLine = NULL;
+	} else {
+		_predictiveDictActLine = _predictiveDictLine[line];
+	}
+
 	_currentWord.clear();
 	_wordNumber = 0;
-	if (0 == strncmp(_predictiveDictLine[line], code.c_str(), code.size())) {
-		_predictiveDictActLine = _predictiveDictLine[line];
+	if (0 == strncmp(_predictiveDictLine[line], _currentCode.c_str(), _currentCode.size())) {
 		char tmp[MAXLINELEN];
-		strncpy(tmp, _predictiveDictActLine, MAXLINELEN);
+		strncpy(tmp, _predictiveDictLine[line], MAXLINELEN);
 		tmp[MAXLINELEN - 1] = 0;
 		char *tok = strtok(tmp, " ");
 		tok = strtok(NULL, " ");
 		_currentWord = Common::String(tok, _currentCode.size());
 		return true;
 	} else {
-		_predictiveDictActLine = NULL;
 		return false;
 	}
 }
-- 
cgit v1.2.3


From d4a81009e499c65da299262049acbaeeae313679 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 6 Jan 2012 23:38:41 +0100
Subject: AGI: Fix stuck next button when switching back to predictive mode

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

(limited to 'engines')

diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp
index e27a2e81f8..4bb378934d 100644
--- a/engines/agi/predictive.cpp
+++ b/engines/agi/predictive.cpp
@@ -458,6 +458,7 @@ bool AgiEngine::predictiveDialog() {
 					_currentCode.clear();
 					_currentWord.clear();
 					memset(repeatcount, 0, sizeof(repeatcount));
+					_predictiveDictActLine = NULL;
 				} else {
 					enterPredictiveResult = true;
 					closeDialog = true;
-- 
cgit v1.2.3


From 4222a728e16e07e1d0fa29d8ade2dfca608ce400 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 7 Jan 2012 11:54:47 +1100
Subject: TSAGE: Implemented R2R Scene 325 - Bridge Console

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   3 +-
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 855 +++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  52 ++
 engines/tsage/staticres.cpp                     |  10 +-
 engines/tsage/staticres.h                       |   5 +-
 5 files changed, 919 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index aa9e1dfe1e..157f222012 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -69,7 +69,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Bridge
 		return new Scene300();
 	case 325:
-		error("Missing scene %d from group 0", sceneNumber);
+		// Bridge Console
+		return new Scene325();
 	case 400:
 		// Science Lab
 		return new Scene400();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 0ef3a68549..597156fd03 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -521,15 +521,15 @@ void Scene125::Icon::setIcon(int id) {
 		_object1.setPosition(_position);
 
 		_sceneText1._fontNumber = scene->_iconFontNumber;
-		_sceneText1.setup(CONSOLE_MESSAGES[id]);
+		_sceneText1.setup(CONSOLE125_MESSAGES[id]);
 		_sceneText1.fixPriority(20);
 
 		_sceneText2._fontNumber = scene->_iconFontNumber;
-		_sceneText2.setup(CONSOLE_MESSAGES[id]);
+		_sceneText2.setup(CONSOLE125_MESSAGES[id]);
 		_sceneText2.fixPriority(20);
 
 		_sceneText2._fontNumber = scene->_iconFontNumber;
-		_sceneText2.setup(CONSOLE_MESSAGES[id]);
+		_sceneText2.setup(CONSOLE125_MESSAGES[id]);
 		_sceneText2.fixPriority(10);
 
 		switch (_lookLineNum) {
@@ -2666,6 +2666,855 @@ void Scene300::signal309() {
 		R2_GLOBALS._stripManager_lookupList[4] = 3;
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 325 - Bridge Console
+ *
+ *--------------------------------------------------------------------------*/
+
+const double ADJUST_FACTOR = 0.06419999999999999;
+
+/*--------------------------------------------------------------------------*/
+
+Scene325::Icon::Icon(): SceneActor()  {
+	_lookLineNum = 0;
+	_field98 = 0;
+	_pressed = false;
+}
+
+void Scene325::Icon::postInit(SceneObjectList *OwnerList) {
+	SceneObject::postInit();
+	
+	_object1.postInit();
+	_object1.fixPriority(21);
+	_object1.hide();
+
+	_sceneText1._color1 = 92;
+	_sceneText1._color2 = 0;
+	_sceneText1._width = 200;
+	_sceneText2._color1 = 0;
+	_sceneText2._color2 = 0;
+	_sceneText2._width = 200;
+	fixPriority(20);
+}
+
+void Scene325::Icon::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+	s.syncAsSint16LE(_lookLineNum);
+	s.syncAsSint16LE(_field98);
+	s.syncAsSint16LE(_pressed);
+}
+
+void Scene325::Icon::process(Event &event) {
+	Scene325 *scene = (Scene325 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!event.handled && !(_flags & OBJFLAG_HIDING) && R2_GLOBALS._player._uiEnabled) {
+
+		if (event.eventType == EVENT_BUTTON_DOWN) {
+			int regionIndex = R2_GLOBALS._sceneRegions.indexOf(event.mousePos);
+
+			switch (R2_GLOBALS._events.getCursor()) {
+			case CURSOR_LOOK:
+				if (regionIndex == _sceneRegionId) {
+					event.handled = true;
+					SceneItem::display2(326, _lookLineNum);
+				}
+				break;
+
+			case CURSOR_USE:
+				if ((regionIndex == _sceneRegionId) && !_pressed) {
+					scene->_sound1.play(14);
+					setFrame(2);
+
+					switch (_object1._strip) {
+					case 1:
+						_object1.setStrip(2);
+						break;
+					case 3:
+						_object1.setStrip(4);
+						break;
+					case 5:
+						_object1.setStrip(6);
+						break;
+					case 7:
+						_object1.setStrip(8);
+						break;
+					default:
+						break;
+					}
+
+					_pressed = true;
+					event.handled = true;
+				}
+				break;
+
+			default:
+				break;
+			}
+		}
+
+		if ((event.eventType == EVENT_BUTTON_UP) && _pressed) {
+			setFrame(1);
+
+			switch (_object1._strip) {
+			case 2:
+				_object1.setStrip(1);
+				break;
+			case 4:
+				_object1.setStrip(3);
+				break;
+			case 6:
+				_object1.setStrip(5);
+				break;
+			default:
+				break;
+			}
+
+			_pressed = false;
+			event.handled = true;
+			scene->consoleAction(_lookLineNum);
+		}
+	}
+}
+
+void Scene325::Icon::setIcon(int id) {
+	Scene325 *scene = (Scene325 *)R2_GLOBALS._sceneManager._scene;
+
+	_lookLineNum = _field98 = id;
+	SceneActor::_lookLineNum = id;
+
+	_sceneText1.remove();
+	_sceneText2.remove();
+
+	if (_lookLineNum) {
+		showIcon();
+		_object1.setup(325, ((id - 1) / 10) * 2 + 1, ((id - 1) % 10) + 1);
+		_object1.setPosition(_position);
+
+		_sceneText1._fontNumber = scene->_iconFontNumber;
+		_sceneText1.setup(CONSOLE325_MESSAGES[id]);
+		_sceneText1.fixPriority(20);
+
+		_sceneText2._fontNumber = scene->_iconFontNumber;
+		_sceneText2.setup(CONSOLE325_MESSAGES[id]);
+		_sceneText2.fixPriority(20);
+
+		_sceneText2._fontNumber = scene->_iconFontNumber;
+		_sceneText2.setup(CONSOLE325_MESSAGES[id]);
+		_sceneText2.fixPriority(10);
+
+		switch (_lookLineNum) {
+		case 7:
+			_sceneText1.setPosition(Common::Point(62, _position.y + 8));
+			_sceneText2.setPosition(Common::Point(64, _position.y + 10));
+			break;
+		case 8:
+		case 9:
+			_sceneText1.setPosition(Common::Point(65, _position.y + 8));
+			_sceneText2.setPosition(Common::Point(67, _position.y + 10));
+			break;
+		case 12:
+			_sceneText1.setPosition(Common::Point(83, _position.y + 8));
+			_sceneText2.setPosition(Common::Point(85, _position.y + 10));
+			break;
+		default:
+			_sceneText1.setPosition(Common::Point(121, _position.y + 8));
+			_sceneText2.setPosition(Common::Point(123, _position.y + 10));
+			break;
+		}
+	} else {
+		hideIcon();
+	}
+}
+
+void Scene325::Icon::showIcon() {
+	_sceneText1.show();
+	_sceneText2.show();
+	_object1.show();
+	_object2.show();
+	show();
+}
+
+void Scene325::Icon::hideIcon() {
+	_sceneText1.hide();
+	_sceneText2.hide();
+	_object1.hide();
+	_object2.hide();
+	hide();
+}
+
+/*--------------------------------------------------------------------------*/
+
+Scene325::Scene325(): SceneExt() {
+	_field412 = 7;
+	_iconFontNumber = 50;
+	_field416 = _field418 = 0;
+	_field41A = _field41C = _field41E = _field420 = 0;
+	_soundCount = _soundIndex = 0;
+	
+	for (int idx = 0; idx < 10; ++idx)
+		_soundQueue[idx] = 0;
+}
+
+void Scene325::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(325);
+
+	R2_GLOBALS.clearFlag(50);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_palette.loadPalette(0);
+	
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.disableControl();
+
+	_item2.setDetails(1, 325, 3, 4, 5);
+	_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 325, 0, 1, 2, 1, (SceneItem *)NULL);
+	_sceneMode = 1;
+	signal();
+}
+	
+void Scene325::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_iconFontNumber);
+	s.syncAsSint16LE(_field416);
+	s.syncAsSint16LE(_field418);
+	s.syncAsSint16LE(_field41A);
+	s.syncAsSint16LE(_field41C);
+	s.syncAsSint16LE(_field41E);
+	s.syncAsSint16LE(_field420);
+	s.syncAsSint16LE(_soundCount);
+	s.syncAsSint16LE(_soundIndex);
+
+	for (int idx = 0; idx < 10; ++idx)
+		s.syncAsSint16LE(_soundQueue[idx]);
+}
+
+void Scene325::remove() {
+	removeText();
+	SceneExt::remove();
+}
+
+void Scene325::signal() {
+	switch (_sceneMode - 1) {
+	case 0:
+		_icon1.postInit();
+		_icon1._sceneRegionId = 2;
+		_icon2.postInit();
+		_icon2._sceneRegionId = 3;
+		_icon3.postInit();
+		_icon3._sceneRegionId = 4;
+		_icon4.postInit();
+		_icon4._sceneRegionId = 5;
+
+		setAction(&_sequenceManager1, this, 127, &_icon1, &_icon2, &_icon3, &_icon4, 
+			&R2_GLOBALS._player, NULL);
+		_sceneMode = 2;
+		break;
+	case 1:
+		_icon1.setup(160, 1, 1);
+		_icon1.setPosition(Common::Point(65, 17));
+		_icon1._object2.postInit();
+		_icon1._object2.setup(160, 7, 1);
+		_icon1._object2.setPosition(Common::Point(106, 41));
+
+		_icon2.setup(160, 1, 1);
+		_icon2.setPosition(Common::Point(80, 32));
+		_icon2._object2.postInit();
+		_icon2._object2.setup(160, 7, 2);
+		_icon2._object2.setPosition(Common::Point(106, 56));
+		
+		_icon3.setup(160, 1, 1);
+		_icon3.setPosition(Common::Point(65, 47));
+		_icon3._object2.postInit();
+		_icon3._object2.setup(160, 7, 1);
+		_icon3._object2.setPosition(Common::Point(106, 71));
+
+		_icon4.setup(160, 1, 1);
+		_icon4.setPosition(Common::Point(80, 62));
+		_icon4._sceneRegionId = 5;
+		_icon4._object2.postInit();
+		_icon4._object2.setup(160, 7, 2);
+		_icon4._object2.setPosition(Common::Point(106, 86));
+
+		_icon5.postInit();
+		_icon5.setup(160, 1, 1);
+		_icon5._sceneRegionId = 7;
+		_icon5.setPosition(Common::Point(37, 92));
+		_icon5.setIcon(8);
+
+		_icon6.postInit();
+		_icon6.setup(160, 1, 1);
+		_icon6.setPosition(Common::Point(106, 110));
+		_icon6.setIcon(7);
+		_icon6._sceneRegionId = 8;
+
+		consoleAction(7);
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		R2_GLOBALS._player._canWalk = false;
+		break;
+	case 9:
+		switch (_field412) {
+		case 3:
+			_sceneMode = 129;
+			_object1.postInit();
+			_object2.postInit();
+			_object3.postInit();
+			if (R2_GLOBALS.getFlag(13)) {
+				_object4.postInit();
+				setAction(&_sequenceManager1, this, 130, &R2_GLOBALS._player, &_object1, 
+					&_object2, &_object3, &_object4, NULL);
+			} else {
+				setAction(&_sequenceManager1, this, 129, &R2_GLOBALS._player, &_object1,
+					&_object2, &_object3, NULL);
+			}
+			break;
+		case 17:
+		case 18:
+		case 19:
+		case 20: {
+			int v = 10 - ((21 - _field412) * 2);
+			if (R2_GLOBALS.getFlag(50))
+				--v;
+			if (_field418 == 5)
+				v += 8;
+			if (R2_GLOBALS.getFlag(51) && (v == 2))
+				R2_GLOBALS.setFlag(57);
+
+			if (R2_GLOBALS.getFlag(44) && !R2_GLOBALS.getFlag(51)) {
+				if (v != 13) {
+					setMessage(328, 0);
+				} else {
+					_field420 = 864;
+
+					_object12.postInit();
+					_object2.setup(326, 4, 1);
+					_object12.setPosition(Common::Point(149, 128));
+					_object12.fixPriority(20);
+
+					_object13.postInit();
+					_object13.setup(326, 4, 2);
+					_object13.setPosition(Common::Point(149, (int)(_field420 * ADJUST_FACTOR)));
+					_object13.fixPriority(21);
+					
+					_object10.postInit();
+					_object10.setup(326, 1, 1);
+					_object10.setPosition(Common::Point(210, 20));
+					_object10.fixPriority(10);
+					
+					_object1.postInit();
+					_object1.setup(326, 1, 1);
+					_object1.setPosition(Common::Point(210, 32));
+					_object10.fixPriority(10);
+
+					_object2.postInit();
+					_object2.setup(326, 1, 1);
+					_object2.setPosition(Common::Point(210, 44));
+					_object2.fixPriority(10);
+
+					_object3.postInit();
+					_object3.setup(326, 1, 1);
+					_object3.setPosition(Common::Point(210, 56));
+					_object3.fixPriority(10);
+
+					_object4.postInit();
+					_object4.setup(326, 1, 1);
+					_object4.setPosition(Common::Point(210, 68));
+					_object4.fixPriority(10);
+
+					_object5.postInit();
+					_object5.setup(326, 1, 1);
+					_object5.setPosition(Common::Point(210, 80));
+					_object5.fixPriority(10);
+				
+					_object6.postInit();
+					_object6.setup(326, 1, 1);
+					_object6.setPosition(Common::Point(210, 92));
+					_object6.fixPriority(10);
+
+					_object7.postInit();
+					_object7.setup(326, 1, 1);
+					_object7.setPosition(Common::Point(210, 104));
+					_object7.fixPriority(10);
+
+					_object8.postInit();
+					_object8.setup(326, 1, 1);
+					_object8.setPosition(Common::Point(210, 116));
+					_object8.fixPriority(10);
+
+					_object9.postInit();
+					_object9.setup(326, 1, 1);
+					_object9.setPosition(Common::Point(210, 128));
+					_object9.fixPriority(10);
+
+					_object11.postInit();
+					_object11.setup(326, 1, 1);
+					_object11.setPosition(Common::Point(210, 150));
+					_object11.fixPriority(10);
+				}
+			} else if (R2_GLOBALS.getFlag(51)) {
+				setMessage(329, (v == 12) ? 10 : v);
+			} else {
+				setMessage(327, (v < 15) ? 1 : v);
+			}
+			break;
+		}
+		case 21:
+			_sceneMode = 129;
+
+			_object1.postInit();
+			_object1.setup(327, 1, 1);
+			_object1.setPosition(Common::Point(170, 80));
+			_object1.fixPriority(10);
+			_object1.animate(ANIM_MODE_5, NULL);
+			break;
+		case 22:
+			_sceneMode = 129;
+
+			_object1.postInit();
+			_object1.setup(327, 2, 1);
+			_object1.setPosition(Common::Point(160, 80));
+			_object1.fixPriority(10);
+			_object1.animate(ANIM_MODE_5, NULL);
+			break;
+		case 24:
+			R2_GLOBALS._player.enableControl();
+			R2_GLOBALS._player._canWalk = false;
+			_field416 = 37;
+			setMessage(128, _field416);
+			break;
+		case 25:
+			R2_GLOBALS._player.enableControl();
+			R2_GLOBALS._player._canWalk = false;
+			_field416 = 68;
+			setMessage(128, _field416);
+			break;
+		case 26:
+			R2_GLOBALS._player.enableControl();
+			R2_GLOBALS._player._canWalk = false;
+			_field416 = 105;
+			setMessage(128, _field416);
+			break;
+		default:
+			R2_GLOBALS._player.enableControl();
+			R2_GLOBALS._player._canWalk = false;
+			_field416 = 105;
+			setMessage(128, _field416);
+			break;
+		}
+		break;
+	case 10:
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+
+		if ((_field412 >= 17) && (_field412 <= 20)) {
+			_icon5.setIcon(8);
+			consoleAction(4);
+		} else {
+			consoleAction(7);
+		}
+
+		_icon6.setIcon(7);
+		break;
+	case 11:
+		R2_GLOBALS.setFlag(45);
+		R2_GLOBALS._sceneManager.changeScene(300);
+		break;
+	case 12:
+		R2_GLOBALS.setFlag(57);
+		R2_GLOBALS._sceneManager.changeScene(300);
+		break;
+	case 14:
+		if (_soundCount)
+			--_soundCount;
+
+		if (!_soundCount || (R2_GLOBALS._speechSubtitles == 2)) {
+			_soundIndex = 0;
+			R2_GLOBALS._playStream.stop();
+		} else {
+			_sceneMode = 15;
+			R2_GLOBALS._playStream.play(_soundQueue[_soundIndex], this);
+		}
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+		break;
+	}
+}
+
+void Scene325::removeText() {
+	_text1.remove();
+	_soundCount = 0;
+	_soundIndex = 0;
+	R2_GLOBALS._playStream.stop();
+}
+
+void Scene325::consoleAction(int id) {
+	_icon1.setIcon(0);
+	_icon2.setIcon(0);
+	_icon3.setIcon(0);
+	_icon4.setIcon(0);
+
+	if (id == 7)
+		_icon5.setIcon(9);
+	else if ((_field412 != 3) && ((_field412 < 17) || (_field412 > 26)))
+		_icon5.setIcon(8);
+
+	switch (id - 1) {
+	case 0:
+		_icon1.setIcon(10);
+		_icon2.setIcon(11);
+		break;
+	case 1:
+		_icon1.setIcon(23);
+		_icon2.setIcon(24);
+		_icon3.setIcon(25);
+		_icon4.setIcon(26);
+	case 2:
+	case 16:
+	case 17:
+	case 18:
+	case 19:
+	case 20:
+	case 21:
+		R2_GLOBALS._player.disableControl();
+		consoleAction(7);
+		_icon1.hideIcon();
+		_icon2.hideIcon();
+		_icon3.hideIcon();
+		// TODO: Finish
+		break;
+	case 3:
+		_icon1.setIcon(5);
+		_icon2.setIcon(6);
+		_icon3.setIcon(R2_GLOBALS.getFlag(50) ? 16 : 15);
+		break;
+	case 4:
+	case 5:
+		_field418 = id;
+		_icon1.setIcon(17);
+		_icon2.setIcon(18);
+		_icon3.setIcon(19);
+		break;
+	case 7:
+		consoleAction(((_field412 == 5) || (_field412 == 6) || (_field412 == 15)) ? 4 : 7);
+		break;
+	case 8:
+		R2_GLOBALS._sceneManager.changeScene(300);
+	case 9:
+	case 10:
+		_iconFontNumber = (id - 1) == 9 ? 50 : 52;
+		_text1.remove();
+		_icon6.setIcon(7);
+		break;
+	case 11:
+		if (R2_GLOBALS.getFlag(57) && (R2_GLOBALS._player._characterIndex == 1) && !R2_GLOBALS.getFlag(25)) {
+			R2_GLOBALS._player.disableControl();
+			R2_GLOBALS._events.setCursor(CURSOR_ARROW);
+			_sceneMode = 13;
+			_stripManager.start(403, this);
+		} else {
+			R2_GLOBALS._player.disableControl();
+			_text1.remove();
+
+			_icon4.setPosition(Common::Point(80, 62));
+			_icon4._sceneRegionId = 5;
+			_icon4.hideIcon();
+
+			_object12.remove();
+			_object13.remove();
+			_object10.remove();
+			_object1.remove();
+			_object2.remove();
+			_object3.remove();
+			_object4.remove();
+			_object5.remove();
+			_object6.remove();
+			_object7.remove();
+			_object8.remove();
+			_object9.remove();
+			_object11.remove();
+
+			_palette.loadPalette(160);
+			_sceneMode = 11;
+
+			BF_GLOBALS._scenePalette.addFader(&_palette._palette[0], 256, 5, this);
+		}
+		break;
+	case 12:
+		_icon4.setIcon(14);
+		_icon4._object2.hide();
+
+		switch (_field412) {
+		case 17:
+		case 18:
+		case 19:
+		case 20:
+			if (_field420) {
+				R2_GLOBALS._player.disableControl();
+				_field41A = 1296;
+				_field41E = 1;
+			}
+			break;
+		default:
+			setMessage(128, --_field416);
+			break;
+		}
+		return;
+	case 13:
+		_icon4.setIcon(14);
+		_icon4._object2.hide();
+
+		switch (_field412) {
+		case 17:
+		case 18:
+		case 19:
+		case 20:
+			if (_field420 < 1620) {
+				R2_GLOBALS._player.disableControl();
+				_field41A = 1296;
+				_field41E = -1;
+			}
+			break;
+		}
+		return;
+	case 14:
+		if (R2_GLOBALS.getFlag(55)) {
+			SceneItem::display2(329, 17);
+		} else {
+			R2_GLOBALS.setFlag(50);
+			consoleAction(4);
+		}
+		id = 4;
+		break;
+	case 15:
+		R2_GLOBALS.clearFlag(50);
+		consoleAction(4);
+		id = 4;
+		break;
+	case 22:
+	case 23:
+	case 24:
+	case 25:
+		R2_GLOBALS._player.disableControl();
+		consoleAction(2);
+		_field412 = id;
+
+		_icon1.hideIcon();
+		_icon2.hideIcon();
+		_icon3.hideIcon();
+		_icon4.hideIcon();
+
+		_icon5.setIcon(13);
+		_icon4.setPosition(Common::Point(52, 107));
+		_icon4._sceneRegionId = 9;
+		_icon4.setIcon(14);
+		_icon4._object2.hide();
+
+		_icon6.setIcon(12);
+		_sceneMode = 10;
+		_palette.loadPalette(161);
+
+		BF_GLOBALS._scenePalette.addFader(&_palette._palette[0], 256, 5, this);
+		break;
+	case 6:
+	default:
+		_icon1.setIcon(1);
+		_icon2.setIcon(2);
+		_icon3.setIcon(3);
+		int idList[3] = { 4, 22, 21 };
+		_icon4.setIcon(idList[R2_GLOBALS._player._characterIndex - 1]);
+		break;
+	}
+
+	if (id != 8)
+		_field412 = id;
+}
+
+void Scene325::process(Event &event) {
+	SceneExt::process(event);
+
+	if (R2_GLOBALS._player._uiEnabled) {
+		_icon1.process(event);
+		_icon2.process(event);
+		_icon3.process(event);
+		_icon4.process(event);
+		_icon5.process(event);
+		_icon6.process(event);
+	}
+}
+
+void Scene325::dispatch() {
+	if (_field41A) {
+		switch (_field41A) {
+		case 13:
+			_field41C = 1;
+			break;
+		case 1296:
+			R2_GLOBALS._sound3.play(87);
+			_field41C = 1;
+			break;
+		case 33:
+		case 1283:
+			_field41C = 2;
+			break;
+		case 63:
+		case 1263:
+			_field41C = 3;
+			break;
+		case 103:
+		case 1233:
+			_field41C = 4;
+			break;
+		case 153:
+		case 1193:
+			_field41C = 5;
+			break;
+		case 213:
+		case 1143:
+			_field41C = 6;
+			break;
+		case 283:
+		case 1083:
+			_field41C = 7;
+			break;
+		case 1013:
+			_field41C = 8;
+			break;
+		default:
+			break;
+		}
+
+		_field41A -= _field41C;
+		int yp = _field41E * _field41C + _object10._position.y;
+		bool flag = false;
+
+		if (yp >= 30) {
+			yp -= 12;
+			--_field420;
+			flag = true;
+		}
+		if (yp <= 10) {
+			yp += 12;
+			++_field420;
+			flag = true;
+		}
+		_object3.setPosition(Common::Point(149, (int)(_field420 * ADJUST_FACTOR) + 22));
+
+		for (int idx = 0; idx < 4; ++idx)
+			_objList[idx].remove();
+	
+		if (flag) {
+			int v = _field420 - 758;
+			_object10.setFrame((v++ <= 0) ? 1 : v);
+			_object1.setFrame((v++ <= 0) ? 1 : v);
+			_object2.setFrame((v++ <= 0) ? 1 : v);
+			_object3.setFrame((v++ <= 0) ? 1 : v);
+			_object4.setFrame((v++ <= 0) ? 1 : v);
+			_object5.setFrame((v++ <= 0) ? 1 : v);
+			_object6.setFrame((v++ <= 0) ? 1 : v);
+			_object7.setFrame((v++ <= 0) ? 1 : v);
+			_object8.setFrame((v++ <= 0) ? 1 : v);
+			_object9.setFrame((v++ <= 0) ? 1 : v);
+			_object11.setFrame((v++ <= 0) ? 1 : v);
+		}
+
+		_object10.setPosition(Common::Point(210, yp));
+		yp += 12;
+		_object1.setPosition(Common::Point(210, yp));
+		yp += 12;
+		_object2.setPosition(Common::Point(210, yp));
+		yp += 12;
+		_object3.setPosition(Common::Point(210, yp));
+		yp += 12;
+		_object4.setPosition(Common::Point(210, yp));
+		yp += 12;
+		_object5.setPosition(Common::Point(210, yp));
+		yp += 12;
+		_object6.setPosition(Common::Point(210, yp));
+		yp += 12;
+		_object7.setPosition(Common::Point(210, yp));
+		yp += 12;
+		_object8.setPosition(Common::Point(210, yp));
+		yp += 12;
+		_object9.setPosition(Common::Point(210, yp));
+		yp += 12;
+		_object11.setPosition(Common::Point(210, yp));
+
+		if (!_field41A) {
+			R2_GLOBALS._sound3.stop();
+			_field41C = 0;
+
+			if (_field420 == 756) {
+				R2_GLOBALS._player.disableControl();
+				R2_GLOBALS._events.setCursor(CURSOR_USE);
+				_sceneMode = 12;
+				_stripManager.start(212, this);
+			} else {
+				R2_GLOBALS._player.enableControl();
+				R2_GLOBALS._player._canWalk = false;
+			}
+		}
+	}
+
+	SceneExt::dispatch();
+}
+
+void Scene325::setMessage(int resNum, int lineNum) {
+	Common::String msg = g_resourceManager->getMessage(resNum, lineNum);
+
+	if (!msg.empty()) {
+		Common::String msgText = parseMessage(msg);
+
+		_text1._fontNumber = _iconFontNumber;
+		_text1._color1 = 92;
+		_text1._color2 = 0;
+		_text1._width = 221;
+		_text1.fixPriority(20);
+		_text1.setup(msgText);
+		_text1.setPosition(Common::Point(49, 19));
+
+		R2_GLOBALS._sceneObjects->draw();
+		
+		if ((_soundCount != 0) && (R2_GLOBALS._speechSubtitles != 2)) {
+			_sceneMode = 15;
+			R2_GLOBALS._playStream.play(_soundQueue[_soundIndex++], this);
+		}
+	} else {
+		_field412 = 13;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._player.hide();
+
+		_icon4.setPosition(Common::Point(80, 62));
+		_icon4._sceneRegionId = 5;
+		_icon4.hideIcon();
+
+		_palette.loadPalette(160);
+		_sceneMode = 11;
+		BF_GLOBALS._scenePalette.addFader(&_palette._palette[0], 256, 5, this);
+	}
+}
+
+/**
+ * Parses a message to be displayed on the console to see whether there are any sounds to be played.
+ */
+Common::String Scene325::parseMessage(const Common::String &msg) {
+	_soundIndex = 0;
+	_soundCount = 0;
+
+	const char *msgP = msg.c_str();
+	while (*msgP == '!') {
+		// Get the sound number
+		_soundQueue[_soundCount++] = atoi(++msgP);
+
+		while (!((*msgP == '\0') || (*msgP < '0') || (*msgP > '9')))
+			++msgP;
+	}
+
+	return Common::String(msgP);
+}
 /*--------------------------------------------------------------------------
  * Scene 400 - Science Lab
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 8ee8c09873..ff5d5d63a4 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -324,6 +324,58 @@ public:
 	virtual void signal();
 };
 
+class Scene325: public SceneExt {
+	class Icon: public SceneActor {
+	public:
+		int _lookLineNum, _field98;
+		bool _pressed;
+		SceneObject _object1, _object2;
+		SceneText _sceneText1, _sceneText2;
+
+		Icon();
+		virtual Common::String getClassName() { return "Scene325_Icon"; }
+		virtual void postInit(SceneObjectList *OwnerList = NULL);
+		virtual void synchronize(Serializer &s);
+		virtual void process(Event &event);
+
+		void setIcon(int id);
+		void showIcon();
+		void hideIcon();
+	};
+	
+private:
+	void removeText();
+	void consoleAction(int id);
+	void setMessage(int resNum, int lineNum);
+	Common::String parseMessage(const Common::String &msg);
+public:
+	int _field412, _iconFontNumber, _field416, _field418;
+	int _field41A, _field41C, _field41E, _field420;
+	int _soundCount, _soundIndex;
+	int _soundQueue[10];
+	SpeakerQuinn _quinnSpeaker;
+	ScenePalette _palette;
+	SceneHotspot _background, _item2;
+	SceneObject _object1, _object2, _object3, _object4, _object5;
+	SceneObject _object6, _object7, _object8, _object9, _object10;
+	SceneObject _object11, _object12, _object13;
+	SceneObject _objList[4];
+	Icon _icon1, _icon2, _icon3, _icon4, _icon5, _icon6;
+	ASoundExt _sound1;
+	SequenceManager _sequenceManager1;
+	SceneText _text1;
+public:
+	Scene325();
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void synchronize(Serializer &s);
+	virtual void remove();
+	virtual void signal();
+	virtual void process(Event &event);
+	virtual void dispatch();
+};
+
+
 class Scene400: public SceneExt {
 	/* Items */
 	class Terminal: public NamedHotspot {
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index 7d9247b4a3..cc93c4f35f 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -183,7 +183,7 @@ char const *const THE_NEXT_DAY = "The Next Day";
 
 namespace Ringworld2 {
 
-char const *const CONSOLE_MESSAGES[] = {
+char const *const CONSOLE125_MESSAGES[] = {
 	NULL, "Select Language", "Computer Services", "Food Services", "Entertainment Services",
 	"Main Menu", "Exit Menu", "Previous Menu", "Interworld", "Hero's Tongue", "Personal Log",
 	"Database", "Starchart", "Iso-Opto Disk Reader", "Eject Disk", "Meals", "Snacks",
@@ -192,6 +192,14 @@ char const *const CONSOLE_MESSAGES[] = {
 	"Mozart", "Bach", "Rossini"
 };
 
+char const *const CONSOLE325_MESSAGES[] = {
+	NULL, "Select Language", "Database", "Star Chart", "Scan Ops", "Deep Scan",
+	"Short Scan", "Main Menu", "Previous Menu", "Exit Menu", "Interworld", "Hero's Tongue",
+	"Done", " ", " ", "Passive Enabled", "Active Enabled", "Technological", "Biological",
+	"Geographical", "Astronomical", "Dipole Anomaly Sweep", "Structural Analysis",
+	"A-G", "N-O", "P-S", "T-Z", "Tchaikovsky", "Mozart", "Bach", "Rossini"
+};
+
 // Scene 825 Autodoc messages
 char const *const MAIN_MENU = "main menu";
 char const *const DIAGNOSIS = "diagnosis";
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index 358ae9f8bb..5b6f4393c4 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -147,7 +147,10 @@ extern char const *const THE_NEXT_DAY;
 namespace Ringworld2 {
 
 // Scene 125 - Console messages
-extern char const *const CONSOLE_MESSAGES[];
+extern char const *const CONSOLE125_MESSAGES[];
+
+// Scene 325 - Console messages
+extern char const *const CONSOLE325_MESSAGES[];
 
 // Scene 825 - Autodoc Messages
 extern char const *const MAIN_MENU;
-- 
cgit v1.2.3


From beb1f5b316b2d00bc02bf9c4f674278dc71aba7a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 7 Jan 2012 18:55:11 +0200
Subject: AGI: Fix bug #3451122 - "AGI-FANMADE: Nick's Quest hangs ScummVM upon
 starting"

---
 engines/agi/checks.cpp | 16 ++++++++++++++++
 engines/agi/picture.h  |  2 ++
 2 files changed, 18 insertions(+)

(limited to 'engines')

diff --git a/engines/agi/checks.cpp b/engines/agi/checks.cpp
index c3b31f6ba9..624476509e 100644
--- a/engines/agi/checks.cpp
+++ b/engines/agi/checks.cpp
@@ -113,6 +113,22 @@ int AgiEngine::checkPriority(VtEntry *v) {
 
 	water = 1;
 
+	// Check if any picture is loaded before checking for priority below.
+	// If no picture has been loaded, the priority buffer won't be initialized,
+	// thus the check below will always fail. This case causes an infinite loop
+	// in the fanmade game Nick's Quest (bug #3451122), as the game attempts to
+	// draw a sprite (view 4, floating Nick) before it loads any picture. This
+	// causes the checks below to always fail, and the engine keeps readjusting
+	// the sprite's position in fixPosition() forever, as there is no valid
+	// position to place it (the default visual and priority screen is set to
+	// zero, i.e. unconditional black). To remedy this situation, we always
+	// return true here if no picture has been loaded and no priority screen
+	// has been set up.
+	if (!_game._vm->_picture->isPictureLoaded()) {
+		warning("checkPriority: no picture loaded");
+		return pass;
+	}
+
 	p0 = &_game.sbuf16c[v->xPos + v->yPos * _WIDTH];
 
 	for (i = 0; i < v->xSize; i++, p0++) {
diff --git a/engines/agi/picture.h b/engines/agi/picture.h
index f2a6586b93..45a95202e5 100644
--- a/engines/agi/picture.h
+++ b/engines/agi/picture.h
@@ -115,6 +115,8 @@ public:
 		putVirtPixel(x, y);
 	}
 
+	bool isPictureLoaded() { return _data != NULL; }
+
 private:
 	uint8 *_data;
 	uint32 _flen;
-- 
cgit v1.2.3


From 8327189f8c24d47ca4e746ea0f6b230028b3ed4c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 7 Jan 2012 20:33:00 +0100
Subject: TSAGE: R2R - Implement scene 1100

---
 engines/tsage/core.cpp                           |  14 +
 engines/tsage/core.h                             |   2 +
 engines/tsage/globals.cpp                        |   2 +
 engines/tsage/globals.h                          |   1 +
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   1 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp  | 644 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h    |  61 +++
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 166 ++++++
 engines/tsage/ringworld2/ringworld2_speakers.h   |  22 +
 9 files changed, 913 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index fdd9feac03..3e49b6b204 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2702,6 +2702,20 @@ void BackgroundSceneObject::draw() {
 	g_globals->_sceneManager._scene->_backSurface.copyFrom(frame, destRect, priorityRegion);
 }
 
+void BackgroundSceneObject::setup2(int visage, int stripFrameNum, int frameNum, int posX, int posY, int priority, int32 arg10) {
+	warning("TODO: Implement properly BackgroundSceneObject::setup2()");
+	postInit();
+	setVisage(visage);
+	setStrip(stripFrameNum);
+	setFrame(frameNum);
+	setPosition(Common::Point(posX, posY), 0);
+	fixPriority(priority);
+}
+
+void BackgroundSceneObject::proc27() {
+	warning("STUB: BackgroundSceneObject::proc27()");
+}
+
 /*--------------------------------------------------------------------------*/
 
 void SceneObjectList::draw() {
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 846dd3532c..542e1d9744 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -608,6 +608,8 @@ public:
 	virtual Common::String getClassName() { return "BackgroundSceneObject"; }
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void draw();
+	void setup2(int visage, int stripFrameNum, int frameNum, int posX, int posY, int priority, int32 arg10);
+	void proc27();
 };
 
 class SceneText : public SceneObject {
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index bae933a2c5..ad7d0d1e0c 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -375,6 +375,7 @@ void Ringworld2Globals::reset() {
 	T2_GLOBALS._uiElements._active = false;
 
 	// Reset fields
+	_v5589E.set(0, 0, 0, 0);
 	_v558B6.set(0, 0, 0, 0);
 	_v558C2 = 0;
 	_v5657C = 0;
@@ -424,6 +425,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	TsAGE2Globals::synchronize(s);
 	int i;
 
+	_v5589E.synchronize(s);
 	_v558B6.synchronize(s);
 
 	s.syncAsSint16LE(_v558C2);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 23bb79b50f..227058f1d6 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -248,6 +248,7 @@ public:
 	PlayStream _playStream;
 	StripProxy _stripProxy;
 	int _insetUp;
+	Rect _v5589E;
 	Rect _v558B6;
 	int _v558C2;
 	int _v565F5;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 157f222012..260eb701f2 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -100,6 +100,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1020:
 		return new Scene1020();
 	case 1100:
+		return new Scene1100();
 	case 1200:
 	case 1330:
 	case 1500:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 1949d19d80..5a6a70015c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -212,5 +212,649 @@ void Scene1020::dispatch() {
 
 	Scene::dispatch();
 }
+
+/*--------------------------------------------------------------------------
+ * Scene 1100 -
+ *
+ *--------------------------------------------------------------------------*/
+Scene1100::Scene1100() {
+	_field412 = 0;
+	_field414 = 0;
+}
+
+void Scene1100::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_field414);
+}
+
+bool Scene1100::Actor16::startAction(CursorType action, Event &event) {
+	Scene1100 *scene = (Scene1100 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_TALK)
+		return SceneActor::startAction(action, event);
+
+	if (R2_GLOBALS.getFlag(52)) {
+		R2_GLOBALS._player.disableControl();
+		if (R2_GLOBALS._player._characterIndex == 1)
+			scene->_field412 = 327;
+		else
+			scene->_field412 = 328;
+		scene->_sceneMode = 53;
+		scene->setAction(&scene->_sequenceManager1, scene, 1122, &R2_GLOBALS._player, NULL);
+	} else {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 55;
+		if (R2_GLOBALS._v565AE >= 3) {
+			if (R2_GLOBALS._player._characterIndex == 1)
+				scene->_stripManager.start3(329, scene, R2_GLOBALS._stripManager_lookupList);
+			else
+				scene->_stripManager.start3(330, scene, R2_GLOBALS._stripManager_lookupList);
+		} else {
+			++R2_GLOBALS._v565AE;
+			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+			if (R2_GLOBALS._player._characterIndex == 1)
+				scene->_stripManager.start3(304, scene, R2_GLOBALS._stripManager_lookupList);
+			else
+				scene->_stripManager.start3(308, scene, R2_GLOBALS._stripManager_lookupList);
+		}
+	}
+	return true;
+}
+
+bool Scene1100::Actor17::startAction(CursorType action, Event &event) {
+	Scene1100 *scene = (Scene1100 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case R2_NEGATOR_GUN:
+		if (_visage == 1105) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 1114;
+			scene->setAction(&scene->_sequenceManager1, scene, 1114, &R2_GLOBALS._player, &scene->_actor17, NULL);
+			return true;
+		} else {
+			return SceneActor::startAction(action, event);
+		}
+		break;
+	case R2_7:
+	// No break on purpose
+	case R2_44:
+		if (_visage == 1105) {
+			R2_GLOBALS._player.disableControl();
+			if (R2_GLOBALS._player._characterIndex == 1) {
+				scene->_sceneMode = 1112;
+				scene->setAction(&scene->_sequenceManager1, scene, 1112, &R2_GLOBALS._player, &scene->_actor17, NULL);
+			} else {
+				scene->_sceneMode = 1115;
+				scene->setAction(&scene->_sequenceManager1, scene, 1115, &R2_GLOBALS._player, &scene->_actor17, NULL);
+			}
+			return true;
+		} else if (_strip == 2) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 1113;
+			if (R2_GLOBALS._player._characterIndex == 1) {
+				scene->setAction(&scene->_sequenceManager1, scene, 1113, &R2_GLOBALS._player, &scene->_actor17, NULL);
+			} else {
+				scene->setAction(&scene->_sequenceManager1, scene, 1118, &R2_GLOBALS._player, &scene->_actor17, NULL);
+			}
+			return true;
+		} else {
+			return SceneActor::startAction(action, event);
+		}
+		break;
+	default:
+		return SceneActor::startAction(action, event);
+		break;
+	}
+}
+
+bool Scene1100::Actor18::startAction(CursorType action, Event &event) {
+	Scene1100 *scene = (Scene1100 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action == CURSOR_TALK) && (!R2_GLOBALS.getFlag(54)) && (R2_GLOBALS.getFlag(52))) {
+		scene->_field412 = 0;
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 53;
+		scene->setAction(&scene->_sequenceManager1, scene, 1122, &R2_GLOBALS._player, NULL);
+		return true;
+	}
+
+	return SceneActor::startAction(action, event);
+}
+
+void Scene1100::postInit(SceneObjectList *OwnerList) {
+	if ((R2_GLOBALS._sceneManager._previousScene == 300) || (R2_GLOBALS._sceneManager._previousScene == 1100))
+		loadScene(1150);
+	else
+		loadScene(1100);
+
+	if ((R2_GLOBALS._sceneManager._previousScene == 1000) && (!R2_GLOBALS.getFlag(44))) {
+		R2_GLOBALS._v58CE2 = 0;
+		R2_GLOBALS._v5589E.left = 0;
+		R2_GLOBALS._v5589E.right = 200;
+	}
+
+	if (R2_GLOBALS._player._characterScene[1] == 1100)
+		R2_GLOBALS._sceneManager._previousScene = 1100;
+
+	if (R2_GLOBALS._sceneManager._previousScene == -1) {
+		R2_GLOBALS._v58CE2 = 0;
+		R2_GLOBALS._v5589E.left = 0;
+		R2_GLOBALS._v5589E.right = 200;
+	}
+
+	SceneExt::postInit();
+		
+	if (R2_GLOBALS._sceneManager._previousScene == -1)
+		R2_GLOBALS._sceneManager._previousScene = 1000;
+
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_chiefSpeaker);
+
+	warning("sub1B007(65, 65, 65);");
+
+	_actor2.postInit();
+	_actor2.setup(1100, 1, 1);
+	_actor2.fixPriority(10);
+
+	R2_GLOBALS._scrollFollower = NULL;
+
+	_item3.setDetails(Rect(56, 47, 68, 83), 1100, 7, -1, -1, 1, NULL);
+	_item4.setDetails(Rect(167, 132, 183, 167), 1100, 7, -1, -1, 1, NULL);
+	_item5.setDetails(Rect(26, 112, 87, 145), 1100, 13, -1, -1, 1, NULL);
+	_item7.setDetails(Rect(4, 70, 79, 167), 1100, 16, -1, -1, 1, NULL);
+
+	R2_GLOBALS._sound1.stop();
+
+	if (R2_GLOBALS._sceneManager._previousScene == 300) {
+		if (R2_GLOBALS._player._characterIndex == 3)
+			R2_GLOBALS._player._characterIndex = R2_QUINN;
+		R2_GLOBALS._player._characterScene[1] = 1100;
+		R2_GLOBALS._player._characterScene[2] = 1100;
+		_actor2.setPosition(Common::Point(150, 30));
+		R2_GLOBALS._sound1.play(93);
+		R2_GLOBALS._player.postInit();
+		R2_GLOBALS._player.hide();
+		R2_GLOBALS._player.disableControl();
+
+		_actor16.postInit();
+		_actor16.hide();
+		if (R2_GLOBALS._player._characterIndex == 1)
+			_actor16.setDetails(9002, 0, 4, 3, 1, (SceneItem *) NULL);
+		else
+			_actor16.setDetails(9001, 0, 5, 3, 1, (SceneItem *) NULL);
+
+		_actor18.postInit();
+		_actor18.setup(1113, 3, 1);
+		_actor18.setPosition(Common::Point(181, 125));
+		_actor18.fixPriority(110);
+
+		if (R2_GLOBALS.getFlag(54))
+			_actor18.setDetails(1100, 4, -1, -1, 1, (SceneItem *) NULL);
+		else
+			_actor18.setDetails(1100, 3, -1, -1, 1, (SceneItem *) NULL);
+		
+		_actor17.postInit();
+		_actor17.setup(1105, 3, 1);
+		_actor17.setPosition(Common::Point(312, 165));
+		_actor17._numFrames = 5;
+		_actor17.setDetails(1100, 22, 23, 24, 1, (SceneItem *) NULL);
+
+		_actor1.postInit();
+		_actor1.setup(1512, 1, 1);
+		_actor1.setPosition(Common::Point(187, -25));
+		_actor1.fixPriority(48);
+		_actor1._moveDiff.y = 1;
+		_actor1.setDetails(1100, 37, -1, -1, 1, (SceneItem *) NULL);
+
+		_sceneMode = 20;
+
+		setAction(&_sequenceManager1, this, 1, &R2_GLOBALS._player, NULL);
+	} else if (R2_GLOBALS._sceneManager._previousScene == 1000) {
+		_actor2.setPosition(Common::Point(50, 30));
+		_field414 = 0;
+		_palette1.loadPalette(1101);
+		R2_GLOBALS._player.postInit();
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._player._effect = 5;
+		R2_GLOBALS._player._field9C = _field312;
+		R2_GLOBALS._player.setup(1102, 3, 2);
+		R2_GLOBALS._player.setObjectWrapper(NULL);
+		R2_GLOBALS._player.setPosition(Common::Point(111,-20));
+		R2_GLOBALS._player.fixPriority(150);
+		R2_GLOBALS._player._moveRate = 30;
+		R2_GLOBALS._player._moveDiff = Common::Point(16, 2);
+
+		_object1.setup2(1104, 2, 1, 175, 125, 102, 1);
+		_object2.setup2(1102, 5, 1, 216, 167, 1, 0);
+
+		_actor12.postInit();
+		_actor12.setup(1113, 2, 1);
+		_actor12.setPosition(Common::Point(67, 151));
+		_actor12.fixPriority(255);
+
+		_actor3.postInit();
+		_actor3.setup(1102, 6, 1);
+		_actor3._moveRate = 30;
+		_actor3._moveDiff.x = 2;
+
+		_actor4.postInit();
+		_actor4.setup(1102, 6, 2);
+		_actor4._moveRate = 30;
+		_actor4._moveDiff.x = 2;
+		_actor4._effect = 5;
+		_actor4._field9C = _field312;
+
+		R2_GLOBALS._sound1.play(86);
+		
+		_sceneMode = 0;
+
+		setAction(&_sequenceManager1, this, 1, &R2_GLOBALS._player, NULL);
+	} else {
+		_actor2.setPosition(Common::Point(180, 30));
+		if (R2_GLOBALS.getFlag(52))
+			R2_GLOBALS._sound1.play(98);
+		else
+			R2_GLOBALS._sound1.play(95);
+
+		R2_GLOBALS._player.postInit();
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		
+		_actor16.postInit();
+
+		if (R2_GLOBALS.getFlag(52)) {
+			if (R2_GLOBALS._player._characterIndex == 1) {
+				R2_GLOBALS._player.setup(19, 7, 1);
+				_actor16.setup(29, 6, 1);
+			} else {
+				R2_GLOBALS._player.setup(29, 7, 1);
+				_actor16.setup(19, 6, 1);
+			}
+			R2_GLOBALS._player.setPosition(Common::Point(140, 124));
+			_actor16.setPosition(Common::Point(237, 134));
+			R2_GLOBALS._player.enableControl();
+		} else {
+			if (R2_GLOBALS._player._characterIndex == 1) {
+				R2_GLOBALS._player.setup(1107, 2, 1);
+				_actor16.setup(1107, 4, 1);
+				R2_GLOBALS._player.setPosition(Common::Point(247, 169));
+				_actor16.setPosition(Common::Point(213, 169));
+			} else {
+				R2_GLOBALS._player.setup(1107, 4, 1);
+				_actor16.setup(1107, 2, 1);
+				R2_GLOBALS._player.setPosition(Common::Point(213, 169));
+				_actor16.setPosition(Common::Point(247, 169));
+			}
+			R2_GLOBALS._player.enableControl();
+			R2_GLOBALS._player._canWalk = false;
+		}
+		
+		if (R2_GLOBALS._player._characterIndex == 1)
+			_actor16.setDetails(9002, 0, 4, 3, 1, (SceneItem *) NULL);
+		else
+			_actor16.setDetails(9001, 0, 5, 3, 1, (SceneItem *) NULL);
+
+		_actor18.postInit();
+		_actor18.setup(1113, 3, 1);
+		_actor18.setPosition(Common::Point(181, 125));
+		_actor18.fixPriority(110);
+
+		if (R2_GLOBALS.getFlag(54))
+			_actor18.setDetails(1100, 4, -1, -1, 1, (SceneItem *) NULL);
+		else
+			_actor18.setDetails(1100, 3, -1, -1, 1, (SceneItem *) NULL);
+
+		if (!R2_GLOBALS.getFlag(52)) {
+			_actor17.postInit();
+			if (R2_GLOBALS.getFlag(53))
+				_actor17.setup(1106, 2, 4);
+			else
+				_actor17.setup(1105, 4, 4);
+
+			_actor17.setPosition(Common::Point(17, 54));
+			_actor17._numFrames = 5;
+
+			if (R2_GLOBALS.getFlag(53))
+				_actor17.setDetails(1100, 28, -1, -1, 1, (SceneItem *) NULL);
+			else
+				_actor17.setDetails(1100, 22, 23, 24, 1, (SceneItem *) NULL);
+
+			_actor17.fixPriority(200);
+		}
+		_actor1.postInit();
+		_actor1.setup(1512, 1, 1);
+		_actor1.setPosition(Common::Point(187, 45));
+		_actor1.fixPriority(48);
+		_actor1._moveDiff.y = 1;
+		_actor1.setDetails(1100, 37, -1, -1, 1, (SceneItem *) NULL);
+	}
+	_item6.setDetails(Rect(123, 69, 222, 105), 1100, 13, -1, -1, 1, NULL);
+	_item2.setDetails(Rect(0, 0, 480, 46), 1100, 0, -1, -1, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 480, 200), 1100, 40, 41, 42, 1, NULL);
+}	
+
+void Scene1100::remove() {
+	R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
+	if (_sceneMode > 20)
+		R2_GLOBALS._sound1.fadeOut2(NULL);
+	g_globals->gfxManager()._bounds.moveTo(Common::Point(0, 0));
+	R2_GLOBALS._v58CE2 = 1;
+	SceneExt::remove();
+}
+
+void Scene1100::signal() {
+	switch (_sceneMode++) {
+	case 0:
+		_actor3.setPosition(Common::Point(350, 20));
+		setAction(&_sequenceManager1, this, 1, &R2_GLOBALS._player, NULL);
+		break;
+	case 1:{
+		Common::Point pt(-150, 20);
+		NpcMover *mover = new NpcMover();
+		_actor3.addMover(mover, &pt, this);
+		_actor4.setPosition(Common::Point(350, 55));
+
+		Common::Point pt2(-150, 55);
+		NpcMover *mover2 = new NpcMover();
+		_actor4.addMover(mover2, &pt2, NULL);
+		}
+		break;
+	case 2:
+		_actor3.remove();
+		_actor4.remove();
+		_actor5.postInit();
+		_actor6.postInit();
+		_actor7.postInit();
+		_actor8.postInit();
+		_actor9.postInit();
+		_actor10.postInit();
+		setAction(&_sequenceManager1, this, 1102, &_actor5, &_actor6, &_actor7, &_actor8, &_actor9, &_actor10, NULL);
+		break;
+	case 3: {
+		R2_GLOBALS._sound2.play(84);
+		R2_GLOBALS._player.setPosition(Common::Point(-50, 126));
+		Common::Point pt(350, 226);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 4:
+		_actor18.postInit();
+		_actor18.show();
+		setAction(&_sequenceManager1, this, 1101, &_actor18, &_actor10, NULL);
+		break;
+	case 5:
+		_actor13.postInit();
+		_actor13._effect = 6;
+		_actor13.setup(1103, 3, 1);
+		_actor13._moveRate = 30;
+
+		_actor14.postInit();
+		_actor14._effect = 6;
+		_actor14.setup(1103, 4, 1);
+		_actor4._moveRate = 25;
+
+		_actor13.setAction(&_sequenceManager2, this, 1109, &_actor13, &_actor14, NULL);
+		break;
+	case 6: {
+		_actor13.remove();
+		_actor14.remove();
+		R2_GLOBALS._player.setPosition(Common::Point(-50, 136));
+		R2_GLOBALS._sound2.play(84);
+		Common::Point pt(350, 236);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 7:
+		setAction(&_sequenceManager1, this, 1103, &_actor18, &_actor10);
+		break;
+	case 8:
+		R2_GLOBALS._player._effect = 0;
+		_actor11.postInit();
+		setAction(&_sequenceManager1, this, 1105, &R2_GLOBALS._player, &_actor10, &_actor11, &_actor18, NULL);
+		break;
+	case 9:
+		_object1.proc27();
+
+		_actor15.postInit();
+		_actor15.setup(1103, 2, 1);
+		_actor15._moveRate = 30;
+		_actor15.setAction(&_sequenceManager3, this, 1107, &_actor15, NULL);
+		break;
+	case 10:
+		_actor13.postInit();
+		_actor13.setup(1103, 1, 1);
+		_actor13._moveRate = 15;
+		_actor13.setAction(&_sequenceManager2, this, 1108, &_actor13, NULL);
+		break;
+	case 11: {
+		setAction(&_sequenceManager1, this, 1116, &_actor11, &_actor10, &_actor12, NULL);
+		R2_GLOBALS._player._effect = 5;
+		R2_GLOBALS._player.setup(1102, 3, 2);
+		R2_GLOBALS._player.setPosition(Common::Point(-50, 131));
+		R2_GLOBALS._sound2.play(84);
+		Common::Point pt(350, 231);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 12:
+	// Really nothing
+		break;
+	case 13:
+		_actor17.postInit();
+		R2_GLOBALS._scrollFollower = &_actor17;
+
+		_actor11.setup(1100, 2, 1);
+		_actor11.setPosition(Common::Point(408, 121));
+
+		_actor10.setup(1100, 3, 5);
+		_actor10.setPosition(Common::Point(409, 121));
+
+		setAction(&_sequenceManager1, this, 1104, &_actor17, NULL);
+		break;
+	case 14:
+		setAction(&_sequenceManager1, this, 1100, &_actor11, &_actor10, NULL);
+		break;
+	case 15:
+		R2_GLOBALS._sceneManager.changeScene(1000);
+		break;
+	case 20: {
+		Common::Point pt(187, -13);
+		NpcMover *mover = new NpcMover();
+		_actor1.addMover(mover, &pt, this);
+		}
+		break;
+	case 21: {
+		R2_GLOBALS._sound2.play(92);
+		_actor17.animate(ANIM_MODE_5, NULL);
+		Common::Point pt(187, 45);
+		NpcMover *mover = new NpcMover();
+		_actor1.addMover(mover, &pt, this);
+		}
+		break;
+	case 22:
+		setAction(&_sequenceManager1, this, 1110, &_actor16, &R2_GLOBALS._player, NULL);
+		break;
+	case 23:
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(312, this);
+		R2_GLOBALS._player.setAction(&_sequenceManager1, this, 1119, &R2_GLOBALS._player, NULL);
+		break;
+	case 24:
+		if (!_stripManager._endHandler)
+			R2_GLOBALS._player.disableControl();
+		break;
+	case 25:
+		R2_GLOBALS._player.disableControl();
+		_stripManager._lookupList[9] = 1;
+		_stripManager._lookupList[10] = 1;
+		_stripManager._lookupList[11] = 1;
+		R2_GLOBALS._sound1.play(95);
+		setAction(&_sequenceManager1, this, 1111, &_actor17, &R2_GLOBALS._player, &_actor16, NULL);
+		break;
+	case 26:
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(302, this);
+		break;		
+	case 27:
+		R2_GLOBALS._player.disableControl();
+		setAction(&_sequenceManager1, this, 1120, &_actor16, &R2_GLOBALS._player, NULL);
+		break;
+	case 28:
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(303, this);
+		break;
+	case 51:
+		R2_GLOBALS.setFlag(53);
+		_actor17.setDetails(1100, 28, -1, -1, 3, (SceneItem *) NULL);
+	// No break on purpose
+	case 50:
+	// No break on purpose
+	case 29:
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		break;
+	case 52:
+		R2_GLOBALS._sound1.play(98);
+		R2_GLOBALS.setFlag(52);
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1116;
+		if (R2_GLOBALS._player._characterIndex == 1) {
+			setAction(&_sequenceManager1, this, 1116, &R2_GLOBALS._player, NULL);
+			_actor16.setAction(&_sequenceManager2, NULL, 1123, &_actor16, NULL);
+		} else {
+			setAction(&_sequenceManager1, this, 1124, &R2_GLOBALS._player, NULL);
+			_actor16.setAction(&_sequenceManager2, NULL, 1117, &_actor16, NULL);
+		}
+		break;
+	case 53:
+		_sceneMode = 54;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		if (_field412 == 0) {
+			R2_GLOBALS.setFlag(55);
+			if (R2_GLOBALS.getFlag(55)) {
+				if (R2_GLOBALS._player._characterIndex == 1)
+					_stripManager.start(318, this);
+				else
+					_stripManager.start(323, this);
+			} else {
+				// This part is totally useless as flag 55 has been set right before the check
+				if (R2_GLOBALS._player._characterIndex == 1)
+					_stripManager.start(317, this);
+				else
+					_stripManager.start(322, this);
+			}
+		} else {
+			_stripManager.start3(_field412, this, _stripManager._lookupList);
+		}
+		break;
+	case 54:
+		if (_stripManager._field2E8 == 1) {
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 1125;
+			setAction(&_sequenceManager1, this, 1125, &R2_GLOBALS._player, &_actor16, NULL);
+		} else 
+			R2_GLOBALS._player.enableControl(CURSOR_TALK);
+		break;
+	case 55:
+		R2_GLOBALS._player.enableControl(CURSOR_TALK);
+		R2_GLOBALS._player._canWalk = false;
+		break;
+	case 99:
+		R2_GLOBALS._player._characterScene[1] = 300;
+		R2_GLOBALS._player._characterScene[2] = 300;
+		R2_GLOBALS._player._characterIndex = R2_QUINN;
+		R2_GLOBALS._sceneManager.changeScene(300);
+		break;
+	case 1112:
+		_sceneMode = 50;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start3(313, this, _stripManager._lookupList);
+		break;
+	case 1113:
+		_sceneMode = 52;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		R2_GLOBALS._sound1.play(96);
+		_stripManager.start3(316, this, _stripManager._lookupList);
+		break;
+	case 1114:
+		_sceneMode = 51;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start3(315, this, _stripManager._lookupList);
+		break;
+	case 1115:
+		_sceneMode = 50;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start3(314, this, _stripManager._lookupList);
+		break;
+	case 1116:
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		_stripManager._lookupList[9] = 1;
+		_stripManager._lookupList[10] = 1;
+		_stripManager._lookupList[11] = 1;
+		break;
+	case 1125: {
+		_sceneMode = 99;
+		R2_GLOBALS._sound2.play(100);
+		R2_GLOBALS._sound1.play(101);
+		Common::Point pt(187, -13);
+		NpcMover *mover = new NpcMover();
+		_actor1.addMover(mover, &pt, this);
+		}
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+		break;
+	}
+}
+
+void Scene1100::dispatch() {
+	if ((g_globals->_sceneObjects->contains(&_actor10)) && (_actor10._visage == 1102) && (_actor10._strip == 4) && (_actor10._frame == 1) && (_actor10._flags & OBJFLAG_HIDING)) {
+		if (_field414 == 1) {
+			_field414 = 2;
+			R2_GLOBALS._scenePalette.refresh();
+		}
+	} else {
+		if (_field414 == 2)
+			R2_GLOBALS._scenePalette.refresh();
+		_field414 = 1;
+	}
+	
+	Scene::dispatch();
+	
+	if (R2_GLOBALS._player._bounds.contains(_actor13._position))
+		_actor13._shade = 3;
+	else 
+		_actor13._shade = 0;
+
+	if (R2_GLOBALS._player._bounds.contains(_actor14._position))
+		_actor14._shade = 3;
+	else 
+		_actor14._shade = 0;
+
+	if (R2_GLOBALS._player._bounds.contains(_actor15._position))
+		_actor15._shade = 3;
+	else 
+		_actor15._shade = 0;
+}
+
+void Scene1100::saveCharacter(int characterIndex) {
+	if (R2_GLOBALS._player._characterIndex == 3)
+		R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::saveCharacter(characterIndex);
+}
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index f0444de70d..a21869b6ad 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -56,6 +56,67 @@ public:
 	virtual void dispatch();
 };
 
+class Scene1100 : public SceneExt {
+	class Actor16 : public SceneActor {
+	public:
+		bool startAction(CursorType action, Event &event);
+	};
+	class Actor17 : public SceneActor {
+	public:
+		bool startAction(CursorType action, Event &event);
+	};
+	class Actor18 : public SceneActor {
+	public:
+		bool startAction(CursorType action, Event &event);
+	};
+
+public:
+	int _field412, _field414;
+	SpeakerSeeker1100 _seekerSpeaker;
+	SpeakerQuinn1100 _quinnSpeaker;
+	SpeakerChief1100 _chiefSpeaker;
+	ScenePalette _palette1;
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	NamedHotspot _item3;
+	NamedHotspot _item4;
+	NamedHotspot _item5;
+	NamedHotspot _item6;
+	NamedHotspot _item7;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	SceneActor _actor6;
+	SceneActor _actor7;
+	SceneActor _actor8;
+	SceneActor _actor9;
+	SceneActor _actor10;
+	SceneActor _actor11;
+	SceneActor _actor12;
+	SceneActor _actor13;
+	SceneActor _actor14;
+	SceneActor _actor15;
+	BackgroundSceneObject _object1;
+	BackgroundSceneObject _object2;
+	Actor16 _actor16;
+	Actor17 _actor17;
+	Actor18 _actor18;
+	SequenceManager _sequenceManager1;
+	SequenceManager _sequenceManager2;
+	SequenceManager _sequenceManager3;
+
+	Scene1100();
+	void synchronize(Serializer &s);
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void dispatch();
+	virtual void saveCharacter(int characterIndex);
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 26ed818819..b5fd99b0b4 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -26,6 +26,7 @@
 #include "tsage/graphics.h"
 #include "tsage/staticres.h"
 #include "tsage/ringworld2/ringworld2_scenes0.h"
+#include "tsage/ringworld2/ringworld2_scenes1.h"
 #include "tsage/ringworld2/ringworld2_scenes2.h"
 #include "tsage/ringworld2/ringworld2_scenes3.h"
 
@@ -246,6 +247,64 @@ SpeakerCaretaker2450::SpeakerCaretaker2450() {
 	_numFrames = 0;
 }
 
+//----------------------------------------------------------------------------
+// Classes related to CHIEF
+//----------------------------------------------------------------------------
+
+SpeakerChief1100::SpeakerChief1100() {
+	_speakerName = "CHIEF";
+	_color1 = 8;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerChief1100::proc15() {
+	int v = _fieldF6;
+	Scene1100 *scene = (Scene1100 *)R2_GLOBALS._sceneManager._scene;
+
+	if (!_object2) {
+		_object2 = &scene->_actor18;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4080, 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(4080, 3, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 100:
+		_numFrames = 0;
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setStrip(_object1._strip - 1);
+		_object1.setFrame(_object1.getFrameCount());
+		_object1.animate(ANIM_MODE_6, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 //----------------------------------------------------------------------------
 // Classes related to GUARD
 //----------------------------------------------------------------------------
@@ -1046,6 +1105,54 @@ void SpeakerQuinn300::proc15() {
 	}
 }
 
+void SpeakerQuinn1100::proc15() {
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (v == 0)
+			return;
+
+		if (R2_GLOBALS._player._characterIndex == 1) {
+			_object2 = &R2_GLOBALS._player;
+		} else {
+			Scene1100 *scene = (Scene1100 *)R2_GLOBALS._sceneManager._scene;
+			_object2 = &scene->_actor16;
+		}
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(1108, 7, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(1109, 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 3:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(1109, 5, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 void SpeakerQuinn2435::proc15() {
 	int v = _fieldF6;
 
@@ -1758,6 +1865,65 @@ void SpeakerSeeker300::proc15() {
 	}
 }
 
+void SpeakerSeeker1100::proc15() {
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (v == 0)
+			return;
+
+		if (R2_GLOBALS._player._characterIndex == 2) {
+			_object2 = &R2_GLOBALS._player;
+		} else {
+			Scene1100 *scene = (Scene1100 *)R2_GLOBALS._sceneManager._scene;
+			_object2 = &scene->_actor16;
+		}
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(1108, 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 2:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(1108, 3, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 3:
+		_object1.setPosition(Common::Point(197, 134));
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(1108, 5, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 4:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(1109, 7, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	case 5:
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(1109, 3, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
 void SpeakerSeeker2435::proc15() {
 	int v = _fieldF6;
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index cbd440e1a9..13c770a4a3 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -82,6 +82,16 @@ public:
 	virtual Common::String getClassName() { return "SpeakerCaretaker2450"; }
 };
 
+// Classes related to Chief
+
+class SpeakerChief1100 : public VisualSpeaker {
+public:
+	SpeakerChief1100();
+
+	virtual Common::String getClassName() { return "SpeakerChief1100"; }
+	virtual void proc15();
+};
+
 // Classes related to Guard
 
 class SpeakerGuard : public VisualSpeaker {
@@ -253,6 +263,12 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerQuinn1100 : public SpeakerQuinn {
+public:
+	virtual Common::String getClassName() { return "SpeakerQuinn1100"; }
+	virtual void proc15();
+};
+
 class SpeakerQuinn2435 : public SpeakerQuinn {
 public:
 	virtual Common::String getClassName() { return "SpeakerQuinn2435"; }
@@ -385,6 +401,12 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerSeeker1100 : public SpeakerSeeker {
+public:
+	virtual Common::String getClassName() { return "SpeakerSeeker1100"; }
+	virtual void proc15();
+};
+
 class SpeakerSeeker2435 : public SpeakerSeeker {
 public:
 	virtual Common::String getClassName() { return "SpeakerSeeker2435"; }
-- 
cgit v1.2.3


From 655d719bde2d9c9c5eb89ac443284278116a7198 Mon Sep 17 00:00:00 2001
From: Matan Bareket
Date: Sat, 7 Jan 2012 14:55:34 -0500
Subject: SCUMM: Add three Hebrew HE games

Freddi Fish 3: The Case of the Stolen Conch Shell,
Putt-Putt Joins the Circus,
Pajama Sam 2: Thunder and Lightning Aren't so Frightening
---
 engines/scumm/scumm-md5.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 06e779c164..bc081b67bc 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 Jan  1 20:12:16 2012
+  This file was generated by the md5table tool on Sat Jan 07 18:43:38 2012
   DO NOT EDIT MANUALLY!
  */
 
@@ -50,6 +50,7 @@ static const MD5Table md5table[] = {
 	{ "0c45eb4baff0c12c3d9dfa889c8070ab", "pajama3", "", "Demo", 13884, Common::DE_DEU, Common::kPlatformUnknown },
 	{ "0cccfa5223099a60e76cfcca57a1a141", "freddi3", "", "", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "0d1b69471605201ef2fa9cec1f5f02d2", "maniac", "V2", "V2", -1, Common::ES_ESP, Common::kPlatformPC },
+	{ "0ddf1174d0d097956ba10dd452ea65e6", "freddi3", "HE 99", "", -1, Common::HE_ISR, Common::kPlatformWindows },
 	{ "0e4c5d54a0ad4b26132e78b5ea76642a", "samnmax", "Floppy", "Demo", 6485, Common::EN_ANY, Common::kPlatformPC },
 	{ "0e96ab45a4eb72acc1b46813976589fd", "activity", "", "", -1, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "0e9b01430e31d9fcd94071d433bbc6bf", "loom", "No AdLib", "EGA", -1, Common::FR_FRA, Common::kPlatformAtariST },
@@ -89,6 +90,7 @@ static const MD5Table md5table[] = {
 	{ "19263586f749a560c1adf8b3393a9593", "socks", "HE 85", "", -1, Common::RU_RUS, Common::kPlatformWindows },
 	{ "19bf6938a94698296bcb0c99c31c91a7", "spyfox2", "", "Demo", -1, Common::EN_GRB, Common::kPlatformWindows },
 	{ "1a6e5ae2777a6a33f06ffc0226210934", "atlantis", "", "CD", -1, Common::EN_ANY, Common::kPlatformMacintosh },
+	{ "1af4eb581a33d808707d66d50e084dca", "pajama2", "HE 99", "", -1, Common::HE_ISR, Common::kPlatformWindows },
 	{ "1c792d28376d45e145cb916bca0400a2", "spyfox2", "", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "1c7e7db2cfab1ad62746ab680a634204", "maniac", "NES", "", -1, Common::FR_FRA, Common::kPlatformNES },
 	{ "1ca86e2cf9aaa2068738a1e5ba477e60", "zak", "FM-TOWNS", "", -1, Common::JA_JPN, Common::kPlatformFMTowns },
@@ -505,6 +507,7 @@ static const MD5Table md5table[] = {
 	{ "c7890e038806df2bb5c0c8c6f1986ea2", "monkey", "VGA", "VGA", -1, Common::EN_ANY, Common::kPlatformPC },
 	{ "c7be10f775404fd9785a8b92a06d240c", "atlantis", "FM-TOWNS", "", 12030, Common::EN_ANY, Common::kPlatformFMTowns },
 	{ "c7c492a107ec520d7a7943037d0ca54a", "freddi", "HE 71", "Demo", -1, Common::NL_NLD, Common::kPlatformWindows },
+	{ "c8253da0f4626d2236b5291b99e33408", "puttcircus", "HE 99", "", -1, Common::HE_ISR, Common::kPlatformWindows },
 	{ "c83079157ec765a28de445aec9768d60", "tentacle", "", "Demo", 7477, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "c8575e0b973ff1723aba6cd92c642db2", "puttrace", "HE 99", "Demo", -1, Common::FR_FRA, Common::kPlatformWindows },
 	{ "c8aac5e3e701874e2fa4117896f9e1b1", "freddi", "HE 73", "Demo", -1, Common::EN_ANY, Common::kPlatformMacintosh },
-- 
cgit v1.2.3


From 9ddabeca32c453d77d9407e8134ab499550d19d1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 7 Jan 2012 21:47:11 +0100
Subject: TSAGE: R2R - Fix sub1B00, rename it to scalePalette

Thanks wjp for the namings
---
 engines/tsage/ringworld2/ringworld2_logic.cpp   | 33 ++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_logic.h     |  3 ++-
 engines/tsage/ringworld2/ringworld2_scenes1.cpp |  2 +-
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 36 +++----------------------
 engines/tsage/ringworld2/ringworld2_scenes3.h   |  1 -
 5 files changed, 38 insertions(+), 37 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 260eb701f2..1a9a03b37c 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -270,7 +270,7 @@ SceneExt::SceneExt(): Scene() {
 	_stripManager._onBegin = SceneExt::startStrip;
 	_stripManager._onEnd = SceneExt::endStrip;
 
-	for (int i = 0; i < 44; i++)
+	for (int i = 0; i < 256; i++)
 		_field312[i] = 0;
 	_field372 = _field37A = 0;
 	_savedPlayerEnabled = false;
@@ -478,6 +478,37 @@ void SceneExt::saveCharacter(int characterIndex) {
 	R2_GLOBALS._player._characterFrame[characterIndex] = R2_GLOBALS._player._frame;
 }
 
+void SceneExt::scalePalette(int RFactor, int GFactor, int BFactor) {
+	byte *tmpPal = R2_GLOBALS._scenePalette._palette;
+	byte newR, newG, newB;
+	int tmp, varC, varD = 0;
+
+	for (int i = 0; i < 256; i++) {
+		newR = (RFactor * tmpPal[(3 * i)]) / 100;
+		newG = (GFactor * tmpPal[(3 * i) + 1]) / 100;
+		newB = (BFactor * tmpPal[(3 * i) + 2]) / 100;
+
+		varC = 769;
+		for (int j = 255; j >= 0; j--) {
+			tmp = abs(tmpPal[(3 * j)] - newR);
+			if (tmp >= varC)
+				continue;
+
+			tmp += abs(tmpPal[(3 * j) + 1] - newG);
+			if (tmp >= varC)
+				continue;
+
+			tmp += abs(tmpPal[(3 * j) + 2] - newB);
+			if (tmp >= varC)
+				continue;
+			
+			varC = tmp;
+			varD = j;
+		}
+		this->_field312[i] = varD;
+	}
+}
+
 /*--------------------------------------------------------------------------*/
 
 void SceneHandlerExt::postInit(SceneObjectList *OwnerList) {
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 4805de48bb..bb6aa25f85 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -79,7 +79,7 @@ private:
 	static void startStrip();
 	static void endStrip();
 public:
-	byte _field312[44];
+	byte _field312[256];
 	int _field372;
 	bool _savedPlayerEnabled;
 	bool _savedUiEnabled;
@@ -106,6 +106,7 @@ public:
 	bool display(CursorType action, Event &event);
 	void fadeOut();
 	void clearScreen();
+	void scalePalette(int RFactor, int GFactor, int BFactor);
 };
 
 class SceneHandlerExt: public SceneHandler {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 5a6a70015c..e773c52805 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -355,7 +355,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
 	_stripManager.addSpeaker(&_quinnSpeaker);
 	_stripManager.addSpeaker(&_chiefSpeaker);
 
-	warning("sub1B007(65, 65, 65);");
+	scalePalette(65, 65, 65);
 
 	_actor2.postInit();
 	_actor2.setup(1100, 1, 1);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 5ae15d9c08..266098a2ca 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -3929,37 +3929,6 @@ void Scene3800::sub110BBD() {
 	}
 }
 
-void Scene3800::sub1B007(int arg1, int arg2, int arg3) {
-	byte *tmpPal = R2_GLOBALS._scenePalette._palette;
-	byte newR, newG, newB;
-	int tmp, varC, varD = 0;
-
-	for (int i = 0; i < 256; i++) {
-		newR = (arg1 * tmpPal[(3 * i)]) / 100;
-		newG = (arg2 * tmpPal[(3 * i) + 1]) / 100;
-		newB = (arg3 * tmpPal[(3 * i) + 2]) / 100;
-
-		varC = 769;
-		for (int j = 255; j >= 0; j--) {
-			tmp = abs(tmpPal[(3 * j)] - newR);
-			if (tmp >= varC)
-				continue;
-
-			tmp += abs(tmpPal[(3 * j) + 1] - newG);
-			if (tmp >= varC)
-				continue;
-
-			tmp += abs(tmpPal[(3 * j) + 2] - newB);
-			if (tmp >= varC)
-				continue;
-			
-			varC = tmp;
-			varD = j;
-		}
-		this->_field312[i] = varD;
-	}
-}
-
 void Scene3800::postInit(SceneObjectList *OwnerList) {
 	_field412 = 0;
 
@@ -3968,7 +3937,7 @@ void Scene3800::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 	R2_GLOBALS._sound1.play(231);
 
-	warning("sub1B007(65, 65, 65)");
+	scalePalette(65, 65, 65);
 
 	setZoomPercents(87, 40, 144, 100);
 
@@ -4218,7 +4187,8 @@ void Scene3900::postInit(SceneObjectList *OwnerList) {
 	_exit5._insideArea = false;
 	_exit5._moving = false;
 
-	warning("sub1B007(65, 65, 65)");
+	scalePalette(65, 65, 65);
+
 	_exit1.setDest(Common::Point(160, 126));
 	_exit1._enabled = true;
 	_exit1._insideArea = false;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index c925871747..8a51aa5251 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -695,7 +695,6 @@ public:
 	Scene3800();
 	void initScene3800();
 	void sub110BBD();
-	void sub1B007(int arg1, int arg2, int arg3);
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
-- 
cgit v1.2.3


From 15ea73104c051a034c39e12d19c96af720ca64b6 Mon Sep 17 00:00:00 2001
From: Fabio Battaglia
Date: Sun, 8 Jan 2012 00:34:15 +0100
Subject: SWORD2: Fix problem with the height of PSX sprites

Apparently some uncompressed PSX sprites have a wrong
height value in the datafiles, creating subtle problems
like missing lines in some graphics. Fixed by artificially
adding 1 to odd height values of uncompressed sprites.
---
 engines/sword2/sprite.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'engines')

diff --git a/engines/sword2/sprite.cpp b/engines/sword2/sprite.cpp
index 8d260947f1..73a4eca8bd 100644
--- a/engines/sword2/sprite.cpp
+++ b/engines/sword2/sprite.cpp
@@ -500,6 +500,16 @@ int32 Screen::drawSprite(SpriteInfo *s) {
 				recomposePsxSprite(s);
 			}
 
+			// If the height is not an even value, fix it.
+			// Apparently it's a problem in the data of a few sprites
+			// of the PSX version. This should fix an evident problem
+			// in the foyer at the beginning of the game, where a line
+			// of pixels is missing near the stairs. But it should also
+			// fix a more subtle one in the glease gallery and in quaramonte
+			// police office.
+			if (s->h % 2)
+				s->h++;
+
 			freeSprite = true;
 			byte *tempBuf = (byte *)malloc(s->w * s->h * 2);
 			memset(tempBuf, 0, s->w * s->h * 2);
-- 
cgit v1.2.3


From 12d1a9d37f716d8aae4e373705d7f8beec1b8842 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Sat, 7 Jan 2012 22:17:39 -0600
Subject: KYRA: Fix LoL/EoB savegame typing issue with keymapper

If you bind letters (e.g. WSAD) using the keymapper and then try to
save using the in-engine dialog, the letters would get captured and
make it impossible to name a save using those letters.

Thanks LordHoto
---
 engines/kyra/gui_eob.cpp | 10 ++++++++++
 engines/kyra/gui_lol.cpp | 12 ++++++++++++
 2 files changed, 22 insertions(+)

(limited to 'engines')

diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index d60fa47571..611eab1bff 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -29,6 +29,7 @@
 #include "kyra/timer.h"
 #include "kyra/util.h"
 
+#include "backends/keymapper/keymapper.h"
 #include "common/system.h"
 #include "common/savefile.h"
 #include "graphics/scaler.h"
@@ -2419,6 +2420,11 @@ void GUI_EoB::updateBoxFrameHighLight(int box) {
 }
 
 int GUI_EoB::getTextInput(char *dest, int x, int y, int destMaxLen, int textColor1, int textColor2, int cursorColor) {
+#ifdef ENABLE_KEYMAPPER
+	Common::Keymapper *const keymapper = _vm->getEventManager()->getKeymapper();
+	keymapper->pushKeymap(Common::kGlobalKeymapName);
+#endif
+
 	uint8 cursorState = 1;
 	char sufx[] = " ";
 
@@ -2533,6 +2539,10 @@ int GUI_EoB::getTextInput(char *dest, int x, int y, int destMaxLen, int textColo
 
 	} while (_keyPressed.keycode != Common::KEYCODE_RETURN && _keyPressed.keycode != Common::KEYCODE_ESCAPE && !_vm->shouldQuit());
 
+#ifdef ENABLE_KEYMAPPER
+	keymapper->popKeymap(Common::kGlobalKeymapName);
+#endif
+
 	return _keyPressed.keycode == Common::KEYCODE_ESCAPE ? -1 : len;
 }
 
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index 80052c70f2..b025aefbd0 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -35,6 +35,8 @@
 
 #include "graphics/scaler.h"
 
+#include "backends/keymapper/keymapper.h"
+
 #include "base/version.h"
 
 namespace Kyra {
@@ -2549,6 +2551,11 @@ int GUI_LoL::getInput() {
 	if (!_displayMenu)
 		return 0;
 
+#ifdef ENABLE_KEYMAPPER
+	Common::Keymapper *const keymapper = _vm->getEventManager()->getKeymapper();
+	keymapper->pushKeymap(Common::kGlobalKeymapName);
+#endif
+
 	Common::Point p = _vm->getMousePos();
 	_vm->_mouseX = p.x;
 	_vm->_mouseY = p.y;
@@ -2585,6 +2592,11 @@ int GUI_LoL::getInput() {
 		_displayMenu = false;
 
 	_vm->delay(8);
+
+#ifdef ENABLE_KEYMAPPER
+	keymapper->popKeymap(Common::kGlobalKeymapName);
+#endif
+
 	return inputFlag & 0x8000 ? 1 : 0;
 }
 
-- 
cgit v1.2.3


From 5a9c189b22cb40fc669a42bd8a91fe2668818a79 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 8 Jan 2012 21:03:42 +1100
Subject: TSAGE: Fix R2R crashes saying 'unknown message'

---
 engines/tsage/ringworld2/ringworld2_logic.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 1a9a03b37c..fa7895f407 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -342,6 +342,7 @@ void SceneExt::loadScene(int sceneNum) {
 bool SceneExt::display(CursorType action, Event &event) {
 	switch (action) {
 	case CURSOR_CROSSHAIRS:
+	case CURSOR_WALK:
 		return false;
 	case CURSOR_LOOK:
 		SceneItem::display2(1, R2_GLOBALS._randomSource.getRandomNumber(4));
-- 
cgit v1.2.3


From e3b93672d54c59c036c0e87ec2f5aac2ad397cc2 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sun, 8 Jan 2012 15:05:50 +0100
Subject: SCUMM: Correctly recognize platform on freddi2 dutch demo

---
 engines/scumm/detection_tables.h | 2 +-
 engines/scumm/scumm-md5.h        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index bd2ff3062b..ff388fe931 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -647,7 +647,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "freddi", "MM-DEMO", kGenHEPC, UNK_LANG, UNK, 0 },
 
 	{ "freddi2", "freddi2", kGenHEPC, UNK_LANG, UNK, 0 },
-	{ "freddi2", "ff2-demo", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "freddi2", "ff2-demo", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "freddi2", "FFHSDemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "freddi2", "FFHSDemo", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "freddi2", "Freddi Fish 2 Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index bc081b67bc..c71315461a 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 Jan 07 18:43:38 2012
+  This file was generated by the md5table tool on Sun Jan  8 13:57:30 2012
   DO NOT EDIT MANUALLY!
  */
 
@@ -488,7 +488,7 @@ static const MD5Table md5table[] = {
 	{ "bfdf584b01503f0762baded581f6a0a2", "SoccerMLS", "", "", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "c0039ad982999c92d0de81910d640fa0", "freddi", "HE 71", "", -1, Common::NL_NLD, Common::kPlatformWindows },
 	{ "c13225cb1bbd3bc9fe578301696d8021", "monkey", "SEGA", "", -1, Common::EN_ANY, Common::kPlatformSegaCD },
-	{ "c20848f53c2d48bfacdc840993843765", "freddi2", "HE 80", "Demo", -1, Common::NL_NLD, Common::kPlatformWindows },
+	{ "c20848f53c2d48bfacdc840993843765", "freddi2", "HE 80", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "c225bec1b6c0798a2b8c89ac226dc793", "pajama", "HE 100", "", -1, Common::EN_ANY, Common::kPlatformWii },
 	{ "c24c490373aeb48fbd54caa8e7ae376d", "loom", "No AdLib", "EGA", -1, Common::DE_DEU, Common::kPlatformAtariST },
 	{ "c25755b08a8d0d47695e05f1e2111bfc", "freddi4", "", "Demo", -1, Common::EN_USA, Common::kPlatformUnknown },
-- 
cgit v1.2.3


From b6bc7476725919d0893f083e5c3c1f2a7f387787 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sun, 8 Jan 2012 17:52:21 +0100
Subject: SCUMM: Add support for 2 freddi3 Mac/Dutch demos

---
 engines/scumm/detection_tables.h | 4 +++-
 engines/scumm/scumm-md5.h        | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index ff388fe931..d31edcff8b 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -660,7 +660,9 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "freddi3", "freddi3", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "freddi3", "F3-Mdemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "freddi3", "f3-mdemo", kGenHEPC, UNK_LANG, UNK, 0 },
-	{ "freddi3", "FF3-DEMO", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "freddi3", "FF3 Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
+	{ "freddi3", "FF3-demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
+	{ "freddi3", "FF3-DEMO", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "freddi3", "FF3DEMO", kGenHEPC, Common::HE_ISR, UNK, 0 },
 	{ "freddi3", "Freddi 3", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 	{ "freddi3", "Freddi Fish 3", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index c71315461a..c086884f5c 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 Jan  8 13:57:30 2012
+  This file was generated by the md5table tool on Sun Jan  8 16:38:51 2012
   DO NOT EDIT MANUALLY!
  */
 
@@ -323,7 +323,7 @@ static const MD5Table md5table[] = {
 	{ "7410a8ba9795020cd42f171c4320659e", "pajama3", "", "", -1, Common::FR_FRA, Common::kPlatformWindows },
 	{ "746e88c172a5b7a1ae89ac0ee3ee681a", "freddi", "HE 90", "Updated", -1, Common::RU_RUS, Common::kPlatformWindows },
 	{ "74da3494fbe1a7d20213b0afe0954755", "catalog", "HE CUP", "Preview", 10841544, Common::FR_FRA, Common::kPlatformUnknown },
-	{ "754feb59d3bf86b8a00840df74fd7b26", "freddi3", "", "Demo", -1, Common::NL_NLD, Common::kPlatformWindows },
+	{ "754feb59d3bf86b8a00840df74fd7b26", "freddi3", "", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "75ba23fff4fd63fa446c02864f2a5a4b", "zak", "V2", "V2", -1, Common::IT_ITA, Common::kPlatformPC },
 	{ "75bff95816b84672b877d22a911ab811", "freddi3", "HE 99", "Updated", -1, Common::RU_RUS, Common::kPlatformWindows },
 	{ "76b66b43e593ad4d2f1dfb5cc8f19700", "spyfox", "HE 99", "", -1, Common::NL_NLD, Common::kPlatformWindows },
-- 
cgit v1.2.3


From e750c9a0b983cdf876694c7da4e4b0807df98724 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sun, 8 Jan 2012 18:02:00 +0100
Subject: SCUMM: Recognize Windows as platform for pajama2 demo

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

(limited to 'engines')

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index d31edcff8b..d6a5c1aece 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -743,7 +743,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "pajama2", "PJP2DEMO", kGenHEPC, Common::DE_DEU, UNK, 0 },
 	{ "pajama2", "PJ2Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "pajama2", "pj2demo", kGenHEPC, UNK_LANG, UNK, 0 },
-	{ "pajama2", "Pjs2demo", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "pajama2", "Pjs2demo", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "pajama2", "PJ2 Demo", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 	{ "pajama2", "PS2DEMO", kGenHEPC, Common::HE_ISR, UNK, 0 },
 
-- 
cgit v1.2.3


From 2bc89ea4dcab39607002427862a6e0afacaad113 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 8 Jan 2012 19:00:33 +0200
Subject: TSAGE: Fix incorrect popup menu positions (regression)

---
 engines/tsage/graphics.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 8436afe2e8..b211f910c1 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -1302,19 +1302,31 @@ int GfxManager::getAngle(const Common::Point &p1, const Common::Point &p2) {
 	}
 }
 
+// FIXME: The two checks for screenSurface inside these two copyFrom() methods
+// are meant for Ringworld 2, but the corresponding setBounds case causes a lot
+// of issues with the popup menus when right clicking in all games (i.e. the
+// popup menu is always shown on the top left of the screen). For now, these checks
+// are limited for R2R only (as was the original intent), but they should be
+// investigated, as they cause the same glitches with the popup menu there as with
+// the other games.
 
 void GfxManager::copyFrom(GfxSurface &src, Rect destBounds, Region *priorityRegion) {
+#if 0
 	if (&_surface == &(GLOBALS._screenSurface))
 		_surface.setBounds(Rect(0, 0, _bounds.width(), _bounds.height()));
 	else
+#endif
 		_surface.setBounds(_bounds);
 
 	_surface.copyFrom(src, destBounds, priorityRegion);
 }
+
 void GfxManager::copyFrom(GfxSurface &src, int destX, int destY) {
+#if 0
 	if (&_surface == &(GLOBALS._screenSurface))
 		_surface.setBounds(Rect(0, 0, _bounds.width(), _bounds.height()));
 	else
+#endif
 		_surface.setBounds(_bounds);
 
 	_surface.copyFrom(src, destX, destY);
-- 
cgit v1.2.3


From 4938e49e2df1d2f8f794461a32a7da86f4e1e967 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 8 Jan 2012 19:02:14 +0200
Subject: TSAGE: Fix assert triggering when there's nothing to update on screen

---
 engines/tsage/graphics.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index b211f910c1..afaf05190e 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -259,6 +259,12 @@ void GfxSurface::updateScreen() {
 	for (Common::List<Rect>::iterator i = _dirtyRects.begin(); i != _dirtyRects.end(); ++i) {
 		Rect r = *i;
 
+		// Make sure that there is something to update. If not, skip this
+		// rectangle. An example case is the speedbike closeup at the beginning
+		// of Ringworld (third screen).
+		if (r.isEmpty())
+			continue;
+
 		const byte *srcP = (const byte *)_customSurface->getBasePtr(r.left, r.top);
 		g_system->copyRectToScreen(srcP, _customSurface->pitch, r.left, r.top, 
 			r.width(), r.height());
-- 
cgit v1.2.3


From fb26f7dcfa2987706f669882135c7648d365e696 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 8 Jan 2012 19:07:00 +0200
Subject: TSAGE: Update comment

---
 engines/tsage/graphics.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index afaf05190e..5acd191b11 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -1309,12 +1309,10 @@ int GfxManager::getAngle(const Common::Point &p1, const Common::Point &p2) {
 }
 
 // FIXME: The two checks for screenSurface inside these two copyFrom() methods
-// are meant for Ringworld 2, but the corresponding setBounds case causes a lot
-// of issues with the popup menus when right clicking in all games (i.e. the
-// popup menu is always shown on the top left of the screen). For now, these checks
-// are limited for R2R only (as was the original intent), but they should be
-// investigated, as they cause the same glitches with the popup menu there as with
-// the other games.
+// are meant for Ringworld 2, but the corresponding setBounds cases cause
+// issues with the popup menus when right clicking in all games (e.g. the popup
+// menu is always shown on the top left of the screen). Therefore, these two
+// code fragments are disabled for now, till the glitches they cause are fixed.
 
 void GfxManager::copyFrom(GfxSurface &src, Rect destBounds, Region *priorityRegion) {
 #if 0
-- 
cgit v1.2.3


From 0a5df02134976d648f0fd212cba6161fba5cec32 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 8 Jan 2012 19:36:59 +0100
Subject: DREAMWEB: Extend the number of saveslots from 7 to 21 in the original
 save/load dialogs.

---
 engines/dreamweb/dreamweb.cpp |  1 +
 engines/dreamweb/dreamweb.h   |  6 ++++--
 engines/dreamweb/saveload.cpp | 46 ++++++++++++++++++++++++++++++++-----------
 3 files changed, 39 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 91aabc89d9..79c5e0d7be 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -195,6 +195,7 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_timedX = 0;
 	_needToDumpTimed = 0;
 	_loadingOrSave = 0;
+	_saveLoadPage = 0;
 	_currentSlot = 0;
 	_cursorPos = 0;
 	_colourPos = 0;
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index e261010902..b9623f54fa 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -227,8 +227,8 @@ protected:
 	Common::Point _lineData[200];		// Output of Bresenham
 
 	// from saveload.cpp
-	char _saveNames[17*7];
-	char _saveNamesOld[17*7];
+	char _saveNames[17*21];
+	char _saveNamesOld[17*21];
 
 	// from vgagrafx.cpp
 	uint8 _workspace[(0x1000 + 2) * 16];
@@ -421,6 +421,7 @@ public:
 	uint8 _timedX;
 	uint8 _needToDumpTimed;
 	uint8 _loadingOrSave;
+	uint8 _saveLoadPage;
 	uint8 _currentSlot;
 	uint8 _cursorPos;
 	uint8 _colourPos;
@@ -692,6 +693,7 @@ public:
 	void loadSaveBox();
 	void showNames();
 	void checkInput();
+	void selectSaveLoadPage();
 	void selectSlot();
 	void showSlots();
 	void showOpBox();
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 386319db34..b1d2b0aac8 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -143,6 +143,7 @@ void DreamWebEngine::doLoad(int savegameId) {
 				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamWebEngine::getBackToOps },
 				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamWebEngine::actualLoad },
 				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamWebEngine::selectSlot },
+				{ kOpsx+158,kOpsx+158+(18*3),kOpsy-17,kOpsy-1,&DreamWebEngine::selectSaveLoadPage },
 				{ 0,320,0,200,&DreamWebEngine::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
@@ -234,6 +235,7 @@ void DreamWebEngine::saveGame() {
 				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamWebEngine::getBackToOps },
 				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamWebEngine::actualSave },
 				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamWebEngine::selectSlot },
+				{ kOpsx+158,kOpsx+158+(18*3),kOpsy-17,kOpsy-1,&DreamWebEngine::selectSaveLoadPage },
 				{ 0,320,0,200,&DreamWebEngine::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
@@ -286,11 +288,11 @@ void DreamWebEngine::saveGame() {
 }
 
 void DreamWebEngine::namesToOld() {
-	memcpy(_saveNamesOld, _saveNames, 17*7);
+	memcpy(_saveNamesOld, _saveNames, 17*21);
 }
 
 void DreamWebEngine::oldToNames() {
-	memcpy(_saveNames, _saveNamesOld, 17*7);
+	memcpy(_saveNames, _saveNamesOld, 17*21);
 }
 
 void DreamWebEngine::saveLoad() {
@@ -440,7 +442,7 @@ void DreamWebEngine::actualSave() {
 	if (!(_mouseButton & 1))
 		return;
 
-	unsigned int slot = _currentSlot;
+	unsigned int slot = _currentSlot + 7 * _saveLoadPage;
 
 	const char *desc = &_saveNames[17*slot];
 	if (desc[1] == 0) // The actual description string starts at desc[1]
@@ -464,13 +466,13 @@ void DreamWebEngine::actualLoad() {
 	if (_mouseButton == _oldButton || _mouseButton != 1)
 		return;
 
-	unsigned int slot = _currentSlot;
+	unsigned int slot = _currentSlot + 7 * _saveLoadPage;
 
 	const char *desc = &_saveNames[17*slot];
 	if (desc[1] == 0) // The actual description string starts at desc[1]
 		return;
 
-	loadPosition(_currentSlot);
+	loadPosition(slot);
 	_getBack = 1;
 }
 
@@ -582,10 +584,10 @@ void DreamWebEngine::loadPosition(unsigned int slot) {
 	if (len[0] != 17)
 		::error("Error loading save: description buffer isn't 17 bytes");
 
-	if (slot < 7) {
+	if (slot < 21) {
 		inSaveFile->read(&_saveNames[17*slot], len[0]);
 	} else {
-		// The savenames buffer only has room for 7 descriptions
+		// The savenames buffer only has room for 21 descriptions
 		uint8 namebuf[17];
 		inSaveFile->read(namebuf, 17);
 	}
@@ -644,8 +646,8 @@ void DreamWebEngine::loadPosition(unsigned int slot) {
 
 // Count number of save files, and load their descriptions into _saveNames
 uint DreamWebEngine::scanForNames() {
-	// Initialize the first 7 slots (like the original code expects)
-	for (unsigned int slot = 0; slot < 7; ++slot) {
+	// Initialize the first 21 slots (like the original code expects)
+	for (unsigned int slot = 0; slot < 21; ++slot) {
 		_saveNames[17 * slot + 0] = 2;
 		_saveNames[17 * slot + 1] = 0;
 		for (int i = 2; i < 17; ++i)
@@ -670,7 +672,7 @@ uint DreamWebEngine::scanForNames() {
 		int slotNum = atoi(file.c_str() + file.size() - 2);
 		SaveStateDescriptor sd(slotNum, name);
 		saveList.push_back(sd);
-		if (slotNum < 7)
+		if (slotNum < 21)
 			Common::strlcpy(&_saveNames[17 * slotNum + 1], name, 16);	// the first character is unused
 	}
 
@@ -709,9 +711,10 @@ void DreamWebEngine::loadSaveBox() {
 
 // show savegame names (original interface), and set kCursorpos
 void DreamWebEngine::showNames() {
+	unsigned int offset = 7 * _saveLoadPage;
 	for (int slot = 0; slot < 7; ++slot) {
 		// The first character of the savegame name is unused
-		Common::String name(&_saveNames[17*slot + 1]);
+		Common::String name(&_saveNames[17 * (slot + offset) + 1]);
 
 		if (slot != _currentSlot) {
 			printDirect((const uint8 *)name.c_str(), kOpsx + 21, kOpsy + 10*slot + 10, 200, false);
@@ -737,8 +740,10 @@ void DreamWebEngine::checkInput() {
 
 	readKey();
 
+	unsigned int slot = _currentSlot + 7 * _saveLoadPage;
+
 	// The first character of the savegame name is unused
-	char *name = &_saveNames[17*_currentSlot + 1];
+	char *name = &_saveNames[17*slot + 1];
 
 	if (_currentKey == 0) {
 		return;
@@ -768,6 +773,21 @@ void DreamWebEngine::checkInput() {
 	workToScreenM();
 }
 
+void DreamWebEngine::selectSaveLoadPage() {
+	commandOnlyCond(31, 244);
+
+	if (_mouseButton != 1 || _mouseButton == _oldButton)
+		return;
+	uint saveLoadPage = (_mouseX - (kOpsx + 158)) / 18;
+	if (saveLoadPage != _saveLoadPage) {
+		_saveLoadPage = saveLoadPage;
+		// This will also make the first slot the selected one, based
+		// on the mouse Y position. I can't decide if this is a feature
+		// or not.
+		selectSlot();
+	}
+}
+
 void DreamWebEngine::selectSlot() {
 	commandOnlyCond(45, 244);
 
@@ -798,6 +818,8 @@ void DreamWebEngine::selectSlot() {
 }
 
 void DreamWebEngine::showSlots() {
+	showFrame(_icons1, kOpsx + 158, kOpsy - 11, 12, 0);
+	showFrame(_icons1, kOpsx + 158 + 18 * _saveLoadPage, kOpsy - 11, 13 + _saveLoadPage, 0);
 	showFrame(_tempGraphics, kOpsx + 7, kOpsy + 8, 2, 0);
 
 	uint16 y = kOpsy + 11;
-- 
cgit v1.2.3


From 7a82f513a3e7001e45a17aae7457bf28cef8e3ce Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sun, 8 Jan 2012 20:05:49 +0100
Subject: SCUMM: Recognize Mac version of dutch putttime demo

---
 engines/scumm/detection_tables.h | 3 ++-
 engines/scumm/scumm-md5.h        | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index d6a5c1aece..322345716a 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -810,7 +810,8 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "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", "TIJDDEMO", kGenHEPC, UNK_LANG, UNK, 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 },
 	{ "putttime", "TimeDemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "putttime", "TEMPDEMO", kGenHEPC, Common::FR_FRA, UNK, 0 },
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index c086884f5c..1649e2a5f9 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 Jan  8 16:38:51 2012
+  This file was generated by the md5table tool on Sun Jan  8 18:57:45 2012
   DO NOT EDIT MANUALLY!
  */
 
@@ -292,7 +292,7 @@ static const MD5Table md5table[] = {
 	{ "6a30a07f353a75cdc602db27d73e1b42", "puttputt", "HE 70", "", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "6a60d395b78b205c93a956100b1bf5ae", "pajama2", "HE 98.5", "", -1, Common::DE_DEU, Common::kPlatformUnknown },
 	{ "6af2419fe3db5c2fdb091ae4e5833770", "puttrace", "HE 98.5", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
-	{ "6b19d0e25cbf720d05822379b8b90ed9", "PuttTime", "HE 90", "Demo", -1, Common::NL_NLD, 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 },
 	{ "6b3ec67da214f558dc5ceaa2acd47453", "indy3", "EGA", "EGA", -1, Common::EN_ANY, Common::kPlatformPC },
-- 
cgit v1.2.3


From 209012a88ea89aef380f856a3d795685925ed269 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 8 Jan 2012 20:11:22 +0100
Subject: SCUMM: Work around script bug in The Dig

The sound of trickling water in the spider lair is started, but never
explicitly stopped, so it keeps going. (Possibly not forever. When I
tried it in DOSBox, it finally stopped when I got back to the Nexus.)
The same sound effect is used the underwater cavern, and in that case
the exit script does fade out the sound so this workaround emulates
that behaviour.
---
 engines/scumm/script.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'engines')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index cfc4b3c419..c9e3edd728 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -29,6 +29,7 @@
 #include "scumm/resource.h"
 #include "scumm/util.h"
 #include "scumm/scumm_v2.h"
+#include "scumm/sound.h"
 #include "scumm/verbs.h"
 
 namespace Scumm {
@@ -935,6 +936,17 @@ void ScummEngine::runExitScript() {
 	}
 	if (VAR_EXIT_SCRIPT2 != 0xFF && VAR(VAR_EXIT_SCRIPT2))
 		runScript(VAR(VAR_EXIT_SCRIPT2), 0, 0, 0);
+
+#ifdef ENABLE_SCUMM_7_8
+	// WORKAROUND: The spider lair (room 44) will optionally play the sound
+	// of trickling water (sound 215), but it never stops it. The same sound
+	// effect is also used in room 33, so let's do the same fade out that it
+	// does in that room's exit script.
+	if (_game.id == GID_DIG && _currentRoom == 44) {
+		int scriptCmds[] = { 14, 215, 0x600, 0, 30 };
+		_sound->soundKludge(scriptCmds, ARRAYSIZE(scriptCmds));
+	}
+#endif
 }
 
 void ScummEngine::runEntryScript() {
-- 
cgit v1.2.3


From 1a16c5ceb43b2dc817238de6ae5c3b91027f69dd Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sun, 8 Jan 2012 20:30:39 +0100
Subject: SCUMM: Recognize platform on win version of dutch puttrace demo

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

(limited to 'engines')

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 322345716a..d10c1df37f 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -778,7 +778,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "puttcircus", "ToffToffGZZ", kGenHEPC, Common::DE_DEU, UNK, 0 },
 
 	{ "puttrace", "puttrace", kGenHEPC, UNK_LANG, UNK, 0 },
-	{ "puttrace", "500demo", kGenHEPC, Common::NL_NLD, UNK, 0 },
+	{ "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", "racedemo", kGenHEPC, UNK_LANG, UNK, 0 },
-- 
cgit v1.2.3


From a4a2878a3716dfbb3b04e6d10d68a99c55a4dd85 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 8 Jan 2012 20:41:18 +0100
Subject: TSAGE: R2R - Implement scene 1500

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   4 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 159 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  13 ++
 3 files changed, 176 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index fa7895f407..ee49c238ee 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -36,6 +36,8 @@ namespace TsAGE {
 namespace Ringworld2 {
 
 Scene *Ringworld2Game::createScene(int sceneNumber) {
+	warning("Switching to scene %d", sceneNumber);
+
 	switch (sceneNumber) {
 	/* Scene group #0 */
 	case 50: 
@@ -103,7 +105,9 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		return new Scene1100();
 	case 1200:
 	case 1330:
+		error("Missing scene %d from group 1", sceneNumber);
 	case 1500:
+		return new Scene1500();
 	case 1525:
 	case 1530:
 	case 1550:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index e773c52805..17422019b0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -856,5 +856,164 @@ void Scene1100::saveCharacter(int characterIndex) {
 		R2_GLOBALS._sound1.fadeOut2(NULL);
 	SceneExt::saveCharacter(characterIndex);
 }
+
+/*--------------------------------------------------------------------------
+ * Scene 1500 -
+ *
+ *--------------------------------------------------------------------------*/
+void Scene1500::postInit(SceneObjectList *OwnerList) {
+	loadScene(1500);
+	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._v5589E.top = 0;
+	R2_GLOBALS._v5589E.bottom = 200;
+	setZoomPercents(170, 13, 240, 100);
+	SceneExt::postInit();
+	scalePalette(65, 65, 65);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.disableControl();
+
+	_actor2.postInit();
+	_actor2.setup(1401, 1, 1);
+	_actor2._effect = 5;
+	_actor2.fixPriority(10);
+	_actor2._field9C = _field312;
+
+	_actor1.postInit();
+	_actor1.setup(1400, 1, 1);
+	_actor1._moveDiff = Common::Point(1, 1);
+	_actor1._linkedActor = &_actor2;
+
+	if (R2_GLOBALS._sceneManager._previousScene != 1010) {
+		_actor4.postInit();
+		_actor4.setup(1401, 2, 1);
+		_actor4._effect = 5;
+		_actor4.fixPriority(10);
+		_actor4._field9C = _field312;
+
+		_actor3.postInit();
+		_actor3._moveRate = 30;
+		_actor3._moveDiff = Common::Point(1, 1);
+		_actor3._linkedActor = &_actor4;
+	}
+
+	if (R2_GLOBALS._sceneManager._previousScene == 300) {
+		_actor1.setPosition(Common::Point(189, 139), 5);
+
+		_actor3.setup(1400, 1, 2);
+		_actor3.setPosition(Common::Point(148, 108), 0);
+
+		_sceneMode = 20;
+		R2_GLOBALS._sound1.play(110);
+	} else if (R2_GLOBALS._sceneManager._previousScene == 1550) {
+		_actor1.setPosition(Common::Point(189, 139), 5);
+		
+		_actor3.setup(1400, 2, 1);
+		_actor3.changeZoom(-1);
+		_actor3.setPosition(Common::Point(298, 258), 5);
+
+		_sceneMode = 10;
+		R2_GLOBALS._sound1.play(106);
+	} else {
+		_actor1.setPosition(Common::Point(289, 239), -30);
+		_sceneMode = 0;
+		R2_GLOBALS._sound1.play(102);
+	}
+	signal();
+}
+
+void Scene1500::remove() {
+	R2_GLOBALS._v5589E.top = 3;
+	R2_GLOBALS._v5589E.bottom = 168;
+	R2_GLOBALS._v58CE2 = 1;
+
+	SceneExt::remove();
+}
+
+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 (_actor1._yDiff < 50) {
+			_actor1.setPosition(Common::Point(289, 239), _actor1._yDiff + 1);
+			_sceneMode = 1;
+		}
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		break;
+	case 2: {
+		Common::Point pt(189, 139);
+		NpcMover *mover = new NpcMover();
+		_actor1.addMover(mover, &pt, this);
+		}
+		break;
+	case 3:
+		if (_actor1._yDiff > 5) {
+			_actor1.setPosition(Common::Point(189, 139), _actor1._yDiff - 1);
+			_sceneMode = 3;
+		}
+		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);
+		break;
+	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();
+		_actor3.addMover(mover, &pt, this);
+		}
+		break;
+	case 12:
+		setAction(&_sequenceManager, this, 2, &R2_GLOBALS._player, NULL);
+		break;
+	case 21: {
+		Common::Point pt(-2, -42);
+		NpcMover *mover = new NpcMover();
+		_actor3.addMover(mover, &pt, NULL);
+		signal();
+		}
+		break;
+	case 22:
+		if (_actor1._yDiff < 50) {
+			_actor1.setPosition(Common::Point(189, 139), _actor1._yDiff + 1);
+			_sceneMode = 22;
+		}
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		break;
+	case 23: {
+		Common::Point pt(-13, -61);
+		NpcMover *mover = new NpcMover();
+		_actor1.addMover(mover, &pt, this);
+		}
+		break;
+	case 24:
+		R2_GLOBALS._sceneManager.changeScene(300);
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1500::dispatch() {
+	if (_sceneMode > 10) {
+		float yDiff = sqrt((float) (_actor3._position.x * _actor3._position.x) + (_actor3._position.y * _actor3._position.y));
+		if (yDiff > 6)
+			_actor3.setPosition(_actor3._position, yDiff);
+	}
+
+	Scene::dispatch();
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index a21869b6ad..a88451e406 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -117,6 +117,19 @@ public:
 	virtual void saveCharacter(int characterIndex);
 };
 
+class Scene1500 : public SceneExt {
+public:
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void dispatch();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 2dc3111bbefbd1233db08e1d05d5eab90e1e264d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 8 Jan 2012 21:50:32 +0100
Subject: TSAGE: R2R - Implement scene 1525

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |  3 ++
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 44 ++++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  8 +++++
 3 files changed, 54 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index ee49c238ee..5eccafefdf 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -107,8 +107,11 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1330:
 		error("Missing scene %d from group 1", sceneNumber);
 	case 1500:
+		// Cutscene: Ship landing
 		return new Scene1500();
 	case 1525:
+		// Cutscene - Ship
+		return new Scene1525();
 	case 1530:
 	case 1550:
 	case 1575:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 17422019b0..1afb1b6509 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -858,7 +858,7 @@ void Scene1100::saveCharacter(int characterIndex) {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 1500 -
+ * Scene 1500 - Cutscene: Ship landing
  *
  *--------------------------------------------------------------------------*/
 void Scene1500::postInit(SceneObjectList *OwnerList) {
@@ -1015,5 +1015,47 @@ void Scene1500::dispatch() {
 	Scene::dispatch();
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1525 - Cutscene - Ship
+ *
+ *--------------------------------------------------------------------------*/
+void Scene1525::postInit(SceneObjectList *OwnerList) {
+	loadScene(1525);
+	R2_GLOBALS._v58CE2 = 0;
+	SceneExt::postInit();
+
+	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();
+
+	_sceneMode = 0;
+	setAction(&_sequenceManager, this, 2, &R2_GLOBALS._player, NULL);
+}
+
+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;
+	case 1:
+		setAction(&_sequenceManager, this, 2, &R2_GLOBALS._player, NULL);
+		break;
+	case 2:
+		if (R2_GLOBALS._sceneManager._previousScene == 1530)
+			R2_GLOBALS._sceneManager.changeScene(1550);
+		else
+			R2_GLOBALS._sceneManager.changeScene(1530);
+	default:
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index a88451e406..4c6d3ba6dc 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -130,6 +130,14 @@ public:
 	virtual void signal();
 	virtual void dispatch();
 };
+
+class Scene1525 : public SceneExt {
+public:
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From d66bfb131caa1ef3eb57c7cf98d423444eaecb66 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 8 Jan 2012 23:00:41 +0100
Subject: KYRA: Cleanup v2 item animation a little bit.

---
 engines/kyra/animator_hof.cpp  | 11 +++++------
 engines/kyra/animator_mr.cpp   |  9 ++++-----
 engines/kyra/kyra_hof.cpp      |  6 +++---
 engines/kyra/kyra_hof.h        |  4 ++--
 engines/kyra/kyra_mr.h         |  2 +-
 engines/kyra/kyra_v2.h         |  4 ++--
 engines/kyra/resource.h        |  8 ++++----
 engines/kyra/sequences_hof.cpp |  2 +-
 engines/kyra/staticres.cpp     | 18 +++++++++---------
 9 files changed, 31 insertions(+), 33 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/animator_hof.cpp b/engines/kyra/animator_hof.cpp
index 741e358143..5a2378f4d0 100644
--- a/engines/kyra/animator_hof.cpp
+++ b/engines/kyra/animator_hof.cpp
@@ -115,15 +115,14 @@ void KyraEngine_HoF::refreshAnimObjects(int force) {
 void KyraEngine_HoF::updateItemAnimations() {
 	bool nextFrame = false;
 
-	if (_itemAnimData[0].itemIndex == -1 || _inventorySaved)
+	if (_itemAnimDefinition[0].itemIndex == -1 || _inventorySaved)
 		return;
 
-	const ItemAnimData_v2 *s = &_itemAnimData[_nextAnimItem];
+	const ItemAnimDefinition *s = &_itemAnimDefinition[_nextAnimItem];
 	ActiveItemAnim *a = &_activeItemAnim[_nextAnimItem];
-	_nextAnimItem = (_nextAnimItem + 1) % _itemAnimDataSize;
+	_nextAnimItem = (_nextAnimItem + 1) % _itemAnimDefinitionSize;
 
-	uint32 ctime = _system->getMillis();
-	if (ctime < a->nextFrame)
+	if (_system->getMillis() < a->nextFrameTime)
 		return;
 
 	uint16 shpIdx = s->frames[a->currentFrame].index + 64;
@@ -164,7 +163,7 @@ void KyraEngine_HoF::updateItemAnimations() {
 	}
 
 	if (nextFrame) {
-		a->nextFrame = _system->getMillis() + (s->frames[a->currentFrame].delay * _tickLength);
+		a->nextFrameTime = _system->getMillis() + (s->frames[a->currentFrame].delay * _tickLength);
 		a->currentFrame = (a->currentFrame + 1) % s->numFrames;
 	}
 }
diff --git a/engines/kyra/animator_mr.cpp b/engines/kyra/animator_mr.cpp
index 31c5cd1a53..29fa3aba80 100644
--- a/engines/kyra/animator_mr.cpp
+++ b/engines/kyra/animator_mr.cpp
@@ -187,15 +187,14 @@ void KyraEngine_MR::refreshAnimObjects(int force) {
 void KyraEngine_MR::updateItemAnimations() {
 	bool nextFrame = false;
 
-	if (_itemAnimData[0].itemIndex == -1)
+	if (_itemAnimDefinition[0].itemIndex == -1)
 		return;
 
-	const ItemAnimData_v2 *s = &_itemAnimData[_nextAnimItem];
+	const ItemAnimDefinition *s = &_itemAnimDefinition[_nextAnimItem];
 	ActiveItemAnim *a = &_activeItemAnim[_nextAnimItem];
 	_nextAnimItem = (_nextAnimItem + 1) % 10;
 
-	uint32 ctime = _system->getMillis();
-	if (ctime < a->nextFrame)
+	if (_system->getMillis() < a->nextFrameTime)
 		return;
 
 	uint16 shpIdx = s->frames[a->currentFrame].index + 248;
@@ -230,7 +229,7 @@ void KyraEngine_MR::updateItemAnimations() {
 	}
 
 	if (nextFrame) {
-		a->nextFrame = _system->getMillis() + (s->frames[a->currentFrame].delay * _tickLength);
+		a->nextFrameTime = _system->getMillis() + (s->frames[a->currentFrame].delay * _tickLength);
 		a->currentFrame = (a->currentFrame + 1) % s->numFrames;
 	}
 }
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index c3c4e6083c..fd2c1870a8 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -88,7 +88,7 @@ KyraEngine_HoF::KyraEngine_HoF(OSystem *system, const GameFlags &flags) : KyraEn
 	_currentTalkSections.ENDTim = 0;
 
 	memset(&_invWsa, 0, sizeof(_invWsa));
-	_itemAnimData = 0;
+	_itemAnimDefinition = 0;
 	_demoAnimData = 0;
 	_nextAnimItem = 0;
 
@@ -211,8 +211,8 @@ void KyraEngine_HoF::pauseEngineIntern(bool pause) {
 
 		_nextIdleAnim += pausedTime;
 
-		for (int x = 0; x < _itemAnimDataSize; x++)
-			_activeItemAnim[x].nextFrame += pausedTime;
+		for (int x = 0; x < _itemAnimDefinitionSize; x++)
+			_activeItemAnim[x].nextFrameTime += pausedTime;
 
 		_tim->refreshTimersAfterPause(pausedTime);
 	}
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index 4b8303b2e4..320f930b56 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -874,8 +874,8 @@ protected:
 	const char * const *_ingameTimJpStr;
 	int _ingameTimJpStrSize;
 	const HofSeqData *_sequences;
-	const ItemAnimData_v2 *_itemAnimData;
-	int _itemAnimDataSize;
+	const ItemAnimDefinition *_itemAnimDefinition;
+	int _itemAnimDefinitionSize;
 	const ItemAnimData_v1 *_demoAnimData;
 	int _demoAnimSize;
 
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index 38ff271037..7c022534a2 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -219,7 +219,7 @@ private:
 	bool _nextIdleType;
 	void showIdleAnim();
 
-	const ItemAnimData_v2 *_itemAnimData;
+	const ItemAnimDefinition *_itemAnimDefinition;
 	ActiveItemAnim _activeItemAnim[10];
 	int _nextAnimItem;
 
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h
index 3d7b9c4997..72d743710d 100644
--- a/engines/kyra/kyra_v2.h
+++ b/engines/kyra/kyra_v2.h
@@ -38,7 +38,7 @@ struct FrameControl {
 	uint16 delay;
 };
 
-struct ItemAnimData_v2 {
+struct ItemAnimDefinition {
 	Item itemIndex;
 	uint8 numFrames;
 	const FrameControl *frames;
@@ -46,7 +46,7 @@ struct ItemAnimData_v2 {
 
 struct ActiveItemAnim {
 	uint16 currentFrame;
-	uint32 nextFrame;
+	uint32 nextFrameTime;
 };
 
 class Screen_v2;
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 5b0af9840d..5de1577943 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -744,7 +744,7 @@ public:
 	const Room *loadRoomTable(int id, int &entries);
 	const HofSeqData *loadHofSequenceData(int id, int &entries);
 	const ItemAnimData_v1 *loadShapeAnimData_v1(int id, int &entries);
-	const ItemAnimData_v2 *loadShapeAnimData_v2(int id, int &entries);
+	const ItemAnimDefinition *loadItemAnimDefinition(int id, int &entries);
 #if defined(ENABLE_EOB) || defined(ENABLE_LOL)
 	const uint16 *loadRawDataBe16(int id, int &entries);
 	const uint32 *loadRawDataBe32(int id, int &entries);
@@ -787,7 +787,7 @@ private:
 	bool loadRoomTable(Common::SeekableReadStream &stream, void *&ptr, int &size);
 	bool loadHofSequenceData(Common::SeekableReadStream &stream, void *&ptr, int &size);
 	bool loadShapeAnimData_v1(Common::SeekableReadStream &stream, void *&ptr, int &size);
-	bool loadShapeAnimData_v2(Common::SeekableReadStream &stream, void *&ptr, int &size);
+	bool loadItemAnimDefinition(Common::SeekableReadStream &stream, void *&ptr, int &size);
 #if defined(ENABLE_EOB) || defined(ENABLE_LOL)
 	bool loadRawDataBe16(Common::SeekableReadStream &stream, void *&ptr, int &size);
 	bool loadRawDataBe32(Common::SeekableReadStream &stream, void *&ptr, int &size);
@@ -813,7 +813,7 @@ private:
 	void freeRoomTable(void *&ptr, int &size);
 	void freeHofSequenceData(void *&ptr, int &size);
 	void freeHofShapeAnimDataV1(void *&ptr, int &size);
-	void freeHofShapeAnimDataV2(void *&ptr, int &size);
+	void freeItemAnimDefinition(void *&ptr, int &size);
 #if defined(ENABLE_EOB) || defined(ENABLE_LOL)
 	void freeRawDataBe16(void *&ptr, int &size);
 	void freeRawDataBe32(void *&ptr, int &size);
@@ -840,7 +840,7 @@ private:
 
 		k2SeqData = 5,
 		k2ShpAnimDataV1 = 6,
-		k2ShpAnimDataV2 = 7,
+		k2ItemAnimDefinition = 7,
 
 		kLoLCharData = 8,
 		kLoLSpellData = 9,
diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index b27f0df137..2e5e20c02f 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -2773,7 +2773,7 @@ void KyraEngine_HoF::seq_init() {
 		return;
 
 	if (_flags.isDemo && !_flags.isTalkie) {
-		_demoAnimData = _staticres->loadShapeAnimData_v1(k2SeqplayShapeAnimData, _itemAnimDataSize);
+		_demoAnimData = _staticres->loadShapeAnimData_v1(k2SeqplayShapeAnimData, _itemAnimDefinitionSize);
 		uint8 *shp = _res->fileData("icons.shp", 0);
 		uint32 outsize = READ_LE_UINT16(shp + 4);
 		_animShapeFiledata = new uint8[outsize];
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 6c95451c5f..99ad6ea7aa 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -247,7 +247,7 @@ bool StaticResource::init() {
 
 		{ k2SeqData, proc(loadHofSequenceData), proc(freeHofSequenceData) },
 		{ k2ShpAnimDataV1, proc(loadShapeAnimData_v1), proc(freeHofShapeAnimDataV1) },
-		{ k2ShpAnimDataV2, proc(loadShapeAnimData_v2), proc(freeHofShapeAnimDataV2) },
+		{ k2ItemAnimDefinition, proc(loadItemAnimDefinition), proc(freeItemAnimDefinition) },
 
 #ifdef ENABLE_LOL
 		{ kLoLCharData, proc(loadCharData), proc(freeCharData) },
@@ -316,8 +316,8 @@ const ItemAnimData_v1 *StaticResource::loadShapeAnimData_v1(int id, int &entries
 	return (const ItemAnimData_v1 *)getData(id, k2ShpAnimDataV1, entries);
 }
 
-const ItemAnimData_v2 *StaticResource::loadShapeAnimData_v2(int id, int &entries) {
-	return (const ItemAnimData_v2 *)getData(id, k2ShpAnimDataV2, entries);
+const ItemAnimDefinition *StaticResource::loadItemAnimDefinition(int id, int &entries) {
+	return (const ItemAnimDefinition *)getData(id, k2ItemAnimDefinition, entries);
 }
 
 bool StaticResource::prefetchId(int id) {
@@ -610,9 +610,9 @@ bool StaticResource::loadShapeAnimData_v1(Common::SeekableReadStream &stream, vo
 	return true;
 }
 
-bool StaticResource::loadShapeAnimData_v2(Common::SeekableReadStream &stream, void *&ptr, int &size) {
+bool StaticResource::loadItemAnimDefinition(Common::SeekableReadStream &stream, void *&ptr, int &size) {
 	size = stream.readByte();
-	ItemAnimData_v2 *loadTo = new ItemAnimData_v2[size];
+	ItemAnimDefinition *loadTo = new ItemAnimDefinition[size];
 	assert(loadTo);
 
 	for (int i = 0; i < size; i++) {
@@ -699,8 +699,8 @@ void StaticResource::freeHofShapeAnimDataV1(void *&ptr, int &size) {
 	size = 0;
 }
 
-void StaticResource::freeHofShapeAnimDataV2(void *&ptr, int &size) {
-	ItemAnimData_v2 *d = (ItemAnimData_v2 *)ptr;
+void StaticResource::freeItemAnimDefinition(void *&ptr, int &size) {
+	ItemAnimDefinition *d = (ItemAnimDefinition *)ptr;
 	for (int i = 0; i < size; i++)
 		delete[] d[i].frames;
 	delete[] d;
@@ -1007,7 +1007,7 @@ void KyraEngine_HoF::initStaticResource() {
 	_cdaTrackTableFinale = _staticres->loadRawData(k2SeqplayFinaleCDA, _cdaTrackTableFinaleSize);
 	_ingameTalkObjIndex = (const uint16 *)_staticres->loadRawData(k2IngameTalkObjIndex, _ingameTalkObjIndexSize);
 	_ingameTimJpStr = _staticres->loadStrings(k2IngameTimJpStrings, _ingameTimJpStrSize);
-	_itemAnimData = _staticres->loadShapeAnimData_v2(k2IngameShapeAnimData, _itemAnimDataSize);
+	_itemAnimDefinition = _staticres->loadItemAnimDefinition(k2IngameShapeAnimData, _itemAnimDefinitionSize);
 
 	// replace sequence talkie files with localized versions
 	const char *const *seqSoundList = _staticres->loadStrings(k2SeqplaySfxFiles, _sequenceSoundListSize);
@@ -1143,7 +1143,7 @@ void KyraEngine_MR::initStaticResource() {
 	_scoreTable = _staticres->loadRawData(k3ScoreTable, _scoreTableSize);
 	_sfxFileList = _staticres->loadStrings(k3SfxFiles, _sfxFileListSize);
 	_sfxFileMap = _staticres->loadRawData(k3SfxMap, _sfxFileMapSize);
-	_itemAnimData = _staticres->loadShapeAnimData_v2(k3ItemAnimData, tmp);
+	_itemAnimDefinition = _staticres->loadItemAnimDefinition(k3ItemAnimData, tmp);
 	_itemMagicTable = _staticres->loadRawData(k3ItemMagicTable, tmp);
 	_itemStringMap = _staticres->loadRawData(k3ItemStringMap, _itemStringMapSize);
 }
-- 
cgit v1.2.3


From d1e9d382143e94f2b1129a7993933825a731bfd3 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 8 Jan 2012 23:56:27 +0100
Subject: TSAGE: R2R - Implement scene 1530

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   1 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 101 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  15 ++++
 engines/tsage/ringworld2/ringworld2_speakers.h  |  10 +++
 4 files changed, 127 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 5eccafefdf..8b4d86532d 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -113,6 +113,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Cutscene - Ship
 		return new Scene1525();
 	case 1530:
+		return new Scene1530();
 	case 1550:
 	case 1575:
 	case 1580:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 1afb1b6509..997331f94c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1057,5 +1057,106 @@ void Scene1525::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1530 -
+ *
+ *--------------------------------------------------------------------------*/
+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);
+
+	R2_GLOBALS._v58CE2 = 0;
+	SceneExt::postInit();
+
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+		
+	if (R2_GLOBALS._sceneManager._previousScene == 1000) {
+		R2_GLOBALS._player.postInit();
+		R2_GLOBALS._player.hide();
+		R2_GLOBALS._player.disableControl();
+
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(538, this);
+		R2_GLOBALS._sound1.play(114);
+
+		_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);
+
+		_actor2.postInit();
+		_actor2.setup(1516, 7, 1);
+		_actor2.setPosition(Common::Point(121, 41));
+		_actor2.animate(ANIM_MODE_2, NULL);
+
+		_actor3.postInit();
+		_actor3.setup(1516, 8, 1);
+		_actor3.setPosition(Common::Point(107, 116));
+		_actor3.animate(ANIM_MODE_2, NULL);
+
+		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);
+
+		_sceneMode = 1;
+	} else {
+		_actor1.postInit();
+		_actor1._effect = 1;
+
+		R2_GLOBALS._player.postInit();
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.disableControl();
+
+		setAction(&_sequenceManager, this, 1530, &R2_GLOBALS._player, &_actor1, NULL);
+
+		_sceneMode = 2;
+	}
+
+}
+
+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 Scene1530::dispatch() {
+	int16 x = R2_GLOBALS._player._position.x;
+	int16 y = R2_GLOBALS._player._position.y;
+
+	_actor2.setPosition(Common::Point(x - 39, y - 85));
+	_actor3.setPosition(Common::Point(x - 53, y - 9));
+
+	Scene::dispatch();
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 4c6d3ba6dc..4631c4f0ce 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -138,6 +138,21 @@ public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 };
+
+class Scene1530 : public SceneExt {
+public:
+	SpeakerQuinn1530 _quinnSpeaker;
+	SpeakerSeeker1530 _seekerSpeaker;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void dispatch();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 13c770a4a3..49ac9f555f 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -269,6 +269,11 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerQuinn1530 : public SpeakerQuinn {
+public:
+	virtual Common::String getClassName() { return "SpeakerQuinn1530"; }
+};
+
 class SpeakerQuinn2435 : public SpeakerQuinn {
 public:
 	virtual Common::String getClassName() { return "SpeakerQuinn2435"; }
@@ -407,6 +412,11 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerSeeker1530 : public SpeakerSeeker {
+public:
+	virtual Common::String getClassName() { return "SpeakerSeeker1530"; }
+};
+
 class SpeakerSeeker2435 : public SpeakerSeeker {
 public:
 	virtual Common::String getClassName() { return "SpeakerSeeker2435"; }
-- 
cgit v1.2.3


From cc3fc3f3da71a39797cb2d25ff531f174c126358 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 8 Jan 2012 23:53:40 +0100
Subject: KYRA: fix regression in non-playable HOF demo

(missing animated items)
---
 engines/kyra/sequences_hof.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index 2e5e20c02f..686c3c9320 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -234,6 +234,8 @@ void KyraEngine_HoF::seq_playSequences(int startSeq, int endSeq) {
 				int32 dly = _tickLength - (now - _seqSubFrameStartTime);
 				if (dly > 0)
 					delay(MIN<uint32>(dly, tdiff));
+				else
+					updateInput();
 			}
 		}
 
@@ -263,6 +265,8 @@ void KyraEngine_HoF::seq_playSequences(int startSeq, int endSeq) {
 			int32 dly = _tickLength - (now - _seqSubFrameStartTime);
 			if (dly > 0)
 				delay(MIN<uint32>(dly, tdiff));
+			else
+				updateInput();
 		}
 
 		seq_sequenceCommand(cseq.finalCommand);
@@ -2780,8 +2784,8 @@ void KyraEngine_HoF::seq_init() {
 		Screen::decodeFrame4(shp + 10, _animShapeFiledata, outsize);
 		delete[] shp;
 
-		for (int numShp = 0; getShapePtr(numShp); ++numShp)
-			addShapeToPool(_screen->getPtrToShape(_animShapeFiledata, numShp), numShp);
+		for (int i = 0; i < 20; i++)
+			addShapeToPool(_screen->getPtrToShape(_animShapeFiledata, i), i);
 	} else {
 		const MainMenu::StaticData data = {
 			{ _sequenceStrings[97], _sequenceStrings[96], _sequenceStrings[95], _sequenceStrings[98], 0 },
-- 
cgit v1.2.3


From 57d586d5982220792e961d95b904427c2972d872 Mon Sep 17 00:00:00 2001
From: Fabio Battaglia
Date: Mon, 9 Jan 2012 00:17:29 +0100
Subject: SWORD2: Force fake transparency for PSX sprites

In PSX version blending is done through hardware transparency,
this would have to be simulated using 16-bit mode. As this is
not yet available in this engine, fake transparency is used
as a placeholder
---
 engines/sword2/sprite.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sword2/sprite.cpp b/engines/sword2/sprite.cpp
index 73a4eca8bd..cb0923cc2f 100644
--- a/engines/sword2/sprite.cpp
+++ b/engines/sword2/sprite.cpp
@@ -772,14 +772,18 @@ int32 Screen::drawSprite(SpriteInfo *s) {
 	src = sprite + rs.top * srcPitch + rs.left;
 	dst = _buffer + _screenWide * rd.top + rd.left;
 
-	if (s->type & RDSPR_BLEND && !Sword2Engine::isPsx()) { // Blending is unavailable in PSX version
+	if (s->type & RDSPR_BLEND) { 
 		// The original code had two different blending cases. One for
 		// s->blend & 0x01 and one for s->blend & 0x02. However, the
 		// only values that actually appear in the cluster files are
 		// 0, 513 and 1025 so the s->blend & 0x02 case was never used.
 		// Which is just as well since that code made no sense to me.
 
-		if (!(_renderCaps & RDBLTFX_SPRITEBLEND)) {
+		// TODO: In PSX version, blending is done through hardware transparency.
+		// The only correct way to simulate this would be using 16-bit mode.
+		// As this is not yet available for this engine, fake transparency is used
+		// as placeholder.
+		if (!(_renderCaps & RDBLTFX_SPRITEBLEND) || Sword2Engine::isPsx()) { 
 			for (i = 0; i < rs.height(); i++) {
 				for (j = 0; j < rs.width(); j++) {
 					if (src[j] && ((i & 1) == (j & 1)))
-- 
cgit v1.2.3


From 3f05ee5452b6f5a5d876bf38fbf806616a90ff50 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 10 Jan 2012 20:10:46 +0100
Subject: TSAGE: R2R - Add some global variables, fix some default values

---
 engines/tsage/globals.cpp | 36 ++++++++++++++++++++++++++++++------
 engines/tsage/globals.h   |  5 +++++
 2 files changed, 35 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index ad7d0d1e0c..4c9c6de956 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -381,23 +381,42 @@ void Ringworld2Globals::reset() {
 	_v5657C = 0;
 	_v565F5 = 0;
 	_v565AE = 0;
-	for (int i = 0; i < 14; i++)
-		_v56605[i] = 0;
+
+	_v56605[0] = 0;
+	_v56605[1] = 3;
+	_v56605[2] = 5;
+	_v56605[3] = 1;
+	_v56605[4] = 2;
+	_v56605[5] = 5;
+	_v56605[6] = 9;
+	_v56605[7] = 14;
+	_v56605[8] = 15;
+	_v56605[9] = 18;
+	_v56605[10] = 20;
+	_v56605[11] = 25;
+	_v56605[12] = 27;
+	_v56605[13] = 31;
+
 	_v566A6 = 3800;
-	_v566A8 = 0;
+	_v566A8 = 5;
 	_v566A9 = 0;
 	_v566AA = 0;
 	for (int i = 0; i < 1000; i++)
 		_v566AB[i] = 0;
-	_v56A93 = 0;
-	_v56A99 = 0;
+	_v56A93 = -1;
+	_v56A99 = 5;
 	_v56A9E = 0;
 	_v56AA0 = 0;
 	_v56AA1 = 0;
+	_v56AA2 = 60;
+	_v56AA4 = 660;
+	_v56AA6 = 1;
+	_v56AA7 = 1;
+	_v56AA8 = 1;
 	_v56AAB = 0;
 	_v57C2C = 0;
 	_v58CE2 = 0;
-	Common::fill(&_v565F1[0], &_v565F1[MAX_CHARACTERS], 0);
+	Common::fill(&_v565F1[0], &_v565F1[MAX_CHARACTERS], 1);
 	_speechSubtitles = SPEECH_VOICE | SPEECH_TEXT;
 	_insetUp = 0;
 
@@ -434,6 +453,8 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_v566A6);
 	s.syncAsSint16LE(_v56A93);
 	s.syncAsSint16LE(_v56A9E);
+	s.syncAsSint16LE(_v56AA2);
+	s.syncAsSint16LE(_v56AA4);
 	s.syncAsSint16LE(_v56AAB);
 	s.syncAsSint16LE(_v57C2C);
 	s.syncAsSint16LE(_v58CE2);
@@ -448,6 +469,9 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsByte(_v566AA);
 	s.syncAsByte(_v56AA0);
 	s.syncAsByte(_v56AA1);
+	s.syncAsByte(_v56AA6);
+	s.syncAsByte(_v56AA7);
+	s.syncAsByte(_v56AA8);
 
 	for (i = 0; i < 14; ++i)
 		s.syncAsByte(_v56605[i]);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 227058f1d6..07f5b85e9b 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -265,6 +265,11 @@ public:
 	int _v56A9E;
 	byte _v56AA0;
 	byte _v56AA1;
+	int _v56AA2;
+	int _v56AA4;
+	byte _v56AA6;
+	byte _v56AA7;
+	byte _v56AA8;
 	int _v56AAB;
 	int _v57C2C;
 	int _v58CE2;
-- 
cgit v1.2.3


From 879cb00c8a15f618b7e22e96877381370e448d64 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 10 Jan 2012 20:11:47 +0100
Subject: TSAGE: R2R - Partial implementation of scene 1200

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 758 +++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  59 ++
 3 files changed, 818 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 8b4d86532d..d7d21154f3 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -104,6 +104,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1100:
 		return new Scene1100();
 	case 1200:
+		return new Scene1200();
 	case 1330:
 		error("Missing scene %d from group 1", sceneNumber);
 	case 1500:
@@ -113,6 +114,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Cutscene - Ship
 		return new Scene1525();
 	case 1530:
+		// Cutscene - Elevator
 		return new Scene1530();
 	case 1550:
 	case 1575:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 997331f94c..3d8cd0e6dd 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -857,6 +857,761 @@ void Scene1100::saveCharacter(int characterIndex) {
 	SceneExt::saveCharacter(characterIndex);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1200 -
+ *
+ *--------------------------------------------------------------------------*/
+Scene1200::Scene1200() {
+	_field412 = 0;
+	_field414 = 0;
+	_field416 = 0;
+	_field418 = 0;
+	_field41A = 0;
+	_field41C = 1; //CHECKME: Only if fixup_flag == 6??
+}
+
+void Scene1200::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_field414);
+	s.syncAsSint16LE(_field416);
+	s.syncAsSint16LE(_field418);
+	s.syncAsSint16LE(_field41A);
+	s.syncAsSint16LE(_field41C);
+}
+
+Scene1200::Area1::Area1() {
+	_field20 = 0;
+}
+
+void Scene1200::Area1::synchronize(Serializer &s) {
+	SceneArea::synchronize(s);
+
+	s.syncAsByte(_field20);
+}
+
+void Scene1200::Area1::Actor3::init(int state) {
+	_state = state;
+
+	SceneActor::postInit();
+	setup(1003, 1, 1);
+	fixPriority(255);
+
+	switch (_state) {
+	case 1:
+		switch (R2_GLOBALS._v56AA6) {
+		case 1:
+			setFrame2(2);
+			setPosition(Common::Point(129, 101));
+			break;
+		case 2:
+			setFrame2(3);
+			setPosition(Common::Point(135, 95));
+			break;
+		default:
+			break;
+		}
+	case 2:
+		switch (R2_GLOBALS._v56AA7) {
+		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 3:
+		switch (R2_GLOBALS._v56AA8) {
+		case 1:
+			setFrame2(3);
+			setPosition(Common::Point(158, 95));
+			break;
+		case 2:
+			setFrame2(2);
+			setPosition(Common::Point(175, 101));
+			break;
+		default:
+			break;
+		}
+	default:
+		break;
+	}
+
+	setDetails(1200, 12, -1, -1, 2, (SceneItem *) NULL);
+}
+
+bool Scene1200::Area1::Actor3::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._v56AA6 == 1) {
+			R2_GLOBALS._v56AA6 = 2;
+			setFrame2(3);
+			setPosition(Common::Point(135, 95));
+		} else {
+			R2_GLOBALS._v56AA6 = 1;
+			setFrame2(2);
+			setPosition(Common::Point(129, 101));
+		}
+		break;
+	case 2:
+		++R2_GLOBALS._v56AA7;
+		if (R2_GLOBALS._v56AA7 == 4)
+			R2_GLOBALS._v56AA7 = 1;
+
+		switch (R2_GLOBALS._v56AA7) {
+		case 1:
+			setFrame2(1);
+			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._v56AA8 == 1) {
+			R2_GLOBALS._v56AA8 = 2;
+			setFrame2(2);
+			setPosition(Common::Point(175, 101));
+		} else {
+			R2_GLOBALS._v56AA8 = 1;
+			setFrame2(3);
+			setPosition(Common::Point(158, 95));
+		}
+		break;
+	default:
+		break;
+	}
+	
+	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
+	scene->_field418 = 0;
+	
+	if ((R2_GLOBALS._v56AA6 == 1) && (R2_GLOBALS._v56AA7 == 1) && (R2_GLOBALS._v56AA8 == 1))
+		scene->_field418 = 1;
+	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA7 == 1) && (R2_GLOBALS._v56AA8 == 1))
+		scene->_field418 = 2;
+	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA7 == 1) && (R2_GLOBALS._v56AA8 == 2))
+		scene->_field418 = 3;
+	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA7 == 3) && (R2_GLOBALS._v56AA8 == 1))
+		scene->_field418 = 4;
+	
+	return true;
+}
+
+void Scene1200::Area1::postInit() {
+	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
+
+	scene->_field41A = 1;
+	R2_GLOBALS._events.setCursor(CURSOR_USE);
+	proc12(1003, 1, 1, 100, 40);
+	proc13(1200, 11, -1, -1);
+	R2_GLOBALS._sound2.play(259);
+	_actor3.init(1);
+	_actor4.init(2);
+	_actor5.init(3);
+
+	R2_GLOBALS._player._canWalk = false;
+}
+
+void Scene1200::Area1::remove() {
+	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
+	
+	scene->_field41A = 0;
+	warning("Unexpected _sceneAreas.remove() call");
+//	scene->_sceneAreas.remove(&_actor3);
+//	scene->_sceneAreas.remove(&_actor4);
+//	scene->_sceneAreas.remove(&_actor5);
+	_actor3.remove();
+	_actor4.remove();
+	_actor5.remove();
+	
+	// sub201EA
+	R2_GLOBALS._sceneItems.remove((SceneItem *)this);
+	_actor2.remove();
+	SceneArea::remove();
+	R2_GLOBALS._insetUp--;
+	//
+	
+	R2_GLOBALS._player._canWalk = true;
+}
+
+void Scene1200::Area1::process(Event &event) {
+	if (_field20 != R2_GLOBALS._insetUp)
+		return;
+
+	CursorType cursor = R2_GLOBALS._events.getCursor();
+
+	if (_actor2._bounds.contains(event.mousePos.x + g_globals->gfxManager()._bounds.left , event.mousePos.y)) {
+		if (cursor == _cursorNum)
+			warning("TODO: _cursorState = ???");
+			R2_GLOBALS._events.setCursor(_savedCursorNum); //, _cursorState);
+	} else if (event.mousePos.y < 168) {
+		if (cursor != _cursorNum) {
+			_savedCursorNum = cursor;
+			warning("TODO: _cursorState = ???");
+			R2_GLOBALS._events.setCursor(CURSOR_INVALID);
+		}
+		if (event.eventType == EVENT_BUTTON_DOWN) {
+			event.handled = true;
+			warning("TODO: _cursorState = ???");
+			R2_GLOBALS._events.setCursor(_savedCursorNum); //, _cursorState);
+			remove();
+		}
+	}
+}
+
+void Scene1200::Area1::proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY) {
+	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
+
+	_actor2.postInit();
+	_actor2.setup(visage, stripFrameNum, frameNum);
+	_actor2.setPosition(Common::Point(posX, posY));
+	_actor2.fixPriority(250);
+	_cursorNum = CURSOR_INVALID;
+	scene->_sceneAreas.push_front(this);
+	++R2_GLOBALS._insetUp;
+	_field20 = R2_GLOBALS._insetUp;
+}
+
+void Scene1200::Area1::proc13(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
+	_actor2.setDetails(resNum, lookLineNum, talkLineNum, useLineNum, 2, (SceneItem *) NULL);
+}
+
+int Scene1200::Object1::sub51AF8(Common::Point pt) {
+	warning("STUB: sub1AF8()");
+	return 0;
+}
+
+
+void Scene1200::postInit(SceneObjectList *OwnerList) {
+	Rect tmpRect;
+
+	loadScene(1200);
+	SceneExt::postInit();
+
+	if (R2_GLOBALS._sceneManager._previousScene < 3200)
+		R2_GLOBALS._sound1.play(257);
+
+	_field412 = 1;
+	_field414 = 0;
+	_field416 = 0;
+	_field418 = 0;
+	_field41A = 0;
+	_field41C = 0;
+
+	if ((R2_GLOBALS._v56AA6 == 1) && (R2_GLOBALS._v56AA8 == 1) && (R2_GLOBALS._v56AA8 == 1))
+		_field418 = 1;
+	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA8 == 1) && (R2_GLOBALS._v56AA8 == 1))
+		_field418 = 2;
+	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA8 == 1) && (R2_GLOBALS._v56AA8 == 2))
+		_field418 = 3;
+	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA8 == 3) && (R2_GLOBALS._v56AA8 == 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[3] = 1200;
+
+	_actor1.postInit();
+	_actor1.hide();
+
+	tmpRect.set(110, 20, 210, 120);
+	warning("_object1.sub9EDE8(tmpRect);");
+	warning("_object1.sub51AE9(1);");
+	warning("_object1.sub51AFD(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);");
+	warning("int unk = set_pane_p(_paneNumber);");
+	warning("_object1.sub51B02();");
+	warning("set_pane_p(unk);");
+
+	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();
+		warning("_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, 3, 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:
+		warning("_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) {
+		warning("_object1.sub9EE22(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);");
+		int unk = _object1.sub51AF8(event.mousePos);
+		switch (R2_GLOBALS._events.getCursor()) {
+		case CURSOR_ARROW:
+			event.handled = true;
+			if ((event.mousePos.x > 179) && (event.mousePos.x < 210) && (event.mousePos.y > 50) && (event.mousePos.y < 89))
+				warning("sub9DAD6(1);");
+
+			if ((event.mousePos.x > 109) && (event.mousePos.x < 140) && (event.mousePos.y > 50) && (event.mousePos.y < 89))
+				warning("sub9DAD6(2);");
+				
+			if ((event.mousePos.x > 140) && (event.mousePos.x < 179) && (event.mousePos.y > 89) && (event.mousePos.y < 120))
+				warning("sub9DAD6(3);");
+				
+			if ((event.mousePos.x > 140) && (event.mousePos.x < 179) && (event.mousePos.y > 19) && (event.mousePos.y < 50))
+				warning("sub9DAD6(4);");
+			break;
+		case CURSOR_USE:
+			if (unk > 36) {
+				if ( ((R2_GLOBALS._v56AA2 == 3)  && (R2_GLOBALS._v56AA4 == 33))
+					|| ((R2_GLOBALS._v56AA2 == 7)  && (R2_GLOBALS._v56AA4 == 33))
+					|| ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 41))
+					|| ((R2_GLOBALS._v56AA2 == 5)  && (R2_GLOBALS._v56AA4 == 5))
+					|| ((R2_GLOBALS._v56AA2 == 13) && (R2_GLOBALS._v56AA4 == 21))
+					|| ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 21))
+					|| ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 5))
+					|| ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 9))
+					|| ((R2_GLOBALS._v56AA2 == 29) && (R2_GLOBALS._v56AA4 == 17))
+					|| ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 17))
+					|| ((R2_GLOBALS._v56AA2 == 35) && (R2_GLOBALS._v56AA4 == 17))
+					|| ((R2_GLOBALS._v56AA2 == 41) && (R2_GLOBALS._v56AA4 == 21)) ) {
+					_area1.postInit();
+					event.handled = true;
+				}
+			}
+
+			if ((unk == 1) || (unk == 4) || (unk == 11) || (unk == 14)) {
+				if ( ((R2_GLOBALS._v56AA2 == 3)  && (R2_GLOBALS._v56AA4 == 9))
+				  || ((R2_GLOBALS._v56AA2 == 11)  && (R2_GLOBALS._v56AA4 == 27))
+				  || ((R2_GLOBALS._v56AA2 == 17)  && (R2_GLOBALS._v56AA4 == 7))
+				  || ((R2_GLOBALS._v56AA2 == 17)  && (R2_GLOBALS._v56AA4 == 27))
+				  || ((R2_GLOBALS._v56AA2 == 17)  && (R2_GLOBALS._v56AA4 == 33))
+				  || (R2_GLOBALS._v56AA2 == 33) ) {
+					switch (R2_GLOBALS._v56AA2) {
+					case 3:
+						R2_GLOBALS._sceneManager.changeScene(3150);
+						break;
+					case 33:
+						if (R2_GLOBALS._v56AA1 >= 4)
+							R2_GLOBALS._sceneManager.changeScene(3250);
+						else
+							SceneItem::display(1200, 6, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+						break;
+					default:
+						SceneItem::display(1200, 5, 0, 280, 1, 160, 9, 1, 2, 20, 7, 154, -999);
+						break;
+					}
+					event.handled = true;
+				}
+			}
+			break;
+		case CURSOR_LOOK:
+			if ((unk == 1) || (unk == 4) || (unk == 11) || (unk == 14)) {
+				event.handled = true;
+				switch (R2_GLOBALS._v56AA2) {
+				case 3:
+					SceneItem::display(1200, 8, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+						break;
+				case 9:
+						R2_GLOBALS._sceneManager.changeScene(3240);
+						break;
+				case 11:
+					if (R2_GLOBALS._v56AA4 == 27)
+						R2_GLOBALS._sceneManager.changeScene(3210);
+					else
+						SceneItem::display(1200, 10, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+					break;
+				case 17:
+					switch (R2_GLOBALS._v56AA4) {
+					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:
+						SceneItem::display(1200, 10, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+						break;
+					}
+				case 33:
+					R2_GLOBALS._sceneManager.changeScene(3245);
+					break;
+				default:
+					SceneItem::display(1200, 10, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+					break;
+				}
+			}
+			if (unk > 36) {
+				event.handled = true;
+				SceneItem::display(1200, 9, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+			}
+			break;
+		case CURSOR_TALK:
+			event.handled = true;
+			break;
+		default:
+			return;
+		}
+	} else if (event.eventType == EVENT_KEYPRESS) {
+		if (_field414 == 0) {
+			event.handled = false;
+			return;
+		}
+		
+		switch (event.kbd.keycode) {
+		case Common::KEYCODE_1:
+			warning("FIXME: keycode = 0x4800");
+			warning("sub9DAD6(4);");
+			break;
+		case Common::KEYCODE_2:
+			warning("FIXME: keycode = 0x4B00");
+			warning("sub9DAD6(2);");
+			break;
+		case Common::KEYCODE_3:
+			warning("FIXME: keycode = 0x4D00");
+			warning("sub9DAD6(1);");
+			break;
+		case Common::KEYCODE_4:
+			warning("FIXME: keycode = 0x5000");
+			warning("sub9DAD6(3);");
+			break;
+		default:
+			event.handled = false;
+			return;
+			break;
+		}
+	} else {
+		return;
+	}
+}
+	
+void Scene1200::dispatch() {
+	Rect tmpRect;
+	Scene::dispatch();
+	if (_field41C != 0) {
+		warning("_object1.sub51AFD(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);");
+		warning("int unk = set_pane_p(_paneNumber);");
+		warning("_object1.sub51B02();");
+		warning("_gfxManager.sub294AC(unk);");
+		warning("tmpRect.sub14DF3();");
+		_field41C = 0;
+	}
+	
+	if (_field414 != 0) {
+		tmpRect.set(110, 20, 210, 120);
+		_field414--;
+		switch (_field412 - 1) {
+		case 0:
+			R2_GLOBALS._v56AA2 += 2;
+			break;
+		case 1:
+			R2_GLOBALS._v56AA2 -= 2;
+			break;
+		case 2:
+			R2_GLOBALS._v56AA4 += 2;
+			break;
+		case 3:
+			R2_GLOBALS._v56AA4 -= 2;
+			break;
+		default:
+			break;
+		}
+		warning("_object1.sub51AFD(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);");
+		warning("int unk = set_pane_p(_paneNumber);");
+		warning("_object1.sub51B02();");
+		warning("_gfxManager.sub294AC(unk);");
+		warning("tmpRect.sub14DF3();");
+		
+		if (_field416 != 0) {
+			switch(_field412 - 1) {
+			case 0:
+				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x - 2, R2_GLOBALS._player._position.y));
+				break;
+			case 1:
+				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x + 2, R2_GLOBALS._player._position.y));
+				break;
+			case 2:
+				R2_GLOBALS._player.setPosition(Common::Point(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y - 2));
+				break;
+			case 3:
+				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);
+}
+
 /*--------------------------------------------------------------------------
  * Scene 1500 - Cutscene: Ship landing
  *
@@ -1058,7 +1813,7 @@ void Scene1525::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 1530 -
+ * Scene 1530 - Cutscene - Elevator
  *
  *--------------------------------------------------------------------------*/
 void Scene1530::postInit(SceneObjectList *OwnerList) {
@@ -1158,5 +1913,6 @@ void Scene1530::dispatch() {
 	Scene::dispatch();
 }
 
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 4631c4f0ce..57e62e352c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -117,6 +117,65 @@ public:
 	virtual void saveCharacter(int characterIndex);
 };
 
+class Scene1200 : public SceneExt {
+	class Area1: public SceneArea {
+	public:
+		class Actor3 : public SceneActorExt {
+		public:
+			void init(int state);
+			bool startAction(CursorType action, Event &event);
+		};
+
+		SceneActor _actor2;
+		Actor3 _actor3;
+		Actor3 _actor4;
+		Actor3 _actor5;
+
+		byte _field20;
+
+		Area1();
+		void synchronize(Serializer &s);
+
+		virtual void postInit();
+		virtual void remove();
+		virtual void process(Event &event);
+		virtual void proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY);
+		virtual void proc13(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
+	};
+
+	class Object1 : public SavedObject {
+	public:
+		Rect rect1;
+		Rect rect2;
+
+		int sub51AF8(Common::Point pt);
+		virtual Common::String getClassName() { return "UnkObject1200"; }
+	};
+		
+public:
+	NamedHotspot _item1;
+	SceneActor _actor1;
+	Area1 _area1;
+	Object1 _object1;
+	SequenceManager _sequenceManager;
+
+	int _field412;
+	int _field414;
+	int _field416;
+	int _field418;
+	int _field41A;
+	int _field41C;
+
+	Scene1200();
+	void synchronize(Serializer &s);
+
+	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 _actor1;
-- 
cgit v1.2.3


From 603dc3734c05876730a6ad9a21aa26a55f76f8fb Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 10 Jan 2012 22:08:00 +0100
Subject: TSAGE: R2R - Fix some warnings, implement sub51AF8

Thanks LordHoto for pointing those
---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 38 ++++++++++++++++++++-----
 engines/tsage/ringworld2/ringworld2_scenes1.h   | 15 ++++++++--
 2 files changed, 44 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 3d8cd0e6dd..84da3f23f8 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1097,9 +1097,33 @@ void Scene1200::Area1::proc13(int resNum, int lookLineNum, int talkLineNum, int
 	_actor2.setDetails(resNum, lookLineNum, talkLineNum, useLineNum, 2, (SceneItem *) NULL);
 }
 
+Scene1200::Object1::Object1() {
+	_field16 = _field26 = _field28 = _field2A = _field2C = _field2E = _field30 = 0;
+}
+
+void Scene1200::Object1::synchronize(Serializer &s) {
+	SavedObject::synchronize(s);
+
+	s.syncAsSint16LE(_field16);
+	s.syncAsSint16LE(_field26);
+	s.syncAsSint16LE(_field28);
+	s.syncAsSint16LE(_field2A);
+	s.syncAsSint16LE(_field2C);
+	s.syncAsSint16LE(_field2E);
+	s.syncAsSint16LE(_field30);
+}
+
 int Scene1200::Object1::sub51AF8(Common::Point pt) {
-	warning("STUB: sub1AF8()");
-	return 0;
+	if (!_rect1.contains(pt))
+		return -1;
+	
+	int tmp1 = (pt.x - _rect1.left + _field2E) / _field2A;
+	int tmp2 = (pt.y - _rect1.top + _field30) / _field2C;
+
+	if ((tmp1 >= 0) && (tmp2 >= 0) && (_field26 > tmp1) && (_field28 > tmp2))
+		return _field16 + (((_field26 * tmp2) + tmp1)* 2);
+
+	return -1;
 }
 
 
@@ -1119,13 +1143,13 @@ void Scene1200::postInit(SceneObjectList *OwnerList) {
 	_field41A = 0;
 	_field41C = 0;
 
-	if ((R2_GLOBALS._v56AA6 == 1) && (R2_GLOBALS._v56AA8 == 1) && (R2_GLOBALS._v56AA8 == 1))
+	if ((R2_GLOBALS._v56AA6 == 1) && (R2_GLOBALS._v56AA7 == 1) && (R2_GLOBALS._v56AA8 == 1))
 		_field418 = 1;
-	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA8 == 1) && (R2_GLOBALS._v56AA8 == 1))
+	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA7 == 1) && (R2_GLOBALS._v56AA8 == 1))
 		_field418 = 2;
-	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA8 == 1) && (R2_GLOBALS._v56AA8 == 2))
+	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA7 == 1) && (R2_GLOBALS._v56AA8 == 2))
 		_field418 = 3;
-	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA8 == 3) && (R2_GLOBALS._v56AA8 == 1))
+	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA7 == 3) && (R2_GLOBALS._v56AA8 == 1))
 		_field418 = 4;
 
 	R2_GLOBALS._player.postInit();
@@ -1764,7 +1788,7 @@ void Scene1500::dispatch() {
 	if (_sceneMode > 10) {
 		float yDiff = sqrt((float) (_actor3._position.x * _actor3._position.x) + (_actor3._position.y * _actor3._position.y));
 		if (yDiff > 6)
-			_actor3.setPosition(_actor3._position, yDiff);
+			_actor3.setPosition(_actor3._position, (int) yDiff);
 	}
 
 	Scene::dispatch();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 57e62e352c..ec05a83fff 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -145,8 +145,19 @@ class Scene1200 : public SceneExt {
 
 	class Object1 : public SavedObject {
 	public:
-		Rect rect1;
-		Rect rect2;
+		Rect _rect1;
+		Rect _rect2;
+
+		int _field16;
+		int _field26;
+		int _field28;
+		int _field2A;
+		int _field2C;
+		int _field2E;
+		int _field30;
+
+		Object1();
+		void synchronize(Serializer &s);
 
 		int sub51AF8(Common::Point pt);
 		virtual Common::String getClassName() { return "UnkObject1200"; }
-- 
cgit v1.2.3


From 0998c64c20f5e1d24da28531b26f327114bcd57d Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Wed, 11 Jan 2012 23:38:37 +0100
Subject: DREAMWEB: Change selectSaveLoadPage()'s command type to be unique

At Filippos's and wjp's suggestion. I don't really understand what
it does (other than printing the mouse over text), so I had simply
copied and pasted from another function.
---
 engines/dreamweb/saveload.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index b1d2b0aac8..3f2c922feb 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -774,7 +774,7 @@ void DreamWebEngine::checkInput() {
 }
 
 void DreamWebEngine::selectSaveLoadPage() {
-	commandOnlyCond(31, 244);
+	commandOnlyCond(31, 254);
 
 	if (_mouseButton != 1 || _mouseButton == _oldButton)
 		return;
-- 
cgit v1.2.3


From c456d6d29a6c94d1b051456cb9b242b8eda756f7 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Wed, 11 Jan 2012 23:56:20 +0100
Subject: DREAMWEB: Rewrite a comment, since the old one could be misread

I read it as "this is how the original code expects save slots to
be initialized", but I guess it could be read as "the original
engine had 21 save slots". Which it didn't.
---
 engines/dreamweb/saveload.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 3f2c922feb..761ce7696f 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -646,7 +646,9 @@ void DreamWebEngine::loadPosition(unsigned int slot) {
 
 // Count number of save files, and load their descriptions into _saveNames
 uint DreamWebEngine::scanForNames() {
-	// Initialize the first 21 slots (like the original code expects)
+	// There are 21 save slots, each of which are 17 bytes. The first byte
+	// doesn't seem to be used. The name starts at the second byte. All the
+	// slots are initialized to be empty.
 	for (unsigned int slot = 0; slot < 21; ++slot) {
 		_saveNames[17 * slot + 0] = 2;
 		_saveNames[17 * slot + 1] = 0;
-- 
cgit v1.2.3


From 22e00a710fe98b291d7b0972fb32f2b18a37efc8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 13 Jan 2012 02:38:20 +0200
Subject: SCI: Fixed some graphics corruption (black boxes) in the dialogs of
 GK1

---
 engines/sci/graphics/frameout.cpp | 3 ++-
 engines/sci/graphics/text32.cpp   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 7bb4162020..9f150ae507 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -498,7 +498,8 @@ void GfxFrameout::kernelFrameout() {
 		// There is a race condition lurking in SQ6, which causes the game to hang in the intro, when teleporting to Polysorbate LX.
 		// Since I first wrote the patch, the race has stopped occurring for me though.
 		// I'll leave this for investigation later, when someone can reproduce.
-		if (it->pictureId == 0xffff)
+		//if (it->pictureId == 0xffff)	// FIXME: This is what SSCI does, and fixes the intro of LSL7, but breaks the dialogs in GK1 (adds black boxes)
+		if (it->planeBack)
 			_paint32->fillRect(it->planeRect, it->planeBack);
 
 		GuiResourceId planeMainPictureId = it->pictureId;
diff --git a/engines/sci/graphics/text32.cpp b/engines/sci/graphics/text32.cpp
index 000bb691dc..e7595fbdaf 100644
--- a/engines/sci/graphics/text32.cpp
+++ b/engines/sci/graphics/text32.cpp
@@ -175,6 +175,7 @@ void GfxText32::disposeTextBitmap(reg_t hunkId) {
 
 void GfxText32::drawTextBitmap(uint16 x, uint16 y, Common::Rect planeRect, reg_t textObject) {
 	reg_t hunkId = readSelector(_segMan, textObject, SELECTOR(bitmap));
+	uint16 backColor = readSelectorValue(_segMan, textObject, SELECTOR(back));
 	// Sanity check: Check if the hunk is set. If not, either the game scripts
 	// didn't set it, or an old saved game has been loaded, where it wasn't set.
 	if (hunkId.isNull())
@@ -204,7 +205,7 @@ void GfxText32::drawTextBitmap(uint16 x, uint16 y, Common::Rect planeRect, reg_t
 	for (int curY = 0; curY < height; curY++) {
 		for (int curX = 0; curX < width; curX++) {
 			byte pixel = surface[curByte++];
-			if (pixel != skipColor)
+			if (pixel != skipColor && pixel != backColor)
 				_screen->putFontPixel(textY, curX + textX, curY, pixel);
 		}
 	}
-- 
cgit v1.2.3


From df0528e7860fc29b6c4020794479f68e83a8c44f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 13 Jan 2012 22:33:02 +0200
Subject: SCI: Blacklist more unused/debug SCI2.1 kernel functions

---
 engines/sci/engine/kernel_tables.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'engines')

diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h
index fe0c9fc2ef..622511c906 100644
--- a/engines/sci/engine/kernel_tables.h
+++ b/engines/sci/engine/kernel_tables.h
@@ -610,6 +610,12 @@ static SciKernelMapEntry s_kernelMap[] = {
 	{ MAP_DUMMY(DeletePic),         SIG_EVERYWHERE,           "(.*)",                 NULL,            NULL },
 	{ MAP_DUMMY(GetSierraProfileString), SIG_EVERYWHERE,      "(.*)",                 NULL,            NULL },
 
+	// Unused / debug functions in the in-between SCI2.1 interpreters
+	{ MAP_DUMMY(PreloadResource),   SIG_EVERYWHERE,           "(.*)",                 NULL,            NULL },
+	{ MAP_DUMMY(CheckCDisc),        SIG_EVERYWHERE,           "(.*)",                 NULL,            NULL },
+	{ MAP_DUMMY(GetSaveCDisc),      SIG_EVERYWHERE,           "(.*)",                 NULL,            NULL },
+	{ MAP_DUMMY(TestPoly),          SIG_EVERYWHERE,           "(.*)",                 NULL,            NULL },
+
 	// SCI2.1 unmapped functions - TODO!
 
 	// MovePlaneItems - used by SQ6 to scroll through the inventory via the up/down buttons
-- 
cgit v1.2.3


From 29d129747d2d321113f0ad29b6dd8c0734d83048 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 13 Jan 2012 22:46:22 +0200
Subject: SCI: Some more work on kSetShowStyle. Silenced some chatty warnings
 in GK1

---
 engines/sci/engine/kgraphics.cpp | 100 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 88 insertions(+), 12 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 76c6778f0a..eb1d4b636e 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -25,6 +25,7 @@
 #include "engines/util.h"
 #include "graphics/cursorman.h"
 #include "graphics/surface.h"
+#include "graphics/palette.h"	// temporary, for the fadeIn()/fadeOut() functions below
 
 #include "gui/message.h"
 
@@ -1212,7 +1213,8 @@ reg_t kRemapColors(EngineState *s, int argc, reg_t *argv) {
 	switch (operation) {
 	case 0:	{ // Set remapping to base. 0 turns remapping off.
 		int16 base = (argc >= 2) ? argv[1].toSint16() : 0;
-		warning("kRemapColors: Set remapping to base %d", base);
+		if (base != 0)	// 0 is the default behavior when changing rooms in GK1, thus silencing the warning
+			warning("kRemapColors: Set remapping to base %d", base);
 		}
 		break;
 	case 1:	{ // unknown
@@ -1440,6 +1442,46 @@ reg_t kWinHelp(EngineState *s, int argc, reg_t *argv) {
 	return s->r_acc;
 }
 
+// Taken from the SCI16 GfxTransitions class
+static void fadeOut() {
+	byte oldPalette[3 * 256], workPalette[3 * 256];
+	int16 stepNr, colorNr;
+	// Sierra did not fade in/out color 255 for sci1.1, but they used it in
+	//  several pictures (e.g. qfg3 demo/intro), so the fading looked weird
+	int16 tillColorNr = getSciVersion() >= SCI_VERSION_1_1 ? 256 : 255;
+
+	g_system->getPaletteManager()->grabPalette(oldPalette, 0, 256);
+
+	for (stepNr = 100; stepNr >= 0; stepNr -= 10) {
+		for (colorNr = 1; colorNr < tillColorNr; colorNr++) {
+			if (g_sci->_gfxPalette->colorIsFromMacClut(colorNr)) {
+				workPalette[colorNr * 3 + 0] = oldPalette[colorNr * 3];
+				workPalette[colorNr * 3 + 1] = oldPalette[colorNr * 3 + 1];
+				workPalette[colorNr * 3 + 2] = oldPalette[colorNr * 3 + 2];
+			} else {
+				workPalette[colorNr * 3 + 0] = oldPalette[colorNr * 3] * stepNr / 100;
+				workPalette[colorNr * 3 + 1] = oldPalette[colorNr * 3 + 1] * stepNr / 100;
+				workPalette[colorNr * 3 + 2] = oldPalette[colorNr * 3 + 2] * stepNr / 100;
+			}
+		}
+		g_system->getPaletteManager()->setPalette(workPalette + 3, 1, 254);
+		g_sci->getEngineState()->wait(2);
+	}
+}
+
+// Taken from the SCI16 GfxTransitions class
+static void fadeIn() {
+	int16 stepNr;
+	// Sierra did not fade in/out color 255 for sci1.1, but they used it in
+	//  several pictures (e.g. qfg3 demo/intro), so the fading looked weird
+	int16 tillColorNr = getSciVersion() >= SCI_VERSION_1_1 ? 256 : 255;
+
+	for (stepNr = 0; stepNr <= 100; stepNr += 10) {
+		g_sci->_gfxPalette->kernelSetIntensity(1, tillColorNr, stepNr, true);
+		g_sci->getEngineState()->wait(2);
+	}
+}
+
 /**
  * Used for scene transitions, replacing (but reusing parts of) the old
  * transition code.
@@ -1450,31 +1492,65 @@ reg_t kSetShowStyle(EngineState *s, int argc, reg_t *argv) {
 	// tables inside graphics/transitions.cpp
 	uint16 showStyle = argv[0].toUint16();	// 0 - 15
 	reg_t planeObj = argv[1];	// the affected plane
-	//argv[2]	// seconds that the transition lasts
-	//argv[3]	// back color to be used(?)
-	//int16 priority = argv[4].toSint16();
-	//argv[5]	// boolean, animate or not while the transition lasts
-	//argv[6]	// refFrame
+	uint16 seconds = argv[2].toUint16();	// seconds that the transition lasts
+	uint16 backColor =  argv[3].toUint16();	// target back color(?). When fading out, it's 0x0000. When fading in, it's 0xffff
+	int16 priority = argv[4].toSint16();	// always 0xc8 (200) when fading in/out
+	uint16 animate = argv[5].toUint16();	// boolean, animate or not while the transition lasts
+	uint16 refFrame = argv[6].toUint16();	// refFrame, always 0 when fading in/out
+	int16 divisions;
 
 	// If the game has the pFadeArray selector, another parameter is used here,
 	// before the optional last parameter
-	/*bool hasFadeArray = g_sci->getKernel()->findSelector("pFadeArray") > 0;
+	bool hasFadeArray = g_sci->getKernel()->findSelector("pFadeArray") > 0;
 	if (hasFadeArray) {
 		// argv[7]
-		//int16 unk7 = (argc >= 9) ? argv[8].toSint16() : 0;	// divisions (transition steps?)
+		divisions = (argc >= 9) ? argv[8].toSint16() : -1;	// divisions (transition steps?)
 	} else {
-		//int16 unk7 = (argc >= 8) ? argv[7].toSint16() : 0;	// divisions (transition steps?)
-	}*/
+		divisions = (argc >= 8) ? argv[7].toSint16() : -1;	// divisions (transition steps?)
+	}
 
 	if (showStyle > 15) {
 		warning("kSetShowStyle: Illegal style %d for plane %04x:%04x", showStyle, PRINT_REG(planeObj));
 		return s->r_acc;
 	}
 
+	// TODO: Proper implementation. This is a very basic version. I'm not even
+	// sure if the rest of the styles will work with this mechanism.
+
+	// Check if the passed parameters are the ones we expect
+	if (showStyle == 13 || showStyle == 14) {	// fade out / fade in
+		if (seconds != 1)
+			warning("kSetShowStyle(fade): seconds isn't 1, it's %d", seconds);
+		if (backColor != 0 && backColor != 0xFFFF)
+			warning("kSetShowStyle(fade): backColor isn't 0 or 0xFFFF, it's %d", backColor);
+		if (priority != 200)
+			warning("kSetShowStyle(fade): priority isn't 200, it's %d", priority);
+		if (animate != 0)
+			warning("kSetShowStyle(fade): animate isn't 0, it's %d", animate);
+		if (refFrame != 0)
+			warning("kSetShowStyle(fade): refFrame isn't 0, it's %d", refFrame);
+		if (divisions >= 0 && divisions != 20)
+			warning("kSetShowStyle(fade): divisions isn't 20, it's %d", divisions);
+	}
+
 	// TODO: Check if the plane is in the list of planes to draw
 
-	// TODO: This is all a stub/skeleton, thus we're invoking kStub() for now
-	kStub(s, argc, argv);
+	switch (showStyle) {
+	//case 0:	// no transition, perhaps? (like in the previous SCI versions)
+	case 13:	// fade out
+		// TODO: Temporary implementation, which ignores all additional parameters
+		fadeOut();
+		break;
+	case 14:	// fade in
+		// TODO: Temporary implementation, which ignores all additional parameters
+		g_sci->_gfxFrameout->kernelFrameout();	// draw new scene before fading in
+		fadeIn();
+		break;
+	default:
+		// TODO: This is all a stub/skeleton, thus we're invoking kStub() for now
+		kStub(s, argc, argv);
+		break;
+	}
 
 	return s->r_acc;
 }
-- 
cgit v1.2.3


From 9e2f1b6a42622756d1027e3522c5223329ad66ad Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 13 Jan 2012 16:04:09 +0100
Subject: TSAGE: R2R - Preliminar implementation of scene 1550

Also implement a couple of functions used by scene 1200
---
 engines/tsage/globals.cpp                       |   12 +-
 engines/tsage/globals.h                         |    3 +-
 engines/tsage/ringworld2/ringworld2_logic.cpp   |    1 +
 engines/tsage/ringworld2/ringworld2_logic.h     |    1 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 1118 ++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  159 +++-
 engines/tsage/ringworld2/ringworld2_speakers.h  |   10 -
 engines/tsage/staticres.cpp                     |   23 +
 engines/tsage/staticres.h                       |    3 +
 9 files changed, 1306 insertions(+), 24 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 4c9c6de956..1ac426518d 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -416,11 +416,14 @@ void Ringworld2Globals::reset() {
 	_v56AAB = 0;
 	_v57C2C = 0;
 	_v58CE2 = 0;
+	_v565EC[0] = 0;
+	_v565EC[1] = 27;
+	_v565EC[2] = 27;
+	_v565EC[3] = 4;
+	_v565EC[4] = 4;
 	Common::fill(&_v565F1[0], &_v565F1[MAX_CHARACTERS], 1);
 	_speechSubtitles = SPEECH_VOICE | SPEECH_TEXT;
 	_insetUp = 0;
-
-	Common::fill(&_v565F1[0], &_v565F1[MAX_CHARACTERS], 0);
 	Common::fill(&_stripManager_lookupList[0], &_stripManager_lookupList[12], 0);
 	_stripManager_lookupList[0] = 1;
 	_stripManager_lookupList[1] = 1;
@@ -460,8 +463,11 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_v58CE2);
 	s.syncAsSint16LE(_speechSubtitles);
 
+	for (i = 0; i < 5; i++)
+		s.syncAsByte(_v565EC[i]);
+
 	for (i = 0; i < MAX_CHARACTERS; ++i)
-		s.syncAsSint16LE(_v565F1[i]);
+		s.syncAsByte(_v565F1[i]);
 	
 	s.syncAsByte(_v565AE);
 	s.syncAsByte(_v566A8);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 07f5b85e9b..9d00e618a4 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -274,7 +274,8 @@ public:
 	int _v57C2C;
 	int _v58CE2;
 	int _speechSubtitles;
-	int _v565F1[4];
+	byte _v565EC[5];
+	byte _v565F1[4];
 	byte _stripManager_lookupList[12];
 
 	virtual void reset();
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index d7d21154f3..2f537c4ebe 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -117,6 +117,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Cutscene - Elevator
 		return new Scene1530();
 	case 1550:
+		return new Scene1550();
 	case 1575:
 	case 1580:
 	case 1625:
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index bb6aa25f85..9b64063803 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -265,6 +265,7 @@ public:
 	int _state;
 
 	SceneActorExt() { _state = 0; }
+
 	virtual Common::String getClassName() { return "SceneActorExt"; }
 	virtual void synchronize(Serializer &s) {
 		SceneActor::synchronize(s);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 84da3f23f8..34a4d6da0d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1126,6 +1126,40 @@ int Scene1200::Object1::sub51AF8(Common::Point pt) {
 	return -1;
 }
 
+bool Scene1200::Object1::sub51AFD(Common::Point pt) {
+	int retval = false;
+
+	_field2E = pt.x;
+	_field30 = pt.y;
+
+	if (_field2E < _rect2.top) {
+		_field2E = _rect2.top;
+		retval = true;
+	}
+
+	if (_field30 < _rect2.left) {
+		_field30 = _rect2.left;
+		retval = true;
+	}
+
+	if (_field2E + _rect1.width() > _rect2.right) {
+		_field2E = _rect2.right - _rect1.width();
+		retval = true;
+	}
+
+	if (_field30 + _rect1.height() > _rect2.bottom) {
+		_field30 = _rect2.bottom - _rect1.height();
+		retval = true;
+	}
+
+	return retval;
+}
+
+void Scene1200::Object1::sub9EDE8(Rect rect) {
+	_rect1 = rect;
+	warning("FIXME: Scene1200::Object1::sub9EDE8()");
+//	_rect1.clip(g_globals->gfxManager()._bounds);
+}
 
 void Scene1200::postInit(SceneObjectList *OwnerList) {
 	Rect tmpRect;
@@ -1163,9 +1197,10 @@ void Scene1200::postInit(SceneObjectList *OwnerList) {
 	_actor1.hide();
 
 	tmpRect.set(110, 20, 210, 120);
-	warning("_object1.sub9EDE8(tmpRect);");
+	_object1.sub9EDE8(tmpRect);
+
 	warning("_object1.sub51AE9(1);");
-	warning("_object1.sub51AFD(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);");
+	_object1.sub51AFD(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
 	warning("int unk = set_pane_p(_paneNumber);");
 	warning("_object1.sub51B02();");
 	warning("set_pane_p(unk);");
@@ -1572,7 +1607,7 @@ void Scene1200::dispatch() {
 	Rect tmpRect;
 	Scene::dispatch();
 	if (_field41C != 0) {
-		warning("_object1.sub51AFD(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);");
+		_object1.sub51AFD(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
 		warning("int unk = set_pane_p(_paneNumber);");
 		warning("_object1.sub51B02();");
 		warning("_gfxManager.sub294AC(unk);");
@@ -1599,7 +1634,7 @@ void Scene1200::dispatch() {
 		default:
 			break;
 		}
-		warning("_object1.sub51AFD(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);");
+		_object1.sub51AFD(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
 		warning("int unk = set_pane_p(_paneNumber);");
 		warning("_object1.sub51B02();");
 		warning("_gfxManager.sub294AC(unk);");
@@ -1937,6 +1972,1081 @@ void Scene1530::dispatch() {
 	Scene::dispatch();
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1550 -
+ *
+ *--------------------------------------------------------------------------*/
+Scene1550::UnkObj15501::UnkObj15501() {
+	_fieldA4 = _fieldA6 = 0;
+}
+
+void Scene1550::UnkObj15501::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+
+	s.syncAsSint16LE(_fieldA4);
+	s.syncAsSint16LE(_fieldA6);
+}
+
+bool Scene1550::UnkObj15501::startAction(CursorType action, Event &event) {
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (_visage == 1561) {
+			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);
+		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, -999);
+				break;
+			case 3:
+				SceneItem::display(1550, 26, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+				break;
+			case 4:
+				SceneItem::display(1550, 35, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+				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, -999);
+				break;
+			case 1:
+				SceneItem::display(1550, 53, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+				break;
+			case 2:
+				SceneItem::display(1550, 76, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+				break;
+			default:
+				break;
+			}
+		}
+		return true;
+		break;
+	default:
+		return SceneActor::startAction(action, event);
+		break;
+	}
+}
+
+Scene1550::UnkObj15502::UnkObj15502() {
+	_fieldA4 = 0;
+}
+
+void Scene1550::UnkObj15502::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+
+	s.syncAsSint16LE(_fieldA4);
+}
+
+bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (_fieldA4 == 8) {
+			scene->_field412 = 1;
+			R2_GLOBALS._player.disableControl();
+			if (R2_GLOBALS._player._characterIndex == 1)
+				scene->_sceneMode = 1576;
+			else 
+				scene->_sceneMode = 1584;
+			// strcpy(scene->_arrUnkObj15502[7]._actorName, 'hatch');
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_arrUnkObj15502[7], NULL);
+			return true;
+		}
+		return SceneActor::startAction(action, event);
+		break;
+	case CURSOR_LOOK:
+		if (_fieldA4 == 8)
+			SceneItem::display(1550, 75, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		else if (_frame == 1)
+			SceneItem::display(1550, 70, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		else
+			SceneItem::display(1550, 71, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		return true;
+		break;
+	case R2_17:
+		scene->_field412 = 1;
+		if (_fieldA4 == 6) {
+			R2_GLOBALS._player.disableControl();
+			scene->_actor1.postInit();
+			if (R2_GLOBALS._player._characterIndex == 1)
+				scene->_sceneMode = 1574;
+			else
+				scene->_sceneMode = 1582;
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_arrUnkObj15502[5], &scene->_actor1, NULL);
+			return true;
+		}
+		return SceneActor::startAction(action, event);
+		break;
+	case R2_18:
+		scene->_field412 = 1;
+		if (_fieldA4 == 3) {
+			R2_GLOBALS._player.disableControl();
+			scene->_actor1.postInit();
+			if (R2_GLOBALS._player._characterIndex == 1)
+				scene->_sceneMode = 1571;
+			else
+				scene->_sceneMode = 1581;
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_arrUnkObj15502[2], &scene->_actor1, NULL);
+			return true;
+		}
+		return SceneActor::startAction(action, event);
+		break;
+	case R2_22:
+		scene->_field412 = 1;
+		if (_fieldA4 == 1) {
+			R2_GLOBALS._player.disableControl();
+			scene->_actor1.postInit();
+			if (R2_GLOBALS._player._characterIndex == 1)
+				scene->_sceneMode = 1569;
+			else
+				scene->_sceneMode = 1579;
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_arrUnkObj15502[0], &scene->_actor1, NULL);
+			return true;
+		}
+		return SceneActor::startAction(action, event);
+		break;
+	case R2_23:
+		scene->_field412 = 1;
+		if (_fieldA4 == 4) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 1572;
+			scene->_actor1.postInit();
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_arrUnkObj15502[3], &scene->_actor1, NULL);
+			return true;
+		}
+		return SceneActor::startAction(action, event);
+		break;
+	case R2_25:
+		scene->_field412 = 1;
+		if (_fieldA4 == 2) {
+			R2_GLOBALS._player.disableControl();
+			scene->_actor1.postInit();
+			if (R2_GLOBALS._player._characterIndex == 1)
+				scene->_sceneMode = 1570;
+			else
+				scene->_sceneMode = 1580;
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_arrUnkObj15502[1], &scene->_actor1, NULL);
+			return true;
+		}
+		return SceneActor::startAction(action, event);
+		break;
+	case R2_27:
+		scene->_field412 = 1;
+		if (_fieldA4 == 5) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 1573;
+			scene->_actor1.postInit();
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_arrUnkObj15502[4], &scene->_actor1, NULL);
+			return true;
+		}
+		return SceneActor::startAction(action, event);
+		break;
+	case R2_45:
+		scene->_field412 = 1;
+		if (_fieldA4 == 7) {
+			R2_GLOBALS._player.disableControl();
+			scene->_actor1.postInit();
+			if (R2_GLOBALS._player._characterIndex == 1)
+				scene->_sceneMode = 1575;
+			else
+				scene->_sceneMode = 1583;
+			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_arrUnkObj15502[6], &scene->_actor1, NULL);
+			return true;
+		}
+		return SceneActor::startAction(action, event);
+		break;
+	default:
+		return SceneActor::startAction(action, event);
+		break;
+	}
+}
+
+Scene1550::UnkObj15503::UnkObj15503() {
+	_fieldA4 = 0;
+}
+
+void Scene1550::UnkObj15503::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+
+	s.syncAsSint16LE(_fieldA4);
+}
+
+bool Scene1550::UnkObj15503::startAction(CursorType action, Event &event) {
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+	switch (_fieldA4) {
+	case 1:
+		if (scene->_actor13._frame == 5) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 25;
+			if (scene->_actor4._frame == 1) {
+				scene->setAction(&scene->_sequenceManager1, scene, 1560, &scene->_actor4, NULL);
+				R2_GLOBALS.setFlag(20);
+				setFrame(2);
+			} else {
+				scene->setAction(&scene->_sequenceManager1, scene, 1561, &scene->_actor4, NULL);
+				R2_GLOBALS.clearFlag(20);
+				setFrame(1);
+			}
+			scene->_unkArea1.remove();
+		}
+		break;
+	case 2:
+		R2_GLOBALS._player.disableControl();
+		if (scene->_actor13._frame == 1) {
+			scene->_sceneMode = 23;
+			scene->setAction(&scene->_sequenceManager1, scene, 1560, this, NULL);
+		} else {
+			if (scene->_actor4._frame == 1)
+				scene->_sceneMode = 24;
+			else 
+				scene->_sceneMode = 22;
+			scene->setAction(&scene->_sequenceManager1, scene, 1561, this, NULL);
+		}
+	break;
+	default:
+		break;
+	}
+	return true;
+}
+
+void Scene1550::UnkArea1550::remove() {
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+
+	_unkObj155031.remove();
+	_unkObj155032.remove();
+	// sub201EA is a common part with UnkArea1200
+	R2_GLOBALS._sceneItems.remove((SceneItem *)this);
+	_areaActor.remove();
+	SceneArea::remove();
+	R2_GLOBALS._insetUp--;
+	//
+	if ((scene->_sceneMode >= 20) and (scene->_sceneMode <= 29))
+		return;
+	
+	R2_GLOBALS._player.disableControl();
+	if (scene->_actor4._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);
+	}
+}
+void Scene1550::UnkArea1550::proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY) {
+	warning("Scene1550::UnkArea1550::proc12() should be based on Scene1550::UnkArea1200::proc12()");
+}
+
+bool Scene1550::Hotspot1::startAction(CursorType action, Event &event) {
+	return SceneHotspot::startAction(action, event);
+}
+
+bool Scene1550::Hotspot3::startAction(CursorType action, Event &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 == 1) || (R2_GLOBALS._player._characterIndex == 2));
+	// The original contains a debug message when CURSOR_TALK is used.
+	if (action == CURSOR_TALK)
+		warning("Location: %d/%d - %d", R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex], R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2], _v5A4D6[(R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] * 30)] + R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex]);
+
+	return SceneHotspot::startAction(action, event);
+}
+
+bool Scene1550::Actor6::startAction(CursorType action, Event &event) {
+	return SceneActor::startAction(action, event);
+}
+
+bool Scene1550::Actor7::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::Actor8::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->_field412 = 1;
+	if (R2_GLOBALS._player._characterIndex == 1)
+		scene->_sceneMode = 1552;
+	else
+		scene->_sceneMode = 1588;
+	
+	scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor8, NULL);
+	return true;
+}
+
+bool Scene1550::Actor9::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);
+		if (R2_GLOBALS._player._characterIndex == 1)
+			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, -999);
+		return true;
+		break;
+	default:
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene1550::Actor10::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 == 1)
+		scene->_sceneMode = 1555;
+	else
+		scene->_sceneMode = 1589;
+
+	scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor10, NULL);
+	return true;		
+}
+
+bool Scene1550::Actor11::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->_field412 = 1;
+	if (R2_GLOBALS._player._characterIndex == 1)
+		scene->_sceneMode = 1586;
+	else
+		scene->_sceneMode = 1587;
+
+	scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor11, NULL);
+	return true;		
+}
+
+bool Scene1550::Actor12::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 == 2) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 1585;
+		scene->setAction(&scene->_sequenceManager1, scene, 1585, &R2_GLOBALS._player, NULL);
+	} else {
+		R2_GLOBALS._player.disableControl();
+		switch(scene->_field415) {
+		case 0:
+			scene->_actor13.fixPriority(168);
+			scene->_actor4.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->_field415 = 1;
+			scene->_sceneMode = 1563;
+			scene->setAction(&scene->_sequenceManager1, scene, 1563, &R2_GLOBALS._player, &scene->_actor4, NULL);
+			break;
+		default:
+			break;
+		}
+	}
+	return true;
+
+}
+
+bool Scene1550::Actor13::startAction(CursorType action, Event &event) {
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (scene->_field415 != 2)
+			return SceneActor::startAction(action, event);
+		
+		if (R2_INVENTORY.getObjectScene(R2_45) == 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, -999);
+		return true;
+		break;
+	case CURSOR_LOOK:
+		if (scene->_field415 != 2)
+			return SceneActor::startAction(action, event);
+
+		if (R2_INVENTORY.getObjectScene(R2_45) == 1550) {
+			SceneItem::display(1550, 74, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		} else
+			SceneItem::display(1550, 64, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		return true;
+		break;
+	default:
+		return SceneActor::startAction(action, event);
+		break;
+	}
+}
+
+Scene1550::Scene1550() {
+	_field412 = 0;
+	_field414 = 0;
+	_field415 = 0;
+	_field417 = 0;
+	_field419 = 0;
+}
+
+void Scene1550::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+	s.syncAsByte(_field414);
+	s.syncAsSint16LE(_field415);
+	s.syncAsSint16LE(_field417);
+	s.syncAsSint16LE(_field419);
+}
+
+void Scene1550::postInit(SceneObjectList *OwnerList) {
+	if ((R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] == 9) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == 11))
+		loadScene(1234);
+	else
+		loadScene(1550);
+	
+	scalePalette(65, 65, 65);
+	setZoomPercents(30, 75, 170, 100);
+	_field417 = 1550;
+	_field419 = 0;
+	SceneExt::postInit();
+	
+	if (R2_GLOBALS._sceneManager._previousScene == -1)
+		R2_GLOBALS.setFlag(R2_16);
+
+	if ((R2_GLOBALS._player._characterScene[1] != 1550) && (R2_GLOBALS._player._characterScene[1] != 1580)) {
+		R2_GLOBALS._player._characterScene[1] = 1550;
+		R2_GLOBALS._player._characterScene[2] = 1550;
+	}
+	
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+	
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player._effect = 6;
+
+	if (R2_GLOBALS._player._characterIndex == 1)
+		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._v565EC[R2_GLOBALS._player._characterIndex] == 9) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == 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();
+	
+	_field414 = 0;
+	_actor7.changeZoom(-1);
+	R2_GLOBALS._player.changeZoom(-1);
+	
+	switch (R2_GLOBALS._sceneManager._previousScene) {
+	case 1530:
+		R2_GLOBALS._v565AE = 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 1580:
+		if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1580) {
+			R2_GLOBALS._player.disableControl();
+			R2_GLOBALS._player.animate(ANIM_MODE_NONE, NULL);
+			
+			_field412 = 1;
+			
+			_actor1.postInit();
+			warning("_arrUnkObj15502[7].subA5CDF()");
+			_arrUnkObj15502[7].hide();
+			if (R2_GLOBALS._player._characterIndex == 1)
+				_sceneMode = 1577;
+			else
+				_sceneMode = 1578;
+			
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_actor1, &_arrUnkObj15502[7], NULL);
+			R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1550;
+		} else {
+			R2_GLOBALS._player.enableControl();
+		}
+		break;
+	default:
+		break;
+	}
+	warning("subA2B2F();");
+	_item1.setDetails(16, 1550, 10, -1, -1);
+	_item2.setDetails(24, 1550, 10, -1, -1);
+	_item3.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(&_actor7))
+			_actor7.postInit();
+
+		if (R2_GLOBALS._player._characterIndex == 1)
+			_actor7.setVisage(1505);
+		else
+			_actor7.setVisage(1500);
+
+		_actor7.changeZoom(77);
+		_actor7.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
+
+		warning("R2_GLOBALS._walkRegions.enableRegion(R2_GLOBALS._v14A72[_field419]);");
+		setAction(&_sequenceManager1, this, 1590, &_actor7, 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:
+		_field412 = 0;
+		R2_GLOBALS._v56AAB = 0;
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	case 20:
+	// No break on purpose
+	case 21:
+	// No break on purpose
+	case 25:
+	// No break on purpose
+	case 1563:
+		R2_GLOBALS.clearFlag(20);
+		_unkArea1.proc12(1559, 1, 1, 160, 125);
+		R2_GLOBALS._player.enableControl();
+		_sceneMode = 0;
+		break;
+	case 22:
+		_unkArea1.remove();
+		_sceneMode = 24;
+		setAction(&_sequenceManager1, this, 1561, &_actor4, NULL);
+		R2_GLOBALS.clearFlag(20);
+		break;
+	case 23:
+		_unkArea1.remove();
+		_sceneMode = 20;
+		setAction(&_sequenceManager1, this, 1566, &_actor13, &_actor5, NULL);
+		R2_GLOBALS.setFlag(21);
+		break;
+	case 24:
+		_unkArea1.remove();
+		_sceneMode = 21;
+		setAction(&_sequenceManager1, this, 1567, &_actor13, &_actor5, 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(_arrUnkObj15501[0]._position.x, _arrUnkObj15501[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 == 1) {
+			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;
+		warning("TODO: unknown use of arrUnkObj15501[0]._fieldA6");
+		switch (_arrUnkObj15501[0]._frame - 1) {
+		case 0:
+			R2_INVENTORY.setObjectScene(26, R2_GLOBALS._player._characterIndex);
+			break;
+		case 1:
+			R2_INVENTORY.setObjectScene(17, R2_GLOBALS._player._characterIndex);
+			break;
+		case 2:
+			R2_INVENTORY.setObjectScene(22, R2_GLOBALS._player._characterIndex);
+			break;
+		case 3:
+			R2_INVENTORY.setObjectScene(25, R2_GLOBALS._player._characterIndex);
+			break;
+		case 4:
+			R2_INVENTORY.setObjectScene(45, R2_GLOBALS._player._characterIndex);
+			break;
+		case 5:
+			R2_INVENTORY.setObjectScene(28, R2_GLOBALS._player._characterIndex);
+			break;
+		default:
+			break;
+		}
+		_arrUnkObj15501[0].remove();
+		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
+		break;
+	case 43:
+		warning("TODO: unknown use of arrUnkObj15501[0]._fieldA6");
+		if (R2_GLOBALS._player._characterIndex == 1)
+			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:
+		warning("STUB: sub_1D227()");
+		++_sceneMode;
+		setAction(&_sequenceManager1, this, 1591, &R2_GLOBALS._player, NULL);
+		if (g_globals->_sceneObjects->contains(&_actor7))
+			signal();
+		else {
+			_actor7.postInit();
+			if (R2_GLOBALS._player._characterIndex == 1)
+				_actor7.setVisage(1505);
+			else
+				_actor7.setVisage(1500);
+			_actor7.changeZoom(77);
+			_actor7.setAction(&_sequenceManager2, this, 1590, &_actor7, NULL);
+			_actor7.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
+		}
+		break;
+	case 51:
+		++_sceneMode;
+		break;
+	case 52:
+		_actor7.changeZoom(-1);
+		_sceneMode = 1592;
+		if (R2_GLOBALS._player._characterIndex == 1)
+			setAction(&_sequenceManager1, this, 1592, &R2_GLOBALS._player, &_actor7, &_arrUnkObj15501[0], &_actor9, NULL);
+		else
+			setAction(&_sequenceManager1, this, 1593, &R2_GLOBALS._player, &_actor7, &_arrUnkObj15501[0], &_actor9, NULL);
+		break;
+	case 61:
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		R2_GLOBALS._player._canWalk = false;
+		_field415 = 2;
+		break;
+	case 62:
+		R2_GLOBALS._player.enableControl(CURSOR_TALK);
+		if (_field415 == 2) {
+			R2_GLOBALS._player.enableControl(CURSOR_USE);
+			R2_GLOBALS._player._canWalk = false;
+		}
+		break;
+	case 70:
+		R2_GLOBALS._v565EC[2] = R2_GLOBALS._v565EC[1];
+		R2_GLOBALS._v565EC[4] = R2_GLOBALS._v565EC[3];
+		R2_GLOBALS._v565EC[0] = 1;
+		_sceneMode = 60;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(500, this);
+		break;
+	case 80:
+		if (R2_GLOBALS.getFlag(16)) {
+			_sceneMode = 60;
+			R2_GLOBALS._player.disableControl();
+			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+			if (R2_GLOBALS._v565AE >= 3) {
+				if (R2_GLOBALS._player._characterIndex == 1)
+					_stripManager.start(572, this);
+				else
+					_stripManager.start(573, this);
+			} else {
+				++R2_GLOBALS._v565AE;
+				if (R2_GLOBALS._player._characterIndex == 1)
+					_stripManager.start(499 + R2_GLOBALS._v565AE, this);
+				else					
+					_stripManager.start(502 + R2_GLOBALS._v565AE, this);
+			}
+		} else {
+			_sceneMode = 60;
+			R2_GLOBALS._player.disableControl();
+			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+			if (R2_GLOBALS._v565AE >= 4) {
+				if (R2_GLOBALS._player._characterIndex == 1)
+					_stripManager.start(572, this);
+				else
+					_stripManager.start(573, this);
+			} else {
+				++R2_GLOBALS._v565AE;
+				if (R2_GLOBALS._player._characterIndex == 1)
+					_stripManager.start(563 + R2_GLOBALS._v565AE, this);
+				else					
+					_stripManager.start(567 + R2_GLOBALS._v565AE, this);
+			}
+		}
+		break;
+	case 1550:
+		R2_GLOBALS._sceneManager.changeScene(1525);
+		break;
+	case 1552:
+	// No break on purpose
+	case 1588:
+		R2_INVENTORY.setObjectScene(R2_19, R2_GLOBALS._player._characterIndex);
+		_actor8.remove();
+		_field412 = 0;
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1553:
+		R2_GLOBALS._sceneManager.changeScene(1575);
+		break;
+	case 1554:
+		R2_GLOBALS._player.enableControl();
+		_field412 = 0;
+		break;
+	case 1555:
+	// No break on purpose
+	case 1589:
+		R2_INVENTORY.setObjectScene(R2_18, R2_GLOBALS._player._characterIndex);
+		_actor10.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1558:
+		_actor13.fixPriority(124);
+		_field415 = 1;
+		_unkArea1.proc12(1559, 1, 1, 160, 125);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1559:
+		_actor13.fixPriority(168);
+		_actor4.fixPriority(169);
+		R2_GLOBALS._player.fixPriority(-1);
+		R2_GLOBALS._player.changeZoom(-1);
+		_field415 = 0;
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1562:
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+		_field415 = 2;
+		break;
+	case 1564:
+		R2_INVENTORY.setObjectScene(R2_45, 1);
+		_sceneMode = 1565;
+		setAction(&_sequenceManager1, this, 1565, &R2_GLOBALS._player, NULL);
+		break;
+	case 1565:
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		R2_GLOBALS._player._canWalk = false;
+		break;
+	case 1569:
+	// No break on purpose
+	case 1579:
+		_field412 = 0;
+		_actor1.remove();
+		R2_INVENTORY.setObjectScene(R2_22, 0);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1570:
+	// No break on purpose
+	case 1580:
+		_field412 = 0;
+		_actor1.remove();
+		R2_INVENTORY.setObjectScene(R2_25, 0);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1571:
+	// No break on purpose
+	case 1581:
+		_field412 = 0;
+		_actor1.remove();
+		R2_INVENTORY.setObjectScene(R2_18, 0);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1572:
+		_field412 = 0;
+		_actor1.remove();
+		R2_INVENTORY.setObjectScene(R2_23, 0);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1573:
+		_field412 = 0;
+		_actor1.remove();
+		R2_INVENTORY.setObjectScene(R2_27, 0);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1574:
+	// No break on purpose
+	case 1582:
+		_field412 = 0;
+		_actor1.remove();
+		R2_INVENTORY.setObjectScene(R2_17, 0);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1575:
+	// No break on purpose
+	case 1583:
+		_field412 = 0;
+		_actor1.remove();
+		R2_INVENTORY.setObjectScene(R2_45, 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;
+		_actor1.remove();
+		_field412 = 0;
+		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, -999);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1586:
+	// No break on purpose
+	case 1587:
+		R2_INVENTORY.setObjectScene(R2_28, R2_GLOBALS._player._characterIndex);
+		_actor1.remove();
+		_field412 = 0;
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1592:
+		_actor9.remove();
+		R2_INVENTORY.setObjectScene(R2_26, 1);
+		if (R2_GLOBALS._player._characterIndex == 1) {
+			R2_GLOBALS._v565EC[2] = R2_GLOBALS._v565EC[1];
+			R2_GLOBALS._v565EC[4] = R2_GLOBALS._v565EC[3];
+		} else {
+			R2_GLOBALS._v565EC[1] = R2_GLOBALS._v565EC[2];
+			R2_GLOBALS._v565EC[3] = R2_GLOBALS._v565EC[4];
+		}
+		R2_GLOBALS._player.enableControl();
+		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 = 0;
+		if (curReg = R2_GLOBALS._sceneRegions.indexOf(event.mousePos) == 0)
+			_field412 = 1;
+		else if (((R2_GLOBALS._player._position.y < 90) && (event.mousePos.y > 90)) || ((R2_GLOBALS._player._position.y > 90) && (event.mousePos.y < 90)))
+			_field412 = 1;
+		else
+			_field412 = 0;
+		
+		if ((curReg == 13) || (curReg == 14))
+			_field412 = 0;
+	}
+	
+	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 == 1) || (R2_GLOBALS._player._characterIndex == 2));
+
+	if ((R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] == 15) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == 16)) {
+		R2_GLOBALS._player._shade = 0;
+		// Original game contains a switch based on an uninitialised variable.
+		// Until we understand what should really happen there, this code is unused on purpose
+		int missingVariable = 0;
+		switch (missingVariable) {
+		case 144:
+		// No break on purpose
+		case 146:
+			_actor13._frame = 5;
+			R2_GLOBALS._player._shade = 3;
+			break;
+		case 148:
+		// No break on purpose
+		case 149:
+			_actor13._frame = 1;
+		// No break on purpose
+		case 147:
+		// No break on purpose
+		case 150:
+			R2_GLOBALS._player._shade = 3;
+			break;
+		default:
+			break;
+		}
+	}
+	
+	if (_field412 != 0)
+		return;
+	
+	switch (R2_GLOBALS._player.getRegionIndex() - 11) {
+	case 0:
+	// No break on purpose
+	case 5:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1;
+		_field412 = 1;
+		--R2_GLOBALS._v565EC[2 + R2_GLOBALS._player._characterIndex];
+		warning("subA2B2F();");
+		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:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 3;
+		_field412 = 1;
+		++R2_GLOBALS._v565EC[2 + R2_GLOBALS._player._characterIndex];
+		warning("subA2B2F();");
+		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:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 5;
+		_field412 = 1;
+		++R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex];
+		warning("subA2B2F();");
+		if ((R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] == 9) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == 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:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 7;
+		_field412 = 1;
+		--R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex];
+		if ((R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] == 24) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == 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._v565EC[R2_GLOBALS._player._characterIndex] == 9) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == 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 == 3)
+		R2_GLOBALS._sound1.fadeOut2(NULL);
+	
+	SceneExt::saveCharacter(characterIndex);
+}
 
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index ec05a83fff..6d2bd3b084 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -59,15 +59,15 @@ public:
 class Scene1100 : public SceneExt {
 	class Actor16 : public SceneActor {
 	public:
-		bool startAction(CursorType action, Event &event);
+		virtual bool startAction(CursorType action, Event &event);
 	};
 	class Actor17 : public SceneActor {
 	public:
-		bool startAction(CursorType action, Event &event);
+		virtual bool startAction(CursorType action, Event &event);
 	};
 	class Actor18 : public SceneActor {
 	public:
-		bool startAction(CursorType action, Event &event);
+		virtual bool startAction(CursorType action, Event &event);
 	};
 
 public:
@@ -123,7 +123,7 @@ class Scene1200 : public SceneExt {
 		class Actor3 : public SceneActorExt {
 		public:
 			void init(int state);
-			bool startAction(CursorType action, Event &event);
+			virtual bool startAction(CursorType action, Event &event);
 		};
 
 		SceneActor _actor2;
@@ -160,6 +160,8 @@ class Scene1200 : public SceneExt {
 		void synchronize(Serializer &s);
 
 		int sub51AF8(Common::Point pt);
+		bool sub51AFD(Common::Point pt);
+		void sub9EDE8(Rect rect);
 		virtual Common::String getClassName() { return "UnkObject1200"; }
 	};
 		
@@ -211,8 +213,8 @@ public:
 
 class Scene1530 : public SceneExt {
 public:
-	SpeakerQuinn1530 _quinnSpeaker;
-	SpeakerSeeker1530 _seekerSpeaker;
+	SpeakerQuinn _quinnSpeaker;
+	SpeakerSeeker _seekerSpeaker;
 	SceneActor _actor1;
 	SceneActor _actor2;
 	SceneActor _actor3;
@@ -223,6 +225,151 @@ public:
 	virtual void signal();
 	virtual void dispatch();
 };
+
+class Scene1550 : public SceneExt {
+	class UnkObj15501 : public SceneActor {
+	public:
+		int _fieldA4;
+		int _fieldA6;
+
+		UnkObj15501();
+		void synchronize(Serializer &s);
+
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class UnkObj15502 : public SceneActor {
+	public:
+		int _fieldA4;
+
+		UnkObj15502();
+		void synchronize(Serializer &s);
+
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class UnkObj15503 : public SceneActor {
+	public:
+		int _fieldA4;
+
+		UnkObj15503();
+		void synchronize(Serializer &s);
+
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class UnkArea1550 : public SceneArea {
+	public:
+		byte _field20;
+		SceneActor _areaActor;
+		UnkObj15503 _unkObj155031;
+		UnkObj15503 _unkObj155032;
+
+		virtual void remove();
+		virtual void proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY);
+	};
+
+	class Hotspot1 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Hotspot3 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor6 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor7 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor8 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor9 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor10 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor11 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor12 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor13 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor14 : public SceneActor {
+		// Nothing specific found in the original
+		// TODO: check if it's an useless class
+	};
+
+public:
+	SpeakerQuinn _quinnSpeaker;
+	SpeakerSeeker _seekerSpeaker;
+	Hotspot1 _item1;
+	Hotspot1 _item2;
+	Hotspot3 _item3;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	Actor6 _actor6;
+	Actor7 _actor7;
+	Actor8 _actor8;
+	Actor9 _actor9;
+	Actor10 _actor10;
+	Actor11 _actor11;
+	Actor12 _actor12;
+	Actor13 _actor13;
+	UnkObj15501 _arrUnkObj15501[8];
+	Actor14 _actor14;
+	Actor14 _actor15;
+	Actor14 _actor16;
+	Actor14 _actor17;
+	Actor14 _actor18;
+	Actor14 _actor19;
+	UnkObj15502 _arrUnkObj15502[8];
+	UnkArea1550 _unkArea1;
+	SequenceManager _sequenceManager1;
+	SequenceManager _sequenceManager2;
+
+	int _field412;
+	byte _field414;
+	int _field415;
+	int _field417;
+	int _field419;
+
+	Scene1550();
+	void synchronize(Serializer &s);
+
+	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
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 49ac9f555f..13c770a4a3 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -269,11 +269,6 @@ public:
 	virtual void proc15();
 };
 
-class SpeakerQuinn1530 : public SpeakerQuinn {
-public:
-	virtual Common::String getClassName() { return "SpeakerQuinn1530"; }
-};
-
 class SpeakerQuinn2435 : public SpeakerQuinn {
 public:
 	virtual Common::String getClassName() { return "SpeakerQuinn2435"; }
@@ -412,11 +407,6 @@ public:
 	virtual void proc15();
 };
 
-class SpeakerSeeker1530 : public SpeakerSeeker {
-public:
-	virtual Common::String getClassName() { return "SpeakerSeeker1530"; }
-};
-
 class SpeakerSeeker2435 : public SpeakerSeeker {
 public:
 	virtual Common::String getClassName() { return "SpeakerSeeker2435"; }
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index cc93c4f35f..1251b6d262 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -237,6 +237,29 @@ char const *const F7 = "F7";
 char const *const F8 = "F8";
 char const *const F10 = "F10";
 
+const byte _v5A4D6[] = {
+	2,  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,  3,
+	16, 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,  18,
+	17, 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,  19,
+	7,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  12,
+	0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0,  0,  0,  12,
+	6,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  10, 0,  0,  0,  0,  0,  0,  0,  0,  0,  12,
+	11, 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,  12,
+	11, 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,  12,
+	11, 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,  12,
+	11, 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,  12,
+	11, 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,  12,
+	11, 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,  12,
+	11, 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,  12,
+	11, 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,  12,
+	11, 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,  12,
+	11, 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,  12,
+	11, 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,  12,
+	11, 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,  12,
+	11, 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,  12,
+	13, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14
+};
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index 5b6f4393c4..ae2aa28aeb 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -190,6 +190,9 @@ extern char const *const F7;
 extern char const *const F8;
 extern char const *const F10;
 
+// Scene 1550 map
+extern const byte _v5A4D6[];
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
-- 
cgit v1.2.3


From 1a12d24981678ede9e708cb441d44d9fe0964808 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 13 Jan 2012 22:18:42 +0100
Subject: TSAGE: R2R - Silent warning

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 34a4d6da0d..45aec17fbf 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2886,8 +2886,8 @@ void Scene1550::signal() {
 
 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 = 0;
-		if (curReg = R2_GLOBALS._sceneRegions.indexOf(event.mousePos) == 0)
+		int curReg = R2_GLOBALS._sceneRegions.indexOf(event.mousePos);
+		if (curReg == 0)
 			_field412 = 1;
 		else if (((R2_GLOBALS._player._position.y < 90) && (event.mousePos.y > 90)) || ((R2_GLOBALS._player._position.y > 90) && (event.mousePos.y < 90)))
 			_field412 = 1;
-- 
cgit v1.2.3


From 4594982ce323d323092927fd336a98dd5acdb11c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 14 Jan 2012 00:21:55 +0200
Subject: SCI: Fix bug in fadeIn()/fadeOut()

This wasn't added in 4742b4d728ba772d47cc497681c9bfb0144475bc)
---
 engines/sci/engine/kgraphics.cpp     | 10 +++++-----
 engines/sci/graphics/transitions.cpp | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index eb1d4b636e..cfeaaaa803 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -1448,12 +1448,12 @@ static void fadeOut() {
 	int16 stepNr, colorNr;
 	// Sierra did not fade in/out color 255 for sci1.1, but they used it in
 	//  several pictures (e.g. qfg3 demo/intro), so the fading looked weird
-	int16 tillColorNr = getSciVersion() >= SCI_VERSION_1_1 ? 256 : 255;
+	int16 tillColorNr = getSciVersion() >= SCI_VERSION_1_1 ? 255 : 254;
 
 	g_system->getPaletteManager()->grabPalette(oldPalette, 0, 256);
 
 	for (stepNr = 100; stepNr >= 0; stepNr -= 10) {
-		for (colorNr = 1; colorNr < tillColorNr; colorNr++) {
+		for (colorNr = 1; colorNr <= tillColorNr; colorNr++) {
 			if (g_sci->_gfxPalette->colorIsFromMacClut(colorNr)) {
 				workPalette[colorNr * 3 + 0] = oldPalette[colorNr * 3];
 				workPalette[colorNr * 3 + 1] = oldPalette[colorNr * 3 + 1];
@@ -1464,7 +1464,7 @@ static void fadeOut() {
 				workPalette[colorNr * 3 + 2] = oldPalette[colorNr * 3 + 2] * stepNr / 100;
 			}
 		}
-		g_system->getPaletteManager()->setPalette(workPalette + 3, 1, 254);
+		g_system->getPaletteManager()->setPalette(workPalette + 3, 1, tillColorNr);
 		g_sci->getEngineState()->wait(2);
 	}
 }
@@ -1474,10 +1474,10 @@ static void fadeIn() {
 	int16 stepNr;
 	// Sierra did not fade in/out color 255 for sci1.1, but they used it in
 	//  several pictures (e.g. qfg3 demo/intro), so the fading looked weird
-	int16 tillColorNr = getSciVersion() >= SCI_VERSION_1_1 ? 256 : 255;
+	int16 tillColorNr = getSciVersion() >= SCI_VERSION_1_1 ? 255 : 254;
 
 	for (stepNr = 0; stepNr <= 100; stepNr += 10) {
-		g_sci->_gfxPalette->kernelSetIntensity(1, tillColorNr, stepNr, true);
+		g_sci->_gfxPalette->kernelSetIntensity(1, tillColorNr + 1, stepNr, true);
 		g_sci->getEngineState()->wait(2);
 	}
 }
diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp
index d047eb10a1..438cf376a5 100644
--- a/engines/sci/graphics/transitions.cpp
+++ b/engines/sci/graphics/transitions.cpp
@@ -295,12 +295,12 @@ void GfxTransitions::fadeOut() {
 	int16 stepNr, colorNr;
 	// Sierra did not fade in/out color 255 for sci1.1, but they used it in
 	//  several pictures (e.g. qfg3 demo/intro), so the fading looked weird
-	int16 tillColorNr = getSciVersion() >= SCI_VERSION_1_1 ? 256 : 255;
+	int16 tillColorNr = getSciVersion() >= SCI_VERSION_1_1 ? 255 : 254;
 
 	g_system->getPaletteManager()->grabPalette(oldPalette, 0, 256);
 
 	for (stepNr = 100; stepNr >= 0; stepNr -= 10) {
-		for (colorNr = 1; colorNr < tillColorNr; colorNr++) {
+		for (colorNr = 1; colorNr <= tillColorNr; colorNr++) {
 			if (_palette->colorIsFromMacClut(colorNr)) {
 				workPalette[colorNr * 3 + 0] = oldPalette[colorNr * 3];
 				workPalette[colorNr * 3 + 1] = oldPalette[colorNr * 3 + 1];
@@ -311,7 +311,7 @@ void GfxTransitions::fadeOut() {
 				workPalette[colorNr * 3 + 2] = oldPalette[colorNr * 3 + 2] * stepNr / 100;
 			}
 		}
-		g_system->getPaletteManager()->setPalette(workPalette + 3, 1, 254);
+		g_system->getPaletteManager()->setPalette(workPalette + 3, 1, tillColorNr);
 		g_sci->getEngineState()->wait(2);
 	}
 }
@@ -322,10 +322,10 @@ void GfxTransitions::fadeIn() {
 	int16 stepNr;
 	// Sierra did not fade in/out color 255 for sci1.1, but they used it in
 	//  several pictures (e.g. qfg3 demo/intro), so the fading looked weird
-	int16 tillColorNr = getSciVersion() >= SCI_VERSION_1_1 ? 256 : 255;
+	int16 tillColorNr = getSciVersion() >= SCI_VERSION_1_1 ? 255 : 254;
 
 	for (stepNr = 0; stepNr <= 100; stepNr += 10) {
-		_palette->kernelSetIntensity(1, tillColorNr, stepNr, true);
+		_palette->kernelSetIntensity(1, tillColorNr + 1, stepNr, true);
 		g_sci->getEngineState()->wait(2);
 	}
 }
-- 
cgit v1.2.3


From 28d5922ccaf909dc52688d41da255dff44078a35 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 14 Jan 2012 09:25:52 +0100
Subject: SCUMM: Fix workaround for Dig spider lair sound glitch

The soundKludge() function assumes there are always 8 parameters
for Digital iMUSE script commands.
---
 engines/scumm/script.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index c9e3edd728..37ea3a9a9f 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -943,7 +943,7 @@ void ScummEngine::runExitScript() {
 	// effect is also used in room 33, so let's do the same fade out that it
 	// does in that room's exit script.
 	if (_game.id == GID_DIG && _currentRoom == 44) {
-		int scriptCmds[] = { 14, 215, 0x600, 0, 30 };
+		int scriptCmds[] = { 14, 215, 0x600, 0, 30, 0, 0, 0 };
 		_sound->soundKludge(scriptCmds, ARRAYSIZE(scriptCmds));
 	}
 #endif
-- 
cgit v1.2.3


From 20bcb0545e72e784b0369d005314fef39432818c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 14 Jan 2012 14:22:23 +0200
Subject: SCI: When deleting a plane, also delete the items in it

This fixes a crash in GK1 day 2, after using the thermostat outside
Mosely's office
---
 engines/sci/graphics/frameout.cpp | 18 ++++++++++++++++--
 engines/sci/graphics/frameout.h   |  1 +
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 9f150ae507..1402dc9e4d 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -101,7 +101,7 @@ void GfxFrameout::kernelAddPlane(reg_t object) {
 }
 
 void GfxFrameout::kernelUpdatePlane(reg_t object) {
-	for (PlaneList::iterator it = _planes.begin(); it != _planes.end(); it++) {
+	for (PlaneList::iterator it = _planes.begin(); it != _planes.end(); ++it) {
 		if (it->object == object) {
 			// Read some information
 			it->priority = readSelectorValue(_segMan, object, SELECTOR(priority));
@@ -178,8 +178,10 @@ void GfxFrameout::kernelUpdatePlane(reg_t object) {
 }
 
 void GfxFrameout::kernelDeletePlane(reg_t object) {
+	deletePlaneItems(object);
 	deletePlanePictures(object);
-	for (PlaneList::iterator it = _planes.begin(); it != _planes.end(); it++) {
+
+	for (PlaneList::iterator it = _planes.begin(); it != _planes.end(); ++it) {
 		if (it->object == object) {
 			_planes.erase(it);
 			Common::Rect planeRect;
@@ -276,6 +278,18 @@ void GfxFrameout::kernelDeleteScreenItem(reg_t object) {
 	_screenItems.remove(itemEntry);
 }
 
+void GfxFrameout::deletePlaneItems(reg_t planeObject) {
+	FrameoutList::iterator listIterator = _screenItems.begin();
+
+	while (listIterator != _screenItems.end()) {
+		reg_t itemPlane = readSelector(_segMan, (*listIterator)->object, SELECTOR(plane));
+		if (planeObject == itemPlane)
+			listIterator = _screenItems.erase(listIterator);
+		else
+			++listIterator;
+	}
+}
+
 FrameoutEntry *GfxFrameout::findScreenItem(reg_t object) {
 	for (FrameoutList::iterator listIterator = _screenItems.begin(); listIterator != _screenItems.end(); listIterator++) {
 		FrameoutEntry *itemEntry = *listIterator;
diff --git a/engines/sci/graphics/frameout.h b/engines/sci/graphics/frameout.h
index a4a0a853e4..8c3cc261d5 100644
--- a/engines/sci/graphics/frameout.h
+++ b/engines/sci/graphics/frameout.h
@@ -94,6 +94,7 @@ public:
 	void kernelAddScreenItem(reg_t object);
 	void kernelUpdateScreenItem(reg_t object);
 	void kernelDeleteScreenItem(reg_t object);
+	void deletePlaneItems(reg_t planeObject);
 	FrameoutEntry *findScreenItem(reg_t object);
 	int16 kernelGetHighPlanePri();
 	void kernelAddPicAt(reg_t planeObj, GuiResourceId pictureId, int16 pictureX, int16 pictureY);
-- 
cgit v1.2.3


From bf6c42d816bd8e6f87c4ecb7459bafcecaf0d010 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 14 Jan 2012 16:37:07 +0200
Subject: SCI: Don't clip the plane rectangle in kernelDeletePlane()

The actual cause for this clipping has been fixed
---
 engines/sci/graphics/frameout.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 1402dc9e4d..e3fac80f7c 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -195,10 +195,6 @@ void GfxFrameout::kernelDeletePlane(reg_t object) {
 			planeRect.left = (planeRect.left * screenRect.width()) / _scriptsRunningWidth;
 			planeRect.bottom = (planeRect.bottom * screenRect.height()) / _scriptsRunningHeight;
 			planeRect.right = (planeRect.right * screenRect.width()) / _scriptsRunningWidth;
-			planeRect.clip(screenRect); // we need to do this, at least in gk1 on cemetary we get bottom right -> 201, 321
-			// FIXME: The code above incorrectly added 1 pixel to the plane's
-			// bottom and right, so probably the plane clipping code is no
-			// longer necessary
 			// Blackout removed plane rect
 			_paint32->fillRect(planeRect, 0);
 			return;
-- 
cgit v1.2.3


From c805e5f5dc71fda908218e049b81b4080919f93e Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 14 Jan 2012 16:39:24 +0100
Subject: KYRA: Fix missing debug commands.

This is a regression from cfac223cee7cc8136fdf43dea1465a1b060a803b.
---
 engines/kyra/debugger.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index 95c6162c36..6514984b93 100644
--- a/engines/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
@@ -205,6 +205,7 @@ void Debugger_LoK::initialize() {
 	DCmd_Register("scenes",             WRAP_METHOD(Debugger_LoK, cmd_listScenes));
 	DCmd_Register("give",               WRAP_METHOD(Debugger_LoK, cmd_giveItem));
 	DCmd_Register("birthstones",        WRAP_METHOD(Debugger_LoK, cmd_listBirthstones));
+	Debugger::initialize();
 }
 
 bool Debugger_LoK::cmd_enterRoom(int argc, const char **argv) {
@@ -295,6 +296,7 @@ void Debugger_v2::initialize() {
 	DCmd_Register("scene_info",         WRAP_METHOD(Debugger_v2, cmd_sceneInfo));
 	DCmd_Register("scene_to_facing",    WRAP_METHOD(Debugger_v2, cmd_sceneToFacing));
 	DCmd_Register("give",               WRAP_METHOD(Debugger_v2, cmd_giveItem));
+	Debugger::initialize();
 }
 
 bool Debugger_v2::cmd_enterScene(int argc, const char **argv) {
@@ -445,6 +447,7 @@ Debugger_HoF::Debugger_HoF(KyraEngine_HoF *vm) : Debugger_v2(vm), _vm(vm) {
 
 void Debugger_HoF::initialize() {
 	DCmd_Register("pass_codes",         WRAP_METHOD(Debugger_HoF, cmd_passcodes));
+	Debugger_v2::initialize();
 }
 
 bool Debugger_HoF::cmd_passcodes(int argc, const char **argv) {
-- 
cgit v1.2.3


From 6a3d0e712940bf4560e5302c40f07f5f6eb8e0aa Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 14 Jan 2012 16:44:30 +0100
Subject: KYRA: Make workaround for bug #1498221 work again.

The bug in question is "KYRA1: Glitches when meeting Zanthia".

This is a regression from 0af418e7ea3a41f93fcc551a45ee5bae822d812a as far as
I can tell.
---
 engines/kyra/kyra_lok.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index c195f0275a..74db67d22b 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -510,7 +510,14 @@ void KyraEngine_LoK::delay(uint32 amount, bool update, bool isMainLoop) {
 			updateTextFade();
 			updateMousePointer();
 		} else {
-			_screen->updateScreen();
+			// We call OSystem::updateScreen here and not Screen::updateScreen
+			// to avoid new graphics changes to be copied to the screen.
+			// This assures the workaround of bug #1498221
+			// "KYRA1: Glitches when meeting Zanthia" is working correctly.
+			// Since we only call updateScreen here to let systems with frame
+			// update count limitations not miss any graphics updates it
+			// should not cause any problems.
+			_system->updateScreen();
 		}
 
 		_isSaveAllowed = isMainLoop;
-- 
cgit v1.2.3


From ce0061d9e008bc739afd327584cbea155f9eb5bc Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 14 Jan 2012 21:01:48 +0200
Subject: SCI: Add a script patch to fix a script bug in GK1 floppy

This bug leads to a crash after Gabriel interrogates people, and is
caused by incorrect ordering in two checks, which was fixed in the CD
version
---
 engines/sci/engine/script_patches.cpp | 62 ++++++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 7efcb42f4b..187f1ce021 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -366,7 +366,7 @@ const uint16 freddypharkasPatchLadderEvent[] = {
 //    script, description,                                      magic DWORD,                                  adjust
 const SciScriptSignature freddypharkasSignatures[] = {
 	{      0, "CD: score early disposal",                    1, PATCH_MAGICDWORD(0x39, 0x0d, 0x43, 0x75),    -3, freddypharkasSignatureScoreDisposal, freddypharkasPatchScoreDisposal },
-	{    235, "CD: canister pickup hang",                   3, PATCH_MAGICDWORD(0x39, 0x07, 0x39, 0x08),    -4, freddypharkasSignatureCanisterHang, freddypharkasPatchCanisterHang },
+	{    235, "CD: canister pickup hang",                   3, PATCH_MAGICDWORD(0x39, 0x07, 0x39, 0x08),     -4, freddypharkasSignatureCanisterHang,  freddypharkasPatchCanisterHang },
 	{    320, "ladder event issue",                          2, PATCH_MAGICDWORD(0x6d, 0x76, 0x38, 0xf5),    -1, freddypharkasSignatureLadderEvent,   freddypharkasPatchLadderEvent },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };
@@ -437,8 +437,68 @@ const uint16 gk1PatchDay5PhoneFreeze[] = {
 	PATCH_END
 };
 
+// Floppy version: Interrogation::dispose() compares an object reference
+// (stored in the view selector) with a number, leading to a crash (this kind
+// of comparison was not used in SCI32). The view selector is used to store
+// both a view number (in some cases), and a view reference (in other cases).
+// In the floppy version, the checks are in the wrong order, so there is a
+// comparison between a number an an object. In the CD version, the checks are
+// in the correct order, thus the comparison is correct, thus we use the code
+// from the CD version in the floppy one.
+const byte gk1SignatureInterrogationBug[] = {
+	43,
+	0x65, 0x4c,        // aTop 4c
+	0x67, 0x50,        // pTos 50
+	0x34, 0x10, 0x27,  // ldi 2710
+	0x1e,              // gt?
+	0x31, 0x08,        // bnt 08  [05a0]
+	0x67, 0x50,        // pTos 50
+	0x34, 0x10, 0x27,  // ldi 2710
+	0x04,              // sub
+	0x65, 0x50,        // aTop 50
+	0x63, 0x50,        // pToa 50
+	0x31, 0x15,        // bnt 15  [05b9]
+	0x39, 0x0e,        // pushi 0e
+	0x76,              // push0
+	0x4a, 0x04, 0x00,  // send 0004
+	0xa5, 0x00,        // sat 00
+	0x38, 0x93, 0x00,  // pushi 0093
+	0x76,              // push0
+	0x63, 0x50,        // pToa 50
+	0x4a, 0x04, 0x00,  // send 0004
+	0x85, 0x00,        // lat 00
+	0x65, 0x50,        // aTop 50
+	0
+};
+
+const uint16 gk1PatchInterrogationBug[] = {
+	0x65, 0x4c,        // aTop 4c
+	0x63, 0x50,        // pToa 50
+	0x31, 0x15,        // bnt 15  [05b9]
+	0x39, 0x0e,        // pushi 0e
+	0x76,              // push0
+	0x4a, 0x04, 0x00,  // send 0004
+	0xa5, 0x00,        // sat 00
+	0x38, 0x93, 0x00,  // pushi 0093
+	0x76,              // push0
+	0x63, 0x50,        // pToa 50
+	0x4a, 0x04, 0x00,  // send 0004
+	0x85, 0x00,        // lat 00
+	0x65, 0x50,        // aTop 50
+	0x67, 0x50,        // pTos 50
+	0x34, 0x10, 0x27,  // ldi 2710
+	0x1e,              // gt?
+	0x31, 0x08,        // bnt 08  [05b9]
+	0x67, 0x50,        // pTos 50
+	0x34, 0x10, 0x27,  // ldi 2710
+	0x04,              // sub
+	0x65, 0x50,        // aTop 50
+	PATCH_END
+};
+
 //    script, description,                                      magic DWORD,                                 adjust
 const SciScriptSignature gk1Signatures[] = {
+	{     51, "interrogation bug",                           1, PATCH_MAGICDWORD(0x65, 0x4c, 0x67, 0x50),     0, gk1SignatureInterrogationBug, gk1PatchInterrogationBug },
 	{    212, "day 5 phone freeze",                          1, PATCH_MAGICDWORD(0x35, 0x03, 0x65, 0x1a),     0, gk1SignatureDay5PhoneFreeze, gk1PatchDay5PhoneFreeze },
 	{    230, "day 6 police beignet timer issue",            1, PATCH_MAGICDWORD(0x34, 0xdc, 0x00, 0x65),   -16, gk1SignatureDay6PoliceBeignet, gk1PatchDay6PoliceBeignet },
 	{    230, "day 6 police sleep timer issue",              1, PATCH_MAGICDWORD(0x34, 0xdc, 0x00, 0x65),    -5, gk1SignatureDay6PoliceSleep, gk1PatchDay6PoliceSleep },
-- 
cgit v1.2.3


From 6530da3feb294eaad413635e819286495fc017a3 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 14 Jan 2012 23:58:59 +0100
Subject: LURE: Move readByte() call out of assert()

---
 engines/lure/hotspots.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index 2f6d0f23aa..c7e7e81900 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -2334,9 +2334,11 @@ void Hotspot::saveToStream(Common::WriteStream *stream) {
 void Hotspot::loadFromStream(Common::ReadStream *stream) {
 	if (_data)
 		_data->npcSchedule.loadFromStream(stream);
-	else
+	else {
 		// Dummy read of terminator for empty actions list
-		assert(stream->readByte() == 0xff);
+		byte dummy = stream->readByte();
+		assert(dummy == 0xff);
+	}
 
 	_pathFinder.loadFromStream(stream);
 
-- 
cgit v1.2.3


From 16f2c5cdb699906379016e95f9bf2ceac50980b1 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 15 Jan 2012 00:04:28 +0100
Subject: DRACI: Move readByte() and readUint32LE() out of assert()

---
 engines/draci/barchive.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/draci/barchive.cpp b/engines/draci/barchive.cpp
index 154073250c..31dfe62dee 100644
--- a/engines/draci/barchive.cpp
+++ b/engines/draci/barchive.cpp
@@ -212,7 +212,8 @@ void BArchive::openArchive(const Common::String &path) {
 
 		_files[i]._offset = fileOffset;				// Offset of file from start
 
-		assert(_f.readByte() == 0 &&
+		byte compressionType = _f.readByte();
+		assert(compressionType == 0 &&
 			"Compression type flag is non-zero (file is compressed)");
 
 		_files[i]._crc = _f.readByte(); 	// CRC checksum of the file
@@ -221,7 +222,8 @@ void BArchive::openArchive(const Common::String &path) {
 	}
 
 	// Last footer item should be equal to footerOffset
-	assert(reader.readUint32LE() == footerOffset && "Footer offset mismatch");
+	uint32 footerOffset2 = reader.readUint32LE();
+	assert(footerOffset2 == footerOffset && "Footer offset mismatch");
 
 	// Indicate that the archive has been successfully opened
 	_opened = true;
-- 
cgit v1.2.3


From d355c536c4d3dea4ff61288d8ac85ab071451825 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 15 Jan 2012 01:13:03 +0100
Subject: KYRA: (EOB) - add support for original save game files

The engine will try to import original save game files once per target (especially the "Quick Start Party").
Afterwards the user can manually import save files with the debug console.
---
 engines/kyra/debugger.cpp     |  31 ++++
 engines/kyra/debugger.h       |   3 +
 engines/kyra/eobcommon.cpp    |  14 +-
 engines/kyra/eobcommon.h      |  11 +-
 engines/kyra/saveload_eob.cpp | 382 +++++++++++++++++++++++++++++++++++++++++-
 engines/kyra/scene_eob.cpp    |  76 ++++++---
 engines/kyra/script_eob.cpp   |  14 +-
 engines/kyra/script_eob.h     |   3 +-
 8 files changed, 497 insertions(+), 37 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index 6514984b93..2c9f9f2eea 100644
--- a/engines/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
@@ -29,6 +29,9 @@
 #include "kyra/eobcommon.h"
 
 #include "common/system.h"
+#include "common/config-manager.h"
+
+#include "gui/message.h"
 
 namespace Kyra {
 
@@ -477,6 +480,34 @@ Debugger_LoL::Debugger_LoL(LoLEngine *vm) : Debugger(vm), _vm(vm) {
 #ifdef ENABLE_EOB
 Debugger_EoB::Debugger_EoB(EoBCoreEngine *vm) : Debugger(vm), _vm(vm) {
 }
+
+void Debugger_EoB::initialize() {
+	DCmd_Register("import_savefile",         WRAP_METHOD(Debugger_EoB, cmd_importSaveFile));
+}
+
+bool Debugger_EoB::cmd_importSaveFile(int argc, const char **argv) {
+	if (argc == 3) {
+		int slot = atoi(argv[1]);
+		if (slot < -1 || slot > 989) {
+			DebugPrintf("slot must be between (including) -1 and 989 \n");
+			return true;
+		}
+
+		::GUI::MessageDialog dialog("Your current game (if any) will be lost if you continue. Make sure to save your game first.\n\n", "Continue", "Cancel");
+		if (!dialog.runModal()) {
+			DebugPrintf("Cancelled.\n");
+			return true;
+		}
+
+		DebugPrintf(_vm->importOriginalSaveFile(slot, argv[2]) ? "Success.\n" : "Failure.\n");
+		_vm->loadItemDefs();
+	} else {
+		DebugPrintf("Syntax:   import_savefile <dest slot> <source file>\n              (Imports source save game file to dest slot.)\n          import_savefile -1\n              (Imports all original save game files found and pushs them to the top of the save game list.)\n\n");
+	}
+
+	return true;
+}
+
 #endif // ENABLE_EOB
 
 } // End of namespace Kyra
diff --git a/engines/kyra/debugger.h b/engines/kyra/debugger.h
index 77f1a9a550..2b1dcbe505 100644
--- a/engines/kyra/debugger.h
+++ b/engines/kyra/debugger.h
@@ -115,8 +115,11 @@ class Debugger_EoB : public Debugger {
 public:
 	Debugger_EoB(EoBCoreEngine *vm);
 
+	virtual void initialize();
 protected:
 	EoBCoreEngine *_vm;
+
+	bool cmd_importSaveFile(int argc, const char **argv);
 };
 #endif // ENABLE_EOB
 
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index e45bad6d72..8e99c6f1b3 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -371,7 +371,7 @@ Common::Error EoBCoreEngine::init() {
 	assert(_sound);
 	_sound->init();
 
-	// Setup volume settings
+	// Setup volume settings (and read in all ConfigManager settings)
 	syncSoundSettings();
 
 	_res = new Resource(this);
@@ -492,6 +492,8 @@ Common::Error EoBCoreEngine::init() {
 }
 
 Common::Error EoBCoreEngine::go() {
+	_debugger->initialize();
+
 	_txt->removePageBreakFlag();
 	_screen->loadPalette("palette.col", _screen->getPalette(0));
 	_screen->setScreenPalette(_screen->getPalette(0));
@@ -500,6 +502,13 @@ Common::Error EoBCoreEngine::go() {
 	loadItemsAndDecorationsShapes();
 	_screen->setMouseCursor(0, 0, _itemIconShapes[0]);
 
+	// Import original save game files (especially the "Quick Start Party")
+	if (ConfMan.getBool("importOrigSaves")) {
+		importOriginalSaveFile(-1);
+		ConfMan.setBool("importOrigSaves", false);
+		ConfMan.flushToDisk();
+	}
+
 	loadItemDefs();
 	int action = 0;
 
@@ -550,6 +559,7 @@ Common::Error EoBCoreEngine::go() {
 void EoBCoreEngine::registerDefaultSettings() {
 	KyraEngine_v1::registerDefaultSettings();
 	ConfMan.registerDefault("hpbargraphs", true);
+	ConfMan.registerDefault("importOrigSaves", true);
 }
 
 void EoBCoreEngine::readSettings() {
@@ -912,7 +922,7 @@ Common::String EoBCoreEngine::getCharStrength(int str, int strExt) {
 	return _strenghtStr;
 }
 
-int EoBCoreEngine::testCharacter(int index, int flags) {
+int EoBCoreEngine::testCharacter(int16 index, int flags) {
 	if (index == -1)
 		return 0;
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 851c52076b..f17cf05ee5 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -242,6 +242,7 @@ class EoBInfProcessor;
 class EoBCoreEngine : public KyraRpgEngine {
 friend class TextDisplayer_rpg;
 friend class GUI_EoB;
+friend class Debugger_EoB;
 friend class EoBInfProcessor;
 friend class DarkmoonSequenceHelper;
 friend class CharacterGenerator;
@@ -365,7 +366,7 @@ protected:
 	int getCharacterClassType(int cclass, int levelIndex);
 	int getModifiedHpLimits(int hpModifier, int constModifier, int level, bool mode);
 	Common::String getCharStrength(int str, int strExt);
-	int testCharacter(int index, int flags);
+	int testCharacter(int16 index, int flags);
 	int getNextValidCharIndex(int curCharIndex, int searchStep);
 
 	void recalcArmorClass(int index);
@@ -573,11 +574,13 @@ protected:
 
 	// Level
 	void loadLevel(int level, int sub);
+	void readLevelFileData(int level);
 	Common::String initLevelData(int sub);
 	void addLevelItems();
 	void loadVcnData(const char *file, const char * /*nextFile*/);
 	void loadBlockProperties(const char *mazFile);
-	const uint8 *getBlockFileData(int levelIndex);
+	const uint8 *getBlockFileData(int levelIndex = 0);
+	Common::String getBlockFileName(int levelIndex, int sub);
 	const uint8 *getBlockFileData(const char *mazFile);
 	void loadDecorations(const char *cpsFile, const char *decFile);
 	void assignWallsAndDecorations(int wallIndex, int vmpIndex, int decDataIndex, int specialType, int flags);
@@ -831,6 +834,10 @@ protected:
 	Common::Error loadGameState(int slot);
 	Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail);
 
+	// Default parameters will import all present original save files and push them to the top of the save dialog.
+	bool importOriginalSaveFile(int destSlot, const char *sourceFile = 0);
+	Common::String readOriginalSaveFile(Common::String &file);
+
 	void *generateMonsterTempData(LevelTempData *tmp);
 	void restoreMonsterTempData(LevelTempData *tmp);
 	void releaseMonsterTempData(LevelTempData *tmp);
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index ef5e8dc7a4..4edd46ffa2 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -28,6 +28,10 @@
 #include "common/system.h"
 #include "common/savefile.h"
 #include "common/substream.h"
+#include "common/config-manager.h"
+#include "common/translation.h"
+
+#include "gui/message.h"
 
 namespace Kyra {
 
@@ -134,7 +138,7 @@ Common::Error EoBCoreEngine::loadGameState(int slot) {
 		_updateFlags = in.readUint16BE();
 		_compassDirection = in.readUint16BE();
 		_currentControlMode = in.readUint16BE();
-		_updateCharNum = in.readUint16BE();
+		_updateCharNum = in.readSint16BE();
 		_openBookSpellLevel = in.readSByte();
 		_openBookSpellSelectedItem  = in.readSByte();
 		_openBookSpellListOffset = in.readSByte();
@@ -395,7 +399,7 @@ Common::Error EoBCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 	out->writeUint16BE(_updateFlags);
 	out->writeUint16BE(_compassDirection);
 	out->writeUint16BE(_currentControlMode);
-	out->writeUint16BE(_updateCharNum);
+	out->writeSint16BE(_updateCharNum);
 	out->writeSByte(_openBookSpellLevel);
 	out->writeSByte(_openBookSpellSelectedItem);
 	out->writeSByte(_openBookSpellListOffset);
@@ -524,6 +528,380 @@ Common::Error EoBCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 	return Common::kNoError;
 }
 
+bool EoBCoreEngine::importOriginalSaveFile(int destSlot, const char *sourceFile) {
+	Common::Array<Common::String> origFiles;
+
+	if (sourceFile) {
+		// If a source file is specified via the console command we just check whether it exists.
+		if (Common::File::exists(sourceFile))
+			origFiles.push_back(sourceFile);
+		else
+			return false;
+	} else {
+		// Check for original save files in the game path (usually at least the "Quick Start Party" file will be present).
+		int numMax = (_flags.gameID == GI_EOB1) ? 1 : 6;
+		const char *pattern = (_flags.gameID == GI_EOB1) ? "EOBDATA.SAV" : "EOBDATA%d.SAV";
+		for (int i = 0; i < numMax; ++i) {
+			Common::String temp = Common::String::format(pattern, i);
+			Common::SeekableReadStream *fs = _res->createReadStream(temp);
+			if (fs) {
+				Common::String dsc;
+				if (_flags.gameID == GI_EOB2) {
+					char descStr[20];
+					fs->read(descStr, 20);
+					dsc = Common::String::format("(\"%s\")", descStr).c_str();
+				}
+
+				delete fs;
+				::GUI::MessageDialog dialog(Common::String::format(_("The following original save game file has been found in your game path:\n\n%s %s\n\nDo you wish to use this save game file with ScummVM?\n\n"), temp.c_str(), dsc.c_str()), _("Yes"), _("No"));
+				if (dialog.runModal())
+					origFiles.push_back(temp);
+			}
+		}
+	}
+
+	int numFilesFound = origFiles.size();
+	if (!numFilesFound)
+		return false;
+
+	int moveUpSlots = 0;
+	_gui->updateSaveSlotsList(_targetName, true);
+
+	// Check whether ScummVM save files exist and how many slots they need to be moved up to make space for the original save files
+	if (destSlot == -1) {
+		for (int i = 0; i < numFilesFound; ++i) {
+			if (Common::find(_gui->_saveSlots.begin(), _gui->_saveSlots.end(), i) != _gui->_saveSlots.end())
+				moveUpSlots++;
+		}
+	}
+
+	// "move up" existing save files
+	if (moveUpSlots) {
+		Common::sort(_gui->_saveSlots.begin(), _gui->_saveSlots.end(), Common::Greater<int>());
+		for (Common::Array<int>::iterator i = _gui->_saveSlots.begin(); i != _gui->_saveSlots.end(); ++i) {
+			int newIndex = *i + moveUpSlots;
+
+			if (*i >= 990) {
+				// Skip quick save slots
+				continue;
+			} else if (*i >= (990 - moveUpSlots)) {
+				// Try to squeeze occupied slots together by finding and occupying empty slots before the current one if necessary
+				int missingSlots = moveUpSlots - (989 - *i);
+				int missingLeft = missingSlots;
+				int missingLast = missingLeft;
+				Common::Array<int>::iterator squeezeStart = i + 1;
+
+				for (; squeezeStart != _gui->_saveSlots.end() && missingLeft; ++squeezeStart) {
+					int diff = *(squeezeStart - 1) - *squeezeStart - 1;
+					missingLast = MIN(missingLeft, diff);
+					missingLeft -= missingLast;
+				}
+
+				// This will probably never happen, since we do have 990 save slots
+				if (missingLeft)
+					warning("%d original save files could not be converted due to missing save game slots", missingLeft);
+
+				int indexS = *(squeezeStart - 2) - missingLast;
+				for (Common::Array<int>::iterator ii = squeezeStart - 2; ii != i - 1; --ii)
+					_saveFileMan->renameSavefile(getSavegameFilename(*ii), getSavegameFilename(indexS++));
+
+				int newPos = *i -= (missingSlots - missingLeft);
+
+				_gui->updateSaveSlotsList(_targetName, true);
+				Common::sort(_gui->_saveSlots.begin(), _gui->_saveSlots.end(), Common::Greater<int>());
+				i = Common::find(_gui->_saveSlots.begin(), _gui->_saveSlots.end(), newPos);
+				if (i == _gui->_saveSlots.end())
+					error("EoBCoreEngine::importOriginalSaveFile(): Unknown error");
+				newIndex = *i + moveUpSlots;
+			}
+
+			_saveFileMan->renameSavefile(getSavegameFilename(*i), getSavegameFilename(newIndex));
+		}
+	}
+
+	int curSlot = MAX(destSlot, 0);
+
+	if (destSlot != -1) {
+		if (Common::find(_gui->_saveSlots.begin(), _gui->_saveSlots.end(), destSlot) != _gui->_saveSlots.end()) {
+			::GUI::MessageDialog dialog(Common::String::format(_("A save game file was found in the specified slot %d. Overwrite?\n\n"), destSlot), _("Yes"), _("No"));
+			if (!dialog.runModal())
+				return false;
+		}
+	}
+
+	for (Common::Array<Common::String>::iterator i = origFiles.begin(); i != origFiles.end(); ++i) {
+		Common::String desc = readOriginalSaveFile(*i);
+		if (desc.empty()) {
+			warning("Unable to import original save file '%s'", i->c_str());
+		} else {
+			// We can't make thumbnails here, since we do not want to load all the level data, monsters, etc. for each save we convert.
+			// Instead, we use an empty surface to avoid that createThumbnailFromScreen() makes a completely pointless thumbnail from
+			// whatever screen that is currently shown when this function is called.
+			Graphics::Surface dummy;
+			saveGameStateIntern(curSlot++, desc.c_str(), &dummy);
+			warning("Imported original save file '%s' ('%s')", i->c_str(), desc.c_str());
+		}
+	}
+
+	_currentLevel = 0;
+	_currentSub = 0;
+	_currentBlock = 0;
+	_currentDirection = 0;
+	_itemInHand = 0;
+	_hasTempDataFlags = 0;
+	_partyEffectFlags = 0;
+	memset(_characters, 0, sizeof(EoBCharacter) * 6);
+	_inf->reset();
+
+	if (destSlot == -1 && curSlot) {
+		::GUI::MessageDialog dialog(_("One or more original save game files have been successfully imported into\nScummVM. If you want to manually import original save game files later you will\nneed to open the ScummVM debug console and use the command 'import_savefile'.\n\n"));
+		dialog.runModal();
+	}
+
+	return true;
+}
+
+Common::String EoBCoreEngine::readOriginalSaveFile(Common::String &file) {
+	Common::String desc;
+
+	Common::SeekableReadStream *fs = _res->createReadStream(file);
+	if (!fs)
+		return desc;
+
+	Common::SeekableSubReadStreamEndian in(fs, 0, fs->size(), _flags.platform == Common::kPlatformAmiga, DisposeAfterUse::YES);
+
+	if (_flags.gameID == GI_EOB1) {
+		// Nothing to read here for EOB 1. Original EOB 1 has
+		// only one save slot without save file description.
+		desc = "<IMPORTED GAME>";
+	} else {
+		char tempStr[20];
+		in.read(tempStr, 20);
+		desc = tempStr;
+	}
+
+	for (int i = 0; i < 6; i++) {
+		EoBCharacter *c = &_characters[i];
+		c->id = in.readByte();
+		c->flags = in.readByte();
+		in.read(c->name, 11);
+		c->strengthCur = in.readSByte();
+		c->strengthMax = in.readSByte();
+		c->strengthExtCur = in.readSByte();
+		c->strengthExtMax = in.readSByte();
+		c->intelligenceCur = in.readSByte();
+		c->intelligenceMax = in.readSByte();
+		c->wisdomCur = in.readSByte();
+		c->wisdomMax = in.readSByte();
+		c->dexterityCur = in.readSByte();
+		c->dexterityMax = in.readSByte();
+		c->constitutionCur = in.readSByte();
+		c->constitutionMax = in.readSByte();
+		c->charismaCur = in.readSByte();
+		c->charismaMax = in.readSByte();
+		c->hitPointsCur = (_flags.gameID == GI_EOB1) ? in.readSByte() : in.readSint16();
+		c->hitPointsMax = (_flags.gameID == GI_EOB1) ? in.readSByte() : in.readSint16();
+		c->armorClass = in.readSByte();
+		c->disabledSlots = in.readByte();
+		c->raceSex = in.readByte();
+		c->cClass = in.readByte();
+		c->alignment = in.readByte();
+		c->portrait = in.readSByte();
+		c->food = in.readByte();
+		in.read(c->level, 3);
+		for (int ii = 0; ii < 3; ii++)
+			c->experience[ii] = in.readUint32();
+		in.skip(4);
+		delete[] c->faceShape;
+		c->faceShape = 0;
+		in.read(c->mageSpells, (_flags.gameID == GI_EOB1) ? 30 :80);
+		in.read(c->clericSpells, (_flags.gameID == GI_EOB1) ? 30 : 80);
+		c->mageSpellsAvailableFlags = in.readUint32();
+		for (int ii = 0; ii < 27; ii++)
+			c->inventory[ii] = in.readSint16();
+		uint32 ct = _system->getMillis();
+		for (int ii = 0; ii < 10; ii++) {
+			c->timers[ii] = in.readUint32() * _tickLength;
+			if (c->timers[ii])
+				c->timers[ii] += ct;
+		}
+		in.read(c->events, 10);
+		in.read(c->effectsRemainder, 4);
+		c->effectFlags = in.readUint32();
+		if (c->effectFlags && _flags.gameID == GI_EOB1) {
+			warning("EoBCoreEngine::readOriginalSaveFile(): Unhandled character effect flags encountered in original EOB1 save file '%s' ('%s')", file.c_str(), desc.c_str());
+			c->effectFlags = 0;
+		}
+		c->damageTaken = in.readByte();
+		in.read(c->slotStatus, 5);
+		in.skip(6);
+	}
+
+	setupCharacterTimers();
+
+	_currentLevel = in.readUint16();
+	_currentSub = (_flags.gameID == GI_EOB1) ? 0 : in.readSint16();
+	_currentBlock = in.readUint16();
+	_currentDirection = in.readUint16();
+	_itemInHand = in.readSint16();
+	_hasTempDataFlags = (_flags.gameID == GI_EOB1) ? in.readUint16() : in.readUint32();
+	_partyEffectFlags = (_flags.gameID == GI_EOB1) ? in.readUint16() : in.readUint32();
+	if (_partyEffectFlags && _flags.gameID == GI_EOB1) {
+		warning("EoBCoreEngine::readOriginalSaveFile(): Unhandled party effect flags encountered in original EOB1 save file '%s' ('%s')", file.c_str(), desc.c_str());
+		_partyEffectFlags = 0;
+	}
+	if (_flags.gameID == GI_EOB2)
+		in.skip(1);
+
+	_inf->loadState(in, true);
+
+	int numItems = (_flags.gameID == GI_EOB1) ? 500 : 600;
+	for (int i = 0; i < numItems; i++) {
+		EoBItem *t = &_items[i];
+		t->nameUnid = in.readByte();
+		t->nameId = in.readByte();
+		t->flags = in.readByte();
+		t->icon = in.readSByte();
+		t->type = in.readSByte();
+		t->pos = in.readSByte();
+		t->block = in.readSint16();
+		t->next = in.readSint16();
+		t->prev = in.readSint16();
+		t->level = in.readByte();
+		t->value = in.readSByte();
+	}
+
+	int numParts = (_flags.gameID == GI_EOB1) ? 13 : 18;
+	int partSize = (_flags.gameID == GI_EOB1) ? 2040 : 2130;
+	uint32 nextPart = in.pos();
+	uint8 *cmpData = new uint8[1200];
+
+	for (int i = 0; i < numParts; i++) {
+		in.seek(nextPart);
+		nextPart += partSize;
+
+		if (!(_hasTempDataFlags & (1 << i)))
+			continue;
+
+		if (_lvlTempData[i]) {
+			delete[] _lvlTempData[i]->wallsXorData;
+			delete[] _lvlTempData[i]->flags;
+			releaseMonsterTempData(_lvlTempData[i]);
+			releaseFlyingObjectTempData(_lvlTempData[i]);
+			releaseWallOfForceTempData(_lvlTempData[i]);
+			delete _lvlTempData[i];
+		}
+
+		_lvlTempData[i] = new LevelTempData;
+		LevelTempData *l = _lvlTempData[i];
+		l->wallsXorData = new uint8[4096];
+		l->flags = new uint16[1024];
+		memset(l->flags, 0, 1024 * sizeof(uint16));
+		EoBMonsterInPlay *lm = new EoBMonsterInPlay[30];
+		l->monsters = lm;
+		EoBFlyingObject *lf = new EoBFlyingObject[_numFlyingObjects];
+		memset(lf, 0, _numFlyingObjects * sizeof(EoBFlyingObject));
+		l->flyingObjects = lf;
+		WallOfForce *lw = new WallOfForce[5];
+		memset(lw, 0, 5 * sizeof(WallOfForce));
+		l->wallsOfForce = lw;
+
+		in.read(cmpData, 1200);
+		_screen->decodeFrame4(cmpData, l->wallsXorData, 4096);
+		_curBlockFile = getBlockFileName(i + 1, 0);
+		const uint8 *p = getBlockFileData();
+		uint16 len = READ_LE_UINT16(p + 4);
+		p += 6;
+
+		uint8 *d = l->wallsXorData;
+		for (int ii = 0; ii < 1024; ii++) {
+			for (int iii = 0; iii < 4; iii++)
+				*d++ ^= p[ii * len + iii];
+		}
+
+		for (int ii = 0; ii < 30; ii++) {
+			EoBMonsterInPlay *m = &lm[ii];
+			m->type = in.readByte();
+			m->unit = in.readByte();
+			m->block = in.readUint16();
+			m->pos = in.readByte();
+			m->dir = in.readSByte();
+			m->animStep = in.readByte();
+			m->shpIndex = in.readByte();
+			m->mode = in.readSByte();
+			m->f_9 = in.readSByte();
+			m->curAttackFrame = in.readSByte();
+			m->spellStatusLeft = in.readSByte();
+			m->hitPointsMax = in.readSint16();
+			m->hitPointsCur = in.readSint16();
+			m->dest = in.readUint16();
+			m->randItem = in.readUint16();
+			m->fixedItem = in.readUint16();
+			m->flags = in.readByte();
+			m->idleAnimState = in.readByte();
+
+			if (_flags.gameID == GI_EOB1)
+				m->stepsTillRemoteAttack = in.readByte();
+			else
+				m->curRemoteWeapon = in.readByte();
+
+			m->numRemoteAttacks = in.readByte();
+			m->palette = in.readSByte();
+
+			if (_flags.gameID == GI_EOB1) {
+				in.skip(1);
+			} else {
+				m->directionChanged = in.readByte();
+				m->stepsTillRemoteAttack = in.readByte();
+				m->sub = in.readByte();
+			}
+
+			_levelBlockProperties[m->block].flags++;
+		}
+
+		if (_flags.gameID == GI_EOB1)
+			continue;
+
+		for (int ii = 0; ii < 5; ii++) {
+			WallOfForce *w = &lw[ii];
+			w->block = in.readUint16();
+			w->duration = in.readUint32();
+		}
+	}
+
+	delete[] cmpData;
+
+	restoreBlockTempData(_currentLevel);
+
+	in.skip(3);
+
+	delete[] _itemTypes;
+	_itemTypes = new EoBItemType[65];
+	memset(_itemTypes, 0, sizeof(EoBItemType) * 65);
+
+	if (_flags.gameID == GI_EOB1)
+		return desc;
+
+	for (int i = 51; i < 65; i++) {
+		EoBItemType *t = &_itemTypes[i];
+		t->invFlags = in.readUint16();
+		t->handFlags = in.readUint16();
+		t->armorClass = in.readSByte();
+		t->allowedClasses = in.readSByte();
+		t->requiredHands = in.readSByte();
+		t->dmgNumDiceS = in.readSByte();
+		t->dmgNumPipsS = in.readSByte();
+		t->dmgIncS = in.readSByte();
+		t->dmgNumDiceL = in.readSByte();
+		t->dmgNumPipsL = in.readSByte();
+		t->dmgIncL = in.readSByte();
+		t->unk1 = in.readByte();
+		t->extraProperties = in.readUint16();
+	}
+
+	return desc;
+}
+
 void *EoBCoreEngine::generateMonsterTempData(LevelTempData *tmp) {
 	EoBMonsterInPlay *m = new EoBMonsterInPlay[30];
 	memcpy(m, _monsters,  sizeof(EoBMonsterInPlay) * 30);
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 982191b359..3d615e966a 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -38,31 +38,7 @@ void EoBCoreEngine::loadLevel(int level, int sub) {
 	_currentSub = sub;
 	uint32 end = _system->getMillis() + 500;
 
-	Common::String file;
-	Common::SeekableReadStream *s = 0;
-	static const char *suffix[] = { "INF", "DRO", "ELO", 0 };
-
-	for (const char *const *sf = suffix; *sf && !s; sf++) {
-		file = Common::String::format("LEVEL%d.%s", level, *sf);
-		s = _res->createReadStream(file);
-	}
-
-	if (!s)
-		error("Failed to load level file LEVEL%d.INF/DRO/ELO", level);
-
-	if (s->readUint16LE() + 2 == s->size()) {
-		if (s->readUint16LE() == 4) {
-			delete s;
-			s = 0;
-			_screen->loadBitmap(file.c_str(), 5, 5, 0);
-		}
-	}
-
-	if (s) {
-		s->seek(0);
-		_screen->loadFileDataToPage(s, 5, 15000);
-		delete s;
-	}
+	readLevelFileData(level);
 
 	Common::String gfxFile;
 	// Work around for issue with corrupt (incomplete) monster property data
@@ -121,6 +97,34 @@ void EoBCoreEngine::loadLevel(int level, int sub) {
 	_screen->setCurPage(0);
 }
 
+void EoBCoreEngine::readLevelFileData(int level) {
+	Common::String file;
+	Common::SeekableReadStream *s = 0;
+	static const char *suffix[] = { "INF", "DRO", "ELO", 0 };
+
+	for (const char *const *sf = suffix; *sf && !s; sf++) {
+		file = Common::String::format("LEVEL%d.%s", level, *sf);
+		s = _res->createReadStream(file);
+	}
+
+	if (!s)
+		error("Failed to load level file LEVEL%d.INF/DRO/ELO", level);
+
+	if (s->readUint16LE() + 2 == s->size()) {
+		if (s->readUint16LE() == 4) {
+			delete s;
+			s = 0;
+			_screen->loadBitmap(file.c_str(), 5, 5, 0);
+		}
+	}
+
+	if (s) {
+		s->seek(0);
+		_screen->loadFileDataToPage(s, 5, 15000);
+		delete s;
+	}
+}
+
 Common::String EoBCoreEngine::initLevelData(int sub) {
 	const uint8 *data = _screen->getCPagePtr(5) + 2;
 	const uint8 *pos = data;
@@ -300,9 +304,29 @@ const uint8 *EoBCoreEngine::getBlockFileData(int) {
 	return _screen->getCPagePtr(14);
 }
 
+Common::String EoBCoreEngine::getBlockFileName(int levelIndex, int sub) {
+	readLevelFileData(levelIndex);
+	const uint8 *data = _screen->getCPagePtr(5) + 2;
+	const uint8 *pos = data;
+
+	for (int i = 0; i < sub; i++)
+		pos = data + READ_LE_UINT16(pos);
+
+	pos += 2;
+
+	if (*pos++ == 0xEC || _flags.gameID == GI_EOB1) {
+		if (_flags.gameID == GI_EOB1)
+			pos -= 3;
+
+		return Common::String((const char *)pos);
+	}
+
+	return Common::String();
+}
+
 const uint8 *EoBCoreEngine::getBlockFileData(const char *mazFile) {
 	_curBlockFile = mazFile;
-	return getBlockFileData(0);
+	return getBlockFileData();
 }
 
 void EoBCoreEngine::loadDecorations(const char *cpsFile, const char *decFile) {
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index 267966dde2..c07c41f706 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -214,10 +214,11 @@ bool EoBInfProcessor::preventRest() const {
 	return _preventRest ? true : false;
 }
 
-void EoBInfProcessor::loadState(Common::SeekableSubReadStreamEndian &in) {
-	_preventRest = in.readByte();
-	for (int i = 0; i < 18; i++)
-		_flagTable[i] = in.readUint32BE();
+void EoBInfProcessor::loadState(Common::SeekableSubReadStreamEndian &in, bool origFile) {
+	_preventRest = (_vm->game() == GI_EOB1 && origFile) ? 0 : in.readByte();
+	int numFlags = (_vm->game() == GI_EOB1 && origFile) ? 13 : 18;
+	for (int i = 0; i < numFlags; i++)
+		_flagTable[i] = in.readUint32();
 }
 
 void EoBInfProcessor::saveState(Common::OutSaveFile *out) {
@@ -226,6 +227,11 @@ void EoBInfProcessor::saveState(Common::OutSaveFile *out) {
 		out->writeUint32BE(_flagTable[i]);
 }
 
+void EoBInfProcessor::reset() {
+	_preventRest = 0;
+	memset(_flagTable, 0, 18 * sizeof(uint32));
+}
+
 const char *EoBInfProcessor::getString(uint16 index) {
 	if (index == 0xffff)
 		return 0;
diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h
index 66323d6846..391791522a 100644
--- a/engines/kyra/script_eob.h
+++ b/engines/kyra/script_eob.h
@@ -47,8 +47,9 @@ public:
 	bool checkFlags(uint32 flags) const;
 	bool preventRest() const;
 
-	void loadState(Common::SeekableSubReadStreamEndian &in);
+	void loadState(Common::SeekableSubReadStreamEndian &in, bool origFile = false);
 	void saveState(Common::OutSaveFile *out);
+	void reset();
 
 private:
 	const char *getString(uint16 index);
-- 
cgit v1.2.3


From ea275d2cdad5d776271ecba81d16f86447a7e953 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 15 Jan 2012 13:27:52 +0100
Subject: SCUMM: add missing free()

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

(limited to 'engines')

diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index f058ef1a2c..1dc026ad52 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -94,6 +94,7 @@ Sound::Sound(ScummEngine *parent, Audio::Mixer *mixer)
 Sound::~Sound() {
 	stopCDTimer();
 	g_system->getAudioCDManager()->stop();
+	free(_offsetTable);
 }
 
 void Sound::addSoundToQueue(int sound, int heOffset, int heChannel, int heFlags) {
-- 
cgit v1.2.3


From cdb6cf687fbeb9365dc75dc5fc92ad17fea8f2e3 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 15 Jan 2012 14:12:45 +0100
Subject: TSAGE: Don't use "&&" synonym "and".

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 45aec17fbf..aa2a0d9c44 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2237,7 +2237,7 @@ void Scene1550::UnkArea1550::remove() {
 	SceneArea::remove();
 	R2_GLOBALS._insetUp--;
 	//
-	if ((scene->_sceneMode >= 20) and (scene->_sceneMode <= 29))
+	if ((scene->_sceneMode >= 20) && (scene->_sceneMode <= 29))
 		return;
 	
 	R2_GLOBALS._player.disableControl();
-- 
cgit v1.2.3


From 780b2eff1636985b900db6d0908cc6d3d395f409 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Jan 2012 18:34:41 +0200
Subject: SCI: Plug a leak in ResourceManager::detectSciVersion()

Many thanks to digitall for finding this one
---
 engines/sci/resource.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 9171e5e5d9..c3bd03bac3 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -2200,13 +2200,16 @@ void ResourceManager::detectSciVersion() {
 	// Handle SCI32 versions here
 	if (_volVersion >= kResVersionSci2) {
 		Common::List<ResourceId> *heaps = listResources(kResourceTypeHeap);
+		bool hasHeapResources = !heaps->empty();
+		delete heaps;
+
 		// SCI2.1/3 and SCI1 Late resource maps are the same, except that
 		// SCI1 Late resource maps have the resource types or'd with
 		// 0x80. We differentiate between SCI2 and SCI2.1/3 based on that.
 		if (_mapVersion == kResVersionSci1Late) {
 			s_sciVersion = SCI_VERSION_2;
 			return;
-		} else if (!heaps->empty()) {
+		} else if (hasHeapResources) {
 			s_sciVersion = SCI_VERSION_2_1;
 			return;
 		} else {
-- 
cgit v1.2.3


From 0f39a4367535fcd4bfa4c41340d90d7856d086d8 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Jan 2012 18:35:33 +0200
Subject: SCI: Plug loads of memory leaks in the SCI32 graphics code

Many thanks to digitall for finding these
---
 engines/sci/graphics/frameout.cpp | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index e3fac80f7c..b12413ab69 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -61,12 +61,13 @@ GfxFrameout::GfxFrameout(SegManager *segMan, ResourceManager *resMan, GfxCoordAd
 }
 
 GfxFrameout::~GfxFrameout() {
+	clear();
 }
 
 void GfxFrameout::clear() {
-	_screenItems.clear();
+	deletePlaneItems(NULL_REG);
 	_planes.clear();
-	_planePictures.clear();
+	deletePlanePictures(NULL_REG);
 }
 
 void GfxFrameout::kernelAddPlane(reg_t object) {
@@ -214,12 +215,15 @@ void GfxFrameout::addPlanePicture(reg_t object, GuiResourceId pictureId, uint16
 }
 
 void GfxFrameout::deletePlanePictures(reg_t object) {
-	for (PlanePictureList::iterator it = _planePictures.begin(); it != _planePictures.end(); it++) {
-		if (it->object == object) {
+	PlanePictureList::iterator it = _planePictures.begin();
+
+	while (it != _planePictures.end()) {
+		if (it->object == object || object.isNull()) {
+			delete it->pictureCels;
 			delete it->picture;
-			_planePictures.erase(it);
-			deletePlanePictures(object);
-			return;
+			it = _planePictures.erase(it);
+		} else {
+			++it;
 		}
 	}
 }
@@ -272,17 +276,28 @@ void GfxFrameout::kernelDeleteScreenItem(reg_t object) {
 	}
 
 	_screenItems.remove(itemEntry);
+	delete itemEntry;
 }
 
 void GfxFrameout::deletePlaneItems(reg_t planeObject) {
 	FrameoutList::iterator listIterator = _screenItems.begin();
 
 	while (listIterator != _screenItems.end()) {
-		reg_t itemPlane = readSelector(_segMan, (*listIterator)->object, SELECTOR(plane));
-		if (planeObject == itemPlane)
+		bool objectMatches = false;
+		if (!planeObject.isNull()) {
+			reg_t itemPlane = readSelector(_segMan, (*listIterator)->object, SELECTOR(plane));
+			objectMatches = (planeObject == itemPlane);
+		} else {
+			objectMatches = true;
+		}
+		
+		if (objectMatches) {
+			FrameoutEntry *itemEntry = *listIterator;
 			listIterator = _screenItems.erase(listIterator);
-		else
+			delete itemEntry;
+		} else {
 			++listIterator;
+		}
 	}
 }
 
-- 
cgit v1.2.3


From f2c163a5690d20e41ff39245242e7cc0b9eed8eb Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Jan 2012 19:02:19 +0200
Subject: SCI: Plug a leak in ResourceManager::processWavePatch()

Many thanks to digitall for finding this one
---
 engines/sci/resource_audio.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index a3cf1b0c84..8730580302 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -185,6 +185,7 @@ void ResourceManager::processWavePatch(ResourceId resourceId, Common::String nam
 	file.open(name);
 
 	updateResource(resourceId, resSrc, file.size());
+	_sources.push_back(resSrc);
 
 	debugC(1, kDebugLevelResMan, "Patching %s - OK", name.c_str());
 }
-- 
cgit v1.2.3


From 56fb56936e36b3a91ab575a78514383199388ed9 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 15 Jan 2012 18:25:00 +0100
Subject: SCI: Clean up some memory management and loops

---
 engines/sci/console.cpp         | 65 +++++++++++++++--------------------------
 engines/sci/detection.cpp       | 18 ++++++------
 engines/sci/engine/features.cpp |  9 ++----
 engines/sci/engine/kscripts.cpp | 10 ++-----
 engines/sci/resource.cpp        | 17 +++++------
 engines/sci/resource.h          |  2 +-
 engines/sci/resource_audio.cpp  | 24 ++++++---------
 7 files changed, 55 insertions(+), 90 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 571d2f834b..395ba4a8c7 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -860,14 +860,14 @@ bool Console::cmdVerifyScripts(int argc, const char **argv) {
 		return true;
 	}
 
-	Common::List<ResourceId> *resources = _engine->getResMan()->listResources(kResourceTypeScript);
-	Common::sort(resources->begin(), resources->end());
-	Common::List<ResourceId>::iterator itr = resources->begin();
+	Common::List<ResourceId> resources = _engine->getResMan()->listResources(kResourceTypeScript);
+	Common::sort(resources.begin(), resources.end());
 
-	DebugPrintf("%d SCI1.1-SCI3 scripts found, performing sanity checks...\n", resources->size());
+	DebugPrintf("%d SCI1.1-SCI3 scripts found, performing sanity checks...\n", resources.size());
 
 	Resource *script, *heap;
-	while (itr != resources->end()) {
+	Common::List<ResourceId>::iterator itr;
+	for (itr = resources.begin(); itr != resources.end(); ++itr) {
 		script = _engine->getResMan()->findResource(*itr, false);
 		if (!script)
 			DebugPrintf("Error: script %d couldn't be loaded\n", itr->getNumber());
@@ -885,12 +885,9 @@ bool Console::cmdVerifyScripts(int argc, const char **argv) {
 				DebugPrintf("Error: script %d is larger than 64KB (%d bytes)\n",
 				itr->getNumber(), script->size);
 		}
-
-		++itr;
 	}
 
 	DebugPrintf("SCI1.1-SCI2.1 script check finished\n");
-	delete resources;
 
 	return true;
 }
@@ -914,9 +911,8 @@ bool Console::cmdShowInstruments(int argc, const char **argv) {
 	MidiParser_SCI *parser = new MidiParser_SCI(doSoundVersion, 0);
 	parser->setMidiDriver(player);
 
-	Common::List<ResourceId> *resources = _engine->getResMan()->listResources(kResourceTypeSound);
-	Common::sort(resources->begin(), resources->end());
-	Common::List<ResourceId>::iterator itr = resources->begin();
+	Common::List<ResourceId> resources = _engine->getResMan()->listResources(kResourceTypeSound);
+	Common::sort(resources.begin(), resources.end());
 	int instruments[128];
 	bool instrumentsSongs[128][1000];
 
@@ -928,26 +924,21 @@ bool Console::cmdShowInstruments(int argc, const char **argv) {
 			instrumentsSongs[i][j] = false;
 
 	if (songNumber == -1) {
-		DebugPrintf("%d sounds found, checking their instrument mappings...\n", resources->size());
+		DebugPrintf("%d sounds found, checking their instrument mappings...\n", resources.size());
 		DebugPrintf("Instruments:\n");
 		DebugPrintf("============\n");
 	}
 
-	SoundResource *sound;
-
-	while (itr != resources->end()) {
-		if (songNumber >= 0 && itr->getNumber() != songNumber) {
-			++itr;
+	Common::List<ResourceId>::iterator itr;
+	for (itr = resources.begin(); itr != resources.end(); ++itr) {
+		if (songNumber >= 0 && itr->getNumber() != songNumber)
 			continue;
-		}
 
-		sound = new SoundResource(itr->getNumber(), _engine->getResMan(), doSoundVersion);
-		int channelFilterMask = sound->getChannelFilterMask(player->getPlayId(), player->hasRhythmChannel());
-		SoundResource::Track *track = sound->getTrackByType(player->getPlayId());
+		SoundResource sound(itr->getNumber(), _engine->getResMan(), doSoundVersion);
+		int channelFilterMask = sound.getChannelFilterMask(player->getPlayId(), player->hasRhythmChannel());
+		SoundResource::Track *track = sound.getTrackByType(player->getPlayId());
 		if (track->digitalChannelNr != -1) {
 			// Skip digitized sound effects
-			delete sound;
-			++itr;
 			continue;
 		}
 
@@ -1027,9 +1018,6 @@ bool Console::cmdShowInstruments(int argc, const char **argv) {
 		} while (!endOfTrack);
 
 		DebugPrintf("\n");
-
-		delete sound;
-		++itr;
 	}
 
 	delete parser;
@@ -1069,7 +1057,6 @@ bool Console::cmdShowInstruments(int argc, const char **argv) {
 		DebugPrintf("\n\n");
 	}
 
-	delete resources;
 	return true;
 }
 
@@ -1132,12 +1119,12 @@ bool Console::cmdList(int argc, const char **argv) {
 			number = atoi(argv[2]);
 		}
 
-		Common::List<ResourceId> *resources = _engine->getResMan()->listResources(res, number);
-		Common::sort(resources->begin(), resources->end());
-		Common::List<ResourceId>::iterator itr = resources->begin();
+		Common::List<ResourceId> resources = _engine->getResMan()->listResources(res, number);
+		Common::sort(resources.begin(), resources.end());
 
 		int cnt = 0;
-		while (itr != resources->end()) {
+		Common::List<ResourceId>::iterator itr;
+		for (itr = resources.begin(); itr != resources.end(); ++itr) {
 			if (number == -1) {
 				DebugPrintf("%8i", itr->getNumber());
 				if (++cnt % 10 == 0)
@@ -1149,10 +1136,8 @@ bool Console::cmdList(int argc, const char **argv) {
 				if (++cnt % 4 == 0)
 					DebugPrintf("\n");
 			}
-			++itr;
 		}
 		DebugPrintf("\n");
-		delete resources;
 	}
 
 	return true;
@@ -2915,12 +2900,11 @@ bool Console::cmdDisassembleAddress(int argc, const char **argv) {
 }
 
 void Console::printKernelCallsFound(int kernelFuncNum, bool showFoundScripts) {
-	Common::List<ResourceId> *resources = _engine->getResMan()->listResources(kResourceTypeScript);
-	Common::sort(resources->begin(), resources->end());
-	Common::List<ResourceId>::iterator itr = resources->begin();
+	Common::List<ResourceId> resources = _engine->getResMan()->listResources(kResourceTypeScript);
+	Common::sort(resources.begin(), resources.end());
 
 	if (showFoundScripts)
-		DebugPrintf("%d scripts found, dissassembling...\n", resources->size());
+		DebugPrintf("%d scripts found, dissassembling...\n", resources.size());
 
 	int scriptSegment;
 	Script *script;
@@ -2928,13 +2912,13 @@ void Console::printKernelCallsFound(int kernelFuncNum, bool showFoundScripts) {
 	// manager won't be affected by loading and unloading scripts here.
 	SegManager *customSegMan = new SegManager(_engine->getResMan());
 
-	while (itr != resources->end()) {
+	Common::List<ResourceId>::iterator itr;
+	for (itr = resources.begin(); itr != resources.end(); ++itr) {
 		// Ignore specific leftover scripts, which require other non-existing scripts
 		if ((_engine->getGameId() == GID_HOYLE3         && itr->getNumber() == 995) ||
 		    (_engine->getGameId() == GID_KQ5            && itr->getNumber() == 980) ||
 		    (_engine->getGameId() == GID_SLATER         && itr->getNumber() == 947) ||
 			(_engine->getGameId() == GID_MOTHERGOOSE256 && itr->getNumber() == 980)) {
-			itr++;
 			continue;
 		}
 
@@ -2993,12 +2977,9 @@ void Console::printKernelCallsFound(int kernelFuncNum, bool showFoundScripts) {
 		}	// for (it = script->_objects.begin(); it != end; ++it)
 
 		customSegMan->uninstantiateScript(itr->getNumber());
-		++itr;
 	}
 
 	delete customSegMan;
-
-	delete resources;
 }
 
 bool Console::cmdFindKernelFunctionCall(int argc, const char **argv) {
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 80f45b4325..c43849056b 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -303,29 +303,29 @@ Common::String convertSierraGameId(Common::String sierraId, uint32 *gameFlags, R
 	if (sierraId == "fp" || sierraId == "gk" || sierraId == "pq4")
 		demoThreshold = 150;
 
-	Common::ScopedPtr<Common::List<ResourceId> > resources(resMan.listResources(kResourceTypeScript, -1));
-	if (resources->size() < demoThreshold) {
+	Common::List<ResourceId> resources = resMan.listResources(kResourceTypeScript, -1);
+	if (resources.size() < demoThreshold) {
 		*gameFlags |= ADGF_DEMO;
 
 		// Crazy Nick's Picks
-		if (sierraId == "lsl1" && resources->size() == 34)
+		if (sierraId == "lsl1" && resources.size() == 34)
 			return "cnick-lsl";
-		if (sierraId == "sq4" && resources->size() == 34)
+		if (sierraId == "sq4" && resources.size() == 34)
 			return "cnick-sq";
-		if (sierraId == "hoyle3" && resources->size() == 42)
+		if (sierraId == "hoyle3" && resources.size() == 42)
 			return "cnick-kq";
-		if (sierraId == "rh budget" && resources->size() == 39)
+		if (sierraId == "rh budget" && resources.size() == 39)
 			return "cnick-longbow";
 		// TODO: cnick-laurabow (the name of the game object contains junk)
 
 		// Handle Astrochicken 1 (SQ3) and 2 (SQ4)
-		if (sierraId == "sq3" && resources->size() == 20)
+		if (sierraId == "sq3" && resources.size() == 20)
 			return "astrochicken";
 		if (sierraId == "sq4")
 			return "msastrochicken";
 	}
 
-	if (sierraId == "torin" && resources->size() == 226)	// Torin's Passage demo
+	if (sierraId == "torin" && resources.size() == 226)	// Torin's Passage demo
 		*gameFlags |= ADGF_DEMO;
 
 	for (const OldNewIdTableEntry *cur = s_oldNewTable; cur->oldId[0]; ++cur) {
@@ -350,7 +350,7 @@ Common::String convertSierraGameId(Common::String sierraId, uint32 *gameFlags, R
 			return "qfg4";
 
 		// qfg4 demo has less than 50 scripts
-		if (resources->size() < 50)
+		if (resources.size() < 50)
 			return "qfg4";
 
 		// Otherwise it's qfg3
diff --git a/engines/sci/engine/features.cpp b/engines/sci/engine/features.cpp
index a5c1b970f1..b3cfee873c 100644
--- a/engines/sci/engine/features.cpp
+++ b/engines/sci/engine/features.cpp
@@ -430,19 +430,16 @@ SciVersion GameFeatures::detectMessageFunctionType() {
 		return _messageFunctionType;
 	}
 
-	Common::List<ResourceId> *resources = g_sci->getResMan()->listResources(kResourceTypeMessage, -1);
-
-	if (resources->empty()) {
-		delete resources;
+	Common::List<ResourceId> resources = g_sci->getResMan()->listResources(kResourceTypeMessage, -1);
 
+	if (resources.empty()) {
 		// No messages found, so this doesn't really matter anyway...
 		_messageFunctionType = SCI_VERSION_1_1;
 		return _messageFunctionType;
 	}
 
-	Resource *res = g_sci->getResMan()->findResource(*resources->begin(), false);
+	Resource *res = g_sci->getResMan()->findResource(*resources.begin(), false);
 	assert(res);
-	delete resources;
 
 	// Only v2 Message resources use the kGetMessage kernel function.
 	// v3-v5 use the kMessage kernel function.
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp
index 93c1fffe3c..9b0e490d7e 100644
--- a/engines/sci/engine/kscripts.cpp
+++ b/engines/sci/engine/kscripts.cpp
@@ -74,17 +74,13 @@ reg_t kLock(EngineState *s, int argc, reg_t *argv) {
 	case 0 :
 		if (id.getNumber() == 0xFFFF) {
 			// Unlock all resources of the requested type
-			Common::List<ResourceId> *resources = g_sci->getResMan()->listResources(type);
-			Common::List<ResourceId>::iterator itr = resources->begin();
-
-			while (itr != resources->end()) {
+			Common::List<ResourceId> resources = g_sci->getResMan()->listResources(type);
+			Common::List<ResourceId>::iterator itr;
+			for (itr = resources.begin(); itr != resources.end(); ++itr) {
 				Resource *res = g_sci->getResMan()->testResource(*itr);
 				if (res->isLocked())
 					g_sci->getResMan()->unlockResource(res);
-				++itr;
 			}
-
-			delete resources;
 		} else {
 			which = g_sci->getResMan()->findResource(id, 0);
 
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index c3bd03bac3..41062eb19b 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -753,12 +753,10 @@ void ResourceManager::addScriptChunkSources() {
 		// to try to get to any scripts in there. The Lighthouse SCI2.1 demo
 		// does exactly this.
 
-		Common::List<ResourceId> *resources = listResources(kResourceTypeScript);
+		Common::List<ResourceId> resources = listResources(kResourceTypeScript);
 
-		if (resources->empty() && testResource(ResourceId(kResourceTypeChunk, 0)))
+		if (resources.empty() && testResource(ResourceId(kResourceTypeChunk, 0)))
 			addResourcesFromChunk(0);
-
-		delete resources;
 	}
 #endif
 }
@@ -1045,13 +1043,13 @@ void ResourceManager::freeOldResources() {
 	}
 }
 
-Common::List<ResourceId> *ResourceManager::listResources(ResourceType type, int mapNumber) {
-	Common::List<ResourceId> *resources = new Common::List<ResourceId>;
+Common::List<ResourceId> ResourceManager::listResources(ResourceType type, int mapNumber) {
+	Common::List<ResourceId> resources;
 
 	ResourceMap::iterator itr = _resMap.begin();
 	while (itr != _resMap.end()) {
 		if ((itr->_value->getType() == type) && ((mapNumber == -1) || (itr->_value->getNumber() == mapNumber)))
-			resources->push_back(itr->_value->_id);
+			resources.push_back(itr->_value->_id);
 		++itr;
 	}
 
@@ -2199,9 +2197,8 @@ void ResourceManager::detectSciVersion() {
 
 	// Handle SCI32 versions here
 	if (_volVersion >= kResVersionSci2) {
-		Common::List<ResourceId> *heaps = listResources(kResourceTypeHeap);
-		bool hasHeapResources = !heaps->empty();
-		delete heaps;
+		Common::List<ResourceId> heaps = listResources(kResourceTypeHeap);
+		bool hasHeapResources = !heaps.empty();
 
 		// SCI2.1/3 and SCI1 Late resource maps are the same, except that
 		// SCI1 Late resource maps have the resource types or'd with
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index 47602de017..294a4672e2 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -322,7 +322,7 @@ public:
 	 * @param mapNumber	For audio36 and sync36, limit search to this map
 	 * @return			The resource list
 	 */
-	Common::List<ResourceId> *listResources(ResourceType type, int mapNumber = -1);
+	Common::List<ResourceId> listResources(ResourceType type, int mapNumber = -1);
 
 	void setAudioLanguage(int language);
 	int getAudioLanguage() const;
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 8730580302..764f4785b7 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -539,11 +539,10 @@ bool ResourceManager::isGMTrackIncluded() {
 
 	// Read the first song and check if it has a GM track
 	bool result = false;
-	Common::List<ResourceId> *resources = listResources(kResourceTypeSound, -1);
-	Common::sort(resources->begin(), resources->end());
-	Common::List<ResourceId>::iterator itr = resources->begin();
+	Common::List<ResourceId> resources = listResources(kResourceTypeSound, -1);
+	Common::sort(resources.begin(), resources.end());
+	Common::List<ResourceId>::iterator itr = resources.begin();
 	int firstSongId = itr->getNumber();
-	delete resources;
 
 	SoundResource *song1 = new SoundResource(firstSongId, this, soundVersion);
 	if (!song1) {
@@ -893,10 +892,10 @@ void AudioVolumeResourceSource::loadResource(ResourceManager *resMan, Resource *
 }
 
 bool ResourceManager::addAudioSources() {
-	Common::List<ResourceId> *resources = listResources(kResourceTypeMap);
-	Common::List<ResourceId>::iterator itr = resources->begin();
+	Common::List<ResourceId> resources = listResources(kResourceTypeMap);
+	Common::List<ResourceId>::iterator itr;
 
-	while (itr != resources->end()) {
+	for (itr = resources.begin(); itr != resources.end(); ++itr) {
 		ResourceSource *src = addSource(new IntMapResourceSource("MAP", itr->getNumber()));
 
 		if ((itr->getNumber() == 65535) && Common::File::exists("RESOURCE.SFX"))
@@ -905,12 +904,8 @@ bool ResourceManager::addAudioSources() {
 			addSource(new AudioVolumeResourceSource(this, "RESOURCE.AUD", src, 0));
 		else
 			return false;
-
-		++itr;
 	}
 
-	delete resources;
-
 	return true;
 }
 
@@ -944,8 +939,9 @@ void ResourceManager::changeAudioDirectory(Common::String path) {
 		audioResourceName = Common::String::format("%s/RESOURCE.AUD", path.c_str());
 	}
 
-	Common::List<ResourceId> *resources = listResources(kResourceTypeMap);
-	for (Common::List<ResourceId>::iterator it = resources->begin(); it != resources->end(); ++it) {
+	Common::List<ResourceId> resources = listResources(kResourceTypeMap);
+	Common::List<ResourceId>::iterator it;
+	for (it = resources.begin(); it != resources.end(); ++it) {
 		// Don't readd 65535.map or resource.sfx
 		if ((it->getNumber() == 65535))
 			continue;
@@ -954,8 +950,6 @@ void ResourceManager::changeAudioDirectory(Common::String path) {
 		addSource(new AudioVolumeResourceSource(this, audioResourceName, src, 0));
 	}
 
-	delete resources;
-
 	// Rescan the newly added resources
 	scanNewSources();
 }
-- 
cgit v1.2.3


From 34b297748c8e67995d84453b2b36b388161b93dc Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Jan 2012 20:11:30 +0200
Subject: SCI: Fix a nasty bug in kString(Dup)

The rawString variable is no longer pointing to invalidated data. This
fixes cases where strings are manipulated by game scripts, such as the
graveyard and rada drum puzzles in GK1
---
 engines/sci/engine/kstring.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 5ae18c1367..0f79c3592c 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -748,18 +748,21 @@ reg_t kString(EngineState *s, int argc, reg_t *argv) {
 		const char *rawString = 0;
 		uint32 size = 0;
 		reg_t stringHandle;
+		SciString *sciString;
+		Common::String commonString;
+
 		// We allocate the new string first because if the StringTable needs to
 		// grow, our rawString pointer will be invalidated
 		SciString *dupString = s->_segMan->allocateString(&stringHandle);
 
 		if (argv[1].segment == s->_segMan->getStringSegmentId()) {
-			SciString *string = s->_segMan->lookupString(argv[1]);
-			rawString = string->getRawData();
-			size = string->getSize();
+			sciString = s->_segMan->lookupString(argv[1]);
+			rawString = sciString->getRawData();
+			size = sciString->getSize();
 		} else {
-			Common::String string = s->_segMan->getString(argv[1]);
-			rawString = string.c_str();
-			size = string.size() + 1;
+			commonString = s->_segMan->getString(argv[1]);
+			rawString = commonString.c_str();
+			size = commonString.size() + 1;
 		}
 
 		dupString->setSize(size);
-- 
cgit v1.2.3


From 96aa86a60b036041446ff52975472ae23887a85f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Jan 2012 20:58:14 +0200
Subject: SCI: Remove wrong script-to-array copying code in kArray

---
 engines/sci/engine/klists.cpp | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp
index 83e59c9c20..2a33df26bc 100644
--- a/engines/sci/engine/klists.cpp
+++ b/engines/sci/engine/klists.cpp
@@ -753,7 +753,6 @@ reg_t kArray(EngineState *s, int argc, reg_t *argv) {
 
 		reg_t arrayHandle = argv[1];
 		SciArray<reg_t> *array1 = s->_segMan->lookupArray(argv[1]);
-		//SciArray<reg_t> *array1 = !argv[1].isNull() ? s->_segMan->lookupArray(argv[1]) : s->_segMan->allocateArray(&arrayHandle);
 		SciArray<reg_t> *array2 = s->_segMan->lookupArray(argv[3]);
 		uint32 index1 = argv[2].toUint16();
 		uint32 index2 = argv[4].toUint16();
@@ -790,21 +789,8 @@ reg_t kArray(EngineState *s, int argc, reg_t *argv) {
 #endif
 			return NULL_REG;
 		}
-		SegmentType sourceType = s->_segMan->getSegmentObj(argv[1].segment)->getType();
-		if (sourceType == SEG_TYPE_SCRIPT) {
-			// A technique used in later SCI2.1 and SCI3 games: the contents of a script
-			// are loaded in an array (well, actually a string).
-			Script *scr = s->_segMan->getScript(argv[1].segment);
-			reg_t stringHandle;
-
-			SciString *dupString = s->_segMan->allocateString(&stringHandle);
-			dupString->setSize(scr->getBufSize());
-			dupString->fromString(Common::String((const char *)scr->getBuf()));
-
-			return stringHandle;
-		} else if (sourceType != SEG_TYPE_ARRAY && sourceType != SEG_TYPE_SCRIPT) {
-			error("kArray(Dup): Request to duplicate a segment which isn't an array or a script");
-		}
+		if (s->_segMan->getSegmentObj(argv[1].segment)->getType() != SEG_TYPE_ARRAY)
+			error("kArray(Dup): Request to duplicate a segment which isn't an array");
 
 		reg_t arrayHandle;
 		SciArray<reg_t> *dupArray = s->_segMan->allocateArray(&arrayHandle);
-- 
cgit v1.2.3


From aff92ea4cd0db8c9beacebe60c9a7c598b1eb01d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Jan 2012 21:02:02 +0200
Subject: SCI: Zero-terminate strings in SciString::fromString()

---
 engines/sci/engine/segment.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/segment.cpp b/engines/sci/engine/segment.cpp
index 73d81baf3a..fcf9774a08 100644
--- a/engines/sci/engine/segment.cpp
+++ b/engines/sci/engine/segment.cpp
@@ -294,11 +294,12 @@ void SciString::fromString(const Common::String &string) {
 	if (_type != 3)
 		error("SciString::fromString(): Array is not a string");
 
-	if (string.size() > _size)
-		setSize(string.size());
+	setSize(string.size() + 1);
 
 	for (uint32 i = 0; i < string.size(); i++)
 		_data[i] = string[i];
+
+	_data[string.size()] = 0;
 }
 
 SegmentRef StringTable::dereference(reg_t pointer) {
-- 
cgit v1.2.3


From cbe75278050eea9226be4a3286e101f04a8c87b9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Jan 2012 21:05:10 +0200
Subject: SCI: Use fromString() in kString(Dup) to simplify code

---
 engines/sci/engine/kstring.cpp | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 0f79c3592c..03359b48c1 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -745,30 +745,24 @@ reg_t kString(EngineState *s, int argc, reg_t *argv) {
 			return make_reg(0, strcmp(string1.c_str(), string2.c_str()));
 	}
 	case 8: { // Dup
-		const char *rawString = 0;
-		uint32 size = 0;
 		reg_t stringHandle;
-		SciString *sciString;
-		Common::String commonString;
 
 		// We allocate the new string first because if the StringTable needs to
 		// grow, our rawString pointer will be invalidated
 		SciString *dupString = s->_segMan->allocateString(&stringHandle);
 
 		if (argv[1].segment == s->_segMan->getStringSegmentId()) {
-			sciString = s->_segMan->lookupString(argv[1]);
-			rawString = sciString->getRawData();
-			size = sciString->getSize();
-		} else {
-			commonString = s->_segMan->getString(argv[1]);
-			rawString = commonString.c_str();
-			size = commonString.size() + 1;
-		}
+			SciString *sciString = s->_segMan->lookupString(argv[1]);
+			const char *rawString = sciString->getRawData();
+			uint32 size = sciString->getSize();
 
-		dupString->setSize(size);
+			dupString->setSize(sciString->getSize());
 
-		for (uint32 i = 0; i < size; i++)
-			dupString->setValue(i, rawString[i]);
+			for (uint32 i = 0; i < size; i++)
+				dupString->setValue(i, rawString[i]);
+		} else {
+			dupString->fromString(s->_segMan->getString(argv[1]));
+		}
 
 		return stringHandle;
 	}
-- 
cgit v1.2.3


From c69ac88be24feb733c74967d367e469e4d90913b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Jan 2012 21:10:18 +0200
Subject: SCI: Ignore an invalid export in a script in the demo of RAMA

---
 engines/sci/engine/vm.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index cbe4736ba2..162dce9fcc 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -235,6 +235,9 @@ ExecStack *execute_method(EngineState *s, uint16 script, uint16 pubfunct, StackP
 		if (g_sci->getGameId() == GID_TORIN && script == 64036) {
 			// Script 64036 in Torin's Passage is empty and contains an invalid
 			// (empty) export
+		} else if (g_sci->getGameId() == GID_RAMA && script == 64908) {
+			// Script 64908 in the demo of RAMA contains an invalid (empty)
+			// export
 		} else
 #endif
 			error("Request for invalid exported function 0x%x of script %d", pubfunct, script);
-- 
cgit v1.2.3


From 7560007ba9becb824c9a107b65f6a630daea9e58 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Jan 2012 21:42:09 +0200
Subject: SCI: Simplify kString(Dup) using the overloaded = operator

Thanks to wjp for his suggestion
---
 engines/sci/engine/kstring.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 03359b48c1..089ba0e65b 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -752,14 +752,7 @@ reg_t kString(EngineState *s, int argc, reg_t *argv) {
 		SciString *dupString = s->_segMan->allocateString(&stringHandle);
 
 		if (argv[1].segment == s->_segMan->getStringSegmentId()) {
-			SciString *sciString = s->_segMan->lookupString(argv[1]);
-			const char *rawString = sciString->getRawData();
-			uint32 size = sciString->getSize();
-
-			dupString->setSize(sciString->getSize());
-
-			for (uint32 i = 0; i < size; i++)
-				dupString->setValue(i, rawString[i]);
+			*dupString = *s->_segMan->lookupString(argv[1]);
 		} else {
 			dupString->fromString(s->_segMan->getString(argv[1]));
 		}
-- 
cgit v1.2.3


From 099b2e9249a81b1cc8e05774c0a85aa29d7853fe Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 15 Jan 2012 23:00:23 +0200
Subject: SCI: Properly handle negative coordinates in drawTextBitmap()

This fixes occasional crashes when going to the map in GK1. Many thanks
to digitall for finding this through Valgrind
---
 engines/sci/graphics/text32.cpp | 6 +++++-
 engines/sci/graphics/text32.h   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/graphics/text32.cpp b/engines/sci/graphics/text32.cpp
index e7595fbdaf..e24799f6b8 100644
--- a/engines/sci/graphics/text32.cpp
+++ b/engines/sci/graphics/text32.cpp
@@ -173,7 +173,7 @@ void GfxText32::disposeTextBitmap(reg_t hunkId) {
 	_segMan->freeHunkEntry(hunkId);
 }
 
-void GfxText32::drawTextBitmap(uint16 x, uint16 y, Common::Rect planeRect, reg_t textObject) {
+void GfxText32::drawTextBitmap(int16 x, int16 y, Common::Rect planeRect, reg_t textObject) {
 	reg_t hunkId = readSelector(_segMan, textObject, SELECTOR(bitmap));
 	uint16 backColor = readSelectorValue(_segMan, textObject, SELECTOR(back));
 	// Sanity check: Check if the hunk is set. If not, either the game scripts
@@ -181,6 +181,10 @@ void GfxText32::drawTextBitmap(uint16 x, uint16 y, Common::Rect planeRect, reg_t
 	if (hunkId.isNull())
 		return;
 
+	// Negative coordinates indicate that text shouldn't be displayed
+	if (x < 0 || y < 0)
+		return;
+
 	byte *memoryPtr = _segMan->getHunkPointer(hunkId);
 
 	if (!memoryPtr)
diff --git a/engines/sci/graphics/text32.h b/engines/sci/graphics/text32.h
index 3c1898858b..3505de85eb 100644
--- a/engines/sci/graphics/text32.h
+++ b/engines/sci/graphics/text32.h
@@ -34,7 +34,7 @@ public:
 	~GfxText32();
 	reg_t createTextBitmap(reg_t textObject, uint16 maxWidth = 0, uint16 maxHeight = 0, reg_t prevHunk = NULL_REG);
 	void disposeTextBitmap(reg_t hunkId);
-	void drawTextBitmap(uint16 x, uint16 y, Common::Rect planeRect, reg_t textObject);
+	void drawTextBitmap(int16 x, int16 y, Common::Rect planeRect, reg_t textObject);
 	int16 GetLongest(const char *text, int16 maxWidth, GfxFont *font);
 
 	void kernelTextSize(const char *text, int16 font, int16 maxWidth, int16 *textWidth, int16 *textHeight);
-- 
cgit v1.2.3


From 3d4f4ce799ecd71a8bc67cd25d50a1cd4d8805ad Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 15 Jan 2012 23:04:09 +0100
Subject: TSAGE: R2R - Scene 1550: Implement subA2B2F()

---
 engines/tsage/globals.h                         |   5 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 698 +++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h   |   8 +-
 engines/tsage/staticres.cpp                     | 163 +++++-
 engines/tsage/staticres.h                       |  11 +-
 5 files changed, 876 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 9d00e618a4..5b1d6b4eb0 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -242,6 +242,11 @@ namespace Ringworld2 {
 #define SPEECH_TEXT 1
 #define SPEECH_VOICE 2
 
+#define k5A78C 15
+#define k5A78D 16
+#define k5A790 18
+#define k5A791 17
+
 class Ringworld2Globals: public TsAGE2Globals {
 public:
 	ASoundExt _sound1, _sound2, _sound3, _sound4;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index aa2a0d9c44..04c4c056ca 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2262,7 +2262,7 @@ bool Scene1550::Hotspot3::startAction(CursorType action, Event &event) {
 	assert ((R2_GLOBALS._player._characterIndex == 1) || (R2_GLOBALS._player._characterIndex == 2));
 	// The original contains a debug message when CURSOR_TALK is used.
 	if (action == CURSOR_TALK)
-		warning("Location: %d/%d - %d", R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex], R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2], _v5A4D6[(R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] * 30)] + R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex]);
+		warning("Location: %d/%d - %d", R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex], R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2], k5A4D6[(R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] * 30)] + R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex]);
 
 	return SceneHotspot::startAction(action, event);
 }
@@ -2519,7 +2519,9 @@ void Scene1550::postInit(SceneObjectList *OwnerList) {
 	default:
 		break;
 	}
-	warning("subA2B2F();");
+	
+	subA2B2F();
+	
 	_item1.setDetails(16, 1550, 10, -1, -1);
 	_item2.setDetails(24, 1550, 10, -1, -1);
 	_item3.setDetails(Rect(0, 0, 320, 200), 1550, 0, 1, -1, 1, NULL);
@@ -2945,7 +2947,9 @@ void Scene1550::dispatch() {
 		_sceneMode = 1;
 		_field412 = 1;
 		--R2_GLOBALS._v565EC[2 + R2_GLOBALS._player._characterIndex];
-		warning("subA2B2F();");
+		
+		subA2B2F();
+		
 		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);
@@ -2966,7 +2970,9 @@ void Scene1550::dispatch() {
 		_sceneMode = 3;
 		_field412 = 1;
 		++R2_GLOBALS._v565EC[2 + R2_GLOBALS._player._characterIndex];
-		warning("subA2B2F();");
+		
+		subA2B2F();
+		
 		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);
@@ -2987,7 +2993,9 @@ void Scene1550::dispatch() {
 		_sceneMode = 5;
 		_field412 = 1;
 		++R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex];
-		warning("subA2B2F();");
+		
+		subA2B2F();
+		
 		if ((R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] == 9) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == 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));
@@ -3048,5 +3056,685 @@ void Scene1550::saveCharacter(int characterIndex) {
 	SceneExt::saveCharacter(characterIndex);
 }
 
+void Scene1550::SceneActor1550::subA4D14(int arg1, int arg2) {
+	warning("Scene1550::subA4D14(%d, %d);", arg1, arg2);
+}
+
+void Scene1550::subA2B2F() {
+	Rect tmpRect;
+	_field419 = 0;
+	_field415 = 0;
+	
+	tmpRect = R2_GLOBALS._v5589E;
+	
+	_actor14.remove();
+	_actor17.remove();
+	_actor15.remove();
+	_actor19.remove();
+	_actor16.remove();
+	_actor18.remove();
+	
+	for (int i = 0; i < 8; ++i)
+		_arrUnkObj15501[i].remove();
+	
+	_actor6.remove();
+
+	for (int i = 0; i < 8; ++i)
+		_arrUnkObj15502[i].remove();
+	
+	_actor8.remove();
+	_actor9.remove();
+	_actor10.remove();
+	_actor3.remove();
+	_actor11.remove();
+	
+	if ((_sceneMode != 1577) && (_sceneMode != 1578))
+		_actor1.remove();
+	
+	_actor2.remove();
+	_actor7.remove();
+	_actor13.remove();
+	_actor5.remove();
+	_actor12.remove();
+	_actor4.remove();
+	
+	switch (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2]) {
+	case 0:
+		switch (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex]) {
+		case 3:
+			R2_GLOBALS._walkRegions.load(1554);
+			_field419 = 1554;
+			break;
+		case 4:
+			R2_GLOBALS._walkRegions.load(1553);
+			_field419 = 1553;
+			break;
+		default:
+			break;
+		}
+		break;
+	case 3:
+	// No break on purpose
+	case 4:
+		if ((R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] == 23) || (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex])) {
+			if (!R2_GLOBALS.getFlag(16)) {
+				R2_GLOBALS._walkRegions.load(1559);
+				_field419 = 1559;
+			}
+		}
+		break;
+	case 7:
+		switch (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex]) {
+		case 10:
+			R2_GLOBALS._walkRegions.load(1555);
+			_field419 = 1555;
+			break;
+		case 11:
+			R2_GLOBALS._walkRegions.load(1556);
+			_field419 = 1556;
+			break;
+		default:
+			break;
+		}
+		break;
+	case 11:
+		switch (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex]) {
+		case 24:
+			R2_GLOBALS._walkRegions.load(1558);
+			_field419 = 1558;
+			break;
+		case 25:
+			R2_GLOBALS._walkRegions.load(1557);
+			_field419 = 1557;
+			break;
+		default:
+			break;
+		}
+		break;
+	case 16:
+		switch (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex]) {
+		case 2:
+			R2_GLOBALS._walkRegions.load(1552);
+			_field419 = 1552;
+			break;
+		case 3:
+			R2_GLOBALS._walkRegions.load(1551);
+			_field419 = 1551;
+			break;
+		case 15:
+			R2_GLOBALS._walkRegions.load(1575);
+			_field419 = 1575;
+		default:
+			break;
+		}
+		break;
+	default:
+		break;
+	}
+
+	int varA = 0;
+
+	if (!R2_GLOBALS.getFlag(16)) {
+		switch (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] - 2) {
+		case 0:
+			switch (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] - 22) {
+				case 0:
+					varA = 1553;
+					_actor15.subA4D14(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;
+					_actor15.subA4D14(6, 0);
+					break;
+				default:
+					break;
+			}
+			break;
+		case 1:
+		// No break on purpose
+		case 2:
+			switch (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] - 21) {
+			case 0:
+				varA = 1550;
+				_actor15.subA4D14(9, 0);
+				break;
+			case 1:
+				varA = 1552;
+				_actor15.subA4D14(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;
+				_actor15.subA4D14(7, 0);
+				break;
+			case 7:
+				varA = 1550;
+				_actor15.subA4D14(8, 0);
+				break;
+			default:
+				break;
+			}
+			break;
+		case 3:
+			switch (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] - 21) {
+			case 0:
+				varA = 1550;
+				_actor15.subA4D14(4, 0);
+				break;
+			case 1:
+				varA = 1550;
+				_actor15.subA4D14(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;
+				_actor15.subA4D14(2, 0);
+				break;
+			case 7:
+				varA = 1550;
+				_actor15.subA4D14(1, 0);
+				break;
+			default:
+				break;
+			}
+			break;
+		default:
+			break;
+		}
+		if ((R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] > 0) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] <= 29) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] >= 20) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] > 7)) {
+			R2_GLOBALS.setFlag(16);
+			R2_GLOBALS._sceneManager.changeScene(1500);
+		}
+	}
+
+	if ((R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] == 9) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == 11)) {
+		if (R2_GLOBALS._sceneManager._sceneNumber != 1234) {
+			R2_GLOBALS._sceneManager._fadeMode = FADEMODE_IMMEDIATE;
+			loadScene(1234);
+			R2_GLOBALS._sceneManager._hasPalette = false;
+			_field414 = 0;
+		}
+	} else {
+		if (R2_GLOBALS._sceneManager._sceneNumber == 1234) {
+			R2_GLOBALS._sceneManager._fadeMode = FADEMODE_IMMEDIATE;
+			loadScene(1550);
+			R2_GLOBALS._sceneManager._hasPalette = false;
+		}
+	}
+
+	if (R2_GLOBALS._sceneManager._sceneNumber == 1234)
+		_field419 = 1576;
+
+	if (_field414 == 0) {
+		_field414 = 1;
+	} else {
+		if (_field414 == 2) {
+			_field414 = 3;
+		} else {
+			_field414 = 2;
+		}
+		
+		if (R2_GLOBALS._sceneManager._sceneNumber == 1550){
+			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("Missing sub2957D()");
+			warning("gfx_set_pane_p()");
+			R2_GLOBALS._sceneManager._fadeMode = FADEMODE_IMMEDIATE;
+
+			if (varA == 0) {
+				if (_field417 != 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)
+				_field417 = varA;
+
+			warning("sub_2C429()");
+		}
+	}
+
+	switch (k5A4D6[(R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] * 30)] + R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex]) {
+	case 0:
+		if (_field419 == 0) {
+			R2_GLOBALS._walkRegions.load(1550);
+			_field419 = 1550;
+		}
+		break;
+	case 1:
+		if (_field419 == 0) {
+			R2_GLOBALS._walkRegions.load(1560);
+			_field419 = 1560;
+		}
+		_actor14.subA4D14(2, 1);
+		_actor15.subA4D14(1, 3);
+		_actor16.subA4D14(2, 5);
+		break;
+	case 2:
+		R2_GLOBALS._walkRegions.load(1561);
+		_field419 = 1561;
+		_actor14.subA4D14(2, 1);
+		_actor17.subA4D14(2, 2);
+		_actor15.subA4D14(1, 3);
+		_actor16.subA4D14(2, 5);
+		break;
+	case 3:
+		R2_GLOBALS._walkRegions.load(1562);
+		_field419 = 1562;
+		_actor14.subA4D14(2, 1);
+		_actor15.subA4D14(1, 3);
+		_actor16.subA4D14(2, 5);
+		_actor18.subA4D14(2, 6);
+		break;
+	case 4:
+		R2_GLOBALS._walkRegions.load(1563);
+		_field419 = 1563;
+		_actor15.subA4D14(2, 3);
+		break;
+	case 5:
+		R2_GLOBALS._walkRegions.load(1564);
+		_field419 = 1564;
+		_actor19.subA4D14(2, 4);
+		break;
+	case 6:
+		R2_GLOBALS._walkRegions.load(1565);
+		_field419 = 1565;
+		_actor14.subA4D14(1, 1);
+		_actor17.subA4D14(1, 2);
+		_actor15.subA4D14(3, 3);
+		break;
+	case 7:
+		R2_GLOBALS._walkRegions.load(1566);
+		_field419 = 1566;
+		_actor14.subA4D14(1, 1);
+		_actor17.subA4D14(1, 2);
+		_actor15.subA4D14(2, 4);
+		break;
+	case 8:
+		R2_GLOBALS._walkRegions.load(1567);
+		_field419 = 1567;
+		_actor17.subA4D14(5, 2);
+		break;
+	case 9:
+		R2_GLOBALS._walkRegions.load(1568);
+		_field419 = 1568;
+		_actor17.subA4D14(4, 2);
+		break;
+	case 10:
+		R2_GLOBALS._walkRegions.load(1569);
+		_field419 = 1569;
+		_actor14.subA4D14(3, 1);
+		break;
+	case 11:
+		R2_GLOBALS._walkRegions.load(1570);
+		_field419 = 1570;
+		_actor14.subA4D14(1, 1);
+		_actor17.subA4D14(1, 2);
+		break;
+	case 12:
+		R2_GLOBALS._walkRegions.load(1571);
+		_field419 = 1571;
+		_actor16.subA4D14(1, 5);
+		_actor18.subA4D14(1, 6);
+		break;
+	case 13:
+		R2_GLOBALS._walkRegions.load(1572);
+		_field419 = 1572;
+		_actor14.subA4D14(1, 1);
+		_actor17.subA4D14(1, 2);
+		_actor19.subA4D14(1, 4);
+		break;
+	case 14:
+		R2_GLOBALS._walkRegions.load(1573);
+		_field419 = 1573;
+		_actor19.subA4D14(1, 4);
+		_actor16.subA4D14(1, 5);
+		_actor18.subA4D14(1, 6);
+		break;
+	case 15:
+		R2_GLOBALS._walkRegions.load(1574);
+		_field419 = 1574;
+		_actor19.subA4D14(1, 4);
+		break;
+	case 16:
+		R2_GLOBALS._walkRegions.load(1570);
+		_field419 = 1570;
+		_actor14.subA4D14(2, 1);
+		_actor17.subA4D14(2, 2);
+		break;
+	case 17:
+		R2_GLOBALS._walkRegions.load(1570);
+		_field419 = 1570;
+		_actor14.subA4D14(2, 1);
+		_actor17.subA4D14(3, 2);
+		break;
+	case 18:
+		R2_GLOBALS._walkRegions.load(1571);
+		_field419 = 1571;
+		_actor16.subA4D14(2, 5);
+		_actor18.subA4D14(2, 6);
+		break;
+	case 19:
+		R2_GLOBALS._walkRegions.load(1571);
+		_field419 = 1571;
+		_actor16.subA4D14(2, 5);
+		_actor18.subA4D14(3, 6);
+		break;
+	default:
+		break;
+	}
+
+	int di = 0;
+	int tmpIdx = 0;
+	for (int i = 0; i < 129 * 4; i += 4) {
+		if ((R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] == k562CC[i]) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == k562CC[i + 1]) && (k562CC[i + 2] != 0)) {
+			tmpIdx = k562CC[i + 3];
+			_arrUnkObj15501[di].postInit();
+			_arrUnkObj15501[di]._effect = 6;
+			_arrUnkObj15501[di]._shade = 0;
+			_arrUnkObj15501[di]._fieldA4 = tmpIdx;
+			_arrUnkObj15501[di]._fieldA6 = i;
+			_arrUnkObj15501[di].setDetails(1550, 62, -1, 63, 2, (SceneItem *) NULL);
+			if (k562CC[i + 2] == 41) {
+				_arrUnkObj15501[di].changeZoom(-1);
+				_arrUnkObj15501[di].setPosition(Common::Point(150, 70));
+				_arrUnkObj15501[di].setup(1562, 1, 1);
+				R2_GLOBALS._walkRegions.enableRegion(k5A78C);
+				R2_GLOBALS._walkRegions.enableRegion(k5A78D);
+				R2_GLOBALS._walkRegions.enableRegion(k5A790);
+				R2_GLOBALS._walkRegions.enableRegion(k5A791);
+				if (R2_INVENTORY.getObjectScene(R2_26) == 1550) {
+					_actor9.postInit();
+					_actor9.setup(1562, 3, 1);
+					_actor9.setPosition(Common::Point(150, 70));
+					_actor9.fixPriority(10);
+					_actor9.setDetails(1550, 41, -1, 42, 2, (SceneItem *) NULL);
+				}
+			} else {
+				if (k562CC[i + 2] > 40) {
+					_arrUnkObj15501[di].changeZoom(100);
+					_arrUnkObj15501[di].setup(1561, 1, k562CC[i + 2] - 40);
+				} else {
+					_arrUnkObj15501[di].changeZoom(-1);
+					_arrUnkObj15501[di].setup(1552, ((k562CC[i + 2] - 1) / 5) + 1, ((k562CC[i + 2] - 1) % 5) + 1);
+				}
+				_arrUnkObj15501[di].setPosition(Common::Point(k5A72E[tmpIdx], k5A73F[tmpIdx]));
+				if (k5A78A[tmpIdx] != 0)
+					R2_GLOBALS._walkRegions.enableRegion(k5A78A[tmpIdx]);
+				di++;
+			}
+		}
+	}
+
+	for (int i = 0; i < 15 * 3; i++) {
+		if ((R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] == k5A79B[i]) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == k5A79B[i + 1])) {
+			tmpIdx = k5A79B[i + 2];
+			switch (tmpIdx - 1) {
+			case 0:
+				if (!R2_GLOBALS.getFlag(16)) {
+					_actor1.postInit();
+					if (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == 3)
+						_actor1.setup(1555, 2, 1);
+					else
+						_actor1.setup(1555, 1, 1);
+					_actor1.setPosition(Common::Point(150, 100));
+					_actor1.fixPriority(92);
+					_actor1.setDetails(1550, 73, -1, -1, 2, (SceneItem *) NULL);
+				}
+				break;
+			case 1:
+				_actor13.postInit();
+				warning("_actor13._actorName = \"dish\";");
+				if (R2_GLOBALS.getFlag(19))
+					_actor13.setup(1556, 3, 5);
+				else
+					_actor13.setup(1556, 3, 1);
+				_actor13.changeZoom(95);
+				_actor13.setPosition(Common::Point(165, 83));
+				_actor13.fixPriority(168);
+				_actor13.setDetails(1550, 17, -1, 19, 2, (SceneItem *) NULL);
+
+				_actor12.postInit();
+				_actor12.setup(1556, 4, 1);
+				_actor12.setPosition(Common::Point(191, 123));
+				_actor12.changeZoom(95);
+				_actor12.setDetails(1550, 65, -1, 66, 2, (SceneItem *) NULL);
+
+				_actor5.postInit();
+				_actor5._numFrames = 5;
+				if (R2_GLOBALS.getFlag(19))
+					_actor5.setup(1556, 8, 5);
+				else
+					_actor5.setup(1556, 8, 1);
+
+				_actor5.setPosition(Common::Point(156, 151));
+				_actor5.fixPriority(10);
+
+				_actor4.postInit();
+				if (R2_GLOBALS.getFlag(20))
+					_actor4.setup(1558, 3, 10);
+				else
+					_actor4.setup(1558, 3, 1);
+
+				_actor4.setPosition(Common::Point(172, 48));
+				_actor4.fixPriority(169);
+				R2_GLOBALS._walkRegions.enableRegion(k5A78A[15]);
+				break;
+			case 2:
+				_actor6.postInit();
+				_actor6.setup(1550, 1, 1);
+				_actor6.setPosition(Common::Point(259, 55));
+				_actor6.fixPriority(133);
+				_actor6.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
+
+				_actor1.postInit();
+				_actor1.setup(1550, 1, 2);
+				_actor1.setPosition(Common::Point(259, 133));
+				_actor1.fixPriority(105);
+				_actor1.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
+				if (R2_INVENTORY.getObjectScene(R2_18) == 1550) {
+					_actor10.postInit();
+					_actor10.setup(1550, 7, 2);
+					_actor10.setPosition(Common::Point(227, 30));
+					_actor10.fixPriority(130);
+					_actor10.setDetails(1550, 29, -1, 63, 2, (SceneItem *) NULL);
+				}
+				break;
+			case 3:
+				_actor6.postInit();
+				_actor6.setup(1550, 1, 4);
+				_actor6.setPosition(Common::Point(76, 131));
+				_actor6.fixPriority(10);
+				_actor6.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
+
+				_actor1.postInit();
+				_actor1.setup(1550, 1, 3);
+				_actor1.setPosition(Common::Point(76, 64));
+				_actor1.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
+				if (R2_INVENTORY.getObjectScene(R2_28) == 1550) {
+					_actor11.postInit();
+					_actor11.setup(1504, 4, 1);
+					_actor11.setPosition(Common::Point(49, 35));
+					_actor11.animate(ANIM_MODE_2, NULL);
+					_actor11._numFrames = 4;
+					_actor11.fixPriority(65);
+					_actor11.setDetails(1550, 14, 15, 63, 2, (SceneItem *) NULL);
+				}
+				if (R2_INVENTORY.getObjectScene(R2_19) == 1550) {
+					_actor8.postInit();
+					_actor8.setup(1550, 7, 1);
+					_actor8.setPosition(Common::Point(45, 44));
+					_actor8.fixPriority(150);
+					_actor8.setDetails(1550, 44, -1, 63, 2, (SceneItem *) NULL);
+				}
+				break;
+			case 4:
+				_actor6.postInit();
+				_actor6.setup(1550, 2, 4);
+				_actor6.setPosition(Common::Point(243, 131));
+				_actor6.fixPriority(10);
+				_actor6.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
+				
+				_actor1.postInit();
+				_actor1.setup(1550, 2, 3);
+				_actor1.setPosition(Common::Point(243, 64));
+				_actor1.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
+				break;
+			case 5:
+				_actor6.postInit();
+				_actor6.setup(1550, 2, 1);
+				_actor6.setPosition(Common::Point(60, 55));
+				_actor6.fixPriority(133);
+				_actor6.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
+
+				_actor1.postInit();
+				_actor1.setup(1550, 2, 2);
+				_actor1.setPosition(Common::Point(60, 133));
+				_actor1.fixPriority(106);
+				_actor1.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
+				break;
+			case 6:
+				_actor6.postInit();
+				_actor6.setup(1550, 3, 1);
+				_actor6.setPosition(Common::Point(281, 132));
+				_actor6.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
+				break;
+			case 7:
+				_actor6.postInit();
+				_actor6.setup(1550, 3, 2);
+				_actor6.setPosition(Common::Point(57, 96));
+				_actor6.fixPriority(70);
+				_actor6.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
+
+				_actor1.postInit();
+				_actor1.setup(1550, 3, 3);
+				_actor1.setPosition(Common::Point(145, 88));
+				_actor1.fixPriority(55);
+				_actor1.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
+
+				_actor2.postInit();
+				_actor2.setup(1550, 3, 4);
+				_actor2.setPosition(Common::Point(64, 137));
+				_actor2.fixPriority(115);
+				_actor2.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
+
+				_actor3.postInit();
+				_actor3.setup(1550, 5, 1);
+				_actor3.setPosition(Common::Point(60, 90));
+				_actor3.fixPriority(45);
+				break;
+			case 8:
+				_actor6.postInit();
+				_actor6.setup(1550, 4, 2);
+				_actor6.setPosition(Common::Point(262, 96));
+				_actor6.fixPriority(70);
+				_actor6.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
+
+				_actor1.postInit();
+				_actor1.setup(1550, 4, 3);
+				_actor1.setPosition(Common::Point(174, 88));
+				_actor1.fixPriority(55);
+				_actor1.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
+
+				_actor2.postInit();
+				_actor2.setup(1550, 4, 4);
+				_actor2.setPosition(Common::Point(255, 137));
+				_actor2.fixPriority(115);
+				_actor2.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
+
+				_actor3.postInit();
+				_actor3.setup(1550, 6, 1);
+				_actor3.setPosition(Common::Point(259, 90));
+				_actor3.fixPriority(45);
+				break;
+			case 9:
+				_actor6.postInit();
+				_actor6.setup(1550, 4, 1);
+				_actor6.setPosition(Common::Point(38, 132));
+				_actor6.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
+				break;
+			case 11:
+				warning("_arrUnkObj15502[7].sub_A5CDF(8);");
+				warning("_arrUnkObj15502[0].sub_A5CDF(1);");
+				warning("_arrUnkObj15502[1].sub_A5CDF(2);");
+				warning("_arrUnkObj15502[2].sub_A5CDF(3);");
+				warning("_arrUnkObj15502[3].sub_A5CDF(4);");
+				warning("_arrUnkObj15502[4].sub_A5CDF(5);");
+				warning("_arrUnkObj15502[5].sub_A5CDF(6);");
+				warning("_arrUnkObj15502[6].sub_A5CDF(7);");
+			default:
+				break;
+			}
+		}
+	}
+
+	if ((R2_GLOBALS._v565EC[1] == R2_GLOBALS._v565EC[2]) && (R2_GLOBALS._v565EC[3] == R2_GLOBALS._v565EC[4])) {
+		_actor7.postInit();
+		_actor7._effect = 7;
+		_actor7.changeZoom(-1);
+
+		assert((_field419 >= 1550) && (_field419 <= 2008));
+		R2_GLOBALS._walkRegions.enableRegion(k5A750[_field419 - 1550]);
+		_actor7.setPosition(Common::Point(k5A72E[k5A76D[_field419 - 1550]], k5A73F[k5A76D[_field419 - 1550]] + 8));
+		if (R2_GLOBALS._player._characterIndex == 1) {
+			if (R2_GLOBALS._player._characterScene[2] == 1580) {
+				_actor7.setup(1516, 3, 17);
+				_actor7.setPosition(Common::Point(272, 94));
+				_actor7.fixPriority(91);
+				_actor7.changeZoom(100);
+				warning("_actor7.setDetails(1550, -1, -1, -1, 5, _arrUnkObj15502[7]);");
+			} else {
+				_actor7.setup(1505, 6, 1);
+				_actor7.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
+			}
+		} else {
+			if (R2_GLOBALS._player._characterScene[1] == 1580) {
+				_actor7.setup(1516, 2, 14);
+				_actor7.setPosition(Common::Point(276, 97));
+				_actor7.fixPriority(91);
+				_actor7.changeZoom(100);
+				warning("_actor7.setDetails(1550, -1, -1, -1, 5, _arrUnkObj15502[7]);");
+			} else {
+				_actor7.setup(1500, 6, 1);
+				_actor7.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
+			}
+		}
+	}
+	R2_GLOBALS._uiElements.updateInventory();
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 6d2bd3b084..0ec42b1d04 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -227,6 +227,11 @@ public:
 };
 
 class Scene1550 : public SceneExt {
+	class SceneActor1550 : public SceneActor {
+	public:
+		void subA4D14(int arg1, int arg2);
+	};
+
 	class UnkObj15501 : public SceneActor {
 	public:
 		int _fieldA4;
@@ -319,7 +324,7 @@ class Scene1550 : public SceneExt {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 
-	class Actor14 : public SceneActor {
+	class Actor14 : public SceneActor1550 {
 		// Nothing specific found in the original
 		// TODO: check if it's an useless class
 	};
@@ -363,6 +368,7 @@ public:
 
 	Scene1550();
 	void synchronize(Serializer &s);
+	void subA2B2F();
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index 1251b6d262..398d06881b 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -237,7 +237,137 @@ char const *const F7 = "F7";
 char const *const F8 = "F8";
 char const *const F10 = "F10";
 
-const byte _v5A4D6[] = {
+const byte k562CC[] = {
+	20, 7,  41, 6,
+	3,  6,  42, 11,
+	10, 15, 43, 6,
+	15, 1,  44, 7,
+	1,  1,  2,  1,
+	1,  1,  21, 12,
+	5,  1,  36, 1,
+	5,  1,  28, 2,
+	9,  1,  10, 7,
+	9,  1,  12, 10,
+	19, 1,  10, 8,
+	19, 1,  2,  13,
+	25, 1,  31, 1,
+	27, 1,  15, 6,
+	27, 1,  20, 7,
+	28, 1,  24, 4,
+	6,  2,  22, 1,
+	6,  2,  16, 5,
+	12, 2,  40, 1,
+	12, 2,  6,  11,
+	18, 2,  21, 5,
+	20, 5,  19, 4,
+	20, 5,  18, 8,
+	1,  6,  20, 11,
+	1,  6,  18, 15,
+	1,  6,  16, 4,
+	7,  6,  6,  16,
+	8,  6,  23, 9,
+	8,  6,  38, 10,
+	8,  6,  14, 13,
+	8,  6,  6,  14,
+	8,  6,  11, 15,
+	10, 6,  3,  1,
+	10, 6,  8,  2,
+	10, 6,  13, 3,
+	10, 6,  6,  15,
+	17, 6,  4,  15,
+	5,  7,  26, 11,
+	25, 7,  27, 3,
+	28, 7,  21, 5,
+	2,  8,  23, 5,
+	14, 8,  21, 5,
+	14, 8,  22, 16,
+	22, 8,  34, 3,
+	22, 8,  24, 7,
+	6,  9,  38, 5,
+	6,  9,  32, 6,
+	6,  9,  18, 7,
+	9,  9,  34, 15,
+	9,  9,  35, 16,
+	18, 9,  1,  5,
+	18, 9,  24, 11,
+	26, 9,  21, 10,
+	1,  10, 21, 9,
+	1,  10, 12, 13,
+	11, 10, 21, 16,
+	15, 10, 8,  1,
+	15, 10, 12, 6,
+	15, 10, 14, 10,
+	20, 10, 14, 10,
+	20, 10, 39, 11,
+	3,  11, 5,  9,
+	3,  11, 4,  13,
+	5,  11, 32, 7,
+	5,  11, 20, 8,
+	5,  11, 20, 11,
+	7,  12, 22, 11,
+	7,  12, 2,  12,
+	7,  12, 23, 16,
+	8,  12, 25, 9,
+	13, 12, 23, 10,
+	16, 12, 3,  11,
+	17, 12, 25, 10,
+	17, 12, 28, 15,
+	25, 12, 8,  15,
+	26, 12, 7,  14,
+	1,  13, 8,  6,
+	10, 13, 28, 11,
+	21, 13, 25, 13,
+	21, 13, 24, 16,
+	25, 13, 25, 3,
+	5,  14, 17, 6,
+	5,  14, 23, 16,
+	12, 14, 36, 15,
+	12, 14, 17, 16,
+	13, 14, 40, 13,
+	13, 14, 38, 14,
+	19, 14, 18, 10,
+	2,  15, 4,  14,
+	8,  15, 1,  13,
+	12, 15, 21, 4,
+	12, 15, 27, 7,
+	12, 15, 28, 8,
+	13, 15, 34, 1,
+	13, 15, 31, 5,
+	14, 15, 21, 16,
+	15, 15, 29, 1,
+	15, 15, 23, 13,
+	25, 15, 24, 6,
+	25, 15, 23, 11,
+	28, 15, 8,  6,
+	28, 15, 9,  10,
+	1,  16, 1,  1,
+	1,  16, 22, 5,
+	7,  16, 3,  4,
+	8,  16, 7,  1,
+	11, 17, 4,  12,
+	18, 17, 1,  13,
+	22, 17, 21, 6,
+	22, 17, 28, 15,
+	27, 17, 12, 7,
+	27, 17, 8,  8,
+	27, 17, 14, 11,
+	27, 17, 18, 15,
+	27, 17, 2,  16,
+	6,  18, 24, 7,
+	14, 18, 21, 13,
+	27, 18, 38, 4,
+	28, 18, 20, 1,
+	1,  18, 11, 15,
+	9,  18, 7,  1,
+	9,  18, 13, 12,
+	16, 18, 32, 10,
+	16, 18, 25, 13,
+	16, 18, 31, 14,
+	25, 18, 20, 7,
+	28, 18, 21, 1
+};
+
+const byte k5A4D6[] = {
 	2,  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,  3,
 	16, 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,  18,
 	17, 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,  19,
@@ -260,6 +390,37 @@ const byte _v5A4D6[] = {
 	13, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 14
 };
 
+const byte k5A72E[] = {0,  98, 135, 183, 229, 81, 133, 185, 235, 75, 131, 187, 241, 70,  129, 190, 247};
+const byte k5A73F[] = {0,  42, 42,  42,  42,  67, 67,  67,  67,  92, 92,  92,  92,  116, 116, 116, 116};
+const byte k5A750[] = {
+	9, 10, 7, 13, 7, 8, 9,  7, 9, 10, 
+	2, 3,  3, 2,  2, 2, 4,  3, 3, 4, 
+	3, 2,  3, 4,  3, 8, 10, 4, 0
+};
+const byte k5A76D[] = {
+	3, 3,  3, 4,  3, 3, 3,  3, 1, 3,
+	3, 3,  3, 7,  3, 7, 3,  3, 3, 3,
+	3, 3,  3, 3,  3, 3, 3,  3, 3
+};
+const byte k5A78A[] = {0,  8,  15,  16,  12,  7,  18,  17,  13,  6,  19,  20,  14,  5,   11,  10,  9};
+const byte k5A79B[] = {
+	23, 3,  1,
+	23, 4,  1,
+	26, 3,  1,
+	26, 4,  1,
+	15, 16, 2,
+	2,  16, 3,
+	3,  16, 4,
+	10, 7,  5,
+	11, 7,  6,
+	3,  0,  7,
+	4,  0,  8,
+	24, 11, 9,
+	25, 11, 10,
+	12, 8,  11,
+	9,  11, 12
+};
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index ae2aa28aeb..b2489b7e3d 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -190,8 +190,15 @@ extern char const *const F7;
 extern char const *const F8;
 extern char const *const F10;
 
-// Scene 1550 map
-extern const byte _v5A4D6[];
+// Scene 1550 arrays of constants
+extern const byte k562CC[];
+extern const byte k5A4D6[];
+extern const byte k5A72E[];
+extern const byte k5A73F[];
+extern const byte k5A750[];
+extern const byte k5A76D[];
+extern const byte k5A78A[];
+extern const byte k5A79B[];
 
 } // End of namespace Ringworld2
 
-- 
cgit v1.2.3


From e0ac42f6c7796347cdc2ca3eb33aeed093327034 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 15 Jan 2012 23:11:10 +0100
Subject: TSAGE: R2R - Fix a GCC warning

Thanks LordHoto for pointing it
---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 2 +-
 engines/tsage/ringworld2/ringworld2_scenes1.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 04c4c056ca..7e39957460 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1018,7 +1018,7 @@ bool Scene1200::Area1::Actor3::startAction(CursorType action, Event &event) {
 	return true;
 }
 
-void Scene1200::Area1::postInit() {
+void Scene1200::Area1::postInit(SceneObjectList *OwnerList) {
 	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
 
 	scene->_field41A = 1;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 0ec42b1d04..5ec6c7f60e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -136,7 +136,7 @@ class Scene1200 : public SceneExt {
 		Area1();
 		void synchronize(Serializer &s);
 
-		virtual void postInit();
+		virtual void postInit(SceneObjectList *OwnerList = NULL);
 		virtual void remove();
 		virtual void process(Event &event);
 		virtual void proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY);
-- 
cgit v1.2.3


From 175e8e00fa79f0580efc33d54f02a70a856dce4e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 16 Jan 2012 00:24:02 +0100
Subject: TSAGE: R2R - Scene 1550: Implement subA4D14()

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 184 +++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h   |   2 +-
 2 files changed, 183 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 7e39957460..3510920057 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -3056,8 +3056,188 @@ void Scene1550::saveCharacter(int characterIndex) {
 	SceneExt::saveCharacter(characterIndex);
 }
 
-void Scene1550::SceneActor1550::subA4D14(int arg1, int arg2) {
-	warning("Scene1550::subA4D14(%d, %d);", arg1, arg2);
+void Scene1550::SceneActor1550::subA4D14(int frameNumber, int strip) {
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+
+	postInit();
+	if (scene->_field414 == 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->_field414 == 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->_field414 == 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::subA2B2F() {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 5ec6c7f60e..aa39545288 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -229,7 +229,7 @@ public:
 class Scene1550 : public SceneExt {
 	class SceneActor1550 : public SceneActor {
 	public:
-		void subA4D14(int arg1, int arg2);
+		void subA4D14(int frameNumber, int strip);
 	};
 
 	class UnkObj15501 : public SceneActor {
-- 
cgit v1.2.3


From c60394eb3f9dee1cfd6c23ed8e64231b666c650d Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 16 Jan 2012 16:07:48 +0100
Subject: SCI: Remove outdated comment

---
 engines/sci/engine/kstring.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 089ba0e65b..a1cd571e89 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -747,8 +747,6 @@ reg_t kString(EngineState *s, int argc, reg_t *argv) {
 	case 8: { // Dup
 		reg_t stringHandle;
 
-		// We allocate the new string first because if the StringTable needs to
-		// grow, our rawString pointer will be invalidated
 		SciString *dupString = s->_segMan->allocateString(&stringHandle);
 
 		if (argv[1].segment == s->_segMan->getStringSegmentId()) {
-- 
cgit v1.2.3


From 26a692ff5c04e157e93778ea49bd918e86dfdbbf Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 16 Jan 2012 16:18:26 +0100
Subject: KYRA: (EOB) - change behavior of safe game file importing code

- The initial import of original save files will now use the next free available slots instead of moving the original files to the top of the save file list
- add error check to loading routine for original saves
- also limit debug console command to main menu, since it causes issues when used during the game or during character generation
---
 engines/kyra/debugger.cpp           | 13 +++---
 engines/kyra/eobcommon.cpp          |  1 +
 engines/kyra/eobcommon.h            |  1 +
 engines/kyra/saveload_eob.cpp       | 80 +++++++++++--------------------------
 engines/kyra/sequences_darkmoon.cpp |  2 +
 engines/kyra/sequences_eob.cpp      |  2 +
 6 files changed, 35 insertions(+), 64 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index 2c9f9f2eea..c0a91ac098 100644
--- a/engines/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
@@ -486,6 +486,11 @@ void Debugger_EoB::initialize() {
 }
 
 bool Debugger_EoB::cmd_importSaveFile(int argc, const char **argv) {
+	if (!_vm->_allowImport) {
+		DebugPrintf("This command may only be used from the main menu.\n");
+		return true;
+	}
+
 	if (argc == 3) {
 		int slot = atoi(argv[1]);
 		if (slot < -1 || slot > 989) {
@@ -493,16 +498,10 @@ bool Debugger_EoB::cmd_importSaveFile(int argc, const char **argv) {
 			return true;
 		}
 
-		::GUI::MessageDialog dialog("Your current game (if any) will be lost if you continue. Make sure to save your game first.\n\n", "Continue", "Cancel");
-		if (!dialog.runModal()) {
-			DebugPrintf("Cancelled.\n");
-			return true;
-		}
-
 		DebugPrintf(_vm->importOriginalSaveFile(slot, argv[2]) ? "Success.\n" : "Failure.\n");
 		_vm->loadItemDefs();
 	} else {
-		DebugPrintf("Syntax:   import_savefile <dest slot> <source file>\n              (Imports source save game file to dest slot.)\n          import_savefile -1\n              (Imports all original save game files found and pushs them to the top of the save game list.)\n\n");
+		DebugPrintf("Syntax:   import_savefile <dest slot> <source file>\n              (Imports source save game file to dest slot.)\n          import_savefile -1\n              (Imports all original save game files found and puts them into the first available slots.)\n\n");
 	}
 
 	return true;
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 8e99c6f1b3..7f35b12123 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -148,6 +148,7 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags)
 	_clericSpellOffset = 0;
 	_restPartyElapsedTime = 0;
 	_allowSkip = false;
+	_allowImport = false;
 
 	_wallsOfForce = 0;
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index f17cf05ee5..e3ea533c63 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -857,6 +857,7 @@ protected:
 	int8 _rrId[10];
 
 	bool _allowSkip;
+	bool _allowImport;
 
 	Screen_EoB *_screen;
 	GUI_EoB *_gui;
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 4edd46ffa2..8884765937 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -530,6 +530,7 @@ Common::Error EoBCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 
 bool EoBCoreEngine::importOriginalSaveFile(int destSlot, const char *sourceFile) {
 	Common::Array<Common::String> origFiles;
+	Common::Array<int> newSlots;
 
 	if (sourceFile) {
 		// If a source file is specified via the console command we just check whether it exists.
@@ -564,63 +565,26 @@ bool EoBCoreEngine::importOriginalSaveFile(int destSlot, const char *sourceFile)
 	if (!numFilesFound)
 		return false;
 
-	int moveUpSlots = 0;
 	_gui->updateSaveSlotsList(_targetName, true);
 
-	// Check whether ScummVM save files exist and how many slots they need to be moved up to make space for the original save files
+	// Find free save slots for the original save files
 	if (destSlot == -1) {
-		for (int i = 0; i < numFilesFound; ++i) {
-			if (Common::find(_gui->_saveSlots.begin(), _gui->_saveSlots.end(), i) != _gui->_saveSlots.end())
-				moveUpSlots++;
+		int assignedSlots = 0;
+		for (int testSlot = 0; testSlot < 990 && assignedSlots < numFilesFound; testSlot++) {
+			if (Common::find(_gui->_saveSlots.begin(), _gui->_saveSlots.end(), testSlot) == _gui->_saveSlots.end()) {
+				newSlots.push_back(testSlot);
+				assignedSlots++;
+			}
 		}
-	}
-
-	// "move up" existing save files
-	if (moveUpSlots) {
-		Common::sort(_gui->_saveSlots.begin(), _gui->_saveSlots.end(), Common::Greater<int>());
-		for (Common::Array<int>::iterator i = _gui->_saveSlots.begin(); i != _gui->_saveSlots.end(); ++i) {
-			int newIndex = *i + moveUpSlots;
-
-			if (*i >= 990) {
-				// Skip quick save slots
-				continue;
-			} else if (*i >= (990 - moveUpSlots)) {
-				// Try to squeeze occupied slots together by finding and occupying empty slots before the current one if necessary
-				int missingSlots = moveUpSlots - (989 - *i);
-				int missingLeft = missingSlots;
-				int missingLast = missingLeft;
-				Common::Array<int>::iterator squeezeStart = i + 1;
-
-				for (; squeezeStart != _gui->_saveSlots.end() && missingLeft; ++squeezeStart) {
-					int diff = *(squeezeStart - 1) - *squeezeStart - 1;
-					missingLast = MIN(missingLeft, diff);
-					missingLeft -= missingLast;
-				}
-
-				// This will probably never happen, since we do have 990 save slots
-				if (missingLeft)
-					warning("%d original save files could not be converted due to missing save game slots", missingLeft);
-
-				int indexS = *(squeezeStart - 2) - missingLast;
-				for (Common::Array<int>::iterator ii = squeezeStart - 2; ii != i - 1; --ii)
-					_saveFileMan->renameSavefile(getSavegameFilename(*ii), getSavegameFilename(indexS++));
 
-				int newPos = *i -= (missingSlots - missingLeft);
+		// This will probably never happen, since we do have 990 save slots
+		if (assignedSlots != numFilesFound)
+			warning("%d original save files could not be converted due to missing save game slots", numFilesFound - assignedSlots);
 
-				_gui->updateSaveSlotsList(_targetName, true);
-				Common::sort(_gui->_saveSlots.begin(), _gui->_saveSlots.end(), Common::Greater<int>());
-				i = Common::find(_gui->_saveSlots.begin(), _gui->_saveSlots.end(), newPos);
-				if (i == _gui->_saveSlots.end())
-					error("EoBCoreEngine::importOriginalSaveFile(): Unknown error");
-				newIndex = *i + moveUpSlots;
-			}
-
-			_saveFileMan->renameSavefile(getSavegameFilename(*i), getSavegameFilename(newIndex));
-		}
+	} else {
+		newSlots.push_back(destSlot);
 	}
 
-	int curSlot = MAX(destSlot, 0);
-
 	if (destSlot != -1) {
 		if (Common::find(_gui->_saveSlots.begin(), _gui->_saveSlots.end(), destSlot) != _gui->_saveSlots.end()) {
 			::GUI::MessageDialog dialog(Common::String::format(_("A save game file was found in the specified slot %d. Overwrite?\n\n"), destSlot), _("Yes"), _("No"));
@@ -629,17 +593,19 @@ bool EoBCoreEngine::importOriginalSaveFile(int destSlot, const char *sourceFile)
 		}
 	}
 
-	for (Common::Array<Common::String>::iterator i = origFiles.begin(); i != origFiles.end(); ++i) {
-		Common::String desc = readOriginalSaveFile(*i);
+	int importedCount = 0;
+	for (int i = 0; i < numFilesFound; i++) {
+		Common::String desc = readOriginalSaveFile(origFiles[i]);
 		if (desc.empty()) {
-			warning("Unable to import original save file '%s'", i->c_str());
+			warning("Unable to import original save file '%s'", origFiles[i].c_str());
 		} else {
 			// We can't make thumbnails here, since we do not want to load all the level data, monsters, etc. for each save we convert.
 			// Instead, we use an empty surface to avoid that createThumbnailFromScreen() makes a completely pointless thumbnail from
 			// whatever screen that is currently shown when this function is called.
 			Graphics::Surface dummy;
-			saveGameStateIntern(curSlot++, desc.c_str(), &dummy);
-			warning("Imported original save file '%s' ('%s')", i->c_str(), desc.c_str());
+			saveGameStateIntern(newSlots[i], desc.c_str(), &dummy);
+			warning("Imported original save file '%s' ('%s')", origFiles[i].c_str(), desc.c_str());
+			importedCount++;
 		}
 	}
 
@@ -653,8 +619,8 @@ bool EoBCoreEngine::importOriginalSaveFile(int destSlot, const char *sourceFile)
 	memset(_characters, 0, sizeof(EoBCharacter) * 6);
 	_inf->reset();
 
-	if (destSlot == -1 && curSlot) {
-		::GUI::MessageDialog dialog(_("One or more original save game files have been successfully imported into\nScummVM. If you want to manually import original save game files later you will\nneed to open the ScummVM debug console and use the command 'import_savefile'.\n\n"));
+	if (destSlot == -1 && importedCount) {
+		::GUI::MessageDialog dialog(Common::String::format(_("%d original save game files have been successfully imported into\nScummVM. If you want to manually import original save game files later you will\nneed to open the ScummVM debug console and use the command 'import_savefile'.\n\n"), importedCount));
 		dialog.runModal();
 	}
 
@@ -899,7 +865,7 @@ Common::String EoBCoreEngine::readOriginalSaveFile(Common::String &file) {
 		t->extraProperties = in.readUint16();
 	}
 
-	return desc;
+	return in.err() ? Common::String() : desc;
 }
 
 void *EoBCoreEngine::generateMonsterTempData(LevelTempData *tmp) {
diff --git a/engines/kyra/sequences_darkmoon.cpp b/engines/kyra/sequences_darkmoon.cpp
index 516c71e626..f0d4a01486 100644
--- a/engines/kyra/sequences_darkmoon.cpp
+++ b/engines/kyra/sequences_darkmoon.cpp
@@ -116,7 +116,9 @@ int DarkMoonEngine::mainMenu() {
 			_screen->_curPage = op;
 			_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
 			_screen->updateScreen();
+			_allowImport = true;
 			menuChoice = mainMenuLoop();
+			_allowImport = false;
 		} break;
 
 		case 1:
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index 9f54306d59..64f88e95ce 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -56,7 +56,9 @@ int EoBEngine::mainMenu() {
 			_screen->_curPage = 0;
 			_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
 			_screen->updateScreen();
+			_allowImport = true;
 			menuChoice = mainMenuLoop();
+			_allowImport = false;
 			} break;
 
 		case 1:
-- 
cgit v1.2.3


From 8b391399cc89441adb119c0afe33d4d26b620a5d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 16 Jan 2012 17:02:18 +0100
Subject: KYRA: Fix for bug #3474339 "KYRA1CD: Ingame animation missing".

This was a regression from 6a3d0e712940bf4560e5302c40f07f5f6eb8e0aa.

This still assures that the workaround for bug #1498221 works.
---
 engines/kyra/kyra_lok.cpp   | 12 ++++--------
 engines/kyra/script_lok.cpp | 19 ++++++++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index 74db67d22b..d7e79575ec 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -510,14 +510,10 @@ void KyraEngine_LoK::delay(uint32 amount, bool update, bool isMainLoop) {
 			updateTextFade();
 			updateMousePointer();
 		} else {
-			// We call OSystem::updateScreen here and not Screen::updateScreen
-			// to avoid new graphics changes to be copied to the screen.
-			// This assures the workaround of bug #1498221
-			// "KYRA1: Glitches when meeting Zanthia" is working correctly.
-			// Since we only call updateScreen here to let systems with frame
-			// update count limitations not miss any graphics updates it
-			// should not cause any problems.
-			_system->updateScreen();
+			// We need to do Screen::updateScreen here, since client code
+			// relies on this method to copy screen changes to the actual
+			// screen since at least 0af418e7ea3a41f93fcc551a45ee5bae822d812a.
+			_screen->updateScreen();
 		}
 
 		_isSaveAllowed = isMainLoop;
diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp
index 135925afd9..8342bccab6 100644
--- a/engines/kyra/script_lok.cpp
+++ b/engines/kyra/script_lok.cpp
@@ -720,14 +720,19 @@ int KyraEngine_LoK::o1_displayWSASequentialFrames(EMCState *script) {
 	if (maxTime - 1 <= 0)
 		maxTime = 1;
 
-	// Workaround for bug #1498221 "KYRA1: Glitches when meeting Zanthia"
-	// the original didn't do a forced screen update after displaying a wsa frame
-	// while we have to do it, which make brandon disappear for a short moment,
-	// what shouldn't happen. So we're not updating the screen for this special
-	// case too.
-	if (startFrame == 18 && endFrame == 18 && _currentRoom == 45) {
+	// WORKAROUND for bug #1498221 "KYRA1: Glitches when meeting Zanthia".
+	// The original did not do a forced screen update after displaying a WSA
+	// frame while we have to do it, which makes Brandon disappear for a short
+	// moment. That is not supposed to happen. So we're not updating the
+	// screen for this special case.
+	// This is only an issue for the CD version, but since the floppy version
+	// does not use the specified paramaeters like these, it is safe to enable
+	// it for all versions.
+	if (startFrame == 18 && endFrame == 18 && waitTime == 10 && wsaIndex == 0 && _currentRoom == 45) {
 		_movieObjects[wsaIndex]->displayFrame(18, 0, xpos, ypos, 0, 0, 0);
-		delay(waitTime * _tickLength);
+		// We call delayMillis manually here to avoid the screen getting
+		// updated.
+		_system->delayMillis(waitTime * _tickLength);
 		return 0;
 	}
 
-- 
cgit v1.2.3


From 5bb473df88c3574df1be4f16cea2e7a389ab3577 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 16 Jan 2012 19:18:27 +0200
Subject: SCI: Update a workaround for the demo of QFG4 to make it work again

---
 engines/sci/engine/workarounds.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index f68b74e1e0..a556134e32 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -353,7 +353,7 @@ const SciWorkaroundEntry kNewWindow_workarounds[] = {
 
 //    gameID,           room,script,lvl,          object-name, method-name,    call,index,                workaround
 const SciWorkaroundEntry kPaletteUnsetFlag_workarounds[] = {
-	{ GID_QFG4,          100,   100,  0,            "doMovie", "<noname144>",    -1,    0, { WORKAROUND_IGNORE,    0 } }, // after the Sierra logo, no flags are passed, thus the call is meaningless - bug #3034506
+	{ 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 #3034506
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 
-- 
cgit v1.2.3


From 1ae18a2e2bff95cfde7cd93983b0ca3fd5f824b1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 16 Jan 2012 19:23:52 +0100
Subject: TSAGE: R2R - Scene 1550: Implement UnkObj15502::subA5CDF()

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 57 ++++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  1 +
 2 files changed, 57 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 3510920057..8bbf9adf85 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2175,6 +2175,61 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 	}
 }
 
+void Scene1550::UnkObj15502::subA5CDF(int strip) {
+	_fieldA4 = strip;
+	postInit();
+	setup(1517, _fieldA4, 1);
+	switch (_fieldA4 - 1) {
+	case 0:
+		if (R2_INVENTORY.getObjectScene(R2_22) == 0)
+			setFrame(5);
+		setPosition(Common::Point(287, 85));
+		break;
+	case 1:
+		if (R2_INVENTORY.getObjectScene(R2_25) == 0)
+			setFrame(5);
+		setPosition(Common::Point(248, 100));
+		break;
+	case 2:
+		if (R2_INVENTORY.getObjectScene(R2_28) == 0)
+			setFrame(5);
+		setPosition(Common::Point(217, 85));
+		break;
+	case 3:
+		if (R2_INVENTORY.getObjectScene(R2_23))
+			setFrame(5);
+		setPosition(Common::Point(161, 121));
+		break;
+	case 4:
+		if (R2_INVENTORY.getObjectScene(R2_27))
+			setFrame(5);
+		setPosition(Common::Point(117, 121));
+		break;
+	case 5:
+		if (R2_INVENTORY.getObjectScene(R2_17))
+			setFrame(5);
+		setPosition(Common::Point(111, 85));
+		break;
+	case 6:
+		if (R2_INVENTORY.getObjectScene(R2_45))
+			setFrame(5);
+		setPosition(Common::Point(95, 84));
+		break;
+	case 7: {
+		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;
+	}
+}
+
 Scene1550::UnkObj15503::UnkObj15503() {
 	_fieldA4 = 0;
 }
@@ -2503,7 +2558,7 @@ void Scene1550::postInit(SceneObjectList *OwnerList) {
 			_field412 = 1;
 			
 			_actor1.postInit();
-			warning("_arrUnkObj15502[7].subA5CDF()");
+			_arrUnkObj15502[7].subA5CDF(8);
 			_arrUnkObj15502[7].hide();
 			if (R2_GLOBALS._player._characterIndex == 1)
 				_sceneMode = 1577;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index aa39545288..ba146ab5a9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -251,6 +251,7 @@ class Scene1550 : public SceneExt {
 		void synchronize(Serializer &s);
 
 		virtual bool startAction(CursorType action, Event &event);
+		void subA5CDF(int strip);
 	};
 
 	class UnkObj15503 : public SceneActor {
-- 
cgit v1.2.3


From 4a1da069f425ac0d65d2d5d5476c1efdab8b06c2 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 16 Jan 2012 19:53:55 +0100
Subject: TSAGE: R2R - Scene 1200: Implement sub9EE22() and sub9DAD6()

Also fix a couple of things in scene 1550
---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 233 ++++++++++++++++++++++--
 engines/tsage/ringworld2/ringworld2_scenes1.h   |   3 +
 2 files changed, 218 insertions(+), 18 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 8bbf9adf85..e1796a40c8 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1161,6 +1161,199 @@ void Scene1200::Object1::sub9EDE8(Rect rect) {
 //	_rect1.clip(g_globals->gfxManager()._bounds);
 }
 
+int Scene1200::Object1::sub9EE22(int &arg1, int &arg2) {
+	arg1 /= _field2A;
+	arg2 /= _field2C;
+	
+	if ((arg1 >= 0) && (arg2 >= 0) && (_field26 > arg1) && (_field28 > arg2)) {
+		return (((_field26 * arg2) + arg1) * 2) + _field16;
+	}
+
+	return -1;
+}
+
+void Scene1200::sub9DAD6(int indx) {
+	_object1.sub9EE22(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);
+	
+	switch (indx) {
+	case 0:
+		if ( ((_object1.sub51AF8(Common::Point(200, 50)) > 36) || (_object1.sub51AF8(Common::Point(200, 88)) > 36)) 
+			&& ( ((R2_GLOBALS._v56AA2 == 3) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4)) 
+				|| ((R2_GLOBALS._v56AA2 == 13) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2)) 
+				|| ((R2_GLOBALS._v56AA2 == 29) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1)) 
+				|| ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 41)) )
+				)	{
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 1200;
+			setAction(&_sequenceManager, this, 1200, &_actor1, NULL);
+		} else if (_object1.sub51AF8(Common::Point(200, 69)) == 36) {
+			switch (_field412 - 1) {
+			case 0:
+				if (R2_GLOBALS._player._visage == 3155)
+					_sceneMode = 15;
+				else
+					_sceneMode = 10;
+				break;
+			case 1:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 76;
+				else
+					_sceneMode = 75;
+				break;
+			case 2:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 101;
+				else
+					_sceneMode = 100;
+				break;
+			case 3:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 111;
+				else
+					_sceneMode = 110;
+				break;
+			default:
+				break;
+			}
+			R2_GLOBALS._player.disableControl();
+			_field412 = 1;
+			signal();
+		}
+		break;
+	case 1:
+		if ( ((_object1.sub51AF8(Common::Point(120, 50)) > 36) || (_object1.sub51AF8(Common::Point(120, 88)) > 36)) 
+			&& ( ((R2_GLOBALS._v56AA2 == 7) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4)) 
+				|| ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2)) 
+				|| ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1)) 
+				|| ((R2_GLOBALS._v56AA2 == 5) && (R2_GLOBALS._v56AA4 == 5)) )
+				)	{
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 1201;
+			setAction(&_sequenceManager, this, 1201, &_actor1, NULL);
+		} else if (_object1.sub51AF8(Common::Point(120, 69)) == 36) {
+			switch (_field412 - 1) {
+			case 0:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 56;
+				else
+					_sceneMode = 55;
+				break;
+			case 1:
+				if (R2_GLOBALS._player._visage == 3155)
+					_sceneMode = 25;
+				else
+					_sceneMode = 20;
+				break;
+			case 2:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 91;
+				else
+					_sceneMode = 90;
+				break;
+			case 3:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 121;
+				else
+					_sceneMode = 120;
+				break;
+			default:
+				break;
+			}
+			R2_GLOBALS._player.disableControl();
+			_field412 = 2;
+			signal();
+		}
+		break;
+	case 2:
+		if ( ((_object1.sub51AF8(Common::Point(140, 110)) > 36) || (_object1.sub51AF8(Common::Point(178, 110)) > 36)) 
+			&& ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 5) && (_field418 != 3)) 
+				|| ((R2_GLOBALS._v56AA2 == 41) && (R2_GLOBALS._v56AA4 == 21)) )
+				)	{
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 1203;
+			setAction(&_sequenceManager, this, 1203, &_actor1, NULL);
+		} else if (_object1.sub51AF8(Common::Point(160, 110)) == 36) {
+			switch (_field412 - 1) {
+			case 0:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 51;
+				else
+					_sceneMode = 50;
+				break;
+			case 1:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 81;
+				else
+					_sceneMode = 80;
+				break;
+			case 2:
+				if (R2_GLOBALS._player._visage == 3155)
+					_sceneMode = 35;
+				else
+					_sceneMode = 30;
+				break;
+			case 3:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 116;
+				else
+					_sceneMode = 115;
+				break;
+			default:
+				break;
+			}
+			R2_GLOBALS._player.disableControl();
+			_field412 = 3;
+			signal();
+		}
+		break;
+	case 3:
+		if ( ((_object1.sub51AF8(Common::Point(140, 30)) > 36) || (_object1.sub51AF8(Common::Point(178, 30)) > 36)) 
+			&& ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 9) && (_field418 != 3)) 
+				|| ((R2_GLOBALS._v56AA2 == 35) && (R2_GLOBALS._v56AA4 == 17)) )
+				)	{
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 1202;
+			setAction(&_sequenceManager, this, 1202, &_actor1, NULL);
+		} else if (_object1.sub51AF8(Common::Point(160, 30)) == 36) {
+			switch (_field412 - 1) {
+			case 0:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 61;
+				else
+					_sceneMode = 60;
+				break;
+			case 1:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 71;
+				else
+					_sceneMode = 70;
+				break;
+			case 2:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 96;
+				else
+					_sceneMode = 95;
+				break;
+			case 3:
+				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();
+			_field412 = 4;
+			signal();
+		}
+		break;
+	default:
+		break;
+	}
+}
 void Scene1200::postInit(SceneObjectList *OwnerList) {
 	Rect tmpRect;
 
@@ -1459,22 +1652,22 @@ void Scene1200::process(Event &event) {
 		return;
 
 	if (event.eventType == EVENT_BUTTON_DOWN) {
-		warning("_object1.sub9EE22(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);");
+		_object1.sub9EE22(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);
 		int unk = _object1.sub51AF8(event.mousePos);
 		switch (R2_GLOBALS._events.getCursor()) {
 		case CURSOR_ARROW:
 			event.handled = true;
 			if ((event.mousePos.x > 179) && (event.mousePos.x < 210) && (event.mousePos.y > 50) && (event.mousePos.y < 89))
-				warning("sub9DAD6(1);");
+				sub9DAD6(1);
 
 			if ((event.mousePos.x > 109) && (event.mousePos.x < 140) && (event.mousePos.y > 50) && (event.mousePos.y < 89))
-				warning("sub9DAD6(2);");
+				sub9DAD6(2);
 				
 			if ((event.mousePos.x > 140) && (event.mousePos.x < 179) && (event.mousePos.y > 89) && (event.mousePos.y < 120))
-				warning("sub9DAD6(3);");
+				sub9DAD6(3);
 				
 			if ((event.mousePos.x > 140) && (event.mousePos.x < 179) && (event.mousePos.y > 19) && (event.mousePos.y < 50))
-				warning("sub9DAD6(4);");
+				sub9DAD6(4);
 			break;
 		case CURSOR_USE:
 			if (unk > 36) {
@@ -1579,19 +1772,19 @@ void Scene1200::process(Event &event) {
 		switch (event.kbd.keycode) {
 		case Common::KEYCODE_1:
 			warning("FIXME: keycode = 0x4800");
-			warning("sub9DAD6(4);");
+			sub9DAD6(4);
 			break;
 		case Common::KEYCODE_2:
 			warning("FIXME: keycode = 0x4B00");
-			warning("sub9DAD6(2);");
+			sub9DAD6(2);
 			break;
 		case Common::KEYCODE_3:
 			warning("FIXME: keycode = 0x4D00");
-			warning("sub9DAD6(1);");
+			sub9DAD6(1);
 			break;
 		case Common::KEYCODE_4:
 			warning("FIXME: keycode = 0x5000");
-			warning("sub9DAD6(3);");
+			sub9DAD6(3);
 			break;
 		default:
 			event.handled = false;
@@ -2316,6 +2509,7 @@ bool Scene1550::Hotspot3::startAction(CursorType action, Event &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 == 1) || (R2_GLOBALS._player._characterIndex == 2));
 	// The original contains a debug message when CURSOR_TALK is used.
+	// This part is totally useless, we could remove it (and the entire function as well)
 	if (action == CURSOR_TALK)
 		warning("Location: %d/%d - %d", R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex], R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2], k5A4D6[(R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] * 30)] + R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex]);
 
@@ -2594,7 +2788,9 @@ void Scene1550::postInit(SceneObjectList *OwnerList) {
 		_actor7.changeZoom(77);
 		_actor7.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
 
-		warning("R2_GLOBALS._walkRegions.enableRegion(R2_GLOBALS._v14A72[_field419]);");
+		assert(_field419 >= 1550);
+		R2_GLOBALS._walkRegions.enableRegion(k5A750[_field419 - 1550]);
+
 		setAction(&_sequenceManager1, this, 1590, &_actor7, NULL);
 	} else if ((_sceneMode != 1577) && (_sceneMode != 1578))
 		R2_GLOBALS._player.enableControl();
@@ -3694,6 +3890,7 @@ void Scene1550::subA2B2F() {
 
 	int di = 0;
 	int tmpIdx = 0;
+	// Original game was checking "i < 129" but it was clearly a bug as it's out of bounds
 	for (int i = 0; i < 129 * 4; i += 4) {
 		if ((R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] == k562CC[i]) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == k562CC[i + 1]) && (k562CC[i + 2] != 0)) {
 			tmpIdx = k562CC[i + 3];
@@ -3922,14 +4119,14 @@ void Scene1550::subA2B2F() {
 				_actor6.setDetails(1550, 56, -1, -1, 2, (SceneItem *) NULL);
 				break;
 			case 11:
-				warning("_arrUnkObj15502[7].sub_A5CDF(8);");
-				warning("_arrUnkObj15502[0].sub_A5CDF(1);");
-				warning("_arrUnkObj15502[1].sub_A5CDF(2);");
-				warning("_arrUnkObj15502[2].sub_A5CDF(3);");
-				warning("_arrUnkObj15502[3].sub_A5CDF(4);");
-				warning("_arrUnkObj15502[4].sub_A5CDF(5);");
-				warning("_arrUnkObj15502[5].sub_A5CDF(6);");
-				warning("_arrUnkObj15502[6].sub_A5CDF(7);");
+				_arrUnkObj15502[7].subA5CDF(8);
+				_arrUnkObj15502[0].subA5CDF(1);
+				_arrUnkObj15502[1].subA5CDF(2);
+				_arrUnkObj15502[2].subA5CDF(3);
+				_arrUnkObj15502[3].subA5CDF(4);
+				_arrUnkObj15502[4].subA5CDF(5);
+				_arrUnkObj15502[5].subA5CDF(6);
+				_arrUnkObj15502[6].subA5CDF(7);
 			default:
 				break;
 			}
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index ba146ab5a9..d62700c686 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -162,6 +162,7 @@ class Scene1200 : public SceneExt {
 		int sub51AF8(Common::Point pt);
 		bool sub51AFD(Common::Point pt);
 		void sub9EDE8(Rect rect);
+		int sub9EE22(int &arg1, int &arg2);
 		virtual Common::String getClassName() { return "UnkObject1200"; }
 	};
 		
@@ -182,6 +183,8 @@ public:
 	Scene1200();
 	void synchronize(Serializer &s);
 
+	void sub9DAD6(int indx);
+
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void signal();
 	virtual void process(Event &event);
-- 
cgit v1.2.3


From 63c13f91c15dd5fc5bdbf11390ce7c6f0a7cd619 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 17 Jan 2012 00:46:13 +0100
Subject: TSAGE: R2R - Partial implementation of scene 1575

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   1 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 380 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  53 ++++
 engines/tsage/staticres.cpp                     |  20 ++
 engines/tsage/staticres.h                       |   1 +
 5 files changed, 455 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 2f537c4ebe..1a03cffc5c 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -119,6 +119,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1550:
 		return new Scene1550();
 	case 1575:
+		return new Scene1575();
 	case 1580:
 	case 1625:
 	case 1700:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index e1796a40c8..576d4e5beb 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4168,5 +4168,385 @@ void Scene1550::subA2B2F() {
 	R2_GLOBALS._uiElements.updateInventory();
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1575 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene1575::Scene1575() {
+	_field412 = 0;
+	_field414 = 0;
+	_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);
+}
+
+Scene1575::Hotspot1::Hotspot1() {
+	_field34 = 0;
+	_field36 = 0;
+}
+
+void Scene1575::Hotspot1::synchronize(Serializer &s) {
+	NamedHotspot::synchronize(s);
+
+	s.syncAsSint16LE(_field34);
+	s.syncAsSint16LE(_field36);
+}
+
+void Scene1575::Hotspot1::process(Event &event) {
+	if ((event.eventType != EVENT_BUTTON_DOWN) || (R2_GLOBALS._events.getCursor() != R2_STEPPING_DISKS) || (!_bounds.contains(event.mousePos))) {
+		if (_field36 == 0)
+			return;
+		if ((_field34 == 1)  || (event.eventType == EVENT_BUTTON_UP) || (!_bounds.contains(event.mousePos))) {
+			_field36 = 0;
+			return;
+		}
+	}
+	_field36 = 1;
+	Scene1575 *scene = (Scene1575 *)R2_GLOBALS._sceneManager._scene;
+
+	event.handled = true;
+	if (R2_GLOBALS.getFlag(18) && (_field34 > 1) && (_field34 < 6)) {
+		warning("sub1A03B(\"Better not move the laser while it\'s firing!\", 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);");
+		return;
+	}
+	int di = scene->_actor1._position.x;
+	
+	switch (_field34 - 1) {
+	case 0:
+		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 {
+			warning("sub1A03B(\"That\'s probably not a good thing, ya know!\", 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);");
+		}
+		break;
+	case 1:
+		if (scene->_field41A < 780) {
+			if (di > 54)
+				di -= 65;
+			di += 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(di, scene->_actor1._position.y));
+			scene->_actor2.setPosition(Common::Point(di + 65, scene->_actor1._position.y));
+			scene->_actor3.setPosition(Common::Point(di + 130, scene->_actor1._position.y));
+		}
+		break;
+	case 2:
+		if (scene->_field41A > 0) {
+			if (di < -8)
+				di += 65;
+			
+			di -= 2;
+			scene->_field41A -= 2;
+			for (int i = 0; i < 178; 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(di, scene->_actor1._position.y));
+			scene->_actor2.setPosition(Common::Point(di + 65, scene->_actor1._position.y));
+			scene->_actor3.setPosition(Common::Point(di + 130, scene->_actor1._position.y));
+		}
+		break;
+	case 3: {
+			int tmpPosY = scene->_actor1._position.y;
+			if (tmpPosY < 176) {
+				++tmpPosY;
+				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(di, scene->_actor1._position.y));
+				scene->_actor2.setPosition(Common::Point(di + 65, scene->_actor1._position.y));
+				scene->_actor3.setPosition(Common::Point(di + 130, scene->_actor1._position.y));
+			}
+		}
+		break;
+	case 4: {
+			int tmpPosY = scene->_actor1._position.y;
+			if (tmpPosY > 145) {
+				tmpPosY--;
+				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(di, scene->_actor1._position.y));
+				scene->_actor2.setPosition(Common::Point(di + 65, scene->_actor1._position.y));
+				scene->_actor3.setPosition(Common::Point(di + 130, scene->_actor1._position.y));
+			}
+		}
+		break;
+	case 5:
+		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();
+}
+
+bool Scene1575::Hotspot1::startAction(CursorType action, Event &event) {
+	if (action == CURSOR_USE)
+		return false;
+	return SceneHotspot::startAction(action, event);
+}
+
+void Scene1575::Hotspot1::subA910D(int indx) {
+	warning("STUB: Scene1575:Hotspot1::subA910D(%d)", indx);
+}
+
+void Scene1575::postInit(SceneObjectList *OwnerList) {
+	loadScene(1575);
+	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._v5589E = Rect(0, 0, 320, 200);
+	SceneExt::postInit();
+	_field414 = 390;
+
+	_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]);
+		warning("TODO: immense pile of floating operations");
+		_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));
+
+	_item1.subA910D(1);
+	_item1.subA910D(2);
+	_item1.subA910D(3);
+	_item1.subA910D(4);
+	_item1.subA910D(5);
+	_item1.subA910D(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);
+
+	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._v5589E.top = 3;
+	R2_GLOBALS._v5589E.bottom = 168;
+	R2_GLOBALS._v58CE2 = 1;
+}
+
+void Scene1575::signal() {
+	R2_GLOBALS._player.enableControl();
+}
+
+void Scene1575::process(Event &event) {
+	Scene::process(event);
+
+	g_globals->_sceneObjects->recurse(SceneHandler::dispatchObject);
+	warning("TODO: check Scene1575::process");
+}
+
+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;
+		}
+		_field418 = R2_GLOBALS._randomSource.getRandomNumber(4) + 1;
+	} else {
+		_field418--;
+	}
+	Scene::dispatch();
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index d62700c686..07813f16d7 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -380,6 +380,59 @@ public:
 	virtual void dispatch();
 	virtual void saveCharacter(int characterIndex);
 };
+
+class Scene1575 : public SceneExt {
+	class Hotspot1 : public NamedHotspot {
+	public:
+		int _field34;
+		int _field36;
+		
+		Hotspot1();
+		void synchronize(Serializer &s);
+		void subA910D(int indx);
+
+		virtual void process(Event &event);
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+	int _field412;
+	int _field414;
+	int _field416;
+	int _field418;
+	int _field41A;
+	Hotspot1 _item1;
+	Hotspot1 _item2;
+	Hotspot1 _item3;
+	Hotspot1 _item4;
+	Hotspot1 _item5;
+	Hotspot1 _item6;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	SceneActor _actor6;
+	SceneActor _actor7;
+	SceneActor _actor8;
+	SceneActor _actor9;
+	SceneActor _actor10;
+	SceneActor _actor11;
+	SceneActor _actor12;
+	SceneActor _actor13;
+	SceneActor _actor14;
+	SceneActor _actor15;
+	SceneActor _arrActor[17];
+	SequenceManager _sequenceManager1;
+
+	Scene1575();
+	void synchronize(Serializer &s);
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void process(Event &event);
+	virtual void dispatch();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index 398d06881b..543dbe86a9 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -421,6 +421,26 @@ const byte k5A79B[] = {
 	9,  11, 12
 };
 
+const byte k5A7F6[] = {
+	4,  11, 6,
+	5,  14, 5,
+	5,  11, 6,
+	5,  7,  5,
+	6,  9,  6,
+	7,  16, 7,
+	7,  12, 7,
+	8,  6,  5,
+	9,  9,  7,
+	10, 13, 9,
+	10, 6,  8,
+	11, 10, 9,
+	12, 15, 10,
+	13, 12, 11,
+	14, 8,  9,
+	15, 16, 1,
+	15, 10, 11
+};
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index b2489b7e3d..2a5d5c76ba 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -199,6 +199,7 @@ extern const byte k5A750[];
 extern const byte k5A76D[];
 extern const byte k5A78A[];
 extern const byte k5A79B[];
+extern const byte k5A7F6[];
 
 } // End of namespace Ringworld2
 
-- 
cgit v1.2.3


From a410584928a7d65655ed4e4195cb39b27ee699c2 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 17 Jan 2012 17:56:29 +0100
Subject: TSAGE: R2R - Implement scene 1580

Also fix a couple of setdetails calls in scene 1550
---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 361 +++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  59 ++++
 3 files changed, 420 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 1a03cffc5c..5bd8aa8315 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -121,6 +121,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1575:
 		return new Scene1575();
 	case 1580:
+		// Inside wreck
+		return new Scene1580();
 	case 1625:
 	case 1700:
 	case 1750:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 576d4e5beb..a8976f667c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4147,7 +4147,7 @@ void Scene1550::subA2B2F() {
 				_actor7.setPosition(Common::Point(272, 94));
 				_actor7.fixPriority(91);
 				_actor7.changeZoom(100);
-				warning("_actor7.setDetails(1550, -1, -1, -1, 5, _arrUnkObj15502[7]);");
+				_actor7.setDetails(1550, -1, -1, -1, 5, &_arrUnkObj15502[7]);
 			} else {
 				_actor7.setup(1505, 6, 1);
 				_actor7.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
@@ -4158,7 +4158,7 @@ void Scene1550::subA2B2F() {
 				_actor7.setPosition(Common::Point(276, 97));
 				_actor7.fixPriority(91);
 				_actor7.changeZoom(100);
-				warning("_actor7.setDetails(1550, -1, -1, -1, 5, _arrUnkObj15502[7]);");
+				_actor7.setDetails(1550, -1, -1, -1, 5, &_arrUnkObj15502[7]);
 			} else {
 				_actor7.setup(1500, 6, 1);
 				_actor7.setDetails(1550, -1, -1, -1, 2, (SceneItem *) NULL);
@@ -4548,5 +4548,362 @@ void Scene1575::dispatch() {
 	Scene::dispatch();
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1580 - Inside wreck
+ *
+ *--------------------------------------------------------------------------*/
+Scene1580::Scene1580() {
+	_field412 = 0;
+}
+
+void Scene1580::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+}
+
+
+bool Scene1580::Hotspot1::startAction(CursorType action, Event &event) {
+	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action == R2_26) {
+		R2_INVENTORY.setObjectScene(26, 1580);
+		R2_GLOBALS._sceneItems.remove(&scene->_item1);
+		scene->_actor2.postInit();
+		scene->_actor2.setup(1580, 1, 4);
+		scene->_actor2.setPosition(Common::Point(159, 163));
+		scene->_actor2.setDetails(1550, 78, -1, -1, 2, (SceneItem *) NULL);
+		
+		scene->_arrActor[5].remove();
+		
+		return true;
+	}
+
+	return SceneHotspot::startAction(action, event);
+}
+
+bool Scene1580::Hotspot2::startAction(CursorType action, Event &event) {
+	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action == R2_28) {
+		R2_INVENTORY.setObjectScene(28, 1580);
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._sceneItems.remove(&scene->_item2);
+
+		scene->_actor3.postInit();
+		scene->_actor3.setup(1580, 1, 1);
+		scene->_actor3.setPosition(Common::Point(124, 108));
+		scene->_actor3.fixPriority(10);
+		
+		if (R2_INVENTORY.getObjectScene(26) == 1580)
+			scene->_actor3.setDetails(1550, 14, -1, -1, 5, &scene->_actor2);
+		else
+			scene->_actor3.setDetails(1550, 14, -1, -1, 2, (SceneItem *)NULL);
+		
+		scene->_actor1.postInit();
+		scene->_actor1.setup(1580, 3, 1);
+		scene->_actor1.setPosition(Common::Point(124, 109));
+		scene->_actor1.fixPriority(20);
+		scene->_field412 = 1;
+		scene->_sceneMode = 10;
+		scene->setAction(&scene->_sequenceManager, scene, 1, R2_GLOBALS._player, NULL);
+
+		return true;
+	}
+
+	return SceneHotspot::startAction(action, event);
+}
+
+bool Scene1580::Actor2::startAction(CursorType action, Event &event) {
+	if ( (action == CURSOR_USE) && (R2_INVENTORY.getObjectScene(28) == 1580)
+		&& (R2_INVENTORY.getObjectScene(17) == 0) && (R2_INVENTORY.getObjectScene(22) == 0)
+		&& (R2_INVENTORY.getObjectScene(25) == 0) && (R2_INVENTORY.getObjectScene(18) == 0)
+		&& (R2_INVENTORY.getObjectScene(23) == 0) && (R2_INVENTORY.getObjectScene(27) == 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 == 1)
+			scene->_stripManager.start(536, scene);
+		else
+			scene->_stripManager.start(537, scene);
+		
+		return true;
+	}
+
+	return SceneActor::startAction(action, event);
+}
+
+bool Scene1580::Actor3::startAction(CursorType action, Event &event) {
+	if ((action == CURSOR_USE) && (R2_INVENTORY.getObjectScene(51) == 1580)) {
+		Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
+
+		R2_INVENTORY.setObjectScene(51, R2_GLOBALS._player._characterIndex);
+		scene->_item2.setDetails(Rect(69, 29, 177, 108), 1550, 82, -1, -1, 2, NULL);
+		scene->_actor1.remove();
+		remove();
+		return true;
+	}
+	
+	return SceneActor::startAction(action, event);
+}
+
+bool Scene1580::Actor4::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->_actor4);
+	scene->_sceneMode = 0;
+	animate(ANIM_MODE_5, scene);
+	
+	return true;
+}
+
+bool Scene1580::Actor5::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);
+	
+	return true;
+}
+
+bool Scene1580::Actor6::startAction(CursorType action, Event &event) {
+	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (R2_GLOBALS._player._characterIndex == 1) {
+			R2_INVENTORY.setObjectScene(23, 1);
+			remove();
+			return true;
+		}
+		break;
+	case R2_9:
+		scene->_sceneMode = 30;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		scene->_stripManager.start(529, scene);
+		return true;
+		break;
+	case R2_39:
+		scene->_sceneMode = 30;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		scene->_stripManager.start(527, scene);
+		return true;
+		break;
+	default:
+		break;
+	}
+
+	return SceneActor::startAction(action, event);
+}
+
+bool Scene1580::Actor7::startAction(CursorType action, Event &event) {
+	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		if (R2_GLOBALS._player._characterIndex == 1) {
+			R2_INVENTORY.setObjectScene(27, 1);
+			remove();
+			return true;
+		}
+		break;
+	case R2_9:
+		scene->_sceneMode = 30;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		scene->_stripManager.start(529, scene);
+		return true;
+		break;
+	case R2_39:
+		scene->_sceneMode = 30;
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		scene->_stripManager.start(527, scene);
+		return true;
+		break;
+	default:
+		break;
+	}
+
+	return SceneActor::startAction(action, event);
+}
+
+void Scene1580::postInit(SceneObjectList *OwnerList) {
+	loadScene(1580);
+	R2_GLOBALS._sceneManager._fadeMode = FADEMODE_GRADUAL;
+	SceneExt::postInit();
+	_field412 = 0;
+
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+	
+	_sceneMode = 0;
+	
+	R2_GLOBALS._player.disableControl();
+	if (R2_INVENTORY.getObjectScene(26) == 1580) {
+		_actor2.postInit();
+		_actor2.setup(1580, 1, 4);
+		_actor2.setPosition(Common::Point(159, 163));
+		_actor2.setDetails(1550, 78, -1, -1, 1, (SceneItem *) NULL);
+	} else {
+		_item1.setDetails(Rect(141, 148, 179, 167), 1550, 79, -1, -1, 1, NULL);
+	}
+	
+	if (R2_INVENTORY.getObjectScene(51) == 1580) {
+		_actor3.postInit();
+		_actor3.setup(1580, 1, 1);
+		_actor3.setPosition(Common::Point(124, 108));
+		_actor3.fixPriority(10);
+		_actor3.setDetails(1550, 13, -1, -1, 1, (SceneItem *) NULL);
+		
+		_actor1.postInit();
+		_actor1.setup(1580, 1, 3);
+		_actor1.setPosition(Common::Point(124, 96));
+		_actor1.fixPriority(20);
+	} else if (R2_INVENTORY.getObjectScene(28) == 1580) {
+		_actor3.postInit();
+		_actor3.setup(1580, 1, 1);
+		_actor3.setPosition(Common::Point(124, 108));
+		_actor3.fixPriority(10);
+		_actor3.setDetails(1550, 14, -1, -1, 1, (SceneItem *) NULL);
+
+		_actor1.postInit();
+		_actor1.setup(1580, 3, 1);
+		_actor1.setPosition(Common::Point(124, 109));
+		_actor1.fixPriority(20);
+			
+		_sceneMode = 10;
+	} else {
+		_item2.setDetails(Rect(69, 29, 177, 108), 1550, 82, -1, -1, 1, NULL);
+	}
+
+	_actor4.postInit();
+	if (R2_INVENTORY.getObjectScene(58) == 0) {
+		_actor4.setup(1580, 5, 1);
+		_actor4.setDetails(1550, 80, -1, -1, 1, (SceneItem *) NULL);
+	} else {
+		_actor4.setup(1580, 5, 6);
+	}
+
+	_actor4.setPosition(Common::Point(216, 108));
+	_actor4.fixPriority(100);
+	
+	_actor5.postInit();
+	_actor5.setup(1580, 4, 1);
+	_actor5.setPosition(Common::Point(291, 147));
+	_actor5.fixPriority(100);
+	_actor5.setDetails(1550, 81, -1, -1, 1, (SceneItem *) NULL);
+
+	if (R2_INVENTORY.getObjectScene(23) == 1580) {
+		_actor6.postInit();
+		_actor6.setup(1580, 6, 2);
+		_actor6.setPosition(Common::Point(222, 108));
+		_actor6.fixPriority(50);
+		_actor6.setDetails(1550, 32, -1, 34, 1, (SceneItem *) NULL);
+	}
+	
+	if (R2_INVENTORY.getObjectScene(27) == 1580) {
+		_actor7.postInit();
+		_actor7.setup(1580, 6, 1);
+		_actor7.setPosition(Common::Point(195, 108));
+		_actor7.fixPriority(50);
+		_actor7.setDetails(1550, 38, -1, 34, 1, (SceneItem *) NULL);
+	}
+	
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1580;
+	R2_GLOBALS._player.hide();
+	setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+	_item3.setDetails(Rect(0, 0, 320, 200), 1550, 50, -1, -1, 1, NULL);
+	
+}
+
+void Scene1580::signal() {
+	switch (_sceneMode++) {
+	case 10:
+		_actor1.animate(ANIM_MODE_5, this);
+		break;
+	case 11:
+		_actor1.setup(1580, 1, 2);
+		_actor1.setPosition(Common::Point(124, 94));
+
+		if (R2_INVENTORY.getObjectScene(18) != 0) {
+			_arrActor[0].postInit();
+			_arrActor[0].setup(1580, 2, 1);
+			_arrActor[0].setPosition(Common::Point(138, 56));
+		}
+		
+		if (R2_INVENTORY.getObjectScene(25) != 0) {
+			_arrActor[1].postInit();
+			_arrActor[1].setup(1580, 2, 2);
+			_arrActor[1].setPosition(Common::Point(140, 66));
+		}
+
+		if (R2_INVENTORY.getObjectScene(27) != 0) {
+			_arrActor[2].postInit();
+			_arrActor[2].setup(1580, 2, 3);
+			_arrActor[2].setPosition(Common::Point(142, 85));
+		}
+
+		if (R2_INVENTORY.getObjectScene(23) != 0) {
+			_arrActor[3].postInit();
+			_arrActor[3].setup(1580, 2, 4);
+			_arrActor[3].setPosition(Common::Point(142, 92));
+		}
+
+		if (R2_INVENTORY.getObjectScene(22) != 0) {
+			_arrActor[4].postInit();
+			_arrActor[4].setup(1580, 2, 5);
+			_arrActor[4].setPosition(Common::Point(108, 54));
+		}
+
+		if (R2_INVENTORY.getObjectScene(26) != 0) {
+			_arrActor[5].postInit();
+			_arrActor[5].setup(1580, 2, 6);
+			_arrActor[5].setPosition(Common::Point(110, 64));
+		}
+
+		if (R2_INVENTORY.getObjectScene(45) != 0) {
+			_arrActor[6].postInit();
+			_arrActor[6].setup(1580, 2, 7);
+			_arrActor[6].setPosition(Common::Point(108, 80));
+		}
+
+		if (R2_INVENTORY.getObjectScene(17) != 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 20:
+		R2_GLOBALS._sceneManager.changeScene(1550);
+		break;
+	case 31:
+		R2_GLOBALS._sceneManager.changeScene(1530);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		R2_GLOBALS._player._canWalk = false;
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 07813f16d7..4a862e91f1 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -433,6 +433,65 @@ public:
 	virtual void process(Event &event);
 	virtual void dispatch();
 };
+
+class Scene1580 : public SceneExt {
+	class Hotspot1 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Hotspot2 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor2 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor3 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor4 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor5 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor6 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor7 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+	int _field412;
+	SpeakerQuinn _quinnSpeaker;
+	SpeakerSeeker _seekerSpeaker;
+	Hotspot1 _item1;
+	Hotspot2 _item2;
+	NamedHotspot _item3;
+	SceneActor _actor1;
+	SceneActor _arrActor[8];
+	Actor2 _actor2;
+	Actor3 _actor3;
+	Actor4 _actor4;
+	Actor5 _actor5;
+	Actor6 _actor6;
+	Actor7 _actor7;
+	SequenceManager _sequenceManager;
+
+	Scene1580();
+	void synchronize(Serializer &s);
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 8f03fef3a43441e761d9169bf44ca8308e2c0097 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 17 Jan 2012 18:11:38 +0100
Subject: TSAGE: R2R - Fix bug in scene 1580 (not detected by MSVC)

Thanks eriktorbjorn for pointing it
---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index a8976f667c..414ae6b644 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4606,7 +4606,7 @@ bool Scene1580::Hotspot2::startAction(CursorType action, Event &event) {
 		scene->_actor1.fixPriority(20);
 		scene->_field412 = 1;
 		scene->_sceneMode = 10;
-		scene->setAction(&scene->_sequenceManager, scene, 1, R2_GLOBALS._player, NULL);
+		scene->setAction(&scene->_sequenceManager, scene, 1, &R2_GLOBALS._player, NULL);
 
 		return true;
 	}
-- 
cgit v1.2.3


From 29a063cb12e5400079bbe14a2610c093c35d7e5e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 17 Jan 2012 22:20:19 +0100
Subject: TSAGE: R2R - Implement scene 1625

---
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   2 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp  | 270 ++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h    |  29 +++
 engines/tsage/ringworld2/ringworld2_speakers.cpp |  51 ++++-
 engines/tsage/ringworld2/ringworld2_speakers.h   |  27 ++-
 engines/tsage/staticres.cpp                      |   2 +
 engines/tsage/staticres.h                        |   2 +
 7 files changed, 378 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 5bd8aa8315..82f52ab558 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -124,6 +124,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Inside wreck
 		return new Scene1580();
 	case 1625:
+		// Miranda being questioned
+		return new Scene1625();
 	case 1700:
 	case 1750:
 	case 1800:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 414ae6b644..6f748362df 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4562,7 +4562,6 @@ void Scene1580::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_field412);
 }
 
-
 bool Scene1580::Hotspot1::startAction(CursorType action, Event &event) {
 	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
 
@@ -4905,5 +4904,274 @@ void Scene1580::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1625 - Miranda being questioned
+ *
+ *--------------------------------------------------------------------------*/
+Scene1625::Scene1625() {
+	_field412 = 0;
+}
+
+void Scene1625::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+}
+
+bool Scene1625::Actor7::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->_actor3.postInit();
+	scene->setAction(&scene->_sequenceManager, scene, 1631, &scene->_actor3, &scene->_actor7, NULL);
+	return true;
+}
+
+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();
+
+	_actor7.postInit();
+	_actor7.setup(1626, 2, 1);
+	_actor7.setPosition(Common::Point(206, 133));
+	_actor7.setDetails(1625, 0, -1, -1, 1, (SceneItem *) NULL);
+
+	_actor5.postInit();
+	_actor5.setup(1625, 8, 1);
+	_actor5.setPosition(Common::Point(190, 131));
+	_actor5.setDetails(1625, 6, -1, 2, 1, (SceneItem *) NULL);
+
+	if (R2_GLOBALS._player._oldCharacterScene[3] == 1625) {
+		if (!R2_GLOBALS.getFlag(83)) {
+			_actor4.postInit();
+			_actor4.setup(1626, 4, 1);
+			_actor4.setPosition(Common::Point(96, 166));
+			_actor4.setDetails(1625, -1, -1, -1, 1, (SceneItem *) NULL);
+		}
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+	} else {
+		_actor1.postInit();
+		_actor1.fixPriority(10);
+
+		_actor6.postInit();
+
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1625;
+		setAction(&_sequenceManager, this, 1625, &_actor1, &_actor6, NULL);
+	}
+
+	R2_GLOBALS._sound1.play(245);
+	_item1.setDetails(Rect(0, 0, 320, 200), 1625, 12, -1, -1, 1, NULL);
+	R2_GLOBALS._player._oldCharacterScene[3] = 1625;
+	R2_GLOBALS._player._characterScene[3] = 1625;
+}
+
+void Scene1625::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene1625::signal() {
+	switch (_sceneMode) {
+	case 10:
+		R2_GLOBALS._player.disableControl();
+		_actor4.postInit();
+		_actor4.setDetails(1625, -1, -1, -1, 2, (SceneItem *) NULL);
+		_sceneMode = 1626;
+		setAction(&_sequenceManager, this, 1626, &_actor2, &_actor4, NULL);
+		break;
+	case 12:
+		// TODO: check if OK_BTN_STRING is required
+		MessageDialog::show(DONE_MSG, OK_BTN_STRING);
+		break;
+	case 14:
+		_actor2.postInit();
+		_actor2.setup(1627, 1, 1);
+		_actor2.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._field2E8) {
+		case 0:
+			_sceneMode = 1627;
+			setAction(&_sequenceManager, this, 1627, &_actor3, &_actor4, NULL);
+			break;
+		case 1:
+			_sceneMode = 1629;
+			setAction(&_sequenceManager, this, 1629, &_actor2, &_actor5, NULL);
+			break;
+		case 3:
+			R2_GLOBALS._player._oldCharacterScene[3] = 3150;
+			R2_GLOBALS._player._characterScene[3] = 3150;
+			R2_GLOBALS._player._characterIndex = R2_QUINN;
+			R2_GLOBALS._sceneManager.changeScene(R2_GLOBALS._player._characterScene[1]);
+			break;
+		case 4:
+			_sceneMode = 1628;
+			_actor2.remove();
+			setAction(&_sequenceManager, this, 1628, &_actor3, &_actor4, NULL);
+			break;
+		case 5:
+			_actor4.postInit();
+			_actor4.setDetails(1625, -1, -1, -1, 2, (SceneItem *) NULL);
+			_sceneMode = 1632;
+			setAction(&_sequenceManager, this, 1632, &_actor4, NULL);
+			break;
+		case 6:
+			_sceneMode = 1633;
+			setAction(&_sequenceManager, this, 1633, &_actor4, NULL);
+			break;
+		case 7:
+			_sceneMode = 1635;
+			setAction(&_sequenceManager, this, 1635, &_actor3, &_actor5, NULL);
+			break;
+		case 8:
+			_actor4.postInit();
+			_actor4.setDetails(1625, -1, -1, -1, 2, (SceneItem *) NULL);
+			_sceneMode = 1634;
+			setAction(&_sequenceManager, this, 1634, &_actor3, &_actor5, NULL);
+			break;
+		case 2:
+		// No break on purpose
+		default:
+			_sceneMode = 1630;
+			_actor2.postInit();
+			setAction(&_sequenceManager, this, 1630, &_actor1, &_actor6, NULL);
+			break;
+		}
+		_field412 = _stripManager._field2E8;
+		_stripManager._field2E8 = 0;
+		break;
+	case 1625:
+		_actor2.postInit();
+		_actor2.setup(1627, 1, 1);
+		_actor2.setPosition(Common::Point(68, 68));
+		_sceneMode = 10;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(800, this);
+		break;
+	case 1626:
+		_actor2.setup(1627, 1, 1);
+		_actor2.setPosition(Common::Point(68, 68));
+		_actor2.show();
+
+		_actor3.postInit();
+		_actor3.setup(1627, 3, 1);
+		_actor3.setPosition(Common::Point(196, 65));
+
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(832, this);
+		break;
+	case 1627:
+		_actor3.setup(1627, 3, 1);
+		_actor3.setPosition(Common::Point(196, 65));
+		_actor3.show();
+
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(833, this);
+		break;
+	case 1628:
+		R2_GLOBALS.setFlag(83);
+		_actor2.postInit();
+		_actor2.setup(1627, 1, 1);
+		_actor2.setPosition(Common::Point(68, 68));
+
+		_actor3.setup(1627, 3, 1);
+		_actor3.setPosition(Common::Point(196, 65));
+		_actor3.show();
+
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(834, this);
+		break;
+	case 1629:
+		_actor2.setup(1627, 1, 1);
+		_actor2.setPosition(Common::Point(68, 68));
+		_actor2.show();
+
+		_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:
+		_actor3.setup(1627, 3, 1);
+		_actor3.setPosition(Common::Point(196, 65));
+		_actor3.show();
+
+		_actor7.remove();
+
+		_actor1.postInit();
+		_actor1.fixPriority(10);
+
+		_actor6.postInit();
+		warning("_actor6._actorName = \"arm\";");
+
+		R2_INVENTORY.setObjectScene(40, 3);
+		_sceneMode = 14;
+
+		setAction(&_sequenceManager, this, 1625, &_actor1, &_actor6, NULL);
+		break;
+	case 1632:
+		_actor2.setup(1627, 1, 1);
+		_actor2.setPosition(Common::Point(68, 68));
+		_actor2.show();
+
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(835, this);
+		break;
+	case 1633:
+		_actor4.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 1635:
+		_actor3.setup(1627, 3, 1);
+		_actor3.setPosition(Common::Point(196, 65));
+		_actor3.show();
+
+		_sceneMode = 99;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(818, this);
+		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);
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 4a862e91f1..e4ba84cdd9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -492,6 +492,35 @@ public:
 	virtual void signal();
 };
 
+class Scene1625 : public SceneExt {
+	class Actor7 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+	int _field412;
+	SpeakerMiranda1625 _mirandaSpeaker;
+	SpeakerTeal1625 _tealSpeaker;
+	SpeakerSoldier1625 _soldierSpeaker;
+	NamedHotspot _item1;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	SceneActor _actor6;
+	Actor7 _actor7;
+	SequenceManager _sequenceManager;
+
+	Scene1625();
+	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_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index b5fd99b0b4..d86429493a 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -486,6 +486,29 @@ void SpeakerMiranda300::proc15() {
 	}
 }
 
+void SpeakerMiranda1625::proc15() {
+	int v = _fieldF6;
+
+	if (!_object2) {
+		Scene1625 *scene = (Scene1625 *)R2_GLOBALS._sceneManager._scene;
+		_object2 = &scene->_actor3;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(Common::Point(196, 65));
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(1627, 3, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
 void SpeakerMiranda3255::proc15() {
 	int v = _fieldF6;
 
@@ -2347,9 +2370,9 @@ void SpeakerSocko3200::proc15() {
 // Classes related to SOLDIER
 //----------------------------------------------------------------------------
 
-SpeakerSoldier300::SpeakerSoldier300(): VisualSpeaker() {
+SpeakerSoldier::SpeakerSoldier(int colour) {
 	_speakerName = "SOLDIER";
-	_color1 = 60;
+	_color1 = colour;
 	_color2 = 0;
 	_fieldF6 = 0;
 	_textWidth = 300;
@@ -2427,6 +2450,30 @@ void SpeakerTeal300::proc15() {
 	}
 }
 
+void SpeakerTeal1625::proc15() {
+	int v = _fieldF6;
+
+	if (!_object2) {
+		Scene1625 *scene = (Scene1625 *)R2_GLOBALS._sceneManager._scene;
+		_object2 = &scene->_actor2;
+		_object2->hide();
+
+		_object1.postInit();
+		_object1.setPosition(Common::Point(68, 68));
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else {
+		((SceneItem *)_action)->_sceneRegionId = 0;
+		_object1.setup(1627, 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	}
+}
+
 void SpeakerTeal3240::proc15() {
 	int v = _fieldF6;
 	Scene3240 *scene = (Scene3240 *)R2_GLOBALS._sceneManager._scene;
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index 13c770a4a3..e795981164 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -146,6 +146,12 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerMiranda1625 : public SpeakerMiranda {
+public:
+	virtual Common::String getClassName() { return "SpeakerMiranda1625"; }
+	virtual void proc15();
+};
+
 class SpeakerMiranda3255 : public SpeakerMiranda {
 public:
 	virtual Common::String getClassName() { return "SpeakerMiranda3255"; }
@@ -477,14 +483,25 @@ public:
 
 // Classes related to Soldier
 
-class SpeakerSoldier300 : public VisualSpeaker {
+class SpeakerSoldier : public VisualSpeaker {
 public:
-	SpeakerSoldier300();
+	SpeakerSoldier(int colour);
+	virtual Common::String getClassName() { return "SpeakerSoldier"; }
+};
 
+class SpeakerSoldier300 : public SpeakerSoldier {
+public:
+	SpeakerSoldier300() : SpeakerSoldier(60) {};
 	virtual Common::String getClassName() { return "SpeakerSoldier300"; }
 	virtual void proc15();
 };
 
+class SpeakerSoldier1625 : public SpeakerSoldier {
+public:
+	SpeakerSoldier1625() : SpeakerSoldier(5) {};
+	virtual Common::String getClassName() { return "SpeakerSoldier1625"; }
+};
+
 // Classes related to Teal
 
 class SpeakerTeal : public VisualSpeaker {
@@ -505,6 +522,12 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerTeal1625 : public SpeakerTeal {
+public:
+	virtual Common::String getClassName() { return "SpeakerTeal1625"; }
+	virtual void proc15();
+};
+
 class SpeakerTeal3240 : public SpeakerTeal {
 public:
 	virtual Common::String getClassName() { return "SpeakerTeal3240"; }
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index 543dbe86a9..3aec851b74 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -237,6 +237,8 @@ char const *const F7 = "F7";
 char const *const F8 = "F8";
 char const *const F10 = "F10";
 
+char const *const DONE_MSG = "Done";
+
 const byte k562CC[] = {
 	20, 7,  41, 6,
 	3,  6,  42, 11,
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index 2a5d5c76ba..4a92f48cf8 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -190,6 +190,8 @@ extern char const *const F7;
 extern char const *const F8;
 extern char const *const F10;
 
+extern char const *const DONE_MSG;
+
 // Scene 1550 arrays of constants
 extern const byte k562CC[];
 extern const byte k5A4D6[];
-- 
cgit v1.2.3


From ace3bf6187e81c04e05c6b81f7ddf3dd57a72ca1 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Tue, 8 Nov 2011 21:31:59 +0000
Subject: SWORD1: Use color for subtitles during cutscene

During the game, different colors are used for subtitles depending
which character is speaking. This commit tries to use the same colors
for the cutscene subtitles. The color to use has to be specified in the
subtitle file between the frame end and the start of text using @1, @2,
@3 or @4 (for George, George as a narrator, Nicole and Maguire
respectively).
---
 engines/sword1/animation.cpp | 125 ++++++++++++++++++++++++++++++++++++++-----
 engines/sword1/animation.h   |  11 ++--
 2 files changed, 121 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index d55a08293e..be9e02f64f 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -72,7 +72,7 @@ MoviePlayer::MoviePlayer(SwordEngine *vm, Text *textMan, ResMan *resMan, Audio::
 	_decoderType = decoderType;
 	_decoder = decoder;
 
-	_white = 255;
+	_c1Color = _c2Color = _c3Color = _c4Color = 255;
 	_black = 0;
 }
 
@@ -127,8 +127,16 @@ bool MoviePlayer::load(uint32 id) {
 					warning("%s:%d startFrame (%d) <= lastEnd (%d)", filename.c_str(), lineNo, startFrame, lastEnd);
 					continue;
 				}
-
-				_movieTexts.push_back(MovieText(startFrame, endFrame, ptr));
+				
+				int color = 0;
+				if (*ptr == '@') {
+					++ptr;
+					color = strtoul(ptr, const_cast<char **>(&ptr), 10);
+					while (*ptr && isspace(static_cast<unsigned char>(*ptr)))
+						ptr++;
+				} 
+
+				_movieTexts.push_back(MovieText(startFrame, endFrame, ptr, color));
 				lastEnd = endFrame;
 			}
 			f.close();
@@ -188,6 +196,7 @@ void MoviePlayer::performPostProcessing(byte *screen) {
 			_textHeight = _resMan->toUint16(frame->height);
 			_textX = 320 - _textWidth / 2;
 			_textY = 420 - _textHeight;
+			_textColor = _movieTexts.front()._color;
 		}
 		if (_decoder->getCurFrame() == _movieTexts.front()._endFrame) {
 			_textMan->releaseText(2, false);
@@ -209,7 +218,7 @@ void MoviePlayer::performPostProcessing(byte *screen) {
 					dst[x] = findBlackPalIndex();
 					break;
 				case LETTER_COL:
-					dst[x] = findWhitePalIndex();
+					dst[x] = findTextColorPalIndex();
 					break;
 				}
 			}
@@ -258,12 +267,29 @@ bool MoviePlayer::playVideo() {
 			if (_decoder->hasDirtyPalette()) {
 				_decoder->setSystemPalette();
 
-				uint32 maxWeight = 0;
 				uint32 minWeight = 0xFFFFFFFF;
 				uint32 weight;
+				float c1Weight = 1e+30;
+				float c2Weight = 1e+30;
+				float c3Weight = 1e+30;
+				float c4Weight = 1e+30;
 				byte r, g, b;
+				float h, s, v, hd, hsvWeight;
 
 				const byte *palette = _decoder->getPalette();
+				
+				// Color comparaison for the subtitles colors is done in HSL
+				// C1 color is used for George and is almost white (R = 248, G = 252, B = 248)
+				const float h1 = 0.333333f, s1 = 0.02f, v1 = 0.99f;
+
+				// C2 color is used for George as a narrator and is grey (R = 184, G = 188, B = 184)
+				const float h2 = 0.333333f, s2 = 0.02f, v2 = 0.74f;
+
+				// C3 color is used for Nicole and is rose (R = 200, G = 120, B = 184)
+				const float h3 = 0.866667f, s3 = 0.4f, v3 = 0.78f;
+
+				// C4 color is used for Maguire and is blue (R = 80, G = 152, B = 184)
+				const float h4 = 0.55f, s4 = 0.57f, v4 = 0.72f;
 
 				for (int i = 0; i < 256; i++) {
 					r = *palette++;
@@ -272,15 +298,55 @@ bool MoviePlayer::playVideo() {
 
 					weight = 3 * r * r + 6 * g * g + 2 * b * b;
 
-					if (weight >= maxWeight) {
-						maxWeight = weight;
-						_white = i;
-					}
-
 					if (weight <= minWeight) {
 						minWeight = weight;
 						_black = i;
 					}
+
+					convertColor(r, g, b, h, s, v);
+
+					// C1 color
+					// It is almost achromatic (very low saturation) so the hue as litle impact on the color.
+					// Therefore use a low weight on hue and high weight on saturation.
+					hd = h - h1;
+					hd += hd < -0.5f ? 1.0f : hd > 0.5f ? -1.0f : 0.0f;
+					hsvWeight = 1.0f * hd * hd + 4.0f * (s - s1) * (s - s1) + 3.0f * (v - v1) * (v - v1);
+					if (hsvWeight <= c1Weight) {
+						c1Weight = hsvWeight;
+						_c1Color = i;
+					}
+
+					// C2 color
+					// Also an almost achromatic color so use the same weights as for C1 color.
+					hd = h - h2;
+					hd += hd < -0.5f ? 1.0f : hd > 0.5f ? -1.0f : 0.0f;
+					hsvWeight = 1.0f * hd * hd + 4.0f * (s - s2) * (s - s2) + 3.0f * (v - v2) * (v - v2);
+					if (hsvWeight <= c2Weight) {
+						c2Weight = hsvWeight;
+						_c2Color = i;
+					}
+
+					// C3 color
+					// A light rose. Use a high weight on the hue to get a rose.
+					// The color is a bit gray and the saturation has not much impact so use a low weight.
+					hd = h - h3;
+					hd += hd < -0.5f ? 1.0f : hd > 0.5f ? -1.0f : 0.0f;
+					hsvWeight = 4.0f * hd * hd + 1.0f * (s - s3) * (s - s3) + 2.0f * (v - v3) * (v - v3);
+					if (hsvWeight <= c3Weight) {
+						c3Weight = hsvWeight;
+						_c3Color = i;
+					}
+
+					// C4 color
+					// Blue. Use a hight weight on the hue to get a blue.
+					// The color is darker and more saturated than C3 and the saturation has more impact.
+					hd = h - h4;
+					hd += hd < -0.5f ? 1.0f : hd > 0.5f ? -1.0f : 0.0f;
+					hsvWeight = 5.0f * hd * hd + 3.0f * (s - s4) * (s - s4) + 2.0f * (v - v4) * (v - v4);
+					if (hsvWeight <= c4Weight) {
+						c4Weight = hsvWeight;
+						_c4Color = i;
+					}
 				}
 			}
 
@@ -304,9 +370,44 @@ bool MoviePlayer::playVideo() {
 byte MoviePlayer::findBlackPalIndex() {
 	return _black;
 }
+	
+byte MoviePlayer::findTextColorPalIndex() {
+	switch (_textColor) {
+	case 1:
+		return _c1Color;
+	case 2:
+		return _c2Color;
+	case 3:
+		return _c3Color;
+	case 4:
+		return _c4Color;
+	}
+	return _c1Color;
+}
 
-byte MoviePlayer::findWhitePalIndex() {
-	return _white;
+void MoviePlayer::convertColor(byte r, byte g, byte b, float &h, float &s, float &v) {
+	float varR = r / 255.0f;
+	float varG = g / 255.0f;
+	float varB = b / 255.0f;
+
+	float min = MIN(varR, MIN(varG, varB));
+	float max = MAX(varR, MAX(varG, varB));
+
+	v = max;
+	float d = max - min;
+	s = max == 0.0f ? 0.0f : d / max;
+
+	if (min == max) {
+		h = 0.0f; // achromatic
+	} else {
+		if (max == varR)
+			h = (varG - varB) / d + (varG < varB ? 6.0f : 0.0f);
+		else if (max == varG)
+			h = (varB - varR) / d + 2.0f;
+		else
+			h = (varR - varG) / d + 4.0f;
+		h /= 6.0f;
+	}
 }
 
 DXADecoderWithSound::DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle)
diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h
index 1c03c66342..c436607211 100644
--- a/engines/sword1/animation.h
+++ b/engines/sword1/animation.h
@@ -45,11 +45,13 @@ class MovieText {
 public:
 	uint16 _startFrame;
 	uint16 _endFrame;
+	uint16 _color;
 	Common::String _text;
-	MovieText(int startFrame, int endFrame, const Common::String &text) {
+	MovieText(int startFrame, int endFrame, const Common::String &text, int color) {
 		_startFrame = startFrame;
 		_endFrame = endFrame;
 		_text = text;
+		_color = color;
 	}
 };
 
@@ -80,7 +82,9 @@ protected:
 	OSystem *_system;
 	Common::List<MovieText> _movieTexts;
 	int _textX, _textY, _textWidth, _textHeight;
-	byte _white, _black;
+	int _textColor;
+	byte _black;
+	byte _c1Color, _c2Color, _c3Color, _c4Color;
 	DecoderType _decoderType;
 
 	Video::VideoDecoder *_decoder;
@@ -91,7 +95,8 @@ protected:
 	void performPostProcessing(byte *screen);
 
 	byte findBlackPalIndex();
-	byte findWhitePalIndex();
+	byte findTextColorPalIndex();
+	void convertColor(byte r, byte g, byte b, float &h, float &s, float &v);
 };
 
 MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, ResMan *resMan, Audio::Mixer *snd, OSystem *system);
-- 
cgit v1.2.3


From 4546ca0e22467c6cea460824689295566f1d410e Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Wed, 18 Jan 2012 02:43:39 +0000
Subject: SWORD1: Do not look for color indexes in cutscenes when there is no
 subtitles

---
 engines/sword1/animation.cpp | 161 ++++++++++++++++++++++---------------------
 1 file changed, 82 insertions(+), 79 deletions(-)

(limited to 'engines')

diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index be9e02f64f..a8c313f2f8 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -267,85 +267,88 @@ bool MoviePlayer::playVideo() {
 			if (_decoder->hasDirtyPalette()) {
 				_decoder->setSystemPalette();
 
-				uint32 minWeight = 0xFFFFFFFF;
-				uint32 weight;
-				float c1Weight = 1e+30;
-				float c2Weight = 1e+30;
-				float c3Weight = 1e+30;
-				float c4Weight = 1e+30;
-				byte r, g, b;
-				float h, s, v, hd, hsvWeight;
-
-				const byte *palette = _decoder->getPalette();
-				
-				// Color comparaison for the subtitles colors is done in HSL
-				// C1 color is used for George and is almost white (R = 248, G = 252, B = 248)
-				const float h1 = 0.333333f, s1 = 0.02f, v1 = 0.99f;
-
-				// C2 color is used for George as a narrator and is grey (R = 184, G = 188, B = 184)
-				const float h2 = 0.333333f, s2 = 0.02f, v2 = 0.74f;
-
-				// C3 color is used for Nicole and is rose (R = 200, G = 120, B = 184)
-				const float h3 = 0.866667f, s3 = 0.4f, v3 = 0.78f;
-
-				// C4 color is used for Maguire and is blue (R = 80, G = 152, B = 184)
-				const float h4 = 0.55f, s4 = 0.57f, v4 = 0.72f;
-
-				for (int i = 0; i < 256; i++) {
-					r = *palette++;
-					g = *palette++;
-					b = *palette++;
-
-					weight = 3 * r * r + 6 * g * g + 2 * b * b;
-
-					if (weight <= minWeight) {
-						minWeight = weight;
-						_black = i;
-					}
-
-					convertColor(r, g, b, h, s, v);
-
-					// C1 color
-					// It is almost achromatic (very low saturation) so the hue as litle impact on the color.
-					// Therefore use a low weight on hue and high weight on saturation.
-					hd = h - h1;
-					hd += hd < -0.5f ? 1.0f : hd > 0.5f ? -1.0f : 0.0f;
-					hsvWeight = 1.0f * hd * hd + 4.0f * (s - s1) * (s - s1) + 3.0f * (v - v1) * (v - v1);
-					if (hsvWeight <= c1Weight) {
-						c1Weight = hsvWeight;
-						_c1Color = i;
-					}
-
-					// C2 color
-					// Also an almost achromatic color so use the same weights as for C1 color.
-					hd = h - h2;
-					hd += hd < -0.5f ? 1.0f : hd > 0.5f ? -1.0f : 0.0f;
-					hsvWeight = 1.0f * hd * hd + 4.0f * (s - s2) * (s - s2) + 3.0f * (v - v2) * (v - v2);
-					if (hsvWeight <= c2Weight) {
-						c2Weight = hsvWeight;
-						_c2Color = i;
-					}
-
-					// C3 color
-					// A light rose. Use a high weight on the hue to get a rose.
-					// The color is a bit gray and the saturation has not much impact so use a low weight.
-					hd = h - h3;
-					hd += hd < -0.5f ? 1.0f : hd > 0.5f ? -1.0f : 0.0f;
-					hsvWeight = 4.0f * hd * hd + 1.0f * (s - s3) * (s - s3) + 2.0f * (v - v3) * (v - v3);
-					if (hsvWeight <= c3Weight) {
-						c3Weight = hsvWeight;
-						_c3Color = i;
-					}
-
-					// C4 color
-					// Blue. Use a hight weight on the hue to get a blue.
-					// The color is darker and more saturated than C3 and the saturation has more impact.
-					hd = h - h4;
-					hd += hd < -0.5f ? 1.0f : hd > 0.5f ? -1.0f : 0.0f;
-					hsvWeight = 5.0f * hd * hd + 3.0f * (s - s4) * (s - s4) + 2.0f * (v - v4) * (v - v4);
-					if (hsvWeight <= c4Weight) {
-						c4Weight = hsvWeight;
-						_c4Color = i;
+				if (!_movieTexts.empty()) {
+					// Look for the best color indexes to use to display the subtitles
+					uint32 minWeight = 0xFFFFFFFF;
+					uint32 weight;
+					float c1Weight = 1e+30;
+					float c2Weight = 1e+30;
+					float c3Weight = 1e+30;
+					float c4Weight = 1e+30;
+					byte r, g, b;
+					float h, s, v, hd, hsvWeight;
+
+					const byte *palette = _decoder->getPalette();
+
+					// Color comparaison for the subtitles colors is done in HSL
+					// C1 color is used for George and is almost white (R = 248, G = 252, B = 248)
+					const float h1 = 0.333333f, s1 = 0.02f, v1 = 0.99f;
+
+					// C2 color is used for George as a narrator and is grey (R = 184, G = 188, B = 184)
+					const float h2 = 0.333333f, s2 = 0.02f, v2 = 0.74f;
+
+					// C3 color is used for Nicole and is rose (R = 200, G = 120, B = 184)
+					const float h3 = 0.866667f, s3 = 0.4f, v3 = 0.78f;
+
+					// C4 color is used for Maguire and is blue (R = 80, G = 152, B = 184)
+					const float h4 = 0.55f, s4 = 0.57f, v4 = 0.72f;
+
+					for (int i = 0; i < 256; i++) {
+						r = *palette++;
+						g = *palette++;
+						b = *palette++;
+
+						weight = 3 * r * r + 6 * g * g + 2 * b * b;
+
+						if (weight <= minWeight) {
+							minWeight = weight;
+							_black = i;
+						}
+
+						convertColor(r, g, b, h, s, v);
+
+						// C1 color
+						// It is almost achromatic (very low saturation) so the hue as litle impact on the color.
+						// Therefore use a low weight on hue and high weight on saturation.
+						hd = h - h1;
+						hd += hd < -0.5f ? 1.0f : hd > 0.5f ? -1.0f : 0.0f;
+						hsvWeight = 1.0f * hd * hd + 4.0f * (s - s1) * (s - s1) + 3.0f * (v - v1) * (v - v1);
+						if (hsvWeight <= c1Weight) {
+							c1Weight = hsvWeight;
+							_c1Color = i;
+						}
+
+						// C2 color
+						// Also an almost achromatic color so use the same weights as for C1 color.
+						hd = h - h2;
+						hd += hd < -0.5f ? 1.0f : hd > 0.5f ? -1.0f : 0.0f;
+						hsvWeight = 1.0f * hd * hd + 4.0f * (s - s2) * (s - s2) + 3.0f * (v - v2) * (v - v2);
+						if (hsvWeight <= c2Weight) {
+							c2Weight = hsvWeight;
+							_c2Color = i;
+						}
+
+						// C3 color
+						// A light rose. Use a high weight on the hue to get a rose.
+						// The color is a bit gray and the saturation has not much impact so use a low weight.
+						hd = h - h3;
+						hd += hd < -0.5f ? 1.0f : hd > 0.5f ? -1.0f : 0.0f;
+						hsvWeight = 4.0f * hd * hd + 1.0f * (s - s3) * (s - s3) + 2.0f * (v - v3) * (v - v3);
+						if (hsvWeight <= c3Weight) {
+							c3Weight = hsvWeight;
+							_c3Color = i;
+						}
+
+						// C4 color
+						// Blue. Use a hight weight on the hue to get a blue.
+						// The color is darker and more saturated than C3 and the saturation has more impact.
+						hd = h - h4;
+						hd += hd < -0.5f ? 1.0f : hd > 0.5f ? -1.0f : 0.0f;
+						hsvWeight = 5.0f * hd * hd + 3.0f * (s - s4) * (s - s4) + 2.0f * (v - v4) * (v - v4);
+						if (hsvWeight <= c4Weight) {
+							c4Weight = hsvWeight;
+							_c4Color = i;
+						}
 					}
 				}
 			}
-- 
cgit v1.2.3


From 00a9d394a502598afcc3502d0bdd7cee88a065cc Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 18 Jan 2012 23:21:50 +0100
Subject: TSAGE: R2R - Implement scene 1700

---
 engines/tsage/globals.cpp                       |   4 +
 engines/tsage/globals.h                         |   2 +
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   1 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 467 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  60 +++
 5 files changed, 534 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 1ac426518d..e6c167355c 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -380,6 +380,8 @@ void Ringworld2Globals::reset() {
 	_v558C2 = 0;
 	_v5657C = 0;
 	_v565F5 = 0;
+	_v565F6 = 0;
+	_v565FA = 0;
 	_v565AE = 0;
 
 	_v56605[0] = 0;
@@ -453,6 +455,8 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_v558C2);
 	s.syncAsSint16LE(_v5657C);
 	s.syncAsSint16LE(_v565F5);
+	s.syncAsSint16LE(_v565F6);
+	s.syncAsSint16LE(_v565FA);
 	s.syncAsSint16LE(_v566A6);
 	s.syncAsSint16LE(_v56A93);
 	s.syncAsSint16LE(_v56A9E);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 5b1d6b4eb0..e734ef3196 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -257,6 +257,8 @@ public:
 	Rect _v558B6;
 	int _v558C2;
 	int _v565F5;
+	int _v565F6;
+	int _v565FA;
 	int _v5657C;
 	byte _v565AE;
 	byte _v56605[14];
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 82f52ab558..15d2331cba 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -127,6 +127,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Miranda being questioned
 		return new Scene1625();
 	case 1700:
+		return new Scene1700();
 	case 1750:
 	case 1800:
 	case 1850:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 6f748362df..9a0a34a93e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -5173,5 +5173,472 @@ void Scene1625::process(Event &event) {
 		Scene::process(event);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1700 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene1700::Scene1700() {
+	_field77A = 0;
+	_field77C = 0;
+}
+
+void Scene1700::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field77A);
+	s.syncAsSint16LE(_field77C);
+}
+
+bool Scene1700::Item2::startAction(CursorType action, Event &event) {
+	// The original contains a debug trace. It's currently skipped.
+	// TODO: either add the debug trace, or remove this function and associated class
+	return SceneHotspot::startAction(action, event);
+}
+
+bool Scene1700::Actor11::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();
+	R2_GLOBALS._v558B6.set(80, 0, 240, 200);
+	scene->_sceneMode = 4;
+
+	Common::Point pt(271, 90);
+	PlayerMover *mover = new PlayerMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+
+	return true;
+}
+
+bool Scene1700::Actor12::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::Exit1::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::Exit2::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::Exit3::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::subAF3F8() {
+	Rect tmpRect;
+	R2_GLOBALS._walkRegions.load(1700);
+	
+	_actor3.remove();
+	_actor4.remove();
+	_actor5.remove();
+	_actor6.remove();
+	_actor7.remove();
+	_actor8.remove();
+	_actor11.remove();
+	
+	if (_sceneMode != 40) {
+		_actor9.remove();
+		_actor10.remove();
+	}
+	
+	warning("tmpRect = _v5589E;");
+	warning("Mouse_hideIfNeeded");
+	warning("set_pane_p(_paneNumber);");
+	warning("Big loop calling gfx_draw_slice_p");
+	
+	if (_field77A == 0)
+		_field77A = 1;
+	else
+		_field77A = 0;
+	
+	warning("set_pane_p(_paneNumber);");
+
+	if ((_sceneMode != 40) && (R2_GLOBALS._v565F6 != 0)){
+		_actor9.postInit();
+		_actor9.setup(1701, 1, 1);
+		_actor9.setPosition(Common::Point(220, 137));
+		_actor9.setDetails(1700, 6, -1, -1, 2, (SceneItem *) NULL);
+		R2_GLOBALS._walkRegions.enableRegion(2);
+		R2_GLOBALS._walkRegions.enableRegion(12);
+	} 
+	
+	if ((R2_GLOBALS._v565F6 + 2) % 4 == 0) {
+		_actor3.postInit();
+		_actor3.setup(1700, 1, 1);
+		_actor3.setPosition(Common::Point(222, 82));
+		_actor3.setDetails(100, -1, -1, -1, 2, (SceneItem *) NULL);
+		
+		_actor5.postInit();
+		_actor5.setup(1700, 2, 1);
+		_actor5.setPosition(Common::Point(177, 82));
+		_actor5.fixPriority(0);
+		
+		_actor6.postInit();
+		_actor6.setup(1700, 2, 2);
+		_actor6.setPosition(Common::Point(332, 96));
+		_actor6.fixPriority(0);
+	
+		_actor4.postInit();
+		_actor4.setup(1700, 1, 2);
+		_actor4.setPosition(Common::Point(424, 84));
+		
+		R2_GLOBALS._walkRegions.enableRegion(11);
+	}
+	
+	if ((R2_GLOBALS._v565F6 + 399) % 800 == 0) {
+		_actor7.postInit();
+		_actor7.setup(1700, 3, 2);
+		_actor7.setPosition(Common::Point(51, 141));
+		_actor7.fixPriority(0);
+		_actor7.setDetails(100, -1, -1, -1, 2, (SceneItem *) NULL);
+		
+		_exit3._enabled = true;
+	} else {
+		R2_GLOBALS._walkRegions.enableRegion(1);
+		_exit3._enabled = false;
+	}
+	
+	if (  ((!R2_GLOBALS.getFlag(15)) && ((R2_GLOBALS._v565F6 == 25) || (R2_GLOBALS._v565F6 == -3))) 
+		 || ((R2_GLOBALS.getFlag(15)) && (R2_GLOBALS._v565F6 == R2_GLOBALS._v565FA))
+		 ) {
+		R2_GLOBALS._v565FA = R2_GLOBALS._v565F6;
+		if (!R2_GLOBALS.getFlag(15))
+			_field77C = 1;
+		
+		_actor11.postInit();
+		_actor11.setup(1700, 3, 1);
+		_actor11.setPosition(Common::Point(338, 150));
+		_actor11.setDetails(1700, 9, -1, -1, 2, (SceneItem *) NULL);
+		_actor11.fixPriority(15);
+		
+		_actor8.postInit();
+		_actor8.setup(1700, 4, 1);
+		_actor8.setPosition(Common::Point(312, 106));
+		_actor8.fixPriority(130);
+	}
+}
+
+void Scene1700::postInit(SceneObjectList *OwnerList) {
+	loadScene(1700);
+	SceneExt::postInit();
+	if (R2_GLOBALS._sceneManager._previousScene == -1)
+		R2_GLOBALS._sceneManager._previousScene = 1530;
+	
+	scalePalette(65, 65, 65);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+
+	_field77A = 0;
+	_field77C = 0;
+	
+	_exit1.setDetails(Rect(94, 0, 319, 12), EXITCURSOR_N, 1700);
+	_exit2.setDetails(Rect(0, 161, 319, 168), EXITCURSOR_S, 1700);
+	_exit3.setDetails(Rect(0, 0, 2, 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.setVisage(1501);
+		R2_GLOBALS._player._moveDiff = Common::Point(2, 1);
+	} else {
+		R2_GLOBALS._player.setVisage(1506);
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 1);
+	}
+	
+	_actor12.postInit();
+	_actor12.animate(ANIM_MODE_1, NULL);
+	_actor12.setObjectWrapper(new SceneObjectWrapper());
+	
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		_actor12.setVisage(1506);
+		_actor12._moveDiff = Common::Point(3, 1);
+		_actor12.setDetails(9002, 1, -1, -1, 1, (SceneItem *) NULL);
+	} else {
+		_actor12.setVisage(1501);
+		_actor12._moveDiff = Common::Point(2, 1);
+		_actor12.setDetails(9001, 1, -1, -1, 1, (SceneItem *) NULL);
+	}
+	
+	R2_GLOBALS._sound1.play(134);
+	
+	_actor1.postInit();
+	_actor1.fixPriority(10);
+	
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		_actor1.setVisage(1112);
+	else 
+		_actor1.setVisage(1111);
+	
+	_actor1._effect = 5;
+	_actor1._field9C = _field312;
+	R2_GLOBALS._player._linkedActor = &_actor1;
+	
+	_actor2.postInit();
+	_actor2.fixPriority(10);
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		_actor2.setVisage(1111);
+	else 
+		_actor2.setVisage(1112);
+	
+	_actor2._effect = 5;
+	_actor2._field9C = _field312;
+	_actor12._linkedActor = &_actor2;
+	
+	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();
+		_actor12.hide();
+		
+		_actor10.postInit();
+		warning("_actor10._actorName = \"hatch\";");
+		_actor10.hide();
+
+		_actor9.postInit();
+		_actor9.setup(1701, 1, 1);
+		_actor9.setPosition(Common::Point(220, 137));
+		_actor9.setDetails(1700, 6, -1, -1, 1, (SceneItem *) NULL);
+		
+		_actor1.hide();
+		_actor2.hide();
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(539, this);
+		_sceneMode = 40;
+		break;
+	case 1750: {
+		R2_GLOBALS._player.setPosition(Common::Point(282, 121));
+		_actor12.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();
+		_actor12.addMover(mover2, &pt2, this);
+		}
+		break;
+	case 1800: {
+		R2_GLOBALS._player.disableControl();
+		R2_GLOBALS._player.setPosition(Common::Point(0, 86));
+		_actor12.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);
+		_actor12.setObjectWrapper(NULL);
+		_actor12._strip = 1;
+		Common::Point pt2(77, 64);
+		NpcMover *mover2 = new NpcMover();
+		_actor12.addMover(mover2, &pt2, NULL);
+		}
+		break;
+	default:
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			R2_GLOBALS._player.setPosition(Common::Point(109, 160));
+			_actor12.setPosition(Common::Point(156, 160));
+			R2_GLOBALS._walkRegions.enableRegion(15);
+		} else {
+			R2_GLOBALS._player.setPosition(Common::Point(156, 160));
+			_actor12.setPosition(Common::Point(109, 160));
+			R2_GLOBALS._walkRegions.enableRegion(17);
+		}
+		_sceneMode = 50;
+		setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
+		break;
+	}
+	R2_GLOBALS._player._characterScene[1] = 1700;
+	R2_GLOBALS._player._characterScene[2] = 1700;
+	R2_GLOBALS._player._oldCharacterScene[1] = 1700;
+	R2_GLOBALS._player._oldCharacterScene[2] = 1700;
+
+	R2_GLOBALS._v558B6.set(20, 0, 320, 200);
+	subAF3F8();
+	_item1.setDetails(1, 1700, 3, -1, -1);
+	_item2.setDetails(Rect(0, 0, 480, 200), 1700, 0, -1, -1, 1, NULL);
+}
+
+void Scene1700::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene1700::signal() {
+	switch (_sceneMode) {
+	case 1: {
+		_sceneMode = 3;
+		if ((R2_GLOBALS._v565F6 < 2400) && (R2_GLOBALS._v565F6 >= 0))
+			++R2_GLOBALS._v565F6;
+		subAF3F8();
+		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);
+		
+		if (R2_GLOBALS._player._position.x < 132) {
+			_actor12.setPosition(Common::Point(156, 170));
+			Common::Point pt2(156, 160);
+			NpcMover *mover2 = new NpcMover();
+			_actor12.addMover(mover2, &pt2, NULL);
+			R2_GLOBALS._walkRegions.enableRegion(15);
+		} else {
+			_actor12.setPosition(Common::Point(109, 170));
+			Common::Point pt3(109, 160);
+			NpcMover *mover3 = new NpcMover();
+			_actor12.addMover(mover3, &pt3, NULL);
+			R2_GLOBALS._walkRegions.enableRegion(17);
+		}
+		}
+		break;
+	case 2: {
+		_sceneMode = 3;
+		if ((R2_GLOBALS._v565F6 > -2400) && (R2_GLOBALS._v565F6 < 0))
+			R2_GLOBALS._v565F6--;
+		subAF3F8();
+		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._player._position.x >= 171) {
+			_actor12.setPosition(Common::Point(155, 0));
+			Common::Point pt2(155, 10);
+			NpcMover *mover2 = new NpcMover();
+			_actor12.addMover(mover2, &pt2, NULL);
+			R2_GLOBALS._walkRegions.enableRegion(15);
+		} else {
+			_actor12.setPosition(Common::Point(188, 0));
+			Common::Point pt3(188, 10);
+			NpcMover *mover3 = new NpcMover();
+			_actor12.addMover(mover3, &pt3, NULL);
+			R2_GLOBALS._walkRegions.enableRegion(17);
+		}
+		}
+		break;
+	case 3:
+		if (_field77C == 0) {
+			R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		} else {
+			R2_GLOBALS.setFlag(15);
+			_field77C = 0;
+			_sceneMode = 31;
+			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+			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();
+		_actor12.addMover(mover, &pt, NULL);
+		if (R2_GLOBALS._player._characterIndex == 1)
+			setAction(&_sequenceManager, this, 1700, &R2_GLOBALS._player, &_actor8, NULL);
+		else
+			setAction(&_sequenceManager, this, 1701, &R2_GLOBALS._player, &_actor8, 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;
+		_actor12.setObjectWrapper(new SceneObjectWrapper());
+		_actor12._strip = 1;
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._walkRegions.enableRegion(14);
+		break;
+	case 8:
+		R2_GLOBALS._player._strip = 2;
+		_actor12._strip = 1;
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		R2_GLOBALS._walkRegions.enableRegion(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._v56AAB = 0;
+		R2_GLOBALS._player.enableControl(CURSOR_TALK);
+		break;
+	case 40:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1704;
+		setAction(&_sequenceManager, this, 1704, &R2_GLOBALS._player, &_actor12, &_actor10, &_actor9, &_actor1, &_actor2, NULL);
+		break;
+	case 50:
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+			R2_GLOBALS._walkRegions.enableRegion(15);
+		else
+			R2_GLOBALS._walkRegions.enableRegion(17);
+		
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1704:
+		R2_GLOBALS._sound1.play(134);
+		R2_GLOBALS._walkRegions.enableRegion(15);
+		R2_GLOBALS._walkRegions.enableRegion(2);
+		R2_GLOBALS._walkRegions.enableRegion(12);
+		R2_GLOBALS._player.fixPriority(-1);
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index e4ba84cdd9..cfd701b2d5 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -521,6 +521,66 @@ public:
 	virtual void process(Event &event);
 };
 
+class Scene1700 : public SceneExt {
+	class Item2 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor11 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor12 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit2 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit3 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+public:
+	SpeakerQuinn _quinnSpeaker;
+	SpeakerSeeker _seekerSpeaker;
+	NamedHotspot _item1;
+	Item2 _item2;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	SceneActor _actor6;
+	SceneActor _actor7;
+	SceneActor _actor8;
+	SceneActor _actor9;
+	SceneActor _actor10;
+	Actor11 _actor11;
+	Actor12 _actor12;
+	Exit1 _exit1;
+	Exit2 _exit2;
+	Exit3 _exit3;
+	SequenceManager _sequenceManager;
+	
+	int _field77A;
+	int _field77C;
+
+	Scene1700();
+	void synchronize(Serializer &s);
+	void subAF3F8();
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 69a2c72c47558dfd54762d2361b0fc2c5e680317 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 20 Jan 2012 19:03:12 +0100
Subject: TSAGE: R2R - Implement scene 1800

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 524 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  53 +++
 3 files changed, 579 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 15d2331cba..ff694a69fd 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -129,7 +129,9 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1700:
 		return new Scene1700();
 	case 1750:
+		error("Missing scene %d from group 1", sceneNumber);
 	case 1800:
+		return new Scene1800();
 	case 1850:
 	case 1875:
 	case 1900:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 9a0a34a93e..2fa7f50cb4 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -5640,5 +5640,529 @@ void Scene1700::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1800 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene1800::Scene1800() {
+	_field412 = 0;
+}
+
+void Scene1800::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+}
+
+bool Scene1800::Hotspot5::startAction(CursorType action, Event &event) {
+	if ((action != R2_9) && (action != R2_39))
+		return false;
+	
+	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);	
+
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		if (R2_GLOBALS._v565F6 == 1201) {
+			scene->_stripManager.start(548, this);
+		} else if (R2_GLOBALS.getFlag(66)) {
+			return false;
+		} else {
+			scene->_stripManager.start(546, this);
+		}
+	} else {
+		if (R2_GLOBALS._v565F6 == 1201) {
+			scene->_stripManager.start(549, this);
+		} else if (R2_GLOBALS.getFlag(66)) {
+			return false;
+		} else {
+			scene->_stripManager.start(547, this);
+		}
+	}
+
+	R2_GLOBALS.setFlag(66);
+	return true;
+}
+
+bool Scene1800::Actor6::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->_actor6, &scene->_actor4, &scene->_actor5, NULL);
+	} else {
+		R2_GLOBALS.clearFlag(64);
+		scene->_sceneMode = 1811;
+		scene->setAction(&scene->_sequenceManager, scene, 1811, &R2_GLOBALS._player, &scene->_actor6, &scene->_actor4, &scene->_actor5, NULL);
+	}
+	return true;
+}
+
+bool Scene1800::Actor7::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) {
+		R2_GLOBALS._player.disableControl();
+		if (scene->_field412 >= 2) {
+			if (R2_GLOBALS.getFlag(14)) {
+				scene->_sceneMode = 1809;
+				scene->setAction(&scene->_sequenceManager, scene, 1809, &R2_GLOBALS._player, &scene->_actor7, NULL);
+				R2_GLOBALS.clearFlag(14);
+			} else {
+				scene->_sceneMode = 1808;
+				scene->setAction(&scene->_sequenceManager, scene, 1808, &R2_GLOBALS._player, &scene->_actor7, NULL);
+				R2_GLOBALS.setFlag(14);
+			}
+		} else {
+			scene->_sceneMode = 1813;
+			scene->setAction(&scene->_sequenceManager, scene, 1813, &R2_GLOBALS._player, NULL);
+		}
+	} else if (R2_GLOBALS.getFlag(14)) {
+		return SceneActor::startAction(action, event);
+	} else {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 1812;
+		scene->setAction(&scene->_sequenceManager, scene, 1812, &R2_GLOBALS._player, NULL);
+	}
+
+	return true;
+}
+
+bool Scene1800::Actor8::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->_actor4._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 = 1804;
+					scene->setAction(&scene->_sequenceManager, scene, 1804, &R2_GLOBALS._player, &scene->_actor2, &scene->_actor8, NULL);
+				} else {
+					scene->_sceneMode = 1;
+					scene->setAction(&scene->_sequenceManager, scene, 1809, &R2_GLOBALS._player, &scene->_actor2, &scene->_actor7, NULL);
+					R2_GLOBALS.clearFlag(14);
+				}
+			} else {
+				if (R2_GLOBALS.getFlag(14)) {
+					scene->_sceneMode = 1;
+					scene->setAction(&scene->_sequenceManager, scene, 1809, &R2_GLOBALS._player, &scene->_actor7, NULL);
+					R2_GLOBALS.clearFlag(14);
+				} else {
+					scene->_sceneMode = 1805;
+					scene->setAction(&scene->_sequenceManager, scene, 1805, &R2_GLOBALS._player, &scene->_actor2, &scene->_actor8, NULL);
+				}
+			}
+		}
+	} else {
+		if (scene->_actor4._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, &R2_GLOBALS._player, &scene->_actor2, &scene->_actor7, NULL);
+					R2_GLOBALS.clearFlag(14);
+				} else {
+					scene->_sceneMode = 1806;
+					scene->setAction(&scene->_sequenceManager, scene, 1806, &R2_GLOBALS._player, &scene->_actor2, &scene->_actor9, NULL);
+				}
+			} else {
+				if (R2_GLOBALS.getFlag(14)) {
+					scene->_sceneMode = 2;
+					scene->setAction(&scene->_sequenceManager, scene, 1809, &R2_GLOBALS._player, &scene->_actor7, NULL);
+					R2_GLOBALS.clearFlag(14);
+				} else {
+					scene->_sceneMode = 1807;
+					scene->setAction(&scene->_sequenceManager, scene, 1807, &R2_GLOBALS._player, &scene->_actor2, &scene->_actor9, NULL);
+				}
+			}
+		}
+	}
+
+	return true;
+}
+
+void Scene1800::Exit1::changeScene() {
+	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._events.setCursor(CURSOR_ARROW);
+	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, &R2_GLOBALS._player, &scene->_actor7, NULL);
+		else
+			scene->setAction(&scene->_sequenceManager, scene, 1809, &scene->_actor2, &scene->_actor7, 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->_actor2, NULL);
+		else
+			scene->setAction(&scene->_sequenceManager, scene, 1802, &R2_GLOBALS._player, &scene->_actor2, NULL);
+	}
+}
+
+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._v565F6 = 1201;
+	
+	if (R2_GLOBALS._v565F6 == 1201)
+		_field412 = 2;
+	else
+		_field412 = 0;
+	
+	scalePalette(65, 65, 65);
+	_exit1.setDetails(Rect(0, 160, 319, 168), EXITCURSOR_S, 1800);
+	_item5.setDetails(Rect(0, 0, 320, 200), -1, -1, -1, -1, 1, NULL);
+	
+	_actor6.postInit();
+	_actor6.setup(1801, 4, 1);
+	_actor6.setPosition(Common::Point(170, 24));
+	_actor6.setDetails(1800, 13, 14, 15, 1, (SceneItem *) NULL);
+	
+	_actor7.postInit();
+	_actor7.setup(1801, 3, 1);
+	_actor7.setPosition(Common::Point(160, 139));
+	_actor7.setDetails(1800, 6, -1, -1, 1, (SceneItem *) NULL);
+	
+	_actor8.postInit();
+	_actor8.setup(1800, 1, 1);
+	_actor8.setPosition(Common::Point(110, 78));
+	_actor8.fixPriority(135);
+	_actor8.setDetails(1800, 20, -1, -1, 1, (SceneItem *) NULL);
+	
+	_actor9.postInit();
+	_actor9.setup(1800, 2, 1);
+	_actor9.setPosition(Common::Point(209, 78));
+	_actor9.fixPriority(135);
+	_actor9.setDetails(1800, 20, -1, -1, 1, (SceneItem *) NULL);
+	
+	_actor4.postInit();
+	if ((_field412 != 1) && (_field412 != 3) && (!R2_GLOBALS.getFlag(64)))
+		_actor4.setup(1801, 2, 1);
+	else
+		_actor4.setup(1801, 2, 10);
+	_actor4.setPosition(Common::Point(76, 142));
+	_actor4.setDetails(1800, 3, -1, -1, 1, (SceneItem *) NULL);
+	
+	_actor5.postInit();
+	if ((_field412 != 1) && (_field412 != 3) && (!R2_GLOBALS.getFlag(64)))
+		_actor5.setup(1801, 1, 1);
+	else
+		_actor5.setup(1801, 1, 10);
+	_actor5.setPosition(Common::Point(243, 142));
+	_actor5.setDetails(1800, 3, -1, -1, 1, (SceneItem *) NULL);
+	
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		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.enableRegion(9);
+			_actor7.hide();
+		} else {
+			R2_GLOBALS._player.setVisage(1507);
+		}
+		R2_GLOBALS._player._moveDiff = Common::Point(4, 2);
+	} else {
+		R2_GLOBALS._player.setVisage(1503);
+		R2_GLOBALS._player._moveDiff = Common::Point(2, 2);
+	}
+	
+	_actor2.postInit();
+	_actor2.animate(ANIM_MODE_1, NULL);
+	_actor2.setObjectWrapper(new SceneObjectWrapper());
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		if (R2_GLOBALS.getFlag(14)) {
+			_actor2.animate(ANIM_MODE_NONE, NULL);
+			_actor2.setObjectWrapper(NULL);
+			_actor2.setup(1801, 5, 12);
+
+			R2_GLOBALS._walkRegions.enableRegion(9);
+			_actor7.hide();
+		} else {
+			_actor2.setup(1507, 1, 1);
+			_actor2.setPosition(Common::Point(180, 160));
+		}
+		_actor2.setDetails(9002, 0, 4, 3, 1, (SceneItem *) NULL);
+		_actor2._moveDiff = Common::Point(4, 2);
+	} else {
+		_actor2.setDetails(9001, 0, 5, 3, 1, (SceneItem *) NULL);
+		_actor2.setVisage(1503);
+		_actor2._moveDiff = Common::Point(2, 2);
+	}
+	
+	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)) {
+				_actor2.setPosition(Common::Point(160, 139));
+				R2_GLOBALS._walkRegions.enableRegion(8);
+			} else {
+				_actor2.setPosition(Common::Point(209, 150));
+				_actor2.setStrip(6);
+				R2_GLOBALS._walkRegions.enableRegion(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);
+			}
+			_actor2.setPosition(Common::Point(114, 150));
+			_actor2.setStrip(5);
+			R2_GLOBALS._walkRegions.enableRegion(10);
+			R2_GLOBALS._walkRegions.enableRegion(11);
+		}
+	} else {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			R2_GLOBALS._player.setPosition(Common::Point(140, 160));
+			_actor2.setPosition(Common::Point(180, 160));
+		} else {
+			R2_GLOBALS._player.setPosition(Common::Point(180, 160));
+			_actor2.setPosition(Common::Point(140, 160));
+		}
+	}
+	
+	_actor1.postInit();
+	_actor1.fixPriority(10);
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		_actor1.setVisage(1111);
+	else
+		_actor1.setVisage(1110);
+	
+	_actor1._effect = 5;
+	_actor1._field9C = _field312;
+
+	R2_GLOBALS._player._linkedActor = &_actor1;
+	
+	_actor3.postInit();
+	_actor3.fixPriority(10);
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		_actor3.setVisage(1110);
+	else
+		_actor3.setVisage(1111);
+	
+	_actor3._effect = 5;
+	_actor3._field9C = _field312;
+	
+	_actor2._linkedActor = &_actor3;
+	
+	R2_GLOBALS._player._characterScene[1] = 1800;
+	R2_GLOBALS._player._characterScene[2] = 1800;
+	
+	_item2.setDetails(Rect(128, 95, 190, 135), 1800, 10, -1, -1, 1, NULL);
+	_item1.setDetails(Rect(95, 3, 223, 135), 1800, 0, -1, -1, 1, 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
+	_item3.setDetails(11, 1800, 23, 24, 25);
+	_item4.setDetails(Rect(0, 0, 320, 200), 1800, 17, -1, 19, 1, 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_ARROW);
+		}
+	} 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, &_actor2, &_actor8, NULL);
+			} else {
+				_sceneMode = 1815;
+				setAction(&_sequenceManager, this, 1815, &R2_GLOBALS._player, &_actor2, &_actor8, NULL);
+			}
+		} else {
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+				_sceneMode = 1816;
+				setAction(&_sequenceManager, this, 1816, &R2_GLOBALS._player, &_actor2, &_actor9, NULL);
+			} else {
+				_sceneMode = 1817;
+				setAction(&_sequenceManager, this, 1817, &R2_GLOBALS._player, &_actor2, &_actor9, NULL);
+			}
+		}
+	} else {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			_sceneMode = 1800;
+			setAction(&_sequenceManager, this, 1800, &R2_GLOBALS._player, &_actor2, NULL);
+		} else {
+			_sceneMode = 1801;
+			setAction(&_sequenceManager, this, 1801, &R2_GLOBALS._player, &_actor2, NULL);
+		}
+	}
+	
+	R2_GLOBALS._player._oldCharacterScene[1] = 1800;
+	R2_GLOBALS._player._oldCharacterScene[2] = 1800;
+}
+
+void Scene1800::signal() {
+	switch (_sceneMode) {
+	case 1:
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			_sceneMode = 1804;
+			setAction(&_sequenceManager, this, 1804, &R2_GLOBALS._player, &_actor2, &_actor8, NULL);
+		} else {
+			_sceneMode = 1805;
+			setAction(&_sequenceManager, this, 1805, &R2_GLOBALS._player, &_actor2, &_actor8, NULL);
+		}
+		break;
+	case 2:
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			_sceneMode = 1806;
+			setAction(&_sequenceManager, this, 1806, &R2_GLOBALS._player, &_actor2, &_actor9, NULL);
+		} else {
+			_sceneMode = 1807;
+			setAction(&_sequenceManager, this, 1807, &R2_GLOBALS._player, &_actor2, &_actor9, NULL);
+		}
+		break;
+	case 3:
+		_sceneMode = 1802;
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+			setAction(&_sequenceManager, this, 1802, &R2_GLOBALS._player, &_actor2, NULL);
+		else
+			setAction(&_sequenceManager, this, 1803, &R2_GLOBALS._player, &_actor2, 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, 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;
+	case 1800:
+		R2_GLOBALS._walkRegions.enableRegion(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.enableRegion(10);
+		R2_GLOBALS._walkRegions.enableRegion(11);
+		R2_GLOBALS.setFlag(63);
+
+		// The following check is completely dumb.
+		// Either an original bug, or dead code.
+		if (R2_GLOBALS.getFlag(63)) {
+			R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		} else {
+			_sceneMode = 10;
+			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+			_stripManager.start(545, this);
+		}
+		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_CROSSHAIRS);
+		_stripManager.start(553, this);
+		break;
+	case 1812:
+		_sceneMode = 13;
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 1814:
+	// No break on purpose
+	case 1815:
+		R2_GLOBALS._walkRegions.enableRegion(10);
+		R2_GLOBALS._walkRegions.enableRegion(11);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 1816:
+	// No break on purpose
+	case 1817:
+		R2_GLOBALS._walkRegions.enableRegion(8);
+		R2_GLOBALS._player.enableControl();
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
+void Scene1800::saveCharacter(int characterIndex) {
+	if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
+		R2_GLOBALS._sound1.fadeOut2(NULL);
+
+	SceneExt::saveCharacter(characterIndex);
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index cfd701b2d5..08d35edf06 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -581,6 +581,59 @@ public:
 	virtual void remove();
 	virtual void signal();
 };
+
+class Scene1800 : public SceneExt {
+	class Hotspot5 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor6 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor7 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor8 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+public:
+	int _field412;
+	SpeakerQuinn _quinnSpeaker;
+	SpeakerSeeker _seekerSpeaker;
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	NamedHotspot _item3;
+	NamedHotspot _item4;
+	Hotspot5 _item5;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	Actor6 _actor6;
+	Actor7 _actor7;
+	Actor8 _actor8;
+	Actor8 _actor9;
+	Exit1 _exit1;
+	SequenceManager _sequenceManager;
+
+	Scene1800();
+	void synchronize(Serializer &s);
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void saveCharacter(int characterIndex);
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 0f6750945651b6213fd47a7a84e3afc8e65b2afd Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 20 Jan 2012 19:45:24 +0100
Subject: TSAGE: R2R - Implement scene 1875

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 208 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  33 ++++
 3 files changed, 243 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index ff694a69fd..7e4cbd88ad 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -133,7 +133,9 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1800:
 		return new Scene1800();
 	case 1850:
+		error("Missing scene %d from group 1", sceneNumber);
 	case 1875:
+		return new Scene1875();
 	case 1900:
 	case 1925:
 	case 1945:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 2fa7f50cb4..18d27b3c49 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -6164,5 +6164,213 @@ void Scene1800::saveCharacter(int characterIndex) {
 	SceneExt::saveCharacter(characterIndex);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1875 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene1875::Actor1875::Actor1875() {
+	_fieldA4 = 0;
+	_fieldA6 = 0;
+}
+
+void Scene1875::Actor1875::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+
+	s.syncAsSint16LE(_fieldA4);
+	s.syncAsSint16LE(_fieldA6);
+}
+
+void Scene1875::Actor1875::subB84AB() {
+	Scene1875 *scene = (Scene1875 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._sound1.play(227);
+
+	int newFrameNumber;
+	switch (_fieldA4) {
+	case 3:
+		if ((scene->_actor1._frame == 1) && (scene->_actor4._strip == 2)) {
+			R2_GLOBALS._player.disableControl();
+			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+			scene->_sceneMode = 10;
+			scene->_stripManager.start(576, this);
+		} else {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 1890;
+			scene->_actor2.postInit();
+			scene->setAction(&scene->_sequenceManager, scene, 1890, &scene->_actor2, NULL);
+		}
+		break;
+	case 4:
+		newFrameNumber = scene->_actor1._frame + 1;
+		if (newFrameNumber > 6)
+			newFrameNumber = 1;
+		scene->_actor1.setFrame(newFrameNumber);
+		break;
+	case 5:
+		newFrameNumber = scene->_actor1._frame - 1;
+		if (newFrameNumber < 1)
+			newFrameNumber = 6;
+		scene->_actor1.setFrame(newFrameNumber);
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1875::Actor1875::subB8271(int indx) {
+	postInit();
+	_fieldA4 = indx;
+	_fieldA6 = 0;
+	setVisage(1855);
+
+	if (_fieldA4 == 1)
+		setStrip(2);
+	else
+		setStrip(1);
+
+	setFrame(_fieldA4);
+	switch (_fieldA4 - 1) {
+	case 0:
+		setPosition(Common::Point(20, 144));
+		break;
+	case 1:
+		setPosition(Common::Point(82, 144));
+		break;
+	case 2:
+		setPosition(Common::Point(136, 144));
+		break;
+	case 3:
+		setPosition(Common::Point(237, 144));
+		break;
+	case 4:
+		setPosition(Common::Point(299, 144));
+		break;
+	default:
+		break;
+	}
+
+	setDetails(1875, 6, 1, -1, 2, (SceneItem *) NULL);
+}
+
+void Scene1875::Actor1875::process(Event &event) {
+	if ((R2_GLOBALS._player._uiEnabled) || (event.handled))
+		return;
+	
+	Scene1875 *scene = (Scene1875 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == R2_STEPPING_DISKS) && (_bounds.contains(event.mousePos)) && (_fieldA6 == 0)) {
+		setStrip(2);
+		switch (_fieldA4) {
+		case 1:
+			R2_GLOBALS._sound2.play(227);
+			scene->_actor5.setStrip(1);
+			break;
+		case 2:
+			R2_GLOBALS._sound2.play(227);
+			scene->_actor4.setStrip(1);
+			break;
+		default:
+			break;
+		}
+		_fieldA6 = 1;
+		event.handled = true;
+	}
+	
+	if ((event.eventType == EVENT_BUTTON_UP) && (_fieldA6 != 0)) {
+		if ((_fieldA4 == 3) || (_fieldA4 == 4) || (_fieldA4 == 5)) {
+			setStrip(1);
+			subB84AB();
+		}
+		_fieldA6 = 0;
+		event.handled = true;
+	}
+}
+
+void Scene1875::postInit(SceneObjectList *OwnerList) {
+	loadScene(1875);
+	SceneExt::postInit();
+	
+	R2_GLOBALS._player._characterScene[1] = 1875;
+	R2_GLOBALS._player._characterScene[2] = 1875;
+	
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+
+	_actor4.subB8271(1);
+	_actor5.subB8271(2);
+	_actor6.subB8271(3);
+	_actor7.subB8271(4);
+	_actor8.subB8271(5);
+	
+	_actor1.postInit();
+	_actor1.setup(1855, 4, 1);
+	_actor1.setPosition(Common::Point(160, 116));
+	
+	R2_GLOBALS._player.postInit();
+	if (R2_GLOBALS._sceneManager._previousScene == 1625) {
+		R2_GLOBALS._sound1.play(122);
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 11;
+		_actor2.postInit();
+		setAction(&_sequenceManager, this, 1892, &_actor2, NULL);
+	} else if (R2_GLOBALS._sceneManager._previousScene == 3150) {
+		R2_GLOBALS._sound1.play(116);
+	} else {
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+	}
+	
+	_item2.setDetails(Rect(43, 14, 275, 122), 1875, 9, 1, -1, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 320, 200), 1875, 3, -1, -1, 1, NULL);
+	
+	R2_GLOBALS._player._characterScene[1] = 1875;
+	R2_GLOBALS._player._characterScene[2] = 1875;
+	R2_GLOBALS._player._oldCharacterScene[1] = 1875;
+	R2_GLOBALS._player._oldCharacterScene[2] = 1875;
+}
+
+void Scene1875::signal() {
+	switch (_sceneMode) {
+	case 10:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1891;
+		_actor2.postInit();
+		setAction(&_sequenceManager, this, 1891, &_actor2, NULL);
+		break;
+	case 11:
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_sceneMode = 1892;
+		_stripManager.start(577, this);
+		break;
+	case 1890:
+		_actor2.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;
+	}
+}
+
+void Scene1875::process(Event &event) {
+	Scene::process(event);
+	
+	_actor4.process(event);
+	_actor5.process(event);
+	_actor6.process(event);
+	_actor7.process(event);
+	_actor8.process(event);
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 08d35edf06..e6ea196cee 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -634,6 +634,39 @@ public:
 	virtual void saveCharacter(int characterIndex);
 };
 
+class Scene1875 : public SceneExt {
+	class Actor1875 : public SceneActor {
+	public:
+		int _fieldA4;
+		int _fieldA6;
+		
+		Actor1875();
+		void subB84AB();
+		void subB8271(int indx);
+		
+		void synchronize(Serializer &s);
+		virtual void process(Event &event);
+	};
+public:
+	SpeakerQuinn _quinnSpeaker;
+	SpeakerSeeker _seekerSpeaker;
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	Actor1875 _actor4;
+	Actor1875 _actor5;
+	Actor1875 _actor6;
+	Actor1875 _actor7;
+	Actor1875 _actor8;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+	virtual void process(Event &event);
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 1c84ef47381fff19c45fb2f9f9a186d16b21b4ab Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 20 Jan 2012 23:39:37 +0100
Subject: TSAGE: R2R - Implement scene 1900

---
 engines/tsage/globals.cpp                        |   2 +
 engines/tsage/globals.h                          |   1 +
 engines/tsage/ringworld2/ringworld2_logic.cpp    |   1 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp  | 251 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h    |  32 +++
 engines/tsage/ringworld2/ringworld2_speakers.cpp |  30 +++
 engines/tsage/ringworld2/ringworld2_speakers.h   |   6 +
 7 files changed, 323 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index e6c167355c..e058be871b 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -407,6 +407,7 @@ void Ringworld2Globals::reset() {
 		_v566AB[i] = 0;
 	_v56A93 = -1;
 	_v56A99 = 5;
+	_v56A9C = 0;
 	_v56A9E = 0;
 	_v56AA0 = 0;
 	_v56AA1 = 0;
@@ -459,6 +460,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_v565FA);
 	s.syncAsSint16LE(_v566A6);
 	s.syncAsSint16LE(_v56A93);
+	s.syncAsSint16LE(_v56A9C);
 	s.syncAsSint16LE(_v56A9E);
 	s.syncAsSint16LE(_v56AA2);
 	s.syncAsSint16LE(_v56AA4);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index e734ef3196..285e48e611 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -269,6 +269,7 @@ public:
 	byte _v566AB[1000];
 	int _v56A93;
 	byte _v56A99;
+	int _v56A9C;
 	int _v56A9E;
 	byte _v56AA0;
 	byte _v56AA1;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 7e4cbd88ad..ad1835b386 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -137,6 +137,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1875:
 		return new Scene1875();
 	case 1900:
+		return new Scene1900();
 	case 1925:
 	case 1945:
 	case 1950:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 18d27b3c49..eb374b3d50 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -6372,5 +6372,256 @@ void Scene1875::process(Event &event) {
 	_actor8.process(event);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1900 - 
+ *
+ *--------------------------------------------------------------------------*/
+bool Scene1900::Actor2::startAction(CursorType action, Event &event) {
+	Scene1900 *scene = (Scene1900 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	if ((_frame != 1) || (R2_GLOBALS._player._characterIndex != R2_SEEKER)) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+			return SceneActor::startAction(action, event);
+		else
+			return true;
+	}
+
+	R2_GLOBALS._player.enableControl(CURSOR_USE);
+
+	if (_position.x >= 160) {
+		scene->_sceneMode = 1905;
+		scene->setAction(&scene->_sequenceManager1, scene, 1905, &R2_GLOBALS._player, &scene->_actor3, NULL);
+	} else {
+		R2_GLOBALS.setFlag(29);
+		scene->_sceneMode = 1904;
+		scene->setAction(&scene->_sequenceManager1, scene, 1904, &R2_GLOBALS._player, &scene->_actor2, NULL);
+	}
+
+	return true;
+}
+
+void Scene1900::Exit1::changeScene() {
+	Scene1900 *scene = (Scene1900 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	scene->_sceneMode = 10;
+
+	Common::Point pt(-10, 135);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene1900::Exit2::changeScene() {
+	Scene1900 *scene = (Scene1900 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	scene->_sceneMode = 11;
+
+	Common::Point pt(330, 135);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene1900::postInit(SceneObjectList *OwnerList) {
+	loadScene(1900);
+	SceneExt::postInit();
+
+	// Debug message, skipped
+
+	if (R2_GLOBALS._sceneManager._previousScene == -1) {
+		R2_GLOBALS._sceneManager._previousScene = 1925;
+		R2_GLOBALS._player._characterIndex = R2_SEEKER;
+		R2_GLOBALS._player._oldCharacterScene[2] = 1925;
+	}
+
+	if (R2_GLOBALS._sceneManager._previousScene != 1875)
+		R2_GLOBALS._sound1.play(200);
+	
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(3);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+	
+	_exit1.setDetails(Rect(0, 105, 14, 145), R2_9, 2000);
+	_exit1.setDest(Common::Point(14, 135));
+
+	_exit2.setDetails(Rect(305, 105, 320, 145), R2_10, 2000);
+	_exit2.setDest(Common::Point(315, 135));
+
+	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._sceneManager._previousScene != 1925)
+		R2_GLOBALS.clearFlag(29);
+
+	_actor2.postInit();
+	_actor2.setup(1901, 1, 1);
+	_actor2.setPosition(Common::Point(95, 109));
+	_actor2.fixPriority(100);
+
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		_actor2.setDetails(1900, 0, 1, 2, 1, (SceneItem *) NULL);
+	else
+		_actor2.setDetails(1900, 0, 1, -1, 1, (SceneItem *) NULL);
+
+	_actor3.postInit();
+	_actor3.setup(1901, 2, 1);
+	_actor3.setPosition(Common::Point(225, 109));
+	_actor3.fixPriority(100);
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
+		_actor3.setDetails(1900, 0, 1, 2, 1, (SceneItem *) NULL);
+	else
+		_actor3.setDetails(1900, 0, 1, -1, 1, (SceneItem *) NULL);
+
+	if (R2_GLOBALS._sceneManager._previousScene != 1875) {
+		_object1.postInit();
+		_object1.setup(1945, 6, 1);
+		_object1.setPosition(Common::Point(96, 109));
+		_object1.fixPriority(80);
+
+		_object2.postInit();
+		_object2.setup(1945, 6, 2);
+		_object2.setPosition(Common::Point(223, 109));
+		_object2.fixPriority(80);
+	}
+	
+	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1875) {
+		R2_GLOBALS._player._characterIndex = R2_QUINN;
+		_actor1.postInit();
+		_sceneMode = 20;
+		R2_GLOBALS._player.setAction(&_sequenceManager1, NULL, 1901, &R2_GLOBALS._player, &_actor2, NULL);
+		_actor1.setAction(&_sequenceManager2, this, 1900, &_actor1, &_actor3, NULL);
+	} else if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1925) {
+		if (R2_GLOBALS.getFlag(29)) {
+			R2_GLOBALS.clearFlag(29);
+			_actor2.hide();
+
+			R2_GLOBALS._player.setStrip(6);
+			R2_GLOBALS._player.setPosition(Common::Point(90, 106));
+			_sceneMode = 1906;
+			setAction(&_sequenceManager1, this, 1906, &R2_GLOBALS._player, &_actor2, NULL);
+		} else {
+			_actor3.hide();
+			R2_GLOBALS._player.setStrip(5);
+			R2_GLOBALS._player.setPosition(Common::Point(230, 106));
+			_sceneMode = 1907;
+			setAction(&_sequenceManager1, this, 1907, &R2_GLOBALS._player, &_actor3, NULL);
+		}
+
+		if (R2_GLOBALS._player._characterScene[1] == R2_GLOBALS._player._characterScene[2]) {
+			_actor1.postInit();
+			_actor1.setPosition(Common::Point(30, 110));
+			R2_GLOBALS._walkRegions.enableRegion(1);
+			_actor1.setup(2008, 3, 1);
+			_actor1.setDetails(9001, 0, -1, -1, 1, (SceneItem *) NULL);
+		}
+		R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1900;
+	} else if (R2_GLOBALS._player._characterScene[1] == R2_GLOBALS._player._characterScene[2]) {
+		_actor1.postInit();
+		_actor1.setPosition(Common::Point(30, 110));
+		R2_GLOBALS._walkRegions.enableRegion(1);
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			_actor1.setup(20, 3, 1);
+			_actor1.setDetails(9002, 1, -1, -1, 1, (SceneItem *) NULL);
+		} else {
+			_actor1.setup(2008, 3, 1);
+			_actor1.setDetails(9001, 0, -1, -1, 1, (SceneItem *) NULL);
+		}
+
+		if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 2000) {
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+				if (R2_GLOBALS._v56605[1] == 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._v56605[2] == 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;
+	}
+	
+	_item2.setDetails(Rect(77, 2, 240, 103), 1900, 6, -1, -1, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 320, 200), 1900, 3, -1, -1, 1, NULL);
+}
+
+void Scene1900::remove() {
+	R2_GLOBALS._sound1.fadeOut(NULL);
+	SceneExt::remove();
+}
+
+void Scene1900::signal() {
+	switch (_sceneMode) {
+	case 10:
+		R2_GLOBALS._v56605[R2_GLOBALS._player._characterIndex] = 5;
+		R2_GLOBALS._sceneManager.changeScene(2000);
+		break;
+	case 11:
+		R2_GLOBALS._v56605[R2_GLOBALS._player._characterIndex] = 6;
+		R2_GLOBALS._sceneManager.changeScene(2000);
+		break;
+	case 20:
+		++_sceneMode;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_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 22:
+		_sceneMode = 1910;
+		_actor1.setAction(&_sequenceManager2, this, 1910, &_actor1, NULL);
+		break;
+	case 1904:
+		R2_GLOBALS._v56A9C = -3;
+	// No break on purpose
+	case 1905:
+		R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+		R2_GLOBALS._sceneManager.changeScene(1925);
+		break;
+	case 1910:
+		R2_INVENTORY.setObjectScene(22, 2535);
+		R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+		R2_GLOBALS._player._oldCharacterScene[1] = 1900;
+		R2_GLOBALS._player._oldCharacterScene[2] = 1900;
+		R2_GLOBALS._sceneManager.changeScene(2450);
+		break;
+	case 1906:
+		R2_GLOBALS._v56A9C = -3;
+	// No break on purpose
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index e6ea196cee..66c3371410 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -667,6 +667,38 @@ public:
 	virtual void process(Event &event);
 };
 
+class Scene1900 : public SceneExt {
+	class Actor2 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit2 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+public:
+	SpeakerSeeker1900 _seekerSpeaker;
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	SceneActor _actor1;
+	BackgroundSceneObject _object1;
+	BackgroundSceneObject _object2;
+	Actor2 _actor2;
+	Actor2 _actor3;
+	Exit1 _exit1;
+	Exit2 _exit2;
+	SequenceManager _sequenceManager1;
+	SequenceManager _sequenceManager2;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index d86429493a..01db39de2f 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1947,6 +1947,36 @@ void SpeakerSeeker1100::proc15() {
 	}
 }
 
+void SpeakerSeeker1900::proc15() {
+	int v = _fieldF6;
+
+	if (!_object2) {
+		if (R2_GLOBALS._player._characterIndex == 2) {
+			_object2 = &R2_GLOBALS._player;
+		} else {
+			Scene1900 *scene = (Scene1900 *)R2_GLOBALS._sceneManager._scene;
+			_object2 = &scene->_actor1;
+		}
+
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+		_object1._numFrames = 7;
+
+		if (_object2->_mover) 
+			_object2->addMover(NULL);
+	}
+
+	if (v == 0) {
+		_object1.animate(ANIM_MODE_2, NULL);
+	} else if (v == 1) {
+		_object1.setup(4032, 1, 1);
+		_object1.animate(ANIM_MODE_5, this);
+	} else {
+		signal();
+	}
+}
+
 void SpeakerSeeker2435::proc15() {
 	int v = _fieldF6;
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index e795981164..a229ace16a 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -413,6 +413,12 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerSeeker1900 : public SpeakerSeeker {
+public:
+	virtual Common::String getClassName() { return "SpeakerSeeker1900"; }
+	virtual void proc15();
+};
+
 class SpeakerSeeker2435 : public SpeakerSeeker {
 public:
 	virtual Common::String getClassName() { return "SpeakerSeeker2435"; }
-- 
cgit v1.2.3


From cb1eaf4134e2ffd1a2ceead9b194e7a446cafb1c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 21 Jan 2012 14:15:51 +1100
Subject: TSAGE: Implemented R2R Scene 160 - Credits

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   3 +-
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 172 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  20 +++
 3 files changed, 194 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index ad1835b386..0309fa6860 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -53,7 +53,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Empty Bedroom #1
 		return new Scene150();
 	case 160:
-		error("Missing scene %d from group 0", sceneNumber);
+		// Credits
+		return new Scene160();
 	case 175:
 		// Empty Bedroom #2
 		return new Scene175();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 597156fd03..f153bd254c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -23,6 +23,7 @@
 #include "tsage/scenes.h"
 #include "tsage/tsage.h"
 #include "tsage/staticres.h"
+#include "tsage/ringworld2/ringworld2_dialogs.h"
 #include "tsage/ringworld2/ringworld2_scenes0.h"
 #include "tsage/ringworld2/ringworld2_speakers.h"
 
@@ -1289,6 +1290,177 @@ void Scene150::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 160 - Credits
+ *
+ *--------------------------------------------------------------------------*/
+
+void Scene160::Action1::signal() {
+	Scene160 *scene = (Scene160 *)R2_GLOBALS._sceneManager._scene;
+	bool breakFlag;
+	SynchronizedList<SceneText *>::iterator i;
+	SceneText *topItem;
+
+	switch (_actionIndex) {
+	case 0:
+		scene->_yChange = 1;
+		scene->_lineNum = 0;
+		++_actionIndex;
+		// Deliberate fall-through
+
+	case 1:
+		setDelay(5);
+		breakFlag = true;
+		do {
+			if (!scene->_lineNum || ((scene->_lineNum != -1) &&
+					((*scene->_creditsList.reverse_begin())->_position.y < 164) || !breakFlag)) {
+				breakFlag = true;
+				Common::String msg = g_resourceManager->getMessage(160, scene->_lineNum++);
+
+				if (*msg.c_str() == '^') {
+					scene->_lineNum = -1;
+				} else {
+					if (msg.size() == 0)
+						msg = " ";
+
+					SceneText *sceneText = new SceneText();
+					sceneText->_fontNumber = 50;
+
+					switch (*msg.c_str()) {
+					case '$': {
+						// Centered text
+						msg.deleteChar(0);
+						int width = R2_GLOBALS.gfxManager()._font.getStringWidth(msg.c_str());
+
+						sceneText->_textMode = ALIGN_CENTER;
+						sceneText->setPosition(Common::Point(160 - (width / 2), 175));
+						sceneText->_width = 320;
+						break;
+					}
+
+					case '%': {
+						// Text for position name
+						msg.deleteChar(0);
+						int width = R2_GLOBALS.gfxManager()._font.getStringWidth(msg.c_str());
+
+						sceneText->_textMode = ALIGN_RIGHT;
+						sceneText->setPosition(Common::Point(151 - width, 175));
+						sceneText->_width = 320;
+						breakFlag = false;
+						break;
+					}
+
+					case '@':
+						// Text for who was in the position
+						msg.deleteChar(0);
+						sceneText->_textMode = ALIGN_LEFT;
+						sceneText->_position = Common::Point(167, 175);
+						sceneText->_width = 153;
+						break;
+
+					default:
+						sceneText->_width = 151;
+						sceneText->setPosition(Common::Point(151, 175));
+						sceneText->_textMode = ALIGN_RIGHT;
+						break;
+					}
+
+					sceneText->_color1 = 191;
+					sceneText->_color2 = 191;
+					sceneText->_color3 = 191;
+					sceneText->setup(msg);
+					sceneText->_flags |= OBJFLAG_CLONED;
+					sceneText->fixPriority(5);
+
+					scene->_creditsList.push_back(sceneText);
+				}
+			}
+
+		} while (!breakFlag);
+
+		// Move all the active credits
+		for (i = scene->_creditsList.begin(); i != scene->_creditsList.end(); ++i) {
+			SceneObject *item = *i;
+			item->setPosition(Common::Point(item->_position.x, item->_position.y - scene->_yChange));
+		}
+
+		topItem = *scene->_creditsList.begin();
+		if (topItem->_position.y < 25) {
+			// Credit has reached the top, so remove it
+			topItem->remove();
+			scene->_creditsList.remove(topItem);
+
+			if (scene->_creditsList.size() == 0) {
+				// No more items left
+				setDelay(10);
+				++_actionIndex;
+			}
+		}
+		break;
+
+	case 2:
+		HelpDialog::show();
+		setDelay(4);
+		break;
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+Scene160::Scene160(): SceneExt() {
+	_frameNumber = _yChange = 0;
+	_lineNum = 0;
+}
+
+void Scene160::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(4001);
+
+	R2_GLOBALS._player._uiEnabled = false;
+	R2_GLOBALS._player.enableControl();
+	R2_GLOBALS._player._canWalk = false;
+	
+	R2_GLOBALS._uiElements.hide();
+	R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
+
+	_lineNum = 0;
+	_frameNumber = R2_GLOBALS._events.getFrameNumber();
+
+	_sound1.play(337);
+	setAction(&_action1);
+}
+
+void Scene160::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+	s.syncAsSint16LE(_frameNumber);
+	s.syncAsSint16LE(_yChange);
+	s.syncAsSint16LE(_lineNum);
+}
+
+void Scene160::remove() {
+	// Clear the credit list
+	SynchronizedList<SceneText *>::iterator i;
+	for (i = _creditsList.begin(); i != _creditsList.end(); ++i) {
+		SceneText *item = *i;
+
+		item->remove();
+	}
+	_creditsList.clear();
+
+	_sound1.fadeOut(NULL);
+	SceneExt::remove();
+}
+
+void Scene160::process(Event &event) {
+	if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_ESCAPE)) {
+		event.handled = true;
+		HelpDialog::show();
+	}
+
+	if (!event.handled)
+		SceneExt::process(event);
+}
+
 /*--------------------------------------------------------------------------
  * Scene 200 - Ship Corridor
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index ff5d5d63a4..177cdc3774 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -166,6 +166,26 @@ public:
 	virtual void signal();
 };
 
+class Scene160: public SceneExt {
+	class Action1: public Action {
+	public:
+		void signal();
+	};
+public:
+	ASound _sound1;
+	Action1 _action1;
+	int _frameNumber, _yChange;
+	SceneObject _object1, _object2, _object3;
+	int _lineNum;
+	SynchronizedList<SceneText *> _creditsList;
+public:
+	Scene160();
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void synchronize(Serializer &s);
+	virtual void remove();
+	virtual void process(Event &event);
+};
+
 class Scene175: public Scene150 {
 };
 
-- 
cgit v1.2.3


From d62e1f28cb08514e7d08c2ea1318b6d5a03296a8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 21 Jan 2012 19:52:14 +1100
Subject: TSAGE: Fix parenthesis in R2R scene 160

---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index f153bd254c..e0713fd4b9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1313,7 +1313,7 @@ void Scene160::Action1::signal() {
 		breakFlag = true;
 		do {
 			if (!scene->_lineNum || ((scene->_lineNum != -1) &&
-					((*scene->_creditsList.reverse_begin())->_position.y < 164) || !breakFlag)) {
+					(((*scene->_creditsList.reverse_begin())->_position.y < 164) || !breakFlag))) {
 				breakFlag = true;
 				Common::String msg = g_resourceManager->getMessage(160, scene->_lineNum++);
 
-- 
cgit v1.2.3


From 1758845af5e0aa09f1ab253710e2037a7dfc9e46 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 21 Jan 2012 19:31:12 +0100
Subject: KYRA: Fix out of bounds access caused by a typo.

Thanks to dhewg for pointing this one out.
---
 engines/kyra/sprites_eob.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index dd49735271..360d31458a 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -75,7 +75,7 @@ const uint8 *EoBCoreEngine::loadMonsterProperties(const uint8 *data) {
 		d->dmgDc[1].base = (int8)*data++;
 		d->dmgDc[2].times = *data++;
 		d->dmgDc[2].pips = *data++;
-		d->dmgDc[3].base = (int8)*data++;
+		d->dmgDc[2].base = (int8)*data++;
 		d->immunityFlags = READ_LE_UINT16(data);
 		data += 2;
 		d->capsFlags = READ_LE_UINT16(data);
-- 
cgit v1.2.3


From 4e118ccf98e3cc442636da3dddaf965e587ccf15 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 22 Jan 2012 13:16:09 +1100
Subject: TSAGE: Implemented R2R Scene 500

---
 engines/tsage/events.h                          |   7 +-
 engines/tsage/globals.cpp                       |   2 +
 engines/tsage/globals.h                         |   1 +
 engines/tsage/ringworld2/ringworld2_logic.cpp   |  58 ++-
 engines/tsage/ringworld2/ringworld2_logic.h     |  14 +
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 519 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  79 ++++
 engines/tsage/ringworld2/ringworld2_scenes1.cpp |   2 +-
 engines/tsage/ringworld2/ringworld2_scenes2.cpp |   6 +-
 engines/tsage/ringworld2/ringworld2_scenes3.cpp |   4 +-
 10 files changed, 679 insertions(+), 13 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index dcff1b45b8..6f54163682 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -88,9 +88,10 @@ enum CursorType {
 	// Ringworld 2 objects
 	R2_OPTO_DISK = 1, R2_READER = 2, R2_NEGATOR_GUN = 3, R2_STEPPING_DISKS = 4, 
 	R2_ATTRACTOR_UNIT = 5, R2_SENSOR_PROBE = 6, 
-	R2_7 = 7, R2_8 = 8, R2_9 = 9, R2_10 = 10, R2_11 = 11, R2_12 = 12, R2_13 = 13, R2_OPTICAL_FIBRE = 14,
-	R2_CLAMP = 15, R2_16 = 16, R2_17 = 17, R2_18 = 18, R2_19 = 19, R2_20 = 20, R2_21 = 21,
-	R2_22 = 22, R2_23 = 23, R2_24 = 24, R2_25 = 25, R2_26 = 26, R2_27 = 27, R2_28 = 28,
+	R2_SONIC_STUNNER = 7, R2_8 = 8, R2_9 = 9, R2_10 = 10, R2_11 = 11, R2_AEROSOL = 12, R2_13 = 13, 
+	R2_OPTICAL_FIBRE = 14, R2_CLAMP = 15, R2_16 = 16, R2_17 = 17, R2_18 = 18, R2_19 = 19, 
+	R2_REBREATHER_TANK = 20, R2_21 = 21, R2_22 = 22, R2_23 = 23, R2_24 = 24, R2_25 = 25, 
+	R2_26 = 26, R2_27 = 27, R2_28 = 28,
 	R2_29 = 29, R2_30 = 30, R2_31 = 31, R2_32 = 32, R2_33 = 33, R2_34 = 34, R2_35 = 35,
 	R2_36 = 36, R2_37 = 37, R2_38 = 38, R2_39 = 39, R2_40 = 40, R2_41 = 41, R2_42 = 42,
 	R2_43 = 43, R2_44 = 44, R2_45 = 45, R2_46 = 46, R2_47 = 47, R2_48 = 48, R2_49 = 49,
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index e058be871b..f0f02d4acb 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -400,6 +400,7 @@ void Ringworld2Globals::reset() {
 	_v56605[13] = 31;
 
 	_v566A6 = 3800;
+	_v566A3 = 2;
 	_v566A8 = 5;
 	_v566A9 = 0;
 	_v566AA = 0;
@@ -458,6 +459,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_v565F5);
 	s.syncAsSint16LE(_v565F6);
 	s.syncAsSint16LE(_v565FA);
+	s.syncAsSint16LE(_v566A3);
 	s.syncAsSint16LE(_v566A6);
 	s.syncAsSint16LE(_v56A93);
 	s.syncAsSint16LE(_v56A9C);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 285e48e611..b9babde131 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -263,6 +263,7 @@ public:
 	byte _v565AE;
 	byte _v56605[14];
 	int _v566A6;
+	byte _v566A3;
 	byte _v566A8;
 	byte _v566A9;
 	byte _v566AA;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 0309fa6860..d81672807a 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -78,6 +78,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Science Lab
 		return new Scene400();
 	case 500:
+		// Lander Bay 2 Storage
+		return new Scene500();
 	case 525:
 	case 600:
 	case 700:
@@ -382,7 +384,7 @@ bool SceneExt::display(CursorType action, Event &event) {
 		else
 			SceneItem::display2(5, 0);
 		break;
-	case R2_7:
+	case R2_SONIC_STUNNER:
 		if ((R2_GLOBALS._v565F1[1] == 2) || ((R2_GLOBALS._v565F1[1] == 1) &&
 				(R2_GLOBALS._v565F1[2] == 2) && (R2_GLOBALS._sceneManager._previousScene == 300))) {
 			R2_GLOBALS._sound4.stop();
@@ -744,12 +746,12 @@ void Ringworld2InvObjectList::reset() {
 	setObjectScene(R2_STEPPING_DISKS, 100);
 	setObjectScene(R2_ATTRACTOR_UNIT, 400);
 	setObjectScene(R2_SENSOR_PROBE, 400);
-	setObjectScene(R2_7, 500);
+	setObjectScene(R2_SONIC_STUNNER, 500);
 	setObjectScene(R2_8, 700);
 	setObjectScene(R2_9, 800);
 	setObjectScene(R2_10, 100);
 	setObjectScene(R2_11, 400);
-	setObjectScene(R2_12, 500);
+	setObjectScene(R2_AEROSOL, 500);
 	setObjectScene(R2_13, 1550);
 	setObjectScene(R2_OPTICAL_FIBRE, 850);
 	setObjectScene(R2_CLAMP, 850);
@@ -757,7 +759,7 @@ void Ringworld2InvObjectList::reset() {
 	setObjectScene(R2_17, 1550);
 	setObjectScene(R2_18, 1550);
 	setObjectScene(R2_19, 1550);
-	setObjectScene(R2_20, 500);
+	setObjectScene(R2_REBREATHER_TANK, 500);
 	setObjectScene(R2_21, 500);
 	setObjectScene(R2_22, 1550);
 	setObjectScene(R2_23, 1580);
@@ -1104,6 +1106,54 @@ void SceneExit::process(Event &event) {
 	}
 }
 
+/*--------------------------------------------------------------------------*/
+
+void SceneAreaObject::remove() {
+	_object1.remove();
+	SceneArea::remove();
+	--R2_GLOBALS._insetUp;
+}
+
+void SceneAreaObject::process(Event &event) {
+	if (_insetCount == R2_GLOBALS._insetUp) {
+		CursorType cursor = R2_GLOBALS._events.getCursor();
+
+		if (_bounds.contains(event.mousePos)) {
+			// Cursor moving in bounded area
+			if (cursor == _cursorNum) {
+				R2_GLOBALS._events.setCursor(_savedCursorNum);
+			}
+		} else if (event.mousePos.y < 168) {
+			if (_cursorNum != cursor)
+				// Cursor moved outside bounded area
+				R2_GLOBALS._events.setCursor(_savedCursorNum);
+
+			if (event.eventType == EVENT_BUTTON_DOWN) {
+				R2_GLOBALS._events.setCursor(_savedCursorNum);
+				event.handled = true;
+			}
+		}
+	}
+}
+
+void SceneAreaObject::setDetails(int visage, int strip, int frameNumber, const Common::Point &pt) {
+	_object1.postInit();
+	_object1.setup(visage, strip, frameNumber);
+	_object1.setPosition(pt);
+	_object1.fixPriority(250);
+
+	_cursorNum = CURSOR_INVALID;
+	Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
+	scene->_sceneAreas.push_front(this);
+	
+	_insetCount = ++R2_GLOBALS._insetUp;
+}
+
+void SceneAreaObject::setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
+	((SceneHotspot *)(this))->setDetails(resNum, lookLineNum, talkLineNum, useLineNum, 
+		2, (SceneItem *)NULL);
+}
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 9b64063803..14ab1d0081 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -273,6 +273,20 @@ public:
 	}
 };
 
+class SceneAreaObject: public SceneArea {
+	class Object1: public SceneActor {
+	public:
+	};
+public:
+	Object1 _object1;
+	int _insetCount;
+
+	virtual void remove();
+	virtual void process(Event &event);
+	void setDetails(int visage, int strip, int frameNumber, const Common::Point &pt);
+	void setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
+};
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index e0713fd4b9..784968b5cb 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -3921,6 +3921,525 @@ void Scene400::dispatch() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 500 - Lander Bay 2 Storage
+ *
+ *--------------------------------------------------------------------------*/
+
+bool Scene500::ControlPanel::startAction(CursorType action, Event &event) {
+	Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action == CURSOR_USE) && (R2_GLOBALS._player._characterIndex == R2_QUINN)) {
+		R2_GLOBALS._player.disableControl();
+		
+		if (R2_GLOBALS.getFlag(26)) {
+			scene->_stripNumber = 1104;
+			scene->_sceneMode = 524;
+			scene->setAction(&scene->_sequenceManager1, scene, 524, &R2_GLOBALS._player, NULL);
+		} else {
+			scene->_sceneMode = 510;
+			scene->setAction(&scene->_sequenceManager1, scene, 510, &R2_GLOBALS._player, NULL);
+		}
+		return true;
+	} else {
+		return SceneHotspot::startAction(action, event);
+	}
+}
+	
+/*--------------------------------------------------------------------------*/
+
+bool Scene500::Object2::startAction(CursorType action, Event &event) {
+	Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action == CURSOR_TALK) {
+		R2_GLOBALS._player.disableControl();
+		if (R2_GLOBALS._player._characterIndex == 1) {
+			scene->_stripNumber = R2_GLOBALS.getFlag(26) ? 1101 : 1103;
+		} else {
+			scene->_stripNumber = R2_GLOBALS.getFlag(26) ? 1102 : 1105;
+		}
+
+		scene->setAction(&scene->_sequenceManager1, scene, 524, &R2_GLOBALS._player, NULL);
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene500::Object3::startAction(CursorType action, Event &event) {
+	Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_LOOK:
+		SceneItem::display2(500, R2_GLOBALS.getFlag(28) ? 28 : _strip + 25);
+		return true;
+
+	case CURSOR_USE:
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			if ((_strip != 3) && (_strip != 7))
+				SceneItem::display2(500, _strip);
+			else if (R2_GLOBALS.getFlag(26)) {
+				R2_GLOBALS._player.disableControl();
+				scene->_stripNumber = 1103;
+				scene->_sceneMode = 524;
+				scene->setAction(&scene->_sequenceManager1, scene, 524, &R2_GLOBALS._player, NULL);
+			} else if (!R2_GLOBALS.getFlag(28))
+				SceneItem::display2(500, 41);
+			else if (!R2_GLOBALS.getFlag(40))
+				SceneItem::display2(500, 40);
+			else {
+				R2_GLOBALS._player.disableControl();
+				scene->_sceneMode = 512;
+				scene->setAction(&scene->_sequenceManager1, scene, 524, &R2_GLOBALS._player, &scene->_object3, NULL);
+				R2_GLOBALS.setFlag(26);
+			}
+		} else {
+			SceneItem::display2(500, 42);
+		}
+		return true;
+
+	case R2_REBREATHER_TANK:
+		if (!R2_GLOBALS.getFlag(25))
+			SceneItem::display2(500, 10);
+		else if (_strip != 3)
+			SceneItem::display2(500, _strip + 25);
+		else {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 515;
+			scene->setAction(&scene->_sequenceManager1, scene, 515, &R2_GLOBALS._player, &scene->_object3, NULL);
+			R2_GLOBALS.setFlag(28);
+		}
+		return true;
+
+	case R2_21:
+		SceneItem::display2(500, 53);
+		return true;
+
+	default:
+		if (action < R2_LAST_INVENT) {
+			SceneItem::display2(500, action);
+			return true;
+		} else {
+			return SceneActor::startAction(action, event);
+		}
+	}
+}
+
+bool Scene500::Doorway::startAction(CursorType action, Event &event) {
+	Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action == CURSOR_USE) && (R2_GLOBALS._player._characterIndex == R2_QUINN)) {
+		R2_GLOBALS._player.disableControl();
+
+		if (R2_GLOBALS.getFlag(26)) {
+			scene->_stripNumber = 1104;
+			scene->_sceneMode = 524;
+			scene->setAction(&scene->_sequenceManager1, scene, 524, &R2_GLOBALS._player, NULL);
+		} else {
+			scene->_sceneMode = 500;
+			scene->setAction(&scene->_sequenceManager1, scene, 500, &R2_GLOBALS._player, NULL); 
+		}
+
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene500::OxygenTanks::startAction(CursorType action, Event &event) {
+	Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_LOOK:
+		SceneItem::display2(500, R2_INVENTORY.getObjectScene(R2_REBREATHER_TANK) ? 50 : 49);
+		return true;
+
+	case CURSOR_USE:
+		if (R2_GLOBALS._player._characterIndex != R2_QUINN) {
+			SceneItem::display2(500, 52);
+			return true;
+		} else if ((R2_INVENTORY.getObjectScene(R2_REBREATHER_TANK) != 1) && 
+				(R2_GLOBALS._player._characterIndex != R2_SEEKER) && !R2_GLOBALS.getFlag(28)) {
+			R2_GLOBALS._player.disableControl();
+			
+			if (_position.y == 120) {
+				scene->_sceneMode = 513;
+				scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, 
+					&scene->_tanks1, NULL);
+			} else {
+				scene->_sceneMode = 514;
+				scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, 
+					&scene->_tanks2, NULL);
+			}
+			return true;
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	return SceneActor::startAction(action, event);
+}
+
+bool Scene500::AirLock::startAction(CursorType action, Event &event) {
+	Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action == CURSOR_USE) && R2_GLOBALS.getFlag(26)) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = (R2_GLOBALS._player._characterIndex == R2_QUINN) ? 521 : 522;
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, 
+			&scene->_object2, &scene->_airLock, NULL);
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene500::Aerosol::startAction(CursorType action, Event &event) {
+	Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action == CURSOR_USE) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 503;
+		scene->setAction(&scene->_sequenceManager1, scene, 503, &R2_GLOBALS._player, this, NULL);
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene500::SonicStunner::startAction(CursorType action, Event &event) {
+	Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action == CURSOR_USE) && (R2_GLOBALS._player._characterIndex == R2_QUINN)) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = R2_GLOBALS.getFlag(26) ? 520 : 502;
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene500::Locker1::startAction(CursorType action, Event &event) {
+	Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action == CURSOR_USE) && (R2_GLOBALS._player._characterIndex == R2_QUINN)) {
+		R2_GLOBALS._player.disableControl();
+
+		if (R2_GLOBALS.getFlag(11))
+			scene->_sceneMode = R2_GLOBALS.getFlag(26) ? 517 : 505;
+		else
+			scene->_sceneMode = R2_GLOBALS.getFlag(26) ? 516 : 504;
+
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, this, NULL);
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene500::Locker2::startAction(CursorType action, Event &event) {
+	Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action == CURSOR_USE) && (R2_GLOBALS._player._characterIndex == R2_QUINN)) {
+		R2_GLOBALS._player.disableControl();
+
+		if (R2_GLOBALS.getFlag(12))
+			scene->_sceneMode = R2_GLOBALS.getFlag(26) ? 519 : 507;
+		else
+			scene->_sceneMode = R2_GLOBALS.getFlag(26) ? 518 : 506;
+
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, this, NULL);
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene500::Object::startAction(CursorType action, Event &event) {
+	if (action == CURSOR_USE) {
+		return false;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+void Scene500::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(500);
+
+	Common::fill(&_buffer[0], &_buffer[2710], 0);
+	_stripManager.setColors(60, 255);
+	_stripManager.setFontNumber(50);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+	_stripManager.addSpeaker(&_quinnSpeaker);
+
+	if (R2_GLOBALS.getFlag(25)) {
+		R2_GLOBALS._player._characterScene[R2_SEEKER] = 500;
+
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			R2_GLOBALS._walkRegions.disableRegion(1);
+
+			_object2.postInit();
+			_object2._effect = 1;
+			_object2.setup(1505, 1, 1);
+			_object2._moveDiff.x = 5;
+			_object2.setPosition(Common::Point(42, 151));
+			_object2.setDetails(500, 34, 35, 36, 1, (SceneItem *)NULL);
+		} else if (R2_GLOBALS._player._characterScene[R2_QUINN] == 500) {
+			_object2.postInit();
+			_object2._effect = 1;
+			_object2.setup(R2_GLOBALS.getFlag(26) ? 1500 : 10, 1, 1);
+			_object2.setPosition(Common::Point(42, 151));
+
+			R2_GLOBALS._walkRegions.disableRegion(1);
+			R2_GLOBALS._walkRegions.disableRegion(2);
+			R2_GLOBALS._walkRegions.disableRegion(3);
+
+			_object2.setDetails(500, 37, 38, -1, 1, (SceneItem *)NULL);
+		}
+	}
+
+	if ((R2_INVENTORY.getObjectScene(R2_REBREATHER_TANK) != 500) && R2_GLOBALS.getFlag(27)) {
+		_tanks1.postInit();
+		_tanks1.setup(502, 7, 1);
+		_tanks1.setPosition(Common::Point(281, 120));
+		_tanks1.setDetails(500, -1, -1, -1, 1, (SceneItem *)NULL);
+	} else {
+		if (R2_INVENTORY.getObjectScene(R2_REBREATHER_TANK) == 500) {
+			_tanks1.postInit();
+			_tanks1.setup(502, 7, 1);
+			_tanks1.setPosition(Common::Point(281, 120));
+			_tanks1.setDetails(500, -1, -1, -1, 1, (SceneItem *)NULL);
+		}
+
+		_tanks2.postInit();
+		_tanks2.setup(502, 7, 1);
+		_tanks2.setPosition(Common::Point(286, 121));
+		_tanks2.setDetails(500, -1, -1, -1, 1, (SceneItem *)NULL);
+	}
+
+	_doorway.postInit();
+	_doorway.setup(501, 1, 1);
+	_doorway.setPosition(Common::Point(132, 85));
+	_doorway.setDetails(500, 15, -1, 17, 1, (SceneItem *)NULL);
+
+	_airLock.postInit();
+	_airLock.setup(501, 2, 1);
+	_airLock.setPosition(Common::Point(41, 121));
+
+	if (!R2_GLOBALS.getFlag(25))
+		_airLock.setDetails(500, 6, -1, 10, 1, (SceneItem *)NULL);
+	else if ((R2_GLOBALS._player._characterScene[R2_QUINN] != 500) ||
+			(R2_GLOBALS._player._characterScene[R2_SEEKER] != 500))
+		_airLock.setDetails(500, 6, -1, 40, 1, (SceneItem *)NULL);
+	else
+		_airLock.setDetails(500, 6, -1, 9, 1, (SceneItem *)NULL);
+
+	_locker1.postInit();
+	_locker1.setup(500, 3, R2_GLOBALS.getFlag(11) ? 6 : 1);
+	_locker1.setPosition(Common::Point(220, 82));
+	_locker1.setDetails(500, 27, -1, -1, 1, (SceneItem *)NULL);
+
+	_locker2.postInit();
+	_locker2.setup(500, 4, R2_GLOBALS.getFlag(12) ? 6 : 1);
+	_locker2.setPosition(Common::Point(291, 98));
+	_locker2.fixPriority(121);
+	_locker2.setDetails(500, 27, -1, -1, 1, (SceneItem *)NULL);
+
+	if (R2_INVENTORY.getObjectScene(R2_AEROSOL) == 500) {
+		_aerosol.postInit();
+		_aerosol.setup(500, 5, 2);
+		_aerosol.setPosition(Common::Point(286, 91));
+		_aerosol.fixPriority(120);
+		_aerosol.setDetails(500, 24, 25, 26, 1, (SceneItem *)NULL);
+	}
+
+	if (R2_INVENTORY.getObjectScene(R2_SONIC_STUNNER) == 500) {
+		_sonicStunner.postInit();
+		_sonicStunner.setup(500, 5, 1);
+		_sonicStunner.setPosition(Common::Point(214, 76));
+		_sonicStunner.setDetails(500, 21, 22, 23, 1, (SceneItem *)NULL);
+	}
+
+	_object1.postInit();
+	_object1._effect = 1;
+	_object1.setup(502, 1, 1);
+	_object1.setPosition(Common::Point(258, 99));
+	_object1.fixPriority(50);
+	
+	_object8.postInit();
+	_object8.setPosition(Common::Point(250, 111));
+
+	if (!R2_GLOBALS.getFlag(35)) {
+		_object8.setup(501, 3, 1);
+	} else {
+		_object8.setup(500, 8, 7);
+
+		_object3.postInit();
+		_object3._effect = 1;
+		_object3.setPosition(Common::Point(247, 52));
+		_object3.setDetails(500, -1, -1, -1, 2, (SceneItem *)NULL);
+
+		if (!R2_GLOBALS.getFlag(26)) {
+			if (R2_GLOBALS.getFlag(28))
+				_object3.setup(502, 7, 2);
+			else
+				_object3.setup(502, R2_GLOBALS._v566A3 + 2, 7);
+		}
+	}
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setVisage(10);
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
+		R2_GLOBALS._player._moveDiff.x = 5;
+
+	_controlPanel.setDetails(Rect(175, 62, 191, 80), 500, 31, 32, 33, 1, (SceneItem *)NULL);
+	_item2.setDetails(Rect(13, 58, 70, 118), 500, 12, -1, -1, 1, (SceneItem *)NULL);
+	_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 500, 0, -1, -1, 1, (SceneItem *)NULL);
+
+	if ((R2_GLOBALS._player._characterIndex == R2_QUINN) && (R2_GLOBALS._sceneManager._previousScene == 700)) {
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 501;
+		setAction(&_sequenceManager1, this, 501, &R2_GLOBALS._player, &_doorway, NULL);
+	} else {
+		if (R2_GLOBALS._player._characterIndex != R2_QUINN) {
+			R2_GLOBALS._player.setup(1505, 6, 1);
+		} else {
+			R2_GLOBALS._player.setup(R2_GLOBALS.getFlag(26) ? 1500 : 10, 6, 1);
+		}
+
+		R2_GLOBALS._player.setPosition(Common::Point(123, 135));
+		R2_GLOBALS._player.enableControl();
+	}
+}
+
+void Scene500::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+	s.syncAsSint16LE(_stripNumber);
+}
+
+void Scene500::signal() {
+	switch (_sceneMode) {
+	case 3:
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 5:
+		_sceneMode = 12;
+		_sound1.play(127);
+		_object1.animate(ANIM_MODE_6, this);
+
+		R2_GLOBALS.clearFlag(35);
+		_object3.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 6:
+		_sceneMode = 11;
+		_sound1.play(127);
+		_object1.animate(ANIM_MODE_5, this);
+
+		R2_GLOBALS.clearFlag(35);
+		_object3.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 7:
+		_sound1.play(126);
+		_object8.animate(ANIM_MODE_6, this);
+
+		R2_GLOBALS.clearFlag(35);
+		_object3.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 500:
+		R2_GLOBALS._sceneManager.changeScene(700);
+		break;
+	case 501:
+		if (R2_GLOBALS._player._characterScene[R2_QUINN] == 500) {
+			_stripNumber = 1100;
+			_sceneMode = 523;
+			setAction(&_sequenceManager1, this, 523, &R2_GLOBALS._player, NULL);
+		} else {
+			R2_GLOBALS._player.enableControl();
+		}
+		break;
+	case 502:
+	case 520:
+		R2_INVENTORY.setObjectScene(R2_SONIC_STUNNER, 1);
+		_sonicStunner.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 503:
+		R2_INVENTORY.setObjectScene(R2_AEROSOL, 1);
+		_aerosol.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 504:
+	case 516:
+		R2_GLOBALS.setFlag(11);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 505:
+	case 517:
+		R2_GLOBALS.clearFlag(11);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 506:
+	case 518:
+		R2_GLOBALS.setFlag(11);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 507:
+	case 519:
+		R2_GLOBALS.clearFlag(12);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 509:
+		R2_GLOBALS.clearFlag(35);
+		_object3.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 510:
+		R2_GLOBALS._player.enableControl();
+		_area1.setDetails(500, 6, 1, Common::Point(160, 120));
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 513:
+		R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 1);
+		_tanks1.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 514:
+		R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 1);
+		R2_GLOBALS.setFlag(27);
+		_tanks2.remove();
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 515:
+		R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 0);
+		R2_GLOBALS.setFlag(28);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 521:
+	case 522:
+		R2_GLOBALS._sceneManager.changeScene(525);
+		break;
+	case 523:
+	case 524:
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
+		_sceneMode = 8;
+		_stripManager.start(_stripNumber, this);
+		break;
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 /*--------------------------------------------------------------------------
  * Scene 800 - Sick Bay
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 177cdc3774..c7b0ecfc83 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -442,6 +442,85 @@ public:
 	virtual void dispatch();
 };
 
+class Scene500: public SceneExt {
+	/* Items */
+	class ControlPanel: public SceneHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	
+	/* Objects */
+	class Object2: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Object3: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Doorway: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class OxygenTanks: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class AirLock: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Object8: public SceneActor {
+		// This classes uses a custom draw method
+	};
+	class Aerosol: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class SonicStunner: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Locker1: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Locker2: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Object: public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+	int _stripNumber;
+	byte _buffer[2710];
+	SpeakerSeeker _seekerSpeaker;
+	SpeakerQuinn _quinnSpeaker;
+	SceneHotspot _background, _item2;
+	ControlPanel _controlPanel;
+	SceneActor _object1;
+	Object2 _object2;
+	Object3 _object3;
+	Doorway _doorway;
+	OxygenTanks _tanks1, _tanks2;
+	AirLock _airLock;
+	Object8 _object8;
+	Aerosol _aerosol;
+	SonicStunner _sonicStunner;
+	Locker1 _locker1;
+	Locker2 _locker2;
+	SceneAreaObject _area1;
+	Object _obj1, _obj2, _obj3;
+	ASoundExt _sound1;
+	SequenceManager _sequenceManager1, _sequenceManager2;
+public:
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void synchronize(Serializer &s);
+	virtual void signal();
+};
+
 class Scene800: public SceneExt {
 	/* Items */
 	class Button: public NamedHotspot {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index eb374b3d50..18ca3b060d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -277,7 +277,7 @@ bool Scene1100::Actor17::startAction(CursorType action, Event &event) {
 			return SceneActor::startAction(action, event);
 		}
 		break;
-	case R2_7:
+	case R2_SONIC_STUNNER:
 	// No break on purpose
 	case R2_44:
 		if (_visage == 1105) {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index ef2d0526ae..a1409067dc 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -1035,7 +1035,7 @@ bool Scene2350::Actor2::startAction(CursorType action, Event &event) {
 bool Scene2350::Actor3::startAction(CursorType action, Event &event) {
 	Scene2350 *scene = (Scene2350 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((action == R2_20) && (R2_GLOBALS.getFlag(74))) {
+	if ((action == R2_REBREATHER_TANK) && (R2_GLOBALS.getFlag(74))) {
 		R2_GLOBALS._player.disableControl();
 		scene->_actor1.postInit();
 		scene->_sceneMode = 2355;
@@ -2488,7 +2488,7 @@ void Scene2500::signal() {
 bool Scene2525::Item5::startAction(CursorType action, Event &event) {
 	Scene2525 *scene = (Scene2525 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((action == R2_20) && (!R2_GLOBALS.getFlag(74))) {
+	if ((action == R2_REBREATHER_TANK) && (!R2_GLOBALS.getFlag(74))) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 2526;
 		scene->setAction(&scene->_sequenceManager, scene, 2526, &R2_GLOBALS._player, NULL);
@@ -4177,7 +4177,7 @@ bool Scene2800::Actor1::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 2803;
 		scene->_stripManager.start(scene->_field412, scene);
 		return true;
-	} else if (action == R2_7) {
+	} else if (action == R2_SONIC_STUNNER) {
 		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS.setFlag(47);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 266098a2ca..c6c1b0610c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -3029,10 +3029,10 @@ bool Scene3600::Actor13::startAction(CursorType action, Event &event) {
 		scene->_stripManager.start(3327, scene);
 
 		return true;
-	case R2_7:
+	case R2_SONIC_STUNNER:
 	// No break on purpose
 	case R2_44:
-		if (action == R2_7)
+		if (action == R2_SONIC_STUNNER)
 			R2_GLOBALS._sound3.play(43);
 		else
 			R2_GLOBALS._sound3.play(99);
-- 
cgit v1.2.3


From 888c341c7a5738ef8cfd838ab711d864f4ebd0c3 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 22 Jan 2012 11:50:15 +0100
Subject: TSAGE: R2R - Implement scene 1925

---
 engines/tsage/globals.cpp                       |   4 +-
 engines/tsage/globals.h                         |   2 +-
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   1 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 324 +++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  49 ++++
 5 files changed, 375 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index f0f02d4acb..1c2b83c81b 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -408,7 +408,7 @@ void Ringworld2Globals::reset() {
 		_v566AB[i] = 0;
 	_v56A93 = -1;
 	_v56A99 = 5;
-	_v56A9C = 0;
+	_scene1925CurrLevel = 0; //_v56A9C
 	_v56A9E = 0;
 	_v56AA0 = 0;
 	_v56AA1 = 0;
@@ -462,7 +462,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_v566A3);
 	s.syncAsSint16LE(_v566A6);
 	s.syncAsSint16LE(_v56A93);
-	s.syncAsSint16LE(_v56A9C);
+	s.syncAsSint16LE(_scene1925CurrLevel); // _v56A9C
 	s.syncAsSint16LE(_v56A9E);
 	s.syncAsSint16LE(_v56AA2);
 	s.syncAsSint16LE(_v56AA4);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index b9babde131..c4ab3e695c 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -270,7 +270,7 @@ public:
 	byte _v566AB[1000];
 	int _v56A93;
 	byte _v56A99;
-	int _v56A9C;
+	int _scene1925CurrLevel; //_v56A9C
 	int _v56A9E;
 	byte _v56AA0;
 	byte _v56AA1;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index d81672807a..21fd638870 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -142,6 +142,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1900:
 		return new Scene1900();
 	case 1925:
+		return new Scene1925();
 	case 1945:
 	case 1950:
 		error("Missing scene %d from group 1", sceneNumber);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 18ca3b060d..58f5a31f17 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -6601,7 +6601,7 @@ void Scene1900::signal() {
 		_actor1.setAction(&_sequenceManager2, this, 1910, &_actor1, NULL);
 		break;
 	case 1904:
-		R2_GLOBALS._v56A9C = -3;
+		R2_GLOBALS._scene1925CurrLevel = -3;
 	// No break on purpose
 	case 1905:
 		R2_GLOBALS._player.disableControl(CURSOR_ARROW);
@@ -6615,7 +6615,7 @@ void Scene1900::signal() {
 		R2_GLOBALS._sceneManager.changeScene(2450);
 		break;
 	case 1906:
-		R2_GLOBALS._v56A9C = -3;
+		R2_GLOBALS._scene1925CurrLevel = -3;
 	// No break on purpose
 	default:
 		R2_GLOBALS._player.enableControl();
@@ -6623,5 +6623,325 @@ void Scene1900::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1925 -
+ *
+ *--------------------------------------------------------------------------*/
+Scene1925::Scene1925() {
+	_field9B8 = 0;
+	for (int i = 0; i < 5; i++)
+		_levelResNum[i] = 0;
+}
+
+void Scene1925::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field9B8);
+	for (int i = 0; i < 5; i++)
+		s.syncAsSint16LE(_levelResNum[i]);
+}
+
+bool Scene1925::Hotspot2::startAction(CursorType action, Event &event) {
+	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+
+	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);
+
+	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_ARROW);
+	scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor1, NULL);
+	return true;
+}
+
+bool Scene1925::Hotspot3::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->_exit3._enabled = false;
+		scene->_sceneMode = 1925;
+		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor1, 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;
+	}
+
+	if (scene->_sceneMode != 0)
+		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+
+	return true;
+}
+
+void Scene1925::Exit1::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->_exit3._enabled = false;
+		scene->_field9B8 = 1927;
+		scene->_sceneMode = 1925;
+		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor1, 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 = 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::Exit2::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->_exit3._enabled = false;
+		scene->_field9B8 = 1926;
+		scene->_sceneMode = 1925;
+		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor1, 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::Exit3::changeScene() {
+	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+
+	_moving = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	scene->_sceneMode = 1921;
+	scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+}
+
+void Scene1925::Exit4::changeScene() {
+	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
+
+	_moving = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	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:
+		loadScene(_levelResNum[4]);
+		_item2.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 2, NULL);
+		_actor1.setDetails(1925, 0, 1, 2, 2, (SceneItem *) NULL);
+		_actor1.show();
+		break;
+	case 512:
+		R2_GLOBALS._scene1925CurrLevel = 508;
+	// No break on purpose
+	default:
+		loadScene(_levelResNum[(R2_GLOBALS._scene1925CurrLevel % 4)]);
+		R2_GLOBALS._sceneItems.remove(&_item2);
+		R2_GLOBALS._sceneItems.remove(&_actor1);
+		_actor1.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[2] = 1925;
+	R2_GLOBALS._player._characterIndex = R2_SEEKER;
+	switch (R2_GLOBALS._scene1925CurrLevel) {
+	case -2:
+		_exit4.setDetails(Rect(203, 44, 247, 111), EXITCURSOR_E, 1925);
+		_item3.setDetails(Rect(31, 3, 45, 167), 1925, 6, -1, 8, 1, NULL);
+		break;
+	case 3:
+		_actor1.setDetails(1925, 0, 1, 2, 1, (SceneItem *) NULL);
+		_item2.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 1, NULL);
+	// No break on purpose
+	case -3: 
+		_exit3.setDetails(Rect(83, 38, 128, 101), EXITCURSOR_W, 1925);
+	// No break on purpose
+	default:
+		_exit1.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1925);
+		_exit2.setDetails(Rect(128, 160, 190, 167), EXITCURSOR_S, 1925);
+		_item3.setDetails(Rect(141, 11, 167, 159),	1925, 6, -1, -1, 1, NULL);
+		break;
+	}
+
+	_actor1.postInit();
+	_actor1.setup(1925, 5, 1);
+	_actor1.setPosition(Common::Point(128, 35));
+	_actor1.hide();
+
+	if (R2_GLOBALS._scene1925CurrLevel == 3)
+		_actor1.show();
+
+	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:
+		_actor1.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;
+	}
+
+	R2_GLOBALS._player._canWalk = false;
+	_field9B8 = 0;
+	R2_GLOBALS._sceneManager._previousScene = 1925;
+	_item1.setDetails(Rect(27, 0, 292, 200), 1925, 9, -1, -1, 1, NULL);
+}
+
+void Scene1925::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	R2_GLOBALS._player._oldCharacterScene[2] = 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 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:
+		_exit3._enabled = false;
+		if (_field9B8 != 0) {
+			_sceneMode = _field9B8;
+			_field9B8 = 0;
+			setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
+		}
+	// No break on purpose
+	default:
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		break;
+	}
+
+	R2_GLOBALS._player._canWalk = false;
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 66c3371410..df6789efbd 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -699,6 +699,55 @@ public:
 	virtual void remove();
 	virtual void signal();
 };
+
+class Scene1925 : public SceneExt {
+	class Hotspot2 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Hotspot3 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit2 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit3 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit4 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+public:
+	NamedHotspot _item1;
+	Hotspot2 _item2;
+	Hotspot3 _item3;
+	SceneActor _actor1;
+	Exit1 _exit1;
+	Exit2 _exit2;
+	Exit3 _exit3;
+	Exit4 _exit4;
+	SequenceManager _sequenceManager;
+
+	int _field9B8;
+	int _levelResNum[5];
+
+	Scene1925();
+	void synchronize(Serializer &s);
+
+	void changeLevel(bool upFlag);
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From e4d6d4780bc033a4dfad0ff13937d287c4fd0de3 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 23 Jan 2012 00:58:42 +0100
Subject: TSAGE: R2R - Implement scene 1945

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   1 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 312 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  48 ++++
 3 files changed, 361 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 21fd638870..983b2b3c7d 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -144,6 +144,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1925:
 		return new Scene1925();
 	case 1945:
+		return new Scene1945();
 	case 1950:
 		error("Missing scene %d from group 1", sceneNumber);
 	/* Scene group #2 */
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 58f5a31f17..d957599159 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -6943,5 +6943,317 @@ void Scene1925::signal() {
 	R2_GLOBALS._player._canWalk = false;
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1945 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene1945::Scene1945() {
+	_fieldEAA = 0;
+	_fieldEAC = 0;
+	_fieldEAE = CURSOR_NONE;
+}
+
+void Scene1945::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_fieldEAA);
+	s.syncAsSint16LE(_fieldEAC);
+	s.syncAsSint16LE(_fieldEAE);
+}
+
+bool Scene1945::Hotspot3::startAction(CursorType action, Event &event) {
+	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case R2_37:
+		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->_fieldEAA = 1942;
+		}
+		// At this point the original check if _sceneMode != 0. Skipped.
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, 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;
+		} else {
+			R2_GLOBALS._player.enableControl(CURSOR_USE);
+			R2_GLOBALS._player._canWalk = false;
+			if (event.mousePos.x > 130)
+				scene->_item3.setDetails(1945, 3, -1, -1, 3, (SceneItem *) NULL);
+			else
+				scene->_item3.setDetails(1945, 3, -1, 5, 3, (SceneItem *) NULL);
+		}
+	// No break on purpose
+	default:
+		return SceneHotspot::startAction(action, event);
+		break;
+	}
+}
+
+bool Scene1945::Hotspot4::startAction(CursorType action, Event &event) {
+	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneHotspot::startAction(action, event);
+
+	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->_fieldEAA = 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 == 221) && (R2_GLOBALS._player._position.y == 142) && (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::Actor3::startAction(CursorType action, Event &event) {
+	if ((action == R2_50) && (action == R2_49)) {
+		Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
+
+		scene->_fieldEAE = 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->_fieldEAA = 1943;
+		} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 50)) {
+			scene->_sceneMode = 1940;
+			scene->_fieldEAA = 1943;
+		} else {
+			scene->_sceneMode = 1949;
+			scene->_fieldEAA = 1947;
+			scene->_fieldEAC = 1943;
+		}
+		// 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::Exit1::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->_fieldEAA = 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 (scene->_sceneMode == 0) {
+		scene->_sceneMode = 1941;
+		signal();
+	} else {
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+	}
+}
+
+void Scene1945::Exit2::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 == 154) && (R2_GLOBALS._player._position.y == 50)) {
+		scene->_sceneMode = 1940;
+		scene->_fieldEAA = 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 (scene->_sceneMode != 0)
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
+}
+
+void Scene1945::postInit(SceneObjectList *OwnerList) {
+	loadScene(1945);
+	SceneExt::postInit();
+	R2_GLOBALS._sound1.play(220);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.enableControl(CURSOR_USE);
+	R2_GLOBALS._player._canWalk = false;
+	R2_GLOBALS._player._characterScene[2] = 1945;
+	R2_GLOBALS._player._characterIndex = R2_SEEKER;
+
+	_exit1.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1945);
+	_exit2.setDetails(Rect(238, 144, 274, 167), EXITCURSOR_E, 1945);
+
+	_item4.setDetails(Rect(141, 3, 167, 126), 1945, 9, -1, -1, 1, NULL);
+
+	if (!R2_GLOBALS.getFlag(43)) {
+		_exit2._enabled = false;
+		_actor3.postInit();
+		_actor3.setup(1945, 4, 1);
+		_actor3.setPosition(Common::Point(253, 169));
+		_actor3.fixPriority(150);
+
+		if (R2_GLOBALS.getFlag(42))
+			_actor3.setDetails(1945, 15, -1, -1, 1, (SceneItem *) NULL);
+		else
+			_actor3.hide();
+
+		_actor1.postInit();
+		_actor1.setup(1945, 8, 1);
+		_actor1.setPosition(Common::Point(253, 169));
+		_actor1.fixPriority(130);
+
+		_actor2.postInit();
+		_actor2.setup(1945, 3, 1);
+		_actor2.hide();
+	} else {
+		_exit2._enabled = true;
+	}
+
+	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._canWalk = false;
+	_fieldEAA = 0;
+	_fieldEAC = 0;
+
+	_item3.setDetails(11, 1945, 3, -1, 5);
+	_item1.setDetails(Rect(238, 144, 274, 167), 1945, 0, -1, 2, 1, NULL);
+	_item2.setDetails(Rect(27, 3, 292, 167), 1945, 3, -1, -1, 1, NULL);
+}
+
+void Scene1945::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene1945::signal() {
+	switch (_sceneMode) {
+	case 1940:
+		if (_fieldEAA == 1943) {
+			_sceneMode = _fieldEAA;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_actor2, NULL);
+		} else {
+			_sceneMode = 1946;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
+		}
+		return;
+		break;
+	case 1941:
+		if (_fieldEAA == 0) {
+			R2_GLOBALS._scene1925CurrLevel = 0;
+			R2_GLOBALS.setFlag(29);
+			R2_GLOBALS._sceneManager.changeScene(1925);
+		} else {
+			_sceneMode = _fieldEAA;
+			_fieldEAA = 0;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
+		}
+		return;
+	case 1942:
+		R2_INVENTORY.setObjectScene(R2_37, 0);
+		_actor3.setDetails(1945, 15, -1, -1, 2, (SceneItem *) NULL);
+		R2_GLOBALS.setFlag(42);
+		break;
+	case 1943:
+		R2_GLOBALS._sound1.fadeOut2(NULL);
+		R2_INVENTORY.setObjectScene(_fieldEAE, 0);
+		_sceneMode = 1948;
+		setAction(&_sequenceManager1, this, _sceneMode, &_actor3, &_actor2, &_actor1, NULL);
+		setAction(&_sequenceManager2, NULL, 1941, &R2_GLOBALS._player, NULL);
+		return;
+	case 1944:
+		break;
+	case 1945:
+		R2_GLOBALS._sceneManager.changeScene(1950);
+		return;
+	case 1946:
+		if (_fieldEAA == 1942) {
+			_sceneMode = _fieldEAA;
+			_fieldEAA = 0;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_actor3, NULL);
+			return;
+		}
+		break;
+	case 1947:
+		if (_fieldEAA == 1943) {
+			_sceneMode = _fieldEAA;
+			_fieldEAA = 1948;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_actor2, NULL);
+		} else {
+			_sceneMode = 1941;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
+		}
+		return;
+	case 1948:
+		R2_GLOBALS._sound1.play(220);
+		_exit2._enabled = true;
+		R2_GLOBALS._sceneItems.remove(&_actor3);
+		R2_GLOBALS.clearFlag(42);
+		R2_GLOBALS.clearFlag(43);
+		_fieldEAA = 1940;
+	// No break on purpose
+	case 1949:
+		_sceneMode = _fieldEAA;
+		if (_fieldEAC == 1943) {
+			_fieldEAA = _fieldEAC;
+			_fieldEAC = 0;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_actor2, NULL);
+		} else {
+			_fieldEAA = 0;
+			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, NULL);
+		}
+		return;
+	default:
+		break;
+	}
+
+	R2_GLOBALS._player.enableControl(CURSOR_USE);
+	R2_GLOBALS._player._canWalk = false;
+}
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index df6789efbd..4a58609cd5 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -748,6 +748,54 @@ public:
 	virtual void remove();
 	virtual void signal();
 };
+
+class Scene1945 : public SceneExt {
+	class Hotspot3 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Hotspot4 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor3 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit2 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+public:
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	Hotspot3 _item3;
+	Hotspot4 _item4;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	Actor3 _actor3;
+	Exit1 _exit1;
+	Exit2 _exit2;
+	SequenceManager _sequenceManager1;
+	SequenceManager _sequenceManager2;
+
+	int _fieldEAA;
+	int _fieldEAC;
+	CursorType _fieldEAE;
+
+	Scene1945();
+	void synchronize(Serializer &s);
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+};
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 2820573b43da847df00d2140bbb710ecef7cd1d1 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 23 Jan 2012 09:50:18 +0100
Subject: TSAGE: R2R - Fix a couple of bugs in scenes 1925 and 1945, some
 renaming

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 12 ++++++------
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index d957599159..38aeee6def 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -6701,7 +6701,7 @@ bool Scene1925::Hotspot3::startAction(CursorType action, Event &event) {
 	return true;
 }
 
-void Scene1925::Exit1::changeScene() {
+void Scene1925::ExitUp::changeScene() {
 	Scene1925 *scene = (Scene1925 *)R2_GLOBALS._sceneManager._scene;
 
 	_moving = false;
@@ -6723,7 +6723,7 @@ void Scene1925::Exit1::changeScene() {
 		scene->_sceneMode = 1932;
 	}
 
-	if (scene->_sceneMode == 0)
+	if (scene->_sceneMode != 0)
 		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, NULL);
 	else {
 		scene->_sceneMode = 1932;
@@ -6779,7 +6779,7 @@ void Scene1925::Exit4::changeScene() {
 }
 
 void Scene1925::changeLevel(bool upFlag) {
-	if (R2_GLOBALS._scene1925CurrLevel <= 0)
+	if (R2_GLOBALS._scene1925CurrLevel < 0)
 		R2_GLOBALS._scene1925CurrLevel = 3;
 
 	if (upFlag) {
@@ -6853,7 +6853,7 @@ void Scene1925::postInit(SceneObjectList *OwnerList) {
 		_exit3.setDetails(Rect(83, 38, 128, 101), EXITCURSOR_W, 1925);
 	// No break on purpose
 	default:
-		_exit1.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1925);
+		_exitUp.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1925);
 		_exit2.setDetails(Rect(128, 160, 190, 167), EXITCURSOR_S, 1925);
 		_item3.setDetails(Rect(141, 11, 167, 159),	1925, 6, -1, -1, 1, NULL);
 		break;
@@ -7055,7 +7055,7 @@ bool Scene1945::Actor3::startAction(CursorType action, Event &event) {
 	}
 }
 
-void Scene1945::Exit1::changeScene() {
+void Scene1945::ExitUp::changeScene() {
 	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
 
 	_moving = false;
@@ -7108,7 +7108,7 @@ void Scene1945::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player._characterScene[2] = 1945;
 	R2_GLOBALS._player._characterIndex = R2_SEEKER;
 
-	_exit1.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1945);
+	_exitUp.setDetails(Rect(128, 0, 186, 10), EXITCURSOR_N, 1945);
 	_exit2.setDetails(Rect(238, 144, 274, 167), EXITCURSOR_E, 1945);
 
 	_item4.setDetails(Rect(141, 3, 167, 126), 1945, 9, -1, -1, 1, NULL);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 4a58609cd5..52fb3650cf 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -710,7 +710,7 @@ class Scene1925 : public SceneExt {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 
-	class Exit1 : public SceneExit {
+	class ExitUp : public SceneExit {
 	public:
 		virtual void changeScene();
 	};
@@ -731,7 +731,7 @@ public:
 	Hotspot2 _item2;
 	Hotspot3 _item3;
 	SceneActor _actor1;
-	Exit1 _exit1;
+	ExitUp _exitUp;
 	Exit2 _exit2;
 	Exit3 _exit3;
 	Exit4 _exit4;
@@ -764,7 +764,7 @@ class Scene1945 : public SceneExt {
 		virtual bool startAction(CursorType action, Event &event);
 	};
 
-	class Exit1 : public SceneExit {
+	class ExitUp : public SceneExit {
 	public:
 		virtual void changeScene();
 	};
@@ -780,7 +780,7 @@ public:
 	SceneActor _actor1;
 	SceneActor _actor2;
 	Actor3 _actor3;
-	Exit1 _exit1;
+	ExitUp _exitUp;
 	Exit2 _exit2;
 	SequenceManager _sequenceManager1;
 	SequenceManager _sequenceManager2;
-- 
cgit v1.2.3


From aec3a92377c4c1467407e92b472da169d61b10b9 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 23 Jan 2012 12:42:04 +0100
Subject: TSAGE: R2R - Implement several missing functions in scene1550

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 67 ++++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  3 ++
 2 files changed, 69 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 38aeee6def..bc4a31c3f0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2497,8 +2497,73 @@ void Scene1550::UnkArea1550::remove() {
 		scene->setAction(&scene->_sequenceManager1, scene, 1562, &R2_GLOBALS._player, NULL);
 	}
 }
+
+void Scene1550::UnkArea1550::process(Event &event) {
+// This is a copy of Scene1200::Area1::process
+	if (_field20 != R2_GLOBALS._insetUp)
+		return;
+
+	CursorType cursor = R2_GLOBALS._events.getCursor();
+
+	if (_areaActor._bounds.contains(event.mousePos.x + g_globals->gfxManager()._bounds.left , event.mousePos.y)) {
+		if (cursor == _cursorNum)
+			warning("TODO: _cursorState = ???");
+			R2_GLOBALS._events.setCursor(_savedCursorNum); //, _cursorState);
+	} else if (event.mousePos.y < 168) {
+		if (cursor != _cursorNum) {
+			_savedCursorNum = cursor;
+			warning("TODO: _cursorState = ???");
+			R2_GLOBALS._events.setCursor(CURSOR_INVALID);
+		}
+		if (event.eventType == EVENT_BUTTON_DOWN) {
+			event.handled = true;
+			warning("TODO: _cursorState = ???");
+			R2_GLOBALS._events.setCursor(_savedCursorNum); //, _cursorState);
+			remove();
+		}
+	}
+}
+
 void Scene1550::UnkArea1550::proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY) {
-	warning("Scene1550::UnkArea1550::proc12() should be based on Scene1550::UnkArea1200::proc12()");
+	// UnkArea1200::proc12();
+	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
+
+	_areaActor.postInit();
+	_areaActor.setup(visage, stripFrameNum, frameNum);
+	_areaActor.setPosition(Common::Point(posX, posY));
+	_areaActor.fixPriority(250);
+	_cursorNum = CURSOR_INVALID;
+	scene->_sceneAreas.push_front(this);
+	++R2_GLOBALS._insetUp;
+	_field20 = R2_GLOBALS._insetUp;
+	//
+
+	proc13(1550, 67, -1, -1);
+	_unkObj155031.postInit();
+	_unkObj155031._fieldA4 = 1;
+	if (scene->_actor4._frame == 1)
+		_unkObj155031.setup(1559, 3, 1);
+	else
+		_unkObj155031.setup(1559, 3, 2);
+	_unkObj155031.setPosition(Common::Point(142, 79));
+	_unkObj155031.fixPriority(251);
+	_unkObj155031.setDetails(1550, 68, -1, -1, 2, (SceneItem *) NULL);
+
+	_unkObj155032.postInit();
+	_unkObj155032._numFrames = 5;
+	_unkObj155032._fieldA4 = 2;
+	if (scene->_actor13._frame == 1)
+		_unkObj155032.setup(1559, 2, 1);
+	else
+		_unkObj155032.setup(1559, 2, 2);
+	_unkObj155032.setPosition(Common::Point(156, 103));
+	_unkObj155032.fixPriority(251);
+	_unkObj155032.setDetails(1550, 69, -1, -1, 2, (SceneItem *) NULL);
+}
+
+void Scene1550::UnkArea1550::proc13(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
+	// Copy of Scene1200::Area1::proc13
+	_areaActor.setDetails(resNum, lookLineNum, talkLineNum, useLineNum, 2, (SceneItem *) NULL);
 }
 
 bool Scene1550::Hotspot1::startAction(CursorType action, Event &event) {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 52fb3650cf..3f2399a2fe 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -275,7 +275,9 @@ class Scene1550 : public SceneExt {
 		UnkObj15503 _unkObj155032;
 
 		virtual void remove();
+		virtual void process(Event &event);
 		virtual void proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY);
+		virtual void proc13(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
 	};
 
 	class Hotspot1 : public NamedHotspot {
@@ -796,6 +798,7 @@ public:
 	virtual void remove();
 	virtual void signal();
 };
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From db26984ed4ee7672c23ed9d45381958a64e07e78 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 25 Jan 2012 22:08:40 +0100
Subject: TSAGE: R2R- Implement scene 1950

---
 engines/tsage/globals.cpp                       |   29 +-
 engines/tsage/globals.h                         |    3 +
 engines/tsage/ringworld2/ringworld2_logic.cpp   |    2 +-
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 1800 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  142 ++
 5 files changed, 1974 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 1c2b83c81b..579239d565 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -383,7 +383,6 @@ void Ringworld2Globals::reset() {
 	_v565F6 = 0;
 	_v565FA = 0;
 	_v565AE = 0;
-
 	_v56605[0] = 0;
 	_v56605[1] = 3;
 	_v56605[2] = 5;
@@ -399,8 +398,34 @@ void Ringworld2Globals::reset() {
 	_v56605[12] = 27;
 	_v56605[13] = 31;
 
+	for (int i = 0; i < 18; i++) {
+		_v56613[(i * 4)    ] = 1;
+		_v56613[(i * 4) + 2] = 0;
+		_v56613[(i * 4) + 3] = 0;
+	}
+	_v56613[( 0 * 4) + 1] = 1;
+	_v56613[( 1 * 4) + 1] = 2;
+	_v56613[( 2 * 4) + 1] = 2;
+	_v56613[( 3 * 4) + 1] = 3;
+	_v56613[( 4 * 4) + 1] = 2;
+	_v56613[( 5 * 4) + 1] = 2;
+	_v56613[( 6 * 4) + 1] = 3;
+	_v56613[( 7 * 4) + 1] = 1;
+	_v56613[( 8 * 4) + 1] = 1;
+	_v56613[( 9 * 4) + 1] = 3;
+	_v56613[(10 * 4) + 1] = 3;
+	_v56613[(11 * 4) + 1] = 1;
+	_v56613[(12 * 4) + 1] = 2;
+	_v56613[(13 * 4) + 1] = 3;
+	_v56613[(14 * 4) + 1] = 2;
+	_v56613[(15 * 4) + 1] = 3;
+	_v56613[(16 * 4) + 1] = 1;
+	_v56613[(17 * 4) + 1] = 1;
+
 	_v566A6 = 3800;
 	_v566A3 = 2;
+	_v566A4 = 1;
+	_v566A5 = 0;
 	_v566A8 = 5;
 	_v566A9 = 0;
 	_v566AA = 0;
@@ -478,6 +503,8 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 		s.syncAsByte(_v565F1[i]);
 	
 	s.syncAsByte(_v565AE);
+	s.syncAsByte(_v566A4);
+	s.syncAsByte(_v566A5);
 	s.syncAsByte(_v566A8);
 	s.syncAsByte(_v566A9);
 	s.syncAsByte(_v566AA);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index c4ab3e695c..eeeddb4540 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -262,6 +262,9 @@ public:
 	int _v5657C;
 	byte _v565AE;
 	byte _v56605[14];
+	int _v56613[76];
+	byte _v566A4;
+	byte _v566A5;
 	int _v566A6;
 	byte _v566A3;
 	byte _v566A8;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 983b2b3c7d..54d9bc362f 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -146,7 +146,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1945:
 		return new Scene1945();
 	case 1950:
-		error("Missing scene %d from group 1", sceneNumber);
+		return new Scene1950();
 	/* Scene group #2 */
 	//
 	case 2000:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index bc4a31c3f0..d3b7d616f1 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1104,6 +1104,9 @@ Scene1200::Object1::Object1() {
 void Scene1200::Object1::synchronize(Serializer &s) {
 	SavedObject::synchronize(s);
 
+	_rect1.synchronize(s);
+	_rect2.synchronize(s);
+
 	s.syncAsSint16LE(_field16);
 	s.syncAsSint16LE(_field26);
 	s.syncAsSint16LE(_field28);
@@ -7320,5 +7323,1802 @@ void Scene1945::signal() {
 	R2_GLOBALS._player._canWalk = false;
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1950 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene1950::Area1::Area1() {
+	_field20 = 0;
+	_fieldB65 = 0;
+}
+void Scene1950::Area1::synchronize(Serializer &s) {
+	SceneArea::synchronize(s);
+	
+	s.syncAsByte(_field20);
+	s.syncAsSint16LE(_fieldB65);
+}
+
+Scene1950::Scene1950() {
+	_field412 = 0;
+	_field414 = 0;
+	_field416 = 0;
+	_field418 = Common::Point(0, 0);
+	_field41C = 0;
+}
+
+void Scene1950::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+	
+	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_field414);
+	s.syncAsSint16LE(_field416);
+	s.syncAsSint16LE(_field418.x);
+	s.syncAsSint16LE(_field418.y);
+	s.syncAsSint16LE(_field41C);
+}
+
+Scene1950::Area1::Actor10::Actor10() {
+	_fieldA4 = 0;
+	_fieldA6 = 0;
+	_fieldA8 = 0;
+}
+
+void Scene1950::Area1::Actor10::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+	
+	s.syncAsSint16LE(_fieldA4);
+	s.syncAsSint16LE(_fieldA6);
+	s.syncAsSint16LE(_fieldA8);
+}
+
+void Scene1950::Area1::Actor10::init(int indx) {
+//	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_fieldA4 = indx;
+	_fieldA6 = 0;
+	_fieldA8 = 0;
+
+	postInit();
+	setup(1971, 2, 1);
+	fixPriority(249);
+	setPosition(Common::Point(((_fieldA4 / 4) * 22) + 127, ((_fieldA4 / 4) * 19) + 71));
+	warning("FIXME: invalid call to scene->_sceneAreas.push_front(this);");
+}
+
+void Scene1950::Area1::Actor10::process(Event &event) {
+	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE) && (_bounds.contains(event.mousePos)) && (_fieldA6 == 0)) {
+		R2_GLOBALS._sound2.play(227);
+		if (_fieldA8 == 0) {
+			setFrame(2);
+			_fieldA8 = 1;
+		} else {
+			setFrame(1);
+			_fieldA8 = 0;
+		}
+		_fieldA6 = 1;
+		event.handled = true;
+	}
+
+	if ((event.eventType == EVENT_BUTTON_UP) && (_fieldA6 != 0)) {
+		_fieldA6 = 0;
+		event.handled = true;
+		Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+		scene->subBF4B4(_fieldA4);
+	}
+}
+
+bool Scene1950::Area1::Actor10::startAction(CursorType action, Event &event) {
+	if (action == CURSOR_USE)
+		return false;
+	return SceneActor::startAction(action, event);
+}
+
+void Scene1950::Area1::remove() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+	for (_fieldB65 = 0; _fieldB65 < 16; ++_fieldB65) {
+		warning("Unexpected _sceneAreas.remove() call");
+		// R2_GLOBALS._sceneAreas.remove(&_arrActor1[_fieldB65]);
+		_arrActor1[_fieldB65].remove();
+	}
+
+	// sub201EA
+	R2_GLOBALS._sceneItems.remove((SceneItem *)this);
+	_areaActor.remove();
+	SceneArea::remove();
+	R2_GLOBALS._insetUp--;
+	//
+	
+	if (!R2_GLOBALS.getFlag(37))
+		R2_GLOBALS._sound2.play(278);
+
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	scene->_exit3._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::Area1::process(Event &event) {
+// This is a copy of Scene1200::Area1::process
+	if (_field20 != R2_GLOBALS._insetUp)
+		return;
+
+	CursorType cursor = R2_GLOBALS._events.getCursor();
+
+	if (_areaActor._bounds.contains(event.mousePos.x + g_globals->gfxManager()._bounds.left , event.mousePos.y)) {
+		if (cursor == _cursorNum)
+			warning("TODO: _cursorState = ???");
+			R2_GLOBALS._events.setCursor(_savedCursorNum); //, _cursorState);
+	} else if (event.mousePos.y < 168) {
+		if (cursor != _cursorNum) {
+			_savedCursorNum = cursor;
+			warning("TODO: _cursorState = ???");
+			R2_GLOBALS._events.setCursor(CURSOR_INVALID);
+		}
+		if (event.eventType == EVENT_BUTTON_DOWN) {
+			event.handled = true;
+			warning("TODO: _cursorState = ???");
+			R2_GLOBALS._events.setCursor(_savedCursorNum); //, _cursorState);
+			remove();
+		}
+	}
+}
+
+void Scene1950::Area1::proc12(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;
+
+	// UnkArea1200::proc12();
+	_areaActor.postInit();
+	_areaActor.setup(visage, stripFrameNum, frameNum);
+	_areaActor.setPosition(Common::Point(posX, posY));
+	_areaActor.fixPriority(250);
+	_cursorNum = CURSOR_INVALID;
+	scene->_sceneAreas.push_front(this);
+	++R2_GLOBALS._insetUp;
+	_field20 = R2_GLOBALS._insetUp;
+	//
+
+	_areaActor.fixPriority(248);
+	scene->_exit3._enabled = false;
+	proc13(1950, 27, 28, 27);
+	
+	for (_fieldB65 = 0; _fieldB65 < 16; _fieldB65++)
+		_arrActor1[_fieldB65].init(_fieldB65);
+}
+
+void Scene1950::Area1::proc13(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
+	// Copy of Scene1200::Area1::proc13()
+	_areaActor.setDetails(resNum, lookLineNum, talkLineNum, useLineNum, 2, (SceneItem *) NULL);
+}
+
+bool Scene1950::Hotspot2::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::Actor2::startAction(CursorType action, Event &event) {
+	if (action != R2_31)
+		return SceneActor::startAction(action, event);
+
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._player.disableControl();
+	R2_INVENTORY.setObjectScene(31, 0);
+	scene->_sceneMode = 1958;
+	scene->setAction(&scene->_sequenceManager, scene, 1958, &R2_GLOBALS._player, &scene->_actor2, NULL);
+	return true;
+}
+
+bool Scene1950::Actor3::startAction(CursorType action, Event &event) {
+	if ((action != CURSOR_USE) || (R2_INVENTORY.getObjectScene(35) != 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::Actor5::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::Actor8::Actor8() {
+	_fieldA4 = 0;
+	_fieldA6 = 0;
+	_fieldA8 = 0;
+	_fieldAA = 0;
+	_fieldAC = 0;
+	_fieldAE = 0;
+	_fieldAF = 0;
+}
+
+void Scene1950::Actor8::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+	
+	s.syncAsSint16LE(_fieldA4);
+	s.syncAsSint16LE(_fieldA6);
+	s.syncAsSint16LE(_fieldA8);
+	s.syncAsSint16LE(_fieldAA);
+	s.syncAsSint16LE(_fieldAC);
+	s.syncAsByte(_fieldAE);
+	s.syncAsByte(_fieldAF);
+}
+
+void Scene1950::Actor8::signal() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_fieldAC) {
+	case 19: {
+		_fieldAC = 0;
+		setVisage(1960);
+		if (R2_GLOBALS._v566A5 == 3)
+			setStrip(2);
+		else
+			setStrip(1);
+
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &scene->_field418, this);
+		}
+		break;
+	case 20: {
+		_fieldAC = 19;
+		R2_GLOBALS._player.setVisage(22);
+		if (R2_GLOBALS._v566A5 == 3)
+			R2_GLOBALS._player.setStrip(1);
+		else
+			R2_GLOBALS._player.setStrip(2);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._v56613[((scene->_field41C - 1) * 4) + 1]--;
+
+		if (R2_GLOBALS._v566A5 == 3)
+			_fieldA4 = _position.x + 10;
+		else
+			_fieldA4 = _position.x - 10;
+
+		_fieldA6 = _position.y -4;
+		setVisage(1961);
+		
+		if (R2_GLOBALS._v566A5 == 3)
+			setStrip(2);
+		else
+			setStrip(1);
+
+		animate(ANIM_MODE_2, NULL);
+		Common::Point pt(_fieldA4, _fieldA6);
+		PlayerMover *mover = new PlayerMover();
+		addMover(mover, &pt, this);
+
+		R2_GLOBALS._player.enableControl();
+		}
+		break;
+	case 21:
+		R2_GLOBALS._player.setVisage(22);
+		if (R2_GLOBALS._v566A5 == 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._v566A5 == 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._v56613[((scene->_field41C - 1) * 4) ]--;
+		R2_GLOBALS._v56613[((scene->_field41C - 1) * 4) + 1]--;
+		R2_GLOBALS._v56613[((scene->_field41C - 1) * 4) + 2] = _position.x;
+		R2_GLOBALS._v56613[((scene->_field41C - 1) * 4) + 3] = _position.y;
+		_fieldA8 = (_position.x - R2_GLOBALS._player._position.x) / 2;
+		_fieldAA = (_position.y - R2_GLOBALS._player._position.y) / 2;
+
+		_fieldAE = 0;
+		for (_fieldAF = 0; _fieldAF < 18; ++_fieldAF)
+			if (R2_GLOBALS._v56613[4 * _fieldAF] == 0)
+				++_fieldAE;
+		
+		if (_fieldAE == 18) {
+			R2_GLOBALS.setFlag(36);
+			_fieldAC = 23;
+			Common::Point pt(R2_GLOBALS._player._position.x + _fieldA8, R2_GLOBALS._player._position.y + _fieldAA);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+		} else if (_fieldAE == 1) {
+			_fieldAC = 22;
+			Common::Point pt(R2_GLOBALS._player._position.x + _fieldA8, R2_GLOBALS._player._position.y + _fieldAA);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, this);
+		} else {
+			R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		}
+
+		if (R2_GLOBALS._v566A5 == 3)
+			scene->_exit3._enabled = true;
+		else
+			scene->_exit6._enabled = true;
+
+		scene->_field416 = 0;
+		break;
+	case 22:
+		SceneItem::display(1950, 18, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	case 23:
+		SceneItem::display(1950, 25, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		scene->_sceneMode = R2_GLOBALS._v566A5;
+		scene->setAction(&scene->_sequenceManager, scene, 1960, &R2_GLOBALS._player, NULL);
+		break;
+	default:
+		break;
+	}
+}
+
+bool Scene1950::Actor8::startAction(CursorType action, Event &event) {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((R2_GLOBALS._v56613[(scene->_field41C - 1) * 4] == 0) || (action != R2_44))
+		return SceneActor::startAction(action, event);
+	
+	R2_GLOBALS._player.disableControl();
+
+	if (R2_GLOBALS._v56613[((scene->_field41C - 1) * 4) + 1] <= 1)
+		_fieldAC = 21;
+	else
+		_fieldAC = 20;
+	
+	R2_GLOBALS._player.setVisage(25);
+	if (R2_GLOBALS._v566A5 == 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::Exit1::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	R2_GLOBALS._v566A5 = 1;
+	scene->_sceneMode = 11;
+
+	Common::Point pt(160, 127);
+	PlayerMover *mover = new PlayerMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene1950::Exit2::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	R2_GLOBALS._v566A5 = 2;
+	scene->_sceneMode = 12;
+
+	if (scene->_field412 == 0) {
+		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::Exit3::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	R2_GLOBALS._v566A5 = 3;
+	scene->_sceneMode = 13;
+
+	if (scene->_field416 != 0)
+		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::Exit4::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	R2_GLOBALS._v566A5 = 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::Exit5::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	R2_GLOBALS._v566A5 = 5;
+	scene->_sceneMode = 15;
+
+	Common::Point pt(160, 213);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+}
+
+void Scene1950::Exit6::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	R2_GLOBALS._v566A5 = 5;
+	if (R2_GLOBALS._v566A4 == 2) {
+		if ((R2_GLOBALS.getFlag(36)) && (R2_INVENTORY.getObjectScene(34) == 2) && (R2_INVENTORY.getObjectScene(35) == 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, -999);
+			if ((R2_INVENTORY.getObjectScene(34) == 1950) || (R2_INVENTORY.getObjectScene(35) == 1950))
+				SceneItem::display(1950, 34, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+			scene->_sceneMode = 0;
+			Common::Point pt(30, 160);
+			NpcMover *mover = new NpcMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+		}
+	} else {
+		if (scene->_field416 != 0)
+			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::Exit7::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	R2_GLOBALS._v566A5 = 0;
+	scene->_sceneMode = 1951;
+	scene->setAction(&scene->_sequenceManager, scene, 1951, &R2_GLOBALS._player, NULL);
+}
+
+void Scene1950::Exit8::changeScene() {
+	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
+
+	_enabled = false;
+	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+	R2_GLOBALS._v566A5 = 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, -999);
+		R2_GLOBALS._v566A5 = 0;
+		scene->_sceneMode = 0;
+		Common::Point pt(250, 150);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, scene);
+		_enabled = true;
+	}
+}
+
+void Scene1950::subBDC1E() {
+	_exit1._enabled = false;
+	_exit2._enabled = false;
+	_exit3._enabled = false;
+	_exit4._enabled = false;
+	_exit5._enabled = false;
+	_exit6._enabled = false;
+	_exit7._enabled = false;
+	_exit8._enabled = false;
+	_exit1._insideArea = false;
+	_exit2._insideArea = false;
+	_exit3._insideArea = false;
+	_exit4._insideArea = false;
+	_exit5._insideArea = false;
+	_exit6._insideArea = false;
+	_exit7._insideArea = false;
+	_exit8._insideArea = false;
+	_exit1._moving = false;
+	_exit2._moving = false;
+	_exit3._moving = false;
+	_exit4._moving = false;
+	_exit5._moving = false;
+	_exit6._moving = false;
+	_exit7._moving = false;
+	_exit8._moving = false;
+	_field412 = 0;
+	switch (R2_GLOBALS._v566A4 - 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);
+		_field412 = 1;
+		break;
+	default:
+		break;
+	}
+	
+	if (R2_GLOBALS._v566A4 != 1)
+		R2_GLOBALS._walkRegions.load(1950);
+
+	switch (R2_GLOBALS._v566A4 - 1) {
+	case 0:
+		_exit7._enabled = true;
+		if ((R2_INVENTORY.getObjectScene(31) == 0) && (R2_INVENTORY.getObjectScene(34) == 1950))
+			_exit8._enabled = true;
+		R2_GLOBALS._walkRegions.enableRegion(2);
+		R2_GLOBALS._walkRegions.enableRegion(3);
+		R2_GLOBALS._walkRegions.enableRegion(4);
+		R2_GLOBALS._walkRegions.enableRegion(5);
+		R2_GLOBALS._walkRegions.enableRegion(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:
+		_exit3._enabled = true;
+		_exit6._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:
+		_exit6._enabled = true;
+		R2_GLOBALS._walkRegions.enableRegion(6);
+		R2_GLOBALS._walkRegions.enableRegion(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:
+		_exit3._enabled = true;
+		R2_GLOBALS._walkRegions.enableRegion(1);
+		R2_GLOBALS._walkRegions.enableRegion(7);
+		R2_GLOBALS._walkRegions.enableRegion(13);
+		break;
+	default:
+		R2_GLOBALS._walkRegions.enableRegion(1);
+		R2_GLOBALS._walkRegions.enableRegion(6);
+		R2_GLOBALS._walkRegions.enableRegion(7);
+		R2_GLOBALS._walkRegions.enableRegion(9);
+		R2_GLOBALS._walkRegions.enableRegion(13);
+		break;
+	}
+	
+	_object1.remove();
+	_object1.removeObject();
+	_actor1.remove();
+	
+	switch (R2_GLOBALS._v566A4 - 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:
+		_exit1._enabled = true;
+		_object1.setup2(1950, (R2_GLOBALS._v566A4 % 2) + 1, 1, 160, 237, 25, 0);
+
+		_actor1.postInit();
+		_actor1.setVisage(1950);
+		_actor1.setStrip((((R2_GLOBALS._v566A4 - 1) / 35) % 2) + 1);
+		_actor1.setFrame(2);
+		_actor1.setPosition(Common::Point(160, 167));
+		_actor1.fixPriority(220);
+		R2_GLOBALS._walkRegions.enableRegion(3);
+		R2_GLOBALS._walkRegions.enableRegion(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:
+		_exit5._enabled = true;
+		_actor1.postInit();
+		_actor1.setVisage(1950);
+		_actor1.setStrip((((R2_GLOBALS._v566A4 - 1) / 35) % 2) + 1);
+		_actor1.setFrame(3);
+		_actor1.setPosition(Common::Point(160, 167));
+		_actor1.fixPriority(220);
+		break;
+	case 58:
+	// No break on purpose
+	case 74:
+	// No break on purpose
+	case 80:
+		_exit1._enabled = true;
+		_exit5._enabled = true;
+
+		_object1.setup(1950, (R2_GLOBALS._v566A4 % 2) + 1, 1, 160, 137, 25);
+
+		_actor1.postInit();
+		_actor1.setVisage(1950);
+		_actor1.setStrip((((R2_GLOBALS._v566A4 - 1) / 35) % 2) + 1);
+		_actor1.setFrame(3);
+		_actor1.setPosition(Common::Point(160, 167));
+		_actor1.fixPriority(220);
+		R2_GLOBALS._walkRegions.enableRegion(3);
+		R2_GLOBALS._walkRegions.enableRegion(4);
+		break;
+	default:
+		_actor1.postInit();
+		_actor1.setVisage(1950);
+		_actor1.setStrip(((R2_GLOBALS._v566A4 - 1) % 35) + 1);
+		_actor1.setFrame(2);
+		_actor1.setPosition(Common::Point(160, 167));
+		_actor1.fixPriority(220);
+		break;
+	}
+	
+	switch (R2_GLOBALS._v566A4 - 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:
+		_exit2._enabled = true;
+	case 54:
+	// No break on purpose
+	case 61:
+	// No break on purpose
+	case 62:
+	// No break on purpose
+	case 65:
+		_exit2._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:
+		_exit4._enabled = true;
+		R2_GLOBALS._walkRegions.enableRegion(4);
+		R2_GLOBALS._walkRegions.enableRegion(5);
+		R2_GLOBALS._walkRegions.enableRegion(6);
+		R2_GLOBALS._walkRegions.enableRegion(10);
+		R2_GLOBALS._walkRegions.enableRegion(11);
+	default:
+		break;
+	}
+	R2_GLOBALS._uiElements.draw();
+}
+
+void Scene1950::subBE59B() {
+	R2_GLOBALS._player.disableControl();
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+
+	_actor8.remove();
+	_actor2.remove();
+	_actor3.remove();
+
+	_field416 = 0;
+	_field41C = 0;
+
+	switch (R2_GLOBALS._v566A4) {
+	case 10:
+		_field41C = 1;
+		break;
+	case 13:
+		_field41C = 2;
+		break;
+	case 16:
+		_field41C = 3;
+		break;
+	case 17:
+		_field41C = 4;
+		break;
+	case 24:
+		_field41C = 5;
+		break;
+	case 25:
+		_field41C = 6;
+		break;
+	case 31:
+		_field41C = 7;
+		break;
+	case 40:
+		_field41C = 8;
+		break;
+	case 45:
+		_field41C = 9;
+		break;
+	case 46:
+		_field41C = 10;
+		break;
+	case 73:
+		_field41C = 11;
+		break;
+	case 75:
+		_field41C = 12;
+		break;
+	case 80:
+		_field41C = 13;
+		break;
+	case 87:
+		_field41C = 14;
+		break;
+	case 88:
+		_field41C = 15;
+		break;
+	case 96:
+		_field41C = 16;
+		break;
+	case 97:
+		_field41C = 17;
+		break;
+	case 104:
+		_field41C = 18;
+		break;
+	default:
+		break;
+	}
+
+	if (_field41C != 0) {
+		_actor8.postInit();
+		_actor8._numFrames = 6;
+		_actor8._moveRate = 6;
+		_actor8._moveDiff = Common::Point(3, 2);
+		_actor8._effect = 1;
+		if (R2_GLOBALS._v56613[(_field41C - 1) * 4] == 0) {
+			_actor8.setPosition(Common::Point(R2_GLOBALS._v56613[((_field41C - 1) * 4) + 2], R2_GLOBALS._v56613[((_field41C - 1) * 4) + 3]));
+			_actor8.animate(ANIM_MODE_NONE, NULL);
+			_actor8.addMover(NULL);
+			_actor8.setVisage(1961);
+			_actor8.setStrip(4);
+			_actor8.setFrame(10);
+			_actor8.fixPriority(10);
+			_actor8.setDetails(1950, 15, -1, 17, 2, (SceneItem *) NULL);
+		} else {
+			_actor8.setVisage(1960);
+			_actor8.setPosition(Common::Point(160, 130));
+			_actor8.animate(ANIM_MODE_2, NULL);
+			_actor8.setDetails(1950, 12, -1, 14, 2, (SceneItem *) NULL);
+			_field416 = 1;
+		}
+	}
+	if ((R2_GLOBALS._v566A4 == 1) && (R2_INVENTORY.getObjectScene(31) != 0)) {
+		_actor2.postInit();
+		_actor2.setVisage(1948);
+		_actor2.setStrip(3);
+		_actor2.setPosition(Common::Point(278, 155));
+		_actor2.fixPriority(100);
+		_actor2.setDetails(1950, 19, 20, 23, 2, (SceneItem *) NULL);
+	}
+
+	if (R2_GLOBALS._v566A4 == 102) {
+		R2_GLOBALS._walkRegions.load(1951);
+		R2_GLOBALS._walkRegions.enableRegion(1);
+		R2_GLOBALS._walkRegions.enableRegion(5);
+		R2_GLOBALS._walkRegions.enableRegion(6);
+		R2_GLOBALS._walkRegions.enableRegion(7);
+
+		_actor6.postInit();
+		_actor6.setVisage(1970);
+		_actor6.setStrip(1);
+		if (R2_GLOBALS.getFlag(37))
+			_actor6.setFrame(3);
+		else
+			_actor6.setFrame(1);
+		_actor6.setPosition(Common::Point(193, 158));
+		_actor6.setDetails(1950, 3, 4, 5, 2, (SceneItem *) NULL);
+		
+		_actor7.postInit();
+		_actor7.setVisage(1970);
+		_actor7.setStrip(3);
+		_actor7.animate(ANIM_MODE_2, NULL);
+		_actor7._numFrames = 6;
+		_actor7.setPosition(Common::Point(194, 158));
+		_actor7.fixPriority(159);
+
+		_item2.setDetails(Rect(188, 124, 199, 133), 1950, 27, 28, -1, 2, NULL);
+		
+		if (R2_INVENTORY.getObjectScene(34) == 1950) {
+			_actor5.postInit();
+			_actor5.setVisage(1970);
+			_actor5.setStrip(1);
+			_actor5.setFrame(2);
+			_actor5.fixPriority(160);
+		}
+		
+		if (R2_GLOBALS.getFlag(37)) {
+			_actor5.setPosition(Common::Point(192, 118));
+			_actor5.setDetails(1950, 9, 4, -1, 2, (SceneItem *) NULL);
+		} else {
+			_actor4.postInit();
+			_actor4.setVisage(1970);
+			_actor4.setStrip(4);
+			_actor4._numFrames = 4;
+			_actor4.animate(ANIM_MODE_8, NULL);
+			_actor4.setPosition(Common::Point(192, 121));
+			_actor4.fixPriority(159);
+			_actor4.setDetails(1950, 6, 7, 8, 2, (SceneItem *) NULL);
+			
+			_actor5.setPosition(Common::Point(192, 109));
+			_actor5.setDetails(1950, 9, 7, 8, 2, (SceneItem *) NULL);
+		}
+		
+		_actor3.postInit();
+		_actor3.setVisage(1972);
+		_actor3.setStrip(1);
+		_actor3.setPosition(Common::Point(76, 94));
+		_actor3.fixPriority(25);
+		_actor3.setDetails(1950, 30, -1, -1, 2, (SceneItem *) NULL);
+		if (R2_INVENTORY.getObjectScene(35) == 2)
+			_actor3.setFrame(2);
+		else
+			_actor3.setFrame(1);
+		
+		_field414 = 1;
+	} else if (_field414 != 0) {
+		_actor6.remove();
+		_actor4.remove();
+		_actor5.remove();
+		_actor7.remove();
+		_actor3.remove();
+
+		_item1.setDetails(Rect(0, 0, 320, 200), 1950, 0, 1, 2, 2, NULL);
+	}
+	
+	switch (R2_GLOBALS._v566A5) {
+	case 0:
+		_sceneMode = 1950;
+		if (R2_INVENTORY.getObjectScene(31) == 0) {
+			R2_GLOBALS._v56AAB = 0;
+			R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		} else {
+			setAction(&_sequenceManager, this, 1950, &R2_GLOBALS._player, NULL);
+		}
+		break;
+	case 1: {
+		_sceneMode = R2_GLOBALS._v566A5;
+		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._v566A5;
+		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:
+		if (_field416 == 0) {
+			_sceneMode = R2_GLOBALS._v566A5;
+			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;
+			_exit3._enabled = false;
+			_field418 = Common::Point(60, 152);
+			R2_GLOBALS._v56AAB = 0;
+			R2_GLOBALS._player.enableControl(CURSOR_USE);
+			R2_GLOBALS._player._canWalk = false;
+
+			_actor8.setStrip(2);
+			NpcMover *mover = new NpcMover();
+			_actor8.addMover(mover, &_field418, 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._v566A5;
+		if (_field412 == 0) {
+			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._v566A5;
+		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:
+		if (_field416 == 0) {
+			_sceneMode = R2_GLOBALS._v566A5;
+			if (R2_GLOBALS._v566A4 == 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;
+			_exit6._enabled = false;
+			_field418 = Common::Point(259, 152);
+
+			R2_GLOBALS._v56AAB = 0;
+			R2_GLOBALS._player.enableControl(CURSOR_USE);
+			R2_GLOBALS._player._canWalk = false;
+			
+			_actor8.setStrip(1);
+			NpcMover *mover = new NpcMover();
+			_actor8.addMover(mover, &_field418, 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::subBF4B4(int indx) {
+	R2_GLOBALS._player.disableControl();
+	int si = indx - 1;
+	if ((indx / 4) == (si / 4)) {
+		if (si < 0)
+			si = 3;
+	} else
+		si = 4;
+	
+	if (_area1._arrActor1[si]._fieldA8 == 0) {
+		_area1._arrActor1[si].setFrame(2);
+		_area1._arrActor1[si]._fieldA8 = 1;
+	} else {
+		_area1._arrActor1[si].setFrame(1);
+		_area1._arrActor1[si]._fieldA8 = 0;
+	}
+	
+	si = indx + 1;
+	if ((indx / 4) == (si / 4)) {
+		if (si >  15)
+			si = 12;
+	} else
+		si -= 4;
+	
+	if (_area1._arrActor1[si]._fieldA8 == 0) {
+		_area1._arrActor1[si].setFrame(2);
+		_area1._arrActor1[si]._fieldA8 = 1;
+	} else {
+		_area1._arrActor1[si].setFrame(1);
+		_area1._arrActor1[si]._fieldA8 = 0;
+	}
+	
+	si = indx - 4;
+	if (si < 0)
+		si += 16;
+
+	if (_area1._arrActor1[si]._fieldA8 == 0) {
+		_area1._arrActor1[si].setFrame(2);
+		_area1._arrActor1[si]._fieldA8 = 1;
+	} else {
+		_area1._arrActor1[si].setFrame(1);
+		_area1._arrActor1[si]._fieldA8 = 0;
+	}
+	
+	si = indx + 4;
+	if (si > 15)
+		si -= 16;
+
+	if (_area1._arrActor1[si]._fieldA8 == 0) {
+		_area1._arrActor1[si].setFrame(2);
+		_area1._arrActor1[si]._fieldA8 = 1;
+	} else {
+		_area1._arrActor1[si].setFrame(1);
+		_area1._arrActor1[si]._fieldA8 = 0;
+	}
+
+	int cpt = 0;
+	for (si = 0; si < 16; si++) {
+		if (_area1._arrActor1[si]._fieldA8 != 0)
+			++cpt;
+	}
+
+	if (cpt != 16) {
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+	} else {
+		R2_GLOBALS.setFlag(37);
+		_sceneMode = 24;
+		// TODO: check if correct. The original doesn't countain a sceneActor in 
+		// this call, but it's extremely unusual
+		setAction(&_sequenceManager, this, 1976, NULL);
+	}
+}
+
+void Scene1950::postInit(SceneObjectList *OwnerList) {
+	_field412 = 0;
+	_field414 = 0;
+	_field416 = 0;
+	_field41C = 0;
+	if (R2_GLOBALS._sceneManager._previousScene == 300)
+		R2_GLOBALS._v566A4 = 103;
+	
+	subBDC1E();
+	SceneExt::postInit();
+	R2_GLOBALS._sound1.play(105);
+
+	_exit1.setDetails(Rect(130, 46, 189, 135), SHADECURSOR_UP, 1950);
+	_exit1.setDest(Common::Point(160, 145));
+	
+	_exit2.setDetails(Rect(208, 0, 255, 73), EXITCURSOR_N, 1950);
+	_exit2.setDest(Common::Point(200, 151));
+	
+	_exit3.setDetails(Rect(305, 95, 320, 147), EXITCURSOR_E, 1950);
+	_exit3.setDest(Common::Point(312, 160));
+	
+	_exit4.setDetails(Rect(208, 99, 255, 143), EXITCURSOR_S, 1950);
+	_exit4.setDest(Common::Point(200, 151));
+	
+	_exit5.setDetails(Rect(113, 154, 206, 168), SHADECURSOR_DOWN, 1950);
+	_exit5.setDest(Common::Point(160, 165));
+	
+	_exit6.setDetails(Rect(0, 95, 14, 147), EXITCURSOR_W, 1950);
+	_exit6.setDest(Common::Point(7, 160));
+	
+	_exit7.setDetails(Rect(72, 54, 120, 128), EXITCURSOR_NW, 1950);
+	_exit7.setDest(Common::Point(120, 140));
+	
+	_exit8.setDetails(Rect(258, 60, 300, 145), EXITCURSOR_NE, 1950);
+	_exit8.setDest(Common::Point(268, 149));
+	
+	R2_GLOBALS._player.postInit();
+	if ( (R2_INVENTORY.getObjectScene(32) == 0) && (R2_INVENTORY.getObjectScene(33) == 0) 
+		&& (R2_INVENTORY.getObjectScene(46) == 0) && (!R2_GLOBALS.getFlag(36)) )
+		R2_GLOBALS._player.setVisage(22);
+	else
+		R2_GLOBALS._player.setVisage(20);
+	
+	R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+	_item1.setDetails(Rect(0, 0, 320, 200), 1950, 0, 1, 2, 1, NULL);
+	
+	subBE59B();
+}
+
+void Scene1950::remove() {
+	R2_GLOBALS._sound1.stop();
+	R2_GLOBALS._sound2.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene1950::signal() {
+	switch (_sceneMode) {
+	case 11:
+		R2_GLOBALS._v566A4 += 7;
+		subBDC1E();
+		subBE59B();
+		break;
+	case 12:
+		R2_GLOBALS._v566A4 += 35;
+		subBDC1E();
+		subBE59B();
+		break;
+	case 1975:
+		SceneItem::display(1950, 21, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+	// No break on purpose
+	case 13:
+		++R2_GLOBALS._v566A4;
+		subBDC1E();
+		subBE59B();
+		break;
+	case 14:
+		R2_GLOBALS._v566A4 += 221;
+		subBDC1E();
+		subBE59B();
+		break;
+	case 15:
+		R2_GLOBALS._v566A4 += 249;
+		subBDC1E();
+		subBE59B();
+		break;
+	case 16:
+	// No break on purpose
+	case 1961:
+		--R2_GLOBALS._v566A4;
+		subBDC1E();
+		subBE59B();
+		break;
+	case 17: {
+		_sceneMode = 13;
+		R2_GLOBALS._v566A5 = 3;
+		_field416 = 0;
+		R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+		R2_GLOBALS._player._canWalk = true;
+		R2_GLOBALS._player.setVisage(22);
+		R2_GLOBALS._player.animate(ANIM_MODE_9, NULL);
+		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();
+		_actor8.addMover(mover2, &pt2, NULL);
+		}
+		break;
+	case 18: {
+		_sceneMode = 16;
+		R2_GLOBALS._v566A5 = 6;
+		_field416 = 0;
+		R2_GLOBALS._player.disableControl(CURSOR_ARROW);
+		R2_GLOBALS._player._canWalk = true;
+		R2_GLOBALS._player.setVisage(22);
+		R2_GLOBALS._player.animate(ANIM_MODE_9, NULL);
+		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();
+		_actor8.addMover(mover2, &pt2, NULL);
+		}
+		break;
+	case 24:
+		_area1.remove();
+		_sceneMode = 1966;
+		_actor6.setFrame(3);
+		setAction(&_sequenceManager, this, 1966, &_actor4, &_actor5, 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, -999);
+		R2_GLOBALS._v56AAB = 0;
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		_exit8._enabled = true;
+		break;
+	case 1959:
+		R2_INVENTORY.setObjectScene(46, 0);
+		R2_GLOBALS._v56AAB = 0;
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		_exit8._enabled = true;
+		break;
+	case 1962:
+	// No break on purpose
+	case 1963:
+		R2_GLOBALS._player.enableControl();
+		_area1.proc12(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, -999);
+			R2_GLOBALS._player.enableControl();
+		break;
+	case 1966:
+		_actor4.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);
+		}
+		_actor5.setDetails(1950, 9, -1, -1, 2, (SceneItem *) NULL);
+	case 1967: {
+		_sceneMode = 0;
+		R2_INVENTORY.setObjectScene(34, 2);
+		_actor5.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);
+		Common::Point pt(218, 165);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 1968:
+		R2_GLOBALS._player.disableControl();
+		R2_INVENTORY.setObjectScene(35, 2);
+		_actor3.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._v56AAB = 0;
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	}
+}
+
+void Scene1950::process(Event &event) {
+	if ( (event.eventType == EVENT_BUTTON_DOWN)
+		&& (R2_GLOBALS._player._uiEnabled) 
+		&& (R2_GLOBALS._events.getCursor() == R2_47)
+		&& (R2_GLOBALS._player._bounds.contains(event.mousePos))
+		&& (R2_INVENTORY.getObjectScene(31) == 0)) {
+		event.handled = true;
+		R2_GLOBALS._player.disableControl();
+		_exit7._enabled = false;
+		_exit8._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_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 3f2399a2fe..7efaec72c1 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -799,6 +799,148 @@ public:
 	virtual void signal();
 };
 
+class Scene1950 : public SceneExt {
+	class Area1: public SceneArea {
+	public:
+		class Actor10 : public SceneActor {
+		public:
+			int _fieldA4;
+			int _fieldA6;
+			int _fieldA8;
+
+			Actor10::Actor10();
+			void synchronize(Serializer &s);
+
+			void init(int indx);
+			virtual void process(Event &event);
+			virtual bool startAction(CursorType action, Event &event);
+		};
+
+		SceneActor _areaActor;
+		Actor10 _arrActor1[16];
+
+		byte _field20;
+		int _fieldB65;
+
+		Area1();
+		void synchronize(Serializer &s);
+
+		virtual void remove();
+		virtual void process(Event &event);
+		virtual void proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY);
+		virtual void proc13(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
+	};
+
+	class Hotspot2 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor2 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor3 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor4 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor5 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor8 : public SceneActor {
+	public:
+		int _fieldA4;
+		int _fieldA6;
+		int _fieldA8;
+		int _fieldAA;
+		int _fieldAC;
+		byte _fieldAE;
+		byte _fieldAF;
+
+		Actor8::Actor8();
+		void synchronize(Serializer &s);
+
+		virtual void signal();
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Exit1 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit2 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit3 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit4 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit5 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit6 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit7 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+	class Exit8 : public SceneExit {
+	public:
+		virtual void changeScene();
+	};
+public:
+	NamedHotspot _item1;
+	Hotspot2 _item2;
+	SceneActor _actor1;
+	BackgroundSceneObject _object1;
+	Actor2 _actor2;
+	Actor3 _actor3;
+	SceneActor _actor4;
+	Actor5 _actor5;
+	SceneActor _actor6;
+	SceneActor _actor7;
+	Actor8 _actor8;
+	Area1 _area1;
+	Exit1 _exit1;
+	Exit2 _exit2;
+	Exit3 _exit3;
+	Exit4 _exit4;
+	Exit5 _exit5;
+	Exit6 _exit6;
+	Exit7 _exit7;
+	Exit8 _exit8;
+	SequenceManager _sequenceManager;
+
+	int _field412;
+	int _field414;
+	int _field416;
+	Common::Point _field418;
+	int _field41C;
+
+	Scene1950();
+	void synchronize(Serializer &s);
+
+	void subBDC1E();
+	void subBE59B();
+	void subBF4B4(int indx);
+	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
 
-- 
cgit v1.2.3


From dd46de7569ce460047bb832f3d12ef2bb342ef8b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 25 Jan 2012 22:20:34 +0100
Subject: TSAGE: Fix compilation, sorry

---
 engines/tsage/ringworld2/ringworld2_scenes1.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 7efaec72c1..7c05cd8e5f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -808,7 +808,7 @@ class Scene1950 : public SceneExt {
 			int _fieldA6;
 			int _fieldA8;
 
-			Actor10::Actor10();
+			Actor10();
 			void synchronize(Serializer &s);
 
 			void init(int indx);
@@ -862,7 +862,7 @@ class Scene1950 : public SceneExt {
 		byte _fieldAE;
 		byte _fieldAF;
 
-		Actor8::Actor8();
+		Actor8();
 		void synchronize(Serializer &s);
 
 		virtual void signal();
-- 
cgit v1.2.3


From c82a75df69aa5d8f36eae52deee508ef9a61e49e Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 22 Jan 2012 02:25:17 +0100
Subject: AGOS: Rework digital sound playback.

The BaseSound class does now only save the sound filename instead of a file
handle. When a new sound is started a new file handle is created, which
assures that each sound uses a different file handle and thus allows for
directly streaming sounds from disk.

This fixes bug #3475610
"AGOS: Wrong sound effects during intro of Simon 2 (DOS)".
---
 engines/agos/sound.cpp      | 326 ++++++++++++++++++--------------------------
 engines/agos/sound.h        |   2 +-
 engines/agos/subroutine.cpp |   2 +-
 3 files changed, 134 insertions(+), 196 deletions(-)

(limited to 'engines')

diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index 4917aefa4d..a3cbbfd134 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/sound.cpp
@@ -22,9 +22,9 @@
 
 #include "common/file.h"
 #include "common/memstream.h"
-#include "common/ptr.h"
 #include "common/textconsole.h"
 #include "common/util.h"
+#include "common/substream.h"
 
 #include "agos/agos.h"
 #include "agos/sound.h"
@@ -44,34 +44,39 @@ namespace AGOS {
 
 class BaseSound : Common::NonCopyable {
 protected:
-	Common::DisposablePtr<Common::File> _file;
+	const Common::String _filename;
 	uint32 *_offsets;
 	Audio::Mixer *_mixer;
 	bool _freeOffsets;
 
+	Common::SeekableReadStream *getSoundStream(uint sound) const;
 public:
-	BaseSound(Audio::Mixer *mixer, Common::File *file, uint32 base, bool bigEndian, DisposeAfterUse::Flag disposeFileAfterUse = DisposeAfterUse::YES);
-	BaseSound(Audio::Mixer *mixer, Common::File *file, uint32 *offsets, DisposeAfterUse::Flag disposeFileAfterUse = DisposeAfterUse::YES);
+	BaseSound(Audio::Mixer *mixer, const Common::String &filename, uint32 base, bool bigEndian);
+	BaseSound(Audio::Mixer *mixer, const Common::String &filename, uint32 *offsets);
 	virtual ~BaseSound();
 
 	void playSound(uint sound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol = 0) {
 		playSound(sound, sound, type, handle, loop, vol);
 	}
-	virtual void playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol = 0) = 0;
+	virtual void playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol = 0);
 	virtual Audio::AudioStream *makeAudioStream(uint sound) = 0;
 };
 
-BaseSound::BaseSound(Audio::Mixer *mixer, Common::File *file, uint32 base, bool bigEndian, DisposeAfterUse::Flag disposeFileAfterUse)
-	: _mixer(mixer), _file(file, disposeFileAfterUse) {
+BaseSound::BaseSound(Audio::Mixer *mixer, const Common::String &filename, uint32 base, bool bigEndian)
+	: _mixer(mixer), _filename(filename), _offsets(NULL) {
 
 	uint res = 0;
 	uint32 size;
 
-	_file->seek(base + sizeof(uint32), SEEK_SET);
+	Common::File file;
+	if (!file.open(_filename))
+		error("BaseSound: Could not open file \"%s\"", filename.c_str());
+
+	file.seek(base + sizeof(uint32), SEEK_SET);
 	if (bigEndian)
-		size = _file->readUint32BE();
+		size = file.readUint32BE();
 	else
-		size = _file->readUint32LE();
+		size = file.readUint32LE();
 
 	// The Feeble Files uses set amount of voice offsets
 	if (size == 0)
@@ -82,24 +87,20 @@ BaseSound::BaseSound(Audio::Mixer *mixer, Common::File *file, uint32 base, bool
 	_offsets = (uint32 *)malloc(size + sizeof(uint32));
 	_freeOffsets = true;
 
-	_file->seek(base, SEEK_SET);
+	file.seek(base, SEEK_SET);
 
 	for (uint i = 0; i < res; i++) {
 		if (bigEndian)
-			_offsets[i] = base + _file->readUint32BE();
+			_offsets[i] = base + file.readUint32BE();
 		else
-			_offsets[i] = base + _file->readUint32LE();
+			_offsets[i] = base + file.readUint32LE();
 	}
 
-	// only needed for mp3
-	_offsets[res] = _file->size();
+	_offsets[res] = file.size();
 }
 
-BaseSound::BaseSound(Audio::Mixer *mixer, Common::File *file, uint32 *offsets, DisposeAfterUse::Flag disposeFileAfterUse)
-	: _mixer(mixer), _file(file, disposeFileAfterUse) {
-
-	_offsets = offsets;
-	_freeOffsets = false;
+BaseSound::BaseSound(Audio::Mixer *mixer, const Common::String &filename, uint32 *offsets)
+	: _mixer(mixer), _filename(filename), _offsets(offsets), _freeOffsets(false) {
 }
 
 BaseSound::~BaseSound() {
@@ -107,6 +108,23 @@ BaseSound::~BaseSound() {
 		free(_offsets);
 }
 
+Common::SeekableReadStream *BaseSound::getSoundStream(uint sound) const {
+	if (_offsets == NULL)
+		return NULL;
+
+	Common::File *file = new Common::File();
+	if (!file->open(_filename)) {
+		warning("BaseSound::getSoundStream: Could not open file \"%s\"", _filename.c_str());
+		return NULL;
+	}
+
+	int i = 1;
+	while (_offsets[sound + i] == _offsets[sound])
+		i++;
+
+	return new Common::SeekableSubReadStream(file, _offsets[sound], _offsets[sound + i], DisposeAfterUse::YES);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 #pragma mark -
 
@@ -218,26 +236,25 @@ static void convertPan(int &pan) {
 ///////////////////////////////////////////////////////////////////////////////
 #pragma mark -
 
+// TODO: Move to a better place?
+void BaseSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol) {
+	convertVolume(vol);
+	_mixer->playStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
+}
+
 class WavSound : public BaseSound {
 public:
-	WavSound(Audio::Mixer *mixer, Common::File *file, uint32 base = 0, DisposeAfterUse::Flag disposeFileAfterUse = DisposeAfterUse::YES)
-		: BaseSound(mixer, file, base, false, disposeFileAfterUse) {}
-	WavSound(Audio::Mixer *mixer, Common::File *file, uint32 *offsets) : BaseSound(mixer, file, offsets) {}
+	WavSound(Audio::Mixer *mixer, const Common::String &filename, uint32 base = 0)
+		: BaseSound(mixer, filename, base, false) {}
+	WavSound(Audio::Mixer *mixer, const Common::String &filename, uint32 *offsets) : BaseSound(mixer, filename, offsets) {}
 	Audio::AudioStream *makeAudioStream(uint sound);
-	void playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol = 0);
 };
 
 Audio::AudioStream *WavSound::makeAudioStream(uint sound) {
-	if (_offsets == NULL)
+	Common::SeekableReadStream *tmp = getSoundStream(sound);
+	if (!tmp)
 		return NULL;
-
-	_file->seek(_offsets[sound], SEEK_SET);
-	return Audio::makeWAVStream(_file.get(), DisposeAfterUse::NO);
-}
-
-void WavSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol) {
-	convertVolume(vol);
-	_mixer->playStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
+	return Audio::makeWAVStream(tmp, DisposeAfterUse::YES);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -246,21 +263,16 @@ void WavSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType typ
 class VocSound : public BaseSound {
 	const byte _flags;
 public:
-	VocSound(Audio::Mixer *mixer, Common::File *file, bool isUnsigned, uint32 base = 0, bool bigEndian = false, DisposeAfterUse::Flag disposeFileAfterUse = DisposeAfterUse::YES)
-		: BaseSound(mixer, file, base, bigEndian, disposeFileAfterUse), _flags(isUnsigned ? Audio::FLAG_UNSIGNED : 0) {}
+	VocSound(Audio::Mixer *mixer, const Common::String &filename, bool isUnsigned, uint32 base = 0, bool bigEndian = false)
+		: BaseSound(mixer, filename, base, bigEndian), _flags(isUnsigned ? Audio::FLAG_UNSIGNED : 0) {}
 	Audio::AudioStream *makeAudioStream(uint sound);
-	void playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol = 0);
 };
 
 Audio::AudioStream *VocSound::makeAudioStream(uint sound) {
-	assert(_offsets);
-	_file->seek(_offsets[sound], SEEK_SET);
-	return Audio::makeVOCStream(_file.get(), _flags);
-}
-
-void VocSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol) {
-	convertVolume(vol);
-	_mixer->playStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
+	Common::SeekableReadStream *tmp = getSoundStream(sound);
+	if (!tmp)
+		return NULL;
+	return Audio::makeVOCStream(tmp, _flags, DisposeAfterUse::YES);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -270,8 +282,8 @@ void VocSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType typ
 class RawSound : public BaseSound {
 	const byte _flags;
 public:
-	RawSound(Audio::Mixer *mixer, Common::File *file, bool isUnsigned)
-		: BaseSound(mixer, file, 0, SOUND_BIG_ENDIAN), _flags(isUnsigned ? Audio::FLAG_UNSIGNED : 0) {}
+	RawSound(Audio::Mixer *mixer, const Common::String &filename, bool isUnsigned)
+		: BaseSound(mixer, filename, 0, SOUND_BIG_ENDIAN), _flags(isUnsigned ? Audio::FLAG_UNSIGNED : 0) {}
 	Audio::AudioStream *makeAudioStream(uint sound);
 	void playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol = 0);
 };
@@ -280,14 +292,15 @@ Audio::AudioStream *RawSound::makeAudioStream(uint sound) {
 	if (_offsets == NULL)
 		return NULL;
 
-	_file->seek(_offsets[sound], SEEK_SET);
-
-	uint size = _file->readUint32BE();
-	byte *buffer = (byte *)malloc(size);
-	assert(buffer);
-	_file->read(buffer, size);
-
-	return Audio::makeRawStream(buffer, size, 22050, _flags);
+	Common::File *file = new Common::File();
+	if (!file->open(_filename)) {
+		warning("RawSound::makeAudioStream: Could not open file \"%s\"", _filename.c_str());
+		return NULL;
+	}
+	
+	file->seek(_offsets[sound], SEEK_SET);
+	uint size = file->readUint32BE();
+	return Audio::makeRawStream(new Common::SeekableSubReadStream(file, _offsets[sound] + 4, _offsets[sound] + 4 + size, DisposeAfterUse::YES), 22050, _flags, DisposeAfterUse::YES);
 }
 
 void RawSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol) {
@@ -298,40 +311,15 @@ void RawSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType typ
 ///////////////////////////////////////////////////////////////////////////////
 #pragma mark -
 
-class CompressedSound : public BaseSound {
-public:
-	CompressedSound(Audio::Mixer *mixer, Common::File *file, uint32 base) : BaseSound(mixer, file, base, false) {}
-
-	Common::SeekableReadStream *loadStream(uint sound) const {
-		if (_offsets == NULL)
-			return NULL;
-
-		_file->seek(_offsets[sound], SEEK_SET);
-
-		int i = 1;
-		while (_offsets[sound + i] == _offsets[sound])
-			i++;
-
-		uint32 size = _offsets[sound + i] - _offsets[sound];
-
-		return _file->readStream(size);
-	}
-
-	void playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol = 0) {
-		convertVolume(vol);
-		_mixer->playStream(type, handle, new LoopingAudioStream(this, sound, loopSound, loop), -1, vol);
-	}
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 #pragma mark -
 
 #ifdef USE_MAD
-class MP3Sound : public CompressedSound {
+class MP3Sound : public BaseSound {
 public:
-	MP3Sound(Audio::Mixer *mixer, Common::File *file, uint32 base = 0) : CompressedSound(mixer, file, base) {}
+	MP3Sound(Audio::Mixer *mixer, const Common::String &filename, uint32 base = 0) : BaseSound(mixer, filename, base, false) {}
 	Audio::AudioStream *makeAudioStream(uint sound) {
-		Common::SeekableReadStream *tmp = loadStream(sound);
+		Common::SeekableReadStream *tmp = getSoundStream(sound);
 		if (!tmp)
 			return NULL;
 		return Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
@@ -343,11 +331,11 @@ public:
 #pragma mark -
 
 #ifdef USE_VORBIS
-class VorbisSound : public CompressedSound {
+class VorbisSound : public BaseSound {
 public:
-	VorbisSound(Audio::Mixer *mixer, Common::File *file, uint32 base = 0) : CompressedSound(mixer, file, base) {}
+	VorbisSound(Audio::Mixer *mixer, const Common::String &filename, uint32 base = 0) : BaseSound(mixer, filename, base, false) {}
 	Audio::AudioStream *makeAudioStream(uint sound) {
-		Common::SeekableReadStream *tmp = loadStream(sound);
+		Common::SeekableReadStream *tmp = getSoundStream(sound);
 		if (!tmp)
 			return NULL;
 		return Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
@@ -359,11 +347,11 @@ public:
 #pragma mark -
 
 #ifdef USE_FLAC
-class FLACSound : public CompressedSound {
+class FLACSound : public BaseSound {
 public:
-	FLACSound(Audio::Mixer *mixer, Common::File *file, uint32 base = 0) : CompressedSound(mixer, file, base) {}
+	FLACSound(Audio::Mixer *mixer, const Common::String &filename, uint32 base = 0) : BaseSound(mixer, filename, base, false) {}
 	Audio::AudioStream *makeAudioStream(uint sound) {
-		Common::SeekableReadStream *tmp = loadStream(sound);
+		Common::SeekableReadStream *tmp = getSoundStream(sound);
 		if (!tmp)
 			return NULL;
 		return Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
@@ -374,25 +362,23 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 #pragma mark -
 
-static CompressedSound *makeCompressedSound(Audio::Mixer *mixer, Common::File *file, const Common::String &basename) {
+static BaseSound *makeSound(Audio::Mixer *mixer, const Common::String &basename) {
 #ifdef USE_FLAC
-	file->open(basename + ".fla");
-	if (file->isOpen()) {
-		return new FLACSound(mixer, file);
-	}
+	if (Common::File::exists(basename + ".fla"))
+		return new FLACSound(mixer, basename + ".fla");
 #endif
 #ifdef USE_VORBIS
-	file->open(basename + ".ogg");
-	if (file->isOpen()) {
-		return new VorbisSound(mixer, file);
-	}
+	if (Common::File::exists(basename + ".ogg"))
+		return new FLACSound(mixer, basename + ".ogg");
 #endif
 #ifdef USE_MAD
-	file->open(basename + ".mp3");
-	if (file->isOpen()) {
-		return new MP3Sound(mixer, file);
-	}
+	if (Common::File::exists(basename + ".mp3"))
+		return new FLACSound(mixer, basename + ".mp3");
 #endif
+	if (Common::File::exists(basename + ".wav"))
+		return new WavSound(mixer, basename + ".wav");
+	if (Common::File::exists(basename + ".voc"))
+		return new VocSound(mixer, basename + ".voc", true);
 	return 0;
 }
 
@@ -441,90 +427,59 @@ Sound::~Sound() {
 
 void Sound::loadVoiceFile(const GameSpecificSettings *gss) {
 	// Game versions which use separate voice files
-	if (_vm->getGameType() == GType_FF || _vm->getGameId() == GID_SIMON1CD32)
+	if (_hasVoiceFile || _vm->getGameType() == GType_FF || _vm->getGameId() == GID_SIMON1CD32)
 		return;
 
+	_voice = makeSound(_mixer, gss->speech_filename);
+	_hasVoiceFile = (_voice != 0);
 
-	char filename[16];
-	Common::File *file = new Common::File();
+	if (_hasVoiceFile)
+		return;
 
-	if (!_hasVoiceFile) {
-		_voice = makeCompressedSound(_mixer, file, gss->speech_filename);
-		_hasVoiceFile = (_voice != 0);
-	}
-	if (!_hasVoiceFile && _vm->getGameType() == GType_SIMON2) {
+	if (_vm->getGameType() == GType_SIMON2) {
 		// for simon2 mac/amiga, only read index file
-		file->open("voices.idx");
-		if (file->isOpen() == true) {
-			int end = file->size();
+		Common::File file;
+		if (file.open("voices.idx")) {
+			int end = file.size();
 			_filenums = (uint16 *)malloc((end / 6 + 1) * 2);
 			_offsets = (uint32 *)malloc((end / 6 + 1) * 4);
 
 			for (int i = 1; i <= end / 6; i++) {
-				_filenums[i] = file->readUint16BE();
-				_offsets[i] = file->readUint32BE();
+				_filenums[i] = file.readUint16BE();
+				_offsets[i] = file.readUint32BE();
 			}
+
 			_hasVoiceFile = true;
-		}
-	}
-	if (!_hasVoiceFile) {
-		sprintf(filename, "%s.wav", gss->speech_filename);
-		file->open(filename);
-		if (file->isOpen()) {
-			_hasVoiceFile = true;
-			_voice = new WavSound(_mixer, file);
+			return;
 		}
 	}
 
 	const bool dataIsUnsigned = true;
 
-	if (!_hasVoiceFile) {
-		sprintf(filename, "%s.voc", gss->speech_filename);
-		file->open(filename);
-		if (file->isOpen()) {
-			_hasVoiceFile = true;
-			_voice = new VocSound(_mixer, file, dataIsUnsigned);
-		}
-	}
-	if (!_hasVoiceFile) {
-		sprintf(filename, "%s", gss->speech_filename);
-		file->open(filename);
-		if (file->isOpen()) {
-			_hasVoiceFile = true;
-			if (_vm->getGameType() == GType_PP)
-				_voice = new WavSound(_mixer, file);
-			else
-				_voice = new VocSound(_mixer, file, dataIsUnsigned);
-		}
+	if (Common::File::exists(gss->speech_filename)) {
+		_hasVoiceFile = true;
+		if (_vm->getGameType() == GType_PP)
+			_voice = new WavSound(_mixer, gss->speech_filename);
+		else
+			_voice = new VocSound(_mixer, gss->speech_filename, dataIsUnsigned);
 	}
 }
 
 void Sound::loadSfxFile(const GameSpecificSettings *gss) {
-	char filename[16];
-	Common::File *file = new Common::File();
+	if (_hasEffectsFile)
+		return;
 
-	if (!_hasEffectsFile) {
-		_effects = makeCompressedSound(_mixer, file, gss->effects_filename);
-		_hasEffectsFile = (_effects != 0);
-	}
+	_effects = makeSound(_mixer, gss->effects_filename);
+	_hasEffectsFile = (_effects != 0);
+
+	if (_hasEffectsFile)
+		return;
 
 	const bool dataIsUnsigned = true;
 
-	if (!_hasEffectsFile) {
-		sprintf(filename, "%s.voc", gss->effects_filename);
-		file->open(filename);
-		if (file->isOpen()) {
-			_hasEffectsFile = true;
-			_effects = new VocSound(_mixer, file, dataIsUnsigned);
-		}
-	}
-	if (!_hasEffectsFile) {
-		sprintf(filename, "%s", gss->effects_filename);
-		file->open(filename);
-		if (file->isOpen()) {
-			_hasEffectsFile = true;
-			_effects = new VocSound(_mixer, file, dataIsUnsigned);
-		}
+	if (Common::File::exists(gss->effects_filename)) {
+		_hasEffectsFile = true;
+		_effects = new VocSound(_mixer, gss->effects_filename, dataIsUnsigned);
 	}
 }
 
@@ -535,10 +490,7 @@ void Sound::readSfxFile(const Common::String &filename) {
 
 	_mixer->stopHandle(_effectsHandle);
 
-	Common::File *file = new Common::File();
-	file->open(filename);
-
-	if (file->isOpen() == false) {
+	if (!Common::File::exists(filename)) {
 		error("readSfxFile: Can't load sfx file %s", filename.c_str());
 	}
 
@@ -546,37 +498,34 @@ void Sound::readSfxFile(const Common::String &filename) {
 
 	delete _effects;
 	if (_vm->getGameId() == GID_SIMON1CD32) {
-		_effects = new VocSound(_mixer, file, dataIsUnsigned, 0, SOUND_BIG_ENDIAN);
+		_effects = new VocSound(_mixer, filename, dataIsUnsigned, 0, SOUND_BIG_ENDIAN);
 	} else
-		_effects = new WavSound(_mixer, file);
+		_effects = new WavSound(_mixer, filename);
 }
 
 // This method is only used by Simon2
-void Sound::loadSfxTable(Common::File *gameFile, uint32 base) {
+void Sound::loadSfxTable(const char *gameFilename, uint32 base) {
 	stopAll();
 
 	delete _effects;
 	const bool dataIsUnsigned = true;
 	if (_vm->getPlatform() == Common::kPlatformWindows)
-		_effects = new WavSound(_mixer, gameFile, base, DisposeAfterUse::NO);
+		_effects = new WavSound(_mixer, gameFilename, base);
 	else
-		_effects = new VocSound(_mixer, gameFile, dataIsUnsigned, base, false, DisposeAfterUse::NO);
+		_effects = new VocSound(_mixer, gameFilename, dataIsUnsigned, base, false);
 }
 
 // This method is only used by Simon1 Amiga CD32
 void Sound::readVoiceFile(const Common::String &filename) {
 	_mixer->stopHandle(_voiceHandle);
 
-	Common::File *file = new Common::File();
-	file->open(filename);
-
-	if (file->isOpen() == false)
+	if (!Common::File::exists(filename))
 		error("readVoiceFile: Can't load voice file %s", filename.c_str());
 
 	const bool dataIsUnsigned = false;
 
 	delete _voice;
-	_voice = new RawSound(_mixer, file, dataIsUnsigned);
+	_voice = new RawSound(_mixer, filename, dataIsUnsigned);
 }
 
 void Sound::playVoice(uint sound) {
@@ -587,13 +536,11 @@ void Sound::playVoice(uint sound) {
 			char filename[16];
 			_lastVoiceFile = _filenums[sound];
 			sprintf(filename, "voices%d.dat", _filenums[sound]);
-			Common::File *file = new Common::File();
-			file->open(filename);
-			if (file->isOpen() == false)
+			if (!Common::File::exists(filename))
 				error("playVoice: Can't load voice file %s", filename);
 
 			delete _voice;
-			_voice = new WavSound(_mixer, file, _offsets);
+			_voice = new WavSound(_mixer, filename, _offsets);
 		}
 	}
 
@@ -794,22 +741,13 @@ void Sound::switchVoiceFile(const GameSpecificSettings *gss, uint disc) {
 	_lastVoiceFile = disc;
 
 	char filename[16];
-	Common::File *file = new Common::File();
 
-	if (!_hasVoiceFile) {
-		sprintf(filename, "%s%u", gss->speech_filename, disc);
-		_voice = makeCompressedSound(_mixer, file, filename);
-		_hasVoiceFile = (_voice != 0);
-	}
-	if (!_hasVoiceFile) {
-		sprintf(filename, "%s%u.wav", gss->speech_filename, disc);
-		file->open(filename);
-		if (file->isOpen() == false) {
-			error("switchVoiceFile: Can't load voice file %s", filename);
-		}
-		_hasVoiceFile = true;
-		_voice = new WavSound(_mixer, file);
-	}
+	sprintf(filename, "%s%u", gss->speech_filename, disc);
+	_voice = makeSound(_mixer, filename);
+	_hasVoiceFile = (_voice != 0);
+
+	if (!_hasVoiceFile)
+		error("switchVoiceFile: Can't load voice file %s", filename);
 }
 
 } // End of namespace AGOS
diff --git a/engines/agos/sound.h b/engines/agos/sound.h
index ab4a3a963d..8633fe2f70 100644
--- a/engines/agos/sound.h
+++ b/engines/agos/sound.h
@@ -85,7 +85,7 @@ protected:
 
 public:
 	void readSfxFile(const Common::String &filename);
-	void loadSfxTable(Common::File *gameFile, uint32 base);
+	void loadSfxTable(const char *gameFilename, uint32 base);
 	void readVoiceFile(const Common::String &filename);
 
 	void playVoice(uint sound);
diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp
index 45cb370057..a319153bad 100644
--- a/engines/agos/subroutine.cpp
+++ b/engines/agos/subroutine.cpp
@@ -369,7 +369,7 @@ bool AGOSEngine_Waxworks::loadTablesIntoMem(uint16 subrId) {
 				readSubroutineBlock(in);
 				closeTablesFile(in);
 				if (getGameType() == GType_SIMON2) {
-					_sound->loadSfxTable(_gameFile, _gameOffsetsPtr[atoi(filename.c_str() + 6) - 1 + _soundIndexBase]);
+					_sound->loadSfxTable(getFileName(GAME_GMEFILE), _gameOffsetsPtr[atoi(filename.c_str() + 6) - 1 + _soundIndexBase]);
 				} else if (getGameType() == GType_SIMON1 && getPlatform() == Common::kPlatformWindows) {
 					filename.setChar('S', 0);
 					filename.setChar('F', 1);
-- 
cgit v1.2.3


From baafd74b660a65766ec7fa2b0c5215d884d0540b Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 26 Jan 2012 01:35:06 +0100
Subject: AGOS: Fix silly copy&paste mistake, which broke Vorbis and MP3
 support.

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

(limited to 'engines')

diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index a3cbbfd134..85c449eafc 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/sound.cpp
@@ -369,11 +369,11 @@ static BaseSound *makeSound(Audio::Mixer *mixer, const Common::String &basename)
 #endif
 #ifdef USE_VORBIS
 	if (Common::File::exists(basename + ".ogg"))
-		return new FLACSound(mixer, basename + ".ogg");
+		return new VorbisSound(mixer, basename + ".ogg");
 #endif
 #ifdef USE_MAD
 	if (Common::File::exists(basename + ".mp3"))
-		return new FLACSound(mixer, basename + ".mp3");
+		return new MP3Sound(mixer, basename + ".mp3");
 #endif
 	if (Common::File::exists(basename + ".wav"))
 		return new WavSound(mixer, basename + ".wav");
-- 
cgit v1.2.3


From 5db023646a8c685469bfe9dc551a282f8240ae04 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Thu, 26 Jan 2012 18:06:10 +0100
Subject: SCUMM: Use regular detection algorithms for FMTOWNS demos.

---
 engines/scumm/detection.cpp      | 23 -----------------------
 engines/scumm/detection_tables.h | 10 ++++++++++
 engines/scumm/scumm-md5.h        |  8 ++++----
 3 files changed, 14 insertions(+), 27 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index d925cc9198..3e1ad53ed6 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -971,9 +971,6 @@ GameList ScummMetaEngine::detectGames(const Common::FSList &fslist) const {
 
 	::detectGames(fslist, results, 0);
 
-	// TODO: We still don't handle the FM-TOWNS demos (like zakloom) very well.
-	// In particular, they are detected as ZakTowns, which is bad.
-
 	for (Common::List<DetectorResult>::iterator
 	          x = results.begin(); x != results.end(); ++x) {
 		const PlainGameDescriptor *g = findPlainGameDescriptor(x->game.gameid, gameDescriptions);
@@ -987,26 +984,6 @@ GameList ScummMetaEngine::detectGames(const Common::FSList &fslist) const {
 		// Based on generateComplexID() in advancedDetector.cpp.
 		dg["preferredtarget"] = generatePreferredTarget(*x);
 
-		// HACK: Detect and distinguish the FM-TOWNS demos
-		if (x->game.platform == Common::kPlatformFMTowns && (x->game.features & GF_DEMO)) {
-			if (x->md5 == "2d388339d6050d8ccaa757b64633954e") {
-				// Indy + Loom demo
-				dg.description() = "Indiana Jones and the Last Crusade & Loom";
-				dg.updateDesc(x->extra);
-				dg["preferredtarget"] = "indyloom";
-			} else if (x->md5 == "77f5c9cc0986eb729c1a6b4c8823bbae") {
-				// Zak + Loom demo
-				dg.description() = "Zak McKracken & Loom";
-				dg.updateDesc(x->extra);
-				dg["preferredtarget"] = "zakloom";
-			} else if (x->md5 == "3938ee1aa4433fca9d9308c9891172b1") {
-				// Indy + Zak demo
-				dg.description() = "Indiana Jones and the Last Crusade & Zak McKracken";
-				dg.updateDesc(x->extra);
-				dg["preferredtarget"] = "indyzak";
-			}
-		}
-
 		dg.setGUIOptions(x->game.guioptions + MidiDriver::musicType2GUIO(x->game.midi));
 		dg.appendGUIOptions(getGameGUIOptionsDescriptionLanguage(x->language));
 
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index d10c1df37f..a44497f193 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -70,6 +70,9 @@ static const PlainGameDescriptor gameDescriptions[] = {
 	{ "samnmax", "Sam & Max Hit the Road" },
 	{ "tentacle", "Day of the Tentacle" },
 	{ "zak", "Zak McKracken and the Alien Mindbenders" },
+	{ "indyloom", "Indiana Jones and the Last Crusade & Loom" },
+	{ "indyzak", "Indiana Jones and the Last Crusade & Zak McKracken" },
+	{ "zakloom", "Zak McKracken & Loom" },
 
 #ifdef ENABLE_SCUMM_7_8
 	{ "ft", "Full Throttle" },
@@ -210,6 +213,9 @@ static const GameSettings gameVariantsTable[] = {
 	{"zak", "V1",       "v1", GID_ZAK, 1, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI)},
 	{"zak", "V2",       "v2", GID_ZAK, 2, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI)},
 	{"zak", "FM-TOWNS",    0, GID_ZAK, 3, 0, MDT_TOWNS, GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_NOASPECT)},
+	{"zakloom", "FM-TOWNS",    0, GID_ZAK, 3, 0, MDT_TOWNS, GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_NOASPECT)},
+	{"indyloom", "FM-TOWNS",    0, GID_ZAK, 3, 0, MDT_TOWNS, GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_NOASPECT)},
+	{"indyzak", "FM-TOWNS",    0, GID_ZAK, 3, 0, MDT_TOWNS, GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_NOASPECT)},
 
 	{"indy3", "EGA",      "ega", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB, 0, UNK, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI)},
 	{"indy3", "No AdLib", "ega", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR,             0, UNK, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI)},
@@ -437,6 +443,10 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 
 	{ "indy3", "%02d.LFL", kGenRoomNum, UNK_LANG, UNK, 0 },
 
+	{ "indyloom", "%02d.LFL", kGenRoomNum, UNK_LANG, UNK, 0 },
+	{ "indyzak", "%02d.LFL", kGenRoomNum, UNK_LANG, UNK, 0 },
+	{ "zakloom", "%02d.LFL", kGenRoomNum, UNK_LANG, UNK, 0 },
+
 	{ "loom", "%02d.LFL", kGenRoomNum, UNK_LANG, UNK, 0 },
 	{ "loom", "%03d.LFL", kGenRoomNum, UNK_LANG, UNK, "VGA" },	// Loom CD
 
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 1649e2a5f9..301361d916 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 Jan  8 18:57:45 2012
+  This file was generated by the md5table tool on Sun Jan 22 19:25:34 2012
   DO NOT EDIT MANUALLY!
  */
 
@@ -129,7 +129,7 @@ static const MD5Table md5table[] = {
 	{ "2c04aacffb8428f30ccf4f734fbe3adc", "activity", "", "", -1, Common::EN_ANY, Common::kPlatformPC },
 	{ "2ccd8891ce4d3f1a334d21bff6a88ca2", "monkey", "CD", "", 9455, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "2d1e891fe52df707c30185e52c50cd92", "monkey", "CD", "CD", 8955, Common::EN_ANY, Common::kPlatformPC },
-	{ "2d388339d6050d8ccaa757b64633954e", "zak", "FM-TOWNS", "Demo", 7520, Common::EN_ANY, Common::kPlatformFMTowns },
+	{ "2d388339d6050d8ccaa757b64633954e", "indyloom", "FM-TOWNS", "Demo", 7520, Common::EN_ANY, Common::kPlatformFMTowns },
 	{ "2d4536a56e01da4b02eb021e7770afa2", "zak", "FM-TOWNS", "", 7520, Common::EN_ANY, Common::kPlatformFMTowns },
 	{ "2d4acbdcfd8e374c9da8c2e7303a5cd0", "BluesBirthday", "", "Demo", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "2d624d1b214f7faf0094daea65c6d1a6", "maniac", "Apple II", "", -1, Common::EN_ANY, Common::kPlatformApple2GS },
@@ -160,7 +160,7 @@ static const MD5Table md5table[] = {
 	{ "37ff1b308999c4cca7319edfcc1280a0", "puttputt", "HE 70", "Demo", 8269, Common::EN_ANY, Common::kPlatformWindows },
 	{ "3824e60cdf639d22f6df92a03dc4b131", "fbear", "HE 62", "", 7732, Common::EN_ANY, Common::kPlatformPC },
 	{ "387a544b8b10b26912d8413bab63a853", "monkey2", "", "Demo", -1, Common::EN_ANY, Common::kPlatformPC },
-	{ "3938ee1aa4433fca9d9308c9891172b1", "zak", "FM-TOWNS", "Demo", 7520, Common::EN_ANY, Common::kPlatformFMTowns },
+	{ "3938ee1aa4433fca9d9308c9891172b1", "indyzak", "FM-TOWNS", "Demo", 7520, Common::EN_ANY, Common::kPlatformFMTowns },
 	{ "399b217b0c8d65d0398076da486363a9", "indy3", "VGA", "VGA", 6295, Common::DE_DEU, Common::kPlatformPC },
 	{ "39cb9dec16fa16f38d79acd80effb059", "loom", "EGA", "EGA", -1, Common::FR_FRA, Common::kPlatformAmiga },
 	{ "39cb9dec16fa16f38d79acd80effb059", "loom", "EGA", "EGA", -1, Common::IT_ITA, Common::kPlatformAmiga },
@@ -329,7 +329,7 @@ static const MD5Table md5table[] = {
 	{ "76b66b43e593ad4d2f1dfb5cc8f19700", "spyfox", "HE 99", "", -1, Common::NL_NLD, Common::kPlatformWindows },
 	{ "771bc18ec6f93837b839c992b211904b", "monkey", "Demo", "EGA Demo", -1, Common::DE_DEU, Common::kPlatformPC },
 	{ "7766c9487f9d53a8cb0edabda5119c3d", "puttputt", "HE 60", "", 8022, Common::EN_ANY, Common::kPlatformPC },
-	{ "77f5c9cc0986eb729c1a6b4c8823bbae", "zak", "FM-TOWNS", "Demo", 7520, Common::EN_ANY, Common::kPlatformFMTowns },
+	{ "77f5c9cc0986eb729c1a6b4c8823bbae", "zakloom", "FM-TOWNS", "Demo", 7520, Common::EN_ANY, Common::kPlatformFMTowns },
 	{ "780e4a0ae2ff17dc296f4a79543b44f8", "puttmoon", "", "", -1, Common::UNK_LANG, Common::kPlatformPC },
 	{ "782393c5934ecd0b536eaf5fd541bd26", "pajama", "HE 100", "Updated", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "784b499c98d07260a30952685758636b", "pajama3", "", "Demo", 13911, Common::DE_DEU, Common::kPlatformWindows },
-- 
cgit v1.2.3


From a19eb264855b236b8d68dfaeb7e0f7a8dd6579a2 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Thu, 26 Jan 2012 19:44:17 +0100
Subject: GOB: Add the background plants in Geisha's Diving minigame

---
 engines/gob/minigames/geisha/diving.cpp | 101 ++++++++++++++++++++++++++++++--
 engines/gob/minigames/geisha/diving.h   |  33 +++++++++++
 2 files changed, 129 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index e3bc69a503..8fe3d63990 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -37,14 +37,22 @@ namespace Gob {
 
 namespace Geisha {
 
-static const int kEvilFishTypeCount = 3;
-
-static const int kEvilFishTypes[kEvilFishTypeCount][5] = {
+const uint16 Diving::kEvilFishTypes[kEvilFishTypeCount][5] = {
 	{ 0, 14,  8,  9, 3}, // Shark
 	{15,  1, 12, 13, 3}, // Moray
 	{16,  2, 10, 11, 3}  // Ray
 };
 
+const uint16 Diving::kPlantLevel1[] = { 18, 19, 20, 21 };
+const uint16 Diving::kPlantLevel2[] = { 22, 23, 24, 25 };
+const uint16 Diving::kPlantLevel3[] = { 26, 27, 28, 29, 30 };
+
+const Diving::PlantLevel Diving::kPlantLevels[] = {
+	{ 150, ARRAYSIZE(kPlantLevel1), kPlantLevel1 },
+	{ 120, ARRAYSIZE(kPlantLevel2), kPlantLevel2 },
+	{ 108, ARRAYSIZE(kPlantLevel3), kPlantLevel3 },
+};
+
 
 Diving::Diving(GobEngine *vm) : _vm(vm), _background(0),
 	_objects(0), _gui(0), _oko(0), _lungs(0), _heart(0),
@@ -63,6 +71,7 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 	init();
 	initScreen();
 	initCursor();
+	initPlants();
 
 	_vm->_draw->blitInvalidated();
 	_vm->_video->retrace();
@@ -71,6 +80,7 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 		checkShots();
 		updateEvilFish();
 		updateDecorFish();
+		updatePlants();
 		updateAnims();
 
 		_vm->_draw->animateCursor(1);
@@ -135,14 +145,24 @@ void Diving::init() {
 		_decorFish[i].decorFish = new ANIObject(*_objects);
 	}
 
+	for (uint i = 0; i < kPlantCount; i++) {
+		_plant[i].level   = i / kPlantPerLevelCount;
+		_plant[i].deltaX  = (kPlantLevelCount - _plant[i].level) * -2;
+
+		_plant[i].x = -1;
+		_plant[i].y = -1;
+
+		_plant[i].plant = new ANIObject(*_objects);
+	}
+
 	_decorFish[0].decorFish->setAnimation( 6); // Jellyfish
 	_decorFish[0].deltaX = 0;
 
 	_decorFish[1].decorFish->setAnimation(32); // Swarm of red/green fish
-	_decorFish[1].deltaX = -6;
+	_decorFish[1].deltaX = -5;
 
 	_decorFish[2].decorFish->setAnimation(33); // Swarm of orange fish
-	_decorFish[2].deltaX = -6;
+	_decorFish[2].deltaX = -5;
 
 	for (uint i = 0; i < kMaxShotCount; i++) {
 		_shot[i] = new ANIObject(*_objects);
@@ -168,6 +188,8 @@ void Diving::init() {
 		_anims.push_back(_decorFish[i].decorFish);
 	for (uint i = 0; i < kEvilFishCount; i++)
 		_anims.push_back(_evilFish[i].evilFish);
+	for (int i = kPlantCount - 1; i >= 0; i--)
+		_anims.push_back(_plant[i].plant);
 	_anims.push_back(_lungs);
 	_anims.push_back(_heart);
 
@@ -208,6 +230,12 @@ void Diving::deinit() {
 		_decorFish[i].decorFish = 0;
 	}
 
+	for (uint i = 0; i < kPlantCount; i++) {
+		delete _plant[i].plant;
+
+		_plant[i].plant = 0;
+	}
+
 	delete _heart;
 	delete _lungs;
 	delete _water;
@@ -259,6 +287,37 @@ void Diving::initCursor() {
 	_vm->_draw->_cursorHotspotY = 8;
 }
 
+
+void Diving::initPlants() {
+	for (uint i = 0; i < kPlantLevelCount; i++) {
+		for (uint j = 0; j < kPlantPerLevelCount; j++) {
+			int16 prevPlantX = -100;
+			if (j > 0)
+				prevPlantX = _plant[i * kPlantPerLevelCount + j - 1].x;
+
+			enterPlant(_plant[i * kPlantPerLevelCount + j], prevPlantX);
+		}
+	}
+}
+
+void Diving::enterPlant(ManagedPlant &plant, int16 prevPlantX) {
+	const PlantLevel &level = kPlantLevels[plant.level];
+	const uint anim = level.plants[_vm->_util->getRandom(kPlantLevels[plant.level].plantCount)];
+
+	plant.plant->setAnimation(anim);
+	plant.plant->rewind();
+
+	int16 width, height;
+	plant.plant->getFrameSize(width, height);
+
+	plant.x = prevPlantX + 150 - 10 + _vm->_util->getRandom(21);
+	plant.y = kPlantLevels[plant.level].y - height;
+
+	plant.plant->setPosition(plant.x, plant.y);
+	plant.plant->setVisible(true);
+	plant.plant->setPause(false);
+}
+
 void Diving::updateEvilFish() {
 	for (uint i = 0; i < kEvilFishCount; i++) {
 		ManagedEvilFish &fish = _evilFish[i];
@@ -333,6 +392,38 @@ void Diving::updateDecorFish() {
 	}
 }
 
+void Diving::updatePlants() {
+	for (uint i = 0; i < kPlantCount; i++) {
+		ManagedPlant &plant = _plant[i];
+
+		if (plant.plant->isVisible()) {
+			// Move the plant
+			plant.plant->setPosition(plant.x += plant.deltaX, plant.y);
+
+			// Check if the plant has left the screen
+			int16 x, y, width, height;
+			plant.plant->getFramePosition(x, y);
+			plant.plant->getFrameSize(width, height);
+
+			if ((x + width) <= 0) {
+				plant.plant->setVisible(false);
+				plant.plant->setPause(true);
+
+				plant.x = 0;
+			}
+
+		} else {
+			// Find the right-most plant in this level and enter the plant to the right of it
+
+			int16 rightX = 320;
+			for (uint j = 0; j < kPlantPerLevelCount; j++)
+				rightX = MAX(rightX, _plant[plant.level * kPlantPerLevelCount + j].x);
+
+			enterPlant(plant, rightX);
+		}
+	}
+}
+
 void Diving::foundBlackPearl() {
 	_blackPearlCount++;
 
diff --git a/engines/gob/minigames/geisha/diving.h b/engines/gob/minigames/geisha/diving.h
index e386d783d7..af224401e3 100644
--- a/engines/gob/minigames/geisha/diving.h
+++ b/engines/gob/minigames/geisha/diving.h
@@ -54,6 +54,26 @@ private:
 	static const uint kDecorFishCount =  3;
 	static const uint kMaxShotCount   = 10;
 
+	static const uint   kEvilFishTypeCount = 3;
+	static const uint16 kEvilFishTypes[kEvilFishTypeCount][5];
+
+	struct PlantLevel {
+		int16 y;
+		uint plantCount;
+		const uint16 *plants;
+	};
+
+	static const uint kPlantLevelCount    = 3;
+	static const uint kPlantPerLevelCount = 5;
+
+	static const uint16 kPlantLevel1[];
+	static const uint16 kPlantLevel2[];
+	static const uint16 kPlantLevel3[];
+
+	static const PlantLevel kPlantLevels[kPlantLevelCount];
+
+	static const uint kPlantCount = kPlantLevelCount * kPlantPerLevelCount;
+
 	struct ManagedEvilFish {
 		EvilFish *evilFish;
 
@@ -68,6 +88,14 @@ private:
 		int8 deltaX;
 	};
 
+	struct ManagedPlant {
+		ANIObject *plant;
+
+		uint level;
+		int8 deltaX;
+		int16 x, y;
+	};
+
 	GobEngine *_vm;
 
 	DECFile *_background;
@@ -81,6 +109,7 @@ private:
 
 	ManagedEvilFish  _evilFish[kEvilFishCount];
 	ManagedDecorFish _decorFish[kDecorFishCount];
+	ManagedPlant     _plant[kPlantCount];
 
 	ANIObject *_shot[kMaxShotCount];
 
@@ -106,12 +135,16 @@ private:
 
 	void initScreen();
 	void initCursor();
+	void initPlants();
+
+	void enterPlant(ManagedPlant &plant, int16 prevPlantX);
 
 	void foundBlackPearl();
 	void foundWhitePearl();
 
 	void updateEvilFish();
 	void updateDecorFish();
+	void updatePlants();
 	void updateAnims();
 
 	int16 checkInput(int16 &mouseX, int16 &mouseY, MouseButtons &mouseButtons);
-- 
cgit v1.2.3


From e0209358b7bcd71993e2665433a1178156459fe2 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Thu, 26 Jan 2012 21:13:38 +0100
Subject: GOB: Add pearls scrolling by on the ocean floor

---
 engines/gob/minigames/geisha/diving.cpp | 52 +++++++++++++++++++++++++++++++++
 engines/gob/minigames/geisha/diving.h   | 11 +++++++
 2 files changed, 63 insertions(+)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index 8fe3d63990..556d54e516 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -68,6 +68,8 @@ Diving::~Diving() {
 }
 
 bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
+	_hasPearlLocation = hasPearlLocation;
+
 	init();
 	initScreen();
 	initCursor();
@@ -81,6 +83,7 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 		updateEvilFish();
 		updateDecorFish();
 		updatePlants();
+		updatePearl();
 		updateAnims();
 
 		_vm->_draw->animateCursor(1);
@@ -155,6 +158,11 @@ void Diving::init() {
 		_plant[i].plant = new ANIObject(*_objects);
 	}
 
+	_pearl.pearl = new ANIObject(*_objects);
+	_pearl.black = false;
+
+	_pearl.pearl->setAnimation(4);
+
 	_decorFish[0].decorFish->setAnimation( 6); // Jellyfish
 	_decorFish[0].deltaX = 0;
 
@@ -184,6 +192,7 @@ void Diving::init() {
 	_anims.push_back(_water);
 	for (uint i = 0; i < kMaxShotCount; i++)
 		_anims.push_back(_shot[i]);
+	_anims.push_back(_pearl.pearl);
 	for (uint i = 0; i < kDecorFishCount; i++)
 		_anims.push_back(_decorFish[i].decorFish);
 	for (uint i = 0; i < kEvilFishCount; i++)
@@ -236,6 +245,9 @@ void Diving::deinit() {
 		_plant[i].plant = 0;
 	}
 
+	delete _pearl.pearl;
+	_pearl.pearl = 0;
+
 	delete _heart;
 	delete _lungs;
 	delete _water;
@@ -316,6 +328,27 @@ void Diving::enterPlant(ManagedPlant &plant, int16 prevPlantX) {
 	plant.plant->setPosition(plant.x, plant.y);
 	plant.plant->setVisible(true);
 	plant.plant->setPause(false);
+
+	if (plant.x > 320)
+		enterPearl(plant.x);
+}
+
+void Diving::enterPearl(int16 x) {
+	// Only one pearl is ever visible
+	if (_pearl.pearl->isVisible())
+		return;
+
+	// Only every 4th potential pearl position has a pearl
+	if (_vm->_util->getRandom(4) != 0)
+		return;
+
+	// Every 5th pearl is a black one, but only if the location is correct
+	_pearl.black = _hasPearlLocation && (_vm->_util->getRandom(5) == 0);
+
+	_pearl.pearl->setPosition(x + 80, 130);
+
+	_pearl.pearl->setVisible(true);
+	_pearl.pearl->setPause(false);
 }
 
 void Diving::updateEvilFish() {
@@ -424,6 +457,25 @@ void Diving::updatePlants() {
 	}
 }
 
+void Diving::updatePearl() {
+	if (!_pearl.pearl->isVisible())
+		return;
+
+	// Move the pearl
+	int16 x, y, width, height;
+	_pearl.pearl->getPosition(x, y);
+	_pearl.pearl->setPosition(x - 5, y);
+
+	// Check if the pearl has left the screen
+	_pearl.pearl->getFramePosition(x, y);
+	_pearl.pearl->getFrameSize(width, height);
+
+	if ((x + width) <= 0) {
+		_pearl.pearl->setVisible(false);
+		_pearl.pearl->setPause(true);
+	}
+}
+
 void Diving::foundBlackPearl() {
 	_blackPearlCount++;
 
diff --git a/engines/gob/minigames/geisha/diving.h b/engines/gob/minigames/geisha/diving.h
index af224401e3..ee2f8d8451 100644
--- a/engines/gob/minigames/geisha/diving.h
+++ b/engines/gob/minigames/geisha/diving.h
@@ -96,6 +96,12 @@ private:
 		int16 x, y;
 	};
 
+	struct ManagedPearl {
+		ANIObject *pearl;
+
+		bool black;
+	};
+
 	GobEngine *_vm;
 
 	DECFile *_background;
@@ -110,6 +116,7 @@ private:
 	ManagedEvilFish  _evilFish[kEvilFishCount];
 	ManagedDecorFish _decorFish[kDecorFishCount];
 	ManagedPlant     _plant[kPlantCount];
+	ManagedPearl     _pearl;
 
 	ANIObject *_shot[kMaxShotCount];
 
@@ -129,6 +136,8 @@ private:
 	SoundDesc _soundWhitePearl;
 	SoundDesc _soundBlackPearl;
 
+	bool _hasPearlLocation;
+
 
 	void init();
 	void deinit();
@@ -138,6 +147,7 @@ private:
 	void initPlants();
 
 	void enterPlant(ManagedPlant &plant, int16 prevPlantX);
+	void enterPearl(int16 x);
 
 	void foundBlackPearl();
 	void foundWhitePearl();
@@ -145,6 +155,7 @@ private:
 	void updateEvilFish();
 	void updateDecorFish();
 	void updatePlants();
+	void updatePearl();
 	void updateAnims();
 
 	int16 checkInput(int16 &mouseX, int16 &mouseY, MouseButtons &mouseButtons);
-- 
cgit v1.2.3


From 9d348f46ad1a7729661867564d4e8ed254244710 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Fri, 27 Jan 2012 14:27:16 +0100
Subject: GOB: Add a controlable Oko to Geisha's Diving minigame

Still missing:
  - Air, constantly decreasing, fill up with breathing
  - Health, decreases by collision with evil fish
  - Death, when health == 0
  - Picking up pearls
---
 engines/gob/minigames/geisha/diving.cpp |  42 ++++++++++--
 engines/gob/minigames/geisha/diving.h   |   5 +-
 engines/gob/minigames/geisha/oko.cpp    | 117 ++++++++++++++++++++++++++++++++
 engines/gob/minigames/geisha/oko.h      |  66 ++++++++++++++++++
 engines/gob/module.mk                   |   1 +
 5 files changed, 226 insertions(+), 5 deletions(-)
 create mode 100644 engines/gob/minigames/geisha/oko.cpp
 create mode 100644 engines/gob/minigames/geisha/oko.h

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index 556d54e516..1f5c025f2d 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -31,6 +31,7 @@
 #include "gob/sound/sound.h"
 
 #include "gob/minigames/geisha/evilfish.h"
+#include "gob/minigames/geisha/oko.h"
 #include "gob/minigames/geisha/diving.h"
 
 namespace Gob {
@@ -55,10 +56,26 @@ const Diving::PlantLevel Diving::kPlantLevels[] = {
 
 
 Diving::Diving(GobEngine *vm) : _vm(vm), _background(0),
-	_objects(0), _gui(0), _oko(0), _lungs(0), _heart(0),
+	_objects(0), _gui(0), _okoAnim(0), _lungs(0), _heart(0),
 	_blackPearl(0), _whitePearlCount(0), _blackPearlCount(0) {
 
 	_blackPearl = new Surface(11, 8, 1);
+
+	for (uint i = 0; i < kEvilFishCount; i++)
+		_evilFish[i].evilFish = 0;
+
+	for (uint i = 0; i < kDecorFishCount; i++)
+		_decorFish[i].decorFish = 0;
+
+	for (uint i = 0; i < kPlantCount; i++)
+		_plant[i].plant = 0;
+
+	for (uint i = 0; i < kMaxShotCount; i++)
+		_shot[i] = 0;
+
+	_pearl.pearl = 0;
+
+	_oko = 0;
 }
 
 Diving::~Diving() {
@@ -103,6 +120,11 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 		if (mouseButtons == kMouseButtonsLeft)
 			shoot(mouseX, mouseY);
 
+		if      (key == kKeyDown)
+			_oko->sink();
+		else if (key == kKeyUp)
+			_oko->raise();
+
 		if ((_whitePearlCount >= 20) || (_blackPearlCount >= 2))
 			break;
 	}
@@ -115,7 +137,7 @@ void Diving::init() {
 	_background = new DECFile(_vm, "tperle.dec"  , 320, 200);
 	_objects    = new ANIFile(_vm, "tperle.ani"  , 320);
 	_gui        = new ANIFile(_vm, "tperlcpt.ani", 320);
-	_oko        = new ANIFile(_vm, "tplonge.ani" , 320);
+	_okoAnim    = new ANIFile(_vm, "tplonge.ani" , 320);
 
 	_water = new ANIObject(*_objects);
 	_lungs = new ANIObject(*_gui);
@@ -179,6 +201,8 @@ void Diving::init() {
 		_shot[i]->setMode(ANIObject::kModeOnce);
 	}
 
+	_oko = new Oko(*_okoAnim);
+
 	Surface tmp(320, 103, 1);
 
 	_vm->_video->drawPackedSprite("tperlobj.cmp", tmp);
@@ -199,6 +223,7 @@ void Diving::init() {
 		_anims.push_back(_evilFish[i].evilFish);
 	for (int i = kPlantCount - 1; i >= 0; i--)
 		_anims.push_back(_plant[i].plant);
+	_anims.push_back(_oko);
 	_anims.push_back(_lungs);
 	_anims.push_back(_heart);
 
@@ -248,11 +273,14 @@ void Diving::deinit() {
 	delete _pearl.pearl;
 	_pearl.pearl = 0;
 
+	delete _oko;
+	_oko = 0;
+
 	delete _heart;
 	delete _lungs;
 	delete _water;
 
-	delete _oko;
+	delete _okoAnim;
 	delete _gui;
 	delete _objects;
 	delete _background;
@@ -261,7 +289,7 @@ void Diving::deinit() {
 	_heart = 0;
 	_lungs = 0;
 
-	_oko        = 0;
+	_okoAnim    = 0;
 	_gui        = 0;
 	_objects    = 0;
 	_background = 0;
@@ -426,6 +454,9 @@ void Diving::updateDecorFish() {
 }
 
 void Diving::updatePlants() {
+	if (_oko->getState() == Oko::kStateBreathe)
+		return;
+
 	for (uint i = 0; i < kPlantCount; i++) {
 		ManagedPlant &plant = _plant[i];
 
@@ -461,6 +492,9 @@ void Diving::updatePearl() {
 	if (!_pearl.pearl->isVisible())
 		return;
 
+	if (_oko->getState() == Oko::kStateBreathe)
+		return;
+
 	// Move the pearl
 	int16 x, y, width, height;
 	_pearl.pearl->getPosition(x, y);
diff --git a/engines/gob/minigames/geisha/diving.h b/engines/gob/minigames/geisha/diving.h
index ee2f8d8451..eeee4df07c 100644
--- a/engines/gob/minigames/geisha/diving.h
+++ b/engines/gob/minigames/geisha/diving.h
@@ -40,6 +40,7 @@ class ANIObject;
 namespace Geisha {
 
 class EvilFish;
+class Oko;
 
 /** Geisha's "Diving" minigame. */
 class Diving {
@@ -107,7 +108,7 @@ private:
 	DECFile *_background;
 	ANIFile *_objects;
 	ANIFile *_gui;
-	ANIFile *_oko;
+	ANIFile *_okoAnim;
 
 	ANIObject *_water;
 	ANIObject *_lungs;
@@ -118,6 +119,8 @@ private:
 	ManagedPlant     _plant[kPlantCount];
 	ManagedPearl     _pearl;
 
+	Oko *_oko;
+
 	ANIObject *_shot[kMaxShotCount];
 
 	Common::List<int> _activeShots;
diff --git a/engines/gob/minigames/geisha/oko.cpp b/engines/gob/minigames/geisha/oko.cpp
new file mode 100644
index 0000000000..24a6c8053e
--- /dev/null
+++ b/engines/gob/minigames/geisha/oko.cpp
@@ -0,0 +1,117 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 "gob/minigames/geisha/oko.h"
+
+namespace Gob {
+
+namespace Geisha {
+
+enum kOkoAnimation {
+	kOkoAnimationEnter   = 0,
+	kOkoAnimationSwim    = 1,
+	kOkoAnimationSink    = 8,
+	kOkoAnimationRaise   = 7,
+	kOkoAnimationBreathe = 2
+};
+
+static const int16 kOkoPositionX = 110;
+
+static const uint kLevelCount = 3;
+static const int16 kLevelPositionX[kLevelCount] = { 44, 84, 124 };
+
+
+Oko::Oko(const ANIFile &ani) : ANIObject(ani), _state(kStateEnter), _level(0) {
+	setAnimation(kOkoAnimationEnter);
+	setVisible(true);
+}
+
+Oko::~Oko() {
+}
+
+void Oko::advance() {
+	bool wasLastFrame = lastFrame();
+
+	ANIObject::advance();
+
+	switch (_state) {
+		case kStateEnter:
+			if (wasLastFrame) {
+				setAnimation(kOkoAnimationSwim);
+				setPosition(kOkoPositionX, kLevelPositionX[_level]);
+				_state = kStateSwim;
+			}
+			break;
+
+		case kStateSink:
+		case kStateRaise:
+		case kStateBreathe:
+			if (wasLastFrame) {
+				setAnimation(kOkoAnimationSwim);
+				setPosition(kOkoPositionX, kLevelPositionX[_level]);
+				_state = kStateSwim;
+			}
+			break;
+
+		default:
+			break;
+	}
+}
+
+void Oko::sink() {
+	if (_state != kStateSwim)
+		return;
+
+	if (_level >= (kLevelCount - 1))
+		return;
+
+	setAnimation(kOkoAnimationSink);
+	setPosition(kOkoPositionX, kLevelPositionX[_level]);
+	_state = kStateSink;
+
+	_level++;
+}
+
+void Oko::raise() {
+	if (_state != kStateSwim)
+		return;
+
+	if (_level == 0) {
+		setAnimation(kOkoAnimationBreathe);
+		_state = kStateBreathe;
+		return;
+	}
+
+	setAnimation(kOkoAnimationRaise);
+	setPosition(kOkoPositionX, kLevelPositionX[_level]);
+	_state = kStateSink;
+
+	_level--;
+}
+
+Oko::State Oko::getState() const {
+	return _state;
+}
+
+} // End of namespace Geisha
+
+} // End of namespace Gob
diff --git a/engines/gob/minigames/geisha/oko.h b/engines/gob/minigames/geisha/oko.h
new file mode 100644
index 0000000000..7e56315c9c
--- /dev/null
+++ b/engines/gob/minigames/geisha/oko.h
@@ -0,0 +1,66 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 GOB_MINIGAMES_GEISHA_OKO_H
+#define GOB_MINIGAMES_GEISHA_OKO_H
+
+#include "gob/aniobject.h"
+
+namespace Gob {
+
+namespace Geisha {
+
+/** Oko, the person you control, in Geisha's "Diving" minigame. */
+class Oko : public ANIObject {
+public:
+	enum State {
+		kStateEnter,
+		kStateSwim,
+		kStateSink,
+		kStateRaise,
+		kStateBreathe
+	};
+
+	Oko(const ANIFile &ani);
+	~Oko();
+
+	/** Advance the animation to the next frame. */
+	void advance();
+
+	/** Oko should sink a level. */
+	void sink();
+	/** Oko should raise a level. */
+	void raise();
+
+	State getState() const;
+
+private:
+	State _state;
+
+	uint8 _level;
+};
+
+} // End of namespace Geisha
+
+} // End of namespace Gob
+
+#endif // GOB_MINIGAMES_GEISHA_OKO_H
diff --git a/engines/gob/module.mk b/engines/gob/module.mk
index bf040c5428..6adf99f669 100644
--- a/engines/gob/module.mk
+++ b/engines/gob/module.mk
@@ -74,6 +74,7 @@ MODULE_OBJS := \
 	demos/scnplayer.o \
 	demos/batplayer.o \
 	minigames/geisha/evilfish.o \
+	minigames/geisha/oko.o \
 	minigames/geisha/diving.o \
 	minigames/geisha/penetration.o \
 	save/savefile.o \
-- 
cgit v1.2.3


From 841462721686488a41588410418f4e5ff46dac76 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Fri, 27 Jan 2012 14:45:41 +0100
Subject: GOB: Play Oko's breathing sound

---
 engines/gob/minigames/geisha/diving.cpp | 12 ++++++------
 engines/gob/minigames/geisha/oko.cpp    | 10 ++++++++--
 engines/gob/minigames/geisha/oko.h      |  8 +++++++-
 engines/gob/sound/bgatmosphere.h        |  1 +
 4 files changed, 22 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index 1f5c025f2d..e08902ac95 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -134,6 +134,11 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 }
 
 void Diving::init() {
+	_vm->_sound->sampleLoad(&_soundShoot     , SOUND_SND, "tirgim.snd");
+	_vm->_sound->sampleLoad(&_soundBreathe   , SOUND_SND, "respir.snd");
+	_vm->_sound->sampleLoad(&_soundWhitePearl, SOUND_SND, "virtou.snd");
+	_vm->_sound->sampleLoad(&_soundBlackPearl, SOUND_SND, "trouve.snd");
+
 	_background = new DECFile(_vm, "tperle.dec"  , 320, 200);
 	_objects    = new ANIFile(_vm, "tperle.ani"  , 320);
 	_gui        = new ANIFile(_vm, "tperlcpt.ani", 320);
@@ -201,7 +206,7 @@ void Diving::init() {
 		_shot[i]->setMode(ANIObject::kModeOnce);
 	}
 
-	_oko = new Oko(*_okoAnim);
+	_oko = new Oko(*_okoAnim, *_vm->_sound, _soundBreathe);
 
 	Surface tmp(320, 103, 1);
 
@@ -226,11 +231,6 @@ void Diving::init() {
 	_anims.push_back(_oko);
 	_anims.push_back(_lungs);
 	_anims.push_back(_heart);
-
-	_vm->_sound->sampleLoad(&_soundShoot     , SOUND_SND, "tirgim.snd");
-	_vm->_sound->sampleLoad(&_soundBreathe   , SOUND_SND, "respir.snd");
-	_vm->_sound->sampleLoad(&_soundWhitePearl, SOUND_SND, "virtou.snd");
-	_vm->_sound->sampleLoad(&_soundBlackPearl, SOUND_SND, "trouve.snd");
 }
 
 void Diving::deinit() {
diff --git a/engines/gob/minigames/geisha/oko.cpp b/engines/gob/minigames/geisha/oko.cpp
index 24a6c8053e..f8536eab3f 100644
--- a/engines/gob/minigames/geisha/oko.cpp
+++ b/engines/gob/minigames/geisha/oko.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include "gob/sound/sound.h"
+
 #include "gob/minigames/geisha/oko.h"
 
 namespace Gob {
@@ -40,7 +42,9 @@ static const uint kLevelCount = 3;
 static const int16 kLevelPositionX[kLevelCount] = { 44, 84, 124 };
 
 
-Oko::Oko(const ANIFile &ani) : ANIObject(ani), _state(kStateEnter), _level(0) {
+Oko::Oko(const ANIFile &ani, Sound &sound, SoundDesc &breathe) :
+	ANIObject(ani), _sound(&sound), _breathe(&breathe), _state(kStateEnter), _level(0) {
+
 	setAnimation(kOkoAnimationEnter);
 	setVisible(true);
 }
@@ -62,9 +66,11 @@ void Oko::advance() {
 			}
 			break;
 
+		case kStateBreathe:
+			if ((getFrame() == 6) || (getFrame() == 23))
+			_sound->blasterPlay(_breathe, 1, 0);
 		case kStateSink:
 		case kStateRaise:
-		case kStateBreathe:
 			if (wasLastFrame) {
 				setAnimation(kOkoAnimationSwim);
 				setPosition(kOkoPositionX, kLevelPositionX[_level]);
diff --git a/engines/gob/minigames/geisha/oko.h b/engines/gob/minigames/geisha/oko.h
index 7e56315c9c..e44d273a73 100644
--- a/engines/gob/minigames/geisha/oko.h
+++ b/engines/gob/minigames/geisha/oko.h
@@ -27,6 +27,9 @@
 
 namespace Gob {
 
+class Sound;
+class SoundDesc;
+
 namespace Geisha {
 
 /** Oko, the person you control, in Geisha's "Diving" minigame. */
@@ -40,7 +43,7 @@ public:
 		kStateBreathe
 	};
 
-	Oko(const ANIFile &ani);
+	Oko(const ANIFile &ani, Sound &sound, SoundDesc &breathe);
 	~Oko();
 
 	/** Advance the animation to the next frame. */
@@ -54,6 +57,9 @@ public:
 	State getState() const;
 
 private:
+	Sound *_sound;
+	SoundDesc *_breathe;
+
 	State _state;
 
 	uint8 _level;
diff --git a/engines/gob/sound/bgatmosphere.h b/engines/gob/sound/bgatmosphere.h
index e88b91d540..23fcc8a71a 100644
--- a/engines/gob/sound/bgatmosphere.h
+++ b/engines/gob/sound/bgatmosphere.h
@@ -24,6 +24,7 @@
 #define GOB_SOUND_BGATMOSPHERE_H
 
 #include "audio/mixer.h"
+#include "common/array.h"
 #include "common/mutex.h"
 #include "common/random.h"
 
-- 
cgit v1.2.3


From cf45f49f72dba59c94ac4d2c0e1bcbebf1482b8f Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Fri, 27 Jan 2012 14:55:32 +0100
Subject: GOB: Picking up pearls

---
 engines/gob/minigames/geisha/diving.cpp | 35 +++++++++++++++++++++++++++++++--
 engines/gob/minigames/geisha/diving.h   |  2 ++
 engines/gob/minigames/geisha/oko.cpp    |  4 ++++
 engines/gob/minigames/geisha/oko.h      |  2 ++
 4 files changed, 41 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index e08902ac95..d59d3430ad 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -120,9 +120,12 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 		if (mouseButtons == kMouseButtonsLeft)
 			shoot(mouseX, mouseY);
 
-		if      (key == kKeyDown)
+		if (key == kKeyDown) {
+			if (_oko->isAtBottom())
+				getPearl();
+
 			_oko->sink();
-		else if (key == kKeyUp)
+		} else if (key == kKeyUp)
 			_oko->raise();
 
 		if ((_whitePearlCount >= 20) || (_blackPearlCount >= 2))
@@ -510,6 +513,30 @@ void Diving::updatePearl() {
 	}
 }
 
+void Diving::getPearl() {
+	if (!_pearl.pearl->isVisible())
+		return;
+
+	// Make sure the pearl is within Oko's grasp
+
+	int16 x, y, width, height;
+	_pearl.pearl->getFramePosition(x, y);
+	_pearl.pearl->getFrameSize(width, height);
+
+	if ((x > 175) || ((x + width) < 168))
+		return;
+
+	// Remove the pearl
+	_pearl.pearl->setVisible(false);
+	_pearl.pearl->setPause(true);
+
+	// Add the pearl to our found pearls repository
+	if (_pearl.black)
+		foundBlackPearl();
+	else
+		foundWhitePearl();
+}
+
 void Diving::foundBlackPearl() {
 	_blackPearlCount++;
 
@@ -520,6 +547,8 @@ void Diving::foundBlackPearl() {
 		_vm->_draw->_backSurface->blit(*_blackPearl, 0, 0, 10, 7, 160, 179, 0);
 		_vm->_draw->dirtiedRect(_vm->_draw->_backSurface, 147, 179, 160, 186);
 	}
+
+	_vm->_sound->blasterPlay(&_soundBlackPearl, 1, 0);
 }
 
 void Diving::foundWhitePearl() {
@@ -531,6 +560,8 @@ void Diving::foundWhitePearl() {
 
 	_background->drawLayer(*_vm->_draw->_backSurface, 0, 2, x, 177, 0);
 	_vm->_draw->dirtiedRect(_vm->_draw->_backSurface, x, 177, x + 3, 180);
+
+	_vm->_sound->blasterPlay(&_soundWhitePearl, 1, 0);
 }
 
 void Diving::updateAnims() {
diff --git a/engines/gob/minigames/geisha/diving.h b/engines/gob/minigames/geisha/diving.h
index eeee4df07c..b00252ca0a 100644
--- a/engines/gob/minigames/geisha/diving.h
+++ b/engines/gob/minigames/geisha/diving.h
@@ -152,6 +152,8 @@ private:
 	void enterPlant(ManagedPlant &plant, int16 prevPlantX);
 	void enterPearl(int16 x);
 
+	void getPearl();
+
 	void foundBlackPearl();
 	void foundWhitePearl();
 
diff --git a/engines/gob/minigames/geisha/oko.cpp b/engines/gob/minigames/geisha/oko.cpp
index f8536eab3f..e4cf32f5b2 100644
--- a/engines/gob/minigames/geisha/oko.cpp
+++ b/engines/gob/minigames/geisha/oko.cpp
@@ -118,6 +118,10 @@ Oko::State Oko::getState() const {
 	return _state;
 }
 
+bool Oko::isAtBottom() const {
+	return _level >= (kLevelCount - 1);
+}
+
 } // End of namespace Geisha
 
 } // End of namespace Gob
diff --git a/engines/gob/minigames/geisha/oko.h b/engines/gob/minigames/geisha/oko.h
index e44d273a73..892f0b81fa 100644
--- a/engines/gob/minigames/geisha/oko.h
+++ b/engines/gob/minigames/geisha/oko.h
@@ -56,6 +56,8 @@ public:
 
 	State getState() const;
 
+	bool isAtBottom() const;
+
 private:
 	Sound *_sound;
 	SoundDesc *_breathe;
-- 
cgit v1.2.3


From 0fd9abfe01d517c12b6855b6777a7e062ec1cc78 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Fri, 27 Jan 2012 15:07:26 +0100
Subject: GOB: Play the correct animation when Oko's picking up pearls

---
 engines/gob/minigames/geisha/diving.cpp |  4 ++--
 engines/gob/minigames/geisha/oko.cpp    | 17 +++++++++++++++--
 engines/gob/minigames/geisha/oko.h      |  3 ++-
 3 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index d59d3430ad..4b08a21fb4 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -121,10 +121,10 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 			shoot(mouseX, mouseY);
 
 		if (key == kKeyDown) {
-			if (_oko->isAtBottom())
+			_oko->sink();
+			if ((_oko->getState() == Oko::kStatePick) && (_oko->getFrame() == 0))
 				getPearl();
 
-			_oko->sink();
 		} else if (key == kKeyUp)
 			_oko->raise();
 
diff --git a/engines/gob/minigames/geisha/oko.cpp b/engines/gob/minigames/geisha/oko.cpp
index e4cf32f5b2..5da1947acf 100644
--- a/engines/gob/minigames/geisha/oko.cpp
+++ b/engines/gob/minigames/geisha/oko.cpp
@@ -33,7 +33,8 @@ enum kOkoAnimation {
 	kOkoAnimationSwim    = 1,
 	kOkoAnimationSink    = 8,
 	kOkoAnimationRaise   = 7,
-	kOkoAnimationBreathe = 2
+	kOkoAnimationBreathe = 2,
+	kOkoAnimationPick    = 3
 };
 
 static const int16 kOkoPositionX = 110;
@@ -78,6 +79,15 @@ void Oko::advance() {
 			}
 			break;
 
+		case kStatePick:
+			if (wasLastFrame) {
+				_level = 1;
+				setAnimation(kOkoAnimationSwim);
+				setPosition(kOkoPositionX, kLevelPositionX[_level]);
+				_state = kStateSwim;
+			}
+			break;
+
 		default:
 			break;
 	}
@@ -87,8 +97,11 @@ void Oko::sink() {
 	if (_state != kStateSwim)
 		return;
 
-	if (_level >= (kLevelCount - 1))
+	if (_level >= (kLevelCount - 1)) {
+		setAnimation(kOkoAnimationPick);
+		_state = kStatePick;
 		return;
+	}
 
 	setAnimation(kOkoAnimationSink);
 	setPosition(kOkoPositionX, kLevelPositionX[_level]);
diff --git a/engines/gob/minigames/geisha/oko.h b/engines/gob/minigames/geisha/oko.h
index 892f0b81fa..0dee53ce45 100644
--- a/engines/gob/minigames/geisha/oko.h
+++ b/engines/gob/minigames/geisha/oko.h
@@ -40,7 +40,8 @@ public:
 		kStateSwim,
 		kStateSink,
 		kStateRaise,
-		kStateBreathe
+		kStateBreathe,
+		kStatePick
 	};
 
 	Oko(const ANIFile &ani, Sound &sound, SoundDesc &breathe);
-- 
cgit v1.2.3


From a7cc5bd301bd0d5c55390de8c421eff91a8458b5 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 27 Jan 2012 20:04:40 +0100
Subject: AGOS: Properly overwrite hasFile from SearchSet in ArchiveMan.

Formerly the hasFile method was non-const, thus did not overwrite the virtual
hasFile method of SearchSet. Since all accesses to this function have been
done through a ArchiveMan typed variable, the missing overwrite should not
have caused any trouble.

It looks like this was forgotten in a6ec4f70da120a1ce406ed4dd9e149e081542f59.
---
 engines/agos/agos.h  | 2 +-
 engines/agos/res.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 03feafa70f..d171902133 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -197,7 +197,7 @@ public:
 	void registerArchive(const Common::String &filename, int priority);
 #endif
 
-	bool hasFile(const Common::String &name);
+	virtual bool hasFile(const Common::String &name) const;
 	Common::SeekableReadStream *open(const Common::String &filename);
 
 private:
diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp
index 62197340d2..284b252d91 100644
--- a/engines/agos/res.cpp
+++ b/engines/agos/res.cpp
@@ -47,7 +47,7 @@ void ArchiveMan::registerArchive(const Common::String &filename, int priority) {
 }
 #endif
 
-bool ArchiveMan::hasFile(const Common::String &name) {
+bool ArchiveMan::hasFile(const Common::String &name) const {
 	if (_fallBack && SearchMan.hasFile(name))
 		return true;
 
-- 
cgit v1.2.3


From a231f9d5ddb685a5a4817c5ff89e493825f12148 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 27 Jan 2012 20:30:02 +0100
Subject: AGOS: Rename ArchiveMan's open to createReadStreamForMember to match
 our Archive API.

---
 engines/agos/agos.h         |  2 +-
 engines/agos/animation.cpp  |  4 ++--
 engines/agos/res.cpp        | 24 ++++++++++++------------
 engines/agos/res_snd.cpp    |  4 ++--
 engines/agos/saveload.cpp   |  4 ++--
 engines/agos/subroutine.cpp |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'engines')

diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index d171902133..9b9cbce94f 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -198,7 +198,7 @@ public:
 #endif
 
 	virtual bool hasFile(const Common::String &name) const;
-	Common::SeekableReadStream *open(const Common::String &filename);
+	virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &filename) const;
 
 private:
 	bool _fallBack;
diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index db2cff328c..c7176fe7e8 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.cpp
@@ -251,7 +251,7 @@ bool MoviePlayerDXA::load() {
 	}
 
 	Common::String videoName = Common::String::format("%s.dxa", baseName);
-	Common::SeekableReadStream *videoStream = _vm->_archives.open(videoName);
+	Common::SeekableReadStream *videoStream = _vm->_archives.createReadStreamForMember(videoName);
 	if (!videoStream)
 		error("Failed to load video file %s", videoName.c_str());
 	if (!loadStream(videoStream))
@@ -415,7 +415,7 @@ MoviePlayerSMK::MoviePlayerSMK(AGOSEngine_Feeble *vm, const char *name)
 bool MoviePlayerSMK::load() {
 	Common::String videoName = Common::String::format("%s.smk", baseName);
 
-	Common::SeekableReadStream *videoStream = _vm->_archives.open(videoName);
+	Common::SeekableReadStream *videoStream = _vm->_archives.createReadStreamForMember(videoName);
 	if (!videoStream)
 		error("Failed to load video file %s", videoName.c_str());
 	if (!loadStream(videoStream))
diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp
index 284b252d91..03acb0a161 100644
--- a/engines/agos/res.cpp
+++ b/engines/agos/res.cpp
@@ -54,12 +54,12 @@ bool ArchiveMan::hasFile(const Common::String &name) const {
 	return Common::SearchSet::hasFile(name);
 }
 
-Common::SeekableReadStream *ArchiveMan::open(const Common::String &filename) {
+Common::SeekableReadStream *ArchiveMan::createReadStreamForMember(const Common::String &filename) const {
 	if (_fallBack && SearchMan.hasFile(filename)) {
 		return SearchMan.createReadStreamForMember(filename);
 	}
 
-	return createReadStreamForMember(filename);
+	return Common::SearchSet::createReadStreamForMember(filename);
 }
 
 #ifdef ENABLE_AGOS2
@@ -180,7 +180,7 @@ void AGOSEngine_PN::loadGamePcFile() {
 
 	if (getFileName(GAME_BASEFILE) != NULL) {
 		// Read dataBase
-		in = _archives.open(getFileName(GAME_BASEFILE));
+		in = _archives.createReadStreamForMember(getFileName(GAME_BASEFILE));
 		if (!in) {
 			error("loadGamePcFile: Can't load database file '%s'", getFileName(GAME_BASEFILE));
 		}
@@ -198,7 +198,7 @@ void AGOSEngine_PN::loadGamePcFile() {
 
 	if (getFileName(GAME_TEXTFILE) != NULL) {
 		// Read textBase
-		in = _archives.open(getFileName(GAME_TEXTFILE));
+		in = _archives.createReadStreamForMember(getFileName(GAME_TEXTFILE));
 		if (!in) {
 			error("loadGamePcFile: Can't load textbase file '%s'", getFileName(GAME_TEXTFILE));
 		}
@@ -221,7 +221,7 @@ void AGOSEngine::loadGamePcFile() {
 
 	if (getFileName(GAME_BASEFILE) != NULL) {
 		/* Read main gamexx file */
-		in = _archives.open(getFileName(GAME_BASEFILE));
+		in = _archives.createReadStreamForMember(getFileName(GAME_BASEFILE));
 		if (!in) {
 			error("loadGamePcFile: Can't load gamexx file '%s'", getFileName(GAME_BASEFILE));
 		}
@@ -247,7 +247,7 @@ void AGOSEngine::loadGamePcFile() {
 
 	if (getFileName(GAME_TBLFILE) != NULL) {
 		/* Read list of TABLE resources */
-		in = _archives.open(getFileName(GAME_TBLFILE));
+		in = _archives.createReadStreamForMember(getFileName(GAME_TBLFILE));
 		if (!in) {
 			error("loadGamePcFile: Can't load table resources file '%s'", getFileName(GAME_TBLFILE));
 		}
@@ -268,7 +268,7 @@ void AGOSEngine::loadGamePcFile() {
 
 	if (getFileName(GAME_STRFILE) != NULL) {
 		/* Read list of TEXT resources */
-		in = _archives.open(getFileName(GAME_STRFILE));
+		in = _archives.createReadStreamForMember(getFileName(GAME_STRFILE));
 		if (!in)
 			error("loadGamePcFile: Can't load text resources file '%s'", getFileName(GAME_STRFILE));
 
@@ -282,7 +282,7 @@ void AGOSEngine::loadGamePcFile() {
 
 	if (getFileName(GAME_STATFILE) != NULL) {
 		/* Read list of ROOM STATE resources */
-		in = _archives.open(getFileName(GAME_STATFILE));
+		in = _archives.createReadStreamForMember(getFileName(GAME_STATFILE));
 		if (!in) {
 			error("loadGamePcFile: Can't load state resources file '%s'", getFileName(GAME_STATFILE));
 		}
@@ -305,7 +305,7 @@ void AGOSEngine::loadGamePcFile() {
 
 	if (getFileName(GAME_RMSLFILE) != NULL) {
 		/* Read list of ROOM ITEMS resources */
-		in = _archives.open(getFileName(GAME_RMSLFILE));
+		in = _archives.createReadStreamForMember(getFileName(GAME_RMSLFILE));
 		if (!in) {
 			error("loadGamePcFile: Can't load room resources file '%s'", getFileName(GAME_RMSLFILE));
 		}
@@ -321,7 +321,7 @@ void AGOSEngine::loadGamePcFile() {
 
 	if (getFileName(GAME_XTBLFILE) != NULL) {
 		/* Read list of XTABLE resources */
-		in = _archives.open(getFileName(GAME_XTBLFILE));
+		in = _archives.createReadStreamForMember(getFileName(GAME_XTBLFILE));
 		if (!in) {
 			error("loadGamePcFile: Can't load xtable resources file '%s'", getFileName(GAME_XTBLFILE));
 		}
@@ -822,7 +822,7 @@ void AGOSEngine::loadVGABeardFile(uint16 id) {
 			sprintf(filename, "0%d.VGA", id);
 		}
 
-		in = _archives.open(filename);
+		in = _archives.createReadStreamForMember(filename);
 		if (!in)
 			error("loadSimonVGAFile: Can't load %s", filename);
 
@@ -900,7 +900,7 @@ void AGOSEngine::loadVGAVideoFile(uint16 id, uint8 type, bool useError) {
 			}
 		}
 
-		in = _archives.open(filename);
+		in = _archives.createReadStreamForMember(filename);
 		if (!in) {
 			if (useError)
 				error("loadVGAVideoFile: Can't load %s", filename);
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index e9a7ea4de9..2777d4f269 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -452,7 +452,7 @@ static const char *const dimpSoundList[32] = {
 void AGOSEngine::loadSoundFile(const char* filename) {
 	Common::SeekableReadStream *in;
 
-	in = _archives.open(filename);
+	in = _archives.createReadStreamForMember(filename);
 	if (!in)
 		error("loadSound: Can't load %s", filename);
 
@@ -475,7 +475,7 @@ void AGOSEngine::loadSound(uint16 sound, int16 pan, int16 vol, uint16 type) {
 		assert(sound >= 1 && sound <= 32);
 		sprintf(filename, "%s.wav", dimpSoundList[sound - 1]);
 
-		in = _archives.open(filename);
+		in = _archives.createReadStreamForMember(filename);
 		if (!in)
 			error("loadSound: Can't load %s", filename);
 
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index 920dbb0a0d..4fbde09ff8 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -1019,7 +1019,7 @@ bool AGOSEngine::loadGame(const char *filename, bool restartMode) {
 
 	if (restartMode) {
 		// Load restart state
-		f = _archives.open(filename);
+		f = _archives.createReadStreamForMember(filename);
 	} else {
 		f = _saveFileMan->openForLoading(filename);
 	}
@@ -1193,7 +1193,7 @@ bool AGOSEngine_Elvira2::loadGame(const char *filename, bool restartMode) {
 
 	if (restartMode) {
 		// Load restart state
-		f = _archives.open(filename);
+		f = _archives.createReadStreamForMember(filename);
 	} else {
 		f = _saveFileMan->openForLoading(filename);
 	}
diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp
index a319153bad..f5aad2dcc8 100644
--- a/engines/agos/subroutine.cpp
+++ b/engines/agos/subroutine.cpp
@@ -266,7 +266,7 @@ Common::SeekableReadStream *AGOSEngine::openTablesFile(const char *filename) {
 }
 
 Common::SeekableReadStream *AGOSEngine::openTablesFile_simon1(const char *filename) {
-	Common::SeekableReadStream *in = _archives.open(filename);
+	Common::SeekableReadStream *in = _archives.createReadStreamForMember(filename);
 	if (!in)
 		error("openTablesFile: Can't open '%s'", filename);
 	return in;
-- 
cgit v1.2.3


From 827cdbd22ea5b9d66848ddc1cdf9cee0afaea0f4 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 27 Jan 2012 20:35:34 +0100
Subject: AGOS: Make ArchiveMan a proper sub-type of SearchSet.

Now all of the Archive API is implemented to avoid possibly inconsistent
behavior when an ArchiveMan object is accessed via a class type higher in the
class hierachy.
---
 engines/agos/agos.h  |  4 ++++
 engines/agos/res.cpp | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

(limited to 'engines')

diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 9b9cbce94f..d9f982a0fa 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -198,6 +198,10 @@ public:
 #endif
 
 	virtual bool hasFile(const Common::String &name) const;
+	virtual int listMatchingMembers(Common::ArchiveMemberList &list, const Common::String &pattern) const;
+	virtual int listMembers(Common::ArchiveMemberList &list) const;
+
+	virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
 	virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &filename) const;
 
 private:
diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp
index 03acb0a161..0305879390 100644
--- a/engines/agos/res.cpp
+++ b/engines/agos/res.cpp
@@ -54,6 +54,24 @@ bool ArchiveMan::hasFile(const Common::String &name) const {
 	return Common::SearchSet::hasFile(name);
 }
 
+int ArchiveMan::listMatchingMembers(Common::ArchiveMemberList &list, const Common::String &pattern) const {
+	const int matches = _fallBack ? SearchMan.listMatchingMembers(list, pattern) : 0;
+	return matches + Common::SearchSet::listMatchingMembers(list, pattern);
+}
+
+int ArchiveMan::listMembers(Common::ArchiveMemberList &list) const {
+	const int matches = _fallBack ? SearchMan.listMembers(list) : 0;
+	return matches + Common::SearchSet::listMembers(list);
+}
+
+const Common::ArchiveMemberPtr ArchiveMan::getMember(const Common::String &name) const {
+	Common::ArchiveMemberPtr ptr = _fallBack ? SearchMan.getMember(name) : Common::ArchiveMemberPtr();
+	if (ptr)
+		return ptr;
+
+	return Common::SearchSet::getMember(name);
+}
+
 Common::SeekableReadStream *ArchiveMan::createReadStreamForMember(const Common::String &filename) const {
 	if (_fallBack && SearchMan.hasFile(filename)) {
 		return SearchMan.createReadStreamForMember(filename);
-- 
cgit v1.2.3


From 9dd703532706c049b14b4bc1e239c9cd08366f2a Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 28 Jan 2012 17:02:43 +0100
Subject: GOB: Add the air and health meters in Geisha's Diving minigame

---
 engines/gob/minigames/geisha/diving.cpp |  20 +++++-
 engines/gob/minigames/geisha/diving.h   |   4 ++
 engines/gob/minigames/geisha/meter.cpp  | 112 ++++++++++++++++++++++++++++++++
 engines/gob/minigames/geisha/meter.h    |  86 ++++++++++++++++++++++++
 engines/gob/module.mk                   |   1 +
 5 files changed, 222 insertions(+), 1 deletion(-)
 create mode 100644 engines/gob/minigames/geisha/meter.cpp
 create mode 100644 engines/gob/minigames/geisha/meter.h

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index 4b08a21fb4..59ebe7f7b1 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -32,6 +32,7 @@
 
 #include "gob/minigames/geisha/evilfish.h"
 #include "gob/minigames/geisha/oko.h"
+#include "gob/minigames/geisha/meter.h"
 #include "gob/minigames/geisha/diving.h"
 
 namespace Gob {
@@ -57,10 +58,14 @@ const Diving::PlantLevel Diving::kPlantLevels[] = {
 
 Diving::Diving(GobEngine *vm) : _vm(vm), _background(0),
 	_objects(0), _gui(0), _okoAnim(0), _lungs(0), _heart(0),
-	_blackPearl(0), _whitePearlCount(0), _blackPearlCount(0) {
+	_blackPearl(0), _airMeter(0), _healthMeter(0),
+	_whitePearlCount(0), _blackPearlCount(0) {
 
 	_blackPearl = new Surface(11, 8, 1);
 
+	_airMeter    = new Meter(4  , 195, 38, 2, 5, 7, 38, Meter::kFillToLeft);
+	_healthMeter = new Meter(276, 195, 38, 2, 6, 7, 38, Meter::kFillToLeft);
+
 	for (uint i = 0; i < kEvilFishCount; i++)
 		_evilFish[i].evilFish = 0;
 
@@ -79,6 +84,9 @@ Diving::Diving(GobEngine *vm) : _vm(vm), _background(0),
 }
 
 Diving::~Diving() {
+	delete _airMeter;
+	delete _healthMeter;
+
 	delete _blackPearl;
 
 	deinit();
@@ -234,6 +242,9 @@ void Diving::init() {
 	_anims.push_back(_oko);
 	_anims.push_back(_lungs);
 	_anims.push_back(_heart);
+
+	_airMeter->setValue(38);
+	_healthMeter->setValue(38);
 }
 
 void Diving::deinit() {
@@ -584,6 +595,13 @@ void Diving::updateAnims() {
 
 		(*a)->advance();
 	}
+
+	// Draw the meters
+	_airMeter->draw(*_vm->_draw->_backSurface, left, top, right, bottom);
+	_vm->_draw->dirtiedRect(_vm->_draw->_backSurface, left, top, right, bottom);
+
+	_healthMeter->draw(*_vm->_draw->_backSurface, left, top, right, bottom);
+	_vm->_draw->dirtiedRect(_vm->_draw->_backSurface, left, top, right, bottom);
 }
 
 int16 Diving::checkInput(int16 &mouseX, int16 &mouseY, MouseButtons &mouseButtons) {
diff --git a/engines/gob/minigames/geisha/diving.h b/engines/gob/minigames/geisha/diving.h
index b00252ca0a..50a5d49a8c 100644
--- a/engines/gob/minigames/geisha/diving.h
+++ b/engines/gob/minigames/geisha/diving.h
@@ -41,6 +41,7 @@ namespace Geisha {
 
 class EvilFish;
 class Oko;
+class Meter;
 
 /** Geisha's "Diving" minigame. */
 class Diving {
@@ -132,6 +133,9 @@ private:
 	uint8 _whitePearlCount;
 	uint8 _blackPearlCount;
 
+	Meter *_airMeter;
+	Meter *_healthMeter;
+
 	uint8 _currentShot;
 
 	SoundDesc _soundShoot;
diff --git a/engines/gob/minigames/geisha/meter.cpp b/engines/gob/minigames/geisha/meter.cpp
new file mode 100644
index 0000000000..82318a303d
--- /dev/null
+++ b/engines/gob/minigames/geisha/meter.cpp
@@ -0,0 +1,112 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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/util.h"
+
+#include "gob/surface.h"
+
+#include "gob/minigames/geisha/meter.h"
+
+namespace Gob {
+
+namespace Geisha {
+
+Meter::Meter(int16 x, int16 y, int16 width, int16 height, uint8 frontColor,
+             uint8 backColor, int32 maxValue, Direction direction) :
+	_x(x), _y(y), _width(width), _height(height), _frontColor(frontColor),
+	_backColor(backColor), _value(0), _maxValue(maxValue), _direction(direction),
+	_needUpdate(true), _surface(0) {
+
+}
+
+Meter::~Meter() {
+	delete _surface;
+}
+
+int32 Meter::getValue() const {
+	return _value;
+}
+
+void Meter::setValue(int32 value) {
+	value = CLIP<int32>(value, 0, _maxValue);
+	if (_value == value)
+		return;
+
+	_value = value;
+	_needUpdate = true;
+}
+
+void Meter::increase(int32 n) {
+	int32 value = CLIP<int32>(_value + n, 0, _maxValue);
+	if (_value == value)
+		return;
+
+	_value = value;
+	_needUpdate = true;
+}
+
+void Meter::decrease(int32 n) {
+	int32 value = CLIP<int32>(_value - n, 0, _maxValue);
+	if (_value == value)
+		return;
+
+	_value = value;
+	_needUpdate = true;
+}
+
+void Meter::draw(Surface &dest, int16 &left, int16 &top, int16 &right, int16 &bottom) {
+	if (!_surface) {
+		_surface = new Surface(_width, _height, dest.getBPP());
+		_needUpdate = true;
+	}
+
+	update();
+
+	left   = CLIP<int16>(_x              , 0, dest.getWidth () - 1);
+	top    = CLIP<int16>(_y              , 0, dest.getHeight() - 1);
+	right  = CLIP<int16>(_x + _width  - 1, 0, dest.getWidth () - 1);
+	bottom = CLIP<int16>(_y + _height - 1, 0, dest.getHeight() - 1);
+
+	dest.blit(*_surface, left - _x, top - _y, _width, _height, left, top);
+}
+
+void Meter::update() {
+	if (!_needUpdate)
+		return;
+
+	_needUpdate = false;
+
+	_surface->fill(_backColor);
+
+	int32 n = floor((((float) _width) / _maxValue * _value) + 0.5);
+	if (n <= 0)
+		return;
+
+	if (_direction == kFillToLeft)
+		_surface->fillRect(_width - n, 0, _width - 1, _height - 1, _frontColor);
+	else
+		_surface->fillRect(0         , 0, n - 1, _height - 1, _frontColor);
+}
+
+} // End of namespace Geisha
+
+} // End of namespace Gob
diff --git a/engines/gob/minigames/geisha/meter.h b/engines/gob/minigames/geisha/meter.h
new file mode 100644
index 0000000000..398128712a
--- /dev/null
+++ b/engines/gob/minigames/geisha/meter.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 GOB_MINIGAMES_GEISHA_METER_H
+#define GOB_MINIGAMES_GEISHA_METER_H
+
+#include "gob/aniobject.h"
+
+namespace Gob {
+
+class Surface;
+
+namespace Geisha {
+
+/** A meter measuring a value. */
+class Meter {
+public:
+	enum Direction {
+		kFillToLeft,
+		kFillToRight
+	};
+
+	Meter(int16 x, int16 y, int16 width, int16 height,
+	      uint8 frontColor, uint8 backColor, int32 maxValue,
+	      Direction direction);
+	~Meter();
+
+	/** Return the current value the meter is measuring. */
+	int32 getValue() const;
+
+	/** Set the current value the meter is measuring. */
+	void setValue(int32 value);
+
+	/** Increase the current value the meter is measuring. */
+	void increase(int32 n = 1);
+	/** Decrease the current value the meter is measuring. */
+	void decrease(int32 n = 1);
+
+	/** Draw the meter onto the surface and return the affected rectangle. */
+	void draw(Surface &dest, int16 &left, int16 &top, int16 &right, int16 &bottom);
+
+private:
+	int16 _x;
+	int16 _y;
+	int16 _width;
+	int16 _height;
+
+	uint8 _frontColor;
+	uint8 _backColor;
+
+	int32 _value;
+	int32 _maxValue;
+
+	Direction _direction;
+
+	bool _needUpdate;
+
+	Surface *_surface;
+
+	void update();
+};
+
+} // End of namespace Geisha
+
+} // End of namespace Gob
+
+#endif // GOB_MINIGAMES_GEISHA_METER_H
diff --git a/engines/gob/module.mk b/engines/gob/module.mk
index 6adf99f669..09098f0ca9 100644
--- a/engines/gob/module.mk
+++ b/engines/gob/module.mk
@@ -75,6 +75,7 @@ MODULE_OBJS := \
 	demos/batplayer.o \
 	minigames/geisha/evilfish.o \
 	minigames/geisha/oko.o \
+	minigames/geisha/meter.o \
 	minigames/geisha/diving.o \
 	minigames/geisha/penetration.o \
 	save/savefile.o \
-- 
cgit v1.2.3


From 7650fca0405f62e62bdf81cb9f2acd8e7f14ca69 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 28 Jan 2012 17:46:04 +0100
Subject: GOB: Air gets used up and is refilled by breathing

---
 engines/gob/minigames/geisha/diving.cpp | 19 +++++++++++++++++++
 engines/gob/minigames/geisha/diving.h   |  3 +++
 engines/gob/minigames/geisha/oko.cpp    |  4 ++--
 engines/gob/minigames/geisha/oko.h      |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index 59ebe7f7b1..bd87be8e7f 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -39,6 +39,9 @@ namespace Gob {
 
 namespace Geisha {
 
+static const uint8 kAirDecreaseRate = 15;
+
+
 const uint16 Diving::kEvilFishTypes[kEvilFishTypeCount][5] = {
 	{ 0, 14,  8,  9, 3}, // Shark
 	{15,  1, 12, 13, 3}, // Moray
@@ -105,6 +108,7 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 
 	while (!_vm->shouldQuit()) {
 		checkShots();
+		updateAirMeter();
 		updateEvilFish();
 		updateDecorFish();
 		updatePlants();
@@ -245,6 +249,8 @@ void Diving::init() {
 
 	_airMeter->setValue(38);
 	_healthMeter->setValue(38);
+
+	_airCycle = 0;
 }
 
 void Diving::deinit() {
@@ -393,6 +399,19 @@ void Diving::enterPearl(int16 x) {
 	_pearl.pearl->setPause(false);
 }
 
+void Diving::updateAirMeter() {
+	if (_oko->isBreathing()) {
+		_airCycle = 0;
+		_airMeter->increase();
+		return;
+	}
+
+	_airCycle = (_airCycle + 1) % kAirDecreaseRate;
+
+	if (_airCycle == 0)
+		_airMeter->decrease();
+}
+
 void Diving::updateEvilFish() {
 	for (uint i = 0; i < kEvilFishCount; i++) {
 		ManagedEvilFish &fish = _evilFish[i];
diff --git a/engines/gob/minigames/geisha/diving.h b/engines/gob/minigames/geisha/diving.h
index 50a5d49a8c..2915e85a93 100644
--- a/engines/gob/minigames/geisha/diving.h
+++ b/engines/gob/minigames/geisha/diving.h
@@ -136,6 +136,8 @@ private:
 	Meter *_airMeter;
 	Meter *_healthMeter;
 
+	uint8 _airCycle;
+
 	uint8 _currentShot;
 
 	SoundDesc _soundShoot;
@@ -161,6 +163,7 @@ private:
 	void foundBlackPearl();
 	void foundWhitePearl();
 
+	void updateAirMeter();
 	void updateEvilFish();
 	void updateDecorFish();
 	void updatePlants();
diff --git a/engines/gob/minigames/geisha/oko.cpp b/engines/gob/minigames/geisha/oko.cpp
index 5da1947acf..23f460fdba 100644
--- a/engines/gob/minigames/geisha/oko.cpp
+++ b/engines/gob/minigames/geisha/oko.cpp
@@ -131,8 +131,8 @@ Oko::State Oko::getState() const {
 	return _state;
 }
 
-bool Oko::isAtBottom() const {
-	return _level >= (kLevelCount - 1);
+bool Oko::isBreathing() const {
+	return (_state == kStateBreathe) && ((getFrame() >= 9) && (getFrame() <= 30));
 }
 
 } // End of namespace Geisha
diff --git a/engines/gob/minigames/geisha/oko.h b/engines/gob/minigames/geisha/oko.h
index 0dee53ce45..37824936e3 100644
--- a/engines/gob/minigames/geisha/oko.h
+++ b/engines/gob/minigames/geisha/oko.h
@@ -57,7 +57,7 @@ public:
 
 	State getState() const;
 
-	bool isAtBottom() const;
+	bool isBreathing() const;
 
 private:
 	Sound *_sound;
-- 
cgit v1.2.3


From 60306c40ac8ec733fb7ec45ea61f91de245ab02e Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 28 Jan 2012 18:03:00 +0100
Subject: GOB: If there's no air left, Oko dies

---
 engines/gob/minigames/geisha/diving.cpp |  3 +++
 engines/gob/minigames/geisha/oko.cpp    | 28 ++++++++++++++++++++++------
 engines/gob/minigames/geisha/oko.h      |  6 +++++-
 3 files changed, 30 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index bd87be8e7f..0a43f96be9 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -410,6 +410,9 @@ void Diving::updateAirMeter() {
 
 	if (_airCycle == 0)
 		_airMeter->decrease();
+
+	if (_airMeter->getValue() == 0)
+		_oko->die();
 }
 
 void Diving::updateEvilFish() {
diff --git a/engines/gob/minigames/geisha/oko.cpp b/engines/gob/minigames/geisha/oko.cpp
index 23f460fdba..c9d4d1f43f 100644
--- a/engines/gob/minigames/geisha/oko.cpp
+++ b/engines/gob/minigames/geisha/oko.cpp
@@ -29,12 +29,15 @@ namespace Gob {
 namespace Geisha {
 
 enum kOkoAnimation {
-	kOkoAnimationEnter   = 0,
-	kOkoAnimationSwim    = 1,
-	kOkoAnimationSink    = 8,
-	kOkoAnimationRaise   = 7,
-	kOkoAnimationBreathe = 2,
-	kOkoAnimationPick    = 3
+	kOkoAnimationEnter   =  0,
+	kOkoAnimationSwim    =  1,
+	kOkoAnimationSink    =  8,
+	kOkoAnimationRaise   =  7,
+	kOkoAnimationBreathe =  2,
+	kOkoAnimationPick    =  3,
+	kOkoAnimationDie0    = 17,
+	kOkoAnimationDie1    = 18,
+	kOkoAnimationDie2    = 19
 };
 
 static const int16 kOkoPositionX = 110;
@@ -56,6 +59,11 @@ Oko::~Oko() {
 void Oko::advance() {
 	bool wasLastFrame = lastFrame();
 
+	if ((_state == kStateDead) && wasLastFrame) {
+		setPause(true);
+		return;
+	}
+
 	ANIObject::advance();
 
 	switch (_state) {
@@ -127,6 +135,14 @@ void Oko::raise() {
 	_level--;
 }
 
+void Oko::die() {
+	if (_state != kStateSwim)
+		return;
+
+	setAnimation(kOkoAnimationDie0 + _level);
+	_state = kStateDead;
+}
+
 Oko::State Oko::getState() const {
 	return _state;
 }
diff --git a/engines/gob/minigames/geisha/oko.h b/engines/gob/minigames/geisha/oko.h
index 37824936e3..d5d18c16b3 100644
--- a/engines/gob/minigames/geisha/oko.h
+++ b/engines/gob/minigames/geisha/oko.h
@@ -41,7 +41,8 @@ public:
 		kStateSink,
 		kStateRaise,
 		kStateBreathe,
-		kStatePick
+		kStatePick,
+		kStateDead
 	};
 
 	Oko(const ANIFile &ani, Sound &sound, SoundDesc &breathe);
@@ -55,6 +56,9 @@ public:
 	/** Oko should raise a level. */
 	void raise();
 
+	/** Oko should die. */
+	void die();
+
 	State getState() const;
 
 	bool isBreathing() const;
-- 
cgit v1.2.3


From 0eeae6e59e49dbcd72a646a1be0d77aa962e7959 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 28 Jan 2012 19:45:02 +0100
Subject: GOB: Oko gets hurt by fish and dies if health == 0

---
 engines/gob/aniobject.cpp                 | 30 +++++++++++++++++
 engines/gob/aniobject.h                   |  5 +++
 engines/gob/minigames/geisha/diving.cpp   | 54 +++++++++++++++++++++++++------
 engines/gob/minigames/geisha/diving.h     |  5 +++
 engines/gob/minigames/geisha/evilfish.cpp | 17 +++-------
 engines/gob/minigames/geisha/evilfish.h   |  6 ++--
 engines/gob/minigames/geisha/oko.cpp      | 10 ++++++
 engines/gob/minigames/geisha/oko.h        |  4 +++
 8 files changed, 106 insertions(+), 25 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/aniobject.cpp b/engines/gob/aniobject.cpp
index a01fe43672..0ca850d1fb 100644
--- a/engines/gob/aniobject.cpp
+++ b/engines/gob/aniobject.cpp
@@ -111,6 +111,36 @@ void ANIObject::getFrameSize(int16 &width, int16 &height) const {
 	height = animation.frameAreas[_frame].bottom - animation.frameAreas[_frame].top  + 1;
 }
 
+bool ANIObject::isIn(int16 x, int16 y) const {
+	if (!isVisible())
+		return false;
+
+	int16 frameX, frameY, frameWidth, frameHeight;
+	getFramePosition(frameX, frameY);
+	getFrameSize(frameWidth, frameHeight);
+
+	if ((x < frameX) || (y < frameY))
+		return false;
+	if ((x > (frameX + frameWidth)) || (y > (frameY + frameHeight)))
+		return false;
+
+	return true;
+}
+
+bool ANIObject::isIn(const ANIObject &obj) const {
+	if (!isVisible() || !obj.isVisible())
+		return false;
+
+	int16 frameX, frameY, frameWidth, frameHeight;
+	getFramePosition(frameX, frameY);
+	getFrameSize(frameWidth, frameHeight);
+
+	return obj.isIn(frameX                 , frameY                  ) ||
+	       obj.isIn(frameX + frameWidth - 1, frameY                  ) ||
+	       obj.isIn(frameX                 , frameY + frameHeight - 1) ||
+	       obj.isIn(frameX + frameWidth - 1, frameY + frameHeight - 1);
+}
+
 void ANIObject::draw(Surface &dest, int16 &left, int16 &top,
                                     int16 &right, int16 &bottom) {
 
diff --git a/engines/gob/aniobject.h b/engines/gob/aniobject.h
index 28103007a6..e3fe301400 100644
--- a/engines/gob/aniobject.h
+++ b/engines/gob/aniobject.h
@@ -69,6 +69,11 @@ public:
 	/** Return the current frame size. */
 	void getFrameSize(int16 &width, int16 &height) const;
 
+	/** Are there coordinates within the animation sprite? */
+	bool isIn(int16 x, int16 y) const;
+	/** Is this object within the animation sprite? */
+	bool isIn(const ANIObject &obj) const;
+
 	/** Set the animation number. */
 	void setAnimation(uint16 animation);
 
diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index 0a43f96be9..fb906ce346 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -66,8 +66,8 @@ Diving::Diving(GobEngine *vm) : _vm(vm), _background(0),
 
 	_blackPearl = new Surface(11, 8, 1);
 
-	_airMeter    = new Meter(4  , 195, 38, 2, 5, 7, 38, Meter::kFillToLeft);
-	_healthMeter = new Meter(276, 195, 38, 2, 6, 7, 38, Meter::kFillToLeft);
+	_airMeter    = new Meter(3  , 195, 40, 2, 5, 7, 40, Meter::kFillToLeft);
+	_healthMeter = new Meter(275, 195, 40, 2, 6, 7,  4, Meter::kFillToLeft);
 
 	for (uint i = 0; i < kEvilFishCount; i++)
 		_evilFish[i].evilFish = 0;
@@ -108,6 +108,8 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 
 	while (!_vm->shouldQuit()) {
 		checkShots();
+		checkOkoHurt();
+
 		updateAirMeter();
 		updateEvilFish();
 		updateDecorFish();
@@ -132,13 +134,7 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 		if (mouseButtons == kMouseButtonsLeft)
 			shoot(mouseX, mouseY);
 
-		if (key == kKeyDown) {
-			_oko->sink();
-			if ((_oko->getState() == Oko::kStatePick) && (_oko->getFrame() == 0))
-				getPearl();
-
-		} else if (key == kKeyUp)
-			_oko->raise();
+		handleOko(key);
 
 		if ((_whitePearlCount >= 20) || (_blackPearlCount >= 2))
 			break;
@@ -251,6 +247,7 @@ void Diving::init() {
 	_healthMeter->setValue(38);
 
 	_airCycle = 0;
+	_hurtGracePeriod = 0;
 }
 
 void Diving::deinit() {
@@ -682,6 +679,45 @@ void Diving::checkShots() {
 	}
 }
 
+void Diving::handleOko(int16 key) {
+	if (key == kKeyDown) {
+		_oko->sink();
+
+		if ((_oko->getState() == Oko::kStatePick) && (_oko->getFrame() == 0))
+			getPearl();
+
+	} else if (key == kKeyUp)
+		_oko->raise();
+}
+
+void Diving::checkOkoHurt() {
+	if (_oko->getState() != Oko::kStateSwim)
+		return;
+
+	// Oko dies if the health reaches 0
+	if (_healthMeter->getValue() == 0)
+		_oko->die();
+
+	// Give Oko a grace period after being hurt
+	if (_hurtGracePeriod > 0) {
+		_hurtGracePeriod--;
+		return;
+	}
+
+	// Check for a fish/Oko-collision
+	for (uint i = 0; i < kEvilFishCount; i++) {
+		EvilFish &evilFish = *_evilFish[i].evilFish;
+
+		if (!evilFish.isDead() && evilFish.isIn(*_oko)) {
+			_oko->hurt();
+			_healthMeter->decrease();
+
+			_hurtGracePeriod = 10;
+			break;
+		}
+	}
+}
+
 } // End of namespace Geisha
 
 } // End of namespace Gob
diff --git a/engines/gob/minigames/geisha/diving.h b/engines/gob/minigames/geisha/diving.h
index 2915e85a93..5db1b8199a 100644
--- a/engines/gob/minigames/geisha/diving.h
+++ b/engines/gob/minigames/geisha/diving.h
@@ -137,6 +137,7 @@ private:
 	Meter *_healthMeter;
 
 	uint8 _airCycle;
+	uint8 _hurtGracePeriod;
 
 	uint8 _currentShot;
 
@@ -174,6 +175,10 @@ private:
 
 	void shoot(int16 mouseX, int16 mouseY);
 	void checkShots();
+
+	void handleOko(int16 key);
+
+	void checkOkoHurt();
 };
 
 } // End of namespace Geisha
diff --git a/engines/gob/minigames/geisha/evilfish.cpp b/engines/gob/minigames/geisha/evilfish.cpp
index e9503f4aed..c7ef9d5622 100644
--- a/engines/gob/minigames/geisha/evilfish.cpp
+++ b/engines/gob/minigames/geisha/evilfish.cpp
@@ -39,19 +39,6 @@ EvilFish::EvilFish(const ANIFile &ani, uint16 screenWidth,
 EvilFish::~EvilFish() {
 }
 
-bool EvilFish::isIn(int16 x, int16 y) const {
-	int16 frameX, frameY, frameWidth, frameHeight;
-	getFramePosition(frameX, frameY);
-	getFrameSize(frameWidth, frameHeight);
-
-	if ((x < frameX) || (y < frameY))
-		return false;
-	if ((x > (frameX + frameWidth)) || (y > (frameY + frameHeight)))
-		return false;
-
-	return true;
-}
-
 void EvilFish::enter(Direction from, int16 y) {
 	_shouldLeave = false;
 
@@ -184,6 +171,10 @@ void EvilFish::mutate(uint16 animSwimLeft, uint16 animSwimRight,
 	}
 }
 
+bool EvilFish::isDead() {
+	return !isVisible() || (_state == kStateNone) || (_state == kStateDie);
+}
+
 } // End of namespace Geisha
 
 } // End of namespace Gob
diff --git a/engines/gob/minigames/geisha/evilfish.h b/engines/gob/minigames/geisha/evilfish.h
index 223645f47f..81efb676e2 100644
--- a/engines/gob/minigames/geisha/evilfish.h
+++ b/engines/gob/minigames/geisha/evilfish.h
@@ -42,9 +42,6 @@ public:
 	         uint16 animTurnLeft, uint16 animTurnRight, uint16 animDie);
 	~EvilFish();
 
-	/** Are there coordinates within the fish's sprite? */
-	bool isIn(int16 x, int16 y) const;
-
 	/** Enter from this direction / screen edge. */
 	void enter(Direction from, int16 y);
 	/** Leave the screen in the current direction. */
@@ -60,6 +57,9 @@ public:
 	void mutate(uint16 animSwimLeft, uint16 animSwimRight,
 	            uint16 animTurnLeft, uint16 animTurnRight, uint16 animDie);
 
+	/** Is the fish dead? */
+	bool isDead();
+
 private:
 	enum State {
 		kStateNone,
diff --git a/engines/gob/minigames/geisha/oko.cpp b/engines/gob/minigames/geisha/oko.cpp
index c9d4d1f43f..1e90b1f8bf 100644
--- a/engines/gob/minigames/geisha/oko.cpp
+++ b/engines/gob/minigames/geisha/oko.cpp
@@ -35,6 +35,7 @@ enum kOkoAnimation {
 	kOkoAnimationRaise   =  7,
 	kOkoAnimationBreathe =  2,
 	kOkoAnimationPick    =  3,
+	kOkoAnimationHurt    =  4,
 	kOkoAnimationDie0    = 17,
 	kOkoAnimationDie1    = 18,
 	kOkoAnimationDie2    = 19
@@ -80,6 +81,7 @@ void Oko::advance() {
 			_sound->blasterPlay(_breathe, 1, 0);
 		case kStateSink:
 		case kStateRaise:
+		case kStateHurt:
 			if (wasLastFrame) {
 				setAnimation(kOkoAnimationSwim);
 				setPosition(kOkoPositionX, kLevelPositionX[_level]);
@@ -135,6 +137,14 @@ void Oko::raise() {
 	_level--;
 }
 
+void Oko::hurt() {
+	if (_state != kStateSwim)
+		return;
+
+	setAnimation(kOkoAnimationHurt);
+	_state = kStateHurt;
+}
+
 void Oko::die() {
 	if (_state != kStateSwim)
 		return;
diff --git a/engines/gob/minigames/geisha/oko.h b/engines/gob/minigames/geisha/oko.h
index d5d18c16b3..7fe0001393 100644
--- a/engines/gob/minigames/geisha/oko.h
+++ b/engines/gob/minigames/geisha/oko.h
@@ -42,6 +42,7 @@ public:
 		kStateRaise,
 		kStateBreathe,
 		kStatePick,
+		kStateHurt,
 		kStateDead
 	};
 
@@ -56,6 +57,9 @@ public:
 	/** Oko should raise a level. */
 	void raise();
 
+	/** Oko should get hurt. */
+	void hurt();
+
 	/** Oko should die. */
 	void die();
 
-- 
cgit v1.2.3


From 3a95cdf961c36387968c7db0c9950a0672b097b9 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 28 Jan 2012 19:45:27 +0100
Subject: GOB: Correct the variable value for the Diving result

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

(limited to 'engines')

diff --git a/engines/gob/inter_geisha.cpp b/engines/gob/inter_geisha.cpp
index c5b91a484b..1f2a7fab7f 100644
--- a/engines/gob/inter_geisha.cpp
+++ b/engines/gob/inter_geisha.cpp
@@ -280,7 +280,7 @@ void Inter_Geisha::oGeisha_gameDiving(OpGobParams &params) {
 
 	bool result = _diving->play(playerCount, hasPearlLocation);
 
-	WRITE_VAR_UINT32(resultVar, result ? 1 : 0);
+	WRITE_VAR_UINT32(resultVar, result ? 0 : 1);
 }
 
 void Inter_Geisha::oGeisha_loadTitleMusic(OpGobParams &params) {
-- 
cgit v1.2.3


From 4b60a761a0ec5694178ac236e24136823d8907d9 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 28 Jan 2012 19:53:26 +0100
Subject: GOB: Explicitely set the Diving palette

---
 engines/gob/minigames/geisha/diving.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index fb906ce346..d94ce0838c 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -41,6 +41,24 @@ namespace Geisha {
 
 static const uint8 kAirDecreaseRate = 15;
 
+static const byte kPalette[48] = {
+	0x00, 0x02, 0x12,
+	0x01, 0x04, 0x1D,
+	0x05, 0x08, 0x28,
+	0x0C, 0x0D, 0x33,
+	0x15, 0x14, 0x3F,
+	0x00, 0x3F, 0x00,
+	0x3F, 0x00, 0x00,
+	0x00, 0x00, 0x00,
+	0x21, 0x0D, 0x00,
+	0x2F, 0x1A, 0x04,
+	0x3D, 0x2B, 0x0D,
+	0x10, 0x10, 0x10,
+	0x1A, 0x1A, 0x1A,
+	0x24, 0x24, 0x24,
+	0x00, 0x01, 0x0F,
+	0x3F, 0x3F, 0x3F
+};
 
 const uint16 Diving::kEvilFishTypes[kEvilFishTypeCount][5] = {
 	{ 0, 14,  8,  9, 3}, // Shark
@@ -315,6 +333,9 @@ void Diving::deinit() {
 void Diving::initScreen() {
 	_vm->_util->setFrameRate(15);
 
+	memcpy(_vm->_draw->_vgaPalette     , kPalette, 48);
+	memcpy(_vm->_draw->_vgaSmallPalette, kPalette, 48);
+
 	_vm->_video->setFullPalette(_vm->_global->_pPaletteDesc);
 
 	_vm->_draw->_backSurface->clear();
-- 
cgit v1.2.3


From c0d0792ccf346270f4def39182748e4c9f3def3d Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 28 Jan 2012 19:55:55 +0100
Subject: GOB: End the Diving minigame when Oko is dead

---
 engines/gob/minigames/geisha/diving.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index d94ce0838c..6b891b4c31 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -128,6 +128,10 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 		checkShots();
 		checkOkoHurt();
 
+		// Is Oko dead?
+		if (_oko->isPaused())
+			break;
+
 		updateAirMeter();
 		updateEvilFish();
 		updateDecorFish();
-- 
cgit v1.2.3


From c161cc123239966128d9487e84face5fbdc463de Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 28 Jan 2012 20:08:13 +0100
Subject: GOB: Fade the Diving minigame in

---
 engines/gob/minigames/geisha/diving.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index 6b891b4c31..047eb5b5d0 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -23,6 +23,7 @@
 #include "common/list.h"
 
 #include "gob/global.h"
+#include "gob/palanim.h"
 #include "gob/draw.h"
 #include "gob/video.h"
 #include "gob/decfile.h"
@@ -116,14 +117,21 @@ Diving::~Diving() {
 bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 	_hasPearlLocation = hasPearlLocation;
 
+	_vm->_palAnim->fade(0, 0, 0);
+
 	init();
 	initScreen();
 	initCursor();
 	initPlants();
 
+	updateAirMeter();
+	updateAnims();
+
 	_vm->_draw->blitInvalidated();
 	_vm->_video->retrace();
 
+	_vm->_palAnim->fade(_vm->_global->_pPaletteDesc, 0, 0);
+
 	while (!_vm->shouldQuit()) {
 		checkShots();
 		checkOkoHurt();
@@ -340,8 +348,6 @@ void Diving::initScreen() {
 	memcpy(_vm->_draw->_vgaPalette     , kPalette, 48);
 	memcpy(_vm->_draw->_vgaSmallPalette, kPalette, 48);
 
-	_vm->_video->setFullPalette(_vm->_global->_pPaletteDesc);
-
 	_vm->_draw->_backSurface->clear();
 	_background->draw(*_vm->_draw->_backSurface);
 
-- 
cgit v1.2.3


From 9fba98415de3fe4bd0549075eed9f7b42400f8c5 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 28 Jan 2012 20:09:58 +0100
Subject: GOB: Don't play a hurt animation right before Oko dies

---
 engines/gob/minigames/geisha/diving.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index 047eb5b5d0..12571be7ff 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -725,10 +725,6 @@ void Diving::checkOkoHurt() {
 	if (_oko->getState() != Oko::kStateSwim)
 		return;
 
-	// Oko dies if the health reaches 0
-	if (_healthMeter->getValue() == 0)
-		_oko->die();
-
 	// Give Oko a grace period after being hurt
 	if (_hurtGracePeriod > 0) {
 		_hurtGracePeriod--;
@@ -740,9 +736,14 @@ void Diving::checkOkoHurt() {
 		EvilFish &evilFish = *_evilFish[i].evilFish;
 
 		if (!evilFish.isDead() && evilFish.isIn(*_oko)) {
-			_oko->hurt();
 			_healthMeter->decrease();
 
+			// If the health reached 0, Oko dies. Otherwise, she gets hurt
+			if (_healthMeter->getValue() == 0)
+				_oko->die();
+			else
+				_oko->hurt();
+
 			_hurtGracePeriod = 10;
 			break;
 		}
-- 
cgit v1.2.3


From 0627a4244d6af625569df0445108a9c0056ca833 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 28 Jan 2012 22:29:19 +0100
Subject: GOB: Play the lungs animation when breathing

---
 engines/gob/minigames/geisha/diving.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index 12571be7ff..75e63118e2 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -431,8 +431,10 @@ void Diving::updateAirMeter() {
 	if (_oko->isBreathing()) {
 		_airCycle = 0;
 		_airMeter->increase();
+		_lungs->setPause(false);
 		return;
-	}
+	} else
+		_lungs->setPause(true);
 
 	_airCycle = (_airCycle + 1) % kAirDecreaseRate;
 
-- 
cgit v1.2.3


From 1eb7c7507bce6bbad0eb8eb2badd6492320a5908 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 28 Jan 2012 22:55:12 +0100
Subject: GOB: Minor cleanup

---
 engines/gob/minigames/geisha/diving.cpp | 89 ++++++++++++++++++++++++++-------
 engines/gob/minigames/geisha/meter.cpp  |  4 ++
 engines/gob/minigames/geisha/meter.h    |  3 ++
 engines/gob/minigames/geisha/oko.cpp    |  4 ++
 engines/gob/minigames/geisha/oko.h      |  1 +
 5 files changed, 84 insertions(+), 17 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index 75e63118e2..a635415b9c 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -61,6 +61,18 @@ static const byte kPalette[48] = {
 	0x3F, 0x3F, 0x3F
 };
 
+enum Animation {
+	kAnimationLungs         =  0,
+	kAnimationHeart         =  1,
+	kAnimationPearl         =  4,
+	kAnimationJellyfish     =  6,
+	kAnimationWater         =  7,
+	kAnimationShot          = 17,
+	kAnimationSwarmRedGreen = 32,
+	kAnimationSwarmOrange   = 33
+};
+
+
 const uint16 Diving::kEvilFishTypes[kEvilFishTypeCount][5] = {
 	{ 0, 14,  8,  9, 3}, // Shark
 	{15,  1, 12, 13, 3}, // Moray
@@ -117,8 +129,10 @@ Diving::~Diving() {
 bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 	_hasPearlLocation = hasPearlLocation;
 
+	// Fade to black
 	_vm->_palAnim->fade(0, 0, 0);
 
+	// Initialize our playing field
 	init();
 	initScreen();
 	initCursor();
@@ -130,16 +144,18 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 	_vm->_draw->blitInvalidated();
 	_vm->_video->retrace();
 
+	// Fade in
 	_vm->_palAnim->fade(_vm->_global->_pPaletteDesc, 0, 0);
 
 	while (!_vm->shouldQuit()) {
-		checkShots();
-		checkOkoHurt();
+		checkShots();   // Check if a shot hit something
+		checkOkoHurt(); // Check if Oko was hurt
 
 		// Is Oko dead?
 		if (_oko->isPaused())
 			break;
 
+		// Update all objects and animations
 		updateAirMeter();
 		updateEvilFish();
 		updateDecorFish();
@@ -149,37 +165,48 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 
 		_vm->_draw->animateCursor(1);
 
+		// Draw and wait for the end of the frame
 		_vm->_draw->blitInvalidated();
-
 		_vm->_util->waitEndFrame();
+
+		// Handle input
 		_vm->_util->processInput();
 
 		int16 mouseX, mouseY;
 		MouseButtons mouseButtons;
 
 		int16 key = checkInput(mouseX, mouseY, mouseButtons);
+
+		// Aborting the game
 		if (key == kKeyEscape)
 			break;
 
+		// Shoot the gun
 		if (mouseButtons == kMouseButtonsLeft)
 			shoot(mouseX, mouseY);
 
+		// Oko
 		handleOko(key);
 
+		// Game end check
 		if ((_whitePearlCount >= 20) || (_blackPearlCount >= 2))
 			break;
 	}
 
 	deinit();
+
+	// The game succeeded when we got 2 black pearls
 	return _blackPearlCount >= 2;
 }
 
 void Diving::init() {
+	// Load sounds
 	_vm->_sound->sampleLoad(&_soundShoot     , SOUND_SND, "tirgim.snd");
 	_vm->_sound->sampleLoad(&_soundBreathe   , SOUND_SND, "respir.snd");
 	_vm->_sound->sampleLoad(&_soundWhitePearl, SOUND_SND, "virtou.snd");
 	_vm->_sound->sampleLoad(&_soundBlackPearl, SOUND_SND, "trouve.snd");
 
+	// Load and initialize sprites and animations
 	_background = new DECFile(_vm, "tperle.dec"  , 320, 200);
 	_objects    = new ANIFile(_vm, "tperle.ani"  , 320);
 	_gui        = new ANIFile(_vm, "tperlcpt.ani", 320);
@@ -189,16 +216,16 @@ void Diving::init() {
 	_lungs = new ANIObject(*_gui);
 	_heart = new ANIObject(*_gui);
 
-	_water->setAnimation(7);
+	_water->setAnimation(kAnimationWater);
 	_water->setPosition();
 	_water->setVisible(true);
 
-	_lungs->setAnimation(0);
+	_lungs->setAnimation(kAnimationLungs);
 	_lungs->setPosition();
 	_lungs->setVisible(true);
 	_lungs->setPause(true);
 
-	_heart->setAnimation(1);
+	_heart->setAnimation(kAnimationHeart);
 	_heart->setPosition();
 	_heart->setVisible(true);
 	_heart->setPause(true);
@@ -229,21 +256,21 @@ void Diving::init() {
 	_pearl.pearl = new ANIObject(*_objects);
 	_pearl.black = false;
 
-	_pearl.pearl->setAnimation(4);
+	_pearl.pearl->setAnimation(kAnimationPearl);
 
-	_decorFish[0].decorFish->setAnimation( 6); // Jellyfish
+	_decorFish[0].decorFish->setAnimation(kAnimationJellyfish);
 	_decorFish[0].deltaX = 0;
 
-	_decorFish[1].decorFish->setAnimation(32); // Swarm of red/green fish
+	_decorFish[1].decorFish->setAnimation(kAnimationSwarmRedGreen);
 	_decorFish[1].deltaX = -5;
 
-	_decorFish[2].decorFish->setAnimation(33); // Swarm of orange fish
+	_decorFish[2].decorFish->setAnimation(kAnimationSwarmOrange);
 	_decorFish[2].deltaX = -5;
 
 	for (uint i = 0; i < kMaxShotCount; i++) {
 		_shot[i] = new ANIObject(*_objects);
 
-		_shot[i]->setAnimation(17);
+		_shot[i]->setAnimation(kAnimationShot);
 		_shot[i]->setMode(ANIObject::kModeOnce);
 	}
 
@@ -259,6 +286,7 @@ void Diving::init() {
 
 	_currentShot = 0;
 
+	// Add the animations to our animation list
 	_anims.push_back(_water);
 	for (uint i = 0; i < kMaxShotCount; i++)
 		_anims.push_back(_shot[i]);
@@ -273,8 +301,9 @@ void Diving::init() {
 	_anims.push_back(_lungs);
 	_anims.push_back(_heart);
 
-	_airMeter->setValue(38);
-	_healthMeter->setValue(38);
+	// Air and health meter
+	_airMeter->setMaxValue();
+	_healthMeter->setMaxValue();
 
 	_airCycle = 0;
 	_hurtGracePeriod = 0;
@@ -343,18 +372,23 @@ void Diving::deinit() {
 }
 
 void Diving::initScreen() {
+	// Set framerate
 	_vm->_util->setFrameRate(15);
 
-	memcpy(_vm->_draw->_vgaPalette     , kPalette, 48);
-	memcpy(_vm->_draw->_vgaSmallPalette, kPalette, 48);
+	// Set palette
+	memcpy(_vm->_draw->_vgaPalette     , kPalette, sizeof(kPalette));
+	memcpy(_vm->_draw->_vgaSmallPalette, kPalette, sizeof(kPalette));
 
+	// Draw background decal
 	_vm->_draw->_backSurface->clear();
 	_background->draw(*_vm->_draw->_backSurface);
 
+	// Draw heart and lung boxes
 	int16 left, top, right, bottom;
 	_lungs->draw(*_vm->_draw->_backSurface, left, top, right, bottom);
 	_heart->draw(*_vm->_draw->_backSurface, left, top, right, bottom);
 
+	// Mark everything as dirty
 	_vm->_draw->dirtiedRect(_vm->_draw->_backSurface, 0, 0, 319, 199);
 }
 
@@ -377,6 +411,7 @@ void Diving::initCursor() {
 
 
 void Diving::initPlants() {
+	// Create initial plantlife
 	for (uint i = 0; i < kPlantLevelCount; i++) {
 		for (uint j = 0; j < kPlantPerLevelCount; j++) {
 			int16 prevPlantX = -100;
@@ -389,6 +424,8 @@ void Diving::initPlants() {
 }
 
 void Diving::enterPlant(ManagedPlant &plant, int16 prevPlantX) {
+	// Create a new plant outside the borders of the screen to scroll in
+
 	const PlantLevel &level = kPlantLevels[plant.level];
 	const uint anim = level.plants[_vm->_util->getRandom(kPlantLevels[plant.level].plantCount)];
 
@@ -398,6 +435,7 @@ void Diving::enterPlant(ManagedPlant &plant, int16 prevPlantX) {
 	int16 width, height;
 	plant.plant->getFrameSize(width, height);
 
+	// The new plant is created 140 - 160 pixels to the right of the right-most plant
 	plant.x = prevPlantX + 150 - 10 + _vm->_util->getRandom(21);
 	plant.y = kPlantLevels[plant.level].y - height;
 
@@ -405,11 +443,14 @@ void Diving::enterPlant(ManagedPlant &plant, int16 prevPlantX) {
 	plant.plant->setVisible(true);
 	plant.plant->setPause(false);
 
+	// If the plant is outside of the screen, create a pearl too if necessary
 	if (plant.x > 320)
 		enterPearl(plant.x);
 }
 
 void Diving::enterPearl(int16 x) {
+	// Create a pearl outside the borders of the screen to scroll in
+
 	// Only one pearl is ever visible
 	if (_pearl.pearl->isVisible())
 		return;
@@ -421,6 +462,7 @@ void Diving::enterPearl(int16 x) {
 	// Every 5th pearl is a black one, but only if the location is correct
 	_pearl.black = _hasPearlLocation && (_vm->_util->getRandom(5) == 0);
 
+	// Set the pearl about in the middle of two bottom-level plants
 	_pearl.pearl->setPosition(x + 80, 130);
 
 	_pearl.pearl->setVisible(true);
@@ -429,18 +471,22 @@ void Diving::enterPearl(int16 x) {
 
 void Diving::updateAirMeter() {
 	if (_oko->isBreathing()) {
+		// If Oko is breathing, increase the air meter and play the lungs animation
 		_airCycle = 0;
 		_airMeter->increase();
 		_lungs->setPause(false);
 		return;
 	} else
+		// Otherwise, don't play the lungs animation
 		_lungs->setPause(true);
 
+	// Update the air cycle and decrease the air meter when the cycle ended
 	_airCycle = (_airCycle + 1) % kAirDecreaseRate;
 
 	if (_airCycle == 0)
 		_airMeter->decrease();
 
+	// Without any air, Oko dies
 	if (_airMeter->getValue() == 0)
 		_oko->die();
 }
@@ -469,6 +515,7 @@ void Diving::updateEvilFish() {
 				fish.enterAt = _vm->_util->getTimeKey() + 2000 + _vm->_util->getRandom(8000);
 
 			if (_vm->_util->getTimeKey() >= fish.enterAt) {
+				// The new fish has a random type
 				int fishType = _vm->_util->getRandom(kEvilFishTypeCount);
 				fish.evilFish->mutate(kEvilFishTypes[fishType][0], kEvilFishTypes[fishType][1],
 				                      kEvilFishTypes[fishType][2], kEvilFishTypes[fishType][3],
@@ -520,7 +567,8 @@ void Diving::updateDecorFish() {
 }
 
 void Diving::updatePlants() {
-	if (_oko->getState() == Oko::kStateBreathe)
+	// When Oko isn't moving, the plants don't continue to scroll by
+	if (!_oko->isMoving())
 		return;
 
 	for (uint i = 0; i < kPlantCount; i++) {
@@ -558,7 +606,8 @@ void Diving::updatePearl() {
 	if (!_pearl.pearl->isVisible())
 		return;
 
-	if (_oko->getState() == Oko::kStateBreathe)
+	// When Oko isn't moving, the pearl doesn't continue to scroll by
+	if (!_oko->isMoving())
 		return;
 
 	// Move the pearl
@@ -603,6 +652,7 @@ void Diving::getPearl() {
 void Diving::foundBlackPearl() {
 	_blackPearlCount++;
 
+	// Put the black pearl drawing into the black pearl box
 	if        (_blackPearlCount == 1) {
 		_vm->_draw->_backSurface->blit(*_blackPearl, 0, 0, 10, 7, 147, 179, 0);
 		_vm->_draw->dirtiedRect(_vm->_draw->_backSurface, 147, 179, 157, 186);
@@ -617,6 +667,7 @@ void Diving::foundBlackPearl() {
 void Diving::foundWhitePearl() {
 	_whitePearlCount++;
 
+	// Put the white pearl drawing into the white pearl box
 	int16 x = 54 + (_whitePearlCount - 1) * 8;
 	if (_whitePearlCount > 10)
 		x += 48;
@@ -688,6 +739,7 @@ void Diving::shoot(int16 mouseX, int16 mouseY) {
 void Diving::checkShots() {
 	Common::List<int>::iterator activeShot = _activeShots.begin();
 
+	// Check if we hit something with our shots
 	while (activeShot != _activeShots.end()) {
 		ANIObject &shot = *_shot[*activeShot];
 
@@ -696,6 +748,7 @@ void Diving::checkShots() {
 
 			shot.getPosition(x, y);
 
+			// When we hit an evil fish, it dies
 			for (uint i = 0; i < kEvilFishCount; i++) {
 				EvilFish &evilFish = *_evilFish[i].evilFish;
 
@@ -714,12 +767,14 @@ void Diving::checkShots() {
 
 void Diving::handleOko(int16 key) {
 	if (key == kKeyDown) {
+		// Oko sinks down a level or picks up a pearl if already at the bottom
 		_oko->sink();
 
 		if ((_oko->getState() == Oko::kStatePick) && (_oko->getFrame() == 0))
 			getPearl();
 
 	} else if (key == kKeyUp)
+		// Oko raises up a level or surfaces to breathe if already at the top
 		_oko->raise();
 }
 
diff --git a/engines/gob/minigames/geisha/meter.cpp b/engines/gob/minigames/geisha/meter.cpp
index 82318a303d..335622c5df 100644
--- a/engines/gob/minigames/geisha/meter.cpp
+++ b/engines/gob/minigames/geisha/meter.cpp
@@ -55,6 +55,10 @@ void Meter::setValue(int32 value) {
 	_needUpdate = true;
 }
 
+void Meter::setMaxValue() {
+	setValue(_maxValue);
+}
+
 void Meter::increase(int32 n) {
 	int32 value = CLIP<int32>(_value + n, 0, _maxValue);
 	if (_value == value)
diff --git a/engines/gob/minigames/geisha/meter.h b/engines/gob/minigames/geisha/meter.h
index 398128712a..a9bdb14d0f 100644
--- a/engines/gob/minigames/geisha/meter.h
+++ b/engines/gob/minigames/geisha/meter.h
@@ -50,6 +50,9 @@ public:
 	/** Set the current value the meter is measuring. */
 	void setValue(int32 value);
 
+	/** Set the current value the meter is measuring to the max value. */
+	void setMaxValue();
+
 	/** Increase the current value the meter is measuring. */
 	void increase(int32 n = 1);
 	/** Decrease the current value the meter is measuring. */
diff --git a/engines/gob/minigames/geisha/oko.cpp b/engines/gob/minigames/geisha/oko.cpp
index 1e90b1f8bf..7ad8be6fa2 100644
--- a/engines/gob/minigames/geisha/oko.cpp
+++ b/engines/gob/minigames/geisha/oko.cpp
@@ -161,6 +161,10 @@ bool Oko::isBreathing() const {
 	return (_state == kStateBreathe) && ((getFrame() >= 9) && (getFrame() <= 30));
 }
 
+bool Oko::isMoving() const {
+	return (_state != kStateBreathe) && (_state != kStateHurt) && (_state != kStateDead);
+}
+
 } // End of namespace Geisha
 
 } // End of namespace Gob
diff --git a/engines/gob/minigames/geisha/oko.h b/engines/gob/minigames/geisha/oko.h
index 7fe0001393..82c6f59be4 100644
--- a/engines/gob/minigames/geisha/oko.h
+++ b/engines/gob/minigames/geisha/oko.h
@@ -66,6 +66,7 @@ public:
 	State getState() const;
 
 	bool isBreathing() const;
+	bool isMoving() const;
 
 private:
 	Sound *_sound;
-- 
cgit v1.2.3


From caeae1a7d66843823a31bb99e081da0165a18a22 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 28 Jan 2012 23:05:05 +0100
Subject: GOB: Pick the pearl at the right frame of the animation

And make the pearl picking a bit less...picky.
---
 engines/gob/minigames/geisha/diving.cpp | 34 +++++++++++++++++++++------------
 engines/gob/minigames/geisha/diving.h   |  1 +
 2 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index a635415b9c..3f7d6fc4b3 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -92,8 +92,7 @@ const Diving::PlantLevel Diving::kPlantLevels[] = {
 
 Diving::Diving(GobEngine *vm) : _vm(vm), _background(0),
 	_objects(0), _gui(0), _okoAnim(0), _lungs(0), _heart(0),
-	_blackPearl(0), _airMeter(0), _healthMeter(0),
-	_whitePearlCount(0), _blackPearlCount(0) {
+	_blackPearl(0), _airMeter(0), _healthMeter(0) {
 
 	_blackPearl = new Surface(11, 8, 1);
 
@@ -307,6 +306,9 @@ void Diving::init() {
 
 	_airCycle = 0;
 	_hurtGracePeriod = 0;
+
+	_whitePearlCount = 0;
+	_blackPearlCount = 0;
 }
 
 void Diving::deinit() {
@@ -467,6 +469,7 @@ void Diving::enterPearl(int16 x) {
 
 	_pearl.pearl->setVisible(true);
 	_pearl.pearl->setPause(false);
+	_pearl.picked = false;
 }
 
 void Diving::updateAirMeter() {
@@ -610,6 +613,21 @@ void Diving::updatePearl() {
 	if (!_oko->isMoving())
 		return;
 
+	// Picking the pearl
+	if (_pearl.picked && (_oko->getState() == Oko::kStatePick) && (_oko->getFrame() == 8)) {
+		// Remove the pearl
+		_pearl.pearl->setVisible(false);
+		_pearl.pearl->setPause(true);
+
+		// Add the pearl to our found pearls repository
+		if (_pearl.black)
+			foundBlackPearl();
+		else
+			foundWhitePearl();
+
+		return;
+	}
+
 	// Move the pearl
 	int16 x, y, width, height;
 	_pearl.pearl->getPosition(x, y);
@@ -635,18 +653,10 @@ void Diving::getPearl() {
 	_pearl.pearl->getFramePosition(x, y);
 	_pearl.pearl->getFrameSize(width, height);
 
-	if ((x > 175) || ((x + width) < 168))
+	if ((x > 190) || ((x + width) < 140))
 		return;
 
-	// Remove the pearl
-	_pearl.pearl->setVisible(false);
-	_pearl.pearl->setPause(true);
-
-	// Add the pearl to our found pearls repository
-	if (_pearl.black)
-		foundBlackPearl();
-	else
-		foundWhitePearl();
+	_pearl.picked = true;
 }
 
 void Diving::foundBlackPearl() {
diff --git a/engines/gob/minigames/geisha/diving.h b/engines/gob/minigames/geisha/diving.h
index 5db1b8199a..65ae06ec3e 100644
--- a/engines/gob/minigames/geisha/diving.h
+++ b/engines/gob/minigames/geisha/diving.h
@@ -101,6 +101,7 @@ private:
 	struct ManagedPearl {
 		ANIObject *pearl;
 
+		bool picked;
 		bool black;
 	};
 
-- 
cgit v1.2.3


From 2f7ae1109bb94ab9b0bf1fe20d554c7124eb8465 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sun, 29 Jan 2012 00:00:04 +0100
Subject: GOB: Add a cheat debug command

- Cheat the Diving minigame to a win
- Get the mastermind solution
---
 engines/gob/cheater.cpp                 | 34 +++++++++++++++++
 engines/gob/cheater.h                   | 62 +++++++++++++++++++++++++++++++
 engines/gob/cheater_geisha.cpp          | 66 +++++++++++++++++++++++++++++++++
 engines/gob/console.cpp                 | 19 +++++++++-
 engines/gob/console.h                   |  8 ++++
 engines/gob/gob.cpp                     |  4 +-
 engines/gob/gob.h                       |  3 +-
 engines/gob/inter.h                     |  4 ++
 engines/gob/inter_geisha.cpp            |  9 +++++
 engines/gob/inter_v1.cpp                | 14 -------
 engines/gob/minigames/geisha/diving.cpp | 13 ++++++-
 engines/gob/minigames/geisha/diving.h   |  4 ++
 engines/gob/module.mk                   |  2 +
 13 files changed, 223 insertions(+), 19 deletions(-)
 create mode 100644 engines/gob/cheater.cpp
 create mode 100644 engines/gob/cheater.h
 create mode 100644 engines/gob/cheater_geisha.cpp

(limited to 'engines')

diff --git a/engines/gob/cheater.cpp b/engines/gob/cheater.cpp
new file mode 100644
index 0000000000..5c1f555389
--- /dev/null
+++ b/engines/gob/cheater.cpp
@@ -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.
+ *
+ */
+
+#include "gob/gob.h"
+#include "gob/cheater.h"
+
+namespace Gob {
+
+Cheater::Cheater(GobEngine *vm) : _vm(vm) {
+}
+
+Cheater::~Cheater() {
+}
+
+} // End of namespace Gob
diff --git a/engines/gob/cheater.h b/engines/gob/cheater.h
new file mode 100644
index 0000000000..334a5e88eb
--- /dev/null
+++ b/engines/gob/cheater.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 GOB_CHEATER_H
+#define GOB_CHEATER_H
+
+namespace GUI {
+	class Debugger;
+}
+
+namespace Gob {
+
+namespace Geisha {
+	class Diving;
+}
+
+class GobEngine;
+
+class Cheater {
+public:
+	Cheater(GobEngine *vm);
+	virtual ~Cheater();
+
+	virtual bool cheat(GUI::Debugger &console) = 0;
+
+protected:
+	GobEngine *_vm;
+};
+
+class Cheater_Geisha : public Cheater {
+public:
+	Cheater_Geisha(GobEngine *vm, Geisha::Diving *diving);
+	~Cheater_Geisha();
+
+	bool cheat(GUI::Debugger &console);
+
+private:
+	Geisha::Diving *_diving;
+};
+
+} // End of namespace Gob
+
+#endif // GOB_CHEATER_H
diff --git a/engines/gob/cheater_geisha.cpp b/engines/gob/cheater_geisha.cpp
new file mode 100644
index 0000000000..3d8c56707d
--- /dev/null
+++ b/engines/gob/cheater_geisha.cpp
@@ -0,0 +1,66 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 "gui/debugger.h"
+
+#include "gob/gob.h"
+#include "gob/cheater.h"
+#include "gob/inter.h"
+
+#include "gob/minigames/geisha/diving.h"
+
+namespace Gob {
+
+Cheater_Geisha::Cheater_Geisha(GobEngine *vm, Geisha::Diving *diving) :
+	Cheater(vm), _diving(diving) {
+
+}
+
+Cheater_Geisha::~Cheater_Geisha() {
+}
+
+bool Cheater_Geisha::cheat(GUI::Debugger &console) {
+	// A cheat to get around the Diving minigame
+	if (_diving->isPlaying()) {
+		_diving->cheatWin();
+		return false;
+	}
+
+	// A cheat to get around the mastermind puzzle
+	if (_vm->isCurrentTot("hard.tot") && _vm->_inter->_variables) {
+		uint32 digit1 = READ_VARO_UINT32(0x768);
+		uint32 digit2 = READ_VARO_UINT32(0x76C);
+		uint32 digit3 = READ_VARO_UINT32(0x770);
+		uint32 digit4 = READ_VARO_UINT32(0x774);
+		uint32 digit5 = READ_VARO_UINT32(0x778);
+
+		if (digit1 && digit2 && digit3 && digit4 && digit5)
+			console.DebugPrintf("Mastermind solution: %d %d %d %d %d\n",
+			                    digit1, digit2, digit3, digit4, digit5);
+
+		return true;
+	}
+
+	return true;
+}
+
+} // End of namespace Gob
diff --git a/engines/gob/console.cpp b/engines/gob/console.cpp
index e7296fb81b..76ccb70dca 100644
--- a/engines/gob/console.cpp
+++ b/engines/gob/console.cpp
@@ -24,22 +24,32 @@
 #include "gob/gob.h"
 #include "gob/inter.h"
 #include "gob/dataio.h"
+#include "gob/cheater.h"
 
 namespace Gob {
 
-GobConsole::GobConsole(GobEngine *vm) : GUI::Debugger(), _vm(vm) {
+GobConsole::GobConsole(GobEngine *vm) : GUI::Debugger(), _vm(vm), _cheater(0) {
 	DCmd_Register("varSize",      WRAP_METHOD(GobConsole, cmd_varSize));
 	DCmd_Register("dumpVars",     WRAP_METHOD(GobConsole, cmd_dumpVars));
 	DCmd_Register("var8",         WRAP_METHOD(GobConsole, cmd_var8));
 	DCmd_Register("var16",        WRAP_METHOD(GobConsole, cmd_var16));
 	DCmd_Register("var32",        WRAP_METHOD(GobConsole, cmd_var32));
 	DCmd_Register("varString",    WRAP_METHOD(GobConsole, cmd_varString));
+	DCmd_Register("cheat",        WRAP_METHOD(GobConsole, cmd_cheat));
 	DCmd_Register("listArchives", WRAP_METHOD(GobConsole, cmd_listArchives));
 }
 
 GobConsole::~GobConsole() {
 }
 
+void GobConsole::registerCheater(Cheater *cheater) {
+	_cheater = cheater;
+}
+
+void GobConsole::unregisterCheater() {
+	_cheater = 0;
+}
+
 bool GobConsole::cmd_varSize(int argc, const char **argv) {
 	DebugPrintf("Size of the variable space: %d bytes\n", _vm->_inter->_variables->getSize());
 	return true;
@@ -155,6 +165,13 @@ bool GobConsole::cmd_varString(int argc, const char **argv) {
 	return true;
 }
 
+bool GobConsole::cmd_cheat(int argc, const char **argv) {
+	if (_cheater)
+		return _cheater->cheat(*this);
+
+	return true;
+}
+
 bool GobConsole::cmd_listArchives(int argc, const char **argv) {
 	Common::Array<ArchiveInfo> info;
 
diff --git a/engines/gob/console.h b/engines/gob/console.h
index b9c3f5ed70..5b6f0255dd 100644
--- a/engines/gob/console.h
+++ b/engines/gob/console.h
@@ -28,15 +28,21 @@
 namespace Gob {
 
 class GobEngine;
+class Cheater;
 
 class GobConsole : public GUI::Debugger {
 public:
 	GobConsole(GobEngine *vm);
 	virtual ~GobConsole(void);
 
+	void registerCheater(Cheater *cheater);
+	void unregisterCheater();
+
 private:
 	GobEngine *_vm;
 
+	Cheater *_cheater;
+
 	bool cmd_varSize(int argc, const char **argv);
 	bool cmd_dumpVars(int argc, const char **argv);
 	bool cmd_var8(int argc, const char **argv);
@@ -44,6 +50,8 @@ private:
 	bool cmd_var32(int argc, const char **argv);
 	bool cmd_varString(int argc, const char **argv);
 
+	bool cmd_cheat(int argc, const char **argv);
+
 	bool cmd_listArchives(int argc, const char **argv);
 };
 
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 51a117b7ec..4e7aa467b5 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -147,9 +147,9 @@ GobEngine::GobEngine(OSystem *syst) : Engine(syst), _rnd("gob") {
 }
 
 GobEngine::~GobEngine() {
-	delete _console;
-
 	deinitGameParts();
+
+	delete _console;
 }
 
 const char *GobEngine::getLangDesc(int16 language) const {
diff --git a/engines/gob/gob.h b/engines/gob/gob.h
index 74c882e021..ea2323807a 100644
--- a/engines/gob/gob.h
+++ b/engines/gob/gob.h
@@ -160,7 +160,6 @@ private:
 	GameType _gameType;
 	int32 _features;
 	Common::Platform _platform;
-	GobConsole *_console;
 
 	uint32 _pauseStart;
 
@@ -194,6 +193,8 @@ public:
 	bool _copyProtection;
 	bool _noMusic;
 
+	GobConsole *_console;
+
 	Global *_global;
 	Util *_util;
 	DataIO *_dataIO;
diff --git a/engines/gob/inter.h b/engines/gob/inter.h
index 6fd4dc2187..c79b6e2260 100644
--- a/engines/gob/inter.h
+++ b/engines/gob/inter.h
@@ -33,6 +33,8 @@
 
 namespace Gob {
 
+class Cheater_Geisha;
+
 namespace Geisha {
 	class Diving;
 	class Penetration;
@@ -371,6 +373,8 @@ protected:
 private:
 	Geisha::Diving      *_diving;
 	Geisha::Penetration *_penetration;
+
+	Cheater_Geisha *_cheater;
 };
 
 class Inter_v2 : public Inter_v1 {
diff --git a/engines/gob/inter_geisha.cpp b/engines/gob/inter_geisha.cpp
index 1f2a7fab7f..7f21ceb91d 100644
--- a/engines/gob/inter_geisha.cpp
+++ b/engines/gob/inter_geisha.cpp
@@ -34,6 +34,7 @@
 #include "gob/game.h"
 #include "gob/draw.h"
 #include "gob/video.h"
+#include "gob/cheater.h"
 #include "gob/save/saveload.h"
 #include "gob/sound/sound.h"
 #include "gob/sound/sounddesc.h"
@@ -53,9 +54,17 @@ Inter_Geisha::Inter_Geisha(GobEngine *vm) : Inter_v1(vm),
 
 	_diving      = new Geisha::Diving(vm);
 	_penetration = new Geisha::Penetration(vm);
+
+	_cheater = new Cheater_Geisha(vm, _diving);
+
+	_vm->_console->registerCheater(_cheater);
 }
 
 Inter_Geisha::~Inter_Geisha() {
+	_vm->_console->unregisterCheater();
+
+	delete _cheater;
+
 	delete _penetration;
 	delete _diving;
 }
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index 2d3f2ad731..9aa190a456 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -658,20 +658,6 @@ void Inter_v1::o1_callSub(OpFuncParams &params) {
 		return;
 	}
 
-	// A cheat to get around the stupid mastermind puzzle in Geisha,
-	// while we're still testing it
-	if ((_vm->getGameType() == kGameTypeGeisha) && (offset == 12934) &&
-	    _vm->isCurrentTot("hard.tot") && _vm->_inter->_variables) {
-
-		uint32 digit1 = READ_VARO_UINT32(0x768);
-		uint32 digit2 = READ_VARO_UINT32(0x76C);
-		uint32 digit3 = READ_VARO_UINT32(0x770);
-		uint32 digit4 = READ_VARO_UINT32(0x774);
-		uint32 digit5 = READ_VARO_UINT32(0x778);
-
-		warning("Mastermind solution: %d %d %d %d %d", digit1, digit2, digit3, digit4, digit5);
-	}
-
 	// Skipping the copy protection screen in Gobliiins
 	if (!_vm->_copyProtection && (_vm->getGameType() == kGameTypeGob1) && (offset == 3905) &&
 	    _vm->isCurrentTot(_vm->_startTot)) {
diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index 3f7d6fc4b3..e097c1d523 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -92,7 +92,7 @@ const Diving::PlantLevel Diving::kPlantLevels[] = {
 
 Diving::Diving(GobEngine *vm) : _vm(vm), _background(0),
 	_objects(0), _gui(0), _okoAnim(0), _lungs(0), _heart(0),
-	_blackPearl(0), _airMeter(0), _healthMeter(0) {
+	_blackPearl(0), _airMeter(0), _healthMeter(0), _isPlaying(false) {
 
 	_blackPearl = new Surface(11, 8, 1);
 
@@ -127,6 +127,7 @@ Diving::~Diving() {
 
 bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 	_hasPearlLocation = hasPearlLocation;
+	_isPlaying = true;
 
 	// Fade to black
 	_vm->_palAnim->fade(0, 0, 0);
@@ -194,10 +195,20 @@ bool Diving::play(uint16 playerCount, bool hasPearlLocation) {
 
 	deinit();
 
+	_isPlaying = false;
+
 	// The game succeeded when we got 2 black pearls
 	return _blackPearlCount >= 2;
 }
 
+bool Diving::isPlaying() const {
+	return _isPlaying;
+}
+
+void Diving::cheatWin() {
+	_blackPearlCount = 2;
+}
+
 void Diving::init() {
 	// Load sounds
 	_vm->_sound->sampleLoad(&_soundShoot     , SOUND_SND, "tirgim.snd");
diff --git a/engines/gob/minigames/geisha/diving.h b/engines/gob/minigames/geisha/diving.h
index 65ae06ec3e..089d60b260 100644
--- a/engines/gob/minigames/geisha/diving.h
+++ b/engines/gob/minigames/geisha/diving.h
@@ -51,6 +51,9 @@ public:
 
 	bool play(uint16 playerCount, bool hasPearlLocation);
 
+	bool isPlaying() const;
+	void cheatWin();
+
 private:
 	static const uint kEvilFishCount  =  3;
 	static const uint kDecorFishCount =  3;
@@ -148,6 +151,7 @@ private:
 	SoundDesc _soundBlackPearl;
 
 	bool _hasPearlLocation;
+	bool _isPlaying;
 
 
 	void init();
diff --git a/engines/gob/module.mk b/engines/gob/module.mk
index 09098f0ca9..1c83b4ae40 100644
--- a/engines/gob/module.mk
+++ b/engines/gob/module.mk
@@ -3,6 +3,8 @@ MODULE := engines/gob
 MODULE_OBJS := \
 	anifile.o \
 	aniobject.o \
+	cheater.o \
+	cheater_geisha.o \
 	console.o \
 	dataio.o \
 	databases.o \
-- 
cgit v1.2.3


From 885a29a1def4cb8c9f5da1c6a4967b49bdcde63a Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sun, 29 Jan 2012 00:12:11 +0100
Subject: GOB: Fix a segfault

---
 engines/gob/minigames/geisha/diving.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/diving.cpp b/engines/gob/minigames/geisha/diving.cpp
index e097c1d523..6f4c6e168a 100644
--- a/engines/gob/minigames/geisha/diving.cpp
+++ b/engines/gob/minigames/geisha/diving.cpp
@@ -91,7 +91,7 @@ const Diving::PlantLevel Diving::kPlantLevels[] = {
 
 
 Diving::Diving(GobEngine *vm) : _vm(vm), _background(0),
-	_objects(0), _gui(0), _okoAnim(0), _lungs(0), _heart(0),
+	_objects(0), _gui(0), _okoAnim(0), _water(0), _lungs(0), _heart(0),
 	_blackPearl(0), _airMeter(0), _healthMeter(0), _isPlaying(false) {
 
 	_blackPearl = new Surface(11, 8, 1);
-- 
cgit v1.2.3


From 0ceeee8148524fc36c3a9b3e7640b987867ecb19 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 29 Jan 2012 17:07:38 +1100
Subject: SCUMM: Add script number differences in SCUMM V0, for two work
 arounds in Maniac Mansion.

---
 engines/scumm/script_v2.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 7f02e899b4..edb046d571 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1171,9 +1171,15 @@ void ScummEngine_v2::o2_startScript() {
 	// imprisonment of the player), then any attempt to start script 87
 	// (which makes Ted go answer the door bell) is simply ignored. This
 	// way, the door bell still chimes, but Ted ignores it.
-	if (_game.id == GID_MANIAC && script == 87) {
-		if (isScriptRunning(88) || isScriptRunning(89)) {
-			return;
+	if (_game.id == GID_MANIAC) {
+		if (_game.version >= 1 && script == 87) {
+			if (isScriptRunning(88) || isScriptRunning(89))
+				return;
+		}
+		// Script numbers are different in V0
+		if (_game.version == 0 && script == 82) {
+			if (isScriptRunning(83) || isScriptRunning(84))
+				return;
 		}
 	}
 
@@ -1189,7 +1195,10 @@ void ScummEngine_v2::o2_stopScript() {
 	// FIXME: Nasty hack for bug #915575
 	// Don't let the exit script for room 26 stop the script (116), when
 	// switching to the dungeon (script 89)
-		if ((script == 116) && isScriptRunning(89))
+		if (_game.version >= 1 && script == 116 && isScriptRunning(89))
+			return;
+		// Script numbers are different in V0
+		if (_game.version == 0 && script == 111 && isScriptRunning(84))
 			return;
 	}
 
-- 
cgit v1.2.3


From f11b52a097912cfc24728259150c00227167df38 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 29 Jan 2012 16:15:27 +0100
Subject: KYRA: Prevent unnecessary removal of const in some casts.

---
 engines/kyra/gui_eob.cpp       |  2 +-
 engines/kyra/staticres_eob.cpp | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 611eab1bff..5c2c3e5f33 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -3781,7 +3781,7 @@ void GUI_EoB::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFil
 	if (!b)
 		return;
 
-	EoBMenuButtonDef *d = (EoBMenuButtonDef *)b->extButtonDef;
+	const EoBMenuButtonDef *d = (const EoBMenuButtonDef *)b->extButtonDef;
 
 	if (d->flags & 1)
 		drawMenuButtonBox(b->x, b->y, b->width, b->height, clicked, noFill);
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index ce43d22362..638a185367 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -369,13 +369,13 @@ void EoBCoreEngine::initStaticResource() {
 	_mnWord = _staticres->loadStrings(kEoBBaseManWord, _mnNumWord);
 	_mnPrompt = _staticres->loadStrings(kEoBBaseManPrompt, temp);
 
-	_monsterStepTable0 = (int8 *)_staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterStepTable02 : kEoBBaseMonsterStepTable01, temp);
-	_monsterStepTable1 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable1, temp);
-	_monsterStepTable2 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable2, temp);
-	_monsterStepTable3 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable3, temp);
+	_monsterStepTable0 = (const int8 *)_staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterStepTable02 : kEoBBaseMonsterStepTable01, temp);
+	_monsterStepTable1 = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable1, temp);
+	_monsterStepTable2 = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable2, temp);
+	_monsterStepTable3 = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable3, temp);
 	_monsterCloseAttPosTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttPosTable1, temp);
 	_monsterCloseAttPosTable2 = _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterCloseAttPosTable22 : kEoBBaseMonsterCloseAttPosTable21, temp);
-	_monsterCloseAttUnkTable = (int8 *)_staticres->loadRawData(kEoBBaseMonsterCloseAttUnkTable, temp);
+	_monsterCloseAttUnkTable = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterCloseAttUnkTable, temp);
 	_monsterCloseAttChkTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttChkTable1, temp);
 	_monsterCloseAttChkTable2 = _staticres->loadRawData(kEoBBaseMonsterCloseAttChkTable2, temp);
 	_monsterCloseAttDstTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttDstTable1, temp);
-- 
cgit v1.2.3


From 21fb4af15494e8a39c08e88a8d51f26f6ed58dff Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 29 Jan 2012 16:33:43 +0100
Subject: SWORD25: Return 0 instead of false in Screenshot::createThumbnail.

This should "fix" a g++ warning.
---
 engines/sword25/gfx/screenshot.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/sword25/gfx/screenshot.cpp b/engines/sword25/gfx/screenshot.cpp
index de7b62fba9..0ea4bff906 100644
--- a/engines/sword25/gfx/screenshot.cpp
+++ b/engines/sword25/gfx/screenshot.cpp
@@ -74,7 +74,7 @@ Common::SeekableReadStream *Screenshot::createThumbnail(Graphics::Surface *data)
 	// The source image must be 800x600.
 	if (data->w != 800 || data->h != 600 || data->format.bytesPerPixel != 4) {
 		error("The sreenshot dimensions have to be 800x600 in order to be saved as a thumbnail.");
-		return false;
+		return 0;
 	}
 
 	// Buffer for the output thumbnail
-- 
cgit v1.2.3


From fa401a2d3d26e1f41e1831dec5f35f1120ec8910 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 29 Jan 2012 16:34:41 +0100
Subject: SCI: Remove unnecessary break after return statement.

---
 engines/sci/engine/kpathing.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines')

diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 375aeaa06b..089b325a7f 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -1545,7 +1545,6 @@ reg_t kAvoidPath(EngineState *s, int argc, reg_t *argv) {
 	default:
 		warning("Unknown AvoidPath subfunction %d", argc);
 		return NULL_REG;
-		break;
 	}
 }
 
-- 
cgit v1.2.3


From 54041675e5be69288f0e7fdf43c5a20f5a183ab3 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 29 Jan 2012 21:35:36 +0100
Subject: TOLTECS: Some formatting fixes.

---
 engines/toltecs/menu.cpp   |   2 +-
 engines/toltecs/movie.cpp  |   3 +-
 engines/toltecs/script.cpp | 274 ++++++++++++++++++++++-----------------------
 3 files changed, 139 insertions(+), 140 deletions(-)

(limited to 'engines')

diff --git a/engines/toltecs/menu.cpp b/engines/toltecs/menu.cpp
index 00a0372e99..7e7349802d 100644
--- a/engines/toltecs/menu.cpp
+++ b/engines/toltecs/menu.cpp
@@ -118,7 +118,7 @@ void MenuSystem::handleEvents() {
 	Common::Event event;
 	Common::EventManager *eventMan = _vm->_system->getEventManager();
 	while (eventMan->pollEvent(event)) {
-	switch (event.type) {
+		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
 			handleKeyDown(event.kbd);
 			break;
diff --git a/engines/toltecs/movie.cpp b/engines/toltecs/movie.cpp
index 054683b63e..28021950a7 100644
--- a/engines/toltecs/movie.cpp
+++ b/engines/toltecs/movie.cpp
@@ -268,7 +268,7 @@ bool MoviePlayer::handleInput() {
 	Common::Event event;
 	Common::EventManager *eventMan = g_system->getEventManager();
 	while (eventMan->pollEvent(event)) {
-	switch (event.type) {
+		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
 			if (event.kbd.keycode == Common::KEYCODE_ESCAPE)
 				return false;
@@ -279,7 +279,6 @@ bool MoviePlayer::handleInput() {
 		case Common::EVENT_QUIT:
 			_vm->quitGame();
 			return false;
-			break;
 		default:
 			break;
 		}
diff --git a/engines/toltecs/script.cpp b/engines/toltecs/script.cpp
index e5fc865f5b..107f4ea11e 100644
--- a/engines/toltecs/script.cpp
+++ b/engines/toltecs/script.cpp
@@ -490,57 +490,57 @@ void ScriptInterpreter::execScriptFunction(uint16 index) {
 
 VarType ScriptInterpreter::getGameVarType(uint variable) {
 	switch (variable) {
-		case 0:	 return vtByte;
-		case 1:	 return vtWord;
-		case 2:	 return vtWord;
-		case 3:	 return vtByte;
-		case 4:	 return vtWord;
-		case 5:	 return vtWord;
-		case 6:	 return vtWord;
-		case 7:	 return vtWord;
-		case 8:	 return vtWord;
-		case 9:	 return vtWord;
-		case 10:	 return vtWord;
-		case 11:	 return vtWord;
-		case 12:	 return vtByte;
-		case 13:	 return vtWord;
-		case 14:	 return vtWord;
-		case 15:	 return vtWord;
-		case 16:	 return vtWord;
-		case 17:	 return vtWord;
-		case 18:	 return vtWord;
-		case 19:	 return vtWord;
-		case 20:	 return vtWord;
-		case 21:	 return vtWord;
-		default:
-			error("Invalid game variable");
+	case 0:	 return vtByte;
+	case 1:	 return vtWord;
+	case 2:	 return vtWord;
+	case 3:	 return vtByte;
+	case 4:	 return vtWord;
+	case 5:	 return vtWord;
+	case 6:	 return vtWord;
+	case 7:	 return vtWord;
+	case 8:	 return vtWord;
+	case 9:	 return vtWord;
+	case 10:	 return vtWord;
+	case 11:	 return vtWord;
+	case 12:	 return vtByte;
+	case 13:	 return vtWord;
+	case 14:	 return vtWord;
+	case 15:	 return vtWord;
+	case 16:	 return vtWord;
+	case 17:	 return vtWord;
+	case 18:	 return vtWord;
+	case 19:	 return vtWord;
+	case 20:	 return vtWord;
+	case 21:	 return vtWord;
+	default:
+		error("Invalid game variable");
 	}
 }
 
 const char *getVarName(uint variable) {
 	switch (variable) {
-		case 0: return "mouseDisabled";
-		case 1: return "mouseY";
-		case 2: return "mouseX";
-		case 3: return "mouseButton";
-		case 4: return "verbLineY";
-		case 5: return "verbLineX";
-		case 6: return "verbLineWidth";
-		case 7: return "verbLineCount";
-		case 8: return "verbLineNum";
-		case 9: return "talkTextItemNum";
-		case 10: return "talkTextY";
-		case 11: return "talkTextX";
-		case 12: return "talkTextFontColor";
-		case 13: return "cameraY";
-		case 14: return "cameraX";
-		case 15: return "walkSpeedY";
-		case 16: return "walkSpeedX";
-		case 17: return "flag01";
-		case 18: return "sceneResIndex";
-		case 19: return "guiHeight";
-		case 20: return "sceneHeight";
-		case 21: return "sceneWidth";
+	case 0: return "mouseDisabled";
+	case 1: return "mouseY";
+	case 2: return "mouseX";
+	case 3: return "mouseButton";
+	case 4: return "verbLineY";
+	case 5: return "verbLineX";
+	case 6: return "verbLineWidth";
+	case 7: return "verbLineCount";
+	case 8: return "verbLineNum";
+	case 9: return "talkTextItemNum";
+	case 10: return "talkTextY";
+	case 11: return "talkTextX";
+	case 12: return "talkTextFontColor";
+	case 13: return "cameraY";
+	case 14: return "cameraX";
+	case 15: return "walkSpeedY";
+	case 16: return "walkSpeedX";
+	case 17: return "flag01";
+	case 18: return "sceneResIndex";
+	case 19: return "guiHeight";
+	case 20: return "sceneHeight";
+	case 21: return "sceneWidth";
 	}
 	return "(invalid)";
 }
@@ -549,31 +549,31 @@ int16 ScriptInterpreter::getGameVar(uint variable) {
 	debug(0, "ScriptInterpreter::getGameVar(%d{%s})", variable, getVarName(variable));
 	
 	switch (variable) {
-		case  0: return _vm->_mouseDisabled;
-		case  1: return _vm->_mouseY;
-		case  2: return _vm->_mouseX;
-		case  3: return _vm->_mouseButton;
-		case  4: return _vm->_screen->_verbLineY;
-		case  5: return _vm->_screen->_verbLineX;
-		case  6: return _vm->_screen->_verbLineWidth;
-		case  7: return _vm->_screen->_verbLineCount;
-		case  8: return _vm->_screen->_verbLineNum;
-		case  9: return _vm->_screen->_talkTextItemNum;
-		case 10: return _vm->_screen->_talkTextY;
-		case 11: return _vm->_screen->_talkTextX;
-		case 12: return _vm->_screen->_talkTextFontColor;
-		case 13: return _vm->_cameraY;
-		case 14: return _vm->_cameraX;
-		case 15: return _vm->_walkSpeedY;
-		case 16: return _vm->_walkSpeedX;
-		case 17: return _vm->_flag01;
-		case 18: return _vm->_sceneResIndex;
-		case 19: return _vm->_guiHeight;
-		case 20: return _vm->_sceneHeight;
-		case 21: return _vm->_sceneWidth;
-		default:
-			warning("Getting unimplemented game variable %s (%d)", getVarName(variable), variable);
-			return 0;
+	case  0: return _vm->_mouseDisabled;
+	case  1: return _vm->_mouseY;
+	case  2: return _vm->_mouseX;
+	case  3: return _vm->_mouseButton;
+	case  4: return _vm->_screen->_verbLineY;
+	case  5: return _vm->_screen->_verbLineX;
+	case  6: return _vm->_screen->_verbLineWidth;
+	case  7: return _vm->_screen->_verbLineCount;
+	case  8: return _vm->_screen->_verbLineNum;
+	case  9: return _vm->_screen->_talkTextItemNum;
+	case 10: return _vm->_screen->_talkTextY;
+	case 11: return _vm->_screen->_talkTextX;
+	case 12: return _vm->_screen->_talkTextFontColor;
+	case 13: return _vm->_cameraY;
+	case 14: return _vm->_cameraX;
+	case 15: return _vm->_walkSpeedY;
+	case 16: return _vm->_walkSpeedX;
+	case 17: return _vm->_flag01;
+	case 18: return _vm->_sceneResIndex;
+	case 19: return _vm->_guiHeight;
+	case 20: return _vm->_sceneHeight;
+	case 21: return _vm->_sceneWidth;
+	default:
+		warning("Getting unimplemented game variable %s (%d)", getVarName(variable), variable);
+		return 0;
 	}
 }
 
@@ -581,72 +581,72 @@ void ScriptInterpreter::setGameVar(uint variable, int16 value) {
 	debug(0, "ScriptInterpreter::setGameVar(%d{%s}, %d)", variable, getVarName(variable), value);
 	
 	switch (variable) {
-		case 0:
-			_vm->_mouseDisabled = value;
-			CursorMan.showMouse(value == 0);
-			break;
-		case 3:
-			_vm->_mouseButton = value;
-			break;
-		case 4:
-			_vm->_screen->_verbLineY = value;
-			break;
-		case 5:
-			_vm->_screen->_verbLineX = value;
-			break;
-		case 6:
-			_vm->_screen->_verbLineWidth = value;
-			break;
-		case 7:
-			_vm->_screen->_verbLineCount = value;
-			break;
-		case 8:
-			_vm->_screen->_verbLineNum = value;
-			break;
-		case 9:
-			_vm->_screen->_talkTextItemNum = value;
-			break;
-		case 10:
-			_vm->_screen->_talkTextY = value;
-			break;
-		case 11:
-			_vm->_screen->_talkTextX = value;
-			break;
-		case 12:
-			_vm->_screen->_talkTextFontColor = value;
-			break;
-		case 13:
-			_vm->_cameraY = value;
-			break;
-		case 14:
-			_vm->_cameraX = value;
-			break;
-		case 15:
-			_vm->_walkSpeedY = value;
-			break;
-		case 16:
-			_vm->_walkSpeedX = value;
-			break;
-		case 17:
-			_vm->_flag01 = value != 0;
-			break;
-		case 18:
-			_vm->_sceneResIndex = value;
-			break;
-		case 19:
-			_vm->_guiHeight = value;
-			break;
-		case 20:
-			_vm->_sceneHeight = value;
-			break;
-		case 21:
-			_vm->_sceneWidth = value;
-			break;
-		case 1:
-		case 2:
-		default:
-			warning("Setting unimplemented game variable %s (%d) to %d", getVarName(variable), variable, value);
-			break;
+	case 0:
+		_vm->_mouseDisabled = value;
+		CursorMan.showMouse(value == 0);
+		break;
+	case 3:
+		_vm->_mouseButton = value;
+		break;
+	case 4:
+		_vm->_screen->_verbLineY = value;
+		break;
+	case 5:
+		_vm->_screen->_verbLineX = value;
+		break;
+	case 6:
+		_vm->_screen->_verbLineWidth = value;
+		break;
+	case 7:
+		_vm->_screen->_verbLineCount = value;
+		break;
+	case 8:
+		_vm->_screen->_verbLineNum = value;
+		break;
+	case 9:
+		_vm->_screen->_talkTextItemNum = value;
+		break;
+	case 10:
+		_vm->_screen->_talkTextY = value;
+		break;
+	case 11:
+		_vm->_screen->_talkTextX = value;
+		break;
+	case 12:
+		_vm->_screen->_talkTextFontColor = value;
+		break;
+	case 13:
+		_vm->_cameraY = value;
+		break;
+	case 14:
+		_vm->_cameraX = value;
+		break;
+	case 15:
+		_vm->_walkSpeedY = value;
+		break;
+	case 16:
+		_vm->_walkSpeedX = value;
+		break;
+	case 17:
+		_vm->_flag01 = value != 0;
+		break;
+	case 18:
+		_vm->_sceneResIndex = value;
+		break;
+	case 19:
+		_vm->_guiHeight = value;
+		break;
+	case 20:
+		_vm->_sceneHeight = value;
+		break;
+	case 21:
+		_vm->_sceneWidth = value;
+		break;
+	case 1:
+	case 2:
+	default:
+		warning("Setting unimplemented game variable %s (%d) to %d", getVarName(variable), variable, value);
+		break;
 	}
 
 }
-- 
cgit v1.2.3


From 5e50948e9d8c6024e8d65c638003e3d7bdd61489 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 29 Jan 2012 21:38:37 +0100
Subject: KYRA: Remove unnecessary semicolon

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

(limited to 'engines')

diff --git a/engines/kyra/eob.cpp b/engines/kyra/eob.cpp
index 7524b077ff..a2ddc928fd 100644
--- a/engines/kyra/eob.cpp
+++ b/engines/kyra/eob.cpp
@@ -326,7 +326,7 @@ void EoBEngine::replaceMonster(int unit, uint16 block, int pos, int dir, int typ
 
 	for (int i = 0; i < 30; i++) {
 		if (_monsters[i].hitPointsCur <= 0) {
-			initMonster(i, unit, block, pos, dir, type, shpIndex, mode, h2, randItem, fixedItem);;
+			initMonster(i, unit, block, pos, dir, type, shpIndex, mode, h2, randItem, fixedItem);
 			break;
 		}
 	}
-- 
cgit v1.2.3


From 14523275a35b31eb61e5afd08499aa9354a9eb35 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 30 Jan 2012 01:16:59 +0100
Subject: TSAGE: R2R - Implement scene 3500

This required a fix for direct draw code
---
 engines/tsage/core.h                            |    2 +-
 engines/tsage/ringworld2/ringworld2_logic.cpp   |  285 ++++-
 engines/tsage/ringworld2/ringworld2_logic.h     |   34 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp |  268 +----
 engines/tsage/ringworld2/ringworld2_scenes1.h   |   25 +-
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 1294 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes3.h   |  120 +++
 7 files changed, 1738 insertions(+), 290 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 542e1d9744..680d9cf76d 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -516,8 +516,8 @@ private:
 
 	int getNewFrame();
 	void animEnded();
-	int changeFrame();
 public:
+	int changeFrame();
 	uint32 _updateStartFrame;
 	uint32 _walkStartFrame;
 	Common::Point _field2E;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 54d9bc362f..8df0a5bda2 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -259,7 +259,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 3400:
 		return new Scene3400();
 	case 3500:
-		error("Missing scene %d from group 3", sceneNumber);
+		return new Scene3500();
 	case 3600:
 		return new Scene3600();
 	case 3700:
@@ -1156,6 +1156,289 @@ void SceneAreaObject::setDetails(int resNum, int lookLineNum, int talkLineNum, i
 		2, (SceneItem *)NULL);
 }
 
+/*****************************************************************************/
+
+UnkObject1200::UnkObject1200() {
+	_field16 = _field3A = NULL;
+	_field12 = _field14 = 0;
+	_field26 = _field28 = _field2A = _field2C = _field2E = _field30 = 0;
+	_field32 = _field34 = _field36 = _field38 = _field3E = _field40 = 0;
+}
+
+void UnkObject1200::synchronize(Serializer &s) {
+	SavedObject::synchronize(s);
+
+	_rect1.synchronize(s);
+	_rect2.synchronize(s);
+
+	// FIXME: syncrhonize _field16 and _field3A
+
+	s.syncAsSint16LE(_field12);
+	s.syncAsSint16LE(_field14);
+	s.syncAsSint16LE(_field26);
+	s.syncAsSint16LE(_field28);
+	s.syncAsSint16LE(_field2A);
+	s.syncAsSint16LE(_field2C);
+	s.syncAsSint16LE(_field2E);
+	s.syncAsSint16LE(_field30);
+	s.syncAsSint16LE(_field32);
+	s.syncAsSint16LE(_field34);
+	s.syncAsSint16LE(_field36);
+	s.syncAsSint16LE(_field38);
+	s.syncAsSint16LE(_field3E);
+	s.syncAsSint16LE(_field40);
+}
+
+void UnkObject1200::sub51AE9(int arg1) {
+	warning("STUB: UnkObject1200::sub51AE9()");
+}
+
+int UnkObject1200::sub51AF8(Common::Point pt) {
+	if (!_rect1.contains(pt))
+		return -1;
+	
+	int tmp1 = (pt.x - _rect1.left + _field2E) / _field2A;
+	int tmp2 = (pt.y - _rect1.top + _field30) / _field2C;
+
+	if ((tmp1 >= 0) && (tmp2 >= 0) && (_field26 > tmp1) && (_field28 > tmp2))
+		return _field16[(((_field26 * tmp2) + tmp1)* 2)];
+
+	return -1;
+}
+
+bool UnkObject1200::sub51AFD(Common::Point pt) {
+	int retval = false;
+
+	_field2E = pt.x;
+	_field30 = pt.y;
+
+	if (_field2E < _rect2.top) {
+		_field2E = _rect2.top;
+		retval = true;
+	}
+
+	if (_field30 < _rect2.left) {
+		_field30 = _rect2.left;
+		retval = true;
+	}
+
+	if (_field2E + _rect1.width() > _rect2.right) {
+		_field2E = _rect2.right - _rect1.width();
+		retval = true;
+	}
+
+	if (_field30 + _rect1.height() > _rect2.bottom) {
+		_field30 = _rect2.bottom - _rect1.height();
+		retval = true;
+	}
+
+	return retval;
+}
+
+void UnkObject1200::sub51B02() {
+	warning("STUB: UnkObject1200::sub51B02()");
+}
+
+void UnkObject1200::sub9EDE8(Rect rect) {
+	_rect1 = rect;
+	warning("FIXME: UnkObject1200::sub9EDE8()");
+//	_rect1.clip(g_globals->gfxManager()._bounds);
+}
+
+int UnkObject1200::sub9EE22(int &arg1, int &arg2) {
+	arg1 /= _field2A;
+	arg2 /= _field2C;
+	
+	if ((arg1 >= 0) && (arg2 >= 0) && (_field26 > arg1) && (_field28 > arg2)) {
+		return _field16[(((_field26 * arg2) + arg1) * 2)];
+	}
+
+	return -1;
+}
+
+void Scene1200::sub9DAD6(int indx) {
+	_object1.sub9EE22(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);
+	
+	switch (indx) {
+	case 0:
+		if ( ((_object1.sub51AF8(Common::Point(200, 50)) > 36) || (_object1.sub51AF8(Common::Point(200, 88)) > 36)) 
+			&& ( ((R2_GLOBALS._v56AA2 == 3) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4)) 
+				|| ((R2_GLOBALS._v56AA2 == 13) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2)) 
+				|| ((R2_GLOBALS._v56AA2 == 29) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1)) 
+				|| ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 41)) )
+				)	{
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 1200;
+			setAction(&_sequenceManager, this, 1200, &_actor1, NULL);
+		} else if (_object1.sub51AF8(Common::Point(200, 69)) == 36) {
+			switch (_field412 - 1) {
+			case 0:
+				if (R2_GLOBALS._player._visage == 3155)
+					_sceneMode = 15;
+				else
+					_sceneMode = 10;
+				break;
+			case 1:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 76;
+				else
+					_sceneMode = 75;
+				break;
+			case 2:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 101;
+				else
+					_sceneMode = 100;
+				break;
+			case 3:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 111;
+				else
+					_sceneMode = 110;
+				break;
+			default:
+				break;
+			}
+			R2_GLOBALS._player.disableControl();
+			_field412 = 1;
+			signal();
+		}
+		break;
+	case 1:
+		if ( ((_object1.sub51AF8(Common::Point(120, 50)) > 36) || (_object1.sub51AF8(Common::Point(120, 88)) > 36)) 
+			&& ( ((R2_GLOBALS._v56AA2 == 7) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4)) 
+				|| ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2)) 
+				|| ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1)) 
+				|| ((R2_GLOBALS._v56AA2 == 5) && (R2_GLOBALS._v56AA4 == 5)) )
+				)	{
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 1201;
+			setAction(&_sequenceManager, this, 1201, &_actor1, NULL);
+		} else if (_object1.sub51AF8(Common::Point(120, 69)) == 36) {
+			switch (_field412 - 1) {
+			case 0:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 56;
+				else
+					_sceneMode = 55;
+				break;
+			case 1:
+				if (R2_GLOBALS._player._visage == 3155)
+					_sceneMode = 25;
+				else
+					_sceneMode = 20;
+				break;
+			case 2:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 91;
+				else
+					_sceneMode = 90;
+				break;
+			case 3:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 121;
+				else
+					_sceneMode = 120;
+				break;
+			default:
+				break;
+			}
+			R2_GLOBALS._player.disableControl();
+			_field412 = 2;
+			signal();
+		}
+		break;
+	case 2:
+		if ( ((_object1.sub51AF8(Common::Point(140, 110)) > 36) || (_object1.sub51AF8(Common::Point(178, 110)) > 36)) 
+			&& ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 5) && (_field418 != 3)) 
+				|| ((R2_GLOBALS._v56AA2 == 41) && (R2_GLOBALS._v56AA4 == 21)) )
+				)	{
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 1203;
+			setAction(&_sequenceManager, this, 1203, &_actor1, NULL);
+		} else if (_object1.sub51AF8(Common::Point(160, 110)) == 36) {
+			switch (_field412 - 1) {
+			case 0:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 51;
+				else
+					_sceneMode = 50;
+				break;
+			case 1:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 81;
+				else
+					_sceneMode = 80;
+				break;
+			case 2:
+				if (R2_GLOBALS._player._visage == 3155)
+					_sceneMode = 35;
+				else
+					_sceneMode = 30;
+				break;
+			case 3:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 116;
+				else
+					_sceneMode = 115;
+				break;
+			default:
+				break;
+			}
+			R2_GLOBALS._player.disableControl();
+			_field412 = 3;
+			signal();
+		}
+		break;
+	case 3:
+		if ( ((_object1.sub51AF8(Common::Point(140, 30)) > 36) || (_object1.sub51AF8(Common::Point(178, 30)) > 36)) 
+			&& ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 9) && (_field418 != 3)) 
+				|| ((R2_GLOBALS._v56AA2 == 35) && (R2_GLOBALS._v56AA4 == 17)) )
+				)	{
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 1202;
+			setAction(&_sequenceManager, this, 1202, &_actor1, NULL);
+		} else if (_object1.sub51AF8(Common::Point(160, 30)) == 36) {
+			switch (_field412 - 1) {
+			case 0:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 61;
+				else
+					_sceneMode = 60;
+				break;
+			case 1:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 71;
+				else
+					_sceneMode = 70;
+				break;
+			case 2:
+				if (R2_GLOBALS._player._visage == 3156)
+					_sceneMode = 96;
+				else
+					_sceneMode = 95;
+				break;
+			case 3:
+				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();
+			_field412 = 4;
+			signal();
+		}
+		break;
+	default:
+		break;
+	}
+}
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 14ab1d0081..dbb740d9fd 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -287,6 +287,40 @@ public:
 	void setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
 };
 
+class UnkObject1200 : public SavedObject {
+public:
+	Rect _rect1;
+	Rect _rect2;
+
+	int *_field16;
+	int *_field3A;
+
+	int _field12;
+	int _field14;
+	int _field26;
+	int _field28;
+	int _field2A;
+	int _field2C;
+	int _field2E;
+	int _field30;
+	int _field32;
+	int _field34;
+	int _field36;
+	int _field38;
+	int _field3E;
+	int _field40;
+
+	UnkObject1200();
+	void synchronize(Serializer &s);
+
+	void sub51AE9(int arg1);
+	int sub51AF8(Common::Point pt);
+	bool sub51AFD(Common::Point pt);
+	void sub51B02();
+	void sub9EDE8(Rect rect);
+	int sub9EE22(int &arg1, int &arg2);
+	virtual Common::String getClassName() { return "UnkObject1200"; }
+};
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index d3b7d616f1..9a9112e3fc 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1097,266 +1097,6 @@ void Scene1200::Area1::proc13(int resNum, int lookLineNum, int talkLineNum, int
 	_actor2.setDetails(resNum, lookLineNum, talkLineNum, useLineNum, 2, (SceneItem *) NULL);
 }
 
-Scene1200::Object1::Object1() {
-	_field16 = _field26 = _field28 = _field2A = _field2C = _field2E = _field30 = 0;
-}
-
-void Scene1200::Object1::synchronize(Serializer &s) {
-	SavedObject::synchronize(s);
-
-	_rect1.synchronize(s);
-	_rect2.synchronize(s);
-
-	s.syncAsSint16LE(_field16);
-	s.syncAsSint16LE(_field26);
-	s.syncAsSint16LE(_field28);
-	s.syncAsSint16LE(_field2A);
-	s.syncAsSint16LE(_field2C);
-	s.syncAsSint16LE(_field2E);
-	s.syncAsSint16LE(_field30);
-}
-
-int Scene1200::Object1::sub51AF8(Common::Point pt) {
-	if (!_rect1.contains(pt))
-		return -1;
-	
-	int tmp1 = (pt.x - _rect1.left + _field2E) / _field2A;
-	int tmp2 = (pt.y - _rect1.top + _field30) / _field2C;
-
-	if ((tmp1 >= 0) && (tmp2 >= 0) && (_field26 > tmp1) && (_field28 > tmp2))
-		return _field16 + (((_field26 * tmp2) + tmp1)* 2);
-
-	return -1;
-}
-
-bool Scene1200::Object1::sub51AFD(Common::Point pt) {
-	int retval = false;
-
-	_field2E = pt.x;
-	_field30 = pt.y;
-
-	if (_field2E < _rect2.top) {
-		_field2E = _rect2.top;
-		retval = true;
-	}
-
-	if (_field30 < _rect2.left) {
-		_field30 = _rect2.left;
-		retval = true;
-	}
-
-	if (_field2E + _rect1.width() > _rect2.right) {
-		_field2E = _rect2.right - _rect1.width();
-		retval = true;
-	}
-
-	if (_field30 + _rect1.height() > _rect2.bottom) {
-		_field30 = _rect2.bottom - _rect1.height();
-		retval = true;
-	}
-
-	return retval;
-}
-
-void Scene1200::Object1::sub9EDE8(Rect rect) {
-	_rect1 = rect;
-	warning("FIXME: Scene1200::Object1::sub9EDE8()");
-//	_rect1.clip(g_globals->gfxManager()._bounds);
-}
-
-int Scene1200::Object1::sub9EE22(int &arg1, int &arg2) {
-	arg1 /= _field2A;
-	arg2 /= _field2C;
-	
-	if ((arg1 >= 0) && (arg2 >= 0) && (_field26 > arg1) && (_field28 > arg2)) {
-		return (((_field26 * arg2) + arg1) * 2) + _field16;
-	}
-
-	return -1;
-}
-
-void Scene1200::sub9DAD6(int indx) {
-	_object1.sub9EE22(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);
-	
-	switch (indx) {
-	case 0:
-		if ( ((_object1.sub51AF8(Common::Point(200, 50)) > 36) || (_object1.sub51AF8(Common::Point(200, 88)) > 36)) 
-			&& ( ((R2_GLOBALS._v56AA2 == 3) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4)) 
-				|| ((R2_GLOBALS._v56AA2 == 13) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2)) 
-				|| ((R2_GLOBALS._v56AA2 == 29) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1)) 
-				|| ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 41)) )
-				)	{
-			R2_GLOBALS._player.disableControl();
-			_sceneMode = 1200;
-			setAction(&_sequenceManager, this, 1200, &_actor1, NULL);
-		} else if (_object1.sub51AF8(Common::Point(200, 69)) == 36) {
-			switch (_field412 - 1) {
-			case 0:
-				if (R2_GLOBALS._player._visage == 3155)
-					_sceneMode = 15;
-				else
-					_sceneMode = 10;
-				break;
-			case 1:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 76;
-				else
-					_sceneMode = 75;
-				break;
-			case 2:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 101;
-				else
-					_sceneMode = 100;
-				break;
-			case 3:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 111;
-				else
-					_sceneMode = 110;
-				break;
-			default:
-				break;
-			}
-			R2_GLOBALS._player.disableControl();
-			_field412 = 1;
-			signal();
-		}
-		break;
-	case 1:
-		if ( ((_object1.sub51AF8(Common::Point(120, 50)) > 36) || (_object1.sub51AF8(Common::Point(120, 88)) > 36)) 
-			&& ( ((R2_GLOBALS._v56AA2 == 7) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4)) 
-				|| ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2)) 
-				|| ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1)) 
-				|| ((R2_GLOBALS._v56AA2 == 5) && (R2_GLOBALS._v56AA4 == 5)) )
-				)	{
-			R2_GLOBALS._player.disableControl();
-			_sceneMode = 1201;
-			setAction(&_sequenceManager, this, 1201, &_actor1, NULL);
-		} else if (_object1.sub51AF8(Common::Point(120, 69)) == 36) {
-			switch (_field412 - 1) {
-			case 0:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 56;
-				else
-					_sceneMode = 55;
-				break;
-			case 1:
-				if (R2_GLOBALS._player._visage == 3155)
-					_sceneMode = 25;
-				else
-					_sceneMode = 20;
-				break;
-			case 2:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 91;
-				else
-					_sceneMode = 90;
-				break;
-			case 3:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 121;
-				else
-					_sceneMode = 120;
-				break;
-			default:
-				break;
-			}
-			R2_GLOBALS._player.disableControl();
-			_field412 = 2;
-			signal();
-		}
-		break;
-	case 2:
-		if ( ((_object1.sub51AF8(Common::Point(140, 110)) > 36) || (_object1.sub51AF8(Common::Point(178, 110)) > 36)) 
-			&& ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 5) && (_field418 != 3)) 
-				|| ((R2_GLOBALS._v56AA2 == 41) && (R2_GLOBALS._v56AA4 == 21)) )
-				)	{
-			R2_GLOBALS._player.disableControl();
-			_sceneMode = 1203;
-			setAction(&_sequenceManager, this, 1203, &_actor1, NULL);
-		} else if (_object1.sub51AF8(Common::Point(160, 110)) == 36) {
-			switch (_field412 - 1) {
-			case 0:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 51;
-				else
-					_sceneMode = 50;
-				break;
-			case 1:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 81;
-				else
-					_sceneMode = 80;
-				break;
-			case 2:
-				if (R2_GLOBALS._player._visage == 3155)
-					_sceneMode = 35;
-				else
-					_sceneMode = 30;
-				break;
-			case 3:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 116;
-				else
-					_sceneMode = 115;
-				break;
-			default:
-				break;
-			}
-			R2_GLOBALS._player.disableControl();
-			_field412 = 3;
-			signal();
-		}
-		break;
-	case 3:
-		if ( ((_object1.sub51AF8(Common::Point(140, 30)) > 36) || (_object1.sub51AF8(Common::Point(178, 30)) > 36)) 
-			&& ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 9) && (_field418 != 3)) 
-				|| ((R2_GLOBALS._v56AA2 == 35) && (R2_GLOBALS._v56AA4 == 17)) )
-				)	{
-			R2_GLOBALS._player.disableControl();
-			_sceneMode = 1202;
-			setAction(&_sequenceManager, this, 1202, &_actor1, NULL);
-		} else if (_object1.sub51AF8(Common::Point(160, 30)) == 36) {
-			switch (_field412 - 1) {
-			case 0:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 61;
-				else
-					_sceneMode = 60;
-				break;
-			case 1:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 71;
-				else
-					_sceneMode = 70;
-				break;
-			case 2:
-				if (R2_GLOBALS._player._visage == 3156)
-					_sceneMode = 96;
-				else
-					_sceneMode = 95;
-				break;
-			case 3:
-				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();
-			_field412 = 4;
-			signal();
-		}
-		break;
-	default:
-		break;
-	}
-}
 void Scene1200::postInit(SceneObjectList *OwnerList) {
 	Rect tmpRect;
 
@@ -1395,10 +1135,10 @@ void Scene1200::postInit(SceneObjectList *OwnerList) {
 	tmpRect.set(110, 20, 210, 120);
 	_object1.sub9EDE8(tmpRect);
 
-	warning("_object1.sub51AE9(1);");
+	_object1.sub51AE9(1);
 	_object1.sub51AFD(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
 	warning("int unk = set_pane_p(_paneNumber);");
-	warning("_object1.sub51B02();");
+	_object1.sub51B02();
 	warning("set_pane_p(unk);");
 
 	R2_GLOBALS._player.enableControl();
@@ -1805,7 +1545,7 @@ void Scene1200::dispatch() {
 	if (_field41C != 0) {
 		_object1.sub51AFD(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
 		warning("int unk = set_pane_p(_paneNumber);");
-		warning("_object1.sub51B02();");
+		_object1.sub51B02();
 		warning("_gfxManager.sub294AC(unk);");
 		warning("tmpRect.sub14DF3();");
 		_field41C = 0;
@@ -1832,7 +1572,7 @@ void Scene1200::dispatch() {
 		}
 		_object1.sub51AFD(Common::Point(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4));
 		warning("int unk = set_pane_p(_paneNumber);");
-		warning("_object1.sub51B02();");
+		_object1.sub51B02();
 		warning("_gfxManager.sub294AC(unk);");
 		warning("tmpRect.sub14DF3();");
 		
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 7c05cd8e5f..da68bffcab 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -142,35 +142,12 @@ class Scene1200 : public SceneExt {
 		virtual void proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY);
 		virtual void proc13(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
 	};
-
-	class Object1 : public SavedObject {
-	public:
-		Rect _rect1;
-		Rect _rect2;
-
-		int _field16;
-		int _field26;
-		int _field28;
-		int _field2A;
-		int _field2C;
-		int _field2E;
-		int _field30;
-
-		Object1();
-		void synchronize(Serializer &s);
-
-		int sub51AF8(Common::Point pt);
-		bool sub51AFD(Common::Point pt);
-		void sub9EDE8(Rect rect);
-		int sub9EE22(int &arg1, int &arg2);
-		virtual Common::String getClassName() { return "UnkObject1200"; }
-	};
 		
 public:
 	NamedHotspot _item1;
 	SceneActor _actor1;
 	Area1 _area1;
-	Object1 _object1;
+	UnkObject1200 _object1;
 	SequenceManager _sequenceManager;
 
 	int _field412;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index c6c1b0610c..d462cb11f5 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -2884,6 +2884,1300 @@ void Scene3400::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 3500 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene3500::Action1::Action1() {
+	_field1E = 0;
+	_field20 = 0;
+	_field22 = 0;
+	_field24 = 0;
+}
+
+void Scene3500::Action1::synchronize(Serializer &s) {
+	Action::synchronize(s);
+
+	s.syncAsSint16LE(_field1E);
+	s.syncAsSint16LE(_field20);
+	s.syncAsSint16LE(_field22);
+	s.syncAsSint16LE(_field24);
+}
+
+void Scene3500::Action1::sub108670(int arg1) {
+	Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene;
+
+	_field1E = arg1;
+	_field20 = 1;
+	_field24 = 1;
+	
+	scene->_actor9.setStrip(2);
+	scene->_actor9.show();
+	
+	if (_field1E == 1)
+		scene->_actor6.show();
+	else
+		scene->_actor5.show();
+
+	if (scene->_actor1._frame % 2 == 0)
+	scene->_actor1._frameChange = _field1E;
+	scene->_actor1.setFrame(scene->_actor1.changeFrame());
+
+	setActionIndex(0);
+}
+
+void Scene3500::Action1::sub108732(int arg1) {
+	Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene;
+
+	_field20 = arg1;
+	_field1E = -_field1E;
+
+	if (_field1E == 1) {
+		scene->_actor6.show();
+		scene->_actor5.hide();
+	} else {
+		scene->_actor5.show();
+		scene->_actor6.hide();
+	}
+
+	switch (_actionIndex) {
+	case 4:
+		scene->_actor1._frameChange = _field1E;
+		scene->_actor1.setFrame(scene->_actor1.changeFrame());
+	// No break on purpose
+	case 3:
+		_actionIndex = 10;
+		setDelay(0);
+		break;
+	case 5: {
+		scene->_fieldAF8 = 160;
+		Common::Point pt(160, 73);
+		NpcMover *mover = new NpcMover();
+		scene->_actor8.addMover(mover, &pt, NULL);
+		
+		scene->_fieldB9E = 160 - (_field1E * 2 * 160);
+		Common::Point pt2(scene->_fieldB9E, 73);
+		NpcMover *mover2 = new NpcMover();
+		scene->_actor9.addMover(mover2, &pt2, this);
+
+		_actionIndex = 11;
+		}
+		break;
+	case 6:
+		scene->_actor1._frameChange = _field1E;
+		scene->_actor1.setFrame(scene->_actor1.changeFrame());
+		setDelay(1);
+	// No break on purpose
+	case 8:
+		scene->_actor9.setStrip(2);
+		_actionIndex = 1;
+		break;
+	default:
+		break;
+	}
+}
+
+Scene3500::Action2::Action2() {
+	_field1E = 0;
+}
+
+void Scene3500::Action2::synchronize(Serializer &s) {
+	Action::synchronize(s);
+
+	s.syncAsSint16LE(_field1E);
+}
+
+Scene3500::Item4::Item4() {
+	_field34 = 0;
+}
+
+void Scene3500::Item4::synchronize(Serializer &s) {
+	NamedHotspot::synchronize(s);
+
+	s.syncAsSint16LE(_field34);
+}
+
+Scene3500::Actor7::Actor7() {
+	_fieldA4 = 0;
+	_fieldA6 = 0;
+	_fieldA8 = 0;
+	_fieldAA = 0;
+	_fieldAC = 0;
+	_fieldAE = 0;
+}
+
+void Scene3500::Actor7::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+
+	s.syncAsSint16LE(_fieldA4);
+	s.syncAsSint16LE(_fieldA6);
+	s.syncAsSint16LE(_fieldA8);
+	s.syncAsSint16LE(_fieldAA);
+	s.syncAsSint16LE(_fieldAC);
+	s.syncAsSint16LE(_fieldAE);
+}
+
+void Scene3500::Actor7::sub109466(int arg1, int arg2, int arg3, int arg4, int arg5) {
+	_fieldAE = 0;
+	_fieldA4 = arg1;
+	_fieldA6 = arg2;
+	_fieldA8 = arg3;
+	_fieldAA = arg4;
+	_fieldAC = _fieldAA / _fieldA8;
+
+	postInit();
+	setup(10501, 3, 1);
+	fixPriority(255);
+	sub109663(arg5);
+}
+
+void Scene3500::Actor7::sub1094ED() {
+	Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene;
+
+	scene->_field1270 = _position.x - _fieldA4;
+}
+
+void Scene3500::Actor7::sub109663(int arg1){
+	sub109693(Common::Point(_fieldA4 + arg1, _fieldA6 - (_fieldAC * arg1)));
+}
+
+void Scene3500::Actor7::sub109693(Common::Point Pt) {
+	setPosition(Pt);
+}
+
+int Scene3500::UnkObject3500::sub1097C9(int arg1) {
+	return (_field2A / 2) + arg1 - (arg1 % _field2A);
+}
+
+int Scene3500::UnkObject3500::sub1097EF(int arg1) {
+	return (_field2C / 2) + arg1 - (arg1 % _field2C);
+}
+
+int Scene3500::UnkObject3500::sub109C09(Common::Point pt) {
+	int vx = pt.x / _field2A;
+	int vy = pt.y / _field2C;
+
+	if ((vx >= 0) && (_field26 > vx) && (_field28 > vy)) {
+		return _field16[((_field26 * vy) + vx) * 2];
+	} else
+		return -1;
+}
+
+int Scene3500::UnkObject3500::sub109C5E(int &x, int &y) {
+	int retVal = sub51AFD(Common::Point(x, y));
+	x = _field2E;
+	y = _field30;
+
+	return retVal;
+}
+
+Scene3500::Scene3500() {
+	_fieldAF8 = 0;
+	_fieldB9E = 0;
+	_rotation = NULL;
+	_field126E = 0;
+	_field1270 = 0;
+	_field1272 = 0;
+	_field1274 = 0;
+	_field1276 = 0;
+	_field1278 = 0;
+	_field127A = 0;
+	_field127C = 0;
+	_field127E = 0;
+	_field1280 = 0;
+	_field1282 = 0;
+	_field1284 = 0;
+	_field1286 = 0;
+}
+
+void Scene3500::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_fieldAF8);
+	s.syncAsSint16LE(_fieldB9E);
+	_rotation->synchronize(s);
+	s.syncAsSint16LE(_field126E);
+	s.syncAsSint16LE(_field1270);
+	s.syncAsSint16LE(_field1272);
+	s.syncAsSint16LE(_field1274);
+	s.syncAsSint16LE(_field1276);
+	s.syncAsSint16LE(_field1278);
+	s.syncAsSint16LE(_field127A);
+	s.syncAsSint16LE(_field127C);
+	s.syncAsSint16LE(_field127E);
+	s.syncAsSint16LE(_field1280);
+	s.syncAsSint16LE(_field1282);
+	s.syncAsSint16LE(_field1284);
+	s.syncAsSint16LE(_field1286);
+}
+
+void Scene3500::sub107F71(int arg1) {
+	switch (arg1) {
+	case -1:
+		_actor7.sub1094ED();
+		if (_field1270 != 0) {
+			_field1270--;
+			_actor7.sub109663(_field1270);
+		}
+		if (_action1._field24 != 0)
+			_field1270 = 0;
+		break;
+	case 1:
+		_actor7.sub1094ED();
+		if (_field1270 < 16) {
+			++_field1270;
+			_actor7.sub109663(_field1270);
+		}
+		if (_action1._field24 != 0)
+			_field1270 = 0;
+		break;
+	case 88:
+		if ((_action == 0) || (_action1._field24 == 0)) {
+		// The original makes a second useless check on action, skipped
+			_action2.sub10831F(2);
+			if ((_action) && ((_action2.getActionIndex() != 0) || (_action2._field1E != 2))) {
+				_action2.signal();
+			} else {
+				_actor9.setAction(&_action2, &_actor9, NULL);
+			}
+		}
+		break;
+	case 96:
+		if ((_action) && (_action1._field24 != 0) && (_action2._field1E != 1)) {
+			_field1278 = 0;
+			_action1.sub108732(0);
+		} else if ((_action) && (_field1278 == 0) && (_action1._field24 != 0)) {
+			_field1278 = arg1;
+		} else if ((_action) && (_action1._field24 == 0)) {
+			_action1.sub108670(1);
+			_action1.signal();
+		} else if (_action == 0) {
+			_action1.sub108670(1);
+			setAction(&_action1, &_actor1, NULL);			
+		}
+		break;
+	case 104:
+		if ((_action == 0) || (_action1._field24 == 0)) {
+			_action2.sub10831F(-1);
+			if ((_action) && ((_action2.getActionIndex() != 0) || (_action2._field1E != -1))) {
+				_action2.signal();
+			} else {
+				_actor9.setAction(&_action2, &_actor9, NULL);
+			}
+		}
+		break;
+	case 112:
+		if ((_action) && (_action1._field24 != 0) && (_action2._field1E != -1)) {
+			_field1278 = 0;
+			_action1.sub108732(0);
+		} else if ((_action) && (_field1278 == 0) && (_action1._field24 != 0)) {
+			_field1278 = arg1;
+		} else if ((_action) && (_action1._field24 == 0)) {
+			_action1.sub108670(-1);
+			_action1.signal();
+		} else if (_action == 0) {
+			_action1.sub108670(-1);
+			setAction(&_action1, &_actor1, NULL);			
+		}
+		break;
+	default:
+		_field1270 = arg1;
+		_actor7.sub109663(arg1);
+		if (_action1._field24 != 0) {
+			_field1270 = 0;
+		}
+		break;
+	}
+}
+
+void Scene3500::Action1::signal() {
+	Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene;
+
+	switch(_actionIndex++) {
+	case 0:
+		R2_GLOBALS._player.disableControl();
+		scene->_field1286 = 0;
+		if (scene->_field1270 != 0) {
+			scene->_field1270 = 0;
+			scene->_field126E = 0;
+			scene->_field1272 = 0;
+			scene->_rotation->_idxChange = 0;
+		}
+		break;
+	case 1:
+		if ((scene->_actor1._frame % 2) == 0) {
+			setDelay(1);
+			return;
+		}
+	// No break on purpose
+	case 3:
+		scene->_actor1._frameChange = _field1E;
+		scene->_actor1.setFrame(scene->_actor1.changeFrame());
+		setDelay(1);
+		break;
+	case 4: {
+		int si = scene->_unkObj1.sub109C09(Common::Point(scene->_field127A + 70, scene->_field127C + 46));
+		int var2 = scene->_unkObj1.sub1097C9(scene->_field127A + 70) - 70;
+		int var4 = scene->_unkObj1.sub1097EF(scene->_field127C + 46) - 46;
+		int di = abs(var2 - scene->_field127A);
+		int var6 = abs(var4 - scene->_field127C);
+		
+		if ((scene->_actor1._frame % 2) != 0) {
+			scene->_actor1._frameChange = _field1E;
+			scene->_actor1.setFrame(scene->_actor1.changeFrame());
+		}
+
+		int var8 = (scene->_action1._field1E * 2 + scene->_field1276);
+		if (var8 > 7) 
+			var8 = 1;
+		else if (var8 < 1) 
+			var8 = 7;
+
+		switch (var8) {
+		case 0:
+			if ( ((si != 2)  && (si != 3)  && (si != 6) && (si != 1) && (si != 23) && (si != 24) && (si != 4) && (si != 11))
+				|| (var6 != 0)) {
+				if ((si != 25) && (si != 26) && (si != 5) && (si != 14) && (si != 15))
+					_field20 = 0;
+				else if ((var6 != 0) || (di <= 3)) // useless, skipped: "|| (di == 0)"
+					_field20 = 0;
+				else
+					_field20 = 1;
+			} else
+				_field20 = 1;
+			break;
+		case 2:
+			if ( ((si != 12)  && (si != 13)  && (si != 11) && (si != 16) && (si != 26) && (si != 24) && (si != 15) && (si != 6) && (si != 31))
+				|| (di != 0)) {
+				if ((si != 25) && (si != 23) && (si != 14) && (si != 5) && (si != 4))
+					_field20 = 0;
+				else if ((di != 0) || (var6 <= 3)) // useless, skipped: "|| (var6 == 0)"
+					_field20 = 0;
+				else
+					_field20 = 1;
+			} else
+				_field20 = 1;
+			break;
+		case 4:
+			if ( ((si != 2)  && (si != 3)  && (si != 6) && (si != 1) && (si != 25) && (si != 26) && (si != 5) && (si != 16) && (si != 31))
+				|| (var6 != 0)) {
+					if ((si != 23) && (si != 24) && (si != 4) && (si != 14) && (si != 15))
+						_field20 = 0;
+					else if ((var6 != 0) || (di <= 3)) // useless, skipped: "|| (di == 0)"
+						_field20 = 0;
+					else
+						_field20 = 1;
+			} else
+				_field20 = 1;
+			break;
+		case 6:
+			if ( ((si != 12)  && (si != 13)  && (si != 11) && (si != 16) && (si != 25) && (si != 23) && (si != 14) && (si != 1) && (si != 31))
+				|| (var6 != 0)) {
+					if ((si != 26) && (si != 24) && (si != 15) && (si != 5) && (si != 4))
+						_field20 = 0;
+					else if ((var6 <= 0) || (di != 0)) // useless, skipped: "|| (var6 == 0)"
+						_field20 = 0;
+					else
+						_field20 = 1;
+			} else
+				_field20 = 1;
+		default:
+			break;
+		}
+		}
+	// No break on purpose
+	case 2: {
+		scene->_actor8.setPosition(Common::Point(160, 73));
+		scene->_actor8._moveDiff.x = 160 - scene->_field126E;
+		scene->_fieldAF8 = 160 - ((_field1E * 2) * 160);
+		Common::Point pt(scene->_fieldAF8, 73);
+		NpcMover *mover = new NpcMover();
+		scene->_actor8.addMover(mover, &pt, this);
+		
+		scene->_actor9.setPosition(Common::Point(160 + ((_field1E * 2) * 160), 73));;
+		scene->_actor9._moveDiff.x = 160 - scene->_field126E;
+		scene->_fieldB9E = 160;
+		Common::Point pt2(scene->_fieldB9E, 73);
+		NpcMover *mover2 = new NpcMover();
+		scene->_actor9.addMover(mover2, &pt2, NULL);
+		}
+		break;
+	case 5:
+		scene->_actor1._frameChange = _field1E;
+		scene->_field1276 = scene->_actor1.changeFrame();
+		scene->_actor1.setFrame(scene->_field1276);
+		setDelay(1);
+		break;
+	case 6:
+		scene->_actor8.setPosition(Common::Point(160, 73));
+		if (_field20 == 0)
+			scene->_actor8.setStrip(1);
+		else
+			scene->_actor8.setStrip(2);
+		scene->_actor8.fixPriority(1);
+		
+		scene->_actor9.setPosition(Common::Point(-160, 73));
+		scene->_actor9.setStrip(9);
+		scene->_actor9.fixPriority(11);
+		scene->_actor9.hide();
+		setDelay(1);
+		break;
+	case 7:
+		if ((scene->_actor1._frame % 2) == 0) {
+			scene->_actor1._frameChange = _field1E;
+			scene->_field1276 = scene->_actor1.changeFrame();
+			scene->_actor1.setFrame(scene->_field1276);
+		}
+		setDelay(1);
+		break;
+	case 8: {
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+		scene->_field1286 = 1;
+		if ((scene->_actor1._frame % 2) == 0) {
+			scene->_actor1._frameChange = _field1E;
+			scene->_actor1.setFrame(scene->_actor1.changeFrame());
+		}
+		// All the var_8 initialization was missing in the original
+		// but it's clearly a cut and paste error from case 4.
+		// The following code allows the switch to work properly.
+		warning("Checkme: fix for dead code");
+		int var_8 = (_field1E * 2 + scene->_field1276);
+		if (var_8 > 7) 
+			var_8 = 1;
+		else if (var_8 < 1) 
+			var_8 = 7;
+		//
+		
+		switch (var_8 - 1) {
+		case 0:
+		// No break on purpose
+		case 4:
+			scene->_field127A = scene->_unkObj1.sub1097C9(scene->_field127A + 70) - 70;
+			break;
+		case 2:
+		// No break on purpose
+		case 6:
+			scene->_field127C = scene->_unkObj1.sub1097EF(scene->_field127C + 46) - 46;
+			break;
+		default:
+			break;
+		}
+		scene->_actor5.hide();
+		scene->_actor6.hide();
+		_field24 = 0;
+		if (_field20 == 0) {
+			scene->_actor7.sub1094ED();
+			if (scene->_field126E == scene->_field1270)
+				scene->_aSound1.play(276);
+		}
+		break;
+		}
+	case 10: {
+		scene->_fieldAF8 = 160;
+		Common::Point pt(160, 73);
+		NpcMover *mover = new NpcMover();
+		scene->_actor8.addMover(mover, &pt, NULL);
+		
+		scene->_fieldB9E = 160 - (_field1E * 2 * 160);
+		Common::Point pt2(scene->_fieldB9E, 73);
+		NpcMover *mover2 = new NpcMover();
+		scene->_actor9.addMover(mover2, &pt2, this);
+		_actionIndex = 6;
+		}
+		break;
+	case 11: {
+		scene->_actor8.setStrip(2);
+		scene->_actor8.setPosition(Common::Point(160, 73));
+		scene->_fieldAF8 = 160 - (_field1E * 2 * 160);
+		Common::Point pt(scene->_fieldAF8, 73);
+		NpcMover *mover = new NpcMover();
+		scene->_actor8.addMover(mover, &pt, NULL);
+		scene->_actor8.fixPriority(11);
+		if (_field20 == 0)
+			scene->_actor9.setStrip(1);
+		else
+			scene->_actor9.setStrip(2);
+		scene->_actor9.setPosition(Common::Point(160 - (_field1E * 2 * 160), 73));
+		scene->_fieldB9E = 160;
+		Common::Point pt2(scene->_fieldB9E, 73);
+		NpcMover *mover2 = new NpcMover();
+		scene->_actor9.addMover(mover2, &pt2, this);
+		scene->_actor9.fixPriority(1);
+		_actionIndex = 5;
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene3500::Action1::dispatch() {
+	Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene;
+
+	Action::dispatch();
+	if ((_actionIndex == 1) && (scene->_field126E <= 4)) {
+		scene->_rotation->_idxChange = 0;
+		signal();
+	}	
+}
+
+void Scene3500::Action2::sub10831F(int arg1) {
+	Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene;
+
+	_field1E = arg1;
+	if (_field1E == -1)
+		scene->_actor3.setFrame2(3);
+	else
+		scene->_actor3.setFrame2(1);
+
+	setActionIndex(0);
+}
+
+void Scene3500::Action2::signal() {
+	Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene;
+
+	int si;
+	int di;
+
+	switch (_actionIndex++) {
+	case 0: {
+		if (scene->_actor8._mover) {
+			si = scene->_fieldAF8;
+			di = scene->_fieldB9E;
+		} else {
+			scene->_fieldAF8 = scene->_actor8._position.x;
+			si = scene->_fieldAF8;
+			scene->_fieldB9E = scene->_actor9._position.y;
+			di = scene->_fieldB9E;
+		}
+		
+		scene->_actor8._moveDiff.y = 9 - (scene->_field126E / 2);
+		Common::Point pt(si, 73 - (_field1E * 12));
+		NpcMover *mover = new NpcMover();
+		scene->_actor8.addMover(mover, &pt, NULL);
+		
+		scene->_actor9._moveDiff.y = 9 - (scene->_field126E / 2);
+		Common::Point pt2(di, 73 - (_field1E * 12));
+		NpcMover *mover2 = new NpcMover();
+		scene->_actor9.addMover(mover2, &pt2, NULL);
+		scene->_field126E = (scene->_field126E / 2) + (scene->_field126E % 2);
+		setDelay(17 - scene->_field126E);
+		}
+		break;
+	case 1: {
+		R2_GLOBALS._sound2.play(339);
+		if (scene->_actor8._mover) {
+			si = scene->_fieldAF8;
+			di = scene->_fieldB9E;
+		} else {
+			si = scene->_actor8._position.x;
+			di = scene->_actor9._position.x;
+		}
+		
+		scene->_actor7.sub1094ED();
+
+		scene->_actor8._moveDiff.y = 9 - (scene->_field126E / 2);
+		Common::Point pt(si, 73);
+		NpcMover *mover = new NpcMover();
+		scene->_actor8.addMover(mover, &pt, NULL);
+
+		scene->_actor9._moveDiff.y = 9 - (scene->_field126E / 2);
+		Common::Point pt2(di, 73);
+		NpcMover *mover2 = new NpcMover();
+		scene->_actor9.addMover(mover2, &pt2, NULL);
+		
+		scene->_actor3.setFrame2(2);
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+bool Scene3500::Item4::startAction(CursorType action, Event &event) {
+	Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene;
+
+	if (scene->_field1286 == 0)
+		return true;
+	
+	if (scene->_field1286 != 4)
+		return SceneHotspot::startAction(action, event);
+	
+	R2_GLOBALS._sound2.play(14);
+	scene->sub107F71(_field34);
+	
+	return true;
+}
+
+void Scene3500::Actor7::process(Event &event) {
+	Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene;
+
+	if (scene->_field1286 == 0)
+		return;
+	
+	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE) && (_bounds.contains(event.mousePos))) {
+		_fieldAE = 1 + event.mousePos.y - _position.y;
+		event.eventType = EVENT_NONE;
+	}
+	
+	if ((event.eventType == EVENT_BUTTON_UP) && (_fieldAE != 0)) {
+		_fieldAE = 0;
+		event.handled = true;
+		if (scene->_action1._field24 == 0)
+			sub1094ED();
+	}
+	
+	if (_fieldAE == 0)
+		return;
+	
+	R2_GLOBALS._sound2.play(338);
+	event.handled = true;
+
+	int cx = event.mousePos.y - _fieldAE + 1;
+	if (_fieldA6 >= cx) {
+		if (_fieldA6 - _fieldAA <= cx)
+			sub109693(Common::Point(((_fieldA6 - cx) / 2) + _fieldA4 + ((_fieldA6 - cx) % 2), cx));
+		else
+			sub109693(Common::Point(_fieldA4 + _fieldA8, _fieldA6 - _fieldAA));
+	} else {
+		sub109693(Common::Point(_fieldA4, _fieldA6));
+	}
+}
+
+bool Scene3500::Actor7::startAction(CursorType action, Event &event) {
+	Scene3500 *scene = (Scene3500 *)R2_GLOBALS._sceneManager._scene;
+
+	if (scene->_field1286 == 0)
+		return true;
+	
+	if (scene->_field1286 == 4)
+		return false;
+	
+	return SceneActor::startAction(action, event);
+}
+
+void Scene3500::postInit(SceneObjectList *OwnerList) {
+	byte tmpPal[768];
+	Rect tmpRect;
+
+	loadScene(1050);
+	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._v5589E.set(0, 0, 320, 200);
+	R2_GLOBALS._sound1.play(305);
+	R2_GLOBALS._player._characterIndex = R2_QUINN;
+	R2_GLOBALS._player._characterScene[1] = 3500;
+	R2_GLOBALS._player._characterScene[2] = 3500;
+	R2_GLOBALS._player._characterScene[3] = 3500;
+	_field1284 = 0;
+	_field1282 = 0;
+	_field1278 = 0;
+	_field1272 = 1;
+	_field1270 = 4;
+	_field126E = 4;
+	_field127A = 860;
+	_field127C = 891;
+	_rotation = R2_GLOBALS._scenePalette.addRotation(240, 254, -1);
+	_rotation->setDelay(0);
+	_rotation->_idxChange = 1;
+
+	for (int i = 240; i <= 254; i++) {
+		int tmpIndex = _rotation->_currIndex - 240;
+
+		if (tmpIndex > 254)
+			tmpIndex--;
+		
+		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];
+	}
+
+	for (int i = 240; i <= 254; 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];
+	}
+	
+	_actor7.sub109466(38, 165, 16, 32, _field1270);
+	_actor7.setDetails(3500, 6, 7, -1, 1, (SceneItem *)NULL);
+	R2_GLOBALS._sound1.play(276);
+
+	_item4._field34 = 88;
+	_item4.setDetails(88, 3500, 18, 10, -1);
+
+	_item5._field34 = 112;
+	_item5.setDetails(112, 3500, 9, 10, -1);
+
+	_item6._field34 = 104;
+	_item6.setDetails(104, 3500, 15, 10, -1);
+
+	_item7._field34 = 96;
+	_item7.setDetails(96, 3500, 12, 10, -1);
+
+	_actor8.postInit();
+	_actor8.setup(10501, 1, 1);
+	_actor8.setPosition(Common::Point(160, 73));
+	_actor8.fixPriority(1);
+
+	_actor9.postInit();
+	_actor9.setup(1050, 2, 1);
+	_actor9.setPosition(Common::Point(-160, 73));
+	_actor9.fixPriority(11);
+	_actor9.hide();
+
+	_item2.setDetails(27, 3500, 21, -1, -1);
+	_item3.setDetails(Rect(160, 89, 299, 182), 3500, 3, -1, -1, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 320, 200), 3500, 0, -1, 2, 1, NULL);
+
+	_actor1.postInit();
+	_field1276 = 1;
+	_actor1.setup(1004, 1, _field1276);
+	_actor1.setPosition(Common::Point(230, 135));
+	_actor1.fixPriority(200);
+	_actor1._frameChange = 1;
+
+	_actor5.postInit();
+	_actor5.setup(1004, 3, 1);
+	_actor5.setPosition(Common::Point(117, 163));
+	_actor5.fixPriority(200);
+	_actor5.hide();
+
+	_actor4.postInit();
+	_actor4.setup(1004, 3, 2);
+	_actor4.setPosition(Common::Point(126, 163));
+	_actor4.fixPriority(200);
+
+	_actor6.postInit();
+	_actor6.setup(1004, 3, 3);
+	_actor6.setPosition(Common::Point(135, 163));
+	_actor6.fixPriority(200);
+	_actor6.hide();
+
+	_actor2.postInit();
+	_actor2.setup(1004, 4, _field126E + 1);
+	_actor2.setPosition(Common::Point(126, 137));
+	_actor2.fixPriority(200);
+
+	_actor3.postInit();
+	_actor3.setup(1004, 5, 2);
+	_actor3.setPosition(Common::Point(126, 108));
+	_actor3.fixPriority(200);
+
+	tmpRect.set(160, 89, 299, 182);
+	_unkObj1.sub9EDE8(tmpRect);
+	_unkObj1.sub51AE9(2);
+	_unkObj1.sub51AFD(Common::Point(_field127A, _field127C));
+
+	_action1._field24 = 0;
+	warning("gfx_set_pane_p()");
+	_unkObj1.sub51B02();
+	warning("gfx_set_pane_p()");
+	_field1286 = 1;
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.enableControl(CURSOR_USE);
+	R2_GLOBALS._player._uiEnabled = false;
+	R2_GLOBALS._player._canWalk = false;
+}
+
+void Scene3500::remove() {
+	_rotation->remove();
+	R2_GLOBALS._sound2.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene3500::signal() {
+	R2_GLOBALS._player.enableControl(CURSOR_USE);
+	R2_GLOBALS._player._canWalk = false;
+	_field1286 = 1;
+}
+
+void Scene3500::process(Event &event) {
+	if (_field1286 == 0)
+		return;
+	
+	if (event.eventType == EVENT_KEYPRESS) {
+		switch (event.kbd.keycode) {
+		case Common::KEYCODE_1:
+			warning("FIXME: keycode = 0x4700");
+			R2_GLOBALS._sound2.play(338);
+			sub107F71(16);
+			event.handled = true;
+			break;
+		case Common::KEYCODE_2:
+			warning("FIXME: keycode = 0x4800");
+			R2_GLOBALS._sound2.play(14, NULL, 63);
+			sub107F71(88);
+			event.handled = true;
+			break;
+		case Common::KEYCODE_3:
+			warning("FIXME: keycode = 0x4900");
+			if (_field1270 < 16)
+				R2_GLOBALS._sound2.play(338);
+			sub107F71(1);
+			event.handled = true;
+			break;
+		case Common::KEYCODE_4:
+			warning("FIXME: keycode = 0x4B00");
+			R2_GLOBALS._sound2.play(14, NULL, 63);
+			sub107F71(112);
+			event.handled = true;
+			break;
+		case Common::KEYCODE_5:
+			warning("FIXME: keycode = 0x4D00");
+			R2_GLOBALS._sound2.play(14, NULL, 63);
+			sub107F71(96);
+			event.handled = true;
+			break;
+		case Common::KEYCODE_6:
+			warning("FIXME: keycode = 0x4F00");
+			R2_GLOBALS._sound2.play(338);
+			sub107F71(0);
+			event.handled = true;
+			break;
+		case Common::KEYCODE_7:
+			warning("FIXME: keycode = 0x5000");
+			R2_GLOBALS._sound2.play(14, NULL, 63);
+			sub107F71(104);
+			event.handled = true;
+			break;
+		case Common::KEYCODE_8:
+			warning("FIXME: keycode = 0x5100");
+			if (_field1270 != 0)
+				R2_GLOBALS._sound2.play(338);
+			sub107F71(-1);
+			event.handled = true;
+			break;
+		case Common::KEYCODE_9:
+			warning("FIXME: keycode = 0x5200");
+			R2_GLOBALS._sound2.play(338);
+			sub107F71(8);
+			event.handled = true;
+			break;
+		case Common::KEYCODE_0:
+			warning("FIXME: keycode = 0x5300");
+			R2_GLOBALS._sound2.play(338);
+			sub107F71(4);
+			event.handled = true;
+			break;
+		default:
+			break;
+		}
+	}
+	
+	if (!event.handled)
+		_actor7.process(event);
+
+	if (!event.handled)
+		_item4.process(event);
+
+	if (!event.handled)
+		_item5.process(event);
+
+	if (!event.handled)
+		_item6.process(event);
+
+	if (!event.handled)
+		_item7.process(event);
+
+	Scene::process(event);
+}
+
+void Scene3500::dispatch() {
+	Rect tmpRect;
+	Scene::dispatch();
+	if (((_actor1._frame % 2) == 0) && (_action1._field24 == 0)) {
+		_actor1.setFrame(_actor1.changeFrame());
+		_field1276 = _actor1._frame;
+	}
+	int oldField1278;
+	if ((_field1278 != 0) && (_action1._field24 == 0)) {
+		oldField1278 = _field1278;
+		_field1278 = 0;
+		sub107F71(oldField1278);
+	}
+
+	if (!_rotation)
+		return;
+
+	int var_field127A = 0;
+	int di = 0;
+	int var_4 = 0;
+	int var_6 = 0;
+	int var_8 = 0;
+	int var_a = 0;
+	int dx = 0;
+	int tmpVar = 0;
+
+	if ((_field126E == 0) && (_field1282 == 0)) {
+		if (_field1284 == 2)
+			R2_GLOBALS._sceneManager.changeScene(1000);
+	} else {
+		_field1282 = 0;
+		tmpRect.set(160, 89, 299, 182);
+
+		var_field127A = _field127A;
+		di = _field127C;
+		var_4 = _unkObj1.sub1097C9(70) - 70;
+		var_6 = _unkObj1.sub1097EF(_field127C + 46) - 46;
+		var_8 = abs(var_4 - var_field127A);
+		var_a = abs(var_6 - di);
+		dx = 0;
+
+		switch (_field1276) {
+		case 0:
+			tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, 46));
+			if (    ((tmpVar == 2) || (tmpVar == 3) || (tmpVar == 6) || (tmpVar == 1))
+				|| (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5) || (tmpVar == 14) || (tmpVar == 15)) && (var_8 > 3)) ) {
+				R2_GLOBALS._sound2.play(339);
+				_rotation->_idxChange = 0;
+				_field1270 = 0;
+				_field126E = 0;
+				_field1272 = 0;
+				if (_action1._field24 == 0)
+					_actor8.hide();
+			} else {
+				var_6 = _unkObj1.sub1097EF(di + 46) - 46;
+				di = _field127C - _field126E;
+				dx = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
+				if (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4)) && (tmpVar != dx)) {
+					di = var_6;
+					R2_GLOBALS._sound2.play(339);
+					_rotation->_idxChange = 0;
+					_field1270 = 0;
+					_field126E = 0;
+					_field1272 = 0;
+					if (_action1._field24 == 0)
+						_actor8.hide();
+				} else if ((tmpVar == 11) && (tmpVar != dx)) {
+					di = var_6 + 3;
+					R2_GLOBALS._sound2.play(339);
+					_rotation->_idxChange = 0;
+					_field1270 = 0;
+					_field126E = 0;
+					_field1272 = 0;
+					if (_action1._field24 == 0)
+						_actor8.hide();
+				} else {
+					var_6 = _unkObj1.sub1097EF(di + 46) - 46;
+					var_a = abs(var_6 - di);
+					tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
+
+					if ( (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4)) && (di <= var_6) && (_field127C>= var_6)) 
+						|| (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5) || (tmpVar == 14) || (tmpVar == 15)) && (_field126E >= var_a) && (_field126E > 3) && (_action1._field24 != 0)) ) {
+						di = var_6;
+						if ((tmpVar != 25) && (tmpVar != 26) && (tmpVar != 5) && (tmpVar != 14) && (tmpVar == 15))
+							R2_GLOBALS._sound2.play(339);
+						_rotation->_idxChange = 0;
+						_field1270 = 0;
+						_field126E = 0;
+						_field1272 = 0;
+						if (_action1._field24 == 0)
+							_actor8.hide();
+					} else if ((tmpVar == 11) && (var_6 + 3 >= di) && (_field127C >= var_6 + 3)) {
+						R2_GLOBALS._sound2.play(339);
+						_rotation->_idxChange = 0;
+						_field1270 = 0;
+						_field126E = 0;
+						_field1272 = 0;
+						if (_action1._field24 == 0)
+							_actor8.hide();
+					} else if (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5) || (tmpVar == 14) || (tmpVar == 15)) && (var_8 != 0) && (var_8 <= 3)) {
+						var_field127A = var_4;
+						R2_GLOBALS._sound2.play(339);
+					} else {
+						// Nothing
+					}
+				}
+			}
+			break;
+		case 2:
+			tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
+			if (  ((tmpVar == 12) || (tmpVar == 13) || (tmpVar == 11) || (tmpVar == 16) || (tmpVar == 31)) 
+			  || (((tmpVar == 25) || (tmpVar == 23) || (tmpVar == 14) || (tmpVar == 5) || (tmpVar == 4)) && (var_a > 3)) ) {
+				R2_GLOBALS._sound2.play(339);
+				_rotation->_idxChange = 0;
+				_field1270 = 0;
+				_field126E = 0;
+				_field1272 = 0;
+				if (_action1._field24 == 0)
+					_actor8.hide();
+			} else {
+				var_4 = _unkObj1.sub1097C9(var_field127A + 70) - 70;
+				var_field127A = _field127A + _field126E;
+				dx = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
+				if (((tmpVar == 26) || (tmpVar == 24) || (tmpVar == 15)) && (tmpVar != dx)) {
+					var_field127A = var_4;
+					R2_GLOBALS._sound2.play(339);
+					_rotation->_idxChange = 0;
+					_field1270 = 0;
+					_field126E = 0;
+					_field1272 = 0;
+					if (_action1._field24 == 0)
+						_actor8.hide();
+				} else if ((tmpVar == 6) && (tmpVar != dx)) {
+					var_field127A = var_4 - 5;
+					R2_GLOBALS._sound2.play(339);
+					_rotation->_idxChange = 0;
+					_field1270 = 0;
+					_field126E = 0;
+					_field1272 = 0;
+					if (_action1._field24 == 0)
+						_actor8.hide();
+				} else {
+					var_4 = _unkObj1.sub1097C9(var_field127A + 70) - 70;
+					var_8 = abs(var_field127A - var_4);
+					tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, tmpVar + 46));
+					if ( (((tmpVar == 26) || (tmpVar == 24) || (tmpVar == 15)) && (var_field127A >= var_4) && (_field127A <= var_4))
+						|| (((tmpVar == 25) || (tmpVar == 23) || (tmpVar == 14) || (tmpVar == 5) || (tmpVar == 4)) && (_field126E >= var_8) && (_field126E <= 3) && (_action1._field24 != 0)) ) {
+						var_field127A = var_4;
+						if ((tmpVar == 25) || (tmpVar == 23) || (tmpVar == 14) || (tmpVar == 5) || (tmpVar == 4))
+							R2_GLOBALS._sound2.play(339);
+						_rotation->_idxChange = 0;
+						_field1270 = 0;
+						_field126E = 0;
+						_field1272 = 0;
+						if (_action1._field24 == 0)
+							_actor8.hide();
+					} else if ((tmpVar == 6) && (var_4 - 5 <= var_field127A) && (_field127A <= var_4 - 5)) {
+						var_field127A = var_4 - 5;
+						R2_GLOBALS._sound2.play(339);
+						_rotation->_idxChange = 0;
+						_field1270 = 0;
+						_field126E = 0;
+						_field1272 = 0;
+						if (_action1._field24 == 0)
+							_actor8.hide();
+					} else if (((tmpVar == 25) || (tmpVar == 23) || (tmpVar == 14) || (tmpVar == 5) || (tmpVar == 4)) && (var_a != 0) && (var_a <= 3)) {
+						di = var_6;
+						R2_GLOBALS._sound2.play(339);
+					} else {
+						// Nothing
+					}
+				}
+			}
+			break;
+		case 4:
+			tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
+			if (  ((tmpVar == 2) || (tmpVar == 3) || (tmpVar == 6) || (tmpVar == 1))
+			  || (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4) || (tmpVar == 14) || (tmpVar == 15)) && (var_8 > 3)) ) {
+				R2_GLOBALS._sound2.play(339);
+				_rotation->_idxChange = 0;
+				_field1270 = 0;
+				_field126E = 0;
+				_field1272 = 0;
+				if (_action1._field24 == 0)
+					_actor8.hide();
+			} else {
+				var_6 = _unkObj1.sub1097EF(di + 46) - 46;
+				di = _field127C + _field126E;
+				dx = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
+				if (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5)) && (tmpVar == dx)) {
+					R2_GLOBALS._sound2.play(339);
+					_rotation->_idxChange = 0;
+					_field1270 = 0;
+					_field126E = 0;
+					_field1272 = 0;
+					if (_action1._field24 == 0)
+						_actor8.hide();
+				} else if ((tmpVar == 16) && (tmpVar == dx)) {
+					di = var_6 - 3;
+					R2_GLOBALS._sound2.play(339);
+					_rotation->_idxChange = 0;
+					_field1270 = 0;
+					_field126E = 0;
+					_field1272 = 0;
+					if (_action1._field24 == 0)
+						_actor8.hide();
+				} else if ((tmpVar == 31) && (tmpVar == dx)) {
+					di = var_6 + 4;
+					R2_GLOBALS._sound2.play(339);
+					_rotation->_idxChange = 0;
+					_field1270 = 0;
+					_field126E = 0;
+					_field1272 = 0;
+					if (_action1._field24 == 0)
+						_actor8.hide();
+				} else {
+					var_6 = _unkObj1.sub1097EF(di + 46) - 46;
+					var_a = abs(di - var_6);
+					tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
+					if ( (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5)) && (di >= var_6) && (_field127C <= var_6)) 
+					  || (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4) || (tmpVar == 14) || (tmpVar == 15)) && (_field126E >= var_a) && (_field126E <= 3) && (_action1._field24 != 0)) ){
+						if ((tmpVar != 23) && (tmpVar != 24) && (tmpVar != 4) && (tmpVar != 14) && (tmpVar != 15))
+							R2_GLOBALS._sound2.play(339);
+						_rotation->_idxChange = 0;
+						_field1270 = 0;
+						_field126E = 0;
+						_field1272 = 0;
+						if (_action1._field24 == 0)
+							_actor8.hide();
+					} else if ((tmpVar == 16) && (var_6 - 3 <= di) && (_field127C <= var_6 - 3)) {
+						di = var_6 - 3;
+						R2_GLOBALS._sound2.play(339);
+						_rotation->_idxChange = 0;
+						_field1270 = 0;
+						_field126E = 0;
+						_field1272 = 0;
+						if (_action1._field24 == 0)
+							_actor8.hide();
+					} else if ((tmpVar == 31) && (var_6 + 4 <= di) && (_field127C <= var_6 + 4)) {
+						di = var_6 + 4;
+						_rotation->_idxChange = 0;
+						_field1270 = 0;
+						_field126E = 0;
+						_field1272 = 0;
+						if (_action1._field24 == 0)
+							_actor8.hide();
+						if ((var_field127A == 660) && (_field126E + 306 <= di) && (di <= 307))
+							 ++_field1284;
+						else
+							R2_GLOBALS._sound2.play(339);
+					} else if (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4) || (tmpVar == 14) || (tmpVar == 15)) && (var_8 != 0) && (var_8 <= 3)) {
+						var_field127A = var_4;
+						R2_GLOBALS._sound2.play(339);
+					} else {
+						// Nothing
+					}
+				}
+			}
+			break;
+		case 6:
+			tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
+			if ( ((tmpVar == 12) || (tmpVar == 13) || (tmpVar == 11) || (tmpVar == 16) || (tmpVar == 31))
+			 || (((tmpVar == 26) || (tmpVar == 24) || (tmpVar == 15) || (tmpVar == 5) || (tmpVar == 4)) && (var_a > 3)) ) {
+				R2_GLOBALS._sound2.play(339);
+				_rotation->_idxChange = 0;
+				_field1270 = 0;
+				_field126E = 0;
+				_field1272 = 0;
+				if (_action1._field24 == 0)
+					_actor8.hide();
+			} else {
+				var_4 = _unkObj1.sub1097C9(var_field127A + 70) - 70;
+				var_field127A = _field127A - _field126E;
+				dx = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
+				if (((tmpVar == 25) || (tmpVar == 23) || (tmpVar == 14)) && (tmpVar != dx)) {
+					var_field127A = var_4;
+					R2_GLOBALS._sound2.play(339);
+					_rotation->_idxChange = 0;
+					_field1270 = 0;
+					_field126E = 0;
+					_field1272 = 0;
+					if (_action1._field24 == 0)
+						_actor8.hide();
+				} else if ((tmpVar == 1) && (tmpVar != dx)) {
+					var_field127A = var_4 + 5;
+					R2_GLOBALS._sound2.play(339);
+					_rotation->_idxChange = 0;
+					_field1270 = 0;
+					_field126E = 0;
+					_field1272 = 0;
+					if (_action1._field24 == 0)
+						_actor8.hide();
+				} else {
+					var_4 = _unkObj1.sub1097C9(var_field127A + 70) - 70;
+					var_8 = abs(var_4 - var_field127A);
+					tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
+					if ( (((tmpVar == 25) || (tmpVar == 23) || (tmpVar == 14)) && (var_field127A <= var_4) && (_field127A >= var_4))
+					  || (((tmpVar == 26) || (tmpVar == 24) || (tmpVar == 15) || (tmpVar == 5) || (tmpVar == 4)) && (_field126E >= var_8) && (_field126E <= 3) && (_action1._field24 != 0)) ) {
+						var_field127A = var_4;
+						if ((tmpVar == 26) || (tmpVar == 24) || (tmpVar == 15) || (tmpVar == 5) || (tmpVar == 4))
+							R2_GLOBALS._sound2.play(339);
+						_rotation->_idxChange = 0;
+						_field1270 = 0;
+						_field126E = 0;
+						_field1272 = 0;
+						if (_action1._field24 == 0)
+							_actor8.hide();
+					} else if ((tmpVar == 1) && (var_field127A >= var_4 + 5) && (_field127A >= var_4 + 5)) {
+						var_field127A = var_4 + 5;
+						R2_GLOBALS._sound2.play(339);
+						_rotation->_idxChange = 0;
+						_field1270 = 0;
+						_field126E = 0;
+						_field1272 = 0;
+						if (_action1._field24 == 0)
+							_actor8.hide();
+					} else if (((tmpVar == 26) || (tmpVar == 24) || (tmpVar == 15) || (tmpVar == 5) || (tmpVar == 4)) && (var_a != 0) && (var_a <= 3)) {
+						di = var_6;
+						R2_GLOBALS._sound2.play(339);
+					} else {
+						// Nothing
+					}
+				}
+			}
+			break;
+		default:
+			break;
+		}
+
+		if (_field1284 < 2) {
+			_field127A = var_field127A;
+			_field127C = di;
+			if (_unkObj1.sub109C5E(_field127A, _field127C) != 0) {
+				_field1272 = 0;
+				_field126E = 0;
+				_field1270 = 0;
+				_rotation->setDelay(0);
+				_rotation->_idxChange = 0;
+			}
+			warning("gfx_set_pane_p");
+			_unkObj1.sub51B02();
+			if (_field1284 != 0)
+				++_field1284;
+		}
+	}
+
+	if (_field1272 == 0) {
+		if (_field126E != _field1270) {
+			if (_field126E >= _field1270) {
+				if (_field126E == 1) {
+					if (_action1._field24 != 0) {
+						if ( ((_field1276 == 1) && (var_8 == 0) && (var_a != 0) && (var_a <= 3) && ((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5) || (tmpVar == 14) || (tmpVar == 15)))
+						  || ((_field1276 == 3) && (var_a == 0) && (var_8 != 0) && (var_8 <= 3) && ((tmpVar == 25) || (tmpVar == 23) || (tmpVar == 14) || (tmpVar == 5) || (tmpVar == 4)))
+						  || ((_field1276 == 5) && (var_8 == 0) && (var_a != 0) && (var_a <= 3) && ((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4) || (tmpVar == 14) || (tmpVar == 15)))
+						  || ((_field1276 == 7) && (var_a == 0) && (var_8 != 0) && (var_8 <= 3) && ((tmpVar == 26) || (tmpVar == 24) || (tmpVar == 15) || (tmpVar == 5) || (tmpVar == 4))) ){
+							_field126E = 1;
+						} else
+							_field126E--;
+					} else
+						_field126E--;
+				} else
+					_field126E--;
+			} else
+				++_field126E;
+			_field1272 = 1;
+		}
+		_actor2.setFrame2(_field126E);
+	}
+
+	if (_field1272 == 1) {
+		if (_field126E == 0)
+			_rotation->_idxChange = 0;
+		else if (_field126E > 8)
+			_rotation->_idxChange = 2;
+		else
+			_rotation->_idxChange = 1;
+	}
+
+	if (_field1272 != 0)
+		_field1272--;
+
+	if (_field126E != 0) {
+		R2_GLOBALS._player._uiEnabled = false;
+		if (_field126E != _field1270)
+			_aSound1.play(276);
+	} else {
+		R2_GLOBALS._player._uiEnabled = true;
+		_aSound1.fadeOut2(NULL);
+	}
+
+	if (_rotation->_currIndex != _field1274)
+		_field1274 = _rotation->_currIndex;
+}
+
 /*--------------------------------------------------------------------------
  * Scene 3600 - 
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 8a51aa5251..6088c88479 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -571,6 +571,126 @@ public:
 	virtual void synchronize(Serializer &s);
 };
 
+class Scene3500 : public SceneExt {
+	class Action1: public Action {
+	public:
+		int _field1E;
+		int _field20;
+		int _field22;
+		int _field24;
+
+		Action1();
+		virtual void synchronize(Serializer &s);
+		void sub108670(int arg1);
+		void sub108732(int arg1);
+		virtual void signal();
+		virtual void dispatch();
+	};
+	class Action2: public Action {
+	public:
+		int _field1E;
+
+		Action2();
+		virtual void synchronize(Serializer &s);
+		void sub10831F(int arg1);
+
+		virtual void signal();
+	};
+
+	class Item4 : public NamedHotspot {
+	public:
+		int _field34;
+		
+		Item4();
+		virtual void synchronize(Serializer &s);
+		
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor7 : public SceneActor {
+	public:
+		int _fieldA4;
+		int _fieldA6;
+		int _fieldA8;
+		int _fieldAA;
+		int _fieldAC;
+		int _fieldAE;
+		
+		Actor7();
+		virtual void synchronize(Serializer &s);
+
+		void sub109466(int arg1, int arg2, int arg3, int arg4, int arg5);
+		void sub1094ED();
+		void sub109663(int arg1);
+		void sub109693(Common::Point Pt);
+
+		virtual void process(Event &event);
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor8 : public SceneActor {
+	public:
+		// TODO: double check if nothing specific is present, then remove this class
+	};
+
+	class UnkObject3500 : public UnkObject1200 {
+	public:
+		int sub1097C9(int arg1);
+		int sub1097EF(int arg1);
+		int sub109C09(Common::Point pt);
+		int sub109C5E(int &x, int &y);
+	};
+public:
+	Action1 _action1;
+	Action2 _action2;
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	NamedHotspot _item3;
+	Item4 _item4;
+	Item4 _item5;
+	Item4 _item6;
+	Item4 _item7;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	SceneActor _actor5;
+	SceneActor _actor6;
+	Actor7 _actor7;
+	Actor8 _actor8;
+	Actor8 _actor9;
+	ASoundExt _aSound1;
+	UnkObject3500 _unkObj1;
+	SequenceManager _sequenceManager;
+
+	int _fieldAF8;
+	int _fieldB9E;
+	PaletteRotation *_rotation;
+	int _field126E;
+	int _field1270;
+	int _field1272;
+	int _field1274;
+	int _field1276;
+	int _field1278;
+	int _field127A;
+	int _field127C;
+	int _field127E;
+	int _field1280;
+	int _field1282;
+	int _field1284;
+	int _field1286;
+
+	Scene3500();
+	void sub107F71(int arg1);
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void process(Event &event);
+	virtual void dispatch();
+	virtual void synchronize(Serializer &s);
+};
+
 class Scene3600 : public SceneExt {
 	class Action3600: public ActionExt {
 	public:
-- 
cgit v1.2.3


From c1352a1ae582a092263f37604557906ae2346bc4 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 30 Jan 2012 17:17:30 +0100
Subject: TSAGE - R2R: Implement scene 1750

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +-
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 302 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  64 +++++
 engines/tsage/ringworld2/ringworld2_scenes3.cpp |   2 +-
 4 files changed, 368 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 8df0a5bda2..7fca363350 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -132,7 +132,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1700:
 		return new Scene1700();
 	case 1750:
-		error("Missing scene %d from group 1", sceneNumber);
+		return new Scene1750();
 	case 1800:
 		return new Scene1800();
 	case 1850:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 9a9112e3fc..b7ed9aa264 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -5448,6 +5448,308 @@ void Scene1700::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1750 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene1750::Actor4::Actor4() {
+	_fieldA4 = 0;
+	_fieldA6 = 0;
+	_fieldA8 = 0;
+	_fieldAA = 0;
+	_fieldAC = 0;
+	_fieldAE = 0;
+}
+
+void Scene1750::Actor4::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+
+	s.syncAsSint16LE(_fieldA4);
+	s.syncAsSint16LE(_fieldA6);
+	s.syncAsSint16LE(_fieldA8);
+	s.syncAsSint16LE(_fieldAA);
+	s.syncAsSint16LE(_fieldAC);
+	s.syncAsSint16LE(_fieldAE);
+}
+
+Scene1750::Actor5::Actor5() {
+	_fieldA4 = 0;
+}
+
+void Scene1750::Actor5::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+
+	s.syncAsSint16LE(_fieldA4);
+}
+
+Scene1750::Scene1750() {
+	_field412 = 0;
+	_field413 = 0;
+	_field415 = 0;
+	_field417 = 0;
+	_field419 = 0;
+	_field41B = 0;
+	_field41D = 0;
+}
+
+void Scene1750::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+	SYNC_POINTER(_rotation);
+
+	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_field413);
+	s.syncAsSint16LE(_field415);
+	s.syncAsSint16LE(_field417);
+	s.syncAsSint16LE(_field419);
+	s.syncAsSint16LE(_field41B);
+	s.syncAsSint16LE(_field41D);
+}
+
+void Scene1750::Actor4::subB1A76(int arg1, int arg2, int arg3, int arg4, int arg5) {
+	_fieldA4 = arg1;
+	_fieldAE = 0;
+	_fieldA6 = arg2;
+	_fieldA8 = arg3;
+	_fieldAA = arg4;
+	_fieldAC = arg5;
+	
+	postInit();
+	setup(1750, 1, 1);
+	fixPriority(255);
+	setPosition(Common::Point(_fieldA6, _fieldA8 + ((_fieldAA * (arg1 - 1)) / (_fieldAC - 1))));
+}
+
+void Scene1750::Actor4::subB1B27() {
+	Scene1750 *scene = (Scene1750 *)R2_GLOBALS._sceneManager._scene;
+
+	int tmpVar = (_fieldAA / (_fieldAC - 1)) / 2;
+	int tmpVar2 = ((_position.y - _fieldA8 + tmpVar) * _fieldAC) / (_fieldAA + 2 * tmpVar);
+
+	setPosition(Common::Point(_fieldA6, _fieldA8 + ((_fieldAA * tmpVar2) / (_fieldAC - 1))));
+	scene->_field415 = scene->_field412 * tmpVar2;
+}
+
+void Scene1750::Actor4::remove() {
+	// Function kept to match IDA. Could be removed.
+	SceneActor::remove();
+}
+
+void Scene1750::Actor4::process(Event &event) {
+	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE) && (_bounds.contains(event.mousePos))) {
+		_fieldAE = 1;
+		event.eventType = EVENT_NONE;
+	}
+
+	if ((event.eventType == EVENT_BUTTON_UP) && (_fieldAE != 0)) {
+		_fieldAE = 0;
+		event.handled = true;
+		addMover(NULL);
+		subB1B27();
+	}
+	
+	if (_fieldAE != 0) {
+		event.handled = true;
+		if (event.mousePos.y >= _fieldA8) {
+			if (_fieldA8 + _fieldAA >= event.mousePos.y)
+				setPosition(Common::Point(_fieldA6, event.mousePos.y));
+			else
+				setPosition(Common::Point(_fieldA6, _fieldA8 + _fieldAA));
+		} else {
+			setPosition(Common::Point(_fieldA6, _fieldA8));
+		}
+	}
+}
+
+bool Scene1750::Actor4::startAction(CursorType action, Event &event) {
+	if (action == CURSOR_USE)
+		return SceneActor::startAction(action, event);
+
+	return false;
+}
+
+bool Scene1750::Actor5::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+	
+	Scene1750 *scene = (Scene1750 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_fieldA4) {
+	case 1:
+		show();
+		scene->_actor6.hide();
+		if (scene->_field415 < 0)
+			scene->_field415 ^= 0xFFFE;
+		scene->_field412 = 1;
+		break;
+	case 2:
+		show();
+		scene->_actor5.hide();
+		if (scene->_field415 > 0)
+			scene->_field415 ^= 0xFFFE;
+		scene->_field412 = -1;
+		break;
+	case 3:
+		if (scene->_rotation->_idxChange == 0) {
+			show();
+			R2_GLOBALS._sceneManager.changeScene(1700);
+		} else {
+			scene->_field415 = 0;
+			scene->_actor4._moveRate = 20;
+			scene->_actor5._moveDiff.y = 1;
+			Common::Point pt(286, 143);
+			NpcMover *mover = new NpcMover();
+			scene->_actor4.addMover(mover, &pt, NULL);
+		}
+	default:
+		break;
+	}
+
+	return true;
+}
+
+void Scene1750::postInit(SceneObjectList *OwnerList) {
+	loadScene(1750);
+	R2_GLOBALS._sound1.play(115);
+	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._v5589E.set(0, 0, 320, 200);
+	SceneExt::postInit();
+	
+	R2_GLOBALS._player._characterScene[1] = 1750;
+	R2_GLOBALS._player._characterScene[2] = 1750;
+	R2_GLOBALS._player._oldCharacterScene[1] = 1750;
+	R2_GLOBALS._player._oldCharacterScene[2] = 1750;
+
+	_rotation = R2_GLOBALS._scenePalette.addRotation(224, 254, 1);
+	_rotation->setDelay(0);
+	_rotation->_idxChange = 0;
+	_rotation->_countdown = 2;
+	
+	switch ((R2_GLOBALS._v565F6 + 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;
+	}
+	
+	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];
+	}
+
+	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];
+	}
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.enableControl();
+
+	_actor3.postInit();
+	_actor3.setup(1750, 3, 1);
+	_actor3.setPosition(Common::Point(49, 185));
+	_actor3.fixPriority(7);
+	_actor3.setDetails(1750, 30, -1, -1, 1, (SceneItem *) NULL);
+	
+	_actor1.postInit();
+	_actor1.setup(1750, 2, 1);
+	_actor1.setPosition(Common::Point(35, ((_rotation->_currIndex - 218) % 4) + ((R2_GLOBALS._v565F6 % 800) * 4) - 1440));
+	_actor1.fixPriority(8);
+	
+	_actor2.postInit();
+	_actor2.setup(1750, 1, 4);
+	
+	int tmpVar = abs(_actor1._position.y - 158) / 100;
+	
+	if (tmpVar >= 8)
+		_actor2.hide();
+	else if (_actor1._position.y <= 158)
+		_actor2.setPosition(Common::Point(137, (tmpVar * 7) + 122));
+	else
+		_actor2.setPosition(Common::Point(148, (tmpVar * 7) + 122));
+	
+	_actor4.subB1A76(1, 286, 143, 41, 15);
+	_actor4.setDetails(1750, 24, 1, -1, 1, (SceneItem *) NULL);
+	
+	_actor5.postInit();
+	_actor5._fieldA4 = 1;
+	_actor5.setup(1750, 1, 2);
+	_actor5.setPosition(Common::Point(192, 140));
+	_actor5.setDetails(1750, 18, 1, -1, 1, (SceneItem *) NULL);
+	
+	_actor6.postInit();
+	_actor6._fieldA4 = 2;
+	_actor6.setup(1750, 1, 3);
+	_actor6.setPosition(Common::Point(192, 163));
+	_actor6.setDetails(1750, 18, 1, -1, 1, (SceneItem *) NULL);
+	_actor6.hide();
+	
+	_actor7.postInit();
+	_actor7._fieldA4 = 3;
+	_actor7.setup(1750, 1, 5);
+	_actor7.setPosition(Common::Point(230, 183));
+	_actor7.setDetails(1750, 27, 1, -1, 1, (SceneItem *) NULL);
+
+	_field412 = 1;
+	_field417 = 0;
+	_field413 = 0;
+	_field415 = 0;
+	_field419 = ((_rotation->_currIndex - 218) / 4) % 4;
+	
+	_item2.setDetails(Rect(129, 112, 155, 175), 1750, 21, -1, -1, 1, NULL);
+	_item3.setDetails(Rect(93, 122, 126, 172), 1750, 15, -1, -1, 1, NULL);
+	_item4.setDetails(Rect(3, 3, 157, 99), 1750, 9, -1, -1, 1, NULL);
+	_item5.setDetails(Rect(162, 3, 316, 99), 1750, 12, -1, -1, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 320, 200), 1750, 6, 1, -1, 1, NULL);
+}
+
+void Scene1750::remove() {
+	_rotation->remove();
+	
+	if (R2_GLOBALS._v565F6 == 2400)
+		R2_GLOBALS._v565F6 = 2399;
+	
+	if (R2_GLOBALS._v565F6 == -2400)
+		R2_GLOBALS._v565F6 = -2399;
+	
+	R2_GLOBALS._v565FA = R2_GLOBALS._v565F6;
+	
+	SceneExt::remove();
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	R2_GLOBALS._v5589E.top = 3;
+	R2_GLOBALS._v5589E.bottom = 168;
+	R2_GLOBALS._v58CE2 = 1;
+}
+
+void Scene1750::signal() {
+	R2_GLOBALS._player.enableControl();
+}
+
+void Scene1750::process(Event &event) {
+	Scene::process(event);
+	if (!event.handled)
+		_actor4.process(event);
+}
+
+void Scene1750::dispatch() {}
+
 /*--------------------------------------------------------------------------
  * Scene 1800 - 
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index da68bffcab..be4f32ac3f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -561,6 +561,70 @@ public:
 	virtual void signal();
 };
 
+class Scene1750 : public SceneExt {
+	class Actor4 : public SceneActor {
+	public:
+		int _fieldA4;
+		int _fieldA6;
+		int _fieldA8;
+		int _fieldAA;
+		int _fieldAC;
+		int _fieldAE;
+		
+		Actor4();
+		virtual void synchronize(Serializer &s);
+		void subB1A76(int arg1, int arg2, int arg3, int arg4, int arg5);
+		void subB1B27();
+
+		virtual void remove();
+		virtual void process(Event &event);
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	
+	class Actor5 : public SceneActor {
+	public:
+		int _fieldA4;
+		
+		Actor5();
+		virtual void synchronize(Serializer &s);
+
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+public:
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	NamedHotspot _item3;
+	NamedHotspot _item4;
+	NamedHotspot _item5;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	Actor4 _actor4;
+	Actor5 _actor5;
+	Actor5 _actor6;
+	Actor5 _actor7;
+	SequenceManager _sequenceManager;
+	PaletteRotation *_rotation;
+
+	int _field412;
+	int _field413;
+	int _field415;
+	int _field417;
+	int _field419;
+	int _field41B;
+	int _field41D;
+
+	Scene1750();
+	virtual void synchronize(Serializer &s);
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void process(Event &event);
+	virtual void dispatch();
+};
+
 class Scene1800 : public SceneExt {
 	class Hotspot5 : public NamedHotspot {
 	public:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index d462cb11f5..e627d9cbf5 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -3092,10 +3092,10 @@ Scene3500::Scene3500() {
 
 void Scene3500::synchronize(Serializer &s) {
 	SceneExt::synchronize(s);
+	SYNC_POINTER(_rotation);
 
 	s.syncAsSint16LE(_fieldAF8);
 	s.syncAsSint16LE(_fieldB9E);
-	_rotation->synchronize(s);
 	s.syncAsSint16LE(_field126E);
 	s.syncAsSint16LE(_field1270);
 	s.syncAsSint16LE(_field1272);
-- 
cgit v1.2.3


From d34cf096081dd3f5b12d129e9d50172cf76e6179 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 30 Jan 2012 17:23:43 +0100
Subject: TSAGE: R2R - Implement scene 525

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |  2 ++
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 26 +++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes0.h   | 10 ++++++++++
 3 files changed, 38 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 7fca363350..f5bbd2eee5 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -81,6 +81,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Lander Bay 2 Storage
 		return new Scene500();
 	case 525:
+		// Cutscene - Walking in hall
+		return new Scene525();
 	case 600:
 	case 700:
 		error("Missing scene %d from group 0", sceneNumber);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 784968b5cb..dcebd3c906 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -4440,6 +4440,32 @@ void Scene500::signal() {
 	}
 }
 
+
+/*--------------------------------------------------------------------------
+ * Scene 525 - Cutscene - Walking in hall
+ *
+ *--------------------------------------------------------------------------*/
+void Scene525::postInit(SceneObjectList *OwnerList) {
+	loadScene(525);
+	R2_GLOBALS._v58CE2 = 0;
+	SceneExt::postInit();
+	
+	R2_GLOBALS._sound1.play(105);
+	
+	_actor1.postInit();
+	_actor1._effect = 1;
+	
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.disableControl();
+	
+	setAction(&_sequenceManager, this, 525, &R2_GLOBALS._player, &_actor1, NULL);
+}
+
+void Scene525::signal() {
+	R2_GLOBALS._sceneManager.changeScene(1525);
+}
+
 /*--------------------------------------------------------------------------
  * Scene 800 - Sick Bay
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index c7b0ecfc83..581958975d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -521,6 +521,16 @@ public:
 	virtual void signal();
 };
 
+class Scene525: public SceneExt {
+public:
+	SceneActor _actor1;
+	SequenceManager _sequenceManager;
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void signal();
+
+};
+
 class Scene800: public SceneExt {
 	/* Items */
 	class Button: public NamedHotspot {
-- 
cgit v1.2.3


From cf8a6dcd835d3db85648c07e3f254505ea7a7945 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 29 Jan 2012 17:14:47 +0100
Subject: KYRA: (EOB) - fix typo

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

(limited to 'engines')

diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 5c2c3e5f33..3df19f3690 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -3656,7 +3656,7 @@ int GUI_EoB::selectCharacterDialogue(int id) {
 			}
 
 		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
-			if (found >= 0)
+			if (hlCur >= 0)
 				result = hlCur;
 
 		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_ESCAPE] || inputFlag == 0x8010) {
-- 
cgit v1.2.3


From 3e8547ebc1d24fc4a120792e3d1b99c982cf1c37 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 30 Jan 2012 23:51:37 +0100
Subject: TSAGE: R2R - Implement scene 600

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   1 +
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 464 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  62 ++++
 3 files changed, 527 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index f5bbd2eee5..16fc460a11 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -84,6 +84,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Cutscene - Walking in hall
 		return new Scene525();
 	case 600:
+		return new Scene600();
 	case 700:
 		error("Missing scene %d from group 0", sceneNumber);
 	case 800:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index dcebd3c906..51f7cd8804 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -4466,6 +4466,470 @@ void Scene525::signal() {
 	R2_GLOBALS._sceneManager.changeScene(1525);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 600 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene600::Scene600() {
+	_field412 = 0;
+	for (int i = 0; i < 256; i++)
+		_fieldAD2[i] = 0;
+}
+
+void Scene600::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+	for (int i = 0; i < 256; i++)
+		s.syncAsByte(_fieldAD2[i]);
+}
+
+bool Scene600::Item1::startAction(CursorType action, Event &event) {
+	if ((action != R2_NEGATOR_GUN) || (!R2_GLOBALS.getFlag(5)) || (R2_GLOBALS.getFlag(8)))
+		return SceneHotspot::startAction(action, event);
+
+	SceneItem::display(600, 32, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+	return true;
+}
+
+bool Scene600::Item4::startAction(CursorType action, Event &event) {
+	if ((action != R2_NEGATOR_GUN) || (!R2_GLOBALS.getFlag(1)))
+		return SceneHotspot::startAction(action, event);
+	
+	if ((R2_GLOBALS.getFlag(5)) && (!R2_GLOBALS.getFlag(8))) {
+		SceneItem::display(600, 32, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		return true;
+	}
+	
+	if (R2_GLOBALS.getFlag(5)) {
+		SceneItem::display(600, 30, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		return true;
+	}
+	
+	if ((!R2_GLOBALS.getFlag(8)) || (R2_GLOBALS.getFlag(9)))
+		return SceneHotspot::startAction(action, event);
+
+	R2_GLOBALS._player.disableControl();
+	
+	Scene600 *scene = (Scene600 *)R2_GLOBALS._sceneManager._scene;
+
+	scene->_object1.setup2(603, 3, 1, 239, 54, 10, 0);
+	scene->_actor3.postInit();
+	scene->_actor2.postInit();
+	
+	scene->_sceneMode = 612;
+	setAction(&scene->_sequenceManager1, this, 612, &scene->_actor3, &scene->_actor2, R2_GLOBALS._player, NULL);
+	return true;
+}
+
+void Scene600::Actor4::signal() {
+	Common::Point pt(36, 177 + R2_GLOBALS._randomSource.getRandomNumber(5));
+	NpcMover *mover = new NpcMover();
+	addMover(mover, &pt, this);
+}
+
+bool Scene600::Actor4::startAction(CursorType action, Event &event) {
+	if ((action >= CURSOR_WALK) && (action < R2CURSORS_START))
+	// Only action cursors
+		return SceneActor::startAction(action, event);
+	
+	return false;
+}
+
+void Scene600::Actor4::draw() {
+	warning("TODO: Actor4::draw()");
+	SceneActor::draw();
+}
+
+bool Scene600::Actor5::startAction(CursorType action, Event &event) {
+	if ((action < CURSOR_WALK) && (action >= R2CURSORS_START))
+		return false;
+		
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+	
+	Scene600 *scene = (Scene600 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((R2_INVENTORY.getObjectScene(R2_CLAMP) == 600) && (!R2_GLOBALS.getFlag(6))) {
+		R2_GLOBALS._player.disableControl();
+		scene->_actor6.setDetails(600, 11, -1, -1, 3, (SceneItem *) NULL);
+		R2_GLOBALS.setFlag(6);
+		scene->_sceneMode = 609;
+		scene->setAction(&scene->_sequenceManager1, scene, 609, &R2_GLOBALS._player, &scene->_actor5, &scene->_actor6, &scene->_actor1, NULL);
+		return true;
+	}
+	
+	if (_frame != 1)
+		return false;
+	
+	if (!R2_GLOBALS.getFlag(6)) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 616;
+		scene->setAction(&scene->_sequenceManager1, scene, 616, &R2_GLOBALS._player, &scene->_actor5, &scene->_actor6, NULL);
+		return true;
+	}
+	
+	if ((R2_GLOBALS.getFlag(9)) && (R2_INVENTORY.getObjectScene(R2_9) == 600))
+		SceneItem::display(600, 31, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+	else {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 601;
+		scene->setAction(&scene->_sequenceManager1, scene, 601, &R2_GLOBALS._player, &scene->_actor5, NULL);
+	}
+	return true;
+}
+
+bool Scene600::Actor6::startAction(CursorType action, Event &event) {
+	Scene600 *scene = (Scene600 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action < CURSOR_WALK) && (action >= R2CURSORS_START)) {
+		switch (action) {
+		case R2_9:
+			if (R2_GLOBALS.getFlag(6)) {
+				if (R2_GLOBALS.getFlag(8)) {
+					SceneItem::display(600, 29, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+					return true;
+				} else {
+					R2_GLOBALS._player.disableControl();
+					scene->_actor8.postInit();
+					scene->_actor8.setDetails(600, 20, -1, -1, 4, &scene->_actor6);
+					scene->_sceneMode = 607;
+					scene->setAction(&scene->_sequenceManager1, scene, 607, &R2_GLOBALS._player, &scene->_actor8, NULL);
+					return true;
+				}
+			} else {
+				return SceneActor::startAction(action, event);
+			}
+			break;
+		case R2_AEROSOL:
+			if (R2_GLOBALS.getFlag(5)) {
+				SceneItem::display(600, 28, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+				return true;
+			} else {
+				R2_GLOBALS._player.disableControl();
+				scene->_actor7.postInit();
+				scene->_actor7.setDetails(600, 27, -1, -1, 5, &scene->_actor6);
+
+				scene->_actor4.postInit();
+				scene->_actor4.setup(601, 3, 1);
+				scene->_actor4._effect = 3;
+				scene->_actor4._moveDiff = Common::Point(1, 1);
+				scene->_actor4._moveRate = 2;
+				scene->_actor4._numFrames = 3;
+				scene->_actor4.setDetails(600, 24, 25, 26, 5, &scene->_actor7);
+
+				scene->_sceneMode = 605;
+
+				scene->setAction(&scene->_sequenceManager1, scene, 605, &R2_GLOBALS._player, &scene->_actor7, &scene->_actor4, &scene->_actor5, NULL);
+				return true;
+			}
+			break;
+		case R2_CLAMP:
+			if (R2_GLOBALS.getFlag(5)) {
+				R2_GLOBALS._player.disableControl();
+				scene->_sceneMode = 606;
+				scene->setAction(&scene->_sequenceManager1, scene, 606, &R2_GLOBALS._player, &scene->_actor6, NULL);
+				return true;
+			} else {
+				return SceneActor::startAction(action, event);
+			}
+			break;
+		default:
+			return false;
+			break;
+		}
+	} else if (action != CURSOR_USE) {
+		if (R2_GLOBALS.getFlag(5)) {
+			return SceneActor::startAction(action, event);
+		} else {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 610;
+			scene->setAction(&scene->_sequenceManager1, scene, 610, &scene->_actor1, &R2_GLOBALS._player, NULL);
+			return true;
+		}
+	} else
+		return SceneActor::startAction(action, event);
+}
+
+bool Scene600::Actor7::startAction(CursorType action, Event &event) {
+	Scene600 *scene = (Scene600 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action < CURSOR_WALK) && (action >= R2CURSORS_START)) {
+		return false;
+	} else if (action == CURSOR_USE) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 614;
+		scene->setAction(&scene->_sequenceManager1, scene, 614, &R2_GLOBALS._player, &scene->_actor7, NULL);
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+bool Scene600::Actor8::startAction(CursorType action, Event &event) {
+	Scene600 *scene = (Scene600 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action == CURSOR_USE) && (R2_INVENTORY.getObjectScene(9) == 600)) {
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 615;
+		scene->setAction(&scene->_sequenceManager1, scene, 615, &R2_GLOBALS._player, &scene->_actor8, NULL);
+	} else if ((action == R2_SONIC_STUNNER) && (R2_INVENTORY.getObjectScene(9) == 600) && (R2_GLOBALS._v565F1[1] == 2) && (!R2_GLOBALS.getFlag(8))){
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 608;
+		scene->setAction(&scene->_sequenceManager1, scene, 608, &R2_GLOBALS._player, &scene->_actor4, NULL);
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+
+	return true;
+}
+
+void Scene600::postInit(SceneObjectList *OwnerList) {
+	loadScene(600);
+	SceneExt::postInit();
+	R2_GLOBALS.setFlag(39);
+	R2_GLOBALS._walkRegions.enableRegion(3);
+	_field412 = 0;
+
+	warning("FIXME: loop to initialize _fieldAD2[]");
+
+	_actor5.postInit();
+	_actor5.setVisage(600);
+	_actor5.setPosition(Common::Point(29, 147));
+	_actor5.fixPriority(10);
+	_actor5.setDetails(300, 3, -1, -1, 1, (SceneItem *) NULL);
+
+	_actor6.postInit();
+	_actor6.setPosition(Common::Point(246, 41));
+
+	if (R2_INVENTORY.getObjectScene(9) == 600) {
+		_actor8.postInit();
+		_actor8.setup(602, 5, 1);
+		_actor8.setPosition(Common::Point(246, 41));
+		_actor8.setDetails(600, 20, -1, -1, 1, (SceneItem *) NULL);
+		switch (R2_GLOBALS._v565F1[1] - 2) {
+		case 0:
+			R2_GLOBALS._sound4.play(45);
+			break;
+		case 1:
+			R2_GLOBALS._sound4.play(4);
+			break;
+		case 2:
+			R2_GLOBALS._sound4.play(5);
+			break;
+		case 3:
+			R2_GLOBALS._sound4.play(6);
+			break;
+		default:
+			break;
+		}
+	}
+
+	if (R2_GLOBALS.getFlag(6)) {
+		_actor6.setup(602, 7, 1);
+		_actor6.setDetails(600, 11, -1, -1, 1, (SceneItem *) NULL);
+	} else {
+		_actor6.setup(600, 2, 1);
+		_actor6.setDetails(600, 10, -1, -1, 1, (SceneItem *) NULL);
+
+		_actor1.postInit();
+		_actor1.setup(600, 3, 5);
+		_actor1.setPosition(Common::Point(223, 51));
+		_actor1.fixPriority(200);
+	}
+
+	if (! R2_GLOBALS.getFlag(9))
+		_object1.setup2(603, 1, 1, 244, 50, 10, 0);
+
+	if (R2_GLOBALS.getFlag(5)) {
+		if (R2_INVENTORY.getObjectScene(12) == 600) {
+			_actor7.postInit();
+			_actor7.setup(602, 2, 2);
+			_actor7.setPosition(Common::Point(189, 95));
+			_actor7.setDetails(600, 27, -1, -1, 1, (SceneItem *) NULL);
+		}
+
+		if (R2_GLOBALS.getFlag(8)) {
+			if (R2_GLOBALS.getFlag(9)) {
+				_actor2.postInit();
+				_actor2.setup(603, 2, 1);
+				_actor2.setPosition(Common::Point(233, 45));
+				_actor2.animate(ANIM_MODE_2, NULL);_actor2.fixPriority(11);
+			}
+		} else {
+			_actor4.postInit();
+			_actor4.setup(601, 1, 1);
+			_actor4.setPosition(Common::Point(180, 110));
+			_actor4._moveDiff = Common::Point(1, 1);
+			_actor4._moveRate = 2;
+			_actor4._numFrames = 3;
+			_actor4.animate(ANIM_MODE_2, NULL);
+			_actor4.fixPriority(130);
+			_actor4._effect = 3;
+			_actor4.setDetails(600, 24, 25, 26, 1, (SceneItem *) NULL);
+			_actor4.signal();
+		}
+	}
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setVisage(10);
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player.disableControl();
+
+	_item2.setDetails(12, 600, 17, -1, 19);
+	_item3.setDetails(11, 600, 14, -1, -1);
+
+	if (R2_GLOBALS.getFlag(9)) {
+		_item1.setDetails(Rect(159, 3, 315, 95), 600, 7, -1, -1, 1, NULL);
+	} else {
+		_item4.setDetails(Rect(173, 15, 315, 45), 600, 21, -1, 23, 1, NULL);
+		_item1.setDetails(Rect(159, 3, 315, 95), 600, 6, -1, -1, 1, NULL);
+	}
+	_item5.setDetails(Rect(0, 0, 320, 200), 600, 0, -1, -1, 1, NULL);
+
+	_sceneMode = 600;
+	if (R2_GLOBALS._sceneManager._previousScene == 700) {
+		if (R2_GLOBALS.getFlag(6)) {
+			setAction(&_sequenceManager1, this, 600, &R2_GLOBALS._player, &_actor5, NULL);
+		} else if (R2_GLOBALS.getFlag(5)) {
+			setAction(&_sequenceManager1, this, 603, &R2_GLOBALS._player, &_actor5, &_actor6, &_actor1, NULL);
+		} else {
+			setAction(&_sequenceManager1, this, 602, &R2_GLOBALS._player, &_actor5, &_actor6, &_actor1, NULL);
+		}
+	} else if (R2_GLOBALS.getFlag(5)) {
+		R2_GLOBALS._player.setPosition(Common::Point(50, 140));
+		R2_GLOBALS._player.setStrip(3);
+		_actor6.setFrame(_actor6.getFrameCount());
+		signal();
+	} else {
+		_actor5.setFrame(7);
+		_actor6.setFrame(7);
+		R2_GLOBALS._player.setPosition(Common::Point(28, 140));
+		R2_GLOBALS._player.setStrip(5);
+		signal();
+	}
+}
+
+void Scene600::remove() {
+	if (R2_INVENTORY.getObjectScene(9) == 600)
+		R2_GLOBALS._sound4.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene600::signal() {
+	switch (_sceneMode) {
+	case 601:
+	// No break on purpose
+	case 613:
+	// No break on purpose
+	case 616:
+		R2_GLOBALS._sceneManager.changeScene(700);
+		break;
+	case 605:
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._walkRegions.enableRegion(6);
+		R2_GLOBALS._walkRegions.enableRegion(7);
+		R2_GLOBALS._walkRegions.enableRegion(9);
+		R2_GLOBALS._walkRegions.enableRegion(10);
+
+		R2_INVENTORY.setObjectScene(12, 600);
+		R2_GLOBALS.setFlag(5);
+
+		_actor4._effect = 3;
+		_actor4.signal();
+		break;
+	case 606:
+		R2_INVENTORY.setObjectScene(15, 600);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 607:
+		R2_INVENTORY.setObjectScene(9, 600);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 608:
+		R2_GLOBALS.setFlag(8);
+		_actor4.remove();
+		R2_GLOBALS._walkRegions.disableRegion(6);
+		R2_GLOBALS._walkRegions.disableRegion(9);
+		R2_GLOBALS._walkRegions.disableRegion(10);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 612:
+		R2_GLOBALS.setFlag(9);
+		_actor3.remove();
+		R2_GLOBALS._sceneItems.remove(&_item4);
+		_actor2.setDetails(600, 21, -1, 23, 4, &_item4);
+		_item1.setDetails(600, 7, -1, -1, 3, (SceneItem *) NULL);
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		break;
+	case 614:
+		R2_GLOBALS._player.enableControl();
+		_actor7.remove();
+		R2_INVENTORY.setObjectScene(12, 1);
+		R2_GLOBALS._walkRegions.disableRegion(7);
+		break;
+	case 615:
+		_actor8.remove();
+		R2_INVENTORY.setObjectScene(9, 1);
+		R2_GLOBALS._player.enableControl();
+		break;
+	default:
+		_field412 = 0;
+		_sceneMode = 0;
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
+void Scene600::process(Event &event) {
+	if ((!R2_GLOBALS._player._canWalk) && (!R2_GLOBALS.getFlag(6)) && (event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == R2_NEGATOR_GUN)) {
+		if (!_actor5.contains(event.mousePos) || (_actor5._frame <= 1)) {
+			if (R2_GLOBALS.getFlag(5)) {
+				_field412 += 10;
+			} else {
+				R2_GLOBALS._player.disableControl();
+				_sceneMode = 604;
+				setAction(&_sequenceManager1, this, 604, &_actor1, &R2_GLOBALS._player, NULL);
+				event.handled = true;
+			}
+		} else {
+			R2_GLOBALS._player.disableControl();
+			_sceneMode = 613;
+			setAction(&_sequenceManager1, this, 613, &R2_GLOBALS._player, &_actor6, NULL);
+			event.handled = true;
+		}
+	} else if ((!R2_GLOBALS.getFlag(6)) && (R2_GLOBALS._player._mover) && (_field412 < 10)){
+		_field412 += 10;
+	}
+
+	Scene::process(event);
+}
+
+void Scene600::dispatch() {
+	if ((_field412 != 0) && (_sceneMode != 600) && (_sceneMode != 603) && (_sceneMode != 602)) {
+		if ( ((_actor6._strip == 4) && (_actor6._frame > 1))
+		  ||  (_sceneMode == 601)
+		  || ((_sceneMode == 616) && (_actor5._frame > 1)) )
+		  _field412 = 0;
+		else {
+			_field412--;
+			if (_field412 % 10 == 0) {
+				_actor1.setAction(&_sequenceManager2, NULL, 611, &_actor1, NULL);
+			}
+			if ((_field412 == 0) && (R2_GLOBALS._player._mover))
+				_field412 = 10;
+		}
+	}
+
+	if (_actor1._frame == 2)
+		_aSound1.play(40);
+
+	Scene::dispatch();
+	if ((_actor4._strip == 3) && (_actor4._frame == 3)) {
+		_actor1.setStrip(4);
+		_actor1.setFrame(1);
+	}
+}
 /*--------------------------------------------------------------------------
  * Scene 800 - Sick Bay
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 581958975d..25940e78b5 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -531,6 +531,68 @@ public:
 
 };
 
+class Scene600 : public SceneExt {
+	class Item1 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Item4 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor4 : public SceneActor {
+	public:
+		virtual void signal();
+		virtual bool startAction(CursorType action, Event &event);
+		virtual void draw();
+	};
+	class Actor5 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor6 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor7 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor8 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+	int _field412;
+	Item1 _item1;
+	Item1 _item2;
+	Item1 _item3;
+	Item4 _item4;
+	Item1 _item5;
+	BackgroundSceneObject _object1;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	Actor4 _actor4;
+	Actor5 _actor5;
+	Actor6 _actor6;
+	Actor7 _actor7;
+	Actor8 _actor8;
+	ASoundExt _aSound1;
+	SequenceManager _sequenceManager1;
+	SequenceManager _sequenceManager2;
+	byte _fieldAD2[256];
+
+	Scene600();
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void Scene600::remove();
+	virtual void signal();
+	virtual void process(Event &event);
+	virtual void dispatch();
+	virtual void synchronize(Serializer &s);
+};
+
 class Scene800: public SceneExt {
 	/* Items */
 	class Button: public NamedHotspot {
-- 
cgit v1.2.3


From 4dffd4c1db122553795390ffed9d7776e20bc329 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 31 Jan 2012 01:02:37 +0100
Subject: TSAGE: R2R - Fix a couple of compilation errors not detected by MSVC

Thanks Kirben for pointing those
---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 2 +-
 engines/tsage/ringworld2/ringworld2_scenes0.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 51f7cd8804..65fd762bbc 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -4518,7 +4518,7 @@ bool Scene600::Item4::startAction(CursorType action, Event &event) {
 	scene->_actor2.postInit();
 	
 	scene->_sceneMode = 612;
-	setAction(&scene->_sequenceManager1, this, 612, &scene->_actor3, &scene->_actor2, R2_GLOBALS._player, NULL);
+	setAction(&scene->_sequenceManager1, this, 612, &scene->_actor3, &scene->_actor2, &R2_GLOBALS._player, NULL);
 	return true;
 }
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 25940e78b5..518e876ce6 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -586,7 +586,7 @@ public:
 
 	Scene600();
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-	virtual void Scene600::remove();
+	virtual void remove();
 	virtual void signal();
 	virtual void process(Event &event);
 	virtual void dispatch();
-- 
cgit v1.2.3


From e4e7827f776eb3f013d047544938a617dde6aae0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 31 Jan 2012 22:20:30 +1100
Subject: TSAGE: Properly handle resetting flags when leaving a scene

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

(limited to 'engines')

diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 9d75808dbf..c091afe34c 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -164,7 +164,7 @@ void SceneManager::changeScene(int newSceneNumber) {
 		sceneObj->setObjectWrapper(NULL);
 		sceneObj->animate(ANIM_MODE_NONE, 0);
 
-		sceneObj->_flags &= !OBJFLAG_PANES;
+		sceneObj->_flags &= ~OBJFLAG_PANES;
 	}
 
 	// Blank out the screen
-- 
cgit v1.2.3


From d1db4a48ed18bc4d411860c06b90151f37875ae8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 31 Jan 2012 22:23:55 +1100
Subject: TSAGE: Implement R2R Scene 205 - Star-field Credits

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |  22 +-
 engines/tsage/ringworld2/ringworld2_logic.h     |  14 +
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 357 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  47 ++++
 4 files changed, 439 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 16fc460a11..463df46681 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -64,7 +64,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Deck #2 - By Lift
 		return new Scene200();
 	case 205:
-		error("Missing scene %d from group 0", sceneNumber);
+		// Star-field Credits
+		return new Scene205();
 	case 250:
 		// Lift
 		return new Scene250();
@@ -1442,6 +1443,25 @@ void Scene1200::sub9DAD6(int indx) {
 	}
 }
 
+/*--------------------------------------------------------------------------*/
+
+ActionObject::ActionObject(): EventHandler() {
+	_endAction = NULL;
+}
+
+void ActionObject::synchronize(Serializer &s) {
+	EventHandler::synchronize(s);
+
+	SYNC_POINTER(_endAction);
+}
+
+void ActionObject::remove() {
+	if (_endAction)
+		_endAction->signal();
+
+	_endAction = NULL;
+}
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index dbb740d9fd..24b8ba07fc 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -321,6 +321,20 @@ public:
 	int sub9EE22(int &arg1, int &arg2);
 	virtual Common::String getClassName() { return "UnkObject1200"; }
 };
+
+class ActionObject: public EventHandler {
+public:
+	EventHandler *_endAction;
+	Rect _rect1, _screenBounds;
+	int _field3A, _field3C;
+	int _field58, _field5A;
+public:
+	ActionObject();
+
+	virtual void synchronize(Serializer &s);
+	virtual void remove();
+};
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 65fd762bbc..887ff17d3b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1615,6 +1615,363 @@ void Scene200::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 205 - Star-field Credits
+ *
+ *--------------------------------------------------------------------------*/
+
+void Scene205::Action1::signal() {
+	Scene205 *scene = (Scene205 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0:
+		setDelay(2);
+		break;
+
+	case 1:
+		scene->_yp = 100 - (scene->_fontHeight * 3 / 2);
+		scene->handleText();
+
+		for (int idx = 1; idx <= 2; ++idx) {
+			++scene->_textIndex;
+			scene->_yp += scene->_fontHeight;
+			scene->handleText();
+		}
+		setDelay(240);
+		break;
+
+	case 2:
+	case 4:
+	case 6:
+	case 8:
+	case 10:
+	case 12:
+	case 14:
+	case 16:
+	case 18:
+	case 20:
+		textLoop();
+		setDelay(120);
+		break;
+
+	case 3:
+		scene->_textIndex = 1;
+		scene->_yp = 100 - ((scene->_fontHeight * 2) / 2);
+		scene->handleText();
+
+		++scene->_textIndex;
+		scene->_yp += scene->_fontHeight;
+		scene->handleText();
+		setDelay(240);
+		break;
+
+	case 5:
+		scene->_textIndex = 1;
+		scene->_yp = 100 - ((scene->_fontHeight * 7) / 2);
+		scene->handleText();
+
+		for (int idx = 1; idx <= 6; ++idx) {
+			++scene->_textIndex;
+			scene->_yp += scene->_fontHeight;
+			scene->handleText();
+		}
+
+		setDelay(480);
+		break;
+
+	case 7:
+		scene->_textIndex = 1;
+		scene->_yp = 100 - ((scene->_fontHeight * 6) / 2);
+		scene->handleText();
+
+		for (int idx = 1; idx <= 5; ++idx) {
+			++scene->_textIndex;
+			scene->_yp += scene->_fontHeight;
+			scene->handleText();
+		}
+
+		setDelay(300);
+		break;
+
+	case 9:
+		scene->_textIndex = 1;
+		scene->_yp = 100 - ((scene->_fontHeight * 8) / 2);
+		scene->handleText();
+
+		for (int idx = 1; idx <= 7; ++idx) {
+			++scene->_textIndex;
+			scene->_yp += scene->_fontHeight;
+			scene->handleText();
+		}
+
+		setDelay(480);
+		break;
+
+	case 11:
+		scene->_textIndex = 1;
+		scene->_yp = 100 - ((scene->_fontHeight * 3) / 2);
+		scene->handleText();
+
+		for (int idx = 1; idx <= 2; ++idx) {
+			++scene->_textIndex;
+			scene->_yp += scene->_fontHeight;
+			scene->handleText();
+		}
+
+		setDelay(240);
+		break;
+
+	case 13:
+		scene->_textIndex = 1;
+		scene->_yp = 100 - ((scene->_fontHeight * 3) / 2);
+		scene->handleText();
+
+		for (int idx = 1; idx <= 2; ++idx) {
+			++scene->_textIndex;
+			scene->_yp += scene->_fontHeight;
+			scene->handleText();
+		}
+
+		setDelay(240);
+		break;
+
+	case 15:
+		scene->_textIndex = 1;
+		scene->_yp = 100 - ((scene->_fontHeight * 5) / 2);
+		scene->handleText();
+
+		for (int idx = 1; idx <= 4; ++idx) {
+			++scene->_textIndex;
+			scene->_yp += scene->_fontHeight;
+			scene->handleText();
+		}
+
+		setDelay(240);
+		break;
+
+	case 17:
+		scene->_textIndex = 1;
+		scene->_yp = 100 - ((scene->_fontHeight * 5) / 2);
+		scene->handleText();
+
+		for (int idx = 1; idx <= 4; ++idx) {
+			++scene->_textIndex;
+			scene->_yp += scene->_fontHeight;
+			scene->handleText();
+		}
+
+		setDelay(360);
+		break;
+
+	case 19:
+		scene->_textIndex = 1;
+		scene->_yp = 100 - ((scene->_fontHeight * 3) / 2);
+		scene->handleText();
+
+		for (int idx = 1; idx <= 2; ++idx) {
+			++scene->_textIndex;
+			scene->_yp += scene->_fontHeight;
+			scene->handleText();
+		}
+
+		setDelay(480);
+		break;
+
+	case 21:
+		R2_GLOBALS._sceneManager.changeScene(R2_GLOBALS._sceneManager._previousScene);
+
+	default:
+		break;
+	}
+}
+
+void Scene205::Action1::textLoop() {
+	Scene205 *scene = (Scene205 *)R2_GLOBALS._sceneManager._scene;
+
+	for (int idx = 1; idx <= 14; ++idx) {
+		if (R2_GLOBALS._sceneObjects->contains(&scene->_textList[idx])) {
+			scene->_textList[idx].remove();
+		}
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+Scene205::Object::Object(): SceneObject() {
+	_x100 = _y100 = 0;
+}
+
+void Scene205::Object::synchronize(Serializer &s) {
+	EventHandler::synchronize(s);
+
+	s.syncAsSint32LE(_x100);
+	s.syncAsSint32LE(_y100);
+}
+
+/*--------------------------------------------------------------------------*/
+
+Scene205::Scene205(): SceneExt() {
+	_yp = 0;
+	_textIndex = 1;
+	_lineNum = -1;
+
+	GfxFont font;
+	font.setFontNumber(4);
+	_fontHeight = font.getHeight();
+}
+
+void Scene205::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(4000);
+	R2_GLOBALS._player._uiEnabled = false;
+
+	R2_GLOBALS._sound1.play(337);
+	R2_GLOBALS._scenePalette.loadPalette(0);
+	R2_GLOBALS._player.disableControl();
+
+	setup();
+	setAction(&_action1);
+}
+
+void Scene205::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	for (int idx = 0; idx < 3; ++idx)
+		SYNC_POINTER(_objList1[idx]);
+	for (int idx = 0; idx < 3; ++idx)
+		SYNC_POINTER(_objList2[idx]);
+	for (int idx = 0; idx < 4; ++idx)
+		SYNC_POINTER(_objList3[idx]);
+
+	s.syncAsSint16LE(_textIndex);
+	s.syncAsSint16LE(_lineNum);
+}
+
+void Scene205::remove() {
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+	SceneExt::remove();
+}
+
+void Scene205::process(Event &event) {
+	if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_ESCAPE)) {
+		event.handled = true;
+		R2_GLOBALS._sceneManager.changeScene(R2_GLOBALS._sceneManager._previousScene);
+	} else {
+		Scene::process(event);
+	}
+}
+
+void Scene205::dispatch() {
+	processList(_objList3, 4, Common::Rect(0, 0, 319, 200), 1, 1, 160, 100);
+	processList(_objList2, 3, Common::Rect(0, 0, 319, 200), 2, 2, 160, 100);
+	processList(_objList1, 3, Common::Rect(0, 0, 319, 200), 4, 3, 160, 100);
+
+	Scene::dispatch();
+}
+
+void Scene205::setup() {
+	const Common::Point pointList1[3] = { Common::Point(2, 50), Common::Point(100, 28), Common::Point(53, 15) };
+	const Common::Point pointList2[3] = { Common::Point(289, 192), Common::Point(125, 60), Common::Point(130, 40) };
+	const Common::Point pointList3[4] = { 
+		Common::Point(140, 149), Common::Point(91, 166), Common::Point(299, 46), Common::Point(314, 10)
+	};
+
+	// Set up the first object list
+	for (int idx = 0; idx < 3; ++idx) {
+		Object *obj = new Object();
+		_objList1[idx] = obj;
+
+		obj->postInit();
+		obj->_flags |= OBJFLAG_CLONED;
+		obj->setVisage(205);
+		obj->_strip = 1;
+		obj->_frame = 1;
+		obj->setPosition(pointList1[idx]);
+		obj->_x100 = obj->_position.x * 100;
+		obj->_y100 = obj->_position.y * 100;
+		obj->fixPriority(12);
+	}
+
+	// Setup the second object list
+	for (int idx = 0; idx < 3; ++idx) {
+		Object *obj = new Object();
+		_objList2[idx] = obj;
+
+		obj->postInit();
+		obj->_flags |= OBJFLAG_CLONED;
+		obj->setVisage(205);
+		obj->_strip = 1;
+		obj->_frame = 2;
+		obj->setPosition(pointList2[idx]);
+		obj->_x100 = obj->_position.x * 100;
+		obj->_y100 = obj->_position.y * 100;
+		obj->fixPriority(11);
+	}
+
+	// Setup the third object list
+	for (int idx = 0; idx < 4; ++idx) {
+		Object *obj = new Object();
+		_objList3[idx] = obj;
+
+		obj->postInit();
+		obj->_flags |= OBJFLAG_CLONED;
+		obj->setVisage(205);
+		obj->_strip = 1;
+		obj->_frame = 3;
+		obj->setPosition(pointList3[idx]);
+		obj->_x100 = obj->_position.x * 100;
+		obj->_y100 = obj->_position.y * 100;
+		obj->fixPriority(10);
+	}
+}
+
+/**
+ * Handles moving a group of stars in the scene background
+ */
+void Scene205::processList(Object **ObjList, int count, const Common::Rect &bounds, 
+						   int xMultiply, int yMultiply, int xCenter, int yCenter) {
+	for (int idx = 0; idx < count; ++idx) {
+		Object *obj = ObjList[idx];
+		Common::Point pt(obj->_position.x - xCenter, obj->_position.y - yCenter);
+
+		if ((obj->_position.x <= 319) && (obj->_position.x >= 0) && 
+				(obj->_position.y <= 199) && (obj->_position.y >= 0)) {
+			if (!pt.x && !pt.y) {
+				pt.x = pt.y = 1;
+			}
+
+			pt.x *= xMultiply;
+			pt.y *= yMultiply;
+			obj->_x100 += pt.x;
+			obj->_y100 += pt.y;
+		} else {
+			obj->_x100 = (bounds.left + R2_GLOBALS._randomSource.getRandomNumber(bounds.right)) * 100;
+			obj->_y100 = (bounds.top + R2_GLOBALS._randomSource.getRandomNumber(bounds.bottom)) * 100;
+		}
+
+		obj->setPosition(Common::Point(obj->_x100 / 100, obj->_y100 / 100));
+   }
+}
+
+void Scene205::handleText() {
+	_message = g_resourceManager->getMessage(205, ++_lineNum);
+	_messageP = _message.c_str();
+
+	_textList[_textIndex]._fontNumber = 4;
+	_textList[_textIndex]._color1 = 0;
+	_textList[_textIndex]._color2 = 10;
+	_textList[_textIndex]._color3 = 7;
+	_textList[_textIndex]._width = 400;
+	_textList[_textIndex].setup(_message);
+	_textList[_textIndex].fixPriority(199);
+
+	GfxFont font;
+	font.setFontNumber(4);
+	int width = font.getStringWidth(_message.c_str());
+	
+	_textList[_textIndex].setPosition(Common::Point(160 - (width / 2), _yp));
+}
+
 /*--------------------------------------------------------------------------
  * Scene 250 - Lift
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 518e876ce6..da2e0b3a52 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -226,6 +226,53 @@ public:
 	virtual void signal();
 };
 
+class Scene205: public SceneExt {
+	/* Actions */
+	class Action1: public Action {
+	private:
+		void textLoop();
+	public:
+		virtual void signal();
+	};
+
+	/* Objects */
+	class Object: public SceneObject {
+	public:
+		int _x100, _y100;
+	public:
+		Object();
+
+		virtual void synchronize(Serializer &s);
+	};
+private:
+	void setup();
+	void processList(Object **ObjList, int count, const Common::Rect &bounds, 
+					int xMultiply, int yMultiply, int xCenter, int yCenter);
+	void handleText();
+public:
+	ActionObject _actionObject;
+	int _fontHeight;
+	SceneText _textList[15];
+	Object *_objList1[3];
+	Object *_objList2[3];
+	Object *_objList3[4];
+	ASound _sound1;
+	Action1 _action1;
+	int _yp;
+	int _textIndex, _lineNum;
+	Common::String _message;
+	const char *_messageP;
+public:
+	Scene205();
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void synchronize(Serializer &s);
+	virtual void remove();
+	virtual void process(Event &event);
+	virtual void dispatch();
+};
+
+
 class Scene250: public SceneExt {
 	class Button: public SceneActor {
 	public:
-- 
cgit v1.2.3


From 23a497f7922e3078dd1be44fddbab41a5646c971 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 31 Jan 2012 22:41:36 +1100
Subject: TSAGE: Minor cleanups for R2R scene 180

---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 2 +-
 engines/tsage/ringworld2/ringworld2_scenes0.h   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 887ff17d3b..84f05656f4 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1845,6 +1845,7 @@ void Scene205::synchronize(Serializer &s) {
 
 	s.syncAsSint16LE(_textIndex);
 	s.syncAsSint16LE(_lineNum);
+	s.syncAsSint16BE(_yp);
 }
 
 void Scene205::remove() {
@@ -1955,7 +1956,6 @@ void Scene205::processList(Object **ObjList, int count, const Common::Rect &boun
 
 void Scene205::handleText() {
 	_message = g_resourceManager->getMessage(205, ++_lineNum);
-	_messageP = _message.c_str();
 
 	_textList[_textIndex]._fontNumber = 4;
 	_textList[_textIndex]._color1 = 0;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index da2e0b3a52..19bded3c5c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -261,7 +261,6 @@ public:
 	int _yp;
 	int _textIndex, _lineNum;
 	Common::String _message;
-	const char *_messageP;
 public:
 	Scene205();
 
-- 
cgit v1.2.3


From 81bc7226050f00010c57c159ea3a85af580b2ffb Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 31 Jan 2012 23:36:19 +0100
Subject: TSAGE: R2R - Implement scene 900

---
 engines/tsage/globals.cpp                       |  12 +
 engines/tsage/globals.h                         |   6 +
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +-
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 367 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  36 +++
 5 files changed, 422 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 579239d565..c17ba9e048 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -379,6 +379,12 @@ void Ringworld2Globals::reset() {
 	_v558B6.set(0, 0, 0, 0);
 	_v558C2 = 0;
 	_v5657C = 0;
+	_v565E1 = 0;
+	_v565E3 = 0;
+	_v565E5 = 0;
+	_v565E7 = 0;
+	_v565E9 = -5;
+	_v565EB = 26;
 	_v565F5 = 0;
 	_v565F6 = 0;
 	_v565FA = 0;
@@ -481,6 +487,12 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 
 	s.syncAsSint16LE(_v558C2);
 	s.syncAsSint16LE(_v5657C);
+	s.syncAsSint16LE(_v565E1);
+	s.syncAsSint16LE(_v565E3);
+	s.syncAsSint16LE(_v565E5);
+	s.syncAsSint16LE(_v565E7);
+	s.syncAsSint16LE(_v565E9);
+	s.syncAsSint16LE(_v565EB);
 	s.syncAsSint16LE(_v565F5);
 	s.syncAsSint16LE(_v565F6);
 	s.syncAsSint16LE(_v565FA);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index eeeddb4540..f185b8235c 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -256,6 +256,12 @@ public:
 	Rect _v5589E;
 	Rect _v558B6;
 	int _v558C2;
+	int _v565E1;
+	int _v565E3;
+	int _v565E5;
+	int _v565E7;
+	int _v565E9;
+	int _v565EB;
 	int _v565F5;
 	int _v565F6;
 	int _v565FA;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 463df46681..a35a78e4db 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -98,7 +98,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Deck #5 - By Lift
 		return new Scene850();
 	case 900:
-		error("Missing scene %d from group 0", sceneNumber);
+		return new Scene900();
 	/* Scene group #1 */
 	//
 	case 1000:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 84f05656f4..1a80142694 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -6118,6 +6118,373 @@ void Scene850::signal() {
 	}
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 900 -
+ *
+ *--------------------------------------------------------------------------*/
+Scene900::Actor4::Actor4() {
+	_fieldA4 = 0;
+}
+
+void Scene900::Actor4::synchronize(Serializer &s) {
+	SceneActor::synchronize(s);
+
+	s.syncAsSint16LE(_fieldA4);
+}
+
+void Scene900::Actor4::sub96135(int arg1) {
+	_fieldA4 = arg1;
+	setDetails(900, -1, -1, -1, 2, (SceneItem *) NULL);
+}
+
+Scene900::Scene900() {
+	_field412 = 0;
+	_field414 = 0;
+	_field416 = 0;
+}
+
+void Scene900::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_field414);
+	s.syncAsSint16LE(_field416);
+}
+
+bool Scene900::Actor4::startAction(CursorType action, Event &event) {
+	Scene900 *scene = (Scene900 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action == CURSOR_USE) {
+		R2_GLOBALS._sound2.play(14);
+		switch (_fieldA4) {
+		case 2:
+			if (scene->_field412 == 1) {
+				scene->_sceneMode = 2;
+				scene->signal();
+			} else if (scene->_field412 == 2) {
+				if (R2_GLOBALS._v565E5 == 0) {
+					scene->_aSound1.play(30);
+					setup(900, 3, 11);
+					R2_GLOBALS._v565E5 = 1;
+					if ((R2_INVENTORY.getObjectScene(R2_8) == 0) && (R2_INVENTORY.getObjectScene(R2_16 == 700)) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70) && (scene->_actor2._animateMode != ANIM_MODE_6)) {
+						scene->_actor2.animate(ANIM_MODE_6, NULL);
+					} else {
+						if (((scene->_actor3._percent * 49) / 100) + scene->_actor3._position.x == scene->_actor2._position.x) {
+							if (scene->_actor2._position.x == 166 - (R2_GLOBALS._v565E3 / 15)) {
+								R2_GLOBALS._player.disableControl();
+								scene->_sceneMode = 4;
+								scene->_actor2._moveDiff.y = (scene->_actor2._position.y - (scene->_actor3._position.y + ((scene->_actor3._percent * 3) / 10) - 2)) / 9;
+								Common::Point pt(scene->_actor3._position.x + ((scene->_actor3._percent * 49) / 100), scene->_actor3._position.y + ((scene->_actor3._percent * 3) / 10) - 2);
+								NpcMover *mover = new NpcMover();
+								scene->_actor2.addMover(mover, &pt, this);
+								scene->_actor2.animate(ANIM_MODE_6, NULL);
+							}
+						}
+					}
+				} else {
+					scene->_aSound1.play(53);
+					setup(900, 3, 9);
+					R2_GLOBALS._v565E5 = 0;
+					
+					if ((R2_INVENTORY.getObjectScene(R2_8) == 0) && (R2_INVENTORY.getObjectScene(R2_16) == 700) && (scene->_actor2._frame < 8) && (scene->_actor2._animateMode != ANIM_MODE_5)) {
+							scene->_actor2.animate(ANIM_MODE_5, NULL);
+					} else if ((R2_INVENTORY.getObjectScene(R2_8) == 700) && (R2_INVENTORY.getObjectScene(R2_16) == 700) && (scene->_actor2._frame < 8)) {
+						R2_GLOBALS._v565E7 = 0;
+						if (scene->_actor2._animateMode != 5) {
+							R2_GLOBALS._player.disableControl();
+							scene->_sceneMode = 5;
+							scene->_actor2.animate(ANIM_MODE_5, NULL);
+							scene->_actor2._moveDiff.y = (166 - scene->_actor2._position.y) / 9;
+							Common::Point pt(scene->_actor2._position.x, 166 - (R2_GLOBALS._v565E3 / 15));
+							NpcMover *mover = new NpcMover();
+							scene->_actor2.addMover(mover, &pt, this);
+						}
+					}
+				}
+			}
+			return true;
+			break;
+		case 3:
+			if (scene->_field412 == 1) {
+				scene->_sceneMode = 3;
+				scene->signal();
+			}
+			return true;
+			break;
+		case 4:
+			if ((scene->_field416 == 0) && (scene->_field414 == 0) && (R2_GLOBALS._v565E3 != 0)) {
+				scene->_aSound1.play(38);
+				scene->_field416 = -5;
+			}
+			return true;
+			break;
+		case 5:
+			if ((scene->_field416 == 0) && (scene->_field414 == 0) && (R2_GLOBALS._v565E3 < 135)) {
+				scene->_aSound1.play(38);
+				scene->_field416 = 5;
+			}
+			return true;
+			break;
+		case 6:
+			if ((scene->_field416 == 0) && (scene->_field414 == 0) && (R2_GLOBALS._v565E1 > -10)) {
+				scene->_aSound1.play(38);
+				scene->_field414 = -5;
+			}
+			return true;
+			break;
+		case 7:
+			if ((scene->_field416 == 0) && (scene->_field414 == 0) && (R2_GLOBALS._v565E1 < 20)) {
+				scene->_aSound1.play(38);
+				scene->_field414 = 5;
+			}
+			return true;
+			break;
+		case 8:
+			SceneItem::display(5, 11, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+			return true;
+			break;
+		case 9:
+			SceneItem::display(5, 12, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+			return true;
+			break;
+		default:
+			if (scene->_field412 == 1) {
+				R2_GLOBALS._player.disableControl();
+				scene->_actor5.remove();
+				scene->_actor6.remove();
+				scene->_actor7.remove();
+				scene->_actor8.remove();
+				scene->_actor9.remove();
+				scene->_actor10.remove();
+				R2_GLOBALS._sound2.play(37);
+				scene->_sceneMode = 901;
+				scene->setAction(&scene->_sequenceManager1, scene, 901, &scene->_actor1, this ,NULL);
+			} else if ((scene->_field412 == 2) || (scene->_field412 == 3)) {
+				scene->_sceneMode = 1;
+				scene->signal();
+			}
+
+			return true;
+			break;
+		}
+	} else if (action == CURSOR_LOOK) {
+		if ((_fieldA4 == 2) && (scene->_field412 == 2))
+			SceneItem::display(900, 21, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		else
+			SceneItem::display(900, _fieldA4, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		return true;
+	} else {
+		return SceneActor::startAction(action, event);
+	}
+}
+
+void Scene900::postInit(SceneObjectList *OwnerList) {
+	g_globals->gfxManager()._bounds.moveTo(Common::Point(0, 0));
+	loadScene(900);
+	SceneExt::postInit();
+	R2_GLOBALS._sound1.play(34);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.hide();
+	R2_GLOBALS._player.disableControl();
+
+	_actor1.postInit();
+	_actor1.setDetails(900, 3, -1, -1, 1, (SceneItem *) NULL);
+
+	_field414 = 0;
+	_field416 = 0;
+
+	_actor3.postInit();
+	_actor3.fixPriority(1);
+	// useless, the original use it for debugging purposes: strcpy(_actor3._actorName, "Crane");
+	_actor3.setup(900, 1, 2);
+	_actor3.setPosition(Common::Point(89, 0));
+	_actor3._effect = 1;
+	_actor3.setDetails(900, 6, -1, 8, 1, (SceneItem *) NULL);
+
+	if ((R2_INVENTORY.getObjectScene(R2_8) != 1) && (R2_INVENTORY.getObjectScene(R2_16) != 1)) {
+		_actor2.postInit();
+		_actor2.setPosition(Common::Point(0, 0));
+		_actor2.fixPriority(1);
+		
+		if (R2_INVENTORY.getObjectScene(R2_8) == 0) {
+			if (R2_INVENTORY.getObjectScene(R2_16) != 700) {
+				_actor2.setup(901, 3, 2);
+			} else if ((R2_GLOBALS._v565E5 != 0) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70)) {
+				_actor2.setup(901, 2, 1);
+			} else {
+				_actor2.setup(901, 2, 8);
+			}
+			_actor2.setPosition(Common::Point(171, 145));
+			_actor2.setDetails(700, -1, -1, -1, 1, (SceneItem *) NULL);
+		} else {
+			_actor2.setDetails(700, -1, -1, -1, 1, (SceneItem *) NULL);
+			if (R2_GLOBALS._v565E7 == 0) {
+				_actor2.setup(901, 1, 8);
+				// Original set two times the same values: skipped
+				_actor2.setPosition(Common::Point((((100  - ((R2_GLOBALS._v565EB * 350) / 100)) * 49) / 100) + ((R2_GLOBALS._v565E9 * _actor3._percent * 6) / 100) + 89, 166 - (R2_GLOBALS._v565EB / 3)));
+				_actor2.changeZoom(((100 - ((R2_GLOBALS._v565EB * 350) / 100) + 52) / 10) * 10);
+			}
+		}
+	}
+	_item1.setDetails(Rect(0, 0, 320, 200), 900, 0, -1, -1, 1, NULL);
+	_sceneMode = 900;
+	setAction(&_sequenceManager1, this, 900, &_actor1, NULL);
+}
+
+void Scene900::remove() {
+	if (_sceneMode != 901)
+		R2_GLOBALS._sound1.play(10);
+	
+	SceneExt::remove();
+}
+
+void Scene900::signal() {
+	switch (_sceneMode) {
+	case 1:
+		_field412 = 1;
+		R2_GLOBALS._sound2.play(37);
+
+		_actor5.remove();
+		_actor6.remove();
+		_actor7.remove();
+		_actor8.remove();
+		_actor9.remove();
+		_actor10.remove();
+
+		_actor5.sub96135(2);
+		_actor5.setup(900, 2, 1);
+		_actor5.setPosition(Common::Point(36, 166));
+
+		_actor6.sub96135(3);
+		_actor6.setup(900, 2, 5);
+		_actor6.setPosition(Common::Point(117, 166));
+		break;
+	case 2:
+		_field412 = 2;
+		
+		_actor5.remove();
+		_actor6.remove();
+
+		_actor5.sub96135(2);
+		if (R2_GLOBALS._v565E5 == 0)
+			_actor5.setup(900, 3, 9);
+		else
+			_actor5.setup(900, 3, 11);
+		_actor5.setPosition(Common::Point(36, 166));
+		
+		_actor7.sub96135(5);
+		_actor7.setup(900, 3, 3);
+		_actor7.setPosition(Common::Point(76, 134));
+
+		_actor8.sub96135(4);
+		_actor8.setup(900, 3, 7);
+		_actor8.setPosition(Common::Point(76, 156));
+
+		_actor9.sub96135(6);
+		_actor9.setup(900, 3, 1);
+		_actor9.setPosition(Common::Point(55, 144));
+
+		_actor10.sub96135(7);
+		_actor10.setup(900, 3, 5);
+		_actor10.setPosition(Common::Point(99, 144));
+		
+		break;
+	case 3:
+		_field412 = 3;
+
+		_actor5.remove();
+		_actor6.remove();
+		_actor7.remove();
+		_actor8.remove();
+		_actor9.remove();
+		_actor10.remove();
+
+		_actor5.sub96135(8);
+		_actor5.setup(900, 4, 1);
+		_actor5.setPosition(Common::Point(36, 166));
+
+		_actor6.sub96135(9);
+		_actor6.setup(900, 4, 5);
+		_actor6.setPosition(Common::Point(117, 166));
+		break;
+	case 4:
+		_sceneMode = 0;
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+		R2_GLOBALS._v565E7 = 1;
+		break;
+	case 900:
+		R2_GLOBALS._player.enableControl(CURSOR_USE);
+		R2_GLOBALS._player._canWalk = false;
+
+		_actor1.setup(900, 1, 1);
+		
+		_actor4.sub96135(1);
+		_actor4.setup(900, 1, 3);
+		_actor4.setPosition(Common::Point(77, 168));
+		
+		_sceneMode = 1;
+		signal();
+		break;
+	case 901:
+		R2_GLOBALS._sceneManager.changeScene(700);
+		break;
+	case 5:
+		_sceneMode = 0;
+	// No break on purpose
+	default:
+		R2_GLOBALS._player.enableControl();
+		R2_GLOBALS._player._canWalk = false;
+		break;
+	}
+}
+
+void Scene900::dispatch() {
+	if (_field416 != 0) {
+		if (_field416 < 0) {
+			R2_GLOBALS._v565E3--;
+			++_field416;
+		} else {
+			++R2_GLOBALS._v565E3;
+			_field416--;
+		}
+	}
+
+	if (_field414 != 0) {
+		R2_GLOBALS._v565E1--;
+		++_field414;
+	} else {
+		++R2_GLOBALS._v565E1;
+		_field414++;
+	}
+
+	if (R2_GLOBALS._sceneObjects->contains(&_actor2)) {
+		if ((R2_GLOBALS._v565E5 != 0) && (R2_INVENTORY.getObjectScene(R2_8) == 0) && (R2_INVENTORY.getObjectScene(R2_16) == 700) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70)) {
+			if ((_actor2._frame > 1) && (_actor2._animateMode != ANIM_MODE_6))
+				_actor2.animate(ANIM_MODE_6, NULL);
+		} else {
+			if ((_actor2._frame < 8) && (_actor2._animateMode != ANIM_MODE_5) && (R2_GLOBALS._v565E7 == 0) && (R2_INVENTORY.getObjectScene(R2_8) == 0) && (R2_INVENTORY.getObjectScene(R2_16) == 700) && (_sceneMode != 4))
+				_actor2.animate(ANIM_MODE_5, NULL);
+		}
+	}
+
+	_actor3.changeZoom(100 - ((R2_GLOBALS._v565E3 * 70) / 100));
+	_actor3.setPosition(Common::Point(((_actor3._percent * R2_GLOBALS._v565E1 * 6) / 100) + 89, R2_GLOBALS._v565E3));
+
+	if ((R2_GLOBALS._sceneObjects->contains(&_actor2)) && (R2_GLOBALS._v565E7 != 0) && (!_actor2._mover) && (_actor2._animateMode == ANIM_MODE_NONE)) {
+		_actor2.setPosition(Common::Point(_actor3._position.x + ((_actor3._percent * 49) / 100), _actor3._position.y + ((_actor3._percent * 3) / 10)));
+		if (R2_GLOBALS._v565E3 >= 75) {
+			_actor2.setup(901, 1, 1);
+			_actor2.changeZoom(((_actor3._percent + 52) / 10) * 10);
+		} else {
+			_actor2.setup(901, 5, 1);
+			_actor2.changeZoom(((_actor3._percent / 10) * 10) + 30);
+		}
+	}
+	Scene::dispatch();
+}
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 19bded3c5c..5d5e531d80 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -764,6 +764,42 @@ public:
 	virtual void signal();
 };
 
+class Scene900 : public SceneExt {
+	class Actor4 : public SceneActor {
+	public:
+    int _fieldA4;
+
+		Actor4();
+		void sub96135(int arg1);
+		virtual void synchronize(Serializer &s);
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+	int _field412;
+	int _field414;
+	int _field416;
+	NamedHotspot _item1;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	Actor4 _actor4;
+	Actor4 _actor5;
+	Actor4 _actor6;
+	Actor4 _actor7;
+	Actor4 _actor8;
+	Actor4 _actor9;
+	Actor4 _actor10;
+	ASoundExt _aSound1;
+	SequenceManager _sequenceManager1;
+
+	Scene900();
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void dispatch();
+	virtual void synchronize(Serializer &s);
+};
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
-- 
cgit v1.2.3


From 96853b234cdbe6465f7484f6fc90a878ccba1051 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 1 Feb 2012 19:22:55 +0100
Subject: ENGINES: Get rid of unnecessary friend in EngineManager.

---
 engines/metaengine.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'engines')

diff --git a/engines/metaengine.h b/engines/metaengine.h
index 8eb8044b34..d9c1360042 100644
--- a/engines/metaengine.h
+++ b/engines/metaengine.h
@@ -224,9 +224,6 @@ typedef PluginSubclass<MetaEngine> EnginePlugin;
  * Singleton class which manages all Engine plugins.
  */
 class EngineManager : public Common::Singleton<EngineManager> {
-private:
-	friend class Common::Singleton<SingletonBaseType>;
-
 public:
 	GameDescriptor findGameInLoadedPlugins(const Common::String &gameName, const EnginePlugin **plugin = NULL) const;
 	GameDescriptor findGame(const Common::String &gameName, const EnginePlugin **plugin = NULL) const;
-- 
cgit v1.2.3


From 4aa494c19b987974d571bfda90b7a20de1cd0e26 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 1 Feb 2012 22:10:59 +0100
Subject: TSAGE: R2R - Implement scene 700

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +-
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 466 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  63 ++++
 3 files changed, 530 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index a35a78e4db..44953abfd2 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -87,7 +87,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 600:
 		return new Scene600();
 	case 700:
-		error("Missing scene %d from group 0", sceneNumber);
+		return new Scene700();
 	case 800:
 		// Sick bay
 		return new Scene800();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 1a80142694..a4c2fe5256 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -5287,6 +5287,472 @@ void Scene600::dispatch() {
 		_actor1.setFrame(1);
 	}
 }
+
+/*--------------------------------------------------------------------------
+ * Scene 700 -
+ *
+ *--------------------------------------------------------------------------*/
+Scene700::Scene700() {
+	_rotation = NULL;
+}
+
+void Scene700::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+	SYNC_POINTER(_rotation);
+}
+
+bool Scene700::Item11::startAction(CursorType action, Event &event) {
+	if ((action == CURSOR_USE) && (R2_GLOBALS._player._position.x < 100))
+		return false;
+
+	return NamedHotspot::startAction(action, event);
+}
+
+bool Scene700::Item12::startAction(CursorType action, Event &event) {
+	Scene700 *scene = (Scene700 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case R2_8:
+		R2_GLOBALS._player.disableControl();
+		scene->_actor5.postInit();
+		scene->_actor5.setup(701, 3, 2);
+		scene->_actor5.setPosition(Common::Point(243, 98));
+		scene->_actor5.setDetails(700, 37, -1, -1, 2, (SceneItem *) NULL);
+		scene->_actor5.hide();
+		scene->_sceneMode = 20;
+		break;
+	case R2_16:
+		R2_GLOBALS._player.disableControl();
+		scene->_actor5.postInit();
+		scene->_actor5.setup(701, 2, 8);
+		scene->_actor5.setPosition(Common::Point(243, 98));
+		scene->_actor5.setDetails(700, 38, -1, -1, 2, (SceneItem *) NULL);
+		scene->_actor5.hide();
+		scene->_sceneMode = 21;
+		break;
+	default:
+		return NamedHotspot::startAction(action, event);
+		break;
+	}
+
+	scene->setAction(&scene->_sequenceManager, this, 707, &R2_GLOBALS._player, &scene->_actor5, NULL);
+	return true;
+}
+
+bool Scene700::Actor2::startAction(CursorType action, Event &event) {
+	Scene700 *scene = (Scene700 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+	
+	if (R2_GLOBALS._player._position.y <= 100)
+		return false;
+	
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 701;
+	scene->setAction(&scene->_sequenceManager, scene, 701, &R2_GLOBALS._player, this, NULL);
+
+	return true;
+}
+
+bool Scene700::Actor3::startAction(CursorType action, Event &event) {
+	Scene700 *scene = (Scene700 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+	
+	if (R2_GLOBALS._player._position.y <= 100)
+		return false;
+	
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 702;
+	scene->setAction(&scene->_sequenceManager, scene, 702, &R2_GLOBALS._player, this, NULL);
+
+	return true;
+}
+
+bool Scene700::Actor4::startAction(CursorType action, Event &event) {
+	Scene700 *scene = (Scene700 *)R2_GLOBALS._sceneManager._scene;
+
+	if (action != CURSOR_USE)
+		return SceneActor::startAction(action, event);
+	
+	if (R2_GLOBALS._player._position.y <= 100)
+		return false;
+	
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 704;
+	scene->setAction(&scene->_sequenceManager, scene, 704, &R2_GLOBALS._player, this, NULL);
+
+	return true;
+}
+
+bool Scene700::Actor5::startAction(CursorType action, Event &event) {
+	Scene700 *scene = (Scene700 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (action) {
+	case CURSOR_USE:
+		switch (R2_INVENTORY.getObjectScene(R2_8)) {
+		case 0:
+			if ((_strip == 2) && (_frame == 1)) {
+				R2_GLOBALS._player.disableControl();
+				if (R2_GLOBALS._player._position.x <= 100) {
+					scene->_sceneMode = 710;
+					scene->setAction(&scene->_sequenceManager, scene, 710, &R2_GLOBALS._player, this, NULL);
+				} else {
+					scene->_sceneMode = 709;
+					scene->setAction(&scene->_sequenceManager, scene, 709, &R2_GLOBALS._player, this, NULL);
+				}
+			} else {
+				return SceneActor::startAction(action, event);
+			}
+			break;
+		case 700: {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 10;
+			Common::Point pt(_position.x - 12, _position.y + 1);
+			PlayerMover *mover = new PlayerMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+			}
+			break;
+		default:
+			break;
+		}
+		break;
+	case R2_ATTRACTOR_UNIT:
+		R2_GLOBALS._player.disableControl();
+		if (R2_INVENTORY.getObjectScene(R2_8) == 700) {
+			scene->_sceneMode = 706;
+			scene->setAction(&scene->_sequenceManager, scene, 706, &R2_GLOBALS._player, &scene->_actor5, NULL);
+		} else {
+			scene->_sceneMode = 15;
+			Common::Point pt(_position.x - 12, _position.y + 1);
+			PlayerMover *mover = new PlayerMover();
+			R2_GLOBALS._player.addMover(mover, &pt, scene);
+		}
+		break;
+	default:
+		return SceneActor::startAction(action, event);
+		break;
+	}
+	
+	return true;
+}
+
+bool Scene700::Actor6::startAction(CursorType action, Event &event) {
+	Scene700 *scene = (Scene700 *)R2_GLOBALS._sceneManager._scene;
+
+	if ((action != CURSOR_USE) || (R2_GLOBALS._player._position.y >= 100))
+		return SceneActor::startAction(action, event);
+	
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 1;
+	Common::Point pt(_position.x, 69);
+	NpcMover *mover = new NpcMover();
+	R2_GLOBALS._player.addMover(mover, &pt, scene);
+
+	return true;
+}
+
+void Scene700::postInit(SceneObjectList *OwnerList) {
+	if (R2_GLOBALS._sceneManager._previousScene == 900)
+		g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
+	
+	loadScene(700);
+	R2_GLOBALS._v558B6.set(60, 0, 260, 200);
+	SceneExt::postInit();
+
+	_rotation = R2_GLOBALS._scenePalette.addRotation(237, 246, -1);
+	_rotation->setDelay(5);
+	_rotation->_countdown = 1;
+
+	_actor2.postInit();
+	_actor2.setVisage(700);
+	_actor2.setPosition(Common::Point(21, 128));
+	_actor2.fixPriority(10);
+	_actor2.setDetails(700, 3, -1, -1, 1, (SceneItem *) NULL);
+
+	_actor3.postInit();
+	_actor3.setup(700, 2, 1);
+	_actor3.setPosition(Common::Point(217, 120));
+	_actor3.fixPriority(10);
+	_actor3.setDetails(700, 15, -1, -1, 1, (SceneItem *) NULL);
+	
+	_actor1.postInit();
+	_actor1.setup(700, 4, 1);
+	_actor1.setPosition(Common::Point(355 - ((R2_GLOBALS._v565E3 * 8) / 5), ((R2_GLOBALS._v565E1 + 20 ) / 5) - 12));
+	_actor1.fixPriority(10);
+	_actor1.setDetails(700, 12, -1, 14, 1, (SceneItem *) NULL);
+
+	_actor6.postInit();
+	_actor6.setup(700, 8, 1);
+	_actor6.setPosition(Common::Point(85, 53));
+	_actor6.setDetails(700, 33, -1, 35, 1, (SceneItem *) NULL);
+
+	_actor7.postInit();
+	_actor7.setup(700, 8, 1);
+	_actor7.setPosition(Common::Point(164, 53));
+	_actor7.setDetails(700, 33, -1, 35, 1, (SceneItem *) NULL);
+
+	_actor8.postInit();
+	_actor8.setup(700, 8, 1);
+	_actor8.setPosition(Common::Point(243, 53));
+	_actor8.setDetails(700, 33, -1, 35, 1, (SceneItem *) NULL);
+
+	_actor9.postInit();
+	_actor9.setup(700, 8, 1);
+	_actor9.setPosition(Common::Point(324, 53));
+	_actor9.setDetails(700, 33, -1, 35, 1, (SceneItem *) NULL);
+
+	if ((R2_INVENTORY.getObjectScene(R2_8) != 1) && (R2_INVENTORY.getObjectScene(R2_16) != 1)) {
+		_actor5.postInit();
+		_actor5.fixPriority(10);
+		switch (R2_INVENTORY.getObjectScene(R2_16)) {
+		case 0:
+			switch (R2_INVENTORY.getObjectScene(R2_8)) {
+			case 0:
+				_actor5.setup(701, 3, 2);
+				_actor5.setPosition(Common::Point(243, 98));
+				_actor5.setDetails(700, 37, -1, -1, 1, (SceneItem *) NULL);
+				break;
+			case 700:
+				_actor5.setup(701, 3, 1);
+				_actor5.setPosition(Common::Point(356 - (R2_GLOBALS._v565EB * 8), 148 - (((R2_GLOBALS._v565E9 + 10) / 5) * 4)));
+				_actor5.setDetails(700, 37, -1, -1, 1, (SceneItem *) NULL);
+				break;
+			default:
+				break;
+			}
+			break;
+		case 700:
+			switch (R2_INVENTORY.getObjectScene(R2_8)) {
+			case 0:
+				if ((R2_GLOBALS._v565E5 != 0) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70))
+					_actor5.setup(701, 2, 1);
+				else
+					_actor5.setup(701, 2, 8);
+				_actor5.setPosition(Common::Point(243, 98));
+				_actor5.fixPriority(77);
+				_actor5.setDetails(700, 38, -1, -1, 1, (SceneItem *) NULL);
+				break;
+			case 700:
+				_actor5.setup(701, 1, 8);
+				if (R2_GLOBALS._v565E7 == 0) {
+					_actor5.setPosition(Common::Point(356 - (R2_GLOBALS._v565EB * 8), 148 - (((R2_GLOBALS._v565E9 + 10) / 5) * 4)));
+				} else {
+					_actor5.setup(701, 1, 1);
+					_actor5.setPosition(Common::Point(_actor1._position.x + 1, _actor1._position.y + 120));
+				}
+				_actor5.setDetails(700, 38, -1, -1, 1, (SceneItem *) NULL);
+				break;
+			default:
+				break;
+			}
+		default:
+			break;
+		}
+	}
+
+	_actor4.postInit();
+	_actor4.setup(700, 3, 1);
+	_actor4.setPosition(Common::Point(454, 117));
+	_actor4.setDetails(700, 27, -1, -1, 1, (SceneItem *) NULL);
+
+	_item12.setDetails(Rect(234, 90, 252, 110), 700, 39, -1, -1, 1, NULL);
+	_item6.setDetails(Rect(91, 158, 385, 167), 700, 6, -1, 8, 1, NULL);
+	_item2.setDetails(Rect(47, 115, 149, 124), 700, 40, -1, 41, 1, NULL);
+	_item3.setDetails(Rect(151, 108, 187, 124), 700, 40, -1, 41, 1, NULL);
+	_item4.setDetails(Rect(247, 108, 275, 124), 700, 40, -1, 41, 1, NULL);
+	_item5.setDetails(Rect(300, 105, 321, 124), 700, 40, -1, 41, 1, NULL);
+	_item7.setDetails(Rect(255, 74, 368, 115), 700, 9, -1, 11, 1, NULL);
+	_item8.setDetails(Rect(69, 74, 182, 115), 700, 9, -1, 11, 1, NULL);
+	_item9.setDetails(Rect(370, 58, 475, 103), 700, 18, -1, -1, 1, NULL);
+	_item10.setDetails(Rect(17, 11, 393, 31), 700, 24, -1, -1, 1, NULL);
+	_item11.setDetails(Rect(42, 32, 368, 66), 700, 30, -1, 32, 1, NULL);
+	_item1.setDetails(Rect(0, 0, 480, 200), 700, 0, -1, -1, 1, NULL);
+
+	R2_GLOBALS._player.postInit();
+	R2_GLOBALS._player.setVisage(11);
+	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+	R2_GLOBALS._player._moveDiff.x = 2;
+	R2_GLOBALS._player.disableControl();
+
+	R2_GLOBALS._sound1.play(34);
+
+	_sceneMode = 700;
+
+	switch (R2_GLOBALS._sceneManager._previousScene) {
+	case 250:
+		setAction(&_sequenceManager, this, 700, &R2_GLOBALS._player, &_actor2, NULL);
+		break;
+	case 500:
+		setAction(&_sequenceManager, this, 703, &R2_GLOBALS._player, &_actor3, NULL);
+		break;
+	case 600: {
+		_sceneMode = 4;
+		_actor7.setFrame(5);
+		R2_GLOBALS._player.setPosition(Common::Point(164, 74));
+		R2_GLOBALS._player.setStrip2(3);
+		Common::Point pt(164, 69);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 900:
+		setAction(&_sequenceManager, this, 705, &R2_GLOBALS._player, &_actor4, NULL);
+		break;
+	default:
+		if (R2_GLOBALS.getFlag(41))
+			R2_GLOBALS._player.setPosition(Common::Point(107, 67));
+		else
+			R2_GLOBALS._player.setPosition(Common::Point(60, 140));
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	}
+}
+
+void Scene700::remove() {
+	R2_GLOBALS._sound1.play(10);
+	_rotation->remove();
+	SceneExt::remove();
+}
+
+void Scene700::signal() {
+	switch (_sceneMode) {
+	case 1:
+		_sceneMode = 2;
+		R2_GLOBALS._player.setStrip(4);
+		if (R2_GLOBALS._player._position.x != 164) {
+			SceneItem::display(700, 36, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+			R2_GLOBALS._player.enableControl();
+		} else {
+			R2_GLOBALS._sound2.play(19);
+			_actor7.animate(ANIM_MODE_5, this);
+		}
+		break;
+	case 2: {
+		_sceneMode = 3;
+		R2_GLOBALS._player.setStrip2(4);
+		Common::Point pt(R2_GLOBALS._player._position.x, R2_GLOBALS._player._position.y + 5);
+		NpcMover *mover = new NpcMover();
+		R2_GLOBALS._player.addMover(mover, &pt, this);
+		}
+		break;
+	case 3:
+		R2_INVENTORY.setObjectScene(5, 600);
+		R2_INVENTORY.setObjectScene(16, 700);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 4:
+		_sceneMode = 5;
+		R2_GLOBALS._player.setStrip2(-1);
+		R2_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper());
+		R2_GLOBALS._sound2.play(19);
+		_actor7.animate(ANIM_MODE_6, this);
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS.setFlag(41);
+		break;
+	case 10:
+		_sceneMode = 11;
+		R2_GLOBALS._player.setup(16, 7, 1);
+		R2_GLOBALS._player.changeZoom(50);
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 11:
+		_sceneMode = 12;
+		_actor5.remove();
+		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
+		break;
+	case 12:
+		R2_GLOBALS._player.setVisage(11);
+		R2_GLOBALS._player.changeZoom(100);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper());
+		R2_GLOBALS._player._strip = 7;
+		if (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_UNIT) == 0) {
+			R2_INVENTORY.setObjectScene(R2_16, 1);
+			R2_INVENTORY.setObjectScene(R2_8, 0);
+		} else {
+			R2_INVENTORY.setObjectScene(R2_8, 1);
+		}
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 15:
+		_sceneMode = 16;
+		R2_GLOBALS._player.setup(16, 7, 1);
+		R2_GLOBALS._player.changeZoom(50);
+		R2_GLOBALS._player.animate(ANIM_MODE_5, this);
+		break;
+	case 16:
+		_sceneMode = 17;
+		_actor5.setup(701, 1, 8);
+		_actor5.setDetails(700, 38, -1, -1, 3, (SceneItem *) NULL);
+		if ((R2_GLOBALS._v565E5 != 0) && (_actor5._position.x == _actor1._position.x + 1) && (_actor5._position.x == 148 - (((R2_GLOBALS._v565E1 + 10) / 5) * 4))) {
+			_actor5.animate(ANIM_MODE_6, NULL);
+			Common::Point pt(_actor5._position.x, _actor1._position.y + 120);
+			NpcMover *mover = new NpcMover();
+			_actor5.addMover(mover, &pt, NULL);
+			R2_GLOBALS._v565E7 = 1;
+		}
+		R2_GLOBALS._player.animate(ANIM_MODE_6, this);
+		break;
+	case 17:
+		R2_INVENTORY.setObjectScene(R2_ATTRACTOR_UNIT, 0);
+		R2_INVENTORY.setObjectScene(R2_16, 700);
+		R2_GLOBALS._player.setVisage(11);
+		R2_GLOBALS._player.changeZoom(100);
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper());
+		R2_GLOBALS._player._strip = 7;
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 20:
+		R2_INVENTORY.setObjectScene(R2_8, 0);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 21:
+		_actor5.fixPriority(77);
+		if ((R2_GLOBALS._v565E5 != 0) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70))
+			_actor5.animate(ANIM_MODE_6, NULL);
+
+		R2_INVENTORY.setObjectScene(R2_16, 700);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 701:
+		R2_GLOBALS._sceneManager.changeScene(250);
+		break;
+	case 702:
+		R2_GLOBALS._sceneManager.changeScene(500);
+		break;
+	case 704:
+		R2_GLOBALS._sceneManager.changeScene(900);
+		break;
+	case 706:
+		_actor5.setDetails(700, 38, -1, -1, 3, (SceneItem *) NULL);
+		_actor5.fixPriority(77);
+		if ((R2_GLOBALS._v565E5 != 0) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70))
+			_actor5.animate(ANIM_MODE_6, NULL);
+		R2_INVENTORY.setObjectScene(R2_ATTRACTOR_UNIT, 0);
+		R2_INVENTORY.setObjectScene(R2_16, 700);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 709:
+		R2_GLOBALS.setFlag(41);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 710:
+		R2_GLOBALS.clearFlag(41);
+		R2_GLOBALS._player.enableControl();
+		break;
+	case 5:
+	// No break on purpose
+	default:
+		R2_GLOBALS._player.enableControl();
+		break;
+	}
+}
+
 /*--------------------------------------------------------------------------
  * Scene 800 - Sick Bay
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 5d5e531d80..0ebcf09da7 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -639,6 +639,69 @@ public:
 	virtual void synchronize(Serializer &s);
 };
 
+class Scene700: public SceneExt {
+	class Item11 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Item12 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor2 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor3 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor4 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor5 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor6 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+public:
+	NamedHotspot _item1;
+	NamedHotspot _item2;
+	NamedHotspot _item3;
+	NamedHotspot _item4;
+	NamedHotspot _item5;
+	NamedHotspot _item6;
+	NamedHotspot _item7;
+	NamedHotspot _item8;
+	NamedHotspot _item9;
+	NamedHotspot _item10;
+	Item11 _item11;
+	Item12 _item12;
+	SceneActor _actor1;
+	Actor2 _actor2;
+	Actor3 _actor3;
+	Actor4 _actor4;
+	Actor5 _actor5;
+	Actor6 _actor6;
+	Actor6 _actor7;
+	Actor6 _actor8;
+	Actor6 _actor9;
+	SequenceManager _sequenceManager;
+	PaletteRotation *_rotation;
+	int _field100E;
+
+	Scene700();
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void synchronize(Serializer &s);
+};
+
 class Scene800: public SceneExt {
 	/* Items */
 	class Button: public NamedHotspot {
-- 
cgit v1.2.3


From c222afc933aaf9f04d15c4bcc4dd4f6c38bae17a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 2 Feb 2012 00:31:25 +0100
Subject: TSAGE: R2R - Avoid a crash in scene 700

---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index a4c2fe5256..39bc41e408 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -5614,7 +5614,11 @@ void Scene700::postInit(SceneObjectList *OwnerList) {
 
 void Scene700::remove() {
 	R2_GLOBALS._sound1.play(10);
-	_rotation->remove();
+// CHECKME: Present in the original... But it crashes badly.
+// The instruction was removed as it's not used in other scene coded the same way
+// and reversed by dreammaster. A double check is required in order to verify it doesn't hide 
+// a memory leak
+//	_rotation->remove();
 	SceneExt::remove();
 }
 
-- 
cgit v1.2.3


From 7e9b0114d8edd4de3869b259d2ce7a358285453d Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Thu, 2 Feb 2012 12:40:25 +0100
Subject: HUGO: Fix keyHandler (noticed by Strangerke).

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

(limited to 'engines')

diff --git a/engines/hugo/parser.cpp b/engines/hugo/parser.cpp
index a0ad4c0986..4eaed6fecf 100644
--- a/engines/hugo/parser.cpp
+++ b/engines/hugo/parser.cpp
@@ -271,7 +271,7 @@ void Parser::keyHandler(Common::Event event) {
 	status_t &gameStatus = _vm->getGameStatus();
 	uint16 nChar = event.kbd.keycode;
 
-	if ((event.kbd.hasFlags(Common::KBD_ALT)) || (event.kbd.hasFlags(Common::KBD_SCRL)))
+	if (event.kbd.flags & (Common::KBD_ALT | Common::KBD_SCRL))
 		return;
 
 	if (event.kbd.hasFlags(Common::KBD_CTRL)) {
-- 
cgit v1.2.3


From 6fed44298e38c672789ac3b2e42d254dd5a6ee62 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 4 Feb 2012 14:11:20 +0100
Subject: TOUCHE: Add charset debug channel

This is intended to help debug the missing Spanish characters reported
in #2040311 and #3483383.
---
 engines/touche/touche.cpp | 8 ++++++++
 engines/touche/touche.h   | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index 81d6adf581..4b989963f6 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -81,6 +81,7 @@ ToucheEngine::ToucheEngine(OSystem *system, Common::Language language)
 	DebugMan.addDebugChannel(kDebugResource, "Resource", "Resource debug level");
 	DebugMan.addDebugChannel(kDebugOpcodes,  "Opcodes",  "Opcodes debug level");
 	DebugMan.addDebugChannel(kDebugMenu,     "Menu",     "Menu debug level");
+	DebugMan.addDebugChannel(kDebugCharset,  "Charset",   "Charset debug level");
 
 	_console = new ToucheConsole(this);
 }
@@ -1260,6 +1261,13 @@ const char *ToucheEngine::getString(int num) const {
 
 int ToucheEngine::getStringWidth(int num) const {
 	const char *str = getString(num);
+	if (DebugMan.isDebugChannelEnabled(kDebugCharset)) {
+		debug("stringwidth: %s", str);
+		debugN("raw:");
+		const char *p = str;
+		while (*p) debugN(" %02X", (unsigned char)*p++);
+		debugN("\n");
+	}
 	return Graphics::getStringWidth16(str);
 }
 
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index cbb3fec7aa..949727b665 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -277,7 +277,8 @@ enum {
 	kDebugGraphics = 1 << 1,
 	kDebugResource = 1 << 2,
 	kDebugOpcodes  = 1 << 3,
-	kDebugMenu     = 1 << 4
+	kDebugMenu     = 1 << 4,
+	kDebugCharset  = 1 << 5
 };
 
 enum ResourceType {
-- 
cgit v1.2.3


From 9f8520fb81810f6ce7718bde2fd4fc6a13e4c45d Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Sat, 4 Feb 2012 19:49:49 +0100
Subject: QUEEN: Fix clicking at the pinnacle.

Check where the click was *before* scrolling the view, so that
it works with a touchscreen. Also, check shouldQuit() here.
---
 engines/queen/logic.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp
index f60ac59ff1..6d90254608 100644
--- a/engines/queen/logic.cpp
+++ b/engines/queen/logic.cpp
@@ -1193,14 +1193,11 @@ void Logic::handlePinnacleRoom() {
 	uint16 prevObj = 0;
 	CmdText *cmdText = CmdText::makeCmdTextInstance(5, _vm);
 	cmdText->setVerb(VERB_WALK_TO);
-	while (_vm->input()->mouseButton() == 0 || _entryObj == 0) {
+	while (!_vm->shouldQuit() && (_vm->input()->mouseButton() == 0 || _entryObj == 0)) {
 
 		_vm->update();
 		mouse = _vm->input()->getMousePos();
 
-		// update screen scrolling
-		_vm->display()->horizontalScroll(mouse.x);
-
 		// update bobs position / frame
 		joe->x = piton->x = 3 * mouse.x / 4 + 200;
 		joe->frameNum = mouse.x / 36 + 45;
@@ -1218,6 +1215,9 @@ void Logic::handlePinnacleRoom() {
 			}
 			prevObj = curObj;
 		}
+
+		// update screen scrolling
+		_vm->display()->horizontalScroll(mouse.x);
 	}
 	delete cmdText;
 	_vm->input()->clearMouseButton();
-- 
cgit v1.2.3


From e8ef680400cf1d7e406bdf8793019a624f4f1d08 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 4 Feb 2012 22:16:20 +0100
Subject: TOUCHE: Add two missing accented letters to Spanish charset.

The A-acute, I-acute, O-acute and U-acute seem to be missing from the font,
and are now all remapped to their unaccented ASCII variants. I and A
were added by 303333352a3, and this patch adds O and U.
This is assuming the CP850 encoding, which is not entirely verified.

See bugs #2040311 and #3483383.
---
 engines/touche/staticres.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/touche/staticres.cpp b/engines/touche/staticres.cpp
index f7b1482f80..f35845e881 100644
--- a/engines/touche/staticres.cpp
+++ b/engines/touche/staticres.cpp
@@ -887,6 +887,8 @@ const uint8 Graphics::_freGerFontData[] = {
 };
 
 // spanish charset differs from original executable, see tracker item #2040311.
+// We remap missing accented upper case letters from CP850 to their unaccented
+// ASCII variants. Specifically, 0xB5 -> A, 0xD6 -> I, 0xE0 -> O, 0xE9 -> U.
 const uint16 Graphics::_spaFontOffs[] = {
 	0x0000, 0x0007, 0x0024, 0x0043, 0x0072, 0x00AD, 0x00E0, 0x0113, 0x0124, 0x0141,
 	0x015E, 0x0191, 0x01C4, 0x01E3, 0x01F8, 0x0215, 0x0232, 0x0269, 0x0286, 0x02BD,
@@ -907,7 +909,8 @@ const uint16 Graphics::_spaFontOffs[] = {
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x0000, 0x0703, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	0x0000, 0x0000, 0x0000, 0x1954
+	0x0000, 0x0000, 0x0627, 0x1954, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x097D
 };
 
 const int Graphics::_spaFontSize = ARRAYSIZE(Graphics::_spaFontOffs);
-- 
cgit v1.2.3


From 27360d20717ae3302f68dc7a171f29624e4c9e11 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 5 Feb 2012 13:20:18 +1100
Subject: TSAGE: Initial implementation of R2R Scene 180

---
 engines/tsage/core.cpp                           |   7 +
 engines/tsage/core.h                             |   1 +
 engines/tsage/events.h                           |   1 +
 engines/tsage/globals.cpp                        |   4 +
 engines/tsage/globals.h                          |   2 +
 engines/tsage/ringworld2/ringworld2_logic.cpp    |  17 +-
 engines/tsage/ringworld2/ringworld2_logic.h      |  15 +
 engines/tsage/ringworld2/ringworld2_scenes0.cpp  | 515 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes0.h    |  37 ++
 engines/tsage/ringworld2/ringworld2_speakers.cpp |  56 +++
 engines/tsage/ringworld2/ringworld2_speakers.h   |  15 +
 11 files changed, 669 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 3e49b6b204..d88d012759 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1301,6 +1301,13 @@ bool ScenePalette::loadPalette(int paletteNum) {
 	return true;
 }
 
+/**
+ * Loads a palette from the passed raw data block
+ */
+void ScenePalette::loadPalette(const byte *pSrc, int start, int count) {
+	Common::copy(pSrc, pSrc + count * 3, &_palette[start * 3]);
+}
+
 void ScenePalette::refresh() {
 	// Set indexes for standard colors to closest color in the palette
 	_colors.background = indexOf(255, 255, 255);	// White background
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 680d9cf76d..ef6d4735c0 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -372,6 +372,7 @@ public:
 	~ScenePalette();
 
 	bool loadPalette(int paletteNum);
+	void loadPalette(const byte *pSrc, int start, int count);
 	void refresh();
 	void setPalette(int index, int count);
 	void getEntry(int index, uint *r, uint *g, uint *b);
diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index 6f54163682..2917256382 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -103,6 +103,7 @@ enum CursorType {
 	EXITCURSOR_E = 0x800A, EXITCURSOR_LEFT_HAND = 0x800B, CURSOR_INVALID = 0x800C, 
 	EXITCURSOR_NE = 0x800D, EXITCURSOR_SE = 0x800E, EXITCURSOR_SW = 0x800F, EXITCURSOR_NW = 0x8010,
 	SHADECURSOR_UP = 0x8011, SHADECURSOR_DOWN = 0x8012, SHADECURSOR_HAND = 0x8013,
+	R2_CURSOR_20 = 0x8014, R2_CURSOR_21 = 0x8015, R2_CURSOR_22 = 0x8016, R2_CURSOR_23 = 0x8017,
 
 	// Cursors
 	CURSOR_WALK = 0x100, CURSOR_LOOK = 0x200, CURSOR_700 = 700, CURSOR_USE = 0x400, CURSOR_TALK = 0x800,
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index c17ba9e048..59f758f97c 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -449,6 +449,7 @@ void Ringworld2Globals::reset() {
 	_v56AA7 = 1;
 	_v56AA8 = 1;
 	_v56AAB = 0;
+	_scene180Mode = -1;
 	_v57C2C = 0;
 	_v58CE2 = 0;
 	_v565EC[0] = 0;
@@ -459,6 +460,7 @@ void Ringworld2Globals::reset() {
 	Common::fill(&_v565F1[0], &_v565F1[MAX_CHARACTERS], 1);
 	_speechSubtitles = SPEECH_VOICE | SPEECH_TEXT;
 	_insetUp = 0;
+	_frameEdgeColour = 2;
 	Common::fill(&_stripManager_lookupList[0], &_stripManager_lookupList[12], 0);
 	_stripManager_lookupList[0] = 1;
 	_stripManager_lookupList[1] = 1;
@@ -504,6 +506,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_v56AA2);
 	s.syncAsSint16LE(_v56AA4);
 	s.syncAsSint16LE(_v56AAB);
+	s.syncAsSint16LE(_scene180Mode);
 	s.syncAsSint16LE(_v57C2C);
 	s.syncAsSint16LE(_v58CE2);
 	s.syncAsSint16LE(_speechSubtitles);
@@ -535,6 +538,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 		s.syncAsByte(_stripManager_lookupList[i]);
 
 	s.syncAsSint16LE(_insetUp);
+	s.syncAsByte(_frameEdgeColour);
 }
 
 } // end of namespace Ringworld2
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index f185b8235c..a0b9f0b555 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -253,6 +253,7 @@ public:
 	PlayStream _playStream;
 	StripProxy _stripProxy;
 	int _insetUp;
+	int _frameEdgeColour;	// _v421e
 	Rect _v5589E;
 	Rect _v558B6;
 	int _v558C2;
@@ -289,6 +290,7 @@ public:
 	byte _v56AA7;
 	byte _v56AA8;
 	int _v56AAB;
+	int _scene180Mode;	// _v575f7
 	int _v57C2C;
 	int _v58CE2;
 	int _speechSubtitles;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 44953abfd2..1d39169d87 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -59,7 +59,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Empty Bedroom #2
 		return new Scene175();
 	case 180:
-		error("Missing scene %d from group 0", sceneNumber);
+		// Title Screen
+		return new Scene180();
 	case 200:
 		// Deck #2 - By Lift
 		return new Scene200();
@@ -1462,6 +1463,20 @@ void ActionObject::remove() {
 	_endAction = NULL;
 }
 
+bool ActionObject::load(int rlbNum, Action *endAction) {
+	warning("TODO ActionOjbect::load");
+	return true;
+}
+
+/*--------------------------------------------------------------------------*/
+
+void ActionObjectExt::synchronize(Serializer &s) {
+	ActionObject::synchronize(s);
+	s.syncAsSint16LE(_v1);
+}
+
+
+
 } // End of namespace Ringworld2
 
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 24b8ba07fc..22bea5c216 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -102,6 +102,7 @@ public:
 	virtual void loadScene(int sceneNum);
 	virtual void refreshBackground(int xAmount, int yAmount);
 	virtual void saveCharacter(int characterIndex);
+	virtual void restore() {}
 
 	bool display(CursorType action, Event &event);
 	void fadeOut();
@@ -327,12 +328,26 @@ public:
 	EventHandler *_endAction;
 	Rect _rect1, _screenBounds;
 	int _field3A, _field3C;
+	int _field56;
 	int _field58, _field5A;
+	ScenePalette _palette;
+	byte _palData[256 * 3];
 public:
 	ActionObject();
 
 	virtual void synchronize(Serializer &s);
 	virtual void remove();
+
+	bool load(int rlbNum, Action *endAction = NULL);
+	bool proc1() { return false; }
+	void proc2() {}
+};
+
+class ActionObjectExt: public ActionObject {
+public:
+	int _v1;
+
+	virtual void synchronize(Serializer &s);
 };
 
 } // End of namespace Ringworld2
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 39bc41e408..cacd0745cd 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1461,6 +1461,521 @@ void Scene160::process(Event &event) {
 		SceneExt::process(event);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 180 - Title Screen
+ *
+ *--------------------------------------------------------------------------*/
+
+void Scene180::Action1::signal() {
+	Scene180 *scene = (Scene180 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0:
+	case 1:
+	case 2:
+		scene->_object5.setStrip((_actionIndex == 1) ? 1 : 2);
+		scene->_object5.setFrame(1);
+		scene->_object5.animate(ANIM_MODE_5, this);
+		break;
+	case 4:
+		scene->_object5.setStrip(3);
+		scene->_object5.setFrame(1);
+		scene->_object5.animate(ANIM_MODE_5, this);
+		_actionIndex = 0;
+		break;
+	}
+}
+
+/*--------------------------------------------------------------------------*/
+
+Scene180::Scene180(): SceneExt(), _webbsterSpeaker(27) {
+	_field412 = 0;
+	_frameInc = 0;
+	_frameNumber = R2_GLOBALS._events.getFrameNumber();
+	_field480 = 1;
+	_field482 = -1;
+	_fontNumber = R2_GLOBALS.gfxManager()._font._fontNumber;
+
+	GfxFont font;
+	font.setFontNumber(7);
+	_fontHeight = font.getHeight();
+
+	_sceneMode = (R2_GLOBALS._sceneManager._previousScene == 205) ? 10 : 0;
+	_gameTextSpeaker._displayMode = 9;
+	_stripManager.addSpeaker(&_gameTextSpeaker);
+	_stripManager.addSpeaker(&_webbsterSpeaker);
+	_stripManager.addSpeaker(&_tealSpeaker);
+	_stripManager.addSpeaker(&_dutyOfficerSpeaker);
+
+	signal();
+}
+
+void Scene180::postInit(SceneObjectList *OwnerList) {
+	SceneExt::postInit();
+	loadScene(9999);
+
+	R2_GLOBALS._player._uiEnabled = false;
+	R2_GLOBALS._player.disableControl();
+
+}
+
+void Scene180::remove() {
+	_stripManager._field2E8 = -1;
+//	_stripManager._field2EA = -1;
+	SceneExt::remove();
+
+	R2_GLOBALS._events.setCursor(CURSOR_WALK);
+	// word_575F7 = 0;
+	R2_GLOBALS._playStream.stop();
+	R2_GLOBALS._sound2.fadeOut2(NULL);
+	R2_GLOBALS._sound1.fadeOut2(NULL);
+}
+
+void Scene180::synchronize(Serializer &s) {
+	SceneExt::synchronize(s);
+
+	s.syncAsSint16LE(_frameNumber);
+	s.syncAsSint16LE(_field412);
+	s.syncAsSint16LE(_field480);
+	s.syncAsSint16LE(_field482);
+	s.syncAsSint16LE(_frameInc);
+	s.syncAsSint16LE(_fontNumber);
+	s.syncAsSint16LE(_fontHeight);
+}
+
+void Scene180::signal() {
+	R2_GLOBALS._playStream.stop();
+
+	switch (_sceneMode) {
+	case 0:
+		setFrameInc(6);
+		break;
+
+	case 1:
+		_field412 = 1;
+		R2_GLOBALS._sceneManager._hasPalette = true;
+		_actionObject._field3C = 2;
+		_actionObject._v1 = 1;
+		_actionObject._field56 = 1;
+		R2_GLOBALS._scene180Mode = 1;
+
+		_actionObject.load(1, NULL);
+		R2_GLOBALS._scenePalette.loadPalette(_actionObject._palData, 0, 256);
+
+		R2_GLOBALS._sound1.play(1);
+		break;
+
+	case 2:
+		R2_GLOBALS._scene180Mode = 1;
+		R2_GLOBALS._paneRefreshFlag[0] = 3;
+
+		if (R2_GLOBALS._sound1.isPlaying()) {
+			setFrameInc(1);
+		} else {
+			setFrameInc(180);
+		}
+		break;
+
+	case 3:
+		R2_GLOBALS._scene180Mode = 1;
+
+		if (R2_GLOBALS._sound1.isPlaying())
+			_sceneMode = 3;
+
+		setFrameInc(1);
+		break;
+
+	case 4:
+	case 8:
+	case 30:
+	case 43:
+	case 47:
+		_field412 = 0;
+		_palette.loadPalette(0);
+		_palette.loadPalette(9998);
+		R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 8, this);
+		break;
+
+	case 5:
+		_actionObject._field3C = 2;
+		_actionObject._v1 = 1;
+		_actionObject._field56 = 1;
+		R2_GLOBALS._scene180Mode = 2;
+		_actionObject.load(2);
+
+		_field412 = 1;
+		R2_GLOBALS._scenePalette.addFader(_actionObject._palData, 256, 6, NULL);
+		R2_GLOBALS._sound1.play(2);
+		break;
+
+	case 6:
+		R2_GLOBALS._scene180Mode = 2;
+		R2_GLOBALS._paneRefreshFlag[0] = 3;
+
+		if (R2_GLOBALS._sound1.isPlaying()) {
+			setFrameInc(1);
+		} else {
+			setFrameInc(180);
+		}
+		break;
+
+	case 7:
+		R2_GLOBALS._scene180Mode = 2;
+		if (R2_GLOBALS._sound1.isPaused())
+			_sceneMode = 7;
+		setFrameInc(1);
+		break;
+
+	case 9:
+		R2_GLOBALS._sound1.play(3);
+		setFrameInc(2);
+		break;
+
+	case 10:
+		loadScene(4002);
+		R2_GLOBALS._scenePalette.loadPalette(0);
+		setFrameInc(6);
+		break;
+
+	case 11:
+		_field412 = 1;
+		_object4.postInit();
+		_object5.postInit();
+		setAction(&_sequenceManager, this, 4000, &_object4, &_object5, NULL);
+		break;
+
+	case 12:
+	case 14:
+	case 16:
+	case 18:
+	case 20:
+	case 22:
+	case 24:
+	case 26:
+	case 46:
+		setFrameInc((R2_GLOBALS._speechSubtitles & 1) ? 1 : 18);
+		break;
+
+	case 13:
+		setAction(&_sequenceManager, this, 4001, &_object4, &_object5, NULL);
+		break;
+
+	case 15:
+		setAction(&_sequenceManager, this, 4002, &_object4, &_object5, NULL);
+		break;
+	
+	case 17:
+		setAction(&_sequenceManager, this, 4003, &_object4, &_object5, NULL);
+		break;
+
+	case 19:
+		setAction(&_sequenceManager, this, 4004, &_object4, &_object5, NULL);
+		break;
+
+	case 21:
+		setAction(&_sequenceManager, this, 4005, &_object4, &_object5, NULL);
+		break;
+
+	case 23:
+		setAction(&_sequenceManager, this, 4006, &_object4, &_object5, NULL);
+		break;
+
+	case 25:
+		setAction(&_sequenceManager, this, 4007, &_object4, &_object5, NULL);
+		break;
+
+	case 27:
+		_field412 = 0;
+		_object4.remove();
+		_object5.remove();
+		setFrameInc(2);
+		break;
+
+	case 28:
+		_field412 = 0;
+		_palette.loadPalette(0);
+		_palette.loadPalette(9998);
+		R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 100, this);
+		break;
+
+	case 29:
+		_field412 = 1;
+		_actionObject._field3C = 0;
+		_actionObject._v1 = 1;
+		_actionObject._field56 = 42;
+		R2_GLOBALS._scene180Mode = 3;
+		_actionObject.load(3);
+		break;
+
+	case 31:
+		R2_GLOBALS._sound2.play(7);
+
+		_object4.postInit();
+		_object4.setVisage(76);
+		_object4.setStrip(1);
+		_object4.setFrame(1);
+		_object4.setPosition(Common::Point(288, 143));
+		_object4.fixPriority(210);
+
+		loadScene(75);
+
+		R2_GLOBALS._scenePalette.loadPalette(0);
+		R2_GLOBALS._scenePalette.loadPalette(75);
+
+		if (R2_GLOBALS._sceneManager._hasPalette)
+			R2_GLOBALS._scenePalette.refresh();
+		setFrameInc(6);
+		break;
+
+	case 32:
+		_field412 = 1;
+		
+		_object2.postInit();
+		_object2.setPosition(Common::Point(161, 97));
+		_object2.hide();
+
+		_object3.postInit();
+		_object3.setPosition(Common::Point(60, 96));
+		_object3.hide();
+		R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 11, this);
+		break;
+
+	case 33:
+		_object2.hide();
+
+		_object3.setup(76, 4, 1);
+		_object3.setFrame(_object3.getFrameCount());
+
+		_object5.postInit();
+		_object5.setup(75, 1, 1);
+		_object5.setPosition(Common::Point(221, 125));
+		_object5.fixPriority(210);
+		_object5.setAction(&_action1);
+		R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 12, this);
+		break;
+
+	case 34:
+		_object2.hide();
+		_object3.hide();
+
+		_object1.postInit();
+		_object1.setup(76, 2, 1);
+		_object1.setPosition(Common::Point(287, 135));
+		_object1.fixPriority(200);
+
+		_sound1.play(19);
+		R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 5, this);
+		break;
+
+	case 35:
+		R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 13, this);
+		break;
+
+	case 36:
+		_object2.remove();
+		_sound1.play(19);
+
+		R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 6, this);
+		break;
+
+	case 37:
+		_field412 = 0;
+		_object1.remove();
+		_palette.loadPalette(9998);
+		R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 8, this);
+		break;
+
+	case 38:
+		_object4.remove();
+		_object5.setAction(NULL);
+		_object5.remove();
+		
+		R2_GLOBALS._sound2.fadeOut2(NULL);
+		R2_GLOBALS._sound1.fadeOut2(NULL);
+		break;
+
+	case 39:
+		R2_GLOBALS._sound1.changeSound(8);
+		setFrameInc(1);
+		break;
+
+	case 40:
+		_actionObject._field3C = 2;
+		_actionObject._field56 = 1;
+		R2_GLOBALS._scene180Mode = 4;
+		if (_actionObject.load(4)) {
+			_actionObject.dispatch();
+			R2_GLOBALS._scenePalette.addFader(_actionObject._palData, 256, 8, this);
+		} else {
+			_sceneMode = 43;
+			setFrameInc(1);
+		}
+		break;
+
+	case 41:
+		_field412 = 1;
+		_actionObject._v1 = 1;
+		break;
+
+	case 42:
+		R2_GLOBALS._scene180Mode = 4;
+		R2_GLOBALS._paneRefreshFlag[0] = 3;
+		setFrameInc(1);
+		break;
+
+	case 44:
+		loadScene(9997);
+		R2_GLOBALS._scenePalette.loadPalette(9997);
+		if (R2_GLOBALS._sceneManager._hasPalette)
+			R2_GLOBALS._scenePalette.refresh();
+
+		setFrameInc(6);
+		break;
+
+	case 45:
+		R2_GLOBALS._scenePalette.addFader(_actionObject._palData, 256, 28, this);
+		break;
+
+	case 48:
+		_field412 = 1;
+		_actionObject._field3C = 2;
+		_actionObject._v1 = 1;
+		_actionObject._field56 = 1;
+		R2_GLOBALS._scene180Mode = 15;
+		_actionObject.load(15, NULL);
+
+		R2_GLOBALS._sound1.play(9);
+		R2_GLOBALS._scenePalette.addFader(_actionObject._palData, 256, 6, NULL);
+		break;
+
+	case 49:
+		R2_GLOBALS._scene180Mode = 15;
+		R2_GLOBALS._paneRefreshFlag[0] = 3;
+		setFrameInc(1);
+		break;
+
+	case 50:
+		R2_GLOBALS._scene180Mode = 0;
+		_field412 = 0;
+		R2_GLOBALS._sceneManager.changeScene(100);
+		break;
+	}
+}
+
+void Scene180::setFrameInc(int v) {
+	_frameInc = v;
+	_frameNumber = R2_GLOBALS._events.getFrameNumber();
+}
+
+void Scene180::process(Event &event) {
+	if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_ESCAPE)) {
+		event.handled = 1;
+		if (!_field412) {
+			if (R2_GLOBALS._scenePalette._listeners.size() == 0) {
+				HelpDialog::show();
+			}
+		}
+	}
+
+	if (!event.handled)
+		SceneExt::process(event);
+}
+
+void Scene180::dispatch() {
+	if (_frameInc) {
+		uint32 frameNumber = R2_GLOBALS._events.getFrameNumber();
+
+		if (frameNumber >= frameNumber) {
+			_frameInc = frameNumber - _frameNumber;
+			_frameNumber = frameNumber;
+
+			if (_frameInc <= 0) {
+				_frameInc = 0;
+				signal();
+			}
+		}
+	}
+
+	if (_actionObject._v1) {
+		if (_actionObject.proc1()) {
+			_actionObject._v1 = 0;
+			_actionObject.proc2();
+			_actionObject.remove();
+
+			signal();
+		} else {
+			_actionObject.dispatch();
+		}
+	}
+
+	Scene::dispatch();
+}
+
+void Scene180::restore() {
+	R2_GLOBALS._gfxColors.background = 0;
+	R2_GLOBALS._gfxColors.foreground = 0xff;
+	R2_GLOBALS._fontColors.background = 0;
+	R2_GLOBALS._fontColors.foreground = 0xff;
+
+	switch (R2_GLOBALS._scene180Mode) {
+	case 0:
+		R2_GLOBALS._events.setCursor(SHADECURSOR_HAND);
+
+		R2_GLOBALS._gfxColors.foreground = 4;
+		R2_GLOBALS._gfxColors.background = 3;
+		R2_GLOBALS._fontColors.background = 3;
+		R2_GLOBALS._frameEdgeColour = 3;
+		break;
+
+	case 1:
+		R2_GLOBALS._events.setCursor(R2_CURSOR_20);
+
+		R2_GLOBALS._gfxColors.foreground = 25;
+		R2_GLOBALS._gfxColors.background = 43;
+		R2_GLOBALS._fontColors.background = 48;
+		R2_GLOBALS._frameEdgeColour = 48;
+		break;
+
+	case 2:
+		R2_GLOBALS._events.setCursor(R2_CURSOR_21);
+
+		R2_GLOBALS._gfxColors.foreground = 106;
+		R2_GLOBALS._gfxColors.background = 136;
+		R2_GLOBALS._fontColors.background = 48;
+		R2_GLOBALS._fontColors.foreground = 253;
+		R2_GLOBALS._frameEdgeColour = 48;
+		break;
+
+	case 3:
+		R2_GLOBALS._events.setCursor(R2_CURSOR_22);
+
+		R2_GLOBALS._gfxColors.foreground = 84;
+		R2_GLOBALS._gfxColors.background = 118;
+		R2_GLOBALS._fontColors.background = 47;
+		R2_GLOBALS._frameEdgeColour = 48;
+		break;
+
+	case 14:
+		R2_GLOBALS._events.setCursor(R2_CURSOR_23);
+
+		R2_GLOBALS._fontColors.background = 38;
+		R2_GLOBALS._fontColors.foreground = 38;
+		R2_GLOBALS._gfxColors.foreground = 192;
+		R2_GLOBALS._gfxColors.background = 30;
+		R2_GLOBALS._frameEdgeColour = 48;
+		break;
+
+	default:
+		R2_GLOBALS._gfxColors.background = 0;
+		R2_GLOBALS._gfxColors.foreground = 59;
+		R2_GLOBALS._fontColors.background = 4;
+		R2_GLOBALS._fontColors.foreground = 15;
+
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
+		break;
+	}
+}
+
 /*--------------------------------------------------------------------------
  * Scene 200 - Ship Corridor
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 0ebcf09da7..f3c8b0bccf 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -189,6 +189,43 @@ public:
 class Scene175: public Scene150 {
 };
 
+class Scene180: public SceneExt {
+	class Action1: public Action {
+	public:
+		void signal();
+	};
+private:
+	void setFrameInc(int v);
+public:
+	SpeakerWebbster _webbsterSpeaker;
+	SpeakerDutyOfficer _dutyOfficerSpeaker;
+	SpeakerTeal _tealSpeaker;
+	SpeakerGameText _gameTextSpeaker;
+	SceneActor _object1, _object2, _object3, _object4, _object5;
+	ScenePalette _palette;
+	SceneText _textList[20];
+	ActionObjectExt _actionObject;
+	SequenceManager _sequenceManager;
+	Action1 _action1;
+	ASoundExt _sound1;
+	
+	int _frameNumber;
+	int _field412, _field480;
+	int _field482, _frameInc;
+	int _fontNumber, _fontHeight;
+	int _scene180Mode;
+public:
+	Scene180();
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);	
+	virtual void synchronize(Serializer &s);
+	virtual void remove();
+	virtual void signal();
+	virtual void process(Event &event);
+	virtual void dispatch();
+	virtual void restore();
+};
+
 class Scene200: public SceneExt {
 	/* Objects */
 	class NorthDoor: public SceneActor {
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 01db39de2f..f729881e8f 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -192,6 +192,17 @@ void VisualSpeaker::setDelay(int delay) {
 	_frameNumber = R2_GLOBALS._events.getFrameNumber();
 }
 
+//----------------------------------------------------------------------------
+
+SpeakerGameText::SpeakerGameText(): VisualSpeaker() {
+	_speakerName = "GAMETEXT";
+	_color1 = 8;
+	_color2 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+}
+
 //----------------------------------------------------------------------------
 // Classes related to CAPTAIN
 //----------------------------------------------------------------------------
@@ -2908,5 +2919,50 @@ void SpeakerWebbster3400::proc15() {
 	}
 }
 
+//----------------------------------------------------------------------------
+
+SpeakerDutyOfficer::SpeakerDutyOfficer(): VisualSpeaker() {
+	_speakerName = "DUTYOFFICER";
+	_color1 = 5;
+	_color2 = 0;
+	_fieldF6 = 0;
+	_textWidth = 300;
+	_hideObjects = false;
+	_object2 = NULL;
+	_displayMode = 1;
+	_numFrames = 0;
+}
+
+void SpeakerDutyOfficer::proc15() {
+	Scene180 *scene = (Scene180 *)R2_GLOBALS._sceneManager._scene;
+
+	int v = _fieldF6;
+
+	if (!_object2) {
+		_object2 = &scene->_object2;
+		_object2->hide();
+		_object1.postInit();
+		_object1.setPosition(_object2->_position);
+
+		if (_object2->_mover)
+			_object2->addMover(NULL);
+	}
+
+	switch (v) {
+	case 0:
+		_object1.animate(ANIM_MODE_2, NULL);
+		break;
+	case 1:
+		_action = NULL;
+		_object1.setup(76, 2, 1);
+		_object1.animate(ANIM_MODE_5, this);
+		break;
+	default:
+		signal();
+		break;
+	}
+}
+
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index a229ace16a..e336564c5f 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -63,6 +63,13 @@ public:
 	void setDelay(int delay);
 };
 
+class SpeakerGameText : public VisualSpeaker {
+public:
+	SpeakerGameText();
+
+	virtual Common::String getClassName() { return "SpeakerGameText"; }
+};
+
 // Classes related to Captain
 
 class SpeakerCaptain3210 : public VisualSpeaker {
@@ -616,6 +623,14 @@ public:
 	virtual void proc15();
 };
 
+class SpeakerDutyOfficer: public VisualSpeaker {
+public:
+	SpeakerDutyOfficer();
+
+	virtual Common::String getClassName() { return "SpeakerDutyOfficer"; }
+	virtual void proc15();
+};
+
 } // End of namespace Ringworld2
 } // End of namespace TsAGE
 
-- 
cgit v1.2.3


From 45e61b985c200a9189d172e8a1410915e7f81f95 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 5 Feb 2012 20:31:56 +1100
Subject: TSAGE: Fix problem with scrolling wide scenes.

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

(limited to 'engines')

diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 5acd191b11..3bcad91d66 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -602,7 +602,7 @@ void GfxSurface::copyFrom(GfxSurface &src, Rect srcBounds, Rect destBounds, Regi
 		destBounds.bottom = destSurface.h;
 
 	if (destBounds.isValidRect() && !((destBounds.right < 0) || (destBounds.bottom < 0)
-			|| (destBounds.left >= SCREEN_WIDTH) || (destBounds.top >= SCREEN_HEIGHT))) {
+		|| (destBounds.left >= destSurface.w) || (destBounds.top >= destSurface.h))) {
 		// Register the affected area as dirty
 		addDirtyRect(destBounds);
 
-- 
cgit v1.2.3


From 4a806d885a95082d2b6d7eef2461adac5dc1ae6a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 5 Feb 2012 20:40:03 +1100
Subject: TSAGE: Clean up the dead code introduced for R2R

---
 engines/tsage/graphics.cpp | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 3bcad91d66..2ceb007cbc 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -1308,30 +1308,14 @@ int GfxManager::getAngle(const Common::Point &p1, const Common::Point &p2) {
 	}
 }
 
-// FIXME: The two checks for screenSurface inside these two copyFrom() methods
-// are meant for Ringworld 2, but the corresponding setBounds cases cause
-// issues with the popup menus when right clicking in all games (e.g. the popup
-// menu is always shown on the top left of the screen). Therefore, these two
-// code fragments are disabled for now, till the glitches they cause are fixed.
-
 void GfxManager::copyFrom(GfxSurface &src, Rect destBounds, Region *priorityRegion) {
-#if 0
-	if (&_surface == &(GLOBALS._screenSurface))
-		_surface.setBounds(Rect(0, 0, _bounds.width(), _bounds.height()));
-	else
-#endif
-		_surface.setBounds(_bounds);
+	_surface.setBounds(_bounds);
 
 	_surface.copyFrom(src, destBounds, priorityRegion);
 }
 
 void GfxManager::copyFrom(GfxSurface &src, int destX, int destY) {
-#if 0
-	if (&_surface == &(GLOBALS._screenSurface))
-		_surface.setBounds(Rect(0, 0, _bounds.width(), _bounds.height()));
-	else
-#endif
-		_surface.setBounds(_bounds);
+	_surface.setBounds(_bounds);
 
 	_surface.copyFrom(src, destX, destY);
 }
-- 
cgit v1.2.3


From e81d1848d1821a20962a72a1837e71ef37beb701 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 6 Feb 2012 21:42:58 +1100
Subject: TSAGE: Add detection entry for Blue Force Spanish CD

---
 engines/tsage/detection_tables.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h
index 0f6d8c9d7d..583cd8e15b 100644
--- a/engines/tsage/detection_tables.h
+++ b/engines/tsage/detection_tables.h
@@ -140,6 +140,20 @@ static const tSageGameDescription gameDescriptions[] = {
 		GType_BlueForce,
 		GF_CD | GF_ALT_REGIONS
 	},
+	// Blue Force Spanish CD
+	{
+		{
+			"blueforce",
+			"CD",
+			AD_ENTRY1s("blue.rlb", "5b2b35c51b62e82d82b0791540bfae2d", 10082565),
+			Common::ES_ESP,
+			Common::kPlatformPC,
+			ADGF_CD | ADGF_TESTING,
+			GUIO2(GUIO_NOSPEECH, GUIO_NOSFX)
+		},
+		GType_BlueForce,
+		GF_CD | GF_ALT_REGIONS
+	},
 
 	// Return to Ringworld
 	{
-- 
cgit v1.2.3


From 2855735e1f8e3daee2f360eb12b79557a9d3326e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 6 Feb 2012 22:03:10 +1100
Subject: TSAGE: Properly de-select inventory buttons when mouse has moved off
 before mouse is released.

This fixes bug #3484777.
---
 engines/tsage/user_interface.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/user_interface.cpp b/engines/tsage/user_interface.cpp
index 2d06e268e4..428bf8c038 100644
--- a/engines/tsage/user_interface.cpp
+++ b/engines/tsage/user_interface.cpp
@@ -199,9 +199,9 @@ void UIInventoryScroll::process(Event &event) {
 		// Draw the button as selected
 		toggle(true);
 
-		event.handled = true;
-		break;
-	case EVENT_BUTTON_UP:
+		// Wait for the mouse to be released
+		BF_GLOBALS._events.waitForPress(EVENT_BUTTON_UP);
+
 		// Restore unselected version
 		toggle(false);
 
-- 
cgit v1.2.3


From b9a93f354b5f783be8e4c3aaf673b7105b8809a7 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Tue, 7 Feb 2012 13:20:50 +0100
Subject: Revert "SKY: Map the floppy intro track."

This reverts commit 0599145ecf92aeabf5bd4221a91761237f970323.
This mapping was incorrect, 503 is the outro.
---
 engines/sky/music/musicbase.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'engines')

diff --git a/engines/sky/music/musicbase.cpp b/engines/sky/music/musicbase.cpp
index c4e5ba4bd0..b388afdb13 100644
--- a/engines/sky/music/musicbase.cpp
+++ b/engines/sky/music/musicbase.cpp
@@ -117,10 +117,6 @@ void MusicBase::loadNewMusic() {
 	} else if (section == 5 && song == 6) {
 		section = 4;
 		song = 4;
-	} else if (section == 0 && song == 1) {
-		// floppy intro
-		section = 5;
-		song = 3;
 	}
 	Common::String trackName = Common::String::format("music_%d%02d", section, song);
 	Audio::SeekableAudioStream *stream = Audio::SeekableAudioStream::openStreamFile(trackName);
-- 
cgit v1.2.3


From 0d6b4df0141fb85d56d8083bdae81b06660e5947 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Wed, 8 Feb 2012 17:18:35 +0000
Subject: DREAMWEB: Remove uneeded duplicate function "printUnderMon".

---
 engines/dreamweb/dreamweb.h   | 1 -
 engines/dreamweb/monitor.cpp  | 4 ++--
 engines/dreamweb/vgagrafx.cpp | 4 ----
 3 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index b9623f54fa..8eeb006844 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -1124,7 +1124,6 @@ public:
 	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height);
 	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height);
 	void workToScreen();
-	void printUnderMon();
 	void frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y);
 	void frameOutNm(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
 	void frameOutBh(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index ab6dd9efcb..d2f6b376ae 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -175,7 +175,7 @@ void DreamWebEngine::monitorLogo() {
 		_oldLogoNum = _logoNum;
 		//fadeDownMon(); // FIXME: Commented out in ASM
 		printLogo();
-		printUnderMon();
+		printUnderMonitor();
 		workToScreen();
 		printLogo();
 		//fadeUpMon(); // FIXME: Commented out in ASM
@@ -286,7 +286,7 @@ void DreamWebEngine::delCurs() {
 
 void DreamWebEngine::scrollMonitor() {
 	printLogo();
-	printUnderMon();
+	printUnderMonitor();
 	workToScreen();
 	playChannel1(25);
 }
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 1e93c0f2fe..26b5e60b9d 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -71,10 +71,6 @@ void DreamWebEngine::workToScreen() {
 	blit(workspace(), 320, 0, 0, 320, 200);
 }
 
-void DreamWebEngine::printUnderMon() {
-	printUnderMonitor();
-}
-
 void DreamWebEngine::frameOutNm(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y) {
 	dst += pitch * y + x;
 
-- 
cgit v1.2.3


From 4b2938c9d0691afb3d718998b185a7669050b267 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 9 Feb 2012 22:59:33 +0100
Subject: TSAGE: R2R - Very preliminary implementation of scene 1337

---
 engines/tsage/globals.cpp                       |    8 +
 engines/tsage/globals.h                         |    4 +
 engines/tsage/graphics.cpp                      |    2 +-
 engines/tsage/ringworld2/ringworld2_logic.cpp   |    3 +-
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 2639 +++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  174 ++
 engines/tsage/staticres.cpp                     |    4 +
 engines/tsage/staticres.h                       |    4 +
 8 files changed, 2836 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 59f758f97c..d3843aa174 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -450,6 +450,10 @@ void Ringworld2Globals::reset() {
 	_v56AA8 = 1;
 	_v56AAB = 0;
 	_scene180Mode = -1;
+	_v57709 = 0;
+	_v5780C = 0;
+	_v5780E = 0;
+	_v57810 = 0;
 	_v57C2C = 0;
 	_v58CE2 = 0;
 	_v565EC[0] = 0;
@@ -507,6 +511,10 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_v56AA4);
 	s.syncAsSint16LE(_v56AAB);
 	s.syncAsSint16LE(_scene180Mode);
+	s.syncAsSint16LE(_v57709);
+	s.syncAsSint16LE(_v5780C);
+	s.syncAsSint16LE(_v5780E);
+	s.syncAsSint16LE(_v57810);
 	s.syncAsSint16LE(_v57C2C);
 	s.syncAsSint16LE(_v58CE2);
 	s.syncAsSint16LE(_speechSubtitles);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index a0b9f0b555..6e3a2eb19d 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -291,6 +291,10 @@ public:
 	byte _v56AA8;
 	int _v56AAB;
 	int _scene180Mode;	// _v575f7
+	int _v57709;
+	int _v5780C;
+	int _v5780E;
+	int _v57810;
 	int _v57C2C;
 	int _v58CE2;
 	int _speechSubtitles;
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 2ceb007cbc..acb615abae 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -440,7 +440,7 @@ bool GfxSurface::displayText(const Common::String &msg, const Common::Point &pt)
 	// Display the text
 	gfxManager._font.writeLines(msg.c_str(), textRect, ALIGN_LEFT);
 
-	// Write for a  mouse or keypress
+	// Wait for a mouse or keypress
 	Event event;
 	while (!g_globals->_events.getEvent(event, EVENT_BUTTON_DOWN | EVENT_KEYPRESS) && !g_vm->shouldQuit())
 		;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 1d39169d87..6a986d58c4 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -114,7 +114,8 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1200:
 		return new Scene1200();
 	case 1330:
-		error("Missing scene %d from group 1", sceneNumber);
+		// Card Game
+		return new Scene1337();
 	case 1500:
 		// Cutscene: Ship landing
 		return new Scene1500();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index b7ed9aa264..bf25c148f8 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1607,6 +1607,2645 @@ void Scene1200::saveCharacter(int characterIndex) {
 	SceneExt::saveCharacter(characterIndex);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1337 - Card game
+ *
+ *--------------------------------------------------------------------------*/
+
+Scene1337::unkObj1337sub1::unkObj1337sub1() {
+	_field34 = 0;
+	_field36 = Common::Point(0, 0);
+}
+
+void Scene1337::unkObj1337sub1::synchronize(Serializer &s) {
+	warning("STUBBED: unkObj1337sub1::synchronize()");
+}
+
+Scene1337::unkObj1337_1::unkObj1337_1() {
+	_fieldB94 = Common::Point(0, 0);
+	_fieldB98 = Common::Point(0, 0);
+	_fieldB9C = Common::Point(0, 0);
+	_fieldBA0 = Common::Point(0, 0);
+	_fieldBA4 = 0;
+}
+
+void Scene1337::unkObj1337_1::synchronize(Serializer &s) {
+	warning("STUBBED: unkObj1337_1::synchronize()");
+}
+
+Scene1337::Scene1337() {
+	_fieldA30 = 0;
+	_field3E24 = 0;
+	_field3E26 = 0;
+
+	for (int i = 0; i < 100; i++)
+		_field3E28[i] = 0;
+
+	_field423C = 0;
+	_field423E = 0;
+	_field4240 = 0;
+	_field4242 = 0;
+	_field4244 = 0;
+	_field4246 = 0;
+	_field4248 = 0;
+	_field424A = 0;
+	_field424C = 0;
+	_field424E = 0;
+}
+
+void Scene1337::synchronize(Serializer &s) {
+	warning("STUBBED: Scene1337::synchronize()");
+}
+
+void Scene1337::Action1337::subD18B5(int arg1, int arg2, int arg3) {
+	warning("STUBBED: Action1337::sub53CD5()");
+}
+
+void Scene1337::Action1337::skipFrames(int32 skipCount) {
+	uint32 firstFrameNumber = g_globals->_events.getFrameNumber();
+	uint32 tmpFrameNumber = firstFrameNumber;
+	
+	while (tmpFrameNumber < firstFrameNumber + skipCount)
+		tmpFrameNumber = g_globals->_events.getFrameNumber();
+
+	warning("_eventManager.waitEvent(-1)");
+}
+
+void Scene1337::Action1::signal() {
+	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 1: {
+		scene->actionDisplay(1331, 6, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		R2_GLOBALS._sceneObjects->draw();
+		scene->actionDisplay(1331, 7, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		scene->actionDisplay(1331, 8, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+
+		scene->_arrunkObj1337[1]._arr2[0]._field34 = 2;
+		scene->_arrunkObj1337[1]._arr2[0]._object1.postInit();
+		scene->_arrunkObj1337[1]._arr2[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[1]._arr2[0]._object1.setPosition(scene->_arrunkObj1337[1]._arr2[0]._field36, 0);
+		scene->_arrunkObj1337[1]._arr2[0]._object1.setStrip(2);
+		scene->_arrunkObj1337[1]._arr2[0]._object1.setFrame(scene->_arrunkObj1337[1]._arr2[0]._field34);
+		scene->_arrunkObj1337[1]._arr2[0]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[1]._arr2[0]);
+
+		scene->_arrunkObj1337[1]._arr2[1]._field34 = 3;
+		scene->_arrunkObj1337[1]._arr2[1]._object1.postInit();
+		scene->_arrunkObj1337[1]._arr2[1]._object1.setVisage(1332);
+		scene->_arrunkObj1337[1]._arr2[1]._object1.setPosition(scene->_arrunkObj1337[1]._arr2[1]._field36, 0);
+		scene->_arrunkObj1337[1]._arr2[1]._object1.setStrip(2);
+		scene->_arrunkObj1337[1]._arr2[1]._object1.setFrame(scene->_arrunkObj1337[1]._arr2[1]._field34);
+		scene->_arrunkObj1337[1]._arr2[1]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[1]._arr2[1]);
+
+		scene->_arrunkObj1337[2]._arr2[0]._field34 = 4;
+		scene->_arrunkObj1337[2]._arr2[0]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr2[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr2[0]._object1.setPosition(scene->_arrunkObj1337[2]._arr2[0]._field36, 0);
+		scene->_arrunkObj1337[2]._arr2[0]._object1.setStrip(2);
+		scene->_arrunkObj1337[2]._arr2[0]._object1.setFrame(scene->_arrunkObj1337[2]._arr2[0]._field34);
+		scene->_arrunkObj1337[2]._arr2[0]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr2[0]);
+
+		scene->_arrunkObj1337[3]._arr2[0]._field34 = 5;
+		scene->_arrunkObj1337[3]._arr2[0]._object1.postInit();
+		scene->_arrunkObj1337[3]._arr2[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[3]._arr2[0]._object1.setPosition(scene->_arrunkObj1337[3]._arr2[0]._field36, 0);
+		scene->_arrunkObj1337[3]._arr2[0]._object1.setStrip(2);
+		scene->_arrunkObj1337[3]._arr2[0]._object1.setFrame(scene->_arrunkObj1337[3]._arr2[0]._field34);
+		scene->_arrunkObj1337[3]._arr2[0]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[3]._arr2[0]);
+
+		scene->_arrunkObj1337[3]._arr2[1]._field34 = 6;
+		scene->_arrunkObj1337[3]._arr2[1]._object1.postInit();
+		scene->_arrunkObj1337[3]._arr2[1]._object1.setVisage(1332);
+		scene->_arrunkObj1337[3]._arr2[1]._object1.setPosition(scene->_arrunkObj1337[3]._arr2[1]._field36, 0);
+		scene->_arrunkObj1337[3]._arr2[1]._object1.setStrip(2);
+		scene->_arrunkObj1337[3]._arr2[1]._object1.setFrame(scene->_arrunkObj1337[3]._arr2[1]._field34);
+		scene->_arrunkObj1337[3]._arr2[1]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[3]._arr2[1]);
+
+		scene->_arrunkObj1337[3]._arr2[2]._field34 = 7;
+		scene->_arrunkObj1337[3]._arr2[2]._object1.postInit();
+		scene->_arrunkObj1337[3]._arr2[2]._object1.setVisage(1332);
+		scene->_arrunkObj1337[3]._arr2[2]._object1.setPosition(scene->_arrunkObj1337[3]._arr2[2]._field36, 0);
+		scene->_arrunkObj1337[3]._arr2[2]._object1.setStrip(2);
+		scene->_arrunkObj1337[3]._arr2[2]._object1.setFrame(scene->_arrunkObj1337[3]._arr2[2]._field34);
+		scene->_arrunkObj1337[3]._arr2[2]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[3]._arr2[2]);
+
+		scene->_arrunkObj1337[0]._arr2[0]._field34 = 8;
+		scene->_arrunkObj1337[0]._arr2[0]._object1.postInit();
+		scene->_arrunkObj1337[0]._arr2[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[0]._arr2[0]._object1.setPosition(scene->_arrunkObj1337[0]._arr2[0]._field36, 0);
+		scene->_arrunkObj1337[0]._arr2[0]._object1.setStrip(2);
+		scene->_arrunkObj1337[0]._arr2[0]._object1.setFrame(scene->_arrunkObj1337[0]._arr2[0]._field34);
+		scene->_arrunkObj1337[0]._arr2[0]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[0]._arr2[0]);
+
+		scene->_arrunkObj1337[0]._arr2[1]._field34 = 9;
+		scene->_arrunkObj1337[0]._arr2[1]._object1.postInit();
+		scene->_arrunkObj1337[0]._arr2[1]._object1.setVisage(1332);
+		scene->_arrunkObj1337[0]._arr2[1]._object1.setPosition(scene->_arrunkObj1337[0]._arr2[1]._field36, 0);
+		scene->_arrunkObj1337[0]._arr2[1]._object1.setStrip(2);
+		scene->_arrunkObj1337[0]._arr2[1]._object1.setFrame(scene->_arrunkObj1337[0]._arr2[1]._field34);
+		scene->_arrunkObj1337[0]._arr2[1]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[0]._arr2[1]);
+
+		R2_GLOBALS._sceneObjects->draw();
+
+		skipFrames(60);
+		scene->actionDisplay(1331, 9, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+
+		scene->_arrunkObj1337[2]._arr2[1]._field34 = 2;
+		scene->_arrunkObj1337[2]._arr2[1]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr2[1]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr2[1]._object1.setPosition(scene->_arrunkObj1337[2]._arr2[1]._field36, 0);
+		scene->_arrunkObj1337[2]._arr2[1]._object1.setStrip(2);
+		scene->_arrunkObj1337[2]._arr2[1]._object1.setFrame(scene->_arrunkObj1337[2]._arr2[1]._field34);
+		scene->_arrunkObj1337[2]._arr2[1]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr2[1]);
+
+		scene->_arrunkObj1337[2]._arr2[2]._field34 = 3;
+		scene->_arrunkObj1337[2]._arr2[2]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr2[2]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr2[2]._object1.setPosition(scene->_arrunkObj1337[2]._arr2[2]._field36, 0);
+		scene->_arrunkObj1337[2]._arr2[2]._object1.setStrip(2);
+		scene->_arrunkObj1337[2]._arr2[2]._object1.setFrame(scene->_arrunkObj1337[2]._arr2[2]._field34);
+		scene->_arrunkObj1337[2]._arr2[2]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr2[2]);
+
+		scene->_arrunkObj1337[2]._arr2[3]._field34 = 5;
+		scene->_arrunkObj1337[2]._arr2[3]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr2[3]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr2[3]._object1.setPosition(scene->_arrunkObj1337[2]._arr2[3]._field36, 0);
+		scene->_arrunkObj1337[2]._arr2[3]._object1.setStrip(2);
+		scene->_arrunkObj1337[2]._arr2[3]._object1.setFrame(scene->_arrunkObj1337[2]._arr2[3]._field34);
+		scene->_arrunkObj1337[2]._arr2[3]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr2[3]);
+
+		scene->_arrunkObj1337[2]._arr2[4]._field34 = 6;
+		scene->_arrunkObj1337[2]._arr2[4]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr2[4]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr2[4]._object1.setPosition(scene->_arrunkObj1337[2]._arr2[4]._field36, 0);
+		scene->_arrunkObj1337[2]._arr2[4]._object1.setStrip(2);
+		scene->_arrunkObj1337[2]._arr2[4]._object1.setFrame(scene->_arrunkObj1337[2]._arr2[4]._field34);
+		scene->_arrunkObj1337[2]._arr2[4]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr2[4]);
+
+		scene->_arrunkObj1337[2]._arr2[5]._field34 = 7;
+		scene->_arrunkObj1337[2]._arr2[5]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr2[5]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr2[5]._object1.setPosition(scene->_arrunkObj1337[2]._arr2[5]._field36, 0);
+		scene->_arrunkObj1337[2]._arr2[5]._object1.setStrip(2);
+		scene->_arrunkObj1337[2]._arr2[5]._object1.setFrame(scene->_arrunkObj1337[2]._arr2[5]._field34);
+		scene->_arrunkObj1337[2]._arr2[5]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr2[5]);
+
+		scene->_arrunkObj1337[2]._arr2[6]._field34 = 8;
+		scene->_arrunkObj1337[2]._arr2[6]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr2[6]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr2[6]._object1.setPosition(scene->_arrunkObj1337[2]._arr2[6]._field36, 0);
+		scene->_arrunkObj1337[2]._arr2[6]._object1.setStrip(2);
+		scene->_arrunkObj1337[2]._arr2[6]._object1.setFrame(scene->_arrunkObj1337[2]._arr2[6]._field34);
+		scene->_arrunkObj1337[2]._arr2[6]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr2[6]);
+
+		scene->_arrunkObj1337[2]._arr2[7]._field34 = 9;
+		scene->_arrunkObj1337[2]._arr2[7]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr2[7]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr2[7]._object1.setPosition(scene->_arrunkObj1337[2]._arr2[7]._field36, 0);
+		scene->_arrunkObj1337[2]._arr2[7]._object1.setStrip(2);
+		scene->_arrunkObj1337[2]._arr2[7]._object1.setFrame(scene->_arrunkObj1337[2]._arr2[7]._field34);
+		scene->_arrunkObj1337[2]._arr2[7]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr2[7]);
+
+		scene->_aSound1.play(62);
+
+		R2_GLOBALS._sceneObjects->draw();
+		
+		skipFrames(120);
+		scene->_arrunkObj1337[2]._arr2[0]._object1.remove();
+		scene->_arrunkObj1337[2]._arr2[1]._object1.remove();
+		scene->_arrunkObj1337[2]._arr2[2]._object1.remove();
+		scene->_arrunkObj1337[2]._arr2[3]._object1.remove();
+		scene->_arrunkObj1337[2]._arr2[4]._object1.remove();
+		scene->_arrunkObj1337[2]._arr2[5]._object1.remove();
+		scene->_arrunkObj1337[2]._arr2[6]._object1.remove();
+		scene->_arrunkObj1337[2]._arr2[7]._object1.remove();
+
+		scene->_arrunkObj1337[1]._arr2[0]._object1.remove();
+		scene->_arrunkObj1337[1]._arr2[1]._object1.remove();
+
+		scene->_arrunkObj1337[3]._arr2[0]._object1.remove();
+		scene->_arrunkObj1337[3]._arr2[1]._object1.remove();
+		scene->_arrunkObj1337[3]._arr2[2]._object1.remove();
+
+		scene->_arrunkObj1337[0]._arr2[0]._object1.remove();
+		scene->_arrunkObj1337[0]._arr2[1]._object1.remove();
+
+		scene->_background2.setup2(1332, 5, 1, 165, 95, 110, 1);
+
+		scene->_arrunkObj1337[1]._arr1[0]._object1.postInit();
+		scene->_arrunkObj1337[1]._arr1[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[1]._arr1[0]._object1.setPosition(scene->_arrunkObj1337[1]._arr1[0]._field36, 0);
+		scene->_arrunkObj1337[1]._arr1[0]._object1.setStrip(1);
+		scene->_arrunkObj1337[1]._arr1[0]._object1.setFrame(4);
+		scene->_arrunkObj1337[1]._arr1[0]._object1.fixPriority(170);
+
+		scene->_arrunkObj1337[1]._arr1[1]._object1.postInit();
+		scene->_arrunkObj1337[1]._arr1[1]._object1.setVisage(1332);
+		scene->_arrunkObj1337[1]._arr1[1]._object1.setPosition(scene->_arrunkObj1337[1]._arr1[1]._field36, 0);
+		scene->_arrunkObj1337[1]._arr1[1]._object1.setStrip(1);
+		scene->_arrunkObj1337[1]._arr1[1]._object1.setFrame(4);
+		scene->_arrunkObj1337[1]._arr1[1]._object1.fixPriority(170);
+
+		scene->_arrunkObj1337[1]._arr1[2]._object1.postInit();
+		scene->_arrunkObj1337[1]._arr1[2]._object1.setVisage(1332);
+		scene->_arrunkObj1337[1]._arr1[2]._object1.setPosition(scene->_arrunkObj1337[1]._arr1[2]._field36, 0);
+		scene->_arrunkObj1337[1]._arr1[2]._object1.setStrip(1);
+		scene->_arrunkObj1337[1]._arr1[2]._object1.setFrame(4);
+		scene->_arrunkObj1337[1]._arr1[2]._object1.fixPriority(170);
+
+		scene->_arrunkObj1337[2]._arr1[0]._field34 = 30;
+		scene->_arrunkObj1337[2]._arr1[0]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr1[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr1[0]._object1.setPosition(scene->_arrunkObj1337[2]._arr1[0]._field36, 0);
+		scene->_arrunkObj1337[2]._arr1[0]._object1.setStrip(1);
+		scene->_arrunkObj1337[2]._arr1[0]._object1.setFrame(2);
+		scene->_arrunkObj1337[2]._arr1[0]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr1[0]);
+
+		scene->_arrunkObj1337[2]._arr1[1]._field34 = 16;
+		scene->_arrunkObj1337[2]._arr1[1]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr1[1]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr1[1]._object1.setPosition(scene->_arrunkObj1337[2]._arr1[1]._field36, 0);
+		scene->_arrunkObj1337[2]._arr1[1]._object1.setStrip(1);
+		scene->_arrunkObj1337[2]._arr1[1]._object1.setFrame(2);
+		scene->_arrunkObj1337[2]._arr1[1]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr1[1]);
+
+		scene->_arrunkObj1337[2]._arr1[2]._field34 = 1;
+		scene->_arrunkObj1337[2]._arr1[2]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr1[2]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr1[2]._object1.setPosition(scene->_arrunkObj1337[2]._arr1[2]._field36, 0);
+		scene->_arrunkObj1337[2]._arr1[2]._object1.setStrip(1);
+		scene->_arrunkObj1337[2]._arr1[2]._object1.setFrame(2);
+		scene->_arrunkObj1337[2]._arr1[2]._object1.fixPriority(170);
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr1[2]);
+
+		scene->_arrunkObj1337[3]._arr1[0]._object1.postInit();
+		scene->_arrunkObj1337[3]._arr1[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[3]._arr1[0]._object1.setPosition(scene->_arrunkObj1337[3]._arr1[0]._field36, 0);
+		scene->_arrunkObj1337[3]._arr1[0]._object1.setStrip(1);
+		scene->_arrunkObj1337[3]._arr1[0]._object1.setFrame(3);
+		scene->_arrunkObj1337[3]._arr1[0]._object1.fixPriority(170);
+
+		scene->_arrunkObj1337[3]._arr1[1]._object1.postInit();
+		scene->_arrunkObj1337[3]._arr1[1]._object1.setVisage(1332);
+		scene->_arrunkObj1337[3]._arr1[1]._object1.setPosition(scene->_arrunkObj1337[3]._arr1[1]._field36, 0);
+		scene->_arrunkObj1337[3]._arr1[1]._object1.setStrip(1);
+		scene->_arrunkObj1337[3]._arr1[1]._object1.setFrame(3);
+		scene->_arrunkObj1337[3]._arr1[1]._object1.fixPriority(170);
+
+		scene->_arrunkObj1337[3]._arr1[2]._object1.postInit();
+		scene->_arrunkObj1337[3]._arr1[2]._object1.setVisage(1332);
+		scene->_arrunkObj1337[3]._arr1[2]._object1.setPosition(scene->_arrunkObj1337[3]._arr1[2]._field36, 0);
+		scene->_arrunkObj1337[3]._arr1[2]._object1.setStrip(1);
+		scene->_arrunkObj1337[3]._arr1[2]._object1.setFrame(3);
+		scene->_arrunkObj1337[3]._arr1[2]._object1.fixPriority(170);
+
+		scene->_arrunkObj1337[0]._arr1[0]._object1.postInit();
+		scene->_arrunkObj1337[0]._arr1[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[0]._arr1[0]._object1.setPosition(scene->_arrunkObj1337[0]._arr1[0]._field36, 0);
+		scene->_arrunkObj1337[0]._arr1[0]._object1.setStrip(1);
+		scene->_arrunkObj1337[0]._arr1[0]._object1.setFrame(2);
+		scene->_arrunkObj1337[0]._arr1[0]._object1.fixPriority(170);
+
+		scene->_arrunkObj1337[0]._arr1[1]._object1.postInit();
+		scene->_arrunkObj1337[0]._arr1[1]._object1.setVisage(1332);
+		scene->_arrunkObj1337[0]._arr1[1]._object1.setPosition(scene->_arrunkObj1337[0]._arr1[1]._field36, 0);
+		scene->_arrunkObj1337[0]._arr1[1]._object1.setStrip(1);
+		scene->_arrunkObj1337[0]._arr1[1]._object1.setFrame(2);
+		scene->_arrunkObj1337[0]._arr1[1]._object1.fixPriority(170);
+
+		scene->_arrunkObj1337[0]._arr1[2]._object1.postInit();
+		scene->_arrunkObj1337[0]._arr1[2]._object1.setVisage(1332);
+		scene->_arrunkObj1337[0]._arr1[2]._object1.setPosition(scene->_arrunkObj1337[0]._arr1[2]._field36, 0);
+		scene->_arrunkObj1337[0]._arr1[2]._object1.setStrip(1);
+		scene->_arrunkObj1337[0]._arr1[2]._object1.setFrame(2);
+		scene->_arrunkObj1337[0]._arr1[2]._object1.fixPriority(170);
+
+		R2_GLOBALS._sceneObjects->draw();
+		
+		scene->actionDisplay(1331, 10, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		scene->_item2._object1.setPosition(Common::Point(162, 95), 0);
+		scene->_item2._object1.show();
+		scene->_aSound2.play(61);
+
+		Common::Point pt(91, 174);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+		}
+		break;
+	case 2: {
+		scene->_arrunkObj1337[2]._arr1[3]._field34 = 2;
+		scene->_arrunkObj1337[2]._arr1[3]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr1[3]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr1[3]._object1.setPosition(scene->_arrunkObj1337[2]._arr1[3]._field36, 0);
+		scene->_arrunkObj1337[2]._arr1[3]._object1.setStrip(1);
+		scene->_arrunkObj1337[2]._arr1[3]._object1.setFrame(2);
+		scene->_arrunkObj1337[2]._arr1[3]._object1.fixPriority(170);
+
+		scene->_item2._object1.hide();
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr1[3]);
+
+		R2_GLOBALS._sceneObjects->draw();
+
+		skipFrames(60);
+		scene->actionDisplay(1331, 11, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		scene->actionDisplay(1331, 12, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+
+		scene->_arrunkObj1337[2]._arr2[1]._field34 = 1;
+		scene->_arrunkObj1337[2]._arr2[1]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr2[1]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr2[1]._object1.setPosition(scene->_arrunkObj1337[2]._arr2[1]._field36, 0);
+		scene->_arrunkObj1337[2]._arr2[1]._object1.hide();
+
+		scene->_item2._object1.setStrip(scene->_arrunkObj1337[2]._arr1[2]._object1._strip);
+		scene->_item2._object1.setFrame(scene->_arrunkObj1337[2]._arr1[2]._object1._frame);
+		scene->_item2._object1.animate(ANIM_MODE_NONE, NULL);
+		
+		scene->_arrunkObj1337[2]._arr1[2]._field34 = 0;
+		scene->_arrunkObj1337[2]._arr1[2]._object1.remove();
+
+		scene->_item2._object1.setPosition(scene->_arrunkObj1337[2]._arr1[2]._field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_arrunkObj1337[2]._arr2[1]._field36, this);
+		}
+		break;
+	case 3: {
+		scene->_item2._object1.hide();
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr2[1]);
+		scene->_aSound1.play(59);
+
+		R2_GLOBALS._sceneObjects->draw();
+
+		skipFrames(60);
+		scene->actionDisplay(1331, 13, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+
+		scene->_arrunkObj1337[2]._arr2[1]._field34 = scene->_arrunkObj1337[2]._arr1[3]._field34;
+
+		scene->_item2._object1.setStrip(scene->_arrunkObj1337[2]._arr1[3]._object1._strip);
+		scene->_item2._object1.setFrame(scene->_arrunkObj1337[2]._arr1[3]._object1._frame);
+
+		scene->_arrunkObj1337[2]._arr1[3]._field34 = 0;
+		scene->_arrunkObj1337[2]._arr1[3]._object1.remove();
+
+		scene->_item2._object1.setPosition(scene->_arrunkObj1337[2]._arr1[3]._field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_arrunkObj1337[2]._arr2[1]._field36, this);
+		}
+		break;
+	case 4: {
+		scene->_item2._object1.hide();
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr2[1]);
+		scene->_aSound1.play(59);
+
+		scene->_item7._field34 = 1;
+		scene->_item7._object1.hide();
+
+		scene->_item2._object1.setStrip(5);
+		scene->_item2._object1.setFrame(1);
+		scene->_item2._object1.animate(ANIM_MODE_2, NULL);
+		scene->_item2._object1.setPosition(scene->_arrunkObj1337[2]._arr2[1]._field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_item7._field36, this);
+		}
+		break;
+	case 5: {
+		scene->_item2._object1.hide();
+
+		scene->_item7._object1.postInit();
+		scene->_item7._object1.setVisage(1332);
+		scene->_item7._object1.setPosition(scene->_item7._field36, 0);
+		scene->setAnimationInfo(&scene->_item7);
+		scene->_aSound2.play(61);
+
+		R2_GLOBALS._sceneObjects->draw();
+
+		skipFrames(60);
+		scene->actionDisplay(1331, 14, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+
+		scene->_arrunkObj1337[2]._arr3[0]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr3[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr3[0]._object1.setPosition(scene->_arrunkObj1337[2]._arr3[0]._field36, 0);
+		scene->_arrunkObj1337[2]._arr3[0]._object1.hide();
+
+		scene->_arrunkObj1337[3]._arr1[2]._field34 = 0;
+		scene->_arrunkObj1337[3]._arr1[2].remove();
+
+		scene->_item2._object1.setPosition(scene->_arrunkObj1337[3]._arr1[2]._field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_arrunkObj1337[2]._arr3[0]._field36, this);
+		}
+		break;
+	case 6: {
+		scene->_item2._object1.hide();
+		scene->_arrunkObj1337[2]._arr3[0]._field34 = 21;
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr3[0]);
+		scene->_aSound1.play(57);
+
+		R2_GLOBALS._sceneObjects->draw();
+
+		skipFrames(60);
+		scene->actionDisplay(1331, 15, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+
+		int tmpVal = 15;
+		int i = -1;
+
+		for (i = 0; i <= 7; i++) {
+			tmpVal += 29;
+
+			scene->_arrObject1[i].postInit();
+			scene->_arrObject1[i].setVisage(1332);
+			scene->_arrObject1[i].setPosition(Common::Point(tmpVal, 90), 0);
+			scene->_arrObject1[i].setStrip(3);
+			scene->_arrObject1[i].fixPriority(190);
+
+			scene->_arrObject2[i].postInit();
+			scene->_arrObject2[i].setVisage(1332);
+			scene->_arrObject2[i].setPosition(Common::Point(tmpVal, 90), 0);
+			scene->_arrObject2[i].setStrip(7);
+			scene->_arrObject2[i].setFrame(1);
+			scene->_arrObject2[i].fixPriority(180);
+		}
+
+		scene->_arrObject1[0].setFrame(1);
+		scene->_arrObject1[1].setFrame(3);
+		scene->_arrObject1[2].setFrame(6);
+		scene->_arrObject1[3].setFrame(8);
+		scene->_arrObject1[4].setFrame(9);
+		scene->_arrObject1[5].setFrame(10);
+		scene->_arrObject1[6].setFrame(11);
+		scene->_arrObject1[7].setFrame(12);
+
+		R2_GLOBALS._sceneObjects->draw();
+
+		skipFrames(240);
+		
+		scene->_arrObject1[0].remove();
+		scene->_arrObject1[1].remove();
+		scene->_arrObject1[2].remove();
+		scene->_arrObject1[3].remove();
+		scene->_arrObject1[4].remove();
+		scene->_arrObject1[5].remove();
+		scene->_arrObject1[6].remove();
+		scene->_arrObject1[7].remove();
+
+		scene->_arrObject2[0].remove();
+		scene->_arrObject2[1].remove();
+		scene->_arrObject2[2].remove();
+		scene->_arrObject2[3].remove();
+		scene->_arrObject2[4].remove();
+		scene->_arrObject2[5].remove();
+		scene->_arrObject2[6].remove();
+		scene->_arrObject2[7].remove();
+
+		scene->_item7._field34 = scene->_arrunkObj1337[2]._arr3[0]._field34;
+
+		scene->_arrunkObj1337[2]._arr3[0]._field34 = 0;
+		scene->_arrunkObj1337[2]._arr3[0]._object1.remove();
+		
+		scene->_item2._object1.setPosition(scene->_arrunkObj1337[2]._arr3[0]._field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_item7._field36, this);
+		}
+		break;
+	case 7: {
+		scene->_item2._object1.hide();
+		scene->setAnimationInfo(&scene->_item7);
+		scene->_aSound2.play(61);
+
+		R2_GLOBALS._sceneObjects->draw();
+
+		scene->_arrunkObj1337[2]._arr3[0]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr3[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr3[0]._object1.setPosition(scene->_arrunkObj1337[2]._arr3[0]._field36, 0);
+		scene->_arrunkObj1337[2]._arr3[0]._object1.hide();
+
+		scene->_arrunkObj1337[3]._arr1[1]._field34 = 0;
+		scene->_arrunkObj1337[3]._arr1[1].remove();
+
+		scene->_item2._object1.setPosition(scene->_arrunkObj1337[3]._arr1[1]._field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_arrunkObj1337[2]._arr3[0]._field36, this);
+		}
+		break;
+	case 8: {
+		scene->_item2._object1.hide();
+		scene->_arrunkObj1337[2]._arr3[0]._field34 = 14;
+		scene->setAnimationInfo(&scene->_arrunkObj1337[2]._arr3[0]);
+		scene->_aSound1.play(57);
+
+		R2_GLOBALS._sceneObjects->draw();
+
+		scene->actionDisplay(1331, 16, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		int tmpVal = 72;
+		int i = -1;
+
+		for (i = 0; i <= 3; i++) {
+			tmpVal += 29;
+			scene->_arrObject1[i].postInit();
+			scene->_arrObject1[i].setVisage(1332);
+			scene->_arrObject1[i].setPosition(Common::Point(tmpVal, 71), 0);
+			scene->_arrObject1[i].setStrip(3);
+			scene->_arrObject1[i].fixPriority(190);
+
+			scene->_arrObject2[i].postInit();
+			scene->_arrObject2[i].setVisage(1332);
+			scene->_arrObject2[i].setPosition(Common::Point(tmpVal, 71), 0);
+			scene->_arrObject2[i].setStrip(7);
+			scene->_arrObject2[i].setFrame(1);
+			scene->_arrObject2[i].fixPriority(180);
+		}
+
+		scene->_arrObject1[0].setFrame(2);
+		scene->_arrObject1[1].setFrame(5);
+		scene->_arrObject1[2].setFrame(7);
+		scene->_arrObject1[3].setFrame(15);
+
+		R2_GLOBALS._sceneObjects->draw();
+
+		skipFrames(240);
+		scene->actionDisplay(1331, 17, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+
+		tmpVal = 72;
+		for (i = 4; i <= 7; i++) {
+			tmpVal += 29;
+
+			scene->_arrObject1[i].postInit();
+			scene->_arrObject1[i].setVisage(1332);
+			scene->_arrObject1[i].setPosition(Common::Point(tmpVal, 100), 0);
+			scene->_arrObject1[i].setStrip(4);
+			scene->_arrObject1[i].fixPriority(190);
+
+			scene->_arrObject2[i].postInit();
+			scene->_arrObject2[i].setVisage(1332);
+			scene->_arrObject2[i].setPosition(Common::Point(tmpVal, 100), 0);
+			scene->_arrObject2[i].setStrip(7);
+			scene->_arrObject2[i].setFrame(1);
+			scene->_arrObject2[i].fixPriority(180);
+		}
+
+		scene->_arrObject1[4].setFrame(1);
+		scene->_arrObject1[5].setFrame(5);
+		scene->_arrObject1[6].setFrame(7);
+		scene->_arrObject1[7].setFrame(3);
+
+		R2_GLOBALS._sceneObjects->draw();
+
+		skipFrames(240);
+		
+		scene->_arrObject1[0].remove();
+		scene->_arrObject1[1].remove();
+		scene->_arrObject1[2].remove();
+		scene->_arrObject1[3].remove();
+		scene->_arrObject1[4].remove();
+		scene->_arrObject1[5].remove();
+		scene->_arrObject1[6].remove();
+		scene->_arrObject1[7].remove();
+
+		scene->_arrObject2[0].remove();
+		scene->_arrObject2[1].remove();
+		scene->_arrObject2[2].remove();
+		scene->_arrObject2[3].remove();
+		scene->_arrObject2[4].remove();
+		scene->_arrObject2[5].remove();
+		scene->_arrObject2[6].remove();
+		scene->_arrObject2[7].remove();
+
+		scene->_item7._field34 = scene->_arrunkObj1337[2]._arr1[0]._field34;
+
+		scene->_item2._object1.setStrip(scene->_arrunkObj1337[2]._arr1[0]._object1._strip);
+		scene->_item2._object1.setFrame(scene->_arrunkObj1337[2]._arr1[0]._object1._frame);
+		scene->_item2._object1.animate(ANIM_MODE_NONE, NULL);
+
+		scene->_arrunkObj1337[2]._arr1[0]._field34 = 0;
+		scene->_arrunkObj1337[2]._arr1[0]._object1.remove();
+
+		scene->_item2._object1.setPosition(scene->_arrunkObj1337[2]._arr1[0]._field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_arrunkObj1337[2]._arr3[0]._field36, this);
+		}
+		break;
+	case 9: {
+		scene->_aSound1.play(58);
+		scene->_arrunkObj1337[2]._arr3[0]._field34 = 0;
+		scene->_arrunkObj1337[2]._arr3[0].remove();
+		scene->_item2._object1.setStrip(5);
+		scene->_item2._object1.setFrame(1);
+		scene->_item2._object1.animate(ANIM_MODE_2, NULL);
+		scene->_item2._object1.setPosition(scene->_arrunkObj1337[2]._arr3[0]._field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_item7._field36, this);
+		}
+		break;
+	case 10: {
+		scene->_item2._object1.hide();
+		scene->setAnimationInfo(&scene->_item7);
+		scene->_aSound2.play(61);
+
+		R2_GLOBALS._sceneObjects->draw();
+		scene->actionDisplay(1331, 18, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+
+		scene->_arrObject1[0].postInit();
+		scene->_arrObject1[0].setVisage(1332);
+		scene->_arrObject1[0].setPosition(Common::Point(131, 71), 0);
+		scene->_arrObject1[0].fixPriority(190);
+		scene->_arrObject1[0].setStrip(3);
+		scene->_arrObject1[0].setFrame(4);
+
+		scene->_arrObject2[0].postInit();
+		scene->_arrObject2[0].setVisage(1332);
+		scene->_arrObject2[0].setPosition(Common::Point(131, 71), 0);
+		scene->_arrObject2[0].setStrip(7);
+		scene->_arrObject2[0].setFrame(1);
+		scene->_arrObject2[0].fixPriority(180);
+			 
+		scene->_arrObject1[1].postInit();
+		scene->_arrObject1[1].setVisage(1332);
+		scene->_arrObject1[1].setPosition(Common::Point(160, 71), 0);
+		scene->_arrObject1[1].fixPriority(190);
+		scene->_arrObject1[1].setStrip(3);
+		scene->_arrObject1[1].setFrame(16);
+
+		scene->_arrObject2[1].postInit();
+		scene->_arrObject2[1].setVisage(1332);
+		scene->_arrObject2[1].setPosition(Common::Point(160, 71), 0);
+		scene->_arrObject2[1].setStrip(7);
+		scene->_arrObject2[1].setFrame(1);
+		scene->_arrObject2[1].fixPriority(180);
+			 
+		scene->_arrObject1[2].postInit();
+		scene->_arrObject1[2].setVisage(1332);
+		scene->_arrObject1[2].setPosition(Common::Point(131, 100), 0);
+		scene->_arrObject1[2].fixPriority(190);
+		scene->_arrObject1[2].setStrip(4);
+		scene->_arrObject1[2].setFrame(4);
+			 
+		scene->_arrObject2[2].postInit();
+		scene->_arrObject2[2].setVisage(1332);
+		scene->_arrObject2[2].setPosition(Common::Point(131, 100), 0);
+		scene->_arrObject2[2].setStrip(7);
+		scene->_arrObject2[2].setFrame(1);
+		scene->_arrObject2[2].fixPriority(180);
+			 
+		scene->_arrObject1[3].postInit();
+		scene->_arrObject1[3].setVisage(1332);
+		scene->_arrObject1[3].setPosition(Common::Point(160, 100), 0);
+		scene->_arrObject1[3].fixPriority(190);
+		scene->_arrObject1[3].setStrip(4);
+		scene->_arrObject1[3].setFrame(2);
+			 
+		scene->_arrObject2[3].postInit();
+		scene->_arrObject2[3].setVisage(1332);
+		scene->_arrObject2[3].setPosition(Common::Point(160, 100), 0);
+		scene->_arrObject2[3].setStrip(7);
+		scene->_arrObject2[3].setFrame(1);
+		scene->_arrObject2[3].fixPriority(180);
+			 
+		R2_GLOBALS._sceneObjects->draw();
+
+		skipFrames(240);
+
+		scene->_arrObject1[0].remove();
+		scene->_arrObject1[1].remove();
+		scene->_arrObject1[2].remove();
+		scene->_arrObject1[3].remove();
+
+		scene->_arrObject2[0].remove();
+		scene->_arrObject2[1].remove();
+		scene->_arrObject2[2].remove();
+		scene->_arrObject2[3].remove();
+
+		scene->_object1.setFrame(1);
+		scene->_object1.show();
+		scene->_object1.animate(ANIM_MODE_2, NULL);
+
+		R2_GLOBALS._sceneObjects->draw();
+
+		scene->actionDisplay(1331, 19, 159, 10, 1, 220, 0, 7, 0, 154, 154);
+		
+		scene->_object1.hide();
+
+		scene->actionDisplay(1331, 20, 159, 10, 1, 220, 0, 7, 0, 154, 154);
+		scene->actionDisplay(1331, 21, 159, 10, 1, 220, 0, 7, 0, 154, 154);
+
+		scene->_item7._field34 = scene->_arrunkObj1337[2]._arr1[1]._field34;
+		
+		scene->_item2._object1.setStrip(scene->_arrunkObj1337[2]._arr1[1]._object1._strip);
+		scene->_item2._object1.setFrame(scene->_arrunkObj1337[2]._arr1[1]._object1._frame);
+		scene->_item2._object1.animate(ANIM_MODE_NONE, NULL);
+
+		scene->_arrunkObj1337[2]._arr1[1]._field34 = 0;
+		scene->_arrunkObj1337[2]._arr1[1]._object1.remove();
+
+		scene->_item2._object1.setPosition(scene->_arrunkObj1337[2]._arr1[1]._field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_item7._field36, this);
+		}
+		break;
+	case 11: {
+		scene->_item2._object1.hide();
+		scene->setAnimationInfo(&scene->_item7);
+		scene->_aSound2.play(61);
+		scene->_item2._object1.setStrip(5);
+		scene->_item2._object1.setFrame(1);
+		scene->_item2._object1.animate(ANIM_MODE_2, NULL);
+
+		R2_GLOBALS._sceneObjects->draw();
+		
+		scene->actionDisplay(1331, 22, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+
+		int i = -1;
+		for (i = 0; i <= 3; i ++) {
+			scene->_arrunkObj1337[3]._arr1[i]._field34 = 0;
+			scene->_arrunkObj1337[3]._arr1[i]._object1.remove();
+
+			scene->_arrunkObj1337[2]._arr1[i]._field34 = 0;
+			scene->_arrunkObj1337[2]._arr1[i]._object1.remove();
+
+			scene->_arrunkObj1337[0]._arr1[i]._field34 = 0;
+			scene->_arrunkObj1337[0]._arr1[i]._object1.remove();
+
+			scene->_arrunkObj1337[1]._arr1[i]._field34 = 0;
+			scene->_arrunkObj1337[1]._arr1[i]._object1.remove();
+		}
+
+		for (i = 0; i <= 7; i++) {
+			scene->_arrunkObj1337[3]._arr2[i]._field34 = 0;
+			scene->_arrunkObj1337[3]._arr2[i]._object1.remove();
+
+			scene->_arrunkObj1337[2]._arr2[i]._field34 = 0;
+			scene->_arrunkObj1337[2]._arr2[i]._object1.remove();
+
+			scene->_arrunkObj1337[0]._arr2[i]._field34 = 0;
+			scene->_arrunkObj1337[0]._arr2[i]._object1.remove();
+
+			scene->_arrunkObj1337[1]._arr2[i]._field34 = 0;
+			scene->_arrunkObj1337[1]._arr2[i]._object1.remove();
+		}
+
+		scene->_arrunkObj1337[2]._arr3[0]._field34 = 0;
+		scene->_arrunkObj1337[2]._arr3[0]._object1.remove();
+
+		scene->_item7._field34 = 0;
+		scene->_item7._object1.remove();
+
+		scene->_background2.remove();
+		}
+	// No break on purpose
+	case 0:
+		R2_GLOBALS._sceneObjects->draw();
+		signal();
+		break;
+	case 12:
+		scene->subCBB1E();
+		remove();
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1337::Action2::signal() {
+	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0:
+		scene->_item3._object1.postInit();
+		scene->_item3._object1.setVisage(1332);
+		scene->_item3._object1.setStrip(8);
+		scene->_item3._object1.setFrame(1);
+		scene->_item3._object1.fixPriority(300);
+		scene->_item3._object1.setPosition(Common::Point(156, 108));
+
+		scene->_item7._object1.remove();
+		scene->_item7._field34 = 0;
+		
+		scene->_aSound1.play(60);
+		scene->_item3._object1.animate(ANIM_MODE_5, this);
+		break;
+	case 1:
+		scene->_item3._object1.setFrame(1);
+		
+		scene->_aSound1.play(60);
+		scene->_item3._object1.animate(ANIM_MODE_5, this);
+		break;
+	case 2: {
+		Common::Point pt(156, 108);
+		NpcMover *mover = new NpcMover();
+		scene->_item3._object1.addMover(mover, &pt, this);
+		}
+		break;
+	case 3:
+		scene->_item3._object1.remove();
+		scene->_background2.setup2(1332, 5, 1, 162, 95, 110, 1);
+		scene->_field423C = 1;
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1337::Action3::signal() {
+	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
+
+	scene->_item2._object1.setPosition(Common::Point(162, 95), 0);
+	
+	switch (_actionIndex++) {
+	case 0: {
+		scene->_item2._object1._moveDiff = Common::Point(30, 30);
+		scene->_item2._object1.setVisage(1332);
+		scene->_item2._object1.setStrip(5);
+		scene->_item2._object1.setFrame(1);
+		scene->_item2._object1.fixPriority(400);
+		scene->_item2._object1.animate(ANIM_MODE_2, NULL);
+		scene->_aSound2.play(61);
+
+		Common::Point pt(283, 146);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+
+		scene->_item2._object1.show();
+		scene->_arrunkObj1337[1]._arr1[0]._field34 = scene->_field3E28[scene->_field3E24];
+		}
+		break;
+	case 1: {
+		scene->_arrunkObj1337[1]._arr1[0]._object1.postInit();
+		scene->_arrunkObj1337[1]._arr1[0]._object1._moveDiff = Common::Point(30, 30);
+		scene->_arrunkObj1337[1]._arr1[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[1]._arr1[0]._object1.setPosition(scene->_arrunkObj1337[1]._arr1[0]._field36, 0);
+		scene->_arrunkObj1337[1]._arr1[0]._object1.setStrip(1);
+		scene->_arrunkObj1337[1]._arr1[0]._object1.setFrame(4);
+		scene->_arrunkObj1337[1]._arr1[0]._object1.fixPriority(170);
+		scene->_aSound2.play(61);
+
+		Common::Point pt(10, 174);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+
+		scene->_arrunkObj1337[2]._arr1[0]._field34 = scene->_field3E28[scene->_field3E24];
+		}
+		break;
+	case 2: {
+		scene->_arrunkObj1337[2]._arr1[0]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr1[0]._object1._moveDiff = Common::Point(30, 30);
+		scene->_arrunkObj1337[2]._arr1[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr1[0]._object1.setPosition(scene->_arrunkObj1337[2]._arr1[0]._field36, 0);
+		scene->_arrunkObj1337[2]._arr1[0]._object1.fixPriority(170);
+		if (scene->_arrunkObj1337[2]._arr1[0]._field34 > 9) {
+			if (scene->_arrunkObj1337[2]._arr1[0]._field34 > 25) {
+				scene->_arrunkObj1337[2]._arr1[0]._object1.setStrip(4);
+				scene->_arrunkObj1337[2]._arr1[0]._object1.setFrame(scene->_arrunkObj1337[2]._arr1[0]._field34 - 25);
+			} else {
+				scene->_arrunkObj1337[2]._arr1[0]._object1.setStrip(3);
+				scene->_arrunkObj1337[2]._arr1[0]._object1.setFrame(scene->_arrunkObj1337[2]._arr1[0]._field34 - 9);
+			}
+		} else {
+			scene->_arrunkObj1337[2]._arr1[0]._object1.setStrip(2);
+			scene->_arrunkObj1337[2]._arr1[0]._object1.setFrame(scene->_arrunkObj1337[2]._arr1[0]._field34);
+		}
+		scene->_aSound2.play(61);
+
+		Common::Point pt(14, 14);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+
+		scene->_arrunkObj1337[3]._arr1[0]._field34 = scene->_field3E28[scene->_field3E24];
+		}
+		break;
+	case 3: {
+		scene->_arrunkObj1337[3]._arr1[0]._object1.postInit();
+		scene->_arrunkObj1337[3]._arr1[0]._object1._moveDiff = Common::Point(30, 30);
+		scene->_arrunkObj1337[3]._arr1[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[3]._arr1[0]._object1.setPosition(scene->_arrunkObj1337[3]._arr1[0]._field36, 0);
+		scene->_arrunkObj1337[3]._arr1[0]._object1.setStrip(1);
+		scene->_arrunkObj1337[3]._arr1[0]._object1.setFrame(3);
+		scene->_arrunkObj1337[3]._arr1[0]._object1.fixPriority(170);
+		scene->_aSound2.play(61);
+
+		Common::Point pt(280, 5);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+
+		scene->_arrunkObj1337[0]._arr1[0]._field34 = scene->_field3E28[scene->_field3E24];
+		}
+		break;
+	case 4: {
+		scene->_arrunkObj1337[0]._arr1[0]._object1.postInit();
+		scene->_arrunkObj1337[0]._arr1[0]._object1._moveDiff = Common::Point(30,30);
+		scene->_arrunkObj1337[0]._arr1[0]._object1.setVisage(1332);
+		scene->_arrunkObj1337[0]._arr1[0]._object1.setPosition(scene->_arrunkObj1337[0]._arr1[0]._field36, 0);
+		scene->_arrunkObj1337[0]._arr1[0]._object1.setStrip(5);
+		scene->_arrunkObj1337[0]._arr1[0]._object1.setFrame(1);
+		scene->_arrunkObj1337[0]._arr1[0]._object1.fixPriority(170);
+		scene->_aSound2.play(61);
+
+		Common::Point pt(283, 124);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+
+		scene->_arrunkObj1337[1]._arr1[1]._field34 = scene->_field3E28[scene->_field3E24];
+		}
+		break;
+	case 5: {
+		scene->_arrunkObj1337[1]._arr1[1]._object1.postInit();
+		scene->_arrunkObj1337[1]._arr1[1]._object1._moveDiff = Common::Point(30, 30);
+		scene->_arrunkObj1337[1]._arr1[1]._object1.setVisage(1332);
+		scene->_arrunkObj1337[1]._arr1[1]._object1.setPosition(scene->_arrunkObj1337[1]._arr1[1]._field36, 0);
+		scene->_arrunkObj1337[1]._arr1[1]._object1.setStrip(1);
+		scene->_arrunkObj1337[1]._arr1[1]._object1.setFrame(4);
+		scene->_arrunkObj1337[1]._arr1[1]._object1.fixPriority(170);
+		scene->_aSound2.play(61);
+
+		Common::Point pt(37, 174);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+
+		scene->_arrunkObj1337[2]._arr1[1]._field34 = scene->_field3E28[scene->_field3E24];
+		}
+		break;
+	case 6: {
+		scene->_arrunkObj1337[2]._arr1[1]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr1[1]._object1._moveDiff = Common::Point(30, 30);
+		scene->_arrunkObj1337[2]._arr1[1]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr1[1]._object1.setPosition(scene->_arrunkObj1337[2]._arr1[1]._field36, 0);
+		scene->_arrunkObj1337[2]._arr1[1]._object1.fixPriority(170);
+
+		if (scene->_arrunkObj1337[2]._arr1[1]._field34 > 9) {
+			if (scene->_arrunkObj1337[2]._arr1[1]._field34 > 25) {
+				scene->_arrunkObj1337[2]._arr1[1]._object1.setStrip(4);
+				scene->_arrunkObj1337[2]._arr1[1]._object1.setFrame(scene->_arrunkObj1337[2]._arr1[1]._field34 - 25);
+			} else {
+				scene->_arrunkObj1337[2]._arr1[1]._object1.setStrip(3);
+				scene->_arrunkObj1337[2]._arr1[1]._object1.setFrame(scene->_arrunkObj1337[2]._arr1[1]._field34 - 9);
+			}
+		} else {
+			scene->_arrunkObj1337[2]._arr1[1]._object1.setStrip(2);
+			scene->_arrunkObj1337[2]._arr1[1]._object1.setFrame(scene->_arrunkObj1337[2]._arr1[1]._field34);
+		}
+
+		scene->_aSound2.play(61);
+
+		Common::Point pt(14, 36);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+
+		scene->_arrunkObj1337[3]._arr1[1]._field34 = scene->_field3E28[scene->_field3E24];
+		}
+		break;
+	case 7: {
+		scene->_arrunkObj1337[3]._arr1[1]._object1.postInit();
+		scene->_arrunkObj1337[3]._arr1[1]._object1._moveDiff = Common::Point(30, 30);
+		scene->_arrunkObj1337[3]._arr1[1]._object1.setVisage(1332);
+		scene->_arrunkObj1337[3]._arr1[1]._object1.setPosition(scene->_arrunkObj1337[3]._arr1[1]._field36);
+		scene->_arrunkObj1337[3]._arr1[1]._object1.setStrip(1);
+		scene->_arrunkObj1337[3]._arr1[1]._object1.setFrame(3);
+		scene->_arrunkObj1337[3]._arr1[1]._object1.fixPriority(170);
+		scene->_aSound2.play(61);
+
+		Common::Point pt(253, 5);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+
+		scene->_arrunkObj1337[0]._arr1[1]._field34 = scene->_field3E28[scene->_field3E24];
+		}
+		break;
+	case 8: {
+		scene->_arrunkObj1337[0]._arr1[1]._object1.postInit();
+		scene->_arrunkObj1337[0]._arr1[1]._object1._moveDiff = Common::Point(30, 30);
+		scene->_arrunkObj1337[0]._arr1[1]._object1.setVisage(1332);
+		scene->_arrunkObj1337[0]._arr1[1]._object1.setPosition(scene->_arrunkObj1337[0]._arr1[1]._field36, 0);
+		scene->_arrunkObj1337[0]._arr1[1]._object1.setStrip(5);
+		scene->_arrunkObj1337[0]._arr1[1]._object1.setFrame(1);
+		scene->_arrunkObj1337[0]._arr1[1]._object1.fixPriority(170);
+		scene->_aSound2.play(61);
+		
+		Common::Point pt(283, 102);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+
+		scene->_arrunkObj1337[1]._arr1[2]._field34 = scene->_field3E28[scene->_field3E24];
+		}
+		break;
+	case 9: {
+		scene->_arrunkObj1337[1]._arr1[2]._object1.postInit();
+		scene->_arrunkObj1337[1]._arr1[2]._object1._moveDiff = Common::Point(30, 30);
+		scene->_arrunkObj1337[1]._arr1[2]._object1.setVisage(1332);
+		scene->_arrunkObj1337[1]._arr1[2]._object1.setPosition(scene->_arrunkObj1337[1]._arr1[2]._field36, 0);
+		scene->_arrunkObj1337[1]._arr1[2]._object1.setStrip(1);
+		scene->_arrunkObj1337[1]._arr1[2]._object1.setFrame(4);
+		scene->_arrunkObj1337[1]._arr1[2]._object1.fixPriority(170);
+		scene->_aSound2.play(61);
+		
+		Common::Point pt(64, 174);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+
+		scene->_arrunkObj1337[2]._arr1[2]._field34 = scene->_field3E28[scene->_field3E24];
+		}
+		break;
+	case 10: {
+		scene->_arrunkObj1337[2]._arr1[2]._object1.postInit();
+		scene->_arrunkObj1337[2]._arr1[2]._object1._moveDiff = Common::Point(30, 30);
+		scene->_arrunkObj1337[2]._arr1[2]._object1.setVisage(1332);
+		scene->_arrunkObj1337[2]._arr1[2]._object1.setPosition(scene->_arrunkObj1337[2]._arr1[2]._field36, 0);
+		scene->_arrunkObj1337[2]._arr1[2]._object1.fixPriority(170);
+
+		if (scene->_arrunkObj1337[2]._arr1[2]._field34 > 9) {
+			if (scene->_arrunkObj1337[2]._arr1[2]._field34 > 25) {
+				scene->_arrunkObj1337[2]._arr1[2]._object1.setStrip(4);
+				scene->_arrunkObj1337[2]._arr1[2]._object1.setFrame(scene->_arrunkObj1337[2]._arr1[2]._field34 - 25);
+			} else {
+				scene->_arrunkObj1337[2]._arr1[2]._object1.setStrip(3);
+				scene->_arrunkObj1337[2]._arr1[2]._object1.setFrame(scene->_arrunkObj1337[2]._arr1[2]._field34 - 9);
+			}
+		} else {
+			scene->_arrunkObj1337[2]._arr1[2]._object1.setStrip(2);
+			scene->_arrunkObj1337[2]._arr1[2]._object1.setFrame(scene->_arrunkObj1337[2]._arr1[2]._field34);
+		}
+
+		scene->_aSound2.play(61);
+
+		Common::Point pt(14, 58);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+
+		scene->_arrunkObj1337[3]._arr1[2]._field34 = scene->_field3E28[scene->_field3E24];
+		}
+		break;
+	case 11: {
+		scene->_arrunkObj1337[3]._arr1[2]._object1.postInit();
+		scene->_arrunkObj1337[3]._arr1[2]._object1._moveDiff = Common::Point(30, 30);
+		scene->_arrunkObj1337[3]._arr1[2]._object1.setVisage(1332);
+		scene->_arrunkObj1337[3]._arr1[2]._object1.setPosition(scene->_arrunkObj1337[3]._arr1[2]._field36, 0);
+		scene->_arrunkObj1337[3]._arr1[2]._object1.setStrip(1);
+		scene->_arrunkObj1337[3]._arr1[2]._object1.setFrame(3);
+		scene->_arrunkObj1337[3]._arr1[2]._object1.fixPriority(170);
+		scene->_aSound2.play(61);
+		
+		Common::Point pt(226, 5);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+
+		scene->_arrunkObj1337[0]._arr1[2]._field34 = scene->_field3E28[scene->_field3E24];
+		}
+		break;
+	case 12:
+		scene->_arrunkObj1337[0]._arr1[2]._object1.postInit();
+		scene->_arrunkObj1337[0]._arr1[2]._object1._moveDiff = Common::Point(30, 30);
+		scene->_arrunkObj1337[0]._arr1[2]._object1.setVisage(1332);
+		scene->_arrunkObj1337[0]._arr1[2]._object1.setPosition(scene->_arrunkObj1337[0]._arr1[2]._field36, 0);
+		scene->_arrunkObj1337[0]._arr1[2]._object1.setStrip(5);
+		scene->_arrunkObj1337[0]._arr1[2]._object1.setFrame(1);
+		scene->_arrunkObj1337[0]._arr1[2]._object1.fixPriority(170);
+		scene->_arrunkObj1337[0]._arr1[2]._object1.hide();
+	default:
+		break;
+	}
+	
+	if (_actionIndex > 12) {
+		scene->_field423E = 0;
+		R2_GLOBALS._sceneObjects->draw();
+		scene->actionDisplay(1330, 0, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		scene->subC20F9();
+	} else if (_actionIndex >= 1) {
+		scene->_field3E28[scene->_field3E24] = 0;
+		scene->_field3E24--;
+	}
+}
+
+void Scene1337::Action4::signal() {
+	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0:
+		if ((scene->_arrunkObj1337[scene->_field423E]._arr1[0]._field34 == 0) && (scene->subC264B(scene->_arrunkObj1337[scene->_field423E]._arr3[0]._field34))) {
+			if (scene->_field3E24 < 0)
+				scene->subC264B(scene->_arrunkObj1337[scene->_field423E]._arr3[0]._field34);
+			scene->_item2._object1.setPosition(Common::Point(162, 95), 0);
+			scene->_item2._object1.show();
+			scene->_aSound2.play(61);
+
+			NpcMover *mover = new NpcMover();
+			scene->_item2._object1.addMover(mover, scene->_arrunkObj1337[scene->_field423E]._fieldB94, this);
+
+			scene->_arrunkObj1337[scene->_field423E]._arr1[0]._field34 = scene->_field3E28[scene->_field3E24];
+			scene->_field3E28[scene->_field3E24] = 0;
+			scene->_field3E24--;
+			
+			if (scene->_field3E24 < 0)
+				scene->_background2.remove(); 
+		} else {
+			// Self call, forcing next actionIndex
+			signal();
+		}
+		break;
+	case 1:
+		if ( ( scene->_item2._object1._position.x == scene->_arrunkObj1337[scene->_field423E]._fieldB94.x)
+			&& ( scene->_item2._object1._position.y == scene->_arrunkObj1337[scene->_field423E]._fieldB94.y) ) {
+			scene->_arrunkObj1337[scene->_field423E]._arr1[0]._object1.postInit();
+			scene->_arrunkObj1337[scene->_field423E]._arr1[0]._object1._moveDiff = Common::Point(30, 30);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[0]._object1.setVisage(1332);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[0]._object1.setPosition(scene->_arrunkObj1337[scene->_field423E]._arr1[0]._field36, 0);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[0]._object1.setStrip(1);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[0]._object1.setFrame(scene->_arrunkObj1337[scene->_field423E]._fieldBA4);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[0]._object1.fixPriority(170);
+		}
+
+		if ((scene->_field4248 == 1) || (scene->_field423E == 2))
+			scene->setAnimationInfo(&scene->_arrunkObj1337[scene->_field423E]._arr1[0]);
+			
+		scene->_item2._object1.hide();
+		if ((scene->_arrunkObj1337[scene->_field423E]._arr1[0]._field34 == 0) && (scene->subC264B(scene->_arrunkObj1337[scene->_field423E]._arr3[0]._field34 == 0))) {
+			if (scene->_field3E24 < 0)
+				scene->subCBB7B();
+			scene->_item2._object1.setPosition(Common::Point(162, 95));
+			scene->_item2._object1.show();
+
+			scene->_aSound2.play(61);
+
+			NpcMover *mover = new NpcMover();
+			scene->_item2._object1.addMover(mover, &scene->_arrunkObj1337[scene->_field423E]._fieldB98, this);
+			
+			scene->_arrunkObj1337[scene->_field423E]._arr1[1]._field34 = scene->_field3E28[scene->_field3E24];
+			scene->_field3E28[scene->_field3E24] = 0;
+			scene->_field3E24--;
+			if (scene->_field3E24 < 0)
+				scene->_background2.remove();
+		} else
+			signal();
+		break;
+	case 2:
+		if ( ( scene->_item2._object1._position.x == scene->_arrunkObj1337[scene->_field423E]._fieldB98.x)
+			&& ( scene->_item2._object1._position.y == scene->_arrunkObj1337[scene->_field423E]._fieldB98.y) ) {
+			scene->_arrunkObj1337[scene->_field423E]._arr1[1]._object1.postInit();
+			scene->_arrunkObj1337[scene->_field423E]._arr1[1]._object1._moveDiff = Common::Point(30, 30);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[1]._object1.setVisage(1332);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[1]._object1.setPosition(scene->_arrunkObj1337[scene->_field423E]._arr1[1]._field36, 0);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[1]._object1.setStrip(1);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[1]._object1.setFrame(scene->_arrunkObj1337[scene->_field423E]._fieldBA4);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[1]._object1.fixPriority(170);
+		}
+
+		if ((scene->_field4248 == 1) || (scene->_field423E == 2))
+			scene->setAnimationInfo(&scene->_arrunkObj1337[scene->_field423E]._arr1[1]);
+			
+		scene->_item2._object1.hide();
+		if ((scene->_arrunkObj1337[scene->_field423E]._arr1[2]._field34 == 0) && (scene->subC264B(scene->_arrunkObj1337[scene->_field423E]._arr3[0]._field34 == 0))) {
+			if (scene->_field3E24 < 0)
+				scene->subCBB7B();
+			scene->_item2._object1.setPosition(Common::Point(162, 95));
+			scene->_item2._object1.show();
+
+			scene->_aSound2.play(61);
+
+			NpcMover *mover = new NpcMover();
+			scene->_item2._object1.addMover(mover, &scene->_arrunkObj1337[scene->_field423E]._fieldB9C, this);
+			
+			scene->_arrunkObj1337[scene->_field423E]._arr1[2]._field34 = scene->_field3E28[scene->_field3E24];
+			scene->_field3E28[scene->_field3E24] = 0;
+			scene->_field3E24--;
+			if (scene->_field3E24 < 0)
+				scene->_background2.remove();
+		} else
+			signal();
+		break;
+	case 3:
+		if ( ( scene->_item2._object1._position.x == scene->_arrunkObj1337[scene->_field423E]._fieldB9C.x)
+			&& ( scene->_item2._object1._position.y == scene->_arrunkObj1337[scene->_field423E]._fieldB9C.y) ) {
+			scene->_arrunkObj1337[scene->_field423E]._arr1[2]._object1.postInit();
+			scene->_arrunkObj1337[scene->_field423E]._arr1[2]._object1._moveDiff = Common::Point(30, 30);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[2]._object1.setVisage(1332);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[2]._object1.setPosition(scene->_arrunkObj1337[scene->_field423E]._arr1[2]._field36, 0);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[2]._object1.setStrip(1);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[2]._object1.setFrame(scene->_arrunkObj1337[scene->_field423E]._fieldBA4);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[2]._object1.fixPriority(170);
+		}
+
+		if ((scene->_field4248 == 1) || (scene->_field423E == 2))
+			scene->setAnimationInfo(&scene->_arrunkObj1337[scene->_field423E]._arr1[2]);
+			
+		scene->_item2._object1.hide();
+		if ((scene->_arrunkObj1337[scene->_field423E]._arr1[3]._field34 == 0) && (scene->subC264B(scene->_arrunkObj1337[scene->_field423E]._arr3[0]._field34 == 0))) {
+			if (scene->_field3E24 < 0)
+				scene->subCBB7B();
+			scene->_item2._object1.setPosition(Common::Point(162, 95));
+			scene->_item2._object1.show();
+
+			scene->_aSound2.play(61);
+
+			NpcMover *mover = new NpcMover();
+			scene->_item2._object1.addMover(mover, &scene->_arrunkObj1337[scene->_field423E]._fieldBA0, this);
+			
+			scene->_arrunkObj1337[scene->_field423E]._arr1[3]._field34 = scene->_field3E28[scene->_field3E24];
+			scene->_field3E28[scene->_field3E24] = 0;
+			scene->_field3E24--;
+			if (scene->_field3E24 < 0)
+				scene->_background2.remove();
+		} else
+			signal();
+		break;
+	case 4:
+		if ( ( scene->_item2._object1._position.x == scene->_arrunkObj1337[scene->_field423E]._fieldBA0.x)
+			&& ( scene->_item2._object1._position.y == scene->_arrunkObj1337[scene->_field423E]._fieldBA0.y) ) {
+			scene->_arrunkObj1337[scene->_field423E]._arr1[3]._object1.postInit();
+			scene->_arrunkObj1337[scene->_field423E]._arr1[3]._object1._moveDiff = Common::Point(30, 30);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[3]._object1.setVisage(1332);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[3]._object1.setPosition(scene->_arrunkObj1337[scene->_field423E]._arr1[3]._field36, 0);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[3]._object1.setStrip(1);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[3]._object1.setFrame(scene->_arrunkObj1337[scene->_field423E]._fieldBA4);
+			scene->_arrunkObj1337[scene->_field423E]._arr1[3]._object1.fixPriority(170);
+		}
+
+		if ((scene->_field4248 == 1) || (scene->_field423E == 2))
+			scene->setAnimationInfo(&scene->_arrunkObj1337[scene->_field423E]._arr1[3]);
+			
+		scene->_item2._object1.hide();
+		switch (scene->_field423E) {
+		case 0:
+			scene->subCF979();
+			break;
+		case 1:
+			scene->subCF31D();
+			break;
+		case 2:
+			scene->subD0281();
+			break;
+		case 3:
+			scene->subC2C2F();
+			break;
+		default:
+			break;
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1337::Action5::signal() {
+	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0: {
+		scene->_field3E28[scene->_field3E26] = scene->_field3EF0->_field34;
+		scene->_field3E26--;
+		if (!g_globals->_sceneObjects->contains(&scene->_item7._object1)) {
+			scene->_item7._object1.postInit();
+			scene->_item7._object1.hide();
+			scene->_item7._object1.setVisage(1332);
+			scene->_item7._object1.setPosition(scene->_item7._field36, 0);
+			scene->_item7._object1.fixPriority(170);
+		}
+		
+		scene->_item7._field34 = scene->_field3EF0->_field34;
+		scene->_field3EF0->_field34 = 0;
+		scene->_field3EF0->_object1.remove();
+
+		if (scene->_field3EF0 == &scene->_item6) {
+			subD18B5(5, 1, 4);
+			scene->subC4CEC();
+		}
+		scene->_item2._object1.setPosition(scene->_field3EF0->_field36, 0);
+		scene->_item2._object1.show();
+		Common::Point pt(128, 95);
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &pt, this);
+		}
+		break;
+	case 1:
+		scene->_item2._object1.hide();
+		scene->setAnimationInfo(&scene->_item7);
+		scene->_aSound2.play(61);
+		scene->subC20F9();
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1337::Action6::signal() {
+	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0: {
+		scene->_field3EF4->_field34 = 1;
+		scene->_field3EF4->_object1.postInit();
+		scene->_field3EF4->_object1.hide();
+		scene->_field3EF4->_object1.setVisage(1332);
+		scene->_field3EF4->_object1.setPosition(scene->_field3EF4->_field36);
+		scene->_field3EF4->_object1.fixPriority(170);
+
+		scene->_field3EF0->_field34 = 0;
+		scene->_field3EF0->_object1.remove();
+
+		scene->_item2._object1.setPosition(scene->_field3EF0->_field36);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_field3EF4->_field36, this);
+		}
+		break;
+	case 1:
+		scene->_item2._object1.hide();
+		scene->setAnimationInfo(scene->_field3EF4);
+		scene->_aSound1.play(59);
+		if (scene->_field3EF0 == &scene->_item6) {
+			subD18B5(5, 1, 4);
+			scene->subC4CEC();
+		}
+		scene->subC20F9();
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1337::Action7::signal() {
+	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0: {
+		scene->_field3EF4->_field34 = scene->_field3EF0->_field34;
+
+		scene->_field3EF0->_field34 = 0;
+		scene->_field3EF0->_object1.remove();
+
+		scene->_item2._object1.setPosition(scene->_field3EF0->_field36, 0);
+		scene->_item2._object1.show();
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_field3EF4->_field36, this);
+		}
+		break;
+	case 1:
+		if (scene->_field3EF0 == &scene->_item6) {
+			subD18B5(5, 1, 4);
+			scene->subC4CEC();
+		}
+		scene->setAnimationInfo(scene->_field3EF4);
+		scene->_aSound1.play(59);
+		scene->_item5._field34 = 1;
+		scene->_item5._field36.x = scene->_field3EF4->_field36.x;
+		scene->_item5._field36.y = scene->_field3EF4->_field36.y;
+		scene->_item5._object1.postInit();
+		scene->_item5._object1.hide();
+		scene->_item5._object1._flags = 0x200;
+
+		scene->subC4A39(&scene->_item5);
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1337::Action8::signal() {
+	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0: {
+		scene->_field3E28[scene->_field3E26] = scene->_field3EF4->_field34;
+		scene->_field3E26--;
+
+		scene->_field3EF4->_field34 = scene->_field3EF0->_field34;
+		scene->_field3EF0->_object1.remove();
+
+		scene->_item2._object1.setPosition(scene->_field3EF0->_field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_field3EF4->_field36, this);
+		}
+		break;
+	case 1:
+		scene->_item2._object1.hide();
+
+		if (scene->_field3EF0 == &scene->_item6) {
+			subD18B5(5, 1, 4);
+			scene->subC4CEC();
+		}
+		scene->setAnimationInfo(scene->_field3EF4);
+		scene->_aSound1.play(58);
+		scene->subC4A39(scene->_field3EF4);
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1337::Action9::signal() {
+	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0: {
+		scene->_field3EF4->_field34 = scene->_field3EF0->_field34;
+		scene->_field3EF4->_object1.postInit();
+		scene->_field3EF4->_object1.hide();
+		scene->_field3EF4->_object1.setVisage(1332);
+		scene->_field3EF4->_object1.setPosition(scene->_field3EF4->_field36, 0);
+		scene->_field3EF4->_object1.fixPriority(170);
+
+		scene->_field3EF0->_field34 = 0;
+		scene->_field3EF0->_object1.remove();
+
+		scene->_item2._object1.setPosition(scene->_field3EF0->_field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_field3EF4->_field36, this);
+		}
+		break;
+	case 1:
+		scene->_item2._object1.hide();
+		scene->setAnimationInfo(scene->_field3EF4);
+		scene->_aSound1.play(57);
+
+		if (scene->_field3EF0 == &scene->_item6) {
+			subD18B5(5, 1, 4);
+			scene->subC4CEC();
+		}
+		
+		scene->subC20F9();
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1337::Action10::signal() {
+	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0: {
+		scene->_field3EF8->_object1.postInit();
+		scene->_field3EF8->_object1.hide();
+		scene->_field3EF8->_object1.setVisage(1332);
+		scene->_field3EF8->_object1.setPosition(scene->_field3EF8->_field36, 0);
+		scene->_field3EF8->_object1.fixPriority(170);
+		scene->_field3EF8->_field34 = scene->_field3EF0->_field34;
+
+		scene->_field3EF0->_field34 = 0;
+		scene->_field3EF0->_object1.remove();
+
+		if (scene->_field3EF0 == &scene->_item6) {
+			subD18B5(5, 1, 4);
+			scene->subC4CEC();
+		}
+
+		scene->_item2._object1.setPosition(scene->_field3EF0->_field36, 0);
+		scene->_item2._object1.show();
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_field3EF8->_field36, this);
+		}
+		break;
+	case 1: {
+		scene->_item2._object1.hide();
+		scene->setAnimationInfo(scene->_field3EF8);
+		scene->_aSound1.play(57);
+
+		bool found = false;
+		int indexFound = -1;
+
+		switch (scene->_field4240) {
+		case 0:
+			for (indexFound = 0; indexFound < 3; indexFound++) {
+				if (scene->_arrunkObj1337[0]._arr1[indexFound]._field34 == 29) {
+					found = true;
+					break;
+				} 
+			}
+			break;
+		case 1:
+			for (indexFound = 0; indexFound < 3; indexFound++) {
+				if (scene->_arrunkObj1337[1]._arr1[indexFound]._field34 == 29) {
+					found = true;
+					break;
+				} 
+			}
+			break;
+		case 2:
+			for (indexFound = 0; indexFound < 3; indexFound++) {
+				if (scene->_arrunkObj1337[2]._arr1[indexFound]._field34 == 29) {
+					found = true;
+					break;
+				} 
+			}
+			break;
+		case 3:
+			for (indexFound = 0; indexFound < 3; indexFound++) {
+				if (scene->_arrunkObj1337[3]._arr1[indexFound]._field34 == 29) {
+					found = true;
+					break;
+				} 
+			}
+			break;
+		default:
+			break;
+		}
+
+		bool found2 = false;
+
+		if (found) {
+			switch (scene->_field4240) {
+			case 0:
+				scene->subC51A0(&scene->_arrunkObj1337[0]._arr1[indexFound], scene->_field3EF8);
+				found2 = true;
+				break;
+			case 1:
+				scene->subC51A0(&scene->_arrunkObj1337[1]._arr1[indexFound], scene->_field3EF8);
+				found2 = true;
+				break;
+			case 2:
+				scene->subC4CD2();
+				if (MessageDialog::show(USE_INTERCEPTOR, NO_MSG, YES_MSG) == 0)
+					scene->subC4CEC();
+				else {			
+					scene->subC51A0(&scene->_arrunkObj1337[2]._arr1[indexFound], scene->_field3EF8);
+					found2 = true;
+				}
+				break;
+			case 3:
+				scene->subC51A0(&scene->_arrunkObj1337[3]._arr1[indexFound], scene->_field3EF8);
+				found2 = true;
+				break;
+			default:
+				break;
+			}
+		}
+
+		if (!found2)
+			break;
+
+		if (scene->_field4240 == 2) {
+			int j = 0;
+			for (int i = 0; i <= 7; i++) {
+				if (scene->_arrunkObj1337[2]._arr2[i]._field34 != 0)
+					++j;
+			}
+			
+			if (j <= 1) {
+				for (int i = 0; i <= 7; i++) {
+					if (scene->_arrunkObj1337[2]._arr2[i]._field34 != 0) {
+						scene->_field3EF4 = &scene->_arrunkObj1337[2]._arr2[i];
+						break;
+					}
+				}
+			} else {
+				scene->subC4CD2();
+				
+				found2 = false;
+				while (!found2) {
+					scene->actionDisplay(1330, 130, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+					
+					// Wait for a mouse or keypress
+					Event event;
+					while (!g_globals->_events.getEvent(event, EVENT_BUTTON_DOWN | EVENT_KEYPRESS) && !g_vm->shouldQuit()) {
+						g_globals->_scenePalette.signalListeners();
+						R2_GLOBALS._sceneObjects->draw();
+						g_globals->_events.delay(g_globals->_sceneHandler->_delayTicks);
+					}
+	
+					scene->_item6._field36 = event.mousePos;
+	
+					for (int i = 0; i <= 7; i++) {
+						if ((scene->subC2BF8(&scene->_arrunkObj1337[2]._arr2[i], &scene->_item6._field36) != 0) && (scene->_arrunkObj1337[2]._arr2[i]._field34 != 0)) {
+							scene->_field3EF4 = &scene->_arrunkObj1337[2]._arr2[0];
+							found2 = true;
+							break;
+						}
+					}
+				}
+				scene->subC4CEC();
+			}
+		}
+		
+		scene->_field3E28[scene->_field3E26] = scene->_field3EF4->_field34;
+		scene->_field3E26--;
+		scene->_field3EF4->_field34 = 0;
+		scene->_field3EF4->_object1.remove();
+		
+		scene->_item2._object1.setPosition(scene->_field3EF4->_field36, 0);
+		scene->_item2._object1.show();
+		
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_field3EF8->_field36, this);
+		}
+		break;
+	case 2:
+		scene->_item2._object1.hide();
+		scene->subC4A39(scene->_field3EF8);
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1337::Action11::signal() {
+	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
+
+	bool noAction = true;
+
+	switch (_actionIndex++) {
+	case 0: {
+		scene->_field3EF4->_object1.postInit();
+		scene->_field3EF4->_object1.hide();
+		scene->_field3EF4->_object1.setVisage(1332);
+		scene->_field3EF4->_object1.setPosition(scene->_field3EF4->_field36, 0);
+		scene->_field3EF4->_object1.fixPriority(170);
+		scene->_field3EF4->_field34 = 25;
+		
+		if (scene->_field4240 == 2) {
+			scene->_item2._object1.setPosition(scene->_field3EF4->_field36, 0);
+			subD18B5(5, 1, 4);
+		} else {
+			scene->_field3EF0->_field34 = 0;
+			scene->_field3EF0->_object1.remove();
+			scene->_item2._object1.setPosition(scene->_field3EF0->_field36, 0);
+		}
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_field3EF4->_field36, this);
+		}
+		break;
+	case 1: {
+		scene->_item2._object1.hide();
+		scene->setAnimationInfo(scene->_field3EF4);
+		scene->_aSound1.play(57);
+
+		bool found = false;
+		int i = -1;
+
+		switch (scene->_field4242) {
+		case 0:
+			for (i = 0; i <= 3; i++) {
+				if (scene->_arrunkObj1337[0]._arr1[i]._field34 == 27) {
+					found = true;
+					break;
+				}
+			}
+
+			if ((found) && (scene->subC3E92(scene->_field4240) != -1)) {
+				scene->_field3EF0 = &scene->_arrunkObj1337[0]._arr1[i];
+				scene->_field3EF4 = &scene->_arrunkObj1337[0]._arr4[0];
+				if (scene->_field4240 != 0) {
+					int tmpVal = scene->subC3E92(scene->_field4240);
+					scene->_field3EF8 = &scene->_arrunkObj1337[scene->_field4240]._arr1[tmpVal];
+				}
+				scene->_item1.setAction(&scene->_action12);
+				noAction = false;
+			}
+			break;
+		case 1:
+			for (i = 0; i <= 3; i++) {
+				if (scene->_arrunkObj1337[1]._arr1[i]._field34 == 27) {
+					found = true;
+					break;
+				}
+			}
+
+			if ((found) && (scene->subC3E92(scene->_field4240) != -1)) {
+				scene->_field3EF0 = &scene->_arrunkObj1337[1]._arr1[i];
+				scene->_field3EF4 = &scene->_arrunkObj1337[1]._arr4[0];
+				if (scene->_field4240 != 1) {
+					int tmpVal = scene->subC3E92(scene->_field4240);
+					scene->_field3EF8 = &scene->_arrunkObj1337[scene->_field4240]._arr1[tmpVal];
+				}
+				scene->_item1.setAction(&scene->_action12);
+				noAction = false;
+			}
+			break;
+		case 2:
+			for (i = 0; i <= 3; i++) {
+				if (scene->_arrunkObj1337[2]._arr1[i]._field34 == 27) {
+					found = true;
+					break;
+				}
+			}
+			
+			if ((found) && (scene->subC3E92(scene->_field4240) != -1)) {
+				scene->subC4CD2();
+				if (MessageDialog::show(USE_DOUBLE_AGENT, NO_MSG, YES_MSG) == 0)
+					scene->subC4CEC();
+				else {
+					scene->subC4CEC();
+					scene->_field3EF0 = &scene->_arrunkObj1337[2]._arr1[i];
+					scene->_field3EF4 = &scene->_arrunkObj1337[2]._arr4[0];
+					if (scene->_field4240 != 2) {
+						int tmpVal = scene->subC3E92(scene->_field4240);
+						scene->_field3EF8 = &scene->_arrunkObj1337[scene->_field4240]._arr1[tmpVal];
+					}
+					scene->_item1.setAction(&scene->_action12);
+					noAction = false;
+				}
+			}
+			break;
+		case 3:
+			for (i = 0; i <= 3; i++) {
+				if (scene->_arrunkObj1337[3]._arr1[i]._field34 == 27) {
+					found = true;
+					break;
+				}
+			}
+
+			if ((found) && (scene->subC3E92(scene->_field4240) != -1)) {
+				scene->_field3EF0 = &scene->_arrunkObj1337[3]._arr1[i];
+				scene->_field3EF4 = &scene->_arrunkObj1337[3]._arr4[0];
+				if (scene->_field4240 != 3) {
+					int tmpVal = scene->subC3E92(scene->_field4240);
+					scene->_field3EF8 = &scene->_arrunkObj1337[scene->_field4240]._arr1[tmpVal];
+				}
+				scene->_item1.setAction(&scene->_action12);
+				noAction = false;
+			}
+			break;
+		default:
+			break;
+		}
+		
+		if (!noAction)
+			return;
+
+		if (scene->_field4240 == 2) {
+			int count = 0;
+			if (scene->_field4242 != 2) {
+				for (i = 0; i <= 3; i++) {
+					if (scene->_arrunkObj1337[scene->_field4242]._arr1[i]._field34 == 0)
+						++count;
+				}
+			}
+
+			if (count > 1) {
+				scene->subC4CD2();
+
+				found = false;
+				while (!found) {
+					switch (scene->_field4242) {
+					case 0:
+						scene->actionDisplay(1330, 131, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+						break;
+					case 1:
+						scene->actionDisplay(1330, 132, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+						break;
+					case 3:
+						scene->actionDisplay(1330, 133, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+						break;
+					default:
+						break;
+					}
+
+					Event event;
+					while (!g_globals->_events.getEvent(event, EVENT_BUTTON_DOWN | EVENT_KEYPRESS) && !g_vm->shouldQuit()) {
+						g_globals->_scenePalette.signalListeners();
+						R2_GLOBALS._sceneObjects->draw();
+						g_globals->_events.delay(g_globals->_sceneHandler->_delayTicks);
+					}
+					
+					scene->_item6._field36 = event.mousePos;
+					
+					found = false;
+
+					if (scene->_field4242 != 2) {
+						for (i = 0; i <= 3; i++) {
+							if ((scene->subC2BF8(&scene->_arrunkObj1337[scene->_field4242]._arr1[i], &scene->_item6._field36) != 0) && (scene->_arrunkObj1337[scene->_field4242]._arr1[i]._field34 != 0)) {
+								scene->_field3EF8 = &scene->_arrunkObj1337[scene->_field4242]._arr1[i];
+								found = true;
+								break;
+							}
+						}
+					}
+				} // while
+				scene->_field4246 = 1;
+				scene->subC4CEC();
+			} else {
+				if (scene->_field4242 != 2) {
+					int tmpVal = scene->subC3E92(scene->_field4242);
+					scene->_field3EF8 = &scene->_arrunkObj1337[scene->_field4242]._arr1[tmpVal];
+				}
+			}
+		}
+
+		scene->_field3EF0->_object1.postInit();
+		scene->_field3EF0->_object1.hide();
+		scene->_field3EF0->_object1.setVisage(1332);
+		scene->_field3EF0->_object1.setPosition(scene->_field3EF0->_field36, 0);
+		scene->_field3EF0->_object1.fixPriority(170);
+		scene->_field3EF0->_object1.setStrip2(1);
+		scene->_field3EF0->_field34 = scene->_field3EF8->_field34;
+
+		scene->_field3EF8->_field34 = 0;
+		scene->_field3EF8->_object1.remove();
+
+		scene->_item2._object1.setPosition(scene->_field3EF8->_field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_field3EF0->_field36, this);
+		}
+		break;
+	case 2:
+		scene->_item2._object1.hide();
+		switch (scene->_field4240) {
+		case 0:
+			scene->_field3EF0->_object1.setFrame(2);
+			scene->_field3EF0->_object1.show();
+			scene->_field423E--;
+			scene->_field4244 = 0;
+			break;
+		case 1:
+			scene->_field3EF0->_object1.setFrame(4);
+			scene->_field3EF0->_object1.show();
+			scene->_field423E--;
+			scene->_field4244 = 0;
+			break;
+		case 3:
+			scene->_field3EF0->_object1.setFrame(3);
+			scene->_field3EF0->_object1.show();
+			scene->_field423E--;
+			scene->_field4244 = 0;
+			break;
+		default:
+			scene->setAnimationInfo(scene->_field3EF0);
+			break;
+		}
+			
+		scene->subC4A39(scene->_field3EF4);
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1337::Action12::signal() {
+	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0:
+		signal();
+		break;
+	case 1: {
+		scene->_field3E28[scene->_field3E26] = scene->_field3EF4->_field34;
+		scene->_field3EF4->_field34 = scene->_field3EF0->_field34;
+		scene->_field3EF0->_field34 = 0;
+		scene->_field3EF0->_object1.remove();
+		scene->_item2._object1.setPosition(scene->_field3EF0->_field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_field3EF4->_field36, this);
+		}
+		break;
+	case 2:
+		scene->_item2._object1.hide();
+		scene->setAnimationInfo(scene->_field3EF4);
+		scene->_aSound1.play(58);
+		if (scene->_field4242 == 2) {
+			int count = 0;
+			int i = -1;
+			switch (scene->_field4240) {
+			case 0:
+				for (i = 0; i <= 3; i++) {
+					if (scene->_arrunkObj1337[0]._arr1[i]._field34 != 0)
+						++count;
+				}
+				break;
+			case 1:
+				for (i = 0; i <= 3; i++) {
+					if (scene->_arrunkObj1337[3]._arr1[i]._field34 != 0)
+						++count;
+				}
+				break;
+			case 3:
+				for (i = 0; i <= 3; i++) {
+					if (scene->_arrunkObj1337[3]._arr1[i]._field34 != 0)
+						++count;
+				}
+				break;
+			default:
+				break;
+			}
+
+			if (count > 1) {
+				scene->subC4CD2();
+
+				bool found = false;
+				
+				while (!found) {
+					switch (scene->_field4240) {
+					case 0:
+						scene->actionDisplay(1330, 131, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+						break;
+					case 1:
+						scene->actionDisplay(1330, 132, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+						break;
+					case 3:
+						scene->actionDisplay(1330, 133, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+						break;
+					default:
+						break;
+					}
+
+					Event event;
+					while (!g_globals->_events.getEvent(event, EVENT_BUTTON_DOWN | EVENT_KEYPRESS) && !g_vm->shouldQuit()) {
+						g_globals->_scenePalette.signalListeners();
+						R2_GLOBALS._sceneObjects->draw();
+						g_globals->_events.delay(g_globals->_sceneHandler->_delayTicks);
+					}
+					
+					scene->_item6._field36 = event.mousePos;
+
+					if (scene->_field4240 == 0) {
+						for (i = 0; i <= 3; i++) {
+							if ((scene->subC2BF8(&scene->_arrunkObj1337[0]._arr1[i], &scene->_item6._field36) != 0) && (scene->_arrunkObj1337[0]._arr1[i]._field34 != 0)) {
+								found = true;
+								scene->_field3EF8 = &scene->_arrunkObj1337[0]._arr1[i];
+								break;
+							}
+						}
+					}
+					
+					if (scene->_field4240 == 3) {
+						for (i = 0; i <= 3; i++) {
+							if ((scene->subC2BF8(&scene->_arrunkObj1337[3]._arr1[i], &scene->_item6._field36) != 0) && (scene->_arrunkObj1337[3]._arr1[i]._field34 != 0)) {
+								found = true;
+								scene->_field3EF8 = &scene->_arrunkObj1337[3]._arr1[i];
+								break;
+							}
+						}
+					}
+
+					if (scene->_field4240 == 1) {
+						for (i = 0; i <= 3; i++) {
+							if ((scene->subC2BF8(&scene->_arrunkObj1337[1]._arr1[i], &scene->_item6._field36) != 0) && (scene->_arrunkObj1337[1]._arr1[i]._field34 != 0)) {
+								found = true;
+								scene->_field3EF8 = &scene->_arrunkObj1337[1]._arr1[i];
+								break;
+							}
+						}
+					}
+				}
+				scene->subC4CEC();
+			} else {
+				if (scene->_field4240 != 1) {
+					switch (scene->_field4240) {
+					case 0:
+						scene->_field3EF8 = &scene->_arrunkObj1337[0]._arr1[scene->subC3E92(0)];
+						break;
+					case 3:
+						scene->_field3EF8 = &scene->_arrunkObj1337[3]._arr1[scene->subC3E92(3)];
+						break;
+					default:
+						break;
+					}
+				} else {
+					scene->_field3EF8 = &scene->_arrunkObj1337[1]._arr1[scene->subC3E92(1)];
+				}
+			}
+
+			scene->_field3EF0->_object1.postInit();
+			scene->_field3EF0->_object1.hide();
+			scene->_field3EF0->_object1.setVisage(1332);
+			scene->_field3EF0->_object1.setPosition(scene->_field3EF0->_field36);
+			scene->_field3EF0->_object1.fixPriority(170);
+			scene->_field3EF0->_object1.setStrip2(1);
+			scene->_field3EF0->_field34 = scene->_field3EF8->_field34;
+
+			scene->_field3EF8->_field34 = 0;
+			scene->_field3EF8->_object1.remove();
+
+			scene->_item2._object1.setPosition(scene->_field3EF8->_field36);
+			scene->_item2._object1.show();
+			scene->_aSound1.play(57);
+
+			NpcMover *mover = new NpcMover();
+			scene->_item2._object1.addMover(mover, &scene->_field3EF0->_field36, this);
+		}
+		break;
+	case 3:
+		scene->_item2._object1.hide();
+		switch (scene->_field4242) {
+		case 0:
+			scene->_field3EF0->_object1.setFrame2(2);
+			scene->_field3EF0->_object1.show();
+			break;
+		case 1:
+			scene->_field3EF0->_object1.setFrame2(4);
+			scene->_field3EF0->_object1.show();
+			break;
+		case 3:
+			scene->_field3EF0->_object1.setFrame2(3);
+			scene->_field3EF0->_object1.show();
+			break;
+		default:
+			scene->setAnimationInfo(scene->_field3EF0);
+			break;
+		}
+		scene->subC4A39(scene->_field3EF4);
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1337::Action13::signal() {
+	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
+
+	switch (_actionIndex++) {
+	case 0: {
+		scene->_field3E28[scene->_field3E26] = scene->_field3EF4->_field34;
+		scene->_field3E26--;
+
+		scene->_field3EF4->_field34 = scene->_field3EF0->_field34;
+
+		scene->_field3EF0->_field34 = 0;
+		scene->_field3EF0->_object1.remove();
+
+		scene->_item2._object1.setPosition(scene->_field3EF0->_field36, 0);
+		scene->_item2._object1.show();
+
+		NpcMover *mover = new NpcMover();
+		scene->_item2._object1.addMover(mover, &scene->_field3EF4->_field36, this);
+		}
+		break;
+	case 1:
+		scene->_item2._object1.hide();
+		scene->setAnimationInfo(scene->_field3EF4);
+		scene->_aSound1.play(58);
+		signal();
+		break;
+	case 2:
+		scene->subC4A39(scene->_field3EF4);
+		break;
+	default:
+		break;
+	}
+}
+
+void Scene1337::postInit(SceneObjectList *OwnerList) {
+// In the original, may be found in subPostInit.
+// Without it, enableControl asserts
+	loadScene(1330);
+	SceneExt::postInit();
+//
+
+	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._player.enableControl();
+	R2_GLOBALS._player._canWalk = false;
+
+	_unkFctPtr412 = NULL;
+
+	_field3EF0 = NULL;
+	_field3EF4 = NULL;
+	_field3EF8 = NULL;
+
+	_arrunkObj1337[2]._arr1[0]._field36 = Common::Point(10, 174);
+	_arrunkObj1337[2]._arr1[1]._field36 = Common::Point(37, 174);
+	_arrunkObj1337[2]._arr1[2]._field36 = Common::Point(64, 174);
+	_arrunkObj1337[2]._arr1[3]._field36 = Common::Point(91, 174);
+
+	_arrunkObj1337[2]._arr2[0]._field36 = Common::Point(119, 174);
+	_arrunkObj1337[2]._arr2[1]._field36 = Common::Point(119, 148);
+	_arrunkObj1337[2]._arr2[2]._field36 = Common::Point(119, 122);
+	_arrunkObj1337[2]._arr2[3]._field36 = Common::Point(145, 122);
+	_arrunkObj1337[2]._arr2[4]._field36 = Common::Point(171, 122);
+	_arrunkObj1337[2]._arr2[5]._field36 = Common::Point(171, 148);
+	_arrunkObj1337[2]._arr2[6]._field36 = Common::Point(171, 174);
+	_arrunkObj1337[2]._arr2[7]._field36 = Common::Point(145, 174);
+
+	_arrunkObj1337[2]._arr3[0]._field36 = Common::Point(199, 174);
+
+	_arrunkObj1337[2]._arr4[0]._field36 = Common::Point(145, 148);
+
+	_arrunkObj1337[2]._fieldB94 = Common::Point(10, 174);
+	_arrunkObj1337[2]._fieldB98 = Common::Point(37, 174);
+	_arrunkObj1337[2]._fieldB9C = Common::Point(64, 174);
+	_arrunkObj1337[2]._fieldBA0 = Common::Point(91, 174);
+	_arrunkObj1337[2]._fieldBA4 = 2;
+
+	_arrunkObj1337[3]._arr1[0]._field36 = Common::Point(14, 14);
+	_arrunkObj1337[3]._arr1[1]._field36 = Common::Point(14, 36);
+	_arrunkObj1337[3]._arr1[2]._field36 = Common::Point(14, 58);
+	_arrunkObj1337[3]._arr1[3]._field36 = Common::Point(14, 80);
+
+	_arrunkObj1337[3]._arr2[0]._field36 = Common::Point(37, 66);
+	_arrunkObj1337[3]._arr2[1]._field36 = Common::Point(63, 66);
+	_arrunkObj1337[3]._arr2[2]._field36 = Common::Point(89, 66);
+	_arrunkObj1337[3]._arr2[3]._field36 = Common::Point(89, 92);
+	_arrunkObj1337[3]._arr2[4]._field36 = Common::Point(89, 118);
+	_arrunkObj1337[3]._arr2[5]._field36 = Common::Point(63, 118);
+	_arrunkObj1337[3]._arr2[6]._field36 = Common::Point(37, 118);
+	_arrunkObj1337[3]._arr2[7]._field36 = Common::Point(37, 92);
+
+	_arrunkObj1337[3]._arr3[0]._field36 = Common::Point(37, 145);
+
+	_arrunkObj1337[3]._arr4[0]._field36 = Common::Point(63, 92);
+
+	_arrunkObj1337[3]._fieldB94 = Common::Point(14, 14);
+	_arrunkObj1337[3]._fieldB98 = Common::Point(14, 36);
+	_arrunkObj1337[3]._fieldB9C = Common::Point(14, 58);
+	_arrunkObj1337[3]._fieldBA0 = Common::Point(14, 80);
+	_arrunkObj1337[3]._fieldBA4 = 3;
+
+	_arrunkObj1337[0]._arr1[0]._field36 = Common::Point(280, 5);
+	_arrunkObj1337[0]._arr1[1]._field36 = Common::Point(253, 5);
+	_arrunkObj1337[0]._arr1[2]._field36 = Common::Point(226, 5);
+	_arrunkObj1337[0]._arr1[3]._field36 = Common::Point(199, 5);
+
+	_arrunkObj1337[0]._arr2[0]._field36 = Common::Point(171, 16);
+	_arrunkObj1337[0]._arr2[1]._field36 = Common::Point(171, 42);
+	_arrunkObj1337[0]._arr2[2]._field36 = Common::Point(171, 68);
+	_arrunkObj1337[0]._arr2[3]._field36 = Common::Point(145, 68);
+	_arrunkObj1337[0]._arr2[4]._field36 = Common::Point(119, 68);
+	_arrunkObj1337[0]._arr2[5]._field36 = Common::Point(119, 42);
+	_arrunkObj1337[0]._arr2[6]._field36 = Common::Point(119, 16);
+	_arrunkObj1337[0]._arr2[7]._field36 = Common::Point(145, 16);
+
+	_arrunkObj1337[0]._arr3[0]._field36 = Common::Point(91, 16);
+
+	_arrunkObj1337[0]._arr4[0]._field36 = Common::Point(145, 42);
+
+	_arrunkObj1337[0]._fieldB94 = Common::Point(280, 5);
+	_arrunkObj1337[0]._fieldB98 = Common::Point(253, 5);
+	_arrunkObj1337[0]._fieldB9C = Common::Point(226, 5);
+	_arrunkObj1337[0]._fieldBA0 = Common::Point(199, 5);
+	_arrunkObj1337[0]._fieldBA4 = 2;
+
+	_arrunkObj1337[1]._arr1[0]._field36 = Common::Point(283, 146);
+	_arrunkObj1337[1]._arr1[1]._field36 = Common::Point(283, 124);
+	_arrunkObj1337[1]._arr1[2]._field36 = Common::Point(283, 102);
+	_arrunkObj1337[1]._arr1[3]._field36 = Common::Point(283, 80);
+
+	_arrunkObj1337[1]._arr2[0]._field36 = Common::Point(253, 122);
+	_arrunkObj1337[1]._arr2[1]._field36 = Common::Point(227, 122);
+	_arrunkObj1337[1]._arr2[2]._field36 = Common::Point(201, 122);
+	_arrunkObj1337[1]._arr2[3]._field36 = Common::Point(201, 96);
+	_arrunkObj1337[1]._arr2[4]._field36 = Common::Point(201, 70);
+	_arrunkObj1337[1]._arr2[5]._field36 = Common::Point(227, 70);
+	_arrunkObj1337[1]._arr2[6]._field36 = Common::Point(253, 70);
+	_arrunkObj1337[1]._arr2[7]._field36 = Common::Point(253, 96);
+
+	_arrunkObj1337[1]._arr3[0]._field36 = Common::Point(253, 43);
+
+	_arrunkObj1337[1]._arr4[0]._field36 = Common::Point(227, 96);
+
+	_arrunkObj1337[1]._fieldB94 = Common::Point(283, 146);
+	_arrunkObj1337[1]._fieldB98 = Common::Point(283, 124);
+	_arrunkObj1337[1]._fieldB9C = Common::Point(283, 102);
+	_arrunkObj1337[1]._fieldBA0 = Common::Point(283, 80);
+	_arrunkObj1337[1]._fieldBA4 = 4;
+
+	subPostInit();
+}
+
+void Scene1337::remove() {
+	if (R2_GLOBALS._v57709 > 1) {
+		subD1917();
+		subD1940(false);
+	}
+
+	R2_GLOBALS._v58CE2 = 1;
+	SceneExt::remove();
+}
+
+void Scene1337::process(Event &event) {
+	if (event.eventType == EVENT_BUTTON_DOWN) {
+		if (event.btnState != BTNSHIFT_RIGHT) {
+			subD183F(R2_GLOBALS._v5780E, 1);
+			event.handled = true;
+		} else if (_unkFctPtr412 != NULL) {
+			FunctionPtrType tmpFctPtr = _unkFctPtr412;
+			_unkFctPtr412 = NULL;
+			(this->*tmpFctPtr)();
+			event.handled = true;
+		}
+	} else if (event.eventType == EVENT_KEYPRESS) {
+		if (event.kbd.keycode == Common::KEYCODE_SPACE) {
+			if (_unkFctPtr412 != NULL) {
+				FunctionPtrType tmpFctPtr = _unkFctPtr412;
+				_unkFctPtr412 = NULL;
+				(this->*tmpFctPtr)();
+				event.handled = true;
+			}
+		} else
+			warning("Fixme: Find proper keycode value");
+	}
+
+	if (!event.handled)
+		Scene::process(event);
+}
+
+void Scene1337::dispatch() {
+	if (_field424C == 0) {
+		++_field424E;
+		if (_field424E == 4) {
+			_field424C = 1;
+			subCBB1E();
+		}
+	}
+	Scene::dispatch();
+}
+
+void Scene1337::actionDisplay(int resNum, int lineNum, int x, int y, int arg5, int width, int textMode, int fontNum, int colFG, int colBGExt, int colFGExt) {
+	// TODO: Check if it's normal that arg5 is unused and replaced by an hardcoded 0 value
+	// May hide an original bug
+	
+	SceneItem::display(resNum, lineNum, SET_X, x, SET_Y, y, SET_KEEP_ONSCREEN, 0, SET_WIDTH, width, SET_POS_MODE, -1, SET_TEXT_MODE, textMode, SET_FONT, fontNum, SET_FG_COLOR, colFG, SET_EXT_BGCOLOR, colBGExt, SET_EXT_FGCOLOR, colFGExt, LIST_END);
+}
+
+void Scene1337::setAnimationInfo(unkObj1337sub1 *subObj) {
+	if (!subObj)
+		return;
+	
+	if (subObj->_field34 > 9) {
+		if (subObj->_field34 > 25) {
+			subObj->_object1.setStrip2(4);
+			subObj->_object1.setFrame(subObj->_field34 - 25);
+		} else {
+			subObj->_object1.setStrip2(3);
+			subObj->_object1.setFrame(subObj->_field34 - 9);
+		}
+	} else {
+		subObj->_object1.setStrip2(2);
+		subObj->_object1.setFrame(subObj->_field34);
+	}
+	
+	subObj->_object1.show();
+	R2_GLOBALS._sceneObjects->draw();
+}
+
+void Scene1337::subC20E5() {
+	warning("STUBBED lvl2 subC20E5()");
+}
+
+void Scene1337::subC20F9() {
+	switch (_field424A) {
+	case -1:
+		++_field423E;
+		if (_field423E == 3)
+			_field423E = 0;
+
+		if (_field4244 == 1) {
+			_object1.show();
+			switch (_field423E) {
+			case 0:
+				_object1.setStrip(3);
+				break;
+			case 1:
+				_object1.setStrip(4);
+				break;
+			case 2:
+				subD1975(174, 107);
+				_object1.setStrip(1);
+				break;
+			case 3:
+				subC4CEC();
+				_object1.setStrip(2);
+				break;
+			default:
+				break;
+			}
+			
+			if (_fieldA30 == 0)
+				_unkFctPtr412 = &Scene1337::subC20E5;
+			else
+				subC20E5();
+		} else {
+			subC20E5();
+		}
+		break;
+	case 0:
+		_aSound2.play(62);
+		actionDisplay(1330, 135, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		actionDisplay(1330, 121, 20, 99, 1, 136, 0, 7, 0, 172, 172);
+		actionDisplay(1330, 122, 300, 99, 1, 136, 0, 7, 0, 117, 117);
+		R2_GLOBALS._sceneObjects->draw();
+		actionDisplay(1330, 123, 159, 134, 1, 200, 0, 7, 0, 105, 105);
+		break;
+	case 1:
+		_aSound2.play(62);
+		actionDisplay(1330, 151, 300, 99, 1, 136, 0, 7, 0, 117, 117);
+		actionDisplay(1330, 118, 20, 99, 1, 136, 0, 7, 0, 172, 172);
+		actionDisplay(1330, 119, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		R2_GLOBALS._sceneObjects->draw();
+		actionDisplay(1330, 120, 159, 134, 1, 200, 0, 7, 0, 105, 105);
+		break;
+	case 2:
+		_aSound2.play(62);
+		actionDisplay(1330, 134, 159, 134, 1, 200, 0, 7, 0, 105, 105);
+		actionDisplay(1330, 124, 20, 99, 1, 136, 0, 7, 0, 172, 172);
+		actionDisplay(1330, 126, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		R2_GLOBALS._sceneObjects->draw();
+		actionDisplay(1330, 125, 300, 99, 1, 136, 0, 7, 0, 117, 117);
+		break;
+	case 3:
+		_aSound2.play(62);
+		actionDisplay(1330, 150, 20, 99, 1, 136, 0, 7, 0, 172, 172);
+		actionDisplay(1330, 115, 300, 99, 1, 136, 0, 7, 0, 117, 117);
+		actionDisplay(1330, 116, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		R2_GLOBALS._sceneObjects->draw();
+		actionDisplay(1330, 117, 159, 134, 1, 200, 0, 7, 0, 105, 105);
+		break;
+	default:
+		break;
+	}
+
+	if (_field424A != -1)
+		R2_GLOBALS._sceneManager.changeScene(125);
+
+}
+
+int Scene1337::subC264B(int arg1) {
+	warning("STUBBED Scene1337::subC264B()");
+	return -1;
+}
+
+int Scene1337::subC2BF8(unkObj1337sub1 *subObj1, Common::Point *pt) {
+	warning("STUBBED Scene1337::subC2BF8()");
+	return -1;
+}
+
+void Scene1337::subC2C2F() {
+	warning("STUBBED Scene1337::subC2C2F()");
+}
+
+int Scene1337::subC3E92(int arg1) {
+	warning("STUBBED Scene1337::subC3E92()");
+	return -1;
+}
+
+void Scene1337::subC4A39(unkObj1337sub1 *subObj) {
+	warning("STUBBED Scene1337::subC4A39()");
+}
+
+void Scene1337::subC4CD2() {
+	warning("STUBBED Scene1337::subC4CD2()");
+}
+
+void Scene1337::subC4CEC() {
+	warning("STUBBED Scene1337::subC4CEC()");
+}
+
+void Scene1337::subC51A0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
+	warning("STUBBED Scene1337::subC51A0()");
+}
+
+void Scene1337::subPostInit() {
+	R2_GLOBALS._v57709 = 0;
+	R2_GLOBALS._v5780C = 0;
+	subD183F(1, 0);
+	subD1940(true);
+	subD18F5();
+
+//	loadScene(1330);
+//	SceneExt::postInit();
+
+	R2_GLOBALS._scenePalette.addRotation(224, 235, 1);
+
+	_field3E28[0] = 1;
+	_field3E28[1] = 1;
+	_field3E28[2] = 1;
+	_field3E28[3] = 1;
+	_field3E28[4] = 1;
+	_field3E28[5] = 1;
+	_field3E28[6] = 1;
+	_field3E28[7] = 1;
+	_field3E28[8] = 26;
+	_field3E28[9] = 2;
+	_field3E28[10] = 2;
+	_field3E28[11] = 2;
+	_field3E28[12] = 2;
+	_field3E28[13] = 2;
+	_field3E28[14] = 26;
+	_field3E28[15] = 3;
+	_field3E28[16] = 3;
+	_field3E28[17] = 3;
+	_field3E28[18] = 3;
+	_field3E28[19] = 3;
+	_field3E28[20] = 28;
+	_field3E28[21] = 4;
+	_field3E28[22] = 4;
+	_field3E28[23] = 4;
+	_field3E28[24] = 4;
+	_field3E28[25] = 4;
+	_field3E28[26] = 28;
+	_field3E28[27] = 5;
+	_field3E28[28] = 5;
+	_field3E28[29] = 5;
+	_field3E28[30] = 5;
+	_field3E28[31] = 5;
+	_field3E28[32] = 30;
+	_field3E28[33] = 6;
+	_field3E28[34] = 6;
+	_field3E28[35] = 6;
+	_field3E28[36] = 6;
+	_field3E28[37] = 6;
+	_field3E28[38] = 30;
+	_field3E28[39] = 7;
+	_field3E28[40] = 7;
+	_field3E28[41] = 7;
+	_field3E28[42] = 7;
+	_field3E28[43] = 7;
+	_field3E28[44] = 32;
+	_field3E28[45] = 8;
+	_field3E28[46] = 8;
+	_field3E28[47] = 8;
+	_field3E28[48] = 8;
+	_field3E28[49] = 8;
+	_field3E28[50] = 32;
+	_field3E28[51] = 9;
+	_field3E28[52] = 9;
+	_field3E28[53] = 9;
+	_field3E28[54] = 9;
+	_field3E28[55] = 9;
+	_field3E28[56] = 10;
+	_field3E28[57] = 11;
+	_field3E28[58] = 12;
+	_field3E28[59] = 13;
+	_field3E28[60] = 13;
+	_field3E28[61] = 14;
+	_field3E28[62] = 15;
+	_field3E28[63] = 16;
+	_field3E28[64] = 17;
+	_field3E28[65] = 18;
+	_field3E28[66] = 19;
+	_field3E28[67] = 20;
+	_field3E28[68] = 21;
+	_field3E28[69] = 26;
+	_field3E28[70] = 28;
+	_field3E28[71] = 24;
+	_field3E28[72] = 25;
+	_field3E28[73] = 25;
+	_field3E28[74] = 25;
+	_field3E28[75] = 25;
+	_field3E28[76] = 26;
+	_field3E28[77] = 26;
+	_field3E28[78] = 26;
+	_field3E28[79] = 27;
+	_field3E28[80] = 27;
+	_field3E28[81] = 28;
+	_field3E28[82] = 28;
+	_field3E28[83] = 28;
+	_field3E28[84] = 29;
+	_field3E28[85] = 29;
+	_field3E28[86] = 29;
+	_field3E28[87] = 30;
+	_field3E28[88] = 30;
+	_field3E28[89] = 30;
+	_field3E28[90] = 30;
+	_field3E28[91] = 32;
+	_field3E28[92] = 1;
+	_field3E28[93] = 32;
+	_field3E28[94] = 32;
+	_field3E28[95] = 32;
+	_field3E28[96] = 1;
+	_field3E28[97] = 1;
+	_field3E28[98] = 1;
+	_field3E28[99] = 0;
+
+	_field3E24 = 98;
+	_field3E26 = 98;
+
+	_item7._field34 = 0;
+	_item7._field36 = Common::Point(128, 95);
+
+	_item8._field34 = 0;
+	_item8._field36 = Common::Point(162, 95);
+
+	_item6._field34 = 0;
+
+	_item2._object1.postInit();
+	_item2._object1.setVisage(1332);
+	_item2._object1.setStrip(5);
+	_item2._object1.setFrame(1);
+	_item2._object1._moveDiff = Common::Point(10, 10);
+	_item2._object1.fixPriority(400);
+	_item2._object1.setPosition(Common::Point(128, 95), 0);
+	_item2._object1.animate(ANIM_MODE_2, NULL);
+	_item2._object1.hide();
+
+	_object1.postInit();
+	_object1.setVisage(1334);
+	_object1.setStrip(1);
+	_object1.setFrame(1);
+	_object1._numFrames = 12;
+	_object1.fixPriority(500);
+	_object1.setPosition(Common::Point(174, 107), 0);
+	_object1.animate(ANIM_MODE_2, NULL);
+	_object1.hide();
+
+	_field4244 = 1;
+	_field4246 = 0;
+	_field4248 = 0;
+	_field424A = -1;
+
+	_background1.setup2(9531, 1, 1, 249, 168, 155, 0);
+
+	_fieldA30 = 0;
+	_field424C = 0;
+	_field424E = 0;
+}
+
+void Scene1337::subCBB1E() {
+	warning("STUBBED Scene1337::subCBB1E()");
+}
+
+void Scene1337::subCBB7B() {
+	warning("STUBBED Scene1337::subCBB7B()");
+}
+
+void Scene1337::subCF31D() {
+	warning("STUBBED Scene1337::subCF31D()");
+}
+
+void Scene1337::subCF979() {
+	warning("STUBBED Scene1337::subCF979()");
+}
+
+void Scene1337::subD0281() {
+	warning("STUBBED Scene1337::subD0281()");
+}
+
+void Scene1337::subD183F(int arg1, int arg2) {
+	if ((R2_GLOBALS._v57709 != 0) || (R2_GLOBALS._v5780C != 0))
+		return;
+
+	R2_GLOBALS._v5780E = arg1 + arg2;
+
+	if (arg2 != 0) {
+		if (R2_GLOBALS._v5780E < 1)
+			R2_GLOBALS._v5780E = 2;
+
+		if (R2_GLOBALS._v5780E > 2)
+			R2_GLOBALS._v5780E = 1;
+	}
+
+	if (R2_GLOBALS._v5780E == 1) {
+		R2_GLOBALS._v57810 = 200;
+		subD195F(1, 4);
+	} else if (R2_GLOBALS._v5780E == 2) {
+		R2_GLOBALS._v57810 = 300;
+		subD195F(1, 5);
+	} else {
+		R2_GLOBALS._v57810 = 0;
+		subD195F(0, 0);
+	}
+}
+
+void Scene1337::subD18B5(int resNum, int rlbNum, int arg3) {
+	warning("STUBBED lvl3 Scene1337::subD18B5()");
+}
+
+void Scene1337::subD18F5() {
+	warning("STUBBED Scene1337::subD18F5()");
+}
+
+void Scene1337::subD1917() {
+	warning("STUBBED Scene1337::subD1917()");
+}
+
+void Scene1337::subD1940(bool flag) {
+	warning("STUBBED Scene1337::subD1940()");
+}
+
+void Scene1337::subD195F(int arg1, int arg2) {
+	subD18B5(5, arg1, arg2);
+}
+
+void Scene1337::subD1975(int arg1, int arg2) {
+	warning("STUBBED lvl2 Scene1337::subD1975()");
+}
+
 /*--------------------------------------------------------------------------
  * Scene 1500 - Cutscene: Ship landing
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index be4f32ac3f..ccc0c3df5d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -169,6 +169,180 @@ public:
 	virtual void saveCharacter(int characterIndex);
 };
 
+class Scene1337 : public SceneExt {
+	class unkObj1337sub1: public SceneItem {
+	public:
+		SceneObject _object1;
+
+		int _field34;
+		Common::Point _field36;
+
+		unkObj1337sub1();
+		void synchronize(Serializer &s);
+	};
+
+	class unkObj1337_1: public SceneItem {
+	public:
+		unkObj1337sub1 _arr1[4];
+		unkObj1337sub1 _arr2[7];
+		unkObj1337sub1 _arr3[1];
+		unkObj1337sub1 _arr4[1];
+
+		Common::Point _fieldB94;
+		Common::Point _fieldB98;
+		Common::Point _fieldB9C;
+		Common::Point _fieldBA0;
+		int _fieldBA4;
+
+		unkObj1337_1();
+		void synchronize(Serializer &s);
+	};
+
+	class Action1337: public Action {
+	public:
+		void subD18B5(int arg1, int arg2, int arg3);
+		void skipFrames(int32 skipCount);
+	};
+
+	class Action1: public Action1337 {
+	public:
+		void signal();
+	};
+	class Action2: public Action1337 {
+	public:
+		void signal();
+	};
+	class Action3: public Action1337 {
+	public:
+		void signal();
+	};
+	class Action4: public Action1337 {
+	public:
+		void signal();
+	};
+	class Action5: public Action1337 {
+	public:
+		void signal();
+	};
+	class Action6: public Action1337 {
+	public:
+		void signal();
+	};
+	class Action7: public Action1337 {
+	public:
+		void signal();
+	};
+	class Action8: public Action1337 {
+	public:
+		void signal();
+	};
+	class Action9: public Action1337 {
+	public:
+		void signal();
+	};
+	class Action10: public Action1337 {
+	public:
+		void signal();
+	};
+	class Action11: public Action1337 {
+	public:
+		void signal();
+	};
+	class Action12: public Action1337 {
+	public:
+		void signal();
+	};
+	class Action13: public Action1337 {
+	public:
+		void signal();
+	};
+public:
+	typedef void (Scene1337::*FunctionPtrType)();
+	FunctionPtrType _unkFctPtr412;
+
+	ASound _aSound1;
+	ASound _aSound2;
+	BackgroundSceneObject _background1;
+	int _fieldA30;
+	unkObj1337_1 _arrunkObj1337[4];
+	SceneItem _item1;
+	SceneObject _object1;
+	Action1 _action1;
+	Action2 _action2;
+	Action3 _action3;
+	Action4 _action4;
+	Action5 _action5;
+	Action6 _action6;
+	Action7 _action7;
+	Action8 _action8;
+	Action9 _action9;
+	Action10 _action10;
+	Action11 _action11;
+	Action12 _action12;
+	Action13 _action13;
+	unkObj1337sub1 _item2;
+	unkObj1337sub1 _item3;
+	unkObj1337sub1 _item4;
+	BackgroundSceneObject _background2;
+	int _field3E24;
+	int _field3E26;
+	int _field3E28[100];
+	unkObj1337sub1 *_field3EF0;
+	unkObj1337sub1 *_field3EF4;
+	unkObj1337sub1 *_field3EF8;
+	unkObj1337sub1 _item5;
+	unkObj1337sub1 _item6;
+	unkObj1337sub1 _item7;
+	unkObj1337sub1 _item8;
+	int _field423C;
+	int _field423E;
+	int _field4240;
+	int _field4242;
+	int _field4244;
+	int _field4246;
+	int _field4248;
+	int _field424A;
+	int _field424C;
+	int _field424E;
+
+	SceneObject _arrObject1[8];
+	SceneObject _arrObject2[8];
+
+	Scene1337();
+	virtual void synchronize(Serializer &s);
+
+	void actionDisplay(int resNum, int lineNum, int x, int y, int arg5, int width, int textMode, int fontNum, int colFG, int colBGExt, int colFGExt);
+	void setAnimationInfo(unkObj1337sub1 *subObj);
+	void subC20E5();
+	void subC20F9();
+	int subC264B(int arg1);
+	int subC2BF8(unkObj1337sub1 *subObj1, Common::Point *pt);
+	void subC2C2F();
+	int subC3E92(int arg1);
+	void subC4A39(unkObj1337sub1 *subObj);
+	void subC4CD2();
+	void subC4CEC();
+	void subC51A0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
+	void subPostInit();
+	void subCBB1E();
+	void subCBB7B();
+	void subCF31D();
+	void subCF979();
+	void subD0281();
+	void subD183F(int arg1, int arg2);
+	void subD18B5(int resNum, int rlbNum, int arg3);
+	void subD18F5();
+	void subD1917();
+	void subD1940(bool flag);
+	void subD195F(int arg1, int arg2);
+	void subD1975(int arg1, int arg2);
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void process(Event &event);
+	virtual void dispatch();
+};
+
 class Scene1500 : public SceneExt {
 public:
 	SceneActor _actor1;
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index 3aec851b74..7a8f1cb1b0 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -238,6 +238,10 @@ char const *const F8 = "F8";
 char const *const F10 = "F10";
 
 char const *const DONE_MSG = "Done";
+char const *const YES_MSG = " Yes ";
+char const *const NO_MSG = " No ";
+char const *const USE_INTERCEPTOR = "Do you want to use your interceptor card?";
+char const *const USE_DOUBLE_AGENT = "Do you want to use your double agent?";
 
 const byte k562CC[] = {
 	20, 7,  41, 6,
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index 4a92f48cf8..ab0cd73b62 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -191,6 +191,10 @@ extern char const *const F8;
 extern char const *const F10;
 
 extern char const *const DONE_MSG;
+extern char const *const YES_MSG;
+extern char const *const NO_MSG;
+extern char const *const USE_INTERCEPTOR;
+extern char const *const USE_DOUBLE_AGENT;
 
 // Scene 1550 arrays of constants
 extern const byte k562CC[];
-- 
cgit v1.2.3


From 6b16fe9423af831cc2d2c4448410c80b18a07541 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 9 Feb 2012 23:08:13 +0100
Subject: TSAGE: Fix compilation by passing non-POD via pointer through "...".

The other uses seem to pass Common::Point via a pointer to the object too,
so this seems fine to do here too.
---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index bf25c148f8..e1357762da 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2759,7 +2759,7 @@ void Scene1337::Action4::signal() {
 			scene->_aSound2.play(61);
 
 			NpcMover *mover = new NpcMover();
-			scene->_item2._object1.addMover(mover, scene->_arrunkObj1337[scene->_field423E]._fieldB94, this);
+			scene->_item2._object1.addMover(mover, &scene->_arrunkObj1337[scene->_field423E]._fieldB94, this);
 
 			scene->_arrunkObj1337[scene->_field423E]._arr1[0]._field34 = scene->_field3E28[scene->_field3E24];
 			scene->_field3E28[scene->_field3E24] = 0;
-- 
cgit v1.2.3


From 9e6e286db7b8f0359a2517ee91d1c1257d557846 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 10 Feb 2012 07:11:20 +0100
Subject: TSAGE: R2R - Fix glitch in scene 180

Thanks to LordHoto for reporting it
---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index cacd0745cd..1c924ba336 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1885,7 +1885,7 @@ void Scene180::dispatch() {
 	if (_frameInc) {
 		uint32 frameNumber = R2_GLOBALS._events.getFrameNumber();
 
-		if (frameNumber >= frameNumber) {
+		if (frameNumber >= (uint32)_frameNumber) {
 			_frameInc = frameNumber - _frameNumber;
 			_frameNumber = frameNumber;
 
-- 
cgit v1.2.3


From 3f6f814c6a20e2eb745c9b03722ce3456685411c Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 10 Feb 2012 07:12:11 +0100
Subject: TSAGE: R2R - Fix error in scene 1337

Thanks to LordHoto for reporting it
---
 engines/tsage/ringworld2/ringworld2_scenes1.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index ccc0c3df5d..b366c6475f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -184,7 +184,7 @@ class Scene1337 : public SceneExt {
 	class unkObj1337_1: public SceneItem {
 	public:
 		unkObj1337sub1 _arr1[4];
-		unkObj1337sub1 _arr2[7];
+		unkObj1337sub1 _arr2[8];
 		unkObj1337sub1 _arr3[1];
 		unkObj1337sub1 _arr4[1];
 
-- 
cgit v1.2.3


From edc52497726139498bb68e3b3334a792b3602ede Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Fri, 10 Feb 2012 21:14:48 -0600
Subject: JANITORIAL: Fix template definition whitespace

---
 engines/hugo/object.h                 |  2 +-
 engines/kyra/screen.cpp               |  2 +-
 engines/made/resource.h               |  2 +-
 engines/parallaction/exec.h           |  2 +-
 engines/parallaction/parallaction.cpp |  2 +-
 engines/parallaction/parallaction.h   |  2 +-
 engines/sci/engine/savegame.cpp       | 22 +++++++++++-----------
 engines/sci/engine/segment.h          |  2 +-
 engines/scumm/he/wiz_he.cpp           | 10 +++++-----
 engines/scumm/player_nes.cpp          |  2 +-
 engines/touche/saveload.cpp           | 26 +++++++++++++-------------
 engines/tucker/saveload.cpp           |  2 +-
 engines/tucker/tucker.h               |  2 +-
 13 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'engines')

diff --git a/engines/hugo/object.h b/engines/hugo/object.h
index c0933729eb..84c20db041 100644
--- a/engines/hugo/object.h
+++ b/engines/hugo/object.h
@@ -117,7 +117,7 @@ protected:
 	void restoreSeq(object_t *obj);
 
 	inline bool checkBoundary(int16 x, int16 y);
-	template <typename T>
+	template<typename T>
 	inline int sign(T a) { if ( a < 0) return -1; else return 1; }
 };
 
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 19314a5699..2b701e3b81 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -2181,7 +2181,7 @@ void Screen::decodeFrameDelta(uint8 *dst, const uint8 *src, bool noXor) {
 		wrapped_decodeFrameDelta<false>(dst, src);
 }
 
-template <bool noXor>
+template<bool noXor>
 void Screen::wrapped_decodeFrameDelta(uint8 *dst, const uint8 *src) {
 	while (1) {
 		uint8 code = *src++;
diff --git a/engines/made/resource.h b/engines/made/resource.h
index 9e0a729c58..537801bdc8 100644
--- a/engines/made/resource.h
+++ b/engines/made/resource.h
@@ -219,7 +219,7 @@ protected:
 
 	void loadIndex(ResourceSlots *slots);
 
-	template <class T>
+	template<class T>
 	T *createResource(uint32 resType, int index) {
 		ResourceSlot *slot = getResourceSlot(resType, index);
 		if (!slot)
diff --git a/engines/parallaction/exec.h b/engines/parallaction/exec.h
index 4ca3947514..b7b8a571f4 100644
--- a/engines/parallaction/exec.h
+++ b/engines/parallaction/exec.h
@@ -71,7 +71,7 @@ typedef Common::Array<const ProgramOpcode*>	ProgramOpcodeSet;
 #define DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(op) void instOp_##op(ProgramContext &)
 
 
-template <class OpcodeSet>
+template<class OpcodeSet>
 class Exec {
 protected:
 	OpcodeSet _opcodes;
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 2fffc9071c..3b1b7d54a0 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -795,7 +795,7 @@ bool Location::keepAnimation_br(AnimationPtr a) {
 	return keepZone_br(a);
 }
 
-template <class T>
+template<class T>
 void Location::freeList(Common::List<T> &list, bool removeAll, Common::MemFunc1<bool, T, Location> filter) {
 	typedef typename Common::List<T>::iterator iterator;
 	iterator it = list.begin();
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 5554eff3c5..6c3ff11d15 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -178,7 +178,7 @@ protected:
 	bool keepAnimation_ns(AnimationPtr a);
 	bool keepAnimation_br(AnimationPtr a);
 
-	template <class T>
+	template<class T>
 	void freeList(Common::List<T> &list, bool removeAll, Common::MemFunc1<bool, T, Location> filter);
 
 public:
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index f1c7133d01..404bea799d 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -66,7 +66,7 @@ void syncWithSerializer(Common::Serializer &s, T &obj) {
 }
 
 // By default, sync using syncWithSerializer, which in turn can easily be overloaded.
-template <typename T>
+template<typename T>
 struct DefaultSyncer : Common::BinaryFunction<Common::Serializer, T, void> {
 	void operator()(Common::Serializer &s, T &obj) const {
 		//obj.saveLoadWithSerializer(s);
@@ -87,7 +87,7 @@ struct DefaultSyncer : Common::BinaryFunction<Common::Serializer, T, void> {
  *
  * TODO: Add something like this for lists, queues....
  */
-template <typename T, class Syncer = DefaultSyncer<T> >
+template<typename T, class Syncer = DefaultSyncer<T> >
 struct ArraySyncer : Common::BinaryFunction<Common::Serializer, T, void> {
 	void operator()(Common::Serializer &s, Common::Array<T> &arr) const {
 		uint len = arr.size();
@@ -113,13 +113,13 @@ void syncArray(Common::Serializer &s, Common::Array<T> &arr) {
 }
 
 
-template <>
+template<>
 void syncWithSerializer(Common::Serializer &s, reg_t &obj) {
 	s.syncAsUint16LE(obj.segment);
 	s.syncAsUint16LE(obj.offset);
 }
 
-template <>
+template<>
 void syncWithSerializer(Common::Serializer &s, synonym_t &obj) {
 	s.syncAsUint16LE(obj.replaceant);
 	s.syncAsUint16LE(obj.replacement);
@@ -247,7 +247,7 @@ void SegManager::saveLoadWithSerializer(Common::Serializer &s) {
 }
 
 
-template <>
+template<>
 void syncWithSerializer(Common::Serializer &s, Class &obj) {
 	s.syncAsSint32LE(obj.script);
 	syncWithSerializer(s, obj.reg);
@@ -326,14 +326,14 @@ void Object::saveLoadWithSerializer(Common::Serializer &s) {
 	syncArray<reg_t>(s, _variables);
 }
 
-template <>
+template<>
 void syncWithSerializer(Common::Serializer &s, SegmentObjTable<Clone>::Entry &obj) {
 	s.syncAsSint32LE(obj.next_free);
 
 	syncWithSerializer<Object>(s, obj);
 }
 
-template <>
+template<>
 void syncWithSerializer(Common::Serializer &s, SegmentObjTable<List>::Entry &obj) {
 	s.syncAsSint32LE(obj.next_free);
 
@@ -341,7 +341,7 @@ void syncWithSerializer(Common::Serializer &s, SegmentObjTable<List>::Entry &obj
 	syncWithSerializer(s, obj.last);
 }
 
-template <>
+template<>
 void syncWithSerializer(Common::Serializer &s, SegmentObjTable<Node>::Entry &obj) {
 	s.syncAsSint32LE(obj.next_free);
 
@@ -352,7 +352,7 @@ void syncWithSerializer(Common::Serializer &s, SegmentObjTable<Node>::Entry &obj
 }
 
 #ifdef ENABLE_SCI32
-template <>
+template<>
 void syncWithSerializer(Common::Serializer &s, SegmentObjTable<SciArray<reg_t> >::Entry &obj) {
 	s.syncAsSint32LE(obj.next_free);
 
@@ -388,7 +388,7 @@ void syncWithSerializer(Common::Serializer &s, SegmentObjTable<SciArray<reg_t> >
 	}
 }
 
-template <>
+template<>
 void syncWithSerializer(Common::Serializer &s, SegmentObjTable<SciString>::Entry &obj) {
 	s.syncAsSint32LE(obj.next_free);
 
@@ -416,7 +416,7 @@ void syncWithSerializer(Common::Serializer &s, SegmentObjTable<SciString>::Entry
 }
 #endif
 
-template <typename T>
+template<typename T>
 void sync_Table(Common::Serializer &s, T &obj) {
 	s.syncAsSint32LE(obj.first_free);
 	s.syncAsSint32LE(obj.entries_used);
diff --git a/engines/sci/engine/segment.h b/engines/sci/engine/segment.h
index 009a2558ce..54cf7b98af 100644
--- a/engines/sci/engine/segment.h
+++ b/engines/sci/engine/segment.h
@@ -370,7 +370,7 @@ public:
 
 #ifdef ENABLE_SCI32
 
-template <typename T>
+template<typename T>
 class SciArray {
 public:
 	SciArray() : _type(-1), _data(NULL), _size(0), _actualSize(0) { }
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index f67922c81c..47b4b8ad33 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -687,7 +687,7 @@ void Wiz::copyRawWizImage(uint8 *dst, const uint8 *src, int dstPitch, int dstTyp
 }
 
 #ifdef USE_RGB_COLOR
-template <int type>
+template<int type>
 void Wiz::write16BitColor(uint8 *dstPtr, const uint8 *dataPtr, int dstType, const uint8 *xmapPtr) {
 	uint16 col = READ_LE_UINT16(dataPtr);
 	if (type == kWizXMap) {
@@ -701,7 +701,7 @@ void Wiz::write16BitColor(uint8 *dstPtr, const uint8 *dataPtr, int dstType, cons
 	}
 }
 
-template <int type>
+template<int type>
 void Wiz::decompress16BitWizImage(uint8 *dst, int dstPitch, int dstType, const uint8 *src, const Common::Rect &srcRect, int flags, const uint8 *xmapPtr) {
 	const uint8 *dataPtr, *dataPtrNext;
 	uint8 code;
@@ -804,7 +804,7 @@ void Wiz::decompress16BitWizImage(uint8 *dst, int dstPitch, int dstType, const u
 }
 #endif
 
-template <int type>
+template<int type>
 void Wiz::write8BitColor(uint8 *dstPtr, const uint8 *dataPtr, int dstType, const uint8 *palPtr, const uint8 *xmapPtr, uint8 bitDepth) {
 	if (bitDepth == 2) {
 		if (type == kWizXMap) {
@@ -833,7 +833,7 @@ void Wiz::write8BitColor(uint8 *dstPtr, const uint8 *dataPtr, int dstType, const
 	}
 }
 
-template <int type>
+template<int type>
 void Wiz::decompressWizImage(uint8 *dst, int dstPitch, int dstType, const uint8 *src, const Common::Rect &srcRect, int flags, const uint8 *palPtr, const uint8 *xmapPtr, uint8 bitDepth) {
 	const uint8 *dataPtr, *dataPtrNext;
 	uint8 code, *dstPtr, *dstPtrNext;
@@ -942,7 +942,7 @@ template void Wiz::decompressWizImage<kWizXMap>(uint8 *dst, int dstPitch, int ds
 template void Wiz::decompressWizImage<kWizRMap>(uint8 *dst, int dstPitch, int dstType, const uint8 *src, const Common::Rect &srcRect, int flags, const uint8 *palPtr, const uint8 *xmapPtr, uint8 bitDepth);
 template void Wiz::decompressWizImage<kWizCopy>(uint8 *dst, int dstPitch, int dstType, const uint8 *src, const Common::Rect &srcRect, int flags, const uint8 *palPtr, const uint8 *xmapPtr, uint8 bitDepth);
 
-template <int type>
+template<int type>
 void Wiz::decompressRawWizImage(uint8 *dst, int dstPitch, int dstType, const uint8 *src, int srcPitch, int w, int h, int transColor, const uint8 *palPtr, uint8 bitDepth) {
 	if (type == kWizRMap) {
 		assert(palPtr != 0);
diff --git a/engines/scumm/player_nes.cpp b/engines/scumm/player_nes.cpp
index 3f8bcef8b7..a6ffc9ed86 100644
--- a/engines/scumm/player_nes.cpp
+++ b/engines/scumm/player_nes.cpp
@@ -507,7 +507,7 @@ void APU::Reset () {
 	Frame.Cycles = 1;
 }
 
-template <class T>
+template<class T>
 int step(T &obj, int sampcycles, uint frame_Cycles, int frame_Num) {
 	int samppos = 0;
 	while (sampcycles) {
diff --git a/engines/touche/saveload.cpp b/engines/touche/saveload.cpp
index 7732c6deb9..a054299ecd 100644
--- a/engines/touche/saveload.cpp
+++ b/engines/touche/saveload.cpp
@@ -60,7 +60,7 @@ static void saveOrLoadPtr(Common::ReadStream &stream, int16 *&p, int16 *base) {
 	p = base + offset;
 }
 
-template <class S>
+template<class S>
 static void saveOrLoad(S &s, Common::Rect &r) {
 	saveOrLoad(s, r.left);
 	saveOrLoad(s, r.top);
@@ -68,13 +68,13 @@ static void saveOrLoad(S &s, Common::Rect &r) {
 	saveOrLoad(s, r.bottom);
 }
 
-template <class S>
+template<class S>
 static void saveOrLoad(S &s, SequenceEntry &seq) {
 	saveOrLoad(s, seq.sprNum);
 	saveOrLoad(s, seq.seqNum);
 }
 
-template <class S>
+template<class S>
 static void saveOrLoad(S &s, KeyChar &key) {
 	saveOrLoad(s, key.num);
 	saveOrLoad(s, key.flags);
@@ -134,14 +134,14 @@ static void saveOrLoad(S &s, KeyChar &key) {
 	}
 }
 
-template <class S>
+template<class S>
 static void saveOrLoad(S &s, TalkEntry &entry) {
 	saveOrLoad(s, entry.otherKeyChar);
 	saveOrLoad(s, entry.talkingKeyChar);
 	saveOrLoad(s, entry.num);
 }
 
-template <class S>
+template<class S>
 static void saveOrLoad(S &s, ProgramHitBoxData &data) {
 	saveOrLoad(s, data.item);
 	saveOrLoad(s, data.talk);
@@ -156,14 +156,14 @@ static void saveOrLoad(S &s, ProgramHitBoxData &data) {
 	}
 }
 
-template <class S>
+template<class S>
 static void saveOrLoad(S &s, Area &area) {
 	saveOrLoad(s, area.r);
 	saveOrLoad(s, area.srcX);
 	saveOrLoad(s, area.srcY);
 }
 
-template <class S>
+template<class S>
 static void saveOrLoad(S &s, ProgramBackgroundData &data) {
 	saveOrLoad(s, data.area);
 	saveOrLoad(s, data.type);
@@ -172,7 +172,7 @@ static void saveOrLoad(S &s, ProgramBackgroundData &data) {
 	saveOrLoad(s, data.scaleDiv);
 }
 
-template <class S>
+template<class S>
 static void saveOrLoad(S &s, ProgramAreaData &data) {
 	saveOrLoad(s, data.area);
 	saveOrLoad(s, data.id);
@@ -181,7 +181,7 @@ static void saveOrLoad(S &s, ProgramAreaData &data) {
 	saveOrLoad(s, data.animNext);
 }
 
-template <class S>
+template<class S>
 static void saveOrLoad(S &s, ProgramWalkData &data) {
 	saveOrLoad(s, data.point1);
 	saveOrLoad(s, data.point2);
@@ -190,7 +190,7 @@ static void saveOrLoad(S &s, ProgramWalkData &data) {
 	saveOrLoad(s, data.area2);
 }
 
-template <class S>
+template<class S>
 static void saveOrLoad(S &s, ProgramPointData &data) {
 	saveOrLoad(s, data.x);
 	saveOrLoad(s, data.y);
@@ -198,7 +198,7 @@ static void saveOrLoad(S &s, ProgramPointData &data) {
 	saveOrLoad(s, data.order);
 }
 
-template <class A>
+template<class A>
 static void saveOrLoadCommonArray(Common::WriteStream &stream, A &array) {
 	uint count = array.size();
 	assert(count < 0xFFFF);
@@ -208,7 +208,7 @@ static void saveOrLoadCommonArray(Common::WriteStream &stream, A &array) {
 	}
 }
 
-template <class A>
+template<class A>
 static void saveOrLoadCommonArray(Common::ReadStream &stream, A &array) {
 	uint count = stream.readUint16LE();
 	if (count == array.size()) {
@@ -218,7 +218,7 @@ static void saveOrLoadCommonArray(Common::ReadStream &stream, A &array) {
 	}
 }
 
-template <class S, class A>
+template<class S, class A>
 static void saveOrLoadStaticArray(S &s, A &array, uint count) {
 	for (uint i = 0; i < count; ++i) {
 		saveOrLoad(s, array[i]);
diff --git a/engines/tucker/saveload.cpp b/engines/tucker/saveload.cpp
index 5bc51acf84..5133bc15e8 100644
--- a/engines/tucker/saveload.cpp
+++ b/engines/tucker/saveload.cpp
@@ -49,7 +49,7 @@ static void saveOrLoadInt(Common::ReadStream &stream, int &i) {
 	i = stream.readSint32LE();
 }
 
-template <class S>
+template<class S>
 void TuckerEngine::saveOrLoadGameStateData(S &s) {
 	for (int i = 0; i < kFlagsTableSize; ++i) {
 		saveOrLoadInt(s, _flagsTable[i]);
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index 3daf75d44a..c9e4d986bb 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -563,7 +563,7 @@ protected:
 	void updateSprite_locationNum81_1(int i);
 	void updateSprite_locationNum82(int i);
 
-	template <class S> void saveOrLoadGameStateData(S &s);
+	template<class S> void saveOrLoadGameStateData(S &s);
 	virtual Common::Error loadGameState(int num);
 	virtual Common::Error saveGameState(int num, const Common::String &description);
 	virtual bool canLoadGameStateCurrently();
-- 
cgit v1.2.3


From 2acd5a823984eccd341b4528523016f9cd539999 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Mon, 26 Dec 2011 13:54:53 +0100
Subject: SCUMM: Fix sound playback if fast-mode is on

Sounds are played that fast in fast-mode that the queue gets stuck.
This is just a workaround and only fixes the symptoms. Check the queue handling for a correct fix.
---
 engines/scumm/actor.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index eb23c30ebe..4a92d6d81a 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1355,7 +1355,10 @@ void ScummEngine::playActorSounds() {
 			} else {
 				sound = _actors[i]->_sound[0];
 			}
-			_sound->addSoundToQueue(sound);
+			// fast mode will flood the queue with walk sounds
+			if (!_fastMode) {
+				_sound->addSoundToQueue(sound);
+			}
 			for (j = 1; j < _numActors; j++) {
 				_actors[j]->_cost.soundCounter = 0;
 			}
-- 
cgit v1.2.3


From 05f853edd7e1b80d25678ccd38c23ab3c171adab Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Mon, 26 Dec 2011 20:58:03 +0100
Subject: SCUMM: Fix meteor actor index

- Now the correct actor name is shown with "give ... to meteor". Formerly the name was "".
- Add actor names that do not have a string assigned
---
 engines/scumm/actor.cpp | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 4a92d6d81a..70e051edfd 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1323,23 +1323,23 @@ static const byte v0ActorSounds[24] = {
 	0x06, // Bernard
 	0x06, // Wendy
 	0x00, // Jeff
-	0x46, // ???
+	0x46, // Radiation Suit
 	0x06, // Dr Fred
 	0x06, // Nurse Edna
 	0x06, // Weird Ed
 	0x06, // Dead Cousin Ted
 	0xFF, // Purple Tentacle
 	0xFF, // Green Tentacle
-	0x06, // Meteor
-	0xC0, // Plant
-	0x06, // ???
-	0x06, // ???
-	0x00, // ???
-	0xC0, // ???
-	0xC0, // ???
-	0x00, // ???
-	0x06, // Sandy
-	0x06, // ???
+	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 */
@@ -2298,22 +2298,23 @@ static const char *const v0ActorNames_English[25] = {
 	"Bernard",
 	"Wendy",
 	"Jeff",
-	"",
+	"", // Radiation Suit
 	"Dr Fred",
 	"Nurse Edna",
 	"Weird Ed",
 	"Dead Cousin Ted",
 	"Purple Tentacle",
 	"Green Tentacle",
+	"", // Meteor Police
 	"Meteor",
-	"",
-	"",
-	"",
+	"", // Mark Eteer
+	"", // Talkshow Host
 	"Plant",
-	"",
-	"",
-	"",
-	"Sandy"
+	"", // Meteor Radiation
+	"", // Edsel (small, outro)
+	"", // Meteor (small, intro)
+	"Sandy", // (Lab)
+	"", // Sandy (Cut-Scene)
 };
 
 static const char *const v0ActorNames_German[25] = {
@@ -2331,15 +2332,16 @@ static const char *const v0ActorNames_German[25] = {
 	"Ted",
 	"Lila Tentakel",
 	"Gr<nes Tentakel",
-	"Meteor",
 	"",
+	"Meteor",
 	"",
 	"",
 	"Pflanze",
 	"",
 	"",
 	"",
-	"Sandy"
+	"Sandy",
+	"",
 };
 
 const byte *Actor::getActorName() {
-- 
cgit v1.2.3


From 1e7ea7f95e34430ef70907360319537f0c061204 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Mon, 26 Dec 2011 22:01:39 +0100
Subject: SCUMM: Fix bug with tracker ID 3072094

MANIAC C64: Bug while getting the stamps from the parcel - ID: 3072094
MMC64: use stamps with envelope - ID: 3095595
---
 engines/scumm/script_v0.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index e2d3f40e8e..71dfbc6a82 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -979,7 +979,15 @@ void ScummEngine_v0::o_setOwnerOf() {
 	owner = getVarOrDirectByte(PARAM_2);
 
 	if (obj == 0)
-		obj = _activeInventory;
+		obj = _activeObject;
+
+	// FIXME: the original interpreter seems to set the owner of 
+	// an item to remove (new owner 0) to 13 (purple tentacle).
+	// Ignore this behavior for now.
+	/*
+	if (owner == 0)
+		owner = 13;
+	*/
 
 	setOwnerOf(obj, owner);
 }
-- 
cgit v1.2.3


From 3e2012483d9543e9e5f65fcbf038e9d2f915639f Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 27 Dec 2011 08:47:59 +0100
Subject: SCUMM: make verbs working better

---
 engines/scumm/verbs.cpp | 43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 67ed17c024..3398cca05c 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -1083,6 +1083,10 @@ void ScummEngine_v0::checkExecVerbs() {
 			int prevInventory = _activeInventory;
 			int invOff = _inventoryOffset;
 
+			// GIVE: actor must be selected (not possible via inventory)
+			if ((_activeVerb == 3) && (_activeObject || _activeInventory))
+				return;
+
 			// Click into V2 inventory
 			checkV2Inventory(_mouse.x, _mouse.y);
 
@@ -1137,13 +1141,6 @@ void ScummEngine_v0::checkExecVerbs() {
 			int obj  = findObject(_virtualMouse.x, _virtualMouse.y);
 			int objIdx = findObjectIndex(_virtualMouse.x, _virtualMouse.y);
 
-			// If we already have an object selected, and we just clicked an actor
-			// Clear any object we may of also clicked on
-			if ((_activeObject || _activeInventory) && act) {
-				obj = 0;
-				objIdx = 0;
-			}
-
 			if (a->_miscflags & 0x80) {
 				if (_activeVerb != 7 && over != 7) {
 					_activeVerb = 0;
@@ -1208,14 +1205,27 @@ void ScummEngine_v0::checkExecVerbs() {
 				return;
 			}
 
-			// Only allowing targetting actors if its the GIVE/USE verb
-			if (_activeVerb == 3 || _activeVerb == 11) {
-				// Different actor selected?
-				if (act) {
-					if (_activeActor != act) {
-						_activeActor = act;
+			// Only allowing targetting actors if its the GIVE verb
+			if (_activeVerb == 3) {
+				if (_activeObject || _activeInventory) {
+					// Once selected the object cannot be changed
+					obj = 0;
+					objIdx = 0;
+
+					// Different actor selected?
+					if (act) {
+						if (_activeActor != act) {
+							_activeActor = act;
+							return;
+						}
+					} else {
 						return;
 					}
+				} else {
+					// An object has to be selected first
+					act = 0;
+					if (!obj)
+						return;
 				}
 			}
 
@@ -1224,9 +1234,12 @@ void ScummEngine_v0::checkExecVerbs() {
 					if (_activeInventory)
 						_activeInvExecute = true;
 
-				// USE
+				// USE / UNLOCK
 				if (_activeVerb == 11 || _activeVerb == 8) {
-					if (obj != _activeObject || obj != _activeObject2) {
+					if (obj != _activeObject && obj != _activeObject2) {
+						if (_activeObject || _activeInventory) {
+							//verbPrep(
+						}
 						if (!_activeObject || _activeInventory) {
 							_activeObject = obj;
 							_activeObjectIndex = objIdx;
-- 
cgit v1.2.3


From c9ae5f383807c1f40088fc042d470bf8ba74f1da Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 27 Dec 2011 08:47:00 +0100
Subject: SCUMM: Fix pickupObject()

---
 engines/scumm/script_v0.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 71dfbc6a82..cc59e608fd 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -777,7 +777,12 @@ void ScummEngine_v0::o_putActorAtObject() {
 void ScummEngine_v0::o_pickupObject() {
 	int obj = fetchScriptByte();
 	if (obj == 0) {
-		obj = _activeObject;
+		if (_activeObject) {
+			obj = _activeObject;
+		} else {
+			// might happen if an inventory item was picked again
+			return;
+		}
 	}
 
 	if (obj < 1) {
-- 
cgit v1.2.3


From a79f224c23f1b0fa4d9850a032e0adc0d72619f7 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 3 Jan 2012 22:10:50 +0100
Subject: SCUMM: changed handling of _activeInventory/_activeActor to
 _activeObject(2)/_activeObject(2)Type

Note: the transition is not completed yet. The code compiles but is probably not runnable as not every occurrence of _activeInventory has been properly replaced.
The usage of _v0ObjectIndex and _v0ObjectInInventory should be revised too and both variables should be replaced by another mechanism (maybe by using a single variable "obj = (type << 8) | id").

- moved v0 only vars _activeInventory, _activeObject, _activeVerb from  ScummEngine_v2 to ScummEngine_v0
- removed _activeActor, _activeInvExecute, _activeObject2Inv and _activeInventory. They are handled by _activeObject/_activeObjectType and _activeObject2/_activeObject2Type now.
- removed _activeObject(2)Index as they only bloat the code without any benefit (?)
- merge prep-name tables from ScummEngine_v2::drawPreposition() and ScummEngine_v0::drawSentenceWord() by introducing ScummEngine_v2::drawPreposition()
- rename ObjectData.flags -> obj_type (quick-fix only, needs review! Maybe obj_nr and obj_type can be merged into one var: obj_nr = (obj_type << 8) | obj_nr)
- o_unknown2 is negation of o_ifActiveObject (o_ifNotEqualActiveObject2)
- renamed o_ifActiveObject -> o_ifEqualActiveObject2 as it acts only on _activeObject2
- renamed ScummEngine_v0::drawSentenceWord() -> ScummEngine_v0::getObjectName()
---
 engines/scumm/object.cpp    |  22 ++---
 engines/scumm/object.h      |   7 +-
 engines/scumm/saveload.cpp  |   2 +-
 engines/scumm/script_v0.cpp | 161 +++++++++++-------------------------
 engines/scumm/script_v2.cpp |  68 ++++++++-------
 engines/scumm/scumm.cpp     |  12 +--
 engines/scumm/scumm_v0.h    |  37 +++++----
 engines/scumm/scumm_v2.h    |   8 +-
 engines/scumm/verbs.cpp     | 197 ++++++++++++++++++--------------------------
 9 files changed, 209 insertions(+), 305 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index da238dc517..a9e2a76345 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -316,7 +316,7 @@ int ScummEngine::getObjectIndex(int object) const {
 
 	for (i = (_numLocalObjects-1); i > 0; i--) {
 		if (_game.version == 0 )
-			if( _objs[i].flags != _v0ObjectFlag )
+			if( _objs[i].obj_type != _v0ObjectFlag )
 				continue;
 
 		if (_objs[i].obj_nr == object)
@@ -492,14 +492,6 @@ int ScummEngine::getObjActToObjActDist(int a, int b) {
 	return getDist(x, y, x2, y2);
 }
 
-int ScummEngine_v0::findObjectIndex(int x, int y) {
-	int objIdx;
-	_v0ObjectIndex = true;
-	objIdx = findObject(x, y);
-	_v0ObjectIndex = false;
-	return objIdx;
-}
-
 int ScummEngine::findObject(int x, int y) {
 	int i, b;
 	byte a;
@@ -510,7 +502,7 @@ int ScummEngine::findObject(int x, int y) {
 			continue;
 
 		if (_game.version == 0) {
-			if (_objs[i].flags == 0 && _objs[i].state & kObjectStateUntouchable)
+			if (_objs[i].obj_type == 0 && _objs[i].state & kObjectStateUntouchable)
 				continue;
 		} else {
 			if (_game.version <= 2 && _objs[i].state & kObjectStateUntouchable)
@@ -532,7 +524,7 @@ int ScummEngine::findObject(int x, int y) {
 				    _objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y) {
 					// MMC64: Set the object search flag
 					if (_game.version == 0)
-						_v0ObjectFlag = _objs[i].flags;
+						_v0ObjectFlag = _objs[i].obj_type;
 					if (_game.version == 0 && _v0ObjectIndex)
 						return i;
 					else
@@ -844,7 +836,7 @@ void ScummEngine_v3old::resetRoomObjects() {
 			char buf[32];
 			sprintf(buf, "roomobj-%d-", _roomResource);
 			if (_game.version == 0)
-				sprintf(buf + 11, "%d-", od->flags);
+				sprintf(buf + 11, "%d-", od->obj_type);
 
 			dumpResource(buf, od->obj_nr, room + od->OBCDoffset);
 		}
@@ -912,7 +904,7 @@ void ScummEngine_v0::resetRoomObject(ObjectData *od, const byte *room, const byt
 	ptr -= 2;
 
 	od->obj_nr = *(ptr + 6);
-	od->flags = *(ptr + 7);
+	od->obj_type = *(ptr + 7);
 
 	od->x_pos = *(ptr + 8) * 8;
 	od->y_pos = ((*(ptr + 9)) & 0x7F) * 8;
@@ -1072,8 +1064,8 @@ void ScummEngine::updateObjectStates() {
 	int i;
 	ObjectData *od = &_objs[1];
 	for (i = 1; i < _numLocalObjects; i++, od++) {
-		// V0 MM, Room objects with Flag == 1 are objects with 'no-state' (room specific objects, non-pickup)
-		if (_game.version == 0 && od->flags == 1)
+		// V0 MM, objects with type == 1 are room objects (room specific objects, non-pickup)
+		if (_game.version == 0 && od->obj_type == 1)
 			continue;
 
 		if (od->obj_nr > 0)
diff --git a/engines/scumm/object.h b/engines/scumm/object.h
index cdf8b09e6f..edbff38355 100644
--- a/engines/scumm/object.h
+++ b/engines/scumm/object.h
@@ -62,7 +62,12 @@ struct ObjectData {
 	byte parentstate;
 	byte state;
 	byte fl_object_index;
-	byte flags;
+	// extra engine specific data
+	union {
+		byte extra;
+		byte obj_type; // v0
+		byte flags; // v8
+	};
 };
 
 #include "common/pack-start.h"	// START STRUCT PACKING
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 38dbd8270a..17135623e2 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -822,7 +822,7 @@ void ScummEngine::saveOrLoad(Serializer *s) {
 		MKLINE(ObjectData, parent, sleByte, VER(8)),
 		MKLINE(ObjectData, state, sleByte, VER(8)),
 		MKLINE(ObjectData, fl_object_index, sleByte, VER(8)),
-		MKLINE(ObjectData, flags, sleByte, VER(46)),
+		MKLINE(ObjectData, extra, sleByte, VER(46)),
 		MKEND()
 	};
 
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index cc59e608fd..07923dea6a 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -79,7 +79,7 @@ void ScummEngine_v0::setupOpcodes() {
 	OPCODE(0x22, o4_saveLoadGame);
 	OPCODE(0x23, o_stopCurrentScript);
 	/* 24 */
-	OPCODE(0x24, o_unknown2);
+	OPCODE(0x24, o_ifNotEqualActiveObject2);
 	OPCODE(0x25, o5_loadRoom);
 	OPCODE(0x26, o_getClosestObjActor);
 	OPCODE(0x27, o2_getActorY);
@@ -159,7 +159,7 @@ void ScummEngine_v0::setupOpcodes() {
 	OPCODE(0x62, o2_stopScript);
 	OPCODE(0x63, o_stopCurrentScript);
 	/* 64 */
-	OPCODE(0x64, o_ifActiveObject);
+	OPCODE(0x64, o_ifEqualActiveObject2);
 	OPCODE(0x65, o_stopCurrentScript);
 	OPCODE(0x66, o_getClosestObjActor);
 	OPCODE(0x67, o5_getActorFacing);
@@ -239,7 +239,7 @@ void ScummEngine_v0::setupOpcodes() {
 	OPCODE(0xa2, o4_saveLoadGame);
 	OPCODE(0xa3, o_stopCurrentScript);
 	/* A4 */
-	OPCODE(0xa4, o_unknown2);
+	OPCODE(0xa4, o_ifNotEqualActiveObject2);
 	OPCODE(0xa5, o5_loadRoom);
 	OPCODE(0xa6, o_stopCurrentScript);
 	OPCODE(0xa7, o2_getActorY);
@@ -319,7 +319,7 @@ void ScummEngine_v0::setupOpcodes() {
 	OPCODE(0xe2, o2_stopScript);
 	OPCODE(0xe3, o_stopCurrentScript);
 	/* E4 */
-	OPCODE(0xe4, o_ifActiveObject);
+	OPCODE(0xe4, o_ifEqualActiveObject2);
 	OPCODE(0xe5, o_loadRoomWithEgo);
 	OPCODE(0xe6, o_stopCurrentScript);
 	OPCODE(0xe7, o5_getActorFacing);
@@ -406,130 +406,67 @@ void ScummEngine_v0::decodeParseString() {
 	actorTalk(buffer);
 }
 
-void ScummEngine_v0::drawSentenceWord(int object, bool usePrep, bool objInInventory) {
+const byte *ScummEngine_v0::getObjectName(int object, int type) {
 	const byte *temp;
-	int sentencePrep = 0;
 
-	// If object not in inventory, we except an index
-	if (!objInInventory)
-		_v0ObjectIndex = true;
-	else
+	if (type == kObjectTypeInventory)
 		_v0ObjectInInventory = true;
 
 	temp = getObjOrActorName(object);
 
 	_v0ObjectInInventory = false;
-	_v0ObjectIndex = false;
 
-	// Append the 'object-name'
+	return temp;
+}
+
+void ScummEngine_v0::drawSentenceObject(int object, int type) {
+	const byte *temp;
+	temp = getObjectName(object, type);
 	if (temp) {
 		_sentenceBuf += " ";
 		_sentenceBuf += (const char *)temp;
 	}
-
-	// Append the modifier? (With / On / To / In)
-	if (!usePrep)
-		return;
-
-	if (_verbs[_activeVerb].prep == 0xFF) {
-		_v0ObjectInInventory = objInInventory;
-		sentencePrep = verbPrep(object);
-	} else {
-		sentencePrep = _verbs[_activeVerb].prep;
-	}
-
-	if (sentencePrep > 0 && sentencePrep <= 4) {
-		// The prepositions, like the fonts, were hard code in the engine. Thus
-		// we have to do that, too, and provde localized versions for all the
-		// languages MM/Zak are available in.
-		static const char *const prepositions[][5] = {
-			{ " ", " in", " with", " on", " to" },   // English
-			{ " ", " mit", " mit", " mit", " zu" },  // German
-			{ " ", " dans", " avec", " sur", " <" }, // French
-			{ " ", " in", " con", " su", " a" },     // Italian
-			{ " ", " en", " con", " en", " a" },     // Spanish
-			};
-		int lang;
-		switch (_language) {
-		case Common::DE_DEU:
-			lang = 1;
-			break;
-		case Common::FR_FRA:
-			lang = 2;
-			break;
-		case Common::IT_ITA:
-			lang = 3;
-			break;
-		case Common::ES_ESP:
-			lang = 4;
-			break;
-		default:
-			lang = 0;	// Default to english
-		}
-
-		_sentenceBuf += prepositions[lang][sentencePrep];
-	}
 }
 
 void ScummEngine_v0::drawSentence() {
 	Common::Rect sentenceline;
-	bool		 inventoryFirst = false;
 
 	if (!(_userState & 32))
 		return;
 
-	// Current Verb, Walk/Use
+	// Current Verb
+	if (_activeVerb == 0)
+		_activeVerb = 13;
 	if (getResourceAddress(rtVerb, _activeVerb)) {
 		_sentenceBuf = (char *)getResourceAddress(rtVerb, _activeVerb);
 	} else {
 		return;
 	}
 
-	// If using inventory first, draw it first
-	if (_activeInvExecute && _activeInventory) {
-		drawSentenceWord(_activeInventory, true, true);
-	} else {
-		// Not using inventory, use selected object
-		if (_activeObject)
-			drawSentenceWord(_activeObjectIndex, true, false);
-		else
-			inventoryFirst = true;
-	}
-
-
-	// Draw the inventory?
-	if (_activeInventory > 0 && _activeObject2 == 0) {
-		// Only if inventory isnt first (it will already be drawn by now)
-		if (!_activeInvExecute) {
-			drawSentenceWord(_activeInventory, inventoryFirst, true);
-		} else {
-			// Draw the active object, which could be inventory based, or room based
-			if (_activeObject && !_activeObjectIndex) {
-				drawSentenceWord(_activeObject, inventoryFirst, true);
-			} else // Room based
-				drawSentenceWord(_activeObjectIndex, inventoryFirst, false);
-		}
-
-	// Draw the 2nd active object
-	} else if (_activeObject2) {
-
-		// 2nd Object is in inventory
-		if (_activeObject2Inv) {
-			_v0ObjectInInventory = true;
-			drawSentenceWord(_activeObject2, inventoryFirst, true);
-		} else {
-			drawSentenceWord(_activeObject2Index, inventoryFirst, false);
+	if (_activeObject) {
+		// Draw the 1st active object
+		drawSentenceObject(_activeObject, _activeObjectType);
+
+		// Append verb preposition
+		int sentencePrep = verbPrep();
+		if (sentencePrep) {
+			drawPreposition(sentencePrep);
+
+			// Draw the 2nd active object
+			if (_activeObject2) {
+				// 2nd Object is an actor
+				if (_activeObject2Type == kObjectTypeActor) {
+					Actor *a = derefActor(_activeObject2, "");
+					_sentenceBuf += " ";
+					_sentenceBuf += (const char *)a->getActorName();
+				// 2nd Object is an inventory or room object
+				} else {
+					drawSentenceObject(_activeObject2, _activeObject2Type);
+				}
+			}
 		}
 	}
 
-	// Draw the active actor
-	if (_activeActor) {
-		Actor *a = derefActor(_activeActor, "");
-
-		_sentenceBuf += " ";
-		_sentenceBuf += (const char *)a->getActorName();
-	}
-
 	_string[2].charset = 1;
 	_string[2].ypos = _virtscr[kVerbVirtScreen].topline;
 	_string[2].xpos = 0;
@@ -890,15 +827,21 @@ void ScummEngine_v0::o_doSentence() {
 	runObjectScript(obj, entry, false, false, NULL);
 }
 
-void ScummEngine_v0::o_unknown2() {
-	byte var1 = fetchScriptByte();
-	error("STUB: o_unknown2(%d)", var1);
+bool ScummEngine_v0::ifEqualActiveObject2Common(bool inventoryObject) {
+	byte obj = fetchScriptByte();
+	if (!inventoryObject || (_activeObject2Type == kObjectTypeInventory))
+		return (obj == _activeObject2);
+	return false;
 }
 
-void ScummEngine_v0::o_ifActiveObject() {
-	byte obj = fetchScriptByte();
+void ScummEngine_v0::o_ifEqualActiveObject2() {
+	bool equal = ifEqualActiveObject2Common((_opcode & 0x80) == 0);
+	jumpRelative(equal);
+}
 
-	jumpRelative(obj == _activeInventory);
+void ScummEngine_v0::o_ifNotEqualActiveObject2() {
+	bool equal = ifEqualActiveObject2Common((_opcode & 0x80) == 0);
+	jumpRelative(!equal);
 }
 
 void ScummEngine_v0::o_getClosestObjActor() {
@@ -1004,19 +947,15 @@ void ScummEngine_v0::resetSentence(bool walking) {
 	// Then reset all active objects (stops the radio crash, bug #3077966)
 	if (!walking || !(_userState & 32)) {
 		_v0ObjectFlag = 0;
-		_activeInventory = 0;
 		_activeObject = 0;
 		_activeObject2 = 0;
-		_activeObjectIndex = 0;
-		_activeObject2Index = 0;
 	}
 
 	_verbExecuting = false;
 	_verbPickup = false;
 
-	_activeActor = 0;
-	_activeInvExecute = false;
-	_activeObject2Inv = false;
+	_activeObjectType = kObjectTypeRoom;
+	_activeObject2Type = kObjectTypeRoom;
 	_activeObjectObtained = false;
 	_activeObject2Obtained = false;
 }
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index edb046d571..76f6b02eb7 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -953,6 +953,41 @@ void ScummEngine_v2::o2_doSentence() {
 	}
 }
 
+void ScummEngine_v2::drawPreposition(int index) {
+		// The prepositions, like the fonts, were hard code in the engine. Thus
+		// we have to do that, too, and provde localized versions for all the
+		// languages MM/Zak are available in.
+		const char *prepositions[][5] = {
+			{ " ", " in", " with", " on", " to" },   // English
+			{ " ", " mit", " mit", " mit", " zu" },  // German
+			{ " ", " dans", " avec", " sur", " <" }, // French
+			{ " ", " in", " con", " su", " a" },     // Italian
+			{ " ", " en", " con", " en", " a" },     // Spanish
+			};
+		int lang;
+		switch (_language) {
+		case Common::DE_DEU:
+			lang = 1;
+			break;
+		case Common::FR_FRA:
+			lang = 2;
+			break;
+		case Common::IT_ITA:
+			lang = 3;
+			break;
+		case Common::ES_ESP:
+			lang = 4;
+			break;
+		default:
+			lang = 0;	// Default to english
+		}
+
+		if (_game.platform == Common::kPlatformNES) {
+			_sentenceBuf += (const char *)(getResourceAddress(rtCostume, 78) + VAR(VAR_SENTENCE_PREPOSITION) * 8 + 2);
+		} else
+			_sentenceBuf += prepositions[lang][index];
+}
+
 void ScummEngine_v2::o2_drawSentence() {
 	Common::Rect sentenceline;
 	const byte *temp;
@@ -986,38 +1021,7 @@ void ScummEngine_v2::o2_drawSentence() {
 	}
 
 	if (0 < VAR(VAR_SENTENCE_PREPOSITION) && VAR(VAR_SENTENCE_PREPOSITION) <= 4) {
-		// The prepositions, like the fonts, were hard code in the engine. Thus
-		// we have to do that, too, and provde localized versions for all the
-		// languages MM/Zak are available in.
-		const char *prepositions[][5] = {
-			{ " ", " in", " with", " on", " to" },   // English
-			{ " ", " mit", " mit", " mit", " zu" },  // German
-			{ " ", " dans", " avec", " sur", " <" }, // French
-			{ " ", " in", " con", " su", " a" },     // Italian
-			{ " ", " en", " con", " en", " a" },     // Spanish
-			};
-		int lang;
-		switch (_language) {
-		case Common::DE_DEU:
-			lang = 1;
-			break;
-		case Common::FR_FRA:
-			lang = 2;
-			break;
-		case Common::IT_ITA:
-			lang = 3;
-			break;
-		case Common::ES_ESP:
-			lang = 4;
-			break;
-		default:
-			lang = 0;	// Default to english
-		}
-
-		if (_game.platform == Common::kPlatformNES) {
-			_sentenceBuf += (const char *)(getResourceAddress(rtCostume, 78) + VAR(VAR_SENTENCE_PREPOSITION) * 8 + 2);
-		} else
-			_sentenceBuf += prepositions[lang][VAR(VAR_SENTENCE_PREPOSITION)];
+		drawPreposition(VAR(VAR_SENTENCE_PREPOSITION));
 	}
 
 	if (VAR(VAR_SENTENCE_OBJECT2) > 0) {
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index d3cc218cd3..d3dc702395 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -701,10 +701,6 @@ ScummEngine_v2::ScummEngine_v2(OSystem *syst, const DetectorResult &dr)
 
 	_inventoryOffset = 0;
 
-	_activeInventory = 0;
-	_activeObject = 0;
-	_activeVerb = 0;
-
 	VAR_SENTENCE_VERB = 0xFF;
 	VAR_SENTENCE_OBJECT1 = 0xFF;
 	VAR_SENTENCE_OBJECT2 = 0xFF;
@@ -723,11 +719,11 @@ ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr)
 	_verbPickup = false;
 	_currentMode = 0;
 
+	_activeVerb = 0;
+	_activeObject = 0;
 	_activeObject2 = 0;
-	_activeObjectIndex = 0;
-	_activeObject2Index = 0;
-	_activeInvExecute = false;
-	_activeObject2Inv = false;
+	_activeObjectType = kObjectTypeRoom;
+	_activeObject2Type = kObjectTypeRoom;
 	_activeObjectObtained = false;
 	_activeObject2Obtained = false;
 
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index af481df0e0..d9629948fe 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -31,22 +31,27 @@ namespace Scumm {
  * Engine for Apple II and Commodore 64 versions of Maniac Mansion
  */
 class ScummEngine_v0 : public ScummEngine_v2 {
+protected:
+	enum ObjectType {
+		kObjectTypeInventory = 0,
+		kObjectTypeRoom = 1,
+		kObjectTypeActor = 2
+	};
+
 protected:
 	byte _currentMode;
 	bool _verbExecuting;			// is a verb executing
 	bool _verbPickup;				// are we picking up an object during a verb execute
 
-	int _activeActor;				// Actor Number
+	int _activeVerb;
+	int _activeObject;				// 1st Object Number
+	int _activeObjectType;			// 1st Object Type (0: inventory, 1: room)
 	int _activeObject2;				// 2nd Object Number
+	int _activeObject2Type;			// 2nd Object Type (0: inventory, 1: room, 2: actor)
 
-	bool _activeInvExecute;			// is activeInventory first to be executed
-	bool _activeObject2Inv;			// is activeobject2 in the inventory
 	bool _activeObjectObtained;		// collected _activeobject?
 	bool _activeObject2Obtained;	// collected _activeObject2?
 
-	int _activeObjectIndex;
-	int _activeObject2Index;
-
 public:
 	ScummEngine_v0(OSystem *syst, const DetectorResult &dr);
 
@@ -68,21 +73,21 @@ protected:
 	virtual void saveOrLoad(Serializer *s);
 
 	// V0 MM Verb commands
-	int  verbPrep(int object);
-	bool verbMove(int object, int objectIndex, bool invObject);
+	int  verbPrep();
+	bool verbMove(int object, bool invObject);
 	bool verbMoveToActor(int actor);
-	bool verbObtain(int object, int objIndex);
+	bool verbObtain(int object, int objType);
 	bool verbExecutes(int object, bool inventory = false);
 	bool verbExec();
 
-	int findObjectIndex(int x, int y);
-
 	virtual void checkExecVerbs();
 	virtual void handleMouseOver(bool updateInventory);
 	void resetVerbs();
 	void setNewKidVerbs();
 
-	void drawSentenceWord(int object, bool usePrep, bool objInInventory);
+	const byte *getObjectName(int object, int type);
+
+	void drawSentenceObject(int object, int type);
 	void drawSentence();
 
 	void switchActor(int slot);
@@ -96,6 +101,10 @@ protected:
 
 	virtual bool areBoxesNeighbors(int box1nr, int box2nr);
 
+	virtual void setActiveInventory(int object);
+
+	bool ifEqualActiveObject2Common(bool ignoreType);
+
 	/* Version C64 script opcodes */
 	void o_stopCurrentScript();
 	void o_loadSound();
@@ -123,8 +132,8 @@ protected:
 	void o_getBitVar();
 	void o_setBitVar();
 	void o_doSentence();
-	void o_unknown2();
-	void o_ifActiveObject();
+	void o_ifEqualActiveObject2();
+	void o_ifNotEqualActiveObject2();
 	void o_getClosestObjActor();
 	void o_printEgo_c64();
 	void o_print_c64();
diff --git a/engines/scumm/scumm_v2.h b/engines/scumm/scumm_v2.h
index 47c5fa2626..1f41283852 100644
--- a/engines/scumm/scumm_v2.h
+++ b/engines/scumm/scumm_v2.h
@@ -44,10 +44,6 @@ protected:
 	Common::String _sentenceBuf;
 	uint16 _inventoryOffset;
 
-	int _activeInventory;
-	int _activeObject;
-	int _activeVerb;
-
 public:
 	ScummEngine_v2(OSystem *syst, const DetectorResult &dr);
 
@@ -100,6 +96,10 @@ protected:
 
 	virtual void setBuiltinCursor(int index);
 
+	void drawPreposition(int index);
+
+	virtual void setActiveInventory(int object);
+
 	/* Version 2 script opcodes */
 	void o2_actorFromPos();
 	void o2_actorOps();
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 3398cca05c..1bb0c0a34d 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -354,6 +354,15 @@ void ScummEngine_v2::checkV2MouseOver(Common::Point pos) {
 	}
 }
 
+void ScummEngine_v2::setActiveInventory(int object) {
+	runInputScript(kInventoryClickArea, object, 0);
+}
+
+void ScummEngine_v0::setActiveInventory(int object) {
+	// TODO
+	//_activeInventory = object;
+}
+
 void ScummEngine_v2::checkV2Inventory(int x, int y) {
 	int inventoryArea = (_game.platform == Common::kPlatformNES) ? 48: 32;
 	int object = 0;
@@ -385,15 +394,8 @@ void ScummEngine_v2::checkV2Inventory(int x, int y) {
 		return;
 
 	object = findInventory(_scummVars[VAR_EGO], object + 1 + _inventoryOffset);
-
-	if (object > 0) {
-		if (_game.version == 0) {
-			_activeInventory = object;
-
-		} else {
-			runInputScript(kInventoryClickArea, object, 0);
-		}
-	}
+	if (object > 0)
+		setActiveInventory(object);
 }
 
 void ScummEngine_v2::redrawV2Inventory() {
@@ -674,15 +676,8 @@ void ScummEngine_v2::checkExecVerbs() {
 
 		if (object != -1) {
 			object = findInventory(_scummVars[VAR_EGO], object + 1 + _inventoryOffset);
-
-			if (object > 0) {
-				if (_game.version == 0) {
-					_activeInventory = object;
-
-				} else {
-					runInputScript(kInventoryClickArea, object, 0);
-				}
-			}
+			if (object > 0)
+				setActiveInventory(object);
 			return;
 		}
 
@@ -741,8 +736,11 @@ void ScummEngine_v0::runObject(int obj, int entry) {
 
 		// For some reasons, certain objects don't have a "give" script
 		} else if (VAR(VAR_ACTIVE_ACTOR) > 0 && VAR(VAR_ACTIVE_ACTOR) < 8) {
+			// TODO
+			/*
 			if (_activeInventory)
 				setOwnerOf(_activeInventory, VAR(VAR_ACTIVE_ACTOR));
+			*/
 		}
 	}
 }
@@ -764,16 +762,14 @@ bool ScummEngine_v0::verbMoveToActor(int actor) {
 	return true;
 }
 
-bool ScummEngine_v0::verbMove(int object, int objectIndex, bool invObject) {
+bool ScummEngine_v0::verbMove(int object, bool invObject) {
 	int x, y, dir;
 	Actor *a = derefActor(VAR(VAR_EGO), "verbMove");
 
 	if (_currentMode != 3 && _currentMode != 2)
 		return false;
 
-	_v0ObjectIndex = true;
-	getObjectXYPos(objectIndex, x, y, dir);
-	_v0ObjectIndex = false;
+	getObjectXYPos(object, x, y, dir);
 
 	// Detect distance from target object
 	int dist =  getDist(a->getRealPos().x, a->getRealPos().y, x, y);
@@ -789,17 +785,13 @@ bool ScummEngine_v0::verbMove(int object, int objectIndex, bool invObject) {
 	} else {
 		// Finished walk, are we picking up the item?
 		if (_verbPickup) {
-			int oldActive = _activeObject, oldIndex = _activeObjectIndex;
+			int oldActive = _activeObject;
 			_activeObject = object;
-			_activeObjectIndex = objectIndex;
 
-			_v0ObjectIndex = true;
 			// Execute pickup
-			runObject(objectIndex, 14);
-			_v0ObjectIndex = false;
+			runObject(object, 14);
 
 			_activeObject = oldActive;
-			_activeObjectIndex = oldIndex;
 
 			// Finished picking up
 			_verbPickup = false;
@@ -809,18 +801,19 @@ bool ScummEngine_v0::verbMove(int object, int objectIndex, bool invObject) {
 	return false;
 }
 
-bool ScummEngine_v0::verbObtain(int obj, int objIndex) {
+bool ScummEngine_v0::verbObtain(int obj, int objType) {
 	bool didPickup = false;
+	int prep;
+	int where;
 
-	int prep, where = whereIsObjectInventory(obj);
-
-	if (objIndex == 0)
+	if (!obj)
 		return false;
 
+	where = whereIsObjectInventory(obj);
+
 	// Object in inventory ?
 	if (where != WIO_INVENTORY) {
-		_v0ObjectIndex = true;
-		prep = verbPrep(objIndex);
+		prep = verbPrep();
 
 		if (prep == 1 || prep == 4) {
 			if (_activeVerb != 13 && _activeVerb != 14) {
@@ -839,11 +832,13 @@ bool ScummEngine_v0::verbObtain(int obj, int objIndex) {
 		}
 
 		//attempt move to object
-		if (verbMove(obj, objIndex, false))
+		if (verbMove(obj, false))
 			return true;
 
 		if (didPickup && (prep == 1 || prep == 4))
 			if (_activeVerb != 13 && _activeVerb != 14) {
+				// TODO
+				/*
 				_v0ObjectInInventory = true;
 
 				if (whereIsObject(obj) == WIO_INVENTORY)
@@ -852,27 +847,32 @@ bool ScummEngine_v0::verbObtain(int obj, int objIndex) {
 					resetSentence(false);
 
 				_v0ObjectInInventory = false;
+				*/
 			}
 	}
 
 	return false;
 }
 
-int ScummEngine_v0::verbPrep(int object) {
-	if (!_v0ObjectInInventory)
-		_v0ObjectIndex = true;
-	else
-		_v0ObjectIndex = false;
+int ScummEngine_v0::verbPrep() {
+	if (_verbs[_activeVerb].prep != 0xFF) {
+		return _verbs[_activeVerb].prep;
+	} else {
+		if (!_v0ObjectInInventory)
+			_v0ObjectIndex = true;
+		else
+			_v0ObjectIndex = false;
 
-	byte *ptr = getOBCDFromObject(object);
-	_v0ObjectIndex = false;
-	assert(ptr);
-	return (*(ptr + 11) >> 5);
+		byte *ptr = getOBCDFromObject(_activeObject);
+		_v0ObjectIndex = false;
+		assert(ptr);
+		return (*(ptr + 11) >> 5);
+	}
 }
 
 bool ScummEngine_v0::verbExecutes(int object, bool inventory) {
 	_v0ObjectInInventory = inventory;
-	int prep = verbPrep(object);
+	int prep = verbPrep();
 
 	if (prep == 2 || prep == 0) {
 		return true;
@@ -885,44 +885,34 @@ bool ScummEngine_v0::verbExec() {
 	int prep = 0;
 	int entry = (_currentMode != 0 && _currentMode != 1) ? _activeVerb : 15;
 
-	if ((!_activeInvExecute && _activeObject && getObjectIndex(_activeObject) == -1)) {
+	if (_activeObject && getObjectIndex(_activeObject) == -1) {
 		resetSentence(false);
 		return false;
 	}
 
 	// Lets try walk to the object
-	if (_activeObject && _activeObjectIndex && !_activeObjectObtained && _currentMode != 0) {
-		prep = verbPrep(_activeObjectIndex);
+	if (_activeObject && !_activeObjectObtained && _currentMode != 0) {
+		prep = verbPrep();
 
-		if (verbObtain(_activeObject, _activeObjectIndex))
+		if (verbObtain(_activeObject, _activeObjectType))
 			return true;
 
 		_activeObjectObtained = true;
 	}
 
 	// Attempt to obtain/reach object2
-	if (_activeObject2 && _activeObject2Index && !_activeObject2Obtained && _currentMode != 0) {
-		prep = verbPrep(_activeObject2Index);
-
+	if (_activeObject2 && !_activeObject2Obtained && _currentMode != 0) {
 		_v0ObjectInInventory = false;
-		if (verbObtain(_activeObject2, _activeObject2Index))
+		if (verbObtain(_activeObject2, _activeObject2Type))
 			return true;
 
-		if (prep != 1 && prep != 4) {
-			_activeInventory = _activeObject;
-			_activeObject = _activeObject2;
-			_activeObjectIndex = _activeObject2Index;
-			_activeObject2 = 0;
-			_activeObject2Index = 0;
-		}
-
 		_activeObject2Obtained = true;
 	}
 
 	// Give-To
-	if (_activeVerb == 3 && _activeInventory && _activeActor) {
+	if (_activeVerb == 3 && _activeObject && _activeObject2 && _activeObject2Type == kObjectTypeActor) {
 		// FIXME: Actors need to turn and face each other
-		if (verbMoveToActor(_activeActor)) {
+		if (verbMoveToActor(_activeObject2)) {
 			// Ignore verbs?
 			Actor *a = derefActor(VAR(VAR_EGO), "verbExec");
 			if (((ActorC64 *)a)->_miscflags & 0x40) {
@@ -933,8 +923,8 @@ bool ScummEngine_v0::verbExec() {
 			return true;
 		}
 		_v0ObjectInInventory = true;
-		VAR(VAR_ACTIVE_ACTOR) = _activeActor;
-		runObject(_activeInventory , 3);
+		VAR(VAR_ACTIVE_ACTOR) = _activeObject2;
+		runObject(_activeObject , 3);
 		_v0ObjectInInventory = false;
 
 		resetSentence(false);
@@ -942,10 +932,8 @@ bool ScummEngine_v0::verbExec() {
 	}
 
 	// Where we performing an action on an actor?
-	if (_activeActor) {
-		_v0ObjectIndex = true;
-		runObject(_activeActor, entry);
-		_v0ObjectIndex = false;
+	if (_activeObject2 && _activeObject2Type == kObjectTypeActor) {
+		runObject(_activeObject2, entry);
 		_verbExecuting = false;
 
 		resetSentence(false);
@@ -953,10 +941,8 @@ bool ScummEngine_v0::verbExec() {
 	}
 
 	// If we've finished walking (now near target), execute the action
-	if (_activeObject && _activeObjectIndex && verbPrep(_activeObjectIndex) == 2) {
-		_v0ObjectIndex = true;
-		runObject(_activeObjectIndex, entry);
-		_v0ObjectIndex = false;
+	if (_activeObject && verbPrep() == 2) {
+		runObject(_activeObject, entry);
 		_verbExecuting = false;
 
 		if ((_currentMode == 3 || _currentMode == 2) && _activeVerb == 13)
@@ -967,10 +953,9 @@ bool ScummEngine_v0::verbExec() {
 	}
 
 	// We acted on an inventory item
-	if (_activeInventory && verbExecutes(_activeInventory, true) && _activeVerb != 3) {
+	if (/*_activeInventory && verbExecutes(_activeInventory, true) &&*/ _activeVerb != 3) {
 		_v0ObjectInInventory = true;
-		_activeObject = _activeInventory;
-		runObject(_activeInventory, _activeVerb);
+		runObject(_activeObject/*2*/, _activeVerb);
 
 		_verbExecuting = false;
 
@@ -985,14 +970,13 @@ bool ScummEngine_v0::verbExec() {
 
 	// Item not in inventory is executed
 	if (_activeObject) {
-		_v0ObjectIndex = true;
-		runObject(_activeObjectIndex, entry);
-		_v0ObjectIndex = false;
-	} else if (_activeInventory) {
+		runObject(_activeObject, entry);
+	} else if (/*_activeInventory*/false) {
+#if 0
 		// Not sure this is the correct way to do this,
 		// however its working for most situations - segra
 		if (verbExecutes(_activeInventory, true) == false) {
-			if (_activeObject2 && _activeObject2Inv && verbExecutes(_activeObject2, true)) {
+			if (_activeObject2 && _activeObject2Type == kObjectTypeInventory && verbExecutes(_activeObject2, true)) {
 				_v0ObjectInInventory = true;
 
 				_activeObject = _activeInventory;
@@ -1013,6 +997,7 @@ bool ScummEngine_v0::verbExec() {
 			_v0ObjectInInventory = true;
 			runObject(_activeInventory, _activeVerb);
 		}
+#endif
 	}
 
 	_verbExecuting = false;
@@ -1060,9 +1045,7 @@ void ScummEngine_v0::checkExecVerbs() {
 	// What-Is selected, any object we hover over is selected, on mouse press we set to WalkTo
 	if (_activeVerb == 15) {
 		int obj = findObject(_virtualMouse.x, _virtualMouse.y);
-		int objIdx = findObjectIndex(_virtualMouse.x, _virtualMouse.y);
 		_activeObject = obj;
-		_activeObjectIndex = objIdx;
 
 		if ((_mouseAndKeyboardStat & MBS_MOUSE_MASK))
 			_activeVerb = 13;	// Walk-To
@@ -1080,11 +1063,13 @@ void ScummEngine_v0::checkExecVerbs() {
 		if (zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) {
 			// TODO
 		} else if (zone->number == kVerbVirtScreen && _mouse.y > zone->topline + 32) {
+#if 0
 			int prevInventory = _activeInventory;
+#endif
 			int invOff = _inventoryOffset;
 
 			// GIVE: actor must be selected (not possible via inventory)
-			if ((_activeVerb == 3) && (_activeObject || _activeInventory))
+			if ((_activeVerb == 3) && _activeObject)
 				return;
 
 			// Click into V2 inventory
@@ -1094,31 +1079,16 @@ void ScummEngine_v0::checkExecVerbs() {
 			if (invOff != _inventoryOffset)
 				return;
 
+#if 0
 			// No inventory selected?
 			if (!_activeInventory)
 				return;
 
 			// Did we just change the selected inventory item?
 			if (prevInventory && prevInventory != _activeInventory && _activeInventory != _activeObject2) {
-				_v0ObjectInInventory = true;
-				int prep = verbPrep(_activeInventory);
-				_v0ObjectInInventory = true;
-				int prep2 = verbPrep(prevInventory);
-
-				// Should the new inventory object remain as the secondary selected object
-				// Or should the new inventory object become primary?
-				if (prep != prep2 || prep != 1) {
-					if (prep == 1 || prep == 3) {
-						int tmp = _activeInventory;
-						_activeInventory = prevInventory;
-						prevInventory = tmp;
-					}
-				}
-
 				// Setup object2
 				_activeObject = 0;
-				_activeInvExecute = true;
-				_activeObject2Inv = true;
+				_activeObject2Type = kObjectTypeInventory;
 				_activeObject2 = _activeInventory;
 				_activeInventory = prevInventory;
 				return;
@@ -1132,14 +1102,14 @@ void ScummEngine_v0::checkExecVerbs() {
 			if (prevInventory != _activeInventory)
 				if (!_activeObject2 || prevInventory != _activeObject2)
 					return;
+#endif
 
-			if (_activeVerb == 11 && !(((_activeObject || _activeInventory)) || !_activeObject2))
+			if (_activeVerb == 11 && !(_activeObject || !_activeObject2))
 				return;
 		} else {
 			int over = findVerbAtPos(_mouse.x, _mouse.y);
 			int act  = getActorFromPos(_virtualMouse.x, _virtualMouse.y);
 			int obj  = findObject(_virtualMouse.x, _virtualMouse.y);
-			int objIdx = findObjectIndex(_virtualMouse.x, _virtualMouse.y);
 
 			if (a->_miscflags & 0x80) {
 				if (_activeVerb != 7 && over != 7) {
@@ -1207,15 +1177,15 @@ void ScummEngine_v0::checkExecVerbs() {
 
 			// Only allowing targetting actors if its the GIVE verb
 			if (_activeVerb == 3) {
-				if (_activeObject || _activeInventory) {
+				if (_activeObject) {
 					// Once selected the object cannot be changed
 					obj = 0;
-					objIdx = 0;
 
 					// Different actor selected?
 					if (act) {
-						if (_activeActor != act) {
-							_activeActor = act;
+						if (_activeObject2 != act || _activeObject2Type != kObjectTypeActor) {
+							_activeObject2 = act;
+							_activeObject2Type = kObjectTypeActor;
 							return;
 						}
 					} else {
@@ -1230,24 +1200,15 @@ void ScummEngine_v0::checkExecVerbs() {
 			}
 
 			if (obj && obj != _activeObject) {
-				if (!_activeObject)
-					if (_activeInventory)
-						_activeInvExecute = true;
-
 				// USE / UNLOCK
 				if (_activeVerb == 11 || _activeVerb == 8) {
 					if (obj != _activeObject && obj != _activeObject2) {
-						if (_activeObject || _activeInventory) {
-							//verbPrep(
-						}
-						if (!_activeObject || _activeInventory) {
+						if (!_activeObject) {
 							_activeObject = obj;
-							_activeObjectIndex = objIdx;
 							return;
 						} else {
 							if (_activeObject2 != obj) {
 								_activeObject2 = obj;
-								_activeObject2Index = objIdx;
 								return;
 							}
 						}
@@ -1256,8 +1217,6 @@ void ScummEngine_v0::checkExecVerbs() {
 					a->stopActorMoving();
 
 					_activeObject = obj;
-					_activeObjectIndex = objIdx;
-
 					if (_activeVerb != 13)
 						return;
 
-- 
cgit v1.2.3


From a709a4231937fef823352cffb7146a94d9f8cccf Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 3 Jan 2012 22:58:25 +0100
Subject: SCUMM: fix ScummEngine_v0::o_stopCurrentScript()

---
 engines/scumm/script_v0.cpp |  9 +--------
 engines/scumm/script_v2.cpp | 10 +++++-----
 engines/scumm/scumm_v2.h    |  1 +
 3 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 07923dea6a..2bbde617ad 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -501,14 +501,7 @@ void ScummEngine_v0::drawSentence() {
 }
 
 void ScummEngine_v0::o_stopCurrentScript() {
-	int script;
-
-	script = vm.slot[_currentScript].number;
-
-	if (_currentScript != 0 && vm.slot[_currentScript].number == script)
-		stopObjectCode();
-	else
-		stopScript(script);
+	stopScriptCommon(0);
 }
 
 void ScummEngine_v0::o_loadSound() {
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 76f6b02eb7..003bafa27e 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1190,11 +1190,7 @@ void ScummEngine_v2::o2_startScript() {
 	runScript(script, 0, 0, 0);
 }
 
-void ScummEngine_v2::o2_stopScript() {
-	int script;
-
-	script = getVarOrDirectByte(PARAM_1);
-
+void ScummEngine_v2::stopScriptCommon(int script) {
 	if (_game.id == GID_MANIAC && _roomResource == 26 && vm.slot[_currentScript].number == 10001) {
 	// FIXME: Nasty hack for bug #915575
 	// Don't let the exit script for room 26 stop the script (116), when
@@ -1215,6 +1211,10 @@ void ScummEngine_v2::o2_stopScript() {
 		stopScript(script);
 }
 
+void ScummEngine_v2::o2_stopScript() {
+	stopScriptCommon(getVarOrDirectByte(PARAM_1));
+}
+
 void ScummEngine_v2::o2_panCameraTo() {
 	panCameraTo(getVarOrDirectByte(PARAM_1) * V12_X_MULTIPLIER, 0);
 }
diff --git a/engines/scumm/scumm_v2.h b/engines/scumm/scumm_v2.h
index 1f41283852..a4da4fb2dc 100644
--- a/engines/scumm/scumm_v2.h
+++ b/engines/scumm/scumm_v2.h
@@ -85,6 +85,7 @@ protected:
 	void ifNotStateCommon(byte type);
 	void setStateCommon(byte type);
 	void clearStateCommon(byte type);
+	void stopScriptCommon(int script);
 
 	virtual void resetSentence(bool walking);
 	void setUserState(byte state);
-- 
cgit v1.2.3


From c69a52853ccc42f3891ce4212fa281dbea65c3ea Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Wed, 4 Jan 2012 16:18:18 +0100
Subject: SCUMM: remove unneeded verbPrep() calls

---
 engines/scumm/verbs.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 1bb0c0a34d..dc4a47a231 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -882,7 +882,6 @@ bool ScummEngine_v0::verbExecutes(int object, bool inventory) {
 }
 
 bool ScummEngine_v0::verbExec() {
-	int prep = 0;
 	int entry = (_currentMode != 0 && _currentMode != 1) ? _activeVerb : 15;
 
 	if (_activeObject && getObjectIndex(_activeObject) == -1) {
@@ -892,8 +891,6 @@ bool ScummEngine_v0::verbExec() {
 
 	// Lets try walk to the object
 	if (_activeObject && !_activeObjectObtained && _currentMode != 0) {
-		prep = verbPrep();
-
 		if (verbObtain(_activeObject, _activeObjectType))
 			return true;
 
-- 
cgit v1.2.3


From 1c32000a004cc184a8744e2467035a4c7ba2f3a5 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 7 Jan 2012 16:08:55 +0100
Subject: SCUMM: start handling object type and id correctly in mm c64

- removed complicated and unnecessary _v0ObjectIndex, _v0ObjectInInventory, _v0ObjectFlag vars
- started to merge object id and type into one object value (type<<8|id)
- verb preposition ids do not dependent on language -> remove from VerbSettings

Note:
- objects with type=0 are foreground objects. They have a state, an owner and a bg overlay image.
- objects with type=1 are bg objects. They do not have a state or owner and are already contained in the bg image. The do not have an entry in objectState/OwnerTable
---
 engines/scumm/object.cpp    |  74 +++---
 engines/scumm/object.h      |   8 +
 engines/scumm/script.cpp    |   2 -
 engines/scumm/script_v0.cpp |  65 ++----
 engines/scumm/script_v2.cpp |   2 -
 engines/scumm/scumm.cpp     |  11 +-
 engines/scumm/scumm.h       |   7 +-
 engines/scumm/scumm_v0.h    |  29 ++-
 engines/scumm/verbs.cpp     | 542 ++++++++++++++++++++++----------------------
 9 files changed, 360 insertions(+), 380 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index a9e2a76345..53dc0151d9 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -178,10 +178,7 @@ void ScummEngine::clearOwnerOf(int obj) {
 		// Alternatively, scan the inventory to see if the object is in there...
 		for (i = 0; i < _numInventory; i++) {
 			if (_inventory[i] == obj) {
-				if (_game.version == 0)
-					assert(WIO_INVENTORY == whereIsObjectInventory(obj));
-				else
-					assert(WIO_INVENTORY == whereIsObject(obj));
+				assert(WIO_INVENTORY == whereIsObject(obj));
 
 				// Found the object! Nuke it from the inventory.
 				_res->nukeResource(rtInventory, i);
@@ -310,52 +307,50 @@ int ScummEngine::getObjectRoom(int obj) const {
 
 int ScummEngine::getObjectIndex(int object) const {
 	int i;
+	int nr = (_game.version != 0) ? object : OBJECT_V0_NR(object);
 
-	if (object < 1)
+	if (nr < 1)
 		return -1;
 
 	for (i = (_numLocalObjects-1); i > 0; i--) {
-		if (_game.version == 0 )
-			if( _objs[i].obj_type != _v0ObjectFlag )
-				continue;
+		if (_game.version == 0 && _objs[i].obj_type != OBJECT_V0_TYPE(object))
+			continue;
 
-		if (_objs[i].obj_nr == object)
+		if (_objs[i].obj_nr == nr)
 			return i;
 	}
 	return -1;
 }
 
-int ScummEngine::whereIsObjectInventory(int object) {
-	int res = 0;
-	_v0ObjectInInventory = true;
-	res = whereIsObject(object);
-	_v0ObjectInInventory = false;
-
-	return res;
-}
-
 int ScummEngine::whereIsObject(int object) const {
 	int i;
 
-	if (object >= _numGlobalObjects)
+	// Note: in MMC64 bg objects are greater _numGlobalObjects
+	if (_game.version != 0 && object >= _numGlobalObjects)
 		return WIO_NOT_FOUND;
 
 	if (object < 1)
 		return WIO_NOT_FOUND;
 
-	if ((_objectOwnerTable[object] != OF_OWNER_ROOM && _game.version != 0) || _v0ObjectInInventory) {
+	if ((_game.version != 0 || OBJECT_V0_TYPE(object) == 0) &&
+		 _objectOwnerTable[object] != OF_OWNER_ROOM) 
+	{
 		for (i = 0; i < _numInventory; i++)
 			if (_inventory[i] == object)
 				return WIO_INVENTORY;
 		return WIO_NOT_FOUND;
 	}
 
-	for (i = (_numLocalObjects-1); i > 0; i--)
-		if ((_objs[i].obj_nr == object && !_v0ObjectIndex) || (_v0ObjectIndex && i == object)) {
+	for (i = (_numLocalObjects-1); i > 0; i--) {
+		int nr = (_game.version != 0) ? object : OBJECT_V0_NR(object);
+		if (_objs[i].obj_nr == nr) {
+			if (_game.version == 0 && _objs[i].obj_type != OBJECT_V0_TYPE(object))
+				continue;
 			if (_objs[i].fl_object_index)
 				return WIO_FLOBJECT;
 			return WIO_ROOM;
 		}
+	}
 
 	return WIO_NOT_FOUND;
 }
@@ -396,7 +391,7 @@ int ScummEngine::getObjectOrActorXY(int object, int &x, int &y) {
  * Returns X, Y and direction in angles
  */
 void ScummEngine::getObjectXYPos(int object, int &x, int &y, int &dir) {
-	int idx = (_v0ObjectIndex) ? object : getObjectIndex(object);
+	int idx = getObjectIndex(object);
 	assert(idx >= 0);
 	ObjectData &od = _objs[idx];
 	int state;
@@ -497,6 +492,7 @@ int ScummEngine::findObject(int x, int y) {
 	byte a;
 	const int mask = (_game.version <= 2) ? kObjectState_08 : 0xF;
 
+	// FIXME(TOBIAS): <= _numLocalObjects?
 	for (i = 1; i < _numLocalObjects; i++) {
 		if ((_objs[i].obj_nr < 1) || getClass(_objs[i].obj_nr, kObjectClassUntouchable))
 			continue;
@@ -522,11 +518,8 @@ int ScummEngine::findObject(int x, int y) {
 #endif
 				if (_objs[i].x_pos <= x && _objs[i].width + _objs[i].x_pos > x &&
 				    _objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y) {
-					// MMC64: Set the object search flag
 					if (_game.version == 0)
-						_v0ObjectFlag = _objs[i].obj_type;
-					if (_game.version == 0 && _v0ObjectIndex)
-						return i;
+						return OBJECT_V0(_objs[i].obj_nr, _objs[i].obj_type);
 					else
 						return _objs[i].obj_nr;
 				}
@@ -1165,7 +1158,7 @@ const byte *ScummEngine::getObjOrActorName(int obj) {
 		}
 	}
 
-	objptr = getOBCDFromObject(obj);
+	objptr = getOBCDFromObject(obj, true);
 	if (objptr == NULL)
 		return NULL;
 
@@ -1218,15 +1211,14 @@ void ScummEngine::setObjectName(int obj) {
 uint32 ScummEngine::getOBCDOffs(int object) const {
 	int i;
 
-	if ((_objectOwnerTable[object] != OF_OWNER_ROOM && (_game.version != 0))  || _v0ObjectInInventory)
+	if ((_game.version != 0 || OBJECT_V0_TYPE(object) == 0) &&
+		_objectOwnerTable[object] != OF_OWNER_ROOM)
 		return 0;
 
-	// V0 MM Return by Index
-	if (_v0ObjectIndex)
-		return _objs[object].OBCDoffset;
-
 	for (i = (_numLocalObjects-1); i > 0; i--) {
 		if (_objs[i].obj_nr == object) {
+			if (_game.version == 0 && _objs[i].obj_type != OBJECT_V0_TYPE(object))
+				continue;
 			if (_objs[i].fl_object_index != 0)
 				return 8;
 			return _objs[i].OBCDoffset;
@@ -1235,21 +1227,25 @@ uint32 ScummEngine::getOBCDOffs(int object) const {
 	return 0;
 }
 
-byte *ScummEngine::getOBCDFromObject(int obj) {
-	bool useInventory = _v0ObjectInInventory;
+byte *ScummEngine::getOBCDFromObject(int obj, bool v0CheckInventory) {
 	int i;
 	byte *ptr;
 
-	_v0ObjectInInventory = false;
-
-	if ((_objectOwnerTable[obj] != OF_OWNER_ROOM && (_game.version != 0)) || useInventory) {
+	if ((_game.version != 0 || OBJECT_V0_TYPE(obj) == 0) &&
+		_objectOwnerTable[obj] != OF_OWNER_ROOM) 
+	{
+		if (_game.version == 0 && !v0CheckInventory)
+			return 0;
 		for (i = 0; i < _numInventory; i++) {
 			if (_inventory[i] == obj)
 				return getResourceAddress(rtInventory, i);
 		}
 	} else {
 		for (i = (_numLocalObjects-1); i > 0; --i) {
-			if ((_objs[i].obj_nr == obj && !_v0ObjectIndex) || (_v0ObjectIndex && i == obj)) {
+			int nr = (_game.version != 0) ? obj : OBJECT_V0_NR(obj);
+			if (_objs[i].obj_nr == nr) {
+				if (_game.version == 0 && _objs[i].obj_type != OBJECT_V0_TYPE(obj))
+					continue;
 				if (_objs[i].fl_object_index) {
 					assert(_objs[i].OBCDoffset == 8);
 					ptr = getResourceAddress(rtFlObject, _objs[i].fl_object_index);
diff --git a/engines/scumm/object.h b/engines/scumm/object.h
index edbff38355..7e4a5b57ab 100644
--- a/engines/scumm/object.h
+++ b/engines/scumm/object.h
@@ -24,6 +24,14 @@
 
 namespace Scumm {
 
+static inline int OBJECT_V0(int id, byte type) {
+	assert(id < 255);
+	return (type << 8 | id);
+}
+#define OBJECT_V0_NR(obj)	(obj & 0xFF)
+#define OBJECT_V0_TYPE(obj)	((obj >> 8) & 0xFF)
+
+
 enum ObjectClass {
 	kObjectClassNeverClip = 20,
 	kObjectClassAlwaysClip = 21,
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 37ea3a9a9f..d04c3c0891 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -131,8 +131,6 @@ void ScummEngine::runObjectScript(int object, int entry, bool freezeResistant, b
 
 	initializeLocals(slot, vars);
 
-	// V0 Ensure we don't try and access objects via index inside the script
-	_v0ObjectIndex = false;
 	runScriptNested(slot);
 }
 
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 2bbde617ad..14df89b28d 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -365,7 +365,7 @@ uint ScummEngine_v0::fetchScriptWord() {
 
 int ScummEngine_v0::getActiveObject() {
 	if (_opcode & PARAM_2)
-		return _activeObject;
+		return _activeObjectNr;
 
 	return fetchScriptByte();
 }
@@ -406,22 +406,9 @@ void ScummEngine_v0::decodeParseString() {
 	actorTalk(buffer);
 }
 
-const byte *ScummEngine_v0::getObjectName(int object, int type) {
-	const byte *temp;
-
-	if (type == kObjectTypeInventory)
-		_v0ObjectInInventory = true;
-
-	temp = getObjOrActorName(object);
-
-	_v0ObjectInInventory = false;
-
-	return temp;
-}
-
 void ScummEngine_v0::drawSentenceObject(int object, int type) {
 	const byte *temp;
-	temp = getObjectName(object, type);
+	temp = getObjOrActorName(OBJECT_V0(object, type));
 	if (temp) {
 		_sentenceBuf += " ";
 		_sentenceBuf += (const char *)temp;
@@ -443,25 +430,25 @@ void ScummEngine_v0::drawSentence() {
 		return;
 	}
 
-	if (_activeObject) {
+	if (_activeObjectNr) {
 		// Draw the 1st active object
-		drawSentenceObject(_activeObject, _activeObjectType);
+		drawSentenceObject(_activeObjectNr, _activeObjectType);
 
 		// Append verb preposition
-		int sentencePrep = verbPrep();
+		int sentencePrep = activeVerbPrep();
 		if (sentencePrep) {
 			drawPreposition(sentencePrep);
 
 			// Draw the 2nd active object
-			if (_activeObject2) {
+			if (_activeObject2Nr) {
 				// 2nd Object is an actor
 				if (_activeObject2Type == kObjectTypeActor) {
-					Actor *a = derefActor(_activeObject2, "");
+					Actor *a = derefActor(_activeObject2Nr, "");
 					_sentenceBuf += " ";
 					_sentenceBuf += (const char *)a->getActorName();
 				// 2nd Object is an inventory or room object
 				} else {
-					drawSentenceObject(_activeObject2, _activeObject2Type);
+					drawSentenceObject(_activeObject2Nr, _activeObject2Type);
 				}
 			}
 		}
@@ -705,26 +692,13 @@ void ScummEngine_v0::o_putActorAtObject() {
 }
 
 void ScummEngine_v0::o_pickupObject() {
-	int obj = fetchScriptByte();
-	if (obj == 0) {
-		if (_activeObject) {
-			obj = _activeObject;
-		} else {
-			// might happen if an inventory item was picked again
-			return;
-		}
-	}
+	int objNr = fetchScriptByte();
+	int obj = OBJECT_V0((objNr ? objNr : _activeObjectNr), 0);
 
-	if (obj < 1) {
-		error("pickupObject received invalid index %d (script %d)", obj, vm.slot[_currentScript].number);
-	}
-
-	if (getObjectIndex(obj) == -1)
+	/* Don't take an object twice */
+	if (whereIsObject(obj) == WIO_INVENTORY)
 		return;
 
-	if (whereIsObjectInventory(_activeObject2) == WIO_INVENTORY)	/* Don't take an */
-		return;					/* object twice */
-
 	addObjectToInventory(obj, _roomResource);
 	markObjectRectAsDirty(obj);
 	putOwner(obj, VAR(VAR_EGO));
@@ -822,8 +796,8 @@ void ScummEngine_v0::o_doSentence() {
 
 bool ScummEngine_v0::ifEqualActiveObject2Common(bool inventoryObject) {
 	byte obj = fetchScriptByte();
-	if (!inventoryObject || (_activeObject2Type == kObjectTypeInventory))
-		return (obj == _activeObject2);
+	if (!inventoryObject || (_activeObject2Type == kObjectTypeFG))
+		return (obj == _activeObject2Nr);
 	return false;
 }
 
@@ -920,7 +894,7 @@ void ScummEngine_v0::o_setOwnerOf() {
 	owner = getVarOrDirectByte(PARAM_2);
 
 	if (obj == 0)
-		obj = _activeObject;
+		obj = _activeObjectNr;
 
 	// FIXME: the original interpreter seems to set the owner of 
 	// an item to remove (new owner 0) to 13 (purple tentacle).
@@ -939,16 +913,15 @@ void ScummEngine_v0::resetSentence(bool walking) {
 	// If the actor is walking, or the screen is a keypad (no sentence verbs/objects are drawn)
 	// Then reset all active objects (stops the radio crash, bug #3077966)
 	if (!walking || !(_userState & 32)) {
-		_v0ObjectFlag = 0;
-		_activeObject = 0;
-		_activeObject2 = 0;
+		_activeObjectNr = 0;
+		_activeObjectType = kObjectTypeBG;
+		_activeObject2Nr = 0;
+		_activeObject2Type = kObjectTypeBG;
 	}
 
 	_verbExecuting = false;
 	_verbPickup = false;
 
-	_activeObjectType = kObjectTypeRoom;
-	_activeObject2Type = kObjectTypeRoom;
 	_activeObjectObtained = false;
 	_activeObject2Obtained = false;
 }
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 003bafa27e..1ea3257c17 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1223,8 +1223,6 @@ void ScummEngine_v2::o2_walkActorToObject() {
 	int obj;
 	Actor *a;
 
-	_v0ObjectFlag = 0;
-
 	a = derefActor(getVarOrDirectByte(PARAM_1), "o2_walkActorToObject");
 	obj = getVarOrDirectWord(PARAM_2);
 	if (whereIsObject(obj) != WIO_NOT_FOUND) {
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index d3dc702395..423ad79b00 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -151,9 +151,6 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 	_fileHandle = 0;
 
 	// Init all vars
-	_v0ObjectIndex = false;
-	_v0ObjectInInventory = false;
-	_v0ObjectFlag = 0;
 	_imuse = NULL;
 	_imuseDigital = NULL;
 	_musicEngine = NULL;
@@ -720,10 +717,10 @@ ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr)
 	_currentMode = 0;
 
 	_activeVerb = 0;
-	_activeObject = 0;
-	_activeObject2 = 0;
-	_activeObjectType = kObjectTypeRoom;
-	_activeObject2Type = kObjectTypeRoom;
+	_activeObjectNr = 0;
+	_activeObject2Nr = 0;
+	_activeObjectType = kObjectTypeBG;
+	_activeObject2Type = kObjectTypeBG;
 	_activeObjectObtained = false;
 	_activeObject2Obtained = false;
 
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index d9237b2b30..f004176da1 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -502,10 +502,6 @@ protected:
 	int32 *_scummVars;
 	byte *_bitVars;
 
-	bool _v0ObjectIndex;			// V0 Use object index, instead of object number
-	bool _v0ObjectInInventory;		// V0 Use object number from inventory
-	byte _v0ObjectFlag;
-
 	/* Global resource tables */
 	int _numVariables, _numBitVariables, _numLocalObjects;
 	int _numGlobalObjects, _numArray, _numVerbs, _numFlObject;
@@ -799,7 +795,6 @@ protected:
 	int getObjNewDir(int obj);
 	int getObjectIndex(int object) const;
 	int getObjectImageCount(int object);
-	int whereIsObjectInventory(int object);
 	int whereIsObject(int object) const;
 	int findObject(int x, int y);
 	void findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint object, uint room);
@@ -820,7 +815,7 @@ protected:
 	virtual void clearDrawQueues();
 
 	uint32 getOBCDOffs(int object) const;
-	byte *getOBCDFromObject(int obj);
+	byte *getOBCDFromObject(int obj, bool v0CheckInventory = true);
 	const byte *getOBIMFromObjectData(const ObjectData &od);
 	const byte *getObjectImage(const byte *ptr, int state);
 	virtual int getObjectIdFromOBIM(const byte *obim);
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index d9629948fe..0bb4d1a4a9 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -33,9 +33,16 @@ namespace Scumm {
 class ScummEngine_v0 : public ScummEngine_v2 {
 protected:
 	enum ObjectType {
-		kObjectTypeInventory = 0,
-		kObjectTypeRoom = 1,
-		kObjectTypeActor = 2
+		kObjectTypeFG = 0,    // foreground object
+		                      //   - with owner/state, might (but has not to) be pickupable
+		                      //     -> with entry in _objectOwner/StateTable
+		                      //     -> all objects in _inventory have this type
+		                      //   - image can be exchanged (background overlay)
+		kObjectTypeBG = 1,    // background object
+		                      //   - without owner/state, not pickupable  (room only)
+		                      //     -> without entry in _objectOwner/StateTable
+		                      //   - image cannot be exchanged (part of background image)
+		kObjectTypeActor = 2  // object is an actor
 	};
 
 protected:
@@ -44,10 +51,10 @@ protected:
 	bool _verbPickup;				// are we picking up an object during a verb execute
 
 	int _activeVerb;
-	int _activeObject;				// 1st Object Number
-	int _activeObjectType;			// 1st Object Type (0: inventory, 1: room)
-	int _activeObject2;				// 2nd Object Number
-	int _activeObject2Type;			// 2nd Object Type (0: inventory, 1: room, 2: actor)
+	int _activeObjectNr;			// 1st Object Number
+	int _activeObjectType;			// 1st Object Type (0: inventory (or room), 1: room)
+	int _activeObject2Nr;			// 2nd Object Number
+	int _activeObject2Type;			// 2nd Object Type (0: inventory (or room), 1: room, 2: actor)
 
 	bool _activeObjectObtained;		// collected _activeobject?
 	bool _activeObject2Obtained;	// collected _activeObject2?
@@ -73,20 +80,20 @@ protected:
 	virtual void saveOrLoad(Serializer *s);
 
 	// V0 MM Verb commands
-	int  verbPrep();
+	int getVerbPrepId();
+	int activeVerbPrep();
 	bool verbMove(int object, bool invObject);
 	bool verbMoveToActor(int actor);
-	bool verbObtain(int object, int objType);
+	bool verbObtain(int object);
 	bool verbExecutes(int object, bool inventory = false);
 	bool verbExec();
 
 	virtual void checkExecVerbs();
 	virtual void handleMouseOver(bool updateInventory);
+	int verbPrepIdType(int verbid);
 	void resetVerbs();
 	void setNewKidVerbs();
 
-	const byte *getObjectName(int object, int type);
-
 	void drawSentenceObject(int object, int type);
 	void drawSentence();
 
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index dc4a47a231..467b587b63 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -37,51 +37,82 @@ enum {
 	kSentenceLine = 6
 };
 
+enum VerbsV0 {
+	kVerbNone    = 0,
+	kVerbOpen    = 1,
+	kVerbClose   = 2,
+	kVerbGive    = 3,
+	kVerbTurnOn  = 4,
+	kVerbTurnOff = 5,
+	kVerbFix     = 6,
+	kVerbNewKid  = 7,
+	kVerbUnlock  = 8,
+	kVerbPush    = 9,
+	kVerbPull    = 10,
+	kVerbUse     = 11,
+	kVerbRead    = 12,
+	kVerbWalkTo  = 13,
+	kVerbPickUp  = 14,
+	kVerbWhatIs  = 15
+};
+
 struct VerbSettings {
 	int id;
 	int x_pos;
 	int y_pos;
-	int prep;
 	const char *name;
 };
 
 static const VerbSettings v0VerbTable_English[] = {
-	{ 1,  8, 0,   0, "Open"},
-	{ 2,  8, 1,   0, "Close"},
-	{ 3,  0, 2,   4, "Give"},
-	{ 4, 32, 0,   0, "Turn on"},
-	{ 5, 32, 1,   0, "Turn off"},
-	{ 6, 32, 2,   2, "Fix"},
-	{ 7, 24, 0,   0, "New Kid"},
-	{ 8, 24, 1,   2, "Unlock"},
-	{ 9,  0, 0,   0, "Push"},
-	{10,  0, 1,   0, "Pull"},
-	{11, 24, 2, 255, "Use"},
-	{12,  8, 2,   0, "Read"},
-	{13, 15, 0,   0, "Walk to"},
-	{14, 15, 1,   0, "Pick up"},
-	{15, 15, 2,   0, "What is"}
+	{kVerbOpen,     8, 0, "Open"},
+	{kVerbClose,    8, 1, "Close"},
+	{kVerbGive,     0, 2, "Give"},
+	{kVerbTurnOn,  32, 0, "Turn on"},
+	{kVerbTurnOff, 32, 1, "Turn off"},
+	{kVerbFix,     32, 2, "Fix"},
+	{kVerbNewKid,  24, 0, "New Kid"},
+	{kVerbUnlock,  24, 1, "Unlock"},
+	{kVerbPush,     0, 0, "Push"},
+	{kVerbPull,     0, 1, "Pull"},
+	{kVerbUse,     24, 2, "Use"},
+	{kVerbRead,     8, 2, "Read"},
+	{kVerbWalkTo,  15, 0, "Walk to"},
+	{kVerbPickUp,  15, 1, "Pick up"},
+	{kVerbWhatIs,  15, 2, "What is"}
 };
 
 // FIXME: Replace * with the correct character
 static const VerbSettings v0VerbTable_German[] = {
-	{ 1,  7, 0,   0, "$ffne"},
-	{ 2, 13, 1,   0, "Schlie*e"},
-	{ 3,  0, 2,   4, "Gebe"},
-	{ 4, 37, 1,   0, "Ein"},
-	{ 5, 37, 0,   0, "Aus"},
-	{ 6, 23, 1,   2, "Repariere"},
-	{ 7, 34, 2,   0, "Person"},
-	{ 8, 23, 0,   2, "Schlie*e auf"},
-	{ 9,  0, 0,   0, "Dr<cke"},
-	{10,  0, 1,   0, "Ziehe"},
-	{11, 23, 2, 255, "Benutz"},
-	{12,  7, 2,   0, "Lese"},
-	{13, 13, 0,   0, "Gehe zu"},
-	{14,  7, 1,   0, "Nimm"},
-	{15, 13, 2,   0, "Was ist"}
+	{kVerbOpen,     7, 0, "$ffne"},
+	{kVerbClose,   13, 1, "Schlie*e"},
+	{kVerbGive,     0, 2, "Gebe"},
+	{kVerbTurnOn,  37, 1, "Ein"},
+	{kVerbTurnOff, 37, 0, "Aus"},
+	{kVerbFix,     23, 1, "Repariere"},
+	{kVerbNewKid,  34, 2, "Person"},
+	{kVerbUnlock,  23, 0, "Schlie*e auf"},
+	{kVerbPush,     0, 0, "Dr<cke"},
+	{kVerbPull,     0, 1, "Ziehe"},
+	{kVerbUse,     23, 2, "Benutz"},
+	{kVerbRead,     7, 2, "Lese"},
+	{kVerbWalkTo,  13, 0, "Gehe zu"},
+	{kVerbPickUp,   7, 1, "Nimm"},
+	{kVerbWhatIs,  13, 2, "Was ist"}
 };
 
+int ScummEngine_v0::verbPrepIdType(int verbid) {
+	switch (verbid) {
+	case kVerbUse: // depends on object1
+		return 0xFF;
+	case kVerbGive: 
+		return 4;
+	case kVerbUnlock: case kVerbFix:
+		return 2;
+	default:
+		return 0;
+	}
+}
+
 void ScummEngine_v0::resetVerbs() {
 	VirtScreen *virt = &_virtscr[kVerbVirtScreen];
 	VerbSlot *vs;
@@ -112,7 +143,7 @@ void ScummEngine_v0::resetVerbs() {
 		vs->key = 0;
 		vs->center = 0;
 		vs->imgindex = 0;
-		vs->prep = vtable[i - 1].prep;
+		vs->prep = verbPrepIdType(vtable[i - 1].id);
 		vs->curRect.left = vtable[i - 1].x_pos * 8;
 		vs->curRect.top = vtable[i - 1].y_pos * 8 + virt->topline + 8;
 		loadPtrToResource(rtVerb, i, (const byte*)vtable[i - 1].name);
@@ -433,9 +464,7 @@ void ScummEngine_v2::redrawV2Inventory() {
 		_string[1].right = _mouseOverBoxesV2[i].rect.right - 1;
 		_string[1].color = _mouseOverBoxesV2[i].color;
 
-		_v0ObjectInInventory = true;
 		const byte *tmp = getObjOrActorName(obj);
-		_v0ObjectInInventory = false;
 		assert(tmp);
 
 		// Prevent inventory entries from overflowing by truncating the text
@@ -518,7 +547,7 @@ void ScummEngine_v2::handleMouseOver(bool updateInventory) {
 }
 
 void ScummEngine_v0::handleMouseOver(bool updateInventory) {
-	drawSentence();
+	//drawSentence();
 	ScummEngine_v2::handleMouseOver(updateInventory);
 }
 
@@ -713,8 +742,6 @@ void ScummEngine_v2::checkExecVerbs() {
 }
 
 void ScummEngine_v0::runObject(int obj, int entry) {
-	bool prev = _v0ObjectInInventory;
-
 	if (getVerbEntrypoint(obj, entry) == 0) {
 		// If nothing was found, attempt to find the 'WHAT-IS' verb script
 		// (which is not really the what-is script, as this verb never actually executes
@@ -724,23 +751,20 @@ void ScummEngine_v0::runObject(int obj, int entry) {
 		}
 	}
 
-	_v0ObjectInInventory = prev;
-
 	if (getVerbEntrypoint(obj, entry) != 0) {
-		_v0ObjectInInventory = prev;
 		runObjectScript(obj, entry, false, false, NULL);
 	} else if (entry != 13 && entry != 15) {
-		if (_activeVerb != 3) {
+		if (_activeVerb == kVerbGive) {
+			// For some reasons, certain objects don't have a "give" script
+			if (VAR(VAR_ACTIVE_ACTOR) > 0 && VAR(VAR_ACTIVE_ACTOR) < 8) {
+				if (OBJECT_V0_TYPE(obj) == kObjectTypeFG) {
+					assert(false);
+					setOwnerOf(obj, VAR(VAR_ACTIVE_ACTOR));
+				}
+			}
+		} else {
 			VAR(VAR_ACTIVE_VERB) = entry;
 			runScript(3, 0, 0, 0);
-
-		// For some reasons, certain objects don't have a "give" script
-		} else if (VAR(VAR_ACTIVE_ACTOR) > 0 && VAR(VAR_ACTIVE_ACTOR) < 8) {
-			// TODO
-			/*
-			if (_activeInventory)
-				setOwnerOf(_activeInventory, VAR(VAR_ACTIVE_ACTOR));
-			*/
 		}
 	}
 }
@@ -785,13 +809,16 @@ bool ScummEngine_v0::verbMove(int object, bool invObject) {
 	} else {
 		// Finished walk, are we picking up the item?
 		if (_verbPickup) {
-			int oldActive = _activeObject;
-			_activeObject = object;
+			int oldActive = OBJECT_V0(_activeObjectNr, _activeObjectType);
+
+			_activeObjectNr = OBJECT_V0_NR(object);
+			_activeObjectType = OBJECT_V0_TYPE(object);
 
 			// Execute pickup
 			runObject(object, 14);
 
-			_activeObject = oldActive;
+			_activeObjectNr = OBJECT_V0_NR(oldActive);
+			_activeObjectType = OBJECT_V0_TYPE(oldActive);
 
 			// Finished picking up
 			_verbPickup = false;
@@ -801,7 +828,7 @@ bool ScummEngine_v0::verbMove(int object, bool invObject) {
 	return false;
 }
 
-bool ScummEngine_v0::verbObtain(int obj, int objType) {
+bool ScummEngine_v0::verbObtain(int obj) {
 	bool didPickup = false;
 	int prep;
 	int where;
@@ -809,11 +836,11 @@ bool ScummEngine_v0::verbObtain(int obj, int objType) {
 	if (!obj)
 		return false;
 
-	where = whereIsObjectInventory(obj);
+	where = whereIsObject(obj);
 
 	// Object in inventory ?
 	if (where != WIO_INVENTORY) {
-		prep = verbPrep();
+		prep = activeVerbPrep();
 
 		if (prep == 1 || prep == 4) {
 			if (_activeVerb != 13 && _activeVerb != 14) {
@@ -837,79 +864,63 @@ bool ScummEngine_v0::verbObtain(int obj, int objType) {
 
 		if (didPickup && (prep == 1 || prep == 4))
 			if (_activeVerb != 13 && _activeVerb != 14) {
-				// TODO
-				/*
-				_v0ObjectInInventory = true;
-
+// TODO(TOBIAS)
+#if 0
 				if (whereIsObject(obj) == WIO_INVENTORY)
 					_activeInventory = obj;
 				else
 					resetSentence(false);
-
-				_v0ObjectInInventory = false;
-				*/
+#endif
 			}
 	}
 
 	return false;
 }
 
-int ScummEngine_v0::verbPrep() {
+int ScummEngine_v0::getVerbPrepId() {
 	if (_verbs[_activeVerb].prep != 0xFF) {
 		return _verbs[_activeVerb].prep;
 	} else {
-		if (!_v0ObjectInInventory)
-			_v0ObjectIndex = true;
-		else
-			_v0ObjectIndex = false;
-
-		byte *ptr = getOBCDFromObject(_activeObject);
-		_v0ObjectIndex = false;
+		byte *ptr = getOBCDFromObject(OBJECT_V0(_activeObjectNr, _activeObjectType), true);
 		assert(ptr);
 		return (*(ptr + 11) >> 5);
 	}
 }
 
-bool ScummEngine_v0::verbExecutes(int object, bool inventory) {
-	_v0ObjectInInventory = inventory;
-	int prep = verbPrep();
-
-	if (prep == 2 || prep == 0) {
-		return true;
-	}
-
-	return false;
+int ScummEngine_v0::activeVerbPrep() {
+	if (!_activeVerb || !_activeObjectNr)
+		return 0;
+	return getVerbPrepId();
 }
 
 bool ScummEngine_v0::verbExec() {
 	int entry = (_currentMode != 0 && _currentMode != 1) ? _activeVerb : 15;
 
-	if (_activeObject && getObjectIndex(_activeObject) == -1) {
+	if (_activeObjectNr && getObjectIndex(OBJECT_V0(_activeObjectNr, _activeObjectType)) == -1) {
 		resetSentence(false);
 		return false;
 	}
 
 	// Lets try walk to the object
-	if (_activeObject && !_activeObjectObtained && _currentMode != 0) {
-		if (verbObtain(_activeObject, _activeObjectType))
+	if (_activeObjectNr && !_activeObjectObtained && _currentMode != 0) {
+		if (verbObtain(OBJECT_V0(_activeObjectNr, _activeObjectType)))
 			return true;
 
 		_activeObjectObtained = true;
 	}
 
 	// Attempt to obtain/reach object2
-	if (_activeObject2 && !_activeObject2Obtained && _currentMode != 0) {
-		_v0ObjectInInventory = false;
-		if (verbObtain(_activeObject2, _activeObject2Type))
+	if (_activeObject2Nr && !_activeObject2Obtained && _currentMode != 0) {
+		if (verbObtain(OBJECT_V0(_activeObject2Nr, _activeObject2Type)))
 			return true;
 
 		_activeObject2Obtained = true;
 	}
 
 	// Give-To
-	if (_activeVerb == 3 && _activeObject && _activeObject2 && _activeObject2Type == kObjectTypeActor) {
+	if (_activeVerb == 3 && _activeObjectNr && _activeObject2Nr && _activeObject2Type == kObjectTypeActor) {
 		// FIXME: Actors need to turn and face each other
-		if (verbMoveToActor(_activeObject2)) {
+		if (verbMoveToActor(_activeObject2Nr)) {
 			// Ignore verbs?
 			Actor *a = derefActor(VAR(VAR_EGO), "verbExec");
 			if (((ActorC64 *)a)->_miscflags & 0x40) {
@@ -919,18 +930,16 @@ bool ScummEngine_v0::verbExec() {
 
 			return true;
 		}
-		_v0ObjectInInventory = true;
-		VAR(VAR_ACTIVE_ACTOR) = _activeObject2;
-		runObject(_activeObject , 3);
-		_v0ObjectInInventory = false;
+		VAR(VAR_ACTIVE_ACTOR) = _activeObject2Nr;
+		runObject(OBJECT_V0(_activeObjectNr, _activeObjectType), 3);
 
 		resetSentence(false);
 		return false;
 	}
 
 	// Where we performing an action on an actor?
-	if (_activeObject2 && _activeObject2Type == kObjectTypeActor) {
-		runObject(_activeObject2, entry);
+	if (_activeObject2Nr && _activeObject2Type == kObjectTypeActor) {
+		runObject(OBJECT_V0(_activeObject2Nr, _activeObject2Type), entry);
 		_verbExecuting = false;
 
 		resetSentence(false);
@@ -938,8 +947,8 @@ bool ScummEngine_v0::verbExec() {
 	}
 
 	// If we've finished walking (now near target), execute the action
-	if (_activeObject && verbPrep() == 2) {
-		runObject(_activeObject, entry);
+	if (_activeObjectNr && activeVerbPrep() == 2) {
+		runObject(OBJECT_V0(_activeObjectNr, _activeObjectType), entry);
 		_verbExecuting = false;
 
 		if ((_currentMode == 3 || _currentMode == 2) && _activeVerb == 13)
@@ -950,9 +959,8 @@ bool ScummEngine_v0::verbExec() {
 	}
 
 	// We acted on an inventory item
-	if (/*_activeInventory && verbExecutes(_activeInventory, true) &&*/ _activeVerb != 3) {
-		_v0ObjectInInventory = true;
-		runObject(_activeObject/*2*/, _activeVerb);
+	if (_activeVerb != 3) {
+		runObject(OBJECT_V0(_activeObjectNr/*2*/, _activeObjectType/*2*/), _activeVerb);
 
 		_verbExecuting = false;
 
@@ -965,36 +973,8 @@ bool ScummEngine_v0::verbExec() {
 		return false;
 	}
 
-	// Item not in inventory is executed
-	if (_activeObject) {
-		runObject(_activeObject, entry);
-	} else if (/*_activeInventory*/false) {
-#if 0
-		// Not sure this is the correct way to do this,
-		// however its working for most situations - segra
-		if (verbExecutes(_activeInventory, true) == false) {
-			if (_activeObject2 && _activeObject2Type == kObjectTypeInventory && verbExecutes(_activeObject2, true)) {
-				_v0ObjectInInventory = true;
-
-				_activeObject = _activeInventory;
-				_activeInventory = _activeObject2;
-
-				runObject(_activeObject, _activeVerb);
-			} else {
-				_v0ObjectInInventory = true;
-
-				if (_activeObject2) {
-					_activeObject = _activeObject2;
-
-					runObject(_activeObject, _activeVerb);
-				} else
-					runObject(_activeInventory, _activeVerb);
-			}
-		} else {
-			_v0ObjectInInventory = true;
-			runObject(_activeInventory, _activeVerb);
-		}
-#endif
+	if (_activeObjectNr) {
+		runObject(OBJECT_V0(_activeObjectNr, _activeObjectType), entry);
 	}
 
 	_verbExecuting = false;
@@ -1009,17 +989,182 @@ bool ScummEngine_v0::verbExec() {
 	return false;
 }
 
+#if 0
+verbExec() {
+	cmdStackMaxLeft = 6;
+	cmdStackPos = 0xFF;
+	if (verbSelectedID == 15) // WHAT IS
+		return;
+		
+	if (verbSelectedID != 13 || objectSelectedID != 0) {
+		cmdStackPos++;
+		cmdVerbID[cmdStackPos] = verbSelectedID;
+		cmdObjectID[cmdStackPos] = objectSelectedID;
+		cmdObjectType[cmdStackPos] = objectSelectedType;
+		cmdVerbPrepID[cmdStackPos] = verbPrepID;
+		cmdObject2ID[cmdStackPos] = objectSelected2ID;
+		cmdObject2Type[cmdStackPos] = objectSelected2Type;
+		
+		if (verbSelectedID != 13) { // WALK TO
+			verbSelectedID = 13;
+			objectSelectedID = 0;
+			verbPrepID = 0;
+		}
+		scriptUpdateSkip = 0;
+		return;
+	}
+	
+	currentActor = scriptVARS[0];
+	roomActor = gActorInRoom[currentActor];
+	tmpX = cursorX();
+	tmpY = cursorY();
+	actorSetPosInBox();
+
+	scriptVARS[6] = tmpX;
+	scriptVARS[7] = tmpY;
+	
+	if (gActor_miscFlags[scriptVARS[0]] & 0x40) {
+		rActor_scriptWalkToX[roomActor] = tmpX;
+		rActor_scriptWalkToX[roomActor] = tmpY;
+		walk_1C4A();
+	}
+}
+#endif
+
 void ScummEngine_v0::checkExecVerbs() {
 	ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "checkExecVerbs");
 	VirtScreen *zone = findVirtScreen(_mouse.y);
 
+	int scriptUpdateSkip;
+	int sentenceLineChanged = false;
+
+	/*
+	if (_userPut <= 0 || _mouseAndKeyboardStat == 0)
+		return;
+	*/
+
+	// Check if mouse click
+	if (_mouseAndKeyboardStat & MBS_MOUSE_MASK) {
+		int over = findVerbAtPos(_mouse.x, _mouse.y);
+		if (over && _activeVerb != over) {
+			_activeVerb = over;
+			//_activeVerbPrep = 0;
+			_activeObjectNr = 0;
+			_activeObjectType = 0;
+			_activeObject2Nr = 0;
+			_activeObject2Type = 0;
+			sentenceLineChanged = true;
+		}
+	}
+
+	if (a->_miscflags & 0x80) {
+		if (_activeVerb != kVerbNewKid) {
+			_activeVerb = kVerbNone;
+		}
+	}
+
+	// mode 1: kid selection, 3: normal
+	if (_currentMode != 0) {
+		if (_currentMode == 1) {
+			// kid selection or dial pad
+			_activeVerb = kVerbPush;
+		}
+
+		if ((_mouseAndKeyboardStat & MBS_MOUSE_MASK) || _activeVerb == kVerbWhatIs) {
+			int id;
+			byte type;
+			if (_activeVerb == kVerbGive && _activeObjectNr) {
+				id = getActorFromPos(_virtualMouse.x, _virtualMouse.y);
+				type = kObjectTypeActor;
+			} else {
+				int obj = findObject(_virtualMouse.x, _virtualMouse.y);
+				id = OBJECT_V0_NR(obj);
+				type = OBJECT_V0_TYPE(obj);
+				debug("found 0x%03x", obj);
+			}
+			if (!id) {
+				if (_activeVerb == kVerbWalkTo) {
+					_activeObjectNr = 0;
+					_activeObject2Nr = 0;
+				}
+			} else {
+				//_activeVerbPrep:
+				// 0: no activeObject or activeObject but no prep
+				// > 0: activeObject + prep
+				if (activeVerbPrep() == 0) {
+					if (id == _activeObjectNr && type == _activeObjectType) {
+						_verbExecuting = true;
+					} else {
+						_activeObjectNr = id;
+						_activeObjectType = type;
+					}
+					//sentenceLineChanged = true;
+					if (_currentMode == 1)
+						_verbExecuting = true;
+				} else {
+					if (id == _activeObject2Nr && type == _activeObject2Type)
+						_verbExecuting = true;
+					if (!(id == _activeObjectNr && type == _activeObjectType)) {
+						_activeObject2Nr = id;
+						_activeObject2Type = type;
+						if (_currentMode == 1)
+							_verbExecuting = true;
+					}
+				}
+			}
+
+			sentenceLineChanged = true;
+			if (_activeVerb == kVerbWalkTo) {
+				scriptUpdateSkip = 0;
+				_verbExecuting = true;
+			}
+		}
+	}
+
+	if (sentenceLineChanged)
+		drawSentence();
+
+	if (_activeVerb == kVerbNewKid) {
+		// TODO
+		if (_currentMode == 3) {
+			// get kid
+			_activeVerb = kVerbWalkTo;
+			resetSentence(false);
+			//switchActor(_verbs[over].verbid - 1);
+		}
+		_activeVerb = kVerbWalkTo;
+	}
+
+	if (_activeVerb == kVerbWalkTo) {
+		//exec();
+	}
+
+	/*
+	if (_activeVerbPrep == 0) {
+		int prep = activeVerbPrep();
+		if (prep == 0)
+			; //exec();
+		else {
+			_activeVerbPrep = prep;
+			; // draw()
+		}
+	} else {
+		if (_activeObject2 == 0)
+			; //drawSentence();
+		else
+			; // exec();
+	}
+	*/
+
+#if 0
 	// Is a verb currently executing
 	if (_verbExecuting) {
 		// Check if mouse click
 		if (_mouseAndKeyboardStat & MBS_MOUSE_MASK) {
 			int over = findVerbAtPos(_mouse.x, _mouse.y);
 			int act  = getActorFromPos(_virtualMouse.x, _virtualMouse.y);
-			int obj  = findObject(_virtualMouse.x, _virtualMouse.y);
+			byte type;
+			int obj  = findObject(_virtualMouse.x, _virtualMouse.y, &type);
 
 			if (over && over != _activeVerb) {
 				_activeVerb = over;
@@ -1039,17 +1184,6 @@ void ScummEngine_v0::checkExecVerbs() {
 		}
 	}
 
-	// What-Is selected, any object we hover over is selected, on mouse press we set to WalkTo
-	if (_activeVerb == 15) {
-		int obj = findObject(_virtualMouse.x, _virtualMouse.y);
-		_activeObject = obj;
-
-		if ((_mouseAndKeyboardStat & MBS_MOUSE_MASK))
-			_activeVerb = 13;	// Walk-To
-
-		return;
-	}
-
 	if (_userPut <= 0 || _mouseAndKeyboardStat == 0)
 		return;
 
@@ -1060,78 +1194,19 @@ void ScummEngine_v0::checkExecVerbs() {
 		if (zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) {
 			// TODO
 		} else if (zone->number == kVerbVirtScreen && _mouse.y > zone->topline + 32) {
-#if 0
-			int prevInventory = _activeInventory;
-#endif
 			int invOff = _inventoryOffset;
 
-			// GIVE: actor must be selected (not possible via inventory)
-			if ((_activeVerb == 3) && _activeObject)
-				return;
-
 			// Click into V2 inventory
 			checkV2Inventory(_mouse.x, _mouse.y);
 
 			// Did the Inventory position changed (arrows pressed, do nothing)
 			if (invOff != _inventoryOffset)
 				return;
-
-#if 0
-			// No inventory selected?
-			if (!_activeInventory)
-				return;
-
-			// Did we just change the selected inventory item?
-			if (prevInventory && prevInventory != _activeInventory && _activeInventory != _activeObject2) {
-				// Setup object2
-				_activeObject = 0;
-				_activeObject2Type = kObjectTypeInventory;
-				_activeObject2 = _activeInventory;
-				_activeInventory = prevInventory;
-				return;
-			}
-
-			// is the new selected inventory the same as the last selected?, reset to previous if it is
-			if (_activeInventory == _activeObject2)
-				_activeInventory = prevInventory;
-
-			// Inventory Selected changed
-			if (prevInventory != _activeInventory)
-				if (!_activeObject2 || prevInventory != _activeObject2)
-					return;
-#endif
-
-			if (_activeVerb == 11 && !(_activeObject || !_activeObject2))
-				return;
 		} else {
 			int over = findVerbAtPos(_mouse.x, _mouse.y);
 			int act  = getActorFromPos(_virtualMouse.x, _virtualMouse.y);
 			int obj  = findObject(_virtualMouse.x, _virtualMouse.y);
 
-			if (a->_miscflags & 0x80) {
-				if (_activeVerb != 7 && over != 7) {
-					_activeVerb = 0;
-					over = 0;
-				}
-			}
-
-			// Handle New Kid verb options
-			if (_activeVerb == 7 || over == 7) {
-				// Disable New-Kid (in the secret lab)
-				if (_currentMode == 2 || _currentMode == 0)
-					return;
-
-				if (_activeVerb == 7 && over) {
-					_activeVerb = 13;
-					switchActor(_verbs[over].verbid - 1);
-					return;
-				}
-
-				setNewKidVerbs();
-				_activeVerb = 7;
-
-				return;
-			}
 
 			// Clicked on nothing, walk here?
 			if (!over && !act && _activeVerb == 13 && !obj && _currentMode != 0) {
@@ -1154,77 +1229,10 @@ void ScummEngine_v0::checkExecVerbs() {
 				}
 				return;
 			}
-
-			// No new verb, use previous
-			if (over == 0)
-				over = _activeVerb;
-
-			// No verb selected, use walk-to
-			if (!_activeVerb)
-				_activeVerb = over = 13;		// Walk-To
-
-			// New verb selected
-			if (_activeVerb != over) {
-				_activeVerb = over;
-				if (_activeVerb == 13) {
-					resetSentence(false);
-				}
-				return;
-			}
-
-			// Only allowing targetting actors if its the GIVE verb
-			if (_activeVerb == 3) {
-				if (_activeObject) {
-					// Once selected the object cannot be changed
-					obj = 0;
-
-					// Different actor selected?
-					if (act) {
-						if (_activeObject2 != act || _activeObject2Type != kObjectTypeActor) {
-							_activeObject2 = act;
-							_activeObject2Type = kObjectTypeActor;
-							return;
-						}
-					} else {
-						return;
-					}
-				} else {
-					// An object has to be selected first
-					act = 0;
-					if (!obj)
-						return;
-				}
-			}
-
-			if (obj && obj != _activeObject) {
-				// USE / UNLOCK
-				if (_activeVerb == 11 || _activeVerb == 8) {
-					if (obj != _activeObject && obj != _activeObject2) {
-						if (!_activeObject) {
-							_activeObject = obj;
-							return;
-						} else {
-							if (_activeObject2 != obj) {
-								_activeObject2 = obj;
-								return;
-							}
-						}
-					}
-				} else {
-					a->stopActorMoving();
-
-					_activeObject = obj;
-					if (_activeVerb != 13)
-						return;
-
-					//return;
-				}
-			}
-		}
-
 		_verbExecuting = true;
 
 	}	// mouse k/b action
+#endif
 }
 
 void ScummEngine::verbMouseOver(int verb) {
-- 
cgit v1.2.3


From 6b5abf69190b47dc7c0da63fa08a717adbfc0cdd Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 7 Jan 2012 17:37:04 +0100
Subject: SCUMM: selecting inventory objects and inventory scrolling works
 again

---
 engines/scumm/scumm_v0.h |   2 -
 engines/scumm/scumm_v2.h |   2 +-
 engines/scumm/verbs.cpp  | 139 ++++++++++++++++++++++-------------------------
 3 files changed, 66 insertions(+), 77 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 0bb4d1a4a9..460843cfc2 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -108,8 +108,6 @@ protected:
 
 	virtual bool areBoxesNeighbors(int box1nr, int box2nr);
 
-	virtual void setActiveInventory(int object);
-
 	bool ifEqualActiveObject2Common(bool ignoreType);
 
 	/* Version C64 script opcodes */
diff --git a/engines/scumm/scumm_v2.h b/engines/scumm/scumm_v2.h
index a4da4fb2dc..b9cd8a3921 100644
--- a/engines/scumm/scumm_v2.h
+++ b/engines/scumm/scumm_v2.h
@@ -50,7 +50,7 @@ public:
 	virtual void resetScumm();
 
 	void checkV2MouseOver(Common::Point pos);
-	void checkV2Inventory(int x, int y);
+	int checkV2Inventory(int x, int y);
 	void redrawV2Inventory();
 
 protected:
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 467b587b63..291985892a 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -389,19 +389,14 @@ void ScummEngine_v2::setActiveInventory(int object) {
 	runInputScript(kInventoryClickArea, object, 0);
 }
 
-void ScummEngine_v0::setActiveInventory(int object) {
-	// TODO
-	//_activeInventory = object;
-}
-
-void ScummEngine_v2::checkV2Inventory(int x, int y) {
+int ScummEngine_v2::checkV2Inventory(int x, int y) {
 	int inventoryArea = (_game.platform == Common::kPlatformNES) ? 48: 32;
 	int object = 0;
 
 	y -= _virtscr[kVerbVirtScreen].topline;
 
 	if ((y < inventoryArea) || !(_mouseAndKeyboardStat & MBS_LEFT_CLICK))
-		return;
+		return 0;
 
 	if (_mouseOverBoxesV2[kInventoryUpArrow].rect.contains(x, y)) {
 		if (_inventoryOffset >= 2) {
@@ -422,11 +417,9 @@ void ScummEngine_v2::checkV2Inventory(int x, int y) {
 	}
 
 	if (object >= 4)
-		return;
+		return 0;
 
-	object = findInventory(_scummVars[VAR_EGO], object + 1 + _inventoryOffset);
-	if (object > 0)
-		setActiveInventory(object);
+	return findInventory(_scummVars[VAR_EGO], object + 1 + _inventoryOffset);
 }
 
 void ScummEngine_v2::redrawV2Inventory() {
@@ -706,7 +699,7 @@ void ScummEngine_v2::checkExecVerbs() {
 		if (object != -1) {
 			object = findInventory(_scummVars[VAR_EGO], object + 1 + _inventoryOffset);
 			if (object > 0)
-				setActiveInventory(object);
+				runInputScript(kInventoryClickArea, object, 0);
 			return;
 		}
 
@@ -727,7 +720,9 @@ void ScummEngine_v2::checkExecVerbs() {
 			runInputScript(kSentenceClickArea, 0, 0);
 		} else if (zone->number == kVerbVirtScreen && _mouse.y > zone->topline + inventoryArea) {
 			// Click into V2 inventory
-			checkV2Inventory(_mouse.x, _mouse.y);
+			int object = checkV2Inventory(_mouse.x, _mouse.y);
+			if (object > 0)
+				runInputScript(kInventoryClickArea, object, 0);
 		} else {
 			over = findVerbAtPos(_mouse.x, _mouse.y);
 			if (over != 0) {
@@ -1070,53 +1065,71 @@ void ScummEngine_v0::checkExecVerbs() {
 			_activeVerb = kVerbPush;
 		}
 
-		if ((_mouseAndKeyboardStat & MBS_MOUSE_MASK) || _activeVerb == kVerbWhatIs) {
-			int id;
-			byte type;
-			if (_activeVerb == kVerbGive && _activeObjectNr) {
-				id = getActorFromPos(_virtualMouse.x, _virtualMouse.y);
-				type = kObjectTypeActor;
-			} else {
-				int obj = findObject(_virtualMouse.x, _virtualMouse.y);
-				id = OBJECT_V0_NR(obj);
-				type = OBJECT_V0_TYPE(obj);
-				debug("found 0x%03x", obj);
-			}
-			if (!id) {
-				if (_activeVerb == kVerbWalkTo) {
-					_activeObjectNr = 0;
-					_activeObject2Nr = 0;
-				}
+		if (_mouseAndKeyboardStat < MBS_MAX_KEY) {
+			// TODO:  Check keypresses
+		} else if ((_mouseAndKeyboardStat & MBS_MOUSE_MASK) || _activeVerb == kVerbWhatIs) {
+			if (zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) {
+				// TODO: handle click into sentence line
 			} else {
-				//_activeVerbPrep:
-				// 0: no activeObject or activeObject but no prep
-				// > 0: activeObject + prep
-				if (activeVerbPrep() == 0) {
-					if (id == _activeObjectNr && type == _activeObjectType) {
-						_verbExecuting = true;
+				int obj = 0;
+
+				if (zone->number == kVerbVirtScreen && _mouse.y > zone->topline + 32) {
+					// click into inventory
+					int invOff = _inventoryOffset;
+					obj = checkV2Inventory(_mouse.x, _mouse.y);
+					if (invOff != _inventoryOffset) {
+						// inventory position changed (arrows pressed, do nothing)
+						return;
+					}
+				} else if (zone->number == kMainVirtScreen) {
+					// click into main screen
+					if (_activeVerb == kVerbGive && _activeObjectNr) {
+						obj = OBJECT_V0(getActorFromPos(_virtualMouse.x, _virtualMouse.y), kObjectTypeActor);
 					} else {
-						_activeObjectNr = id;
-						_activeObjectType = type;
+						obj = findObject(_virtualMouse.x, _virtualMouse.y);
+					}
+				}
+
+				int id = OBJECT_V0_NR(obj);
+				int type = OBJECT_V0_TYPE(obj);
+				debug("found 0x%03x", obj);
+
+				if (!id) {
+					if (_activeVerb == kVerbWalkTo) {
+						_activeObjectNr = 0;
+						_activeObject2Nr = 0;
 					}
-					//sentenceLineChanged = true;
-					if (_currentMode == 1)
-						_verbExecuting = true;
 				} else {
-					if (id == _activeObject2Nr && type == _activeObject2Type)
-						_verbExecuting = true;
-					if (!(id == _activeObjectNr && type == _activeObjectType)) {
-						_activeObject2Nr = id;
-						_activeObject2Type = type;
+					//_activeVerbPrep:
+					// 0: no activeObject or activeObject but no prep
+					// > 0: activeObject + prep
+					if (activeVerbPrep() == 0) {
+						if (id == _activeObjectNr && type == _activeObjectType) {
+							_verbExecuting = true;
+						} else {
+							_activeObjectNr = id;
+							_activeObjectType = type;
+						}
+						//sentenceLineChanged = true;
 						if (_currentMode == 1)
 							_verbExecuting = true;
+					} else {
+						if (id == _activeObject2Nr && type == _activeObject2Type)
+							_verbExecuting = true;
+						if (!(id == _activeObjectNr && type == _activeObjectType)) {
+							_activeObject2Nr = id;
+							_activeObject2Type = type;
+							if (_currentMode == 1)
+								_verbExecuting = true;
+						}
 					}
 				}
-			}
 
-			sentenceLineChanged = true;
-			if (_activeVerb == kVerbWalkTo) {
-				scriptUpdateSkip = 0;
-				_verbExecuting = true;
+				sentenceLineChanged = true;
+				if (_activeVerb == kVerbWalkTo) {
+					scriptUpdateSkip = 0;
+					_verbExecuting = true;
+				}
 			}
 		}
 	}
@@ -1184,29 +1197,7 @@ void ScummEngine_v0::checkExecVerbs() {
 		}
 	}
 
-	if (_userPut <= 0 || _mouseAndKeyboardStat == 0)
-		return;
-
-	if (_mouseAndKeyboardStat < MBS_MAX_KEY) {
-		/* Check keypresses */
-		// TODO
-	} else if (_mouseAndKeyboardStat & MBS_MOUSE_MASK) {
-		if (zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) {
-			// TODO
-		} else if (zone->number == kVerbVirtScreen && _mouse.y > zone->topline + 32) {
-			int invOff = _inventoryOffset;
-
-			// Click into V2 inventory
-			checkV2Inventory(_mouse.x, _mouse.y);
-
-			// Did the Inventory position changed (arrows pressed, do nothing)
-			if (invOff != _inventoryOffset)
-				return;
-		} else {
-			int over = findVerbAtPos(_mouse.x, _mouse.y);
-			int act  = getActorFromPos(_virtualMouse.x, _virtualMouse.y);
-			int obj  = findObject(_virtualMouse.x, _virtualMouse.y);
-
+	...
 
 			// Clicked on nothing, walk here?
 			if (!over && !act && _activeVerb == 13 && !obj && _currentMode != 0) {
-- 
cgit v1.2.3


From b01f601d7e8dc0b7885ff058c8596dc2ad6762f4 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 7 Jan 2012 18:05:42 +0100
Subject: SCUMM: use constants for c64 actor miscflags

---
 engines/scumm/actor.h       | 13 ++++++++++++-
 engines/scumm/script_v0.cpp | 10 +++++-----
 engines/scumm/verbs.cpp     | 10 +++++-----
 3 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 1584d0a78b..d8e3692619 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -335,10 +335,21 @@ protected:
 	virtual void prepareDrawActorCostume(BaseCostumeRenderer *bcr);
 };
 
+enum ActorC64MiscFlags {
+	kActorMiscFlagStrong   = 0x01, // Kid is strong (Hunk-O-Matic used)
+	kActorMiscFlag_02      = 0x02, // ???
+	kActorMiscFlag_04      = 0x04, // ???
+	kActorMiscFlagEdsEnemy = 0x08, // Kid is not Weird Ed's friend
+	kActorMiscFlag_10      = 0x10, // ???
+	kActorMiscFlag_20      = 0x20, // ???
+	kActorMiscFlagFreeze   = 0x40, // Stop moving
+	kActorMiscFlagHide     = 0x80, // Hide actor (e.g. dead or wearing radiation suit)
+};
+
 class ActorC64 : public Actor_v2 {
 public:
 	byte _costCommand, _costFrame;
-	byte _miscflags; // 0x1: strong, 0x8: Ed's enemy, 0x40: stop moving, 0x80: hide(dead/radiation suit)
+	byte _miscflags;
 	byte _speaking, _speakingPrev;
 
 public:
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 14df89b28d..0f9fbc6e6f 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -542,16 +542,16 @@ void ScummEngine_v0::o_loadRoom() {
 }
 
 void ScummEngine_v0::o_loadRoomWithEgo() {
-	Actor *a;
+	ActorC64 *a;
 	int obj, room, x, y, dir;
 
 	obj = fetchScriptByte();
 	room = fetchScriptByte();
 
-	a = derefActor(VAR(VAR_EGO), "o_loadRoomWithEgo");
+	a = (ActorC64 *)derefActor(VAR(VAR_EGO), "o_loadRoomWithEgo");
 
 	//0x634F
-	if (((ActorC64 *)a)->_miscflags & 0x40) {
+	if (a->_miscflags & kActorMiscFlagFreeze) {
 		// TODO: Check if this is the correct function
 		// to be calling here
 		stopObjectCode();
@@ -734,9 +734,9 @@ void ScummEngine_v0::o_setActorBitVar() {
 		a->_miscflags &= ~mask;
 
 	// This flag causes the actor to stop moving (used by script #158, Green Tentacle 'Oomph!')
-	if (a->_miscflags & 0x40)
+	if (a->_miscflags & kActorMiscFlagFreeze)
 		a->stopActorMoving();
-	if (a->_miscflags & 0x80)
+	if (a->_miscflags & kActorMiscFlagHide)
 		a->setActorCostume(0);
 
 	debug(0, "o_setActorBitVar(%d, %d, %d)", act, mask, mod);
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 291985892a..3d0abae0a3 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -847,8 +847,8 @@ bool ScummEngine_v0::verbObtain(int obj) {
 		}
 
 		// Ignore verbs?
-		Actor *a = derefActor(VAR(VAR_EGO), "verbObtain");
-		if (((ActorC64 *)a)->_miscflags & 0x40) {
+		ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "verbObtain");
+		if (a->_miscflags & kActorMiscFlagFreeze) {
 			resetSentence(false);
 			return false;
 		}
@@ -918,7 +918,7 @@ bool ScummEngine_v0::verbExec() {
 		if (verbMoveToActor(_activeObject2Nr)) {
 			// Ignore verbs?
 			Actor *a = derefActor(VAR(VAR_EGO), "verbExec");
-			if (((ActorC64 *)a)->_miscflags & 0x40) {
+			if (((ActorC64 *)a)->_miscflags & kActorMiscFlagFreeze) {
 				resetSentence(false);
 				return false;
 			}
@@ -1052,7 +1052,7 @@ void ScummEngine_v0::checkExecVerbs() {
 		}
 	}
 
-	if (a->_miscflags & 0x80) {
+	if (a->_miscflags & kActorMiscFlagHide) {
 		if (_activeVerb != kVerbNewKid) {
 			_activeVerb = kVerbNone;
 		}
@@ -1210,7 +1210,7 @@ void ScummEngine_v0::checkExecVerbs() {
 
 				if (zone->number == kMainVirtScreen) {
 					// Ignore verbs?
-					if (a->_miscflags & 0x40) {
+					if (a->_miscflags & kActorMiscFlagFreeze) {
 						resetSentence(false);
 						return;
 					}
-- 
cgit v1.2.3


From 706b8cf1c531e15b980a64060a1080e17e854d98 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 7 Jan 2012 20:06:26 +0100
Subject: SCUMM: replace verb, prep and currentMode values with symbolic
 constants

---
 engines/scumm/script_v0.cpp | 14 ++++-----
 engines/scumm/scumm.cpp     |  2 +-
 engines/scumm/scumm_v0.h    |  7 +++++
 engines/scumm/verbs.cpp     | 77 +++++++++++++++++----------------------------
 engines/scumm/verbs.h       | 28 +++++++++++++++++
 5 files changed, 72 insertions(+), 56 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 0f9fbc6e6f..31363ed140 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -422,8 +422,8 @@ void ScummEngine_v0::drawSentence() {
 		return;
 
 	// Current Verb
-	if (_activeVerb == 0)
-		_activeVerb = 13;
+	if (_activeVerb == kVerbNone)
+		_activeVerb = kVerbWalkTo;
 	if (getResourceAddress(rtVerb, _activeVerb)) {
 		_sentenceBuf = (char *)getResourceAddress(rtVerb, _activeVerb);
 	} else {
@@ -602,15 +602,15 @@ void ScummEngine_v0::o_cursorCommand() {
 
 	_currentMode = fetchScriptByte();
 	switch (_currentMode) {
-	case 0:
+	case kModeCutscene:
 		state = 15;
 		break;
-	case 1:
+	case kModeKeypad:
 		state = 31;
 		break;
-	case 2:
+	case kModeNoNewKid:
 		break;
-	case 3:
+	case kModeNormal:
 		state = 247;
 		break;
 	}
@@ -908,7 +908,7 @@ void ScummEngine_v0::o_setOwnerOf() {
 }
 
 void ScummEngine_v0::resetSentence(bool walking) {
-	_activeVerb = 13;
+	_activeVerb = kVerbWalkTo;
 
 	// If the actor is walking, or the screen is a keypad (no sentence verbs/objects are drawn)
 	// Then reset all active objects (stops the radio crash, bug #3077966)
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 423ad79b00..8b2e2ef88e 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -716,7 +716,7 @@ ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr)
 	_verbPickup = false;
 	_currentMode = 0;
 
-	_activeVerb = 0;
+	_activeVerb = kVerbNone;
 	_activeObjectNr = 0;
 	_activeObject2Nr = 0;
 	_activeObjectType = kObjectTypeBG;
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 460843cfc2..2c8c1c85c5 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -32,6 +32,13 @@ namespace Scumm {
  */
 class ScummEngine_v0 : public ScummEngine_v2 {
 protected:
+	enum CurrentMode {
+		kModeCutscene = 0,   // cutscene active
+		kModeKeypad = 1,     // kid selection / dial pad / save-load dialog
+		kModeNoNewKid = 2,   // verb "new kid" disabled (e.g. when entering lab)
+		kModeNormal = 3,     // normal playing mode
+	};
+
 	enum ObjectType {
 		kObjectTypeFG = 0,    // foreground object
 		                      //   - with owner/state, might (but has not to) be pickupable
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 3d0abae0a3..03acdda1a8 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -37,25 +37,6 @@ enum {
 	kSentenceLine = 6
 };
 
-enum VerbsV0 {
-	kVerbNone    = 0,
-	kVerbOpen    = 1,
-	kVerbClose   = 2,
-	kVerbGive    = 3,
-	kVerbTurnOn  = 4,
-	kVerbTurnOff = 5,
-	kVerbFix     = 6,
-	kVerbNewKid  = 7,
-	kVerbUnlock  = 8,
-	kVerbPush    = 9,
-	kVerbPull    = 10,
-	kVerbUse     = 11,
-	kVerbRead    = 12,
-	kVerbWalkTo  = 13,
-	kVerbPickUp  = 14,
-	kVerbWhatIs  = 15
-};
-
 struct VerbSettings {
 	int id;
 	int x_pos;
@@ -103,13 +84,13 @@ static const VerbSettings v0VerbTable_German[] = {
 int ScummEngine_v0::verbPrepIdType(int verbid) {
 	switch (verbid) {
 	case kVerbUse: // depends on object1
-		return 0xFF;
+		return kVerbPrepObject;
 	case kVerbGive: 
-		return 4;
+		return kVerbPrepTo;
 	case kVerbUnlock: case kVerbFix:
-		return 2;
+		return kVerbPrepWith;
 	default:
-		return 0;
+		return kVerbPrepNone;
 	}
 }
 
@@ -192,7 +173,7 @@ void ScummEngine_v0::switchActor(int slot) {
 		return;
 
 	// verbs disabled? or just new kid button?
-	if (_currentMode == 0 || _currentMode == 1 || _currentMode == 2)
+	if (_currentMode == kModeCutscene || _currentMode == kModeKeypad || _currentMode == kModeNoNewKid)
 		return;
 
 	VAR(VAR_EGO) = VAR(97 + slot);
@@ -785,7 +766,7 @@ bool ScummEngine_v0::verbMove(int object, bool invObject) {
 	int x, y, dir;
 	Actor *a = derefActor(VAR(VAR_EGO), "verbMove");
 
-	if (_currentMode != 3 && _currentMode != 2)
+	if (_currentMode != kModeNormal && _currentMode != kModeNoNewKid)
 		return false;
 
 	getObjectXYPos(object, x, y, dir);
@@ -837,8 +818,8 @@ bool ScummEngine_v0::verbObtain(int obj) {
 	if (where != WIO_INVENTORY) {
 		prep = activeVerbPrep();
 
-		if (prep == 1 || prep == 4) {
-			if (_activeVerb != 13 && _activeVerb != 14) {
+		if (prep == kVerbPrepIn || prep == kVerbPrepTo) {
+			if (_activeVerb != kVerbWalkTo && _activeVerb != kVerbPickUp) {
 				_verbPickup = true;
 				didPickup = true;
 			}
@@ -857,8 +838,8 @@ bool ScummEngine_v0::verbObtain(int obj) {
 		if (verbMove(obj, false))
 			return true;
 
-		if (didPickup && (prep == 1 || prep == 4))
-			if (_activeVerb != 13 && _activeVerb != 14) {
+		if (didPickup && (prep == kVerbPrepIn || prep == kVerbPrepTo))
+			if (_activeVerb != kVerbWalkTo && _activeVerb != kVerbPickUp) {
 // TODO(TOBIAS)
 #if 0
 				if (whereIsObject(obj) == WIO_INVENTORY)
@@ -889,7 +870,7 @@ int ScummEngine_v0::activeVerbPrep() {
 }
 
 bool ScummEngine_v0::verbExec() {
-	int entry = (_currentMode != 0 && _currentMode != 1) ? _activeVerb : 15;
+	int entry = (_currentMode != kModeCutscene && _currentMode != kModeKeypad) ? _activeVerb : kVerbWhatIs;
 
 	if (_activeObjectNr && getObjectIndex(OBJECT_V0(_activeObjectNr, _activeObjectType)) == -1) {
 		resetSentence(false);
@@ -897,7 +878,7 @@ bool ScummEngine_v0::verbExec() {
 	}
 
 	// Lets try walk to the object
-	if (_activeObjectNr && !_activeObjectObtained && _currentMode != 0) {
+	if (_activeObjectNr && !_activeObjectObtained && _currentMode != kModeCutscene) {
 		if (verbObtain(OBJECT_V0(_activeObjectNr, _activeObjectType)))
 			return true;
 
@@ -905,7 +886,7 @@ bool ScummEngine_v0::verbExec() {
 	}
 
 	// Attempt to obtain/reach object2
-	if (_activeObject2Nr && !_activeObject2Obtained && _currentMode != 0) {
+	if (_activeObject2Nr && !_activeObject2Obtained && _currentMode != kModeCutscene) {
 		if (verbObtain(OBJECT_V0(_activeObject2Nr, _activeObject2Type)))
 			return true;
 
@@ -913,7 +894,7 @@ bool ScummEngine_v0::verbExec() {
 	}
 
 	// Give-To
-	if (_activeVerb == 3 && _activeObjectNr && _activeObject2Nr && _activeObject2Type == kObjectTypeActor) {
+	if (_activeVerb == kVerbGive && _activeObjectNr && _activeObject2Nr && _activeObject2Type == kObjectTypeActor) {
 		// FIXME: Actors need to turn and face each other
 		if (verbMoveToActor(_activeObject2Nr)) {
 			// Ignore verbs?
@@ -942,11 +923,11 @@ bool ScummEngine_v0::verbExec() {
 	}
 
 	// If we've finished walking (now near target), execute the action
-	if (_activeObjectNr && activeVerbPrep() == 2) {
+	if (_activeObjectNr && activeVerbPrep() == kVerbPrepWith) {
 		runObject(OBJECT_V0(_activeObjectNr, _activeObjectType), entry);
 		_verbExecuting = false;
 
-		if ((_currentMode == 3 || _currentMode == 2) && _activeVerb == 13)
+		if ((_currentMode == kModeNormal || _currentMode == kModeNoNewKid) && _activeVerb == kVerbWalkTo)
 			return false;
 
 		resetSentence(false);
@@ -954,12 +935,12 @@ bool ScummEngine_v0::verbExec() {
 	}
 
 	// We acted on an inventory item
-	if (_activeVerb != 3) {
+	if (_activeVerb != kVerbGive) {
 		runObject(OBJECT_V0(_activeObjectNr/*2*/, _activeObjectType/*2*/), _activeVerb);
 
 		_verbExecuting = false;
 
-		if (_currentMode == 3 && _activeVerb == 13) {
+		if (_currentMode == kModeNormal && _activeVerb == kVerbWalkTo) {
 			resetSentence(true);
 			return false;
 		}
@@ -974,7 +955,7 @@ bool ScummEngine_v0::verbExec() {
 
 	_verbExecuting = false;
 
-	if (_activeVerb == 13) {
+	if (_activeVerb == kVerbWalkTo) {
 		resetSentence(true);
 		return false;
 	}
@@ -1058,10 +1039,8 @@ void ScummEngine_v0::checkExecVerbs() {
 		}
 	}
 
-	// mode 1: kid selection, 3: normal
-	if (_currentMode != 0) {
-		if (_currentMode == 1) {
-			// kid selection or dial pad
+	if (_currentMode != kModeCutscene) {
+		if (_currentMode == kModeKeypad) {
 			_activeVerb = kVerbPush;
 		}
 
@@ -1097,13 +1076,15 @@ void ScummEngine_v0::checkExecVerbs() {
 				if (!id) {
 					if (_activeVerb == kVerbWalkTo) {
 						_activeObjectNr = 0;
+						_activeObjectType = 0;
 						_activeObject2Nr = 0;
+						_activeObject2Type = 0;
 					}
 				} else {
 					//_activeVerbPrep:
 					// 0: no activeObject or activeObject but no prep
 					// > 0: activeObject + prep
-					if (activeVerbPrep() == 0) {
+					if (activeVerbPrep() == kVerbPrepNone) {
 						if (id == _activeObjectNr && type == _activeObjectType) {
 							_verbExecuting = true;
 						} else {
@@ -1111,7 +1092,7 @@ void ScummEngine_v0::checkExecVerbs() {
 							_activeObjectType = type;
 						}
 						//sentenceLineChanged = true;
-						if (_currentMode == 1)
+						if (_currentMode == kModeKeypad)
 							_verbExecuting = true;
 					} else {
 						if (id == _activeObject2Nr && type == _activeObject2Type)
@@ -1119,7 +1100,7 @@ void ScummEngine_v0::checkExecVerbs() {
 						if (!(id == _activeObjectNr && type == _activeObjectType)) {
 							_activeObject2Nr = id;
 							_activeObject2Type = type;
-							if (_currentMode == 1)
+							if (_currentMode == kModeKeypad)
 								_verbExecuting = true;
 						}
 					}
@@ -1139,7 +1120,7 @@ void ScummEngine_v0::checkExecVerbs() {
 
 	if (_activeVerb == kVerbNewKid) {
 		// TODO
-		if (_currentMode == 3) {
+		if (_currentMode == kModeNormal) {
 			// get kid
 			_activeVerb = kVerbWalkTo;
 			resetSentence(false);
@@ -1155,7 +1136,7 @@ void ScummEngine_v0::checkExecVerbs() {
 	/*
 	if (_activeVerbPrep == 0) {
 		int prep = activeVerbPrep();
-		if (prep == 0)
+		if (prep == kVerbPrepNone)
 			; //exec();
 		else {
 			_activeVerbPrep = prep;
@@ -1200,7 +1181,7 @@ void ScummEngine_v0::checkExecVerbs() {
 	...
 
 			// Clicked on nothing, walk here?
-			if (!over && !act && _activeVerb == 13 && !obj && _currentMode != 0) {
+			if (!over && !act && _activeVerb == kVerbWalkTo && !obj && _currentMode != kMode_0) {
 				// Clear all selected
 				resetSentence(false);
 
diff --git a/engines/scumm/verbs.h b/engines/scumm/verbs.h
index fb4dc969e2..fce260ea63 100644
--- a/engines/scumm/verbs.h
+++ b/engines/scumm/verbs.h
@@ -57,6 +57,34 @@ struct VerbSlot {
 	uint16 imgindex;
 };
 
+enum VerbsV0 {
+	kVerbNone    = 0,
+	kVerbOpen    = 1,
+	kVerbClose   = 2,
+	kVerbGive    = 3,
+	kVerbTurnOn  = 4,
+	kVerbTurnOff = 5,
+	kVerbFix     = 6,
+	kVerbNewKid  = 7,
+	kVerbUnlock  = 8,
+	kVerbPush    = 9,
+	kVerbPull    = 10,
+	kVerbUse     = 11,
+	kVerbRead    = 12,
+	kVerbWalkTo  = 13,
+	kVerbPickUp  = 14,
+	kVerbWhatIs  = 15
+};
+
+enum VerbPrepsV0 {
+	kVerbPrepNone   = 0,
+	kVerbPrepIn     = 1,
+	kVerbPrepWith   = 2,
+	kVerbPrepOn     = 3,
+	kVerbPrepTo     = 4,
+	kVerbPrepObject = 0xFF, // prep depends on object (USE)
+};
+
 } // End of namespace Scumm
 
 #endif
-- 
cgit v1.2.3


From d8b435917d5cc00ad2b4817c5eabc828439e36f3 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 7 Jan 2012 20:25:01 +0100
Subject: SCUMM: mm c64 cleanup

---
 engines/scumm/script_v0.cpp | 8 ++++----
 engines/scumm/scumm_v0.h    | 5 ++---
 engines/scumm/verbs.cpp     | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 31363ed140..9b39391246 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -406,9 +406,9 @@ void ScummEngine_v0::decodeParseString() {
 	actorTalk(buffer);
 }
 
-void ScummEngine_v0::drawSentenceObject(int object, int type) {
+void ScummEngine_v0::drawSentenceObject(int object) {
 	const byte *temp;
-	temp = getObjOrActorName(OBJECT_V0(object, type));
+	temp = getObjOrActorName(object);
 	if (temp) {
 		_sentenceBuf += " ";
 		_sentenceBuf += (const char *)temp;
@@ -432,7 +432,7 @@ void ScummEngine_v0::drawSentence() {
 
 	if (_activeObjectNr) {
 		// Draw the 1st active object
-		drawSentenceObject(_activeObjectNr, _activeObjectType);
+		drawSentenceObject(OBJECT_V0(_activeObjectNr, _activeObjectType));
 
 		// Append verb preposition
 		int sentencePrep = activeVerbPrep();
@@ -448,7 +448,7 @@ void ScummEngine_v0::drawSentence() {
 					_sentenceBuf += (const char *)a->getActorName();
 				// 2nd Object is an inventory or room object
 				} else {
-					drawSentenceObject(_activeObject2Nr, _activeObject2Type);
+					drawSentenceObject(OBJECT_V0(_activeObject2Nr, _activeObject2Type));
 				}
 			}
 		}
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 2c8c1c85c5..9b38b108e2 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -89,10 +89,9 @@ protected:
 	// V0 MM Verb commands
 	int getVerbPrepId();
 	int activeVerbPrep();
-	bool verbMove(int object, bool invObject);
+	bool verbMove(int object);
 	bool verbMoveToActor(int actor);
 	bool verbObtain(int object);
-	bool verbExecutes(int object, bool inventory = false);
 	bool verbExec();
 
 	virtual void checkExecVerbs();
@@ -101,7 +100,7 @@ protected:
 	void resetVerbs();
 	void setNewKidVerbs();
 
-	void drawSentenceObject(int object, int type);
+	void drawSentenceObject(int object);
 	void drawSentence();
 
 	void switchActor(int slot);
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 03acdda1a8..016248c530 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -762,7 +762,7 @@ bool ScummEngine_v0::verbMoveToActor(int actor) {
 	return true;
 }
 
-bool ScummEngine_v0::verbMove(int object, bool invObject) {
+bool ScummEngine_v0::verbMove(int object) {
 	int x, y, dir;
 	Actor *a = derefActor(VAR(VAR_EGO), "verbMove");
 
@@ -835,7 +835,7 @@ bool ScummEngine_v0::verbObtain(int obj) {
 		}
 
 		//attempt move to object
-		if (verbMove(obj, false))
+		if (verbMove(obj))
 			return true;
 
 		if (didPickup && (prep == kVerbPrepIn || prep == kVerbPrepTo))
-- 
cgit v1.2.3


From de0b5f76749add219a6b667d5d2d69fb8a86d959 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 8 Jan 2012 23:51:13 +0100
Subject: SCUMM: use command stack and SentenceTab in mm c64

- MM C64 uses command stack (SentenceTab, doSentence()) now
- _cmdObject... added for current SentenceTab. The _active... variables are only used to build a sentence in the inventory but never by a script.
-> many routines are not needed anymore and are removed
---
 engines/scumm/object.cpp    |  11 +-
 engines/scumm/script.cpp    | 136 ++++++++++++++-
 engines/scumm/script_v0.cpp |  68 +++++---
 engines/scumm/script_v2.cpp |  27 +--
 engines/scumm/script_v5.cpp |  65 ++++---
 engines/scumm/scumm.cpp     |  14 +-
 engines/scumm/scumm.h       |   2 +-
 engines/scumm/scumm_v0.h    |  22 ++-
 engines/scumm/scumm_v2.h    |   2 +-
 engines/scumm/scumm_v5.h    |   2 +
 engines/scumm/verbs.cpp     | 410 +++++---------------------------------------
 11 files changed, 307 insertions(+), 452 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 53dc0151d9..49f1777c86 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -434,8 +434,15 @@ void ScummEngine::getObjectXYPos(int object, int &x, int &y, int &dir) {
 			y = od.y_pos + (int16)READ_LE_UINT16(&imhd->old.hotspot[state].y);
 		}
 	} else if (_game.version <= 2) {
-		x = od.walk_x >> V12_X_SHIFT;
-		y = od.walk_y >> V12_Y_SHIFT;
+		if (od.actordir) {
+			x = od.walk_x;
+			y = od.walk_y;
+		} else {
+			x = od.x_pos + od.width/2;
+			y = od.y_pos + od.height/2;
+		}
+		x = x >> V12_X_SHIFT;
+		y = y >> V12_Y_SHIFT;
 	} else {
 		x = od.walk_x;
 		y = od.walk_y;
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index d04c3c0891..0864022c59 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -28,6 +28,7 @@
 #include "scumm/object.h"
 #include "scumm/resource.h"
 #include "scumm/util.h"
+#include "scumm/scumm_v0.h"
 #include "scumm/scumm_v2.h"
 #include "scumm/sound.h"
 #include "scumm/verbs.h"
@@ -194,9 +195,14 @@ int ScummEngine::getVerbEntrypoint(int obj, int entry) {
 		return verboffs + 8 + READ_LE_UINT32(ptr + 1);
 	} else if (_game.version <= 2) {
 		do {
-			if (!*verbptr)
-				return 0;
-			if (*verbptr == entry || *verbptr == 0xFF)
+			const int kFallbackEntry = (_game.version == 0 ? 0x0F : 0xFF);
+			if (!*verbptr) {
+				if (_game.version == 0 && entry == kVerbWalkTo)
+					return 13;
+				else
+					return 0;
+			}
+			if (*verbptr == entry || *verbptr == kFallbackEntry)
 				break;
 			verbptr += 2;
 		} while (1);
@@ -1128,6 +1134,130 @@ void ScummEngine::checkAndRunSentenceScript() {
 		runScript(sentenceScript, 0, 0, localParamList);
 }
 
+void ScummEngine_v0::walkToActorOrObject(int object) {
+	int x, y, dir;
+	ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "walkToObject");
+
+	_walkToObject = object;
+	_walkToObjectIdx = getObjectIndex(object);
+
+	if (OBJECT_V0_TYPE(object) == kObjectTypeActor) {
+		walkActorToActor(VAR(VAR_EGO), OBJECT_V0_NR(object), 4);
+		x = a->getRealPos().x;
+		y = a->getRealPos().y;
+	} else {
+		walkActorToObject(VAR(VAR_EGO), object);
+		getObjectXYPos(object, x, y, dir);
+	}
+
+	VAR(6) = x;
+	VAR(7) = y;
+
+	if (!(a->_miscflags & kActorMiscFlagFreeze)) {
+		// FIXME: walking already started -> should be stopped if condition not true
+		//actorStartWalk();
+	}
+}
+
+void ScummEngine_v0::checkAndRunSentenceScript() {
+	const ScriptSlot *ss;
+
+	if (_walkToObjectIdx) {
+		ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "checkAndRunSentenceScript");
+		if (a->_moving)
+			return;
+		// TODO: change actor facing
+		_walkToObjectIdx = 0;
+		runSentenceScript();
+		return;
+	}
+
+	if (!_sentenceNum || _sentence[_sentenceNum - 1].freezeCount)
+		return;
+
+	//_sentenceNum--;
+	SentenceTab &st = _sentence[_sentenceNum - 1];
+
+	if (st.preposition && st.objectB == st.objectA)
+		return;
+
+	// FIXME: should this be executed?
+	//_currentScript = 0xFF;
+
+	int obj1Nr = OBJECT_V0_NR(st.objectA);
+	int obj1Type = OBJECT_V0_TYPE(st.objectA);
+	int obj2Nr = OBJECT_V0_NR(st.objectB);
+	int obj2Type = OBJECT_V0_TYPE(st.objectB);
+	assert(obj1Nr);
+
+	// If two objects are involved, at least one must be in the actors inventory
+	if (obj2Nr &&
+		(obj1Type != kObjectTypeFG || _objectOwnerTable[obj1Nr] != VAR(VAR_EGO)) &&
+	    (obj2Type != kObjectTypeFG || _objectOwnerTable[obj2Nr] != VAR(VAR_EGO)))
+	{
+		if (getVerbEntrypoint(st.objectA, kVerbPickUp))
+			doSentence(kVerbPickUp, st.objectA, 0);
+		else if (getVerbEntrypoint(st.objectB, kVerbPickUp))
+			doSentence(kVerbPickUp, st.objectB, 0);
+		else
+			_sentenceNum--;
+		return;
+	}
+
+	_cmdVerb = st.verb;
+	_cmdObjectNr = obj1Nr;
+	_cmdObjectType = obj1Type;
+	_cmdObject2Nr = obj2Nr;
+	_cmdObject2Type = obj2Type;
+	_sentenceNum--;
+
+	// TODO: check sentenceNum
+
+	if (whereIsObject(st.objectA) != WIO_INVENTORY) {
+		if (_currentMode != kModeKeypad) {
+			walkToActorOrObject(st.objectA);
+			return;
+		}
+	} else if (st.objectB && whereIsObject(st.objectB) != WIO_INVENTORY) {
+		walkToActorOrObject(st.objectB);
+		return;
+	}
+
+	runSentenceScript();
+	if (_currentMode == kModeKeypad) {
+		_walkToObjectIdx = 0;
+	}
+}
+
+void ScummEngine_v0::runSentenceScript() {
+	int obj = OBJECT_V0(_cmdObjectNr, _cmdObjectType);
+
+	// FIXME: should it really ever return 0xD on WalkTo, seems wrong?
+	if (getVerbEntrypoint(obj, _cmdVerb) != 0) {
+		if (_cmdVerb == kVerbRead && VAR(VAR_CURRENT_LIGHTS) == 0) {
+			//slot = 0xFF;
+			VAR(VAR_ACTIVE_VERB) = _cmdVerb;
+			runScript(3, 0, 0, 0);
+			return;
+		} else {
+			VAR(VAR_ACTIVE_ACTOR) = _cmdObject2Nr;
+			runObjectScript(obj, _cmdVerb, false, false, NULL);
+			return;
+		}
+	} else {
+		if (_cmdVerb == kVerbGive) {
+			if (_cmdObject2Nr < 8)
+				setOwnerOf(obj, _cmdObject2Nr);
+			return;
+		} else if (_cmdVerb == kVerbWalkTo) {
+			//slot = 0xFF;
+			VAR(VAR_ACTIVE_VERB) = _cmdVerb;
+			runScript(3, 0, 0, 0);
+			return;
+		}
+	}
+}
+
 void ScummEngine_v2::runInputScript(int clickArea, int val, int mode) {
 	int args[24];
 	int verbScript;
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 9b39391246..f4b98a4ba5 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -177,7 +177,7 @@ void ScummEngine_v0::setupOpcodes() {
 	OPCODE(0x70, o_lights);
 	OPCODE(0x71, o_getBitVar);
 	OPCODE(0x72, o_nop);
-	OPCODE(0x73, o5_getObjectOwner);
+	OPCODE(0x73, o_getObjectOwner);
 	/* 74 */
 	OPCODE(0x74, o5_getDist);
 	OPCODE(0x75, o_printEgo_c64);
@@ -337,7 +337,7 @@ void ScummEngine_v0::setupOpcodes() {
 	OPCODE(0xf0, o_lights);
 	OPCODE(0xf1, o_getBitVar);
 	OPCODE(0xf2, o_nop);
-	OPCODE(0xf3, o5_getObjectOwner);
+	OPCODE(0xf3, o_getObjectOwner);
 	/* F4 */
 	OPCODE(0xf4, o5_getDist);
 	OPCODE(0xf5, o_stopCurrentScript);
@@ -365,7 +365,7 @@ uint ScummEngine_v0::fetchScriptWord() {
 
 int ScummEngine_v0::getActiveObject() {
 	if (_opcode & PARAM_2)
-		return _activeObjectNr;
+		return _cmdObjectNr;
 
 	return fetchScriptByte();
 }
@@ -693,7 +693,7 @@ void ScummEngine_v0::o_putActorAtObject() {
 
 void ScummEngine_v0::o_pickupObject() {
 	int objNr = fetchScriptByte();
-	int obj = OBJECT_V0((objNr ? objNr : _activeObjectNr), 0);
+	int obj = OBJECT_V0((objNr ? objNr : _cmdObjectNr), 0);
 
 	/* Don't take an object twice */
 	if (whereIsObject(obj) == WIO_INVENTORY)
@@ -742,6 +742,12 @@ void ScummEngine_v0::o_setActorBitVar() {
 	debug(0, "o_setActorBitVar(%d, %d, %d)", act, mask, mod);
 }
 
+void ScummEngine_v0::o_getObjectOwner() {
+	getResultPos();
+	int obj = getVarOrDirectWord(PARAM_1);
+	setResult(getOwner(obj ? obj : _cmdObjectNr));
+}
+
 void ScummEngine_v0::o_getActorBitVar() {
 	getResultPos();
 	byte act = getVarOrDirectByte(PARAM_1);
@@ -787,17 +793,35 @@ void ScummEngine_v0::o_printEgo_c64() {
 }
 
 void ScummEngine_v0::o_doSentence() {
-	byte entry = fetchScriptByte();
-	byte obj = fetchScriptByte();
-	fetchScriptByte();
+	byte verb = fetchScriptByte();
+	int obj, obj2;
+	byte b;
+
+	b = fetchScriptByte();
+	if (b == 0xFF) {
+		obj = OBJECT_V0(_cmdObject2Nr, _cmdObject2Type);
+	} else if (b == 0xFE) {
+		obj = OBJECT_V0(_cmdObjectNr, _cmdObjectType);
+	} else {
+		obj = OBJECT_V0(b, (_opcode & 0x80) ? 1 : 0);
+	}
 
-	runObjectScript(obj, entry, false, false, NULL);
+	b = fetchScriptByte();
+	if (b == 0xFF) {
+		obj2 = OBJECT_V0(_cmdObject2Nr, _cmdObject2Type);
+	} else if (b == 0xFE) {
+		obj2 = OBJECT_V0(_cmdObjectNr, _cmdObjectType);
+	} else {
+		obj2 = OBJECT_V0(b, (_opcode & 0x40) ? 1 : 0);
+	}
+
+	doSentence(verb, obj, obj2);
 }
 
-bool ScummEngine_v0::ifEqualActiveObject2Common(bool inventoryObject) {
+bool ScummEngine_v0::ifEqualActiveObject2Common(bool ignoreType) {
 	byte obj = fetchScriptByte();
-	if (!inventoryObject || (_activeObject2Type == kObjectTypeFG))
-		return (obj == _activeObject2Nr);
+	if (!ignoreType || (_cmdObject2Type == kObjectTypeFG))
+		return (obj == _cmdObject2Nr);
 	return false;
 }
 
@@ -894,7 +918,7 @@ void ScummEngine_v0::o_setOwnerOf() {
 	owner = getVarOrDirectByte(PARAM_2);
 
 	if (obj == 0)
-		obj = _activeObjectNr;
+		obj = _cmdObjectNr;
 
 	// FIXME: the original interpreter seems to set the owner of 
 	// an item to remove (new owner 0) to 13 (purple tentacle).
@@ -909,21 +933,11 @@ void ScummEngine_v0::o_setOwnerOf() {
 
 void ScummEngine_v0::resetSentence(bool walking) {
 	_activeVerb = kVerbWalkTo;
-
-	// If the actor is walking, or the screen is a keypad (no sentence verbs/objects are drawn)
-	// Then reset all active objects (stops the radio crash, bug #3077966)
-	if (!walking || !(_userState & 32)) {
-		_activeObjectNr = 0;
-		_activeObjectType = kObjectTypeBG;
-		_activeObject2Nr = 0;
-		_activeObject2Type = kObjectTypeBG;
-	}
-
-	_verbExecuting = false;
-	_verbPickup = false;
-
-	_activeObjectObtained = false;
-	_activeObject2Obtained = false;
+	_activeObjectNr = 0;
+	_activeObjectType = kObjectTypeBG;
+	_activeObject2Nr = 0;
+	_activeObject2Type = kObjectTypeBG;
+	_walkToObjectIdx = 0;
 }
 
 } // End of namespace Scumm
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 1ea3257c17..6f6138d411 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1219,20 +1219,23 @@ void ScummEngine_v2::o2_panCameraTo() {
 	panCameraTo(getVarOrDirectByte(PARAM_1) * V12_X_MULTIPLIER, 0);
 }
 
-void ScummEngine_v2::o2_walkActorToObject() {
-	int obj;
-	Actor *a;
+void ScummEngine_v2::walkActorToObject(int actor, int obj) {
+	int x, y, dir;
+	getObjectXYPos(obj, x, y, dir);
 
-	a = derefActor(getVarOrDirectByte(PARAM_1), "o2_walkActorToObject");
-	obj = getVarOrDirectWord(PARAM_2);
-	if (whereIsObject(obj) != WIO_NOT_FOUND) {
-		int x, y, dir;
-		getObjectXYPos(obj, x, y, dir);
-		AdjustBoxResult r = a->adjustXYToBeInBox(x, y);
-		x = r.x;
-		y = r.y;
+	Actor *a = derefActor(actor, "walkActorToObject");
+	AdjustBoxResult r = a->adjustXYToBeInBox(x, y);
+	x = r.x;
+	y = r.y;
+
+	a->startWalkActor(x, y, dir);
+}
 
-		a->startWalkActor(x, y, dir);
+void ScummEngine_v2::o2_walkActorToObject() {
+	int actor = getVarOrDirectByte(PARAM_1);
+	int obj = getVarOrDirectWord(PARAM_2);
+	if (whereIsObject(obj) != WIO_NOT_FOUND) {
+		walkActorToObject(actor, obj);
 	}
 }
 
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 6426b75e1e..1d68e86942 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -2464,8 +2464,43 @@ void ScummEngine_v5::o5_walkActorTo() {
 	a->startWalkActor(x, y, -1);
 }
 
+void ScummEngine_v5::walkActorToActor(int actor, int toActor, int dist) {
+	Actor *a = derefActor(actor, "walkActorToActor");
+	Actor *to = derefActor(toActor, "walkActorToActor(2)");
+
+	if (_game.version <= 2) {
+		dist *= V12_X_MULTIPLIER;
+	} else if (dist == 0xFF) {
+		dist = a->_scalex * a->_width / 0xFF;
+		dist += (to->_scalex * to->_width / 0xFF) / 2;
+	}
+	int x = to->getPos().x;
+	int y = to->getPos().y;
+	if (x < a->getPos().x)
+		x += dist;
+	else
+		x -= dist;
+
+	if (_game.version <= 2) {
+		x /= V12_X_MULTIPLIER;
+		y /= V12_Y_MULTIPLIER;
+	}
+	if (_game.version <= 3) {
+		AdjustBoxResult abr = a->adjustXYToBeInBox(x, y);
+		x = abr.x;
+		y = abr.y;
+	}
+	a->startWalkActor(x, y, -1);
+
+	// WORKAROUND: See bug #2971126 for details on why this is here.
+	if (_game.version == 0) {
+		// FIXME(TOBIAS): is this still needed?
+		// (updateScriptPtr/_currentScript might now be called automatically) 
+		o5_breakHere();
+	}
+}
+
 void ScummEngine_v5::o5_walkActorToActor() {
-	int x, y;
 	Actor *a, *a2;
 	int nr = getVarOrDirectByte(PARAM_1);
 	int nr2 = getVarOrDirectByte(PARAM_2);
@@ -2499,33 +2534,7 @@ void ScummEngine_v5::o5_walkActorToActor() {
 	if (!a2->isInCurrentRoom())
 		return;
 
-	if (_game.version <= 2) {
-		dist *= V12_X_MULTIPLIER;
-	} else if (dist == 0xFF) {
-		dist = a->_scalex * a->_width / 0xFF;
-		dist += (a2->_scalex * a2->_width / 0xFF) / 2;
-	}
-	x = a2->getPos().x;
-	y = a2->getPos().y;
-	if (x < a->getPos().x)
-		x += dist;
-	else
-		x -= dist;
-
-	if (_game.version <= 2) {
-		x /= V12_X_MULTIPLIER;
-		y /= V12_Y_MULTIPLIER;
-	}
-	if (_game.version <= 3) {
-		AdjustBoxResult abr = a->adjustXYToBeInBox(x, y);
-		x = abr.x;
-		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();
+	walkActorToActor(nr, nr2, dist);
 }
 
 void ScummEngine_v5::o5_walkActorToObject() {
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 8b2e2ef88e..e6ec2b0dab 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -712,17 +712,19 @@ ScummEngine_v2::ScummEngine_v2(OSystem *syst, const DetectorResult &dr)
 ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr)
 	: ScummEngine_v2(syst, dr) {
 
-	_verbExecuting = false;
-	_verbPickup = false;
 	_currentMode = 0;
 
 	_activeVerb = kVerbNone;
 	_activeObjectNr = 0;
+	_activeObjectType = 0;
 	_activeObject2Nr = 0;
-	_activeObjectType = kObjectTypeBG;
-	_activeObject2Type = kObjectTypeBG;
-	_activeObjectObtained = false;
-	_activeObject2Obtained = false;
+	_activeObject2Type = 0;
+
+	_cmdVerb = kVerbNone;
+	_cmdObjectNr = 0;
+	_cmdObjectType = 0;
+	_cmdObject2Nr = 0;
+	_cmdObject2Type = 0;
 
 	VAR_ACTIVE_ACTOR = 0xFF;
 	VAR_IS_SOUND_RUNNING = 0xFF;
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index f004176da1..fadc3902c0 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -642,7 +642,7 @@ protected:
 	void updateScriptPtr();
 	virtual void runInventoryScript(int i);
 	void inventoryScriptIndy3Mac();
-	void checkAndRunSentenceScript();
+	virtual void checkAndRunSentenceScript();
 	void runExitScript();
 	void runEntryScript();
 	void runAllScripts();
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 9b38b108e2..031a73acf9 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -54,8 +54,6 @@ protected:
 
 protected:
 	byte _currentMode;
-	bool _verbExecuting;			// is a verb executing
-	bool _verbPickup;				// are we picking up an object during a verb execute
 
 	int _activeVerb;
 	int _activeObjectNr;			// 1st Object Number
@@ -63,8 +61,14 @@ protected:
 	int _activeObject2Nr;			// 2nd Object Number
 	int _activeObject2Type;			// 2nd Object Type (0: inventory (or room), 1: room, 2: actor)
 
-	bool _activeObjectObtained;		// collected _activeobject?
-	bool _activeObject2Obtained;	// collected _activeObject2?
+	int _cmdVerb;
+	int _cmdObjectNr;
+	int _cmdObjectType;
+	int _cmdObject2Nr;
+	int _cmdObject2Type;
+
+	int _walkToObject;
+	int _walkToObjectIdx;
 
 public:
 	ScummEngine_v0(OSystem *syst, const DetectorResult &dr);
@@ -83,17 +87,16 @@ protected:
 
 	virtual void processInput();
 
-	virtual void runObject(int obj, int entry);
 	virtual void saveOrLoad(Serializer *s);
 
 	// V0 MM Verb commands
 	int getVerbPrepId();
 	int activeVerbPrep();
-	bool verbMove(int object);
-	bool verbMoveToActor(int actor);
-	bool verbObtain(int object);
-	bool verbExec();
+	void walkToActorOrObject(int object);
+	void verbExec();
 
+	virtual void runSentenceScript();
+	virtual void checkAndRunSentenceScript();
 	virtual void checkExecVerbs();
 	virtual void handleMouseOver(bool updateInventory);
 	int verbPrepIdType(int verbid);
@@ -138,6 +141,7 @@ protected:
 	void o_unlockScript();
 	void o_decrement();
 	void o_nop();
+	void o_getObjectOwner();
 	void o_getActorBitVar();
 	void o_setActorBitVar();
 	void o_getBitVar();
diff --git a/engines/scumm/scumm_v2.h b/engines/scumm/scumm_v2.h
index b9cd8a3921..b407fd3f8a 100644
--- a/engines/scumm/scumm_v2.h
+++ b/engines/scumm/scumm_v2.h
@@ -99,7 +99,7 @@ protected:
 
 	void drawPreposition(int index);
 
-	virtual void setActiveInventory(int object);
+	void walkActorToObject(int actor, int obj);
 
 	/* Version 2 script opcodes */
 	void o2_actorFromPos();
diff --git a/engines/scumm/scumm_v5.h b/engines/scumm/scumm_v5.h
index b8a61c1677..0eef04b8de 100644
--- a/engines/scumm/scumm_v5.h
+++ b/engines/scumm/scumm_v5.h
@@ -87,6 +87,8 @@ protected:
 
 	void drawFlashlight();
 
+	void walkActorToActor(int actor, int toActor, int dist);
+
 	/**
 	 * Fetch the next script word, then if cond is *false*, perform a relative jump.
 	 * So this corresponds to a "jne" jump instruction.
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 016248c530..376e075daa 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -366,10 +366,6 @@ void ScummEngine_v2::checkV2MouseOver(Common::Point pos) {
 	}
 }
 
-void ScummEngine_v2::setActiveInventory(int object) {
-	runInputScript(kInventoryClickArea, object, 0);
-}
-
 int ScummEngine_v2::checkV2Inventory(int x, int y) {
 	int inventoryArea = (_game.platform == Common::kPlatformNES) ? 48: 32;
 	int object = 0;
@@ -717,142 +713,6 @@ void ScummEngine_v2::checkExecVerbs() {
 	}
 }
 
-void ScummEngine_v0::runObject(int obj, int entry) {
-	if (getVerbEntrypoint(obj, entry) == 0) {
-		// If nothing was found, attempt to find the 'WHAT-IS' verb script
-		// (which is not really the what-is script, as this verb never actually executes
-		//  it merely seems to be some type of fallback)
-		if (getVerbEntrypoint(obj, 0x0F) != 0) {
-			entry = 0x0F;
-		}
-	}
-
-	if (getVerbEntrypoint(obj, entry) != 0) {
-		runObjectScript(obj, entry, false, false, NULL);
-	} else if (entry != 13 && entry != 15) {
-		if (_activeVerb == kVerbGive) {
-			// For some reasons, certain objects don't have a "give" script
-			if (VAR(VAR_ACTIVE_ACTOR) > 0 && VAR(VAR_ACTIVE_ACTOR) < 8) {
-				if (OBJECT_V0_TYPE(obj) == kObjectTypeFG) {
-					assert(false);
-					setOwnerOf(obj, VAR(VAR_ACTIVE_ACTOR));
-				}
-			}
-		} else {
-			VAR(VAR_ACTIVE_VERB) = entry;
-			runScript(3, 0, 0, 0);
-		}
-	}
-}
-
-bool ScummEngine_v0::verbMoveToActor(int actor) {
-	Actor *a = derefActor(VAR(VAR_EGO), "verbMoveToActor");
-	Actor *a2 = derefActor(actor, "verbMoveToActor");
-	int dist = getDist(a->getRealPos().x, a->getRealPos().y, a2->getRealPos().x, a2->getRealPos().y);
-
-	if (!a->_moving && dist > 4) {
-		a->startWalkActor(a2->getRealPos().x, a2->getRealPos().y, -1);
-	} else {
-		if (dist <= 4) {
-			a->stopActorMoving();
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool ScummEngine_v0::verbMove(int object) {
-	int x, y, dir;
-	Actor *a = derefActor(VAR(VAR_EGO), "verbMove");
-
-	if (_currentMode != kModeNormal && _currentMode != kModeNoNewKid)
-		return false;
-
-	getObjectXYPos(object, x, y, dir);
-
-	// Detect distance from target object
-	int dist =  getDist(a->getRealPos().x, a->getRealPos().y, x, y);
-
-	if (a->_moving)
-		return true;
-
-	if (dist > 5) {
-		a->startWalkActor(x, y, dir);
-		VAR(6) = x;
-		VAR(7) = y;
-		return true;
-	} else {
-		// Finished walk, are we picking up the item?
-		if (_verbPickup) {
-			int oldActive = OBJECT_V0(_activeObjectNr, _activeObjectType);
-
-			_activeObjectNr = OBJECT_V0_NR(object);
-			_activeObjectType = OBJECT_V0_TYPE(object);
-
-			// Execute pickup
-			runObject(object, 14);
-
-			_activeObjectNr = OBJECT_V0_NR(oldActive);
-			_activeObjectType = OBJECT_V0_TYPE(oldActive);
-
-			// Finished picking up
-			_verbPickup = false;
-		}
-	}
-
-	return false;
-}
-
-bool ScummEngine_v0::verbObtain(int obj) {
-	bool didPickup = false;
-	int prep;
-	int where;
-
-	if (!obj)
-		return false;
-
-	where = whereIsObject(obj);
-
-	// Object in inventory ?
-	if (where != WIO_INVENTORY) {
-		prep = activeVerbPrep();
-
-		if (prep == kVerbPrepIn || prep == kVerbPrepTo) {
-			if (_activeVerb != kVerbWalkTo && _activeVerb != kVerbPickUp) {
-				_verbPickup = true;
-				didPickup = true;
-			}
-		} else {
-			_verbPickup = false;
-		}
-
-		// Ignore verbs?
-		ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "verbObtain");
-		if (a->_miscflags & kActorMiscFlagFreeze) {
-			resetSentence(false);
-			return false;
-		}
-
-		//attempt move to object
-		if (verbMove(obj))
-			return true;
-
-		if (didPickup && (prep == kVerbPrepIn || prep == kVerbPrepTo))
-			if (_activeVerb != kVerbWalkTo && _activeVerb != kVerbPickUp) {
-// TODO(TOBIAS)
-#if 0
-				if (whereIsObject(obj) == WIO_INVENTORY)
-					_activeInventory = obj;
-				else
-					resetSentence(false);
-#endif
-			}
-	}
-
-	return false;
-}
-
 int ScummEngine_v0::getVerbPrepId() {
 	if (_verbs[_activeVerb].prep != 0xFF) {
 		return _verbs[_activeVerb].prep;
@@ -869,150 +729,44 @@ int ScummEngine_v0::activeVerbPrep() {
 	return getVerbPrepId();
 }
 
-bool ScummEngine_v0::verbExec() {
-	int entry = (_currentMode != kModeCutscene && _currentMode != kModeKeypad) ? _activeVerb : kVerbWhatIs;
-
-	if (_activeObjectNr && getObjectIndex(OBJECT_V0(_activeObjectNr, _activeObjectType)) == -1) {
-		resetSentence(false);
-		return false;
-	}
-
-	// Lets try walk to the object
-	if (_activeObjectNr && !_activeObjectObtained && _currentMode != kModeCutscene) {
-		if (verbObtain(OBJECT_V0(_activeObjectNr, _activeObjectType)))
-			return true;
-
-		_activeObjectObtained = true;
-	}
-
-	// Attempt to obtain/reach object2
-	if (_activeObject2Nr && !_activeObject2Obtained && _currentMode != kModeCutscene) {
-		if (verbObtain(OBJECT_V0(_activeObject2Nr, _activeObject2Type)))
-			return true;
-
-		_activeObject2Obtained = true;
-	}
-
-	// Give-To
-	if (_activeVerb == kVerbGive && _activeObjectNr && _activeObject2Nr && _activeObject2Type == kObjectTypeActor) {
-		// FIXME: Actors need to turn and face each other
-		if (verbMoveToActor(_activeObject2Nr)) {
-			// Ignore verbs?
-			Actor *a = derefActor(VAR(VAR_EGO), "verbExec");
-			if (((ActorC64 *)a)->_miscflags & kActorMiscFlagFreeze) {
-				resetSentence(false);
-				return false;
-			}
-
-			return true;
-		}
-		VAR(VAR_ACTIVE_ACTOR) = _activeObject2Nr;
-		runObject(OBJECT_V0(_activeObjectNr, _activeObjectType), 3);
-
-		resetSentence(false);
-		return false;
-	}
-
-	// Where we performing an action on an actor?
-	if (_activeObject2Nr && _activeObject2Type == kObjectTypeActor) {
-		runObject(OBJECT_V0(_activeObject2Nr, _activeObject2Type), entry);
-		_verbExecuting = false;
-
-		resetSentence(false);
-		return false;
-	}
-
-	// If we've finished walking (now near target), execute the action
-	if (_activeObjectNr && activeVerbPrep() == kVerbPrepWith) {
-		runObject(OBJECT_V0(_activeObjectNr, _activeObjectType), entry);
-		_verbExecuting = false;
-
-		if ((_currentMode == kModeNormal || _currentMode == kModeNoNewKid) && _activeVerb == kVerbWalkTo)
-			return false;
-
-		resetSentence(false);
-		return false;
-	}
-
-	// We acted on an inventory item
-	if (_activeVerb != kVerbGive) {
-		runObject(OBJECT_V0(_activeObjectNr/*2*/, _activeObjectType/*2*/), _activeVerb);
-
-		_verbExecuting = false;
-
-		if (_currentMode == kModeNormal && _activeVerb == kVerbWalkTo) {
-			resetSentence(true);
-			return false;
+void ScummEngine_v0::verbExec() {
+	if (_activeVerb == kVerbWhatIs)
+		return;
+		
+	if (_activeVerb != kVerbWalkTo || _activeObjectNr != 0) {		
+		doSentence(_activeVerb, 
+			OBJECT_V0(_activeObjectNr, _activeObjectType), 
+			OBJECT_V0(_activeObject2Nr, _activeObject2Type));
+		if (_activeVerb != kVerbWalkTo) {
+			_activeVerb = kVerbWalkTo;
+			_activeObjectNr = 0;
 		}
-
-		resetSentence(false);
-		return false;
-	}
-
-	if (_activeObjectNr) {
-		runObject(OBJECT_V0(_activeObjectNr, _activeObjectType), entry);
-	}
-
-	_verbExecuting = false;
-
-	if (_activeVerb == kVerbWalkTo) {
-		resetSentence(true);
-		return false;
+		_walkToObjectIdx = 0;
+		return;
 	}
 
-	resetSentence(false);
+	ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "verbExec");
+	int x = _virtualMouse.x / V12_X_MULTIPLIER;
+	int y = _virtualMouse.y / V12_Y_MULTIPLIER;
+	//actorSetPosInBox();
 
-	return false;
-}
+	// 0xB31
+	VAR(6) = x;
+	VAR(7) = y;
 
-#if 0
-verbExec() {
-	cmdStackMaxLeft = 6;
-	cmdStackPos = 0xFF;
-	if (verbSelectedID == 15) // WHAT IS
-		return;
-		
-	if (verbSelectedID != 13 || objectSelectedID != 0) {
-		cmdStackPos++;
-		cmdVerbID[cmdStackPos] = verbSelectedID;
-		cmdObjectID[cmdStackPos] = objectSelectedID;
-		cmdObjectType[cmdStackPos] = objectSelectedType;
-		cmdVerbPrepID[cmdStackPos] = verbPrepID;
-		cmdObject2ID[cmdStackPos] = objectSelected2ID;
-		cmdObject2Type[cmdStackPos] = objectSelected2Type;
-		
-		if (verbSelectedID != 13) { // WALK TO
-			verbSelectedID = 13;
-			objectSelectedID = 0;
-			verbPrepID = 0;
-		}
-		scriptUpdateSkip = 0;
+	if (a->_miscflags & kActorMiscFlagFreeze)
 		return;
-	}
-	
-	currentActor = scriptVARS[0];
-	roomActor = gActorInRoom[currentActor];
-	tmpX = cursorX();
-	tmpY = cursorY();
-	actorSetPosInBox();
-
-	scriptVARS[6] = tmpX;
-	scriptVARS[7] = tmpY;
-	
-	if (gActor_miscFlags[scriptVARS[0]] & 0x40) {
-		rActor_scriptWalkToX[roomActor] = tmpX;
-		rActor_scriptWalkToX[roomActor] = tmpY;
-		walk_1C4A();
-	}
+
+	a->stopActorMoving();
+	a->startWalkActor(VAR(6), VAR(7), -1);
 }
-#endif
 
 void ScummEngine_v0::checkExecVerbs() {
 	ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "checkExecVerbs");
 	VirtScreen *zone = findVirtScreen(_mouse.y);
 
-	int scriptUpdateSkip;
 	int sentenceLineChanged = false;
+	bool execute = false;
 
 	/*
 	if (_userPut <= 0 || _mouseAndKeyboardStat == 0)
@@ -1024,7 +778,6 @@ void ScummEngine_v0::checkExecVerbs() {
 		int over = findVerbAtPos(_mouse.x, _mouse.y);
 		if (over && _activeVerb != over) {
 			_activeVerb = over;
-			//_activeVerbPrep = 0;
 			_activeObjectNr = 0;
 			_activeObjectType = 0;
 			_activeObject2Nr = 0;
@@ -1045,7 +798,7 @@ void ScummEngine_v0::checkExecVerbs() {
 		}
 
 		if (_mouseAndKeyboardStat < MBS_MAX_KEY) {
-			// TODO:  Check keypresses
+			// TODO: check keypresses
 		} else if ((_mouseAndKeyboardStat & MBS_MOUSE_MASK) || _activeVerb == kVerbWhatIs) {
 			if (zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) {
 				// TODO: handle click into sentence line
@@ -1081,130 +834,61 @@ void ScummEngine_v0::checkExecVerbs() {
 						_activeObject2Type = 0;
 					}
 				} else {
-					//_activeVerbPrep:
-					// 0: no activeObject or activeObject but no prep
-					// > 0: activeObject + prep
 					if (activeVerbPrep() == kVerbPrepNone) {
 						if (id == _activeObjectNr && type == _activeObjectType) {
-							_verbExecuting = true;
+							execute = true;
 						} else {
 							_activeObjectNr = id;
 							_activeObjectType = type;
 						}
-						//sentenceLineChanged = true;
 						if (_currentMode == kModeKeypad)
-							_verbExecuting = true;
+							execute = true;
 					} else {
 						if (id == _activeObject2Nr && type == _activeObject2Type)
-							_verbExecuting = true;
+							execute = true;
 						if (!(id == _activeObjectNr && type == _activeObjectType)) {
 							_activeObject2Nr = id;
 							_activeObject2Type = type;
 							if (_currentMode == kModeKeypad)
-								_verbExecuting = true;
+								execute = true;
 						}
 					}
 				}
 
 				sentenceLineChanged = true;
-				if (_activeVerb == kVerbWalkTo) {
-					scriptUpdateSkip = 0;
-					_verbExecuting = true;
+				if (_activeVerb == kVerbWalkTo && zone->number == kMainVirtScreen) {
+					_walkToObjectIdx = 0;
+					execute = true;
 				}
 			}
 		}
 	}
 
-	if (sentenceLineChanged)
+	if (sentenceLineChanged) {
 		drawSentence();
+		sentenceLineChanged = false;
+	}
+
+	if (!execute || !_activeVerb)
+		return;
 
 	if (_activeVerb == kVerbNewKid) {
-		// TODO
 		if (_currentMode == kModeNormal) {
-			// get kid
+			// TODO: get clicked kid
 			_activeVerb = kVerbWalkTo;
-			resetSentence(false);
+			drawSentence();
 			//switchActor(_verbs[over].verbid - 1);
 		}
 		_activeVerb = kVerbWalkTo;
 	}
 
-	if (_activeVerb == kVerbWalkTo) {
-		//exec();
-	}
-
-	/*
-	if (_activeVerbPrep == 0) {
-		int prep = activeVerbPrep();
-		if (prep == kVerbPrepNone)
-			; //exec();
-		else {
-			_activeVerbPrep = prep;
-			; // draw()
-		}
-	} else {
-		if (_activeObject2 == 0)
-			; //drawSentence();
-		else
-			; // exec();
+	if (_activeVerb == kVerbWalkTo)
+		verbExec();
+	else if (_activeObjectNr) {
+		// execute if we have a 1st object and either have or do not need a 2nd
+		if (activeVerbPrep() == kVerbPrepNone || _activeObject2Nr)
+			verbExec();
 	}
-	*/
-
-#if 0
-	// Is a verb currently executing
-	if (_verbExecuting) {
-		// Check if mouse click
-		if (_mouseAndKeyboardStat & MBS_MOUSE_MASK) {
-			int over = findVerbAtPos(_mouse.x, _mouse.y);
-			int act  = getActorFromPos(_virtualMouse.x, _virtualMouse.y);
-			byte type;
-			int obj  = findObject(_virtualMouse.x, _virtualMouse.y, &type);
-
-			if (over && over != _activeVerb) {
-				_activeVerb = over;
-				_verbExecuting = false;
-				return;
-			}
-
-			if (!obj && !act && !over) {
-				resetSentence(false);
-			} else {
-				a->stopActorMoving();
-			}
-		} else {
-
-			if (_verbExecuting && !verbExec())
-				return;
-		}
-	}
-
-	...
-
-			// Clicked on nothing, walk here?
-			if (!over && !act && _activeVerb == kVerbWalkTo && !obj && _currentMode != kMode_0) {
-				// Clear all selected
-				resetSentence(false);
-
-				// 0xB31
-				VAR(6) = _virtualMouse.x / V12_X_MULTIPLIER;
-				VAR(7) = _virtualMouse.y / V12_Y_MULTIPLIER;
-
-				if (zone->number == kMainVirtScreen) {
-					// Ignore verbs?
-					if (a->_miscflags & kActorMiscFlagFreeze) {
-						resetSentence(false);
-						return;
-					}
-					a->stopActorMoving();
-					a->startWalkActor(VAR(6), VAR(7), -1);
-					_verbExecuting = true;
-				}
-				return;
-			}
-		_verbExecuting = true;
-
-	}	// mouse k/b action
-#endif
 }
 
 void ScummEngine::verbMouseOver(int verb) {
-- 
cgit v1.2.3


From c16ef940a1f25846623903d6ce744374228ff104 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Mon, 9 Jan 2012 20:04:38 +0100
Subject: SCUMM: make START-button in mm c64 kid selection screen work again

---
 engines/scumm/object.cpp | 2 +-
 engines/scumm/verbs.cpp  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 49f1777c86..670b2cb79c 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -1223,7 +1223,7 @@ uint32 ScummEngine::getOBCDOffs(int object) const {
 		return 0;
 
 	for (i = (_numLocalObjects-1); i > 0; i--) {
-		if (_objs[i].obj_nr == object) {
+		if (_objs[i].obj_nr == OBJECT_V0_NR(object)) {
 			if (_game.version == 0 && _objs[i].obj_type != OBJECT_V0_TYPE(object))
 				continue;
 			if (_objs[i].fl_object_index != 0)
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 376e075daa..19ad003da6 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -740,6 +740,7 @@ void ScummEngine_v0::verbExec() {
 		if (_activeVerb != kVerbWalkTo) {
 			_activeVerb = kVerbWalkTo;
 			_activeObjectNr = 0;
+			_activeObjectType = 0;
 		}
 		_walkToObjectIdx = 0;
 		return;
@@ -841,6 +842,7 @@ void ScummEngine_v0::checkExecVerbs() {
 							_activeObjectNr = id;
 							_activeObjectType = type;
 						}
+						// immediately execute action in keypad/selection mode
 						if (_currentMode == kModeKeypad)
 							execute = true;
 					} else {
-- 
cgit v1.2.3


From b337823bab5994b78f639a7625ff763f061a1c0c Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Mon, 9 Jan 2012 23:21:08 +0100
Subject: SCUMM: fix verb and script handling

- getVerbEntrypoint() should not handle walk-to differently (revert 0x0D handling back to original behavior)
- VAR_ACTIVE_ACTOR actually is VAR_ACTIVE_OBJECT2
- runSentenceScript(): "if (_cmdVerb == kVerbWalkTo)" must be "if (_cmdVerb != kVerbWalkTo)"
---
 engines/scumm/script.cpp | 34 ++++++++++++----------------------
 engines/scumm/scumm.cpp  |  2 +-
 engines/scumm/scumm_v0.h |  2 +-
 engines/scumm/vars.cpp   |  2 +-
 4 files changed, 15 insertions(+), 25 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 0864022c59..e34c81d0d4 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -196,12 +196,8 @@ int ScummEngine::getVerbEntrypoint(int obj, int entry) {
 	} else if (_game.version <= 2) {
 		do {
 			const int kFallbackEntry = (_game.version == 0 ? 0x0F : 0xFF);
-			if (!*verbptr) {
-				if (_game.version == 0 && entry == kVerbWalkTo)
-					return 13;
-				else
-					return 0;
-			}
+			if (!*verbptr)
+				return 0;
 			if (*verbptr == entry || *verbptr == kFallbackEntry)
 				break;
 			verbptr += 2;
@@ -1160,8 +1156,6 @@ void ScummEngine_v0::walkToActorOrObject(int object) {
 }
 
 void ScummEngine_v0::checkAndRunSentenceScript() {
-	const ScriptSlot *ss;
-
 	if (_walkToObjectIdx) {
 		ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "checkAndRunSentenceScript");
 		if (a->_moving)
@@ -1175,7 +1169,6 @@ void ScummEngine_v0::checkAndRunSentenceScript() {
 	if (!_sentenceNum || _sentence[_sentenceNum - 1].freezeCount)
 		return;
 
-	//_sentenceNum--;
 	SentenceTab &st = _sentence[_sentenceNum - 1];
 
 	if (st.preposition && st.objectB == st.objectA)
@@ -1232,30 +1225,27 @@ void ScummEngine_v0::checkAndRunSentenceScript() {
 void ScummEngine_v0::runSentenceScript() {
 	int obj = OBJECT_V0(_cmdObjectNr, _cmdObjectType);
 
-	// FIXME: should it really ever return 0xD on WalkTo, seems wrong?
 	if (getVerbEntrypoint(obj, _cmdVerb) != 0) {
-		if (_cmdVerb == kVerbRead && VAR(VAR_CURRENT_LIGHTS) == 0) {
-			//slot = 0xFF;
-			VAR(VAR_ACTIVE_VERB) = _cmdVerb;
-			runScript(3, 0, 0, 0);
-			return;
-		} else {
-			VAR(VAR_ACTIVE_ACTOR) = _cmdObject2Nr;
+		// do not read in the dark
+		if (!(_cmdVerb == kVerbRead && _currentLights == 0)) {
+			VAR(VAR_ACTIVE_OBJECT2) = _cmdObject2Nr;
 			runObjectScript(obj, _cmdVerb, false, false, NULL);
 			return;
 		}
 	} else {
 		if (_cmdVerb == kVerbGive) {
+			// no "give to"-script: give to other kid or ignore
 			if (_cmdObject2Nr < 8)
 				setOwnerOf(obj, _cmdObject2Nr);
 			return;
-		} else if (_cmdVerb == kVerbWalkTo) {
-			//slot = 0xFF;
-			VAR(VAR_ACTIVE_VERB) = _cmdVerb;
-			runScript(3, 0, 0, 0);
-			return;
 		}
 	}
+
+	if (_cmdVerb != kVerbWalkTo) {
+		// perform verb's fallback action
+		VAR(VAR_ACTIVE_VERB) = _cmdVerb;
+		runScript(3, 0, 0, 0);
+	}
 }
 
 void ScummEngine_v2::runInputScript(int clickArea, int val, int mode) {
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index e6ec2b0dab..2eda5cac80 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -726,7 +726,7 @@ ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr)
 	_cmdObject2Nr = 0;
 	_cmdObject2Type = 0;
 
-	VAR_ACTIVE_ACTOR = 0xFF;
+	VAR_ACTIVE_OBJECT2 = 0xFF;
 	VAR_IS_SOUND_RUNNING = 0xFF;
 	VAR_ACTIVE_VERB = 0xFF;
 }
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 031a73acf9..3335a15ad2 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -159,7 +159,7 @@ protected:
 	void o_beginOverride();
 	void o_setOwnerOf();
 
-	byte VAR_ACTIVE_ACTOR;
+	byte VAR_ACTIVE_OBJECT2;
 	byte VAR_IS_SOUND_RUNNING;
 	byte VAR_ACTIVE_VERB;
 };
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index 26a6a2f3b1..6365a728d2 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -115,7 +115,7 @@ void ScummEngine_v0::setupScummVars() {
 	VAR_CAMERA_POS_X = 2;
 	VAR_HAVE_MSG = 3;
 	VAR_ROOM = 4;
-	VAR_ACTIVE_ACTOR = 5;
+	VAR_ACTIVE_OBJECT2 = 5;
 	VAR_OVERRIDE = 6;
 	VAR_IS_SOUND_RUNNING = 8;
 	VAR_ACTIVE_VERB = 9;
-- 
cgit v1.2.3


From 32945904d5267562975d01f2bae5c56a7c35af93 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 10 Jan 2012 19:43:24 +0100
Subject: SCUMM: fix kid selection in v0

The kid names are now displayed in the sentence line (instead of the verb area) as it is done in the original.
---
 engines/scumm/script_v0.cpp | 92 ++++++++++++++++++++++++++-------------------
 engines/scumm/scumm_v0.h    |  5 ++-
 engines/scumm/verbs.cpp     | 62 ++++++++++--------------------
 3 files changed, 76 insertions(+), 83 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index f4b98a4ba5..cd2e8969bb 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -406,6 +406,42 @@ void ScummEngine_v0::decodeParseString() {
 	actorTalk(buffer);
 }
 
+void ScummEngine_v0::clearSentenceLine() {
+	Common::Rect sentenceline;
+	sentenceline.top = _virtscr[kVerbVirtScreen].topline;
+	sentenceline.bottom = _virtscr[kVerbVirtScreen].topline + 8;
+	sentenceline.left = 0;
+	sentenceline.right = _virtscr[kVerbVirtScreen].w - 1;
+	restoreBackground(sentenceline);
+}
+
+void ScummEngine_v0::flushSentenceLine() {
+	byte string[80];
+	const char *ptr = _sentenceBuf.c_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;
+	_string[2].xpos = 0;
+	_string[2].right = _virtscr[kVerbVirtScreen].w - 1;
+	_string[2].color = 16;
+	drawString(2, (byte *)string);
+}
+
 void ScummEngine_v0::drawSentenceObject(int object) {
 	const byte *temp;
 	temp = getObjOrActorName(object);
@@ -415,20 +451,30 @@ void ScummEngine_v0::drawSentenceObject(int object) {
 	}
 }
 
-void ScummEngine_v0::drawSentence() {
-	Common::Rect sentenceline;
 
+void ScummEngine_v0::drawSentenceLine() {
 	if (!(_userState & 32))
 		return;
 
+	clearSentenceLine();
+
+	if (_activeVerb == kVerbNewKid) {
+		_sentenceBuf = "";
+		for (int i = 0; i < 3; ++i) {
+			Actor *a = derefActor(VAR(97 + i), "drawSentence");
+			_sentenceBuf += Common::String::format("%-13s", a->getActorName());
+		}
+		flushSentenceLine();
+		return;
+	}
+
 	// Current Verb
 	if (_activeVerb == kVerbNone)
 		_activeVerb = kVerbWalkTo;
-	if (getResourceAddress(rtVerb, _activeVerb)) {
-		_sentenceBuf = (char *)getResourceAddress(rtVerb, _activeVerb);
-	} else {
-		return;
-	}
+
+	char *verbName = (char *)getResourceAddress(rtVerb, _activeVerb);
+	assert(verbName);
+	_sentenceBuf = verbName;
 
 	if (_activeObjectNr) {
 		// Draw the 1st active object
@@ -454,37 +500,7 @@ void ScummEngine_v0::drawSentence() {
 		}
 	}
 
-	_string[2].charset = 1;
-	_string[2].ypos = _virtscr[kVerbVirtScreen].topline;
-	_string[2].xpos = 0;
-	_string[2].right = _virtscr[kVerbVirtScreen].w - 1;
-	_string[2].color = 16;
-
-	byte string[80];
-	const char *ptr = _sentenceBuf.c_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;
-
-	sentenceline.top = _virtscr[kVerbVirtScreen].topline;
-	sentenceline.bottom = _virtscr[kVerbVirtScreen].topline + 8;
-	sentenceline.left = 0;
-	sentenceline.right = _virtscr[kVerbVirtScreen].w - 1;
-	restoreBackground(sentenceline);
-
-	drawString(2, (byte *)string);
+	flushSentenceLine();
 }
 
 void ScummEngine_v0::o_stopCurrentScript() {
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 3335a15ad2..78449eaa57 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -101,10 +101,11 @@ protected:
 	virtual void handleMouseOver(bool updateInventory);
 	int verbPrepIdType(int verbid);
 	void resetVerbs();
-	void setNewKidVerbs();
 
+	void clearSentenceLine();
+	void flushSentenceLine();
 	void drawSentenceObject(int object);
-	void drawSentence();
+	void drawSentenceLine();
 
 	void switchActor(int slot);
 
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 19ad003da6..e06ee3d949 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -131,37 +131,6 @@ void ScummEngine_v0::resetVerbs() {
 	}
 }
 
-void ScummEngine_v0::setNewKidVerbs() {
-	VirtScreen *virt = &_virtscr[kVerbVirtScreen];
-	VerbSlot *vs;
-	int i;
-
-	for (i = 1; i < 16; i++)
-		killVerb(i);
-
-	for (i = 1; i < 4; i++) {
-		vs = &_verbs[i];
-		vs->verbid = i;
-		vs->color = 5;
-		vs->hicolor = 7;
-		vs->dimcolor = 11;
-		vs->type = kTextVerbType;
-		vs->charset_nr = _string[0]._default.charset;
-		vs->curmode = 1;
-		vs->saveid = 0;
-		vs->key = 0;
-		vs->center = 0;
-		vs->imgindex = 0;
-		vs->prep = 0;
-		vs->curRect.left = (i * 8) * 8;
-		vs->curRect.top = virt->topline + 8;
-
-		Actor *a = derefActor(VAR(96 + i), "setNewKidVerbs");
-		loadPtrToResource(rtVerb, i, (const byte*)a->getActorName());
-	}
-	setUserState(191);
-}
-
 void ScummEngine_v0::switchActor(int slot) {
 	resetSentence(false);
 
@@ -802,7 +771,24 @@ void ScummEngine_v0::checkExecVerbs() {
 			// TODO: check keypresses
 		} else if ((_mouseAndKeyboardStat & MBS_MOUSE_MASK) || _activeVerb == kVerbWhatIs) {
 			if (zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) {
-				// TODO: handle click into sentence line
+				if (_activeVerb == kVerbNewKid) {
+					if (_currentMode == kModeNormal) {
+						int kid;
+						int lineX = _mouse.x >> V12_X_SHIFT;
+						if (lineX < 11)
+							kid = 0;
+						else if (lineX < 25)
+							kid = 1;
+						else
+							kid = 2;
+						// TODO: get clicked kid
+						_activeVerb = kVerbWalkTo;
+						drawSentenceLine();
+						switchActor(kid);
+					}
+					_activeVerb = kVerbWalkTo;
+					return;
+				}
 			} else {
 				int obj = 0;
 
@@ -867,23 +853,13 @@ void ScummEngine_v0::checkExecVerbs() {
 	}
 
 	if (sentenceLineChanged) {
-		drawSentence();
+		drawSentenceLine();
 		sentenceLineChanged = false;
 	}
 
 	if (!execute || !_activeVerb)
 		return;
 
-	if (_activeVerb == kVerbNewKid) {
-		if (_currentMode == kModeNormal) {
-			// TODO: get clicked kid
-			_activeVerb = kVerbWalkTo;
-			drawSentence();
-			//switchActor(_verbs[over].verbid - 1);
-		}
-		_activeVerb = kVerbWalkTo;
-	}
-
 	if (_activeVerb == kVerbWalkTo)
 		verbExec();
 	else if (_activeObjectNr) {
-- 
cgit v1.2.3


From c010da00a425ff4be1619093327c46ab2e6c1381 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 10 Jan 2012 20:50:23 +0100
Subject: SCUMM: click into sentence line in v0 now performs the action

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

(limited to 'engines')

diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index e06ee3d949..cb8148d81b 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -781,13 +781,15 @@ void ScummEngine_v0::checkExecVerbs() {
 							kid = 1;
 						else
 							kid = 2;
-						// TODO: get clicked kid
 						_activeVerb = kVerbWalkTo;
 						drawSentenceLine();
 						switchActor(kid);
 					}
 					_activeVerb = kVerbWalkTo;
 					return;
+				} else if (_activeVerb && _activeVerb != kVerbWalkTo && _activeVerb != kVerbWhatIs) {
+					if (_activeObjectNr && (!activeVerbPrep() || _activeObject2Nr))
+						execute = true;
 				}
 			} else {
 				int obj = 0;
-- 
cgit v1.2.3


From df07d2db297b263142a0505d880e57b17e681a97 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 10 Jan 2012 22:11:11 +0100
Subject: SCUMM: fix a regression in v0

Found by segra.
---
 engines/scumm/object.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 670b2cb79c..26597864fd 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -1223,7 +1223,8 @@ uint32 ScummEngine::getOBCDOffs(int object) const {
 		return 0;
 
 	for (i = (_numLocalObjects-1); i > 0; i--) {
-		if (_objs[i].obj_nr == OBJECT_V0_NR(object)) {
+		int nr = (_game.version != 0) ? object : OBJECT_V0_NR(object);
+		if (_objs[i].obj_nr == nr) {
 			if (_game.version == 0 && _objs[i].obj_type != OBJECT_V0_TYPE(object))
 				continue;
 			if (_objs[i].fl_object_index != 0)
-- 
cgit v1.2.3


From 8392d23e6bf740fb336cc98e0bbee8882108503a Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 10 Jan 2012 23:15:53 +0100
Subject: SCUMM: reset sentence line in v0 if sentence executed

---
 engines/scumm/script.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index e34c81d0d4..ded47ad60a 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1225,6 +1225,8 @@ void ScummEngine_v0::checkAndRunSentenceScript() {
 void ScummEngine_v0::runSentenceScript() {
 	int obj = OBJECT_V0(_cmdObjectNr, _cmdObjectType);
 
+	drawSentenceLine();
+
 	if (getVerbEntrypoint(obj, _cmdVerb) != 0) {
 		// do not read in the dark
 		if (!(_cmdVerb == kVerbRead && _currentLights == 0)) {
-- 
cgit v1.2.3


From e14bc5fd6d9df5157c841683e6e02f8d25cd8a2c Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 10 Jan 2012 23:17:40 +0100
Subject: SCUMM: improve verb and sentence handling

- execute sentence if verb was clicked twice
- reuse the first object if a new verb is selected (but no preposition is used yet)
---
 engines/scumm/scumm_v0.h |  1 +
 engines/scumm/verbs.cpp  | 52 ++++++++++++++++++++++++++++++++++--------------
 2 files changed, 38 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 78449eaa57..c2af6d4c5f 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -97,6 +97,7 @@ protected:
 
 	virtual void runSentenceScript();
 	virtual void checkAndRunSentenceScript();
+	bool checkSentenceComplete();
 	virtual void checkExecVerbs();
 	virtual void handleMouseOver(bool updateInventory);
 	int verbPrepIdType(int verbid);
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index cb8148d81b..74ff27c483 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -731,6 +731,14 @@ void ScummEngine_v0::verbExec() {
 	a->startWalkActor(VAR(6), VAR(7), -1);
 }
 
+bool ScummEngine_v0::checkSentenceComplete() {
+	if (_activeVerb && _activeVerb != kVerbWalkTo && _activeVerb != kVerbWhatIs) {
+		if (_activeObjectNr && (!activeVerbPrep() || _activeObject2Nr))
+			return true;
+	}
+	return false;
+}
+
 void ScummEngine_v0::checkExecVerbs() {
 	ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "checkExecVerbs");
 	VirtScreen *zone = findVirtScreen(_mouse.y);
@@ -738,21 +746,28 @@ void ScummEngine_v0::checkExecVerbs() {
 	int sentenceLineChanged = false;
 	bool execute = false;
 
-	/*
-	if (_userPut <= 0 || _mouseAndKeyboardStat == 0)
-		return;
-	*/
+	//if (_userPut <= 0)
+	//	return;
 
-	// Check if mouse click
 	if (_mouseAndKeyboardStat & MBS_MOUSE_MASK) {
 		int over = findVerbAtPos(_mouse.x, _mouse.y);
-		if (over && _activeVerb != over) {
-			_activeVerb = over;
-			_activeObjectNr = 0;
-			_activeObjectType = 0;
-			_activeObject2Nr = 0;
-			_activeObject2Type = 0;
-			sentenceLineChanged = true;
+		// click region: verbs
+		if (over) {
+			if (_activeVerb != over) { // new verb
+				// keep first object if no preposition is used yet
+				if (activeVerbPrep()) {
+					_activeObjectNr = 0;
+					_activeObjectType = 0;
+				}
+				_activeObject2Nr = 0;
+				_activeObject2Type = 0;
+				_activeVerb = over;
+				sentenceLineChanged = true;
+			} else {
+				// execute sentence if complete
+				if (checkSentenceComplete())
+					execute = true;
+			}
 		}
 	}
 
@@ -770,6 +785,7 @@ void ScummEngine_v0::checkExecVerbs() {
 		if (_mouseAndKeyboardStat < MBS_MAX_KEY) {
 			// TODO: check keypresses
 		} else if ((_mouseAndKeyboardStat & MBS_MOUSE_MASK) || _activeVerb == kVerbWhatIs) {
+			// click region: sentence line
 			if (zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) {
 				if (_activeVerb == kVerbNewKid) {
 					if (_currentMode == kModeNormal) {
@@ -787,13 +803,18 @@ void ScummEngine_v0::checkExecVerbs() {
 					}
 					_activeVerb = kVerbWalkTo;
 					return;
-				} else if (_activeVerb && _activeVerb != kVerbWalkTo && _activeVerb != kVerbWhatIs) {
-					if (_activeObjectNr && (!activeVerbPrep() || _activeObject2Nr))
+				} else {
+					// execute sentence if complete
+					if (checkSentenceComplete())
 						execute = true;
 				}
-			} else {
+			// click region: inventory or main screen
+			} else if ((zone->number == kVerbVirtScreen && _mouse.y > zone->topline + 32) ||
+			           (zone->number == kMainVirtScreen))
+			{
 				int obj = 0;
 
+				// click region: inventory
 				if (zone->number == kVerbVirtScreen && _mouse.y > zone->topline + 32) {
 					// click into inventory
 					int invOff = _inventoryOffset;
@@ -802,6 +823,7 @@ void ScummEngine_v0::checkExecVerbs() {
 						// inventory position changed (arrows pressed, do nothing)
 						return;
 					}
+				// click region: main screen
 				} else if (zone->number == kMainVirtScreen) {
 					// click into main screen
 					if (_activeVerb == kVerbGive && _activeObjectNr) {
-- 
cgit v1.2.3


From e89dd623ef2f44bac2768327da7faeef0e2c6f5b Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 10 Jan 2012 23:39:13 +0100
Subject: SCUMM: pop stack in v0 if command's object1 and 2 are the same

Otherwise the command will never be removed and the stack overflows
---
 engines/scumm/script.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index ded47ad60a..eb0f7bf16a 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1171,8 +1171,10 @@ void ScummEngine_v0::checkAndRunSentenceScript() {
 
 	SentenceTab &st = _sentence[_sentenceNum - 1];
 
-	if (st.preposition && st.objectB == st.objectA)
+	if (st.preposition && st.objectB == st.objectA) {
+		_sentenceNum--;
 		return;
+	}
 
 	// FIXME: should this be executed?
 	//_currentScript = 0xFF;
-- 
cgit v1.2.3


From 4bc726b9958a26e9ce82d00c8fd4ced35b83b83d Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 10 Jan 2012 23:40:58 +0100
Subject: SCUMM: reset object2 in v0 correctly

This fixes the issue that a kid will not enter the front door after opening it with the key.
---
 engines/scumm/verbs.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines')

diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 74ff27c483..e70ae49b34 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -710,6 +710,8 @@ void ScummEngine_v0::verbExec() {
 			_activeVerb = kVerbWalkTo;
 			_activeObjectNr = 0;
 			_activeObjectType = 0;
+			_activeObject2Nr = 0;
+			_activeObject2Type = 0;
 		}
 		_walkToObjectIdx = 0;
 		return;
-- 
cgit v1.2.3


From ffcd6004613d42d924d20a42694e870c041dadaa Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Wed, 11 Jan 2012 22:50:35 +0100
Subject: SCUMM: make what-is verb work in v0 again

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

(limited to 'engines')

diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index e70ae49b34..30d0d02976 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -784,7 +784,7 @@ void ScummEngine_v0::checkExecVerbs() {
 			_activeVerb = kVerbPush;
 		}
 
-		if (_mouseAndKeyboardStat < MBS_MAX_KEY) {
+		if (_mouseAndKeyboardStat > 0 && _mouseAndKeyboardStat < MBS_MAX_KEY) {
 			// TODO: check keypresses
 		} else if ((_mouseAndKeyboardStat & MBS_MOUSE_MASK) || _activeVerb == kVerbWhatIs) {
 			// click region: sentence line
-- 
cgit v1.2.3


From 621017ce65f3c5b346c3b17bd4e6700af13215c6 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Wed, 11 Jan 2012 22:57:46 +0100
Subject: SCUMM: remove some NOTEs/TODOs

- o5_breakHere() seems to be still needed. For example edna does not manage to walk up the ladder if this is not enabled.
- numLocalObjects seems to be big enough so that < instead of <= can be used. The original interpreter only uses the local ids 0 .. 44 whereas scummvm has _numLocalObjects set to 200.
---
 engines/scumm/object.cpp    | 1 -
 engines/scumm/script_v5.cpp | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 26597864fd..86d9065385 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -499,7 +499,6 @@ int ScummEngine::findObject(int x, int y) {
 	byte a;
 	const int mask = (_game.version <= 2) ? kObjectState_08 : 0xF;
 
-	// FIXME(TOBIAS): <= _numLocalObjects?
 	for (i = 1; i < _numLocalObjects; i++) {
 		if ((_objs[i].obj_nr < 1) || getClass(_objs[i].obj_nr, kObjectClassUntouchable))
 			continue;
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 1d68e86942..707c3c2397 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -2493,11 +2493,8 @@ void ScummEngine_v5::walkActorToActor(int actor, int toActor, int dist) {
 	a->startWalkActor(x, y, -1);
 
 	// WORKAROUND: See bug #2971126 for details on why this is here.
-	if (_game.version == 0) {
-		// FIXME(TOBIAS): is this still needed?
-		// (updateScriptPtr/_currentScript might now be called automatically) 
+	if (_game.version == 0)
 		o5_breakHere();
-	}
 }
 
 void ScummEngine_v5::o5_walkActorToActor() {
-- 
cgit v1.2.3


From b999fe9e265277dbd8e736edec1478013c86feba Mon Sep 17 00:00:00 2001
From: segrax
Date: Sun, 15 Jan 2012 23:23:11 +1100
Subject: SCUMM: Add in support in v0 for the unknown variable to
 o_animateActor

---
 engines/scumm/actor.cpp     | 57 ++++++++++++++++++++++++++++++++----
 engines/scumm/actor.h       | 15 ++++++++++
 engines/scumm/costume.cpp   | 70 +++++++++++++++++++++++++++++++++++----------
 engines/scumm/script_v0.cpp |  2 ++
 4 files changed, 124 insertions(+), 20 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 70e051edfd..bccf4ef746 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -859,10 +859,16 @@ void Actor::setDirection(int direction) {
 
 	// V0 MM
 	if (_vm->_game.version == 0) {
-		if (_moving)
-			_vm->_costumeLoader->costumeDecodeData(this, _walkFrame, 0);
-		else
-			_vm->_costumeLoader->costumeDecodeData(this, _standFrame, 0);
+
+       	if (_moving)
+		    _vm->_costumeLoader->costumeDecodeData(this, _walkFrame, 0);
+	    else
+		    _vm->_costumeLoader->costumeDecodeData(this, _standFrame, 0);
+
+        // 0x2C17
+
+        ((ActorC64*) this)->_byte_FD0A = 0xFF;
+
 		_needRedraw = true;
 		return;
 	}
@@ -896,6 +902,9 @@ void Actor::turnToDirection(int newdir) {
 	if (newdir == -1 || _ignoreTurns)
 		return;
 
+    if( _vm->_game.version == 0 )
+        ((ActorC64*) this)->_byte_FD0A = -1;
+
 	if (_vm->_game.version <= 6) {
 		_moving = MF_TURN;
 		_targetFacing = newdir;
@@ -1794,7 +1803,6 @@ void Actor::animateActor(int anim) {
 		dir = anim % 1000;
 
 	} else {
-
 		cmd = anim / 4;
 		dir = oldDirToNewDir(anim % 4);
 
@@ -2626,6 +2634,45 @@ void ScummEngine_v71he::queueAuxEntry(int actorNum, int subIndex) {
 }
 #endif
 
+void ActorC64::animateActor(int anim) {
+    Actor::animateActor(anim);
+    return;
+    int dir = oldDirToNewDir(anim % 4);
+
+    if( this->isInCurrentRoom() ) {
+
+       this->_costCommandNew = anim;
+       this->_byte_FD0A = this->_byte_FDE8;
+
+       // 0x273A
+       /*switch( anim ) {
+            case 4:
+                dir = 1;
+                break;
+            case 5:
+                dir = 0;
+                break;
+            case 6:
+                dir = 0x80;
+                break;
+            case 7:
+                dir = 0x81;
+                break;
+
+            default:
+                return;
+        }*/
+
+        this->setDirection( dir );
+
+    } else {
+
+        if( anim > 4 ) { 
+            if( anim <= 7 )
+                this->setDirection( dir );
+        }
+    }
+}
 
 void ActorC64::saveLoadWithSerializer(Serializer *ser) {
 	Actor::saveLoadWithSerializer(ser);
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index d8e3692619..1feb1afaa5 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -348,16 +348,29 @@ enum ActorC64MiscFlags {
 
 class ActorC64 : public Actor_v2 {
 public:
+    byte _costCommandNew;
 	byte _costCommand, _costFrame;
 	byte _miscflags;
 	byte _speaking, _speakingPrev;
 
+    byte _byte_FDE8;
+    int8 _byte_FD0A;
+    byte _byte_FCE2[8];
+    
+
 public:
 	ActorC64(ScummEngine *scumm, int id) : Actor_v2(scumm, id) {
 		 _costCommand = 0;
 		 _costFrame = 0;
 		 _speaking = 0;
 		 _speakingPrev = 0;
+         _byte_FD0A = 0;
+         _byte_FDE8 = 0;
+
+         // Reset the limb counter?
+         for( int i = 0; i < sizeof( _byte_FCE2 ); ++i )
+             _byte_FCE2[i] = 0;
+
 	}
 	virtual void initActor(int mode) {
 		Actor_v2::initActor(mode);
@@ -366,6 +379,8 @@ public:
 		}
 	}
 
+    virtual void animateActor(int anim);
+
 	// Used by the save/load system:
 	virtual void saveLoadWithSerializer(Serializer *ser);
 
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index eb3cc3262c..0c091c38bf 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1298,12 +1298,14 @@ void C64CostumeLoader::frameUpdate(ActorC64 *a, int cmd ) {
 	cmd <<= 3;
 
 	for (int limb = 0, pos = 0; limb < 8; ++limb, pos = 0) {
-		// get a limb frames ptr from the costume command
+		// get the frame number for the beginning of the costume command
 		limbFrames = ((_animCmds + cmd)[limb]);
 
-		// Dont change limb if entry is invalid
+		// Dont change if frame is invalid
 		if (limbFrames == 0xFF)
-			continue;
+            continue;
+
+        a->_byte_FCE2[limb] = a->_byte_FD0A;
 
 		// Has limb frames ptr changed since last update?
 		if (a->_cost.start[limb] == limbFrames)
@@ -1337,7 +1339,7 @@ void C64CostumeLoader::frameUpdate(ActorC64 *a, int cmd ) {
 		}
 
 		// Set ending position of limb frames
-		a->_cost.end[limb] = pos - 1;
+		a->_cost.end[limb] = pos;
 		a->_cost.curpos[limb] = 0;
 	}
 }
@@ -1345,18 +1347,27 @@ void C64CostumeLoader::frameUpdate(ActorC64 *a, int cmd ) {
 // based on 0x2BCA, doesn't match disassembly because 'oldDir' variable
 // is not the same value as stored in the original interpreter
 int C64CostumeLoader::dirToDirStop(int oldDir) {
+    int res = 0;
+
 	switch (oldDir) {
 		case 0:
-			return 4;	// Left
+			res = 4;	// Left
+            break;
+
 		case 1:
-			return 5;	// Right
+			res = 5;	// Right
+            break;
+
 		case 2:
-			return 6;	// Face Camera
-		case 3:
-			return 7;	// Face Away
+			res = 6;	// Face Camera
+            break;
+
+        default:
+			res = 7;	// Face Away
+            break;
 	}
-	// shouldnt' be reached
-	return 4;
+	
+    return res;
 }
 
 void C64CostumeLoader::actorSpeak(ActorC64 *a, int &cmd) {
@@ -1378,21 +1389,28 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 
 	// Enable/Disable speaking flag
 	if (frame == a->_talkStartFrame) {
+
 		if (v0ActorTalkArray[a->_number] & 0x40)
 			return;
 
 		A->_speaking = 1;
 		return;
 	}
+
 	if (frame == a->_talkStopFrame) {
+
 		A->_speaking = 0;
 		return;
 	}
 
 	// Different command for stand frame
 	if (frame == a->_standFrame)
+    {
 		command = dirToDirStop(dir);
 
+        A->_byte_FDE8 = 0xFF;
+    }
+
 	// Update the limb frames
 	frameUpdate(A, command);
 
@@ -1435,11 +1453,33 @@ byte C64CostumeLoader::increaseAnims(Actor *a) {
 	}
 
 	// increase each frame pos
+    // 0x2543
 	for (int limb = 0; limb < 8; ++limb) {
-		if (a->_cost.curpos[limb] < a->_cost.end[limb])
-			a->_cost.curpos[limb]++;
-		else
-			a->_cost.curpos[limb] = 0;
+
+		if (++a->_cost.curpos[limb] >= a->_cost.end[limb]) {
+
+            // 0x2541
+            if( A->_byte_FCE2[limb] == 0 ) {
+
+                // 0x2556
+                --a->_cost.curpos[limb];
+
+                A->_costCommandNew = 0xFF;
+                //A->_costCommand = 0xFF;
+                
+                // 0x2568
+                //A->_limbCommandNew[limb] = 0xFF;
+                //A->_limbCommand[limb] = 0xFF;
+
+            } else {
+                if( A->_byte_FCE2[limb] != 0xFF )
+                    --A->_byte_FCE2[limb];
+
+                a->_cost.curpos[limb] = 0;
+            }
+        }
+
+        
 	}
 
 	return 1;
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index cd2e8969bb..e3d74fcd90 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -663,6 +663,8 @@ void ScummEngine_v0::o_animateActor() {
 
 	ActorC64 *a = (ActorC64*) derefActor(act, "o_animateActor");
 
+    a->_byte_FDE8 = unk;
+
 	// 0x6993
 	if (anim == 0xFE) {
 		a->_speaking = 0x80;	// Enabled, but not switching
-- 
cgit v1.2.3


From 6ca91a2be5e2f2ad981e52a5c21ca97ca3dee48d Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 15 Jan 2012 19:26:02 +0100
Subject: SCUMM: Fix actor behind man-eating plant issue in v0.

Thanks segra for finding how it works in the original interpreter. The plant is handled specially and 0 is used instead of its y-position.
---
 engines/scumm/actor.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index bccf4ef746..950f580f42 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1474,6 +1474,18 @@ void ScummEngine::processActors() {
 				}
 			}
 		}
+	} else if (_game.version == 0) {
+		for (int j = 0; j < numactors; ++j) {
+			for (int i = 0; i < numactors; ++i) {
+				// Note: the plant is handled different in v0, the y value is not used.
+				// In v1/2 this is done by the actor's elevation instead.
+				int sc_actor1 = (_sortedActors[j]->_number == 19 ? 0 : _sortedActors[j]->getPos().y);
+				int sc_actor2 = (_sortedActors[i]->_number == 19 ? 0 : _sortedActors[i]->getPos().y);
+				if (sc_actor1 < sc_actor2) {
+					SWAP(_sortedActors[i], _sortedActors[j]);
+				}
+			}
+		}
 	} else {
 		for (int j = 0; j < numactors; ++j) {
 			for (int i = 0; i < numactors; ++i) {
-- 
cgit v1.2.3


From f2309998ffbcb33a96edac7f2959abc534717827 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 15 Jan 2012 20:11:30 +0100
Subject: SCUMM: fix debugger for v0

---
 engines/scumm/debugger.cpp  | 11 +++++++----
 engines/scumm/object.cpp    | 11 +++++++++++
 engines/scumm/object.h      | 12 ++++++++++++
 engines/scumm/script.cpp    |  6 +++---
 engines/scumm/script_v0.cpp | 14 ++++++--------
 engines/scumm/scumm.h       |  1 +
 engines/scumm/scumm_v0.h    | 13 -------------
 engines/scumm/verbs.cpp     |  2 +-
 8 files changed, 41 insertions(+), 29 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index 54f7fea97b..59018f1269 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -382,7 +382,7 @@ bool ScummDebugger::Cmd_Actor(int argc, const char **argv) {
 			DebugPrintf("Actor[%d].costume = %d\n", actnum, a->_costume);
 		}
 	} else if (!strcmp(argv[2], "name")) {
-		DebugPrintf("Name of actor %d: %s\n", actnum, _vm->getObjOrActorName(actnum));
+		DebugPrintf("Name of actor %d: %s\n", actnum, _vm->getActorName(actnum));
 	} else if (!strcmp(argv[2], "condmask")) {
 		if (argc > 3) {
 			a->_heCondMask = value;
@@ -427,9 +427,11 @@ bool ScummDebugger::Cmd_PrintObjects(int argc, const char **argv) {
 		o = &(_vm->_objs[i]);
 		if (o->obj_nr == 0)
 			continue;
+		int obj = (_vm->_game.version != 0 ? o->obj_nr : OBJECT_V0(o->obj_nr, o->obj_type));
+		int classData = (_vm->_game.version != 0 ? _vm->_classData[o->obj_nr] : 0);
 		DebugPrintf("|%4d|%4d|%4d|%5d|%6d|%5d|%2d|$%08x|\n",
-				o->obj_nr, o->x_pos, o->y_pos, o->width, o->height, o->state,
-				o->fl_object_index, _vm->_classData[o->obj_nr]);
+				obj, o->x_pos, o->y_pos, o->width, o->height, o->state,
+				o->fl_object_index, classData);
 	}
 	DebugPrintf("\n");
 
@@ -446,7 +448,8 @@ bool ScummDebugger::Cmd_Object(int argc, const char **argv) {
 	}
 
 	obj = atoi(argv[1]);
-	if (obj >= _vm->_numGlobalObjects) {
+	int obj_nr = (_vm->_game.version != 0 ? obj : OBJECT_V0_NR(obj));
+	if (obj_nr >= _vm->_numGlobalObjects) {
 		DebugPrintf("Object %d is out of range (range: 1 - %d)\n", obj, _vm->_numGlobalObjects);
 		return true;
 	}
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 86d9065385..d3ed086892 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -1150,6 +1150,17 @@ void ScummEngine::markObjectRectAsDirty(int obj) {
 	}
 }
 
+const byte *ScummEngine::getActorName(int id) {
+	if (_game.version == 0) {
+		if (id > 0 && id < _numActors)
+			return derefActor(id, "getActorName")->getActorName();
+		else
+			return NULL;
+	} else {
+		return getObjOrActorName(id);
+	}
+}
+
 const byte *ScummEngine::getObjOrActorName(int obj) {
 	byte *objptr;
 	int i;
diff --git a/engines/scumm/object.h b/engines/scumm/object.h
index 7e4a5b57ab..12956fc4fd 100644
--- a/engines/scumm/object.h
+++ b/engines/scumm/object.h
@@ -31,6 +31,18 @@ static inline int OBJECT_V0(int id, byte type) {
 #define OBJECT_V0_NR(obj)	(obj & 0xFF)
 #define OBJECT_V0_TYPE(obj)	((obj >> 8) & 0xFF)
 
+enum ObjectV0Type {
+	kObjectV0TypeFG = 0,    // foreground object
+		                    //   - with owner/state, might (but has not to) be pickupable
+		                    //     -> with entry in _objectOwner/StateTable
+		                    //     -> all objects in _inventory have this type
+		                    //   - image can be exchanged (background overlay)
+	kObjectV0TypeBG = 1,    // background object
+		                    //   - without owner/state, not pickupable  (room only)
+		                    //     -> without entry in _objectOwner/StateTable
+		                    //   - image cannot be exchanged (part of background image)
+	kObjectV0TypeActor = 2  // object is an actor
+};
 
 enum ObjectClass {
 	kObjectClassNeverClip = 20,
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index eb0f7bf16a..bc6873edf2 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1137,7 +1137,7 @@ void ScummEngine_v0::walkToActorOrObject(int object) {
 	_walkToObject = object;
 	_walkToObjectIdx = getObjectIndex(object);
 
-	if (OBJECT_V0_TYPE(object) == kObjectTypeActor) {
+	if (OBJECT_V0_TYPE(object) == kObjectV0TypeActor) {
 		walkActorToActor(VAR(VAR_EGO), OBJECT_V0_NR(object), 4);
 		x = a->getRealPos().x;
 		y = a->getRealPos().y;
@@ -1187,8 +1187,8 @@ void ScummEngine_v0::checkAndRunSentenceScript() {
 
 	// If two objects are involved, at least one must be in the actors inventory
 	if (obj2Nr &&
-		(obj1Type != kObjectTypeFG || _objectOwnerTable[obj1Nr] != VAR(VAR_EGO)) &&
-	    (obj2Type != kObjectTypeFG || _objectOwnerTable[obj2Nr] != VAR(VAR_EGO)))
+		(obj1Type != kObjectV0TypeFG || _objectOwnerTable[obj1Nr] != VAR(VAR_EGO)) &&
+	    (obj2Type != kObjectV0TypeFG || _objectOwnerTable[obj2Nr] != VAR(VAR_EGO)))
 	{
 		if (getVerbEntrypoint(st.objectA, kVerbPickUp))
 			doSentence(kVerbPickUp, st.objectA, 0);
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index e3d74fcd90..f35230b6e2 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -461,8 +461,7 @@ void ScummEngine_v0::drawSentenceLine() {
 	if (_activeVerb == kVerbNewKid) {
 		_sentenceBuf = "";
 		for (int i = 0; i < 3; ++i) {
-			Actor *a = derefActor(VAR(97 + i), "drawSentence");
-			_sentenceBuf += Common::String::format("%-13s", a->getActorName());
+			_sentenceBuf += Common::String::format("%-13s", getActorName(VAR(97 + i)));
 		}
 		flushSentenceLine();
 		return;
@@ -488,10 +487,9 @@ void ScummEngine_v0::drawSentenceLine() {
 			// Draw the 2nd active object
 			if (_activeObject2Nr) {
 				// 2nd Object is an actor
-				if (_activeObject2Type == kObjectTypeActor) {
-					Actor *a = derefActor(_activeObject2Nr, "");
+				if (_activeObject2Type == kObjectV0TypeActor) {
 					_sentenceBuf += " ";
-					_sentenceBuf += (const char *)a->getActorName();
+					_sentenceBuf += (const char *)getActorName(_activeObject2Nr);
 				// 2nd Object is an inventory or room object
 				} else {
 					drawSentenceObject(OBJECT_V0(_activeObject2Nr, _activeObject2Type));
@@ -838,7 +836,7 @@ void ScummEngine_v0::o_doSentence() {
 
 bool ScummEngine_v0::ifEqualActiveObject2Common(bool ignoreType) {
 	byte obj = fetchScriptByte();
-	if (!ignoreType || (_cmdObject2Type == kObjectTypeFG))
+	if (!ignoreType || (_cmdObject2Type == kObjectV0TypeFG))
 		return (obj == _cmdObject2Nr);
 	return false;
 }
@@ -952,9 +950,9 @@ void ScummEngine_v0::o_setOwnerOf() {
 void ScummEngine_v0::resetSentence(bool walking) {
 	_activeVerb = kVerbWalkTo;
 	_activeObjectNr = 0;
-	_activeObjectType = kObjectTypeBG;
+	_activeObjectType = kObjectV0TypeBG;
 	_activeObject2Nr = 0;
-	_activeObject2Type = kObjectTypeBG;
+	_activeObject2Type = kObjectV0TypeBG;
 	_walkToObjectIdx = 0;
 }
 
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index fadc3902c0..d77ae44d4c 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -804,6 +804,7 @@ public:
 protected:
 
 	int getObjActToObjActDist(int a, int b); // Not sure how to handle
+	const byte *getActorName(int id);
 	const byte *getObjOrActorName(int obj);		 // these three..
 	void setObjectName(int obj);
 
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index c2af6d4c5f..4da46b31bf 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -39,19 +39,6 @@ protected:
 		kModeNormal = 3,     // normal playing mode
 	};
 
-	enum ObjectType {
-		kObjectTypeFG = 0,    // foreground object
-		                      //   - with owner/state, might (but has not to) be pickupable
-		                      //     -> with entry in _objectOwner/StateTable
-		                      //     -> all objects in _inventory have this type
-		                      //   - image can be exchanged (background overlay)
-		kObjectTypeBG = 1,    // background object
-		                      //   - without owner/state, not pickupable  (room only)
-		                      //     -> without entry in _objectOwner/StateTable
-		                      //   - image cannot be exchanged (part of background image)
-		kObjectTypeActor = 2  // object is an actor
-	};
-
 protected:
 	byte _currentMode;
 
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 30d0d02976..99fdafa5b6 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -829,7 +829,7 @@ void ScummEngine_v0::checkExecVerbs() {
 				} else if (zone->number == kMainVirtScreen) {
 					// click into main screen
 					if (_activeVerb == kVerbGive && _activeObjectNr) {
-						obj = OBJECT_V0(getActorFromPos(_virtualMouse.x, _virtualMouse.y), kObjectTypeActor);
+						obj = OBJECT_V0(getActorFromPos(_virtualMouse.x, _virtualMouse.y), kObjectV0TypeActor);
 					} else {
 						obj = findObject(_virtualMouse.x, _virtualMouse.y);
 					}
-- 
cgit v1.2.3


From c138ef67099cd14bedd4e0e79080e31e2b41eddd Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 15 Jan 2012 21:43:21 +0100
Subject: SCUMM: merge _activeObjectNr/_activeObjectType and
 _cmdObjectNr/_cmdObjectType

---
 engines/scumm/debugger.cpp  |  3 ++-
 engines/scumm/object.cpp    | 18 ++++---------
 engines/scumm/script.cpp    | 31 +++++++++-------------
 engines/scumm/script_v0.cpp | 62 ++++++++++++++++---------------------------
 engines/scumm/scumm.cpp     | 12 +++------
 engines/scumm/scumm.h       |  1 -
 engines/scumm/scumm_v0.h    | 18 +++++--------
 engines/scumm/verbs.cpp     | 64 ++++++++++++++++++---------------------------
 8 files changed, 78 insertions(+), 131 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index 59018f1269..b52dc7997a 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -382,7 +382,8 @@ bool ScummDebugger::Cmd_Actor(int argc, const char **argv) {
 			DebugPrintf("Actor[%d].costume = %d\n", actnum, a->_costume);
 		}
 	} else if (!strcmp(argv[2], "name")) {
-		DebugPrintf("Name of actor %d: %s\n", actnum, _vm->getActorName(actnum));
+		int actor = (_vm->_game.version != 0 ? actnum : OBJECT_V0(actnum, kObjectV0TypeActor));
+		DebugPrintf("Name of actor %d: %s\n", actnum, _vm->getObjOrActorName(actor));
 	} else if (!strcmp(argv[2], "condmask")) {
 		if (argc > 3) {
 			a->_heCondMask = value;
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index d3ed086892..f7a01fd4cc 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -1150,23 +1150,15 @@ void ScummEngine::markObjectRectAsDirty(int obj) {
 	}
 }
 
-const byte *ScummEngine::getActorName(int id) {
-	if (_game.version == 0) {
-		if (id > 0 && id < _numActors)
-			return derefActor(id, "getActorName")->getActorName();
-		else
-			return NULL;
-	} else {
-		return getObjOrActorName(id);
-	}
-}
-
 const byte *ScummEngine::getObjOrActorName(int obj) {
 	byte *objptr;
 	int i;
 
-	if (obj < _numActors && _game.version >= 1)
-		return derefActor(obj, "getObjOrActorName")->getActorName();
+	if ((_game.version == 0 && OBJECT_V0_TYPE(obj) == kObjectV0TypeActor) ||
+	    (_game.version != 0 && obj < _numActors)) {
+		int actorNr = (_game.version != 0 ? obj : OBJECT_V0_NR(obj));
+		return derefActor(actorNr, "getObjOrActorName")->getActorName();
+	}
 
 	for (i = 0; i < _numNewNames; i++) {
 		if (_newNames[i] == obj) {
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index bc6873edf2..3fa89b68fb 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1179,16 +1179,12 @@ void ScummEngine_v0::checkAndRunSentenceScript() {
 	// FIXME: should this be executed?
 	//_currentScript = 0xFF;
 
-	int obj1Nr = OBJECT_V0_NR(st.objectA);
-	int obj1Type = OBJECT_V0_TYPE(st.objectA);
-	int obj2Nr = OBJECT_V0_NR(st.objectB);
-	int obj2Type = OBJECT_V0_TYPE(st.objectB);
-	assert(obj1Nr);
+	assert(st.objectA);
 
 	// If two objects are involved, at least one must be in the actors inventory
-	if (obj2Nr &&
-		(obj1Type != kObjectV0TypeFG || _objectOwnerTable[obj1Nr] != VAR(VAR_EGO)) &&
-	    (obj2Type != kObjectV0TypeFG || _objectOwnerTable[obj2Nr] != VAR(VAR_EGO)))
+	if (st.objectB &&
+		(OBJECT_V0_TYPE(st.objectA) != kObjectV0TypeFG || _objectOwnerTable[st.objectA] != VAR(VAR_EGO)) &&
+	    (OBJECT_V0_TYPE(st.objectB) != kObjectV0TypeFG || _objectOwnerTable[st.objectB] != VAR(VAR_EGO)))
 	{
 		if (getVerbEntrypoint(st.objectA, kVerbPickUp))
 			doSentence(kVerbPickUp, st.objectA, 0);
@@ -1200,10 +1196,8 @@ void ScummEngine_v0::checkAndRunSentenceScript() {
 	}
 
 	_cmdVerb = st.verb;
-	_cmdObjectNr = obj1Nr;
-	_cmdObjectType = obj1Type;
-	_cmdObject2Nr = obj2Nr;
-	_cmdObject2Type = obj2Type;
+	_cmdObject = st.objectA;
+	_cmdObject2 = st.objectB;
 	_sentenceNum--;
 
 	// TODO: check sentenceNum
@@ -1225,22 +1219,21 @@ void ScummEngine_v0::checkAndRunSentenceScript() {
 }
 
 void ScummEngine_v0::runSentenceScript() {
-	int obj = OBJECT_V0(_cmdObjectNr, _cmdObjectType);
-
 	drawSentenceLine();
 
-	if (getVerbEntrypoint(obj, _cmdVerb) != 0) {
+	if (getVerbEntrypoint(_cmdObject, _cmdVerb) != 0) {
 		// do not read in the dark
 		if (!(_cmdVerb == kVerbRead && _currentLights == 0)) {
-			VAR(VAR_ACTIVE_OBJECT2) = _cmdObject2Nr;
-			runObjectScript(obj, _cmdVerb, false, false, NULL);
+			VAR(VAR_ACTIVE_OBJECT2) = OBJECT_V0_NR(_cmdObject2);
+			runObjectScript(_cmdObject, _cmdVerb, false, false, NULL);
 			return;
 		}
 	} else {
 		if (_cmdVerb == kVerbGive) {
 			// no "give to"-script: give to other kid or ignore
-			if (_cmdObject2Nr < 8)
-				setOwnerOf(obj, _cmdObject2Nr);
+			int actor = OBJECT_V0_NR(_cmdObject2);
+			if (actor < 8)
+				setOwnerOf(_cmdObject, actor);
 			return;
 		}
 	}
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index f35230b6e2..a40dd44727 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -365,7 +365,7 @@ uint ScummEngine_v0::fetchScriptWord() {
 
 int ScummEngine_v0::getActiveObject() {
 	if (_opcode & PARAM_2)
-		return _cmdObjectNr;
+		return OBJECT_V0_NR(_cmdObject);
 
 	return fetchScriptByte();
 }
@@ -461,7 +461,8 @@ void ScummEngine_v0::drawSentenceLine() {
 	if (_activeVerb == kVerbNewKid) {
 		_sentenceBuf = "";
 		for (int i = 0; i < 3; ++i) {
-			_sentenceBuf += Common::String::format("%-13s", getActorName(VAR(97 + i)));
+			Actor *a = derefActor(VAR(97 + i), "drawSentenceLine");
+			_sentenceBuf += Common::String::format("%-13s", a->getActorName());
 		}
 		flushSentenceLine();
 		return;
@@ -475,9 +476,9 @@ void ScummEngine_v0::drawSentenceLine() {
 	assert(verbName);
 	_sentenceBuf = verbName;
 
-	if (_activeObjectNr) {
+	if (_activeObject) {
 		// Draw the 1st active object
-		drawSentenceObject(OBJECT_V0(_activeObjectNr, _activeObjectType));
+		drawSentenceObject(_activeObject);
 
 		// Append verb preposition
 		int sentencePrep = activeVerbPrep();
@@ -485,16 +486,8 @@ void ScummEngine_v0::drawSentenceLine() {
 			drawPreposition(sentencePrep);
 
 			// Draw the 2nd active object
-			if (_activeObject2Nr) {
-				// 2nd Object is an actor
-				if (_activeObject2Type == kObjectV0TypeActor) {
-					_sentenceBuf += " ";
-					_sentenceBuf += (const char *)getActorName(_activeObject2Nr);
-				// 2nd Object is an inventory or room object
-				} else {
-					drawSentenceObject(OBJECT_V0(_activeObject2Nr, _activeObject2Type));
-				}
-			}
+			if (_activeObject2)
+				drawSentenceObject(_activeObject2);
 		}
 	}
 
@@ -708,8 +701,9 @@ void ScummEngine_v0::o_putActorAtObject() {
 }
 
 void ScummEngine_v0::o_pickupObject() {
-	int objNr = fetchScriptByte();
-	int obj = OBJECT_V0((objNr ? objNr : _cmdObjectNr), 0);
+	int obj = fetchScriptByte();
+	if (!obj)
+		obj = _cmdObject;
 
 	/* Don't take an object twice */
 	if (whereIsObject(obj) == WIO_INVENTORY)
@@ -761,7 +755,7 @@ void ScummEngine_v0::o_setActorBitVar() {
 void ScummEngine_v0::o_getObjectOwner() {
 	getResultPos();
 	int obj = getVarOrDirectWord(PARAM_1);
-	setResult(getOwner(obj ? obj : _cmdObjectNr));
+	setResult(getOwner(obj ? obj : _cmdObject));
 }
 
 void ScummEngine_v0::o_getActorBitVar() {
@@ -815,20 +809,20 @@ void ScummEngine_v0::o_doSentence() {
 
 	b = fetchScriptByte();
 	if (b == 0xFF) {
-		obj = OBJECT_V0(_cmdObject2Nr, _cmdObject2Type);
+		obj = _cmdObject2;
 	} else if (b == 0xFE) {
-		obj = OBJECT_V0(_cmdObjectNr, _cmdObjectType);
+		obj = _cmdObject;
 	} else {
-		obj = OBJECT_V0(b, (_opcode & 0x80) ? 1 : 0);
+		obj = OBJECT_V0(b, (_opcode & 0x80) ? kObjectV0TypeBG : kObjectV0TypeFG);
 	}
 
 	b = fetchScriptByte();
 	if (b == 0xFF) {
-		obj2 = OBJECT_V0(_cmdObject2Nr, _cmdObject2Type);
+		obj2 = _cmdObject2;
 	} else if (b == 0xFE) {
-		obj2 = OBJECT_V0(_cmdObjectNr, _cmdObjectType);
+		obj2 = _cmdObject;
 	} else {
-		obj2 = OBJECT_V0(b, (_opcode & 0x40) ? 1 : 0);
+		obj2 = OBJECT_V0(b, (_opcode & 0x40) ? kObjectV0TypeBG : kObjectV0TypeFG);
 	}
 
 	doSentence(verb, obj, obj2);
@@ -836,8 +830,8 @@ void ScummEngine_v0::o_doSentence() {
 
 bool ScummEngine_v0::ifEqualActiveObject2Common(bool ignoreType) {
 	byte obj = fetchScriptByte();
-	if (!ignoreType || (_cmdObject2Type == kObjectV0TypeFG))
-		return (obj == _cmdObject2Nr);
+	if (!ignoreType || (OBJECT_V0_TYPE(_cmdObject2) == kObjectV0TypeFG))
+		return (obj == OBJECT_V0_NR(_cmdObject2));
 	return false;
 }
 
@@ -933,26 +927,16 @@ void ScummEngine_v0::o_setOwnerOf() {
 	obj = getVarOrDirectWord(PARAM_1);
 	owner = getVarOrDirectByte(PARAM_2);
 
-	if (obj == 0)
-		obj = _cmdObjectNr;
-
-	// FIXME: the original interpreter seems to set the owner of 
-	// an item to remove (new owner 0) to 13 (purple tentacle).
-	// Ignore this behavior for now.
-	/*
-	if (owner == 0)
-		owner = 13;
-	*/
+	if (!obj)
+		obj = _cmdObject;
 
 	setOwnerOf(obj, owner);
 }
 
 void ScummEngine_v0::resetSentence(bool walking) {
 	_activeVerb = kVerbWalkTo;
-	_activeObjectNr = 0;
-	_activeObjectType = kObjectV0TypeBG;
-	_activeObject2Nr = 0;
-	_activeObject2Type = kObjectV0TypeBG;
+	_activeObject = 0;
+	_activeObject2 = 0;
 	_walkToObjectIdx = 0;
 }
 
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 2eda5cac80..f2db5ad6ba 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -715,16 +715,12 @@ ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr)
 	_currentMode = 0;
 
 	_activeVerb = kVerbNone;
-	_activeObjectNr = 0;
-	_activeObjectType = 0;
-	_activeObject2Nr = 0;
-	_activeObject2Type = 0;
+	_activeObject = 0;
+	_activeObject2 = 0;
 
 	_cmdVerb = kVerbNone;
-	_cmdObjectNr = 0;
-	_cmdObjectType = 0;
-	_cmdObject2Nr = 0;
-	_cmdObject2Type = 0;
+	_cmdObject = 0;
+	_cmdObject2 = 0;
 
 	VAR_ACTIVE_OBJECT2 = 0xFF;
 	VAR_IS_SOUND_RUNNING = 0xFF;
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index d77ae44d4c..fadc3902c0 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -804,7 +804,6 @@ public:
 protected:
 
 	int getObjActToObjActDist(int a, int b); // Not sure how to handle
-	const byte *getActorName(int id);
 	const byte *getObjOrActorName(int obj);		 // these three..
 	void setObjectName(int obj);
 
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 4da46b31bf..6b49cc0ddf 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -42,17 +42,13 @@ protected:
 protected:
 	byte _currentMode;
 
-	int _activeVerb;
-	int _activeObjectNr;			// 1st Object Number
-	int _activeObjectType;			// 1st Object Type (0: inventory (or room), 1: room)
-	int _activeObject2Nr;			// 2nd Object Number
-	int _activeObject2Type;			// 2nd Object Type (0: inventory (or room), 1: room, 2: actor)
-
-	int _cmdVerb;
-	int _cmdObjectNr;
-	int _cmdObjectType;
-	int _cmdObject2Nr;
-	int _cmdObject2Type;
+	int _activeVerb;		// selected verb
+	int _activeObject;		// 1st selected object (see OBJECT_V0(nr, type), cannot be an actor)
+	int _activeObject2;		// 2nd selected object or actor (see OBJECT_V0(nr, type))
+
+	int _cmdVerb;			// script verb
+	int _cmdObject;			// 1st script object (see OBJECT_V0(nr, type))
+	int _cmdObject2;		// 2nd script object or actor (see OBJECT_V0(nr, type))
 
 	int _walkToObject;
 	int _walkToObjectIdx;
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 99fdafa5b6..dc049816e3 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -686,14 +686,14 @@ int ScummEngine_v0::getVerbPrepId() {
 	if (_verbs[_activeVerb].prep != 0xFF) {
 		return _verbs[_activeVerb].prep;
 	} else {
-		byte *ptr = getOBCDFromObject(OBJECT_V0(_activeObjectNr, _activeObjectType), true);
+		byte *ptr = getOBCDFromObject(_activeObject, true);
 		assert(ptr);
 		return (*(ptr + 11) >> 5);
 	}
 }
 
 int ScummEngine_v0::activeVerbPrep() {
-	if (!_activeVerb || !_activeObjectNr)
+	if (!_activeVerb || !_activeObject)
 		return 0;
 	return getVerbPrepId();
 }
@@ -702,16 +702,12 @@ void ScummEngine_v0::verbExec() {
 	if (_activeVerb == kVerbWhatIs)
 		return;
 		
-	if (_activeVerb != kVerbWalkTo || _activeObjectNr != 0) {		
-		doSentence(_activeVerb, 
-			OBJECT_V0(_activeObjectNr, _activeObjectType), 
-			OBJECT_V0(_activeObject2Nr, _activeObject2Type));
+	if (!(_activeVerb == kVerbWalkTo && _activeObject == 0)) {		
+		doSentence(_activeVerb, _activeObject, _activeObject2);
 		if (_activeVerb != kVerbWalkTo) {
 			_activeVerb = kVerbWalkTo;
-			_activeObjectNr = 0;
-			_activeObjectType = 0;
-			_activeObject2Nr = 0;
-			_activeObject2Type = 0;
+			_activeObject = 0;
+			_activeObject2 = 0;
 		}
 		_walkToObjectIdx = 0;
 		return;
@@ -735,7 +731,7 @@ void ScummEngine_v0::verbExec() {
 
 bool ScummEngine_v0::checkSentenceComplete() {
 	if (_activeVerb && _activeVerb != kVerbWalkTo && _activeVerb != kVerbWhatIs) {
-		if (_activeObjectNr && (!activeVerbPrep() || _activeObject2Nr))
+		if (_activeObject && (!activeVerbPrep() || _activeObject2))
 			return true;
 	}
 	return false;
@@ -757,12 +753,9 @@ void ScummEngine_v0::checkExecVerbs() {
 		if (over) {
 			if (_activeVerb != over) { // new verb
 				// keep first object if no preposition is used yet
-				if (activeVerbPrep()) {
-					_activeObjectNr = 0;
-					_activeObjectType = 0;
-				}
-				_activeObject2Nr = 0;
-				_activeObject2Type = 0;
+				if (activeVerbPrep())
+					_activeObject = 0;
+				_activeObject2 = 0;
 				_activeVerb = over;
 				sentenceLineChanged = true;
 			} else {
@@ -828,41 +821,34 @@ void ScummEngine_v0::checkExecVerbs() {
 				// click region: main screen
 				} else if (zone->number == kMainVirtScreen) {
 					// click into main screen
-					if (_activeVerb == kVerbGive && _activeObjectNr) {
-						obj = OBJECT_V0(getActorFromPos(_virtualMouse.x, _virtualMouse.y), kObjectV0TypeActor);
+					if (_activeVerb == kVerbGive && _activeObject) {
+						int actor = getActorFromPos(_virtualMouse.x, _virtualMouse.y);
+						if (actor != 0)
+							obj = OBJECT_V0(actor, kObjectV0TypeActor);
 					} else {
 						obj = findObject(_virtualMouse.x, _virtualMouse.y);
 					}
 				}
 
-				int id = OBJECT_V0_NR(obj);
-				int type = OBJECT_V0_TYPE(obj);
-				debug("found 0x%03x", obj);
-
-				if (!id) {
+				if (!obj) {
 					if (_activeVerb == kVerbWalkTo) {
-						_activeObjectNr = 0;
-						_activeObjectType = 0;
-						_activeObject2Nr = 0;
-						_activeObject2Type = 0;
+						_activeObject = 0;
+						_activeObject2 = 0;
 					}
 				} else {
 					if (activeVerbPrep() == kVerbPrepNone) {
-						if (id == _activeObjectNr && type == _activeObjectType) {
+						if (obj == _activeObject)
 							execute = true;
-						} else {
-							_activeObjectNr = id;
-							_activeObjectType = type;
-						}
+						else
+							_activeObject = obj;
 						// immediately execute action in keypad/selection mode
 						if (_currentMode == kModeKeypad)
 							execute = true;
 					} else {
-						if (id == _activeObject2Nr && type == _activeObject2Type)
+						if (obj == _activeObject2)
 							execute = true;
-						if (!(id == _activeObjectNr && type == _activeObjectType)) {
-							_activeObject2Nr = id;
-							_activeObject2Type = type;
+						if (obj != _activeObject) {
+							_activeObject2 = obj;
 							if (_currentMode == kModeKeypad)
 								execute = true;
 						}
@@ -888,9 +874,9 @@ void ScummEngine_v0::checkExecVerbs() {
 
 	if (_activeVerb == kVerbWalkTo)
 		verbExec();
-	else if (_activeObjectNr) {
+	else if (_activeObject) {
 		// execute if we have a 1st object and either have or do not need a 2nd
-		if (activeVerbPrep() == kVerbPrepNone || _activeObject2Nr)
+		if (activeVerbPrep() == kVerbPrepNone || _activeObject2)
 			verbExec();
 	}
 }
-- 
cgit v1.2.3


From 8141511e2f6eb01a526d6adf3ecf915c656e280c Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 15 Jan 2012 23:51:28 +0100
Subject: SCUMM: fix ScummEngine_v0::ifEqualActiveObject2Common() parameter
 name

---
 engines/scumm/script_v0.cpp | 4 ++--
 engines/scumm/scumm_v0.h    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index a40dd44727..ac6ee4b9d6 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -828,9 +828,9 @@ void ScummEngine_v0::o_doSentence() {
 	doSentence(verb, obj, obj2);
 }
 
-bool ScummEngine_v0::ifEqualActiveObject2Common(bool ignoreType) {
+bool ScummEngine_v0::ifEqualActiveObject2Common(bool checkType) {
 	byte obj = fetchScriptByte();
-	if (!ignoreType || (OBJECT_V0_TYPE(_cmdObject2) == kObjectV0TypeFG))
+	if (!checkType || (OBJECT_V0_TYPE(_cmdObject2) == kObjectV0TypeFG))
 		return (obj == OBJECT_V0_NR(_cmdObject2));
 	return false;
 }
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 6b49cc0ddf..cdae22e983 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -102,7 +102,7 @@ protected:
 
 	virtual bool areBoxesNeighbors(int box1nr, int box2nr);
 
-	bool ifEqualActiveObject2Common(bool ignoreType);
+	bool ifEqualActiveObject2Common(bool checkType);
 
 	/* Version C64 script opcodes */
 	void o_stopCurrentScript();
-- 
cgit v1.2.3


From 347035385e3608c3107db7b9cba0673ce9e03a22 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Mon, 16 Jan 2012 22:32:46 +0100
Subject: SCUMM: merge object v0 id and type into one object var

---
 engines/scumm/debugger.cpp  |  6 ++---
 engines/scumm/object.cpp    | 55 ++++++++++++++++-----------------------------
 engines/scumm/object.h      | 11 +++------
 engines/scumm/saveload.cpp  | 17 +++++++++-----
 engines/scumm/script.cpp    |  6 ++---
 engines/scumm/script_v0.cpp |  4 ++--
 engines/scumm/scumm_v0.h    |  8 +++----
 7 files changed, 44 insertions(+), 63 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index b52dc7997a..5d1396633f 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -428,10 +428,9 @@ bool ScummDebugger::Cmd_PrintObjects(int argc, const char **argv) {
 		o = &(_vm->_objs[i]);
 		if (o->obj_nr == 0)
 			continue;
-		int obj = (_vm->_game.version != 0 ? o->obj_nr : OBJECT_V0(o->obj_nr, o->obj_type));
 		int classData = (_vm->_game.version != 0 ? _vm->_classData[o->obj_nr] : 0);
 		DebugPrintf("|%4d|%4d|%4d|%5d|%6d|%5d|%2d|$%08x|\n",
-				obj, o->x_pos, o->y_pos, o->width, o->height, o->state,
+				o->obj_nr, o->x_pos, o->y_pos, o->width, o->height, o->state,
 				o->fl_object_index, classData);
 	}
 	DebugPrintf("\n");
@@ -449,8 +448,7 @@ bool ScummDebugger::Cmd_Object(int argc, const char **argv) {
 	}
 
 	obj = atoi(argv[1]);
-	int obj_nr = (_vm->_game.version != 0 ? obj : OBJECT_V0_NR(obj));
-	if (obj_nr >= _vm->_numGlobalObjects) {
+	if (_vm->_game.version != 0 && obj >= _vm->_numGlobalObjects) {
 		DebugPrintf("Object %d is out of range (range: 1 - %d)\n", obj, _vm->_numGlobalObjects);
 		return true;
 	}
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index f7a01fd4cc..bf871d7fa5 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -203,6 +203,9 @@ void ScummEngine::clearOwnerOf(int obj) {
 }
 
 bool ScummEngine::getClass(int obj, int cls) const {
+	if (_game.version == 0)
+		return false;
+
 	assertRange(0, obj, _numGlobalObjects - 1, "object");
 	cls &= 0x7F;
 	assertRange(1, cls, 32, "class");
@@ -230,6 +233,9 @@ bool ScummEngine::getClass(int obj, int cls) const {
 }
 
 void ScummEngine::putClass(int obj, int cls, bool set) {
+	if (_game.version == 0)
+		return;
+
 	assertRange(0, obj, _numGlobalObjects - 1, "object");
 	cls &= 0x7F;
 	assertRange(1, cls, 32, "class");
@@ -307,16 +313,12 @@ int ScummEngine::getObjectRoom(int obj) const {
 
 int ScummEngine::getObjectIndex(int object) const {
 	int i;
-	int nr = (_game.version != 0) ? object : OBJECT_V0_NR(object);
 
-	if (nr < 1)
+	if (object < 1)
 		return -1;
 
 	for (i = (_numLocalObjects-1); i > 0; i--) {
-		if (_game.version == 0 && _objs[i].obj_type != OBJECT_V0_TYPE(object))
-			continue;
-
-		if (_objs[i].obj_nr == nr)
+		if (_objs[i].obj_nr == object)
 			return i;
 	}
 	return -1;
@@ -342,10 +344,7 @@ int ScummEngine::whereIsObject(int object) const {
 	}
 
 	for (i = (_numLocalObjects-1); i > 0; i--) {
-		int nr = (_game.version != 0) ? object : OBJECT_V0_NR(object);
-		if (_objs[i].obj_nr == nr) {
-			if (_game.version == 0 && _objs[i].obj_type != OBJECT_V0_TYPE(object))
-				continue;
+		if (_objs[i].obj_nr == object) {
 			if (_objs[i].fl_object_index)
 				return WIO_FLOBJECT;
 			return WIO_ROOM;
@@ -503,11 +502,9 @@ int ScummEngine::findObject(int x, int y) {
 		if ((_objs[i].obj_nr < 1) || getClass(_objs[i].obj_nr, kObjectClassUntouchable))
 			continue;
 
-		if (_game.version == 0) {
-			if (_objs[i].obj_type == 0 && _objs[i].state & kObjectStateUntouchable)
-				continue;
-		} else {
-			if (_game.version <= 2 && _objs[i].state & kObjectStateUntouchable)
+		if ((_game.version == 0 && OBJECT_V0_TYPE(_objs[i].obj_nr) == kObjectV0TypeFG) ||
+			(_game.version > 0 && _game.version <= 2)) {
+			if (_objs[i].state & kObjectStateUntouchable)
 				continue;
 		}
 
@@ -523,12 +520,8 @@ int ScummEngine::findObject(int x, int y) {
 				}
 #endif
 				if (_objs[i].x_pos <= x && _objs[i].width + _objs[i].x_pos > x &&
-				    _objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y) {
-					if (_game.version == 0)
-						return OBJECT_V0(_objs[i].obj_nr, _objs[i].obj_type);
-					else
-						return _objs[i].obj_nr;
-				}
+				    _objs[i].y_pos <= y && _objs[i].height + _objs[i].y_pos > y)
+					return _objs[i].obj_nr;
 				break;
 			}
 		} while ((_objs[b].state & mask) == a);
@@ -834,9 +827,6 @@ void ScummEngine_v3old::resetRoomObjects() {
 		if (_dumpScripts) {
 			char buf[32];
 			sprintf(buf, "roomobj-%d-", _roomResource);
-			if (_game.version == 0)
-				sprintf(buf + 11, "%d-", od->obj_type);
-
 			dumpResource(buf, od->obj_nr, room + od->OBCDoffset);
 		}
 	}
@@ -902,8 +892,7 @@ void ScummEngine_v0::resetRoomObject(ObjectData *od, const byte *room, const byt
 	const byte *ptr = room + od->OBCDoffset;
 	ptr -= 2;
 
-	od->obj_nr = *(ptr + 6);
-	od->obj_type = *(ptr + 7);
+	od->obj_nr = OBJECT_V0(*(ptr + 6), *(ptr + 7));
 
 	od->x_pos = *(ptr + 8) * 8;
 	od->y_pos = ((*(ptr + 9)) & 0x7F) * 8;
@@ -1064,7 +1053,7 @@ void ScummEngine::updateObjectStates() {
 	ObjectData *od = &_objs[1];
 	for (i = 1; i < _numLocalObjects; i++, od++) {
 		// V0 MM, objects with type == 1 are room objects (room specific objects, non-pickup)
-		if (_game.version == 0 && od->obj_type == 1)
+		if (_game.version == 0 && OBJECT_V0_TYPE(od->obj_nr) == kObjectV0TypeBG)
 			continue;
 
 		if (od->obj_nr > 0)
@@ -1156,7 +1145,7 @@ const byte *ScummEngine::getObjOrActorName(int obj) {
 
 	if ((_game.version == 0 && OBJECT_V0_TYPE(obj) == kObjectV0TypeActor) ||
 	    (_game.version != 0 && obj < _numActors)) {
-		int actorNr = (_game.version != 0 ? obj : OBJECT_V0_NR(obj));
+		int actorNr = (_game.version != 0 ? obj : OBJECT_V0_ID(obj));
 		return derefActor(actorNr, "getObjOrActorName")->getActorName();
 	}
 
@@ -1225,10 +1214,7 @@ uint32 ScummEngine::getOBCDOffs(int object) const {
 		return 0;
 
 	for (i = (_numLocalObjects-1); i > 0; i--) {
-		int nr = (_game.version != 0) ? object : OBJECT_V0_NR(object);
-		if (_objs[i].obj_nr == nr) {
-			if (_game.version == 0 && _objs[i].obj_type != OBJECT_V0_TYPE(object))
-				continue;
+		if (_objs[i].obj_nr == object) {
 			if (_objs[i].fl_object_index != 0)
 				return 8;
 			return _objs[i].OBCDoffset;
@@ -1252,10 +1238,7 @@ byte *ScummEngine::getOBCDFromObject(int obj, bool v0CheckInventory) {
 		}
 	} else {
 		for (i = (_numLocalObjects-1); i > 0; --i) {
-			int nr = (_game.version != 0) ? obj : OBJECT_V0_NR(obj);
-			if (_objs[i].obj_nr == nr) {
-				if (_game.version == 0 && _objs[i].obj_type != OBJECT_V0_TYPE(obj))
-					continue;
+			if (_objs[i].obj_nr == obj) {
 				if (_objs[i].fl_object_index) {
 					assert(_objs[i].OBCDoffset == 8);
 					ptr = getResourceAddress(rtFlObject, _objs[i].fl_object_index);
diff --git a/engines/scumm/object.h b/engines/scumm/object.h
index 12956fc4fd..37ccc4eef6 100644
--- a/engines/scumm/object.h
+++ b/engines/scumm/object.h
@@ -25,10 +25,10 @@
 namespace Scumm {
 
 static inline int OBJECT_V0(int id, byte type) {
-	assert(id < 255);
+	assert(id < 256);
 	return (type << 8 | id);
 }
-#define OBJECT_V0_NR(obj)	(obj & 0xFF)
+#define OBJECT_V0_ID(obj)	(obj & 0xFF)
 #define OBJECT_V0_TYPE(obj)	((obj >> 8) & 0xFF)
 
 enum ObjectV0Type {
@@ -82,12 +82,7 @@ struct ObjectData {
 	byte parentstate;
 	byte state;
 	byte fl_object_index;
-	// extra engine specific data
-	union {
-		byte extra;
-		byte obj_type; // v0
-		byte flags; // v8
-	};
+	byte flags;
 };
 
 #include "common/pack-start.h"	// START STRUCT PACKING
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 17135623e2..6c6c4a1a27 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -822,7 +822,7 @@ void ScummEngine::saveOrLoad(Serializer *s) {
 		MKLINE(ObjectData, parent, sleByte, VER(8)),
 		MKLINE(ObjectData, state, sleByte, VER(8)),
 		MKLINE(ObjectData, fl_object_index, sleByte, VER(8)),
-		MKLINE(ObjectData, extra, sleByte, VER(46)),
+		MKLINE(ObjectData, flags, sleByte, VER(46)),
 		MKEND()
 	};
 
@@ -1205,12 +1205,17 @@ void ScummEngine::saveOrLoad(Serializer *s) {
 	// Save/load local objects
 	//
 	s->saveLoadArrayOf(_objs, _numLocalObjects, sizeof(_objs[0]), objectEntries);
-	if (s->isLoading() && s->getVersion() < VER(13)) {
-		// Since roughly v13 of the save games, the objs storage has changed a bit
-		for (i = _numObjectsInRoom; i < _numLocalObjects; i++) {
-			_objs[i].obj_nr = 0;
+	if (s->isLoading()) {
+		if (s->getVersion() < VER(13)) {
+			// Since roughly v13 of the save games, the objs storage has changed a bit
+			for (i = _numObjectsInRoom; i < _numLocalObjects; i++)
+				_objs[i].obj_nr = 0;
+		} else if (_game.version == 0) { //  TODO: handle this correctly
+			for (i = 0; i < _numLocalObjects; i++) {
+				if (_objs[i].obj_nr != 0 && _objs[i].flags != 0)
+					_objs[i].obj_nr = OBJECT_V0(_objs[i].obj_nr, _objs[i].flags);
+			}
 		}
-
 	}
 
 
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 3fa89b68fb..588ebaffb9 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1138,7 +1138,7 @@ void ScummEngine_v0::walkToActorOrObject(int object) {
 	_walkToObjectIdx = getObjectIndex(object);
 
 	if (OBJECT_V0_TYPE(object) == kObjectV0TypeActor) {
-		walkActorToActor(VAR(VAR_EGO), OBJECT_V0_NR(object), 4);
+		walkActorToActor(VAR(VAR_EGO), OBJECT_V0_ID(object), 4);
 		x = a->getRealPos().x;
 		y = a->getRealPos().y;
 	} else {
@@ -1224,14 +1224,14 @@ void ScummEngine_v0::runSentenceScript() {
 	if (getVerbEntrypoint(_cmdObject, _cmdVerb) != 0) {
 		// do not read in the dark
 		if (!(_cmdVerb == kVerbRead && _currentLights == 0)) {
-			VAR(VAR_ACTIVE_OBJECT2) = OBJECT_V0_NR(_cmdObject2);
+			VAR(VAR_ACTIVE_OBJECT2) = OBJECT_V0_ID(_cmdObject2);
 			runObjectScript(_cmdObject, _cmdVerb, false, false, NULL);
 			return;
 		}
 	} else {
 		if (_cmdVerb == kVerbGive) {
 			// no "give to"-script: give to other kid or ignore
-			int actor = OBJECT_V0_NR(_cmdObject2);
+			int actor = OBJECT_V0_ID(_cmdObject2);
 			if (actor < 8)
 				setOwnerOf(_cmdObject, actor);
 			return;
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index ac6ee4b9d6..e2ec40ef52 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -365,7 +365,7 @@ uint ScummEngine_v0::fetchScriptWord() {
 
 int ScummEngine_v0::getActiveObject() {
 	if (_opcode & PARAM_2)
-		return OBJECT_V0_NR(_cmdObject);
+		return OBJECT_V0_ID(_cmdObject);
 
 	return fetchScriptByte();
 }
@@ -831,7 +831,7 @@ void ScummEngine_v0::o_doSentence() {
 bool ScummEngine_v0::ifEqualActiveObject2Common(bool checkType) {
 	byte obj = fetchScriptByte();
 	if (!checkType || (OBJECT_V0_TYPE(_cmdObject2) == kObjectV0TypeFG))
-		return (obj == OBJECT_V0_NR(_cmdObject2));
+		return (obj == OBJECT_V0_ID(_cmdObject2));
 	return false;
 }
 
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index cdae22e983..b6f9027dfa 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -43,12 +43,12 @@ protected:
 	byte _currentMode;
 
 	int _activeVerb;		// selected verb
-	int _activeObject;		// 1st selected object (see OBJECT_V0(nr, type), cannot be an actor)
-	int _activeObject2;		// 2nd selected object or actor (see OBJECT_V0(nr, type))
+	int _activeObject;		// 1st selected object (see OBJECT_V0())
+	int _activeObject2;		// 2nd selected object or actor (see OBJECT_V0())
 
 	int _cmdVerb;			// script verb
-	int _cmdObject;			// 1st script object (see OBJECT_V0(nr, type))
-	int _cmdObject2;		// 2nd script object or actor (see OBJECT_V0(nr, type))
+	int _cmdObject;			// 1st script object (see OBJECT_V0())
+	int _cmdObject2;		// 2nd script object or actor (see OBJECT_V0())
 
 	int _walkToObject;
 	int _walkToObjectIdx;
-- 
cgit v1.2.3


From cbae5c79b702494dd30abb9504767029fba065ae Mon Sep 17 00:00:00 2001
From: segrax
Date: Tue, 17 Jan 2012 20:03:52 +1100
Subject: SCUMM: Change vars to ints, remove unused variable for now

---
 engines/scumm/actor.cpp   | 5 ++---
 engines/scumm/actor.h     | 5 ++---
 engines/scumm/costume.cpp | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 950f580f42..e703c55192 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -866,8 +866,7 @@ void Actor::setDirection(int direction) {
 		    _vm->_costumeLoader->costumeDecodeData(this, _standFrame, 0);
 
         // 0x2C17
-
-        ((ActorC64*) this)->_byte_FD0A = 0xFF;
+        ((ActorC64*) this)->_byte_FD0A = -1;
 
 		_needRedraw = true;
 		return;
@@ -2653,7 +2652,7 @@ void ActorC64::animateActor(int anim) {
 
     if( this->isInCurrentRoom() ) {
 
-       this->_costCommandNew = anim;
+      // this->_costCommandNew = anim;
        this->_byte_FD0A = this->_byte_FDE8;
 
        // 0x273A
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 1feb1afaa5..a2b36e51ca 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -348,14 +348,13 @@ enum ActorC64MiscFlags {
 
 class ActorC64 : public Actor_v2 {
 public:
-    byte _costCommandNew;
 	byte _costCommand, _costFrame;
 	byte _miscflags;
 	byte _speaking, _speakingPrev;
 
-    byte _byte_FDE8;
+    int8 _byte_FDE8;
     int8 _byte_FD0A;
-    byte _byte_FCE2[8];
+    int8 _byte_FCE2[8];
     
 
 public:
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 0c091c38bf..68eeeea674 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1464,7 +1464,7 @@ byte C64CostumeLoader::increaseAnims(Actor *a) {
                 // 0x2556
                 --a->_cost.curpos[limb];
 
-                A->_costCommandNew = 0xFF;
+                //A->_costCommandNew = 0xFF;
                 //A->_costCommand = 0xFF;
                 
                 // 0x2568
-- 
cgit v1.2.3


From 4519e56e5c018459c408e20e7469d35b6ac7ed44 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 17 Jan 2012 21:51:39 +0100
Subject: SCUMM: shorten delay for dungeon door closing action

Escaping with only one kid should not be possible anymore.
---
 engines/scumm/script_v2.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'engines')

diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 6f6138d411..c35ddea64d 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1433,6 +1433,17 @@ void ScummEngine_v2::o2_delay() {
 	delay |= fetchScriptByte() << 16;
 	delay = 0xFFFFFF - delay;
 
+	// WORKAROUND: walking speed in the original v0/v1 interpreter 
+	// is sometimes slower (e.g. during scrolling) than in ScummVM.
+	// Hence, the delay for the door-closing action in the dungeon 
+	// is to long, so a single kid is able to escape -> shorten delay.
+	int script = vm.slot[_currentScript].number;
+	if ((_game.version == 0 && script == 132) || 
+		(_game.version == 1 && script == 137)) {
+		if (delay == 180)
+			delay = 120;
+	}
+
 	vm.slot[_currentScript].delay = delay;
 	vm.slot[_currentScript].status = ssPaused;
 	o5_breakHere();
-- 
cgit v1.2.3


From 0bae642453caeef9c6af9c49f043f46eebd0f787 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Tue, 17 Jan 2012 22:52:59 +0100
Subject: SCUMM: 2nd try to fix dungeon door timing

Shorten the timer delay does not work as escaping with a second kid is not possible too. Instead decrease engine speed during script execution.
---
 engines/scumm/script_v2.cpp | 11 -----------
 engines/scumm/scumm.cpp     |  8 ++++++++
 2 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index c35ddea64d..6f6138d411 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1433,17 +1433,6 @@ void ScummEngine_v2::o2_delay() {
 	delay |= fetchScriptByte() << 16;
 	delay = 0xFFFFFF - delay;
 
-	// WORKAROUND: walking speed in the original v0/v1 interpreter 
-	// is sometimes slower (e.g. during scrolling) than in ScummVM.
-	// Hence, the delay for the door-closing action in the dungeon 
-	// is to long, so a single kid is able to escape -> shorten delay.
-	int script = vm.slot[_currentScript].number;
-	if ((_game.version == 0 && script == 132) || 
-		(_game.version == 1 && script == 137)) {
-		if (delay == 180)
-			delay = 120;
-	}
-
 	vm.slot[_currentScript].delay = delay;
 	vm.slot[_currentScript].status = ssPaused;
 	o5_breakHere();
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index f2db5ad6ba..61d38dc593 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1964,6 +1964,14 @@ Common::Error ScummEngine::go() {
 		if (delta < 1)	// Ensure we don't get into an endless loop
 			delta = 1;  // by not decreasing sleepers.
 
+		// WORKAROUND: walking speed in the original v0/v1 interpreter 
+		// is sometimes slower (e.g. during scrolling) than in ScummVM.
+		// This is important for the door-closing action in the dungeon,
+		// otherwise (delta < 6) a single kid is able to escape. 
+		if ((_game.version == 0 && isScriptRunning(132)) || 
+			(_game.version == 1 && isScriptRunning(137)))
+			delta = 6;
+
 		// Wait...
 		waitForTimer(delta * 1000 / 60 - diff);
 
-- 
cgit v1.2.3


From 6d4b710c541a2e7706cb80c8737e6f8caa487277 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Wed, 18 Jan 2012 00:04:03 +0100
Subject: SCUMM: fix opcode walkToObject in v0

Before Michael did not develop the film correctly
---
 engines/scumm/script_v0.cpp | 23 +++++++++++++++++++----
 engines/scumm/scumm_v0.h    |  1 +
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index e2ec40ef52..3b81a913b3 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -101,7 +101,7 @@ void ScummEngine_v0::setupOpcodes() {
 	/* 34 */
 	OPCODE(0x34, o5_getDist);
 	OPCODE(0x35, o_stopCurrentScript);
-	OPCODE(0x36, o2_walkActorToObject);
+	OPCODE(0x36, o_walkActorToObject);
 	OPCODE(0x37, o2_clearState04);
 	/* 38 */
 	OPCODE(0x38, o2_isLessEqual);
@@ -181,7 +181,7 @@ void ScummEngine_v0::setupOpcodes() {
 	/* 74 */
 	OPCODE(0x74, o5_getDist);
 	OPCODE(0x75, o_printEgo_c64);
-	OPCODE(0x76, o2_walkActorToObject);
+	OPCODE(0x76, o_walkActorToObject);
 	OPCODE(0x77, o2_clearState04);
 	/* 78 */
 	OPCODE(0x78, o2_isGreater);
@@ -261,7 +261,7 @@ void ScummEngine_v0::setupOpcodes() {
 	/* B4 */
 	OPCODE(0xb4, o5_getDist);
 	OPCODE(0xb5, o_stopCurrentScript);
-	OPCODE(0xb6, o2_walkActorToObject);
+	OPCODE(0xb6, o_walkActorToObject);
 	OPCODE(0xb7, o2_setState04);
 	/* B8 */
 	OPCODE(0xb8, o2_isLessEqual);
@@ -341,7 +341,7 @@ void ScummEngine_v0::setupOpcodes() {
 	/* F4 */
 	OPCODE(0xf4, o5_getDist);
 	OPCODE(0xf5, o_stopCurrentScript);
-	OPCODE(0xf6, o2_walkActorToObject);
+	OPCODE(0xf6, o_walkActorToObject);
 	OPCODE(0xf7, o2_setState04);
 	/* F8 */
 	OPCODE(0xf8, o2_isGreater);
@@ -498,6 +498,21 @@ void ScummEngine_v0::o_stopCurrentScript() {
 	stopScriptCommon(0);
 }
 
+void ScummEngine_v0::o_walkActorToObject() {
+	int actor = getVarOrDirectByte(PARAM_1);
+	int objId = fetchScriptByte();
+	int obj;
+
+	if (_opcode & 0x40)
+		obj = OBJECT_V0(objId, kObjectV0TypeBG);
+	else
+		obj = OBJECT_V0(objId, kObjectV0TypeFG);
+
+	if (whereIsObject(obj) != WIO_NOT_FOUND) {
+		walkActorToObject(actor, obj);
+	}
+}
+
 void ScummEngine_v0::o_loadSound() {
 	int resid = fetchScriptByte();
 	ensureResourceLoaded(rtSound, resid);
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index b6f9027dfa..d70d893f09 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -106,6 +106,7 @@ protected:
 
 	/* Version C64 script opcodes */
 	void o_stopCurrentScript();
+	void o_walkActorToObject();
 	void o_loadSound();
 	void o_getActorMoving();
 	void o_animateActor();
-- 
cgit v1.2.3


From f2c3675ed1306f82b5cb5d44d541739ff727dfde Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Wed, 18 Jan 2012 20:29:29 +0100
Subject: SCUMM: v0 opcode review

- o_setObjectName has a default value
- o_putActorAtObject can either operate on a fg or bg object

Note: neither the default value nor the bg object opcode (4E) seem to be ever used by any script. So this commit is rather for completeness than for bug-fixing.
---
 engines/scumm/script_v0.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 3b81a913b3..caaf56878f 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -701,7 +701,12 @@ void ScummEngine_v0::o_putActorAtObject() {
 
 	a = derefActor(getVarOrDirectByte(PARAM_1), "o_putActorAtObject");
 
-	obj = fetchScriptByte();
+	int objId = fetchScriptByte();
+	if (_opcode & 0x40)
+		obj = OBJECT_V0(objId, kObjectV0TypeBG);
+	else
+		obj = OBJECT_V0(objId, kObjectV0TypeFG);
+
 	if (whereIsObject(obj) != WIO_NOT_FOUND) {
 		getObjectXYPos(obj, x, y);
 		AdjustBoxResult r = a->adjustXYToBeInBox(x, y);
@@ -735,6 +740,8 @@ void ScummEngine_v0::o_pickupObject() {
 
 void ScummEngine_v0::o_setObjectName() {
 	int obj = fetchScriptByte();
+	if (!obj)
+		obj = _cmdObject;
 	setObjectName(obj);
 }
 
-- 
cgit v1.2.3


From e2d45467bb6f0dc6d35fa33697bb97ae470f05f1 Mon Sep 17 00:00:00 2001
From: segrax
Date: Thu, 19 Jan 2012 17:59:56 +1100
Subject: SCUMM: improve unknown variable support, add case 0xff to the
 animateactor opcode

---
 engines/scumm/actor.cpp     |  8 +++++---
 engines/scumm/costume.cpp   |  7 +++++--
 engines/scumm/script_v0.cpp | 21 +++++++++++++--------
 3 files changed, 23 insertions(+), 13 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index e703c55192..c4b7c82a57 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -847,7 +847,7 @@ void Actor::setDirection(int direction) {
 		direction = 90;
 
 	// Do nothing if actor is already facing in the given direction
-	if (_facing == direction)
+	if (_vm->_game.version != 0 && _facing == direction)
 		return;
 
 	// Normalize the angle
@@ -1294,6 +1294,10 @@ void Actor::showActor() {
 	_vm->ensureResourceLoaded(rtCostume, _costume);
 
 	if (_vm->_game.version == 0) {
+
+        // 0x39DF
+        ((ActorC64*) this)->_byte_FDE8 = 1;
+
 		_cost.reset();
 		startAnimActor(_standFrame);
 	} else if (_vm->_game.version <= 2) {
@@ -2646,8 +2650,6 @@ void ScummEngine_v71he::queueAuxEntry(int actorNum, int subIndex) {
 #endif
 
 void ActorC64::animateActor(int anim) {
-    Actor::animateActor(anim);
-    return;
     int dir = oldDirToNewDir(anim % 4);
 
     if( this->isInCurrentRoom() ) {
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 68eeeea674..04e3f5986b 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1378,6 +1378,8 @@ void C64CostumeLoader::actorSpeak(ActorC64 *a, int &cmd) {
 		cmd += 0x0C;
 	else
 		cmd += 0x10;
+
+    a->_byte_FDE8 = -1;
 }
 
 void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
@@ -1408,7 +1410,8 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
     {
 		command = dirToDirStop(dir);
 
-        A->_byte_FDE8 = 0xFF;
+        //0x2BEB
+        A->_byte_FDE8 = -1;
     }
 
 	// Update the limb frames
@@ -1472,7 +1475,7 @@ byte C64CostumeLoader::increaseAnims(Actor *a) {
                 //A->_limbCommand[limb] = 0xFF;
 
             } else {
-                if( A->_byte_FCE2[limb] != 0xFF )
+                if( A->_byte_FCE2[limb] != -1 )
                     --A->_byte_FCE2[limb];
 
                 a->_cost.curpos[limb] = 0;
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index caaf56878f..ec3cad009d 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -663,24 +663,29 @@ void ScummEngine_v0::o_lights() {
 void ScummEngine_v0::o_animateActor() {
 	int act = getVarOrDirectByte(PARAM_1);
 	int anim = getVarOrDirectByte(PARAM_2);
-	int unk = fetchScriptByte();
+	int8 unk = (int8) fetchScriptByte();
 
 	debug(0,"o_animateActor: unk %d", unk);
 
 	ActorC64 *a = (ActorC64*) derefActor(act, "o_animateActor");
 
     a->_byte_FDE8 = unk;
-
-	// 0x6993
-	if (anim == 0xFE) {
+	
+    switch( anim ) {
+    case 0xFE:
+        // 0x6993
 		a->_speaking = 0x80;	// Enabled, but not switching
 		return;
-	}
-	// 0x69A3
-	if (anim == 0xFD) {
+
+    case 0xFD:
+	    // 0x69A3
 		a->_speaking = 0x00;
 		return;
-	}
+	
+    case 0xFF:
+        a->stopActorMoving();
+        return;
+    }
 
 	a->animateActor(anim);
 }
-- 
cgit v1.2.3


From e331421eae305fe857c1b630d5764e35635eaa7e Mon Sep 17 00:00:00 2001
From: segrax
Date: Fri, 20 Jan 2012 07:47:43 +1100
Subject: SCUMM: Save the new variables, move the setting of the unknown
 variable to after the setDirection call

---
 engines/scumm/actor.cpp  | 12 +++++++-----
 engines/scumm/saveload.h |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index c4b7c82a57..17e1f8cd82 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -865,9 +865,6 @@ void Actor::setDirection(int direction) {
 	    else
 		    _vm->_costumeLoader->costumeDecodeData(this, _standFrame, 0);
 
-        // 0x2C17
-        ((ActorC64*) this)->_byte_FD0A = -1;
-
 		_needRedraw = true;
 		return;
 	}
@@ -901,6 +898,7 @@ void Actor::turnToDirection(int newdir) {
 	if (newdir == -1 || _ignoreTurns)
 		return;
 
+    // 0x2C17
     if( _vm->_game.version == 0 )
         ((ActorC64*) this)->_byte_FD0A = -1;
 
@@ -2655,7 +2653,6 @@ void ActorC64::animateActor(int anim) {
     if( this->isInCurrentRoom() ) {
 
       // this->_costCommandNew = anim;
-       this->_byte_FD0A = this->_byte_FDE8;
 
        // 0x273A
        /*switch( anim ) {
@@ -2675,9 +2672,11 @@ void ActorC64::animateActor(int anim) {
             default:
                 return;
         }*/
-
+        
         this->setDirection( dir );
 
+        this->_byte_FD0A = this->_byte_FDE8;
+
     } else {
 
         if( anim > 4 ) { 
@@ -2696,6 +2695,9 @@ void ActorC64::saveLoadWithSerializer(Serializer *ser) {
 		MKLINE(ActorC64, _miscflags, sleByte, VER(84)),
 		MKLINE(ActorC64, _speaking, sleByte, VER(84)),
 		MKLINE(ActorC64, _speakingPrev, sleByte, VER(84)),
+        MKLINE(ActorC64, _byte_FD0A, sleByte, VER(89)),
+        MKLINE(ActorC64, _byte_FDE8, sleByte, VER(89)),
+        MKARRAY(ActorC64, _byte_FCE2, sleInt8, 8, VER(89)),
 		MKEND()
 	};
 
diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h
index 064bdf1406..898f80f867 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 88
+#define CURRENT_VER 89
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead
-- 
cgit v1.2.3


From a999aa39ba4963b8c31b1db81f73bdc04e9b4772 Mon Sep 17 00:00:00 2001
From: segrax
Date: Sat, 21 Jan 2012 17:50:55 +1100
Subject: SCUMM: Re-arrange some things to make it closer to the original

---
 engines/scumm/actor.cpp     | 45 +++++++++++++++++++++++++++------------------
 engines/scumm/actor.h       |  3 ++-
 engines/scumm/costume.cpp   |  6 +-----
 engines/scumm/script_v0.cpp | 23 ++++++++++++-----------
 4 files changed, 42 insertions(+), 35 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 17e1f8cd82..090ad25c9a 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -319,6 +319,9 @@ int Actor::actorWalkStep() {
 	int distX, distY;
 	int nextFacing;
 
+    if( _vm->_game.version == 0 )
+        ((ActorC64*) this)->_byte_FD0A = -1;
+
 	_needRedraw = true;
 
 	nextFacing = updateActorDirection(true);
@@ -857,18 +860,6 @@ void Actor::setDirection(int direction) {
 	if (_costume == 0)
 		return;
 
-	// V0 MM
-	if (_vm->_game.version == 0) {
-
-       	if (_moving)
-		    _vm->_costumeLoader->costumeDecodeData(this, _walkFrame, 0);
-	    else
-		    _vm->_costumeLoader->costumeDecodeData(this, _standFrame, 0);
-
-		_needRedraw = true;
-		return;
-	}
-
 	// Update the costume for the new direction (and mark the actor for redraw)
 	aMask = 0x8000;
 	for (i = 0; i < 16; i++, aMask >>= 1) {
@@ -881,6 +872,27 @@ void Actor::setDirection(int direction) {
 	_needRedraw = true;
 }
 
+void ActorC64::setDirection(int direction) {
+
+    // Normalize the angle
+	_facing = normalizeAngle(direction);
+
+     // 0x2C17
+   // _byte_FDE8 = -1;
+
+	// If there is no costume set for this actor, we are finished
+	if (_costume == 0)
+		return;
+
+    if (_moving)
+		_vm->_costumeLoader->costumeDecodeData(this, _walkFrame, 0);
+	else {
+		_vm->_costumeLoader->costumeDecodeData(this, _standFrame, 0);
+    }
+
+	_needRedraw = true;
+}
+
 void Actor::faceToObject(int obj) {
 	int x2, y2, dir;
 
@@ -898,10 +910,6 @@ void Actor::turnToDirection(int newdir) {
 	if (newdir == -1 || _ignoreTurns)
 		return;
 
-    // 0x2C17
-    if( _vm->_game.version == 0 )
-        ((ActorC64*) this)->_byte_FD0A = -1;
-
 	if (_vm->_game.version <= 6) {
 		_moving = MF_TURN;
 		_targetFacing = newdir;
@@ -2672,11 +2680,12 @@ void ActorC64::animateActor(int anim) {
             default:
                 return;
         }*/
-        
-        this->setDirection( dir );
 
+                
         this->_byte_FD0A = this->_byte_FDE8;
 
+        this->setDirection( dir );
+
     } else {
 
         if( anim > 4 ) { 
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index a2b36e51ca..0b3fcd7143 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -202,7 +202,7 @@ public:
 	void adjustActorPos();
 	virtual AdjustBoxResult adjustXYToBeInBox(int dstX, int dstY);
 
-	void setDirection(int direction);
+	virtual void setDirection(int direction);
 	void faceToObject(int obj);
 	void turnToDirection(int newdir);
 	virtual void walkActor();
@@ -379,6 +379,7 @@ public:
 	}
 
     virtual void animateActor(int anim);
+    virtual void setDirection(int direction);
 
 	// Used by the save/load system:
 	virtual void saveLoadWithSerializer(Serializer *ser);
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 04e3f5986b..965cee79a8 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1305,6 +1305,7 @@ void C64CostumeLoader::frameUpdate(ActorC64 *a, int cmd ) {
 		if (limbFrames == 0xFF)
             continue;
 
+        // 0x2679
         a->_byte_FCE2[limb] = a->_byte_FD0A;
 
 		// Has limb frames ptr changed since last update?
@@ -1407,13 +1408,8 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 
 	// Different command for stand frame
 	if (frame == a->_standFrame)
-    {
 		command = dirToDirStop(dir);
 
-        //0x2BEB
-        A->_byte_FDE8 = -1;
-    }
-
 	// Update the limb frames
 	frameUpdate(A, command);
 
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index ec3cad009d..e277480aed 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -672,19 +672,20 @@ void ScummEngine_v0::o_animateActor() {
     a->_byte_FDE8 = unk;
 	
     switch( anim ) {
-    case 0xFE:
-        // 0x6993
-		a->_speaking = 0x80;	// Enabled, but not switching
-		return;
 
-    case 0xFD:
-	    // 0x69A3
-		a->_speaking = 0x00;
-		return;
+        case 0xFE:
+            // 0x6993
+	        a->_speaking = 0x80;	// Enabled, but not switching
+	        return;
+
+        case 0xFD:
+	        // 0x69A3
+	        a->_speaking = 0x00;
+	        return;
 	
-    case 0xFF:
-        a->stopActorMoving();
-        return;
+        case 0xFF:
+            a->stopActorMoving();
+            return;
     }
 
 	a->animateActor(anim);
-- 
cgit v1.2.3


From 2f1336cdf07b59c560d082a1ce3bb7986a3913df Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 21 Jan 2012 14:06:19 +0100
Subject: SCUMM: fix blank sentence line in v0 after cutscenes and remove
 unused parameter of resetSentence()

---
 engines/scumm/script.cpp    |  2 +-
 engines/scumm/script_v0.cpp | 12 +++++++++---
 engines/scumm/scumm_v0.h    |  3 ++-
 engines/scumm/vars.cpp      |  2 +-
 engines/scumm/verbs.cpp     | 13 +++++--------
 5 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 588ebaffb9..6dac647714 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1219,7 +1219,7 @@ void ScummEngine_v0::checkAndRunSentenceScript() {
 }
 
 void ScummEngine_v0::runSentenceScript() {
-	drawSentenceLine();
+	_redrawSentenceLine = true;
 
 	if (getVerbEntrypoint(_cmdObject, _cmdVerb) != 0) {
 		// do not read in the dark
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index e277480aed..7fce4011e4 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -453,6 +453,8 @@ void ScummEngine_v0::drawSentenceObject(int object) {
 
 
 void ScummEngine_v0::drawSentenceLine() {
+	_redrawSentenceLine = false;
+
 	if (!(_userState & 32))
 		return;
 
@@ -601,7 +603,7 @@ void ScummEngine_v0::o_loadRoomWithEgo() {
 
 	_fullRedraw = true;
 
-	resetSentence(false);
+	resetSentence();
 
 	if (x >= 0 && y >= 0) {
 		a->startWalkActor(x, y, -1);
@@ -625,6 +627,7 @@ void ScummEngine_v0::o_cursorCommand() {
 	_currentMode = fetchScriptByte();
 	switch (_currentMode) {
 	case kModeCutscene:
+		_redrawSentenceLine = false;
 		state = 15;
 		break;
 	case kModeKeypad:
@@ -909,7 +912,7 @@ void ScummEngine_v0::o_cutscene() {
 	setUserState(15);
 
 	_sentenceNum = 0;
-	resetSentence(false);
+	resetSentence();
 
 	vm.cutScenePtr[0] = 0;
 }
@@ -930,6 +933,8 @@ void ScummEngine_v0::o_endCutscene() {
 	} else if (vm.cutSceneData[2] != _currentRoom) {
 		startScene(vm.cutSceneData[2], 0, 0);
 	}
+
+	_redrawSentenceLine = true;
 }
 
 void ScummEngine_v0::o_beginOverride() {
@@ -961,11 +966,12 @@ void ScummEngine_v0::o_setOwnerOf() {
 	setOwnerOf(obj, owner);
 }
 
-void ScummEngine_v0::resetSentence(bool walking) {
+void ScummEngine_v0::resetSentence() {
 	_activeVerb = kVerbWalkTo;
 	_activeObject = 0;
 	_activeObject2 = 0;
 	_walkToObjectIdx = 0;
+	_redrawSentenceLine = true;
 }
 
 } // End of namespace Scumm
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index d70d893f09..ae97b57a3e 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -52,6 +52,7 @@ protected:
 
 	int _walkToObject;
 	int _walkToObjectIdx;
+	bool _redrawSentenceLine;
 
 public:
 	ScummEngine_v0(OSystem *syst, const DetectorResult &dr);
@@ -98,7 +99,7 @@ protected:
 
 	virtual int getActiveObject();
 
-	virtual void resetSentence(bool walking);
+	virtual void resetSentence();
 
 	virtual bool areBoxesNeighbors(int box1nr, int box2nr);
 
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index 6365a728d2..6d132c601f 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -546,7 +546,7 @@ void ScummEngine_v8::setupScummVars() {
 #endif
 
 void ScummEngine_v0::resetScummVars() {
-	resetSentence(false);
+	resetSentence();
 
 	VAR(VAR_EGO) = 3;
 
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index dc049816e3..8888935ea7 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -132,7 +132,7 @@ void ScummEngine_v0::resetVerbs() {
 }
 
 void ScummEngine_v0::switchActor(int slot) {
-	resetSentence(false);
+	resetSentence();
 
 	if (_currentRoom == 45)
 		return;
@@ -741,7 +741,6 @@ void ScummEngine_v0::checkExecVerbs() {
 	ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "checkExecVerbs");
 	VirtScreen *zone = findVirtScreen(_mouse.y);
 
-	int sentenceLineChanged = false;
 	bool execute = false;
 
 	//if (_userPut <= 0)
@@ -757,7 +756,7 @@ void ScummEngine_v0::checkExecVerbs() {
 					_activeObject = 0;
 				_activeObject2 = 0;
 				_activeVerb = over;
-				sentenceLineChanged = true;
+				_redrawSentenceLine = true;
 			} else {
 				// execute sentence if complete
 				if (checkSentenceComplete())
@@ -793,7 +792,7 @@ void ScummEngine_v0::checkExecVerbs() {
 						else
 							kid = 2;
 						_activeVerb = kVerbWalkTo;
-						drawSentenceLine();
+						_redrawSentenceLine = true;
 						switchActor(kid);
 					}
 					_activeVerb = kVerbWalkTo;
@@ -855,7 +854,7 @@ void ScummEngine_v0::checkExecVerbs() {
 					}
 				}
 
-				sentenceLineChanged = true;
+				_redrawSentenceLine = true;
 				if (_activeVerb == kVerbWalkTo && zone->number == kMainVirtScreen) {
 					_walkToObjectIdx = 0;
 					execute = true;
@@ -864,10 +863,8 @@ void ScummEngine_v0::checkExecVerbs() {
 		}
 	}
 
-	if (sentenceLineChanged) {
+	if (_redrawSentenceLine)
 		drawSentenceLine();
-		sentenceLineChanged = false;
-	}
 
 	if (!execute || !_activeVerb)
 		return;
-- 
cgit v1.2.3


From f22bbc47b460bf7901844649e1e7929f512b9670 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 21 Jan 2012 23:05:16 +0100
Subject: SCUMM: fix v0 mode handling and actor switching

- handle mode switching correctly
  - do not freeze scripts in cutscene mode (mode 0), as some scripts are freezed in mode 0 that should not be freezed
  - kModeNoNewKid (mode 2) needs the same userState as mode 3
- rename o_cursorCommand to o_setMode as it is not really cursor specific
- handle actorHiding correctly (do not set costume to 0 as the previous costume cannot be reverted after hiding)
- add drawSentence
- document meanings for actor misc flags
- fix actor names for "new kid" if the radiation suit is used (all kids are set to 0 then with actor 0 name " ")
- cleanup actor switching routine
- _userPut is not used anymore in v0
---
 engines/scumm/actor.cpp     |  9 ++++++--
 engines/scumm/actor.h       | 16 ++++++-------
 engines/scumm/script_v0.cpp | 55 ++++++++++++++++++++++++---------------------
 engines/scumm/scumm_v0.h    |  4 +++-
 engines/scumm/verbs.cpp     | 20 +++++------------
 5 files changed, 52 insertions(+), 52 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 090ad25c9a..86daaeff2f 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1512,12 +1512,17 @@ void ScummEngine::processActors() {
 	for (Actor** ac = _sortedActors; ac != end; ++ac) {
 		Actor* a = *ac;
 
-		// V0 MM: 0x057B
 		if (_game.version == 0) {
+			// 0x057B
 			ActorC64 *A = (ActorC64*) a;
-			if ((A->_speaking & 1))
+			if (A->_speaking & 1)
 				A->_speaking ^= 0xFE;
+
+			// 0x22B5
+			if (A->_miscflags & kActorMiscFlagHide)
+				continue;
 		}
+
 		// Draw and animate the actors, except those w/o a costume.
 		// Note: We could 'optimize' this a little bit by only putting
 		// actors with a costume into the _sortedActors array in the
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 0b3fcd7143..7e8faa54cc 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -336,14 +336,14 @@ protected:
 };
 
 enum ActorC64MiscFlags {
-	kActorMiscFlagStrong   = 0x01, // Kid is strong (Hunk-O-Matic used)
-	kActorMiscFlag_02      = 0x02, // ???
-	kActorMiscFlag_04      = 0x04, // ???
-	kActorMiscFlagEdsEnemy = 0x08, // Kid is not Weird Ed's friend
-	kActorMiscFlag_10      = 0x10, // ???
-	kActorMiscFlag_20      = 0x20, // ???
-	kActorMiscFlagFreeze   = 0x40, // Stop moving
-	kActorMiscFlagHide     = 0x80, // Hide actor (e.g. dead or wearing radiation suit)
+	kActorMiscFlagStrong    = 0x01, // Kid is strong (Hunk-O-Matic used)
+	kActorMiscFlagGTFriend  = 0x02, // Kid is green tentacle's friend (recording contract)
+	kActorMiscFlagWatchedTV = 0x04, // Kid knows publisher's address (watched TV)
+	kActorMiscFlagEdsEnemy  = 0x08, // Kid is not Weird Ed's friend
+	kActorMiscFlag_10       = 0x10, // ???
+	kActorMiscFlag_20       = 0x20, // ???
+	kActorMiscFlagFreeze    = 0x40, // Stop moving
+	kActorMiscFlagHide      = 0x80, // Kid is invisible (dead or in radiation suit)
 };
 
 class ActorC64 : public Actor_v2 {
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 7fce4011e4..b0e3a958e4 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -154,7 +154,7 @@ void ScummEngine_v0::setupOpcodes() {
 	OPCODE(0x5e, o2_walkActorTo);
 	OPCODE(0x5f, o2_ifState04);
 	/* 60 */
-	OPCODE(0x60, o_cursorCommand);
+	OPCODE(0x60, o_setMode);
 	OPCODE(0x61, o2_putActor);
 	OPCODE(0x62, o2_stopScript);
 	OPCODE(0x63, o_stopCurrentScript);
@@ -314,7 +314,7 @@ void ScummEngine_v0::setupOpcodes() {
 	OPCODE(0xde, o2_walkActorTo);
 	OPCODE(0xdf, o2_ifNotState04);
 	/* E0 */
-	OPCODE(0xe0, o_cursorCommand);
+	OPCODE(0xe0, o_setMode);
 	OPCODE(0xe1, o2_putActor);
 	OPCODE(0xe2, o2_stopScript);
 	OPCODE(0xe3, o_stopCurrentScript);
@@ -463,8 +463,16 @@ void ScummEngine_v0::drawSentenceLine() {
 	if (_activeVerb == kVerbNewKid) {
 		_sentenceBuf = "";
 		for (int i = 0; i < 3; ++i) {
-			Actor *a = derefActor(VAR(97 + i), "drawSentenceLine");
-			_sentenceBuf += Common::String::format("%-13s", a->getActorName());
+			char *actorName;
+			int actorId = VAR(97 + i);
+			if (actorId == 0) {
+				// after usage of the radiation suit, kid vars are set to 0
+				actorName = " ";
+			} else {
+				Actor *a = derefActor(actorId, "drawSentenceLine");
+				actorName = (char *)a->getActorName();
+			}
+			_sentenceBuf += Common::String::format("%-13s", actorName);
 		}
 		flushSentenceLine();
 		return;
@@ -620,28 +628,30 @@ void ScummEngine_v0::o_unlockRoom() {
 	_res->unlock(rtRoom, resid);
 }
 
-void ScummEngine_v0::o_cursorCommand() {
-	// TODO
+void ScummEngine_v0::setMode(byte mode) {
 	int state = 0;
 
-	_currentMode = fetchScriptByte();
+	_currentMode = mode;
+
 	switch (_currentMode) {
 	case kModeCutscene:
 		_redrawSentenceLine = false;
-		state = 15;
+		state = 7;
 		break;
 	case kModeKeypad:
-		state = 31;
-		break;
-	case kModeNoNewKid:
+		state = 23;
 		break;
 	case kModeNormal:
+	case kModeNoNewKid:
 		state = 247;
 		break;
 	}
 
 	setUserState(state);
-	debug(0, "o_cursorCommand(%d)", _currentMode);
+}
+
+void ScummEngine_v0::o_setMode() {
+	setMode(fetchScriptByte());
 }
 
 void ScummEngine_v0::o_lights() {
@@ -777,8 +787,6 @@ void ScummEngine_v0::o_setActorBitVar() {
 	// This flag causes the actor to stop moving (used by script #158, Green Tentacle 'Oomph!')
 	if (a->_miscflags & kActorMiscFlagFreeze)
 		a->stopActorMoving();
-	if (a->_miscflags & kActorMiscFlagHide)
-		a->setActorCostume(0);
 
 	debug(0, "o_setActorBitVar(%d, %d, %d)", act, mask, mod);
 }
@@ -904,12 +912,10 @@ void ScummEngine_v0::o_getClosestObjActor() {
 }
 
 void ScummEngine_v0::o_cutscene() {
-	vm.cutSceneData[0] = _userState | (_userPut ? 16 : 0);
+	vm.cutSceneData[0] = _currentMode;
 	vm.cutSceneData[2] = _currentRoom;
-	vm.cutSceneData[3] = camera._mode;
 
-	// Hide inventory, freeze scripts, hide cursor
-	setUserState(15);
+	setMode(kModeCutscene);
 
 	_sentenceNum = 0;
 	resetSentence();
@@ -924,17 +930,14 @@ void ScummEngine_v0::o_endCutscene() {
 	vm.cutSceneScript[0] = 0;
 	vm.cutScenePtr[0] = 0;
 
-	// Reset user state to values before cutscene
-	setUserState(vm.cutSceneData[0] | 7);
+	setMode(vm.cutSceneData[0]);
 
-	camera._mode = (byte) vm.cutSceneData[3];
-	if (camera._mode == kFollowActorCameraMode) {
-		actorFollowCamera(VAR(VAR_EGO));
-	} else if (vm.cutSceneData[2] != _currentRoom) {
+	if (_currentMode == kModeKeypad) {
 		startScene(vm.cutSceneData[2], 0, 0);
+	} else {
+		actorFollowCamera(VAR(VAR_EGO));
+		_redrawSentenceLine = true;
 	}
-
-	_redrawSentenceLine = true;
 }
 
 void ScummEngine_v0::o_beginOverride() {
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index ae97b57a3e..c5c0c0950c 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -92,6 +92,8 @@ protected:
 	void drawSentenceObject(int object);
 	void drawSentenceLine();
 
+	void setMode(byte mode);
+
 	void switchActor(int slot);
 
 	virtual int getVarOrDirectWord(byte mask);
@@ -122,7 +124,7 @@ protected:
 	void o_lockScript();
 	void o_loadScript();
 	void o_lockRoom();
-	void o_cursorCommand();
+	void o_setMode();
 	void o_lights();
 	void o_unlockCostume();
 	void o_unlockScript();
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 8888935ea7..bb0d8f4ae2 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -134,21 +134,12 @@ void ScummEngine_v0::resetVerbs() {
 void ScummEngine_v0::switchActor(int slot) {
 	resetSentence();
 
-	if (_currentRoom == 45)
-		return;
-
-	// radiation suit? don't let the player switch
-	if (VAR(VAR_EGO) == 8)
-		return;
-
-	// verbs disabled? or just new kid button?
-	if (_currentMode == kModeCutscene || _currentMode == kModeKeypad || _currentMode == kModeNoNewKid)
+	// actor switching only allowed during normal gamplay (not cutscene, ...)
+	if (_currentMode != kModeNormal)
 		return;
 
 	VAR(VAR_EGO) = VAR(97 + slot);
-	resetVerbs();
 	actorFollowCamera(VAR(VAR_EGO));
-	setUserState(247);
 }
 
 void ScummEngine_v2::initV2MouseOver() {
@@ -743,9 +734,6 @@ void ScummEngine_v0::checkExecVerbs() {
 
 	bool execute = false;
 
-	//if (_userPut <= 0)
-	//	return;
-
 	if (_mouseAndKeyboardStat & MBS_MOUSE_MASK) {
 		int over = findVerbAtPos(_mouse.x, _mouse.y);
 		// click region: verbs
@@ -777,7 +765,7 @@ void ScummEngine_v0::checkExecVerbs() {
 		}
 
 		if (_mouseAndKeyboardStat > 0 && _mouseAndKeyboardStat < MBS_MAX_KEY) {
-			// TODO: check keypresses
+			// keys already checked by input handler
 		} else if ((_mouseAndKeyboardStat & MBS_MOUSE_MASK) || _activeVerb == kVerbWhatIs) {
 			// click region: sentence line
 			if (zone->number == kVerbVirtScreen && _mouse.y <= zone->topline + 8) {
@@ -793,9 +781,11 @@ void ScummEngine_v0::checkExecVerbs() {
 							kid = 2;
 						_activeVerb = kVerbWalkTo;
 						_redrawSentenceLine = true;
+						drawSentenceLine();
 						switchActor(kid);
 					}
 					_activeVerb = kVerbWalkTo;
+					_redrawSentenceLine = true;
 					return;
 				} else {
 					// execute sentence if complete
-- 
cgit v1.2.3


From 124e8926ba3d81c03f7603ebb6f5b2ed8d949831 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 22 Jan 2012 00:01:53 +0100
Subject: SCUMM: do not convert a savegame twice

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

(limited to 'engines')

diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 6c6c4a1a27..a1b2fafa86 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1212,7 +1212,7 @@ void ScummEngine::saveOrLoad(Serializer *s) {
 				_objs[i].obj_nr = 0;
 		} else if (_game.version == 0) { //  TODO: handle this correctly
 			for (i = 0; i < _numLocalObjects; i++) {
-				if (_objs[i].obj_nr != 0 && _objs[i].flags != 0)
+				if (_objs[i].obj_nr != 0 && OBJECT_V0_TYPE(_objs[i].obj_nr) == 0 && _objs[i].flags != 0)
 					_objs[i].obj_nr = OBJECT_V0(_objs[i].obj_nr, _objs[i].flags);
 			}
 		}
-- 
cgit v1.2.3


From 00dcc63e8f7c59c5e331963e56b03a5f8462745d Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 22 Jan 2012 01:31:28 +0100
Subject: SCUMM: remove unimplemented und unused method startMusic() in pce and
 apple2 players

---
 engines/scumm/player_apple2.h | 1 -
 engines/scumm/player_pce.h    | 1 -
 2 files changed, 2 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/player_apple2.h b/engines/scumm/player_apple2.h
index 4cbd24b81d..c3e1b7fc60 100644
--- a/engines/scumm/player_apple2.h
+++ b/engines/scumm/player_apple2.h
@@ -247,7 +247,6 @@ public:
 		_sampleRate = rate;
 		_sampleConverter.setSampleRate(rate); 
 	}
-	void startMusic(int songResIndex);
 	virtual void startSound(int sound);
 	virtual void stopSound(int sound);
 	virtual void stopAllSounds();
diff --git a/engines/scumm/player_pce.h b/engines/scumm/player_pce.h
index eb6afd892a..427fb1ace6 100644
--- a/engines/scumm/player_pce.h
+++ b/engines/scumm/player_pce.h
@@ -76,7 +76,6 @@ public:
 	virtual ~Player_PCE();
 
 	virtual void setMusicVolume(int vol) { _maxvol = vol; }
-	void startMusic(int songResIndex);
 	virtual void startSound(int sound);
 	virtual void stopSound(int sound);
 	virtual void stopAllSounds();
-- 
cgit v1.2.3


From 7d4ffb1ec068bb149fb20287d955719d3c3f5a0d Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 22 Jan 2012 01:43:46 +0100
Subject: SCUMM: fix resetAllSounds() in player_sid

It actually was stopMusic() before and so stopped only the music and not all sounds.
The former implementation is for the o_stopMusic opcode which is not supported directly by ScummVM (it always stops all sounds). It is kept as stopMusic_intern() but is not used anymore.
---
 engines/scumm/player_sid.cpp | 4 ++--
 engines/scumm/player_sid.h   | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/player_sid.cpp b/engines/scumm/player_sid.cpp
index f0f60a3924..ecfaef22c1 100644
--- a/engines/scumm/player_sid.cpp
+++ b/engines/scumm/player_sid.cpp
@@ -683,7 +683,7 @@ void Player_SID::stopSound_intern(int soundResID) { // $5093
 	releaseResource(soundResID);
 }
 
-void Player_SID::stopAllSounds_intern() { // $4CAA
+void Player_SID::stopMusic_intern() { // $4CAA
 	statusBits1B = 0;
 	isMusicPlaying = false;
 
@@ -1352,7 +1352,7 @@ void Player_SID::stopSound(int nr) {
 
 void Player_SID::stopAllSounds() {
 	Common::StackLock lock(_mutex);
-	stopAllSounds_intern();
+	resetPlayerState();
 }
 
 int Player_SID::getSoundStatus(int nr) const {
diff --git a/engines/scumm/player_sid.h b/engines/scumm/player_sid.h
index baeb7bbef0..12e3573575 100644
--- a/engines/scumm/player_sid.h
+++ b/engines/scumm/player_sid.h
@@ -57,7 +57,6 @@ public:
 	virtual ~Player_SID();
 
 	virtual void setMusicVolume(int vol) { _maxvol = vol; }
-	void startMusic(int songResIndex);
 	virtual void startSound(int sound);
 	virtual void stopSound(int sound);
 	virtual void stopAllSounds();
@@ -95,7 +94,7 @@ private:
 	void initMusic(int songResIndex); // $7de6
 	int initSound(int soundResID); // $4D0A
 	void stopSound_intern(int soundResID); // $5093
-	void stopAllSounds_intern(); // $4CAA
+	void stopMusic_intern(); // $4CAA
 
 	void resetSID(); // $48D8
 	void update(); // $481B
-- 
cgit v1.2.3


From fd4a3501ede75d87c06980b5ac563402da834f25 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 22 Jan 2012 01:44:42 +0100
Subject: SCUMM: fix saving of array _byte_FCE2

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

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 86daaeff2f..3a4f72181b 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2711,7 +2711,7 @@ void ActorC64::saveLoadWithSerializer(Serializer *ser) {
 		MKLINE(ActorC64, _speakingPrev, sleByte, VER(84)),
         MKLINE(ActorC64, _byte_FD0A, sleByte, VER(89)),
         MKLINE(ActorC64, _byte_FDE8, sleByte, VER(89)),
-        MKARRAY(ActorC64, _byte_FCE2, sleInt8, 8, VER(89)),
+        MKARRAY(ActorC64, _byte_FCE2[0], sleInt8, 8, VER(89)),
 		MKEND()
 	};
 
-- 
cgit v1.2.3


From 96f8fc6ca9889d30db11b854c95ffd65bb88034d Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 22 Jan 2012 22:58:10 +0100
Subject: SCUMM: Fix actor ID handling in v0

Some object functions allow actor IDs and object IDs as parameters. They are easily distinguishable in engines > 0 as actor IDs are < _numActors and object IDs are bigger. In v0 this is not the case as there are objects with IDs like 3 and 5 (e.g. the hamster). So object ID handling was unified for v0 and the other engines by introducing objIsActor(), objToActor() and ActorToObj().
---
 engines/scumm/debugger.cpp  |  4 +--
 engines/scumm/object.cpp    | 67 +++++++++++++++++++++++++++++----------------
 engines/scumm/script_v0.cpp | 21 +++++++-------
 engines/scumm/script_v2.cpp |  4 +--
 engines/scumm/script_v5.cpp |  8 +++++-
 engines/scumm/scumm.h       |  3 ++
 engines/scumm/scumm_v0.h    |  2 +-
 7 files changed, 69 insertions(+), 40 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index 5d1396633f..edcf2e6fea 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -382,8 +382,8 @@ bool ScummDebugger::Cmd_Actor(int argc, const char **argv) {
 			DebugPrintf("Actor[%d].costume = %d\n", actnum, a->_costume);
 		}
 	} else if (!strcmp(argv[2], "name")) {
-		int actor = (_vm->_game.version != 0 ? actnum : OBJECT_V0(actnum, kObjectV0TypeActor));
-		DebugPrintf("Name of actor %d: %s\n", actnum, _vm->getObjOrActorName(actor));
+		DebugPrintf("Name of actor %d: %s\n", actnum, 
+			_vm->getObjOrActorName(_vm->actorToObj(actnum)));
 	} else if (!strcmp(argv[2], "condmask")) {
 		if (argc > 3) {
 			a->_heCondMask = value;
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index bf871d7fa5..4ef8707714 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -357,8 +357,8 @@ int ScummEngine::whereIsObject(int object) const {
 int ScummEngine::getObjectOrActorXY(int object, int &x, int &y) {
 	Actor *act;
 
-	if (object < _numActors) {
-		act = derefActorSafe(object, "getObjectOrActorXY");
+	if (objIsActor(object)) {
+		act = derefActorSafe(objToActor(object), "getObjectOrActorXY");
 		if (act && act->isInCurrentRoom()) {
 			x = act->getRealPos().x;
 			y = act->getRealPos().y;
@@ -371,7 +371,7 @@ int ScummEngine::getObjectOrActorXY(int object, int &x, int &y) {
 	case WIO_NOT_FOUND:
 		return -1;
 	case WIO_INVENTORY:
-		if (_objectOwnerTable[object] < _numActors) {
+		if (objIsActor(_objectOwnerTable[object])) {
 			act = derefActor(_objectOwnerTable[object], "getObjectOrActorXY(2)");
 			if (act && act->isInCurrentRoom()) {
 				x = act->getRealPos().x;
@@ -463,11 +463,11 @@ int ScummEngine::getObjActToObjActDist(int a, int b) {
 	Actor *acta = NULL;
 	Actor *actb = NULL;
 
-	if (a < _numActors)
-		acta = derefActorSafe(a, "getObjActToObjActDist");
+	if (objIsActor(a))
+		acta = derefActorSafe(objToActor(a), "getObjActToObjActDist");
 
-	if (b < _numActors)
-		actb = derefActorSafe(b, "getObjActToObjActDist(2)");
+	if (objIsActor(b))
+		actb = derefActorSafe(objToActor(b), "getObjActToObjActDist(2)");
 
 	if (acta && actb && acta->getRoom() == actb->getRoom() && acta->getRoom() && !acta->isInCurrentRoom())
 		return 0;
@@ -1143,11 +1143,8 @@ const byte *ScummEngine::getObjOrActorName(int obj) {
 	byte *objptr;
 	int i;
 
-	if ((_game.version == 0 && OBJECT_V0_TYPE(obj) == kObjectV0TypeActor) ||
-	    (_game.version != 0 && obj < _numActors)) {
-		int actorNr = (_game.version != 0 ? obj : OBJECT_V0_ID(obj));
-		return derefActor(actorNr, "getObjOrActorName")->getActorName();
-	}
+	if (objIsActor(obj))
+		return derefActor(objToActor(obj), "getObjOrActorName")->getActorName();
 
 	for (i = 0; i < _numNewNames; i++) {
 		if (_newNames[i] == obj) {
@@ -1183,7 +1180,7 @@ const byte *ScummEngine::getObjOrActorName(int obj) {
 void ScummEngine::setObjectName(int obj) {
 	int i;
 
-	if (obj < _numActors && _game.version != 0)
+	if (objIsActor(obj))
 		error("Can't set actor %d name with new-name-of", obj);
 
 	for (i = 0; i < _numNewNames; i++) {
@@ -1491,11 +1488,34 @@ void ScummEngine::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id,
 	}
 }
 
+bool ScummEngine::objIsActor(int obj) {
+	// object IDs < _numActors are used in v0 for objects too (e.g. hamster)
+	if (_game.version == 0)
+		return OBJECT_V0_TYPE(obj) == kObjectV0TypeActor;
+	else
+		return obj < _numActors;
+}
+
+int ScummEngine::objToActor(int obj) {
+	if (_game.version == 0)
+		return OBJECT_V0_ID(obj);
+	else
+		return obj;
+}
+
+int ScummEngine::actorToObj(int actor) {
+	if (_game.version == 0)
+		return OBJECT_V0(actor, kObjectV0TypeActor);
+	else
+		return actor;
+}
+
 int ScummEngine::getObjX(int obj) {
-	if (obj < _numActors) {
-		if (obj < 1)
-			return 0;									/* fix for indy4's map */
-		return derefActor(obj, "getObjX")->getRealPos().x;
+	if (obj < 1)
+		return 0;									/* fix for indy4's map */
+
+	if (objIsActor(obj)) {
+		return derefActor(objToActor(obj), "getObjX")->getRealPos().x;
 	} else {
 		if (whereIsObject(obj) == WIO_NOT_FOUND)
 			return -1;
@@ -1506,10 +1526,11 @@ int ScummEngine::getObjX(int obj) {
 }
 
 int ScummEngine::getObjY(int obj) {
-	if (obj < _numActors) {
-		if (obj < 1)
-			return 0;									/* fix for indy4's map */
-		return derefActor(obj, "getObjY")->getRealPos().y;
+	if (obj < 1)
+		return 0;									/* fix for indy4's map */
+
+	if (objIsActor(obj)) {
+		return derefActor(objToActor(obj), "getObjY")->getRealPos().y;
 	} else {
 		if (whereIsObject(obj) == WIO_NOT_FOUND)
 			return -1;
@@ -1525,8 +1546,8 @@ int ScummEngine::getObjOldDir(int obj) {
 
 int ScummEngine::getObjNewDir(int obj) {
 	int dir;
-	if (obj < _numActors) {
-		dir = derefActor(obj, "getObjNewDir")->getFacing();
+	if (objIsActor(obj)) {
+		dir = derefActor(objToActor(obj), "getObjNewDir")->getFacing();
 	} else {
 		int x, y;
 		getObjectXYPos(obj, x, y, dir);
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index b0e3a958e4..7dc8945595 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -81,7 +81,7 @@ void ScummEngine_v0::setupOpcodes() {
 	/* 24 */
 	OPCODE(0x24, o_ifNotEqualActiveObject2);
 	OPCODE(0x25, o5_loadRoom);
-	OPCODE(0x26, o_getClosestObjActor);
+	OPCODE(0x26, o_getClosestActor);
 	OPCODE(0x27, o2_getActorY);
 	/* 28 */
 	OPCODE(0x28, o5_equalZero);
@@ -161,7 +161,7 @@ void ScummEngine_v0::setupOpcodes() {
 	/* 64 */
 	OPCODE(0x64, o_ifEqualActiveObject2);
 	OPCODE(0x65, o_stopCurrentScript);
-	OPCODE(0x66, o_getClosestObjActor);
+	OPCODE(0x66, o_getClosestActor);
 	OPCODE(0x67, o5_getActorFacing);
 	/* 68 */
 	OPCODE(0x68, o5_isScriptRunning);
@@ -884,31 +884,30 @@ void ScummEngine_v0::o_ifNotEqualActiveObject2() {
 	jumpRelative(!equal);
 }
 
-void ScummEngine_v0::o_getClosestObjActor() {
-	int obj;
-	int act;
+void ScummEngine_v0::o_getClosestActor() {
+	int act, check_act;
 	int dist;
 
 	// This code can't detect any actors farther away than 255 units
 	// (pixels in newer games, characters in older ones.) But this is
 	// perfectly OK, as it is exactly how the original behaved.
 
-	int closest_obj = 0xFF, closest_dist = 0xFF;
+	int closest_act = 0xFF, closest_dist = 0xFF;
 
 	getResultPos();
 
 	act = getVarOrDirectByte(PARAM_1);
-	obj = (_opcode & PARAM_2) ? 25 : 7;
+	check_act = (_opcode & PARAM_2) ? 25 : 7;
 
 	do {
-		dist = getObjActToObjActDist(act, obj);
+		dist = getObjActToObjActDist(actorToObj(act), actorToObj(check_act));
 		if (dist < closest_dist) {
 			closest_dist = dist;
-			closest_obj = obj;
+			closest_act = check_act;
 		}
-	} while (--obj);
+	} while (--check_act);
 
-	setResult(closest_obj);
+	setResult(closest_act);
 }
 
 void ScummEngine_v0::o_cutscene() {
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 6f6138d411..59500deaf5 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1315,7 +1315,7 @@ void ScummEngine_v2::o2_getActorX() {
 	getResultPos();
 
 	a = getVarOrDirectByte(PARAM_1);
-	setResult(getObjX(a));
+	setResult(getObjX(actorToObj(a)));
 }
 
 void ScummEngine_v2::o2_getActorY() {
@@ -1323,7 +1323,7 @@ void ScummEngine_v2::o2_getActorY() {
 	getResultPos();
 
 	a = getVarOrDirectByte(PARAM_1);
-	setResult(getObjY(a));
+	setResult(getObjY(actorToObj(a)));
 }
 
 void ScummEngine_v2::o2_isGreater() {
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 707c3c2397..a5591b701f 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1095,10 +1095,16 @@ void ScummEngine_v5::o5_getClosestObjActor() {
 void ScummEngine_v5::o5_getDist() {
 	int o1, o2;
 	int r;
+
 	getResultPos();
+	
 	o1 = getVarOrDirectWord(PARAM_1);
 	o2 = getVarOrDirectWord(PARAM_2);
-	r = getObjActToObjActDist(o1, o2);
+
+	if (_game.version == 0) // in v0 both parameters are always actor IDs, never objects
+		r = getObjActToObjActDist(actorToObj(o1), actorToObj(o2));
+	else
+		r = getObjActToObjActDist(o1, o2);
 
 	// FIXME: MI2 race workaround, see bug #597022. We never quite figured out
 	// what the real cause of this, or if it maybe occurs in the original, too...
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index fadc3902c0..042a3a5d47 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -787,6 +787,9 @@ protected:
 	void setOwnerOf(int obj, int owner);
 	void clearOwnerOf(int obj);
 	int getObjectRoom(int obj) const;
+	bool objIsActor(int obj);
+	int objToActor(int obj);
+	int actorToObj(int actor);
 	int getObjX(int obj);
 	int getObjY(int obj);
 	void getObjectXYPos(int object, int &x, int &y)	{ int dir; getObjectXYPos(object, x, y, dir); }
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index c5c0c0950c..10ae18ace5 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -138,7 +138,7 @@ protected:
 	void o_doSentence();
 	void o_ifEqualActiveObject2();
 	void o_ifNotEqualActiveObject2();
-	void o_getClosestObjActor();
+	void o_getClosestActor();
 	void o_printEgo_c64();
 	void o_print_c64();
 	void o_unlockRoom();
-- 
cgit v1.2.3


From b31157cee3159ec266e454dec354bd928ee54629 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 22 Jan 2012 23:01:59 +0100
Subject: SCUMM: delete some obsolete v0 TODOs

---
 engines/scumm/script_v0.cpp | 3 ---
 engines/scumm/verbs.cpp     | 1 -
 2 files changed, 4 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 7dc8945595..9fd8397596 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -584,8 +584,6 @@ void ScummEngine_v0::o_loadRoomWithEgo() {
 
 	//0x634F
 	if (a->_miscflags & kActorMiscFlagFreeze) {
-		// TODO: Check if this is the correct function
-		// to be calling here
 		stopObjectCode();
 		return;
 	}
@@ -767,7 +765,6 @@ void ScummEngine_v0::o_setObjectName() {
 void ScummEngine_v0::o_nop() {
 }
 
-// TODO: Maybe translate actor flags in future.
 void ScummEngine_v0::o_setActorBitVar() {
 	byte act = getVarOrDirectByte(PARAM_1);
 	byte mask = getVarOrDirectByte(PARAM_2);
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index bb0d8f4ae2..9334f40048 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -62,7 +62,6 @@ static const VerbSettings v0VerbTable_English[] = {
 	{kVerbWhatIs,  15, 2, "What is"}
 };
 
-// FIXME: Replace * with the correct character
 static const VerbSettings v0VerbTable_German[] = {
 	{kVerbOpen,     7, 0, "$ffne"},
 	{kVerbClose,   13, 1, "Schlie*e"},
-- 
cgit v1.2.3


From b0201a8df24462b95c786826793e46583349ee1c Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 22 Jan 2012 23:06:07 +0100
Subject: SCUMM: fix o_setObjectName()

The parameter can either be a FG or BG object depending on the opcode.
---
 engines/scumm/script_v0.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 9fd8397596..a04f23aea8 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -756,9 +756,16 @@ void ScummEngine_v0::o_pickupObject() {
 }
 
 void ScummEngine_v0::o_setObjectName() {
-	int obj = fetchScriptByte();
-	if (!obj)
+	int obj;
+	int objId = fetchScriptByte();
+	if (!objId) {
 		obj = _cmdObject;
+	} else {
+		if (_opcode & 0x80)
+			obj = OBJECT_V0(objId, kObjectV0TypeBG);
+		else
+			obj = OBJECT_V0(objId, kObjectV0TypeFG);
+	}
 	setObjectName(obj);
 }
 
-- 
cgit v1.2.3


From 1da715719c89e5cb185accf48300ba1d75c63b96 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 22 Jan 2012 23:10:46 +0100
Subject: SCUMM: handle actor freeze in walkToActorOrObject()

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

(limited to 'engines')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 6dac647714..31eef50a6a 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1149,9 +1149,9 @@ void ScummEngine_v0::walkToActorOrObject(int object) {
 	VAR(6) = x;
 	VAR(7) = y;
 
-	if (!(a->_miscflags & kActorMiscFlagFreeze)) {
-		// FIXME: walking already started -> should be stopped if condition not true
-		//actorStartWalk();
+	// actor must not move if frozen
+	if (a->_miscflags & kActorMiscFlagFreeze)
+		a->stopActorMoving();
 	}
 }
 
-- 
cgit v1.2.3


From fb684565412c69aeb0d0a9837fc5a76b98cbe285 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 22 Jan 2012 23:13:58 +0100
Subject: SCUMM: complete handling of pending walkTo actions for sentence
 commands in v0

---
 engines/scumm/script.cpp    | 53 ++++++++++++++++++++++++++++++++++++---------
 engines/scumm/script_v0.cpp |  3 ++-
 engines/scumm/scumm_v0.h    |  9 +++++++-
 engines/scumm/verbs.cpp     |  4 ++--
 4 files changed, 55 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 31eef50a6a..cda2b3cd82 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1135,7 +1135,7 @@ void ScummEngine_v0::walkToActorOrObject(int object) {
 	ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "walkToObject");
 
 	_walkToObject = object;
-	_walkToObjectIdx = getObjectIndex(object);
+	_walkToObjectState = kWalkToObjectStateWalk;
 
 	if (OBJECT_V0_TYPE(object) == kObjectV0TypeActor) {
 		walkActorToActor(VAR(VAR_EGO), OBJECT_V0_ID(object), 4);
@@ -1152,19 +1152,52 @@ void ScummEngine_v0::walkToActorOrObject(int object) {
 	// actor must not move if frozen
 	if (a->_miscflags & kActorMiscFlagFreeze)
 		a->stopActorMoving();
+}
+
+bool ScummEngine_v0::checkPendingWalkAction() {
+	// before a sentence script is executed, it might be necessary to walk to
+	// and pickup objects before. Check if such an action is pending and handle
+	// it if available.
+	if (_walkToObjectState == kWalkToObjectStateDone)
+		return false;
+
+	int actor = VAR(VAR_EGO);
+	ActorC64 *a = (ActorC64 *)derefActor(actor, "checkAndRunSentenceScript");
+
+	// wait until walking or turning action is finished
+	if (a->_moving)
+		return true;
+
+	// after walking and turning finally execute the script
+	if (_walkToObjectState == kWalkToObjectStateTurn) {
+		runSentenceScript();
+	// change actor facing
+	} else if (getObjActToObjActDist(actorToObj(actor), _walkToObject) <= 4) {
+		if (objIsActor(_walkToObject)) { // walk to actor finished
+			// make actors turn to each other
+			a->faceToObject(_walkToObject);
+			int otherActor = objToActor(_walkToObject);
+			// ignore the plant
+			if (otherActor != 19) {
+				Actor *b = derefActor(otherActor, "checkAndRunSentenceScript(2)");
+				b->faceToObject(actorToObj(actor));
+			}
+		} else { // walk to object finished
+			int x, y, dir;
+			getObjectXYPos(_walkToObject, x, y, dir);
+			a->turnToDirection(dir);
+		}
+		_walkToObjectState = kWalkToObjectStateTurn;
+		return true;
 	}
+
+	_walkToObjectState = kWalkToObjectStateDone;
+	return false;
 }
 
 void ScummEngine_v0::checkAndRunSentenceScript() {
-	if (_walkToObjectIdx) {
-		ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "checkAndRunSentenceScript");
-		if (a->_moving)
-			return;
-		// TODO: change actor facing
-		_walkToObjectIdx = 0;
-		runSentenceScript();
+	if (checkPendingWalkAction())
 		return;
-	}
 
 	if (!_sentenceNum || _sentence[_sentenceNum - 1].freezeCount)
 		return;
@@ -1214,7 +1247,7 @@ void ScummEngine_v0::checkAndRunSentenceScript() {
 
 	runSentenceScript();
 	if (_currentMode == kModeKeypad) {
-		_walkToObjectIdx = 0;
+		_walkToObjectState = kWalkToObjectStateDone;
 	}
 }
 
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index a04f23aea8..4d9a206118 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -976,7 +976,8 @@ void ScummEngine_v0::resetSentence() {
 	_activeVerb = kVerbWalkTo;
 	_activeObject = 0;
 	_activeObject2 = 0;
-	_walkToObjectIdx = 0;
+
+	_walkToObjectState = kWalkToObjectStateDone;
 	_redrawSentenceLine = true;
 }
 
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 10ae18ace5..e25d6f5826 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -39,6 +39,12 @@ protected:
 		kModeNormal = 3,     // normal playing mode
 	};
 
+	enum WalkToObjectState {
+		kWalkToObjectStateDone = 0,
+		kWalkToObjectStateWalk = 1,
+		kWalkToObjectStateTurn = 2,
+	};
+
 protected:
 	byte _currentMode;
 
@@ -51,7 +57,7 @@ protected:
 	int _cmdObject2;		// 2nd script object or actor (see OBJECT_V0())
 
 	int _walkToObject;
-	int _walkToObjectIdx;
+	int _walkToObjectState;
 	bool _redrawSentenceLine;
 
 public:
@@ -81,6 +87,7 @@ protected:
 
 	virtual void runSentenceScript();
 	virtual void checkAndRunSentenceScript();
+	bool checkPendingWalkAction();
 	bool checkSentenceComplete();
 	virtual void checkExecVerbs();
 	virtual void handleMouseOver(bool updateInventory);
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 9334f40048..91c9cc159a 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -699,7 +699,7 @@ void ScummEngine_v0::verbExec() {
 			_activeObject = 0;
 			_activeObject2 = 0;
 		}
-		_walkToObjectIdx = 0;
+		_walkToObjectState = kWalkToObjectStateDone;
 		return;
 	}
 
@@ -845,7 +845,7 @@ void ScummEngine_v0::checkExecVerbs() {
 
 				_redrawSentenceLine = true;
 				if (_activeVerb == kVerbWalkTo && zone->number == kMainVirtScreen) {
-					_walkToObjectIdx = 0;
+					_walkToObjectState = kWalkToObjectStateDone;
 					execute = true;
 				}
 			}
-- 
cgit v1.2.3


From e3f9a09d49aaeb4657862ca734d20279e75c869f Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 22 Jan 2012 23:20:27 +0100
Subject: SCUMM: keep track of the number of nested script calls for a sentence
 command in v0

If for instance an object necessary for the sentence command is not reachable or pickupable (try to use faucet (object 55) with jar with water in microwave (object 50), the pick-up script of the jar will tell the actor to pickup object 99 (jar not in microwave)) the actor will try to pick-up the jar infinitely.
This is fixed by counting the amount of nested scripts the sentence command has called (directly or indirectly) so far and aborts it if there have been too many.
---
 engines/scumm/script.cpp    | 17 ++++++++++++++---
 engines/scumm/script_v0.cpp |  3 +++
 engines/scumm/scumm_v0.h    |  1 +
 engines/scumm/verbs.cpp     |  3 +++
 4 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index cda2b3cd82..b51452170a 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1209,8 +1209,7 @@ void ScummEngine_v0::checkAndRunSentenceScript() {
 		return;
 	}
 
-	// FIXME: should this be executed?
-	//_currentScript = 0xFF;
+	_currentScript = 0xFF;
 
 	assert(st.objectA);
 
@@ -1233,7 +1232,19 @@ void ScummEngine_v0::checkAndRunSentenceScript() {
 	_cmdObject2 = st.objectB;
 	_sentenceNum--;
 
-	// TODO: check sentenceNum
+	// abort sentence execution if the number of nested scripts is too high.
+	// This might happen for instance if the sentence command depends on an
+	// object that the actor has to pick-up in a nested doSentence() call.
+	// If the actor is not able to pick-up the object (e.g. because it is not
+	// reachable or pickupable) a nested pick-up command is triggered again
+	// and again, so the actual sentence command will never be executed.
+	// In this case the sentence command has to be aborted.
+	_sentenceNestedCount++;
+	if (_sentenceNestedCount > 6) {
+		_sentenceNestedCount = 0;
+		_sentenceNum = 0;
+		return;
+	}
 
 	if (whereIsObject(st.objectA) != WIO_INVENTORY) {
 		if (_currentMode != kModeKeypad) {
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 4d9a206118..4081123e13 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -979,6 +979,9 @@ void ScummEngine_v0::resetSentence() {
 
 	_walkToObjectState = kWalkToObjectStateDone;
 	_redrawSentenceLine = true;
+
+	_sentenceNum = 0;
+	_sentenceNestedCount = 0;
 }
 
 } // End of namespace Scumm
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index e25d6f5826..8b13569042 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -55,6 +55,7 @@ protected:
 	int _cmdVerb;			// script verb
 	int _cmdObject;			// 1st script object (see OBJECT_V0())
 	int _cmdObject2;		// 2nd script object or actor (see OBJECT_V0())
+	int _sentenceNestedCount;
 
 	int _walkToObject;
 	int _walkToObjectState;
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 91c9cc159a..7a099adae9 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -689,6 +689,9 @@ int ScummEngine_v0::activeVerbPrep() {
 }
 
 void ScummEngine_v0::verbExec() {
+	_sentenceNum = 0;
+	_sentenceNestedCount = 0;
+
 	if (_activeVerb == kVerbWhatIs)
 		return;
 		
-- 
cgit v1.2.3


From 65fb1f9a09b3460eebaf7d033990fe9e778070f4 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Tue, 24 Jan 2012 23:23:19 +1100
Subject: SCUMM: Fix the animation system, rename the Limb Frame Repeat
 variable

---
 engines/scumm/actor.cpp     | 259 ++++++++++++++++++++++++++++++++------------
 engines/scumm/actor.h       |  43 +++++---
 engines/scumm/costume.cpp   | 234 +++++++++++----------------------------
 engines/scumm/costume.h     |   2 -
 engines/scumm/script_v0.cpp |  10 +-
 5 files changed, 285 insertions(+), 263 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 3a4f72181b..2d0e498f48 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -42,6 +42,14 @@ 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
+};
+
 Actor::Actor(ScummEngine *scumm, int id) :
 	_vm(scumm), _number(id) {
 	assert(_vm != 0);
@@ -226,11 +234,6 @@ void Actor::stopActorMoving() {
 	if (_walkScript)
 		_vm->stopScript(_walkScript);
 
-	// V0 Games will walk on the spot if the actor is stopped mid-walk
-	// So we must set the stand still frame
-	if (_vm->_game.version == 0)
-		startWalkAnim(3, -1);
-
 	_moving = 0;
 }
 
@@ -320,11 +323,12 @@ int Actor::actorWalkStep() {
 	int nextFacing;
 
     if( _vm->_game.version == 0 )
-        ((ActorC64*) this)->_byte_FD0A = -1;
+        ((ActorC64*) this)->_AnimFrameRepeat = -1;
 
 	_needRedraw = true;
 
-	nextFacing = updateActorDirection(true);
+	nextFacing = updateActorDirection(true);;
+
 	if (!(_moving & MF_IN_LEG) || _facing != nextFacing) {
 		if (_walkFrame != _frame || _facing != nextFacing) {
 			startWalkAnim(1, nextFacing);
@@ -364,6 +368,7 @@ int Actor::actorWalkStep() {
 		_moving &= ~MF_IN_LEG;
 		return 0;
 	}
+
 	return 1;
 }
 
@@ -415,6 +420,9 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
 		}
 	}
 
+	if( _vm->_game.version == 0 )
+		((ActorC64*) this)->animateActor(dir);
+
 	_walkdata.dest.x = abr.x;
 	_walkdata.dest.y = abr.y;
 	_walkdata.destbox = abr.box;
@@ -545,17 +553,18 @@ void Actor_v2::walkActor() {
 
 	if (_moving & MF_TURN) {
 		new_dir = updateActorDirection(false);
-		// FIXME: is this correct?
+		
 		if (_facing != new_dir) {
 
-			// Actor never stops walking when an object has been selected without this
-			if (_vm->_game.version ==0)
-				_moving = 0;
-
-			setDirection(new_dir);
+			if( _vm->_game.version != 0 )
+				setDirection(new_dir);
 
-		} else
+		} else {
 			_moving = 0;
+		}
+
+		if( _vm->_game.version == 0 )
+			((ActorC64*)this)->setCmdFromDirection( newDirToOldDir(new_dir) );
 		return;
 	}
 
@@ -564,6 +573,8 @@ void Actor_v2::walkActor() {
 
 	if (_moving & MF_IN_LEG) {
 		actorWalkStep();
+		if( _vm->_game.version == 0 )
+			((ActorC64*) this)->animateActor( newDirToOldDir( _facing ) );
 	} else {
 		if (_moving & MF_LAST_LEG) {
 			_moving = 0;
@@ -850,7 +861,7 @@ void Actor::setDirection(int direction) {
 		direction = 90;
 
 	// Do nothing if actor is already facing in the given direction
-	if (_vm->_game.version != 0 && _facing == direction)
+	if (_facing == direction)
 		return;
 
 	// Normalize the angle
@@ -872,25 +883,45 @@ void Actor::setDirection(int direction) {
 	_needRedraw = true;
 }
 
-void ActorC64::setDirection(int direction) {
+void ActorC64::setDirection(int cmd) {
 
     // Normalize the angle
-	_facing = normalizeAngle(direction);
-
-     // 0x2C17
-   // _byte_FDE8 = -1;
+	_facing = normalizeAngle( cmd );
 
 	// If there is no costume set for this actor, we are finished
 	if (_costume == 0)
 		return;
+}
 
-    if (_moving)
-		_vm->_costumeLoader->costumeDecodeData(this, _walkFrame, 0);
-	else {
-		_vm->_costumeLoader->costumeDecodeData(this, _standFrame, 0);
-    }
+// based on 0x2BCA, doesn't match disassembly because 'oldDir' variable
+// is not the same value as stored in the original interpreter
+int ActorC64::setCmdFromDirection(int direction) {
+    int res = 0;
 
-	_needRedraw = true;
+	switch (direction) {
+		case 0:
+			res = 4;	// Left
+            break;
+
+		case 1:
+			res = 5;	// Right
+            break;
+
+		case 2:
+			res = 6;	// Face Away
+            break;
+
+        default:
+			res = 7;	// Face Camera
+            break;
+	}
+	
+	
+	_AnimFrameRepeat = -1;
+	animateActor(res);
+	animateCostume();
+
+    return res;
 }
 
 void Actor::faceToObject(int obj) {
@@ -961,10 +992,12 @@ void Actor::putActor(int dstX, int dstY, int newRoom) {
 
 	if (_visible) {
 		if (isInCurrentRoom()) {
+			
 			if (_moving) {
 				stopActorMoving();
 				startAnimActor(_standFrame);
 			}
+
 			adjustActorPos();
 		} else {
 #ifdef ENABLE_HE
@@ -1228,6 +1261,8 @@ void Actor::adjustActorPos() {
 		if (flags & 7) {
 			turnToDirection(_facing);
 		}
+		if (_vm->_game.version == 0)
+				((ActorC64*)this)->setCmdFromDirection( newDirToOldDir(_facing) );
 	}
 }
 
@@ -1300,12 +1335,21 @@ void Actor::showActor() {
 	_vm->ensureResourceLoaded(rtCostume, _costume);
 
 	if (_vm->_game.version == 0) {
+		ActorC64 *a = ((ActorC64*) this);
+		
+		a->_costCommand = a->_costCommandNew = 0xFF;
+
+		for( int i = 0; i < 8; ++i ) {
+			a->_limbFrameRepeatNew[i] = 0;
+
+		}
 
         // 0x39DF
-        ((ActorC64*) this)->_byte_FDE8 = 1;
+        a->_AnimFrameRepeat = 1;
 
 		_cost.reset();
-		startAnimActor(_standFrame);
+		a->setCmdFromDirection( newDirToOldDir(_facing) );
+
 	} else if (_vm->_game.version <= 2) {
 		_cost.reset();
 		startAnimActor(_standFrame);
@@ -1817,6 +1861,27 @@ void Actor::startAnimActor(int f) {
 	}
 }
 
+void ActorC64::startAnimActor(int f) {
+	if (f == _talkStartFrame) {
+		if (v0ActorTalkArray[_number] & 0x40)
+			return;
+
+		_speaking = 1;
+		return;
+	}
+
+	if (f == _talkStopFrame) {
+
+		_speaking = 0;
+		return;
+	}
+
+	if( f == _standFrame )
+		setCmdFromDirection( newDirToOldDir(_facing) );
+	else
+		animateActor( newDirToOldDir(_facing) );
+}
+
 void Actor::animateActor(int anim) {
 	int cmd, dir;
 
@@ -1878,6 +1943,65 @@ void Actor::animateCostume() {
 	}
 }
 
+void ActorC64::limbFrameCheck() {
+	if (_cost.frame[_limb_current] == 0xFFFF )
+		return;
+
+	if (_cost.start[_limb_current] == _cost.frame[_limb_current] )
+		return;
+
+	// 0x25A4
+	_cost.start[_limb_current] = _cost.frame[_limb_current];
+
+	_limbFrameRepeat[_limb_current] = _limbFrameRepeatNew[_limb_current];
+
+	_cost.active[_limb_current] = _cost.frame[_limb_current];
+	_cost.curpos[_limb_current] = 0;
+
+	_needRedraw = true;
+}
+
+void ActorC64::animateCostume() {
+	
+	// Sound
+	if (_moving  && _vm->_currentRoom != 1 && _vm->_currentRoom != 44) {
+		if (_cost.soundPos == 0)
+			_cost.soundCounter++;
+
+		// Is this the correct location?
+		// 0x073C
+		if (v0ActorTalkArray[_number] & 0x3F)
+			_cost.soundPos = (_cost.soundPos + 1) % 3;
+	}
+
+	_vm->_costumeLoader->loadCostume(_costume);
+
+	speakCheck();
+
+	for( _limb_current = 0; _limb_current < 8; ++_limb_current ) {
+		limbFrameCheck();
+		
+		if (_vm->_costumeLoader->increaseAnims(this))
+			_needRedraw = true;
+	}
+}
+
+void ActorC64::speakCheck() {
+
+	if (v0ActorTalkArray[_number] & 0x80)
+		return;
+	
+	int cmd = newDirToOldDir( _facing );
+
+	if (_speaking & 0x80)
+		cmd += 0x0C;
+	else
+		cmd += 0x10;
+
+    _AnimFrameRepeat = -1;
+	animateActor( cmd );
+}
+
 #ifdef ENABLE_SCUMM_7_8
 void Actor::animateLimb(int limb, int f) {
 	// This methods is very similiar to animateCostume().
@@ -2661,42 +2785,43 @@ void ScummEngine_v71he::queueAuxEntry(int actorNum, int subIndex) {
 #endif
 
 void ActorC64::animateActor(int anim) {
-    int dir = oldDirToNewDir(anim % 4);
-
-    if( this->isInCurrentRoom() ) {
-
-      // this->_costCommandNew = anim;
-
-       // 0x273A
-       /*switch( anim ) {
-            case 4:
-                dir = 1;
-                break;
-            case 5:
-                dir = 0;
-                break;
-            case 6:
-                dir = 0x80;
-                break;
-            case 7:
-                dir = 0x81;
-                break;
-
-            default:
-                return;
-        }*/
-
-                
-        this->_byte_FD0A = this->_byte_FDE8;
-
-        this->setDirection( dir );
-
-    } else {
-
-        if( anim > 4 ) { 
-            if( anim <= 7 )
-                this->setDirection( dir );
-        }
+	int dir = -1;
+	
+	switch( anim ) {
+		case 0x04:
+			dir = 0;
+			break;
+
+		case 0x05:
+			dir = 1;
+			break;
+
+		case 0x06:
+			dir = 2;
+			break;
+
+		case 0x07:
+			dir = 3;
+			break;
+
+		default:
+			break;
+	}
+
+    if( isInCurrentRoom() ) {
+
+		_costCommandNew = anim;
+		_vm->_costumeLoader->costumeDecodeData(this, 0, 0);
+		
+		if( dir == -1 )
+			return;
+
+		setDirection( oldDirToNewDir(dir) );
+
+	} else {
+
+        if( anim > 4 && anim <= 7 )
+			setDirection( oldDirToNewDir(dir) );
     }
 }
 
@@ -2708,10 +2833,8 @@ void ActorC64::saveLoadWithSerializer(Serializer *ser) {
 		MKLINE(ActorC64, _costFrame, sleByte, VER(84)),
 		MKLINE(ActorC64, _miscflags, sleByte, VER(84)),
 		MKLINE(ActorC64, _speaking, sleByte, VER(84)),
-		MKLINE(ActorC64, _speakingPrev, sleByte, VER(84)),
-        MKLINE(ActorC64, _byte_FD0A, sleByte, VER(89)),
-        MKLINE(ActorC64, _byte_FDE8, sleByte, VER(89)),
-        MKARRAY(ActorC64, _byte_FCE2[0], sleInt8, 8, VER(89)),
+        MKLINE(ActorC64, _AnimFrameRepeat, sleByte, VER(89)),
+        MKARRAY(ActorC64, _limbFrameRepeatNew[0], sleInt8, 8, VER(89)),
 		MKEND()
 	};
 
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 7e8faa54cc..35ff657fa7 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -208,7 +208,7 @@ public:
 	virtual void walkActor();
 	void drawActorCostume(bool hitTestMode = false);
 	virtual void prepareDrawActorCostume(BaseCostumeRenderer *bcr);
-	void animateCostume();
+	virtual void animateCostume();
 	virtual void setActorCostume(int c);
 
 	void animateLimb(int limb, int f);
@@ -222,7 +222,7 @@ protected:
 	void startWalkAnim(int cmd, int angle);
 public:
 	void runActorTalkScript(int f);
-	void startAnimActor(int frame);
+	virtual void startAnimActor(int frame);
 
 	void remapActorPalette(int r_fact, int g_fact, int b_fact, int threshold);
 	void remapActorPaletteColor(int slot, int color);
@@ -348,38 +348,47 @@ enum ActorC64MiscFlags {
 
 class ActorC64 : public Actor_v2 {
 public:
-	byte _costCommand, _costFrame;
+	byte _costCommandNew, _costCommand, _costFrame;
 	byte _miscflags;
-	byte _speaking, _speakingPrev;
+	byte _speaking;
 
-    int8 _byte_FDE8;
-    int8 _byte_FD0A;
-    int8 _byte_FCE2[8];
-    
+    int8 _AnimFrameRepeat;
+    int8 _limbFrameRepeatNew[8], _limbFrameRepeat[8];
+
+    byte _limb_current;
+	bool _limb_flipped[8];
 
 public:
 	ActorC64(ScummEngine *scumm, int id) : Actor_v2(scumm, id) {
-		 _costCommand = 0;
+		 _costCommand = 0xFF;
 		 _costFrame = 0;
 		 _speaking = 0;
-		 _speakingPrev = 0;
-         _byte_FD0A = 0;
-         _byte_FDE8 = 0;
-
-         // Reset the limb counter?
-         for( int i = 0; i < sizeof( _byte_FCE2 ); ++i )
-             _byte_FCE2[i] = 0;
-
+         _AnimFrameRepeat = 0;
+		 _costCommandNew = 0;
+
+		 for( int i = 0; i < 8; ++i ) {
+			_limbFrameRepeatNew[i] = 0;
+			_limbFrameRepeat[i] = 0;
+			_limb_flipped[i] = false;
+		 }
 	}
 	virtual void initActor(int mode) {
 		Actor_v2::initActor(mode);
 		if (mode == -1) {
 			_miscflags = 0;
 		}
+
 	}
 
     virtual void animateActor(int anim);
+	virtual void animateCostume();
+
+	void		 limbFrameCheck();
+
+	void		 speakCheck();
     virtual void setDirection(int direction);
+	int			 setCmdFromDirection(int direction);
+	void		 startAnimActor(int f);
 
 	// Used by the save/load system:
 	virtual void saveLoadWithSerializer(Serializer *ser);
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 965cee79a8..c7285ead56 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -72,14 +72,6 @@ static const int v1MMNESLookup[25] = {
 	0x17, 0x00, 0x01, 0x05, 0x16
 };
 
-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
-};
-
 byte ClassicCostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) {
 	int i, skip = 0;
 	byte drawFlag = 1;
@@ -1187,10 +1179,12 @@ static const byte actorColorsMMC64[25] = {
 	}
 
 byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
+	ActorC64* A = (ActorC64*) a;
+
 	if (limb >= 8)
 		return 0;
 
-	if (a->_cost.start[limb] == 0xFFFF)
+	if (a->_cost.curpos[limb] == 0xFFFF || A->_cost.active[limb] == 0xFFFF )
 		return 0;
 
 	if (limb == 0) {
@@ -1198,8 +1192,8 @@ byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
 		_draw_bottom = 0;
 	}
 
-	bool flipped = (a->_cost.start[limb] & 0x80) != 0;
-	byte frameStart = _loaded._frameOffsets[a->_cost.frame[limb]];
+	byte frameB = _loaded._frameOffsets[limb] + a->_cost.active[limb];
+	byte frameStart = _loaded._frameOffsets[ frameB ];
 	byte frame = _loaded._frameOffsets[frameStart + a->_cost.curpos[limb]];
 	if (frame == 0xFF)
 		return 0;
@@ -1231,7 +1225,7 @@ byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
 	if (!width || !height)
 		return 0;
 
-	int xpos = _actorX + (flipped ? -1 : +1) * (offsetX * 8 - a->_width / 2);
+	int xpos = _actorX + (A->_limb_flipped[ limb ] ? -1 : +1) * (offsetX * 8 - a->_width / 2);
 	// +1 as we appear to be 1 pixel away from the original interpreter
 	int ypos = _actorY - offsetY + 1;
 
@@ -1241,13 +1235,13 @@ byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
 			byte color = data[y * width + x];
 			byte pcolor;
 
-			int destX = xpos + (flipped ? -(x + 1) : x) * 8;
+			int destX = xpos + (A->_limb_flipped[ limb ] ? -(x + 1) : x) * 8;
 			int destY = ypos + y;
 
 			if (destY >= 0 && destY < _out.h && destX >= 0 && destX < _out.w) {
 				byte *dst = (byte *)_out.pixels + destY * _out.pitch + destX;
 				byte *mask = _vm->getMaskBuffer(0, destY, _zbuf);
-				if (flipped) {
+				if (A->_limb_flipped[ limb ]) {
 					LINE(0, 0); LINE(2, 2); LINE(4, 4); LINE(6, 6);
 				} else {
 					LINE(6, 0); LINE(4, 2); LINE(2, 4); LINE(0, 6);
@@ -1258,7 +1252,7 @@ byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
 
 	_draw_top = MIN(_draw_top, ypos);
 	_draw_bottom = MAX(_draw_bottom, ypos + height);
-	if (flipped)
+	if (A->_limb_flipped[ limb ])
 		_vm->markRectAsDirty(kMainVirtScreen, xpos - (width * 8), xpos, ypos, ypos + height, _actorID);
 	else
 		_vm->markRectAsDirty(kMainVirtScreen, xpos, xpos + (width * 8), ypos, ypos + height, _actorID);
@@ -1291,195 +1285,93 @@ void C64CostumeLoader::loadCostume(int id) {
 	_maxHeight = 0;
 }
 
-void C64CostumeLoader::frameUpdate(ActorC64 *a, int cmd ) {
-	byte limbFrames = 0;
-
-	// Each costume-command has 8 limbs  (0x2622)
-	cmd <<= 3;
-
-	for (int limb = 0, pos = 0; limb < 8; ++limb, pos = 0) {
-		// get the frame number for the beginning of the costume command
-		limbFrames = ((_animCmds + cmd)[limb]);
-
-		// Dont change if frame is invalid
-		if (limbFrames == 0xFF)
-            continue;
-
-        // 0x2679
-        a->_byte_FCE2[limb] = a->_byte_FD0A;
-
-		// Has limb frames ptr changed since last update?
-		if (a->_cost.start[limb] == limbFrames)
-			continue;
-
-		// Set new limb command addresses
-		a->_cost.start[limb]	= limbFrames;
-		a->_cost.frame[limb]	= _frameOffsets[limb] + (limbFrames & 0x7f);			// limb animation-frames ptr
-
-		// Get first entry of a limbs' frames
-		byte frameStart = _frameOffsets[ a->_cost.frame[limb]];
-
-		// Loop each frame in this limb until we reach the end marker
-		while (pos != 0xFF) {	// This is just so we dont overflow
-			byte frame = _frameOffsets[frameStart + pos];
-
-			// Each animation-frame until we find end
-			if (frame == 0xFF)
-				break;
-
-			byte ptrLow = _baseptr[frame];
-			byte ptrHigh = ptrLow + _dataOffsets[4];
-			int  frameOffset = (_baseptr[ptrHigh] << 8) + _baseptr[ptrLow + 2];			// 0x23EF / 0x2400
-
-			const byte *data = _baseptr + frameOffset;
-
-			if (data[3] > _maxHeight)
-				_maxHeight = data[3] + 1;
-
-			++pos;
-		}
-
-		// Set ending position of limb frames
-		a->_cost.end[limb] = pos;
-		a->_cost.curpos[limb] = 0;
-	}
-}
-
-// based on 0x2BCA, doesn't match disassembly because 'oldDir' variable
-// is not the same value as stored in the original interpreter
-int C64CostumeLoader::dirToDirStop(int oldDir) {
-    int res = 0;
-
-	switch (oldDir) {
-		case 0:
-			res = 4;	// Left
-            break;
-
-		case 1:
-			res = 5;	// Right
-            break;
-
-		case 2:
-			res = 6;	// Face Camera
-            break;
+void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
+	ActorC64 *A = (ActorC64 *)a;
 
-        default:
-			res = 7;	// Face Away
-            break;
-	}
-	
-    return res;
-}
+	loadCostume(a->_costume);
 
-void C64CostumeLoader::actorSpeak(ActorC64 *a, int &cmd) {
-	if (v0ActorTalkArray[a->_number] & 0x80)
+	if( A->_costCommandNew == 0xFF || (A->_costCommand == A->_costCommandNew) )
 		return;
 
-	if ((a->_speaking & 0x80))
-		cmd += 0x0C;
-	else
-		cmd += 0x10;
-
-    a->_byte_FDE8 = -1;
-}
+	A->_costCommand = A->_costCommandNew;
 
-void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
-	ActorC64 *A = (ActorC64 *)a;
-	int dir = newDirToOldDir(a->getFacing());
-	int command = dir;
+	int cmd = A->_costCommand;
+	byte limbFrameNumber = 0;
 
-	loadCostume(a->_costume);
+	// Each costume-command has 8 limbs  (0x2622)
+	cmd <<= 3;
 
-	// Enable/Disable speaking flag
-	if (frame == a->_talkStartFrame) {
+	for (int limb = 0; limb < 8; ++limb) {
 
-		if (v0ActorTalkArray[a->_number] & 0x40)
-			return;
+		// get the frame number for the beginning of the costume command
+		limbFrameNumber = ((_animCmds + cmd)[limb]);
 
-		A->_speaking = 1;
-		return;
-	}
+		if( limbFrameNumber & 0x80 ) {
 
-	if (frame == a->_talkStopFrame) {
+			// 0x263D
+			if( limbFrameNumber == 0xFF )
+				continue;
 
-		A->_speaking = 0;
-		return;
-	}
+			// 0x2643
+			a->_cost.frame[limb]	= (limbFrameNumber & 0x7f);			// limb animation-frames ptr
+			if( A->_limb_flipped[limb] != true )
+				a->_cost.start[limb] = 0xFFFF;
 
-	// Different command for stand frame
-	if (frame == a->_standFrame)
-		command = dirToDirStop(dir);
+			A->_limb_flipped[limb] = true;
 
-	// Update the limb frames
-	frameUpdate(A, command);
+		} else {
+			//0x2660
+			a->_cost.frame[limb]	= limbFrameNumber;
 
-	// Keep current command/frame mode
-	A->_costCommand = dir;
-	A->_costFrame = frame;
+			if( A->_limb_flipped[limb] != false )
+				a->_cost.start[limb] = 0xFFFF;
 
-	// Update 'speaking' frames?
-	if (A->_speaking) {
-		command = dir;	// Incase standing frame was set as cmd
-		actorSpeak(A, command);
+			A->_limb_flipped[limb] = false;
+		}
 
-		// Update the limb speak frames
-		frameUpdate(A, command);
+		// 0x2679
+        A->_limbFrameRepeatNew[limb] = A->_AnimFrameRepeat;
 	}
 }
 
 byte C64CostumeLoader::increaseAnims(Actor *a) {
 	ActorC64 *A = (ActorC64 *)a;
+	
+	if( _frameOffsets == 0 )
+		return 0;
 
-	// check if the actor speak flag has changed since last frame increase
-	if (A->_speaking != A->_speakingPrev) {
-		int cmd = A->_costCommand;
-		A->_speakingPrev = A->_speaking;
-
-		actorSpeak(A, cmd);
-
-		// Update the limb frames
-		frameUpdate(A, cmd);
-	}
-
-	if (A->_moving  && _vm->_currentRoom != 1 && _vm->_currentRoom != 44) {
-		if (a->_cost.soundPos == 0)
-			a->_cost.soundCounter++;
-
-		// Is this the correct location?
-		// 0x073C
-		if (v0ActorTalkArray[a->_number] & 0x3F)
-			a->_cost.soundPos = (a->_cost.soundPos + 1) % 3;
-	}
+	uint16 limbPrevious = a->_cost.curpos[A->_limb_current]++;
 
 	// increase each frame pos
     // 0x2543
-	for (int limb = 0; limb < 8; ++limb) {
-
-		if (++a->_cost.curpos[limb] >= a->_cost.end[limb]) {
+	byte frameB = _frameOffsets[A->_limb_current] + a->_cost.active[A->_limb_current];
+	byte frameStart = _frameOffsets[ frameB ];
+	byte frame = _frameOffsets[frameStart + a->_cost.curpos[A->_limb_current]];
 
-            // 0x2541
-            if( A->_byte_FCE2[limb] == 0 ) {
+	if ( frame == 0xFF ) {
+        // 0x2545
+        if( A->_limbFrameRepeat[A->_limb_current] == 0 ) {
 
-                // 0x2556
-                --a->_cost.curpos[limb];
+            // 0x2556
+            --A->_cost.curpos[A->_limb_current];
 
-                //A->_costCommandNew = 0xFF;
-                //A->_costCommand = 0xFF;
+            A->_costCommandNew = 0xFF;
+            A->_costCommand = 0xFF;
                 
-                // 0x2568
-                //A->_limbCommandNew[limb] = 0xFF;
-                //A->_limbCommand[limb] = 0xFF;
+            // 0x2568
+			A->_cost.frame[A->_limb_current] = 0xFFFF;
+			A->_cost.start[A->_limb_current] = 0xFFFF;
 
-            } else {
-                if( A->_byte_FCE2[limb] != -1 )
-                    --A->_byte_FCE2[limb];
+        } else {
+            if( A->_limbFrameRepeat[A->_limb_current] != -1 )
+                --A->_limbFrameRepeat[A->_limb_current];
 
-                a->_cost.curpos[limb] = 0;
-            }
+            a->_cost.curpos[A->_limb_current] = 0;
         }
+    }
 
-        
-	}
+	if( limbPrevious == a->_cost.curpos[A->_limb_current] )
+		return 0;
 
 	return 1;
 }
diff --git a/engines/scumm/costume.h b/engines/scumm/costume.h
index 3acf2a1f6c..50e3f1e1b2 100644
--- a/engines/scumm/costume.h
+++ b/engines/scumm/costume.h
@@ -77,9 +77,7 @@ public:
 	int _maxHeight;
 
 protected:
-	void actorSpeak(ActorC64 *a, int &cmd);
 	int dirToDirStop(int oldDir);
-	void frameUpdate(ActorC64 *A, int cmd);
 
 };
 
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 4081123e13..0bdefd660b 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -27,6 +27,7 @@
 #include "scumm/resource.h"
 #include "scumm/scumm_v0.h"
 #include "scumm/verbs.h"
+#include "scumm/util.h"
 
 namespace Scumm {
 
@@ -601,8 +602,7 @@ void ScummEngine_v0::o_loadRoomWithEgo() {
 	x = r.x;
 	y = r.y;
 	a->putActor(x, y, _currentRoom);
-	a->setDirection(dir + 180);
-
+	
 	camera._dest.x = camera._cur.x = a->getPos().x;
 	setCameraAt(a->getPos().x, a->getPos().y);
 	setCameraFollows(a);
@@ -674,13 +674,13 @@ void ScummEngine_v0::o_lights() {
 void ScummEngine_v0::o_animateActor() {
 	int act = getVarOrDirectByte(PARAM_1);
 	int anim = getVarOrDirectByte(PARAM_2);
-	int8 unk = (int8) fetchScriptByte();
+	int8 animFrameRepeat = (int8) fetchScriptByte();
 
-	debug(0,"o_animateActor: unk %d", unk);
+	debug(0,"o_animateActor: animFrameRepeat %d", animFrameRepeat);
 
 	ActorC64 *a = (ActorC64*) derefActor(act, "o_animateActor");
 
-    a->_byte_FDE8 = unk;
+    a->_AnimFrameRepeat = animFrameRepeat;
 	
     switch( anim ) {
 
-- 
cgit v1.2.3


From 08e3866395326faee0e64e2e92097f85418980f3 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Wed, 25 Jan 2012 16:18:33 +1100
Subject: SCUMM: Animation Fixes

---
 engines/scumm/actor.cpp     | 65 ++++++++++++++++++++++++++-------------------
 engines/scumm/actor.h       |  7 +++--
 engines/scumm/costume.cpp   |  7 +++--
 engines/scumm/script_v0.cpp |  6 ++---
 4 files changed, 48 insertions(+), 37 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 2d0e498f48..89e4133ade 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -323,11 +323,11 @@ int Actor::actorWalkStep() {
 	int nextFacing;
 
     if( _vm->_game.version == 0 )
-        ((ActorC64*) this)->_AnimFrameRepeat = -1;
+        ((ActorC64*) this)->_animFrameRepeat = -1;
 
 	_needRedraw = true;
 
-	nextFacing = updateActorDirection(true);;
+	nextFacing = updateActorDirection(true);
 
 	if (!(_moving & MF_IN_LEG) || _facing != nextFacing) {
 		if (_walkFrame != _frame || _facing != nextFacing) {
@@ -420,9 +420,6 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
 		}
 	}
 
-	if( _vm->_game.version == 0 )
-		((ActorC64*) this)->animateActor(dir);
-
 	_walkdata.dest.x = abr.x;
 	_walkdata.dest.y = abr.y;
 	_walkdata.destbox = abr.box;
@@ -448,6 +445,7 @@ void Actor::startWalkAnim(int cmd, int angle) {
 		args[2] = angle;
 		_vm->runScript(_walkScript, 1, 0, args);
 	} else {
+
 		switch (cmd) {
 		case 1:										/* start walk */
 			setDirection(angle);
@@ -564,7 +562,9 @@ void Actor_v2::walkActor() {
 		}
 
 		if( _vm->_game.version == 0 )
-			((ActorC64*)this)->setCmdFromDirection( newDirToOldDir(new_dir) );
+			if( _moving == 0 )
+				((ActorC64*)this)->setCmdFromDirection( newDirToOldDir(new_dir) );
+
 		return;
 	}
 
@@ -573,8 +573,10 @@ void Actor_v2::walkActor() {
 
 	if (_moving & MF_IN_LEG) {
 		actorWalkStep();
+
 		if( _vm->_game.version == 0 )
 			((ActorC64*) this)->animateActor( newDirToOldDir( _facing ) );
+
 	} else {
 		if (_moving & MF_LAST_LEG) {
 			_moving = 0;
@@ -884,13 +886,9 @@ void Actor::setDirection(int direction) {
 }
 
 void ActorC64::setDirection(int cmd) {
+	
+	setCmdFromDirection( newDirToOldDir( cmd ) );
 
-    // Normalize the angle
-	_facing = normalizeAngle( cmd );
-
-	// If there is no costume set for this actor, we are finished
-	if (_costume == 0)
-		return;
 }
 
 // based on 0x2BCA, doesn't match disassembly because 'oldDir' variable
@@ -916,8 +914,7 @@ int ActorC64::setCmdFromDirection(int direction) {
             break;
 	}
 	
-	
-	_AnimFrameRepeat = -1;
+	_animFrameRepeat = -1;
 	animateActor(res);
 	animateCostume();
 
@@ -951,6 +948,9 @@ void Actor::turnToDirection(int newdir) {
 			_targetFacing = newdir;
 		}
 	}
+
+	if (_vm->_game.version == 0)
+		((ActorC64*)this)->setCmdFromDirection( newDirToOldDir(newdir) );
 }
 
 
@@ -999,6 +999,7 @@ void Actor::putActor(int dstX, int dstY, int newRoom) {
 			}
 
 			adjustActorPos();
+
 		} else {
 #ifdef ENABLE_HE
 			if (_vm->_game.heversion >= 71)
@@ -1010,6 +1011,9 @@ void Actor::putActor(int dstX, int dstY, int newRoom) {
 		if (isInCurrentRoom())
 			showActor();
 	}
+
+	if( _vm->_game.version == 0 && _costume != 0x13 )
+		turnToDirection( oldDirToNewDir(2));
 }
 
 static bool inBoxQuickReject(const BoxCoords &box, int x, int y, int threshold) {
@@ -1261,8 +1265,6 @@ void Actor::adjustActorPos() {
 		if (flags & 7) {
 			turnToDirection(_facing);
 		}
-		if (_vm->_game.version == 0)
-				((ActorC64*)this)->setCmdFromDirection( newDirToOldDir(_facing) );
 	}
 }
 
@@ -1335,20 +1337,26 @@ void Actor::showActor() {
 	_vm->ensureResourceLoaded(rtCostume, _costume);
 
 	if (_vm->_game.version == 0) {
+
 		ActorC64 *a = ((ActorC64*) this);
 		
 		a->_costCommand = a->_costCommandNew = 0xFF;
 
 		for( int i = 0; i < 8; ++i ) {
+			a->_limbFrameRepeat[i] = 0;
 			a->_limbFrameRepeatNew[i] = 0;
-
 		}
 
+		_cost.reset();
+
         // 0x39DF
-        a->_AnimFrameRepeat = 1;
+        a->_animFrameRepeat = 1;
+		a->_speaking = 0;
 
-		_cost.reset();
-		a->setCmdFromDirection( newDirToOldDir(_facing) );
+ 		if( a->_costume != 0x13 )
+			startAnimActor(_standFrame);
+		_visible = true;
+		return;
 
 	} else if (_vm->_game.version <= 2) {
 		_cost.reset();
@@ -1974,8 +1982,6 @@ void ActorC64::animateCostume() {
 			_cost.soundPos = (_cost.soundPos + 1) % 3;
 	}
 
-	_vm->_costumeLoader->loadCostume(_costume);
-
 	speakCheck();
 
 	for( _limb_current = 0; _limb_current < 8; ++_limb_current ) {
@@ -1998,7 +2004,7 @@ void ActorC64::speakCheck() {
 	else
 		cmd += 0x10;
 
-    _AnimFrameRepeat = -1;
+    _animFrameRepeat = -1;
 	animateActor( cmd );
 }
 
@@ -2788,18 +2794,22 @@ void ActorC64::animateActor(int anim) {
 	int dir = -1;
 	
 	switch( anim ) {
+		case 0x00:
 		case 0x04:
 			dir = 0;
 			break;
 
+		case 0x01:
 		case 0x05:
 			dir = 1;
 			break;
 
+		case 0x02:
 		case 0x06:
 			dir = 2;
 			break;
 
+		case 0x03:
 		case 0x07:
 			dir = 3;
 			break;
@@ -2816,12 +2826,12 @@ void ActorC64::animateActor(int anim) {
 		if( dir == -1 )
 			return;
 
-		setDirection( oldDirToNewDir(dir) );
+		_facing = normalizeAngle( oldDirToNewDir(dir) );
 
 	} else {
 
         if( anim > 4 && anim <= 7 )
-			setDirection( oldDirToNewDir(dir) );
+			_facing = normalizeAngle( oldDirToNewDir(dir) );
     }
 }
 
@@ -2830,11 +2840,12 @@ void ActorC64::saveLoadWithSerializer(Serializer *ser) {
 
 	static const SaveLoadEntry actorEntries[] = {
 		MKLINE(ActorC64, _costCommand, sleByte, VER(84)),
-		MKLINE(ActorC64, _costFrame, sleByte, VER(84)),
+		MKLINE_OLD(ActorC64, _costFrame, sleByte, VER(84), VER(89)),
 		MKLINE(ActorC64, _miscflags, sleByte, VER(84)),
 		MKLINE(ActorC64, _speaking, sleByte, VER(84)),
-        MKLINE(ActorC64, _AnimFrameRepeat, sleByte, VER(89)),
+        MKLINE(ActorC64, _animFrameRepeat, sleByte, VER(89)),
         MKARRAY(ActorC64, _limbFrameRepeatNew[0], sleInt8, 8, VER(89)),
+		MKARRAY(ActorC64, _limbFrameRepeat[0], sleInt8, 8, VER(89)),
 		MKEND()
 	};
 
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 35ff657fa7..a93b75c6e7 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -352,7 +352,7 @@ public:
 	byte _miscflags;
 	byte _speaking;
 
-    int8 _AnimFrameRepeat;
+    int8 _animFrameRepeat;
     int8 _limbFrameRepeatNew[8], _limbFrameRepeat[8];
 
     byte _limb_current;
@@ -361,10 +361,9 @@ public:
 public:
 	ActorC64(ScummEngine *scumm, int id) : Actor_v2(scumm, id) {
 		 _costCommand = 0xFF;
-		 _costFrame = 0;
 		 _speaking = 0;
-         _AnimFrameRepeat = 0;
-		 _costCommandNew = 0;
+         _animFrameRepeat = 0;
+		 _costCommandNew = 0xFF;
 
 		 for( int i = 0; i < 8; ++i ) {
 			_limbFrameRepeatNew[i] = 0;
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index c7285ead56..cfb1e8690f 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1288,6 +1288,9 @@ void C64CostumeLoader::loadCostume(int id) {
 void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 	ActorC64 *A = (ActorC64 *)a;
 
+	if( !a->_costume )
+		return;
+
 	loadCostume(a->_costume);
 
 	if( A->_costCommandNew == 0xFF || (A->_costCommand == A->_costCommandNew) )
@@ -1330,14 +1333,14 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 		}
 
 		// 0x2679
-        A->_limbFrameRepeatNew[limb] = A->_AnimFrameRepeat;
+        A->_limbFrameRepeatNew[limb] = A->_animFrameRepeat;
 	}
 }
 
 byte C64CostumeLoader::increaseAnims(Actor *a) {
 	ActorC64 *A = (ActorC64 *)a;
 	
-	if( _frameOffsets == 0 )
+	if( _frameOffsets == 0 || (a->_cost.active[A->_limb_current] == 0xFFFF) )
 		return 0;
 
 	uint16 limbPrevious = a->_cost.curpos[A->_limb_current]++;
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 0bdefd660b..054d861db4 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -674,13 +674,11 @@ void ScummEngine_v0::o_lights() {
 void ScummEngine_v0::o_animateActor() {
 	int act = getVarOrDirectByte(PARAM_1);
 	int anim = getVarOrDirectByte(PARAM_2);
-	int8 animFrameRepeat = (int8) fetchScriptByte();
-
-	debug(0,"o_animateActor: animFrameRepeat %d", animFrameRepeat);
+	int8 repeat = (int8) fetchScriptByte();
 
 	ActorC64 *a = (ActorC64*) derefActor(act, "o_animateActor");
 
-    a->_AnimFrameRepeat = animFrameRepeat;
+    a->_animFrameRepeat = repeat;
 	
     switch( anim ) {
 
-- 
cgit v1.2.3


From 5b4b606a5879ddcbeb43d3c846bdf40f2d864bed Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Thu, 26 Jan 2012 18:38:38 +1100
Subject: SCUMM: Remove the setCmdFromDirection function

---
 engines/scumm/actor.cpp | 21 ++++++---------------
 engines/scumm/actor.h   |  1 -
 2 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 89e4133ade..f5c17078da 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -563,7 +563,7 @@ void Actor_v2::walkActor() {
 
 		if( _vm->_game.version == 0 )
 			if( _moving == 0 )
-				((ActorC64*)this)->setCmdFromDirection( newDirToOldDir(new_dir) );
+				setDirection( new_dir );
 
 		return;
 	}
@@ -885,18 +885,11 @@ void Actor::setDirection(int direction) {
 	_needRedraw = true;
 }
 
-void ActorC64::setDirection(int cmd) {
-	
-	setCmdFromDirection( newDirToOldDir( cmd ) );
-
-}
-
-// based on 0x2BCA, doesn't match disassembly because 'oldDir' variable
-// is not the same value as stored in the original interpreter
-int ActorC64::setCmdFromDirection(int direction) {
+void ActorC64::setDirection(int direction) {
+	int dir = newDirToOldDir( direction );
     int res = 0;
 
-	switch (direction) {
+	switch (dir) {
 		case 0:
 			res = 4;	// Left
             break;
@@ -917,8 +910,6 @@ int ActorC64::setCmdFromDirection(int direction) {
 	_animFrameRepeat = -1;
 	animateActor(res);
 	animateCostume();
-
-    return res;
 }
 
 void Actor::faceToObject(int obj) {
@@ -950,7 +941,7 @@ void Actor::turnToDirection(int newdir) {
 	}
 
 	if (_vm->_game.version == 0)
-		((ActorC64*)this)->setCmdFromDirection( newDirToOldDir(newdir) );
+		setDirection( newdir );
 }
 
 
@@ -1885,7 +1876,7 @@ void ActorC64::startAnimActor(int f) {
 	}
 
 	if( f == _standFrame )
-		setCmdFromDirection( newDirToOldDir(_facing) );
+		setDirection( _facing );
 	else
 		animateActor( newDirToOldDir(_facing) );
 }
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index a93b75c6e7..d3271f4eaa 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -386,7 +386,6 @@ public:
 
 	void		 speakCheck();
     virtual void setDirection(int direction);
-	int			 setCmdFromDirection(int direction);
 	void		 startAnimActor(int f);
 
 	// Used by the save/load system:
-- 
cgit v1.2.3


From cf292001d35b56b4e4741d7519019c57b30d22dd Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Thu, 26 Jan 2012 21:37:04 +1100
Subject: SCUMM: Animations fix again, no need for the hack now

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

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index f5c17078da..47b2582242 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -909,7 +909,8 @@ void ActorC64::setDirection(int direction) {
 	
 	_animFrameRepeat = -1;
 	animateActor(res);
-	animateCostume();
+	if(_moving)
+		animateCostume();
 }
 
 void Actor::faceToObject(int obj) {
@@ -1344,8 +1345,7 @@ void Actor::showActor() {
         a->_animFrameRepeat = 1;
 		a->_speaking = 0;
 
- 		if( a->_costume != 0x13 )
-			startAnimActor(_standFrame);
+		startAnimActor(_standFrame);
 		_visible = true;
 		return;
 
-- 
cgit v1.2.3


From f99dab78e401608e45da672355ecac468f8e5e1d Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Thu, 26 Jan 2012 18:42:35 +0100
Subject: SCUMM: fix for old savegames

---
 engines/scumm/actor.cpp  | 8 +++++---
 engines/scumm/saveload.h | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 47b2582242..ed517524ff 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2834,9 +2834,11 @@ void ActorC64::saveLoadWithSerializer(Serializer *ser) {
 		MKLINE_OLD(ActorC64, _costFrame, sleByte, VER(84), VER(89)),
 		MKLINE(ActorC64, _miscflags, sleByte, VER(84)),
 		MKLINE(ActorC64, _speaking, sleByte, VER(84)),
-        MKLINE(ActorC64, _animFrameRepeat, sleByte, VER(89)),
-        MKARRAY(ActorC64, _limbFrameRepeatNew[0], sleInt8, 8, VER(89)),
-		MKARRAY(ActorC64, _limbFrameRepeat[0], sleInt8, 8, VER(89)),
+		MK_OBSOLETE(ActorC64, _speakingPrev, sleByte, VER(84), VER(89)),
+		MK_OBSOLETE(ActorC64, _byte_FD0A, sleByte, VER(89), VER(89)),
+		MKLINE(ActorC64, _animFrameRepeat, sleByte, VER(89)),
+		MKARRAY(ActorC64, _limbFrameRepeatNew[0], sleInt8, 8, VER(89)),
+		MKARRAY(ActorC64, _limbFrameRepeat[0], sleInt8, 8, VER(90)),
 		MKEND()
 	};
 
diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h
index 898f80f867..931b56f137 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 89
+#define CURRENT_VER 90
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead
-- 
cgit v1.2.3


From ddd65dfc22333eefccf3a875fcd33c4597426089 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Thu, 26 Jan 2012 22:39:34 +0100
Subject: SCUMM: fix actor climbing on plant or swimming pool ladder

Before, the actor will descend the ladder of the pool and maybe even into the the pool. Another issue fixed by this is the actor climbing onto the plant pot if you give something to it.
---
 engines/scumm/actor.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index ed517524ff..19cd0ae2eb 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1105,16 +1105,11 @@ static int checkXYInBoxBounds(int boxnum, int x, int y, int &destX, int &destY)
 	// yDist must be divided by 4, as we are using 8x2 pixels
 	// blocks for actor coordinates).
 	int xDist = ABS(x - destX);
-	int yDist;
+	int yDist = ABS(y - destY) / 4;
 	int dist;
 
-	// MM C64: This fixes the trunk bug (#3070065), as well
-	// as the fruit bowl, however im not sure if its
-	// the proper solution or not.
-	if( g_scumm->_game.version == 0 )
-		yDist = ABS(y - destY);
-	else
-		yDist = ABS(y - destY) / 4;
+	if(g_scumm->_game.version == 0)
+		xDist *= 2;
 
 	if (xDist < yDist)
 		dist = (xDist >> 1) + yDist;
@@ -1133,7 +1128,9 @@ AdjustBoxResult Actor_v2::adjustXYToBeInBox(const int dstX, const int dstY) {
 
 	int numBoxes = _vm->getNumBoxes() - 1;
 	int bestDist = 0xFF;
-	for (int box = numBoxes; box >= 0; box--) {
+	for (int i = 0; i <= numBoxes; i++) {
+		// MM v0 prioritizes lower boxes, other engines higher boxes
+		int box = (_vm->_game.version == 0 ? i : numBoxes - i);
 		int foundX, foundY;
 		int flags = _vm->getBoxFlags(box);
 		if ((flags & kBoxInvisible) && !((flags & kBoxPlayerOnly) && !isPlayer()))
@@ -1143,7 +1140,6 @@ AdjustBoxResult Actor_v2::adjustXYToBeInBox(const int dstX, const int dstY) {
 			abr.x = foundX;
 			abr.y = foundY;
 			abr.box = box;
-
 			break;
 		}
 		if (dist < bestDist) {
-- 
cgit v1.2.3


From 1e8d0664ac704160c3353d998a3b9978245128bd Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Fri, 27 Jan 2012 22:05:10 +1100
Subject: SCUMM: Fix Tentacle issue, and possibly some other animation issues

---
 engines/scumm/actor.cpp     | 52 ++++++++++++++++++++++++---------------------
 engines/scumm/costume.cpp   | 29 +++++++++++++------------
 engines/scumm/costume.h     |  3 ++-
 engines/scumm/script_v0.cpp |  1 +
 4 files changed, 46 insertions(+), 39 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 19cd0ae2eb..c22fc8a438 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -396,9 +396,14 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
 	}
 
 	if (_vm->_game.version <= 2) {
+
 		abr = adjustXYToBeInBox(abr.x, abr.y);
 		if (_pos.x == abr.x && _pos.y == abr.y && (dir == -1 || _facing == dir))
 			return;
+
+		if( _vm->_game.version == 0 )
+			((ActorC64*) this)->animateActor( newDirToOldDir( _facing ) );
+
 	} else {
 		if (_ignoreBoxes) {
 			abr.box = kInvalidBox;
@@ -554,17 +559,12 @@ void Actor_v2::walkActor() {
 		
 		if (_facing != new_dir) {
 
-			if( _vm->_game.version != 0 )
-				setDirection(new_dir);
+			setDirection(new_dir);
 
 		} else {
 			_moving = 0;
 		}
 
-		if( _vm->_game.version == 0 )
-			if( _moving == 0 )
-				setDirection( new_dir );
-
 		return;
 	}
 
@@ -909,7 +909,7 @@ void ActorC64::setDirection(int direction) {
 	
 	_animFrameRepeat = -1;
 	animateActor(res);
-	if(_moving)
+	if(_moving & MF_TURN)
 		animateCostume();
 }
 
@@ -936,13 +936,12 @@ void Actor::turnToDirection(int newdir) {
 	} else {
 		_moving &= ~MF_TURN;
 		if (newdir != _facing) {
+			
 			_moving |= MF_TURN;
 			_targetFacing = newdir;
 		}
 	}
 
-	if (_vm->_game.version == 0)
-		setDirection( newdir );
 }
 
 
@@ -1004,8 +1003,10 @@ void Actor::putActor(int dstX, int dstY, int newRoom) {
 			showActor();
 	}
 
-	if( _vm->_game.version == 0 && _costume != 0x13 )
-		turnToDirection( oldDirToNewDir(2));
+	if( _vm->_game.version == 0 ) {
+		_moving = 0;
+		setDirection( oldDirToNewDir(2));
+	}
 }
 
 static bool inBoxQuickReject(const BoxCoords &box, int x, int y, int threshold) {
@@ -1874,7 +1875,7 @@ void ActorC64::startAnimActor(int f) {
 	if( f == _standFrame )
 		setDirection( _facing );
 	else
-		animateActor( newDirToOldDir(_facing) );
+		animateActor( newDirToOldDir(_targetFacing) );
 }
 
 void Actor::animateActor(int anim) {
@@ -1950,24 +1951,16 @@ void ActorC64::limbFrameCheck() {
 
 	_limbFrameRepeat[_limb_current] = _limbFrameRepeatNew[_limb_current];
 
-	_cost.active[_limb_current] = _cost.frame[_limb_current];
+	_vm->_costumeLoader->loadCostume(_costume);
+
+	// 0x25C3
+	_cost.active[_limb_current] = ((C64CostumeLoader*)_vm->_costumeLoader)->getFrame( this );
 	_cost.curpos[_limb_current] = 0;
 
 	_needRedraw = true;
 }
 
 void ActorC64::animateCostume() {
-	
-	// Sound
-	if (_moving  && _vm->_currentRoom != 1 && _vm->_currentRoom != 44) {
-		if (_cost.soundPos == 0)
-			_cost.soundCounter++;
-
-		// Is this the correct location?
-		// 0x073C
-		if (v0ActorTalkArray[_number] & 0x3F)
-			_cost.soundPos = (_cost.soundPos + 1) % 3;
-	}
 
 	speakCheck();
 
@@ -2780,6 +2773,17 @@ void ScummEngine_v71he::queueAuxEntry(int actorNum, int subIndex) {
 void ActorC64::animateActor(int anim) {
 	int dir = -1;
 	
+	// Sound
+	if (_moving  && _vm->_currentRoom != 1 && _vm->_currentRoom != 44) {
+		if (_cost.soundPos == 0)
+			_cost.soundCounter++;
+
+		// Is this the correct location?
+		// 0x073C
+		if (v0ActorTalkArray[_number] & 0x3F)
+			_cost.soundPos = (_cost.soundPos + 1) % 3;
+	}
+
 	switch( anim ) {
 		case 0x00:
 		case 0x04:
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index cfb1e8690f..0ae0aca147 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1184,20 +1184,17 @@ byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
 	if (limb >= 8)
 		return 0;
 
-	if (a->_cost.curpos[limb] == 0xFFFF || A->_cost.active[limb] == 0xFFFF )
-		return 0;
-
 	if (limb == 0) {
 		_draw_top = 200;
 		_draw_bottom = 0;
 	}
-
-	byte frameB = _loaded._frameOffsets[limb] + a->_cost.active[limb];
-	byte frameStart = _loaded._frameOffsets[ frameB ];
-	byte frame = _loaded._frameOffsets[frameStart + a->_cost.curpos[limb]];
-	if (frame == 0xFF)
+	
+	if(  a->_cost.curpos[limb] == 0xFFFF )
 		return 0;
 
+	_loaded.loadCostume( a->_costume );
+	byte frame = _loaded._frameOffsets[ a->_cost.curpos[limb] + a->_cost.active[limb] ];
+
 	byte ptrLow = _loaded._baseptr[frame];
 	byte ptrHigh = ptrLow + _loaded._dataOffsets[4];
 	int frameOffset = (_loaded._baseptr[ptrHigh] << 8) + _loaded._baseptr[ptrLow + 2];			// 0x23EF / 0x2400
@@ -1337,19 +1334,23 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 	}
 }
 
+byte C64CostumeLoader::getFrame( ActorC64 *A ) {
+
+	loadCostume(A->_costume);
+
+	return _frameOffsets[ _frameOffsets[A->_limb_current] + A->_cost.start[ A->_limb_current ] ];
+}
+
 byte C64CostumeLoader::increaseAnims(Actor *a) {
 	ActorC64 *A = (ActorC64 *)a;
 	
-	if( _frameOffsets == 0 || (a->_cost.active[A->_limb_current] == 0xFFFF) )
-		return 0;
-
 	uint16 limbPrevious = a->_cost.curpos[A->_limb_current]++;
 
+	loadCostume(a->_costume);
+
 	// increase each frame pos
     // 0x2543
-	byte frameB = _frameOffsets[A->_limb_current] + a->_cost.active[A->_limb_current];
-	byte frameStart = _frameOffsets[ frameB ];
-	byte frame = _frameOffsets[frameStart + a->_cost.curpos[A->_limb_current]];
+	byte frame = _frameOffsets[ a->_cost.curpos[A->_limb_current] + a->_cost.active[A->_limb_current] ];
 
 	if ( frame == 0xFF ) {
         // 0x2545
diff --git a/engines/scumm/costume.h b/engines/scumm/costume.h
index 50e3f1e1b2..38e21d586f 100644
--- a/engines/scumm/costume.h
+++ b/engines/scumm/costume.h
@@ -73,11 +73,12 @@ public:
 	void loadCostume(int id);
 	void costumeDecodeData(Actor *a, int frame, uint usemask);
 	byte increaseAnims(Actor *a);
+	
+	byte getFrame( ActorC64 *A );
 
 	int _maxHeight;
 
 protected:
-	int dirToDirStop(int oldDir);
 
 };
 
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 054d861db4..cf2b7d9a8f 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -698,6 +698,7 @@ void ScummEngine_v0::o_animateActor() {
     }
 
 	a->animateActor(anim);
+	a->animateCostume();
 }
 
 void ScummEngine_v0::o_getActorMoving() {
-- 
cgit v1.2.3


From f299fc295e620a71d5fbb783b549b10807c97b99 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Sat, 28 Jan 2012 00:02:05 +1100
Subject: SCUMM: Fix for V0 objects

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

(limited to 'engines')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index b51452170a..1d2581f915 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1000,7 +1000,7 @@ void ScummEngine::killScriptsAndResources() {
 		for (i = 0; i < _numNewNames; i++) {
 			const int obj = _newNames[i];
 			if (obj) {
-				const int owner = getOwner(obj);
+				const int owner = getOwner( (_game.version != 0 ? obj : OBJECT_V0_ID(obj) ) );
 				// We can delete custom name resources if either the object is
 				// no longer in use (i.e. not owned by anyone anymore); or if
 				// it is an object which is owned by a room.
-- 
cgit v1.2.3


From 5accf01881424e10e1700bf36c4b8236ed200258 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Sat, 28 Jan 2012 00:25:30 +1100
Subject: SCUMM: Remove unnecessary calls to animateActor

---
 engines/scumm/actor.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index c22fc8a438..95b7f90318 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -401,9 +401,6 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
 		if (_pos.x == abr.x && _pos.y == abr.y && (dir == -1 || _facing == dir))
 			return;
 
-		if( _vm->_game.version == 0 )
-			((ActorC64*) this)->animateActor( newDirToOldDir( _facing ) );
-
 	} else {
 		if (_ignoreBoxes) {
 			abr.box = kInvalidBox;
@@ -909,7 +906,7 @@ void ActorC64::setDirection(int direction) {
 	
 	_animFrameRepeat = -1;
 	animateActor(res);
-	if(_moving & MF_TURN)
+	if(_moving)
 		animateCostume();
 }
 
@@ -1002,11 +999,6 @@ void Actor::putActor(int dstX, int dstY, int newRoom) {
 		if (isInCurrentRoom())
 			showActor();
 	}
-
-	if( _vm->_game.version == 0 ) {
-		_moving = 0;
-		setDirection( oldDirToNewDir(2));
-	}
 }
 
 static bool inBoxQuickReject(const BoxCoords &box, int x, int y, int threshold) {
-- 
cgit v1.2.3


From fb3e431ec63cbdd2edc7e289b0910cfe4aa72510 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Sat, 28 Jan 2012 00:38:19 +1100
Subject: SCUMM: V0 always turns actor towards camera when entering room,
 remove unnecessary loadcostume

---
 engines/scumm/actor.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 95b7f90318..e95b3555eb 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -999,6 +999,10 @@ void Actor::putActor(int dstX, int dstY, int newRoom) {
 		if (isInCurrentRoom())
 			showActor();
 	}
+
+	// V0 always sets the actor to face the camera upon entering a room
+	if( _vm->_game.version == 0 ) 
+		setDirection( oldDirToNewDir(2));
 }
 
 static bool inBoxQuickReject(const BoxCoords &box, int x, int y, int threshold) {
@@ -1943,8 +1947,6 @@ void ActorC64::limbFrameCheck() {
 
 	_limbFrameRepeat[_limb_current] = _limbFrameRepeatNew[_limb_current];
 
-	_vm->_costumeLoader->loadCostume(_costume);
-
 	// 0x25C3
 	_cost.active[_limb_current] = ((C64CostumeLoader*)_vm->_costumeLoader)->getFrame( this );
 	_cost.curpos[_limb_current] = 0;
-- 
cgit v1.2.3


From 1ca0b84b018657d3980b167cc2d8b56d94b4f26a Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Sat, 28 Jan 2012 00:48:49 +1100
Subject: SCUMM: Improve comments

---
 engines/scumm/costume.cpp | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 0ae0aca147..3bb62c2de5 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1189,12 +1189,14 @@ byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
 		_draw_bottom = 0;
 	}
 	
+	// Invalid current position?
 	if(  a->_cost.curpos[limb] == 0xFFFF )
 		return 0;
 
 	_loaded.loadCostume( a->_costume );
 	byte frame = _loaded._frameOffsets[ a->_cost.curpos[limb] + a->_cost.active[limb] ];
 
+	// Get the frame ptr
 	byte ptrLow = _loaded._baseptr[frame];
 	byte ptrHigh = ptrLow + _loaded._dataOffsets[4];
 	int frameOffset = (_loaded._baseptr[ptrHigh] << 8) + _loaded._baseptr[ptrLow + 2];			// 0x23EF / 0x2400
@@ -1285,11 +1287,9 @@ void C64CostumeLoader::loadCostume(int id) {
 void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 	ActorC64 *A = (ActorC64 *)a;
 
-	if( !a->_costume )
-		return;
-
 	loadCostume(a->_costume);
 
+	// Invalid costume command?
 	if( A->_costCommandNew == 0xFF || (A->_costCommand == A->_costCommandNew) )
 		return;
 
@@ -1306,13 +1306,14 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 		// get the frame number for the beginning of the costume command
 		limbFrameNumber = ((_animCmds + cmd)[limb]);
 
+		// Is this limb flipped?
 		if( limbFrameNumber & 0x80 ) {
 
-			// 0x263D
+			// Invalid frame?
 			if( limbFrameNumber == 0xFF )
 				continue;
 
-			// 0x2643
+			// Store the limb frame number (clear the flipped status)
 			a->_cost.frame[limb]	= (limbFrameNumber & 0x7f);			// limb animation-frames ptr
 			if( A->_limb_flipped[limb] != true )
 				a->_cost.start[limb] = 0xFFFF;
@@ -1320,7 +1321,7 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 			A->_limb_flipped[limb] = true;
 
 		} else {
-			//0x2660
+			//Store the limb frame number
 			a->_cost.frame[limb]	= limbFrameNumber;
 
 			if( A->_limb_flipped[limb] != false )
@@ -1329,7 +1330,7 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 			A->_limb_flipped[limb] = false;
 		}
 
-		// 0x2679
+		// Set the repeat value
         A->_limbFrameRepeatNew[limb] = A->_animFrameRepeat;
 	}
 }
@@ -1338,6 +1339,7 @@ byte C64CostumeLoader::getFrame( ActorC64 *A ) {
 
 	loadCostume(A->_costume);
 
+	// Get the frame number for the current limb / Command
 	return _frameOffsets[ _frameOffsets[A->_limb_current] + A->_cost.start[ A->_limb_current ] ];
 }
 
@@ -1348,32 +1350,38 @@ byte C64CostumeLoader::increaseAnims(Actor *a) {
 
 	loadCostume(a->_costume);
 
-	// increase each frame pos
     // 0x2543
 	byte frame = _frameOffsets[ a->_cost.curpos[A->_limb_current] + a->_cost.active[A->_limb_current] ];
 
+	// Is this frame invalid?
 	if ( frame == 0xFF ) {
-        // 0x2545
+
+        // Repeat timer has reached 0?
         if( A->_limbFrameRepeat[A->_limb_current] == 0 ) {
 
-            // 0x2556
+            // Use the previous frame
             --A->_cost.curpos[A->_limb_current];
 
+			// Reset the comstume command
             A->_costCommandNew = 0xFF;
             A->_costCommand = 0xFF;
                 
-            // 0x2568
+            // Set the frame/start to invalid
 			A->_cost.frame[A->_limb_current] = 0xFFFF;
 			A->_cost.start[A->_limb_current] = 0xFFFF;
 
         } else {
+
+			// Repeat timer enabled?
             if( A->_limbFrameRepeat[A->_limb_current] != -1 )
                 --A->_limbFrameRepeat[A->_limb_current];
 
+			// No, restart at frame 0
             a->_cost.curpos[A->_limb_current] = 0;
         }
     }
 
+	// Limb frame has changed?
 	if( limbPrevious == a->_cost.curpos[A->_limb_current] )
 		return 0;
 
-- 
cgit v1.2.3


From 9ba01d020b8a48bed57977a430c532a3237dedd0 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Sat, 28 Jan 2012 01:25:13 +1100
Subject: SCUMM: Fix V0 Sound, and a direction issue (affected walking down the
 ladder)

---
 engines/scumm/actor.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index e95b3555eb..0191439612 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1557,8 +1557,18 @@ void ScummEngine::processActors() {
 			// 0x22B5
 			if (A->_miscflags & kActorMiscFlagHide)
 				continue;
-		}
 
+			// Sound
+			if (A->_moving  && _currentRoom != 1 && _currentRoom != 44) {
+				if (A->_cost.soundPos == 0)
+					A->_cost.soundCounter++;
+
+				// Is this the correct location?
+				// 0x073C
+				if (v0ActorTalkArray[A->_number] & 0x3F)
+					A->_cost.soundPos = (A->_cost.soundPos + 1) % 3;
+			}
+		}
 		// Draw and animate the actors, except those w/o a costume.
 		// Note: We could 'optimize' this a little bit by only putting
 		// actors with a costume into the _sortedActors array in the
@@ -1871,7 +1881,7 @@ void ActorC64::startAnimActor(int f) {
 	if( f == _standFrame )
 		setDirection( _facing );
 	else
-		animateActor( newDirToOldDir(_targetFacing) );
+		animateActor( newDirToOldDir(_facing) );
 }
 
 void Actor::animateActor(int anim) {
@@ -2766,17 +2776,6 @@ void ScummEngine_v71he::queueAuxEntry(int actorNum, int subIndex) {
 
 void ActorC64::animateActor(int anim) {
 	int dir = -1;
-	
-	// Sound
-	if (_moving  && _vm->_currentRoom != 1 && _vm->_currentRoom != 44) {
-		if (_cost.soundPos == 0)
-			_cost.soundCounter++;
-
-		// Is this the correct location?
-		// 0x073C
-		if (v0ActorTalkArray[_number] & 0x3F)
-			_cost.soundPos = (_cost.soundPos + 1) % 3;
-	}
 
 	switch( anim ) {
 		case 0x00:
-- 
cgit v1.2.3


From c6688cf0d516543a051841116d5175ca8bcee39f Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Sat, 28 Jan 2012 09:38:54 +1100
Subject: SCUMM: Remove unused variable, remove old comment

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

(limited to 'engines')

diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 3bb62c2de5..e3a2203adc 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1280,8 +1280,6 @@ void C64CostumeLoader::loadCostume(int id) {
 	_frameOffsets = _baseptr + READ_LE_UINT16(ptr + 5);
 	_dataOffsets = ptr;
 	_animCmds = _baseptr + READ_LE_UINT16(ptr + 7);
-
-	_maxHeight = 0;
 }
 
 void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
@@ -1314,7 +1312,8 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 				continue;
 
 			// Store the limb frame number (clear the flipped status)
-			a->_cost.frame[limb]	= (limbFrameNumber & 0x7f);			// limb animation-frames ptr
+			a->_cost.frame[limb]	= (limbFrameNumber & 0x7f);
+
 			if( A->_limb_flipped[limb] != true )
 				a->_cost.start[limb] = 0xFFFF;
 
diff --git a/engines/scumm/costume.h b/engines/scumm/costume.h
index 38e21d586f..4600cc5670 100644
--- a/engines/scumm/costume.h
+++ b/engines/scumm/costume.h
@@ -76,8 +76,6 @@ public:
 	
 	byte getFrame( ActorC64 *A );
 
-	int _maxHeight;
-
 protected:
 
 };
-- 
cgit v1.2.3


From 08e1e127e9a03b10b83b790458bdfff5130aa510 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 28 Jan 2012 21:15:05 +0100
Subject: SCUMM: handle v0 distance check in checkPendingWalkAction() correctly

---
 engines/scumm/script.cpp | 50 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 1d2581f915..63f04c1f32 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1162,7 +1162,7 @@ bool ScummEngine_v0::checkPendingWalkAction() {
 		return false;
 
 	int actor = VAR(VAR_EGO);
-	ActorC64 *a = (ActorC64 *)derefActor(actor, "checkAndRunSentenceScript");
+	ActorC64 *a = (ActorC64 *)derefActor(actor, "checkPendingWalkAction");
 
 	// wait until walking or turning action is finished
 	if (a->_moving)
@@ -1172,23 +1172,41 @@ bool ScummEngine_v0::checkPendingWalkAction() {
 	if (_walkToObjectState == kWalkToObjectStateTurn) {
 		runSentenceScript();
 	// change actor facing
-	} else if (getObjActToObjActDist(actorToObj(actor), _walkToObject) <= 4) {
-		if (objIsActor(_walkToObject)) { // walk to actor finished
-			// make actors turn to each other
-			a->faceToObject(_walkToObject);
-			int otherActor = objToActor(_walkToObject);
-			// ignore the plant
-			if (otherActor != 19) {
-				Actor *b = derefActor(otherActor, "checkAndRunSentenceScript(2)");
-				b->faceToObject(actorToObj(actor));
+	} else {
+		int x, y, distX, distY;
+		if (objIsActor(_walkToObject)) {
+			Actor *b = derefActor(objToActor(_walkToObject), "checkPendingWalkAction(2)");
+			x = b->getRealPos().x;
+			y = b->getRealPos().y;
+			if (x < a->getRealPos().x)
+				x += 4;
+			else
+				x -= 4;
+		} else {
+			getObjectXYPos(_walkToObject, x, y);
+		}
+		AdjustBoxResult abr = a->adjustXYToBeInBox(x, y);
+		distX = ABS(a->getRealPos().x - abr.x);
+		distY = ABS(a->getRealPos().y - abr.y);
+
+		if (distX <= 4 && distY <= 8) {
+			if (objIsActor(_walkToObject)) { // walk to actor finished
+				// make actors turn to each other
+				a->faceToObject(_walkToObject);
+				int otherActor = objToActor(_walkToObject);
+				// ignore the plant
+				if (otherActor != 19) {
+					Actor *b = derefActor(otherActor, "checkPendingWalkAction(3)");
+					b->faceToObject(actorToObj(actor));
+				}
+			} else { // walk to object finished
+				int x, y, dir;
+				getObjectXYPos(_walkToObject, x, y, dir);
+				a->turnToDirection(dir);
 			}
-		} else { // walk to object finished
-			int x, y, dir;
-			getObjectXYPos(_walkToObject, x, y, dir);
-			a->turnToDirection(dir);
+			_walkToObjectState = kWalkToObjectStateTurn;
+			return true;
 		}
-		_walkToObjectState = kWalkToObjectStateTurn;
-		return true;
 	}
 
 	_walkToObjectState = kWalkToObjectStateDone;
-- 
cgit v1.2.3


From 7d409dd15f13f517c083e58d0e5c59ec0776c974 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 28 Jan 2012 21:32:41 +0100
Subject: SCUMM: in v0 do not allow an inventory item as 2nd object of a
 give-to command

---
 engines/scumm/verbs.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 7a099adae9..4347ad9db9 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -809,6 +809,9 @@ void ScummEngine_v0::checkExecVerbs() {
 						// inventory position changed (arrows pressed, do nothing)
 						return;
 					}
+					// the second object of a give-to command has to be an actor
+					if (_activeVerb == kVerbGive && _activeObject)
+						obj = 0;
 				// click region: main screen
 				} else if (zone->number == kMainVirtScreen) {
 					// click into main screen
-- 
cgit v1.2.3


From cc68a598564285b6f303f90304891f0beef7f1e4 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 29 Jan 2012 04:42:02 +0100
Subject: SCUMM: fix diagonal walking in at least MM v0

The comparison "ABS((int)(deltaXFactor >> 16)) > _speedx)" does not work as "deltaXFactor >> 16" will clear the fractional part of deltaXFactor. As a result the deltaXFactor might be bigger than (_speedx<<16) and the actor moves faster than he should.
---
 engines/scumm/actor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 0191439612..f0ba79b98d 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -289,7 +289,7 @@ int Actor::calcMovementFactor(const Common::Point& next) {
 		deltaYFactor = 0;
 	}
 
-	if ((uint) ABS((int)(deltaXFactor >> 16)) > _speedx) {
+	if ((uint) ABS(deltaXFactor) > (_speedx << 16))	{
 		deltaXFactor = _speedx << 16;
 		if (diffX < 0)
 			deltaXFactor = -deltaXFactor;
-- 
cgit v1.2.3


From e33d41035cfbdf81c0178730bec1ed3eb36d7ef7 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 29 Jan 2012 06:20:16 +0100
Subject: SCUMM: scumm_vars 14 to 16 are not handled specially in v0

Reading the manuscript will be fixed by this.
---
 engines/scumm/script_v2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 59500deaf5..983bba0914 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -412,7 +412,7 @@ void ScummEngine_v2::decodeParseString() {
 }
 
 int ScummEngine_v2::readVar(uint var) {
-	if (var >= 14 && var <= 16)
+	if (_game.version >= 1 && var >= 14 && var <= 16)
 		var = _scummVars[var];
 
 	assertRange(0, var, _numVariables - 1, "variable (reading)");
-- 
cgit v1.2.3


From f5faa4554defa2e220f3b0507c8fefb8f13182c6 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 29 Jan 2012 06:35:57 +0100
Subject: SCUMM: isPlayer() is not supported by engine v0

---
 engines/scumm/actor.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index f0ba79b98d..c2390ab4b0 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2620,6 +2620,8 @@ bool Actor::isPlayer() {
 }
 
 bool Actor_v2::isPlayer() {
+	// isPlayer() is not supported by v0 
+	assert(_vm->_game.version != 0);
 	return _vm->VAR(42) <= _number && _number <= _vm->VAR(43);
 }
 
-- 
cgit v1.2.3


From d4ddd2ca840fc91cd75cdb4545db30f2f0a78722 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 29 Jan 2012 17:03:37 +0100
Subject: SCUMM: introduce constants for _userState for cleaner and easier to
 understand code

---
 engines/scumm/script_v0.cpp | 20 +++++++++++++++-----
 engines/scumm/script_v2.cpp | 27 +++++++++++++++------------
 engines/scumm/scumm.h       | 13 +++++++++++++
 engines/scumm/verbs.cpp     |  8 ++++----
 4 files changed, 47 insertions(+), 21 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index cf2b7d9a8f..46052cdf49 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -456,7 +456,7 @@ void ScummEngine_v0::drawSentenceObject(int object) {
 void ScummEngine_v0::drawSentenceLine() {
 	_redrawSentenceLine = false;
 
-	if (!(_userState & 32))
+	if (!(_userState & USERSTATE_IFACE_SENTENCE))
 		return;
 
 	clearSentenceLine();
@@ -627,22 +627,32 @@ void ScummEngine_v0::o_unlockRoom() {
 }
 
 void ScummEngine_v0::setMode(byte mode) {
-	int state = 0;
+	int state;
 
 	_currentMode = mode;
 
 	switch (_currentMode) {
 	case kModeCutscene:
 		_redrawSentenceLine = false;
-		state = 7;
+		// Note: do not change freeze state here
+		state = USERSTATE_SET_IFACE | 
+			USERSTATE_SET_CURSOR |
+			USERSTATE_SET_FREEZE;
 		break;
 	case kModeKeypad:
-		state = 23;
+		_redrawSentenceLine = false;
+		state = USERSTATE_SET_IFACE | 
+			USERSTATE_SET_CURSOR | USERSTATE_CURSOR_ON |
+			USERSTATE_SET_FREEZE;
 		break;
 	case kModeNormal:
 	case kModeNoNewKid:
-		state = 247;
+		state = USERSTATE_SET_IFACE | USERSTATE_IFACE_ALL | 
+			USERSTATE_SET_CURSOR | USERSTATE_CURSOR_ON |
+			USERSTATE_SET_FREEZE;
 		break;
+	default:
+		error("Invalid mode: %d", mode);
 	}
 
 	setUserState(state);
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 983bba0914..2b2bad32a7 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -993,7 +993,8 @@ void ScummEngine_v2::o2_drawSentence() {
 	const byte *temp;
 	int slot = getVerbSlot(VAR(VAR_SENTENCE_VERB), 0);
 
-	if (!((_userState & 32) || (_game.platform == Common::kPlatformNES && _userState & 0xe0)))
+	if (!((_userState & USERSTATE_IFACE_SENTENCE) || 
+		  (_game.platform == Common::kPlatformNES && (_userState & USERSTATE_IFACE_ALL))))
 		return;
 
 	if (getResourceAddress(rtVerb, slot))
@@ -1303,7 +1304,7 @@ void ScummEngine_v2::o2_findObject() {
 	int x = getVarOrDirectByte(PARAM_1) * V12_X_MULTIPLIER;
 	int y = getVarOrDirectByte(PARAM_2) * V12_Y_MULTIPLIER;
 	obj = findObject(x, y);
-	if (obj == 0 && (_game.platform == Common::kPlatformNES) && (_userState & 0x40)) {
+	if (obj == 0 && (_game.platform == Common::kPlatformNES) && (_userState & USERSTATE_IFACE_INVENTORY)) {
 		if (_mouseOverBoxV2 >= 0 && _mouseOverBoxV2 < 4)
 			obj = findInventory(VAR(VAR_EGO), _mouseOverBoxV2 + _inventoryOffset + 1);
 	}
@@ -1485,7 +1486,9 @@ void ScummEngine_v2::o2_cutscene() {
 	VAR(VAR_CURSORSTATE) = 200;
 
 	// Hide inventory, freeze scripts, hide cursor
-	setUserState(15);
+	setUserState(USERSTATE_SET_IFACE | 
+		USERSTATE_SET_CURSOR | 
+		USERSTATE_SET_FREEZE | USERSTATE_FREEZE_ON);
 
 	_sentenceNum = 0;
 	stopScript(SENTENCE_SCRIPT);
@@ -1504,7 +1507,7 @@ void ScummEngine_v2::o2_endCutscene() {
 	VAR(VAR_CURSORSTATE) = vm.cutSceneData[1];
 
 	// Reset user state to values before cutscene
-	setUserState(vm.cutSceneData[0] | 7);
+	setUserState(vm.cutSceneData[0] | USERSTATE_SET_IFACE | USERSTATE_SET_CURSOR | USERSTATE_SET_FREEZE);
 
 	if ((_game.id == GID_MANIAC) && !(_game.platform == Common::kPlatformNES)) {
 		camera._mode = (byte) vm.cutSceneData[3];
@@ -1570,24 +1573,24 @@ void ScummEngine_v2::o2_cursorCommand() {	// TODO: Define the magic numbers
 }
 
 void ScummEngine_v2::setUserState(byte state) {
-	if (state & 4) {						// Userface
+	if (state & USERSTATE_SET_IFACE) {			// Userface
 		if (_game.platform == Common::kPlatformNES)
-			_userState = (_userState & ~0xE0) | (state & 0xE0);
+			_userState = (_userState & ~USERSTATE_IFACE_ALL) | (state & USERSTATE_IFACE_ALL);
 		else
-			_userState = state & (32 | 64 | 128);
+			_userState = state & USERSTATE_IFACE_ALL;
 	}
 
-	if (state & 1) {						// Freeze
-		if (state & 8)
+	if (state & USERSTATE_SET_FREEZE) {		// Freeze
+		if (state & USERSTATE_FREEZE_ON)
 			freezeScripts(0);
 		else
 			unfreezeScripts();
 	}
 
-	if (state & 2) {						// Cursor Show/Hide
+	if (state & USERSTATE_SET_CURSOR) {			// Cursor Show/Hide
 		if (_game.platform == Common::kPlatformNES)
-			_userState = (_userState & ~0x10) | (state & 0x10);
-		if (state & 16) {
+			_userState = (_userState & ~USERSTATE_CURSOR_ON) | (state & USERSTATE_CURSOR_ON);
+		if (state & USERSTATE_CURSOR_ON) {
 			_userPut = 1;
 			_cursor.state = 1;
 		} else {
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 042a3a5d47..fa04c5b616 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -303,6 +303,19 @@ struct SaveStateMetaInfos {
 	uint32 playtime;
 };
 
+enum UserStates {
+	USERSTATE_SET_FREEZE      = 0x01,   // freeze scripts if USERSTATE_FREEZE_ON is set, unfreeze otherwise
+	USERSTATE_SET_CURSOR      = 0x02,   // shows cursor if USERSTATE_CURSOR_ON is set, hides it otherwise
+	USERSTATE_SET_IFACE       = 0x04,   // change user-interface (sentence-line, inventory, verb-area)
+	USERSTATE_FREEZE_ON       = 0x08,   // only interpreted if USERSTATE_SET_FREEZE is set
+	USERSTATE_CURSOR_ON       = 0x10,   // only interpreted if USERSTATE_SET_CURSOR is set
+	USERSTATE_IFACE_SENTENCE  = 0x20,   // only interpreted if USERSTATE_SET_IFACE is set
+	USERSTATE_IFACE_INVENTORY = 0x40,   // only interpreted if USERSTATE_SET_IFACE is set
+	USERSTATE_IFACE_VERBS     = 0x80    // only interpreted if USERSTATE_SET_IFACE is set
+};
+
+#define USERSTATE_IFACE_ALL (USERSTATE_IFACE_SENTENCE | USERSTATE_IFACE_INVENTORY | USERSTATE_IFACE_VERBS)
+
 /**
  * A list of resource types.
  * WARNING: Do not change the order of these, as the savegame format relies
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 4347ad9db9..2b9d2342bc 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -272,7 +272,7 @@ void ScummEngine_v2::checkV2MouseOver(Common::Point pos) {
 	int i, x, y, new_box = -1;
 
 	// Don't do anything unless the inventory is active
-	if (!(_userState & 64)) {
+	if (!(_userState & USERSTATE_IFACE_INVENTORY)) {
 		_mouseOverBoxV2 = -1;
 		return;
 	}
@@ -368,7 +368,7 @@ void ScummEngine_v2::redrawV2Inventory() {
 
 	_mouseOverBoxV2 = -1;
 
-	if (!(_userState & 64))	// Don't draw inventory unless active
+	if (!(_userState & USERSTATE_IFACE_INVENTORY))	// Don't draw inventory unless active
 		return;
 
 	// Clear on all invocations
@@ -432,7 +432,7 @@ void ScummEngine_v2::redrawV2Inventory() {
 }
 
 void ScummEngine::redrawVerbs() {
-	if (_game.version <= 2 && !(_userState & 128)) // Don't draw verbs unless active
+	if (_game.version <= 2 && !(_userState & USERSTATE_IFACE_VERBS)) // Don't draw verbs unless active
 		return;
 
 	int i, verb = 0;
@@ -875,7 +875,7 @@ void ScummEngine_v0::checkExecVerbs() {
 
 void ScummEngine::verbMouseOver(int verb) {
 	// Don't do anything unless verbs are active
-	if (_game.version <= 2 && !(_userState & 128))
+	if (_game.version <= 2 && !(_userState & USERSTATE_IFACE_VERBS))
 		return;
 
 	if (_game.id == GID_FT)
-- 
cgit v1.2.3


From 984c2a05e4e4ec643c1135c6b087f6e7faf1997f Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 29 Jan 2012 17:11:54 +0100
Subject: SCUMM: replace o_beginOverride() with o2_beginOverride()

In contrast to the comment in o_beginOverride() VAR(VAR_OVERRIDE) is not set in the disassembly. In addition the cutscene stack-pointer is always 0 as this feature is not used in v0. This makes o_beginOverride() work the same way o2_beginOverride() and so it is not needed anymore.

Note that fetchScriptWord() was changed to ScummEngine::fetchScriptWord() in o2_beginOverride() as ScummEngine_v0::fetchScriptWord() only fetches a byte.
As we need two bytes here we have to use ScummEngine::fetchScriptWord().
---
 engines/scumm/script_v0.cpp | 19 +------------------
 engines/scumm/script_v2.cpp |  2 +-
 engines/scumm/scumm_v0.h    |  1 -
 3 files changed, 2 insertions(+), 20 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 46052cdf49..a7187237f3 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -145,7 +145,7 @@ void ScummEngine_v0::setupOpcodes() {
 	OPCODE(0x56, o_getActorMoving);
 	OPCODE(0x57, o2_clearState08);
 	/* 58 */
-	OPCODE(0x58, o_beginOverride);
+	OPCODE(0x58, o2_beginOverride);
 	OPCODE(0x59, o_stopCurrentScript);
 	OPCODE(0x5a, o2_add);
 	OPCODE(0x5b, o_getActorBitVar);
@@ -952,23 +952,6 @@ void ScummEngine_v0::o_endCutscene() {
 	}
 }
 
-void ScummEngine_v0::o_beginOverride() {
-	const int idx = vm.cutSceneStackPointer;
-	assert(0 <= idx && idx < 5);
-
-	vm.cutScenePtr[idx] = _scriptPointer - _scriptOrgPointer;
-	vm.cutSceneScript[idx] = _currentScript;
-
-	// Skip the jump instruction following the override instruction
-	// (the jump is responsible for "skipping" cutscenes, and the reason
-	// why we record the current script position in vm.cutScenePtr).
-	fetchScriptByte();
-	ScummEngine::fetchScriptWord();
-
-	// This is based on disassembly
-	VAR(VAR_OVERRIDE) = 0;
-}
-
 void ScummEngine_v0::o_setOwnerOf() {
 	int obj, owner;
 
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 2b2bad32a7..6857f8635b 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1527,7 +1527,7 @@ void ScummEngine_v2::o2_beginOverride() {
 
 	// Skip the jump instruction following the override instruction
 	fetchScriptByte();
-	fetchScriptWord();
+	ScummEngine::fetchScriptWord();
 }
 
 void ScummEngine_v2::o2_chainScript() {
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 8b13569042..a5af34b1ff 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -153,7 +153,6 @@ protected:
 	void o_unlockSound();
 	void o_cutscene();
 	void o_endCutscene();
-	void o_beginOverride();
 	void o_setOwnerOf();
 
 	byte VAR_ACTIVE_OBJECT2;
-- 
cgit v1.2.3


From 91bdf9a3f5abff5651679b414de878a890219b44 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 29 Jan 2012 17:18:31 +0100
Subject: SCUMM: fix cutscenes by reintroduction of freeze modes

---
 engines/scumm/script_v0.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index a7187237f3..faac991193 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -636,14 +636,13 @@ void ScummEngine_v0::setMode(byte mode) {
 		_redrawSentenceLine = false;
 		// Note: do not change freeze state here
 		state = USERSTATE_SET_IFACE | 
-			USERSTATE_SET_CURSOR |
-			USERSTATE_SET_FREEZE;
+			USERSTATE_SET_CURSOR;
 		break;
 	case kModeKeypad:
 		_redrawSentenceLine = false;
 		state = USERSTATE_SET_IFACE | 
 			USERSTATE_SET_CURSOR | USERSTATE_CURSOR_ON |
-			USERSTATE_SET_FREEZE;
+			USERSTATE_SET_FREEZE | USERSTATE_FREEZE_ON;
 		break;
 	case kModeNormal:
 	case kModeNoNewKid:
@@ -927,12 +926,14 @@ void ScummEngine_v0::o_cutscene() {
 	vm.cutSceneData[0] = _currentMode;
 	vm.cutSceneData[2] = _currentRoom;
 
+	freezeScripts(0);
 	setMode(kModeCutscene);
 
 	_sentenceNum = 0;
 	resetSentence();
 
 	vm.cutScenePtr[0] = 0;
+	vm.cutSceneScript[0] = 0;
 }
 
 void ScummEngine_v0::o_endCutscene() {
@@ -946,8 +947,13 @@ void ScummEngine_v0::o_endCutscene() {
 
 	if (_currentMode == kModeKeypad) {
 		startScene(vm.cutSceneData[2], 0, 0);
+		// in contrast to the normal keypad behavior we unfreeze scripts here
+		unfreezeScripts();
 	} else {
+		unfreezeScripts();
 		actorFollowCamera(VAR(VAR_EGO));
+		// set mode again to have the freeze mode right
+		setMode(vm.cutSceneData[0]);
 		_redrawSentenceLine = true;
 	}
 }
-- 
cgit v1.2.3


From 2b657283d763b23a3263485924c43d5e86aefcc9 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 29 Jan 2012 17:26:16 +0100
Subject: SCUMM: forward savegame version is needed due to previous savegame
 changes)

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

(limited to 'engines')

diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h
index 931b56f137..a316670e3d 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 90
+#define CURRENT_VER 91
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead
-- 
cgit v1.2.3


From 92908bfc4b461dad5cf5811a0d3c167827ddf3b1 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Mon, 30 Jan 2012 23:33:48 +1100
Subject: SCUMM: Fix ActorStop, V0 needs to set the stop direction

---
 engines/scumm/actor.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index c2390ab4b0..6f6c1d21db 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -235,6 +235,8 @@ void Actor::stopActorMoving() {
 		_vm->stopScript(_walkScript);
 
 	_moving = 0;
+	if( _vm->_game.version == 0 )
+		((ActorC64*)this)->setDirection( _facing );
 }
 
 void Actor::setActorWalkSpeed(uint newSpeedX, uint newSpeedY) {
-- 
cgit v1.2.3


From a8008e0a717fd2bb1d697f04c1901397deabe958 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Tue, 31 Jan 2012 07:42:38 +1100
Subject: SCUMM: Fix if there is no costume set

---
 engines/scumm/costume.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index e3a2203adc..b2ad4b9b33 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1285,6 +1285,9 @@ void C64CostumeLoader::loadCostume(int id) {
 void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 	ActorC64 *A = (ActorC64 *)a;
 
+	if(!a->_costume)
+		return;
+
 	loadCostume(a->_costume);
 
 	// Invalid costume command?
-- 
cgit v1.2.3


From 434aaaf0c0cdbcc8a1ebc0e461f1e31582126f92 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 4 Feb 2012 11:18:14 +0100
Subject: SCUMM: fix gcc compiler warnings

---
 engines/scumm/actor.h       | 2 +-
 engines/scumm/costume.cpp   | 2 +-
 engines/scumm/script.cpp    | 4 ++--
 engines/scumm/script_v0.cpp | 2 +-
 engines/scumm/scumm_v0.h    | 4 ++--
 engines/scumm/verbs.h       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index d3271f4eaa..4e251d0e3c 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -343,7 +343,7 @@ enum ActorC64MiscFlags {
 	kActorMiscFlag_10       = 0x10, // ???
 	kActorMiscFlag_20       = 0x20, // ???
 	kActorMiscFlagFreeze    = 0x40, // Stop moving
-	kActorMiscFlagHide      = 0x80, // Kid is invisible (dead or in radiation suit)
+	kActorMiscFlagHide      = 0x80  // Kid is invisible (dead or in radiation suit)
 };
 
 class ActorC64 : public Actor_v2 {
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index b2ad4b9b33..489c1f46e7 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1179,7 +1179,7 @@ static const byte actorColorsMMC64[25] = {
 	}
 
 byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
-	ActorC64* A = (ActorC64*) a;
+	const ActorC64* A = (const ActorC64 *)a;
 
 	if (limb >= 8)
 		return 0;
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 63f04c1f32..8880963698 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1200,8 +1200,8 @@ bool ScummEngine_v0::checkPendingWalkAction() {
 					b->faceToObject(actorToObj(actor));
 				}
 			} else { // walk to object finished
-				int x, y, dir;
-				getObjectXYPos(_walkToObject, x, y, dir);
+				int tmpX, tmpY, dir;
+				getObjectXYPos(_walkToObject, tmpX, tmpY, dir);
 				a->turnToDirection(dir);
 			}
 			_walkToObjectState = kWalkToObjectStateTurn;
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index faac991193..8de95858f2 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -464,7 +464,7 @@ void ScummEngine_v0::drawSentenceLine() {
 	if (_activeVerb == kVerbNewKid) {
 		_sentenceBuf = "";
 		for (int i = 0; i < 3; ++i) {
-			char *actorName;
+			const char *actorName;
 			int actorId = VAR(97 + i);
 			if (actorId == 0) {
 				// after usage of the radiation suit, kid vars are set to 0
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index a5af34b1ff..a64f108243 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -36,13 +36,13 @@ protected:
 		kModeCutscene = 0,   // cutscene active
 		kModeKeypad = 1,     // kid selection / dial pad / save-load dialog
 		kModeNoNewKid = 2,   // verb "new kid" disabled (e.g. when entering lab)
-		kModeNormal = 3,     // normal playing mode
+		kModeNormal = 3      // normal playing mode
 	};
 
 	enum WalkToObjectState {
 		kWalkToObjectStateDone = 0,
 		kWalkToObjectStateWalk = 1,
-		kWalkToObjectStateTurn = 2,
+		kWalkToObjectStateTurn = 2
 	};
 
 protected:
diff --git a/engines/scumm/verbs.h b/engines/scumm/verbs.h
index fce260ea63..0aa008b4de 100644
--- a/engines/scumm/verbs.h
+++ b/engines/scumm/verbs.h
@@ -82,7 +82,7 @@ enum VerbPrepsV0 {
 	kVerbPrepWith   = 2,
 	kVerbPrepOn     = 3,
 	kVerbPrepTo     = 4,
-	kVerbPrepObject = 0xFF, // prep depends on object (USE)
+	kVerbPrepObject = 0xFF // prep depends on object (USE)
 };
 
 } // End of namespace Scumm
-- 
cgit v1.2.3


From e14e4ab3b035012781abfbac500e6de88e0ad60b Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 4 Feb 2012 14:49:44 +0100
Subject: SCUMM: adjust to coding style-guide

---
 engines/scumm/actor.cpp     | 80 ++++++++++++++++++++-------------------------
 engines/scumm/actor.h       | 28 ++++++++--------
 engines/scumm/costume.cpp   | 70 +++++++++++++++++++--------------------
 engines/scumm/costume.h     |  2 +-
 engines/scumm/object.h      | 14 ++++----
 engines/scumm/script.cpp    |  4 +--
 engines/scumm/script_v0.cpp | 28 ++++++++--------
 engines/scumm/script_v2.cpp |  2 +-
 engines/scumm/verbs.cpp     |  3 +-
 9 files changed, 110 insertions(+), 121 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 6f6c1d21db..c5d2a2b9fb 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -235,8 +235,8 @@ void Actor::stopActorMoving() {
 		_vm->stopScript(_walkScript);
 
 	_moving = 0;
-	if( _vm->_game.version == 0 )
-		((ActorC64*)this)->setDirection( _facing );
+	if(_vm->_game.version == 0)
+		((ActorC64 *)this)->setDirection(_facing);
 }
 
 void Actor::setActorWalkSpeed(uint newSpeedX, uint newSpeedY) {
@@ -324,13 +324,12 @@ int Actor::actorWalkStep() {
 	int distX, distY;
 	int nextFacing;
 
-    if( _vm->_game.version == 0 )
-        ((ActorC64*) this)->_animFrameRepeat = -1;
+	if(_vm->_game.version == 0)
+		((ActorC64 *)this)->_animFrameRepeat = -1;
 
 	_needRedraw = true;
 
 	nextFacing = updateActorDirection(true);
-
 	if (!(_moving & MF_IN_LEG) || _facing != nextFacing) {
 		if (_walkFrame != _frame || _facing != nextFacing) {
 			startWalkAnim(1, nextFacing);
@@ -370,7 +369,6 @@ int Actor::actorWalkStep() {
 		_moving &= ~MF_IN_LEG;
 		return 0;
 	}
-
 	return 1;
 }
 
@@ -398,11 +396,9 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
 	}
 
 	if (_vm->_game.version <= 2) {
-
 		abr = adjustXYToBeInBox(abr.x, abr.y);
 		if (_pos.x == abr.x && _pos.y == abr.y && (dir == -1 || _facing == dir))
 			return;
-
 	} else {
 		if (_ignoreBoxes) {
 			abr.box = kInvalidBox;
@@ -449,7 +445,6 @@ void Actor::startWalkAnim(int cmd, int angle) {
 		args[2] = angle;
 		_vm->runScript(_walkScript, 1, 0, args);
 	} else {
-
 		switch (cmd) {
 		case 1:										/* start walk */
 			setDirection(angle);
@@ -573,9 +568,8 @@ void Actor_v2::walkActor() {
 	if (_moving & MF_IN_LEG) {
 		actorWalkStep();
 
-		if( _vm->_game.version == 0 )
-			((ActorC64*) this)->animateActor( newDirToOldDir( _facing ) );
-
+		if(_vm->_game.version == 0)
+			((ActorC64 *)this)->animateActor(newDirToOldDir(_facing));
 	} else {
 		if (_moving & MF_LAST_LEG) {
 			_moving = 0;
@@ -886,24 +880,24 @@ void Actor::setDirection(int direction) {
 
 void ActorC64::setDirection(int direction) {
 	int dir = newDirToOldDir( direction );
-    int res = 0;
+	int res = 0;
 
 	switch (dir) {
 		case 0:
 			res = 4;	// Left
-            break;
+			break;
 
 		case 1:
 			res = 5;	// Right
-            break;
+			break;
 
 		case 2:
 			res = 6;	// Face Away
-            break;
+			break;
 
-        default:
+		default:
 			res = 7;	// Face Camera
-            break;
+			break;
 	}
 	
 	_animFrameRepeat = -1;
@@ -935,12 +929,10 @@ void Actor::turnToDirection(int newdir) {
 	} else {
 		_moving &= ~MF_TURN;
 		if (newdir != _facing) {
-			
 			_moving |= MF_TURN;
 			_targetFacing = newdir;
 		}
 	}
-
 }
 
 
@@ -982,14 +974,11 @@ void Actor::putActor(int dstX, int dstY, int newRoom) {
 
 	if (_visible) {
 		if (isInCurrentRoom()) {
-			
 			if (_moving) {
 				stopActorMoving();
 				startAnimActor(_standFrame);
 			}
-
 			adjustActorPos();
-
 		} else {
 #ifdef ENABLE_HE
 			if (_vm->_game.heversion >= 71)
@@ -1003,8 +992,8 @@ 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 ) 
-		setDirection( oldDirToNewDir(2));
+	if(_vm->_game.version == 0)
+		setDirection(oldDirToNewDir(2));
 }
 
 static bool inBoxQuickReject(const BoxCoords &box, int x, int y, int threshold) {
@@ -1139,6 +1128,7 @@ AdjustBoxResult Actor_v2::adjustXYToBeInBox(const int dstX, const int dstY) {
 			abr.x = foundX;
 			abr.y = foundY;
 			abr.box = box;
+
 			break;
 		}
 		if (dist < bestDist) {
@@ -1324,20 +1314,19 @@ void Actor::showActor() {
 	_vm->ensureResourceLoaded(rtCostume, _costume);
 
 	if (_vm->_game.version == 0) {
-
-		ActorC64 *a = ((ActorC64*) this);
+		ActorC64 *a = ((ActorC64 *)this);
 		
 		a->_costCommand = a->_costCommandNew = 0xFF;
 
-		for( int i = 0; i < 8; ++i ) {
+		for(int i = 0; i < 8; ++i) {
 			a->_limbFrameRepeat[i] = 0;
 			a->_limbFrameRepeatNew[i] = 0;
 		}
 
 		_cost.reset();
 
-        // 0x39DF
-        a->_animFrameRepeat = 1;
+		// 0x39DF
+		a->_animFrameRepeat = 1;
 		a->_speaking = 0;
 
 		startAnimActor(_standFrame);
@@ -1880,10 +1869,10 @@ void ActorC64::startAnimActor(int f) {
 		return;
 	}
 
-	if( f == _standFrame )
-		setDirection( _facing );
+	if(f == _standFrame)
+		setDirection(_facing);
 	else
-		animateActor( newDirToOldDir(_facing) );
+		animateActor(newDirToOldDir(_facing));
 }
 
 void Actor::animateActor(int anim) {
@@ -1898,6 +1887,7 @@ void Actor::animateActor(int anim) {
 		dir = anim % 1000;
 
 	} else {
+
 		cmd = anim / 4;
 		dir = oldDirToNewDir(anim % 4);
 
@@ -1970,7 +1960,7 @@ void ActorC64::animateCostume() {
 
 	speakCheck();
 
-	for( _limb_current = 0; _limb_current < 8; ++_limb_current ) {
+	for(_limb_current = 0; _limb_current < 8; ++_limb_current) {
 		limbFrameCheck();
 		
 		if (_vm->_costumeLoader->increaseAnims(this))
@@ -1983,15 +1973,15 @@ void ActorC64::speakCheck() {
 	if (v0ActorTalkArray[_number] & 0x80)
 		return;
 	
-	int cmd = newDirToOldDir( _facing );
+	int cmd = newDirToOldDir(_facing);
 
 	if (_speaking & 0x80)
 		cmd += 0x0C;
 	else
 		cmd += 0x10;
 
-    _animFrameRepeat = -1;
-	animateActor( cmd );
+	_animFrameRepeat = -1;
+	animateActor(cmd);
 }
 
 #ifdef ENABLE_SCUMM_7_8
@@ -2622,7 +2612,7 @@ bool Actor::isPlayer() {
 }
 
 bool Actor_v2::isPlayer() {
-	// isPlayer() is not supported by v0 
+	// isPlayer() is not supported by v0
 	assert(_vm->_game.version != 0);
 	return _vm->VAR(42) <= _number && _number <= _vm->VAR(43);
 }
@@ -2781,7 +2771,7 @@ void ScummEngine_v71he::queueAuxEntry(int actorNum, int subIndex) {
 void ActorC64::animateActor(int anim) {
 	int dir = -1;
 
-	switch( anim ) {
+	switch (anim) {
 		case 0x00:
 		case 0x04:
 			dir = 0;
@@ -2806,21 +2796,21 @@ void ActorC64::animateActor(int anim) {
 			break;
 	}
 
-    if( isInCurrentRoom() ) {
+	if(isInCurrentRoom()) {
 
 		_costCommandNew = anim;
 		_vm->_costumeLoader->costumeDecodeData(this, 0, 0);
 		
-		if( dir == -1 )
+		if(dir == -1)
 			return;
 
-		_facing = normalizeAngle( oldDirToNewDir(dir) );
+		_facing = normalizeAngle(oldDirToNewDir(dir));
 
 	} else {
 
-        if( anim > 4 && anim <= 7 )
-			_facing = normalizeAngle( oldDirToNewDir(dir) );
-    }
+		if(anim > 4 && anim <= 7)
+			_facing = normalizeAngle(oldDirToNewDir(dir));
+	}
 }
 
 void ActorC64::saveLoadWithSerializer(Serializer *ser) {
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 4e251d0e3c..c82bd641bd 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -352,41 +352,41 @@ public:
 	byte _miscflags;
 	byte _speaking;
 
-    int8 _animFrameRepeat;
-    int8 _limbFrameRepeatNew[8], _limbFrameRepeat[8];
+	int8 _animFrameRepeat;
+	int8 _limbFrameRepeatNew[8], _limbFrameRepeat[8];
 
-    byte _limb_current;
+	byte _limb_current;
 	bool _limb_flipped[8];
 
 public:
 	ActorC64(ScummEngine *scumm, int id) : Actor_v2(scumm, id) {
-		 _costCommand = 0xFF;
-		 _speaking = 0;
-         _animFrameRepeat = 0;
-		 _costCommandNew = 0xFF;
+		_costCommand = 0xFF;
+		_speaking = 0;
+		_animFrameRepeat = 0;
+		_costCommandNew = 0xFF;
 
-		 for( int i = 0; i < 8; ++i ) {
+		for(int i = 0; i < 8; ++i) {
 			_limbFrameRepeatNew[i] = 0;
 			_limbFrameRepeat[i] = 0;
 			_limb_flipped[i] = false;
 		 }
 	}
+
 	virtual void initActor(int mode) {
 		Actor_v2::initActor(mode);
 		if (mode == -1) {
 			_miscflags = 0;
 		}
-
 	}
 
-    virtual void animateActor(int anim);
+	virtual void animateActor(int anim);
 	virtual void animateCostume();
 
-	void		 limbFrameCheck();
+	void limbFrameCheck();
 
-	void		 speakCheck();
-    virtual void setDirection(int direction);
-	void		 startAnimActor(int f);
+	void speakCheck();
+	virtual void setDirection(int direction);
+	void startAnimActor(int f);
 
 	// Used by the save/load system:
 	virtual void saveLoadWithSerializer(Serializer *ser);
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 489c1f46e7..0b22cf38e2 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1190,11 +1190,11 @@ byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
 	}
 	
 	// Invalid current position?
-	if(  a->_cost.curpos[limb] == 0xFFFF )
+	if(a->_cost.curpos[limb] == 0xFFFF)
 		return 0;
 
-	_loaded.loadCostume( a->_costume );
-	byte frame = _loaded._frameOffsets[ a->_cost.curpos[limb] + a->_cost.active[limb] ];
+	_loaded.loadCostume(a->_costume);
+	byte frame = _loaded._frameOffsets[a->_cost.curpos[limb] + a->_cost.active[limb]];
 
 	// Get the frame ptr
 	byte ptrLow = _loaded._baseptr[frame];
@@ -1224,7 +1224,7 @@ byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
 	if (!width || !height)
 		return 0;
 
-	int xpos = _actorX + (A->_limb_flipped[ limb ] ? -1 : +1) * (offsetX * 8 - a->_width / 2);
+	int xpos = _actorX + (A->_limb_flipped[limb] ? -1 : +1) * (offsetX * 8 - a->_width / 2);
 	// +1 as we appear to be 1 pixel away from the original interpreter
 	int ypos = _actorY - offsetY + 1;
 
@@ -1234,13 +1234,13 @@ byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
 			byte color = data[y * width + x];
 			byte pcolor;
 
-			int destX = xpos + (A->_limb_flipped[ limb ] ? -(x + 1) : x) * 8;
+			int destX = xpos + (A->_limb_flipped[limb] ? -(x + 1) : x) * 8;
 			int destY = ypos + y;
 
 			if (destY >= 0 && destY < _out.h && destX >= 0 && destX < _out.w) {
 				byte *dst = (byte *)_out.pixels + destY * _out.pitch + destX;
 				byte *mask = _vm->getMaskBuffer(0, destY, _zbuf);
-				if (A->_limb_flipped[ limb ]) {
+				if (A->_limb_flipped[limb]) {
 					LINE(0, 0); LINE(2, 2); LINE(4, 4); LINE(6, 6);
 				} else {
 					LINE(6, 0); LINE(4, 2); LINE(2, 4); LINE(0, 6);
@@ -1251,7 +1251,7 @@ byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
 
 	_draw_top = MIN(_draw_top, ypos);
 	_draw_bottom = MAX(_draw_bottom, ypos + height);
-	if (A->_limb_flipped[ limb ])
+	if (A->_limb_flipped[limb])
 		_vm->markRectAsDirty(kMainVirtScreen, xpos - (width * 8), xpos, ypos, ypos + height, _actorID);
 	else
 		_vm->markRectAsDirty(kMainVirtScreen, xpos, xpos + (width * 8), ypos, ypos + height, _actorID);
@@ -1291,7 +1291,7 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 	loadCostume(a->_costume);
 
 	// Invalid costume command?
-	if( A->_costCommandNew == 0xFF || (A->_costCommand == A->_costCommandNew) )
+	if(A->_costCommandNew == 0xFF || (A->_costCommand == A->_costCommandNew))
 		return;
 
 	A->_costCommand = A->_costCommandNew;
@@ -1308,41 +1308,41 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 		limbFrameNumber = ((_animCmds + cmd)[limb]);
 
 		// Is this limb flipped?
-		if( limbFrameNumber & 0x80 ) {
+		if(limbFrameNumber & 0x80) {
 
 			// Invalid frame?
-			if( limbFrameNumber == 0xFF )
+			if(limbFrameNumber == 0xFF)
 				continue;
 
 			// Store the limb frame number (clear the flipped status)
-			a->_cost.frame[limb]	= (limbFrameNumber & 0x7f);
+			a->_cost.frame[limb] = (limbFrameNumber & 0x7f);
 
-			if( A->_limb_flipped[limb] != true )
+			if(A->_limb_flipped[limb] != true)
 				a->_cost.start[limb] = 0xFFFF;
 
 			A->_limb_flipped[limb] = true;
 
 		} else {
 			//Store the limb frame number
-			a->_cost.frame[limb]	= limbFrameNumber;
+			a->_cost.frame[limb] = limbFrameNumber;
 
-			if( A->_limb_flipped[limb] != false )
+			if(A->_limb_flipped[limb] != false)
 				a->_cost.start[limb] = 0xFFFF;
 
 			A->_limb_flipped[limb] = false;
 		}
 
 		// Set the repeat value
-        A->_limbFrameRepeatNew[limb] = A->_animFrameRepeat;
+		A->_limbFrameRepeatNew[limb] = A->_animFrameRepeat;
 	}
 }
 
-byte C64CostumeLoader::getFrame( ActorC64 *A ) {
+byte C64CostumeLoader::getFrame(ActorC64 *A) {
 
 	loadCostume(A->_costume);
 
 	// Get the frame number for the current limb / Command
-	return _frameOffsets[ _frameOffsets[A->_limb_current] + A->_cost.start[ A->_limb_current ] ];
+	return _frameOffsets[_frameOffsets[A->_limb_current] + A->_cost.start[A->_limb_current]];
 }
 
 byte C64CostumeLoader::increaseAnims(Actor *a) {
@@ -1352,39 +1352,39 @@ byte C64CostumeLoader::increaseAnims(Actor *a) {
 
 	loadCostume(a->_costume);
 
-    // 0x2543
-	byte frame = _frameOffsets[ a->_cost.curpos[A->_limb_current] + a->_cost.active[A->_limb_current] ];
+	// 0x2543
+	byte frame = _frameOffsets[a->_cost.curpos[A->_limb_current] + a->_cost.active[A->_limb_current]];
 
 	// Is this frame invalid?
-	if ( frame == 0xFF ) {
+	if (frame == 0xFF) {
 
-        // Repeat timer has reached 0?
-        if( A->_limbFrameRepeat[A->_limb_current] == 0 ) {
+		// Repeat timer has reached 0?
+		if(A->_limbFrameRepeat[A->_limb_current] == 0) {
 
-            // Use the previous frame
-            --A->_cost.curpos[A->_limb_current];
+			// Use the previous frame
+			--A->_cost.curpos[A->_limb_current];
 
 			// Reset the comstume command
-            A->_costCommandNew = 0xFF;
-            A->_costCommand = 0xFF;
-                
-            // Set the frame/start to invalid
+			A->_costCommandNew = 0xFF;
+			A->_costCommand = 0xFF;
+			
+			// Set the frame/start to invalid
 			A->_cost.frame[A->_limb_current] = 0xFFFF;
 			A->_cost.start[A->_limb_current] = 0xFFFF;
 
-        } else {
+		} else {
 
 			// Repeat timer enabled?
-            if( A->_limbFrameRepeat[A->_limb_current] != -1 )
-                --A->_limbFrameRepeat[A->_limb_current];
+			if(A->_limbFrameRepeat[A->_limb_current] != -1)
+				--A->_limbFrameRepeat[A->_limb_current];
 
 			// No, restart at frame 0
-            a->_cost.curpos[A->_limb_current] = 0;
-        }
-    }
+			a->_cost.curpos[A->_limb_current] = 0;
+		}
+	}
 
 	// Limb frame has changed?
-	if( limbPrevious == a->_cost.curpos[A->_limb_current] )
+	if(limbPrevious == a->_cost.curpos[A->_limb_current])
 		return 0;
 
 	return 1;
diff --git a/engines/scumm/costume.h b/engines/scumm/costume.h
index 4600cc5670..50f23dbacf 100644
--- a/engines/scumm/costume.h
+++ b/engines/scumm/costume.h
@@ -74,7 +74,7 @@ public:
 	void costumeDecodeData(Actor *a, int frame, uint usemask);
 	byte increaseAnims(Actor *a);
 	
-	byte getFrame( ActorC64 *A );
+	byte getFrame(ActorC64 *A);
 
 protected:
 
diff --git a/engines/scumm/object.h b/engines/scumm/object.h
index 37ccc4eef6..8212075e43 100644
--- a/engines/scumm/object.h
+++ b/engines/scumm/object.h
@@ -33,14 +33,14 @@ static inline int OBJECT_V0(int id, byte type) {
 
 enum ObjectV0Type {
 	kObjectV0TypeFG = 0,    // foreground object
-		                    //   - with owner/state, might (but has not to) be pickupable
-		                    //     -> with entry in _objectOwner/StateTable
-		                    //     -> all objects in _inventory have this type
-		                    //   - image can be exchanged (background overlay)
+	                        //   - with owner/state, might (but has not to) be pickupable
+	                        //     -> with entry in _objectOwner/StateTable
+	                        //     -> all objects in _inventory have this type
+	                        //   - image can be exchanged (background overlay)
 	kObjectV0TypeBG = 1,    // background object
-		                    //   - without owner/state, not pickupable  (room only)
-		                    //     -> without entry in _objectOwner/StateTable
-		                    //   - image cannot be exchanged (part of background image)
+	                        //   - without owner/state, not pickupable  (room only)
+	                        //     -> without entry in _objectOwner/StateTable
+	                        //   - image cannot be exchanged (part of background image)
 	kObjectV0TypeActor = 2  // object is an actor
 };
 
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 8880963698..3bd70d0e24 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1000,7 +1000,7 @@ void ScummEngine::killScriptsAndResources() {
 		for (i = 0; i < _numNewNames; i++) {
 			const int obj = _newNames[i];
 			if (obj) {
-				const int owner = getOwner( (_game.version != 0 ? obj : OBJECT_V0_ID(obj) ) );
+				const int owner = getOwner((_game.version != 0 ? obj : OBJECT_V0_ID(obj)));
 				// We can delete custom name resources if either the object is
 				// no longer in use (i.e. not owned by anyone anymore); or if
 				// it is an object which is owned by a room.
@@ -1234,7 +1234,7 @@ void ScummEngine_v0::checkAndRunSentenceScript() {
 	// If two objects are involved, at least one must be in the actors inventory
 	if (st.objectB &&
 		(OBJECT_V0_TYPE(st.objectA) != kObjectV0TypeFG || _objectOwnerTable[st.objectA] != VAR(VAR_EGO)) &&
-	    (OBJECT_V0_TYPE(st.objectB) != kObjectV0TypeFG || _objectOwnerTable[st.objectB] != VAR(VAR_EGO)))
+		(OBJECT_V0_TYPE(st.objectB) != kObjectV0TypeFG || _objectOwnerTable[st.objectB] != VAR(VAR_EGO)))
 	{
 		if (getVerbEntrypoint(st.objectA, kVerbPickUp))
 			doSentence(kVerbPickUp, st.objectA, 0);
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 8de95858f2..07be151ce2 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -687,24 +687,24 @@ void ScummEngine_v0::o_animateActor() {
 
 	ActorC64 *a = (ActorC64*) derefActor(act, "o_animateActor");
 
-    a->_animFrameRepeat = repeat;
+	a->_animFrameRepeat = repeat;
 	
-    switch( anim ) {
+	switch (anim) {
 
-        case 0xFE:
-            // 0x6993
-	        a->_speaking = 0x80;	// Enabled, but not switching
-	        return;
+		case 0xFE:
+			// 0x6993
+			a->_speaking = 0x80;	// Enabled, but not switching
+			return;
 
-        case 0xFD:
-	        // 0x69A3
-	        a->_speaking = 0x00;
-	        return;
+		case 0xFD:
+			// 0x69A3
+			a->_speaking = 0x00;
+			return;
 	
-        case 0xFF:
-            a->stopActorMoving();
-            return;
-    }
+		case 0xFF:
+			a->stopActorMoving();
+			return;
+	}
 
 	a->animateActor(anim);
 	a->animateCostume();
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 6857f8635b..1b8dc965e0 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -994,7 +994,7 @@ void ScummEngine_v2::o2_drawSentence() {
 	int slot = getVerbSlot(VAR(VAR_SENTENCE_VERB), 0);
 
 	if (!((_userState & USERSTATE_IFACE_SENTENCE) || 
-		  (_game.platform == Common::kPlatformNES && (_userState & USERSTATE_IFACE_ALL))))
+	      (_game.platform == Common::kPlatformNES && (_userState & USERSTATE_IFACE_ALL))))
 		return;
 
 	if (getResourceAddress(rtVerb, slot))
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 2b9d2342bc..88a1283067 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -476,7 +476,6 @@ void ScummEngine_v2::handleMouseOver(bool updateInventory) {
 }
 
 void ScummEngine_v0::handleMouseOver(bool updateInventory) {
-	//drawSentence();
 	ScummEngine_v2::handleMouseOver(updateInventory);
 }
 
@@ -695,7 +694,7 @@ void ScummEngine_v0::verbExec() {
 	if (_activeVerb == kVerbWhatIs)
 		return;
 		
-	if (!(_activeVerb == kVerbWalkTo && _activeObject == 0)) {		
+	if (!(_activeVerb == kVerbWalkTo && _activeObject == 0)) {
 		doSentence(_activeVerb, _activeObject, _activeObject2);
 		if (_activeVerb != kVerbWalkTo) {
 			_activeVerb = kVerbWalkTo;
-- 
cgit v1.2.3


From daff6f36ae210bea03bc51f0e5293218f439cd89 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 4 Feb 2012 15:40:36 +0100
Subject: SCUMM: _currentLights is v0 only

---
 engines/scumm/gfx.cpp    | 19 +++++++++++--------
 engines/scumm/scumm.cpp  |  2 +-
 engines/scumm/scumm.h    |  3 +--
 engines/scumm/scumm_v0.h |  3 +++
 4 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index a22aa1802f..a6b8377d2f 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -26,6 +26,7 @@
 #include "scumm/he/intern_he.h"
 #endif
 #include "scumm/resource.h"
+#include "scumm/scumm_v0.h"
 #include "scumm/scumm_v5.h"
 #include "scumm/scumm_v6.h"
 #include "scumm/usage_bits.h"
@@ -1487,15 +1488,17 @@ void ScummEngine_v5::drawFlashlight() {
 	_flashlight.isDrawn = true;
 }
 
-// V0 Maniac doesn't have a ScummVar for VAR_CURRENT_LIGHTS, and just uses
-// an internal variable. Emulate this to prevent overwriting script vars...
-// And V6 games do not use the "lights" at all. There, the whole screen is
-// always visible, and actors are always colored, so we fake the correct
-// light value for it.
+int ScummEngine_v0::getCurrentLights() const {
+	// V0 Maniac doesn't have a ScummVar for VAR_CURRENT_LIGHTS, and just uses
+	// an internal variable. Emulate this to prevent overwriting script vars...
+	// And V6 games do not use the "lights" at all. There, the whole screen is
+	// always visible, and actors are always colored, so we fake the correct
+	// light value for it.
+	return _currentLights;
+}
+
 int ScummEngine::getCurrentLights() const {
-	if (_game.id == GID_MANIAC && _game.version == 0)
-		return _currentLights;
-	else if (_game.version >= 6)
+	if (_game.version >= 6)
 		return LIGHTMODE_room_lights_on | LIGHTMODE_actor_use_colors;
 	else
 		return VAR(VAR_CURRENT_LIGHTS);
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 61d38dc593..d8b02d0881 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -263,7 +263,6 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 	_bytesPerPixel = 1;
 	_doEffect = false;
 	_snapScroll = false;
-	_currentLights = 0;
 	_shakeEnabled = false;
 	_shakeFrame = 0;
 	_screenStartStrip = 0;
@@ -713,6 +712,7 @@ ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr)
 	: ScummEngine_v2(syst, dr) {
 
 	_currentMode = 0;
+	_currentLights = 0;
 
 	_activeVerb = kVerbNone;
 	_activeObject = 0;
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index fa04c5b616..f67536d3ed 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -942,8 +942,7 @@ protected:
 public:
 	bool isLightOn() const;
 
-	byte _currentLights;
-	int getCurrentLights() const;
+	virtual int getCurrentLights() const;
 
 protected:
 	void initScreens(int b, int h);
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index a64f108243..982b62d645 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -47,6 +47,7 @@ protected:
 
 protected:
 	byte _currentMode;
+	byte _currentLights;
 
 	int _activeVerb;		// selected verb
 	int _activeObject;		// 1st selected object (see OBJECT_V0())
@@ -115,6 +116,8 @@ protected:
 
 	bool ifEqualActiveObject2Common(bool checkType);
 
+	virtual int getCurrentLights() const;
+
 	/* Version C64 script opcodes */
 	void o_stopCurrentScript();
 	void o_walkActorToObject();
-- 
cgit v1.2.3


From 5d3e1dd0dc7542057779f192c6865e9501eb8e36 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 4 Feb 2012 17:32:26 +0100
Subject: SCUMM: remove the temporary variable _limb_current

---
 engines/scumm/actor.cpp   | 24 +++++++++---------------
 engines/scumm/actor.h     |  3 +--
 engines/scumm/costume.cpp | 40 +++++++++++++++++++++++++---------------
 engines/scumm/costume.h   |  5 ++---
 4 files changed, 37 insertions(+), 35 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index c5d2a2b9fb..f58d3fde4e 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1937,39 +1937,33 @@ void Actor::animateCostume() {
 	}
 }
 
-void ActorC64::limbFrameCheck() {
-	if (_cost.frame[_limb_current] == 0xFFFF )
+void ActorC64::limbFrameCheck(int limb) {
+	if (_cost.frame[limb] == 0xFFFF)
 		return;
 
-	if (_cost.start[_limb_current] == _cost.frame[_limb_current] )
+	if (_cost.start[limb] == _cost.frame[limb])
 		return;
 
 	// 0x25A4
-	_cost.start[_limb_current] = _cost.frame[_limb_current];
+	_cost.start[limb] = _cost.frame[limb];
 
-	_limbFrameRepeat[_limb_current] = _limbFrameRepeatNew[_limb_current];
+	_limbFrameRepeat[limb] = _limbFrameRepeatNew[limb];
 
 	// 0x25C3
-	_cost.active[_limb_current] = ((C64CostumeLoader*)_vm->_costumeLoader)->getFrame( this );
-	_cost.curpos[_limb_current] = 0;
+	_cost.active[limb] = ((C64CostumeLoader*)_vm->_costumeLoader)->getFrame(this, limb);
+	_cost.curpos[limb] = 0;
 
 	_needRedraw = true;
 }
 
 void ActorC64::animateCostume() {
-
 	speakCheck();
 
-	for(_limb_current = 0; _limb_current < 8; ++_limb_current) {
-		limbFrameCheck();
-		
-		if (_vm->_costumeLoader->increaseAnims(this))
-			_needRedraw = true;
-	}
+	if (_vm->_costumeLoader->increaseAnims(this))
+		_needRedraw = true;
 }
 
 void ActorC64::speakCheck() {
-
 	if (v0ActorTalkArray[_number] & 0x80)
 		return;
 	
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index c82bd641bd..c2ffcf1275 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -355,7 +355,6 @@ public:
 	int8 _animFrameRepeat;
 	int8 _limbFrameRepeatNew[8], _limbFrameRepeat[8];
 
-	byte _limb_current;
 	bool _limb_flipped[8];
 
 public:
@@ -382,7 +381,7 @@ public:
 	virtual void animateActor(int anim);
 	virtual void animateCostume();
 
-	void limbFrameCheck();
+	void limbFrameCheck(int limb);
 
 	void speakCheck();
 	virtual void setDirection(int direction);
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 0b22cf38e2..9fe5296546 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1337,54 +1337,64 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 	}
 }
 
-byte C64CostumeLoader::getFrame(ActorC64 *A) {
-
-	loadCostume(A->_costume);
+byte C64CostumeLoader::getFrame(Actor *a, int limb) {
+	loadCostume(a->_costume);
 
 	// Get the frame number for the current limb / Command
-	return _frameOffsets[_frameOffsets[A->_limb_current] + A->_cost.start[A->_limb_current]];
+	return _frameOffsets[_frameOffsets[limb] + a->_cost.start[limb]];
 }
 
 byte C64CostumeLoader::increaseAnims(Actor *a) {
 	ActorC64 *A = (ActorC64 *)a;
-	
-	uint16 limbPrevious = a->_cost.curpos[A->_limb_current]++;
+	int i;
+	byte r = 0;
+
+	for(i = 0; i != 8; i++) {
+		A->limbFrameCheck(i);
+		r += increaseAnim(a, i);
+	}
+	return r;
+}
+
+byte C64CostumeLoader::increaseAnim(Actor *a, int limb) {
+	ActorC64 *A = (ActorC64 *)a;
+	const uint16 limbPrevious = a->_cost.curpos[limb]++;
 
 	loadCostume(a->_costume);
 
 	// 0x2543
-	byte frame = _frameOffsets[a->_cost.curpos[A->_limb_current] + a->_cost.active[A->_limb_current]];
+	byte frame = _frameOffsets[a->_cost.curpos[limb] + a->_cost.active[limb]];
 
 	// Is this frame invalid?
 	if (frame == 0xFF) {
 
 		// Repeat timer has reached 0?
-		if(A->_limbFrameRepeat[A->_limb_current] == 0) {
+		if(A->_limbFrameRepeat[limb] == 0) {
 
 			// Use the previous frame
-			--A->_cost.curpos[A->_limb_current];
+			--A->_cost.curpos[limb];
 
 			// Reset the comstume command
 			A->_costCommandNew = 0xFF;
 			A->_costCommand = 0xFF;
 			
 			// Set the frame/start to invalid
-			A->_cost.frame[A->_limb_current] = 0xFFFF;
-			A->_cost.start[A->_limb_current] = 0xFFFF;
+			A->_cost.frame[limb] = 0xFFFF;
+			A->_cost.start[limb] = 0xFFFF;
 
 		} else {
 
 			// Repeat timer enabled?
-			if(A->_limbFrameRepeat[A->_limb_current] != -1)
-				--A->_limbFrameRepeat[A->_limb_current];
+			if(A->_limbFrameRepeat[limb] != -1)
+				--A->_limbFrameRepeat[limb];
 
 			// No, restart at frame 0
-			a->_cost.curpos[A->_limb_current] = 0;
+			a->_cost.curpos[limb] = 0;
 		}
 	}
 
 	// Limb frame has changed?
-	if(limbPrevious == a->_cost.curpos[A->_limb_current])
+	if(limbPrevious == a->_cost.curpos[limb])
 		return 0;
 
 	return 1;
diff --git a/engines/scumm/costume.h b/engines/scumm/costume.h
index 50f23dbacf..16317cb1c9 100644
--- a/engines/scumm/costume.h
+++ b/engines/scumm/costume.h
@@ -73,11 +73,10 @@ public:
 	void loadCostume(int id);
 	void costumeDecodeData(Actor *a, int frame, uint usemask);
 	byte increaseAnims(Actor *a);
-	
-	byte getFrame(ActorC64 *A);
+	byte getFrame(Actor *a, int limb);
 
 protected:
-
+	byte increaseAnim(Actor *a, int limb);
 };
 
 class ClassicCostumeRenderer : public BaseCostumeRenderer {
-- 
cgit v1.2.3


From 8d3b27293965ea17a4a34a1258688f9eeb3410d1 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 4 Feb 2012 17:35:59 +0100
Subject: SCUMM: save complete v0 state and initialize actors correctly

---
 engines/scumm/actor.cpp    | 19 +++++++++++++++++--
 engines/scumm/actor.h      | 27 ++++++---------------------
 engines/scumm/saveload.cpp | 12 +++++++++++-
 engines/scumm/saveload.h   |  2 +-
 4 files changed, 35 insertions(+), 25 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index f58d3fde4e..59c4110348 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -175,6 +175,21 @@ void Actor_v2::initActor(int mode) {
 	_talkStopFrame = 4;
 }
 
+void ActorC64::initActor(int mode) {
+	Actor_v2::initActor(mode);
+
+	_costCommandNew = 0xFF;
+	_costCommand = 0xFF;
+	_miscflags = 0;
+	_speaking = 0;
+
+	_animFrameRepeat = 0;
+	for(int i = 0; i < 8; ++i) {
+		_limbFrameRepeatNew[i] = 0;
+		_limbFrameRepeat[i] = 0;
+		_limb_flipped[i] = false;
+	}
+}
 
 void Actor::setBox(int box) {
 	_walkbox = box;
@@ -2812,11 +2827,11 @@ void ActorC64::saveLoadWithSerializer(Serializer *ser) {
 
 	static const SaveLoadEntry actorEntries[] = {
 		MKLINE(ActorC64, _costCommand, sleByte, VER(84)),
-		MKLINE_OLD(ActorC64, _costFrame, sleByte, VER(84), VER(89)),
+		MK_OBSOLETE(ActorC64, _costFrame, sleByte, VER(84), VER(89)),
 		MKLINE(ActorC64, _miscflags, sleByte, VER(84)),
 		MKLINE(ActorC64, _speaking, sleByte, VER(84)),
 		MK_OBSOLETE(ActorC64, _speakingPrev, sleByte, VER(84), VER(89)),
-		MK_OBSOLETE(ActorC64, _byte_FD0A, sleByte, VER(89), VER(89)),
+		MK_OBSOLETE(ActorC64, _limbTemp, sleByte, VER(89), VER(89)),
 		MKLINE(ActorC64, _animFrameRepeat, sleByte, VER(89)),
 		MKARRAY(ActorC64, _limbFrameRepeatNew[0], sleInt8, 8, VER(89)),
 		MKARRAY(ActorC64, _limbFrameRepeat[0], sleInt8, 8, VER(90)),
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index c2ffcf1275..9e4955c079 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -348,36 +348,21 @@ enum ActorC64MiscFlags {
 
 class ActorC64 : public Actor_v2 {
 public:
-	byte _costCommandNew, _costCommand, _costFrame;
+	byte _costCommandNew;
+	byte _costCommand;
 	byte _miscflags;
 	byte _speaking;
 
 	int8 _animFrameRepeat;
-	int8 _limbFrameRepeatNew[8], _limbFrameRepeat[8];
+	int8 _limbFrameRepeatNew[8];
+	int8 _limbFrameRepeat[8];
 
 	bool _limb_flipped[8];
 
 public:
-	ActorC64(ScummEngine *scumm, int id) : Actor_v2(scumm, id) {
-		_costCommand = 0xFF;
-		_speaking = 0;
-		_animFrameRepeat = 0;
-		_costCommandNew = 0xFF;
-
-		for(int i = 0; i < 8; ++i) {
-			_limbFrameRepeatNew[i] = 0;
-			_limbFrameRepeat[i] = 0;
-			_limb_flipped[i] = false;
-		 }
-	}
-
-	virtual void initActor(int mode) {
-		Actor_v2::initActor(mode);
-		if (mode == -1) {
-			_miscflags = 0;
-		}
-	}
+	ActorC64(ScummEngine *scumm, int id) : Actor_v2(scumm, id) {}
 
+	virtual void initActor(int mode);
 	virtual void animateActor(int anim);
 	virtual void animateCostume();
 
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index a1b2fafa86..6e54377199 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1210,10 +1210,12 @@ void ScummEngine::saveOrLoad(Serializer *s) {
 			// Since roughly v13 of the save games, the objs storage has changed a bit
 			for (i = _numObjectsInRoom; i < _numLocalObjects; i++)
 				_objs[i].obj_nr = 0;
-		} else if (_game.version == 0) { //  TODO: handle this correctly
+		} else if (_game.version == 0 && s->getVersion() < VER(91)) {
 			for (i = 0; i < _numLocalObjects; i++) {
+				// Merge object id and type (previously stored in flags)
 				if (_objs[i].obj_nr != 0 && OBJECT_V0_TYPE(_objs[i].obj_nr) == 0 && _objs[i].flags != 0)
 					_objs[i].obj_nr = OBJECT_V0(_objs[i].obj_nr, _objs[i].flags);
+				_objs[i].flags = 0;
 			}
 		}
 	}
@@ -1502,6 +1504,14 @@ void ScummEngine_v0::saveOrLoad(Serializer *s) {
 	const SaveLoadEntry v0Entrys[] = {
 		MKLINE(ScummEngine_v0, _currentMode, sleByte, VER(78)),
 		MKLINE(ScummEngine_v0, _currentLights, sleByte, VER(78)),
+		MKLINE(ScummEngine_v0, _activeVerb, sleByte, VER(92)),
+		MKLINE(ScummEngine_v0, _activeObject, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _activeObject2, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _cmdVerb, sleByte, VER(92)),
+		MKLINE(ScummEngine_v0, _cmdObject, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _cmdObject2, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _walkToObject, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _walkToObjectState, sleByte, VER(92)),
 		MKEND()
 	};
  	s->saveLoadEntries(this, v0Entrys);
diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h
index a316670e3d..90feee6dc0 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 91
+#define CURRENT_VER 92
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead
-- 
cgit v1.2.3


From 9dd6105ce62210509207dc61607543b7bcf5639d Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 4 Feb 2012 18:34:08 +0100
Subject: SCUMM: replace "c64" with "v0" when it applies to both C64 and
 AppleII v0 versions

In addition some routines (e.g. the gfx ones) that are even used in v1.
---
 engines/scumm/actor.cpp            | 52 ++++++++++++++--------------
 engines/scumm/actor.h              |  6 ++--
 engines/scumm/boxes.cpp            | 26 +++++++-------
 engines/scumm/boxes.h              |  2 +-
 engines/scumm/charset-fontdata.cpp |  2 +-
 engines/scumm/costume.cpp          | 28 +++++++--------
 engines/scumm/costume.h            | 10 +++---
 engines/scumm/gfx.cpp              | 70 +++++++++++++++++++-------------------
 engines/scumm/gfx.h                | 12 +++----
 engines/scumm/object.cpp           |  4 +--
 engines/scumm/room.cpp             |  2 +-
 engines/scumm/script.cpp           |  4 +--
 engines/scumm/script_v0.cpp        | 24 ++++++-------
 engines/scumm/script_v2.cpp        |  2 +-
 engines/scumm/scumm.cpp            |  8 ++---
 engines/scumm/scumm_v0.h           |  6 ++--
 engines/scumm/verbs.cpp            |  4 +--
 17 files changed, 131 insertions(+), 131 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 59c4110348..ee655dec33 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -175,7 +175,7 @@ void Actor_v2::initActor(int mode) {
 	_talkStopFrame = 4;
 }
 
-void ActorC64::initActor(int mode) {
+void Actor_v0::initActor(int mode) {
 	Actor_v2::initActor(mode);
 
 	_costCommandNew = 0xFF;
@@ -251,7 +251,7 @@ void Actor::stopActorMoving() {
 
 	_moving = 0;
 	if(_vm->_game.version == 0)
-		((ActorC64 *)this)->setDirection(_facing);
+		((Actor_v0 *)this)->setDirection(_facing);
 }
 
 void Actor::setActorWalkSpeed(uint newSpeedX, uint newSpeedY) {
@@ -340,7 +340,7 @@ int Actor::actorWalkStep() {
 	int nextFacing;
 
 	if(_vm->_game.version == 0)
-		((ActorC64 *)this)->_animFrameRepeat = -1;
+		((Actor_v0 *)this)->_animFrameRepeat = -1;
 
 	_needRedraw = true;
 
@@ -584,7 +584,7 @@ void Actor_v2::walkActor() {
 		actorWalkStep();
 
 		if(_vm->_game.version == 0)
-			((ActorC64 *)this)->animateActor(newDirToOldDir(_facing));
+			((Actor_v0 *)this)->animateActor(newDirToOldDir(_facing));
 	} else {
 		if (_moving & MF_LAST_LEG) {
 			_moving = 0;
@@ -805,7 +805,7 @@ int Actor::remapDirection(int dir, bool is_walking) {
 			return 180;
 		}
 
-		// MM C64 stores flags as a part of the mask
+		// MM v0 stores flags as a part of the mask
 		if (_vm->_game.version == 0) {
 			mask = _vm->getMaskFromBox(_walkbox);
 			// face the wall if climbing/descending a ladder
@@ -893,7 +893,7 @@ void Actor::setDirection(int direction) {
 	_needRedraw = true;
 }
 
-void ActorC64::setDirection(int direction) {
+void Actor_v0::setDirection(int direction) {
 	int dir = newDirToOldDir( direction );
 	int res = 0;
 
@@ -1329,7 +1329,7 @@ void Actor::showActor() {
 	_vm->ensureResourceLoaded(rtCostume, _costume);
 
 	if (_vm->_game.version == 0) {
-		ActorC64 *a = ((ActorC64 *)this);
+		Actor_v0 *a = ((Actor_v0 *)this);
 		
 		a->_costCommand = a->_costCommandNew = 0xFF;
 
@@ -1556,7 +1556,7 @@ void ScummEngine::processActors() {
 
 		if (_game.version == 0) {
 			// 0x057B
-			ActorC64 *A = (ActorC64*) a;
+			Actor_v0 *A = (Actor_v0*) a;
 			if (A->_speaking & 1)
 				A->_speaking ^= 0xFE;
 
@@ -1869,7 +1869,7 @@ void Actor::startAnimActor(int f) {
 	}
 }
 
-void ActorC64::startAnimActor(int f) {
+void Actor_v0::startAnimActor(int f) {
 	if (f == _talkStartFrame) {
 		if (v0ActorTalkArray[_number] & 0x40)
 			return;
@@ -1952,7 +1952,7 @@ void Actor::animateCostume() {
 	}
 }
 
-void ActorC64::limbFrameCheck(int limb) {
+void Actor_v0::limbFrameCheck(int limb) {
 	if (_cost.frame[limb] == 0xFFFF)
 		return;
 
@@ -1965,20 +1965,20 @@ void ActorC64::limbFrameCheck(int limb) {
 	_limbFrameRepeat[limb] = _limbFrameRepeatNew[limb];
 
 	// 0x25C3
-	_cost.active[limb] = ((C64CostumeLoader*)_vm->_costumeLoader)->getFrame(this, limb);
+	_cost.active[limb] = ((V0CostumeLoader*)_vm->_costumeLoader)->getFrame(this, limb);
 	_cost.curpos[limb] = 0;
 
 	_needRedraw = true;
 }
 
-void ActorC64::animateCostume() {
+void Actor_v0::animateCostume() {
 	speakCheck();
 
 	if (_vm->_costumeLoader->increaseAnims(this))
 		_needRedraw = true;
 }
 
-void ActorC64::speakCheck() {
+void Actor_v0::speakCheck() {
 	if (v0ActorTalkArray[_number] & 0x80)
 		return;
 	
@@ -2146,7 +2146,7 @@ void ScummEngine::setTalkingActor(int i) {
 		VAR(VAR_TALK_ACTOR) = i;
 }
 
-static const int c64MMActorTalkColor[25] = {
+static const int v0MMActorTalkColor[25] = {
 	1, 7, 2, 14, 8, 15, 3, 7, 7, 15, 1, 13, 1, 4, 5, 5, 4, 3, 1, 5, 1, 1, 1, 1, 7
 };
 static const int v1MMActorTalkColor[25] = {
@@ -2158,7 +2158,7 @@ void ScummEngine::resetV1ActorTalkColor() {
 
 	for (i = 1; i < _numActors; i++) {
 		if (_game.version == 0) {
-			_actors[i]->_talkColor = c64MMActorTalkColor[i];
+			_actors[i]->_talkColor = v0MMActorTalkColor[i];
 		} else {
 			_actors[i]->_talkColor = v1MMActorTalkColor[i];
 		}
@@ -2777,7 +2777,7 @@ void ScummEngine_v71he::queueAuxEntry(int actorNum, int subIndex) {
 }
 #endif
 
-void ActorC64::animateActor(int anim) {
+void Actor_v0::animateActor(int anim) {
 	int dir = -1;
 
 	switch (anim) {
@@ -2822,19 +2822,19 @@ void ActorC64::animateActor(int anim) {
 	}
 }
 
-void ActorC64::saveLoadWithSerializer(Serializer *ser) {
+void Actor_v0::saveLoadWithSerializer(Serializer *ser) {
 	Actor::saveLoadWithSerializer(ser);
 
 	static const SaveLoadEntry actorEntries[] = {
-		MKLINE(ActorC64, _costCommand, sleByte, VER(84)),
-		MK_OBSOLETE(ActorC64, _costFrame, sleByte, VER(84), VER(89)),
-		MKLINE(ActorC64, _miscflags, sleByte, VER(84)),
-		MKLINE(ActorC64, _speaking, sleByte, VER(84)),
-		MK_OBSOLETE(ActorC64, _speakingPrev, sleByte, VER(84), VER(89)),
-		MK_OBSOLETE(ActorC64, _limbTemp, sleByte, VER(89), VER(89)),
-		MKLINE(ActorC64, _animFrameRepeat, sleByte, VER(89)),
-		MKARRAY(ActorC64, _limbFrameRepeatNew[0], sleInt8, 8, VER(89)),
-		MKARRAY(ActorC64, _limbFrameRepeat[0], sleInt8, 8, VER(90)),
+		MKLINE(Actor_v0, _costCommand, sleByte, VER(84)),
+		MK_OBSOLETE(Actor_v0, _costFrame, sleByte, VER(84), VER(89)),
+		MKLINE(Actor_v0, _miscflags, sleByte, VER(84)),
+		MKLINE(Actor_v0, _speaking, sleByte, VER(84)),
+		MK_OBSOLETE(Actor_v0, _speakingPrev, sleByte, VER(84), VER(89)),
+		MK_OBSOLETE(Actor_v0, _limbTemp, sleByte, VER(89), VER(89)),
+		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)),
 		MKEND()
 	};
 
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 9e4955c079..69cfbfe398 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -335,7 +335,7 @@ protected:
 	virtual void prepareDrawActorCostume(BaseCostumeRenderer *bcr);
 };
 
-enum ActorC64MiscFlags {
+enum ActorV0MiscFlags {
 	kActorMiscFlagStrong    = 0x01, // Kid is strong (Hunk-O-Matic used)
 	kActorMiscFlagGTFriend  = 0x02, // Kid is green tentacle's friend (recording contract)
 	kActorMiscFlagWatchedTV = 0x04, // Kid knows publisher's address (watched TV)
@@ -346,7 +346,7 @@ enum ActorC64MiscFlags {
 	kActorMiscFlagHide      = 0x80  // Kid is invisible (dead or in radiation suit)
 };
 
-class ActorC64 : public Actor_v2 {
+class Actor_v0 : public Actor_v2 {
 public:
 	byte _costCommandNew;
 	byte _costCommand;
@@ -360,7 +360,7 @@ public:
 	bool _limb_flipped[8];
 
 public:
-	ActorC64(ScummEngine *scumm, int id) : Actor_v2(scumm, id) {}
+	Actor_v0(ScummEngine *scumm, int id) : Actor_v2(scumm, id) {}
 
 	virtual void initActor(int mode);
 	virtual void animateActor(int anim);
diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp
index 64d4d7422c..f6d2a18f38 100644
--- a/engines/scumm/boxes.cpp
+++ b/engines/scumm/boxes.cpp
@@ -42,7 +42,7 @@ struct Box {				/* Internal walkbox file format */
 			byte y1;
 			byte y2;
 			byte mask;
-		} c64;
+		} v0;
 
 		struct {
 			byte uy;
@@ -181,7 +181,7 @@ byte ScummEngine::getMaskFromBox(int box) {
 	if (_game.version == 8)
 		return (byte) FROM_LE_32(ptr->v8.mask);
 	else if (_game.version == 0)
-		return ptr->c64.mask;
+		return ptr->v0.mask;
 	else if (_game.version <= 2)
 		return ptr->v2.mask;
 	else
@@ -479,7 +479,7 @@ Box *ScummEngine::getBoxBaseAddr(int box) {
 
 	assertRange(0, box, ptr[0] - 1, "box");
 	if (_game.version == 0)
-		return (Box *)(ptr + box * SIZEOF_BOX_C64 + 1);
+		return (Box *)(ptr + box * SIZEOF_BOX_V0 + 1);
 	else if (_game.version <= 2)
 		return (Box *)(ptr + box * SIZEOF_BOX_V2 + 1);
 	else if (_game.version == 3)
@@ -602,19 +602,19 @@ BoxCoords ScummEngine::getBoxCoordinates(int boxnum) {
 			SWAP(box->ll, box->lr);
 		}
 	} else if (_game.version == 0) {
-		box->ul.x = bp->c64.x1;
-		box->ul.y = bp->c64.y1;
-		box->ur.x = bp->c64.x2;
-		box->ur.y = bp->c64.y1;
+		box->ul.x = bp->v0.x1;
+		box->ul.y = bp->v0.y1;
+		box->ur.x = bp->v0.x2;
+		box->ur.y = bp->v0.y1;
 
-		box->ll.x = bp->c64.x1;
-		box->ll.y = bp->c64.y2;
-		box->lr.x = bp->c64.x2;
-		box->lr.y = bp->c64.y2;
+		box->ll.x = bp->v0.x1;
+		box->ll.y = bp->v0.y2;
+		box->lr.x = bp->v0.x2;
+		box->lr.y = bp->v0.y2;
 
-		if ((bp->c64.mask & 0x88) == 0x88) {
+		if ((bp->v0.mask & 0x88) == 0x88) {
 			// walkbox for (right/left) corner
-			if (bp->c64.mask & 0x04)
+			if (bp->v0.mask & 0x04)
 				box->ur = box->ul;
 			else
 				box->ul = box->ur;
diff --git a/engines/scumm/boxes.h b/engines/scumm/boxes.h
index e554aea1b5..345d6a9d36 100644
--- a/engines/scumm/boxes.h
+++ b/engines/scumm/boxes.h
@@ -27,7 +27,7 @@
 
 namespace Scumm {
 
-#define SIZEOF_BOX_C64 5
+#define SIZEOF_BOX_V0 5
 #define SIZEOF_BOX_V2 8
 #define SIZEOF_BOX_V3 18
 #define SIZEOF_BOX 20
diff --git a/engines/scumm/charset-fontdata.cpp b/engines/scumm/charset-fontdata.cpp
index 29465584f8..16193f5503 100644
--- a/engines/scumm/charset-fontdata.cpp
+++ b/engines/scumm/charset-fontdata.cpp
@@ -420,7 +420,7 @@ static const byte germanCharsetDataV2[] = {
 	126, 10,
 };
 
-// German C64 MM.
+// German v0 MM.
 static const byte germanCharsetDataV0[] = {
 	36, 11,
 	42, 12,
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 9fe5296546..da6c1a2ae4 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1163,7 +1163,7 @@ byte NESCostumeLoader::increaseAnim(Actor *a, int slot) {
 	return (a->_cost.curpos[slot] != oldframe);
 }
 
-static const byte actorColorsMMC64[25] = {
+static const byte actorV0Colors[25] = {
 	0, 7, 2, 6, 9, 1, 3, 7, 7, 1, 1, 9, 1, 4, 5, 5, 4, 1, 0, 5, 4, 2, 2, 7, 7
 };
 
@@ -1178,8 +1178,8 @@ static const byte actorColorsMMC64[25] = {
 			dst[p + 1] = palette[pcolor]; \
 	}
 
-byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
-	const ActorC64* A = (const ActorC64 *)a;
+byte V0CostumeRenderer::drawLimb(const Actor *a, int limb) {
+	const Actor_v0* A = (const Actor_v0 *)a;
 
 	if (limb >= 8)
 		return 0;
@@ -1207,7 +1207,7 @@ byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
 	byte palette[4] = { 0, 0, 0, 0 };
 	if (_vm->getCurrentLights() & LIGHTMODE_actor_use_colors) {
 		palette[1] = 10;
-		palette[2] = actorColorsMMC64[_actorID];
+		palette[2] = actorV0Colors[_actorID];
 	} else {
 		palette[2] = 11;
 		palette[3] = 11;
@@ -1261,11 +1261,11 @@ byte C64CostumeRenderer::drawLimb(const Actor *a, int limb) {
 #undef LINE
 #undef MASK_AT
 
-void C64CostumeRenderer::setCostume(int costume, int shadow) {
+void V0CostumeRenderer::setCostume(int costume, int shadow) {
 	_loaded.loadCostume(costume);
 }
 
-void C64CostumeLoader::loadCostume(int id) {
+void V0CostumeLoader::loadCostume(int id) {
 	const byte *ptr = _vm->getResourceAddress(rtCostume, id);
 
 	_id = id;
@@ -1275,15 +1275,15 @@ void C64CostumeLoader::loadCostume(int id) {
 	_numColors = 0;
 	_numAnim = 0;
 	_mirror = 0;
-	_palette = &actorColorsMMC64[id];
+	_palette = &actorV0Colors[id];
 
 	_frameOffsets = _baseptr + READ_LE_UINT16(ptr + 5);
 	_dataOffsets = ptr;
 	_animCmds = _baseptr + READ_LE_UINT16(ptr + 7);
 }
 
-void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
-	ActorC64 *A = (ActorC64 *)a;
+void V0CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
+	Actor_v0 *A = (Actor_v0 *)a;
 
 	if(!a->_costume)
 		return;
@@ -1337,15 +1337,15 @@ void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 	}
 }
 
-byte C64CostumeLoader::getFrame(Actor *a, int limb) {
+byte V0CostumeLoader::getFrame(Actor *a, int limb) {
 	loadCostume(a->_costume);
 
 	// Get the frame number for the current limb / Command
 	return _frameOffsets[_frameOffsets[limb] + a->_cost.start[limb]];
 }
 
-byte C64CostumeLoader::increaseAnims(Actor *a) {
-	ActorC64 *A = (ActorC64 *)a;
+byte V0CostumeLoader::increaseAnims(Actor *a) {
+	Actor_v0 *A = (Actor_v0 *)a;
 	int i;
 	byte r = 0;
 
@@ -1356,8 +1356,8 @@ byte C64CostumeLoader::increaseAnims(Actor *a) {
 	return r;
 }
 
-byte C64CostumeLoader::increaseAnim(Actor *a, int limb) {
-	ActorC64 *A = (ActorC64 *)a;
+byte V0CostumeLoader::increaseAnim(Actor *a, int limb) {
+	Actor_v0 *A = (Actor_v0 *)a;
 	const uint16 limbPrevious = a->_cost.curpos[limb]++;
 
 	loadCostume(a->_costume);
diff --git a/engines/scumm/costume.h b/engines/scumm/costume.h
index 16317cb1c9..4a21692ddb 100644
--- a/engines/scumm/costume.h
+++ b/engines/scumm/costume.h
@@ -67,9 +67,9 @@ protected:
 	byte increaseAnim(Actor *a, int slot);
 };
 
-class C64CostumeLoader : public ClassicCostumeLoader {
+class V0CostumeLoader : public ClassicCostumeLoader {
 public:
-	C64CostumeLoader(ScummEngine *vm) : ClassicCostumeLoader(vm) {}
+	V0CostumeLoader(ScummEngine *vm) : ClassicCostumeLoader(vm) {}
 	void loadCostume(int id);
 	void costumeDecodeData(Actor *a, int frame, uint usemask);
 	byte increaseAnims(Actor *a);
@@ -131,12 +131,12 @@ public:
 };
 #endif
 
-class C64CostumeRenderer : public BaseCostumeRenderer {
+class V0CostumeRenderer : public BaseCostumeRenderer {
 protected:
-	C64CostumeLoader _loaded;
+	V0CostumeLoader _loaded;
 
 public:
-	C64CostumeRenderer(ScummEngine *vm) : BaseCostumeRenderer(vm), _loaded(vm) {}
+	V0CostumeRenderer(ScummEngine *vm) : BaseCostumeRenderer(vm), _loaded(vm) {}
 
 	void setPalette(uint16 *palette) {}
 	void setFacing(const Actor *a) {}
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index a6b8377d2f..bc6cfc761e 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -240,7 +240,7 @@ GdiPCEngine::~GdiPCEngine() {
 #endif
 
 GdiV1::GdiV1(ScummEngine *vm) : Gdi(vm) {
-	memset(&_C64, 0, sizeof(_C64));
+	memset(&_V1, 0, sizeof(_V1));
 }
 
 GdiV2::GdiV2(ScummEngine *vm) : Gdi(vm) {
@@ -297,17 +297,17 @@ void GdiPCEngine::loadTiles(byte *roomptr) {
 
 void GdiV1::roomChanged(byte *roomptr) {
 	for (int i = 0; i < 4; i++){
-		_C64.colors[i] = roomptr[6 + i];
+		_V1.colors[i] = roomptr[6 + i];
 	}
-	decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 10), _C64.charMap, 2048);
-	decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 12), _C64.picMap, roomptr[4] * roomptr[5]);
-	decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 14), _C64.colorMap, roomptr[4] * roomptr[5]);
-	decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 16), _C64.maskMap, roomptr[4] * roomptr[5]);
+	decodeV1Gfx(roomptr + READ_LE_UINT16(roomptr + 10), _V1.charMap, 2048);
+	decodeV1Gfx(roomptr + READ_LE_UINT16(roomptr + 12), _V1.picMap, roomptr[4] * roomptr[5]);
+	decodeV1Gfx(roomptr + READ_LE_UINT16(roomptr + 14), _V1.colorMap, roomptr[4] * roomptr[5]);
+	decodeV1Gfx(roomptr + READ_LE_UINT16(roomptr + 16), _V1.maskMap, roomptr[4] * roomptr[5]);
 
 	// Read the mask data. The 16bit length value seems to always be 8 too big.
 	// See bug #1837375 for details on this.
 	const byte *maskPtr = roomptr + READ_LE_UINT16(roomptr + 18);
-	decodeC64Gfx(maskPtr + 2, _C64.maskChar, READ_LE_UINT16(maskPtr) - 8);
+	decodeV1Gfx(maskPtr + 2, _V1.maskChar, READ_LE_UINT16(maskPtr) - 8);
 	_objectMode = true;
 }
 
@@ -1541,7 +1541,7 @@ void GdiV1::prepareDrawBitmap(const byte *ptr, VirtScreen *vs,
 					const int x, const int y, const int width, const int height,
 	                int stripnr, int numstrip) {
 	if (_objectMode) {
-		decodeC64Gfx(ptr, _C64.objectMap, (width / 8) * (height / 8) * 3);
+		decodeV1Gfx(ptr, _V1.objectMap, (width / 8) * (height / 8) * 3);
 	}
 }
 
@@ -1928,9 +1928,9 @@ bool GdiPCEngine::drawStrip(byte *dstPtr, VirtScreen *vs, int x, int y, const in
 bool GdiV1::drawStrip(byte *dstPtr, VirtScreen *vs, int x, int y, const int width, const int height,
 					int stripnr, const byte *smap_ptr) {
 	if (_objectMode)
-		drawStripC64Object(dstPtr, vs->pitch, stripnr, width, height);
+		drawStripV1Object(dstPtr, vs->pitch, stripnr, width, height);
 	else
-		drawStripC64Background(dstPtr, vs->pitch, stripnr, height);
+		drawStripV1Background(dstPtr, vs->pitch, stripnr, height);
 
 	return false;
 }
@@ -2071,7 +2071,7 @@ void GdiV1::decodeMask(int x, int y, const int width, const int height,
 	                int stripnr, int numzbuf, const byte *zplane_list[9],
 	                bool transpStrip, byte flag) {
 	byte *mask_ptr = getMaskBuffer(x, y, 1);
-	drawStripC64Mask(mask_ptr, stripnr, width, height);
+	drawStripV1Mask(mask_ptr, stripnr, width, height);
 }
 
 void GdiV2::decodeMask(int x, int y, const int width, const int height,
@@ -3089,67 +3089,67 @@ void GdiPCEngine::drawStripPCEngineMask(byte *dst, int stripnr, int top, int hei
 }
 #endif
 
-void GdiV1::drawStripC64Background(byte *dst, int dstPitch, int stripnr, int height) {
+void GdiV1::drawStripV1Background(byte *dst, int dstPitch, int stripnr, int height) {
 	int charIdx;
 	height /= 8;
 	for (int y = 0; y < height; y++) {
-		_C64.colors[3] = (_C64.colorMap[y + stripnr * height] & 7);
+		_V1.colors[3] = (_V1.colorMap[y + stripnr * height] & 7);
 		// Check for room color change in V1 zak
 		if (_roomPalette[0] == 255) {
-			_C64.colors[2] = _roomPalette[2];
-			_C64.colors[1] = _roomPalette[1];
+			_V1.colors[2] = _roomPalette[2];
+			_V1.colors[1] = _roomPalette[1];
 		}
 
-		charIdx = _C64.picMap[y + stripnr * height] * 8;
+		charIdx = _V1.picMap[y + stripnr * height] * 8;
 		for (int i = 0; i < 8; i++) {
-			byte c = _C64.charMap[charIdx + i];
-			dst[0] = dst[1] = _C64.colors[(c >> 6) & 3];
-			dst[2] = dst[3] = _C64.colors[(c >> 4) & 3];
-			dst[4] = dst[5] = _C64.colors[(c >> 2) & 3];
-			dst[6] = dst[7] = _C64.colors[(c >> 0) & 3];
+			byte c = _V1.charMap[charIdx + i];
+			dst[0] = dst[1] = _V1.colors[(c >> 6) & 3];
+			dst[2] = dst[3] = _V1.colors[(c >> 4) & 3];
+			dst[4] = dst[5] = _V1.colors[(c >> 2) & 3];
+			dst[6] = dst[7] = _V1.colors[(c >> 0) & 3];
 			dst += dstPitch;
 		}
 	}
 }
 
-void GdiV1::drawStripC64Object(byte *dst, int dstPitch, int stripnr, int width, int height) {
+void GdiV1::drawStripV1Object(byte *dst, int dstPitch, int stripnr, int width, int height) {
 	int charIdx;
 	height /= 8;
 	width /= 8;
 	for (int y = 0; y < height; y++) {
-		_C64.colors[3] = (_C64.objectMap[(y + height) * width + stripnr] & 7);
-		charIdx = _C64.objectMap[y * width + stripnr] * 8;
+		_V1.colors[3] = (_V1.objectMap[(y + height) * width + stripnr] & 7);
+		charIdx = _V1.objectMap[y * width + stripnr] * 8;
 		for (int i = 0; i < 8; i++) {
-			byte c = _C64.charMap[charIdx + i];
-			dst[0] = dst[1] = _C64.colors[(c >> 6) & 3];
-			dst[2] = dst[3] = _C64.colors[(c >> 4) & 3];
-			dst[4] = dst[5] = _C64.colors[(c >> 2) & 3];
-			dst[6] = dst[7] = _C64.colors[(c >> 0) & 3];
+			byte c = _V1.charMap[charIdx + i];
+			dst[0] = dst[1] = _V1.colors[(c >> 6) & 3];
+			dst[2] = dst[3] = _V1.colors[(c >> 4) & 3];
+			dst[4] = dst[5] = _V1.colors[(c >> 2) & 3];
+			dst[6] = dst[7] = _V1.colors[(c >> 0) & 3];
 			dst += dstPitch;
 		}
 	}
 }
 
-void GdiV1::drawStripC64Mask(byte *dst, int stripnr, int width, int height) const {
+void GdiV1::drawStripV1Mask(byte *dst, int stripnr, int width, int height) const {
 	int maskIdx;
 	height /= 8;
 	width /= 8;
 	for (int y = 0; y < height; y++) {
 		if (_objectMode)
-			maskIdx = _C64.objectMap[(y + 2 * height) * width + stripnr] * 8;
+			maskIdx = _V1.objectMap[(y + 2 * height) * width + stripnr] * 8;
 		else
-			maskIdx = _C64.maskMap[y + stripnr * height] * 8;
+			maskIdx = _V1.maskMap[y + stripnr * height] * 8;
 		for (int i = 0; i < 8; i++) {
-			byte c = _C64.maskChar[maskIdx + i];
+			byte c = _V1.maskChar[maskIdx + i];
 
-			// V1/C64 masks are inverted compared to what ScummVM expects
+			// V1/V0 masks are inverted compared to what ScummVM expects
 			*dst = c ^ 0xFF;
 			dst += _numStrips;
 		}
 	}
 }
 
-void GdiV1::decodeC64Gfx(const byte *src, byte *dst, int size) const {
+void GdiV1::decodeV1Gfx(const byte *src, byte *dst, int size) const {
 	int x, z;
 	byte color, run, common[4];
 
diff --git a/engines/scumm/gfx.h b/engines/scumm/gfx.h
index 4b44ddc376..0d81698c50 100644
--- a/engines/scumm/gfx.h
+++ b/engines/scumm/gfx.h
@@ -375,19 +375,19 @@ public:
 
 class GdiV1 : public Gdi {
 protected:
-	/** Render settings which are specific to the C64 graphic decoders. */
+	/** Render settings which are specific to the v0/v1 graphic decoders. */
 	struct {
 		byte colors[4];
 		byte charMap[2048], objectMap[2048], picMap[4096], colorMap[4096];
 		byte maskMap[4096], maskChar[4096];
-	} _C64;
+	} _V1;
 
 protected:
-	void decodeC64Gfx(const byte *src, byte *dst, int size) const;
+	void decodeV1Gfx(const byte *src, byte *dst, int size) const;
 
-	void drawStripC64Object(byte *dst, int dstPitch, int stripnr, int width, int height);
-	void drawStripC64Background(byte *dst, int dstPitch, int stripnr, int height);
-	void drawStripC64Mask(byte *dst, int stripnr, int width, int height) const;
+	void drawStripV1Object(byte *dst, int dstPitch, int stripnr, int width, int height);
+	void drawStripV1Background(byte *dst, int dstPitch, int stripnr, int height);
+	void drawStripV1Mask(byte *dst, int stripnr, int width, int height) const;
 
 	virtual bool drawStrip(byte *dstPtr, VirtScreen *vs,
 					int x, int y, const int width, const int height,
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index 4ef8707714..e38552c8f3 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -327,7 +327,7 @@ int ScummEngine::getObjectIndex(int object) const {
 int ScummEngine::whereIsObject(int object) const {
 	int i;
 
-	// Note: in MMC64 bg objects are greater _numGlobalObjects
+	// Note: in MM v0 bg objects are greater _numGlobalObjects
 	if (_game.version != 0 && object >= _numGlobalObjects)
 		return WIO_NOT_FOUND;
 
@@ -808,7 +808,7 @@ void ScummEngine_v3old::resetRoomObjects() {
 	else
 		ptr = room + 29;
 
-	// Default pointer of objects without image, in C64 verison of Maniac Mansion
+	// Default pointer of objects without image, in v0 version of Maniac Mansion
 	int defaultPtr = READ_LE_UINT16(ptr + 2 * _numObjectsInRoom);
 
 	for (i = 0; i < _numObjectsInRoom; i++) {
diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp
index 63cbef8944..9ee8fb93a9 100644
--- a/engines/scumm/room.cpp
+++ b/engines/scumm/room.cpp
@@ -747,7 +747,7 @@ void ScummEngine_v3old::resetRoomSubBlocks() {
 			}
 
 			ptr = roomptr + *(roomptr + 0x15);
-			size = numOfBoxes * SIZEOF_BOX_C64 + 1;
+			size = numOfBoxes * SIZEOF_BOX_V0 + 1;
 
 			_res->createResource(rtMatrix, 2, size + 1);
 			getResourceAddress(rtMatrix, 2)[0] = numOfBoxes;
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 3bd70d0e24..39420ee974 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1132,7 +1132,7 @@ void ScummEngine::checkAndRunSentenceScript() {
 
 void ScummEngine_v0::walkToActorOrObject(int object) {
 	int x, y, dir;
-	ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "walkToObject");
+	Actor_v0 *a = (Actor_v0 *)derefActor(VAR(VAR_EGO), "walkToObject");
 
 	_walkToObject = object;
 	_walkToObjectState = kWalkToObjectStateWalk;
@@ -1162,7 +1162,7 @@ bool ScummEngine_v0::checkPendingWalkAction() {
 		return false;
 
 	int actor = VAR(VAR_EGO);
-	ActorC64 *a = (ActorC64 *)derefActor(actor, "checkPendingWalkAction");
+	Actor_v0 *a = (Actor_v0 *)derefActor(actor, "checkPendingWalkAction");
 
 	// wait until walking or turning action is finished
 	if (a->_moving)
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 07be151ce2..45901186cd 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -51,7 +51,7 @@ void ScummEngine_v0::setupOpcodes() {
 	OPCODE(0x0b, o_setActorBitVar);
 	/* 0C */
 	OPCODE(0x0c, o_loadSound);
-	OPCODE(0x0d, o_printEgo_c64);
+	OPCODE(0x0d, o_printEgo);
 	OPCODE(0x0e, o_putActorAtObject);
 	OPCODE(0x0f, o2_clearState02);
 	/* 10 */
@@ -60,7 +60,7 @@ void ScummEngine_v0::setupOpcodes() {
 	OPCODE(0x12, o2_panCameraTo);
 	OPCODE(0x13, o_lockCostume);
 	/* 14 */
-	OPCODE(0x14, o_print_c64);
+	OPCODE(0x14, o_print);
 	OPCODE(0x15, o5_walkActorToActor);
 	OPCODE(0x16, o5_getRandomNr);
 	OPCODE(0x17, o2_clearState08);
@@ -92,7 +92,7 @@ void ScummEngine_v0::setupOpcodes() {
 	/* 2C */
 	OPCODE(0x2c, o_stopCurrentScript);
 	OPCODE(0x2d, o2_putActorInRoom);
-	OPCODE(0x2e, o_print_c64);
+	OPCODE(0x2e, o_print);
 	OPCODE(0x2f, o2_ifState08);
 	/* 30 */
 	OPCODE(0x30, o_loadCostume);
@@ -181,7 +181,7 @@ void ScummEngine_v0::setupOpcodes() {
 	OPCODE(0x73, o_getObjectOwner);
 	/* 74 */
 	OPCODE(0x74, o5_getDist);
-	OPCODE(0x75, o_printEgo_c64);
+	OPCODE(0x75, o_printEgo);
 	OPCODE(0x76, o_walkActorToObject);
 	OPCODE(0x77, o2_clearState04);
 	/* 78 */
@@ -252,7 +252,7 @@ void ScummEngine_v0::setupOpcodes() {
 	/* AC */
 	OPCODE(0xac, o_stopCurrentScript);
 	OPCODE(0xad, o2_putActorInRoom);
-	OPCODE(0xae, o_print_c64);
+	OPCODE(0xae, o_print);
 	OPCODE(0xaf, o2_ifNotState08);
 	/* B0 */
 	OPCODE(0xb0, o_loadCostume);
@@ -575,13 +575,13 @@ void ScummEngine_v0::o_loadRoom() {
 }
 
 void ScummEngine_v0::o_loadRoomWithEgo() {
-	ActorC64 *a;
+	Actor_v0 *a;
 	int obj, room, x, y, dir;
 
 	obj = fetchScriptByte();
 	room = fetchScriptByte();
 
-	a = (ActorC64 *)derefActor(VAR(VAR_EGO), "o_loadRoomWithEgo");
+	a = (Actor_v0 *)derefActor(VAR(VAR_EGO), "o_loadRoomWithEgo");
 
 	//0x634F
 	if (a->_miscflags & kActorMiscFlagFreeze) {
@@ -685,7 +685,7 @@ void ScummEngine_v0::o_animateActor() {
 	int anim = getVarOrDirectByte(PARAM_2);
 	int8 repeat = (int8) fetchScriptByte();
 
-	ActorC64 *a = (ActorC64*) derefActor(act, "o_animateActor");
+	Actor_v0 *a = (Actor_v0*) derefActor(act, "o_animateActor");
 
 	a->_animFrameRepeat = repeat;
 	
@@ -789,7 +789,7 @@ void ScummEngine_v0::o_setActorBitVar() {
 	if (act >= _numActors)
 		return;
 
-	ActorC64 *a = (ActorC64 *)derefActor(act, "o_setActorBitVar");
+	Actor_v0 *a = (Actor_v0 *)derefActor(act, "o_setActorBitVar");
 
 	if (mod)
 		a->_miscflags |= mask;
@@ -814,7 +814,7 @@ void ScummEngine_v0::o_getActorBitVar() {
 	byte act = getVarOrDirectByte(PARAM_1);
 	byte mask = getVarOrDirectByte(PARAM_2);
 
-	ActorC64 *a = (ActorC64 *)derefActor(act, "o_getActorBitVar");
+	Actor_v0 *a = (Actor_v0 *)derefActor(act, "o_getActorBitVar");
 	setResult((a->_miscflags & mask) ? 1 : 0);
 
 	debug(0, "o_getActorBitVar(%d, %d, %d)", act, mask, (a->_miscflags & mask));
@@ -843,12 +843,12 @@ void ScummEngine_v0::o_getBitVar() {
 	debug(0, "o_getBitVar (%d, %d %d)", flag, mask, _bitVars[flag] & (1 << mask));
 }
 
-void ScummEngine_v0::o_print_c64() {
+void ScummEngine_v0::o_print() {
 	_actorToPrintStrFor = fetchScriptByte();
 	decodeParseString();
 }
 
-void ScummEngine_v0::o_printEgo_c64() {
+void ScummEngine_v0::o_printEgo() {
 	_actorToPrintStrFor = (byte)VAR(VAR_EGO);
 	decodeParseString();
 }
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 1b8dc965e0..9c8742cffd 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -401,7 +401,7 @@ void ScummEngine_v2::decodeParseString() {
 	_string[textSlot].overhead = false;
 
 	if (_game.id == GID_MANIAC && _actorToPrintStrFor == 0xFF) {
-		if (_game.platform == Common::kPlatformC64) {
+		if (_game.version == 0) {
 			_string[textSlot].color = 14;
 		} else if (_game.features & GF_DEMO) {
 			_string[textSlot].color = (_game.version == 2) ? 15 : 1;
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index d8b02d0881..fc46f88df4 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1025,7 +1025,7 @@ Common::Error ScummEngine::init() {
 
 	// The	kGenUnchanged method is only used for 'container files', i.e. files
 	// that contain the real game files bundled together in an archive format.
-	// This is the case of the NES, C64 and Mac versions of certain games.
+	// This is the case of the NES, v0 and Mac versions of certain games.
 	// Note: All of these can also occur in 'extracted' form, in which case they
 	// are treated like any other SCUMM game.
 	if (_filenamePattern.genMethod == kGenUnchanged) {
@@ -1379,8 +1379,8 @@ void ScummEngine::setupCostumeRenderer() {
 		_costumeRenderer = new AkosRenderer(this);
 		_costumeLoader = new AkosCostumeLoader(this);
 	} else if (_game.version == 0) {
-		_costumeRenderer = new C64CostumeRenderer(this);
-		_costumeLoader = new C64CostumeLoader(this);
+		_costumeRenderer = new V0CostumeRenderer(this);
+		_costumeLoader = new V0CostumeLoader(this);
 	} else if (_game.platform == Common::kPlatformNES) {
 		_costumeRenderer = new NESCostumeRenderer(this);
 		_costumeLoader = new NESCostumeLoader(this);
@@ -1459,7 +1459,7 @@ void ScummEngine::resetScumm() {
 	_sortedActors = new Actor * [_numActors];
 	for (i = 0; i < _numActors; ++i) {
 		if (_game.version == 0)
-			_actors[i] = new ActorC64(this, i);
+			_actors[i] = new Actor_v0(this, i);
 		else if (_game.version <= 2)
 			_actors[i] = new Actor_v2(this, i);
 		else if (_game.version == 3)
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 982b62d645..1341b9ed15 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -118,7 +118,7 @@ protected:
 
 	virtual int getCurrentLights() const;
 
-	/* Version C64 script opcodes */
+	/* Version 0 script opcodes */
 	void o_stopCurrentScript();
 	void o_walkActorToObject();
 	void o_loadSound();
@@ -150,8 +150,8 @@ protected:
 	void o_ifEqualActiveObject2();
 	void o_ifNotEqualActiveObject2();
 	void o_getClosestActor();
-	void o_printEgo_c64();
-	void o_print_c64();
+	void o_printEgo();
+	void o_print();
 	void o_unlockRoom();
 	void o_unlockSound();
 	void o_cutscene();
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 88a1283067..567ca31485 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -705,7 +705,7 @@ void ScummEngine_v0::verbExec() {
 		return;
 	}
 
-	ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "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();
@@ -730,7 +730,7 @@ bool ScummEngine_v0::checkSentenceComplete() {
 }
 
 void ScummEngine_v0::checkExecVerbs() {
-	ActorC64 *a = (ActorC64 *)derefActor(VAR(VAR_EGO), "checkExecVerbs");
+	Actor_v0 *a = (Actor_v0 *)derefActor(VAR(VAR_EGO), "checkExecVerbs");
 	VirtScreen *zone = findVirtScreen(_mouse.y);
 
 	bool execute = false;
-- 
cgit v1.2.3


From 163f698cf0f0f9fb66fd5e782c74d64ea598c953 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Sun, 5 Feb 2012 16:35:44 +1100
Subject: SCUMM: Few changes for animations, dont move while turning & not
 necessary to call animateactor during startanimactor

---
 engines/scumm/actor.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index ee655dec33..bcacdc3b5a 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -350,6 +350,10 @@ 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)) {
@@ -384,6 +388,10 @@ int Actor::actorWalkStep() {
 		_moving &= ~MF_IN_LEG;
 		return 0;
 	}
+
+	if(_vm->_game.version == 0)
+		((Actor_v0 *)this)->animateActor(newDirToOldDir(_facing));
+
 	return 1;
 }
 
@@ -583,8 +591,6 @@ void Actor_v2::walkActor() {
 	if (_moving & MF_IN_LEG) {
 		actorWalkStep();
 
-		if(_vm->_game.version == 0)
-			((Actor_v0 *)this)->animateActor(newDirToOldDir(_facing));
 	} else {
 		if (_moving & MF_LAST_LEG) {
 			_moving = 0;
@@ -1886,8 +1892,8 @@ void Actor_v0::startAnimActor(int f) {
 
 	if(f == _standFrame)
 		setDirection(_facing);
-	else
-		animateActor(newDirToOldDir(_facing));
+	//else
+	//	animateActor(newDirToOldDir(_facing));
 }
 
 void Actor::animateActor(int anim) {
-- 
cgit v1.2.3


From 6c40b3f36f152f05313d19d048193541f91bca6b Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Sun, 5 Feb 2012 18:53:50 +1100
Subject: SCUMM: Remove old code

---
 engines/scumm/actor.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index bcacdc3b5a..bc336292dc 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1892,8 +1892,6 @@ void Actor_v0::startAnimActor(int f) {
 
 	if(f == _standFrame)
 		setDirection(_facing);
-	//else
-	//	animateActor(newDirToOldDir(_facing));
 }
 
 void Actor::animateActor(int anim) {
-- 
cgit v1.2.3


From ef56bd6de2403e8a5f88ef49933207147b497783 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 5 Feb 2012 15:40:52 +0100
Subject: SCUMM: add support for diagonal walking between boxes (e.g. used for
 meteor opening scene)

---
 engines/scumm/actor.cpp | 93 ++++++++++++++++++++++++++++++++++++++++++++-----
 engines/scumm/actor.h   |  5 ++-
 2 files changed, 89 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index bc336292dc..1ba0eafc06 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -567,6 +567,90 @@ 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;
+}
+
 void Actor_v2::walkActor() {
 	Common::Point foundPath, tmp;
 	int new_dir, next_box;
@@ -618,14 +702,7 @@ void Actor_v2::walkActor() {
 
 				_walkdata.curbox = next_box;
 
-				// WORKAROUND: The route of the meteor landing in the introduction isn't correct.
-				// MM V0 in contrast to MM V2 uses two walkboxes instead of just one. Hence a route
-				// from walkbox 1 to 0 is calculated first. This causes the meteor to fly on a
-				// horizontal line to walkbox 0 then vertically to the ground.
-				// To fix this problem, the box-to-box routing has been disabled in room 33.
-				if (_vm->_game.version == 0 && _vm->_currentRoom == 33) {
-					foundPath = _walkdata.dest;
-				} else {
+				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);
 				}
diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 69cfbfe398..0ed239d005 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -333,6 +333,7 @@ public:
 protected:
 	virtual bool isPlayer();
 	virtual void prepareDrawActorCostume(BaseCostumeRenderer *bcr);
+	virtual bool checkWalkboxesHaveDirectPath(Common::Point &foundPath);
 };
 
 enum ActorV0MiscFlags {
@@ -376,7 +377,9 @@ public:
 	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);
 };
 
 
-- 
cgit v1.2.3


From 0aabf95cb84620f7b5a84b09ceddf5d46d93323c Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Mon, 6 Feb 2012 08:06:48 +0100
Subject: SCUMM: match style-guide, add missing spaces between some "if ()",
 "for ()"

---
 engines/scumm/actor.cpp      | 26 +++++++++++++-------------
 engines/scumm/costume.cpp    | 22 +++++++++++-----------
 engines/scumm/player_pce.cpp | 22 +++++++++++-----------
 3 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 1ba0eafc06..3989d0f803 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -184,7 +184,7 @@ void Actor_v0::initActor(int mode) {
 	_speaking = 0;
 
 	_animFrameRepeat = 0;
-	for(int i = 0; i < 8; ++i) {
+	for (int i = 0; i < 8; ++i) {
 		_limbFrameRepeatNew[i] = 0;
 		_limbFrameRepeat[i] = 0;
 		_limb_flipped[i] = false;
@@ -250,7 +250,7 @@ void Actor::stopActorMoving() {
 		_vm->stopScript(_walkScript);
 
 	_moving = 0;
-	if(_vm->_game.version == 0)
+	if (_vm->_game.version == 0)
 		((Actor_v0 *)this)->setDirection(_facing);
 }
 
@@ -339,7 +339,7 @@ int Actor::actorWalkStep() {
 	int distX, distY;
 	int nextFacing;
 
-	if(_vm->_game.version == 0)
+	if (_vm->_game.version == 0)
 		((Actor_v0 *)this)->_animFrameRepeat = -1;
 
 	_needRedraw = true;
@@ -352,7 +352,7 @@ int Actor::actorWalkStep() {
 		_moving |= MF_IN_LEG;
 
 		// V0: Don't move during the turn
-		if(_vm->_game.version == 0)
+		if (_vm->_game.version == 0)
 			return 0;
 	}
 
@@ -389,7 +389,7 @@ int Actor::actorWalkStep() {
 		return 0;
 	}
 
-	if(_vm->_game.version == 0)
+	if (_vm->_game.version == 0)
 		((Actor_v0 *)this)->animateActor(newDirToOldDir(_facing));
 
 	return 1;
@@ -1000,7 +1000,7 @@ void Actor_v0::setDirection(int direction) {
 	
 	_animFrameRepeat = -1;
 	animateActor(res);
-	if(_moving)
+	if (_moving)
 		animateCostume();
 }
 
@@ -1090,7 +1090,7 @@ 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)
 		setDirection(oldDirToNewDir(2));
 }
 
@@ -1194,7 +1194,7 @@ static int checkXYInBoxBounds(int boxnum, int x, int y, int &destX, int &destY)
 	int yDist = ABS(y - destY) / 4;
 	int dist;
 
-	if(g_scumm->_game.version == 0)
+	if (g_scumm->_game.version == 0)
 		xDist *= 2;
 
 	if (xDist < yDist)
@@ -1416,7 +1416,7 @@ void Actor::showActor() {
 		
 		a->_costCommand = a->_costCommandNew = 0xFF;
 
-		for(int i = 0; i < 8; ++i) {
+		for (int i = 0; i < 8; ++i) {
 			a->_limbFrameRepeat[i] = 0;
 			a->_limbFrameRepeatNew[i] = 0;
 		}
@@ -1967,7 +1967,7 @@ void Actor_v0::startAnimActor(int f) {
 		return;
 	}
 
-	if(f == _standFrame)
+	if (f == _standFrame)
 		setDirection(_facing);
 }
 
@@ -2886,19 +2886,19 @@ void Actor_v0::animateActor(int anim) {
 			break;
 	}
 
-	if(isInCurrentRoom()) {
+	if (isInCurrentRoom()) {
 
 		_costCommandNew = anim;
 		_vm->_costumeLoader->costumeDecodeData(this, 0, 0);
 		
-		if(dir == -1)
+		if (dir == -1)
 			return;
 
 		_facing = normalizeAngle(oldDirToNewDir(dir));
 
 	} else {
 
-		if(anim > 4 && anim <= 7)
+		if (anim > 4 && anim <= 7)
 			_facing = normalizeAngle(oldDirToNewDir(dir));
 	}
 }
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index da6c1a2ae4..5f0df3566a 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1190,7 +1190,7 @@ byte V0CostumeRenderer::drawLimb(const Actor *a, int limb) {
 	}
 	
 	// Invalid current position?
-	if(a->_cost.curpos[limb] == 0xFFFF)
+	if (a->_cost.curpos[limb] == 0xFFFF)
 		return 0;
 
 	_loaded.loadCostume(a->_costume);
@@ -1285,13 +1285,13 @@ void V0CostumeLoader::loadCostume(int id) {
 void V0CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 	Actor_v0 *A = (Actor_v0 *)a;
 
-	if(!a->_costume)
+	if (!a->_costume)
 		return;
 
 	loadCostume(a->_costume);
 
 	// Invalid costume command?
-	if(A->_costCommandNew == 0xFF || (A->_costCommand == A->_costCommandNew))
+	if (A->_costCommandNew == 0xFF || (A->_costCommand == A->_costCommandNew))
 		return;
 
 	A->_costCommand = A->_costCommandNew;
@@ -1308,16 +1308,16 @@ void V0CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 		limbFrameNumber = ((_animCmds + cmd)[limb]);
 
 		// Is this limb flipped?
-		if(limbFrameNumber & 0x80) {
+		if (limbFrameNumber & 0x80) {
 
 			// Invalid frame?
-			if(limbFrameNumber == 0xFF)
+			if (limbFrameNumber == 0xFF)
 				continue;
 
 			// Store the limb frame number (clear the flipped status)
 			a->_cost.frame[limb] = (limbFrameNumber & 0x7f);
 
-			if(A->_limb_flipped[limb] != true)
+			if (A->_limb_flipped[limb] != true)
 				a->_cost.start[limb] = 0xFFFF;
 
 			A->_limb_flipped[limb] = true;
@@ -1326,7 +1326,7 @@ void V0CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 			//Store the limb frame number
 			a->_cost.frame[limb] = limbFrameNumber;
 
-			if(A->_limb_flipped[limb] != false)
+			if (A->_limb_flipped[limb] != false)
 				a->_cost.start[limb] = 0xFFFF;
 
 			A->_limb_flipped[limb] = false;
@@ -1349,7 +1349,7 @@ byte V0CostumeLoader::increaseAnims(Actor *a) {
 	int i;
 	byte r = 0;
 
-	for(i = 0; i != 8; i++) {
+	for (i = 0; i != 8; i++) {
 		A->limbFrameCheck(i);
 		r += increaseAnim(a, i);
 	}
@@ -1369,7 +1369,7 @@ byte V0CostumeLoader::increaseAnim(Actor *a, int limb) {
 	if (frame == 0xFF) {
 
 		// Repeat timer has reached 0?
-		if(A->_limbFrameRepeat[limb] == 0) {
+		if (A->_limbFrameRepeat[limb] == 0) {
 
 			// Use the previous frame
 			--A->_cost.curpos[limb];
@@ -1385,7 +1385,7 @@ byte V0CostumeLoader::increaseAnim(Actor *a, int limb) {
 		} else {
 
 			// Repeat timer enabled?
-			if(A->_limbFrameRepeat[limb] != -1)
+			if (A->_limbFrameRepeat[limb] != -1)
 				--A->_limbFrameRepeat[limb];
 
 			// No, restart at frame 0
@@ -1394,7 +1394,7 @@ byte V0CostumeLoader::increaseAnim(Actor *a, int limb) {
 	}
 
 	// Limb frame has changed?
-	if(limbPrevious == a->_cost.curpos[limb])
+	if (limbPrevious == a->_cost.curpos[limb])
 		return 0;
 
 	return 1;
diff --git a/engines/scumm/player_pce.cpp b/engines/scumm/player_pce.cpp
index 786971c683..8d886ee008 100644
--- a/engines/scumm/player_pce.cpp
+++ b/engines/scumm/player_pce.cpp
@@ -269,13 +269,13 @@ void PSG_HuC6280::init() {
 	reset();
 
 	// Make waveform frequency table
-	for(i = 0; i < 4096; i++) {
+	for (i = 0; i < 4096; i++) {
 		step = ((_clock / _rate) * 4096) / (i+1);
 		_waveFreqTable[(1 + i) & 0xFFF] = (uint32)step;
 	}
 
 	// Make noise frequency table
-	for(i = 0; i < 32; i++) {
+	for (i = 0; i < 32; i++) {
 		step = ((_clock / _rate) * 32) / (i+1);
 		_noiseFreqTable[i] = (uint32)step;
 	}
@@ -283,7 +283,7 @@ void PSG_HuC6280::init() {
 	// Make volume table
 	// PSG_HuC6280 has 48dB volume range spread over 32 steps
 	step = 48.0 / 32.0;
-	for(i = 0; i < 31; i++) {
+	for (i = 0; i < 31; i++) {
 		_volumeTable[i] = (uint16)level;
 		level /= pow(10.0, step / 20.0);
 	}
@@ -323,7 +323,7 @@ void PSG_HuC6280::write(int offset, byte data) {
 
 	case 0x04: // Channel control (key-on, DDA mode, volume)
 		// 1-to-0 transition of DDA bit resets waveform index
-		if((chan->control & 0x40) && ((data & 0x40) == 0)) {
+		if ((chan->control & 0x40) && ((data & 0x40) == 0)) {
 			chan->index = 0;
 		}
 		chan->control = data;
@@ -383,9 +383,9 @@ void PSG_HuC6280::update(int16* samples, int sampleCnt) {
 	// Clear buffer
 	memset(samples, 0, 2 * sampleCnt * sizeof(int16));
 
-	for(ch = 0; ch < 6; ch++) {
+	for (ch = 0; ch < 6; ch++) {
 		// Only look at enabled channels
-		if(_channel[ch].control & 0x80) {
+		if (_channel[ch].control & 0x80) {
 			int lal = (_channel[ch].balance >> 4) & 0x0F;
 			int ral = (_channel[ch].balance >> 0) & 0x0F;
 			int al  = _channel[ch].control & 0x1F;
@@ -395,25 +395,25 @@ void PSG_HuC6280::update(int16* samples, int sampleCnt) {
 
 			// Calculate volume just as the patent says
 			vll = (0x1F - lal) + (0x1F - al) + (0x1F - lmal);
-			if(vll > 0x1F) vll = 0x1F;
+			if (vll > 0x1F) vll = 0x1F;
 
 			vlr = (0x1F - ral) + (0x1F - al) + (0x1F - rmal);
-			if(vlr > 0x1F) vlr = 0x1F;
+			if (vlr > 0x1F) vlr = 0x1F;
 
 			vll = _volumeTable[vll];
 			vlr = _volumeTable[vlr];
 
 			// Check channel mode
-			if(_channel[ch].control & 0x40) {
+			if (_channel[ch].control & 0x40) {
 				/* DDA mode */
-				for(i = 0; i < sampleCnt; i++) {
+				for (i = 0; i < sampleCnt; i++) {
 					samples[2*i]     += (int16)(vll * (_channel[ch].dda - 16));
 					samples[2*i + 1] += (int16)(vlr * (_channel[ch].dda - 16));
 				}
 			} else {
 				/* Waveform mode */
 				uint32 step = _waveFreqTable[_channel[ch].frequency];
-				for(i = 0; i < sampleCnt; i += 1) {
+				for (i = 0; i < sampleCnt; i += 1) {
 					int offset;
 					int16 data;
 					offset = (_channel[ch].counter >> 12) & 0x1F;
-- 
cgit v1.2.3


From 4922055063b0a72069ffdbbe9e95c5b11f47bd71 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Fri, 10 Feb 2012 22:58:59 +0100
Subject: SCUMM: cleanup and separation of
 objIsActor()/objToActor()/actorToObj() for v0 and other engines

---
 engines/scumm/actor.cpp  |  6 ------
 engines/scumm/object.cpp | 33 ++++++++++++++++++---------------
 engines/scumm/scumm.h    |  6 +++---
 engines/scumm/scumm_v0.h |  4 ++++
 4 files changed, 25 insertions(+), 24 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 3989d0f803..9e1b91c338 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -657,15 +657,11 @@ void Actor_v2::walkActor() {
 
 	if (_moving & MF_TURN) {
 		new_dir = updateActorDirection(false);
-		
 		if (_facing != new_dir) {
-
 			setDirection(new_dir);
-
 		} else {
 			_moving = 0;
 		}
-
 		return;
 	}
 
@@ -674,7 +670,6 @@ void Actor_v2::walkActor() {
 
 	if (_moving & MF_IN_LEG) {
 		actorWalkStep();
-
 	} else {
 		if (_moving & MF_LAST_LEG) {
 			_moving = 0;
@@ -1423,7 +1418,6 @@ void Actor::showActor() {
 
 		_cost.reset();
 
-		// 0x39DF
 		a->_animFrameRepeat = 1;
 		a->_speaking = 0;
 
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index e38552c8f3..399cd91324 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -437,8 +437,8 @@ void ScummEngine::getObjectXYPos(int object, int &x, int &y, int &dir) {
 			x = od.walk_x;
 			y = od.walk_y;
 		} else {
-			x = od.x_pos + od.width/2;
-			y = od.y_pos + od.height/2;
+			x = od.x_pos + od.width / 2;
+			y = od.y_pos + od.height / 2;
 		}
 		x = x >> V12_X_SHIFT;
 		y = y >> V12_Y_SHIFT;
@@ -1488,26 +1488,29 @@ void ScummEngine::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id,
 	}
 }
 
-bool ScummEngine::objIsActor(int obj) {
+bool ScummEngine_v0::objIsActor(int obj) {
 	// object IDs < _numActors are used in v0 for objects too (e.g. hamster)
-	if (_game.version == 0)
-		return OBJECT_V0_TYPE(obj) == kObjectV0TypeActor;
-	else
-		return obj < _numActors;
+	return OBJECT_V0_TYPE(obj) == kObjectV0TypeActor;
+}
+
+int ScummEngine_v0::objToActor(int obj) {
+	return OBJECT_V0_ID(obj);
+}
+
+int ScummEngine_v0::actorToObj(int actor) {
+	return OBJECT_V0(actor, kObjectV0TypeActor);
+}
+
+bool ScummEngine::objIsActor(int obj) {
+	return obj < _numActors;
 }
 
 int ScummEngine::objToActor(int obj) {
-	if (_game.version == 0)
-		return OBJECT_V0_ID(obj);
-	else
-		return obj;
+	return obj;
 }
 
 int ScummEngine::actorToObj(int actor) {
-	if (_game.version == 0)
-		return OBJECT_V0(actor, kObjectV0TypeActor);
-	else
-		return actor;
+	return actor;
 }
 
 int ScummEngine::getObjX(int obj) {
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index f67536d3ed..2f1e536f0a 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -800,9 +800,9 @@ protected:
 	void setOwnerOf(int obj, int owner);
 	void clearOwnerOf(int obj);
 	int getObjectRoom(int obj) const;
-	bool objIsActor(int obj);
-	int objToActor(int obj);
-	int actorToObj(int actor);
+	virtual bool objIsActor(int obj);
+	virtual int objToActor(int obj);
+	virtual int actorToObj(int actor);
 	int getObjX(int obj);
 	int getObjY(int obj);
 	void getObjectXYPos(int object, int &x, int &y)	{ int dir; getObjectXYPos(object, x, y, dir); }
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 1341b9ed15..144dd701d4 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -81,6 +81,10 @@ protected:
 
 	virtual void saveOrLoad(Serializer *s);
 
+	virtual bool objIsActor(int obj);
+	virtual int objToActor(int obj);
+	virtual int actorToObj(int actor);
+
 	// V0 MM Verb commands
 	int getVerbPrepId();
 	int activeVerbPrep();
-- 
cgit v1.2.3


From 67d67ec4f6c867fab9ef5ff6f40c1f6144f0f77f Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Fri, 10 Feb 2012 23:39:07 +0100
Subject: SCUMM: replaced A with a0 to avoid upper-case local vars

---
 engines/scumm/actor.cpp   | 18 ++++++++---------
 engines/scumm/costume.cpp | 50 +++++++++++++++++++++++------------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 9e1b91c338..07c439043f 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1633,23 +1633,23 @@ void ScummEngine::processActors() {
 
 		if (_game.version == 0) {
 			// 0x057B
-			Actor_v0 *A = (Actor_v0*) a;
-			if (A->_speaking & 1)
-				A->_speaking ^= 0xFE;
+			Actor_v0 *a0 = (Actor_v0*) a;
+			if (a0->_speaking & 1)
+				a0->_speaking ^= 0xFE;
 
 			// 0x22B5
-			if (A->_miscflags & kActorMiscFlagHide)
+			if (a0->_miscflags & kActorMiscFlagHide)
 				continue;
 
 			// Sound
-			if (A->_moving  && _currentRoom != 1 && _currentRoom != 44) {
-				if (A->_cost.soundPos == 0)
-					A->_cost.soundCounter++;
+			if (a0->_moving  && _currentRoom != 1 && _currentRoom != 44) {
+				if (a0->_cost.soundPos == 0)
+					a0->_cost.soundCounter++;
 
 				// Is this the correct location?
 				// 0x073C
-				if (v0ActorTalkArray[A->_number] & 0x3F)
-					A->_cost.soundPos = (A->_cost.soundPos + 1) % 3;
+				if (v0ActorTalkArray[a0->_number] & 0x3F)
+					a0->_cost.soundPos = (a0->_cost.soundPos + 1) % 3;
 			}
 		}
 		// Draw and animate the actors, except those w/o a costume.
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 5f0df3566a..2bbf3b3801 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -1179,7 +1179,7 @@ static const byte actorV0Colors[25] = {
 	}
 
 byte V0CostumeRenderer::drawLimb(const Actor *a, int limb) {
-	const Actor_v0* A = (const Actor_v0 *)a;
+	const Actor_v0* a0 = (const Actor_v0 *)a;
 
 	if (limb >= 8)
 		return 0;
@@ -1224,7 +1224,7 @@ byte V0CostumeRenderer::drawLimb(const Actor *a, int limb) {
 	if (!width || !height)
 		return 0;
 
-	int xpos = _actorX + (A->_limb_flipped[limb] ? -1 : +1) * (offsetX * 8 - a->_width / 2);
+	int xpos = _actorX + (a0->_limb_flipped[limb] ? -1 : +1) * (offsetX * 8 - a->_width / 2);
 	// +1 as we appear to be 1 pixel away from the original interpreter
 	int ypos = _actorY - offsetY + 1;
 
@@ -1234,13 +1234,13 @@ byte V0CostumeRenderer::drawLimb(const Actor *a, int limb) {
 			byte color = data[y * width + x];
 			byte pcolor;
 
-			int destX = xpos + (A->_limb_flipped[limb] ? -(x + 1) : x) * 8;
+			int destX = xpos + (a0->_limb_flipped[limb] ? -(x + 1) : x) * 8;
 			int destY = ypos + y;
 
 			if (destY >= 0 && destY < _out.h && destX >= 0 && destX < _out.w) {
 				byte *dst = (byte *)_out.pixels + destY * _out.pitch + destX;
 				byte *mask = _vm->getMaskBuffer(0, destY, _zbuf);
-				if (A->_limb_flipped[limb]) {
+				if (a0->_limb_flipped[limb]) {
 					LINE(0, 0); LINE(2, 2); LINE(4, 4); LINE(6, 6);
 				} else {
 					LINE(6, 0); LINE(4, 2); LINE(2, 4); LINE(0, 6);
@@ -1251,7 +1251,7 @@ byte V0CostumeRenderer::drawLimb(const Actor *a, int limb) {
 
 	_draw_top = MIN(_draw_top, ypos);
 	_draw_bottom = MAX(_draw_bottom, ypos + height);
-	if (A->_limb_flipped[limb])
+	if (a0->_limb_flipped[limb])
 		_vm->markRectAsDirty(kMainVirtScreen, xpos - (width * 8), xpos, ypos, ypos + height, _actorID);
 	else
 		_vm->markRectAsDirty(kMainVirtScreen, xpos, xpos + (width * 8), ypos, ypos + height, _actorID);
@@ -1283,7 +1283,7 @@ void V0CostumeLoader::loadCostume(int id) {
 }
 
 void V0CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
-	Actor_v0 *A = (Actor_v0 *)a;
+	Actor_v0 *a0 = (Actor_v0 *)a;
 
 	if (!a->_costume)
 		return;
@@ -1291,12 +1291,12 @@ void V0CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 	loadCostume(a->_costume);
 
 	// Invalid costume command?
-	if (A->_costCommandNew == 0xFF || (A->_costCommand == A->_costCommandNew))
+	if (a0->_costCommandNew == 0xFF || (a0->_costCommand == a0->_costCommandNew))
 		return;
 
-	A->_costCommand = A->_costCommandNew;
+	a0->_costCommand = a0->_costCommandNew;
 
-	int cmd = A->_costCommand;
+	int cmd = a0->_costCommand;
 	byte limbFrameNumber = 0;
 
 	// Each costume-command has 8 limbs  (0x2622)
@@ -1317,23 +1317,23 @@ void V0CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
 			// Store the limb frame number (clear the flipped status)
 			a->_cost.frame[limb] = (limbFrameNumber & 0x7f);
 
-			if (A->_limb_flipped[limb] != true)
+			if (a0->_limb_flipped[limb] != true)
 				a->_cost.start[limb] = 0xFFFF;
 
-			A->_limb_flipped[limb] = true;
+			a0->_limb_flipped[limb] = true;
 
 		} else {
 			//Store the limb frame number
 			a->_cost.frame[limb] = limbFrameNumber;
 
-			if (A->_limb_flipped[limb] != false)
+			if (a0->_limb_flipped[limb] != false)
 				a->_cost.start[limb] = 0xFFFF;
 
-			A->_limb_flipped[limb] = false;
+			a0->_limb_flipped[limb] = false;
 		}
 
 		// Set the repeat value
-		A->_limbFrameRepeatNew[limb] = A->_animFrameRepeat;
+		a0->_limbFrameRepeatNew[limb] = a0->_animFrameRepeat;
 	}
 }
 
@@ -1345,19 +1345,19 @@ byte V0CostumeLoader::getFrame(Actor *a, int limb) {
 }
 
 byte V0CostumeLoader::increaseAnims(Actor *a) {
-	Actor_v0 *A = (Actor_v0 *)a;
+	Actor_v0 *a0 = (Actor_v0 *)a;
 	int i;
 	byte r = 0;
 
 	for (i = 0; i != 8; i++) {
-		A->limbFrameCheck(i);
+		a0->limbFrameCheck(i);
 		r += increaseAnim(a, i);
 	}
 	return r;
 }
 
 byte V0CostumeLoader::increaseAnim(Actor *a, int limb) {
-	Actor_v0 *A = (Actor_v0 *)a;
+	Actor_v0 *a0 = (Actor_v0 *)a;
 	const uint16 limbPrevious = a->_cost.curpos[limb]++;
 
 	loadCostume(a->_costume);
@@ -1369,24 +1369,24 @@ byte V0CostumeLoader::increaseAnim(Actor *a, int limb) {
 	if (frame == 0xFF) {
 
 		// Repeat timer has reached 0?
-		if (A->_limbFrameRepeat[limb] == 0) {
+		if (a0->_limbFrameRepeat[limb] == 0) {
 
 			// Use the previous frame
-			--A->_cost.curpos[limb];
+			--a0->_cost.curpos[limb];
 
 			// Reset the comstume command
-			A->_costCommandNew = 0xFF;
-			A->_costCommand = 0xFF;
+			a0->_costCommandNew = 0xFF;
+			a0->_costCommand = 0xFF;
 			
 			// Set the frame/start to invalid
-			A->_cost.frame[limb] = 0xFFFF;
-			A->_cost.start[limb] = 0xFFFF;
+			a0->_cost.frame[limb] = 0xFFFF;
+			a0->_cost.start[limb] = 0xFFFF;
 
 		} else {
 
 			// Repeat timer enabled?
-			if (A->_limbFrameRepeat[limb] != -1)
-				--A->_limbFrameRepeat[limb];
+			if (a0->_limbFrameRepeat[limb] != -1)
+				--a0->_limbFrameRepeat[limb];
 
 			// No, restart at frame 0
 			a->_cost.curpos[limb] = 0;
-- 
cgit v1.2.3


From 0d5b03d8daffa758a60feaea9a6515a0632cce72 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Fri, 10 Feb 2012 23:46:32 +0100
Subject: SCUMM: remove unnecessary cast to Actor_v0

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

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 07c439043f..53496428e3 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -251,7 +251,7 @@ void Actor::stopActorMoving() {
 
 	_moving = 0;
 	if (_vm->_game.version == 0)
-		((Actor_v0 *)this)->setDirection(_facing);
+		setDirection(_facing);
 }
 
 void Actor::setActorWalkSpeed(uint newSpeedX, uint newSpeedY) {
-- 
cgit v1.2.3


From 65fc7225bb31e72120dcdf16e91ae377c657548d Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 11 Feb 2012 00:10:58 +0100
Subject: SCUMM: revert savegame version to 89

Previous versions 89-92 are merged into version 89.
---
 engines/scumm/actor.cpp    |  7 +++----
 engines/scumm/saveload.cpp | 18 +++++++++---------
 engines/scumm/saveload.h   |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 53496428e3..dee601b273 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2902,14 +2902,13 @@ void Actor_v0::saveLoadWithSerializer(Serializer *ser) {
 
 	static const SaveLoadEntry actorEntries[] = {
 		MKLINE(Actor_v0, _costCommand, sleByte, VER(84)),
-		MK_OBSOLETE(Actor_v0, _costFrame, sleByte, VER(84), VER(89)),
+		MK_OBSOLETE(Actor_v0, _costFrame, sleByte, VER(84), VER(88)),
 		MKLINE(Actor_v0, _miscflags, sleByte, VER(84)),
 		MKLINE(Actor_v0, _speaking, sleByte, VER(84)),
-		MK_OBSOLETE(Actor_v0, _speakingPrev, sleByte, VER(84), VER(89)),
-		MK_OBSOLETE(Actor_v0, _limbTemp, sleByte, VER(89), VER(89)),
+		MK_OBSOLETE(Actor_v0, _speakingPrev, sleByte, VER(84), VER(88)),
 		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)),
+		MKARRAY(Actor_v0, _limbFrameRepeat[0], sleInt8, 8, VER(89)),
 		MKEND()
 	};
 
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 6e54377199..51a291b7f2 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1210,7 +1210,7 @@ void ScummEngine::saveOrLoad(Serializer *s) {
 			// Since roughly v13 of the save games, the objs storage has changed a bit
 			for (i = _numObjectsInRoom; i < _numLocalObjects; i++)
 				_objs[i].obj_nr = 0;
-		} else if (_game.version == 0 && s->getVersion() < VER(91)) {
+		} else if (_game.version == 0 && s->getVersion() < VER(89)) {
 			for (i = 0; i < _numLocalObjects; i++) {
 				// Merge object id and type (previously stored in flags)
 				if (_objs[i].obj_nr != 0 && OBJECT_V0_TYPE(_objs[i].obj_nr) == 0 && _objs[i].flags != 0)
@@ -1504,14 +1504,14 @@ void ScummEngine_v0::saveOrLoad(Serializer *s) {
 	const SaveLoadEntry v0Entrys[] = {
 		MKLINE(ScummEngine_v0, _currentMode, sleByte, VER(78)),
 		MKLINE(ScummEngine_v0, _currentLights, sleByte, VER(78)),
-		MKLINE(ScummEngine_v0, _activeVerb, sleByte, VER(92)),
-		MKLINE(ScummEngine_v0, _activeObject, sleUint16, VER(92)),
-		MKLINE(ScummEngine_v0, _activeObject2, sleUint16, VER(92)),
-		MKLINE(ScummEngine_v0, _cmdVerb, sleByte, VER(92)),
-		MKLINE(ScummEngine_v0, _cmdObject, sleUint16, VER(92)),
-		MKLINE(ScummEngine_v0, _cmdObject2, sleUint16, VER(92)),
-		MKLINE(ScummEngine_v0, _walkToObject, sleUint16, VER(92)),
-		MKLINE(ScummEngine_v0, _walkToObjectState, sleByte, VER(92)),
+		MKLINE(ScummEngine_v0, _activeVerb, sleByte, VER(89)),
+		MKLINE(ScummEngine_v0, _activeObject, sleUint16, VER(89)),
+		MKLINE(ScummEngine_v0, _activeObject2, sleUint16, VER(89)),
+		MKLINE(ScummEngine_v0, _cmdVerb, sleByte, VER(89)),
+		MKLINE(ScummEngine_v0, _cmdObject, sleUint16, VER(89)),
+		MKLINE(ScummEngine_v0, _cmdObject2, sleUint16, VER(89)),
+		MKLINE(ScummEngine_v0, _walkToObject, sleUint16, VER(89)),
+		MKLINE(ScummEngine_v0, _walkToObjectState, sleByte, VER(89)),
 		MKEND()
 	};
  	s->saveLoadEntries(this, v0Entrys);
diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h
index 90feee6dc0..898f80f867 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 92
+#define CURRENT_VER 89
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead
-- 
cgit v1.2.3


From 784472a6690f4be0ba7af4841dcd6b167c639a64 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 11 Feb 2012 10:55:55 +0100
Subject: Revert "SCUMM: revert savegame version to 89"

This reverts commit 65fc7225bb31e72120dcdf16e91ae377c657548d.

Increasing the savegame version on a branch and then decreasing it again
leads to problems with loading current savegames in old commits during
a bisect.
---
 engines/scumm/actor.cpp    |  7 ++++---
 engines/scumm/saveload.cpp | 18 +++++++++---------
 engines/scumm/saveload.h   |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index dee601b273..53496428e3 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2902,13 +2902,14 @@ void Actor_v0::saveLoadWithSerializer(Serializer *ser) {
 
 	static const SaveLoadEntry actorEntries[] = {
 		MKLINE(Actor_v0, _costCommand, sleByte, VER(84)),
-		MK_OBSOLETE(Actor_v0, _costFrame, sleByte, VER(84), VER(88)),
+		MK_OBSOLETE(Actor_v0, _costFrame, sleByte, VER(84), VER(89)),
 		MKLINE(Actor_v0, _miscflags, sleByte, VER(84)),
 		MKLINE(Actor_v0, _speaking, sleByte, VER(84)),
-		MK_OBSOLETE(Actor_v0, _speakingPrev, sleByte, VER(84), VER(88)),
+		MK_OBSOLETE(Actor_v0, _speakingPrev, sleByte, VER(84), VER(89)),
+		MK_OBSOLETE(Actor_v0, _limbTemp, sleByte, VER(89), VER(89)),
 		MKLINE(Actor_v0, _animFrameRepeat, sleByte, VER(89)),
 		MKARRAY(Actor_v0, _limbFrameRepeatNew[0], sleInt8, 8, VER(89)),
-		MKARRAY(Actor_v0, _limbFrameRepeat[0], sleInt8, 8, VER(89)),
+		MKARRAY(Actor_v0, _limbFrameRepeat[0], sleInt8, 8, VER(90)),
 		MKEND()
 	};
 
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 51a291b7f2..6e54377199 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1210,7 +1210,7 @@ void ScummEngine::saveOrLoad(Serializer *s) {
 			// Since roughly v13 of the save games, the objs storage has changed a bit
 			for (i = _numObjectsInRoom; i < _numLocalObjects; i++)
 				_objs[i].obj_nr = 0;
-		} else if (_game.version == 0 && s->getVersion() < VER(89)) {
+		} else if (_game.version == 0 && s->getVersion() < VER(91)) {
 			for (i = 0; i < _numLocalObjects; i++) {
 				// Merge object id and type (previously stored in flags)
 				if (_objs[i].obj_nr != 0 && OBJECT_V0_TYPE(_objs[i].obj_nr) == 0 && _objs[i].flags != 0)
@@ -1504,14 +1504,14 @@ void ScummEngine_v0::saveOrLoad(Serializer *s) {
 	const SaveLoadEntry v0Entrys[] = {
 		MKLINE(ScummEngine_v0, _currentMode, sleByte, VER(78)),
 		MKLINE(ScummEngine_v0, _currentLights, sleByte, VER(78)),
-		MKLINE(ScummEngine_v0, _activeVerb, sleByte, VER(89)),
-		MKLINE(ScummEngine_v0, _activeObject, sleUint16, VER(89)),
-		MKLINE(ScummEngine_v0, _activeObject2, sleUint16, VER(89)),
-		MKLINE(ScummEngine_v0, _cmdVerb, sleByte, VER(89)),
-		MKLINE(ScummEngine_v0, _cmdObject, sleUint16, VER(89)),
-		MKLINE(ScummEngine_v0, _cmdObject2, sleUint16, VER(89)),
-		MKLINE(ScummEngine_v0, _walkToObject, sleUint16, VER(89)),
-		MKLINE(ScummEngine_v0, _walkToObjectState, sleByte, VER(89)),
+		MKLINE(ScummEngine_v0, _activeVerb, sleByte, VER(92)),
+		MKLINE(ScummEngine_v0, _activeObject, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _activeObject2, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _cmdVerb, sleByte, VER(92)),
+		MKLINE(ScummEngine_v0, _cmdObject, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _cmdObject2, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _walkToObject, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _walkToObjectState, sleByte, VER(92)),
 		MKEND()
 	};
  	s->saveLoadEntries(this, v0Entrys);
diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h
index 898f80f867..90feee6dc0 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 89
+#define CURRENT_VER 92
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead
-- 
cgit v1.2.3


From 928fd72a359d00f0cae45b9ca49c4b8f24e08d90 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 11 Feb 2012 11:10:21 +0100
Subject: TSAGE: R2R - scene 1337: Implement some missing functions

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 117 +++++++++++++++++++++---
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  14 ++-
 engines/tsage/staticres.cpp                     |   1 +
 engines/tsage/staticres.h                       |   1 +
 4 files changed, 116 insertions(+), 17 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index e1357762da..b3907d7162 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2430,7 +2430,7 @@ void Scene1337::Action1::signal() {
 		signal();
 		break;
 	case 12:
-		scene->subCBB1E();
+		scene->suggestInstructions();
 		remove();
 		break;
 	default:
@@ -3870,7 +3870,7 @@ void Scene1337::dispatch() {
 		++_field424E;
 		if (_field424E == 4) {
 			_field424C = 1;
-			subCBB1E();
+			suggestInstructions();
 		}
 	}
 	Scene::dispatch();
@@ -3905,7 +3905,7 @@ void Scene1337::setAnimationInfo(unkObj1337sub1 *subObj) {
 }
 
 void Scene1337::subC20E5() {
-	warning("STUBBED lvl2 subC20E5()");
+	subC2586();
 }
 
 void Scene1337::subC20F9() {
@@ -3985,11 +3985,52 @@ void Scene1337::subC20F9() {
 
 }
 
+void Scene1337::subC2586() {
+	if (_field4244 != 0)
+		_object1.hide();
+
+	switch (_field423E) {
+	case 2:
+		subC4CD2();
+		if (_field4246 == 1) 
+			actionDisplay(1330, 114, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		_field4246 = 0;
+	// No break on purpose
+	case 0:
+	// No break on purpose
+	case 1:
+	// No break on purpose
+	case 3:
+		_item1.setAction(&_action4);
+	default:
+		break;
+	}
+
+	_field4244 = 1;
+
+}
+
 int Scene1337::subC264B(int arg1) {
 	warning("STUBBED Scene1337::subC264B()");
 	return -1;
 }
 
+int Scene1337::subC27F9(int arg1) {
+	switch (arg1) {
+	case 10:
+	case 12:
+	case 15:
+	case 17:
+	case 18:
+	case 19:
+	case 20:
+	case 21:
+		return arg1;
+	default:
+		return -1;
+	}
+}
+
 int Scene1337::subC2BF8(unkObj1337sub1 *subObj1, Common::Point *pt) {
 	warning("STUBBED Scene1337::subC2BF8()");
 	return -1;
@@ -4009,7 +4050,10 @@ void Scene1337::subC4A39(unkObj1337sub1 *subObj) {
 }
 
 void Scene1337::subC4CD2() {
-	warning("STUBBED Scene1337::subC4CD2()");
+	if (R2_GLOBALS._v57709 > 0) {
+		subD1917();
+		subD1940(false);
+	}
 }
 
 void Scene1337::subC4CEC() {
@@ -4176,14 +4220,32 @@ void Scene1337::subPostInit() {
 	_field424E = 0;
 }
 
-void Scene1337::subCBB1E() {
-	warning("STUBBED Scene1337::subCBB1E()");
+void Scene1337::suggestInstructions() {
+	if (R2_GLOBALS._v57709 > 0)
+		subD1917();
+	if (MessageDialog::show(NEED_INSTRUCTIONS, NO_MSG, YES_MSG) == 0) {
+		if (R2_GLOBALS._v57709 == 0)
+			subD18F5();
+		subCCF26();
+	} else {
+		if (R2_GLOBALS._v57709 == 0)
+			subD18F5();
+		subCB59B();
+	}
+}
+
+void Scene1337::subCB59B() {
+	_item1.setAction(&_action1);
 }
 
 void Scene1337::subCBB7B() {
 	warning("STUBBED Scene1337::subCBB7B()");
 }
 
+void Scene1337::subCCF26() {
+	warning("STUBBED Scene1337::subCCF26()");
+}
+
 void Scene1337::subCF31D() {
 	warning("STUBBED Scene1337::subCF31D()");
 }
@@ -4192,8 +4254,19 @@ void Scene1337::subCF979() {
 	warning("STUBBED Scene1337::subCF979()");
 }
 
+void Scene1337::subD026D() {
+	subD02CA();
+}
+
 void Scene1337::subD0281() {
-	warning("STUBBED Scene1337::subD0281()");
+	if (subC27F9(this->_arrunkObj1337[2]._arr3[0]._field34) == -1)
+		_unkFctPtr412 = &Scene1337::subD026D;
+	else
+		subC4A39(&_arrunkObj1337[2]._arr3[0]);
+}
+
+void Scene1337::subD02CA() {
+	warning("STUBBED lvl4 Scene1337::subD02CA()");
 }
 
 void Scene1337::subD183F(int arg1, int arg2) {
@@ -4226,16 +4299,34 @@ void Scene1337::subD18B5(int resNum, int rlbNum, int arg3) {
 	warning("STUBBED lvl3 Scene1337::subD18B5()");
 }
 
-void Scene1337::subD18F5() {
-	warning("STUBBED Scene1337::subD18F5()");
+int Scene1337::subD18F5() {
+	if (R2_GLOBALS._v57709 == 0)
+		// The cursor looks... very dummy
+		// To be checked
+		warning("TODO: CursorManager.setData(R2_GLOBALS.off_57705)");
+		
+	++R2_GLOBALS._v57709;
+
+	return R2_GLOBALS._v57709;
 }
 
-void Scene1337::subD1917() {
-	warning("STUBBED Scene1337::subD1917()");
+int Scene1337::subD1917() {
+	if (R2_GLOBALS._v57709 != 0) {
+		R2_GLOBALS._v57709--;
+		if (R2_GLOBALS._v57709 != 0)
+			warning("FIXME: subD195F(_width, _data);");
+	}
+
+	return R2_GLOBALS._v57709;
 }
 
-void Scene1337::subD1940(bool flag) {
-	warning("STUBBED Scene1337::subD1940()");
+int Scene1337::subD1940(bool flag) {
+	if (flag)
+		++R2_GLOBALS._v5780C;
+	else if (R2_GLOBALS._v5780C != 0)
+		--R2_GLOBALS._v5780C;
+
+	return R2_GLOBALS._v5780C;
 }
 
 void Scene1337::subD195F(int arg1, int arg2) {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index b366c6475f..53db763f13 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -315,7 +315,9 @@ public:
 	void setAnimationInfo(unkObj1337sub1 *subObj);
 	void subC20E5();
 	void subC20F9();
+	void subC2586();
 	int subC264B(int arg1);
+	int subC27F9(int arg1);
 	int subC2BF8(unkObj1337sub1 *subObj1, Common::Point *pt);
 	void subC2C2F();
 	int subC3E92(int arg1);
@@ -324,16 +326,20 @@ public:
 	void subC4CEC();
 	void subC51A0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
 	void subPostInit();
-	void subCBB1E();
+	void subCB59B();
+	void suggestInstructions();
 	void subCBB7B();
+	void subCCF26();
 	void subCF31D();
 	void subCF979();
+	void subD026D();
 	void subD0281();
+	void subD02CA();
 	void subD183F(int arg1, int arg2);
 	void subD18B5(int resNum, int rlbNum, int arg3);
-	void subD18F5();
-	void subD1917();
-	void subD1940(bool flag);
+	int subD18F5();
+	int subD1917();
+	int subD1940(bool flag);
 	void subD195F(int arg1, int arg2);
 	void subD1975(int arg1, int arg2);
 
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index 7a8f1cb1b0..e8004bc40d 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -242,6 +242,7 @@ char const *const YES_MSG = " Yes ";
 char const *const NO_MSG = " No ";
 char const *const USE_INTERCEPTOR = "Do you want to use your interceptor card?";
 char const *const USE_DOUBLE_AGENT = "Do you want to use your double agent?";
+char const *const NEED_INSTRUCTIONS = "Do you want instructions?";
 
 const byte k562CC[] = {
 	20, 7,  41, 6,
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index ab0cd73b62..41d1991b48 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -195,6 +195,7 @@ extern char const *const YES_MSG;
 extern char const *const NO_MSG;
 extern char const *const USE_INTERCEPTOR;
 extern char const *const USE_DOUBLE_AGENT;
+extern char const *const NEED_INSTRUCTIONS;
 
 // Scene 1550 arrays of constants
 extern const byte k562CC[];
-- 
cgit v1.2.3


From 5ce622c1b65917b194e6118c9fa247c2a8d4b54e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 11 Feb 2012 21:45:16 +1100
Subject: TINSEL: Added extra fields to the savegame header for SCN/GRA usage
 and language

New savegames that are created will no longer appear in the savegame list for different data versions or languages.
---
 engines/tinsel/saveload.cpp | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp
index 8664cd5f15..f8598c05f8 100644
--- a/engines/tinsel/saveload.cpp
+++ b/engines/tinsel/saveload.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "tinsel/actors.h"
+#include "tinsel/config.h"
 #include "tinsel/dialogs.h"
 #include "tinsel/drives.h"
 #include "tinsel/dw.h"
@@ -94,12 +95,14 @@ struct SaveGameHeader {
 	uint32 ver;
 	char desc[SG_DESC_LEN];
 	TimeDate dateTime;
+	bool scnFlag;
+	byte language;
 };
 
 enum {
 	DW1_SAVEGAME_ID = 0x44575399,	// = 'DWSc' = "DiscWorld 1 ScummVM"
 	DW2_SAVEGAME_ID = 0x44573253,	// = 'DW2S' = "DiscWorld 2 ScummVM"
-	SAVEGAME_HEADER_SIZE = 4 + 4 + 4 + SG_DESC_LEN + 7
+	SAVEGAME_HEADER_SIZE = 4 + 4 + 4 + SG_DESC_LEN + 7 + 1 + 1
 };
 
 #define SAVEGAME_ID (TinselV2 ? (uint32)DW2_SAVEGAME_ID : (uint32)DW1_SAVEGAME_ID)
@@ -166,6 +169,21 @@ static bool syncSaveGameHeader(Common::Serializer &s, SaveGameHeader &hdr) {
 	// Perform sanity check
 	if (tmp < 0 || !correctID || hdr.ver > CURRENT_VER || hdr.size > 1024)
 		return false;
+
+	if (tmp > 0) {
+		// If there's header space left, handling syncing the Scn flag and game language
+		s.syncAsByte(hdr.scnFlag);
+		s.syncAsByte(hdr.language);
+		tmp -= 2;
+
+		if (_vm && s.isLoading()) {
+			// If the engine is loaded, ensure the Scn/Gra usage is correct, and it's the correct language
+			if ((hdr.scnFlag != ((_vm->getFeatures() & GF_SCNFILES) != 0)) ||
+					(hdr.language != _vm->_config->_language))
+				return false;
+		}
+	}
+
 	// Skip over any extra bytes
 	s.skip(tmp);
 	return true;
@@ -547,6 +565,9 @@ static void DoSave() {
 	memcpy(hdr.desc, SaveSceneDesc, SG_DESC_LEN);
 	hdr.desc[SG_DESC_LEN - 1] = 0;
 	g_system->getTimeAndDate(hdr.dateTime);
+	hdr.scnFlag = _vm->getFeatures() & GF_SCNFILES;
+	hdr.language = _vm->_config->_language;
+
 	if (!syncSaveGameHeader(s, hdr) || f->err()) {
 		SaveFailure(f);
 		return;
-- 
cgit v1.2.3


From 056fc6250cc04a38772870139a8208ffde425765 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 11 Feb 2012 12:35:05 +0100
Subject: TSAGE: R2R - Scene 1337: Implement shuffleCards()

Game is now starting
---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 59 ++++++++++++++++++++++---
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  2 +-
 2 files changed, 54 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index b3907d7162..c04134a873 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -2790,7 +2790,7 @@ void Scene1337::Action4::signal() {
 		scene->_item2._object1.hide();
 		if ((scene->_arrunkObj1337[scene->_field423E]._arr1[0]._field34 == 0) && (scene->subC264B(scene->_arrunkObj1337[scene->_field423E]._arr3[0]._field34 == 0))) {
 			if (scene->_field3E24 < 0)
-				scene->subCBB7B();
+				scene->shuffleCards();
 			scene->_item2._object1.setPosition(Common::Point(162, 95));
 			scene->_item2._object1.show();
 
@@ -2825,7 +2825,7 @@ void Scene1337::Action4::signal() {
 		scene->_item2._object1.hide();
 		if ((scene->_arrunkObj1337[scene->_field423E]._arr1[2]._field34 == 0) && (scene->subC264B(scene->_arrunkObj1337[scene->_field423E]._arr3[0]._field34 == 0))) {
 			if (scene->_field3E24 < 0)
-				scene->subCBB7B();
+				scene->shuffleCards();
 			scene->_item2._object1.setPosition(Common::Point(162, 95));
 			scene->_item2._object1.show();
 
@@ -2860,7 +2860,7 @@ void Scene1337::Action4::signal() {
 		scene->_item2._object1.hide();
 		if ((scene->_arrunkObj1337[scene->_field423E]._arr1[3]._field34 == 0) && (scene->subC264B(scene->_arrunkObj1337[scene->_field423E]._arr3[0]._field34 == 0))) {
 			if (scene->_field3E24 < 0)
-				scene->subCBB7B();
+				scene->shuffleCards();
 			scene->_item2._object1.setPosition(Common::Point(162, 95));
 			scene->_item2._object1.show();
 
@@ -4238,12 +4238,59 @@ void Scene1337::subCB59B() {
 	_item1.setAction(&_action1);
 }
 
-void Scene1337::subCBB7B() {
-	warning("STUBBED Scene1337::subCBB7B()");
+void Scene1337::shuffleCards() {
+	R2_GLOBALS._sceneObjects->draw();
+
+	for (int i = 0; i <= 98; i++) {
+		if (_field3E28[i] == 0) {
+			for (int j = i + 1; j <= 98; j ++) {
+				if (_field3E28[j] != 0) {
+					_field3E28[i] = _field3E28[j];
+					_field3E28[j] = 0;
+					break;
+				}
+			}
+		}
+	}
+
+	for (int i = 0; i <= 99; i ++) {
+		if (_field3E28[i] == 0) {
+			_field3E24 = i - 1;
+			_field3E26 = 98;
+			break;
+		}
+	}
+
+	// tmpVal is never modified in the original. It looks weird but it works: at the end, the cards are suffled!
+	int tmpVal = 0;
+	int randIndx;
+	int swap;
+	for (int i = 0; i < 2000; i ++) {
+		randIndx = R2_GLOBALS._randomSource.getRandomNumber(_field3E24);
+		swap = _field3E28[tmpVal];
+		_field3E28[tmpVal] = _field3E28[randIndx];
+		_field3E28[randIndx] = swap;
+	}
+
+	_field423C = 0;
+	_item2._object1.setAction(&_action2);
+
+	while(_field423C == 0) {
+		g_globals->_scenePalette.signalListeners();
+		R2_GLOBALS._sceneObjects->draw();
+		warning("TODO: recurse on draw() and on signalListeners()?");
+		g_globals->_events.delay(g_globals->_sceneHandler->_delayTicks);
+
+		// Hack to avoid eternal loop
+		// To be removed when the recurse is working properly
+		_field423C = 1;
+	}
 }
 
 void Scene1337::subCCF26() {
-	warning("STUBBED Scene1337::subCCF26()");
+	_item2._object1._moveDiff = Common::Point(30, 30);
+	shuffleCards();
+	_item1.setAction(&_action3);
 }
 
 void Scene1337::subCF31D() {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 53db763f13..2a91980756 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -328,7 +328,7 @@ public:
 	void subPostInit();
 	void subCB59B();
 	void suggestInstructions();
-	void subCBB7B();
+	void shuffleCards();
 	void subCCF26();
 	void subCF31D();
 	void subCF979();
-- 
cgit v1.2.3


From 07904c881bdb23976a853b8185c2650792247935 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 11 Feb 2012 23:05:43 +0100
Subject: MOHAWK: Avoid warning

---
 engines/mohawk/livingbooks.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 08f3b86c7c..708478a6d8 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -388,10 +388,13 @@ bool MohawkEngine_LivingBooks::loadPage(LBMode mode, uint page, uint subpage) {
 	}
 
 	// TODO: fading between pages
+#if 0
 	bool fade = false;
 	if (leftover.contains("fade")) {
 		fade = true;
 	}
+#endif
+
 	if (leftover.contains("read")) {
 		_readOnly = true;
 	}
-- 
cgit v1.2.3


From 7760f8358a45ae746f07bbbb42f86d19fc85a0c7 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 12 Feb 2012 11:32:16 +0100
Subject: TSAGE: R2R - Scene 1337: Implement main AI function, with all
 sub-functions stubbed

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 315 +++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  30 ++-
 2 files changed, 336 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index c04134a873..7857363482 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4010,20 +4010,75 @@ void Scene1337::subC2586() {
 
 }
 
-int Scene1337::subC264B(int arg1) {
-	warning("STUBBED Scene1337::subC264B()");
+bool Scene1337::subC264B(int arg1) {
+	switch (arg1) {
+	case 10:
+	// No break on purpose
+	case 12:
+	// No break on purpose
+	case 15:
+	// No break on purpose
+	case 17:
+	// No break on purpose
+	case 18:
+	// No break on purpose
+	case 19:
+	// No break on purpose
+	case 20:
+	// No break on purpose
+	case 21:
+		return true;
+	default:
+		return false;
+	}
+}
+
+int Scene1337::subC2687(int arg1) {
+	warning("STUBBED Scene1337::subC2687()");
+	return -1;
+}
+
+int Scene1337::subC26CB(int arg1, int arg2) {
+	warning("STUBBED Scene1337::subC26CB()");
+	return -1;
+}
+
+int Scene1337::subC2719(int arg1) {
+	warning("STUBBED Scene1337::subC2719()");
+	return -1;
+}
+
+int Scene1337::subC274D(int arg1) {
+	warning("STUBBED Scene1337::subC274D()");
+	return -1;
+}
+
+int Scene1337::subC2781(int arg1) {
+	warning("STUBBED Scene1337::subC2781()");
+	return -1;
+}
+
+int Scene1337::subC27B5(int arg1) {
+	warning("STUBBED Scene1337::subC27B5()");
 	return -1;
 }
 
 int Scene1337::subC27F9(int arg1) {
 	switch (arg1) {
 	case 10:
+	// No break on purpose
 	case 12:
+	// No break on purpose
 	case 15:
+	// No break on purpose
 	case 17:
+	// No break on purpose
 	case 18:
+	// No break on purpose
 	case 19:
+	// No break on purpose
 	case 20:
+	// No break on purpose
 	case 21:
 		return arg1;
 	default:
@@ -4031,6 +4086,10 @@ int Scene1337::subC27F9(int arg1) {
 	}
 }
 
+void Scene1337::subC2835(int arg1) {
+	warning("STUBBED Scene1337::subC2835()");
+}
+
 int Scene1337::subC2BF8(unkObj1337sub1 *subObj1, Common::Point *pt) {
 	warning("STUBBED Scene1337::subC2BF8()");
 	return -1;
@@ -4040,11 +4099,50 @@ void Scene1337::subC2C2F() {
 	warning("STUBBED Scene1337::subC2C2F()");
 }
 
+void Scene1337::subC318B(int arg1, unkObj1337sub1 *subObj2) {
+	warning("STUBBED Scene1337::subC318B()");
+}
+
+int Scene1337::subC32B1(int arg1) {
+	warning("STUBBED Scene1337::subC32B1()");
+	return -1;
+}
+
+int Scene1337::subC331B(int arg1) {
+	warning("STUBBED Scene1337::subC331B()");
+	return -1;
+}
+
+int Scene1337::subC3386(int arg1, int arg2) {
+	warning("STUBBED Scene1337::subCF979()");
+	return -1;
+}
+
+void Scene1337::subC33C0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
+	warning("STUBBED Scene1337::subC33C0()");
+}
+
 int Scene1337::subC3E92(int arg1) {
 	warning("STUBBED Scene1337::subC3E92()");
 	return -1;
 }
 
+void Scene1337::subC340B(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
+	warning("STUBBED Scene1337::subC340B()");
+}
+
+void Scene1337::subC3456(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
+	warning("STUBBED Scene1337::subC3456()");
+}
+
+void Scene1337::subC34A1(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
+	warning("STUBBED Scene1337::subC34A1()");
+}
+
+void Scene1337::subC358E(unkObj1337sub1 *subObj1) {
+	warning("STUBBED Scene1337::subC358E()");
+}
+
 void Scene1337::subC4A39(unkObj1337sub1 *subObj) {
 	warning("STUBBED Scene1337::subC4A39()");
 }
@@ -4295,6 +4393,219 @@ void Scene1337::subCCF26() {
 
 void Scene1337::subCF31D() {
 	warning("STUBBED Scene1337::subCF31D()");
+	int tmpVal = 1;
+	bool found;
+	int count;
+
+	if (this->_arrunkObj1337[1]._arr3[0]._field34 != 0) {
+		switch (_arrunkObj1337[1]._arr3[0]._field34) {
+		case 10:
+		// No break on purpose
+		case 12:
+		// No break on purpose
+		case 15:
+		// No break on purpose
+		case 17:
+		// No break on purpose
+		case 18:
+		// No break on purpose
+		case 19:
+		// No break on purpose
+		case 20:
+		// No break on purpose
+		case 21:
+			tmpVal = 0;
+			subC4A39(&_arrunkObj1337[1]._arr3[0]);
+			break;
+		default:
+			found = false;
+			int i;
+			for (i = 0; i <= 3; i++) {
+				if (subC3386(_arrunkObj1337[1]._arr3[0]._field34, _arrunkObj1337[1]._arr1[i]._field34) != 0) {
+					found = true;
+					break;
+				}
+			}
+
+			if (found) {
+				tmpVal = 0;
+				subC34A1(&_arrunkObj1337[1]._arr1[i], &_arrunkObj1337[1]._arr3[0]);
+			}
+		}
+	}
+
+	if (tmpVal != 1)
+		return;
+
+	found = false;
+	for (int i = 0; i <= 3; i++) {
+		int tmpIndx = subC26CB(1, i);
+		if (tmpIndx == -1)
+			break;
+		
+		tmpVal = 0;
+		for (int j = 0; j <= 7; j++) {
+			if (_arrunkObj1337[1]._arr2[j]._field34 == _arrunkObj1337[1]._arr1[tmpIndx]._field34) {
+				tmpVal = 1;
+				break;
+			}
+		}
+		
+		if (tmpVal == 0)
+			break;
+
+		for (int j = 0; j <= 7; j++) {
+			if (_arrunkObj1337[1]._arr2[j]._field34 == 1) {
+				if (subC2687(_arrunkObj1337[1]._arr3[0]._field34) == 0) {
+					count = 0;
+					for (int k = 0; k <= 7; k++) {
+						if ((_arrunkObj1337[1]._arr2[k]._field34 > 1) && (_arrunkObj1337[1]._arr2[k]._field34 <= 9))
+							++count;
+					}
+					
+					if (count == 7)
+						_field424A = 1;
+
+					subC33C0(&_arrunkObj1337[1]._arr1[tmpIndx], &_arrunkObj1337[1]._arr2[j]);
+					found = true;
+					break;
+				}
+			}
+		}
+	}
+
+	if (found)
+		return;
+
+	tmpVal = subC2719(1);
+	if (tmpVal != -1) {
+		for (int i = 0; i <= 7; i++) {
+			if ((_arrunkObj1337[1]._arr2[i]._field34 == 0) && (subC2687(_arrunkObj1337[1]._arr3[0]._field34) == 0)) {
+				subC340B(&_arrunkObj1337[1]._arr1[tmpVal], &_arrunkObj1337[1]._arr2[i]);
+				found = true;
+			}
+		}
+	}
+	
+	if (found)
+		return;
+
+	tmpVal = subC274D(1);
+
+	if ((tmpVal != -1) && (subC331B(1) != -1))
+		subC358E(&_arrunkObj1337[1]._arr1[tmpVal]);
+
+	if (found)
+		return;
+
+	tmpVal = subC2781(1);
+	if (tmpVal != -1) {
+		count = -1;
+		int rndVal = R2_GLOBALS._randomSource.getRandomNumber(3);
+		for (int i = 0; i <= 3; i++) {
+			if (rndVal != 1) {
+				if (  (_arrunkObj1337[rndVal]._arr1[0]._field34 != 0) 
+				   || (_arrunkObj1337[rndVal]._arr1[1]._field34 != 0) 
+				   || (_arrunkObj1337[rndVal]._arr1[2]._field34 != 0) 
+				   || (_arrunkObj1337[rndVal]._arr1[3]._field34 == 0)) {
+					count = rndVal;
+					break;
+				}
+
+				rndVal--;
+				if (rndVal < 0)
+					rndVal = 3;
+			}
+		}
+
+		if (count != -1) {
+			subC318B(1, &_arrunkObj1337[1]._arr1[tmpVal]);
+			found = true;
+		}
+	}
+	
+	if (found)
+		return;
+
+	count = -1;
+	int i;
+	for (i = 0; i <= 3; i++) {
+		tmpVal = subC27B5(_arrunkObj1337[1]._arr1[i]._field34);
+		if (tmpVal != -1) {
+			int rndVal = R2_GLOBALS._randomSource.getRandomNumber(3);
+
+			for (int j = 0; j <= 3; j++) {
+				if (tmpVal != 1) {
+					for (int k = 0; k <= 7; k++) {
+						// 'k' is not used in that loop. 
+						// It looks suspicious.
+						if ((_arrunkObj1337[tmpVal]._arr3[0]._field34 == 0) && (subC32B1(_arrunkObj1337[1]._arr1[i]._field34) == 1)) {
+							count = tmpVal;
+							break;
+						}
+					}
+				}
+
+				if (count != -1) {
+					found = true;
+					break;
+				} else {
+					rndVal--;
+					if (rndVal < 0)
+						rndVal = 3;
+				}
+			}
+
+			if (found)
+				break;
+		}
+	}
+
+	if (found) {
+		if (count == -1)
+			return;
+
+		subC3456(&_arrunkObj1337[1]._arr1[i], &_arrunkObj1337[count]._arr3[0]);
+	} else {
+		int j;
+		for (j = 0; j <= 3; j++) {
+			if (subC27F9(_arrunkObj1337[1]._arr1[j]._field34) != -1) {
+				count = -1;
+				int rndVal = R2_GLOBALS._randomSource.getRandomNumber(3);
+				for (int l = 0; l <= 3; l++) {
+					if (rndVal != 1) {
+						for (int m = 0; m <= 7; m++) {
+							// 'm' is not used in that loop. It looks suspicious.
+							if ((_arrunkObj1337[rndVal]._arr3[0]._field34 == 0) && (_arrunkObj1337[1]._arr1[j]._field34 == 1)) {
+								count = rndVal;
+								break;
+							}
+						}
+					}
+					if (count != -1) {
+						found = true;
+						break;
+					} else {
+						rndVal--;
+						if (rndVal < 0)
+							rndVal = 3;
+					}
+				}
+				if (found)
+					break;
+			}
+		}
+
+		if (found) {
+			if (count == -1)
+				return;	
+
+			subC3456(&_arrunkObj1337[1]._arr1[j], &_arrunkObj1337[count]._arr3[0]);
+		} else {
+			subC2835(1);
+		}
+	}
+
 }
 
 void Scene1337::subCF979() {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 2a91980756..1e67029f87 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -316,11 +316,27 @@ public:
 	void subC20E5();
 	void subC20F9();
 	void subC2586();
-	int subC264B(int arg1);
-	int subC27F9(int arg1);
-	int subC2BF8(unkObj1337sub1 *subObj1, Common::Point *pt);
+	bool subC264B(int arg1);
+	int  subC2687(int arg1);
+	int  subC26CB(int arg1, int arg2);
+	int  subC2719(int arg1);
+	int  subC274D(int arg1);
+	int  subC2781(int arg1);
+	int  subC27B5(int arg1);
+	int  subC27F9(int arg1);
+	void subC2835(int arg1);
+	int  subC2BF8(unkObj1337sub1 *subObj1, Common::Point *pt);
 	void subC2C2F();
-	int subC3E92(int arg1);
+	void subC318B(int arg1, unkObj1337sub1 *subObj2);
+	int  subC32B1(int arg1);
+	int  subC331B(int arg1);
+	int  subC3386(int arg1, int arg2);
+	void subC33C0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
+	void subC3456(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
+	void subC340B(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
+	void subC34A1(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
+	void subC358E(unkObj1337sub1 *subObj1);
+	int  subC3E92(int arg1);
 	void subC4A39(unkObj1337sub1 *subObj);
 	void subC4CD2();
 	void subC4CEC();
@@ -337,9 +353,9 @@ public:
 	void subD02CA();
 	void subD183F(int arg1, int arg2);
 	void subD18B5(int resNum, int rlbNum, int arg3);
-	int subD18F5();
-	int subD1917();
-	int subD1940(bool flag);
+	int  subD18F5();
+	int  subD1917();
+	int  subD1940(bool flag);
 	void subD195F(int arg1, int arg2);
 	void subD1975(int arg1, int arg2);
 
-- 
cgit v1.2.3


From 93619b96d33619014a0ed18878410ade85295caa Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 12 Feb 2012 13:09:07 +0100
Subject: TSAGE: R2R - Scene 1337: Implement 7 functions used by AI

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |  1 +
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 65 ++++++++++++++++++++-----
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  2 +-
 3 files changed, 54 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 6a986d58c4..83ca51faf5 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -113,6 +113,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		return new Scene1100();
 	case 1200:
 		return new Scene1200();
+	case 1337:
 	case 1330:
 		// Card Game
 		return new Scene1337();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 7857363482..4395e5c386 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4033,34 +4033,71 @@ bool Scene1337::subC264B(int arg1) {
 	}
 }
 
-int Scene1337::subC2687(int arg1) {
-	warning("STUBBED Scene1337::subC2687()");
-	return -1;
+bool Scene1337::subC2687(int arg1) {
+	switch (arg1) {
+	case 11:
+	// No break on purpose
+	case 14:
+	// No break on purpose
+	case 16:
+	// No break on purpose
+	case 24:
+		return true;
+	default:
+		return false;
+	}
 }
 
 int Scene1337::subC26CB(int arg1, int arg2) {
-	warning("STUBBED Scene1337::subC26CB()");
+	if ((_arrunkObj1337[arg1]._arr1[arg2]._field34 > 1) && (_arrunkObj1337[arg1]._arr1[arg2]._field34 <= 9)) {
+		return arg2;
+	}
+
 	return -1;
 }
 
 int Scene1337::subC2719(int arg1) {
-	warning("STUBBED Scene1337::subC2719()");
+	for (int i = 0; i <= 3; i++) {
+		if (_arrunkObj1337[arg1]._arr1[i]._field34 == 1)
+			return i;
+	}
+
 	return -1;
 }
 
 int Scene1337::subC274D(int arg1) {
-	warning("STUBBED Scene1337::subC274D()");
+	for (int i = 0; i <= 3; i++) {
+		if (_arrunkObj1337[arg1]._arr1[i]._field34 == 13)
+			return i;
+	}
+
 	return -1;
 }
 
 int Scene1337::subC2781(int arg1) {
-	warning("STUBBED Scene1337::subC2781()");
+	for (int i = 0; i <= 3; i++) {
+		if (_arrunkObj1337[arg1]._arr1[i]._field34 == 25)
+			return i;
+	}
+
 	return -1;
 }
 
 int Scene1337::subC27B5(int arg1) {
-	warning("STUBBED Scene1337::subC27B5()");
-	return -1;
+	switch (arg1) {
+	case 11:
+	// No break on purpose
+	case 14:
+	// No break on purpose
+	case 16:
+	// No break on purpose
+	case 24:
+		return arg1;
+		break;
+	default:
+		return -1;
+		break;
+	}
 }
 
 int Scene1337::subC27F9(int arg1) {
@@ -4128,7 +4165,10 @@ int Scene1337::subC3E92(int arg1) {
 }
 
 void Scene1337::subC340B(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
-	warning("STUBBED Scene1337::subC340B()");
+	_field3EF0 = subObj1;
+	_field3EF4 = subObj2;
+
+	_item1.setAction(&_action6);
 }
 
 void Scene1337::subC3456(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
@@ -4392,7 +4432,6 @@ void Scene1337::subCCF26() {
 }
 
 void Scene1337::subCF31D() {
-	warning("STUBBED Scene1337::subCF31D()");
 	int tmpVal = 1;
 	bool found;
 	int count;
@@ -4456,7 +4495,7 @@ void Scene1337::subCF31D() {
 
 		for (int j = 0; j <= 7; j++) {
 			if (_arrunkObj1337[1]._arr2[j]._field34 == 1) {
-				if (subC2687(_arrunkObj1337[1]._arr3[0]._field34) == 0) {
+				if (!subC2687(_arrunkObj1337[1]._arr3[0]._field34)) {
 					count = 0;
 					for (int k = 0; k <= 7; k++) {
 						if ((_arrunkObj1337[1]._arr2[k]._field34 > 1) && (_arrunkObj1337[1]._arr2[k]._field34 <= 9))
@@ -4480,7 +4519,7 @@ void Scene1337::subCF31D() {
 	tmpVal = subC2719(1);
 	if (tmpVal != -1) {
 		for (int i = 0; i <= 7; i++) {
-			if ((_arrunkObj1337[1]._arr2[i]._field34 == 0) && (subC2687(_arrunkObj1337[1]._arr3[0]._field34) == 0)) {
+			if ((_arrunkObj1337[1]._arr2[i]._field34 == 0) && (!subC2687(_arrunkObj1337[1]._arr3[0]._field34))) {
 				subC340B(&_arrunkObj1337[1]._arr1[tmpVal], &_arrunkObj1337[1]._arr2[i]);
 				found = true;
 			}
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 1e67029f87..d23ce00793 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -317,7 +317,7 @@ public:
 	void subC20F9();
 	void subC2586();
 	bool subC264B(int arg1);
-	int  subC2687(int arg1);
+	bool subC2687(int arg1);
 	int  subC26CB(int arg1, int arg2);
 	int  subC2719(int arg1);
 	int  subC274D(int arg1);
-- 
cgit v1.2.3


From 15bbe3bff18178b0b66fb73a33782813f9e96999 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 12 Feb 2012 13:18:41 +0100
Subject: SCI: Expand adjustGraphColor to work for older EGA games too

See bug #3486899.
---
 engines/sci/engine/kgraphics.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index cfeaaaa803..caae562d67 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -59,11 +59,13 @@
 namespace Sci {
 
 static int16 adjustGraphColor(int16 color) {
-	// WORKAROUND: SCI1 EGA and Amiga games can set invalid colors (above 0 - 15).
-	// Colors above 15 are all white in SCI1 EGA games, which is why this was never
-	// observed. We clip them all to (0, 15) instead, as colors above 15 are used
-	// for the undithering algorithm in EGA games - bug #3048908.
-	if (getSciVersion() >= SCI_VERSION_1_EARLY && g_sci->getResMan()->getViewType() == kViewEga)
+	// WORKAROUND: EGA and Amiga games can set invalid colors (above 0 - 15).
+	// It seems only the lower nibble was used in these games.
+	// bug #3048908, #3486899.
+	// Confirmed in EGA games KQ4(late), QFG1(ega), LB1 that
+	// at least FillBox (only one of the functions using adjustGraphColor)
+	// behaves like this.
+	if (g_sci->getResMan()->getViewType() == kViewEga)
 		return color & 0x0F;	// 0 - 15
 	else
 		return color;
-- 
cgit v1.2.3


From 0ba3335674dcd88d34d1d2ab8453658191d31c38 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 12 Feb 2012 16:14:25 +0100
Subject: TSAGE: R2R - Scene 1337: Implement 2 functions used by AI

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 150 +++++++++++++++++++++++-
 1 file changed, 148 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 4395e5c386..0c95ee3f25 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4124,7 +4124,151 @@ int Scene1337::subC27F9(int arg1) {
 }
 
 void Scene1337::subC2835(int arg1) {
-	warning("STUBBED Scene1337::subC2835()");
+	int i;
+	bool found = false;
+	switch (arg1) {
+	case 0:
+		for (i = 0; i <= 3; i++) {
+			if (subC27F9(_arrunkObj1337[arg1]._arr1[i]._field34) != -1) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found)
+			break;
+
+		for (i = 0; i <= 3; i++) {
+			if (subC27B5(_arrunkObj1337[arg1]._arr1[i]._field34) != -1) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found)
+			break;
+
+		for (i = 0; i <= 3; i++) {
+			if ((_arrunkObj1337[arg1]._arr1[i]._field34 > 1) && (_arrunkObj1337[arg1]._arr1[i]._field34 <= 9)) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found)
+			break;
+
+		for (i = 0; i <= 3; i++) {
+			if ((_arrunkObj1337[arg1]._arr1[i]._field34 >= 26) && (_arrunkObj1337[arg1]._arr1[i]._field34 <= 33)) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found)
+			break;
+
+		for (i = 0; i <= 3; i++) {
+			if (_arrunkObj1337[arg1]._arr1[i]._field34 == 1) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found)
+			break;
+
+		for (i = 0; i <= 3; i++) {
+			if (_arrunkObj1337[arg1]._arr1[i]._field34 == 25) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found)
+			break;
+		
+		for (i = 0; i <= 3; i++) {
+			if (_arrunkObj1337[arg1]._arr1[i]._field34 == 13) {
+				found = true;
+				break;
+			}
+		}
+		break;
+	case 1:
+		for (i = 0; i <= 3; i++) {
+			if ((_arrunkObj1337[arg1]._arr1[i]._field34 >= 26) && (_arrunkObj1337[arg1]._arr1[i]._field34 <= 33)) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found)
+			break;
+
+		for (i = 0; i <= 3; i++) {
+			if (_arrunkObj1337[arg1]._arr1[i]._field34 == 1) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found)
+			break;
+
+		for (i = 0; i <= 3; i++) {
+			if ((_arrunkObj1337[arg1]._arr1[i]._field34 > 1) && (_arrunkObj1337[arg1]._arr1[i]._field34 <= 9)) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found)
+			break;
+
+		for (i = 0; i <= 3; i++) {
+			if (subC27F9(_arrunkObj1337[arg1]._arr1[i]._field34) != -1) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found)
+			break;
+
+		for (i = 0; i <= 3; i++) {
+			if (subC27B5(_arrunkObj1337[arg1]._arr1[i]._field34) != -1) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found)
+			break;
+
+		for (i = 0; i <= 3; i++) {
+			if (_arrunkObj1337[arg1]._arr1[i]._field34 == 25) {
+				found = true;
+				break;
+			}
+		}
+
+		if (found)
+			break;
+
+		for (i = 0; i <= 3; i++) {
+			if (_arrunkObj1337[arg1]._arr1[i]._field34 == 13) {
+				found = true;
+				break;
+			}
+		}
+
+		break;
+	default:
+		return;
+	}
+
+	subC4A39(&_arrunkObj1337[arg1]._arr1[i]);
 }
 
 int Scene1337::subC2BF8(unkObj1337sub1 *subObj1, Common::Point *pt) {
@@ -4184,7 +4328,9 @@ void Scene1337::subC358E(unkObj1337sub1 *subObj1) {
 }
 
 void Scene1337::subC4A39(unkObj1337sub1 *subObj) {
-	warning("STUBBED Scene1337::subC4A39()");
+	_field3EF0 = subObj;
+
+	_item1.setAction(&_action5);
 }
 
 void Scene1337::subC4CD2() {
-- 
cgit v1.2.3


From 8b39b0b0faa07ec5bc5f18cc2ec00ecd5b3fb949 Mon Sep 17 00:00:00 2001
From: sylvaintv
Date: Sun, 12 Feb 2012 23:16:54 +0100
Subject: TOON: Add russian version detection

---
 engines/toon/detection.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'engines')

diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp
index 6a76ade90a..8234934972 100644
--- a/engines/toon/detection.cpp
+++ b/engines/toon/detection.cpp
@@ -76,6 +76,15 @@ static const ADGameDescription gameDescriptions[] = {
 		},
 		Common::ES_ESP, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO0()
 	},
+	{
+		"toon", "",
+		{
+			{"local.pak", 0, "48ec60709bebbdeff791d55ee18ec910", 3417846},
+			{"arcaddbl.svl", 0, "1d1b96e317e03ffd3874a8ebe59556f3", 6246232},
+			{"study.svl", 0, "d4aff126ee27be3c3d25e2996369d7cb", 2324368},
+		},
+		Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO0()
+	},		
 	{
 		"toon", "",
 		{
-- 
cgit v1.2.3


From 24e50eb218db5de3bad806737cba247798112a2a Mon Sep 17 00:00:00 2001
From: sylvaintv
Date: Sun, 12 Feb 2012 23:18:40 +0100
Subject: TOON: Fix bug #3467139 with russian version crash

Bug #3467139: "TOON: Russian Version Crashes"
A frame is corrupted in an localized animation
Moved the check before the Rect creation.
---
 engines/toon/toon.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 99932362af..657e18635f 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -4666,11 +4666,11 @@ void ToonEngine::addDirtyRect( int32 left, int32 top, int32 right, int32 bottom
 	top = MIN<int32>(MAX<int32>(top, 0), TOON_BACKBUFFER_HEIGHT);
 	bottom = MIN<int32>(MAX<int32>(bottom, 0), TOON_BACKBUFFER_HEIGHT);
 
-	Common::Rect rect(left, top, right, bottom);
-
 	if (bottom - top <= 0 || right - left <= 0)
 		return;
 
+	Common::Rect rect(left, top, right, bottom);
+
 	for (uint32 i = 0; i < _dirtyRects.size(); i++) {
 		if (_dirtyRects[i].contains(rect))
 			return;
-- 
cgit v1.2.3


From 3abb3ad757848d2899308b52bf642211c201d154 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 12 Feb 2012 22:31:05 +0100
Subject: DREAMWEB: Fix duplicate line in monk end sequence

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

(limited to 'engines')

diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index aa0f3bd799..96dabc9b40 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -52,7 +52,7 @@ void DreamWebEngine::monkSpeaking() {
 	hangOn(300);
 
 	if (hasSpeech()) {
-		for (int i = 40; i <= 48; i++) {
+		for (int i = 40; i < 48; i++) {
 			loadSpeech('T', 83, 'T', i);
 
 			playChannel1(50 + 12);
-- 
cgit v1.2.3


From 3fc8b7227b05203a9c60a91c4db361da9181fba5 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 12 Feb 2012 23:45:37 +0100
Subject: DREAMWEB: Fix missing subtitle lines in speech+subtitle mode

This is done by adding a (very ugly) way to force the previous timed-temp
line off screen, so the next one can be shown.
---
 engines/dreamweb/dreamweb.cpp |  3 --
 engines/dreamweb/dreamweb.h   |  6 +--
 engines/dreamweb/structs.h    | 12 ++++++
 engines/dreamweb/stubs.cpp    | 89 +++++++++++++++++++++++++++++--------------
 4 files changed, 75 insertions(+), 35 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 79c5e0d7be..0a5deb4657 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -190,9 +190,6 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_monAdX = 0;
 	_monAdY = 0;
 	_timeCount = 0;
-	_countToTimed = 0;
-	_timedY = 0;
-	_timedX = 0;
 	_needToDumpTimed = 0;
 	_loadingOrSave = 0;
 	_saveLoadPage = 0;
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 8eeb006844..38016e5897 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -186,7 +186,6 @@ private:
 	uint8 _channel0, _channel1;
 
 protected:
-	const char *_timedString;
 	GameVars _vars; // saved variables
 
 	// from backdrop.cpp
@@ -416,10 +415,9 @@ public:
 	uint16 _monAdX;
 	uint16 _monAdY;
 	uint16 _timeCount;
-	uint16 _countToTimed;
-	uint8 _timedY;
-	uint8 _timedX;
 	uint8 _needToDumpTimed;
+	TimedTemp _previousTimedTemp;
+	TimedTemp _timedTemp;
 	uint8 _loadingOrSave;
 	uint8 _saveLoadPage;
 	uint8 _currentSlot;
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index ddc027120d..cedf2b6d76 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -418,6 +418,18 @@ struct GameVars {
 	uint8 _shakeCounter;
 };
 
+struct TimedTemp {
+	TimedTemp() : _timeCount(0), _string(0) { }
+
+	uint8 _x;
+	uint8 _y;
+
+	uint16 _timeCount;
+	uint16 _countToTimed;
+
+	const char *_string;
+};
+
 } // End of namespace DreamWeb
 
 #endif
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 5f05f290ad..d93add6b42 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -864,16 +864,16 @@ void DreamWebEngine::dumpTextLine() {
 
 void DreamWebEngine::getUnderTimed() {
 	if (_foreignRelease)
-		multiGet(_underTimedText, _timedX, _timedY - 3, 240, kUnderTimedTextSizeY_f);
+		multiGet(_underTimedText, _timedTemp._x, _timedTemp._y - 3, 240, kUnderTimedTextSizeY_f);
 	else
-		multiGet(_underTimedText, _timedX, _timedY, 240, kUnderTimedTextSizeY);
+		multiGet(_underTimedText, _timedTemp._x, _timedTemp._y, 240, kUnderTimedTextSizeY);
 }
 
 void DreamWebEngine::putUnderTimed() {
 	if (_foreignRelease)
-		multiPut(_underTimedText, _timedX, _timedY - 3, 240, kUnderTimedTextSizeY_f);
+		multiPut(_underTimedText, _timedTemp._x, _timedTemp._y - 3, 240, kUnderTimedTextSizeY_f);
 	else
-		multiPut(_underTimedText, _timedX, _timedY, 240, kUnderTimedTextSizeY);
+		multiPut(_underTimedText, _timedTemp._x, _timedTemp._y, 240, kUnderTimedTextSizeY);
 }
 
 void DreamWebEngine::triggerMessage(uint16 index) {
@@ -903,6 +903,23 @@ void DreamWebEngine::processTrigger() {
 }
 
 void DreamWebEngine::useTimedText() {
+	if (_previousTimedTemp._string) {
+		// TODO: It might be nice to make subtitles wait for the speech
+		// to finish (_channel1Playing) when we're in speech+subtitles mode,
+		// instead of waiting the pre-specified amount of time.
+
+
+		// Ugly... (Maybe make this an argument to putUnderTimed()?)
+		TimedTemp t = _timedTemp;
+		_timedTemp = _previousTimedTemp;
+
+		// Force-reset the previous string to make room for the next one
+		putUnderTimed();
+
+		_timedTemp = t;
+		return;
+	}
+
 	if (_timeCount == 0)
 		return;
 	--_timeCount;
@@ -912,49 +929,65 @@ void DreamWebEngine::useTimedText() {
 		return;
 	}
 
-	if (_timeCount == _countToTimed)
+	if (_timeCount == _timedTemp._countToTimed)
 		getUnderTimed();
-	else if (_timeCount > _countToTimed)
+	else if (_timeCount > _timedTemp._countToTimed)
 		return;
 
-	const uint8 *string = (const uint8 *)_timedString;
-	printDirect(string, _timedX, _timedY, 237, true);
+	const uint8 *string = (const uint8 *)_timedTemp._string;
+	printDirect(string, _timedTemp._x, _timedTemp._y, 237, true);
 	_needToDumpTimed = 1;
 }
 
 void DreamWebEngine::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
+
 	if (hasSpeech() && voiceIndex != 0) {
 		if (loadSpeech('T', voiceIndex, 'T', textIndex)) {
 			playChannel1(50+12);
 		}
 
-		// FIXME: This fallthrough does not properly support subtitles+speech
-		// mode. The parameters to setuptimedtemp() are sometimes different
-		// for speech and for subtitles. See e.g., madmantext()
 		if (_speechLoaded && !_subtitles)
 			return;
+
+		if (_timeCount != 0) {
+			// store previous TimedTemp for deletion
+			_previousTimedTemp = _timedTemp;
+			_timeCount = 0;
+		}
 	}
 
 	if (_timeCount != 0)
 		return;
-	_timedY = y;
-	_timedX = x;
-	_countToTimed = countToTimed;
-	_timeCount = timeCount + countToTimed;
-	_timedString = _textFile1.getString(textIndex);
-	debug(1, "setupTimedTemp: (%d, %d) => '%s'", textIndex, voiceIndex, _timedString);
+
+	_timedTemp._y = y;
+	_timedTemp._x = x;
+	_timedTemp._countToTimed = countToTimed;
+	_timeCount = _timedTemp._timeCount = timeCount + countToTimed;
+	_timedTemp._string = _textFile1.getString(textIndex);
+	debug(1, "setupTimedTemp: (%d, %d) => '%s'", textIndex, voiceIndex, _timedTemp._string);
 }
 
 void DreamWebEngine::dumpTimedText() {
-	const uint16 kUndertimedysize = 30;
-	if (_needToDumpTimed != 1)
+	const TimedTemp *tt;
+	if (_previousTimedTemp._string) {
+		assert(!_needToDumpTimed);
+
+		tt = &_previousTimedTemp;
+		_previousTimedTemp._string = 0;
+		_previousTimedTemp._timeCount = 0;
+	} else if (_needToDumpTimed != 1) {
 		return;
-	uint8 y = _timedY;
+	} else {
+		tt = &_timedTemp;
+		_needToDumpTimed = 0;
+	}
+
+	const uint16 kUndertimedysize = 30;
+	uint8 y = tt->_y;
 	if (_foreignRelease)
 		y -= 3;
 
-	multiDump(_timedX, y, 240, kUndertimedysize);
-	_needToDumpTimed = 0;
+	multiDump(tt->_x, y, 240, kUndertimedysize);
 }
 
 void DreamWebEngine::getTime() {
@@ -2822,12 +2855,12 @@ void DreamWebEngine::setupTimedUse(uint16 textIndex, uint16 countToTimed, uint16
 	if (_timeCount != 0)
 		return; // can't setup
 
-	_timedY = y;
-	_timedX = x;
-	_countToTimed = countToTimed;
-	_timeCount = timeCount + countToTimed;
-	_timedString = _puzzleText.getString(textIndex);
-	debug(1, "setupTimedUse: %d => '%s'", textIndex, _timedString);
+	_timedTemp._y = y;
+	_timedTemp._x = x;
+	_timedTemp._countToTimed = countToTimed;
+	_timeCount = _timedTemp._timeCount = timeCount + countToTimed;
+	_timedTemp._string = _puzzleText.getString(textIndex);
+	debug(1, "setupTimedUse: %d => '%s'", textIndex, _timedTemp._string);
 }
 
 void DreamWebEngine::entryTexts() {
-- 
cgit v1.2.3


From 143363d5b6baef14898ee0f41e3735de2048761a Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 12 Feb 2012 23:47:18 +0100
Subject: DREAMWEB: Improve subtitle durations in madman scene

---
 engines/dreamweb/people.cpp | 10 ++++++++--
 engines/dreamweb/titles.cpp |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 0f51adde17..1b8ee1b4de 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -145,13 +145,19 @@ void DreamWebEngine::updatePeople() {
 void DreamWebEngine::madmanText() {
 	byte origCount;
 
+	uint16 length = 90;
 	if (hasSpeech()) {
-		if (_speechCount >= 63)
+		if (_speechCount > 15)
 			return;
 		if (_channel1Playing != 255)
 			return;
 		origCount = _speechCount;
 		++_speechCount;
+
+		if (origCount != 15)
+			length = 32000; // Set subtitle time very high to make it
+			                // always wait for the next line, except for the
+			                // last one, when there is no next line.
 	} else {
 		if (_vars._combatCount >= 61)
 			return;
@@ -159,7 +165,7 @@ void DreamWebEngine::madmanText() {
 			return;
 		origCount = _vars._combatCount / 4;
 	}
-	setupTimedTemp(47 + origCount, 82, 72, 80, 90, 1);
+	setupTimedTemp(47 + origCount, 82, 72, 80, length, 1);
 }
 
 void DreamWebEngine::madman(ReelRoutine &routine) {
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index 96dabc9b40..8ca5aa70b3 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -51,6 +51,7 @@ void DreamWebEngine::monkSpeaking() {
 	fadeScreenUps();
 	hangOn(300);
 
+	// TODO: Subtitles+speech mode
 	if (hasSpeech()) {
 		for (int i = 40; i < 48; i++) {
 			loadSpeech('T', 83, 'T', i);
-- 
cgit v1.2.3


From 51ef8a78ccc556527d58ab552b7a8b589f2c7c27 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 22 Jan 2012 12:23:55 +0200
Subject: SWORD1: Silence some MSVC warnings (conversion from double to float)

---
 engines/sword1/animation.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index a8c313f2f8..5ad84d995f 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -271,10 +271,10 @@ bool MoviePlayer::playVideo() {
 					// Look for the best color indexes to use to display the subtitles
 					uint32 minWeight = 0xFFFFFFFF;
 					uint32 weight;
-					float c1Weight = 1e+30;
-					float c2Weight = 1e+30;
-					float c3Weight = 1e+30;
-					float c4Weight = 1e+30;
+					float c1Weight = 1e+30f;
+					float c2Weight = 1e+30f;
+					float c3Weight = 1e+30f;
+					float c4Weight = 1e+30f;
 					byte r, g, b;
 					float h, s, v, hd, hsvWeight;
 
-- 
cgit v1.2.3


From fbb51fcd889ac5483d5aad5c0f62980c00bf65da Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 13 Feb 2012 04:03:05 +0200
Subject: SCI: Fix bug #3487092: "SCI: LB1: Magnifying glass cursor is grey"

---
 engines/sci/graphics/cursor.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'engines')

diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index 50da48aaf3..a939b042a7 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -137,6 +137,11 @@ void GfxCursor::kernelSetShape(GuiResourceId resourceId) {
 	colorMapping[1] = _screen->getColorWhite(); // White is also hardcoded
 	colorMapping[2] = SCI_CURSOR_SCI0_TRANSPARENCYCOLOR;
 	colorMapping[3] = _palette->matchColor(170, 170, 170); // Grey
+	// Special case for the magnifier cursor in LB1 (bug #3487092).
+	// No other SCI0 game has a cursor resource of 1, so this is handled
+	// specifically for LB1.
+	if (resourceId == 1)
+		colorMapping[3] = _screen->getColorWhite();
 
 	// Seek to actual data
 	resourceData += 4;
-- 
cgit v1.2.3


From 7a030fcdcd3d512536e4a9fd492c602a7fd51d40 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 13 Feb 2012 13:38:11 +1100
Subject: SCUMM: Fix compiler warning.

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

(limited to 'engines')

diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 144dd701d4..7f532c04d7 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -114,7 +114,7 @@ protected:
 
 	virtual int getActiveObject();
 
-	virtual void resetSentence();
+	void resetSentence();
 
 	virtual bool areBoxesNeighbors(int box1nr, int box2nr);
 
-- 
cgit v1.2.3


From 7da29858e7b582f6914e0cc4f4e2938cb425a49e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 13 Feb 2012 12:05:55 +0200
Subject: SCI: Fix the order of diagonal roll transitions in the old lookup
 table

This fixes several inverted transitions (like in SQ3, ICEMAN, Hoyle 1 etc) - bug #3485194
---
 engines/sci/graphics/transitions.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp
index 438cf376a5..b385c2c1db 100644
--- a/engines/sci/graphics/transitions.cpp
+++ b/engines/sci/graphics/transitions.cpp
@@ -52,8 +52,8 @@ static const GfxTransitionTranslateEntry oldTransitionIDs[] = {
 	{   3, SCI_TRANSITIONS_STRAIGHT_FROM_LEFT,			false },
 	{   4, SCI_TRANSITIONS_STRAIGHT_FROM_BOTTOM,		false },
 	{   5, SCI_TRANSITIONS_STRAIGHT_FROM_TOP,			false },
-	{   6, SCI_TRANSITIONS_DIAGONALROLL_FROMCENTER,		false },
-	{   7, SCI_TRANSITIONS_DIAGONALROLL_TOCENTER,		false },
+	{   6, SCI_TRANSITIONS_DIAGONALROLL_TOCENTER,		false },
+	{   7, SCI_TRANSITIONS_DIAGONALROLL_FROMCENTER,		false },
 	{   8, SCI_TRANSITIONS_BLOCKS,						false },
 	{   9, SCI_TRANSITIONS_VERTICALROLL_TOCENTER,		false },
 	{  10, SCI_TRANSITIONS_HORIZONTALROLL_TOCENTER,		false },
-- 
cgit v1.2.3


From 3f5aaa0ca5b77d3e766d5eb8ea51085f072db701 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 13 Feb 2012 20:26:43 +0100
Subject: SCUMM: Clean up resetSentence

---
 engines/scumm/script_v2.cpp | 8 ++++----
 engines/scumm/scumm_v2.h    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 9c8742cffd..ce162b4a6a 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -873,7 +873,7 @@ void ScummEngine_v2::o2_doSentence() {
 		return;
 	}
 	if (a == 0xFB) {
-		resetSentence(false);
+		resetSentence();
 		return;
 	}
 
@@ -1411,7 +1411,7 @@ void ScummEngine_v2::o2_loadRoomWithEgo() {
 
 	_fullRedraw = true;
 
-	resetSentence(false);
+	resetSentence();
 
 	if (x >= 0 && y >= 0) {
 		a->startWalkActor(x, y, -1);
@@ -1492,7 +1492,7 @@ void ScummEngine_v2::o2_cutscene() {
 
 	_sentenceNum = 0;
 	stopScript(SENTENCE_SCRIPT);
-	resetSentence(false);
+	resetSentence();
 
 	vm.cutScenePtr[0] = 0;
 }
@@ -1640,7 +1640,7 @@ void ScummEngine_v2::o2_switchCostumeSet() {
 		o2_dummy();
 }
 
-void ScummEngine_v2::resetSentence(bool walking) {
+void ScummEngine_v2::resetSentence() {
 	VAR(VAR_SENTENCE_VERB) = VAR(VAR_BACKUP_VERB);
 	VAR(VAR_SENTENCE_OBJECT1) = 0;
 	VAR(VAR_SENTENCE_OBJECT2) = 0;
diff --git a/engines/scumm/scumm_v2.h b/engines/scumm/scumm_v2.h
index b407fd3f8a..316a08d325 100644
--- a/engines/scumm/scumm_v2.h
+++ b/engines/scumm/scumm_v2.h
@@ -87,7 +87,7 @@ protected:
 	void clearStateCommon(byte type);
 	void stopScriptCommon(int script);
 
-	virtual void resetSentence(bool walking);
+	void resetSentence();
 	void setUserState(byte state);
 
 	virtual void handleMouseOver(bool updateInventory);
-- 
cgit v1.2.3


From c7a5d31f0576fe6ced0ac3170ab89c5df13135ba Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 13 Feb 2012 21:21:42 +0100
Subject: BASS: Report savegame errors when saving by pressing enter

This makes error handling consistent between mouse and keyboard.
---
 engines/sky/control.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines')

diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index 9efa6ce769..7741f1080e 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -878,6 +878,8 @@ uint16 Control::saveRestorePanel(bool allowSave) {
 			clickRes = handleClick(lookList[0]);
 			if (clickRes == GAME_SAVED)
 				saveDescriptions(saveGameTexts);
+			else if (clickRes == NO_DISK_SPACE)
+				displayMessage(0, "Could not save the game. (%s)", _saveFileMan->popErrorDesc().c_str());
 			quitPanel = true;
 			_mouseClicked = false;
 			_keyPressed.reset();
-- 
cgit v1.2.3


From 87e85e17cbe95821899bee76d978924760d76f89 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 13 Feb 2012 21:28:32 +0100
Subject: BASS: Fix savegame corruption

When using the GMM or autosaves, _savedMouse and _savedCharSet were
never set. See bug #3487117.
---
 engines/sky/control.cpp   | 15 +++++++++++++--
 engines/sky/control.h     |  2 +-
 engines/sky/detection.cpp |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index 7741f1080e..fd2f2b92d3 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -535,7 +535,7 @@ uint16 Control::handleClick(ConResource *pButton) {
 		return saveRestorePanel(true); // texts can be edited
 	case SAVE_A_GAME:
 		animClick(pButton);
-		return saveGameToFile();
+		return saveGameToFile(true);
 	case RESTORE_A_GAME:
 		animClick(pButton);
 		return restoreGameFromFile(false);
@@ -1101,6 +1101,10 @@ void Control::doAutoSave() {
 		displayMessage(0, "Unable to create autosave file '%s'. (%s)", fName, _saveFileMan->popErrorDesc().c_str());
 		return;
 	}
+
+	_savedCharSet = _skyText->giveCurrentCharSet();
+	_savedMouse = _skyMouse->giveCurrentMouseType();
+
 	uint8 *saveData = (uint8 *)malloc(0x20000);
 	uint32 fSize = prepareSaveData(saveData);
 
@@ -1114,7 +1118,7 @@ void Control::doAutoSave() {
 	free(saveData);
 }
 
-uint16 Control::saveGameToFile() {
+uint16 Control::saveGameToFile(bool fromControlPanel) {
 	char fName[20];
 	sprintf(fName,"SKY-VM.%03d", _selectedGame);
 
@@ -1123,6 +1127,13 @@ uint16 Control::saveGameToFile() {
 	if (outf == NULL)
 		return NO_DISK_SPACE;
 
+	if (!fromControlPanel) {
+		// These variables are usually set when entering the control panel,
+		// but not when using the GMM.
+		_savedCharSet = _skyText->giveCurrentCharSet();
+		_savedMouse = _skyMouse->giveCurrentMouseType();
+	}
+
 	uint8 *saveData = (uint8 *)malloc(0x20000);
 	uint32 fSize = prepareSaveData(saveData);
 
diff --git a/engines/sky/control.h b/engines/sky/control.h
index 6aa7a41c62..59eda9b4e6 100644
--- a/engines/sky/control.h
+++ b/engines/sky/control.h
@@ -190,7 +190,7 @@ public:
 	bool loadSaveAllowed();
 
 	uint16 _selectedGame;
-	uint16 saveGameToFile();
+	uint16 saveGameToFile(bool fromControlPanel);
 
 	void loadDescriptions(Common::StringArray &list);
 	void saveDescriptions(const Common::StringArray &list);
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index 484958ca52..a078200edd 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -286,7 +286,7 @@ Common::Error SkyEngine::saveGameState(int slot, const Common::String &desc) {
 
 	// Set the save slot and save the game
 	_skyControl->_selectedGame = slot - 1;
-	if (_skyControl->saveGameToFile() != GAME_SAVED)
+	if (_skyControl->saveGameToFile(false) != GAME_SAVED)
 		return Common::kWritePermissionDenied;
 
 	// Load current save game descriptions
-- 
cgit v1.2.3


From 54ede63fcc5046f8fec7b59e64b66780fd7a73b5 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 13 Feb 2012 21:23:47 +0100
Subject: BASS: Reduce code duplication in autosave code

---
 engines/sky/control.cpp | 31 +++++++++----------------------
 engines/sky/control.h   |  2 +-
 2 files changed, 10 insertions(+), 23 deletions(-)

(limited to 'engines')

diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index fd2f2b92d3..a40e77d1cb 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -1094,36 +1094,23 @@ void Control::doAutoSave() {
 		strcpy(fName, "SKY-VM-CD.ASD");
 	else
 		sprintf(fName, "SKY-VM%03d.ASD", SkyEngine::_systemVars.gameVersion);
-	Common::OutSaveFile *outf;
-
-	outf = _saveFileMan->openForSaving(fName);
-	if (outf == NULL) {
-		displayMessage(0, "Unable to create autosave file '%s'. (%s)", fName, _saveFileMan->popErrorDesc().c_str());
-		return;
-	}
-
-	_savedCharSet = _skyText->giveCurrentCharSet();
-	_savedMouse = _skyMouse->giveCurrentMouseType();
-
-	uint8 *saveData = (uint8 *)malloc(0x20000);
-	uint32 fSize = prepareSaveData(saveData);
 
-	outf->write(saveData, fSize);
-	outf->finalize();
+	uint16 res = saveGameToFile(false, fName);
 
-	if (outf->err())
-		displayMessage(0, "Unable to write autosave file '%s'. Disk full? (%s)", fName, _saveFileMan->popErrorDesc().c_str());
+	if (res != GAME_SAVED)
+		displayMessage(0, "Unable to perform autosave to '%s'. (%s)", fName, _saveFileMan->popErrorDesc().c_str());
 
-	delete outf;
-	free(saveData);
 }
 
-uint16 Control::saveGameToFile(bool fromControlPanel) {
+uint16 Control::saveGameToFile(bool fromControlPanel, const char *filename) {
 	char fName[20];
-	sprintf(fName,"SKY-VM.%03d", _selectedGame);
+	if (!filename) {
+		sprintf(fName,"SKY-VM.%03d", _selectedGame);
+		filename = fName;
+	}
 
 	Common::OutSaveFile *outf;
-	outf = _saveFileMan->openForSaving(fName);
+	outf = _saveFileMan->openForSaving(filename);
 	if (outf == NULL)
 		return NO_DISK_SPACE;
 
diff --git a/engines/sky/control.h b/engines/sky/control.h
index 59eda9b4e6..42ada564df 100644
--- a/engines/sky/control.h
+++ b/engines/sky/control.h
@@ -190,7 +190,7 @@ public:
 	bool loadSaveAllowed();
 
 	uint16 _selectedGame;
-	uint16 saveGameToFile(bool fromControlPanel);
+	uint16 saveGameToFile(bool fromControlPanel, const char *filename = 0);
 
 	void loadDescriptions(Common::StringArray &list);
 	void saveDescriptions(const Common::StringArray &list);
-- 
cgit v1.2.3


From a5b02677775f06bd0de99b81de104d24a3abc50e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 13 Feb 2012 22:11:18 +0100
Subject: TSAGE: R2R - Scene 1337: Implement subD02CA() plus a couple of little
 functions used by AI

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 504 +++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  17 +-
 engines/tsage/staticres.cpp                     |   2 +-
 engines/tsage/staticres.h                       |   1 +
 4 files changed, 497 insertions(+), 27 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 0c95ee3f25..6dd0fb42e5 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1657,7 +1657,7 @@ void Scene1337::synchronize(Serializer &s) {
 	warning("STUBBED: Scene1337::synchronize()");
 }
 
-void Scene1337::Action1337::subD18B5(int arg1, int arg2, int arg3) {
+void Scene1337::Action1337::subD18B5(int resNum, int stripNum, int frameNum) {
 	warning("STUBBED: Action1337::sub53CD5()");
 }
 
@@ -3239,7 +3239,7 @@ void Scene1337::Action10::signal() {
 					scene->_item6._field36 = event.mousePos;
 	
 					for (int i = 0; i <= 7; i++) {
-						if ((scene->subC2BF8(&scene->_arrunkObj1337[2]._arr2[i], &scene->_item6._field36) != 0) && (scene->_arrunkObj1337[2]._arr2[i]._field34 != 0)) {
+						if ((scene->subC2BF8(&scene->_arrunkObj1337[2]._arr2[i], scene->_item6._field36) != 0) && (scene->_arrunkObj1337[2]._arr2[i]._field34 != 0)) {
 							scene->_field3EF4 = &scene->_arrunkObj1337[2]._arr2[0];
 							found2 = true;
 							break;
@@ -3438,7 +3438,7 @@ void Scene1337::Action11::signal() {
 
 					if (scene->_field4242 != 2) {
 						for (i = 0; i <= 3; i++) {
-							if ((scene->subC2BF8(&scene->_arrunkObj1337[scene->_field4242]._arr1[i], &scene->_item6._field36) != 0) && (scene->_arrunkObj1337[scene->_field4242]._arr1[i]._field34 != 0)) {
+							if ((scene->subC2BF8(&scene->_arrunkObj1337[scene->_field4242]._arr1[i], scene->_item6._field36) != 0) && (scene->_arrunkObj1337[scene->_field4242]._arr1[i]._field34 != 0)) {
 								scene->_field3EF8 = &scene->_arrunkObj1337[scene->_field4242]._arr1[i];
 								found = true;
 								break;
@@ -3587,7 +3587,7 @@ void Scene1337::Action12::signal() {
 
 					if (scene->_field4240 == 0) {
 						for (i = 0; i <= 3; i++) {
-							if ((scene->subC2BF8(&scene->_arrunkObj1337[0]._arr1[i], &scene->_item6._field36) != 0) && (scene->_arrunkObj1337[0]._arr1[i]._field34 != 0)) {
+							if ((scene->subC2BF8(&scene->_arrunkObj1337[0]._arr1[i], scene->_item6._field36) != 0) && (scene->_arrunkObj1337[0]._arr1[i]._field34 != 0)) {
 								found = true;
 								scene->_field3EF8 = &scene->_arrunkObj1337[0]._arr1[i];
 								break;
@@ -3597,7 +3597,7 @@ void Scene1337::Action12::signal() {
 					
 					if (scene->_field4240 == 3) {
 						for (i = 0; i <= 3; i++) {
-							if ((scene->subC2BF8(&scene->_arrunkObj1337[3]._arr1[i], &scene->_item6._field36) != 0) && (scene->_arrunkObj1337[3]._arr1[i]._field34 != 0)) {
+							if ((scene->subC2BF8(&scene->_arrunkObj1337[3]._arr1[i], scene->_item6._field36) != 0) && (scene->_arrunkObj1337[3]._arr1[i]._field34 != 0)) {
 								found = true;
 								scene->_field3EF8 = &scene->_arrunkObj1337[3]._arr1[i];
 								break;
@@ -3607,7 +3607,7 @@ void Scene1337::Action12::signal() {
 
 					if (scene->_field4240 == 1) {
 						for (i = 0; i <= 3; i++) {
-							if ((scene->subC2BF8(&scene->_arrunkObj1337[1]._arr1[i], &scene->_item6._field36) != 0) && (scene->_arrunkObj1337[1]._arr1[i]._field34 != 0)) {
+							if ((scene->subC2BF8(&scene->_arrunkObj1337[1]._arr1[i], scene->_item6._field36) != 0) && (scene->_arrunkObj1337[1]._arr1[i]._field34 != 0)) {
 								found = true;
 								scene->_field3EF8 = &scene->_arrunkObj1337[1]._arr1[i];
 								break;
@@ -4271,20 +4271,40 @@ void Scene1337::subC2835(int arg1) {
 	subC4A39(&_arrunkObj1337[arg1]._arr1[i]);
 }
 
-int Scene1337::subC2BF8(unkObj1337sub1 *subObj1, Common::Point *pt) {
-	warning("STUBBED Scene1337::subC2BF8()");
-	return -1;
+bool Scene1337::subC2BF8(unkObj1337sub1 *subObj1, Common::Point pt) {
+	if ((subObj1->_field36.x > pt.x) || (subObj1->_field36.x + 24 < pt.x))
+		return false;
+
+	if ((subObj1->_field36.y > pt.y) || (subObj1->_field36.y + 24 < pt.y))
+		return false;
+
+	return true;
 }
 
 void Scene1337::subC2C2F() {
 	warning("STUBBED Scene1337::subC2C2F()");
 }
 
-void Scene1337::subC318B(int arg1, unkObj1337sub1 *subObj2) {
-	warning("STUBBED Scene1337::subC318B()");
+void Scene1337::subC318B(int arg1, unkObj1337sub1 *subObj1, int arg3) {
+	_field4240 = arg1;
+	_field4242 = arg3;
+
+	int randIndx;
+	
+	for (;;) {
+		randIndx = R2_GLOBALS._randomSource.getRandomNumber(3);
+		if (_arrunkObj1337[arg3]._arr1[randIndx]._field34 != 0)
+			break;
+	}
+
+	_field3EF0 = subObj1;
+	_field3EF4 = &_arrunkObj1337[arg3]._arr4[0];
+	_field3EF8 = &_arrunkObj1337[arg3]._arr1[randIndx];
+
+	_item1.setAction(&_action11);
 }
 
-int Scene1337::subC32B1(int arg1) {
+int Scene1337::subC32B1(int arg1, int arg2) {
 	warning("STUBBED Scene1337::subC32B1()");
 	return -1;
 }
@@ -4323,8 +4343,17 @@ void Scene1337::subC34A1(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
 	warning("STUBBED Scene1337::subC34A1()");
 }
 
-void Scene1337::subC358E(unkObj1337sub1 *subObj1) {
-	warning("STUBBED Scene1337::subC358E()");
+Scene1337::unkObj1337sub1 *Scene1337::subC34EC(int arg1) {
+	warning("STUBBED Scene1337::subC34EC()");
+	return NULL;
+}
+
+void Scene1337::subC358E(unkObj1337sub1 *subObj1, int arg2) {
+	_field3EF0 = subObj1;
+	_field3EF4 = subC34EC(arg2);
+	_field3EF8 = &_arrunkObj1337[arg2]._arr4[0];
+	_field4240 = arg2;
+	_item1.setAction(&_action10);
 }
 
 void Scene1337::subC4A39(unkObj1337sub1 *subObj) {
@@ -4577,6 +4606,10 @@ void Scene1337::subCCF26() {
 	_item1.setAction(&_action3);
 }
 
+void Scene1337::subCDB90(int arg1, Common::Point *pt) {
+	warning("STUBBED: subCDB90()");
+}
+
 void Scene1337::subCF31D() {
 	int tmpVal = 1;
 	bool found;
@@ -4676,9 +4709,10 @@ void Scene1337::subCF31D() {
 		return;
 
 	tmpVal = subC274D(1);
+	int tmpVal2 = subC331B(1);
 
-	if ((tmpVal != -1) && (subC331B(1) != -1))
-		subC358E(&_arrunkObj1337[1]._arr1[tmpVal]);
+	if ((tmpVal != -1) && ( tmpVal2 != -1))
+		subC358E(&_arrunkObj1337[1]._arr1[tmpVal], tmpVal2);
 
 	if (found)
 		return;
@@ -4704,7 +4738,7 @@ void Scene1337::subCF31D() {
 		}
 
 		if (count != -1) {
-			subC318B(1, &_arrunkObj1337[1]._arr1[tmpVal]);
+			subC318B(1, &_arrunkObj1337[1]._arr1[tmpVal], count);
 			found = true;
 		}
 	}
@@ -4724,7 +4758,7 @@ void Scene1337::subCF31D() {
 					for (int k = 0; k <= 7; k++) {
 						// 'k' is not used in that loop. 
 						// It looks suspicious.
-						if ((_arrunkObj1337[tmpVal]._arr3[0]._field34 == 0) && (subC32B1(_arrunkObj1337[1]._arr1[i]._field34) == 1)) {
+						if ((_arrunkObj1337[tmpVal]._arr3[0]._field34 == 0) && (subC32B1(tmpVal, _arrunkObj1337[1]._arr1[i]._field34) == 1)) {
 							count = tmpVal;
 							break;
 						}
@@ -4809,7 +4843,418 @@ void Scene1337::subD0281() {
 }
 
 void Scene1337::subD02CA() {
-	warning("STUBBED lvl4 Scene1337::subD02CA()");
+	_item6._field36 = g_globals->_events._mousePos;
+
+	if (R2_GLOBALS._v57810 == 200) {
+		int di;
+		for (di = 0; di < 4; di++) {
+			if ((subC2BF8(&_arrunkObj1337[2]._arr1[di], _item6._field36) != 0) && (_arrunkObj1337[2]._arr1[di]._field34 != 0)) {
+				_item6._field34 = _arrunkObj1337[2]._arr1[di]._field34;
+				_item6._field36 = _arrunkObj1337[2]._arr1[di]._field36;
+				// _item6._actorName = _arrunkObj1337[2]._arr1[di]._actorName;
+				_item6._fieldE = _arrunkObj1337[2]._arr1[di]._fieldE;
+				_item6._field10 = _arrunkObj1337[2]._arr1[di]._field10;
+				warning("_item6._field12 = _arrunkObj1337[2]._arr1[di]._field12;");
+				warning("_item6._field14 = _arrunkObj1337[2]._arr1[di]._field14;");
+				warning("_item6._field16 = _arrunkObj1337[2]._arr1[di]._field16;");
+				_item6._sceneRegionId = _arrunkObj1337[2]._arr1[di]._sceneRegionId;
+				_item6._position = _arrunkObj1337[2]._arr1[di]._position;
+				_item6._yDiff = _arrunkObj1337[2]._arr1[di]._yDiff;
+				_item6._bounds = _arrunkObj1337[2]._arr1[di]._bounds;
+				_item6._resNum = _arrunkObj1337[2]._arr1[di]._resNum;
+				_item6._lookLineNum = _arrunkObj1337[2]._arr1[di]._lookLineNum;
+				_item6._talkLineNum = _arrunkObj1337[2]._arr1[di]._talkLineNum;
+				_item6._useLineNum = _arrunkObj1337[2]._arr1[di]._useLineNum;
+				_item6._action = _arrunkObj1337[2]._arr1[di]._action;
+				warning("_item6._field0 = _arrunkObj1337[2]._arr1[di]._field0;");
+				_item6._object1._updateStartFrame = _arrunkObj1337[2]._arr1[di]._object1._updateStartFrame;
+				_item6._object1._walkStartFrame = _arrunkObj1337[2]._arr1[di]._object1._walkStartFrame;
+				// _field2E is named _field3C in R2R
+				_item6._object1._field2E = _arrunkObj1337[2]._arr1[di]._object1._field2E;
+				_item6._object1._percent = _arrunkObj1337[2]._arr1[di]._object1._percent;
+				_item6._object1._priority = _arrunkObj1337[2]._arr1[di]._object1._priority;
+				_item6._object1._angle = _arrunkObj1337[2]._arr1[di]._object1._angle;
+				_item6._object1._flags = _arrunkObj1337[2]._arr1[di]._object1._flags;
+				_item6._object1._xe = _arrunkObj1337[2]._arr1[di]._object1._xe;
+				_item6._object1._xs = _arrunkObj1337[2]._arr1[di]._object1._xs;
+				_item6._object1._paneRects[0] = _arrunkObj1337[2]._arr1[di]._object1._paneRects[0];
+				_item6._object1._paneRects[1] = _arrunkObj1337[2]._arr1[di]._object1._paneRects[1];
+				_item6._object1._visage = _arrunkObj1337[2]._arr1[di]._object1._visage;
+				_item6._object1._objectWrapper = _arrunkObj1337[2]._arr1[di]._object1._objectWrapper;
+				_item6._object1._strip = _arrunkObj1337[2]._arr1[di]._object1._strip;
+				_item6._object1._animateMode = _arrunkObj1337[2]._arr1[di]._object1._animateMode;
+				_item6._object1._frame = _arrunkObj1337[2]._arr1[di]._object1._frame;
+				_item6._object1._endFrame = _arrunkObj1337[2]._arr1[di]._object1._endFrame;
+				// _field68 is named _field76 in R2R
+				_item6._object1._field68 = _arrunkObj1337[2]._arr1[di]._object1._field68;
+				_item6._object1._frameChange = _arrunkObj1337[2]._arr1[di]._object1._frameChange;
+				_item6._object1._numFrames = _arrunkObj1337[2]._arr1[di]._object1._numFrames;
+				_item6._object1._regionIndex = _arrunkObj1337[2]._arr1[di]._object1._regionIndex;
+				_item6._object1._mover = _arrunkObj1337[2]._arr1[di]._object1._mover;
+				_item6._object1._moveDiff = _arrunkObj1337[2]._arr1[di]._object1._moveDiff;
+				_item6._object1._moveRate = _arrunkObj1337[2]._arr1[di]._object1._moveRate;
+				_item6._object1._field8A = _arrunkObj1337[2]._arr1[di]._object1._field8A;
+				_item6._object1._endAction = _arrunkObj1337[2]._arr1[di]._object1._endAction;
+				_item6._object1._regionBitList = _arrunkObj1337[2]._arr1[di]._object1._regionBitList;
+				// _item6._object1._actorName = _arrunkObj1337[2]._arr1[di]._object1._actorName;
+				_item6._object1._fieldE = _arrunkObj1337[2]._arr1[di]._object1._fieldE;
+				_item6._object1._field10 = _arrunkObj1337[2]._arr1[di]._object1._field10;
+				warning("_item6._object1._field12 = _arrunkObj1337[2]._arr1[di]._object1._field12;");
+				warning("_item6._object1._field14 = _arrunkObj1337[2]._arr1[di]._object1._field14;");
+				warning("_item6._object1._field16 = _arrunkObj1337[2]._arr1[di]._object1._field16;");
+				_item6._object1 = _arrunkObj1337[2]._arr1[di]._object1;
+			}
+		}
+		
+		if (di == 4) {
+			subCDB90(1, &_item6._field36);
+			subD0281();
+			return;
+		}
+	} else if (R2_GLOBALS._v57810 == 300) {
+		subCDB90(3, &_item6._field36);
+		subD0281();
+		return;
+	} else {
+		subD1A48(R2_GLOBALS._v57810);
+		subD0281();
+		return;
+	}
+	
+	// That continues the block when R2_GLOBALS._v57810 == 200 and di != 4
+	subD18B5(1332, _item6._object1._strip, _item6._object1._frame);
+	R2_GLOBALS._sceneObjects->draw();
+	Event event;
+	bool found = false;
+	bool found_di;
+	for (;;) {
+		if ( ((g_globals->_events.getEvent(event, EVENT_BUTTON_DOWN)) && (event.btnState == BTNSHIFT_RIGHT))
+			|| (g_globals->_events.getEvent(event, EVENT_KEYPRESS)) ){
+			_item6._field36 = g_globals->_events._mousePos;
+			found_di = false;
+			
+			for (int i = 0; i <= 3; i ++) {
+				if (subC2BF8(&_arrunkObj1337[2]._arr1[i], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+					if (_arrunkObj1337[2]._arr1[i]._field34 == 0) {
+						_arrunkObj1337[2]._arr1[i]._field34 = _item6._field34;
+						_arrunkObj1337[2]._arr1[i]._object1.postInit();
+						_arrunkObj1337[2]._arr1[i]._object1.hide();
+						_arrunkObj1337[2]._arr1[i]._object1.setVisage(1332);
+						_arrunkObj1337[2]._arr1[i]._object1.setPosition(_arrunkObj1337[2]._arr1[i]._field36, 0);
+						_arrunkObj1337[2]._arr1[i]._object1.fixPriority(170);
+						setAnimationInfo(&_arrunkObj1337[2]._arr1[i]);
+						subD18B5(5, 1, 4);
+						found = true;
+						_field423E--;
+						_field4244 = 0;
+						subC20F9();
+					} else {
+						actionDisplay(1330, 127, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+						found_di = true;
+					}
+					break;
+				}
+			}
+			
+			if ((!found) && (!found_di)) {
+				if (subC2BF8(&_item7, Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+					subC4A39(&_item6);
+				} else if (!found) {
+					bool foundVar4;
+					int i;
+					if (_item6._field34 == 1) {
+						foundVar4 = false;
+						for (i = 0; i <= 7; i++) {
+							if (subC2BF8(&_arrunkObj1337[2]._arr2[i], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+								foundVar4 = true;
+								break;
+							}
+						}
+
+						if ((foundVar4) && (_arrunkObj1337[2]._arr2[i]._field34 == 0)) {
+							if (subC27B5(_arrunkObj1337[2]._arr3[0]._field34) != -1) {
+								actionDisplay(1330, 55, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+							} else {
+								subC340B(&_item6, &_arrunkObj1337[2]._arr2[i]);
+								return;
+							}
+						} else {
+							actionDisplay(1330, 56, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+						}
+					} else if (_item6._field34 <= 9) {
+						foundVar4 = false;
+						for (i = 0; i <= 7; i++) {
+							if (subC2BF8(&_arrunkObj1337[2]._arr2[i], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+								foundVar4 = true;
+								break;
+							}
+						}
+						if ((foundVar4) && (_arrunkObj1337[2]._arr2[i]._field34 == 1)) {
+							foundVar4 = false;
+							int j;
+							for (j = 0; j <= 7; j++) {
+								if (_item6._field34 == _arrunkObj1337[2]._arr2[j]._field34) {
+									foundVar4 = true;
+									break;
+								}
+							}
+							if (foundVar4) {
+								actionDisplay(1330, 34, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+							} else if (subC27B5(_arrunkObj1337[2]._arr3[0]._field34) != -1) {
+								actionDisplay(1330, 35, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+							} else {
+								if (j == 7)
+									_field424A = 2;
+								
+								subC33C0(&_item6, &_arrunkObj1337[2]._arr2[i]);
+								return;
+							}
+						} else {
+							actionDisplay(1330, 37, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+						}
+					} else {
+						if ((_item6._field34 == 26) || (_item6._field34 == 30) ||(_item6._field34 == 32) || (_item6._field34 == 28)) {
+							if (subC2BF8(&_arrunkObj1337[2]._arr3[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+								actionDisplay(1330, 42, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+							} else if (subC3386(_arrunkObj1337[2]._arr3[0]._field34, _item6._field34) == 0) {
+								if (_arrunkObj1337[2]._arr3[0]._field34 != 0) {
+									switch (_arrunkObj1337[2]._arr3[0]._field34) {
+									case 11:
+										actionDisplay(1330, 68, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+										break;
+									case 14:
+										actionDisplay(1330, 80, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+										break;
+									case 16:
+										actionDisplay(1330, 84, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+										break;
+									case 24:
+										actionDisplay(1330, 96, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+										break;
+									default:
+										break;
+									}
+								} else {
+									actionDisplay(1330, 41, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+								}
+							} else {
+								subC34A1(&_item6, &_arrunkObj1337[2]._arr3[0]);
+								return;
+							}
+						} else {
+							if ((subC27F9(_item6._field34) == -1) && (subC27B5(_item6._field34) == -1)) {
+								if (_item6._field34 == 13) {
+									if (subC2BF8(&_arrunkObj1337[0]._arr4[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+										for (int k = 0; k <= 7; k++) {
+											if (_arrunkObj1337[0]._arr2[k]._field34 != 0) {
+												found = true;
+												subC358E(&_item6, 0);
+											}
+										}
+
+										if (!found)
+											actionDisplay(1330, 74, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+									} else if (subC2BF8(&_arrunkObj1337[3]._arr4[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+										for (int k = 0; k <= 7; k++) {
+											if (_arrunkObj1337[3]._arr2[k]._field34 != 0) {
+												found = true;
+												subC358E(&_item6, 3);
+											}
+										}
+										if (!found)
+											actionDisplay(1330, 74, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+									} else if (subC2BF8(&_arrunkObj1337[1]._arr4[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+										for (int k = 0; k <= 7; k++) {
+											if (_arrunkObj1337[1]._arr2[k]._field34 == 0) {
+												found = true;
+												subC358E(&_item6, 1);
+											}
+										}
+										if (!found)
+											actionDisplay(1330, 74, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+									} else {
+										actionDisplay(1330, 128, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+									}
+								} else if (_item6._field34 == 25) {
+									int k;
+									if (subC2BF8(&_arrunkObj1337[0]._arr4[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+										if ( (_arrunkObj1337[0]._arr1[0]._field34 != 0)
+											|| (_arrunkObj1337[0]._arr1[1]._field34 != 0)
+											|| (_arrunkObj1337[0]._arr1[2]._field34 != 0)
+											|| (_arrunkObj1337[0]._arr1[3]._field34 != 0) ) {
+												for (k = 0; k <= 3; k++){
+													if (_arrunkObj1337[2]._arr1[k]._field34 == 0)
+														break;
+												}
+												subC318B(2, &_arrunkObj1337[2]._arr1[k], 0);
+												return;
+										} else {
+											actionDisplay(1330, 99, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+										}
+									} else if (subC2BF8(&_arrunkObj1337[1]._arr4[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+										if ( (_arrunkObj1337[1]._arr1[0]._field34 != 0)
+											|| (_arrunkObj1337[1]._arr1[1]._field34 != 0)
+											|| (_arrunkObj1337[1]._arr1[2]._field34 != 0)
+											|| (_arrunkObj1337[1]._arr1[3]._field34 != 0) ) {
+												for (k = 0; k <= 3; k++){
+													if (_arrunkObj1337[2]._arr1[k]._field34 == 0)
+														break;
+												}
+												subC318B(2, &_arrunkObj1337[2]._arr1[k], 1);
+												return;
+										} else {
+											actionDisplay(1330, 99, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+										}
+									}
+									
+									if (subC2BF8(&_arrunkObj1337[3]._arr4[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+										if ( (_arrunkObj1337[3]._arr1[0]._field34 != 0)
+											|| (_arrunkObj1337[3]._arr1[1]._field34 != 0)
+											|| (_arrunkObj1337[3]._arr1[2]._field34 != 0)
+											|| (_arrunkObj1337[3]._arr1[3]._field34 != 0) ) {
+												for (k = 0; k <= 3; k++){
+													if (_arrunkObj1337[2]._arr1[k]._field34 == 0)
+														break;
+												}
+												subC318B(2, &_arrunkObj1337[2]._arr1[k], 3);
+												return;
+										} else {
+											actionDisplay(1330, 99, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+										}
+									} else {
+										actionDisplay(1330, 129, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+									}
+								} else if (_item6._field34 == 29) {
+									actionDisplay(1330, 136, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+								} else if (_item6._field34 == 27) {
+									actionDisplay(1330, 137, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+								}
+							} else {
+								if (subC2BF8(&_arrunkObj1337[0]._arr3[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+									if (_arrunkObj1337[0]._arr3[0]._field34 != 0) {
+										actionDisplay(1330, 15, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+									} else if (subC32B1(0, _item6._field34) != 1) {
+										switch (_item6._field34) {
+										case 10:
+											actionDisplay(1330, 66, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 12:
+											actionDisplay(1330, 70, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 15:
+											actionDisplay(1330, 82, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 17:
+											actionDisplay(1330, 86, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 18:
+											actionDisplay(1330, 88, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 19:
+											actionDisplay(1330, 90, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 20:
+											actionDisplay(1330, 92, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 21:
+											actionDisplay(1330, 94, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										default:
+											break;
+										}
+									} else {
+										subC3456(&_item6, &_arrunkObj1337[0]._arr3[0]);
+										found = true;
+									}
+								} else if (subC2BF8(&_arrunkObj1337[3]._arr3[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+									if (_arrunkObj1337[3]._arr3[0]._field34 != 0) {
+										actionDisplay(1330, 17, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+									} else if (subC32B1(3, _item6._field34) != 1) {
+										switch (_item6._field34) {
+										case 10:
+											actionDisplay(1330, 66, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 12:
+											actionDisplay(1330, 70, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 15:
+											actionDisplay(1330, 82, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 17:
+											actionDisplay(1330, 86, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 18:
+											actionDisplay(1330, 88, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 19:
+											actionDisplay(1330, 90, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 20:
+											actionDisplay(1330, 92, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 21:
+											actionDisplay(1330, 94, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										default:
+											break;
+										}
+									} else {
+										subC3456(&_item6, &_arrunkObj1337[3]._arr3[0]);
+										found = true;
+									}
+								} else if (subC2BF8(&_arrunkObj1337[1]._arr3[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
+									if (_arrunkObj1337[1]._arr3[0]._field34 != 0) {
+										actionDisplay(1330, 19, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+									} else if (subC32B1(1, _item6._field34) != 1) {
+										switch (_item6._field34) {
+										case 10:
+											actionDisplay(1330, 66, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 12:
+											actionDisplay(1330, 70, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 15:
+											actionDisplay(1330, 82, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 17:
+											actionDisplay(1330, 86, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 18:
+											actionDisplay(1330, 88, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 19:
+											actionDisplay(1330, 90, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 20:
+											actionDisplay(1330, 92, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										case 21:
+											actionDisplay(1330, 94, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+											break;
+										default:
+											break;
+										}
+									} else {
+										subC3456(&_item6, &_arrunkObj1337[1]._arr3[0]);
+										found = true;
+									}
+								} else {
+									actionDisplay(1330, 38, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			if (found)
+				return;
+		} else {
+			g_globals->_scenePalette.signalListeners();
+			R2_GLOBALS._sceneObjects->draw();
+			g_globals->_events.delay(g_globals->_sceneHandler->_delayTicks);
+		}
+	}
 }
 
 void Scene1337::subD183F(int arg1, int arg2) {
@@ -4880,6 +5325,27 @@ void Scene1337::subD1975(int arg1, int arg2) {
 	warning("STUBBED lvl2 Scene1337::subD1975()");
 }
 
+void Scene1337::subD1A48(int arg1) {
+	int tmpVal = -1;
+
+	switch (arg1) {
+	case 200:
+		tmpVal = 141;
+		break;
+	case 300:
+		tmpVal = 142;
+		break;
+	default:
+		MessageDialog::show(WRONG_ANSWER_MSG, OK_BTN_STRING);
+		break;
+	}
+
+	if (tmpVal == -1)
+		return;
+
+	actionDisplay(1330, tmpVal, -1, -1, 1, 220, 1, 5, 0, 105, 0);
+}
+
 /*--------------------------------------------------------------------------
  * Scene 1500 - Cutscene: Ship landing
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index d23ce00793..0c3764639e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -170,7 +170,7 @@ public:
 };
 
 class Scene1337 : public SceneExt {
-	class unkObj1337sub1: public SceneItem {
+	class unkObj1337sub1: public SceneHotspot {
 	public:
 		SceneObject _object1;
 
@@ -181,7 +181,7 @@ class Scene1337 : public SceneExt {
 		void synchronize(Serializer &s);
 	};
 
-	class unkObj1337_1: public SceneItem {
+	class unkObj1337_1: public SceneHotspot {
 	public:
 		unkObj1337sub1 _arr1[4];
 		unkObj1337sub1 _arr2[8];
@@ -200,7 +200,7 @@ class Scene1337 : public SceneExt {
 
 	class Action1337: public Action {
 	public:
-		void subD18B5(int arg1, int arg2, int arg3);
+		void subD18B5(int resNum, int stripNum, int frameNum);
 		void skipFrames(int32 skipCount);
 	};
 
@@ -325,17 +325,18 @@ public:
 	int  subC27B5(int arg1);
 	int  subC27F9(int arg1);
 	void subC2835(int arg1);
-	int  subC2BF8(unkObj1337sub1 *subObj1, Common::Point *pt);
+	bool subC2BF8(unkObj1337sub1 *subObj1, Common::Point pt);
 	void subC2C2F();
-	void subC318B(int arg1, unkObj1337sub1 *subObj2);
-	int  subC32B1(int arg1);
+	void subC318B(int arg1, unkObj1337sub1 *subObj2, int arg3);
+	int  subC32B1(int arg1, int arg2);
 	int  subC331B(int arg1);
 	int  subC3386(int arg1, int arg2);
 	void subC33C0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
 	void subC3456(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
 	void subC340B(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
 	void subC34A1(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
-	void subC358E(unkObj1337sub1 *subObj1);
+	unkObj1337sub1 *subC34EC(int arg1);
+	void subC358E(unkObj1337sub1 *subObj1, int arg2);
 	int  subC3E92(int arg1);
 	void subC4A39(unkObj1337sub1 *subObj);
 	void subC4CD2();
@@ -346,6 +347,7 @@ public:
 	void suggestInstructions();
 	void shuffleCards();
 	void subCCF26();
+	void subCDB90(int arg1, Common::Point *pt);
 	void subCF31D();
 	void subCF979();
 	void subD026D();
@@ -358,6 +360,7 @@ public:
 	int  subD1940(bool flag);
 	void subD195F(int arg1, int arg2);
 	void subD1975(int arg1, int arg2);
+	void subD1A48(int arg1);
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void remove();
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index e8004bc40d..c254565aca 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -243,7 +243,7 @@ char const *const NO_MSG = " No ";
 char const *const USE_INTERCEPTOR = "Do you want to use your interceptor card?";
 char const *const USE_DOUBLE_AGENT = "Do you want to use your double agent?";
 char const *const NEED_INSTRUCTIONS = "Do you want instructions?";
-
+char const *const WRONG_ANSWER_MSG = "Wrong respond value sent.";
 const byte k562CC[] = {
 	20, 7,  41, 6,
 	3,  6,  42, 11,
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index 41d1991b48..e3daf73333 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -196,6 +196,7 @@ extern char const *const NO_MSG;
 extern char const *const USE_INTERCEPTOR;
 extern char const *const USE_DOUBLE_AGENT;
 extern char const *const NEED_INSTRUCTIONS;
+extern char const *const WRONG_ANSWER_MSG;
 
 // Scene 1550 arrays of constants
 extern const byte k562CC[];
-- 
cgit v1.2.3


From 29919077cdf0f936b3ec8bba901b6b08c6ecd774 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 13 Feb 2012 23:39:13 +0100
Subject: TSAGE: R2R - Scene 1337: Implement 10 more AI functions

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 139 ++++++++++++++++++++----
 engines/tsage/ringworld2/ringworld2_scenes1.h   |   5 +-
 2 files changed, 122 insertions(+), 22 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 6dd0fb42e5..ea089279b6 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4304,28 +4304,114 @@ void Scene1337::subC318B(int arg1, unkObj1337sub1 *subObj1, int arg3) {
 	_item1.setAction(&_action11);
 }
 
-int Scene1337::subC32B1(int arg1, int arg2) {
-	warning("STUBBED Scene1337::subC32B1()");
-	return -1;
+int Scene1337::subC3257(int arg1) {
+	int retVal;
+
+	switch (arg1) {
+	case 10:
+		retVal = 2;
+		break;
+	case 12:
+		retVal = 3;
+		break;
+	case 15:
+		retVal = 5;
+		break;
+	case 17:
+		retVal = 9;
+		break;
+	case 18:
+		retVal = 6;
+		break;
+	case 19:
+		retVal = 4;
+		break;
+	case 20:
+		retVal = 8;
+		break;
+	case 21:
+		retVal = 7;
+		break;
+	default:
+		retVal = -1;
+	}
+
+	return retVal;
+}
+
+bool Scene1337::subC32B1(int arg1, int arg2) {
+	for (int i = 0; i <= 7; i++) {
+		if (_arrunkObj1337[arg1]._arr2[i]._field34 != 0) {
+			int tmpVal = subC3257(arg2);
+			if (tmpVal == _arrunkObj1337[arg1]._arr2[i]._field34)
+				return false;
+		}
+	}
+	return true;
 }
 
 int Scene1337::subC331B(int arg1) {
-	warning("STUBBED Scene1337::subC331B()");
+	int randIndx = R2_GLOBALS._randomSource.getRandomNumber(3);
+
+	for (int i = 0; i <= 3; i++) {
+		if (randIndx != arg1) {
+			for (int j = 0; j <= 7; j++) {
+				if (_arrunkObj1337[randIndx]._arr2[j]._field34 != 0)
+					return randIndx;
+			}
+		}
+
+		if (arg1 == 1) {
+			randIndx--;
+			if (randIndx < 0)
+				randIndx = 3;
+		} else {
+			++randIndx;
+			if (randIndx > 3)
+				randIndx = 0;
+		}
+	}
+
 	return -1;
 }
 
-int Scene1337::subC3386(int arg1, int arg2) {
-	warning("STUBBED Scene1337::subCF979()");
-	return -1;
+bool Scene1337::subC3386(int arg1, int arg2) {
+	if ((arg1 == 11) && (arg2 == 26))
+		return true;
+
+	if ((arg1 == 14) && (arg2 == 30))
+		return true;
+
+	if ((arg1 == 16) && (arg2 == 32))
+		return true;
+
+	if ((arg1 == 24) && (arg2 == 28))
+		return true;
+
+	return false;
 }
 
 void Scene1337::subC33C0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
-	warning("STUBBED Scene1337::subC33C0()");
+	_field3EF4 = subObj2;
+	_field3EF0 = subObj1;
+	_item1.setAction(&_action7);
 }
 
 int Scene1337::subC3E92(int arg1) {
-	warning("STUBBED Scene1337::subC3E92()");
-	return -1;
+	if ( (_arrunkObj1337[arg1]._arr1[0]._field34 == 0) 
+	  && (_arrunkObj1337[arg1]._arr1[1]._field34 == 0)
+	  && (_arrunkObj1337[arg1]._arr1[2]._field34 == 0)
+	  && (_arrunkObj1337[arg1]._arr1[3]._field34 == 0))
+	  return -1;
+
+	int randIndx;
+	for (;;) {
+		randIndx = R2_GLOBALS._randomSource.getRandomNumber(3);
+		if (_arrunkObj1337[arg1]._arr1[randIndx]._field34 == 0)
+			break;
+	}
+
+	return randIndx;
 }
 
 void Scene1337::subC340B(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
@@ -4336,11 +4422,17 @@ void Scene1337::subC340B(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
 }
 
 void Scene1337::subC3456(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
-	warning("STUBBED Scene1337::subC3456()");
+	_field3EF0 = subObj1;
+	_field3EF4 = subObj2;
+
+	_item1.setAction(&_action9);
 }
 
 void Scene1337::subC34A1(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
-	warning("STUBBED Scene1337::subC34A1()");
+	_field3EF0 = subObj1;
+	_field3EF4 = subObj2;
+
+	_item1.setAction(&_action8);
 }
 
 Scene1337::unkObj1337sub1 *Scene1337::subC34EC(int arg1) {
@@ -4370,11 +4462,18 @@ void Scene1337::subC4CD2() {
 }
 
 void Scene1337::subC4CEC() {
-	warning("STUBBED Scene1337::subC4CEC()");
+	if (R2_GLOBALS._v57709 != 0)
+		return;
+
+	subD18F5();
+	subD1940(1);
 }
 
 void Scene1337::subC51A0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
-	warning("STUBBED Scene1337::subC51A0()");
+	_field3EF0 = subObj1;
+	_field3EF4 = subObj2;
+
+	_item1.setAction(&_action13);
 }
 
 void Scene1337::subPostInit() {
@@ -4639,7 +4738,7 @@ void Scene1337::subCF31D() {
 			found = false;
 			int i;
 			for (i = 0; i <= 3; i++) {
-				if (subC3386(_arrunkObj1337[1]._arr3[0]._field34, _arrunkObj1337[1]._arr1[i]._field34) != 0) {
+				if (subC3386(_arrunkObj1337[1]._arr3[0]._field34, _arrunkObj1337[1]._arr1[i]._field34)) {
 					found = true;
 					break;
 				}
@@ -4758,7 +4857,7 @@ void Scene1337::subCF31D() {
 					for (int k = 0; k <= 7; k++) {
 						// 'k' is not used in that loop. 
 						// It looks suspicious.
-						if ((_arrunkObj1337[tmpVal]._arr3[0]._field34 == 0) && (subC32B1(tmpVal, _arrunkObj1337[1]._arr1[i]._field34) == 1)) {
+						if ((_arrunkObj1337[tmpVal]._arr3[0]._field34 == 0) && (subC32B1(tmpVal, _arrunkObj1337[1]._arr1[i]._field34))) {
 							count = tmpVal;
 							break;
 						}
@@ -5016,7 +5115,7 @@ void Scene1337::subD02CA() {
 						if ((_item6._field34 == 26) || (_item6._field34 == 30) ||(_item6._field34 == 32) || (_item6._field34 == 28)) {
 							if (subC2BF8(&_arrunkObj1337[2]._arr3[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
 								actionDisplay(1330, 42, 159, 10, 1, 200, 0, 7, 0, 154, 154);
-							} else if (subC3386(_arrunkObj1337[2]._arr3[0]._field34, _item6._field34) == 0) {
+							} else if (!subC3386(_arrunkObj1337[2]._arr3[0]._field34, _item6._field34)) {
 								if (_arrunkObj1337[2]._arr3[0]._field34 != 0) {
 									switch (_arrunkObj1337[2]._arr3[0]._field34) {
 									case 11:
@@ -5133,7 +5232,7 @@ void Scene1337::subD02CA() {
 								if (subC2BF8(&_arrunkObj1337[0]._arr3[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
 									if (_arrunkObj1337[0]._arr3[0]._field34 != 0) {
 										actionDisplay(1330, 15, 159, 10, 1, 200, 0, 7, 0, 154, 154);
-									} else if (subC32B1(0, _item6._field34) != 1) {
+									} else if (!subC32B1(0, _item6._field34)) {
 										switch (_item6._field34) {
 										case 10:
 											actionDisplay(1330, 66, 159, 10, 1, 200, 0, 7, 0, 154, 154);
@@ -5169,7 +5268,7 @@ void Scene1337::subD02CA() {
 								} else if (subC2BF8(&_arrunkObj1337[3]._arr3[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
 									if (_arrunkObj1337[3]._arr3[0]._field34 != 0) {
 										actionDisplay(1330, 17, 159, 10, 1, 200, 0, 7, 0, 154, 154);
-									} else if (subC32B1(3, _item6._field34) != 1) {
+									} else if (!subC32B1(3, _item6._field34)) {
 										switch (_item6._field34) {
 										case 10:
 											actionDisplay(1330, 66, 159, 10, 1, 200, 0, 7, 0, 154, 154);
@@ -5205,7 +5304,7 @@ void Scene1337::subD02CA() {
 								} else if (subC2BF8(&_arrunkObj1337[1]._arr3[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
 									if (_arrunkObj1337[1]._arr3[0]._field34 != 0) {
 										actionDisplay(1330, 19, 159, 10, 1, 200, 0, 7, 0, 154, 154);
-									} else if (subC32B1(1, _item6._field34) != 1) {
+									} else if (!subC32B1(1, _item6._field34)) {
 										switch (_item6._field34) {
 										case 10:
 											actionDisplay(1330, 66, 159, 10, 1, 200, 0, 7, 0, 154, 154);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 0c3764639e..0f22ca646a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -328,9 +328,10 @@ public:
 	bool subC2BF8(unkObj1337sub1 *subObj1, Common::Point pt);
 	void subC2C2F();
 	void subC318B(int arg1, unkObj1337sub1 *subObj2, int arg3);
-	int  subC32B1(int arg1, int arg2);
+	int  subC3257(int arg1);
+	bool subC32B1(int arg1, int arg2);
 	int  subC331B(int arg1);
-	int  subC3386(int arg1, int arg2);
+	bool subC3386(int arg1, int arg2);
 	void subC33C0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
 	void subC3456(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
 	void subC340B(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
-- 
cgit v1.2.3


From ad9fdfd3904a78da10cbd3f8e0c7358b9d5d4d8b Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 13 Feb 2012 23:40:24 +0100
Subject: KYRA: Silence some icpc warnings by making a member array of
 KyraRpgGUISettings non-const.

All instances are const anyway, thus this should be a safe way to silence
the warning.
---
 engines/kyra/kyra_rpg.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index a1b9b4c332..b5530a9a81 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -87,9 +87,9 @@ struct KyraRpgGUISettings {
 		uint16 width;
 		uint16 height;
 		int waitReserve;
-		const uint16 waitX[2];
-		const uint8 waitY[2];
-		const uint16 waitWidth[2];
+		uint16 waitX[2];
+		uint8 waitY[2];
+		uint16 waitWidth[2];
 	} buttons;
 
 	struct Colors {
-- 
cgit v1.2.3


From 5cf932198e289b8e8d2fe0ee3e57d7cfbf3b65eb Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Mon, 13 Feb 2012 23:24:09 -0600
Subject: KEYMAPPER: Fix Action ctor args in most keymaps

---
 engines/kyra/eobcommon.cpp | 4 ++--
 engines/kyra/lol.cpp       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 7f35b12123..ffee24fdee 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -345,12 +345,12 @@ void EoBCoreEngine::initKeymap() {
 	};
 
 	for (uint i = 0; i < ARRAYSIZE(keyActionEntries); ++i) {
-		Common::Action *const act = new Common::Action(engineKeyMap, keyActionEntries[i].id, keyActionEntries[i].description, Common::kGenericActionType, Common::kActionKeyType);
+		Common::Action *const act = new Common::Action(engineKeyMap, keyActionEntries[i].id, keyActionEntries[i].description);
 		act->addKeyEvent(keyActionEntries[i].ks);
 	}
 
 	if (_flags.gameID == GI_EOB2) {
-		Common::Action *const act = new Common::Action(engineKeyMap, "SL6", _("Spell Level 6"), Common::kGenericActionType, Common::kActionKeyType);
+		Common::Action *const act = new Common::Action(engineKeyMap, "SL6", _("Spell Level 6"));
 		act->addKeyEvent(Common::KeyState(Common::KEYCODE_6));
 	}
 
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 258f53c602..38e9d33259 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -491,7 +491,7 @@ void LoLEngine::initKeymap() {
 	};
 
 	for (const Common::KeyActionEntry *entry = keyActionEntries; entry->id; ++entry) {
-		Common::Action *const act = new Common::Action(engineKeyMap, entry->id, entry->description, Common::kGenericActionType, Common::kActionKeyType);
+		Common::Action *const act = new Common::Action(engineKeyMap, entry->id, entry->description);
 		act->addKeyEvent(entry->ks);
 	}
 
-- 
cgit v1.2.3


From fc1d93ee1b8281e7af308ebc17707b3c6cb2e6d7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 14 Feb 2012 21:07:12 +1100
Subject: TSAGE: Implemented missing R2R method SceneHandler::setupPaletteMaps

---
 engines/tsage/globals.cpp                     |   2 +
 engines/tsage/globals.h                       |   3 +
 engines/tsage/ringworld2/ringworld2_logic.cpp | 103 ++++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_logic.h   |   2 +
 4 files changed, 110 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index d3843aa174..afd029d035 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -375,6 +375,8 @@ void Ringworld2Globals::reset() {
 	T2_GLOBALS._uiElements._active = false;
 
 	// Reset fields
+	Common::fill(&_v1000[0], &_v1000[0x1000], 0);
+	_v1000Flag = false;
 	_v5589E.set(0, 0, 0, 0);
 	_v558B6.set(0, 0, 0, 0);
 	_v558C2 = 0;
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 6e3a2eb19d..88b0a8146a 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -252,6 +252,9 @@ public:
 	ASoundExt _sound1, _sound2, _sound3, _sound4;
 	PlayStream _playStream;
 	StripProxy _stripProxy;
+	bool _v1000Flag;
+	byte _v1000[0x1000];
+	byte _palIndexList[10][256];
 	int _insetUp;
 	int _frameEdgeColour;	// _v421e
 	Rect _v5589E;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 83ca51faf5..d146e4cbee 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -323,6 +323,19 @@ void SceneExt::postInit(SceneObjectList *OwnerList) {
 	_action = NULL;
 	_field12 = 0;
 	_sceneMode = 0;
+
+	int prevScene = R2_GLOBALS._sceneManager._previousScene;
+	int sceneNumber = R2_GLOBALS._sceneManager._sceneNumber;
+	if (((prevScene == -1) && (sceneNumber != 180) && (sceneNumber != 205) && (sceneNumber != 50)) 
+			|| (sceneNumber == 50)
+			|| ((prevScene == 205) && (sceneNumber == 100))
+			|| ((prevScene == 180) && (sceneNumber == 100))) {
+		static_cast<SceneHandlerExt *>(R2_GLOBALS._sceneHandler)->setupPaletteMaps();
+		R2_GLOBALS._v58CE2 = 1;
+		R2_GLOBALS._uiElements.show();
+	} else {
+		R2_GLOBALS._uiElements.updateInventory();
+	}
 }
 
 void SceneExt::remove() {
@@ -570,6 +583,96 @@ void SceneHandlerExt::process(Event &event) {
 		SceneHandler::process(event);
 }
 
+void SceneHandlerExt::setupPaletteMaps() {
+	byte *palP = &R2_GLOBALS._scenePalette._palette[0];
+
+	if (!R2_GLOBALS._v1000Flag) {
+		R2_GLOBALS._v1000Flag = true;
+
+		for (int idx = 0; idx < 10; ++idx) {
+			for (int palIndex = 0; palIndex < 224; ++palIndex) {
+				int r, g, b;
+
+				// Get adjusted RGB values
+				switch (idx) {
+				case 7:
+					r = palP[palIndex * 3] * 85 / 100;
+					g = palP[palIndex * 3 + 1] * 7 / 10;
+					b = palP[palIndex * 3 + 2] * 7 / 10;
+					break;
+				case 8:
+					r = palP[palIndex * 3] * 7 / 10;
+					g = palP[palIndex * 3 + 1] * 85 / 100;
+					b = palP[palIndex * 3 + 2] * 7 / 10;
+					break;
+				case 9:
+					r = palP[palIndex * 3] * 8 / 10;
+					g = palP[palIndex * 3 + 1] * 5 / 10;
+					b = palP[palIndex * 3 + 2] * 9 / 10;
+					break;
+				default:
+					r = palP[palIndex * 3] * (10 - idx) / 10;
+					g = palP[palIndex * 3 + 1] * (10 - idx) / 12;
+					b = palP[palIndex * 3 + 2] * (10 - idx) / 10;
+					break;
+				}
+
+				// Scan for the palette index with the closest matching colour
+				int threshold = 769;
+				int foundIndex = -1;
+				for (int pIndex2 = 223; pIndex2 >= 0; --pIndex2) {
+					int diffSum = ABS(palP[pIndex2 * 3] - r);
+					if (diffSum >= threshold)
+						continue;
+
+					diffSum += ABS(palP[pIndex2 * 3 + 1] - g);
+					if (diffSum >= threshold)
+						continue;
+					
+					diffSum += ABS(palP[pIndex2 * 3 + 2] - b);
+					if (diffSum >= threshold)
+						continue;
+					
+					threshold = diffSum;
+					foundIndex = pIndex2;
+				}
+
+				R2_GLOBALS._palIndexList[idx][palIndex] = foundIndex;
+			}
+		}
+	}
+
+	for (int palIndex = 0; palIndex < 224; ++palIndex) {
+		int r = palP[palIndex * 3] >> 2;
+		int g = palP[palIndex * 3 + 1] >> 2;
+		int b = palP[palIndex * 3 + 2] >> 2;
+
+		int idx = (((r << 4) | g) << 4) | b;
+		R2_GLOBALS._v1000[idx] = palIndex;
+	}
+
+	int vdx = 0;
+	int idx = 0;
+	int palIndex = 224;
+
+	for (int vIndex = 0; vIndex < 4096; ++vIndex) {
+		int v = R2_GLOBALS._v1000[vIndex];
+		if (!v) {
+			R2_GLOBALS._v1000[vIndex] = idx;
+		} else {
+			idx = v;
+		}
+
+		if (!palIndex) {
+			vdx = palIndex;
+		} else {
+			int idxTemp = palIndex;
+			palIndex = (palIndex + vdx) / 2;
+			vdx = idxTemp;
+		}
+	}
+}
+
 /*--------------------------------------------------------------------------*/
 
 DisplayHotspot::DisplayHotspot(int regionId, ...) {
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 22bea5c216..925a3d6522 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -114,6 +114,8 @@ class SceneHandlerExt: public SceneHandler {
 public:
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void process(Event &event);
+
+	void setupPaletteMaps();
 };
 
 
-- 
cgit v1.2.3


From f6720ee139c728779fae7807621bf11031aacfe1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 14 Feb 2012 22:33:50 +1100
Subject: TSAGE: R2R bugfix for selecting Output Alpha in the console screen

---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 1c924ba336..e3dbe1af22 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1033,6 +1033,7 @@ void Scene125::consoleAction(int id) {
 
 		_sceneMode = 10;
 		_palette.loadPalette(161);
+		R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 5, this);
 		break;
 	case 24:
 		_icon4.setIcon(25);
-- 
cgit v1.2.3


From b6a0d8052ba46b06631c260c7aa0745bd833058e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 14 Feb 2012 22:43:46 +1100
Subject: TSAGE: Replace previously unknown value _v58ec2 with
 _uiElements._active

---
 engines/tsage/globals.cpp                       |  2 --
 engines/tsage/globals.h                         |  1 -
 engines/tsage/ringworld2/ringworld2_logic.cpp   |  6 ++---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp |  4 ++--
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 30 ++++++++++++-------------
 engines/tsage/ringworld2/ringworld2_scenes2.cpp |  4 ++--
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 22 +++++++++---------
 7 files changed, 33 insertions(+), 36 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index afd029d035..b4c3127ea8 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -457,7 +457,6 @@ void Ringworld2Globals::reset() {
 	_v5780E = 0;
 	_v57810 = 0;
 	_v57C2C = 0;
-	_v58CE2 = 0;
 	_v565EC[0] = 0;
 	_v565EC[1] = 27;
 	_v565EC[2] = 27;
@@ -518,7 +517,6 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_v5780E);
 	s.syncAsSint16LE(_v57810);
 	s.syncAsSint16LE(_v57C2C);
-	s.syncAsSint16LE(_v58CE2);
 	s.syncAsSint16LE(_speechSubtitles);
 
 	for (i = 0; i < 5; i++)
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 88b0a8146a..d80e4d9859 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -299,7 +299,6 @@ public:
 	int _v5780E;
 	int _v57810;
 	int _v57C2C;
-	int _v58CE2;
 	int _speechSubtitles;
 	byte _v565EC[5];
 	byte _v565F1[4];
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index d146e4cbee..4f7578b1fa 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -331,7 +331,7 @@ void SceneExt::postInit(SceneObjectList *OwnerList) {
 			|| ((prevScene == 205) && (sceneNumber == 100))
 			|| ((prevScene == 180) && (sceneNumber == 100))) {
 		static_cast<SceneHandlerExt *>(R2_GLOBALS._sceneHandler)->setupPaletteMaps();
-		R2_GLOBALS._v58CE2 = 1;
+		R2_GLOBALS._uiElements._active = true;
 		R2_GLOBALS._uiElements.show();
 	} else {
 		R2_GLOBALS._uiElements.updateInventory();
@@ -378,7 +378,7 @@ void SceneExt::loadScene(int sceneNum) {
 			(sceneNumber == 50) || ((prevScene == 205) && (sceneNumber == 100)) ||
 			((prevScene == 180) && (sceneNumber == 100))) {
 		// TODO: sub_17875
-		R2_GLOBALS._v58CE2 = 1;
+		R2_GLOBALS._uiElements._active = true;
 		R2_GLOBALS._uiElements.show();
 	} else {
 		// Update the user interface
@@ -564,7 +564,7 @@ void SceneHandlerExt::postInit(SceneObjectList *OwnerList) {
 }
 
 void SceneHandlerExt::process(Event &event) {
-	if (T2_GLOBALS._uiElements._active) {
+	if (T2_GLOBALS._uiElements._active && R2_GLOBALS._player._uiEnabled) {
 		T2_GLOBALS._uiElements.process(event);
 		if (event.handled)
 			return;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index e3dbe1af22..2b2b5e71ef 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -51,7 +51,7 @@ void Scene50::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit(OwnerList);
 	loadScene(110);
 
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	R2_GLOBALS._scenePalette.loadPalette(0);
 
 	R2_GLOBALS._sound2.play(10);
@@ -5320,7 +5320,7 @@ void Scene500::signal() {
  *--------------------------------------------------------------------------*/
 void Scene525::postInit(SceneObjectList *OwnerList) {
 	loadScene(525);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
 	
 	R2_GLOBALS._sound1.play(105);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index ea089279b6..c498171bd7 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -37,7 +37,7 @@ void Scene1010::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 	loadScene(1010);
 
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	setZoomPercents(100, 1, 160, 100);
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.setObjectWrapper(NULL);
@@ -100,7 +100,7 @@ void Scene1020::postInit(SceneObjectList *OwnerList) {
 		g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
 
 	R2_GLOBALS._v558B6.set(160, 0, 160, 161);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	R2_GLOBALS._player.postInit();
 
 	if (R2_GLOBALS._sceneManager._previousScene == 1010) {
@@ -330,7 +330,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
 		loadScene(1100);
 
 	if ((R2_GLOBALS._sceneManager._previousScene == 1000) && (!R2_GLOBALS.getFlag(44))) {
-		R2_GLOBALS._v58CE2 = 0;
+		R2_GLOBALS._uiElements._active = false;
 		R2_GLOBALS._v5589E.left = 0;
 		R2_GLOBALS._v5589E.right = 200;
 	}
@@ -339,7 +339,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._sceneManager._previousScene = 1100;
 
 	if (R2_GLOBALS._sceneManager._previousScene == -1) {
-		R2_GLOBALS._v58CE2 = 0;
+		R2_GLOBALS._uiElements._active = false;
 		R2_GLOBALS._v5589E.left = 0;
 		R2_GLOBALS._v5589E.right = 200;
 	}
@@ -542,7 +542,7 @@ void Scene1100::remove() {
 	if (_sceneMode > 20)
 		R2_GLOBALS._sound1.fadeOut2(NULL);
 	g_globals->gfxManager()._bounds.moveTo(Common::Point(0, 0));
-	R2_GLOBALS._v58CE2 = 1;
+	R2_GLOBALS._uiElements._active = true;
 	SceneExt::remove();
 }
 
@@ -3719,7 +3719,7 @@ void Scene1337::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 //
 
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	R2_GLOBALS._player.enableControl();
 	R2_GLOBALS._player._canWalk = false;
 
@@ -3834,7 +3834,7 @@ void Scene1337::remove() {
 		subD1940(false);
 	}
 
-	R2_GLOBALS._v58CE2 = 1;
+	R2_GLOBALS._uiElements._active = true;
 	SceneExt::remove();
 }
 
@@ -5451,7 +5451,7 @@ void Scene1337::subD1A48(int arg1) {
  *--------------------------------------------------------------------------*/
 void Scene1500::postInit(SceneObjectList *OwnerList) {
 	loadScene(1500);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	R2_GLOBALS._v5589E.top = 0;
 	R2_GLOBALS._v5589E.bottom = 200;
 	setZoomPercents(170, 13, 240, 100);
@@ -5514,7 +5514,7 @@ void Scene1500::postInit(SceneObjectList *OwnerList) {
 void Scene1500::remove() {
 	R2_GLOBALS._v5589E.top = 3;
 	R2_GLOBALS._v5589E.bottom = 168;
-	R2_GLOBALS._v58CE2 = 1;
+	R2_GLOBALS._uiElements._active = true;
 
 	SceneExt::remove();
 }
@@ -5609,7 +5609,7 @@ void Scene1500::dispatch() {
  *--------------------------------------------------------------------------*/
 void Scene1525::postInit(SceneObjectList *OwnerList) {
 	loadScene(1525);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
 
 	R2_GLOBALS._player.postInit();
@@ -5657,7 +5657,7 @@ void Scene1530::postInit(SceneObjectList *OwnerList) {
 	else
 		loadScene(1530);
 
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
 
 	_stripManager.addSpeaker(&_quinnSpeaker);
@@ -7982,7 +7982,7 @@ void Scene1575::Hotspot1::subA910D(int indx) {
 
 void Scene1575::postInit(SceneObjectList *OwnerList) {
 	loadScene(1575);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	R2_GLOBALS._v5589E = Rect(0, 0, 320, 200);
 	SceneExt::postInit();
 	_field414 = 390;
@@ -8097,7 +8097,7 @@ void Scene1575::remove() {
 	SceneExt::remove();
 	R2_GLOBALS._v5589E.top = 3;
 	R2_GLOBALS._v5589E.bottom = 168;
-	R2_GLOBALS._v58CE2 = 1;
+	R2_GLOBALS._uiElements._active = true;
 }
 
 void Scene1575::signal() {
@@ -9448,7 +9448,7 @@ bool Scene1750::Actor5::startAction(CursorType action, Event &event) {
 void Scene1750::postInit(SceneObjectList *OwnerList) {
 	loadScene(1750);
 	R2_GLOBALS._sound1.play(115);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	R2_GLOBALS._v5589E.set(0, 0, 320, 200);
 	SceneExt::postInit();
 	
@@ -9573,7 +9573,7 @@ void Scene1750::remove() {
 	R2_GLOBALS._sound1.fadeOut2(NULL);
 	R2_GLOBALS._v5589E.top = 3;
 	R2_GLOBALS._v5589E.bottom = 168;
-	R2_GLOBALS._v58CE2 = 1;
+	R2_GLOBALS._uiElements._active = true;
 }
 
 void Scene1750::signal() {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index a1409067dc..3cc541493d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -2399,7 +2399,7 @@ void Scene2500::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 
 	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 3100)
-		R2_GLOBALS._v58CE2 = 0;
+		R2_GLOBALS._uiElements._active = false;
 
 	_stripManager.addSpeaker(&_quinnSpeaker);
 	_stripManager.addSpeaker(&_seekerSpeaker);
@@ -2978,7 +2978,7 @@ void Scene2600::synchronize(Serializer &s) {
 
 void Scene2600::postInit(SceneObjectList *OwnerList) {
 	loadScene(2600);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
 	R2_GLOBALS._sound1.fadeSound(214);
 	R2_GLOBALS._sound2.play(215);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index e627d9cbf5..99bcf3df44 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -60,7 +60,7 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 	if (R2_GLOBALS._sceneManager._previousScene == 1000) {
 		if (R2_GLOBALS._player._oldCharacterScene[1] == 3100) {
 			loadScene(3101);
-			R2_GLOBALS._v58CE2 = 0;
+			R2_GLOBALS._uiElements._active = false;
 		} else {
 			loadScene(3100);
 			g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
@@ -71,7 +71,7 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 	// Original was doing it twice in a row. Skipped.
 
 	if (R2_GLOBALS._sceneManager._previousScene == 3255)
-		R2_GLOBALS._v58CE2 = 0;
+		R2_GLOBALS._uiElements._active = false;
 
 	SceneExt::postInit();
 	_stripManager.addSpeaker(&_guardSpeaker);
@@ -927,7 +927,7 @@ void Scene3175::signal() {
  *--------------------------------------------------------------------------*/
 void Scene3200::postInit(SceneObjectList *OwnerList) {
 	loadScene(3200);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
 
 	_stripManager.addSpeaker(&_rockoSpeaker);
@@ -955,7 +955,7 @@ void Scene3200::signal() {
  *--------------------------------------------------------------------------*/
 void Scene3210::postInit(SceneObjectList *OwnerList) {
 	loadScene(3210);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
 
 	_stripManager.addSpeaker(&_privateSpeaker);
@@ -981,7 +981,7 @@ void Scene3210::signal() {
  *--------------------------------------------------------------------------*/
 void Scene3220::postInit(SceneObjectList *OwnerList) {
 	loadScene(3220);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
 
 	_stripManager.addSpeaker(&_rockoSpeaker);
@@ -1007,7 +1007,7 @@ void Scene3220::signal() {
  *--------------------------------------------------------------------------*/
 void Scene3230::postInit(SceneObjectList *OwnerList) {
 	loadScene(3230);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
 
 	_stripManager.addSpeaker(&_rockoSpeaker);
@@ -1034,7 +1034,7 @@ void Scene3230::signal() {
  *--------------------------------------------------------------------------*/
 void Scene3240::postInit(SceneObjectList *OwnerList) {
 	loadScene(3240);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
 
 	_stripManager.addSpeaker(&_tealSpeaker);
@@ -1061,7 +1061,7 @@ void Scene3240::signal() {
  *--------------------------------------------------------------------------*/
 void Scene3245::postInit(SceneObjectList *OwnerList) {
 	loadScene(3245);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
 
 	_stripManager.addSpeaker(&_ralfSpeaker);
@@ -1641,7 +1641,7 @@ void Scene3275::signal() {
  *--------------------------------------------------------------------------*/
 void Scene3350::postInit(SceneObjectList *OwnerList) {
 	loadScene(3350);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
 	R2_GLOBALS._sound2.play(310);
 
@@ -3562,7 +3562,7 @@ void Scene3500::postInit(SceneObjectList *OwnerList) {
 	Rect tmpRect;
 
 	loadScene(1050);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	R2_GLOBALS._v5589E.set(0, 0, 320, 200);
 	R2_GLOBALS._sound1.play(305);
 	R2_GLOBALS._player._characterIndex = R2_QUINN;
@@ -4876,7 +4876,7 @@ void Scene3600::dispatch() {
  *--------------------------------------------------------------------------*/
 void Scene3700::postInit(SceneObjectList *OwnerList) {
 	loadScene(3700);
-	R2_GLOBALS._v58CE2 = 0;
+	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
 
 	_stripManager.setColors(60, 255);
-- 
cgit v1.2.3


From ffd59d1c21d9a4e47ff372a126ea10f7432ec309 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 14 Feb 2012 22:46:25 +1100
Subject: TSAGE: Correctly hide the user interface in R2R Output Alpha scene

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index c498171bd7..f410de3384 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -3719,7 +3719,10 @@ void Scene1337::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 //
 
+	// Hide the user interface
 	R2_GLOBALS._uiElements._active = false;
+	BF_GLOBALS._interfaceY = 200;
+
 	R2_GLOBALS._player.enableControl();
 	R2_GLOBALS._player._canWalk = false;
 
-- 
cgit v1.2.3


From 654016c9273bf5fc3810af8b55bf6f0c7694d982 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 14 Feb 2012 18:50:21 +0100
Subject: TSAGE: R2R - Scene 1337: Implement AI function subC2C2F

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 181 +++++++++++++++++++++++-
 1 file changed, 179 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index f410de3384..456cfb051f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1658,7 +1658,7 @@ void Scene1337::synchronize(Serializer &s) {
 }
 
 void Scene1337::Action1337::subD18B5(int resNum, int stripNum, int frameNum) {
-	warning("STUBBED: Action1337::sub53CD5()");
+	warning("STUBBED: Action1337::subD18B5()");
 }
 
 void Scene1337::Action1337::skipFrames(int32 skipCount) {
@@ -4285,7 +4285,184 @@ bool Scene1337::subC2BF8(unkObj1337sub1 *subObj1, Common::Point pt) {
 }
 
 void Scene1337::subC2C2F() {
-	warning("STUBBED Scene1337::subC2C2F()");
+	bool found = true;
+
+	if (_arrunkObj1337[3]._arr3[0]._field34 != 0) {
+		switch (_arrunkObj1337[3]._arr3[0]._field34) {
+		case 10:
+		// No break on purpose
+		case 12:
+		// No break on purpose
+		case 15:
+		// No break on purpose
+		case 17:
+		// No break on purpose
+		case 18:
+		// No break on purpose
+		case 19:
+		// No break on purpose
+		case 20:
+		// No break on purpose
+		case 21:
+			subC4A39(&_arrunkObj1337[3]._arr3[0]);
+			found = false;
+			break;
+		default:
+			found = false;
+			int i;
+			for (i = 0; i <= 3; i++) {
+				if (subC3386(_arrunkObj1337[3]._arr3[0]._field34, _arrunkObj1337[3]._arr1[i]._field34)) {
+					found = true;
+					break;
+				}
+			}
+
+			if (found) {
+				found = false;
+				subC34A1(&_arrunkObj1337[3]._arr1[i], &_arrunkObj1337[3]._arr3[0]);
+			}
+			break;
+		}
+	}
+
+	if (!found)
+		return;
+
+	int randIndx = R2_GLOBALS._randomSource.getRandomNumber(3);
+	
+	if (_arrunkObj1337[3]._arr1[randIndx]._field34 == 1) {
+		found = false;
+
+		for (int i = 0; i <= 7; i++) {
+			if ((_arrunkObj1337[3]._arr2[i]._field34 == 0) && (!subC2687(_arrunkObj1337[3]._arr3[0]._field34))) {
+				subC340B(&_arrunkObj1337[3]._arr1[randIndx], &_arrunkObj1337[3]._arr2[i]);
+				found = true;
+				break;
+			}
+		}
+
+		if (found) {
+			return;
+		}
+	} else if (_arrunkObj1337[3]._arr1[randIndx]._field34 <= 9) {
+		found = false;
+
+		for (int i = 0; i <= 7; i++) {
+			if (_arrunkObj1337[3]._arr2[i]._field34 == _arrunkObj1337[3]._arr1[randIndx]._field34) {
+				found = true;
+				break;
+			}
+		}
+
+		if (!found) {
+			for (int i = 0; i <= 7; i++) {
+				if ((_arrunkObj1337[3]._arr2[i]._field34 == 1) && (!subC2687(_arrunkObj1337[3]._arr3[i]._field34))) {
+					int tmpVal = 0;
+					
+					for (int i = 0; i <= 7; i++) {
+						if ((_arrunkObj1337[3]._arr2[i]._field34 > 1) && (_arrunkObj1337[3]._arr2[i]._field34 <= 9))
+							++tmpVal;
+					}
+					
+					if (tmpVal == 7)
+						_field424A = 3;
+					
+					subC33C0(&_arrunkObj1337[3]._arr1[randIndx], &_arrunkObj1337[3]._arr2[i]);
+					found = true;
+					break;
+				}
+			}
+			if (found)
+				return;
+		}
+	} else if (_arrunkObj1337[3]._arr1[randIndx]._field34 == 13) {
+		int tmpVal = subC331B(3);
+
+		if (tmpVal != -1) {
+			subC358E(&_arrunkObj1337[3]._arr1[randIndx], tmpVal);
+			return;
+		}
+	} else if (_arrunkObj1337[3]._arr1[randIndx]._field34 == 25) {
+		int tmpVal = -1;
+		found = false;
+		int tmpRandIndx = R2_GLOBALS._randomSource.getRandomNumber(3);
+		
+		for (int i = 0; i <= 3; i++) {
+			if (  (tmpRandIndx != 3)
+			  && (  (_arrunkObj1337[tmpRandIndx]._arr1[0]._field34 != 0)
+			     || (_arrunkObj1337[tmpRandIndx]._arr1[1]._field34 != 0)
+			     || (_arrunkObj1337[tmpRandIndx]._arr1[2]._field34 != 0)
+			     || (_arrunkObj1337[tmpRandIndx]._arr1[3]._field34 != 0) )) {
+				tmpVal = tmpRandIndx;
+				break;
+			}
+			
+			++tmpRandIndx;
+			if (tmpRandIndx > 3)
+				tmpRandIndx = 0;
+		}
+
+		if (tmpVal != -1) {
+			subC318B(3, &_arrunkObj1337[3]._arr1[randIndx], tmpVal);
+			return;
+		}
+	} else {
+		switch (_arrunkObj1337[3]._arr1[randIndx]._field34) {
+		case 10:
+		// No break on purpose
+		case 11:
+		// No break on purpose
+		case 12:
+		// No break on purpose
+		case 14:
+		// No break on purpose
+		case 15:
+		// No break on purpose
+		case 16:
+		// No break on purpose
+		case 17:
+		// No break on purpose
+		case 18:
+		// No break on purpose
+		case 19:
+		// No break on purpose
+		case 20:
+		// No break on purpose
+		case 21:
+		// No break on purpose
+		case 24: {
+			int tmpVal = -1;
+			int tmpRandIndx = R2_GLOBALS._randomSource.getRandomNumber(3);
+			
+			for (int i = 0; i <= 3; i++) {
+				if (tmpRandIndx != 3) {
+					for (int j = 0; j <= 7; j++) {
+						if ((_arrunkObj1337[j]._arr3[0]._field34 == 0) && (subC32B1(j, _arrunkObj1337[3]._arr1[randIndx]._field34))) {
+							tmpVal = j;
+						}
+					}
+				}
+
+				++tmpRandIndx;
+				if (tmpRandIndx > 3)
+					tmpRandIndx = 0;
+				
+				if (tmpVal != -1)
+					break;
+			}
+			
+			if (tmpVal != -1) {
+				// Useless second identical check skipped
+				subC3456(&_arrunkObj1337[3]._arr1[randIndx], &_arrunkObj1337[tmpVal]._arr3[0]);
+				return;
+			}
+			}
+		default:
+			break;
+		}
+	}
+
+	subC4A39(&_arrunkObj1337[3]._arr1[randIndx]);
 }
 
 void Scene1337::subC318B(int arg1, unkObj1337sub1 *subObj1, int arg3) {
-- 
cgit v1.2.3


From 1dcc8402b8dd57bbf5174a6d7a0c99b39fae7ccb Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 14 Feb 2012 18:52:05 +0100
Subject: TSAGE: R2R - Scene 1337: Implement on more AI function

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 456cfb051f..0745855182 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4616,7 +4616,18 @@ void Scene1337::subC34A1(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
 }
 
 Scene1337::unkObj1337sub1 *Scene1337::subC34EC(int arg1) {
-	warning("STUBBED Scene1337::subC34EC()");
+	for (int i = 0; i <= 7; i++) {
+		if (_arrunkObj1337[arg1]._arr2[i]._field34 == 1) {
+			return &_arrunkObj1337[arg1]._arr2[i];
+		}
+	}
+	
+	for (int i = 0; i <= 7; i++) {
+		if ((_arrunkObj1337[arg1]._arr2[i]._field34 != 0) && (_arrunkObj1337[arg1]._arr2[i]._field34 < 10)) {
+			return &_arrunkObj1337[arg1]._arr2[i];
+		}
+	}
+	
 	return NULL;
 }
 
-- 
cgit v1.2.3


From f380d3ded235297a4162ff0735dcb037da813faa Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 14 Feb 2012 19:03:50 +0100
Subject: TSAGE: R2R - Scene 1337: Implement one more large AI function
 (subCDB90)

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 314 +++++++++++++++++++++++-
 engines/tsage/ringworld2/ringworld2_scenes1.h   |   4 +-
 2 files changed, 313 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 0745855182..769fd58c78 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4667,6 +4667,10 @@ void Scene1337::subC51A0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
 	_item1.setAction(&_action13);
 }
 
+void Scene1337::subC6235(int arg1) {
+	warning("STUBBED: subC6235()");
+}
+
 void Scene1337::subPostInit() {
 	R2_GLOBALS._v57709 = 0;
 	R2_GLOBALS._v5780C = 0;
@@ -4895,9 +4899,311 @@ void Scene1337::subCCF26() {
 	shuffleCards();
 	_item1.setAction(&_action3);
 }
+void Scene1337::subCD193() {
+	warning("STUBBED: subCD193()");
+}
 
-void Scene1337::subCDB90(int arg1, Common::Point *pt) {
-	warning("STUBBED: subCDB90()");
+void Scene1337::subCDB90(int arg1, Common::Point pt) {
+	bool found = false;
+	int curReg = R2_GLOBALS._sceneRegions.indexOf(g_globals->_events._mousePos);
+	
+	if (arg1 == 3) {
+		int i;
+		for (i = 0; i <= 7; i++) {
+			if ( (subC2BF8(&_arrunkObj1337[2]._arr2[i], pt))
+			  || (subC2BF8(&_arrunkObj1337[0]._arr2[i], pt))
+			  || (subC2BF8(&_arrunkObj1337[1]._arr2[i], pt))
+			  || (subC2BF8(&_arrunkObj1337[3]._arr2[i], pt)) ) {
+				found = true;
+				break;
+			}
+		}
+		
+		if (found) {
+			switch (curReg) {
+			case 5:
+				if (_arrunkObj1337[2]._arr2[i]._field34 != 0)
+					subC6235(_arrunkObj1337[2]._arr2[i]._field34);
+				else
+					actionDisplay(1330, 20, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+				break;
+			case 10:
+				if (_arrunkObj1337[3]._arr2[i]._field34 != 0)
+					subC6235(_arrunkObj1337[3]._arr2[i]._field34);
+				else
+					actionDisplay(1330, 22, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+				break;
+			case 15:
+				if (_arrunkObj1337[0]._arr2[i]._field34 != 0)
+					subC6235(_arrunkObj1337[0]._arr2[i]._field34);
+				else
+					actionDisplay(1330, 21, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+				break;
+			case 20:
+				if (_arrunkObj1337[1]._arr2[i]._field34 != 0)
+					subC6235(_arrunkObj1337[1]._arr2[i]._field34);
+				else
+					actionDisplay(1330, 23, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+				break;
+			default:
+				break;
+			}
+		} else {
+			if ( (subC2BF8(&_arrunkObj1337[2]._arr3[0], pt))
+			  || (subC2BF8(&_arrunkObj1337[0]._arr3[0], pt))
+			  || (subC2BF8(&_arrunkObj1337[1]._arr3[0], pt))
+			  || (subC2BF8(&_arrunkObj1337[3]._arr3[0], pt)) ) {
+				found = true;
+			}
+			
+			if (found) {
+				switch (curReg) {
+				case 5:
+					if (_arrunkObj1337[2]._arr3[0]._field34 != 0)
+						subC6235(_arrunkObj1337[2]._arr3[0]._field34);
+					else
+						actionDisplay(1330, 10, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+					break;
+				case 10:
+					if (_arrunkObj1337[3]._arr3[0]._field34 != 0)
+						subC6235(_arrunkObj1337[3]._arr3[0]._field34);
+					else
+						actionDisplay(1330, 16, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+					break;
+				case 15:
+					if (_arrunkObj1337[0]._arr3[0]._field34 != 0)
+						subC6235(_arrunkObj1337[3]._arr3[0]._field34);
+					else
+						actionDisplay(1330, 13, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+					break;
+				case 20:
+					if (_arrunkObj1337[1]._arr3[0]._field34 != 0)
+						subC6235(_arrunkObj1337[1]._arr3[0]._field34);
+					else
+						actionDisplay(1330, 18, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+					break;
+				default:
+					break;
+				}
+			} else {
+				if (subC2BF8(&_item7, pt)) {
+					if (_item7._field34 != 0)
+						subC6235(_item7._field34);
+					else
+						actionDisplay(1330, 7, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+				} else if (_background1._bounds.contains(pt)) {
+					actionDisplay(1330, 43, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+				} else if (subC2BF8(&_item8, pt)) {
+					actionDisplay(1330, 4, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+				} else if ( (subC2BF8(&_arrunkObj1337[2]._arr4[0], pt))
+					       || (subC2BF8(&_arrunkObj1337[3]._arr4[0], pt))
+					       || (subC2BF8(&_arrunkObj1337[0]._arr4[0], pt))
+					       || (subC2BF8(&_arrunkObj1337[1]._arr4[0], pt)) ) {
+					actionDisplay(1330, 32, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+				} else {
+					if (subC2BF8(&_arrunkObj1337[2]._arr1[0], pt))
+						subC6235(_arrunkObj1337[2]._arr1[0]._field34);
+					else if (subC2BF8(&_arrunkObj1337[2]._arr1[1], pt))
+						subC6235(_arrunkObj1337[2]._arr1[1]._field34);
+					else if (subC2BF8(&_arrunkObj1337[2]._arr1[2], pt))
+						subC6235(_arrunkObj1337[2]._arr1[2]._field34);
+					else if (subC2BF8(&_arrunkObj1337[2]._arr1[3], pt))
+						subC6235(_arrunkObj1337[2]._arr1[3]._field34);
+					else if ((curReg >= 6) || (curReg <= 9))
+						actionDisplay(1330, 29, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+					else if ((curReg >= 11) || (curReg <= 14))
+						actionDisplay(1330, 31, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+					else if ((curReg >= 16) || (curReg <= 19))
+						actionDisplay(1330, 30, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+					else {
+						switch (curReg) {
+						case 0:
+							actionDisplay(1330, 2, 159, 134, 1, 200, 0, 7, 0, 105, 105);
+							break;
+						case 5:
+							actionDisplay(1330, 25, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+							break;
+						case 10:
+							actionDisplay(1330, 27, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+							break;
+						case 15:
+							actionDisplay(1330, 26, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+							break;
+						case 20:
+							actionDisplay(1330, 28, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+							break;
+						case 21:
+							actionDisplay(1330, 24, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+							break;
+						default:
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	if (arg1 != 1)
+		return;
+		
+	for (int i = 0; i <= 7; i++) {
+		if (subC2BF8(&_arrunkObj1337[2]._arr2[i], pt)) {
+			switch (_arrunkObj1337[2]._arr2[i]._field34) {
+			case 0:
+				actionDisplay(1330, 11, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+				break;
+			case 1:
+				actionDisplay(1330, 54, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+				break;
+			default:
+				actionDisplay(1330, 34, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+				break;
+			}
+			found = true;
+			break;
+		} else if (subC2BF8(&_arrunkObj1337[0]._arr2[i], pt)) {
+			switch (_arrunkObj1337[0]._arr2[i]._field34) {
+			case 0:
+				actionDisplay(1330, 11, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+				break;
+			default:
+				actionDisplay(1330, 1, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+				break;
+			}
+			found = true;
+			break;
+		} else if (subC2BF8(&_arrunkObj1337[1]._arr2[i], pt)) {
+			switch (_arrunkObj1337[1]._arr2[i]._field34) {
+			case 0:
+				actionDisplay(1330, 146, 300, 99, 1, 136, 0, 7, 0, 117, 117);
+				break;
+			default:
+				actionDisplay(1330, 144, 300, 99, 1, 136, 0, 7, 0, 117, 117);
+				break;
+			}
+			found = true;
+			break;
+		} else if (subC2BF8(&_arrunkObj1337[3]._arr2[i], pt)) {
+			switch (_arrunkObj1337[3]._arr2[i]._field34) {
+			case 0:
+				actionDisplay(1330, 147, 20, 99, 1, 136, 0, 7, 0, 172, 172);
+				break;
+			default:
+				actionDisplay(1330, 145, 20, 99, 1, 136, 0, 7, 0, 172, 172);
+				break;
+			}
+			found = true;
+			break;
+		}
+	}
+
+	if (subC2BF8(&_arrunkObj1337[2]._arr3[0], pt)) {
+		if (_arrunkObj1337[0]._arr3[0]._field34 != 0) {
+			actionDisplay(1330, 39, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		} else {
+			actionDisplay(1330, 11, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		}
+		found = true;
+	}
+	
+	if (subC2BF8(&_arrunkObj1337[3]._arr3[0], pt)) {
+		if (_arrunkObj1337[3]._arr3[0]._field34 != 0) {
+			actionDisplay(1330, 145, 20, 99, 1, 136, 0, 7, 0, 172, 172);
+		} else {
+			actionDisplay(1330, 147, 20, 99, 1, 136, 0, 7, 0, 172, 172);
+		}
+		found = true;
+	}
+	
+	if (subC2BF8(&_arrunkObj1337[1]._arr3[0], pt)) {
+		if (_arrunkObj1337[1]._arr3[0]._field34 != 0) {
+			actionDisplay(1330, 144, 300, 99, 1, 136, 0, 7, 0, 117, 117);
+		} else {
+			actionDisplay(1330, 146, 300, 99, 1, 136, 0, 7, 0, 117, 117);
+		}
+		found = true;
+	}
+	
+	if (subC2BF8(&_arrunkObj1337[0]._arr3[0], pt)) {
+		if (_arrunkObj1337[0]._arr3[0]._field34 != 0) {
+			actionDisplay(1330, 1, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		} else {
+			actionDisplay(1330, 11, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		}
+		found = true;
+	}
+
+	if (subC2BF8(&_arrunkObj1337[3]._arr4[0], pt)) {
+		actionDisplay(1330, 147, 20, 99, 1, 136, 0, 7, 0, 172, 172);
+		found = true;
+	}
+
+	if (subC2BF8(&_arrunkObj1337[1]._arr4[0], pt)) {
+		actionDisplay(1330, 146, 300, 99, 1, 136, 0, 7, 0, 117, 117);
+		found = true;
+	}
+
+	if (subC2BF8(&_arrunkObj1337[0]._arr4[0], pt)) {
+		actionDisplay(1330, 11, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		found = true;
+	}
+
+	if (found)
+		return;
+	
+	if (_background1._bounds.contains(pt)) {
+		subCD193();
+		return;
+	}
+	
+	if (subC2BF8(&_item7, pt))
+		actionDisplay(1330, 9, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+	else if (subC2BF8(&_item8, pt))
+		actionDisplay(1330, 5, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+	else {
+		switch (curReg) {
+		case 0:
+			actionDisplay(1330, 3, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+			break;
+		case 6:
+		// no break on purpose
+		case 7:
+		// no break on purpose
+		case 8:
+		// no break on purpose
+		case 9:
+			actionDisplay(1330, 145, 20, 99, 1, 136, 0, 7, 0, 172, 172);
+			break;
+		case 10:
+			actionDisplay(1330, 147, 20, 99, 1, 136, 0, 7, 0, 172, 172);
+			break;
+		case 11:
+		// no break on purpose
+		case 12:
+		// no break on purpose
+		case 13:
+		// no break on purpose
+		case 14:
+			actionDisplay(1330, 1, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+			break;
+		case 16:
+		// no break on purpose
+		case 17:
+		// no break on purpose
+		case 18:
+		// no break on purpose
+		case 19:
+			actionDisplay(1330, 144, 300, 99, 1, 136, 0, 7, 0, 117, 117);
+			break;
+		case 20:
+			actionDisplay(1330, 146, 300, 99, 1, 136, 0, 7, 0, 117, 117);
+			break;
+		default:
+			actionDisplay(1330, 11, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+			break;
+		}
+	}
 }
 
 void Scene1337::subCF31D() {
@@ -5197,12 +5503,12 @@ void Scene1337::subD02CA() {
 		}
 		
 		if (di == 4) {
-			subCDB90(1, &_item6._field36);
+			subCDB90(1, _item6._field36);
 			subD0281();
 			return;
 		}
 	} else if (R2_GLOBALS._v57810 == 300) {
-		subCDB90(3, &_item6._field36);
+		subCDB90(3, _item6._field36);
 		subD0281();
 		return;
 	} else {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 0f22ca646a..913550c223 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -343,12 +343,14 @@ public:
 	void subC4CD2();
 	void subC4CEC();
 	void subC51A0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
+	void subC6235(int arg1);
 	void subPostInit();
 	void subCB59B();
 	void suggestInstructions();
 	void shuffleCards();
 	void subCCF26();
-	void subCDB90(int arg1, Common::Point *pt);
+	void subCD193();
+	void subCDB90(int arg1, Common::Point pt);
 	void subCF31D();
 	void subCF979();
 	void subD026D();
-- 
cgit v1.2.3


From 949c8e97f5e54232b1b1277e39920f591aeedbcd Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 14 Feb 2012 20:09:49 +0100
Subject: TSAGE: R2R - Scene 1337: Implement another large AI function
 (subCF979)

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 250 +++++++++++++++++++++++-
 1 file changed, 249 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 769fd58c78..bdafd3ba9a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -5424,7 +5424,255 @@ void Scene1337::subCF31D() {
 }
 
 void Scene1337::subCF979() {
-	warning("STUBBED Scene1337::subCF979()");
+	bool found = true;
+
+	if (_arrunkObj1337[0]._arr3[0]._field34 != 0) {
+		switch (_arrunkObj1337[0]._arr3[0]._field34) {
+		case 10:
+		//No break on purpose
+		case 12:
+		//No break on purpose
+		case 15:
+		//No break on purpose
+		case 17:
+		//No break on purpose
+		case 18:
+		//No break on purpose
+		case 19:
+		//No break on purpose
+		case 20:
+		//No break on purpose
+		case 21:
+			subC4A39(&_arrunkObj1337[0]._arr3[0]);
+			found = false;
+			break;
+		default:
+			int i;
+			found = false;
+
+			for (i = 0; i <= 3; i++) {
+				if (subC3386(_arrunkObj1337[0]._arr3[0]._field34, _arrunkObj1337[0]._arr1[i]._field34)) {
+					found = true;
+					break;
+				}
+			}
+
+			if (found) {
+				found = false;
+				subC34A1(&_arrunkObj1337[0]._arr1[i], &_arrunkObj1337[0]._arr3[0]);
+			}
+			break;
+		}
+	}
+	
+	if (found)
+		return;
+	
+	int tmpVal;
+	found = false;
+	for (int i = 0; i <= 3; i++) {
+		tmpVal = subC26CB(0, i);
+
+		if (tmpVal != -1) {
+			bool flag = false;;
+			for (int j = 0; j <= 7; j++) {
+				if (_arrunkObj1337[0]._arr2[j]._field34 == _arrunkObj1337[0]._arr1[tmpVal]._field34) {
+					flag = true;
+					break;
+				}
+			}
+			
+			if (!flag) {
+				for (int j = 0; j <= 7; j++) {
+					if ((_arrunkObj1337[0]._arr2[j]._field34 == 1) && (!subC2687(_arrunkObj1337[0]._arr3[0]._field34))) {
+						int count = 0;
+						for (int k = 0; k <= 7; k++) {
+							if ((_arrunkObj1337[0]._arr2[k]._field34 > 1) && (_arrunkObj1337[0]._arr2[k]._field34 <= 9)) {
+								++count;
+							}
+						}
+
+						if (count == 7)
+							_field424A = 0;
+						
+						subC33C0(&_arrunkObj1337[0]._arr1[tmpVal], &_arrunkObj1337[0]._arr2[j]);
+						found = true;
+					}
+				}
+			}
+		}
+		
+		if (found)
+			break;
+	}
+
+	if (found)
+		return;
+	
+	found = false;
+	tmpVal = subC2719(0);
+
+	if (tmpVal != -1) {
+		for (int i = 0; i <= 7; i++) {
+			if ((_arrunkObj1337[0]._arr2[i]._field34 == 0) && (!subC2687(_arrunkObj1337[0]._arr3[0]._field34))) {
+				subC340B(&_arrunkObj1337[0]._arr1[tmpVal], &_arrunkObj1337[0]._arr2[i]);
+				found = true;
+				break;
+			}
+		}
+	}
+	
+	if (found)
+		return;
+	
+	tmpVal = subC274D(0);
+	if (tmpVal != -1) {
+		for (int i = 0; i <= 7; i++) {
+			if (_arrunkObj1337[2]._arr2[i]._field34 != 0) {
+				subC358E(&_arrunkObj1337[0]._arr1[tmpVal], 2);
+				found = true;
+				break;
+			}
+		}
+	}
+	
+	if (found) 
+		return;
+	
+	tmpVal = subC2781(0);
+	if (tmpVal != -1) {
+		if ( (_arrunkObj1337[2]._arr1[0]._field34 != 0)
+		  || (_arrunkObj1337[2]._arr1[1]._field34 != 0)
+		  || (_arrunkObj1337[2]._arr1[2]._field34 != 0)
+		  || (_arrunkObj1337[2]._arr1[3]._field34 != 0) ) {
+			subC318B(0, &_arrunkObj1337[0]._arr1[tmpVal], 2);
+			found = true;
+		}
+	}
+	
+	if (found) 
+		return;
+	
+	for (int i = 0; i <= 3; i++) {
+		if (subC27B5(_arrunkObj1337[0]._arr1[i]._field34) != -1) {
+			// The variable 'j' is not used in the inner code of the loop. It's suspect
+			for (int j = 0; j <= 7; j++) {
+				if ((_arrunkObj1337[2]._arr3[0]._field34 == 0) && (subC32B1(2, _arrunkObj1337[0]._arr1[i]._field34))) {
+					subC3456(&_arrunkObj1337[0]._arr1[i], &_arrunkObj1337[2]._arr3[0]);
+					found = true;
+					break;
+				}
+			}
+
+			if (found)
+				break;
+		}
+	}
+
+	if (found) 
+		return;
+
+	for (int i = 0; i <= 3; i++) {
+		if (subC27F9(_arrunkObj1337[0]._arr1[i]._field34) != -1) {
+			for (int j = 0; j <= 7; j++) {
+				if ((_arrunkObj1337[2]._arr3[0]._field34 == 0) && (subC32B1(2, _arrunkObj1337[0]._arr1[j]._field34))) {
+					subC3456(&_arrunkObj1337[0]._arr1[j], &_arrunkObj1337[2]._arr3[0]);
+					found = true;
+				}
+			}
+			
+			if (found)
+				break;
+		}
+	}
+		
+	if (found) 
+		return;
+
+	tmpVal = subC274D(0);
+	int tmpVal2 = subC331B(0);
+	
+	if ((tmpVal != -1) && (tmpVal2 != -1)) {
+		subC358E(&_arrunkObj1337[0]._arr1[tmpVal], tmpVal2);
+		found = true;
+	}
+	
+	if (found)
+		return;
+	
+	tmpVal = subC2781(0);
+	if (tmpVal != -1) {
+		if ( (_arrunkObj1337[1]._arr1[0]._field34 != 0)
+		  || (_arrunkObj1337[1]._arr1[1]._field34 != 0)
+		  || (_arrunkObj1337[1]._arr1[2]._field34 != 0)
+		  || (_arrunkObj1337[1]._arr1[3]._field34 != 0) ) {
+			subC318B(0, &_arrunkObj1337[0]._arr1[tmpVal], 1);
+			found = true;
+		}
+	}
+	
+	if (found)
+		return;
+
+	for (int i = 0; i <= 3; i++) {
+		tmpVal = subC27F9(_arrunkObj1337[0]._arr1[i]._field34);
+		if (tmpVal != -1) {
+			// The variable 'j' is not used in the inner code of the loop. It's suspect.
+			for (int j = 0; j <= 7; j++) {
+				if ((_arrunkObj1337[1]._arr3[0]._field34 == 0) && (subC32B1(1, _arrunkObj1337[0]._arr1[i]._field34))) {
+					subC3456(&_arrunkObj1337[0]._arr1[i], &_arrunkObj1337[1]._arr3[0]);
+					found = true;
+				}
+			}
+			
+			if (!found) {
+			// The variable 'j' is not used in the inner code of the loop. It's suspect.
+				for (int j = 0; j <= 7; j++) {
+					if ((_arrunkObj1337[3]._arr3[0]._field34 == 0) && (subC32B1(3, _arrunkObj1337[0]._arr1[i]._field34))) {
+					subC3456(&_arrunkObj1337[0]._arr1[i], &_arrunkObj1337[3]._arr3[0]);
+					found = true;
+					}
+				}
+			}
+			
+			if (found)
+				break;
+		}
+	}
+
+	if (found)
+		return;
+
+	for (int i = 0; i <= 3; i++) {
+		tmpVal = subC27B5(_arrunkObj1337[0]._arr1[i]._field34);
+		if (tmpVal != -1) {
+			// The variable 'j' is not used in the inner code of the loop. It's suspect.
+			for (int j = 0; j <= 7; j++) {
+				if ((_arrunkObj1337[1]._arr3[0]._field34 == 0) && (subC32B1(1, _arrunkObj1337[0]._arr1[i]._field34))) {
+					subC3456(&_arrunkObj1337[0]._arr1[i], &_arrunkObj1337[1]._arr3[0]);
+					found = true;
+				}
+			}
+
+			if (!found) {
+			// The variable 'j' is not used in the inner code of the loop. It's suspect.
+				for (int j = 0; j <= 7; j++) {
+					if ((_arrunkObj1337[3]._arr3[0]._field34 == 0) && (subC32B1(3, _arrunkObj1337[0]._arr1[i]._field34))) {
+					subC3456(&_arrunkObj1337[0]._arr1[i], &_arrunkObj1337[3]._arr3[0]);
+					found = true;
+					}
+				}
+			}
+			
+			if (found)
+				break;
+		}
+	}
+	
+	if (found)
+		return;
+
+	subC2835(0);
 }
 
 void Scene1337::subD026D() {
-- 
cgit v1.2.3


From a64dc10b40a923e69d63b8936d1b37d47d747724 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 14 Feb 2012 22:21:25 +0100
Subject: TSAGE: R2R - Scene 1337: Implement another AI related function

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 96 ++++++++++++++++++++++++-
 1 file changed, 95 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index bdafd3ba9a..10f76cabf3 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4668,7 +4668,101 @@ void Scene1337::subC51A0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
 }
 
 void Scene1337::subC6235(int arg1) {
-	warning("STUBBED: subC6235()");
+	switch (arg1 - 1) {
+	case 0:
+		actionDisplay(1330, 53, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 1:
+		actionDisplay(1330, 57, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 2:
+		actionDisplay(1330, 58, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 3:
+		actionDisplay(1330, 59, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 4:
+		actionDisplay(1330, 60, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 5:
+		actionDisplay(1330, 61, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 6:
+		actionDisplay(1330, 62, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 7:
+		actionDisplay(1330, 63, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 8:
+		actionDisplay(1330, 64, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 9:
+		actionDisplay(1330, 65, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 10:
+		actionDisplay(1330, 67, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 11:
+		actionDisplay(1330, 69, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 12:
+		actionDisplay(1330, 71, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		actionDisplay(1330, 72, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		actionDisplay(1330, 73, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 13:
+		actionDisplay(1330, 79, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 14:
+		actionDisplay(1330, 81, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 15:
+		actionDisplay(1330, 83, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 16:
+		actionDisplay(1330, 85, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 17:
+		actionDisplay(1330, 87, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 18:
+		actionDisplay(1330, 89, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 19:
+		actionDisplay(1330, 91, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 20:
+		actionDisplay(1330, 93, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 23:
+		actionDisplay(1330, 95, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 24:
+		actionDisplay(1330, 97, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 25:
+		actionDisplay(1330, 104, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 26:
+		actionDisplay(1330, 105, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		actionDisplay(1330, 106, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 27:
+		actionDisplay(1330, 110, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 28:
+		actionDisplay(1330, 108, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		actionDisplay(1330, 109, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 29:
+		actionDisplay(1330, 111, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	case 31:
+		actionDisplay(1330, 112, 159, 10, 1, 200, 0, 7, 0, 154, 154);
+		break;
+	default:
+		break;
+	}
 }
 
 void Scene1337::subPostInit() {
-- 
cgit v1.2.3


From dc229b893e1d0e4aa0ca8d2c5c3cd695e38f8942 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 14 Feb 2012 22:26:12 +0100
Subject: TSAGE: R2R - Scene 1337: rename previously committed function

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 30 ++++++++++++-------------
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 10f76cabf3..6268978310 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4667,8 +4667,8 @@ void Scene1337::subC51A0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
 	_item1.setAction(&_action13);
 }
 
-void Scene1337::subC6235(int arg1) {
-	switch (arg1 - 1) {
+void Scene1337::displayDialog(int dialogNumb) {
+	switch (dialogNumb - 1) {
 	case 0:
 		actionDisplay(1330, 53, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 		break;
@@ -5017,25 +5017,25 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 			switch (curReg) {
 			case 5:
 				if (_arrunkObj1337[2]._arr2[i]._field34 != 0)
-					subC6235(_arrunkObj1337[2]._arr2[i]._field34);
+					displayDialog(_arrunkObj1337[2]._arr2[i]._field34);
 				else
 					actionDisplay(1330, 20, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 				break;
 			case 10:
 				if (_arrunkObj1337[3]._arr2[i]._field34 != 0)
-					subC6235(_arrunkObj1337[3]._arr2[i]._field34);
+					displayDialog(_arrunkObj1337[3]._arr2[i]._field34);
 				else
 					actionDisplay(1330, 22, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 				break;
 			case 15:
 				if (_arrunkObj1337[0]._arr2[i]._field34 != 0)
-					subC6235(_arrunkObj1337[0]._arr2[i]._field34);
+					displayDialog(_arrunkObj1337[0]._arr2[i]._field34);
 				else
 					actionDisplay(1330, 21, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 				break;
 			case 20:
 				if (_arrunkObj1337[1]._arr2[i]._field34 != 0)
-					subC6235(_arrunkObj1337[1]._arr2[i]._field34);
+					displayDialog(_arrunkObj1337[1]._arr2[i]._field34);
 				else
 					actionDisplay(1330, 23, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 				break;
@@ -5054,25 +5054,25 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 				switch (curReg) {
 				case 5:
 					if (_arrunkObj1337[2]._arr3[0]._field34 != 0)
-						subC6235(_arrunkObj1337[2]._arr3[0]._field34);
+						displayDialog(_arrunkObj1337[2]._arr3[0]._field34);
 					else
 						actionDisplay(1330, 10, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					break;
 				case 10:
 					if (_arrunkObj1337[3]._arr3[0]._field34 != 0)
-						subC6235(_arrunkObj1337[3]._arr3[0]._field34);
+						displayDialog(_arrunkObj1337[3]._arr3[0]._field34);
 					else
 						actionDisplay(1330, 16, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					break;
 				case 15:
 					if (_arrunkObj1337[0]._arr3[0]._field34 != 0)
-						subC6235(_arrunkObj1337[3]._arr3[0]._field34);
+						displayDialog(_arrunkObj1337[3]._arr3[0]._field34);
 					else
 						actionDisplay(1330, 13, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					break;
 				case 20:
 					if (_arrunkObj1337[1]._arr3[0]._field34 != 0)
-						subC6235(_arrunkObj1337[1]._arr3[0]._field34);
+						displayDialog(_arrunkObj1337[1]._arr3[0]._field34);
 					else
 						actionDisplay(1330, 18, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					break;
@@ -5082,7 +5082,7 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 			} else {
 				if (subC2BF8(&_item7, pt)) {
 					if (_item7._field34 != 0)
-						subC6235(_item7._field34);
+						displayDialog(_item7._field34);
 					else
 						actionDisplay(1330, 7, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 				} else if (_background1._bounds.contains(pt)) {
@@ -5096,13 +5096,13 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 					actionDisplay(1330, 32, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 				} else {
 					if (subC2BF8(&_arrunkObj1337[2]._arr1[0], pt))
-						subC6235(_arrunkObj1337[2]._arr1[0]._field34);
+						displayDialog(_arrunkObj1337[2]._arr1[0]._field34);
 					else if (subC2BF8(&_arrunkObj1337[2]._arr1[1], pt))
-						subC6235(_arrunkObj1337[2]._arr1[1]._field34);
+						displayDialog(_arrunkObj1337[2]._arr1[1]._field34);
 					else if (subC2BF8(&_arrunkObj1337[2]._arr1[2], pt))
-						subC6235(_arrunkObj1337[2]._arr1[2]._field34);
+						displayDialog(_arrunkObj1337[2]._arr1[2]._field34);
 					else if (subC2BF8(&_arrunkObj1337[2]._arr1[3], pt))
-						subC6235(_arrunkObj1337[2]._arr1[3]._field34);
+						displayDialog(_arrunkObj1337[2]._arr1[3]._field34);
 					else if ((curReg >= 6) || (curReg <= 9))
 						actionDisplay(1330, 29, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 					else if ((curReg >= 11) || (curReg <= 14))
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 913550c223..4c412dbcb0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -343,7 +343,7 @@ public:
 	void subC4CD2();
 	void subC4CEC();
 	void subC51A0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2);
-	void subC6235(int arg1);
+	void displayDialog(int dialogNumb);
 	void subPostInit();
 	void subCB59B();
 	void suggestInstructions();
-- 
cgit v1.2.3


From 8faf01647817e8882164c567d644d0af616583eb Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 15 Feb 2012 01:48:58 +0100
Subject: TSAGE: R2R - Scene 1337: Fix a shadowed variable

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 6268978310..cf8d214d6b 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -4359,8 +4359,8 @@ void Scene1337::subC2C2F() {
 				if ((_arrunkObj1337[3]._arr2[i]._field34 == 1) && (!subC2687(_arrunkObj1337[3]._arr3[i]._field34))) {
 					int tmpVal = 0;
 					
-					for (int i = 0; i <= 7; i++) {
-						if ((_arrunkObj1337[3]._arr2[i]._field34 > 1) && (_arrunkObj1337[3]._arr2[i]._field34 <= 9))
+					for (int j = 0; j <= 7; j++) {
+						if ((_arrunkObj1337[3]._arr2[j]._field34 > 1) && (_arrunkObj1337[3]._arr2[j]._field34 <= 9))
 							++tmpVal;
 					}
 					
-- 
cgit v1.2.3


From 8c0e361582abbaed5e6b37a31651702b570f674b Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Wed, 15 Feb 2012 14:17:09 +0000
Subject: COMPOSER: Add detection entries for 3 V1 Magic Tales games.

These are listed in bug #3485018 - "COMPOSER: v1 undetected MD5's"
---
 engines/composer/detection.cpp | 45 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'engines')

diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index af355402c2..c9237a5884 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -53,9 +53,12 @@ Common::Language ComposerEngine::getLanguage() const {
 
 static const PlainGameDescriptor composerGames[] = {
 	{"composer", "Composer Game"},
+	{"babayaga", "Magic Tales: Baba Yaga and the Magic Geese"},
 	{"darby", "Darby the Dragon"},
 	{"gregory", "Gregory and the Hot Air Balloon"},
+	{"imoking", "Magic Tales: Imo and the King"},
 	{"liam", "Magic Tales: Liam Finds a Story"},
+	{"littlesamurai", "Magic Tales: The Little Samurai"},
 	{"princess", "The Princess and the Crab"},
 	{"sleepingcub", "Sleeping Cub's Test of Courage"},
 	{0, 0}
@@ -64,6 +67,48 @@ static const PlainGameDescriptor composerGames[] = {
 namespace Composer {
 
 static const ComposerGameDescription gameDescriptions[] = {
+	// Magic Tales: Baba Yaga and the Magic Geese - from bug #3485018
+	{
+		{
+			"babayaga",
+			"",
+			AD_ENTRY1s("book.ini", "412b7f4b0ef07f442009d28e3a819974", 3852),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_ComposerV1
+	},
+
+	// Magic Tales: Imo and the King - from bug #3485018
+	{
+		{
+			"imoking",
+			"",
+			AD_ENTRY1s("book.ini", "62b52a1763cce7d7d6ccde9f9d32fd4b", 3299),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_ComposerV1
+	},
+
+	// Magic Tales: The Little Samurai - from bug #3485018
+	{
+		{
+			"littlesamurai",
+			"",
+			AD_ENTRY1s("book.ini", "7a851869d022a9041e0dd11e5bace09b", 3747),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_ComposerV1
+	},
+
 	// from Liam Finds a Story CD
 	{
 		{
-- 
cgit v1.2.3


From b66b7f8ec81a6574134adb5d2d8e3d55663e3fb4 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Wed, 15 Feb 2012 14:43:27 +0000
Subject: COMPOSER: Add Detection Entry for Sleeping Cub Mac.

Parameters from bug #3461369 - "COMPOSER: Mac Sleeping Cub Not
Detected".
---
 engines/composer/detection.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'engines')

diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index c9237a5884..ca615e2f19 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -270,6 +270,24 @@ static const ComposerGameDescription gameDescriptions[] = {
 		GType_ComposerV2
 	},
 
+	// Sleeping Cub Mac - From Bug #3461369
+	{
+		{
+			"sleepingcub",
+			0,
+			{
+				{"sleeping cub.ini", 0, "39642a4036cb51443f5e90052c3ad0b2", -1},
+				{"page99.rsc", 0, "219fbd9bd2ff87c7023814405d753145", -1},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_ComposerV2
+	},
+
 	{ AD_TABLE_END_MARKER, 0 }
 };
 
-- 
cgit v1.2.3


From 658080deeda79d20ea40643569fbcb072573e7cf Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 28 Jan 2012 01:15:49 +0100
Subject: ALL: Avoid using is* macros from ctype.h

On some systems, passing signed chars to macros like isspace() etc. lead
to a runtime error. Hence, mark these macros as forbidden by default,
and introduce otherwise equivalent alternatives for them.
---
 engines/agi/agi.cpp                   | 14 +-------------
 engines/agi/wagparser.cpp             |  4 ++--
 engines/agos/script_pn.cpp            |  8 ++++----
 engines/agos/string.cpp               |  2 +-
 engines/agos/string_pn.cpp            |  2 +-
 engines/cge/text.cpp                  |  4 ++--
 engines/cine/detection.cpp            |  2 +-
 engines/drascula/interface.cpp        |  2 +-
 engines/hugo/util.cpp                 |  2 +-
 engines/kyra/gui.cpp                  |  2 +-
 engines/mohawk/livingbooks_code.cpp   |  8 ++++----
 engines/parallaction/dialogue.cpp     |  2 +-
 engines/parallaction/parser_br.cpp    | 12 ++++++------
 engines/parallaction/parser_ns.cpp    |  2 +-
 engines/queen/talk.cpp                |  2 +-
 engines/saga/interface.cpp            |  4 ++--
 engines/sci/engine/kstring.cpp        |  6 +++---
 engines/sci/graphics/text16.cpp       |  2 +-
 engines/sci/parser/vocabulary.cpp     |  2 +-
 engines/sci/resource.cpp              |  4 ++--
 engines/sci/resource_audio.cpp        |  2 +-
 engines/scumm/smush/smush_player.cpp  |  4 ++--
 engines/scumm/string.cpp              |  8 ++++----
 engines/sky/control.cpp               |  2 +-
 engines/sky/detection.cpp             |  2 +-
 engines/sword1/animation.cpp          |  4 ++--
 engines/sword25/util/lua/lbaselib.cpp |  7 ++-----
 engines/sword25/util/lua/llex.cpp     | 26 ++++++++++++--------------
 engines/sword25/util/lua/lobject.cpp  |  8 ++------
 engines/sword25/util/lua/lstrlib.cpp  |  2 ++
 30 files changed, 66 insertions(+), 85 deletions(-)

(limited to 'engines')

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 4ed606c3ba..e1c52c7c5e 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -250,19 +250,7 @@ void AgiEngine::processEvents() {
 				// Not a special key, so get the ASCII code for it
 				key = event.kbd.ascii;
 
-				// Function isalpha is defined in <ctype.h> so the following applies to it:
-				//
-				// The C Programming Language Standard states:
-				//   The header <ctype.h> declares several functions useful for classifying
-				//   and mapping characters. In all cases the argument is an int, the value
-				//   of which shall be representable as an unsigned char or shall equal the
-				//   value of the macro EOF. If the argument has any other value, the
-				//   behavior is undefined.
-				//
-				// For a concrete example (e.g. in Microsoft Visual Studio 2003):
-				//   When used with a debug CRT library, isalpha will display a CRT assert
-				//   if passed a parameter that isn't EOF or in the range of 0 through 0xFF.
-				if (key >= 0 && key <= 0xFF && isalpha(key)) {
+				if (isAlpha(key)) {
 					// Key is A-Z.
 					// Map Ctrl-A to 1, Ctrl-B to 2, etc.
 					if (event.kbd.flags & Common::KBD_CTRL) {
diff --git a/engines/agi/wagparser.cpp b/engines/agi/wagparser.cpp
index 39f9e0dd92..00602420e2 100644
--- a/engines/agi/wagparser.cpp
+++ b/engines/agi/wagparser.cpp
@@ -112,11 +112,11 @@ WagFileParser::~WagFileParser() {
 bool WagFileParser::checkAgiVersionProperty(const WagProperty &version) const {
 	if (version.getCode() == WagProperty::PC_INTVERSION && // Must be AGI interpreter version property
 		version.getSize() >= 3 && // Need at least three characters for a version number like "X.Y"
-		isdigit(static_cast<unsigned char>(version.getData()[0])) && // And the first character must be a digit
+		isDigit(version.getData()[0]) && // And the first character must be a digit
 		(version.getData()[1] == ',' || version.getData()[1] == '.')) { // And the second a comma or a period
 
 		for (int i = 2; i < version.getSize(); i++) // And the rest must all be digits
-			if (!isdigit(static_cast<unsigned char>(version.getData()[i])))
+			if (!isDigit(version.getData()[i]))
 				return false; // Bail out if found a non-digit after the decimal point
 
 		return true;
diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp
index 196350b9bf..70540343ed 100644
--- a/engines/agos/script_pn.cpp
+++ b/engines/agos/script_pn.cpp
@@ -466,8 +466,8 @@ void AGOSEngine_PN::opn_opcode35() {
 void AGOSEngine_PN::opn_opcode36() {
 	for (int i = 0; i < _dataBase[57] + 1; ++i)
 		_wordcp[i] = 0;
-	if (isspace(static_cast<unsigned char>(*_inpp)))
-		while ((*_inpp) && (isspace(static_cast<unsigned char>(*_inpp))))
+	if (isSpace(*_inpp))
+		while ((*_inpp) && (isSpace(*_inpp)))
 			_inpp++;
 	if (*_inpp == 0) {
 		setScriptReturn(false);
@@ -481,7 +481,7 @@ void AGOSEngine_PN::opn_opcode36() {
 	}
 
 	int ct = 1;
-	while ((*_inpp != '.') && (*_inpp != ',') && (!isspace(static_cast<unsigned char>(*_inpp))) && (*_inpp != '\0') &&
+	while ((*_inpp != '.') && (*_inpp != ',') && (!isSpace(*_inpp)) && (*_inpp != '\0') &&
 		(*_inpp!='"')) {
 		if (ct < _dataBase[57])
 			_wordcp[ct++] = *_inpp;
@@ -581,7 +581,7 @@ void AGOSEngine_PN::opn_opcode46() {
 		return;
 	}
 	x++;
-	while ((*x != '.') && (*x != ',') && (*x != '"') && (!isspace(static_cast<unsigned char>(*x))) && (*x != '\0'))
+	while ((*x != '.') && (*x != ',') && (*x != '"') && (!isSpace(*x)) && (*x != '\0'))
 		pcf(*x++);
 	setScriptReturn(true);
 }
diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp
index 410fd5a1ce..4298ff6155 100644
--- a/engines/agos/string.cpp
+++ b/engines/agos/string.cpp
@@ -152,7 +152,7 @@ const byte *AGOSEngine::getStringPtrByID(uint16 stringId, bool upperCase) {
 	}
 
 	if (upperCase && *dst) {
-		if (islower(*dst))
+		if (isLower(*dst))
 			*dst = toupper(*dst);
 	}
 
diff --git a/engines/agos/string_pn.cpp b/engines/agos/string_pn.cpp
index ac8c263da3..8f31da6f58 100644
--- a/engines/agos/string_pn.cpp
+++ b/engines/agos/string_pn.cpp
@@ -137,7 +137,7 @@ void AGOSEngine_PN::pcf(uint8 ch) {
 		if ((ch != 32) || (_bp + _xofs != 50))
 			_buffer[_bp++] = ch;
 	}
-	if ((ch != 254) && (!isspace(ch)) && (_bp < 60))
+	if ((ch != 254) && (!isSpace(ch)) && (_bp < 60))
 		return;
 	/* We know have a case of needing to print the text */
 	if (_bp + _xofs > 50) {
diff --git a/engines/cge/text.cpp b/engines/cge/text.cpp
index 331dc8ac2d..9fb3c95e93 100644
--- a/engines/cge/text.cpp
+++ b/engines/cge/text.cpp
@@ -72,7 +72,7 @@ int16 Text::count() {
 		strcpy(tmpStr, line.c_str());
 		if ((s = strtok(tmpStr, " =,;/\t\n")) == NULL)
 			continue;
-		if (!isdigit(*s))
+		if (!isDigit(*s))
 			continue;
 
 		counter++;
@@ -105,7 +105,7 @@ void Text::load() {
 		strcpy(tmpStr, line.c_str());
 		if ((s = strtok(tmpStr, " =,;/\t\n")) == NULL)
 			continue;
-		if (!isdigit(*s))
+		if (!isDigit(*s))
 			continue;
 
 		int r = atoi(s);
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index ed656682ee..65b2285f11 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -141,7 +141,7 @@ SaveStateList CineMetaEngine::listSaves(const char *target) const {
 
 		for (file = filenames.begin(); file != filenames.end(); ++file) {
 			// Jump over savegame files that don't end with a digit (e.g. "fw.3" is ok, "fw.a" is not).
-			if (!isdigit(static_cast<unsigned char>(file->lastChar())))
+			if (!isDigit(file->lastChar()))
 				continue;
 
 			// Obtain the last digit of the filename, since they correspond to the save slot
diff --git a/engines/drascula/interface.cpp b/engines/drascula/interface.cpp
index 5e4f7a1541..c08bcea01f 100644
--- a/engines/drascula/interface.cpp
+++ b/engines/drascula/interface.cpp
@@ -168,7 +168,7 @@ void DrasculaEngine::enterName() {
 		key = getScan();
 
 		if (key != 0) {
-			if (key >= 0 && key <= 0xFF && isalpha(static_cast<unsigned char>(key)))
+			if (key >= 0 && key <= 0xFF && isAlpha(key))
 				select2[v] = tolower(key);
 			else if ((key >= Common::KEYCODE_0 && key <= Common::KEYCODE_9) || key == Common::KEYCODE_SPACE)
 				select2[v] = key;
diff --git a/engines/hugo/util.cpp b/engines/hugo/util.cpp
index 6dc9890c3a..1428fc93a3 100644
--- a/engines/hugo/util.cpp
+++ b/engines/hugo/util.cpp
@@ -119,7 +119,7 @@ char *strlwr(char *buffer) {
 	char *result = buffer;
 
 	while (*buffer != '\0') {
-		if (isupper(static_cast<unsigned char>(*buffer)))
+		if (isUpper(*buffer))
 			*buffer = tolower(*buffer);
 		buffer++;
 	}
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index 9e08ae0fb9..07d8b307f3 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -56,7 +56,7 @@ void GUI::updateSaveFileList(Common::String targetName, bool excludeQuickSaves)
 		s1 = (*i)[i->size() - 3];
 		s2 = (*i)[i->size() - 2];
 		s3 = (*i)[i->size() - 1];
-		if (!isdigit(static_cast<unsigned char>(s1)) || !isdigit(static_cast<unsigned char>(s2)) || !isdigit(static_cast<unsigned char>(s3)))
+		if (!isDigit(s1) || !isDigit(s2) || !isDigit(s3))
 			continue;
 		s1 -= '0';
 		s2 -= '0';
diff --git a/engines/mohawk/livingbooks_code.cpp b/engines/mohawk/livingbooks_code.cpp
index 41acea19c4..b961e20f78 100644
--- a/engines/mohawk/livingbooks_code.cpp
+++ b/engines/mohawk/livingbooks_code.cpp
@@ -1766,7 +1766,7 @@ uint LBCode::parseCode(const Common::String &source) {
 			{
 			Common::String tempString;
 			while (pos < source.size()) {
-				if (!isalpha(source[pos]) && !isdigit(source[pos]))
+				if (!isAlpha(source[pos]) && !isDigit(source[pos]))
 					break;
 				tempString += source[pos++];
 			}
@@ -1777,7 +1777,7 @@ uint LBCode::parseCode(const Common::String &source) {
 			}
 			break;
 		default:
-			if (isdigit(token)) {
+			if (isDigit(token)) {
 				const char *in = source.c_str() + pos - 1;
 				// FIXME: handle floats?
 				char *endptr;
@@ -1792,11 +1792,11 @@ uint LBCode::parseCode(const Common::String &source) {
 				WRITE_BE_UINT16(tmp, (int16)intValue);
 				code.push_back(tmp[0]);
 				code.push_back(tmp[1]);
-			} else if (isalpha(token)) {
+			} else if (isAlpha(token)) {
 				Common::String tempString;
 				tempString += token;
 				while (pos < source.size()) {
-					if (!isalpha(source[pos]) && !isdigit(source[pos]))
+					if (!isAlpha(source[pos]) && !isDigit(source[pos]))
 						break;
 					tempString += source[pos++];
 				}
diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index a908152bf8..3bb4404b98 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -381,7 +381,7 @@ protected:
 	}
 
 	void accumPassword(uint16 ascii) {
-		if (!isdigit(ascii)) {
+		if (!isDigit(ascii)) {
 			return;
 		}
 
diff --git a/engines/parallaction/parser_br.cpp b/engines/parallaction/parser_br.cpp
index df53ecca3f..fb6a4102d1 100644
--- a/engines/parallaction/parser_br.cpp
+++ b/engines/parallaction/parser_br.cpp
@@ -524,14 +524,14 @@ DECLARE_COMMAND_PARSER(location)  {
 	ctxt.cmd->_startPos.x = -1000;
 	ctxt.cmd->_startPos2.x = -1000;
 	if (_tokens[ctxt.nextToken][0] != '\0') {
-		if (isdigit(static_cast<unsigned char>(_tokens[ctxt.nextToken][0])) || _tokens[ctxt.nextToken][0] == '-') {
+		if (isDigit(_tokens[ctxt.nextToken][0]) || _tokens[ctxt.nextToken][0] == '-') {
 			ctxt.cmd->_startPos.x = atoi(_tokens[ctxt.nextToken]);
 			ctxt.nextToken++;
 			ctxt.cmd->_startPos.y = atoi(_tokens[ctxt.nextToken]);
 			ctxt.nextToken++;
 		}
 
-		if (isdigit(static_cast<unsigned char>(_tokens[ctxt.nextToken][0])) || _tokens[ctxt.nextToken][0] == '-') {
+		if (isDigit(_tokens[ctxt.nextToken][0]) || _tokens[ctxt.nextToken][0] == '-') {
 			ctxt.cmd->_startPos2.x = atoi(_tokens[ctxt.nextToken]);
 			ctxt.nextToken++;
 			ctxt.cmd->_startPos2.y = atoi(_tokens[ctxt.nextToken]);
@@ -677,7 +677,7 @@ DECLARE_COMMAND_PARSER(text)  {
 
 	createCommand(_parser->_lookup);
 
-	if (isdigit(static_cast<unsigned char>(_tokens[1][1]))) {
+	if (isDigit(_tokens[1][1])) {
 		ctxt.cmd->_zeta0 = atoi(_tokens[1]);
 		ctxt.nextToken++;
 	} else {
@@ -714,7 +714,7 @@ DECLARE_COMMAND_PARSER(unary)  {
 DECLARE_ZONE_PARSER(limits)  {
 	debugC(7, kDebugParser, "ZONE_PARSER(limits) ");
 
-	if (isalpha(static_cast<unsigned char>(_tokens[1][1]))) {
+	if (isAlpha(_tokens[1][1])) {
 		ctxt.z->_flags |= kFlagsAnimLinked;
 		ctxt.z->_linkedName = _tokens[1];
 	} else {
@@ -1003,7 +1003,7 @@ DECLARE_INSTRUCTION_PARSER(text)  {
 
 	int _si = 1;
 
-	if (isdigit(static_cast<unsigned char>(_tokens[1][1]))) {
+	if (isDigit(_tokens[1][1])) {
 		ctxt.inst->_y = atoi(_tokens[1]);
 		_si = 2;
 	} else {
@@ -1066,7 +1066,7 @@ DECLARE_INSTRUCTION_PARSER(endif)  {
 
 void ProgramParser_br::parseRValue(ScriptVar &v, const char *str) {
 
-	if (isdigit(static_cast<unsigned char>(str[0])) || str[0] == '-') {
+	if (isDigit(str[0]) || str[0] == '-') {
 		v.setImmediate(atoi(str));
 		return;
 	}
diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp
index a73f1558e8..13c42b30e1 100644
--- a/engines/parallaction/parser_ns.cpp
+++ b/engines/parallaction/parser_ns.cpp
@@ -534,7 +534,7 @@ DECLARE_INSTRUCTION_PARSER(endscript)  {
 
 void ProgramParser_ns::parseRValue(ScriptVar &v, const char *str) {
 
-	if (isdigit(static_cast<unsigned char>(str[0])) || str[0] == '-') {
+	if (isDigit(str[0]) || str[0] == '-') {
 		v.setImmediate(atoi(str));
 		return;
 	}
diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index f38c78c825..72cb40bd7a 100644
--- a/engines/queen/talk.cpp
+++ b/engines/queen/talk.cpp
@@ -657,7 +657,7 @@ void Talk::stringAnimation(const SpeechParameters *parameters, int startFrame, i
 	} else if (parameters->animation[0] == 'E') {
 		// Talking head animation
 		return;
-	} else if (!isdigit(static_cast<unsigned char>(parameters->animation[0]))) {
+	} else if (!isDigit(parameters->animation[0])) {
 		debug(6, "Error in speak string animation: '%s'", parameters->animation);
 		return;
 	} else
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index 994b35cbf8..dd99f5854a 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -1151,7 +1151,7 @@ void Interface::processStatusTextInput(Common::KeyState keystate) {
 		if (_statusTextInputPos >= STATUS_TEXT_INPUT_MAX) {
 			break;
 		}
-		if (isalnum(keystate.ascii) || (keystate.ascii == ' ')) {
+		if (isAlnum(keystate.ascii) || (keystate.ascii == ' ')) {
 			_statusTextInputString[_statusTextInputPos++] = keystate.ascii;
 			_statusTextInputString[_statusTextInputPos] = 0;
 		}
@@ -1209,7 +1209,7 @@ bool Interface::processTextInput(Common::KeyState keystate) {
 		_textInputPos = _textInputStringLength + 1;
 		break;
 	default:
-		if (((keystate.ascii <= 255) && (isalnum(keystate.ascii))) || (keystate.ascii == ' ') ||
+		if (((keystate.ascii <= 255) && (isAlnum(keystate.ascii))) || (keystate.ascii == ' ') ||
 		    (keystate.ascii == '-') || (keystate.ascii == '_')) {
 			if (_textInputStringLength < save_title_size - 1) {
 				ch[0] = keystate.ascii;
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index a1cd571e89..735b1b2187 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -147,7 +147,7 @@ reg_t kReadNumber(EngineState *s, int argc, reg_t *argv) {
 	Common::String source_str = s->_segMan->getString(argv[0]);
 	const char *source = source_str.c_str();
 
-	while (isspace((unsigned char)*source))
+	while (isSpace(*source))
 		source++; /* Skip whitespace */
 
 	int16 result = 0;
@@ -246,14 +246,14 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
 
 			/* int writelength; -- unused atm */
 
-			if (xfer && (isdigit(static_cast<unsigned char>(xfer)) || xfer == '-' || xfer == '=')) {
+			if (xfer && (isDigit(xfer) || xfer == '-' || xfer == '=')) {
 				char *destp;
 
 				if (xfer == '0')
 					fillchar = '0';
 				else if (xfer == '=')
 					align = ALIGN_CENTER;
-				else if (isdigit(static_cast<unsigned char>(xfer)) || (xfer == '-'))
+				else if (isDigit(xfer) || (xfer == '-'))
 					source--; // Go to start of length argument
 
 				strLength = strtol(source, &destp, 10);
diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index 84547d9828..bd89e237f0 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -100,7 +100,7 @@ int16 GfxText16::CodeProcessing(const char *&text, GuiResourceId orgFontId, int1
 	//  cX -> sets textColor to _textColors[X-1]
 	curCode = textCode[0];
 	curCodeParm = textCode[1];
-	if (isdigit(static_cast<unsigned char>(curCodeParm))) {
+	if (isDigit(curCodeParm)) {
 		curCodeParm -= '0';
 	} else {
 		curCodeParm = -1;
diff --git a/engines/sci/parser/vocabulary.cpp b/engines/sci/parser/vocabulary.cpp
index a5c4686b3b..44e11d5b1f 100644
--- a/engines/sci/parser/vocabulary.cpp
+++ b/engines/sci/parser/vocabulary.cpp
@@ -534,7 +534,7 @@ bool Vocabulary::tokenizeString(ResultWordListList &retval, const char *sentence
 	do {
 
 		c = sentence[pos_in_sentence++];
-		if (isalnum(c) || (c == '-' && wordLen) || (c >= 0x80)) {
+		if (isAlnum(c) || (c == '-' && wordLen) || (c >= 0x80)) {
 			currentWord[wordLen] = lowerCaseMap[c];
 			++wordLen;
 		}
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 41062eb19b..a95a7e9b35 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1558,7 +1558,7 @@ void ResourceManager::readResourcePatches() {
 			name = (*x)->getName();
 
 			// SCI1 scheme
-			if (isdigit(static_cast<unsigned char>(name[0]))) {
+			if (isDigit(name[0])) {
 				char *end = 0;
 				resourceNr = strtol(name.c_str(), &end, 10);
 				bAdd = (*end == '.'); // Ensure the next character is the period
@@ -1566,7 +1566,7 @@ void ResourceManager::readResourcePatches() {
 				// SCI0 scheme
 				int resname_len = strlen(szResType);
 				if (scumm_strnicmp(name.c_str(), szResType, resname_len) == 0
-					&& !isalpha(static_cast<unsigned char>(name[resname_len + 1]))) {
+					&& !isAlpha(name[resname_len + 1])) {
 					resourceNr = atoi(name.c_str() + resname_len + 1);
 					bAdd = true;
 				}
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 764f4785b7..4eb94cca69 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -198,7 +198,7 @@ void ResourceManager::readWaveAudioPatches() {
 	for (Common::ArchiveMemberList::const_iterator x = files.begin(); x != files.end(); ++x) {
 		Common::String name = (*x)->getName();
 
-		if (isdigit(static_cast<unsigned char>(name[0])))
+		if (isDigit(name[0]))
 			processWavePatch(ResourceId(kResourceTypeAudio, atoi(name.c_str())), name);
 	}
 }
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 2f4e86bf61..36de5e470b 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -90,13 +90,13 @@ public:
 			assert(def_end != NULL);
 
 			char *id_end = def_end;
-			while (id_end >= def_start && !isdigit(static_cast<unsigned char>(*(id_end-1)))) {
+			while (id_end >= def_start && !isDigit(*(id_end-1))) {
 				id_end--;
 			}
 
 			assert(id_end > def_start);
 			char *id_start = id_end;
-			while (isdigit(static_cast<unsigned char>(*(id_start - 1)))) {
+			while (isDigit(*(id_start - 1))) {
 				id_start--;
 			}
 
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 61bb89328d..8a689fffa9 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1389,10 +1389,10 @@ void ScummEngine_v7::loadLanguageBundle() {
 			} else if (*ptr == '#') {
 				// Number of subtags following a given basetag. We don't need that
 				// information so we just skip it
-			} else if (isdigit(static_cast<unsigned char>(*ptr))) {
+			} else if (isDigit(*ptr)) {
 				int idx = 0;
 				// A number (up to three digits)...
-				while (isdigit(static_cast<unsigned char>(*ptr))) {
+				while (isDigit(*ptr)) {
 					idx = idx * 10 + (*ptr - '0');
 					ptr++;
 				}
@@ -1430,12 +1430,12 @@ void ScummEngine_v7::loadLanguageBundle() {
 		for (i = 0; i < _languageIndexSize; i++) {
 			// First 8 chars in the line give the string ID / 'tag'
 			int j;
-			for (j = 0; j < 8 && !isspace(static_cast<unsigned char>(*ptr)); j++, ptr++)
+			for (j = 0; j < 8 && !isSpace(*ptr); j++, ptr++)
 				_languageIndex[i].tag[j] = toupper(*ptr);
 			_languageIndex[i].tag[j] = 0;
 
 			// After that follows a single space which we skip
-			assert(isspace(static_cast<unsigned char>(*ptr)));
+			assert(isSpace(*ptr));
 			ptr++;
 
 			// Then comes the translated string: we record an offset to that.
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index a40e77d1cb..6363789d3a 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -974,7 +974,7 @@ void Control::handleKeyPress(Common::KeyState kbd, Common::String &textBuf) {
 
 		// Allow the key only if is a letter, a digit, or one of a selected
 		// list of extra characters
-		if (isalnum(kbd.ascii) || strchr(" ,().='-&+!?\"", kbd.ascii) != 0) {
+		if (isAlnum(kbd.ascii) || strchr(" ,().='-&+!?\"", kbd.ascii) != 0) {
 			textBuf += kbd.ascii;
 		}
 	}
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index a078200edd..51f7330f09 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -206,7 +206,7 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const {
 		// Extract the extension
 		Common::String ext = file->c_str() + file->size() - 3;
 		ext.toUppercase();
-		if (isdigit(static_cast<unsigned char>(ext[0])) && isdigit(static_cast<unsigned char>(ext[1])) && isdigit(static_cast<unsigned char>(ext[2]))){
+		if (isDigit(ext[0]) && isDigit(ext[1]) && isDigit(ext[2])) {
 			int slotNum = atoi(ext.c_str());
 			Common::InSaveFile *in = saveFileMan->openForLoading(*file);
 			if (in) {
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index 5ad84d995f..a1c02c861a 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -115,7 +115,7 @@ bool MoviePlayer::load(uint32 id) {
 				int startFrame = strtoul(ptr, const_cast<char **>(&ptr), 10);
 				int endFrame = strtoul(ptr, const_cast<char **>(&ptr), 10);
 
-				while (*ptr && isspace(static_cast<unsigned char>(*ptr)))
+				while (*ptr && isSpace(*ptr))
 					ptr++;
 
 				if (startFrame > endFrame) {
@@ -132,7 +132,7 @@ bool MoviePlayer::load(uint32 id) {
 				if (*ptr == '@') {
 					++ptr;
 					color = strtoul(ptr, const_cast<char **>(&ptr), 10);
-					while (*ptr && isspace(static_cast<unsigned char>(*ptr)))
+					while (*ptr && isSpace(*ptr))
 						ptr++;
 				} 
 
diff --git a/engines/sword25/util/lua/lbaselib.cpp b/engines/sword25/util/lua/lbaselib.cpp
index 3f0b645164..940ddcd4f9 100644
--- a/engines/sword25/util/lua/lbaselib.cpp
+++ b/engines/sword25/util/lua/lbaselib.cpp
@@ -6,10 +6,7 @@
 
 
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "common/util.h"
 
 #define lbaselib_c
 #define LUA_LIB
@@ -62,7 +59,7 @@ static int luaB_tonumber (lua_State *L) {
     luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
     n = strtoul(s1, &s2, base);
     if (s1 != s2) {  /* at least one valid digit? */
-      while (isspace((unsigned char)(*s2))) s2++;  /* skip trailing spaces */
+      while (isSpace(*s2)) s2++;  /* skip trailing spaces */
       if (*s2 == '\0') {  /* no invalid trailing characters? */
         lua_pushnumber(L, (lua_Number)n);
         return 1;
diff --git a/engines/sword25/util/lua/llex.cpp b/engines/sword25/util/lua/llex.cpp
index 464ab3ec15..6c7eb78060 100644
--- a/engines/sword25/util/lua/llex.cpp
+++ b/engines/sword25/util/lua/llex.cpp
@@ -5,9 +5,7 @@
 */
 
 
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
+#include "common/util.h"
 
 #define llex_c
 #define LUA_CORE
@@ -188,7 +186,7 @@ static void trydecpoint (LexState *ls, SemInfo *seminfo) {
   sprintf(buf, "%.1f", 1.0);
   ls->decpoint = '.';
   for (i = 0; buf[i]; i++) {
-    if (!isspace(static_cast<unsigned char>(buf[i])) && !isdigit(static_cast<unsigned char>(buf[i]))) {
+    if (!isSpace(buf[i]) && !isDigit(buf[i])) {
       ls->decpoint = buf[i];
       break;
     }
@@ -204,13 +202,13 @@ static void trydecpoint (LexState *ls, SemInfo *seminfo) {
 
 /* LUA_NUMBER */
 static void read_numeral (LexState *ls, SemInfo *seminfo) {
-  lua_assert(isdigit(ls->current));
+  lua_assert(isDigit(ls->current));
   do {
     save_and_next(ls);
-  } while (isdigit(ls->current) || ls->current == '.');
+  } while (isDigit(ls->current) || ls->current == '.');
   if (check_next(ls, "Ee"))  /* `E'? */
     check_next(ls, "+-");  /* optional exponent sign */
-  while (isalnum(ls->current) || ls->current == '_')
+  while (isAlnum(ls->current) || ls->current == '_')
     save_and_next(ls);
   save(ls, '\0');
   buffreplace(ls, '.', ls->decpoint);  /* follow locale for decimal point */
@@ -313,7 +311,7 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
           case '\r': save(ls, '\n'); inclinenumber(ls); continue;
           case EOZ: continue;  /* will raise an error next loop */
           default: {
-            if (!isdigit(ls->current))
+            if (!isDigit(ls->current))
               save_and_next(ls);  /* handles \\, \", \', and \? */
             else {  /* \xxx */
               int i = 0;
@@ -321,7 +319,7 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
               do {
                 c = 10*c + (ls->current-'0');
                 next(ls);
-              } while (++i<3 && isdigit(ls->current));
+              } while (++i<3 && isDigit(ls->current));
               if (c > UCHAR_MAX)
                 luaX_lexerror(ls, "escape sequence too large", TK_STRING);
               save(ls, c);
@@ -412,7 +410,7 @@ static int llex (LexState *ls, SemInfo *seminfo) {
             return TK_DOTS;   /* ... */
           else return TK_CONCAT;   /* .. */
         }
-        else if (!isdigit(ls->current)) return '.';
+        else if (!isDigit(ls->current)) return '.';
         else {
           read_numeral(ls, seminfo);
           return TK_NUMBER;
@@ -422,21 +420,21 @@ static int llex (LexState *ls, SemInfo *seminfo) {
         return TK_EOS;
       }
       default: {
-        if (isspace(ls->current)) {
+        if (isSpace(ls->current)) {
           lua_assert(!currIsNewline(ls));
           next(ls);
           continue;
         }
-        else if (isdigit(ls->current)) {
+        else if (isDigit(ls->current)) {
           read_numeral(ls, seminfo);
           return TK_NUMBER;
         }
-        else if (isalpha(ls->current) || ls->current == '_') {
+        else if (isAlpha(ls->current) || ls->current == '_') {
           /* identifier or reserved word */
           TString *ts;
           do {
             save_and_next(ls);
-          } while (isalnum(ls->current) || ls->current == '_');
+          } while (isAlnum(ls->current) || ls->current == '_');
           ts = luaX_newstring(ls, luaZ_buffer(ls->buff),
                                   luaZ_bufflen(ls->buff));
           if (ts->tsv.reserved > 0)  /* reserved word? */
diff --git a/engines/sword25/util/lua/lobject.cpp b/engines/sword25/util/lua/lobject.cpp
index 24718931ed..1890aaae68 100644
--- a/engines/sword25/util/lua/lobject.cpp
+++ b/engines/sword25/util/lua/lobject.cpp
@@ -4,11 +4,7 @@
 ** See Copyright Notice in lua.h
 */
 
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "common/util.h"
 
 #define lobject_c
 #define LUA_CORE
@@ -94,7 +90,7 @@ int luaO_str2d (const char *s, lua_Number *result) {
   if (*endptr == 'x' || *endptr == 'X')  /* maybe an hexadecimal constant? */
     *result = cast_num(strtoul(s, &endptr, 16));
   if (*endptr == '\0') return 1;  /* most common case */
-  while (isspace(cast(unsigned char, *endptr))) endptr++;
+  while (isSpace(*endptr)) endptr++;
   if (*endptr != '\0') return 0;  /* invalid trailing characters? */
   return 1;
 }
diff --git a/engines/sword25/util/lua/lstrlib.cpp b/engines/sword25/util/lua/lstrlib.cpp
index bcc869cb98..ed68a2fa00 100644
--- a/engines/sword25/util/lua/lstrlib.cpp
+++ b/engines/sword25/util/lua/lstrlib.cpp
@@ -5,6 +5,8 @@
 */
 
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_ctype_h
+
 #include <ctype.h>
 #include <stddef.h>
 #include <stdio.h>
-- 
cgit v1.2.3


From 1e2019d2084ecdaa568e3eeeb32d642d446725f8 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Wed, 15 Feb 2012 16:00:53 +0000
Subject: COMPOSER: Add Detection Entry for Princess and the Crab Mac.

Parameters taken from bug #3461984 - "COMPOSER: Mac Princess and the
Crab Not Detected".
---
 engines/composer/detection.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'engines')

diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index ca615e2f19..ac7eafd510 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -253,6 +253,24 @@ static const ComposerGameDescription gameDescriptions[] = {
 		GType_ComposerV2
 	},
 
+	// The Princess and the Crab Mac - From Bug #3461984
+	{
+		{
+			"princess",
+			0,
+			{
+				{"the princess and the crab.ini", 0, "f6b551a7304643004bd5e4df7ac1e76e", -1},
+				{"page99.rsc", 0, "fd5ebd3b5e36c4651c50241619525355", -1},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_ComposerV2
+	},
+
 	{ // Provided by sev
 		{
 			"sleepingcub",
-- 
cgit v1.2.3


From 921f602ab8631a9d10e0a173b6b331dbafda564a Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Wed, 15 Feb 2012 00:06:13 -0600
Subject: JANITORIAL: Fix whitespace in pointer template arg

---
 engines/agi/agi.h                  |  2 +-
 engines/agi/menu.h                 |  4 ++--
 engines/agi/sprite.h               |  2 +-
 engines/agi/words.cpp              |  2 +-
 engines/cruise/cruise.h            |  2 +-
 engines/cruise/cruise_main.cpp     |  2 +-
 engines/draci/sprite.cpp           |  2 +-
 engines/kyra/eobcommon.h           |  2 +-
 engines/kyra/kyra_hof.cpp          |  2 +-
 engines/kyra/kyra_hof.h            |  2 +-
 engines/kyra/kyra_mr.cpp           |  2 +-
 engines/kyra/kyra_mr.h             |  2 +-
 engines/kyra/kyra_v1.h             |  2 +-
 engines/kyra/kyra_v2.h             |  4 ++--
 engines/kyra/lol.h                 | 10 +++++-----
 engines/kyra/screen.h              |  2 +-
 engines/kyra/script.cpp            |  2 +-
 engines/kyra/script.h              |  4 ++--
 engines/kyra/script_eob.h          |  2 +-
 engines/kyra/script_hof.cpp        |  2 +-
 engines/kyra/script_mr.cpp         |  2 +-
 engines/kyra/script_tim.cpp        |  2 +-
 engines/kyra/script_tim.h          |  4 ++--
 engines/made/database.h            |  4 ++--
 engines/made/resource.h            |  4 ++--
 engines/made/scriptfuncs.h         |  2 +-
 engines/mohawk/graphics.cpp        |  4 ++--
 engines/mohawk/graphics.h          |  6 +++---
 engines/mohawk/myst.h              |  2 +-
 engines/mohawk/myst_areas.h        |  2 +-
 engines/mohawk/myst_scripts.h      |  2 +-
 engines/mohawk/riven_external.h    |  2 +-
 engines/mohawk/riven_scripts.h     |  2 +-
 engines/parallaction/debug.cpp     |  6 +++---
 engines/parallaction/exec.h        |  4 ++--
 engines/parallaction/graphics.h    |  6 +++---
 engines/parallaction/gui.h         |  2 +-
 engines/parallaction/objects.cpp   |  2 +-
 engines/parallaction/parser.h      | 10 +++++-----
 engines/parallaction/parser_br.cpp |  4 ++--
 engines/parallaction/parser_ns.cpp |  4 ++--
 engines/parallaction/sound_ns.cpp  |  2 +-
 engines/saga/resource.h            |  2 +-
 engines/tinsel/detection.cpp       |  2 +-
 engines/toltecs/resource.h         |  2 +-
 engines/toltecs/script.h           |  2 +-
 46 files changed, 70 insertions(+), 70 deletions(-)

(limited to 'engines')

diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index e9923aba2e..ea3afa5ca3 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -631,7 +631,7 @@ struct AgiGame {
 	AgiLogic *_curLogic;
 
 	// words
-	Common::Array<AgiWord*> words[26];
+	Common::Array<AgiWord *> words[26];
 
 	// view table
 	VtEntry viewTable[MAX_VIEWTABLE];
diff --git a/engines/agi/menu.h b/engines/agi/menu.h
index e659c71fab..1d5828d78a 100644
--- a/engines/agi/menu.h
+++ b/engines/agi/menu.h
@@ -33,8 +33,8 @@ namespace Agi {
 
 struct AgiMenu;
 struct AgiMenuOption;
-typedef Common::List<AgiMenu*> MenuList;
-typedef Common::List<AgiMenuOption*> MenuOptionList;
+typedef Common::List<AgiMenu *> MenuList;
+typedef Common::List<AgiMenuOption *> MenuOptionList;
 
 class GfxMgr;
 class PictureMgr;
diff --git a/engines/agi/sprite.h b/engines/agi/sprite.h
index 68f0e32b86..851c2438fb 100644
--- a/engines/agi/sprite.h
+++ b/engines/agi/sprite.h
@@ -27,7 +27,7 @@ namespace Agi {
 
 
 struct Sprite;
-typedef Common::List<Sprite*> SpriteList;
+typedef Common::List<Sprite *> SpriteList;
 
 class AgiEngine;
 class GfxMgr;
diff --git a/engines/agi/words.cpp b/engines/agi/words.cpp
index 1001c66b20..4400112247 100644
--- a/engines/agi/words.cpp
+++ b/engines/agi/words.cpp
@@ -130,7 +130,7 @@ int AgiEngine::findWord(const char *word, int *flen) {
 		return -1;
 
 	*flen = 0;
-	Common::Array<AgiWord*> &a = _game.words[c];
+	Common::Array<AgiWord *> &a = _game.words[c];
 	
 	for (int i = 0; i < (int)a.size(); i++) {
 		int wlen = strlen(a[i]->word);
diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h
index 94f8759d01..9782df8f09 100644
--- a/engines/cruise/cruise.h
+++ b/engines/cruise/cruise.h
@@ -116,7 +116,7 @@ public:
 		static uint32 const cookie = 0x41424344;
 	};
 
-	Common::List<MemInfo*> _memList;
+	Common::List<MemInfo *> _memList;
 
 	typedef Common::List<Common::Rect> RectList;
 
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index a1337aefa7..7ce9b4ec78 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -45,7 +45,7 @@ typedef CruiseEngine::MemInfo MemInfo;
 void MemoryList() {
 	if (!_vm->_memList.empty()) {
 		debug("Current list of un-freed memory blocks:");
-		Common::List<MemInfo*>::iterator i;
+		Common::List<MemInfo *>::iterator i;
 		for (i = _vm->_memList.begin(); i != _vm->_memList.end(); ++i) {
 			MemInfo const *const v = *i;
 			debug("%s - %d", v->fname, v->lineNum);
diff --git a/engines/draci/sprite.cpp b/engines/draci/sprite.cpp
index 92ce7d31d9..965cdabf3e 100644
--- a/engines/draci/sprite.cpp
+++ b/engines/draci/sprite.cpp
@@ -318,7 +318,7 @@ void Text::repeatedlySplitLongLines(uint maxWidth) {
 }
 
 void Text::splitLinesLongerThan(uint maxWidth) {
-	char *start = const_cast<char*> (_text.c_str());	// hacky
+	char *start = const_cast<char *> (_text.c_str());	// hacky
 	while (1) {
 		char *end = strchr(start, '|');
 		if (end) {
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index e3ea533c63..4e2e1c5298 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -623,7 +623,7 @@ protected:
 	uint32 _envAudioTimer;
 	uint16 _teleporterPulse;
 
-	Common::Array<const int16*> _dscWallMapping;
+	Common::Array<const int16 *> _dscWallMapping;
 	const int16 *_dscShapeCoords;
 
 	const uint8 *_dscItemPosIndex;
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index fd2c1870a8..0ba173d9d0 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -171,7 +171,7 @@ KyraEngine_HoF::~KyraEngine_HoF() {
 		delete[] _conversationState[i];
 	delete[] _conversationState;
 
-	for (Common::Array<const TIMOpcode*>::iterator i = _timOpcodes.begin(); i != _timOpcodes.end(); ++i)
+	for (Common::Array<const TIMOpcode *>::iterator i = _timOpcodes.begin(); i != _timOpcodes.end(); ++i)
 		delete *i;
 	_timOpcodes.clear();
 }
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index 320f930b56..182854cdf1 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -656,7 +656,7 @@ protected:
 	int t2_resetChat(const TIM *tim, const uint16 *param);
 	int t2_playSoundEffect(const TIM *tim, const uint16 *param);
 
-	Common::Array<const TIMOpcode*> _timOpcodes;
+	Common::Array<const TIMOpcode *> _timOpcodes;
 
 	// sound
 	int _oldTalkFile;
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 4e07c8f343..39ed0d038a 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -183,7 +183,7 @@ KyraEngine_MR::~KyraEngine_MR() {
 	delete[] _sceneStrings;
 	delete[] _talkObjectList;
 
-	for (Common::Array<const Opcode*>::iterator i = _opcodesDialog.begin(); i != _opcodesDialog.end(); ++i)
+	for (Common::Array<const Opcode *>::iterator i = _opcodesDialog.begin(); i != _opcodesDialog.end(); ++i)
 		delete *i;
 	_opcodesDialog.clear();
 
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index 7c022534a2..004236ca04 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -463,7 +463,7 @@ private:
 
 	void npcChatSequence(const char *str, int object, int vocHigh, int vocLow);
 
-	Common::Array<const Opcode*> _opcodesDialog;
+	Common::Array<const Opcode *> _opcodesDialog;
 
 	int o3d_updateAnim(EMCState *script);
 	int o3d_delay(EMCState *script);
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 67332eccdb..04bfab2cb8 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -326,7 +326,7 @@ protected:
 
 	// opcode
 	virtual void setupOpcodeTable() = 0;
-	Common::Array<const Opcode*> _opcodes;
+	Common::Array<const Opcode *> _opcodes;
 
 	int o1_queryGameFlag(EMCState *script);
 	int o1_setGameFlag(EMCState *script);
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h
index 72d743710d..563416bf1e 100644
--- a/engines/kyra/kyra_v2.h
+++ b/engines/kyra/kyra_v2.h
@@ -224,7 +224,7 @@ protected:
 	// Sequences
 	EMCData _animationScriptData;
 	EMCState _animationScriptState;
-	Common::Array<const Opcode*> _opcodesAnimation;
+	Common::Array<const Opcode *> _opcodesAnimation;
 
 	void runAnimationScript(const char *filename, int allowSkip, int resetChar, int newShapes, int shapeUnload);
 
@@ -252,7 +252,7 @@ protected:
 	virtual void uninitAnimationShapes(int count, uint8 *filedata) = 0;
 
 	// Shapes
-	typedef Common::HashMap<int, uint8*> ShapeMap;
+	typedef Common::HashMap<int, uint8 *> ShapeMap;
 	ShapeMap _gameShapes;
 
 	uint8 *getShapePtr(int index) const;
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index bb8f24eb66..dbd461267f 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -447,7 +447,7 @@ private:
 	uint16 _envSfxQueuedBlocks[10];
 	int _nextSpeechId;
 	int _nextSpeaker;
-	typedef Common::List<Audio::SeekableAudioStream*> SpeechList;
+	typedef Common::List<Audio::SeekableAudioStream *> SpeechList;
 	SpeechList _speechList;
 
 	int _curTlkFile;
@@ -762,14 +762,14 @@ private:
 	// tim opcode
 	void setupOpcodeTable();
 
-	Common::Array<const TIMOpcode*> _timIntroOpcodes;
+	Common::Array<const TIMOpcode *> _timIntroOpcodes;
 	int tlol_setupPaletteFade(const TIM *tim, const uint16 *param);
 	int tlol_loadPalette(const TIM *tim, const uint16 *param);
 	int tlol_setupPaletteFadeEx(const TIM *tim, const uint16 *param);
 	int tlol_processWsaFrame(const TIM *tim, const uint16 *param);
 	int tlol_displayText(const TIM *tim, const uint16 *param);
 
-	Common::Array<const TIMOpcode*> _timOutroOpcodes;
+	Common::Array<const TIMOpcode *> _timOutroOpcodes;
 	int tlol_fadeInScene(const TIM *tim, const uint16 *param);
 	int tlol_unusedResourceFunc(const TIM *tim, const uint16 *param);
 	int tlol_fadeInPalette(const TIM *tim, const uint16 *param);
@@ -778,7 +778,7 @@ private:
 	int tlol_delayForChat(const TIM *tim, const uint16 *param);
 	int tlol_fadeOutSound(const TIM *tim, const uint16 *param);
 
-	Common::Array<const TIMOpcode*> _timIngameOpcodes;
+	Common::Array<const TIMOpcode *> _timIngameOpcodes;
 	int tlol_initSceneWindowDialogue(const TIM *tim, const uint16 *param);
 	int tlol_restoreAfterSceneWindowDialogue(const TIM *tim, const uint16 *param);
 	int tlol_giveItem(const TIM *tim, const uint16 *param);
@@ -1156,7 +1156,7 @@ private:
 
 	// spells
 	typedef Common::Functor1Mem<ActiveSpell *, int, LoLEngine> SpellProc;
-	Common::Array<const SpellProc*> _spellProcs;
+	Common::Array<const SpellProc *> _spellProcs;
 	typedef void (LoLEngine::*SpellProcCallback)(WSAMovie_v2 *, int, int);
 
 	int castSpell(int charNum, int spellType, int spellLevel);
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index dd74692a5d..62ea35af9e 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -554,7 +554,7 @@ protected:
 	uint8 _sjisInvisibleColor;
 
 	Palette *_screenPalette;
-	Common::Array<Palette*> _palettes;
+	Common::Array<Palette *> _palettes;
 	Palette *_internFadePalette;
 
 	Font *_fonts[FID_NUM];
diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp
index 1981341063..303cbb45aa 100644
--- a/engines/kyra/script.cpp
+++ b/engines/kyra/script.cpp
@@ -95,7 +95,7 @@ bool EMCInterpreter::callback(Common::IFFChunk &chunk) {
 	return false;
 }
 
-bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Common::Array<const Opcode*> *opcodes) {
+bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Common::Array<const Opcode *> *opcodes) {
 	Common::SeekableReadStream *stream = _vm->resource()->createReadStream(filename);
 	if (!stream) {
 		error("Couldn't open script file '%s'", filename);
diff --git a/engines/kyra/script.h b/engines/kyra/script.h
index dffb4e27f5..ccbe733e4d 100644
--- a/engines/kyra/script.h
+++ b/engines/kyra/script.h
@@ -41,7 +41,7 @@ struct EMCData {
 	uint16 *ordr;
 	uint16 dataSize;
 
-	const Common::Array<const Opcode*> *sysFuncs;
+	const Common::Array<const Opcode *> *sysFuncs;
 };
 
 struct EMCState {
@@ -109,7 +109,7 @@ class EMCInterpreter {
 public:
 	EMCInterpreter(KyraEngine_v1 *vm);
 
-	bool load(const char *filename, EMCData *data, const Common::Array<const Opcode*> *opcodes);
+	bool load(const char *filename, EMCData *data, const Common::Array<const Opcode *> *opcodes);
 	void unload(EMCData *data);
 
 	void init(EMCState *scriptState, const EMCData *data);
diff --git a/engines/kyra/script_eob.h b/engines/kyra/script_eob.h
index 391791522a..fc8b4cfc31 100644
--- a/engines/kyra/script_eob.h
+++ b/engines/kyra/script_eob.h
@@ -99,7 +99,7 @@ private:
 		InfProc *proc;
 		Common::String desc;
 	};
-	Common::Array<const InfOpcode*> _opcodes;
+	Common::Array<const InfOpcode *> _opcodes;
 
 	int8 *_scriptData;
 	uint16 _scriptSize;
diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp
index 73b6915c89..b80b8105a1 100644
--- a/engines/kyra/script_hof.cpp
+++ b/engines/kyra/script_hof.cpp
@@ -1480,7 +1480,7 @@ typedef Common::Functor2Mem<const TIM *, const uint16 *, int, KyraEngine_HoF> TI
 #define OpcodeTimUnImpl() _timOpcodes.push_back(new TIMOpcodeV2(this, 0))
 
 void KyraEngine_HoF::setupOpcodeTable() {
-	Common::Array<const Opcode*> *table = 0;
+	Common::Array<const Opcode *> *table = 0;
 
 	_opcodes.reserve(176);
 	SetOpcodeTable(_opcodes);
diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp
index 56b2a48b89..afe11aba02 100644
--- a/engines/kyra/script_mr.cpp
+++ b/engines/kyra/script_mr.cpp
@@ -1129,7 +1129,7 @@ typedef Common::Functor1Mem<EMCState *, int, KyraEngine_MR> OpcodeV3;
 #define Opcode(x) table->push_back(new OpcodeV3(this, &KyraEngine_MR::x))
 #define OpcodeUnImpl() table->push_back(new OpcodeV3(this, 0))
 void KyraEngine_MR::setupOpcodeTable() {
-	Common::Array<const Opcode*> *table = 0;
+	Common::Array<const Opcode *> *table = 0;
 
 	_opcodes.reserve(176);
 	SetOpcodeTable(_opcodes);
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index 7995ad21f1..177d7993a0 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -135,7 +135,7 @@ bool TIMInterpreter::callback(Common::IFFChunk &chunk) {
 	return false;
 }
 
-TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpcode*> *opcodes) {
+TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpcode *> *opcodes) {
 	if (!_vm->resource()->exists(filename))
 		return 0;
 
diff --git a/engines/kyra/script_tim.h b/engines/kyra/script_tim.h
index e132ed78c5..aa512daae8 100644
--- a/engines/kyra/script_tim.h
+++ b/engines/kyra/script_tim.h
@@ -146,7 +146,7 @@ struct TIM {
 	uint16 *avtl;
 	uint8 *text;
 
-	const Common::Array<const TIMOpcode*> *opcodes;
+	const Common::Array<const TIMOpcode *> *opcodes;
 
 	// TODO: Get rid of this ugly HACK to allow the
 	// Lands of Lore outro to be working properly.
@@ -159,7 +159,7 @@ public:
 	TIMInterpreter(KyraEngine_v1 *engine, Screen_v2 *screen_v2, OSystem *system);
 	virtual ~TIMInterpreter();
 
-	TIM *load(const char *filename, const Common::Array<const TIMOpcode*> *opcodes);
+	TIM *load(const char *filename, const Common::Array<const TIMOpcode *> *opcodes);
 	void unload(TIM *&tim) const;
 
 	bool callback(Common::IFFChunk &chunk);
diff --git a/engines/made/database.h b/engines/made/database.h
index 63f0557196..89b4b45357 100644
--- a/engines/made/database.h
+++ b/engines/made/database.h
@@ -151,9 +151,9 @@ public:
 	void dumpObject(int16 index);
 
 protected:
-	typedef Common::HashMap<uint32, int16*> ObjectPropertyCacheMap;
+	typedef Common::HashMap<uint32, int16 *> ObjectPropertyCacheMap;
 	MadeEngine *_vm;
-	Common::Array<Object*> _objects;
+	Common::Array<Object *> _objects;
 	ObjectPropertyCacheMap _objectPropertyCache;
 	byte *_gameState;
 	uint32 _gameStateSize;
diff --git a/engines/made/resource.h b/engines/made/resource.h
index 537801bdc8..da227a39a0 100644
--- a/engines/made/resource.h
+++ b/engines/made/resource.h
@@ -111,7 +111,7 @@ public:
 	int16 getWidth() const { return _width; }
 	int16 getHeight() const { return _height; }
 protected:
-	Common::Array<Graphics::Surface*> _frames;
+	Common::Array<Graphics::Surface *> _frames;
 	uint16 _flags;
 	int16 _width, _height;
 };
@@ -210,7 +210,7 @@ protected:
 	bool _isV1;
 
 	typedef Common::Array<ResourceSlot> ResourceSlots;
-	typedef Common::HashMap<uint32, ResourceSlots*> ResMap;
+	typedef Common::HashMap<uint32, ResourceSlots *> ResMap;
 	void openResourceBlock(const char *filename, Common::File *blockFile, uint32 resType);
 
 	ResMap _resSlots;
diff --git a/engines/made/scriptfuncs.h b/engines/made/scriptfuncs.h
index 6b3301755d..03d29c4592 100644
--- a/engines/made/scriptfuncs.h
+++ b/engines/made/scriptfuncs.h
@@ -68,7 +68,7 @@ protected:
 	Audio::SoundHandle _pcSpeakerHandle1, _pcSpeakerHandle2;
 	Audio::PCSpeaker *_pcSpeaker1, *_pcSpeaker2;
 
-	Common::Array<const ExternalFunc*> _externalFuncs;
+	Common::Array<const ExternalFunc *> _externalFuncs;
 	Common::Array<const char *> _externalFuncNames;
 	GenericResource *_musicRes;
 
diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp
index dcb0c7940d..2ffabf1e8c 100644
--- a/engines/mohawk/graphics.cpp
+++ b/engines/mohawk/graphics.cpp
@@ -108,9 +108,9 @@ GraphicsManager::~GraphicsManager() {
 }
 
 void GraphicsManager::clearCache() {
-	for (Common::HashMap<uint16, MohawkSurface*>::iterator it = _cache.begin(); it != _cache.end(); it++)
+	for (Common::HashMap<uint16, MohawkSurface *>::iterator it = _cache.begin(); it != _cache.end(); it++)
 		delete it->_value;
-	for (Common::HashMap<uint16, Common::Array<MohawkSurface*> >::iterator it = _subImageCache.begin(); it != _subImageCache.end(); it++) {
+	for (Common::HashMap<uint16, Common::Array<MohawkSurface *> >::iterator it = _subImageCache.begin(); it != _subImageCache.end(); it++) {
 		Common::Array<MohawkSurface *> &array = it->_value;
 		for (uint i = 0; i < array.size(); i++)
 			delete array[i];
diff --git a/engines/mohawk/graphics.h b/engines/mohawk/graphics.h
index 463608a2aa..8fa5d5f895 100644
--- a/engines/mohawk/graphics.h
+++ b/engines/mohawk/graphics.h
@@ -99,8 +99,8 @@ protected:
 
 private:
 	// An image cache that stores images until clearCache() is called
-	Common::HashMap<uint16, MohawkSurface*> _cache;
-	Common::HashMap<uint16, Common::Array<MohawkSurface*> > _subImageCache;
+	Common::HashMap<uint16, MohawkSurface *> _cache;
+	Common::HashMap<uint16, Common::Array<MohawkSurface *> > _subImageCache;
 };
 
 #ifdef ENABLE_MYST
@@ -222,7 +222,7 @@ private:
 		uint16 frameCount;
 		Common::Rect rect;
 		uint16 speed;
-		Common::Array<Common::SeekableReadStream*> frameScripts;
+		Common::Array<Common::SeekableReadStream *> frameScripts;
 
 		// Cur frame
 		uint16 curFrame;
diff --git a/engines/mohawk/myst.h b/engines/mohawk/myst.h
index 02f0a46e3f..30770f7ec9 100644
--- a/engines/mohawk/myst.h
+++ b/engines/mohawk/myst.h
@@ -173,7 +173,7 @@ public:
 	MystGraphics *_gfx;
 	MystGameState *_gameState;
 	MystScriptParser *_scriptParser;
-	Common::Array<MystResource*> _resources;
+	Common::Array<MystResource *> _resources;
 	MystResource *_dragResource;
 	Common::RandomSource *_rnd;
 
diff --git a/engines/mohawk/myst_areas.h b/engines/mohawk/myst_areas.h
index 136356ea4f..297a7cc92b 100644
--- a/engines/mohawk/myst_areas.h
+++ b/engines/mohawk/myst_areas.h
@@ -137,7 +137,7 @@ public:
 protected:
 	uint16 _var7;
 	uint16 _numSubResources;
-	Common::Array<MystResource*> _subResources;
+	Common::Array<MystResource *> _subResources;
 };
 
 class MystResourceType8 : public MystResourceType7 {
diff --git a/engines/mohawk/myst_scripts.h b/engines/mohawk/myst_scripts.h
index 18f5b27a6d..ccb76e0dc8 100644
--- a/engines/mohawk/myst_scripts.h
+++ b/engines/mohawk/myst_scripts.h
@@ -143,7 +143,7 @@ protected:
 		const char *desc;
 	};
 
-	Common::Array<MystOpcode*> _opcodes;
+	Common::Array<MystOpcode *> _opcodes;
 
 	MystResource *_invokingResource;
 
diff --git a/engines/mohawk/riven_external.h b/engines/mohawk/riven_external.h
index 5f5d0cb0b2..9f076325a2 100644
--- a/engines/mohawk/riven_external.h
+++ b/engines/mohawk/riven_external.h
@@ -53,7 +53,7 @@ private:
 		ExternalCmd proc;
 	};
 
-	Common::Array<RivenExternalCmd*> _externalCommands;
+	Common::Array<RivenExternalCmd *> _externalCommands;
 	void setupCommands();
 
 	// Supplementary Functions
diff --git a/engines/mohawk/riven_scripts.h b/engines/mohawk/riven_scripts.h
index 2932ba5939..a871f0afa0 100644
--- a/engines/mohawk/riven_scripts.h
+++ b/engines/mohawk/riven_scripts.h
@@ -125,7 +125,7 @@ private:
 	DECLARE_OPCODE(activateMLST);
 };
 
-typedef Common::Array<RivenScript*> RivenScriptList;
+typedef Common::Array<RivenScript *> RivenScriptList;
 
 class RivenScriptManager {
 public:
diff --git a/engines/parallaction/debug.cpp b/engines/parallaction/debug.cpp
index 72f26cb6b9..0cb329e0f0 100644
--- a/engines/parallaction/debug.cpp
+++ b/engines/parallaction/debug.cpp
@@ -69,14 +69,14 @@ bool Debugger::Cmd_Location(int argc, const char **argv) {
 
 	switch (argc) {
 	case 3:
-		character = const_cast<char*>(argv[2]);
-		location = const_cast<char*>(argv[1]);
+		character = const_cast<char *>(argv[2]);
+		location = const_cast<char *>(argv[1]);
 		sprintf(tmp, "%s.%s", location, character);
 		_vm->scheduleLocationSwitch(tmp);
 		break;
 
 	case 2:
-		location = const_cast<char*>(argv[1]);
+		location = const_cast<char *>(argv[1]);
 		_vm->scheduleLocationSwitch(location);
 		break;
 
diff --git a/engines/parallaction/exec.h b/engines/parallaction/exec.h
index b7b8a571f4..b966d677cd 100644
--- a/engines/parallaction/exec.h
+++ b/engines/parallaction/exec.h
@@ -55,7 +55,7 @@ struct CommandContext {
 	// in Parallaction_XX
 };
 typedef Common::Functor1<CommandContext&, void> CommandOpcode;
-typedef Common::Array<const CommandOpcode*>	CommandOpcodeSet;
+typedef Common::Array<const CommandOpcode *>	CommandOpcodeSet;
 #define DECLARE_UNQUALIFIED_COMMAND_OPCODE(op) void cmdOp_##op(CommandContext &)
 
 struct ProgramContext {
@@ -67,7 +67,7 @@ struct ProgramContext {
 	bool		_suspend;
 };
 typedef Common::Functor1<ProgramContext&, void> ProgramOpcode;
-typedef Common::Array<const ProgramOpcode*>	ProgramOpcodeSet;
+typedef Common::Array<const ProgramOpcode *>	ProgramOpcodeSet;
 #define DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(op) void instOp_##op(ProgramContext &)
 
 
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index dacf7715ae..99bc811763 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -341,12 +341,12 @@ public:
 */
 struct BackgroundInfo {
 protected:
-	typedef Common::Array<MaskBuffer*> MaskPatches;
+	typedef Common::Array<MaskBuffer *> MaskPatches;
 	MaskPatches	_maskPatches;
 	MaskBuffer		_maskBackup;
 	void clearMaskData();
 
-	typedef Common::Array<PathBuffer*> PathPatches;
+	typedef Common::Array<PathBuffer *> PathPatches;
 	PathPatches	_pathPatches;
 	PathBuffer		_pathBackup;
 	void clearPathData();
@@ -415,7 +415,7 @@ public:
 };
 
 
-typedef Common::Array<GfxObj*> GfxObjArray;
+typedef Common::Array<GfxObj *> GfxObjArray;
 #define SCENE_DRAWLIST_SIZE 100
 
 class Gfx {
diff --git a/engines/parallaction/gui.h b/engines/parallaction/gui.h
index 95c5653220..a6eed240c4 100644
--- a/engines/parallaction/gui.h
+++ b/engines/parallaction/gui.h
@@ -36,7 +36,7 @@ namespace Parallaction {
 class MenuInputState;
 
 class MenuInputHelper {
-	typedef	Common::HashMap<Common::String, MenuInputState*> StateMap;
+	typedef	Common::HashMap<Common::String, MenuInputState *> StateMap;
 
 	StateMap	_map;
 	MenuInputState	*_state;
diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp
index fe21732f03..222a0a9552 100644
--- a/engines/parallaction/objects.cpp
+++ b/engines/parallaction/objects.cpp
@@ -390,7 +390,7 @@ Table::Table(uint32 size) : _size(size), _used(0), _disposeMemory(true) {
 }
 
 Table::Table(uint32 size, const char **data) : _size(size), _used(size), _disposeMemory(false) {
-	_data = const_cast<char**>(data);
+	_data = const_cast<char **>(data);
 }
 
 Table::~Table() {
diff --git a/engines/parallaction/parser.h b/engines/parallaction/parser.h
index 1cf8e2f7ff..3e2604eda2 100644
--- a/engines/parallaction/parser.h
+++ b/engines/parallaction/parser.h
@@ -57,7 +57,7 @@ public:
 
 
 typedef Common::Functor0<void> Opcode;
-typedef Common::Array<const Opcode*>	OpcodeSet;
+typedef Common::Array<const Opcode *>	OpcodeSet;
 
 
 
@@ -69,8 +69,8 @@ public:
 
 	uint	_lookup;
 
-	Common::Stack<OpcodeSet*>	_opcodes;
-	Common::Stack<Table*>		_statements;
+	Common::Stack<OpcodeSet *>	_opcodes;
+	Common::Stack<Table *>		_statements;
 
 	OpcodeSet	*_currentOpcodes;
 	Table		*_currentStatements;
@@ -199,7 +199,7 @@ protected:
 	void		addCommand();
 
 	void clearSet(OpcodeSet &opcodes) {
-		for (Common::Array<const Opcode*>::iterator i = opcodes.begin(); i != opcodes.end(); ++i)
+		for (Common::Array<const Opcode *>::iterator i = opcodes.begin(); i != opcodes.end(); ++i)
 			delete *i;
 		opcodes.clear();
 	}
@@ -357,7 +357,7 @@ protected:
 	virtual void	parseRValue(ScriptVar &var, const char *str);
 
 	void clearSet(OpcodeSet &opcodes) {
-		for (Common::Array<const Opcode*>::iterator i = opcodes.begin(); i != opcodes.end(); ++i)
+		for (Common::Array<const Opcode *>::iterator i = opcodes.begin(); i != opcodes.end(); ++i)
 			delete *i;
 		opcodes.clear();
 	}
diff --git a/engines/parallaction/parser_br.cpp b/engines/parallaction/parser_br.cpp
index df53ecca3f..4aabf17e6e 100644
--- a/engines/parallaction/parser_br.cpp
+++ b/engines/parallaction/parser_br.cpp
@@ -1131,7 +1131,7 @@ void LocationParser_br::init() {
 	_locationZoneStmt = new Table(ARRAYSIZE(_locationZoneStmtRes_br), _locationZoneStmtRes_br);
 	_locationAnimStmt = new Table(ARRAYSIZE(_locationAnimStmtRes_br), _locationAnimStmtRes_br);
 
-	Common::Array<const Opcode*> *table = 0;
+	Common::Array<const Opcode *> *table = 0;
 
 	SetOpcodeTable(_commandParsers);
 	WARNING_PARSER(unexpected);
@@ -1234,7 +1234,7 @@ void ProgramParser_br::init() {
 
 	_instructionNames = new Table(ARRAYSIZE(_instructionNamesRes_br), _instructionNamesRes_br);
 
-	Common::Array<const Opcode*> *table = 0;
+	Common::Array<const Opcode *> *table = 0;
 
 	SetOpcodeTable(_instructionParsers);
 	INSTRUCTION_PARSER(defLocal);	// invalid opcode -> local definition
diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp
index a73f1558e8..e4bdcc7f68 100644
--- a/engines/parallaction/parser_ns.cpp
+++ b/engines/parallaction/parser_ns.cpp
@@ -1107,7 +1107,7 @@ void LocationParser_ns::init() {
 	_locationZoneStmt = new Table(ARRAYSIZE(_locationZoneStmtRes_ns), _locationZoneStmtRes_ns);
 	_locationAnimStmt = new Table(ARRAYSIZE(_locationAnimStmtRes_ns), _locationAnimStmtRes_ns);
 
-	Common::Array<const Opcode*> *table = 0;
+	Common::Array<const Opcode *> *table = 0;
 
 	SetOpcodeTable(_commandParsers);
 	WARNING_PARSER(unexpected);
@@ -1177,7 +1177,7 @@ void ProgramParser_ns::init() {
 
 	_instructionNames = new Table(ARRAYSIZE(_instructionNamesRes_ns), _instructionNamesRes_ns);
 
-	Common::Array<const Opcode*> *table = 0;
+	Common::Array<const Opcode *> *table = 0;
 	SetOpcodeTable(_instructionParsers);
 	INSTRUCTION_PARSER(defLocal);	// invalid opcode -> local definition
 	INSTRUCTION_PARSER(animation);	// on
diff --git a/engines/parallaction/sound_ns.cpp b/engines/parallaction/sound_ns.cpp
index b5d4c72ea4..3cc25b36b0 100644
--- a/engines/parallaction/sound_ns.cpp
+++ b/engines/parallaction/sound_ns.cpp
@@ -165,7 +165,7 @@ void DosSoundMan_ns::playCharacterMusic(const char *character) {
 		return;
 	}
 
-	char *name = const_cast<char*>(character);
+	char *name = const_cast<char *>(character);
 	const char *newMusicFile = 0;
 
 	if (!scumm_stricmp(name, _dinoName)) {
diff --git a/engines/saga/resource.h b/engines/saga/resource.h
index 2124f3e29f..a8e2e92361 100644
--- a/engines/saga/resource.h
+++ b/engines/saga/resource.h
@@ -157,7 +157,7 @@ protected:
 	virtual void processPatches(Resource *resource, const GamePatchDescription *patchFiles) { }
 };
 
-typedef Common::List<ResourceContext*> ResourceContextList;
+typedef Common::List<ResourceContext *> ResourceContextList;
 
 struct MetaResource {
 	int16 sceneIndex;
diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp
index 1fce032633..0f662e22bd 100644
--- a/engines/tinsel/detection.cpp
+++ b/engines/tinsel/detection.cpp
@@ -169,7 +169,7 @@ struct SizeMD5 {
 };
 typedef Common::HashMap<Common::String, SizeMD5, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> SizeMD5Map;
 typedef Common::HashMap<Common::String, Common::FSNode, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> FileMap;
-typedef Common::Array<const ADGameDescription*> ADGameDescList;
+typedef Common::Array<const ADGameDescription *> ADGameDescList;
 
 /**
  * Fallback detection scans the list of Discworld 2 targets to see if it can detect an installation
diff --git a/engines/toltecs/resource.h b/engines/toltecs/resource.h
index 7f4694f0f6..3fed2e11ca 100644
--- a/engines/toltecs/resource.h
+++ b/engines/toltecs/resource.h
@@ -71,7 +71,7 @@ public:
 	void purgeCache();
 
 protected:
-	typedef Common::HashMap<uint, Resource*> ResourceMap;
+	typedef Common::HashMap<uint, Resource *> ResourceMap;
 
 	ToltecsEngine *_vm;
 
diff --git a/engines/toltecs/script.h b/engines/toltecs/script.h
index 1a5a9c90ad..0c1898c525 100644
--- a/engines/toltecs/script.h
+++ b/engines/toltecs/script.h
@@ -77,7 +77,7 @@ protected:
 	};
 
 	ToltecsEngine *_vm;
-	Common::Array<const ScriptFunction*> _scriptFuncs;
+	Common::Array<const ScriptFunction *> _scriptFuncs;
 	Common::Array<const char *> _scriptFuncNames;
 
 	byte *_stack;
-- 
cgit v1.2.3


From a4798602d7a025dc13fd253d584dbf29dbec488d Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Wed, 15 Feb 2012 09:53:31 -0600
Subject: JANITORIAL: Fix missing whitespace in pointer cast

find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g'

This seems to have caught some params as well which is not undesirable IMO.
It also caught some strings containing this which is undesirable so I
excluded them manually. (engines/sci/engine/kernel_tables.h)
---
 engines/agi/preagi_mickey.h                  |  2 +-
 engines/agi/preagi_troll.cpp                 |  4 +-
 engines/agi/sound_2gs.cpp                    |  6 +--
 engines/agi/sound_sarien.cpp                 |  4 +-
 engines/agi/sprite.cpp                       |  2 +-
 engines/cine/gfx.cpp                         |  2 +-
 engines/cruise/background.cpp                |  2 +-
 engines/cruise/backgroundIncrust.cpp         |  6 +--
 engines/cruise/cruise_main.cpp               |  4 +-
 engines/cruise/dataLoader.cpp                |  2 +-
 engines/cruise/font.cpp                      |  2 +-
 engines/cruise/function.cpp                  | 10 ++--
 engines/cruise/mainDraw.cpp                  |  8 ++--
 engines/cruise/saveload.cpp                  |  4 +-
 engines/cruise/script.cpp                    |  4 +-
 engines/dreamweb/saveload.cpp                |  2 +-
 engines/groovie/script.cpp                   |  2 +-
 engines/hugo/schedule.cpp                    |  2 +-
 engines/hugo/sound.cpp                       |  2 +-
 engines/kyra/eobcommon.h                     |  6 +--
 engines/kyra/kyra_rpg.cpp                    |  4 +-
 engines/kyra/saveload_rpg.cpp                |  2 +-
 engines/kyra/screen.cpp                      |  2 +-
 engines/lastexpress/entities/alexei.cpp      |  2 +-
 engines/lastexpress/entities/entity_intern.h |  4 +-
 engines/lastexpress/game/entities.cpp        |  6 +--
 engines/lure/sound.cpp                       |  2 +-
 engines/made/database.cpp                    | 24 +++++-----
 engines/made/graphics.cpp                    |  4 +-
 engines/made/resource.h                      |  2 +-
 engines/made/screen.cpp                      |  8 ++--
 engines/made/screenfx.cpp                    |  4 +-
 engines/mohawk/video.cpp                     |  2 +-
 engines/parallaction/balloons.cpp            |  4 +-
 engines/parallaction/callables_br.cpp        | 14 +++---
 engines/parallaction/callables_ns.cpp        | 16 +++----
 engines/parallaction/disk.cpp                |  4 +-
 engines/parallaction/disk_br.cpp             | 10 ++--
 engines/parallaction/disk_ns.cpp             | 16 +++----
 engines/parallaction/font.cpp                | 16 +++----
 engines/parallaction/gfxbase.cpp             |  8 ++--
 engines/parallaction/graphics.cpp            | 32 ++++++-------
 engines/parallaction/graphics.h              |  2 +-
 engines/parallaction/gui_br.cpp              |  4 +-
 engines/parallaction/inventory.cpp           |  4 +-
 engines/parallaction/inventory.h             |  2 +-
 engines/parallaction/objects.cpp             |  2 +-
 engines/parallaction/parallaction.h          | 72 ++++++++++++++--------------
 engines/parallaction/sound_br.cpp            |  2 +-
 engines/queen/music.cpp                      |  2 +-
 engines/saga/animation.cpp                   |  2 +-
 engines/saga/gfx.cpp                         |  2 +-
 engines/saga/isomap.cpp                      |  2 +-
 engines/saga/script.h                        |  4 +-
 engines/sci/console.cpp                      |  8 ++--
 engines/sci/engine/kfile.cpp                 |  2 +-
 engines/sci/engine/message.cpp               |  2 +-
 engines/sci/engine/scriptdebug.cpp           |  2 +-
 engines/sci/engine/seg_manager.cpp           |  2 +-
 engines/sci/engine/segment.cpp               |  2 +-
 engines/sci/graphics/screen.cpp              |  8 ++--
 engines/sci/parser/said.cpp                  |  2 +-
 engines/sci/sound/drivers/amigamac.cpp       |  6 +--
 engines/scumm/actor.cpp                      |  2 +-
 engines/scumm/costume.cpp                    |  2 +-
 engines/scumm/cursor.cpp                     |  2 +-
 engines/scumm/detection.cpp                  |  2 +-
 engines/scumm/gfx.cpp                        | 10 ++--
 engines/scumm/gfx_towns.cpp                  | 12 ++---
 engines/scumm/he/sound_he.cpp                |  2 +-
 engines/scumm/player_apple2.h                |  2 +-
 engines/scumm/player_sid.cpp                 |  2 +-
 engines/scumm/player_v1.cpp                  |  4 +-
 engines/scumm/resource.cpp                   |  4 +-
 engines/scumm/saveload.cpp                   | 12 ++---
 engines/scumm/saveload.h                     |  4 +-
 engines/scumm/script_v4.cpp                  |  4 +-
 engines/scumm/script_v8.cpp                  |  2 +-
 engines/scumm/string.cpp                     |  2 +-
 engines/sky/autoroute.cpp                    |  2 +-
 engines/sky/compact.cpp                      | 34 ++++++-------
 engines/sky/control.cpp                      | 20 ++++----
 engines/sky/control.h                        |  2 +-
 engines/sky/disk.cpp                         |  4 +-
 engines/sky/intro.cpp                        | 26 +++++-----
 engines/sky/logic.cpp                        | 22 ++++-----
 engines/sky/mouse.cpp                        |  2 +-
 engines/sky/music/adlibchannel.cpp           | 10 ++--
 engines/sky/music/gmmusic.cpp                |  2 +-
 engines/sky/music/mt32music.cpp              |  2 +-
 engines/sky/text.cpp                         |  4 +-
 engines/sword2/music.cpp                     |  2 +-
 engines/sword25/util/lua/luaconf.h           |  2 +-
 engines/sword25/util/pluto/pluto.cpp         | 26 +++++-----
 engines/tinsel/graphics.cpp                  |  2 +-
 engines/tinsel/heapmem.cpp                   |  8 ++--
 engines/toltecs/menu.cpp                     |  4 +-
 engines/toltecs/movie.cpp                    |  2 +-
 engines/toltecs/screen.cpp                   |  2 +-
 engines/toltecs/script.cpp                   | 10 ++--
 engines/toltecs/segmap.cpp                   |  4 +-
 engines/toon/audio.cpp                       |  2 +-
 engines/toon/character.cpp                   |  2 +-
 engines/toon/script_func.h                   |  2 +-
 104 files changed, 331 insertions(+), 331 deletions(-)

(limited to 'engines')

diff --git a/engines/agi/preagi_mickey.h b/engines/agi/preagi_mickey.h
index 673839a592..18b0593d78 100644
--- a/engines/agi/preagi_mickey.h
+++ b/engines/agi/preagi_mickey.h
@@ -704,7 +704,7 @@ protected:
 	void readOfsData(int, int, uint8*, long);
 	bool chooseY_N(int, bool);
 	int choose1to9(int);
-	void printStr(char*);
+	void printStr(char *);
 	void printLine(const char*);
 	void printExeStr(int);
 	void printExeMsg(int);
diff --git a/engines/agi/preagi_troll.cpp b/engines/agi/preagi_troll.cpp
index 50b2945383..b7d2801076 100644
--- a/engines/agi/preagi_troll.cpp
+++ b/engines/agi/preagi_troll.cpp
@@ -455,7 +455,7 @@ int TrollEngine::drawRoom(char *menu) {
 	_gfx->doUpdate();
 
 	char tmp[10];
-	strncat(menu, (char*)_gameData + _locMessagesIdx[_currentRoom], 39);
+	strncat(menu, (char *)_gameData + _locMessagesIdx[_currentRoom], 39);
 
 	for (int i = 0; i < 3; i++) {
 		if (_roomDescs[_roomPicture - 1].options[i]) {
@@ -725,7 +725,7 @@ void TrollEngine::fillOffsets() {
 
 void TrollEngine::init() {
 	_picture->setPictureVersion(AGIPIC_V15);
-	//SetScreenPar(320, 200, (char*)ibm_fontdata);
+	//SetScreenPar(320, 200, (char *)ibm_fontdata);
 
 	const int gaps[] = { 0x3A40,  0x4600,  0x4800,  0x5800,  0x5a00,  0x6a00,
 						 0x6c00,  0x7400,  0x7600,  0x7c00,  0x7e00,  0x8e00,
diff --git a/engines/agi/sound_2gs.cpp b/engines/agi/sound_2gs.cpp
index b15950f31d..bfc8d4d8f3 100644
--- a/engines/agi/sound_2gs.cpp
+++ b/engines/agi/sound_2gs.cpp
@@ -68,10 +68,10 @@ int SoundGen2GS::readBuffer(int16 *buffer, const int numSamples) {
 	static uint data_available = 0;
 	static uint data_offset = 0;
 	uint n = numSamples << 1;
-	uint8 *p = (uint8*)buffer;
+	uint8 *p = (uint8 *)buffer;
 
 	while (n > data_available) {
-		memcpy(p, (uint8*)_out + data_offset, data_available);
+		memcpy(p, (uint8 *)_out + data_offset, data_available);
 		p += data_available;
 		n -= data_available;
 
@@ -81,7 +81,7 @@ int SoundGen2GS::readBuffer(int16 *buffer, const int numSamples) {
 		data_offset = 0;
 	}
 
-	memcpy(p, (uint8*)_out + data_offset, n);
+	memcpy(p, (uint8 *)_out + data_offset, n);
 	data_offset += n;
 	data_available -= n;
 
diff --git a/engines/agi/sound_sarien.cpp b/engines/agi/sound_sarien.cpp
index a2baf89d12..576801bc56 100644
--- a/engines/agi/sound_sarien.cpp
+++ b/engines/agi/sound_sarien.cpp
@@ -330,7 +330,7 @@ void SoundGenSarien::fillAudio(int16 *stream, uint len) {
 	debugC(5, kDebugLevelSound, "(%p, %d)", (void *)stream, len);
 
 	while (len > data_available) {
-		memcpy((uint8 *)stream + p, (uint8*)_sndBuffer + data_offset, data_available);
+		memcpy((uint8 *)stream + p, (uint8 *)_sndBuffer + data_offset, data_available);
 		p += data_available;
 		len -= data_available;
 
@@ -339,7 +339,7 @@ void SoundGenSarien::fillAudio(int16 *stream, uint len) {
 		data_offset = 0;
 	}
 
-	memcpy((uint8 *)stream + p, (uint8*)_sndBuffer + data_offset, len);
+	memcpy((uint8 *)stream + p, (uint8 *)_sndBuffer + data_offset, len);
 	data_offset += len;
 	data_available -= len;
 }
diff --git a/engines/agi/sprite.cpp b/engines/agi/sprite.cpp
index 8d13be3f68..ea2d329fb0 100644
--- a/engines/agi/sprite.cpp
+++ b/engines/agi/sprite.cpp
@@ -55,7 +55,7 @@ void *SpritesMgr::poolAlloc(int size) {
 
 	// Adjust size to sizeof(void *) boundary to prevent data misalignment
 	// errors.
-	const int alignPadding = sizeof(void*) - 1;
+	const int alignPadding = sizeof(void *) - 1;
 	size = (size + alignPadding) & ~alignPadding;
 
 	x = _poolTop;
diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index 01e05bed6d..918d522606 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -1801,7 +1801,7 @@ void maskBgOverlay(const byte *bgPtr, const byte *maskPtr, int16 width, int16 he
 	for (it = g_cine->_bgIncrustList.begin(); it != g_cine->_bgIncrustList.end(); ++it) {
 		tmpWidth = g_cine->_animDataTable[it->frame]._realWidth;
 		tmpHeight = g_cine->_animDataTable[it->frame]._height;
-		mask = (byte*)malloc(tmpWidth * tmpHeight);
+		mask = (byte *)malloc(tmpWidth * tmpHeight);
 
 		if (it->param == 0) {
 			generateMask(g_cine->_animDataTable[it->frame].data(), mask, tmpWidth * tmpHeight, it->part);
diff --git a/engines/cruise/background.cpp b/engines/cruise/background.cpp
index 4d1284a802..9da5413013 100644
--- a/engines/cruise/background.cpp
+++ b/engines/cruise/background.cpp
@@ -129,7 +129,7 @@ int loadBackground(const char *name, int idx) {
 		flagSpeed = 0;
 	}
 
-	if (!strcmp((char*)ptr, "PAL")) {
+	if (!strcmp((char *)ptr, "PAL")) {
 		memcpy(palScreen[idx], ptr + 4, 256*3);
 		gfxModuleData_setPal256(palScreen[idx]);
 	} else {
diff --git a/engines/cruise/backgroundIncrust.cpp b/engines/cruise/backgroundIncrust.cpp
index 39286670ed..ddda8dee45 100644
--- a/engines/cruise/backgroundIncrust.cpp
+++ b/engines/cruise/backgroundIncrust.cpp
@@ -46,7 +46,7 @@ void backupBackground(backgroundIncrustStruct *pIncrust, int X, int Y, int width
 	pIncrust->savedX = X;
 	pIncrust->savedY = Y;
 
-	pIncrust->ptr = (uint8*)MemAlloc(width * height);
+	pIncrust->ptr = (uint8 *)MemAlloc(width * height);
 	for (int i = 0; i < height; i++) {
 		for (int j = 0; j < width; j++) {
 			int xp = j + X;
@@ -169,7 +169,7 @@ backgroundIncrustStruct *addBackgroundIncrust(int16 overlayIdx,	int16 objectIdx,
 			int sizeTable[4];	// 0 = left, 1 = right, 2 = bottom, 3 = top
 
 			// this function checks if the dataPtr is not 0, else it retrives the data for X, Y, scale and DataPtr again (OLD: mainDrawSub1Sub1)
-			flipPoly(params.fileIdx, (int16*)filesDatabase[params.fileIdx].subData.ptr, params.scale, &newFrame, newElement->X, newElement->Y, &newX, &newY, &newScale);
+			flipPoly(params.fileIdx, (int16 *)filesDatabase[params.fileIdx].subData.ptr, params.scale, &newFrame, newElement->X, newElement->Y, &newX, &newY, &newScale);
 
 			// this function fills the sizeTable for the poly (OLD: mainDrawSub1Sub2)
 			getPolySize(newX, newY, newScale, sizeTable, (unsigned char*)newFrame);
@@ -213,7 +213,7 @@ void regenerateBackgroundIncrust(backgroundIncrustStruct *pHead) {
 				drawSprite(width, height, NULL, filesDatabase[frame].subData.ptr, pl->Y, pl->X, backgroundScreens[pl->backgroundIdx], filesDatabase[frame].subData.ptrMask);
 			} else {
 				// Poly
-				addBackgroundIncrustSub1(frame, pl->X, pl->Y, NULL, pl->scale, (char*)backgroundScreens[pl->backgroundIdx], (char *)filesDatabase[frame].subData.ptr);
+				addBackgroundIncrustSub1(frame, pl->X, pl->Y, NULL, pl->scale, (char *)backgroundScreens[pl->backgroundIdx], (char *)filesDatabase[frame].subData.ptr);
 			}
 
 			backgroundChanged[pl->backgroundIdx] = true;
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 7ce9b4ec78..6e2847d6d7 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -691,7 +691,7 @@ int findObject(int mouseX, int mouseY, int *outObjOvl, int *outObjIdx) {
 						if ((filesDatabase[j].subData.resourceType == OBJ_TYPE_POLY) && (filesDatabase[j].subData.ptr)) {
 							int zoom = params.scale;
 
-							int16* dataPtr = (int16*)filesDatabase[j].subData.ptr;
+							int16* dataPtr = (int16 *)filesDatabase[j].subData.ptr;
 
 							if (*dataPtr == 0) {
 								int16 offset;
@@ -723,7 +723,7 @@ int findObject(int mouseX, int mouseY, int *outObjOvl, int *outObjIdx) {
 								y -= newY;
 							}
 
-							if (dataPtr && findPoly((char*)dataPtr, x, y, zoom, mouseX, mouseY)) {
+							if (dataPtr && findPoly((char *)dataPtr, x, y, zoom, mouseX, mouseY)) {
 								*outObjOvl = linkedObjOvl;
 								*outObjIdx = linkedObjIdx;
 
diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp
index 76479d7a10..94d075ecc3 100644
--- a/engines/cruise/dataLoader.cpp
+++ b/engines/cruise/dataLoader.cpp
@@ -420,7 +420,7 @@ int loadSetEntry(const char *name, uint8 *ptr, int currentEntryIdx, int currentD
 	int sec = 0;
 	uint16 numIdx;
 
-	if (!strcmp((char*)ptr, "SEC")) {
+	if (!strcmp((char *)ptr, "SEC")) {
 		sec = 1;
 	}
 
diff --git a/engines/cruise/font.cpp b/engines/cruise/font.cpp
index a6680f7a02..2fd86a11b7 100644
--- a/engines/cruise/font.cpp
+++ b/engines/cruise/font.cpp
@@ -106,7 +106,7 @@ void loadFNT(const char *fileName) {
 
 	fontFileHandle.read(header, 4);
 
-	if (strcmp((char*)header, "FNT") == 0) {
+	if (strcmp((char *)header, "FNT") == 0) {
 		uint32 fontSize = fontFileHandle.readUint32BE();
 
 		_systemFNT = (uint8 *)mallocAndZero(fontSize);
diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp
index 27b9be7e79..610465e962 100644
--- a/engines/cruise/function.cpp
+++ b/engines/cruise/function.cpp
@@ -142,7 +142,7 @@ int16 Op_AddProc() {
 
 	if (procBss) {
 		for (long int i = 0; i < pop1; i++) {
-			int16* ptr = (int16*)(procBss + i * 2);
+			int16* ptr = (int16 *)(procBss + i * 2);
 			*ptr = param[i];
 			bigEndianShortToNative(ptr);
 		}
@@ -1046,7 +1046,7 @@ int16 Op_ComputeLine() {
 	int y1 = popVar();
 	int x1 = popVar();
 
-	point* pDest = (point*)popPtr();
+	point* pDest = (point *)popPtr();
 
 	int maxValue = cor_droite(x1, y1, x2, y2, pDest);
 
@@ -1334,7 +1334,7 @@ int16 Op_TrackAnim() {		// setup actor position
 }
 
 int16 Op_BgName() {
-	char* bgName = (char*)popPtr();
+	char* bgName = (char *)popPtr();
 	int bgIdx = popVar();
 
 	if ((bgIdx >= 0) && (bgIdx < NBSCREENS) && bgName) {
@@ -1524,7 +1524,7 @@ int16 Op_Itoa() {
 		param[i] = popVar();
 
 	int val = popVar();
-	char* pDest = (char*)popPtr();
+	char* pDest = (char *)popPtr();
 
 	if (!nbp)
 		sprintf(txt, "%d", val);
@@ -1645,7 +1645,7 @@ int16 Op_SetVolume() {
 }
 
 int16 Op_SongExist() {
-	const char *songName = (char*)popPtr();
+	const char *songName = (char *)popPtr();
 
 	if (songName) {
 		char name[33];
diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp
index 9a5df69cae..24f65500db 100644
--- a/engines/cruise/mainDraw.cpp
+++ b/engines/cruise/mainDraw.cpp
@@ -185,7 +185,7 @@ void flipPoly(int fileId, int16 *dataPtr, int scale, char** newFrame, int X, int
 		Y -= newY;
 	}
 
-	*newFrame = (char*)dataPtr;
+	*newFrame = (char *)dataPtr;
 	*outX = X;
 	*outY = Y;
 	*outScale = scale;
@@ -1077,7 +1077,7 @@ void mainDrawPolygons(int fileIndex, cellStruct *plWork, int X, int scale, int Y
 	int sizeTable[4];	// 0 = left, 1 = right, 2 = bottom, 3 = top
 
 	// this function checks if the dataPtr is not 0, else it retrives the data for X, Y, scale and DataPtr again (OLD: mainDrawSub1Sub1)
-	flipPoly(fileIndex, (int16*)dataPtr, scale, &newFrame, X, Y, &newX, &newY, &newScale);
+	flipPoly(fileIndex, (int16 *)dataPtr, scale, &newFrame, X, Y, &newX, &newY, &newScale);
 
 	// this function fills the sizeTable for the poly (OLD: mainDrawSub1Sub2)
 	getPolySize(newX, newY, newScale, sizeTable, (unsigned char*)newFrame);
@@ -1143,7 +1143,7 @@ void mainDrawPolygons(int fileIndex, cellStruct *plWork, int X, int scale, int Y
 	}
 
 	// this function builds the poly model and then calls the draw functions (OLD: mainDrawSub1Sub5)
-	buildPolyModel(newX, newY, newScale, (char*)polygonMask, destBuffer, newFrame);
+	buildPolyModel(newX, newY, newScale, (char *)polygonMask, destBuffer, newFrame);
 }
 
 void drawMessage(const gfxEntryStruct *pGfxPtr, int globalX, int globalY, int width, int newColor, uint8 *ouputPtr) {
@@ -1419,7 +1419,7 @@ void mainDraw(int16 param) {
 	currentObjPtr = cellHead.next;
 
 #ifdef _DEBUG
-	/*	polyOutputBuffer = (char*)bgPtr;
+	/*	polyOutputBuffer = (char *)bgPtr;
 		drawCtp(); */
 #endif
 
diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp
index e2bd1ebc34..26bea0441c 100644
--- a/engines/cruise/saveload.cpp
+++ b/engines/cruise/saveload.cpp
@@ -924,10 +924,10 @@ Common::Error loadSavegameData(int saveGameIdx) {
 
 			if (ptr) {
 				ASSERT(0);
-				//*(int16*)(currentcellHead->datas+0x2E) = getSprite(ptr,*(int16*)(currentcellHead->datas+0xE));
+				//*(int16 *)(currentcellHead->datas+0x2E) = getSprite(ptr,*(int16 *)(currentcellHead->datas+0xE));
 			} else {
 				ASSERT(0);
-				//*(int16*)(currentcellHead->datas+0x2E) = 0;
+				//*(int16 *)(currentcellHead->datas+0x2E) = 0;
 			}
 		}
 
diff --git a/engines/cruise/script.cpp b/engines/cruise/script.cpp
index cf28548e7d..d753d938bd 100644
--- a/engines/cruise/script.cpp
+++ b/engines/cruise/script.cpp
@@ -33,7 +33,7 @@ scriptInstanceStruct procHead;
 scriptInstanceStruct *currentScriptPtr;
 
 int8 getByteFromScript() {
-	int8 var = *(int8*)(currentData3DataPtr + currentScriptPtr->scriptOffset);
+	int8 var = *(int8 *)(currentData3DataPtr + currentScriptPtr->scriptOffset);
 	++currentScriptPtr->scriptOffset;
 
 	return (var);
@@ -202,7 +202,7 @@ int32 opcodeType1()	{
 			di = currentScriptPtr->overlayNumber;
 		}
 
-		if ((var == 0x85) && !strcmp((char*)currentCtpName, "S26.CTP") && !di && mode == 1) { // patch in bar
+		if ((var == 0x85) && !strcmp((char *)currentCtpName, "S26.CTP") && !di && mode == 1) { // patch in bar
 			var = 0x87;
 		}
 
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 761ce7696f..4779d0baef 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -260,7 +260,7 @@ void DreamWebEngine::saveGame() {
 		}
 
 		char descbuf[17] = { 2, 0 };
-		Common::strlcpy((char*)descbuf + 1, game_description.c_str(), 16);
+		Common::strlcpy((char *)descbuf + 1, game_description.c_str(), 16);
 		unsigned int desclen = game_description.size();
 		if (desclen > 15)
 			desclen = 15;
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index a8b4417459..68415233f4 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -373,7 +373,7 @@ bool Script::hotspot(Common::Rect rect, uint16 address, uint8 cursor) {
 	    DebugMan.isDebugChannelEnabled(kGroovieDebugAll)) {
 		rect.translate(0, -80);
 		_vm->_graphicsMan->_foreground.frameRect(rect, 250);
-		_vm->_system->copyRectToScreen((byte*)_vm->_graphicsMan->_foreground.getBasePtr(0, 0), _vm->_graphicsMan->_foreground.pitch, 0, 80, 640, 320);
+		_vm->_system->copyRectToScreen((byte *)_vm->_graphicsMan->_foreground.getBasePtr(0, 0), _vm->_graphicsMan->_foreground.pitch, 0, 80, 640, 320);
 		_vm->_system->updateScreen();
 	}
 
diff --git a/engines/hugo/schedule.cpp b/engines/hugo/schedule.cpp
index 892c144393..896e8fa2ce 100644
--- a/engines/hugo/schedule.cpp
+++ b/engines/hugo/schedule.cpp
@@ -1104,7 +1104,7 @@ void Scheduler::restoreEvents(Common::ReadStream *f) {
 		if ((index == -1) && (subElem == -1))
 			_events[i].action = 0;
 		else
-			_events[i].action = (act*)&_actListArr[index][subElem];
+			_events[i].action = (act *)&_actListArr[index][subElem];
 
 		_events[i].localActionFl = (f->readByte() == 1) ? true : false;
 		_events[i].time = f->readUint32BE();
diff --git a/engines/hugo/sound.cpp b/engines/hugo/sound.cpp
index 9dcd7d346a..d0b4e3dfe8 100644
--- a/engines/hugo/sound.cpp
+++ b/engines/hugo/sound.cpp
@@ -256,7 +256,7 @@ void SoundHandler::checkMusic() {
 }
 
 void SoundHandler::loopPlayer(void *refCon) {
-	((SoundHandler*)refCon)->pcspkr_player();
+	((SoundHandler *)refCon)->pcspkr_player();
 }
 
 /**
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 4e2e1c5298..dff2427ddb 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -945,11 +945,11 @@ protected:
 	void printNoEffectWarning();
 
 	void spellCallback_start_empty() {}
-	bool spellCallback_end_empty(void*) { return true; }
+	bool spellCallback_end_empty(void *) { return true; }
 	void spellCallback_start_armor();
 	void spellCallback_start_burningHands();
 	void spellCallback_start_detectMagic();
-	bool spellCallback_end_detectMagic(void*);
+	bool spellCallback_end_detectMagic(void *);
 	void spellCallback_start_magicMissile();
 	bool spellCallback_end_magicMissile(void *obj);
 	void spellCallback_start_shockingGrasp();
@@ -981,7 +981,7 @@ protected:
 	void spellCallback_start_fleshToStone();
 	void spellCallback_start_stoneToFlesh();
 	void spellCallback_start_trueSeeing();
-	bool spellCallback_end_trueSeeing(void*);
+	bool spellCallback_end_trueSeeing(void *);
 	void spellCallback_start_slayLiving();
 	void spellCallback_start_powerWordStun();
 	void spellCallback_start_causeLightWounds();
diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp
index b8d56b3ecb..b28292562a 100644
--- a/engines/kyra/kyra_rpg.cpp
+++ b/engines/kyra/kyra_rpg.cpp
@@ -148,7 +148,7 @@ Common::Error KyraRpgEngine::init() {
 	_levelDecorationProperties = new LevelDecorationProperty[100];
 	memset(_levelDecorationProperties, 0, 100 * sizeof(LevelDecorationProperty));
 	_levelDecorationShapes = new uint8*[400];
-	memset(_levelDecorationShapes, 0, 400 * sizeof(uint8*));
+	memset(_levelDecorationShapes, 0, 400 * sizeof(uint8 *));
 	_levelBlockProperties = new LevelBlockProperty[1025];
 	memset(_levelBlockProperties, 0, 1025 * sizeof(LevelBlockProperty));
 
@@ -178,7 +178,7 @@ Common::Error KyraRpgEngine::init() {
 		_vcnExpTable[i] = i & 0x0f;
 
 	_doorShapes = new uint8*[6];
-	memset(_doorShapes, 0, 6 * sizeof(uint8*));
+	memset(_doorShapes, 0, 6 * sizeof(uint8 *));
 
 	initStaticResource();
 
diff --git a/engines/kyra/saveload_rpg.cpp b/engines/kyra/saveload_rpg.cpp
index 2e9f0228cf..f3eef0d811 100644
--- a/engines/kyra/saveload_rpg.cpp
+++ b/engines/kyra/saveload_rpg.cpp
@@ -118,7 +118,7 @@ void KyraRpgEngine::restoreFlyingObjectTempData(LevelTempData *tmp) {
 }
 
 void KyraRpgEngine::releaseFlyingObjectTempData(LevelTempData *tmp) {
-	EoBFlyingObject *p = (EoBFlyingObject*)tmp->flyingObjects;
+	EoBFlyingObject *p = (EoBFlyingObject *)tmp->flyingObjects;
 	delete[] p;
 }
 
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 2b701e3b81..6a76cfd0d5 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -3200,7 +3200,7 @@ void Screen::crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int s
 
 	hideMouse();
 
-	uint16 *wB = (uint16*)_pagePtrs[14];
+	uint16 *wB = (uint16 *)_pagePtrs[14];
 	uint8 *hB = _pagePtrs[14] + 640;
 
 	for (int i = 0; i < w; i++)
diff --git a/engines/lastexpress/entities/alexei.cpp b/engines/lastexpress/entities/alexei.cpp
index 073ca3f175..54c2d87b89 100644
--- a/engines/lastexpress/entities/alexei.cpp
+++ b/engines/lastexpress/entities/alexei.cpp
@@ -355,7 +355,7 @@ IMPLEMENT_FUNCTION_IS(16, Alexei, function16, TimeValue)
 		break;
 
 	case kActionDefault:
-		getEntities()->drawSequenceLeft(kEntityAlexei, (char*)&params->seq);
+		getEntities()->drawSequenceLeft(kEntityAlexei, (char *)&params->seq);
 		getObjects()->update(kObjectCompartment2, kEntityAlexei, kObjectLocation1, kCursorHandKnock, kCursorHand);
 		getObjects()->update(kObjectHandleInsideBathroom, kEntityAlexei, kObjectLocation1, kCursorHandKnock, kCursorHand);
 		break;
diff --git a/engines/lastexpress/entities/entity_intern.h b/engines/lastexpress/entities/entity_intern.h
index bf75e022de..2da0da15b3 100644
--- a/engines/lastexpress/entities/entity_intern.h
+++ b/engines/lastexpress/entities/entity_intern.h
@@ -94,7 +94,7 @@ void class::setup_##name() { \
 
 // Expose parameters and check validity
 #define EXPOSE_PARAMS(type) \
-	type *params = (type*)_data->getCurrentParameters(); \
+	type *params = (type *)_data->getCurrentParameters(); \
 	if (!params) \
 		error("[EXPOSE_PARAMS] Trying to call an entity function with invalid parameters"); \
 
@@ -307,7 +307,7 @@ void class::setup_##name() { \
 //////////////////////////////////////////////////////////////////////////
 #define RESET_ENTITY_STATE(entity, class, function) \
 	getEntities()->resetState(entity); \
-	((class*)getEntities()->get(entity))->function();
+	((class *)getEntities()->get(entity))->function();
 
 //////////////////////////////////////////////////////////////////////////
 // Parameters macros (for default IIII parameters)
diff --git a/engines/lastexpress/game/entities.cpp b/engines/lastexpress/game/entities.cpp
index 894663dda6..f27087a609 100644
--- a/engines/lastexpress/game/entities.cpp
+++ b/engines/lastexpress/game/entities.cpp
@@ -615,9 +615,9 @@ void Entities::resetSequences(EntityIndex entityIndex) const {
 	getData(entityIndex)->field_4A9 = false;
 	getData(entityIndex)->field_4AA = false;
 
-	strcpy((char*)&getData(entityIndex)->sequenceNameCopy, "");
-	strcpy((char*)&getData(entityIndex)->sequenceName, "");
-	strcpy((char*)&getData(entityIndex)->sequenceName2, "");
+	strcpy((char *)&getData(entityIndex)->sequenceNameCopy, "");
+	strcpy((char *)&getData(entityIndex)->sequenceName, "");
+	strcpy((char *)&getData(entityIndex)->sequenceName2, "");
 
 	getScenes()->resetQueue();
 }
diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp
index 0aecae22ec..bf0abdea07 100644
--- a/engines/lure/sound.cpp
+++ b/engines/lure/sound.cpp
@@ -635,7 +635,7 @@ MidiMusic::MidiMusic(MidiDriver *driver, ChannelEntry channels[NUM_CHANNELS],
 
 		for (uint i = 0; i < packedSize; i++)
 #if defined(SCUMM_NEED_ALIGNMENT)
-			memcpy(dataDest++, (byte*)((byte*)data + *(idx + i) * sizeof(uint16)), sizeof(uint16));
+			memcpy(dataDest++, (byte *)((byte *)data + *(idx + i) * sizeof(uint16)), sizeof(uint16));
 #else
 			*dataDest++ = data[*(idx + i)];
 #endif
diff --git a/engines/made/database.cpp b/engines/made/database.cpp
index 454fe09a38..2b87f97392 100644
--- a/engines/made/database.cpp
+++ b/engines/made/database.cpp
@@ -56,7 +56,7 @@ const char *Object::getString() {
 
 void Object::setString(const char *str) {
 	if (getClass() == 0x7FFF) {
-		char *objStr = (char*)getData();
+		char *objStr = (char *)getData();
 		if (str)
 			strncpy(objStr, str, getSize());
 		else
@@ -86,10 +86,10 @@ int16 Object::getVectorSize() {
 
 int16 Object::getVectorItem(int16 index) {
 	if (getClass() == 0x7FFF) {
-		byte *vector = (byte*)getData();
+		byte *vector = (byte *)getData();
 		return vector[index];
 	} else if (getClass() <= 0x7FFE) {
-		int16 *vector = (int16*)getData();
+		int16 *vector = (int16 *)getData();
 		return READ_LE_UINT16(&vector[index]);
 	} else {
 		// should never reach here
@@ -100,10 +100,10 @@ int16 Object::getVectorItem(int16 index) {
 
 void Object::setVectorItem(int16 index, int16 value) {
 	if (getClass() == 0x7FFF) {
-		byte *vector = (byte*)getData();
+		byte *vector = (byte *)getData();
 		vector[index] = value;
 	} else if (getClass() <= 0x7FFE) {
-		int16 *vector = (int16*)getData();
+		int16 *vector = (int16 *)getData();
 		WRITE_LE_UINT16(&vector[index], value);
 	}
 }
@@ -526,7 +526,7 @@ int16 *GameDatabaseV2::findObjectProperty(int16 objectIndex, int16 propertyId, i
 		error("GameDatabaseV2::findObjectProperty(%04X, %04X) Not an object", objectIndex, propertyId);
 	}
 
-	int16 *prop = (int16*)obj->getData();
+	int16 *prop = (int16 *)obj->getData();
 	byte count1 = obj->getCount1();
 	byte count2 = obj->getCount2();
 
@@ -553,7 +553,7 @@ int16 *GameDatabaseV2::findObjectProperty(int16 objectIndex, int16 propertyId, i
 
 		obj = getObject(parentObjectIndex);
 
-		prop = (int16*)obj->getData();
+		prop = (int16 *)obj->getData();
 		count1 = obj->getCount1();
 		count2 = obj->getCount2();
 
@@ -750,7 +750,7 @@ int16 *GameDatabaseV3::findObjectProperty(int16 objectIndex, int16 propertyId, i
 		error("GameDatabaseV2::findObjectProperty(%04X, %04X) Not an object", objectIndex, propertyId);
 	}
 
-	int16 *prop = (int16*)obj->getData();
+	int16 *prop = (int16 *)obj->getData();
 	byte count1 = obj->getCount1();
 	byte count2 = obj->getCount2();
 
@@ -762,7 +762,7 @@ int16 *GameDatabaseV3::findObjectProperty(int16 objectIndex, int16 propertyId, i
 		if ((READ_LE_UINT16(prop) & 0x3FFF) == propertyId) {
 			if (READ_LE_UINT16(prop) & 0x4000) {
 				propertyFlag = 1;
-				return (int16*)_gameState + READ_LE_UINT16(propPtr1);
+				return (int16 *)_gameState + READ_LE_UINT16(propPtr1);
 			} else {
 				propertyFlag = obj->getFlags() & 1;
 				return propPtr1;
@@ -782,7 +782,7 @@ int16 *GameDatabaseV3::findObjectProperty(int16 objectIndex, int16 propertyId, i
 
 		obj = getObject(parentObjectIndex);
 
-		prop = (int16*)obj->getData();
+		prop = (int16 *)obj->getData();
 		count1 = obj->getCount1();
 		count2 = obj->getCount2();
 
@@ -794,7 +794,7 @@ int16 *GameDatabaseV3::findObjectProperty(int16 objectIndex, int16 propertyId, i
 				if ((READ_LE_UINT16(prop) & 0x3FFF) == propertyId) {
 					if (READ_LE_UINT16(prop) & 0x4000) {
 						propertyFlag = 1;
-						return (int16*)_gameState + READ_LE_UINT16(propPtr1);
+						return (int16 *)_gameState + READ_LE_UINT16(propPtr1);
 					} else {
 						propertyFlag = obj->getFlags() & 1;
 						return propPtr1;
@@ -806,7 +806,7 @@ int16 *GameDatabaseV3::findObjectProperty(int16 objectIndex, int16 propertyId, i
 				if ((READ_LE_UINT16(prop) & 0x3FFF) == propertyId) {
 					if (READ_LE_UINT16(prop) & 0x4000) {
 						propertyFlag = 1;
-						return (int16*)_gameState + READ_LE_UINT16(propertyPtr);
+						return (int16 *)_gameState + READ_LE_UINT16(propertyPtr);
 					} else {
 						propertyFlag = obj->getFlags() & 1;
 						return propertyPtr;
diff --git a/engines/made/graphics.cpp b/engines/made/graphics.cpp
index 30496d8595..4d3fc7116a 100644
--- a/engines/made/graphics.cpp
+++ b/engines/made/graphics.cpp
@@ -83,7 +83,7 @@ void decompressImage(byte *source, Graphics::Surface &surface, uint16 cmdOffs, u
 	if ((maskFlags != 0) && (maskFlags != 2) && (pixelFlags != 0) && (pixelFlags != 2) && (cmdFlags != 0))
 		error("decompressImage() Unsupported flags: cmdFlags = %02X; maskFlags = %02X, pixelFlags = %02X", cmdFlags, maskFlags, pixelFlags);
 
-	byte *destPtr = (byte*)surface.getBasePtr(0, 0);
+	byte *destPtr = (byte *)surface.getBasePtr(0, 0);
 
 	byte lineBuf[640 * 4];
 	byte bitBuf[40];
@@ -196,7 +196,7 @@ void decompressMovieImage(byte *source, Graphics::Surface &surface, uint16 cmdOf
 	byte *maskBuffer = source + maskOffs;
 	byte *pixelBuffer = source + pixelOffs;
 
-	byte *destPtr = (byte*)surface.getBasePtr(0, 0);
+	byte *destPtr = (byte *)surface.getBasePtr(0, 0);
 
 	byte bitBuf[40];
 
diff --git a/engines/made/resource.h b/engines/made/resource.h
index da227a39a0..a789069272 100644
--- a/engines/made/resource.h
+++ b/engines/made/resource.h
@@ -224,7 +224,7 @@ protected:
 		ResourceSlot *slot = getResourceSlot(resType, index);
 		if (!slot)
 			return NULL;
-		T *res = (T*)getResourceFromCache(slot);
+		T *res = (T *)getResourceFromCache(slot);
 		if (!res) {
 			byte *buffer;
 			uint32 size;
diff --git a/engines/made/screen.cpp b/engines/made/screen.cpp
index 168902d577..b49bfff840 100644
--- a/engines/made/screen.cpp
+++ b/engines/made/screen.cpp
@@ -179,10 +179,10 @@ void Screen::drawSurface(Graphics::Surface *sourceSurface, int x, int y, int16 f
 		clipHeight = clipInfo.clipRect.bottom - y;
 	}
 
-	source = (byte*)sourceSurface->getBasePtr(0, startY);
-	dest = (byte*)clipInfo.destSurface->getBasePtr(x, y);
+	source = (byte *)sourceSurface->getBasePtr(0, startY);
+	dest = (byte *)clipInfo.destSurface->getBasePtr(x, y);
 	if (_vm->getGameID() != GID_RTZ)
-		maskp = (byte*)_maskDrawCtx.destSurface->getBasePtr(x, y);
+		maskp = (byte *)_maskDrawCtx.destSurface->getBasePtr(x, y);
 
 	int32 sourcePitch, linePtrAdd, sourceAdd;
 	byte *linePtr;
@@ -633,7 +633,7 @@ void Screen::printChar(uint c, int16 x, int16 y, byte color) {
 		return;
 
 	byte p;
-	byte *dest = (byte*)_fontDrawCtx.destSurface->getBasePtr(x, y);
+	byte *dest = (byte *)_fontDrawCtx.destSurface->getBasePtr(x, y);
 
 	for (uint yc = 0; yc < height; yc++) {
 		p = charData[yc];
diff --git a/engines/made/screenfx.cpp b/engines/made/screenfx.cpp
index ff0d393885..4e0d463b53 100644
--- a/engines/made/screenfx.cpp
+++ b/engines/made/screenfx.cpp
@@ -231,10 +231,10 @@ void ScreenEffects::copyFxRect(Graphics::Surface *surface, int16 x1, int16 y1, i
 
 	vfxY1 = y1 & 7;
 
-	byte *source = (byte*)surface->getBasePtr(x1, y1);
+	byte *source = (byte *)surface->getBasePtr(x1, y1);
 
 	Graphics::Surface *vgaScreen = _screen->lockScreen();
-	byte *dest = (byte*)vgaScreen->getBasePtr(x1, y1);
+	byte *dest = (byte *)vgaScreen->getBasePtr(x1, y1);
 
 	int16 addX = x2 / 16;
 
diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp
index 7958906897..8d72fa3f72 100644
--- a/engines/mohawk/video.cpp
+++ b/engines/mohawk/video.cpp
@@ -261,7 +261,7 @@ bool VideoManager::updateMovies() {
 				// Clip the width/height to make sure we stay on the screen (Myst does this a few times)
 				uint16 width = MIN<int32>(_videoStreams[i]->getWidth(), _vm->_system->getWidth() - _videoStreams[i].x);
 				uint16 height = MIN<int32>(_videoStreams[i]->getHeight(), _vm->_system->getHeight() - _videoStreams[i].y);
-				_vm->_system->copyRectToScreen((byte*)frame->pixels, frame->pitch, _videoStreams[i].x, _videoStreams[i].y, width, height);
+				_vm->_system->copyRectToScreen((byte *)frame->pixels, frame->pitch, _videoStreams[i].x, _videoStreams[i].y, width, height);
 
 				// We've drawn something to the screen, make sure we update it
 				updateScreen = true;
diff --git a/engines/parallaction/balloons.cpp b/engines/parallaction/balloons.cpp
index f74eef18e1..1ddd401b20 100644
--- a/engines/parallaction/balloons.cpp
+++ b/engines/parallaction/balloons.cpp
@@ -179,7 +179,7 @@ protected:
 		uint16 rx = 10;
 		uint16 ry = 4 + _lines * _font->height();	// y
 
-		byte *dst = (byte*)_surf->getBasePtr(rx, ry);
+		byte *dst = (byte *)_surf->getBasePtr(rx, ry);
 		_font->setColor(_color);
 		_font->drawString(dst, _surf->w, _line.c_str());
 	}
@@ -494,7 +494,7 @@ protected:
 		uint16 rx = _x + (_surf->w - _lineWidth) / 2;
 		uint16 ry = _y + _lines * _font->height();	// y
 
-		byte *dst = (byte*)_surf->getBasePtr(rx, ry);
+		byte *dst = (byte *)_surf->getBasePtr(rx, ry);
 		_font->setColor(_color);
 		_font->drawString(dst, _surf->w, _line.c_str());
 	}
diff --git a/engines/parallaction/callables_br.cpp b/engines/parallaction/callables_br.cpp
index ac5ff88560..7d3e63dfba 100644
--- a/engines/parallaction/callables_br.cpp
+++ b/engines/parallaction/callables_br.cpp
@@ -26,31 +26,31 @@
 
 namespace Parallaction {
 
-void Parallaction_br::_c_null(void*) {
+void Parallaction_br::_c_null(void *) {
 	// do nothing :)
 }
 
-void Parallaction_br::_c_blufade(void*) {
+void Parallaction_br::_c_blufade(void *) {
 	warning("Parallaction_br::_c_blufade() not yet implemented");
 }
 
-void Parallaction_br::_c_resetpalette(void*) {
+void Parallaction_br::_c_resetpalette(void *) {
 	warning("Parallaction_br::_c_resetpalette() not yet implemented");
 }
 
-void Parallaction_br::_c_ferrcycle(void*) {
+void Parallaction_br::_c_ferrcycle(void *) {
 	warning("Parallaction_br::_c_ferrcycle() not yet implemented");
 }
 
-void Parallaction_br::_c_lipsinc(void*) {
+void Parallaction_br::_c_lipsinc(void *) {
 	warning("Unexpected lipsinc routine call! Please notify the team");
 }
 
-void Parallaction_br::_c_albcycle(void*) {
+void Parallaction_br::_c_albcycle(void *) {
 	warning("Parallaction_br::_c_albcycle() not yet implemented");
 }
 
-void Parallaction_br::_c_password(void*) {
+void Parallaction_br::_c_password(void *) {
 	warning("Parallaction_br::_c_password() not yet implemented");
 }
 
diff --git a/engines/parallaction/callables_ns.cpp b/engines/parallaction/callables_ns.cpp
index 77f54fcc98..64885c7ff3 100644
--- a/engines/parallaction/callables_ns.cpp
+++ b/engines/parallaction/callables_ns.cpp
@@ -260,7 +260,7 @@ void Parallaction_ns::stopMovingSarcophagus() {
 
 void Parallaction_ns::_c_moveSarc(void *parm) {
 	if (!_movingSarcophagus) {
-		startMovingSarcophagus(*(ZonePtr*)parm);
+		startMovingSarcophagus(*(ZonePtr *)parm);
 	} else {
 		stopMovingSarcophagus();
 	}
@@ -417,18 +417,18 @@ void Parallaction_ns::_c_testResult(void *parm) {
 	return;
 }
 
-void Parallaction_ns::_c_offSound(void*) {
+void Parallaction_ns::_c_offSound(void *) {
 	_soundManI->stopSfx(0);
 	_soundManI->stopSfx(1);
 	_soundManI->stopSfx(2);
 	_soundManI->stopSfx(3);
 }
 
-void Parallaction_ns::_c_startMusic(void*) {
+void Parallaction_ns::_c_startMusic(void *) {
 	_soundManI->playMusic();
 }
 
-void Parallaction_ns::_c_closeMusic(void*) {
+void Parallaction_ns::_c_closeMusic(void *) {
 	_soundManI->stopMusic();
 }
 
@@ -490,7 +490,7 @@ void Parallaction_ns::_c_moveSheet(void *parm) {
 }
 
 void zeroMask(int x, int y, int color, void *data) {
-	BackgroundInfo *info = (BackgroundInfo*)data;
+	BackgroundInfo *info = (BackgroundInfo *)data;
 
 	uint16 _ax = x + y * info->_mask->w;
 	info->_mask->data[_ax >> 2] &= ~(3 << ((_ax & 3) << 1));
@@ -575,16 +575,16 @@ int16 projectorProgram[] = {
    25, 116, 25, 115, 25, 114, 25, 113, 25, 112, 25, 111, 25, 110, 25, -1, -1
 };
 
-void Parallaction_ns::_c_projector(void*) {
+void Parallaction_ns::_c_projector(void *) {
 	_gfx->setHalfbriteMode(true);
 	_gfx->setProjectorProgram(projectorProgram);
 }
 
-void Parallaction_ns::_c_HBOff(void*) {
+void Parallaction_ns::_c_HBOff(void *) {
 	_gfx->setHalfbriteMode(false);
 }
 
-void Parallaction_ns::_c_HBOn(void*) {
+void Parallaction_ns::_c_HBOn(void *) {
 	_gfx->setHalfbriteMode(true);
 }
 
diff --git a/engines/parallaction/disk.cpp b/engines/parallaction/disk.cpp
index 61172d0896..f20e05771a 100644
--- a/engines/parallaction/disk.cpp
+++ b/engines/parallaction/disk.cpp
@@ -38,7 +38,7 @@ void ILBMLoader::setupBuffer(uint32 w, uint32 h) {
 		}
 		_surf->create(w, h, Graphics::PixelFormat::createFormatCLUT8());
 		_mode  = Graphics::ILBMDecoder::ILBM_UNPACK_PLANES;
-		_intBuffer = (byte*)_surf->pixels;
+		_intBuffer = (byte *)_surf->pixels;
 		break;
 
 	case BODYMODE_MASKBUFFER:
@@ -82,7 +82,7 @@ bool ILBMLoader::callback(Common::IFFChunk &chunk) {
 	case ID_CRNG:
 		if (_crng) {
 			PaletteFxRange *ptr = &_crng[_numCRNG];
-			chunk._stream->read((byte*)ptr, chunk._size);
+			chunk._stream->read((byte *)ptr, chunk._size);
 			ptr->_timer = FROM_BE_16(ptr->_timer);
 			ptr->_step = FROM_BE_16(ptr->_step);
 			ptr->_flags = FROM_BE_16(ptr->_flags);
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index f9e368ab39..5e39c893db 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -283,7 +283,7 @@ Sprites* DosDisk_br::createSprites(Common::ReadStream *stream) {
 		spr->w = stream->readUint16LE();
 		spr->h = stream->readUint16LE();
 
-		spr->packedData = (byte*)malloc(spr->size);
+		spr->packedData = (byte *)malloc(spr->size);
 		stream->read(spr->packedData, spr->size);
 	}
 	delete stream;
@@ -450,7 +450,7 @@ void AmigaDisk_br::init() {
 
 void AmigaDisk_br::adjustForPalette(Graphics::Surface &surf, int transparentColor) {
 	uint size = surf.w * surf.h;
-	byte *data = (byte*)surf.pixels;
+	byte *data = (byte *)surf.pixels;
 	for (uint i = 0; i < size; i++, data++) {
 		if (transparentColor == -1 || transparentColor != *data)
 			*data += 16;
@@ -609,7 +609,7 @@ GfxObj* AmigaDisk_br::loadStatic(const char* name) {
 		stream->read(shadow, shadowSize);
 		for (int32 i = 0; i < surf->h; ++i) {
 			byte *src = shadow + shadowWidth * i;
-			byte *dst = (byte*)surf->pixels + surf->pitch * i;
+			byte *dst = (byte *)surf->pixels + surf->pitch * i;
 
 			for (int32 j = 0; j < surf->w; ++j, ++dst) {
 				byte bit = src[j/8] & (1 << (7 - (j & 7)));
@@ -637,7 +637,7 @@ Sprites* AmigaDisk_br::createSprites(Common::ReadStream *stream) {
 		spr->w = stream->readUint16BE();
 		spr->h = stream->readUint16BE() - 1;
 
-		spr->packedData = (byte*)malloc(spr->size);
+		spr->packedData = (byte *)malloc(spr->size);
 		stream->read(spr->packedData, spr->size);
 	}
 
@@ -725,7 +725,7 @@ GfxObj* AmigaDisk_br::loadObjects(const char *name, uint8 part) {
 		max = 72;
 
 	byte *data = new byte[max * 2601];
-	byte *srcPtr = (byte*)loader._surf->getBasePtr(0,0);
+	byte *srcPtr = (byte *)loader._surf->getBasePtr(0,0);
 	int w = loader._surf->w;
 
 	// Convert to the expected display format
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index e145743f09..b2285d0da3 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -473,7 +473,7 @@ void DosDisk_ns::loadBackground(BackgroundInfo& info, const char *filename) {
 	// read bitmap, mask and path data and extract them into the 3 buffers
 	info.bg.create(info.width, info.height, Graphics::PixelFormat::createFormatCLUT8());
 	createMaskAndPathBuffers(info);
-	unpackBackground(stream, (byte*)info.bg.pixels, info._mask->data, info._path->data);
+	unpackBackground(stream, (byte *)info.bg.pixels, info._mask->data, info._path->data);
 
 	delete stream;
 }
@@ -661,10 +661,10 @@ public:
 
 		stream.seek(-4, SEEK_END);
 		uint32 decrlen = stream.readUint32BE() >> 8;
-		byte *dest = (byte*)malloc(decrlen);
+		byte *dest = (byte *)malloc(decrlen);
 
 		uint32 crlen = stream.size() - 4;
-		byte *src = (byte*)malloc(crlen);
+		byte *src = (byte *)malloc(crlen);
 		stream.seek(4, SEEK_SET);
 		stream.read(src, crlen);
 
@@ -757,14 +757,14 @@ void AmigaDisk_ns::unpackFrame(byte *dst, byte *src, uint16 planeSize) {
 */
 void AmigaDisk_ns::patchFrame(byte *dst, byte *dlta, uint16 bytesPerPlane, uint16 height) {
 
-	uint32 *dataIndex = (uint32*)dlta;
-	uint32 *ofslenIndex = (uint32*)dlta + 8;
+	uint32 *dataIndex = (uint32 *)dlta;
+	uint32 *ofslenIndex = (uint32 *)dlta + 8;
 
-	uint16 *base = (uint16*)dlta;
+	uint16 *base = (uint16 *)dlta;
 	uint16 wordsPerLine = bytesPerPlane >> 1;
 
 	for (uint j = 0; j < NUM_PLANES; j++) {
-		uint16 *dst16 = (uint16*)(dst + j * bytesPerPlane * height);
+		uint16 *dst16 = (uint16 *)(dst + j * bytesPerPlane * height);
 
 		uint16 *data = base + READ_BE_UINT32(dataIndex);
 		dataIndex++;
@@ -804,7 +804,7 @@ void AmigaDisk_ns::unpackBitmap(byte *dst, byte *src, uint16 numFrames, uint16 b
 			uint size = READ_BE_UINT32(src + 4);
 
 			if (tempBuffer == 0)
-				tempBuffer = (byte*)malloc(planeSize * NUM_PLANES);
+				tempBuffer = (byte *)malloc(planeSize * NUM_PLANES);
 
 			memcpy(tempBuffer, baseFrame, planeSize * NUM_PLANES);
 
diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp
index cc7f320e1c..d4c9aefd32 100644
--- a/engines/parallaction/font.cpp
+++ b/engines/parallaction/font.cpp
@@ -57,17 +57,17 @@ public:
 		_numGlyphs = stream.readByte();
 		_height = stream.readUint32BE();
 
-		_widths = (byte*)malloc(_numGlyphs);
+		_widths = (byte *)malloc(_numGlyphs);
 		stream.read(_widths, _numGlyphs);
 
-		_offsets = (uint*)malloc(_numGlyphs * sizeof(uint));
+		_offsets = (uint *)malloc(_numGlyphs * sizeof(uint));
 		_offsets[0] = 0;
 		for (uint i = 1; i < _numGlyphs; i++)
 			_offsets[i] = _offsets[i-1] + _widths[i-1] * _height;
 
 		uint size = _offsets[_numGlyphs-1] + _widths[_numGlyphs-1] * _height;
 
-		_data = (byte*)malloc(size);
+		_data = (byte *)malloc(size);
 		stream.read(_data, size);
 
 	}
@@ -503,25 +503,25 @@ AmigaFont::AmigaFont(Common::SeekableReadStream &stream) {
 	stream.seek(32);	// skips dummy header
 
 	_dataSize = stream.size() - stream.pos();
-	_data = (byte*)malloc(_dataSize);
+	_data = (byte *)malloc(_dataSize);
 	stream.read(_data, _dataSize);
 
-	_font = (AmigaDiskFont*)(_data + 78);
+	_font = (AmigaDiskFont *)(_data + 78);
 	_font->_ySize = FROM_BE_16(_font->_ySize);
 	_font->_xSize = FROM_BE_16(_font->_xSize);
 	_font->_baseline = FROM_BE_16(_font->_baseline);
 	_font->_modulo = FROM_BE_16(_font->_modulo);
 
-	_charLoc = (CharLoc*)(_data + FROM_BE_32(_font->_charLoc));
+	_charLoc = (CharLoc *)(_data + FROM_BE_32(_font->_charLoc));
 	_charData = _data + FROM_BE_32(_font->_charData);
 
 	_charSpace = 0;
 	_charKern = 0;
 
 	if (_font->_charSpace != 0)
-		_charSpace = (uint16*)(_data + FROM_BE_32(_font->_charSpace));
+		_charSpace = (uint16 *)(_data + FROM_BE_32(_font->_charSpace));
 	if (_font->_charKern != 0)
-		_charKern = (uint16*)(_data + FROM_BE_32(_font->_charKern));
+		_charKern = (uint16 *)(_data + FROM_BE_32(_font->_charKern));
 
 }
 
diff --git a/engines/parallaction/gfxbase.cpp b/engines/parallaction/gfxbase.cpp
index c351551e36..852235ce34 100644
--- a/engines/parallaction/gfxbase.cpp
+++ b/engines/parallaction/gfxbase.cpp
@@ -235,7 +235,7 @@ void Gfx::drawGfxObject(GfxObj *obj, Graphics::Surface &surf) {
 }
 
 void Gfx::drawText(Font *font, Graphics::Surface* surf, uint16 x, uint16 y, const char *text, byte color) {
-	byte *dst = (byte*)surf->getBasePtr(x, y);
+	byte *dst = (byte *)surf->getBasePtr(x, y);
 	font->setColor(color);
 	font->drawString(dst, surf->w, text);
 }
@@ -308,7 +308,7 @@ void Gfx::bltMaskScale(const Common::Rect& r, byte *data, Graphics::Surface *sur
 	dp.y = dstRect.top;
 
 	byte *s = data + srcRect.left + srcRect.top * width;
-	byte *d = (byte*)surf->getBasePtr(dp.x, dp.y);
+	byte *d = (byte *)surf->getBasePtr(dp.x, dp.y);
 
 	uint line = 0, col = 0;
 
@@ -380,7 +380,7 @@ void Gfx::bltMaskNoScale(const Common::Rect& r, byte *data, Graphics::Surface *s
 	q.translate(-r.left, -r.top);
 
 	byte *s = data + q.left + q.top * r.width();
-	byte *d = (byte*)surf->getBasePtr(dp.x, dp.y);
+	byte *d = (byte *)surf->getBasePtr(dp.x, dp.y);
 
 	uint sPitch = r.width() - q.width();
 	uint dPitch = surf->w - q.width();
@@ -422,7 +422,7 @@ void Gfx::bltNoMaskNoScale(const Common::Rect& r, byte *data, Graphics::Surface
 	q.translate(-r.left, -r.top);
 
 	byte *s = data + q.left + q.top * r.width();
-	byte *d = (byte*)surf->getBasePtr(dp.x, dp.y);
+	byte *d = (byte *)surf->getBasePtr(dp.x, dp.y);
 
 	uint sPitch = r.width() - q.width();
 	uint dPitch = surf->w - q.width();
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index a006edf114..6868505c52 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -44,7 +44,7 @@ namespace Parallaction {
 
 void halfbritePixel(int x, int y, int color, void *data) {
 	Graphics::Surface *surf = (Graphics::Surface *)data;
-	byte *pixel = (byte*)surf->getBasePtr(x, y);
+	byte *pixel = (byte *)surf->getBasePtr(x, y);
 	*pixel &= ~0x20;
 }
 
@@ -319,7 +319,7 @@ void Gfx::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int
 			y += _scrollPosY;
 		}
 
-		byte *dst = (byte*)_backBuffer.getBasePtr(x, y);
+		byte *dst = (byte *)_backBuffer.getBasePtr(x, y);
 		for (int i = 0; i < h; i++) {
 			memcpy(dst, buf, w);
 			buf += pitch;
@@ -357,7 +357,7 @@ void Gfx::unlockScreen() {
 
 void Gfx::updateScreenIntern() {
 	if (_doubleBuffering) {
-		byte *data = (byte*)_backBuffer.getBasePtr(_scrollPosX, _scrollPosY);
+		byte *data = (byte *)_backBuffer.getBasePtr(_scrollPosX, _scrollPosY);
 		_vm->_system->copyRectToScreen(data, _backBuffer.pitch, 0, 0, _vm->_screenWidth, _vm->_screenHeight);
 	}
 
@@ -425,7 +425,7 @@ void Gfx::updateScreen() {
 		// background may not cover the whole screen, so adjust bulk update size
 		uint w = _backgroundInfo->width;
 		uint h = _backgroundInfo->height;
-		byte *backgroundData = (byte*)_backgroundInfo->bg.getBasePtr(0, 0);
+		byte *backgroundData = (byte *)_backgroundInfo->bg.getBasePtr(0, 0);
 		uint16 backgroundPitch = _backgroundInfo->bg.pitch;
 		copyRectToScreen(backgroundData, backgroundPitch, _backgroundInfo->_x, _backgroundInfo->_y, w, h);
 	}
@@ -450,7 +450,7 @@ void Gfx::applyHalfbriteEffect_NS(Graphics::Surface &surf) {
 		return;
 	}
 
-	byte *buf = (byte*)surf.pixels;
+	byte *buf = (byte *)surf.pixels;
 	for (int i = 0; i < surf.w*surf.h; i++) {
 		*buf++ |= 0x20;
 	}
@@ -493,7 +493,7 @@ void Gfx::patchBackground(Graphics::Surface &surf, int16 x, int16 y, bool mask)
 	r.moveTo(x, y);
 
 	uint16 z = (mask) ? _backgroundInfo->getMaskLayer(y) : LAYER_FOREGROUND;
-	blt(r, (byte*)surf.pixels, &_backgroundInfo->bg, z, 100, 0);
+	blt(r, (byte *)surf.pixels, &_backgroundInfo->bg, z, 100, 0);
 }
 
 void Gfx::fillBackground(const Common::Rect& r, byte color) {
@@ -502,7 +502,7 @@ void Gfx::fillBackground(const Common::Rect& r, byte color) {
 
 void Gfx::invertBackground(const Common::Rect& r) {
 
-	byte *d = (byte*)_backgroundInfo->bg.getBasePtr(r.left, r.top);
+	byte *d = (byte *)_backgroundInfo->bg.getBasePtr(r.left, r.top);
 
 	for (int i = 0; i < r.height(); i++) {
 		for (int j = 0; j < r.width(); j++) {
@@ -536,12 +536,12 @@ GfxObj *Gfx::renderFloatingLabel(Font *font, char *text) {
 		setupLabelSurface(*cnv, w, h);
 
 		font->setColor((_gameType == GType_BRA) ? 0 : 7);
-		font->drawString((byte*)cnv->pixels + 1, cnv->w, text);
-		font->drawString((byte*)cnv->pixels + 1 + cnv->w * 2, cnv->w, text);
-		font->drawString((byte*)cnv->pixels + cnv->w, cnv->w, text);
-		font->drawString((byte*)cnv->pixels + 2 + cnv->w, cnv->w, text);
+		font->drawString((byte *)cnv->pixels + 1, cnv->w, text);
+		font->drawString((byte *)cnv->pixels + 1 + cnv->w * 2, cnv->w, text);
+		font->drawString((byte *)cnv->pixels + cnv->w, cnv->w, text);
+		font->drawString((byte *)cnv->pixels + 2 + cnv->w, cnv->w, text);
 		font->setColor((_gameType == GType_BRA) ? 11 : 1);
-		font->drawString((byte*)cnv->pixels + 1 + cnv->w, cnv->w, text);
+		font->drawString((byte *)cnv->pixels + 1 + cnv->w, cnv->w, text);
 	} else {
 		w = font->getStringWidth(text);
 		h = font->height();
@@ -703,8 +703,8 @@ void Gfx::unregisterLabel(GfxObj *label) {
 
 void Gfx::copyRect(const Common::Rect &r, Graphics::Surface &src, Graphics::Surface &dst) {
 
-	byte *s = (byte*)src.getBasePtr(r.left, r.top);
-	byte *d = (byte*)dst.getBasePtr(0, 0);
+	byte *s = (byte *)src.getBasePtr(r.left, r.top);
+	byte *d = (byte *)dst.getBasePtr(0, 0);
 
 	for (uint16 i = 0; i < r.height(); i++) {
 		memcpy(d, s, r.width());
@@ -1017,7 +1017,7 @@ void MaskBuffer::create(uint16 width, uint16 height) {
 	internalWidth = w >> 2;
 	h = height;
 	size = (internalWidth * h);
-	data = (byte*)calloc(size, 1);
+	data = (byte *)calloc(size, 1);
 }
 
 void MaskBuffer::free() {
@@ -1096,7 +1096,7 @@ void PathBuffer::create(uint16 width, uint16 height) {
 	internalWidth = w >> 3;
 	h = height;
 	size = (internalWidth * h);
-	data = (byte*)calloc(size, 1);
+	data = (byte *)calloc(size, 1);
 }
 
 void PathBuffer::free() {
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index 99bc811763..b43dd193b5 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -103,7 +103,7 @@ public:
 	}
 	byte*	getData(uint16 index) {
 		assert(index == 0);
-		return (byte*)_surf->getBasePtr(0,0);
+		return (byte *)_surf->getBasePtr(0,0);
 	}
 	void	getRect(uint16 index, Common::Rect &r) {
 		assert(index == 0);
diff --git a/engines/parallaction/gui_br.cpp b/engines/parallaction/gui_br.cpp
index 56148d78d8..5bc5acf630 100644
--- a/engines/parallaction/gui_br.cpp
+++ b/engines/parallaction/gui_br.cpp
@@ -488,10 +488,10 @@ public:
 		_font->setColor(0);
 		int x = (w - questionW)/2;
 		int y = 13;
-		_font->drawString((byte*)surf->getBasePtr(x, y), surf->pitch, question);
+		_font->drawString((byte *)surf->getBasePtr(x, y), surf->pitch, question);
 		x = (w - optionW)/2;
 		y = 13 + _font->height()*2;
-		_font->drawString((byte*)surf->getBasePtr(x,y), surf->pitch, option);
+		_font->drawString((byte *)surf->getBasePtr(x,y), surf->pitch, option);
 
 		_obj = new GfxObj(kGfxObjTypeMenu, new SurfaceToFrames(surf), "quitdialog");
 		assert(_obj);
diff --git a/engines/parallaction/inventory.cpp b/engines/parallaction/inventory.cpp
index 8fd9f56802..1cae63be42 100644
--- a/engines/parallaction/inventory.cpp
+++ b/engines/parallaction/inventory.cpp
@@ -183,7 +183,7 @@ ItemPosition InventoryRenderer::hitTest(const Common::Point &p) const {
 void InventoryRenderer::drawItem(ItemPosition pos, ItemName name) {
 	Common::Rect r;
 	getItemRect(pos, r);
-	byte* d = (byte*)_surf.getBasePtr(r.left, r.top);
+	byte* d = (byte *)_surf.getBasePtr(r.left, r.top);
 	drawItem(name, d, _surf.pitch);
 }
 
@@ -238,7 +238,7 @@ void InventoryRenderer::getItemRect(ItemPosition pos, Common::Rect &r) {
 }
 
 Inventory::Inventory(int maxItems, InventoryItem *verbs) : _numItems(0), _maxItems(maxItems) {
-	_items = (InventoryItem*)calloc(_maxItems, sizeof(InventoryItem));
+	_items = (InventoryItem *)calloc(_maxItems, sizeof(InventoryItem));
 
 	int i = 0;
 	for ( ; verbs[i]._id; i++) {
diff --git a/engines/parallaction/inventory.h b/engines/parallaction/inventory.h
index 91c06d1e93..a3b7bf953f 100644
--- a/engines/parallaction/inventory.h
+++ b/engines/parallaction/inventory.h
@@ -108,7 +108,7 @@ public:
 	void highlightItem(ItemPosition pos, byte color);
 	void drawItem(ItemName name, byte *buffer, uint pitch);
 
-	byte*	getData() const { return (byte*)_surf.pixels; }
+	byte*	getData() const { return (byte *)_surf.pixels; }
 
 	void	getRect(Common::Rect &r) const;
 	int16	getNumLines() const;
diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp
index 222a0a9552..d3529c5dd9 100644
--- a/engines/parallaction/objects.cpp
+++ b/engines/parallaction/objects.cpp
@@ -386,7 +386,7 @@ ScriptVar::~ScriptVar() {
 
 
 Table::Table(uint32 size) : _size(size), _used(0), _disposeMemory(true) {
-	_data = (char**)calloc(size, sizeof(char*));
+	_data = (char**)calloc(size, sizeof(char *));
 }
 
 Table::Table(uint32 size, const char **data) : _size(size), _used(size), _disposeMemory(false) {
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 6c3ff11d15..0d56b62e2f 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -447,7 +447,7 @@ private:
 
 
 	//  callables data
-	typedef void (Parallaction_ns::*Callable)(void*);
+	typedef void (Parallaction_ns::*Callable)(void *);
 	const Callable *_callables;
 	ZonePtr _moveSarcGetZone;
 	ZonePtr _moveSarcExaZone;
@@ -468,37 +468,37 @@ private:
 	PathWalker_NS		*_walker;
 
 	// common callables
-	void _c_play_boogie(void*);
-	void _c_startIntro(void*);
-	void _c_endIntro(void*);
-	void _c_moveSheet(void*);
-	void _c_sketch(void*);
-	void _c_shade(void*);
-	void _c_score(void*);
-	void _c_fade(void*);
-	void _c_moveSarc(void*);
-	void _c_contaFoglie(void*);
-	void _c_zeroFoglie(void*);
-	void _c_trasformata(void*);
-	void _c_offMouse(void*);
-	void _c_onMouse(void*);
-	void _c_setMask(void*);
-	void _c_endComment(void*);
-	void _c_frankenstein(void*);
-	void _c_finito(void*);
-	void _c_ridux(void*);
-	void _c_testResult(void*);
+	void _c_play_boogie(void *);
+	void _c_startIntro(void *);
+	void _c_endIntro(void *);
+	void _c_moveSheet(void *);
+	void _c_sketch(void *);
+	void _c_shade(void *);
+	void _c_score(void *);
+	void _c_fade(void *);
+	void _c_moveSarc(void *);
+	void _c_contaFoglie(void *);
+	void _c_zeroFoglie(void *);
+	void _c_trasformata(void *);
+	void _c_offMouse(void *);
+	void _c_onMouse(void *);
+	void _c_setMask(void *);
+	void _c_endComment(void *);
+	void _c_frankenstein(void *);
+	void _c_finito(void *);
+	void _c_ridux(void *);
+	void _c_testResult(void *);
 
 	// dos specific callables
-	void _c_null(void*);
+	void _c_null(void *);
 
 	// amiga specific callables
-	void _c_projector(void*);
-	void _c_HBOff(void*);
-	void _c_offSound(void*);
-	void _c_startMusic(void*);
-	void _c_closeMusic(void*);
-	void _c_HBOn(void*);
+	void _c_projector(void *);
+	void _c_HBOff(void *);
+	void _c_offSound(void *);
+	void _c_startMusic(void *);
+	void _c_closeMusic(void *);
+	void _c_HBOn(void *);
 };
 
 
@@ -582,7 +582,7 @@ private:
 	void 	startIngameMenu();
 	void	freeCharacter();
 
-	typedef void (Parallaction_br::*Callable)(void*);
+	typedef void (Parallaction_br::*Callable)(void *);
 	const Callable *_callables;
 	static const Callable _dosCallables[6];
 	static const Callable _amigaCallables[6];
@@ -592,13 +592,13 @@ private:
 	PathWalker_BR		*_walker;
 
 	// dos callables
-	void _c_null(void*);
-	void _c_blufade(void*);
-	void _c_resetpalette(void*);
-	void _c_ferrcycle(void*);
-	void _c_lipsinc(void*);
-	void _c_albcycle(void*);
-	void _c_password(void*);
+	void _c_null(void *);
+	void _c_blufade(void *);
+	void _c_resetpalette(void *);
+	void _c_ferrcycle(void *);
+	void _c_lipsinc(void *);
+	void _c_albcycle(void *);
+	void _c_password(void *);
 };
 
 extern Parallaction *_vm;
diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp
index 16ffd24a82..0925e55309 100644
--- a/engines/parallaction/sound_br.cpp
+++ b/engines/parallaction/sound_br.cpp
@@ -378,7 +378,7 @@ Audio::AudioStream *AmigaSoundMan_br::loadChannelData(const char *filename, Chan
 
 	if (_vm->getFeatures() & GF_DEMO) {
 		uint32 dataSize = stream->size();
-		int8 *data = (int8*)malloc(dataSize);
+		int8 *data = (int8 *)malloc(dataSize);
 		if (stream->read(data, dataSize) != dataSize)
 			error("DosSoundMan_br::loadChannelData: Read failed");
 
diff --git a/engines/queen/music.cpp b/engines/queen/music.cpp
index 858692703c..2835954003 100644
--- a/engines/queen/music.cpp
+++ b/engines/queen/music.cpp
@@ -303,7 +303,7 @@ void MidiMusic::playMusic() {
 
 		for (uint i = 0; i < packedSize; i++)
 #if defined(SCUMM_NEED_ALIGNMENT)
-			memcpy(&_buf[i], (byte*)((byte*)data + *(idx + i) * sizeof(uint16)), sizeof(uint16));
+			memcpy(&_buf[i], (byte *)((byte *)data + *(idx + i) * sizeof(uint16)), sizeof(uint16));
 #else
 			_buf[i] = data[*(idx + i)];
 #endif
diff --git a/engines/saga/animation.cpp b/engines/saga/animation.cpp
index 8b2d1e9dad..fd602ff4fb 100644
--- a/engines/saga/animation.cpp
+++ b/engines/saga/animation.cpp
@@ -501,7 +501,7 @@ void Anim::play(uint16 animId, int vectorTime, bool playing) {
 	}
 
 	anim = getAnimation(animId);
-	displayBuffer = (byte*)_vm->_render->getBackGroundSurface()->pixels;
+	displayBuffer = (byte *)_vm->_render->getBackGroundSurface()->pixels;
 
 	if (playing) {
 		anim->state = ANIM_PLAYING;
diff --git a/engines/saga/gfx.cpp b/engines/saga/gfx.cpp
index 8e98f0fbe7..62250a0820 100644
--- a/engines/saga/gfx.cpp
+++ b/engines/saga/gfx.cpp
@@ -156,7 +156,7 @@ void Surface::transitionDissolve(const byte *sourceBuffer, const Common::Rect &s
 			if (sourceRect.contains(x1, y1)) {
 				color = sourceBuffer[(x1-sourceRect.left) + sourceRect.width()*(y1-sourceRect.top)];
 				if (flags == 0 || color)
-					((byte*)pixels)[seq] = color;
+					((byte *)pixels)[seq] = color;
 			}
 		}
 	}
diff --git a/engines/saga/isomap.cpp b/engines/saga/isomap.cpp
index ec6b13f313..945b4ad5a7 100644
--- a/engines/saga/isomap.cpp
+++ b/engines/saga/isomap.cpp
@@ -346,7 +346,7 @@ int16 IsoMap::findMulti(int16 tileIndex, int16 absU, int16 absV, int16 absH) {
 			if (offset + sizeof(int16) > _multiTableData.size() * sizeof(int16)) {
 				error("wrong multiTileEntryData->offset");
 			}
-			tiles = (int16*)((byte*)&_multiTableData.front() + offset);
+			tiles = (int16 *)((byte *)&_multiTableData.front() + offset);
 			tileIndex = *tiles;
 			if (tileIndex >= 256) {
 				warning("something terrible happened");
diff --git a/engines/saga/script.h b/engines/saga/script.h
index 227b58a298..c4ea2d62b3 100644
--- a/engines/saga/script.h
+++ b/engines/saga/script.h
@@ -196,9 +196,9 @@ public:
 		case kAddressModule:
 			return _moduleBase;
 		case kAddressStack:
-			return (byte*)&_stackBuf[_frameIndex];
+			return (byte *)&_stackBuf[_frameIndex];
 		case kAddressThread:
-			return (byte*)_threadVars;
+			return (byte *)_threadVars;
 		default:
 			return _commonBase;
 		}
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 395ba4a8c7..9607a8e66d 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -1433,7 +1433,7 @@ bool Console::cmdSaid(int argc, const char **argv) {
 			_engine->getVocabulary()->dumpParseTree();
 			_engine->getVocabulary()->parserIsValid = true;
 
-			int ret = said((byte*)spec, true);
+			int ret = said((byte *)spec, true);
 			DebugPrintf("kSaid: %s\n", (ret == SAID_NO_MATCH ? "No match" : "Match"));
 		}
 
@@ -1605,7 +1605,7 @@ bool Console::cmdWindowList(int argc, const char **argv) {
 bool Console::cmdSavedBits(int argc, const char **argv) {
 	SegManager *segman = _engine->_gamestate->_segMan;
 	SegmentId id = segman->findSegmentByType(SEG_TYPE_HUNK);
-	HunkTable* hunks = (HunkTable*)segman->getSegmentObj(id);
+	HunkTable* hunks = (HunkTable *)segman->getSegmentObj(id);
 	if (!hunks) {
 		DebugPrintf("No hunk segment found.\n");
 		return true;
@@ -1617,7 +1617,7 @@ bool Console::cmdSavedBits(int argc, const char **argv) {
 		uint16 offset = entries[i].offset;
 		const Hunk& h = hunks->_table[offset];
 		if (strcmp(h.type, "SaveBits()") == 0) {
-			byte* memoryPtr = (byte*)h.mem;
+			byte* memoryPtr = (byte *)h.mem;
 
 			if (memoryPtr) {
 				DebugPrintf("%04x:%04x:", PRINT_REG(entries[i]));
@@ -1671,7 +1671,7 @@ bool Console::cmdShowSavedBits(int argc, const char **argv) {
 
 	SegManager *segman = _engine->_gamestate->_segMan;
 	SegmentId id = segman->findSegmentByType(SEG_TYPE_HUNK);
-	HunkTable* hunks = (HunkTable*)segman->getSegmentObj(id);
+	HunkTable* hunks = (HunkTable *)segman->getSegmentObj(id);
 	if (!hunks) {
 		DebugPrintf("No hunk segment found.\n");
 		return true;
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index ce903626e7..aade40fd9f 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -823,7 +823,7 @@ reg_t kFileIOWriteRaw(EngineState *s, int argc, reg_t *argv) {
 	int size = argv[2].toUint16();
 	char *buf = new char[size];
 	bool success = false;
-	s->_segMan->memcpy((byte*)buf, argv[1], size);
+	s->_segMan->memcpy((byte *)buf, argv[1], size);
 	debugC(kDebugLevelFile, "kFileIO(writeRaw): %d, %d", handle, size);
 
 	FileHandle *f = getFileFromHandle(s, handle);
diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp
index f30f4e923e..cddd01e10c 100644
--- a/engines/sci/engine/message.cpp
+++ b/engines/sci/engine/message.cpp
@@ -345,7 +345,7 @@ bool MessageState::stringLit(Common::String &outStr, const Common::String &inStr
 }
 
 bool MessageState::stringStage(Common::String &outstr, const Common::String &inStr, uint &index) {
-	// Stage directions of the form (n*), where n is anything but a digit or a lowercase character
+	// Stage directions of the form (n *), where n is anything but a digit or a lowercase character
 	if (inStr[index] != '(')
 		return false;
 
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 554a6b6a2c..ef61b2e28a 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -727,7 +727,7 @@ void logKernelCall(const KernelFunction *kernelCall, const KernelSubFunction *ke
 				switch (mobj->getType()) {
 				case SEG_TYPE_HUNK:
 				{
-					HunkTable *ht = (HunkTable*)mobj;
+					HunkTable *ht = (HunkTable *)mobj;
 					int index = argv[parmNr].offset;
 					if (ht->isValidEntry(index)) {
 						// NOTE: This ", deleted" isn't as useful as it could
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index 04c61f7b7c..cc127c8dbc 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -691,7 +691,7 @@ void SegManager::memcpy(reg_t dest, const byte* src, size_t n) {
 
 	if (dest_r.isRaw) {
 		// raw -> raw
-		::memcpy((char*)dest_r.raw, src, n);
+		::memcpy((char *)dest_r.raw, src, n);
 	} else {
 		// raw -> non-raw
 		for (uint i = 0; i < n; i++)
diff --git a/engines/sci/engine/segment.cpp b/engines/sci/engine/segment.cpp
index fcf9774a08..36b7d92c07 100644
--- a/engines/sci/engine/segment.cpp
+++ b/engines/sci/engine/segment.cpp
@@ -306,7 +306,7 @@ SegmentRef StringTable::dereference(reg_t pointer) {
 	SegmentRef ret;
 	ret.isRaw = true;
 	ret.maxSize = _table[pointer.offset].getSize();
-	ret.raw = (byte*)_table[pointer.offset].getRawData();
+	ret.raw = (byte *)_table[pointer.offset].getRawData();
 	return ret;
 }
 
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 6469bc0cb3..4020518b72 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -438,7 +438,7 @@ void GfxScreen::bitsSaveScreen(Common::Rect rect, byte *screen, uint16 screenWid
 	screen += (rect.top * screenWidth) + rect.left;
 
 	for (y = rect.top; y < rect.bottom; y++) {
-		memcpy(memoryPtr, (void*)screen, width); memoryPtr += width;
+		memcpy(memoryPtr, (void *)screen, width); memoryPtr += width;
 		screen += screenWidth;
 	}
 }
@@ -458,7 +458,7 @@ void GfxScreen::bitsSaveDisplayScreen(Common::Rect rect, byte *&memoryPtr) {
 	}
 
 	for (y = rect.top; y < rect.bottom; y++) {
-		memcpy(memoryPtr, (void*)screen, width); memoryPtr += width;
+		memcpy(memoryPtr, (void *)screen, width); memoryPtr += width;
 		screen += _displayWidth;
 	}
 }
@@ -503,7 +503,7 @@ void GfxScreen::bitsRestoreScreen(Common::Rect rect, byte *&memoryPtr, byte *scr
 	screen += (rect.top * screenWidth) + rect.left;
 
 	for (y = rect.top; y < rect.bottom; y++) {
-		memcpy((void*) screen, memoryPtr, width); memoryPtr += width;
+		memcpy((void *) screen, memoryPtr, width); memoryPtr += width;
 		screen += screenWidth;
 	}
 }
@@ -523,7 +523,7 @@ void GfxScreen::bitsRestoreDisplayScreen(Common::Rect rect, byte *&memoryPtr) {
 	}
 
 	for (y = rect.top; y < rect.bottom; y++) {
-		memcpy((void*) screen, memoryPtr, width); memoryPtr += width;
+		memcpy((void *) screen, memoryPtr, width); memoryPtr += width;
 		screen += _displayWidth;
 	}
 }
diff --git a/engines/sci/parser/said.cpp b/engines/sci/parser/said.cpp
index d44109faec..eff4a29f49 100644
--- a/engines/sci/parser/said.cpp
+++ b/engines/sci/parser/said.cpp
@@ -743,7 +743,7 @@ static void node_print_desc(ParseTreeNode* node) {
 	}
 }
 #else
-static void node_print_desc(ParseTreeNode*) { }
+static void node_print_desc(ParseTreeNode *) { }
 #endif
 
 
diff --git a/engines/sci/sound/drivers/amigamac.cpp b/engines/sci/sound/drivers/amigamac.cpp
index 41697d4a07..131a85f371 100644
--- a/engines/sci/sound/drivers/amigamac.cpp
+++ b/engines/sci/sound/drivers/amigamac.cpp
@@ -524,7 +524,7 @@ MidiDriver_AmigaMac::InstrumentSample *MidiDriver_AmigaMac::readInstrumentSCI0(C
 		instrument->size = seg_size[0];
 		instrument->loop_size = seg_size[1];
 
-		instrument->loop = (int8*)malloc(instrument->loop_size + 1);
+		instrument->loop = (int8 *)malloc(instrument->loop_size + 1);
 		memcpy(instrument->loop, instrument->samples + loop_offset, instrument->loop_size);
 
 		instrument->samples[instrument->size] = instrument->loop[0];
@@ -708,7 +708,7 @@ void MidiDriver_AmigaMac::generateSamples(int16 *data, int len) {
 	if (len == 0)
 		return;
 
-	int16 *buffers = (int16*)malloc(len * 2 * kChannels);
+	int16 *buffers = (int16 *)malloc(len * 2 * kChannels);
 
 	memset(buffers, 0, len * 2 * kChannels);
 
@@ -869,7 +869,7 @@ bool MidiDriver_AmigaMac::loadInstrumentsSCI0Mac(Common::SeekableReadStream &fil
 			instrument->size = seg_size[0];
 			instrument->loop_size = seg_size[1] - seg_size[0];
 
-			instrument->loop = (int8*)malloc(instrument->loop_size + 1);
+			instrument->loop = (int8 *)malloc(instrument->loop_size + 1);
 			memcpy(instrument->loop, instrument->samples + loop_offset, instrument->loop_size);
 
 			instrument->samples[instrument->size] = instrument->loop[0];
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 53496428e3..b8722b6963 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2040,7 +2040,7 @@ void Actor_v0::limbFrameCheck(int limb) {
 	_limbFrameRepeat[limb] = _limbFrameRepeatNew[limb];
 
 	// 0x25C3
-	_cost.active[limb] = ((V0CostumeLoader*)_vm->_costumeLoader)->getFrame(this, limb);
+	_cost.active[limb] = ((V0CostumeLoader *)_vm->_costumeLoader)->getFrame(this, limb);
 	_cost.curpos[limb] = 0;
 
 	_needRedraw = true;
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index 2bbf3b3801..6e7e9ff688 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -668,7 +668,7 @@ void ClassicCostumeRenderer::procPCEngine(Codec1 &v1) {
 							 (v1.mask_ptr && (mask[0] & maskbit));
 
 					if (pcolor && !masked) {
-						WRITE_UINT16(dst, ((uint16*)_palette)[pcolor]);
+						WRITE_UINT16(dst, ((uint16 *)_palette)[pcolor]);
 					}
 
 					xPos += xStep;
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index 36f06a4889..42f11498d9 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -636,7 +636,7 @@ void ScummEngine_v5::setBuiltinCursor(int idx) {
 				byte *dst2 = (_textSurfaceMultiplier == 2) ? dst1 + 16 * scl : dst1;
 				if (_outputPixelFormat.bytesPerPixel == 2) {
 					for (int b = 0; b < scl; b += 2) {
-						*((uint16*)dst1) = *((uint16*)dst2) = color;
+						*((uint16 *)dst1) = *((uint16 *)dst2) = color;
 						dst1 += 2;
 						dst2 += 2;
 					}
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 3e1ad53ed6..b47982af00 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -598,7 +598,7 @@ static void detectGames(const Common::FSList &fslist, Common::List<DetectorResul
 			}
 
 			if (isDiskImg)
-				closeDiskImage((ScummDiskImage*)tmp);
+				closeDiskImage((ScummDiskImage *)tmp);
 			delete tmp;
 		}
 
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index bc6cfc761e..48ccdfd1cf 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -1136,7 +1136,7 @@ void ScummEngine::clearTextSurface() {
 		_townsScreen->fillLayerRect(1, 0, 0, _textSurface.w, _textSurface.h, 0);
 #endif
 
-	fill((byte*)_textSurface.pixels,  _textSurface.pitch,
+	fill((byte *)_textSurface.pixels,  _textSurface.pitch,
 #ifndef DISABLE_TOWNS_DUAL_LAYER_MODE
 		_game.platform == Common::kPlatformFMTowns ? 0 :
 #endif
@@ -2773,7 +2773,7 @@ void GdiNES::drawStripNESMask(byte *dst, int stripnr, int top, int height) const
 void readOffsetTable(const byte *ptr, uint16 **table, int *count) {
 	int pos = 0;
 	*count = READ_LE_UINT16(ptr) / 2 + 1;
-	*table = (uint16*)malloc(*count * sizeof(uint16));
+	*table = (uint16 *)malloc(*count * sizeof(uint16));
 	for (int i = 0; i < *count; i++) {
 		(*table)[i] = READ_LE_UINT16(ptr + pos) + pos + 2;
 		pos += 2;
@@ -2977,10 +2977,10 @@ void GdiPCEngine::decodePCEngineTileData(const byte *ptr) {
 
 	if (_distaff) {
 		free(_PCE.staffTiles);
-		_PCE.staffTiles = (byte*)calloc(_PCE.numTiles * 8 * 8, sizeof(byte));
+		_PCE.staffTiles = (byte *)calloc(_PCE.numTiles * 8 * 8, sizeof(byte));
 	} else {
 		free(_PCE.roomTiles);
-		_PCE.roomTiles = (byte*)calloc(_PCE.numTiles * 8 * 8, sizeof(byte));
+		_PCE.roomTiles = (byte *)calloc(_PCE.numTiles * 8 * 8, sizeof(byte));
 	}
 
 	for (int i = 0; i < _PCE.numTiles; ++i) {
@@ -3023,7 +3023,7 @@ void GdiPCEngine::decodePCEngineMaskData(const byte *ptr) {
 	readOffsetTable(ptr, &maskOffsets, &_PCE.numMasks);
 
 	free(_PCE.masks);
-	_PCE.masks = (byte*)malloc(_PCE.numMasks * 8 * sizeof(byte));
+	_PCE.masks = (byte *)malloc(_PCE.numMasks * 8 * sizeof(byte));
 
 	for (int i = 0; i < _PCE.numMasks; ++i) {
 		mask = &_PCE.masks[i * 8];
diff --git a/engines/scumm/gfx_towns.cpp b/engines/scumm/gfx_towns.cpp
index 6a3f50a1af..8bffcab4a0 100644
--- a/engines/scumm/gfx_towns.cpp
+++ b/engines/scumm/gfx_towns.cpp
@@ -39,7 +39,7 @@ void ScummEngine::towns_drawStripToScreen(VirtScreen *vs, int dstX, int dstY, in
 	int m = _textSurfaceMultiplier;
 
 	uint8 *src1 = vs->getPixels(srcX, srcY);
-	uint8 *src2 = (uint8*)_textSurface.getBasePtr(srcX * m, (srcY + vs->topline - _screenTop) * m);
+	uint8 *src2 = (uint8 *)_textSurface.getBasePtr(srcX * m, (srcY + vs->topline - _screenTop) * m);
 	uint8 *dst1 = _townsScreen->getLayerPixels(0, dstX, dstY);
 	uint8 *dst2 = _townsScreen->getLayerPixels(1, dstX * m, dstY * m);
 
@@ -52,7 +52,7 @@ void ScummEngine::towns_drawStripToScreen(VirtScreen *vs, int dstX, int dstY, in
 		for (int h = 0; h < height; ++h) {
 			if (_outputPixelFormat.bytesPerPixel == 2) {
 				for (int w = 0; w < width; ++w) {
-					*(uint16*)dst1 = _16BitPalette[*src1++];
+					*(uint16 *)dst1 = _16BitPalette[*src1++];
 					dst1 += _outputPixelFormat.bytesPerPixel;
 				}
 
@@ -245,7 +245,7 @@ void TownsScreen::setupLayer(int layer, int width, int height, int numCol, void
 	l->numCol = numCol;
 	l->bpp = ((numCol - 1) & 0xff00) ? 2 : 1;
 	l->pitch = width * l->bpp;
-	l->palette = (uint8*)pal;
+	l->palette = (uint8 *)pal;
 
 	if (l->palette && _pixelFormat.bytesPerPixel == 1)
 		warning("TownsScreen::setupLayer(): Layer palette usage requires 16 bit graphics setting.\nLayer palette will be ignored.");
@@ -304,7 +304,7 @@ void TownsScreen::fillLayerRect(int layer, int x, int y, int w, int h, int col)
 	for (int i = 0; i < h; ++i) {
 		if (l->bpp == 2) {
 			for (int ii = 0; ii < w; ++ii) {
-				*(uint16*)pos = col;
+				*(uint16 *)pos = col;
 				pos += 2;
 			}
 			pos += (l->pitch - w * 2);
@@ -472,10 +472,10 @@ void TownsScreen::updateOutputBuffer() {
 							if (col || l->onBottom) {
 								if (l->numCol == 16)
 									col = (col >> 4) & (col & 0x0f);
-								*(uint16*)dst = l->bltTmpPal[col];
+								*(uint16 *)dst = l->bltTmpPal[col];
 							}
 						} else {
-							*(uint16*)dst = *(uint16*)src;
+							*(uint16 *)dst = *(uint16 *)src;
 						}
 						dst += 2;
 					}
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 85e2a2f1dd..1007d2a7b0 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -652,7 +652,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags)
 			 * even addresses, so the use of (void *) in the
 			 * following cast shuts the compiler from warning
 			 * unnecessarily. */
-			size = voxStream->readBuffer((int16*)(void *)sound, size * 2);
+			size = voxStream->readBuffer((int16 *)(void *)sound, size * 2);
 			size *= 2; // 16bits.
 			delete voxStream;
 
diff --git a/engines/scumm/player_apple2.h b/engines/scumm/player_apple2.h
index c3e1b7fc60..b4a7d409fb 100644
--- a/engines/scumm/player_apple2.h
+++ b/engines/scumm/player_apple2.h
@@ -209,7 +209,7 @@ public:
 	}
 
 	uint32 readSamples(void *buffer, int numSamples) {
-		return _buffer.read((byte*)buffer, numSamples * 2) / 2;
+		return _buffer.read((byte *)buffer, numSamples * 2) / 2;
 	}
 
 private:
diff --git a/engines/scumm/player_sid.cpp b/engines/scumm/player_sid.cpp
index ecfaef22c1..7a609364e5 100644
--- a/engines/scumm/player_sid.cpp
+++ b/engines/scumm/player_sid.cpp
@@ -1293,7 +1293,7 @@ int Player_SID::readBuffer(int16 *buffer, const int numSamples) {
 			_cpuCyclesLeft = timingProps[_videoSystem].cyclesPerFrame;
 		}
 		// fetch samples
-		int sampleCount = _sid->updateClock(_cpuCyclesLeft, (short*)buffer, samplesLeft);
+		int sampleCount = _sid->updateClock(_cpuCyclesLeft, (short *)buffer, samplesLeft);
 		samplesLeft -= sampleCount;
 		buffer += sampleCount;
 	}
diff --git a/engines/scumm/player_v1.cpp b/engines/scumm/player_v1.cpp
index 8afede8c5a..8e784e9866 100644
--- a/engines/scumm/player_v1.cpp
+++ b/engines/scumm/player_v1.cpp
@@ -351,8 +351,8 @@ parse_again:
 			*_value_ptr_2 = _start_2;
 		}
 		debug(6, "chunk 1: %lu: %d step %d for %d, %lu: %d step %d for %d",
-			  (long)(_value_ptr - (uint*)_channels), _start, _delta, _time_left,
-			  (long)(_value_ptr_2 - (uint*)_channels), _start_2, _delta_2, _time_left_2);
+			  (long)(_value_ptr - (uint *)_channels), _start, _delta, _time_left,
+			  (long)(_value_ptr_2 - (uint *)_channels), _start_2, _delta_2, _time_left_2);
 		break;
 
 	case 2:
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index f445a44ded..b2093e9c1a 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -232,7 +232,7 @@ void ScummEngine::askForDisk(const char *filename, int disknum) {
 #endif
 	} else {
 		sprintf(buf, "Cannot find file: '%s'", filename);
-		InfoDialog dialog(this, (char*)buf);
+		InfoDialog dialog(this, (char *)buf);
 		runDialog(dialog);
 		error("Cannot find file: '%s'", filename);
 	}
@@ -350,7 +350,7 @@ void ScummEngine_v7::readIndexBlock(uint32 blocktype, uint32 itemsize) {
 	switch (blocktype) {
 	case MKTAG('A','N','A','M'):		// Used by: The Dig, FT
 		num = _fileHandle->readUint16LE();
-		ptr = (char*)malloc(num * 9);
+		ptr = (char *)malloc(num * 9);
 		_fileHandle->read(ptr, num * 9);
 		_imuseDigital->setAudioNames(num, ptr);
 		break;
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 6e54377199..beac077fd1 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -875,21 +875,21 @@ void ScummEngine::saveOrLoad(Serializer *s) {
 		// vm.localvar grew from 25 to 40 script entries and then from
 		// 16 to 32 bit variables (but that wasn't reflect here)... and
 		// THEN from 16 to 25 variables.
-		MKARRAY2_OLD(ScummEngine, vm.localvar[0][0], sleUint16, 17, 25, (byte*)vm.localvar[1] - (byte*)vm.localvar[0], VER(8), VER(8)),
-		MKARRAY2_OLD(ScummEngine, vm.localvar[0][0], sleUint16, 17, 40, (byte*)vm.localvar[1] - (byte*)vm.localvar[0], VER(9), VER(14)),
+		MKARRAY2_OLD(ScummEngine, vm.localvar[0][0], sleUint16, 17, 25, (byte *)vm.localvar[1] - (byte *)vm.localvar[0], VER(8), VER(8)),
+		MKARRAY2_OLD(ScummEngine, vm.localvar[0][0], sleUint16, 17, 40, (byte *)vm.localvar[1] - (byte *)vm.localvar[0], VER(9), VER(14)),
 
 		// We used to save 25 * 40 = 1000 blocks; but actually, each 'row consisted of 26 entry,
 		// i.e. 26 * 40 = 1040. Thus the last 40 blocks of localvar where not saved at all. To be
 		// able to load this screwed format, we use a trick: We load 26 * 38 = 988 blocks.
 		// Then, we mark the followin 12 blocks (24 bytes) as obsolete.
-		MKARRAY2_OLD(ScummEngine, vm.localvar[0][0], sleUint16, 26, 38, (byte*)vm.localvar[1] - (byte*)vm.localvar[0], VER(15), VER(17)),
+		MKARRAY2_OLD(ScummEngine, vm.localvar[0][0], sleUint16, 26, 38, (byte *)vm.localvar[1] - (byte *)vm.localvar[0], VER(15), VER(17)),
 		MK_OBSOLETE_ARRAY(ScummEngine, vm.localvar[39][0], sleUint16, 12, VER(15), VER(17)),
 
 		// This was the first proper multi dimensional version of the localvars, with 32 bit values
-		MKARRAY2_OLD(ScummEngine, vm.localvar[0][0], sleUint32, 26, 40, (byte*)vm.localvar[1] - (byte*)vm.localvar[0], VER(18), VER(19)),
+		MKARRAY2_OLD(ScummEngine, vm.localvar[0][0], sleUint32, 26, 40, (byte *)vm.localvar[1] - (byte *)vm.localvar[0], VER(18), VER(19)),
 
 		// Then we doubled the script slots again, from 40 to 80
-		MKARRAY2(ScummEngine, vm.localvar[0][0], sleUint32, 26, NUM_SCRIPT_SLOT, (byte*)vm.localvar[1] - (byte*)vm.localvar[0], VER(20)),
+		MKARRAY2(ScummEngine, vm.localvar[0][0], sleUint32, 26, NUM_SCRIPT_SLOT, (byte *)vm.localvar[1] - (byte *)vm.localvar[0], VER(20)),
 
 
 		MKARRAY(ScummEngine, _resourceMapper[0], sleByte, 128, VER(8)),
@@ -1538,7 +1538,7 @@ void ScummEngine_v5::saveOrLoad(Serializer *s) {
 	ScummEngine::saveOrLoad(s);
 
 	const SaveLoadEntry cursorEntries[] = {
-		MKARRAY2(ScummEngine_v5, _cursorImages[0][0], sleUint16, 16, 4, (byte*)_cursorImages[1] - (byte*)_cursorImages[0], VER(44)),
+		MKARRAY2(ScummEngine_v5, _cursorImages[0][0], sleUint16, 16, 4, (byte *)_cursorImages[1] - (byte *)_cursorImages[0], VER(44)),
 		MKARRAY(ScummEngine_v5, _cursorHotspots[0], sleByte, 8, VER(44)),
 		MKEND()
 	};
diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h
index 90feee6dc0..d5f7ea526e 100644
--- a/engines/scumm/saveload.h
+++ b/engines/scumm/saveload.h
@@ -74,13 +74,13 @@ namespace Scumm {
  * what POD means refer to <http://en.wikipedia.org/wiki/Plain_Old_Data_Structures> or
  * to <http://www.informit.com/guides/content.asp?g=cplusplus&seqNum=32&rl=1>)
  */
-#define OFFS(type,item) (((ptrdiff_t)(&((type*)42)->type::item))-42)
+#define OFFS(type,item) (((ptrdiff_t)(&((type *)42)->type::item))-42)
 
 /**
  * Similar to the OFFS macro, this macro computes the size (in bytes) of a
  * member of a given struct/class type.
  */
-#define SIZE(type,item) sizeof(((type*)42)->type::item)
+#define SIZE(type,item) sizeof(((type *)42)->type::item)
 
 // Any item that is still in use automatically gets a maxVersion equal to CURRENT_VER
 #define MKLINE(type,item,saveas,minVer) {OFFS(type,item),saveas,SIZE(type,item),minVer,CURRENT_VER}
diff --git a/engines/scumm/script_v4.cpp b/engines/scumm/script_v4.cpp
index 8340f62dbc..1de9f08168 100644
--- a/engines/scumm/script_v4.cpp
+++ b/engines/scumm/script_v4.cpp
@@ -350,7 +350,7 @@ void ScummEngine_v4::loadIQPoints(byte *ptr, int size) {
 
 	file = _saveFileMan->openForLoading(filename);
 	if (file != NULL) {
-		byte *tmp = (byte*)malloc(size);
+		byte *tmp = (byte *)malloc(size);
 		int nread = file->read(tmp, size);
 		if (nread == size) {
 			memcpy(ptr, tmp, size);
@@ -414,7 +414,7 @@ void ScummEngine_v4::o4_saveLoadGame() {
 				// use name entered by the user
 				char* ptr;
 				int firstSlot = (_game.id == GID_LOOM) ? STRINGID_SAVENAME1_LOOM : STRINGID_SAVENAME1;
-				ptr = (char*)getStringAddress(slot + firstSlot - 1);
+				ptr = (char *)getStringAddress(slot + firstSlot - 1);
 				strncpy(name, ptr, sizeof(name));
 			}
 
diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp
index c8b92be3c8..f6f376f3c9 100644
--- a/engines/scumm/script_v8.cpp
+++ b/engines/scumm/script_v8.cpp
@@ -1122,7 +1122,7 @@ void ScummEngine_v8::o8_kernelSetFunctions() {
 	}
 	case 26: { // saveGameWrite
 		// FIXME: This doesn't work
-		char *address = (char*)getStringAddress(args[2]);
+		char *address = (char *)getStringAddress(args[2]);
 		debug(0, "o8_kernelSetFunctions: saveGame(%d, %s)", args[1], address);
 		break;
 	}
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 61bb89328d..3d254b1ce4 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -112,7 +112,7 @@ void ScummEngine::showMessageDialog(const byte *msg) {
 	if (_string[3].color == 0)
 		_string[3].color = 4;
 
-	InfoDialog dialog(this, (char*)buf);
+	InfoDialog dialog(this, (char *)buf);
 	VAR(VAR_KEYPRESS) = runDialog(dialog);
 }
 
diff --git a/engines/sky/autoroute.cpp b/engines/sky/autoroute.cpp
index 5273b21807..ab791cb066 100644
--- a/engines/sky/autoroute.cpp
+++ b/engines/sky/autoroute.cpp
@@ -242,7 +242,7 @@ uint16 AutoRoute::autoRoute(Compact *cpt) {
 	clipCoordX(cpt->arTargetX, destX, initDestX);
 	clipCoordY(cpt->arTargetY, destY, initDestY);
 
-	uint16 *routeDest = (uint16*)_skyCompact->fetchCpt(cpt->animScratchId);
+	uint16 *routeDest = (uint16 *)_skyCompact->fetchCpt(cpt->animScratchId);
 	memset(routeDest, 0, 64);
 	if ((startX == destX) && (startY == destY))
 		return 2;
diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp
index fd81cb9bea..cf9bd55b1a 100644
--- a/engines/sky/compact.cpp
+++ b/engines/sky/compact.cpp
@@ -34,7 +34,7 @@ namespace Sky {
 
 #define	SKY_CPT_SIZE	419427
 
-#define OFFS(type,item) (((ptrdiff_t)(&((type*)42)->item))-42)
+#define OFFS(type,item) (((ptrdiff_t)(&((type *)42)->item))-42)
 #define MK32(type,item) OFFS(type, item),0,0,0
 #define MK16(type,item) OFFS(type, item),0
 #define MK32_A5(type, item) MK32(type, item[0]), MK32(type, item[1]), \
@@ -147,28 +147,28 @@ SkyCompact::SkyCompact() {
 	_numDataLists = _cptFile->readUint16LE();
 	_cptNames	  = (char***)malloc(_numDataLists * sizeof(char**));
 	_dataListLen  = (uint16 *)malloc(_numDataLists * sizeof(uint16));
-	_cptSizes	  = (uint16 **)malloc(_numDataLists * sizeof(uint16*));
-	_cptTypes	  = (uint16 **)malloc(_numDataLists * sizeof(uint16*));
+	_cptSizes	  = (uint16 **)malloc(_numDataLists * sizeof(uint16 *));
+	_cptTypes	  = (uint16 **)malloc(_numDataLists * sizeof(uint16 *));
 	_compacts	  = (Compact***)malloc(_numDataLists * sizeof(Compact**));
 
 	for (int i = 0; i < _numDataLists; i++) {
 		_dataListLen[i] = _cptFile->readUint16LE();
-		_cptNames[i] = (char**)malloc(_dataListLen[i] * sizeof(char*));
+		_cptNames[i] = (char**)malloc(_dataListLen[i] * sizeof(char *));
 		_cptSizes[i] = (uint16 *)malloc(_dataListLen[i] * sizeof(uint16));
 		_cptTypes[i] = (uint16 *)malloc(_dataListLen[i] * sizeof(uint16));
-		_compacts[i] = (Compact**)malloc(_dataListLen[i] * sizeof(Compact*));
+		_compacts[i] = (Compact**)malloc(_dataListLen[i] * sizeof(Compact *));
 	}
 
 	uint32 rawSize = _cptFile->readUint32LE() * sizeof(uint16);
-	uint16 *rawPos = _rawBuf = (uint16*)malloc(rawSize);
+	uint16 *rawPos = _rawBuf = (uint16 *)malloc(rawSize);
 
 	uint32 srcSize = _cptFile->readUint32LE() * sizeof(uint16);
-	uint16 *srcBuf = (uint16*)malloc(srcSize);
+	uint16 *srcBuf = (uint16 *)malloc(srcSize);
 	uint16 *srcPos = srcBuf;
 	_cptFile->read(srcBuf, srcSize);
 
 	uint32 asciiSize = _cptFile->readUint32LE();
-	char *asciiPos = _asciiBuf = (char*)malloc(asciiSize);
+	char *asciiPos = _asciiBuf = (char *)malloc(asciiSize);
 	_cptFile->read(_asciiBuf, asciiSize);
 
 	// and fill them with the compact data
@@ -177,7 +177,7 @@ SkyCompact::SkyCompact() {
 			_cptSizes[lcnt][ecnt] = READ_LE_UINT16(srcPos++);
 			if (_cptSizes[lcnt][ecnt]) {
 				_cptTypes[lcnt][ecnt] = READ_LE_UINT16(srcPos++);
-				_compacts[lcnt][ecnt] = (Compact*)rawPos;
+				_compacts[lcnt][ecnt] = (Compact *)rawPos;
 				_cptNames[lcnt][ecnt] = asciiPos;
 				asciiPos += strlen(asciiPos) + 1;
 
@@ -193,7 +193,7 @@ SkyCompact::SkyCompact() {
 	free(srcBuf);
 
 	uint16 numDlincs = _cptFile->readUint16LE();
-	uint16 *dlincBuf = (uint16*)malloc(numDlincs * 2 * sizeof(uint16));
+	uint16 *dlincBuf = (uint16 *)malloc(numDlincs * 2 * sizeof(uint16));
 	uint16 *dlincPos = dlincBuf;
 	_cptFile->read(dlincBuf, numDlincs * 2 * sizeof(uint16));
 	// these compacts don't actually exist but only point to other ones...
@@ -213,13 +213,13 @@ SkyCompact::SkyCompact() {
 	// if this is v0.0288, parse this diff data
 	uint16 numDiffs = _cptFile->readUint16LE();
 	uint16 diffSize = _cptFile->readUint16LE();
-	uint16 *diffBuf = (uint16*)malloc(diffSize * sizeof(uint16));
+	uint16 *diffBuf = (uint16 *)malloc(diffSize * sizeof(uint16));
 	_cptFile->read(diffBuf, diffSize * sizeof(uint16));
 	if (SkyEngine::_systemVars.gameVersion == 288) {
 		uint16 *diffPos = diffBuf;
 		for (cnt = 0; cnt < numDiffs; cnt++) {
 			uint16 cptId = READ_LE_UINT16(diffPos++);
-			uint16 *rawCpt = (uint16*)fetchCpt(cptId);
+			uint16 *rawCpt = (uint16 *)fetchCpt(cptId);
 			rawCpt += READ_LE_UINT16(diffPos++);
 			uint16 len = READ_LE_UINT16(diffPos++);
 			for (uint16 elemCnt = 0; elemCnt < len; elemCnt++)
@@ -231,7 +231,7 @@ SkyCompact::SkyCompact() {
 
 	// these are the IDs that have to be saved into savegame files.
 	_numSaveIds = _cptFile->readUint16LE();
-	_saveIds = (uint16*)malloc(_numSaveIds * sizeof(uint16));
+	_saveIds = (uint16 *)malloc(_numSaveIds * sizeof(uint16));
 	_cptFile->read(_saveIds, _numSaveIds * sizeof(uint16));
 	for (cnt = 0; cnt < _numSaveIds; cnt++)
 		_saveIds[cnt] = FROM_LE_16(_saveIds[cnt]);
@@ -318,7 +318,7 @@ uint16 *SkyCompact::getSub(Compact *cpt, uint16 mode) {
 }
 
 uint16 *SkyCompact::getGrafixPtr(Compact *cpt) {
-	uint16 *gfxBase = (uint16*)fetchCpt(cpt->grafixProgId);
+	uint16 *gfxBase = (uint16 *)fetchCpt(cpt->grafixProgId);
 	if (gfxBase == NULL)
 		return NULL;
 
@@ -358,7 +358,7 @@ MegaSet *SkyCompact::getMegaSet(Compact *cpt) {
 */
 uint16 *SkyCompact::getTurnTable(Compact *cpt, uint16 dir) {
 	MegaSet *m = getMegaSet(cpt);
-	TurnTable *turnTable = (TurnTable*)fetchCpt(m->turnTableId);
+	TurnTable *turnTable = (TurnTable *)fetchCpt(m->turnTableId);
 	switch (dir) {
 	case 0:
 		return turnTable->turnTableUp;
@@ -418,7 +418,7 @@ void *SkyCompact::getCompactElem(Compact *cpt, uint16 off) {
 uint8 *SkyCompact::createResetData(uint16 gameVersion) {
 	_cptFile->seek(_resetDataPos);
 	uint32 dataSize = _cptFile->readUint16LE() * sizeof(uint16);
-	uint16 *resetBuf = (uint16*)malloc(dataSize);
+	uint16 *resetBuf = (uint16 *)malloc(dataSize);
 	_cptFile->read(resetBuf, dataSize);
 	uint16 numDiffs = _cptFile->readUint16LE();
 	for (uint16 cnt = 0; cnt < numDiffs; cnt++) {
@@ -429,7 +429,7 @@ uint8 *SkyCompact::createResetData(uint16 gameVersion) {
 				uint16 pos = _cptFile->readUint16LE();
 				resetBuf[pos] = TO_LE_16(_cptFile->readUint16LE());
 			}
-			return (uint8*)resetBuf;
+			return (uint8 *)resetBuf;
 		} else
 			_cptFile->seek(diffFields * 2 * sizeof(uint16), SEEK_CUR);
 	}
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index a40e77d1cb..83dab4ee77 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -1160,7 +1160,7 @@ uint32 Control::prepareSaveData(uint8 *destBuf) {
 
 	for (cnt = 0; cnt < _skyCompact->_numSaveIds; cnt++) {
 		uint16 numElems;
-		uint16 *rawCpt = (uint16*)_skyCompact->fetchCptInfo(_skyCompact->_saveIds[cnt], &numElems, NULL, NULL);
+		uint16 *rawCpt = (uint16 *)_skyCompact->fetchCptInfo(_skyCompact->_saveIds[cnt], &numElems, NULL, NULL);
 		for (uint16 elemCnt = 0; elemCnt < numElems; elemCnt++)
 			STOSW(destPos, rawCpt[elemCnt]);
 	}
@@ -1209,9 +1209,9 @@ void Control::importOldCompact(Compact* destCpt, uint8 **srcPos, uint16 numElems
 		else if (graphType == OG_COMPACT)
 			destCpt->grafixProgId = target;
 		else if (graphType == OG_TALKTABLE)
-			destCpt->grafixProgId = ((uint16*)_skyCompact->fetchCpt(CPT_TALK_TABLE_LIST))[target];
+			destCpt->grafixProgId = ((uint16 *)_skyCompact->fetchCpt(CPT_TALK_TABLE_LIST))[target];
 		else if (graphType == OG_COMPACTELEM)
-			destCpt->grafixProgId = *(uint16*)_skyCompact->getCompactElem(destCpt, target);
+			destCpt->grafixProgId = *(uint16 *)_skyCompact->getCompactElem(destCpt, target);
 		else
 			error("Illegal GrafixProg type encountered for compact %s", name);
 	}
@@ -1330,7 +1330,7 @@ uint16 Control::parseSaveData(uint8 *srcBuf) {
 	LODSD(srcPos, mouseType);
 	LODSD(srcPos, palette);
 
-	_skyLogic->parseSaveData((uint32*)srcPos);
+	_skyLogic->parseSaveData((uint32 *)srcPos);
 	srcPos += NUM_SKY_SCRIPTVARS * sizeof(uint32);
 
 	for (cnt = 0; cnt < 60; cnt++)
@@ -1339,7 +1339,7 @@ uint16 Control::parseSaveData(uint8 *srcBuf) {
 	if (saveRev == SAVE_FILE_REVISION) {
 		for (cnt = 0; cnt < _skyCompact->_numSaveIds; cnt++) {
 			uint16 numElems;
-			uint16 *rawCpt = (uint16*)_skyCompact->fetchCptInfo(_skyCompact->_saveIds[cnt], &numElems, NULL, NULL);
+			uint16 *rawCpt = (uint16 *)_skyCompact->fetchCptInfo(_skyCompact->_saveIds[cnt], &numElems, NULL, NULL);
 			for (uint16 elemCnt = 0; elemCnt < numElems; elemCnt++)
 				LODSW(srcPos, rawCpt[elemCnt]);
 		}
@@ -1348,19 +1348,19 @@ uint16 Control::parseSaveData(uint8 *srcBuf) {
 			uint16 numElems;
 			uint16 type;
 			char name[128];
-			uint16 *rawCpt = (uint16*)_skyCompact->fetchCptInfo(_skyCompact->_saveIds[cnt], &numElems, &type, name);
+			uint16 *rawCpt = (uint16 *)_skyCompact->fetchCptInfo(_skyCompact->_saveIds[cnt], &numElems, &type, name);
 			if (type == COMPACT) {
-				importOldCompact((Compact*)rawCpt, &srcPos, numElems, type, name);
+				importOldCompact((Compact *)rawCpt, &srcPos, numElems, type, name);
 			} else if (type == ROUTEBUF) {
 				assert(numElems == 32);
 				for (uint32 elemCnt = 0; elemCnt < numElems; elemCnt++)
 					LODSW(srcPos, rawCpt[elemCnt]);
 			}
 		}
-		uint16 *rawCpt = (uint16*)_skyCompact->fetchCpt(0xBF);
+		uint16 *rawCpt = (uint16 *)_skyCompact->fetchCpt(0xBF);
 		for (cnt = 0; cnt < 3; cnt++)
 			LODSW(srcPos, rawCpt[cnt]);
-		rawCpt = (uint16*)_skyCompact->fetchCpt(0xC2);
+		rawCpt = (uint16 *)_skyCompact->fetchCpt(0xC2);
 		for (cnt = 0; cnt < 13; cnt++)
 			LODSW(srcPos, rawCpt[cnt]);
 	}
@@ -1467,7 +1467,7 @@ void Control::restartGame() {
 		return; // no restart for floppy demo
 
 	uint8 *resetData = _skyCompact->createResetData((uint16)SkyEngine::_systemVars.gameVersion);
-	parseSaveData((uint8*)resetData);
+	parseSaveData((uint8 *)resetData);
 	free(resetData);
 	_skyScreen->forceRefresh();
 
diff --git a/engines/sky/control.h b/engines/sky/control.h
index 42ada564df..280f7e19cd 100644
--- a/engines/sky/control.h
+++ b/engines/sky/control.h
@@ -136,7 +136,7 @@ class ConResource {
 public:
 	ConResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen);
 	virtual ~ConResource() {}
-	void setSprite(void *pSpData) { _spriteData = (DataFileHeader*)pSpData; }
+	void setSprite(void *pSpData) { _spriteData = (DataFileHeader *)pSpData; }
 	void setText(uint32 pText) { if (pText) _text = pText + 0x7000; else _text = 0; }
 	void setXY(uint16 x, uint16 y) { _x = x; _y = y; }
 	bool isMouseOver(uint32 mouseX, uint32 mouseY);
diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp
index 99b707dcf1..e97aeb01a2 100644
--- a/engines/sky/disk.cpp
+++ b/engines/sky/disk.cpp
@@ -117,7 +117,7 @@ uint8 *Disk::loadFile(uint16 fileNr) {
 	cflag = (uint8)((fileFlags >> 23) & 0x1);
 	//if cflag == 0 then file is compressed, 1 == uncompressed
 
-	DataFileHeader *fileHeader = (DataFileHeader*)fileDest;
+	DataFileHeader *fileHeader = (DataFileHeader *)fileDest;
 
 	if ((!cflag) && ((FROM_LE_16(fileHeader->flag) >> 7) & 1)) {
 		debug(4, "File is RNC compressed.");
@@ -175,7 +175,7 @@ uint8 *Disk::loadFile(uint16 fileNr) {
 }
 
 uint16 *Disk::loadScriptFile(uint16 fileNr) {
-	uint16 *buf = (uint16*)loadFile(fileNr);
+	uint16 *buf = (uint16 *)loadFile(fileNr);
 #ifdef SCUMM_BIG_ENDIAN
 	for (uint i = 0; i < _lastLoadedFileSize / 2; i++)
 		buf[i] = FROM_LE_16(buf[i]);
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index f1ea4d2df2..2f75a19b69 100644
--- a/engines/sky/intro.cpp
+++ b/engines/sky/intro.cpp
@@ -633,8 +633,8 @@ Intro::Intro(Disk *disk, Screen *screen, MusicBase *music, Sound *sound, Text *t
 	_skyText = text;
 	_mixer = mixer;
 	_system = system;
-	_textBuf = (uint8*)malloc(10000);
-	_saveBuf = (uint8*)malloc(10000);
+	_textBuf = (uint8 *)malloc(10000);
+	_saveBuf = (uint8 *)malloc(10000);
 	_bgBuf = NULL;
 	_relDelay = 0;
 }
@@ -774,7 +774,7 @@ bool Intro::nextPart(uint16 *&data) {
 }
 
 bool Intro::floppyScrollFlirt() {
-	uint8 *scrollScreen = (uint8*)malloc(FRAME_SIZE * 2);
+	uint8 *scrollScreen = (uint8 *)malloc(FRAME_SIZE * 2);
 	memset(scrollScreen, 0, FRAME_SIZE);
 	memcpy(scrollScreen + FRAME_SIZE, _skyScreen->giveCurrent(), FRAME_SIZE);
 	uint8 *scrollPos = scrollScreen + FRAME_SIZE;
@@ -828,8 +828,8 @@ bool Intro::commandFlirt(uint16 *&data) {
 				_skyText->displayText(*data++, _textBuf, true, INTRO_TEXT_WIDTH, 255);
 				break;
 			case IC_SHOW_TEXT:
-				((DataFileHeader*)_textBuf)->s_x = *data++;
-				((DataFileHeader*)_textBuf)->s_y = *data++;
+				((DataFileHeader *)_textBuf)->s_x = *data++;
+				((DataFileHeader *)_textBuf)->s_y = *data++;
 				showTextBuf();
 				break;
 			case IC_REMOVE_TEXT:
@@ -858,10 +858,10 @@ bool Intro::commandFlirt(uint16 *&data) {
 }
 
 void Intro::showTextBuf() {
-	uint16 x = ((DataFileHeader*)_textBuf)->s_x;
-	uint16 y = ((DataFileHeader*)_textBuf)->s_y;
-	uint16 width = ((DataFileHeader*)_textBuf)->s_width;
-	uint16 height = ((DataFileHeader*)_textBuf)->s_height;
+	uint16 x = ((DataFileHeader *)_textBuf)->s_x;
+	uint16 y = ((DataFileHeader *)_textBuf)->s_y;
+	uint16 width = ((DataFileHeader *)_textBuf)->s_width;
+	uint16 height = ((DataFileHeader *)_textBuf)->s_height;
 	uint8 *screenBuf = _skyScreen->giveCurrent() + y * GAME_SCREEN_WIDTH + x;
 	memcpy(_saveBuf, _textBuf, sizeof(DataFileHeader));
 	uint8 *saveBuf = _saveBuf + sizeof(DataFileHeader);
@@ -880,10 +880,10 @@ void Intro::showTextBuf() {
 }
 
 void Intro::restoreScreen() {
-	uint16 x = ((DataFileHeader*)_saveBuf)->s_x;
-	uint16 y = ((DataFileHeader*)_saveBuf)->s_y;
-	uint16 width = ((DataFileHeader*)_saveBuf)->s_width;
-	uint16 height = ((DataFileHeader*)_saveBuf)->s_height;
+	uint16 x = ((DataFileHeader *)_saveBuf)->s_x;
+	uint16 y = ((DataFileHeader *)_saveBuf)->s_y;
+	uint16 width = ((DataFileHeader *)_saveBuf)->s_width;
+	uint16 height = ((DataFileHeader *)_saveBuf)->s_height;
 	uint8 *screenBuf = _skyScreen->giveCurrent() + y * GAME_SCREEN_WIDTH + x;
 	uint8 *saveBuf = _saveBuf + sizeof(DataFileHeader);
 	for (uint16 cnt = 0; cnt < height; cnt++) {
diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp
index 18fb4f7e82..e92e768272 100644
--- a/engines/sky/logic.cpp
+++ b/engines/sky/logic.cpp
@@ -382,8 +382,8 @@ void Logic::mainAnim() {
 		}
 	};
 
-	uint16 animId = *(uint16*)_skyCompact->getCompactElem(_compact, C_ANIM_UP + _compact->megaSet + dir * 4);
-	uint16 *animList = (uint16*)_skyCompact->fetchCpt(animId);
+	uint16 animId = *(uint16 *)_skyCompact->getCompactElem(_compact, C_ANIM_UP + _compact->megaSet + dir * 4);
+	uint16 *animList = (uint16 *)_skyCompact->fetchCpt(animId);
 
 	uint16 arAnimIndex = _compact->arAnimIndex;
 	if (!animList[arAnimIndex / 2]) {
@@ -400,7 +400,7 @@ void Logic::mainAnim() {
 }
 
 void Logic::arTurn() {
-	uint16 *turnData = (uint16*)_skyCompact->fetchCpt(_compact->turnProgId) + _compact->turnProgPos;
+	uint16 *turnData = (uint16 *)_skyCompact->fetchCpt(_compact->turnProgId) + _compact->turnProgPos;
 	_compact->frame = *turnData++;
 	_compact->turnProgPos++;
 
@@ -453,7 +453,7 @@ void Logic::anim() {
 }
 
 void Logic::turn() {
-	uint16 *turnData = (uint16*)_skyCompact->fetchCpt(_compact->turnProgId) + _compact->turnProgPos;
+	uint16 *turnData = (uint16 *)_skyCompact->fetchCpt(_compact->turnProgId) + _compact->turnProgPos;
 	if (*turnData) {
 		_compact->frame = *turnData;
 		_compact->turnProgPos++;
@@ -1425,12 +1425,12 @@ uint16 Logic::script(uint16 scriptNo, uint16 offset) {
 
 bool Logic::fnCacheChip(uint32 a, uint32 b, uint32 c) {
 	_skySound->fnStopFx();
-	_skyDisk->fnCacheChip((uint16*)_skyCompact->fetchCpt((uint16)a));
+	_skyDisk->fnCacheChip((uint16 *)_skyCompact->fetchCpt((uint16)a));
 	return true;
 }
 
 bool Logic::fnCacheFast(uint32 a, uint32 b, uint32 c) {
-	_skyDisk->fnCacheFast((uint16*)_skyCompact->fetchCpt((uint16)a));
+	_skyDisk->fnCacheFast((uint16 *)_skyCompact->fetchCpt((uint16)a));
 	return true;
 }
 
@@ -1577,7 +1577,7 @@ bool Logic::fnGetTo(uint32 targetPlaceId, uint32 mode, uint32 c) {
 		warning("can't find _compact's getToTable. Place compact is NULL");
 		return false;
 	}
-	uint16 *getToTable = (uint16*)_skyCompact->fetchCpt(cpt->getToTableId);
+	uint16 *getToTable = (uint16 *)_skyCompact->fetchCpt(cpt->getToTableId);
 	if (!getToTable) {
 		warning("Place compact's getToTable is NULL");
 		return false;
@@ -1596,7 +1596,7 @@ bool Logic::fnGetTo(uint32 targetPlaceId, uint32 mode, uint32 c) {
 bool Logic::fnSetToStand(uint32 a, uint32 b, uint32 c) {
 	_compact->mood = 1; // high level stood still
 
-	_compact->grafixProgId = *(uint16*)_skyCompact->getCompactElem(_compact, C_STAND_UP + _compact->megaSet + _compact->dir * 4);
+	_compact->grafixProgId = *(uint16 *)_skyCompact->getCompactElem(_compact, C_STAND_UP + _compact->megaSet + _compact->dir * 4);
 	_compact->grafixProgPos = 0;
 
 	uint16 *standList = _skyCompact->getGrafixPtr(_compact);
@@ -2158,8 +2158,8 @@ bool Logic::fnSetMegaSet(uint32 mega, uint32 setNo, uint32 c) {
 
 bool Logic::fnMoveItems(uint32 listNo, uint32 screenNo, uint32 c) {
 	// Move a list of id's to another screen
-	uint16 *p = (uint16*)_skyCompact->fetchCpt(CPT_MOVE_LIST);
-	p = (uint16*)_skyCompact->fetchCpt(p[listNo]);
+	uint16 *p = (uint16 *)_skyCompact->fetchCpt(CPT_MOVE_LIST);
+	p = (uint16 *)_skyCompact->fetchCpt(p[listNo]);
 	for (int i = 0; i < 2; i++) {
 		if (!*p)
 			return true;
@@ -2528,7 +2528,7 @@ void Logic::stdSpeak(Compact *target, uint32 textNum, uint32 animNum, uint32 bas
 	animNum += target->megaSet / NEXT_MEGA_SET;
 	animNum &= 0xFF;
 
-	uint16 *talkTable = (uint16*)_skyCompact->fetchCpt(CPT_TALK_TABLE_LIST);
+	uint16 *talkTable = (uint16 *)_skyCompact->fetchCpt(CPT_TALK_TABLE_LIST);
 	target->grafixProgId = talkTable[animNum];
 	target->grafixProgPos = 0;
 	uint16 *animPtr = _skyCompact->getGrafixPtr(target);
diff --git a/engines/sky/mouse.cpp b/engines/sky/mouse.cpp
index 98f942889e..74a92c8f00 100644
--- a/engines/sky/mouse.cpp
+++ b/engines/sky/mouse.cpp
@@ -319,7 +319,7 @@ void Mouse::fnOpenCloseHand(bool open) {
 	if (open)
 		cursor++;
 
-	uint32 size = ((DataFileHeader*)_objectMouseData)->s_sp_size;
+	uint32 size = ((DataFileHeader *)_objectMouseData)->s_sp_size;
 	uint8 *srcData;
 	uint8 *destData;
 
diff --git a/engines/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp
index 896b58aa22..99509554c7 100644
--- a/engines/sky/music/adlibchannel.cpp
+++ b/engines/sky/music/adlibchannel.cpp
@@ -49,32 +49,32 @@ AdLibChannel::AdLibChannel(FM_OPL *opl, uint8 *pMusicData, uint16 startOfData) {
 
 	if (SkyEngine::_systemVars.gameVersion == 109) {
 		//instrumentDataLoc = (_musicData[0x11D0] << 8) | _musicData[0x11CF];
-		//_frequenceTable = (uint16*)(_musicData + 0x835);
+		//_frequenceTable = (uint16 *)(_musicData + 0x835);
 		//_registerTable = _musicData + 0xE35;
 		//_opOutputTable = _musicData + 0xE47;
 		//_adlibRegMirror = _musicData + 0xF4A;
 
 		instrumentDataLoc = READ_LE_UINT16(_musicData + 0x1204);
-		_frequenceTable = (uint16*)(_musicData + 0x868);
+		_frequenceTable = (uint16 *)(_musicData + 0x868);
 		_registerTable = _musicData + 0xE68;
 		_opOutputTable = _musicData + 0xE7A;
 		_adlibRegMirror = _musicData + 0xF7D;
 	} else if (SkyEngine::_systemVars.gameVersion == 267) {
 		instrumentDataLoc = READ_LE_UINT16(_musicData + 0x11FB);
-		_frequenceTable = (uint16*)(_musicData + 0x7F4);
+		_frequenceTable = (uint16 *)(_musicData + 0x7F4);
 		_registerTable = _musicData + 0xDF4;
 		_opOutputTable = _musicData + 0xE06;
 		_adlibRegMirror = _musicData + 0xF55;
 	} else {
 		instrumentDataLoc = READ_LE_UINT16(_musicData + 0x1205);
-		_frequenceTable = (uint16*)(_musicData + 0x7FE);
+		_frequenceTable = (uint16 *)(_musicData + 0x7FE);
 		_registerTable = _musicData + 0xDFE;
 		_opOutputTable = _musicData + 0xE10;
 		_adlibRegMirror = _musicData + 0xF5F;
 	}
 
 	_instrumentMap = _musicData+instrumentDataLoc;
-	_instruments = (InstrumentStruct*)(_instrumentMap+0x80);
+	_instruments = (InstrumentStruct *)(_instrumentMap+0x80);
 }
 
 AdLibChannel::~AdLibChannel() {
diff --git a/engines/sky/music/gmmusic.cpp b/engines/sky/music/gmmusic.cpp
index 85240ea82e..84f6a654d0 100644
--- a/engines/sky/music/gmmusic.cpp
+++ b/engines/sky/music/gmmusic.cpp
@@ -31,7 +31,7 @@
 namespace Sky {
 
 void GmMusic::passTimerFunc(void *param) {
-	((GmMusic*)param)->timerCall();
+	((GmMusic *)param)->timerCall();
 }
 
 GmMusic::GmMusic(MidiDriver *pMidiDrv, Audio::Mixer *pMixer, Disk *pDisk) : MusicBase(pMixer, pDisk) {
diff --git a/engines/sky/music/mt32music.cpp b/engines/sky/music/mt32music.cpp
index 18ebf123ff..a3fdd42713 100644
--- a/engines/sky/music/mt32music.cpp
+++ b/engines/sky/music/mt32music.cpp
@@ -31,7 +31,7 @@
 namespace Sky {
 
 void MT32Music::passTimerFunc(void *param) {
-	((MT32Music*)param)->timerCall();
+	((MT32Music *)param)->timerCall();
 }
 
 MT32Music::MT32Music(MidiDriver *pMidiDrv, Audio::Mixer *pMixer, Disk *pDisk) : MusicBase(pMixer, pDisk) {
diff --git a/engines/sky/text.cpp b/engines/sky/text.cpp
index 3e119b3b20..38a01116fe 100644
--- a/engines/sky/text.cpp
+++ b/engines/sky/text.cpp
@@ -136,7 +136,7 @@ void Text::getText(uint32 textNr) { //load text #"textNr" into textBuffer
 	textNr &= 0x1F;
 
 	if (blockNr) {
-		uint16 *blockPtr = (uint16*)(textDataPtr + 4);
+		uint16 *blockPtr = (uint16 *)(textDataPtr + 4);
 		uint32 nr32MsgBlocks = blockNr >> 5;
 
 		do {
@@ -298,7 +298,7 @@ DisplayedText Text::displayText(char *textPtr, uint8 *dest, bool center, uint16
 	uint32 numBytes = (dtLineSize * numLines) + sizeof(DataFileHeader) + 4;
 
 	if (!dest)
-		dest = (uint8*)malloc(numBytes);
+		dest = (uint8 *)malloc(numBytes);
 
 	// clear text sprite buffer
 	memset(dest + sizeof(DataFileHeader), 0, numBytes - sizeof(DataFileHeader));
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index 1bb08fd36f..40a4021a5c 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -115,7 +115,7 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base,
 		fh->idxLen = fh->file.readUint32LE();
 		fh->file.seek(entrySize * 4);
 
-		fh->idxTab = (uint32*)malloc(fh->idxLen * 3 * sizeof(uint32));
+		fh->idxTab = (uint32 *)malloc(fh->idxLen * 3 * sizeof(uint32));
 		for (uint32 cnt = 0; cnt < fh->idxLen; cnt++) {
 			fh->idxTab[cnt * 3 + 0] = fh->file.readUint32LE();
 			fh->idxTab[cnt * 3 + 1] = fh->file.readUint32LE();
diff --git a/engines/sword25/util/lua/luaconf.h b/engines/sword25/util/lua/luaconf.h
index f5affe9fd7..38ff9e1320 100644
--- a/engines/sword25/util/lua/luaconf.h
+++ b/engines/sword25/util/lua/luaconf.h
@@ -643,7 +643,7 @@ union luai_Cast { double l_d; long l_l; };
 ** CHANGE it if you have a way to implement it in your system.
 */
 #define lua_popen(L,c,m)	((void)((void)c, m),  \
-		luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
+		luaL_error(L, LUA_QL("popen") " not supported"), (FILE *)0)
 #define lua_pclose(L,file)		((void)((void)L, file), 0)
 
 /*
diff --git a/engines/sword25/util/pluto/pluto.cpp b/engines/sword25/util/pluto/pluto.cpp
index 957f5af795..d645e5ed2a 100644
--- a/engines/sword25/util/pluto/pluto.cpp
+++ b/engines/sword25/util/pluto/pluto.cpp
@@ -159,7 +159,7 @@ static int persistspecialobject(PersistInfo *pi, int defaction)
 	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, (void *)pi->writer);
 	lua_pushlightuserdata(pi->L, pi->ud);
 					/* perms reftbl ... obj mt __persist obj ud */
 	lua_call(pi->L, 3, 1);
@@ -663,7 +663,7 @@ static void persist(PersistInfo *pi)
 	}
 	lua_pushvalue(pi->L, -1);
 					/* perms reftbl ... obj obj */
-	lua_pushlightuserdata(pi->L, (void*)(++(pi->counter)));
+	lua_pushlightuserdata(pi->L, (void *)(++(pi->counter)));
 					/* perms reftbl ... obj obj ref */
 	lua_rawset(pi->L, 2);
 					/* perms reftbl ... obj */
@@ -854,7 +854,7 @@ static void registerobject(int ref, UnpersistInfo *upi)
 {
 					/* perms reftbl ... obj */
 	lua_checkstack(upi->L, 2);
-	lua_pushlightuserdata(upi->L, (void*)ref);
+	lua_pushlightuserdata(upi->L, (void *)ref);
 					/* perms reftbl ... obj ref */
 	lua_pushvalue(upi->L, -2);
 					/* perms reftbl ... obj ref obj */
@@ -989,7 +989,7 @@ static void unpersisttable(int ref, UnpersistInfo *upi)
 static UpVal *makeupval(lua_State *L, int stackpos)
 {
 	UpVal *uv = pdep_new(L, UpVal);
-	pdep_link(L, (GCObject*)uv, LUA_TUPVAL);
+	pdep_link(L, (GCObject *)uv, LUA_TUPVAL);
 	uv->tt = LUA_TUPVAL;
 	uv->v = &uv->u.value;
 	uv->u.l.prev = NULL;
@@ -1025,8 +1025,8 @@ static Proto *makefakeproto(lua_State *L, lu_byte nups)
 static void boxupval_start(lua_State *L)
 {
 	LClosure *lcl;
-	lcl = (LClosure*)pdep_newLclosure(L, 1, hvalue(&L->l_gt));
-	pushclosure(L, (Closure*)lcl);
+	lcl = (LClosure *)pdep_newLclosure(L, 1, hvalue(&L->l_gt));
+	pushclosure(L, (Closure *)lcl);
 					/* ... func */
 	lcl->p = makefakeproto(L, 1);
 
@@ -1053,7 +1053,7 @@ static void unboxupval(lua_State *L)
 	LClosure *lcl;
 	UpVal *uv;
 
-	lcl = (LClosure*)clvalue(getobject(L, -1));
+	lcl = (LClosure *)clvalue(getobject(L, -1));
 	uv = lcl->upvals[0];
 	lua_pop(L, 1);
 					/* ... */
@@ -1071,8 +1071,8 @@ static void unpersistfunction(int ref, UnpersistInfo *upi)
 
 	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);
+	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 */
@@ -1393,9 +1393,9 @@ static void unpersistthread(int ref, UnpersistInfo *upi)
 
 			verify(LIF(Z,read)(&upi->zio, &stackpos, sizeof(size_t)) == 0);
 			uv->v = L2->stack + stackpos;
-			gcunlink(upi->L, (GCObject*)uv);
+			gcunlink(upi->L, (GCObject *)uv);
 			uv->marked = luaC_white(g);
-			*nextslot = (GCObject*)uv;
+			*nextslot = (GCObject *)uv;
 			nextslot = &uv->next;
 			uv->u.l.prev = &G(L2)->uvhead;
 			uv->u.l.next = G(L2)->uvhead.u.l.next;
@@ -1482,7 +1482,7 @@ static int inreftable(lua_State *L, int ref)
 	int res;
 	lua_checkstack(L, 1);
 					/* perms reftbl ... */
-	lua_pushlightuserdata(L, (void*)ref);
+	lua_pushlightuserdata(L, (void *)ref);
 					/* perms reftbl ... ref */
 	lua_gettable(L, 2);
 					/* perms reftbl ... obj? */
@@ -1571,7 +1571,7 @@ static void unpersist(UnpersistInfo *upi)
 			lua_pushnil(upi->L);
 					/* perms reftbl ... nil */
 		} else {
-			lua_pushlightuserdata(upi->L, (void*)ref);
+			lua_pushlightuserdata(upi->L, (void *)ref);
 					/* perms reftbl ... ref */
 			lua_gettable(upi->L, 2);
 					/* perms reftbl ... obj? */
diff --git a/engines/tinsel/graphics.cpp b/engines/tinsel/graphics.cpp
index 545310185c..4f3cc36994 100644
--- a/engines/tinsel/graphics.cpp
+++ b/engines/tinsel/graphics.cpp
@@ -67,7 +67,7 @@ uint8* psxPJCRLEUnwinder(uint16 imageWidth, uint16 imageHeight, uint8 *srcIdx) {
 	// Calculate needed index numbers, align width and height not next multiple of four
 	imageWidth = (imageWidth % 4) ? ((imageWidth / 4) + 1) * 4 : imageWidth;
 	imageHeight = (imageHeight % 4) ? ((imageHeight / 4) + 1) * 4 : imageHeight;
-	destinationBuffer = (uint8*)malloc((imageWidth * imageHeight) / 8);
+	destinationBuffer = (uint8 *)malloc((imageWidth * imageHeight) / 8);
 	dstIdx = destinationBuffer;
 	remainingBlocks = (imageWidth * imageHeight) / 16;
 
diff --git a/engines/tinsel/heapmem.cpp b/engines/tinsel/heapmem.cpp
index 026dc9457e..819493bda1 100644
--- a/engines/tinsel/heapmem.cpp
+++ b/engines/tinsel/heapmem.cpp
@@ -234,8 +234,8 @@ static MEM_NODE *MemoryAlloc(long size) {
 	MEM_NODE *pHeap = &heapSentinel;
 
 #ifdef SCUMM_NEED_ALIGNMENT
-	const int alignPadding = sizeof(void*) - 1;
-	size = (size + alignPadding) & ~alignPadding;	//round up to nearest multiple of sizeof(void*), this ensures the addresses that are returned are alignment-safe.
+	const int alignPadding = sizeof(void *) - 1;
+	size = (size + alignPadding) & ~alignPadding;	//round up to nearest multiple of sizeof(void *), this ensures the addresses that are returned are alignment-safe.
 #endif
 
 	// compact the heap to make up room for 'size' bytes, if necessary
@@ -310,8 +310,8 @@ MEM_NODE *MemoryNoAlloc() {
 MEM_NODE *MemoryAllocFixed(long size) {
 
 #ifdef SCUMM_NEED_ALIGNMENT
-	const int alignPadding = sizeof(void*) - 1;
-	size = (size + alignPadding) & ~alignPadding;	//round up to nearest multiple of sizeof(void*), this ensures the addresses that are returned are alignment-safe.
+	const int alignPadding = sizeof(void *) - 1;
+	size = (size + alignPadding) & ~alignPadding;	//round up to nearest multiple of sizeof(void *), this ensures the addresses that are returned are alignment-safe.
 #endif
 
 	// Search for a free entry in s_fixedMnodesList
diff --git a/engines/toltecs/menu.cpp b/engines/toltecs/menu.cpp
index 7e7349802d..172ec0a565 100644
--- a/engines/toltecs/menu.cpp
+++ b/engines/toltecs/menu.cpp
@@ -406,7 +406,7 @@ void MenuSystem::clickItem(ItemID id) {
 }
 
 void MenuSystem::restoreRect(int x, int y, int w, int h) {
-	byte *src = (byte*)_background->getBasePtr(x, y);
+	byte *src = (byte *)_background->getBasePtr(x, y);
 	byte *dst = _vm->_screen->_frontScreen + x + y * 640;
 	while (h--) {
 		memcpy(dst, src, w);
@@ -416,7 +416,7 @@ void MenuSystem::restoreRect(int x, int y, int w, int h) {
 }
 
 void MenuSystem::shadeRect(int x, int y, int w, int h, byte color1, byte color2) {
-	byte *src = (byte*)_background->getBasePtr(x, y);
+	byte *src = (byte *)_background->getBasePtr(x, y);
 	for (int xc = 0; xc < w; xc++) {
 		src[xc] = color2;
 		src[xc + h * 640] = color1;
diff --git a/engines/toltecs/movie.cpp b/engines/toltecs/movie.cpp
index 28021950a7..76d42ebf0a 100644
--- a/engines/toltecs/movie.cpp
+++ b/engines/toltecs/movie.cpp
@@ -215,7 +215,7 @@ void MoviePlayer::fetchAudioChunks() {
 		byte chunkType = _vm->_arc->readByte();
 		uint32 chunkSize = _vm->_arc->readUint32LE();
 		if (chunkType == 4) {
-			byte *chunkBuffer = (byte*)malloc(chunkSize);
+			byte *chunkBuffer = (byte *)malloc(chunkSize);
 			_vm->_arc->read(chunkBuffer, chunkSize);
 			_audioStream->queueBuffer(chunkBuffer, chunkSize, DisposeAfterUse::YES, Audio::FLAG_UNSIGNED);
 			chunkBuffer = NULL;
diff --git a/engines/toltecs/screen.cpp b/engines/toltecs/screen.cpp
index d66ed18d8c..b781490b69 100644
--- a/engines/toltecs/screen.cpp
+++ b/engines/toltecs/screen.cpp
@@ -658,7 +658,7 @@ void Screen::drawSurface(int16 x, int16 y, Graphics::Surface *surface) {
 	int16 skipX = 0;
 	int16 width = surface->w;
 	int16 height = surface->h;
-	byte *surfacePixels = (byte*)surface->getBasePtr(0, 0);
+	byte *surfacePixels = (byte *)surface->getBasePtr(0, 0);
 	byte *frontScreen;
 
 	// Not on screen, skip
diff --git a/engines/toltecs/script.cpp b/engines/toltecs/script.cpp
index 107f4ea11e..9683831980 100644
--- a/engines/toltecs/script.cpp
+++ b/engines/toltecs/script.cpp
@@ -786,7 +786,7 @@ void ScriptInterpreter::sfGetRandomNumber() {
 }
 
 void ScriptInterpreter::sfDrawGuiTextMulti() {
-	_vm->_screen->drawGuiTextMulti((byte*)localPtr(arg16(3)));
+	_vm->_screen->drawGuiTextMulti((byte *)localPtr(arg16(3)));
 }
 
 void ScriptInterpreter::sfUpdateVerbLine() {
@@ -907,11 +907,11 @@ void ScriptInterpreter::sfDrawGuiImage() {
 }
 
 void ScriptInterpreter::sfAddAnimatedSpriteNoLoop() {
-	_vm->_screen->addAnimatedSprite(arg16(5), arg16(3), arg16(7), (byte*)localPtr(0), (int16*)localPtr(arg16(9)), false, 2);
+	_vm->_screen->addAnimatedSprite(arg16(5), arg16(3), arg16(7), (byte *)localPtr(0), (int16 *)localPtr(arg16(9)), false, 2);
 }
 
 void ScriptInterpreter::sfAddAnimatedSprite() {
-	_vm->_screen->addAnimatedSprite(arg16(5), arg16(3), arg16(7), (byte*)localPtr(0), (int16*)localPtr(arg16(9)), true, 2);
+	_vm->_screen->addAnimatedSprite(arg16(5), arg16(3), arg16(7), (byte *)localPtr(0), (int16 *)localPtr(arg16(9)), true, 2);
 }
 
 void ScriptInterpreter::sfAddStaticSprite() {
@@ -919,11 +919,11 @@ void ScriptInterpreter::sfAddStaticSprite() {
 }
 
 void ScriptInterpreter::sfAddAnimatedSpriteScaled() {
-	_vm->_screen->addAnimatedSprite(arg16(5), arg16(3), arg16(7), (byte*)localPtr(0), (int16*)localPtr(arg16(9)), true, 1);
+	_vm->_screen->addAnimatedSprite(arg16(5), arg16(3), arg16(7), (byte *)localPtr(0), (int16 *)localPtr(arg16(9)), true, 1);
 }
 
 void ScriptInterpreter::sfFindPath() {
-	_vm->_segmap->findPath((int16*)(getSlotData(arg16(13)) + arg16(11)), arg16(9), arg16(7), arg16(5), arg16(3));
+	_vm->_segmap->findPath((int16 *)(getSlotData(arg16(13)) + arg16(11)), arg16(9), arg16(7), arg16(5), arg16(3));
 }
 
 void ScriptInterpreter::sfWalk() {
diff --git a/engines/toltecs/segmap.cpp b/engines/toltecs/segmap.cpp
index 10e5f56096..f7d806c67b 100644
--- a/engines/toltecs/segmap.cpp
+++ b/engines/toltecs/segmap.cpp
@@ -269,7 +269,7 @@ struct LineData {
 };
 
 void plotProc(int x, int y, int color, void *data) {
-	LineData *ld = (LineData*)data;
+	LineData *ld = (LineData *)data;
 	ld->surf[x + y * ld->pitch] = color;
 }
 
@@ -373,7 +373,7 @@ void SegmentMap::loadSegmapMaskRectSurface(byte *maskData, SegmapMaskRect &maskR
 	maskRect.surface->create(maskRect.width, maskRect.height, Graphics::PixelFormat::createFormatCLUT8());
 
 	byte *backScreen = _vm->_screen->_backScreen + maskRect.x + (maskRect.y * _vm->_sceneWidth);
-	byte *dest = (byte*)maskRect.surface->getBasePtr(0, 0);
+	byte *dest = (byte *)maskRect.surface->getBasePtr(0, 0);
 
 	for (int16 h = 0; h < maskRect.height; h++) {
 		int16 w = maskRect.width;
diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp
index b9adfa7eeb..77822ab078 100644
--- a/engines/toon/audio.cpp
+++ b/engines/toon/audio.cpp
@@ -514,7 +514,7 @@ Common::SeekableReadStream *AudioStreamPackage::getStream(int32 id, bool ownMemo
 	int32 size = 0;
 	getInfo(id, &offset, &size);
 	if (ownMemory) {
-		byte *memory = (byte*)malloc(size);
+		byte *memory = (byte *)malloc(size);
 		_file->seek(offset);
 		_file->read(memory, size);
 		return new Common::MemoryReadStream(memory, size, DisposeAfterUse::YES);
diff --git a/engines/toon/character.cpp b/engines/toon/character.cpp
index 715bd33433..0e5189957b 100644
--- a/engines/toon/character.cpp
+++ b/engines/toon/character.cpp
@@ -997,7 +997,7 @@ bool Character::loadShadowAnimation(const Common::String &animName) {
 
 void Character::plotPath(Graphics::Surface& surface) {
 	for (int i = 0; i < _currentPathNodeCount; i++) {
-		 *(byte*)surface.getBasePtr(_currentPathX[i], _currentPathY[i]) = ( i < _currentPathNode);
+		 *(byte *)surface.getBasePtr(_currentPathX[i], _currentPathY[i]) = ( i < _currentPathNode);
 	}
 }
 
diff --git a/engines/toon/script_func.h b/engines/toon/script_func.h
index ef1cb59f47..e22c4b34fa 100644
--- a/engines/toon/script_func.h
+++ b/engines/toon/script_func.h
@@ -39,7 +39,7 @@ public:
 	Common::Array<const OpcodeV2 *> _opcodes;
 	ToonEngine *_vm;
 
-#define SYSFUNC(x)  int32 x(EMCState*)
+#define SYSFUNC(x)  int32 x(EMCState *)
 	SYSFUNC(sys_Cmd_Dummy);
 	SYSFUNC(sys_Cmd_Change_Actor_X_And_Y);
 	SYSFUNC(sys_Cmd_Init_Talking_Character);
-- 
cgit v1.2.3


From ad78ea6b506c0c97d6587a26a254ff912bcf4fa1 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Wed, 15 Feb 2012 16:29:03 +0000
Subject: COMPOSER: Add Detection Entry for Liam Finds a Story Mac.

Parameters from bug #3463201 - "COMPOSER: Liam Finds a Story (Mac) Not
Detected".
---
 engines/composer/detection.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'engines')

diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index ac7eafd510..9eb49612b3 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -136,6 +136,24 @@ static const ComposerGameDescription gameDescriptions[] = {
 		GType_ComposerV2
 	},
 
+	// Liam Finds a Story Mac - from bug #3463201
+	{
+		{
+			"liam",
+			0,
+			{
+				{"liam finds a story.ini", 0, "85a1ca6002ded8572920bbdb73d35b0a", -1},
+				{"page99.rsc", 0, "11b0a19c6b6d73c39e2bd289a457c1dc", -1},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_ComposerV2
+	},
+
 	// from Liam Finds a Story CD
 	{
 		{
@@ -316,6 +334,7 @@ using namespace Composer;
 // we match from data too, to stop detection from a non-top-level directory
 const static char *directoryGlobs[] = {
 	"data",
+	"liam",
 	"programs",
 	"princess",
 	"sleepcub",
-- 
cgit v1.2.3


From 160fd3a17953f33de881449577059d97a9c6b2f8 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Wed, 15 Feb 2012 17:06:16 +0000
Subject: COMPOSER: Add Detection Entries for 3 V1 Magic Tales Mac Variants.

Parameters given in bug #3466402 - "COMPOSER: Multiple Mac games not
detected".
---
 engines/composer/detection.cpp | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'engines')

diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index 9eb49612b3..835f3c5683 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -81,6 +81,20 @@ static const ComposerGameDescription gameDescriptions[] = {
 		GType_ComposerV1
 	},
 
+	// Magic Tales: Baba Yaga and the Magic Geese Mac - from bug #3466402
+	{
+		{
+			"babayaga",
+			"",
+			AD_ENTRY1("Baba Yaga", "ae3a4445f42fe10253da7ee4ea0d37"),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_ComposerV1
+	},
+
 	// Magic Tales: Imo and the King - from bug #3485018
 	{
 		{
@@ -95,6 +109,20 @@ static const ComposerGameDescription gameDescriptions[] = {
 		GType_ComposerV1
 	},
 
+	// Magic Tales: Imo and the King Mac - from bug #3466402
+	{
+		{
+			"imoking",
+			"",
+			AD_ENTRY1("imo and the king", "b0277885fec943b5f19409f35b33964c"),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_ComposerV1
+	},
+
 	// Magic Tales: The Little Samurai - from bug #3485018
 	{
 		{
@@ -109,6 +137,20 @@ static const ComposerGameDescription gameDescriptions[] = {
 		GType_ComposerV1
 	},
 
+	// Magic Tales: The Little Samurai Mac - from bug #3466402
+	{
+		{
+			"littlesamurai",
+			"",
+			AD_ENTRY1("The Little Samurai", "38121dd649c24e8676aa108cf35d44b5"),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_ComposerV1
+	},
+
 	// from Liam Finds a Story CD
 	{
 		{
-- 
cgit v1.2.3


From 8103d57d374a4061e7bd6f6f0e8d9e412eed0445 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Wed, 15 Feb 2012 17:36:58 +0000
Subject: MOHAWK: Add Detection Entries For 3 LB Mac Games.

Parameters taken from bug #3461368 - "MOHAWK: Living Books Mac
Versions Not Recognized".
---
 engines/mohawk/detection_tables.h | 50 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'engines')

diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 2b1b28716e..27b1192f09 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -1293,6 +1293,23 @@ static const MohawkGameDescription gameDescriptions[] = {
 		0
 	},
 
+	// Just Grandma and Me 2.0 Macintosh
+	// From aluff in bug #3461368
+	{
+		{
+			"grandma",
+			"v2.0",
+			AD_ENTRY1("BookOutline", "99fe5c8ace79f0542e6390bc3b58f25a"),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_UNSTABLE,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_LIVINGBOOKSV3,
+		0,
+		0
+	},
+
 	// Just Grandma and Me 1.0
 	// From scoriae
 	{
@@ -1782,6 +1799,23 @@ static const MohawkGameDescription gameDescriptions[] = {
 		0
 	},
 
+	// Arthur Birthday (English) Version 2.0 Macintosh
+	// From aluff in bug #3461368
+	{
+		{
+			"arthurbday",
+			"",
+			AD_ENTRY1("BookOutline", "8e4fddb5b761c8cf2a3b448dd38422be"),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_UNSTABLE,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_LIVINGBOOKSV3,
+		0,
+		0
+	},
+
 	{
 		{
 			"arthurbday",
@@ -2251,6 +2285,22 @@ static const MohawkGameDescription gameDescriptions[] = {
 		0
 	},
 
+	// From aluff in bug #3461368
+	{
+		{
+			"beardark",
+			"",
+			AD_ENTRY1("BookOutline", "b56746b3b2c062c8588bfb6b28e137c1"),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_LIVINGBOOKSV3,
+		0,
+		0
+	},
+
 	{
 		{
 			"arthurcomp",
-- 
cgit v1.2.3


From f9ae92186e07231ce6710e0e7b31485c9f18b0fc Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 15 Feb 2012 19:37:20 +0100
Subject: TSAGE: R2R - Rename inventory enums, fix isInventoryIcon()

---
 engines/tsage/events.h                          | 26 ++++---
 engines/tsage/ringworld2/ringworld2_logic.cpp   | 88 +++++++++++-----------
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 56 +++++++-------
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 98 ++++++++++++-------------
 engines/tsage/ringworld2/ringworld2_scenes2.cpp | 38 +++++-----
 engines/tsage/ringworld2/ringworld2_scenes3.cpp | 12 +--
 engines/tsage/user_interface.cpp                |  2 +-
 7 files changed, 162 insertions(+), 158 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index 2917256382..cf2d1a34ed 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -87,16 +87,20 @@ enum CursorType {
 
 	// Ringworld 2 objects
 	R2_OPTO_DISK = 1, R2_READER = 2, R2_NEGATOR_GUN = 3, R2_STEPPING_DISKS = 4, 
-	R2_ATTRACTOR_UNIT = 5, R2_SENSOR_PROBE = 6, 
-	R2_SONIC_STUNNER = 7, R2_8 = 8, R2_9 = 9, R2_10 = 10, R2_11 = 11, R2_AEROSOL = 12, R2_13 = 13, 
-	R2_OPTICAL_FIBRE = 14, R2_CLAMP = 15, R2_16 = 16, R2_17 = 17, R2_18 = 18, R2_19 = 19, 
-	R2_REBREATHER_TANK = 20, R2_21 = 21, R2_22 = 22, R2_23 = 23, R2_24 = 24, R2_25 = 25, 
-	R2_26 = 26, R2_27 = 27, R2_28 = 28,
-	R2_29 = 29, R2_30 = 30, R2_31 = 31, R2_32 = 32, R2_33 = 33, R2_34 = 34, R2_35 = 35,
-	R2_36 = 36, R2_37 = 37, R2_38 = 38, R2_39 = 39, R2_40 = 40, R2_41 = 41, R2_42 = 42,
-	R2_43 = 43, R2_44 = 44, R2_45 = 45, R2_46 = 46, R2_47 = 47, R2_48 = 48, R2_49 = 49,
-	R2_50 = 50, R2_51 = 51, R2_52 = 52,
-	R2_LAST_INVENT = 53,
+	R2_ATTRACTOR_UNIT = 5, R2_SENSOR_PROBE = 6, R2_SONIC_STUNNER = 7, 
+	R2_CABLE_HARNESS = 8, R2_COM_SCANNER = 9, R2_SPENT_POWER_CAPSULE = 10, 
+	R2_CHARGED_POWER_CAPSULE = 11, R2_AEROSOL = 12, R2_REMOTE_CONTROL = 13, 
+	R2_OPTICAL_FIBRE = 14, R2_CLAMP = 15, R2_ATTRACTOR_CABLE_HARNESS = 16, 
+	R2_FUEL_CELL = 17, R2_GYROSCOPE = 18, R2_AIRBAG = 19, R2_REBREATHER_TANK = 20, 
+	R2_RESERVE_REBREATHER_TANK = 21, R2_GUIDANCE_MODULE = 22, R2_THRUSTER_VALVE = 23,
+	R2_BALLOON_BACKPACK = 24, R2_RADAR_MECHANISM = 25, R2_JOYSTICK = 26, 
+	R2_IGNITOR = 27, R2_DIAGNOSTICS_DISPLAY = 28, R2_GLASS_DOME = 29, R2_WICK_LAMP = 30, 
+	R2_SCRITH_KEY = 31, R2_TANNER_MASK = 32, R2_PURE_GRAIN_ALCOHOL = 33, R2_SAPPHIRE_BLUE = 34, 
+	R2_ANCIENT_SCROLLS = 35, R2_FLUTE = 36, R2_GUNPOWDER = 37, R2_NONAME = 38, 
+	R2_COM_SCANNER_2 = 39, R2_SUPERCONDUCTOR_WIRE = 40, R2_PILLOW = 41, R2_FOOD_TRAY = 42,
+	R2_LASER_HACKSAW = 43, R2_PHOTON_STUNNER = 44, R2_BATTERY = 45, R2_SOAKED_FACEMASK = 46, 
+	R2_LIGHT_BULB = 47, R2_ALCOHOL_LAMP = 48, R2_ALCOHOL_LAMP_2 = 49, R2_ALCOHOL_LAMP_3 = 50, 
+	R2_BROKEN_DISPLAY = 51, R2_TOOLBOX = 52, R2_LAST_INVENT = 53,
 
 	// Ringworld 2 cursors
 	R2CURSORS_START = 0x8000, EXITCURSOR_N  = 0x8007,  EXITCURSOR_S  = 0x8008, EXITCURSOR_W = 0x8009, 
@@ -145,7 +149,7 @@ public:
 	Common::EventType type() { return _event.type; }
 	uint32 getFrameNumber() const { return _frameNumber; }
 	void delay(int numFrames);
-	bool isInventoryIcon() const { return _currentCursor < 256; }
+	bool isInventoryIcon() const { return (_currentCursor >= 0) && (_currentCursor < 256); }
 	void proc1() { warning("TODO: EventsClass::proc1"); }
 
 	virtual void listenerSynchronize(Serializer &s);
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 4f7578b1fa..074a3960cb 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -419,13 +419,13 @@ bool SceneExt::display(CursorType action, Event &event) {
 
 		R2_GLOBALS._sound4.play(45);
 		break;
-	case R2_9:
-	case R2_39:
+	case R2_COM_SCANNER:
+	case R2_COM_SCANNER_2:
 		R2_GLOBALS._sound3.play(44);
 		SceneItem::display2(2, action);
 		R2_GLOBALS._sound3.stop();
 		break;
-	case R2_44:
+	case R2_PHOTON_STUNNER:
 		R2_GLOBALS._sound3.play(99);
 		SceneItem::display2(2, action);
 		break;
@@ -859,51 +859,51 @@ void Ringworld2InvObjectList::reset() {
 	setObjectScene(R2_ATTRACTOR_UNIT, 400);
 	setObjectScene(R2_SENSOR_PROBE, 400);
 	setObjectScene(R2_SONIC_STUNNER, 500);
-	setObjectScene(R2_8, 700);
-	setObjectScene(R2_9, 800);
-	setObjectScene(R2_10, 100);
-	setObjectScene(R2_11, 400);
+	setObjectScene(R2_CABLE_HARNESS, 700);
+	setObjectScene(R2_COM_SCANNER, 800);
+	setObjectScene(R2_SPENT_POWER_CAPSULE, 100);
+	setObjectScene(R2_CHARGED_POWER_CAPSULE, 400);
 	setObjectScene(R2_AEROSOL, 500);
-	setObjectScene(R2_13, 1550);
+	setObjectScene(R2_REMOTE_CONTROL, 1550);
 	setObjectScene(R2_OPTICAL_FIBRE, 850);
 	setObjectScene(R2_CLAMP, 850);
-	setObjectScene(R2_16, 0);
-	setObjectScene(R2_17, 1550);
-	setObjectScene(R2_18, 1550);
-	setObjectScene(R2_19, 1550);
+	setObjectScene(R2_ATTRACTOR_CABLE_HARNESS, 0);
+	setObjectScene(R2_FUEL_CELL, 1550);
+	setObjectScene(R2_GYROSCOPE, 1550);
+	setObjectScene(R2_AIRBAG, 1550);
 	setObjectScene(R2_REBREATHER_TANK, 500);
-	setObjectScene(R2_21, 500);
-	setObjectScene(R2_22, 1550);
-	setObjectScene(R2_23, 1580);
-	setObjectScene(R2_24, 9999);
-	setObjectScene(R2_25, 1550);
-	setObjectScene(R2_26, 1550);
-	setObjectScene(R2_27, 1580);
-	setObjectScene(R2_28, 1550);
-	setObjectScene(R2_29, 2525);
-	setObjectScene(R2_30, 2440);
-	setObjectScene(R2_31, 2455);
-	setObjectScene(R2_32, 2535);
-	setObjectScene(R2_33, 2530);
-	setObjectScene(R2_34, 1950);
-	setObjectScene(R2_35, 1950);
-	setObjectScene(R2_36, 9999);
-	setObjectScene(R2_37, 2430);
-	setObjectScene(R2_38, 9999);
-	setObjectScene(R2_39, 2);
-	setObjectScene(R2_40, 9999);
-	setObjectScene(R2_41, 3150);
-	setObjectScene(R2_42, 0);
-	setObjectScene(R2_43, 3260);
-	setObjectScene(R2_44, 2);
-	setObjectScene(R2_45, 1550);
-	setObjectScene(R2_46, 0);
-	setObjectScene(R2_47, 3150);
-	setObjectScene(R2_48, 2435);
-	setObjectScene(R2_49, 2440);
-	setObjectScene(R2_50, 2435);
-	setObjectScene(R2_51, 1580);
-	setObjectScene(R2_52, 3260);
+	setObjectScene(R2_RESERVE_REBREATHER_TANK, 500);
+	setObjectScene(R2_GUIDANCE_MODULE, 1550);
+	setObjectScene(R2_THRUSTER_VALVE, 1580);
+	setObjectScene(R2_BALLOON_BACKPACK, 9999);
+	setObjectScene(R2_RADAR_MECHANISM, 1550);
+	setObjectScene(R2_JOYSTICK, 1550);
+	setObjectScene(R2_IGNITOR, 1580);
+	setObjectScene(R2_DIAGNOSTICS_DISPLAY, 1550);
+	setObjectScene(R2_GLASS_DOME, 2525);
+	setObjectScene(R2_WICK_LAMP, 2440);
+	setObjectScene(R2_SCRITH_KEY, 2455);
+	setObjectScene(R2_TANNER_MASK, 2535);
+	setObjectScene(R2_PURE_GRAIN_ALCOHOL, 2530);
+	setObjectScene(R2_SAPPHIRE_BLUE, 1950);
+	setObjectScene(R2_ANCIENT_SCROLLS, 1950);
+	setObjectScene(R2_FLUTE, 9999);
+	setObjectScene(R2_GUNPOWDER, 2430);
+	setObjectScene(R2_NONAME, 9999);
+	setObjectScene(R2_COM_SCANNER_2, 2);
+	setObjectScene(R2_SUPERCONDUCTOR_WIRE, 9999);
+	setObjectScene(R2_PILLOW, 3150);
+	setObjectScene(R2_FOOD_TRAY, 0);
+	setObjectScene(R2_LASER_HACKSAW, 3260);
+	setObjectScene(R2_PHOTON_STUNNER, 2);
+	setObjectScene(R2_BATTERY, 1550);
+	setObjectScene(R2_SOAKED_FACEMASK, 0);
+	setObjectScene(R2_LIGHT_BULB, 3150);
+	setObjectScene(R2_ALCOHOL_LAMP, 2435);
+	setObjectScene(R2_ALCOHOL_LAMP_2, 2440);
+	setObjectScene(R2_ALCOHOL_LAMP_3, 2435);
+	setObjectScene(R2_BROKEN_DISPLAY, 1580);
+	setObjectScene(R2_TOOLBOX, 3260);
 }
 
 void Ringworld2InvObjectList::setObjectScene(int objectNum, int sceneNumber) {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 2b2b5e71ef..c2b00b675e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -4884,7 +4884,7 @@ bool Scene500::Object3::startAction(CursorType action, Event &event) {
 		}
 		return true;
 
-	case R2_21:
+	case R2_RESERVE_REBREATHER_TANK:
 		SceneItem::display2(500, 53);
 		return true;
 
@@ -5442,7 +5442,7 @@ bool Scene600::Actor5::startAction(CursorType action, Event &event) {
 		return true;
 	}
 	
-	if ((R2_GLOBALS.getFlag(9)) && (R2_INVENTORY.getObjectScene(R2_9) == 600))
+	if ((R2_GLOBALS.getFlag(9)) && (R2_INVENTORY.getObjectScene(R2_COM_SCANNER) == 600))
 		SceneItem::display(600, 31, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 	else {
 		R2_GLOBALS._player.disableControl();
@@ -5457,7 +5457,7 @@ bool Scene600::Actor6::startAction(CursorType action, Event &event) {
 
 	if ((action < CURSOR_WALK) && (action >= R2CURSORS_START)) {
 		switch (action) {
-		case R2_9:
+		case R2_COM_SCANNER:
 			if (R2_GLOBALS.getFlag(6)) {
 				if (R2_GLOBALS.getFlag(8)) {
 					SceneItem::display(600, 29, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
@@ -5828,7 +5828,7 @@ bool Scene700::Item12::startAction(CursorType action, Event &event) {
 	Scene700 *scene = (Scene700 *)R2_GLOBALS._sceneManager._scene;
 
 	switch (action) {
-	case R2_8:
+	case R2_CABLE_HARNESS:
 		R2_GLOBALS._player.disableControl();
 		scene->_actor5.postInit();
 		scene->_actor5.setup(701, 3, 2);
@@ -5837,7 +5837,7 @@ bool Scene700::Item12::startAction(CursorType action, Event &event) {
 		scene->_actor5.hide();
 		scene->_sceneMode = 20;
 		break;
-	case R2_16:
+	case R2_ATTRACTOR_CABLE_HARNESS:
 		R2_GLOBALS._player.disableControl();
 		scene->_actor5.postInit();
 		scene->_actor5.setup(701, 2, 8);
@@ -5908,7 +5908,7 @@ bool Scene700::Actor5::startAction(CursorType action, Event &event) {
 
 	switch (action) {
 	case CURSOR_USE:
-		switch (R2_INVENTORY.getObjectScene(R2_8)) {
+		switch (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS)) {
 		case 0:
 			if ((_strip == 2) && (_frame == 1)) {
 				R2_GLOBALS._player.disableControl();
@@ -5937,7 +5937,7 @@ bool Scene700::Actor5::startAction(CursorType action, Event &event) {
 		break;
 	case R2_ATTRACTOR_UNIT:
 		R2_GLOBALS._player.disableControl();
-		if (R2_INVENTORY.getObjectScene(R2_8) == 700) {
+		if (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 700) {
 			scene->_sceneMode = 706;
 			scene->setAction(&scene->_sequenceManager, scene, 706, &R2_GLOBALS._player, &scene->_actor5, NULL);
 		} else {
@@ -6020,12 +6020,12 @@ void Scene700::postInit(SceneObjectList *OwnerList) {
 	_actor9.setPosition(Common::Point(324, 53));
 	_actor9.setDetails(700, 33, -1, 35, 1, (SceneItem *) NULL);
 
-	if ((R2_INVENTORY.getObjectScene(R2_8) != 1) && (R2_INVENTORY.getObjectScene(R2_16) != 1)) {
+	if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) != 1) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) != 1)) {
 		_actor5.postInit();
 		_actor5.fixPriority(10);
-		switch (R2_INVENTORY.getObjectScene(R2_16)) {
+		switch (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS)) {
 		case 0:
-			switch (R2_INVENTORY.getObjectScene(R2_8)) {
+			switch (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS)) {
 			case 0:
 				_actor5.setup(701, 3, 2);
 				_actor5.setPosition(Common::Point(243, 98));
@@ -6041,7 +6041,7 @@ void Scene700::postInit(SceneObjectList *OwnerList) {
 			}
 			break;
 		case 700:
-			switch (R2_INVENTORY.getObjectScene(R2_8)) {
+			switch (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS)) {
 			case 0:
 				if ((R2_GLOBALS._v565E5 != 0) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70))
 					_actor5.setup(701, 2, 1);
@@ -6191,10 +6191,10 @@ void Scene700::signal() {
 		R2_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper());
 		R2_GLOBALS._player._strip = 7;
 		if (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_UNIT) == 0) {
-			R2_INVENTORY.setObjectScene(R2_16, 1);
-			R2_INVENTORY.setObjectScene(R2_8, 0);
+			R2_INVENTORY.setObjectScene(R2_ATTRACTOR_CABLE_HARNESS, 1);
+			R2_INVENTORY.setObjectScene(R2_CABLE_HARNESS, 0);
 		} else {
-			R2_INVENTORY.setObjectScene(R2_8, 1);
+			R2_INVENTORY.setObjectScene(R2_CABLE_HARNESS, 1);
 		}
 		R2_GLOBALS._player.enableControl();
 		break;
@@ -6219,7 +6219,7 @@ void Scene700::signal() {
 		break;
 	case 17:
 		R2_INVENTORY.setObjectScene(R2_ATTRACTOR_UNIT, 0);
-		R2_INVENTORY.setObjectScene(R2_16, 700);
+		R2_INVENTORY.setObjectScene(R2_ATTRACTOR_CABLE_HARNESS, 700);
 		R2_GLOBALS._player.setVisage(11);
 		R2_GLOBALS._player.changeZoom(100);
 		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
@@ -6228,7 +6228,7 @@ void Scene700::signal() {
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 20:
-		R2_INVENTORY.setObjectScene(R2_8, 0);
+		R2_INVENTORY.setObjectScene(R2_CABLE_HARNESS, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 21:
@@ -6236,7 +6236,7 @@ void Scene700::signal() {
 		if ((R2_GLOBALS._v565E5 != 0) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70))
 			_actor5.animate(ANIM_MODE_6, NULL);
 
-		R2_INVENTORY.setObjectScene(R2_16, 700);
+		R2_INVENTORY.setObjectScene(R2_ATTRACTOR_CABLE_HARNESS, 700);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 701:
@@ -6254,7 +6254,7 @@ void Scene700::signal() {
 		if ((R2_GLOBALS._v565E5 != 0) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70))
 			_actor5.animate(ANIM_MODE_6, NULL);
 		R2_INVENTORY.setObjectScene(R2_ATTRACTOR_UNIT, 0);
-		R2_INVENTORY.setObjectScene(R2_16, 700);
+		R2_INVENTORY.setObjectScene(R2_ATTRACTOR_CABLE_HARNESS, 700);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 709:
@@ -6462,7 +6462,7 @@ void Scene800::postInit(SceneObjectList *OwnerList) {
 	_cabinet.setPosition(Common::Point(169, 79));
 	_cabinet.setDetails(800, 41, -1, -1, 1, (SceneItem *)NULL);
 
-	if (R2_INVENTORY.getObjectScene(R2_9) == 800) {
+	if (R2_INVENTORY.getObjectScene(R2_COM_SCANNER) == 800) {
 		_comScanner.postInit();
 		_comScanner.setup(801, 2, 1);
 		_comScanner.setPosition(Common::Point(174, 73));
@@ -6548,7 +6548,7 @@ void Scene800::signal() {
 	case 811:
 		R2_GLOBALS._player.enableControl();
 		_comScanner.remove();
-		R2_INVENTORY.setObjectScene(R2_9, 1);
+		R2_INVENTORY.setObjectScene(R2_COM_SCANNER, 1);
 		break;
 	default:
 		R2_GLOBALS._player.enableControl();
@@ -7152,7 +7152,7 @@ bool Scene900::Actor4::startAction(CursorType action, Event &event) {
 					scene->_aSound1.play(30);
 					setup(900, 3, 11);
 					R2_GLOBALS._v565E5 = 1;
-					if ((R2_INVENTORY.getObjectScene(R2_8) == 0) && (R2_INVENTORY.getObjectScene(R2_16 == 700)) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70) && (scene->_actor2._animateMode != ANIM_MODE_6)) {
+					if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS == 700)) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70) && (scene->_actor2._animateMode != ANIM_MODE_6)) {
 						scene->_actor2.animate(ANIM_MODE_6, NULL);
 					} else {
 						if (((scene->_actor3._percent * 49) / 100) + scene->_actor3._position.x == scene->_actor2._position.x) {
@@ -7172,9 +7172,9 @@ bool Scene900::Actor4::startAction(CursorType action, Event &event) {
 					setup(900, 3, 9);
 					R2_GLOBALS._v565E5 = 0;
 					
-					if ((R2_INVENTORY.getObjectScene(R2_8) == 0) && (R2_INVENTORY.getObjectScene(R2_16) == 700) && (scene->_actor2._frame < 8) && (scene->_actor2._animateMode != ANIM_MODE_5)) {
+					if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (scene->_actor2._frame < 8) && (scene->_actor2._animateMode != ANIM_MODE_5)) {
 							scene->_actor2.animate(ANIM_MODE_5, NULL);
-					} else if ((R2_INVENTORY.getObjectScene(R2_8) == 700) && (R2_INVENTORY.getObjectScene(R2_16) == 700) && (scene->_actor2._frame < 8)) {
+					} else if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 700) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (scene->_actor2._frame < 8)) {
 						R2_GLOBALS._v565E7 = 0;
 						if (scene->_actor2._animateMode != 5) {
 							R2_GLOBALS._player.disableControl();
@@ -7288,13 +7288,13 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 	_actor3._effect = 1;
 	_actor3.setDetails(900, 6, -1, 8, 1, (SceneItem *) NULL);
 
-	if ((R2_INVENTORY.getObjectScene(R2_8) != 1) && (R2_INVENTORY.getObjectScene(R2_16) != 1)) {
+	if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) != 1) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) != 1)) {
 		_actor2.postInit();
 		_actor2.setPosition(Common::Point(0, 0));
 		_actor2.fixPriority(1);
 		
-		if (R2_INVENTORY.getObjectScene(R2_8) == 0) {
-			if (R2_INVENTORY.getObjectScene(R2_16) != 700) {
+		if (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) {
+			if (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) != 700) {
 				_actor2.setup(901, 3, 2);
 			} else if ((R2_GLOBALS._v565E5 != 0) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70)) {
 				_actor2.setup(901, 2, 1);
@@ -7446,11 +7446,11 @@ void Scene900::dispatch() {
 	}
 
 	if (R2_GLOBALS._sceneObjects->contains(&_actor2)) {
-		if ((R2_GLOBALS._v565E5 != 0) && (R2_INVENTORY.getObjectScene(R2_8) == 0) && (R2_INVENTORY.getObjectScene(R2_16) == 700) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70)) {
+		if ((R2_GLOBALS._v565E5 != 0) && (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70)) {
 			if ((_actor2._frame > 1) && (_actor2._animateMode != ANIM_MODE_6))
 				_actor2.animate(ANIM_MODE_6, NULL);
 		} else {
-			if ((_actor2._frame < 8) && (_actor2._animateMode != ANIM_MODE_5) && (R2_GLOBALS._v565E7 == 0) && (R2_INVENTORY.getObjectScene(R2_8) == 0) && (R2_INVENTORY.getObjectScene(R2_16) == 700) && (_sceneMode != 4))
+			if ((_actor2._frame < 8) && (_actor2._animateMode != ANIM_MODE_5) && (R2_GLOBALS._v565E7 == 0) && (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (_sceneMode != 4))
 				_actor2.animate(ANIM_MODE_5, NULL);
 		}
 	}
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index cf8d214d6b..713d7dc7d0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -279,7 +279,7 @@ bool Scene1100::Actor17::startAction(CursorType action, Event &event) {
 		break;
 	case R2_SONIC_STUNNER:
 	// No break on purpose
-	case R2_44:
+	case R2_PHOTON_STUNNER:
 		if (_visage == 1105) {
 			R2_GLOBALS._player.disableControl();
 			if (R2_GLOBALS._player._characterIndex == 1) {
@@ -6690,7 +6690,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 			SceneItem::display(1550, 71, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 		return true;
 		break;
-	case R2_17:
+	case R2_FUEL_CELL:
 		scene->_field412 = 1;
 		if (_fieldA4 == 6) {
 			R2_GLOBALS._player.disableControl();
@@ -6704,7 +6704,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 		}
 		return SceneActor::startAction(action, event);
 		break;
-	case R2_18:
+	case R2_GYROSCOPE:
 		scene->_field412 = 1;
 		if (_fieldA4 == 3) {
 			R2_GLOBALS._player.disableControl();
@@ -6718,7 +6718,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 		}
 		return SceneActor::startAction(action, event);
 		break;
-	case R2_22:
+	case R2_GUIDANCE_MODULE:
 		scene->_field412 = 1;
 		if (_fieldA4 == 1) {
 			R2_GLOBALS._player.disableControl();
@@ -6732,7 +6732,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 		}
 		return SceneActor::startAction(action, event);
 		break;
-	case R2_23:
+	case R2_THRUSTER_VALVE:
 		scene->_field412 = 1;
 		if (_fieldA4 == 4) {
 			R2_GLOBALS._player.disableControl();
@@ -6743,7 +6743,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 		}
 		return SceneActor::startAction(action, event);
 		break;
-	case R2_25:
+	case R2_RADAR_MECHANISM:
 		scene->_field412 = 1;
 		if (_fieldA4 == 2) {
 			R2_GLOBALS._player.disableControl();
@@ -6757,7 +6757,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 		}
 		return SceneActor::startAction(action, event);
 		break;
-	case R2_27:
+	case R2_IGNITOR:
 		scene->_field412 = 1;
 		if (_fieldA4 == 5) {
 			R2_GLOBALS._player.disableControl();
@@ -6768,7 +6768,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 		}
 		return SceneActor::startAction(action, event);
 		break;
-	case R2_45:
+	case R2_BATTERY:
 		scene->_field412 = 1;
 		if (_fieldA4 == 7) {
 			R2_GLOBALS._player.disableControl();
@@ -6794,37 +6794,37 @@ void Scene1550::UnkObj15502::subA5CDF(int strip) {
 	setup(1517, _fieldA4, 1);
 	switch (_fieldA4 - 1) {
 	case 0:
-		if (R2_INVENTORY.getObjectScene(R2_22) == 0)
+		if (R2_INVENTORY.getObjectScene(R2_GUIDANCE_MODULE) == 0)
 			setFrame(5);
 		setPosition(Common::Point(287, 85));
 		break;
 	case 1:
-		if (R2_INVENTORY.getObjectScene(R2_25) == 0)
+		if (R2_INVENTORY.getObjectScene(R2_RADAR_MECHANISM) == 0)
 			setFrame(5);
 		setPosition(Common::Point(248, 100));
 		break;
 	case 2:
-		if (R2_INVENTORY.getObjectScene(R2_28) == 0)
+		if (R2_INVENTORY.getObjectScene(R2_DIAGNOSTICS_DISPLAY) == 0)
 			setFrame(5);
 		setPosition(Common::Point(217, 85));
 		break;
 	case 3:
-		if (R2_INVENTORY.getObjectScene(R2_23))
+		if (R2_INVENTORY.getObjectScene(R2_THRUSTER_VALVE))
 			setFrame(5);
 		setPosition(Common::Point(161, 121));
 		break;
 	case 4:
-		if (R2_INVENTORY.getObjectScene(R2_27))
+		if (R2_INVENTORY.getObjectScene(R2_IGNITOR))
 			setFrame(5);
 		setPosition(Common::Point(117, 121));
 		break;
 	case 5:
-		if (R2_INVENTORY.getObjectScene(R2_17))
+		if (R2_INVENTORY.getObjectScene(R2_FUEL_CELL))
 			setFrame(5);
 		setPosition(Common::Point(111, 85));
 		break;
 	case 6:
-		if (R2_INVENTORY.getObjectScene(R2_45))
+		if (R2_INVENTORY.getObjectScene(R2_BATTERY))
 			setFrame(5);
 		setPosition(Common::Point(95, 84));
 		break;
@@ -7129,7 +7129,7 @@ bool Scene1550::Actor13::startAction(CursorType action, Event &event) {
 		if (scene->_field415 != 2)
 			return SceneActor::startAction(action, event);
 		
-		if (R2_INVENTORY.getObjectScene(R2_45) == 1550) {
+		if (R2_INVENTORY.getObjectScene(R2_BATTERY) == 1550) {
 			R2_GLOBALS._player.disableControl();
 			scene->_sceneMode = 1564;
 			scene->setAction(&scene->_sequenceManager1, scene, 1564, &R2_GLOBALS._player, NULL);
@@ -7141,7 +7141,7 @@ bool Scene1550::Actor13::startAction(CursorType action, Event &event) {
 		if (scene->_field415 != 2)
 			return SceneActor::startAction(action, event);
 
-		if (R2_INVENTORY.getObjectScene(R2_45) == 1550) {
+		if (R2_INVENTORY.getObjectScene(R2_BATTERY) == 1550) {
 			SceneItem::display(1550, 74, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 		} else
 			SceneItem::display(1550, 64, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
@@ -7184,7 +7184,7 @@ void Scene1550::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 	
 	if (R2_GLOBALS._sceneManager._previousScene == -1)
-		R2_GLOBALS.setFlag(R2_16);
+		R2_GLOBALS.setFlag(R2_ATTRACTOR_CABLE_HARNESS);
 
 	if ((R2_GLOBALS._player._characterScene[1] != 1550) && (R2_GLOBALS._player._characterScene[1] != 1580)) {
 		R2_GLOBALS._player._characterScene[1] = 1550;
@@ -7477,7 +7477,7 @@ void Scene1550::signal() {
 	case 1552:
 	// No break on purpose
 	case 1588:
-		R2_INVENTORY.setObjectScene(R2_19, R2_GLOBALS._player._characterIndex);
+		R2_INVENTORY.setObjectScene(R2_AIRBAG, R2_GLOBALS._player._characterIndex);
 		_actor8.remove();
 		_field412 = 0;
 		R2_GLOBALS._player.enableControl();
@@ -7492,7 +7492,7 @@ void Scene1550::signal() {
 	case 1555:
 	// No break on purpose
 	case 1589:
-		R2_INVENTORY.setObjectScene(R2_18, R2_GLOBALS._player._characterIndex);
+		R2_INVENTORY.setObjectScene(R2_GYROSCOPE, R2_GLOBALS._player._characterIndex);
 		_actor10.remove();
 		R2_GLOBALS._player.enableControl();
 		break;
@@ -7516,7 +7516,7 @@ void Scene1550::signal() {
 		_field415 = 2;
 		break;
 	case 1564:
-		R2_INVENTORY.setObjectScene(R2_45, 1);
+		R2_INVENTORY.setObjectScene(R2_BATTERY, 1);
 		_sceneMode = 1565;
 		setAction(&_sequenceManager1, this, 1565, &R2_GLOBALS._player, NULL);
 		break;
@@ -7529,7 +7529,7 @@ void Scene1550::signal() {
 	case 1579:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_22, 0);
+		R2_INVENTORY.setObjectScene(R2_GUIDANCE_MODULE, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1570:
@@ -7537,7 +7537,7 @@ void Scene1550::signal() {
 	case 1580:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_25, 0);
+		R2_INVENTORY.setObjectScene(R2_RADAR_MECHANISM, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1571:
@@ -7545,19 +7545,19 @@ void Scene1550::signal() {
 	case 1581:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_18, 0);
+		R2_INVENTORY.setObjectScene(R2_GYROSCOPE, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1572:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_23, 0);
+		R2_INVENTORY.setObjectScene(R2_THRUSTER_VALVE, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1573:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_27, 0);
+		R2_INVENTORY.setObjectScene(R2_IGNITOR, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1574:
@@ -7565,7 +7565,7 @@ void Scene1550::signal() {
 	case 1582:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_17, 0);
+		R2_INVENTORY.setObjectScene(R2_FUEL_CELL, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1575:
@@ -7573,7 +7573,7 @@ void Scene1550::signal() {
 	case 1583:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_45, 0);
+		R2_INVENTORY.setObjectScene(R2_BATTERY, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1576:
@@ -7598,14 +7598,14 @@ void Scene1550::signal() {
 	case 1586:
 	// No break on purpose
 	case 1587:
-		R2_INVENTORY.setObjectScene(R2_28, R2_GLOBALS._player._characterIndex);
+		R2_INVENTORY.setObjectScene(R2_DIAGNOSTICS_DISPLAY, R2_GLOBALS._player._characterIndex);
 		_actor1.remove();
 		_field412 = 0;
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1592:
 		_actor9.remove();
-		R2_INVENTORY.setObjectScene(R2_26, 1);
+		R2_INVENTORY.setObjectScene(R2_JOYSTICK, 1);
 		if (R2_GLOBALS._player._characterIndex == 1) {
 			R2_GLOBALS._v565EC[2] = R2_GLOBALS._v565EC[1];
 			R2_GLOBALS._v565EC[4] = R2_GLOBALS._v565EC[3];
@@ -8393,7 +8393,7 @@ void Scene1550::subA2B2F() {
 				R2_GLOBALS._walkRegions.enableRegion(k5A78D);
 				R2_GLOBALS._walkRegions.enableRegion(k5A790);
 				R2_GLOBALS._walkRegions.enableRegion(k5A791);
-				if (R2_INVENTORY.getObjectScene(R2_26) == 1550) {
+				if (R2_INVENTORY.getObjectScene(R2_JOYSTICK) == 1550) {
 					_actor9.postInit();
 					_actor9.setup(1562, 3, 1);
 					_actor9.setPosition(Common::Point(150, 70));
@@ -8482,7 +8482,7 @@ void Scene1550::subA2B2F() {
 				_actor1.setPosition(Common::Point(259, 133));
 				_actor1.fixPriority(105);
 				_actor1.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
-				if (R2_INVENTORY.getObjectScene(R2_18) == 1550) {
+				if (R2_INVENTORY.getObjectScene(R2_GYROSCOPE) == 1550) {
 					_actor10.postInit();
 					_actor10.setup(1550, 7, 2);
 					_actor10.setPosition(Common::Point(227, 30));
@@ -8501,7 +8501,7 @@ void Scene1550::subA2B2F() {
 				_actor1.setup(1550, 1, 3);
 				_actor1.setPosition(Common::Point(76, 64));
 				_actor1.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
-				if (R2_INVENTORY.getObjectScene(R2_28) == 1550) {
+				if (R2_INVENTORY.getObjectScene(R2_DIAGNOSTICS_DISPLAY) == 1550) {
 					_actor11.postInit();
 					_actor11.setup(1504, 4, 1);
 					_actor11.setPosition(Common::Point(49, 35));
@@ -8510,7 +8510,7 @@ void Scene1550::subA2B2F() {
 					_actor11.fixPriority(65);
 					_actor11.setDetails(1550, 14, 15, 63, 2, (SceneItem *) NULL);
 				}
-				if (R2_INVENTORY.getObjectScene(R2_19) == 1550) {
+				if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1550) {
 					_actor8.postInit();
 					_actor8.setup(1550, 7, 1);
 					_actor8.setPosition(Common::Point(45, 44));
@@ -9050,7 +9050,7 @@ void Scene1580::synchronize(Serializer &s) {
 bool Scene1580::Hotspot1::startAction(CursorType action, Event &event) {
 	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
 
-	if (action == R2_26) {
+	if (action == R2_JOYSTICK) {
 		R2_INVENTORY.setObjectScene(26, 1580);
 		R2_GLOBALS._sceneItems.remove(&scene->_item1);
 		scene->_actor2.postInit();
@@ -9069,7 +9069,7 @@ bool Scene1580::Hotspot1::startAction(CursorType action, Event &event) {
 bool Scene1580::Hotspot2::startAction(CursorType action, Event &event) {
 	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
 
-	if (action == R2_28) {
+	if (action == R2_DIAGNOSTICS_DISPLAY) {
 		R2_INVENTORY.setObjectScene(28, 1580);
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._sceneItems.remove(&scene->_item2);
@@ -9171,14 +9171,14 @@ bool Scene1580::Actor6::startAction(CursorType action, Event &event) {
 			return true;
 		}
 		break;
-	case R2_9:
+	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_39:
+	case R2_COM_SCANNER_2:
 		scene->_sceneMode = 30;
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
@@ -9203,14 +9203,14 @@ bool Scene1580::Actor7::startAction(CursorType action, Event &event) {
 			return true;
 		}
 		break;
-	case R2_9:
+	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_39:
+	case R2_COM_SCANNER_2:
 		scene->_sceneMode = 30;
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
@@ -10442,7 +10442,7 @@ void Scene1800::synchronize(Serializer &s) {
 }
 
 bool Scene1800::Hotspot5::startAction(CursorType action, Event &event) {
-	if ((action != R2_9) && (action != R2_39))
+	if ((action != R2_COM_SCANNER) && (action != R2_COM_SCANNER_2))
 		return false;
 	
 	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
@@ -11231,10 +11231,10 @@ void Scene1900::postInit(SceneObjectList *OwnerList) {
 	_stripManager.setFontNumber(3);
 	_stripManager.addSpeaker(&_seekerSpeaker);
 	
-	_exit1.setDetails(Rect(0, 105, 14, 145), R2_9, 2000);
+	_exit1.setDetails(Rect(0, 105, 14, 145), R2_COM_SCANNER, 2000);
 	_exit1.setDest(Common::Point(14, 135));
 
-	_exit2.setDetails(Rect(305, 105, 320, 145), R2_10, 2000);
+	_exit2.setDetails(Rect(305, 105, 320, 145), R2_SPENT_POWER_CAPSULE, 2000);
 	_exit2.setDest(Common::Point(315, 135));
 
 	R2_GLOBALS._player.postInit();
@@ -11752,7 +11752,7 @@ bool Scene1945::Hotspot3::startAction(CursorType action, Event &event) {
 	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
 
 	switch (action) {
-	case R2_37:
+	case R2_GUNPOWDER:
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 0;
 		if ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142))
@@ -11817,7 +11817,7 @@ bool Scene1945::Hotspot4::startAction(CursorType action, Event &event) {
 }
 
 bool Scene1945::Actor3::startAction(CursorType action, Event &event) {
-	if ((action == R2_50) && (action == R2_49)) {
+	if ((action == R2_ALCOHOL_LAMP_3) && (action == R2_ALCOHOL_LAMP_2)) {
 		Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
 
 		scene->_fieldEAE = action;
@@ -11981,7 +11981,7 @@ void Scene1945::signal() {
 		}
 		return;
 	case 1942:
-		R2_INVENTORY.setObjectScene(R2_37, 0);
+		R2_INVENTORY.setObjectScene(R2_GUNPOWDER, 0);
 		_actor3.setDetails(1945, 15, -1, -1, 2, (SceneItem *) NULL);
 		R2_GLOBALS.setFlag(42);
 		break;
@@ -12239,7 +12239,7 @@ bool Scene1950::Hotspot2::startAction(CursorType action, Event &event) {
 }
 
 bool Scene1950::Actor2::startAction(CursorType action, Event &event) {
-	if (action != R2_31)
+	if (action != R2_SCRITH_KEY)
 		return SceneActor::startAction(action, event);
 
 	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
@@ -12416,7 +12416,7 @@ void Scene1950::Actor8::signal() {
 bool Scene1950::Actor8::startAction(CursorType action, Event &event) {
 	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((R2_GLOBALS._v56613[(scene->_field41C - 1) * 4] == 0) || (action != R2_44))
+	if ((R2_GLOBALS._v56613[(scene->_field41C - 1) * 4] == 0) || (action != R2_PHOTON_STUNNER))
 		return SceneActor::startAction(action, event);
 	
 	R2_GLOBALS._player.disableControl();
@@ -13826,7 +13826,7 @@ void Scene1950::signal() {
 void Scene1950::process(Event &event) {
 	if ( (event.eventType == EVENT_BUTTON_DOWN)
 		&& (R2_GLOBALS._player._uiEnabled) 
-		&& (R2_GLOBALS._events.getCursor() == R2_47)
+		&& (R2_GLOBALS._events.getCursor() == R2_LIGHT_BULB)
 		&& (R2_GLOBALS._player._bounds.contains(event.mousePos))
 		&& (R2_INVENTORY.getObjectScene(31) == 0)) {
 		event.handled = true;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 3cc541493d..5567519046 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -1269,13 +1269,13 @@ void Scene2400::signal() {
 bool Scene2425::Item1::startAction(CursorType action, Event &event) {
 	Scene2425 *scene = (Scene2425 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((action == R2_37) && (!R2_GLOBALS.getFlag(84))) {
+	if ((action == R2_GUNPOWDER) && (!R2_GLOBALS.getFlag(84))) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 2426;
 		scene->setAction(&scene->_sequenceManager, scene, 2426, &R2_GLOBALS._player, &scene->_actor1, NULL);
 		R2_GLOBALS.setFlag(84);
 		return true;
-	} else if (action == R2_37) {
+	} else if (action == R2_GUNPOWDER) {
 		R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
 		R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS);
 		return NamedHotspot::startAction(R2_STEPPING_DISKS, event);
@@ -1286,13 +1286,13 @@ bool Scene2425::Item1::startAction(CursorType action, Event &event) {
 bool Scene2425::Item2::startAction(CursorType action, Event &event) {
 	Scene2425 *scene = (Scene2425 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((action == R2_37) && (R2_GLOBALS.getFlag(84))) {
+	if ((action == R2_GUNPOWDER) && (R2_GLOBALS.getFlag(84))) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 2427;
 		scene->setAction(&scene->_sequenceManager, scene, 2427, &R2_GLOBALS._player, &scene->_actor1, NULL);
 		R2_GLOBALS.clearFlag(84);
 		return true;
-	} else if (action == R2_37) {
+	} else if (action == R2_GUNPOWDER) {
 		R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
 		R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS);
 		return NamedHotspot::startAction(R2_STEPPING_DISKS, event);
@@ -1303,7 +1303,7 @@ bool Scene2425::Item2::startAction(CursorType action, Event &event) {
 bool Scene2425::Item3::startAction(CursorType action, Event &event) {
 	Scene2425 *scene = (Scene2425 *)R2_GLOBALS._sceneManager._scene;
 
-	if (action != R2_37)
+	if (action != R2_GUNPOWDER)
 		return NamedHotspot::startAction(action, event);
 	else {
 		R2_GLOBALS._player.disableControl();
@@ -1320,7 +1320,7 @@ bool Scene2425::Item3::startAction(CursorType action, Event &event) {
 }
 
 bool Scene2425::Item4::startAction(CursorType action, Event &event) {
-	if (action != R2_37)
+	if (action != R2_GUNPOWDER)
 		return NamedHotspot::startAction(action, event);
 	else {
 		R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
@@ -1332,19 +1332,19 @@ bool Scene2425::Item4::startAction(CursorType action, Event &event) {
 bool Scene2425::Actor1::startAction(CursorType action, Event &event) {
 	if (action == R2_STEPPING_DISKS) {
 		if (R2_GLOBALS._player._characterIndex == 2) {
-			R2_GLOBALS._events.setCursor(R2_37);
+			R2_GLOBALS._events.setCursor(R2_GUNPOWDER);
 			return true;
 		} else {
 			return SceneActor::startAction(action, event);
 		}
-	} else if (R2_GLOBALS._events.getCursor() == R2_37)
+	} else if (R2_GLOBALS._events.getCursor() == R2_GUNPOWDER)
 		return false;
 	else 
 		return SceneActor::startAction(action, event);
 }
 
 bool Scene2425::Actor2::startAction(CursorType action, Event &event) {
-	if (action != R2_37)
+	if (action != R2_GUNPOWDER)
 		return SceneActor::startAction(action, event);
 	else {
 		R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
@@ -1601,12 +1601,12 @@ void Scene2430::signal() {
 		break;
 	case 2430:
 		_actor2.remove();
-		R2_INVENTORY.setObjectScene(R2_37, 2);
+		R2_INVENTORY.setObjectScene(R2_GUNPOWDER, 2);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 2435:
 		_actor3.remove();
-		R2_INVENTORY.setObjectScene(R2_50, 2);
+		R2_INVENTORY.setObjectScene(R2_ALCOHOL_LAMP_3, 2);
 		R2_GLOBALS._player.enableControl();
 		break;
 	default:
@@ -1627,18 +1627,18 @@ bool Scene2435::Actor2::startAction(CursorType action, Event &event) {
 	Scene2435 *scene = (Scene2435 *)R2_GLOBALS._sceneManager._scene;
 
 	switch (action) {
-	case R2_34:
+	case R2_SAPPHIRE_BLUE:
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		R2_GLOBALS.setFlag(82);
 		scene->_stripManager.start(603, scene);
 		return true;
-	case R2_35:
+	case R2_ANCIENT_SCROLLS:
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		R2_GLOBALS.setFlag(82);
 		scene->_stripManager.start(602, scene);
-		R2_INVENTORY.setObjectScene(R2_35, 2000);
+		R2_INVENTORY.setObjectScene(R2_ANCIENT_SCROLLS, 2000);
 		return true;
 	case CURSOR_TALK:
 		R2_GLOBALS._player.disableControl();
@@ -1647,7 +1647,7 @@ bool Scene2435::Actor2::startAction(CursorType action, Event &event) {
 		if ((R2_GLOBALS._player._characterIndex == 1) || (R2_GLOBALS.getFlag(82))) {
 			scene->_stripManager.start(605, scene);
 			return true;
-		} else if (R2_INVENTORY.getObjectScene(R2_35) == 2) {
+		} else if (R2_INVENTORY.getObjectScene(R2_ANCIENT_SCROLLS) == 2) {
 			scene->_stripManager.start(601, scene);
 			return true;
 		} else {
@@ -2204,7 +2204,7 @@ void Scene2450::signal() {
 bool Scene2455::Actor1::startAction(CursorType action, Event &event) {
 	Scene2455 *scene = (Scene2455 *)R2_GLOBALS._sceneManager._scene;
 
-	if (action == R2_29) {
+	if (action == R2_GLASS_DOME) {
 		if ((R2_INVENTORY.getObjectScene(49) == 2455) || (R2_INVENTORY.getObjectScene(50) == 2455)) {
 			R2_GLOBALS._player.disableControl();
 			scene->_sceneMode = 2458;
@@ -2224,7 +2224,7 @@ bool Scene2455::Actor2::startAction(CursorType action, Event &event) {
 	Scene2455 *scene = (Scene2455 *)R2_GLOBALS._sceneManager._scene;
 
 	switch (action) {
-	case R2_49:
+	case R2_ALCOHOL_LAMP_2:
 		if (R2_INVENTORY.getObjectScene(50) != 2455) {
 			R2_GLOBALS._player.disableControl();
 			scene->_actor1.postInit();
@@ -2236,7 +2236,7 @@ bool Scene2455::Actor2::startAction(CursorType action, Event &event) {
 			return true;
 		}
 		break;
-	case R2_50:
+	case R2_ALCOHOL_LAMP_3:
 		if (R2_INVENTORY.getObjectScene(49) != 2455) {
 			R2_GLOBALS._player.disableControl();
 			scene->_actor1.postInit();
@@ -3513,7 +3513,7 @@ void Scene2700::signal() {
 }
 void Scene2700::process(Event &event) {
 	if ((R2_GLOBALS._player._canWalk) && (event.eventType == EVENT_BUTTON_DOWN)) {
-		if (R2_GLOBALS._events.getCursor() == R2_36) {
+		if (R2_GLOBALS._events.getCursor() == R2_FLUTE) {
 			if (R2_GLOBALS._player._bounds.contains(event.mousePos)) {
 				_sceneMode = 10;
 				_field414 = 2710;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 99bcf3df44..2b97cba8e9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -385,7 +385,7 @@ bool Scene3150::Item5::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 3154;
 		scene->setAction(&scene->_sequenceManager, scene, 3154, &R2_GLOBALS._player, &scene->_actor3, NULL);
 		return true;
-	case R2_40:
+	case R2_SUPERCONDUCTOR_WIRE:
 		if ((R2_INVENTORY.getObjectScene(47) != 3150) && (R2_GLOBALS.getFlag(75))) {
 			R2_GLOBALS._player.disableControl();
 			scene->_actor3.postInit();
@@ -407,7 +407,7 @@ bool Scene3150::Item6::startAction(CursorType action, Event &event) {
 	Scene3150 *scene = (Scene3150 *)R2_GLOBALS._sceneManager._scene;
 
 	switch (action) {
-	case R2_41:
+	case R2_PILLOW:
 		R2_GLOBALS._player.disableControl();
 		scene->_actor4.postInit();
 		scene->_actor4._effect = 6;
@@ -416,7 +416,7 @@ bool Scene3150::Item6::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 3158;
 		scene->setAction(&scene->_sequenceManager, scene, 3158, &R2_GLOBALS._player, &scene->_actor4, NULL);
 		return true;
-	case R2_42:
+	case R2_FOOD_TRAY:
 		if ((R2_INVENTORY.getObjectScene(47) != 3150) && (R2_INVENTORY.getObjectScene(40) == 3150) && (R2_GLOBALS.getFlag(75))) {
 			scene->_actor5.postInit();
 			scene->_actor5._effect = 6;
@@ -447,7 +447,7 @@ bool Scene3150::Actor4::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 3151;
 		scene->setAction(&scene->_sequenceManager, scene, 3151, &R2_GLOBALS._player, &scene->_actor4, NULL);
 		return true;
-	case R2_42:
+	case R2_FOOD_TRAY:
 		return false;
 	default:
 		return SceneActor::startAction(action, event);
@@ -498,7 +498,7 @@ bool Scene3150::Actor6::startAction(CursorType action, Event &event) {
 bool Scene3150::Actor7::startAction(CursorType action, Event &event) {
 	Scene3150 *scene = (Scene3150 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((action == R2_43) && (!R2_GLOBALS.getFlag(80))) {
+	if ((action == R2_LASER_HACKSAW) && (!R2_GLOBALS.getFlag(80))) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 3160;
 		scene->setAction(&scene->_sequenceManager, scene, 3160, &R2_GLOBALS._player, &scene->_actor7, NULL);
@@ -4325,7 +4325,7 @@ bool Scene3600::Actor13::startAction(CursorType action, Event &event) {
 		return true;
 	case R2_SONIC_STUNNER:
 	// No break on purpose
-	case R2_44:
+	case R2_PHOTON_STUNNER:
 		if (action == R2_SONIC_STUNNER)
 			R2_GLOBALS._sound3.play(43);
 		else
diff --git a/engines/tsage/user_interface.cpp b/engines/tsage/user_interface.cpp
index 428bf8c038..ca9fddc6ce 100644
--- a/engines/tsage/user_interface.cpp
+++ b/engines/tsage/user_interface.cpp
@@ -82,7 +82,7 @@ void UIQuestion::showDescription(CursorType cursor) {
 		}
 		break;
 	case GType_Ringworld2:
-		if ((cursor == R2_9) || (cursor == R2_39)) {
+		if ((cursor == R2_COM_SCANNER) || (cursor == R2_COM_SCANNER_2)) {
 			// Show communicator
 			warning("TODO: Communicator");
 		} else {
-- 
cgit v1.2.3


From ffd5326ca10fd7f33e5099ccb24075e06248a721 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 15 Feb 2012 19:44:56 +0100
Subject: TSAGE: R2R - Scene 1337: rename a variable

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 6 +++---
 engines/tsage/ringworld2/ringworld2_scenes1.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 713d7dc7d0..4d37d6beb0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1634,7 +1634,7 @@ void Scene1337::unkObj1337_1::synchronize(Serializer &s) {
 }
 
 Scene1337::Scene1337() {
-	_fieldA30 = 0;
+	_autoplay = false;
 	_field3E24 = 0;
 	_field3E26 = 0;
 
@@ -3939,7 +3939,7 @@ void Scene1337::subC20F9() {
 				break;
 			}
 			
-			if (_fieldA30 == 0)
+			if (!_autoplay)
 				_unkFctPtr412 = &Scene1337::subC20E5;
 			else
 				subC20E5();
@@ -4916,7 +4916,7 @@ void Scene1337::subPostInit() {
 
 	_background1.setup2(9531, 1, 1, 249, 168, 155, 0);
 
-	_fieldA30 = 0;
+	_autoplay = false;
 	_field424C = 0;
 	_field424E = 0;
 }
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 4c412dbcb0..a5c7ee5f5c 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -263,7 +263,7 @@ public:
 	ASound _aSound1;
 	ASound _aSound2;
 	BackgroundSceneObject _background1;
-	int _fieldA30;
+	bool _autoplay;
 	unkObj1337_1 _arrunkObj1337[4];
 	SceneItem _item1;
 	SceneObject _object1;
-- 
cgit v1.2.3


From 66aff9c4d81f842b6f5d66adedf9dd0f524d4cec Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 15 Feb 2012 23:56:15 +0100
Subject: TSAGE: R2R - Implement scene 1850

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   |   2 +-
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 775 ++++++++++++++++++++++++
 engines/tsage/ringworld2/ringworld2_scenes1.h   |  52 ++
 3 files changed, 828 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 074a3960cb..33ccfa1898 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -143,7 +143,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 	case 1800:
 		return new Scene1800();
 	case 1850:
-		error("Missing scene %d from group 1", sceneNumber);
+		return new Scene1850();
 	case 1875:
 		return new Scene1875();
 	case 1900:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 4d37d6beb0..a52030677f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -10951,6 +10951,781 @@ void Scene1800::saveCharacter(int characterIndex) {
 	SceneExt::saveCharacter(characterIndex);
 }
 
+/*--------------------------------------------------------------------------
+ * Scene 1850 - 
+ *
+ *--------------------------------------------------------------------------*/
+Scene1850::Scene1850() {
+	warning("STUBBED: Scene1850()");
+}
+
+void Scene1850::synchronize(Serializer &s) {
+	warning("STUBBED: Scene1850::synchronize()");
+}
+
+bool Scene1850::Hotspot2::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneHotspot::startAction(action, event);
+	
+	Scene1850 *scene = (Scene1850 *)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->_field41E = 1;
+		scene->_sceneMode = 1860;
+
+		if (R2_GLOBALS.getFlag(32))
+			scene->setAction(&scene->_sequenceManager1, scene, 1860, &R2_GLOBALS._player, &scene->_actor5, NULL);
+		else
+			scene->setAction(&scene->_sequenceManager1, scene, 1859, &R2_GLOBALS._player, &scene->_actor5, 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);
+	}
+	
+	return true;
+}
+
+bool Scene1850::Actor5::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);
+		
+		R2_GLOBALS._player.disableControl();
+		scene->_sceneMode = 1857;
+		
+		if (R2_GLOBALS.getFlag(32))
+			scene->setAction(&scene->_sequenceManager1, scene, 1858, &R2_GLOBALS._player, &scene->_actor5, NULL);
+		else
+			scene->setAction(&scene->_sequenceManager1, scene, 1857, &R2_GLOBALS._player, &scene->_actor5, 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, -999);
+		else
+			SceneItem::display(1850, 1, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		
+		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;
+
+				R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+				scene->_stripManager.start(558, scene);
+
+				return true;
+			} else {
+				return SceneActor::startAction(action, event);
+			}
+		} else if (R2_GLOBALS.getFlag(30)) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 1875;
+			scene->_actor2.postInit();
+			
+			if (R2_GLOBALS.getFlag(32))
+				scene->setAction(&scene->_sequenceManager1, scene, 1876, &R2_GLOBALS._player, &scene->_actor2, NULL);
+			else
+				scene->setAction(&scene->_sequenceManager1, scene, 1875, &R2_GLOBALS._player, &scene->_actor2, NULL);
+
+			return true;
+		} else if (R2_GLOBALS.getFlag(70)) {
+			R2_GLOBALS._player.disableControl();
+			scene->_sceneMode = 30;
+			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+			scene->_stripManager.start(557, scene);
+			R2_GLOBALS.setFlag(69);
+			
+			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->_actor5, &scene->_actor2, NULL);
+		}
+		
+		return true;
+		break;
+	default:
+		return SceneActor::startAction(action, event);
+		break;
+	}
+}
+
+bool Scene1850::Actor6::startAction(CursorType action, Event &event) {
+	if (action != CURSOR_USE)
+		return SceneHotspot::startAction(action, event);
+	
+	Scene1850 *scene = (Scene1850 *)R2_GLOBALS._sceneManager._scene;
+	
+	if (R2_GLOBALS.getFlag(32)) {
+		SceneItem::display(3240, 4, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
+		return true;
+	}
+	
+	R2_GLOBALS._player.disableControl();
+	if (scene->_field412 == 1851)
+		R2_GLOBALS._player._effect = 1;
+	
+	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->_field41E = 3;
+		else
+			scene->_field41E = 2;
+		
+		scene->_sceneMode = 1860;
+		
+		if (R2_GLOBALS.getFlag(32)) {
+			scene->setAction(&scene->_sequenceManager1, scene, 1860, &R2_GLOBALS._player, &scene->_actor5, NULL);
+		} else {
+			scene->setAction(&scene->_sequenceManager1, scene, 1859, &R2_GLOBALS._player, &scene->_actor5, NULL);
+		}
+	} else {
+		scene->_sceneMode = 11;
+		if (_position.x >= 160) {
+			scene->setAction(&scene->_sequenceManager1, scene, 1866, &R2_GLOBALS._player, &scene->_actor7, NULL);
+		} else {
+			scene->setAction(&scene->_sequenceManager1, scene, 1865, &R2_GLOBALS._player, &scene->_actor6, NULL);
+		}
+	}
+
+	return true;
+}
+
+bool Scene1850::Actor8::startAction(CursorType action, Event &event) {
+	if ((action != CURSOR_USE) || (_position.y != 120))
+		return SceneHotspot::startAction(action, event);
+
+	Scene1850 *scene = (Scene1850 *)R2_GLOBALS._sceneManager._scene;
+
+	R2_GLOBALS._player.disableControl();
+	scene->_sceneMode = 1881;
+	
+	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);
+	}
+	
+	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)) {
+		_field412 = 1850;
+		g_globals->_scenePalette.loadPalette(1850);
+	} else {
+		_field412 = 1851;
+		g_globals->_scenePalette.loadPalette(1851);
+	}
+
+	SceneExt::postInit();
+
+	if (R2_GLOBALS._sceneManager._previousScene == 3150)
+		R2_GLOBALS._sound1.play(116);
+	
+	_stripManager.addSpeaker(&_quinnSpeaker);
+	_stripManager.addSpeaker(&_seekerSpeaker);
+	
+	_field418 = 0;
+	_field41E = 0;
+	_field41A = Common::Point(0, 0);
+
+	R2_GLOBALS._player._characterScene[1] = 1850;
+	R2_GLOBALS._player._characterScene[2] = 1850;
+
+	_item2.setDetails(Rect(101, 56, 111, 63), 1850, 19, -1, -1, 1, NULL);
+
+	_actor6.postInit();
+	_actor6.setup(1850, 3, 1);
+	_actor6.setPosition(Common::Point(66, 102));
+	_actor6.setDetails(1850, 22, -1, -1, 1, (SceneItem *) NULL);
+
+	_actor7.postInit();
+	_actor7.setup(1850, 2, 1);
+	_actor7.setPosition(Common::Point(253, 102));
+	_actor7.setDetails(1850, 22, -1, -1, 1, (SceneItem *) NULL);
+
+	R2_GLOBALS._walkRegions.enableRegion(1);
+
+	_actor5.postInit();
+	
+	if (R2_GLOBALS.getFlag(34)) {
+		R2_GLOBALS._walkRegions.enableRegion(2);
+		_actor5.setup(1851, 4, 3);
+	} else if (R2_GLOBALS.getFlag(30)) {
+		_actor5.setup(1851, 2, 2);
+	} else {
+		R2_GLOBALS._walkRegions.enableRegion(5);
+		if (R2_GLOBALS.getFlag(33)) {
+			R2_GLOBALS._walkRegions.enableRegion(2);
+			_actor5.setup(1851, 1, 3);
+		} else {
+			_actor5.setup(1851, 2, 1);
+		}
+	}
+
+	_actor5.setPosition(Common::Point(219, 130));
+	_actor5.fixPriority(114);
+	_actor5.setDetails(1850, -1, -1, -1, 1, (SceneItem *) NULL);
+
+	R2_GLOBALS._player.postInit();
+
+	_actor1.postInit();
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *) NULL);
+	} else {
+		_actor1.setDetails(9001, 0, 5, 3, 1, (SceneItem *) NULL);
+	}
+
+	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1850) {
+		R2_GLOBALS._player._effect = 6;
+		_actor1._effect = 6;
+		if (R2_GLOBALS.getFlag(31)) {
+			R2_GLOBALS._player._shade = 0;
+			_actor1._shade = 0;
+		} else {
+			R2_GLOBALS._player._shade = 6;
+			_actor1._shade = 6;
+		}
+
+		if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1850) {
+			_actor2.postInit();
+			if (R2_GLOBALS.getFlag(34)) {
+				_actor2.setup(1851, 4, 2);
+				_actor2.fixPriority(114);
+			} else {
+				_actor2.setup(1851, 4, 1);
+			}
+
+			_actor2.setPosition(Common::Point(179, 113));
+
+			if ((_actor5._strip == 1) && (_actor5._frame == 3)){
+				_actor2.hide();
+			}
+
+			_actor2.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);
+				_actor1.setVisage(1508);
+
+				_actor3.postInit();
+				_actor3.setup(1853, 3, 1);
+				_actor3.setPosition(Common::Point(122, 113));
+				_actor3.fixPriority(114);
+				_actor3._effect = 6;
+
+				// Totally useless test
+				if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+					_actor3.setDetails(1850, 28, -1, -1, 2, (SceneItem *) NULL);
+				} else {
+					// And the associated dead code
+					_actor3.setDetails(1850, 30, -1, -1, 2, (SceneItem *) NULL);
+				}
+
+				_actor4.postInit();
+				_actor4.setup(1853, 3, 2);
+				_actor4.setPosition(Common::Point(139, 111));
+				_actor4.fixPriority(114);
+				_actor4._effect = 6;
+
+				// Still totally useless test
+				if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+					_actor4.setDetails(1850, 29, -1, -1, 2, (SceneItem *) NULL);
+				} else {
+					// Another piece of dead code
+					_actor4.setDetails(1850, 28, -1, -1, 2, (SceneItem *) NULL);
+				}
+
+				if (R2_GLOBALS.getFlag(31)) {
+					_actor3._shade = 0;
+					_actor4._shade = 0;
+				} else {
+					_actor3._shade = 6;
+					_actor4._shade = 6;
+				}
+			} else {
+				R2_GLOBALS._player.setVisage(1500);
+				_actor1.setVisage(1505);
+			}
+		} else { // Not Quinn
+			if (R2_GLOBALS.getFlag(32)) {
+				R2_GLOBALS._player.setVisage(1508);
+				_actor1.setVisage(1511);
+
+				_actor3.postInit();
+				_actor3.setup(1853, 3, 1);
+				_actor3.setPosition(Common::Point(122, 113));
+				_actor3.fixPriority(114);
+				_actor3._effect = 6;
+
+				// Totally useless test
+				if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+					// Dead code
+					_actor3.setDetails(1850, 28, -1, -1, 2, (SceneItem *) NULL);
+				} else {
+					_actor3.setDetails(1850, 30, -1, -1, 2, (SceneItem *) NULL);
+				}
+
+				_actor4.postInit();
+				_actor4.setup(1853, 3, 2);
+				_actor4.setPosition(Common::Point(139, 111));
+				_actor4.fixPriority(114);
+				_actor4._effect = 6;
+
+				// Again, useless test
+				if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+					// and dead code
+					_actor4.setDetails(1850, 29, -1, -1, 1, (SceneItem *) NULL);
+				} else {
+					_actor4.setDetails(1850, 28, -1, -1, 1, (SceneItem *) NULL);
+				}
+
+				if (R2_GLOBALS.getFlag(31)) {
+					_actor3._shade = 0;
+					_actor4._shade = 0;
+				} else {
+					_actor3._shade = 6;
+					_actor4._shade = 6;
+				}
+			} else {
+				R2_GLOBALS._player.setVisage(1505);
+				_actor1.setVisage(1500);
+			}
+		}
+
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
+		R2_GLOBALS._player.setStrip(3);
+		R2_GLOBALS._player.setPosition(Common::Point(80, 114));
+
+		_actor1.animate(ANIM_MODE_1, NULL);
+		_actor1.setObjectWrapper(new SceneObjectWrapper());
+		_actor1.setStrip(3);
+		_actor1.setPosition(Common::Point(180, 96));
+
+		if (R2_GLOBALS.getFlag(30)) {
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+				_actor1.animate(ANIM_MODE_NONE, NULL);
+				_actor1.setObjectWrapper(NULL);
+				if (R2_GLOBALS.getFlag(32)) {
+					_actor1.setup(1854, 1, 3);
+				} else {
+					_actor1.setup(1854, 2, 3);
+				}
+
+				_actor1.setPosition(Common::Point(164, 106));
+			} else {
+				_actor1.animate(ANIM_MODE_NONE, NULL);
+				_actor1.setObjectWrapper(NULL);
+				if (R2_GLOBALS.getFlag(32)) {
+					R2_GLOBALS._player.setup(1854, 1, 3);
+				} else {
+					R2_GLOBALS._player.setup(1854, 2, 3);
+				}
+
+				R2_GLOBALS._player.setPosition(Common::Point(164, 106));
+			}
+		} 
+
+		R2_GLOBALS._player.enableControl();
+	} else { // R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] != 1850
+		R2_GLOBALS._player._effect = 1;
+		_actor1._effect = 1;
+		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, &_actor1, &_actor7, NULL);
+			} else {
+				setAction(&_sequenceManager1, this, 1861, &R2_GLOBALS._player, &_actor1, &_actor6, NULL);
+			}
+		} else {
+			if (R2_GLOBALS.getFlag(29)) {
+				setAction(&_sequenceManager1, this, 1864, &R2_GLOBALS._player, &_actor1, &_actor7, NULL);
+			} else {
+				setAction(&_sequenceManager1, this, 1862, &R2_GLOBALS._player, &_actor1, &_actor6, NULL);
+			}
+		}
+	}
+
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
+		_actor1._moveDiff = Common::Point(5, 3);
+	} else {
+		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
+		_actor1._moveDiff = Common::Point(3, 2);
+	}
+
+	_actor8.postInit();
+	_actor8.setup(1850, 1, 1);
+
+	if (R2_GLOBALS.getFlag(62)) {
+		_actor8.setPosition(Common::Point(159, 120));
+	} else {
+		_actor8.setPosition(Common::Point(159, 184));
+	}
+
+	_actor8.fixPriority(113);
+	
+	if (R2_GLOBALS.getFlag(34)) {
+		_actor8.setDetails(1850, 25, -1, -1, 4, &_actor5);
+	} else {
+		_actor8.setDetails(1850, 25, -1, -1, 2, (SceneItem *) NULL);
+	}
+
+	if (!R2_GLOBALS.getFlag(62)) {
+		_actor8.hide();
+	}
+
+	_item1.setDetails(Rect(0, 0, 320, 200), 1850, 16, -1, -1, 1, NULL);
+
+	R2_GLOBALS._player._oldCharacterScene[1] = 1850;
+	R2_GLOBALS._player._oldCharacterScene[2] = 1850;
+}
+
+void Scene1850::remove() {
+	g_globals->_scenePalette.loadPalette(0);
+
+	R2_GLOBALS._scenePalette._palette[771] = 255;
+	R2_GLOBALS._scenePalette._palette[772] = 255;
+	R2_GLOBALS._scenePalette._palette[773] = 255;
+	
+	SceneExt::remove();
+}
+
+void Scene1850::signal() {
+	switch (_sceneMode) {
+	case 10:
+		R2_GLOBALS._player._effect = 6;
+		R2_GLOBALS._player._shade = 6;
+
+		_actor1._effect = 6;
+		_actor1._shade = 6;
+		
+		R2_GLOBALS._walkRegions.enableRegion(5);
+		
+		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 11:
+		R2_GLOBALS.clearFlag(30);
+		R2_GLOBALS._sceneManager.changeScene(1800);
+		break;
+	case 15:
+		_sceneMode = 16;
+		break;
+	case 16:
+		_sceneMode = 1870;
+		setAction(&_sequenceManager1, this, 1870, &R2_GLOBALS._player, &_actor1, &_actor3, &_actor4, 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, &_actor1, &_actor5, 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 (_field412 == 1851) {
+			R2_GLOBALS.setFlag(31);
+			_palette1.loadPalette(1850);
+			_field412 = 1850;
+		} else {
+			R2_GLOBALS.clearFlag(31);
+			_palette1.loadPalette(1851);
+			_field412 = 1851;
+		}
+		
+		_field418 = 1;
+		if (R2_GLOBALS.getFlag(30)) {
+			_actor8.setAction(&_sequenceManager2, NULL, 1867, &_actor8, NULL);
+		} else if (R2_GLOBALS.getFlag(34)) {
+			if (R2_GLOBALS.getFlag(62)) {
+				R2_GLOBALS.clearFlag(62);
+				_actor8.setAction(&_sequenceManager2, this, 1851, &_actor8, NULL);
+			} else {
+				R2_GLOBALS.setFlag(62);
+				_actor8.setAction(&_sequenceManager2, this, 1850, &_actor8, NULL);
+			}
+		} else if (R2_GLOBALS.getFlag(33)) {
+				R2_GLOBALS.setFlag(62);
+				R2_GLOBALS.setFlag(34);
+				R2_GLOBALS._walkRegions.enableRegion(2);
+				
+				_actor2.postInit();
+				_actor2.setDetails(1850, 6, -1, -1, 5, &_actor5);
+				
+				_sceneMode = 1879;
+
+				_actor8.setAction(&_sequenceManager2, this, 1879, &_actor5, &_actor8, &_actor2, NULL);
+		} else {
+			_actor8.setAction(&_sequenceManager2, NULL, 1867, &_actor8, 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 (_field412 == 1851)
+			_field416 = -20;
+		else
+			_field416 = 20;
+		
+		_field414 = 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);
+			}
+		}
+		break;
+	case 1857:
+		if (R2_GLOBALS.getFlag(69)) {
+			R2_GLOBALS._player.enableControl();
+			R2_GLOBALS._player._canWalk = false;
+		} else {
+			_sceneMode = 1858;
+			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+			_stripManager.start(555, this);
+			R2_GLOBALS.setFlag(69);
+		}
+		break;
+	case 1858:
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1859;
+		setAction(&_sequenceManager1, this, 1859, &R2_GLOBALS._player, &_actor5, 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 (_field41A.x != 0) {
+			R2_GLOBALS._player.enableControl();
+
+			PlayerMover *mover = new PlayerMover();
+			R2_GLOBALS._player.addMover(mover, &_field41A, this);
+			
+			_field41A = Common::Point(0, 0);
+		}
+		
+		switch (_field41E) {
+		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, &_actor6, NULL);
+			break;
+		case 3:
+			warning("_field41E == 3");
+			_sceneMode = 11;
+			setAction(&_sequenceManager1, this, 1866, &R2_GLOBALS._player, &_actor7, NULL);
+			break;
+		default:
+			break;
+		}
+		
+		_field41E = 0;
+		break;
+	case 1870:
+		R2_GLOBALS._walkRegions.enableRegion(5);
+		R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 1);
+		R2_GLOBALS.setFlag(32);
+		R2_GLOBALS._player.enableControl(CURSOR_ARROW);
+		break;
+	case 1875:
+		R2_INVENTORY.setObjectScene(R2_AIRBAG, 1850);
+		_sceneMode = 21;
+		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		_stripManager.start(561, this);
+		break;
+	case 1877:
+		_actor3.postInit();
+		_actor3._effect = 6;
+
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			_actor3.setDetails(1850, 28, -1, -1, 2, (SceneItem *)NULL);
+		} else {
+			_actor3.setDetails(1850, 30, -1, -1, 2, (SceneItem *)NULL);
+		}
+		
+		_actor4.postInit();
+		_actor4._effect = 6;
+		
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
+			_actor4.setDetails(1850, 29, -1, -1, 2, (SceneItem *)NULL);
+		} else {
+			_actor4.setDetails(1850, 28, -1, -1, 2, (SceneItem *)NULL);
+		}
+		
+		if (R2_GLOBALS.getFlag(31)) {
+			_actor3._shade = 0;
+			_actor4._shade = 0;
+		} else {
+			_actor3._shade = 6;
+			_actor4._shade = 6;
+		}
+			
+		R2_GLOBALS.clearFlag(30);
+		_sceneMode = 15;
+		setAction(&_sequenceManager1, this, 1869, &R2_GLOBALS._player, &_actor3, NULL);
+		setAction(&_sequenceManager2, this, 1868, &_actor1, &_actor4, NULL);
+		break;		
+	case 1878:
+		R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 1850);
+		R2_GLOBALS.setFlag(33);
+		R2_GLOBALS._walkRegions.enableRegion(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;
+	}
+}
+
+void Scene1850::process(Event &event) {
+	if ( (event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_ARROW) 
+		&& (R2_GLOBALS._player._characterIndex == R2_SEEKER) && (R2_GLOBALS.getFlag(30))) {
+		_field41A = event.mousePos;
+		R2_GLOBALS._player.disableControl();
+		_sceneMode = 1860;
+		if (R2_GLOBALS.getFlag(32)) {
+			setAction(&_sequenceManager1, this, 1860, &R2_GLOBALS._player, &_actor5, NULL);
+		} else {
+			setAction(&_sequenceManager1, this, 1859, &R2_GLOBALS._player, &_actor5, NULL);
+		}
+		R2_GLOBALS.clearFlag(32);
+		event.handled = true;
+	}
+	
+	Scene::process(event);
+}
+
+void Scene1850::dispatch() {
+	if (_field418 != 0) {
+		_field414--;
+		if (_field414 == 0)
+			_field418 = 0;
+		
+		if (_field416 >= 0) {
+			R2_GLOBALS._player._shade = (_field414 * 6) / _field416;
+		} else {
+			R2_GLOBALS._player._shade = ((_field414 * 6) / _field416) + 6;
+		}
+		R2_GLOBALS._player._flags |= OBJFLAG_PANES;
+
+		_actor1._shade = R2_GLOBALS._player._shade;
+		_actor1._flags |= OBJFLAG_PANES;
+
+		_actor3._shade = R2_GLOBALS._player._shade;
+		_actor3._flags |= OBJFLAG_PANES;
+
+		_actor4._shade = R2_GLOBALS._player._shade;
+		_actor4._flags |= OBJFLAG_PANES;
+	}
+
+	if (R2_GLOBALS.getFlag(32)) {
+		_actor3.setPosition(Common::Point(_actor8._position.x - 37, _actor8._position.y - 71));
+		_actor4.setPosition(Common::Point(_actor8._position.x - 20, _actor8._position.y - 73));
+	}
+
+	if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1850) {
+		_actor2.setPosition(Common::Point(_actor8._position.x + 20, _actor8._position.y - 71));
+	}
+	
+	Scene::dispatch();
+}
+
 /*--------------------------------------------------------------------------
  * Scene 1875 - 
  *
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index a5c7ee5f5c..5906030c5f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -879,6 +879,58 @@ public:
 	virtual void saveCharacter(int characterIndex);
 };
 
+class Scene1850 : public SceneExt {
+	class Hotspot2 : public NamedHotspot {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+
+	class Actor5 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor6 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	class Actor8 : public SceneActor {
+	public:
+		virtual bool startAction(CursorType action, Event &event);
+	};
+	
+public:
+	int _field412;
+	int _field414;
+	int _field416;
+	int _field418;
+	Common::Point _field41A;
+	int _field41E;
+	ScenePalette _palette1;
+	SpeakerQuinn _quinnSpeaker;
+	SpeakerSeeker _seekerSpeaker;
+	NamedHotspot _item1;
+	Hotspot2 _item2;
+	SceneActor _actor1;
+	SceneActor _actor2;
+	SceneActor _actor3;
+	SceneActor _actor4;
+	Actor5 _actor5;
+	Actor6 _actor6;
+	Actor6 _actor7;
+	Actor8 _actor8;
+	SequenceManager _sequenceManager1;
+	SequenceManager _sequenceManager2;
+
+	Scene1850();
+	void synchronize(Serializer &s);
+
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
+	virtual void remove();
+	virtual void signal();
+	virtual void process(Event &event);
+	virtual void dispatch();
+};
+
 class Scene1875 : public SceneExt {
 	class Actor1875 : public SceneActor {
 	public:
-- 
cgit v1.2.3


From 910e93db40c3c9fa4032324bf14bc1fb22c074f2 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 16 Feb 2012 00:57:18 +0000
Subject: MOHAWK: Add Detection Entry for "Tortoise and the Hare" Hebrew
 Variant.

Parameter from bug #3441928 - "MOHAWK: Hebrew Tortoise and Hare not
detected".
---
 engines/mohawk/detection_tables.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'engines')

diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 27b1192f09..1d2fc625c1 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -1011,6 +1011,22 @@ static const MohawkGameDescription gameDescriptions[] = {
 		0,
 	},
 
+	// Tortoise and the Hare Hebrew variant - From georgeqgreg on bug #3441928
+	{
+		{
+			"tortoise",
+			"",
+			AD_ENTRY1("TORTB.LB", "9a7932c32bf1d6faf27fae8801ba967a"),
+			Common::HE_ISR,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_LIVINGBOOKSV2,
+		0,
+		0,
+	},
+
 	// From afholman in bug#3309308
 	{
 		{
-- 
cgit v1.2.3


From dcbf77cc928deb5d7bb56efc8bec3ba5e0925b59 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 29 Dec 2011 01:02:42 +0100
Subject: DREAMWEB: Document some locations

---
 engines/dreamweb/stubs.cpp | 49 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index d93add6b42..5f8ea53ada 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -30,76 +30,91 @@ namespace DreamWeb {
 uint8 g_keyBuffer[16];
 
 const Room g_roomData[] = {
+	// location 0
 	{ "DREAMWEB.R00", // Ryan's apartment
 	  5,255,33,10,
 	  255,255,255,0,
 	  1,6,2,255,3,255,255,255,255,255,0 },
 
+	// location 1
 	{ "DREAMWEB.R01",
 	  1,255,44,10,
 	  255,255,255,0,
 	  7,2,255,255,255,255,6,255,255,255,1 },
 
+	// location 2: Louis' (?)
 	{ "DREAMWEB.R02",
 	  2,255,33,0,
 	  255,255,255,0,
 	  1,0,255,255,1,255,3,255,255,255,2 },
 
+	// location 3
 	{ "DREAMWEB.R03",
 	  5,255,33,10,
 	  255,255,255,0,
 	  2,2,0,2,4,255,0,255,255,255,3 },
 
+	// location 4
 	{ "DREAMWEB.R04",
 	  23,255,11,30,
 	  255,255,255,0,
 	  1,4,0,5,255,255,3,255,255,255,4 },
 
+	// location 5: In hotel, lift noise audible (?)
 	{ "DREAMWEB.R05",
 	  5,255,22,30, // if demo: 22,255,22,30,
 	  255,255,255,0,
 	  1,2,0,4,255,255,3,255,255,255,5 },
 
+	// location 6: sarters (?)
 	{ "DREAMWEB.R06",
 	  5,255,11,30,
 	  255,255,255,0,
 	  1,0,0,1,2,255,0,255,255,255,6 },
 
+	// location 7
 	{ "DREAMWEB.R07",
 	  255,255,0,20,
 	  255,255,255,0,
 	  2,2,255,255,255,255,0,255,255,255,7 },
 
+	// location 8: TV studio (?)
 	{ "DREAMWEB.R08",
 	  8,255,0,10,
 	  255,255,255,0,
 	  1,2,255,255,255,255,0,11,40,0,8 },
 
+	// location 9
 	{ "DREAMWEB.R09",
 	  9,255,22,10,
 	  255,255,255,0,
 	  4,6,255,255,255,255,0,255,255,255,9 },
 
+	// location 10
 	{ "DREAMWEB.R10",
 	  10,255,33,30,
 	  255,255,255,0,
 	  2,0,255,255,2,2,4,22,30,255,10 }, // 22,30,0 switches
 	                                    // off path 0 in skip
+	// location 11
 	{ "DREAMWEB.R11",
 	  11,255,11,20,
 	  255,255,255,0,
 	  0,4,255,255,255,255,255,255,255,255,11 },
 
+	// location 12
 	{ "DREAMWEB.R12",
 	  12,255,22,20,
 	  255,255,255,0,
 	  1,4,255,255,255,255,255,255,255,255,12 },
 
+	// location 13: boathouse (?)
 	{ "DREAMWEB.R13",
 	  12,255,22,20,
 	  255,255,255,0,
 	  1,4,255,255,255,255,255,255,255,255,13 },
 
+	// location 14
 	{ "DREAMWEB.R14",
 	  14,255,44,20,
 	  255,255,255,0,
@@ -110,166 +125,196 @@ const Room g_roomData[] = {
 	{ "", 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 },
 
+	// location 19
 	{ "DREAMWEB.R19",
 	  19,255,0,0,
 	  255,255,255,0,
 	  0,4,255,255,255,255,255,255,255,255,19 },
 
+	// location 20: Sart room (?)
 	{ "DREAMWEB.R20",
 	  22,255,0,20,
 	  255,255,255,0,
 	  1,4,2,15,255,255,255,255,255,255,20 },
 
+	// location 21: lift noise audible (?)
 	{ "DREAMWEB.R21",
 	  5,255,11,10, // if demo: 22,255,11,10,
 	  255,255,255,0,
 	  1,4,2,15,1,255,255,255,255,255,21 },
 
+	// location 22: pool room (?)
 	{ "DREAMWEB.R22",
 	  22,255,22,10,
 	  255,255,255,0,
 	  0,4,255,255,1,255,255,255,255,255,22 },
 
+	// location 23
 	{ "DREAMWEB.R23",
 	  23,255,22,30,
 	  255,255,255,0,
 	  1,4,2,15,3,255,255,255,255,255,23 },
 
+	// location 24: only room in which initialInv() is active, i.e. we get initial inventory here
 	{ "DREAMWEB.R24",
 	  5,255,44,0,
 	  255,255,255,0,
 	  1,6,2,15,255,255,255,255,255,255,24 },
 
+	// location 25: helicopter (?)
 	{ "DREAMWEB.R25",
 	  22,255,11,40,
 	  255,255,255,0,
 	  1,0,255,255,255,255,255,255,255,255,25 },
 
+	// location 26: reached via trap door (?)
 	{ "DREAMWEB.R26",
 	  9,255,22,20,
 	  255,255,255,0,
 	  4,2,255,255,255,255,255,255,255,255,26 },
 
+	// location 27: rock room (?)
 	{ "DREAMWEB.R27",
 	  22,255,11,20,
 	  255,255,255,0,
 	  0,6,255,255,255,255,255,255,255,255,27 },
 
+	// location 28: related to TV studiou (?), see resetLocation()
 	{ "DREAMWEB.R28",
 	  5,255,11,30,
 	  255,255,255,0,
 	  0,0,255,255,2,255,255,255,255,255,28 },
 
+	// location 29: aide (?)
 	{ "DREAMWEB.R29",
 	  22,255,11,10,
 	  255,255,255,0,
 	  0,2,255,255,255,255,255,255,255,255,29 },
 
 
-
+	// location 30
 	{ "DREAMWEB.R05", // Duplicate of hotel lobby, but emerging from the lift.
 	  5,255,22,10,    // if demo: 22,255,22,10
 	  255,255,255,0,
 	  1,4,1,15,255,255,255,255,255,255,5 },
 
+	// location 31
 	{ "DREAMWEB.R04",  // Duplicate of pool hall lobby,
 	  23,255,22,20,    // but emerging from the lift.
 	  255,255,255,0,
 	  1,4,2,15,255,255,255,255,255,255,4 },
 
+	// location 32
 	{ "DREAMWEB.R10",  // entering alley via skip
 	  10,255,22,30,
 	  255,255,255,0,
 	  3,6,255,255,255,255,255,255,255,255,10 },
 
+	// location 33
 	{ "DREAMWEB.R12",  // on the beach, getting up.
 	  12,255,22,20,
 	  255,255,255,0,
 	  0,2,255,255,255,255,255,255,255,255,12 },
 
+	// location 34
 	{ "DREAMWEB.R03",  // Duplicate of Eden's lobby
 	  5,255,44,0,      // but emerging from the lift
 	  255,255,255,0,
 	  1,6,2,255,4,255,255,255,255,255,3 },
 
+	// location 35: Location when starting the game, after dream (?)
 	{ "DREAMWEB.R24",  // Duplicate of Eden's flat
 	  5,255,22,0,      // but starting on the bed
 	  255,255,255,0,
 	  3,6,0,255,255,255,255,33,0,3,24 }, //  33,0,3 turns off path for lift
 
+	// location 36
 	{ "DREAMWEB.R22",  // Duplicate
 	  22,255,22,20,    // of hotel but in pool room
 	  255,255,255,0,
 	  1,4,255,255,255,255,255,255,255,255,22 },
 
+	// location 37
 	{ "DREAMWEB.R22",  // Duplicate
 	  22,255,22,20,    // of hotel but in pool room
 	  255,255,255,0,   // coming out of bedroom
 	  0,2,255,255,255,255,255,255,255,255,22 },
 
+	// location 38
 	{ "DREAMWEB.R11",  // Duplicate
 	  11,255,22,30,    // of carpark but getting
 	  255,255,255,0,   // up off the floor
 	  0,0,255,255,255,255,255,255,255,255,11 },
 
+	// location 39
 	{ "DREAMWEB.R28",
 	  5,255,11,20,
 	  255,255,255,0,
 	  0,6,255,255,2,255,255,255,255,255,28 },
 
+	// location 40
 	{ "DREAMWEB.R21",
 	  5,255,11,10, // if demo: 22,255,11,10
 	  255,255,255,0,
 	  1,4,2,15,1,255,255,255,255,255,21 },
 
+	// location 41
 	{ "DREAMWEB.R26",
 	  9,255,0,40,
 	  255,255,255,0,
 	  0,0,255,255,255,255,255,255,255,255,26 },
 
+	// location 42
 	{ "DREAMWEB.R19",
 	  19,255,0,0,
 	  255,255,255,0,
 	  2,2,255,255,255,255,255,255,255,255,19 },
 
+	// location 43
 	{ "DREAMWEB.R08",  // leaving tvstudio into street
 	  8,255,11,40,
 	  255,255,255,0,
 	  0,4,255,255,255,255,255,255,255,255,8 },
 
+	// location 44
 	{ "DREAMWEB.R01",
 	  1,255,44,10,
 	  255,255,255,0,
 	  3,6,255,255,255,255,255,255,255,255,1 },
 
 
+	// location 45
 	{ "DREAMWEB.R45",  // Dream room
 	  35,255,22,30,
 	  255,255,255,0,
 	  0,6,255,255,255,255,255,255,255,255,45 },
 
+	// location 46
 	{ "DREAMWEB.R46",  // Dream room
 	  35,255,22,40,
 	  255,255,255,0,
 	  0,4,255,255,255,255,255,255,255,255,46 },
 
+	// location 47
 	{ "DREAMWEB.R47",  // Dream room
 	  35,255,0,0,
 	  255,255,255,0,
 	  0,0,255,255,255,255,255,255,255,255,47 },
 
+	// location 48
 	{ "DREAMWEB.R45",  // Dream room
 	  35,255,22,30,
 	  255,255,255,0,
 	  4,0,255,255,255,255,255,255,255,255,45 },
 
+	// location 49
 	{ "DREAMWEB.R46",  // Dream room
 	  35,255,22,50,
 	  255,255,255,0,
 	  0,4,255,255,255,255,255,255,255,255,46 },
 
 
-
+	// location 50
 	{ "DREAMWEB.R50",  //  Intro sequence one
 	  35,255,22,30,
 	  255,255,255,0,
-- 
cgit v1.2.3


From 5d88e67cfdcfe483b374c523c7160b044d7cf3eb Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 12 Jan 2012 11:35:13 +0100
Subject: TSAGE: Remove superfluous md5 bytes setting

---
 engines/tsage/detection.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp
index 12add10c58..0c458f5c35 100644
--- a/engines/tsage/detection.cpp
+++ b/engines/tsage/detection.cpp
@@ -74,7 +74,6 @@ enum {
 class TSageMetaEngine : public AdvancedMetaEngine {
 public:
 	TSageMetaEngine() : AdvancedMetaEngine(TsAGE::gameDescriptions, sizeof(TsAGE::tSageGameDescription), tSageGameTitles) {
-		_md5Bytes = 5000;
 		_singleid = "tsage";
 		_guioptions = GUIO1(GUIO_NOSPEECH);
 	}
-- 
cgit v1.2.3


From 08223e97469e3bbfe33237c951751c77a94b04ed Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 12 Jan 2012 11:35:28 +0100
Subject: CGE: Change detector singleid to be all lowercase

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

(limited to 'engines')

diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp
index 3fa3dbd7ff..b3ef31f30f 100644
--- a/engines/cge/detection.cpp
+++ b/engines/cge/detection.cpp
@@ -104,7 +104,7 @@ static const ADFileBasedFallback fileBasedFallback[] = {
 class CGEMetaEngine : public AdvancedMetaEngine {
 public:
 	CGEMetaEngine() : AdvancedMetaEngine(CGE::gameDescriptions, sizeof(ADGameDescription), CGEGames) {
-		_singleid = "Soltys";
+		_singleid = "soltys";
 	}
 
 	virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
-- 
cgit v1.2.3


From 46321aacd85e4dfb70bb460e80667fdcbdd2791d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 23 Jan 2012 12:20:31 +0100
Subject: AGOS: Cleanup

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

(limited to 'engines')

diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index c7176fe7e8..29d1b36e19 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.cpp
@@ -312,7 +312,7 @@ void MoviePlayerDXA::startSound() {
 
 			_fileStream->seek(size, SEEK_CUR);
 
-			in.open((const char *)"audio.wav");
+			in.open("audio.wav");
 			if (!in.isOpen()) {
 				error("Can't read offset file 'audio.wav'");
 			}
-- 
cgit v1.2.3


From 856aa5119b899d798af212f946224ab4886775fe Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 16 Feb 2012 18:32:04 +0100
Subject: TSAGE: R2R - Fix various warnings

Thanks Digitall for reporting those
---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index a52030677f..23a9eb2590 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -3846,7 +3846,7 @@ void Scene1337::process(Event &event) {
 		if (event.btnState != BTNSHIFT_RIGHT) {
 			subD183F(R2_GLOBALS._v5780E, 1);
 			event.handled = true;
-		} else if (_unkFctPtr412 != NULL) {
+		} else if (_unkFctPtr412) {
 			FunctionPtrType tmpFctPtr = _unkFctPtr412;
 			_unkFctPtr412 = NULL;
 			(this->*tmpFctPtr)();
@@ -3854,7 +3854,7 @@ void Scene1337::process(Event &event) {
 		}
 	} else if (event.eventType == EVENT_KEYPRESS) {
 		if (event.kbd.keycode == Common::KEYCODE_SPACE) {
-			if (_unkFctPtr412 != NULL) {
+			if (_unkFctPtr412) {
 				FunctionPtrType tmpFctPtr = _unkFctPtr412;
 				_unkFctPtr412 = NULL;
 				(this->*tmpFctPtr)();
@@ -4436,8 +4436,11 @@ void Scene1337::subC2C2F() {
 			
 			for (int i = 0; i <= 3; i++) {
 				if (tmpRandIndx != 3) {
+				// The variables 'i' and 'j' are not used in the inner code of the loop.
+				// It's understandable for 'i', which helps making sure that tmpVal is used properly,
+				// but it's suspect for j
 					for (int j = 0; j <= 7; j++) {
-						if ((_arrunkObj1337[j]._arr3[0]._field34 == 0) && (subC32B1(j, _arrunkObj1337[3]._arr1[randIndx]._field34))) {
+						if ((_arrunkObj1337[tmpRandIndx]._arr3[0]._field34 == 0) && (subC32B1(tmpRandIndx, _arrunkObj1337[3]._arr1[randIndx]._field34))) {
 							tmpVal = j;
 						}
 					}
@@ -5668,9 +5671,10 @@ void Scene1337::subCF979() {
 
 	for (int i = 0; i <= 3; i++) {
 		if (subC27F9(_arrunkObj1337[0]._arr1[i]._field34) != -1) {
+			// The variable 'j' is not used in the inner code of the loop. It's suspect
 			for (int j = 0; j <= 7; j++) {
-				if ((_arrunkObj1337[2]._arr3[0]._field34 == 0) && (subC32B1(2, _arrunkObj1337[0]._arr1[j]._field34))) {
-					subC3456(&_arrunkObj1337[0]._arr1[j], &_arrunkObj1337[2]._arr3[0]);
+				if ((_arrunkObj1337[2]._arr3[0]._field34 == 0) && (subC32B1(2, _arrunkObj1337[0]._arr1[i]._field34))) {
+					subC3456(&_arrunkObj1337[0]._arr1[i], &_arrunkObj1337[2]._arr3[0]);
 					found = true;
 				}
 			}
-- 
cgit v1.2.3


From 8c5f988a005f8bdf11ad9ea025bc31a010bd133e Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 16 Feb 2012 20:57:52 +0000
Subject: MOHAWK: Correct detection md5sum for Tortoise and the Hare Hebrew.

md5sum was for datafiles modified by bug submitter to access hidden
content. New md5sum is for unmodified standard release.
---
 engines/mohawk/detection_tables.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 1d2fc625c1..08df0a2cbe 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -1016,7 +1016,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 		{
 			"tortoise",
 			"",
-			AD_ENTRY1("TORTB.LB", "9a7932c32bf1d6faf27fae8801ba967a"),
+			AD_ENTRY1("TORTB.LB", "23135777370cf1ff00aa7247e93642d3"),
 			Common::HE_ISR,
 			Common::kPlatformWindows,
 			ADGF_NO_FLAGS,
-- 
cgit v1.2.3


From c48ad37244e3706972b538616d0c0ce6653b4c68 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 17 Feb 2012 10:52:40 +0200
Subject: SCI: Fix bug #3487088 - "SCI: LB1: Missing Wait cursor"

---
 engines/sci/graphics/cursor.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'engines')

diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index a939b042a7..1f7a2cfdbb 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -131,6 +131,15 @@ void GfxCursor::kernelSetShape(GuiResourceId resourceId) {
 	// bit 0 of resourceData[3] is set on <SCI1 games, which means center hotspot
 	if ((hotspot.x == 0) && (hotspot.y == 256))
 		hotspot.x = hotspot.y = SCI_CURSOR_SCI0_HEIGHTWIDTH / 2;
+	// LB1 defines bogus hotspot data for the busy cursor, which is fairly easy
+	// to detect, as the hotspot is defined outside the visible screen (!).
+	// Presumably, this was done to prevent the cursor from being usable, however
+	// the only thing that can be done when the wait cursor is shown is to skip
+	// scenes by left clicking. This bogus hotspot causes the cursor to not be
+	// drawn at all, thus we detect it and set the hotspot to (0, 0) instead.
+	// Fixes bug #3487088.
+	if (hotspot.x > _screen->getDisplayWidth())
+		hotspot.x = hotspot.y = 0;
 
 	// Now find out what colors we are supposed to use
 	colorMapping[0] = 0; // Black is hardcoded
-- 
cgit v1.2.3


From b21f956790075f11fff4b43cecb8afca368594b3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 17 Feb 2012 21:09:59 +0200
Subject: SCI: Fix and cleanup the monochrome cursor code

This makes the code like FreeSCI again, which is the correct way to fix
bug #3487088.
---
 engines/sci/graphics/cursor.cpp | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index 1f7a2cfdbb..b269e8ba51 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -125,21 +125,17 @@ void GfxCursor::kernelSetShape(GuiResourceId resourceId) {
 		error("cursor resource %d has invalid size", resourceId);
 
 	resourceData = resource->data;
-	// hotspot is specified for SCI1 cursors
-	hotspot.x = READ_LE_UINT16(resourceData);
-	hotspot.y = READ_LE_UINT16(resourceData + 2);
-	// bit 0 of resourceData[3] is set on <SCI1 games, which means center hotspot
-	if ((hotspot.x == 0) && (hotspot.y == 256))
-		hotspot.x = hotspot.y = SCI_CURSOR_SCI0_HEIGHTWIDTH / 2;
-	// LB1 defines bogus hotspot data for the busy cursor, which is fairly easy
-	// to detect, as the hotspot is defined outside the visible screen (!).
-	// Presumably, this was done to prevent the cursor from being usable, however
-	// the only thing that can be done when the wait cursor is shown is to skip
-	// scenes by left clicking. This bogus hotspot causes the cursor to not be
-	// drawn at all, thus we detect it and set the hotspot to (0, 0) instead.
-	// Fixes bug #3487088.
-	if (hotspot.x > _screen->getDisplayWidth())
-		hotspot.x = hotspot.y = 0;
+
+	if (getSciVersion() <= SCI_VERSION_0_LATE) {
+		// SCI0 cursors contain hotspot flags, not actual hotspot coordinates.
+		// If bit 0 of resourceData[3] is set, the hotspot should be centered,
+		// otherwise it's in the top left of the mouse cursor.
+		hotspot.x = hotspot.y = resourceData[3] ? SCI_CURSOR_SCI0_HEIGHTWIDTH / 2 : 0;
+	} else {
+		// Cursors in newer SCI versions contain actual hotspot coordinates.
+		hotspot.x = READ_LE_UINT16(resourceData);
+		hotspot.y = READ_LE_UINT16(resourceData + 2);
+	}
 
 	// Now find out what colors we are supposed to use
 	colorMapping[0] = 0; // Black is hardcoded
-- 
cgit v1.2.3


From c87657f066ca9cbb0e07963c31cf57c96b1c5068 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 17 Feb 2012 21:54:50 +0200
Subject: SCI: Added some sanity checks by digitall

- Limit the LB1 cursor workaround to LB1 only (so that fanmade games
aren't affected)
- Error our when bad cursor hotspots are found
---
 engines/sci/graphics/cursor.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index b269e8ba51..daab532d0e 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -145,7 +145,7 @@ void GfxCursor::kernelSetShape(GuiResourceId resourceId) {
 	// Special case for the magnifier cursor in LB1 (bug #3487092).
 	// No other SCI0 game has a cursor resource of 1, so this is handled
 	// specifically for LB1.
-	if (resourceId == 1)
+	if (g_sci->getGameId() == GID_LAURABOW && resourceId == 1)
 		colorMapping[3] = _screen->getColorWhite();
 
 	// Seek to actual data
@@ -175,6 +175,11 @@ void GfxCursor::kernelSetShape(GuiResourceId resourceId) {
 		rawBitmap = upscaledBitmap;
 	}
 
+	if (hotspot.x >= heightWidth || hotspot.y >= heightWidth) {
+		error("cursor %d's hotspot (%d, %d) is out of range of the cursor's dimensions (%dx%d)",
+				resourceId, hotspot.x, hotspot.y, heightWidth, heightWidth);
+	}
+
 	CursorMan.replaceCursor(rawBitmap, heightWidth, heightWidth, hotspot.x, hotspot.y, SCI_CURSOR_SCI0_TRANSPARENCYCOLOR);
 	kernelShow();
 
-- 
cgit v1.2.3


From 423d41dfc1d0ce5ff340c8915c0016116d6408d7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 18 Feb 2012 10:19:51 +1100
Subject: TSAGE: Disabled Spanish Blue Force detection entry

---
 engines/tsage/detection_tables.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h
index 583cd8e15b..d538cbacbf 100644
--- a/engines/tsage/detection_tables.h
+++ b/engines/tsage/detection_tables.h
@@ -140,6 +140,8 @@ static const tSageGameDescription gameDescriptions[] = {
 		GType_BlueForce,
 		GF_CD | GF_ALT_REGIONS
 	},
+#if 0
+	// Blue Force Spanish doesn't yet work
 	// Blue Force Spanish CD
 	{
 		{
@@ -154,7 +156,7 @@ static const tSageGameDescription gameDescriptions[] = {
 		GType_BlueForce,
 		GF_CD | GF_ALT_REGIONS
 	},
-
+#endif
 	// Return to Ringworld
 	{
 		{
-- 
cgit v1.2.3


From 0ff60284ce6e876ac895a13a45657afacddbd8e0 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 18 Feb 2012 01:46:24 +0200
Subject: DREAMWEB: Fix the detection entries for the French and Spanish CD
 versions

---
 engines/dreamweb/detection_tables.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/detection_tables.h b/engines/dreamweb/detection_tables.h
index 75f5786268..9ca7024c89 100644
--- a/engines/dreamweb/detection_tables.h
+++ b/engines/dreamweb/detection_tables.h
@@ -78,13 +78,15 @@ static const DreamWebGameDescription gameDescriptions[] = {
 	},
 
 	// French CD release
+	// NOTE: The original files are named dreamwfr.*, thus they have to be renamed
+	// to dreamweb.* for the game to work, as the engine looks for dreamweb.* files
 	{
 		{
 			"dreamweb",
 			"CD",
 			{
-				{"dreamwfr.r00", 0, "e354582a8564faf5c515df92f207e8d1", 154657},
-				{"dreamwfr.r02", 0, "57f3f08d5aefd04184eac76927eced80", 200575},
+				{"dreamweb.r00", 0, "e354582a8564faf5c515df92f207e8d1", 154657},
+				{"dreamweb.r02", 0, "57f3f08d5aefd04184eac76927eced80", 200575},
 				AD_LISTEND
 			},
 			Common::FR_FRA,
@@ -146,13 +148,15 @@ static const DreamWebGameDescription gameDescriptions[] = {
 	},
 
 	// Spanish CD release
+	// NOTE: The original files are named dreamwsp.*, thus they have to be renamed
+	// to dreamweb.* for the game to work, as the engine looks for dreamweb.* files
 	{
 		{
 			"dreamweb",
 			"CD",
 			{
-				{"dreamwsp.r00", 0, "2df07174321de39c4f17c9ff654b268a", 153608},
-				{"dreamwsp.r02", 0, "577d435ad5da08fb1bcf6ea3dd6e0b9e", 199499},
+				{"dreamweb.r00", 0, "2df07174321de39c4f17c9ff654b268a", 153608},
+				{"dreamweb.r02", 0, "577d435ad5da08fb1bcf6ea3dd6e0b9e", 199499},
 				AD_LISTEND
 			},
 			Common::ES_ESP,
-- 
cgit v1.2.3


From 975801b6702daefe85f2cc91525ba474bd4aa3aa Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 18 Feb 2012 15:24:32 +1100
Subject: TSAGE: Disable right click in R2R Scene 1330

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

(limited to 'engines')

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index d88d012759..c2ce426052 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -4107,7 +4107,8 @@ void SceneHandler::process(Event &event) {
 
 	// Check for displaying right-click dialog
 	if ((event.eventType == EVENT_BUTTON_DOWN) && (event.btnState == BTNSHIFT_RIGHT) &&
-			g_globals->_player._uiEnabled) {
+			g_globals->_player._uiEnabled &&
+			((g_vm->getGameID() != GType_Ringworld2) || (R2_GLOBALS._sceneManager._sceneNumber != 1330))) {
 		g_globals->_game->rightClick();
 
 		event.handled = true;
-- 
cgit v1.2.3


From fd40d1b1925e689e330ff71fcb95fa9da08f8936 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 18 Feb 2012 14:25:35 +0100
Subject: DREAMWEB: Revert "Fix the detection entries for the French and
 Spanish CD versions"

This reverts commit 0ff60284ce6e876ac895a13a45657afacddbd8e0.

We do not want to encourage people to rename all files in their games.
Instead, we should properly support the foreign versions.
---
 engines/dreamweb/detection_tables.h | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/detection_tables.h b/engines/dreamweb/detection_tables.h
index 9ca7024c89..75f5786268 100644
--- a/engines/dreamweb/detection_tables.h
+++ b/engines/dreamweb/detection_tables.h
@@ -78,15 +78,13 @@ static const DreamWebGameDescription gameDescriptions[] = {
 	},
 
 	// French CD release
-	// NOTE: The original files are named dreamwfr.*, thus they have to be renamed
-	// to dreamweb.* for the game to work, as the engine looks for dreamweb.* files
 	{
 		{
 			"dreamweb",
 			"CD",
 			{
-				{"dreamweb.r00", 0, "e354582a8564faf5c515df92f207e8d1", 154657},
-				{"dreamweb.r02", 0, "57f3f08d5aefd04184eac76927eced80", 200575},
+				{"dreamwfr.r00", 0, "e354582a8564faf5c515df92f207e8d1", 154657},
+				{"dreamwfr.r02", 0, "57f3f08d5aefd04184eac76927eced80", 200575},
 				AD_LISTEND
 			},
 			Common::FR_FRA,
@@ -148,15 +146,13 @@ static const DreamWebGameDescription gameDescriptions[] = {
 	},
 
 	// Spanish CD release
-	// NOTE: The original files are named dreamwsp.*, thus they have to be renamed
-	// to dreamweb.* for the game to work, as the engine looks for dreamweb.* files
 	{
 		{
 			"dreamweb",
 			"CD",
 			{
-				{"dreamweb.r00", 0, "2df07174321de39c4f17c9ff654b268a", 153608},
-				{"dreamweb.r02", 0, "577d435ad5da08fb1bcf6ea3dd6e0b9e", 199499},
+				{"dreamwsp.r00", 0, "2df07174321de39c4f17c9ff654b268a", 153608},
+				{"dreamwsp.r02", 0, "577d435ad5da08fb1bcf6ea3dd6e0b9e", 199499},
 				AD_LISTEND
 			},
 			Common::ES_ESP,
-- 
cgit v1.2.3


From 0f3614b043816238a9334f6cde9fa477ecbf00ff Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 20 Feb 2012 22:30:46 +1100
Subject: TSAGE: Implemented method for getting a resource section entry

This will be needed for streaming data directly from the resource file without fully loading the resource.
---
 engines/tsage/resources.cpp | 62 +++++++++++++++++++++++++++++++++++++--------
 engines/tsage/resources.h   |  5 ++++
 2 files changed, 56 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/resources.cpp b/engines/tsage/resources.cpp
index 824f20e9b2..f6f870be20 100644
--- a/engines/tsage/resources.cpp
+++ b/engines/tsage/resources.cpp
@@ -135,7 +135,7 @@ uint16 BitReader::readToken() {
 /*-------------------------------------------------------------------------*/
 
 TLib::TLib(MemoryManager &memManager, const Common::String &filename) :
-		_memoryManager(memManager) {
+		_filename(filename), _memoryManager(memManager) {
 
 	// If the resource strings list isn't yet loaded, load them
 	if (_resStrings.size() == 0) {
@@ -158,25 +158,35 @@ 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;
 
-	if (_file.readUint32BE() != 0x544D492D)
+	loadSection(_file, _resources);
+}
+
+/**
+ * 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 = */_file.readByte();
-	uint16 numEntries = _file.readByte();
+	/*uint8 unknown1 = */f.readByte();
+	uint16 numEntries = f.readByte();
 
 	for (uint i = 0; i < numEntries; ++i) {
-		uint16 id = _file.readUint16LE();
-		uint16 size = _file.readUint16LE();
-		uint16 uncSize = _file.readUint16LE();
-		uint8 sizeHi = _file.readByte();
-		uint8 type = _file.readByte() >> 5;
+		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 = _file.readUint32LE();
+		uint32 offset = f.readUint32LE();
 
 		ResourceEntry re;
 		re.id = id;
@@ -185,7 +195,7 @@ void TLib::loadSection(uint32 fileOffset) {
 		re.size = ((sizeHi & 0xF) << 16) | size;
 		re.uncompressedSize = ((sizeHi & 0xF0) << 12) | uncSize;
 
-		_resources.push_back(re);
+		resources.push_back(re);
 	}
 }
 
@@ -443,6 +453,36 @@ bool TLib::getMessage(int resNum, int lineNum, Common::String &result, bool supp
 
 /*--------------------------------------------------------------------------*/
 
+/**
+ * Open up the main resource file and get an entry from the root section
+ */
+bool TLib::getSectionEntry(Common::File &f, ResourceType resType, int rlbNum, int resNum, 
+									  ResourceEntry &resEntry) {
+	// Try and open the resource file
+	if (!f.open(_filename))
+	  return false;
+
+	// Load the root section index
+	ResourceList resList;
+	loadSection(f, resList);
+
+	// Loop through the index for the desired entry
+	ResourceList::iterator iter;
+	for (iter = _resources.begin(); iter != _resources.end(); ++iter) {
+		ResourceEntry &re = *iter;
+		if (re.id == resNum) {
+			// Found it, so exit
+			resEntry = re;
+			return true;
+		}
+	}
+
+	// No matching entry found
+	return false;
+}
+
+/*--------------------------------------------------------------------------*/
+
 ResourceManager::~ResourceManager() {
 	for (uint idx = 0; idx < _libList.size(); ++idx)
 		delete _libList[idx];
diff --git a/engines/tsage/resources.h b/engines/tsage/resources.h
index 0410fa3f42..2b5561b184 100644
--- a/engines/tsage/resources.h
+++ b/engines/tsage/resources.h
@@ -145,10 +145,12 @@ private:
 	MemoryManager &_memoryManager;
 private:
 	Common::File _file;
+	Common::String _filename;
 	ResourceList _resources;
 	SectionList _sections;
 
 	void loadSection(uint32 fileOffset);
+	void loadSection(Common::File &f, ResourceList &resources);
 	void loadIndex();
 public:
 	TLib(MemoryManager &memManager, const Common::String &filename);
@@ -159,6 +161,8 @@ public:
 	bool getPalette(int paletteNum, byte *palData, uint *startNum, uint *numEntries);
 	byte *getSubResource(int resNum, int rlbNum, int index, uint *size, bool suppressErrors = false);
 	bool getMessage(int resNum, int lineNum, Common::String &result, bool suppressErrors = false);
+
+	bool getSectionEntry(Common::File &f, ResourceType resType, int rlbNum, int resNum, ResourceEntry &resEntry);
 };
 
 class ResourceManager {
@@ -174,6 +178,7 @@ public:
 	void getPalette(int paletteNum, byte *palData, uint *startNum, uint *numEntries, bool suppressErrors = false);
 	byte *getSubResource(int resNum, int rlbNum, int index, uint *size, bool suppressErrors = false);
 	Common::String getMessage(int resNum, int lineNum, bool suppressErrors = false);
+	TLib &first() { return **_libList.begin(); }
 };
 
 
-- 
cgit v1.2.3


From 7a54ba86a083bdfd414a85e4edd5d0baeb91c779 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 20 Feb 2012 22:31:58 +1100
Subject: TSAGE: Starting to implement animation player needed for R2R Title
 Screen

---
 engines/tsage/core.h                            |   1 +
 engines/tsage/ringworld2/ringworld2_logic.cpp   | 118 +++++++++++++++++++++---
 engines/tsage/ringworld2/ringworld2_logic.h     |  40 ++++++--
 engines/tsage/ringworld2/ringworld2_scenes0.cpp |  92 +++++++++---------
 engines/tsage/ringworld2/ringworld2_scenes0.h   |   4 +-
 5 files changed, 188 insertions(+), 67 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index ef6d4735c0..45bb3506d5 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -373,6 +373,7 @@ public:
 
 	bool loadPalette(int paletteNum);
 	void loadPalette(const byte *pSrc, int start, int count);
+	void replace(const ScenePalette *src) { loadPalette(src->_palette, 0, 256); }
 	void refresh();
 	void setPalette(int index, int count);
 	void getEntry(int index, uint *r, uint *g, uint *b);
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 33ccfa1898..89cf831088 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1551,36 +1551,130 @@ void Scene1200::sub9DAD6(int indx) {
 
 /*--------------------------------------------------------------------------*/
 
-ActionObject::ActionObject(): EventHandler() {
+AnimationPlayer::AnimationPlayer(): EventHandler() {
+	_endAction = NULL;
+	
+	_fieldA = NULL;
+	_field16 = NULL;
+	
+	_screenBounds = R2_GLOBALS._gfxManagerInstance._bounds;
+	_rect1 = R2_GLOBALS._gfxManagerInstance._bounds;
+	_field3C = 0;
+	_field3A = 1;
+	_field5A = 0;
+	_field58 = 0;
 	_endAction = NULL;
 }
 
-void ActionObject::synchronize(Serializer &s) {
-	EventHandler::synchronize(s);
+AnimationPlayer::~AnimationPlayer() {
+	if (!method3())
+		method4();
+}
 
-	SYNC_POINTER(_endAction);
+void AnimationPlayer::synchronize(Serializer &s) {
+	EventHandler::synchronize(s);
+	warning("TODO AnimationPlayer::load");
 }
 
-void ActionObject::remove() {
+void AnimationPlayer::remove() {
 	if (_endAction)
 		_endAction->signal();
 
 	_endAction = NULL;
 }
 
-bool ActionObject::load(int rlbNum, Action *endAction) {
-	warning("TODO ActionOjbect::load");
-	return true;
+void AnimationPlayer::process(Event &event) {
+	if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_ESCAPE) &&
+			(_field3A)) {
+		_field90C = _field576;
+	} 
 }
 
-/*--------------------------------------------------------------------------*/
+void AnimationPlayer::dispatch() {
+	uint32 gameFrame = R2_GLOBALS._events.getFrameNumber();
+	uint32 gameDiff = (gameFrame > _gameFrame) ? gameFrame - _gameFrame : _gameFrame - gameFrame;
+
+	if (gameDiff >= _field910) {
+		drawFrame(_field904 % _field57C);
+		++_field904;
+		_field90C = _field904 / _field57C;
 
-void ActionObjectExt::synchronize(Serializer &s) {
-	ActionObject::synchronize(s);
-	s.syncAsSint16LE(_v1);
+		if (_field90C == _field90E)
+			method2();
+
+		_field908 = _field904;
+		_gameFrame = gameFrame;
+	}
 }
 
+bool AnimationPlayer::load(int rlbNum, Action *endAction) {
+	ResourceEntry resEntry;
+	if (!g_resourceManager->first().getSectionEntry(_resourceFile, RES_IMAGE, rlbNum, 0, resEntry)) {
+		warning("Couldn't find resource index");
+		// TODO: Complete animation loading
+	}
+
+	_resourceFile.close();
+	return false;
+}
+
+void AnimationPlayer::drawFrame(int frameIndex) {
+	uint32 v = READ_LE_UINT32(_dataP);
+warning("v = %d", v);
+//TODO
 
+	// End check
+	if (_field56 == 42) {
+		_screenBounds.expandPanes();
+
+		R2_GLOBALS._sceneObjects->draw();
+	} else {
+		if (R2_GLOBALS._sceneManager._hasPalette) {
+			R2_GLOBALS._sceneManager._hasPalette = false;
+			R2_GLOBALS._scenePalette.refresh();
+		}
+	}
+}
+
+void AnimationPlayer::method2() {
+
+}
+
+bool AnimationPlayer::method3() {
+	return (_field90C >= _field576);
+}
+
+void AnimationPlayer::method4() {
+	if (_field38) {
+		switch (_field3C) {
+		case 0:
+			R2_GLOBALS._scenePalette.replace(&_palette);
+			changePane();
+			R2_GLOBALS._sceneManager._hasPalette = true;
+			break;
+		case 2:
+			proc14();
+			break;
+		default:
+			changePane();
+			break;
+		}
+	}
+
+// TODO
+}
+
+/*--------------------------------------------------------------------------*/
+
+AnimationPlayerExt::AnimationPlayerExt(): AnimationPlayer() {
+	_v = 0;
+	_field3A = 0;
+}
+
+void AnimationPlayerExt::synchronize(Serializer &s) {
+	AnimationPlayer::synchronize(s);
+	s.syncAsSint16LE(_v);
+}
 
 } // End of namespace Ringworld2
 
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 925a3d6522..98fcaae981 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -325,29 +325,55 @@ public:
 	virtual Common::String getClassName() { return "UnkObject1200"; }
 };
 
-class ActionObject: public EventHandler {
+class AnimationPlayer: public EventHandler {
 public:
-	EventHandler *_endAction;
+	Common::File _resourceFile;
+	void *_fieldA;
+	void *_field16;
+
+	byte *_dataP;
 	Rect _rect1, _screenBounds;
+	int _field38;
 	int _field3A, _field3C;
 	int _field56;
 	int _field58, _field5A;
 	ScenePalette _palette;
 	byte _palData[256 * 3];
+	Action *_endAction;
+	int _field576;
+	int _field57C;
+	int _palStart, _palSize;
+	int _field904;
+	int _field908;
+	int _field90C;
+	int _field90E;
+	uint _field910;
+	uint32 _gameFrame;
 public:
-	ActionObject();
+	AnimationPlayer();
+	~AnimationPlayer();
 
 	virtual void synchronize(Serializer &s);
 	virtual void remove();
+	virtual void process(Event &event);
+	virtual void dispatch();
+	virtual void flipPane() {}
+	virtual void changePane() {}
+	virtual void proc14() {}
 
 	bool load(int rlbNum, Action *endAction = NULL);
-	bool proc1() { return false; }
-	void proc2() {}
+	void drawFrame(int frameIndex);
+	void method2();
+	bool method3();
+	void method4();
+	void method5() {}
 };
 
-class ActionObjectExt: public ActionObject {
+class AnimationPlayerExt: public AnimationPlayer {
+public:
+	int _v;
 public:
-	int _v1;
+	AnimationPlayerExt();
 
 	virtual void synchronize(Serializer &s);
 };
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index c2b00b675e..dab9afb269 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1499,25 +1499,25 @@ Scene180::Scene180(): SceneExt(), _webbsterSpeaker(27) {
 
 	GfxFont font;
 	font.setFontNumber(7);
-	_fontHeight = font.getHeight();
+	_fontHeight = font.getHeight() + 1;
 
 	_sceneMode = (R2_GLOBALS._sceneManager._previousScene == 205) ? 10 : 0;
 	_gameTextSpeaker._displayMode = 9;
-	_stripManager.addSpeaker(&_gameTextSpeaker);
-	_stripManager.addSpeaker(&_webbsterSpeaker);
-	_stripManager.addSpeaker(&_tealSpeaker);
-	_stripManager.addSpeaker(&_dutyOfficerSpeaker);
-
-	signal();
 }
 
 void Scene180::postInit(SceneObjectList *OwnerList) {
-	SceneExt::postInit();
 	loadScene(9999);
+	SceneExt::postInit();
 
-	R2_GLOBALS._player._uiEnabled = false;
+	R2_GLOBALS._uiElements._active = true;
 	R2_GLOBALS._player.disableControl();
 
+	_stripManager.addSpeaker(&_gameTextSpeaker);
+	_stripManager.addSpeaker(&_webbsterSpeaker);
+	_stripManager.addSpeaker(&_tealSpeaker);
+	_stripManager.addSpeaker(&_dutyOfficerSpeaker);
+
+	signal();
 }
 
 void Scene180::remove() {
@@ -1547,7 +1547,7 @@ void Scene180::synchronize(Serializer &s) {
 void Scene180::signal() {
 	R2_GLOBALS._playStream.stop();
 
-	switch (_sceneMode) {
+	switch (_sceneMode++) {
 	case 0:
 		setFrameInc(6);
 		break;
@@ -1555,13 +1555,13 @@ void Scene180::signal() {
 	case 1:
 		_field412 = 1;
 		R2_GLOBALS._sceneManager._hasPalette = true;
-		_actionObject._field3C = 2;
-		_actionObject._v1 = 1;
-		_actionObject._field56 = 1;
+		_animationPlayer._field3C = 2;
+		_animationPlayer._v = 1;
+		_animationPlayer._field56 = 1;
 		R2_GLOBALS._scene180Mode = 1;
 
-		_actionObject.load(1, NULL);
-		R2_GLOBALS._scenePalette.loadPalette(_actionObject._palData, 0, 256);
+		_animationPlayer.load(1, NULL);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._palData, 0, 256);
 
 		R2_GLOBALS._sound1.play(1);
 		break;
@@ -1598,14 +1598,14 @@ void Scene180::signal() {
 		break;
 
 	case 5:
-		_actionObject._field3C = 2;
-		_actionObject._v1 = 1;
-		_actionObject._field56 = 1;
+		_animationPlayer._field3C = 2;
+		_animationPlayer._v = 1;
+		_animationPlayer._field56 = 1;
 		R2_GLOBALS._scene180Mode = 2;
-		_actionObject.load(2);
+		_animationPlayer.load(2);
 
 		_field412 = 1;
-		R2_GLOBALS._scenePalette.addFader(_actionObject._palData, 256, 6, NULL);
+		R2_GLOBALS._scenePalette.addFader(_animationPlayer._palData, 256, 6, NULL);
 		R2_GLOBALS._sound1.play(2);
 		break;
 
@@ -1701,11 +1701,11 @@ void Scene180::signal() {
 
 	case 29:
 		_field412 = 1;
-		_actionObject._field3C = 0;
-		_actionObject._v1 = 1;
-		_actionObject._field56 = 42;
+		_animationPlayer._field3C = 0;
+		_animationPlayer._v = 1;
+		_animationPlayer._field56 = 42;
 		R2_GLOBALS._scene180Mode = 3;
-		_actionObject.load(3);
+		_animationPlayer.load(3);
 		break;
 
 	case 31:
@@ -1801,12 +1801,12 @@ void Scene180::signal() {
 		break;
 
 	case 40:
-		_actionObject._field3C = 2;
-		_actionObject._field56 = 1;
+		_animationPlayer._field3C = 2;
+		_animationPlayer._field56 = 1;
 		R2_GLOBALS._scene180Mode = 4;
-		if (_actionObject.load(4)) {
-			_actionObject.dispatch();
-			R2_GLOBALS._scenePalette.addFader(_actionObject._palData, 256, 8, this);
+		if (_animationPlayer.load(4)) {
+			_animationPlayer.dispatch();
+			R2_GLOBALS._scenePalette.addFader(_animationPlayer._palData, 256, 8, this);
 		} else {
 			_sceneMode = 43;
 			setFrameInc(1);
@@ -1815,7 +1815,7 @@ void Scene180::signal() {
 
 	case 41:
 		_field412 = 1;
-		_actionObject._v1 = 1;
+		_animationPlayer._v = 1;
 		break;
 
 	case 42:
@@ -1834,19 +1834,19 @@ void Scene180::signal() {
 		break;
 
 	case 45:
-		R2_GLOBALS._scenePalette.addFader(_actionObject._palData, 256, 28, this);
+		R2_GLOBALS._scenePalette.addFader(_animationPlayer._palData, 256, 28, this);
 		break;
 
 	case 48:
 		_field412 = 1;
-		_actionObject._field3C = 2;
-		_actionObject._v1 = 1;
-		_actionObject._field56 = 1;
+		_animationPlayer._field3C = 2;
+		_animationPlayer._v = 1;
+		_animationPlayer._field56 = 1;
 		R2_GLOBALS._scene180Mode = 15;
-		_actionObject.load(15, NULL);
+		_animationPlayer.load(15, NULL);
 
 		R2_GLOBALS._sound1.play(9);
-		R2_GLOBALS._scenePalette.addFader(_actionObject._palData, 256, 6, NULL);
+		R2_GLOBALS._scenePalette.addFader(_animationPlayer._palData, 256, 6, NULL);
 		break;
 
 	case 49:
@@ -1884,11 +1884,11 @@ void Scene180::process(Event &event) {
 
 void Scene180::dispatch() {
 	if (_frameInc) {
-		uint32 frameNumber = R2_GLOBALS._events.getFrameNumber();
+		uint32 gameFrame = R2_GLOBALS._events.getFrameNumber();
 
-		if (frameNumber >= (uint32)_frameNumber) {
-			_frameInc = frameNumber - _frameNumber;
-			_frameNumber = frameNumber;
+		if (gameFrame >= (uint32)_frameNumber) {
+			_frameInc -= gameFrame - _frameNumber;
+			_frameNumber = gameFrame;
 
 			if (_frameInc <= 0) {
 				_frameInc = 0;
@@ -1897,15 +1897,15 @@ void Scene180::dispatch() {
 		}
 	}
 
-	if (_actionObject._v1) {
-		if (_actionObject.proc1()) {
-			_actionObject._v1 = 0;
-			_actionObject.proc2();
-			_actionObject.remove();
+	if (_animationPlayer._v) {
+		if (_animationPlayer.method3()) {
+			_animationPlayer._v = 0;
+			_animationPlayer.method4();
+			_animationPlayer.remove();
 
 			signal();
 		} else {
-			_actionObject.dispatch();
+			_animationPlayer.dispatch();
 		}
 	}
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index f3c8b0bccf..d757080156 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -204,7 +204,7 @@ public:
 	SceneActor _object1, _object2, _object3, _object4, _object5;
 	ScenePalette _palette;
 	SceneText _textList[20];
-	ActionObjectExt _actionObject;
+	AnimationPlayerExt _animationPlayer;
 	SequenceManager _sequenceManager;
 	Action1 _action1;
 	ASoundExt _sound1;
@@ -287,7 +287,7 @@ private:
 					int xMultiply, int yMultiply, int xCenter, int yCenter);
 	void handleText();
 public:
-	ActionObject _actionObject;
+	AnimationPlayer _animationPlayer;
 	int _fontHeight;
 	SceneText _textList[15];
 	Object *_objList1[3];
-- 
cgit v1.2.3


From 4f8665fc836898ebf54fc73b1061125b748183bc Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 20 Feb 2012 16:03:39 +0100
Subject: COMMON: Move isFoo functions to namespace Common, add doxygen
 comments

---
 engines/agi/agi.cpp                   |  2 +-
 engines/agi/wagparser.cpp             |  4 ++--
 engines/agos/script_pn.cpp            |  8 ++++----
 engines/agos/string.cpp               |  2 +-
 engines/agos/string_pn.cpp            |  2 +-
 engines/cge/text.cpp                  |  4 ++--
 engines/cine/detection.cpp            |  2 +-
 engines/hugo/util.cpp                 |  2 +-
 engines/kyra/gui.cpp                  |  2 +-
 engines/mohawk/livingbooks_code.cpp   |  8 ++++----
 engines/parallaction/dialogue.cpp     |  2 +-
 engines/parallaction/parser_br.cpp    | 12 ++++++------
 engines/parallaction/parser_ns.cpp    |  2 +-
 engines/queen/talk.cpp                |  2 +-
 engines/saga/interface.cpp            |  4 ++--
 engines/sci/engine/kstring.cpp        |  6 +++---
 engines/sci/graphics/text16.cpp       |  2 +-
 engines/sci/parser/vocabulary.cpp     |  2 +-
 engines/sci/resource.cpp              |  4 ++--
 engines/sci/resource_audio.cpp        |  2 +-
 engines/scumm/smush/smush_player.cpp  |  4 ++--
 engines/scumm/string.cpp              |  8 ++++----
 engines/sky/control.cpp               |  2 +-
 engines/sky/detection.cpp             |  2 +-
 engines/sword1/animation.cpp          |  4 ++--
 engines/sword25/util/lua/lbaselib.cpp |  2 +-
 engines/sword25/util/lua/llex.cpp     | 22 +++++++++++-----------
 engines/sword25/util/lua/lobject.cpp  |  2 +-
 28 files changed, 60 insertions(+), 60 deletions(-)

(limited to 'engines')

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index e1c52c7c5e..e9c9645768 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -250,7 +250,7 @@ void AgiEngine::processEvents() {
 				// Not a special key, so get the ASCII code for it
 				key = event.kbd.ascii;
 
-				if (isAlpha(key)) {
+				if (Common::isAlpha(key)) {
 					// Key is A-Z.
 					// Map Ctrl-A to 1, Ctrl-B to 2, etc.
 					if (event.kbd.flags & Common::KBD_CTRL) {
diff --git a/engines/agi/wagparser.cpp b/engines/agi/wagparser.cpp
index 00602420e2..61feac5d17 100644
--- a/engines/agi/wagparser.cpp
+++ b/engines/agi/wagparser.cpp
@@ -112,11 +112,11 @@ WagFileParser::~WagFileParser() {
 bool WagFileParser::checkAgiVersionProperty(const WagProperty &version) const {
 	if (version.getCode() == WagProperty::PC_INTVERSION && // Must be AGI interpreter version property
 		version.getSize() >= 3 && // Need at least three characters for a version number like "X.Y"
-		isDigit(version.getData()[0]) && // And the first character must be a digit
+		Common::isDigit(version.getData()[0]) && // And the first character must be a digit
 		(version.getData()[1] == ',' || version.getData()[1] == '.')) { // And the second a comma or a period
 
 		for (int i = 2; i < version.getSize(); i++) // And the rest must all be digits
-			if (!isDigit(version.getData()[i]))
+			if (!Common::isDigit(version.getData()[i]))
 				return false; // Bail out if found a non-digit after the decimal point
 
 		return true;
diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp
index 70540343ed..60a1376f25 100644
--- a/engines/agos/script_pn.cpp
+++ b/engines/agos/script_pn.cpp
@@ -466,8 +466,8 @@ void AGOSEngine_PN::opn_opcode35() {
 void AGOSEngine_PN::opn_opcode36() {
 	for (int i = 0; i < _dataBase[57] + 1; ++i)
 		_wordcp[i] = 0;
-	if (isSpace(*_inpp))
-		while ((*_inpp) && (isSpace(*_inpp)))
+	if (Common::isSpace(*_inpp))
+		while ((*_inpp) && (Common::isSpace(*_inpp)))
 			_inpp++;
 	if (*_inpp == 0) {
 		setScriptReturn(false);
@@ -481,7 +481,7 @@ void AGOSEngine_PN::opn_opcode36() {
 	}
 
 	int ct = 1;
-	while ((*_inpp != '.') && (*_inpp != ',') && (!isSpace(*_inpp)) && (*_inpp != '\0') &&
+	while ((*_inpp != '.') && (*_inpp != ',') && (!Common::isSpace(*_inpp)) && (*_inpp != '\0') &&
 		(*_inpp!='"')) {
 		if (ct < _dataBase[57])
 			_wordcp[ct++] = *_inpp;
@@ -581,7 +581,7 @@ void AGOSEngine_PN::opn_opcode46() {
 		return;
 	}
 	x++;
-	while ((*x != '.') && (*x != ',') && (*x != '"') && (!isSpace(*x)) && (*x != '\0'))
+	while ((*x != '.') && (*x != ',') && (*x != '"') && (!Common::isSpace(*x)) && (*x != '\0'))
 		pcf(*x++);
 	setScriptReturn(true);
 }
diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp
index 4298ff6155..ee1b9df246 100644
--- a/engines/agos/string.cpp
+++ b/engines/agos/string.cpp
@@ -152,7 +152,7 @@ const byte *AGOSEngine::getStringPtrByID(uint16 stringId, bool upperCase) {
 	}
 
 	if (upperCase && *dst) {
-		if (isLower(*dst))
+		if (Common::isLower(*dst))
 			*dst = toupper(*dst);
 	}
 
diff --git a/engines/agos/string_pn.cpp b/engines/agos/string_pn.cpp
index 8f31da6f58..4d4e2be16a 100644
--- a/engines/agos/string_pn.cpp
+++ b/engines/agos/string_pn.cpp
@@ -137,7 +137,7 @@ void AGOSEngine_PN::pcf(uint8 ch) {
 		if ((ch != 32) || (_bp + _xofs != 50))
 			_buffer[_bp++] = ch;
 	}
-	if ((ch != 254) && (!isSpace(ch)) && (_bp < 60))
+	if ((ch != 254) && (!Common::isSpace(ch)) && (_bp < 60))
 		return;
 	/* We know have a case of needing to print the text */
 	if (_bp + _xofs > 50) {
diff --git a/engines/cge/text.cpp b/engines/cge/text.cpp
index 9fb3c95e93..fd4120d49d 100644
--- a/engines/cge/text.cpp
+++ b/engines/cge/text.cpp
@@ -72,7 +72,7 @@ int16 Text::count() {
 		strcpy(tmpStr, line.c_str());
 		if ((s = strtok(tmpStr, " =,;/\t\n")) == NULL)
 			continue;
-		if (!isDigit(*s))
+		if (!Common::isDigit(*s))
 			continue;
 
 		counter++;
@@ -105,7 +105,7 @@ void Text::load() {
 		strcpy(tmpStr, line.c_str());
 		if ((s = strtok(tmpStr, " =,;/\t\n")) == NULL)
 			continue;
-		if (!isDigit(*s))
+		if (!Common::isDigit(*s))
 			continue;
 
 		int r = atoi(s);
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index 65b2285f11..823b8e38b5 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -141,7 +141,7 @@ SaveStateList CineMetaEngine::listSaves(const char *target) const {
 
 		for (file = filenames.begin(); file != filenames.end(); ++file) {
 			// Jump over savegame files that don't end with a digit (e.g. "fw.3" is ok, "fw.a" is not).
-			if (!isDigit(file->lastChar()))
+			if (!Common::isDigit(file->lastChar()))
 				continue;
 
 			// Obtain the last digit of the filename, since they correspond to the save slot
diff --git a/engines/hugo/util.cpp b/engines/hugo/util.cpp
index 1428fc93a3..fdc676e6a7 100644
--- a/engines/hugo/util.cpp
+++ b/engines/hugo/util.cpp
@@ -119,7 +119,7 @@ char *strlwr(char *buffer) {
 	char *result = buffer;
 
 	while (*buffer != '\0') {
-		if (isUpper(*buffer))
+		if (Common::isUpper(*buffer))
 			*buffer = tolower(*buffer);
 		buffer++;
 	}
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp
index 07d8b307f3..1156b17957 100644
--- a/engines/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
@@ -56,7 +56,7 @@ void GUI::updateSaveFileList(Common::String targetName, bool excludeQuickSaves)
 		s1 = (*i)[i->size() - 3];
 		s2 = (*i)[i->size() - 2];
 		s3 = (*i)[i->size() - 1];
-		if (!isDigit(s1) || !isDigit(s2) || !isDigit(s3))
+		if (!Common::isDigit(s1) || !Common::isDigit(s2) || !Common::isDigit(s3))
 			continue;
 		s1 -= '0';
 		s2 -= '0';
diff --git a/engines/mohawk/livingbooks_code.cpp b/engines/mohawk/livingbooks_code.cpp
index b961e20f78..bb8f7a0d05 100644
--- a/engines/mohawk/livingbooks_code.cpp
+++ b/engines/mohawk/livingbooks_code.cpp
@@ -1766,7 +1766,7 @@ uint LBCode::parseCode(const Common::String &source) {
 			{
 			Common::String tempString;
 			while (pos < source.size()) {
-				if (!isAlpha(source[pos]) && !isDigit(source[pos]))
+				if (!Common::isAlpha(source[pos]) && !Common::isDigit(source[pos]))
 					break;
 				tempString += source[pos++];
 			}
@@ -1777,7 +1777,7 @@ uint LBCode::parseCode(const Common::String &source) {
 			}
 			break;
 		default:
-			if (isDigit(token)) {
+			if (Common::isDigit(token)) {
 				const char *in = source.c_str() + pos - 1;
 				// FIXME: handle floats?
 				char *endptr;
@@ -1792,11 +1792,11 @@ uint LBCode::parseCode(const Common::String &source) {
 				WRITE_BE_UINT16(tmp, (int16)intValue);
 				code.push_back(tmp[0]);
 				code.push_back(tmp[1]);
-			} else if (isAlpha(token)) {
+			} else if (Common::isAlpha(token)) {
 				Common::String tempString;
 				tempString += token;
 				while (pos < source.size()) {
-					if (!isAlpha(source[pos]) && !isDigit(source[pos]))
+					if (!Common::isAlpha(source[pos]) && !Common::isDigit(source[pos]))
 						break;
 					tempString += source[pos++];
 				}
diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index 3bb4404b98..e0bd6a6677 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -381,7 +381,7 @@ protected:
 	}
 
 	void accumPassword(uint16 ascii) {
-		if (!isDigit(ascii)) {
+		if (!Common::isDigit(ascii)) {
 			return;
 		}
 
diff --git a/engines/parallaction/parser_br.cpp b/engines/parallaction/parser_br.cpp
index fb6a4102d1..82940340bc 100644
--- a/engines/parallaction/parser_br.cpp
+++ b/engines/parallaction/parser_br.cpp
@@ -524,14 +524,14 @@ DECLARE_COMMAND_PARSER(location)  {
 	ctxt.cmd->_startPos.x = -1000;
 	ctxt.cmd->_startPos2.x = -1000;
 	if (_tokens[ctxt.nextToken][0] != '\0') {
-		if (isDigit(_tokens[ctxt.nextToken][0]) || _tokens[ctxt.nextToken][0] == '-') {
+		if (Common::isDigit(_tokens[ctxt.nextToken][0]) || _tokens[ctxt.nextToken][0] == '-') {
 			ctxt.cmd->_startPos.x = atoi(_tokens[ctxt.nextToken]);
 			ctxt.nextToken++;
 			ctxt.cmd->_startPos.y = atoi(_tokens[ctxt.nextToken]);
 			ctxt.nextToken++;
 		}
 
-		if (isDigit(_tokens[ctxt.nextToken][0]) || _tokens[ctxt.nextToken][0] == '-') {
+		if (Common::isDigit(_tokens[ctxt.nextToken][0]) || _tokens[ctxt.nextToken][0] == '-') {
 			ctxt.cmd->_startPos2.x = atoi(_tokens[ctxt.nextToken]);
 			ctxt.nextToken++;
 			ctxt.cmd->_startPos2.y = atoi(_tokens[ctxt.nextToken]);
@@ -677,7 +677,7 @@ DECLARE_COMMAND_PARSER(text)  {
 
 	createCommand(_parser->_lookup);
 
-	if (isDigit(_tokens[1][1])) {
+	if (Common::isDigit(_tokens[1][1])) {
 		ctxt.cmd->_zeta0 = atoi(_tokens[1]);
 		ctxt.nextToken++;
 	} else {
@@ -714,7 +714,7 @@ DECLARE_COMMAND_PARSER(unary)  {
 DECLARE_ZONE_PARSER(limits)  {
 	debugC(7, kDebugParser, "ZONE_PARSER(limits) ");
 
-	if (isAlpha(_tokens[1][1])) {
+	if (Common::isAlpha(_tokens[1][1])) {
 		ctxt.z->_flags |= kFlagsAnimLinked;
 		ctxt.z->_linkedName = _tokens[1];
 	} else {
@@ -1003,7 +1003,7 @@ DECLARE_INSTRUCTION_PARSER(text)  {
 
 	int _si = 1;
 
-	if (isDigit(_tokens[1][1])) {
+	if (Common::isDigit(_tokens[1][1])) {
 		ctxt.inst->_y = atoi(_tokens[1]);
 		_si = 2;
 	} else {
@@ -1066,7 +1066,7 @@ DECLARE_INSTRUCTION_PARSER(endif)  {
 
 void ProgramParser_br::parseRValue(ScriptVar &v, const char *str) {
 
-	if (isDigit(str[0]) || str[0] == '-') {
+	if (Common::isDigit(str[0]) || str[0] == '-') {
 		v.setImmediate(atoi(str));
 		return;
 	}
diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp
index 13c42b30e1..36b8640a60 100644
--- a/engines/parallaction/parser_ns.cpp
+++ b/engines/parallaction/parser_ns.cpp
@@ -534,7 +534,7 @@ DECLARE_INSTRUCTION_PARSER(endscript)  {
 
 void ProgramParser_ns::parseRValue(ScriptVar &v, const char *str) {
 
-	if (isDigit(str[0]) || str[0] == '-') {
+	if (Common::isDigit(str[0]) || str[0] == '-') {
 		v.setImmediate(atoi(str));
 		return;
 	}
diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index 72cb40bd7a..94bc105bb0 100644
--- a/engines/queen/talk.cpp
+++ b/engines/queen/talk.cpp
@@ -657,7 +657,7 @@ void Talk::stringAnimation(const SpeechParameters *parameters, int startFrame, i
 	} else if (parameters->animation[0] == 'E') {
 		// Talking head animation
 		return;
-	} else if (!isDigit(parameters->animation[0])) {
+	} else if (!Common::isDigit(parameters->animation[0])) {
 		debug(6, "Error in speak string animation: '%s'", parameters->animation);
 		return;
 	} else
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index dd99f5854a..a7bd7edbe5 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -1151,7 +1151,7 @@ void Interface::processStatusTextInput(Common::KeyState keystate) {
 		if (_statusTextInputPos >= STATUS_TEXT_INPUT_MAX) {
 			break;
 		}
-		if (isAlnum(keystate.ascii) || (keystate.ascii == ' ')) {
+		if (Common::isAlnum(keystate.ascii) || (keystate.ascii == ' ')) {
 			_statusTextInputString[_statusTextInputPos++] = keystate.ascii;
 			_statusTextInputString[_statusTextInputPos] = 0;
 		}
@@ -1209,7 +1209,7 @@ bool Interface::processTextInput(Common::KeyState keystate) {
 		_textInputPos = _textInputStringLength + 1;
 		break;
 	default:
-		if (((keystate.ascii <= 255) && (isAlnum(keystate.ascii))) || (keystate.ascii == ' ') ||
+		if (((keystate.ascii <= 255) && (Common::isAlnum(keystate.ascii))) || (keystate.ascii == ' ') ||
 		    (keystate.ascii == '-') || (keystate.ascii == '_')) {
 			if (_textInputStringLength < save_title_size - 1) {
 				ch[0] = keystate.ascii;
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 735b1b2187..fe8d631497 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -147,7 +147,7 @@ reg_t kReadNumber(EngineState *s, int argc, reg_t *argv) {
 	Common::String source_str = s->_segMan->getString(argv[0]);
 	const char *source = source_str.c_str();
 
-	while (isSpace(*source))
+	while (Common::isSpace(*source))
 		source++; /* Skip whitespace */
 
 	int16 result = 0;
@@ -246,14 +246,14 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
 
 			/* int writelength; -- unused atm */
 
-			if (xfer && (isDigit(xfer) || xfer == '-' || xfer == '=')) {
+			if (xfer && (Common::isDigit(xfer) || xfer == '-' || xfer == '=')) {
 				char *destp;
 
 				if (xfer == '0')
 					fillchar = '0';
 				else if (xfer == '=')
 					align = ALIGN_CENTER;
-				else if (isDigit(xfer) || (xfer == '-'))
+				else if (Common::isDigit(xfer) || (xfer == '-'))
 					source--; // Go to start of length argument
 
 				strLength = strtol(source, &destp, 10);
diff --git a/engines/sci/graphics/text16.cpp b/engines/sci/graphics/text16.cpp
index bd89e237f0..7eaa0168b8 100644
--- a/engines/sci/graphics/text16.cpp
+++ b/engines/sci/graphics/text16.cpp
@@ -100,7 +100,7 @@ int16 GfxText16::CodeProcessing(const char *&text, GuiResourceId orgFontId, int1
 	//  cX -> sets textColor to _textColors[X-1]
 	curCode = textCode[0];
 	curCodeParm = textCode[1];
-	if (isDigit(curCodeParm)) {
+	if (Common::isDigit(curCodeParm)) {
 		curCodeParm -= '0';
 	} else {
 		curCodeParm = -1;
diff --git a/engines/sci/parser/vocabulary.cpp b/engines/sci/parser/vocabulary.cpp
index 44e11d5b1f..e56158ecc1 100644
--- a/engines/sci/parser/vocabulary.cpp
+++ b/engines/sci/parser/vocabulary.cpp
@@ -534,7 +534,7 @@ bool Vocabulary::tokenizeString(ResultWordListList &retval, const char *sentence
 	do {
 
 		c = sentence[pos_in_sentence++];
-		if (isAlnum(c) || (c == '-' && wordLen) || (c >= 0x80)) {
+		if (Common::isAlnum(c) || (c == '-' && wordLen) || (c >= 0x80)) {
 			currentWord[wordLen] = lowerCaseMap[c];
 			++wordLen;
 		}
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index a95a7e9b35..50b3387159 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1558,7 +1558,7 @@ void ResourceManager::readResourcePatches() {
 			name = (*x)->getName();
 
 			// SCI1 scheme
-			if (isDigit(name[0])) {
+			if (Common::isDigit(name[0])) {
 				char *end = 0;
 				resourceNr = strtol(name.c_str(), &end, 10);
 				bAdd = (*end == '.'); // Ensure the next character is the period
@@ -1566,7 +1566,7 @@ void ResourceManager::readResourcePatches() {
 				// SCI0 scheme
 				int resname_len = strlen(szResType);
 				if (scumm_strnicmp(name.c_str(), szResType, resname_len) == 0
-					&& !isAlpha(name[resname_len + 1])) {
+					&& !Common::isAlpha(name[resname_len + 1])) {
 					resourceNr = atoi(name.c_str() + resname_len + 1);
 					bAdd = true;
 				}
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 4eb94cca69..684e1a1d0d 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -198,7 +198,7 @@ void ResourceManager::readWaveAudioPatches() {
 	for (Common::ArchiveMemberList::const_iterator x = files.begin(); x != files.end(); ++x) {
 		Common::String name = (*x)->getName();
 
-		if (isDigit(name[0]))
+		if (Common::isDigit(name[0]))
 			processWavePatch(ResourceId(kResourceTypeAudio, atoi(name.c_str())), name);
 	}
 }
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 36de5e470b..a53b808ba1 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -90,13 +90,13 @@ public:
 			assert(def_end != NULL);
 
 			char *id_end = def_end;
-			while (id_end >= def_start && !isDigit(*(id_end-1))) {
+			while (id_end >= def_start && !Common::isDigit(*(id_end-1))) {
 				id_end--;
 			}
 
 			assert(id_end > def_start);
 			char *id_start = id_end;
-			while (isDigit(*(id_start - 1))) {
+			while (Common::isDigit(*(id_start - 1))) {
 				id_start--;
 			}
 
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 8a689fffa9..bcb45e2e92 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1389,10 +1389,10 @@ void ScummEngine_v7::loadLanguageBundle() {
 			} else if (*ptr == '#') {
 				// Number of subtags following a given basetag. We don't need that
 				// information so we just skip it
-			} else if (isDigit(*ptr)) {
+			} else if (Common::isDigit(*ptr)) {
 				int idx = 0;
 				// A number (up to three digits)...
-				while (isDigit(*ptr)) {
+				while (Common::isDigit(*ptr)) {
 					idx = idx * 10 + (*ptr - '0');
 					ptr++;
 				}
@@ -1430,12 +1430,12 @@ void ScummEngine_v7::loadLanguageBundle() {
 		for (i = 0; i < _languageIndexSize; i++) {
 			// First 8 chars in the line give the string ID / 'tag'
 			int j;
-			for (j = 0; j < 8 && !isSpace(*ptr); j++, ptr++)
+			for (j = 0; j < 8 && !Common::isSpace(*ptr); j++, ptr++)
 				_languageIndex[i].tag[j] = toupper(*ptr);
 			_languageIndex[i].tag[j] = 0;
 
 			// After that follows a single space which we skip
-			assert(isSpace(*ptr));
+			assert(Common::isSpace(*ptr));
 			ptr++;
 
 			// Then comes the translated string: we record an offset to that.
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index 6363789d3a..036659a677 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -974,7 +974,7 @@ void Control::handleKeyPress(Common::KeyState kbd, Common::String &textBuf) {
 
 		// Allow the key only if is a letter, a digit, or one of a selected
 		// list of extra characters
-		if (isAlnum(kbd.ascii) || strchr(" ,().='-&+!?\"", kbd.ascii) != 0) {
+		if (Common::isAlnum(kbd.ascii) || strchr(" ,().='-&+!?\"", kbd.ascii) != 0) {
 			textBuf += kbd.ascii;
 		}
 	}
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index 51f7330f09..2b702e99ea 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -206,7 +206,7 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const {
 		// Extract the extension
 		Common::String ext = file->c_str() + file->size() - 3;
 		ext.toUppercase();
-		if (isDigit(ext[0]) && isDigit(ext[1]) && isDigit(ext[2])) {
+		if (Common::isDigit(ext[0]) && Common::isDigit(ext[1]) && Common::isDigit(ext[2])) {
 			int slotNum = atoi(ext.c_str());
 			Common::InSaveFile *in = saveFileMan->openForLoading(*file);
 			if (in) {
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index a1c02c861a..e274e02cfd 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -115,7 +115,7 @@ bool MoviePlayer::load(uint32 id) {
 				int startFrame = strtoul(ptr, const_cast<char **>(&ptr), 10);
 				int endFrame = strtoul(ptr, const_cast<char **>(&ptr), 10);
 
-				while (*ptr && isSpace(*ptr))
+				while (*ptr && Common::isSpace(*ptr))
 					ptr++;
 
 				if (startFrame > endFrame) {
@@ -132,7 +132,7 @@ bool MoviePlayer::load(uint32 id) {
 				if (*ptr == '@') {
 					++ptr;
 					color = strtoul(ptr, const_cast<char **>(&ptr), 10);
-					while (*ptr && isSpace(*ptr))
+					while (*ptr && Common::isSpace(*ptr))
 						ptr++;
 				} 
 
diff --git a/engines/sword25/util/lua/lbaselib.cpp b/engines/sword25/util/lua/lbaselib.cpp
index 940ddcd4f9..659c61d956 100644
--- a/engines/sword25/util/lua/lbaselib.cpp
+++ b/engines/sword25/util/lua/lbaselib.cpp
@@ -59,7 +59,7 @@ static int luaB_tonumber (lua_State *L) {
     luaL_argcheck(L, 2 <= base && base <= 36, 2, "base out of range");
     n = strtoul(s1, &s2, base);
     if (s1 != s2) {  /* at least one valid digit? */
-      while (isSpace(*s2)) s2++;  /* skip trailing spaces */
+      while (Common::isSpace(*s2)) s2++;  /* skip trailing spaces */
       if (*s2 == '\0') {  /* no invalid trailing characters? */
         lua_pushnumber(L, (lua_Number)n);
         return 1;
diff --git a/engines/sword25/util/lua/llex.cpp b/engines/sword25/util/lua/llex.cpp
index 6c7eb78060..f8433d3afa 100644
--- a/engines/sword25/util/lua/llex.cpp
+++ b/engines/sword25/util/lua/llex.cpp
@@ -186,7 +186,7 @@ static void trydecpoint (LexState *ls, SemInfo *seminfo) {
   sprintf(buf, "%.1f", 1.0);
   ls->decpoint = '.';
   for (i = 0; buf[i]; i++) {
-    if (!isSpace(buf[i]) && !isDigit(buf[i])) {
+    if (!Common::isSpace(buf[i]) && !Common::isDigit(buf[i])) {
       ls->decpoint = buf[i];
       break;
     }
@@ -202,13 +202,13 @@ static void trydecpoint (LexState *ls, SemInfo *seminfo) {
 
 /* LUA_NUMBER */
 static void read_numeral (LexState *ls, SemInfo *seminfo) {
-  lua_assert(isDigit(ls->current));
+  lua_assert(Common::isDigit(ls->current));
   do {
     save_and_next(ls);
-  } while (isDigit(ls->current) || ls->current == '.');
+  } while (Common::isDigit(ls->current) || ls->current == '.');
   if (check_next(ls, "Ee"))  /* `E'? */
     check_next(ls, "+-");  /* optional exponent sign */
-  while (isAlnum(ls->current) || ls->current == '_')
+  while (Common::isAlnum(ls->current) || ls->current == '_')
     save_and_next(ls);
   save(ls, '\0');
   buffreplace(ls, '.', ls->decpoint);  /* follow locale for decimal point */
@@ -311,7 +311,7 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
           case '\r': save(ls, '\n'); inclinenumber(ls); continue;
           case EOZ: continue;  /* will raise an error next loop */
           default: {
-            if (!isDigit(ls->current))
+            if (!Common::isDigit(ls->current))
               save_and_next(ls);  /* handles \\, \", \', and \? */
             else {  /* \xxx */
               int i = 0;
@@ -319,7 +319,7 @@ static void read_string (LexState *ls, int del, SemInfo *seminfo) {
               do {
                 c = 10*c + (ls->current-'0');
                 next(ls);
-              } while (++i<3 && isDigit(ls->current));
+              } while (++i<3 && Common::isDigit(ls->current));
               if (c > UCHAR_MAX)
                 luaX_lexerror(ls, "escape sequence too large", TK_STRING);
               save(ls, c);
@@ -410,7 +410,7 @@ static int llex (LexState *ls, SemInfo *seminfo) {
             return TK_DOTS;   /* ... */
           else return TK_CONCAT;   /* .. */
         }
-        else if (!isDigit(ls->current)) return '.';
+        else if (!Common::isDigit(ls->current)) return '.';
         else {
           read_numeral(ls, seminfo);
           return TK_NUMBER;
@@ -420,21 +420,21 @@ static int llex (LexState *ls, SemInfo *seminfo) {
         return TK_EOS;
       }
       default: {
-        if (isSpace(ls->current)) {
+        if (Common::isSpace(ls->current)) {
           lua_assert(!currIsNewline(ls));
           next(ls);
           continue;
         }
-        else if (isDigit(ls->current)) {
+        else if (Common::isDigit(ls->current)) {
           read_numeral(ls, seminfo);
           return TK_NUMBER;
         }
-        else if (isAlpha(ls->current) || ls->current == '_') {
+        else if (Common::isAlpha(ls->current) || ls->current == '_') {
           /* identifier or reserved word */
           TString *ts;
           do {
             save_and_next(ls);
-          } while (isAlnum(ls->current) || ls->current == '_');
+          } while (Common::isAlnum(ls->current) || ls->current == '_');
           ts = luaX_newstring(ls, luaZ_buffer(ls->buff),
                                   luaZ_bufflen(ls->buff));
           if (ts->tsv.reserved > 0)  /* reserved word? */
diff --git a/engines/sword25/util/lua/lobject.cpp b/engines/sword25/util/lua/lobject.cpp
index 1890aaae68..1ffee52556 100644
--- a/engines/sword25/util/lua/lobject.cpp
+++ b/engines/sword25/util/lua/lobject.cpp
@@ -90,7 +90,7 @@ int luaO_str2d (const char *s, lua_Number *result) {
   if (*endptr == 'x' || *endptr == 'X')  /* maybe an hexadecimal constant? */
     *result = cast_num(strtoul(s, &endptr, 16));
   if (*endptr == '\0') return 1;  /* most common case */
-  while (isSpace(*endptr)) endptr++;
+  while (Common::isSpace(*endptr)) endptr++;
   if (*endptr != '\0') return 0;  /* invalid trailing characters? */
   return 1;
 }
-- 
cgit v1.2.3


From ab5c3e2dad5b1c3493b686647dc73094979fc208 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 17 Jan 2012 23:11:00 +0100
Subject: KYRA: (EOB) - move EOB 1 intro code into separate class

---
 engines/kyra/eob.cpp           |  10 +-
 engines/kyra/eob.h             |  37 +-
 engines/kyra/sequences_eob.cpp | 831 ++++++++++++++++++++++-------------------
 engines/kyra/staticres_eob.cpp |  21 --
 4 files changed, 455 insertions(+), 444 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob.cpp b/engines/kyra/eob.cpp
index a2ddc928fd..40b028184f 100644
--- a/engines/kyra/eob.cpp
+++ b/engines/kyra/eob.cpp
@@ -33,18 +33,14 @@ EoBEngine::EoBEngine(OSystem *system, const GameFlags &flags)
 	_numSpells = 53;
 	_menuChoiceInit = 4;
 
-	_turnUndeadString = _introFilesOpening = _introFilesTower = _introFilesOrb = 0;
-	_introFilesWdEntry = _introFilesKing = _introFilesHands = _introFilesWdExit = 0;
-	_introFilesTunnel = _finBonusStrings = _npcStrings[1] = _npcStrings[2] = 0;
+	_turnUndeadString = 0;
+	_finBonusStrings = _npcStrings[1] = _npcStrings[2] = 0;
 	_npcStrings[3] = _npcStrings[4] = _npcStrings[5] = _npcStrings[6] = 0;
 	_npcStrings[7] = _npcStrings[8] = _npcStrings[9] = _npcStrings[10] = 0;
-	_introOpeningFrmDelay = _introWdEncodeX = _introWdEncodeY = _introWdEncodeWH = 0;
-	_npcShpData = _npcSubShpIndex1 = _npcSubShpIndex2 = _npcSubShpY = _introWdDsY = 0;
-	_introTvlX1 = _introTvlY1 = _introTvlX2 = _introTvlY2 = _introTvlW = _introTvlH = 0;
+	_npcShpData = _npcSubShpIndex1 = _npcSubShpIndex2 = _npcSubShpY = 0;
 	_dscDoorScaleMult4 = _dscDoorScaleMult5 = _dscDoorScaleMult6 = _dscDoorY3 = 0;
 	_dscDoorY4 = _dscDoorY5 = _dscDoorY6 = _dscDoorY7 = _doorShapeEncodeDefs = 0;
 	_doorSwitchShapeEncodeDefs = _doorSwitchCoords = 0;
-	_introWdDsX = 0;
 	_dscDoorCoordsExt = 0;
 }
 
diff --git a/engines/kyra/eob.h b/engines/kyra/eob.h
index ce71c76af4..89d2b25b23 100644
--- a/engines/kyra/eob.h
+++ b/engines/kyra/eob.h
@@ -31,6 +31,7 @@ namespace Kyra {
 
 class EoBEngine : public EoBCoreEngine {
 friend class GUI_EoB;
+friend class EoBIntroPlayer;
 public:
 	EoBEngine(OSystem *system, const GameFlags &flags);
 	~EoBEngine();
@@ -51,46 +52,10 @@ private:
 	void startupLoad();
 
 	// Intro/Outro
-	void seq_playOpeningCredits();
 	void seq_playIntro();
 	void seq_playFinale();
-
-	void seq_tower();
-	void seq_orb();
-	void seq_waterdeepEntry();
-	void seq_king();
-	void seq_hands();
-	void seq_waterdeepExit();
-	void seq_tunnel();
-
 	void seq_xdeath();
 
-	void loadSetIntroPalette(const char *filename);
-	void copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step);
-	void boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH);
-	void whirlTransition();
-
-	const char *const *_introFilesOpening;
-	const char *const *_introFilesTower;
-	const char *const *_introFilesOrb;
-	const char *const *_introFilesWdEntry;
-	const char *const *_introFilesKing;
-	const char *const *_introFilesHands;
-	const char *const *_introFilesWdExit;
-	const char *const *_introFilesTunnel;
-	const uint8 *_introOpeningFrmDelay;
-	const uint8 *_introWdEncodeX;
-	const uint8 *_introWdEncodeY;
-	const uint8 *_introWdEncodeWH;
-	const uint16 *_introWdDsX;
-	const uint8 *_introWdDsY;
-	const uint8 *_introTvlX1;
-	const uint8 *_introTvlY1;
-	const uint8 *_introTvlX2;
-	const uint8 *_introTvlY2;
-	const uint8 *_introTvlW;
-	const uint8 *_introTvlH;
-
 	const char *const *_finBonusStrings;
 
 	// characters
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index 64f88e95ce..f18c67f659 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -33,111 +33,89 @@
 
 namespace Kyra {
 
-int EoBEngine::mainMenu() {
-	int menuChoice = _menuChoiceInit;
-	_menuChoiceInit = 0;
-
-	Screen::FontId of = _screen->_currentFont;
-
-	while (menuChoice >= 0 && !shouldQuit()) {
-		switch (menuChoice) {
-		case 0: {
-			_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
-			_screen->loadEoBBitmap("INTRO", 0, 5, 3, 2);
-			_screen->setScreenPalette(_screen->getPalette(0));
-			_screen->_curPage = 2;
-			of = _screen->setFont(Screen::FID_6_FNT);
-			Common::String versionString(Common::String::format("ScummVM %s", gScummVMVersion));
-			_screen->printText(versionString.c_str(), 280 - versionString.size() * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
-			_screen->setFont(of);
-			_screen->fillRect(0, 159, 319, 199, _screen->getPagePixel(2, 0, 0));
-			gui_drawBox(77, 165, 173, 29, 13, 14, 12);
-			gui_drawBox(76, 164, 175, 31, 13, 14, -1);
-			_screen->_curPage = 0;
-			_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
-			_screen->updateScreen();
-			_allowImport = true;
-			menuChoice = mainMenuLoop();
-			_allowImport = false;
-			} break;
-
-		case 1:
-			// load game in progress
-			//
-			menuChoice = -1;
-			break;
-
-		case 2:
-			// create new party
-			menuChoice = -2;
-			break;
-
-		case 3:
-			// quit
-			menuChoice = -5;
-			break;
-
-		case 4:
-			// intro
-			_sound->loadSoundFile("SOUND");
-			_screen->hideMouse();
-			seq_playOpeningCredits();
-			seq_playIntro();
-			_screen->showMouse();
-			_sound->loadSoundFile("ADLIB");
-			menuChoice = 0;
-			break;
-		}
-	}
-
-	return shouldQuit() ? -5 : menuChoice;
-}
-
-int EoBEngine::mainMenuLoop() {
-	int sel = -1;
-	do {
-		_screen->setScreenDim(28);
-		_gui->simpleMenu_setup(8, 0, _mainMenuStrings, -1, 0, 0);
-
-		while (sel == -1 && !shouldQuit())
-			sel = _gui->simpleMenu_process(8, _mainMenuStrings, 0, -1, 0);
-	} while ((sel < 0 || sel > 5) && !shouldQuit());
-
-	return sel + 1;
-}
-
-void EoBEngine::seq_playOpeningCredits() {
-	_allowSkip = true;
-
-	loadSetIntroPalette(_introFilesOpening[5]);
-	_screen->loadBitmap(_introFilesOpening[4], 5, 3, 0);
-	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
-	_screen->updateScreen();
-
-	snd_playSong(1);
-	delay(_introOpeningFrmDelay[0] * _tickLength);
-
-	for (int i = 0; i < 4 && !shouldQuit() && !skipFlag(); i++) {
-		_screen->loadBitmap(_introFilesOpening[i], 5, 3, 0);
-		uint32 nextFrameTimer = _system->getMillis() + _introOpeningFrmDelay[i + 1] * _tickLength;
-		_screen->crossFadeRegion(0, 50, 0, 50, 320, 102, 2, 0);
-		delayUntil(nextFrameTimer);
-	}
-
-	_allowSkip = false;
+class EoBIntroPlayer {
+public:
+	EoBIntroPlayer(EoBEngine *vm, Screen_EoB *screen);
+	~EoBIntroPlayer() {}
+
+	void start();
+
+private:
+	void openingCredits();
+	void tower();
+	void orb();
+	void waterdeepEntry();
+	void king();
+	void hands();
+	void waterdeepExit();
+	void tunnel();
+
+	void loadAndSetPalette(const char *filename);
+	void copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step);
+	void boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH);
+	void whirlTransition();
+
+	EoBEngine *_vm;
+	Screen_EoB *_screen;
+
+	const char *const *_filesOpening;
+	const char *const *_filesTower;
+	const char *const *_filesOrb;
+	const char *const *_filesWdEntry;
+	const char *const *_filesKing;
+	const char *const *_filesHands;
+	const char *const *_filesWdExit;
+	const char *const *_filesTunnel;
+	const uint8 *_openingFrmDelay;
+	const uint8 *_wdEncodeX;
+	const uint8 *_wdEncodeY;
+	const uint8 *_wdEncodeWH;
+	const uint16 *_wdDsX;
+	const uint8 *_wdDsY;
+	const uint8 *_tvlX1;
+	const uint8 *_tvlY1;
+	const uint8 *_tvlX2;
+	const uint8 *_tvlY2;
+	const uint8 *_tvlW;
+	const uint8 *_tvlH;
+};
+
+EoBIntroPlayer::EoBIntroPlayer(EoBEngine *vm, Screen_EoB *screen) : _vm(vm), _screen(screen) {
+	int temp = 0;
+	_filesOpening = _vm->staticres()->loadStrings(kEoB1IntroFilesOpening, temp);
+	_filesTower = _vm->staticres()->loadStrings(kEoB1IntroFilesTower, temp);
+	_filesOrb = _vm->staticres()->loadStrings(kEoB1IntroFilesOrb, temp);
+	_filesWdEntry = _vm->staticres()->loadStrings(kEoB1IntroFilesWdEntry, temp);
+	_filesKing = _vm->staticres()->loadStrings(kEoB1IntroFilesKing, temp);
+	_filesHands = _vm->staticres()->loadStrings(kEoB1IntroFilesHands, temp);
+	_filesWdExit = _vm->staticres()->loadStrings(kEoB1IntroFilesWdExit, temp);
+	_filesTunnel = _vm->staticres()->loadStrings(kEoB1IntroFilesTunnel, temp);
+	_openingFrmDelay = _vm->staticres()->loadRawData(kEoB1IntroOpeningFrmDelay, temp);
+	_wdEncodeX = _vm->staticres()->loadRawData(kEoB1IntroWdEncodeX, temp);
+	_wdEncodeY = _vm->staticres()->loadRawData(kEoB1IntroWdEncodeY, temp);
+	_wdEncodeWH = _vm->staticres()->loadRawData(kEoB1IntroWdEncodeWH, temp);
+	_wdDsX = _vm->staticres()->loadRawDataBe16(kEoB1IntroWdDsX, temp);
+	_wdDsY = _vm->staticres()->loadRawData(kEoB1IntroWdDsY, temp);
+	_tvlX1 = _vm->staticres()->loadRawData(kEoB1IntroTvlX1, temp);
+	_tvlY1 = _vm->staticres()->loadRawData(kEoB1IntroTvlY1, temp);
+	_tvlX2 = _vm->staticres()->loadRawData(kEoB1IntroTvlX2, temp);
+	_tvlY2 = _vm->staticres()->loadRawData(kEoB1IntroTvlY2, temp);
+	_tvlW = _vm->staticres()->loadRawData(kEoB1IntroTvlW, temp);
+	_tvlH = _vm->staticres()->loadRawData(kEoB1IntroTvlH, temp);
 }
 
-void EoBEngine::seq_playIntro() {
-	_allowSkip = true;
+void EoBIntroPlayer::start() {
+	_vm->_allowSkip = true;
+	openingCredits();
 
-	if (!shouldQuit() && !skipFlag()) {
-		snd_playSong(2);
+	if (!_vm->shouldQuit() && !_vm->skipFlag()) {
+		_vm->snd_playSong(2);
 		_screen->loadBitmap("TITLE-V.CMP", 5, 3, 0);
 		_screen->crossFadeRegion(0, 0, 0, 0, 320, 200, 2, 0);
-		delay(120 * _tickLength);
+		_vm->delay(120 * _vm->_tickLength);
 	}
 
-	Common::SeekableReadStream *s = _res->createReadStream("TEXT.RAW");
+	Common::SeekableReadStream *s = _vm->resource()->createReadStream("TEXT.RAW");
 	if (s) {
 		s->seek(768);
 		_screen->loadFileDataToPage(s, 6, s->size() - 768);
@@ -146,65 +124,41 @@ void EoBEngine::seq_playIntro() {
 		_screen->loadBitmap("TEXT.CMP", 3, 6, 0);
 	}
 
-	seq_tower();
-	seq_orb();
-	seq_waterdeepEntry();
-	seq_king();
-	seq_hands();
-	seq_waterdeepExit();
-	seq_tunnel();
+	tower();
+	orb();
+	waterdeepEntry();
+	king();
+	hands();
+	waterdeepExit();
+	tunnel();
 
 	whirlTransition();
-	_sound->haltTrack();
-	_allowSkip = false;
+	_vm->snd_stopSound();
+	_vm->_allowSkip = false;
 }
 
-void EoBEngine::seq_playFinale() {
-	Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
-	_screen->loadFileDataToPage(s, 5, 32000);
-	delete s;
-
-	snd_playSoundEffect(20);
-
-	_txt->resetPageBreakString();
-	_txt->setWaitButtonMode(1);
-	_txt->setupField(12, true);
-	gui_drawBox(0, 0, 176, 175, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
-	_txt->printDialogueText(51, _moreStrings[0]);
-
-	if (!checkScriptFlags(0x1ffe)) {
-		_screen->fadeToBlack();
-		return;
-	}
-
-	_txt->printDialogueText(_finBonusStrings[0]);
-	for (int i = 0; i < 6; i++) {
-		_txt->printDialogueText(_finBonusStrings[1]);
-		if (_characters[i].flags & 1)
-			_txt->printDialogueText(_characters[i].name);
-	}
+void EoBIntroPlayer::openingCredits() {
+	loadAndSetPalette(_filesOpening[5]);
+	_screen->loadBitmap(_filesOpening[4], 5, 3, 0);
+	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->updateScreen();
 
-	uint32 password = 0;
-	for (int i = 0; i < 4; i++) {
-		if (!(_characters[i].flags & 1))
-			continue;
+	_vm->snd_playSong(1);
+	_vm->delay(_openingFrmDelay[0] * _vm->_tickLength);
 
-		int len = strlen(_characters[i].name);
-		for (int ii = 0; ii < len; ii++) {
-			uint32 c = _characters[i].name[ii];
-			password += (c * c);
-		}
+	for (int i = 0; i < 4 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
+		_screen->loadBitmap(_filesOpening[i], 5, 3, 0);
+		uint32 nextFrameTimer = _vm->_system->getMillis() + _openingFrmDelay[i + 1] * _vm->_tickLength;
+		_screen->crossFadeRegion(0, 50, 0, 50, 320, 102, 2, 0);
+		_vm->delayUntil(nextFrameTimer);
 	}
-
-	_txt->printDialogueText(Common::String::format(_finBonusStrings[2], password).c_str(), true);
-	_screen->fadeToBlack();
 }
 
-void EoBEngine::seq_tower() {
-	if (shouldQuit() || skipFlag())
+void EoBIntroPlayer::tower() {
+	if (_vm->shouldQuit() || _vm->skipFlag())
 		return;
 
-	_screen->loadBitmap(_introFilesTower[1], 5, 3, 0);
+	_screen->loadBitmap(_filesTower[1], 5, 3, 0);
 	_screen->setCurPage(2);
 	uint8 *shp = _screen->encodeShape(0, 0, 16, 56, true);
 	_screen->copyPage(3, 4);
@@ -216,7 +170,7 @@ void EoBEngine::seq_tower() {
 	_screen->fillRect(0, 184, 319, 199, 12);
 	int cp = _screen->setCurPage(0);
 	whirlTransition();
-	loadSetIntroPalette(_introFilesTower[0]);
+	loadAndSetPalette(_filesTower[0]);
 
 	_screen->setCurPage(cp);
 	_screen->clearCurPage();
@@ -226,29 +180,29 @@ void EoBEngine::seq_tower() {
 
 	_screen->setCurPage(0);
 
-	for (int i = 0; i < 64 && !shouldQuit() && !skipFlag(); i += 2) {
-		uint32 end = _system->getMillis() + 2 * _tickLength;
+	for (int i = 0; i < 64 && !_vm->shouldQuit() && !_vm->skipFlag(); i += 2) {
+		uint32 end = _vm->_system->getMillis() + 2 * _vm->_tickLength;
 		_screen->copyRegion(0, 142 - i, 96, 0, 128, i + 1, 4, 0, Screen::CR_NO_P_CHECK);
 		_screen->copyRegion(0, 0, 96, i + 1, 128, 167 - i, 2, 0, Screen::CR_NO_P_CHECK);
 		if (!i)
 			_screen->copyRegion(0, 0, 0, 168, 320, 32, 6, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
-	for (int i = 0; i < 24 && !shouldQuit() && !skipFlag(); i += 2) {
-		uint32 end = _system->getMillis() + 2 * _tickLength;
+	for (int i = 0; i < 24 && !_vm->shouldQuit() && !_vm->skipFlag(); i += 2) {
+		uint32 end = _vm->_system->getMillis() + 2 * _vm->_tickLength;
 		_screen->copyRegion(0, 79 - i, 96, 0, 24, 65 + i, 4, 0, Screen::CR_NO_P_CHECK);
 		_screen->copyRegion(104, 79 - i, 200, 0, 24, 65 + i, 4, 0, Screen::CR_NO_P_CHECK);
 		_screen->copyRegion(24, 110, 120, i + 31, 80, 34, 4, 0, Screen::CR_NO_P_CHECK);
 		_screen->copyRegion(152, 0, 120, 32, 80, i + 1, 4, 0, Screen::CR_NO_P_CHECK);
 		_screen->copyRegion(0, 0, 96, 65 + i, 128, 103 - i, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
-	for (int i = 0; i < 56 && !shouldQuit() && !skipFlag(); i += 2) {
-		uint32 end = _system->getMillis() + 2 * _tickLength;
+	for (int i = 0; i < 56 && !_vm->shouldQuit() && !_vm->skipFlag(); i += 2) {
+		uint32 end = _vm->_system->getMillis() + 2 * _vm->_tickLength;
 		_screen->copyRegion(0, 56, 96, i, 24, 54, 4, 0, Screen::CR_NO_P_CHECK);
 		_screen->copyRegion(104, 56, 200, i, 24, 54, 4, 0, Screen::CR_NO_P_CHECK);
 		_screen->copyRegion(0, 110, 96, 54 + i, 128, 34, 4, 0, Screen::CR_NO_P_CHECK);
@@ -266,24 +220,24 @@ void EoBEngine::seq_tower() {
 		_screen->copyRegion(128, 0, 96, 0, 128, i + 1, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->copyRegion(0, 0, 96, i + 89, 128, 79 - i, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
 	_screen->copyRegion(0, 32, 0, 168, 320, 32, 6, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	delay(65 * _tickLength);
+	_vm->delay(65 * _vm->_tickLength);
 	delete[] shp;
 }
 
-void EoBEngine::seq_orb() {
-	if (shouldQuit() || skipFlag())
+void EoBIntroPlayer::orb() {
+	if (_vm->shouldQuit() || _vm->skipFlag())
 		return;
 
 	uint8 *shp[5];
-	_screen->loadBitmap(_introFilesOrb[0], 5, 3, 0);
+	_screen->loadBitmap(_filesOrb[0], 5, 3, 0);
 	_screen->setCurPage(2);
 	shp[4] = _screen->encodeShape(0, 0, 20, 136, true);
-	_screen->loadBitmap(_introFilesOrb[1], 5, 3, 0);
+	_screen->loadBitmap(_filesOrb[1], 5, 3, 0);
 	shp[3] = _screen->encodeShape(16, 0, 16, 104, true);
 
 	_screen->fillRect(0, 0, 127, 103, 12);
@@ -297,51 +251,51 @@ void EoBEngine::seq_orb() {
 	_screen->copyPage(3, 4);
 	_screen->clearCurPage();
 
-	snd_playSoundEffect(6);
+	_vm->snd_playSoundEffect(6);
 
-	for (int i = -1; i < 4 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + 3 * _tickLength;
+	for (int i = -1; i < 4 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
+		uint32 end = _vm->_system->getMillis() + 3 * _vm->_tickLength;
 		if (i >= 0)
 			_screen->drawShape(2, shp[i], 16, 16, 0);
 		_screen->drawShape(2, shp[4], 0, 0, 0);
 		_screen->copyRegion(0, 0, 80, 24, 160, 136, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
 	_screen->copyRegion(0, 64, 0, 168, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	delay(40 * _tickLength);
+	_vm->delay(40 * _vm->_tickLength);
 
-	snd_playSoundEffect(6);
+	_vm->snd_playSoundEffect(6);
 
-	for (int i = 3; i > -2 && !shouldQuit() && !skipFlag(); i--) {
-		uint32 end = _system->getMillis() + 3 * _tickLength;
+	for (int i = 3; i > -2 && !_vm->shouldQuit() && !_vm->skipFlag(); i--) {
+		uint32 end = _vm->_system->getMillis() + 3 * _vm->_tickLength;
 		_screen->fillRect(16, 16, 143, 119, 12, 2);
 		if (i >= 0)
 			_screen->drawShape(2, shp[i], 16, 16, 0);
 		_screen->drawShape(2, shp[4], 0, 0, 0);
 		_screen->copyRegion(0, 0, 80, 24, 160, 136, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
-	delay(40 * _tickLength);
+	_vm->delay(40 * _vm->_tickLength);
 
 	for (int i = 0; i < 5; i++)
 		delete[] shp[i];
 }
 
-void EoBEngine::seq_waterdeepEntry() {
-	if (shouldQuit() || skipFlag())
+void EoBIntroPlayer::waterdeepEntry() {
+	if (_vm->shouldQuit() || _vm->skipFlag())
 		return;
 
 	uint8 *shp[4];
 	uint8 *shp2[31];
 	uint8 *shp3[3];
 
-	loadSetIntroPalette(_introFilesWdEntry[0]);
-	_screen->loadBitmap(_introFilesWdEntry[1], 5, 3, 0);
+	loadAndSetPalette(_filesWdEntry[0]);
+	_screen->loadBitmap(_filesWdEntry[1], 5, 3, 0);
 	_screen->setCurPage(2);
 	shp[3] = _screen->encodeShape(0, 0, 20, 136, true);
 	for (int i = 1; i < 4; i++) {
@@ -352,57 +306,57 @@ void EoBEngine::seq_waterdeepEntry() {
 
 	_screen->copyPage(3, 4);
 	_screen->fillRect(0, 168, 319, 199, 12, 0);
-	snd_playSoundEffect(6);
+	_vm->snd_playSoundEffect(6);
 
-	for (int i = 0; i < 4 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + 3 * _tickLength;
+	for (int i = 0; i < 4 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
+		uint32 end = _vm->_system->getMillis() + 3 * _vm->_tickLength;
 		_screen->drawShape(0, shp[i], 80, 24, 0);
 		delete[] shp[i];
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
 	_screen->copyRegion(0, 80, 0, 168, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	delay(50 * _tickLength);
+	_vm->delay(50 * _vm->_tickLength);
 
 	_screen->setCurPage(2);
 	shp[0] = _screen->encodeShape(20, 0, 20, 136, true);
-	_screen->loadBitmap(_introFilesWdEntry[2], 5, 3, 0);
+	_screen->loadBitmap(_filesWdEntry[2], 5, 3, 0);
 	shp[1] = _screen->encodeShape(0, 0, 20, 136, true);
 	shp[2] = _screen->encodeShape(20, 0, 20, 136, true);
-	_screen->loadBitmap(_introFilesWdEntry[3], 5, 3, 0);
+	_screen->loadBitmap(_filesWdEntry[3], 5, 3, 0);
 
 	for (int i = 0; i < 31; i++)
-		shp2[i] = _screen->encodeShape(_introWdEncodeX[i], 136 + (_introWdEncodeY[i] << 3), _introWdEncodeWH[i], _introWdEncodeWH[i] << 3, true);
+		shp2[i] = _screen->encodeShape(_wdEncodeX[i], 136 + (_wdEncodeY[i] << 3), _wdEncodeWH[i], _wdEncodeWH[i] << 3, true);
 	for (int i = 0; i < 3; i++)
 		shp3[i] = _screen->encodeShape(5 * i, 152, 5, 32, true);
 
 	_screen->copyPage(3, 4);
 
-	for (int i = 0; i < 3 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + 3 * _tickLength;
+	for (int i = 0; i < 3 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
+		uint32 end = _vm->_system->getMillis() + 3 * _vm->_tickLength;
 		_screen->fillRect(0, 0, 159, 135, 12, 2);
 		_screen->drawShape(2, shp[i], 0, 0, 0);
 		_screen->copyRegion(0, 0, 80, 24, 160, 136, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
 	_screen->copyRegion(0, 0, 80, 24, 160, 136, 4, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	delay(4 * _tickLength);
+	_vm->delay(4 * _vm->_tickLength);
 	_screen->copyRegion(160, 0, 80, 24, 160, 136, 4, 0, Screen::CR_NO_P_CHECK);
 	_screen->fillRect(0, 168, 319, 199, 12, 0);
 	_screen->updateScreen();
-	delay(4 * _tickLength);
+	_vm->delay(4 * _vm->_tickLength);
 	_screen->copyRegion(0, 184, 40, 184, 232, 16, 4, 0, Screen::CR_NO_P_CHECK);
 
 	int cx = 264;
 	int cy = 11;
 
-	for (int i = 0; i < 70 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + 3 * _tickLength;
+	for (int i = 0; i < 70 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
+		uint32 end = _vm->_system->getMillis() + 3 * _vm->_tickLength;
 
 		_screen->copyRegion(cx - 2, cy - 2, 0, 0, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
 		_screen->drawShape(4, shp3[((i & 3) == 3) ? 1 : (i & 3)], cx, cy, 0);
@@ -412,15 +366,15 @@ void EoBEngine::seq_waterdeepEntry() {
 		cy++;
 
 		for (int ii = 0; ii < 5; ii++) {
-			int s = _rnd.getRandomNumber(255) % 31;
-			_screen->drawShape(0, shp2[s], _introWdDsX[s] - 80, _introWdDsY[s] + 24, 0);
+			int s = _vm->_rnd.getRandomNumber(255) % 31;
+			_screen->drawShape(0, shp2[s], _wdDsX[s] - 80, _wdDsY[s] + 24, 0);
 		}
 
-		if (!(_rnd.getRandomNumber(255) & 7))
-			snd_playSoundEffect(_rnd.getRandomBit() ? 5 : 14);
+		if (!(_vm->_rnd.getRandomNumber(255) & 7))
+			_vm->snd_playSoundEffect(_vm->_rnd.getRandomBit() ? 5 : 14);
 
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
 	for (int i = 0; i < 3; i++) {
@@ -432,11 +386,11 @@ void EoBEngine::seq_waterdeepEntry() {
 		delete[] shp2[i];
 }
 
-void EoBEngine::seq_king() {
-	if (shouldQuit() || skipFlag())
+void EoBIntroPlayer::king() {
+	if (_vm->shouldQuit() || _vm->skipFlag())
 		return;
 
-	_screen->loadBitmap(_introFilesKing[0], 5, 3, 0);
+	_screen->loadBitmap(_filesKing[0], 5, 3, 0);
 	_screen->copyPage(3, 4);
 
 	int x = 15;
@@ -444,8 +398,8 @@ void EoBEngine::seq_king() {
 	int w = 1;
 	int h = 1;
 
-	for (int i = 0; i < 10 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + _tickLength;
+	for (int i = 0; i < 10 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
+		uint32 end = _vm->_system->getMillis() + _vm->_tickLength;
 		_screen->copyRegion(x << 3, y << 3, x << 3, y << 3, w << 3, h << 3, 4, 0, Screen::CR_NO_P_CHECK);
 		if (x > 6)
 			x --;
@@ -458,10 +412,10 @@ void EoBEngine::seq_king() {
 		if (y + h > 23)
 			h = 23 - y;
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
-	delay(25 * _tickLength);
+	_vm->delay(25 * _vm->_tickLength);
 
 	uint8 *shp[4];
 	int16 dy[4];
@@ -471,19 +425,19 @@ void EoBEngine::seq_king() {
 	static const uint8 advEncW[] = { 6, 6, 7, 6 };
 	static const int8 modY[] = { -4, -8, -2, -2, 1, 0, 0, 0 };
 
-	_screen->loadBitmap(_introFilesKing[1], 5, 3, 0);
+	_screen->loadBitmap(_filesKing[1], 5, 3, 0);
 	_screen->setCurPage(2);
 	for (int i = 0; i < 4; i++) {
 		shp[i] = _screen->encodeShape(advEncX[i], 0, advEncW[i], 98, true);
-		dy[i] = 180 + ((_rnd.getRandomNumber(255) & 3) << 3);
+		dy[i] = 180 + ((_vm->_rnd.getRandomNumber(255) & 3) << 3);
 		stepY[i] = (i * 5) & 3;
 	}
 
 	_screen->copyPage(0, 4);
 
-	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag();) {
+	for (bool runloop = true; runloop && !_vm->shouldQuit() && !_vm->skipFlag();) {
 		runloop = false;
-		uint32 end = _system->getMillis() + 2 * _tickLength;
+		uint32 end = _vm->_system->getMillis() + 2 * _vm->_tickLength;
 
 		for (int i = 0; i < 4; i++) {
 			if (dy[i] <= 82)
@@ -503,29 +457,29 @@ void EoBEngine::seq_king() {
 			runloop = true;
 		}
 
-		if (!(_rnd.getRandomNumber(255) & 3))
-			snd_playSoundEffect(7);
+		if (!(_vm->_rnd.getRandomNumber(255) & 3))
+			_vm->snd_playSoundEffect(7);
 
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
 	_screen->copyRegion(0, 96, 0, 160, 320, 32, 6, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	delay(70 * _tickLength);
+	_vm->delay(70 * _vm->_tickLength);
 
 	for (int i = 0; i < 4; i++)
 		delete[] shp[i];
 }
 
-void EoBEngine::seq_hands() {
-	if (shouldQuit() || skipFlag())
+void EoBIntroPlayer::hands() {
+	if (_vm->shouldQuit() || _vm->skipFlag())
 		return;
 
 	_screen->setCurPage(2);
 	uint8 *shp1 = _screen->encodeShape(0, 140, 21, 60, true);
 	uint8 *shp2 = _screen->encodeShape(21, 140, 12, 60, true);
-	_screen->loadBitmap(_introFilesHands[0], 3, 5, 0);
+	_screen->loadBitmap(_filesHands[0], 3, 5, 0);
 
 	_screen->fillRect(0, 160, 319, 199, 12, 0);
 	_screen->fillRect(0, 0, 191, 63, 157, 2);
@@ -535,24 +489,24 @@ void EoBEngine::seq_hands() {
 	_screen->copyRegion(0, 128, 0, 176, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
 
 	_screen->updateScreen();
-	delay(15 * _tickLength);
-	snd_playSoundEffect(11);
+	_vm->delay(15 * _vm->_tickLength);
+	_vm->snd_playSoundEffect(11);
 
-	for (int i = -22; i <= 20 && !shouldQuit() && !skipFlag(); i += 4) {
-		uint32 end = _system->getMillis() + _tickLength;
+	for (int i = -22; i <= 20 && !_vm->shouldQuit() && !_vm->skipFlag(); i += 4) {
+		uint32 end = _vm->_system->getMillis() + _vm->_tickLength;
 		_screen->fillRect(0, 0, 167, 63, 157);
 		_screen->drawShape(2, shp1, i, 4, 0);
 		_screen->drawShape(2, shp2, 105 - i, 4, 0);
 		_screen->copyRegion(0, 0, 144, 32, 168, 64, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
-	snd_playSoundEffect(10);
+	_vm->snd_playSoundEffect(10);
 
 	delete[] shp1;
 	delete[] shp2;
-	delay(15 * _tickLength);
+	_vm->delay(15 * _vm->_tickLength);
 
 	_screen->setCurPage(4);
 	shp1 = _screen->encodeShape(17, 0, 11, 120, true);
@@ -564,35 +518,35 @@ void EoBEngine::seq_hands() {
 	_screen->drawShape(2, shp1, 32, -80, 0);
 	_screen->drawShape(2, shp2, 40, -16, 0);
 	boxMorphTransition(18, 16, 10, 12, 0, 0, 17, 8, 17, 3, 25, 10);
-	delay(15 * _tickLength);
+	_vm->delay(15 * _vm->_tickLength);
 
-	for (int i = -80; i <= 0 && !shouldQuit() && !skipFlag(); i += 4) {
-		uint32 end = _system->getMillis() + _tickLength;
+	for (int i = -80; i <= 0 && !_vm->shouldQuit() && !_vm->skipFlag(); i += 4) {
+		uint32 end = _vm->_system->getMillis() + _vm->_tickLength;
 		_screen->fillRect(0, 0, 135, 63, 157);
 		_screen->drawShape(2, shp1, 32, i, 0);
 		_screen->drawShape(2, shp2, 40, i + 64, 0);
 		_screen->copyRegion(0, 0, 80, 96, 136, 64, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
-	snd_playSoundEffect(12);
-	delay(5 * _tickLength);
+	_vm->snd_playSoundEffect(12);
+	_vm->delay(5 * _vm->_tickLength);
 
-	for (int i = 0; i > -54 && !shouldQuit() && !skipFlag(); i -= 4) {
-		uint32 end = _system->getMillis() + _tickLength;
+	for (int i = 0; i > -54 && !_vm->shouldQuit() && !_vm->skipFlag(); i -= 4) {
+		uint32 end = _vm->_system->getMillis() + _vm->_tickLength;
 		_screen->fillRect(0, 0, 135, 63, 157);
 		_screen->drawShape(2, shp3, 12, 64 + i, 0);
 		_screen->drawShape(2, shp1, 32, i, 0);
 		_screen->copyRegion(0, 0, 80, 96, 136, 64, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
 	delete[] shp1;
 	delete[] shp2;
 	delete[] shp3;
-	delay(15 * _tickLength);
+	_vm->delay(15 * _vm->_tickLength);
 
 	_screen->setCurPage(4);
 	shp1 = _screen->encodeShape(0, 0, 17, 136, true);
@@ -603,23 +557,23 @@ void EoBEngine::seq_hands() {
 	_screen->drawShape(2, shp1, -56, -56, 0);
 	_screen->drawShape(2, shp2, 52, 49, 0);
 	boxMorphTransition(9, 6, 0, 0, 0, 0, 18, 12, 8, 11, 21, 10);
-	delay(15 * _tickLength);
-	snd_playSoundEffect(11);
+	_vm->delay(15 * _vm->_tickLength);
+	_vm->snd_playSoundEffect(11);
 
-	for (int i = -56; i <= -8 && !shouldQuit() && !skipFlag(); i += 4) {
-		uint32 end = _system->getMillis() + _tickLength;
+	for (int i = -56; i <= -8 && !_vm->shouldQuit() && !_vm->skipFlag(); i += 4) {
+		uint32 end = _vm->_system->getMillis() + _vm->_tickLength;
 		_screen->fillRect(0, 0, 143, 95, 157);
 		_screen->drawShape(2, shp1, i, i, 0);
 		_screen->drawShape(2, shp2, (i == -8) ? 55 : 52, (i == -8) ? 52 : 49, 0);
 		_screen->copyRegion(0, 0, 0, 0, 144, 96, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
-	snd_playSoundEffect(10);
+	_vm->snd_playSoundEffect(10);
 	delete[] shp1;
 	delete[] shp2;
-	delay(30 * _tickLength);
+	_vm->delay(30 * _vm->_tickLength);
 
 	_screen->setCurPage(4);
 	shp1 = _screen->encodeShape(28, 0, 11, 40, true);
@@ -629,46 +583,46 @@ void EoBEngine::seq_hands() {
 	_screen->fillRect(0, 0, 87, 112, 157);
 	_screen->drawShape(2, shp2, 0, 90, 0);
 	boxMorphTransition(20, 13, 15, 6, 0, 0, 11, 14, 0, 0, 24, 16);
-	delay(15 * _tickLength);
+	_vm->delay(15 * _vm->_tickLength);
 
 	int dy = 90;
-	for (int i = -40; i <= 0 && !shouldQuit() && !skipFlag(); i += 4) {
-		uint32 end = _system->getMillis() + _tickLength;
+	for (int i = -40; i <= 0 && !_vm->shouldQuit() && !_vm->skipFlag(); i += 4) {
+		uint32 end = _vm->_system->getMillis() + _vm->_tickLength;
 		_screen->fillRect(0, 0, 87, 112, 157);
 		_screen->drawShape(2, shp2, 0, dy, 0);
 		_screen->copyRegion(0, 0, 120, 48, 88, 112, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 		dy -= 5;
 	}
 
-	snd_playSoundEffect(13);
+	_vm->snd_playSoundEffect(13);
 
-	for (int i = -40; i <= 0 && !shouldQuit() && !skipFlag(); i += 4) {
-		uint32 end = _system->getMillis() + _tickLength;
+	for (int i = -40; i <= 0 && !_vm->shouldQuit() && !_vm->skipFlag(); i += 4) {
+		uint32 end = _vm->_system->getMillis() + _vm->_tickLength;
 		_screen->fillRect(0, 0, 87, 39, 157);
 		_screen->drawShape(2, shp1, 0, i, 0);
 		_screen->copyRegion(0, 0, 120, 48, 88, 112, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
 	delete[] shp1;
 	delete[] shp2;
-	delay(48 * _tickLength);
+	_vm->delay(48 * _vm->_tickLength);
 }
 
-void EoBEngine::seq_waterdeepExit() {
-	if (shouldQuit() || skipFlag())
+void EoBIntroPlayer::waterdeepExit() {
+	if (_vm->shouldQuit() || _vm->skipFlag())
 		return;
 
 	uint8 *shp2[31];
 	uint8 *shp3[3];
 
-	_screen->loadBitmap(_introFilesWdExit[0], 5, 3, 0);
+	_screen->loadBitmap(_filesWdExit[0], 5, 3, 0);
 	_screen->setCurPage(2);
 	for (int i = 0; i < 31; i++)
-		shp2[i] = _screen->encodeShape(_introWdEncodeX[i], 136 + (_introWdEncodeY[i] << 3), _introWdEncodeWH[i], _introWdEncodeWH[i] << 3, true);
+		shp2[i] = _screen->encodeShape(_wdEncodeX[i], 136 + (_wdEncodeY[i] << 3), _wdEncodeWH[i], _wdEncodeWH[i] << 3, true);
 	for (int i = 0; i < 3; i++)
 		shp3[i] = _screen->encodeShape(5 * i + 15, 152, 5, 32, true);
 	uint8 *shp1 = _screen->encodeShape(31, 136, 5, 32, true);
@@ -680,8 +634,8 @@ void EoBEngine::seq_waterdeepExit() {
 	int cx = 140;
 	int cy = 128;
 
-	for (int i = 0; i < 70 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + 3 * _tickLength;
+	for (int i = 0; i < 70 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
+		uint32 end = _vm->_system->getMillis() + 3 * _vm->_tickLength;
 		int fx = cx - 2;
 		if (fx < 160)
 			fx = 160;
@@ -698,15 +652,15 @@ void EoBEngine::seq_waterdeepExit() {
 		cy--;
 
 		for (int ii = 0; ii < 5; ii++) {
-			int s = _rnd.getRandomNumber(255) % 31;
-			_screen->drawShape(0, shp2[s], _introWdDsX[s] - 80, _introWdDsY[s] + 24, 0);
+			int s = _vm->_rnd.getRandomNumber(255) % 31;
+			_screen->drawShape(0, shp2[s], _wdDsX[s] - 80, _wdDsY[s] + 24, 0);
 		}
 
-		if (!(_rnd.getRandomNumber(255) & 7))
-			snd_playSoundEffect(_rnd.getRandomBit() ? 5 : 14);
+		if (!(_vm->_rnd.getRandomNumber(255) & 7))
+			_vm->snd_playSoundEffect(_vm->_rnd.getRandomBit() ? 5 : 14);
 
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
 	for (int i = 0; i < 3; i++)
@@ -720,19 +674,19 @@ void EoBEngine::seq_waterdeepExit() {
 	_screen->fillRect(0, 168, 319, 199, 12, 0);
 	_screen->copyRegion(0, 136, 0, 0, 48, 36, 0, 4, Screen::CR_NO_P_CHECK);
 
-	loadSetIntroPalette(_introFilesWdExit[1]);
-	_screen->loadBitmap(_introFilesWdExit[2], 3, 5, 0);
+	loadAndSetPalette(_filesWdExit[1]);
+	_screen->loadBitmap(_filesWdExit[2], 3, 5, 0);
 	_screen->copyPage(5, 2);
 	whirlTransition();
-	delay(6 * _tickLength);
+	_vm->delay(6 * _vm->_tickLength);
 
 	_screen->copyRegion(0, 144, 0, 184, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
 
 	cx = 0;
 	cy = 136;
 	int dy = 0;
-	for (int i = 0; i < 19 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + _tickLength;
+	for (int i = 0; i < 19 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
+		uint32 end = _vm->_system->getMillis() + _vm->_tickLength;
 		_screen->copyRegion(cx, cy, 80, dy + 16, 160, 8, 2, 0, Screen::CR_NO_P_CHECK);
 		cy += 8;
 		dy += 8;
@@ -741,199 +695,142 @@ void EoBEngine::seq_waterdeepExit() {
 			cy = 0;
 		}
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
-	snd_playSong(3);
-	delay(60 * _tickLength);
+	_vm->snd_playSong(3);
+	_vm->delay(60 * _vm->_tickLength);
 
-	for (int i = 0; i < 56 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + _tickLength;
+	for (int i = 0; i < 56 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
+		uint32 end = _vm->_system->getMillis() +_vm->_tickLength;
 		_screen->copyRegion(0, 136 + i, 80, 16, 160, 56 - i, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->copyRegion(160, 0, 80, 72 - i, 160, 96 + i, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
-	for (int i = 1; i < 48 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + _tickLength;
+	for (int i = 1; i < 48 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
+		uint32 end = _vm->_system->getMillis() + _vm->_tickLength;
 		_screen->copyRegion(160, i, 80, 16, 160, 152, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
-	_screen->loadBitmap(_introFilesWdExit[3], 3, 5, 0);
+	_screen->loadBitmap(_filesWdExit[3], 3, 5, 0);
 	_screen->copyPage(5, 2);
-	delay(30 * _tickLength);
+	_vm->delay(30 * _vm->_tickLength);
 	_screen->setCurPage(0);
 	_screen->fillRect(0, 16, 319, 31, 12);
 	_screen->fillRect(0, 136, 319, 199, 12);
 	_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
-	loadSetIntroPalette(_introFilesWdExit[4]);
+	loadAndSetPalette(_filesWdExit[4]);
 	_screen->updateScreen();
-	delay(50 * _tickLength);
+	_vm->delay(50 * _vm->_tickLength);
 }
 
-void EoBEngine::seq_tunnel() {
-	if (shouldQuit() || skipFlag())
+void EoBIntroPlayer::tunnel() {
+	if (_vm->shouldQuit() || _vm->skipFlag())
 		return;
 
 	_screen->setCurPage(4);
 	uint8 *shp2 = _screen->encodeShape(20, 0, 20, 120, true);
 	uint8 *shp1 = _screen->encodeShape(0, 0, 20, 120, true);
-	drawBlockObject(1, 4, shp2, 160, 0, 0);
-	drawBlockObject(1, 4, shp1, 0, 0, 0);
+	_vm->drawBlockObject(1, 4, shp2, 160, 0, 0);
+	_vm->drawBlockObject(1, 4, shp1, 0, 0, 0);
 	delete[] shp1;
 	delete[] shp2;
 
-	for (int i = 0; i < 3 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + 8 * _tickLength;
+	for (int i = 0; i < 3 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
+		uint32 end = _vm->_system->getMillis() + 8 * _vm->_tickLength;
 		_screen->copyRegion(0, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
-		snd_playSoundEffect(7);
+		_vm->snd_playSoundEffect(7);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 		_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
-		snd_playSoundEffect(7);
-		end = _system->getMillis() + 8 * _tickLength;
+		_vm->snd_playSoundEffect(7);
+		end = _vm->_system->getMillis() + 8 * _vm->_tickLength;
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
 	_screen->copyRegion(0, 160, 0, 184, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	delay(18 * _tickLength);
+	_vm->delay(18 * _vm->_tickLength);
 	_screen->copyRegion(160, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	delay(5 * _tickLength);
+	_vm->delay(5 * _vm->_tickLength);
 	_screen->copyRegion(0, 122, 80, 32, 160, 60, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->copyRegion(160, 122, 80, 92, 160, 60, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	delay(5 * _tickLength);
+	_vm->delay(5 * _vm->_tickLength);
 	_screen->copyRegion(160, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
 	for (int i = 0; i < 6; i++)
 		_screen->copyRegion(i * 48, 185, 56, (i << 3) + 24, 48, 8, 2, 2, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	delay(5 * _tickLength);
+	_vm->delay(5 * _vm->_tickLength);
 	_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
 
-	_screen->loadBitmap(_introFilesTunnel[0], 5, 3, 0);
+	_screen->loadBitmap(_filesTunnel[0], 5, 3, 0);
 	_screen->copyPage(3, 4);
 	_screen->updateScreen();
-	delay(40 * _tickLength);
+	_vm->delay(40 * _vm->_tickLength);
 
 	_screen->copyRegion(264, 0, 136, 56, 48, 48, 4, 0, Screen::CR_NO_P_CHECK);
-	snd_playSoundEffect(8);
+	_vm->snd_playSoundEffect(8);
 	_screen->copyRegion(0, 0, 0, 0, 320, 184, 0, 2, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	delay(16 * _tickLength);
-	snd_playSoundEffect(4);
+	_vm->delay(16 * _vm->_tickLength);
+	_vm->snd_playSoundEffect(4);
 
-	for (int i = 0; i < 30 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + _tickLength;
+	for (int i = 0; i < 30 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
+		uint32 end = _vm->_system->getMillis() + _vm->_tickLength;
 		if (i == 0)
 			_screen->fillRect(0, 168, 319, 199, 12, 0);
-		_screen->copyRegion(80, 25 + (_rnd.getRandomNumber(255) & 7), 80, 24, 160, 144, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(80, 25 + (_vm->_rnd.getRandomNumber(255) & 7), 80, 24, 160, 144, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 
-	snd_playSoundEffect(9);
+	_vm->snd_playSoundEffect(9);
 
-	for (int i = 0; i < 6 && !shouldQuit() && !skipFlag(); i++) {
-		uint32 end = _system->getMillis() + _tickLength;
-		_screen->copyRegion(_introTvlX1[i] << 3, _introTvlY1[i], _introTvlX2[i] << 3, _introTvlY2[i], _introTvlW[i] << 3, _introTvlH[i], 4, 2, Screen::CR_NO_P_CHECK);
-		for (int ii = 0; ii < 4 && !shouldQuit() && !skipFlag(); ii++) {
+	for (int i = 0; i < 6 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
+		uint32 end = _vm->_system->getMillis() + _vm->_tickLength;
+		_screen->copyRegion(_tvlX1[i] << 3, _tvlY1[i], _tvlX2[i] << 3, _tvlY2[i], _tvlW[i] << 3, _tvlH[i], 4, 2, Screen::CR_NO_P_CHECK);
+		for (int ii = 0; ii < 4 && !_vm->shouldQuit() && !_vm->skipFlag(); ii++) {
 			_screen->updateScreen();
-			delayUntil(end);
-			end = _system->getMillis() + _tickLength;
-			_screen->copyRegion(80, 25 + (_rnd.getRandomNumber(255) & 7), 80, 24, 160, 144, 2, 0, Screen::CR_NO_P_CHECK);
+			_vm->delayUntil(end);
+			end = _vm->_system->getMillis() + _vm->_tickLength;
+			_screen->copyRegion(80, 25 + (_vm->_rnd.getRandomNumber(255) & 7), 80, 24, 160, 144, 2, 0, Screen::CR_NO_P_CHECK);
 		}
 	}
 	_screen->copyRegion(0, 0, 0, 0, 320, 168, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	delay(40 * _tickLength);
+	_vm->delay(40 * _vm->_tickLength);
 
-	_screen->loadBitmap(_introFilesTunnel[1], 5, 3, 0);
+	_screen->loadBitmap(_filesTunnel[1], 5, 3, 0);
 	_screen->copyPage(3, 4);
-	snd_playSoundEffect(6);
+	_vm->snd_playSoundEffect(6);
 	_screen->copyRegion(0, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	delay(2 * _tickLength);
+	_vm->delay(2 * _vm->_tickLength);
 	_screen->copyRegion(160, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
-	delay(2 * _tickLength);
+	_vm->delay(2 * _vm->_tickLength);
 	_screen->copyRegion(0, 120, 80, 30, 160, 64, 4, 0, Screen::CR_NO_P_CHECK);
 	_screen->copyRegion(160, 120, 80, 94, 160, 64, 4, 0, Screen::CR_NO_P_CHECK);
 	_screen->copyRegion(0, 176, 0, 184, 320, 16, 6, 0, Screen::CR_NO_P_CHECK);
 	_screen->setCurPage(0);
 	_screen->updateScreen();
-	delay(50 * _tickLength);
+	_vm->delay(50 * _vm->_tickLength);
 }
 
-void EoBEngine::seq_xdeath() {
-	uint8 *shapes1[5];
-	uint8 *shapes2;
-
-	_screen->loadShapeSetBitmap("XDEATH2", 5, 3);
-	for (int i = 0; i < 4; i++)
-		shapes1[i] = _screen->encodeShape(i / 2 * 14, i / 2 * 88, 14, 88, true);
-	_screen->loadShapeSetBitmap("XDEATH3", 5, 3);
-	shapes2 = _screen->encodeShape(22, 0, 16, 95, true);
-	_screen->loadEoBBitmap("XDEATH1", 0, 5, 3, -1);
-	_screen->setCurPage(0);
-
-	for (int i = 0; i < 10; i++) {
-		if (i == 2)
-			snd_playSoundEffect(72);
-		else if (i == 4 || i == 6)
-			snd_playSoundEffect(54);
-		else
-			snd_playSoundEffect(34);
-
-		if (i < 6) {
-			_screen->copyRegion((i % 3) * 104, i / 3 * 88, 32, 10, 104, 88, 2, 0, Screen::CR_NO_P_CHECK);
-		} else {
-			snd_playSoundEffect(42);
-			_screen->drawShape(0, shapes1[i - 6], 32, 10, 0);
-		}
-
-		_screen->updateScreen();
-		delay(4 * _tickLength);
-	}
-
-	const ScreenDim *dm = _screen->getScreenDim(5);
-	_screen->modifyScreenDim(5, dm->sx, 8, dm->w, dm->h);
-	_screen->copyRegion(0, 0, 0, 0, 176, 120, 0, 5, Screen::CR_NO_P_CHECK);
-
-	for (int i = 0; i < 19; i++) {
-		snd_playSoundEffect(119);
-		_screen->copyRegion(0, 0, 0, 0, 176, 120, 5, 2, Screen::CR_NO_P_CHECK);
-		_screen->drawShape(2, shapes2, 24, i * 5 - 90, 5);
-		_screen->copyRegion(0, 0, 0, 0, 176, 120, 2, 0, Screen::CR_NO_P_CHECK);
-		_screen->updateScreen();
-		delay(2 * _tickLength);
-	}
-
-	_screen->modifyScreenDim(5, dm->sx, 0, dm->w, dm->h);
-
-	snd_playSoundEffect(5);
-	delay(60 * _tickLength);
-
-	for (int i = 0; i < 4; i++)
-		delete[] shapes1[i];
-	delete[] shapes2;
-
-	gui_drawPlayField(false);
-	gui_drawAllCharPortraitsWithStats();
-}
-
-void EoBEngine::loadSetIntroPalette(const char *filename) {
+void EoBIntroPlayer::loadAndSetPalette(const char *filename) {
 	_screen->loadPalette(filename, _screen->getPalette(0));
 	_screen->getPalette(0).fill(0, 1, 0);
 	_screen->setScreenPalette(_screen->getPalette(0));
 }
 
-void EoBEngine::copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step) {
+void EoBIntroPlayer::copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int step) {
 	const uint8 *ptr2 = _screen->getCPagePtr(3) + y1 * 320 + x1;
 
 	if (step == 1) {
@@ -993,7 +890,7 @@ void EoBEngine::copyBlurRegion(int x1, int y1, int x2, int y2, int w, int h, int
 	}
 }
 
-void EoBEngine::boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH) {
+void EoBIntroPlayer::boxMorphTransition(int targetDestX, int targetDestY, int targetFinalX, int targetFinalY, int targetSrcX, int targetSrcY, int targetFinalW, int targetFinalH, int originX1, int originY1, int originW, int originH) {
 	int originX2 = originX1 + originW;
 	int originY2 = originY1 + originH;
 	if (originY2 > 21)
@@ -1001,8 +898,8 @@ void EoBEngine::boxMorphTransition(int targetDestX, int targetDestY, int targetF
 
 	int w = 1;
 	int h = 1;
-	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag();) {
-		uint32 end = _system->getMillis() + _tickLength;
+	for (bool runloop = true; runloop && !_vm->shouldQuit() && !_vm->skipFlag();) {
+		uint32 end = _vm->_system->getMillis() + _vm->_tickLength;
 		_screen->copyRegion(targetSrcX << 3, targetSrcY << 3, targetDestX << 3, targetDestY << 3, w << 3, h << 3, 2, 0, Screen::CR_NO_P_CHECK);
 		if (originX1 < targetDestX)
 			_screen->copyRegion(312, 0, originX1 << 3, 0, 8, 176, 0, 0, Screen::CR_NO_P_CHECK);
@@ -1046,14 +943,14 @@ void EoBEngine::boxMorphTransition(int targetDestX, int targetDestY, int targetF
 			originY2--;
 
 		_screen->updateScreen();
-		delayUntil(end);
+		_vm->delayUntil(end);
 	}
 }
 
-void EoBEngine::whirlTransition() {
+void EoBIntroPlayer::whirlTransition() {
 	for (int i = 0; i < 2; i++) {
 		for (int ii = 0; ii < 8; ii++) {
-			uint32 e = _system->getMillis() + 3;
+			uint32 e = _vm->_system->getMillis() + 3;
 			if (ii & 1) {
 				for (int iii = i + ii; iii < 320; iii += 8)
 					_screen->drawClippedLine(iii, 0, iii, 199, 12);
@@ -1062,11 +959,185 @@ void EoBEngine::whirlTransition() {
 					_screen->drawClippedLine(0, iii, 319, iii, 12);
 			}
 			_screen->updateScreen();
-			uint32 c = _system->getMillis();
+			uint32 c = _vm->_system->getMillis();
 			if (e > c)
-				_system->delayMillis(e - c);
+				_vm->_system->delayMillis(e - c);
+		}
+	}
+}
+
+int EoBEngine::mainMenu() {
+	int menuChoice = _menuChoiceInit;
+	_menuChoiceInit = 0;
+
+	Screen::FontId of = _screen->_currentFont;
+
+	while (menuChoice >= 0 && !shouldQuit()) {
+		switch (menuChoice) {
+		case 0: {
+			_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
+			_screen->loadEoBBitmap("INTRO", 0, 5, 3, 2);
+			_screen->setScreenPalette(_screen->getPalette(0));
+			_screen->_curPage = 2;
+			of = _screen->setFont(Screen::FID_6_FNT);
+			Common::String versionString(Common::String::format("ScummVM %s", gScummVMVersion));
+			_screen->printText(versionString.c_str(), 280 - versionString.size() * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
+			_screen->setFont(of);
+			_screen->fillRect(0, 159, 319, 199, _screen->getPagePixel(2, 0, 0));
+			gui_drawBox(77, 165, 173, 29, 13, 14, 12);
+			gui_drawBox(76, 164, 175, 31, 13, 14, -1);
+			_screen->_curPage = 0;
+			_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->updateScreen();
+			_allowImport = true;
+			menuChoice = mainMenuLoop();
+			_allowImport = false;
+			} break;
+
+		case 1:
+			// load game in progress
+			//
+			menuChoice = -1;
+			break;
+
+		case 2:
+			// create new party
+			menuChoice = -2;
+			break;
+
+		case 3:
+			// quit
+			menuChoice = -5;
+			break;
+
+		case 4:
+			// intro
+			_sound->loadSoundFile("SOUND");
+			_screen->hideMouse();
+			seq_playIntro();
+			_screen->showMouse();
+			_sound->loadSoundFile("ADLIB");
+			menuChoice = 0;
+			break;
 		}
 	}
+
+	return shouldQuit() ? -5 : menuChoice;
+}
+
+int EoBEngine::mainMenuLoop() {
+	int sel = -1;
+	do {
+		_screen->setScreenDim(28);
+		_gui->simpleMenu_setup(8, 0, _mainMenuStrings, -1, 0, 0);
+
+		while (sel == -1 && !shouldQuit())
+			sel = _gui->simpleMenu_process(8, _mainMenuStrings, 0, -1, 0);
+	} while ((sel < 0 || sel > 5) && !shouldQuit());
+
+	return sel + 1;
+}
+
+void EoBEngine::seq_playIntro() {
+	EoBIntroPlayer(this, _screen).start();
+}
+
+void EoBEngine::seq_playFinale() {
+	Common::SeekableReadStream *s = _res->createReadStream("TEXT.DAT");
+	_screen->loadFileDataToPage(s, 5, 32000);
+	delete s;
+
+	snd_playSoundEffect(20);
+
+	_txt->resetPageBreakString();
+	_txt->setWaitButtonMode(1);
+	_txt->setupField(12, true);
+	gui_drawBox(0, 0, 176, 175, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
+	_txt->printDialogueText(51, _moreStrings[0]);
+
+	if (!checkScriptFlags(0x1ffe)) {
+		_screen->fadeToBlack();
+		return;
+	}
+
+	_txt->printDialogueText(_finBonusStrings[0]);
+	for (int i = 0; i < 6; i++) {
+		_txt->printDialogueText(_finBonusStrings[1]);
+		if (_characters[i].flags & 1)
+			_txt->printDialogueText(_characters[i].name);
+	}
+
+	uint32 password = 0;
+	for (int i = 0; i < 4; i++) {
+		if (!(_characters[i].flags & 1))
+			continue;
+
+		int len = strlen(_characters[i].name);
+		for (int ii = 0; ii < len; ii++) {
+			uint32 c = _characters[i].name[ii];
+			password += (c * c);
+		}
+	}
+
+	_txt->printDialogueText(Common::String::format(_finBonusStrings[2], password).c_str(), true);
+	_screen->fadeToBlack();
+}
+
+void EoBEngine::seq_xdeath() {
+	uint8 *shapes1[5];
+	uint8 *shapes2;
+
+	_screen->loadShapeSetBitmap("XDEATH2", 5, 3);
+	for (int i = 0; i < 4; i++)
+		shapes1[i] = _screen->encodeShape(i / 2 * 14, i / 2 * 88, 14, 88, true);
+	_screen->loadShapeSetBitmap("XDEATH3", 5, 3);
+	shapes2 = _screen->encodeShape(22, 0, 16, 95, true);
+	_screen->loadEoBBitmap("XDEATH1", 0, 5, 3, -1);
+	_screen->setCurPage(0);
+
+	for (int i = 0; i < 10; i++) {
+		if (i == 2)
+			snd_playSoundEffect(72);
+		else if (i == 4 || i == 6)
+			snd_playSoundEffect(54);
+		else
+			snd_playSoundEffect(34);
+
+		if (i < 6) {
+			_screen->copyRegion((i % 3) * 104, i / 3 * 88, 32, 10, 104, 88, 2, 0, Screen::CR_NO_P_CHECK);
+		} else {
+			snd_playSoundEffect(42);
+			_screen->drawShape(0, shapes1[i - 6], 32, 10, 0);
+		}
+
+		_screen->updateScreen();
+		delay(4 * _tickLength);
+	}
+
+	const ScreenDim *dm = _screen->getScreenDim(5);
+	_screen->modifyScreenDim(5, dm->sx, 8, dm->w, dm->h);
+	_screen->copyRegion(0, 0, 0, 0, 176, 120, 0, 5, Screen::CR_NO_P_CHECK);
+
+	for (int i = 0; i < 19; i++) {
+		snd_playSoundEffect(119);
+		_screen->copyRegion(0, 0, 0, 0, 176, 120, 5, 2, Screen::CR_NO_P_CHECK);
+		_screen->drawShape(2, shapes2, 24, i * 5 - 90, 5);
+		_screen->copyRegion(0, 0, 0, 0, 176, 120, 2, 0, Screen::CR_NO_P_CHECK);
+		_screen->updateScreen();
+		delay(2 * _tickLength);
+	}
+
+	_screen->modifyScreenDim(5, dm->sx, 0, dm->w, dm->h);
+
+	snd_playSoundEffect(5);
+	delay(60 * _tickLength);
+
+	for (int i = 0; i < 4; i++)
+		delete[] shapes1[i];
+	delete[] shapes2;
+
+	gui_drawPlayField(false);
+	gui_drawAllCharPortraitsWithStats();
 }
 
 } // End of namespace Kyra
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 638a185367..a65ade7aee 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -1016,27 +1016,6 @@ void EoBEngine::initStaticResource() {
 	_mainMenuStrings = _staticres->loadStrings(kEoB1MainMenuStrings, temp);
 	_finBonusStrings = _staticres->loadStrings(kEoB1BonusStrings, temp);
 
-	_introFilesOpening = _staticres->loadStrings(kEoB1IntroFilesOpening, temp);
-	_introFilesTower = _staticres->loadStrings(kEoB1IntroFilesTower, temp);
-	_introFilesOrb = _staticres->loadStrings(kEoB1IntroFilesOrb, temp);
-	_introFilesWdEntry = _staticres->loadStrings(kEoB1IntroFilesWdEntry, temp);
-	_introFilesKing = _staticres->loadStrings(kEoB1IntroFilesKing, temp);
-	_introFilesHands = _staticres->loadStrings(kEoB1IntroFilesHands, temp);
-	_introFilesWdExit = _staticres->loadStrings(kEoB1IntroFilesWdExit, temp);
-	_introFilesTunnel = _staticres->loadStrings(kEoB1IntroFilesTunnel, temp);
-	_introOpeningFrmDelay = _staticres->loadRawData(kEoB1IntroOpeningFrmDelay, temp);
-	_introWdEncodeX = _staticres->loadRawData(kEoB1IntroWdEncodeX, temp);
-	_introWdEncodeY = _staticres->loadRawData(kEoB1IntroWdEncodeY, temp);
-	_introWdEncodeWH = _staticres->loadRawData(kEoB1IntroWdEncodeWH, temp);
-	_introWdDsX = _staticres->loadRawDataBe16(kEoB1IntroWdDsX, temp);
-	_introWdDsY = _staticres->loadRawData(kEoB1IntroWdDsY, temp);
-	_introTvlX1 = _staticres->loadRawData(kEoB1IntroTvlX1, temp);
-	_introTvlY1 = _staticres->loadRawData(kEoB1IntroTvlY1, temp);
-	_introTvlX2 = _staticres->loadRawData(kEoB1IntroTvlX2, temp);
-	_introTvlY2 = _staticres->loadRawData(kEoB1IntroTvlY2, temp);
-	_introTvlW = _staticres->loadRawData(kEoB1IntroTvlW, temp);
-	_introTvlH = _staticres->loadRawData(kEoB1IntroTvlH, temp);
-
 	_doorShapeEncodeDefs = _staticres->loadRawData(kEoB1DoorShapeDefs, temp);
 	_doorSwitchShapeEncodeDefs = _staticres->loadRawData(kEoB1DoorSwitchShapeDefs, temp);
 	_doorSwitchCoords = _staticres->loadRawData(kEoB1DoorSwitchCoords, temp);
-- 
cgit v1.2.3


From 70cfbcd0468db96a788d7886b6f851d5dfee4769 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 22 Jan 2012 19:05:03 +0100
Subject: KYRA: add new rendering mode gui options

(EOB should support EGA and CGA mode, but this isn't implemented yet)
---
 engines/kyra/detection_tables.h | 184 ++++++++++++++++++++--------------------
 1 file changed, 92 insertions(+), 92 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index 2b3708528c..4d84b09ff5 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -97,7 +97,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -110,7 +110,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -122,7 +122,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -134,7 +134,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -146,7 +146,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -158,7 +158,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::RU_RUS,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_OLDFLOPPY_FLAGS
 	},
@@ -170,7 +170,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::ES_ESP,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -182,7 +182,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::ES_ESP,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -194,7 +194,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::IT_ITA,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -211,7 +211,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformAmiga,
 			ADGF_NO_FLAGS,
-			GUIO2(GUIO_NOSPEECH, GUIO_MIDIAMIGA)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIAMIGA, GUIO_RENDERAMIGA)
 		},
 		KYRA1_AMIGA_FLAGS
 	},
@@ -228,7 +228,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformAmiga,
 			ADGF_NO_FLAGS,
-			GUIO2(GUIO_NOSPEECH, GUIO_MIDIAMIGA)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIAMIGA, GUIO_RENDERAMIGA)
 		},
 		KYRA1_AMIGA_FLAGS
 	},
@@ -245,7 +245,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
 			ADGF_NO_FLAGS,
-			GUIO2(GUIO_NOSPEECH, GUIO_MIDIGM)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIGM, GUIO_RENDERVGA)
 		},
 		KYRA1_FLOPPY_FLAGS
 	},
@@ -262,7 +262,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformFMTowns,
 			ADGF_NO_FLAGS,
-			GUIO2(GUIO_NOSPEECH, GUIO_MIDITOWNS)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDITOWNS, GUIO_RENDERFMTOWNS)
 		},
 		KYRA1_TOWNS_FLAGS
 	},
@@ -278,7 +278,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::JA_JPN,
 			Common::kPlatformFMTowns,
 			ADGF_NO_FLAGS,
-			GUIO2(GUIO_NOSPEECH, GUIO_MIDITOWNS)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDITOWNS, GUIO_RENDERFMTOWNS)
 		},
 		KYRA1_TOWNS_SJIS_FLAGS
 	},
@@ -297,7 +297,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::JA_JPN,
 			Common::kPlatformPC98,
 			ADGF_NO_FLAGS,
-			GUIO2(GUIO_NOSPEECH, GUIO_MIDIPC98)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIPC98, GUIO_RENDERPC98)
 		},
 		KYRA1_TOWNS_SJIS_FLAGS
 	},
@@ -310,7 +310,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_CD,
-			GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_CD_FLAGS
 	},
@@ -322,7 +322,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_CD,
-			GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_CD_FLAGS
 	},
@@ -334,7 +334,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_CD,
-			GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_CD_FLAGS
 	},
@@ -347,7 +347,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::IT_ITA,
 			Common::kPlatformPC,
 			ADGF_CD,
-			GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_CD_FLAGS
 	},
@@ -409,7 +409,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_DEMO,
-			GUIO4(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_DEMO_FLAGS
 	},
@@ -422,7 +422,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_DEMO | ADGF_CD,
-			GUIO3(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK)
+			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA1_DEMO_CD_FLAGS
 	},
@@ -435,7 +435,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_FLOPPY_CMP_FLAGS
 	},
@@ -448,7 +448,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_FLOPPY_CMP_FLAGS
 	},
@@ -461,7 +461,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_FLOPPY_FLAGS
 	},
@@ -474,7 +474,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_FLOPPY_FLAGS
 	},
@@ -487,7 +487,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_FLOPPY_FLAGS
 	},
@@ -500,7 +500,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::IT_ITA,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_FLOPPY_FLAGS
 	},
@@ -513,7 +513,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::RU_RUS,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_FLOPPY_FAN_FLAGS(Common::RU_RUS, Common::EN_ANY)
 	},
@@ -526,7 +526,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::RU_RUS,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_FLOPPY_FAN_FLAGS(Common::RU_RUS, Common::EN_ANY)
 	},
@@ -539,7 +539,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_CD_FLAGS
 	},
@@ -551,7 +551,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_CD_FLAGS
 	},
@@ -563,7 +563,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_CD_FLAGS
 	},
@@ -577,7 +577,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::IT_ITA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -589,7 +589,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -601,7 +601,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -614,7 +614,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::IT_ITA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -627,7 +627,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -640,7 +640,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -654,7 +654,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::RU_RUS,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_CD_FAN_FLAGS(Common::RU_RUS, Common::EN_ANY)
 	},
@@ -667,7 +667,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD | ADGF_DEMO,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_CD_DEMO_FLAGS
 	},
@@ -680,7 +680,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD | ADGF_DEMO,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_CD_DEMO_FLAGS
 	},
@@ -693,7 +693,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD | ADGF_DEMO,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_CD_DEMO_FLAGS
 	},
@@ -706,7 +706,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_DEMO,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_DEMO_FLAGS
 	},
@@ -719,7 +719,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformFMTowns,
 			ADGF_NO_FLAGS,
-			GUIO2(GUIO_NOSPEECH, GUIO_MIDITOWNS)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDITOWNS, GUIO_RENDERFMTOWNS)
 		},
 		KYRA2_TOWNS_FLAGS
 	},
@@ -731,7 +731,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::JA_JPN,
 			Common::kPlatformFMTowns,
 			ADGF_NO_FLAGS,
-			GUIO2(GUIO_NOSPEECH, GUIO_MIDITOWNS)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDITOWNS, GUIO_RENDERFMTOWNS)
 		},
 		KYRA2_TOWNS_SJIS_FLAGS
 	},
@@ -743,7 +743,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC98,
 			ADGF_CD,
-			GUIO2(GUIO_NOSPEECH, GUIO_MIDIPC98)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIPC98, GUIO_RENDERPC98)
 		},
 		KYRA2_TOWNS_FLAGS
 	},
@@ -755,7 +755,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::JA_JPN,
 			Common::kPlatformPC98,
 			ADGF_CD,
-			GUIO2(GUIO_NOSPEECH, GUIO_MIDIPC98)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIPC98, GUIO_RENDERPC98)
 		},
 		KYRA2_TOWNS_SJIS_FLAGS
 	},
@@ -775,7 +775,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_FLAGS
 	},
@@ -791,7 +791,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_FLAGS
 	},
@@ -807,7 +807,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_FLAGS
 	},
@@ -825,7 +825,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_INS_FLAGS
 	},
@@ -841,7 +841,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_INS_FLAGS
 	},
@@ -857,7 +857,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_INS_FLAGS
 	},
@@ -875,7 +875,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_INS_FLAGS
 	},
@@ -891,7 +891,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformMacintosh,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_INS_FLAGS
 	},
@@ -907,7 +907,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformMacintosh,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_INS_FLAGS
 	},
@@ -925,7 +925,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::ES_ESP,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_FAN_FLAGS(Common::ES_ESP, Common::EN_ANY)
 	},
@@ -941,7 +941,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_FAN_FLAGS(Common::ES_ESP, Common::EN_ANY)
 	},
@@ -957,7 +957,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_FAN_FLAGS(Common::ES_ESP, Common::EN_ANY)
 	},
@@ -975,7 +975,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA)
 	},
@@ -991,7 +991,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA)
 	},
@@ -1007,7 +1007,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::IT_ITA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE,
-			GUIO1(GUIO_NOMIDI)
+			GUIO2(GUIO_NOMIDI, GUIO_RENDERVGA)
 		},
 		KYRA3_CD_FAN_FLAGS(Common::IT_ITA, Common::FR_FRA)
 	},
@@ -1026,7 +1026,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FLAGS
 	},
@@ -1043,7 +1043,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FLAGS
 	},
@@ -1060,7 +1060,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FLAGS
 	},
@@ -1077,7 +1077,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FLAGS
 	},
@@ -1094,7 +1094,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FLAGS
 	},
@@ -1111,7 +1111,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FLAGS
 	},
@@ -1129,7 +1129,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FAN_FLAGS(Common::RU_RUS, Common::DE_DEU)
 	},
@@ -1147,7 +1147,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FAN_FLAGS(Common::RU_RUS, Common::DE_DEU)
 	},
@@ -1164,7 +1164,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::RU_RUS,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FAN_FLAGS(Common::RU_RUS, Common::DE_DEU)
 	},
@@ -1182,7 +1182,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::IT_ITA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -1199,7 +1199,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -1216,7 +1216,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -1233,7 +1233,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::IT_ITA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -1250,7 +1250,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -1267,7 +1267,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::FR_FRA,
 			Common::kPlatformPC,
 			ADGF_DROPLANGUAGE | ADGF_CD,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_CD_FAN_FLAGS(Common::IT_ITA, Common::EN_ANY)
 	},
@@ -1283,7 +1283,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_FLOPPY_CMP_FLAGS
 	},
@@ -1299,7 +1299,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_FLOPPY_CMP_FLAGS
 	},
@@ -1315,7 +1315,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_FLOPPY_CMP_FLAGS
 	},
@@ -1332,7 +1332,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_FLOPPY_FLAGS
 	},
@@ -1349,7 +1349,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_FLOPPY_FLAGS
 	},
@@ -1366,7 +1366,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_FLOPPY_FLAGS
 	},
@@ -1383,7 +1383,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_FLOPPY_FLAGS
 	},
@@ -1401,7 +1401,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::RU_RUS,
 			Common::kPlatformPC,
 			ADGF_NO_FLAGS,
-			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_FLOPPY_FAN_FLAGS(Common::RU_RUS, Common::EN_ANY)
 	},
@@ -1418,7 +1418,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::JA_JPN,
 			Common::kPlatformPC98,
 			ADGF_NO_FLAGS,
-			GUIO2(GUIO_NOSPEECH, GUIO_MIDIPC98)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIPC98, GUIO_RENDERPC98)
 		},
 		LOL_PC98_SJIS_FLAGS
 	},
@@ -1435,7 +1435,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_DEMO,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_DEMO_FLAGS
 	},
@@ -1451,7 +1451,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_DEMO,
-			GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		LOL_KYRA2_DEMO_FLAGS
 	},
@@ -1469,7 +1469,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_TESTING,
-			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK, GUIO_RENDERVGA, GUIO_RENDEREGA, GUIO_RENDERCGA)
 		},
 		EOB_FLAGS
 	},
@@ -1485,7 +1485,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_TESTING,
-			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
+			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK, GUIO_RENDERVGA, GUIO_RENDEREGA, GUIO_RENDERCGA)
 		},
 		EOB_FLAGS
 	},
@@ -1501,7 +1501,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC,
 			ADGF_TESTING,
-			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK, GUIO_RENDERVGA, GUIO_RENDEREGA)
 		},
 		EOB2_FLAGS
 	},
@@ -1517,7 +1517,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::DE_DEU,
 			Common::kPlatformPC,
 			ADGF_TESTING,
-			GUIO3(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK)
+			GUIO5(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIPCSPK, GUIO_RENDERVGA, GUIO_RENDEREGA)
 		},
 		EOB2_FLAGS
 	},
-- 
cgit v1.2.3


From 47005de313ac9646d8b676042d0695346c96b9dd Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 31 Jan 2012 18:09:29 +0100
Subject: KYRA: (EOB) - fix minor bug (wrongly initialized value) and some
 renaming

---
 engines/kyra/eobcommon.cpp    | 1 +
 engines/kyra/items_eob.cpp    | 9 ++++-----
 engines/kyra/kyra_rpg.h       | 2 +-
 engines/kyra/saveload_eob.cpp | 4 ++--
 engines/kyra/timer_eob.cpp    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index ffee24fdee..42ceed593e 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -201,6 +201,7 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags)
 	_coneOfColdDest1 = _coneOfColdDest2 = _coneOfColdDest3 = _coneOfColdDest4 = 0;
 	_coneOfColdGfxTblSize = 0;
 	_menuButtonDefs = 0;
+	_updateCharNum = 0;
 	_menuStringsMain = _menuStringsSaveLoad = _menuStringsOnOff = _menuStringsSpells = 0;
 	_menuStringsRest = _menuStringsDrop = _menuStringsExit = _menuStringsStarve = 0;
 	_menuStringsScribe = _menuStringsDrop2 = _menuStringsHead = _menuStringsPoison = 0;
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index 33b47c12e7..979b68d34b 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -531,7 +531,7 @@ bool EoBCoreEngine::launchObject(int charIndex, Item item, uint16 startBlock, in
 	setItemPosition((Item *)&_levelBlockProperties[startBlock].drawObjects, startBlock, item, startPos | 4);
 
 	t->enable = 1;
-	t->u2 = 1;
+	t->starting = 1;
 	t->flags = 0;
 	t->direction = dir;
 	t->distance = 12;
@@ -559,7 +559,7 @@ void EoBCoreEngine::launchMagicObject(int charIndex, int type, uint16 startBlock
 		return;
 
 	t->enable = 2;
-	t->u2 = 1;
+	t->starting = 1;
 	t->flags = _magicFlightObjectProperties[(type << 2) + 2];
 	t->direction = dir;
 	t->distance = _magicFlightObjectProperties[(type << 2) + 1];
@@ -568,7 +568,6 @@ void EoBCoreEngine::launchMagicObject(int charIndex, int type, uint16 startBlock
 	t->item = type;
 	t->objectType = _magicFlightObjectProperties[(type << 2) + 3];
 	t->attackerId = charIndex;
-	t->u2 = 1;
 	t->callBackIndex = _magicFlightObjectProperties[type << 2];
 	_sceneUpdateRequired = true;
 }
@@ -576,7 +575,7 @@ void EoBCoreEngine::launchMagicObject(int charIndex, int type, uint16 startBlock
 bool EoBCoreEngine::updateObjectFlight(EoBFlyingObject *fo, int block, int pos) {
 	uint8 wallFlags = _wllWallFlags[_levelBlockProperties[block].walls[fo->direction ^ 2]];
 	if (fo->enable == 1) {
-		if ((wallFlags & 1) || (fo->u2) || ((wallFlags & 2) && (_dscItemShapeMap[_items[fo->item].icon] >= 15))) {
+		if ((wallFlags & 1) || (fo->starting) || ((wallFlags & 2) && (_dscItemShapeMap[_items[fo->item].icon] >= 15))) {
 			getQueuedItem((Item *)&_levelBlockProperties[fo->curBlock].drawObjects, 0, fo->item);
 			setItemPosition((Item *)&_levelBlockProperties[block].drawObjects, block, fo->item, pos | 4);
 			fo->curBlock = block;
@@ -602,7 +601,7 @@ bool EoBCoreEngine::updateObjectFlight(EoBFlyingObject *fo, int block, int pos)
 }
 
 bool EoBCoreEngine::updateFlyingObjectHitTest(EoBFlyingObject *fo, int block, int pos) {
-	if (fo->u2 && (fo->curBlock != _currentBlock || fo->attackerId >= 0) && (!blockHasMonsters(block) || fo->attackerId < 0))
+	if (fo->starting && (fo->curBlock != _currentBlock || fo->attackerId >= 0) && (!blockHasMonsters(fo->curBlock) || fo->attackerId < 0))
 		return false;
 
 	if (fo->enable == 2) {
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index b5530a9a81..b606963d8a 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -70,7 +70,7 @@ struct EoBFlyingObject {
 	int16 attackerId;
 	Item item;
 	uint16 curBlock;
-	uint16 u2;
+	uint16 starting;
 	uint8 u1;
 	uint8 direction;
 	uint8 distance;
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 8884765937..9f9476d0dc 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -255,7 +255,7 @@ Common::Error EoBCoreEngine::loadGameState(int slot) {
 			m->attackerId = in.readSint16BE();
 			m->item = in.readSint16BE();
 			m->curBlock = in.readUint16BE();
-			m->u2 = in.readUint16BE();
+			m->starting = in.readUint16BE();
 			m->u1 = in.readByte();
 			m->direction = in.readByte();
 			m->distance = in.readByte();
@@ -494,7 +494,7 @@ Common::Error EoBCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 			out->writeSint16BE(m->attackerId);
 			out->writeSint16BE(m->item);
 			out->writeUint16BE(m->curBlock);
-			out->writeUint16BE(m->u2);
+			out->writeUint16BE(m->starting);
 			out->writeByte(m->u1);
 			out->writeByte(m->direction);
 			out->writeByte(m->distance);
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 8ad28c2ec4..de1becfa72 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -195,7 +195,7 @@ void EoBCoreEngine::timerProcessFlyingObjects(int timerNum) {
 		if (newBl) {
 			bl = calcNewBlockPosition(fo->curBlock, fo->direction);
 			pos &= 3;
-			fo->u2 = 0;
+			fo->starting = 0;
 		}
 
 		if (updateObjectFlight(fo, bl, pos)) {
-- 
cgit v1.2.3


From d192fed3b52ec36abaf0f2d85158ddb28ee69fb1 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 6 Feb 2012 01:31:38 +0100
Subject: KYRA: (EOB) - fix character hand icons

(upper thumbs should point to the right, lower thumb to the left)
---
 engines/kyra/gui_eob.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 3df19f3690..b89a6d7293 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -285,7 +285,7 @@ void EoBCoreEngine::gui_drawWeaponSlot(int charIndex, int slot) {
 	else if (!slot && _flags.gameID == GI_EOB2 && checkScriptFlags(0x80000000))
 		_screen->drawShape(_screen->_curPage, _itemIconShapes[103], x + 8, y, 0);
 	else
-		_screen->drawShape(_screen->_curPage, _itemIconShapes[85], x + 8, y, 0);
+		_screen->drawShape(_screen->_curPage, _itemIconShapes[85 + slot], x + 8, y, 0);
 
 	if ((_characters[charIndex].disabledSlots & (1 << slot)) || !validateWeaponSlotItem(charIndex, slot) || (_characters[charIndex].hitPointsCur <= 0) || (_characters[charIndex].flags & 0x0c))
 		_screen->drawShape(_screen->_curPage, _weaponSlotGrid, x, y, 0);
-- 
cgit v1.2.3


From 66ba9343987d67e8bf8e1742fcf139dee95a8448 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 13 Feb 2012 01:04:48 +0100
Subject: KYRA: (EOB) - fix minor glitch in hp and food bar graphs

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

(limited to 'engines')

diff --git a/engines/kyra/gui_rpg.cpp b/engines/kyra/gui_rpg.cpp
index 718722f58d..a8b94032d0 100644
--- a/engines/kyra/gui_rpg.cpp
+++ b/engines/kyra/gui_rpg.cpp
@@ -72,7 +72,7 @@ void KyraRpgEngine::gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32
 		screen()->fillRect(x, y, x + t - 1, y + h, col1);
 
 	if (t < w && col2)
-		screen()->fillRect(x + t, y, x + w, y + h, col2);
+		screen()->fillRect(x + t, y, x + w - 1, y + h, col2);
 }
 
 void KyraRpgEngine::gui_initButtonsFromList(const int16 *list) {
-- 
cgit v1.2.3


From 86a817beb5eef248c5f5e28f18133db802a59c2e Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 13 Feb 2012 18:39:50 +0100
Subject: KYRA: (EOB) - start work on CGA and EGA graphics modes

---
 engines/kyra/chargen.cpp            |  10 +-
 engines/kyra/darkmoon.cpp           |  15 +-
 engines/kyra/darkmoon.h             |  17 +-
 engines/kyra/eob.cpp                |  21 +-
 engines/kyra/eob.h                  |   1 +
 engines/kyra/eobcommon.cpp          |  72 +++--
 engines/kyra/eobcommon.h            |  15 +-
 engines/kyra/gui_eob.cpp            |  10 +-
 engines/kyra/kyra_rpg.cpp           |   8 +-
 engines/kyra/kyra_rpg.h             |   2 +-
 engines/kyra/kyra_v1.cpp            |   5 +
 engines/kyra/kyra_v1.h              |   2 +
 engines/kyra/resource.h             | 150 +++++----
 engines/kyra/saveload_eob.cpp       |   4 +-
 engines/kyra/scene_eob.cpp          |  54 ++--
 engines/kyra/scene_lol.cpp          |   4 +-
 engines/kyra/scene_rpg.cpp          |  16 +-
 engines/kyra/screen.cpp             | 110 ++++++-
 engines/kyra/screen.h               |  34 +-
 engines/kyra/screen_eob.cpp         | 320 +++++++++++++++---
 engines/kyra/screen_eob.h           |  18 +-
 engines/kyra/sequences_darkmoon.cpp | 629 ++++++++++++++++++++----------------
 engines/kyra/sequences_eob.cpp      | 102 +++---
 engines/kyra/sprites_eob.cpp        |   2 +-
 engines/kyra/staticres.cpp          |   2 +-
 engines/kyra/staticres_eob.cpp      |  79 +++--
 26 files changed, 1141 insertions(+), 561 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index ed761e53c6..23274349e7 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -248,10 +248,10 @@ void CharacterGenerator::init() {
 
 	_faceShapes = new uint8*[44];
 	for (int i = 0; i < 44; i++)
-		_faceShapes[i] = _screen->encodeShape((i % 10) << 2, (i / 10) << 5, 4, 32, true);
+		_faceShapes[i] = _screen->encodeShape((i % 10) << 2, (i / 10) << 5, 4, 32, true, _vm->_cgaMappingDefault);
 	_screen->_curPage = 0;
 
-	_screen->loadEoBBitmap("CHARGEN", 0, 3, 3, 0);
+	_screen->loadEoBBitmap("CHARGEN", _vm->_cgaMappingDefault, 3, 3, 0);
 	_screen->loadShapeSetBitmap("CHARGENB", 3, 3);
 	if (_chargenMagicShapes) {
 		for (int i = 0; i < 10; i++)
@@ -261,14 +261,14 @@ void CharacterGenerator::init() {
 
 	_chargenMagicShapes = new uint8*[10];
 	for (int i = 0; i < 10; i++)
-		_chargenMagicShapes[i] = _screen->encodeShape(i << 2, 0, 4, 32, true);
+		_chargenMagicShapes[i] = _screen->encodeShape(i << 2, 0, 4, 32, true, _vm->_cgaMappingDefault);
 
 	for (int i = 0; i < 17; i++) {
 		const CreatePartyModButton *c = &_chargenModButtons[i];
-		_chargenButtonLabels[i] = c->labelW ? _screen->encodeShape(c->encodeLabelX, c->encodeLabelY, c->labelW, c->labelH, true) : 0;
+		_chargenButtonLabels[i] = c->labelW ? _screen->encodeShape(c->encodeLabelX, c->encodeLabelY, c->labelW, c->labelH, true, _vm->_cgaMappingDefault) : 0;
 	}
 
-	_screen->copyPage(3, 2);
+	_screen->convertPage(3, 2, _vm->_cgaMappingDefault);
 	_screen->_curPage = 0;
 	_screen->copyRegion(144, 64, 0, 0, 180, 128, 0, 2, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
diff --git a/engines/kyra/darkmoon.cpp b/engines/kyra/darkmoon.cpp
index f63d49933b..918221e0dd 100644
--- a/engines/kyra/darkmoon.cpp
+++ b/engines/kyra/darkmoon.cpp
@@ -29,22 +29,21 @@
 namespace Kyra {
 
 DarkMoonEngine::DarkMoonEngine(OSystem *system, const GameFlags &flags) : EoBCoreEngine(system, flags) {
-	_seqIntro = _seqFinale = 0;
+	_animIntro = _animFinale = 0;
 	_shapesIntro = _shapesFinale = 0;
 	_dscDoorType5Offs = 0;
 	_numSpells = 70;
 	_menuChoiceInit = 4;
 
 	_introStrings = _cpsFilesIntro = _cpsFilesFinale = _finaleStrings = _kheldranStrings = _npcStrings[0] = _npcStrings[1] = _hornStrings = 0;
-	_seqIntro = _seqFinale = 0;
 	_shapesIntro = _shapesFinale = 0;
 	_creditsData = _npcShpData = _dscDoorType5Offs = _hornSounds = 0;
 	_dreamSteps = 0;
 }
 
 DarkMoonEngine::~DarkMoonEngine() {
-	delete[] _seqIntro;
-	delete[] _seqFinale;
+	delete[] _animIntro;
+	delete[] _animFinale;
 	delete[] _shapesIntro;
 	delete[] _shapesFinale;
 }
@@ -58,6 +57,14 @@ Common::Error DarkMoonEngine::init() {
 
 	_monsterProps = new EoBMonsterProperty[10];
 
+	if (_configRenderMode == Common::kRenderEGA) {
+		Palette pal(16);
+		_screen->loadPalette(_egaDefaultPalette, pal, 16);
+		_screen->setScreenPalette(pal);
+	} else {
+		_screen->loadPalette("palette.col", _screen->getPalette(0));
+	}
+
 	return Common::kNoError;
 }
 
diff --git a/engines/kyra/darkmoon.h b/engines/kyra/darkmoon.h
index 78413d2c38..f6e7b3ed2c 100644
--- a/engines/kyra/darkmoon.h
+++ b/engines/kyra/darkmoon.h
@@ -31,7 +31,7 @@ namespace Kyra {
 
 class DarkmoonSequenceHelper;
 
-struct EoBSequenceStep {
+struct DarkMoonAnimCommand {
 	uint8 command;
 	uint8 obj;
 	int16 x1;
@@ -74,17 +74,19 @@ private:
 
 	const char * const *_introStrings;
 	const char * const *_cpsFilesIntro;
-	const EoBSequenceStep **_seqIntro;
-	const EoBShapeDef **_shapesIntro;
+	const DarkMoonAnimCommand **_animIntro;
+	const DarkMoonShapeDef **_shapesIntro;
 
 	const char * const *_finaleStrings;
 	const uint8 *_creditsData;
 	const char * const *_cpsFilesFinale;
-	const EoBSequenceStep **_seqFinale;
-	const EoBShapeDef **_shapesFinale;
+	const DarkMoonAnimCommand **_animFinale;
+	const DarkMoonShapeDef **_shapesFinale;
 
-	static const char *_palFilesIntro[];
-	static const char *_palFilesFinale[];
+	static const char *_palFilesIntroVGA[];
+	static const char *_palFilesIntroEGA[];
+	static const char *_palFilesFinaleVGA[];
+	static const char *_palFilesFinaleEGA[];
 
 	// Ingame sequence
 	void seq_nightmare();
@@ -135,6 +137,7 @@ private:
 	const uint8 *_hornSounds;
 
 	static const KyraRpgGUISettings _guiSettings;
+	static const uint8 _egaDefaultPalette[];
 };
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/eob.cpp b/engines/kyra/eob.cpp
index 40b028184f..3a1cfc1c84 100644
--- a/engines/kyra/eob.cpp
+++ b/engines/kyra/eob.cpp
@@ -55,7 +55,7 @@ Common::Error EoBEngine::init() {
 
 	initStaticResource();
 
-	_itemsOverlay = _res->fileData("ITEMRMP.VGA", 0);
+	_itemsOverlay = _res->fileData((_configRenderMode == Common::kRenderEGA || _configRenderMode == Common::kRenderCGA) ? "ITEMRMP.EGA" : "ITEMRMP.VGA", 0);
 
 	_screen->modifyScreenDim(7, 0x01, 0xB3, 0x22, 0x12);
 	_screen->modifyScreenDim(9, 0x01, 0x7D, 0x26, 0x3F);
@@ -63,6 +63,14 @@ Common::Error EoBEngine::init() {
 
 	_scriptTimersCount = 1;
 
+	if (_configRenderMode == Common::kRenderEGA) {
+		Palette pal(16);
+		_screen->loadPalette(_egaDefaultPalette, pal, 16);
+		_screen->setScreenPalette(pal);
+	} else {
+		_screen->loadPalette("palette.col", _screen->getPalette(0));
+	}
+
 	return Common::kNoError;
 }
 
@@ -73,6 +81,7 @@ void EoBEngine::startupNew() {
 	_currentBlock = 490;
 	_currentDirection = 0;
 	setHandItem(0);
+
 	EoBCoreEngine::startupNew();
 }
 
@@ -134,7 +143,7 @@ void EoBEngine::drawNpcScene(int npcIndex) {
 void EoBEngine::encodeDrawNpcSeqShape(int npcIndex, int drawX, int drawY) {
 	const uint8 *shpDef = &_npcShpData[npcIndex << 2];
 	_screen->_curPage = 2;
-	const uint8 *shp = _screen->encodeShape(shpDef[0], shpDef[1], shpDef[2], shpDef[3]);
+	const uint8 *shp = _screen->encodeShape(shpDef[0], shpDef[1], shpDef[2], shpDef[3], false, _cgaMappingDefault);
 	_screen->_curPage = 0;
 	_screen->drawShape(0, shp, drawX - (shp[2] << 2), drawY - shp[1], 5);
 	delete[] shp;
@@ -352,9 +361,9 @@ void EoBEngine::loadDoorShapes(int doorType1, int shapeId1, int doorType2, int s
 	if (doorType1 != 0xff) {
 		for (int i = 0; i < 3; i++) {
 			const uint8 *enc = &_doorShapeEncodeDefs[(doorType1 * 3 + i) << 2];
-			_doorShapes[shapeId1 + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+			_doorShapes[shapeId1 + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3], false, (_flags.gameID == GI_EOB1) ? _cgaMappingLevel[_cgaLevelMappingIndex[_currentLevel - 1]] : 0);
 			enc = &_doorSwitchShapeEncodeDefs[(doorType1 * 3 + i) << 2];
-			_doorSwitches[shapeId1 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+			_doorSwitches[shapeId1 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3], false, (_flags.gameID == GI_EOB1) ? _cgaMappingLevel[_cgaLevelMappingIndex[_currentLevel - 1]] : 0);
 			_doorSwitches[shapeId1 + i].x = _doorSwitchCoords[doorType1 * 6 + i * 2];
 			_doorSwitches[shapeId1 + i].y = _doorSwitchCoords[doorType1 * 6 + i * 2 + 1];
 		}
@@ -363,9 +372,9 @@ void EoBEngine::loadDoorShapes(int doorType1, int shapeId1, int doorType2, int s
 	if (doorType2 != 0xff) {
 		for (int i = 0; i < 3; i++) {
 			const uint8 *enc = &_doorShapeEncodeDefs[(doorType2 * 3 + i) << 2];
-			_doorShapes[shapeId2 + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+			_doorShapes[shapeId2 + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3], false, (_flags.gameID == GI_EOB1) ? _cgaMappingLevel[_cgaLevelMappingIndex[_currentLevel - 1]] : 0);
 			enc = &_doorSwitchShapeEncodeDefs[(doorType2 * 3 + i) << 2];
-			_doorSwitches[shapeId2 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+			_doorSwitches[shapeId2 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3], false, (_flags.gameID == GI_EOB1) ? _cgaMappingLevel[_cgaLevelMappingIndex[_currentLevel - 1]] : 0);
 			_doorSwitches[shapeId2 + i].x = _doorSwitchCoords[doorType2 * 6 + i * 2];
 			_doorSwitches[shapeId2 + i].y = _doorSwitchCoords[doorType2 * 6 + i * 2 + 1];
 		}
diff --git a/engines/kyra/eob.h b/engines/kyra/eob.h
index 89d2b25b23..9d583a0cd7 100644
--- a/engines/kyra/eob.h
+++ b/engines/kyra/eob.h
@@ -109,6 +109,7 @@ private:
 	const KyraRpgGUISettings *guiSettings();
 
 	static const KyraRpgGUISettings _guiSettings;
+	static const uint8 _egaDefaultPalette[];
 };
 
 
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 42ceed593e..a68c7de9e8 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -47,6 +47,7 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags)
 	  _numThrownItemShapes(flags.gameID == GI_EOB1 ? 12 : 9),
 	  _numItemIconShapes(flags.gameID == GI_EOB1 ? 89 : 112),
 	  _teleporterWallId(flags.gameID == GI_EOB1 ? 52 : 44) {
+
 	_screen = 0;
 	_gui = 0;
 	_debugger = 0;
@@ -212,6 +213,8 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags)
 	_spellLevelsMage = _spellLevelsCleric = _numSpellsCleric = _numSpellsWisAdj = _numSpellsPal = _numSpellsMage = 0;
 	_mnNumWord = _numSpells = _mageSpellListSize = _spellLevelsMageSize = _spellLevelsClericSize = 0;
 	_inventorySlotsX = _slotValidationFlags = _encodeMonsterShpTable = 0;
+	_cgaMappingDefault = _cgaMappingAlt = _cgaMappingInv = _cgaLevelMappingIndex = _cgaMappingItemsL = _cgaMappingItemsS = _cgaMappingThrown = _cgaMappingIcons = _cgaMappingDeco = 0;
+	memset(_cgaMappingLevel, 0, sizeof(_cgaMappingLevel));	
 	memset(_expRequirementTables, 0, sizeof(_expRequirementTables));
 	memset(_saveThrowTables, 0, sizeof(_saveThrowTables));
 	memset(_doorType, 0, sizeof(_doorType));
@@ -364,6 +367,9 @@ Common::Error EoBCoreEngine::init() {
 	// This makes a tick length of 54.94.
 	_tickLength = 55;
 
+	if (ConfMan.hasKey("render_mode"))
+		_configRenderMode = Common::parseRenderMode(ConfMan.get("render_mode"));
+
 	_screen = new Screen_EoB(this, _system);
 	assert(_screen);
 	_screen->setResolution();
@@ -497,8 +503,7 @@ Common::Error EoBCoreEngine::go() {
 	_debugger->initialize();
 
 	_txt->removePageBreakFlag();
-	_screen->loadPalette("palette.col", _screen->getPalette(0));
-	_screen->setScreenPalette(_screen->getPalette(0));
+
 	_screen->setFont(Screen::FID_8_FNT);
 
 	loadItemsAndDecorationsShapes();
@@ -661,44 +666,43 @@ bool EoBCoreEngine::checkPartyStatus(bool handleDeath) {
 
 void EoBCoreEngine::loadItemsAndDecorationsShapes() {
 	releaseItemsAndDecorationsShapes();
-	_screen->setCurPage(2);
 
-	_screen->loadBitmap("ITEML1.CPS", 5, 3, 0);
+	_screen->loadShapeSetBitmap("ITEML1", 5, 3);
 	_largeItemShapes = new const uint8*[_numLargeItemShapes];
 	int div = (_flags.gameID == GI_EOB1) ? 3 : 8;
 	int mul = (_flags.gameID == GI_EOB1) ? 64 : 24;
 
 	for (int i = 0; i < _numLargeItemShapes; i++)
-		_largeItemShapes[i] = _screen->encodeShape((i / div) << 3, (i % div) * mul, 8, 24);
+		_largeItemShapes[i] = _screen->encodeShape((i / div) << 3, (i % div) * mul, 8, 24, false, _cgaMappingItemsL);
 
-	_screen->loadBitmap("ITEMS1.CPS", 5, 3, 0);
+	_screen->loadShapeSetBitmap("ITEMS1", 5, 3);
 	_smallItemShapes = new const uint8*[_numSmallItemShapes];
 	for (int i = 0; i < _numSmallItemShapes; i++)
-		_smallItemShapes[i] = _screen->encodeShape((i / div) << 2, (i % div) * mul, 4, 24);
+		_smallItemShapes[i] = _screen->encodeShape((i / div) << 2, (i % div) * mul, 4, 24, false, _cgaMappingItemsS);
 
-	_screen->loadBitmap("THROWN.CPS", 5, 3, 0);
+	_screen->loadShapeSetBitmap("THROWN", 5, 3);
 	_thrownItemShapes = new const uint8*[_numThrownItemShapes];
 	for (int i = 0; i < _numThrownItemShapes; i++)
-		_thrownItemShapes[i] = _screen->encodeShape((i / div) << 2, (i % div) * mul, 4, 24);
+		_thrownItemShapes[i] = _screen->encodeShape((i / div) << 2, (i % div) * mul, 4, 24, false, _cgaMappingThrown);
 
 	_spellShapes = new const uint8*[4];
 	for (int i = 0; i < 4; i++)
-		_spellShapes[i] = _screen->encodeShape(8, i << 5, 6, 32);
+		_spellShapes[i] = _screen->encodeShape(8, i << 5, 6, 32, false, _cgaMappingThrown);
 
 	_firebeamShapes = new const uint8*[3];
-	_firebeamShapes[0] = _screen->encodeShape(16, 0, 4, 24);
-	_firebeamShapes[1] = _screen->encodeShape(16, 24, 4, 24);
-	_firebeamShapes[2] = _screen->encodeShape(16, 48, 3, 24);
-	_redSplatShape = _screen->encodeShape(16, _flags.gameID == GI_EOB1 ? 144 : 72, 5, 24);
-	_greenSplatShape = _screen->encodeShape(16, _flags.gameID == GI_EOB1 ? 168 : 96, 5, 16);
+	_firebeamShapes[0] = _screen->encodeShape(16, 0, 4, 24, false, _cgaMappingThrown);
+	_firebeamShapes[1] = _screen->encodeShape(16, 24, 4, 24, false, _cgaMappingThrown);
+	_firebeamShapes[2] = _screen->encodeShape(16, 48, 3, 24, false, _cgaMappingThrown);
+	_redSplatShape = _screen->encodeShape(16, _flags.gameID == GI_EOB1 ? 144 : 72, 5, 24, false, _cgaMappingThrown);
+	_greenSplatShape = _screen->encodeShape(16, _flags.gameID == GI_EOB1 ? 168 : 96, 5, 16, false, _cgaMappingThrown);
 
-	_screen->loadBitmap("ITEMICN.CPS", 5, 3, 0);
+	_screen->loadShapeSetBitmap("ITEMICN", 5, 3);
 	_itemIconShapes = new const uint8*[_numItemIconShapes];
 	for (int i = 0; i < _numItemIconShapes; i++)
-		_itemIconShapes[i] = _screen->encodeShape((i % 0x14) << 1, (i / 0x14) << 4, 2, 0x10);
+		_itemIconShapes[i] = _screen->encodeShape((i % 0x14) << 1, (i / 0x14) << 4, 2, 0x10, false, _cgaMappingIcons);
 	_tempIconShape = new uint8[300];
 
-	_screen->loadBitmap("DECORATE.CPS", 5, 3, 0);
+	_screen->loadShapeSetBitmap("DECORATE", 5, 3);
 
 	if (_flags.gameID == GI_EOB2) {
 		_lightningColumnShape = _screen->encodeShape(18, 88, 4, 64);
@@ -709,16 +713,16 @@ void EoBCoreEngine::loadItemsAndDecorationsShapes() {
 
 	_teleporterShapes = new const uint8*[6];
 	for (int i = 0; i < 6; i++)
-		_teleporterShapes[i] = _screen->encodeShape(_teleporterShapeDefs[(i << 2)], _teleporterShapeDefs[(i << 2) + 1], _teleporterShapeDefs[(i << 2) + 2], _teleporterShapeDefs[(i << 2) + 3]);
+		_teleporterShapes[i] = _screen->encodeShape(_teleporterShapeDefs[(i << 2)], _teleporterShapeDefs[(i << 2) + 1], _teleporterShapeDefs[(i << 2) + 2], _teleporterShapeDefs[(i << 2) + 3], false, _cgaMappingDefault);
 	_sparkShapes = new const uint8*[3];
-	_sparkShapes[0] = _screen->encodeShape(29, 0, 2, 16);
-	_sparkShapes[1] = _screen->encodeShape(31, 0, 2, 16);
-	_sparkShapes[2] = _screen->encodeShape(33, 0, 2, 16);
-	_deadCharShape = _screen->encodeShape(0, 88, 4, 32);
-	_disabledCharGrid = _screen->encodeShape(4, 88, 4, 32);
-	_blackBoxSmallGrid = _screen->encodeShape(9, 88, 2, 8);
-	_weaponSlotGrid = _screen->encodeShape(8, 88, 4, 16);
-	_blackBoxWideGrid = _screen->encodeShape(8, 104, 4, 8);
+	_sparkShapes[0] = _screen->encodeShape(29, 0, 2, 16, false, _cgaMappingDeco);
+	_sparkShapes[1] = _screen->encodeShape(31, 0, 2, 16, false, _cgaMappingDeco);
+	_sparkShapes[2] = _screen->encodeShape(33, 0, 2, 16, false, _cgaMappingDeco);
+	_deadCharShape = _screen->encodeShape(0, 88, 4, 32, false, _cgaMappingDeco);
+	_disabledCharGrid = _screen->encodeShape(4, 88, 4, 32, false, _cgaMappingDeco);
+	_blackBoxSmallGrid = _screen->encodeShape(9, 88, 2, 8, false, _cgaMappingDeco);
+	_weaponSlotGrid = _screen->encodeShape(8, 88, 4, 16, false, _cgaMappingDeco);
+	_blackBoxWideGrid = _screen->encodeShape(8, 104, 4, 8, false, _cgaMappingDeco);
 
 	static const uint8 dHeight[] = { 17, 10, 10 };
 	static const uint8 dY[] = { 120, 137, 147 };
@@ -726,7 +730,7 @@ void EoBCoreEngine::loadItemsAndDecorationsShapes() {
 	_compassShapes = new const uint8*[12];
 	for (int y = 0; y < 3; y++) {
 		for (int x = 0; x < 4; x++)
-			_compassShapes[(y << 2) + x] = _screen->encodeShape(x * 3, dY[y], 3, dHeight[y]);
+			_compassShapes[(y << 2) + x] = _screen->encodeShape(x * 3, dY[y], 3, dHeight[y], false, _cgaMappingDeco);
 	}
 }
 
@@ -1197,7 +1201,7 @@ void EoBCoreEngine::initNpc(int npcIndex) {
 
 	_screen->loadShapeSetBitmap(_flags.gameID == GI_EOB2 ? "OUTPORTS" : "OUTTAKE", 3, 3);
 	_screen->_curPage = 2;
-	c->faceShape = _screen->encodeShape(npcIndex << 2, _flags.gameID == GI_EOB2 ? 0 : 160, 4, 32, true);
+	c->faceShape = _screen->encodeShape(npcIndex << 2, _flags.gameID == GI_EOB2 ? 0 : 160, 4, 32, true, _cgaMappingDefault);
 	_screen->_curPage = 0;
 }
 
@@ -1679,13 +1683,13 @@ void EoBCoreEngine::seq_portal() {
 	_screen->loadShapeSetBitmap("PORTALA", 5, 3);
 
 	for (int i = 0; i < 5; i++) {
-		shapes1[i] = _screen->encodeShape(i * 3, 0, 3, 75);
-		shapes2[i] = _screen->encodeShape(i * 3, 80, 3, 75);
-		shapes3[i] = _screen->encodeShape(15, i * 18, 15, 18);
+		shapes1[i] = _screen->encodeShape(i * 3, 0, 3, 75, false, _cgaMappingDefault);
+		shapes2[i] = _screen->encodeShape(i * 3, 80, 3, 75, false, _cgaMappingDefault);
+		shapes3[i] = _screen->encodeShape(15, i * 18, 15, 18, false, _cgaMappingDefault);
 	}
 
-	shape0 = _screen->encodeShape(30, 0, 8, 77);
-	_screen->loadEoBBitmap("PORTALB", 0, 5, 3, 2);
+	shape0 = _screen->encodeShape(30, 0, 8, 77, false, _cgaMappingDefault);
+	_screen->loadEoBBitmap("PORTALB", _cgaMappingDefault, 5, 3, 2);
 
 	snd_playSoundEffect(33);
 	snd_playSoundEffect(19);
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index dff2427ddb..49589c809c 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -31,7 +31,7 @@
 
 namespace Kyra {
 
-struct EoBShapeDef {
+struct DarkMoonShapeDef {
 	int16 index;
 	uint8 x, y, w, h;
 };
@@ -577,7 +577,7 @@ protected:
 	void readLevelFileData(int level);
 	Common::String initLevelData(int sub);
 	void addLevelItems();
-	void loadVcnData(const char *file, const char * /*nextFile*/);
+	void loadVcnData(const char *file, const uint8 *cgaMapping);
 	void loadBlockProperties(const char *mazFile);
 	const uint8 *getBlockFileData(int levelIndex = 0);
 	Common::String getBlockFileName(int levelIndex, int sub);
@@ -834,6 +834,17 @@ protected:
 	Common::Error loadGameState(int slot);
 	Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail);
 
+	const uint8 *_cgaMappingDefault;
+	const uint8 *_cgaMappingAlt;
+	const uint8 *_cgaMappingInv;
+	const uint8 *_cgaMappingItemsL;
+	const uint8 *_cgaMappingItemsS;
+	const uint8 *_cgaMappingThrown;
+	const uint8 *_cgaMappingIcons;
+	const uint8 *_cgaMappingDeco;
+	const uint8 *_cgaMappingLevel[5];
+	const uint8 *_cgaLevelMappingIndex;
+
 	// Default parameters will import all present original save files and push them to the top of the save dialog.
 	bool importOriginalSaveFile(int destSlot, const char *sourceFile = 0);
 	Common::String readOriginalSaveFile(Common::String &file);
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index b89a6d7293..2fdfb0c011 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -47,7 +47,7 @@ Button *EoBCoreEngine::gui_getButton(Button *buttonList, int index) {
 }
 
 void EoBCoreEngine::gui_drawPlayField(bool refresh) {
-	_screen->loadEoBBitmap("PLAYFLD", 0, 5, 3, 2);
+	_screen->loadEoBBitmap("PLAYFLD", _cgaMappingDeco, 5, 3, 2);
 	int cp = _screen->setCurPage(2);
 	gui_drawCompass(true);
 
@@ -60,11 +60,11 @@ void EoBCoreEngine::gui_drawPlayField(bool refresh) {
 	if (!_loading)
 		_screen->updateScreen();
 
-	_screen->loadEoBBitmap("INVENT", 0, 5, 3, 2);
+	_screen->loadEoBBitmap("INVENT", _cgaMappingInv, 5, 3, 2);
 }
 
 void EoBCoreEngine::gui_restorePlayField() {
-	loadVcnData(0, 0);
+	loadVcnData(0, (_flags.gameID == GI_EOB1) ? _cgaMappingLevel[_cgaLevelMappingIndex[_currentLevel - 1]] : 0);
 	_screen->_curPage = 0;
 	gui_drawPlayField(true);
 	gui_drawAllCharPortraitsWithStats();
@@ -1891,7 +1891,7 @@ void GUI_EoB::simpleMenu_setup(int sd, int maxItem, const char *const *strings,
 	for (int i = 0; i < _menuNumItems; i++) {
 		int item = simpleMenu_getMenuItem(i, menuItemsMask, itemOffset);
 		int ty = y + i * (lineSpacing + _screen->getFontHeight());
-		_screen->printShadedText(strings[item], x, ty, dm->unkA, 0);
+		_screen->printShadedText(strings[item], x, ty, (_vm->_configRenderMode == Common::kRenderCGA) ? 1 : dm->unkA, 0);
 		if (item == v)
 			_screen->printText(strings[item], x, ty, dm->unkC, 0);
 	}
@@ -1944,7 +1944,7 @@ int GUI_EoB::simpleMenu_process(int sd, const char *const *strings, void *b, int
 	}
 
 	if (newItem != currentItem) {
-		_screen->printText(strings[simpleMenu_getMenuItem(currentItem, menuItemsMask, itemOffset)], x, y + currentItem * lineH , dm->unkA, 0);
+		_screen->printText(strings[simpleMenu_getMenuItem(currentItem, menuItemsMask, itemOffset)], x, y + currentItem * lineH, (_vm->_configRenderMode == Common::kRenderCGA) ? 1 : dm->unkA, 0);
 		_screen->printText(strings[simpleMenu_getMenuItem(newItem,  menuItemsMask, itemOffset)], x, y + newItem * lineH , dm->unkC, 0);
 		_screen->updateScreen();
 	}
diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp
index b28292562a..8c9a1ec835 100644
--- a/engines/kyra/kyra_rpg.cpp
+++ b/engines/kyra/kyra_rpg.cpp
@@ -45,7 +45,7 @@ KyraRpgEngine::KyraRpgEngine(OSystem *system, const GameFlags &flags) : KyraEngi
 	_vcnBlocks = 0;
 	_vcfBlocks = 0;
 	_vcnShift = 0;
-	_vcnExpTable = 0;
+	_vcnColTable = 0;
 	_vmpPtr = 0;
 	_blockBrightness = _wllVcnOffset = 0;
 	_blockDrawingBuffer = 0;
@@ -123,7 +123,7 @@ KyraRpgEngine::~KyraRpgEngine() {
 	delete[] _wllWallFlags;
 
 	delete[] _vmpPtr;
-	delete[] _vcnExpTable;
+	delete[] _vcnColTable;
 	delete[] _vcnBlocks;
 	delete[] _vcfBlocks;
 	delete[] _vcnShift;
@@ -173,9 +173,9 @@ Common::Error KyraRpgEngine::init() {
 	_lvlShapeLeftRight = new int16[36];
 	memset(_lvlShapeLeftRight, 0, 36 * sizeof(int16));
 
-	_vcnExpTable = new uint8[128];
+	_vcnColTable = new uint8[128];
 	for (int i = 0; i < 128; i++)
-		_vcnExpTable[i] = i & 0x0f;
+		_vcnColTable[i] = i & 0x0f;
 
 	_doorShapes = new uint8*[6];
 	memset(_doorShapes, 0, 6 * sizeof(uint8 *));
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index b606963d8a..6a71239250 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -225,7 +225,7 @@ protected:
 	uint8 *_vcnBlocks;
 	uint8 *_vcfBlocks;
 	uint8 *_vcnShift;
-	uint8 *_vcnExpTable;
+	uint8 *_vcnColTable;
 	uint16 *_blockDrawingBuffer;
 	uint8 *_sceneWindowBuffer;
 	uint8 _blockBrightness;
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 7167d41550..0f7da7673b 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -42,6 +42,8 @@ KyraEngine_v1::KyraEngine_v1(OSystem *system, const GameFlags &flags)
 	_emc = 0;
 	_debugger = 0;
 
+	_configRenderMode = Common::kRenderDefault;
+
 	if (_flags.platform == Common::kPlatformAmiga)
 		_gameSpeed = 50;
 	else
@@ -163,6 +165,9 @@ Common::Error KyraEngine_v1::init() {
 	if (_sound)
 		_sound->updateVolumeSettings();
 
+	if (ConfMan.hasKey("render_mode"))
+		_configRenderMode = Common::parseRenderMode(ConfMan.get("render_mode"));
+
 	_res = new Resource(this);
 	assert(_res);
 	_res->reset();
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 04bfab2cb8..2c2901a753 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -306,6 +306,8 @@ protected:
 	bool _configSounds;
 	uint8 _configVoice;
 
+	Common::RenderMode _configRenderMode;
+
 	// game speed
 	virtual bool skipFlag() const;
 	virtual void resetSkipFlag(bool removeEvent = true);
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 5de1577943..84592880e1 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -517,9 +517,23 @@ enum KyraResources {
 	kEoB1EnemyMageSfx,
 	kEoB1BeholderSpellList,
 	kEoB1BeholderSfx,
-
 	kEoB1TurnUndeadString,
 
+	kEoB1CgaMappingDefault,
+	kEoB1CgaMappingAlt,
+	kEoB1CgaMappingInv,
+	kEoB1CgaMappingItemsL,
+	kEoB1CgaMappingItemsS,
+	kEoB1CgaMappingThrown,
+	kEoB1CgaMappingIcons,
+	kEoB1CgaMappingDeco,
+	kEoB1CgaLevelMappingIndex,
+	kEoB1CgaMappingLevel0,
+	kEoB1CgaMappingLevel1,
+	kEoB1CgaMappingLevel2,
+	kEoB1CgaMappingLevel3,
+	kEoB1CgaMappingLevel4,
+
 	kEoB1NpcShpData,
 	kEoB1NpcSubShpIndex1,
 	kEoB1NpcSubShpIndex2,
@@ -548,50 +562,50 @@ enum KyraResources {
 
 	kEoB2IntroStrings,
 	kEoB2IntroCPSFiles,
-	kEoB2IntroSeqData00,
-	kEoB2IntroSeqData01,
-	kEoB2IntroSeqData02,
-	kEoB2IntroSeqData03,
-	kEoB2IntroSeqData04,
-	kEoB2IntroSeqData05,
-	kEoB2IntroSeqData06,
-	kEoB2IntroSeqData07,
-	kEoB2IntroSeqData08,
-	kEoB2IntroSeqData09,
-	kEoB2IntroSeqData10,
-	kEoB2IntroSeqData11,
-	kEoB2IntroSeqData12,
-	kEoB2IntroSeqData13,
-	kEoB2IntroSeqData14,
-	kEoB2IntroSeqData15,
-	kEoB2IntroSeqData16,
-	kEoB2IntroSeqData17,
-	kEoB2IntroSeqData18,
-	kEoB2IntroSeqData19,
-	kEoB2IntroSeqData20,
-	kEoB2IntroSeqData21,
-	kEoB2IntroSeqData22,
-	kEoB2IntroSeqData23,
-	kEoB2IntroSeqData24,
-	kEoB2IntroSeqData25,
-	kEoB2IntroSeqData26,
-	kEoB2IntroSeqData27,
-	kEoB2IntroSeqData28,
-	kEoB2IntroSeqData29,
-	kEoB2IntroSeqData30,
-	kEoB2IntroSeqData31,
-	kEoB2IntroSeqData32,
-	kEoB2IntroSeqData33,
-	kEoB2IntroSeqData34,
-	kEoB2IntroSeqData35,
-	kEoB2IntroSeqData36,
-	kEoB2IntroSeqData37,
-	kEoB2IntroSeqData38,
-	kEoB2IntroSeqData39,
-	kEoB2IntroSeqData40,
-	kEoB2IntroSeqData41,
-	kEoB2IntroSeqData42,
-	kEoB2IntroSeqData43,
+	kEob2IntroAnimData00,
+	kEob2IntroAnimData01,
+	kEob2IntroAnimData02,
+	kEob2IntroAnimData03,
+	kEob2IntroAnimData04,
+	kEob2IntroAnimData05,
+	kEob2IntroAnimData06,
+	kEob2IntroAnimData07,
+	kEob2IntroAnimData08,
+	kEob2IntroAnimData09,
+	kEob2IntroAnimData10,
+	kEob2IntroAnimData11,
+	kEob2IntroAnimData12,
+	kEob2IntroAnimData13,
+	kEob2IntroAnimData14,
+	kEob2IntroAnimData15,
+	kEob2IntroAnimData16,
+	kEob2IntroAnimData17,
+	kEob2IntroAnimData18,
+	kEob2IntroAnimData19,
+	kEob2IntroAnimData20,
+	kEob2IntroAnimData21,
+	kEob2IntroAnimData22,
+	kEob2IntroAnimData23,
+	kEob2IntroAnimData24,
+	kEob2IntroAnimData25,
+	kEob2IntroAnimData26,
+	kEob2IntroAnimData27,
+	kEob2IntroAnimData28,
+	kEob2IntroAnimData29,
+	kEob2IntroAnimData30,
+	kEob2IntroAnimData31,
+	kEob2IntroAnimData32,
+	kEob2IntroAnimData33,
+	kEob2IntroAnimData34,
+	kEob2IntroAnimData35,
+	kEob2IntroAnimData36,
+	kEob2IntroAnimData37,
+	kEob2IntroAnimData38,
+	kEob2IntroAnimData39,
+	kEob2IntroAnimData40,
+	kEob2IntroAnimData41,
+	kEob2IntroAnimData42,
+	kEob2IntroAnimData43,
 	kEoB2IntroShapes00,
 	kEoB2IntroShapes01,
 	kEoB2IntroShapes04,
@@ -600,27 +614,27 @@ enum KyraResources {
 	kEoB2FinaleStrings,
 	kEoB2CreditsData,
 	kEoB2FinaleCPSFiles,
-	kEoB2FinaleSeqData00,
-	kEoB2FinaleSeqData01,
-	kEoB2FinaleSeqData02,
-	kEoB2FinaleSeqData03,
-	kEoB2FinaleSeqData04,
-	kEoB2FinaleSeqData05,
-	kEoB2FinaleSeqData06,
-	kEoB2FinaleSeqData07,
-	kEoB2FinaleSeqData08,
-	kEoB2FinaleSeqData09,
-	kEoB2FinaleSeqData10,
-	kEoB2FinaleSeqData11,
-	kEoB2FinaleSeqData12,
-	kEoB2FinaleSeqData13,
-	kEoB2FinaleSeqData14,
-	kEoB2FinaleSeqData15,
-	kEoB2FinaleSeqData16,
-	kEoB2FinaleSeqData17,
-	kEoB2FinaleSeqData18,
-	kEoB2FinaleSeqData19,
-	kEoB2FinaleSeqData20,
+	kEob2FinaleAnimData00,
+	kEob2FinaleAnimData01,
+	kEob2FinaleAnimData02,
+	kEob2FinaleAnimData03,
+	kEob2FinaleAnimData04,
+	kEob2FinaleAnimData05,
+	kEob2FinaleAnimData06,
+	kEob2FinaleAnimData07,
+	kEob2FinaleAnimData08,
+	kEob2FinaleAnimData09,
+	kEob2FinaleAnimData10,
+	kEob2FinaleAnimData11,
+	kEob2FinaleAnimData12,
+	kEob2FinaleAnimData13,
+	kEob2FinaleAnimData14,
+	kEob2FinaleAnimData15,
+	kEob2FinaleAnimData16,
+	kEob2FinaleAnimData17,
+	kEob2FinaleAnimData18,
+	kEob2FinaleAnimData19,
+	kEob2FinaleAnimData20,
 	kEoB2FinaleShapes00,
 	kEoB2FinaleShapes03,
 	kEoB2FinaleShapes07,
@@ -757,8 +771,8 @@ public:
 	const LoLButtonDef *loadButtonDefs(int id, int &entries);
 #endif // ENABLE_LOL
 #ifdef ENABLE_EOB
-	const EoBSequenceStep *loadEoB2SeqData(int id, int &entries);
-	const EoBShapeDef *loadEoB2ShapeData(int id, int &entries);
+	const DarkMoonAnimCommand *loadEoB2SeqData(int id, int &entries);
+	const DarkMoonShapeDef *loadEoB2ShapeData(int id, int &entries);
 	const EoBCharacter *loadEoBNpcData(int id, int &entries);
 #endif // ENABLE_EOB
 
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 9f9476d0dc..7f20c124ff 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -110,7 +110,7 @@ Common::Error EoBCoreEngine::loadGameState(int slot) {
 		EoBCharacter *c = &_characters[i];
 		if (!c->flags || c->portrait < 0)
 			continue;
-		c->faceShape = _screen->encodeShape((c->portrait % 10) << 2, (c->portrait / 10) << 5, 4, 32, true);
+		c->faceShape = _screen->encodeShape((c->portrait % 10) << 2, (c->portrait / 10) << 5, 4, 32, true, _cgaMappingDefault);
 	}
 
 	_screen->loadShapeSetBitmap(_flags.gameID == GI_EOB2 ? "OUTPORTS" : "OUTTAKE", 3, 3);
@@ -118,7 +118,7 @@ Common::Error EoBCoreEngine::loadGameState(int slot) {
 		EoBCharacter *c = &_characters[i];
 		if (!c->flags || c->portrait >= 0)
 			continue;
-		c->faceShape = _screen->encodeShape((-(c->portrait + 1)) << 2, _flags.gameID == GI_EOB2 ? 0 : 160, 4, 32, true);
+		c->faceShape = _screen->encodeShape((-(c->portrait + 1)) << 2, _flags.gameID == GI_EOB2 ? 0 : 160, 4, 32, true, _cgaMappingDefault);
 	}
 	_screen->_curPage = 0;
 
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 3d615e966a..2a59a97cc1 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -86,8 +86,8 @@ void EoBCoreEngine::loadLevel(int level, int sub) {
 		pos += 2;
 	}
 
-	loadVcnData(gfxFile.c_str(), 0);
-	_screen->loadEoBBitmap("INVENT", 0, 5, 3, 2);
+	loadVcnData(gfxFile.c_str(), (_flags.gameID == GI_EOB1) ? _cgaMappingLevel[_cgaLevelMappingIndex[level - 1]] : 0);
+	_screen->loadEoBBitmap("INVENT", _cgaMappingInv, 5, 3, 2);
 	delayUntil(end);
 	snd_stopSound();
 
@@ -142,7 +142,8 @@ Common::String EoBCoreEngine::initLevelData(int sub) {
 		loadBlockProperties((const char *)pos);
 		pos += slen;
 
-		Common::SeekableReadStream *s = _res->createReadStream(Common::String::format("%s.VMP", (const char *)pos));
+		const char *vmpPattern = (_flags.gameID == GI_EOB1 && (_configRenderMode == Common::kRenderEGA || _configRenderMode == Common::kRenderCGA)) ? "%s.EMP" : "%s.VMP";
+		Common::SeekableReadStream *s = _res->createReadStream(Common::String::format(vmpPattern, (const char *)pos));
 		uint16 size = s->readUint16LE();
 		delete[] _vmpPtr;
 		_vmpPtr = new uint16[size];
@@ -150,12 +151,14 @@ Common::String EoBCoreEngine::initLevelData(int sub) {
 			_vmpPtr[i] = s->readUint16LE();
 		delete s;
 
-		Common::String tmpStr = Common::String::format("%s.PAL", (const char *)pos);
+		const char *paletteFilePattern = (_flags.gameID == GI_EOB2 && _configRenderMode == Common::kRenderEGA) ? "%s.EGA" : "%s.PAL";
+
+		Common::String tmpStr = Common::String::format(paletteFilePattern, (const char *)pos);
 		_curGfxFile = (const char *)pos;
 		pos += slen;
 
 		if (*pos++ != 0xff && _flags.gameID == GI_EOB2) {
-			tmpStr = Common::String::format("%s.PAL", (const char *)pos);
+			tmpStr = Common::String::format(paletteFilePattern, (const char *)pos);
 			pos += 13;
 		}
 
@@ -165,21 +168,24 @@ Common::String EoBCoreEngine::initLevelData(int sub) {
 			_screen->setShapeFadeMode(1, false);
 		}
 
-		_screen->loadPalette(tmpStr.c_str(), _screen->getPalette(0));
+		if (_flags.gameID == GI_EOB2 || _configRenderMode != Common::kRenderEGA)
+			_screen->loadPalette(tmpStr.c_str(), _screen->getPalette(0));
 
-		Palette backupPal(256);
-		backupPal.copy(_screen->getPalette(0), 224, 32, 224);
-		_screen->getPalette(0).fill(224, 32, 0x3f);
-		uint8 *src = _screen->getPalette(0).getData();
+		if (_configRenderMode != Common::kRenderCGA) {
+			Palette backupPal(256);
+			backupPal.copy(_screen->getPalette(0), 224, 32, 224);
+			_screen->getPalette(0).fill(224, 32, 0x3f);
+			uint8 *src = _screen->getPalette(0).getData();
 
-		_screen->createFadeTable(src, _screen->getFadeTable(0), 4, 75);     // green
-		_screen->createFadeTable(src, _screen->getFadeTable(1), 12, 200);   // black
-		_screen->createFadeTable(src, _screen->getFadeTable(2), 10, 85);    // blue
-		_screen->createFadeTable(src, _screen->getFadeTable(3), 11, 125);   // light blue
+			_screen->createFadeTable(src, _screen->getFadeTable(0), 4, 75);     // green
+			_screen->createFadeTable(src, _screen->getFadeTable(1), 12, 200);   // black
+			_screen->createFadeTable(src, _screen->getFadeTable(2), 10, 85);    // blue
+			_screen->createFadeTable(src, _screen->getFadeTable(3), 11, 125);   // light blue
 
-		_screen->getPalette(0).copy(backupPal, 224, 32, 224);
-		_screen->createFadeTable(src, _screen->getFadeTable(4), 12, 85);    // grey (shadow)
-		_screen->setFadeTableIndex(4);
+			_screen->getPalette(0).copy(backupPal, 224, 32, 224);
+			_screen->createFadeTable(src, _screen->getFadeTable(4), 12, 85);    // grey (shadow)
+			_screen->setFadeTableIndex(4);
+		}
 	}
 
 	if (_flags.gameID == GI_EOB2) {
@@ -267,15 +273,17 @@ void EoBCoreEngine::addLevelItems() {
 	}
 }
 
-void EoBCoreEngine::loadVcnData(const char *file, const char * /*nextFile*/) {
+void EoBCoreEngine::loadVcnData(const char *file, const uint8 *cgaMapping) {
 	if (file)
 		strcpy(_lastBlockDataFile, file);
 
-	_screen->loadBitmap(Common::String::format("%s.VCN", _lastBlockDataFile).c_str(), 3, 3, 0);
-	const uint8 *v = _screen->getCPagePtr(2);
+	const char *filePattern = (_flags.gameID == GI_EOB1 && (_configRenderMode == Common::kRenderEGA || _configRenderMode == Common::kRenderCGA)) ? "%s.ECN" : "%s.VCN";
+	_screen->loadBitmap(Common::String::format(filePattern, _lastBlockDataFile).c_str(), 3, 3, 0);
+	const uint8 *v = _screen->getCPagePtr(3);
 	uint32 tlen = READ_LE_UINT16(v) << 5;
 	v += 2;
-	memcpy(_vcnExpTable, v, 32);
+	if (!(_flags.gameID == GI_EOB1 && (_configRenderMode == Common::kRenderEGA || _configRenderMode == Common::kRenderCGA)))
+		memcpy(_vcnColTable, v, 32);
 	v += 32;
 	delete[] _vcnBlocks;
 	_vcnBlocks = new uint8[tlen];
@@ -301,7 +309,7 @@ const uint8 *EoBCoreEngine::getBlockFileData(int) {
 	Common::SeekableReadStream *s = _res->createReadStream(_curBlockFile);
 	_screen->loadFileDataToPage(s, 15, s->size());
 	delete s;
-	return _screen->getCPagePtr(14);
+	return _screen->getCPagePtr(15);
 }
 
 Common::String EoBCoreEngine::getBlockFileName(int levelIndex, int sub) {
@@ -400,7 +408,7 @@ void EoBCoreEngine::assignWallsAndDecorations(int wallIndex, int vmpIndex, int d
 			if (r->w == 0 || r->h == 0)
 				error("Error trying to make decoration %d (x: %d, y: %d, w: %d, h: %d)", decIndex, r->x, r->y, r->w, r->h);
 
-			_levelDecorationShapes[t] = _screen->encodeShape(r->x, r->y, r->w, r->h);
+			_levelDecorationShapes[t] = _screen->encodeShape(r->x, r->y, r->w, r->h, false, (_flags.gameID == GI_EOB1) ? _cgaMappingLevel[_cgaLevelMappingIndex[_currentLevel - 1]] : 0);
 		}
 
 		decIndex = _levelDecorationProperties[_mappedDecorationsCount++].next;
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index 796db9a340..79884718d7 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -358,7 +358,7 @@ void LoLEngine::loadLevelGraphics(const char *file, int specialColor, int weight
 		memcpy(_vcnShift, v, tlen);
 		v += tlen;
 
-		memcpy(_vcnExpTable, v, 128);
+		memcpy(_vcnColTable, v, 128);
 		v += 128;
 
 		if (_lastOverridePalFilePtr) {
@@ -451,7 +451,7 @@ void LoLEngine::loadLevelGraphics(const char *file, int specialColor, int weight
 		for (int i = 0; i < 8; i++) {
 			uint8 *pl = _screen->getLevelOverlay(7 - i);
 			for (int ii = 0; ii < 16; ii++)
-				_vcnExpTable[(i << 4) + ii] = pl[(ii << 4) | ii];
+				_vcnColTable[(i << 4) + ii] = pl[(ii << 4) | ii];
 		}
 	}
 
diff --git a/engines/kyra/scene_rpg.cpp b/engines/kyra/scene_rpg.cpp
index 07a7a879b1..55d02d8da1 100644
--- a/engines/kyra/scene_rpg.cpp
+++ b/engines/kyra/scene_rpg.cpp
@@ -389,8 +389,8 @@ void KyraRpgEngine::drawVcnBlocks() {
 					src += 3;
 					for (int blockX = 0; blockX < 4; blockX++) {
 						uint8 t = *src--;
-						*d++ = _vcnExpTable[((t & 0x0f) + wllVcnOffset) | shift];
-						*d++ = _vcnExpTable[((t >> 4) + wllVcnOffset) | shift];
+						*d++ = _vcnColTable[((t & 0x0f) + wllVcnOffset) | shift];
+						*d++ = _vcnColTable[((t >> 4) + wllVcnOffset) | shift];
 					}
 					src += 5;
 					d += 168;
@@ -399,8 +399,8 @@ void KyraRpgEngine::drawVcnBlocks() {
 				for (int blockY = 0; blockY < 8; blockY++) {
 					for (int blockX = 0; blockX < 4; blockX++) {
 						uint8 t = *src++;
-						*d++ = _vcnExpTable[((t >> 4) + wllVcnOffset) | shift];
-						*d++ = _vcnExpTable[((t & 0x0f) + wllVcnOffset) | shift];
+						*d++ = _vcnColTable[((t >> 4) + wllVcnOffset) | shift];
+						*d++ = _vcnColTable[((t & 0x0f) + wllVcnOffset) | shift];
 					}
 					d += 168;
 				}
@@ -424,8 +424,8 @@ void KyraRpgEngine::drawVcnBlocks() {
 						src += 3;
 						for (int blockX = 0; blockX < 4; blockX++) {
 							uint8 t = *src--;
-							uint8 h = _vcnExpTable[((t & 0x0f) + wllVcnRmdOffset) | shift];
-							uint8 l = _vcnExpTable[((t >> 4) + wllVcnRmdOffset) | shift];
+							uint8 h = _vcnColTable[((t & 0x0f) + wllVcnRmdOffset) | shift];
+							uint8 l = _vcnColTable[((t >> 4) + wllVcnRmdOffset) | shift];
 							if (h)
 								*d = h;
 							d++;
@@ -440,8 +440,8 @@ void KyraRpgEngine::drawVcnBlocks() {
 					for (int blockY = 0; blockY < 8; blockY++) {
 						for (int blockX = 0; blockX < 4; blockX++) {
 							uint8 t = *src++;
-							uint8 h = _vcnExpTable[((t >> 4) + wllVcnRmdOffset) | shift];
-							uint8 l = _vcnExpTable[((t & 0x0f) + wllVcnRmdOffset) | shift];
+							uint8 h = _vcnColTable[((t >> 4) + wllVcnRmdOffset) | shift];
+							uint8 l = _vcnColTable[((t & 0x0f) + wllVcnRmdOffset) | shift];
 							if (h)
 								*d = h;
 							d++;
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 6a76cfd0d5..ebf7835bfd 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -27,6 +27,7 @@
 #include "common/endian.h"
 #include "common/memstream.h"
 #include "common/system.h"
+#include "common/config-manager.h"
 
 #include "engines/util.h"
 
@@ -49,6 +50,9 @@ Screen::Screen(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, co
 
 	memset(_fonts, 0, sizeof(_fonts));
 
+	_renderMode = Common::kRenderDefault;
+	_cgaDrawCharDitheringTable = 0;
+
 	_currentFont = FID_8_FNT;
 	_paletteChanged = true;
 	_curDim = 0;
@@ -84,6 +88,10 @@ bool Screen::init() {
 	_useSJIS = false;
 	_use16ColorMode = _vm->gameFlags().use16ColorMode;
 	_isAmiga = (_vm->gameFlags().platform == Common::kPlatformAmiga);
+
+	if (ConfMan.hasKey("render_mode"))
+		_renderMode = Common::parseRenderMode(ConfMan.get("render_mode"));
+
 	memset(_fonts, 0, sizeof(_fonts));
 
 	if (_vm->gameFlags().useHiResOverlay) {
@@ -110,15 +118,33 @@ bool Screen::init() {
 	}
 
 	_curPage = 0;
-	uint8 *pagePtr = new uint8[SCREEN_PAGE_SIZE * 8];
-	for (int pageNum = 0; pageNum < SCREEN_PAGE_NUM; pageNum += 2)
-		_pagePtrs[pageNum] = _pagePtrs[pageNum + 1] = pagePtr + (pageNum >> 1) * SCREEN_PAGE_SIZE;
-	memset(pagePtr, 0, SCREEN_PAGE_SIZE * 8);
+
+	int numPages = SCREEN_PAGE_NUM / 2;
+	// CGA and EGA modes use additional pages to do the CGA/EGA specific graphics conversions.
+	if (_renderMode == Common::kRenderEGA || _renderMode == Common::kRenderCGA)
+		numPages += 4;
+
+	uint8 *pagePtr = new uint8[numPages * SCREEN_PAGE_SIZE];
+	memset(pagePtr, 0, numPages * SCREEN_PAGE_SIZE);
+
+	if (_renderMode == Common::kRenderEGA || _renderMode == Common::kRenderCGA) {
+		// Unlike VGA mode the odd and even page numbers do not always point to the same buffers.
+		// Instead, the odd pages are used for CGA/EGA specific graphics conversions.
+		int pageNum = 0;
+		for (; pageNum < 8; pageNum++)
+			_pagePtrs[pageNum] = pagePtr + pageNum * SCREEN_PAGE_SIZE;
+		for (; pageNum < SCREEN_PAGE_NUM; pageNum += 2)
+			_pagePtrs[pageNum] = _pagePtrs[pageNum + 1] = pagePtr + (pageNum / 2) * SCREEN_PAGE_SIZE;
+	} else {
+		for (int pageNum = 0; pageNum < SCREEN_PAGE_NUM; pageNum += 2)
+			_pagePtrs[pageNum] = _pagePtrs[pageNum + 1] = pagePtr + (pageNum / 2) * SCREEN_PAGE_SIZE;
+	}
 
 	memset(_shapePages, 0, sizeof(_shapePages));
 
 	const int paletteCount = _isAmiga ? 13 : 4;
-	const int numColors = _use16ColorMode ? 16 : (_isAmiga ? 32 : 256);
+	// We allow 256 color palettes in EGA mode, since original EOB II code does the same and requires it
+	const int numColors = _use16ColorMode ? 16 : (_isAmiga ? 32 : (_renderMode == Common::kRenderCGA ? 4 : 256));
 
 	_interfacePaletteEnabled = false;
 
@@ -131,6 +157,13 @@ bool Screen::init() {
 		assert(_palettes[i]);
 	}
 
+	// Setup CGA colors (if CGA mode is selected)
+	if (_renderMode == Common::kRenderCGA) {
+		Palette pal(4);
+		pal.setCGAPalette(1, Palette::kIntensityHigh);
+		Screen::setScreenPalette(pal);
+	}
+
 	_internFadePalette = new Palette(numColors);
 	assert(_internFadePalette);
 
@@ -618,8 +651,14 @@ void Screen::fadeToBlack(int delay, const UpdateFunctor *upFunc) {
 }
 
 void Screen::fadePalette(const Palette &pal, int delay, const UpdateFunctor *upFunc) {
+	if (_renderMode == Common::kRenderEGA)
+		setScreenPalette(pal);
+
 	updateScreen();
 
+	if (_renderMode == Common::kRenderCGA || _renderMode == Common::kRenderEGA)
+		return;
+
 	int diff = 0, delayInc = 0;
 	getFadeParams(pal, delay, delayInc, diff);
 
@@ -1126,7 +1165,7 @@ bool Screen::loadFont(FontId fontId, const char *filename) {
 			fnt = new AMIGAFont();
 #ifdef ENABLE_EOB
 		else if (_vm->game() == GI_EOB1 || _vm->game() == GI_EOB2)
-			fnt = new OldDOSFont();
+			fnt = new OldDOSFont(_renderMode, _cgaDrawCharDitheringTable);
 #endif // ENABLE_EOB
 		else
 			fnt = new DOSFont();
@@ -3013,6 +3052,9 @@ void Screen::loadBitmap(const char *filename, int tempPage, int dstPage, Palette
 }
 
 bool Screen::loadPalette(const char *filename, Palette &pal) {
+	if (_renderMode == Common::kRenderCGA)
+		return true;
+
 	Common::SeekableReadStream *stream = _vm->resource()->createReadStream(filename);
 
 	if (!stream)
@@ -3029,6 +3071,17 @@ bool Screen::loadPalette(const char *filename, Palette &pal) {
 	} else if (_vm->gameFlags().platform == Common::kPlatformPC98 && _use16ColorMode) {
 		numCols = stream->size() / Palette::kPC98BytesPerColor;
 		pal.loadPC98Palette(*stream, 0, MIN(maxCols, numCols));
+	} else if (_renderMode == Common::kRenderEGA) {
+		// EOB II checks the number of palette bytes to distinguish between real EGA palettes
+		// and normal palettes (which are used to generate a color map).
+		if (stream->size() == 16) {
+			numCols = 16;
+			pal.loadEGAPalette(*stream, 0, 16);
+		} else {
+			numCols = stream->size() / Palette::kVGABytesPerColor;
+			pal.loadVGAPalette(*stream, 0, numCols);
+		}
+
 	} else {
 		numCols = stream->size() / Palette::kVGABytesPerColor;
 		pal.loadVGAPalette(*stream, 0, MIN(maxCols, numCols));
@@ -3076,7 +3129,14 @@ void Screen::loadPalette(const byte *data, Palette &pal, int bytes) {
 		pal.loadAmigaPalette(stream, 0, stream.size() / Palette::kAmigaBytesPerColor);
 	else if (_vm->gameFlags().platform == Common::kPlatformPC98 && _use16ColorMode)
 		pal.loadPC98Palette(stream, 0, stream.size() / Palette::kPC98BytesPerColor);
-	else
+	else if (_renderMode == Common::kRenderEGA) {
+		// EOB II checks the number of palette bytes to distinguish between real EGA palettes
+		// and normal palettes (which are used to generate a color map).
+		if (stream.size() == 16)
+			pal.loadEGAPalette(stream, 0, stream.size());
+		else
+			pal.loadVGAPalette(stream, 0, stream.size() / Palette::kVGABytesPerColor);
+	} else
 		pal.loadVGAPalette(stream, 0, stream.size() / Palette::kVGABytesPerColor);
 }
 
@@ -3553,6 +3613,24 @@ void Palette::loadVGAPalette(Common::ReadStream &stream, int startIndex, int col
 		*pos++ = stream.readByte() & 0x3f;
 }
 
+void Palette::loadEGAPalette(Common::ReadStream &stream, int startIndex, int colors) {
+	assert(startIndex + colors <= 16);
+
+	uint8 *dst = _palData + startIndex * 3;
+	for (int i = 0; i < colors; i++) {
+		uint8 index = stream.readByte();
+		assert(index < _egaNumColors);
+		memcpy(dst, &_egaColors[index * 3], 3);
+		dst += 3;
+	}
+}
+
+void Palette::setCGAPalette(int palIndex, CGAIntensity intensity) {
+	assert(_numColors == _cgaNumColors);
+	assert(!(palIndex & ~1));
+	memcpy(_palData, _cgaColors[palIndex * 2 + intensity], _numColors * 3);
+}
+
 void Palette::loadAmigaPalette(Common::ReadStream &stream, int startIndex, int colors) {
 	assert(startIndex + colors <= _numColors);
 
@@ -3629,4 +3707,22 @@ uint8 *Palette::fetchRealPalette() const {
 	return buffer;
 }
 
+const uint8 Palette::_egaColors[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0x00, 0xAA, 0x00, 0x00, 0xAA, 0xAA,
+	0xAA, 0x00, 0x00, 0xAA,	0x00, 0xAA, 0xAA, 0x55, 0x00, 0xAA, 0xAA, 0xAA,
+	0x55, 0x55, 0x55, 0x55, 0x55, 0xFF, 0x55, 0xFF,	0x55, 0x55, 0xFF, 0xFF,
+	0xFF, 0x55, 0x55, 0xFF, 0x55, 0xFF, 0xFF, 0xFF, 0x55, 0xFF, 0xFF, 0xFF
+};
+
+const int Palette::_egaNumColors = ARRAYSIZE(_egaColors) / 3;
+
+const uint8 Palette::_cgaColors[4][12] = {
+	{ 0x00, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x2A, 0x00, 0x00, 0x2A, 0x15, 0x00 },
+	{ 0x00, 0x00, 0x00, 0x15, 0x3F, 0x15, 0x3F, 0x15, 0x15, 0x3F, 0x3F, 0x15 },
+	{ 0x00, 0x00, 0x00, 0x00, 0x2A, 0x2A, 0x2A, 0x00, 0x2A, 0x2A, 0x2A, 0x2A },
+	{ 0x00, 0x00, 0x00, 0x15, 0x3F, 0x3F, 0x3F, 0x15, 0x3F, 0x3F, 0x3F, 0x3F }
+};
+
+const int Palette::_cgaNumColors = ARRAYSIZE(_cgaColors[0]) / 3;
+
 } // End of namespace Kyra
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index 62ea35af9e..fcb5ef2be4 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -145,8 +145,8 @@ private:
  */
 class OldDOSFont : public Font {
 public:
-	OldDOSFont();
-	~OldDOSFont() { unload(); }
+	OldDOSFont(Common::RenderMode mode, const uint16 *cgaDitheringTable);
+	~OldDOSFont();
 
 	bool load(Common::SeekableReadStream &file);
 	int getHeight() const { return _height; }
@@ -165,6 +165,9 @@ private:
 	const uint8 *_colorMap;
 
 	int _numGlyphs;
+
+	Common::RenderMode _renderMode;
+	const uint16 *_cgaDitheringTable;
 };
 #endif // ENABLE_EOB
 
@@ -251,6 +254,21 @@ public:
 	 */
 	void loadVGAPalette(Common::ReadStream &stream, int startIndex, int colors);
 
+	/**
+	 * Load a EGA palette from the given stream.
+	 */
+	void loadEGAPalette(Common::ReadStream &stream, int startIndex, int colors);
+
+	/**
+	 * Set default CGA palette. We only need the cyan/magenta/grey mode.
+	 */
+	enum CGAIntensity {
+		kIntensityLow = 0,
+		kIntensityHigh = 1
+	};
+
+	void setCGAPalette(int palIndex, CGAIntensity intensity);
+
 	/**
 	 * Load a AMIGA palette from the given stream.
 	 */
@@ -325,9 +343,15 @@ public:
 	 */
 	uint8 *getData() { return _palData; }
 	const uint8 *getData() const { return _palData; }
+
 private:
 	uint8 *_palData;
 	const int _numColors;
+
+	static const uint8 _egaColors[];
+	static const int _egaNumColors;
+	static const uint8 _cgaColors[4][12];
+	static const int _cgaNumColors;
 };
 
 class Screen {
@@ -480,9 +504,9 @@ public:
 	// misc
 	void loadBitmap(const char *filename, int tempPage, int dstPage, Palette *pal, bool skip=false);
 
-	bool loadPalette(const char *filename, Palette &pal);
+	virtual bool loadPalette(const char *filename, Palette &pal);
 	bool loadPaletteTable(const char *filename, int firstPalette);
-	void loadPalette(const byte *data, Palette &pal, int bytes);
+	virtual void loadPalette(const byte *data, Palette &pal, int bytes);
 
 	void setAnimBlockPtr(int size);
 
@@ -550,6 +574,8 @@ protected:
 	bool _useSJIS;
 	bool _use16ColorMode;
 	bool _isAmiga;
+	Common::RenderMode _renderMode;
+	uint16 *_cgaDrawCharDitheringTable;
 
 	uint8 _sjisInvisibleColor;
 
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 6b1128bdfd..aa94114dfc 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -33,6 +33,7 @@
 #include "common/system.h"
 
 #include "graphics/cursorman.h"
+#include "graphics/palette.h"
 
 namespace Kyra {
 
@@ -49,29 +50,66 @@ Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system,
 	_dsRem = 0;
 	_dsScaleTmp = 0;
 	_gfxMaxY = 0;
+	_egaColorMap = 0;
+	_egaPixelValueTable = 0;
+	_cgaMappingDefault = 0;
+	_cgaDitheringTables[0] = _cgaDitheringTables[1] = 0;
+	_useHiResEGADithering = false;
 }
 
 Screen_EoB::~Screen_EoB() {
 	delete[] _fadeData;
 	delete[] _dsTempPage;
+	delete[] _egaColorMap;
+	delete[] _egaPixelValueTable;
+	delete[] _cgaDitheringTables[0];
+	delete[] _cgaDitheringTables[1];
+	delete[] _cgaDrawCharDitheringTable;
 }
 
 bool Screen_EoB::init() {
 	if (Screen::init()) {
 		int temp;
 		_gfxMaxY = _vm->staticres()->loadRawData(kEoBBaseExpObjectY, temp);
-		_fadeData = _vm->resource()->fileData("FADING.DAT", 0);
+		
+		if (_renderMode != Common::kRenderCGA && _renderMode != Common::kRenderEGA)
+			_fadeData = _vm->resource()->fileData("FADING.DAT", 0);
 
 		if (!_fadeData) {
 			_fadeData = new uint8[0x700];
 			memset(_fadeData, 0, 0x700);
-			uint8 *pal = _vm->resource()->fileData("palette1.pal", 0); // EGA: palette0.pal
-			for (int i = 0; i < 7; i++)
-				createFadeTable(pal, &_fadeData[i << 8], 18, (i + 1) * 36);
-			delete[] pal;
+			if (_renderMode != Common::kRenderCGA && _renderMode != Common::kRenderEGA) {
+				uint8 *pal = _vm->resource()->fileData("PALETTE1.PAL", 0);
+				for (int i = 0; i < 7; i++)
+					createFadeTable(pal, &_fadeData[i << 8], 18, (i + 1) * 36);
+				delete[] pal;
+			}
 		}
 
 		_dsTempPage = new uint8[6000];
+		if (_renderMode == Common::kRenderEGA) {
+			_egaColorMap = new uint8[256];
+			_egaPixelValueTable = new uint8[256];
+			for (int i = 0; i < 256; i++) {
+				_egaColorMap[i] = i & 0x0f;
+				_egaPixelValueTable[i] = i & 0x0f;
+			}
+
+			if (_vm->game() == GI_EOB2)
+				_useHiResEGADithering = true;
+		} else if (_renderMode == Common::kRenderCGA) {
+			_cgaMappingDefault = _vm->staticres()->loadRawData(kEoB1CgaMappingDefault, temp);
+			_cgaDitheringTables[0] = new uint16[256];
+			memset(_cgaDitheringTables[0], 0, 256 * sizeof(uint16));
+			_cgaDitheringTables[1] = new uint16[256];
+			memset(_cgaDitheringTables[1], 0, 256 * sizeof(uint16));
+			_cgaDrawCharDitheringTable = new uint16[256];
+			memset(_cgaDrawCharDitheringTable, 0, 256 * sizeof(uint16));
+			
+			static const uint bits[] = { 0, 3, 12, 15 };
+			for (int i = 0; i < 256; i++)
+				WRITE_BE_UINT16(&_cgaDrawCharDitheringTable[i], (bits[i & 3] << 8) | (bits[(i >> 2) & 3] << 12) | (bits[(i >> 4) & 3] << 0) | (bits[(i >> 6) & 3] << 4));
+		}
 
 		return true;
 	}
@@ -121,12 +159,13 @@ void Screen_EoB::printShadedText(const char *string, int x, int y, int col1, int
 }
 
 void Screen_EoB::loadShapeSetBitmap(const char *file, int tempPage, int destPage) {
-	loadEoBBitmap(file, 0, tempPage, destPage, -1);
+	loadEoBBitmap(file, _cgaMappingDefault, tempPage, destPage, -1);
 	_curPage = 2;
 }
 
-void Screen_EoB::loadEoBBitmap(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage) {
-	Common::String tmp = Common::String::format("%s.CPS", file);
+void Screen_EoB::loadEoBBitmap(const char *file, const uint8 *cgaMapping, int tempPage, int destPage, int convertToPage) {
+	const char *filePattern = (_vm->game() == GI_EOB1 && (_renderMode == Common::kRenderEGA || _renderMode == Common::kRenderCGA)) ? "%s.EGA" : "%s.CPS";
+	Common::String tmp = Common::String::format(filePattern, file);
 	Common::SeekableReadStream *s = _vm->resource()->createReadStream(tmp);
 	bool loadAlternative = false;
 	if (s) {
@@ -149,28 +188,124 @@ void Screen_EoB::loadEoBBitmap(const char *file, const uint8 *ditheringData, int
 			tmp.setChar('X', 0);
 			s = _vm->resource()->createReadStream(tmp);
 			if (!s)
-				error("Screen_EoB::loadEoBBitmap(): CPS file loading failed.");
+				error("Screen_EoB::loadEoBBitmap(): Failed to load file '%s'", file);
 			s->seek(768);
 			loadFileDataToPage(s, destPage, 64000);
 			delete s;
 		}
 	}
 
-	if (copyToPage == -1) {
+	if (convertToPage == -1) {
 		return;
-	} else if (copyToPage == 0) {
-		copyPage(destPage, 2);
+	} else if (convertToPage == 2 && _renderMode == Common::kRenderCGA) {
+		convertPage(destPage, 4, cgaMapping);
+		copyRegion(0, 0, 0, 0, 320, 200, 4, 2, Screen::CR_NO_P_CHECK);
+	} else if (convertToPage == 0) {
+		convertPage(destPage, 2, cgaMapping);
 		copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
 	} else {
-		copyPage(destPage, copyToPage);
+		convertPage(destPage, convertToPage, cgaMapping);
+	}
+}
+
+void Screen_EoB::convertPage(int srcPage, int dstPage, const uint8 *cgaMapping) {
+	uint8 *src = getPagePtr(srcPage);
+	uint8 *dst = getPagePtr(dstPage);
+	if (src == dst)
+		return;
+
+	if (_renderMode == Common::kRenderCGA) {
+		generateCGADitheringTables(cgaMapping);
+		uint16 *d = (uint16*)dst;
+		uint8 tblSwitch = 0;	
+		for (int height = SCREEN_H; height; height--) {
+			const uint16 *table = _cgaDitheringTables[(tblSwitch++) & 1];
+			for (int width = SCREEN_W / 2; width; width--) {
+				*d++ = table[((src[0] & 0x0f) << 4) | (src[1] & 0x0f)];
+				src += 2;
+			}
+		}
+
+		if (dstPage == 0 || dstPage == 1)
+			_forceFullUpdate = true;
+
+	} else if (_renderMode == Common::kRenderEGA) {
+		uint32 len = SCREEN_W * SCREEN_H;
+		if (_useHiResEGADithering) {
+			while (len--) {
+				uint8 col = _egaColorMap[*src++] & 0x0f;
+				*dst++ = col;
+
+				/*for (int i = 4; i; i--) {
+					uint8 col = _egaColorMap[*src++];
+
+				}*/
+			}
+		} else {
+			while (len--)
+				*dst++ = *src++ & 0x0f;
+		}
+
+		if (dstPage == 0 || dstPage == 1)
+			_forceFullUpdate = true;
+	} else {
+		copyPage(srcPage, dstPage);
+	}
+}
+
+void Screen_EoB::setScreenPalette(const Palette &pal) {
+	if (_renderMode == Common::kRenderEGA && _egaColorMap && pal.getNumColors() != 16) {
+		const uint8 *src = pal.getData();
+		uint8 *dst = _egaColorMap;
+
+		for (int i = 256; i; i--) {
+			uint8 r = *src++;
+			uint8 g = *src++;
+			uint8 b = *src++;
+
+			uint8 col = 0;
+			uint16 min = 11907;
+
+			for (int ii = 256; ii; ii--) {
+				const uint8 *palEntry = _egaMatchTable + (ii - 1) * 3;
+				if (*palEntry == 0xff)
+					continue;
+
+				int e_r = palEntry[0];
+				e_r -= r;
+				int e_g = palEntry[1];
+				e_g -= g;
+				int e_b = palEntry[2];
+				e_b -= b;
+
+				int s = (e_r * e_r) + (e_g * e_g) + (e_b * e_b);
+
+				if (s < min) {
+					min = s;
+					col = ii - 1;
+				}
+			}
+			*dst++ = col;
+		}
+
+		memset(_egaPixelValueTable, 0, 256);
+		for (int i = 0; i < 256; i++)
+			_egaPixelValueTable[_egaColorMap[i]] = i;
+
+	} else if (_renderMode == Common::kRenderEGA) {
+		_screenPalette->copy(pal);
+		_system->getPaletteManager()->setPalette(_screenPalette->getData(), 0, _screenPalette->getNumColors());
+
+	} else if (_renderMode != Common::kRenderCGA) {
+		Screen::setScreenPalette(pal);
 	}
 }
 
-uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4bitEncoding) {
+uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4bitEncoding, const uint8 *cgaMapping) {
 	uint8 *shp = 0;
 	uint16 shapesize = 0;
 
-	uint8 *srcPage = getPagePtr(_curPage) + y * 320 + (x << 3);
+	uint8 *srcPage = getPagePtr(_curPage | 1) + y * 320 + (x << 3);
 	uint8 *src = srcPage;
 
 	if (no4bitEncoding) {
@@ -206,7 +341,7 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 		*dst++ = (w & 0xff);
 		*dst++ = (h & 0xff);
 
-		srcPage = getPagePtr(_curPage) + y * 320 + (x << 3);
+		srcPage = getPagePtr(_curPage | 1) + y * 320 + (x << 3);
 		src = srcPage;
 
 		h1 = h;
@@ -255,7 +390,7 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 		uint8 *pal = dst;
 		dst += 0x10;
 
-		srcPage = getPagePtr(_curPage) + y * 320 + (x << 3);
+		srcPage = getPagePtr(_curPage | 1) + y * 320 + (x << 3);
 		src = srcPage;
 		nib = col = 0;
 
@@ -1096,12 +1231,74 @@ bool Screen_EoB::posWithinRect(int posX, int posY, int x1, int y1, int x2, int y
 	return true;
 }
 
-OldDOSFont::OldDOSFont() {
+void Screen_EoB::generateCGADitheringTables(const uint8 *mappingData) {
+	for (int i = 0; i < 256; i++) {
+		WRITE_BE_UINT16(&_cgaDitheringTables[0][i], (mappingData[i >> 4] << 8) | mappingData[(i & 0x0f) + 16]);
+		WRITE_BE_UINT16(&_cgaDitheringTables[1][i], (mappingData[(i >> 4) + 16] << 8) | mappingData[i & 0x0f]);
+	}
+}
+
+const uint8 Screen_EoB::_egaMatchTable[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x1E, 0x00, 0x00, 0x1E, 0x1E, 0x1E, 0x00, 0x00, 0x1E,
+	0x00, 0x1E, 0x1E, 0x0F, 0x00, 0x1E, 0x1E, 0x1E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x2D, 0x0F, 0x2D,
+	0x0F, 0x0F, 0x2D, 0x2D, 0x2D, 0x0F, 0x0F, 0x2D, 0x0F, 0x2D, 0x2D, 0x2D, 0x0F, 0x2D, 0x2D, 0x2D,
+	0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x2A, 0x00, 0x1E, 0x1E, 0x00, 0x1E, 0x2A, 0x1E, 0x00, 0x1E, 0x1E,
+	0x00, 0x2A, 0x1E, 0x0F, 0x1E, 0x1E, 0x1E, 0x2A, 0x0F, 0x0F, 0x21, 0x0F, 0x0F, 0x36, 0x0F, 0x2D,
+	0x21, 0x0F, 0x2D, 0x36, 0x2D, 0x0F, 0x21, 0x2D, 0x0F, 0x36, 0x2D, 0x2D, 0x21, 0x2D, 0x2D, 0x36,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x2A, 0x00, 0x00, 0x2A, 0x1E, 0x1E, 0x1E, 0x00, 0x1E,
+	0x1E, 0x1E, 0x1E, 0x21, 0x00, 0x1E, 0x2A, 0x1E, 0x0F, 0x21, 0x0F, 0x0F, 0x21, 0x2D, 0x0F, 0x36,
+	0x0F, 0x0F, 0x36, 0x2D, 0x2D, 0x21, 0x0F, 0x2D, 0x21, 0x2D, 0x2D, 0x36, 0x0F, 0x2D, 0x36, 0x2D,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x2A, 0x2A, 0x1E, 0x1E, 0x1E, 0x1E,
+	0x1E, 0x2A, 0x1E, 0x21, 0x1E, 0x1E, 0x2A, 0x2A, 0x0F, 0x21, 0x21, 0x0F, 0x21, 0x36, 0x0F, 0x36,
+	0x21, 0x0F, 0x36, 0x36, 0x2D, 0x21, 0x21, 0x2D, 0x21, 0x36, 0x2D, 0x36, 0x21, 0x2D, 0x36, 0x36,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x2A, 0x00, 0x00, 0x2A,
+	0x00, 0x1E, 0x2A, 0x0F, 0x00, 0x2A, 0x1E, 0x1E, 0x21, 0x0F, 0x0F, 0x21, 0x0F, 0x2D, 0x21, 0x2D,
+	0x0F, 0x21, 0x2D, 0x2D, 0x36, 0x0F, 0x0F, 0x36, 0x0F, 0x2D, 0x36, 0x2D, 0x0F, 0x36, 0x2D, 0x2D,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x2A,
+	0x00, 0x2A, 0x2A, 0x0F, 0x1E, 0x2A, 0x1E, 0x2A, 0x21, 0x0F, 0x21, 0x21, 0x0F, 0x36, 0x21, 0x2D,
+	0x21, 0x21, 0x2D, 0x36, 0x36, 0x0F, 0x21, 0x36, 0x0F, 0x36, 0x36, 0x2D, 0x21, 0x36, 0x2D, 0x36,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0x2A, 0x15, 0x00, 0x2A, 0x21, 0x1E, 0x21, 0x15, 0x0F, 0x21, 0x15, 0x2D, 0x21, 0x2F,
+	0x0F, 0x21, 0x2F, 0x2D, 0x36, 0x15, 0x0F, 0x36, 0x15, 0x2D, 0x36, 0x2F, 0x0F, 0x36, 0x2F, 0x2D,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x2A, 0x2A, 0x2A, 0x21, 0x21, 0x21, 0x21, 0x21, 0x36, 0x21, 0x36,
+	0x21, 0x21, 0x36, 0x36, 0x36, 0x21, 0x21, 0x36, 0x21, 0x36, 0x36, 0x36, 0x21, 0x36, 0x36, 0x36,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x15, 0x15, 0x15, 0x15, 0x15, 0x2F, 0x15, 0x2F,
+	0x15, 0x15, 0x2F, 0x2F, 0x2F, 0x15, 0x15, 0x2F, 0x15, 0x2F, 0x2F, 0x2F, 0x15, 0x2F, 0x2F, 0x2F,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x15, 0x15, 0x3F, 0x15, 0x2F,
+	0x2F, 0x15, 0x2F, 0x3F, 0x2F, 0x15, 0x2F, 0x2F, 0x15, 0x3F, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x3F,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x15, 0x3F,
+	0x15, 0x15, 0x3F, 0x2F, 0x2F, 0x2F, 0x15, 0x2F, 0x2F, 0x2F, 0x2F, 0x3F, 0x15, 0x2F, 0x3F, 0x2F,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x15, 0x3F, 0x3F, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F, 0x3F, 0x2F, 0x3F, 0x2F, 0x2F, 0x3F, 0x3F,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x15, 0x15, 0x3F, 0x15, 0x2F, 0x3F, 0x2F, 0x15, 0x3F, 0x2F, 0x2F,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x15, 0x3F, 0x3F, 0x2F, 0x2F, 0x3F, 0x2F, 0x3F,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x3F, 0x15, 0x3F, 0x3F, 0x2F,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x3F, 0x3F
+};
+
+OldDOSFont::OldDOSFont(Common::RenderMode mode, const uint16 *cgaDitheringTable) : _renderMode(mode), _cgaDitheringTable(cgaDitheringTable) {
 	_data = 0;
 	_width = _height = _numGlyphs = 0;
 	_bitmapOffsets = 0;
 }
 
+OldDOSFont::~OldDOSFont() {
+	unload();
+}
+
 bool OldDOSFont::load(Common::SeekableReadStream &file) {
 	unload();
 
@@ -1192,36 +1389,87 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 	uint8 color1 = _colorMap[1];
 	uint8 color2 = _colorMap[0];
 
+	static const uint16 cgaColorMask[] = { 0, 0x5555, 0xAAAA, 0xFFFF };
+	uint16 cgaMask1 = cgaColorMask[color1 & 3];
+	uint16 cgaMask2 = cgaColorMask[color2 & 3];
+
 	int cH = _height;
 	while (cH--) {
 		int cW = w;
+		uint8 last = 0;
 		const uint8 *mtbl = _width == 8 ? renderMaskTable8 : renderMaskTable6;
 
-		for (bool runWidthLoop = true; runWidthLoop;) {
+		if (_renderMode == Common::kRenderCGA) {
 			uint8 s = *src++;
 			uint8 m = *mtbl++;
 
-			for (uint8 i = 0x80; i; i >>= 1) {
-				if (!(m & i)) {
-					runWidthLoop = false;
-					break;
-				}
+			uint8 in = s | last;
+			uint16 cmp1 = 0;
+			uint16 cmp2 = 0;
+			
+			if (color1) {
+				in &= m;
+				cmp1 = _cgaDitheringTable[in];
+			}
 
-				if (s & i) {
-					if (color1)
-						*dst = color1;
-				} else if (color2) {
-					*dst = color2;
-				}
-				dst++;
+			if (color2) {
+				in = ~in & m;
+				cmp2 = _cgaDitheringTable[in];
 			}
 
-			if (cW)
-				cW--;
-			else
-				runWidthLoop = false;
-		}
+			uint16 cDst = 0;
+			uint8 sh = 14;
+			for (int i = 0; i < _width; i++) {
+				cDst |= ((dst[i] & 3) << sh);
+				sh -= 2;
+			}
 
+			uint16 out = (~(cmp1 | cmp2) & cDst) | (cmp1 & cgaMask1) | (cmp2 & cgaMask2);
+
+			sh = 14;
+			for (int i = 0; i < _width; i++) {
+				*dst++ = (out >> sh) & 3;
+				sh -= 2;
+			}
+
+			last = s;
+		} else {
+			for (bool runWidthLoop = true; runWidthLoop;) {
+				uint8 s = *src++;
+				uint8 m = *mtbl++;
+
+				for (uint8 i = 0x80; i; i >>= 1) {
+					if (!(m & i)) {
+						runWidthLoop = false;
+						break;
+					}
+
+					if (_renderMode == Common::kRenderCGA) {
+						uint8 in = s | last;
+						if (s & i) {
+							if (color1)
+								*dst = color1;
+						} else if (color2) {
+							*dst = color2;
+						}
+						last = s;
+					} else {
+						if (s & i) {
+							if (color1)
+								*dst = color1;
+						} else if (color2) {
+							*dst = color2;
+						}
+					}
+					dst++;
+				}
+
+				if (cW)
+					cW--;
+				else
+					runWidthLoop = false;
+			}
+		}
 		dst += pitch;
 	}
 }
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index 7040177266..1b55806b8b 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -45,10 +45,14 @@ public:
 	void loadFileDataToPage(Common::SeekableReadStream *s, int pageNum, uint32 size);
 
 	void printShadedText(const char *string, int x, int y, int col1, int col2);
-	void loadEoBBitmap(const char *file, const uint8 *ditheringData, int tempPage, int destPage, int copyToPage);
+	void loadEoBBitmap(const char *file, const uint8 *cgaMapping, int tempPage, int destPage, int convertToPage);
 	void loadShapeSetBitmap(const char *file, int tempPage, int destPage);
 
-	uint8 *encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4bitEncoding = false);
+	void convertPage(int srcPage, int dstPage, const uint8 *cgaMapping);
+
+	void setScreenPalette(const Palette &pal);
+
+	uint8 *encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4bitEncoding = false, const uint8 *cgaMapping = 0);
 	void drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd = -1, int flags = 0, ...);
 	const uint8 *scaleShape(const uint8 *shapeData, int blockDistance);
 	const uint8 *scaleShapeStep(const uint8 *shp);
@@ -77,6 +81,8 @@ private:
 	void scaleShapeProcessLine(uint8 *&dst, const uint8 *&src);
 	bool posWithinRect(int posX, int posY, int x1, int y1, int x2, int y2);
 
+	void generateCGADitheringTables(const uint8 *mappingData);
+
 	int _dsDiv, _dsRem, _dsScaleTmp;
 	int16 _gfxX, _gfxY;
 	uint8 _gfxCol;
@@ -90,6 +96,14 @@ private:
 
 	uint8 *_dsTempPage;
 
+	uint16 *_cgaDitheringTables[2];
+	const uint8 *_cgaMappingDefault;
+	
+	uint8 *_egaColorMap;
+	uint8 *_egaPixelValueTable;
+	bool _useHiResEGADithering;
+
+	static const uint8 _egaMatchTable[];
 	static const ScreenDim _screenDimTable[];
 	static const int _screenDimTableCount;
 };
diff --git a/engines/kyra/sequences_darkmoon.cpp b/engines/kyra/sequences_darkmoon.cpp
index f0d4a01486..d4f5c847fd 100644
--- a/engines/kyra/sequences_darkmoon.cpp
+++ b/engines/kyra/sequences_darkmoon.cpp
@@ -41,11 +41,22 @@ public:
 		kFinale
 	};
 
-	DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_EoB *screen, Mode mode, const char *const *strings, const char *const *cpsFiles, const char *const *palFiles, const EoBShapeDef **shapeDefList, const EoBSequenceStep **seqList);
+	struct Config {
+		Config(Mode m, const char *const *str, const char *const *cps, const char *const *pal, const DarkMoonShapeDef **shp, const DarkMoonAnimCommand **anim, bool paletteFading) : mode(m), strings(str), cpsFiles(cps), palFiles(pal), shapeDefs(shp), animData(anim), palFading(paletteFading) {}
+		Mode mode;
+		const char *const *strings;
+		const char *const *cpsFiles;
+		const char *const *palFiles;
+		const DarkMoonShapeDef **shapeDefs;
+		const DarkMoonAnimCommand **animData;
+		bool palFading;
+	};
+
+	DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_EoB *screen, const Config *config);
 	~DarkmoonSequenceHelper();
 
 	void loadScene(int index, int pageNum);
-	void runSequence(int index, int del = -1);
+	void animCommand(int index, int del = -1);
 
 	void printText(int index, int color);
 	void fadeText();
@@ -68,13 +79,7 @@ private:
 	OSystem *_system;
 	DarkMoonEngine *_vm;
 	Screen_EoB *_screen;
-	Mode _mode;
-
-	const char *const *_strings;
-	const char *const *_cpsFiles;
-	const char *const *_palFiles;
-	const EoBShapeDef **_shapeDefs;
-	const EoBSequenceStep **_seqData;
+	const Config *_config;
 
 	Palette *_palettes[12];
 
@@ -103,10 +108,14 @@ int DarkMoonEngine::mainMenu() {
 				_screen->loadFileDataToPage(s, 3, 64000);
 				delete s;
 			} else {
-				_screen->loadBitmap("MENU.CPS", 3, 2, &_screen->getPalette(0));
+				_screen->loadBitmap("MENU.CPS", 3, 3, &_screen->getPalette(0));
 			}
 
+			if (_configRenderMode == Common::kRenderEGA)
+				_screen->loadPalette("MENU.EGA", _screen->getPalette(0));
+
 			_screen->setScreenPalette(_screen->getPalette(0));
+			_screen->convertPage(3, 2, 0);
 
 			of = _screen->setFont(Screen::FID_6_FNT);
 			op = _screen->setCurPage(2);
@@ -167,7 +176,8 @@ int DarkMoonEngine::mainMenuLoop() {
 }
 
 void DarkMoonEngine::seq_playIntro() {
-	DarkmoonSequenceHelper sq(_system, this, _screen, DarkmoonSequenceHelper::kIntro, _introStrings, _cpsFilesIntro, _palFilesIntro, _shapesIntro, _seqIntro);
+	DarkmoonSequenceHelper::Config config(DarkmoonSequenceHelper::kIntro, _introStrings, _cpsFilesIntro, _configRenderMode == Common::kRenderEGA ? _palFilesIntroEGA : _palFilesIntroVGA, _shapesIntro,	_animIntro,	false);
+	DarkmoonSequenceHelper sq(_system, this, _screen, &config);
 
 	_screen->setCurPage(0);
 	_screen->clearCurPage();
@@ -192,24 +202,24 @@ void DarkMoonEngine::seq_playIntro() {
 	removeInputTop();
 	sq.delay(18);
 
-	sq.runSequence(3, 18);
-	sq.runSequence(6, 18);
-	sq.runSequence(0);
+	sq.animCommand(3, 18);
+	sq.animCommand(6, 18);
+	sq.animCommand(0);
 
 	sq.waitForSongNotifier(1);
 
-	sq.runSequence(11);
-	sq.runSequence(7, 6);
-	sq.runSequence(2, 6);
+	sq.animCommand(_configRenderMode == Common::kRenderEGA ? 12 : 11);
+	sq.animCommand(7, 6);
+	sq.animCommand(2, 6);
 
 	sq.waitForSongNotifier(2);
 
-	sq.runSequence(38);
-	sq.runSequence(3);
-	sq.runSequence(8);
-	sq.runSequence(1, 10);
-	sq.runSequence(0, 6);
-	sq.runSequence(2);
+	sq.animCommand(_configRenderMode == Common::kRenderEGA ? 39 : 38);
+	sq.animCommand(3);
+	sq.animCommand(8);
+	sq.animCommand(1, 10);
+	sq.animCommand(0, 6);
+	sq.animCommand(2);
 
 	sq.waitForSongNotifier(3);
 
@@ -218,22 +228,22 @@ void DarkMoonEngine::seq_playIntro() {
 	_screen->setClearScreenDim(17);
 	_screen->setCurPage(0);
 
-	sq.runSequence(40);
-	sq.runSequence(7, 18);
+	sq.animCommand(_configRenderMode == Common::kRenderEGA ? 41 : 40);
+	sq.animCommand(7, 18);
 
 	sq.printText(0, 16);    // You were settling...
-	sq.runSequence(7, 90);
+	sq.animCommand(7, 90);
 	sq.fadeText();
 
 	sq.printText(1, 16);    // Then a note was slipped to you
-	sq.runSequence(8);
-	sq.runSequence(2, 72);
+	sq.animCommand(8);
+	sq.animCommand(2, 72);
 	sq.fadeText();
 
 	sq.printText(2, 16);    // It was from your friend Khelben Blackstaff...
-	sq.runSequence(2);
-	sq.runSequence(6, 36);
-	sq.runSequence(3);
+	sq.animCommand(2);
+	sq.animCommand(6, 36);
+	sq.animCommand(3);
 	sq.fadeText();
 
 	sq.printText(3, 16);    // The message was urgent.
@@ -243,19 +253,33 @@ void DarkMoonEngine::seq_playIntro() {
 
 	// intro scroll
 	if (!skipFlag() && !shouldQuit()) {
-		for (int i = 0; i < 280; i += 3) {
-			uint32 endtime = _system->getMillis() + _tickLength;
-			_screen->copyRegion(11, 8, 8, 8, 301, 128, 0, 0, Screen::CR_NO_P_CHECK);
-			_screen->copyRegion(i, 0, 309, 8, 3, 128, 2, 0, Screen::CR_NO_P_CHECK);
-			_screen->updateScreen();
-			if (i == 96)
-				sq.runSequence(42);
-			delayUntil(endtime);
+		if (_configRenderMode == Common::kRenderEGA) {
+			for (int i = 0; i < 35; i++) {
+				uint32 endtime = _system->getMillis() + 2 * _tickLength;
+				_screen->copyRegion(16, 8, 8, 8, 296, 128, 0, 0, Screen::CR_NO_P_CHECK);
+				_screen->copyRegion(i << 3, 0, 304, 8, 8, 128, 2, 0, Screen::CR_NO_P_CHECK);
+				_screen->updateScreen();
+				if (i == 12)
+					sq.animCommand(42);
+				else if (i == 25)
+					snd_playSoundEffect(11);
+				delayUntil(endtime);
+			}
+		} else {
+			for (int i = 0; i < 280; i += 3) {
+				uint32 endtime = _system->getMillis() + _tickLength;
+				_screen->copyRegion(11, 8, 8, 8, 301, 128, 0, 0, Screen::CR_NO_P_CHECK);
+				_screen->copyRegion(i, 0, 309, 8, 3, 128, 2, 0, Screen::CR_NO_P_CHECK);
+				_screen->updateScreen();
+				if (i == 96)
+					sq.animCommand(42);
+				delayUntil(endtime);
+			}
 		}
 	}
 
 	_screen->copyRegion(8, 8, 0, 0, 304, 128, 0, 2, Screen::CR_NO_P_CHECK);
-	sq.runSequence(4);
+	sq.animCommand(4);
 	sq.fadeText();
 	sq.delay(10);
 
@@ -268,22 +292,22 @@ void DarkMoonEngine::seq_playIntro() {
 
 	sq.loadScene(3, 2);
 	sq.delay(54);
-	sq.runSequence(13);
+	sq.animCommand(13);
 	_screen->copyRegion(104, 16, 96, 8, 120, 100, 0, 2, Screen::CR_NO_P_CHECK);
 	sq.fadeText();
 
 	sq.printText(5, 15);    // Welcome, please come in
-	sq.runSequence(10);
-	sq.runSequence(10);
-	sq.runSequence(9);
-	sq.runSequence(9);
+	sq.animCommand(10);
+	sq.animCommand(10);
+	sq.animCommand(9);
+	sq.animCommand(9);
 	sq.fadeText();
 
 	sq.printText(6, 15);    // Khelben awaits you in his study
 	for (int i = 0; i < 3; i++)
-		sq.runSequence(10);
-	sq.runSequence(9);
-	sq.runSequence(14);
+		sq.animCommand(10);
+	sq.animCommand(9);
+	sq.animCommand(14);
 	sq.loadScene(5, 2);
 
 	sq.waitForSongNotifier(5);
@@ -293,45 +317,50 @@ void DarkMoonEngine::seq_playIntro() {
 	_screen->updateScreen();
 
 	for (int i = 0; i < 6; i++)
-		sq.runSequence(15);
+		sq.animCommand(15);
+
+	if (_configRenderMode == Common::kRenderEGA && !skipFlag() && !shouldQuit()) {
+		_screen->loadPalette("INTRO.EGA", _screen->getPalette(0));
+		_screen->setScreenPalette(_screen->getPalette(0));
+	}
 
 	sq.loadScene(6, 2);
 	sq.loadScene(7, 2);
 	_screen->clearCurPage();
 	sq.update(2);
 
-	sq.runSequence(16);
+	sq.animCommand(16);
 	sq.printText(7, 15);    // Thank you for coming so quickly
-	sq.runSequence(16);
-	sq.runSequence(17);
+	sq.animCommand(16);
+	sq.animCommand(17);
 	for (int i = 0; i < 3; i++)
-		sq.runSequence(16);
+		sq.animCommand(16);
 	sq.fadeText();
-	sq.runSequence(16);
+	sq.animCommand(16);
 
 	sq.loadScene(8, 2);
 	sq.update(2);
-	sq.runSequence(32);
+	sq.animCommand(32);
 	sq.printText(8, 15);    // I am troubled my friend
-	sq.runSequence(33);
-	sq.runSequence(33);
+	sq.animCommand(33);
+	sq.animCommand(33);
 	for (int i = 0; i < 4; i++)
-		sq.runSequence(32);
+		sq.animCommand(32);
 	sq.fadeText();
 
 	sq.printText(9, 15);    // Ancient evil stirs in the Temple Darkmoon
-	sq.runSequence(33);
-	sq.runSequence(43);
-	sq.runSequence(33);
+	sq.animCommand(33);
+	sq.animCommand(43);
+	sq.animCommand(33);
 	for (int i = 0; i < 3; i++)
-		sq.runSequence(32);
+		sq.animCommand(32);
 	sq.fadeText();
 
 	sq.printText(10, 15);   // I fear for the safety of our city
 	for (int i = 0; i < 4; i++)
-		sq.runSequence(33);
-	sq.runSequence(32);
-	sq.runSequence(32);
+		sq.animCommand(33);
+	sq.animCommand(32);
+	sq.animCommand(32);
 
 	sq.loadScene(9, 2);
 	sq.fadeText();
@@ -339,67 +368,67 @@ void DarkMoonEngine::seq_playIntro() {
 	sq.waitForSongNotifier(6);
 
 	sq.update(2);
-	sq.runSequence(34);
+	sq.animCommand(34);
 
 	sq.printText(11, 15);   // I need your help
 	for (int i = 0; i < 3; i++)
-		sq.runSequence(34);
-	sq.runSequence(35);
+		sq.animCommand(34);
+	sq.animCommand(35);
 	for (int i = 0; i < 4; i++)
-		sq.runSequence(34);
+		sq.animCommand(34);
 	sq.fadeText();
 
 	sq.loadScene(12, 2);
 	sq.update(2);
 	sq.loadScene(6, 2);
-	sq.runSequence(18);
+	sq.animCommand(18);
 
 	sq.printText(12, 15);   // Three nights ago I sent forth a scout
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(22);
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(18);
+	sq.animCommand(19);
+	sq.animCommand(20);
+	sq.animCommand(22);
+	sq.animCommand(19);
+	sq.animCommand(20);
+	sq.animCommand(18);
 	sq.fadeText();
 
 	sq.printText(13, 15);   // She has not yet returned
-	sq.runSequence(20);
-	sq.runSequence(19);
-	sq.runSequence(23);
-	sq.runSequence(24);
-	sq.runSequence(20);
-	sq.runSequence(19);
-	sq.runSequence(17);
-	sq.runSequence(18);
+	sq.animCommand(20);
+	sq.animCommand(19);
+	sq.animCommand(23);
+	sq.animCommand(24);
+	sq.animCommand(20);
+	sq.animCommand(19);
+	sq.animCommand(17);
+	sq.animCommand(18);
 	sq.fadeText();
 
 	sq.printText(14, 15);   // I fear for her safety
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(20);
-	sq.runSequence(18);
-	sq.runSequence(25);
-	sq.runSequence(18);
-	sq.runSequence(18);
+	sq.animCommand(19);
+	sq.animCommand(20);
+	sq.animCommand(20);
+	sq.animCommand(18);
+	sq.animCommand(25);
+	sq.animCommand(18);
+	sq.animCommand(18);
 	sq.fadeText();
-	sq.runSequence(18);
-	sq.runSequence(18);
+	sq.animCommand(18);
+	sq.animCommand(18);
 
 	sq.printText(15, 15);   // Take this coin
-	sq.runSequence(28);
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(18);
-	sq.runSequence(18);
+	sq.animCommand(28);
+	sq.animCommand(19);
+	sq.animCommand(20);
+	sq.animCommand(18);
+	sq.animCommand(18);
 	sq.fadeText();
 
 	sq.loadScene(10, 2);
 	_screen->clearCurPage();
 	_screen->updateScreen();
 
-	sq.runSequence(37, 18);
-	sq.runSequence(36, 36);
+	sq.animCommand(37, 18);
+	sq.animCommand(36, 36);
 
 	sq.loadScene(12, 2);
 	_screen->clearCurPage();
@@ -407,44 +436,44 @@ void DarkMoonEngine::seq_playIntro() {
 
 	sq.loadScene(11, 2);
 	sq.printText(16, 15);   // I will use it to contact you
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(20);
-	sq.runSequence(18);
-	sq.runSequence(18);
+	sq.animCommand(19);
+	sq.animCommand(20);
+	sq.animCommand(20);
+	sq.animCommand(18);
+	sq.animCommand(18);
 	sq.fadeText();
 
 	sq.printText(17, 15);   // You must act quickly
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(19);
-	sq.runSequence(18);
-	sq.runSequence(18);
+	sq.animCommand(19);
+	sq.animCommand(20);
+	sq.animCommand(19);
+	sq.animCommand(18);
+	sq.animCommand(18);
 	sq.fadeText();
-	sq.runSequence(18);
+	sq.animCommand(18);
 
 	sq.printText(18, 15);   // I will teleport you near Darkmoon
-	sq.runSequence(20);
-	sq.runSequence(27);
-	sq.runSequence(20);
-	sq.runSequence(19);
-	sq.runSequence(18);
-	sq.runSequence(18);
+	sq.animCommand(20);
+	sq.animCommand(27);
+	sq.animCommand(20);
+	sq.animCommand(19);
+	sq.animCommand(18);
+	sq.animCommand(18);
 	sq.fadeText();
-	sq.runSequence(18);
+	sq.animCommand(18);
 
 	sq.printText(19, 15);   // May luck be with you my friend
-	sq.runSequence(19);
-	sq.runSequence(19);
-	sq.runSequence(20);
-	sq.runSequence(18);
+	sq.animCommand(19);
+	sq.animCommand(19);
+	sq.animCommand(20);
+	sq.animCommand(18);
 	sq.fadeText();
-	sq.runSequence(29);
+	sq.animCommand(29);
 
 	sq.waitForSongNotifier(7);
 
-	sq.runSequence(30);
-	sq.runSequence(31);
+	sq.animCommand(30);
+	sq.animCommand(31);
 
 	sq.waitForSongNotifier(8, true);
 
@@ -454,17 +483,21 @@ void DarkMoonEngine::seq_playIntro() {
 		_screen->setScreenDim(17);
 		_screen->clearCurDim();
 		snd_playSoundEffect(14);
-		sq.fadePalette(10, 1);
+
+		if (_configRenderMode != Common::kRenderEGA)
+			sq.fadePalette(10, 1);
 		_screen->setClearScreenDim(18);
 		sq.delay(6);
-		sq.fadePalette(9, 1);
+		if (_configRenderMode != Common::kRenderEGA)
+			sq.fadePalette(9, 1);
 		_screen->clearCurPage();
 	}
 	sq.fadePalette(9, 10);
 }
 
 void DarkMoonEngine::seq_playFinale() {
-	DarkmoonSequenceHelper sq(_system, this, _screen, DarkmoonSequenceHelper::kFinale, _finaleStrings, _cpsFilesFinale, _palFilesFinale, _shapesFinale, _seqFinale);
+	DarkmoonSequenceHelper::Config config(DarkmoonSequenceHelper::kFinale, _finaleStrings, _cpsFilesFinale, _configRenderMode == Common::kRenderEGA ? _palFilesFinaleEGA : _palFilesFinaleVGA, _shapesFinale, _animFinale, true);
+	DarkmoonSequenceHelper sq(_system, this, _screen, &config);
 
 	_screen->setCurPage(0);
 	_screen->setFont(Screen::FID_8_FNT);
@@ -485,76 +518,76 @@ void DarkMoonEngine::seq_playFinale() {
 
 	sq.loadScene(1, 2);
 
-	sq.runSequence(0);
-	sq.runSequence(0);
+	sq.animCommand(0);
+	sq.animCommand(0);
 	for (int i = 0; i < 3; i++)
-		sq.runSequence(2);
-	sq.runSequence(1);
-	sq.runSequence(2);
-	sq.runSequence(2);
+		sq.animCommand(2);
+	sq.animCommand(1);
+	sq.animCommand(2);
+	sq.animCommand(2);
 
 	sq.printText(0, 10);            // Finally, Dran has been defeated
 	for (int i = 0; i < 7; i++)
-		sq.runSequence(2);
+		sq.animCommand(2);
 	sq.fadeText();
-	sq.runSequence(2);
+	sq.animCommand(2);
 
 	sq.waitForSongNotifier(1);
 
 	sq.printText(1, 10);            // Suddenly, your friend Khelben appears
-	sq.runSequence(4);
+	sq.animCommand(4);
 	for (int i = 0; i < 3; i++)
-		sq.runSequence(2);
+		sq.animCommand(2);
 	sq.fadeText();
 
 	sq.printText(2, 15);            // Greetings, my victorious friends
 	for (int i = 0; i < 4; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
+		sq.animCommand(5);
+	sq.animCommand(2);
+	sq.animCommand(2);
 	sq.fadeText();
-	sq.runSequence(6);
+	sq.animCommand(6);
 
 	sq.printText(3, 15);            // You have defeated Dran
 	for (int i = 0; i < 5; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
+		sq.animCommand(5);
+	sq.animCommand(2);
+	sq.animCommand(2);
 	sq.fadeText();
 
 	sq.printText(4, 15);            // I did not know Dran was a dragon
 	for (int i = 0; i < 4; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
+		sq.animCommand(5);
+	sq.animCommand(2);
+	sq.animCommand(2);
 	sq.fadeText();
 
 	sq.printText(5, 15);            // He must have been over 300 years old
 	for (int i = 0; i < 4; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
+		sq.animCommand(5);
+	sq.animCommand(2);
+	sq.animCommand(2);
 	sq.fadeText();
 
 	sq.printText(6, 15);            // His power is gone
 	for (int i = 0; i < 3; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
+		sq.animCommand(5);
+	sq.animCommand(2);
+	sq.animCommand(2);
 	sq.fadeText();
 
 	sq.printText(7, 15);            // But Darkmoon is still a source of great evil
 	for (int i = 0; i < 4; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
+		sq.animCommand(5);
+	sq.animCommand(2);
+	sq.animCommand(2);
 	sq.fadeText();
 
 	sq.printText(8, 15);            // And many of his minions remain
 	for (int i = 0; i < 4; i++)
-		sq.runSequence(5);
-	sq.runSequence(2);
-	sq.runSequence(2);
+		sq.animCommand(5);
+	sq.animCommand(2);
+	sq.animCommand(2);
 	sq.fadeText();
 
 	sq.loadScene(2, 2);
@@ -563,29 +596,32 @@ void DarkMoonEngine::seq_playFinale() {
 	_screen->copyRegion(8, 8, 0, 0, 304, 128, 0, 2, Screen::CR_NO_P_CHECK);
 
 	sq.printText(9, 15);            // Now we must leave this place
-	sq.runSequence(7);
-	sq.runSequence(8);
-	sq.runSequence(7);
-	sq.runSequence(7, 36);
+	sq.animCommand(7);
+	sq.animCommand(8);
+	sq.animCommand(7);
+	sq.animCommand(7, 36);
 	sq.fadeText();
 
 	sq.printText(10, 15);           // So my forces can destroy it..
 	for (int i = 0; i < 3; i++)
-		sq.runSequence(7);
-	sq.runSequence(8);
-	sq.runSequence(7);
-	sq.runSequence(7, 36);
-	sq.runSequence(8, 18);
+		sq.animCommand(7);
+	sq.animCommand(8);
+	sq.animCommand(7);
+	sq.animCommand(7, 36);
+	sq.animCommand(8, 18);
 	sq.fadeText();
 
 	sq.printText(11, 15);           // Follow me
-	sq.runSequence(7, 18);
-	sq.runSequence(9, 18);
-	sq.runSequence(8, 18);
+	sq.animCommand(7, 18);
+	sq.animCommand(9, 18);
+	sq.animCommand(8, 18);
 	sq.fadeText();
 
 	sq.loadScene(7, 2);
-	sq.copyPalette(3, 0);
+
+	if (_configRenderMode != Common::kRenderEGA)
+		sq.copyPalette(3, 0);
+
 	sq.loadScene(4, 2);
 
 	sq.waitForSongNotifier(2);
@@ -607,23 +643,23 @@ void DarkMoonEngine::seq_playFinale() {
 		snd_playSoundEffect(7);
 	sq.delay(8);
 
-	sq.runSequence(10);
-	sq.runSequence(13);
+	sq.animCommand(10);
+	sq.animCommand(13);
 	sq.initDelayedPaletteFade(4, 1);
 
-	sq.runSequence(14);
-	sq.runSequence(13);
-	sq.runSequence(14);
-	sq.runSequence(14);
-	sq.runSequence(13);
+	sq.animCommand(14);
+	sq.animCommand(13);
+	sq.animCommand(14);
+	sq.animCommand(14);
+	sq.animCommand(13);
 	sq.initDelayedPaletteFade(2, 1);
 
-	sq.runSequence(15);
-	sq.runSequence(14);
-	sq.runSequence(13);
-	sq.runSequence(15);
-	sq.runSequence(15);
-	sq.runSequence(11);
+	sq.animCommand(15);
+	sq.animCommand(14);
+	sq.animCommand(13);
+	sq.animCommand(15);
+	sq.animCommand(15);
+	sq.animCommand(11);
 
 	sq.printText(13, 10);           // The temple's evil is very strong
 	sq.delay(72);
@@ -639,22 +675,22 @@ void DarkMoonEngine::seq_playFinale() {
 		snd_playSoundEffect(7);
 	sq.delay(8);
 
-	sq.runSequence(10);
+	sq.animCommand(10);
 	sq.initDelayedPaletteFade(5, 1);
-	sq.runSequence(13);
-	sq.runSequence(14);
-	sq.runSequence(13);
-	sq.runSequence(14);
-	sq.runSequence(13);
-	sq.runSequence(13);
-	sq.runSequence(14);
-	sq.runSequence(14);
-	sq.runSequence(13);
-	sq.runSequence(12);
+	sq.animCommand(13);
+	sq.animCommand(14);
+	sq.animCommand(13);
+	sq.animCommand(14);
+	sq.animCommand(13);
+	sq.animCommand(13);
+	sq.animCommand(14);
+	sq.animCommand(14);
+	sq.animCommand(13);
+	sq.animCommand(12);
 	for (int i = 0; i < 4; i++)
-		sq.runSequence(16);
-	sq.runSequence(17);
-	sq.runSequence(18);
+		sq.animCommand(16);
+	sq.animCommand(17);
+	sq.animCommand(18);
 
 	sq.printText(15, 10);           // The temple ceases to exist
 	sq.initDelayedPaletteFade(6, 1);
@@ -672,40 +708,43 @@ void DarkMoonEngine::seq_playFinale() {
 	if (!skipFlag() && !shouldQuit())
 		snd_playSoundEffect(6);
 
-	if (!skipFlag() && !shouldQuit())
+	if (!skipFlag() && !shouldQuit()) {
+		if (_configRenderMode != Common::kRenderEGA)
+			sq.setPaletteWithoutTextColor(0);
 		_screen->crossFadeRegion(0, 0, 8, 8, 304, 128, 2, 0);
+	}
 	sq.delay(18);
 
 	sq.printText(16, 15);           // My friends, our work is done
-	sq.runSequence(20);
-	sq.runSequence(19);
-	sq.runSequence(19, 36);
+	sq.animCommand(20);
+	sq.animCommand(19);
+	sq.animCommand(19, 36);
 	if (!skipFlag() && !shouldQuit())
 		snd_playSoundEffect(12);
 	sq.fadeText();
 
 	sq.printText(17, 15);           // Thank you
-	sq.runSequence(19);
-	sq.runSequence(20, 36);
+	sq.animCommand(19);
+	sq.animCommand(20, 36);
 	sq.fadeText();
 
 	sq.printText(18, 15);           // You have earned my deepest respect
 	if (!skipFlag() && !shouldQuit())
 		snd_playSoundEffect(11);
-	sq.runSequence(20);
-	sq.runSequence(19);
-	sq.runSequence(19);
+	sq.animCommand(20);
+	sq.animCommand(19);
+	sq.animCommand(19);
 	if (!skipFlag() && !shouldQuit())
 		snd_playSoundEffect(11);
 	sq.delay(36);
 	sq.fadeText();
 
 	sq.printText(19, 15);           // We will remember you always
-	sq.runSequence(19);
-	sq.runSequence(19, 18);
+	sq.animCommand(19);
+	sq.animCommand(19, 18);
 	if (!skipFlag() && !shouldQuit())
 		snd_playSoundEffect(11);
-	sq.runSequence(20, 18);
+	sq.animCommand(20, 18);
 	sq.fadeText();
 
 	sq.delay(28);
@@ -718,6 +757,8 @@ void DarkMoonEngine::seq_playFinale() {
 		_screen->copyRegion(0, 0, 8, 8, 304, 128, 2, 0, Screen::CR_NO_P_CHECK);
 	} else {
 		snd_playSoundEffect(6);
+		if (_configRenderMode != Common::kRenderEGA)
+			sq.setPaletteWithoutTextColor(0);
 		_screen->crossFadeRegion(0, 0, 8, 8, 304, 128, 2, 0);
 	}
 
@@ -756,8 +797,10 @@ void DarkMoonEngine::seq_playFinale() {
 
 	resetSkipFlag(true);
 
-	sq.setPalette(11);
-	sq.fadePalette(9, 10);
+	if (_configRenderMode != Common::kRenderEGA) {
+		sq.setPalette(11);
+		sq.fadePalette(9, 10);
+	}
 
 	_screen->clearCurPage();
 	sq.loadScene(11, 2);
@@ -912,15 +955,15 @@ void DarkMoonEngine::seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *da
 		delete[] items[i].str;
 }
 
-DarkmoonSequenceHelper::DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_EoB *screen, Mode mode, const char *const *strings, const char *const *cpsFiles, const char *const *palFiles, const EoBShapeDef **shapeDefList, const EoBSequenceStep **seqList) :
-	_system(system), _vm(vm), _screen(screen), _mode(mode), _strings(strings), _cpsFiles(cpsFiles), _palFiles(palFiles), _shapeDefs(shapeDefList), _seqData(seqList) {
+DarkmoonSequenceHelper::DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *vm, Screen_EoB *screen, const Config *config) :
+	_system(system), _vm(vm), _screen(screen), _config(config) {
 
-	for (int i = 0; _palFiles[i]; i++) {
+	for (int i = 0; _config->palFiles[i]; i++) {
 		if (i < 4)
 			_palettes[i] = &_screen->getPalette(i);
 		else
 			_palettes[i] = new Palette(256);
-		_screen->loadPalette(_palFiles[i], *_palettes[i]);
+		_screen->loadPalette(_config->palFiles[i], *_palettes[i]);
 	}
 
 	_palettes[9] = new Palette(256);
@@ -946,7 +989,7 @@ DarkmoonSequenceHelper::DarkmoonSequenceHelper(OSystem *system, DarkMoonEngine *
 }
 
 DarkmoonSequenceHelper::~DarkmoonSequenceHelper() {
-	for (int i = 4; _palFiles[i]; i++)
+	for (int i = 4; _config->palFiles[i]; i++)
 		delete _palettes[i];
 	delete _palettes[9];
 	delete _palettes[10];
@@ -967,12 +1010,22 @@ DarkmoonSequenceHelper::~DarkmoonSequenceHelper() {
 
 void DarkmoonSequenceHelper::loadScene(int index, int pageNum) {
 	char file[13];
-	strcpy(file, _cpsFiles[index]);
+	strcpy(file, _config->cpsFiles[index]);
 
 	Common::SeekableReadStream *s = _vm->resource()->createReadStream(file);
-	if (s && file[0] != 'X') {
+	uint32 chunkID = 0;
+	if (s) {
+		chunkID = s->readUint32LE();
+		s->seek(0);
+	}
+
+	if (s && chunkID == MKTAG('F', 'O', 'R', 'M')) {
+		// The original code also handles files with FORM chunks and ILBM and PBM sub chunks. This will probably be necessary for Amiga versions.
+		// The DOS versions do not need this, but still have the code for it. We error out for now.
+		error("DarkmoonSequenceHelper::loadScene(): CPS file loading failure in scene %d - unhandled FORM chunk encountered", index);
+	} else if (s && file[0] != 'X') {
 		delete s;
-		_screen->loadBitmap(_cpsFiles[index], pageNum | 1, pageNum | 1, _palettes[0]);
+		_screen->loadBitmap(_config->cpsFiles[index], pageNum | 1, pageNum | 1, _palettes[0]);
 	} else {
 		if (!s) {
 			file[0] = 'X';
@@ -982,7 +1035,7 @@ void DarkmoonSequenceHelper::loadScene(int index, int pageNum) {
 		if (!s)
 			error("DarkmoonSequenceHelper::loadScene(): CPS file loading failure in scene %d", index);
 
-		if (_mode == kFinale)
+		if (_config->mode == kFinale)
 			s->read(_palettes[0]->getData(), 768);
 		else
 			s->seek(768);
@@ -992,8 +1045,8 @@ void DarkmoonSequenceHelper::loadScene(int index, int pageNum) {
 
 	int cp = _screen->setCurPage(pageNum);
 
-	if (_shapeDefs[index]) {
-		for (const EoBShapeDef *df = _shapeDefs[index]; df->w; df++) {
+	if (_config->shapeDefs[index]) {
+		for (const DarkMoonShapeDef *df = _config->shapeDefs[index]; df->w; df++) {
 			uint16 shapeIndex = (df->index < 0) ? df->index * -1 : df->index;
 			if (_shapes[shapeIndex])
 				delete[] _shapes[shapeIndex];
@@ -1002,20 +1055,24 @@ void DarkmoonSequenceHelper::loadScene(int index, int pageNum) {
 	}
 
 	_screen->setCurPage(cp);
-	_screen->copyPage(pageNum | 1, pageNum);
+
+	if (_vm->_configRenderMode == Common::kRenderEGA)
+		setPalette(0);
+
+	_screen->convertPage(pageNum | 1, pageNum, 0);
 
 	if ((pageNum == 0 || pageNum == 1) && !_vm->skipFlag() && !_vm->shouldQuit())
 		_screen->updateScreen();
 }
 
-void DarkmoonSequenceHelper::runSequence(int index, int del) {
+void DarkmoonSequenceHelper::animCommand(int index, int del) {
 	if (_vm->skipFlag() || _vm->shouldQuit())
 		return;
 
 	uint32 end = 0;
 
-	for (const EoBSequenceStep *s = _seqData[index]; s->command != 0xff && !_vm->skipFlag() && !_vm->shouldQuit(); s++) {
-		int palIndex = _mode == kFinale ? (s->pal + 1) : s->pal;
+	for (const DarkMoonAnimCommand *s = _config->animData[index]; s->command != 0xff && !_vm->skipFlag() && !_vm->shouldQuit(); s++) {
+		int palIndex = _config->mode == kFinale ? (s->pal + 1) : s->pal;
 		int x = s->x1;
 		int y = s->y1;
 		int x2 = 0;
@@ -1025,10 +1082,10 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 		switch (s->command) {
 		case 0:
 			// flash palette
-			if (s->pal)
+			if (_vm->_configRenderMode != Common::kRenderEGA && s->pal)
 				setPaletteWithoutTextColor(palIndex);
 			delay(s->delay);
-			if (_mode == kIntro && s->pal)
+			if (_vm->_configRenderMode != Common::kRenderEGA && _config->mode == kIntro && s->pal)
 				setPaletteWithoutTextColor(0);
 			break;
 
@@ -1037,7 +1094,7 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 			shapeW = _shapes[s->obj][2];
 			shapeH = _shapes[s->obj][3];
 
-			if (_mode == kFinale) {
+			if (_config->mode == kFinale) {
 				_screen->setScreenDim(18);
 				x -= (_screen->_curDim->sx << 3);
 				y -= _screen->_curDim->sy;
@@ -1047,17 +1104,17 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 					x2 = x;
 			}
 
-			_screen->drawShape(0, _shapes[s->obj], x, y, _mode == kIntro ? 0 : 18);
+			_screen->drawShape(0, _shapes[s->obj], x, y, _config->mode == kIntro ? 0 : 18);
 
-			if (s->pal)
+			if (_vm->_configRenderMode != Common::kRenderEGA && s->pal)
 				setPaletteWithoutTextColor(palIndex);
 			else
 				_screen->updateScreen();
 
 			delay(s->delay);
 
-			if (_mode == kIntro) {
-				if (s->pal)
+			if (_config->mode == kIntro) {
+				if (_vm->_configRenderMode != Common::kRenderEGA && s->pal)
 					setPaletteWithoutTextColor(0);
 				_screen->copyRegion(x - 8, y - 8, x, y, (shapeW + 1) << 3, shapeH, 2, 0, Screen::CR_NO_P_CHECK);
 			} else {
@@ -1071,50 +1128,59 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 			// draw shape
 			_screen->drawShape(_screen->_curPage, _shapes[s->obj], x, y, 0);
 
-			if (s->pal)
+			if (_vm->_configRenderMode != Common::kRenderEGA && s->pal)
 				setPaletteWithoutTextColor(palIndex);
 			else if (!_screen->_curPage)
 				_screen->updateScreen();
 
 			delay(s->delay);
 
-			if (_mode == kIntro && s->pal)
+			if (_vm->_configRenderMode != Common::kRenderEGA && _config->mode == kIntro && s->pal)
 				setPaletteWithoutTextColor(0);
 			break;
 
 		case 3:
 		case 4:
 			// fade shape in or out or restore background
-			if (_mode == kFinale)
+			if (_config->mode == kFinale)
 				break;
 
-			_screen->setShapeFadeMode(0, true);
-			_screen->setShapeFadeMode(1, true);
+			if (_vm->_configRenderMode == Common::kRenderEGA) {
+				if (palIndex)
+					_screen->drawShape(0, _shapes[s->obj], s->x1, y, 0);
+				else
+					_screen->copyRegion(s->x1 - 8, s->y1 - 8, s->x1, s->y1, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 2, 0, Screen::CR_NO_P_CHECK);
+				_screen->updateScreen();
+				delay(s->delay /** 7*/);
+			} else {
+				_screen->setShapeFadeMode(0, true);
+				_screen->setShapeFadeMode(1, true);
 
-			end = _system->getMillis() + s->delay * _vm->tickLength();
+				end = _system->getMillis() + s->delay * _vm->tickLength();
 
-			if (palIndex) {
-				_screen->setFadeTableIndex(palIndex - 1);
+				if (palIndex) {
+					_screen->setFadeTableIndex(palIndex - 1);
 
-				_screen->copyRegion(s->x1 - 8, s->y1 - 8, 0, 0, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 2, 4, Screen::CR_NO_P_CHECK);
-				_screen->drawShape(4, _shapes[s->obj], s->x1 & 7, 0, 0);
-				_screen->copyRegion(0, 0, s->x1, s->y1, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 4, 0, Screen::CR_NO_P_CHECK);
-			} else {
-				_screen->copyRegion(s->x1 - 8, s->y1 - 8, s->x1, s->y1, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 2, 0, Screen::CR_NO_P_CHECK);
-			}
-			_screen->updateScreen();
+					_screen->copyRegion(s->x1 - 8, s->y1 - 8, 0, 0, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 2, 4, Screen::CR_NO_P_CHECK);
+					_screen->drawShape(4, _shapes[s->obj], s->x1 & 7, 0, 0);
+					_screen->copyRegion(0, 0, s->x1, s->y1, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 4, 0, Screen::CR_NO_P_CHECK);
+				} else {
+					_screen->copyRegion(s->x1 - 8, s->y1 - 8, s->x1, s->y1, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 2, 0, Screen::CR_NO_P_CHECK);
+				}
+				_screen->updateScreen();
 
-			_vm->delayUntil(end);
-			_screen->setShapeFadeMode(0, false);
-			_screen->setShapeFadeMode(1, false);
+				_vm->delayUntil(end);
+				_screen->setShapeFadeMode(0, false);
+				_screen->setShapeFadeMode(1, false);
+			}
 			break;
 
 		case 5:
 			// copy region
-			if (_mode == kFinale && s->pal)
+			if (_config->mode == kFinale && s->pal)
 				setPaletteWithoutTextColor(palIndex);
 
-			_screen->copyRegion(s->x2 << 3, s->y2, s->x1, s->y1, s->w << 3, s->h, (s->obj && _mode == kFinale) ? 6 : 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->copyRegion(s->x2 << 3, s->y2, s->x1, s->y1, s->w << 3, s->h, (s->obj && _config->mode == kFinale) ? 6 : 2, 0, Screen::CR_NO_P_CHECK);
 			_screen->updateScreen();
 			delay(s->delay);
 			break;
@@ -1125,8 +1191,15 @@ void DarkmoonSequenceHelper::runSequence(int index, int del) {
 				_vm->snd_playSoundEffect(s->obj);
 			break;
 
+		case 7:
+			// restore background (only used in EGA mode)
+			delay(s->delay);
+			_screen->copyRegion(s->x1 - 8, s->y1 - 8, s->x1, s->y1, (_shapes[s->obj][2] + 1) << 3, _shapes[s->obj][3], 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->updateScreen();
+			break;
+
 		default:
-			error("DarkmoonSequenceHelper::runSequence(): Unknown animation opcode encountered.");
+			error("DarkmoonSequenceHelper::animCommand(): Unknown animation opcode encountered.");
 			break;
 		}
 	}
@@ -1140,12 +1213,17 @@ void DarkmoonSequenceHelper::printText(int index, int color) {
 		return;
 
 	_screen->setClearScreenDim(17);
-	_palettes[0]->copy(*_palettes[0], color, 1, 255);
-	setPalette(0);
+	uint8 col1 = 15;
+
+	if (_vm->_configRenderMode != Common::kRenderEGA) {
+		_palettes[0]->copy(*_palettes[0], color, 1, 255);
+		setPalette(0);
+		col1 = 255;
+	}
 
-	char *temp = new char[strlen(_strings[index]) + 1];
+	char *temp = new char[strlen(_config->strings[index]) + 1];
 	char *str = temp;
-	strcpy(str, _strings[index]);
+	strcpy(str, _config->strings[index]);
 
 	const ScreenDim *dm = _screen->_curDim;
 
@@ -1156,7 +1234,7 @@ void DarkmoonSequenceHelper::printText(int index, int color) {
 			*cr = 0;
 
 		uint32 len = strlen(str);
-		_screen->printText(str, (dm->sx + ((dm->w - len) >> 1)) << 3, dm->sy + yOffs, 255, dm->unkA);
+		_screen->printText(str, (dm->sx + ((dm->w - len) >> 1)) << 3, dm->sy + yOffs, col1, dm->unkA);
 
 		if (cr) {
 			*cr = 13;
@@ -1173,8 +1251,8 @@ void DarkmoonSequenceHelper::printText(int index, int color) {
 void DarkmoonSequenceHelper::fadeText() {
 	if (_vm->skipFlag() || _vm->shouldQuit())
 		return;
-
-	_screen->fadeTextColor(_palettes[0], 255, 8);
+	if (_vm->_configRenderMode != Common::kRenderEGA)
+		_screen->fadeTextColor(_palettes[0], 255, 8);
 	_screen->clearCurDim();
 }
 
@@ -1183,11 +1261,13 @@ void DarkmoonSequenceHelper::update(int srcPage) {
 		return;
 
 	_screen->copyRegion(0, 0, 8, 8, 304, 128, srcPage, 0, Screen::CR_NO_P_CHECK);
-	setPaletteWithoutTextColor(0);
+
+	if (_vm->_configRenderMode != Common::kRenderEGA)
+		setPaletteWithoutTextColor(0);
 }
 
 void DarkmoonSequenceHelper::setPaletteWithoutTextColor(int index) {
-	if (_vm->skipFlag() || _vm->shouldQuit())
+	if (_vm->_configRenderMode == Common::kRenderEGA || _vm->skipFlag() || _vm->shouldQuit())
 		return;
 
 	if (!memcmp(_palettes[11]->getData(), _palettes[index]->getData(), 765))
@@ -1198,6 +1278,7 @@ void DarkmoonSequenceHelper::setPaletteWithoutTextColor(int index) {
 	setPalette(11);
 
 	_screen->updateScreen();
+	_system->delayMillis(10);
 }
 
 void DarkmoonSequenceHelper::setPalette(int index) {
@@ -1207,8 +1288,12 @@ void DarkmoonSequenceHelper::setPalette(int index) {
 void DarkmoonSequenceHelper::fadePalette(int index, int del) {
 	if (_vm->skipFlag() || _vm->shouldQuit())
 		return;
-
-	_screen->fadePalette(*_palettes[index], del * _vm->tickLength());
+	if (_vm->_configRenderMode == Common::kRenderEGA) {
+		setPalette(index);
+		_screen->updateScreen();
+	} else {
+		_screen->fadePalette(*_palettes[index], del * _vm->tickLength());
+	}
 }
 
 void DarkmoonSequenceHelper::copyPalette(int srcIndex, int destIndex) {
@@ -1227,7 +1312,7 @@ bool DarkmoonSequenceHelper::processDelayedPaletteFade() {
 	if (_vm->skipFlag() || _vm->shouldQuit())
 		return true;
 
-	if (!_fadePalRate || (_system->getMillis() <= _fadePalTimer))
+	if (_vm->_configRenderMode == Common::kRenderEGA || !_fadePalRate || (_system->getMillis() <= _fadePalTimer))
 		return false;
 
 	if (_screen->delayedFadePalStep(_palettes[_fadePalIndex], _palettes[0], _fadePalRate)) {
@@ -1246,7 +1331,7 @@ void DarkmoonSequenceHelper::delay(uint32 ticks) {
 
 	uint32 end = _system->getMillis() + ticks * _vm->_tickLength;
 
-	if (_mode == kFinale) {
+	if (_config->palFading) {
 		do {
 			if (processDelayedPaletteFade())
 				break;
@@ -1263,11 +1348,11 @@ void DarkmoonSequenceHelper::waitForSongNotifier(int index, bool introUpdateAnim
 	int seq = 0;
 	while (_vm->sound()->checkTrigger() < index && !(_vm->skipFlag() || _vm->shouldQuit())) {
 		if (introUpdateAnim) {
-			runSequence(30 | seq);
+			animCommand(30 | seq);
 			seq ^= 1;
 		}
 
-		if (_mode == kFinale)
+		if (_config->palFading)
 			processDelayedPaletteFade();
 
 		_vm->updateInput();
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index f18c67f659..195c44ea2a 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -110,7 +110,8 @@ void EoBIntroPlayer::start() {
 
 	if (!_vm->shouldQuit() && !_vm->skipFlag()) {
 		_vm->snd_playSong(2);
-		_screen->loadBitmap("TITLE-V.CMP", 5, 3, 0);
+		_screen->loadBitmap((_vm->_configRenderMode == Common::kRenderCGA || _vm->_configRenderMode == Common::kRenderEGA) ? "TITLE-E.CMP" : "TITLE-V.CMP", 3, 5, 0);
+		_screen->convertPage(5, 2, _vm->_cgaMappingDefault);
 		_screen->crossFadeRegion(0, 0, 0, 0, 320, 200, 2, 0);
 		_vm->delay(120 * _vm->_tickLength);
 	}
@@ -121,7 +122,8 @@ void EoBIntroPlayer::start() {
 		_screen->loadFileDataToPage(s, 6, s->size() - 768);
 		delete s;
 	} else {
-		_screen->loadBitmap("TEXT.CMP", 3, 6, 0);
+		_screen->loadBitmap("TEXT.CMP", 3, 5, 0);
+		_screen->convertPage(5, 6, _vm->_cgaMappingAlt);
 	}
 
 	tower();
@@ -139,8 +141,9 @@ void EoBIntroPlayer::start() {
 
 void EoBIntroPlayer::openingCredits() {
 	loadAndSetPalette(_filesOpening[5]);
+
 	_screen->loadBitmap(_filesOpening[4], 5, 3, 0);
-	_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+	_screen->convertPage(3, 0, _vm->_cgaMappingAlt);
 	_screen->updateScreen();
 
 	_vm->snd_playSong(1);
@@ -149,7 +152,8 @@ void EoBIntroPlayer::openingCredits() {
 	for (int i = 0; i < 4 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
 		_screen->loadBitmap(_filesOpening[i], 5, 3, 0);
 		uint32 nextFrameTimer = _vm->_system->getMillis() + _openingFrmDelay[i + 1] * _vm->_tickLength;
-		_screen->crossFadeRegion(0, 50, 0, 50, 320, 102, 2, 0);
+		_screen->convertPage(3, 4, _vm->_cgaMappingAlt);
+		_screen->crossFadeRegion(0, 50, 0, 50, 320, 102, 4, 0);
 		_vm->delayUntil(nextFrameTimer);
 	}
 }
@@ -160,8 +164,8 @@ void EoBIntroPlayer::tower() {
 
 	_screen->loadBitmap(_filesTower[1], 5, 3, 0);
 	_screen->setCurPage(2);
-	uint8 *shp = _screen->encodeShape(0, 0, 16, 56, true);
-	_screen->copyPage(3, 4);
+	uint8 *shp = _screen->encodeShape(0, 0, 16, 56, true, _vm->_cgaMappingAlt);
+	_screen->convertPage(3, 4, _vm->_cgaMappingAlt);
 	_screen->clearCurPage();
 
 	for (int i = 0; i < 200; i += 64)
@@ -236,19 +240,19 @@ void EoBIntroPlayer::orb() {
 	uint8 *shp[5];
 	_screen->loadBitmap(_filesOrb[0], 5, 3, 0);
 	_screen->setCurPage(2);
-	shp[4] = _screen->encodeShape(0, 0, 20, 136, true);
+	shp[4] = _screen->encodeShape(0, 0, 20, 136, true, _vm->_cgaMappingAlt);
 	_screen->loadBitmap(_filesOrb[1], 5, 3, 0);
-	shp[3] = _screen->encodeShape(16, 0, 16, 104, true);
+	shp[3] = _screen->encodeShape(16, 0, 16, 104, true, _vm->_cgaMappingAlt);
 
 	_screen->fillRect(0, 0, 127, 103, 12);
 	for (int i = 1; i < 4; i++) {
 		copyBlurRegion(128, 0, 0, 0, 128, 104, i);
-		shp[3 - i] = _screen->encodeShape(0, 0, 16, 104, true);
+		shp[3 - i] = _screen->encodeShape(0, 0, 16, 104, true, _vm->_cgaMappingAlt);
 	}
 
 	_screen->fillRect(0, 0, 159, 135, 12);
 	_screen->setCurPage(0);
-	_screen->copyPage(3, 4);
+	_screen->convertPage(3, 4, _vm->_cgaMappingAlt);
 	_screen->clearCurPage();
 
 	_vm->snd_playSoundEffect(6);
@@ -297,14 +301,14 @@ void EoBIntroPlayer::waterdeepEntry() {
 	loadAndSetPalette(_filesWdEntry[0]);
 	_screen->loadBitmap(_filesWdEntry[1], 5, 3, 0);
 	_screen->setCurPage(2);
-	shp[3] = _screen->encodeShape(0, 0, 20, 136, true);
+	shp[3] = _screen->encodeShape(0, 0, 20, 136, true, _vm->_cgaMappingAlt);
 	for (int i = 1; i < 4; i++) {
 		copyBlurRegion(0, 0, 0, 0, 160, 136, i);
-		shp[3 - i] = _screen->encodeShape(0, 0, 20, 136, true);
+		shp[3 - i] = _screen->encodeShape(0, 0, 20, 136, true, _vm->_cgaMappingAlt);
 	}
 	_screen->setCurPage(0);
 
-	_screen->copyPage(3, 4);
+	_screen->convertPage(3, 4, _vm->_cgaMappingAlt);
 	_screen->fillRect(0, 168, 319, 199, 12, 0);
 	_vm->snd_playSoundEffect(6);
 
@@ -321,18 +325,18 @@ void EoBIntroPlayer::waterdeepEntry() {
 	_vm->delay(50 * _vm->_tickLength);
 
 	_screen->setCurPage(2);
-	shp[0] = _screen->encodeShape(20, 0, 20, 136, true);
+	shp[0] = _screen->encodeShape(20, 0, 20, 136, true, _vm->_cgaMappingAlt);
 	_screen->loadBitmap(_filesWdEntry[2], 5, 3, 0);
-	shp[1] = _screen->encodeShape(0, 0, 20, 136, true);
-	shp[2] = _screen->encodeShape(20, 0, 20, 136, true);
+	shp[1] = _screen->encodeShape(0, 0, 20, 136, true, _vm->_cgaMappingAlt);
+	shp[2] = _screen->encodeShape(20, 0, 20, 136, true, _vm->_cgaMappingAlt);
 	_screen->loadBitmap(_filesWdEntry[3], 5, 3, 0);
 
 	for (int i = 0; i < 31; i++)
-		shp2[i] = _screen->encodeShape(_wdEncodeX[i], 136 + (_wdEncodeY[i] << 3), _wdEncodeWH[i], _wdEncodeWH[i] << 3, true);
+		shp2[i] = _screen->encodeShape(_wdEncodeX[i], 136 + (_wdEncodeY[i] << 3), _wdEncodeWH[i], _wdEncodeWH[i] << 3, true, _vm->_cgaMappingAlt);
 	for (int i = 0; i < 3; i++)
-		shp3[i] = _screen->encodeShape(5 * i, 152, 5, 32, true);
+		shp3[i] = _screen->encodeShape(5 * i, 152, 5, 32, true, _vm->_cgaMappingAlt);
 
-	_screen->copyPage(3, 4);
+	_screen->convertPage(3, 4, _vm->_cgaMappingAlt);
 
 	for (int i = 0; i < 3 && !_vm->shouldQuit() && !_vm->skipFlag(); i++) {
 		uint32 end = _vm->_system->getMillis() + 3 * _vm->_tickLength;
@@ -391,7 +395,7 @@ void EoBIntroPlayer::king() {
 		return;
 
 	_screen->loadBitmap(_filesKing[0], 5, 3, 0);
-	_screen->copyPage(3, 4);
+	_screen->convertPage(3, 4, _vm->_cgaMappingAlt);
 
 	int x = 15;
 	int y = 14;
@@ -428,7 +432,7 @@ void EoBIntroPlayer::king() {
 	_screen->loadBitmap(_filesKing[1], 5, 3, 0);
 	_screen->setCurPage(2);
 	for (int i = 0; i < 4; i++) {
-		shp[i] = _screen->encodeShape(advEncX[i], 0, advEncW[i], 98, true);
+		shp[i] = _screen->encodeShape(advEncX[i], 0, advEncW[i], 98, true, _vm->_cgaMappingAlt);
 		dy[i] = 180 + ((_vm->_rnd.getRandomNumber(255) & 3) << 3);
 		stepY[i] = (i * 5) & 3;
 	}
@@ -477,8 +481,8 @@ void EoBIntroPlayer::hands() {
 		return;
 
 	_screen->setCurPage(2);
-	uint8 *shp1 = _screen->encodeShape(0, 140, 21, 60, true);
-	uint8 *shp2 = _screen->encodeShape(21, 140, 12, 60, true);
+	uint8 *shp1 = _screen->encodeShape(0, 140, 21, 60, true, _vm->_cgaMappingAlt);
+	uint8 *shp2 = _screen->encodeShape(21, 140, 12, 60, true, _vm->_cgaMappingAlt);
 	_screen->loadBitmap(_filesHands[0], 3, 5, 0);
 
 	_screen->fillRect(0, 160, 319, 199, 12, 0);
@@ -509,9 +513,9 @@ void EoBIntroPlayer::hands() {
 	_vm->delay(15 * _vm->_tickLength);
 
 	_screen->setCurPage(4);
-	shp1 = _screen->encodeShape(17, 0, 11, 120, true);
-	shp2 = _screen->encodeShape(28, 112, 1, 31, true);
-	uint8 *shp3 = _screen->encodeShape(9, 138, 14, 54, true);
+	shp1 = _screen->encodeShape(17, 0, 11, 120, true, _vm->_cgaMappingAlt);
+	shp2 = _screen->encodeShape(28, 112, 1, 31, true, _vm->_cgaMappingAlt);
+	uint8 *shp3 = _screen->encodeShape(9, 138, 14, 54, true, _vm->_cgaMappingAlt);
 
 	_screen->setCurPage(2);
 	_screen->fillRect(0, 0, 135, 63, 157);
@@ -549,8 +553,8 @@ void EoBIntroPlayer::hands() {
 	_vm->delay(15 * _vm->_tickLength);
 
 	_screen->setCurPage(4);
-	shp1 = _screen->encodeShape(0, 0, 17, 136, true);
-	shp2 = _screen->encodeShape(0, 136, 9, 48, true);
+	shp1 = _screen->encodeShape(0, 0, 17, 136, true, _vm->_cgaMappingAlt);
+	shp2 = _screen->encodeShape(0, 136, 9, 48, true, _vm->_cgaMappingAlt);
 
 	_screen->setCurPage(2);
 	_screen->fillRect(0, 0, 143, 95, 157);
@@ -576,8 +580,8 @@ void EoBIntroPlayer::hands() {
 	_vm->delay(30 * _vm->_tickLength);
 
 	_screen->setCurPage(4);
-	shp1 = _screen->encodeShape(28, 0, 11, 40, true);
-	shp2 = _screen->encodeShape(28, 40, 10, 72, true);
+	shp1 = _screen->encodeShape(28, 0, 11, 40, true, _vm->_cgaMappingAlt);
+	shp2 = _screen->encodeShape(28, 40, 10, 72, true, _vm->_cgaMappingAlt);
 
 	_screen->setCurPage(2);
 	_screen->fillRect(0, 0, 87, 112, 157);
@@ -622,11 +626,11 @@ void EoBIntroPlayer::waterdeepExit() {
 	_screen->loadBitmap(_filesWdExit[0], 5, 3, 0);
 	_screen->setCurPage(2);
 	for (int i = 0; i < 31; i++)
-		shp2[i] = _screen->encodeShape(_wdEncodeX[i], 136 + (_wdEncodeY[i] << 3), _wdEncodeWH[i], _wdEncodeWH[i] << 3, true);
+		shp2[i] = _screen->encodeShape(_wdEncodeX[i], 136 + (_wdEncodeY[i] << 3), _wdEncodeWH[i], _wdEncodeWH[i] << 3, true, _vm->_cgaMappingAlt);
 	for (int i = 0; i < 3; i++)
-		shp3[i] = _screen->encodeShape(5 * i + 15, 152, 5, 32, true);
-	uint8 *shp1 = _screen->encodeShape(31, 136, 5, 32, true);
-	_screen->copyPage(3, 4);
+		shp3[i] = _screen->encodeShape(5 * i + 15, 152, 5, 32, true, _vm->_cgaMappingAlt);
+	uint8 *shp1 = _screen->encodeShape(31, 136, 5, 32, true, _vm->_cgaMappingAlt);
+	_screen->convertPage(3, 4, _vm->_cgaMappingAlt);
 	_screen->copyRegion(0, 0, 0, 136, 48, 36, 4, 4, Screen::CR_NO_P_CHECK);
 	_screen->fillRect(0, 168, 319, 199, 12, 0);
 	_screen->copyRegion(160, 0, 80, 24, 160, 136, 4, 0, Screen::CR_NO_P_CHECK);
@@ -676,7 +680,7 @@ void EoBIntroPlayer::waterdeepExit() {
 
 	loadAndSetPalette(_filesWdExit[1]);
 	_screen->loadBitmap(_filesWdExit[2], 3, 5, 0);
-	_screen->copyPage(5, 2);
+	_screen->convertPage(5, 2, _vm->_cgaMappingAlt);
 	whirlTransition();
 	_vm->delay(6 * _vm->_tickLength);
 
@@ -717,7 +721,7 @@ void EoBIntroPlayer::waterdeepExit() {
 	}
 
 	_screen->loadBitmap(_filesWdExit[3], 3, 5, 0);
-	_screen->copyPage(5, 2);
+	_screen->convertPage(5, 2, _vm->_cgaMappingAlt);
 	_vm->delay(30 * _vm->_tickLength);
 	_screen->setCurPage(0);
 	_screen->fillRect(0, 16, 319, 31, 12);
@@ -733,8 +737,8 @@ void EoBIntroPlayer::tunnel() {
 		return;
 
 	_screen->setCurPage(4);
-	uint8 *shp2 = _screen->encodeShape(20, 0, 20, 120, true);
-	uint8 *shp1 = _screen->encodeShape(0, 0, 20, 120, true);
+	uint8 *shp2 = _screen->encodeShape(20, 0, 20, 120, true, _vm->_cgaMappingAlt);
+	uint8 *shp1 = _screen->encodeShape(0, 0, 20, 120, true, _vm->_cgaMappingAlt);
 	_vm->drawBlockObject(1, 4, shp2, 160, 0, 0);
 	_vm->drawBlockObject(1, 4, shp1, 0, 0, 0);
 	delete[] shp1;
@@ -771,7 +775,7 @@ void EoBIntroPlayer::tunnel() {
 	_screen->copyRegion(0, 0, 80, 32, 160, 120, 2, 0, Screen::CR_NO_P_CHECK);
 
 	_screen->loadBitmap(_filesTunnel[0], 5, 3, 0);
-	_screen->copyPage(3, 4);
+	_screen->convertPage(3, 4, _vm->_cgaMappingAlt);
 	_screen->updateScreen();
 	_vm->delay(40 * _vm->_tickLength);
 
@@ -808,7 +812,7 @@ void EoBIntroPlayer::tunnel() {
 	_vm->delay(40 * _vm->_tickLength);
 
 	_screen->loadBitmap(_filesTunnel[1], 5, 3, 0);
-	_screen->copyPage(3, 4);
+	_screen->convertPage(3, 4, _vm->_cgaMappingAlt);
 	_vm->snd_playSoundEffect(6);
 	_screen->copyRegion(0, 0, 80, 32, 160, 120, 4, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
@@ -825,6 +829,8 @@ void EoBIntroPlayer::tunnel() {
 }
 
 void EoBIntroPlayer::loadAndSetPalette(const char *filename) {
+	if (_vm->_configRenderMode == Common::kRenderCGA || _vm->_configRenderMode == Common::kRenderEGA)
+		return;
 	_screen->loadPalette(filename, _screen->getPalette(0));
 	_screen->getPalette(0).fill(0, 1, 0);
 	_screen->setScreenPalette(_screen->getPalette(0));
@@ -975,8 +981,9 @@ int EoBEngine::mainMenu() {
 	while (menuChoice >= 0 && !shouldQuit()) {
 		switch (menuChoice) {
 		case 0: {
-			_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
-			_screen->loadEoBBitmap("INTRO", 0, 5, 3, 2);
+			if (_configRenderMode != Common::kRenderEGA)
+				_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
+			_screen->loadEoBBitmap("INTRO", _cgaMappingDefault, 5, 3, 2);
 			_screen->setScreenPalette(_screen->getPalette(0));
 			_screen->_curPage = 2;
 			of = _screen->setFont(Screen::FID_6_FNT);
@@ -984,8 +991,8 @@ int EoBEngine::mainMenu() {
 			_screen->printText(versionString.c_str(), 280 - versionString.size() * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
 			_screen->setFont(of);
 			_screen->fillRect(0, 159, 319, 199, _screen->getPagePixel(2, 0, 0));
-			gui_drawBox(77, 165, 173, 29, 13, 14, 12);
-			gui_drawBox(76, 164, 175, 31, 13, 14, -1);
+			gui_drawBox(77, 165, 173, 29, 14, 13, 12);
+			gui_drawBox(76, 164, 175, 31, 14, 13, -1);
 			_screen->_curPage = 0;
 			_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
 			_screen->updateScreen();
@@ -996,7 +1003,6 @@ int EoBEngine::mainMenu() {
 
 		case 1:
 			// load game in progress
-			//
 			menuChoice = -1;
 			break;
 
@@ -1089,10 +1095,10 @@ void EoBEngine::seq_xdeath() {
 
 	_screen->loadShapeSetBitmap("XDEATH2", 5, 3);
 	for (int i = 0; i < 4; i++)
-		shapes1[i] = _screen->encodeShape(i / 2 * 14, i / 2 * 88, 14, 88, true);
+		shapes1[i] = _screen->encodeShape(i / 2 * 14, i / 2 * 88, 14, 88, true, _cgaMappingDefault);
 	_screen->loadShapeSetBitmap("XDEATH3", 5, 3);
-	shapes2 = _screen->encodeShape(22, 0, 16, 95, true);
-	_screen->loadEoBBitmap("XDEATH1", 0, 5, 3, -1);
+	shapes2 = _screen->encodeShape(22, 0, 16, 95, true, _cgaMappingDefault);
+	_screen->loadEoBBitmap("XDEATH1", _cgaMappingDefault, 5, 3, -1);
 	_screen->setCurPage(0);
 
 	for (int i = 0; i < 10; i++) {
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 360d31458a..9e450a5ac7 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -37,7 +37,7 @@ void EoBCoreEngine::loadMonsterShapes(const char *filename, int monsterIndex, bo
 	const uint16 *enc = &_encodeMonsterShpTable[encodeTableIndex << 2];
 
 	for (int i = 0; i < 6; i++, enc += 4)
-		_monsterShapes[monsterIndex + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
+		_monsterShapes[monsterIndex + i] = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3], false, _cgaMappingDefault);
 
 	generateMonsterPalettes(filename, monsterIndex);
 
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 99ad6ea7aa..2be25ce093 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -38,7 +38,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 80
+#define RESFILE_VERSION 81
 
 namespace {
 bool checkKyraDat(Common::SeekableReadStream *file) {
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index a65ade7aee..5e28757978 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -28,12 +28,12 @@
 namespace Kyra {
 
 #ifdef ENABLE_EOB
-const EoBSequenceStep *StaticResource::loadEoB2SeqData(int id, int &entries) {
-	return (const EoBSequenceStep *)getData(id, kEoB2SequenceData, entries);
+const DarkMoonAnimCommand *StaticResource::loadEoB2SeqData(int id, int &entries) {
+	return (const DarkMoonAnimCommand *)getData(id, kEoB2SequenceData, entries);
 }
 
-const EoBShapeDef *StaticResource::loadEoB2ShapeData(int id, int &entries) {
-	return (const EoBShapeDef *)getData(id, kEoB2ShapeData, entries);
+const DarkMoonShapeDef *StaticResource::loadEoB2ShapeData(int id, int &entries) {
+	return (const DarkMoonShapeDef *)getData(id, kEoB2ShapeData, entries);
 }
 
 const EoBCharacter *StaticResource::loadEoBNpcData(int id, int &entries) {
@@ -43,7 +43,7 @@ const EoBCharacter *StaticResource::loadEoBNpcData(int id, int &entries) {
 bool StaticResource::loadEoB2SeqData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
 	size = stream.size() / 11;
 
-	EoBSequenceStep *s = new EoBSequenceStep[size];
+	DarkMoonAnimCommand *s = new DarkMoonAnimCommand[size];
 
 	for (int i = 0; i < size; i++) {
 		s[i].command = stream.readByte();
@@ -65,7 +65,7 @@ bool StaticResource::loadEoB2SeqData(Common::SeekableReadStream &stream, void *&
 bool StaticResource::loadEoB2ShapeData(Common::SeekableReadStream &stream, void *&ptr, int &size) {
 	size = stream.size() / 6;
 
-	EoBShapeDef *s = new EoBShapeDef[size];
+	DarkMoonShapeDef *s = new DarkMoonShapeDef[size];
 
 	for (int i = 0; i < size; i++) {
 		s[i].index = stream.readSint16BE();
@@ -127,14 +127,14 @@ bool StaticResource::loadEoBNpcData(Common::SeekableReadStream &stream, void *&p
 }
 
 void StaticResource::freeEoB2SeqData(void *&ptr, int &size) {
-	EoBSequenceStep *d = (EoBSequenceStep *)ptr;
+	DarkMoonAnimCommand *d = (DarkMoonAnimCommand *)ptr;
 	delete[] d;
 	ptr = 0;
 	size = 0;
 }
 
 void StaticResource::freeEoB2ShapeData(void *&ptr, int &size) {
-	EoBShapeDef *d = (EoBShapeDef *)ptr;
+	DarkMoonShapeDef *d = (DarkMoonShapeDef *)ptr;
 	delete[] d;
 	ptr = 0;
 	size = 0;
@@ -1035,6 +1035,18 @@ void EoBEngine::initStaticResource() {
 	_beholderSpellList = _staticres->loadRawData(kEoB1BeholderSpellList, temp);
 	_beholderSfx = _staticres->loadRawData(kEoB1BeholderSfx, temp);
 
+	_cgaMappingDefault = _staticres->loadRawData(kEoB1CgaMappingDefault, temp);
+	_cgaMappingAlt = _staticres->loadRawData(kEoB1CgaMappingAlt, temp);
+	_cgaMappingInv = _staticres->loadRawData(kEoB1CgaMappingInv, temp);
+	_cgaMappingItemsL = _staticres->loadRawData(kEoB1CgaMappingItemsL, temp);
+	_cgaMappingItemsS = _staticres->loadRawData(kEoB1CgaMappingItemsS, temp);
+	_cgaMappingThrown = _staticres->loadRawData(kEoB1CgaMappingThrown, temp);
+	_cgaMappingIcons = _staticres->loadRawData(kEoB1CgaMappingIcons, temp);
+	_cgaMappingDeco = _staticres->loadRawData(kEoB1CgaMappingDeco, temp);
+	_cgaLevelMappingIndex = _staticres->loadRawData(kEoB1CgaLevelMappingIndex, temp);
+	for (int i = 0; i < 5; i++)
+		_cgaMappingLevel[i] = _staticres->loadRawData(kEoB1CgaMappingLevel0 + i, temp);
+
 	_turnUndeadString = _staticres->loadStrings(kEoB1TurnUndeadString, temp);
 
 	_npcShpData = _staticres->loadRawData(kEoB1NpcShpData, temp);
@@ -1174,18 +1186,22 @@ const KyraRpgGUISettings EoBEngine::_guiSettings = {
 	{ 135, 130, 132, 133, 133, 17, 23, 20, 184, 177, 180, 184, 177, 180	}
 };
 
+const uint8 EoBEngine::_egaDefaultPalette[] = {
+	0, 5, 3, 2, 10, 14, 12, 6, 4, 11, 9, 1, 0, 8, 7, 15
+};
+
 void DarkMoonEngine::initStaticResource() {
 	int temp;
 	_mainMenuStrings = _staticres->loadStrings(kEoB2MainMenuStrings, temp);
 	_introStrings = _staticres->loadStrings(kEoB2IntroStrings, temp);
 	_cpsFilesIntro = _staticres->loadStrings(kEoB2IntroCPSFiles, temp);
 
-	_seqIntro = new const EoBSequenceStep*[44];
+	_animIntro = new const DarkMoonAnimCommand*[44];
 	for (int i = 0; i < 44; i++)
-		_seqIntro[i] = _staticres->loadEoB2SeqData(kEoB2IntroSeqData00 + i, temp);
+		_animIntro[i] = _staticres->loadEoB2SeqData(kEob2IntroAnimData00 + i, temp);
 
-	_shapesIntro = new const EoBShapeDef*[13];
-	memset(_shapesIntro, 0, sizeof(EoBShapeDef *) * 13);
+	_shapesIntro = new const DarkMoonShapeDef*[13];
+	memset(_shapesIntro, 0, sizeof(DarkMoonShapeDef*) * 13);
 	_shapesIntro[0] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes00, temp);
 	_shapesIntro[1] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes01, temp);
 	_shapesIntro[4] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes04, temp);
@@ -1195,12 +1211,12 @@ void DarkMoonEngine::initStaticResource() {
 	_creditsData = _staticres->loadRawData(kEoB2CreditsData, temp);
 	_cpsFilesFinale = _staticres->loadStrings(kEoB2FinaleCPSFiles, temp);
 
-	_seqFinale = new const EoBSequenceStep*[21];
+	_animFinale = new const DarkMoonAnimCommand*[21];
 	for (int i = 0; i < 21; i++)
-		_seqFinale[i] = _staticres->loadEoB2SeqData(kEoB2FinaleSeqData00 + i, temp);
+		_animFinale[i] = _staticres->loadEoB2SeqData(kEob2FinaleAnimData00 + i, temp);
 
-	_shapesFinale = new const EoBShapeDef*[13];
-	memset(_shapesFinale, 0, sizeof(EoBShapeDef *) * 13);
+	_shapesFinale = new const DarkMoonShapeDef*[13];
+	memset(_shapesFinale, 0, sizeof(DarkMoonShapeDef*) * 13);
 	_shapesFinale[0] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes00, temp);
 	_shapesFinale[3] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes03, temp);
 	_shapesFinale[7] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes07, temp);
@@ -1275,15 +1291,23 @@ void DarkMoonEngine::initSpells() {
 	}
 }
 
-const char *DarkMoonEngine::_palFilesIntro[] = {
-	"PALETTE1.PAL", // EGA: palette0.pal
+const char *DarkMoonEngine::_palFilesIntroVGA[] = {
+	"PALETTE1.PAL",
+	"PALETTE3.PAL",
+	"PALETTE2.PAL",
+	"PALETTE4.PAL",
+	0
+};
+
+const char *DarkMoonEngine::_palFilesIntroEGA[] = {
+	"PALETTE0.PAL",
 	"PALETTE3.PAL",
 	"PALETTE2.PAL",
 	"PALETTE4.PAL",
 	0
 };
 
-const char *DarkMoonEngine::_palFilesFinale[] = {
+const char *DarkMoonEngine::_palFilesFinaleVGA[] = {
 	"FINALE_0.PAL",
 	"FINALE_0.PAL",
 	"FINALE_1.PAL",
@@ -1296,11 +1320,28 @@ const char *DarkMoonEngine::_palFilesFinale[] = {
 	0
 };
 
+const char *DarkMoonEngine::_palFilesFinaleEGA[] = {
+	"FINALE_0.PAL",
+	"FINALE_0.PAL",
+	"FINALE_1.PAL",
+	"FINALE_2.PAL",
+	"FINALE_3.PAL",
+	"FINALE_4.PAL",
+	"FINALE_5.PAL",
+	"FINALE_0.PAL",
+	"FINALE_0.PAL",
+	0
+};
+
 const KyraRpgGUISettings DarkMoonEngine::_guiSettings = {
 	{ 9, 15, 95, 9, 7, { 221, 76 }, { 189, 162 }, { 95, 95 } },
 	{ 186, 181, 183, 133, 184, 17, 23, 20, 186, 181, 183, 182, 177, 180 }
 };
 
+const uint8 DarkMoonEngine::_egaDefaultPalette[] = {
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+};
+
 #endif // ENABLE_EOB
 
 } // End of namespace Kyra
-- 
cgit v1.2.3


From 151d314912b08d7d598a3995524d89c8b4ab0371 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Mon, 13 Feb 2012 17:04:05 +0100
Subject: KYRA: (EOB) - complete CGA graphics mode implementation

---
 engines/kyra/eob.cpp           |   5 +-
 engines/kyra/eob.h             |   3 +-
 engines/kyra/eobcommon.cpp     |  34 +--
 engines/kyra/eobcommon.h       |   6 +-
 engines/kyra/gui_eob.cpp       |  89 ++++---
 engines/kyra/items_eob.cpp     |   9 +-
 engines/kyra/kyra_rpg.cpp      |   2 +
 engines/kyra/kyra_rpg.h        |   1 +
 engines/kyra/scene_eob.cpp     |  50 +++-
 engines/kyra/scene_rpg.cpp     |  64 +++--
 engines/kyra/screen.cpp        |  17 +-
 engines/kyra/screen_eob.cpp    | 540 ++++++++++++++++++++++++-----------------
 engines/kyra/screen_eob.h      |  16 +-
 engines/kyra/sequences_eob.cpp |   1 +
 engines/kyra/sprites_eob.cpp   |   4 +-
 engines/kyra/staticres_eob.cpp |  11 +-
 16 files changed, 519 insertions(+), 333 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob.cpp b/engines/kyra/eob.cpp
index 3a1cfc1c84..769e77e63c 100644
--- a/engines/kyra/eob.cpp
+++ b/engines/kyra/eob.cpp
@@ -55,7 +55,8 @@ Common::Error EoBEngine::init() {
 
 	initStaticResource();
 
-	_itemsOverlay = _res->fileData((_configRenderMode == Common::kRenderEGA || _configRenderMode == Common::kRenderCGA) ? "ITEMRMP.EGA" : "ITEMRMP.VGA", 0);
+	if (_configRenderMode != Common::kRenderCGA)
+		_itemsOverlay = _res->fileData((_configRenderMode == Common::kRenderEGA) ? "ITEMRMP.EGA" : "ITEMRMP.VGA", 0);
 
 	_screen->modifyScreenDim(7, 0x01, 0xB3, 0x22, 0x12);
 	_screen->modifyScreenDim(9, 0x01, 0x7D, 0x26, 0x3F);
@@ -553,7 +554,7 @@ void EoBEngine::healParty() {
 }
 
 const KyraRpgGUISettings *EoBEngine::guiSettings() {
-	return &_guiSettings;
+	return (_configRenderMode == Common::kRenderCGA || _configRenderMode == Common::kRenderEGA) ? &_guiSettingsEGA : &_guiSettingsVGA;
 }
 
 } // End of namespace Kyra
diff --git a/engines/kyra/eob.h b/engines/kyra/eob.h
index 9d583a0cd7..37ce483702 100644
--- a/engines/kyra/eob.h
+++ b/engines/kyra/eob.h
@@ -108,7 +108,8 @@ private:
 
 	const KyraRpgGUISettings *guiSettings();
 
-	static const KyraRpgGUISettings _guiSettings;
+	static const KyraRpgGUISettings _guiSettingsVGA;
+	static const KyraRpgGUISettings _guiSettingsEGA;
 	static const uint8 _egaDefaultPalette[];
 };
 
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index a68c7de9e8..ecac20a7f8 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -65,7 +65,6 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags)
 	_itemIconShapes = _wallOfForceShapes = _teleporterShapes = _sparkShapes = _compassShapes = 0;
 	_redSplatShape = _greenSplatShape = _deadCharShape = _disabledCharGrid = 0;
 	_blackBoxSmallGrid = _weaponSlotGrid = _blackBoxWideGrid = _lightningColumnShape = 0;
-	_tempIconShape = 0;
 
 	_monsterDustStrings = 0;
 	_enemyMageSpellList = 0;
@@ -93,7 +92,7 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags)
 	_doorSwitches = 0;
 	_monsterProps = 0;
 	_monsterDecorations = 0;
-	_monsterOvl1 = _monsterOvl2 = 0;
+	_monsterFlashOverlay = _monsterStoneOverlay = 0;
 	_monsters = 0;
 	_dstMonsterIndex = 0;
 	_preventMonsterFlash = false;
@@ -214,7 +213,7 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags)
 	_mnNumWord = _numSpells = _mageSpellListSize = _spellLevelsMageSize = _spellLevelsClericSize = 0;
 	_inventorySlotsX = _slotValidationFlags = _encodeMonsterShpTable = 0;
 	_cgaMappingDefault = _cgaMappingAlt = _cgaMappingInv = _cgaLevelMappingIndex = _cgaMappingItemsL = _cgaMappingItemsS = _cgaMappingThrown = _cgaMappingIcons = _cgaMappingDeco = 0;
-	memset(_cgaMappingLevel, 0, sizeof(_cgaMappingLevel));	
+	memset(_cgaMappingLevel, 0, sizeof(_cgaMappingLevel));
 	memset(_expRequirementTables, 0, sizeof(_expRequirementTables));
 	memset(_saveThrowTables, 0, sizeof(_saveThrowTables));
 	memset(_doorType, 0, sizeof(_doorType));
@@ -271,8 +270,8 @@ EoBCoreEngine::~EoBCoreEngine() {
 	delete[] _itemNames;
 	delete[] _flyingObjects;
 
-	delete[] _monsterOvl1;
-	delete[] _monsterOvl2;
+	delete[] _monsterFlashOverlay;
+	delete[] _monsterStoneOverlay;
 	delete[] _monsters;
 
 	if (_monsterDecorations) {
@@ -483,11 +482,11 @@ Common::Error EoBCoreEngine::init() {
 	_doorSwitches = new SpriteDecoration[6];
 	memset(_doorSwitches, 0, 6 * sizeof(SpriteDecoration));
 
-	_monsterOvl1 = new uint8[16];
-	_monsterOvl2 = new uint8[16];
-	memset(_monsterOvl1, 15, 16 * sizeof(uint8));
-	memset(_monsterOvl2, 13, 16 * sizeof(uint8));
-	_monsterOvl1[0] = _monsterOvl2[0] = 0;
+	_monsterFlashOverlay = new uint8[16];
+	_monsterStoneOverlay = new uint8[16];
+	memset(_monsterFlashOverlay, (_configRenderMode == Common::kRenderCGA) ? 0xff : 0x0f, 16 * sizeof(uint8));
+	memset(_monsterStoneOverlay, 0x0d, 16 * sizeof(uint8));
+	_monsterFlashOverlay[0] = _monsterStoneOverlay[0] = 0;
 
 	// Prevent autosave on game startup
 	_lastAutosave = _system->getMillis();
@@ -700,7 +699,6 @@ void EoBCoreEngine::loadItemsAndDecorationsShapes() {
 	_itemIconShapes = new const uint8*[_numItemIconShapes];
 	for (int i = 0; i < _numItemIconShapes; i++)
 		_itemIconShapes[i] = _screen->encodeShape((i % 0x14) << 1, (i / 0x14) << 4, 2, 0x10, false, _cgaMappingIcons);
-	_tempIconShape = new uint8[300];
 
 	_screen->loadShapeSetBitmap("DECORATE", 5, 3);
 
@@ -774,7 +772,6 @@ void EoBCoreEngine::releaseItemsAndDecorationsShapes() {
 		}
 		delete[] _itemIconShapes;
 	}
-	delete[] _tempIconShape;
 
 	if (_sparkShapes) {
 		for (int i = 0; i < 3; i++) {
@@ -838,18 +835,13 @@ void EoBCoreEngine::setHandItem(Item itemIndex) {
 	_itemInHand = itemIndex;
 	int icon = _items[_itemInHand].icon;
 	const uint8 *shp = _itemIconShapes[icon];
+	const uint8 *ovl = 0;
 
-	if (icon && (_items[_itemInHand].flags & 0x80) && (_partyEffectFlags & 2)) {
-		memcpy(_tempIconShape, shp, shp[1] * shp[2] * 4 + 20);
-		if (_flags.gameID == GI_EOB1)
-			_screen->replaceShapePalette(_tempIconShape, &_itemsOverlay[icon << 4]);
-		else
-			_screen->applyShapeOverlay(_tempIconShape, 3);
-		shp = _tempIconShape;
-	}
+	if (icon && (_items[_itemInHand].flags & 0x80) && (_partyEffectFlags & 2))
+		ovl = _flags.gameID == GI_EOB1 ? ((_configRenderMode == Common::kRenderCGA) ? _itemsOverlayCGA : &_itemsOverlay[icon << 4]) : _screen->generateShapeOverlay(shp, 3);
 
 	int mouseOffs = itemIndex ? 8 : 0;
-	_screen->setMouseCursor(mouseOffs, mouseOffs, shp);
+	_screen->setMouseCursor(mouseOffs, mouseOffs, shp, ovl);
 }
 
 int EoBCoreEngine::getDexterityArmorClassModifier(int dexterity) {
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 49589c809c..38be2a64e8 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -302,8 +302,8 @@ protected:
 	const uint8 *_blackBoxWideGrid;
 	const uint8 *_lightningColumnShape;
 
-	uint8 *_tempIconShape;
 	uint8 *_itemsOverlay;
+	static const uint8 _itemsOverlayCGA[];
 
 	static const uint8 _teleporterShapeDefs[];
 	static const uint8 _wallOfForceShapeDefs[];
@@ -528,8 +528,8 @@ protected:
 	void updateMonstersSpellStatus(EoBMonsterInPlay *m);
 	void setBlockMonsterDirection(int block, int dir);
 
-	uint8 *_monsterOvl1;
-	uint8 *_monsterOvl2;
+	uint8 *_monsterFlashOverlay;
+	uint8 *_monsterStoneOverlay;
 
 	SpriteDecoration *_monsterDecorations;
 	EoBMonsterProperty *_monsterProps;
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 2fdfb0c011..39cc4692c4 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -116,7 +116,7 @@ void EoBCoreEngine::gui_drawCharPortraitWithStats(int index) {
 		if (c->damageTaken > 0) {
 			_screen->drawShape(2, _redSplatShape, x2 + 13, y2 + 30, 0);
 			Common::String tmpStr = Common::String::format("%d", c->damageTaken);
-			_screen->printText(tmpStr.c_str(), x2 + 34 - tmpStr.size() * 3, y2 + 42, 15, 0);
+			_screen->printText(tmpStr.c_str(), x2 + 34 - tmpStr.size() * 3, y2 + 42, (_configRenderMode == Common::kRenderCGA) ? 12 : 15, 0);
 		}
 
 		_screen->setCurPage(cp);
@@ -256,10 +256,8 @@ void EoBCoreEngine::gui_drawFaceShape(int index) {
 	if (c->hitPointsCur < 1)
 		_screen->drawShape(_screen->_curPage, _disabledCharGrid, x, y, 0);
 
-	//if ((c->flags & 2) || (c->flags & 8) || (c->effectFlags & 0x140)) {
-		_screen->setFadeTableIndex(4);
-		_screen->setShapeFadeMode(1, false);
-	//}
+	_screen->setFadeTableIndex(4);
+	_screen->setShapeFadeMode(1, false);
 }
 
 void EoBCoreEngine::gui_drawWeaponSlot(int charIndex, int slot) {
@@ -323,11 +321,13 @@ void EoBCoreEngine::gui_drawWeaponSlotStatus(int x, int y, int status) {
 		break;
 	}
 
+	int textColor= (_configRenderMode == Common::kRenderCGA) ? 2 : 15;
+
 	if (!tmpStr2.empty()) {
-		_screen->printText(tmpStr.c_str(), x + (16 - tmpStr.size() * 3), y + 2, 15, 0);
-		_screen->printText(tmpStr2.c_str(), x + (16 - tmpStr.size() * 3), y + 9, 15, 0);
+		_screen->printText(tmpStr.c_str(), x + (16 - tmpStr.size() * 3), y + 2, textColor, 0);
+		_screen->printText(tmpStr2.c_str(), x + (16 - tmpStr.size() * 3), y + 9, textColor, 0);
 	} else {
-		_screen->printText(tmpStr.c_str(), x + (16 - tmpStr.size() * 3), y + 5, 15, 0);
+		_screen->printText(tmpStr.c_str(), x + (16 - tmpStr.size() * 3), y + 5, textColor, 0);
 	}
 }
 
@@ -408,12 +408,13 @@ void EoBCoreEngine::gui_drawHorizontalBarGraph(int x, int y, int w, int h, int32
 }
 
 void EoBCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
-	uint8 redGreenColor = (_partyEffectFlags & 0x20000) ? 4 : 6;
+	uint8 redGreenColor = (_partyEffectFlags & 0x20000) ? 4 : ((_configRenderMode == Common::kRenderCGA) ? 3 : 6);
 
 	static const uint8 xCoords[] = { 8, 80 };
 	static const uint8 yCoords[] = { 2, 54, 106 };
 	int x = xCoords[index & 1];
 	int y = yCoords[index >> 1];
+	int xOffset = (_configRenderMode == Common::kRenderCGA) ? 0 : 1;
 
 	if (!_screen->_curPage)
 		x += 176;
@@ -467,7 +468,7 @@ void EoBCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
 	} else {
 		_screen->drawClippedLine(x, y, x + 62, y, guiSettings()->colors.frame2);
 		_screen->drawClippedLine(x, y + 49, x + 62, y + 49, guiSettings()->colors.frame1);
-		_screen->drawClippedLine(x - 1, y, x - 1, y + 50, 12);
+		_screen->drawClippedLine(x - xOffset, y, x - xOffset, y + 50, 12);
 		_screen->drawClippedLine(x + 63, y, x + 63, y + 50, 12);
 	}
 }
@@ -481,7 +482,15 @@ void EoBCoreEngine::gui_drawInventoryItem(int slot, int special, int pageNum) {
 
 	if (special) {
 		int wh = (slot == 25 || slot == 26) ? 10 : 18;
-		gui_drawBox(x - 1, y - 1, wh, wh, guiSettings()->colors.frame1, guiSettings()->colors.frame2, slot == 16 ? -1 : guiSettings()->colors.fill);
+
+		uint8 col1 = guiSettings()->colors.frame1;
+		uint8 col2 = guiSettings()->colors.frame2;
+		if (_configRenderMode == Common::kRenderCGA ) {
+			col1 = 1;
+			col2 = 3;
+		}
+
+		gui_drawBox(x - 1, y - 1, wh, wh, col1, col2, slot == 16 ? -1 : guiSettings()->colors.fill);
 
 		if (slot == 16) {
 			_screen->fillRect(227, 65, 238, 69, 12);
@@ -528,14 +537,26 @@ void EoBCoreEngine::gui_drawSpellbook() {
 	_screen->copyRegion(64, 121, 64, 121, 112, 56, 0, 2, Screen::CR_NO_P_CHECK);
 
 	for (int i = 0; i < numTab; i++) {
-		int col1 = guiSettings()->colors.inactiveTabFrame1;
-		int col2 = guiSettings()->colors.inactiveTabFrame2;
-		int col3 = guiSettings()->colors.inactiveTabFill;
-
-		if (i == _openBookSpellLevel) {
-			col1 =  guiSettings()->colors.frame1;
-			col2 =  guiSettings()->colors.frame2;
-			col3 =  guiSettings()->colors.fill;
+		int col1 = 0;
+		int col2 = 1;
+		int col3 = 2;
+
+		if (_configRenderMode == Common::kRenderCGA) {
+			if (i == _openBookSpellLevel) {
+				col1 = 1;
+				col2 = 2;
+				col3 = 3;
+			}
+		} else {
+			col1 = guiSettings()->colors.inactiveTabFrame1;
+			col2 = guiSettings()->colors.inactiveTabFrame2;
+			col3 = guiSettings()->colors.inactiveTabFill;
+
+			if (i == _openBookSpellLevel) {
+				col1 =  guiSettings()->colors.frame1;
+				col2 =  guiSettings()->colors.frame2;
+				col3 =  guiSettings()->colors.fill;
+			}
 		}
 
 		if (_flags.gameID == GI_EOB1) {
@@ -558,19 +579,21 @@ void EoBCoreEngine::gui_drawSpellbook() {
 		gui_drawSpellbookScrollArrow(165, 169, 1);
 	}
 
-	int textCol1 = 15;
+	int textCol1 = (_configRenderMode == Common::kRenderCGA) ? 3 : 15;
 	int textCol2 = 8;
 	int textXa = 74;
 	int textXs = 71;
 	int textY = 170;
-	int col3 = guiSettings()->colors.fill;
+	int col3 = (_configRenderMode == Common::kRenderCGA) ? 2 : guiSettings()->colors.fill;
 	int col4 = guiSettings()->colors.extraFill;
+	int col5 = 12;
 
 	if (_flags.gameID == GI_EOB1) {
-		textCol2 = 11;
+		textCol2 = (_configRenderMode == Common::kRenderCGA) ? 12 : 11;
 		textXa = textXs = 73;
 		textY = 168;
-		col4 = guiSettings()->colors.fill;
+		col4 = col3;
+		col5 = textCol1;
 	}
 
 	for (int i = 0; i < 7; i++) {
@@ -587,7 +610,7 @@ void EoBCoreEngine::gui_drawSpellbook() {
 			if (d >= 0 && i < 6 && (i + _openBookSpellListOffset) < 9)
 				_screen->printText(_openBookSpellList[d], textXs, 132 + 6 * i, textCol1, col3);
 			else
-				_screen->printText(_magicStrings1[0], textXa, textY, 12, col4);
+				_screen->printText(_magicStrings1[0], textXa, textY, col5, col4);
 		}
 	}
 
@@ -2704,13 +2727,14 @@ bool GUI_EoB::runSaveMenu(int x, int y) {
 
 int GUI_EoB::selectSaveSlotDialogue(int x, int y, int id) {
 	_saveSlotX = _saveSlotY = 0;
+	int col1 = (_vm->_configRenderMode == Common::kRenderCGA) ? 1 : 15;
 	_screen->setCurPage(2);
 
 	_savegameOffset = 0;
 
 	drawMenuButtonBox(0, 0, 176, 144, false, false);
 	const char *title = (id < 2) ? _vm->_saveLoadStrings[2 + id] : _vm->_transferStringsScummVM[id - 1];
-	_screen->printShadedText(title, 52, 5, 15, 0);
+	_screen->printShadedText(title, 52, 5, col1, 0);
 
 	_screen->copyRegion(0, 0, x, y, 176, 144, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->setCurPage(0);
@@ -2783,12 +2807,12 @@ int GUI_EoB::selectSaveSlotDialogue(int x, int y, int id) {
 			lastHighlight = -1;
 			setupSaveMenuSlots();
 			for (int i = 0; i < 7; i++)
-				drawSaveSlotButton(i, 1, 15);
+				drawSaveSlotButton(i, 1, col1);
 			lastOffset = _savegameOffset;
 		}
 
 		if (lastHighlight != newHighlight) {
-			drawSaveSlotButton(lastHighlight, 0, 15);
+			drawSaveSlotButton(lastHighlight, 0, col1);
 			drawSaveSlotButton(newHighlight, 0, 6);
 
 			// Display highlighted slot index in the bottom left corner to avoid people getting lost with the 990 save slots
@@ -3797,10 +3821,12 @@ void GUI_EoB::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFil
 			yOffs = (b->height - 7) >> 1;
 		}
 
+		int col1 = (_vm->_configRenderMode == Common::kRenderCGA) ? 1 : 15;
+
 		if (noFill || clicked)
-			_screen->printText(s, b->x + xOffs, b->y + yOffs, highlight ? 6 : 15, 0);
+			_screen->printText(s, b->x + xOffs, b->y + yOffs, highlight ? 6 : col1, 0);
 		else
-			_screen->printShadedText(s, b->x + xOffs, b->y + yOffs, highlight ? 6 : 15, 0);
+			_screen->printShadedText(s, b->x + xOffs, b->y + yOffs, highlight ? 6 : col1, 0);
 	}
 }
 
@@ -3862,13 +3888,14 @@ void GUI_EoB::memorizePrayMenuPrintString(int spellId, int bookPageIndex, int sp
 		return;
 
 	int y = bookPageIndex * 9 + 50;
+	int col1 = (_vm->_configRenderMode == Common::kRenderCGA) ? 1 : 15;
 
 	if (spellId) {
 		Common::String s(Common::String::format(_vm->_menuStringsMgc[0], spellType ? _vm->_clericSpellList[spellId] : _vm->_mageSpellList[spellId], _numAssignedSpellsOfType[spellId * 2 - 2]));
 		if (noFill)
-			_screen->printText(s.c_str(), 8, y, highLight ? 6 : 15, 0);
+			_screen->printText(s.c_str(), 8, y, highLight ? 6 : col1, 0);
 		else
-			_screen->printShadedText(s.c_str(), 8, y, highLight ? 6 : 15, _vm->guiSettings()->colors.fill);
+			_screen->printShadedText(s.c_str(), 8, y, highLight ? 6 : col1, _vm->guiSettings()->colors.fill);
 
 	} else {
 		_screen->fillRect(6, y, 168, y + 8,  _vm->guiSettings()->colors.fill);
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index 979b68d34b..5b65887d4b 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -462,19 +462,18 @@ void EoBCoreEngine::identifyQueuedItems(Item itemQueue) {
 void EoBCoreEngine::drawItemIconShape(int pageNum, Item itemId, int x, int y) {
 	int icn = _items[itemId].icon;
 	bool applyBluePal = ((_partyEffectFlags & 2) && (_items[itemId].flags & 0x80)) ? true : false;
-
-	memcpy(_tempIconShape, _itemIconShapes[icn], _itemIconShapes[icn][1] * _itemIconShapes[icn][2] * 4 + 20);
+	const uint8 *ovl = 0;
 
 	if (applyBluePal) {
-		if (_flags.gameID == GI_EOB1) {
-			_screen->replaceShapePalette(_tempIconShape, &_itemsOverlay[icn << 4]);
+		if (_flags.gameID == GI_EOB1) {			
+			ovl = (_configRenderMode == Common::kRenderCGA) ? _itemsOverlayCGA : &_itemsOverlay[icn << 4];
 		} else {
 			_screen->setFadeTableIndex(3);
 			_screen->setShapeFadeMode(1, true);
 		}
 	}
 
-	_screen->drawShape(pageNum, _tempIconShape, x, y, 0);
+	_screen->drawShape(pageNum, _itemIconShapes[icn], x, y, 0, ovl ? 2 : 0, ovl);
 
 	if (applyBluePal) {
 		_screen->setFadeTableIndex(4);
diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp
index 8c9a1ec835..a885eb9e2d 100644
--- a/engines/kyra/kyra_rpg.cpp
+++ b/engines/kyra/kyra_rpg.cpp
@@ -44,6 +44,7 @@ KyraRpgEngine::KyraRpgEngine(OSystem *system, const GameFlags &flags) : KyraEngi
 	_vmpPtr = 0;
 	_vcnBlocks = 0;
 	_vcfBlocks = 0;
+	_vcnTransitionMask = 0;
 	_vcnShift = 0;
 	_vcnColTable = 0;
 	_vmpPtr = 0;
@@ -126,6 +127,7 @@ KyraRpgEngine::~KyraRpgEngine() {
 	delete[] _vcnColTable;
 	delete[] _vcnBlocks;
 	delete[] _vcfBlocks;
+	delete[] _vcnTransitionMask;
 	delete[] _vcnShift;
 	delete[] _blockDrawingBuffer;
 	delete[] _sceneWindowBuffer;
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index 6a71239250..aec34fc3c9 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -224,6 +224,7 @@ protected:
 	uint16 *_vmpPtr;
 	uint8 *_vcnBlocks;
 	uint8 *_vcfBlocks;
+	uint8 *_vcnTransitionMask;
 	uint8 *_vcnShift;
 	uint8 *_vcnColTable;
 	uint16 *_blockDrawingBuffer;
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 2a59a97cc1..5a06fe7977 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -279,15 +279,51 @@ void EoBCoreEngine::loadVcnData(const char *file, const uint8 *cgaMapping) {
 
 	const char *filePattern = (_flags.gameID == GI_EOB1 && (_configRenderMode == Common::kRenderEGA || _configRenderMode == Common::kRenderCGA)) ? "%s.ECN" : "%s.VCN";
 	_screen->loadBitmap(Common::String::format(filePattern, _lastBlockDataFile).c_str(), 3, 3, 0);
-	const uint8 *v = _screen->getCPagePtr(3);
-	uint32 tlen = READ_LE_UINT16(v) << 5;
-	v += 2;
+	const uint8 *pos = _screen->getCPagePtr(3);
+	uint32 tlen = READ_LE_UINT16(pos) << 5;
+	pos += 2;
 	if (!(_flags.gameID == GI_EOB1 && (_configRenderMode == Common::kRenderEGA || _configRenderMode == Common::kRenderCGA)))
-		memcpy(_vcnColTable, v, 32);
-	v += 32;
+		memcpy(_vcnColTable, pos, 32);
+	pos += 32;
 	delete[] _vcnBlocks;
 	_vcnBlocks = new uint8[tlen];
-	memcpy(_vcnBlocks, v, tlen);
+
+	if (_configRenderMode == Common::kRenderCGA) {
+		uint8 *tmp = _screen->encodeShape(0, 0, 1, 8, false, cgaMapping);
+		delete[] tmp;
+
+		delete[] _vcnTransitionMask;
+		_vcnTransitionMask = new uint8[tlen];
+		uint8 tblSwitch = 0;
+		uint8 *dst = _vcnBlocks;
+		uint8 *dst2 = _vcnTransitionMask;
+
+		while (dst < _vcnBlocks + tlen) {
+			const uint16 *table = _screen->getCGADitheringTable((tblSwitch++) & 1);
+			for (int ii = 0; ii < 2; ii++) {
+				*dst++ = ((table[pos[0]] & 0x000f) << 4) | ((table[pos[0]] & 0x0f00) >> 8);
+				*dst++= ((table[pos[1]] & 0x000f) << 4) | ((table[pos[1]] & 0x0f00) >> 8);
+
+				uint8 msk = 0;
+				if (pos[0] & 0xf0)
+					msk |= 0x30;
+				if (pos[0] & 0x0f)
+					msk |= 0x03;
+				*dst2++ = msk ^ 0x33;
+
+				msk = 0;
+				if (pos[1] & 0xf0)
+					msk |= 0x30;
+				if (pos[1] & 0x0f)
+					msk |= 0x03;
+				*dst2++ = msk ^ 0x33;
+
+				pos += 2;
+			}
+		}
+	} else {
+		memcpy(_vcnBlocks, pos, tlen);
+	}
 }
 
 void EoBCoreEngine::loadBlockProperties(const char *mazFile) {
@@ -338,7 +374,7 @@ const uint8 *EoBCoreEngine::getBlockFileData(const char *mazFile) {
 }
 
 void EoBCoreEngine::loadDecorations(const char *cpsFile, const char *decFile) {
-	_screen->loadShapeSetBitmap(cpsFile, 3, 3);
+	_screen->loadShapeSetBitmap(cpsFile, 5, 3);
 	Common::SeekableReadStream *s = _res->createReadStream(decFile);
 
 	_levelDecorationDataSize = s->readUint16LE();
diff --git a/engines/kyra/scene_rpg.cpp b/engines/kyra/scene_rpg.cpp
index 55d02d8da1..269a5d3461 100644
--- a/engines/kyra/scene_rpg.cpp
+++ b/engines/kyra/scene_rpg.cpp
@@ -349,15 +349,14 @@ void KyraRpgEngine::drawVcnBlocks() {
 	for (int y = 0; y < 15; y++) {
 		for (int x = 0; x < 22; x++) {
 			bool horizontalFlip = false;
-			int remainder = 0;
-
 			uint16 vcnOffset = *bdb++;
+			uint16 vcnExtraOffsetWll = 0;
 			int wllVcnOffset = 0;
 			int wllVcnRmdOffset = 0;
 
 			if (vcnOffset & 0x8000) {
 				// this renders a wall block over the transparent pixels of a floor/ceiling block
-				remainder = vcnOffset - 0x8000;
+				vcnExtraOffsetWll = vcnOffset - 0x8000;
 				vcnOffset = 0;
 				wllVcnRmdOffset = _wllVcnOffset;
 			}
@@ -388,9 +387,9 @@ void KyraRpgEngine::drawVcnBlocks() {
 				for (int blockY = 0; blockY < 8; blockY++) {
 					src += 3;
 					for (int blockX = 0; blockX < 4; blockX++) {
-						uint8 t = *src--;
-						*d++ = _vcnColTable[((t & 0x0f) + wllVcnOffset) | shift];
-						*d++ = _vcnColTable[((t >> 4) + wllVcnOffset) | shift];
+						uint8 bl = *src--;
+						*d++ = _vcnColTable[((bl & 0x0f) + wllVcnOffset) | shift];
+						*d++ = _vcnColTable[((bl >> 4) + wllVcnOffset) | shift];
 					}
 					src += 5;
 					d += 168;
@@ -398,54 +397,71 @@ void KyraRpgEngine::drawVcnBlocks() {
 			} else {
 				for (int blockY = 0; blockY < 8; blockY++) {
 					for (int blockX = 0; blockX < 4; blockX++) {
-						uint8 t = *src++;
-						*d++ = _vcnColTable[((t >> 4) + wllVcnOffset) | shift];
-						*d++ = _vcnColTable[((t & 0x0f) + wllVcnOffset) | shift];
+						uint8 bl = *src++;
+						*d++ = _vcnColTable[((bl >> 4) + wllVcnOffset) | shift];
+						*d++ = _vcnColTable[((bl & 0x0f) + wllVcnOffset) | shift];
 					}
 					d += 168;
 				}
 			}
 			d -= 1400;
 
-			if (remainder) {
+			if (vcnExtraOffsetWll) {
 				d -= 8;
 				horizontalFlip = false;
 
-				if (remainder & 0x4000) {
-					remainder &= 0x3fff;
+				if (vcnExtraOffsetWll & 0x4000) {
+					vcnExtraOffsetWll &= 0x3fff;
 					horizontalFlip = true;
 				}
 
-				shift = _vcnShift ? _vcnShift[remainder] : _blockBrightness;
-				src = &_vcnBlocks[remainder << 5];
+				shift = _vcnShift ? _vcnShift[vcnExtraOffsetWll] : _blockBrightness;
+				src = &_vcnBlocks[vcnExtraOffsetWll << 5];
+				uint8 *maskTable = _vcnTransitionMask ? &_vcnTransitionMask[vcnExtraOffsetWll << 5] : 0;
 
 				if (horizontalFlip) {
 					for (int blockY = 0; blockY < 8; blockY++) {
 						src += 3;
+						maskTable += 3;
 						for (int blockX = 0; blockX < 4; blockX++) {
-							uint8 t = *src--;
-							uint8 h = _vcnColTable[((t & 0x0f) + wllVcnRmdOffset) | shift];
-							uint8 l = _vcnColTable[((t >> 4) + wllVcnRmdOffset) | shift];
-							if (h)
+							uint8 bl = *src--;
+							uint8 mask = _vcnTransitionMask ? *maskTable-- : 0;
+							uint8 h = _vcnColTable[((bl & 0x0f) + wllVcnRmdOffset) | shift];
+							uint8 l = _vcnColTable[((bl >> 4) + wllVcnRmdOffset) | shift];
+
+							if (_vcnTransitionMask)
+								*d = (*d & (mask & 0x0f)) | h;
+							else if (h)
 								*d = h;
 							d++;
-							if (l)
+
+							if (_vcnTransitionMask)
+								*d = (*d & (mask >> 4)) | l;
+							else if (l)
 								*d = l;
 							d++;
 						}
 						src += 5;
+						maskTable += 5;
 						d += 168;
 					}
 				} else {
 					for (int blockY = 0; blockY < 8; blockY++) {
 						for (int blockX = 0; blockX < 4; blockX++) {
-							uint8 t = *src++;
-							uint8 h = _vcnColTable[((t >> 4) + wllVcnRmdOffset) | shift];
-							uint8 l = _vcnColTable[((t & 0x0f) + wllVcnRmdOffset) | shift];
-							if (h)
+							uint8 bl = *src++;
+							uint8 mask = _vcnTransitionMask ? *maskTable++ : 0;
+							uint8 h = _vcnColTable[((bl >> 4) + wllVcnRmdOffset) | shift];
+							uint8 l = _vcnColTable[((bl & 0x0f) + wllVcnRmdOffset) | shift];
+
+							if (_vcnTransitionMask)
+								*d = (*d & (mask >> 4)) | h;
+							else if (h)
 								*d = h;
 							d++;
-							if (l)
+
+							if (_vcnTransitionMask)
+								*d = (*d & (mask & 0x0f)) | l;
+							else if (l)
 								*d = l;
 							d++;
 						}
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index ebf7835bfd..d394a86f6f 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -159,8 +159,10 @@ bool Screen::init() {
 
 	// Setup CGA colors (if CGA mode is selected)
 	if (_renderMode == Common::kRenderCGA) {
-		Palette pal(4);
+		Palette pal(5);
 		pal.setCGAPalette(1, Palette::kIntensityHigh);
+		// create additional black color 4 for use with the mouse cursor manager
+		pal.fill(4, 1, 0);
 		Screen::setScreenPalette(pal);
 	}
 
@@ -1035,6 +1037,8 @@ void Screen::fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum,
 	if (_use16ColorMode) {
 		color &= 0x0F;
 		color |= (color << 4);
+	} else if (_renderMode == Common::kRenderCGA) {
+		color &= 3;
 	}
 
 	if (xored) {
@@ -1112,6 +1116,8 @@ void Screen::drawLine(bool vertical, int x, int y, int length, int color) {
 	if (_use16ColorMode) {
 		color &= 0x0F;
 		color |= (color << 4);
+	} else if (_renderMode == Common::kRenderCGA) {
+		color &= 3;
 	}
 
 	if (vertical) {
@@ -2086,17 +2092,16 @@ void Screen::decodeFrame1(const uint8 *src, uint8 *dst, uint32 size) {
 
 	while (dst < dstEnd) {
 		code = decodeEGAGetCode(src, nib);
-		last = code & 0xff;
 		uint8 cmd = code >> 8;
 
 		if (cmd--) {
-			code = (cmd << 8) | last;
+			code = (cmd << 8) | (code & 0xff);
 			uint8 *tmpDst = dst;
-			last = *dst;
 
 			if (code < numPatterns) {
 				const uint8 *tmpSrc = patterns[code].pos;
 				countPrev = patterns[code].len;
+				last = *tmpSrc;
 				for (int i = 0; i < countPrev; i++)
 					*dst++ = *tmpSrc++;
 
@@ -2118,7 +2123,7 @@ void Screen::decodeFrame1(const uint8 *src, uint8 *dst, uint32 size) {
 			count = countPrev;
 
 		} else {
-			*dst++ = last;
+			*dst++ = last = (code & 0xff);
 
 			if (numPatterns < 3840) {
 				patterns[numPatterns].pos = dstPrev;
@@ -3626,7 +3631,7 @@ void Palette::loadEGAPalette(Common::ReadStream &stream, int startIndex, int col
 }
 
 void Palette::setCGAPalette(int palIndex, CGAIntensity intensity) {
-	assert(_numColors == _cgaNumColors);
+	assert(_numColors >= _cgaNumColors);
 	assert(!(palIndex & ~1));
 	memcpy(_palData, _cgaColors[palIndex * 2 + intensity], _numColors * 3);
 }
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index aa94114dfc..8721c2cc02 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -48,7 +48,8 @@ Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system,
 	_dsTempPage = 0;
 	_dsDiv = 0;
 	_dsRem = 0;
-	_dsScaleTmp = 0;
+	_dsScaleTrans = 0;
+	_cgaScaleTable = 0;
 	_gfxMaxY = 0;
 	_egaColorMap = 0;
 	_egaPixelValueTable = 0;
@@ -60,6 +61,7 @@ Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system,
 Screen_EoB::~Screen_EoB() {
 	delete[] _fadeData;
 	delete[] _dsTempPage;
+	delete[] _cgaScaleTable;
 	delete[] _egaColorMap;
 	delete[] _egaPixelValueTable;
 	delete[] _cgaDitheringTables[0];
@@ -71,7 +73,7 @@ bool Screen_EoB::init() {
 	if (Screen::init()) {
 		int temp;
 		_gfxMaxY = _vm->staticres()->loadRawData(kEoBBaseExpObjectY, temp);
-		
+
 		if (_renderMode != Common::kRenderCGA && _renderMode != Common::kRenderEGA)
 			_fadeData = _vm->resource()->fileData("FADING.DAT", 0);
 
@@ -86,7 +88,8 @@ bool Screen_EoB::init() {
 			}
 		}
 
-		_dsTempPage = new uint8[6000];
+		_dsTempPage = new uint8[12000];
+
 		if (_renderMode == Common::kRenderEGA) {
 			_egaColorMap = new uint8[256];
 			_egaPixelValueTable = new uint8[256];
@@ -97,18 +100,24 @@ bool Screen_EoB::init() {
 
 			if (_vm->game() == GI_EOB2)
 				_useHiResEGADithering = true;
+
 		} else if (_renderMode == Common::kRenderCGA) {
 			_cgaMappingDefault = _vm->staticres()->loadRawData(kEoB1CgaMappingDefault, temp);
 			_cgaDitheringTables[0] = new uint16[256];
 			memset(_cgaDitheringTables[0], 0, 256 * sizeof(uint16));
 			_cgaDitheringTables[1] = new uint16[256];
 			memset(_cgaDitheringTables[1], 0, 256 * sizeof(uint16));
+
 			_cgaDrawCharDitheringTable = new uint16[256];
 			memset(_cgaDrawCharDitheringTable, 0, 256 * sizeof(uint16));
-			
 			static const uint bits[] = { 0, 3, 12, 15 };
 			for (int i = 0; i < 256; i++)
-				WRITE_BE_UINT16(&_cgaDrawCharDitheringTable[i], (bits[i & 3] << 8) | (bits[(i >> 2) & 3] << 12) | (bits[(i >> 4) & 3] << 0) | (bits[(i >> 6) & 3] << 4));
+				_cgaDrawCharDitheringTable[i] = (bits[i & 3] << 8) | (bits[(i >> 2) & 3] << 12) | (bits[(i >> 4) & 3] << 0) | (bits[(i >> 6) & 3] << 4);
+
+			_cgaScaleTable = new uint8[256];
+			memset(_cgaScaleTable, 0, 256 * sizeof(uint8));
+			for (int i = 0; i < 256; i++)
+				_cgaScaleTable[i] = ((i & 0xf0) >> 2) | (i & 0x03);
 		}
 
 		return true;
@@ -126,15 +135,43 @@ void Screen_EoB::clearCurDim() {
 }
 
 void Screen_EoB::setMouseCursor(int x, int y, const byte *shape) {
+	setMouseCursor(x, y, shape, 0);
+}
+
+void Screen_EoB::setMouseCursor(int x, int y, const byte *shape, const uint8 *ovl) {
 	if (!shape)
 		return;
 	int mouseW = shape[2] << 3;
 	int mouseH = shape[3];
 	uint8 *cursor = new uint8[mouseW * mouseH];
 	fillRect(0, 0, mouseW, mouseH, _cursorColorKey, 8);
-	drawShape(8, shape, 0, 0, 0);
+	drawShape(8, shape, 0, 0, 0, 2, ovl);
 	CursorMan.showMouse(false);
 	copyRegionToBuffer(8, 0, 0, mouseW, mouseH, cursor);
+
+	// Mouse cursor post processing for CGA mode. Unlike the original (which uses drawShape for the mouse cursor)
+	// the cursor manager cannot know whether a pixel value of 0 is supposed to be black or transparent. Thus, we
+	// go over the transparency mask again and turn the black pixels to color 4.
+	if (_renderMode == Common::kRenderCGA) {
+		const uint8 *maskTbl = shape + 4 + ((mouseW * mouseH) >> 2);
+		uint8 *dst = cursor;
+		uint8 trans = 0;
+		uint8 shift = 6;
+
+		uint16 mH = mouseH;
+		while (mH--) {
+			uint16 mW = mouseW;
+			while (mW--) {
+				if (shift == 6)
+					trans = *maskTbl++;
+				if (!*dst && !((trans >> shift) & 3))
+					*dst = 4;
+				dst++;
+				shift = (shift - 2) & 7;
+			}
+		}
+	}
+
 	CursorMan.replaceCursor(cursor, mouseW, mouseH, x, y, _cursorColorKey);
 	if (isMouseVisible())
 		CursorMan.showMouse(true);
@@ -215,13 +252,14 @@ void Screen_EoB::convertPage(int srcPage, int dstPage, const uint8 *cgaMapping)
 		return;
 
 	if (_renderMode == Common::kRenderCGA) {
-		generateCGADitheringTables(cgaMapping);
+		if (cgaMapping)
+			generateCGADitheringTables(cgaMapping);
 		uint16 *d = (uint16*)dst;
-		uint8 tblSwitch = 0;	
+		uint8 tblSwitch = 0;
 		for (int height = SCREEN_H; height; height--) {
 			const uint16 *table = _cgaDitheringTables[(tblSwitch++) & 1];
 			for (int width = SCREEN_W / 2; width; width--) {
-				*d++ = table[((src[0] & 0x0f) << 4) | (src[1] & 0x0f)];
+				*d++ = table[((src[1] & 0x0f) << 4) | (src[0] & 0x0f)];
 				src += 2;
 			}
 		}
@@ -301,14 +339,53 @@ void Screen_EoB::setScreenPalette(const Palette &pal) {
 	}
 }
 
-uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4bitEncoding, const uint8 *cgaMapping) {
+uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool encode8bit, const uint8 *cgaMapping) {
 	uint8 *shp = 0;
 	uint16 shapesize = 0;
 
-	uint8 *srcPage = getPagePtr(_curPage | 1) + y * 320 + (x << 3);
-	uint8 *src = srcPage;
+	uint8 *srcLineStart = getPagePtr(_curPage | 1) + y * 320 + (x << 3);
+	uint8 *src = srcLineStart;
+
+	if (_renderMode == Common::kRenderCGA) {
+		if (cgaMapping)
+			generateCGADitheringTables(cgaMapping);
+		shapesize = h * (w << 2) + 4;
+		shp = new uint8[shapesize];
+		memset(shp, 0, shapesize);
+		uint8 *dst = shp;
+
+		*dst++ = 4;
+		*dst++ = (h & 0xff);
+		*dst++ = (w & 0xff);
+		*dst++ = (h & 0xff);
+
+		uint8 *dst2 = dst + (h * (w << 1));
+
+		uint8 tblSwitch = 0;
+		uint16 h1 = h;
+		while (h1--) {
+			uint16 w1 = w << 1;
+			const uint16 *table = _cgaDitheringTables[(tblSwitch++) & 1];
+
+			while (w1--) {
+				uint16 p0 = table[((src[1] & 0x0f) << 4) | (src[0] & 0x0f)];
+				uint16 p1 = table[((src[3] & 0x0f) << 4) | (src[2] & 0x0f)];
+
+				*dst++ = ((p0 & 0x0003) << 6) | ((p0 & 0x0300) >> 4) | ((p1 & 0x0003) << 2) | ((p1 & 0x0300) >> 8);
+
+				uint8 msk = 0;
+				for (int i = 0; i < 4; i++) {
+					if (!src[3 - i])
+						msk |= (3 << (i << 1));
+				}
+				*dst2++ = msk;
+				src += 4;
+			}
+			srcLineStart += SCREEN_W;
+			src = srcLineStart;
+		}
 
-	if (no4bitEncoding) {
+	} else if (encode8bit) {
 		uint16 h1 = h;
 		while (h1--) {
 			uint8 *lineEnd = src + (w << 3);
@@ -326,8 +403,8 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 				shapesize++;
 			} while (src != lineEnd);
 
-			srcPage += 320;
-			src = srcPage;
+			srcLineStart += SCREEN_W;
+			src = srcLineStart;
 		}
 
 		shapesize += 4;
@@ -336,13 +413,13 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 		memset(shp, 0, shapesize);
 		uint8 *dst = shp;
 
-		*dst++ = 0;
+		*dst++ = 8;
 		*dst++ = (h & 0xff);
 		*dst++ = (w & 0xff);
 		*dst++ = (h & 0xff);
 
-		srcPage = getPagePtr(_curPage | 1) + y * 320 + (x << 3);
-		src = srcPage;
+		srcLineStart = getPagePtr(_curPage | 1) + y * 320 + (x << 3);
+		src = srcLineStart;
 
 		h1 = h;
 		while (h1--) {
@@ -367,8 +444,8 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 				*dst++ = val;
 			} while (src != lineEnd);
 
-			srcPage += 320;
-			src = srcPage;
+			srcLineStart += SCREEN_W;
+			src = srcLineStart;
 		}
 
 	} else {
@@ -381,17 +458,14 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 		memset(shp, 0, shapesize);
 		uint8 *dst = shp;
 
-		*dst++ = 1;
+		*dst++ = 2;
 		*dst++ = (h & 0xff);
 		*dst++ = (w & 0xff);
 		*dst++ = (h & 0xff);
 		memset(dst, 0xff, 0x10);
 
 		uint8 *pal = dst;
-		dst += 0x10;
-
-		srcPage = getPagePtr(_curPage | 1) + y * 320 + (x << 3);
-		src = srcPage;
+		dst += 16;
 		nib = col = 0;
 
 		uint16 h1 = h;
@@ -411,14 +485,13 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 					}
 				}
 
-				if (++nib & 1) {
+				if (++nib & 1)
 					*dst = c << 4;
-				} else {
+				else
 					*dst++ |= c;
-				}
 			}
-			srcPage += 320;
-			src = srcPage;
+			srcLineStart += SCREEN_W;
+			src = srcLineStart;
 		}
 		delete [] colorMap;
 	}
@@ -449,10 +522,11 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 	int16 dX = x - (_dsX1 << 3);
 	int16 dY = y;
 	int16 dW = _dsX2 - _dsX1;
-	uint8 flag = *src++;
+	uint8 pixelsPerByte = *src++ ;
 
 	uint16 dH = *src++;
 	uint16 width = (*src++) << 3;
+	uint16 transOffset = (pixelsPerByte == 4) ? (dH * width) >> 2 : 0;
 	src++;
 
 	int rX = x;
@@ -465,148 +539,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 
 	int pixelStep = (flags & 1) ? -1 : 1;
 
-	if (flag) {
-		const uint8 *pal = ovl ? ovl : src;
-		src += 16;
-
-		if (d < 0) {
-			d = -d;
-			if (d >= dH)
-				return;
-			src += (d * (width >> 1));
-			d = dY + dH - _dsY1;
-			if (d >= 0) {
-				dH = d;
-				dY = _dsY1;
-				d = _dsY2 - dY;
-			}
-		} else {
-			d = _dsY2 - dY;
-		}
-
-		if (d < 1)
-			return;
-
-		if (d < dH)
-			dH = d;
-
-		int16 cnt1 = 0;
-		int16 cnt2 = 0;
-		int16 dXbit1 = dX & 1;
-
-		if (dX < 0) {
-			width += dX;
-			d = -dX;
-			if (flags & 1)
-				src -= (d >> 1);
-			else
-				src += (d >> 1);
-
-			if (d >= w2)
-				return;
-
-			dX = 0;
-			cnt1++;
-		}
-
-		d = (dW << 3) - dX;
-
-		if (d < 1)
-			return;
-
-		if (d < width) {
-			width = d;
-			cnt2++;
-		}
-
-		dst += (dY * 320 + dX);
-
-		if (pageNum == 0 || pageNum == 1)
-			addDirtyRect(rX, rY, rW, rH);
-
-		int w3 = w2;
-		dY = 320 - width;
-		width >>= 1;
-		w2 >>= 1;
-		if (flags & 1)
-			src += (w2 - 1);
-
-		int16 w1shr = width;
-
-		if (cnt1 && (dXbit1 & 1)) {
-			w1shr++;
-			w2++;
-			if (!cnt2)
-				dY += 2;
-		}
-
-		if (cnt2 && (dXbit1 & 1))
-			w1shr++;
-
-		int lineSrcStep = (w2 - w1shr);
-		if (flags & 1)
-			lineSrcStep = w3 - lineSrcStep;
-
-		while (dH--) {
-			int16 hpos = width;
-			uint8 col = 0;
-			uint8 b = 0;
-			uint8 nextloop = 0;
-
-			if (cnt1 && dXbit1) {
-				if (!hpos)
-					return;
-				b = *src;
-				src += pixelStep;
-				nextloop = 2;
-			} else {
-				nextloop = hpos ? 1 : 3;
-			}
-
-			while (nextloop) {
-				switch (nextloop) {
-				case 1:
-					b = *src;
-					src += pixelStep;
-					col = pal[(flags & 1) ? (b & 0x0f) : (b >> 4)];
-					if (col)
-						drawShapeSetPixel(dst, col);
-					dst++;
-
-				case 2:
-					col = pal[(flags & 1) ? (b >> 4) : (b & 0x0f)];
-
-					if (!col) {
-						nextloop = 4;
-						break;
-					}
-
-					drawShapeSetPixel(dst++, col);
-					nextloop = --hpos ? 1 : 3;
-					break;
-
-				case 3:
-					if (cnt2 && dXbit1) {
-						col = pal[(flags & 1) ? (*src & 0x0f) : (*src >> 4)];
-						src += pixelStep;
-						if (col)
-							drawShapeSetPixel(dst, col);
-						dst++;
-					}
-
-					src += lineSrcStep;
-					dst += dY;
-					nextloop = 0;
-					break;
-
-				case 4:
-					dst++;
-					nextloop = --hpos ? 1 : 3;
-					break;
-				}
-			}
-		}
-	} else {
+	if (pixelsPerByte == 8)  {
 		uint16 marginLeft = 0;
 		uint16 marginRight = 0;
 
@@ -740,6 +673,127 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 			if (flags & 1)
 				src = src2 + 1;
 		}
+	} else {
+		const uint8 *pal = 0;
+		uint8 cgaPal[4];
+		memset(cgaPal, 0, 4);
+
+		if (pixelsPerByte == 2) {
+			pal = ovl ? ovl : src;
+			src += 16;
+		} else {
+			static const uint8 cgaDefOvl[] = { 0x00, 0x55, 0xaa, 0xff };
+			pal = ovl ? ovl : cgaDefOvl;
+			for (int i = 0; i < 4; i++)
+				cgaPal[i] = pal[i] & 3;
+			pal = cgaPal;
+		}
+
+		if (d < 0) {
+			d = -d;
+			if (d >= dH)
+				return;
+			src += (d * (width / pixelsPerByte));
+			d = dY + dH - _dsY1;
+			if (d >= 0) {
+				dH = d;
+				dY = _dsY1;
+				d = _dsY2 - dY;
+			}
+		} else {
+			d = _dsY2 - dY;
+		}
+
+		if (d < 1)
+			return;
+
+		if (d < dH)
+			dH = d;
+
+		bool trimL = false;
+		uint8 dXbitAlign = dX & (pixelsPerByte - 1);
+
+		if (dX < 0) {
+			width += dX;
+			d = -dX;
+			if (flags & 1)
+				src -= (d / pixelsPerByte);
+			else
+				src += (d / pixelsPerByte);
+
+			if (d >= w2)
+				return;
+
+			dX = 0;
+			trimL = true;
+		}
+
+		d = (dW << 3) - dX;
+
+		if (d < 1)
+			return;
+
+		if (d < width)
+			width = d;
+
+		dst += (dY * 320 + dX);
+
+		if (pageNum == 0 || pageNum == 1)
+			addDirtyRect(rX, rY, rW, rH);
+
+		int pitch = 320 - width;
+		int16 lineSrcStep = (w2 - width) / pixelsPerByte;
+		uint8 lineSrcStepRemainder = (w2 - width) % pixelsPerByte;
+
+		w2 /= pixelsPerByte;
+		if (flags & 1)
+			src += (w2 - 1);
+
+		uint8 pixelPacking = 8 / pixelsPerByte;
+		uint8 pixelPackingMask = 0;
+
+		for (int i = 0; i < pixelPacking; i++)
+			pixelPackingMask |= (1 << i);
+
+		if (trimL && (dXbitAlign > lineSrcStepRemainder))
+			lineSrcStep--;
+
+		uint8 bitShDef = 8 - pixelPacking;
+		if (flags & 1) {
+			lineSrcStep = (w2 << 1) - lineSrcStep;
+			bitShDef = 0;
+		}
+
+		uint8 bitShLineStart = bitShDef;
+		if (trimL)
+			bitShLineStart -= (dXbitAlign * pixelStep * pixelPacking);
+
+		while (dH--) {
+			int16 wd = width;
+			uint8 in = 0;
+			uint8 trans = 0;
+			uint8 shift = bitShLineStart;
+			uint8 shSwtch = bitShLineStart;
+
+			while (wd--) {
+				if (shift == shSwtch) {
+					in = *src;
+					trans = src[transOffset];
+					src += pixelStep;
+					shSwtch = bitShDef;
+				}
+				if (pixelsPerByte == 2) {
+					if (pal[(in >> shift) & pixelPackingMask])
+						drawShapeSetPixel(dst, pal[(in >> shift) & pixelPackingMask]);
+				} else {
+					*dst = (*dst & ((trans >> shift) & (pixelPackingMask))) | pal[(in >> shift) & pixelPackingMask];
+				}
+				dst++;
+				shift = (shift - (pixelStep * pixelPacking) & 7);
+			}
+			src += lineSrcStep;
+			dst += pitch;
+		}
 	}
 }
 
@@ -753,69 +807,75 @@ const uint8 *Screen_EoB::scaleShape(const uint8 *shapeData, int steps) {
 }
 
 const uint8 *Screen_EoB::scaleShapeStep(const uint8 *shp) {
-	uint8 *d = _dsTempPage;
-	*d++ = *shp++;
+	uint8 *dst = (shp != _dsTempPage) ? _dsTempPage : _dsTempPage + 6000;
+	uint8 *d = dst;
+	uint8 pixelsPerByte = *d++ = *shp++;
+	assert (pixelsPerByte > 1);
 
-	uint16 h = (*shp++) + 1;
+	uint16 h = shp[0] + 1;
 	d[0] = d[2] = (h << 1) / 3;
-	d++;
 
-	uint16 w = *shp++;
-	uint16 w2 = w << 2;
+	uint16 w = shp[1];
+	uint16 w2 = (w << 3) / pixelsPerByte;
 	uint16 t = ((w << 1) % 3) ? 1 : 0;
-	*d++ = ((w << 1) / 3) + t;
-
-	shp++;
-	d++;
-
-	int i = 0;
-	while (i < 16) {
-		if (!shp[i]) {
-			i = -i;
-			break;
+	d[1] = ((w << 1) / 3) + t;
+	
+	uint32 transOffsetSrc = (pixelsPerByte == 4) ? (shp[0] * shp[1]) << 1 : 0;
+	uint32 transOffsetDst = (pixelsPerByte == 4) ? (d[0] * d[1]) << 1 : 0;
+	shp += 3;
+	d += 3;	
+
+	if (pixelsPerByte == 2) {
+		int i = 0;
+		while (i < 16) {
+			if (!shp[i]) {
+				i = -i;
+				break;
+			}
+			i++;
 		}
-		i++;
-	}
 
-	if (i >= 0)
-		i = 0;
-	else
-		i = -i;
+		if (i >= 0)
+			i = 0;
+		else
+			i = -i;
 
-	_dsScaleTmp = (i << 4) | (i & 0x0f);
-	for (int ii = 0; ii < 16; ii++)
-		*d++ = *shp++;
+		_dsScaleTrans = (i << 4) | (i & 0x0f);
+		for (int ii = 0; ii < 16; ii++)
+			*d++ = *shp++;
+	}
 
 	_dsDiv = w2 / 3;
 	_dsRem = w2 % 3;
 
 	while (--h) {
-		scaleShapeProcessLine(d, shp);
+		if (pixelsPerByte == 2)
+			scaleShapeProcessLine4Bit(d, shp);
+		else
+			scaleShapeProcessLine2Bit(d, shp, transOffsetDst, transOffsetSrc);
 		if (!--h)
 			break;
-		scaleShapeProcessLine(d, shp);
+		if (pixelsPerByte == 2)
+			scaleShapeProcessLine4Bit(d, shp);
+		else
+			scaleShapeProcessLine2Bit(d, shp, transOffsetDst, transOffsetSrc);
 		if (!--h)
 			break;
 		shp += w2;
 	}
 
-	return (const uint8 *)_dsTempPage;
+	return (const uint8*)dst;
 }
 
-void Screen_EoB::replaceShapePalette(uint8 *shp, const uint8 *pal) {
-	if (*shp != 1)
-		return;
-	shp += 4;
-	memcpy(shp, pal, 16);
-}
+const uint8 *Screen_EoB::generateShapeOverlay(const uint8 *shp, int paletteOverlayIndex) {
+	if (*shp != 2)
+		return 0;
 
-void Screen_EoB::applyShapeOverlay(uint8 *shp, int ovlIndex) {
-	if (*shp != 1)
-		return;
 	shp += 4;
-	uint8 *ovl = getFadeTable(ovlIndex);
+	uint8 *ovl = getFadeTable(paletteOverlayIndex);
 	for (int i = 0; i < 16; i++)
-		shp[i] = ovl[shp[i]];
+		_shapeOverlay[i] = ovl[shp[i]];
+	return _shapeOverlay;
 }
 
 void Screen_EoB::setShapeFrame(int x1, int y1, int x2, int y2) {
@@ -1187,6 +1247,10 @@ uint8 *Screen_EoB::getFadeTable(int index) {
 	return (index >= 0 && index < 5) ? &_fadeData[index << 8] : 0;
 }
 
+const uint16 *Screen_EoB::getCGADitheringTable(int index) {
+	return !(index & ~1) ? _cgaDitheringTables[index] : 0;
+}
+
 void Screen_EoB::drawShapeSetPixel(uint8 *dst, uint8 c) {
 	if (_shapeFadeMode[0]) {
 		if (_shapeFadeMode[1]) {
@@ -1206,7 +1270,35 @@ void Screen_EoB::drawShapeSetPixel(uint8 *dst, uint8 c) {
 	*dst = c;
 }
 
-void Screen_EoB::scaleShapeProcessLine(uint8 *&dst, const uint8 *&src) {
+void Screen_EoB::scaleShapeProcessLine2Bit(uint8 *&shpDst, const uint8 *&shpSrc, uint32 transOffsetDst, uint32 transOffsetSrc) {
+	for (int i = 0; i < _dsDiv; i++) {
+		shpDst[0] = (_cgaScaleTable[shpSrc[0]] << 2) | (shpSrc[1] >> 6);
+		shpDst[1] = ((shpSrc[1] & 0x0f) << 4) | ((shpSrc[2] >> 2) & 0x0f);
+		shpDst[transOffsetDst] = (_cgaScaleTable[shpSrc[transOffsetSrc]] << 2) | (shpSrc[transOffsetSrc + 1] >> 6);
+		shpDst[transOffsetDst + 1] = ((shpSrc[transOffsetSrc + 1] & 0x0f) << 4) | ((shpSrc[transOffsetSrc + 2] >> 2) & 0x0f);
+		shpSrc += 3;
+		shpDst += 2;
+	}
+
+	if (_dsRem == 1) {
+		shpDst[0] = _cgaScaleTable[shpSrc[0]] << 2;
+		shpDst[1] = 0;
+		shpDst[transOffsetDst] = (_cgaScaleTable[shpSrc[transOffsetSrc]] << 2) | 3;
+		shpDst[transOffsetDst + 1] = 0xff;
+		shpSrc++;
+		shpDst += 2;
+
+	} else if (_dsRem == 2) {
+		shpDst[0] = (_cgaScaleTable[shpSrc[0]] << 2) | (shpSrc[1] >> 6);
+		shpDst[1] = (shpSrc[1] & 0x3f) << 2;
+		shpDst[transOffsetDst] = (_cgaScaleTable[shpSrc[transOffsetSrc]] << 2) | (shpSrc[transOffsetSrc + 1] >> 6);
+		shpDst[transOffsetDst + 1] = ((shpSrc[transOffsetSrc + 1] & 0x3f) << 2) | 3;
+		shpSrc += 2;
+		shpDst += 2;
+	}
+}
+
+void Screen_EoB::scaleShapeProcessLine4Bit(uint8 *&dst, const uint8 *&src) {
 	for (int i = 0; i < _dsDiv; i++) {
 		*dst++ = *src++;
 		*dst++ = (READ_BE_UINT16(src) >> 4) & 0xff;
@@ -1215,13 +1307,13 @@ void Screen_EoB::scaleShapeProcessLine(uint8 *&dst, const uint8 *&src) {
 
 	if (_dsRem == 1) {
 		*dst++ = *src++;
-		*dst++ = _dsScaleTmp;
+		*dst++ = _dsScaleTrans;
 	} else if (_dsRem == 2) {
 		*dst++ = (src[0] & 0xf0) | (src[1] >> 4);
 		src += 2;
-		*dst++ = _dsScaleTmp;
-		*dst++ = _dsScaleTmp;
-		*dst++ = _dsScaleTmp;
+		*dst++ = _dsScaleTrans;
+		*dst++ = _dsScaleTrans;
+		*dst++ = _dsScaleTrans;
 	}
 }
 
@@ -1233,8 +1325,8 @@ bool Screen_EoB::posWithinRect(int posX, int posY, int x1, int y1, int x2, int y
 
 void Screen_EoB::generateCGADitheringTables(const uint8 *mappingData) {
 	for (int i = 0; i < 256; i++) {
-		WRITE_BE_UINT16(&_cgaDitheringTables[0][i], (mappingData[i >> 4] << 8) | mappingData[(i & 0x0f) + 16]);
-		WRITE_BE_UINT16(&_cgaDitheringTables[1][i], (mappingData[(i >> 4) + 16] << 8) | mappingData[i & 0x0f]);
+		_cgaDitheringTables[0][i] = (mappingData[(i >> 4) + 16] << 8) | mappingData[i & 0x0f];
+		_cgaDitheringTables[1][i] = (mappingData[i >> 4] << 8) | mappingData[(i & 0x0f) + 16];
 	}
 }
 
@@ -1406,7 +1498,7 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 			uint8 in = s | last;
 			uint16 cmp1 = 0;
 			uint16 cmp2 = 0;
-			
+
 			if (color1) {
 				in &= m;
 				cmp1 = _cgaDitheringTable[in];
@@ -1418,18 +1510,18 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 			}
 
 			uint16 cDst = 0;
-			uint8 sh = 14;
+			uint8 sh = 6;
 			for (int i = 0; i < _width; i++) {
 				cDst |= ((dst[i] & 3) << sh);
-				sh -= 2;
+				sh = (sh - 2) & 0x0f;
 			}
 
 			uint16 out = (~(cmp1 | cmp2) & cDst) | (cmp1 & cgaMask1) | (cmp2 & cgaMask2);
 
-			sh = 14;
+			sh = 6;
 			for (int i = 0; i < _width; i++) {
 				*dst++ = (out >> sh) & 3;
-				sh -= 2;
+				sh = (sh - 2) & 0x0f;
 			}
 
 			last = s;
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index 1b55806b8b..dc6c4b200f 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -41,6 +41,7 @@ public:
 	void clearCurDim();
 
 	void setMouseCursor(int x, int y, const byte *shape);
+	void setMouseCursor(int x, int y, const byte *shape, const uint8 *ovl);
 
 	void loadFileDataToPage(Common::SeekableReadStream *s, int pageNum, uint32 size);
 
@@ -52,12 +53,11 @@ public:
 
 	void setScreenPalette(const Palette &pal);
 
-	uint8 *encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4bitEncoding = false, const uint8 *cgaMapping = 0);
+	uint8 *encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool encode8bit = false, const uint8 *cgaMapping = 0);
 	void drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd = -1, int flags = 0, ...);
 	const uint8 *scaleShape(const uint8 *shapeData, int blockDistance);
 	const uint8 *scaleShapeStep(const uint8 *shp);
-	void replaceShapePalette(uint8 *shp, const uint8 *pal);
-	void applyShapeOverlay(uint8 *shp, int ovlIndex);
+	const uint8 *generateShapeOverlay(const uint8 *shp, int paletteOverlayIndex);
 
 	void setShapeFrame(int x1, int y1, int x2, int y2);
 	void setShapeFadeMode (uint8 i, bool b);
@@ -75,15 +75,18 @@ public:
 	void setFadeTableIndex(int index);
 	void createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, uint8 weight);
 	uint8 *getFadeTable(int index);
+	const uint16 *getCGADitheringTable(int index);
 
 private:
 	void drawShapeSetPixel(uint8 *dst, uint8 c);
-	void scaleShapeProcessLine(uint8 *&dst, const uint8 *&src);
+	void scaleShapeProcessLine2Bit(uint8 *&shpDst, const uint8 *&shpSrc, uint32 transOffsetDst, uint32 transOffsetSrc);
+	void scaleShapeProcessLine4Bit(uint8 *&dst, const uint8 *&src);
 	bool posWithinRect(int posX, int posY, int x1, int y1, int x2, int y2);
 
 	void generateCGADitheringTables(const uint8 *mappingData);
 
-	int _dsDiv, _dsRem, _dsScaleTmp;
+	int _dsDiv, _dsRem, _dsScaleTrans;
+	uint8 *_cgaScaleTable;
 	int16 _gfxX, _gfxY;
 	uint8 _gfxCol;
 	const uint8 *_gfxMaxY;
@@ -93,12 +96,13 @@ private:
 	uint16 _shapeFadeInternal;
 	uint8 *_fadeData;
 	int _fadeDataIndex;
+	uint8 _shapeOverlay[16];
 
 	uint8 *_dsTempPage;
 
 	uint16 *_cgaDitheringTables[2];
 	const uint8 *_cgaMappingDefault;
-	
+
 	uint8 *_egaColorMap;
 	uint8 *_egaPixelValueTable;
 	bool _useHiResEGADithering;
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index 195c44ea2a..aa8d18fe77 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -1099,6 +1099,7 @@ void EoBEngine::seq_xdeath() {
 	_screen->loadShapeSetBitmap("XDEATH3", 5, 3);
 	shapes2 = _screen->encodeShape(22, 0, 16, 95, true, _cgaMappingDefault);
 	_screen->loadEoBBitmap("XDEATH1", _cgaMappingDefault, 5, 3, -1);
+	_screen->convertPage(3, 2, _cgaMappingDefault);
 	_screen->setCurPage(0);
 
 	for (int i = 0; i < 10; i++) {
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 9e450a5ac7..40fc7c14e9 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -342,9 +342,9 @@ void EoBCoreEngine::drawMonsterShape(const uint8 *shape, int x, int y, int flipp
 	uint8 *ovl = 0;
 
 	if (flags & 2)
-		ovl = _monsterOvl1;
+		ovl = _monsterFlashOverlay;
 	else if (_flags.gameID == GI_EOB2 && flags & 0x20)
-		ovl = _monsterOvl2;
+		ovl = _monsterStoneOverlay;
 	else if (palIndex != -1)
 		ovl = _monsterPalettes[palIndex];
 
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 5e28757978..7a5012f117 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -198,6 +198,10 @@ const uint8 EoBCoreEngine::_charClassModifier[] = {
 	0x00, 0x00, 0x02
 };
 
+const uint8 EoBCoreEngine::_itemsOverlayCGA[] = {
+	0x00, 0x55, 0x55, 0xFF
+};
+
 const uint8 EoBCoreEngine::_teleporterShapeDefs[] = {
 	0x0C, 0x58, 0x02, 0x0E,
 	0x0C, 0x67, 0x01, 0x07,
@@ -1181,11 +1185,16 @@ void EoBEngine::initSpells() {
 	}
 }
 
-const KyraRpgGUISettings EoBEngine::_guiSettings = {
+const KyraRpgGUISettings EoBEngine::_guiSettingsVGA = {
 	{ 9, 15, 95, 9, 7, { 285, 139 }, { 189, 162 }, { 31, 31 } },
 	{ 135, 130, 132, 133, 133, 17, 23, 20, 184, 177, 180, 184, 177, 180	}
 };
 
+const KyraRpgGUISettings EoBEngine::_guiSettingsEGA = {
+	{ 9, 15, 95, 9, 7, { 285, 139 }, { 189, 162 }, { 31, 31 } },
+	{ 13, 9, 2, 133, 2, 6, 13, 8, 13, 15, 14, 13, 15, 14 }
+};
+
 const uint8 EoBEngine::_egaDefaultPalette[] = {
 	0, 5, 3, 2, 10, 14, 12, 6, 4, 11, 9, 1, 0, 8, 7, 15
 };
-- 
cgit v1.2.3


From a4223e9c2ba7d53097df95a3f640ffdba7d0fb20 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Wed, 15 Feb 2012 18:11:18 +0100
Subject: KYRA: (EOB) - fix EOB1 door clipping

(this was done in the same way as in EOB2 and LOL, but it has to be slightly different)
---
 engines/kyra/eob.cpp           |  2 +-
 engines/kyra/kyra_rpg.cpp      |  4 ++++
 engines/kyra/kyra_rpg.h        |  6 +++++-
 engines/kyra/resource.h        |  4 ++++
 engines/kyra/scene_lol.cpp     |  2 +-
 engines/kyra/scene_rpg.cpp     | 21 ++++++++++++---------
 engines/kyra/sprites_eob.cpp   |  2 +-
 engines/kyra/staticres.cpp     |  2 +-
 engines/kyra/staticres_rpg.cpp |  4 ++++
 9 files changed, 33 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eob.cpp b/engines/kyra/eob.cpp
index 769e77e63c..9e58affded 100644
--- a/engines/kyra/eob.cpp
+++ b/engines/kyra/eob.cpp
@@ -421,7 +421,7 @@ void EoBEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wal
 		d1 = x - (_doorShapes[shapeIndex + 3][2] << 2);
 		x -= (shp[2] << 2);
 		drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], d1, y, 5);
-		scaleLevelShapesDim(index, y1, y2, 5);
+		setDoorShapeDim(index, y1, y2, 5);
 		y = _dscDoorY3[mDim] - ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim] : _dscDoorScaleMult2[mDim]);
 		drawBlockObject(0, 2, shp, x, y, 5);
 		if (_wllShapeMap[wall] == -1)
diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp
index a885eb9e2d..1e3890b124 100644
--- a/engines/kyra/kyra_rpg.cpp
+++ b/engines/kyra/kyra_rpg.cpp
@@ -94,6 +94,10 @@ KyraRpgEngine::KyraRpgEngine(OSystem *system, const GameFlags &flags) : KyraEngi
 	_dscDimMap = 0;
 	_dscDoorShpIndex = 0;
 	_dscDoorY2 = 0;
+	_dscDoorFrameY1 = 0;
+	_dscDoorFrameY2 = 0;
+	_dscDoorFrameIndex1 = 0;
+	_dscDoorFrameIndex2 = 0;
 
 	_shpDmX1 = _shpDmX2 = 0;
 
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index aec34fc3c9..f4678e302a 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -183,7 +183,7 @@ protected:
 
 	virtual const uint8 *getBlockFileData(int levelIndex) = 0;
 	void setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim);
-	void scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim);
+	void setDoorShapeDim(int index, int16 &y1, int16 &y2, int dim);
 	void drawLevelModifyScreenDim(int dim, int16 x1, int16 y1, int16 x2, int16 y2);
 	void generateBlockDrawingBuffer();
 	void generateVmpTileData(int16 startBlockX, uint8 startBlockY, uint8 wllVmpIndex, int16 vmpOffset, uint8 numBlocksX, uint8 numBlocksY);
@@ -271,6 +271,10 @@ protected:
 	const uint8 *_dscDoorShpIndex;
 	int _dscDoorShpIndexSize;
 	const uint8 *_dscDoorY2;
+	const uint8 *_dscDoorFrameY1;
+	const uint8 *_dscDoorFrameY2;
+	const uint8 *_dscDoorFrameIndex1;
+	const uint8 *_dscDoorFrameIndex2;
 
 	// Script
 	virtual void runLevelScript(int block, int flags) = 0;
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 84592880e1..f2bc4e8146 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -263,6 +263,10 @@ enum KyraResources {
 	kRpgCommonDscBlockMap,
 	kRpgCommonDscDimMap,
 	kRpgCommonDscDoorY2,
+	kRpgCommonDscDoorFrameY1,
+	kRpgCommonDscDoorFrameY2,
+	kRpgCommonDscDoorFrameIndex1,
+	kRpgCommonDscDoorFrameIndex2,
 	kRpgCommonDscBlockIndex,
 
 	kEoBBaseChargenStrings1,
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index 79884718d7..628654f127 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -1436,7 +1436,7 @@ void LoLEngine::drawSceneShapes(int) {
 		if (v > 80)
 			v = 80;
 
-		scaleLevelShapesDim(t, dimY1, dimY2, _sceneShpDim);
+		setDoorShapeDim(t, dimY1, dimY2, _sceneShpDim);
 		drawDoor(_doorShapes[(s < 23 ? _dscDoorShpIndex[s] : 0)], 0, t, 10, 0, -v, 2);
 		setLevelShapesDim(t, dimY1, dimY2, _sceneShpDim);
 	}
diff --git a/engines/kyra/scene_rpg.cpp b/engines/kyra/scene_rpg.cpp
index 269a5d3461..7f6b16bfc6 100644
--- a/engines/kyra/scene_rpg.cpp
+++ b/engines/kyra/scene_rpg.cpp
@@ -51,7 +51,7 @@ void KyraRpgEngine::setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim)
 				if (t > x1) {
 					x1 = t;
 					if (!(a & 0x10))
-						scaleLevelShapesDim(index, y1, y2, -1);
+						setDoorShapeDim(index, y1, y2, -1);
 				}
 
 				t = _dscDim2[((m + i) << 1) + 1];
@@ -59,7 +59,7 @@ void KyraRpgEngine::setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim)
 				if (t < x2) {
 					x2 = t;
 					if (!(a & 0x10))
-						scaleLevelShapesDim(index, y1, y2, -1);
+						setDoorShapeDim(index, y1, y2, -1);
 				}
 			} else {
 				int t = _dscDim1[m + i];
@@ -100,17 +100,20 @@ void KyraRpgEngine::setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim)
 	drawLevelModifyScreenDim(dim, x1, 0, x2, 15);
 }
 
-void KyraRpgEngine::scaleLevelShapesDim(int index, int16 &y1, int16 &y2, int dim) {
-	static const int8 dscY1[] = { 0x1E, 0x18, 0x10, 0x00 };
-	static const int8 dscY2[] = { 0x3B, 0x47, 0x56, 0x78 };
-
+void KyraRpgEngine::setDoorShapeDim(int index, int16 &y1, int16 &y2, int dim) {
 	uint8 a = _dscDimMap[index];
 
-	if (dim == -1 && a != 3)
+	if (_flags.gameID != GI_EOB1 && dim == -1 && a != 3)
 		a++;
 
-	y1 = dscY1[a];
-	y2 = dscY2[a];
+	uint8 b = a;
+	if (_flags.gameID == GI_EOB1) {
+		a += _dscDoorFrameIndex1[_currentLevel - 1];
+		b += _dscDoorFrameIndex2[_currentLevel - 1];
+	}
+	
+	y1 = _dscDoorFrameY1[a];
+	y2 = _dscDoorFrameY2[b];
 
 	if (dim == -1)
 		return;
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 40fc7c14e9..068647aeec 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -462,7 +462,7 @@ void EoBCoreEngine::drawDoor(int index) {
 
 	int16 y1 = 0;
 	int16 y2 = 0;
-	scaleLevelShapesDim(index, y1, y2, 5);
+	setDoorShapeDim(index, y1, y2, 5);
 	drawDoorIntern(type, index, x, y, w, s, d, y1, y2);
 	drawLevelModifyScreenDim(5, _shpDmX1, 0, _shpDmX2, 15);
 }
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 2be25ce093..423b827092 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -38,7 +38,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 81
+#define RESFILE_VERSION 82
 
 namespace {
 bool checkKyraDat(Common::SeekableReadStream *file) {
diff --git a/engines/kyra/staticres_rpg.cpp b/engines/kyra/staticres_rpg.cpp
index cc75ae3442..a30cbf7d05 100644
--- a/engines/kyra/staticres_rpg.cpp
+++ b/engines/kyra/staticres_rpg.cpp
@@ -88,6 +88,10 @@ void KyraRpgEngine::initStaticResource() {
 	_dscDimMap = _staticres->loadRawData(kRpgCommonDscDimMap, temp);
 	_dscDoorShpIndex = _staticres->loadRawData(kRpgCommonDscDoorShapeIndex, _dscDoorShpIndexSize);
 	_dscDoorY2 = _staticres->loadRawData(kRpgCommonDscDoorY2, temp);
+	_dscDoorFrameY1 = _staticres->loadRawData(kRpgCommonDscDoorFrameY1, temp);
+	_dscDoorFrameY2 = _staticres->loadRawData(kRpgCommonDscDoorFrameY2, temp);
+	_dscDoorFrameIndex1 = _staticres->loadRawData(kRpgCommonDscDoorFrameIndex1, temp);
+	_dscDoorFrameIndex2 = _staticres->loadRawData(kRpgCommonDscDoorFrameIndex2, temp);
 	_moreStrings = _staticres->loadStrings(kRpgCommonMoreStrings, temp);
 }
 
-- 
cgit v1.2.3


From df9b1bd2e4f70b3d9b2ad35ce806d0da4de253fe Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 14 Feb 2012 18:31:33 +0100
Subject: KYRA: (EOB) - implement EGA graphics mode for EOB1

---
 engines/kyra/eobcommon.cpp     |   2 +-
 engines/kyra/items_eob.cpp     |   2 +-
 engines/kyra/scene_rpg.cpp     |   2 +-
 engines/kyra/screen.cpp        |  11 ++++-
 engines/kyra/screen_eob.cpp    | 110 +++++++++++++++++++++++------------------
 engines/kyra/screen_eob.h      |   1 +
 engines/kyra/sequences_eob.cpp |   4 +-
 7 files changed, 76 insertions(+), 56 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index ecac20a7f8..9bec256ec7 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -390,7 +390,7 @@ Common::Error EoBCoreEngine::init() {
 	if (!_staticres->init())
 		error("_staticres->init() failed");
 
-	if (!screen()->init())
+	if (!_screen->init(_flags.gameID == GI_EOB2 && _configRenderMode == Common::kRenderEGA))
 		error("screen()->init() failed");
 
 	if (ConfMan.hasKey("save_slot")) {
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index 5b65887d4b..0994e12e4f 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -465,7 +465,7 @@ void EoBCoreEngine::drawItemIconShape(int pageNum, Item itemId, int x, int y) {
 	const uint8 *ovl = 0;
 
 	if (applyBluePal) {
-		if (_flags.gameID == GI_EOB1) {			
+		if (_flags.gameID == GI_EOB1) {
 			ovl = (_configRenderMode == Common::kRenderCGA) ? _itemsOverlayCGA : &_itemsOverlay[icn << 4];
 		} else {
 			_screen->setFadeTableIndex(3);
diff --git a/engines/kyra/scene_rpg.cpp b/engines/kyra/scene_rpg.cpp
index 7f6b16bfc6..da7c9fdb90 100644
--- a/engines/kyra/scene_rpg.cpp
+++ b/engines/kyra/scene_rpg.cpp
@@ -111,7 +111,7 @@ void KyraRpgEngine::setDoorShapeDim(int index, int16 &y1, int16 &y2, int dim) {
 		a += _dscDoorFrameIndex1[_currentLevel - 1];
 		b += _dscDoorFrameIndex2[_currentLevel - 1];
 	}
-	
+
 	y1 = _dscDoorFrameY1[a];
 	y2 = _dscDoorFrameY2[b];
 
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index d394a86f6f..3087a8a027 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -648,6 +648,9 @@ void Screen::fadeFromBlack(int delay, const UpdateFunctor *upFunc) {
 }
 
 void Screen::fadeToBlack(int delay, const UpdateFunctor *upFunc) {
+	if (_renderMode == Common::kRenderEGA)
+		return;
+
 	Palette pal(getPalette(0).getNumColors());
 	fadePalette(pal, delay, upFunc);
 }
@@ -1038,7 +1041,9 @@ void Screen::fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum,
 		color &= 0x0F;
 		color |= (color << 4);
 	} else if (_renderMode == Common::kRenderCGA) {
-		color &= 3;
+		color &= 0x03;
+	} else if (_renderMode == Common::kRenderEGA) {
+		color &= 0x0F;
 	}
 
 	if (xored) {
@@ -1117,7 +1122,9 @@ void Screen::drawLine(bool vertical, int x, int y, int length, int color) {
 		color &= 0x0F;
 		color |= (color << 4);
 	} else if (_renderMode == Common::kRenderCGA) {
-		color &= 3;
+		color &= 0x03;
+	} else if (_renderMode == Common::kRenderEGA) {
+		color &= 0x0F;
 	}
 
 	if (vertical) {
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 8721c2cc02..51665a00b1 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -70,6 +70,10 @@ Screen_EoB::~Screen_EoB() {
 }
 
 bool Screen_EoB::init() {
+	return init(false);
+}
+
+bool Screen_EoB::init(bool useHiResEGADithering) {
 	if (Screen::init()) {
 		int temp;
 		_gfxMaxY = _vm->staticres()->loadRawData(kEoBBaseExpObjectY, temp);
@@ -91,6 +95,7 @@ bool Screen_EoB::init() {
 		_dsTempPage = new uint8[12000];
 
 		if (_renderMode == Common::kRenderEGA) {
+			_useHiResEGADithering = useHiResEGADithering;
 			_egaColorMap = new uint8[256];
 			_egaPixelValueTable = new uint8[256];
 			for (int i = 0; i < 256; i++) {
@@ -98,9 +103,6 @@ bool Screen_EoB::init() {
 				_egaPixelValueTable[i] = i & 0x0f;
 			}
 
-			if (_vm->game() == GI_EOB2)
-				_useHiResEGADithering = true;
-
 		} else if (_renderMode == Common::kRenderCGA) {
 			_cgaMappingDefault = _vm->staticres()->loadRawData(kEoB1CgaMappingDefault, temp);
 			_cgaDitheringTables[0] = new uint16[256];
@@ -346,6 +348,9 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool enco
 	uint8 *srcLineStart = getPagePtr(_curPage | 1) + y * 320 + (x << 3);
 	uint8 *src = srcLineStart;
 
+	if (_renderMode == Common::kRenderEGA && !_useHiResEGADithering)
+		encode8bit = false;
+
 	if (_renderMode == Common::kRenderCGA) {
 		if (cgaMapping)
 			generateCGADitheringTables(cgaMapping);
@@ -450,8 +455,12 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool enco
 
 	} else {
 		uint8 nib = 0, col = 0;
-		uint8 *colorMap = new uint8[0x100];
-		memset(colorMap, 0xff, 0x100);
+		uint8 *colorMap = 0;
+
+		if (_renderMode != Common::kRenderEGA) {
+			colorMap = new uint8[0x100];
+			memset(colorMap, 0xff, 0x100);
+		}
 
 		shapesize = h * (w << 2) + 20;
 		shp = new uint8[shapesize];
@@ -462,7 +471,13 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool enco
 		*dst++ = (h & 0xff);
 		*dst++ = (w & 0xff);
 		*dst++ = (h & 0xff);
-		memset(dst, 0xff, 0x10);
+
+		if (_renderMode == Common::kRenderEGA) {
+			for (int i = 0; i < 16; i++)
+				dst[i] = i;
+		} else {
+			memset(dst, 0xff, 0x10);
+		}
 
 		uint8 *pal = dst;
 		dst += 16;
@@ -473,15 +488,18 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool enco
 			uint16 w1 = w << 3;
 			while (w1--) {
 				uint8 s = *src++;
-				uint8 c = colorMap[s];
-				if (c == 0xff) {
-					if (col < 0x10) {
-						*pal++ = s;
-						c = colorMap[s] = col++;
-						if (!col)
+				uint8 c = s & 0x0f;
+				if (colorMap) {
+					c = colorMap[s];
+					if (c == 0xff) {
+						if (col < 0x10) {
+							*pal++ = s;
+							c = colorMap[s] = col++;
+							if (!col)
+								c = 0;
+						} else {
 							c = 0;
-					} else {
-						c = 0;
+						}
 					}
 				}
 
@@ -782,12 +800,9 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 					src += pixelStep;
 					shSwtch = bitShDef;
 				}
-				if (pixelsPerByte == 2) {
-					if (pal[(in >> shift) & pixelPackingMask])
-						drawShapeSetPixel(dst, pal[(in >> shift) & pixelPackingMask]);
-				} else {
-					*dst = (*dst & ((trans >> shift) & (pixelPackingMask))) | pal[(in >> shift) & pixelPackingMask];
-				}
+				uint8 col = (pixelsPerByte == 2) ? pal[(in >> shift) & pixelPackingMask] : (*dst & ((trans >> shift) & (pixelPackingMask))) | pal[(in >> shift) & pixelPackingMask];
+				if (col || pixelsPerByte == 4)
+					drawShapeSetPixel(dst, col);
 				dst++;
 				shift = (shift - (pixelStep * pixelPacking) & 7);
 			}
@@ -819,11 +834,11 @@ const uint8 *Screen_EoB::scaleShapeStep(const uint8 *shp) {
 	uint16 w2 = (w << 3) / pixelsPerByte;
 	uint16 t = ((w << 1) % 3) ? 1 : 0;
 	d[1] = ((w << 1) / 3) + t;
-	
+
 	uint32 transOffsetSrc = (pixelsPerByte == 4) ? (shp[0] * shp[1]) << 1 : 0;
 	uint32 transOffsetDst = (pixelsPerByte == 4) ? (d[0] * d[1]) << 1 : 0;
 	shp += 3;
-	d += 3;	
+	d += 3;
 
 	if (pixelsPerByte == 2) {
 		int i = 0;
@@ -1252,19 +1267,21 @@ const uint16 *Screen_EoB::getCGADitheringTable(int index) {
 }
 
 void Screen_EoB::drawShapeSetPixel(uint8 *dst, uint8 c) {
-	if (_shapeFadeMode[0]) {
-		if (_shapeFadeMode[1]) {
-			c = *dst;
-		} else {
-			_shapeFadeInternal &= 7;
-			c = *(dst + _shapeFadeInternal++);
+	if ((_renderMode != Common::kRenderCGA && _renderMode != Common::kRenderEGA) || _useHiResEGADithering) {
+		if (_shapeFadeMode[0]) {
+			if (_shapeFadeMode[1]) {
+				c = *dst;
+			} else {
+				_shapeFadeInternal &= 7;
+				c = *(dst + _shapeFadeInternal++);
+			}
 		}
-	}
 
-	if (_shapeFadeMode[1]) {
-		uint8 cnt = _shapeFadeMode[1];
-		while (cnt--)
-			c = _fadeData[_fadeDataIndex + c];
+		if (_shapeFadeMode[1]) {
+			uint8 cnt = _shapeFadeMode[1];
+			while (cnt--)
+				c = _fadeData[_fadeDataIndex + c];
+		}
 	}
 
 	*dst = c;
@@ -1485,6 +1502,11 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 	uint16 cgaMask1 = cgaColorMask[color1 & 3];
 	uint16 cgaMask2 = cgaColorMask[color2 & 3];
 
+	if (_renderMode == Common::kRenderCGA) {
+		color1 &= 0x0f;
+		color2 &= 0x0f;
+	}
+
 	int cH = _height;
 	while (cH--) {
 		int cW = w;
@@ -1525,6 +1547,7 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 			}
 
 			last = s;
+
 		} else {
 			for (bool runWidthLoop = true; runWidthLoop;) {
 				uint8 s = *src++;
@@ -1536,22 +1559,11 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 						break;
 					}
 
-					if (_renderMode == Common::kRenderCGA) {
-						uint8 in = s | last;
-						if (s & i) {
-							if (color1)
-								*dst = color1;
-						} else if (color2) {
-							*dst = color2;
-						}
-						last = s;
-					} else {
-						if (s & i) {
-							if (color1)
-								*dst = color1;
-						} else if (color2) {
-							*dst = color2;
-						}
+					if (s & i) {
+						if (color1)
+							*dst = color1;
+					} else if (color2) {
+						*dst = color2;
 					}
 					dst++;
 				}
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index dc6c4b200f..cf8f86953d 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -36,6 +36,7 @@ public:
 	virtual ~Screen_EoB();
 
 	bool init();
+	bool init(bool useHiResEGADithering);
 
 	void setClearScreenDim(int dim);
 	void clearCurDim();
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index aa8d18fe77..4a9f7d8a65 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -119,12 +119,12 @@ void EoBIntroPlayer::start() {
 	Common::SeekableReadStream *s = _vm->resource()->createReadStream("TEXT.RAW");
 	if (s) {
 		s->seek(768);
-		_screen->loadFileDataToPage(s, 6, s->size() - 768);
+		_screen->loadFileDataToPage(s, 5, s->size() - 768);
 		delete s;
 	} else {
 		_screen->loadBitmap("TEXT.CMP", 3, 5, 0);
-		_screen->convertPage(5, 6, _vm->_cgaMappingAlt);
 	}
+	_screen->convertPage(5, 6, _vm->_cgaMappingAlt);
 
 	tower();
 	orb();
-- 
cgit v1.2.3


From 930bcbf2dceebbdd7d29e3e1c478b2f7aafbf933 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 14 Feb 2012 21:38:19 +0100
Subject: KYRA: (EOB) - fix minor text displayer glitch

---
 engines/kyra/text_rpg.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text_rpg.cpp
index a78adb93d9..d0f7b5e532 100644
--- a/engines/kyra/text_rpg.cpp
+++ b/engines/kyra/text_rpg.cpp
@@ -229,7 +229,7 @@ void TextDisplayer_rpg::displayText(char *str, ...) {
 			break;
 
 		default:
-			if (_vm->game() == GI_LOL || c > 30) {
+			if (_vm->game() == GI_LOL || (unsigned char)c > 30) {
 				_lineWidth += (pc98PrintFlag ? 4 : _screen->getCharWidth((uint8)c));
 				_currentLine[_numCharsLeft++] = c;
 				_currentLine[_numCharsLeft] = 0;
@@ -282,14 +282,18 @@ void TextDisplayer_rpg::readNextPara() {
 			_tempString1 = 0;
 	}
 
-	if ((_vm->game() != GI_LOL) && (d & 0x80)) {
+	// This seems to be some sort of character conversion mechanism. The original doesn't make any use of it, however.
+	// All necessary conversions take place somewhere else. This code actually causes issues if the character conversions
+	// don't take place before calling displayText(). So we disable it for now. If some (not yet supported) localized
+	// versions depend on this code we'll have to look at this again.
+	/* if ((_vm->game() != GI_LOL) && (d & 0x80)) {
 		d &= 0x7f;
 		c = d & 7;
 		d = (d & 0x78) >> 3;
 		uint8 l = d;
 		c = _table1[(l << 3) + c];
 		d = _table2[l];
-	}
+	}*/
 
 	_ctrl[1] = d;
 	_ctrl[2] = c;
-- 
cgit v1.2.3


From 3c1e2686b8e8ad36f1cdc3bb2afebd7f9de72845 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 14 Feb 2012 23:41:21 +0100
Subject: KYRA: (EOB) - fix minor sprite drawing glitch in EOB1

(some sprites were drawn one pixel too far to the right)
---
 engines/kyra/sprites_eob.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines')

diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index 068647aeec..5c679f5cb4 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -335,6 +335,8 @@ const int16 *EoBCoreEngine::findBlockMonsters(uint16 block, int pos, int dir, in
 
 void EoBCoreEngine::drawBlockObject(int flipped, int page, const uint8 *shape, int x, int y, int sd, uint8 *ovl) {
 	const ScreenDim *d = _screen->getScreenDim(sd);
+	if (_flags.gameID == GI_EOB1)
+		x &= ~1;
 	_screen->drawShape(page, shape, x - (d->sx << 3), y - d->sy, sd, flipped | (ovl ? 2 : 0), ovl);
 }
 
-- 
cgit v1.2.3


From 66da4777d476c6a9fc2a13351e3b30afc748fd94 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 21 Feb 2012 21:14:28 +0100
Subject: KYRA: (EOB) - implement EGA mode (hi res dithering) for EOB II

(also fix various thing connected to CGA/EGA modes)
---
 engines/kyra/chargen.cpp      |  10 +-
 engines/kyra/darkmoon.cpp     |  13 +-
 engines/kyra/eob.cpp          |   2 +-
 engines/kyra/eobcommon.cpp    |   6 +-
 engines/kyra/gui_eob.cpp      |  28 +--
 engines/kyra/gui_eob.h        |   5 +-
 engines/kyra/kyra_hof.cpp     |   2 +-
 engines/kyra/kyra_lok.cpp     |   2 +-
 engines/kyra/kyra_mr.cpp      |   2 +-
 engines/kyra/kyra_rpg.cpp     |  17 +-
 engines/kyra/kyra_rpg.h       |   5 +
 engines/kyra/kyra_v1.cpp      |   9 +-
 engines/kyra/kyra_v1.h        |   2 +-
 engines/kyra/lol.cpp          |   2 +-
 engines/kyra/magic_eob.cpp    |   2 +-
 engines/kyra/saveload_eob.cpp |   2 +-
 engines/kyra/scene_eob.cpp    |  65 +++++--
 engines/kyra/scene_rpg.cpp    |  76 +++++----
 engines/kyra/screen.cpp       | 190 +++++++++++++--------
 engines/kyra/screen.h         |  24 ++-
 engines/kyra/screen_eob.cpp   | 384 +++++++++++++++++++++++++++++++-----------
 engines/kyra/screen_eob.h     |  14 +-
 22 files changed, 591 insertions(+), 271 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 23274349e7..73f5fccb92 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -1496,7 +1496,7 @@ TransferPartyWiz::~TransferPartyWiz() {
 }
 
 bool TransferPartyWiz::start() {
-	_screen->copyPage(0, 12);
+	_screen->copyPage(0, (_screen->getPageScaleFactor(0) == 2) ? 1 : 12);
 
 	if (!selectAndLoadTransferFile())
 		return false;
@@ -1536,7 +1536,7 @@ bool TransferPartyWiz::start() {
 
 bool TransferPartyWiz::selectAndLoadTransferFile() {
 	do {
-		_screen->copyPage(12, 0);
+		_screen->copyPage((_screen->getPageScaleFactor(0) == 2) ? 1 : 12, 0);
 		 if (transferFileDialogue(_vm->_savegameFilename))
 			 break;
 	} while (_vm->_gui->confirmDialogue2(15, 68, 1));
@@ -1566,7 +1566,7 @@ bool TransferPartyWiz::selectAndLoadTransferFile() {
 		return false;
 
 	Common::String target = _vm->_gui->transferTargetMenu(eobTargets);
-	_screen->copyPage(12, 0);
+	_screen->copyPage((_screen->getPageScaleFactor(0) == 2) ? 1 : 12, 0);
 
 	if (target.empty())
 		return true;
@@ -1579,10 +1579,10 @@ bool TransferPartyWiz::selectAndLoadTransferFile() {
 			return true;
 	}
 
-	_screen->copyPage(12, 0);
+	_screen->copyPage((_screen->getPageScaleFactor(0) == 2) ? 1 : 12, 0);
 
 	bool result = _vm->_gui->transferFileMenu(target, dest);
-	_screen->copyPage(12, 0);
+	_screen->copyPage((_screen->getPageScaleFactor(0) == 2) ? 1 : 12, 0);
 
 	return result;
 }
diff --git a/engines/kyra/darkmoon.cpp b/engines/kyra/darkmoon.cpp
index 918221e0dd..16bd3dad58 100644
--- a/engines/kyra/darkmoon.cpp
+++ b/engines/kyra/darkmoon.cpp
@@ -61,10 +61,11 @@ Common::Error DarkMoonEngine::init() {
 		Palette pal(16);
 		_screen->loadPalette(_egaDefaultPalette, pal, 16);
 		_screen->setScreenPalette(pal);
-	} else {
-		_screen->loadPalette("palette.col", _screen->getPalette(0));
 	}
 
+	_screen->loadPalette("PALETTE.COL", _screen->getPalette(0));
+	_screen->setScreenPalette(_screen->getPalette(0));
+
 	return Common::kNoError;
 }
 
@@ -157,7 +158,9 @@ void DarkMoonEngine::generateMonsterPalettes(const char *file, int16 monsterInde
 		int colx = 302 + 3 * i;
 
 		for (int ii = 0; ii < 16; ii++) {
-			uint8 col = _screen->getPagePixel(_screen->_curPage, colx, 184 + ii);
+			// Don't use getPagePixel() here, since in EGA mode it will try to
+			// undither the pixel (although the shape bitmap is undithered already)
+			uint8 col = _screen->getCPagePtr(_screen->_curPage | 1)[(184 + ii) * Screen::SCREEN_W + colx];
 
 			int iii = 0;
 			for (; iii < 16; iii++) {
@@ -175,7 +178,9 @@ void DarkMoonEngine::generateMonsterPalettes(const char *file, int16 monsterInde
 			memcpy(tmpPal, _monsterShapes[dci] + 4, 16);
 
 			for (int iii = 0; iii < 16; iii++) {
-				uint8 col = _screen->getPagePixel(_screen->_curPage, colx + ii, 184 + iii);
+				// Don't use getPagePixel() here, since in EGA mode it will try to
+				// undither the pixel (although the shape bitmap is undithered already)
+				uint8 col = _screen->getCPagePtr(_screen->_curPage | 1)[(184 + iii) * Screen::SCREEN_W + colx + ii];
 				if (newPal[iii])
 					tmpPal[newPal[iii]] = col;
 			}
diff --git a/engines/kyra/eob.cpp b/engines/kyra/eob.cpp
index 9e58affded..a7bde9f1ee 100644
--- a/engines/kyra/eob.cpp
+++ b/engines/kyra/eob.cpp
@@ -69,7 +69,7 @@ Common::Error EoBEngine::init() {
 		_screen->loadPalette(_egaDefaultPalette, pal, 16);
 		_screen->setScreenPalette(pal);
 	} else {
-		_screen->loadPalette("palette.col", _screen->getPalette(0));
+		_screen->loadPalette("PALETTE.COL", _screen->getPalette(0));
 	}
 
 	return Common::kNoError;
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 9bec256ec7..ff53ba8b0a 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -371,7 +371,7 @@ Common::Error EoBCoreEngine::init() {
 
 	_screen = new Screen_EoB(this, _system);
 	assert(_screen);
-	_screen->setResolution();
+	_screen->setResolution(_flags.useHiResOverlay || (_flags.gameID == GI_EOB2 && _configRenderMode == Common::kRenderEGA));
 
 	//MidiDriverType midiDriver = MidiDriver::detectDevice(MDT_PCSPK | MDT_ADLIB);
 	_sound = new SoundAdLibPC(this, _mixer);
@@ -1738,7 +1738,7 @@ void EoBCoreEngine::seq_portal() {
 bool EoBCoreEngine::checkPassword() {
 	char answ[20];
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
-	_screen->copyPage(0, 10);
+	_screen->copyPage(0, (_screen->getPageScaleFactor(0) == 2) ? 4 : 10);
 
 	_screen->setScreenDim(13);
 	gui_drawBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, guiSettings()->colors.frame1, guiSettings()->colors.frame2, -1);
@@ -1765,7 +1765,7 @@ bool EoBCoreEngine::checkPassword() {
 
 	_screen->modifyScreenDim(13, _screen->_curDim->sx - 1, _screen->_curDim->sy - 2, _screen->_curDim->w + 2, _screen->_curDim->h + 16);
 	_screen->setFont(of);
-	_screen->copyPage(10, 0);
+	_screen->copyPage((_screen->getPageScaleFactor(0) == 2) ? 4 : 10, 0);
 	return true;
 }
 
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 39cc4692c4..eadfd10d1e 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -777,11 +777,11 @@ int EoBCoreEngine::clickedCamp(Button *button) {
 	}
 
 	_screen->copyPage(0, 7);
-	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 12, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, (_screen->getPageScaleFactor(0) == 2) ? 1 : 12, Screen::CR_NO_P_CHECK);
 
 	_gui->runCampMenu();
 
-	_screen->copyRegion(0, 0, 0, 120, 176, 24, 12, 2, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(0, 0, 0, 120, 176, 24, (_screen->getPageScaleFactor(0) == 2) ? 1 : 12, 2, Screen::CR_NO_P_CHECK);
 	_screen->setScreenDim(cd);
 	drawScene(0);
 
@@ -1170,7 +1170,7 @@ int EoBCoreEngine::clickedSceneSpecial(Button *button) {
 
 int EoBCoreEngine::clickedSpellbookAbort(Button *button) {
 	_updateFlags = 0;
-	_screen->copyRegion(0, 0, 64, 121, 112, 56, 10, 0, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(0, 0, 64, 121, 112, 56, (_screen->getPageScaleFactor(0) == 2) ? 4 : 10, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
 	gui_drawCompass(true);
 	gui_toggleButtons();
@@ -1392,9 +1392,11 @@ GUI_EoB::GUI_EoB(EoBCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 
 	_charSelectRedraw = false;
 
+	_highLightColorTable = (_vm->game() == GI_EOB1 && (_vm->_configRenderMode == Common::kRenderCGA || _vm->_configRenderMode == Common::kRenderEGA)) ? _highlightColorTableEGA : _highlightColorTableVGA;
 	_updateBoxIndex = -1;
 	_highLightBoxTimer = 0;
 	_updateBoxColorIndex = 0;
+
 	_needRest = false;
 }
 
@@ -2170,7 +2172,7 @@ void GUI_EoB::runCampMenu() {
 				if (cnt > 4) {
 					_vm->dropCharacter(selectCharacterDialogue(53));
 					_vm->gui_drawPlayField(false);
-					_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 12, Screen::CR_NO_P_CHECK);
+					_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, (_screen->getPageScaleFactor(0) == 2) ? 1 : 12, Screen::CR_NO_P_CHECK);
 					_screen->setFont(Screen::FID_6_FNT);
 					_vm->gui_drawAllCharPortraitsWithStats();
 					_screen->setFont(Screen::FID_8_FNT);
@@ -2411,8 +2413,6 @@ void GUI_EoB::messageDialogue2(int dim, int id, int buttonTextCol) {
 }
 
 void GUI_EoB::updateBoxFrameHighLight(int box) {
-	static const uint8 colorTable[] = { 0x0F, 0xB0, 0xB2, 0xB4, 0xB6, 0xB8, 0xBA, 0xBC, 0x0C, 0xBC, 0xBA, 0xB8, 0xB6, 0xB4, 0xB2, 0xB0, 0x00 };
-
 	if (_updateBoxIndex == box) {
 		if (_updateBoxIndex == -1)
 			return;
@@ -2420,18 +2420,18 @@ void GUI_EoB::updateBoxFrameHighLight(int box) {
 		if (_vm->_system->getMillis() <= _highLightBoxTimer)
 			return;
 
-		if (!colorTable[_updateBoxColorIndex])
+		if (!_highLightColorTable[_updateBoxColorIndex])
 			_updateBoxColorIndex = 0;
 
-		const EoBRect16 *r = &_updateBoxFrameHighLights[_updateBoxIndex];
-		_screen->drawBox(r->x1, r->y1, r->x2, r->y2, colorTable[_updateBoxColorIndex++]);
+		const EoBRect16 *r = &_highlightFrames[_updateBoxIndex];
+		_screen->drawBox(r->x1, r->y1, r->x2, r->y2, _highLightColorTable[_updateBoxColorIndex++]);
 		_screen->updateScreen();
 
 		_highLightBoxTimer = _vm->_system->getMillis() + _vm->_tickLength;
 
 	} else {
 		if (_updateBoxIndex != -1) {
-			const EoBRect16 *r = &_updateBoxFrameHighLights[_updateBoxIndex];
+			const EoBRect16 *r = &_highlightFrames[_updateBoxIndex];
 			_screen->drawBox(r->x1, r->y1, r->x2, r->y2, 12);
 			_screen->updateScreen();
 		}
@@ -2607,7 +2607,7 @@ Common::String GUI_EoB::transferTargetMenu(Common::Array<Common::String> &target
 			break;
 	} while (_saveSlotIdTemp[slot] == -1);
 
-	_screen->copyRegion(72, 14, 72, 14, 176, 144, 12, 0, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(72, 14, 72, 14, 176, 144, (_screen->getPageScaleFactor(0) == 2) ? 7 : 12, 0, Screen::CR_NO_P_CHECK);
 	_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
 
 	return (slot < 6) ? _savegameList[_savegameOffset + slot] : Common::String();
@@ -4054,7 +4054,7 @@ void GUI_EoB::restParty_updateRestTime(int hours, bool init) {
 	_screen->setFont(of);
 }
 
-const EoBRect16 GUI_EoB::_updateBoxFrameHighLights[] = {
+const EoBRect16 GUI_EoB::_highlightFrames[] = {
 	{ 0x00B7, 0x0001, 0x00F7, 0x0034 },
 	{ 0x00FF, 0x0001, 0x013F, 0x0034 },
 	{ 0x00B7, 0x0035, 0x00F7, 0x0068 },
@@ -4077,6 +4077,10 @@ const EoBRect16 GUI_EoB::_updateBoxFrameHighLights[] = {
 	{ 0x00A3, 0x0068, 0x00C3, 0x0089 }
 };
 
+const uint8 GUI_EoB::_highlightColorTableVGA[] = { 0x0F, 0xB0, 0xB2, 0xB4, 0xB6, 0xB8, 0xBA, 0xBC, 0x0C, 0xBC, 0xBA, 0xB8, 0xB6, 0xB4, 0xB2, 0xB0, 0x00 };
+
+const uint8 GUI_EoB::_highlightColorTableEGA[] = { 0x0C, 0x0D, 0x0E, 0x0F, 0x0E, 0x0D, 0x00 };
+
 } // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/gui_eob.h b/engines/kyra/gui_eob.h
index 759ed641ce..f6be18ffbb 100644
--- a/engines/kyra/gui_eob.h
+++ b/engines/kyra/gui_eob.h
@@ -148,9 +148,12 @@ private:
 
 	int _updateBoxIndex;
 	int _updateBoxColorIndex;
+	const uint8 *_highLightColorTable;
 	uint32 _highLightBoxTimer;
 
-	static const EoBRect16 _updateBoxFrameHighLights[];
+	static const EoBRect16 _highlightFrames[];
+	static const uint8 _highlightColorTableVGA[];
+	static const uint8 _highlightColorTableEGA[];
 };
 
 }	// End of namespace Kyra
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index 0ba173d9d0..b07e3a4965 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -221,7 +221,7 @@ void KyraEngine_HoF::pauseEngineIntern(bool pause) {
 Common::Error KyraEngine_HoF::init() {
 	_screen = new Screen_HoF(this, _system);
 	assert(_screen);
-	_screen->setResolution();
+	_screen->setResolution(_flags.useHiResOverlay);
 
 	_debugger = new Debugger_HoF(this);
 	assert(_debugger);
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index d7e79575ec..e8a2c02e6e 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -172,7 +172,7 @@ Common::Error KyraEngine_LoK::init() {
 	else
 		_screen = new Screen_LoK(this, _system);
 	assert(_screen);
-	_screen->setResolution();
+	_screen->setResolution(_flags.useHiResOverlay);
 
 	_debugger = new Debugger_LoK(this);
 	assert(_debugger);
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 39ed0d038a..38f473a619 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -203,7 +203,7 @@ KyraEngine_MR::~KyraEngine_MR() {
 Common::Error KyraEngine_MR::init() {
 	_screen = new Screen_MR(this, _system);
 	assert(_screen);
-	_screen->setResolution();
+	_screen->setResolution(_flags.useHiResOverlay);
 
 	_debugger = new Debugger_v2(this);
 	assert(_debugger);
diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp
index 1e3890b124..121731e394 100644
--- a/engines/kyra/kyra_rpg.cpp
+++ b/engines/kyra/kyra_rpg.cpp
@@ -41,13 +41,17 @@ KyraRpgEngine::KyraRpgEngine(OSystem *system, const GameFlags &flags) : KyraEngi
 
 	_currentLevel = 0;
 
-	_vmpPtr = 0;
 	_vcnBlocks = 0;
 	_vcfBlocks = 0;
 	_vcnTransitionMask = 0;
 	_vcnShift = 0;
 	_vcnColTable = 0;
+	_vcnBlockWidth = 4;
+	_vcnBlockHeight = 8;
+	_vcnFlip0 = 0;
+	_vcnFlip1 = 1;
 	_vmpPtr = 0;
+	_vmpSize = 0;
 	_blockBrightness = _wllVcnOffset = 0;
 	_blockDrawingBuffer = 0;
 	_sceneWindowBuffer = 0;
@@ -167,10 +171,17 @@ Common::Error KyraRpgEngine::init() {
 	_wllWallFlags = new uint8[256];
 	memset(_wllWallFlags, 0, 256);
 
+	if (_flags.gameID == GI_EOB2 && _configRenderMode == Common::kRenderEGA) {
+		_vcnBlockWidth <<= 1;
+		_vcnBlockHeight <<= 1;
+		SWAP(_vcnFlip0, _vcnFlip1);
+	}
+
 	_blockDrawingBuffer = new uint16[1320];
 	memset(_blockDrawingBuffer, 0, 1320 * sizeof(uint16));
-	_sceneWindowBuffer = new uint8[21120];
-	memset(_sceneWindowBuffer, 0, 21120);
+	uint32 swbSize = 22 * _vcnBlockWidth * 2 * 15 * _vcnBlockHeight;
+	_sceneWindowBuffer = new uint8[swbSize];
+	memset(_sceneWindowBuffer, 0, swbSize);
 
 	_lvlShapeTop = new int16[18];
 	memset(_lvlShapeTop, 0, 18 * sizeof(int16));
diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h
index f4678e302a..50a4c9bdc1 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -222,6 +222,7 @@ protected:
 	uint16 _decorationCount;
 	int16 _mappedDecorationsCount;
 	uint16 *_vmpPtr;
+	uint16 _vmpSize;
 	uint8 *_vcnBlocks;
 	uint8 *_vcfBlocks;
 	uint8 *_vcnTransitionMask;
@@ -231,6 +232,10 @@ protected:
 	uint8 *_sceneWindowBuffer;
 	uint8 _blockBrightness;
 	uint8 _wllVcnOffset;
+	uint8 _vcnBlockWidth;
+	uint8 _vcnBlockHeight;
+	uint8 _vcnFlip0;
+	uint8 _vcnFlip1;
 
 	uint8 **_doorShapes;
 
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 0f7da7673b..7c67af2f13 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -230,7 +230,7 @@ KyraEngine_v1::~KyraEngine_v1() {
 	delete _debugger;
 }
 
-Common::Point KyraEngine_v1::getMousePos() const {
+Common::Point KyraEngine_v1::getMousePos() {
 	Common::Point mouse = _eventMan->getMousePos();
 
 	if (_flags.useHiResOverlay) {
@@ -238,6 +238,9 @@ Common::Point KyraEngine_v1::getMousePos() const {
 		mouse.y >>= 1;
 	}
 
+	mouse.x /= screen()->getPageScaleFactor(0);
+	mouse.y /= screen()->getPageScaleFactor(0);
+
 	return mouse;
 }
 
@@ -313,6 +316,8 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
 				_mouseX >>= 1;
 				_mouseY >>= 1;
 			}
+			_mouseX /= screen()->getPageScaleFactor(0);
+			_mouseY /= screen()->getPageScaleFactor(0);
 			keys = (event.type == Common::EVENT_LBUTTONDOWN ? 199 : (200 | 0x800));
 			breakLoop = true;
 			} break;
@@ -325,6 +330,8 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
 				_mouseX >>= 1;
 				_mouseY >>= 1;
 			}
+			_mouseX /= screen()->getPageScaleFactor(0);
+			_mouseY /= screen()->getPageScaleFactor(0);
 			keys = (event.type == Common::EVENT_RBUTTONDOWN ? 201 : (202 | 0x800));
 			breakLoop = true;
 			} break;
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 2c2901a753..95d58d4ab2 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -210,7 +210,7 @@ public:
 
 	// input
 	void setMousePos(int x, int y);
-	Common::Point getMousePos() const;
+	Common::Point getMousePos();
 
 	// config specific
 	bool speechEnabled();
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 38e9d33259..022a878e0a 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -364,7 +364,7 @@ GUI *LoLEngine::gui() const {
 Common::Error LoLEngine::init() {
 	_screen = new Screen_LoL(this, _system);
 	assert(_screen);
-	_screen->setResolution();
+	_screen->setResolution(_flags.useHiResOverlay);
 
 	_debugger = new Debugger_LoL(this);
 	assert(_debugger);
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index fbddd620d1..b2949ce1d5 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -60,7 +60,7 @@ void EoBCoreEngine::useMagicBookOrSymbol(int charIndex, int type) {
 	}
 
 	if (!_updateFlags)
-		_screen->copyRegion(64, 121, 0, 0, 112, 56, 0, 10, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(64, 121, 0, 0, 112, 56, 0, (_screen->getPageScaleFactor(0) == 2) ? 4 : 10, Screen::CR_NO_P_CHECK);
 	_updateFlags = 1;
 	gui_setPlayFieldButtons();
 	gui_drawSpellbook();
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 7f20c124ff..4a446aa3f3 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -298,7 +298,7 @@ Common::Error EoBCoreEngine::loadGameState(int slot) {
 		useMagicBookOrSymbol(_openBookChar, _openBookType);
 	}
 
-	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 12, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, (_screen->getPageScaleFactor(0) == 2) ? 1 : 12, Screen::CR_NO_P_CHECK);
 
 	gui_toggleButtons();
 	setHandItem(_itemInHand);
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index 5a06fe7977..3db055db90 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -144,10 +144,10 @@ Common::String EoBCoreEngine::initLevelData(int sub) {
 
 		const char *vmpPattern = (_flags.gameID == GI_EOB1 && (_configRenderMode == Common::kRenderEGA || _configRenderMode == Common::kRenderCGA)) ? "%s.EMP" : "%s.VMP";
 		Common::SeekableReadStream *s = _res->createReadStream(Common::String::format(vmpPattern, (const char *)pos));
-		uint16 size = s->readUint16LE();
+		_vmpSize = s->readUint16LE();
 		delete[] _vmpPtr;
-		_vmpPtr = new uint16[size];
-		for (int i = 0; i < size; i++)
+		_vmpPtr = new uint16[_vmpSize];
+		for (int i = 0; i < _vmpSize; i++)
 			_vmpPtr[i] = s->readUint16LE();
 		delete s;
 
@@ -185,6 +185,8 @@ Common::String EoBCoreEngine::initLevelData(int sub) {
 			_screen->getPalette(0).copy(backupPal, 224, 32, 224);
 			_screen->createFadeTable(src, _screen->getFadeTable(4), 12, 85);    // grey (shadow)
 			_screen->setFadeTableIndex(4);
+			if (_flags.gameID == GI_EOB2 && _configRenderMode == Common::kRenderEGA)
+				_screen->setScreenPalette(_screen->getPalette(0));
 		}
 	}
 
@@ -280,25 +282,64 @@ void EoBCoreEngine::loadVcnData(const char *file, const uint8 *cgaMapping) {
 	const char *filePattern = (_flags.gameID == GI_EOB1 && (_configRenderMode == Common::kRenderEGA || _configRenderMode == Common::kRenderCGA)) ? "%s.ECN" : "%s.VCN";
 	_screen->loadBitmap(Common::String::format(filePattern, _lastBlockDataFile).c_str(), 3, 3, 0);
 	const uint8 *pos = _screen->getCPagePtr(3);
-	uint32 tlen = READ_LE_UINT16(pos) << 5;
+
+	uint32 vcnSize = READ_LE_UINT16(pos) * _vcnBlockWidth * _vcnBlockHeight;
 	pos += 2;
-	if (!(_flags.gameID == GI_EOB1 && (_configRenderMode == Common::kRenderEGA || _configRenderMode == Common::kRenderCGA)))
-		memcpy(_vcnColTable, pos, 32);
+
+	const uint8 *colMap = pos;
 	pos += 32;
+
 	delete[] _vcnBlocks;
-	_vcnBlocks = new uint8[tlen];
+	_vcnBlocks = new uint8[vcnSize];
 
-	if (_configRenderMode == Common::kRenderCGA) {
+	if (_flags.gameID == GI_EOB2 && _configRenderMode == Common::kRenderEGA) {
+		const uint8 *egaTable = _screen->getEGADitheringTable();
+		assert(_vmpPtr);
+		assert(egaTable);
+
+		delete[] _vcnTransitionMask;
+		_vcnTransitionMask = new uint8[vcnSize];
+
+		for (int i = 0; i < _vmpSize; i++) {
+			uint16 vcnOffs = _vmpPtr[i] & 0x3FFF;
+			const uint8 *src = &pos[vcnOffs << 5];
+			uint8 *dst1 = &_vcnBlocks[vcnOffs << 7];
+			uint8 *dst3 = &_vcnTransitionMask[vcnOffs << 7];
+			int palOffset = (i < 330) ? 0 : _wllVcnOffset;
+
+			for (int y = 0; y < 8; y++) {
+				uint8 *dst2 = dst1 + 8;
+				uint8 *dst4 = dst3 + 8;
+
+				for (int x = 0; x < 4; x++) {
+					uint8 in = *src++;
+
+					dst1[0] = dst2[0] = egaTable[colMap[(in >> 4) + palOffset]];
+					dst1[1] = dst2[1] = egaTable[colMap[(in & 0x0f) + palOffset]];
+					dst3[0] = dst4[0] = (in & 0xf0) ? 0 : 0xff;
+					dst3[1] = dst4[1] = (in & 0x0f) ? 0 : 0xff;
+
+					dst1 += 2;
+					dst2 += 2;
+					dst3 += 2;
+					dst4 += 2;
+				}
+
+				dst1 += 8;
+				dst3 += 8;
+			}
+		}
+	} else if (_configRenderMode == Common::kRenderCGA) {
 		uint8 *tmp = _screen->encodeShape(0, 0, 1, 8, false, cgaMapping);
 		delete[] tmp;
 
 		delete[] _vcnTransitionMask;
-		_vcnTransitionMask = new uint8[tlen];
+		_vcnTransitionMask = new uint8[vcnSize];
 		uint8 tblSwitch = 0;
 		uint8 *dst = _vcnBlocks;
 		uint8 *dst2 = _vcnTransitionMask;
 
-		while (dst < _vcnBlocks + tlen) {
+		while (dst < _vcnBlocks + vcnSize) {
 			const uint16 *table = _screen->getCGADitheringTable((tblSwitch++) & 1);
 			for (int ii = 0; ii < 2; ii++) {
 				*dst++ = ((table[pos[0]] & 0x000f) << 4) | ((table[pos[0]] & 0x0f00) >> 8);
@@ -322,7 +363,9 @@ void EoBCoreEngine::loadVcnData(const char *file, const uint8 *cgaMapping) {
 			}
 		}
 	} else {
-		memcpy(_vcnBlocks, pos, tlen);
+		if (_configRenderMode != Common::kRenderEGA)
+			memcpy(_vcnColTable, colMap, 32);
+		memcpy(_vcnBlocks, pos, vcnSize);
 	}
 }
 
diff --git a/engines/kyra/scene_rpg.cpp b/engines/kyra/scene_rpg.cpp
index da7c9fdb90..b015b10cd9 100644
--- a/engines/kyra/scene_rpg.cpp
+++ b/engines/kyra/scene_rpg.cpp
@@ -348,6 +348,9 @@ bool KyraRpgEngine::checkSceneUpdateNeed(int block) {
 void KyraRpgEngine::drawVcnBlocks() {
 	uint8 *d = _sceneWindowBuffer;
 	uint16 *bdb = _blockDrawingBuffer;
+	uint16 pitch = 22 * _vcnBlockWidth * 2;
+	uint8 pxl[2];
+	pxl[0] = pxl[1] = 0;
 
 	for (int y = 0; y < 15; y++) {
 		for (int x = 0; x < 22; x++) {
@@ -371,7 +374,7 @@ void KyraRpgEngine::drawVcnBlocks() {
 
 			uint8 *src = 0;
 			if (vcnOffset) {
-				src = &_vcnBlocks[vcnOffset << 5];
+				src = &_vcnBlocks[vcnOffset * _vcnBlockWidth * _vcnBlockHeight];
 				wllVcnOffset = _wllVcnOffset;
 			} else {
 				// floor/ceiling blocks
@@ -381,36 +384,37 @@ void KyraRpgEngine::drawVcnBlocks() {
 					vcnOffset &= 0x3fff;
 				}
 
-				src = (_vcfBlocks ? _vcfBlocks : _vcnBlocks) + (vcnOffset << 5);
+				src = (_vcfBlocks ? _vcfBlocks : _vcnBlocks) + (vcnOffset * _vcnBlockWidth * _vcnBlockHeight);
 			}
 
 			uint8 shift = _vcnShift ? _vcnShift[vcnOffset] : _blockBrightness;
 
 			if (horizontalFlip) {
-				for (int blockY = 0; blockY < 8; blockY++) {
-					src += 3;
-					for (int blockX = 0; blockX < 4; blockX++) {
+				for (int blockY = 0; blockY < _vcnBlockHeight; blockY++) {
+					src += (_vcnBlockWidth - 1);
+					for (int blockX = 0; blockX < _vcnBlockWidth; blockX++) {
 						uint8 bl = *src--;
-						*d++ = _vcnColTable[((bl & 0x0f) + wllVcnOffset) | shift];
-						*d++ = _vcnColTable[((bl >> 4) + wllVcnOffset) | shift];
+						d[_vcnFlip0] = _vcnColTable[((bl & 0x0f) + wllVcnOffset) | shift];
+						d[_vcnFlip1] = _vcnColTable[((bl >> 4) + wllVcnOffset) | shift];
+						d += 2;
 					}
-					src += 5;
-					d += 168;
+					src += (_vcnBlockWidth + 1);
+					d += (pitch - 2 * _vcnBlockWidth);
 				}
 			} else {
-				for (int blockY = 0; blockY < 8; blockY++) {
-					for (int blockX = 0; blockX < 4; blockX++) {
+				for (int blockY = 0; blockY < _vcnBlockHeight; blockY++) {
+					for (int blockX = 0; blockX < _vcnBlockWidth; blockX++) {
 						uint8 bl = *src++;
 						*d++ = _vcnColTable[((bl >> 4) + wllVcnOffset) | shift];
 						*d++ = _vcnColTable[((bl & 0x0f) + wllVcnOffset) | shift];
 					}
-					d += 168;
+					d += (pitch - 2 * _vcnBlockWidth);
 				}
 			}
-			d -= 1400;
+			d -= (pitch * _vcnBlockHeight - 2 * _vcnBlockWidth);
 
 			if (vcnExtraOffsetWll) {
-				d -= 8;
+				d -= (2 * _vcnBlockWidth);
 				horizontalFlip = false;
 
 				if (vcnExtraOffsetWll & 0x4000) {
@@ -419,38 +423,38 @@ void KyraRpgEngine::drawVcnBlocks() {
 				}
 
 				shift = _vcnShift ? _vcnShift[vcnExtraOffsetWll] : _blockBrightness;
-				src = &_vcnBlocks[vcnExtraOffsetWll << 5];
-				uint8 *maskTable = _vcnTransitionMask ? &_vcnTransitionMask[vcnExtraOffsetWll << 5] : 0;
+				src = &_vcnBlocks[vcnExtraOffsetWll * _vcnBlockWidth * _vcnBlockHeight];
+				uint8 *maskTable = _vcnTransitionMask ? &_vcnTransitionMask[vcnExtraOffsetWll * _vcnBlockWidth * _vcnBlockHeight] : 0;
 
 				if (horizontalFlip) {
-					for (int blockY = 0; blockY < 8; blockY++) {
-						src += 3;
-						maskTable += 3;
-						for (int blockX = 0; blockX < 4; blockX++) {
+					for (int blockY = 0; blockY < _vcnBlockHeight; blockY++) {
+						src += (_vcnBlockWidth - 1);
+						maskTable += (_vcnBlockWidth - 1);
+						for (int blockX = 0; blockX < _vcnBlockWidth; blockX++) {
 							uint8 bl = *src--;
 							uint8 mask = _vcnTransitionMask ? *maskTable-- : 0;
-							uint8 h = _vcnColTable[((bl & 0x0f) + wllVcnRmdOffset) | shift];
-							uint8 l = _vcnColTable[((bl >> 4) + wllVcnRmdOffset) | shift];
+							pxl[_vcnFlip0] = _vcnColTable[((bl & 0x0f) + wllVcnRmdOffset) | shift];
+							pxl[_vcnFlip1] = _vcnColTable[((bl >> 4) + wllVcnRmdOffset) | shift];
 
 							if (_vcnTransitionMask)
-								*d = (*d & (mask & 0x0f)) | h;
-							else if (h)
-								*d = h;
+								*d = (*d & (mask & 0x0f)) | pxl[0];
+							else if (pxl[0])
+								*d = pxl[0];
 							d++;
 
 							if (_vcnTransitionMask)
-								*d = (*d & (mask >> 4)) | l;
-							else if (l)
-								*d = l;
+								*d = (*d & (mask >> 4)) | pxl[1];
+							else if (pxl[1])
+								*d = pxl[1];
 							d++;
 						}
-						src += 5;
-						maskTable += 5;
-						d += 168;
+						src += (_vcnBlockWidth + 1);
+						maskTable += (_vcnBlockWidth + 1);
+						d += (pitch - 2 * _vcnBlockWidth);
 					}
 				} else {
-					for (int blockY = 0; blockY < 8; blockY++) {
-						for (int blockX = 0; blockX < 4; blockX++) {
+					for (int blockY = 0; blockY < _vcnBlockHeight; blockY++) {
+						for (int blockX = 0; blockX < _vcnBlockWidth; blockX++) {
 							uint8 bl = *src++;
 							uint8 mask = _vcnTransitionMask ? *maskTable++ : 0;
 							uint8 h = _vcnColTable[((bl >> 4) + wllVcnRmdOffset) | shift];
@@ -468,13 +472,13 @@ void KyraRpgEngine::drawVcnBlocks() {
 								*d = l;
 							d++;
 						}
-						d += 168;
+						d += (pitch - 2 * _vcnBlockWidth);
 					}
 				}
-				d -= 1400;
+				d -= (pitch * _vcnBlockHeight - 2 * _vcnBlockWidth);
 			}
 		}
-		d += 1232;
+		d += (pitch * (_vcnBlockHeight - 1));
 	}
 
 	screen()->copyBlockToPage(_sceneDrawPage1, _sceneXoffset, 0, 176, 120, _sceneWindowBuffer);
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 3087a8a027..ef6333b350 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -39,7 +39,7 @@ namespace Kyra {
 
 Screen::Screen(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, const int dimTableSize)
 	: _system(system), _vm(vm), _sjisInvisibleColor(0), _dimTable(dimTable), _dimTableCount(dimTableSize),
-	_cursorColorKey((vm->game() == GI_KYRA1) ? 0xFF : 0x00) {
+	_cursorColorKey((vm->game() == GI_KYRA1 || vm->game() == GI_EOB1 || vm->game() == GI_EOB2) ? 0xFF : 0) {
 	_debugEnabled = false;
 	_maskMinY = _maskMaxY = -1;
 
@@ -50,8 +50,14 @@ Screen::Screen(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, co
 
 	memset(_fonts, 0, sizeof(_fonts));
 
+	memset(_pagePtrs, 0, sizeof(_pagePtrs));
+	// Set scale factor to 1 (no scaling) for all pages
+	memset(_pageScaleFactor, 1, sizeof(_pageScaleFactor));
+	// In VGA mode the odd and even page pointers point to the same buffers.
+	for (int i = 0; i < SCREEN_PAGE_NUM; i++)
+		_pageMapping[i] = i & ~1;
+
 	_renderMode = Common::kRenderDefault;
-	_cgaDrawCharDitheringTable = 0;
 
 	_currentFont = FID_8_FNT;
 	_paletteChanged = true;
@@ -92,6 +98,12 @@ bool Screen::init() {
 	if (ConfMan.hasKey("render_mode"))
 		_renderMode = Common::parseRenderMode(ConfMan.get("render_mode"));
 
+	// CGA and EGA modes use additional pages to do the CGA/EGA specific graphics conversions.
+	if (_renderMode == Common::kRenderCGA || _renderMode == Common::kRenderEGA) {
+		for (int i = 0; i < 8; i++)
+			_pageMapping[i] = i;
+	}
+
 	memset(_fonts, 0, sizeof(_fonts));
 
 	if (_vm->gameFlags().useHiResOverlay) {
@@ -119,25 +131,28 @@ bool Screen::init() {
 
 	_curPage = 0;
 
-	int numPages = SCREEN_PAGE_NUM / 2;
-	// CGA and EGA modes use additional pages to do the CGA/EGA specific graphics conversions.
-	if (_renderMode == Common::kRenderEGA || _renderMode == Common::kRenderCGA)
-		numPages += 4;
-
-	uint8 *pagePtr = new uint8[numPages * SCREEN_PAGE_SIZE];
-	memset(pagePtr, 0, numPages * SCREEN_PAGE_SIZE);
-
-	if (_renderMode == Common::kRenderEGA || _renderMode == Common::kRenderCGA) {
-		// Unlike VGA mode the odd and even page numbers do not always point to the same buffers.
-		// Instead, the odd pages are used for CGA/EGA specific graphics conversions.
-		int pageNum = 0;
-		for (; pageNum < 8; pageNum++)
-			_pagePtrs[pageNum] = pagePtr + pageNum * SCREEN_PAGE_SIZE;
-		for (; pageNum < SCREEN_PAGE_NUM; pageNum += 2)
-			_pagePtrs[pageNum] = _pagePtrs[pageNum + 1] = pagePtr + (pageNum / 2) * SCREEN_PAGE_SIZE;
-	} else {
-		for (int pageNum = 0; pageNum < SCREEN_PAGE_NUM; pageNum += 2)
-			_pagePtrs[pageNum] = _pagePtrs[pageNum + 1] = pagePtr + (pageNum / 2) * SCREEN_PAGE_SIZE;
+	Common::Array<uint8> realPages;
+	for (int i = 0; i < SCREEN_PAGE_NUM; i++) {
+		if (Common::find(realPages.begin(), realPages.end(), _pageMapping[i]) == realPages.end())
+			realPages.push_back(_pageMapping[i]);
+	}
+
+	int numPages = realPages.size();
+	uint32 bufferSize = 0;
+	for (int i = 0; i < numPages; i++)
+		bufferSize += (SCREEN_PAGE_SIZE * _pageScaleFactor[realPages[i]] * _pageScaleFactor[realPages[i]]);
+
+	uint8 *pagePtr = new uint8[bufferSize];
+	memset(pagePtr, 0, bufferSize);
+
+	memset(_pagePtrs, 0, sizeof(_pagePtrs));
+	for (int i = 0; i < SCREEN_PAGE_NUM; i++) {
+		if (_pagePtrs[_pageMapping[i]]) {
+			_pagePtrs[i] = _pagePtrs[_pageMapping[i]];
+		} else {
+			_pagePtrs[i] = pagePtr;
+			pagePtr += (SCREEN_PAGE_SIZE * _pageScaleFactor[i] * _pageScaleFactor[i]);
+		}
 	}
 
 	memset(_shapePages, 0, sizeof(_shapePages));
@@ -211,7 +226,7 @@ bool Screen::enableScreenDebug(bool enable) {
 
 	if (_debugEnabled != enable) {
 		_debugEnabled = enable;
-		setResolution();
+		setResolution(_vm->gameFlags().useHiResOverlay);
 		_forceFullUpdate = true;
 		updateScreen();
 	}
@@ -219,14 +234,14 @@ bool Screen::enableScreenDebug(bool enable) {
 	return temp;
 }
 
-void Screen::setResolution() {
+void Screen::setResolution(bool hiRes) {
 	byte palette[3*256];
 	_system->getPaletteManager()->grabPalette(palette, 0, 256);
 
 	int width = 320, height = 200;
 	bool defaultTo1xScaler = false;
 
-	if (_vm->gameFlags().useHiResOverlay) {
+	if (hiRes) {
 		defaultTo1xScaler = true;
 		height = 400;
 
@@ -261,7 +276,7 @@ void Screen::updateScreen() {
 		needRealUpdate = true;
 
 		if (!_useOverlays)
-			_system->copyRectToScreen(getPagePtr(2), SCREEN_W, 320, 0, SCREEN_W, SCREEN_H);
+			_system->copyRectToScreen(getPagePtr(2), SCREEN_W, 320, 0, SCREEN_W * _pageScaleFactor[2], SCREEN_H * _pageScaleFactor[2]);
 		else
 			_system->copyRectToScreen(getPagePtr(2), SCREEN_W, 640, 0, SCREEN_W, SCREEN_H);
 	}
@@ -272,12 +287,12 @@ void Screen::updateScreen() {
 
 void Screen::updateDirtyRects() {
 	if (_forceFullUpdate) {
-		_system->copyRectToScreen(getCPagePtr(0), SCREEN_W, 0, 0, SCREEN_W, SCREEN_H);
+		_system->copyRectToScreen(getCPagePtr(0), SCREEN_W * _pageScaleFactor[0], 0, 0, SCREEN_W * _pageScaleFactor[0], SCREEN_H * _pageScaleFactor[0]);
 	} else {
 		const byte *page0 = getCPagePtr(0);
 		Common::List<Common::Rect>::iterator it;
 		for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
-			_system->copyRectToScreen(page0 + it->top * SCREEN_W + it->left, SCREEN_W, it->left, it->top, it->width(), it->height());
+			_system->copyRectToScreen(page0 + it->top * SCREEN_W * _pageScaleFactor[0] + it->left, SCREEN_W * _pageScaleFactor[0], it->left, it->top, it->width(), it->height());
 		}
 	}
 	_forceFullUpdate = false;
@@ -451,6 +466,11 @@ const uint8 *Screen::getCPagePtr(int pageNum) const {
 	return _pagePtrs[pageNum];
 }
 
+int Screen::getPageScaleFactor(int pageNum) {
+	assert(pageNum < SCREEN_PAGE_NUM);
+	return _pageScaleFactor[pageNum];
+}
+
 uint8 *Screen::getPageRect(int pageNum, int x, int y, int w, int h) {
 	assert(pageNum < SCREEN_PAGE_NUM);
 	if (pageNum == 0 || pageNum == 1)
@@ -462,7 +482,7 @@ void Screen::clearPage(int pageNum) {
 	assert(pageNum < SCREEN_PAGE_NUM);
 	if (pageNum == 0 || pageNum == 1)
 		_forceFullUpdate = true;
-	memset(getPagePtr(pageNum), 0, SCREEN_PAGE_SIZE);
+	memset(getPagePtr(pageNum), 0, SCREEN_PAGE_SIZE * _pageScaleFactor[_curPage] * _pageScaleFactor[_curPage]);
 	clearOverlayPage(pageNum);
 }
 
@@ -476,7 +496,7 @@ int Screen::setCurPage(int pageNum) {
 void Screen::clearCurPage() {
 	if (_curPage == 0 || _curPage == 1)
 		_forceFullUpdate = true;
-	memset(getPagePtr(_curPage), 0, SCREEN_PAGE_SIZE);
+	memset(getPagePtr(_curPage), 0, SCREEN_PAGE_SIZE * _pageScaleFactor[_curPage] * _pageScaleFactor[_curPage]);
 	clearOverlayPage(_curPage);
 }
 
@@ -632,12 +652,17 @@ uint8 Screen::getPagePixel(int pageNum, int x, int y) {
 void Screen::setPagePixel(int pageNum, int x, int y, uint8 color) {
 	assert(pageNum < SCREEN_PAGE_NUM);
 	assert(x >= 0 && x < SCREEN_W && y >= 0 && y < SCREEN_H);
+
 	if (pageNum == 0 || pageNum == 1)
 		addDirtyRect(x, y, 1, 1);
 
 	if (_use16ColorMode) {
 		color &= 0x0F;
 		color |= (color << 4);
+	} else if (_renderMode == Common::kRenderCGA) {
+		color &= 0x03;
+	} else if (_renderMode == Common::kRenderEGA) {
+		color &= 0x0F;
 	}
 
 	_pagePtrs[pageNum][y * SCREEN_W + x] = color;
@@ -845,16 +870,26 @@ void Screen::copyToPage0(int y, int h, uint8 page, uint8 *seqBuf) {
 }
 
 void Screen::copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage, int flags) {
+	// Since we don't (need to) do any actual scaling, we check for compatible pages here
+	assert(_pageScaleFactor[srcPage] == _pageScaleFactor[dstPage]);
+
+	x1 *= _pageScaleFactor[srcPage];
+	y1 *= _pageScaleFactor[srcPage];
+	x2 *= _pageScaleFactor[dstPage];
+	y2 *= _pageScaleFactor[dstPage];
+	w *= _pageScaleFactor[srcPage];
+	h *= _pageScaleFactor[srcPage];
+
 	if (x2 < 0) {
 		if (x2  <= -w)
 			return;
 		w += x2;
 		x1 -= x2;
 		x2 = 0;
-	} else if (x2 + w >= SCREEN_W) {
-		if (x2 > SCREEN_W)
+	} else if (x2 + w >= SCREEN_W * _pageScaleFactor[dstPage]) {
+		if (x2 > SCREEN_W * _pageScaleFactor[dstPage])
 			return;
-		w = SCREEN_W - x2;
+		w = SCREEN_W * _pageScaleFactor[srcPage] - x2;
 	}
 
 	if (y2 < 0) {
@@ -863,14 +898,14 @@ void Screen::copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPag
 		h += y2;
 		y1 -= y2;
 		y2 = 0;
-	} else if (y2 + h >= SCREEN_H) {
-		if (y2 > SCREEN_H)
+	} else if (y2 + h >= SCREEN_H * _pageScaleFactor[dstPage]) {
+		if (y2 > SCREEN_H * _pageScaleFactor[dstPage])
 			return;
-		h = SCREEN_H - y2;
+		h = SCREEN_H * _pageScaleFactor[srcPage] - y2;
 	}
 
-	const uint8 *src = getPagePtr(srcPage) + y1 * SCREEN_W + x1;
-	uint8 *dst = getPagePtr(dstPage) + y2 * SCREEN_W + x2;
+	const uint8 *src = getPagePtr(srcPage) + y1 * SCREEN_W * _pageScaleFactor[srcPage] + x1;
+	uint8 *dst = getPagePtr(dstPage) + y2 * SCREEN_W * _pageScaleFactor[dstPage] + x2;
 
 	if (src == dst)
 		return;
@@ -883,8 +918,8 @@ void Screen::copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPag
 	if (flags & CR_NO_P_CHECK) {
 		while (h--) {
 			memmove(dst, src, w);
-			src += SCREEN_W;
-			dst += SCREEN_W;
+			src += SCREEN_W * _pageScaleFactor[srcPage];
+			dst += SCREEN_W * _pageScaleFactor[dstPage];
 		}
 	} else {
 		while (h--) {
@@ -892,19 +927,24 @@ void Screen::copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPag
 				if (src[i])
 					dst[i] = src[i];
 			}
-			src += SCREEN_W;
-			dst += SCREEN_W;
+			src += SCREEN_W * _pageScaleFactor[srcPage];
+			dst += SCREEN_W * _pageScaleFactor[dstPage];
 		}
 	}
 }
 
 void Screen::copyRegionToBuffer(int pageNum, int x, int y, int w, int h, uint8 *dest) {
+	x *= _pageScaleFactor[pageNum];
+	y *= _pageScaleFactor[pageNum];
+	w *= _pageScaleFactor[pageNum];
+	h *= _pageScaleFactor[pageNum];
+
 	if (y < 0) {
 		dest += (-y) * w;
 		h += y;
 		y = 0;
 	} else if (y + h > SCREEN_H) {
-		h = SCREEN_H - y;
+		h = SCREEN_H * _pageScaleFactor[pageNum] - y;
 	}
 
 	if (x < 0) {
@@ -912,7 +952,7 @@ void Screen::copyRegionToBuffer(int pageNum, int x, int y, int w, int h, uint8 *
 		w += x;
 		x = 0;
 	} else if (x + w > SCREEN_W) {
-		w = SCREEN_W - x;
+		w = SCREEN_W * _pageScaleFactor[pageNum] - x;
 	}
 
 	if (w < 0 || h < 0)
@@ -921,14 +961,17 @@ void Screen::copyRegionToBuffer(int pageNum, int x, int y, int w, int h, uint8 *
 	uint8 *pagePtr = getPagePtr(pageNum);
 
 	for (int i = y; i < y + h; ++i)
-		memcpy(dest + (i - y) * w, pagePtr + i * SCREEN_W + x, w);
+		memcpy(dest + (i - y) * w, pagePtr + i * SCREEN_W * _pageScaleFactor[pageNum] + x, w);
 }
 
 void Screen::copyPage(uint8 srcPage, uint8 dstPage) {
+	// Since we don't (need to) do any actual scaling, we check for compatible pages here
+	assert(_pageScaleFactor[srcPage] == _pageScaleFactor[dstPage]);
+
 	uint8 *src = getPagePtr(srcPage);
 	uint8 *dst = getPagePtr(dstPage);
 	if (src != dst)
-		memcpy(dst, src, SCREEN_W * SCREEN_H);
+		memcpy(dst, src, SCREEN_W * _pageScaleFactor[srcPage] * SCREEN_H * _pageScaleFactor[srcPage]);
 	copyOverlayRegion(0, 0, 0, 0, SCREEN_W, SCREEN_H, srcPage, dstPage);
 
 	if (dstPage == 0 || dstPage == 1)
@@ -955,7 +998,12 @@ void Screen::copyBlockToPage(int pageNum, int x, int y, int w, int h, const uint
 	if (w < 0 || h < 0)
 		return;
 
-	uint8 *dst = getPagePtr(pageNum) + y * SCREEN_W + x;
+	x *= _pageScaleFactor[pageNum];
+	y *= _pageScaleFactor[pageNum];
+	w *= _pageScaleFactor[pageNum];
+	h *= _pageScaleFactor[pageNum];
+
+	uint8 *dst = getPagePtr(pageNum) + y * SCREEN_W * _pageScaleFactor[pageNum] + x;
 
 	if (pageNum == 0 || pageNum == 1)
 		addDirtyRect(x, y, w, h);
@@ -964,7 +1012,7 @@ void Screen::copyBlockToPage(int pageNum, int x, int y, int w, int h, const uint
 
 	while (h--) {
 		memcpy(dst, src, w);
-		dst += SCREEN_W;
+		dst += SCREEN_W * _pageScaleFactor[pageNum];
 		src += w;
 	}
 }
@@ -1132,7 +1180,7 @@ void Screen::drawLine(bool vertical, int x, int y, int length, int color) {
 		int currLine = 0;
 		while (currLine < length) {
 			*ptr = color;
-			ptr += SCREEN_W;
+			ptr += SCREEN_W * _pageScaleFactor[_curPage];
 			currLine++;
 		}
 	} else {
@@ -1178,7 +1226,7 @@ bool Screen::loadFont(FontId fontId, const char *filename) {
 			fnt = new AMIGAFont();
 #ifdef ENABLE_EOB
 		else if (_vm->game() == GI_EOB1 || _vm->game() == GI_EOB2)
-			fnt = new OldDOSFont(_renderMode, _cgaDrawCharDitheringTable);
+			fnt = new OldDOSFont(_renderMode, (_vm->game() == GI_EOB2) && (_renderMode == Common::kRenderEGA));
 #endif // ENABLE_EOB
 		else
 			fnt = new DOSFont();
@@ -1265,12 +1313,12 @@ void Screen::printText(const char *str, int x, int y, uint8 color1, uint8 color2
 			break;
 		} else if (c == '\r') {
 			x = x_start;
-			y += charHeightFnt + _charOffset;
+			y += (charHeightFnt + _charOffset);
 		} else {
 			int charWidth = getCharWidth(c);
 			if (x + charWidth > SCREEN_W) {
 				x = x_start;
-				y += charHeightFnt + _charOffset;
+				y += (charHeightFnt + _charOffset);
 				if (y >= SCREEN_H)
 					break;
 			}
@@ -1307,6 +1355,9 @@ void Screen::drawChar(uint16 c, int x, int y) {
 	if (x + charWidth > SCREEN_W || y + charHeight > SCREEN_H)
 		return;
 
+	x *= _pageScaleFactor[_curPage];
+	y *= _pageScaleFactor[_curPage];
+
 	if (useOverlay) {
 		uint8 *destPage = getOverlayPtr(_curPage);
 		if (!destPage) {
@@ -1318,11 +1369,11 @@ void Screen::drawChar(uint16 c, int x, int y) {
 
 		fnt->drawChar(c, destPage, 640);
 	} else {
-		fnt->drawChar(c, getPagePtr(_curPage) + y * SCREEN_W + x, SCREEN_W);
+		fnt->drawChar(c, getPagePtr(_curPage) + y * SCREEN_W * _pageScaleFactor[_curPage] + x, SCREEN_W * _pageScaleFactor[_curPage]);
 	}
 
 	if (_curPage == 0 || _curPage == 1)
-		addDirtyRect(x, y, charWidth, charHeight);
+		addDirtyRect(x, y, charWidth * _pageScaleFactor[_curPage], charHeight * _pageScaleFactor[_curPage]);
 }
 
 void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd, int flags, ...) {
@@ -3084,16 +3135,11 @@ bool Screen::loadPalette(const char *filename, Palette &pal) {
 		numCols = stream->size() / Palette::kPC98BytesPerColor;
 		pal.loadPC98Palette(*stream, 0, MIN(maxCols, numCols));
 	} else if (_renderMode == Common::kRenderEGA) {
-		// EOB II checks the number of palette bytes to distinguish between real EGA palettes
-		// and normal palettes (which are used to generate a color map).
-		if (stream->size() == 16) {
-			numCols = 16;
-			pal.loadEGAPalette(*stream, 0, 16);
-		} else {
-			numCols = stream->size() / Palette::kVGABytesPerColor;
-			pal.loadVGAPalette(*stream, 0, numCols);
-		}
-
+		numCols = stream->size();
+		// There aren't any 16 color EGA palette files. So this shouldn't ever get triggered.
+		assert (numCols != 16);
+		numCols /= Palette::kVGABytesPerColor;
+		pal.loadVGAPalette(*stream, 0, numCols);
 	} else {
 		numCols = stream->size() / Palette::kVGABytesPerColor;
 		pal.loadVGAPalette(*stream, 0, MIN(maxCols, numCols));
@@ -3163,7 +3209,7 @@ void Screen::addDirtyRect(int x, int y, int w, int h) {
 	Common::Rect r(x, y, x + w, y + h);
 
 	// Clip rectangle
-	r.clip(SCREEN_W, SCREEN_H);
+	r.clip(SCREEN_W * _pageScaleFactor[0], SCREEN_H * _pageScaleFactor[0]);
 
 	// If it is empty after clipping, we are done
 	if (r.isEmpty())
@@ -3270,6 +3316,8 @@ void Screen::crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int s
 	if (srcPage > 13 || dstPage > 13)
 		error("Screen::crossFadeRegion(): attempting to use temp page as source or dest page.");
 
+	assert(_pageScaleFactor[srcPage] == _pageScaleFactor[dstPage]);
+
 	hideMouse();
 
 	uint16 *wB = (uint16 *)_pagePtrs[14];
@@ -3287,23 +3335,19 @@ void Screen::crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int s
 	for (int i = 0; i < h; i++)
 		SWAP(hB[_vm->_rnd.getRandomNumberRng(0, h - 1)], hB[i]);
 
-	uint8 *s = _pagePtrs[srcPage];
-	uint8 *d = _pagePtrs[dstPage];
-
 	for (int i = 0; i < h; i++) {
 		int iH = i;
 		uint32 end = _system->getMillis() + 3;
 		for (int ii = 0; ii < w; ii++) {
-			int sX = x1 + wB[ii];
-			int sY = y1 + hB[iH];
-			int dX = x2 + wB[ii];
-			int dY = y2 + hB[iH];
+			int sX = (x1 + wB[ii]);
+			int sY = (y1 + hB[iH]);
+			int dX = (x2 + wB[ii]);
+			int dY = (y2 + hB[iH]);
 
 			if (++iH >= h)
 				iH = 0;
 
-			d[dY * 320 + dX] = s[sY * 320 + sX];
-			addDirtyRect(dX, dY, 1, 1);
+			setPagePixel(dstPage, dX, dY, getPagePixel(srcPage, sX, sY));
 		}
 
 		// This tries to speed things up, to get similiar speeds as in DOSBox etc.
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index fcb5ef2be4..18c0aa90f7 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -145,7 +145,7 @@ private:
  */
 class OldDOSFont : public Font {
 public:
-	OldDOSFont(Common::RenderMode mode, const uint16 *cgaDitheringTable);
+	OldDOSFont(Common::RenderMode mode, bool useHiResEGADithering);
 	~OldDOSFont();
 
 	bool load(Common::SeekableReadStream &file);
@@ -167,7 +167,10 @@ private:
 	int _numGlyphs;
 
 	Common::RenderMode _renderMode;
-	const uint16 *_cgaDitheringTable;
+	bool _useHiResEGADithering;
+
+	static uint16 *_cgaDitheringTable;
+	static int _numRef;
 };
 #endif // ENABLE_EOB
 
@@ -395,7 +398,7 @@ public:
 
 	// init
 	virtual bool init();
-	virtual void setResolution();
+	virtual void setResolution(bool hiRes = false);
 
 	void updateScreen();
 
@@ -422,14 +425,16 @@ public:
 	void copyBlockToPage(int pageNum, int x, int y, int w, int h, const uint8 *src);
 
 	void shuffleScreen(int sx, int sy, int w, int h, int srcPage, int dstPage, int ticks, bool transparent);
-	void fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum = -1, bool xored = false);
+	virtual void fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum = -1, bool xored = false);
 
 	void clearPage(int pageNum);
 
-	uint8 getPagePixel(int pageNum, int x, int y);
-	void setPagePixel(int pageNum, int x, int y, uint8 color);
+	virtual uint8 getPagePixel(int pageNum, int x, int y);
+	virtual void setPagePixel(int pageNum, int x, int y, uint8 color);
 
 	const uint8 *getCPagePtr(int pageNum) const;
+	int getPageScaleFactor(int pageNum);
+
 	uint8 *getPageRect(int pageNum, int x, int y, int w, int h);
 
 	// palette handling
@@ -453,7 +458,7 @@ public:
 	void copyPalette(const int dst, const int src);
 
 	// gui specific (processing on _curPage)
-	void drawLine(bool vertical, int x, int y, int length, int color);
+	virtual void drawLine(bool vertical, int x, int y, int length, int color);
 	void drawClippedLine(int x1, int y1, int x2, int y2, int color);
 	virtual void drawShadedBox(int x1, int y1, int x2, int y2, int color1, int color2);
 	void drawBox(int x1, int y1, int x2, int y2, int color);
@@ -468,7 +473,7 @@ public:
 	int getCharWidth(uint16 c) const;
 	int getTextWidth(const char *str) const;
 
-	void printText(const char *str, int x, int y, uint8 color1, uint8 color2);
+	virtual void printText(const char *str, int x, int y, uint8 color1, uint8 color2);
 
 	virtual void setTextColorMap(const uint8 *cmap) = 0;
 	void setTextColor(const uint8 *cmap, int a, int b);
@@ -569,13 +574,14 @@ protected:
 
 	uint8 *_pagePtrs[16];
 	uint8 *_sjisOverlayPtrs[SCREEN_OVLS_NUM];
+	uint8 _pageScaleFactor[SCREEN_PAGE_NUM];
+	uint8 _pageMapping[SCREEN_PAGE_NUM];
 
 	bool _useOverlays;
 	bool _useSJIS;
 	bool _use16ColorMode;
 	bool _isAmiga;
 	Common::RenderMode _renderMode;
-	uint16 *_cgaDrawCharDitheringTable;
 
 	uint8 _sjisInvisibleColor;
 
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 51665a00b1..38521d757c 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -51,7 +51,7 @@ Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system,
 	_dsScaleTrans = 0;
 	_cgaScaleTable = 0;
 	_gfxMaxY = 0;
-	_egaColorMap = 0;
+	_egaDitheringTable = 0;
 	_egaPixelValueTable = 0;
 	_cgaMappingDefault = 0;
 	_cgaDitheringTables[0] = _cgaDitheringTables[1] = 0;
@@ -62,11 +62,10 @@ Screen_EoB::~Screen_EoB() {
 	delete[] _fadeData;
 	delete[] _dsTempPage;
 	delete[] _cgaScaleTable;
-	delete[] _egaColorMap;
+	delete[] _egaDitheringTable;
 	delete[] _egaPixelValueTable;
 	delete[] _cgaDitheringTables[0];
 	delete[] _cgaDitheringTables[1];
-	delete[] _cgaDrawCharDitheringTable;
 }
 
 bool Screen_EoB::init() {
@@ -74,6 +73,12 @@ bool Screen_EoB::init() {
 }
 
 bool Screen_EoB::init(bool useHiResEGADithering) {
+	// Define hi-res pages for EGA mode in EOB II
+	if (useHiResEGADithering) {
+		for (int i = 0; i < 8; i++)
+			_pageScaleFactor[i] = 2;
+	}
+
 	if (Screen::init()) {
 		int temp;
 		_gfxMaxY = _vm->staticres()->loadRawData(kEoBBaseExpObjectY, temp);
@@ -96,10 +101,10 @@ bool Screen_EoB::init(bool useHiResEGADithering) {
 
 		if (_renderMode == Common::kRenderEGA) {
 			_useHiResEGADithering = useHiResEGADithering;
-			_egaColorMap = new uint8[256];
+			_egaDitheringTable = new uint8[256];
 			_egaPixelValueTable = new uint8[256];
 			for (int i = 0; i < 256; i++) {
-				_egaColorMap[i] = i & 0x0f;
+				_egaDitheringTable[i] = i & 0x0f;
 				_egaPixelValueTable[i] = i & 0x0f;
 			}
 
@@ -110,12 +115,6 @@ bool Screen_EoB::init(bool useHiResEGADithering) {
 			_cgaDitheringTables[1] = new uint16[256];
 			memset(_cgaDitheringTables[1], 0, 256 * sizeof(uint16));
 
-			_cgaDrawCharDitheringTable = new uint16[256];
-			memset(_cgaDrawCharDitheringTable, 0, 256 * sizeof(uint16));
-			static const uint bits[] = { 0, 3, 12, 15 };
-			for (int i = 0; i < 256; i++)
-				_cgaDrawCharDitheringTable[i] = (bits[i & 3] << 8) | (bits[(i >> 2) & 3] << 12) | (bits[(i >> 4) & 3] << 0) | (bits[(i >> 6) & 3] << 4);
-
 			_cgaScaleTable = new uint8[256];
 			memset(_cgaScaleTable, 0, 256 * sizeof(uint8));
 			for (int i = 0; i < 256; i++)
@@ -143,13 +142,19 @@ void Screen_EoB::setMouseCursor(int x, int y, const byte *shape) {
 void Screen_EoB::setMouseCursor(int x, int y, const byte *shape, const uint8 *ovl) {
 	if (!shape)
 		return;
-	int mouseW = shape[2] << 3;
-	int mouseH = shape[3];
-	uint8 *cursor = new uint8[mouseW * mouseH];
-	fillRect(0, 0, mouseW, mouseH, _cursorColorKey, 8);
-	drawShape(8, shape, 0, 0, 0, 2, ovl);
+
+	int mouseW = (shape[2] << 3);
+	int mouseH = (shape[3]);
+	int colorKey = (_renderMode == Common::kRenderCGA) ? 0 : _cursorColorKey;
+
+	uint8 *cursor = new uint8[mouseW * _pageScaleFactor[6] * mouseH * _pageScaleFactor[6]];
+	// We use memset and copyBlockToPage instead of fillRect to make sure that the
+	// color key 0xFF doesn't get converted into EGA color
+	memset (cursor, colorKey, mouseW * _pageScaleFactor[6] * mouseH * _pageScaleFactor[6]);
+	copyBlockToPage(6, 0, 0, mouseW, mouseH, cursor);
+	drawShape(6, shape, 0, 0, 0, 2, ovl);
 	CursorMan.showMouse(false);
-	copyRegionToBuffer(8, 0, 0, mouseW, mouseH, cursor);
+	copyRegionToBuffer(6, 0, 0, mouseW, mouseH, cursor);
 
 	// Mouse cursor post processing for CGA mode. Unlike the original (which uses drawShape for the mouse cursor)
 	// the cursor manager cannot know whether a pixel value of 0 is supposed to be black or transparent. Thus, we
@@ -174,7 +179,7 @@ void Screen_EoB::setMouseCursor(int x, int y, const byte *shape, const uint8 *ov
 		}
 	}
 
-	CursorMan.replaceCursor(cursor, mouseW, mouseH, x, y, _cursorColorKey);
+	CursorMan.replaceCursor(cursor, mouseW * _pageScaleFactor[6], mouseH * _pageScaleFactor[6], x, y, colorKey);
 	if (isMouseVisible())
 		CursorMan.showMouse(true);
 	delete[] cursor;
@@ -190,6 +195,19 @@ void Screen_EoB::loadFileDataToPage(Common::SeekableReadStream *s, int pageNum,
 	s->read(_pagePtrs[pageNum], size);
 }
 
+void Screen_EoB::printText(const char *str, int x, int y, uint8 color1, uint8 color2) {
+	if (_useHiResEGADithering) {
+		// This is sort of an abuse of the text color map. But since EOB doesn't use it anyway
+		// and the font drawing code needs access to both the original color values and the
+		// EGA dithering colors we pass them on like this.
+		uint8 cmap[2];
+		cmap[0] = _egaDitheringTable[color2];
+		cmap[1] = _egaDitheringTable[color1];
+		setTextColor(cmap, 2, 3);
+	}
+	Screen::printText(str, x, y, color1, color2);
+}
+
 void Screen_EoB::printShadedText(const char *string, int x, int y, int col1, int col2) {
 	printText(string, x - 1, y, 12, col2);
 	printText(string, x, y + 1, 12, 0);
@@ -256,87 +274,153 @@ void Screen_EoB::convertPage(int srcPage, int dstPage, const uint8 *cgaMapping)
 	if (_renderMode == Common::kRenderCGA) {
 		if (cgaMapping)
 			generateCGADitheringTables(cgaMapping);
+
 		uint16 *d = (uint16*)dst;
 		uint8 tblSwitch = 0;
 		for (int height = SCREEN_H; height; height--) {
 			const uint16 *table = _cgaDitheringTables[(tblSwitch++) & 1];
 			for (int width = SCREEN_W / 2; width; width--) {
-				*d++ = table[((src[1] & 0x0f) << 4) | (src[0] & 0x0f)];
+				WRITE_LE_UINT16(d++, table[((src[1] & 0x0f) << 4) | (src[0] & 0x0f)]);
 				src += 2;
 			}
 		}
 
-		if (dstPage == 0 || dstPage == 1)
-			_forceFullUpdate = true;
+	} else if (_useHiResEGADithering) {
+		for (int height = SCREEN_H; height; height--) {
+			uint8 *dst2 = dst + SCREEN_W * 2;
+			for (int width = SCREEN_W; width; width--) {
+				uint8 in = _egaDitheringTable[*src++];
+				*dst++ = *dst2++ = in >> 4;
+				*dst++ = *dst2++ = in & 0x0f;
+			}
+			dst += (SCREEN_W * 2);
+		}
 
 	} else if (_renderMode == Common::kRenderEGA) {
 		uint32 len = SCREEN_W * SCREEN_H;
-		if (_useHiResEGADithering) {
-			while (len--) {
-				uint8 col = _egaColorMap[*src++] & 0x0f;
-				*dst++ = col;
+		while (len--)
+			*dst++ = *src++ & 0x0f;
+
+	} else {
+		copyPage(srcPage, dstPage);
+	}
 
-				/*for (int i = 4; i; i--) {
-					uint8 col = _egaColorMap[*src++];
+	if (dstPage == 0 || dstPage == 1)
+		_forceFullUpdate = true;
+}
 
-				}*/
-			}
-		} else {
-			while (len--)
-				*dst++ = *src++ & 0x0f;
+void Screen_EoB::fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum, bool xored) {
+	if (!_useHiResEGADithering) {
+		Screen::fillRect(x1, y1, x2, y2, color, pageNum, xored);
+		return;
+	}
+
+	assert(x2 < SCREEN_W && y2 < SCREEN_H);
+	if (pageNum == -1)
+		pageNum = _curPage;
+
+	uint16 pitch = (SCREEN_W - (x2 - x1 + 1)) * _pageScaleFactor[pageNum];
+	uint8 col1 = (_egaDitheringTable[color] >> 4);
+	uint8 col2 = (_egaDitheringTable[color] & 0x0f);
+
+	x1 *= _pageScaleFactor[pageNum];
+	y1 *= _pageScaleFactor[pageNum];
+	x2 *= _pageScaleFactor[pageNum];
+	y2 *= _pageScaleFactor[pageNum];
+	uint16 w = x2 - x1 + _pageScaleFactor[pageNum];
+	uint16 h = y2 - y1 + _pageScaleFactor[pageNum];
+
+	uint8 *dst = getPagePtr(pageNum) + y1 * SCREEN_W * _pageScaleFactor[pageNum] + x1;
+	if (pageNum == 0 || pageNum == 1)
+		addDirtyRect(x1, y1, w, h);
+
+	while (h--) {
+		for (uint16 w1 = w; w1; w1 -= 2) {
+			*dst++ = col1;
+			*dst++ = col2;
 		}
+		dst += pitch;
+	}
+}
 
-		if (dstPage == 0 || dstPage == 1)
-			_forceFullUpdate = true;
+void Screen_EoB::drawLine(bool vertical, int x, int y, int length, int color) {
+	if (!_useHiResEGADithering) {
+		Screen::drawLine(vertical, x, y, length, color);
+		return;
+	}
+
+	uint16 pitch = (SCREEN_W - 1) * _pageScaleFactor[_curPage];
+	uint8 col1 = (_egaDitheringTable[color] >> 4);
+	uint8 col2 = (_egaDitheringTable[color] & 0x0f);
+
+	x *= _pageScaleFactor[_curPage];
+	y *= _pageScaleFactor[_curPage];
+	length *= _pageScaleFactor[_curPage];
+	uint8 *ptr = getPagePtr(_curPage) + y * SCREEN_W * _pageScaleFactor[_curPage] + x;
+	uint8 *ptr2 = ptr + SCREEN_W * _pageScaleFactor[_curPage];
+
+	if (vertical) {
+		assert((y + length) <= SCREEN_H * _pageScaleFactor[_curPage]);
+		int currLine = 0;
+		while (currLine < length) {
+			*ptr++ = col1;
+			*ptr++ = col2;
+			ptr += pitch;
+			currLine++;
+		}
 	} else {
-		copyPage(srcPage, dstPage);
+		assert((x + length) <= SCREEN_W * _pageScaleFactor[_curPage]);
+		int currLine = 0;
+		while (currLine < length) {
+			*ptr++ = *ptr2++ = col1;
+			*ptr++ = *ptr2++ = col2;
+			currLine += 2;
+		}
 	}
+
+	if (_curPage == 0 || _curPage == 1)
+		addDirtyRect(x, y, (vertical) ? _pageScaleFactor[_curPage] : length, (vertical) ? length : _pageScaleFactor[_curPage]);
 }
 
-void Screen_EoB::setScreenPalette(const Palette &pal) {
-	if (_renderMode == Common::kRenderEGA && _egaColorMap && pal.getNumColors() != 16) {
-		const uint8 *src = pal.getData();
-		uint8 *dst = _egaColorMap;
-
-		for (int i = 256; i; i--) {
-			uint8 r = *src++;
-			uint8 g = *src++;
-			uint8 b = *src++;
-
-			uint8 col = 0;
-			uint16 min = 11907;
-
-			for (int ii = 256; ii; ii--) {
-				const uint8 *palEntry = _egaMatchTable + (ii - 1) * 3;
-				if (*palEntry == 0xff)
-					continue;
-
-				int e_r = palEntry[0];
-				e_r -= r;
-				int e_g = palEntry[1];
-				e_g -= g;
-				int e_b = palEntry[2];
-				e_b -= b;
-
-				int s = (e_r * e_r) + (e_g * e_g) + (e_b * e_b);
-
-				if (s < min) {
-					min = s;
-					col = ii - 1;
-				}
-			}
-			*dst++ = col;
-		}
+uint8 Screen_EoB::getPagePixel(int pageNum, int x, int y) {
+	if (!_useHiResEGADithering)
+		return Screen::getPagePixel(pageNum, x, y);
 
-		memset(_egaPixelValueTable, 0, 256);
-		for (int i = 0; i < 256; i++)
-			_egaPixelValueTable[_egaColorMap[i]] = i;
+	x *= _pageScaleFactor[_curPage];
+	y *= _pageScaleFactor[_curPage];
+	uint8 *pos = &_pagePtrs[pageNum][y * SCREEN_W * _pageScaleFactor[_curPage] + x];
 
-	} else if (_renderMode == Common::kRenderEGA) {
+	return _egaPixelValueTable[(pos[0] << 4) | (pos[1] & 0x0f)];
+}
+
+void Screen_EoB::setPagePixel(int pageNum, int x, int y, uint8 color) {
+	if (!_useHiResEGADithering) {
+		Screen::setPagePixel(pageNum, x, y, color);
+		return;
+	}
+
+	assert(pageNum < SCREEN_PAGE_NUM);
+	assert(x >= 0 && x < SCREEN_W && y >= 0 && y < SCREEN_H);
+
+	x *= _pageScaleFactor[_curPage];
+	y *= _pageScaleFactor[_curPage];
+
+	if (pageNum == 0 || pageNum == 1)
+		addDirtyRect(x, y, _pageScaleFactor[pageNum], _pageScaleFactor[pageNum]);
+
+	uint8 *pos = &_pagePtrs[pageNum][y * SCREEN_W * _pageScaleFactor[_curPage] + x];
+	uint8 *pos2 = pos + SCREEN_W * _pageScaleFactor[_curPage];
+	pos[0] = pos2[0] = _egaDitheringTable[color] >> 4;
+	pos[1] = pos2[1] = _egaDitheringTable[color] & 0x0f;
+}
+
+void Screen_EoB::setScreenPalette(const Palette &pal) {
+	if (_useHiResEGADithering && pal.getNumColors() != 16) {
+		generateEGADitheringTable(pal);
+	} else if (_renderMode == Common::kRenderEGA && pal.getNumColors() == 16) {
 		_screenPalette->copy(pal);
 		_system->getPaletteManager()->setPalette(_screenPalette->getData(), 0, _screenPalette->getNumColors());
-
-	} else if (_renderMode != Common::kRenderCGA) {
+	} else if (_renderMode != Common::kRenderCGA && _renderMode != Common::kRenderEGA) {
 		Screen::setScreenPalette(pal);
 	}
 }
@@ -457,7 +541,7 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool enco
 		uint8 nib = 0, col = 0;
 		uint8 *colorMap = 0;
 
-		if (_renderMode != Common::kRenderEGA) {
+		if (_renderMode != Common::kRenderEGA || _useHiResEGADithering) {
 			colorMap = new uint8[0x100];
 			memset(colorMap, 0xff, 0x100);
 		}
@@ -472,7 +556,7 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool enco
 		*dst++ = (w & 0xff);
 		*dst++ = (h & 0xff);
 
-		if (_renderMode == Common::kRenderEGA) {
+		if (_renderMode == Common::kRenderEGA && !_useHiResEGADithering) {
 			for (int i = 0; i < 16; i++)
 				dst[i] = i;
 		} else {
@@ -536,7 +620,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 		y += _dsY1;
 	}
 
-	dst += (_dsX1 << 3);
+	dst += (_dsX1 << 3) * _pageScaleFactor[pageNum];
 	int16 dX = x - (_dsX1 << 3);
 	int16 dY = y;
 	int16 dW = _dsX2 - _dsX1;
@@ -608,11 +692,11 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 			marginRight = w2 - marginLeft - width;
 		}
 
-		dst += (dY * 320 + dX);
+		dst += (dY * SCREEN_W * _pageScaleFactor[pageNum] * _pageScaleFactor[pageNum] + dX * _pageScaleFactor[pageNum]);
 		uint8 *dstL = dst;
 
 		if (pageNum == 0 || pageNum == 1)
-			addDirtyRect(rX, rY, rW, rH);
+			addDirtyRect(rX * _pageScaleFactor[pageNum], rY * _pageScaleFactor[pageNum], rW * _pageScaleFactor[pageNum], rH * _pageScaleFactor[pageNum]);
 
 		while (dH--) {
 			int16 xpos = (int16) marginLeft;
@@ -647,7 +731,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 				} while (xpos > 0);
 			}
 
-			dst -= xpos;
+			dst -= (xpos * _pageScaleFactor[pageNum]);
 			xpos += width;
 
 			while (xpos > 0) {
@@ -656,11 +740,12 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 				src += pixelStep;
 
 				if (m) {
-					drawShapeSetPixel(dst++, c);
+					drawShapeSetPixel(dst, c, SCREEN_W * _pageScaleFactor[pageNum]);
+					dst += _pageScaleFactor[pageNum];
 					xpos--;
 				} else {
 					uint8 len = (flags & 1) ? src[1] : src[0];
-					dst += len;
+					dst += (len * _pageScaleFactor[pageNum]);
 					xpos -= len;
 					src += pixelStep;
 				}
@@ -686,7 +771,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 				} while (xpos > 0);
 			}
 
-			dstL += 320;
+			dstL += SCREEN_W * _pageScaleFactor[pageNum] * _pageScaleFactor[pageNum];
 			dst = dstL;
 			if (flags & 1)
 				src = src2 + 1;
@@ -754,12 +839,12 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 		if (d < width)
 			width = d;
 
-		dst += (dY * 320 + dX);
+		dst += (dY * _pageScaleFactor[pageNum] * SCREEN_W * _pageScaleFactor[pageNum] + dX * _pageScaleFactor[pageNum]);
 
 		if (pageNum == 0 || pageNum == 1)
-			addDirtyRect(rX, rY, rW, rH);
+			addDirtyRect(rX * _pageScaleFactor[pageNum], rY * _pageScaleFactor[pageNum], rW * _pageScaleFactor[pageNum], rH * _pageScaleFactor[pageNum]);
 
-		int pitch = 320 - width;
+		int pitch = SCREEN_W * _pageScaleFactor[pageNum] * _pageScaleFactor[pageNum] - width * _pageScaleFactor[pageNum];
 		int16 lineSrcStep = (w2 - width) / pixelsPerByte;
 		uint8 lineSrcStepRemainder = (w2 - width) % pixelsPerByte;
 
@@ -802,9 +887,9 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 				}
 				uint8 col = (pixelsPerByte == 2) ? pal[(in >> shift) & pixelPackingMask] : (*dst & ((trans >> shift) & (pixelPackingMask))) | pal[(in >> shift) & pixelPackingMask];
 				if (col || pixelsPerByte == 4)
-					drawShapeSetPixel(dst, col);
-				dst++;
-				shift = (shift - (pixelStep * pixelPacking) & 7);
+					drawShapeSetPixel(dst, col, SCREEN_W * _pageScaleFactor[pageNum]);
+				dst += _pageScaleFactor[pageNum];
+				shift = ((shift - (pixelStep * pixelPacking)) & 7);
 			}
 			src += lineSrcStep;
 			dst += pitch;
@@ -1266,25 +1351,36 @@ const uint16 *Screen_EoB::getCGADitheringTable(int index) {
 	return !(index & ~1) ? _cgaDitheringTables[index] : 0;
 }
 
-void Screen_EoB::drawShapeSetPixel(uint8 *dst, uint8 c) {
+const uint8 *Screen_EoB::getEGADitheringTable() {
+	return _egaDitheringTable;
+}
+
+void Screen_EoB::drawShapeSetPixel(uint8 *dst, uint8 col, uint16 pitch) {
 	if ((_renderMode != Common::kRenderCGA && _renderMode != Common::kRenderEGA) || _useHiResEGADithering) {
 		if (_shapeFadeMode[0]) {
 			if (_shapeFadeMode[1]) {
-				c = *dst;
+				col = _useHiResEGADithering ? _egaPixelValueTable[(dst[0] << 4) | (dst[1] & 0x0f)] : *dst;
 			} else {
 				_shapeFadeInternal &= 7;
-				c = *(dst + _shapeFadeInternal++);
+				 col = _useHiResEGADithering ? _egaPixelValueTable[(dst[_shapeFadeInternal] << 4) | (dst[_shapeFadeInternal + 1] & 0x0f)] : dst[_shapeFadeInternal];
+				_shapeFadeInternal++;
 			}
 		}
 
 		if (_shapeFadeMode[1]) {
 			uint8 cnt = _shapeFadeMode[1];
 			while (cnt--)
-				c = _fadeData[_fadeDataIndex + c];
+				col = _fadeData[_fadeDataIndex + col];
 		}
 	}
 
-	*dst = c;
+	if (_useHiResEGADithering) {
+		col = _egaDitheringTable[col];
+		dst[0] = dst[pitch] = col >> 4;
+		dst[1] = dst[pitch + 1] = col & 0x0f;
+	} else {
+		*dst = col;
+	}
 }
 
 void Screen_EoB::scaleShapeProcessLine2Bit(uint8 *&shpDst, const uint8 *&shpSrc, uint32 transOffsetDst, uint32 transOffsetSrc) {
@@ -1340,6 +1436,43 @@ bool Screen_EoB::posWithinRect(int posX, int posY, int x1, int y1, int x2, int y
 	return true;
 }
 
+void Screen_EoB::generateEGADitheringTable(const Palette &pal) {
+	assert(_egaDitheringTable);
+	const uint8 *src = pal.getData();
+	uint8 *dst = _egaDitheringTable;
+
+	for (int i = 256; i; i--) {
+		int r = *src++;
+		int g = *src++;
+		int b = *src++;
+
+		uint8 col = 0;
+		uint16 min = 0x2E83;
+
+		for (int ii = 256; ii; ii--) {
+			const uint8 *palEntry = _egaMatchTable + (ii - 1) * 3;
+			if (*palEntry == 0xff)
+				continue;
+
+			int e_r = palEntry[0] - r;
+			int e_g = palEntry[1] - g;
+			int e_b = palEntry[2] - b;
+
+			uint16 s = (e_r * e_r) + (e_g * e_g) + (e_b * e_b);
+
+			if (s <= min) {
+				min = s;
+				col = ii - 1;
+			}
+		}
+		*dst++ = col;
+	}
+
+	memset(_egaPixelValueTable, 0, 256);
+	for (int i = 0; i < 256; i++)
+		_egaPixelValueTable[_egaDitheringTable[i]] = i;
+}
+
 void Screen_EoB::generateCGADitheringTables(const uint8 *mappingData) {
 	for (int i = 0; i < 256; i++) {
 		_cgaDitheringTables[0][i] = (mappingData[(i >> 4) + 16] << 8) | mappingData[i & 0x0f];
@@ -1398,14 +1531,34 @@ const uint8 Screen_EoB::_egaMatchTable[] = {
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x3F, 0x3F
 };
 
-OldDOSFont::OldDOSFont(Common::RenderMode mode, const uint16 *cgaDitheringTable) : _renderMode(mode), _cgaDitheringTable(cgaDitheringTable) {
+uint16 *OldDOSFont::_cgaDitheringTable = 0;
+int OldDOSFont::_numRef = 0;
+
+OldDOSFont::OldDOSFont(Common::RenderMode mode, bool useHiResEGADithering) : _renderMode(mode), _useHiResEGADithering(useHiResEGADithering) {
 	_data = 0;
 	_width = _height = _numGlyphs = 0;
 	_bitmapOffsets = 0;
+
+	_numRef++;
+	if (!_cgaDitheringTable && _numRef == 1) {
+		_cgaDitheringTable = new uint16[256];
+		memset(_cgaDitheringTable, 0, 256 * sizeof(uint16));
+		static const uint bits[] = { 0, 3, 12, 15 };
+		for (int i = 0; i < 256; i++)
+			_cgaDitheringTable[i] = (bits[i & 3] << 8) | (bits[(i >> 2) & 3] << 12) | (bits[(i >> 4) & 3] << 0) | (bits[(i >> 6) & 3] << 4);
+	}
 }
 
 OldDOSFont::~OldDOSFont() {
 	unload();
+
+	if (_numRef)
+		--_numRef;
+
+	if (_cgaDitheringTable && !_numRef) {
+		delete[] _cgaDitheringTable;
+		_cgaDitheringTable = 0;
+	}
 }
 
 bool OldDOSFont::load(Common::SeekableReadStream &file) {
@@ -1491,18 +1644,27 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 	}
 
 	const uint8 *src = &_data[_bitmapOffsets[c]];
+	uint8 *dst2 = dst + pitch;
 
 	int w = (_width - 1) >> 3;
 	pitch -= _width;
 
+	if (_useHiResEGADithering)
+		pitch *= 2;
+
 	uint8 color1 = _colorMap[1];
 	uint8 color2 = _colorMap[0];
 
+	uint8 colEGA11 = _colorMap[3] >> 4;
+	uint8 colEGA12 = _colorMap[3] & 0x0f;
+	uint8 colEGA21 = _colorMap[2] >> 4;
+	uint8 colEGA22 = _colorMap[2] & 0x0f;
+
 	static const uint16 cgaColorMask[] = { 0, 0x5555, 0xAAAA, 0xFFFF };
 	uint16 cgaMask1 = cgaColorMask[color1 & 3];
 	uint16 cgaMask2 = cgaColorMask[color2 & 3];
 
-	if (_renderMode == Common::kRenderCGA) {
+	if (_renderMode == Common::kRenderCGA || (_renderMode == Common::kRenderEGA && !_useHiResEGADithering)) {
 		color1 &= 0x0f;
 		color2 &= 0x0f;
 	}
@@ -1559,13 +1721,27 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 						break;
 					}
 
-					if (s & i) {
-						if (color1)
-							*dst = color1;
-					} else if (color2) {
-						*dst = color2;
+					if (_useHiResEGADithering) {
+						if (s & i) {
+							if (color1) {
+								dst[0] = dst2[0] = colEGA11;
+								dst[1] = dst2[1] = colEGA12;
+							}
+						} else if (color2) {
+							dst[0] = dst2[0] = colEGA21;
+							dst[1] = dst2[1] = colEGA22;
+						}
+						dst += 2;
+						dst2 += 2;
+					} else {
+						if (s & i) {
+							if (color1)
+								*dst = color1;
+						} else if (color2) {
+							*dst = color2;
+						}
+						dst++;
 					}
-					dst++;
 				}
 
 				if (cW)
@@ -1574,7 +1750,9 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 					runWidthLoop = false;
 			}
 		}
+
 		dst += pitch;
+		dst2 += pitch;
 	}
 }
 
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index cf8f86953d..2bcfbd8f60 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -46,12 +46,19 @@ public:
 
 	void loadFileDataToPage(Common::SeekableReadStream *s, int pageNum, uint32 size);
 
+	void printText(const char *str, int x, int y, uint8 color1, uint8 color2);
 	void printShadedText(const char *string, int x, int y, int col1, int col2);
+
 	void loadEoBBitmap(const char *file, const uint8 *cgaMapping, int tempPage, int destPage, int convertToPage);
 	void loadShapeSetBitmap(const char *file, int tempPage, int destPage);
 
 	void convertPage(int srcPage, int dstPage, const uint8 *cgaMapping);
 
+	void fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum = -1, bool xored = false);
+	void drawLine(bool vertical, int x, int y, int length, int color);
+	uint8 getPagePixel(int pageNum, int x, int y);
+	void setPagePixel(int pageNum, int x, int y, uint8 color);
+
 	void setScreenPalette(const Palette &pal);
 
 	uint8 *encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool encode8bit = false, const uint8 *cgaMapping = 0);
@@ -76,14 +83,17 @@ public:
 	void setFadeTableIndex(int index);
 	void createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, uint8 weight);
 	uint8 *getFadeTable(int index);
+
 	const uint16 *getCGADitheringTable(int index);
+	const uint8 *getEGADitheringTable();
 
 private:
-	void drawShapeSetPixel(uint8 *dst, uint8 c);
+	void drawShapeSetPixel(uint8 *dst, uint8 col, uint16 pitch);
 	void scaleShapeProcessLine2Bit(uint8 *&shpDst, const uint8 *&shpSrc, uint32 transOffsetDst, uint32 transOffsetSrc);
 	void scaleShapeProcessLine4Bit(uint8 *&dst, const uint8 *&src);
 	bool posWithinRect(int posX, int posY, int x1, int y1, int x2, int y2);
 
+	void generateEGADitheringTable(const Palette &pal);
 	void generateCGADitheringTables(const uint8 *mappingData);
 
 	int _dsDiv, _dsRem, _dsScaleTrans;
@@ -104,7 +114,7 @@ private:
 	uint16 *_cgaDitheringTables[2];
 	const uint8 *_cgaMappingDefault;
 
-	uint8 *_egaColorMap;
+	uint8 *_egaDitheringTable;
 	uint8 *_egaPixelValueTable;
 	bool _useHiResEGADithering;
 
-- 
cgit v1.2.3


From 7986f1709d77a84df92ba86ecf04a0cb1e88e0cf Mon Sep 17 00:00:00 2001
From: athrxx
Date: Tue, 21 Feb 2012 21:17:51 +0100
Subject: KYRA: (EOB) - make detection entries for EOB I more unique (bug
 #3488973)

This makes sure that non English versions don't get detected as English.
---
 engines/kyra/detection_tables.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index 4d84b09ff5..44e604c44d 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -1463,7 +1463,7 @@ const KYRAGameDescription adGameDescs[] = {
 			"eob",
 			0,
 			{
-				{ "EOBDATA2.PAK", 0, "feaf0345086b3a1d931352f4b0ad8feb", -1 },
+				{ "EOBDATA3.PAK", 0, "61aff543131bd61a8b7d7dc901a8278b", -1 },
 				{ 0, 0, 0, 0 }
 			},
 			Common::EN_ANY,
@@ -1479,7 +1479,7 @@ const KYRAGameDescription adGameDescs[] = {
 			"eob",
 			0,
 			{
-				{ "SHINDIA.CPS", 0, "383b0c7ba0903eae5d04cad28ce90aaf", -1 },
+				{ "TEXT.DAT", 0, "fb59b50f97fd1806756911d986b9b2b5", -1 },
 				{ 0, 0, 0, 0 }
 			},
 			Common::DE_DEU,
-- 
cgit v1.2.3


From aa26d5def4265d496c03ef81fb2aa128020b08d4 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Tue, 21 Feb 2012 22:30:29 +0000
Subject: ENGINES: Add error handling for GMM Gamestate Load/Save Usage.

As indicated by wjp, the Global Main Menu (GMM) did not check or report
on the returned error state from saveGameState() and loadGameState() usage.
This corrects this and adds a MessageDialog report of any failure.
---
 engines/dialogs.cpp | 19 ++++++++++++-------
 engines/engine.cpp  | 16 ++++++++++------
 2 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'engines')

diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index 435576e9e4..1b54c7e26a 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -227,19 +227,24 @@ void MainMenuDialog::save() {
 		Common::String result(_saveDialog->getResultString());
 		if (result.empty()) {
 			// If the user was lazy and entered no save name, come up with a default name.
-			Common::String buf;
 			#if defined(USE_SAVEGAME_TIMESTAMP)
 			TimeDate curTime;
 			g_system->getTimeAndDate(curTime);
 			curTime.tm_year += 1900; // fixup year
 			curTime.tm_mon++; // fixup month
-			buf = Common::String::format("%04d.%02d.%02d / %02d:%02d:%02d", curTime.tm_year, curTime.tm_mon, curTime.tm_mday, curTime.tm_hour, curTime.tm_min, curTime.tm_sec);
+			result = Common::String::format("%04d.%02d.%02d / %02d:%02d:%02d", curTime.tm_year, curTime.tm_mon, curTime.tm_mday, curTime.tm_hour, curTime.tm_min, curTime.tm_sec);
 			#else
-			buf = Common::String::format("Save %d", slot + 1);
+			result = Common::String::format("Save %d", slot + 1);
 			#endif
-			_engine->saveGameState(slot, buf);
-		} else {
-			_engine->saveGameState(slot, result);
+		}
+
+		Common::Error status = _engine->saveGameState(slot, result);
+		if (status.getCode() != Common::kNoError) {
+			Common::String failMessage = Common::String::format(_("Gamestate save failed (%s)! "
+				  "Please consult the README for basic information, and for "
+				  "instructions on how to obtain further assistance."), status.getDesc().c_str());
+			GUI::MessageDialog dialog(failMessage);
+			dialog.runModal();			
 		}
 
 		close();
@@ -256,7 +261,7 @@ void MainMenuDialog::load() {
 
 	_engine->setGameToLoadSlot(slot);
 
-	if (slot >= 0)		
+	if (slot >= 0)
 		close();
 }
 
diff --git a/engines/engine.cpp b/engines/engine.cpp
index 4811ba6917..2ef4ecab60 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -420,12 +420,16 @@ void Engine::openMainMenuDialog() {
 	// (not from inside the menu loop to avoid
 	// mouse cursor glitches and simliar bugs,
 	// e.g. #2822778).
-	// FIXME: For now we just ignore the return
-	// value, which is quite bad since it could
-	// be a fatal loading error, which renders
-	// the engine unusable.
-	if (_saveSlotToLoad >= 0)
-		loadGameState(_saveSlotToLoad);
+	if (_saveSlotToLoad >= 0) {
+		Common::Error status = loadGameState(_saveSlotToLoad);
+		if (status.getCode() != Common::kNoError) {
+			Common::String failMessage = Common::String::format(_("Gamestate load failed (%s)! "
+				  "Please consult the README for basic information, and for "
+				  "instructions on how to obtain further assistance."), status.getDesc().c_str());
+			GUI::MessageDialog dialog(failMessage);
+			dialog.runModal();
+		}
+	}
 
 	syncSoundSettings();
 }
-- 
cgit v1.2.3


From 4202d45fce31db586991e9afb3aaca82baa4404b Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 22 Feb 2012 16:30:39 +0100
Subject: CGE: Avoid including advancedDetector.h from cge.h

---
 engines/cge/cge.cpp    | 1 +
 engines/cge/cge.h      | 3 ++-
 engines/cge/events.cpp | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 34e7d3f2f9..875ac34cd0 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -28,6 +28,7 @@
 #include "common/EventRecorder.h"
 #include "common/file.h"
 #include "common/fs.h"
+#include "engines/advancedDetector.h"
 #include "engines/util.h"
 #include "cge/cge.h"
 #include "cge/vga13h.h"
diff --git a/engines/cge/cge.h b/engines/cge/cge.h
index d324b293fa..4ebc836ee0 100644
--- a/engines/cge/cge.h
+++ b/engines/cge/cge.h
@@ -31,11 +31,12 @@
 #include "engines/engine.h"
 #include "gui/debugger.h"
 #include "graphics/surface.h"
-#include "engines/advancedDetector.h"
 #include "cge/console.h"
 #include "cge/bitmap.h"
 #include "cge/sound.h"
 
+struct ADGameDescription;
+
 namespace CGE {
 
 class Console;
diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp
index 7c98f00b7b..3c561c5659 100644
--- a/engines/cge/events.cpp
+++ b/engines/cge/events.cpp
@@ -30,6 +30,7 @@
 #include "gui/message.h"
 #include "common/config-manager.h"
 #include "common/events.h"
+#include "engines/advancedDetector.h"
 #include "cge/events.h"
 #include "cge/events.h"
 #include "cge/text.h"
-- 
cgit v1.2.3


From 37216ab3814f68d45df1f02fd8765e58b4a1b9df Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 22 Feb 2012 18:21:57 +0100
Subject: DREAMWEB: Avoid including advancedDetector.h from dreamweb.h

---
 engines/dreamweb/detection.cpp      | 10 ++++++++++
 engines/dreamweb/detection_tables.h |  4 ++++
 engines/dreamweb/dreamweb.cpp       | 14 +++++---------
 engines/dreamweb/dreamweb.h         |  8 ++------
 4 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index b891c2a3ea..9d3797db03 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -25,6 +25,8 @@
 #include "common/algorithm.h"
 #include "common/system.h"
 
+#include "engines/advancedDetector.h"
+
 #include "graphics/thumbnail.h"
 
 #include "dreamweb/dreamweb.h"
@@ -215,4 +217,12 @@ bool DreamWebEngine::canSaveGameStateCurrently() {
 	return false;
 }
 
+Common::Language DreamWebEngine::getLanguage() const {
+	return _gameDescription->desc.language;
+}
+
+bool DreamWebEngine::isCD() {
+	return _gameDescription->desc.flags & ADGF_CD;
+}
+
 } // End of namespace DreamWeb
diff --git a/engines/dreamweb/detection_tables.h b/engines/dreamweb/detection_tables.h
index 75f5786268..216e6715dc 100644
--- a/engines/dreamweb/detection_tables.h
+++ b/engines/dreamweb/detection_tables.h
@@ -25,6 +25,10 @@
 
 namespace DreamWeb {
 
+struct DreamWebGameDescription {
+	ADGameDescription desc;
+};
+
 static const DreamWebGameDescription gameDescriptions[] = {
 	// International floppy release
 	{
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 0a5deb4657..2ee20210ba 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -30,6 +30,8 @@
 #include "common/timer.h"
 #include "common/util.h"
 
+#include "engines/advancedDetector.h"
+
 #include "graphics/palette.h"
 #include "graphics/surface.h"
 
@@ -60,8 +62,6 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_channel0 = 0;
 	_channel1 = 0;
 
-	_language = gameDesc->desc.language;
-
 	_openChangeSize = kInventx+(4*kItempicsize);
 	_quitRequested = false;
 
@@ -477,10 +477,9 @@ uint8 DreamWebEngine::modifyChar(uint8 c) const {
 	if (c < 128)
 		return c;
 
-	switch(_language) {
+	switch(getLanguage()) {
 	case Common::DE_DEU:
-		switch(c)
-		{
+		switch(c) {
 		case 129:
 			return 'Z' + 3;
 		case 132:
@@ -528,11 +527,8 @@ uint8 DreamWebEngine::modifyChar(uint8 c) const {
 	}
 }
 
-bool DreamWebEngine::isCD() {
-	return _gameDescription->desc.flags & ADGF_CD;
-}
-
 bool DreamWebEngine::hasSpeech() {
 	return isCD() && _hasSpeech;
 }
+
 } // End of namespace DreamWeb
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 38016e5897..981ee86d4e 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -34,7 +34,6 @@
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
 
-#include "engines/advancedDetector.h"
 #include "engines/engine.h"
 
 #include "dreamweb/console.h"
@@ -98,9 +97,7 @@ enum {
 	kDebugSaveLoad = (1 << 1)
 };
 
-struct DreamWebGameDescription {
-	ADGameDescription desc;
-};
+struct DreamWebGameDescription;
 
 class DreamWebEngine : public Engine {
 private:
@@ -149,7 +146,7 @@ public:
 
 	void enableSavingOrLoading(bool enable = true) { _enableSavingOrLoading = enable; }
 
-	Common::Language getLanguage() const { return _language; }
+	Common::Language getLanguage() const;
 	uint8 modifyChar(uint8 c) const;
 
 	void stopSound(uint8 channel);
@@ -167,7 +164,6 @@ private:
 	bool _turbo;
 	uint _oldMouseState;
 	bool _enableSavingOrLoading;
-	Common::Language _language;
 
 	struct Sample {
 		uint offset;
-- 
cgit v1.2.3


From 9628913cdc1cf832ba438a2015db4e25e7217524 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 22 Feb 2012 18:26:38 +0100
Subject: GOB: Fix type conversion warning

---
 engines/gob/minigames/geisha/meter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/gob/minigames/geisha/meter.cpp b/engines/gob/minigames/geisha/meter.cpp
index 335622c5df..e3b9bd1ccf 100644
--- a/engines/gob/minigames/geisha/meter.cpp
+++ b/engines/gob/minigames/geisha/meter.cpp
@@ -101,7 +101,7 @@ void Meter::update() {
 
 	_surface->fill(_backColor);
 
-	int32 n = floor((((float) _width) / _maxValue * _value) + 0.5);
+	int32 n = (int32)floor((((float) _width) / _maxValue * _value) + 0.5);
 	if (n <= 0)
 		return;
 
-- 
cgit v1.2.3


From 442bcb7d3eb64f3fbde3ee5bd2b16e7c01bae469 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 22 Feb 2012 20:20:55 +0100
Subject: ALL: Fix some signed/unsigned comparison warnings.

---
 engines/agi/saveload.cpp | 4 ++--
 engines/gob/hotspots.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index 00d6a1c8dd..0ef6230374 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -221,8 +221,8 @@ int AgiEngine::saveGame(const Common::String &fileName, const Common::String &de
 
 	// Save image stack
 
-	for (i = 0; i < _imageStack.size(); i++) {
-		ImageStackElement ise = _imageStack[i];
+	for (Common::Stack<ImageStackElement>::size_type j = 0; j < _imageStack.size(); ++j) {
+		const ImageStackElement &ise = _imageStack[j];
 		out->writeByte(ise.type);
 		out->writeSint16BE(ise.parm1);
 		out->writeSint16BE(ise.parm2);
diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp
index 5e0af847de..9a89f11923 100644
--- a/engines/gob/hotspots.cpp
+++ b/engines/gob/hotspots.cpp
@@ -477,7 +477,7 @@ void Hotspots::call(uint16 offset) {
 
 	_shouldPush = true;
 
-	int16 stackSize = _stack.size();
+	Common::Stack<StackEntry>::size_type stackSize = _stack.size();
 
 	_vm->_inter->funcBlock(0);
 
-- 
cgit v1.2.3


From be35baddc70e0299502ff4e5858a5865c8a3a108 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Wed, 22 Feb 2012 23:14:29 +0100
Subject: TINSEL: Rename globals to add g_ prefix.

---
 engines/tinsel/background.cpp |   38 +-
 engines/tinsel/bg.cpp         |   98 +-
 engines/tinsel/cursor.cpp     |  298 +++---
 engines/tinsel/dialogs.cpp    | 2249 ++++++++++++++++++++---------------------
 engines/tinsel/drives.cpp     |   38 +-
 engines/tinsel/events.cpp     |   86 +-
 engines/tinsel/font.cpp       |   32 +-
 engines/tinsel/graphics.cpp   |    4 +-
 engines/tinsel/handle.cpp     |  108 +-
 engines/tinsel/heapmem.cpp    |   66 +-
 engines/tinsel/mareels.cpp    |   34 +-
 engines/tinsel/move.cpp       |   40 +-
 engines/tinsel/music.cpp      |   72 +-
 engines/tinsel/palette.cpp    |  132 +--
 engines/tinsel/pcode.cpp      |   98 +-
 engines/tinsel/pdisplay.cpp   |   54 +-
 engines/tinsel/play.cpp       |   50 +-
 engines/tinsel/rince.cpp      |   92 +-
 engines/tinsel/saveload.cpp   |  155 +--
 engines/tinsel/savescn.cpp    |  140 +--
 engines/tinsel/scene.cpp      |   60 +-
 engines/tinsel/sched.cpp      |   64 +-
 engines/tinsel/scroll.cpp     |  292 +++---
 engines/tinsel/scroll.h       |    6 +-
 engines/tinsel/sound.cpp      |   34 +-
 engines/tinsel/strres.cpp     |   56 +-
 engines/tinsel/strres.h       |    2 +-
 engines/tinsel/sysvar.cpp     |   20 +-
 engines/tinsel/text.cpp       |    8 +-
 engines/tinsel/timers.cpp     |   50 +-
 engines/tinsel/tinlib.cpp     |  108 +-
 engines/tinsel/tinsel.cpp     |  172 ++--
 engines/tinsel/token.cpp      |   28 +-
 33 files changed, 2388 insertions(+), 2396 deletions(-)

(limited to 'engines')

diff --git a/engines/tinsel/background.cpp b/engines/tinsel/background.cpp
index 72397db97f..8e3fc50f12 100644
--- a/engines/tinsel/background.cpp
+++ b/engines/tinsel/background.cpp
@@ -34,7 +34,7 @@ namespace Tinsel {
 // FIXME: Avoid non-const global vars
 
 // current background
-const BACKGND *pCurBgnd = NULL;
+const BACKGND *g_pCurBgnd = NULL;
 
 /**
  * Called to initialize a background.
@@ -46,7 +46,7 @@ void InitBackground(const BACKGND *pBgnd) {
 	PLAYFIELD *pPlayfield;	// pointer to current playfield
 
 	// set current background
-	pCurBgnd = pBgnd;
+	g_pCurBgnd = pBgnd;
 
 	// init background sky color
 	SetBgndColor(pBgnd->rgbSkyColor);
@@ -83,13 +83,13 @@ void PlayfieldSetPos(int which, int newXpos, int newYpos) {
 	PLAYFIELD *pPlayfield;	// pointer to relavent playfield
 
 	// make sure there is a background
-	assert(pCurBgnd != NULL);
+	assert(g_pCurBgnd != NULL);
 
 	// make sure the playfield number is in range
-	assert(which >= 0 && which < pCurBgnd->numPlayfields);
+	assert(which >= 0 && which < g_pCurBgnd->numPlayfields);
 
 	// get playfield pointer
-	pPlayfield = pCurBgnd->fieldArray + which;
+	pPlayfield = g_pCurBgnd->fieldArray + which;
 
 	// set new integer position
 	pPlayfield->fieldX = intToFrac(newXpos);
@@ -110,13 +110,13 @@ void PlayfieldGetPos(int which, int *pXpos, int *pYpos) {
 	PLAYFIELD *pPlayfield;	// pointer to relavent playfield
 
 	// make sure there is a background
-	assert(pCurBgnd != NULL);
+	assert(g_pCurBgnd != NULL);
 
 	// make sure the playfield number is in range
-	assert(which >= 0 && which < pCurBgnd->numPlayfields);
+	assert(which >= 0 && which < g_pCurBgnd->numPlayfields);
 
 	// get playfield pointer
-	pPlayfield = pCurBgnd->fieldArray + which;
+	pPlayfield = g_pCurBgnd->fieldArray + which;
 
 	// get current integer position
 	*pXpos = fracToInt(pPlayfield->fieldX);
@@ -132,13 +132,13 @@ int PlayfieldGetCenterX(int which) {
 	PLAYFIELD *pPlayfield; // pointer to relavent playfield
 
 	// make sure there is a background
-	assert(pCurBgnd != NULL);
+	assert(g_pCurBgnd != NULL);
 
 	// make sure the playfield number is in range
-	assert(which >= 0 && which < pCurBgnd->numPlayfields);
+	assert(which >= 0 && which < g_pCurBgnd->numPlayfields);
 
 	// get playfield pointer
-	pPlayfield = pCurBgnd->fieldArray + which;
+	pPlayfield = g_pCurBgnd->fieldArray + which;
 
 	// get current integer position
 	return fracToInt(pPlayfield->fieldX) + SCREEN_WIDTH/2;
@@ -153,13 +153,13 @@ OBJECT **GetPlayfieldList(int which) {
 	PLAYFIELD *pPlayfield;	// pointer to relavent playfield
 
 	// make sure there is a background
-	assert(pCurBgnd != NULL);
+	assert(g_pCurBgnd != NULL);
 
 	// make sure the playfield number is in range
-	assert(which >= 0 && which < pCurBgnd->numPlayfields);
+	assert(which >= 0 && which < g_pCurBgnd->numPlayfields);
 
 	// get playfield pointer
-	pPlayfield = pCurBgnd->fieldArray + which;
+	pPlayfield = g_pCurBgnd->fieldArray + which;
 
 	// return the display list pointer for this playfield
 	return &pPlayfield->pDispList;
@@ -177,13 +177,13 @@ void DrawBackgnd() {
 	int prevX, prevY;	// save interger part of position
 	Common::Point ptWin;	// window top left
 
-	if (pCurBgnd == NULL)
+	if (g_pCurBgnd == NULL)
 		return;		// no current background
 
 	// scroll each background playfield
-	for (i = 0; i < pCurBgnd->numPlayfields; i++) {
+	for (i = 0; i < g_pCurBgnd->numPlayfields; i++) {
 		// get pointer to correct playfield
-		pPlay = pCurBgnd->fieldArray + i;
+		pPlay = g_pCurBgnd->fieldArray + i;
 
 		// save integer part of position
 		prevX = fracToInt(pPlay->fieldX);
@@ -220,11 +220,11 @@ void DrawBackgnd() {
 	for (RectList::const_iterator r = clipRects.begin(); r != clipRects.end(); ++r) {
 		// clear the clip rectangle on the virtual screen
 		// for each background playfield
-		for (i = 0; i < pCurBgnd->numPlayfields; i++) {
+		for (i = 0; i < g_pCurBgnd->numPlayfields; i++) {
 			Common::Rect rcPlayClip;	// clip rect for this playfield
 
 			// get pointer to correct playfield
-			pPlay = pCurBgnd->fieldArray + i;
+			pPlay = g_pCurBgnd->fieldArray + i;
 
 			// convert fixed point window pos to a int
 			ptWin.x = fracToInt(pPlay->fieldX);
diff --git a/engines/tinsel/bg.cpp b/engines/tinsel/bg.cpp
index cf692e16ea..72ba05f0b9 100644
--- a/engines/tinsel/bg.cpp
+++ b/engines/tinsel/bg.cpp
@@ -47,59 +47,59 @@ namespace Tinsel {
 #define MAX_BG	10
 
 // FIXME: Avoid non-const global vars
-static SCNHANDLE hBgPal = 0;	// Background's palette
-static POBJECT pBG[MAX_BG];
-static ANIM	thisAnim[MAX_BG];	// used by BGmainProcess()
-static int BGspeed = 0;
-static SCNHANDLE hBackground = 0;	// Current scene handle - stored in case of Save_Scene()
-static bool bDoFadeIn = false;
-static int bgReels;
+static SCNHANDLE g_hBgPal = 0;	// Background's palette
+static POBJECT g_pBG[MAX_BG];
+static ANIM	g_thisAnim[MAX_BG];	// used by BGmainProcess()
+static int g_BGspeed = 0;
+static SCNHANDLE g_hBackground = 0;	// Current scene handle - stored in case of Save_Scene()
+static bool g_bDoFadeIn = false;
+static int g_bgReels;
 
 /**
  * GetBgObject
  */
 OBJECT *GetBgObject() {
-	return pBG[0];
+	return g_pBG[0];
 }
 
 /**
  * BackPal
  */
 SCNHANDLE BgPal() {
-	return hBgPal;
+	return g_hBgPal;
 }
 
 /**
  * SetDoFadeIn
 */
 void SetDoFadeIn(bool tf) {
-	bDoFadeIn = tf;
+	g_bDoFadeIn = tf;
 }
 
 /**
  * Called before scene change.
  */
 void DropBackground() {
-	pBG[0] = NULL;	// No background
+	g_pBG[0] = NULL;	// No background
 
 	if (!TinselV2)
-		hBgPal = 0;	// No background palette
+		g_hBgPal = 0;	// No background palette
 }
 
 /**
  * Return the width of the current background.
  */
 int BgWidth() {
-	assert(pBG[0]);
-	return MultiRightmost(pBG[0]) + 1;
+	assert(g_pBG[0]);
+	return MultiRightmost(g_pBG[0]) + 1;
 }
 
 /**
  * Return the height of the current background.
  */
 int BgHeight() {
-	assert(pBG[0]);
-	return MultiLowest(pBG[0]) + 1;
+	assert(g_pBG[0]);
+	return MultiLowest(g_pBG[0]) + 1;
 }
 
 /**
@@ -117,7 +117,7 @@ static void BGmainProcess(CORO_PARAM, const void *param) {
 	const MULTI_INIT *pmi;
 
 	// get the stuff copied to process when it was created
-	if (pBG[0] == NULL) {
+	if (g_pBG[0] == NULL) {
 		/*** At start of scene ***/
 
 		if (!TinselV2) {
@@ -127,40 +127,40 @@ static void BGmainProcess(CORO_PARAM, const void *param) {
 			pmi = (const MULTI_INIT *)LockMem(FROM_LE_32(pReel->mobj));
 
 			// Initialize and insert the object, and initialize its script.
-			pBG[0] = MultiInitObject(pmi);
-			MultiInsertObject(GetPlayfieldList(FIELD_WORLD), pBG[0]);
-			InitStepAnimScript(&thisAnim[0], pBG[0], FROM_LE_32(pReel->script), BGspeed);
-			bgReels = 1;
+			g_pBG[0] = MultiInitObject(pmi);
+			MultiInsertObject(GetPlayfieldList(FIELD_WORLD), g_pBG[0]);
+			InitStepAnimScript(&g_thisAnim[0], g_pBG[0], FROM_LE_32(pReel->script), g_BGspeed);
+			g_bgReels = 1;
 		} else {
 			/*** At start of scene ***/
-			pFilm = (const FILM *)LockMem(hBackground);
-			bgReels = FROM_LE_32(pFilm->numreels);
+			pFilm = (const FILM *)LockMem(g_hBackground);
+			g_bgReels = FROM_LE_32(pFilm->numreels);
 
 			int i;
-			for (i = 0; i < bgReels; i++) {
+			for (i = 0; i < g_bgReels; i++) {
 				// Get the MULTI_INIT structure
 				pmi = (PMULTI_INIT) LockMem(FROM_LE_32(pFilm->reels[i].mobj));
 
 				// Initialize and insert the object, and initialize its script.
-				pBG[i] = MultiInitObject(pmi);
-				MultiInsertObject(GetPlayfieldList(FIELD_WORLD), pBG[i]);
-				MultiSetZPosition(pBG[i], 0);
-				InitStepAnimScript(&thisAnim[i], pBG[i], FROM_LE_32(pFilm->reels[i].script), BGspeed);
+				g_pBG[i] = MultiInitObject(pmi);
+				MultiInsertObject(GetPlayfieldList(FIELD_WORLD), g_pBG[i]);
+				MultiSetZPosition(g_pBG[i], 0);
+				InitStepAnimScript(&g_thisAnim[i], g_pBG[i], FROM_LE_32(pFilm->reels[i].script), g_BGspeed);
 
 				if (i > 0)
-					pBG[i-1]->pSlave = pBG[i];
+					g_pBG[i-1]->pSlave = g_pBG[i];
 			}
 		}
 
-		if (bDoFadeIn) {
+		if (g_bDoFadeIn) {
 			FadeInFast(NULL);
-			bDoFadeIn = false;
+			g_bDoFadeIn = false;
 		} else if (TinselV2)
 			PokeInTagColor();
 
 		for (;;) {
-			for (int i = 0; i < bgReels; i++) {
-				if (StepAnimScript(&thisAnim[i]) == ScriptFinished)
+			for (int i = 0; i < g_bgReels; i++) {
+				if (StepAnimScript(&g_thisAnim[i]) == ScriptFinished)
 					error("Background animation has finished");
 			}
 
@@ -170,16 +170,16 @@ static void BGmainProcess(CORO_PARAM, const void *param) {
 		// New background during scene
 		if (!TinselV2) {
 			pReel = (const FREEL *)param;
-			InitStepAnimScript(&thisAnim[0], pBG[0], FROM_LE_32(pReel->script), BGspeed);
-			StepAnimScript(&thisAnim[0]);
+			InitStepAnimScript(&g_thisAnim[0], g_pBG[0], FROM_LE_32(pReel->script), g_BGspeed);
+			StepAnimScript(&g_thisAnim[0]);
 		} else {
-			pFilm = (const FILM *)LockMem(hBackground);
-			assert(bgReels == (int32)FROM_LE_32(pFilm->numreels));
+			pFilm = (const FILM *)LockMem(g_hBackground);
+			assert(g_bgReels == (int32)FROM_LE_32(pFilm->numreels));
 
 			// Just re-initialize the scripts.
-			for (int i = 0; i < bgReels; i++) {
-				InitStepAnimScript(&thisAnim[i], pBG[i], pFilm->reels[i].script, BGspeed);
-				StepAnimScript(&thisAnim[i]);
+			for (int i = 0; i < g_bgReels; i++) {
+				InitStepAnimScript(&g_thisAnim[i], g_pBG[i], pFilm->reels[i].script, g_BGspeed);
+				StepAnimScript(&g_thisAnim[i]);
 			}
 		}
 	}
@@ -206,7 +206,7 @@ static void BGotherProcess(CORO_PARAM, const void *param) {
 	_ctx->pObj = MultiInitObject(pmi);
 	MultiInsertObject(GetPlayfieldList(FIELD_WORLD), _ctx->pObj);
 
-	InitStepAnimScript(&_ctx->anim, pBG[0], FROM_LE_32(pReel->script), BGspeed);
+	InitStepAnimScript(&_ctx->anim, g_pBG[0], FROM_LE_32(pReel->script), g_BGspeed);
 
 	while (StepAnimScript(&_ctx->anim) != ScriptFinished)
 		CORO_SLEEP(1);
@@ -218,14 +218,14 @@ static void BGotherProcess(CORO_PARAM, const void *param) {
  * AetBgPal()
  */
 void SetBackPal(SCNHANDLE hPal) {
-	hBgPal = hPal;
+	g_hBgPal = hPal;
 
-	FettleFontPal(hBgPal);
-	CreateTranslucentPalette(hBgPal);
+	FettleFontPal(g_hBgPal);
+	CreateTranslucentPalette(g_hBgPal);
 }
 
 void ChangePalette(SCNHANDLE hPal) {
-	SwapPalette(FindPalette(hBgPal), hPal);
+	SwapPalette(FindPalette(g_hBgPal), hPal);
 
 	SetBackPal(hPal);
 }
@@ -245,14 +245,14 @@ void StartupBackground(CORO_PARAM, SCNHANDLE hFilm) {
 	const FILM *pfilm;
 	IMAGE *pim;
 
-	hBackground = hFilm;		// Save handle in case of Save_Scene()
+	g_hBackground = hFilm;		// Save handle in case of Save_Scene()
 
 	pim = GetImageFromFilm(hFilm, 0, NULL, NULL, &pfilm);
 
 	SetBackPal(FROM_LE_32(pim->hImgPal));
 
 	// Extract the film speed
-	BGspeed = ONE_SECOND / FROM_LE_32(pfilm->frate);
+	g_BGspeed = ONE_SECOND / FROM_LE_32(pfilm->frate);
 
 	// Start display process for each reel in the film
 	g_scheduler->createProcess(PID_REEL, BGmainProcess, &pfilm->reels[0], sizeof(FREEL));
@@ -262,7 +262,7 @@ void StartupBackground(CORO_PARAM, SCNHANDLE hFilm) {
 			g_scheduler->createProcess(PID_REEL, BGotherProcess, &pfilm->reels[i], sizeof(FREEL));
 	}
 
-	if (pBG[0] == NULL)
+	if (g_pBG[0] == NULL)
 		ControlStartOff();
 
 	if (TinselV2 && (coroParam != nullContext))
@@ -275,7 +275,7 @@ void StartupBackground(CORO_PARAM, SCNHANDLE hFilm) {
  * Return the current scene handle.
  */
 SCNHANDLE GetBgroundHandle() {
-	return hBackground;
+	return g_hBackground;
 }
 
 } // End of namespace Tinsel
diff --git a/engines/tinsel/cursor.cpp b/engines/tinsel/cursor.cpp
index 8248609a81..bf901c03b6 100644
--- a/engines/tinsel/cursor.cpp
+++ b/engines/tinsel/cursor.cpp
@@ -56,36 +56,36 @@ namespace Tinsel {
 
 // FIXME: Avoid non-const global vars
 
-static OBJECT *McurObj = NULL;		// Main cursor object
-static OBJECT *AcurObj = NULL;		// Auxiliary cursor object
+static OBJECT *g_McurObj = NULL;		// Main cursor object
+static OBJECT *g_AcurObj = NULL;		// Auxiliary cursor object
 
-static ANIM McurAnim = {0,0,0,0,0};		// Main cursor animation structure
-static ANIM AcurAnim = {0,0,0,0,0};		// Auxiliary cursor animation structure
+static ANIM g_McurAnim = {0,0,0,0,0};		// Main cursor animation structure
+static ANIM g_AcurAnim = {0,0,0,0,0};		// Auxiliary cursor animation structure
 
-static bool bHiddenCursor = false;		// Set when cursor is hidden
-static bool bTempNoTrailers = false;	// Set when cursor trails are hidden
-static bool bTempHide = false;			// Set when cursor is hidden
+static bool g_bHiddenCursor = false;		// Set when cursor is hidden
+static bool g_bTempNoTrailers = false;	// Set when cursor trails are hidden
+static bool g_bTempHide = false;			// Set when cursor is hidden
 
-static bool bFrozenCursor = false;	// Set when cursor position is frozen
+static bool g_bFrozenCursor = false;	// Set when cursor position is frozen
 
-static frac_t IterationSize = 0;
+static frac_t g_IterationSize = 0;
 
-static SCNHANDLE hCursorFilm = 0;	// Handle to cursor reel data
+static SCNHANDLE g_hCursorFilm = 0;	// Handle to cursor reel data
 
-static int numTrails = 0;
-static int nextTrail = 0;
+static int g_numTrails = 0;
+static int g_nextTrail = 0;
 
-static bool bWhoa = false;		// Set by DropCursor() at the end of a scene
+static bool g_bWhoa = false;		// Set by DropCursor() at the end of a scene
 				// - causes cursor processes to do nothing
 				// Reset when main cursor has re-initialized
 
-static uint16 restart = 0;	// When main cursor has been bWhoa-ed, it waits
+static uint16 g_restart = 0;	// When main cursor has been bWhoa-ed, it waits
 							// for this to be set to 0x8000.
 							// Main cursor sets all the bits after a re-start
 							// - each cursor trail examines it's own bit
 							// to trigger a trail restart.
 
-static short ACoX = 0, ACoY = 0;	// Auxillary cursor image's animation offsets
+static short g_ACoX = 0, g_ACoY = 0;	// Auxillary cursor image's animation offsets
 
 
 
@@ -96,9 +96,9 @@ static struct {
 	ANIM	trailAnim;	// Animation structure
 	OBJECT *trailObj;	// This trailer's object
 
-} ntrailData [MAX_TRAILERS];
+} g_ntrailData [MAX_TRAILERS];
 
-static int lastCursorX = 0, lastCursorY = 0;
+static int g_lastCursorX = 0, g_lastCursorY = 0;
 
 
 //----------------- FORWARD REFERENCES --------------------
@@ -116,26 +116,26 @@ static void InitCurTrailObj(int i, int x, int y) {
 
 	const FILM *pfilm;
 
-	if (!numTrails)
+	if (!g_numTrails)
 		return;
 
 	// Get rid of old object
-	if (ntrailData[i].trailObj != NULL)
-		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj);
+	if (g_ntrailData[i].trailObj != NULL)
+		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_ntrailData[i].trailObj);
 
-	pim = GetImageFromFilm(hCursorFilm, i+1, &pfr, &pmi, &pfilm);// Get pointer to image
+	pim = GetImageFromFilm(g_hCursorFilm, i+1, &pfr, &pmi, &pfilm);// Get pointer to image
 	assert(BgPal()); // No background palette
 	pim->hImgPal = TO_LE_32(BgPal());
 
 	// Initialize and insert the object, set its Z-pos, and hide it
-	ntrailData[i].trailObj = MultiInitObject(pmi);
-	MultiInsertObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj);
-	MultiSetZPosition(ntrailData[i].trailObj, Z_CURSORTRAIL);
-	MultiSetAniXY(ntrailData[i].trailObj, x, y);
+	g_ntrailData[i].trailObj = MultiInitObject(pmi);
+	MultiInsertObject(GetPlayfieldList(FIELD_STATUS), g_ntrailData[i].trailObj);
+	MultiSetZPosition(g_ntrailData[i].trailObj, Z_CURSORTRAIL);
+	MultiSetAniXY(g_ntrailData[i].trailObj, x, y);
 
 	// Initialize the animation script
-	InitStepAnimScript(&ntrailData[i].trailAnim, ntrailData[i].trailObj, FROM_LE_32(pfr->script), ONE_SECOND / FROM_LE_32(pfilm->frate));
-	StepAnimScript(&ntrailData[i].trailAnim);
+	InitStepAnimScript(&g_ntrailData[i].trailAnim, g_ntrailData[i].trailObj, FROM_LE_32(pfr->script), ONE_SECOND / FROM_LE_32(pfilm->frate));
+	StepAnimScript(&g_ntrailData[i].trailAnim);
 }
 
 /**
@@ -196,12 +196,12 @@ void SetCursorScreenXY(int newx, int newy) {
  * Returns false if there is no cursor object.
  */
 bool GetCursorXYNoWait(int *x, int *y, bool absolute) {
-	if (McurObj == NULL) {
+	if (g_McurObj == NULL) {
 		*x = *y = 0;
 		return false;
 	}
 
-	GetAniPosition(McurObj, x, y);
+	GetAniPosition(g_McurObj, x, y);
 
 	if (absolute) {
 		int	Loffset, Toffset;	// Screen offset
@@ -222,7 +222,7 @@ bool GetCursorXYNoWait(int *x, int *y, bool absolute) {
 void GetCursorXY(int *x, int *y, bool absolute) {
 	//while (McurObj == NULL)
 	//	ProcessSleepSelf();
-	assert(McurObj);
+	assert(g_McurObj);
 	GetCursorXYNoWait(x, y, absolute);
 }
 
@@ -234,22 +234,22 @@ void GetCursorXY(int *x, int *y, bool absolute) {
 void RestoreMainCursor() {
 	const FILM *pfilm;
 
-	if (McurObj != NULL) {
-		pfilm = (const FILM *)LockMem(hCursorFilm);
+	if (g_McurObj != NULL) {
+		pfilm = (const FILM *)LockMem(g_hCursorFilm);
 
-		InitStepAnimScript(&McurAnim, McurObj, FROM_LE_32(pfilm->reels->script), ONE_SECOND / FROM_LE_32(pfilm->frate));
-		StepAnimScript(&McurAnim);
+		InitStepAnimScript(&g_McurAnim, g_McurObj, FROM_LE_32(pfilm->reels->script), ONE_SECOND / FROM_LE_32(pfilm->frate));
+		StepAnimScript(&g_McurAnim);
 	}
-	bHiddenCursor = false;
-	bFrozenCursor = false;
+	g_bHiddenCursor = false;
+	g_bFrozenCursor = false;
 }
 
 /**
  * Called from INVENTRY.C to customise the main cursor.
  */
 void SetTempCursor(SCNHANDLE pScript) {
-	if (McurObj != NULL)
-		InitStepAnimScript(&McurAnim, McurObj, pScript, 2);
+	if (g_McurObj != NULL)
+		InitStepAnimScript(&g_McurAnim, g_McurObj, pScript, 2);
 }
 
 /**
@@ -258,17 +258,17 @@ void SetTempCursor(SCNHANDLE pScript) {
 void DwHideCursor() {
 	int i;
 
-	bHiddenCursor = true;
+	g_bHiddenCursor = true;
 
-	if (McurObj)
-		MultiHideObject(McurObj);
-	if (AcurObj)
-		MultiHideObject(AcurObj);
+	if (g_McurObj)
+		MultiHideObject(g_McurObj);
+	if (g_AcurObj)
+		MultiHideObject(g_AcurObj);
 
-	for (i = 0; i < numTrails; i++) {
-		if (ntrailData[i].trailObj != NULL) {
-			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj);
-			ntrailData[i].trailObj = NULL;
+	for (i = 0; i < g_numTrails; i++) {
+		if (g_ntrailData[i].trailObj != NULL) {
+			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_ntrailData[i].trailObj);
+			g_ntrailData[i].trailObj = NULL;
 		}
 	}
 }
@@ -277,21 +277,21 @@ void DwHideCursor() {
  * Unhide the cursor.
  */
 void UnHideCursor() {
-	bHiddenCursor = false;
+	g_bHiddenCursor = false;
 }
 
 /**
  * Freeze the cursor.
  */
 void FreezeCursor() {
-	bFrozenCursor = true;
+	g_bFrozenCursor = true;
 }
 
 /**
  * Freeze the cursor, or not.
  */
 void DoFreezeCursor(bool bFreeze) {
-	bFrozenCursor = bFreeze;
+	g_bFrozenCursor = bFreeze;
 }
 
 /**
@@ -300,12 +300,12 @@ void DoFreezeCursor(bool bFreeze) {
 void HideCursorTrails() {
 	int i;
 
-	bTempNoTrailers = true;
+	g_bTempNoTrailers = true;
 
-	for (i = 0; i < numTrails; i++)	{
-		if (ntrailData[i].trailObj != NULL) {
-			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj);
-			ntrailData[i].trailObj = NULL;
+	for (i = 0; i < g_numTrails; i++)	{
+		if (g_ntrailData[i].trailObj != NULL) {
+			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_ntrailData[i].trailObj);
+			g_ntrailData[i].trailObj = NULL;
 		}
 	}
 }
@@ -314,7 +314,7 @@ void HideCursorTrails() {
  * UnHideCursorTrails
  */
 void UnHideCursorTrails() {
-	bTempNoTrailers = false;
+	g_bTempNoTrailers = false;
 }
 
 /**
@@ -356,9 +356,9 @@ IMAGE *GetImageFromFilm(SCNHANDLE hFilm, int reel, const FREEL **ppfr, const MUL
  * Delete auxillary cursor. Restore animation offsets in the image.
  */
 void DelAuxCursor() {
-	if (AcurObj != NULL) {
-		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), AcurObj);
-		AcurObj = NULL;
+	if (g_AcurObj != NULL) {
+		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_AcurObj);
+		g_AcurObj = NULL;
 	}
 }
 
@@ -381,21 +381,21 @@ void SetAuxCursor(SCNHANDLE hFilm) {
 	assert(BgPal()); // no background palette
 	pim->hImgPal = TO_LE_32(BgPal());			// Poke in the background palette
 
-	ACoX = (short)(FROM_LE_16(pim->imgWidth)/2 - ((int16) FROM_LE_16(pim->anioffX)));
-	ACoY = (short)((FROM_LE_16(pim->imgHeight) & ~C16_FLAG_MASK)/2 -
+	g_ACoX = (short)(FROM_LE_16(pim->imgWidth)/2 - ((int16) FROM_LE_16(pim->anioffX)));
+	g_ACoY = (short)((FROM_LE_16(pim->imgHeight) & ~C16_FLAG_MASK)/2 -
 		((int16) FROM_LE_16(pim->anioffY)));
 
 	// Initialize and insert the auxillary cursor object
-	AcurObj = MultiInitObject(pmi);
-	MultiInsertObject(GetPlayfieldList(FIELD_STATUS), AcurObj);
+	g_AcurObj = MultiInitObject(pmi);
+	MultiInsertObject(GetPlayfieldList(FIELD_STATUS), g_AcurObj);
 
 	// Initialize the animation and set its position
-	InitStepAnimScript(&AcurAnim, AcurObj, FROM_LE_32(pfr->script), ONE_SECOND / FROM_LE_32(pfilm->frate));
-	MultiSetAniXY(AcurObj, x - ACoX, y - ACoY);
-	MultiSetZPosition(AcurObj, Z_ACURSOR);
+	InitStepAnimScript(&g_AcurAnim, g_AcurObj, FROM_LE_32(pfr->script), ONE_SECOND / FROM_LE_32(pfilm->frate));
+	MultiSetAniXY(g_AcurObj, x - g_ACoX, y - g_ACoY);
+	MultiSetZPosition(g_AcurObj, Z_ACURSOR);
 
-	if (bHiddenCursor)
-		MultiHideObject(AcurObj);
+	if (g_bHiddenCursor)
+		MultiHideObject(g_AcurObj);
 }
 
 /**
@@ -421,52 +421,52 @@ static void DoCursorMove() {
 	dir = _vm->getKeyDirection();
 	if (dir != 0) {
 		if (dir & MSK_LEFT)
-			newX -= IterationSize;
+			newX -= g_IterationSize;
 
 		if (dir & MSK_RIGHT)
-			newX += IterationSize;
+			newX += g_IterationSize;
 
 		if (dir & MSK_UP)
-			newY -= IterationSize;
+			newY -= g_IterationSize;
 
 		if (dir & MSK_DOWN)
-			newY += IterationSize;
+			newY += g_IterationSize;
 
-		IterationSize += ITER_ACCELERATION;
+		g_IterationSize += ITER_ACCELERATION;
 
 		// set new mouse driver position
 		_vm->setMousePosition(Common::Point(fracToInt(newX), fracToInt(newY)));
 	} else
 
-		IterationSize = ITERATION_BASE;
+		g_IterationSize = ITERATION_BASE;
 
 	// get new mouse driver position - could have been modified
 	ptMouse = _vm->getMousePosition();
 
-	if (lastCursorX != ptMouse.x || lastCursorY != ptMouse.y) {
+	if (g_lastCursorX != ptMouse.x || g_lastCursorY != ptMouse.y) {
 		resetUserEventTime();
 
-		if (!bTempNoTrailers && !bHiddenCursor) {
-			InitCurTrailObj(nextTrail++, lastCursorX, lastCursorY);
-			if (nextTrail == numTrails)
-				nextTrail = 0;
+		if (!g_bTempNoTrailers && !g_bHiddenCursor) {
+			InitCurTrailObj(g_nextTrail++, g_lastCursorX, g_lastCursorY);
+			if (g_nextTrail == g_numTrails)
+				g_nextTrail = 0;
 		}
 	}
 
 	// adjust cursor to new mouse position
-	if (McurObj)
-		MultiSetAniXY(McurObj, ptMouse.x, ptMouse.y);
-	if (AcurObj != NULL)
-		MultiSetAniXY(AcurObj, ptMouse.x - ACoX, ptMouse.y - ACoY);
+	if (g_McurObj)
+		MultiSetAniXY(g_McurObj, ptMouse.x, ptMouse.y);
+	if (g_AcurObj != NULL)
+		MultiSetAniXY(g_AcurObj, ptMouse.x - g_ACoX, ptMouse.y - g_ACoY);
 
-	if (InventoryActive() && McurObj) {
+	if (InventoryActive() && g_McurObj) {
 		// Notify the inventory
 		Xmovement(ptMouse.x - startX);
 		Ymovement(ptMouse.y - startY);
 	}
 
-	lastCursorX = ptMouse.x;
-	lastCursorY = ptMouse.y;
+	g_lastCursorX = ptMouse.x;
+	g_lastCursorY = ptMouse.y;
 }
 
 /**
@@ -479,7 +479,7 @@ static void InitCurObj() {
 	IMAGE *pim;
 
 	if (TinselV2) {
-		pFilm = (const FILM *)LockMem(hCursorFilm);
+		pFilm = (const FILM *)LockMem(g_hCursorFilm);
 		pfr = (const FREEL *)&pFilm->reels[0];
 		pmi = (MULTI_INIT *)LockMem(FROM_LE_32(pfr->mobj));
 
@@ -487,16 +487,16 @@ static void InitCurObj() {
 	} else {
 		assert(BgPal()); // no background palette
 
-		pim = GetImageFromFilm(hCursorFilm, 0, &pfr, &pmi, &pFilm);// Get pointer to image
+		pim = GetImageFromFilm(g_hCursorFilm, 0, &pfr, &pmi, &pFilm);// Get pointer to image
 		pim->hImgPal = TO_LE_32(BgPal());
 
-		AcurObj = NULL;		// No auxillary cursor
+		g_AcurObj = NULL;		// No auxillary cursor
 	}
 
-	McurObj = MultiInitObject(pmi);
-	MultiInsertObject(GetPlayfieldList(FIELD_STATUS), McurObj);
+	g_McurObj = MultiInitObject(pmi);
+	MultiInsertObject(GetPlayfieldList(FIELD_STATUS), g_McurObj);
 
-	InitStepAnimScript(&McurAnim, McurObj, FROM_LE_32(pfr->script), ONE_SECOND / FROM_LE_32(pFilm->frate));
+	InitStepAnimScript(&g_McurAnim, g_McurObj, FROM_LE_32(pfr->script), ONE_SECOND / FROM_LE_32(pFilm->frate));
 }
 
 /**
@@ -504,14 +504,14 @@ static void InitCurObj() {
  */
 static void InitCurPos() {
 	Common::Point ptMouse = _vm->getMousePosition();
-	lastCursorX = ptMouse.x;
-	lastCursorY = ptMouse.y;
+	g_lastCursorX = ptMouse.x;
+	g_lastCursorY = ptMouse.y;
 
-	MultiSetZPosition(McurObj, Z_CURSOR);
+	MultiSetZPosition(g_McurObj, Z_CURSOR);
 	DoCursorMove();
-	MultiHideObject(McurObj);
+	MultiHideObject(g_McurObj);
 
-	IterationSize = ITERATION_BASE;
+	g_IterationSize = ITERATION_BASE;
 }
 
 /**
@@ -525,9 +525,9 @@ static void CursorStoppedCheck(CORO_PARAM) {
 	CORO_BEGIN_CODE(_ctx);
 
 	// If scene is closing down
-	if (bWhoa) {
+	if (g_bWhoa) {
 		// ...wait for next scene start-up
-		while (restart != 0x8000)
+		while (g_restart != 0x8000)
 			CORO_SLEEP(1);
 
 		// Re-initialize
@@ -536,8 +536,8 @@ static void CursorStoppedCheck(CORO_PARAM) {
 		InventoryIconCursor(false);	// May be holding something
 
 		// Re-start the cursor trails
-		restart = (uint16)-1;		// set all bits
-		bWhoa = false;
+		g_restart = (uint16)-1;		// set all bits
+		g_bWhoa = false;
 	}
 	CORO_END_CODE;
 }
@@ -552,15 +552,15 @@ void CursorProcess(CORO_PARAM, const void *) {
 
 	CORO_BEGIN_CODE(_ctx);
 
-	while (!hCursorFilm || !BgPal())
+	while (!g_hCursorFilm || !BgPal())
 		CORO_SLEEP(1);
 
 	InitCurObj();
 	InitCurPos();
 	InventoryIconCursor(false);		// May be holding something
 
-	bWhoa = false;
-	restart = 0;
+	g_bWhoa = false;
+	g_restart = 0;
 
 	while (1) {
 		// allow rescheduling
@@ -570,36 +570,36 @@ void CursorProcess(CORO_PARAM, const void *) {
 		CORO_INVOKE_0(CursorStoppedCheck);
 
 		// Step the animation script(s)
-		StepAnimScript(&McurAnim);
-		if (AcurObj != NULL)
-			StepAnimScript(&AcurAnim);
-		for (int i = 0; i < numTrails; i++) {
-			if (ntrailData[i].trailObj != NULL) {
-				if (StepAnimScript(&ntrailData[i].trailAnim) == ScriptFinished) {
-					MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj);
-					ntrailData[i].trailObj = NULL;
+		StepAnimScript(&g_McurAnim);
+		if (g_AcurObj != NULL)
+			StepAnimScript(&g_AcurAnim);
+		for (int i = 0; i < g_numTrails; i++) {
+			if (g_ntrailData[i].trailObj != NULL) {
+				if (StepAnimScript(&g_ntrailData[i].trailAnim) == ScriptFinished) {
+					MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_ntrailData[i].trailObj);
+					g_ntrailData[i].trailObj = NULL;
 				}
 			}
 		}
 
 		// Move the cursor as appropriate
-		if (!bFrozenCursor)
+		if (!g_bFrozenCursor)
 			DoCursorMove();
 
 		// If the cursor should be hidden...
-		if (bHiddenCursor || bTempHide) {
+		if (g_bHiddenCursor || g_bTempHide) {
 			// ...hide the cursor object(s)
-			MultiHideObject(McurObj);
-			if (AcurObj)
-				MultiHideObject(AcurObj);
+			MultiHideObject(g_McurObj);
+			if (g_AcurObj)
+				MultiHideObject(g_AcurObj);
 
-			for (int i = 0; i < numTrails; i++) {
-				if (ntrailData[i].trailObj != NULL)
-					MultiHideObject(ntrailData[i].trailObj);
+			for (int i = 0; i < g_numTrails; i++) {
+				if (g_ntrailData[i].trailObj != NULL)
+					MultiHideObject(g_ntrailData[i].trailObj);
 			}
 
 			// Wait 'til cursor is again required.
-			while (bHiddenCursor) {
+			while (g_bHiddenCursor) {
 				CORO_SLEEP(1);
 
 				// Stop/start between scenes
@@ -617,12 +617,12 @@ void CursorProcess(CORO_PARAM, const void *) {
 void DwInitCursor(SCNHANDLE bfilm) {
 	const FILM *pfilm;
 
-	hCursorFilm = bfilm;
+	g_hCursorFilm = bfilm;
 
-	pfilm = (const FILM *)LockMem(hCursorFilm);
-	numTrails = FROM_LE_32(pfilm->numreels) - 1;
+	pfilm = (const FILM *)LockMem(g_hCursorFilm);
+	g_numTrails = FROM_LE_32(pfilm->numreels) - 1;
 
-	assert(numTrails <= MAX_TRAILERS);
+	assert(g_numTrails <= MAX_TRAILERS);
 }
 
 /**
@@ -630,24 +630,24 @@ void DwInitCursor(SCNHANDLE bfilm) {
  */
 void DropCursor() {
 	if (TinselV2) {
-		if (AcurObj)
-			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), AcurObj);
-		if (McurObj)
-			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), McurObj);
+		if (g_AcurObj)
+			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_AcurObj);
+		if (g_McurObj)
+			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_McurObj);
 
-		restart = 0;
+		g_restart = 0;
 	}
 
-	AcurObj = NULL;		// No auxillary cursor
-	McurObj = NULL;		// No cursor object (imminently deleted elsewhere)
-	bHiddenCursor = false;	// Not hidden in next scene
-	bTempNoTrailers = false;	// Trailers not hidden in next scene
-	bWhoa = true;		// Suspend cursor processes
+	g_AcurObj = NULL;		// No auxillary cursor
+	g_McurObj = NULL;		// No cursor object (imminently deleted elsewhere)
+	g_bHiddenCursor = false;	// Not hidden in next scene
+	g_bTempNoTrailers = false;	// Trailers not hidden in next scene
+	g_bWhoa = true;		// Suspend cursor processes
 
-	for (int i = 0; i < numTrails; i++) {
-		if (ntrailData[i].trailObj != NULL)		{
-			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj);
-			ntrailData[i].trailObj = NULL;
+	for (int i = 0; i < g_numTrails; i++) {
+		if (g_ntrailData[i].trailObj != NULL)		{
+			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_ntrailData[i].trailObj);
+			g_ntrailData[i].trailObj = NULL;
 		}
 	}
 }
@@ -656,7 +656,7 @@ void DropCursor() {
  * RestartCursor is called when a new scene is starting up.
  */
 void RestartCursor() {
-	restart = 0x8000;	// Get the main cursor to re-initialize
+	g_restart = 0x8000;	// Get the main cursor to re-initialize
 }
 
 /**
@@ -664,32 +664,32 @@ void RestartCursor() {
  * pointers etc.
  */
 void RebootCursor() {
-	McurObj = AcurObj = NULL;
+	g_McurObj = g_AcurObj = NULL;
 	for (int i = 0; i < MAX_TRAILERS; i++)
-		ntrailData[i].trailObj = NULL;
+		g_ntrailData[i].trailObj = NULL;
 
-	bHiddenCursor = bTempNoTrailers = bFrozenCursor = false;
+	g_bHiddenCursor = g_bTempNoTrailers = g_bFrozenCursor = false;
 
-	hCursorFilm = 0;
+	g_hCursorFilm = 0;
 
-	bWhoa = false;
-	restart = 0;
+	g_bWhoa = false;
+	g_restart = 0;
 }
 
 void StartCursorFollowed() {
 	DelAuxCursor();
 
 	if (!SysVar(SV_ENABLEPRINTCURSOR))
-		bTempHide = true;
+		g_bTempHide = true;
 }
 
 void EndCursorFollowed() {
 	InventoryIconCursor(false);	// May be holding something
-	bTempHide = false;
+	g_bTempHide = false;
 }
 
 bool isCursorShown() {
-	return !(bTempHide || bHiddenCursor);
+	return !(g_bTempHide || g_bHiddenCursor);
 }
 
 } // End of namespace Tinsel
diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index 6ca070b67a..5396e47566 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -63,17 +63,6 @@
 
 namespace Tinsel {
 
-//----------------- EXTERNAL GLOBAL DATA --------------------
-
-// In DOS_DW.C
-extern bool bRestart;		// restart flag - set to restart the game
-
-#ifdef MAC_OPTIONS
-// In MAC_SOUND.C
-extern int volMaster;
-#endif
-
-
 //----------------- LOCAL DEFINES --------------------
 
 #define HOPPER_FILENAME		"hopper"
@@ -312,23 +301,23 @@ static const int vFillers[MAXVICONS] = {
 
 //----- Permanent data (set once) -----
 
-static SCNHANDLE hWinParts = 0;	// Window members and cursors' graphic data
-static SCNHANDLE flagFilm = 0;	// Window members and cursors' graphic data
-static SCNHANDLE configStrings[20];
+static SCNHANDLE g_hWinParts = 0;	// Window members and cursors' graphic data
+static SCNHANDLE g_flagFilm = 0;	// Window members and cursors' graphic data
+static SCNHANDLE g_configStrings[20];
 
-static INV_OBJECT *invObjects = NULL;	// Inventory objects' data
-static int numObjects = 0;				// Number of inventory objects
-static SCNHANDLE *invFilms = NULL;
-static bool bNoLanguage = false;
-static DIRECTION initialDirection;
+static INV_OBJECT *g_invObjects = NULL;	// Inventory objects' data
+static int g_numObjects = 0;				// Number of inventory objects
+static SCNHANDLE *g_invFilms = NULL;
+static bool g_bNoLanguage = false;
+static DIRECTION g_initialDirection;
 
 //----- Permanent data (updated, valid while inventory closed) -----
 
-static enum {NO_INV, IDLE_INV, ACTIVE_INV, BOGUS_INV} InventoryState;
+static enum {NO_INV, IDLE_INV, ACTIVE_INV, BOGUS_INV} g_InventoryState;
 
-static int HeldItem = INV_NOICON;	// Current held item
+static int g_heldItem = INV_NOICON;	// Current held item
 
-static SCNHANDLE heldFilm;
+static SCNHANDLE g_heldFilm;
 
 struct INV_DEF {
 
@@ -364,60 +353,60 @@ struct INV_DEF {
 
 };
 
-static INV_DEF InvD[NUM_INV];		// Conversation + 2 inventories + ...
+static INV_DEF g_InvD[NUM_INV];		// Conversation + 2 inventories + ...
 
 
 // Permanent contents of conversation inventory
-static int permIcons[MAX_PERMICONS];	// Basic items i.e. permanent contents
-static int numPermIcons = 0;			// - copy to conv. inventory at pop-up time
-static int numEndIcons = 0;
+static int g_permIcons[MAX_PERMICONS];	// Basic items i.e. permanent contents
+static int g_numPermIcons = 0;			// - copy to conv. inventory at pop-up time
+static int g_numEndIcons = 0;
 
 //----- Data pertinant to current active inventory -----
 
-static int ino = 0;		// Which inventory is currently active
+static int g_ino = 0;		// Which inventory is currently active
 
-static bool InventoryHidden = false;
-static bool InventoryMaximised = false;
+static bool g_InventoryHidden = false;
+static bool g_InventoryMaximised = false;
 
 static enum {	ID_NONE, ID_MOVE, ID_SLIDE,
 		ID_BOTTOM, ID_TOP, ID_LEFT, ID_RIGHT,
 		ID_TLEFT, ID_TRIGHT, ID_BLEFT, ID_BRIGHT,
-		ID_CSLIDE, ID_MDCONT } InvDragging;
+		ID_CSLIDE, ID_MDCONT } g_InvDragging;
 
-static int SuppH = 0;		// 'Linear' element of
-static int SuppV = 0;		// dimensions during re-sizing
+static int g_SuppH = 0;		// 'Linear' element of
+static int g_SuppV = 0;		// dimensions during re-sizing
 
-static int Ychange = 0;		//
-static int Ycompensate = 0;		// All to do with re-sizing.
-static int Xchange = 0;		//
-static int Xcompensate = 0;		//
+static int g_Ychange = 0;		//
+static int g_Ycompensate = 0;		// All to do with re-sizing.
+static int g_Xchange = 0;		//
+static int g_Xcompensate = 0;		//
 
-static bool ItemsChanged = 0;	// When set, causes items to be re-drawn
+static bool g_ItemsChanged = 0;	// When set, causes items to be re-drawn
 
-static bool bReOpenMenu = 0;
+static bool g_bReOpenMenu = 0;
 
-static int TL = 0, TR = 0, BL = 0, BR = 0;	// Used during window construction
-static int TLwidth = 0, TLheight = 0;	//
-static int TRwidth = 0;		//
-static int BLheight = 0;		//
+static int g_TL = 0, g_TR = 0, g_BL = 0, g_BR = 0;	// Used during window construction
+static int g_TLwidth = 0, g_TLheight = 0;	//
+static int g_TRwidth = 0;		//
+static int g_BLheight = 0;		//
 
-static LANGUAGE displayedLanguage;
+static LANGUAGE g_displayedLanguage;
 
-static OBJECT	*objArray[MAX_WCOMP];	// Current display objects (window)
-static OBJECT	*iconArray[MAX_ICONS];	// Current display objects (icons)
-static ANIM		iconAnims[MAX_ICONS];
-static OBJECT	*DobjArray[MAX_WCOMP];	// Current display objects (re-sizing window)
+static OBJECT	*g_objArray[MAX_WCOMP];	// Current display objects (window)
+static OBJECT	*g_iconArray[MAX_ICONS];	// Current display objects (icons)
+static ANIM		g_iconAnims[MAX_ICONS];
+static OBJECT	*g_DobjArray[MAX_WCOMP];	// Current display objects (re-sizing window)
 
-static OBJECT *RectObject = 0, *SlideObject = 0;	// Current display objects, for reference
+static OBJECT *g_RectObject = 0, *g_SlideObject = 0;	// Current display objects, for reference
 					// objects are in objArray.
 
-static int sliderYpos = 0;			// For positioning the slider
-static int sliderYmax = 0, sliderYmin = 0;	//
+static int g_sliderYpos = 0;			// For positioning the slider
+static int g_sliderYmax = 0, g_sliderYmin = 0;	//
 
-#define sliderRange	(sliderYmax - sliderYmin)
+#define sliderRange	(g_sliderYmax - g_sliderYmin)
 
 // Also to do with the slider
-static struct { int n; int y; } slideStuff[MAX_ININV_TOT+1];
+static struct { int n; int y; } g_slideStuff[MAX_ININV_TOT+1];
 
 #define MAXSLIDES 4
 struct MDSLIDES {
@@ -425,25 +414,25 @@ struct MDSLIDES {
 	OBJECT	*obj;
 	int	min, max;
 };
-static MDSLIDES mdSlides[MAXSLIDES];
-static int numMdSlides = 0;
+static MDSLIDES g_mdSlides[MAXSLIDES];
+static int g_numMdSlides = 0;
 
-static int GlitterIndex = 0;
+static int g_GlitterIndex = 0;
 
 // Icon clicked on to cause an event
 // - Passed to conversation polygon or actor code via Topic()
 // - (sometimes) Passed to inventory icon code via OtherObject()
-static int thisIcon = 0;
+static int g_thisIcon = 0;
 
-static CONV_PARAM thisConvFn;				// Top, 'Middle' or Bottom
-static HPOLYGON thisConvPoly = 0;			// Conversation code is in a polygon code block
-static int thisConvActor;					// ...or an actor's code block.
-static int pointedIcon = INV_NOICON;		// used by InvLabels - icon pointed to on last call
-static volatile int PointedWaitCount = 0;	// used by ObjectProcess - fix the 'repeated pressing bug'
-static int sX = 0;							// used by SlideMSlider() - current x-coordinate
-static int lX = 0;							// used by SlideMSlider() - last x-coordinate
+static CONV_PARAM g_thisConvFn;				// Top, 'Middle' or Bottom
+static HPOLYGON g_thisConvPoly = 0;			// Conversation code is in a polygon code block
+static int g_thisConvActor;					// ...or an actor's code block.
+static int g_pointedIcon = INV_NOICON;		// used by InvLabels - icon pointed to on last call
+static volatile int g_PointedWaitCount = 0;	// used by ObjectProcess - fix the 'repeated pressing bug'
+static int g_sX = 0;							// used by SlideMSlider() - current x-coordinate
+static int g_lX = 0;							// used by SlideMSlider() - last x-coordinate
 
-static bool bMoveOnUnHide;	// Set before start of conversation
+static bool g_bMoveOnUnHide;	// Set before start of conversation
 				// - causes conversation to be started in a sensible place
 
 //----- Data pertinant to configure (incl. load/save game) -----
@@ -486,16 +475,16 @@ typedef HOPENTRY *PHOPENTRY;
 
 #include "common/pack-end.h"	// END STRUCT PACKING
 
-static PHOPPER		pHopper;
-static PHOPENTRY	pEntries;
-static int numScenes;
+static PHOPPER		g_pHopper;
+static PHOPENTRY	g_pEntries;
+static int g_numScenes;
 
-static int numEntries;
+static int g_numEntries;
 
-static PHOPPER pChosenScene = NULL;
+static PHOPPER g_pChosenScene = NULL;
 
-static int lastChosenScene;
-static bool bRemember;
+static int g_lastChosenScene;
+static bool g_bRemember;
 
 //--------------------------------------------------------------
 
@@ -970,7 +959,7 @@ static struct {
 };
 
 // For editing save game names
-static char sedit[SG_DESC_LEN+2];
+static char g_sedit[SG_DESC_LEN+2];
 
 #define HL1	0	// Hilight that moves with the cursor
 #define HL2	1	// Hilight on selected RGROUP box
@@ -1096,7 +1085,7 @@ static void PrimeSceneHopper() {
 	vSize = f.readUint32LE();
 
 	// allocate a buffer for it all
-	assert(pHopper == NULL);
+	assert(g_pHopper == NULL);
 	uint32 size = f.size() - 8;
 
 	// make sure memory allocated
@@ -1111,9 +1100,9 @@ static void PrimeSceneHopper() {
 		error(FILE_IS_CORRUPT, HOPPER_FILENAME);
 
 	// Set data pointers
-	pHopper = (PHOPPER)pBuffer;
-	pEntries = (PHOPENTRY)(pBuffer + vSize);
-	numScenes = vSize / sizeof(HOPPER);
+	g_pHopper = (PHOPPER)pBuffer;
+	g_pEntries = (PHOPENTRY)(pBuffer + vSize);
+	g_numScenes = vSize / sizeof(HOPPER);
 
 	// close the file
 	f.close();
@@ -1123,31 +1112,31 @@ static void PrimeSceneHopper() {
  * Free the scene hopper data file
  */
 static void FreeSceneHopper() {
-	free(pHopper);
-	pHopper = NULL;
+	free(g_pHopper);
+	g_pHopper = NULL;
 }
 
 static void FirstScene(int first) {
 	int	i;
 
-	assert(numScenes && pHopper);
+	assert(g_numScenes && g_pHopper);
 
-	if (bRemember) {
+	if (g_bRemember) {
 		assert(first == 0);
-		first = lastChosenScene;
-		bRemember = false;
+		first = g_lastChosenScene;
+		g_bRemember = false;
 	}
 
 	// Force it to a sensible value
-	if (first > numScenes - NUM_RGROUP_BOXES)
-		first = numScenes - NUM_RGROUP_BOXES;
+	if (first > g_numScenes - NUM_RGROUP_BOXES)
+		first = g_numScenes - NUM_RGROUP_BOXES;
 	if (first < 0)
 		first = 0;
 
 	// Fill in the rest
-	for (i = 0; i < NUM_RGROUP_BOXES && i + first < numScenes; i++) {
+	for (i = 0; i < NUM_RGROUP_BOXES && i + first < g_numScenes; i++) {
 		cd.box[i].textMethod = TM_STRINGNUM;
-		cd.box[i].ixText = FROM_LE_32(pHopper[i + first].hSceneDesc);
+		cd.box[i].ixText = FROM_LE_32(g_pHopper[i + first].hSceneDesc);
 	}
 	// Blank out the spare ones (if any)
 	while (i < NUM_RGROUP_BOXES) {
@@ -1159,31 +1148,31 @@ static void FirstScene(int first) {
 }
 
 static void RememberChosenScene() {
-	bRemember = true;
+	g_bRemember = true;
 }
 
 static void SetChosenScene() {
-	lastChosenScene = cd.selBox + cd.extraBase;
-	pChosenScene = &pHopper[cd.selBox + cd.extraBase];
+	g_lastChosenScene = cd.selBox + cd.extraBase;
+	g_pChosenScene = &g_pHopper[cd.selBox + cd.extraBase];
 }
 
 static void FirstEntry(int first) {
 	int	i;
 
-	InvD[INV_MENU].hInvTitle = FROM_LE_32(pChosenScene->hSceneDesc);
+	g_InvD[INV_MENU].hInvTitle = FROM_LE_32(g_pChosenScene->hSceneDesc);
 
 	// get number of entrances
-	numEntries = FROM_LE_32(pChosenScene->numEntries);
+	g_numEntries = FROM_LE_32(g_pChosenScene->numEntries);
 
 	// Force first to a sensible value
-	if (first > numEntries-NUM_RGROUP_BOXES)
-		first = numEntries-NUM_RGROUP_BOXES;
+	if (first > g_numEntries-NUM_RGROUP_BOXES)
+		first = g_numEntries-NUM_RGROUP_BOXES;
 	if (first < 0)
 		first = 0;
 
-	for (i = 0; i < NUM_RGROUP_BOXES && i < numEntries; i++) {
+	for (i = 0; i < NUM_RGROUP_BOXES && i < g_numEntries; i++) {
 		cd.box[i].textMethod = TM_STRINGNUM;
-		cd.box[i].ixText = FROM_LE_32(pEntries[FROM_LE_32(pChosenScene->entryIndex) + i + first].hDesc);
+		cd.box[i].ixText = FROM_LE_32(g_pEntries[FROM_LE_32(g_pChosenScene->entryIndex) + i + first].hDesc);
 	}
 	// Blank out the spare ones (if any)
 	while (i < NUM_RGROUP_BOXES) {
@@ -1195,15 +1184,15 @@ static void FirstEntry(int first) {
 }
 
 static void HopAction() {
-	PHOPENTRY pEntry = pEntries + FROM_LE_32(pChosenScene->entryIndex) + cd.selBox + cd.extraBase;
+	PHOPENTRY pEntry = g_pEntries + FROM_LE_32(g_pChosenScene->entryIndex) + cd.selBox + cd.extraBase;
 
-	uint32 hScene = FROM_LE_32(pChosenScene->hScene);
+	uint32 hScene = FROM_LE_32(g_pChosenScene->hScene);
 	uint32 eNumber = FROM_LE_32(pEntry->eNumber);
 	debugC(DEBUG_BASIC, kTinselDebugAnimations, "Scene hopper chose scene %xh,%d\n", hScene, eNumber);
 
 	if (FROM_LE_32(pEntry->flags) & fCall) {
 		SaveScene(nullContext);
-		NewScene(nullContext, pChosenScene->hScene, pEntry->eNumber, TRANS_FADE);
+		NewScene(nullContext, g_pChosenScene->hScene, pEntry->eNumber, TRANS_FADE);
 	}
 	else if (FROM_LE_32(pEntry->flags) & fHook)
 		HookScene(hScene, eNumber, TRANS_FADE);
@@ -1220,9 +1209,9 @@ static void HopAction() {
  */
 static void DumpIconArray() {
 	for (int i = 0; i < MAX_ICONS; i++) {
-		if (iconArray[i] != NULL) {
-			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[i]);
-			iconArray[i] = NULL;
+		if (g_iconArray[i] != NULL) {
+			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[i]);
+			g_iconArray[i] = NULL;
 		}
 	}
 }
@@ -1232,9 +1221,9 @@ static void DumpIconArray() {
  */
 static void DumpDobjArray() {
 	for (int i = 0; i < MAX_WCOMP; i++) {
-		if (DobjArray[i] != NULL) {
-			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), DobjArray[i]);
-			DobjArray[i] = NULL;
+		if (g_DobjArray[i] != NULL) {
+			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_DobjArray[i]);
+			g_DobjArray[i] = NULL;
 		}
 	}
 }
@@ -1244,9 +1233,9 @@ static void DumpDobjArray() {
  */
 static void DumpObjArray() {
 	for (int i = 0; i < MAX_WCOMP; i++) {
-		if (objArray[i] != NULL) {
-			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), objArray[i]);
-			objArray[i] = NULL;
+		if (g_objArray[i] != NULL) {
+			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_objArray[i]);
+			g_objArray[i] = NULL;
 		}
 	}
 }
@@ -1256,9 +1245,9 @@ static void DumpObjArray() {
  * i.e. Image data and Glitter code.
  */
 static INV_OBJECT *GetInvObject(int id) {
-	INV_OBJECT *pObject = invObjects;
+	INV_OBJECT *pObject = g_invObjects;
 
-	for (int i = 0; i < numObjects; i++, pObject++) {
+	for (int i = 0; i < g_numObjects; i++, pObject++) {
 		if (pObject->id == id)
 			return pObject;
 	}
@@ -1270,9 +1259,9 @@ static INV_OBJECT *GetInvObject(int id) {
  * Convert item ID number to index.
  */
 static int GetObjectIndex(int id) {
-	INV_OBJECT *pObject = invObjects;
+	INV_OBJECT *pObject = g_invObjects;
 
-	for (int i = 0; i < numObjects; i++, pObject++) {
+	for (int i = 0; i < g_numObjects; i++, pObject++) {
 		if (pObject->id == id)
 			return i;
 	}
@@ -1287,15 +1276,15 @@ static int GetObjectIndex(int id) {
 extern int InventoryPos(int num) {
 	int	i;
 
-	for (i = 0; i < InvD[INV_1].NoofItems; i++)	// First inventory
-		if (InvD[INV_1].contents[i] == num)
+	for (i = 0; i < g_InvD[INV_1].NoofItems; i++)	// First inventory
+		if (g_InvD[INV_1].contents[i] == num)
 			return i;
 
-	for (i = 0; i < InvD[INV_2].NoofItems; i++)	// Second inventory
-		if (InvD[INV_2].contents[i] == num)
+	for (i = 0; i < g_InvD[INV_2].NoofItems; i++)	// Second inventory
+		if (g_InvD[INV_2].contents[i] == num)
 			return i;
 
-	if (HeldItem == num)
+	if (g_heldItem == num)
 		return INV_HELDNOTIN;	// Held, but not in either inventory
 
 	return INV_NOICON;		// Not held, not in either inventory
@@ -1304,8 +1293,8 @@ extern int InventoryPos(int num) {
 extern bool IsInInventory(int object, int invnum) {
 	assert(invnum == INV_1 || invnum == INV_2);
 
-	for (int i = 0; i < InvD[invnum].NoofItems; i++)	// First inventory
-		if (InvD[invnum].contents[i] == object)
+	for (int i = 0; i < g_InvD[invnum].NoofItems; i++)	// First inventory
+		if (g_InvD[invnum].contents[i] == object)
 			return true;
 
 	return false;
@@ -1315,7 +1304,7 @@ extern bool IsInInventory(int object, int invnum) {
  * Returns which item is held (INV_NOICON (-1) if none)
  */
 extern int WhichItemHeld() {
-	return HeldItem;
+	return g_heldItem;
 }
 
 /**
@@ -1324,15 +1313,15 @@ extern int WhichItemHeld() {
  */
 extern void InventoryIconCursor(bool bNewItem) {
 
-	if (HeldItem != INV_NOICON) {
+	if (g_heldItem != INV_NOICON) {
 		if (TinselV2) {
 			if (bNewItem) {
-				int	objIndex = GetObjectIndex(HeldItem);
-				heldFilm = invFilms[objIndex];
+				int	objIndex = GetObjectIndex(g_heldItem);
+				g_heldFilm = g_invFilms[objIndex];
 			}
-			SetAuxCursor(heldFilm);
+			SetAuxCursor(g_heldFilm);
 		} else {
-			INV_OBJECT *invObj = GetInvObject(HeldItem);
+			INV_OBJECT *invObj = GetInvObject(g_heldItem);
 			SetAuxCursor(invObj->hIconFilm);
 		}
 	}
@@ -1342,14 +1331,14 @@ extern void InventoryIconCursor(bool bNewItem) {
  * Returns true if the inventory is active.
  */
 extern bool InventoryActive() {
-	return (InventoryState == ACTIVE_INV);
+	return (g_InventoryState == ACTIVE_INV);
 }
 
 extern int WhichInventoryOpen() {
-	if (InventoryState != ACTIVE_INV)
+	if (g_InventoryState != ACTIVE_INV)
 		return 0;
 	else
-		return ino;
+		return g_ino;
 }
 
 
@@ -1387,7 +1376,7 @@ static void ObjectProcess(CORO_PARAM, const void *param) {
 	CORO_INVOKE_1(Interpret, _ctx->pic);
 
 	if (to->event == POINTED) {
-		_ctx->ThisPointedWait = ++PointedWaitCount;
+		_ctx->ThisPointedWait = ++g_PointedWaitCount;
 		while (1) {
 			CORO_SLEEP(1);
 			int	x, y;
@@ -1396,7 +1385,7 @@ static void ObjectProcess(CORO_PARAM, const void *param) {
 				break;
 
 			// Fix the 'repeated pressing bug'
-			if (_ctx->ThisPointedWait != PointedWaitCount)
+			if (_ctx->ThisPointedWait != g_PointedWaitCount)
 				CORO_KILL_SELF();
 		}
 
@@ -1413,10 +1402,10 @@ static void ObjectProcess(CORO_PARAM, const void *param) {
 static void InvTinselEvent(INV_OBJECT *pinvo, TINSEL_EVENT event, PLR_EVENT be, int index) {
 	OP_INIT to = { pinvo, event, be, 0 };
 
-	if (InventoryHidden || (TinselV2 && !pinvo->hScript))
+	if (g_InventoryHidden || (TinselV2 && !pinvo->hScript))
 		return;
 
-	GlitterIndex = index;
+	g_GlitterIndex = index;
 	g_scheduler->createProcess(PID_TCODE, ObjectProcess, &to, sizeof(to));
 }
 
@@ -1491,9 +1480,9 @@ static void FirstFile(int first) {
 static void InvSaveGame() {
 	if (cd.selBox != NOBOX) {
 #ifndef JAPAN
-		sedit[strlen(sedit)-1] = 0;	// Don't include the cursor!
+		g_sedit[strlen(g_sedit)-1] = 0;	// Don't include the cursor!
 #endif
-		SaveGame(ListEntry(cd.selBox-cd.modifier+cd.extraBase, LE_NAME), sedit);
+		SaveGame(ListEntry(cd.selBox-cd.modifier+cd.extraBase, LE_NAME), g_sedit);
 	}
 }
 
@@ -1506,17 +1495,17 @@ static void InvLoadGame() {
 	if (cd.selBox != NOBOX && (cd.selBox+cd.extraBase < cd.numSaved)) {
 		rGame = cd.selBox;
 		cd.selBox = NOBOX;
-		if (iconArray[HL3] != NULL) {
-			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL3]);
-			iconArray[HL3] = NULL;
+		if (g_iconArray[HL3] != NULL) {
+			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL3]);
+			g_iconArray[HL3] = NULL;
 		}
-		if (iconArray[HL2] != NULL) {
-			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL2]);
-			iconArray[HL2] = NULL;
+		if (g_iconArray[HL2] != NULL) {
+			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL2]);
+			g_iconArray[HL2] = NULL;
 		}
-		if (iconArray[HL1] != NULL) {
-			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL1]);
-			iconArray[HL1] = NULL;
+		if (g_iconArray[HL1] != NULL) {
+			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL1]);
+			g_iconArray[HL1] = NULL;
 		}
 		RestoreGame(rGame+cd.extraBase);
 	}
@@ -1533,7 +1522,7 @@ static bool UpdateString(const Common::KeyState &kbd) {
 	if (!cd.editableRgroup)
 		return false;
 
-	cpos = strlen(sedit)-1;
+	cpos = strlen(g_sedit)-1;
 
 	if (kbd.ascii == 0)
 		return false;
@@ -1541,18 +1530,18 @@ static bool UpdateString(const Common::KeyState &kbd) {
 	if (kbd.keycode == Common::KEYCODE_BACKSPACE) {
 		if (!cpos)
 			return false;
-		sedit[cpos] = 0;
+		g_sedit[cpos] = 0;
 		cpos--;
-		sedit[cpos] = CURSOR_CHAR;
+		g_sedit[cpos] = CURSOR_CHAR;
 		return true;
 //	} else if (isalnum(c) || c == ',' || c == '.' || c == '\'' || (c == ' ' && cpos != 0)) {
 	} else if (IsCharImage(GetTagFontHandle(), kbd.ascii) || (kbd.ascii == ' ' && cpos != 0)) {
 		if (cpos == SG_DESC_LEN)
 			return false;
-		sedit[cpos] = kbd.ascii;
+		g_sedit[cpos] = kbd.ascii;
 		cpos++;
-		sedit[cpos] = CURSOR_CHAR;
-		sedit[cpos+1] = 0;
+		g_sedit[cpos] = CURSOR_CHAR;
+		g_sedit[cpos+1] = 0;
 		return true;
 	}
 	return false;
@@ -1582,25 +1571,25 @@ static bool InvKeyIn(const Common::KeyState &kbd) {
 			* Delete display of text currently being edited,
 			* and replace it with freshly edited text.
 			*/
-			if (iconArray[HL3] != NULL) {
-				MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL3]);
-				iconArray[HL3] = NULL;
+			if (g_iconArray[HL3] != NULL) {
+				MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL3]);
+				g_iconArray[HL3] = NULL;
 			}
-			iconArray[HL3] = ObjectTextOut(
-				GetPlayfieldList(FIELD_STATUS), sedit, 0,
-				InvD[ino].inventoryX + cd.box[cd.selBox].xpos + 2,
-				InvD[ino].inventoryY + cd.box[cd.selBox].ypos + TYOFF,
+			g_iconArray[HL3] = ObjectTextOut(
+				GetPlayfieldList(FIELD_STATUS), g_sedit, 0,
+				g_InvD[g_ino].inventoryX + cd.box[cd.selBox].xpos + 2,
+				g_InvD[g_ino].inventoryY + cd.box[cd.selBox].ypos + TYOFF,
 				GetTagFontHandle(), 0);
-			if (MultiRightmost(iconArray[HL3]) > MAX_NAME_RIGHT) {
-				MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL3]);
+			if (MultiRightmost(g_iconArray[HL3]) > MAX_NAME_RIGHT) {
+				MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL3]);
 				UpdateString(Common::KeyState(Common::KEYCODE_BACKSPACE));
-				iconArray[HL3] = ObjectTextOut(
-					GetPlayfieldList(FIELD_STATUS), sedit, 0,
-					InvD[ino].inventoryX + cd.box[cd.selBox].xpos + 2,
-					InvD[ino].inventoryY + cd.box[cd.selBox].ypos + TYOFF,
+				g_iconArray[HL3] = ObjectTextOut(
+					GetPlayfieldList(FIELD_STATUS), g_sedit, 0,
+					g_InvD[g_ino].inventoryX + cd.box[cd.selBox].xpos + 2,
+					g_InvD[g_ino].inventoryY + cd.box[cd.selBox].ypos + TYOFF,
 					GetTagFontHandle(), 0);
 			}
-			MultiSetZPosition(iconArray[HL3], Z_INV_ITEXT + 2);
+			MultiSetZPosition(g_iconArray[HL3], Z_INV_ITEXT + 2);
 		}
 #endif
 	}
@@ -1625,28 +1614,28 @@ static void Select(int i, bool force) {
 	cd.selBox = i;
 
 	// Clear previous selected highlight and text
-	if (iconArray[HL2] != NULL) {
-		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL2]);
-		iconArray[HL2] = NULL;
+	if (g_iconArray[HL2] != NULL) {
+		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL2]);
+		g_iconArray[HL2] = NULL;
 	}
-	if (iconArray[HL3] != NULL) {
-		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL3]);
-		iconArray[HL3] = NULL;
+	if (g_iconArray[HL3] != NULL) {
+		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL3]);
+		g_iconArray[HL3] = NULL;
 	}
 
 	// New highlight box
 	switch (cd.box[i].boxType) {
 	case RGROUP:
-		iconArray[HL2] = RectangleObject(BgPal(),
+		g_iconArray[HL2] = RectangleObject(BgPal(),
 			(TinselV2 ? HighlightColor() : COL_HILIGHT), cd.box[i].w, cd.box[i].h);
-		MultiInsertObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL2]);
-		MultiSetAniXY(iconArray[HL2],
-		InvD[ino].inventoryX + cd.box[i].xpos,
-		InvD[ino].inventoryY + cd.box[i].ypos);
+		MultiInsertObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL2]);
+		MultiSetAniXY(g_iconArray[HL2],
+		g_InvD[g_ino].inventoryX + cd.box[i].xpos,
+		g_InvD[g_ino].inventoryY + cd.box[i].ypos);
 
 		// Z-position of box, and add edit text if appropriate
 		if (cd.editableRgroup) {
-			MultiSetZPosition(iconArray[HL2], Z_INV_ITEXT+1);
+			MultiSetZPosition(g_iconArray[HL2], Z_INV_ITEXT+1);
 
 			if (TinselV2) {
 				assert(cd.box[i].textMethod == TM_POINTER);
@@ -1657,29 +1646,29 @@ static void Select(int i, bool force) {
 			// Current date and time
 			time(&secs_now);
 			time_now = localtime(&secs_now);
-			strftime(sedit, SG_DESC_LEN, "%D %H:%M", time_now);
+			strftime(g_sedit, SG_DESC_LEN, "%D %H:%M", time_now);
 #else
 			// Current description with cursor appended
 			if (cd.box[i].boxText != NULL) {
-				strcpy(sedit, cd.box[i].boxText);
-				strcat(sedit, sCursor);
+				strcpy(g_sedit, cd.box[i].boxText);
+				strcat(g_sedit, sCursor);
 			} else {
-				strcpy(sedit, sCursor);
+				strcpy(g_sedit, sCursor);
 			}
 #endif
 
-			iconArray[HL3] = ObjectTextOut(
-				GetPlayfieldList(FIELD_STATUS), sedit, 0,
-				InvD[ino].inventoryX + cd.box[i].xpos + 2,
+			g_iconArray[HL3] = ObjectTextOut(
+				GetPlayfieldList(FIELD_STATUS), g_sedit, 0,
+				g_InvD[g_ino].inventoryX + cd.box[i].xpos + 2,
 #ifdef JAPAN
-				InvD[ino].inventoryY + cd.box[i].ypos + 2,
+				g_InvD[g_ino].inventoryY + cd.box[i].ypos + 2,
 #else
-				InvD[ino].inventoryY + cd.box[i].ypos + TYOFF,
+				g_InvD[g_ino].inventoryY + cd.box[i].ypos + TYOFF,
 #endif
 				GetTagFontHandle(), 0);
-			MultiSetZPosition(iconArray[HL3], Z_INV_ITEXT + 2);
+			MultiSetZPosition(g_iconArray[HL3], Z_INV_ITEXT + 2);
 		} else {
-			MultiSetZPosition(iconArray[HL2], Z_INV_ICONS + 1);
+			MultiSetZPosition(g_iconArray[HL2], Z_INV_ICONS + 1);
 		}
 
 		_vm->divertKeyInput(InvKeyIn);
@@ -1687,12 +1676,12 @@ static void Select(int i, bool force) {
 		break;
 
 	case FRGROUP:
-		iconArray[HL2] = RectangleObject(BgPal(), COL_HILIGHT, cd.box[i].w+6, cd.box[i].h+6);
-		MultiInsertObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL2]);
-		MultiSetAniXY(iconArray[HL2],
-		InvD[ino].inventoryX + cd.box[i].xpos - 2,
-		InvD[ino].inventoryY + cd.box[i].ypos - 2);
-		MultiSetZPosition(iconArray[HL2], Z_INV_BRECT+1);
+		g_iconArray[HL2] = RectangleObject(BgPal(), COL_HILIGHT, cd.box[i].w+6, cd.box[i].h+6);
+		MultiInsertObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL2]);
+		MultiSetAniXY(g_iconArray[HL2],
+		g_InvD[g_ino].inventoryX + cd.box[i].xpos - 2,
+		g_InvD[g_ino].inventoryY + cd.box[i].ypos - 2);
+		MultiSetZPosition(g_iconArray[HL2], Z_INV_BRECT+1);
 
 		break;
 
@@ -1710,13 +1699,13 @@ static void Select(int i, bool force) {
  * Stop holding an item.
  */
 extern void DropItem(int item) {
-	if (HeldItem == item) {
-		HeldItem = INV_NOICON;		// Item not held
+	if (g_heldItem == item) {
+		g_heldItem = INV_NOICON;		// Item not held
 		DelAuxCursor();			// no longer aux cursor
 	}
 
 	// Redraw contents - held item was not displayed as a content.
-	ItemsChanged = true;
+	g_ItemsChanged = true;
 }
 
 /**
@@ -1725,8 +1714,8 @@ extern void DropItem(int item) {
 extern void ClearInventory(int invno) {
 	assert(invno == INV_1 || invno == INV_2);
 
-	InvD[invno].NoofItems = 0;
-	memset(InvD[invno].contents, 0, sizeof(InvD[invno].contents));
+	g_InvD[invno].NoofItems = 0;
+	memset(g_InvD[invno].contents, 0, sizeof(g_InvD[invno].contents));
 }
 
 /**
@@ -1743,12 +1732,12 @@ extern void AddToInventory(int invno, int icon, bool hold) {
 		|| invno == INV_OPEN || (invno == INV_DEFAULT && TinselV2));
 
 	if (invno == INV_OPEN) {
-		assert(InventoryState == ACTIVE_INV && (ino == INV_1 || ino == INV_2)); // addopeninv() with inventry not open
-		invno = ino;
+		assert(g_InventoryState == ACTIVE_INV && (g_ino == INV_1 || g_ino == INV_2)); // addopeninv() with inventry not open
+		invno = g_ino;
 		bOpen = true;
 
 		// Make sure it doesn't get in both!
-		RemFromInventory(ino == INV_1 ? INV_2 : INV_1, icon);
+		RemFromInventory(g_ino == INV_1 ? INV_2 : INV_1, icon);
 	} else {
 		bOpen = false;
 
@@ -1769,61 +1758,61 @@ extern void AddToInventory(int invno, int icon, bool hold) {
 		RemFromInventory(INV_1, icon);
 
 	// See if it's already there
-	for (i = 0; i < InvD[invno].NoofItems; i++) {
-		if (InvD[invno].contents[i] == icon)
+	for (i = 0; i < g_InvD[invno].NoofItems; i++) {
+		if (g_InvD[invno].contents[i] == icon)
 			break;
 	}
 
 	// Add it if it isn't already there
-	if (i == InvD[invno].NoofItems) {
+	if (i == g_InvD[invno].NoofItems) {
 		if (!bOpen) {
 			if (invno == INV_CONV) {
 				if (TinselV2) {
 					int nei;
 
 					// Count how many current contents have end attribute
-					for (i = 0, nei = 0; i < InvD[INV_CONV].NoofItems; i++) {
-						invObj = GetInvObject(InvD[INV_CONV].contents[i]);
+					for (i = 0, nei = 0; i < g_InvD[INV_CONV].NoofItems; i++) {
+						invObj = GetInvObject(g_InvD[INV_CONV].contents[i]);
 						if (invObj->attribute & CONVENDITEM)
 							nei++;
 					}
 
 					// For conversation, insert before end icons
-					memmove(&InvD[INV_CONV].contents[i-nei+1],
-						&InvD[INV_CONV].contents[i-nei], nei * sizeof(int));
-					InvD[INV_CONV].contents[i - nei] = icon;
-					InvD[INV_CONV].NoofItems++;
-					InvD[INV_CONV].NoofHicons = InvD[INV_CONV].NoofItems;
+					memmove(&g_InvD[INV_CONV].contents[i-nei+1],
+						&g_InvD[INV_CONV].contents[i-nei], nei * sizeof(int));
+					g_InvD[INV_CONV].contents[i - nei] = icon;
+					g_InvD[INV_CONV].NoofItems++;
+					g_InvD[INV_CONV].NoofHicons = g_InvD[INV_CONV].NoofItems;
 
 					// Get the window to re-position
-					bMoveOnUnHide = true;
+					g_bMoveOnUnHide = true;
 				} else {
 					// For conversation, insert before last icon
 					// which will always be the goodbye icon
-					InvD[invno].contents[InvD[invno].NoofItems] = InvD[invno].contents[InvD[invno].NoofItems-1];
-					InvD[invno].contents[InvD[invno].NoofItems-1] = icon;
-					InvD[invno].NoofItems++;
+					g_InvD[invno].contents[g_InvD[invno].NoofItems] = g_InvD[invno].contents[g_InvD[invno].NoofItems-1];
+					g_InvD[invno].contents[g_InvD[invno].NoofItems-1] = icon;
+					g_InvD[invno].NoofItems++;
 				}
 			} else {
-				InvD[invno].contents[InvD[invno].NoofItems++] = icon;
+				g_InvD[invno].contents[g_InvD[invno].NoofItems++] = icon;
 			}
-			ItemsChanged = true;
+			g_ItemsChanged = true;
 		} else {
 			// It could be that the index is beyond what you'd expect
 			// as delinv may well have been called
-			if (GlitterIndex < InvD[invno].NoofItems) {
-				memmove(&InvD[invno].contents[GlitterIndex + 1],
-					&InvD[invno].contents[GlitterIndex],
-					(InvD[invno].NoofItems - GlitterIndex) * sizeof(int));
-				InvD[invno].contents[GlitterIndex] = icon;
+			if (g_GlitterIndex < g_InvD[invno].NoofItems) {
+				memmove(&g_InvD[invno].contents[g_GlitterIndex + 1],
+					&g_InvD[invno].contents[g_GlitterIndex],
+					(g_InvD[invno].NoofItems - g_GlitterIndex) * sizeof(int));
+				g_InvD[invno].contents[g_GlitterIndex] = icon;
 			} else {
-				InvD[invno].contents[InvD[invno].NoofItems] = icon;
+				g_InvD[invno].contents[g_InvD[invno].NoofItems] = icon;
 			}
-			InvD[invno].NoofItems++;
+			g_InvD[invno].NoofItems++;
 		}
 
 		// Move here after bug on Japenese DW1
-		ItemsChanged = true;
+		g_ItemsChanged = true;
 	}
 
 	// Hold it if requested
@@ -1841,25 +1830,25 @@ extern bool RemFromInventory(int invno, int icon) {
 	assert(invno == INV_1 || invno == INV_2 || invno == INV_CONV); // Trying to delete from illegal inventory
 
 	// See if it's there
-	for (i = 0; i < InvD[invno].NoofItems; i++) {
-		if (InvD[invno].contents[i] == icon)
+	for (i = 0; i < g_InvD[invno].NoofItems; i++) {
+		if (g_InvD[invno].contents[i] == icon)
 			break;
 	}
 
-	if (i == InvD[invno].NoofItems)
+	if (i == g_InvD[invno].NoofItems)
 		return false;			// Item wasn't there
 	else {
-		memmove(&InvD[invno].contents[i], &InvD[invno].contents[i+1], (InvD[invno].NoofItems-i)*sizeof(int));
-		InvD[invno].NoofItems--;
+		memmove(&g_InvD[invno].contents[i], &g_InvD[invno].contents[i+1], (g_InvD[invno].NoofItems-i)*sizeof(int));
+		g_InvD[invno].NoofItems--;
 
 		if (TinselV2 && invno == INV_CONV) {
-			InvD[INV_CONV].NoofHicons = InvD[invno].NoofItems;
+			g_InvD[INV_CONV].NoofHicons = g_InvD[invno].NoofItems;
 
 			// Get the window to re-position
-			bMoveOnUnHide = true;
+			g_bMoveOnUnHide = true;
 		}
 
-		ItemsChanged = true;
+		g_ItemsChanged = true;
 		return true;			// Item removed
 	}
 }
@@ -1870,27 +1859,27 @@ extern bool RemFromInventory(int invno, int icon) {
 extern void HoldItem(int item, bool bKeepFilm) {
 	INV_OBJECT *invObj;
 
-	if (HeldItem != item) {
-		if (TinselV2 && (HeldItem != NOOBJECT)) {
+	if (g_heldItem != item) {
+		if (TinselV2 && (g_heldItem != NOOBJECT)) {
 			// No longer holding previous item
 			DelAuxCursor();	 // no longer aux cursor
 
 			// If old held object is not in an inventory, and
 			// has a default, stick it in its default inventory.
-			if (!IsInInventory(HeldItem, INV_1) && !IsInInventory(HeldItem, INV_2)) {
-				invObj = GetInvObject(HeldItem);
+			if (!IsInInventory(g_heldItem, INV_1) && !IsInInventory(g_heldItem, INV_2)) {
+				invObj = GetInvObject(g_heldItem);
 
 				if (invObj->attribute & DEFINV1)
-					AddToInventory(INV_1, HeldItem);
+					AddToInventory(INV_1, g_heldItem);
 				else if (invObj->attribute & DEFINV2)
-					AddToInventory(INV_2, HeldItem);
+					AddToInventory(INV_2, g_heldItem);
 				else
 					// Hook for definable default inventory
-					AddToInventory(INV_1, HeldItem);
+					AddToInventory(INV_1, g_heldItem);
 			}
 
 		} else if (!TinselV2) {
-			if (item == INV_NOICON && HeldItem != INV_NOICON)
+			if (item == INV_NOICON && g_heldItem != INV_NOICON)
 				DelAuxCursor();			// no longer aux cursor
 
 			if (item != INV_NOICON) {
@@ -1899,19 +1888,19 @@ extern void HoldItem(int item, bool bKeepFilm) {
 			}
 		}
 
-		HeldItem = item;			// Item held
+		g_heldItem = item;			// Item held
 
 		if (TinselV2) {
 			InventoryIconCursor(!bKeepFilm);
 
 			// Redraw contents - held item not displayed as a content.
-			ItemsChanged = true;
+			g_ItemsChanged = true;
 		}
 	}
 
 	if (!TinselV2)
 		// Redraw contents - held item not displayed as a content.
-		ItemsChanged = true;
+		g_ItemsChanged = true;
 }
 
 /**************************************************************************/
@@ -1929,8 +1918,8 @@ enum {	I_NOTIN, I_HEADER, I_BODY,
 			// the active area of the borders for re-sizing.
 
 /*---------------------------------*/
-#define LeftX	InvD[ino].inventoryX
-#define TopY	InvD[ino].inventoryY
+#define LeftX	g_InvD[g_ino].inventoryX
+#define TopY	g_InvD[g_ino].inventoryY
 /*---------------------------------*/
 
 /**
@@ -1943,8 +1932,8 @@ enum {	I_NOTIN, I_HEADER, I_BODY,
  */
 static int InvArea(int x, int y) {
 	if (TinselV2) {
-		int RightX = MultiRightmost(RectObject) - NM_BG_SIZ_X - NM_BG_POS_X - NM_RS_R_INSET;
-		int BottomY = MultiLowest(RectObject) - NM_BG_SIZ_Y - NM_BG_POS_Y - NM_RS_B_INSET;
+		int RightX = MultiRightmost(g_RectObject) - NM_BG_SIZ_X - NM_BG_POS_X - NM_RS_R_INSET;
+		int BottomY = MultiLowest(g_RectObject) - NM_BG_SIZ_Y - NM_BG_POS_Y - NM_RS_B_INSET;
 
 		// Outside the whole rectangle?
 		if (x <= LeftX || x > RightX || y <= TopY || y > BottomY)
@@ -1983,7 +1972,7 @@ static int InvArea(int x, int y) {
 			return I_HEADER;
 
 		// Scroll bits
-		if (!(ino == INV_MENU && cd.bExtraWin)) {
+		if (!(g_ino == INV_MENU && cd.bExtraWin)) {
 			if (x > RightX - NM_SLIDE_INSET && x <= RightX - NM_SLIDE_INSET + NM_SLIDE_THICKNESS) {
 				if (y > TopY + NM_UP_ARROW_TOP && y < TopY + NM_UP_ARROW_BOTTOM)
 					return I_UP;
@@ -1992,10 +1981,10 @@ static int InvArea(int x, int y) {
 
 				/* '3' is a magic adjustment with no apparent sense */
 
-				if (y >= TopY + sliderYmin - 3 && y < TopY + sliderYmax + NM_SLH) {
-					if (y < TopY + sliderYpos - 3)
+				if (y >= TopY + g_sliderYmin - 3 && y < TopY + g_sliderYmax + NM_SLH) {
+					if (y < TopY + g_sliderYpos - 3)
 						return I_SLIDE_UP;
-					if (y < TopY + sliderYpos + NM_SLH - 3)
+					if (y < TopY + g_sliderYpos + NM_SLH - 3)
 						return I_SLIDE;
 					else
 						return I_SLIDE_DOWN;
@@ -2003,8 +1992,8 @@ static int InvArea(int x, int y) {
 			}
 		}
 	} else {
-		int RightX = MultiRightmost(RectObject) + 1;
-		int BottomY = MultiLowest(RectObject) + 1;
+		int RightX = MultiRightmost(g_RectObject) + 1;
+		int BottomY = MultiLowest(g_RectObject) + 1;
 
 		// Outside the whole rectangle?
 		if (x <= LeftX - EXTRA || x > RightX + EXTRA
@@ -2041,7 +2030,7 @@ static int InvArea(int x, int y) {
 		/*
 		 * In the move area?
 		 */
-		if (ino != INV_CONF
+		if (g_ino != INV_CONF
 		&& x >= LeftX + M_SW - 2 && x <= RightX - M_SW + 3 &&
 		   y >= TopY + M_TH - 2  && y < TopY + M_TBB + 2)
 			return I_HEADER;
@@ -2049,17 +2038,17 @@ static int InvArea(int x, int y) {
 		/*
 		 * Scroll bits
 		 */
-		if (!(ino == INV_CONF && cd.bExtraWin)) {
+		if (!(g_ino == INV_CONF && cd.bExtraWin)) {
 			if (x > RightX - NM_SLIDE_INSET && x <= RightX - NM_SLIDE_INSET + NM_SLIDE_THICKNESS) {
 				if (y > TopY + M_IUT + 1 && y < TopY + M_IUB - 1)
 					return I_UP;
 				if (y > BottomY - M_IDT + 4 && y <= BottomY - M_IDB + 1)
 					return I_DOWN;
 
-				if (y >= TopY + sliderYmin && y < TopY + sliderYmax + M_SH) {
-					if (y < TopY + sliderYpos)
+				if (y >= TopY + g_sliderYmin && y < TopY + g_sliderYmax + M_SH) {
+					if (y < TopY + g_sliderYpos)
 						return I_SLIDE_UP;
-					if (y < TopY + sliderYpos + M_SH)
+					if (y < TopY + g_sliderYpos + M_SH)
 						return I_SLIDE;
 					else
 						return I_SLIDE_DOWN;
@@ -2081,14 +2070,14 @@ extern int InvItem(int *x, int *y, bool update) {
 	int item;
 	int IconsX;
 
-	itop = InvD[ino].inventoryY + START_ICONY;
+	itop = g_InvD[g_ino].inventoryY + START_ICONY;
 
-	IconsX = InvD[ino].inventoryX + START_ICONX;
+	IconsX = g_InvD[g_ino].inventoryX + START_ICONX;
 
-	for (item = InvD[ino].FirstDisp, row = 0; row < InvD[ino].NoofVicons; row++) {
+	for (item = g_InvD[g_ino].FirstDisp, row = 0; row < g_InvD[g_ino].NoofVicons; row++) {
 		ileft = IconsX;
 
-		for (col = 0; col < InvD[ino].NoofHicons; col++, item++) {
+		for (col = 0; col < g_InvD[g_ino].NoofHicons; col++, item++) {
 			if (*x >= ileft && *x < ileft + ITEM_WIDTH &&
 			   *y >= itop  && *y < itop + ITEM_HEIGHT) {
 				if (update) {
@@ -2121,20 +2110,20 @@ int InvItemId(int x, int y) {
 	int row, col;
 	int item;
 
-	if (InventoryHidden || InventoryState == IDLE_INV)
+	if (g_InventoryHidden || g_InventoryState == IDLE_INV)
 		return INV_NOICON;
 
-	itop = InvD[ino].inventoryY + START_ICONY;
+	itop = g_InvD[g_ino].inventoryY + START_ICONY;
 
-	int IconsX = InvD[ino].inventoryX + START_ICONX;
+	int IconsX = g_InvD[g_ino].inventoryX + START_ICONX;
 
-	for (item = InvD[ino].FirstDisp, row = 0; row < InvD[ino].NoofVicons; row++) {
+	for (item = g_InvD[g_ino].FirstDisp, row = 0; row < g_InvD[g_ino].NoofVicons; row++) {
 		ileft = IconsX;
 
-		for (col = 0; col < InvD[ino].NoofHicons; col++, item++) {
+		for (col = 0; col < g_InvD[g_ino].NoofHicons; col++, item++) {
 			if (x >= ileft && x < ileft + ITEM_WIDTH &&
 			   y >= itop  && y < itop + ITEM_HEIGHT) {
-				return InvD[ino].contents[item];
+				return g_InvD[g_ino].contents[item];
 			}
 
 			ileft += ITEM_WIDTH + 1;
@@ -2149,15 +2138,15 @@ int InvItemId(int x, int y) {
  */
 static int WhichMenuBox(int curX, int curY, bool bSlides) {
 	if (bSlides) {
-		for (int i = 0; i < numMdSlides; i++) {
-			if (curY > MultiHighest(mdSlides[i].obj) && curY < MultiLowest(mdSlides[i].obj)
-			&& curX > MultiLeftmost(mdSlides[i].obj) && curX < MultiRightmost(mdSlides[i].obj))
-				return mdSlides[i].num | IS_SLIDER;
+		for (int i = 0; i < g_numMdSlides; i++) {
+			if (curY > MultiHighest(g_mdSlides[i].obj) && curY < MultiLowest(g_mdSlides[i].obj)
+			&& curX > MultiLeftmost(g_mdSlides[i].obj) && curX < MultiRightmost(g_mdSlides[i].obj))
+				return g_mdSlides[i].num | IS_SLIDER;
 		}
 	}
 
-	curX -= InvD[ino].inventoryX;
-	curY -= InvD[ino].inventoryY;
+	curX -= g_InvD[g_ino].inventoryX;
+	curY -= g_InvD[g_ino].inventoryY;
 
 	for (int i = 0; i < cd.NumBoxes; i++) {
 		switch (cd.box[i].boxType) {
@@ -2184,7 +2173,7 @@ static int WhichMenuBox(int curX, int curY, bool bSlides) {
 			break;
 
 		case ROTATE:
-			if (bNoLanguage)
+			if (g_bNoLanguage)
 				break;
 
 			if (curY > cd.box[i].ypos && curY < cd.box[i].ypos + cd.box[i].h) {
@@ -2222,9 +2211,9 @@ static int WhichMenuBox(int curX, int curY, bool bSlides) {
 				return IB_UP;
 			else if (curY > (r.bottom - (TinselV2 ? 18 : 5)))
 				return IB_DOWN;
-			else if (curY + InvD[ino].inventoryY < sliderYpos)
+			else if (curY + g_InvD[g_ino].inventoryY < g_sliderYpos)
 				return IB_SLIDE_UP;
-			else if (curY + InvD[ino].inventoryY >= sliderYpos + NM_SLH)
+			else if (curY + g_InvD[g_ino].inventoryY >= g_sliderYpos + NM_SLH)
 				return IB_SLIDE_DOWN;
 			else
 				return IB_SLIDE;
@@ -2260,60 +2249,60 @@ static void InvBoxes(bool InBody, int curX, int curY) {
 	if (index < 0) {
 		// unhigh-light box (if one was)
 		cd.pointBox = NOBOX;
-		if (iconArray[HL1] != NULL) {
-			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL1]);
-			iconArray[HL1] = NULL;
+		if (g_iconArray[HL1] != NULL) {
+			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL1]);
+			g_iconArray[HL1] = NULL;
 		}
 	} else if (index != cd.pointBox) {
 		cd.pointBox = index;
 		// A new box is pointed to - high-light it
-		if (iconArray[HL1] != NULL) {
-			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL1]);
-			iconArray[HL1] = NULL;
+		if (g_iconArray[HL1] != NULL) {
+			MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL1]);
+			g_iconArray[HL1] = NULL;
 		}
 		if ((cd.box[cd.pointBox].boxType == ARSBUT && cd.selBox != NOBOX) ||
 ///* I don't agree */ cd.box[cd.pointBox].boxType == RGROUP ||
 		    cd.box[cd.pointBox].boxType == AATBUT ||
 		    cd.box[cd.pointBox].boxType == AABUT) {
-			iconArray[HL1] = RectangleObject(BgPal(),
+			g_iconArray[HL1] = RectangleObject(BgPal(),
 				(TinselV2 ? HighlightColor() : COL_HILIGHT),
 				cd.box[cd.pointBox].w, cd.box[cd.pointBox].h);
-			MultiInsertObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL1]);
-			MultiSetAniXY(iconArray[HL1],
-				InvD[ino].inventoryX + cd.box[cd.pointBox].xpos,
-				InvD[ino].inventoryY + cd.box[cd.pointBox].ypos);
-			MultiSetZPosition(iconArray[HL1], Z_INV_ICONS+1);
+			MultiInsertObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL1]);
+			MultiSetAniXY(g_iconArray[HL1],
+				g_InvD[g_ino].inventoryX + cd.box[cd.pointBox].xpos,
+				g_InvD[g_ino].inventoryY + cd.box[cd.pointBox].ypos);
+			MultiSetZPosition(g_iconArray[HL1], Z_INV_ICONS+1);
 		} else if (cd.box[cd.pointBox].boxType == AAGBUT ||
 				cd.box[cd.pointBox].boxType == ARSGBUT ||
 				cd.box[cd.pointBox].boxType == TOGGLE ||
 				cd.box[cd.pointBox].boxType == TOGGLE1 ||
 				cd.box[cd.pointBox].boxType == TOGGLE2) {
-			pfilm = (const FILM *)LockMem(hWinParts);
+			pfilm = (const FILM *)LockMem(g_hWinParts);
 
-			iconArray[HL1] = AddObject(&pfilm->reels[cd.box[cd.pointBox].bi+HIGRAPH], -1);
-			MultiSetAniXY(iconArray[HL1],
-				InvD[ino].inventoryX + cd.box[cd.pointBox].xpos,
-				InvD[ino].inventoryY + cd.box[cd.pointBox].ypos);
-			MultiSetZPosition(iconArray[HL1], Z_INV_ICONS+1);
+			g_iconArray[HL1] = AddObject(&pfilm->reels[cd.box[cd.pointBox].bi+HIGRAPH], -1);
+			MultiSetAniXY(g_iconArray[HL1],
+				g_InvD[g_ino].inventoryX + cd.box[cd.pointBox].xpos,
+				g_InvD[g_ino].inventoryY + cd.box[cd.pointBox].ypos);
+			MultiSetZPosition(g_iconArray[HL1], Z_INV_ICONS+1);
 		} else if (cd.box[cd.pointBox].boxType == ROTATE) {
-			if (bNoLanguage)
+			if (g_bNoLanguage)
 				return;
 
-			pfilm = (const FILM *)LockMem(hWinParts);
+			pfilm = (const FILM *)LockMem(g_hWinParts);
 
 			rotateIndex = cd.box[cd.pointBox].bi;
 			if (rotateIndex == IX2_LEFT1) {
-				iconArray[HL1] = AddObject(&pfilm->reels[IX2_LEFT2], -1 );
-				MultiSetAniXY(iconArray[HL1],
-					InvD[ino].inventoryX + cd.box[cd.pointBox].xpos - ROTX1,
-					InvD[ino].inventoryY + cd.box[cd.pointBox].ypos);
-				MultiSetZPosition(iconArray[HL1], Z_INV_ICONS+1);
+				g_iconArray[HL1] = AddObject(&pfilm->reels[IX2_LEFT2], -1 );
+				MultiSetAniXY(g_iconArray[HL1],
+					g_InvD[g_ino].inventoryX + cd.box[cd.pointBox].xpos - ROTX1,
+					g_InvD[g_ino].inventoryY + cd.box[cd.pointBox].ypos);
+				MultiSetZPosition(g_iconArray[HL1], Z_INV_ICONS+1);
 			} else if (rotateIndex == IX2_RIGHT1) {
-				iconArray[HL1] = AddObject(&pfilm->reels[IX2_RIGHT2], -1);
-				MultiSetAniXY(iconArray[HL1],
-					InvD[ino].inventoryX + cd.box[cd.pointBox].xpos + ROTX1,
-					InvD[ino].inventoryY + cd.box[cd.pointBox].ypos);
-				MultiSetZPosition(iconArray[HL1], Z_INV_ICONS + 1);
+				g_iconArray[HL1] = AddObject(&pfilm->reels[IX2_RIGHT2], -1);
+				MultiSetAniXY(g_iconArray[HL1],
+					g_InvD[g_ino].inventoryX + cd.box[cd.pointBox].xpos + ROTX1,
+					g_InvD[g_ino].inventoryY + cd.box[cd.pointBox].ypos);
+				MultiSetZPosition(g_iconArray[HL1], Z_INV_ICONS + 1);
 			}
 		}
 	}
@@ -2330,37 +2319,37 @@ static void ButtonPress(CORO_PARAM, CONFBOX *box) {
 	assert(box->boxType == AAGBUT || box->boxType == ARSGBUT);
 
 	// Replace highlight image with normal image
-	pfilm = (const FILM *)LockMem(hWinParts);
-	if (iconArray[HL1] != NULL)
-		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL1]);
-	pfilm = (const FILM *)LockMem(hWinParts);
-	iconArray[HL1] = AddObject(&pfilm->reels[box->bi+NORMGRAPH], -1);
-	MultiSetAniXY(iconArray[HL1], InvD[ino].inventoryX + box->xpos, InvD[ino].inventoryY + box->ypos);
-	MultiSetZPosition(iconArray[HL1], Z_INV_ICONS+1);
+	pfilm = (const FILM *)LockMem(g_hWinParts);
+	if (g_iconArray[HL1] != NULL)
+		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL1]);
+	pfilm = (const FILM *)LockMem(g_hWinParts);
+	g_iconArray[HL1] = AddObject(&pfilm->reels[box->bi+NORMGRAPH], -1);
+	MultiSetAniXY(g_iconArray[HL1], g_InvD[g_ino].inventoryX + box->xpos, g_InvD[g_ino].inventoryY + box->ypos);
+	MultiSetZPosition(g_iconArray[HL1], Z_INV_ICONS+1);
 
 	// Hold normal image for 1 frame
 	CORO_SLEEP(1);
-	if (iconArray[HL1] == NULL)
+	if (g_iconArray[HL1] == NULL)
 		return;
 
 	// Replace normal image with depresses image
-	pfilm = (const FILM *)LockMem(hWinParts);
-	MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL1]);
-	iconArray[HL1] = AddObject(&pfilm->reels[box->bi+DOWNGRAPH], -1);
-	MultiSetAniXY(iconArray[HL1], InvD[ino].inventoryX + box->xpos, InvD[ino].inventoryY + box->ypos);
-	MultiSetZPosition(iconArray[HL1], Z_INV_ICONS+1);
+	pfilm = (const FILM *)LockMem(g_hWinParts);
+	MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL1]);
+	g_iconArray[HL1] = AddObject(&pfilm->reels[box->bi+DOWNGRAPH], -1);
+	MultiSetAniXY(g_iconArray[HL1], g_InvD[g_ino].inventoryX + box->xpos, g_InvD[g_ino].inventoryY + box->ypos);
+	MultiSetZPosition(g_iconArray[HL1], Z_INV_ICONS+1);
 
 	// Hold depressed image for 2 frames
 	CORO_SLEEP(2);
-	if (iconArray[HL1] == NULL)
+	if (g_iconArray[HL1] == NULL)
 		return;
 
 	// Replace depressed image with normal image
-	pfilm = (const FILM *)LockMem(hWinParts);
-	MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL1]);
-	iconArray[HL1] = AddObject(&pfilm->reels[box->bi+NORMGRAPH], -1);
-	MultiSetAniXY(iconArray[HL1], InvD[ino].inventoryX + box->xpos, InvD[ino].inventoryY + box->ypos);
-	MultiSetZPosition(iconArray[HL1], Z_INV_ICONS+1);
+	pfilm = (const FILM *)LockMem(g_hWinParts);
+	MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL1]);
+	g_iconArray[HL1] = AddObject(&pfilm->reels[box->bi+NORMGRAPH], -1);
+	MultiSetAniXY(g_iconArray[HL1], g_InvD[g_ino].inventoryX + box->xpos, g_InvD[g_ino].inventoryY + box->ypos);
+	MultiSetZPosition(g_iconArray[HL1], Z_INV_ICONS+1);
 
 	CORO_SLEEP(1);
 
@@ -2379,25 +2368,25 @@ static void ButtonToggle(CORO_PARAM, CONFBOX *box) {
 		|| (box->boxType == TOGGLE2));
 
 	// Remove hilight image
-	if (iconArray[HL1] != NULL) {
-		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL1]);
-		iconArray[HL1] = NULL;
+	if (g_iconArray[HL1] != NULL) {
+		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL1]);
+		g_iconArray[HL1] = NULL;
 	}
 
 	// Hold normal image for 1 frame
 	CORO_SLEEP(1);
-	if (InventoryState != ACTIVE_INV)
+	if (g_InventoryState != ACTIVE_INV)
 		return;
 
 	// Add depressed image
-	pfilm = (const FILM *)LockMem(hWinParts);
-	iconArray[HL1] = AddObject(&pfilm->reels[box->bi+DOWNGRAPH], -1);
-	MultiSetAniXY(iconArray[HL1], InvD[ino].inventoryX + box->xpos, InvD[ino].inventoryY + box->ypos);
-	MultiSetZPosition(iconArray[HL1], Z_INV_ICONS+1);
+	pfilm = (const FILM *)LockMem(g_hWinParts);
+	g_iconArray[HL1] = AddObject(&pfilm->reels[box->bi+DOWNGRAPH], -1);
+	MultiSetAniXY(g_iconArray[HL1], g_InvD[g_ino].inventoryX + box->xpos, g_InvD[g_ino].inventoryY + box->ypos);
+	MultiSetZPosition(g_iconArray[HL1], Z_INV_ICONS+1);
 
 	// Hold depressed image for 1 frame
 	CORO_SLEEP(1);
-	if (iconArray[HL1] == NULL)
+	if (g_iconArray[HL1] == NULL)
 		return;
 
 	// Toggle state
@@ -2409,34 +2398,34 @@ static void ButtonToggle(CORO_PARAM, CONFBOX *box) {
 		Select(cd.selBox, true);
 
 	// New state, depressed image
-	pfilm = (const FILM *)LockMem(hWinParts);
-	if (iconArray[HL1] != NULL)
-		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL1]);
-	iconArray[HL1] = AddObject(&pfilm->reels[box->bi+DOWNGRAPH], -1);
-	MultiSetAniXY(iconArray[HL1], InvD[ino].inventoryX + box->xpos, InvD[ino].inventoryY + box->ypos);
-	MultiSetZPosition(iconArray[HL1], Z_INV_ICONS+1);
+	pfilm = (const FILM *)LockMem(g_hWinParts);
+	if (g_iconArray[HL1] != NULL)
+		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL1]);
+	g_iconArray[HL1] = AddObject(&pfilm->reels[box->bi+DOWNGRAPH], -1);
+	MultiSetAniXY(g_iconArray[HL1], g_InvD[g_ino].inventoryX + box->xpos, g_InvD[g_ino].inventoryY + box->ypos);
+	MultiSetZPosition(g_iconArray[HL1], Z_INV_ICONS+1);
 
 	// Hold new depressed image for 1 frame
 	CORO_SLEEP(1);
-	if (iconArray[HL1] == NULL)
+	if (g_iconArray[HL1] == NULL)
 		return;
 
 	// New state, normal
-	MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL1]);
-	iconArray[HL1] = NULL;
+	MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL1]);
+	g_iconArray[HL1] = NULL;
 
 	// Hold normal image for 1 frame
 	CORO_SLEEP(1);
-	if (InventoryState != ACTIVE_INV)
+	if (g_InventoryState != ACTIVE_INV)
 		return;
 
 	// New state, highlighted
-	pfilm = (const FILM *)LockMem(hWinParts);
-	if (iconArray[HL1] != NULL)
-		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), iconArray[HL1]);
-	iconArray[HL1] = AddObject(&pfilm->reels[box->bi+HIGRAPH], -1);
-	MultiSetAniXY(iconArray[HL1], InvD[ino].inventoryX + box->xpos, InvD[ino].inventoryY + box->ypos);
-	MultiSetZPosition(iconArray[HL1], Z_INV_ICONS+1);
+	pfilm = (const FILM *)LockMem(g_hWinParts);
+	if (g_iconArray[HL1] != NULL)
+		MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[HL1]);
+	g_iconArray[HL1] = AddObject(&pfilm->reels[box->bi+HIGRAPH], -1);
+	MultiSetAniXY(g_iconArray[HL1], g_InvD[g_ino].inventoryX + box->xpos, g_InvD[g_ino].inventoryY + box->ypos);
+	MultiSetZPosition(g_iconArray[HL1], Z_INV_ICONS+1);
 
 	CORO_END_CODE;
 }
@@ -2454,23 +2443,23 @@ static void InvLabels(bool InBody, int aniX, int aniY) {
 	else {
 		index = InvItem(&aniX, &aniY, false);
 		if (index != INV_NOICON) {
-			if (index >= InvD[ino].NoofItems)
+			if (index >= g_InvD[g_ino].NoofItems)
 				index = INV_NOICON;
 			else
-				index = InvD[ino].contents[index];
+				index = g_InvD[g_ino].contents[index];
 		}
 	}
 
 	// If no icon pointed to, or points to (logical position of)
 	// currently held icon, then no icon is pointed to!
-	if (index == INV_NOICON || index == HeldItem) {
-		pointedIcon = INV_NOICON;
-	} else if (index != pointedIcon) {
+	if (index == INV_NOICON || index == g_heldItem) {
+		g_pointedIcon = INV_NOICON;
+	} else if (index != g_pointedIcon) {
 		// A new icon is pointed to - run its script with POINTED event
 		invObj = GetInvObject(index);
 		if (invObj->hScript)
 			InvTinselEvent(invObj, POINTED, PLR_NOEVENT, index);
-		pointedIcon = index;
+		g_pointedIcon = index;
 	}
 }
 
@@ -2492,54 +2481,54 @@ static void AdjustTop() {
 	int n, i;
 
 	// Only do this if there's a slider
-	if (!SlideObject)
+	if (!g_SlideObject)
 		return;
 
-	rowsWanted = (InvD[ino].NoofItems - InvD[ino].FirstDisp + InvD[ino].NoofHicons-1) / InvD[ino].NoofHicons;
+	rowsWanted = (g_InvD[g_ino].NoofItems - g_InvD[g_ino].FirstDisp + g_InvD[g_ino].NoofHicons-1) / g_InvD[g_ino].NoofHicons;
 
-	while (rowsWanted < InvD[ino].NoofVicons) {
-		if (InvD[ino].FirstDisp) {
-			InvD[ino].FirstDisp -= InvD[ino].NoofHicons;
-			if (InvD[ino].FirstDisp < 0)
-				InvD[ino].FirstDisp = 0;
+	while (rowsWanted < g_InvD[g_ino].NoofVicons) {
+		if (g_InvD[g_ino].FirstDisp) {
+			g_InvD[g_ino].FirstDisp -= g_InvD[g_ino].NoofHicons;
+			if (g_InvD[g_ino].FirstDisp < 0)
+				g_InvD[g_ino].FirstDisp = 0;
 			rowsWanted++;
 		} else
 			break;
 	}
-	tMissing = InvD[ino].FirstDisp ? (InvD[ino].FirstDisp + InvD[ino].NoofHicons-1)/InvD[ino].NoofHicons : 0;
-	bMissing = (rowsWanted > InvD[ino].NoofVicons) ? rowsWanted - InvD[ino].NoofVicons : 0;
+	tMissing = g_InvD[g_ino].FirstDisp ? (g_InvD[g_ino].FirstDisp + g_InvD[g_ino].NoofHicons-1)/g_InvD[g_ino].NoofHicons : 0;
+	bMissing = (rowsWanted > g_InvD[g_ino].NoofVicons) ? rowsWanted - g_InvD[g_ino].NoofVicons : 0;
 
 	nMissing = tMissing + bMissing;
-	slideRange = sliderYmax - sliderYmin;
+	slideRange = g_sliderYmax - g_sliderYmin;
 
 	if (!tMissing)
-		nsliderYpos = sliderYmin;
+		nsliderYpos = g_sliderYmin;
 	else if (!bMissing)
-		nsliderYpos = sliderYmax;
+		nsliderYpos = g_sliderYmax;
 	else {
 		nsliderYpos = tMissing*slideRange/nMissing;
-		nsliderYpos += sliderYmin;
+		nsliderYpos += g_sliderYmin;
 	}
 
 	if (nMissing) {
-		n = InvD[ino].FirstDisp - tMissing*InvD[ino].NoofHicons;
-		for (i = 0; i <= nMissing; i++, n += InvD[ino].NoofHicons) {
-			slideStuff[i].n = n;
-			slideStuff[i].y = (i*slideRange/nMissing) + sliderYmin;
+		n = g_InvD[g_ino].FirstDisp - tMissing*g_InvD[g_ino].NoofHicons;
+		for (i = 0; i <= nMissing; i++, n += g_InvD[g_ino].NoofHicons) {
+			g_slideStuff[i].n = n;
+			g_slideStuff[i].y = (i*slideRange/nMissing) + g_sliderYmin;
 		}
-		if (slideStuff[0].n < 0)
-			slideStuff[0].n = 0;
+		if (g_slideStuff[0].n < 0)
+			g_slideStuff[0].n = 0;
 		assert(i < MAX_ININV + 1);
-		slideStuff[i].n = -1;
+		g_slideStuff[i].n = -1;
 	} else {
-		slideStuff[0].n = 0;
-		slideStuff[0].y = sliderYmin;
-		slideStuff[1].n = -1;
+		g_slideStuff[0].n = 0;
+		g_slideStuff[0].y = g_sliderYmin;
+		g_slideStuff[1].n = -1;
 	}
 
-	if (nsliderYpos != sliderYpos) {
-		MultiMoveRelXY(SlideObject, 0, nsliderYpos - sliderYpos);
-		sliderYpos = nsliderYpos;
+	if (nsliderYpos != g_sliderYpos) {
+		MultiMoveRelXY(g_SlideObject, 0, nsliderYpos - g_sliderYpos);
+		g_sliderYpos = nsliderYpos;
 	}
 }
 
@@ -2580,26 +2569,26 @@ static void FillInInventory() {
 
 	DumpIconArray();
 
-	if (InvDragging != ID_SLIDE)
+	if (g_InvDragging != ID_SLIDE)
 		AdjustTop();		// Set up slideStuff[]
 
-	Index = InvD[ino].FirstDisp;	// Start from first displayed object
+	Index = g_InvD[g_ino].FirstDisp;	// Start from first displayed object
 	n = 0;
 	ypos = START_ICONY;		// Y-offset of first display row
 
-	for (row = 0; row < InvD[ino].NoofVicons; row++,	ypos += ITEM_HEIGHT + 1) {
+	for (row = 0; row < g_InvD[g_ino].NoofVicons; row++,	ypos += ITEM_HEIGHT + 1) {
 		xpos = START_ICONX;		// X-offset of first display column
 
-		for (col = 0; col < InvD[ino].NoofHicons; col++) {
-			if (Index >= InvD[ino].NoofItems)
+		for (col = 0; col < g_InvD[g_ino].NoofHicons; col++) {
+			if (Index >= g_InvD[g_ino].NoofItems)
 				break;
-			else if (InvD[ino].contents[Index] != HeldItem) {
+			else if (g_InvD[g_ino].contents[Index] != g_heldItem) {
 				// Create a display object and position it
-				iconArray[n] = AddInvObject(InvD[ino].contents[Index], &pfr, &pfilm);
-				MultiSetAniXY(iconArray[n], InvD[ino].inventoryX + xpos , InvD[ino].inventoryY + ypos);
-				MultiSetZPosition(iconArray[n], Z_INV_ICONS);
+				g_iconArray[n] = AddInvObject(g_InvD[g_ino].contents[Index], &pfr, &pfilm);
+				MultiSetAniXY(g_iconArray[n], g_InvD[g_ino].inventoryX + xpos , g_InvD[g_ino].inventoryY + ypos);
+				MultiSetZPosition(g_iconArray[n], Z_INV_ICONS);
 
-				InitStepAnimScript(&iconAnims[n], iconArray[n], FROM_LE_32(pfr->script), ONE_SECOND / FROM_LE_32(pfilm->frate));
+				InitStepAnimScript(&g_iconAnims[n], g_iconArray[n], FROM_LE_32(pfr->script), ONE_SECOND / FROM_LE_32(pfilm->frate));
 
 				n++;
 			}
@@ -2617,16 +2606,16 @@ enum {FROM_HANDLE, FROM_STRING};
  */
 static void AddBackground(OBJECT **rect, OBJECT **title, int extraH, int extraV, int textFrom) {
 	// Why not 2 ????
-	int width = TLwidth + extraH + TRwidth + NM_BG_SIZ_X;
-	int height = TLheight + extraV + BLheight + NM_BG_SIZ_Y;
+	int width = g_TLwidth + extraH + g_TRwidth + NM_BG_SIZ_X;
+	int height = g_TLheight + extraV + g_BLheight + NM_BG_SIZ_Y;
 
 	// Create a rectangle object
-	RectObject = *rect = TranslucentObject(width, height);
+	g_RectObject = *rect = TranslucentObject(width, height);
 
 	// add it to display list and position it
 	MultiInsertObject(GetPlayfieldList(FIELD_STATUS), *rect);
-	MultiSetAniXY(*rect, InvD[ino].inventoryX + NM_BG_POS_X,
-		InvD[ino].inventoryY + NM_BG_POS_Y);
+	MultiSetAniXY(*rect, g_InvD[g_ino].inventoryX + NM_BG_POS_X,
+		g_InvD[g_ino].inventoryY + NM_BG_POS_Y);
 	MultiSetZPosition(*rect, Z_INV_BRECT);
 
 	if (title == NULL)
@@ -2634,16 +2623,16 @@ static void AddBackground(OBJECT **rect, OBJECT **title, int extraH, int extraV,
 
 	// Create text object using title string
 	if (textFrom == FROM_HANDLE) {
-		LoadStringRes(InvD[ino].hInvTitle, TextBufferAddr(), TBUFSZ);
+		LoadStringRes(g_InvD[g_ino].hInvTitle, TextBufferAddr(), TBUFSZ);
 		*title = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(), 0,
-					InvD[ino].inventoryX + width/2, InvD[ino].inventoryY + M_TOFF,
+					g_InvD[g_ino].inventoryX + width/2, g_InvD[g_ino].inventoryY + M_TOFF,
 					GetTagFontHandle(), TXT_CENTER);
 		assert(*title); // Inventory title string produced NULL text
 		MultiSetZPosition(*title, Z_INV_HTEXT);
 	} else if (textFrom == FROM_STRING && cd.ixHeading != NO_HEADING) {
-		LoadStringRes(configStrings[cd.ixHeading], TextBufferAddr(), TBUFSZ);
+		LoadStringRes(g_configStrings[cd.ixHeading], TextBufferAddr(), TBUFSZ);
 		*title = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(), 0,
-					InvD[ino].inventoryX + width/2, InvD[ino].inventoryY + M_TOFF,
+					g_InvD[g_ino].inventoryX + width/2, g_InvD[g_ino].inventoryY + M_TOFF,
 					GetTagFontHandle(), TXT_CENTER);
 		assert(*title); // Inventory title string produced NULL text
 		MultiSetZPosition(*title, Z_INV_HTEXT);
@@ -2661,13 +2650,13 @@ static void AddBackground(OBJECT **rect, int extraH, int extraV) {
  * Adds a title for a dialog
  */
 static void AddTitle(POBJECT *title, int extraH) {
-	int width = TLwidth + extraH + TRwidth + NM_BG_SIZ_X;
+	int width = g_TLwidth + extraH + g_TRwidth + NM_BG_SIZ_X;
 
 	// Create text object using title string
-	if (InvD[ino].hInvTitle != (SCNHANDLE)NO_HEADING) {
-		LoadStringRes(InvD[ino].hInvTitle, TextBufferAddr(), TBUFSZ);
+	if (g_InvD[g_ino].hInvTitle != (SCNHANDLE)NO_HEADING) {
+		LoadStringRes(g_InvD[g_ino].hInvTitle, TextBufferAddr(), TBUFSZ);
 		*title = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(), 0,
-					InvD[ino].inventoryX + (width/2)+NM_BG_POS_X, InvD[ino].inventoryY + NM_TOFF,
+					g_InvD[g_ino].inventoryX + (width/2)+NM_BG_POS_X, g_InvD[g_ino].inventoryY + NM_TOFF,
 					GetTagFontHandle(), TXT_CENTER, 0);
 		assert(*title);
 		MultiSetZPosition(*title, Z_INV_HTEXT);
@@ -2691,13 +2680,13 @@ static OBJECT *AddObject(const FREEL *pfreel, int num) {
 
 	// Horrible bodge involving global variables to save
 	// width and/or height of some window frame components
-	if (num == TL) {
-		TLwidth = FROM_LE_16(pim->imgWidth);
-		TLheight = FROM_LE_16(pim->imgHeight) & ~C16_FLAG_MASK;
-	} else if (num == TR) {
-		TRwidth = FROM_LE_16(pim->imgWidth);
-	} else if (num == BL) {
-		BLheight = FROM_LE_16(pim->imgHeight) & ~C16_FLAG_MASK;
+	if (num == g_TL) {
+		g_TLwidth = FROM_LE_16(pim->imgWidth);
+		g_TLheight = FROM_LE_16(pim->imgHeight) & ~C16_FLAG_MASK;
+	} else if (num == g_TR) {
+		g_TRwidth = FROM_LE_16(pim->imgWidth);
+	} else if (num == g_BL) {
+		g_BLheight = FROM_LE_16(pim->imgHeight) & ~C16_FLAG_MASK;
 	}
 
 	// Set up and insert the multi-object
@@ -2712,9 +2701,9 @@ static OBJECT *AddObject(const FREEL *pfreel, int num) {
  */
 
 static void AddSlider(OBJECT **slide, const FILM *pfilm) {
-	SlideObject = *slide = AddObject(&pfilm->reels[IX_SLIDE], -1);
-	MultiSetAniXY(*slide, MultiRightmost(RectObject) + (TinselV2 ? NM_SLX : -M_SXOFF + 2) - 1,
-		InvD[ino].inventoryY + sliderYpos);
+	g_SlideObject = *slide = AddObject(&pfilm->reels[IX_SLIDE], -1);
+	MultiSetAniXY(*slide, MultiRightmost(g_RectObject) + (TinselV2 ? NM_SLX : -M_SXOFF + 2) - 1,
+		g_InvD[g_ino].inventoryY + g_sliderYpos);
 	MultiSetZPosition(*slide, Z_INV_MFRAME);
 }
 
@@ -2722,8 +2711,8 @@ static void AddSlider(OBJECT **slide, const FILM *pfilm) {
  * Display a box with some text in it.
  */
 static void AddBox(int *pi, const int i) {
-	int x	= InvD[ino].inventoryX + cd.box[i].xpos;
-	int y	= InvD[ino].inventoryY + cd.box[i].ypos;
+	int x	= g_InvD[g_ino].inventoryX + cd.box[i].xpos;
+	int y	= g_InvD[g_ino].inventoryY + cd.box[i].ypos;
 	int *pival = cd.box[i].ival;
 	int	xdisp;
 	const FILM *pFilm;
@@ -2735,11 +2724,11 @@ static void AddBox(int *pi, const int i) {
 			break;
 
 		// Give us a box
-		iconArray[*pi] = RectangleObject(BgPal(), TinselV2 ? BoxColor() : COL_BOX,
+		g_iconArray[*pi] = RectangleObject(BgPal(), TinselV2 ? BoxColor() : COL_BOX,
 			cd.box[i].w, cd.box[i].h);
-		MultiInsertObject(GetPlayfieldList(FIELD_STATUS), iconArray[*pi]);
-		MultiSetAniXY(iconArray[*pi], x, y);
-		MultiSetZPosition(iconArray[*pi], Z_INV_BRECT + 1);
+		MultiInsertObject(GetPlayfieldList(FIELD_STATUS), g_iconArray[*pi]);
+		MultiSetAniXY(g_iconArray[*pi], x, y);
+		MultiSetZPosition(g_iconArray[*pi], Z_INV_BRECT + 1);
 		*pi += 1;
 
 		// Stick in the text
@@ -2747,14 +2736,14 @@ static void AddBox(int *pi, const int i) {
 				(!TinselV2 && (cd.box[i].ixText == USE_POINTER))) {
 			if (cd.box[i].boxText != NULL) {
 				if (cd.box[i].boxType == RGROUP) {
-					iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), cd.box[i].boxText, 0,
+					g_iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), cd.box[i].boxText, 0,
 #ifdef JAPAN
 							x + 2, y+2, GetTagFontHandle(), 0);
 #else
 							x + 2, y + TYOFF, GetTagFontHandle(), 0);
 #endif
 				} else {
-					iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), cd.box[i].boxText, 0,
+					g_iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), cd.box[i].boxText, 0,
 #ifdef JAPAN
 // Note: it never seems to go here!
 							x + cd.box[i].w/2, y+2, GetTagFontHandle(), TXT_CENTER);
@@ -2763,7 +2752,7 @@ static void AddBox(int *pi, const int i) {
 #endif
 				}
 
-				MultiSetZPosition(iconArray[*pi], Z_INV_ITEXT);
+				MultiSetZPosition(g_iconArray[*pi], Z_INV_ITEXT);
 				*pi += 1;
 			}
 		} else {
@@ -2775,61 +2764,61 @@ static void AddBox(int *pi, const int i) {
 					LoadStringRes(cd.box[i].ixText, TextBufferAddr(), TBUFSZ);
 				}
 			} else {
-				LoadStringRes(configStrings[cd.box[i].ixText], TextBufferAddr(), TBUFSZ);
+				LoadStringRes(g_configStrings[cd.box[i].ixText], TextBufferAddr(), TBUFSZ);
 				assert(cd.box[i].boxType != RGROUP); // You'll need to add some code!
 			}
 
 			if (TinselV2 && (cd.box[i].boxType == RGROUP))
-				iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(),
+				g_iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(),
 						0, x + 2, y + TYOFF, GetTagFontHandle(), 0, 0);
 			else
-				iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
+				g_iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
 					TextBufferAddr(), 0,
 #ifdef JAPAN
 					x + cd.box[i].w/2, y+2, GetTagFontHandle(), TXT_CENTER);
 #else
 					x + cd.box[i].w / 2, y + TYOFF, GetTagFontHandle(), TXT_CENTER);
 #endif
-			MultiSetZPosition(iconArray[*pi], Z_INV_ITEXT);
+			MultiSetZPosition(g_iconArray[*pi], Z_INV_ITEXT);
 			*pi += 1;
 		}
 		break;
 
 	case AAGBUT:
 	case ARSGBUT:
-		pFilm = (const FILM *)LockMem(hWinParts);
+		pFilm = (const FILM *)LockMem(g_hWinParts);
 
-		iconArray[*pi] = AddObject(&pFilm->reels[cd.box[i].bi + NORMGRAPH], -1);
-		MultiSetAniXY(iconArray[*pi], x, y);
-		MultiSetZPosition(iconArray[*pi], Z_INV_BRECT + 1);
+		g_iconArray[*pi] = AddObject(&pFilm->reels[cd.box[i].bi + NORMGRAPH], -1);
+		MultiSetAniXY(g_iconArray[*pi], x, y);
+		MultiSetZPosition(g_iconArray[*pi], Z_INV_BRECT + 1);
 		*pi += 1;
 
 		break;
 
 	case FRGROUP:
-		assert(flagFilm != 0); // Language flags not declared!
+		assert(g_flagFilm != 0); // Language flags not declared!
 
-		pFilm = (const FILM *)LockMem(flagFilm);
+		pFilm = (const FILM *)LockMem(g_flagFilm);
 
 		if (_vm->_config->_isAmericanEnglishVersion && cd.box[i].bi == FIX_UK)
 			cd.box[i].bi = FIX_USA;
 
-		iconArray[*pi] = AddObject(&pFilm->reels[cd.box[i].bi], -1);
-		MultiSetAniXY(iconArray[*pi], x, y);
-		MultiSetZPosition(iconArray[*pi], Z_INV_BRECT+2);
+		g_iconArray[*pi] = AddObject(&pFilm->reels[cd.box[i].bi], -1);
+		MultiSetAniXY(g_iconArray[*pi], x, y);
+		MultiSetZPosition(g_iconArray[*pi], Z_INV_BRECT+2);
 		*pi += 1;
 
 		break;
 
 	case FLIP:
-		pFilm = (const FILM *)LockMem(hWinParts);
+		pFilm = (const FILM *)LockMem(g_hWinParts);
 
 		if (*pival)
-			iconArray[*pi] = AddObject(&pFilm->reels[cd.box[i].bi], -1);
+			g_iconArray[*pi] = AddObject(&pFilm->reels[cd.box[i].bi], -1);
 		else
-			iconArray[*pi] = AddObject(&pFilm->reels[cd.box[i].bi+1], -1);
-		MultiSetAniXY(iconArray[*pi], x, y);
-		MultiSetZPosition(iconArray[*pi], Z_INV_BRECT+1);
+			g_iconArray[*pi] = AddObject(&pFilm->reels[cd.box[i].bi+1], -1);
+		MultiSetAniXY(g_iconArray[*pi], x, y);
+		MultiSetZPosition(g_iconArray[*pi], Z_INV_BRECT+1);
 		*pi += 1;
 
 		// Stick in the text
@@ -2838,23 +2827,23 @@ static void AddBox(int *pi, const int i) {
 			LoadStringRes(SysString(cd.box[i].ixText), TextBufferAddr(), TBUFSZ);
 		} else {
 			assert(cd.box[i].ixText != USE_POINTER);
-			LoadStringRes(configStrings[cd.box[i].ixText], TextBufferAddr(), TBUFSZ);
+			LoadStringRes(g_configStrings[cd.box[i].ixText], TextBufferAddr(), TBUFSZ);
 		}
-		iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
+		g_iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
 			TextBufferAddr(), 0, x + MDTEXT_XOFF, y + MDTEXT_YOFF, GetTagFontHandle(), TXT_RIGHT);
-		MultiSetZPosition(iconArray[*pi], Z_INV_ITEXT);
+		MultiSetZPosition(g_iconArray[*pi], Z_INV_ITEXT);
 		*pi += 1;
 		break;
 
 	case TOGGLE:
 	case TOGGLE1:
 	case TOGGLE2:
-		pFilm = (const FILM *)LockMem(hWinParts);
+		pFilm = (const FILM *)LockMem(g_hWinParts);
 
 		cd.box[i].bi = *pival ? IX_TICK1 : IX_CROSS1;
-		iconArray[*pi] = AddObject(&pFilm->reels[cd.box[i].bi + NORMGRAPH], -1);
-		MultiSetAniXY(iconArray[*pi], x, y);
-		MultiSetZPosition(iconArray[*pi], Z_INV_BRECT+1);
+		g_iconArray[*pi] = AddObject(&pFilm->reels[cd.box[i].bi + NORMGRAPH], -1);
+		MultiSetAniXY(g_iconArray[*pi], x, y);
+		MultiSetZPosition(g_iconArray[*pi], Z_INV_BRECT+1);
 		*pi += 1;
 
 		// Stick in the text
@@ -2863,39 +2852,39 @@ static void AddBox(int *pi, const int i) {
 			LoadStringRes(SysString(cd.box[i].ixText), TextBufferAddr(), TBUFSZ);
 		} else {
 			assert(cd.box[i].ixText != USE_POINTER);
-			LoadStringRes(configStrings[cd.box[i].ixText], TextBufferAddr(), TBUFSZ);
+			LoadStringRes(g_configStrings[cd.box[i].ixText], TextBufferAddr(), TBUFSZ);
 		}
 
 		if (cd.box[i].boxType == TOGGLE2) {
-			iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
+			g_iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
 				TextBufferAddr(), 0, x + cd.box[i].w / 2, y + TOG2_YOFF,
 				GetTagFontHandle(), TXT_CENTER, 0);
 		} else {
-			iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
+			g_iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
 				TextBufferAddr(), 0, x + MDTEXT_XOFF, y + MDTEXT_YOFF,
 				GetTagFontHandle(), TXT_RIGHT, 0);
 		}
 
-		MultiSetZPosition(iconArray[*pi], Z_INV_ITEXT);
+		MultiSetZPosition(g_iconArray[*pi], Z_INV_ITEXT);
 		*pi += 1;
 		break;
 
 	case SLIDER:
-		pFilm = (const FILM *)LockMem(hWinParts);
+		pFilm = (const FILM *)LockMem(g_hWinParts);
 		xdisp = SLIDE_RANGE*(*pival)/cd.box[i].w;
 
-		iconArray[*pi] = AddObject(&pFilm->reels[IX_MDGROOVE], -1);
-		MultiSetAniXY(iconArray[*pi], x, y);
-		MultiSetZPosition(iconArray[*pi], Z_MDGROOVE);
+		g_iconArray[*pi] = AddObject(&pFilm->reels[IX_MDGROOVE], -1);
+		MultiSetAniXY(g_iconArray[*pi], x, y);
+		MultiSetZPosition(g_iconArray[*pi], Z_MDGROOVE);
 		*pi += 1;
-		iconArray[*pi] = AddObject(&pFilm->reels[IX_MDSLIDER], -1);
-		MultiSetAniXY(iconArray[*pi], x+SLIDE_MINX+xdisp, y);
-		MultiSetZPosition(iconArray[*pi], Z_MDSLIDER);
-		assert(numMdSlides < MAXSLIDES);
-		mdSlides[numMdSlides].num = i;
-		mdSlides[numMdSlides].min = x + SLIDE_MINX;
-		mdSlides[numMdSlides].max = x + SLIDE_MAXX;
-		mdSlides[numMdSlides++].obj = iconArray[*pi];
+		g_iconArray[*pi] = AddObject(&pFilm->reels[IX_MDSLIDER], -1);
+		MultiSetAniXY(g_iconArray[*pi], x+SLIDE_MINX+xdisp, y);
+		MultiSetZPosition(g_iconArray[*pi], Z_MDSLIDER);
+		assert(g_numMdSlides < MAXSLIDES);
+		g_mdSlides[g_numMdSlides].num = i;
+		g_mdSlides[g_numMdSlides].min = x + SLIDE_MINX;
+		g_mdSlides[g_numMdSlides].max = x + SLIDE_MAXX;
+		g_mdSlides[g_numMdSlides++].obj = g_iconArray[*pi];
 		*pi += 1;
 
 		// Stick in the text
@@ -2904,55 +2893,55 @@ static void AddBox(int *pi, const int i) {
 			LoadStringRes(SysString(cd.box[i].ixText), TextBufferAddr(), TBUFSZ);
 		} else {
 			assert(cd.box[i].ixText != USE_POINTER);
-			LoadStringRes(configStrings[cd.box[i].ixText], TextBufferAddr(), TBUFSZ);
+			LoadStringRes(g_configStrings[cd.box[i].ixText], TextBufferAddr(), TBUFSZ);
 		}
-		iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
+		g_iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
 			TextBufferAddr(), 0, x+MDTEXT_XOFF, y+MDTEXT_YOFF, GetTagFontHandle(), TXT_RIGHT);
-		MultiSetZPosition(iconArray[*pi], Z_INV_ITEXT);
+		MultiSetZPosition(g_iconArray[*pi], Z_INV_ITEXT);
 		*pi += 1;
 		break;
 
 	case ROTATE:
-		pFilm = (const FILM *)LockMem(hWinParts);
+		pFilm = (const FILM *)LockMem(g_hWinParts);
 
 		// Left one
-		if (!bNoLanguage) {
-			iconArray[*pi] = AddObject(&pFilm->reels[IX2_LEFT1], -1);
-			MultiSetAniXY(iconArray[*pi], x-ROTX1, y);
-			MultiSetZPosition(iconArray[*pi], Z_INV_BRECT + 1);
+		if (!g_bNoLanguage) {
+			g_iconArray[*pi] = AddObject(&pFilm->reels[IX2_LEFT1], -1);
+			MultiSetAniXY(g_iconArray[*pi], x-ROTX1, y);
+			MultiSetZPosition(g_iconArray[*pi], Z_INV_BRECT + 1);
 			*pi += 1;
 
 			// Right one
-			iconArray[*pi] = AddObject( &pFilm->reels[IX2_RIGHT1], -1);
-			MultiSetAniXY(iconArray[*pi], x + ROTX1, y);
-			MultiSetZPosition(iconArray[*pi], Z_INV_BRECT + 1);
+			g_iconArray[*pi] = AddObject( &pFilm->reels[IX2_RIGHT1], -1);
+			MultiSetAniXY(g_iconArray[*pi], x + ROTX1, y);
+			MultiSetZPosition(g_iconArray[*pi], Z_INV_BRECT + 1);
 			*pi += 1;
 
 			// Stick in the text
 			assert(cd.box[i].textMethod == TM_INDEX);
 			LoadStringRes(SysString(cd.box[i].ixText), TextBufferAddr(), TBUFSZ);
-			iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
+			g_iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
 				TextBufferAddr(), 0, x + cd.box[i].w / 2, y + TOG2_YOFF,
 				GetTagFontHandle(), TXT_CENTER, 0);
-			MultiSetZPosition(iconArray[*pi], Z_INV_ITEXT);
+			MultiSetZPosition(g_iconArray[*pi], Z_INV_ITEXT);
 			*pi += 1;
 		}
 
 		// Current language's text
-		if (LanguageDesc(displayedLanguage) == 0)
+		if (LanguageDesc(g_displayedLanguage) == 0)
 			break;
 
-		LoadStringRes(LanguageDesc(displayedLanguage), TextBufferAddr(), TBUFSZ);
-		iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(), 0,
+		LoadStringRes(LanguageDesc(g_displayedLanguage), TextBufferAddr(), TBUFSZ);
+		g_iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(), 0,
 				x + cd.box[i].w / 2, y + ROT_YOFF, GetTagFontHandle(), TXT_CENTER, 0);
-		MultiSetZPosition(iconArray[*pi], Z_INV_ITEXT);
+		MultiSetZPosition(g_iconArray[*pi], Z_INV_ITEXT);
 		*pi += 1;
 
 		// Current language's flag
-		pFilm = (const FILM *)LockMem(LanguageFlag(displayedLanguage));
-		iconArray[*pi] = AddObject(&pFilm->reels[0], -1);
-		MultiSetAniXY(iconArray[*pi], x + FLAGX, y + FLAGY);
-		MultiSetZPosition(iconArray[*pi], Z_INV_BRECT + 1);
+		pFilm = (const FILM *)LockMem(LanguageFlag(g_displayedLanguage));
+		g_iconArray[*pi] = AddObject(&pFilm->reels[0], -1);
+		MultiSetAniXY(g_iconArray[*pi], x + FLAGX, y + FLAGY);
+		MultiSetZPosition(g_iconArray[*pi], Z_INV_BRECT + 1);
 		*pi += 1;
 		break;
 	}
@@ -2965,7 +2954,7 @@ static void AddBoxes(bool bPosnSlide) {
 	int	objCount = NUMHL;	// Object count - allow for HL1, HL2 etc.
 
 	DumpIconArray();
-	numMdSlides = 0;
+	g_numMdSlides = 0;
 
 	for (int i = 0; i < cd.NumBoxes; i++) {
 		AddBox(&objCount, i);
@@ -2973,32 +2962,32 @@ static void AddBoxes(bool bPosnSlide) {
 
 	if (cd.bExtraWin) {
 		if (bPosnSlide && !TinselV2)
-			sliderYpos = sliderYmin + (cd.extraBase*(sliderYmax-sliderYmin))/(MAX_SAVED_FILES-NUM_RGROUP_BOXES);
+			g_sliderYpos = g_sliderYmin + (cd.extraBase*(g_sliderYmax-g_sliderYmin))/(MAX_SAVED_FILES-NUM_RGROUP_BOXES);
 		else if (bPosnSlide) {
 			// Tinsel 2 bPosnSlide code
-			int lastY = sliderYpos;
+			int lastY = g_sliderYpos;
 
 			if (cd.box == loadBox || cd.box == saveBox)
-				sliderYpos = sliderYmin + (cd.extraBase * (sliderRange)) /
+				g_sliderYpos = g_sliderYmin + (cd.extraBase * (sliderRange)) /
 				(MAX_SAVED_FILES - NUM_RGROUP_BOXES);
 			else if (cd.box == hopperBox1) {
-				if (numScenes <= NUM_RGROUP_BOXES)
-					sliderYpos = sliderYmin;
+				if (g_numScenes <= NUM_RGROUP_BOXES)
+					g_sliderYpos = g_sliderYmin;
 				else
-					sliderYpos = sliderYmin + (cd.extraBase*(sliderRange))/(numScenes-NUM_RGROUP_BOXES);
+					g_sliderYpos = g_sliderYmin + (cd.extraBase*(sliderRange))/(g_numScenes-NUM_RGROUP_BOXES);
 			} else if (cd.box == hopperBox2) {
-				if (numEntries <= NUM_RGROUP_BOXES)
-					sliderYpos = sliderYmin;
+				if (g_numEntries <= NUM_RGROUP_BOXES)
+					g_sliderYpos = g_sliderYmin;
 				else
-					sliderYpos = sliderYmin + (cd.extraBase * (sliderRange)) /
-					(numEntries-NUM_RGROUP_BOXES);
+					g_sliderYpos = g_sliderYmin + (cd.extraBase * (sliderRange)) /
+					(g_numEntries-NUM_RGROUP_BOXES);
 			}
 
-			MultiMoveRelXY(SlideObject, 0, sliderYpos - lastY);
+			MultiMoveRelXY(g_SlideObject, 0, g_sliderYpos - lastY);
 		}
 
 		if (!TinselV2)
-			MultiSetAniXY(SlideObject, InvD[ino].inventoryX + 24 + 179, sliderYpos);
+			MultiSetAniXY(g_SlideObject, g_InvD[g_ino].inventoryX + 24 + 179, g_sliderYpos);
 	}
 
 	assert(objCount < MAX_ICONS); // added too many icons
@@ -3008,8 +2997,8 @@ static void AddBoxes(bool bPosnSlide) {
  * Display the scroll bar slider.
  */
 static void AddEWSlider(OBJECT **slide, const FILM *pfilm) {
-	SlideObject = *slide = AddObject(&pfilm->reels[IX_SLIDE], -1);
-	MultiSetAniXY(*slide, InvD[ino].inventoryX + 24 + 127, sliderYpos);
+	g_SlideObject = *slide = AddObject(&pfilm->reels[IX_SLIDE], -1);
+	MultiSetAniXY(*slide, g_InvD[g_ino].inventoryX + 24 + 127, g_sliderYpos);
 	MultiSetZPosition(*slide, Z_INV_MFRAME);
 }
 
@@ -3021,7 +3010,7 @@ static int AddExtraWindow(int x, int y, OBJECT **retObj) {
 	const FILM *pfilm;
 
 	// Get the frame's data
-	pfilm = (const FILM *)LockMem(hWinParts);
+	pfilm = (const FILM *)LockMem(g_hWinParts);
 
 	x += TinselV2 ? 30 : 20;
 	y += TinselV2 ? 38 : 24;
@@ -3032,56 +3021,56 @@ static int AddExtraWindow(int x, int y, OBJECT **retObj) {
 	MultiSetZPosition(retObj[n], Z_INV_MFRAME);
 	n++;
 	retObj[n] = AddObject(&pfilm->reels[IX_NTR], -1);	// Top right
-	MultiSetAniXY(retObj[n], x + (TinselV2 ? TLwidth + 312 : 152), y);
+	MultiSetAniXY(retObj[n], x + (TinselV2 ? g_TLwidth + 312 : 152), y);
 	MultiSetZPosition(retObj[n], Z_INV_MFRAME);
 	n++;
 	retObj[n] = AddObject(&pfilm->reels[IX_BL], -1);	// Bottom left
-	MultiSetAniXY(retObj[n], x, y + (TinselV2 ? TLheight + 208 : 124));
+	MultiSetAniXY(retObj[n], x, y + (TinselV2 ? g_TLheight + 208 : 124));
 	MultiSetZPosition(retObj[n], Z_INV_MFRAME);
 	n++;
 	retObj[n] = AddObject(&pfilm->reels[IX_BR], -1);	// Bottom right
-	MultiSetAniXY(retObj[n], x + (TinselV2 ? TLwidth + 312 : 152),
-		y + (TinselV2 ? TLheight + 208 : 124));
+	MultiSetAniXY(retObj[n], x + (TinselV2 ? g_TLwidth + 312 : 152),
+		y + (TinselV2 ? g_TLheight + 208 : 124));
 	MultiSetZPosition(retObj[n], Z_INV_MFRAME);
 	n++;
 
 	// Draw the edges
 	retObj[n] = AddObject(&pfilm->reels[IX_H156], -1);	// Top
-	MultiSetAniXY(retObj[n], x + (TinselV2 ? TLwidth : 6), y + NM_TBT);
+	MultiSetAniXY(retObj[n], x + (TinselV2 ? g_TLwidth : 6), y + NM_TBT);
 	MultiSetZPosition(retObj[n], Z_INV_MFRAME);
 	n++;
 	retObj[n] = AddObject(&pfilm->reels[IX_H156], -1);	// Bottom
-	MultiSetAniXY(retObj[n], x + (TinselV2 ? TLwidth : 6), y +
-		(TinselV2 ? TLheight + 208 + BLheight + NM_BSY : 143));
+	MultiSetAniXY(retObj[n], x + (TinselV2 ? g_TLwidth : 6), y +
+		(TinselV2 ? g_TLheight + 208 + g_BLheight + NM_BSY : 143));
 	MultiSetZPosition(retObj[n], Z_INV_MFRAME);
 	n++;
 	retObj[n] = AddObject(&pfilm->reels[IX_V104], -1);	// Left
-	MultiSetAniXY(retObj[n], x + NM_LSX, y + (TinselV2 ? TLheight : 20));
+	MultiSetAniXY(retObj[n], x + NM_LSX, y + (TinselV2 ? g_TLheight : 20));
 	MultiSetZPosition(retObj[n], Z_INV_MFRAME);
 	n++;
 	retObj[n] = AddObject(&pfilm->reels[IX_V104], -1);	// Right 1
-	MultiSetAniXY(retObj[n], x + (TinselV2 ? TLwidth + 312 + TRwidth + NM_RSX : 179),
-		y + (TinselV2 ? TLheight : 20));
+	MultiSetAniXY(retObj[n], x + (TinselV2 ? g_TLwidth + 312 + g_TRwidth + NM_RSX : 179),
+		y + (TinselV2 ? g_TLheight : 20));
 	MultiSetZPosition(retObj[n], Z_INV_MFRAME);
 	n++;
 	retObj[n] = AddObject(&pfilm->reels[IX_V104], -1);	// Right 2
-	MultiSetAniXY(retObj[n], x + (TinselV2 ? TLwidth + 312 + TRwidth + NM_SBL : 188),
-		y + (TinselV2 ? TLheight : 20));
+	MultiSetAniXY(retObj[n], x + (TinselV2 ? g_TLwidth + 312 + g_TRwidth + NM_SBL : 188),
+		y + (TinselV2 ? g_TLheight : 20));
 	MultiSetZPosition(retObj[n], Z_INV_MFRAME);
 	n++;
 
 	if (TinselV2) {
-		sliderYpos = sliderYmin = y + 27;
-		sliderYmax = y + 273;
-
-		retObj[n++] = SlideObject = AddObject( &pfilm->reels[IX_SLIDE], -1);
-		MultiSetAniXY(SlideObject,
-			x + TLwidth + 320 + TRwidth - NM_BG_POS_X + NM_BG_SIZ_X - 2,
-			sliderYpos);
-		MultiSetZPosition(SlideObject, Z_INV_MFRAME);
+		g_sliderYpos = g_sliderYmin = y + 27;
+		g_sliderYmax = y + 273;
+
+		retObj[n++] = g_SlideObject = AddObject( &pfilm->reels[IX_SLIDE], -1);
+		MultiSetAniXY(g_SlideObject,
+			x + g_TLwidth + 320 + g_TRwidth - NM_BG_POS_X + NM_BG_SIZ_X - 2,
+			g_sliderYpos);
+		MultiSetZPosition(g_SlideObject, Z_INV_MFRAME);
 	} else {
-		sliderYpos = sliderYmin = y + 9;
-		sliderYmax = y + 134;
+		g_sliderYpos = g_sliderYmin = y + 9;
+		g_sliderYmax = y + 134;
 		AddEWSlider(&retObj[n++], pfilm);
 	}
 
@@ -3099,17 +3088,17 @@ static void ConstructInventory(InventoryType filling) {
 	int	eH, eV;		// Extra width and height
 	int	n = 0;		// Index into object array
 	int	zpos;		// Z-position of frame
-	int	invX = InvD[ino].inventoryX;
-	int	invY = InvD[ino].inventoryY;
+	int	invX = g_InvD[g_ino].inventoryX;
+	int	invY = g_InvD[g_ino].inventoryY;
 	OBJECT **retObj;
 	const FILM *pfilm;
 
 	// Select the object array to use
 	if (filling == FULL || filling == CONF) {
-		retObj = objArray;		// Standard window
+		retObj = g_objArray;		// Standard window
 		zpos = Z_INV_MFRAME;
 	} else {
-		retObj = DobjArray;		// Re-sizing window
+		retObj = g_DobjArray;		// Re-sizing window
 		zpos = Z_INV_RFRAME;
 	}
 
@@ -3122,83 +3111,83 @@ static void ConstructInventory(InventoryType filling) {
 	}
 
 	// Get the frame's data
-	pfilm = (const FILM *)LockMem(hWinParts);
+	pfilm = (const FILM *)LockMem(g_hWinParts);
 
 	// Standard window is of granular dimensions
 	if (filling == FULL) {
 		// Round-up/down to nearest number of icons
-		if (SuppH > ITEM_WIDTH / 2)
-			InvD[ino].NoofHicons++;
-		if (SuppV > ITEM_HEIGHT / 2)
-			InvD[ino].NoofVicons++;
-		SuppH = SuppV = 0;
+		if (g_SuppH > ITEM_WIDTH / 2)
+			g_InvD[g_ino].NoofHicons++;
+		if (g_SuppV > ITEM_HEIGHT / 2)
+			g_InvD[g_ino].NoofVicons++;
+		g_SuppH = g_SuppV = 0;
 	}
 
 	// Extra width and height
-	eH = (InvD[ino].NoofHicons - 1) * (ITEM_WIDTH+I_SEPARATION) + SuppH;
-	eV = (InvD[ino].NoofVicons - 1) * (ITEM_HEIGHT+I_SEPARATION) + SuppV;
+	eH = (g_InvD[g_ino].NoofHicons - 1) * (ITEM_WIDTH+I_SEPARATION) + g_SuppH;
+	eV = (g_InvD[g_ino].NoofVicons - 1) * (ITEM_HEIGHT+I_SEPARATION) + g_SuppV;
 
 	// Which window frame corners to use
-	if (TinselV2 && (ino == INV_CONV)) {
-		TL = IX_TL;
-		TR = IX2_TR4;
-		BL = IX_BL;
-		BR = IX_RBR;
-	} else if ((filling == FULL) && (ino != INV_CONV)) {
-		TL = IX_TL;
-		TR = IX_TR;
-		BL = IX_BL;
-		BR = IX_BR;
+	if (TinselV2 && (g_ino == INV_CONV)) {
+		g_TL = IX_TL;
+		g_TR = IX2_TR4;
+		g_BL = IX_BL;
+		g_BR = IX_RBR;
+	} else if ((filling == FULL) && (g_ino != INV_CONV)) {
+		g_TL = IX_TL;
+		g_TR = IX_TR;
+		g_BL = IX_BL;
+		g_BR = IX_BR;
 	} else {
-		TL = IX_RTL;
-		TR = IX_RTR;
-		BL = IX_BL;
-		BR = IX_RBR;
+		g_TL = IX_RTL;
+		g_TR = IX_RTR;
+		g_BL = IX_BL;
+		g_BR = IX_RBR;
 	}
 
 	// Draw the four corners
-	retObj[n] = AddObject(&pfilm->reels[TL], TL);
+	retObj[n] = AddObject(&pfilm->reels[g_TL], g_TL);
 	MultiSetAniXY(retObj[n], invX, invY);
 	MultiSetZPosition(retObj[n], zpos);
 	n++;
-	retObj[n] = AddObject(&pfilm->reels[TR], TR);
-	MultiSetAniXY(retObj[n], invX + TLwidth + eH, invY);
+	retObj[n] = AddObject(&pfilm->reels[g_TR], g_TR);
+	MultiSetAniXY(retObj[n], invX + g_TLwidth + eH, invY);
 	MultiSetZPosition(retObj[n], zpos);
 	n++;
-	retObj[n] = AddObject(&pfilm->reels[BL], BL);
-	MultiSetAniXY(retObj[n], invX, invY + TLheight + eV);
+	retObj[n] = AddObject(&pfilm->reels[g_BL], g_BL);
+	MultiSetAniXY(retObj[n], invX, invY + g_TLheight + eV);
 	MultiSetZPosition(retObj[n], zpos);
 	n++;
-	retObj[n] = AddObject(&pfilm->reels[BR], BR);
-	MultiSetAniXY(retObj[n], invX + TLwidth + eH, invY + TLheight + eV);
+	retObj[n] = AddObject(&pfilm->reels[g_BR], g_BR);
+	MultiSetAniXY(retObj[n], invX + g_TLwidth + eH, invY + g_TLheight + eV);
 	MultiSetZPosition(retObj[n], zpos);
 	n++;
 
 	// Draw extra Top and bottom parts
-	if (InvD[ino].NoofHicons > 1) {
+	if (g_InvD[g_ino].NoofHicons > 1) {
 		// Top side
-		retObj[n] = AddObject(&pfilm->reels[hFillers[InvD[ino].NoofHicons-2]], -1);
-		MultiSetAniXY(retObj[n], invX + TLwidth, invY + NM_TBT);
+		retObj[n] = AddObject(&pfilm->reels[hFillers[g_InvD[g_ino].NoofHicons-2]], -1);
+		MultiSetAniXY(retObj[n], invX + g_TLwidth, invY + NM_TBT);
 		MultiSetZPosition(retObj[n], zpos);
 		n++;
 
 		// Bottom of header box
 		if (filling == FULL) {
 			if (TinselV2) {
-				retObj[n] = AddObject(&pfilm->reels[hFillers[InvD[ino].NoofHicons-2]], -1);
-				MultiSetAniXY(retObj[n], invX + TLwidth, invY + NM_TBB);
+				retObj[n] = AddObject(&pfilm->reels[hFillers[g_InvD[g_ino].NoofHicons-2]], -1);
+				MultiSetAniXY(retObj[n], invX + g_TLwidth, invY + NM_TBB);
 				MultiSetZPosition(retObj[n], zpos);
 				n++;
 			} else {
-				retObj[n] = AddObject(&pfilm->reels[hFillers[InvD[ino].NoofHicons-2]], -1);
-				MultiSetAniXY(retObj[n], invX + TLwidth, invY + M_TBB + 1);
+				retObj[n] = AddObject(&pfilm->reels[hFillers[g_InvD[g_ino].NoofHicons-2]], -1);
+				MultiSetAniXY(retObj[n], invX + g_TLwidth, invY + M_TBB + 1);
 				MultiSetZPosition(retObj[n], zpos);
 				n++;
 
 				// Extra bits for conversation - hopefully temporary
-				if (ino == INV_CONV) {
+				if (g_ino == INV_CONV) {
 					retObj[n] = AddObject(&pfilm->reels[IX_H26], -1);
-					MultiSetAniXY(retObj[n], invX + TLwidth - 2, invY + M_TBB + 1);
+					MultiSetAniXY(retObj[n], invX + g_TLwidth - 2, invY + M_TBB + 1);
 					MultiSetZPosition(retObj[n], zpos);
 					n++;
 
@@ -3211,16 +3200,16 @@ static void ConstructInventory(InventoryType filling) {
 		}
 
 		// Bottom side
-		retObj[n] = AddObject(&pfilm->reels[hFillers[InvD[ino].NoofHicons-2]], -1);
-		MultiSetAniXY(retObj[n], invX + TLwidth, invY + TLheight + eV + BLheight + NM_BSY);
+		retObj[n] = AddObject(&pfilm->reels[hFillers[g_InvD[g_ino].NoofHicons-2]], -1);
+		MultiSetAniXY(retObj[n], invX + g_TLwidth, invY + g_TLheight + eV + g_BLheight + NM_BSY);
 
 		MultiSetZPosition(retObj[n], zpos);
 		n++;
 	}
-	if (SuppH) {
-		int offx = TLwidth + eH - (TinselV2 ? ITEM_WIDTH + I_SEPARATION : 26);
-		if (offx < TLwidth)	// Not too far!
-			offx = TLwidth;
+	if (g_SuppH) {
+		int offx = g_TLwidth + eH - (TinselV2 ? ITEM_WIDTH + I_SEPARATION : 26);
+		if (offx < g_TLwidth)	// Not too far!
+			offx = g_TLwidth;
 
 		// Top side extra
 		retObj[n] = AddObject(&pfilm->reels[IX_H26], -1);
@@ -3230,39 +3219,39 @@ static void ConstructInventory(InventoryType filling) {
 
 		// Bottom side extra
 		retObj[n] = AddObject(&pfilm->reels[IX_H26], -1);
-		MultiSetAniXY(retObj[n], invX + offx, invY + TLheight + eV + BLheight + NM_BSY);
+		MultiSetAniXY(retObj[n], invX + offx, invY + g_TLheight + eV + g_BLheight + NM_BSY);
 
 		MultiSetZPosition(retObj[n], zpos);
 		n++;
 	}
 
 	// Draw extra side parts
-	if (InvD[ino].NoofVicons > 1) {
+	if (g_InvD[g_ino].NoofVicons > 1) {
 		// Left side
-		retObj[n] = AddObject(&pfilm->reels[vFillers[InvD[ino].NoofVicons-2]], -1);
-		MultiSetAniXY(retObj[n], invX + NM_LSX, invY + TLheight);
+		retObj[n] = AddObject(&pfilm->reels[vFillers[g_InvD[g_ino].NoofVicons-2]], -1);
+		MultiSetAniXY(retObj[n], invX + NM_LSX, invY + g_TLheight);
 		MultiSetZPosition(retObj[n], zpos);
 		n++;
 
 		// Left side of scroll bar
-		if (filling == FULL && ino != INV_CONV) {
-			retObj[n] = AddObject(&pfilm->reels[vFillers[InvD[ino].NoofVicons-2]], -1);
+		if (filling == FULL && g_ino != INV_CONV) {
+			retObj[n] = AddObject(&pfilm->reels[vFillers[g_InvD[g_ino].NoofVicons-2]], -1);
 			if (TinselV2)
-				MultiSetAniXY(retObj[n], invX + TLwidth + eH + TRwidth + NM_SBL, invY + TLheight);
+				MultiSetAniXY(retObj[n], invX + g_TLwidth + eH + g_TRwidth + NM_SBL, invY + g_TLheight);
 			else
-				MultiSetAniXY(retObj[n], invX + TLwidth + eH + M_SBL + 1, invY + TLheight);
+				MultiSetAniXY(retObj[n], invX + g_TLwidth + eH + M_SBL + 1, invY + g_TLheight);
 			MultiSetZPosition(retObj[n], zpos);
 			n++;
 		}
 
 		// Right side
-		retObj[n] = AddObject(&pfilm->reels[vFillers[InvD[ino].NoofVicons-2]], -1);
-		MultiSetAniXY(retObj[n], invX + TLwidth + eH + TRwidth + NM_RSX, invY + TLheight);
+		retObj[n] = AddObject(&pfilm->reels[vFillers[g_InvD[g_ino].NoofVicons-2]], -1);
+		MultiSetAniXY(retObj[n], invX + g_TLwidth + eH + g_TRwidth + NM_RSX, invY + g_TLheight);
 		MultiSetZPosition(retObj[n], zpos);
 		n++;
 	}
-	if (SuppV) {
-		int offy = TLheight + eV - (TinselV2 ? ITEM_HEIGHT + I_SEPARATION : 26);
+	if (g_SuppV) {
+		int offy = g_TLheight + eV - (TinselV2 ? ITEM_HEIGHT + I_SEPARATION : 26);
 		int minAmount = TinselV2 ? 20 : 5;
 		if (offy < minAmount)
 			offy = minAmount;
@@ -3275,7 +3264,7 @@ static void ConstructInventory(InventoryType filling) {
 
 		// Right side extra
 		retObj[n] = AddObject(&pfilm->reels[IX_V26], -1);
-		MultiSetAniXY(retObj[n], invX + TLwidth + eH + TRwidth + NM_RSX, invY + offy);
+		MultiSetAniXY(retObj[n], invX + g_TLwidth + eH + g_TRwidth + NM_RSX, invY + offy);
 		MultiSetZPosition(retObj[n], zpos);
 		n++;
 	}
@@ -3296,20 +3285,20 @@ static void ConstructInventory(InventoryType filling) {
 			AddBackground(rect, title, eH, eV, FROM_HANDLE);
 		}
 
-		if (ino == INV_CONV) {
-			SlideObject = NULL;
+		if (g_ino == INV_CONV) {
+			g_SlideObject = NULL;
 
 			if (TinselV2) {
 				// !!!!! MAGIC NUMBER ALERT !!!!!
 				// Make sure it's big enough for the heading
-				if (MultiLeftmost(retObj[n-1]) < InvD[INV_CONV].inventoryX + 10) {
-					InvD[INV_CONV].NoofHicons++;
+				if (MultiLeftmost(retObj[n-1]) < g_InvD[INV_CONV].inventoryX + 10) {
+					g_InvD[INV_CONV].NoofHicons++;
 					ConstructInventory(FULL);
 				}
 			}
-		} else if (InvD[ino].NoofItems > InvD[ino].NoofHicons*InvD[ino].NoofVicons) {
-			sliderYmin = TLheight - (TinselV2 ? 2 : 1);
-			sliderYmax = TLheight + eV + (TinselV2 ? 12 : 10);
+		} else if (g_InvD[g_ino].NoofItems > g_InvD[g_ino].NoofHicons*g_InvD[g_ino].NoofVicons) {
+			g_sliderYmin = g_TLheight - (TinselV2 ? 2 : 1);
+			g_sliderYmax = g_TLheight + eV + (TinselV2 ? 12 : 10);
 			AddSlider(&retObj[n++], pfilm);
 		}
 
@@ -3333,7 +3322,7 @@ static void ConstructInventory(InventoryType filling) {
 	assert(n < MAX_WCOMP); // added more parts than we can handle!
 
 	// Reposition returns true if needs to move
-	if (InvD[ino].bMoveable && filling == FULL && RePosition()) {
+	if (g_InvD[g_ino].bMoveable && filling == FULL && RePosition()) {
 		ConstructInventory(FULL);
 	}
 }
@@ -3348,32 +3337,32 @@ static bool RePosition() {
 	int	p;
 	bool	bMoveitMoveit = false;
 
-	assert(RectObject); // no recangle object!
+	assert(g_RectObject); // no recangle object!
 
 	// Test for off-screen horizontally
-	p = MultiLeftmost(RectObject);
+	p = MultiLeftmost(g_RectObject);
 	if (p > MAXLEFT) {
 		// Too far to the right
-		InvD[ino].inventoryX += MAXLEFT - p;
+		g_InvD[g_ino].inventoryX += MAXLEFT - p;
 		bMoveitMoveit = true;			// I like to....
 	} else {
 		// Too far to the left?
-		p = MultiRightmost(RectObject);
+		p = MultiRightmost(g_RectObject);
 		if (p < MINRIGHT) {
-			InvD[ino].inventoryX += MINRIGHT - p;
+			g_InvD[g_ino].inventoryX += MINRIGHT - p;
 			bMoveitMoveit = true;		// I like to....
 		}
 	}
 
 	// Test for off-screen vertically
-	p = MultiHighest(RectObject);
+	p = MultiHighest(g_RectObject);
 	if (p < MINTOP) {
 		// Too high
-		InvD[ino].inventoryY += MINTOP - p;
+		g_InvD[g_ino].inventoryY += MINTOP - p;
 		bMoveitMoveit = true;			// I like to....
 	} else if (p > MAXTOP) {
 		// Too low
-		InvD[ino].inventoryY += MAXTOP - p;
+		g_InvD[g_ino].inventoryY += MAXTOP - p;
 		bMoveitMoveit = true;			// I like to....
 	}
 
@@ -3393,7 +3382,7 @@ static void AlterCursor(int num) {
 	IMAGE *pim;
 
 	// Get pointer to image
-	pim = GetImageFromFilm(hWinParts, num, &pfreel);
+	pim = GetImageFromFilm(g_hWinParts, num, &pfreel);
 
 	// Poke in the background palette
 	pim->hImgPal = TO_LE_32(BgPal());
@@ -3414,7 +3403,7 @@ static void InvCursor(InvCursorFN fn, int CurX, int CurY) {
 	bool	restoreMain = false;
 
 	// If currently dragging, don't be messing about with the cursor shape
-	if (InvDragging != ID_NONE)
+	if (g_InvDragging != ID_NONE)
 		return;
 
 	switch (fn) {
@@ -3427,7 +3416,7 @@ static void InvCursor(InvCursorFN fn, int CurX, int CurY) {
 		area = InvArea(CurX, CurY);
 
 		// Check for POINTED events
-		if (ino == INV_CONF)
+		if (g_ino == INV_CONF)
 			InvBoxes(area == I_BODY, CurX, CurY);
 		else
 			InvLabels(area == I_BODY, CurX, CurY);
@@ -3445,7 +3434,7 @@ static void InvCursor(InvCursorFN fn, int CurX, int CurY) {
 
 		case I_TLEFT:
 		case I_BRIGHT:
-			if (!InvD[ino].resizable)
+			if (!g_InvD[g_ino].resizable)
 				restoreMain = true;
 			else if (ICursor != IC_DR) {
 				AlterCursor(IX_CURDD);
@@ -3455,7 +3444,7 @@ static void InvCursor(InvCursorFN fn, int CurX, int CurY) {
 
 		case I_TRIGHT:
 		case I_BLEFT:
-			if (!InvD[ino].resizable)
+			if (!g_InvD[g_ino].resizable)
 				restoreMain = true;
 			else if (ICursor != IC_UR) {
 				AlterCursor(IX_CURDU);
@@ -3465,7 +3454,7 @@ static void InvCursor(InvCursorFN fn, int CurX, int CurY) {
 
 		case I_TOP:
 		case I_BOTTOM:
-			if (!InvD[ino].resizable) {
+			if (!g_InvD[g_ino].resizable) {
 				restoreMain = true;
 				break;
 			}
@@ -3477,7 +3466,7 @@ static void InvCursor(InvCursorFN fn, int CurX, int CurY) {
 
 		case I_LEFT:
 		case I_RIGHT:
-			if (!InvD[ino].resizable)
+			if (!g_InvD[g_ino].resizable)
 				restoreMain = true;
 			else if (ICursor != IC_LR) {
 				AlterCursor(IX_CURLR);
@@ -3516,7 +3505,7 @@ static void InvCursor(InvCursorFN fn, int CurX, int CurY) {
 
 
 extern void ConvAction(int index) {
-	assert(ino == INV_CONV); // not conv. window!
+	assert(g_ino == INV_CONV); // not conv. window!
 	PMOVER pMover = TinselV2 ? GetMover(GetLeadId()) : NULL;
 
 	switch (index) {
@@ -3524,36 +3513,36 @@ extern void ConvAction(int index) {
 		return;
 
 	case INV_CLOSEICON:
-		thisIcon = -1;	// Postamble
+		g_thisIcon = -1;	// Postamble
 		break;
 
 	case INV_OPENICON:
 		// Store the direction the lead character is facing in when the conversation starts
 		if (TinselV2)
-			initialDirection = GetMoverDirection(pMover);
-		thisIcon = -2;	// Preamble
+			g_initialDirection = GetMoverDirection(pMover);
+		g_thisIcon = -2;	// Preamble
 		break;
 
 	default:
-		thisIcon = InvD[ino].contents[index];
+		g_thisIcon = g_InvD[g_ino].contents[index];
 		break;
 	}
 
 	if (!TinselV2)
-		RunPolyTinselCode(thisConvPoly, CONVERSE, PLR_NOEVENT, true);
+		RunPolyTinselCode(g_thisConvPoly, CONVERSE, PLR_NOEVENT, true);
 	else {
 		// If the lead's direction has changed for any reason (such as having broken the
 		// fourth wall and talked to the screen), reset back to the original direction
 		DIRECTION currDirection = GetMoverDirection(pMover);
-		if (currDirection != initialDirection) {
-			SetMoverDirection(pMover, initialDirection);
+		if (currDirection != g_initialDirection) {
+			SetMoverDirection(pMover, g_initialDirection);
 			SetMoverStanding(pMover);
 		}
 
-		if (thisConvPoly != NOPOLY)
-			PolygonEvent(nullContext, thisConvPoly, CONVERSE, 0, false, 0);
+		if (g_thisConvPoly != NOPOLY)
+			PolygonEvent(nullContext, g_thisConvPoly, CONVERSE, 0, false, 0);
 		else
-			ActorEvent(nullContext, thisConvActor, CONVERSE, false, 0);
+			ActorEvent(nullContext, g_thisConvActor, CONVERSE, false, 0);
 	}
 
 }
@@ -3566,18 +3555,18 @@ extern void ConvAction(int index) {
  * Note: ano may (will probably) be set when it's a polygon.
  */
 extern void SetConvDetails(CONV_PARAM fn, HPOLYGON hPoly, int ano) {
-	thisConvFn = fn;
-	thisConvPoly = hPoly;
-	thisConvActor = ano;
+	g_thisConvFn = fn;
+	g_thisConvPoly = hPoly;
+	g_thisConvActor = ano;
 
-	bMoveOnUnHide = true;
+	g_bMoveOnUnHide = true;
 
 	// Get the Actor Tag's or Tagged Actor's label for the conversation window title
 	if (hPoly != NOPOLY)	{
 		int x, y;
-		GetTagTag(hPoly, &InvD[INV_CONV].hInvTitle, &x, &y);
+		GetTagTag(hPoly, &g_InvD[INV_CONV].hInvTitle, &x, &y);
 	} else {
-		InvD[INV_CONV].hInvTitle = GetActorTagHandle(ano);
+		g_InvD[INV_CONV].hInvTitle = GetActorTagHandle(ano);
 	}
 }
 
@@ -3590,27 +3579,27 @@ extern void PermaConvIcon(int icon, bool bEnd) {
 	int i;
 
 	// See if it's already there
-	for (i = 0; i < numPermIcons; i++) {
-		if (permIcons[i] == icon)
+	for (i = 0; i < g_numPermIcons; i++) {
+		if (g_permIcons[i] == icon)
 			break;
 	}
 
 	// Add it if it isn't already there
-	if (i == numPermIcons) {
-		assert(numPermIcons < MAX_PERMICONS);
+	if (i == g_numPermIcons) {
+		assert(g_numPermIcons < MAX_PERMICONS);
 
-		if (bEnd || !numEndIcons) {
+		if (bEnd || !g_numEndIcons) {
 			// Add it at the end
-			permIcons[numPermIcons++] = icon;
+			g_permIcons[g_numPermIcons++] = icon;
 			if (bEnd)
-				numEndIcons++;
+				g_numEndIcons++;
 		} else {
 			// Insert before end icons
-			memmove(&permIcons[numPermIcons-numEndIcons+1],
-				&permIcons[numPermIcons-numEndIcons],
-				numEndIcons * sizeof(int));
-			permIcons[numPermIcons-numEndIcons] = icon;
-			numPermIcons++;
+			memmove(&g_permIcons[g_numPermIcons-g_numEndIcons+1],
+				&g_permIcons[g_numPermIcons-g_numEndIcons],
+				g_numEndIcons * sizeof(int));
+			g_permIcons[g_numPermIcons-g_numEndIcons] = icon;
+			g_numPermIcons++;
 		}
 	}
 }
@@ -3619,21 +3608,21 @@ extern void PermaConvIcon(int icon, bool bEnd) {
 
 extern void convPos(int fn) {
 	if (fn == CONV_DEF)
-		InvD[INV_CONV].inventoryY = 8;
+		g_InvD[INV_CONV].inventoryY = 8;
 	else if (fn == CONV_BOTTOM)
-		InvD[INV_CONV].inventoryY = 150;
+		g_InvD[INV_CONV].inventoryY = 150;
 }
 
 extern void ConvPoly(HPOLYGON hPoly) {
-	thisConvPoly = hPoly;
+	g_thisConvPoly = hPoly;
 }
 
 extern int GetIcon() {
-	return thisIcon;
+	return g_thisIcon;
 }
 
 extern void CloseDownConv() {
-	if (InventoryState == ACTIVE_INV && ino == INV_CONV) {
+	if (g_InventoryState == ACTIVE_INV && g_ino == INV_CONV) {
 		KillInventory();
 	}
 }
@@ -3642,43 +3631,43 @@ extern void HideConversation(bool bHide) {
 	int aniX, aniY;
 	int i;
 
-	if (InventoryState == ACTIVE_INV && ino == INV_CONV) {
+	if (g_InventoryState == ACTIVE_INV && g_ino == INV_CONV) {
 		if (bHide) {
 			// Move all the window and icons off-screen
-			for (i = 0; objArray[i] && i < MAX_WCOMP; i++) {
-				MultiAdjustXY(objArray[i], 2 * SCREEN_WIDTH, 0);
+			for (i = 0; g_objArray[i] && i < MAX_WCOMP; i++) {
+				MultiAdjustXY(g_objArray[i], 2 * SCREEN_WIDTH, 0);
 			}
-			for (i = 0; iconArray[i] && i < MAX_ICONS; i++) {
-				MultiAdjustXY(iconArray[i], 2 * SCREEN_WIDTH, 0);
+			for (i = 0; g_iconArray[i] && i < MAX_ICONS; i++) {
+				MultiAdjustXY(g_iconArray[i], 2 * SCREEN_WIDTH, 0);
 			}
 
 			// Window is hidden
-			InventoryHidden = true;
+			g_InventoryHidden = true;
 
 			// Remove any labels
 			InvLabels(false, 0, 0);
 		} else {
 			// Window is not hidden
-			InventoryHidden = false;
+			g_InventoryHidden = false;
 
-			if (TinselV2 && ItemsChanged)
+			if (TinselV2 && g_ItemsChanged)
 				// Just rebuild the whole thing
 				ConstructInventory(FULL);
 			else {
 				// Move it all back on-screen
-				for (i = 0; objArray[i] && i < MAX_WCOMP; i++) {
-					MultiAdjustXY(objArray[i], -2 * SCREEN_WIDTH, 0);
+				for (i = 0; g_objArray[i] && i < MAX_WCOMP; i++) {
+					MultiAdjustXY(g_objArray[i], -2 * SCREEN_WIDTH, 0);
 				}
 
 				// Don't flash if items changed. If they have, will be redrawn anyway.
-				if (TinselV2 || !ItemsChanged) {
-					for (i = 0; iconArray[i] && i < MAX_ICONS; i++) {
-						MultiAdjustXY(iconArray[i], -2*SCREEN_WIDTH, 0);
+				if (TinselV2 || !g_ItemsChanged) {
+					for (i = 0; g_iconArray[i] && i < MAX_ICONS; i++) {
+						MultiAdjustXY(g_iconArray[i], -2*SCREEN_WIDTH, 0);
 					}
 				}
 			}
 
-			if (TinselV2 && bMoveOnUnHide) {
+			if (TinselV2 && g_bMoveOnUnHide) {
 				/*
 				 * First time, position it appropriately
 				 */
@@ -3686,17 +3675,17 @@ extern void HideConversation(bool bHide) {
 				int x, y, deltay;
 
 				// Only do it once per conversation
-				bMoveOnUnHide = false;
+				g_bMoveOnUnHide = false;
 
 				// Current center of the window
-				left = MultiLeftmost(RectObject);
-				center = (MultiRightmost(RectObject) + left) / 2;
+				left = MultiLeftmost(g_RectObject);
+				center = (MultiRightmost(g_RectObject) + left) / 2;
 
 				// Get the x-offset for the conversation window
-				if (thisConvActor) {
+				if (g_thisConvActor) {
 					int Loffset, Toffset;
 
-					GetActorMidTop(thisConvActor, &x, &y);
+					GetActorMidTop(g_thisConvActor, &x, &y);
 					PlayfieldGetPos(FIELD_WORLD, &Loffset, &Toffset);
 					x -= Loffset;
 					y -= Toffset;
@@ -3706,19 +3695,19 @@ extern void HideConversation(bool bHide) {
 				}
 
 				// Save old y-position
-				deltay = InvD[INV_CONV].inventoryY;
+				deltay = g_InvD[INV_CONV].inventoryY;
 
-				switch (thisConvFn) {
+				switch (g_thisConvFn) {
 				case CONV_TOP:
-					InvD[INV_CONV].inventoryY = SysVar(SV_CONV_TOPY);
+					g_InvD[INV_CONV].inventoryY = SysVar(SV_CONV_TOPY);
 					break;
 
 				case CONV_BOTTOM:
-					InvD[INV_CONV].inventoryY = SysVar(SV_CONV_BOTY);
+					g_InvD[INV_CONV].inventoryY = SysVar(SV_CONV_BOTY);
 					break;
 
 				case CONV_DEF:
-					InvD[INV_CONV].inventoryY = y - SysVar(SV_CONV_ABOVE_Y);
+					g_InvD[INV_CONV].inventoryY = y - SysVar(SV_CONV_ABOVE_Y);
 					break;
 
 				default:
@@ -3726,34 +3715,34 @@ extern void HideConversation(bool bHide) {
 				}
 
 				// Calculate y change
-				deltay = InvD[INV_CONV].inventoryY - deltay;
+				deltay = g_InvD[INV_CONV].inventoryY - deltay;
 
 				// Move it all
-				for (i = 0; objArray[i] && i < MAX_WCOMP; i++) {
-					MultiMoveRelXY(objArray[i], x - center, deltay);
+				for (i = 0; g_objArray[i] && i < MAX_WCOMP; i++) {
+					MultiMoveRelXY(g_objArray[i], x - center, deltay);
 				}
-				for (i = 0; iconArray[i] && i < MAX_ICONS; i++) {
-					MultiMoveRelXY(iconArray[i], x - center, deltay);
+				for (i = 0; g_iconArray[i] && i < MAX_ICONS; i++) {
+					MultiMoveRelXY(g_iconArray[i], x - center, deltay);
 				}
-				InvD[INV_CONV].inventoryX += x - center;
+				g_InvD[INV_CONV].inventoryX += x - center;
 
 				/*
 				 * Now positioned as worked out
 				 * - but it must be in a sensible place
 				*/
-				if (MultiLeftmost(RectObject) < SysVar(SV_CONV_MINX))
-					x = SysVar(SV_CONV_MINX) - MultiLeftmost(RectObject);
-				else if (MultiRightmost(RectObject) > SCREEN_WIDTH - SysVar(SV_CONV_MINX))
-					x = SCREEN_WIDTH - SysVar(SV_CONV_MINX) - MultiRightmost(RectObject);
+				if (MultiLeftmost(g_RectObject) < SysVar(SV_CONV_MINX))
+					x = SysVar(SV_CONV_MINX) - MultiLeftmost(g_RectObject);
+				else if (MultiRightmost(g_RectObject) > SCREEN_WIDTH - SysVar(SV_CONV_MINX))
+					x = SCREEN_WIDTH - SysVar(SV_CONV_MINX) - MultiRightmost(g_RectObject);
 				else
 					x = 0;
 
-				if (thisConvFn == CONV_DEF && MultiHighest(RectObject) < SysVar(SV_CONV_MINY)
-						&& thisConvActor) {
+				if (g_thisConvFn == CONV_DEF && MultiHighest(g_RectObject) < SysVar(SV_CONV_MINY)
+						&& g_thisConvActor) {
 					int Loffset, Toffset;
 
 					PlayfieldGetPos(FIELD_WORLD, &Loffset, &Toffset);
-					y = GetActorBottom(thisConvActor) - MultiHighest(RectObject) +
+					y = GetActorBottom(g_thisConvActor) - MultiHighest(g_RectObject) +
 						SysVar(SV_CONV_BELOW_Y);
 					y -= Toffset;
 				}
@@ -3761,28 +3750,28 @@ extern void HideConversation(bool bHide) {
 					y = 0;
 
 				if (x || y) {
-					for (i = 0; objArray[i] && i < MAX_WCOMP; i++) {
-						MultiMoveRelXY(objArray[i], x, y);
+					for (i = 0; g_objArray[i] && i < MAX_WCOMP; i++) {
+						MultiMoveRelXY(g_objArray[i], x, y);
 					}
-					for (i = 0; iconArray[i] && i < MAX_ICONS; i++) {
-						MultiMoveRelXY(iconArray[i], x, y);
+					for (i = 0; g_iconArray[i] && i < MAX_ICONS; i++) {
+						MultiMoveRelXY(g_iconArray[i], x, y);
 					}
-					InvD[INV_CONV].inventoryX += x;
-					InvD[INV_CONV].inventoryY += y;
+					g_InvD[INV_CONV].inventoryX += x;
+					g_InvD[INV_CONV].inventoryY += y;
 				}
 
 				/*
 				 * Oh shit! We might have gone off the bottom
 				 */
-				if (MultiLowest(RectObject) > SCREEN_BOX_HEIGHT2 - SysVar(SV_CONV_MINY)) {
-					y = (SCREEN_BOX_HEIGHT2 - SysVar(SV_CONV_MINY)) - MultiLowest(RectObject);
-					for (i = 0; objArray[i] && i < MAX_WCOMP; i++) {
-						MultiMoveRelXY(objArray[i], 0, y);
+				if (MultiLowest(g_RectObject) > SCREEN_BOX_HEIGHT2 - SysVar(SV_CONV_MINY)) {
+					y = (SCREEN_BOX_HEIGHT2 - SysVar(SV_CONV_MINY)) - MultiLowest(g_RectObject);
+					for (i = 0; g_objArray[i] && i < MAX_WCOMP; i++) {
+						MultiMoveRelXY(g_objArray[i], 0, y);
 					}
-					for (i = 0; iconArray[i] && i < MAX_ICONS; i++) {
-						MultiMoveRelXY(iconArray[i], 0, y);
+					for (i = 0; g_iconArray[i] && i < MAX_ICONS; i++) {
+						MultiMoveRelXY(g_iconArray[i], 0, y);
 					}
-					InvD[INV_CONV].inventoryY += y;
+					g_InvD[INV_CONV].inventoryY += y;
 				}
 			}
 
@@ -3793,7 +3782,7 @@ extern void HideConversation(bool bHide) {
 }
 
 extern bool ConvIsHidden() {
-	return InventoryHidden;
+	return g_InventoryHidden;
 }
 
 
@@ -3808,8 +3797,8 @@ extern void PopUpInventory(int invno) {
 	assert(invno == INV_1 || invno == INV_2 || invno == INV_CONV
 		|| invno == INV_CONF || invno == INV_MENU); // Trying to open illegal inventory
 
-	if (InventoryState == IDLE_INV) {
-		bReOpenMenu = false;	// Better safe than sorry...
+	if (g_InventoryState == IDLE_INV) {
+		g_bReOpenMenu = false;	// Better safe than sorry...
 
 		DisableTags();		// Tags disabled during inventory
 		if (TinselV2)
@@ -3821,25 +3810,25 @@ extern void PopUpInventory(int invno) {
 				_vm->_pcmMusic->dim(false);
 
 			// Start conversation with permanent contents
-			memset(InvD[INV_CONV].contents, 0, MAX_ININV*sizeof(int));
-			memcpy(InvD[INV_CONV].contents, permIcons, numPermIcons*sizeof(int));
-			InvD[INV_CONV].NoofItems = numPermIcons;
+			memset(g_InvD[INV_CONV].contents, 0, MAX_ININV*sizeof(int));
+			memcpy(g_InvD[INV_CONV].contents, g_permIcons, g_numPermIcons*sizeof(int));
+			g_InvD[INV_CONV].NoofItems = g_numPermIcons;
 			if (TinselV2)
-				InvD[INV_CONV].NoofHicons = numPermIcons;
+				g_InvD[INV_CONV].NoofHicons = g_numPermIcons;
 			else
-				thisIcon = 0;
+				g_thisIcon = 0;
 		} else if (invno == INV_CONF) {	// Configuration window?
 			cd.selBox = NOBOX;
 			cd.pointBox = NOBOX;
 		}
 
-		ino = invno;			// The open inventory
+		g_ino = invno;			// The open inventory
 
-		ItemsChanged = false;		// Nothing changed
-		InvDragging = ID_NONE;		// Not dragging
-		InventoryState = ACTIVE_INV;	// Inventory actiive
-		InventoryHidden = false;	// Not hidden
-		InventoryMaximised = InvD[ino].bMax;
+		g_ItemsChanged = false;		// Nothing changed
+		g_InvDragging = ID_NONE;		// Not dragging
+		g_InventoryState = ACTIVE_INV;	// Inventory actiive
+		g_InventoryHidden = false;	// Not hidden
+		g_InventoryMaximised = g_InvD[g_ino].bMax;
 		if (invno != INV_CONF)	// Configuration window?
 			ConstructInventory(FULL);	// Draw it up
 		else {
@@ -3849,10 +3838,10 @@ extern void PopUpInventory(int invno) {
 }
 
 static void SetMenuGlobals(CONFINIT *ci) {
-	InvD[INV_CONF].MinHicons = InvD[INV_CONF].MaxHicons = InvD[INV_CONF].NoofHicons = ci->h;
-	InvD[INV_CONF].MaxVicons = InvD[INV_CONF].MinVicons = InvD[INV_CONF].NoofVicons = ci->v;
-	InvD[INV_CONF].inventoryX = ci->x;
-	InvD[INV_CONF].inventoryY = ci->y;
+	g_InvD[INV_CONF].MinHicons = g_InvD[INV_CONF].MaxHicons = g_InvD[INV_CONF].NoofHicons = ci->h;
+	g_InvD[INV_CONF].MaxVicons = g_InvD[INV_CONF].MinVicons = g_InvD[INV_CONF].NoofVicons = ci->v;
+	g_InvD[INV_CONF].inventoryX = ci->x;
+	g_InvD[INV_CONF].inventoryY = ci->y;
 	cd.bExtraWin = ci->bExtraWin;
 	cd.box = ci->Box;
 	cd.NumBoxes = ci->NumBoxes;
@@ -3860,9 +3849,9 @@ static void SetMenuGlobals(CONFINIT *ci) {
 
 	if (TinselV2) {
 		if ((ci->ixHeading != NO_HEADING) && SysString(ci->ixHeading))
-			InvD[INV_MENU].hInvTitle = SysString(ci->ixHeading);
+			g_InvD[INV_MENU].hInvTitle = SysString(ci->ixHeading);
 		else
-			InvD[INV_MENU].hInvTitle = NO_HEADING;
+			g_InvD[INV_MENU].hInvTitle = NO_HEADING;
 	}
 }
 
@@ -3876,11 +3865,11 @@ extern void OpenMenu(CONFTYPE menuType) {
 	if (TinselV0)
 		return;
 
-	if (InventoryState != IDLE_INV)
+	if (g_InventoryState != IDLE_INV)
 		return;
 
-	InvD[INV_CONF].resizable = false;
-	InvD[INV_CONF].bMoveable = false;
+	g_InvD[INV_CONF].resizable = false;
+	g_InvD[INV_CONF].bMoveable = false;
 
 	switch (menuType) {
 	case MAIN_MENU:
@@ -3915,7 +3904,7 @@ extern void OpenMenu(CONFTYPE menuType) {
 
 	case SOUND_MENU:
 		if (TinselV2)
-			displayedLanguage = TextLanguage();
+			g_displayedLanguage = TextLanguage();
 #if 1
 		// FIXME: Hack to setup CONFBOX pointer to data in the global Config object
 		if (TinselV2) {
@@ -4003,16 +3992,16 @@ extern void OpenMenu(CONFTYPE menuType) {
 
 	case TOP_WINDOW:
 		SetMenuGlobals(&ciTopWin);
-		ino = INV_CONF;
+		g_ino = INV_CONF;
 		ConstructInventory(CONF);	// Draw it up
-		InventoryState = BOGUS_INV;
+		g_InventoryState = BOGUS_INV;
 		return;
 
 	default:
 		return;
 	}
 
-	if (HeldItem != INV_NOICON)
+	if (g_heldItem != INV_NOICON)
 		DelAuxCursor();			// no longer aux cursor
 
 	PopUpInventory(INV_CONF);
@@ -4045,38 +4034,38 @@ extern void OpenMenu(CONFTYPE menuType) {
  * Close down an inventory window.
  */
 extern void KillInventory() {
-	if (objArray[0] != NULL) {
+	if (g_objArray[0] != NULL) {
 		DumpObjArray();
 		DumpDobjArray();
 		DumpIconArray();
 	}
 
-	if (InventoryState == ACTIVE_INV) {
+	if (g_InventoryState == ACTIVE_INV) {
 		EnableTags();
 		if (TinselV2)
 			EnablePointing();
 
-		InvD[ino].bMax = InventoryMaximised;
+		g_InvD[g_ino].bMax = g_InventoryMaximised;
 
 		UnHideCursorTrails();
 		_vm->divertKeyInput(NULL);
 	}
 
-	InventoryState = IDLE_INV;
+	g_InventoryState = IDLE_INV;
 
-	if (bReOpenMenu) {
-		bReOpenMenu = false;
+	if (g_bReOpenMenu) {
+		g_bReOpenMenu = false;
 		OpenMenu(MAIN_MENU);
 
 		// Write config changes
 		_vm->_config->writeToDisk();
 
-	} else if (ino == INV_CONF)
+	} else if (g_ino == INV_CONF)
 		InventoryIconCursor(false);
 
 	if (TinselV2)
 		// Pump up the volume
-		if (ino == INV_CONV)
+		if (g_ino == INV_CONV)
 			_vm->_pcmMusic->unDim(false);
 
 	g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);	// Hide VK after save dialog closes
@@ -4084,15 +4073,15 @@ extern void KillInventory() {
 
 extern void CloseInventory() {
 	// If not active, ignore this
-	if (InventoryState != ACTIVE_INV)
+	if (g_InventoryState != ACTIVE_INV)
 		return;
 
 	// If hidden, a conversation action is still underway - ignore this
-	if (InventoryHidden)
+	if (g_InventoryHidden)
 		return;
 
 	// If conversation, this is a closeing event
-	if (ino == INV_CONV)
+	if (g_ino == INV_CONV)
 		ConvAction(INV_CLOSEICON);
 
 	KillInventory();
@@ -4117,13 +4106,13 @@ extern void InventoryProcess(CORO_PARAM, const void *) {
 	CORO_BEGIN_CODE(_ctx);
 
 	if (NumberOfLanguages() <= 1)
-		bNoLanguage = true;
+		g_bNoLanguage = true;
 
 	while (1) {
 		CORO_SLEEP(1);		// allow scheduling
 
-		if (objArray[0] != NULL) {
-			if (ItemsChanged && ino != INV_CONF && !InventoryHidden) {
+		if (g_objArray[0] != NULL) {
+			if (g_ItemsChanged && g_ino != INV_CONF && !g_InventoryHidden) {
 				FillInInventory();
 
 				// Needed when clicking on scroll bar.
@@ -4131,15 +4120,15 @@ extern void InventoryProcess(CORO_PARAM, const void *) {
 				GetCursorXY(&curX, &curY, false);
 				InvCursor(IC_AREA, curX, curY);
 
-				ItemsChanged = false;
+				g_ItemsChanged = false;
 			}
-			if (ino != INV_CONF) {
+			if (g_ino != INV_CONF) {
 				for (int i = 0; i < MAX_ICONS; i++) {
-					if (iconArray[i] != NULL)
-						StepAnimScript(&iconAnims[i]);
+					if (g_iconArray[i] != NULL)
+						StepAnimScript(&g_iconAnims[i]);
 				}
 			}
-			if (InvDragging == ID_MDCONT) {
+			if (g_InvDragging == ID_MDCONT) {
 				// Mixing desk control
 				int sval, index, *pival;
 
@@ -4263,12 +4252,12 @@ static int NearestSlideY(int fity) {
 	int i = 0;
 
 	do {
-		thisDist = ABS(slideStuff[i].y - fity);
+		thisDist = ABS(g_slideStuff[i].y - fity);
 		if (thisDist < nearDist) {
 			nearDist = thisDist;
 			nearI = i;
 		}
-	} while (slideStuff[++i].n != -1);
+	} while (g_slideStuff[++i].n != -1);
 	return nearI;
 }
 
@@ -4281,44 +4270,44 @@ static void SlideSlider(int y, SSFN fn) {
 	int gotoY, ati;
 
 	// Only do this if there's a slider
-	if (!SlideObject)
+	if (!g_SlideObject)
 		return;
 
 	switch (fn) {
 	case S_START:			// Start of a drag on the slider
-		newY = sliderYpos;
-		lasti = NearestSlideY(sliderYpos);
+		newY = g_sliderYpos;
+		lasti = NearestSlideY(g_sliderYpos);
 		break;
 
 	case S_SLIDE:			// Y-movement during drag
 		newY = newY + y;		// New y-position
 
-		if (newY < sliderYmin)
-			gotoY = sliderYmin;	// Above top limit
-		else if (newY > sliderYmax)
-			gotoY = sliderYmax;	// Below bottom limit
+		if (newY < g_sliderYmin)
+			gotoY = g_sliderYmin;	// Above top limit
+		else if (newY > g_sliderYmax)
+			gotoY = g_sliderYmax;	// Below bottom limit
 		else
 			gotoY = newY;		// Hunky-Dory
 
 		// Move slider to new position
-		MultiMoveRelXY(SlideObject, 0, gotoY - sliderYpos);
-		sliderYpos = gotoY;
+		MultiMoveRelXY(g_SlideObject, 0, gotoY - g_sliderYpos);
+		g_sliderYpos = gotoY;
 
 		// Re-draw icons if necessary
-		ati = NearestSlideY(sliderYpos);
+		ati = NearestSlideY(g_sliderYpos);
 		if (ati != lasti) {
-			InvD[ino].FirstDisp = slideStuff[ati].n;
-			assert(InvD[ino].FirstDisp >= 0); // negative first displayed
-			ItemsChanged = true;
+			g_InvD[g_ino].FirstDisp = g_slideStuff[ati].n;
+			assert(g_InvD[g_ino].FirstDisp >= 0); // negative first displayed
+			g_ItemsChanged = true;
 			lasti = ati;
 		}
 		break;
 
 	case S_END:			// End of a drag on the slider
 		// Draw icons from new start icon
-		ati = NearestSlideY(sliderYpos);
-		InvD[ino].FirstDisp = slideStuff[ati].n;
-		ItemsChanged = true;
+		ati = NearestSlideY(g_sliderYpos);
+		g_InvD[g_ino].FirstDisp = g_slideStuff[ati].n;
+		g_ItemsChanged = true;
 		break;
 
 	default:
@@ -4336,38 +4325,38 @@ static void SlideCSlider(int y, SSFN fn) {
 	int	fc;
 
 	// Only do this if there's a slider
-	if (!SlideObject)
+	if (!g_SlideObject)
 		return;
 
 	switch (fn) {
 	case S_START:			// Start of a drag on the slider
-		newY = sliderYpos;
+		newY = g_sliderYpos;
 		break;
 
 	case S_SLIDE:			// Y-movement during drag
 		newY = newY + y;		// New y-position
 
-		if (newY < sliderYmin)
-			gotoY = sliderYmin;	// Above top limit
-		else if (newY > sliderYmax)
-			gotoY = sliderYmax;	// Below bottom limit
+		if (newY < g_sliderYmin)
+			gotoY = g_sliderYmin;	// Above top limit
+		else if (newY > g_sliderYmax)
+			gotoY = g_sliderYmax;	// Below bottom limit
 		else
 			gotoY = newY;		// Hunky-Dory
 
 		// Move slider to new position
 		if (TinselV2)
-			MultiMoveRelXY(SlideObject, 0, gotoY - sliderYpos);
-		sliderYpos = gotoY;
+			MultiMoveRelXY(g_SlideObject, 0, gotoY - g_sliderYpos);
+		g_sliderYpos = gotoY;
 
 		fc = cd.extraBase;
 
 		if ((cd.box == saveBox || cd.box == loadBox))
-			FirstFile((sliderYpos - sliderYmin) * (MAX_SAVED_FILES - NUM_RGROUP_BOXES) /
-				(sliderYmax - sliderYmin));
+			FirstFile((g_sliderYpos - g_sliderYmin) * (MAX_SAVED_FILES - NUM_RGROUP_BOXES) /
+				(g_sliderYmax - g_sliderYmin));
 		else if (cd.box == hopperBox1)
-			FirstScene((sliderYpos - sliderYmin) * (numScenes - NUM_RGROUP_BOXES) / sliderRange);
+			FirstScene((g_sliderYpos - g_sliderYmin) * (g_numScenes - NUM_RGROUP_BOXES) / sliderRange);
 		else if (cd.box == hopperBox2)
-			FirstEntry((sliderYpos - sliderYmin) * (numEntries - NUM_RGROUP_BOXES) / sliderRange);
+			FirstEntry((g_sliderYpos - g_sliderYmin) * (g_numEntries - NUM_RGROUP_BOXES) / sliderRange);
 
 		// If extraBase has changed...
 		if (fc != cd.extraBase) {
@@ -4409,16 +4398,16 @@ static void SlideMSlider(int x, SSFN fn) {
 
 	// Work out the indices
 	index = cd.selBox & ~IS_MASK;
-	for (i = 0; i < numMdSlides; i++)
-		if (mdSlides[i].num == index)
+	for (i = 0; i < g_numMdSlides; i++)
+		if (g_mdSlides[i].num == index)
 			break;
-	assert(i < numMdSlides);
+	assert(i < g_numMdSlides);
 
 	switch (fn) {
 	case S_START:			// Start of a drag on the slider
 		// can use index as a throw-away value
-		GetAniPosition(mdSlides[i].obj, &newX, &index);
-		lX = sX = newX;
+		GetAniPosition(g_mdSlides[i].obj, &newX, &index);
+		g_lX = g_sX = newX;
 		break;
 
 	case S_SLIDE:			// X-movement during drag
@@ -4427,19 +4416,19 @@ static void SlideMSlider(int x, SSFN fn) {
 
 		newX = newX + x;	// New x-position
 
-		if (newX < mdSlides[i].min)
-			gotoX = mdSlides[i].min;	// Below bottom limit
-		else if (newX > mdSlides[i].max)
-			gotoX = mdSlides[i].max;	// Above top limit
+		if (newX < g_mdSlides[i].min)
+			gotoX = g_mdSlides[i].min;	// Below bottom limit
+		else if (newX > g_mdSlides[i].max)
+			gotoX = g_mdSlides[i].max;	// Above top limit
 		else
 			gotoX = newX;		// Hunky-Dory
 
 		// Move slider to new position
-		MultiMoveRelXY(mdSlides[i].obj, gotoX - sX, 0);
-		sX = gotoX;
+		MultiMoveRelXY(g_mdSlides[i].obj, gotoX - g_sX, 0);
+		g_sX = gotoX;
 
-		if (lX != sX) {
-			*cd.box[index].ival = (sX - mdSlides[i].min)*cd.box[index].w/SLIDE_RANGE;
+		if (g_lX != g_sX) {
+			*cd.box[index].ival = (g_sX - g_mdSlides[i].min)*cd.box[index].w/SLIDE_RANGE;
 			if (cd.box[index].boxFunc == MUSICVOL)
 				SetMidiVolume(*cd.box[index].ival);
 #ifdef MAC_OPTIONS
@@ -4449,14 +4438,14 @@ static void SlideMSlider(int x, SSFN fn) {
 			if (cd.box[index].boxFunc == SAMPVOL)
 				SetSampleVolume(*cd.box[index].ival);
 #endif
-			lX = sX;
+			g_lX = g_sX;
 		}
 		break;
 
 	case S_TIMEUP:
 	case S_TIMEDN:
 		gotoX = SLIDE_RANGE*(*cd.box[index].ival)/cd.box[index].w;
-		MultiSetAniX(mdSlides[i].obj, mdSlides[i].min+gotoX);
+		MultiSetAniX(g_mdSlides[i].obj, g_mdSlides[i].min+gotoX);
 
 		if (cd.box[index].boxFunc == MUSICVOL)
 			SetMidiVolume(*cd.box[index].ival);
@@ -4471,7 +4460,7 @@ static void SlideMSlider(int x, SSFN fn) {
 
 	case S_END:			// End of a drag on the slider
 		AddBoxes(false);	// Might change position slightly
-		if (ino == INV_CONF && cd.box == subtitlesBox)
+		if (g_ino == INV_CONF && cd.box == subtitlesBox)
 			Select(_vm->_config->_language, false);
 		break;
 	}
@@ -4481,23 +4470,23 @@ static void SlideMSlider(int x, SSFN fn) {
  * Called from ChangeingSize() during re-sizing.
  */
 static void GettingTaller() {
-	if (SuppV) {
-		Ychange += SuppV;
-		if (Ycompensate == 'T')
-			InvD[ino].inventoryY += SuppV;
-		SuppV = 0;
+	if (g_SuppV) {
+		g_Ychange += g_SuppV;
+		if (g_Ycompensate == 'T')
+			g_InvD[g_ino].inventoryY += g_SuppV;
+		g_SuppV = 0;
 	}
-	while (Ychange > (ITEM_HEIGHT+1) && InvD[ino].NoofVicons < InvD[ino].MaxVicons) {
-		Ychange -= (ITEM_HEIGHT+1);
-		InvD[ino].NoofVicons++;
-		if (Ycompensate == 'T')
-			InvD[ino].inventoryY -= (ITEM_HEIGHT+1);
+	while (g_Ychange > (ITEM_HEIGHT+1) && g_InvD[g_ino].NoofVicons < g_InvD[g_ino].MaxVicons) {
+		g_Ychange -= (ITEM_HEIGHT+1);
+		g_InvD[g_ino].NoofVicons++;
+		if (g_Ycompensate == 'T')
+			g_InvD[g_ino].inventoryY -= (ITEM_HEIGHT+1);
 	}
-	if (InvD[ino].NoofVicons < InvD[ino].MaxVicons) {
-		SuppV = Ychange;
-		Ychange = 0;
-		if (Ycompensate == 'T')
-			InvD[ino].inventoryY -= SuppV;
+	if (g_InvD[g_ino].NoofVicons < g_InvD[g_ino].MaxVicons) {
+		g_SuppV = g_Ychange;
+		g_Ychange = 0;
+		if (g_Ycompensate == 'T')
+			g_InvD[g_ino].inventoryY -= g_SuppV;
 	}
 }
 
@@ -4505,73 +4494,73 @@ static void GettingTaller() {
  * Called from ChangeingSize() during re-sizing.
  */
 static void GettingShorter() {
-	int StartNvi = InvD[ino].NoofVicons;
-	int StartUv = SuppV;
+	int StartNvi = g_InvD[g_ino].NoofVicons;
+	int StartUv = g_SuppV;
 
-	if (SuppV) {
-		Ychange += (SuppV - (ITEM_HEIGHT+1));
-		InvD[ino].NoofVicons++;
-		SuppV = 0;
+	if (g_SuppV) {
+		g_Ychange += (g_SuppV - (ITEM_HEIGHT+1));
+		g_InvD[g_ino].NoofVicons++;
+		g_SuppV = 0;
 	}
-	while (Ychange < -(ITEM_HEIGHT+1) && InvD[ino].NoofVicons > InvD[ino].MinVicons) {
-		Ychange += (ITEM_HEIGHT+1);
-		InvD[ino].NoofVicons--;
+	while (g_Ychange < -(ITEM_HEIGHT+1) && g_InvD[g_ino].NoofVicons > g_InvD[g_ino].MinVicons) {
+		g_Ychange += (ITEM_HEIGHT+1);
+		g_InvD[g_ino].NoofVicons--;
 	}
-	if (InvD[ino].NoofVicons > InvD[ino].MinVicons && Ychange) {
-		SuppV = (ITEM_HEIGHT+1) + Ychange;
-		InvD[ino].NoofVicons--;
-		Ychange = 0;
+	if (g_InvD[g_ino].NoofVicons > g_InvD[g_ino].MinVicons && g_Ychange) {
+		g_SuppV = (ITEM_HEIGHT+1) + g_Ychange;
+		g_InvD[g_ino].NoofVicons--;
+		g_Ychange = 0;
 	}
-	if (Ycompensate == 'T')
-		InvD[ino].inventoryY += (ITEM_HEIGHT+1)*(StartNvi - InvD[ino].NoofVicons) - (SuppV - StartUv);
+	if (g_Ycompensate == 'T')
+		g_InvD[g_ino].inventoryY += (ITEM_HEIGHT+1)*(StartNvi - g_InvD[g_ino].NoofVicons) - (g_SuppV - StartUv);
 }
 
 /**
  * Called from ChangeingSize() during re-sizing.
  */
 static void GettingWider() {
-	int StartNhi = InvD[ino].NoofHicons;
-	int StartUh = SuppH;
+	int StartNhi = g_InvD[g_ino].NoofHicons;
+	int StartUh = g_SuppH;
 
-	if (SuppH) {
-		Xchange += SuppH;
-		SuppH = 0;
+	if (g_SuppH) {
+		g_Xchange += g_SuppH;
+		g_SuppH = 0;
 	}
-	while (Xchange > (ITEM_WIDTH+1) && InvD[ino].NoofHicons < InvD[ino].MaxHicons) {
-		Xchange -= (ITEM_WIDTH+1);
-		InvD[ino].NoofHicons++;
+	while (g_Xchange > (ITEM_WIDTH+1) && g_InvD[g_ino].NoofHicons < g_InvD[g_ino].MaxHicons) {
+		g_Xchange -= (ITEM_WIDTH+1);
+		g_InvD[g_ino].NoofHicons++;
 	}
-	if (InvD[ino].NoofHicons < InvD[ino].MaxHicons) {
-		SuppH = Xchange;
-		Xchange = 0;
+	if (g_InvD[g_ino].NoofHicons < g_InvD[g_ino].MaxHicons) {
+		g_SuppH = g_Xchange;
+		g_Xchange = 0;
 	}
-	if (Xcompensate == 'L')
-		InvD[ino].inventoryX += (ITEM_WIDTH+1)*(StartNhi - InvD[ino].NoofHicons) - (SuppH - StartUh);
+	if (g_Xcompensate == 'L')
+		g_InvD[g_ino].inventoryX += (ITEM_WIDTH+1)*(StartNhi - g_InvD[g_ino].NoofHicons) - (g_SuppH - StartUh);
 }
 
 /**
  * Called from ChangeingSize() during re-sizing.
  */
 static void GettingNarrower() {
-	int StartNhi = InvD[ino].NoofHicons;
-	int StartUh = SuppH;
+	int StartNhi = g_InvD[g_ino].NoofHicons;
+	int StartUh = g_SuppH;
 
-	if (SuppH) {
-		Xchange += (SuppH - (ITEM_WIDTH+1));
-		InvD[ino].NoofHicons++;
-		SuppH = 0;
+	if (g_SuppH) {
+		g_Xchange += (g_SuppH - (ITEM_WIDTH+1));
+		g_InvD[g_ino].NoofHicons++;
+		g_SuppH = 0;
 	}
-	while (Xchange < -(ITEM_WIDTH+1) && InvD[ino].NoofHicons > InvD[ino].MinHicons) {
-		Xchange += (ITEM_WIDTH+1);
-		InvD[ino].NoofHicons--;
+	while (g_Xchange < -(ITEM_WIDTH+1) && g_InvD[g_ino].NoofHicons > g_InvD[g_ino].MinHicons) {
+		g_Xchange += (ITEM_WIDTH+1);
+		g_InvD[g_ino].NoofHicons--;
 	}
-	if (InvD[ino].NoofHicons > InvD[ino].MinHicons && Xchange) {
-		SuppH = (ITEM_WIDTH+1) + Xchange;
-		InvD[ino].NoofHicons--;
-		Xchange = 0;
+	if (g_InvD[g_ino].NoofHicons > g_InvD[g_ino].MinHicons && g_Xchange) {
+		g_SuppH = (ITEM_WIDTH+1) + g_Xchange;
+		g_InvD[g_ino].NoofHicons--;
+		g_Xchange = 0;
 	}
-	if (Xcompensate == 'L')
-		InvD[ino].inventoryX += (ITEM_WIDTH+1)*(StartNhi - InvD[ino].NoofHicons) - (SuppH - StartUh);
+	if (g_Xcompensate == 'L')
+		g_InvD[g_ino].inventoryX += (ITEM_WIDTH+1)*(StartNhi - g_InvD[g_ino].NoofHicons) - (g_SuppH - StartUh);
 }
 
 
@@ -4580,15 +4569,15 @@ static void GettingNarrower() {
  */
 static void ChangeingSize() {
 	/* Make it taller or shorter if necessary. */
-	if (Ychange > 0)
+	if (g_Ychange > 0)
 		GettingTaller();
-	else if (Ychange < 0)
+	else if (g_Ychange < 0)
 		GettingShorter();
 
 	/* Make it wider or narrower if necessary. */
-	if (Xchange > 0)
+	if (g_Xchange > 0)
 		GettingWider();
-	else if (Xchange < 0)
+	else if (g_Xchange < 0)
 		GettingNarrower();
 
 	ConstructInventory(EMPTY);
@@ -4601,29 +4590,29 @@ extern void Xmovement(int x) {
 	int aniX, aniY;
 	int i;
 
-	if (x && objArray[0] != NULL) {
-		switch (InvDragging) {
+	if (x && g_objArray[0] != NULL) {
+		switch (g_InvDragging) {
 		case ID_MOVE:
-			GetAniPosition(objArray[0], &InvD[ino].inventoryX, &aniY);
-			InvD[ino].inventoryX +=x;
-			MultiSetAniX(objArray[0], InvD[ino].inventoryX);
-			for (i = 1; objArray[i] && i < MAX_WCOMP; i++)
-				MultiMoveRelXY(objArray[i], x, 0);
-			for (i = 0; iconArray[i] && i < MAX_ICONS; i++)
-				MultiMoveRelXY(iconArray[i], x, 0);
+			GetAniPosition(g_objArray[0], &g_InvD[g_ino].inventoryX, &aniY);
+			g_InvD[g_ino].inventoryX +=x;
+			MultiSetAniX(g_objArray[0], g_InvD[g_ino].inventoryX);
+			for (i = 1; g_objArray[i] && i < MAX_WCOMP; i++)
+				MultiMoveRelXY(g_objArray[i], x, 0);
+			for (i = 0; g_iconArray[i] && i < MAX_ICONS; i++)
+				MultiMoveRelXY(g_iconArray[i], x, 0);
 			break;
 
 		case ID_LEFT:
 		case ID_TLEFT:
 		case ID_BLEFT:
-			Xchange -= x;
+			g_Xchange -= x;
 			ChangeingSize();
 			break;
 
 		case ID_RIGHT:
 		case ID_TRIGHT:
 		case ID_BRIGHT:
-			Xchange += x;
+			g_Xchange += x;
 			ChangeingSize();
 			break;
 
@@ -4649,16 +4638,16 @@ extern void Ymovement(int y) {
 	int aniX, aniY;
 	int i;
 
-	if (y && objArray[0] != NULL) {
-		switch (InvDragging) {
+	if (y && g_objArray[0] != NULL) {
+		switch (g_InvDragging) {
 		case ID_MOVE:
-			GetAniPosition(objArray[0], &aniX, &InvD[ino].inventoryY);
-			InvD[ino].inventoryY +=y;
-			MultiSetAniY(objArray[0], InvD[ino].inventoryY);
-			for (i = 1; objArray[i] && i < MAX_WCOMP; i++)
-				MultiMoveRelXY(objArray[i], 0, y);
-			for (i = 0; iconArray[i] && i < MAX_ICONS; i++)
-				MultiMoveRelXY(iconArray[i], 0, y);
+			GetAniPosition(g_objArray[0], &aniX, &g_InvD[g_ino].inventoryY);
+			g_InvD[g_ino].inventoryY +=y;
+			MultiSetAniY(g_objArray[0], g_InvD[g_ino].inventoryY);
+			for (i = 1; g_objArray[i] && i < MAX_WCOMP; i++)
+				MultiMoveRelXY(g_objArray[i], 0, y);
+			for (i = 0; g_iconArray[i] && i < MAX_ICONS; i++)
+				MultiMoveRelXY(g_iconArray[i], 0, y);
 			break;
 
 		case ID_SLIDE:
@@ -4672,14 +4661,14 @@ extern void Ymovement(int y) {
 		case ID_BOTTOM:
 		case ID_BLEFT:
 		case ID_BRIGHT:
-			Ychange += y;
+			g_Ychange += y;
 			ChangeingSize();
 			break;
 
 		case ID_TOP:
 		case ID_TLEFT:
 		case ID_TRIGHT:
-			Ychange -= y;
+			g_Ychange -= y;
 			ChangeingSize();
 			break;
 
@@ -4705,16 +4694,16 @@ static void InvDragStart() {
 	/*
 	 * Do something different for Save/Restore screens
 	 */
-	if (ino == INV_CONF) {
+	if (g_ino == INV_CONF) {
 		int	whichbox;
 
 		whichbox = WhichMenuBox(curX, curY, true);
 
 		if (whichbox == IB_SLIDE) {
-			InvDragging = ID_CSLIDE;
+			g_InvDragging = ID_CSLIDE;
 			SlideCSlider(0, S_START);
 		} else if (whichbox > 0 && (whichbox & IS_MASK)) {
-			InvDragging = ID_MDCONT;	// Mixing desk control
+			g_InvDragging = ID_MDCONT;	// Mixing desk control
 			cd.selBox = whichbox;
 			SlideMSlider(0, S_START);
 		}
@@ -4726,85 +4715,85 @@ static void InvDragStart() {
 	 */
 	switch (InvArea(curX, curY)) {
 	case I_HEADER:
-		if (InvD[ino].bMoveable) {
-			InvDragging = ID_MOVE;
+		if (g_InvD[g_ino].bMoveable) {
+			g_InvDragging = ID_MOVE;
 		}
 		break;
 
 	case I_SLIDE:
-		InvDragging = ID_SLIDE;
+		g_InvDragging = ID_SLIDE;
 		SlideSlider(0, S_START);
 		break;
 
 	case I_BOTTOM:
-		if (InvD[ino].resizable) {
-			Ychange = 0;
-			InvDragging = ID_BOTTOM;
-			Ycompensate = 'B';
+		if (g_InvD[g_ino].resizable) {
+			g_Ychange = 0;
+			g_InvDragging = ID_BOTTOM;
+			g_Ycompensate = 'B';
 		}
 		break;
 
 	case I_TOP:
-		if (InvD[ino].resizable) {
-			Ychange = 0;
-			InvDragging = ID_TOP;
-			Ycompensate = 'T';
+		if (g_InvD[g_ino].resizable) {
+			g_Ychange = 0;
+			g_InvDragging = ID_TOP;
+			g_Ycompensate = 'T';
 		}
 		break;
 
 	case I_LEFT:
-		if (InvD[ino].resizable) {
-			Xchange = 0;
-			InvDragging = ID_LEFT;
-			Xcompensate = 'L';
+		if (g_InvD[g_ino].resizable) {
+			g_Xchange = 0;
+			g_InvDragging = ID_LEFT;
+			g_Xcompensate = 'L';
 		}
 		break;
 
 	case I_RIGHT:
-		if (InvD[ino].resizable) {
-			Xchange = 0;
-			InvDragging = ID_RIGHT;
-			Xcompensate = 'R';
+		if (g_InvD[g_ino].resizable) {
+			g_Xchange = 0;
+			g_InvDragging = ID_RIGHT;
+			g_Xcompensate = 'R';
 		}
 		break;
 
 	case I_TLEFT:
-		if (InvD[ino].resizable) {
-			Ychange = 0;
-			Ycompensate = 'T';
-			Xchange = 0;
-			Xcompensate = 'L';
-			InvDragging = ID_TLEFT;
+		if (g_InvD[g_ino].resizable) {
+			g_Ychange = 0;
+			g_Ycompensate = 'T';
+			g_Xchange = 0;
+			g_Xcompensate = 'L';
+			g_InvDragging = ID_TLEFT;
 		}
 		break;
 
 	case I_TRIGHT:
-		if (InvD[ino].resizable) {
-			Ychange = 0;
-			Ycompensate = 'T';
-			Xchange = 0;
-			Xcompensate = 'R';
-			InvDragging = ID_TRIGHT;
+		if (g_InvD[g_ino].resizable) {
+			g_Ychange = 0;
+			g_Ycompensate = 'T';
+			g_Xchange = 0;
+			g_Xcompensate = 'R';
+			g_InvDragging = ID_TRIGHT;
 		}
 		break;
 
 	case I_BLEFT:
-		if (InvD[ino].resizable) {
-			Ychange = 0;
-			Ycompensate = 'B';
-			Xchange = 0;
-			Xcompensate = 'L';
-			InvDragging = ID_BLEFT;
+		if (g_InvD[g_ino].resizable) {
+			g_Ychange = 0;
+			g_Ycompensate = 'B';
+			g_Xchange = 0;
+			g_Xcompensate = 'L';
+			g_InvDragging = ID_BLEFT;
 		}
 		break;
 
 	case I_BRIGHT:
-		if (InvD[ino].resizable) {
-			Ychange = 0;
-			Ycompensate = 'B';
-			Xchange = 0;
-			Xcompensate = 'R';
-			InvDragging = ID_BRIGHT;
+		if (g_InvD[g_ino].resizable) {
+			g_Ychange = 0;
+			g_Ycompensate = 'B';
+			g_Xchange = 0;
+			g_Xcompensate = 'R';
+			g_InvDragging = ID_BRIGHT;
 		}
 		break;
 	}
@@ -4818,14 +4807,14 @@ static void InvDragEnd() {
 
 	GetCursorXY(&curX, &curY, false);
 
-	if (InvDragging != ID_NONE) {
-		if (InvDragging == ID_SLIDE) {
+	if (g_InvDragging != ID_NONE) {
+		if (g_InvDragging == ID_SLIDE) {
 			SlideSlider(0, S_END);
-		} else if (InvDragging == ID_CSLIDE) {
+		} else if (g_InvDragging == ID_CSLIDE) {
 			;	// No action
-		} else if (InvDragging == ID_MDCONT) {
+		} else if (g_InvDragging == ID_MDCONT) {
 			SlideMSlider(0, S_END);
-		} else if (InvDragging == ID_MOVE) {
+		} else if (g_InvDragging == ID_MOVE) {
 			;	// No action
 		} else {
 			// Were re-sizing. Redraw the whole thing.
@@ -4834,21 +4823,21 @@ static void InvDragEnd() {
 			ConstructInventory(FULL);
 
 			// If this was the maximised, it no longer is!
-			if (InventoryMaximised) {
-				InventoryMaximised = false;
-				InvD[ino].otherX = InvD[ino].inventoryX;
-				InvD[ino].otherY = InvD[ino].inventoryY;
+			if (g_InventoryMaximised) {
+				g_InventoryMaximised = false;
+				g_InvD[g_ino].otherX = g_InvD[g_ino].inventoryX;
+				g_InvD[g_ino].otherY = g_InvD[g_ino].inventoryY;
 			}
 		}
 
-		InvDragging = ID_NONE;
+		g_InvDragging = ID_NONE;
 		ProcessedProvisional();
 	}
 
 	// Cursor could well now be inappropriate
 	InvCursor(IC_AREA, curX, curY);
 
-	Xchange = Ychange = 0;		// Probably no need, but does no harm!
+	g_Xchange = g_Ychange = 0;		// Probably no need, but does no harm!
 }
 
 static void MenuPageDown() {
@@ -4860,7 +4849,7 @@ static void MenuPageDown() {
 			Select(cd.selBox, true);
 		}
 	} else if (cd.box == hopperBox1) {
-		if (cd.extraBase < numScenes - NUM_RGROUP_BOXES) {
+		if (cd.extraBase < g_numScenes - NUM_RGROUP_BOXES) {
 			FirstScene(cd.extraBase + (NUM_RGROUP_BOXES - 1));
 			AddBoxes(true);
 			if (cd.selBox)
@@ -4868,7 +4857,7 @@ static void MenuPageDown() {
 			Select(cd.selBox, true);
 		}
 	} else if (cd.box == hopperBox2) {
-		if (cd.extraBase < numEntries - NUM_RGROUP_BOXES) {
+		if (cd.extraBase < g_numEntries - NUM_RGROUP_BOXES) {
 			FirstEntry(cd.extraBase+(NUM_RGROUP_BOXES - 1));
 			AddBoxes(true);
 			if (cd.selBox)
@@ -5010,7 +4999,7 @@ static void ConfActionSpecial(int i) {
 				Select(cd.selBox, true);
 			}
 		} else if (cd.box == hopperBox1) {
-			if (cd.extraBase < numScenes - NUM_RGROUP_BOXES) {
+			if (cd.extraBase < g_numScenes - NUM_RGROUP_BOXES) {
 				FirstScene(cd.extraBase + 1);
 				AddBoxes(true);
 				if (cd.selBox)
@@ -5018,7 +5007,7 @@ static void ConfActionSpecial(int i) {
 				Select(cd.selBox, true);
 			}
 		} else if (cd.box == hopperBox2) {
-			if (cd.extraBase < numEntries - NUM_RGROUP_BOXES) {
+			if (cd.extraBase < g_numEntries - NUM_RGROUP_BOXES) {
 				FirstEntry(cd.extraBase + 1);
 				AddBoxes(true);
 				if (cd.selBox)
@@ -5045,25 +5034,25 @@ static void InvPutDown(int index) {
 	int hiIndex;	// Current position of held item (if in)
 
 	// Find where the held item is positioned in this inventory (if it is)
-	for (hiIndex = 0; hiIndex < InvD[ino].NoofItems; hiIndex++)
-		if (InvD[ino].contents[hiIndex] == HeldItem)
+	for (hiIndex = 0; hiIndex < g_InvD[g_ino].NoofItems; hiIndex++)
+		if (g_InvD[g_ino].contents[hiIndex] == g_heldItem)
 			break;
 
 	// If drop position would leave a gap, move it up
-	if (index >= InvD[ino].NoofItems) {
-		if (hiIndex == InvD[ino].NoofItems)	// Not in, add it
-			index = InvD[ino].NoofItems;
+	if (index >= g_InvD[g_ino].NoofItems) {
+		if (hiIndex == g_InvD[g_ino].NoofItems)	// Not in, add it
+			index = g_InvD[g_ino].NoofItems;
 		else
-			index = InvD[ino].NoofItems - 1;
+			index = g_InvD[g_ino].NoofItems - 1;
 	}
 
-	if (hiIndex == InvD[ino].NoofItems) {	// Not in, add it
-		if (InvD[ino].NoofItems < InvD[ino].MaxInvObj) {
-			InvD[ino].NoofItems++;
+	if (hiIndex == g_InvD[g_ino].NoofItems) {	// Not in, add it
+		if (g_InvD[g_ino].NoofItems < g_InvD[g_ino].MaxInvObj) {
+			g_InvD[g_ino].NoofItems++;
 
 			// Don't leave it in the other inventory!
-			if (InventoryPos(HeldItem) != INV_HELDNOTIN)
-				RemFromInventory(ino == INV_1 ? INV_2 : INV_1, HeldItem);
+			if (InventoryPos(g_heldItem) != INV_HELDNOTIN)
+				RemFromInventory(g_ino == INV_1 ? INV_2 : INV_1, g_heldItem);
 		} else {
 			// No room at the inn!
 			return;
@@ -5072,17 +5061,17 @@ static void InvPutDown(int index) {
 
 	// Position it in the inventory
 	if (index < hiIndex) {
-		memmove(&InvD[ino].contents[index + 1], &InvD[ino].contents[index], (hiIndex-index)*sizeof(int));
-		InvD[ino].contents[index] = HeldItem;
+		memmove(&g_InvD[g_ino].contents[index + 1], &g_InvD[g_ino].contents[index], (hiIndex-index)*sizeof(int));
+		g_InvD[g_ino].contents[index] = g_heldItem;
 	} else if (index > hiIndex) {
-		memmove(&InvD[ino].contents[hiIndex], &InvD[ino].contents[hiIndex+1], (index-hiIndex)*sizeof(int));
-		InvD[ino].contents[index] = HeldItem;
+		memmove(&g_InvD[g_ino].contents[hiIndex], &g_InvD[g_ino].contents[hiIndex+1], (index-hiIndex)*sizeof(int));
+		g_InvD[g_ino].contents[index] = g_heldItem;
 	} else {
-		InvD[ino].contents[index] = HeldItem;
+		g_InvD[g_ino].contents[index] = g_heldItem;
 	}
 
-	HeldItem = INV_NOICON;
-	ItemsChanged = true;
+	g_heldItem = INV_NOICON;
+	g_ItemsChanged = true;
 	DelAuxCursor();
 	RestoreMainCursor();
 	GetCursorXY(&aniX, &aniY, false);
@@ -5116,26 +5105,26 @@ static void InvPickup(int index) {
 		return;
 
 	// If not holding anything
-	if (HeldItem == INV_NOICON && InvD[ino].contents[index] &&
-			(!TinselV2 || InvD[ino].contents[index] != HeldItem)) {
+	if (g_heldItem == INV_NOICON && g_InvD[g_ino].contents[index] &&
+			(!TinselV2 || g_InvD[g_ino].contents[index] != g_heldItem)) {
 		// Pick-up
-		invObj = GetInvObject(InvD[ino].contents[index]);
-		thisIcon = InvD[ino].contents[index];
+		invObj = GetInvObject(g_InvD[g_ino].contents[index]);
+		g_thisIcon = g_InvD[g_ino].contents[index];
 		if (TinselV2)
 			InvTinselEvent(invObj, PICKUP, INV_PICKUP, index);
 		else if (invObj->hScript)
 			InvTinselEvent(invObj, WALKTO, INV_PICKUP, index);
 
-	} else if (HeldItem != INV_NOICON) {
+	} else if (g_heldItem != INV_NOICON) {
 		// Put-down
-		invObj = GetInvObject(HeldItem);
+		invObj = GetInvObject(g_heldItem);
 
 		// If DROPCODE set, send event, otherwise it's a putdown
 		if (invObj->attribute & IO_DROPCODE && invObj->hScript)
 			InvTinselEvent(invObj, PUTDOWN, INV_PICKUP, index);
 
-		else if (!(invObj->attribute & IO_ONLYINV1 && ino != INV_1)
-				&& !(invObj->attribute & IO_ONLYINV2 && ino != INV_2)) {
+		else if (!(invObj->attribute & IO_ONLYINV1 && g_ino != INV_1)
+				&& !(invObj->attribute & IO_ONLYINV2 && g_ino != INV_2)) {
 			if (TinselV2)
 				InvPutDown(index);
 			else
@@ -5152,7 +5141,7 @@ static void InvWalkTo(const Common::Point &coOrds) {
 
 	switch (InvArea(coOrds.x, coOrds.y)) {
 	case I_NOTIN:
-		if (ino == INV_CONV)
+		if (g_ino == INV_CONV)
 			ConvAction(INV_CLOSEICON);
 		if ((cd.box == hopperBox1) || (cd.box == hopperBox2))
 			FreeSceneHopper();
@@ -5160,43 +5149,43 @@ static void InvWalkTo(const Common::Point &coOrds) {
 		break;
 
 	case I_SLIDE_UP:
-		if (InvD[ino].NoofVicons == 1)
-			InvD[ino].FirstDisp -= InvD[ino].NoofHicons;
-		for (i = 1; i < InvD[ino].NoofVicons; i++)
-			InvD[ino].FirstDisp -= InvD[ino].NoofHicons;
-		if (InvD[ino].FirstDisp < 0)
-			InvD[ino].FirstDisp = 0;
-		ItemsChanged = true;
+		if (g_InvD[g_ino].NoofVicons == 1)
+			g_InvD[g_ino].FirstDisp -= g_InvD[g_ino].NoofHicons;
+		for (i = 1; i < g_InvD[g_ino].NoofVicons; i++)
+			g_InvD[g_ino].FirstDisp -= g_InvD[g_ino].NoofHicons;
+		if (g_InvD[g_ino].FirstDisp < 0)
+			g_InvD[g_ino].FirstDisp = 0;
+		g_ItemsChanged = true;
 		break;
 
 	case I_UP:
-		InvD[ino].FirstDisp -= InvD[ino].NoofHicons;
-		if (InvD[ino].FirstDisp < 0)
-			InvD[ino].FirstDisp = 0;
-		ItemsChanged = true;
+		g_InvD[g_ino].FirstDisp -= g_InvD[g_ino].NoofHicons;
+		if (g_InvD[g_ino].FirstDisp < 0)
+			g_InvD[g_ino].FirstDisp = 0;
+		g_ItemsChanged = true;
 		break;
 
 	case I_SLIDE_DOWN:
-		if (InvD[ino].NoofVicons == 1)
-			if (InvD[ino].FirstDisp + InvD[ino].NoofHicons*InvD[ino].NoofVicons < InvD[ino].NoofItems)
-				InvD[ino].FirstDisp += InvD[ino].NoofHicons;
-		for (i = 1; i < InvD[ino].NoofVicons; i++) {
-			if (InvD[ino].FirstDisp + InvD[ino].NoofHicons*InvD[ino].NoofVicons < InvD[ino].NoofItems)
-				InvD[ino].FirstDisp += InvD[ino].NoofHicons;
+		if (g_InvD[g_ino].NoofVicons == 1)
+			if (g_InvD[g_ino].FirstDisp + g_InvD[g_ino].NoofHicons*g_InvD[g_ino].NoofVicons < g_InvD[g_ino].NoofItems)
+				g_InvD[g_ino].FirstDisp += g_InvD[g_ino].NoofHicons;
+		for (i = 1; i < g_InvD[g_ino].NoofVicons; i++) {
+			if (g_InvD[g_ino].FirstDisp + g_InvD[g_ino].NoofHicons*g_InvD[g_ino].NoofVicons < g_InvD[g_ino].NoofItems)
+				g_InvD[g_ino].FirstDisp += g_InvD[g_ino].NoofHicons;
 		}
-		ItemsChanged = true;
+		g_ItemsChanged = true;
 		break;
 
 	case I_DOWN:
-		if (InvD[ino].FirstDisp + InvD[ino].NoofHicons*InvD[ino].NoofVicons < InvD[ino].NoofItems) {
-			InvD[ino].FirstDisp += InvD[ino].NoofHicons;
-			ItemsChanged = true;
+		if (g_InvD[g_ino].FirstDisp + g_InvD[g_ino].NoofHicons*g_InvD[g_ino].NoofVicons < g_InvD[g_ino].NoofItems) {
+			g_InvD[g_ino].FirstDisp += g_InvD[g_ino].NoofHicons;
+			g_ItemsChanged = true;
 		}
 		break;
 
 	case I_BODY:
-		if (ino == INV_CONF) {
-			if (!InventoryHidden)
+		if (g_ino == INV_CONF) {
+			if (!g_InventoryHidden)
 				MenuAction(WhichMenuBox(coOrds.x, coOrds.y, false), false);
 		} else {
 			Common::Point pt = coOrds;
@@ -5204,8 +5193,8 @@ static void InvWalkTo(const Common::Point &coOrds) {
 
 			// To cater for drop in dead space between icons,
 			// look 1 pixel right, then 1 down, then 1 right and down.
-			if (i == INV_NOICON && HeldItem != INV_NOICON &&
-					(ino == INV_1 || ino == INV_2)) {
+			if (i == INV_NOICON && g_heldItem != INV_NOICON &&
+					(g_ino == INV_1 || g_ino == INV_2)) {
 				pt.x += 1;				// 1 to the right
 				i = InvItem(pt, false);
 				if (i == INV_NOICON) {
@@ -5219,7 +5208,7 @@ static void InvWalkTo(const Common::Point &coOrds) {
 				}
 			}
 
-			if (ino == INV_CONV) {
+			if (g_ino == INV_CONV) {
 				ConvAction(i);
 			} else
 				InvPickup(i);
@@ -5238,19 +5227,19 @@ static void InvAction() {
 
 	switch (InvArea(aniX, aniY)) {
 	case I_BODY:
-		if (ino == INV_CONF) {
-			if (!InventoryHidden)
+		if (g_ino == INV_CONF) {
+			if (!g_InventoryHidden)
 				MenuAction(WhichMenuBox(aniX, aniY, false), true);
-		} else if (ino == INV_CONV) {
+		} else if (g_ino == INV_CONV) {
 			index = InvItem(&aniX, &aniY, false);
 			ConvAction(index);
 		} else {
 			index = InvItem(&aniX, &aniY, false);
 			if (index != INV_NOICON) {
-				if (InvD[ino].contents[index] && InvD[ino].contents[index] != HeldItem) {
-					invObj = GetInvObject(InvD[ino].contents[index]);
+				if (g_InvD[g_ino].contents[index] && g_InvD[g_ino].contents[index] != g_heldItem) {
+					invObj = GetInvObject(g_InvD[g_ino].contents[index]);
 					if (TinselV2)
-						thisIcon = InvD[ino].contents[index];
+						g_thisIcon = g_InvD[g_ino].contents[index];
 					if (TinselV2 || (invObj->hScript))
 						InvTinselEvent(invObj, ACTION, INV_ACTION, index);
 				}
@@ -5259,33 +5248,33 @@ static void InvAction() {
 		break;
 
 	case I_HEADER:	// Maximise/unmaximise inventory
-		if (!InvD[ino].resizable)
+		if (!g_InvD[g_ino].resizable)
 			break;
 
-		if (!InventoryMaximised) {
-			InvD[ino].sNoofHicons = InvD[ino].NoofHicons;
-			InvD[ino].sNoofVicons = InvD[ino].NoofVicons;
-			InvD[ino].NoofHicons = InvD[ino].MaxHicons;
-			InvD[ino].NoofVicons = InvD[ino].MaxVicons;
-			InventoryMaximised = true;
-
-			i = InvD[ino].inventoryX;
-			InvD[ino].inventoryX = InvD[ino].otherX;
-			InvD[ino].otherX = i;
-			i = InvD[ino].inventoryY;
-			InvD[ino].inventoryY = InvD[ino].otherY;
-			InvD[ino].otherY = i;
+		if (!g_InventoryMaximised) {
+			g_InvD[g_ino].sNoofHicons = g_InvD[g_ino].NoofHicons;
+			g_InvD[g_ino].sNoofVicons = g_InvD[g_ino].NoofVicons;
+			g_InvD[g_ino].NoofHicons = g_InvD[g_ino].MaxHicons;
+			g_InvD[g_ino].NoofVicons = g_InvD[g_ino].MaxVicons;
+			g_InventoryMaximised = true;
+
+			i = g_InvD[g_ino].inventoryX;
+			g_InvD[g_ino].inventoryX = g_InvD[g_ino].otherX;
+			g_InvD[g_ino].otherX = i;
+			i = g_InvD[g_ino].inventoryY;
+			g_InvD[g_ino].inventoryY = g_InvD[g_ino].otherY;
+			g_InvD[g_ino].otherY = i;
 		} else {
-			InvD[ino].NoofHicons = InvD[ino].sNoofHicons;
-			InvD[ino].NoofVicons = InvD[ino].sNoofVicons;
-			InventoryMaximised = false;
-
-			i = InvD[ino].inventoryX;
-			InvD[ino].inventoryX = InvD[ino].otherX;
-			InvD[ino].otherX = i;
-			i = InvD[ino].inventoryY;
-			InvD[ino].inventoryY = InvD[ino].otherY;
-			InvD[ino].otherY = i;
+			g_InvD[g_ino].NoofHicons = g_InvD[g_ino].sNoofHicons;
+			g_InvD[g_ino].NoofVicons = g_InvD[g_ino].sNoofVicons;
+			g_InventoryMaximised = false;
+
+			i = g_InvD[g_ino].inventoryX;
+			g_InvD[g_ino].inventoryX = g_InvD[g_ino].otherX;
+			g_InvD[g_ino].otherX = i;
+			i = g_InvD[g_ino].inventoryY;
+			g_InvD[g_ino].inventoryY = g_InvD[g_ino].otherY;
+			g_InvD[g_ino].otherY = i;
 		}
 
 		// Delete current, and re-draw
@@ -5295,15 +5284,15 @@ static void InvAction() {
 		break;
 
 	case I_UP:
-		InvD[ino].FirstDisp -= InvD[ino].NoofHicons;
-		if (InvD[ino].FirstDisp < 0)
-			InvD[ino].FirstDisp = 0;
-		ItemsChanged = true;
+		g_InvD[g_ino].FirstDisp -= g_InvD[g_ino].NoofHicons;
+		if (g_InvD[g_ino].FirstDisp < 0)
+			g_InvD[g_ino].FirstDisp = 0;
+		g_ItemsChanged = true;
 		break;
 	case I_DOWN:
-		if (InvD[ino].FirstDisp + InvD[ino].NoofHicons*InvD[ino].NoofVicons < InvD[ino].NoofItems) {
-			InvD[ino].FirstDisp += InvD[ino].NoofHicons;
-			ItemsChanged = true;
+		if (g_InvD[g_ino].FirstDisp + g_InvD[g_ino].NoofHicons*g_InvD[g_ino].NoofVicons < g_InvD[g_ino].NoofItems) {
+			g_InvD[g_ino].FirstDisp += g_InvD[g_ino].NoofHicons;
+			g_ItemsChanged = true;
 		}
 		break;
 	}
@@ -5319,8 +5308,8 @@ static void InvLook(const Common::Point &coOrds) {
 	case I_BODY:
 		index = InvItem(pt, false);
 		if (index != INV_NOICON) {
-			if (InvD[ino].contents[index] && InvD[ino].contents[index] != HeldItem) {
-				invObj = GetInvObject(InvD[ino].contents[index]);
+			if (g_InvD[g_ino].contents[index] && g_InvD[g_ino].contents[index] != g_heldItem) {
+				invObj = GetInvObject(g_InvD[g_ino].contents[index]);
 				if (invObj->hScript)
 					InvTinselEvent(invObj, LOOK, INV_LOOK, index);
 			}
@@ -5328,7 +5317,7 @@ static void InvLook(const Common::Point &coOrds) {
 		break;
 
 	case I_NOTIN:
-		if (ino == INV_CONV)
+		if (g_ino == INV_CONV)
 			ConvAction(INV_CLOSEICON);
 		KillInventory();
 		break;
@@ -5341,7 +5330,7 @@ static void InvLook(const Common::Point &coOrds) {
 /**************************************************************************/
 
 extern void EventToInventory(PLR_EVENT pEvent, const Common::Point &coOrds) {
-	if (InventoryHidden)
+	if (g_InventoryHidden)
 		return;
 
 	switch (pEvent) {
@@ -5364,7 +5353,7 @@ extern void EventToInventory(PLR_EVENT pEvent, const Common::Point &coOrds) {
 		break;
 
 	case PLR_ACTION:		// PLR_DLEFT
-		if (InvDragging != ID_MDCONT)
+		if (g_InvDragging != ID_MDCONT)
 			InvDragEnd();
 		InvAction();
 		break;
@@ -5380,7 +5369,7 @@ extern void EventToInventory(PLR_EVENT pEvent, const Common::Point &coOrds) {
 	case PLR_ESCAPE:
 		if (MenuActive()) {
 			if (cd.box != optionBox && cd.box != hopperBox1 && cd.box != hopperBox2)
-				bReOpenMenu = true;
+				g_bReOpenMenu = true;
 			if ((cd.box == hopperBox1) || (cd.box == hopperBox2))
 				FreeSceneHopper();
 		}
@@ -5388,42 +5377,42 @@ extern void EventToInventory(PLR_EVENT pEvent, const Common::Point &coOrds) {
 		break;
 
 	case PLR_PGDN:
-		if (ino == INV_MENU) {
+		if (g_ino == INV_MENU) {
 			// Only act if load or save screen
 			MenuPageDown();
 		} else {
 			// This code is a copy of the IB_SLIDE_DOWN case in InvWalkTo
 			// TODO: So share this duplicate code
-			if (InvD[ino].NoofVicons == 1)
-				if (InvD[ino].FirstDisp + InvD[ino].NoofHicons*InvD[ino].NoofVicons < InvD[ino].NoofItems)
-					InvD[ino].FirstDisp += InvD[ino].NoofHicons;
-			for (int i = 1; i < InvD[ino].NoofVicons; i++) {
-				if (InvD[ino].FirstDisp + InvD[ino].NoofHicons*InvD[ino].NoofVicons < InvD[ino].NoofItems)
-					InvD[ino].FirstDisp += InvD[ino].NoofHicons;
+			if (g_InvD[g_ino].NoofVicons == 1)
+				if (g_InvD[g_ino].FirstDisp + g_InvD[g_ino].NoofHicons*g_InvD[g_ino].NoofVicons < g_InvD[g_ino].NoofItems)
+					g_InvD[g_ino].FirstDisp += g_InvD[g_ino].NoofHicons;
+			for (int i = 1; i < g_InvD[g_ino].NoofVicons; i++) {
+				if (g_InvD[g_ino].FirstDisp + g_InvD[g_ino].NoofHicons*g_InvD[g_ino].NoofVicons < g_InvD[g_ino].NoofItems)
+					g_InvD[g_ino].FirstDisp += g_InvD[g_ino].NoofHicons;
 			}
-			ItemsChanged = true;
+			g_ItemsChanged = true;
 		}
 		break;
 
 	case PLR_PGUP:
-		if (ino == INV_MENU) {
+		if (g_ino == INV_MENU) {
 			// Only act if load or save screen
 			MenuPageUp();
 		} else {
 			// This code is a copy of the I_SLIDE_UP case in InvWalkTo
 			// TODO: So share this duplicate code
-			if (InvD[ino].NoofVicons == 1)
-				InvD[ino].FirstDisp -= InvD[ino].NoofHicons;
-			for (int i = 1; i < InvD[ino].NoofVicons; i++)
-				InvD[ino].FirstDisp -= InvD[ino].NoofHicons;
-			if (InvD[ino].FirstDisp < 0)
-				InvD[ino].FirstDisp = 0;
-			ItemsChanged = true;
+			if (g_InvD[g_ino].NoofVicons == 1)
+				g_InvD[g_ino].FirstDisp -= g_InvD[g_ino].NoofHicons;
+			for (int i = 1; i < g_InvD[g_ino].NoofVicons; i++)
+				g_InvD[g_ino].FirstDisp -= g_InvD[g_ino].NoofHicons;
+			if (g_InvD[g_ino].FirstDisp < 0)
+				g_InvD[g_ino].FirstDisp = 0;
+			g_ItemsChanged = true;
 		}
 		break;
 
 	case PLR_HOME:
-		if (ino == INV_MENU) {
+		if (g_ino == INV_MENU) {
 			// Only act if load or save screen
 			if (cd.box == loadBox || cd.box == saveBox)
 				FirstFile(0);
@@ -5438,19 +5427,19 @@ extern void EventToInventory(PLR_EVENT pEvent, const Common::Point &coOrds) {
 			cd.selBox = 0;
 			Select(cd.selBox, true);
 		} else {
-			InvD[ino].FirstDisp = 0;
-			ItemsChanged = true;
+			g_InvD[g_ino].FirstDisp = 0;
+			g_ItemsChanged = true;
 		}
 		break;
 
 	case PLR_END:
-		if (ino == INV_MENU) {
+		if (g_ino == INV_MENU) {
 			if (cd.box == loadBox || cd.box == saveBox)
 				FirstFile(MAX_SAVED_FILES);	// Will get reduced to appropriate value
 			else if (cd.box == hopperBox1)
-				FirstScene(numScenes);		// Will get reduced to appropriate value
+				FirstScene(g_numScenes);		// Will get reduced to appropriate value
 			else if (cd.box == hopperBox2)
-				FirstEntry(numEntries);		// Will get reduced to appropriate value
+				FirstEntry(g_numEntries);		// Will get reduced to appropriate value
 			else
 				break;
 
@@ -5458,10 +5447,10 @@ extern void EventToInventory(PLR_EVENT pEvent, const Common::Point &coOrds) {
 			cd.selBox = 0;
 			Select(cd.selBox, true);
 		} else {
-			InvD[ino].FirstDisp = InvD[ino].NoofItems - InvD[ino].NoofHicons*InvD[ino].NoofVicons;
-			if (InvD[ino].FirstDisp < 0)
-				InvD[ino].FirstDisp = 0;
-			ItemsChanged = true;
+			g_InvD[g_ino].FirstDisp = g_InvD[g_ino].NoofItems - g_InvD[g_ino].NoofHicons*g_InvD[g_ino].NoofVicons;
+			if (g_InvD[g_ino].FirstDisp < 0)
+				g_InvD[g_ino].FirstDisp = 0;
+			g_ItemsChanged = true;
 		}
 		break;
 	default:
@@ -5483,8 +5472,8 @@ extern void SetObjectFilm(int object, SCNHANDLE hFilm) {
 	invObj = GetInvObject(object);
 	invObj->hIconFilm = hFilm;
 
-	if (HeldItem != object)
-		ItemsChanged = true;
+	if (g_heldItem != object)
+		g_ItemsChanged = true;
 }
 
 /**
@@ -5492,34 +5481,34 @@ extern void SetObjectFilm(int object, SCNHANDLE hFilm) {
  */
 extern void syncInvInfo(Common::Serializer &s) {
 	for (int i = 0; i < NUM_INV; i++) {
-		s.syncAsSint32LE(InvD[i].MinHicons);
-		s.syncAsSint32LE(InvD[i].MinVicons);
-		s.syncAsSint32LE(InvD[i].MaxHicons);
-		s.syncAsSint32LE(InvD[i].MaxVicons);
-		s.syncAsSint32LE(InvD[i].NoofHicons);
-		s.syncAsSint32LE(InvD[i].NoofVicons);
+		s.syncAsSint32LE(g_InvD[i].MinHicons);
+		s.syncAsSint32LE(g_InvD[i].MinVicons);
+		s.syncAsSint32LE(g_InvD[i].MaxHicons);
+		s.syncAsSint32LE(g_InvD[i].MaxVicons);
+		s.syncAsSint32LE(g_InvD[i].NoofHicons);
+		s.syncAsSint32LE(g_InvD[i].NoofVicons);
 		for (int j = 0; j < MAX_ININV; j++) {
-			s.syncAsSint32LE(InvD[i].contents[j]);
+			s.syncAsSint32LE(g_InvD[i].contents[j]);
 		}
-		s.syncAsSint32LE(InvD[i].NoofItems);
-		s.syncAsSint32LE(InvD[i].FirstDisp);
-		s.syncAsSint32LE(InvD[i].inventoryX);
-		s.syncAsSint32LE(InvD[i].inventoryY);
-		s.syncAsSint32LE(InvD[i].otherX);
-		s.syncAsSint32LE(InvD[i].otherY);
-		s.syncAsSint32LE(InvD[i].MaxInvObj);
-		s.syncAsSint32LE(InvD[i].hInvTitle);
-		s.syncAsSint32LE(InvD[i].resizable);
-		s.syncAsSint32LE(InvD[i].bMoveable);
-		s.syncAsSint32LE(InvD[i].sNoofHicons);
-		s.syncAsSint32LE(InvD[i].sNoofVicons);
-		s.syncAsSint32LE(InvD[i].bMax);
+		s.syncAsSint32LE(g_InvD[i].NoofItems);
+		s.syncAsSint32LE(g_InvD[i].FirstDisp);
+		s.syncAsSint32LE(g_InvD[i].inventoryX);
+		s.syncAsSint32LE(g_InvD[i].inventoryY);
+		s.syncAsSint32LE(g_InvD[i].otherX);
+		s.syncAsSint32LE(g_InvD[i].otherY);
+		s.syncAsSint32LE(g_InvD[i].MaxInvObj);
+		s.syncAsSint32LE(g_InvD[i].hInvTitle);
+		s.syncAsSint32LE(g_InvD[i].resizable);
+		s.syncAsSint32LE(g_InvD[i].bMoveable);
+		s.syncAsSint32LE(g_InvD[i].sNoofHicons);
+		s.syncAsSint32LE(g_InvD[i].sNoofVicons);
+		s.syncAsSint32LE(g_InvD[i].bMax);
 	}
 
 	if (TinselV2) {
-		for (int i = 0; i < numObjects; ++i)
-			s.syncAsUint32LE(invFilms[i]);
-		s.syncAsUint32LE(heldFilm);
+		for (int i = 0; i < g_numObjects; ++i)
+			s.syncAsUint32LE(g_invFilms[i]);
+		s.syncAsUint32LE(g_heldFilm);
 	}
 }
 
@@ -5533,18 +5522,18 @@ extern void syncInvInfo(Common::Serializer &s) {
  */
 // Note: the SCHANDLE type here has been changed to a void*
 extern void RegisterIcons(void *cptr, int num) {
-	numObjects = num;
-	invObjects = (INV_OBJECT *) cptr;
+	g_numObjects = num;
+	g_invObjects = (INV_OBJECT *) cptr;
 
 	if (TinselV0) {
 		// In Tinsel 0, the INV_OBJECT structure doesn't have an attributes field, so we
 		// need to 'unpack' the source structures into the standard Tinsel v1/v2 format
-		MEM_NODE *node = MemoryAllocFixed(numObjects * sizeof(INV_OBJECT));
+		MEM_NODE *node = MemoryAllocFixed(g_numObjects * sizeof(INV_OBJECT));
 		assert(node);
-		invObjects = (INV_OBJECT *)MemoryDeref(node);
-		assert(invObjects);
+		g_invObjects = (INV_OBJECT *)MemoryDeref(node);
+		assert(g_invObjects);
 		byte *srcP = (byte *)cptr;
-		INV_OBJECT *destP = (INV_OBJECT *)invObjects;
+		INV_OBJECT *destP = (INV_OBJECT *)g_invObjects;
 
 		for (int i = 0; i < num; ++i, ++destP, srcP += 12) {
 			memmove(destP, srcP, 12);
@@ -5552,12 +5541,12 @@ extern void RegisterIcons(void *cptr, int num) {
 		}
 	} else if (TinselV1Mac) {
 		// Macintosh version has BE encoded resources, so the values need to be byte swapped
-		MEM_NODE *node = MemoryAllocFixed(numObjects * sizeof(INV_OBJECT));
+		MEM_NODE *node = MemoryAllocFixed(g_numObjects * sizeof(INV_OBJECT));
 		assert(node);
-		invObjects = (INV_OBJECT *)MemoryDeref(node);
-		assert(invObjects);
+		g_invObjects = (INV_OBJECT *)MemoryDeref(node);
+		assert(g_invObjects);
 		INV_OBJECT *srcP = (INV_OBJECT *)cptr;
-		INV_OBJECT *destP = (INV_OBJECT *)invObjects;
+		INV_OBJECT *destP = (INV_OBJECT *)g_invObjects;
 
 		for (int i = 0; i < num; ++i, ++destP, ++srcP) {
 			destP->id = FROM_BE_32(srcP->id);
@@ -5566,14 +5555,14 @@ extern void RegisterIcons(void *cptr, int num) {
 			destP->attribute = FROM_BE_32(srcP->attribute);
 		}
 	} else if (TinselV2) {
-		if (invFilms == NULL) {
+		if (g_invFilms == NULL) {
 			// First time - allocate memory
-			MEM_NODE *node = MemoryAllocFixed(numObjects * sizeof(SCNHANDLE));
+			MEM_NODE *node = MemoryAllocFixed(g_numObjects * sizeof(SCNHANDLE));
 			assert(node);
-			invFilms = (SCNHANDLE *)MemoryDeref(node);
-			if (invFilms == NULL)
+			g_invFilms = (SCNHANDLE *)MemoryDeref(node);
+			if (g_invFilms == NULL)
 				error(NO_MEM, "inventory scripts");
-			memset(invFilms, 0, numObjects * sizeof(SCNHANDLE));
+			memset(g_invFilms, 0, g_numObjects * sizeof(SCNHANDLE));
 		}
 
 
@@ -5581,11 +5570,11 @@ extern void RegisterIcons(void *cptr, int num) {
 		// and store all the films separately
 		int i;
 		INV_OBJECT *pio;
-		for (i = 0, pio = invObjects; i < numObjects; i++, pio++) {
+		for (i = 0, pio = g_invObjects; i < g_numObjects; i++, pio++) {
 			if (pio->attribute & PERMACONV)
 				PermaConvIcon(pio->id, pio->attribute & CONVENDITEM);
 
-			invFilms[i] = pio->hIconFilm;
+			g_invFilms[i] = pio->hIconFilm;
 		}
 	}
 }
@@ -5599,7 +5588,7 @@ extern void setInvWinParts(SCNHANDLE hf) {
 	const FILM *pfilm;
 #endif
 
-	hWinParts = hf;
+	g_hWinParts = hf;
 
 #ifdef DEBUG
 	pfilm = (const FILM *)LockMem(hf);
@@ -5616,7 +5605,7 @@ extern void setFlagFilms(SCNHANDLE hf) {
 	const FILM *pfilm;
 #endif
 
-	flagFilm = hf;
+	g_flagFilm = hf;
 
 #ifdef DEBUG
 	pfilm = (const FILM *)LockMem(hf);
@@ -5628,7 +5617,7 @@ extern void setFlagFilms(SCNHANDLE hf) {
  * Called from Glitter function 'DecCStrings()'
  */
 extern void setConfigStrings(SCNHANDLE *tp) {
-	memcpy(configStrings, tp, sizeof(configStrings));
+	memcpy(g_configStrings, tp, sizeof(g_configStrings));
 }
 
 /**
@@ -5652,36 +5641,36 @@ extern void idec_inv(int num, SCNHANDLE text, int MaxContents,
 	if (StartHeight > MaxHeight)
 		StartHeight = MaxHeight;
 
-	InventoryState = IDLE_INV;
+	g_InventoryState = IDLE_INV;
 
-	InvD[num].MaxHicons = MaxWidth;
-	InvD[num].MinHicons = MinWidth;
-	InvD[num].MaxVicons = MaxHeight;
-	InvD[num].MinVicons = MinHeight;
+	g_InvD[num].MaxHicons = MaxWidth;
+	g_InvD[num].MinHicons = MinWidth;
+	g_InvD[num].MaxVicons = MaxHeight;
+	g_InvD[num].MinVicons = MinHeight;
 
-	InvD[num].NoofHicons = StartWidth;
-	InvD[num].NoofVicons = StartHeight;
+	g_InvD[num].NoofHicons = StartWidth;
+	g_InvD[num].NoofVicons = StartHeight;
 
-	memset(InvD[num].contents, 0, sizeof(InvD[num].contents));
-	InvD[num].NoofItems = 0;
+	memset(g_InvD[num].contents, 0, sizeof(g_InvD[num].contents));
+	g_InvD[num].NoofItems = 0;
 
-	InvD[num].FirstDisp = 0;
+	g_InvD[num].FirstDisp = 0;
 
-	InvD[num].inventoryX = startx;
-	InvD[num].inventoryY = starty;
-	InvD[num].otherX = 21;
-	InvD[num].otherY = 15;
+	g_InvD[num].inventoryX = startx;
+	g_InvD[num].inventoryY = starty;
+	g_InvD[num].otherX = 21;
+	g_InvD[num].otherY = 15;
 
-	InvD[num].MaxInvObj = MaxContents;
+	g_InvD[num].MaxInvObj = MaxContents;
 
-	InvD[num].hInvTitle = text;
+	g_InvD[num].hInvTitle = text;
 
 	if (MaxWidth != MinWidth && MaxHeight != MinHeight)
-		InvD[num].resizable = true;
+		g_InvD[num].resizable = true;
 
-	InvD[num].bMoveable = moveable;
+	g_InvD[num].bMoveable = moveable;
 
-	InvD[num].bMax = false;
+	g_InvD[num].bMax = false;
 }
 
 /**
@@ -5729,7 +5718,7 @@ extern void idec_inv2(SCNHANDLE text, int MaxContents,
 extern int InvGetLimit(int invno) {
 	assert(invno == INV_1 || invno == INV_2); // only INV_1 and INV_2 supported
 
-	return InvD[invno].MaxInvObj;
+	return g_InvD[invno].MaxInvObj;
 }
 
 /**
@@ -5737,12 +5726,12 @@ extern int InvGetLimit(int invno) {
  */
 extern void InvSetLimit(int invno, int MaxContents) {
 	assert(invno == INV_1 || invno == INV_2); // only INV_1 and INV_2 supported
-	assert(MaxContents >= InvD[invno].NoofItems); // can't reduce maximum contents below current contents
+	assert(MaxContents >= g_InvD[invno].NoofItems); // can't reduce maximum contents below current contents
 
 	if (MaxContents > MAX_ININV)
 		MaxContents = MAX_ININV;	// Max contents
 
-	InvD[invno].MaxInvObj = MaxContents;
+	g_InvD[invno].MaxInvObj = MaxContents;
 }
 
 /**
@@ -5757,34 +5746,34 @@ extern void InvSetSize(int invno, int MinWidth, int MinHeight,
 	if (StartHeight > MaxHeight)
 		StartHeight = MaxHeight;
 
-	InvD[invno].MaxHicons = MaxWidth;
-	InvD[invno].MinHicons = MinWidth;
-	InvD[invno].MaxVicons = MaxHeight;
-	InvD[invno].MinVicons = MinHeight;
+	g_InvD[invno].MaxHicons = MaxWidth;
+	g_InvD[invno].MinHicons = MinWidth;
+	g_InvD[invno].MaxVicons = MaxHeight;
+	g_InvD[invno].MinVicons = MinHeight;
 
-	InvD[invno].NoofHicons = StartWidth;
-	InvD[invno].NoofVicons = StartHeight;
+	g_InvD[invno].NoofHicons = StartWidth;
+	g_InvD[invno].NoofVicons = StartHeight;
 
 	if (MaxWidth != MinWidth && MaxHeight != MinHeight)
-		InvD[invno].resizable = true;
+		g_InvD[invno].resizable = true;
 	else
-		InvD[invno].resizable = false;
+		g_InvD[invno].resizable = false;
 
-	InvD[invno].bMax = false;
+	g_InvD[invno].bMax = false;
 }
 
 /**************************************************************************/
 
 extern bool IsTopWindow() {
-	return (InventoryState == BOGUS_INV);
+	return (g_InventoryState == BOGUS_INV);
 }
 
 extern bool MenuActive() {
-	return (InventoryState == ACTIVE_INV && ino == INV_CONF);
+	return (g_InventoryState == ACTIVE_INV && g_ino == INV_CONF);
 }
 
 extern bool IsConvWindow() {
-	return (InventoryState == ACTIVE_INV && ino == INV_CONV);
+	return (g_InventoryState == ACTIVE_INV && g_ino == INV_CONV);
 }
 
 } // End of namespace Tinsel
diff --git a/engines/tinsel/drives.cpp b/engines/tinsel/drives.cpp
index 5977d3b718..d815fd165d 100644
--- a/engines/tinsel/drives.cpp
+++ b/engines/tinsel/drives.cpp
@@ -32,13 +32,13 @@ namespace Tinsel {
 
 // FIXME: Avoid non-const global vars
 
-char currentCD = '1';
+char g_currentCD = '1';
 
-static bool bChangingCD = false;
-static char nextCD = '\0';
+static bool g_bChangingCD = false;
+static char g_nextCD = '\0';
 
-static uint32 lastTime = 0;
-extern LANGUAGE sampleLanguage;
+static uint32 g_lastTime = 0;
+extern LANGUAGE g_sampleLanguage;
 
 
 void CdCD(CORO_PARAM) {
@@ -47,7 +47,7 @@ void CdCD(CORO_PARAM) {
 
 	CORO_BEGIN_CODE(_ctx);
 
-	while (bChangingCD) {
+	while (g_bChangingCD) {
 		if (g_scheduler->getCurrentProcess()) {
 			// FIXME: CdCD gets passed a nullContext in RegisterGlobals() and
 			//        PrimeSceneHopper(), because I didn't know how to get a proper
@@ -66,13 +66,13 @@ void CdCD(CORO_PARAM) {
 
 int GetCurrentCD() {
 	// count from 1
-	return (currentCD - '1' + 1);
+	return (g_currentCD - '1' + 1);
 }
 
 static const uint32 cdFlags[] = { fCd1, fCd2, fCd3, fCd4, fCd5, fCd6, fCd7, fCd8 };
 
 void SetCD(int flags) {
-	if (flags & cdFlags[currentCD - '1'])
+	if (flags & cdFlags[g_currentCD - '1'])
 		return;
 
 	error("SetCD() problem");
@@ -82,7 +82,7 @@ int GetCD(int flags) {
 	int i;
 	char cd = '\0';
 
-	if (flags & cdFlags[currentCD - '1'])
+	if (flags & cdFlags[g_currentCD - '1'])
 		return GetCurrentCD();
 
 	for (i = 0; i < 8; i++) {
@@ -93,19 +93,19 @@ int GetCD(int flags) {
 	}
 	assert(i != 8);
 
-	nextCD = cd;
+	g_nextCD = cd;
 	return cd;
 }
 
 void DoCdChange() {
-	if (bChangingCD && (g_system->getMillis() > (lastTime + 1000))) {
-		lastTime = g_system->getMillis();
+	if (g_bChangingCD && (g_system->getMillis() > (g_lastTime + 1000))) {
+		g_lastTime = g_system->getMillis();
 		_vm->_sound->closeSampleStream();
 
 		// Use the filesize of the sample file to determine, for Discworld 2, which CD it is
 		if (TinselV2) {
 			TinselFile f;
-			if (!f.open(_vm->getSampleFile(sampleLanguage)))
+			if (!f.open(_vm->getSampleFile(g_sampleLanguage)))
 				// No CD present
 				return;
 
@@ -113,28 +113,28 @@ void DoCdChange() {
 
 			f.close();
 
-			if (currentCD != sampleCdNumber)
+			if (g_currentCD != sampleCdNumber)
 				return;
 		}
 
 		_vm->_sound->openSampleFiles();
 		ChangeLanguage(TextLanguage());
-		bChangingCD = false;
+		g_bChangingCD = false;
 	}
 }
 
 void SetNextCD(int cdNumber) {
 	assert(cdNumber == 1 || cdNumber == 2);
 
-	nextCD = (char)(cdNumber + '1' - 1);
+	g_nextCD = (char)(cdNumber + '1' - 1);
 }
 
 bool GotoCD() {
 	// WORKAROUND: Somehow, CdDoChange() is called twice... Hopefully, this guard helps
-	if (currentCD == nextCD)
+	if (g_currentCD == g_nextCD)
 		return false;
 
-	currentCD = nextCD;
+	g_currentCD = g_nextCD;
 
 /*	if (bNoCD)	{
 		strcpy(cdDirectory, hdDirectory);
@@ -142,7 +142,7 @@ bool GotoCD() {
 		strcat(cdDirectory, cdLastBit);
 	}
 */
-	bChangingCD = true;
+	g_bChangingCD = true;
 
 	return true;
 }
diff --git a/engines/tinsel/events.cpp b/engines/tinsel/events.cpp
index e701ddca99..74454c5f2a 100644
--- a/engines/tinsel/events.cpp
+++ b/engines/tinsel/events.cpp
@@ -54,37 +54,37 @@ extern HPOLYGON GetTaggedPoly();
 
 //----------------- EXTERNAL GLOBAL DATA ---------------------
 
-extern bool bEnableMenu;
+extern bool g_bEnableMenu;
 
 //----------------- LOCAL GLOBAL DATA --------------------
 
 // FIXME: Avoid non-const global vars
 
-static uint32 lastUserEvent = 0;	// Time it hapenned
-static int leftEvents = 0;		// Single or double, left or right. Or escape key.
-static int escEvents = 1;		// Escape key
-static int userEvents = 0;		// Whenever a button or a key comes in
+static uint32 g_lastUserEvent = 0;	// Time it hapenned
+static int g_leftEvents = 0;		// Single or double, left or right. Or escape key.
+static int g_escEvents = 1;		// Escape key
+static int g_userEvents = 0;		// Whenever a button or a key comes in
 
-static int eCount = 0;
+static int g_eCount = 0;
 
-static int controlState;
-static bool bStartOff;
+static int g_controlState;
+static bool g_bStartOff;
 
-static int controlX, controlY;
-static bool bProvNotProcessed = false;
+static int g_controlX, g_controlY;
+static bool g_bProvNotProcessed = false;
 
 /**
  * Gets called before each schedule, only 1 user action per schedule
  * is allowed.
  */
 void ResetEcount() {
-	eCount = 0;
+	g_eCount = 0;
 }
 
 
 void IncUserEvents() {
-	userEvents++;
-	lastUserEvent = DwGetCurrentTime();
+	g_userEvents++;
+	g_lastUserEvent = DwGetCurrentTime();
 }
 
 /**
@@ -104,7 +104,7 @@ void AllowDclick(CORO_PARAM, PLR_EVENT be) {
 		FreeToken(TOKEN_LEFT_BUT);
 
 		// Prevent activation of 2 events on the same tick
-		if (++eCount != 1)
+		if (++g_eCount != 1)
 			CORO_KILL_SELF();
 
 		break;
@@ -125,17 +125,17 @@ void ControlOn() {
 		return;
 	}
 
-	bEnableMenu = false;
+	g_bEnableMenu = false;
 
-	if (controlState == CONTROL_OFF) {
+	if (g_controlState == CONTROL_OFF) {
 		// Control is on
-		controlState = CONTROL_ON;
+		g_controlState = CONTROL_ON;
 
 		// Restore cursor to where it was
-		if (bStartOff == true)
-			bStartOff = false;
+		if (g_bStartOff == true)
+			g_bStartOff = false;
 		else
-			SetCursorXY(controlX, controlY);
+			SetCursorXY(g_controlX, g_controlY);
 
 		// Re-instate cursor
 		UnHideCursor();
@@ -155,14 +155,14 @@ void ControlOff() {
 		return;
 	}
 
-	bEnableMenu = false;
+	g_bEnableMenu = false;
 
-	if (controlState == CONTROL_ON) {
+	if (g_controlState == CONTROL_ON) {
 		// Control is off
-		controlState = CONTROL_OFF;
+		g_controlState = CONTROL_OFF;
 
 		// Store cursor position
-		GetCursorXY(&controlX, &controlY, true);
+		GetCursorXY(&g_controlX, &g_controlY, true);
 
 		// Blank out cursor
 		DwHideCursor();
@@ -181,10 +181,10 @@ void ControlStartOff() {
 		return;
 	}
 
-	bEnableMenu = false;
+	g_bEnableMenu = false;
 
 	// Control is off
-	controlState = CONTROL_OFF;
+	g_controlState = CONTROL_OFF;
 
 	// Blank out cursor
 	DwHideCursor();
@@ -192,7 +192,7 @@ void ControlStartOff() {
 	// Switch off tags
 	DisableTags();
 
-	bStartOff = true;
+	g_bStartOff = true;
 }
 
 /**
@@ -211,7 +211,7 @@ bool GetControl(int param) {
 }
 
 bool GetControl() {
-	if (controlState == CONTROL_ON) {
+	if (g_controlState == CONTROL_ON) {
 		ControlOff();
 		return true;
 	} else
@@ -220,7 +220,7 @@ bool GetControl() {
 
 bool ControlIsOn() {
 	if (TinselV2)
-		return (controlState == CONTROL_ON);
+		return (g_controlState == CONTROL_ON);
 
 	return TestToken(TOKEN_CONTROL);
 }
@@ -289,7 +289,7 @@ static void ProcessUserEvent(TINSEL_EVENT uEvent, const Common::Point &coOrds, P
 	HPOLYGON hPoly;
 
 	// Prevent activation of 2 events on the same tick
-	if (++eCount != 1)
+	if (++g_eCount != 1)
 		return;
 
 	if ((actor = GetTaggedActor()) != 0) {
@@ -395,19 +395,19 @@ void PlayerEvent(PLR_EVENT pEvent, const Common::Point &coOrds) {
 	static uint32 lastRealAction = 0;	// FIXME: Avoid non-const global vars
 
 	// This stuff to allow F1 key during startup.
-	if (bEnableMenu && pEvent == PLR_MENU)
+	if (g_bEnableMenu && pEvent == PLR_MENU)
 		Control(CONTROL_ON);
 	else
 		IncUserEvents();
 
 	if (pEvent == PLR_ESCAPE) {
-		++escEvents;
-		++leftEvents;		// Yes, I do mean this
+		++g_escEvents;
+		++g_leftEvents;		// Yes, I do mean this
 	} else if ((pEvent == PLR_PROV_WALKTO)
 			|| (pEvent == PLR_WALKTO)
 			|| (pEvent == PLR_LOOK)
 			|| (pEvent == PLR_ACTION)) {
-		++leftEvents;
+		++g_leftEvents;
 	}
 
 	// Only allow events if player control is on
@@ -484,18 +484,18 @@ void PlayerEvent(PLR_EVENT pEvent, const Common::Point &coOrds) {
  * For ESCapable Glitter sequences
  */
 int GetEscEvents() {
-	return escEvents;
+	return g_escEvents;
 }
 
 /**
  * For cutting short talk()s etc.
  */
 int GetLeftEvents() {
-	return leftEvents;
+	return g_leftEvents;
 }
 
 bool LeftEventChange(int myleftEvent) {
-	if (leftEvents != myleftEvent) {
+	if (g_leftEvents != myleftEvent) {
 		ProcessedProvisional();
 		return true;
 	} else
@@ -506,15 +506,15 @@ bool LeftEventChange(int myleftEvent) {
  * For waitkey() Glitter function
  */
 int getUserEvents() {
-	return userEvents;
+	return g_userEvents;
 }
 
 uint32 getUserEventTime() {
-	return DwGetCurrentTime() - lastUserEvent;
+	return DwGetCurrentTime() - g_lastUserEvent;
 }
 
 void resetUserEventTime() {
-	lastUserEvent = DwGetCurrentTime();
+	g_lastUserEvent = DwGetCurrentTime();
 }
 
 struct PTP_INIT {
@@ -655,18 +655,18 @@ void effRunPolyTinselCode(HPOLYGON hPoly, TINSEL_EVENT event, int actor) {
  * subsequent 'real' event.
  */
 void ProcessedProvisional() {
-	bProvNotProcessed = false;
+	g_bProvNotProcessed = false;
 }
 
 /**
  * Resets the bProvNotProcessed flag
  */
 void ProvNotProcessed() {
-	bProvNotProcessed = true;
+	g_bProvNotProcessed = true;
 }
 
 bool GetProvNotProcessed() {
-	return bProvNotProcessed;
+	return g_bProvNotProcessed;
 }
 
 } // End of namespace Tinsel
diff --git a/engines/tinsel/font.cpp b/engines/tinsel/font.cpp
index e857dca509..54aa7cc15f 100644
--- a/engines/tinsel/font.cpp
+++ b/engines/tinsel/font.cpp
@@ -34,38 +34,38 @@ namespace Tinsel {
 
 // FIXME: Avoid non-const global vars
 
-static char tBuffer[TBUFSZ];
+static char g_tBuffer[TBUFSZ];
 
-static SCNHANDLE hTagFont = 0, hTalkFont = 0;
-static SCNHANDLE hRegularTalkFont = 0, hRegularTagFont = 0;
+static SCNHANDLE g_hTagFont = 0, g_hTalkFont = 0;
+static SCNHANDLE g_hRegularTalkFont = 0, g_hRegularTagFont = 0;
 
 
 /**
  * Return address of tBuffer
  */
 char *TextBufferAddr() {
-	return tBuffer;
+	return g_tBuffer;
 }
 
 /**
  * Return hTagFont handle.
  */
 SCNHANDLE GetTagFontHandle() {
-	return hTagFont;
+	return g_hTagFont;
 }
 
 /**
  * Return hTalkFont handle.
  */
 SCNHANDLE GetTalkFontHandle() {
-	return hTalkFont;
+	return g_hTalkFont;
 }
 
 /**
  * Called from dec_tagfont() Glitter function. Store the tag font handle.
  */
 void SetTagFontHandle(SCNHANDLE hFont) {
-	hTagFont = hRegularTagFont = hFont;		// Store the font handle
+	g_hTagFont = g_hRegularTagFont = hFont;		// Store the font handle
 }
 
 /**
@@ -73,20 +73,20 @@ void SetTagFontHandle(SCNHANDLE hFont) {
  * Store the talk font handle.
  */
 void SetTalkFontHandle(SCNHANDLE hFont) {
-	hTalkFont = hRegularTalkFont = hFont;		// Store the font handle
+	g_hTalkFont = g_hRegularTalkFont = hFont;		// Store the font handle
 }
 
 void SetTempTagFontHandle(SCNHANDLE hFont) {
-	hTagFont = hFont;
+	g_hTagFont = hFont;
 }
 
 void SetTempTalkFontHandle(SCNHANDLE hFont) {
-	hTalkFont = hFont;
+	g_hTalkFont = hFont;
 }
 
 void ResetFontHandles() {
-	hTagFont = hRegularTagFont;
-	hTalkFont = hRegularTalkFont;
+	g_hTagFont = g_hRegularTagFont;
+	g_hTalkFont = g_hRegularTalkFont;
 }
 
 
@@ -98,17 +98,17 @@ void FettleFontPal(SCNHANDLE fontPal) {
 	IMAGE *pImg;
 
 	assert(fontPal);
-	assert(hTagFont); // Tag font not declared
-	assert(hTalkFont); // Talk font not declared
+	assert(g_hTagFont); // Tag font not declared
+	assert(g_hTalkFont); // Talk font not declared
 
-	pFont = (const FONT *)LockMem(hTagFont);
+	pFont = (const FONT *)LockMem(g_hTagFont);
 	pImg = (IMAGE *)LockMem(FROM_LE_32(pFont->fontInit.hObjImg));	// get image for char 0
 	if (!TinselV2)
 		pImg->hImgPal = TO_LE_32(fontPal);
 	else
 		pImg->hImgPal = 0;
 
-	pFont = (const FONT *)LockMem(hTalkFont);
+	pFont = (const FONT *)LockMem(g_hTalkFont);
 	pImg = (IMAGE *)LockMem(FROM_LE_32(pFont->fontInit.hObjImg));	// get image for char 0
 	if (!TinselV2)
 		pImg->hImgPal = TO_LE_32(fontPal);
diff --git a/engines/tinsel/graphics.cpp b/engines/tinsel/graphics.cpp
index 4f3cc36994..9b06b1a501 100644
--- a/engines/tinsel/graphics.cpp
+++ b/engines/tinsel/graphics.cpp
@@ -40,7 +40,7 @@ namespace Tinsel {
 #define CHAR_WIDTH 4
 #define CHAR_HEIGHT 4
 
-extern uint8 transPalette[MAX_COLORS];
+extern uint8 g_transPalette[MAX_COLORS];
 
 //----------------- SUPPORT FUNCTIONS ---------------------
 
@@ -559,7 +559,7 @@ static void WrtTrans(DRAWOBJECT *pObj, uint8 *destP, bool applyClipping) {
 	// Loop through any remaining lines
 	while (pObj->height > 0) {
 		for (int i = 0; i < pObj->width; ++i, ++destP)
-			*destP = transPalette[*destP];
+			*destP = g_transPalette[*destP];
 
 		--pObj->height;
 		destP += lineOffset;
diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp
index eeb83b1f98..e31b2141f5 100644
--- a/engines/tinsel/handle.cpp
+++ b/engines/tinsel/handle.cpp
@@ -69,17 +69,17 @@ enum {
 // FIXME: Avoid non-const global vars
 
 // handle table gets loaded from index file at runtime
-static MEMHANDLE *handleTable = 0;
+static MEMHANDLE *g_handleTable = 0;
 
 // number of handles in the handle table
-static uint numHandles = 0;
+static uint g_numHandles = 0;
 
-static uint32 cdPlayHandle = (uint32)-1;
+static uint32 g_cdPlayHandle = (uint32)-1;
 
-static SCNHANDLE cdBaseHandle = 0, cdTopHandle = 0;
-static Common::File *cdGraphStream = 0;
+static SCNHANDLE g_cdBaseHandle = 0, g_cdTopHandle = 0;
+static Common::File *g_cdGraphStream = 0;
 
-static char szCdPlayFile[100];
+static char g_szCdPlayFile[100];
 
 //----------------- FORWARD REFERENCES --------------------
 
@@ -110,24 +110,24 @@ void SetupHandleTable() {
 			}
 
 			// calc number of handles
-			numHandles = len / RECORD_SIZE;
+			g_numHandles = len / RECORD_SIZE;
 
 			// allocate memory for the index file
-			handleTable = (MEMHANDLE *)calloc(numHandles, sizeof(struct MEMHANDLE));
+			g_handleTable = (MEMHANDLE *)calloc(g_numHandles, sizeof(struct MEMHANDLE));
 
 			// make sure memory allocated
-			assert(handleTable);
+			assert(g_handleTable);
 
 			// load data
-			for (i = 0; i < numHandles; i++) {
-				f.read(handleTable[i].szName, 12);
-				handleTable[i].filesize = f.readUint32();
+			for (i = 0; i < g_numHandles; i++) {
+				f.read(g_handleTable[i].szName, 12);
+				g_handleTable[i].filesize = f.readUint32();
 				// The pointer should always be NULL. We don't
 				// need to read that from the file.
-				handleTable[i]._node = NULL;
+				g_handleTable[i]._node = NULL;
 				f.seek(4, SEEK_CUR);
 				// For Discworld 2, read in the flags2 field
-				handleTable[i].flags2 = t2Flag ? f.readUint32() : 0;
+				g_handleTable[i].flags2 = t2Flag ? f.readUint32() : 0;
 			}
 
 			if (f.eos() || f.err()) {
@@ -145,7 +145,7 @@ void SetupHandleTable() {
 	}
 
 	// allocate memory nodes and load all permanent graphics
-	for (i = 0, pH = handleTable; i < numHandles; i++, pH++) {
+	for (i = 0, pH = g_handleTable; i < g_numHandles; i++, pH++) {
 		if (pH->filesize & fPreload) {
 			// allocate a fixed memory node for permanent files
 			pH->_node = MemoryAllocFixed((pH->filesize & FSIZE_MASK));
@@ -172,24 +172,24 @@ void SetupHandleTable() {
 }
 
 void FreeHandleTable() {
-	free(handleTable);
-	handleTable = NULL;
+	free(g_handleTable);
+	g_handleTable = NULL;
 
-	delete cdGraphStream;
-	cdGraphStream = NULL;
+	delete g_cdGraphStream;
+	g_cdGraphStream = NULL;
 }
 
 /**
  * Loads a memory block as a file.
  */
 void OpenCDGraphFile() {
-	delete cdGraphStream;
+	delete g_cdGraphStream;
 
 	// As the theory goes, the right CD will be in there!
 
-	cdGraphStream = new Common::File;
-	if (!cdGraphStream->open(szCdPlayFile))
-		error(CANNOT_FIND_FILE, szCdPlayFile);
+	g_cdGraphStream = new Common::File;
+	if (!g_cdGraphStream->open(g_szCdPlayFile))
+		error(CANNOT_FIND_FILE, g_szCdPlayFile);
 }
 
 void LoadCDGraphData(MEMHANDLE *pH) {
@@ -210,15 +210,15 @@ void LoadCDGraphData(MEMHANDLE *pH) {
 	assert(addr);
 
 	// Move to correct place in file and load the required data
-	assert(cdGraphStream);
-	cdGraphStream->seek(cdBaseHandle & OFFSETMASK, SEEK_SET);
-	bytes = cdGraphStream->read(addr, (cdTopHandle - cdBaseHandle) & OFFSETMASK);
+	assert(g_cdGraphStream);
+	g_cdGraphStream->seek(g_cdBaseHandle & OFFSETMASK, SEEK_SET);
+	bytes = g_cdGraphStream->read(addr, (g_cdTopHandle - g_cdBaseHandle) & OFFSETMASK);
 
 	// New code to try and handle CD read failures 24/2/97
-	while (bytes != ((cdTopHandle - cdBaseHandle) & OFFSETMASK) && retries++ < MAX_READ_RETRIES)	{
+	while (bytes != ((g_cdTopHandle - g_cdBaseHandle) & OFFSETMASK) && retries++ < MAX_READ_RETRIES)	{
 		// Try again
-		cdGraphStream->seek(cdBaseHandle & OFFSETMASK, SEEK_SET);
-		bytes = cdGraphStream->read(addr, (cdTopHandle - cdBaseHandle) & OFFSETMASK);
+		g_cdGraphStream->seek(g_cdBaseHandle & OFFSETMASK, SEEK_SET);
+		bytes = g_cdGraphStream->read(addr, (g_cdTopHandle - g_cdBaseHandle) & OFFSETMASK);
 	}
 
 	// discardable - unlock the memory
@@ -230,7 +230,7 @@ void LoadCDGraphData(MEMHANDLE *pH) {
 	// clear the loading flag
 //	pH->filesize &= ~fLoading;
 
-	if (bytes != ((cdTopHandle - cdBaseHandle) & OFFSETMASK))
+	if (bytes != ((g_cdTopHandle - g_cdBaseHandle) & OFFSETMASK))
 		// file is corrupt
 		error(FILE_READ_ERROR, "CD play file");
 }
@@ -245,22 +245,22 @@ void LoadCDGraphData(MEMHANDLE *pH) {
 void LoadExtraGraphData(SCNHANDLE start, SCNHANDLE next) {
 	OpenCDGraphFile();
 
-	MemoryDiscard((handleTable + cdPlayHandle)->_node); // Free it
+	MemoryDiscard((g_handleTable + g_cdPlayHandle)->_node); // Free it
 
 	// It must always be the same
-	assert(cdPlayHandle == (start >> SCNHANDLE_SHIFT));
-	assert(cdPlayHandle == (next >> SCNHANDLE_SHIFT));
+	assert(g_cdPlayHandle == (start >> SCNHANDLE_SHIFT));
+	assert(g_cdPlayHandle == (next >> SCNHANDLE_SHIFT));
 
-	cdBaseHandle = start;
-	cdTopHandle = next;
+	g_cdBaseHandle = start;
+	g_cdTopHandle = next;
 }
 
 void SetCdPlaySceneDetails(int fileNum, const char *fileName) {
-	strcpy(szCdPlayFile, fileName);
+	strcpy(g_szCdPlayFile, fileName);
 }
 
 void SetCdPlayHandle(int fileNum) {
-	cdPlayHandle = fileNum;
+	g_cdPlayHandle = fileNum;
 }
 
 
@@ -323,26 +323,26 @@ byte *LockMem(SCNHANDLE offset) {
 	MEMHANDLE *pH;			// points to table entry
 
 	// range check the memory handle
-	assert(handle < numHandles);
+	assert(handle < g_numHandles);
 
 #ifdef DEBUG
 	if (handle != s_lockedScene)
 		warning("  Calling LockMem(0x%x), handle %d differs from active scene %d", offset, handle, s_lockedScene);
 #endif
 
-	pH = handleTable + handle;
+	pH = g_handleTable + handle;
 
 	if (pH->filesize & fPreload) {
 		// permanent files are already loaded, nothing to be done
-	} else if (handle == cdPlayHandle) {
+	} else if (handle == g_cdPlayHandle) {
 		// Must be in currently loaded/loadable range
-		if (offset < cdBaseHandle || offset >= cdTopHandle)
+		if (offset < g_cdBaseHandle || offset >= g_cdTopHandle)
 			error("Overlapping (in time) CD-plays");
 
 		// May have been discarded, if so, we have to reload
 		if (!MemoryDeref(pH->_node)) {
 			// Data was discarded, we have to reload
-			MemoryReAlloc(pH->_node, cdTopHandle - cdBaseHandle);
+			MemoryReAlloc(pH->_node, g_cdTopHandle - g_cdBaseHandle);
 
 			LoadCDGraphData(pH);
 
@@ -353,7 +353,7 @@ byte *LockMem(SCNHANDLE offset) {
 		// make sure address is valid
 		assert(pH->filesize & fLoaded);
 
-		offset -= cdBaseHandle;
+		offset -= g_cdBaseHandle;
 	} else {
 		if (!MemoryDeref(pH->_node)) {
 			// Data was discarded, we have to reload
@@ -387,9 +387,9 @@ void LockScene(SCNHANDLE offset) {
 #endif
 
 	// range check the memory handle
-	assert(handle < numHandles);
+	assert(handle < g_numHandles);
 
-	pH = handleTable + handle;
+	pH = g_handleTable + handle;
 
 	if ((pH->filesize & fPreload) == 0) {
 		// Ensure the scene handle is allocated.
@@ -414,9 +414,9 @@ void UnlockScene(SCNHANDLE offset) {
 	MEMHANDLE *pH;					// points to table entry
 
 	// range check the memory handle
-	assert(handle < numHandles);
+	assert(handle < g_numHandles);
 
-	pH = handleTable + handle;
+	pH = g_handleTable + handle;
 
 	if ((pH->filesize & fPreload) == 0) {
 		// unlock the scene data
@@ -441,9 +441,9 @@ bool ValidHandle(SCNHANDLE offset) {
 	MEMHANDLE *pH;					// points to table entry
 
 	// range check the memory handle
-	assert(handle < numHandles);
+	assert(handle < g_numHandles);
 
-	pH = handleTable + handle;
+	pH = g_handleTable + handle;
 
 	return (pH->filesize & FSIZE_MASK) != 8;
 }
@@ -458,7 +458,7 @@ void TouchMem(SCNHANDLE offset) {
 	uint32 handle = offset >> SCNHANDLE_SHIFT;	// calc memory handle to use
 
 	if (offset != 0) {
-		pH = handleTable + handle;
+		pH = g_handleTable + handle;
 
 		// update the LRU time whether its loaded or not!
 		if (pH->_node)
@@ -474,9 +474,9 @@ bool IsCdPlayHandle(SCNHANDLE offset) {
 	uint32 handle = offset >> SCNHANDLE_SHIFT;	// calc memory handle to use
 
 	// range check the memory handle
-	assert(handle < numHandles);
+	assert(handle < g_numHandles);
 
-	return (handle == cdPlayHandle);
+	return (handle == g_cdPlayHandle);
 }
 
 /**
@@ -486,9 +486,9 @@ int CdNumber(SCNHANDLE offset) {
 	uint handle = offset >> SCNHANDLE_SHIFT;	// calc memory handle to use
 
 	// range check the memory handle
-	assert(handle < numHandles);
+	assert(handle < g_numHandles);
 
-	MEMHANDLE *pH = handleTable + handle;
+	MEMHANDLE *pH = g_handleTable + handle;
 
 	if (!TinselV2)
 		return 1;
diff --git a/engines/tinsel/heapmem.cpp b/engines/tinsel/heapmem.cpp
index 819493bda1..597cc69e66 100644
--- a/engines/tinsel/heapmem.cpp
+++ b/engines/tinsel/heapmem.cpp
@@ -58,16 +58,16 @@ static const uint32 MemoryPoolSize[3] = {5 * 1024 * 1024, 5 * 1024 * 1024, 10 *
 
 
 // list of all memory nodes
-MEM_NODE mnodeList[NUM_MNODES];
+MEM_NODE g_mnodeList[NUM_MNODES];
 
 // pointer to the linked list of free mnodes
-static MEM_NODE *pFreeMemNodes;
+static MEM_NODE *g_pFreeMemNodes;
 
 // list of all fixed memory nodes
-MEM_NODE s_fixedMnodesList[5];
+MEM_NODE g_s_fixedMnodesList[5];
 
 // the mnode heap sentinel
-static MEM_NODE heapSentinel;
+static MEM_NODE g_heapSentinel;
 
 //
 static MEM_NODE *AllocMemNode();
@@ -80,7 +80,7 @@ static void MemoryStats() {
 	int lockedSize = 0;
 	int totalSize = 0;
 
-	const MEM_NODE *pHeap = &heapSentinel;
+	const MEM_NODE *pHeap = &g_heapSentinel;
 	MEM_NODE *pCur;
 
 	for (pCur = pHeap->pNext; pCur != pHeap; pCur = pCur->pNext) {
@@ -104,43 +104,43 @@ static void MemoryStats() {
  */
 void MemoryInit() {
 	// place first node on free list
-	pFreeMemNodes = mnodeList;
+	g_pFreeMemNodes = g_mnodeList;
 
 	// link all other objects after first
-	memset(mnodeList, 0, sizeof(mnodeList));
+	memset(g_mnodeList, 0, sizeof(g_mnodeList));
 	for (int i = 1; i < NUM_MNODES; i++) {
-		mnodeList[i - 1].pNext = mnodeList + i;
+		g_mnodeList[i - 1].pNext = g_mnodeList + i;
 	}
 
 	// null the last mnode
-	mnodeList[NUM_MNODES - 1].pNext = NULL;
+	g_mnodeList[NUM_MNODES - 1].pNext = NULL;
 
 	// clear list of fixed memory nodes
-	memset(s_fixedMnodesList, 0, sizeof(s_fixedMnodesList));
+	memset(g_s_fixedMnodesList, 0, sizeof(g_s_fixedMnodesList));
 
 	// set cyclic links to the sentinel
-	heapSentinel.pPrev = &heapSentinel;
-	heapSentinel.pNext = &heapSentinel;
+	g_heapSentinel.pPrev = &g_heapSentinel;
+	g_heapSentinel.pNext = &g_heapSentinel;
 
 	// flag sentinel as locked
-	heapSentinel.flags = DWM_LOCKED | DWM_SENTINEL;
+	g_heapSentinel.flags = DWM_LOCKED | DWM_SENTINEL;
 
 	// store the current heap size in the sentinel
 	uint32 size = MemoryPoolSize[0];
 	if (TinselVersion == TINSEL_V1) size = MemoryPoolSize[1];
 	else if (TinselVersion == TINSEL_V2) size = MemoryPoolSize[2];
-	heapSentinel.size = size;
+	g_heapSentinel.size = size;
 }
 
 /**
  * Deinitializes the memory manager.
  */
 void MemoryDeinit() {
-	const MEM_NODE *pHeap = &heapSentinel;
+	const MEM_NODE *pHeap = &g_heapSentinel;
 	MEM_NODE *pCur;
 
-	pCur = s_fixedMnodesList;
-	for (int i = 0; i < ARRAYSIZE(s_fixedMnodesList); ++i, ++pCur) {
+	pCur = g_s_fixedMnodesList;
+	for (int i = 0; i < ARRAYSIZE(g_s_fixedMnodesList); ++i, ++pCur) {
 		free(pCur->pBaseAddr);
 		pCur->pBaseAddr = 0;
 	}
@@ -157,13 +157,13 @@ void MemoryDeinit() {
  */
 static MEM_NODE *AllocMemNode() {
 	// get the first free mnode
-	MEM_NODE *pMemNode = pFreeMemNodes;
+	MEM_NODE *pMemNode = g_pFreeMemNodes;
 
 	// make sure a mnode is available
 	assert(pMemNode); // Out of memory nodes
 
 	// the next free mnode
-	pFreeMemNodes = pMemNode->pNext;
+	g_pFreeMemNodes = pMemNode->pNext;
 
 	// wipe out the mnode
 	memset(pMemNode, 0, sizeof(MEM_NODE));
@@ -178,13 +178,13 @@ static MEM_NODE *AllocMemNode() {
  */
 void FreeMemNode(MEM_NODE *pMemNode) {
 	// validate mnode pointer
-	assert(pMemNode >= mnodeList && pMemNode <= mnodeList + NUM_MNODES - 1);
+	assert(pMemNode >= g_mnodeList && pMemNode <= g_mnodeList + NUM_MNODES - 1);
 
 	// place free list in mnode next
-	pMemNode->pNext = pFreeMemNodes;
+	pMemNode->pNext = g_pFreeMemNodes;
 
 	// add mnode to top of free list
-	pFreeMemNodes = pMemNode;
+	g_pFreeMemNodes = pMemNode;
 }
 
 
@@ -194,11 +194,11 @@ void FreeMemNode(MEM_NODE *pMemNode) {
  * @return true if any blocks were discarded, false otherwise
  */
 static bool HeapCompact(long size) {
-	const MEM_NODE *pHeap = &heapSentinel;
+	const MEM_NODE *pHeap = &g_heapSentinel;
 	MEM_NODE *pCur, *pOldest;
 	uint32 oldest;		// time of the oldest discardable block
 
-	while (heapSentinel.size < size) {
+	while (g_heapSentinel.size < size) {
 
 		// find the oldest discardable block
 		oldest = DwGetCurrentTime();
@@ -231,7 +231,7 @@ static bool HeapCompact(long size) {
  * @param size			Number of bytes to allocate
  */
 static MEM_NODE *MemoryAlloc(long size) {
-	MEM_NODE *pHeap = &heapSentinel;
+	MEM_NODE *pHeap = &g_heapSentinel;
 
 #ifdef SCUMM_NEED_ALIGNMENT
 	const int alignPadding = sizeof(void *) - 1;
@@ -255,7 +255,7 @@ static MEM_NODE *MemoryAlloc(long size) {
 	assert(pNode->pBaseAddr);
 
 	// Subtract size of new block from total
-	heapSentinel.size -= size;
+	g_heapSentinel.size -= size;
 
 #ifdef DEBUG
 	MemoryStats();
@@ -282,7 +282,7 @@ static MEM_NODE *MemoryAlloc(long size) {
  * by using MemoryReAlloc().
  */
 MEM_NODE *MemoryNoAlloc() {
-	MEM_NODE *pHeap = &heapSentinel;
+	MEM_NODE *pHeap = &g_heapSentinel;
 
 	// chain a discarded node onto the end of the heap
 	MEM_NODE *pNode = AllocMemNode();
@@ -315,8 +315,8 @@ MEM_NODE *MemoryAllocFixed(long size) {
 #endif
 
 	// Search for a free entry in s_fixedMnodesList
-	MEM_NODE *pNode = s_fixedMnodesList;
-	for (int i = 0; i < ARRAYSIZE(s_fixedMnodesList); ++i, ++pNode) {
+	MEM_NODE *pNode = g_s_fixedMnodesList;
+	for (int i = 0; i < ARRAYSIZE(g_s_fixedMnodesList); ++i, ++pNode) {
 		if (!pNode->pBaseAddr) {
 			pNode->pNext = 0;
 			pNode->pPrev = 0;
@@ -326,7 +326,7 @@ MEM_NODE *MemoryAllocFixed(long size) {
 			pNode->flags = DWM_USED;
 
 			// Subtract size of new block from total
-			heapSentinel.size -= size;
+			g_heapSentinel.size -= size;
 
 			return pNode;
 		}
@@ -342,7 +342,7 @@ MEM_NODE *MemoryAllocFixed(long size) {
  */
 void MemoryDiscard(MEM_NODE *pMemNode) {
 	// validate mnode pointer
-	assert(pMemNode >= mnodeList && pMemNode <= mnodeList + NUM_MNODES - 1);
+	assert(pMemNode >= g_mnodeList && pMemNode <= g_mnodeList + NUM_MNODES - 1);
 
 	// object must be in use and locked
 	assert((pMemNode->flags & (DWM_USED | DWM_LOCKED)) == DWM_USED);
@@ -351,7 +351,7 @@ void MemoryDiscard(MEM_NODE *pMemNode) {
 	if ((pMemNode->flags & DWM_DISCARDED) == 0) {
 		// free memory
 		free(pMemNode->pBaseAddr);
-		heapSentinel.size += pMemNode->size;
+		g_heapSentinel.size += pMemNode->size;
 
 #ifdef DEBUG
 		MemoryStats();
@@ -416,7 +416,7 @@ void MemoryReAlloc(MEM_NODE *pMemNode, long size) {
 	MEM_NODE *pNew;
 
 	// validate mnode pointer
-	assert(pMemNode >= mnodeList && pMemNode <= mnodeList + NUM_MNODES - 1);
+	assert(pMemNode >= g_mnodeList && pMemNode <= g_mnodeList + NUM_MNODES - 1);
 
 	// align the size to machine boundary requirements
 	size = (size + sizeof(void *) - 1) & ~(sizeof(void *) - 1);
diff --git a/engines/tinsel/mareels.cpp b/engines/tinsel/mareels.cpp
index bd267a2c65..7dd905d0f2 100644
--- a/engines/tinsel/mareels.cpp
+++ b/engines/tinsel/mareels.cpp
@@ -48,9 +48,9 @@ struct SCIdataStruct {
 
 // FIXME: Avoid non-const global vars
 
-static SCIdataStruct SCIdata[MAX_SCRENTRIES];
+static SCIdataStruct g_SCIdata[MAX_SCRENTRIES];
 
-static int scrEntries = 0;
+static int g_scrEntries = 0;
 
 /**
  * Sets an actor's walk reels
@@ -131,16 +131,16 @@ void SetScalingReels(int actor, int scale, int direction,
 	assert(!(scale == 1 && direction == D_UP) &&
 		!(scale == NUM_MAINSCALES && direction == D_DOWN)); // illegal direction from scale
 
-	assert(scrEntries < MAX_SCRENTRIES); // Scaling reels limit reached!
+	assert(g_scrEntries < MAX_SCRENTRIES); // Scaling reels limit reached!
 
-	SCIdata[scrEntries].actor = actor;
-	SCIdata[scrEntries].scale = scale;
-	SCIdata[scrEntries].direction = direction;
-	SCIdata[scrEntries].reels[LEFTREEL]	= left;
-	SCIdata[scrEntries].reels[RIGHTREEL]	= right;
-	SCIdata[scrEntries].reels[FORWARD]	= forward;
-	SCIdata[scrEntries].reels[AWAY]		= away;
-	scrEntries++;
+	g_SCIdata[g_scrEntries].actor = actor;
+	g_SCIdata[g_scrEntries].scale = scale;
+	g_SCIdata[g_scrEntries].direction = direction;
+	g_SCIdata[g_scrEntries].reels[LEFTREEL]	= left;
+	g_SCIdata[g_scrEntries].reels[RIGHTREEL]	= right;
+	g_SCIdata[g_scrEntries].reels[FORWARD]	= forward;
+	g_SCIdata[g_scrEntries].reels[AWAY]		= away;
+	g_scrEntries++;
 }
 
 /**
@@ -155,12 +155,12 @@ SCNHANDLE ScalingReel(int ano, int scale1, int scale2, DIRECTION reel) {
 	else
 		d = D_UP;
 
-	for (int i = 0; i < scrEntries; i++)	{
-		if (SCIdata[i].actor == ano && SCIdata[i].scale == scale1 && SCIdata[i].direction == d) {
-			if (SCIdata[i].reels[reel] == TF_NONE)
+	for (int i = 0; i < g_scrEntries; i++)	{
+		if (g_SCIdata[i].actor == ano && g_SCIdata[i].scale == scale1 && g_SCIdata[i].direction == d) {
+			if (g_SCIdata[i].reels[reel] == TF_NONE)
 				return 0;
 			else
-				return SCIdata[i].reels[reel];
+				return g_SCIdata[i].reels[reel];
 		}
 	}
 	return 0;
@@ -170,8 +170,8 @@ SCNHANDLE ScalingReel(int ano, int scale1, int scale2, DIRECTION reel) {
  * RebootScalingReels
  */
 void RebootScalingReels() {
-	scrEntries = 0;
-	memset(SCIdata, 0, sizeof(SCIdata));
+	g_scrEntries = 0;
+	memset(g_SCIdata, 0, sizeof(g_SCIdata));
 }
 
 /**
diff --git a/engines/tinsel/move.cpp b/engines/tinsel/move.cpp
index e20f28d528..bb49e59fe7 100644
--- a/engines/tinsel/move.cpp
+++ b/engines/tinsel/move.cpp
@@ -77,14 +77,14 @@ HPOLYGON InitExtraBlock(PMOVER ca, PMOVER ta);
 // FIXME: Avoid non-const global vars
 
 #if SLOW_RINCE_DOWN
-static int Interlude = 0;	// For slowing down walking, for testing
-static int BogusVar = 0;	// For slowing down walking, for testing
+static int g_Interlude = 0;	// For slowing down walking, for testing
+static int g_BogusVar = 0;	// For slowing down walking, for testing
 #endif
 
-static int32 DefaultRefer = 0;
-static int lastLeadXdest = 0, lastLeadYdest = 0;
+static int32 g_DefaultRefer = 0;
+static int g_lastLeadXdest = 0, g_lastLeadYdest = 0;
 
-static int hSlowVar = 0;	// used by MoveActor()
+static int g_hSlowVar = 0;	// used by MoveActor()
 
 
 //----------------- FORWARD REFERENCES --------------------
@@ -101,9 +101,9 @@ static void NewCoOrdinates(int fromx, int fromy, int *targetX, int *targetY,
  */
 
 void AddInterlude(int n) {
-	Interlude += n;
-	if (Interlude < 0)
-		Interlude = 0;
+	g_Interlude += n;
+	if (g_Interlude < 0)
+		g_Interlude = 0;
 }
 #endif
 
@@ -251,7 +251,7 @@ static int ClickedOnNothing(int clickX, int clickY, int *ptgtX, int *ptgtY) {
 
 	PlayfieldGetPos(FIELD_WORLD, &Loffset, &Toffset);
 
-	switch (DefaultRefer) {
+	switch (g_DefaultRefer) {
 	case REF_DEFAULT:
 		// Try searching down and up (onscreen).
 		for (i = clickY+1; i < SCREEN_HEIGHT+Toffset; i++)
@@ -1353,15 +1353,15 @@ int SetActorDest(PMOVER pMover, int clickX, int clickY, bool igPath, SCNHANDLE h
 		targetY = clickY;
 
 		if (pMover->actorID == GetLeadId()) {
-			lastLeadXdest = targetX;
-			lastLeadYdest = targetY;
+			g_lastLeadXdest = targetX;
+			g_lastLeadYdest = targetY;
 		}
 	} else {
 		int wodResult = WorkOutDestination(clickX, clickY, &targetX, &targetY);
 
 		if (pMover->actorID == GetLeadId()) {
-			lastLeadXdest = targetX;
-			lastLeadYdest = targetY;
+			g_lastLeadXdest = targetX;
+			g_lastLeadYdest = targetY;
 		}
 
 		if (wodResult == ALL_SORTED) {
@@ -1613,17 +1613,17 @@ void MoveActor(PMOVER pMover) {
 	}
 
 #if SLOW_RINCE_DOWN
-/**/	if (BogusVar++ < Interlude)	// Temporary slow-down-the-action code
+/**/	if (g_BogusVar++ < g_Interlude)	// Temporary slow-down-the-action code
 /**/		return;			//
-/**/	BogusVar = 0;			//
+/**/	g_BogusVar = 0;			//
 #endif
 
 	if (!TinselV2) {
 		// During swalk()s, movement while hidden may be slowed down.
 		if (pMover->bHidden) {
-			if (++hSlowVar < pMover->SlowFactor)
+			if (++g_hSlowVar < pMover->SlowFactor)
 				return;
-			hSlowVar = 0;
+			g_hSlowVar = 0;
 		}
 	}
 
@@ -1705,15 +1705,15 @@ void MoveActor(PMOVER pMover) {
  * Store the default refer type for the current scene.
  */
 void SetDefaultRefer(int32 defRefer) {
-	DefaultRefer = defRefer;
+	g_DefaultRefer = defRefer;
 }
 
 int GetLastLeadXdest() {
-	return lastLeadXdest;
+	return g_lastLeadXdest;
 }
 
 int GetLastLeadYdest() {
-	return lastLeadYdest;
+	return g_lastLeadYdest;
 }
 
 
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index f552c49491..781a378f13 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -64,13 +64,13 @@ struct SOUND_BUFFER {
 // FIXME: Avoid non-const global vars
 
 // MIDI buffer
-static SOUND_BUFFER midiBuffer = { 0, 0 };
+static SOUND_BUFFER g_midiBuffer = { 0, 0 };
 
-static SCNHANDLE	currentMidi = 0;
-static bool		currentLoop = false;
+static SCNHANDLE	g_currentMidi = 0;
+static bool		g_currentLoop = false;
 
 // We allocate 155 entries because that's the maximum, used in the SCN version
-static SCNHANDLE midiOffsets[155];
+static SCNHANDLE g_midiOffsets[155];
 
 static const int enhancedAudioGRAVersion[] = {
 	 1,   2,   1,   1,   3,   3,   4,   4,   5,   6, //   1-10
@@ -110,16 +110,16 @@ static const int enhancedAudioSCNVersion[] = {
 };
 
 int GetTrackNumber(SCNHANDLE hMidi) {
-	for (int i = 0; i < ARRAYSIZE(midiOffsets); i++)
-		if (midiOffsets[i] == hMidi)
+	for (int i = 0; i < ARRAYSIZE(g_midiOffsets); i++)
+		if (g_midiOffsets[i] == hMidi)
 			return i;
 
 	return -1;
 }
 
 SCNHANDLE GetTrackOffset(int trackNumber) {
-	assert(trackNumber < ARRAYSIZE(midiOffsets));
-	return midiOffsets[trackNumber];
+	assert(trackNumber < ARRAYSIZE(g_midiOffsets));
+	return g_midiOffsets[trackNumber];
 }
 
 /**
@@ -128,8 +128,8 @@ SCNHANDLE GetTrackOffset(int trackNumber) {
  * @param bLoop				Whether to loop the sequence
  */
 bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) {
-	currentMidi = dwFileOffset;
-	currentLoop = bLoop;
+	g_currentMidi = dwFileOffset;
+	g_currentLoop = bLoop;
 
 	// Tinsel V1 PSX uses a different music format, so i
 	// disable it here.
@@ -166,8 +166,8 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) {
 				StopMidi();
 
 				// StopMidi resets these fields, so set them again
-				currentMidi = dwFileOffset;
-				currentLoop = bLoop;
+				g_currentMidi = dwFileOffset;
+				g_currentLoop = bLoop;
 
 				// try to play track, but don't fall back to a true CD
 				g_system->getAudioCDManager()->play(track, bLoop ? -1 : 1, 0, 0, true);
@@ -203,13 +203,13 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) {
 		dwSeqLen = midiStream.readUint32LE();
 
 		// make sure buffer is large enough for this sequence
-		assert(dwSeqLen > 0 && dwSeqLen <= midiBuffer.size);
+		assert(dwSeqLen > 0 && dwSeqLen <= g_midiBuffer.size);
 
 		// stop any currently playing tune
 		_vm->_midiMusic->stop();
 
 		// read the sequence
-		if (midiStream.read(midiBuffer.pDat, dwSeqLen) != dwSeqLen)
+		if (midiStream.read(g_midiBuffer.pDat, dwSeqLen) != dwSeqLen)
 			error(FILE_IS_CORRUPT, MIDI_FILE);
 
 		midiStream.close();
@@ -231,14 +231,14 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) {
 			_vm->_midiMusic->send(0x7F07B0 | 13);
 		}
 
-		_vm->_midiMusic->playXMIDI(midiBuffer.pDat, dwSeqLen, bLoop);
+		_vm->_midiMusic->playXMIDI(g_midiBuffer.pDat, dwSeqLen, bLoop);
 
 		// Store the length
 		//dwLastSeqLen = dwSeqLen;
 	} else {
 	 	// dwFileOffset == dwLastMidiIndex
 		_vm->_midiMusic->stop();
-		_vm->_midiMusic->playXMIDI(midiBuffer.pDat, dwSeqLen, bLoop);
+		_vm->_midiMusic->playXMIDI(g_midiBuffer.pDat, dwSeqLen, bLoop);
 	}
 
 	return true;
@@ -259,8 +259,8 @@ bool MidiPlaying() {
  * Stops any currently playing midi.
  */
 bool StopMidi() {
-	currentMidi = 0;
-	currentLoop = false;
+	g_currentMidi = 0;
+	g_currentLoop = false;
 
 	if (_vm->getFeatures() & GF_ENHANCED_AUDIO_SUPPORT) {
 		g_system->getAudioCDManager()->stop();
@@ -295,8 +295,8 @@ void SetMidiVolume(int vol) {
 		_vm->_midiMusic->setVolume(vol);
 	} else if (vol != 0 && priorVolMusic == 0) {
 		// Perhaps restart last midi sequence
-		if (currentLoop)
-			PlayMidiSequence(currentMidi, true);
+		if (g_currentLoop)
+			PlayMidiSequence(g_currentMidi, true);
 
 		_vm->_midiMusic->setVolume(vol);
 	} else if (vol != 0 && priorVolMusic != 0) {
@@ -318,7 +318,7 @@ void OpenMidiFiles() {
 	if ((_vm->getFeatures() & GF_DEMO) || (TinselVersion == TINSEL_V2) || TinselV1PSX)
 		return;
 
-	if (midiBuffer.pDat)
+	if (g_midiBuffer.pDat)
 		// already allocated
 		return;
 
@@ -327,15 +327,15 @@ void OpenMidiFiles() {
 		error(CANNOT_FIND_FILE, MIDI_FILE);
 
 	// gen length of the largest sequence
-	midiBuffer.size = midiStream.readUint32LE();
+	g_midiBuffer.size = midiStream.readUint32LE();
 	if (midiStream.eos() || midiStream.err())
 		error(FILE_IS_CORRUPT, MIDI_FILE);
 
-	if (midiBuffer.size) {
+	if (g_midiBuffer.size) {
 		// allocate a buffer big enough for the largest MIDI sequence
-		if ((midiBuffer.pDat = (uint8 *)malloc(midiBuffer.size)) != NULL) {
+		if ((g_midiBuffer.pDat = (uint8 *)malloc(g_midiBuffer.size)) != NULL) {
 			// clear out the buffer
-			memset(midiBuffer.pDat, 0, midiBuffer.size);
+			memset(g_midiBuffer.pDat, 0, g_midiBuffer.size);
 //			VMM_lock(midiBuffer.pDat, midiBuffer.size);
 		} else {
 			//mSeqHandle = NULL;
@@ -352,15 +352,15 @@ void OpenMidiFiles() {
 	uint32 songLength = 0;
 
 	// Init
-	for (int i = 0; i < ARRAYSIZE(midiOffsets); i++)
-		midiOffsets[i] = 0;
+	for (int i = 0; i < ARRAYSIZE(g_midiOffsets); i++)
+		g_midiOffsets[i] = 0;
 
 	while (!midiStream.eos() && !midiStream.err()) {
 		if (curOffset + (4 * curTrack) >= (uint32)midiStream.size())
 			break;
 
-		assert(curTrack < ARRAYSIZE(midiOffsets));
-		midiOffsets[curTrack] = curOffset + (4 * curTrack);
+		assert(curTrack < ARRAYSIZE(g_midiOffsets));
+		g_midiOffsets[curTrack] = curOffset + (4 * curTrack);
 		//debug("%d: %d", curTrack, midiOffsets[curTrack]);
 
 		songLength = midiStream.readUint32LE();
@@ -374,8 +374,8 @@ void OpenMidiFiles() {
 }
 
 void DeleteMidiBuffer() {
-	free(midiBuffer.pDat);
-	midiBuffer.pDat = NULL;
+	free(g_midiBuffer.pDat);
+	g_midiBuffer.pDat = NULL;
 }
 
 MidiMusicPlayer::MidiMusicPlayer() {
@@ -860,22 +860,22 @@ void PCMMusicPlayer::stop() {
 }
 
 void CurrentMidiFacts(SCNHANDLE	*pMidi, bool *pLoop) {
-	*pMidi = currentMidi;
-	*pLoop = currentLoop;
+	*pMidi = g_currentMidi;
+	*pLoop = g_currentLoop;
 }
 
 void RestoreMidiFacts(SCNHANDLE	Midi, bool Loop) {
 	StopMidi();
 
-	currentMidi = Midi;
-	currentLoop = Loop;
+	g_currentMidi = Midi;
+	g_currentLoop = Loop;
 
 	if (_vm->_config->_musicVolume != 0 && Loop) {
 		bool mute = false;
 		if (ConfMan.hasKey("mute"))
 			mute = ConfMan.getBool("mute");
 
-		PlayMidiSequence(currentMidi, true);
+		PlayMidiSequence(g_currentMidi, true);
 		SetMidiVolume(mute ? 0 : _vm->_config->_musicVolume);
 	}
 }
diff --git a/engines/tinsel/palette.cpp b/engines/tinsel/palette.cpp
index f2437bd17e..e6c9467fab 100644
--- a/engines/tinsel/palette.cpp
+++ b/engines/tinsel/palette.cpp
@@ -54,33 +54,33 @@ struct VIDEO_DAC_Q {
 // FIXME: Avoid non-const global vars
 
 /** palette allocator data */
-static PALQ palAllocData[NUM_PALETTES];
+static PALQ g_palAllocData[NUM_PALETTES];
 
 
 /** video DAC transfer Q length */
 #define VDACQLENGTH (NUM_PALETTES+2)
 
 /** video DAC transfer Q */
-static VIDEO_DAC_Q vidDACdata[VDACQLENGTH];
+static VIDEO_DAC_Q g_vidDACdata[VDACQLENGTH];
 
 /** video DAC transfer Q head pointer */
-static VIDEO_DAC_Q *pDAChead;
+static VIDEO_DAC_Q *g_pDAChead;
 
 /** color index of the 4 colors used for the translucent palette */
 #define COL_HILIGHT	TBLUE1
 
 /** the translucent palette lookup table */
-uint8 transPalette[MAX_COLORS];	// used in graphics.cpp
+uint8 g_transPalette[MAX_COLORS];	// used in graphics.cpp
 
-uint8 ghostPalette[MAX_COLORS];
+uint8 g_ghostPalette[MAX_COLORS];
 
-static int translucentIndex	= 228;
+static int g_translucentIndex	= 228;
 
-static int talkIndex		= 233;
+static int g_talkIndex		= 233;
 
-static COLORREF talkColRef;
+static COLORREF g_talkColRef;
 
-static COLORREF tagColRef;
+static COLORREF g_tagColRef;
 
 
 #ifdef DEBUG
@@ -131,11 +131,11 @@ void psxPaletteMapper(PALQ *originalPal, uint8 *psxClut, byte *mapperTable) {
  */
 void PalettesToVideoDAC() {
 	PALQ *pPalQ;				// palette Q iterator
-	VIDEO_DAC_Q *pDACtail = vidDACdata;	// set tail pointer
+	VIDEO_DAC_Q *pDACtail = g_vidDACdata;	// set tail pointer
 	byte pal[768];
 
 	// while Q is not empty
-	while (pDAChead != pDACtail) {
+	while (g_pDAChead != pDACtail) {
 		const PALETTE *pPalette;	// pointer to hardware palette
 		const COLORREF *pColors;	// pointer to list of RGB triples
 
@@ -179,10 +179,10 @@ void PalettesToVideoDAC() {
 	}
 
 	// reset video DAC transfer Q head pointer
-	pDAChead = vidDACdata;
+	g_pDAChead = g_vidDACdata;
 
 	// clear all palette moved bits
-	for (pPalQ = palAllocData; pPalQ < palAllocData + NUM_PALETTES; pPalQ++)
+	for (pPalQ = g_palAllocData; pPalQ < g_palAllocData + NUM_PALETTES; pPalQ++)
 		pPalQ->posInDAC &= ~PALETTE_MOVED;
 }
 
@@ -196,10 +196,10 @@ void ResetPalAllocator() {
 #endif
 
 	// wipe out the palette allocator data
-	memset(palAllocData, 0, sizeof(palAllocData));
+	memset(g_palAllocData, 0, sizeof(g_palAllocData));
 
 	// reset video DAC transfer Q head pointer
-	pDAChead = vidDACdata;
+	g_pDAChead = g_vidDACdata;
 }
 
 #ifdef	DEBUG
@@ -220,19 +220,19 @@ void PaletteStats() {
  */
 void UpdateDACqueueHandle(int posInDAC, int numColors, SCNHANDLE hPalette) {
 	// check Q overflow
-	assert(pDAChead < vidDACdata + VDACQLENGTH);
+	assert(g_pDAChead < g_vidDACdata + VDACQLENGTH);
 
-	pDAChead->destDACindex = posInDAC & ~PALETTE_MOVED;	// set index in video DAC
-	pDAChead->numColors = numColors;	// set number of colors
-	pDAChead->pal.hRGBarray = hPalette;	// set handle of palette
-	pDAChead->bHandle = true;		// we are using a palette handle
+	g_pDAChead->destDACindex = posInDAC & ~PALETTE_MOVED;	// set index in video DAC
+	g_pDAChead->numColors = numColors;	// set number of colors
+	g_pDAChead->pal.hRGBarray = hPalette;	// set handle of palette
+	g_pDAChead->bHandle = true;		// we are using a palette handle
 
 	// update head pointer
-	++pDAChead;
+	++g_pDAChead;
 
 #ifdef DEBUG
-	if ((pDAChead-vidDACdata) > maxDACQ)
-		maxDACQ = pDAChead-vidDACdata;
+	if ((g_pDAChead-g_vidDACdata) > maxDACQ)
+		maxDACQ = g_pDAChead-g_vidDACdata;
 #endif
 }
 
@@ -244,22 +244,22 @@ void UpdateDACqueueHandle(int posInDAC, int numColors, SCNHANDLE hPalette) {
  */
 void UpdateDACqueue(int posInDAC, int numColors, COLORREF *pColors) {
 	// check Q overflow
-	assert(pDAChead < vidDACdata + NUM_PALETTES);
+	assert(g_pDAChead < g_vidDACdata + NUM_PALETTES);
 
-	pDAChead->destDACindex = posInDAC & ~PALETTE_MOVED;	// set index in video DAC
-	pDAChead->numColors = numColors;	// set number of colors
+	g_pDAChead->destDACindex = posInDAC & ~PALETTE_MOVED;	// set index in video DAC
+	g_pDAChead->numColors = numColors;	// set number of colors
 	if (numColors == 1)
-		pDAChead->pal.singleRGB = *pColors;	// set single color of which the "palette" consists
+		g_pDAChead->pal.singleRGB = *pColors;	// set single color of which the "palette" consists
 	else
-		pDAChead->pal.pRGBarray = pColors;	// set addr of palette
-	pDAChead->bHandle = false;		// we are not using a palette handle
+		g_pDAChead->pal.pRGBarray = pColors;	// set addr of palette
+	g_pDAChead->bHandle = false;		// we are not using a palette handle
 
 	// update head pointer
-	++pDAChead;
+	++g_pDAChead;
 
 #ifdef DEBUG
-	if ((pDAChead-vidDACdata) > maxDACQ)
-		maxDACQ = pDAChead-vidDACdata;
+	if ((g_pDAChead-g_vidDACdata) > maxDACQ)
+		maxDACQ = g_pDAChead-g_vidDACdata;
 #endif
 }
 
@@ -271,19 +271,19 @@ void UpdateDACqueue(int posInDAC, int numColors, COLORREF *pColors) {
  */
 void UpdateDACqueue(int posInDAC, COLORREF color) {
 	// check Q overflow
-	assert(pDAChead < vidDACdata + NUM_PALETTES);
+	assert(g_pDAChead < g_vidDACdata + NUM_PALETTES);
 
-	pDAChead->destDACindex = posInDAC & ~PALETTE_MOVED;	// set index in video DAC
-	pDAChead->numColors = 1;	// set number of colors
-	pDAChead->pal.singleRGB = color;	// set single color of which the "palette" consists
-	pDAChead->bHandle = false;		// we are not using a palette handle
+	g_pDAChead->destDACindex = posInDAC & ~PALETTE_MOVED;	// set index in video DAC
+	g_pDAChead->numColors = 1;	// set number of colors
+	g_pDAChead->pal.singleRGB = color;	// set single color of which the "palette" consists
+	g_pDAChead->bHandle = false;		// we are not using a palette handle
 
 	// update head pointer
-	++pDAChead;
+	++g_pDAChead;
 
 #ifdef DEBUG
-	if ((pDAChead-vidDACdata) > maxDACQ)
-		maxDACQ = pDAChead-vidDACdata;
+	if ((g_pDAChead-g_vidDACdata) > maxDACQ)
+		maxDACQ = g_pDAChead-g_vidDACdata;
 #endif
 }
 
@@ -301,7 +301,7 @@ PALQ *AllocPalette(SCNHANDLE hNewPal) {
 	pNewPal = (PALETTE *)LockMem(hNewPal);
 
 	// search all structs in palette allocator - see if palette already allocated
-	for (p = palAllocData; p < palAllocData + NUM_PALETTES; p++) {
+	for (p = g_palAllocData; p < g_palAllocData + NUM_PALETTES; p++) {
 		if (p->hPal == hNewPal) {
 			// found the desired palette in palette allocator
 			p->objCount++;	// update number of objects using palette
@@ -312,7 +312,7 @@ PALQ *AllocPalette(SCNHANDLE hNewPal) {
 	// search all structs in palette allocator - find a free slot
 	iDAC = FGND_DAC_INDEX;	// init DAC index to first available foreground color
 
-	for (p = palAllocData; p < palAllocData + NUM_PALETTES; p++) {
+	for (p = g_palAllocData; p < g_palAllocData + NUM_PALETTES; p++) {
 		if (p->hPal == 0) {
 			// found a free slot in palette allocator
 			p->objCount = 1;	// init number of objects using palette
@@ -337,7 +337,7 @@ PALQ *AllocPalette(SCNHANDLE hNewPal) {
 				UpdateDACqueueHandle(p->posInDAC, p->numColors, p->hPal);
 
 			// move all palettes after this one down (if necessary)
-			for (pPrev = p, pNxtPal = pPrev + 1; pNxtPal < palAllocData + NUM_PALETTES; pNxtPal++) {
+			for (pPrev = p, pNxtPal = pPrev + 1; pNxtPal < g_palAllocData + NUM_PALETTES; pNxtPal++) {
 				if (pNxtPal->hPal != 0) {
 					// palette slot is in use
 					if (pNxtPal->posInDAC >= pPrev->posInDAC + pPrev->numColors)
@@ -381,7 +381,7 @@ PALQ *AllocPalette(SCNHANDLE hNewPal) {
  */
 void FreePalette(PALQ *pFreePal) {
 	// validate palette Q pointer
-	assert(pFreePal >= palAllocData && pFreePal <= palAllocData + NUM_PALETTES - 1);
+	assert(pFreePal >= g_palAllocData && pFreePal <= g_palAllocData + NUM_PALETTES - 1);
 
 	// reduce the palettes object reference count
 	pFreePal->objCount--;
@@ -408,7 +408,7 @@ PALQ *FindPalette(SCNHANDLE hSrchPal) {
 	PALQ *pPal;		// palette allocator iterator
 
 	// search all structs in palette allocator
-	for (pPal = palAllocData; pPal < palAllocData + NUM_PALETTES; pPal++) {
+	for (pPal = g_palAllocData; pPal < g_palAllocData + NUM_PALETTES; pPal++) {
 		if (pPal->hPal == hSrchPal)
 			// found palette in palette allocator
 			return pPal;
@@ -428,7 +428,7 @@ void SwapPalette(PALQ *pPalQ, SCNHANDLE hNewPal) {
 	PALETTE *pNewPal = (PALETTE *)LockMem(hNewPal);
 
 	// validate palette Q pointer
-	assert(pPalQ >= palAllocData && pPalQ <= palAllocData + NUM_PALETTES - 1);
+	assert(pPalQ >= g_palAllocData && pPalQ <= g_palAllocData + NUM_PALETTES - 1);
 
 	if (pPalQ->numColors >= (int)FROM_LE_32(pNewPal->numColors)) {
 		// new palette will fit the slot
@@ -455,7 +455,7 @@ void SwapPalette(PALQ *pPalQ, SCNHANDLE hNewPal) {
 
 		PALQ *pNxtPalQ;		// next palette queue position
 
-		for (pNxtPalQ = pPalQ + 1; pNxtPalQ < palAllocData + NUM_PALETTES; pNxtPalQ++) {
+		for (pNxtPalQ = pPalQ + 1; pNxtPalQ < g_palAllocData + NUM_PALETTES; pNxtPalQ++) {
 			if (pNxtPalQ->posInDAC >= pPalQ->posInDAC + pPalQ->numColors)
 				// no need to move palettes down
 				break;
@@ -482,14 +482,14 @@ void SwapPalette(PALQ *pPalQ, SCNHANDLE hNewPal) {
 PALQ *GetNextPalette(PALQ *pStrtPal) {
 	if (pStrtPal == NULL) {
 		// start of palette iteration - return 1st palette
-		return (palAllocData[0].objCount) ? palAllocData : NULL;
+		return (g_palAllocData[0].objCount) ? g_palAllocData : NULL;
 	}
 
 	// validate palette Q pointer
-	assert(pStrtPal >= palAllocData && pStrtPal <= palAllocData + NUM_PALETTES - 1);
+	assert(pStrtPal >= g_palAllocData && pStrtPal <= g_palAllocData + NUM_PALETTES - 1);
 
 	// return next active palette in list
-	while (++pStrtPal < palAllocData + NUM_PALETTES) {
+	while (++pStrtPal < g_palAllocData + NUM_PALETTES) {
 		if (pStrtPal->objCount)
 			// active palette found
 			return pStrtPal;
@@ -515,7 +515,7 @@ void SetBgndColor(COLORREF color) {
  */
 void FadingPalette(PALQ *pPalQ, bool bFading) {
 	// validate palette Q pointer
-	assert(pPalQ >= palAllocData && pPalQ <= palAllocData + NUM_PALETTES - 1);
+	assert(pPalQ >= g_palAllocData && pPalQ <= g_palAllocData + NUM_PALETTES - 1);
 
 	// validate that this is a change
 	assert(pPalQ->bFading != bFading);
@@ -530,7 +530,7 @@ void FadingPalette(PALQ *pPalQ, bool bFading) {
 void NoFadingPalettes() {
 	PALQ *pPalQ;
 
-	for (pPalQ = palAllocData; pPalQ <= palAllocData + NUM_PALETTES - 1; pPalQ++) {
+	for (pPalQ = g_palAllocData; pPalQ <= g_palAllocData + NUM_PALETTES - 1; pPalQ++) {
 		pPalQ->bFading = false;
 	}
 }
@@ -544,7 +544,7 @@ void CreateTranslucentPalette(SCNHANDLE hPalette) {
 	PALETTE *pPal = (PALETTE *)LockMem(hPalette);
 
 	// leave background color alone
-	transPalette[0] = 0;
+	g_transPalette[0] = 0;
 
 	for (uint i = 0; i < FROM_LE_32(pPal->numColors); i++) {
 		// get the RGB color model values
@@ -558,7 +558,7 @@ void CreateTranslucentPalette(SCNHANDLE hPalette) {
 
 		// map the Value field to one of the 4 colors reserved for the translucent palette
 		val /= 63;
-		transPalette[i + 1] = (uint8)((val == 0) ? 0 : val +
+		g_transPalette[i + 1] = (uint8)((val == 0) ? 0 : val +
 			(TinselV2 ? TranslucentColor() : COL_HILIGHT) - 1);
 	}
 }
@@ -572,7 +572,7 @@ void CreateGhostPalette(SCNHANDLE hPalette) {
 	int i;
 
 	// leave background color alone
-	ghostPalette[0] = 0;
+	g_ghostPalette[0] = 0;
 
 	for (i = 0; i < (int)FROM_LE_32(pPal->numColors); i++) {
 		// get the RGB color model values
@@ -587,7 +587,7 @@ void CreateGhostPalette(SCNHANDLE hPalette) {
 		// map the Value field to one of the 4 colors reserved for the translucent palette
 		val /= 64;
 		assert(/*val >= 0 &&*/ val <= 3);
-		ghostPalette[i + 1] = (uint8)(val + SysVar(ISV_GHOST_BASE));
+		g_ghostPalette[i + 1] = (uint8)(val + SysVar(ISV_GHOST_BASE));
 	}
 }
 
@@ -648,41 +648,41 @@ void DimPartPalette(SCNHANDLE hDimPal, int startColor, int length, int brightnes
 }
 
 int TranslucentColor() {
-	return translucentIndex;
+	return g_translucentIndex;
 }
 
 int HighlightColor() {
-	UpdateDACqueue(talkIndex, (COLORREF)SysVar(SYS_HighlightRGB));
+	UpdateDACqueue(g_talkIndex, (COLORREF)SysVar(SYS_HighlightRGB));
 
-	return talkIndex;
+	return g_talkIndex;
 }
 
 int TalkColor() {
-	return TinselV2 ? talkIndex : TALKFONT_COL;
+	return TinselV2 ? g_talkIndex : TALKFONT_COL;
 }
 
 void SetTalkColorRef(COLORREF colRef) {
-	talkColRef = colRef;
+	g_talkColRef = colRef;
 }
 
 COLORREF GetTalkColorRef() {
-	return talkColRef;
+	return g_talkColRef;
 }
 
 void SetTagColorRef(COLORREF colRef) {
-	tagColRef = colRef;
+	g_tagColRef = colRef;
 }
 
 COLORREF GetTagColorRef() {
-	return tagColRef;
+	return g_tagColRef;
 }
 
 void SetTranslucencyOffset(int offset) {
-	translucentIndex = offset;
+	g_translucentIndex = offset;
 }
 
 void SetTalkTextOffset(int offset) {
-	talkIndex = offset;
+	g_talkIndex = offset;
 }
 
 } // End of namespace Tinsel
diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp
index 2ab1e653d4..145a6a8e5d 100644
--- a/engines/tinsel/pcode.cpp
+++ b/engines/tinsel/pcode.cpp
@@ -100,19 +100,19 @@ enum OPCODE {
 
 #define	OPMASK		0x3F	///< mask to isolate the opcode
 
-bool bNoPause = false;
+bool g_bNoPause = false;
 
 //----------------- LOCAL GLOBAL DATA --------------------
 
 // FIXME: Avoid non-const global vars
 
-static int32 *pGlobals = 0;		// global vars
+static int32 *g_pGlobals = 0;		// global vars
 
-static int numGlobals = 0;		// How many global variables to save/restore
+static int g_numGlobals = 0;		// How many global variables to save/restore
 
-static INT_CONTEXT *icList = 0;
+static INT_CONTEXT *g_icList = 0;
 
-static uint32 hMasterScript;
+static uint32 g_hMasterScript;
 
 //----------------- SCRIPT BUGS WORKAROUNDS --------------
 
@@ -227,7 +227,7 @@ void LockCode(INT_CONTEXT *ic) {
 	if (ic->GSort == GS_MASTER) {
 		if (TinselV2)
 			// Get the srcipt handle from a specific global chunk
-			ic->code = (byte *)LockMem(hMasterScript);
+			ic->code = (byte *)LockMem(g_hMasterScript);
 		else
 			ic->code = (byte *)FindChunk(MASTER_SCNHANDLE, CHUNK_PCODE);
 	} else
@@ -241,7 +241,7 @@ static INT_CONTEXT *AllocateInterpretContext(GSORT gsort) {
 	INT_CONTEXT *pic;
 	int	i;
 
-	for (i = 0, pic = icList; i < NUM_INTERPRET; i++, pic++) {
+	for (i = 0, pic = g_icList; i < NUM_INTERPRET; i++, pic++) {
 		if (pic->GSort == GS_NONE) {
 			pic->pProc = g_scheduler->getCurrentProcess();
 			pic->GSort = gsort;
@@ -264,8 +264,8 @@ static void FreeWaitCheck(PINT_CONTEXT pic, bool bVoluntary) {
 	// Is this waiting for something?
 	if (pic->waitNumber1) {
 		for (i = 0; i < NUM_INTERPRET; i++) {
-			if ((icList + i)->waitNumber2 == pic->waitNumber1) {
-				(icList + i)->waitNumber2 = 0;
+			if ((g_icList + i)->waitNumber2 == pic->waitNumber1) {
+				(g_icList + i)->waitNumber2 = 0;
 				break;
 			}
 		}
@@ -274,10 +274,10 @@ static void FreeWaitCheck(PINT_CONTEXT pic, bool bVoluntary) {
 	// Is someone waiting for this?
 	if (pic->waitNumber2) {
 		for (i = 0; i < NUM_INTERPRET; i++) {
-			if ((icList + i)->waitNumber1 == pic->waitNumber2) {
-				(icList + i)->waitNumber1 = 0;
-				(icList + i)->resumeCode = bVoluntary ? RES_FINISHED : RES_CUTSHORT;
-				g_scheduler->reschedule((icList + i)->pProc);
+			if ((g_icList + i)->waitNumber1 == pic->waitNumber2) {
+				(g_icList + i)->waitNumber1 = 0;
+				(g_icList + i)->resumeCode = bVoluntary ? RES_FINISHED : RES_CUTSHORT;
+				g_scheduler->reschedule((g_icList + i)->pProc);
 				break;
 			}
 		}
@@ -305,7 +305,7 @@ void FreeInterpretContextPr(PROCESS *pProc) {
 	INT_CONTEXT *pic;
 	int	i;
 
-	for (i = 0, pic = icList; i < NUM_INTERPRET; i++, pic++) {
+	for (i = 0, pic = g_icList; i < NUM_INTERPRET; i++, pic++) {
 		if (pic->GSort != GS_NONE && pic->pProc == pProc) {
 			FreeWaitCheck(pic, false);
 			if (TinselV2)
@@ -323,7 +323,7 @@ void FreeMostInterpretContexts() {
 	INT_CONTEXT *pic;
 	int	i;
 
-	for (i = 0, pic = icList; i < NUM_INTERPRET; i++, pic++) {
+	for (i = 0, pic = g_icList; i < NUM_INTERPRET; i++, pic++) {
 		if ((pic->GSort != GS_MASTER) && (pic->GSort != GS_GPROCESS)) {
 			memset(pic, 0, sizeof(INT_CONTEXT));
 			pic->GSort = GS_NONE;
@@ -338,7 +338,7 @@ void FreeMasterInterpretContext() {
 	INT_CONTEXT *pic;
 	int	i;
 
-	for (i = 0, pic = icList; i < NUM_INTERPRET; i++, pic++)	{
+	for (i = 0, pic = g_icList; i < NUM_INTERPRET; i++, pic++)	{
 		if ((pic->GSort == GS_MASTER) || (pic->GSort == GS_GPROCESS)) {
 			memset(pic, 0, sizeof(INT_CONTEXT));
 			pic->GSort = GS_NONE;
@@ -405,30 +405,30 @@ INT_CONTEXT *RestoreInterpretContext(INT_CONTEXT *ric) {
  * Allocates enough RAM to hold the global Glitter variables.
  */
 void RegisterGlobals(int num) {
-	if (pGlobals == NULL) {
-		numGlobals = num;
+	if (g_pGlobals == NULL) {
+		g_numGlobals = num;
 
-		hMasterScript = !TinselV2 ? 0 :
+		g_hMasterScript = !TinselV2 ? 0 :
 			READ_LE_UINT32(FindChunk(MASTER_SCNHANDLE, CHUNK_MASTER_SCRIPT));
 
 		// Allocate RAM for pGlobals and make sure it's allocated
-		pGlobals = (int32 *)calloc(numGlobals, sizeof(int32));
-		if (pGlobals == NULL) {
+		g_pGlobals = (int32 *)calloc(g_numGlobals, sizeof(int32));
+		if (g_pGlobals == NULL) {
 			error("Cannot allocate memory for global data");
 		}
 
 		// Allocate RAM for interpret contexts and make sure it's allocated
-		icList = (INT_CONTEXT *)calloc(NUM_INTERPRET, sizeof(INT_CONTEXT));
-		if (icList == NULL) {
+		g_icList = (INT_CONTEXT *)calloc(NUM_INTERPRET, sizeof(INT_CONTEXT));
+		if (g_icList == NULL) {
 			error("Cannot allocate memory for interpret contexts");
 		}
 		g_scheduler->setResourceCallback(FreeInterpretContextPr);
 	} else {
 		// Check size is still the same
-		assert(numGlobals == num);
+		assert(g_numGlobals == num);
 
-		memset(pGlobals, 0, numGlobals * sizeof(int32));
-		memset(icList, 0, NUM_INTERPRET * sizeof(INT_CONTEXT));
+		memset(g_pGlobals, 0, g_numGlobals * sizeof(int32));
+		memset(g_icList, 0, NUM_INTERPRET * sizeof(INT_CONTEXT));
 	}
 
 	if (TinselV2) {
@@ -444,7 +444,7 @@ void RegisterGlobals(int num) {
 			error(FILE_IS_CORRUPT, GLOBALS_FILENAME);
 
 		for (int i = 0; i < length; ++i)
-			pGlobals[i] = f.readSint32LE();
+			g_pGlobals[i] = f.readSint32LE();
 
 		if (f.eos() || f.err())
 			error(FILE_IS_CORRUPT, GLOBALS_FILENAME);
@@ -454,19 +454,19 @@ void RegisterGlobals(int num) {
 }
 
 void FreeGlobals() {
-	free(pGlobals);
-	pGlobals = NULL;
+	free(g_pGlobals);
+	g_pGlobals = NULL;
 
-	free(icList);
-	icList = NULL;
+	free(g_icList);
+	g_icList = NULL;
 }
 
 /**
  * (Un)serialize the global data for save/restore game.
  */
 void syncGlobInfo(Common::Serializer &s) {
-	for (int i = 0; i < numGlobals; i++) {
-		s.syncAsSint32LE(pGlobals[i]);
+	for (int i = 0; i < g_numGlobals; i++) {
+		s.syncAsSint32LE(g_pGlobals[i]);
 	}
 }
 
@@ -502,7 +502,7 @@ void INT_CONTEXT::syncWithSerializer(Common::Serializer &s) {
  * Return pointer to and size of global data for save/restore game.
  */
 void SaveInterpretContexts(INT_CONTEXT *sICInfo) {
-	memcpy(sICInfo, icList, NUM_INTERPRET * sizeof(INT_CONTEXT));
+	memcpy(sICInfo, g_icList, NUM_INTERPRET * sizeof(INT_CONTEXT));
 }
 
 /**
@@ -633,8 +633,8 @@ void Interpret(CORO_PARAM, INT_CONTEXT *ic) {
 		case OP_GLOAD:				// loads global variable onto stack
 
 			tmp = Fetch(opcode, ic->code, wkEntry, ip);
-			assert(0 <= tmp && tmp < numGlobals);
-			ic->stack[++ic->sp] = pGlobals[tmp];
+			assert(0 <= tmp && tmp < g_numGlobals);
+			ic->stack[++ic->sp] = g_pGlobals[tmp];
 			break;
 
 		case OP_STORE:				// pops stack and stores in local variable
@@ -645,8 +645,8 @@ void Interpret(CORO_PARAM, INT_CONTEXT *ic) {
 		case OP_GSTORE:				// pops stack and stores in global variable
 
 			tmp = Fetch(opcode, ic->code, wkEntry, ip);
-			assert(0 <= tmp && tmp < numGlobals);
-			pGlobals[tmp] = ic->stack[ic->sp--];
+			assert(0 <= tmp && tmp < g_numGlobals);
+			g_pGlobals[tmp] = ic->stack[ic->sp--];
 			break;
 
 		case OP_CALL:				// procedure call
@@ -809,7 +809,7 @@ void Interpret(CORO_PARAM, INT_CONTEXT *ic) {
 			break;
 
 		case OP_ESCON:
-			bNoPause = true;
+			g_bNoPause = true;
 			ic->escOn = true;
 			ic->myEscape = GetEscEvents();
 			break;
@@ -856,8 +856,8 @@ static uint32 UniqueWaitNumber() {
 			retval = (uint32)-1;
 
 		for (i = 0; i < NUM_INTERPRET; i++) {
-			if ((icList+i)->waitNumber1 == retval
-			 || (icList+i)->waitNumber2 == retval)
+			if ((g_icList+i)->waitNumber1 == retval
+			 || (g_icList+i)->waitNumber2 == retval)
 				break;
 		}
 
@@ -887,7 +887,7 @@ void WaitInterpret(CORO_PARAM, PPROCESS pWaitProc, bool *result) {
 
 	CORO_BEGIN_CODE(_ctx);
 
-	for (i = 0, _ctx->picWaiter = icList; i < NUM_INTERPRET; i++, _ctx->picWaiter++) {
+	for (i = 0, _ctx->picWaiter = g_icList; i < NUM_INTERPRET; i++, _ctx->picWaiter++) {
 		if (_ctx->picWaiter->GSort != GS_NONE && _ctx->picWaiter->pProc == currentProcess) {
 			break;
 		}
@@ -896,7 +896,7 @@ void WaitInterpret(CORO_PARAM, PPROCESS pWaitProc, bool *result) {
 	/*
 	 * Find the interpret context of the process we're waiting for
 	 */
-	for (i = 0, _ctx->picWaitee = icList; i < NUM_INTERPRET; i++, _ctx->picWaitee++) {
+	for (i = 0, _ctx->picWaitee = g_icList; i < NUM_INTERPRET; i++, _ctx->picWaitee++) {
 		if (_ctx->picWaitee->GSort != GS_NONE && _ctx->picWaitee->pProc == pWaitProc) {
 			break;
 		}
@@ -931,11 +931,11 @@ void CheckOutWaiters() {
 	// Check all waited for have someone waiting
 	for (i = 0; i < NUM_INTERPRET; i++)	{
 		// If someone is supposedly waiting for this one
-		if ((icList + i)->GSort != GS_NONE && (icList + i)->waitNumber2) {
+		if ((g_icList + i)->GSort != GS_NONE && (g_icList + i)->waitNumber2) {
 			// Someone really must be waiting for this one
 			for (j = 0; j < NUM_INTERPRET; j++) {
-				if ((icList + j)->GSort != GS_NONE
-				 && (icList + j)->waitNumber1 == (icList + i)->waitNumber2) {
+				if ((g_icList + j)->GSort != GS_NONE
+				 && (g_icList + j)->waitNumber1 == (g_icList + i)->waitNumber2) {
 					break;
 				}
 			}
@@ -946,11 +946,11 @@ void CheckOutWaiters() {
 	// Check waiting for someone to wait for
 	for (i = 0; i < NUM_INTERPRET; i++) {
 		// If someone is supposedly waiting for this one
-		if ((icList + i)->GSort != GS_NONE && (icList + i)->waitNumber1) {
+		if ((g_icList + i)->GSort != GS_NONE && (g_icList + i)->waitNumber1) {
 			// Someone really must be waiting for this one
 			for (j = 0; j < NUM_INTERPRET; j++) {
-				if ((icList + j)->GSort != GS_NONE
-				 && (icList + j)->waitNumber2 == (icList + i)->waitNumber1) {
+				if ((g_icList + j)->GSort != GS_NONE
+				 && (g_icList + j)->waitNumber2 == (g_icList + i)->waitNumber1) {
 					break;
 				}
 			}
diff --git a/engines/tinsel/pdisplay.cpp b/engines/tinsel/pdisplay.cpp
index 7439c6f77d..9a9e6ab00f 100644
--- a/engines/tinsel/pdisplay.cpp
+++ b/engines/tinsel/pdisplay.cpp
@@ -50,7 +50,7 @@ namespace Tinsel {
 #ifdef DEBUG
 //extern int Overrun;		// The overrun counter, in DOS_DW.C
 
-extern int newestString;	// The overrun counter, in STRRES.C
+extern int g_newestString;	// The overrun counter, in STRRES.C
 #endif
 
 
@@ -73,17 +73,17 @@ enum HotSpotTag {
 
 // FIXME: Avoid non-const global vars
 
-static bool DispPath = false;
-static bool bShowString = false;
+static bool g_DispPath = false;
+static bool g_bShowString = false;
 
-static int	TaggedActor = 0;
-static HPOLYGON	hTaggedPolygon = NOPOLY;
+static int	g_TaggedActor = 0;
+static HPOLYGON	g_hTaggedPolygon = NOPOLY;
 
-static bool bTagsActive = true;
+static bool g_bTagsActive = true;
 
-static bool bPointingActive = true;
+static bool g_bPointingActive = true;
 
-static char tagBuffer[64];
+static char g_tagBuffer[64];
 
 #ifdef DEBUG
 /**
@@ -158,7 +158,7 @@ void CursorPositionProcess(CORO_PARAM, const void *) {
 			sprintf(PositionString, "%d %d", aniX + Loffset, aniY + Toffset);
 			_ctx->cpText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), PositionString,
 						0, CPOSX, POSY, GetTagFontHandle(), TXT_CENTER);
-			if (DispPath) {
+			if (g_DispPath) {
 				HPOLYGON hp = InPolygon(aniX + Loffset, aniY + Toffset, PATH);
 				if (hp == NOPOLY)
 					sprintf(PositionString, "No path");
@@ -226,18 +226,18 @@ void CursorPositionProcess(CORO_PARAM, const void *) {
 		/*-------------*\
 		| String number	|
 		\*-------------*/
-		if (bShowString && newestString != _ctx->prevString) {
+		if (g_bShowString && g_newestString != _ctx->prevString) {
 			// kill current text objects
 			if (_ctx->spText) {
 				MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), _ctx->spText);
 			}
 
-			sprintf(PositionString, "String: %d", newestString);
+			sprintf(PositionString, "String: %d", g_newestString);
 			_ctx->spText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), PositionString,
 						0, SPOSX, POSY+10, GetTalkFontHandle(), TXT_CENTER);
 
 			// update previous value
-			_ctx->prevString = newestString;
+			_ctx->prevString = g_newestString;
 		}
 
 		// update previous playfield position
@@ -257,7 +257,7 @@ void DisablePointing() {
 	int	i;
 	HPOLYGON hPoly;		// Polygon handle
 
-	bPointingActive = false;
+	g_bPointingActive = false;
 
 	for (i = 0; i < MAX_POLY; i++)	{
 		hPoly = GetPolyHandle(i);
@@ -284,7 +284,7 @@ void DisablePointing() {
  * EnablePointing()
  */
 void EnablePointing() {
-	bPointingActive = true;
+	g_bPointingActive = true;
 }
 
 /**
@@ -292,7 +292,7 @@ void EnablePointing() {
  * (if one is). Tag process asks us for this information, as does ProcessUserEvent().
  */
 static void SaveTaggedActor(int ano) {
-	TaggedActor = ano;
+	g_TaggedActor = ano;
 }
 
 /**
@@ -300,7 +300,7 @@ static void SaveTaggedActor(int ano) {
  * (if one is). Tag process asks us for this information, as does ProcessUserEvent().
  */
 int GetTaggedActor() {
-	return TaggedActor;
+	return g_TaggedActor;
 }
 
 /**
@@ -308,11 +308,11 @@ int GetTaggedActor() {
  * (if one is). Tag process asks us for this information, as does ProcessUserEvent().
  */
 static void SaveTaggedPoly(HPOLYGON hp) {
-	hTaggedPolygon = hp;
+	g_hTaggedPolygon = hp;
 }
 
 HPOLYGON GetTaggedPoly() {
-	return hTaggedPolygon;
+	return g_hTaggedPolygon;
 }
 
 /**
@@ -405,11 +405,11 @@ static bool ActorTag(int curX, int curY, HotSpotTag *pTag, OBJECT **ppText) {
 
 			if (ActorTagIsWanted(actor)) {
 				GetActorTagPos(actor, &tagX, &tagY, false);
-				LoadStringRes(GetActorTagHandle(actor), tagBuffer, sizeof(tagBuffer));
+				LoadStringRes(GetActorTagHandle(actor), g_tagBuffer, sizeof(g_tagBuffer));
 
 				// May have buggered cursor
 				EndCursorFollowed();
-				*ppText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), tagBuffer,
+				*ppText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), g_tagBuffer,
 						0, tagX, tagY, GetTagFontHandle(), TXT_CENTER, 0);
 				assert(*ppText);
 				MultiSetZPosition(*ppText, Z_TAG_TEXT);
@@ -653,7 +653,7 @@ void TagProcess(CORO_PARAM, const void *) {
 	SaveTaggedPoly(NOPOLY);		// No tagged polygon yet
 
 	while (1) {
-		if (bTagsActive) {
+		if (g_bTagsActive) {
 			int	curX, curY;	// cursor position
 			while (!GetCursorXYNoWait(&curX, &curY, true))
 				CORO_SLEEP(1);
@@ -804,7 +804,7 @@ void PointProcess(CORO_PARAM, const void *) {
 			// allow re-scheduling
 			do {
 				CORO_SLEEP(1);
-			} while (!bPointingActive);
+			} while (!g_bPointingActive);
 		} else {
 			// allow re-scheduling
 			CORO_SLEEP(1);
@@ -815,15 +815,15 @@ void PointProcess(CORO_PARAM, const void *) {
 }
 
 void DisableTags() {
-	bTagsActive = false;
+	g_bTagsActive = false;
 }
 
 void EnableTags() {
-	bTagsActive = true;
+	g_bTagsActive = true;
 }
 
 bool DisableTagsIfEnabled() {
-	if (bTagsActive) {
+	if (g_bTagsActive) {
 		DisableTags();
 		return true;
 	} else
@@ -836,12 +836,12 @@ bool DisableTagsIfEnabled() {
  * cursor is in.
  */
 void TogglePathDisplay() {
-	DispPath ^= 1;	// Toggle path display (XOR with true)
+	g_DispPath ^= 1;	// Toggle path display (XOR with true)
 }
 
 
 void setshowstring() {
-	bShowString = true;
+	g_bShowString = true;
 }
 
 } // End of namespace Tinsel
diff --git a/engines/tinsel/play.cpp b/engines/tinsel/play.cpp
index 71e07721a6..40729d9f3a 100644
--- a/engines/tinsel/play.cpp
+++ b/engines/tinsel/play.cpp
@@ -62,10 +62,10 @@ struct PPINIT {
 
 // FIXME: Avoid non-const global vars
 
-static SOUNDREELS soundReels[MAX_SOUNDREELS];
-static int soundReelNumbers[MAX_SOUNDREELS];
+static SOUNDREELS g_soundReels[MAX_SOUNDREELS];
+static int g_soundReelNumbers[MAX_SOUNDREELS];
 
-static int soundReelWait;
+static int g_soundReelWait;
 
 //-------------------- METHODS ----------------------
 
@@ -148,31 +148,31 @@ static int RegisterSoundReel(SCNHANDLE hFilm, int column, int actorCol) {
 
 	for (i = 0; i < MAX_SOUNDREELS; i++) {
 		// Should assert this doesn't happen, but let's be tolerant
-		if (soundReels[i].hFilm == hFilm && soundReels[i].column == column)
+		if (g_soundReels[i].hFilm == hFilm && g_soundReels[i].column == column)
 			break;
 
-		if (!soundReels[i].hFilm) {
-			soundReels[i].hFilm = hFilm;
-			soundReels[i].column = column;
-			soundReels[i].actorCol = actorCol;
+		if (!g_soundReels[i].hFilm) {
+			g_soundReels[i].hFilm = hFilm;
+			g_soundReels[i].column = column;
+			g_soundReels[i].actorCol = actorCol;
 			break;
 		}
 	}
 
-	soundReelNumbers[i]++;
+	g_soundReelNumbers[i]++;
 	return i;
 }
 
 void NoSoundReels() {
-	memset(soundReels, 0, sizeof(soundReels));
-	soundReelWait = 0;
+	memset(g_soundReels, 0, sizeof(g_soundReels));
+	g_soundReelWait = 0;
 }
 
 static void DeRegisterSoundReel(SCNHANDLE hFilm, int column) {
 	for (int i = 0; i < MAX_SOUNDREELS; i++) {
 		// Should assert this doesn't happen, but let's be tolerant
-		if (soundReels[i].hFilm == hFilm && soundReels[i].column == column) {
-			soundReels[i].hFilm = 0;
+		if (g_soundReels[i].hFilm == hFilm && g_soundReels[i].column == column) {
+			g_soundReels[i].hFilm = 0;
 			break;
 		}
 	}
@@ -180,15 +180,15 @@ static void DeRegisterSoundReel(SCNHANDLE hFilm, int column) {
 
 void SaveSoundReels(PSOUNDREELS psr) {
 	for (int i = 0; i < MAX_SOUNDREELS; i++) {
-		if (IsCdPlayHandle(soundReels[i].hFilm))
-			soundReels[i].hFilm = 0;
+		if (IsCdPlayHandle(g_soundReels[i].hFilm))
+			g_soundReels[i].hFilm = 0;
 	}
 
-	memcpy(psr, soundReels, sizeof(soundReels));
+	memcpy(psr, g_soundReels, sizeof(g_soundReels));
 }
 
 void RestoreSoundReels(PSOUNDREELS psr) {
-	memcpy(soundReels, psr, sizeof(soundReels));
+	memcpy(g_soundReels, psr, sizeof(g_soundReels));
 }
 
 static uint32 GetZfactor(int actorID, PMOVER pMover, bool bNewMover) {
@@ -245,7 +245,7 @@ static void SoundReel(CORO_PARAM, SCNHANDLE hFilm, int column, int speed,
 	_ctx->bFinished = false;
 	_ctx->bLooped = false;
 	_ctx->myId = RegisterSoundReel(hFilm, column, actorCol);
-	_ctx->myNum = soundReelNumbers[_ctx->myId];
+	_ctx->myNum = g_soundReelNumbers[_ctx->myId];
 
 	do {
 		pFilm = (FILM *)LockMem(hFilm);
@@ -366,10 +366,10 @@ static void SoundReel(CORO_PARAM, SCNHANDLE hFilm, int column, int speed,
 
 			_ctx->bFinished = true;
 		}
-	} while (!_ctx->bFinished && _ctx->myNum == soundReelNumbers[_ctx->myId]);
+	} while (!_ctx->bFinished && _ctx->myNum == g_soundReelNumbers[_ctx->myId]);
 
 	// De-register - if not been replaced
-	if (_ctx->myNum == soundReelNumbers[_ctx->myId])
+	if (_ctx->myNum == g_soundReelNumbers[_ctx->myId])
 		DeRegisterSoundReel(hFilm, column);
 
 	CORO_END_CODE;
@@ -384,17 +384,17 @@ static void ResSoundReel(CORO_PARAM, const void *param) {
 
 	CORO_BEGIN_CODE(_ctx);
 
-	CORO_INVOKE_ARGS(SoundReel, (CORO_SUBCTX, soundReels[i].hFilm, soundReels[i].column,
-		-1, 0, soundReels[i].actorCol));
+	CORO_INVOKE_ARGS(SoundReel, (CORO_SUBCTX, g_soundReels[i].hFilm, g_soundReels[i].column,
+		-1, 0, g_soundReels[i].actorCol));
 
 	CORO_KILL_SELF();
 	CORO_END_CODE;
 }
 
 static void SoundReelWaitCheck() {
-	if (--soundReelWait == 0) {
+	if (--g_soundReelWait == 0) {
 		for (int i = 0; i < MAX_SOUNDREELS; i++) {
-			if (soundReels[i].hFilm) {
+			if (g_soundReels[i].hFilm) {
 				g_scheduler->createProcess(PID_REEL, ResSoundReel, &i, sizeof(i));
 			}
 		}
@@ -1162,7 +1162,7 @@ void RestoreActorReels(SCNHANDLE hFilm, int actor, int x, int y) {
 			// Start display process for the reel
 			g_scheduler->createProcess(PID_REEL, PlayProcess, &ppi, sizeof(ppi));
 
-			soundReelWait++;
+			g_soundReelWait++;
 		}
 	}
 }
diff --git a/engines/tinsel/rince.cpp b/engines/tinsel/rince.cpp
index ca196aac92..bb0aeabd2f 100644
--- a/engines/tinsel/rince.cpp
+++ b/engines/tinsel/rince.cpp
@@ -51,7 +51,7 @@ namespace Tinsel {
 
 //----------------- LOCAL GLOBAL DATA --------------------
 
-static MOVER Movers[MAX_MOVERS];	// FIXME: Avoid non-const global vars
+static MOVER g_Movers[MAX_MOVERS];	// FIXME: Avoid non-const global vars
 
 //----------------- FUNCTIONS ----------------------------
 
@@ -115,7 +115,7 @@ void MoverBrightness(PMOVER pMover, int brightness) {
  * RebootMovers
  */
 void RebootMovers() {
-	memset(Movers, 0, sizeof(Movers));
+	memset(g_Movers, 0, sizeof(g_Movers));
 }
 
 /**
@@ -127,11 +127,11 @@ PMOVER GetMover(int ano) {
 
 	// Slot 0 is reserved for lead actor
 	if (ano == GetLeadId() || ano == LEAD_ACTOR)
-		return &Movers[0];
+		return &g_Movers[0];
 
 	for (i = 1; i < MAX_MOVERS; i++)
-		if (Movers[i].actorID == ano)
-			return &Movers[i];
+		if (g_Movers[i].actorID == ano)
+			return &g_Movers[i];
 
 	return NULL;
 }
@@ -144,25 +144,25 @@ PMOVER RegisterMover(int ano) {
 
 	// Slot 0 is reserved for lead actor
 	if (ano == GetLeadId() || ano == LEAD_ACTOR) {
-		Movers[0].actorToken = TOKEN_LEAD;
-		Movers[0].actorID = GetLeadId();
-		return &Movers[0];
+		g_Movers[0].actorToken = TOKEN_LEAD;
+		g_Movers[0].actorID = GetLeadId();
+		return &g_Movers[0];
 	}
 
 	// Check it hasn't already been declared
 	for (i = 1; i < MAX_MOVERS; i++) {
-		if (Movers[i].actorID == ano) {
+		if (g_Movers[i].actorID == ano) {
 			// Actor is already a moving actor
-			return &Movers[i];
+			return &g_Movers[i];
 		}
 	}
 
 	// Find an empty slot
 	for (i = 1; i < MAX_MOVERS; i++)
-		if (!Movers[i].actorID) {
-			Movers[i].actorToken = TOKEN_LEAD + i;
-			Movers[i].actorID = ano;
-			return &Movers[i];
+		if (!g_Movers[i].actorID) {
+			g_Movers[i].actorToken = TOKEN_LEAD + i;
+			g_Movers[i].actorID = ano;
+			return &g_Movers[i];
 		}
 
 	error("Too many moving actors");
@@ -176,8 +176,8 @@ PMOVER RegisterMover(int ano) {
 PMOVER GetLiveMover(int index) {
 	assert(index >= 0 && index < MAX_MOVERS); // out of range
 
-	if (Movers[index].bActive)
-		return &Movers[index];
+	if (g_Movers[index].bActive)
+		return &g_Movers[index];
 	else
 		return NULL;
 }
@@ -185,13 +185,13 @@ PMOVER GetLiveMover(int index) {
 bool IsMAinEffectPoly(int index) {
 	assert(index >= 0 && index < MAX_MOVERS); // out of range
 
-	return Movers[index].bInEffect;
+	return g_Movers[index].bInEffect;
 }
 
 void SetMoverInEffect(int index, bool tf) {
 	assert(index >= 0 && index < MAX_MOVERS); // out of range
 
-	Movers[index].bInEffect = tf;
+	g_Movers[index].bInEffect = tf;
 }
 
 /**
@@ -392,7 +392,7 @@ static void InitMover(PMOVER pMover) {
  */
 void DropMovers() {
 	for (int i = 0; i < MAX_MOVERS; i++)
-		InitMover(&Movers[i]);
+		InitMover(&g_Movers[i]);
 }
 
 
@@ -880,30 +880,30 @@ PMOVER InMoverBlock(PMOVER pMover, int x, int y) {
 	caR = GetMoverRight(pMover) + x - caX;
 
 	for (int i = 0; i < MAX_MOVERS; i++) {
-		if (pMover == &Movers[i] ||
-				(TinselV2 && (Movers[i].actorObj == NULL)) ||
-				(!TinselV2 && !Movers[i].bActive))
+		if (pMover == &g_Movers[i] ||
+				(TinselV2 && (g_Movers[i].actorObj == NULL)) ||
+				(!TinselV2 && !g_Movers[i].bActive))
 			continue;
 
 		// At around the same height?
-		GetMoverPosition(&Movers[i], &taX, &taY);
-		if (Movers[i].hFnpath != NOPOLY)
+		GetMoverPosition(&g_Movers[i], &taX, &taY);
+		if (g_Movers[i].hFnpath != NOPOLY)
 			continue;
 
 		if (ABS(y - taY) > 2)	// 2 was 8
 			continue;
 
 		// To the left?
-		taL = GetMoverLeft(&Movers[i]);
+		taL = GetMoverLeft(&g_Movers[i]);
 		if (caR <= taL)
 			continue;
 
 		// To the right?
-		taR = GetMoverRight(&Movers[i]);
+		taR = GetMoverRight(&g_Movers[i]);
 		if (caL >= taR)
 			continue;
 
-		return &Movers[i];
+		return &g_Movers[i];
 	}
 	return NULL;
 }
@@ -913,33 +913,33 @@ PMOVER InMoverBlock(PMOVER pMover, int x, int y) {
  */
 void SaveMovers(SAVED_MOVER *sMoverInfo) {
 	for (int i = 0; i < MAX_MOVERS; i++) {
-		sMoverInfo[i].bActive = !TinselV2 ? Movers[i].bActive : Movers[i].actorObj != NULL;
-		sMoverInfo[i].actorID	= Movers[i].actorID;
-		sMoverInfo[i].objX	= Movers[i].objX;
-		sMoverInfo[i].objY	= Movers[i].objY;
-		sMoverInfo[i].hLastfilm	= Movers[i].hLastFilm;
+		sMoverInfo[i].bActive = !TinselV2 ? g_Movers[i].bActive : g_Movers[i].actorObj != NULL;
+		sMoverInfo[i].actorID	= g_Movers[i].actorID;
+		sMoverInfo[i].objX	= g_Movers[i].objX;
+		sMoverInfo[i].objY	= g_Movers[i].objY;
+		sMoverInfo[i].hLastfilm	= g_Movers[i].hLastFilm;
 
 		if (TinselV2) {
-			sMoverInfo[i].bHidden = Movers[i].bHidden;
-			sMoverInfo[i].brightness = Movers[i].brightness;
-			sMoverInfo[i].startColor = Movers[i].startColor;
-			sMoverInfo[i].paletteLength = Movers[i].paletteLength;
+			sMoverInfo[i].bHidden = g_Movers[i].bHidden;
+			sMoverInfo[i].brightness = g_Movers[i].brightness;
+			sMoverInfo[i].startColor = g_Movers[i].startColor;
+			sMoverInfo[i].paletteLength = g_Movers[i].paletteLength;
 		}
 
-		memcpy(sMoverInfo[i].walkReels, Movers[i].walkReels, TOTAL_SCALES * 4 * sizeof(SCNHANDLE));
-		memcpy(sMoverInfo[i].standReels, Movers[i].standReels, TOTAL_SCALES * 4 * sizeof(SCNHANDLE));
-		memcpy(sMoverInfo[i].talkReels, Movers[i].talkReels, TOTAL_SCALES * 4 * sizeof(SCNHANDLE));
+		memcpy(sMoverInfo[i].walkReels, g_Movers[i].walkReels, TOTAL_SCALES * 4 * sizeof(SCNHANDLE));
+		memcpy(sMoverInfo[i].standReels, g_Movers[i].standReels, TOTAL_SCALES * 4 * sizeof(SCNHANDLE));
+		memcpy(sMoverInfo[i].talkReels, g_Movers[i].talkReels, TOTAL_SCALES * 4 * sizeof(SCNHANDLE));
 	}
 }
 
 void RestoreAuxScales(SAVED_MOVER *sMoverInfo) {
 	for (int i = 0; i < MAX_MOVERS; i++) {
 		if (TinselV2)
-			Movers[i].actorID = sMoverInfo[i].actorID;
+			g_Movers[i].actorID = sMoverInfo[i].actorID;
 
-		memcpy(Movers[i].walkReels, sMoverInfo[i].walkReels, TOTAL_SCALES * 4 * sizeof(SCNHANDLE));
-		memcpy(Movers[i].standReels, sMoverInfo[i].standReels, TOTAL_SCALES * 4 * sizeof(SCNHANDLE));
-		memcpy(Movers[i].talkReels, sMoverInfo[i].talkReels, TOTAL_SCALES * 4 * sizeof(SCNHANDLE));
+		memcpy(g_Movers[i].walkReels, sMoverInfo[i].walkReels, TOTAL_SCALES * 4 * sizeof(SCNHANDLE));
+		memcpy(g_Movers[i].standReels, sMoverInfo[i].standReels, TOTAL_SCALES * 4 * sizeof(SCNHANDLE));
+		memcpy(g_Movers[i].talkReels, sMoverInfo[i].talkReels, TOTAL_SCALES * 4 * sizeof(SCNHANDLE));
 	}
 }
 
@@ -950,10 +950,10 @@ PMOVER NextMover(PMOVER pMover) {
 	if (pMover == NULL)
 		next = 0;
 	else
-		next = pMover - Movers + 1;
+		next = pMover - g_Movers + 1;
 
-	if (Movers[next].actorID)
-		return &Movers[next];
+	if (g_Movers[next].actorID)
+		return &g_Movers[next];
 	else
 		return NULL;
 }
diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp
index f8598c05f8..0a552c8c2b 100644
--- a/engines/tinsel/saveload.cpp
+++ b/engines/tinsel/saveload.cpp
@@ -68,9 +68,9 @@ namespace Tinsel {
 
 //----------------- GLOBAL GLOBAL DATA --------------------
 
-int	thingHeld = 0;
-int	restoreCD = 0;
-SRSTATE SRstate = SR_IDLE;
+int	g_thingHeld = 0;
+int	g_restoreCD = 0;
+SRSTATE g_SRstate = SR_IDLE;
 
 //----------------- EXTERN FUNCTIONS --------------------
 
@@ -83,9 +83,9 @@ extern void syncGlobInfo(Common::Serializer &s);
 // in POLYGONS.C
 extern void syncPolyInfo(Common::Serializer &s);
 
-extern int sceneCtr;
+extern int g_sceneCtr;
 
-extern bool ASceneIsSaved;
+extern bool g_ASceneIsSaved;
 
 //----------------- LOCAL DEFINES --------------------
 
@@ -123,21 +123,23 @@ struct SFILES {
 
 // FIXME: Avoid non-const global vars
 
-static int	numSfiles = 0;
-static SFILES	savedFiles[MAX_SAVED_FILES];
+static int	g_numSfiles = 0;
+static SFILES	g_savedFiles[MAX_SAVED_FILES];
 
-static bool NeedLoad = true;
+static bool g_NeedLoad = true;
 
-static SAVED_DATA *srsd = 0;
-static int RestoreGameNumber = 0;
-static char *SaveSceneName = 0;
-static const char *SaveSceneDesc = 0;
-static int *SaveSceneSsCount = 0;
-static SAVED_DATA *SaveSceneSsData = 0;	// points to 'SAVED_DATA ssdata[MAX_NEST]'
+static SAVED_DATA *g_srsd = 0;
+static int g_RestoreGameNumber = 0;
+static char *g_SaveSceneName = 0;
+static const char *g_SaveSceneDesc = 0;
+static int *g_SaveSceneSsCount = 0;
+static SAVED_DATA *g_SaveSceneSsData = 0;	// points to 'SAVED_DATA ssdata[MAX_NEST]'
 
 //------------- SAVE/LOAD SUPPORT METHODS ----------------
 
-void setNeedLoad() { NeedLoad = true; }
+void setNeedLoad() {
+	g_NeedLoad = true;
+}
 
 static void syncTime(Common::Serializer &s, TimeDate &t) {
 	s.syncAsUint16LE(t.tm_year);
@@ -345,18 +347,18 @@ static int cmpTimeDate(const TimeDate &a, const TimeDate &b) {
 int getList(Common::SaveFileManager *saveFileMan, const Common::String &target) {
 	// No change since last call?
 	// TODO/FIXME: Just always reload this data? Be careful about slow downs!!!
-	if (!NeedLoad)
-		return numSfiles;
+	if (!g_NeedLoad)
+		return g_numSfiles;
 
 	int i;
 
 	const Common::String pattern = target +  ".???";
 	Common::StringArray files = saveFileMan->listSavefiles(pattern);
 
-	numSfiles = 0;
+	g_numSfiles = 0;
 
 	for (Common::StringArray::const_iterator file = files.begin(); file != files.end(); ++file) {
-		if (numSfiles >= MAX_SAVED_FILES)
+		if (g_numSfiles >= MAX_SAVED_FILES)
 			break;
 
 		const Common::String &fname = *file;
@@ -376,46 +378,46 @@ int getList(Common::SaveFileManager *saveFileMan, const Common::String &target)
 			// "incompatible version".
 		}
 
-		i = numSfiles;
+		i = g_numSfiles;
 #ifndef DISABLE_SAVEGAME_SORTING
-		for (i = 0; i < numSfiles; i++) {
-			if (cmpTimeDate(hdr.dateTime, savedFiles[i].dateTime) > 0) {
-				Common::copy_backward(&savedFiles[i], &savedFiles[numSfiles], &savedFiles[numSfiles + 1]);
+		for (i = 0; i < g_numSfiles; i++) {
+			if (cmpTimeDate(hdr.dateTime, g_savedFiles[i].dateTime) > 0) {
+				Common::copy_backward(&g_savedFiles[i], &g_savedFiles[g_numSfiles], &g_savedFiles[g_numSfiles + 1]);
 				break;
 			}
 		}
 #endif
 
-		Common::strlcpy(savedFiles[i].name, fname.c_str(), FNAMELEN);
-		Common::strlcpy(savedFiles[i].desc, hdr.desc, SG_DESC_LEN);
-		savedFiles[i].dateTime = hdr.dateTime;
+		Common::strlcpy(g_savedFiles[i].name, fname.c_str(), FNAMELEN);
+		Common::strlcpy(g_savedFiles[i].desc, hdr.desc, SG_DESC_LEN);
+		g_savedFiles[i].dateTime = hdr.dateTime;
 
-		++numSfiles;
+		++g_numSfiles;
 	}
 
 	// Next getList() needn't do its stuff again
-	NeedLoad = false;
+	g_NeedLoad = false;
 
-	return numSfiles;
+	return g_numSfiles;
 }
 
 int getList() {
 	// No change since last call?
 	// TODO/FIXME: Just always reload this data? Be careful about slow downs!!!
-	if (!NeedLoad)
-		return numSfiles;
+	if (!g_NeedLoad)
+		return g_numSfiles;
 
 	return getList(_vm->getSaveFileMan(), _vm->getTargetName());
 }
 
 char *ListEntry(int i, letype which) {
 	if (i == -1)
-		i = numSfiles;
+		i = g_numSfiles;
 
 	assert(i >= 0);
 
-	if (i < numSfiles)
-		return which == LE_NAME ? savedFiles[i].name : savedFiles[i].desc;
+	if (i < g_numSfiles)
+		return which == LE_NAME ? g_savedFiles[i].name : g_savedFiles[i].desc;
 	else
 		return NULL;
 }
@@ -425,14 +427,14 @@ static void DoSync(Common::Serializer &s) {
 
 	if (TinselV2) {
 		if (s.isSaving())
-			restoreCD = GetCurrentCD();
-		s.syncAsSint16LE(restoreCD);
+			g_restoreCD = GetCurrentCD();
+		s.syncAsSint16LE(g_restoreCD);
 	}
 
 	if (TinselV2 && s.isLoading())
 		HoldItem(INV_NOICON);
 
-	syncSavedData(s, *srsd);
+	syncSavedData(s, *g_srsd);
 	syncGlobInfo(s);		// Glitter globals
 	syncInvInfo(s);			// Inventory data
 
@@ -442,7 +444,7 @@ static void DoSync(Common::Serializer &s) {
 	s.syncAsSint32LE(sg);
 	if (s.isLoading()) {
 		if (TinselV2)
-			thingHeld = sg;
+			g_thingHeld = sg;
 		else
 			HoldItem(sg);
 	}
@@ -452,17 +454,17 @@ static void DoSync(Common::Serializer &s) {
 		syncPolyInfo(s);		// Dead polygon data
 	syncSCdata(s);			// Hook Scene and delayed scene
 
-	s.syncAsSint32LE(*SaveSceneSsCount);
+	s.syncAsSint32LE(*g_SaveSceneSsCount);
 
-	if (*SaveSceneSsCount != 0) {
-		SAVED_DATA *sdPtr = SaveSceneSsData;
-		for (int i = 0; i < *SaveSceneSsCount; ++i, ++sdPtr)
+	if (*g_SaveSceneSsCount != 0) {
+		SAVED_DATA *sdPtr = g_SaveSceneSsData;
+		for (int i = 0; i < *g_SaveSceneSsCount; ++i, ++sdPtr)
 			syncSavedData(s, *sdPtr);
 
 		// Flag that there is a saved scene to return to. Note that in this context 'saved scene'
 		// is a stored scene to return to from another scene, such as from the Summoning Book close-up
 		// in Discworld 1 to whatever scene Rincewind was in prior to that
-		ASceneIsSaved = true;
+		g_ASceneIsSaved = true;
 	}
 
 	if (!TinselV2)
@@ -473,7 +475,7 @@ static void DoSync(Common::Serializer &s) {
  * DoRestore
  */
 static bool DoRestore() {
-	Common::InSaveFile *f =  _vm->getSaveFileMan()->openForLoading(savedFiles[RestoreGameNumber].name);
+	Common::InSaveFile *f =  _vm->getSaveFileMan()->openForLoading(g_savedFiles[g_RestoreGameNumber].name);
 
 	if (f == NULL) {
 		return false;
@@ -507,8 +509,8 @@ static bool DoRestore() {
 static void SaveFailure(Common::OutSaveFile *f) {
 	if (f) {
 		delete f;
-		_vm->getSaveFileMan()->removeSavefile(SaveSceneName);
-		SaveSceneName = NULL;	// Invalidate save name
+		_vm->getSaveFileMan()->removeSavefile(g_SaveSceneName);
+		g_SaveSceneName = NULL;	// Invalidate save name
 	}
 	GUI::MessageDialog dialog(_("Failed to save game state to file."));
 	dialog.runModal();
@@ -522,9 +524,9 @@ static void DoSave() {
 	char tmpName[FNAMELEN];
 
 	// Next getList() must do its stuff again
-	NeedLoad = true;
+	g_NeedLoad = true;
 
-	if (SaveSceneName == NULL) {
+	if (g_SaveSceneName == NULL) {
 		// Generate a new unique save name
 		int	i;
 		int	ano = 1;	// Allocated number
@@ -533,23 +535,23 @@ static void DoSave() {
 			Common::String fname = _vm->getSavegameFilename(ano);
 			strcpy(tmpName, fname.c_str());
 
-			for (i = 0; i < numSfiles; i++)
-				if (!strcmp(savedFiles[i].name, tmpName))
+			for (i = 0; i < g_numSfiles; i++)
+				if (!strcmp(g_savedFiles[i].name, tmpName))
 					break;
 
-			if (i == numSfiles)
+			if (i == g_numSfiles)
 				break;
 			ano++;
 		}
 
-		SaveSceneName = tmpName;
+		g_SaveSceneName = tmpName;
 	}
 
 
-	if (SaveSceneDesc[0] == 0)
-		SaveSceneDesc = "unnamed";
+	if (g_SaveSceneDesc[0] == 0)
+		g_SaveSceneDesc = "unnamed";
 
-	f = _vm->getSaveFileMan()->openForSaving(SaveSceneName);
+	f = _vm->getSaveFileMan()->openForSaving(g_SaveSceneName);
 	Common::Serializer s(0, f);
 
 	if (f == NULL) {
@@ -562,7 +564,7 @@ static void DoSave() {
 	hdr.id = SAVEGAME_ID;
 	hdr.size = SAVEGAME_HEADER_SIZE;
 	hdr.ver = CURRENT_VER;
-	memcpy(hdr.desc, SaveSceneDesc, SG_DESC_LEN);
+	memcpy(hdr.desc, g_SaveSceneDesc, SG_DESC_LEN);
 	hdr.desc[SG_DESC_LEN - 1] = 0;
 	g_system->getTimeAndDate(hdr.dateTime);
 	hdr.scnFlag = _vm->getFeatures() & GF_SCNFILES;
@@ -584,28 +586,29 @@ static void DoSave() {
 
 	f->finalize();
 	delete f;
-	SaveSceneName = NULL;	// Invalidate save name
+	g_SaveSceneName = NULL;	// Invalidate save name
 }
 
 /**
  * ProcessSRQueue
  */
 void ProcessSRQueue() {
-	switch (SRstate) {
+	switch (g_SRstate) {
 	case SR_DORESTORE:
 		// If a load has been done directly from title screens, set a larger value for scene ctr so the
 		// code used to skip the title screens in Discworld 1 gets properly disabled
-		if (sceneCtr < 10) sceneCtr = 10;
+		if (g_sceneCtr < 10)
+			g_sceneCtr = 10;
 
 		if (DoRestore()) {
-			DoRestoreScene(srsd, false);
+			DoRestoreScene(g_srsd, false);
 		}
-		SRstate = SR_IDLE;
+		g_SRstate = SR_IDLE;
 		break;
 
 	case SR_DOSAVE:
 		DoSave();
-		SRstate = SR_IDLE;
+		g_SRstate = SR_IDLE;
 		break;
 	default:
 		break;
@@ -614,14 +617,14 @@ void ProcessSRQueue() {
 
 
 void RequestSaveGame(char *name, char *desc, SAVED_DATA *sd, int *pSsCount, SAVED_DATA *pSsData) {
-	assert(SRstate == SR_IDLE);
-
-	SaveSceneName = name;
-	SaveSceneDesc = desc;
-	SaveSceneSsCount = pSsCount;
-	SaveSceneSsData = pSsData;
-	srsd = sd;
-	SRstate = SR_DOSAVE;
+	assert(g_SRstate == SR_IDLE);
+
+	g_SaveSceneName = name;
+	g_SaveSceneDesc = desc;
+	g_SaveSceneSsCount = pSsCount;
+	g_SaveSceneSsData = pSsData;
+	g_srsd = sd;
+	g_SRstate = SR_DOSAVE;
 }
 
 void RequestRestoreGame(int num, SAVED_DATA *sd, int *pSsCount, SAVED_DATA *pSsData) {
@@ -630,17 +633,17 @@ void RequestRestoreGame(int num, SAVED_DATA *sd, int *pSsCount, SAVED_DATA *pSsD
 			return;
 		else if (num == -2) {
 			// From CD change for restore
-			num = RestoreGameNumber;
+			num = g_RestoreGameNumber;
 		}
 	}
 
 	assert(num >= 0);
 
-	RestoreGameNumber = num;
-	SaveSceneSsCount = pSsCount;
-	SaveSceneSsData = pSsData;
-	srsd = sd;
-	SRstate = SR_DORESTORE;
+	g_RestoreGameNumber = num;
+	g_SaveSceneSsCount = pSsCount;
+	g_SaveSceneSsData = pSsData;
+	g_srsd = sd;
+	g_SRstate = SR_DORESTORE;
 }
 
 /**
diff --git a/engines/tinsel/savescn.cpp b/engines/tinsel/savescn.cpp
index 39a8033d45..1b06e3929c 100644
--- a/engines/tinsel/savescn.cpp
+++ b/engines/tinsel/savescn.cpp
@@ -75,29 +75,29 @@ enum {
 
 //----------------- EXTERNAL GLOBAL DATA --------------------
 
-extern int	thingHeld;
-extern int	restoreCD;
-extern SRSTATE SRstate;
+extern int	g_thingHeld;
+extern int	g_restoreCD;
+extern SRSTATE g_SRstate;
 
 //----------------- LOCAL GLOBAL DATA --------------------
 
 // FIXME: Avoid non-const global vars
 
-bool ASceneIsSaved = false;
+bool g_ASceneIsSaved = false;
 
-static int savedSceneCount = 0;
+static int g_savedSceneCount = 0;
 
-static bool bNotDoneYet = false;
+static bool g_bNotDoneYet = false;
 
 //static SAVED_DATA ssData[MAX_NEST];
-static SAVED_DATA *ssData = NULL;
-static SAVED_DATA sgData;
+static SAVED_DATA *g_ssData = NULL;
+static SAVED_DATA g_sgData;
 
-static SAVED_DATA *rsd = 0;
+static SAVED_DATA *g_rsd = 0;
 
-static int RestoreSceneCount = 0;
+static int g_RestoreSceneCount = 0;
 
-static bool bNoFade = false;
+static bool g_bNoFade = false;
 
 //----------------- FORWARD REFERENCES --------------------
 
@@ -133,7 +133,7 @@ void DoSaveScene(SAVED_DATA *sd) {
 		CurrentMidiFacts(&sd->SavedMidi, &sd->SavedLoop);
 	}
 
-	ASceneIsSaved = true;
+	g_ASceneIsSaved = true;
 }
 
 /**
@@ -142,29 +142,29 @@ void DoSaveScene(SAVED_DATA *sd) {
  * @param bFadeOut		Flag to perform a fade out
  */
 void DoRestoreScene(SAVED_DATA *sd, bool bFadeOut) {
-	rsd = sd;
+	g_rsd = sd;
 
 	if (bFadeOut)
-		RestoreSceneCount = RS_COUNT + COUNTOUT_COUNT;	// Set restore scene count
+		g_RestoreSceneCount = RS_COUNT + COUNTOUT_COUNT;	// Set restore scene count
 	else
-		RestoreSceneCount = RS_COUNT;	// Set restore scene count
+		g_RestoreSceneCount = RS_COUNT;	// Set restore scene count
 }
 
 void InitializeSaveScenes() {
-	if (ssData == NULL) {
-		ssData = (SAVED_DATA *)calloc(MAX_NEST, sizeof(SAVED_DATA));
-		if (ssData == NULL) {
+	if (g_ssData == NULL) {
+		g_ssData = (SAVED_DATA *)calloc(MAX_NEST, sizeof(SAVED_DATA));
+		if (g_ssData == NULL) {
 			error("Cannot allocate memory for scene changes");
 		}
 	} else {
 		// Re-initialize - no scenes saved
-		savedSceneCount = 0;
+		g_savedSceneCount = 0;
 	}
 }
 
 void FreeSaveScenes() {
-	free(ssData);
-	ssData = NULL;
+	free(g_ssData);
+	g_ssData = NULL;
 }
 
 /**
@@ -212,29 +212,29 @@ static void SortMAProcess(CORO_PARAM, const void *) {
 	_ctx->viaActor = SysVar(ISV_DIVERT_ACTOR);
 	SetSysVar(ISV_DIVERT_ACTOR, 0);
 
-	RestoreAuxScales(rsd->SavedMoverInfo);
+	RestoreAuxScales(g_rsd->SavedMoverInfo);
 
 	for (_ctx->i = 0; _ctx->i < MAX_MOVERS; _ctx->i++) {
-		if (rsd->SavedMoverInfo[_ctx->i].bActive) {
-			CORO_INVOKE_ARGS(Stand, (CORO_SUBCTX, rsd->SavedMoverInfo[_ctx->i].actorID,
-				rsd->SavedMoverInfo[_ctx->i].objX, rsd->SavedMoverInfo[_ctx->i].objY,
-				rsd->SavedMoverInfo[_ctx->i].hLastfilm));
+		if (g_rsd->SavedMoverInfo[_ctx->i].bActive) {
+			CORO_INVOKE_ARGS(Stand, (CORO_SUBCTX, g_rsd->SavedMoverInfo[_ctx->i].actorID,
+				g_rsd->SavedMoverInfo[_ctx->i].objX, g_rsd->SavedMoverInfo[_ctx->i].objY,
+				g_rsd->SavedMoverInfo[_ctx->i].hLastfilm));
 
-			if (rsd->SavedMoverInfo[_ctx->i].bHidden)
-				HideMover(GetMover(rsd->SavedMoverInfo[_ctx->i].actorID));
+			if (g_rsd->SavedMoverInfo[_ctx->i].bHidden)
+				HideMover(GetMover(g_rsd->SavedMoverInfo[_ctx->i].actorID));
 		}
 
-		ActorPalette(rsd->SavedMoverInfo[_ctx->i].actorID,
-			rsd->SavedMoverInfo[_ctx->i].startColor, rsd->SavedMoverInfo[_ctx->i].paletteLength);
+		ActorPalette(g_rsd->SavedMoverInfo[_ctx->i].actorID,
+			g_rsd->SavedMoverInfo[_ctx->i].startColor, g_rsd->SavedMoverInfo[_ctx->i].paletteLength);
 
-		if (rsd->SavedMoverInfo[_ctx->i].brightness != BOGUS_BRIGHTNESS)
-			ActorBrightness(rsd->SavedMoverInfo[_ctx->i].actorID, rsd->SavedMoverInfo[_ctx->i].brightness);
+		if (g_rsd->SavedMoverInfo[_ctx->i].brightness != BOGUS_BRIGHTNESS)
+			ActorBrightness(g_rsd->SavedMoverInfo[_ctx->i].actorID, g_rsd->SavedMoverInfo[_ctx->i].brightness);
 	}
 
 	// Restore via actor
 	SetSysVar(ISV_DIVERT_ACTOR, _ctx->viaActor);
 
-	bNotDoneYet = false;
+	g_bNotDoneYet = false;
 
 	CORO_END_CODE;
 }
@@ -244,49 +244,49 @@ static void SortMAProcess(CORO_PARAM, const void *) {
 
 void ResumeInterprets() {
 	// Master script only affected on restore game, not restore scene
-	if (!TinselV2 && (rsd == &sgData)) {
+	if (!TinselV2 && (g_rsd == &g_sgData)) {
 		g_scheduler->killMatchingProcess(PID_MASTER_SCR, -1);
 		FreeMasterInterpretContext();
 	}
 
 	for (int i = 0; i < NUM_INTERPRET; i++) {
-		switch (rsd->SavedICInfo[i].GSort) {
+		switch (g_rsd->SavedICInfo[i].GSort) {
 		case GS_NONE:
 			break;
 
 		case GS_INVENTORY:
-			if (rsd->SavedICInfo[i].event != POINTED) {
-				RestoreProcess(&rsd->SavedICInfo[i]);
+			if (g_rsd->SavedICInfo[i].event != POINTED) {
+				RestoreProcess(&g_rsd->SavedICInfo[i]);
 			}
 			break;
 
 		case GS_MASTER:
 			// Master script only affected on restore game, not restore scene
-			if (rsd == &sgData)
-				RestoreMasterProcess(&rsd->SavedICInfo[i]);
+			if (g_rsd == &g_sgData)
+				RestoreMasterProcess(&g_rsd->SavedICInfo[i]);
 			break;
 
 		case GS_PROCESS:
 			// Tinsel 2 process
-			RestoreSceneProcess(&rsd->SavedICInfo[i]);
+			RestoreSceneProcess(&g_rsd->SavedICInfo[i]);
 			break;
 
 		case GS_GPROCESS:
 			// Tinsel 2 Global processes only affected on restore game, not restore scene
-			if (rsd == &sgData)
-				RestoreGlobalProcess(&rsd->SavedICInfo[i]);
+			if (g_rsd == &g_sgData)
+				RestoreGlobalProcess(&g_rsd->SavedICInfo[i]);
 			break;
 
 		case GS_ACTOR:
 			if (TinselV2)
-				RestoreProcess(&rsd->SavedICInfo[i]);
+				RestoreProcess(&g_rsd->SavedICInfo[i]);
 			else
-				RestoreActorProcess(rsd->SavedICInfo[i].idActor, &rsd->SavedICInfo[i], rsd == &sgData);
+				RestoreActorProcess(g_rsd->SavedICInfo[i].idActor, &g_rsd->SavedICInfo[i], g_rsd == &g_sgData);
 			break;
 
 		case GS_POLYGON:
 		case GS_SCENE:
-			RestoreProcess(&rsd->SavedICInfo[i]);
+			RestoreProcess(&g_rsd->SavedICInfo[i]);
 			break;
 
 		default:
@@ -313,7 +313,7 @@ static int DoRestoreSceneFrame(SAVED_DATA *sd, int n) {
 		if (TinselV2) {
 
 			// Master script only affected on restore game, not restore scene
-			if (sd == &sgData) {
+			if (sd == &g_sgData) {
 				g_scheduler->killMatchingProcess(PID_MASTER_SCR);
 				KillGlobalProcesses();
 				FreeMasterInterpretContext();
@@ -322,12 +322,12 @@ static int DoRestoreSceneFrame(SAVED_DATA *sd, int n) {
 			RestorePolygonStuff(sd->SavedPolygonStuff);
 
 			// Abandon temporarily if different CD
-			if (sd == &sgData && restoreCD != GetCurrentCD()) {
-				SRstate = SR_IDLE;
+			if (sd == &g_sgData && g_restoreCD != GetCurrentCD()) {
+				g_SRstate = SR_IDLE;
 
 				EndScene();
-				SetNextCD(restoreCD);
-				CDChangeForRestore(restoreCD);
+				SetNextCD(g_restoreCD);
+				CDChangeForRestore(g_restoreCD);
 
 				return 0;
 			}
@@ -338,8 +338,8 @@ static int DoRestoreSceneFrame(SAVED_DATA *sd, int n) {
 		// Start up the scene
 		StartNewScene(sd->SavedSceneHandle, NO_ENTRY_NUM);
 
-		SetDoFadeIn(!bNoFade);
-		bNoFade = false;
+		SetDoFadeIn(!g_bNoFade);
+		g_bNoFade = false;
 		StartupBackground(nullContext, sd->SavedBgroundHandle);
 
 		if (TinselV2) {
@@ -355,7 +355,7 @@ static int DoRestoreSceneFrame(SAVED_DATA *sd, int n) {
 		if (TinselV2) {
 			// create process to sort out the moving actors
 			g_scheduler->createProcess(PID_MOVER, SortMAProcess, NULL, 0);
-			bNotDoneYet = true;
+			g_bNotDoneYet = true;
 
 			RestoreActorZ(sd->savedActorZ);
 			RestoreZpositions(sd->zPositions);
@@ -374,11 +374,11 @@ static int DoRestoreSceneFrame(SAVED_DATA *sd, int n) {
 
 	case 1:
 		if (TinselV2) {
-			if (bNotDoneYet)
+			if (g_bNotDoneYet)
 				return n;
 
-			if (sd == &sgData)
-				HoldItem(thingHeld, true);
+			if (sd == &g_sgData)
+				HoldItem(g_thingHeld, true);
 			if (sd->bTinselDim)
 				_vm->_pcmMusic->dim(true);
 			_vm->_pcmMusic->restoreThatTune(sd->SavedTune);
@@ -406,7 +406,7 @@ static int DoRestoreSceneFrame(SAVED_DATA *sd, int n) {
 void RestoreGame(int num) {
 	KillInventory();
 
-	RequestRestoreGame(num, &sgData, &savedSceneCount, ssData);
+	RequestRestoreGame(num, &g_sgData, &g_savedSceneCount, g_ssData);
 
 	// Actual restoring is performed by ProcessSRQueue
 }
@@ -418,9 +418,9 @@ void RestoreGame(int num) {
  */
 void SaveGame(char *name, char *desc) {
 	// Get current scene data
-	DoSaveScene(&sgData);
+	DoSaveScene(&g_sgData);
 
-	RequestSaveGame(name, desc, &sgData, &savedSceneCount, ssData);
+	RequestSaveGame(name, desc, &g_sgData, &g_savedSceneCount, g_ssData);
 
 	// Actual saving is performed by ProcessSRQueue
 }
@@ -429,11 +429,11 @@ void SaveGame(char *name, char *desc) {
 //---------------------------------------------------------------------------------
 
 bool IsRestoringScene() {
-	if (RestoreSceneCount) {
-		RestoreSceneCount = DoRestoreSceneFrame(rsd, RestoreSceneCount);
+	if (g_RestoreSceneCount) {
+		g_RestoreSceneCount = DoRestoreSceneFrame(g_rsd, g_RestoreSceneCount);
 	}
 
-	return RestoreSceneCount ? true : false;
+	return g_RestoreSceneCount ? true : false;
 }
 
 /**
@@ -441,13 +441,13 @@ bool IsRestoringScene() {
  */
 void TinselRestoreScene(bool bFade) {
 	// only called by restore_scene PCODE
-	if (RestoreSceneCount == 0) {
-		assert(savedSceneCount >= 1); // No saved scene to restore
+	if (g_RestoreSceneCount == 0) {
+		assert(g_savedSceneCount >= 1); // No saved scene to restore
 
-		if (ASceneIsSaved)
-			DoRestoreScene(&ssData[--savedSceneCount], bFade);
+		if (g_ASceneIsSaved)
+			DoRestoreScene(&g_ssData[--g_savedSceneCount], bFade);
 		if (!bFade)
-			bNoFade = true;
+			g_bNoFade = true;
 	}
 }
 
@@ -461,14 +461,14 @@ void TinselSaveScene(CORO_PARAM) {
 
 	CORO_BEGIN_CODE(_ctx);
 
-	assert(savedSceneCount < MAX_NEST); // nesting limit reached
+	assert(g_savedSceneCount < MAX_NEST); // nesting limit reached
 
 	// Don't save the same thing multiple times!
 	// FIXME/TODO: Maybe this can be changed to an assert?
-	if (savedSceneCount && ssData[savedSceneCount-1].SavedSceneHandle == GetSceneHandle())
+	if (g_savedSceneCount && g_ssData[g_savedSceneCount-1].SavedSceneHandle == GetSceneHandle())
 		CORO_KILL_SELF();
 
-	DoSaveScene(&ssData[savedSceneCount++]);
+	DoSaveScene(&g_ssData[g_savedSceneCount++]);
 
 	CORO_END_CODE;
 }
diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp
index 89b0da7d65..f635ce13a3 100644
--- a/engines/tinsel/scene.cpp
+++ b/engines/tinsel/scene.cpp
@@ -107,15 +107,15 @@ struct ENTRANCE_STRUC {
 // FIXME: Avoid non-const global vars
 
 #ifdef DEBUG
-static bool ShowPosition = false;	// Set when showpos() has been called
+static bool g_ShowPosition = false;	// Set when showpos() has been called
 #endif
 
-int sceneCtr = 0;
-static int initialMyEscape;
+int g_sceneCtr = 0;
+static int g_initialMyEscape;
 
-static SCNHANDLE SceneHandle = 0;	// Current scene handle - stored in case of Save_Scene()
+static SCNHANDLE g_SceneHandle = 0;	// Current scene handle - stored in case of Save_Scene()
 
-SCENE_STRUC tempStruc;
+SCENE_STRUC g_tempStruc;
 
 struct TP_INIT {
 	SCNHANDLE hTinselCode;		// Code
@@ -128,18 +128,18 @@ const SCENE_STRUC *GetSceneStruc(const byte *pStruc) {
 
 	// Copy appropriate fields into tempStruc, and return a pointer to it
 	const byte *p = pStruc;
-	memset(&tempStruc, 0, sizeof(SCENE_STRUC));
-
-	tempStruc.numEntrance = READ_UINT32(p); p += sizeof(uint32);
-	tempStruc.numPoly = READ_UINT32(p); p += sizeof(uint32);
-	tempStruc.numTaggedActor = READ_UINT32(p); p += sizeof(uint32);
-	tempStruc.defRefer = READ_UINT32(p); p += sizeof(uint32);
-	tempStruc.hSceneScript = READ_UINT32(p); p += sizeof(uint32);
-	tempStruc.hEntrance = READ_UINT32(p); p += sizeof(uint32);
-	tempStruc.hPoly = READ_UINT32(p); p += sizeof(uint32);
-	tempStruc.hTaggedActor = READ_UINT32(p); p += sizeof(uint32);
-
-	return &tempStruc;
+	memset(&g_tempStruc, 0, sizeof(SCENE_STRUC));
+
+	g_tempStruc.numEntrance = READ_UINT32(p); p += sizeof(uint32);
+	g_tempStruc.numPoly = READ_UINT32(p); p += sizeof(uint32);
+	g_tempStruc.numTaggedActor = READ_UINT32(p); p += sizeof(uint32);
+	g_tempStruc.defRefer = READ_UINT32(p); p += sizeof(uint32);
+	g_tempStruc.hSceneScript = READ_UINT32(p); p += sizeof(uint32);
+	g_tempStruc.hEntrance = READ_UINT32(p); p += sizeof(uint32);
+	g_tempStruc.hPoly = READ_UINT32(p); p += sizeof(uint32);
+	g_tempStruc.hTaggedActor = READ_UINT32(p); p += sizeof(uint32);
+
+	return &g_tempStruc;
 }
 
 
@@ -157,8 +157,8 @@ static void SceneTinselProcess(CORO_PARAM, const void *param) {
 	CORO_BEGIN_CODE(_ctx);
 
 	// The following myEscape value setting is used for enabling title screen skipping in DW1
-	if (TinselV1 && (sceneCtr == 1)) initialMyEscape = GetEscEvents();
-	_ctx->myEscape = (TinselV1 && (sceneCtr < 4)) ? initialMyEscape : 0;
+	if (TinselV1 && (g_sceneCtr == 1)) g_initialMyEscape = GetEscEvents();
+	_ctx->myEscape = (TinselV1 && (g_sceneCtr < 4)) ? g_initialMyEscape : 0;
 
 	// get the stuff copied to process when it was created
 	_ctx->pInit = (const TP_INIT *)param;
@@ -184,8 +184,8 @@ static void SceneTinselProcess(CORO_PARAM, const void *param) {
 void SendSceneTinselProcess(TINSEL_EVENT event) {
 	SCENE_STRUC	*ss;
 
-	if (SceneHandle != (SCNHANDLE)NULL) {
-		ss = (SCENE_STRUC *) FindChunk(SceneHandle, CHUNK_SCENE);
+	if (g_SceneHandle != (SCNHANDLE)NULL) {
+		ss = (SCENE_STRUC *) FindChunk(g_SceneHandle, CHUNK_SCENE);
 
 		if (ss->hSceneScript) {
 			TP_INIT	init;
@@ -214,9 +214,9 @@ static void LoadScene(SCNHANDLE scene, int entry) {
 	const ENTRANCE_STRUC	*es;
 
 	// Scene handle
-	SceneHandle = scene;		// Save scene handle in case of Save_Scene()
-	LockMem(SceneHandle);		// Make sure scene is loaded
-	LockScene(SceneHandle);		// Prevent current scene from being discarded
+	g_SceneHandle = scene;		// Save scene handle in case of Save_Scene()
+	LockMem(g_SceneHandle);		// Make sure scene is loaded
+	LockScene(g_SceneHandle);		// Prevent current scene from being discarded
 
 	if (TinselV2) {
 		// CdPlay() stuff
@@ -307,9 +307,9 @@ static void LoadScene(SCNHANDLE scene, int entry) {
  * Wrap up the last scene.
  */
 void EndScene() {
-	if (SceneHandle != 0) {
-		UnlockScene(SceneHandle);
-		SceneHandle = 0;
+	if (g_SceneHandle != 0) {
+		UnlockScene(g_SceneHandle);
+		g_SceneHandle = 0;
 	}
 
 	KillInventory();	// Close down any open inventory
@@ -409,7 +409,7 @@ void PrimeScene() {
 	g_scheduler->createProcess(PID_SCROLL, EffectPolyProcess, NULL, 0);
 
 #ifdef DEBUG
-	if (ShowPosition)
+	if (g_ShowPosition)
 		g_scheduler->createProcess(PID_POSITION, CursorPositionProcess, NULL, 0);
 #endif
 
@@ -445,7 +445,7 @@ void StartNewScene(SCNHANDLE scene, int entry) {
  */
 
 void setshowpos() {
-	ShowPosition = true;
+	g_ShowPosition = true;
 }
 #endif
 
@@ -454,7 +454,7 @@ void setshowpos() {
  */
 
 SCNHANDLE GetSceneHandle() {
-	return SceneHandle;
+	return g_SceneHandle;
 }
 
 /**
diff --git a/engines/tinsel/sched.cpp b/engines/tinsel/sched.cpp
index d6cd806eb2..343758d924 100644
--- a/engines/tinsel/sched.cpp
+++ b/engines/tinsel/sched.cpp
@@ -47,11 +47,11 @@ struct PROCESS_STRUC {
 
 // FIXME: Avoid non-const global vars
 
-static uint32 numSceneProcess;
-static SCNHANDLE hSceneProcess;
+static uint32 g_numSceneProcess;
+static SCNHANDLE g_hSceneProcess;
 
-static uint32 numGlobalProcess;
-static PROCESS_STRUC *pGlobalProcess;
+static uint32 g_numGlobalProcess;
+static PROCESS_STRUC *g_pGlobalProcess;
 
 //--------------------- FUNCTIONS ------------------------
 
@@ -574,8 +574,8 @@ void RestoreSceneProcess(INT_CONTEXT *pic) {
 	uint32 i;
 	PROCESS_STRUC	*pStruc;
 
-	pStruc = (PROCESS_STRUC *)LockMem(hSceneProcess);
-	for (i = 0; i < numSceneProcess; i++) {
+	pStruc = (PROCESS_STRUC *)LockMem(g_hSceneProcess);
+	for (i = 0; i < g_numSceneProcess; i++) {
 		if (FROM_LE_32(pStruc[i].hProcessCode) == pic->hCode) {
 			g_scheduler->createProcess(PID_PROCESS + i, RestoredProcessProcess,
 					 &pic, sizeof(pic));
@@ -583,7 +583,7 @@ void RestoreSceneProcess(INT_CONTEXT *pic) {
 		}
 	}
 
-	assert(i < numSceneProcess);
+	assert(i < g_numSceneProcess);
 }
 
 /**
@@ -602,8 +602,8 @@ void SceneProcessEvent(CORO_PARAM, uint32 procID, TINSEL_EVENT event, bool bWait
 
 	CORO_BEGIN_CODE(_ctx);
 
-	_ctx->pStruc = (PROCESS_STRUC *)LockMem(hSceneProcess);
-	for (i = 0; i < numSceneProcess; i++) {
+	_ctx->pStruc = (PROCESS_STRUC *)LockMem(g_hSceneProcess);
+	for (i = 0; i < g_numSceneProcess; i++) {
 		if (FROM_LE_32(_ctx->pStruc[i].processId) == procID) {
 			assert(_ctx->pStruc[i].hProcessCode);		// Must have some code to run
 
@@ -624,7 +624,7 @@ void SceneProcessEvent(CORO_PARAM, uint32 procID, TINSEL_EVENT event, bool bWait
 		}
 	}
 
-	if (i == numSceneProcess)
+	if (i == g_numSceneProcess)
 		return;
 
 	if (bWait) {
@@ -641,8 +641,8 @@ void KillSceneProcess(uint32 procID) {
 	uint32 i;		// Loop counter
 	PROCESS_STRUC	*pStruc;
 
-	pStruc = (PROCESS_STRUC *) LockMem(hSceneProcess);
-	for (i = 0; i < numSceneProcess; i++) {
+	pStruc = (PROCESS_STRUC *) LockMem(g_hSceneProcess);
+	for (i = 0; i < g_numSceneProcess; i++) {
 		if (FROM_LE_32(pStruc[i].processId) == procID) {
 			g_scheduler->killMatchingProcess(PID_PROCESS + i, -1);
 			break;
@@ -654,8 +654,8 @@ void KillSceneProcess(uint32 procID) {
  * Register the scene processes in a scene.
  */
 void SceneProcesses(uint32 numProcess, SCNHANDLE hProcess) {
-	numSceneProcess = numProcess;
-	hSceneProcess = hProcess;
+	g_numSceneProcess = numProcess;
+	g_hSceneProcess = hProcess;
 }
 
 
@@ -669,15 +669,15 @@ void SceneProcesses(uint32 numProcess, SCNHANDLE hProcess) {
 void RestoreGlobalProcess(INT_CONTEXT *pic) {
 	uint32 i;		// Loop counter
 
-	for (i = 0; i < numGlobalProcess; i++) {
-		if (pGlobalProcess[i].hProcessCode == pic->hCode) {
+	for (i = 0; i < g_numGlobalProcess; i++) {
+		if (g_pGlobalProcess[i].hProcessCode == pic->hCode) {
 			g_scheduler->createProcess(PID_GPROCESS + i, RestoredProcessProcess,
 					 &pic, sizeof(pic));
 			break;
 		}
 	}
 
-	assert(i < numGlobalProcess);
+	assert(i < g_numGlobalProcess);
 }
 
 /**
@@ -685,7 +685,7 @@ void RestoreGlobalProcess(INT_CONTEXT *pic) {
  */
 void KillGlobalProcesses() {
 
-	for (uint32 i = 0; i < numGlobalProcess; ++i)	{
+	for (uint32 i = 0; i < g_numGlobalProcess; ++i)	{
 		g_scheduler->killMatchingProcess(PID_GPROCESS + i, -1);
 	}
 }
@@ -706,12 +706,12 @@ bool GlobalProcessEvent(CORO_PARAM, uint32 procID, TINSEL_EVENT event, bool bWai
 	uint32	i;		// Loop counter
 	_ctx->pProc = NULL;
 
-	for (i = 0; i < numGlobalProcess; ++i)	{
-		if (pGlobalProcess[i].processId == procID) {
-			assert(pGlobalProcess[i].hProcessCode);		// Must have some code to run
+	for (i = 0; i < g_numGlobalProcess; ++i)	{
+		if (g_pGlobalProcess[i].processId == procID) {
+			assert(g_pGlobalProcess[i].hProcessCode);		// Must have some code to run
 
 			_ctx->pic = InitInterpretContext(GS_GPROCESS,
-				pGlobalProcess[i].hProcessCode,
+				g_pGlobalProcess[i].hProcessCode,
 				event,
 				NOPOLY,			// No polygon
 				0,			// No actor
@@ -728,7 +728,7 @@ bool GlobalProcessEvent(CORO_PARAM, uint32 procID, TINSEL_EVENT event, bool bWai
 		}
 	}
 
-	if ((i == numGlobalProcess) || (_ctx->pic == NULL))
+	if ((i == g_numGlobalProcess) || (_ctx->pic == NULL))
 		result = false;
 	else if (bWait)
 		CORO_INVOKE_ARGS_V(WaitInterpret, false, (CORO_SUBCTX, _ctx->pProc, &result));
@@ -743,8 +743,8 @@ bool GlobalProcessEvent(CORO_PARAM, uint32 procID, TINSEL_EVENT event, bool bWai
 void xKillGlobalProcess(uint32 procID) {
 	uint32 i;		// Loop counter
 
-	for (i = 0; i < numGlobalProcess; ++i) {
-		if (pGlobalProcess[i].processId == procID) {
+	for (i = 0; i < g_numGlobalProcess; ++i) {
+		if (g_pGlobalProcess[i].processId == procID) {
 			g_scheduler->killMatchingProcess(PID_GPROCESS + i, -1);
 			break;
 		}
@@ -755,13 +755,13 @@ void xKillGlobalProcess(uint32 procID) {
  * Register the global processes list
  */
 void GlobalProcesses(uint32 numProcess, byte *pProcess) {
-	pGlobalProcess = new PROCESS_STRUC[numProcess];
-	numGlobalProcess = numProcess;
+	g_pGlobalProcess = new PROCESS_STRUC[numProcess];
+	g_numGlobalProcess = numProcess;
 	byte *p = pProcess;
 
 	for (uint i = 0; i < numProcess; ++i, p += 8) {
-		pGlobalProcess[i].processId = READ_LE_UINT32(p);
-		pGlobalProcess[i].hProcessCode = READ_LE_UINT32(p + 4);
+		g_pGlobalProcess[i].processId = READ_LE_UINT32(p);
+		g_pGlobalProcess[i].hProcessCode = READ_LE_UINT32(p + 4);
 	}
 }
 
@@ -769,9 +769,9 @@ void GlobalProcesses(uint32 numProcess, byte *pProcess) {
  * Frees the global processes list
  */
 void FreeGlobalProcesses() {
-	delete[] pGlobalProcess;
-	pGlobalProcess = 0;
-	numGlobalProcess = 0;
+	delete[] g_pGlobalProcess;
+	g_pGlobalProcess = 0;
+	g_numGlobalProcess = 0;
 }
 
 } // End of namespace Tinsel
diff --git a/engines/tinsel/scroll.cpp b/engines/tinsel/scroll.cpp
index d75e649be3..0a6a281d35 100644
--- a/engines/tinsel/scroll.cpp
+++ b/engines/tinsel/scroll.cpp
@@ -49,14 +49,14 @@ namespace Tinsel {
 // FIXME: Avoid non-const global vars
 
 
-static int LeftScroll = 0, DownScroll = 0;	// Number of iterations outstanding
+static int g_LeftScroll = 0, g_DownScroll = 0;	// Number of iterations outstanding
 
-static int scrollActor = 0;
-static PMOVER pScrollMover = 0;
-static int oldx = 0, oldy = 0;
+static int g_scrollActor = 0;
+static PMOVER g_pScrollMover = 0;
+static int g_oldx = 0, g_oldy = 0;
 
 /** Boundaries and numbers of boundaries */
-static SCROLLDATA sd = {
+static SCROLLDATA g_sd = {
 		{
 			{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}
@@ -77,28 +77,28 @@ static SCROLLDATA sd = {
 		0
 	};
 
-static int ImageH = 0, ImageW = 0;
+static int g_ImageH = 0, g_ImageW = 0;
 
-static bool ScrollCursor = 0;	// If a TAG or EXIT polygon is clicked on,
+static bool g_ScrollCursor = 0;	// If a TAG or EXIT polygon is clicked on,
 				// the cursor is kept over that polygon
 				// whilst scrolling
 
-static int scrollPixelsX = SCROLLPIXELS;
-static int scrollPixelsY = SCROLLPIXELS;
+static int g_scrollPixelsX = SCROLLPIXELS;
+static int g_scrollPixelsY = SCROLLPIXELS;
 
 
 /**
  * Reset the ScrollCursor flag
  */
 void DontScrollCursor() {
-	ScrollCursor = false;
+	g_ScrollCursor = false;
 }
 
 /**
  * Set the ScrollCursor flag
  */
 void DoScrollCursor() {
-	ScrollCursor = true;
+	g_ScrollCursor = true;
 }
 
 /**
@@ -107,20 +107,20 @@ void DoScrollCursor() {
 void SetNoScroll(int x1, int y1, int x2, int y2) {
 	if (x1 == x2) {
 		/* Vertical line */
-		assert(sd.NumNoH < MAX_HNOSCROLL);
+		assert(g_sd.NumNoH < MAX_HNOSCROLL);
 
-		sd.NoHScroll[sd.NumNoH].ln = x1;	// X pos of vertical line
-		sd.NoHScroll[sd.NumNoH].c1 = y1;
-		sd.NoHScroll[sd.NumNoH].c2 = y2;
-		sd.NumNoH++;
+		g_sd.NoHScroll[g_sd.NumNoH].ln = x1;	// X pos of vertical line
+		g_sd.NoHScroll[g_sd.NumNoH].c1 = y1;
+		g_sd.NoHScroll[g_sd.NumNoH].c2 = y2;
+		g_sd.NumNoH++;
 	} else if (y1 == y2) {
 		/* Horizontal line */
-		assert(sd.NumNoV < MAX_VNOSCROLL);
+		assert(g_sd.NumNoV < MAX_VNOSCROLL);
 
-		sd.NoVScroll[sd.NumNoV].ln = y1;	// Y pos of horizontal line
-		sd.NoVScroll[sd.NumNoV].c1 = x1;
-		sd.NoVScroll[sd.NumNoV].c2 = x2;
-		sd.NumNoV++;
+		g_sd.NoVScroll[g_sd.NumNoV].ln = y1;	// Y pos of horizontal line
+		g_sd.NoVScroll[g_sd.NumNoV].c1 = x1;
+		g_sd.NoVScroll[g_sd.NumNoV].c2 = x2;
+		g_sd.NumNoV++;
 	} else {
 		/* No-scroll lines must be horizontal or vertical */
 	}
@@ -144,21 +144,21 @@ static void NeedScroll(int direction) {
 		BottomLine = Toffset + (SCREEN_HEIGHT - 1);
 		RightCol = Loffset + (SCREEN_WIDTH - 1);
 
-		for (i = 0; i < sd.NumNoH; i++) {
-			if (RightCol >= sd.NoHScroll[i].ln - 1 && RightCol <= sd.NoHScroll[i].ln + 1 &&
-					((sd.NoHScroll[i].c1 >= Toffset && sd.NoHScroll[i].c1 <= BottomLine) ||
-					(sd.NoHScroll[i].c2 >= Toffset && sd.NoHScroll[i].c2 <= BottomLine) ||
-					(sd.NoHScroll[i].c1 < Toffset && sd.NoHScroll[i].c2 > BottomLine)))
+		for (i = 0; i < g_sd.NumNoH; i++) {
+			if (RightCol >= g_sd.NoHScroll[i].ln - 1 && RightCol <= g_sd.NoHScroll[i].ln + 1 &&
+					((g_sd.NoHScroll[i].c1 >= Toffset && g_sd.NoHScroll[i].c1 <= BottomLine) ||
+					(g_sd.NoHScroll[i].c2 >= Toffset && g_sd.NoHScroll[i].c2 <= BottomLine) ||
+					(g_sd.NoHScroll[i].c1 < Toffset && g_sd.NoHScroll[i].c2 > BottomLine)))
 				return;
 		}
 
-		if (LeftScroll <= 0) {
+		if (g_LeftScroll <= 0) {
 			if (TinselV2) {
-				scrollPixelsX = sd.xSpeed;
-				LeftScroll += sd.xDistance;
+				g_scrollPixelsX = g_sd.xSpeed;
+				g_LeftScroll += g_sd.xDistance;
 			} else {
-				scrollPixelsX = SCROLLPIXELS;
-				LeftScroll = RLSCROLL;
+				g_scrollPixelsX = SCROLLPIXELS;
+				g_LeftScroll = RLSCROLL;
 			}
 		}
 		break;
@@ -167,21 +167,21 @@ static void NeedScroll(int direction) {
 
 		BottomLine = Toffset + (SCREEN_HEIGHT - 1);
 
-		for (i = 0; i < sd.NumNoH; i++) {
-			if (Loffset >= sd.NoHScroll[i].ln - 1 && Loffset <= sd.NoHScroll[i].ln + 1 &&
-					((sd.NoHScroll[i].c1 >= Toffset && sd.NoHScroll[i].c1 <= BottomLine) ||
-					(sd.NoHScroll[i].c2 >= Toffset && sd.NoHScroll[i].c2 <= BottomLine) ||
-					(sd.NoHScroll[i].c1 < Toffset && sd.NoHScroll[i].c2 > BottomLine)))
+		for (i = 0; i < g_sd.NumNoH; i++) {
+			if (Loffset >= g_sd.NoHScroll[i].ln - 1 && Loffset <= g_sd.NoHScroll[i].ln + 1 &&
+					((g_sd.NoHScroll[i].c1 >= Toffset && g_sd.NoHScroll[i].c1 <= BottomLine) ||
+					(g_sd.NoHScroll[i].c2 >= Toffset && g_sd.NoHScroll[i].c2 <= BottomLine) ||
+					(g_sd.NoHScroll[i].c1 < Toffset && g_sd.NoHScroll[i].c2 > BottomLine)))
 				return;
 		}
 
-		if (LeftScroll >= 0) {
+		if (g_LeftScroll >= 0) {
 			if (TinselV2) {
-				scrollPixelsX = sd.xSpeed;
-				LeftScroll -= sd.xDistance;
+				g_scrollPixelsX = g_sd.xSpeed;
+				g_LeftScroll -= g_sd.xDistance;
 			} else {
-				scrollPixelsX = SCROLLPIXELS;
-				LeftScroll = -RLSCROLL;
+				g_scrollPixelsX = SCROLLPIXELS;
+				g_LeftScroll = -RLSCROLL;
 			}
 		}
 		break;
@@ -191,21 +191,21 @@ static void NeedScroll(int direction) {
 		BottomLine = Toffset + (SCREEN_HEIGHT - 1);
 		RightCol = Loffset + (SCREEN_WIDTH - 1);
 
-		for (i = 0; i < sd.NumNoV; i++) {
-			if ((BottomLine >= sd.NoVScroll[i].ln - 1 && BottomLine <= sd.NoVScroll[i].ln + 1) &&
-					((sd.NoVScroll[i].c1 >= Loffset && sd.NoVScroll[i].c1 <= RightCol) ||
-					(sd.NoVScroll[i].c2 >= Loffset && sd.NoVScroll[i].c2 <= RightCol) ||
-					(sd.NoVScroll[i].c1 < Loffset && sd.NoVScroll[i].c2 > RightCol)))
+		for (i = 0; i < g_sd.NumNoV; i++) {
+			if ((BottomLine >= g_sd.NoVScroll[i].ln - 1 && BottomLine <= g_sd.NoVScroll[i].ln + 1) &&
+					((g_sd.NoVScroll[i].c1 >= Loffset && g_sd.NoVScroll[i].c1 <= RightCol) ||
+					(g_sd.NoVScroll[i].c2 >= Loffset && g_sd.NoVScroll[i].c2 <= RightCol) ||
+					(g_sd.NoVScroll[i].c1 < Loffset && g_sd.NoVScroll[i].c2 > RightCol)))
 				return;
 			}
 
-		if (DownScroll <= 0) {
+		if (g_DownScroll <= 0) {
 			if (TinselV2) {
-				scrollPixelsY = sd.ySpeed;
-				DownScroll += sd.yDistance;
+				g_scrollPixelsY = g_sd.ySpeed;
+				g_DownScroll += g_sd.yDistance;
 			} else {
-				scrollPixelsY = SCROLLPIXELS;
-				DownScroll = UDSCROLL;
+				g_scrollPixelsY = SCROLLPIXELS;
+				g_DownScroll = UDSCROLL;
 			}
 		}
 		break;
@@ -214,21 +214,21 @@ static void NeedScroll(int direction) {
 
 		RightCol = Loffset + (SCREEN_WIDTH - 1);
 
-		for (i = 0; i < sd.NumNoV; i++) {
-			if (Toffset >= sd.NoVScroll[i].ln - 1  && Toffset <= sd.NoVScroll[i].ln + 1  &&
-					((sd.NoVScroll[i].c1 >= Loffset && sd.NoVScroll[i].c1 <= RightCol) ||
-					(sd.NoVScroll[i].c2 >= Loffset && sd.NoVScroll[i].c2 <= RightCol) ||
-					(sd.NoVScroll[i].c1 < Loffset && sd.NoVScroll[i].c2 > RightCol)))
+		for (i = 0; i < g_sd.NumNoV; i++) {
+			if (Toffset >= g_sd.NoVScroll[i].ln - 1  && Toffset <= g_sd.NoVScroll[i].ln + 1  &&
+					((g_sd.NoVScroll[i].c1 >= Loffset && g_sd.NoVScroll[i].c1 <= RightCol) ||
+					(g_sd.NoVScroll[i].c2 >= Loffset && g_sd.NoVScroll[i].c2 <= RightCol) ||
+					(g_sd.NoVScroll[i].c1 < Loffset && g_sd.NoVScroll[i].c2 > RightCol)))
 				return;
 		}
 
-		if (DownScroll >= 0) {
+		if (g_DownScroll >= 0) {
 			if (TinselV2) {
-				scrollPixelsY = sd.ySpeed;
-				DownScroll -= sd.yDistance;
+				g_scrollPixelsY = g_sd.ySpeed;
+				g_DownScroll -= g_sd.yDistance;
 			} else {
-				scrollPixelsY = SCROLLPIXELS;
-				DownScroll = -UDSCROLL;
+				g_scrollPixelsY = SCROLLPIXELS;
+				g_DownScroll = -UDSCROLL;
 			}
 		}
 		break;
@@ -249,39 +249,39 @@ static void ScrollImage() {
 	/*
 	 * Keeping cursor on a tag?
 	 */
-	if (ScrollCursor) {
+	if (g_ScrollCursor) {
 		GetCursorXYNoWait(&curX, &curY, true);
 		if (InPolygon(curX, curY, TAG) != NOPOLY || InPolygon(curX, curY, EXIT) != NOPOLY) {
 			OldLoffset = Loffset;
 			OldToffset = Toffset;
 		} else
-			ScrollCursor = false;
+			g_ScrollCursor = false;
 	}
 
 	/*
 	 * Horizontal scrolling
 	 */
-	if (LeftScroll > 0) {
-		LeftScroll -= scrollPixelsX;
-		if (LeftScroll < 0) {
-			Loffset += LeftScroll;
-			LeftScroll = 0;
+	if (g_LeftScroll > 0) {
+		g_LeftScroll -= g_scrollPixelsX;
+		if (g_LeftScroll < 0) {
+			Loffset += g_LeftScroll;
+			g_LeftScroll = 0;
 		}
-		Loffset += scrollPixelsX;		// Move right
-		if (Loffset > ImageW - SCREEN_WIDTH)
-			Loffset = ImageW - SCREEN_WIDTH;// Now at extreme right
+		Loffset += g_scrollPixelsX;		// Move right
+		if (Loffset > g_ImageW - SCREEN_WIDTH)
+			Loffset = g_ImageW - SCREEN_WIDTH;// Now at extreme right
 
 		/*** New feature to prop up rickety scroll boundaries ***/
 		if (TinselV2 && SysVar(SV_MaximumXoffset) &&  (Loffset > SysVar(SV_MaximumXoffset)))
 			Loffset = SysVar(SV_MaximumXoffset);
 
-	} else if (LeftScroll < 0) {
-		LeftScroll += scrollPixelsX;
-		if (LeftScroll > 0) {
-			Loffset += LeftScroll;
-			LeftScroll = 0;
+	} else if (g_LeftScroll < 0) {
+		g_LeftScroll += g_scrollPixelsX;
+		if (g_LeftScroll > 0) {
+			Loffset += g_LeftScroll;
+			g_LeftScroll = 0;
 		}
-		Loffset -= scrollPixelsX;	// Move left
+		Loffset -= g_scrollPixelsX;	// Move left
 		if (Loffset < 0)
 			Loffset = 0;		// Now at extreme left
 
@@ -293,28 +293,28 @@ static void ScrollImage() {
 	/*
 	 * Vertical scrolling
 	 */
-	if (DownScroll > 0) {
-		DownScroll -= scrollPixelsY;
-		if (DownScroll < 0) {
-			Toffset += DownScroll;
-			DownScroll = 0;
+	if (g_DownScroll > 0) {
+		g_DownScroll -= g_scrollPixelsY;
+		if (g_DownScroll < 0) {
+			Toffset += g_DownScroll;
+			g_DownScroll = 0;
 		}
-		Toffset += scrollPixelsY;		// Move down
+		Toffset += g_scrollPixelsY;		// Move down
 
-		if (Toffset > ImageH - SCREEN_HEIGHT)
-			Toffset = ImageH - SCREEN_HEIGHT;// Now at extreme bottom
+		if (Toffset > g_ImageH - SCREEN_HEIGHT)
+			Toffset = g_ImageH - SCREEN_HEIGHT;// Now at extreme bottom
 
 		/*** New feature to prop up rickety scroll boundaries ***/
 		if (TinselV2 && SysVar(SV_MaximumYoffset) &&  Toffset > SysVar(SV_MaximumYoffset))
 			Toffset = SysVar(SV_MaximumYoffset);
 
-	} else if (DownScroll < 0) {
-		DownScroll += scrollPixelsY;
-		if (DownScroll > 0) {
-			Toffset += DownScroll;
-			DownScroll = 0;
+	} else if (g_DownScroll < 0) {
+		g_DownScroll += g_scrollPixelsY;
+		if (g_DownScroll > 0) {
+			Toffset += g_DownScroll;
+			g_DownScroll = 0;
 		}
-		Toffset -= scrollPixelsY;		// Move up
+		Toffset -= g_scrollPixelsY;		// Move up
 
 		if (Toffset < 0)
 			Toffset = 0;			// Now at extreme top
@@ -327,7 +327,7 @@ static void ScrollImage() {
 	/*
 	 * Move cursor if keeping cursor on a tag.
 	 */
-	if (ScrollCursor)
+	if (g_ScrollCursor)
 		AdjustCursorXY(OldLoffset - Loffset, OldToffset - Toffset);
 
 	PlayfieldSetPos(FIELD_WORLD, Loffset, Toffset);
@@ -345,12 +345,12 @@ static void MonitorScroll() {
 	/*
 	 * Only do it if the actor is there and is visible
 	 */
-	if (!pScrollMover || MoverHidden(pScrollMover) || !MoverIs(pScrollMover))
+	if (!g_pScrollMover || MoverHidden(g_pScrollMover) || !MoverIs(g_pScrollMover))
 		return;
 
-	GetActorPos(scrollActor, &newx, &newy);
+	GetActorPos(g_scrollActor, &newx, &newy);
 
-	if (oldx == newx && oldy == newy)
+	if (g_oldx == newx && g_oldy == newy)
 		return;
 
 	PlayfieldGetPos(FIELD_WORLD, &Loffset, &Toffset);
@@ -358,49 +358,49 @@ static void MonitorScroll() {
 	/*
 	 * Approaching right side or left side of the screen?
 	 */
-	if (newx > Loffset+SCREEN_WIDTH - RLDISTANCE && Loffset < ImageW - SCREEN_WIDTH) {
-		if (newx > oldx)
+	if (newx > Loffset+SCREEN_WIDTH - RLDISTANCE && Loffset < g_ImageW - SCREEN_WIDTH) {
+		if (newx > g_oldx)
 				NeedScroll(LEFT);
 	} else if (newx < Loffset + RLDISTANCE  &&  Loffset) {
-		if (newx < oldx)
+		if (newx < g_oldx)
 				NeedScroll(RIGHT);
 	}
 
 	/*
 	 * Approaching bottom or top of the screen?
 	 */
-	if (newy > Toffset+SCREEN_HEIGHT-DDISTANCE && Toffset < ImageH-SCREEN_HEIGHT) {
-		if (newy > oldy)
+	if (newy > Toffset+SCREEN_HEIGHT-DDISTANCE && Toffset < g_ImageH-SCREEN_HEIGHT) {
+		if (newy > g_oldy)
 				NeedScroll(UP);
-	} else if (Toffset && newy < Toffset + UDISTANCE + GetActorBottom(scrollActor) - GetActorTop(scrollActor)) {
-		if (newy < oldy)
+	} else if (Toffset && newy < Toffset + UDISTANCE + GetActorBottom(g_scrollActor) - GetActorTop(g_scrollActor)) {
+		if (newy < g_oldy)
 				NeedScroll(DOWN);
 	}
 
-	oldx = newx;
-	oldy = newy;
+	g_oldx = newx;
+	g_oldy = newy;
 }
 
 static void RestoreScrollDefaults() {
-	sd.xTrigger		= SysVar(SV_SCROLL_XTRIGGER);
-	sd.xDistance	= SysVar(SV_SCROLL_XDISTANCE);
-	sd.xSpeed		= SysVar(SV_SCROLL_XSPEED);
-	sd.yTriggerTop	= SysVar(SV_SCROLL_YTRIGGERTOP);
-	sd.yTriggerBottom= SysVar(SV_SCROLL_YTRIGGERBOT);
-	sd.yDistance	= SysVar(SV_SCROLL_YDISTANCE);
-	sd.ySpeed		= SysVar(SV_SCROLL_YSPEED);
+	g_sd.xTrigger		= SysVar(SV_SCROLL_XTRIGGER);
+	g_sd.xDistance	= SysVar(SV_SCROLL_XDISTANCE);
+	g_sd.xSpeed		= SysVar(SV_SCROLL_XSPEED);
+	g_sd.yTriggerTop	= SysVar(SV_SCROLL_YTRIGGERTOP);
+	g_sd.yTriggerBottom= SysVar(SV_SCROLL_YTRIGGERBOT);
+	g_sd.yDistance	= SysVar(SV_SCROLL_YDISTANCE);
+	g_sd.ySpeed		= SysVar(SV_SCROLL_YSPEED);
 }
 
 /**
  * Does the obvious - called at the end of a scene.
  */
 void DropScroll() {
-	sd.NumNoH = sd.NumNoV = 0;
+	g_sd.NumNoH = g_sd.NumNoV = 0;
 	if (TinselV2) {
-		LeftScroll = DownScroll = 0;		// No iterations outstanding
-		oldx = oldy = 0;
-		scrollPixelsX = sd.xSpeed;
-		scrollPixelsY = sd.ySpeed;
+		g_LeftScroll = g_DownScroll = 0;		// No iterations outstanding
+		g_oldx = g_oldy = 0;
+		g_scrollPixelsX = g_sd.xSpeed;
+		g_scrollPixelsY = g_sd.ySpeed;
 		RestoreScrollDefaults();
 	}
 }
@@ -420,28 +420,28 @@ void ScrollProcess(CORO_PARAM, const void *) {
 	while (!GetBgObject())
 		CORO_SLEEP(1);
 
-	ImageH = BgHeight();		// Dimensions
-	ImageW = BgWidth();		//  of this scene.
+	g_ImageH = BgHeight();		// Dimensions
+	g_ImageW = BgWidth();		//  of this scene.
 
 	// Give up if there'll be no purpose in this process
-	if (ImageW == SCREEN_WIDTH  &&  ImageH == SCREEN_HEIGHT)
+	if (g_ImageW == SCREEN_WIDTH  &&  g_ImageH == SCREEN_HEIGHT)
 		CORO_KILL_SELF();
 
 	if (!TinselV2) {
-		LeftScroll = DownScroll = 0;		// No iterations outstanding
-		oldx = oldy = 0;
-		scrollPixelsX = scrollPixelsY = SCROLLPIXELS;
+		g_LeftScroll = g_DownScroll = 0;		// No iterations outstanding
+		g_oldx = g_oldy = 0;
+		g_scrollPixelsX = g_scrollPixelsY = SCROLLPIXELS;
 	}
 
-	if (!scrollActor)
-		scrollActor = GetLeadId();
+	if (!g_scrollActor)
+		g_scrollActor = GetLeadId();
 
-	pScrollMover = GetMover(scrollActor);
+	g_pScrollMover = GetMover(g_scrollActor);
 
 	while (1) {
 		MonitorScroll();		// Set scroll requirement
 
-		if (LeftScroll || DownScroll)	// Scroll if required
+		if (g_LeftScroll || g_DownScroll)	// Scroll if required
 			ScrollImage();
 
 		CORO_SLEEP(1);		// allow re-scheduling
@@ -454,11 +454,11 @@ void ScrollProcess(CORO_PARAM, const void *) {
  * Change which actor the camera is following.
  */
 void ScrollFocus(int ano) {
-	if (scrollActor != ano) {
-		oldx = oldy = 0;
-		scrollActor = ano;
+	if (g_scrollActor != ano) {
+		g_oldx = g_oldy = 0;
+		g_scrollActor = ano;
 
-		pScrollMover = ano ? GetMover(scrollActor) : NULL;
+		g_pScrollMover = ano ? GetMover(g_scrollActor) : NULL;
 	}
 }
 
@@ -466,7 +466,7 @@ void ScrollFocus(int ano) {
  * Returns the actor which the camera is following
  */
 int GetScrollFocus() {
-	return scrollActor;
+	return g_scrollActor;
 }
 
 
@@ -476,29 +476,29 @@ int GetScrollFocus() {
 void ScrollTo(int x, int y, int xIter, int yIter) {
 	int Loffset, Toffset;		// for background offsets
 
-	scrollPixelsX = xIter != 0 ? xIter : (TinselV2 ? sd.xSpeed : SCROLLPIXELS);
-	scrollPixelsY = yIter != 0 ? yIter : (TinselV2 ? sd.ySpeed : SCROLLPIXELS);
+	g_scrollPixelsX = xIter != 0 ? xIter : (TinselV2 ? g_sd.xSpeed : SCROLLPIXELS);
+	g_scrollPixelsY = yIter != 0 ? yIter : (TinselV2 ? g_sd.ySpeed : SCROLLPIXELS);
 
 	PlayfieldGetPos(FIELD_WORLD, &Loffset, &Toffset);	// get background offsets
 
-	LeftScroll = x - Loffset;
-	DownScroll = y - Toffset;
+	g_LeftScroll = x - Loffset;
+	g_DownScroll = y - Toffset;
 }
 
 /**
  * Kill of any current scroll.
  */
 void KillScroll() {
-	LeftScroll = DownScroll = 0;
+	g_LeftScroll = g_DownScroll = 0;
 }
 
 
 void GetNoScrollData(SCROLLDATA *ssd) {
-	memcpy(ssd, &sd, sizeof(SCROLLDATA));
+	memcpy(ssd, &g_sd, sizeof(SCROLLDATA));
 }
 
 void RestoreNoScrollData(SCROLLDATA *ssd) {
-	memcpy(&sd, ssd, sizeof(SCROLLDATA));
+	memcpy(&g_sd, ssd, sizeof(SCROLLDATA));
 }
 
 /**
@@ -512,24 +512,24 @@ void SetScrollParameters(int xTrigger, int xDistance, int xSpeed, int yTriggerTo
 		RestoreScrollDefaults();
 	} else {
 		if (xTrigger)
-			sd.xTrigger = xTrigger;
+			g_sd.xTrigger = xTrigger;
 		if (xDistance)
-			sd.xDistance = xDistance;
+			g_sd.xDistance = xDistance;
 		if (xSpeed)
-			sd.xSpeed = xSpeed;
+			g_sd.xSpeed = xSpeed;
 		if (yTriggerTop)
-			sd.yTriggerTop = yTriggerTop;
+			g_sd.yTriggerTop = yTriggerTop;
 		if (yTriggerBottom)
-			sd.yTriggerBottom = yTriggerBottom;
+			g_sd.yTriggerBottom = yTriggerBottom;
 		if (yDistance)
-			sd.yDistance = yDistance;
+			g_sd.yDistance = yDistance;
 		if (ySpeed)
-			sd.ySpeed = ySpeed;
+			g_sd.ySpeed = ySpeed;
 	}
 }
 
 bool IsScrolling() {
-	return (LeftScroll || DownScroll);
+	return (g_LeftScroll || g_DownScroll);
 }
 
 } // End of namespace Tinsel
diff --git a/engines/tinsel/scroll.h b/engines/tinsel/scroll.h
index 62562b20b2..bcdc15cda6 100644
--- a/engines/tinsel/scroll.h
+++ b/engines/tinsel/scroll.h
@@ -28,9 +28,9 @@ namespace Tinsel {
 #define SCROLLPIXELS 8	// Number of pixels to scroll per iteration
 
 // Distance from edge that triggers a scroll
-#define RLDISTANCE (TinselV2 ? sd.xTrigger : 50)
-#define UDISTANCE (TinselV2 ? sd.yTriggerTop : 20)
-#define DDISTANCE (TinselV2 ? sd.yTriggerBottom : 20)
+#define RLDISTANCE (TinselV2 ? g_sd.xTrigger : 50)
+#define UDISTANCE (TinselV2 ? g_sd.yTriggerTop : 20)
+#define DDISTANCE (TinselV2 ? g_sd.yTriggerBottom : 20)
 
 // Number of iterations to make
 #define RLSCROLL 160	// 20*8 = 160 = half a screen
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp
index 130928d885..f575b03270 100644
--- a/engines/tinsel/sound.cpp
+++ b/engines/tinsel/sound.cpp
@@ -49,7 +49,7 @@
 
 namespace Tinsel {
 
-extern LANGUAGE sampleLanguage;
+extern LANGUAGE g_sampleLanguage;
 
 //--------------------------- General data ----------------------------------
 
@@ -99,12 +99,12 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound
 	// move to correct position in the sample file
 	_sampleStream.seek(dwSampleIndex);
 	if (_sampleStream.eos() || _sampleStream.err() || (uint32)_sampleStream.pos() != dwSampleIndex)
-		error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
+		error(FILE_IS_CORRUPT, _vm->getSampleFile(g_sampleLanguage));
 
 	// read the length of the sample
 	uint32 sampleLen = _sampleStream.readUint32();
 	if (_sampleStream.eos() || _sampleStream.err())
-		error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
+		error(FILE_IS_CORRUPT, _vm->getSampleFile(g_sampleLanguage));
 
 	if (TinselV1PSX) {
 		// Read the stream and create a XA ADPCM audio stream
@@ -124,7 +124,7 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound
 
 		// read all of the sample
 		if (_sampleStream.read(sampleBuf, sampleLen) != sampleLen)
-			error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
+			error(FILE_IS_CORRUPT, _vm->getSampleFile(g_sampleLanguage));
 
 		// FIXME: Should set this in a different place ;)
 		_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, _vm->_config->_soundVolume);
@@ -254,12 +254,12 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p
 	// move to correct position in the sample file
 	_sampleStream.seek(dwSampleIndex);
 	if (_sampleStream.eos() || _sampleStream.err() || (uint32)_sampleStream.pos() != dwSampleIndex)
-		error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
+		error(FILE_IS_CORRUPT, _vm->getSampleFile(g_sampleLanguage));
 
 	// read the length of the sample
 	uint32 sampleLen = _sampleStream.readUint32();
 	if (_sampleStream.eos() || _sampleStream.err())
-		error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
+		error(FILE_IS_CORRUPT, _vm->getSampleFile(g_sampleLanguage));
 
 	if (sampleLen & 0x80000000) {
 		// Has sub samples
@@ -273,11 +273,11 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p
 			sampleLen = _sampleStream.readUint32();
 			_sampleStream.skip(sampleLen);
 			if (_sampleStream.eos() || _sampleStream.err())
-				error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
+				error(FILE_IS_CORRUPT, _vm->getSampleFile(g_sampleLanguage));
 		}
 		sampleLen = _sampleStream.readUint32();
 		if (_sampleStream.eos() || _sampleStream.err())
-			error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
+			error(FILE_IS_CORRUPT, _vm->getSampleFile(g_sampleLanguage));
 	}
 
 	debugC(DEBUG_DETAILED, kTinselDebugSound, "Playing sound %d.%d, %d bytes at %d (pan %d)", id, sub, sampleLen,
@@ -289,7 +289,7 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p
 
 	// read all of the sample
 	if (_sampleStream.read(sampleBuf, sampleLen) != sampleLen)
-		error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
+		error(FILE_IS_CORRUPT, _vm->getSampleFile(g_sampleLanguage));
 
 	Common::MemoryReadStream *compressedStream =
 		new Common::MemoryReadStream(sampleBuf, sampleLen, DisposeAfterUse::YES);
@@ -481,7 +481,7 @@ void SoundManager::openSampleFiles() {
 		return;
 
 	// open sample index file in binary mode
-	if (f.open(_vm->getSampleIndex(sampleLanguage)))	{
+	if (f.open(_vm->getSampleIndex(g_sampleLanguage)))	{
 		// get length of index file
 		f.seek(0, SEEK_END);		// move to end of file
 		_sampleIndexLen = f.pos();	// get file pointer
@@ -502,7 +502,7 @@ void SoundManager::openSampleFiles() {
 		// load data
 		if (f.read(_sampleIndex, _sampleIndexLen) != (uint32)_sampleIndexLen)
 			// file must be corrupt if we get to here
-			error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
+			error(FILE_IS_CORRUPT, _vm->getSampleFile(g_sampleLanguage));
 
 		// close the file
 		f.close();
@@ -542,28 +542,28 @@ void SoundManager::openSampleFiles() {
 		_sampleIndex[0] = 0;
 	} else {
 		char buf[50];
-		sprintf(buf, CANNOT_FIND_FILE, _vm->getSampleIndex(sampleLanguage));
+		sprintf(buf, CANNOT_FIND_FILE, _vm->getSampleIndex(g_sampleLanguage));
 		GUI::MessageDialog dialog(buf, "OK");
 		dialog.runModal();
 
-		error(CANNOT_FIND_FILE, _vm->getSampleIndex(sampleLanguage));
+		error(CANNOT_FIND_FILE, _vm->getSampleIndex(g_sampleLanguage));
 	}
 
 	// open sample file in binary mode
-	if (!_sampleStream.open(_vm->getSampleFile(sampleLanguage))) {
+	if (!_sampleStream.open(_vm->getSampleFile(g_sampleLanguage))) {
 		char buf[50];
-		sprintf(buf, CANNOT_FIND_FILE, _vm->getSampleFile(sampleLanguage));
+		sprintf(buf, CANNOT_FIND_FILE, _vm->getSampleFile(g_sampleLanguage));
 		GUI::MessageDialog dialog(buf, "OK");
 		dialog.runModal();
 
-		error(CANNOT_FIND_FILE, _vm->getSampleFile(sampleLanguage));
+		error(CANNOT_FIND_FILE, _vm->getSampleFile(g_sampleLanguage));
 	}
 
 /*
 	// gen length of the largest sample
 	sampleBuffer.size = _sampleStream.readUint32LE();
 	if (_sampleStream.eos() || _sampleStream.err())
-		error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage));
+		error(FILE_IS_CORRUPT, _vm->getSampleFile(g_sampleLanguage));
 */
 }
 
diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp
index f3a7278993..5a29a4d2cd 100644
--- a/engines/tinsel/strres.cpp
+++ b/engines/tinsel/strres.cpp
@@ -38,11 +38,11 @@ namespace Tinsel {
 
 #ifdef DEBUG
 // Diagnostic number
-int newestString;
+int g_newestString;
 #endif
 
 // buffer for resource strings
-static uint8 *textBuffer = 0;
+static uint8 *g_textBuffer = 0;
 
 static struct {
 	bool		bPresent;
@@ -50,7 +50,7 @@ static struct {
 	SCNHANDLE	hDescription;
 	SCNHANDLE	hFlagFilm;
 
-} languages[NUM_LANGUAGES] = {
+} g_languages[NUM_LANGUAGES] = {
 
 	{ false, "English",	0, 0 },
 	{ false, "French",	0, 0 },
@@ -65,9 +65,9 @@ static struct {
 
 
 // Set if we're handling 2-byte characters.
-bool bMultiByte = false;
+bool g_bMultiByte = false;
 
-LANGUAGE textLanguage, sampleLanguage = TXT_ENGLISH;
+LANGUAGE g_textLanguage, g_sampleLanguage = TXT_ENGLISH;
 
 //----------------- LOCAL DEFINES ----------------------------
 
@@ -85,12 +85,12 @@ void ChangeLanguage(LANGUAGE newLang) {
 	TinselFile f;
 	uint32 textLen = 0;	// length of buffer
 
-	textLanguage = newLang;
-	sampleLanguage = newLang;
+	g_textLanguage = newLang;
+	g_sampleLanguage = newLang;
 
 	// free the previous buffer
-	free(textBuffer);
-	textBuffer = NULL;
+	free(g_textBuffer);
+	g_textBuffer = NULL;
 
 	// Try and open the specified language file. If it fails, and the language
 	// isn't English, try falling back on opening 'english.txt' - some foreign
@@ -116,22 +116,22 @@ void ChangeLanguage(LANGUAGE newLang) {
 	if (textLen == CHUNK_STRING || textLen == CHUNK_MBSTRING) {
 		// the file is uncompressed
 
-		bMultiByte = (textLen == CHUNK_MBSTRING);
+		g_bMultiByte = (textLen == CHUNK_MBSTRING);
 
 		// get length of uncompressed file
 		textLen = f.size();
 		f.seek(0, SEEK_SET);	// Set to beginning of file
 
-		if (textBuffer == NULL) {
+		if (g_textBuffer == NULL) {
 			// allocate a text buffer for the strings
-			textBuffer = (uint8 *)malloc(textLen);
+			g_textBuffer = (uint8 *)malloc(textLen);
 
 			// make sure memory allocated
-			assert(textBuffer);
+			assert(g_textBuffer);
 		}
 
 		// load data
-		if (f.read(textBuffer, textLen) != textLen)
+		if (f.read(g_textBuffer, textLen) != textLen)
 			// file must be corrupt if we get to here
 			error(FILE_IS_CORRUPT, _vm->getTextFile(newLang));
 
@@ -147,7 +147,7 @@ void ChangeLanguage(LANGUAGE newLang) {
  */
 static byte *FindStringBase(int id) {
 	// base of string resource table
-	byte *pText = textBuffer;
+	byte *pText = g_textBuffer;
 
 	// For Tinsel 0, Ids are decremented by 1
 	if (TinselV0)
@@ -353,8 +353,8 @@ int SubStringCount(int id) {
 
 
 void FreeTextBuffer() {
-	free(textBuffer);
-	textBuffer = NULL;
+	free(g_textBuffer);
+	g_textBuffer = NULL;
 }
 
 /**
@@ -364,29 +364,29 @@ void FreeTextBuffer() {
 void LanguageFacts(int language, SCNHANDLE hDescription, SCNHANDLE hFlagFilm) {
 	assert(language >= 0 && language < NUM_LANGUAGES);
 
-	languages[language].hDescription = hDescription;
-	languages[language].hFlagFilm	 = hFlagFilm;
+	g_languages[language].hDescription = hDescription;
+	g_languages[language].hFlagFilm	 = hFlagFilm;
 }
 
 /**
  * Gets the current subtitles language
  */
 LANGUAGE TextLanguage() {
-	return textLanguage;
+	return g_textLanguage;
 }
 
 /**
  * Gets the current voice language
  */
 LANGUAGE SampleLanguage() {
-	return sampleLanguage;
+	return g_sampleLanguage;
 }
 
 int NumberOfLanguages() {
 	int i, count;
 
 	for (i = 0, count = 0; i < NUM_LANGUAGES; i++) {
-		if (languages[i].bPresent)
+		if (g_languages[i].bPresent)
 			count++;
 	}
 	return count;
@@ -396,12 +396,12 @@ LANGUAGE NextLanguage(LANGUAGE thisOne) {
 	int i;
 
 	for (i = thisOne+1; i < NUM_LANGUAGES; i++) {
-		if (languages[i].bPresent)
+		if (g_languages[i].bPresent)
 			return (LANGUAGE)i;
 	}
 
 	for (i = 0; i < thisOne; i++) {
-		if (languages[i].bPresent)
+		if (g_languages[i].bPresent)
 			return (LANGUAGE)i;
 	}
 
@@ -413,12 +413,12 @@ LANGUAGE PrevLanguage(LANGUAGE thisOne) {
 	int i;
 
 	for (i = thisOne-1; i >= 0; i--) {
-		if (languages[i].bPresent)
+		if (g_languages[i].bPresent)
 			return (LANGUAGE)i;
 	}
 
 	for (i = NUM_LANGUAGES-1; i > thisOne; i--) {
-		if (languages[i].bPresent)
+		if (g_languages[i].bPresent)
 			return (LANGUAGE)i;
 	}
 
@@ -427,11 +427,11 @@ LANGUAGE PrevLanguage(LANGUAGE thisOne) {
 }
 
 SCNHANDLE LanguageDesc(LANGUAGE thisOne) {
-	return languages[thisOne].hDescription;
+	return g_languages[thisOne].hDescription;
 }
 
 SCNHANDLE LanguageFlag(LANGUAGE thisOne) {
-	return languages[thisOne].hFlagFilm;
+	return g_languages[thisOne].hFlagFilm;
 }
 
 } // End of namespace Tinsel
diff --git a/engines/tinsel/strres.h b/engines/tinsel/strres.h
index f6e86951b6..772896c81f 100644
--- a/engines/tinsel/strres.h
+++ b/engines/tinsel/strres.h
@@ -35,7 +35,7 @@ namespace Tinsel {
 #define	MAX_STRRES_SIZE		300000	// maximum size of string resource file
 
 // Set if we're handling 2-byte characters.
-extern bool bMultiByte;
+extern bool g_bMultiByte;
 
 /*----------------------------------------------------------------------*\
 |*				Function Prototypes			*|
diff --git a/engines/tinsel/sysvar.cpp b/engines/tinsel/sysvar.cpp
index 88053f15c6..6ef4f165ab 100644
--- a/engines/tinsel/sysvar.cpp
+++ b/engines/tinsel/sysvar.cpp
@@ -43,7 +43,7 @@ extern int NewestSavedGame();
 
 // FIXME: Avoid non-const global vars
 
-static int systemVars[SV_TOPVALID] = {
+static int g_systemVars[SV_TOPVALID] = {
 
 		INV_1,		// Default inventory
 
@@ -105,7 +105,7 @@ static int systemVars[SV_TOPVALID] = {
 		0		// ISV_GHOST_COLOR
 };
 
-static SCNHANDLE systemStrings[SS_MAX_VALID];	// FIXME: Avoid non-const global vars
+static SCNHANDLE g_systemStrings[SS_MAX_VALID];	// FIXME: Avoid non-const global vars
 
 //static bool bFlagNoBlocking = false;
 
@@ -116,8 +116,8 @@ static SCNHANDLE systemStrings[SS_MAX_VALID];	// FIXME: Avoid non-const global v
  */
 
 void InitSysVars() {
-	systemVars[SV_SCROLL_XDISTANCE] = SCREEN_WIDTH / 2;
-	systemVars[SV_SCROLL_YDISTANCE] = SCREEN_BOX_HEIGHT1 / 2;
+	g_systemVars[SV_SCROLL_XDISTANCE] = SCREEN_WIDTH / 2;
+	g_systemVars[SV_SCROLL_YDISTANCE] = SCREEN_BOX_HEIGHT1 / 2;
 }
 
 /**
@@ -138,7 +138,7 @@ void SetSysVar(int varId, int newValue) {
 		error("SetSystemVar(): read only identifier");
 
 	default:
-		systemVars[varId] = newValue;
+		g_systemVars[varId] = newValue;
 	}
 }
 
@@ -167,28 +167,28 @@ int SysVar(int varId) {
 		//return bDebuggingAllowed;
 
 	default:
-		return systemVars[varId];
+		return g_systemVars[varId];
 	}
 }
 
 void SaveSysVars(int *pSv) {
-	memcpy(pSv, systemVars, sizeof(systemVars));
+	memcpy(pSv, g_systemVars, sizeof(g_systemVars));
 }
 
 void RestoreSysVars(int *pSv) {
-	memcpy(systemVars, pSv, sizeof(systemVars));
+	memcpy(g_systemVars, pSv, sizeof(g_systemVars));
 }
 
 void SetSysString(int number, SCNHANDLE hString) {
 	assert(number >= 0 && number < SS_MAX_VALID);
 
-	systemStrings[number] = hString;
+	g_systemStrings[number] = hString;
 }
 
 SCNHANDLE SysString(int number) {
 	assert(number >= 0 && number < SS_MAX_VALID);
 
-	return systemStrings[number];
+	return g_systemStrings[number];
 }
 
 /**
diff --git a/engines/tinsel/text.cpp b/engines/tinsel/text.cpp
index ecb1e153f3..5eb092d00d 100644
--- a/engines/tinsel/text.cpp
+++ b/engines/tinsel/text.cpp
@@ -25,7 +25,7 @@
 #include "tinsel/graphics.h"	// object plotting
 #include "tinsel/handle.h"
 #include "tinsel/sched.h"	// process scheduler defines
-#include "tinsel/strres.h"	// bMultiByte
+#include "tinsel/strres.h"	// g_bMultiByte
 #include "tinsel/text.h"	// text defines
 
 namespace Tinsel {
@@ -42,7 +42,7 @@ int StringLengthPix(char *szStr, const FONT *pFont) {
 
 	// while not end of string or end of line
 	for (strLen = 0; (c = *szStr) != EOS_CHAR && c != LF_CHAR; szStr++) {
-		if (bMultiByte) {
+		if (g_bMultiByte) {
 			if (c & 0x80)
 				c = ((c & ~0x80) << 8) + *++szStr;
 		}
@@ -136,7 +136,7 @@ OBJECT *ObjectTextOut(OBJECT **pList, char *szStr, int color,
 
 		// repeat until end of string or end of line
 		while ((c = *szStr) != EOS_CHAR && c != LF_CHAR) {
-			if (bMultiByte) {
+			if (g_bMultiByte) {
 				if (c & 0x80)
 					c = ((c & ~0x80) << 8) + *++szStr;
 			}
@@ -265,7 +265,7 @@ bool IsCharImage(SCNHANDLE hFont, char c) {
 
 	// Inventory save game name editor needs to be more clever for
 	// multi-byte characters. This bodge will stop it erring.
-	if (bMultiByte && (c2 & 0x80))
+	if (g_bMultiByte && (c2 & 0x80))
 		return false;
 
 	// get font pointer
diff --git a/engines/tinsel/timers.cpp b/engines/tinsel/timers.cpp
index 1c3ff9b260..d3a7446565 100644
--- a/engines/tinsel/timers.cpp
+++ b/engines/tinsel/timers.cpp
@@ -49,7 +49,7 @@ struct TIMER {
 
 //----------------- LOCAL GLOBAL DATA --------------------
 
-static TIMER timers[MAX_TIMERS];	// FIXME: Avoid non-const global vars
+static TIMER g_timers[MAX_TIMERS];	// FIXME: Avoid non-const global vars
 
 
 //--------------------------------------------------------
@@ -72,7 +72,7 @@ uint32 DwGetCurrentTime() {
  */
 
 void RebootTimers() {
-	memset(timers, 0, sizeof(timers));
+	memset(g_timers, 0, sizeof(g_timers));
 }
 
 /**
@@ -80,11 +80,11 @@ void RebootTimers() {
  */
 void syncTimerInfo(Common::Serializer &s) {
 	for (int i = 0; i < MAX_TIMERS; i++) {
-		s.syncAsSint32LE(timers[i].tno);
-		s.syncAsSint32LE(timers[i].ticks);
-		s.syncAsSint32LE(timers[i].secs);
-		s.syncAsSint32LE(timers[i].delta);
-		s.syncAsSint32LE(timers[i].frame);
+		s.syncAsSint32LE(g_timers[i].tno);
+		s.syncAsSint32LE(g_timers[i].ticks);
+		s.syncAsSint32LE(g_timers[i].secs);
+		s.syncAsSint32LE(g_timers[i].delta);
+		s.syncAsSint32LE(g_timers[i].frame);
 	}
 }
 
@@ -95,8 +95,8 @@ void syncTimerInfo(Common::Serializer &s) {
  */
 static TIMER *findTimer(int num) {
 	for (int i = 0; i < MAX_TIMERS; i++) {
-		if (timers[i].tno == num)
-			return &timers[i];
+		if (g_timers[i].tno == num)
+			return &g_timers[i];
 	}
 	return NULL;
 }
@@ -109,9 +109,9 @@ static TIMER *allocateTimer(int num) {
 	assert(!findTimer(num)); // Allocating already existant timer
 
 	for (int i = 0; i < MAX_TIMERS; i++) {
-		if (!timers[i].tno) {
-			timers[i].tno = num;
-			return &timers[i];
+		if (!g_timers[i].tno) {
+			g_timers[i].tno = num;
+			return &g_timers[i];
 		}
 	}
 
@@ -123,23 +123,23 @@ static TIMER *allocateTimer(int num) {
  */
 void FettleTimers() {
 	for (int i = 0; i < MAX_TIMERS; i++) {
-		if (!timers[i].tno)
+		if (!g_timers[i].tno)
 			continue;
 
-		timers[i].ticks += timers[i].delta;	// Update tick value
+		g_timers[i].ticks += g_timers[i].delta;	// Update tick value
 
-		if (timers[i].frame) {
-			if (timers[i].ticks < 0)
-				timers[i].ticks = 0;	// Have reached zero
+		if (g_timers[i].frame) {
+			if (g_timers[i].ticks < 0)
+				g_timers[i].ticks = 0;	// Have reached zero
 		} else {
-			if (timers[i].ticks < 0) {
-				timers[i].ticks = ONE_SECOND;
-				timers[i].secs--;
-				if (timers[i].secs < 0)
-					timers[i].secs = 0;	// Have reached zero
-			} else if (timers[i].ticks == ONE_SECOND) {
-				timers[i].ticks = 0;
-				timers[i].secs++;		// Another second has passed
+			if (g_timers[i].ticks < 0) {
+				g_timers[i].ticks = ONE_SECOND;
+				g_timers[i].secs--;
+				if (g_timers[i].secs < 0)
+					g_timers[i].secs = 0;	// Have reached zero
+			} else if (g_timers[i].ticks == ONE_SECOND) {
+				g_timers[i].ticks = 0;
+				g_timers[i].secs++;		// Another second has passed
 			}
 		}
 	}
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 7fbec69cbf..c652abca25 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -74,11 +74,11 @@ namespace Tinsel {
 //----------------- EXTERNAL GLOBAL DATA --------------------
 
 // In DOS_DW.C
-extern bool bRestart;		// restart flag - set to restart the game
-extern bool bHasRestarted;	// Set after a restart
+extern bool g_bRestart;		// restart flag - set to restart the game
+extern bool g_bHasRestarted;	// Set after a restart
 
 // In PCODE.CPP
-extern bool bNoPause;
+extern bool g_bNoPause;
 
 // In DOS_MAIN.C
 // TODO/FIXME: From dos_main.c: "Only used on PSX so far"
@@ -100,7 +100,7 @@ extern int NewestSavedGame();
 
 // in SCENE.CPP
 extern void setshowpos();
-extern int sceneCtr;
+extern int g_sceneCtr;
 
 // in TINSEL.CPP
 extern void SetCdChangeScene(SCNHANDLE hScene);
@@ -122,10 +122,10 @@ SCNHANDLE GetSceneHandle();
 
 // FIXME: Avoid non-const global vars
 
-bool bEnableMenu;
+bool g_bEnableMenu;
 
-static bool bInstantScroll = false;
-static bool bEscapedCdPlay = false;
+static bool g_bInstantScroll = false;
+static bool g_bEscapedCdPlay = false;
 
 
 //----------------- LOCAL DEFINES --------------------
@@ -298,13 +298,13 @@ static const MASTER_LIB_CODES DW2_CODES[] = {
 // as it was at control(off).
 // They are global so that MoveCursor(..) has a net effect if it
 // precedes control(on).
-static int controlX = 0, controlY = 0;
+static int g_controlX = 0, g_controlY = 0;
 
-static int offtype = 0;			// used by Control()
-static uint32 lastValue = 0;	// used by RandomFn()
-static int scrollNumber = 0;	// used by scroll()
+static int g_offtype = 0;			// used by Control()
+static uint32 g_lastValue = 0;	// used by RandomFn()
+static int g_scrollNumber = 0;	// used by scroll()
 
-static bool bNotPointedRunning = false;	// Used in Printobj and PrintObjPointed
+static bool g_bNotPointedRunning = false;	// Used in Printobj and PrintObjPointed
 
 //----------------- FORWARD REFERENCES --------------------
 
@@ -404,7 +404,7 @@ static void ScrollMonitorProcess(CORO_PARAM, const void *param) {
 		CORO_SLEEP(1);
 
 		// give up if have been superseded
-		if (psm->thisScroll != scrollNumber)
+		if (psm->thisScroll != g_scrollNumber)
 			break;
 
 		// If ESCAPE is pressed...
@@ -706,7 +706,7 @@ static void CDload(SCNHANDLE start, SCNHANDLE next, int myEscape) {
 
 	if (TinselV2) {
 		if (myEscape && myEscape != GetEscEvents()) {
-			bEscapedCdPlay = true;
+			g_bEscapedCdPlay = true;
 			return;
 		}
 
@@ -754,14 +754,14 @@ void Control(int param) {
 	}
 
 	// Tinsel 1 handling code
-	bEnableMenu = false;
+	g_bEnableMenu = false;
 
 	switch (param) {
 	case CONTROL_STARTOFF:
 		GetControlToken();	// Take control
 		DisableTags();			// Switch off tags
 		DwHideCursor();			// Blank out cursor
-		offtype = param;
+		g_offtype = param;
 		break;
 
 	case CONTROL_OFF:
@@ -771,17 +771,17 @@ void Control(int param) {
 			GetControlToken();	// Take control
 
 			DisableTags();			// Switch off tags
-			GetCursorXYNoWait(&controlX, &controlY, true);	// Store cursor position
+			GetCursorXYNoWait(&g_controlX, &g_controlY, true);	// Store cursor position
 
 			// There may be a button timing out
 			GetToken(TOKEN_LEFT_BUT);
 			FreeToken(TOKEN_LEFT_BUT);
 		}
 
-		if (offtype == CONTROL_STARTOFF)
-			GetCursorXYNoWait(&controlX, &controlY, true);	// Store cursor position
+		if (g_offtype == CONTROL_STARTOFF)
+			GetCursorXYNoWait(&g_controlX, &g_controlY, true);	// Store cursor position
 
-		offtype = param;
+		g_offtype = param;
 
 		if (param == CONTROL_OFF)
 			DwHideCursor();		// Blank out cursor
@@ -794,8 +794,8 @@ void Control(int param) {
 		break;
 
 	case CONTROL_ON:
-		if (offtype != CONTROL_OFFV2 && offtype != CONTROL_STARTOFF)
-			SetCursorXY(controlX, controlY);// ... where it was
+		if (g_offtype != CONTROL_OFFV2 && g_offtype != CONTROL_STARTOFF)
+			SetCursorXY(g_controlX, g_controlY);// ... where it was
 
 		FreeControlToken();	// Release control
 
@@ -1092,7 +1092,7 @@ static void DropEverything() {
  * EnableMenu
  */
 static void EnableMenu() {
-	bEnableMenu = true;
+	g_bEnableMenu = true;
 }
 
 /**
@@ -1212,7 +1212,7 @@ static void HailScene(SCNHANDLE scene) {
  * Returns TRUE if the game has been restarted, FALSE if not.
  */
 static bool HasRestarted() {
-	return bHasRestarted;
+	return g_bHasRestarted;
 }
 
 /**
@@ -1308,7 +1308,7 @@ static int IdleTime() {
  * Set flag if InstantScroll(on), reset if InstantScroll(off)
  */
 void InstantScroll(int onoff) {
-	bInstantScroll = (onoff != 0);
+	g_bInstantScroll = (onoff != 0);
 }
 
 /**
@@ -1419,8 +1419,8 @@ static int LToffset(int lort) {
 static void MoveCursor(int x, int y) {
 	SetCursorXY(x, y);
 
-	controlX = x;		// Save these values so that
-	controlY = y;		// control(on) doesn't undo this
+	g_controlX = x;		// Save these values so that
+	g_controlY = y;		// control(on) doesn't undo this
 }
 
 /**
@@ -1465,7 +1465,7 @@ void NewScene(CORO_PARAM, SCNHANDLE scene, int entrance, int transition) {
 		GetControl(CONTROL_STARTOFF);
 
 	if (TinselV1)
-		++sceneCtr;
+		++g_sceneCtr;
 
 	// Prevent code subsequent to this call running before scene changes
 	if (g_scheduler->getCurrentPID() != PID_MASTER_SCR)
@@ -1541,8 +1541,8 @@ static void Play(CORO_PARAM, SCNHANDLE hFilm, int x, int y, int compit, int acto
 
 
 	// Don't do CDPlay() for now if already escaped
-	if (bEscapedCdPlay) {
-		bEscapedCdPlay = false;
+	if (g_bEscapedCdPlay) {
+		g_bEscapedCdPlay = false;
 		return;
 	}
 
@@ -1583,8 +1583,8 @@ static void Play(CORO_PARAM, SCNHANDLE hFilm, int x, int y, bool bComplete, int
 	assert(hFilm != 0);
 
 	// Don't do CdPlay() for now if already escaped
-	if (bEscapedCdPlay) {
-		bEscapedCdPlay = false;
+	if (g_bEscapedCdPlay) {
+		g_bEscapedCdPlay = false;
 		return;
 	}
 
@@ -2068,11 +2068,11 @@ static void PrintObj(CORO_PARAM, const SCNHANDLE hText, const INV_OBJECT *pinvo,
 	_ctx->myEscape = myEscape;
 
 	if (hText == (SCNHANDLE)-1) {	// 'OFF'
-		bNotPointedRunning = true;
+		g_bNotPointedRunning = true;
 		return;
 	}
 	if (hText == (SCNHANDLE)-2) {	// 'ON'
-		bNotPointedRunning = false;
+		g_bNotPointedRunning = false;
 		return;
 	}
 
@@ -2092,10 +2092,10 @@ static void PrintObj(CORO_PARAM, const SCNHANDLE hText, const INV_OBJECT *pinvo,
 	* POINT/other event PrintObj() arbitration...
 	*/
 	if (event != POINTED) {
-		bNotPointedRunning = true;	// Get POINTED text to die
+		g_bNotPointedRunning = true;	// Get POINTED text to die
 		CORO_SLEEP(1);		// Give it chance to
 	} else if (!TinselV2)
-		bNotPointedRunning = false;	// There may have been an OFF without an ON
+		g_bNotPointedRunning = false;	// There may have been an OFF without an ON
 
 	// Make multi-ones escape
 	if (TinselV2 && (SubStringCount(hText) > 1) && !_ctx->myEscape)
@@ -2163,12 +2163,12 @@ static void PrintObj(CORO_PARAM, const SCNHANDLE hText, const INV_OBJECT *pinvo,
 						break;
 
 					// Give way to non-POINTED-generated text
-					if (bNotPointedRunning) {
+					if (g_bNotPointedRunning) {
 						// Delete the text, and wait for the all-clear
 						MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), _ctx->pText);
 						_ctx->pText = NULL;
 
-						while (bNotPointedRunning)
+						while (g_bNotPointedRunning)
 							CORO_SLEEP(1);
 
 						GetCursorXY(&x, &y, false);
@@ -2262,7 +2262,7 @@ static void PrintObj(CORO_PARAM, const SCNHANDLE hText, const INV_OBJECT *pinvo,
 
 	// Let POINTED text back in if this is the last
 	if (event != POINTED)
-		bNotPointedRunning = false;
+		g_bNotPointedRunning = false;
 
 	CORO_END_CODE;
 }
@@ -2281,11 +2281,11 @@ static void PrintObjPointed(CORO_PARAM, const SCNHANDLE text, const INV_OBJECT *
 				break;
 
 			// Give way to non-POINTED-generated text
-			if (bNotPointedRunning) {
+			if (g_bNotPointedRunning) {
 				// Delete the text, and wait for the all-clear
 				MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), pText);
 				pText = NULL;
-				while (bNotPointedRunning)
+				while (g_bNotPointedRunning)
 					CORO_SLEEP(1);
 
 				GetCursorXY(&x, &y, false);
@@ -2372,7 +2372,7 @@ static void PrintObjNonPointed(CORO_PARAM, const SCNHANDLE text, const OBJECT *p
 			}
 		} while (1);
 
-		bNotPointedRunning = false;	// Let POINTED text back in
+		g_bNotPointedRunning = false;	// Let POINTED text back in
 
 		if (_ctx->took_control)
 			Control(CONTROL_ON);	// Free control if we took it
@@ -2425,9 +2425,9 @@ static int RandomFn(int n1, int n2, int norpt) {
 
 	do {
 		value = n1 + _vm->getRandomNumber(n2 - n1);
-	} while ((lastValue == value) && (norpt == RAND_NORPT) && (++i <= 10));
+	} while ((g_lastValue == value) && (norpt == RAND_NORPT) && (++i <= 10));
 
-	lastValue = value;
+	g_lastValue = value;
 	return value;
 }
 
@@ -2446,8 +2446,8 @@ void FnRestartGame() {
 	StopMidi();
 	StopSample();
 
-	bRestart = true;
-	sceneCtr = 0;
+	g_bRestart = true;
+	g_sceneCtr = 0;
 }
 
 /**
@@ -2554,15 +2554,15 @@ static void Scroll(CORO_PARAM, EXTREME extreme, int xp, int yp, int xIter, int y
 
 	CORO_BEGIN_CODE(_ctx);
 
-	++scrollNumber;
+	++g_scrollNumber;
 	_ctx->x = xp;
 	_ctx->y = yp;
 
-	if ((TinselV2 && bInstantScroll) || (escOn && myEscape != GetEscEvents())) {
+	if ((TinselV2 && g_bInstantScroll) || (escOn && myEscape != GetEscEvents())) {
 		// Instant completion!
 		Offset(extreme, _ctx->x, _ctx->y);
 	} else {
-		_ctx->thisScroll = scrollNumber;
+		_ctx->thisScroll = g_scrollNumber;
 		if (TinselV2)
 			DecodeExtreme(extreme, &_ctx->x, &_ctx->y);
 
@@ -2581,7 +2581,7 @@ static void Scroll(CORO_PARAM, EXTREME extreme, int xp, int yp, int xIter, int y
 				}
 
 				// give up if have been superseded
-				if (_ctx->thisScroll != scrollNumber)
+				if (_ctx->thisScroll != g_scrollNumber)
 					CORO_KILL_SELF();
 
 				PlayfieldGetPos(FIELD_WORLD, &Loffset, &Toffset);
@@ -2592,7 +2592,7 @@ static void Scroll(CORO_PARAM, EXTREME extreme, int xp, int yp, int xIter, int y
 			// Scroll is escapable even though we're not waiting for it
 			sm.x = _ctx->x;
 			sm.y = _ctx->y;
-			sm.thisScroll = scrollNumber;
+			sm.thisScroll = g_scrollNumber;
 			sm.myEscape = myEscape;
 			g_scheduler->createProcess(PID_TCODE, ScrollMonitorProcess, &sm, sizeof(sm));
 		}
@@ -3410,8 +3410,8 @@ static void TalkOrSay(CORO_PARAM, SPEECH_TYPE speechType, SCNHANDLE hText, int x
 
 		if (TinselV2 && _ctx->bSample) {
 			// Kick off the sample now (perhaps with a delay)
-			if (bNoPause)
-				bNoPause = false;
+			if (g_bNoPause)
+				g_bNoPause = false;
 			else if (!IsDemo)
 				CORO_SLEEP(SysVar(SV_SPEECHDELAY));
 
@@ -4899,7 +4899,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 
 	case NOPAUSE:
 		// DW2 only
-		bNoPause = true;
+		g_bNoPause = true;
 		return 0;
 
 	case NOSCROLL:
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index cd0f9b9fa4..65900cc7f3 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -66,7 +66,7 @@ namespace Tinsel {
 // In BG.CPP
 extern void SetDoFadeIn(bool tf);
 extern void DropBackground();
-extern const BACKGND *pCurBgnd;
+extern const BACKGND *g_pCurBgnd;
 
 // In CURSOR.CPP
 extern void CursorProcess(CORO_PARAM, const void *);
@@ -85,16 +85,16 @@ void SetNewScene(SCNHANDLE scene, int entrance, int transition);
 
 // FIXME: Avoid non-const global vars
 
-bool bRestart = false;
-bool bHasRestarted = false;
-bool loadingFromGMM = false;
+bool g_bRestart = false;
+bool g_bHasRestarted = false;
+bool g_loadingFromGMM = false;
 
-static bool bCuttingScene = false;
+static bool g_bCuttingScene = false;
 
-static bool bChangingForRestore = false;
+static bool g_bChangingForRestore = false;
 
 #ifdef DEBUG
-bool bFast;		// set to make it go ludicrously fast
+bool g_bFast;		// set to make it go ludicrously fast
 #endif
 
 //----------------- LOCAL GLOBAL DATA --------------------
@@ -105,14 +105,14 @@ struct Scene {
 	int	trans;		// Transition - not yet used
 };
 
-static Scene NextScene = { 0, 0, 0 };
-static Scene HookScene = { 0, 0, 0 };
-static Scene DelayedScene = { 0, 0, 0 };
+static Scene g_NextScene = { 0, 0, 0 };
+static Scene g_HookScene = { 0, 0, 0 };
+static Scene g_DelayedScene = { 0, 0, 0 };
 
-static PROCESS *pMouseProcess = 0;
-static PROCESS *pKeyboardProcess = 0;
+static PROCESS *g_pMouseProcess = 0;
+static PROCESS *g_pKeyboardProcess = 0;
 
-static SCNHANDLE hCdChangeScene;
+static SCNHANDLE g_hCdChangeScene;
 
 //----------------- LOCAL PROCEDURES --------------------
 
@@ -457,49 +457,49 @@ static void MasterScriptProcess(CORO_PARAM, const void *) {
  * Store the facts pertaining to a scene change.
  */
 void SetNewScene(SCNHANDLE scene, int entrance, int transition) {
-	if (!bCuttingScene && TinselV2)
+	if (!g_bCuttingScene && TinselV2)
 		WrapScene();
 
 	// If we're loading from the GMM, load the scene as a delayed one
-	if (loadingFromGMM) {
-		DelayedScene.scene = scene;
-		DelayedScene.entry = entrance;
-		DelayedScene.trans = transition;
-		loadingFromGMM = false;
+	if (g_loadingFromGMM) {
+		g_DelayedScene.scene = scene;
+		g_DelayedScene.entry = entrance;
+		g_DelayedScene.trans = transition;
+		g_loadingFromGMM = false;
 		return;
 	}
 
 	// If CD change will be required, stick in the scene change scene
 	if (CdNumber(scene) != GetCurrentCD()) {
 		// This scene gets delayed
-		DelayedScene.scene = scene;
-		DelayedScene.entry = entrance;
-		DelayedScene.trans = transition;
+		g_DelayedScene.scene = scene;
+		g_DelayedScene.entry = entrance;
+		g_DelayedScene.trans = transition;
 
-		NextScene.scene = hCdChangeScene;
-		NextScene.entry = CdNumber(scene) - '0';
-		NextScene.trans = TRANS_FADE;
+		g_NextScene.scene = g_hCdChangeScene;
+		g_NextScene.entry = CdNumber(scene) - '0';
+		g_NextScene.trans = TRANS_FADE;
 
 		return;
 	}
 
-	if (HookScene.scene == 0 || bCuttingScene) {
+	if (g_HookScene.scene == 0 || g_bCuttingScene) {
 		// This scene comes next
-		NextScene.scene = scene;
-		NextScene.entry = entrance;
-		NextScene.trans = transition;
+		g_NextScene.scene = scene;
+		g_NextScene.entry = entrance;
+		g_NextScene.trans = transition;
 	} else {
 		// This scene gets delayed
-		DelayedScene.scene = scene;
-		DelayedScene.entry = entrance;
-		DelayedScene.trans = transition;
+		g_DelayedScene.scene = scene;
+		g_DelayedScene.entry = entrance;
+		g_DelayedScene.trans = transition;
 
 		// The hooked scene comes next
-		NextScene.scene = HookScene.scene;
-		NextScene.entry = HookScene.entry;
-		NextScene.trans = HookScene.trans;
+		g_NextScene.scene = g_HookScene.scene;
+		g_NextScene.entry = g_HookScene.entry;
+		g_NextScene.trans = g_HookScene.trans;
 
-		HookScene.scene = 0;
+		g_HookScene.scene = 0;
 	}
 
 	// Workaround for "Missing Red Dragon in square" bug in Discworld 1 PSX, act IV.
@@ -509,10 +509,10 @@ void SetNewScene(SCNHANDLE scene, int entrance, int transition) {
 	// I'm forcing the load of the right scene by checking that the player has (or has not) the
 	// right items: player must have Mambo the swamp dragon, and mustn't have fireworks (used on
 	// the swamp dragon previously to "load it up").
-	if (TinselV1PSX && NextScene.scene == 0x1800000 && NextScene.entry == 2) {
+	if (TinselV1PSX && g_NextScene.scene == 0x1800000 && g_NextScene.entry == 2) {
 		if ((IsInInventory(261, INV_1) || IsInInventory(261, INV_2)) &&
 			(!IsInInventory(232, INV_1) && !IsInInventory(232, INV_2)))
-			NextScene.entry = 1;
+			g_NextScene.entry = 1;
 	}
 }
 
@@ -520,72 +520,72 @@ void SetNewScene(SCNHANDLE scene, int entrance, int transition) {
  * Store a scene as hooked
  */
 void SetHookScene(SCNHANDLE scene, int entrance, int transition) {
-	assert(HookScene.scene == 0); // scene already hooked
+	assert(g_HookScene.scene == 0); // scene already hooked
 
-	HookScene.scene = scene;
-	HookScene.entry = entrance;
-	HookScene.trans = transition;
+	g_HookScene.scene = scene;
+	g_HookScene.entry = entrance;
+	g_HookScene.trans = transition;
 }
 
 /**
  * Hooked scene is over, trigger a change to the delayed scene
  */
 void UnHookScene() {
-	assert(DelayedScene.scene != 0); // no scene delayed
+	assert(g_DelayedScene.scene != 0); // no scene delayed
 
 	// The delayed scene can go now
-	NextScene.scene = DelayedScene.scene;
-	NextScene.entry = DelayedScene.entry;
-	NextScene.trans = DelayedScene.trans;
+	g_NextScene.scene = g_DelayedScene.scene;
+	g_NextScene.entry = g_DelayedScene.entry;
+	g_NextScene.trans = g_DelayedScene.trans;
 
-	DelayedScene.scene = 0;
+	g_DelayedScene.scene = 0;
 }
 
 void SuspendHook() {
-	bCuttingScene = true;
+	g_bCuttingScene = true;
 }
 
 void CdHasChanged() {
-	if (bChangingForRestore) {
-		bChangingForRestore = false;
+	if (g_bChangingForRestore) {
+		g_bChangingForRestore = false;
 		RestoreGame(-2);
 	} else {
-		assert(DelayedScene.scene != 0);
+		assert(g_DelayedScene.scene != 0);
 
 		WrapScene();
 
 		// The delayed scene can go now
-		NextScene.scene = DelayedScene.scene;
-		NextScene.entry = DelayedScene.entry;
-		NextScene.trans = DelayedScene.trans;
+		g_NextScene.scene = g_DelayedScene.scene;
+		g_NextScene.entry = g_DelayedScene.entry;
+		g_NextScene.trans = g_DelayedScene.trans;
 
-		DelayedScene.scene = 0;
+		g_DelayedScene.scene = 0;
 	}
 }
 
 void SetCdChangeScene(SCNHANDLE hScene) {
-	hCdChangeScene = hScene;
+	g_hCdChangeScene = hScene;
 }
 
 void CDChangeForRestore(int cdNumber) {
-	NextScene.scene = hCdChangeScene;
-	NextScene.entry = cdNumber;
-	NextScene.trans = TRANS_FADE;
-	bChangingForRestore = true;
+	g_NextScene.scene = g_hCdChangeScene;
+	g_NextScene.entry = cdNumber;
+	g_NextScene.trans = TRANS_FADE;
+	g_bChangingForRestore = true;
 }
 
 void UnSuspendHook() {
-	bCuttingScene = false;
+	g_bCuttingScene = false;
 }
 
 void syncSCdata(Common::Serializer &s) {
-	s.syncAsUint32LE(HookScene.scene);
-	s.syncAsSint32LE(HookScene.entry);
-	s.syncAsSint32LE(HookScene.trans);
+	s.syncAsUint32LE(g_HookScene.scene);
+	s.syncAsSint32LE(g_HookScene.entry);
+	s.syncAsSint32LE(g_HookScene.trans);
 
-	s.syncAsUint32LE(DelayedScene.scene);
-	s.syncAsSint32LE(DelayedScene.entry);
-	s.syncAsSint32LE(DelayedScene.trans);
+	s.syncAsUint32LE(g_DelayedScene.scene);
+	s.syncAsSint32LE(g_DelayedScene.entry);
+	s.syncAsSint32LE(g_DelayedScene.trans);
 }
 
 
@@ -640,16 +640,16 @@ bool ChangeScene(bool bReset) {
 	// Prevent attempt to fade-out when restarting game
 	if (bReset) {
 		CountOut = 1;	// immediate start of first scene again
-		DelayedScene.scene = HookScene.scene = 0;
+		g_DelayedScene.scene = g_HookScene.scene = 0;
 		return false;
 	}
 
 	if (IsRestoringScene())
 		return true;
 
-	if (NextScene.scene != 0) {
+	if (g_NextScene.scene != 0) {
 		if (!CountOut) {
-			switch (NextScene.trans) {
+			switch (g_NextScene.trans) {
 			case TRANS_CUT:
 				CountOut = 1;
 				break;
@@ -667,10 +667,10 @@ bool ChangeScene(bool bReset) {
 			if (!TinselV2)
 				ClearScreen();
 
-			StartNewScene(NextScene.scene, NextScene.entry);
-			NextScene.scene = 0;
+			StartNewScene(g_NextScene.scene, g_NextScene.entry);
+			g_NextScene.scene = 0;
 
-			switch (NextScene.trans) {
+			switch (g_NextScene.trans) {
 			case TRANS_CUT:
 				SetDoFadeIn(false);
 				break;
@@ -691,7 +691,7 @@ bool ChangeScene(bool bReset) {
  * CuttingScene
  */
 void CuttingScene(bool bCutting) {
-	bCuttingScene = bCutting;
+	g_bCuttingScene = bCutting;
 
 	if (!bCutting)
 		WrapScene();
@@ -927,7 +927,7 @@ Common::Error TinselEngine::run() {
 	RebootTimers();
 	RebootScalingReels();
 
-	DelayedScene.scene = HookScene.scene = 0;
+	g_DelayedScene.scene = g_HookScene.scene = 0;
 #endif
 
 	// Load in text strings
@@ -957,7 +957,7 @@ Common::Error TinselEngine::run() {
 
 	if (ConfMan.hasKey("save_slot")) {
 		if (loadGameState(ConfMan.getInt("save_slot")).getCode() == Common::kNoError)
-			loadingFromGMM = true;
+			g_loadingFromGMM = true;
 	}
 
 	// Foreground loop
@@ -973,10 +973,10 @@ Common::Error TinselEngine::run() {
 			NextGameCycle();
 		}
 
-		if (bRestart) {
+		if (g_bRestart) {
 			RestartGame();
-			bRestart = false;
-			bHasRestarted = true;	// Set restarted flag
+			g_bRestart = false;
+			g_bHasRestarted = true;	// Set restarted flag
 		}
 
 		// Save/Restore scene file transfers
@@ -986,7 +986,7 @@ Common::Error TinselEngine::run() {
 		_bmv->FettleBMV();
 
 #ifdef DEBUG
-		if (bFast)
+		if (g_bFast)
 			continue;		// run flat-out
 #endif
 		// Loop processing events while there are any pending
@@ -1005,7 +1005,7 @@ Common::Error TinselEngine::run() {
 	_vm->_config->writeToDisk();
 
 	EndScene();
-	pCurBgnd = NULL;
+	g_pCurBgnd = NULL;
 
 	return Common::kNoError;
 }
@@ -1106,7 +1106,7 @@ void TinselEngine::RestartGame() {
 	RebootTimers();
 	RebootScalingReels();
 
-	DelayedScene.scene = HookScene.scene = 0;
+	g_DelayedScene.scene = g_HookScene.scene = 0;
 
 	// remove keyboard, mouse and joystick drivers
 	ChopDrivers();
@@ -1135,8 +1135,8 @@ void TinselEngine::RestartDrivers() {
 	_scheduler->reset();
 
 	// init the event handlers
-	pMouseProcess = _scheduler->createProcess(PID_MOUSE, MouseProcess, NULL, 0);
-	pKeyboardProcess = _scheduler->createProcess(PID_KEYBOARD, KeyboardProcess, NULL, 0);
+	g_pMouseProcess = _scheduler->createProcess(PID_MOUSE, MouseProcess, NULL, 0);
+	g_pKeyboardProcess = _scheduler->createProcess(PID_KEYBOARD, KeyboardProcess, NULL, 0);
 
 	// open MIDI files
 	OpenMidiFiles();
@@ -1164,8 +1164,8 @@ void TinselEngine::ChopDrivers() {
 	DeleteMidiBuffer();
 
 	// remove event drivers
-	_scheduler->killProcess(pMouseProcess);
-	_scheduler->killProcess(pKeyboardProcess);
+	_scheduler->killProcess(g_pMouseProcess);
+	_scheduler->killProcess(g_pKeyboardProcess);
 }
 
 /**
diff --git a/engines/tinsel/token.cpp b/engines/tinsel/token.cpp
index c7490a100b..c26fa40466 100644
--- a/engines/tinsel/token.cpp
+++ b/engines/tinsel/token.cpp
@@ -34,7 +34,7 @@ struct Token {
 	PROCESS		*proc;
 };
 
-static Token tokens[NUMTOKENS];	// FIXME: Avoid non-const global vars
+static Token g_tokens[NUMTOKENS];	// FIXME: Avoid non-const global vars
 
 
 /**
@@ -44,8 +44,8 @@ static void TerminateProcess(PROCESS *tProc) {
 
 	// Release tokens held by the process
 	for (int i = 0; i < NUMTOKENS; i++) {
-		if (tokens[i].proc == tProc) {
-			tokens[i].proc = NULL;
+		if (g_tokens[i].proc == tProc) {
+			g_tokens[i].proc = NULL;
 		}
 	}
 
@@ -59,8 +59,8 @@ static void TerminateProcess(PROCESS *tProc) {
 void GetControlToken() {
 	const int which = TOKEN_CONTROL;
 
-	if (tokens[which].proc == NULL) {
-		tokens[which].proc = g_scheduler->getCurrentProcess();
+	if (g_tokens[which].proc == NULL) {
+		g_tokens[which].proc = g_scheduler->getCurrentProcess();
 	}
 }
 
@@ -69,7 +69,7 @@ void GetControlToken() {
  */
 void FreeControlToken() {
 	// Allow anyone to free TOKEN_CONTROL
-	tokens[TOKEN_CONTROL].proc = NULL;
+	g_tokens[TOKEN_CONTROL].proc = NULL;
 }
 
 
@@ -84,12 +84,12 @@ void FreeControlToken() {
 void GetToken(int which) {
 	assert(TOKEN_LEAD <= which && which < NUMTOKENS);
 
-	if (tokens[which].proc != NULL) {
-		assert(tokens[which].proc != g_scheduler->getCurrentProcess());
-		TerminateProcess(tokens[which].proc);
+	if (g_tokens[which].proc != NULL) {
+		assert(g_tokens[which].proc != g_scheduler->getCurrentProcess());
+		TerminateProcess(g_tokens[which].proc);
 	}
 
-	tokens[which].proc = g_scheduler->getCurrentProcess();
+	g_tokens[which].proc = g_scheduler->getCurrentProcess();
 }
 
 /**
@@ -99,9 +99,9 @@ void GetToken(int which) {
 void FreeToken(int which) {
 	assert(TOKEN_LEAD <= which && which < NUMTOKENS);
 
-	assert(tokens[which].proc == g_scheduler->getCurrentProcess());	// we'd have been killed if some other proc had taken this token
+	assert(g_tokens[which].proc == g_scheduler->getCurrentProcess());	// we'd have been killed if some other proc had taken this token
 
-	tokens[which].proc = NULL;
+	g_tokens[which].proc = NULL;
 }
 
 /**
@@ -111,7 +111,7 @@ bool TestToken(int which) {
 	if (which < 0 || which >= NUMTOKENS)
 		return false;
 
-	return (tokens[which].proc == NULL);
+	return (g_tokens[which].proc == NULL);
 }
 
 /**
@@ -119,7 +119,7 @@ bool TestToken(int which) {
  */
 void FreeAllTokens() {
 	for (int i = 0; i < NUMTOKENS; i++) {
-		tokens[i].proc = NULL;
+		g_tokens[i].proc = NULL;
 	}
 }
 
-- 
cgit v1.2.3


From 256d160679eb211e9a38fbcf18ee5fedd232fc72 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Wed, 22 Feb 2012 19:06:29 +0100
Subject: DREAMWEB: Remove shared temp graphics variables.

Instead, have a different variable for each use.
---
 engines/dreamweb/dreamweb.h   |  35 ++++++++------
 engines/dreamweb/keypad.cpp   | 110 +++++++++++++++++++++---------------------
 engines/dreamweb/monitor.cpp  |  38 +++++++--------
 engines/dreamweb/newplace.cpp |  38 +++++++--------
 engines/dreamweb/print.cpp    |   4 +-
 engines/dreamweb/saveload.cpp |  42 ++++++++--------
 engines/dreamweb/stubs.cpp    |  76 ++++++++++++-----------------
 engines/dreamweb/titles.cpp   |   9 ++--
 engines/dreamweb/use.cpp      |   4 +-
 9 files changed, 174 insertions(+), 182 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 38016e5897..c67dfb3660 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -265,13 +265,28 @@ protected:
 	TextFile _puzzleText;
 	TextFile _commandText;
 
-	// graphics files
-	GraphicsFile _tempGraphics;
-	GraphicsFile _tempGraphics2;
-	GraphicsFile _tempGraphics3;
+	// local graphics files
+	GraphicsFile _keypadGraphics;
+	GraphicsFile _menuGraphics;
+	GraphicsFile _menuGraphics2;
+	GraphicsFile _folderGraphics;
+	GraphicsFile _folderGraphics2;
+	GraphicsFile _folderGraphics3;
+	GraphicsFile _folderCharset;
+	GraphicsFile _symbolGraphics;
+	GraphicsFile _diaryGraphics;
+	GraphicsFile _diaryCharset;
+	GraphicsFile _monitorGraphics;
+	GraphicsFile _monitorCharset;
+	GraphicsFile _newplaceGraphics;
+	GraphicsFile _newplaceGraphics2;
+	GraphicsFile _newplaceGraphics3;
+	GraphicsFile _cityGraphics;
+	GraphicsFile _saveGraphics;
+
+	// global graphics files
 	GraphicsFile _icons1;
 	GraphicsFile _icons2;
-	GraphicsFile _tempCharset;
 	GraphicsFile _charset1;
 	GraphicsFile _mainSprites;
 	const GraphicsFile *_currentCharset;
@@ -797,15 +812,11 @@ public:
 	void loadGraphicsFile(GraphicsFile &file, const char *fileName);
 	void loadGraphicsSegment(GraphicsFile &file, Common::File &inFile, unsigned int len);
 	void loadTextSegment(TextFile &file, Common::File &inFile, unsigned int len);
-	void loadIntoTemp(const char *fileName);
-	void loadIntoTemp2(const char *fileName);
-	void loadIntoTemp3(const char *fileName);
-	void loadTempCharset(const char *fileName);
 	void loadTravelText();
 	void loadTempText(const char *fileName);
 	void sortOutMap();
 	void loadRoomData(const Room &room, bool skipDat);
-	void useTempCharset();
+	void useTempCharset(GraphicsFile *charset);
 	void useCharset1();
 	void printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered);
 	void printMessage2(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered, uint8 count);
@@ -848,11 +859,7 @@ public:
 	bool isItWorn(const DynObject *object);
 	bool compare(uint8 index, uint8 flag, const char id[4]);
 	void hangOnW(uint16 frameCount);
-	void getRidOfTemp();
 	void getRidOfTempText();
-	void getRidOfTemp2();
-	void getRidOfTemp3();
-	void getRidOfTempCharset();
 	void getRidOfAll();
 	void placeSetObject(uint8 index);
 	void removeSetObject(uint8 index);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 2a31652ace..172e85104f 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -93,7 +93,7 @@ void DreamWebEngine::enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 d
 		}
 	}
 	_manIsOffScreen = 0;
-	getRidOfTemp();
+	_keypadGraphics.clear();
 	restoreReels();
 	redrawMainScrn();
 	workToScreenM();
@@ -108,7 +108,7 @@ bool DreamWebEngine::isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 d
 }
 
 void DreamWebEngine::loadKeypad() {
-	loadIntoTemp("DREAMWEB.G02");
+	loadGraphicsFile(_keypadGraphics, "DREAMWEB.G02");
 }
 
 void DreamWebEngine::quitKey() {
@@ -185,8 +185,8 @@ void DreamWebEngine::buttonPress(uint8 buttonId) {
 }
 
 void DreamWebEngine::showOuterPad() {
-	showFrame(_tempGraphics, kKeypadx-3, kKeypady-4, 1, 0);
-	showFrame(_tempGraphics, kKeypadx+74, kKeypady+76, 37, 0);
+	showFrame(_keypadGraphics, kKeypadx-3, kKeypady-4, 1, 0);
+	showFrame(_keypadGraphics, kKeypadx+74, kKeypady+76, 37, 0);
 }
 
 void DreamWebEngine::showKeypad() {
@@ -214,7 +214,7 @@ void DreamWebEngine::showKeypad() {
 		}
 		if ((_lightCount >= 60) && (_lightCount < 100))
 			--frameIndex;
-		showFrame(_tempGraphics, kKeypadx+60, y, frameIndex, 0);
+		showFrame(_keypadGraphics, kKeypadx+60, y, frameIndex, 0);
 	}
 }
 
@@ -225,7 +225,7 @@ void DreamWebEngine::singleKey(uint8 key, uint16 x, uint16 y) {
 			key -= 11;
 	}
 	key -= 20;
-	showFrame(_tempGraphics, x, y, key, 0);
+	showFrame(_keypadGraphics, x, y, key, 0);
 }
 
 void DreamWebEngine::dumpKeypad() {
@@ -241,9 +241,9 @@ void DreamWebEngine::useMenu() {
 	_vars._newObs = 0;
 	drawFloor();
 	printSprites();
-	showFrame(_tempGraphics2, kMenux-48, kMenuy-4, 4, 0);
+	showFrame(_menuGraphics2, kMenux-48, kMenuy-4, 4, 0);
 	getUnderMenu();
-	showFrame(_tempGraphics2, kMenux+54, kMenuy+72, 5, 0);
+	showFrame(_menuGraphics2, kMenux+54, kMenuy+72, 5, 0);
 	workToScreenM();
 	_getBack = 0;
 	do {
@@ -265,8 +265,8 @@ void DreamWebEngine::useMenu() {
 	} while ((_getBack != 1) && !_quitRequested);
 	_manIsOffScreen = 0;
 	redrawMainScrn();
-	getRidOfTemp();
-	getRidOfTemp2();
+	_menuGraphics.clear();
+	_menuGraphics2.clear();
 	restoreReels();
 	workToScreenM();
 }
@@ -289,12 +289,12 @@ void DreamWebEngine::showMenu() {
 	++_menuCount;
 	if (_menuCount == 37*2)
 		_menuCount = 0;
-	showFrame(_tempGraphics, kMenux, kMenuy, _menuCount / 2, 0);
+	showFrame(_menuGraphics, kMenux, kMenuy, _menuCount / 2, 0);
 }
 
 void DreamWebEngine::loadMenu() {
-	loadIntoTemp("DREAMWEB.S02"); // sprite name 3
-	loadIntoTemp2("DREAMWEB.G07"); // mon. graphics 2
+	loadGraphicsFile(_menuGraphics, "DREAMWEB.S02"); // sprite name 3
+	loadGraphicsFile(_menuGraphics2, "DREAMWEB.G07"); // mon. graphics 2
 }
 
 void DreamWebEngine::viewFolder() {
@@ -317,10 +317,10 @@ void DreamWebEngine::viewFolder() {
 		checkFolderCoords();
 	} while (_getBack == 0);
 	_manIsOffScreen = 0;
-	getRidOfTemp();
-	getRidOfTemp2();
-	getRidOfTemp3();
-	getRidOfTempCharset();
+	_folderGraphics.clear();
+	_folderGraphics2.clear();
+	_folderGraphics3.clear();
+	_folderCharset.clear();
 	restoreAll();
 	redrawMainScrn();
 	workToScreenM();
@@ -394,22 +394,22 @@ void DreamWebEngine::checkFolderCoords() {
 }
 
 void DreamWebEngine::loadFolder() {
-	loadIntoTemp("DREAMWEB.G09"); // folder graphics 1
-	loadIntoTemp2("DREAMWEB.G10"); // folder graphics 2
-	loadIntoTemp3("DREAMWEB.G11"); // folder graphics 3
-	loadTempCharset("DREAMWEB.C02"); // character set 3
+	loadGraphicsFile(_folderGraphics, "DREAMWEB.G09"); // folder graphics 1
+	loadGraphicsFile(_folderGraphics2, "DREAMWEB.G10"); // folder graphics 2
+	loadGraphicsFile(_folderGraphics3, "DREAMWEB.G11"); // folder graphics 3
+	loadGraphicsFile(_folderCharset, "DREAMWEB.C02"); // character set 3
 	loadTempText("DREAMWEB.T50"); // folder text
 }
 
 void DreamWebEngine::showFolder() {
 	_commandType = 255;
 	if (_folderPage) {
-		useTempCharset();
+		useTempCharset(&_folderCharset);
 		createPanel2();
-		showFrame(_tempGraphics, 0, 0, 0, 0);
-		showFrame(_tempGraphics, 143, 0, 1, 0);
-		showFrame(_tempGraphics, 0, 92, 2, 0);
-		showFrame(_tempGraphics, 143, 92, 3, 0);
+		showFrame(_folderGraphics, 0, 0, 0, 0);
+		showFrame(_folderGraphics, 143, 0, 1, 0);
+		showFrame(_folderGraphics, 0, 92, 2, 0);
+		showFrame(_folderGraphics, 143, 92, 3, 0);
 		folderExit();
 		if (_folderPage != 1)
 			showLeftPage();
@@ -419,25 +419,25 @@ void DreamWebEngine::showFolder() {
 		underTextLine();
 	} else {
 		createPanel2();
-		showFrame(_tempGraphics3, 143-28, 0, 0, 0);
-		showFrame(_tempGraphics3, 143-28, 92, 1, 0);
+		showFrame(_folderGraphics3, 143-28, 0, 0, 0);
+		showFrame(_folderGraphics3, 143-28, 92, 1, 0);
 		folderExit();
 		underTextLine();
 	}
 }
 
 void DreamWebEngine::folderExit() {
-	showFrame(_tempGraphics2, 296, 178, 6, 0);
+	showFrame(_folderGraphics2, 296, 178, 6, 0);
 }
 
 void DreamWebEngine::showLeftPage() {
-	showFrame(_tempGraphics2, 0, 12, 3, 0);
+	showFrame(_folderGraphics2, 0, 12, 3, 0);
 	uint16 y = 12+5;
 	for (size_t i = 0; i < 9; ++i) {
-		showFrame(_tempGraphics2, 0, y, 4, 0);
+		showFrame(_folderGraphics2, 0, y, 4, 0);
 		y += 16;
 	}
-	showFrame(_tempGraphics2, 0, y, 5, 0);
+	showFrame(_folderGraphics2, 0, y, 5, 0);
 	_lineSpacing = 8;
 	_charShift = 91;
 	_kerning = 1;
@@ -464,14 +464,14 @@ void DreamWebEngine::showLeftPage() {
 }
 
 void DreamWebEngine::showRightPage() {
-	showFrame(_tempGraphics2, 143, 12, 0, 0);
+	showFrame(_folderGraphics2, 143, 12, 0, 0);
 	uint16 y = 12+37;
 	for (size_t i = 0; i < 7; ++i) {
-		showFrame(_tempGraphics2, 143, y, 1, 0);
+		showFrame(_folderGraphics2, 143, y, 1, 0);
 		y += 16;
 	}
 
-	showFrame(_tempGraphics2, 143, y, 2, 0);
+	showFrame(_folderGraphics2, 143, y, 2, 0);
 	_lineSpacing = 8;
 	_kerning = 1;
 	uint8 pageIndex = _folderPage - 1;
@@ -491,7 +491,7 @@ void DreamWebEngine::showRightPage() {
 void DreamWebEngine::enterSymbol() {
 	_manIsOffScreen = 1;
 	getRidOfReels();
-	loadIntoTemp("DREAMWEB.G12"); // symbol graphics
+	loadGraphicsFile(_symbolGraphics, "DREAMWEB.G12"); // symbol graphics
 	_symbolTopX = 24;
 	_symbolTopDir = 0;
 	_symbolBotX = 24;
@@ -529,7 +529,7 @@ void DreamWebEngine::enterSymbol() {
 		turnAnyPathOn(0, _roomNum + 12);
 		_manIsOffScreen = 0;
 		redrawMainScrn();
-		getRidOfTemp();
+		_symbolGraphics.clear();
 		restoreReels();
 		workToScreenM();
 		playChannel1(13);
@@ -539,7 +539,7 @@ void DreamWebEngine::enterSymbol() {
 		turnAnyPathOff(0, _roomNum + 12);
 		_manIsOffScreen = 0;
 		redrawMainScrn();
-		getRidOfTemp();
+		_symbolGraphics.clear();
 		restoreReels();
 		workToScreenM();
 	}
@@ -616,19 +616,19 @@ void DreamWebEngine::dumpSymbol() {
 }
 
 void DreamWebEngine::showSymbol() {
-	showFrame(_tempGraphics, kSymbolx, kSymboly, 12, 0);
+	showFrame(_symbolGraphics, kSymbolx, kSymboly, 12, 0);
 
-	showFrame(_tempGraphics, _symbolTopX + kSymbolx-44, kSymboly+20, _symbolTopNum, 32);
+	showFrame(_symbolGraphics, _symbolTopX + kSymbolx-44, kSymboly+20, _symbolTopNum, 32);
 	uint8 nextTopSymbol = nextSymbol(_symbolTopNum);
-	showFrame(_tempGraphics, _symbolTopX + kSymbolx+5, kSymboly+20, nextTopSymbol, 32);
+	showFrame(_symbolGraphics, _symbolTopX + kSymbolx+5, kSymboly+20, nextTopSymbol, 32);
 	uint8 nextNextTopSymbol = nextSymbol(nextTopSymbol);
-	showFrame(_tempGraphics, _symbolTopX + kSymbolx+54, kSymboly+20, nextNextTopSymbol, 32);
+	showFrame(_symbolGraphics, _symbolTopX + kSymbolx+54, kSymboly+20, nextNextTopSymbol, 32);
 
-	showFrame(_tempGraphics, _symbolBotX + kSymbolx-44, kSymboly+49, 6 + _symbolBotNum, 32);
+	showFrame(_symbolGraphics, _symbolBotX + kSymbolx-44, kSymboly+49, 6 + _symbolBotNum, 32);
 	uint8 nextBotSymbol = nextSymbol(_symbolBotNum);
-	showFrame(_tempGraphics, _symbolBotX + kSymbolx+5, kSymboly+49, 6 + nextBotSymbol, 32);
+	showFrame(_symbolGraphics, _symbolBotX + kSymbolx+5, kSymboly+49, 6 + nextBotSymbol, 32);
 	uint8 nextNextBotSymbol = nextSymbol(nextBotSymbol);
-	showFrame(_tempGraphics, _symbolBotX + kSymbolx+54, kSymboly+49, 6 + nextNextBotSymbol, 32);
+	showFrame(_symbolGraphics, _symbolBotX + kSymbolx+54, kSymboly+49, 6 + nextNextBotSymbol, 32);
 }
 
 uint8 DreamWebEngine::nextSymbol(uint8 symbol) {
@@ -716,9 +716,9 @@ void DreamWebEngine::updateSymbolBot() {
 
 void DreamWebEngine::useDiary() {
 	getRidOfReels();
-	loadIntoTemp("DREAMWEB.G14");
+	loadGraphicsFile(_diaryGraphics, "DREAMWEB.G14");
 	loadTempText("DREAMWEB.T51");
-	loadTempCharset("DREAMWEB.C02");
+	loadGraphicsFile(_diaryCharset, "DREAMWEB.C02");
 	createPanel();
 	showIcon();
 	showDiary();
@@ -751,9 +751,9 @@ void DreamWebEngine::useDiary() {
 	} while (!_getBack && !_quitRequested);
 
 
-	getRidOfTemp();
+	_diaryGraphics.clear();
 	getRidOfTempText();
-	getRidOfTempCharset();
+	_diaryCharset.clear();
 	restoreReels();
 	_manIsOffScreen = 0;
 	redrawMainScrn();
@@ -761,8 +761,8 @@ void DreamWebEngine::useDiary() {
 }
 
 void DreamWebEngine::showDiary() {
-	showFrame(_tempGraphics, kDiaryx, kDiaryy + 37, 1, 0);
-	showFrame(_tempGraphics, kDiaryx + 176, kDiaryy + 108, 2, 0);
+	showFrame(_diaryGraphics, kDiaryx, kDiaryy + 37, 1, 0);
+	showFrame(_diaryGraphics, kDiaryx + 176, kDiaryy + 108, 2, 0);
 }
 
 void DreamWebEngine::showDiaryKeys() {
@@ -776,10 +776,10 @@ void DreamWebEngine::showDiaryKeys() {
 
 	if (_pressed == 'N') {
 		byte frame = (_pressCount == 1) ? 3 : 4;
-		showFrame(_tempGraphics, kDiaryx + 94, kDiaryy + 97, frame, 0);
+		showFrame(_diaryGraphics, kDiaryx + 94, kDiaryy + 97, frame, 0);
 	} else {
 		byte frame = (_pressCount == 1) ? 5 : 6;
-		showFrame(_tempGraphics, kDiaryx + 151, kDiaryy + 71, frame, 0);
+		showFrame(_diaryGraphics, kDiaryx + 151, kDiaryy + 71, frame, 0);
 	}
 
 	if (_pressCount == 1)
@@ -847,9 +847,9 @@ void DreamWebEngine::diaryKeyN() {
 }
 
 void DreamWebEngine::showDiaryPage() {
-	showFrame(_tempGraphics, kDiaryx, kDiaryy, 0, 0);
+	showFrame(_diaryGraphics, kDiaryx, kDiaryy, 0, 0);
 	_kerning = 1;
-	useTempCharset();
+	useTempCharset(&_diaryCharset);
 	_charShift = 91+91;
 	const uint8 *string = getTextInFile1(_diaryPage);
 	uint16 y = kDiaryy + 16;
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index d2f6b376ae..f5f064f855 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -54,11 +54,11 @@ void DreamWebEngine::useMon() {
 	showIcon();
 	drawFloor();
 	getRidOfAll();
-	loadIntoTemp("DREAMWEB.G03"); // mon. graphic name
+	loadGraphicsFile(_monitorGraphics, "DREAMWEB.G03"); // mon. graphic name
 	loadPersonal();
 	loadNews();
 	loadCart();
-	loadTempCharset("DREAMWEB.C01"); // character set 2
+	loadGraphicsFile(_monitorCharset, "DREAMWEB.C01"); // character set 2
 	printOuterMon();
 	initialMonCols();
 	printLogo();
@@ -89,8 +89,8 @@ void DreamWebEngine::useMon() {
 		if (_quitRequested) //TODO : Check why it crashes when put before the execcommand
 			break;
 	} while (!stop);
-	getRidOfTemp();
-	getRidOfTempCharset();
+	_monitorGraphics.clear();
+	_monitorCharset.clear();
 
 	_textFile1.clear();
 	_textFile2.clear();
@@ -188,14 +188,14 @@ void DreamWebEngine::monitorLogo() {
 }
 
 void DreamWebEngine::printLogo() {
-	showFrame(_tempGraphics, 56, 32, 0, 0);
+	showFrame(_monitorGraphics, 56, 32, 0, 0);
 	showCurrentFile();
 }
 
 void DreamWebEngine::input() {
 	memset(_inputLine, 0, 64);
 	_curPos = 0;
-	printChar(_tempCharset, _monAdX, _monAdY, '>', 0, NULL, NULL);
+	printChar(_monitorCharset, _monAdX, _monAdY, '>', 0, NULL, NULL);
 	multiDump(_monAdX, _monAdY, 6, 8);
 	_monAdX += 6;
 	_cursLocX = _monAdX;
@@ -227,7 +227,7 @@ void DreamWebEngine::input() {
 			continue;
 		multiGet(_mapStore + _curPos * 256, _monAdX, _monAdY, 8, 8);
 		uint8 charWidth;
-		printChar(_tempCharset, _monAdX, _monAdY, currentKey, 0, &charWidth, NULL);
+		printChar(_monitorCharset, _monAdX, _monAdY, currentKey, 0, &charWidth, NULL);
 		_inputLine[_curPos * 2 + 1] = charWidth;
 		_monAdX += charWidth;
 		++_curPos;
@@ -266,7 +266,7 @@ void DreamWebEngine::printCurs() {
 	multiGet(_textUnder, x, y, 6, height);
 	++_mainTimer;
 	if ((_mainTimer & 16) == 0)
-		showFrame(_tempCharset, x, y, '/' - 32, 0);
+		showFrame(_monitorCharset, x, y, '/' - 32, 0);
 	multiDump(x - 6, y, 12, height);
 }
 
@@ -302,17 +302,17 @@ void DreamWebEngine::showCurrentFile() {
 	while (*currentFile) {
 		char c = *currentFile++;
 		c = modifyChar(c);
-		printChar(_tempCharset, &x, 37, c, 0, NULL, NULL);
+		printChar(_monitorCharset, &x, 37, c, 0, NULL, NULL);
 	}
 }
 
 void DreamWebEngine::accessLightOn() {
-	showFrame(_tempGraphics, 74, 182, 8, 0);
+	showFrame(_monitorGraphics, 74, 182, 8, 0);
 	multiDump(74, 182, 12, 8);
 }
 
 void DreamWebEngine::accessLightOff() {
-	showFrame(_tempGraphics, 74, 182, 7, 0);
+	showFrame(_monitorGraphics, 74, 182, 7, 0);
 	multiDump(74, 182, 12, 8);
 }
 
@@ -345,22 +345,22 @@ void DreamWebEngine::netError() {
 }
 
 void DreamWebEngine::powerLightOn() {
-	showFrame(_tempGraphics, 257+4, 182, 6, 0);
+	showFrame(_monitorGraphics, 257+4, 182, 6, 0);
 	multiDump(257+4, 182, 12, 8);
 }
 
 void DreamWebEngine::powerLightOff() {
-	showFrame(_tempGraphics, 257+4, 182, 5, 0);
+	showFrame(_monitorGraphics, 257+4, 182, 5, 0);
 	multiDump(257+4, 182, 12, 8);
 }
 
 void DreamWebEngine::lockLightOn() {
-	showFrame(_tempGraphics, 56, 182, 10, 0);
+	showFrame(_monitorGraphics, 56, 182, 10, 0);
 	multiDump(58, 182, 12, 8);
 }
 
 void DreamWebEngine::lockLightOff() {
-	showFrame(_tempGraphics, 56, 182, 9, 0);
+	showFrame(_monitorGraphics, 56, 182, 9, 0);
 	multiDump(58, 182, 12, 8);
 }
 
@@ -375,10 +375,10 @@ void DreamWebEngine::turnOnPower() {
 }
 
 void DreamWebEngine::printOuterMon() {
-	showFrame(_tempGraphics, 40, 32, 1, 0);
-	showFrame(_tempGraphics, 264, 32, 2, 0);
-	showFrame(_tempGraphics, 40, 12, 3, 0);
-	showFrame(_tempGraphics, 40, 164, 4, 0);
+	showFrame(_monitorGraphics, 40, 32, 1, 0);
+	showFrame(_monitorGraphics, 264, 32, 2, 0);
+	showFrame(_monitorGraphics, 40, 12, 3, 0);
+	showFrame(_monitorGraphics, 40, 164, 4, 0);
 }
 
 void DreamWebEngine::loadPersonal() {
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index 8083055da6..c484855da4 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -41,7 +41,7 @@ void DreamWebEngine::selectLocation() {
 	_pointerFrame = 22;
 	readCityPic();
 	showCity();
-	getRidOfTemp();
+	_cityGraphics.clear();
 	readDestIcon();
 	loadTravelText();
 	showPanel();
@@ -89,17 +89,17 @@ void DreamWebEngine::selectLocation() {
 		_getBack = 0;
 	}
 
-	getRidOfTemp();
-	getRidOfTemp2();
-	getRidOfTemp3();
+	_newplaceGraphics.clear();
+	_newplaceGraphics2.clear();
+	_newplaceGraphics3.clear();
 
 	_travelText.clear();
 }
 
 void DreamWebEngine::showCity() {
 	clearWork();
-	showFrame(_tempGraphics, 57, 32, 0, 0);
-	showFrame(_tempGraphics, 120+57, 32, 1, 0);
+	showFrame(_cityGraphics, 57, 32, 0, 0);
+	showFrame(_cityGraphics, 120+57, 32, 1, 0);
 }
 
 void DreamWebEngine::lookAtPlace() {
@@ -113,10 +113,10 @@ void DreamWebEngine::lookAtPlace() {
 	delPointer();
 	delTextLine();
 	getUnderCentre();
-	showFrame(_tempGraphics3, 60, 72, 0, 0);
-	showFrame(_tempGraphics3, 60, 72 + 55, 4, 0);
+	showFrame(_newplaceGraphics3, 60, 72, 0, 0);
+	showFrame(_newplaceGraphics3, 60, 72 + 55, 4, 0);
 	if (_foreignRelease)
-		showFrame(_tempGraphics3, 60, 72+55+21, 4, 0);
+		showFrame(_newplaceGraphics3, 60, 72+55+21, 4, 0);
 
 	const uint8 *string = (const uint8 *)_travelText.getString(_destPos);
 	findNextColon(&string);
@@ -143,21 +143,21 @@ void DreamWebEngine::locationPic() {
 	byte picture = roomPics[_destPos];
 
 	if (picture >= 6)
-		showFrame(_tempGraphics2, 104, 138 + 14, picture - 6, 0);	// Second slot
+		showFrame(_newplaceGraphics2, 104, 138 + 14, picture - 6, 0);	// Second slot
 	else
-		showFrame(_tempGraphics,  104, 138 + 14, picture + 4, 0);
+		showFrame(_newplaceGraphics,  104, 138 + 14, picture + 4, 0);
 
 	if (_destPos == _realLocation)
-		showFrame(_tempGraphics, 104, 140 + 14, 3, 0);	// Currently in this location
+		showFrame(_newplaceGraphics, 104, 140 + 14, 3, 0);	// Currently in this location
 
 	const uint8 *string = (const uint8 *)_travelText.getString(_destPos);
 	printDirect(string, 50, 20, 241, 241 & 1);
 }
 
 void DreamWebEngine::showArrows() {
-	showFrame(_tempGraphics, 116 - 12, 16, 0, 0);
-	showFrame(_tempGraphics, 226 + 12, 16, 1, 0);
-	showFrame(_tempGraphics, 280, 14, 2, 0);
+	showFrame(_newplaceGraphics, 116 - 12, 16, 0, 0);
+	showFrame(_newplaceGraphics, 226 + 12, 16, 1, 0);
+	showFrame(_newplaceGraphics, 280, 14, 2, 0);
 }
 
 void DreamWebEngine::nextDest() {
@@ -259,13 +259,13 @@ void DreamWebEngine::resetLocation(uint8 index) {
 }
 
 void DreamWebEngine::readDestIcon() {
-	loadIntoTemp("DREAMWEB.G05");
-	loadIntoTemp2("DREAMWEB.G06");
-	loadIntoTemp3("DREAMWEB.G08");
+	loadGraphicsFile(_newplaceGraphics, "DREAMWEB.G05");
+	loadGraphicsFile(_newplaceGraphics2, "DREAMWEB.G06");
+	loadGraphicsFile(_newplaceGraphics3, "DREAMWEB.G08");
 }
 
 void DreamWebEngine::readCityPic() {
-	loadIntoTemp("DREAMWEB.G04");
+	loadGraphicsFile(_cityGraphics, "DREAMWEB.G04");
 }
 
 } // End of namespace DreamWeb
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 24e0183a07..a6b93a5590 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -210,7 +210,7 @@ const char *DreamWebEngine::monPrint(const char *string) {
 	bool done = false;
 	while (!done) {
 
-		uint16 count = getNumber(_tempCharset, (const uint8 *)iterator, 166, false, &x);
+		uint16 count = getNumber(_monitorCharset, (const uint8 *)iterator, 166, false, &x);
 		do {	
 			char c = *iterator++;
 			if (c == ':')
@@ -226,7 +226,7 @@ const char *DreamWebEngine::monPrint(const char *string) {
 				break;
 			}
 			c = modifyChar(c);
-			printChar(_tempCharset, &x, _monAdY, c, 0, NULL, NULL);
+			printChar(_monitorCharset, &x, _monAdY, c, 0, NULL, NULL);
 			_cursLocX = x;
 			_cursLocY = _monAdY;
 			_mainTimer = 1;
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 4779d0baef..acc76572ef 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -178,7 +178,7 @@ void DreamWebEngine::doLoad(int savegameId) {
 	// If we reach this point, loadPosition() has just been called.
 	// Among other things, it will have filled g_MadeUpRoomDat.
 
-	getRidOfTemp();
+	_saveGraphics.clear();
 
 	startLoading(g_madeUpRoomDat);
 	loadRoomsSample();
@@ -270,7 +270,7 @@ void DreamWebEngine::saveGame() {
 			descbuf[++desclen] = 1;
 
 		// TODO: The below is copied from actualsave
-		getRidOfTemp();
+		_saveGraphics.clear();
 		restoreAll(); // reels
 		_textAddressX = 13;
 		_textAddressY = 182;
@@ -360,7 +360,7 @@ void DreamWebEngine::doSaveLoad() {
 	_textAddressY = 182;
 	_textLen = 240;
 	if (_getBack != 4) {
-		getRidOfTemp();
+		_saveGraphics.clear();
 		restoreAll();
 		redrawMainScrn();
 		workToScreenM();
@@ -388,16 +388,16 @@ void DreamWebEngine::getBackToOps() {
 }
 
 void DreamWebEngine::showMainOps() {
-	showFrame(_tempGraphics, kOpsx+10, kOpsy+10, 8, 0);
-	showFrame(_tempGraphics, kOpsx+59, kOpsy+30, 7, 0);
-	showFrame(_tempGraphics, kOpsx+128+4, kOpsy+12, 1, 0);
+	showFrame(_saveGraphics, kOpsx+10, kOpsy+10, 8, 0);
+	showFrame(_saveGraphics, kOpsx+59, kOpsy+30, 7, 0);
+	showFrame(_saveGraphics, kOpsx+128+4, kOpsy+12, 1, 0);
 }
 
 void DreamWebEngine::showDiscOps() {
-	showFrame(_tempGraphics, kOpsx+128+4, kOpsy+12, 1, 0);
-	showFrame(_tempGraphics, kOpsx+10, kOpsy+10, 9, 0);
-	showFrame(_tempGraphics, kOpsx+59, kOpsy+30, 10, 0);
-	showFrame(_tempGraphics, kOpsx+176+2, kOpsy+60-4, 5, 0);
+	showFrame(_saveGraphics, kOpsx+128+4, kOpsy+12, 1, 0);
+	showFrame(_saveGraphics, kOpsx+10, kOpsy+10, 9, 0);
+	showFrame(_saveGraphics, kOpsx+59, kOpsy+30, 10, 0);
+	showFrame(_saveGraphics, kOpsx+176+2, kOpsy+60-4, 5, 0);
 }
 
 void DreamWebEngine::discOps() {
@@ -450,7 +450,7 @@ void DreamWebEngine::actualSave() {
 
 	savePosition(slot, desc);
 
-	getRidOfTemp();
+	_saveGraphics.clear();
 	restoreAll(); // reels
 	_textAddressX = 13;
 	_textAddressY = 182;
@@ -703,12 +703,12 @@ void DreamWebEngine::loadOld() {
 void DreamWebEngine::showDecisions() {
 	createPanel2();
 	showOpBox();
-	showFrame(_tempGraphics, kOpsx + 17, kOpsy + 13, 6, 0);
+	showFrame(_saveGraphics, kOpsx + 17, kOpsy + 13, 6, 0);
 	underTextLine();
 }
 
 void DreamWebEngine::loadSaveBox() {
-	loadIntoTemp("DREAMWEB.G08");
+	loadGraphicsFile(_saveGraphics, "DREAMWEB.G08");
 }
 
 // show savegame names (original interface), and set kCursorpos
@@ -822,37 +822,37 @@ void DreamWebEngine::selectSlot() {
 void DreamWebEngine::showSlots() {
 	showFrame(_icons1, kOpsx + 158, kOpsy - 11, 12, 0);
 	showFrame(_icons1, kOpsx + 158 + 18 * _saveLoadPage, kOpsy - 11, 13 + _saveLoadPage, 0);
-	showFrame(_tempGraphics, kOpsx + 7, kOpsy + 8, 2, 0);
+	showFrame(_saveGraphics, kOpsx + 7, kOpsy + 8, 2, 0);
 
 	uint16 y = kOpsy + 11;
 
 	for (int slot = 0; slot < 7; slot++) {
 		if (slot == _currentSlot)
-			showFrame(_tempGraphics, kOpsx + 10, y, 3, 0);
+			showFrame(_saveGraphics, kOpsx + 10, y, 3, 0);
 
 		y += 10;
 	}
 }
 
 void DreamWebEngine::showOpBox() {
-	showFrame(_tempGraphics, kOpsx, kOpsy, 0, 0);
+	showFrame(_saveGraphics, kOpsx, kOpsy, 0, 0);
 
 	// This call displays half of the ops dialog in the CD version. It's not
 	// in the floppy version, and if it's called, a stray red dot is shown in
 	// the game dialogs.
 	if (isCD())
-		showFrame(_tempGraphics, kOpsx, kOpsy + 55, 4, 0);
+		showFrame(_saveGraphics, kOpsx, kOpsy + 55, 4, 0);
 }
 
 void DreamWebEngine::showLoadOps() {
-	showFrame(_tempGraphics, kOpsx + 128 + 4, kOpsy + 12, 1, 0);
-	showFrame(_tempGraphics, kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
+	showFrame(_saveGraphics, kOpsx + 128 + 4, kOpsy + 12, 1, 0);
+	showFrame(_saveGraphics, kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
 	printMessage(kOpsx + 104, kOpsy + 14, 55, 101, (101 & 1));
 }
 
 void DreamWebEngine::showSaveOps() {
-	showFrame(_tempGraphics, kOpsx + 128 + 4, kOpsy + 12, 1, 0);
-	showFrame(_tempGraphics, kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
+	showFrame(_saveGraphics, kOpsx + 128 + 4, kOpsy + 12, 1, 0);
+	showFrame(_saveGraphics, kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
 	printMessage(kOpsx + 104, kOpsy + 14, 54, 101, (101 & 1));
 }
 
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 5f8ea53ada..4178fb489a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -510,12 +510,27 @@ void DreamWebEngine::dreamwebFinalize() {
 	_icons1.clear();
 	_icons2.clear();
 	_charset1.clear();
-	_tempGraphics.clear();
-	_tempGraphics2.clear();
-	_tempGraphics3.clear();
-	_tempCharset.clear();
 	_mainSprites.clear();
 
+	// clear local graphics, just in case
+	_keypadGraphics.clear();
+	_menuGraphics.clear();
+	_menuGraphics2.clear();
+	_folderGraphics.clear();
+	_folderGraphics2.clear();
+	_folderGraphics3.clear();
+	_folderCharset.clear();
+	_symbolGraphics.clear();
+	_diaryGraphics.clear();
+	_diaryCharset.clear();
+	_monitorGraphics.clear();
+	_monitorCharset.clear();
+	_newplaceGraphics.clear();
+	_newplaceGraphics2.clear();
+	_newplaceGraphics3.clear();
+	_cityGraphics.clear();
+	_saveGraphics.clear();
+
 	_exFrames.clear();
 	_exText.clear();
 
@@ -852,22 +867,6 @@ void DreamWebEngine::loadTextSegment(TextFile &file, Common::File &inFile, unsig
 	inFile.read((uint8 *)file._text, len - headerSize);
 }
 
-void DreamWebEngine::loadIntoTemp(const char *fileName) {
-	loadGraphicsFile(_tempGraphics, fileName);
-}
-
-void DreamWebEngine::loadIntoTemp2(const char *fileName) {
-	loadGraphicsFile(_tempGraphics2, fileName);
-}
-
-void DreamWebEngine::loadIntoTemp3(const char *fileName) {
-	loadGraphicsFile(_tempGraphics3, fileName);
-}
-
-void DreamWebEngine::loadTempCharset(const char *fileName) {
-	loadGraphicsFile(_tempCharset, fileName);
-}
-
 void DreamWebEngine::hangOnCurs(uint16 frameCount) {
 	for (uint16 i = 0; i < frameCount; ++i) {
 		printCurs();
@@ -2065,30 +2064,14 @@ void DreamWebEngine::useCharset1() {
 	_currentCharset = &_charset1;
 }
 
-void DreamWebEngine::useTempCharset() {
-	_currentCharset = &_tempCharset;
-}
-
-void DreamWebEngine::getRidOfTemp() {
-	_tempGraphics.clear();
+void DreamWebEngine::useTempCharset(GraphicsFile *charset) {
+	_currentCharset = charset;
 }
 
 void DreamWebEngine::getRidOfTempText() {
 	_textFile1.clear();
 }
 
-void DreamWebEngine::getRidOfTemp2() {
-	_tempGraphics2.clear();
-}
-
-void DreamWebEngine::getRidOfTemp3() {
-	_tempGraphics3.clear();
-}
-
-void DreamWebEngine::getRidOfTempCharset() {
-	_tempCharset.clear();
-}
-
 void DreamWebEngine::getRidOfAll() {
 	delete[] _backdropBlocks;
 	_backdropBlocks = 0;
@@ -2765,7 +2748,7 @@ void DreamWebEngine::decide() {
 	} while (!_getBack);
 
 	if (_getBack != 4)
-		getRidOfTemp();	// room not loaded
+		_saveGraphics.clear();	// room not loaded
 
 	_textAddressX = 13;
 	_textAddressY = 182;
@@ -2794,12 +2777,13 @@ void DreamWebEngine::showGun() {
 	_roomsSample = 34;
 	loadRoomsSample();
 	_volume = 0;
-	loadIntoTemp("DREAMWEB.G13");
+	GraphicsFile graphics;
+	loadGraphicsFile(graphics, "DREAMWEB.G13");
 	createPanel2();
-	showFrame(_tempGraphics, 100, 4, 0, 0);
-	showFrame(_tempGraphics, 158, 106, 1, 0);
+	showFrame(graphics, 100, 4, 0, 0);
+	showFrame(graphics, 158, 106, 1, 0);
 	workToScreen();
-	getRidOfTemp();
+	graphics.clear();
 	fadeScreenUp();
 	hangOn(160);
 	playChannel0(12, 0);
@@ -3018,7 +3002,7 @@ void DreamWebEngine::lookAtCard() {
 	getRidOfReels();
 	loadKeypad();
 	createPanel2();
-	showFrame(_tempGraphics, 160, 80, 42, 128);
+	showFrame(_keypadGraphics, 160, 80, 42, 128);
 	const uint8 *obText = getObTextStart();
 	findNextColon(&obText);
 	findNextColon(&obText);
@@ -3028,12 +3012,12 @@ void DreamWebEngine::lookAtCard() {
 	workToScreenM();
 	hangOnW(280);
 	createPanel2();
-	showFrame(_tempGraphics, 160, 80, 42, 128);
+	showFrame(_keypadGraphics, 160, 80, 42, 128);
 	printDirect(obText, 36, 130, 241, 241 & 1);
 	workToScreenM();
 	hangOnW(200);
 	_manIsOffScreen = 0;
-	getRidOfTemp();
+	_keypadGraphics.clear();
 	restoreReels();
 	putBackObStuff();
 }
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index 8ca5aa70b3..f4112f71f6 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -40,9 +40,10 @@ void DreamWebEngine::endGame() {
 void DreamWebEngine::monkSpeaking() {
 	_roomsSample = 35;
 	loadRoomsSample();
-	loadIntoTemp("DREAMWEB.G15");
+	GraphicsFile graphics;
+	loadGraphicsFile(graphics, "DREAMWEB.G15");
 	clearWork();
-	showFrame(_tempGraphics, 160, 72, 0, 128);	// show monk
+	showFrame(graphics, 160, 72, 0, 128);	// show monk
 	workToScreen();
 	_volume = 7;
 	_volumeDirection = -1;
@@ -74,7 +75,7 @@ void DreamWebEngine::monkSpeaking() {
 				printResult = printDirect(&string, 36, &y, 239, 239 & 1);
 				workToScreen();
 				clearWork();
-				showFrame(_tempGraphics, 160, 72, 0, 128);	// show monk
+				showFrame(graphics, 160, 72, 0, 128);	// show monk
 				hangOnP(240);
 				if (_quitRequested)
 					return;
@@ -86,7 +87,7 @@ void DreamWebEngine::monkSpeaking() {
 	_volumeTo = 7;
 	fadeScreenDowns();
 	hangOn(300);
-	getRidOfTemp();
+	graphics.clear();
 }
 
 void DreamWebEngine::gettingShot() {
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index fc0398c7b9..e59843539f 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1501,7 +1501,7 @@ void DreamWebEngine::useCashCard() {
 	showExit();
 	showMan();
 	uint16 y = (!_foreignRelease) ? 120 : 120 - 3;
-	showFrame(_tempGraphics, 114, y, 39, 0);
+	showFrame(_keypadGraphics, 114, y, 39, 0);
 	const uint8 *obText = getObTextStart();
 	findNextColon(&obText);
 	findNextColon(&obText);
@@ -1517,7 +1517,7 @@ void DreamWebEngine::useCashCard() {
 	_charShift = 0;
 	workToScreenM();
 	hangOnP(400);
-	getRidOfTemp();
+	_keypadGraphics.clear();
 	restoreReels();
 	putBackObStuff();
 }
-- 
cgit v1.2.3


From 6e70f7728915b766d647668a156b09f84a3c40cf Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Wed, 22 Feb 2012 19:15:47 +0100
Subject: DREAMWEB: Dynamically allocate GraphicsFile::_frames.

This avoids extra memory usage due to the previous commit.
---
 engines/dreamweb/dreamweb.h | 1 +
 engines/dreamweb/structs.h  | 6 ++++--
 engines/dreamweb/stubs.cpp  | 8 +++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index c67dfb3660..f49c38371d 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -76,6 +76,7 @@ const unsigned int kSymbolx = 64;
 const unsigned int kSymboly = 56;
 const unsigned int kLengthofvars = 68;
 const unsigned int kFrameBlocksize = 2080;
+const unsigned int kGraphicsFileFrameSize = 347; // ceil(2080 / sizeof(Frame))
 const unsigned int kNumexobjects = 114;
 const unsigned int kNumExTexts = kNumexobjects + 2;
 const uint16 kExtextlen = 18000;
diff --git a/engines/dreamweb/structs.h b/engines/dreamweb/structs.h
index cedf2b6d76..24b67e317a 100644
--- a/engines/dreamweb/structs.h
+++ b/engines/dreamweb/structs.h
@@ -339,9 +339,9 @@ struct TextFile {
 };
 
 struct GraphicsFile {
-	GraphicsFile() : _data(0) { }
+	GraphicsFile() : _data(0), _frames(0) { }
 
-	Frame _frames[347];
+	Frame *_frames;
 	uint8 *_data;
 
 	const uint8 *getFrameData(unsigned int i) const {
@@ -351,6 +351,8 @@ struct GraphicsFile {
 		return _data + _frames[i].ptr();
 	}
 	void clear() {
+		delete[] _frames;
+		_frames = 0;
 		delete[] _data;
 		_data = 0;
 	}
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 4178fb489a..763bcb88fe 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -843,17 +843,18 @@ void DreamWebEngine::loadGraphicsFile(GraphicsFile &file, const char *fileName)
 	uint16 sizeInBytes = header.len(0);
 
 	assert(sizeInBytes >= kFrameBlocksize);
-	delete[] file._data;
+	file.clear();
 	file._data = new uint8[sizeInBytes - kFrameBlocksize];
-
+	file._frames = new Frame[kGraphicsFileFrameSize];
 	f.read((uint8 *)file._frames, kFrameBlocksize);
 	f.read(file._data, sizeInBytes - kFrameBlocksize);
 }
 
 void DreamWebEngine::loadGraphicsSegment(GraphicsFile &file, Common::File &inFile, unsigned int len) {
 	assert(len >= kFrameBlocksize);
-	delete[] file._data;
+	file.clear();
 	file._data = new uint8[len - kFrameBlocksize];
+	file._frames = new Frame[kGraphicsFileFrameSize];
 	inFile.read((uint8 *)file._frames, kFrameBlocksize);
 	inFile.read(file._data, len - kFrameBlocksize);
 }
@@ -2257,6 +2258,7 @@ void DreamWebEngine::drawFloor() {
 void DreamWebEngine::allocateBuffers() {
 	_exFrames.clear();
 	_exFrames._data = new uint8[kExframeslen];
+	_exFrames._frames = new Frame[kGraphicsFileFrameSize];
 	_exText.clear();
 	_exText._text = new char[kExtextlen];
 }
-- 
cgit v1.2.3


From df21e72fe22132a802856bccc5f4bba27e4d3c17 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 6 Jan 2012 23:50:58 -0500
Subject: SWORD1: Add support for PSX stream playback

---
 engines/sword1/animation.cpp | 121 ++++++++++++++++++++++++++++++++++++++-----
 engines/sword1/animation.h   |  11 ++--
 engines/sword1/sword1.cpp    |   5 +-
 3 files changed, 116 insertions(+), 21 deletions(-)

(limited to 'engines')

diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index d55a08293e..9e190e01d0 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -37,6 +37,11 @@
 
 #include "gui/message.h"
 
+#include "video/psx_decoder.h"
+#include "video/smk_decoder.h"
+
+#include "engines/util.h"
+
 namespace Sword1 {
 
 static const char *const sequenceList[20] = {
@@ -62,6 +67,31 @@ static const char *const sequenceList[20] = {
 	"credits",  // 19 CD2   credits, to follow "finale" sequence
 };
 
+// This is the list of the names of the PlayStation videos
+// TODO: fight.str, flashy.str, 
+static const char *const sequenceListPSX[20] = {
+	"e_ferr1",
+	"ladder1",
+	"steps1",
+	"sewer1",
+	"e_intro1",
+	"river1",
+	"truck1",
+	"grave1",
+	"montfcn1",
+	"tapesty1",
+	"ireland1",
+	"e_fin1",
+	"e_hist1",
+	"spanish1",
+	"well1",
+	"candle1",
+	"geodrop1",
+	"vulture1",
+	"",
+	"" // no credits?
+};
+
 ///////////////////////////////////////////////////////////////////////////////
 // Basic movie player
 ///////////////////////////////////////////////////////////////////////////////
@@ -72,8 +102,8 @@ MoviePlayer::MoviePlayer(SwordEngine *vm, Text *textMan, ResMan *resMan, Audio::
 	_decoderType = decoderType;
 	_decoder = decoder;
 
-	_white = 255;
-	_black = 0;
+	_white = (decoderType == kVideoDecoderPSX) ? _system->getScreenFormat().RGBToColor(0xff, 0xff, 0xff) : 255;
+	_black = (decoderType == kVideoDecoderPSX) ? _system->getScreenFormat().RGBToColor(0x00, 0x00, 0x00) : 0;
 }
 
 MoviePlayer::~MoviePlayer() {
@@ -142,6 +172,21 @@ bool MoviePlayer::load(uint32 id) {
 	case kVideoDecoderSMK:
 		filename = Common::String::format("%s.smk", sequenceList[id]);
 		break;
+	case kVideoDecoderPSX:
+		filename = Common::String::format("%s.str", sequenceListPSX[id]);
+
+		// Need to switch to true color
+		initGraphics(g_system->getWidth(), g_system->getHeight(), true, 0);
+
+		// Need to load here in case it fails in which case we'd need
+		// to go back to paletted mode
+		if (_decoder->loadFile(filename)) {
+			return true;
+		} else {
+			initGraphics(g_system->getWidth(), g_system->getHeight(), true);
+			return false;
+		}
+		break;
 	}
 
 	return _decoder->loadFile(filename.c_str());
@@ -179,6 +224,10 @@ void MoviePlayer::play() {
 }
 
 void MoviePlayer::performPostProcessing(byte *screen) {
+	// TODO
+	if (_decoderType == kVideoDecoderPSX)
+		return;
+
 	if (!_movieTexts.empty()) {
 		if (_decoder->getCurFrame() == _movieTexts.front()._startFrame) {
 			_textMan->makeTextSprite(2, (const uint8 *)_movieTexts.front()._text.c_str(), 600, LETTER_COL);
@@ -206,10 +255,10 @@ void MoviePlayer::performPostProcessing(byte *screen) {
 			for (x = 0; x < _textWidth; x++) {
 				switch (src[x]) {
 				case BORDER_COL:
-					dst[x] = findBlackPalIndex();
+					dst[x] = getBlackColor();
 					break;
 				case LETTER_COL:
-					dst[x] = findWhitePalIndex();
+					dst[x] = getWhiteColor();
 					break;
 				}
 			}
@@ -229,12 +278,12 @@ void MoviePlayer::performPostProcessing(byte *screen) {
 
 		for (y = 0; y < _textHeight; y++) {
 			if (_textY + y < frameY || _textY + y >= frameY + frameHeight) {
-				memset(dst + _textX, findBlackPalIndex(), _textWidth);
+				memset(dst + _textX, getBlackColor(), _textWidth);
 			} else {
 				if (frameX > _textX)
-					memset(dst + _textX, findBlackPalIndex(), frameX - _textX);
+					memset(dst + _textX, getBlackColor(), frameX - _textX);
 				if (frameX + frameWidth < _textX + _textWidth)
-					memset(dst + frameX + frameWidth, findBlackPalIndex(), _textX + _textWidth - (frameX + frameWidth));
+					memset(dst + frameX + frameWidth, getBlackColor(), _textX + _textWidth - (frameX + frameWidth));
 			}
 
 			dst += _system->getWidth();
@@ -246,14 +295,19 @@ void MoviePlayer::performPostProcessing(byte *screen) {
 }
 
 bool MoviePlayer::playVideo() {
+	bool skipped = false;
 	uint16 x = (g_system->getWidth() - _decoder->getWidth()) / 2;
 	uint16 y = (g_system->getHeight() - _decoder->getHeight()) / 2;
 
-	while (!_vm->shouldQuit() && !_decoder->endOfVideo()) {
+	while (!_vm->shouldQuit() && !_decoder->endOfVideo() && !skipped) {
 		if (_decoder->needsUpdate()) {
 			const Graphics::Surface *frame = _decoder->decodeNextFrame();
-			if (frame)
-				_vm->_system->copyRectToScreen((byte *)frame->pixels, frame->pitch, x, y, frame->w, frame->h);
+			if (frame) {
+				if (_decoderType == kVideoDecoderPSX)
+					drawFramePSX(frame);
+				else
+					_vm->_system->copyRectToScreen((byte *)frame->pixels, frame->pitch, x, y, frame->w, frame->h);
+			}
 
 			if (_decoder->hasDirtyPalette()) {
 				_decoder->setSystemPalette();
@@ -293,22 +347,44 @@ bool MoviePlayer::playVideo() {
 		Common::Event event;
 		while (_vm->_system->getEventManager()->pollEvent(event))
 			if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE) || event.type == Common::EVENT_LBUTTONUP)
-				return false;
+				skipped = true;
 
 		_vm->_system->delayMillis(10);
 	}
 
-	return !_vm->shouldQuit();
+	if (_decoderType == kVideoDecoderPSX) {
+		// Need to jump back to paletted color
+		initGraphics(g_system->getWidth(), g_system->getHeight(), true);
+	}
+
+	return !_vm->shouldQuit() && !skipped;
 }
 
-byte MoviePlayer::findBlackPalIndex() {
+uint32 MoviePlayer::getBlackColor() {
 	return _black;
 }
 
-byte MoviePlayer::findWhitePalIndex() {
+uint32 MoviePlayer::getWhiteColor() {
 	return _white;
 }
 
+void MoviePlayer::drawFramePSX(const Graphics::Surface *frame) {
+	// The PSX videos have half resolution
+
+	Graphics::Surface scaledFrame;
+	scaledFrame.create(frame->w, frame->h * 2, frame->format);
+
+	for (int y = 0; y < scaledFrame.h; y++)
+		memcpy(scaledFrame.getBasePtr(0, y), frame->getBasePtr(0, y / 2), scaledFrame.w * scaledFrame.format.bytesPerPixel);
+
+	uint16 x = (g_system->getWidth() - scaledFrame.w) / 2;
+	uint16 y = (g_system->getHeight() - scaledFrame.h) / 2;
+
+	_vm->_system->copyRectToScreen((byte *)scaledFrame.pixels, scaledFrame.pitch, x, y, scaledFrame.w, scaledFrame.h);
+
+	scaledFrame.free();
+}
+
 DXADecoderWithSound::DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle)
 	: _mixer(mixer), _bgSoundHandle(bgSoundHandle)  {
 }
@@ -328,6 +404,23 @@ MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, ResMan *
 	Common::String filename;
 	Audio::SoundHandle *bgSoundHandle = new Audio::SoundHandle;
 
+	// For the PSX version, we'll try the PlayStation stream files
+	if (vm->isPsx()) {
+		filename = Common::String(sequenceListPSX[id]) + ".str";
+
+		if (Common::File::exists(filename)) {
+#ifdef USE_RGB_COLOR
+			// All BS1 PSX videos seem to be 15fps
+			Video::VideoDecoder *psxDecoder = new Video::PSXStreamDecoder(15);
+			return new MoviePlayer(vm, textMan, resMan, snd, system, bgSoundHandle, psxDecoder, kVideoDecoderPSX);
+#else
+			GUI::MessageDialog dialog(Common::String::format(_("PSX stream cutscene '%s' cannot be played in paletted mode"), filename.c_str()), _("OK"));
+			dialog.runModal();
+			return 0;
+#endif
+		}
+	}
+
 	filename = Common::String::format("%s.smk", sequenceList[id]);
 
 	if (Common::File::exists(filename)) {
diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h
index 1c03c66342..23dae7f56d 100644
--- a/engines/sword1/animation.h
+++ b/engines/sword1/animation.h
@@ -24,7 +24,6 @@
 #define SWORD1_ANIMATION_H
 
 #include "video/dxa_decoder.h"
-#include "video/smk_decoder.h"
 #include "video/video_decoder.h"
 
 #include "common/list.h"
@@ -38,7 +37,8 @@ namespace Sword1 {
 
 enum DecoderType {
 	kVideoDecoderDXA = 0,
-	kVideoDecoderSMK = 1
+	kVideoDecoderSMK = 1,
+	kVideoDecoderPSX = 2
 };
 
 class MovieText {
@@ -80,7 +80,7 @@ protected:
 	OSystem *_system;
 	Common::List<MovieText> _movieTexts;
 	int _textX, _textY, _textWidth, _textHeight;
-	byte _white, _black;
+	uint32 _white, _black;
 	DecoderType _decoderType;
 
 	Video::VideoDecoder *_decoder;
@@ -89,9 +89,10 @@ protected:
 
 	bool playVideo();
 	void performPostProcessing(byte *screen);
+	void drawFramePSX(const Graphics::Surface *frame);
 
-	byte findBlackPalIndex();
-	byte findWhitePalIndex();
+	uint32 getBlackColor();
+	uint32 getWhiteColor();
 };
 
 MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, ResMan *resMan, Audio::Mixer *snd, OSystem *system);
diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index 865e025786..75e8f72d9d 100644
--- a/engines/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
@@ -62,8 +62,9 @@ SwordEngine::SwordEngine(OSystem *syst)
 	SearchMan.addSubDirectoryMatching(gameDataDir, "speech");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "video");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "smackshi");
-	SearchMan.addSubDirectoryMatching(gameDataDir, "english");//PSX Demo
-	SearchMan.addSubDirectoryMatching(gameDataDir, "italian");//PSX Demo
+	SearchMan.addSubDirectoryMatching(gameDataDir, "streams"); // PSX videos
+	SearchMan.addSubDirectoryMatching(gameDataDir, "english"); // PSX Demo
+	SearchMan.addSubDirectoryMatching(gameDataDir, "italian"); // PSX Demo
 
 	_console = new SwordConsole(this);
 }
-- 
cgit v1.2.3


From 8812f885bc95f0e4af05c333780eb77a8c2eaa19 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 7 Jan 2012 00:20:27 -0500
Subject: SWORD2: Add support for PSX stream playback

---
 engines/sword2/animation.cpp | 140 +++++++++++++++++++++++++++++++++----------
 engines/sword2/animation.h   |  17 +++---
 engines/sword2/function.cpp  |   4 +-
 engines/sword2/sword2.cpp    |   1 +
 4 files changed, 121 insertions(+), 41 deletions(-)

(limited to 'engines')

diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index 80b4809722..e77ae98163 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -40,6 +40,11 @@
 
 #include "gui/message.h"
 
+#include "video/smk_decoder.h"
+#include "video/psx_decoder.h"
+
+#include "engines/util.h"
+
 namespace Sword2 {
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -66,6 +71,10 @@ MoviePlayer::~MoviePlayer() {
  * @param id the id of the file
  */
 bool MoviePlayer::load(const char *name) {
+	// This happens when quitting during the "eye" cutscene.
+	if (_vm->shouldQuit())
+		return false;
+
 	if (_decoderType == kVideoDecoderDXA)
 		_bgSoundStream = Audio::SeekableAudioStream::openStreamFile(name);
 	else
@@ -81,16 +90,26 @@ bool MoviePlayer::load(const char *name) {
 	case kVideoDecoderSMK:
 		filename = Common::String::format("%s.smk", name);
 		break;
+	case kVideoDecoderPSX:
+		filename = Common::String::format("%s.str", name);
+
+		// Need to switch to true color
+		initGraphics(640, 480, true, 0);
+
+		// Need to load here in case it fails in which case we'd need
+		// to go back to paletted mode
+		if (_decoder->loadFile(filename)) {
+			return true;
+		} else {
+			initGraphics(640, 480, true);
+			return false;
+		}
 	}
 
 	return _decoder->loadFile(filename.c_str());
 }
 
 void MoviePlayer::play(MovieText *movieTexts, uint32 numMovieTexts, uint32 leadIn, uint32 leadOut) {
-	// This happens when quitting during the "eye" cutscene.
-	if (_vm->shouldQuit())
-		return;
-
 	_leadOutFrame = _decoder->getFrameCount();
 	if (_leadOutFrame > 60)
 		_leadOutFrame -= 60;
@@ -120,6 +139,11 @@ void MoviePlayer::play(MovieText *movieTexts, uint32 numMovieTexts, uint32 leadI
 
 	while (_snd->isSoundHandleActive(*_bgSoundHandle))
 		_system->delayMillis(100);
+
+	if (_decoderType == kVideoDecoderPSX) {
+		// Need to jump back to paletted color
+		initGraphics(640, 480, true);
+	}
 }
 
 void MoviePlayer::openTextObject(uint32 index) {
@@ -165,7 +189,7 @@ void MoviePlayer::openTextObject(uint32 index) {
 	}
 }
 
-void MoviePlayer::closeTextObject(uint32 index, byte *screen, uint16 pitch) {
+void MoviePlayer::closeTextObject(uint32 index, Graphics::Surface *screen, uint16 pitch) {
 	if (index < _numMovieTexts) {
 		MovieText *text = &_movieTexts[index];
 
@@ -180,23 +204,23 @@ void MoviePlayer::closeTextObject(uint32 index, byte *screen, uint16 pitch) {
 
 				int frameWidth = _decoder->getWidth();
 				int frameHeight = _decoder->getHeight();
+
+				if (_decoderType == kVideoDecoderPSX)
+					frameHeight *= 2;
+
 				int frameX = (_system->getWidth() - frameWidth) / 2;
 				int frameY = (_system->getHeight() - frameHeight) / 2;
-				byte black = findBlackPalIndex();
-
-				byte *dst = screen + _textY * pitch;
+				uint32 black = getBlackColor();
 
 				for (int y = 0; y < text->_textSprite.h; y++) {
 					if (_textY + y < frameY || _textY + y >= frameY + frameHeight) {
-						memset(dst + _textX, black, text->_textSprite.w);
+						screen->hLine(_textX, _textY + y, _textX + text->_textSprite.w, black);
 					} else {
 						if (frameX > _textX)
-							memset(dst + _textX, black, frameX - _textX);
+							screen->hLine(_textX, _textY + y, frameX, black);
 						if (frameX + frameWidth < _textX + text->_textSprite.w)
-							memset(dst + frameX + frameWidth, black, _textX + text->_textSprite.w - (frameX + frameWidth));
+							screen->hLine(frameX + frameWidth, _textY + y, text->_textSprite.w, black);
 					}
-
-					dst += pitch;
 				}
 			}
 
@@ -206,11 +230,24 @@ void MoviePlayer::closeTextObject(uint32 index, byte *screen, uint16 pitch) {
 	}
 }
 
-void MoviePlayer::drawTextObject(uint32 index, byte *screen, uint16 pitch) {
+#define PUT_PIXEL(c) \
+	switch (screen->format.bytesPerPixel) { \
+	case 1: \
+		*dst = (c); \
+		break; \
+	case 2: \
+		WRITE_UINT16(dst, (c)); \
+		break; \
+	case 4: \
+		WRITE_UINT32(dst, (c)); \
+		break; \
+	}
+
+void MoviePlayer::drawTextObject(uint32 index, Graphics::Surface *screen, uint16 pitch) {
 	MovieText *text = &_movieTexts[index];
 
-	byte white = findWhitePalIndex();
-	byte black = findBlackPalIndex();
+	uint32 white = getWhiteColor();
+	uint32 black = getBlackColor();
 
 	if (text->_textMem && _textSurface) {
 		byte *src = text->_textSprite.data;
@@ -226,17 +263,20 @@ void MoviePlayer::drawTextObject(uint32 index, byte *screen, uint16 pitch) {
 			src = psxSpriteBuffer;
 		}
 
-		byte *dst = screen + _textY * pitch + _textX;
-
 		for (int y = 0; y < height; y++) {
+			byte *dst = (byte *)screen->getBasePtr(_textX, _textY + y);
+
 			for (int x = 0; x < width; x++) {
-				if (src[x] == 1)
-					dst[x] = black;
-				else if (src[x] == 255)
-					dst[x] = white;
+				if (src[x] == 1) {
+					PUT_PIXEL(black);
+				} else if (src[x] == 255) {
+					PUT_PIXEL(white);
+				}
+
+				dst += screen->format.bytesPerPixel;
 			}
+
 			src += width;
-			dst += pitch;
 		}
 
 		// Free buffer used to resize psx sprite
@@ -245,7 +285,9 @@ void MoviePlayer::drawTextObject(uint32 index, byte *screen, uint16 pitch) {
 	}
 }
 
-void MoviePlayer::performPostProcessing(byte *screen, uint16 pitch) {
+#undef PUT_PIXEL
+
+void MoviePlayer::performPostProcessing(Graphics::Surface *screen, uint16 pitch) {
 	MovieText *text;
 	int frame = _decoder->getCurFrame();
 
@@ -286,8 +328,12 @@ bool MoviePlayer::playVideo() {
 	while (!_vm->shouldQuit() && !_decoder->endOfVideo()) {
 		if (_decoder->needsUpdate()) {
 			const Graphics::Surface *frame = _decoder->decodeNextFrame();
-			if (frame)
-				_vm->_system->copyRectToScreen((byte *)frame->pixels, frame->pitch, x, y, frame->w, frame->h);
+			if (frame) {
+				if (_decoderType == kVideoDecoderPSX)
+					drawFramePSX(frame);
+				else
+					_vm->_system->copyRectToScreen((byte *)frame->pixels, frame->pitch, x, y, frame->w, frame->h);
+			}
 
 			if (_decoder->hasDirtyPalette()) {
 				_decoder->setSystemPalette();
@@ -319,7 +365,7 @@ bool MoviePlayer::playVideo() {
 			}
 
 			Graphics::Surface *screen = _vm->_system->lockScreen();
-			performPostProcessing((byte *)screen->pixels, screen->pitch);
+			performPostProcessing(screen, screen->pitch);
 			_vm->_system->unlockScreen();
 			_vm->_system->updateScreen();
 		}
@@ -335,12 +381,29 @@ bool MoviePlayer::playVideo() {
 	return !_vm->shouldQuit();
 }
 
-byte MoviePlayer::findBlackPalIndex() {
-	return _black;
+uint32 MoviePlayer::getBlackColor() {
+	return (_decoderType == kVideoDecoderPSX) ? g_system->getScreenFormat().RGBToColor(0x00, 0x00, 0x00) : _black;
 }
 
-byte MoviePlayer::findWhitePalIndex() {
-	return _white;
+uint32 MoviePlayer::getWhiteColor() {
+	return (_decoderType == kVideoDecoderPSX) ? g_system->getScreenFormat().RGBToColor(0xFF, 0xFF, 0xFF) : _white;
+}
+
+void MoviePlayer::drawFramePSX(const Graphics::Surface *frame) {
+	// The PSX videos have half resolution
+
+	Graphics::Surface scaledFrame;
+	scaledFrame.create(frame->w, frame->h * 2, frame->format);
+
+	for (int y = 0; y < scaledFrame.h; y++)
+		memcpy(scaledFrame.getBasePtr(0, y), frame->getBasePtr(0, y / 2), scaledFrame.w * scaledFrame.format.bytesPerPixel);
+
+	uint16 x = (g_system->getWidth() - scaledFrame.w) / 2;
+	uint16 y = (g_system->getHeight() - scaledFrame.h) / 2;
+
+	_vm->_system->copyRectToScreen((byte *)scaledFrame.pixels, scaledFrame.pitch, x, y, scaledFrame.w, scaledFrame.h);
+
+	scaledFrame.free();
 }
 
 DXADecoderWithSound::DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle)
@@ -358,10 +421,23 @@ uint32 DXADecoderWithSound::getElapsedTime() const {
 // Factory function for creating the appropriate cutscene player
 ///////////////////////////////////////////////////////////////////////////////
 
-MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *snd, OSystem *system) {
+MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, uint32 frameCount) {
 	Common::String filename;
 	Audio::SoundHandle *bgSoundHandle = new Audio::SoundHandle;
 
+	filename = Common::String::format("%s.str", name);
+
+	if (Common::File::exists(filename)) {
+#ifdef USE_RGB_COLOR
+		Video::VideoDecoder *psxDecoder = new Video::PSXStreamDecoder(Video::PSXStreamDecoder::kCD2x, frameCount);
+		return new MoviePlayer(vm, snd, system, bgSoundHandle, psxDecoder, kVideoDecoderPSX);
+#else
+		GUI::MessageDialog dialog(_("PSX cutscenes found but ScummVM has been built without RGB color support"), _("OK"));
+		dialog.runModal();
+		return NULL;
+#endif
+	}
+
 	filename = Common::String::format("%s.smk", name);
 
 	if (Common::File::exists(filename)) {
diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h
index 1f5fced03b..3ef8dac754 100644
--- a/engines/sword2/animation.h
+++ b/engines/sword2/animation.h
@@ -26,7 +26,6 @@
 #define SWORD2_ANIMATION_H
 
 #include "video/dxa_decoder.h"
-#include "video/smk_decoder.h"
 #include "video/video_decoder.h"
 #include "audio/mixer.h"
 
@@ -36,7 +35,8 @@ namespace Sword2 {
 
 enum DecoderType {
 	kVideoDecoderDXA = 0,
-	kVideoDecoderSMK = 1
+	kVideoDecoderSMK = 1,
+	kVideoDecoderPSX = 2
 };
 
 struct MovieText {
@@ -93,18 +93,19 @@ protected:
 	uint32 _leadOut;
 	int _leadOutFrame;
 
-	void performPostProcessing(byte *screen, uint16 pitch);
+	void performPostProcessing(Graphics::Surface *screen, uint16 pitch);
 	bool playVideo();
+	void drawFramePSX(const Graphics::Surface *frame);
 
 	void openTextObject(uint32 index);
-	void closeTextObject(uint32 index, byte *screen, uint16 pitch);
-	void drawTextObject(uint32 index, byte *screen, uint16 pitch);
+	void closeTextObject(uint32 index, Graphics::Surface *screen, uint16 pitch);
+	void drawTextObject(uint32 index, Graphics::Surface *screen, uint16 pitch);
 
-	byte findBlackPalIndex();
-	byte findWhitePalIndex();
+	uint32 getBlackColor();
+	uint32 getWhiteColor();
 };
 
-MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *snd, OSystem *system);
+MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, uint32 frameCount);
 
 } // End of namespace Sword2
 
diff --git a/engines/sword2/function.cpp b/engines/sword2/function.cpp
index 60ee6176a4..836b252d6c 100644
--- a/engines/sword2/function.cpp
+++ b/engines/sword2/function.cpp
@@ -2137,7 +2137,9 @@ int32 Logic::fnPlaySequence(int32 *params) {
 	// pause sfx during sequence
 	_vm->_sound->pauseFx();
 
-	_moviePlayer = makeMoviePlayer(filename, _vm, _vm->_mixer, _vm->_system);
+	uint32 frameCount = Sword2Engine::isPsx() ? params[1] : 0;
+
+	_moviePlayer = makeMoviePlayer(filename, _vm, _vm->_mixer, _vm->_system, frameCount);
 
 	if (_moviePlayer && _moviePlayer->load(filename)) {
 		_moviePlayer->play(_sequenceTextList, _sequenceTextLines, _smackerLeadIn, _smackerLeadOut);
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index 3b7965259c..bdfc388c5f 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -255,6 +255,7 @@ Sword2Engine::Sword2Engine(OSystem *syst) : Engine(syst), _rnd("sword2") {
 	SearchMan.addSubDirectoryMatching(gameDataDir, "sword2");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "video");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "smacks");
+	SearchMan.addSubDirectoryMatching(gameDataDir, "streams"); // PSX video
 
 	if (!scumm_stricmp(ConfMan.get("gameid").c_str(), "sword2demo") || !scumm_stricmp(ConfMan.get("gameid").c_str(), "sword2psxdemo"))
 		_features = GF_DEMO;
-- 
cgit v1.2.3


From 66cd8bdd68d9e0d14e40c9f55c06f8ea9cf2006b Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Tue, 10 Jan 2012 22:15:04 -0500
Subject: VIDEO: Make PSX streams calculate frame timing solely from CD speed

BS2 videos now play at the proper rate and BS1 videos have improved a/v sync.
---
 engines/sword1/animation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index 9e190e01d0..a1ace0f331 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -410,8 +410,8 @@ MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, ResMan *
 
 		if (Common::File::exists(filename)) {
 #ifdef USE_RGB_COLOR
-			// All BS1 PSX videos seem to be 15fps
-			Video::VideoDecoder *psxDecoder = new Video::PSXStreamDecoder(15);
+			// All BS1 PSX videos run the videos at 2x speed
+			Video::VideoDecoder *psxDecoder = new Video::PSXStreamDecoder(Video::PSXStreamDecoder::kCD2x);
 			return new MoviePlayer(vm, textMan, resMan, snd, system, bgSoundHandle, psxDecoder, kVideoDecoderPSX);
 #else
 			GUI::MessageDialog dialog(Common::String::format(_("PSX stream cutscene '%s' cannot be played in paletted mode"), filename.c_str()), _("OK"));
-- 
cgit v1.2.3


From a352c3cc000fb13f0dae32e84a859a8fb5cb5966 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Mon, 16 Jan 2012 20:27:36 -0500
Subject: SWORD1: Add support for the PSX demo videos

---
 engines/sword1/animation.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index a1ace0f331..e25b986d40 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -88,8 +88,8 @@ static const char *const sequenceListPSX[20] = {
 	"candle1",
 	"geodrop1",
 	"vulture1",
-	"",
-	"" // no credits?
+	"", // not present
+	""  // credits are not a video
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -173,7 +173,7 @@ bool MoviePlayer::load(uint32 id) {
 		filename = Common::String::format("%s.smk", sequenceList[id]);
 		break;
 	case kVideoDecoderPSX:
-		filename = Common::String::format("%s.str", sequenceListPSX[id]);
+		filename = Common::String::format("%s.str", (_vm->_systemVars.isDemo) ? sequenceList[id] : sequenceListPSX[id]);
 
 		// Need to switch to true color
 		initGraphics(g_system->getWidth(), g_system->getHeight(), true, 0);
@@ -406,7 +406,8 @@ MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, ResMan *
 
 	// For the PSX version, we'll try the PlayStation stream files
 	if (vm->isPsx()) {
-		filename = Common::String(sequenceListPSX[id]) + ".str";
+		// The demo uses the normal file names
+		filename = ((vm->_systemVars.isDemo) ? Common::String(sequenceList[id]) : Common::String(sequenceListPSX[id])) + ".str";
 
 		if (Common::File::exists(filename)) {
 #ifdef USE_RGB_COLOR
@@ -450,9 +451,11 @@ MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, ResMan *
 		return NULL;
 	}
 
-	Common::String buf = Common::String::format(_("Cutscene '%s' not found"), sequenceList[id]);
-	GUI::MessageDialog dialog(buf, _("OK"));
-	dialog.runModal();
+	if (!vm->isPsx() || scumm_stricmp(sequenceList[id], "enddemo") != 0) {
+		Common::String buf = Common::String::format(_("Cutscene '%s' not found"), sequenceList[id]);
+		GUI::MessageDialog dialog(buf, _("OK"));
+		dialog.runModal();
+	}
 
 	return NULL;
 }
-- 
cgit v1.2.3


From 7a3e0ea45300ba950d71ba0eae9381a0b0869f01 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Mon, 16 Jan 2012 20:19:17 -0500
Subject: SWORD1: Add some TODO's for PSX stream subtitles

And some other minor cleanup
---
 engines/sword1/animation.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index e25b986d40..a3d732e13b 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -88,7 +88,7 @@ static const char *const sequenceListPSX[20] = {
 	"candle1",
 	"geodrop1",
 	"vulture1",
-	"", // not present
+	"", // demo video not present
 	""  // credits are not a video
 };
 
@@ -102,8 +102,8 @@ MoviePlayer::MoviePlayer(SwordEngine *vm, Text *textMan, ResMan *resMan, Audio::
 	_decoderType = decoderType;
 	_decoder = decoder;
 
-	_white = (decoderType == kVideoDecoderPSX) ? _system->getScreenFormat().RGBToColor(0xff, 0xff, 0xff) : 255;
-	_black = (decoderType == kVideoDecoderPSX) ? _system->getScreenFormat().RGBToColor(0x00, 0x00, 0x00) : 0;
+	_white = 255;
+	_black = 0;
 }
 
 MoviePlayer::~MoviePlayer() {
@@ -224,8 +224,9 @@ void MoviePlayer::play() {
 }
 
 void MoviePlayer::performPostProcessing(byte *screen) {
-	// TODO
-	if (_decoderType == kVideoDecoderPSX)
+	// TODO: We don't support the PSX stream videos yet
+	// nor using the PSX fonts to display subtitles.
+	if (_vm->isPsx())
 		return;
 
 	if (!_movieTexts.empty()) {
@@ -361,11 +362,11 @@ bool MoviePlayer::playVideo() {
 }
 
 uint32 MoviePlayer::getBlackColor() {
-	return _black;
+	return (_decoderType == kVideoDecoderPSX) ? g_system->getScreenFormat().RGBToColor(0x00, 0x00, 0x00) : _black;
 }
 
 uint32 MoviePlayer::getWhiteColor() {
-	return _white;
+	return (_decoderType == kVideoDecoderPSX) ? g_system->getScreenFormat().RGBToColor(0xFF, 0xFF, 0xFF) : _white;
 }
 
 void MoviePlayer::drawFramePSX(const Graphics::Surface *frame) {
-- 
cgit v1.2.3


From eba87458d399382e639d81e91d6acb3ce13f2252 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 24 Feb 2012 19:38:46 +1100
Subject: TSAGE: More properly implemented resource streaming for R2R animation
 player

---
 engines/tsage/resources.cpp                     | 154 ++++++++++++++----------
 engines/tsage/resources.h                       |   9 +-
 engines/tsage/ringworld2/ringworld2_logic.cpp   |  87 +++++++++++--
 engines/tsage/ringworld2/ringworld2_logic.h     |  32 +++--
 engines/tsage/ringworld2/ringworld2_scenes0.cpp |  10 +-
 5 files changed, 204 insertions(+), 88 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/resources.cpp b/engines/tsage/resources.cpp
index f6f870be20..0afae0042f 100644
--- a/engines/tsage/resources.cpp
+++ b/engines/tsage/resources.cpp
@@ -166,37 +166,7 @@ void TLib::loadSection(uint32 fileOffset) {
 	_file.seek(fileOffset);
 	_sections.fileOffset = fileOffset;
 
-	loadSection(_file, _resources);
-}
-
-/**
- * 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);
-	}
+	ResourceManager::loadSection(_file, _resources);
 }
 
 struct DecodeReference {
@@ -342,6 +312,40 @@ byte *TLib::getResource(ResourceType resType, uint16 resNum, uint16 rlbNum, bool
 	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 = NULL;
+	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;
 
@@ -453,36 +457,6 @@ bool TLib::getMessage(int resNum, int lineNum, Common::String &result, bool supp
 
 /*--------------------------------------------------------------------------*/
 
-/**
- * Open up the main resource file and get an entry from the root section
- */
-bool TLib::getSectionEntry(Common::File &f, ResourceType resType, int rlbNum, int resNum, 
-									  ResourceEntry &resEntry) {
-	// Try and open the resource file
-	if (!f.open(_filename))
-	  return false;
-
-	// Load the root section index
-	ResourceList resList;
-	loadSection(f, resList);
-
-	// Loop through the index for the desired entry
-	ResourceList::iterator iter;
-	for (iter = _resources.begin(); iter != _resources.end(); ++iter) {
-		ResourceEntry &re = *iter;
-		if (re.id == resNum) {
-			// Found it, so exit
-			resEntry = re;
-			return true;
-		}
-	}
-
-	// No matching entry found
-	return false;
-}
-
-/*--------------------------------------------------------------------------*/
-
 ResourceManager::~ResourceManager() {
 	for (uint idx = 0; idx < _libList.size(); ++idx)
 		delete _libList[idx];
@@ -557,4 +531,62 @@ Common::String ResourceManager::getMessage(int resNum, int lineNum, bool suppres
 	return Common::String();
 }
 
+/*--------------------------------------------------------------------------*/
+
+/**
+ * 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 ResourceManager::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 ResourceManager::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
diff --git a/engines/tsage/resources.h b/engines/tsage/resources.h
index 2b5561b184..45cecf8521 100644
--- a/engines/tsage/resources.h
+++ b/engines/tsage/resources.h
@@ -150,19 +150,19 @@ private:
 	SectionList _sections;
 
 	void loadSection(uint32 fileOffset);
-	void loadSection(Common::File &f, ResourceList &resources);
 	void loadIndex();
 public:
 	TLib(MemoryManager &memManager, const Common::String &filename);
 	~TLib();
 
+	const Common::String &getFilename() { return _filename; }
+	const SectionList &getSections() { return _sections; }
 	byte *getResource(uint16 id, bool suppressErrors = false);
 	byte *getResource(ResourceType resType, uint16 resNum, uint16 rlbNum, bool suppressErrors = false);
+	uint32 getResourceStart(ResourceType resType, uint16 resNum, uint16 rlbNum, ResourceEntry &entry);
 	bool getPalette(int paletteNum, byte *palData, uint *startNum, uint *numEntries);
 	byte *getSubResource(int resNum, int rlbNum, int index, uint *size, bool suppressErrors = false);
 	bool getMessage(int resNum, int lineNum, Common::String &result, bool suppressErrors = false);
-
-	bool getSectionEntry(Common::File &f, ResourceType resType, int rlbNum, int resNum, ResourceEntry &resEntry);
 };
 
 class ResourceManager {
@@ -179,6 +179,9 @@ public:
 	byte *getSubResource(int resNum, int rlbNum, int index, uint *size, bool suppressErrors = false);
 	Common::String getMessage(int resNum, int lineNum, bool suppressErrors = false);
 	TLib &first() { return **_libList.begin(); }
+
+	static bool scanIndex(Common::File &f, ResourceType resType, int rlbNum, int resNum, ResourceEntry &resEntry);
+	static void loadSection(Common::File &f, ResourceList &resources);
 };
 
 
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 89cf831088..d5cbde81be 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1551,6 +1551,27 @@ void Scene1200::sub9DAD6(int indx) {
 
 /*--------------------------------------------------------------------------*/
 
+void AnimationPlayerSubData::load(Common::File &f) {
+	f.skip(6);
+	_field6 = f.readUint16LE();
+	f.skip(2);
+	_fieldA = f.readUint16LE();
+	_fieldC = f.readUint16LE();
+	f.skip(4);
+	_field12 = f.readUint16LE();
+	_field14 = f.readUint16LE();
+	_field16 = f.readUint16LE();
+	f.skip(4);
+	_palStart = f.readUint16LE();
+	_palSize = f.readUint16LE();
+	f.read(_palData, 768);
+	_field320 = f.readSint32LE();
+	f.skip(12);
+	f.read(_field330, 96);
+}
+
+/*--------------------------------------------------------------------------*/
+
 AnimationPlayer::AnimationPlayer(): EventHandler() {
 	_endAction = NULL;
 	
@@ -1586,7 +1607,7 @@ void AnimationPlayer::remove() {
 void AnimationPlayer::process(Event &event) {
 	if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_ESCAPE) &&
 			(_field3A)) {
-		_field90C = _field576;
+		_field90C = _subData._field6;
 	} 
 }
 
@@ -1595,9 +1616,9 @@ void AnimationPlayer::dispatch() {
 	uint32 gameDiff = (gameFrame > _gameFrame) ? gameFrame - _gameFrame : _gameFrame - gameFrame;
 
 	if (gameDiff >= _field910) {
-		drawFrame(_field904 % _field57C);
+		drawFrame(_field904 % _subData._fieldC);
 		++_field904;
-		_field90C = _field904 / _field57C;
+		_field90C = _field904 / _subData._fieldC;
 
 		if (_field90C == _field90E)
 			method2();
@@ -1607,18 +1628,63 @@ void AnimationPlayer::dispatch() {
 	}
 }
 
-bool AnimationPlayer::load(int rlbNum, Action *endAction) {
-	ResourceEntry resEntry;
-	if (!g_resourceManager->first().getSectionEntry(_resourceFile, RES_IMAGE, rlbNum, 0, resEntry)) {
-		warning("Couldn't find resource index");
-		// TODO: Complete animation loading
+bool AnimationPlayer::load(int animId, Action *endAction) {
+	// Open up the main resource file for access
+	TLib &libFile = g_resourceManager->first();
+	if (!_resourceFile.open(libFile.getFilename()))
+		error("Could not open resource");
+
+	// Get the offset of the given resource and seek to it in the player's file reference
+	ResourceEntry entry;
+	uint32 fileOffset = libFile.getResourceStart(RES_IMAGE, animId, 0, entry);
+	_resourceFile.seek(fileOffset);
+
+	// At this point, the file is pointing to the start of the resource data
+
+	// Set the end action
+	_endAction = endAction;
+	
+	// Load the sub data block
+	_subData.load(_resourceFile);
+
+	// Set other properties
+	_field908 = -1;
+	_field904 = 0;
+	_field910 = 60 / _subData._fieldA;
+	_gameFrame = R2_GLOBALS._events.getFrameNumber() - _field910;
+
+	if (_subData._field320) {
+		_field900 = _subData._field320;
+	} else {
+		int v = (_subData._field12 + 2) * _subData._field14 * _subData._fieldC;
+		_field900 = (_subData._field16 / _subData._fieldC) + v + 96;
 	}
+	
+	_animData = _fieldA = new byte[_field900];
+
+	if (_subData._fieldC <= 1) {
+		_subData._field16 = NULL;
+		_animPtr = _animData;
+	} else {
+		_field16 = new byte[_field900];
+		_animPtr = _field16;
+	}
+
+	_field90C = 0;
+	_field90E = 1;
+
+	// TODO: Stuff
+
+	if (_field3C) {
+
+	}
+
 
-	_resourceFile.close();
 	return false;
 }
 
 void AnimationPlayer::drawFrame(int frameIndex) {
+/*
 	uint32 v = READ_LE_UINT32(_dataP);
 warning("v = %d", v);
 //TODO
@@ -1634,6 +1700,7 @@ warning("v = %d", v);
 			R2_GLOBALS._scenePalette.refresh();
 		}
 	}
+*/
 }
 
 void AnimationPlayer::method2() {
@@ -1641,7 +1708,7 @@ void AnimationPlayer::method2() {
 }
 
 bool AnimationPlayer::method3() {
-	return (_field90C >= _field576);
+	return (_field90C >= _subData._field6);
 }
 
 void AnimationPlayer::method4() {
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 98fcaae981..651cfec763 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -325,24 +325,38 @@ public:
 	virtual Common::String getClassName() { return "UnkObject1200"; }
 };
 
+class AnimationPlayerSubData {
+public:
+	int _field6;
+	int _fieldA;
+	int _fieldC;
+	int _field12;
+	int _field14;
+	int _field16;
+	int _palStart;
+	int _palSize;
+	byte _palData[256 * 3];
+	int32 _field320;
+	byte _field330[96];
+public:
+	void load(Common::File &f);
+};
+
 class AnimationPlayer: public EventHandler {
 public:
+	byte *_fieldA;
+	byte *_field16;
+	byte *_animData, *_animPtr;
 	Common::File _resourceFile;
-	void *_fieldA;
-	void *_field16;
-
-	byte *_dataP;
 	Rect _rect1, _screenBounds;
 	int _field38;
 	int _field3A, _field3C;
 	int _field56;
 	int _field58, _field5A;
 	ScenePalette _palette;
-	byte _palData[256 * 3];
+	AnimationPlayerSubData _subData;
 	Action *_endAction;
-	int _field576;
-	int _field57C;
-	int _palStart, _palSize;
+	int _field900;
 	int _field904;
 	int _field908;
 	int _field90C;
@@ -361,7 +375,7 @@ public:
 	virtual void changePane() {}
 	virtual void proc14() {}
 
-	bool load(int rlbNum, Action *endAction = NULL);
+	bool load(int animId, Action *endAction = NULL);
 	void drawFrame(int frameIndex);
 	void method2();
 	bool method3();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index dab9afb269..9af4c7b534 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1561,7 +1561,7 @@ void Scene180::signal() {
 		R2_GLOBALS._scene180Mode = 1;
 
 		_animationPlayer.load(1, NULL);
-		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._palData, 0, 256);
+		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 
 		R2_GLOBALS._sound1.play(1);
 		break;
@@ -1605,7 +1605,7 @@ void Scene180::signal() {
 		_animationPlayer.load(2);
 
 		_field412 = 1;
-		R2_GLOBALS._scenePalette.addFader(_animationPlayer._palData, 256, 6, NULL);
+		R2_GLOBALS._scenePalette.addFader(_animationPlayer._subData._palData, 256, 6, NULL);
 		R2_GLOBALS._sound1.play(2);
 		break;
 
@@ -1806,7 +1806,7 @@ void Scene180::signal() {
 		R2_GLOBALS._scene180Mode = 4;
 		if (_animationPlayer.load(4)) {
 			_animationPlayer.dispatch();
-			R2_GLOBALS._scenePalette.addFader(_animationPlayer._palData, 256, 8, this);
+			R2_GLOBALS._scenePalette.addFader(_animationPlayer._subData._palData, 256, 8, this);
 		} else {
 			_sceneMode = 43;
 			setFrameInc(1);
@@ -1834,7 +1834,7 @@ void Scene180::signal() {
 		break;
 
 	case 45:
-		R2_GLOBALS._scenePalette.addFader(_animationPlayer._palData, 256, 28, this);
+		R2_GLOBALS._scenePalette.addFader(_animationPlayer._subData._palData, 256, 28, this);
 		break;
 
 	case 48:
@@ -1846,7 +1846,7 @@ void Scene180::signal() {
 		_animationPlayer.load(15, NULL);
 
 		R2_GLOBALS._sound1.play(9);
-		R2_GLOBALS._scenePalette.addFader(_animationPlayer._palData, 256, 6, NULL);
+		R2_GLOBALS._scenePalette.addFader(_animationPlayer._subData._palData, 256, 6, NULL);
 		break;
 
 	case 49:
-- 
cgit v1.2.3


From 050902756e51e2195f7818bfd002050a73d73d8a Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Wed, 22 Feb 2012 23:18:50 +0100
Subject: CGE: Use WRITE_LE_UINT16 for unaligned writes.

---
 engines/cge/bitmap.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/cge/bitmap.cpp b/engines/cge/bitmap.cpp
index 4b5034756c..37f4eb070e 100644
--- a/engines/cge/bitmap.cpp
+++ b/engines/cge/bitmap.cpp
@@ -198,7 +198,7 @@ BitmapPtr Bitmap::code() {
 					if ((pix == kPixelTransp) != skip || cnt >= 0x3FF0) { // end of block
 						cnt |= (skip) ? kBmpSKP : kBmpCPY;
 						if (_v)
-							*cp = TO_LE_16(cnt);                          // store block description uint16
+							WRITE_LE_UINT16(cp, cnt); // store block description uint16
 
 						cp = (uint16 *) im;
 						im += 2;
@@ -220,7 +220,7 @@ BitmapPtr Bitmap::code() {
 					} else {
 						cnt |= kBmpCPY;
 						if (_v)
-							*cp = TO_LE_16(cnt);
+							WRITE_LE_UINT16(cp, cnt);
 
 						cp = (uint16 *) im;
 						im += 2;
@@ -232,13 +232,13 @@ BitmapPtr Bitmap::code() {
 			if (cnt && ! skip) {
 				cnt |= kBmpCPY;
 				if (_v)
-					*cp = TO_LE_16(cnt);
+					WRITE_LE_UINT16(cp, cnt);
 
 				cp = (uint16 *) im;
 				im += 2;
 			}
 			if (_v)
-				*cp = TO_LE_16(kBmpEOI);
+				WRITE_LE_UINT16(cp, kBmpEOI);
 			cp = (uint16 *) im;
 			im += 2;
 		}
-- 
cgit v1.2.3


From 7e7cb21531289e9292136d66ce01222c3279dab6 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Wed, 22 Feb 2012 21:26:54 +0100
Subject: SCUMM: Add windows platform detection for several HES games/demos

---
 engines/scumm/detection_tables.h | 18 +++++++++---------
 engines/scumm/scumm-md5.h        |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index a44497f193..0bdb2e57f2 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -667,7 +667,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "freddi2", "Fritzi Fisch 2", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 },
 	{ "freddi2", "MALICE2", kGenHEMac, Common::FR_FRA, Common::kPlatformMacintosh, 0 },
 
-	{ "freddi3", "freddi3", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "freddi3", "freddi3", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "freddi3", "F3-Mdemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "freddi3", "f3-mdemo", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "freddi3", "FF3 Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
@@ -689,10 +689,10 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "freddi3", "MM3-DEMO", kGenHEPC, Common::FR_FRA, UNK, 0 },
 	{ "freddi3", "MM3-Demo", kGenHEMac, Common::FR_FRA, Common::kPlatformMacintosh, 0 },
 
-	{ "freddi4", "freddi4", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "freddi4", "freddi4", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "freddi4", "Freddi4", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 	{ "freddi4", "f4-demo", kGenHEPC, UNK_LANG, UNK, 0 },
-	{ "freddi4", "ff4demo", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "freddi4", "ff4demo", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "freddi4", "Ff4demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "freddi4", "Freddi 4", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "freddi4", "Freddi 4 Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
@@ -717,7 +717,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "lost", "Verloren", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 
 	{ "maze", "maze", kGenHEPC, UNK_LANG, UNK, 0 },
-	{ "maze", "Doolhof", kGenHEPC, Common::NL_NLD, UNK, 0 },
+	{ "maze", "Doolhof", kGenHEPC, Common::NL_NLD, Common::kPlatformWindows, 0 },
 	{ "maze", "Doolhof", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 	{ "maze", "Maze Madness", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 
@@ -764,7 +764,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "pajama3", "Pajama Sam 3", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "pajama3", "Pajama Sam 3-Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "pajama3", "pj3-demo", kGenHEPC, UNK_LANG, UNK, 0 },
-	{ "pajama3", "pj3demo", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "pajama3", "pj3demo", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "pajama3", "PJ3Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "pajama3", "Pajama Sam Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "pajama3", "PJMini", kGenHEPC, UNK_LANG, UNK, 0 },
@@ -791,11 +791,11 @@ 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", "racedemo", kGenHEPC, UNK_LANG, UNK, 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 },
 	{ "puttrace", "PouceCourse", kGenHEPC, Common::FR_FRA, UNK, 0 },
-	{ "puttrace", "Putt500", kGenHEPC, Common::NL_NLD, UNK, 0 },
+	{ "puttrace", "Putt500", kGenHEPC, Common::NL_NLD, Common::kPlatformWindows, 0 },
 	{ "puttrace", "Putt500", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 	{ "puttrace", "Putt500 demo", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 	{ "puttrace", "Putt Race", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
@@ -880,7 +880,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 
 	{ "spyfox2", "spyfox2", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "spyfox2", "sf2-demo", kGenHEPC, UNK_LANG, UNK, 0 },
-	{ "spyfox2", "sf2demo", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "spyfox2", "sf2demo", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "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 },
@@ -902,7 +902,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "thinkerk", "thinkerk", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "thinkerk", "ThinkerK", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 
-	{ "water", "water", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "water", "water", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "water", "Water", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 	{ "water", "Water Worries", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 #endif
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 301361d916..4f04554322 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 Jan 22 19:25:34 2012
+  This file was generated by the md5table tool on Mon Feb 20 18:25:34 2012
   DO NOT EDIT MANUALLY!
  */
 
@@ -77,7 +77,7 @@ static const MD5Table md5table[] = {
 	{ "15f588e887e857e8c56fe6ade4956168", "atlantis", "Floppy", "Floppy", -1, Common::ES_ESP, Common::kPlatformAmiga },
 	{ "16542a7342a918bfe4ba512007d36c47", "FreddisFunShop", "HE 99L", "", -1, Common::EN_USA, Common::kPlatformUnknown },
 	{ "166553538ff320c69edafeee29525419", "samnmax", "", "CD", 199195304, Common::EN_ANY, Common::kPlatformMacintosh },
-	{ "16effd200aa6b8abe9c569c3e578814d", "freddi4", "HE 99", "Demo", -1, Common::NL_NLD, Common::kPlatformWindows },
+	{ "16effd200aa6b8abe9c569c3e578814d", "freddi4", "HE 99", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "179879b6e35c1ead0d93aab26db0951b", "fbear", "HE 70", "", 13381, Common::EN_ANY, Common::kPlatformWindows },
 	{ "17b5d5e6af4ae89d62631641d66d5a05", "indy3", "VGA", "VGA", -1, Common::IT_ITA, Common::kPlatformPC },
 	{ "17f7296f63c78642724f057fd8e736a7", "maniac", "NES", "", 2082, Common::EN_GRB, Common::kPlatformNES },
-- 
cgit v1.2.3


From 44c5e48bd3bed195d9814ed61b87613daffbf172 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Wed, 22 Feb 2012 21:27:04 +0100
Subject: SCUMM: Add 2 not yet recognized MD5s from Dutch Putt-Putt 3 in 1 CD

---
 engines/scumm/detection_tables.h | 6 ++++--
 engines/scumm/scumm-md5.h        | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 0bdb2e57f2..844ac3e5c4 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -632,8 +632,9 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "chase", "chase", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "chase", "Cheese Chase", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 
-	{ "dog", "dog", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "dog", "dog", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "dog", "Dog on a Stick", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
+	{ "dog", "Springparadijs", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 
 	{ "farm", "farm", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "farm", "farmdemo", kGenHEPC, UNK_LANG, UNK, 0 },
@@ -704,7 +705,8 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "freddi4", "MaliceMRC", kGenHEPC, Common::FR_FRA, UNK, 0 },
 	{ "freddi4", "Mm4demo", kGenHEPC, Common::FR_FRA, UNK, 0 },
 
-	{ "FreddisFunShop", "FreddisFunShop", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "FreddisFunShop", "FreddisFunShop", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
+	{ "FreddisFunShop", "FreddisFunShop", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "FreddisFunShop", "Freddi's FunShop", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 
 	{ "jungle", "jungle", kGenHEPC, UNK_LANG, UNK, 0 },
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 4f04554322..f7f7678a9f 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 Feb 20 18:25:34 2012
+  This file was generated by the md5table tool on Wed Feb 22 19:57:16 2012
   DO NOT EDIT MANUALLY!
  */
 
@@ -91,6 +91,7 @@ static const MD5Table md5table[] = {
 	{ "19bf6938a94698296bcb0c99c31c91a7", "spyfox2", "", "Demo", -1, Common::EN_GRB, Common::kPlatformWindows },
 	{ "1a6e5ae2777a6a33f06ffc0226210934", "atlantis", "", "CD", -1, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "1af4eb581a33d808707d66d50e084dca", "pajama2", "HE 99", "", -1, Common::HE_ISR, Common::kPlatformWindows },
+	{ "1b720def35ecfa07032ddf1efb34c368", "dog", "", "", 19681, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "1c792d28376d45e145cb916bca0400a2", "spyfox2", "", "Demo", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "1c7e7db2cfab1ad62746ab680a634204", "maniac", "NES", "", -1, Common::FR_FRA, Common::kPlatformNES },
 	{ "1ca86e2cf9aaa2068738a1e5ba477e60", "zak", "FM-TOWNS", "", -1, Common::JA_JPN, Common::kPlatformFMTowns },
@@ -210,6 +211,7 @@ static const MD5Table md5table[] = {
 	{ "4ce2d5b355964bbcb5e5ce73236ef868", "freddicove", "HE 100", "", -1, Common::RU_RUS, Common::kPlatformWindows },
 	{ "4cfd3fda4a4e6e64a1fc488eba973b7a", "fbpack", "", "", -1, Common::EN_ANY, Common::kPlatformPC },
 	{ "4d34042713958b971cb139fba4658586", "atlantis", "FM-TOWNS", "", -1, Common::JA_JPN, Common::kPlatformFMTowns },
+	{ "4d3fbc888de4e6565013f61dc83da6b6", "FreddisFunShop", "HE 99", "", 36245, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "4dbff3787aedcd96b0b325f2d92d7ad9", "maze", "HE 100", "Updated", -1, Common::EN_USA, Common::kPlatformUnknown },
 	{ "4dc780f1bc587a193ce8a97652791438", "loom", "EGA", "EGA", -1, Common::EN_ANY, Common::kPlatformAmiga },
 	{ "4e5867848ee61bc30d157e2c94eee9b4", "PuttTime", "HE 90", "Demo", 18394, Common::EN_USA, Common::kPlatformUnknown },
-- 
cgit v1.2.3


From 542014c309cb713ee5f550f344065fa9124f17bd Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Fri, 24 Feb 2012 04:44:26 +0000
Subject: DREAMWEB: Add datafile name prefix to engine and modify showPCX() to
 it.

This new variable removes the need for duplicates strings of the form
"DREAMWEB.*" spread throughout the dreamweb engine, replacing them with
a common const string on the engine holding the datafile name prefix.

This will reduce binary size and it should also simplify adding support
for foreign language variants, where the datafile name prefix is
changed.

To demostrate usage and prove this, showPCX() is migrated to using this.
---
 engines/dreamweb/dreamweb.cpp |  2 ++
 engines/dreamweb/dreamweb.h   |  5 ++++-
 engines/dreamweb/titles.cpp   | 14 +++++++-------
 engines/dreamweb/vgagrafx.cpp |  3 ++-
 4 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 2ee20210ba..4ed6ef7c15 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -62,6 +62,8 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_channel0 = 0;
 	_channel1 = 0;
 
+	_datafilePrefix = Common::String("DREAMWEB.");
+
 	_openChangeSize = kInventx+(4*kItempicsize);
 	_quitRequested = false;
 
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 6d7253da65..1ea16c24ed 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -152,6 +152,8 @@ public:
 
 	void stopSound(uint8 channel);
 
+	const Common::String& getDatafilePrefix() { return _datafilePrefix; };
+
 private:
 	void keyPressed(uint16 ascii);
 	void setSpeed(uint speed);
@@ -160,6 +162,7 @@ private:
 
 	const DreamWebGameDescription	*_gameDescription;
 	Common::RandomSource			_rnd;
+	Common::String _datafilePrefix;
 
 	uint _speed;
 	bool _turbo;
@@ -1133,7 +1136,7 @@ public:
 	void doShake();
 	void vSync();
 	void setMode();
-	void showPCX(const Common::String &name);
+	void showPCX(const Common::String &suffix);
 	void showFrameInternal(const uint8 *pSrc, uint16 x, uint16 y, uint8 effectsFlag, uint8 width, uint8 height);
 	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
 	void showFrame(const GraphicsFile &frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index f4112f71f6..0059b19605 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -104,7 +104,7 @@ void DreamWebEngine::gettingShot() {
 void DreamWebEngine::bibleQuote() {
 	initGraphics(640, 480, true);
 
-	showPCX("DREAMWEB.I00");
+	showPCX("I00");
 	fadeScreenUps();
 
 	hangOne(80);
@@ -292,7 +292,7 @@ void DreamWebEngine::realCredits() {
 	initGraphics(640, 480, true);
 	hangOn(35);
 
-	showPCX("DREAMWEB.I01");
+	showPCX("I01");
 	playChannel0(12, 0);
 
 	hangOne(2);
@@ -318,7 +318,7 @@ void DreamWebEngine::realCredits() {
 		return; // "realcreditsearly"
 	}
 
-	showPCX("DREAMWEB.I02");
+	showPCX("I02");
 	playChannel0(12, 0);
 	hangOne(2);
 
@@ -343,7 +343,7 @@ void DreamWebEngine::realCredits() {
 		return; // "realcreditsearly"
 	}
 
-	showPCX("DREAMWEB.I03");
+	showPCX("I03");
 	playChannel0(12, 0);
 	hangOne(2);
 
@@ -368,7 +368,7 @@ void DreamWebEngine::realCredits() {
 		return; // "realcreditsearly"
 	}
 
-	showPCX("DREAMWEB.I04");
+	showPCX("I04");
 	playChannel0(12, 0);
 	hangOne(2);
 
@@ -393,7 +393,7 @@ void DreamWebEngine::realCredits() {
 		return; // "realcreditsearly"
 	}
 
-	showPCX("DREAMWEB.I05");
+	showPCX("I05");
 	playChannel0(12, 0);
 	hangOne(2);
 
@@ -418,7 +418,7 @@ void DreamWebEngine::realCredits() {
 		return; // "realcreditsearly"
 	}
 
-	showPCX("DREAMWEB.I06");
+	showPCX("I06");
 	fadeScreenUps();
 	hangOne(60);
 
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 26b5e60b9d..61f3977710 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -153,7 +153,8 @@ void DreamWebEngine::setMode() {
 	initGraphics(320, 200, false);
 }
 
-void DreamWebEngine::showPCX(const Common::String &name) {
+void DreamWebEngine::showPCX(const Common::String &suffix) {
+	Common::String name = getDatafilePrefix() + suffix;
 	Common::File pcxFile;
 
 	if (!pcxFile.open(name)) {
-- 
cgit v1.2.3


From 31bf535a83682d6ad1616b8862119edbb95429c1 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Fri, 24 Feb 2012 05:19:29 +0000
Subject: DREAMWEB: Migrate loadTempText() to using datafile prefix variable.

---
 engines/dreamweb/dreamweb.h | 2 +-
 engines/dreamweb/keypad.cpp | 4 ++--
 engines/dreamweb/people.cpp | 2 +-
 engines/dreamweb/stubs.cpp  | 7 ++++---
 engines/dreamweb/titles.cpp | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 1ea16c24ed..40ae05bd8a 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -813,7 +813,7 @@ public:
 	void loadGraphicsSegment(GraphicsFile &file, Common::File &inFile, unsigned int len);
 	void loadTextSegment(TextFile &file, Common::File &inFile, unsigned int len);
 	void loadTravelText();
-	void loadTempText(const char *fileName);
+	void loadTempText(const char *suffix);
 	void sortOutMap();
 	void loadRoomData(const Room &room, bool skipDat);
 	void useTempCharset(GraphicsFile *charset);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 172e85104f..16729275c1 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -398,7 +398,7 @@ void DreamWebEngine::loadFolder() {
 	loadGraphicsFile(_folderGraphics2, "DREAMWEB.G10"); // folder graphics 2
 	loadGraphicsFile(_folderGraphics3, "DREAMWEB.G11"); // folder graphics 3
 	loadGraphicsFile(_folderCharset, "DREAMWEB.C02"); // character set 3
-	loadTempText("DREAMWEB.T50"); // folder text
+	loadTempText("T50"); // folder text
 }
 
 void DreamWebEngine::showFolder() {
@@ -717,7 +717,7 @@ void DreamWebEngine::updateSymbolBot() {
 void DreamWebEngine::useDiary() {
 	getRidOfReels();
 	loadGraphicsFile(_diaryGraphics, "DREAMWEB.G14");
-	loadTempText("DREAMWEB.T51");
+	loadTempText("T51");
 	loadGraphicsFile(_diaryCharset, "DREAMWEB.C02");
 	createPanel();
 	showIcon();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 1b8ee1b4de..316a1689c9 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -178,7 +178,7 @@ void DreamWebEngine::madman(ReelRoutine &routine) {
 			return;
 		}
 		if (newReelPointer == 10) {
-			loadTempText("DREAMWEB.T82");
+			loadTempText("T82");
 			_vars._combatCount = (uint8)-1;
 			_speechCount = 0;
 		}
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 763bcb88fe..89c9aa8d38 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2238,8 +2238,9 @@ void DreamWebEngine::loadTravelText() {
 	loadTextFile(_travelText, "DREAMWEB.T81"); // location descs
 }
 
-void DreamWebEngine::loadTempText(const char *fileName) {
-	loadTextFile(_textFile1, fileName);
+void DreamWebEngine::loadTempText(const char *suffix) {
+	Common::String fileName = getDatafilePrefix() + suffix;
+	loadTextFile(_textFile1, fileName.c_str());
 }
 
 void DreamWebEngine::drawFloor() {
@@ -2789,7 +2790,7 @@ void DreamWebEngine::showGun() {
 	fadeScreenUp();
 	hangOn(160);
 	playChannel0(12, 0);
-	loadTempText("DREAMWEB.T83");
+	loadTempText("T83");
 	rollEndCreditsGameLost();
 	getRidOfTempText();
 }
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index 0059b19605..146503dcdf 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -26,7 +26,7 @@
 namespace DreamWeb {
 
 void DreamWebEngine::endGame() {
-	loadTempText("DREAMWEB.T83");
+	loadTempText("T83");
 	monkSpeaking();
 	if (_quitRequested)
 		return;
@@ -141,7 +141,7 @@ void DreamWebEngine::hangOne(uint16 delay) {
 }
 
 void DreamWebEngine::intro() {
-	loadTempText("DREAMWEB.T82");
+	loadTempText("T82");
 	loadPalFromIFF();
 	setMode();
 	_newLocation = 50;
-- 
cgit v1.2.3


From e3c5f9180ce48a7a43d13baa4b91a17deb50782a Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Fri, 24 Feb 2012 05:29:01 +0000
Subject: DREAMWEB: Migrate loadSounds() to using datafile prefix variable.

---
 engines/dreamweb/dreamweb.h | 2 +-
 engines/dreamweb/sound.cpp  | 7 ++++---
 engines/dreamweb/stubs.cpp  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 40ae05bd8a..54646ba702 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -142,7 +142,7 @@ public:
 
 	void quit();
 
-	void loadSounds(uint bank, const Common::String &file);
+	void loadSounds(uint bank, const Common::String &suffix);
 	bool loadSpeech(const Common::String &filename);
 
 	void enableSavingOrLoading(bool enable = true) { _enableSavingOrLoading = enable; }
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index b79be28cea..b51527a8cd 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -89,7 +89,7 @@ void DreamWebEngine::loadRoomsSample() {
 		return; // loaded already
 
 	assert(sample < 100);
-	Common::String sampleName = Common::String::format("DREAMWEB.V%02d", sample);
+	Common::String sampleSuffix = Common::String::format("V%02d", sample);
 	_currentSample = sample;
 
 	uint8 ch0 = _channel0Playing;
@@ -98,7 +98,7 @@ void DreamWebEngine::loadRoomsSample() {
 	uint8 ch1 = _channel1Playing;
 	if (ch1 >= 12)
 		cancelCh1();
-	loadSounds(1, sampleName.c_str());
+	loadSounds(1, sampleSuffix.c_str());
 }
 
 } // End of namespace DreamWeb
@@ -240,7 +240,8 @@ void DreamWebEngine::soundHandler() {
 
 }
 
-void DreamWebEngine::loadSounds(uint bank, const Common::String &filename) {
+void DreamWebEngine::loadSounds(uint bank, const Common::String &suffix) {
+	Common::String filename = getDatafilePrefix() + suffix;
 	debug(1, "loadSounds(%u, %s)", bank, filename.c_str());
 	Common::File file;
 	if (!file.open(filename)) {
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 89c9aa8d38..caa5fc8f7f 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -579,7 +579,7 @@ void DreamWebEngine::dreamweb() {
 	readSetData();
 	_wonGame = false;
 
-	loadSounds(0, "DREAMWEB.V99"); // basic sample
+	loadSounds(0, "V99"); // basic sample
 
 	bool firstLoop = true;
 
-- 
cgit v1.2.3


From bca22d4bee654a64fc1de9735dc45c1819e1d445 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Fri, 24 Feb 2012 05:46:00 +0000
Subject: DREAMWEB: Migrate loadGraphicsFile() to using datafile prefix
 variable.

---
 engines/dreamweb/dreamweb.h   |  2 +-
 engines/dreamweb/keypad.cpp   | 20 ++++++++++----------
 engines/dreamweb/monitor.cpp  |  4 ++--
 engines/dreamweb/newplace.cpp |  8 ++++----
 engines/dreamweb/saveload.cpp |  2 +-
 engines/dreamweb/stubs.cpp    | 13 +++++++------
 engines/dreamweb/titles.cpp   |  2 +-
 7 files changed, 26 insertions(+), 25 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 54646ba702..762d6387a6 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -809,7 +809,7 @@ public:
 	uint8 findNextColon(const uint8 **string);
 	void allocateBuffers();
 	void loadTextFile(TextFile &file, const char *fileName);
-	void loadGraphicsFile(GraphicsFile &file, const char *fileName);
+	void loadGraphicsFile(GraphicsFile &file, const char *suffix);
 	void loadGraphicsSegment(GraphicsFile &file, Common::File &inFile, unsigned int len);
 	void loadTextSegment(TextFile &file, Common::File &inFile, unsigned int len);
 	void loadTravelText();
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index 16729275c1..2ab5835997 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -108,7 +108,7 @@ bool DreamWebEngine::isItRight(uint8 digit0, uint8 digit1, uint8 digit2, uint8 d
 }
 
 void DreamWebEngine::loadKeypad() {
-	loadGraphicsFile(_keypadGraphics, "DREAMWEB.G02");
+	loadGraphicsFile(_keypadGraphics, "G02");
 }
 
 void DreamWebEngine::quitKey() {
@@ -293,8 +293,8 @@ void DreamWebEngine::showMenu() {
 }
 
 void DreamWebEngine::loadMenu() {
-	loadGraphicsFile(_menuGraphics, "DREAMWEB.S02"); // sprite name 3
-	loadGraphicsFile(_menuGraphics2, "DREAMWEB.G07"); // mon. graphics 2
+	loadGraphicsFile(_menuGraphics, "S02"); // sprite name 3
+	loadGraphicsFile(_menuGraphics2, "G07"); // mon. graphics 2
 }
 
 void DreamWebEngine::viewFolder() {
@@ -394,10 +394,10 @@ void DreamWebEngine::checkFolderCoords() {
 }
 
 void DreamWebEngine::loadFolder() {
-	loadGraphicsFile(_folderGraphics, "DREAMWEB.G09"); // folder graphics 1
-	loadGraphicsFile(_folderGraphics2, "DREAMWEB.G10"); // folder graphics 2
-	loadGraphicsFile(_folderGraphics3, "DREAMWEB.G11"); // folder graphics 3
-	loadGraphicsFile(_folderCharset, "DREAMWEB.C02"); // character set 3
+	loadGraphicsFile(_folderGraphics, "G09"); // folder graphics 1
+	loadGraphicsFile(_folderGraphics2, "G10"); // folder graphics 2
+	loadGraphicsFile(_folderGraphics3, "G11"); // folder graphics 3
+	loadGraphicsFile(_folderCharset, "C02"); // character set 3
 	loadTempText("T50"); // folder text
 }
 
@@ -491,7 +491,7 @@ void DreamWebEngine::showRightPage() {
 void DreamWebEngine::enterSymbol() {
 	_manIsOffScreen = 1;
 	getRidOfReels();
-	loadGraphicsFile(_symbolGraphics, "DREAMWEB.G12"); // symbol graphics
+	loadGraphicsFile(_symbolGraphics, "G12"); // symbol graphics
 	_symbolTopX = 24;
 	_symbolTopDir = 0;
 	_symbolBotX = 24;
@@ -716,9 +716,9 @@ void DreamWebEngine::updateSymbolBot() {
 
 void DreamWebEngine::useDiary() {
 	getRidOfReels();
-	loadGraphicsFile(_diaryGraphics, "DREAMWEB.G14");
+	loadGraphicsFile(_diaryGraphics, "G14");
 	loadTempText("T51");
-	loadGraphicsFile(_diaryCharset, "DREAMWEB.C02");
+	loadGraphicsFile(_diaryCharset, "C02");
 	createPanel();
 	showIcon();
 	showDiary();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index f5f064f855..61c23cda0e 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -54,11 +54,11 @@ void DreamWebEngine::useMon() {
 	showIcon();
 	drawFloor();
 	getRidOfAll();
-	loadGraphicsFile(_monitorGraphics, "DREAMWEB.G03"); // mon. graphic name
+	loadGraphicsFile(_monitorGraphics, "G03"); // mon. graphic name
 	loadPersonal();
 	loadNews();
 	loadCart();
-	loadGraphicsFile(_monitorCharset, "DREAMWEB.C01"); // character set 2
+	loadGraphicsFile(_monitorCharset, "C01"); // character set 2
 	printOuterMon();
 	initialMonCols();
 	printLogo();
diff --git a/engines/dreamweb/newplace.cpp b/engines/dreamweb/newplace.cpp
index c484855da4..529c45bd4a 100644
--- a/engines/dreamweb/newplace.cpp
+++ b/engines/dreamweb/newplace.cpp
@@ -259,13 +259,13 @@ void DreamWebEngine::resetLocation(uint8 index) {
 }
 
 void DreamWebEngine::readDestIcon() {
-	loadGraphicsFile(_newplaceGraphics, "DREAMWEB.G05");
-	loadGraphicsFile(_newplaceGraphics2, "DREAMWEB.G06");
-	loadGraphicsFile(_newplaceGraphics3, "DREAMWEB.G08");
+	loadGraphicsFile(_newplaceGraphics, "G05");
+	loadGraphicsFile(_newplaceGraphics2, "G06");
+	loadGraphicsFile(_newplaceGraphics3, "G08");
 }
 
 void DreamWebEngine::readCityPic() {
-	loadGraphicsFile(_cityGraphics, "DREAMWEB.G04");
+	loadGraphicsFile(_cityGraphics, "G04");
 }
 
 } // End of namespace DreamWeb
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index acc76572ef..a526c8a3bc 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -708,7 +708,7 @@ void DreamWebEngine::showDecisions() {
 }
 
 void DreamWebEngine::loadSaveBox() {
-	loadGraphicsFile(_saveGraphics, "DREAMWEB.G08");
+	loadGraphicsFile(_saveGraphics, "G08");
 }
 
 // show savegame names (original interface), and set kCursorpos
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index caa5fc8f7f..e195ef3726 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -834,7 +834,8 @@ void DreamWebEngine::switchRyanOff() {
 	_vars._ryanOn = 1;
 }
 
-void DreamWebEngine::loadGraphicsFile(GraphicsFile &file, const char *fileName) {
+void DreamWebEngine::loadGraphicsFile(GraphicsFile &file, const char *suffix) {
+	Common::String fileName = getDatafilePrefix() + suffix;
 	FileHeader header;
 
 	Common::File f;
@@ -1991,10 +1992,10 @@ void DreamWebEngine::loadRoom() {
 }
 
 void DreamWebEngine::readSetData() {
-	loadGraphicsFile(_charset1, "DREAMWEB.C00");
-	loadGraphicsFile(_icons1, "DREAMWEB.G00");
-	loadGraphicsFile(_icons2, "DREAMWEB.G01");
-	loadGraphicsFile(_mainSprites, "DREAMWEB.S00");
+	loadGraphicsFile(_charset1, "C00");
+	loadGraphicsFile(_icons1, "G00");
+	loadGraphicsFile(_icons2, "G01");
+	loadGraphicsFile(_mainSprites, "S00");
 	loadTextFile(_puzzleText, "DREAMWEB.T80");
 	loadTextFile(_commandText, "DREAMWEB.T84");
 	useCharset1();
@@ -2781,7 +2782,7 @@ void DreamWebEngine::showGun() {
 	loadRoomsSample();
 	_volume = 0;
 	GraphicsFile graphics;
-	loadGraphicsFile(graphics, "DREAMWEB.G13");
+	loadGraphicsFile(graphics, "G13");
 	createPanel2();
 	showFrame(graphics, 100, 4, 0, 0);
 	showFrame(graphics, 158, 106, 1, 0);
diff --git a/engines/dreamweb/titles.cpp b/engines/dreamweb/titles.cpp
index 146503dcdf..f7486ce687 100644
--- a/engines/dreamweb/titles.cpp
+++ b/engines/dreamweb/titles.cpp
@@ -41,7 +41,7 @@ void DreamWebEngine::monkSpeaking() {
 	_roomsSample = 35;
 	loadRoomsSample();
 	GraphicsFile graphics;
-	loadGraphicsFile(graphics, "DREAMWEB.G15");
+	loadGraphicsFile(graphics, "G15");
 	clearWork();
 	showFrame(graphics, 160, 72, 0, 128);	// show monk
 	workToScreen();
-- 
cgit v1.2.3


From a397748aceab258ccfe36cb6719bdbbda1dee730 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Fri, 24 Feb 2012 06:02:03 +0000
Subject: DREAMWEB: Migrate loadTextFile() to using datafile prefix variable.

---
 engines/dreamweb/dreamweb.h  |  2 +-
 engines/dreamweb/monitor.cpp | 22 +++++++++++-----------
 engines/dreamweb/stubs.cpp   | 13 ++++++-------
 3 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 762d6387a6..e80b5538ad 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -808,7 +808,7 @@ public:
 	const uint8 *getTextInFile1(uint16 index);
 	uint8 findNextColon(const uint8 **string);
 	void allocateBuffers();
-	void loadTextFile(TextFile &file, const char *fileName);
+	void loadTextFile(TextFile &file, const char *suffix);
 	void loadGraphicsFile(GraphicsFile &file, const char *suffix);
 	void loadGraphicsSegment(GraphicsFile &file, Common::File &inFile, unsigned int len);
 	void loadTextSegment(TextFile &file, Common::File &inFile, unsigned int len);
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 61c23cda0e..cdef60e94d 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -383,21 +383,21 @@ void DreamWebEngine::printOuterMon() {
 
 void DreamWebEngine::loadPersonal() {
 	if (_vars._location == 0 || _vars._location == 42)
-		loadTextFile(_textFile1, "DREAMWEB.T01"); // monitor file 1
+		loadTextFile(_textFile1, "T01"); // monitor file 1
 	else
-		loadTextFile(_textFile1, "DREAMWEB.T02"); // monitor file 2
+		loadTextFile(_textFile1, "T02"); // monitor file 2
 }
 
 void DreamWebEngine::loadNews() {
 	// textfile2 holds information accessible by anyone
 	if (_vars._newsItem == 0)
-		loadTextFile(_textFile2, "DREAMWEB.T10"); // monitor file 10
+		loadTextFile(_textFile2, "T10"); // monitor file 10
 	else if (_vars._newsItem == 1)
-		loadTextFile(_textFile2, "DREAMWEB.T11"); // monitor file 11
+		loadTextFile(_textFile2, "T11"); // monitor file 11
 	else if (_vars._newsItem == 2)
-		loadTextFile(_textFile2, "DREAMWEB.T12"); // monitor file 12
+		loadTextFile(_textFile2, "T12"); // monitor file 12
 	else
-		loadTextFile(_textFile2, "DREAMWEB.T13"); // monitor file 13
+		loadTextFile(_textFile2, "T13"); // monitor file 13
 }
 
 void DreamWebEngine::loadCart() {
@@ -408,15 +408,15 @@ void DreamWebEngine::loadCart() {
 		cartridgeId = getExAd(cartridgeIndex)->objId[3] + 1;
 
 	if (cartridgeId == 0)
-		loadTextFile(_textFile3, "DREAMWEB.T20"); // monitor file 20
+		loadTextFile(_textFile3, "T20"); // monitor file 20
 	else if (cartridgeId == 1)
-		loadTextFile(_textFile3, "DREAMWEB.T21"); // monitor file 21
+		loadTextFile(_textFile3, "T21"); // monitor file 21
 	else if (cartridgeId == 2)
-		loadTextFile(_textFile3, "DREAMWEB.T22"); // monitor file 22
+		loadTextFile(_textFile3, "T22"); // monitor file 22
 	else if (cartridgeId == 3)
-		loadTextFile(_textFile3, "DREAMWEB.T23"); // monitor file 23
+		loadTextFile(_textFile3, "T23"); // monitor file 23
 	else
-		loadTextFile(_textFile3, "DREAMWEB.T24"); // monitor file 24
+		loadTextFile(_textFile3, "T24"); // monitor file 24
 }
 
 void DreamWebEngine::showKeys() {
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index e195ef3726..a542173e1d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -728,8 +728,8 @@ void DreamWebEngine::dreamweb() {
 	}
 }
 
-void DreamWebEngine::loadTextFile(TextFile &file, const char *fileName)
-{
+void DreamWebEngine::loadTextFile(TextFile &file, const char *suffix) {
+	Common::String fileName = getDatafilePrefix() + suffix;
 	FileHeader header;
 
 	Common::File f;
@@ -1996,8 +1996,8 @@ void DreamWebEngine::readSetData() {
 	loadGraphicsFile(_icons1, "G00");
 	loadGraphicsFile(_icons2, "G01");
 	loadGraphicsFile(_mainSprites, "S00");
-	loadTextFile(_puzzleText, "DREAMWEB.T80");
-	loadTextFile(_commandText, "DREAMWEB.T84");
+	loadTextFile(_puzzleText, "T80");
+	loadTextFile(_commandText, "T84");
 	useCharset1();
 
 	// FIXME: Why is this commented out?
@@ -2236,12 +2236,11 @@ const uint8 *DreamWebEngine::getTextInFile1(uint16 index) {
 }
 
 void DreamWebEngine::loadTravelText() {
-	loadTextFile(_travelText, "DREAMWEB.T81"); // location descs
+	loadTextFile(_travelText, "T81"); // location descs
 }
 
 void DreamWebEngine::loadTempText(const char *suffix) {
-	Common::String fileName = getDatafilePrefix() + suffix;
-	loadTextFile(_textFile1, fileName.c_str());
+	loadTextFile(_textFile1, suffix);
 }
 
 void DreamWebEngine::drawFloor() {
-- 
cgit v1.2.3


From 966210b56dbe9a37ffde1fb0b46cc794ffed0562 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Fri, 24 Feb 2012 06:15:17 +0000
Subject: DREAMWEB: Migrate remaining minor functions to using datafile prefix
 variable.

Currently, the usages associated with savegames have been omitted.
These will probably need a different prefix constant as it is likely
foreign variants still use "DREAMWEB.*" for savegames, while using
a different prefix for the datafiles. We may even migrate away from
this naming convention as this causes savegame collisions when multiple
language variants are present, which could cause issues.

The usages in the Room members of the constant g_roomData structure have
also been omitted, as the members are copied into the savegame format,
thus replacing these and fixing other accesses is not trivial.
---
 engines/dreamweb/stubs.cpp    | 2 +-
 engines/dreamweb/vgagrafx.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a542173e1d..8e63774317 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2001,7 +2001,7 @@ void DreamWebEngine::readSetData() {
 	useCharset1();
 
 	// FIXME: Why is this commented out?
-	//openFile("DREAMWEB.VOL");
+	//openFile(getDatafilePrefix() + "VOL");
 	//uint8 *volumeTab = getSegment(data.word(kSoundbuffer)).ptr(16384, 0);
 	//readFromFile(volumeTab, 2048-256);
 	//closeFile();
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 61f3977710..be7d210999 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -409,7 +409,7 @@ bool DreamWebEngine::pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y) {
 void DreamWebEngine::loadPalFromIFF() {
 	Common::File palFile;
 	uint8* buf = new uint8[2000];
-	palFile.open("DREAMWEB.PAL");
+	palFile.open(getDatafilePrefix() + "PAL");
 	palFile.read(buf, 2000);
 	palFile.close();
 
-- 
cgit v1.2.3


From ecd1a9f9435c5fc5d502d75dd256394b5f3283f3 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Thu, 23 Feb 2012 21:36:14 +0100
Subject: KYRA: (EOB) - cleanup CGA/EGA code a bit

---
 engines/kyra/chargen.cpp      | 10 +++++-----
 engines/kyra/detection.cpp    |  2 ++
 engines/kyra/eobcommon.cpp    | 18 ++++++++++++++----
 engines/kyra/eobcommon.h      |  2 ++
 engines/kyra/gui_eob.cpp      | 10 +++++-----
 engines/kyra/kyra_hof.cpp     |  2 +-
 engines/kyra/kyra_lok.cpp     |  6 +++---
 engines/kyra/kyra_mr.cpp      |  2 +-
 engines/kyra/kyra_rpg.cpp     |  6 ------
 engines/kyra/kyra_v1.cpp      | 15 ++++-----------
 engines/kyra/kyra_v1.h        |  2 +-
 engines/kyra/lol.cpp          |  2 +-
 engines/kyra/magic_eob.cpp    |  2 +-
 engines/kyra/saveload_eob.cpp |  2 +-
 engines/kyra/screen.cpp       | 23 +++++++++--------------
 engines/kyra/screen.h         |  7 ++++---
 engines/kyra/screen_eob.cpp   | 22 ++++++++++------------
 engines/kyra/screen_eob.h     |  2 --
 18 files changed, 64 insertions(+), 71 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 73f5fccb92..54e1abcc2c 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -1496,7 +1496,7 @@ TransferPartyWiz::~TransferPartyWiz() {
 }
 
 bool TransferPartyWiz::start() {
-	_screen->copyPage(0, (_screen->getPageScaleFactor(0) == 2) ? 1 : 12);
+	_screen->copyPage(0, _vm->_useHiResDithering ? 1 : 12);
 
 	if (!selectAndLoadTransferFile())
 		return false;
@@ -1536,7 +1536,7 @@ bool TransferPartyWiz::start() {
 
 bool TransferPartyWiz::selectAndLoadTransferFile() {
 	do {
-		_screen->copyPage((_screen->getPageScaleFactor(0) == 2) ? 1 : 12, 0);
+		_screen->copyPage(_vm->_useHiResDithering ? 1 : 12, 0);
 		 if (transferFileDialogue(_vm->_savegameFilename))
 			 break;
 	} while (_vm->_gui->confirmDialogue2(15, 68, 1));
@@ -1566,7 +1566,7 @@ bool TransferPartyWiz::selectAndLoadTransferFile() {
 		return false;
 
 	Common::String target = _vm->_gui->transferTargetMenu(eobTargets);
-	_screen->copyPage((_screen->getPageScaleFactor(0) == 2) ? 1 : 12, 0);
+	_screen->copyPage(_vm->_useHiResDithering ? 1 : 12, 0);
 
 	if (target.empty())
 		return true;
@@ -1579,10 +1579,10 @@ bool TransferPartyWiz::selectAndLoadTransferFile() {
 			return true;
 	}
 
-	_screen->copyPage((_screen->getPageScaleFactor(0) == 2) ? 1 : 12, 0);
+	_screen->copyPage(_vm->_useHiResDithering ? 1 : 12, 0);
 
 	bool result = _vm->_gui->transferFileMenu(target, dest);
-	_screen->copyPage((_screen->getPageScaleFactor(0) == 2) ? 1 : 12, 0);
+	_screen->copyPage(_vm->_useHiResDithering ? 1 : 12, 0);
 
 	return result;
 }
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 1a4fd3bd9d..46dfec84ff 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -140,6 +140,8 @@ bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame
 		*engine = new Kyra::EoBEngine(syst, flags);
 		break;
 	case Kyra::GI_EOB2:
+		 if (Common::parseRenderMode(ConfMan.get("render_mode")) == Common::kRenderEGA)
+			 flags.useHiRes = true;
 		*engine = new Kyra::DarkMoonEngine(syst, flags);
 		break;
 #endif // ENABLE_EOB
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index ff53ba8b0a..1489e4f1f5 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -57,6 +57,8 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags)
 	_configMouse = true;
 	_loading = false;
 
+	_useHiResDithering = false;
+
 	_envAudioTimer = 0;
 	_flashShapeTimer = 0;
 	_drawSceneTimer = 0;
@@ -369,9 +371,11 @@ Common::Error EoBCoreEngine::init() {
 	if (ConfMan.hasKey("render_mode"))
 		_configRenderMode = Common::parseRenderMode(ConfMan.get("render_mode"));
 
+	_useHiResDithering = (_configRenderMode == Common::kRenderEGA && _flags.useHiRes);
+
 	_screen = new Screen_EoB(this, _system);
 	assert(_screen);
-	_screen->setResolution(_flags.useHiResOverlay || (_flags.gameID == GI_EOB2 && _configRenderMode == Common::kRenderEGA));
+	_screen->setResolution();
 
 	//MidiDriverType midiDriver = MidiDriver::detectDevice(MDT_PCSPK | MDT_ADLIB);
 	_sound = new SoundAdLibPC(this, _mixer);
@@ -390,7 +394,7 @@ Common::Error EoBCoreEngine::init() {
 	if (!_staticres->init())
 		error("_staticres->init() failed");
 
-	if (!_screen->init(_flags.gameID == GI_EOB2 && _configRenderMode == Common::kRenderEGA))
+	if (!_screen->init())
 		error("screen()->init() failed");
 
 	if (ConfMan.hasKey("save_slot")) {
@@ -413,6 +417,12 @@ Common::Error EoBCoreEngine::init() {
 	_screen->loadFont(Screen::FID_6_FNT, "FONT6.FNT");
 	_screen->loadFont(Screen::FID_8_FNT, "FONT8.FNT");
 
+	if (_useHiResDithering) {
+		_vcnBlockWidth <<= 1;
+		_vcnBlockHeight <<= 1;
+		SWAP(_vcnFlip0, _vcnFlip1);
+	}
+
 	Common::Error err = KyraRpgEngine::init();
 	if (err.getCode() != Common::kNoError)
 		return err;
@@ -1738,7 +1748,7 @@ void EoBCoreEngine::seq_portal() {
 bool EoBCoreEngine::checkPassword() {
 	char answ[20];
 	Screen::FontId of = _screen->setFont(Screen::FID_8_FNT);
-	_screen->copyPage(0, (_screen->getPageScaleFactor(0) == 2) ? 4 : 10);
+	_screen->copyPage(0, _useHiResDithering ? 4 : 10);
 
 	_screen->setScreenDim(13);
 	gui_drawBox(_screen->_curDim->sx << 3, _screen->_curDim->sy, _screen->_curDim->w << 3, _screen->_curDim->h, guiSettings()->colors.frame1, guiSettings()->colors.frame2, -1);
@@ -1765,7 +1775,7 @@ bool EoBCoreEngine::checkPassword() {
 
 	_screen->modifyScreenDim(13, _screen->_curDim->sx - 1, _screen->_curDim->sy - 2, _screen->_curDim->w + 2, _screen->_curDim->h + 16);
 	_screen->setFont(of);
-	_screen->copyPage((_screen->getPageScaleFactor(0) == 2) ? 4 : 10, 0);
+	_screen->copyPage(_useHiResDithering ? 4 : 10, 0);
 	return true;
 }
 
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 38be2a64e8..050fe2b794 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -845,6 +845,8 @@ protected:
 	const uint8 *_cgaMappingLevel[5];
 	const uint8 *_cgaLevelMappingIndex;
 
+	bool _useHiResDithering;
+
 	// Default parameters will import all present original save files and push them to the top of the save dialog.
 	bool importOriginalSaveFile(int destSlot, const char *sourceFile = 0);
 	Common::String readOriginalSaveFile(Common::String &file);
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index eadfd10d1e..ec9b674885 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -777,11 +777,11 @@ int EoBCoreEngine::clickedCamp(Button *button) {
 	}
 
 	_screen->copyPage(0, 7);
-	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, (_screen->getPageScaleFactor(0) == 2) ? 1 : 12, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, _useHiResDithering ? 1 : 12, Screen::CR_NO_P_CHECK);
 
 	_gui->runCampMenu();
 
-	_screen->copyRegion(0, 0, 0, 120, 176, 24, (_screen->getPageScaleFactor(0) == 2) ? 1 : 12, 2, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(0, 0, 0, 120, 176, 24, _useHiResDithering ? 1 : 12, 2, Screen::CR_NO_P_CHECK);
 	_screen->setScreenDim(cd);
 	drawScene(0);
 
@@ -1170,7 +1170,7 @@ int EoBCoreEngine::clickedSceneSpecial(Button *button) {
 
 int EoBCoreEngine::clickedSpellbookAbort(Button *button) {
 	_updateFlags = 0;
-	_screen->copyRegion(0, 0, 64, 121, 112, 56, (_screen->getPageScaleFactor(0) == 2) ? 4 : 10, 0, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(0, 0, 64, 121, 112, 56, _useHiResDithering ? 4 : 10, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
 	gui_drawCompass(true);
 	gui_toggleButtons();
@@ -2172,7 +2172,7 @@ void GUI_EoB::runCampMenu() {
 				if (cnt > 4) {
 					_vm->dropCharacter(selectCharacterDialogue(53));
 					_vm->gui_drawPlayField(false);
-					_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, (_screen->getPageScaleFactor(0) == 2) ? 1 : 12, Screen::CR_NO_P_CHECK);
+					_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, _vm->_useHiResDithering ? 1 : 12, Screen::CR_NO_P_CHECK);
 					_screen->setFont(Screen::FID_6_FNT);
 					_vm->gui_drawAllCharPortraitsWithStats();
 					_screen->setFont(Screen::FID_8_FNT);
@@ -2607,7 +2607,7 @@ Common::String GUI_EoB::transferTargetMenu(Common::Array<Common::String> &target
 			break;
 	} while (_saveSlotIdTemp[slot] == -1);
 
-	_screen->copyRegion(72, 14, 72, 14, 176, 144, (_screen->getPageScaleFactor(0) == 2) ? 7 : 12, 0, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(72, 14, 72, 14, 176, 144, _vm->_useHiResDithering ? 7 : 12, 0, Screen::CR_NO_P_CHECK);
 	_screen->modifyScreenDim(11, xo, yo, dm->w, dm->h);
 
 	return (slot < 6) ? _savegameList[_savegameOffset + slot] : Common::String();
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index b07e3a4965..0ba173d9d0 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -221,7 +221,7 @@ void KyraEngine_HoF::pauseEngineIntern(bool pause) {
 Common::Error KyraEngine_HoF::init() {
 	_screen = new Screen_HoF(this, _system);
 	assert(_screen);
-	_screen->setResolution(_flags.useHiResOverlay);
+	_screen->setResolution();
 
 	_debugger = new Debugger_HoF(this);
 	assert(_debugger);
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index e8a2c02e6e..1dd53901e8 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -167,12 +167,12 @@ KyraEngine_LoK::~KyraEngine_LoK() {
 }
 
 Common::Error KyraEngine_LoK::init() {
-	if (_flags.platform == Common::kPlatformPC98 && _flags.useHiResOverlay && ConfMan.getBool("16_color"))
+	if (_flags.platform == Common::kPlatformPC98 && _flags.useHiRes && ConfMan.getBool("16_color"))
 		_screen = new Screen_LoK_16(this, _system);
 	else
 		_screen = new Screen_LoK(this, _system);
 	assert(_screen);
-	_screen->setResolution(_flags.useHiResOverlay);
+	_screen->setResolution();
 
 	_debugger = new Debugger_LoK(this);
 	assert(_debugger);
@@ -961,7 +961,7 @@ void KyraEngine_LoK::registerDefaultSettings() {
 	// specific to the Kyra engine.
 	ConfMan.registerDefault("walkspeed", 2);
 
-	if (_flags.platform == Common::kPlatformPC98 && _flags.useHiResOverlay)
+	if (_flags.platform == Common::kPlatformPC98 && _flags.useHiRes)
 		ConfMan.registerDefault("16_color", false);
 }
 
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 38f473a619..39ed0d038a 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -203,7 +203,7 @@ KyraEngine_MR::~KyraEngine_MR() {
 Common::Error KyraEngine_MR::init() {
 	_screen = new Screen_MR(this, _system);
 	assert(_screen);
-	_screen->setResolution(_flags.useHiResOverlay);
+	_screen->setResolution();
 
 	_debugger = new Debugger_v2(this);
 	assert(_debugger);
diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp
index 121731e394..8857f64f7e 100644
--- a/engines/kyra/kyra_rpg.cpp
+++ b/engines/kyra/kyra_rpg.cpp
@@ -171,12 +171,6 @@ Common::Error KyraRpgEngine::init() {
 	_wllWallFlags = new uint8[256];
 	memset(_wllWallFlags, 0, 256);
 
-	if (_flags.gameID == GI_EOB2 && _configRenderMode == Common::kRenderEGA) {
-		_vcnBlockWidth <<= 1;
-		_vcnBlockHeight <<= 1;
-		SWAP(_vcnFlip0, _vcnFlip1);
-	}
-
 	_blockDrawingBuffer = new uint16[1320];
 	memset(_blockDrawingBuffer, 0, 1320 * sizeof(uint16));
 	uint32 swbSize = 22 * _vcnBlockWidth * 2 * 15 * _vcnBlockHeight;
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 7c67af2f13..2672618c67 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -233,19 +233,16 @@ KyraEngine_v1::~KyraEngine_v1() {
 Common::Point KyraEngine_v1::getMousePos() {
 	Common::Point mouse = _eventMan->getMousePos();
 
-	if (_flags.useHiResOverlay) {
+	if (_flags.useHiRes) {
 		mouse.x >>= 1;
 		mouse.y >>= 1;
 	}
 
-	mouse.x /= screen()->getPageScaleFactor(0);
-	mouse.y /= screen()->getPageScaleFactor(0);
-
 	return mouse;
 }
 
 void KyraEngine_v1::setMousePos(int x, int y) {
-	if (_flags.useHiResOverlay) {
+	if (_flags.useHiRes) {
 		x <<= 1;
 		y <<= 1;
 	}
@@ -312,12 +309,10 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
 		case Common::EVENT_LBUTTONUP: {
 			_mouseX = event.mouse.x;
 			_mouseY = event.mouse.y;
-			if (_flags.useHiResOverlay) {
+			if (_flags.useHiRes) {
 				_mouseX >>= 1;
 				_mouseY >>= 1;
 			}
-			_mouseX /= screen()->getPageScaleFactor(0);
-			_mouseY /= screen()->getPageScaleFactor(0);
 			keys = (event.type == Common::EVENT_LBUTTONDOWN ? 199 : (200 | 0x800));
 			breakLoop = true;
 			} break;
@@ -326,12 +321,10 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
 		case Common::EVENT_RBUTTONUP: {
 			_mouseX = event.mouse.x;
 			_mouseY = event.mouse.y;
-			if (_flags.useHiResOverlay) {
+			if (_flags.useHiRes) {
 				_mouseX >>= 1;
 				_mouseY >>= 1;
 			}
-			_mouseX /= screen()->getPageScaleFactor(0);
-			_mouseY /= screen()->getPageScaleFactor(0);
 			keys = (event.type == Common::EVENT_RBUTTONDOWN ? 201 : (202 | 0x800));
 			breakLoop = true;
 			} break;
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 95d58d4ab2..499f575a0c 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -118,7 +118,7 @@ struct GameFlags {
 	bool useAltShapeHeader    : 1;    // alternative shape header (uses 2 bytes more, those are unused though)
 	bool isTalkie             : 1;
 	bool isOldFloppy          : 1;
-	bool useHiResOverlay      : 1;
+	bool useHiRes      : 1;
 	bool use16ColorMode       : 1;
 	bool useDigSound          : 1;
 	bool useInstallerPackage  : 1;
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 022a878e0a..38e9d33259 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -364,7 +364,7 @@ GUI *LoLEngine::gui() const {
 Common::Error LoLEngine::init() {
 	_screen = new Screen_LoL(this, _system);
 	assert(_screen);
-	_screen->setResolution(_flags.useHiResOverlay);
+	_screen->setResolution();
 
 	_debugger = new Debugger_LoL(this);
 	assert(_debugger);
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index b2949ce1d5..985286854b 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -60,7 +60,7 @@ void EoBCoreEngine::useMagicBookOrSymbol(int charIndex, int type) {
 	}
 
 	if (!_updateFlags)
-		_screen->copyRegion(64, 121, 0, 0, 112, 56, 0, (_screen->getPageScaleFactor(0) == 2) ? 4 : 10, Screen::CR_NO_P_CHECK);
+		_screen->copyRegion(64, 121, 0, 0, 112, 56, 0, _useHiResDithering ? 4 : 10, Screen::CR_NO_P_CHECK);
 	_updateFlags = 1;
 	gui_setPlayFieldButtons();
 	gui_drawSpellbook();
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 4a446aa3f3..f7d7d95b57 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -298,7 +298,7 @@ Common::Error EoBCoreEngine::loadGameState(int slot) {
 		useMagicBookOrSymbol(_openBookChar, _openBookType);
 	}
 
-	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, (_screen->getPageScaleFactor(0) == 2) ? 1 : 12, Screen::CR_NO_P_CHECK);
+	_screen->copyRegion(0, 120, 0, 0, 176, 24, 0, _useHiResDithering ? 1 : 12, Screen::CR_NO_P_CHECK);
 
 	gui_toggleButtons();
 	setHandItem(_itemInHand);
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index ef6333b350..d3b4d6f943 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -106,8 +106,9 @@ bool Screen::init() {
 
 	memset(_fonts, 0, sizeof(_fonts));
 
-	if (_vm->gameFlags().useHiResOverlay) {
-		_useOverlays = true;
+	_useOverlays = (_vm->gameFlags().useHiRes && _renderMode != Common::kRenderEGA);
+
+	if (_useOverlays) {
 		_useSJIS = (_vm->gameFlags().lang == Common::JA_JPN);
 		_sjisInvisibleColor = (_vm->game() == GI_KYRA1) ? 0x80 : 0xF6;
 
@@ -226,7 +227,7 @@ bool Screen::enableScreenDebug(bool enable) {
 
 	if (_debugEnabled != enable) {
 		_debugEnabled = enable;
-		setResolution(_vm->gameFlags().useHiResOverlay);
+		setResolution();
 		_forceFullUpdate = true;
 		updateScreen();
 	}
@@ -234,14 +235,14 @@ bool Screen::enableScreenDebug(bool enable) {
 	return temp;
 }
 
-void Screen::setResolution(bool hiRes) {
+void Screen::setResolution() {
 	byte palette[3*256];
 	_system->getPaletteManager()->grabPalette(palette, 0, 256);
 
 	int width = 320, height = 200;
 	bool defaultTo1xScaler = false;
 
-	if (hiRes) {
+	if (_vm->gameFlags().useHiRes) {
 		defaultTo1xScaler = true;
 		height = 400;
 
@@ -466,11 +467,6 @@ const uint8 *Screen::getCPagePtr(int pageNum) const {
 	return _pagePtrs[pageNum];
 }
 
-int Screen::getPageScaleFactor(int pageNum) {
-	assert(pageNum < SCREEN_PAGE_NUM);
-	return _pageScaleFactor[pageNum];
-}
-
 uint8 *Screen::getPageRect(int pageNum, int x, int y, int w, int h) {
 	assert(pageNum < SCREEN_PAGE_NUM);
 	if (pageNum == 0 || pageNum == 1)
@@ -1226,7 +1222,7 @@ bool Screen::loadFont(FontId fontId, const char *filename) {
 			fnt = new AMIGAFont();
 #ifdef ENABLE_EOB
 		else if (_vm->game() == GI_EOB1 || _vm->game() == GI_EOB2)
-			fnt = new OldDOSFont(_renderMode, (_vm->game() == GI_EOB2) && (_renderMode == Common::kRenderEGA));
+			fnt = new OldDOSFont(_renderMode, _vm->gameFlags().useHiRes);
 #endif // ENABLE_EOB
 		else
 			fnt = new DOSFont();
@@ -2896,21 +2892,20 @@ void Screen::setMouseCursor(int x, int y, const byte *shape) {
 	if (_vm->gameFlags().useAltShapeHeader)
 		shape -= 2;
 
-	if (_vm->gameFlags().useHiResOverlay) {
+	if (_vm->gameFlags().useHiRes) {
 		x <<= 1;
 		y <<= 1;
 		mouseWidth <<= 1;
 		mouseHeight <<= 1;
 	}
 
-
 	uint8 *cursor = new uint8[mouseHeight * mouseWidth];
 	fillRect(0, 0, mouseWidth, mouseHeight, _cursorColorKey, 8);
 	drawShape(8, shape, 0, 0, 0, 0);
 
 	int xOffset = 0;
 
-	if (_vm->gameFlags().useHiResOverlay) {
+	if (_vm->gameFlags().useHiRes) {
 		xOffset = mouseWidth;
 		scale2x(getPagePtr(8) + mouseWidth, SCREEN_W, getPagePtr(8), SCREEN_W, mouseWidth, mouseHeight);
 		postProcessCursor(getPagePtr(8) + mouseWidth, mouseWidth, mouseHeight, SCREEN_W);
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index 18c0aa90f7..4f7f6d49ed 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -168,6 +168,7 @@ private:
 
 	Common::RenderMode _renderMode;
 	bool _useHiResEGADithering;
+	bool _useLoResEGA;
 
 	static uint16 *_cgaDitheringTable;
 	static int _numRef;
@@ -398,7 +399,7 @@ public:
 
 	// init
 	virtual bool init();
-	virtual void setResolution(bool hiRes = false);
+	virtual void setResolution();
 
 	void updateScreen();
 
@@ -433,8 +434,6 @@ public:
 	virtual void setPagePixel(int pageNum, int x, int y, uint8 color);
 
 	const uint8 *getCPagePtr(int pageNum) const;
-	int getPageScaleFactor(int pageNum);
-
 	uint8 *getPageRect(int pageNum, int x, int y, int w, int h);
 
 	// palette handling
@@ -580,6 +579,8 @@ protected:
 	bool _useOverlays;
 	bool _useSJIS;
 	bool _use16ColorMode;
+	bool _useHiResEGADithering;
+	bool _useLoResEGA;
 	bool _isAmiga;
 	Common::RenderMode _renderMode;
 
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 38521d757c..dc53e8aca5 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -55,7 +55,7 @@ Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system,
 	_egaPixelValueTable = 0;
 	_cgaMappingDefault = 0;
 	_cgaDitheringTables[0] = _cgaDitheringTables[1] = 0;
-	_useHiResEGADithering = false;
+	_useLoResEGA = _useHiResEGADithering = false;
 }
 
 Screen_EoB::~Screen_EoB() {
@@ -69,12 +69,8 @@ Screen_EoB::~Screen_EoB() {
 }
 
 bool Screen_EoB::init() {
-	return init(false);
-}
-
-bool Screen_EoB::init(bool useHiResEGADithering) {
 	// Define hi-res pages for EGA mode in EOB II
-	if (useHiResEGADithering) {
+	if (_vm->gameFlags().useHiRes) {
 		for (int i = 0; i < 8; i++)
 			_pageScaleFactor[i] = 2;
 	}
@@ -99,15 +95,16 @@ bool Screen_EoB::init(bool useHiResEGADithering) {
 
 		_dsTempPage = new uint8[12000];
 
-		if (_renderMode == Common::kRenderEGA) {
-			_useHiResEGADithering = useHiResEGADithering;
+		if (_vm->gameFlags().useHiRes && _renderMode == Common::kRenderEGA) {
+			_useHiResEGADithering = true;
 			_egaDitheringTable = new uint8[256];
 			_egaPixelValueTable = new uint8[256];
 			for (int i = 0; i < 256; i++) {
 				_egaDitheringTable[i] = i & 0x0f;
 				_egaPixelValueTable[i] = i & 0x0f;
 			}
-
+		} else if (_renderMode == Common::kRenderEGA) {
+			_useLoResEGA = true;
 		} else if (_renderMode == Common::kRenderCGA) {
 			_cgaMappingDefault = _vm->staticres()->loadRawData(kEoB1CgaMappingDefault, temp);
 			_cgaDitheringTables[0] = new uint16[256];
@@ -432,7 +429,7 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool enco
 	uint8 *srcLineStart = getPagePtr(_curPage | 1) + y * 320 + (x << 3);
 	uint8 *src = srcLineStart;
 
-	if (_renderMode == Common::kRenderEGA && !_useHiResEGADithering)
+	if (_useLoResEGA)
 		encode8bit = false;
 
 	if (_renderMode == Common::kRenderCGA) {
@@ -556,7 +553,7 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool enco
 		*dst++ = (w & 0xff);
 		*dst++ = (h & 0xff);
 
-		if (_renderMode == Common::kRenderEGA && !_useHiResEGADithering) {
+		if (_useLoResEGA) {
 			for (int i = 0; i < 16; i++)
 				dst[i] = i;
 		} else {
@@ -1538,6 +1535,7 @@ OldDOSFont::OldDOSFont(Common::RenderMode mode, bool useHiResEGADithering) : _re
 	_data = 0;
 	_width = _height = _numGlyphs = 0;
 	_bitmapOffsets = 0;
+	_useLoResEGA = (_renderMode == Common::kRenderEGA && !_useHiResEGADithering);
 
 	_numRef++;
 	if (!_cgaDitheringTable && _numRef == 1) {
@@ -1664,7 +1662,7 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 	uint16 cgaMask1 = cgaColorMask[color1 & 3];
 	uint16 cgaMask2 = cgaColorMask[color2 & 3];
 
-	if (_renderMode == Common::kRenderCGA || (_renderMode == Common::kRenderEGA && !_useHiResEGADithering)) {
+	if (_renderMode == Common::kRenderCGA || _useLoResEGA) {
 		color1 &= 0x0f;
 		color2 &= 0x0f;
 	}
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index 2bcfbd8f60..92de5c8b38 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -36,7 +36,6 @@ public:
 	virtual ~Screen_EoB();
 
 	bool init();
-	bool init(bool useHiResEGADithering);
 
 	void setClearScreenDim(int dim);
 	void clearCurDim();
@@ -116,7 +115,6 @@ private:
 
 	uint8 *_egaDitheringTable;
 	uint8 *_egaPixelValueTable;
-	bool _useHiResEGADithering;
 
 	static const uint8 _egaMatchTable[];
 	static const ScreenDim _screenDimTable[];
-- 
cgit v1.2.3


From 3b574466fa3cb28c521234f5460164ade91a8d50 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Fri, 24 Feb 2012 17:15:34 +0100
Subject: COMMON: distinguish between 256 colors and 16 colors PC-98 rendering
 modes

KYRA 1 PC-98 supports both modes in the same target. The desired mode can now be selected in the rendering options. We did have good support for the 16 colors mode of KYRA 1 already. This mode could not really be selected though (except by manually modifying the config file or the code).
---
 engines/kyra/detection_tables.h | 8 ++++----
 engines/kyra/kyra_lok.cpp       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index 44e604c44d..204c49cd2c 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -297,7 +297,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::JA_JPN,
 			Common::kPlatformPC98,
 			ADGF_NO_FLAGS,
-			GUIO3(GUIO_NOSPEECH, GUIO_MIDIPC98, GUIO_RENDERPC98)
+			GUIO4(GUIO_NOSPEECH, GUIO_MIDIPC98, GUIO_RENDERPC9821, GUIO_RENDERPC9801)
 		},
 		KYRA1_TOWNS_SJIS_FLAGS
 	},
@@ -743,7 +743,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::EN_ANY,
 			Common::kPlatformPC98,
 			ADGF_CD,
-			GUIO3(GUIO_NOSPEECH, GUIO_MIDIPC98, GUIO_RENDERPC98)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIPC98, GUIO_RENDERPC9821)
 		},
 		KYRA2_TOWNS_FLAGS
 	},
@@ -755,7 +755,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::JA_JPN,
 			Common::kPlatformPC98,
 			ADGF_CD,
-			GUIO3(GUIO_NOSPEECH, GUIO_MIDIPC98, GUIO_RENDERPC98)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIPC98, GUIO_RENDERPC9821)
 		},
 		KYRA2_TOWNS_SJIS_FLAGS
 	},
@@ -1418,7 +1418,7 @@ const KYRAGameDescription adGameDescs[] = {
 			Common::JA_JPN,
 			Common::kPlatformPC98,
 			ADGF_NO_FLAGS,
-			GUIO3(GUIO_NOSPEECH, GUIO_MIDIPC98, GUIO_RENDERPC98)
+			GUIO3(GUIO_NOSPEECH, GUIO_MIDIPC98, GUIO_RENDERPC9801)
 		},
 		LOL_PC98_SJIS_FLAGS
 	},
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index 1dd53901e8..4ea686ae39 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -167,7 +167,7 @@ KyraEngine_LoK::~KyraEngine_LoK() {
 }
 
 Common::Error KyraEngine_LoK::init() {
-	if (_flags.platform == Common::kPlatformPC98 && _flags.useHiRes && ConfMan.getBool("16_color"))
+	if (Common::parseRenderMode(ConfMan.get("render_mode")) == Common::kRenderPC9801)
 		_screen = new Screen_LoK_16(this, _system);
 	else
 		_screen = new Screen_LoK(this, _system);
-- 
cgit v1.2.3


From 30fa5e166379b9e0764b437c6925c22d908d7122 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Fri, 24 Feb 2012 15:48:06 +0100
Subject: KYRA: (EOB) - fix save file thumbnail generation in CGA/EGA mode

---
 engines/kyra/gui_eob.cpp    |  9 ++++++++-
 engines/kyra/screen.h       |  2 +-
 engines/kyra/screen_eob.cpp | 15 +++++++++++++++
 engines/kyra/screen_eob.h   |  1 +
 4 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index ec9b674885..e8e69d5b1f 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -2648,7 +2648,14 @@ bool GUI_EoB::transferFileMenu(Common::String &targetName, Common::String &selec
 void GUI_EoB::createScreenThumbnail(Graphics::Surface &dst) {
 	uint8 *screenPal = new uint8[768];
 	_screen->getRealPalette(0, screenPal);
-	::createThumbnail(&dst, _screen->getCPagePtr(7), Screen::SCREEN_W, Screen::SCREEN_H, screenPal);
+	uint16 width = Screen::SCREEN_W;
+	uint16 height = Screen::SCREEN_H;
+	if (_vm->_useHiResDithering) {
+		width <<= 1;
+		height <<= 1;
+	}
+
+	::createThumbnail(&dst, _screen->getCPagePtr(7), width, height, screenPal);
 	delete[] screenPal;
 }
 
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index 4f7f6d49ed..a0cf5742c6 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -452,7 +452,7 @@ public:
 	void enableInterfacePalette(bool e);
 	void setInterfacePalette(const Palette &pal, uint8 r, uint8 g, uint8 b);
 
-	void getRealPalette(int num, uint8 *dst);
+	virtual void getRealPalette(int num, uint8 *dst);
 	Palette &getPalette(int num);
 	void copyPalette(const int dst, const int src);
 
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index dc53e8aca5..9fae729bc4 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -422,6 +422,21 @@ void Screen_EoB::setScreenPalette(const Palette &pal) {
 	}
 }
 
+void Screen_EoB::getRealPalette(int num, uint8 *dst) {
+	if (_renderMode == Common::kRenderCGA || _renderMode == Common::kRenderEGA) {
+		const uint8 *pal = _screenPalette->getData();
+		for (int i = 0; i < 16; ++i) {
+			dst[0] = (pal[0] << 2) | (pal[0] & 3);
+			dst[1] = (pal[1] << 2) | (pal[1] & 3);
+			dst[2] = (pal[2] << 2) | (pal[2] & 3);
+			dst += 3;
+			pal += 3;
+		}
+	} else {
+		Screen::getRealPalette(num, dst);
+	}
+}
+
 uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool encode8bit, const uint8 *cgaMapping) {
 	uint8 *shp = 0;
 	uint16 shapesize = 0;
diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h
index 92de5c8b38..fc40cfe903 100644
--- a/engines/kyra/screen_eob.h
+++ b/engines/kyra/screen_eob.h
@@ -59,6 +59,7 @@ public:
 	void setPagePixel(int pageNum, int x, int y, uint8 color);
 
 	void setScreenPalette(const Palette &pal);
+	void getRealPalette(int num, uint8 *dst);
 
 	uint8 *encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool encode8bit = false, const uint8 *cgaMapping = 0);
 	void drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd = -1, int flags = 0, ...);
-- 
cgit v1.2.3


From 4e68b06fed3d2f0f2b8236cb7424cab4321f7b2d Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Fri, 24 Feb 2012 19:43:49 +0000
Subject: DREAMWEB: Remove uneeded Common::String construction.

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

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 4ed6ef7c15..9c02cd74ad 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -62,7 +62,7 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_channel0 = 0;
 	_channel1 = 0;
 
-	_datafilePrefix = Common::String("DREAMWEB.");
+	_datafilePrefix = "DREAMWEB.";
 
 	_openChangeSize = kInventx+(4*kItempicsize);
 	_quitRequested = false;
-- 
cgit v1.2.3


From 3a3c1eec5374a7d85a18ee55cab0891cd250529b Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 25 Feb 2012 10:21:40 +0100
Subject: TSAGE: R2R - Fix bug #3492133, error in palette index used

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 23a9eb2590..e849e7137a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -11432,9 +11432,9 @@ void Scene1850::postInit(SceneObjectList *OwnerList) {
 void Scene1850::remove() {
 	g_globals->_scenePalette.loadPalette(0);
 
-	R2_GLOBALS._scenePalette._palette[771] = 255;
-	R2_GLOBALS._scenePalette._palette[772] = 255;
-	R2_GLOBALS._scenePalette._palette[773] = 255;
+	R2_GLOBALS._scenePalette._palette[765] = 255;
+	R2_GLOBALS._scenePalette._palette[766] = 255;
+	R2_GLOBALS._scenePalette._palette[767] = 255;
 	
 	SceneExt::remove();
 }
-- 
cgit v1.2.3


From 9279b25694f16a6166c7eaf677682caeeaed5d7e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 25 Feb 2012 12:44:37 +0100
Subject: TSAGE: JANITORIAL: Remove trailing spaces

---
 engines/tsage/blue_force/blueforce_logic.cpp     |   8 +-
 engines/tsage/blue_force/blueforce_scenes1.cpp   |  40 +-
 engines/tsage/blue_force/blueforce_scenes1.h     |   4 +-
 engines/tsage/blue_force/blueforce_scenes2.cpp   |  42 +-
 engines/tsage/blue_force/blueforce_scenes3.cpp   |   8 +-
 engines/tsage/blue_force/blueforce_scenes4.cpp   |  16 +-
 engines/tsage/blue_force/blueforce_scenes5.cpp   |  62 +-
 engines/tsage/blue_force/blueforce_scenes5.h     |   2 +-
 engines/tsage/blue_force/blueforce_scenes6.cpp   |  10 +-
 engines/tsage/blue_force/blueforce_scenes8.cpp   |  34 +-
 engines/tsage/blue_force/blueforce_scenes9.cpp   |   6 +-
 engines/tsage/debugger.cpp                       |   6 +-
 engines/tsage/events.h                           |  28 +-
 engines/tsage/graphics.cpp                       |   6 +-
 engines/tsage/resources.cpp                      |   8 +-
 engines/tsage/ringworld2/ringworld2_dialogs.cpp  |   2 +-
 engines/tsage/ringworld2/ringworld2_logic.cpp    |  62 +-
 engines/tsage/ringworld2/ringworld2_scenes0.cpp  | 202 +++---
 engines/tsage/ringworld2/ringworld2_scenes0.h    |  14 +-
 engines/tsage/ringworld2/ringworld2_scenes1.cpp  | 870 +++++++++++------------
 engines/tsage/ringworld2/ringworld2_scenes1.h    |  20 +-
 engines/tsage/ringworld2/ringworld2_scenes2.cpp  |  48 +-
 engines/tsage/ringworld2/ringworld2_scenes3.cpp  | 230 +++---
 engines/tsage/ringworld2/ringworld2_scenes3.h    |  12 +-
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 150 ++--
 engines/tsage/scenes.cpp                         |   6 +-
 engines/tsage/staticres.cpp                      |   4 +-
 engines/tsage/user_interface.cpp                 |   2 +-
 28 files changed, 951 insertions(+), 951 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_logic.cpp b/engines/tsage/blue_force/blueforce_logic.cpp
index eef48ad58e..3aef18f4f0 100644
--- a/engines/tsage/blue_force/blueforce_logic.cpp
+++ b/engines/tsage/blue_force/blueforce_logic.cpp
@@ -733,7 +733,7 @@ void SceneExt::remove() {
 			_action->_endHandler = NULL;
 		_action->remove();
 	}
-	
+
 	_focusObject = NULL;
 }
 
@@ -1326,7 +1326,7 @@ bool BlueForceInvObjectList::SelectItem(int objectNumber) {
 		AmmoBeltDialog *dlg = new AmmoBeltDialog();
 		dlg->execute();
 		delete dlg;
-	
+
 		return true;
 	}
 
@@ -1408,7 +1408,7 @@ void SceneMessage::signal() {
 }
 
 void SceneMessage::process(Event &event) {
-	if ((event.eventType == EVENT_BUTTON_DOWN) || 
+	if ((event.eventType == EVENT_BUTTON_DOWN) ||
 		((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_RETURN))) {
 		signal();
 	}
@@ -1439,7 +1439,7 @@ void SceneMessage::draw() {
 
 void SceneMessage::clear() {
 	// Fade out the text display
-	static const uint32 black = 0;	
+	static const uint32 black = 0;
 	BF_GLOBALS._scenePalette.fade((const byte *)&black, false, 100);
 
 	// Refresh the background
diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp
index c067cd87ea..9f1e9ce36e 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes1.cpp
@@ -430,7 +430,7 @@ void Scene110::Action1::signal() {
 	case 6:
 		// Play "Vroum"
 		scene->_sound.play(31);
-		// The guy starts the engine 
+		// The guy starts the engine
 		scene->_object4.setStrip(3);
 		scene->_object4._frame = 1;
 		scene->_object4.animate(ANIM_MODE_5, NULL);
@@ -837,7 +837,7 @@ void Scene110::postInit(SceneObjectList *OwnerList) {
 	_object10._moveDiff.y = 10;
 	_object10.setPosition(_object9._position);
 	_object10.hide();
-	
+
 	setAction(&_action1);
 }
 /*--------------------------------------------------------------------------
@@ -987,7 +987,7 @@ void Scene114::signal() {
  *--------------------------------------------------------------------------*/
 bool Scene115::Kate::startAction(CursorType action, Event &event) {
 	Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
-	
+
 	switch (action) {
 	case CURSOR_LOOK:
 		SceneItem::display(115, 8, SET_WIDTH, 312,
@@ -1061,7 +1061,7 @@ bool Scene115::Kate::startAction(CursorType action, Event &event) {
 
 bool Scene115::Tony::startAction(CursorType action, Event &event) {
 	Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
-	
+
 	switch (action) {
 	case CURSOR_LOOK:
 		SceneItem::display(115, 7, SET_WIDTH, 312,
@@ -1164,7 +1164,7 @@ bool Scene115::Tony::startAction(CursorType action, Event &event) {
 
 bool Scene115::Object3::startAction(CursorType action, Event &event) {
 	Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
-	
+
 	switch (action) {
 	case CURSOR_LOOK:
 		SceneItem::display(115, 9, SET_WIDTH, 312,
@@ -1195,7 +1195,7 @@ bool Scene115::Object3::startAction(CursorType action, Event &event) {
 
 bool Scene115::Object4::startAction(CursorType action, Event &event) {
 	Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
-	
+
 	switch (action) {
 	case CURSOR_LOOK:
 		SceneItem::display(115, 42, SET_WIDTH, 312,
@@ -1217,7 +1217,7 @@ bool Scene115::Object4::startAction(CursorType action, Event &event) {
 
 void Scene115::Jukebox::signal() {
 	Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
-	
+
 	if (_jokeboxPlayingCtr == 2)
 		_jokeboxPlayingCtr = 0;
 	else if (_jokeboxPlayingCtr == 1) {
@@ -1228,7 +1228,7 @@ void Scene115::Jukebox::signal() {
 
 bool Scene115::Jukebox::startAction(CursorType action, Event &event) {
 	Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
-	
+
 	if (action == CURSOR_USE) {
 		if (_jokeboxPlayingCtr == 0) {
 			_jokeboxPlayingCtr = 1;
@@ -1241,7 +1241,7 @@ bool Scene115::Jukebox::startAction(CursorType action, Event &event) {
 				SET_FONT, 4, SET_BG_COLOR, 1, SET_FG_COLOR, 19, SET_EXT_BGCOLOR, 9,
 				SET_EXT_FGCOLOR, 13, LIST_END);
 		return true;
-	} else 
+	} else
 		return NamedHotspot::startAction(action, event);
 }
 
@@ -1265,7 +1265,7 @@ void Scene115::EventHandler1::dispatch() {
 
 bool Scene115::Item10::startAction(CursorType action, Event &event) {
 	Scene115 *scene = (Scene115 *)BF_GLOBALS._sceneManager._scene;
-	
+
 	if (BF_GLOBALS.getFlag(fWithLyle)) {
 		scene->_object4.setStrip2(6);
 		Common::Point pt(-20, 122);
@@ -1591,7 +1591,7 @@ Scene115::Scene115() : SceneExt () {
 
 void Scene115::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
-	
+
 	BF_GLOBALS._sound1.fadeSound(15);
 	loadScene(115);
 	setZoomPercents(98, 85, 115, 100);
@@ -1641,7 +1641,7 @@ void Scene115::postInit(SceneObjectList *OwnerList) {
 
 	_object11.postInit();
 	_object11.hide();
-	
+
 	_object12.postInit();
 	_object12.hide();
 
@@ -1817,7 +1817,7 @@ void Scene125::Action1::signal() {
 	case 0:
 	// No break on purpose
 	default:
-		break;		
+		break;
 	}
 }
 
@@ -2054,7 +2054,7 @@ void Scene125::Action3::dispatch() {
 	SceneObject *owner = static_cast<SceneObject *>(this->_owner);
 
 	Action::dispatch();
-	
+
 	if ((_actionIndex == 9) && (owner->_percent > 70))
 		owner->changeZoom(owner->_percent - 1);
 }
@@ -2095,7 +2095,7 @@ void Scene125::Action4::dispatch() {
 	SceneObject *owner = static_cast<SceneObject *>(this->_owner);
 
 	Action::dispatch();
-	
+
 	if ((_actionIndex == 4) && (owner->_percent > 80))
 		owner->changeZoom(owner->_percent - 1);
 }
@@ -2134,7 +2134,7 @@ void Scene125::Action6::dispatch() {
 	SceneObject *owner = static_cast<SceneObject *>(this->_owner);
 
 	Action::dispatch();
-	
+
 	if ((_actionIndex == 2) && (owner->_percent < 100))
 		owner->changeZoom(owner->_percent + 1);
 }
@@ -2169,7 +2169,7 @@ void Scene125::postInit(SceneObjectList *OwnerList) {
 	BF_GLOBALS._player._moveDiff.x = 6;
 	BF_GLOBALS._player._moveDiff.y = 6;
 	BF_GLOBALS._player.disableControl();
-	
+
 	_object5.postInit();
 	_object5.setVisage(128);
 	_object5.setPosition(Common::Point(150, 117));
@@ -2457,7 +2457,7 @@ void Scene160::Action1::signal() {
 		scene->_kid.setStrip(2);
 		scene->_kid.animate(ANIM_MODE_5, this);
 
-		scene->_kidBody.setPosition(scene->_kid._position); 
+		scene->_kidBody.setPosition(scene->_kid._position);
 		scene->_kidBody.setFrame(1);
 		scene->_kidBody.setStrip(3);
 		break;
@@ -2630,7 +2630,7 @@ void Scene160::Action2::signal() {
 		break;
 	case 25:
 		BF_GLOBALS._sound1.fade(0, 10, 10, true, this);
-// FIXME: Currently, fade() doesn't end properly with this song, 
+// FIXME: Currently, fade() doesn't end properly with this song,
 //        thus never returns here. This hack skips the wait and changes
 //        directly to the next scene
 // Start of hack
@@ -2895,7 +2895,7 @@ void Scene180::postInit(SceneObjectList *OwnerList) {
 				_vechile.setStrip(3);
 				_vechile._frame = 5;
 				_vechile.changeZoom(75);
-				
+
 				_dispatchMode = 1;
 				_vechile._moveDiff.x = 45;
 			} else {
diff --git a/engines/tsage/blue_force/blueforce_scenes1.h b/engines/tsage/blue_force/blueforce_scenes1.h
index b304c2aeaa..ddde200370 100644
--- a/engines/tsage/blue_force/blueforce_scenes1.h
+++ b/engines/tsage/blue_force/blueforce_scenes1.h
@@ -137,7 +137,7 @@ class Scene110: public SceneExt {
 		virtual void signal();
 	};
 public:
-	NamedObject _object1, _object2, _object3, _object4, _object5, _object6, _object7, _object8, _object9, _object10; 
+	NamedObject _object1, _object2, _object3, _object4, _object5, _object6, _object7, _object8, _object9, _object10;
 	ASound _sound;
 	Action1 _action1;
 	Action2 _action2;
@@ -354,7 +354,7 @@ public:
 	NamedObject _object1;
 	NamedObject _object2;
 	IntroSceneText _text;
-	
+
 	void postInit(SceneObjectList *OwnerList);
 };
 
diff --git a/engines/tsage/blue_force/blueforce_scenes2.cpp b/engines/tsage/blue_force/blueforce_scenes2.cpp
index 340baae6a9..c992afe620 100644
--- a/engines/tsage/blue_force/blueforce_scenes2.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes2.cpp
@@ -67,7 +67,7 @@ void Scene200::Action1::signal() {
 		rot->setDelay(10);
 		rot = BF_GLOBALS._scenePalette.addRotation(96, 111, 1);
 		rot->setDelay(10);
-		
+
 		scene->setAction(&scene->_sequenceManager, this, 201, &scene->_object1, &scene->_object2,
 			&scene->_object3, &scene->_object4, &scene->_object5, &scene->_object6, NULL);
 		break;
@@ -99,7 +99,7 @@ void Scene200::Action2::signal() {
 		break;
 	}
 }
-	
+
 
 /*--------------------------------------------------------------------------*/
 
@@ -133,7 +133,7 @@ void Scene200::postInit(SceneObjectList *OwnerList) {
 	_object11.setVisage(200);
 	_object11.setPosition(Common::Point(96, 112), 1000);
 	_object11.setStrip(3);
-	_object11.setFrame(1); 
+	_object11.setFrame(1);
 	_object11.changeZoom(100);
 
 	_object10.setAction(&_action1);
@@ -168,7 +168,7 @@ void Scene210::Action1::signal() {
 		rot->setDelay(10);
 		rot = BF_GLOBALS._scenePalette.addRotation(96, 111, 1);
 		rot->setDelay(10);
-		
+
 		scene->setAction(&scene->_sequenceManager, this, 210, &scene->_object10, &scene->_object11,
 			&scene->_object12, &scene->_object13, &scene->_object14, &scene->_object15, NULL);
 		break;
@@ -301,7 +301,7 @@ void Scene220::Action1::signal() {
 		rot->setDelay(10);
 		rot = BF_GLOBALS._scenePalette.addRotation(96, 111, 1);
 		rot->setDelay(10);
-		
+
 		scene->setAction(&scene->_sequenceManager, this, 220, &scene->_object4, &scene->_object5,
 			&scene->_object6, &scene->_object7, &scene->_object8, &scene->_object9, NULL);
 		break;
@@ -508,7 +508,7 @@ void Scene225::Action1::signal() {
 		rot->setDelay(10);
 		rot = BF_GLOBALS._scenePalette.addRotation(96, 111, 1);
 		rot->setDelay(10);
-		
+
 		scene->setAction(&scene->_sequenceManager, this, 225, &scene->_object15, &scene->_object16,
 			&scene->_object17, &scene->_object18, &scene->_object19, &scene->_object20, NULL);
 		break;
@@ -661,7 +661,7 @@ void Scene225::postInit(SceneObjectList *OwnerList) {
 	_object11._frame = 1;
 	_object11.changeZoom(100);
 	_object11._numFrames = 2;
-	
+
 	_object12.postInit();
 	_object12.setVisage(1225);
 	_object12.setPosition(Common::Point(368, 35));
@@ -1007,14 +1007,14 @@ void Scene270::postInit(SceneObjectList *OwnerList) {
 	BF_GLOBALS._player._moveDiff.x = 8;
 	BF_GLOBALS._player.changeZoom(-1);
 	BF_GLOBALS._player.disableControl();
-	
+
 	switch (BF_GLOBALS._sceneManager._previousScene) {
 	case 560:
 		if (BF_GLOBALS._bookmark == bTalkedToGrannyAboutSkipsCard) {
 			_field219A = 1;
 			BF_GLOBALS._player._moveDiff.x = 5;
 			_field386 = 0;
-			
+
 			_grandma.animate(ANIM_MODE_1, NULL);
 			setAction(&_sequenceManager1, NULL, 2720, &BF_GLOBALS._player, &_grandma, NULL);
 			BF_GLOBALS._bookmark = bLyleStoppedBy;
@@ -1138,7 +1138,7 @@ void Scene270::signal() {
 	case 2717:
 		_sceneMode = 2718;
 		_lyle.setFrame2(-1);
-		setAction(&_sequenceManager1, this, 2718, &BF_GLOBALS._player, &_laura, &_skip, 
+		setAction(&_sequenceManager1, this, 2718, &BF_GLOBALS._player, &_laura, &_skip,
 			&_lyle, &_grandma, NULL);
 		break;
 	case 2718:
@@ -1167,7 +1167,7 @@ void Scene270::signal() {
 		break;
 	default:
 		break;
-	}		
+	}
 }
 
 void Scene270::process(Event &event) {
@@ -1374,7 +1374,7 @@ Scene271::Scene271() {
 
 void Scene271::synchronize(Serializer &s) {
 	PalettedScene::synchronize(s);
-	
+
 	s.syncAsSint16LE(_field796);
 	s.syncAsSint16LE(_field2E16);
 	s.syncAsSint16LE(_tempPos.x);
@@ -1396,7 +1396,7 @@ void Scene271::postInit(SceneObjectList *OwnerList) {
 	_stripManager.addSpeaker(&_gameTextSpeaker);
 	_stripManager.addSpeaker(&_granTextSpeaker);
 	_stripManager.addSpeaker(&_lyleTextSpeaker);
-	
+
 	_exit.setDetails(Rect(310, 115, 320, 167), 270, -1, -1, -1, 1, NULL);
 
 	_tv.postInit();
@@ -1433,7 +1433,7 @@ void Scene271::postInit(SceneObjectList *OwnerList) {
 	_item2.setDetails(3, 270, 24, 25, 26, 1);
 	_item4.setDetails(2, 270, 30, 31, 32, 1);
 	_item11.setDetails(Rect(0, 0, SCREEN_WIDTH, UI_INTERFACE_Y), 270, 0, 1, 2, 1, NULL);
-	
+
 	BF_GLOBALS._player.postInit();
 	BF_GLOBALS._player._moveDiff.x = 8;
 	BF_GLOBALS._player.changeZoom(-1);
@@ -1477,7 +1477,7 @@ void Scene271::postInit(SceneObjectList *OwnerList) {
 		_object11.setStrip(1);
 		_object11._frame = 2;
 		_object11.setPosition(Common::Point(35, 136));
-		
+
 		_object6.postInit();
 		_object6.hide();
 
@@ -1508,15 +1508,15 @@ void Scene271::postInit(SceneObjectList *OwnerList) {
 		_object7.setVisage(277);
 		_object7.setStrip(7);
 		_object7.setPosition(Common::Point(48, 149));
-		
+
 		BF_GLOBALS._walkRegions.disableRegion(6);
 		BF_GLOBALS._walkRegions.disableRegion(14);
 		BF_GLOBALS._walkRegions.disableRegion(19);
-		
+
 		_object12.postInit();
 		_object12.setVisage(276);
 		_object12.setPosition(Common::Point(129, 130));
-		
+
 		_object2.postInit();
 		_object2.setVisage(270);
 		_object2.setStrip(3);
@@ -1637,10 +1637,10 @@ void Scene271::signal() {
 		BF_GLOBALS._player.enableControl();
 		_field796 = 1;
 		_field2E16 = 1;
-		
+
 		_object1.remove();
 		_object11.remove();
-		
+
 		BF_INVENTORY.setObjectScene(INV_LYLE_CARD, 1);
 		break;
 	case 2709:
@@ -1754,7 +1754,7 @@ void Scene280::Action1::signal() {
 		scene->_jake.setFrame(1);
 		scene->_jake.animate(ANIM_MODE_8, NULL);
 		scene->_jake._numFrames = 5;
-		
+
 		scene->_stripManager.start(2800, this);
 		break;
 	case 2:
diff --git a/engines/tsage/blue_force/blueforce_scenes3.cpp b/engines/tsage/blue_force/blueforce_scenes3.cpp
index 8955199286..22c831f531 100644
--- a/engines/tsage/blue_force/blueforce_scenes3.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes3.cpp
@@ -945,7 +945,7 @@ void Scene315::Action1::signal() {
 			T2_GLOBALS._uiElements.addScore(30);
 			BF_INVENTORY.setObjectScene(INV_MUG_SHOT, 1);
 			//HACK: This has to be checked wether or not it occurs in the original.
-			//When the _sceneMode is set to 3169, the value desn't change. 
+			//When the _sceneMode is set to 3169, the value desn't change.
 			//If you show the forest rapsheet, it gives points (and again... and again...)
 			scene->_sceneMode = 3154;
 		}
@@ -4509,12 +4509,12 @@ void Scene360::signal() {
 		break;
 	case 3607:
 	case 3609:
-		// Original game was only using at this place visage 1363. 
+		// Original game was only using at this place visage 1363.
 		// This workaround allow Harrison to keep his gun handy
 		// when entering the romm (if required)
 		if (! BF_GLOBALS.getFlag(gunDrawn))
 			_harrison.setVisage(1363);
-		else 
+		else
 			_harrison.setVisage(363);
 		BF_GLOBALS._player.enableControl();
 		break;
@@ -5365,7 +5365,7 @@ bool Scene385::Jim::startAction(CursorType action, Event &event) {
 	} else if (action < CURSOR_WALK)
 		// Any other inventory item
 		return false;
-	else 
+	else
 		return NamedObject::startAction(action, event);
 }
 
diff --git a/engines/tsage/blue_force/blueforce_scenes4.cpp b/engines/tsage/blue_force/blueforce_scenes4.cpp
index e966daf34e..a10f311791 100644
--- a/engines/tsage/blue_force/blueforce_scenes4.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes4.cpp
@@ -1083,7 +1083,7 @@ void Scene415::postInit(SceneObjectList *OwnerList) {
 	_animatedSeat.setStrip(1);
 	_animatedSeat.setPosition(Common::Point(306, 116));
 	_animatedSeat.fixPriority(80);
-	
+
 	_windowLever.setDetails(16, 415, 25, -1, 26, 1);
 	_item7.setDetails(17, 415, 32, -1, 33, 1);
 	_seatBelt.setDetails(14, 415, 29, -1, 30, 1);
@@ -1271,7 +1271,7 @@ void Scene440::postInit(SceneObjectList *OwnerList) {
 
 		BF_GLOBALS._player.setVisage(303);
 		BF_GLOBALS._player.setPosition(Common::Point(187, 104));
-		
+
 		_lyle.setPosition(Common::Point(135, 128));
 		_lyle.show();
 
@@ -1291,7 +1291,7 @@ void Scene440::postInit(SceneObjectList *OwnerList) {
 			_vechile.setVisage(580);
 			_vechile.setStrip(2);
 			_vechile.setFrame(3);
-			
+
 			BF_GLOBALS._player.setVisage(303);
 		}
 	}
@@ -1310,7 +1310,7 @@ void Scene440::postInit(SceneObjectList *OwnerList) {
 		_lyle.setPosition(Common::Point(143, 93));
 		_lyle.setStrip(5);
 		_lyle.fixPriority(90);
-		
+
 		_doorway.setFrame(_doorway.getFrameCount());
 		_sceneMode = 4401;
 		setAction(&_sequenceManager, this, 4401, &BF_GLOBALS._player, &_doorway, NULL);
@@ -1375,7 +1375,7 @@ bool Scene450::Weasel::startAction(CursorType action, Event &event) {
 		T2_GLOBALS._uiElements.addScore(30);
 
 		scene->_sceneMode = 4505;
-		scene->setAction(&scene->_sequenceManager, scene, 4505, &BF_GLOBALS._player, this, 
+		scene->setAction(&scene->_sequenceManager, scene, 4505, &BF_GLOBALS._player, this,
 			&scene->_counterDoor, &scene->_object2, NULL);
 		return true;
 	default:
@@ -1427,7 +1427,7 @@ bool Scene450::Manager::startAction(CursorType action, Event &event) {
 		if (BF_GLOBALS.getFlag(takenWeasel) && !BF_GLOBALS.getFlag(gotTrailer450)) {
 			BF_GLOBALS.setFlag(gotTrailer450);
 			scene->_sceneMode = 4517;
-			scene->setAction(&scene->_sequenceManager, scene, 4517, &BF_GLOBALS._player, this, 
+			scene->setAction(&scene->_sequenceManager, scene, 4517, &BF_GLOBALS._player, this,
 				&scene->_door, NULL);
 		} else {
 			animate(ANIM_MODE_8, 1, NULL);
@@ -1485,11 +1485,11 @@ bool Scene450::Manager::startAction(CursorType action, Event &event) {
 		} else {
 			animate(ANIM_MODE_8, 1, NULL);
 			BF_GLOBALS._player.disableControl();
-			
+
 			if (!BF_GLOBALS.getFlag(showEugeneID))
 				T2_GLOBALS._uiElements.addScore(30);
 			BF_GLOBALS.setFlag(showEugeneID);
-			
+
 			if ((BF_GLOBALS.getFlag(showRapEugene) || BF_GLOBALS.getFlag(showEugeneNapkin)) &&
 					!BF_GLOBALS.getFlag(fMgrCallsWeasel)) {
 				T2_GLOBALS._uiElements.addScore(30);
diff --git a/engines/tsage/blue_force/blueforce_scenes5.cpp b/engines/tsage/blue_force/blueforce_scenes5.cpp
index 692e142f55..abadc4300a 100644
--- a/engines/tsage/blue_force/blueforce_scenes5.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes5.cpp
@@ -60,7 +60,7 @@ bool Scene550::Lyle::startAction(CursorType action, Event &event) {
 
 	switch (action) {
 	case CURSOR_TALK:
-		if ((BF_INVENTORY.getObjectScene(INV_SCHEDULE) == 1) || 
+		if ((BF_INVENTORY.getObjectScene(INV_SCHEDULE) == 1) ||
 				(BF_INVENTORY.getObjectScene(INV_9MM_BULLETS) == 1)) {
 			if ((BF_INVENTORY.getObjectScene(INV_SCHEDULE) == 1) &&
 					(BF_INVENTORY.getObjectScene(INV_9MM_BULLETS) == 1)) {
@@ -132,7 +132,7 @@ bool Scene550::Vechile::startAction(CursorType action, Event &event) {
 			BF_GLOBALS._player.disableControl();
 			scene->_sceneMode = 2;
 			scene->setAction(&scene->_sequenceManager, scene, 5501, &BF_GLOBALS._player, NULL);
-		} else if ((BF_INVENTORY.getObjectScene(INV_SCHEDULE) == 1) || 
+		} else if ((BF_INVENTORY.getObjectScene(INV_SCHEDULE) == 1) ||
 					(BF_INVENTORY.getObjectScene(INV_9MM_BULLETS) == 1)) {
 			if (BF_INVENTORY.getObjectScene(INV_9MM_BULLETS) == 1) {
 				scene->_sceneMode = 5501;
@@ -164,11 +164,11 @@ void Scene550::postInit(SceneObjectList *OwnerList) {
 		_sceneMode = 1;
 		signal();
 		return;
-	} 
+	}
 
 	SceneExt::postInit();
 	loadScene(550);
-	
+
 	_stripManager.addSpeaker(&_gameTextSpeaker);
 	_stripManager.addSpeaker(&_lyleHatSpeaker);
 	_stripManager.addSpeaker(&_jakeJacketSpeaker);
@@ -216,7 +216,7 @@ void Scene550::postInit(SceneObjectList *OwnerList) {
 		if (BF_GLOBALS.getFlag(onDuty)) {
 			_vechile.setVisage(301);
 			_vechile.setStrip(1);
-			
+
 			BF_GLOBALS._player.setVisage(304);
 		} else {
 			_vechile.setVisage(580);
@@ -224,7 +224,7 @@ void Scene550::postInit(SceneObjectList *OwnerList) {
 			_vechile.setFrame(2);
 
 			BF_GLOBALS._player.setVisage(303);
-		}		
+		}
 	}
 
 	BF_GLOBALS._sceneItems.push_back(&_vechile);
@@ -299,7 +299,7 @@ void Scene551::Action2::signal() {
 		BF_GLOBALS._walkRegions.enableRegion(18);
 		BF_GLOBALS._walkRegions.enableRegion(4);
 		scene->_field1CD2 = 1;
-		
+
 		scene->_harrison.setObjectWrapper(new SceneObjectWrapper());
 		scene->_harrison.animate(ANIM_MODE_1, NULL);
 
@@ -506,7 +506,7 @@ void Scene551::TrunkInset::remove() {
 	BF_GLOBALS._player.disableControl();
 
 	scene->_sceneMode = 0;
-	scene->setAction(&scene->_sequenceManager, scene, 5516, &scene->_harrison, 
+	scene->setAction(&scene->_sequenceManager, scene, 5516, &scene->_harrison,
 		&scene->_patrolCarTrunk, NULL);
 
 	FocusObject::remove();
@@ -711,7 +711,7 @@ void Scene551::postInit(SceneObjectList *OwnerList) {
 		_object12.show();
 		_object12.setDetails(550, 25, -1, 26, 1, (SceneItem *)NULL);
 		BF_GLOBALS._sceneItems.push_front(&_object12);
-		
+
 		_harrison.postInit();
 		_harrison.setVisage(304);
 		_harrison.setPosition(Common::Point(67, 102));
@@ -1076,7 +1076,7 @@ void Scene560::SafeInset::postInit(SceneObjectList *OwnerList) {
 		_item4.setDetails(Rect(143, 86, 159, 102), 560, 49, 50, -1, 1, NULL);
 		_item5.setDetails(Rect(159, 86, 175, 102), 560, 49, 50, -1, 1, NULL);
 		_item6.setDetails(Rect(175, 86, 191, 102), 560, 49, 50, -1, 1, NULL);
-		
+
 		BF_GLOBALS._sceneItems.remove(&_item1);
 		BF_GLOBALS._sceneItems.remove(&_item2);
 		BF_GLOBALS._sceneItems.remove(&_item3);
@@ -1114,9 +1114,9 @@ void Scene560::SafeInset::postInit(SceneObjectList *OwnerList) {
 		_digit0.setStrip(3);
 		_digit0.setPosition(Common::Point(183, 94));
 		_digit0.fixPriority(252);
-		
+
 		int amount = (BF_GLOBALS._safeCombination != 0) ? BF_GLOBALS._safeCombination : 1000;
-		
+
 		// Get digit 0 portion
 		int remainder = amount % 10;
 		amount /= 10;
@@ -1135,7 +1135,7 @@ void Scene560::SafeInset::postInit(SceneObjectList *OwnerList) {
 
 void Scene560::SafeInset::remove() {
 	Scene560 *scene = (Scene560 *)BF_GLOBALS._sceneManager._scene;
-	
+
 	_item1.remove();
 	_item2.remove();
 	_item3.remove();
@@ -1145,7 +1145,7 @@ void Scene560::SafeInset::remove() {
 	_digit2.remove();
 	_digit1.remove();
 	_digit0.remove();
-	
+
 	scene->_nickel.remove();
 
 	if (BF_GLOBALS._events.getCursor() == CURSOR_USE) {
@@ -1293,7 +1293,7 @@ bool Scene560::SafeInset::Item::startAction(CursorType action, Event &event) {
 		default:
 			break;
 		}
-		
+
 		scene->_safeInset.signal();
 		scene->_sound1.play(75);
 		return true;
@@ -1345,7 +1345,7 @@ bool Scene560::BoxInset::Item1::startAction(CursorType action, Event &event) {
 		scene->_safeInset.setPosition(Common::Point(160, 141));
 		scene->_safeInset.fixPriority(251);
 		scene->_safeInset.setDetails(560, 45, 46, -1);
-		
+
 		scene->_sceneMode = 3;
 		scene->_boxInset.remove();
 
@@ -1414,7 +1414,7 @@ void Scene560::postInit(SceneObjectList *OwnerList) {
 	_deskChair.setPosition(Common::Point(81, 149));
 	_deskChair.fixPriority(151);
 	_deskChair.changeZoom(81);
-	
+
 	if (BF_GLOBALS._sceneManager._previousScene == 570) {
 		// Returning from using computer
 		BF_GLOBALS._events.setCursor(CURSOR_USE);
@@ -1448,7 +1448,7 @@ void Scene560::postInit(SceneObjectList *OwnerList) {
 		BF_GLOBALS._player._moveDiff.x = 11;
 		BF_GLOBALS._player.changeZoom(-1);
 		BF_GLOBALS._player.disableControl();
-		
+
 		_sceneMode = 10;
 		ADD_MOVER(BF_GLOBALS._player, 85, 115);
 	}
@@ -1516,7 +1516,7 @@ void Scene560::signal() {
 				T2_GLOBALS._uiElements.addScore(10);
 				BF_GLOBALS.setFlag(fGotPointsForPunch);
 			}
-			
+
 			_boxInset.postInit();
 			_boxInset.setVisage(560);
 			_boxInset.setStrip(2);
@@ -1605,7 +1605,7 @@ void Scene570::PasswordEntry::postInit(SceneObjectList *OwnerList) {
 void Scene570::PasswordEntry::process(Event &event) {
 	Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
 	bool entryChanged = false;
-	
+
 	switch (event.eventType) {
 	case EVENT_KEYPRESS: {
 		int key = toupper(event.kbd.ascii);
@@ -1648,7 +1648,7 @@ void Scene570::PasswordEntry::process(Event &event) {
 		_entryText.setPosition(Common::Point(213, 40));
 		_entryText.fixPriority(255);
 		_entryText.setup(_entryBuffer);
-		
+
 		// Pad entered text with spaces to make up the allowed width and then display
 		Common::String msg = _entryBuffer;
 		while (msg.size() < 10)
@@ -1658,7 +1658,7 @@ void Scene570::PasswordEntry::process(Event &event) {
 }
 
 void Scene570::PasswordEntry::checkPassword() {
-	// Check if the password is correctly entered as 'JACKIE' or, as a nod to the 
+	// Check if the password is correctly entered as 'JACKIE' or, as a nod to the
 	// reimplementation in ScummVM, as the project name.
 	Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
 
@@ -1794,7 +1794,7 @@ void Scene570::Icon::remove() {
 }
 
 bool Scene570::Icon::startAction(CursorType action, Event &event) {
-	Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;		
+	Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
 
 	switch (action) {
 	case CURSOR_LOOK:
@@ -1907,7 +1907,7 @@ bool Scene570::Icon::startAction(CursorType action, Event &event) {
 }
 
 void Scene570::Icon::setDetails(int iconId, int folderId, int parentFolderId, int unused, const Common::String &msg) {
-	Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;	
+	Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
 	NamedObject::postInit();
 
 	_iconId = iconId;
@@ -1929,7 +1929,7 @@ void Scene570::Icon::setDetails(int iconId, int folderId, int parentFolderId, in
 /*--------------------------------------------------------------------------*/
 
 bool Scene570::PowerSwitch::startAction(CursorType action, Event &event) {
-	Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;		
+	Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
 
 	switch (action) {
 	case CURSOR_USE:
@@ -1972,7 +1972,7 @@ bool Scene570::PrinterIcon::startAction(CursorType action, Event &event) {
 }
 
 void Scene570::Object3::remove() {
-	Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;		
+	Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
 	scene->_object4._flag = 0;
 
 	scene->_printerIcon.remove();
@@ -1998,7 +1998,7 @@ void Scene570::Object3::remove() {
 /*--------------------------------------------------------------------------*/
 
 bool Scene570::FloppyDrive::startAction(CursorType action, Event &event) {
-	Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;		
+	Scene570 *scene = (Scene570 *)BF_GLOBALS._sceneManager._scene;
 
 	switch (action) {
 	case CURSOR_USE:
@@ -2326,7 +2326,7 @@ bool Scene590::Skip::startAction(CursorType action, Event &event) {
 		} else {
 			scene->_stripNumber = !scene->_field17DC ? 5901 : 5902;
 		}
-		
+
 		scene->setAction(&scene->_action1);
 		scene->_field17DC = 1;
 		return true;
@@ -2404,7 +2404,7 @@ void Scene590::Action2::signal() {
 	case 4:
 		scene->_skip.setStrip(1);
 		scene->_skip.animate(ANIM_MODE_1, NULL);
-		
+
 		BF_GLOBALS._player.setVisage(368);
 		BF_GLOBALS._player.setStrip(7);
 		BF_GLOBALS._player.setPosition(Common::Point(238, 131));
@@ -2456,7 +2456,7 @@ void Scene590::postInit(SceneObjectList *OwnerList) {
 	_stripManager.addSpeaker(&_skipSpeaker);
 	_stripManager.addSpeaker(&_lauraSpeaker);
 	_stripManager.addSpeaker(&_jakeJacketSpeaker);
-	
+
 	if (BF_GLOBALS.getFlag(onDuty)) {
 		BF_GLOBALS._player.setVisage(361);
 		BF_GLOBALS._player._moveDiff = Common::Point(6, 2);
@@ -2488,7 +2488,7 @@ void Scene590::postInit(SceneObjectList *OwnerList) {
 	_item10.setDetails(13, 590, 9, -1, 21, 1);
 	_item11.setDetails(15, 590, 10, -1, 22, 1);
 	_item12.setDetails(17, 590, 11, -1, 23, 1);
-	
+
 	BF_GLOBALS._player.disableControl();
 	_sceneMode = 0;
 	setAction(&_sequenceManager, this, 5900, &BF_GLOBALS._player, NULL);
diff --git a/engines/tsage/blue_force/blueforce_scenes5.h b/engines/tsage/blue_force/blueforce_scenes5.h
index 76bf4cdbc3..73d323fc54 100644
--- a/engines/tsage/blue_force/blueforce_scenes5.h
+++ b/engines/tsage/blue_force/blueforce_scenes5.h
@@ -228,7 +228,7 @@ public:
 	NamedHotspot _chair, _lamp, _item4, _trophy, _watercolours, _fileCabinets;
 	NamedHotspot _certificate, _bookcase, _desk, _carpet, _item12, _office;
 	ASound _sound1;
-	bool _field380; 
+	bool _field380;
 	bool _field11EA;
 	Common::Point _destPosition;
 
diff --git a/engines/tsage/blue_force/blueforce_scenes6.cpp b/engines/tsage/blue_force/blueforce_scenes6.cpp
index e5e7c71bef..9467df7917 100644
--- a/engines/tsage/blue_force/blueforce_scenes6.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes6.cpp
@@ -49,7 +49,7 @@ void Scene600::Action1::signal() {
 		break;
 	case 2:
 		scene->_sound1.play(59);
-		setAction(&scene->_sequenceManager, this, 600, &scene->_object2, &scene->_ryan, 
+		setAction(&scene->_sequenceManager, this, 600, &scene->_object2, &scene->_ryan,
 			&BF_GLOBALS._player, &scene->_skidMarks, NULL);
 		break;
 	case 3:
@@ -149,7 +149,7 @@ void Scene600::remove() {
 void Scene620::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 	loadScene(999);
-	
+
 	BF_GLOBALS._player.postInit();
 	BF_GLOBALS._player.disableControl();
 	BF_GLOBALS._player.setVisage(621);
@@ -176,14 +176,14 @@ void Scene620::signal() {
 	case 13:
 	case 16:
 	case 19:
-		addFader((const byte *)&black, 2, this);	
+		addFader((const byte *)&black, 2, this);
 		break;
 	case 2:
 		BF_GLOBALS._player.remove();
 		_object1.postInit();
 		_object1.setVisage(622);
 		_object1.setPosition(Common::Point(101, 41));
-		add2Faders((const byte *)&black, 2, 622, this);	
+		add2Faders((const byte *)&black, 2, 622, this);
 		break;
 	case 5:
 		_object1.remove();
@@ -441,7 +441,7 @@ void Scene690::postInit(SceneObjectList *OwnerList) {
 		BF_GLOBALS._dayNumber = 1;
 
 	_stripManager.addSpeaker(&_jakeSpeaker);
-	
+
 	_object1.postInit();
 	_object1.setVisage(690);
 	_object1.setStrip2(2);
diff --git a/engines/tsage/blue_force/blueforce_scenes8.cpp b/engines/tsage/blue_force/blueforce_scenes8.cpp
index ceee748374..5a60cd7c5e 100644
--- a/engines/tsage/blue_force/blueforce_scenes8.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes8.cpp
@@ -434,7 +434,7 @@ void Scene810::Action2::signal() {
 		scene->_lyle.setVisage(813);
 		scene->_lyle.setStrip(2);
 		scene->_lyle.setFrame(1);
-		
+
 		ADD_PLAYER_MOVER(84, 113);
 		break;
 	case 5:
@@ -611,7 +611,7 @@ bool Scene810::Lyle::startAction(CursorType action, Event &event) {
 	default:
 		return NamedObjectExt::startAction(action, event);
 	}
-}		
+}
 
 bool Scene810::Chair::startAction(CursorType action, Event &event) {
 	switch (action) {
@@ -709,7 +709,7 @@ bool Scene810::Object5::startAction(CursorType action, Event &event) {
 	case CURSOR_USE: {
 		scene->_sceneMode = 8195;
 		BF_GLOBALS._player.disableControl();
-		
+
 		PlayerMover *mover = new PlayerMover();
 		Common::Point destPos(67, 111);
 		BF_GLOBALS._player.addMover(mover, &destPos, scene);
@@ -804,7 +804,7 @@ bool Scene810::FaxMachine::startAction(CursorType action, Event &event) {
 			scene->_sceneMode = 811;
 
 			if (BF_GLOBALS._sceneObjects->contains(&scene->_lyle)) {
-				scene->setAction(&scene->_sequenceManager1, scene, BF_GLOBALS.getFlag(onDuty) ? 8108 : 8105, 
+				scene->setAction(&scene->_sequenceManager1, scene, BF_GLOBALS.getFlag(onDuty) ? 8108 : 8105,
 					&BF_GLOBALS._player, &scene->_object6, NULL);
 			} else {
 				scene->setAction(&scene->_sequenceManager1, scene, 8111, &BF_GLOBALS._player,
@@ -1058,12 +1058,12 @@ void Scene810::postInit(SceneObjectList *OwnerList) {
 	case 820:
 		BF_GLOBALS._player.setStrip(7);
 		BF_GLOBALS._player.setPosition(Common::Point(278, 116));
-		
+
 		_lyle.setVisage(845);
 		_lyle.setPosition(Common::Point(340, 175));
 		_lyle.setObjectWrapper(new SceneObjectWrapper());
 		_lyle.animate(ANIM_MODE_1, NULL);
-		
+
 		_chair.show();
 
 		BF_GLOBALS._player.disableControl();
@@ -1121,7 +1121,7 @@ void Scene810::postInit(SceneObjectList *OwnerList) {
 	_item12._sceneRegionId = 8;
 	BF_GLOBALS._sceneItems.push_back(&_item12);
 
-	BF_GLOBALS._sceneItems.addItems(&_microficheReader, &_map, &_window, &_bookcase, &_garbageCan, 
+	BF_GLOBALS._sceneItems.addItems(&_microficheReader, &_map, &_window, &_bookcase, &_garbageCan,
 		&_fileCabinets, &_coffeeMaker, &_shelves, &_background, NULL);
 	_background.setBounds(Rect(0, 0, SCREEN_WIDTH, UI_INTERFACE_Y));
 }
@@ -1276,7 +1276,7 @@ void Scene810::dispatch() {
 		_lyle.updateAngle(BF_GLOBALS._player._position);
 	}
 
-	if (BF_GLOBALS._sceneObjects->contains(&_faxMachineInset) && (BF_GLOBALS._player._position.x != 67) && 
+	if (BF_GLOBALS._sceneObjects->contains(&_faxMachineInset) && (BF_GLOBALS._player._position.x != 67) &&
 			(BF_GLOBALS._player._position.y != 111)) {
 		_faxMachineInset.remove();
 	}
@@ -1341,7 +1341,7 @@ bool Scene820::PowerButton::startAction(CursorType action, Event &event) {
 			BF_GLOBALS._scenePalette.loadPalette(821);
 			BF_GLOBALS._scenePalette.refresh();
 
-			SceneItem::display(820, scene->_pageNumber, SET_WIDTH, 240, SET_X, 41, SET_Y, 0, 
+			SceneItem::display(820, scene->_pageNumber, SET_WIDTH, 240, SET_X, 41, SET_Y, 0,
 				SET_FONT, 50, SET_FG_COLOR, 18, SET_EXT_BGCOLOR, 12, SET_KEEP_ONSCREEN, true, LIST_END);
 		} else {
 			BF_GLOBALS._scenePalette.loadPalette(820);
@@ -1388,7 +1388,7 @@ bool Scene820::BackButton::startAction(CursorType action, Event &event) {
 			scene->_object5.hide();
 		}
 
-		SceneItem::display(820, scene->_pageNumber, SET_WIDTH, 240, SET_X, 41, SET_Y, 0, 
+		SceneItem::display(820, scene->_pageNumber, SET_WIDTH, 240, SET_X, 41, SET_Y, 0,
 			SET_FONT, 50, SET_FG_COLOR, 18, SET_EXT_BGCOLOR, 12, SET_KEEP_ONSCREEN, true, LIST_END);
 		return true;
 	default:
@@ -1419,7 +1419,7 @@ bool Scene820::ForwardButton::startAction(CursorType action, Event &event) {
 		if (scene->_pageNumber < 4)
 			++scene->_pageNumber;
 
-		SceneItem::display(820, scene->_pageNumber, SET_WIDTH, 240, SET_X, 41, SET_Y, 0, 
+		SceneItem::display(820, scene->_pageNumber, SET_WIDTH, 240, SET_X, 41, SET_Y, 0,
 			SET_FONT, 50, SET_FG_COLOR, 18, SET_EXT_BGCOLOR, 12, SET_KEEP_ONSCREEN, true, LIST_END);
 
 		if (scene->_pageNumber == 4) {
@@ -1447,7 +1447,7 @@ void Scene820::synchronize(Serializer &s) {
 void Scene820::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 	loadScene(820);
-	
+
 	_stripManager.addSpeaker(&_gameTextSpeaker);
 
 	_powerButton.postInit();
@@ -3115,7 +3115,7 @@ void Scene870::postInit(SceneObjectList *OwnerList) {
 			_lyle.setPosition(Common::Point(156, 148));
 			_lyle.fixPriority(149);
 		}
-	
+
 		if ((BF_INVENTORY.getObjectScene(INV_HANDCUFFS) != 1) &&
 				(BF_INVENTORY.getObjectScene(INV_GRENADES) == 355)) {
 			_object4.postInit();
@@ -3135,7 +3135,7 @@ void Scene870::postInit(SceneObjectList *OwnerList) {
 		}
 		break;
 	}
-	
+
 	_boat.setDetails(7, 870, 3, 4, 5, 1);
 	_crate.setDetails(14, 870, 12, 13, 14, 1);
 	_water.setDetails(5, 870, 24, 25, 26, 1);
@@ -3393,7 +3393,7 @@ void Scene880::postInit(SceneObjectList *OwnerList) {
 			_object4.setFrame2(_object4.getFrameCount());
 			_object4.fixPriority(160);
 			_object4.setPosition(Common::Point(255, 148));
-			
+
 			_seqNumber = 8816;
 		} else if (BF_GLOBALS.getFlag(fBlowUpGoon)) {
 			_object4.setStrip(7);
@@ -3405,7 +3405,7 @@ void Scene880::postInit(SceneObjectList *OwnerList) {
 		} else {
 			_object4.setStrip(2);
 			_object4.setPosition(Common::Point(258, 147));
-		
+
 			_object3.postInit();
 			_object3.setVisage(871);
 			_object3.setStrip(4);
@@ -3600,7 +3600,7 @@ void Scene880::handleAction(Action *action) {
 		action->_owner = NULL;
 	}
 }
-	
+
 void Scene880::dispatch() {
 	SceneExt::dispatch();
 
diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index f5705eb471..a303576928 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -386,7 +386,7 @@ void Scene900::Action3::signal() {
 		break;
 	default:
 		break;
-	} 
+	}
 }
 
 void Scene900::Action4::signal() {
@@ -540,7 +540,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 				_lyle.setDetails(900, 19, 20, 21, ANIM_MODE_1, (SceneItem *)NULL);
 				_lyle.animate(ANIM_MODE_1, NULL);
 				_lyle.setObjectWrapper(new SceneObjectWrapper());
-			} 
+			}
 
 			_sceneMode = 9000;
 			setAction(&_sequenceManager1, this, 9000, &BF_GLOBALS._player, NULL);
@@ -2125,7 +2125,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) {
 		_lyle.setFrame(3);
 		_lyle._field90 = 1;
 		_lyle.setDetails(910, 69, 70 ,71 , 5, &_item4);
-	
+
 		BF_GLOBALS._walkRegions.disableRegion(15);
 		BF_GLOBALS._walkRegions.disableRegion(16);
 		BF_GLOBALS._walkRegions.disableRegion(14);
diff --git a/engines/tsage/debugger.cpp b/engines/tsage/debugger.cpp
index f7ba5c20f2..82645f2d62 100644
--- a/engines/tsage/debugger.cpp
+++ b/engines/tsage/debugger.cpp
@@ -305,7 +305,7 @@ bool Debugger::Cmd_Hotspots(int argc, const char **argv) {
 			if (ri != g_globals->_sceneRegions.end()) {
 				// Fill out the areas defined by the region
 				Region &r = *ri;
-			
+
 				for (int y = r._bounds.top; y < r._bounds.bottom; ++y) {
 					LineSliceSet set = r.getLineSlices(y);
 
@@ -615,7 +615,7 @@ bool BlueForceDebugger::Cmd_MoveObject(int argc, const char **argv) {
 
 	if ((objNum > 0) && (objNum < 65))
 		BF_INVENTORY.setObjectScene(objNum, sceneNum);
-	else 
+	else
 		DebugPrintf("Invalid object Id %s\n", argv[1]);
 
 	return true;
@@ -702,7 +702,7 @@ bool Ringworld2Debugger::Cmd_MoveObject(int argc, const char **argv) {
 
 	if ((objNum > 0) && (objNum < 53))
 		R2_INVENTORY.setObjectScene(objNum, sceneNum);
-	else 
+	else
 		DebugPrintf("Invalid object Id %s\n", argv[1]);
 
 	return true;
diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index cf2d1a34ed..475db47315 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -86,25 +86,25 @@ enum CursorType {
 	INV_CARAVAN_KEY = 67, BF_LAST_INVENT = 68,
 
 	// Ringworld 2 objects
-	R2_OPTO_DISK = 1, R2_READER = 2, R2_NEGATOR_GUN = 3, R2_STEPPING_DISKS = 4, 
-	R2_ATTRACTOR_UNIT = 5, R2_SENSOR_PROBE = 6, R2_SONIC_STUNNER = 7, 
-	R2_CABLE_HARNESS = 8, R2_COM_SCANNER = 9, R2_SPENT_POWER_CAPSULE = 10, 
-	R2_CHARGED_POWER_CAPSULE = 11, R2_AEROSOL = 12, R2_REMOTE_CONTROL = 13, 
-	R2_OPTICAL_FIBRE = 14, R2_CLAMP = 15, R2_ATTRACTOR_CABLE_HARNESS = 16, 
-	R2_FUEL_CELL = 17, R2_GYROSCOPE = 18, R2_AIRBAG = 19, R2_REBREATHER_TANK = 20, 
+	R2_OPTO_DISK = 1, R2_READER = 2, R2_NEGATOR_GUN = 3, R2_STEPPING_DISKS = 4,
+	R2_ATTRACTOR_UNIT = 5, R2_SENSOR_PROBE = 6, R2_SONIC_STUNNER = 7,
+	R2_CABLE_HARNESS = 8, R2_COM_SCANNER = 9, R2_SPENT_POWER_CAPSULE = 10,
+	R2_CHARGED_POWER_CAPSULE = 11, R2_AEROSOL = 12, R2_REMOTE_CONTROL = 13,
+	R2_OPTICAL_FIBRE = 14, R2_CLAMP = 15, R2_ATTRACTOR_CABLE_HARNESS = 16,
+	R2_FUEL_CELL = 17, R2_GYROSCOPE = 18, R2_AIRBAG = 19, R2_REBREATHER_TANK = 20,
 	R2_RESERVE_REBREATHER_TANK = 21, R2_GUIDANCE_MODULE = 22, R2_THRUSTER_VALVE = 23,
-	R2_BALLOON_BACKPACK = 24, R2_RADAR_MECHANISM = 25, R2_JOYSTICK = 26, 
-	R2_IGNITOR = 27, R2_DIAGNOSTICS_DISPLAY = 28, R2_GLASS_DOME = 29, R2_WICK_LAMP = 30, 
-	R2_SCRITH_KEY = 31, R2_TANNER_MASK = 32, R2_PURE_GRAIN_ALCOHOL = 33, R2_SAPPHIRE_BLUE = 34, 
-	R2_ANCIENT_SCROLLS = 35, R2_FLUTE = 36, R2_GUNPOWDER = 37, R2_NONAME = 38, 
+	R2_BALLOON_BACKPACK = 24, R2_RADAR_MECHANISM = 25, R2_JOYSTICK = 26,
+	R2_IGNITOR = 27, R2_DIAGNOSTICS_DISPLAY = 28, R2_GLASS_DOME = 29, R2_WICK_LAMP = 30,
+	R2_SCRITH_KEY = 31, R2_TANNER_MASK = 32, R2_PURE_GRAIN_ALCOHOL = 33, R2_SAPPHIRE_BLUE = 34,
+	R2_ANCIENT_SCROLLS = 35, R2_FLUTE = 36, R2_GUNPOWDER = 37, R2_NONAME = 38,
 	R2_COM_SCANNER_2 = 39, R2_SUPERCONDUCTOR_WIRE = 40, R2_PILLOW = 41, R2_FOOD_TRAY = 42,
-	R2_LASER_HACKSAW = 43, R2_PHOTON_STUNNER = 44, R2_BATTERY = 45, R2_SOAKED_FACEMASK = 46, 
-	R2_LIGHT_BULB = 47, R2_ALCOHOL_LAMP = 48, R2_ALCOHOL_LAMP_2 = 49, R2_ALCOHOL_LAMP_3 = 50, 
+	R2_LASER_HACKSAW = 43, R2_PHOTON_STUNNER = 44, R2_BATTERY = 45, R2_SOAKED_FACEMASK = 46,
+	R2_LIGHT_BULB = 47, R2_ALCOHOL_LAMP = 48, R2_ALCOHOL_LAMP_2 = 49, R2_ALCOHOL_LAMP_3 = 50,
 	R2_BROKEN_DISPLAY = 51, R2_TOOLBOX = 52, R2_LAST_INVENT = 53,
 
 	// Ringworld 2 cursors
-	R2CURSORS_START = 0x8000, EXITCURSOR_N  = 0x8007,  EXITCURSOR_S  = 0x8008, EXITCURSOR_W = 0x8009, 
-	EXITCURSOR_E = 0x800A, EXITCURSOR_LEFT_HAND = 0x800B, CURSOR_INVALID = 0x800C, 
+	R2CURSORS_START = 0x8000, EXITCURSOR_N  = 0x8007,  EXITCURSOR_S  = 0x8008, EXITCURSOR_W = 0x8009,
+	EXITCURSOR_E = 0x800A, EXITCURSOR_LEFT_HAND = 0x800B, CURSOR_INVALID = 0x800C,
 	EXITCURSOR_NE = 0x800D, EXITCURSOR_SE = 0x800E, EXITCURSOR_SW = 0x800F, EXITCURSOR_NW = 0x8010,
 	SHADECURSOR_UP = 0x8011, SHADECURSOR_DOWN = 0x8012, SHADECURSOR_HAND = 0x8013,
 	R2_CURSOR_20 = 0x8014, R2_CURSOR_21 = 0x8015, R2_CURSOR_22 = 0x8016, R2_CURSOR_23 = 0x8017,
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index acb615abae..5ddc7b6a1a 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -266,7 +266,7 @@ void GfxSurface::updateScreen() {
 			continue;
 
 		const byte *srcP = (const byte *)_customSurface->getBasePtr(r.left, r.top);
-		g_system->copyRectToScreen(srcP, _customSurface->pitch, r.left, r.top, 
+		g_system->copyRectToScreen(srcP, _customSurface->pitch, r.left, r.top,
 			r.width(), r.height());
 	}
 
@@ -287,7 +287,7 @@ void GfxSurface::addDirtyRect(const Rect &r) {
 		r2.translate(_bounds.left, _bounds.top);
 
 		// Add to the dirty rect list
-		_dirtyRects.push_back(Rect(r2.left, r2.top, 
+		_dirtyRects.push_back(Rect(r2.left, r2.top,
 		MIN(r2.right + 1, SCREEN_WIDTH), MIN(r2.bottom + 1, SCREEN_HEIGHT)));
 	}
 }
@@ -1194,7 +1194,7 @@ void GfxDialog::setPalette() {
 		g_globals->_scenePalette.setPalette(g_globals->_fontColors.background, 1);
 		g_globals->_scenePalette.setPalette(g_globals->_fontColors.foreground, 1);
 		g_globals->_scenePalette.setEntry(255, 0xff, 0xff, 0xff);
-		g_globals->_scenePalette.setPalette(255, 1);	
+		g_globals->_scenePalette.setPalette(255, 1);
 	} else {
 		g_globals->_scenePalette.loadPalette(0);
 		g_globals->_scenePalette.setPalette(0, 1);
diff --git a/engines/tsage/resources.cpp b/engines/tsage/resources.cpp
index 0afae0042f..5987d78067 100644
--- a/engines/tsage/resources.cpp
+++ b/engines/tsage/resources.cpp
@@ -326,7 +326,7 @@ uint32 TLib::getResourceStart(ResourceType resType, uint16 resNum, uint16 rlbNum
 
 	// Load in the section index
 	loadSection((*i).fileOffset);
-	
+
 	// Scan for an entry for the given Id
 	ResourceEntry *re = NULL;
 	ResourceList::iterator iter;
@@ -341,7 +341,7 @@ uint32 TLib::getResourceStart(ResourceType resType, uint16 resNum, uint16 rlbNum
 	if (!re || re->isCompressed)
 		error("Invalid resource Id #%d", rlbNum);
 
-	// Return the resource entry as well as the file offset 
+	// Return the resource entry as well as the file offset
 	entry = *re;
 	return _sections.fileOffset + entry.fileOffset;
 }
@@ -441,7 +441,7 @@ bool TLib::getMessage(int resNum, int lineNum, Common::String &result, bool supp
 
 	while (lineNum-- > 0) {
 		srcP += strlen(srcP) + 1;
-		
+
 		if (srcP >= endP) {
 			if (suppressErrors)
 				return false;
@@ -537,7 +537,7 @@ Common::String ResourceManager::getMessage(int resNum, int lineNum, bool suppres
  * 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 ResourceManager::scanIndex(Common::File &f, ResourceType resType, int rlbNum, int resNum, 
+bool ResourceManager::scanIndex(Common::File &f, ResourceType resType, int rlbNum, int resNum,
 									  ResourceEntry &resEntry) {
 	// Load the root section index
 	ResourceList resList;
diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
index 5178fe6418..30ae6be7b1 100644
--- a/engines/tsage/ringworld2/ringworld2_dialogs.cpp
+++ b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
@@ -389,7 +389,7 @@ HelpDialog::HelpDialog() {
 	_msgTitle._bounds.moveTo(5, 0);
 	_msgVersion.set(GAME_VERSION, 172, ALIGN_CENTER);
 	_msgVersion._bounds.moveTo(5, _msgTitle._bounds.bottom + 3);
-	addElements(&_msgTitle, &_msgVersion, NULL);	
+	addElements(&_msgTitle, &_msgVersion, NULL);
 
 	// Set buttons
 	_btnList[0].setText(F2);
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index d5cbde81be..b420a375a3 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -40,16 +40,16 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 
 	switch (sceneNumber) {
 	/* Scene group #0 */
-	case 50: 
+	case 50:
 		// Waking up cutscene
 		return new Scene50();
-	case 100: 
+	case 100:
 		// Quinn's room
 		return new Scene100();
-	case 125: 
+	case 125:
 		// Computer console
 		return new Scene125();
-	case 150: 
+	case 150:
 		// Empty Bedroom #1
 		return new Scene150();
 	case 160:
@@ -166,7 +166,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {
 		// Ice Maze: Large empty room
 		return new Scene2400();
 	case 2425:
-		// Ice Maze: 
+		// Ice Maze:
 		return new Scene2425();
 	case 2430:
 		// Ice Maze: Bedroom
@@ -326,7 +326,7 @@ void SceneExt::postInit(SceneObjectList *OwnerList) {
 
 	int prevScene = R2_GLOBALS._sceneManager._previousScene;
 	int sceneNumber = R2_GLOBALS._sceneManager._sceneNumber;
-	if (((prevScene == -1) && (sceneNumber != 180) && (sceneNumber != 205) && (sceneNumber != 50)) 
+	if (((prevScene == -1) && (sceneNumber != 180) && (sceneNumber != 205) && (sceneNumber != 50))
 			|| (sceneNumber == 50)
 			|| ((prevScene == 205) && (sceneNumber == 100))
 			|| ((prevScene == 180) && (sceneNumber == 100))) {
@@ -549,7 +549,7 @@ void SceneExt::scalePalette(int RFactor, int GFactor, int BFactor) {
 			tmp += abs(tmpPal[(3 * j) + 2] - newB);
 			if (tmp >= varC)
 				continue;
-			
+
 			varC = tmp;
 			varD = j;
 		}
@@ -628,11 +628,11 @@ void SceneHandlerExt::setupPaletteMaps() {
 					diffSum += ABS(palP[pIndex2 * 3 + 1] - g);
 					if (diffSum >= threshold)
 						continue;
-					
+
 					diffSum += ABS(palP[pIndex2 * 3 + 2] - b);
 					if (diffSum >= threshold)
 						continue;
-					
+
 					threshold = diffSum;
 					foundIndex = pIndex2;
 				}
@@ -1257,12 +1257,12 @@ void SceneAreaObject::setDetails(int visage, int strip, int frameNumber, const C
 	_cursorNum = CURSOR_INVALID;
 	Scene500 *scene = (Scene500 *)R2_GLOBALS._sceneManager._scene;
 	scene->_sceneAreas.push_front(this);
-	
+
 	_insetCount = ++R2_GLOBALS._insetUp;
 }
 
 void SceneAreaObject::setDetails(int resNum, int lookLineNum, int talkLineNum, int useLineNum) {
-	((SceneHotspot *)(this))->setDetails(resNum, lookLineNum, talkLineNum, useLineNum, 
+	((SceneHotspot *)(this))->setDetails(resNum, lookLineNum, talkLineNum, useLineNum,
 		2, (SceneItem *)NULL);
 }
 
@@ -1306,7 +1306,7 @@ void UnkObject1200::sub51AE9(int arg1) {
 int UnkObject1200::sub51AF8(Common::Point pt) {
 	if (!_rect1.contains(pt))
 		return -1;
-	
+
 	int tmp1 = (pt.x - _rect1.left + _field2E) / _field2A;
 	int tmp2 = (pt.y - _rect1.top + _field30) / _field2C;
 
@@ -1358,7 +1358,7 @@ void UnkObject1200::sub9EDE8(Rect rect) {
 int UnkObject1200::sub9EE22(int &arg1, int &arg2) {
 	arg1 /= _field2A;
 	arg2 /= _field2C;
-	
+
 	if ((arg1 >= 0) && (arg2 >= 0) && (_field26 > arg1) && (_field28 > arg2)) {
 		return _field16[(((_field26 * arg2) + arg1) * 2)];
 	}
@@ -1368,13 +1368,13 @@ int UnkObject1200::sub9EE22(int &arg1, int &arg2) {
 
 void Scene1200::sub9DAD6(int indx) {
 	_object1.sub9EE22(R2_GLOBALS._v56AA2, R2_GLOBALS._v56AA4);
-	
+
 	switch (indx) {
 	case 0:
-		if ( ((_object1.sub51AF8(Common::Point(200, 50)) > 36) || (_object1.sub51AF8(Common::Point(200, 88)) > 36)) 
-			&& ( ((R2_GLOBALS._v56AA2 == 3) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4)) 
-				|| ((R2_GLOBALS._v56AA2 == 13) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2)) 
-				|| ((R2_GLOBALS._v56AA2 == 29) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1)) 
+		if ( ((_object1.sub51AF8(Common::Point(200, 50)) > 36) || (_object1.sub51AF8(Common::Point(200, 88)) > 36))
+			&& ( ((R2_GLOBALS._v56AA2 == 3) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4))
+				|| ((R2_GLOBALS._v56AA2 == 13) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2))
+				|| ((R2_GLOBALS._v56AA2 == 29) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1))
 				|| ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 41)) )
 				)	{
 			R2_GLOBALS._player.disableControl();
@@ -1415,10 +1415,10 @@ void Scene1200::sub9DAD6(int indx) {
 		}
 		break;
 	case 1:
-		if ( ((_object1.sub51AF8(Common::Point(120, 50)) > 36) || (_object1.sub51AF8(Common::Point(120, 88)) > 36)) 
-			&& ( ((R2_GLOBALS._v56AA2 == 7) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4)) 
-				|| ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2)) 
-				|| ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1)) 
+		if ( ((_object1.sub51AF8(Common::Point(120, 50)) > 36) || (_object1.sub51AF8(Common::Point(120, 88)) > 36))
+			&& ( ((R2_GLOBALS._v56AA2 == 7) && (R2_GLOBALS._v56AA4 == 33) && (_field418 != 4))
+				|| ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 21) && (_field418 != 2))
+				|| ((R2_GLOBALS._v56AA2 == 33) && (R2_GLOBALS._v56AA4 == 17) && (_field418 != 1))
 				|| ((R2_GLOBALS._v56AA2 == 5) && (R2_GLOBALS._v56AA4 == 5)) )
 				)	{
 			R2_GLOBALS._player.disableControl();
@@ -1459,8 +1459,8 @@ void Scene1200::sub9DAD6(int indx) {
 		}
 		break;
 	case 2:
-		if ( ((_object1.sub51AF8(Common::Point(140, 110)) > 36) || (_object1.sub51AF8(Common::Point(178, 110)) > 36)) 
-			&& ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 5) && (_field418 != 3)) 
+		if ( ((_object1.sub51AF8(Common::Point(140, 110)) > 36) || (_object1.sub51AF8(Common::Point(178, 110)) > 36))
+			&& ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 5) && (_field418 != 3))
 				|| ((R2_GLOBALS._v56AA2 == 41) && (R2_GLOBALS._v56AA4 == 21)) )
 				)	{
 			R2_GLOBALS._player.disableControl();
@@ -1501,8 +1501,8 @@ void Scene1200::sub9DAD6(int indx) {
 		}
 		break;
 	case 3:
-		if ( ((_object1.sub51AF8(Common::Point(140, 30)) > 36) || (_object1.sub51AF8(Common::Point(178, 30)) > 36)) 
-			&& ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 9) && (_field418 != 3)) 
+		if ( ((_object1.sub51AF8(Common::Point(140, 30)) > 36) || (_object1.sub51AF8(Common::Point(178, 30)) > 36))
+			&& ( ((R2_GLOBALS._v56AA2 == 17) && (R2_GLOBALS._v56AA4 == 9) && (_field418 != 3))
 				|| ((R2_GLOBALS._v56AA2 == 35) && (R2_GLOBALS._v56AA4 == 17)) )
 				)	{
 			R2_GLOBALS._player.disableControl();
@@ -1574,10 +1574,10 @@ void AnimationPlayerSubData::load(Common::File &f) {
 
 AnimationPlayer::AnimationPlayer(): EventHandler() {
 	_endAction = NULL;
-	
+
 	_fieldA = NULL;
 	_field16 = NULL;
-	
+
 	_screenBounds = R2_GLOBALS._gfxManagerInstance._bounds;
 	_rect1 = R2_GLOBALS._gfxManagerInstance._bounds;
 	_field3C = 0;
@@ -1608,7 +1608,7 @@ void AnimationPlayer::process(Event &event) {
 	if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_ESCAPE) &&
 			(_field3A)) {
 		_field90C = _subData._field6;
-	} 
+	}
 }
 
 void AnimationPlayer::dispatch() {
@@ -1643,7 +1643,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 
 	// Set the end action
 	_endAction = endAction;
-	
+
 	// Load the sub data block
 	_subData.load(_resourceFile);
 
@@ -1659,7 +1659,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 		int v = (_subData._field12 + 2) * _subData._field14 * _subData._fieldC;
 		_field900 = (_subData._field16 / _subData._fieldC) + v + 96;
 	}
-	
+
 	_animData = _fieldA = new byte[_field900];
 
 	if (_subData._fieldC <= 1) {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 9af4c7b534..3c9956282a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -125,17 +125,17 @@ bool Scene100::Table::startAction(CursorType action, Event &event) {
 				scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, (SceneItem *)NULL);
 			}
 
-			scene->setAction(&scene->_sequenceManager2, scene, 108, this, &scene->_object3, 
+			scene->setAction(&scene->_sequenceManager2, scene, 108, this, &scene->_object3,
 				&scene->_stasisNegator, &R2_GLOBALS._player, NULL);
 		} else {
 			scene->_sceneMode = 109;
-			scene->setAction(&scene->_sequenceManager2, scene, 109, this, &scene->_object3, 
+			scene->setAction(&scene->_sequenceManager2, scene, 109, this, &scene->_object3,
 				&scene->_stasisNegator, &R2_GLOBALS._player, NULL);
 		}
 		return true;
 	case CURSOR_TALK:
 		R2_GLOBALS._player.disableControl();
-		
+
 		if (_strip == 2) {
 			SceneItem::display2(100, 18);
 			scene->_sceneMode = 102;
@@ -149,12 +149,12 @@ bool Scene100::Table::startAction(CursorType action, Event &event) {
 				scene->_stasisNegator.setDetails(100, 21, 22, 23, 2, (SceneItem *)NULL);
 			}
 
-			scene->setAction(&scene->_sequenceManager2, scene, 102, this, &scene->_object3, 
+			scene->setAction(&scene->_sequenceManager2, scene, 102, this, &scene->_object3,
 				&scene->_stasisNegator, NULL);
 		} else {
 			SceneItem::display2(100, 19);
 			scene->_sceneMode = 103;
-			scene->setAction(&scene->_sequenceManager2, scene, 103, this, &scene->_object3, 
+			scene->setAction(&scene->_sequenceManager2, scene, 103, this, &scene->_object3,
 				&scene->_stasisNegator, NULL);
 		}
 		return true;
@@ -264,7 +264,7 @@ void Scene100::postInit(SceneObjectList *OwnerList) {
 	_bedLights2.setup(100, 3, 1);
 	_bedLights2.setPosition(Common::Point(89, 147));
 	_bedLights2.fixPriority(250);
-	_bedLights2.animate(ANIM_MODE_7, 0, NULL); 
+	_bedLights2.animate(ANIM_MODE_7, 0, NULL);
 	_bedLights2._numFrames = 3;
 
 	_wardrobe.postInit();
@@ -289,7 +289,7 @@ void Scene100::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.setVisage(10);
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 	R2_GLOBALS._player.disableControl();
-	
+
 	_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 100, 0, 1, -1, 1, NULL);
 
 	switch (R2_GLOBALS._sceneManager._previousScene) {
@@ -330,7 +330,7 @@ void Scene100::signal() {
 	case 109:
 		_table.setStrip(2);
 		_table.setFrame(3);
-		
+
 		_object3.remove();
 		_stasisNegator.remove();
 		R2_GLOBALS._player.enableControl();
@@ -413,7 +413,7 @@ Scene125::Icon::Icon(): SceneActor()  {
 
 void Scene125::Icon::postInit(SceneObjectList *OwnerList) {
 	SceneObject::postInit();
-	
+
 	_object1.postInit();
 	_object1.fixPriority(255);
 	_object1.hide();
@@ -621,7 +621,7 @@ void Scene125::postInit(SceneObjectList *OwnerList) {
 	loadScene(160);
 	_palette.loadPalette(0);
 
-	if (R2_GLOBALS._sceneManager._previousScene != 125) 
+	if (R2_GLOBALS._sceneManager._previousScene != 125)
 		// Save the prior scene to return to when the console is turned off
 		R2_GLOBALS._player._oldCharacterScene[1] = R2_GLOBALS._sceneManager._previousScene;
 
@@ -638,7 +638,7 @@ void Scene125::postInit(SceneObjectList *OwnerList) {
 	_object6.postInit();
 	_object6.setup(162, 1, 1);
 	_object6.setPosition(Common::Point(214, 168));
-	
+
 	_item4.setDetails(Rect(27, 145, 81, 159), 126, 9, -1, -1, 1, NULL);
 	_item3.setDetails(Rect(144, 119, 286, 167), 126, 6, 7, 8, 1, NULL);
 	_item2.setDetails(1, 126, 3, 4, 5);
@@ -669,7 +669,7 @@ void Scene125::signal() {
 		_icon1._object2.postInit();
 		_icon1._object2.setup(160, 7, 1);
 		_icon1._object2.setPosition(Common::Point(106, 41));
-		
+
 		_icon2.setup(160, 1, 1);
 		_icon2.setPosition(Common::Point(80, 32));
 		_icon2._object2.postInit();
@@ -766,7 +766,7 @@ void Scene125::signal() {
 	case 11:
 		R2_GLOBALS._player.enableControl();
 		R2_GLOBALS._player._canWalk = false;
-		
+
 		if ((_consoleMode >= 27) && (_consoleMode <= 30)) {
 			consoleAction(11);
 		}
@@ -915,7 +915,7 @@ void Scene125::consoleAction(int id) {
 		_icon2.hideIcon();
 		_icon3.hideIcon();
 		_icon5.setIcon(24);
-		
+
 		_icon4.setPosition(Common::Point(52, 107));
 		_icon4._sceneRegionId = 9;
 		_icon4.setIcon(25);
@@ -923,7 +923,7 @@ void Scene125::consoleAction(int id) {
 
 		_icon6.setIcon(26);
 		_sceneMode = 10;
-		
+
 		_palette.loadPalette(161);
 		R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 5, this);
 		break;
@@ -958,7 +958,7 @@ void Scene125::consoleAction(int id) {
 			_icon2.hideIcon();
 			_icon3.hideIcon();
 			_icon5.setIcon(24);
-			
+
 			_icon4.setPosition(Common::Point(52, 107));
 			_icon4._sceneRegionId = 9;
 			_icon4.setIcon(25);
@@ -966,7 +966,7 @@ void Scene125::consoleAction(int id) {
 
 			_icon6.setIcon(26);
 			_sceneMode = 10;
-			
+
 			_palette.loadPalette(161);
 			R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 5, this);
 		}
@@ -1089,7 +1089,7 @@ void Scene125::consoleAction(int id) {
 		_icon3.hideIcon();
 		_icon4.hideIcon();
 		_icon5.setIcon(24);
-		
+
 		_icon4.setPosition(Common::Point(52, 107));
 		_icon4._sceneRegionId = 9;
 		_icon4.setIcon(25);
@@ -1097,7 +1097,7 @@ void Scene125::consoleAction(int id) {
 
 		_icon6.setIcon(26);
 		_sceneMode = 10;
-		
+
 		_palette.loadPalette(161);
 		R2_GLOBALS._scenePalette.addFader(_palette._palette, 256, 5, this);
 		break;
@@ -1134,7 +1134,7 @@ void Scene125::consoleAction(int id) {
  */
 void Scene125::setDetails(int resNum, int lineNum) {
 	stop();
-	
+
 	Common::String msg = g_resourceManager->getMessage(resNum, lineNum, true);
 
 	if (!msg.empty()) {
@@ -1243,7 +1243,7 @@ void Scene150::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.setVisage(10);
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 	R2_GLOBALS._player.disableControl();
-	
+
 	_background.setDetails(Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 150, 0, 1, -1, 1, NULL);
 	_sceneMode = 100;
 
@@ -1420,7 +1420,7 @@ void Scene160::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player._uiEnabled = false;
 	R2_GLOBALS._player.enableControl();
 	R2_GLOBALS._player._canWalk = false;
-	
+
 	R2_GLOBALS._uiElements.hide();
 	R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
 
@@ -1664,7 +1664,7 @@ void Scene180::signal() {
 	case 15:
 		setAction(&_sequenceManager, this, 4002, &_object4, &_object5, NULL);
 		break;
-	
+
 	case 17:
 		setAction(&_sequenceManager, this, 4003, &_object4, &_object5, NULL);
 		break;
@@ -1730,7 +1730,7 @@ void Scene180::signal() {
 
 	case 32:
 		_field412 = 1;
-		
+
 		_object2.postInit();
 		_object2.setPosition(Common::Point(161, 97));
 		_object2.hide();
@@ -1790,7 +1790,7 @@ void Scene180::signal() {
 		_object4.remove();
 		_object5.setAction(NULL);
 		_object5.remove();
-		
+
 		R2_GLOBALS._sound2.fadeOut2(NULL);
 		R2_GLOBALS._sound1.fadeOut2(NULL);
 		break;
@@ -2389,7 +2389,7 @@ void Scene205::dispatch() {
 void Scene205::setup() {
 	const Common::Point pointList1[3] = { Common::Point(2, 50), Common::Point(100, 28), Common::Point(53, 15) };
 	const Common::Point pointList2[3] = { Common::Point(289, 192), Common::Point(125, 60), Common::Point(130, 40) };
-	const Common::Point pointList3[4] = { 
+	const Common::Point pointList3[4] = {
 		Common::Point(140, 149), Common::Point(91, 166), Common::Point(299, 46), Common::Point(314, 10)
 	};
 
@@ -2445,13 +2445,13 @@ void Scene205::setup() {
 /**
  * Handles moving a group of stars in the scene background
  */
-void Scene205::processList(Object **ObjList, int count, const Common::Rect &bounds, 
+void Scene205::processList(Object **ObjList, int count, const Common::Rect &bounds,
 						   int xMultiply, int yMultiply, int xCenter, int yCenter) {
 	for (int idx = 0; idx < count; ++idx) {
 		Object *obj = ObjList[idx];
 		Common::Point pt(obj->_position.x - xCenter, obj->_position.y - yCenter);
 
-		if ((obj->_position.x <= 319) && (obj->_position.x >= 0) && 
+		if ((obj->_position.x <= 319) && (obj->_position.x >= 0) &&
 				(obj->_position.y <= 199) && (obj->_position.y >= 0)) {
 			if (!pt.x && !pt.y) {
 				pt.x = pt.y = 1;
@@ -2484,7 +2484,7 @@ void Scene205::handleText() {
 	GfxFont font;
 	font.setFontNumber(4);
 	int width = font.getStringWidth(_message.c_str());
-	
+
 	_textList[_textIndex].setPosition(Common::Point(160 - (width / 2), _yp));
 }
 
@@ -2681,13 +2681,13 @@ void Scene250::signal() {
 		_field412 += 12;
 		R2_GLOBALS._player.setPosition(Common::Point(261, 185));
 		ADD_MOVER(R2_GLOBALS._player, 261, 15);
-		
+
 		if ((_field414 - 12) == _field412)
 			_sceneMode = 4;
 		break;
 	case 4:
 		_sound1.play(21);
-		
+
 		_currentFloor.setPosition(Common::Point(111, _currentFloor._position.y + 12));
 		R2_GLOBALS._player.setPosition(Common::Point(261, 185));
 		ADD_MOVER(R2_GLOBALS._player, 261, 15);
@@ -2837,7 +2837,7 @@ void Scene300::Action2::signal() {
 	case 2:
 		if (!R2_GLOBALS._playStream.isPlaying())
 			_actionIndex = R2_GLOBALS._randomSource.getRandomNumber(1);
-			
+
 		setDelay(60 + R2_GLOBALS._randomSource.getRandomNumber(119));
 		break;
 	default:
@@ -2860,7 +2860,7 @@ void Scene300::Action3::signal() {
 	case 2:
 		if (!R2_GLOBALS._playStream.isPlaying())
 			_actionIndex = R2_GLOBALS._randomSource.getRandomNumber(1);
-			
+
 		setDelay(60 + R2_GLOBALS._randomSource.getRandomNumber(119));
 		break;
 	default:
@@ -2922,7 +2922,7 @@ bool Scene300::MirandaWorkstation::startAction(CursorType action, Event &event)
 		if (R2_GLOBALS._player._characterIndex != 3)
 			SceneItem::display2(300, 49);
 		else
-			R2_GLOBALS._sceneManager.changeScene(325);			
+			R2_GLOBALS._sceneManager.changeScene(325);
 		return true;
 
 	case CURSOR_LOOK:
@@ -2952,7 +2952,7 @@ bool Scene300::SeekerWorkstation::startAction(CursorType action, Event &event) {
 		if (R2_GLOBALS._player._characterIndex != 2)
 			SceneItem::display2(300, 48);
 		else
-			R2_GLOBALS._sceneManager.changeScene(325);			
+			R2_GLOBALS._sceneManager.changeScene(325);
 		return true;
 
 	default:
@@ -3107,7 +3107,7 @@ bool Scene300::Seeker::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 310;
 		scene->setAction(&scene->_sequenceManager1, scene, 310, &R2_GLOBALS._player, NULL);
 		return true;
-	
+
 	default:
 		break;
 	}
@@ -3153,7 +3153,7 @@ bool Scene300::Doorway::startAction(CursorType action, Event &event) {
 	Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
 
 	if (action == CURSOR_USE) {
-		if ((R2_GLOBALS._player._characterIndex == R2_QUINN) && 
+		if ((R2_GLOBALS._player._characterIndex == R2_QUINN) &&
 				(!R2_GLOBALS.getFlag(44) || R2_GLOBALS._player._characterScene[R2_MIRANDA] == 500)) {
 			R2_GLOBALS._player.disableControl();
 			scene->_sceneMode = 301;
@@ -3161,7 +3161,7 @@ bool Scene300::Doorway::startAction(CursorType action, Event &event) {
 		} else {
 			SceneItem::display2(300, 45);
 		}
-		
+
 		return true;
 	} else {
 		return SceneActor::startAction(action, event);
@@ -3373,7 +3373,7 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 				R2_GLOBALS._player.setup(302, 3, 1);
 				R2_GLOBALS._player.setPosition(Common::Point(271, 150));
 				R2_GLOBALS._player.setAction(&_action1);
-				
+
 				if (R2_GLOBALS.getFlag(55)) {
 					if (R2_GLOBALS.getFlag(57)) {
 						R2_GLOBALS.clearFlag(60);
@@ -3689,7 +3689,7 @@ void Scene300::signal309() {
 
 	if (R2_GLOBALS.getFlag(39))
 		R2_GLOBALS._stripManager_lookupList[1] = 2;
-	
+
 	if (R2_GLOBALS.getFlag(5))
 		R2_GLOBALS._stripManager_lookupList[1] = 3;
 
@@ -3728,7 +3728,7 @@ Scene325::Icon::Icon(): SceneActor()  {
 
 void Scene325::Icon::postInit(SceneObjectList *OwnerList) {
 	SceneObject::postInit();
-	
+
 	_object1.postInit();
 	_object1.fixPriority(21);
 	_object1.hide();
@@ -3895,7 +3895,7 @@ Scene325::Scene325(): SceneExt() {
 	_field416 = _field418 = 0;
 	_field41A = _field41C = _field41E = _field420 = 0;
 	_soundCount = _soundIndex = 0;
-	
+
 	for (int idx = 0; idx < 10; ++idx)
 		_soundQueue[idx] = 0;
 }
@@ -3907,7 +3907,7 @@ void Scene325::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS.clearFlag(50);
 	_stripManager.addSpeaker(&_quinnSpeaker);
 	_palette.loadPalette(0);
-	
+
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.hide();
 	R2_GLOBALS._player.disableControl();
@@ -3917,7 +3917,7 @@ void Scene325::postInit(SceneObjectList *OwnerList) {
 	_sceneMode = 1;
 	signal();
 }
-	
+
 void Scene325::synchronize(Serializer &s) {
 	SceneExt::synchronize(s);
 
@@ -3953,7 +3953,7 @@ void Scene325::signal() {
 		_icon4.postInit();
 		_icon4._sceneRegionId = 5;
 
-		setAction(&_sequenceManager1, this, 127, &_icon1, &_icon2, &_icon3, &_icon4, 
+		setAction(&_sequenceManager1, this, 127, &_icon1, &_icon2, &_icon3, &_icon4,
 			&R2_GLOBALS._player, NULL);
 		_sceneMode = 2;
 		break;
@@ -3969,7 +3969,7 @@ void Scene325::signal() {
 		_icon2._object2.postInit();
 		_icon2._object2.setup(160, 7, 2);
 		_icon2._object2.setPosition(Common::Point(106, 56));
-		
+
 		_icon3.setup(160, 1, 1);
 		_icon3.setPosition(Common::Point(65, 47));
 		_icon3._object2.postInit();
@@ -4008,7 +4008,7 @@ void Scene325::signal() {
 			_object3.postInit();
 			if (R2_GLOBALS.getFlag(13)) {
 				_object4.postInit();
-				setAction(&_sequenceManager1, this, 130, &R2_GLOBALS._player, &_object1, 
+				setAction(&_sequenceManager1, this, 130, &R2_GLOBALS._player, &_object1,
 					&_object2, &_object3, &_object4, NULL);
 			} else {
 				setAction(&_sequenceManager1, this, 129, &R2_GLOBALS._player, &_object1,
@@ -4042,12 +4042,12 @@ void Scene325::signal() {
 					_object13.setup(326, 4, 2);
 					_object13.setPosition(Common::Point(149, (int)(_field420 * ADJUST_FACTOR)));
 					_object13.fixPriority(21);
-					
+
 					_object10.postInit();
 					_object10.setup(326, 1, 1);
 					_object10.setPosition(Common::Point(210, 20));
 					_object10.fixPriority(10);
-					
+
 					_object1.postInit();
 					_object1.setup(326, 1, 1);
 					_object1.setPosition(Common::Point(210, 32));
@@ -4072,7 +4072,7 @@ void Scene325::signal() {
 					_object5.setup(326, 1, 1);
 					_object5.setPosition(Common::Point(210, 80));
 					_object5.fixPriority(10);
-				
+
 					_object6.postInit();
 					_object6.setup(326, 1, 1);
 					_object6.setPosition(Common::Point(210, 92));
@@ -4450,7 +4450,7 @@ void Scene325::dispatch() {
 
 		for (int idx = 0; idx < 4; ++idx)
 			_objList[idx].remove();
-	
+
 		if (flag) {
 			int v = _field420 - 758;
 			_object10.setFrame((v++ <= 0) ? 1 : v);
@@ -4522,7 +4522,7 @@ void Scene325::setMessage(int resNum, int lineNum) {
 		_text1.setPosition(Common::Point(49, 19));
 
 		R2_GLOBALS._sceneObjects->draw();
-		
+
 		if ((_soundCount != 0) && (R2_GLOBALS._speechSubtitles != 2)) {
 			_sceneMode = 15;
 			R2_GLOBALS._playStream.play(_soundQueue[_soundIndex++], this);
@@ -4804,7 +4804,7 @@ bool Scene500::ControlPanel::startAction(CursorType action, Event &event) {
 
 	if ((action == CURSOR_USE) && (R2_GLOBALS._player._characterIndex == R2_QUINN)) {
 		R2_GLOBALS._player.disableControl();
-		
+
 		if (R2_GLOBALS.getFlag(26)) {
 			scene->_stripNumber = 1104;
 			scene->_sceneMode = 524;
@@ -4818,7 +4818,7 @@ bool Scene500::ControlPanel::startAction(CursorType action, Event &event) {
 		return SceneHotspot::startAction(action, event);
 	}
 }
-	
+
 /*--------------------------------------------------------------------------*/
 
 bool Scene500::Object2::startAction(CursorType action, Event &event) {
@@ -4910,7 +4910,7 @@ bool Scene500::Doorway::startAction(CursorType action, Event &event) {
 			scene->setAction(&scene->_sequenceManager1, scene, 524, &R2_GLOBALS._player, NULL);
 		} else {
 			scene->_sceneMode = 500;
-			scene->setAction(&scene->_sequenceManager1, scene, 500, &R2_GLOBALS._player, NULL); 
+			scene->setAction(&scene->_sequenceManager1, scene, 500, &R2_GLOBALS._player, NULL);
 		}
 
 		return true;
@@ -4931,17 +4931,17 @@ bool Scene500::OxygenTanks::startAction(CursorType action, Event &event) {
 		if (R2_GLOBALS._player._characterIndex != R2_QUINN) {
 			SceneItem::display2(500, 52);
 			return true;
-		} else if ((R2_INVENTORY.getObjectScene(R2_REBREATHER_TANK) != 1) && 
+		} else if ((R2_INVENTORY.getObjectScene(R2_REBREATHER_TANK) != 1) &&
 				(R2_GLOBALS._player._characterIndex != R2_SEEKER) && !R2_GLOBALS.getFlag(28)) {
 			R2_GLOBALS._player.disableControl();
-			
+
 			if (_position.y == 120) {
 				scene->_sceneMode = 513;
-				scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, 
+				scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player,
 					&scene->_tanks1, NULL);
 			} else {
 				scene->_sceneMode = 514;
-				scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, 
+				scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player,
 					&scene->_tanks2, NULL);
 			}
 			return true;
@@ -4961,7 +4961,7 @@ bool Scene500::AirLock::startAction(CursorType action, Event &event) {
 	if ((action == CURSOR_USE) && R2_GLOBALS.getFlag(26)) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = (R2_GLOBALS._player._characterIndex == R2_QUINN) ? 521 : 522;
-		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, 
+		scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player,
 			&scene->_object2, &scene->_airLock, NULL);
 		return true;
 	} else {
@@ -5144,7 +5144,7 @@ void Scene500::postInit(SceneObjectList *OwnerList) {
 	_object1.setup(502, 1, 1);
 	_object1.setPosition(Common::Point(258, 99));
 	_object1.fixPriority(50);
-	
+
 	_object8.postInit();
 	_object8.setPosition(Common::Point(250, 111));
 
@@ -5322,16 +5322,16 @@ void Scene525::postInit(SceneObjectList *OwnerList) {
 	loadScene(525);
 	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
-	
+
 	R2_GLOBALS._sound1.play(105);
-	
+
 	_actor1.postInit();
 	_actor1._effect = 1;
-	
+
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 	R2_GLOBALS._player.disableControl();
-	
+
 	setAction(&_sequenceManager, this, 525, &R2_GLOBALS._player, &_actor1, NULL);
 }
 
@@ -5340,7 +5340,7 @@ void Scene525::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 600 - 
+ * Scene 600 -
  *
  *--------------------------------------------------------------------------*/
 Scene600::Scene600() {
@@ -5368,28 +5368,28 @@ bool Scene600::Item1::startAction(CursorType action, Event &event) {
 bool Scene600::Item4::startAction(CursorType action, Event &event) {
 	if ((action != R2_NEGATOR_GUN) || (!R2_GLOBALS.getFlag(1)))
 		return SceneHotspot::startAction(action, event);
-	
+
 	if ((R2_GLOBALS.getFlag(5)) && (!R2_GLOBALS.getFlag(8))) {
 		SceneItem::display(600, 32, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 		return true;
 	}
-	
+
 	if (R2_GLOBALS.getFlag(5)) {
 		SceneItem::display(600, 30, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 		return true;
 	}
-	
+
 	if ((!R2_GLOBALS.getFlag(8)) || (R2_GLOBALS.getFlag(9)))
 		return SceneHotspot::startAction(action, event);
 
 	R2_GLOBALS._player.disableControl();
-	
+
 	Scene600 *scene = (Scene600 *)R2_GLOBALS._sceneManager._scene;
 
 	scene->_object1.setup2(603, 3, 1, 239, 54, 10, 0);
 	scene->_actor3.postInit();
 	scene->_actor2.postInit();
-	
+
 	scene->_sceneMode = 612;
 	setAction(&scene->_sequenceManager1, this, 612, &scene->_actor3, &scene->_actor2, &R2_GLOBALS._player, NULL);
 	return true;
@@ -5405,7 +5405,7 @@ bool Scene600::Actor4::startAction(CursorType action, Event &event) {
 	if ((action >= CURSOR_WALK) && (action < R2CURSORS_START))
 	// Only action cursors
 		return SceneActor::startAction(action, event);
-	
+
 	return false;
 }
 
@@ -5417,10 +5417,10 @@ void Scene600::Actor4::draw() {
 bool Scene600::Actor5::startAction(CursorType action, Event &event) {
 	if ((action < CURSOR_WALK) && (action >= R2CURSORS_START))
 		return false;
-		
+
 	if (action != CURSOR_USE)
 		return SceneActor::startAction(action, event);
-	
+
 	Scene600 *scene = (Scene600 *)R2_GLOBALS._sceneManager._scene;
 
 	if ((R2_INVENTORY.getObjectScene(R2_CLAMP) == 600) && (!R2_GLOBALS.getFlag(6))) {
@@ -5431,17 +5431,17 @@ bool Scene600::Actor5::startAction(CursorType action, Event &event) {
 		scene->setAction(&scene->_sequenceManager1, scene, 609, &R2_GLOBALS._player, &scene->_actor5, &scene->_actor6, &scene->_actor1, NULL);
 		return true;
 	}
-	
+
 	if (_frame != 1)
 		return false;
-	
+
 	if (!R2_GLOBALS.getFlag(6)) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 616;
 		scene->setAction(&scene->_sequenceManager1, scene, 616, &R2_GLOBALS._player, &scene->_actor5, &scene->_actor6, NULL);
 		return true;
 	}
-	
+
 	if ((R2_GLOBALS.getFlag(9)) && (R2_INVENTORY.getObjectScene(R2_COM_SCANNER) == 600))
 		SceneItem::display(600, 31, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 	else {
@@ -5860,10 +5860,10 @@ bool Scene700::Actor2::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_USE)
 		return SceneActor::startAction(action, event);
-	
+
 	if (R2_GLOBALS._player._position.y <= 100)
 		return false;
-	
+
 	R2_GLOBALS._player.disableControl();
 	scene->_sceneMode = 701;
 	scene->setAction(&scene->_sequenceManager, scene, 701, &R2_GLOBALS._player, this, NULL);
@@ -5876,10 +5876,10 @@ bool Scene700::Actor3::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_USE)
 		return SceneActor::startAction(action, event);
-	
+
 	if (R2_GLOBALS._player._position.y <= 100)
 		return false;
-	
+
 	R2_GLOBALS._player.disableControl();
 	scene->_sceneMode = 702;
 	scene->setAction(&scene->_sequenceManager, scene, 702, &R2_GLOBALS._player, this, NULL);
@@ -5892,10 +5892,10 @@ bool Scene700::Actor4::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_USE)
 		return SceneActor::startAction(action, event);
-	
+
 	if (R2_GLOBALS._player._position.y <= 100)
 		return false;
-	
+
 	R2_GLOBALS._player.disableControl();
 	scene->_sceneMode = 704;
 	scene->setAction(&scene->_sequenceManager, scene, 704, &R2_GLOBALS._player, this, NULL);
@@ -5951,7 +5951,7 @@ bool Scene700::Actor5::startAction(CursorType action, Event &event) {
 		return SceneActor::startAction(action, event);
 		break;
 	}
-	
+
 	return true;
 }
 
@@ -5960,7 +5960,7 @@ bool Scene700::Actor6::startAction(CursorType action, Event &event) {
 
 	if ((action != CURSOR_USE) || (R2_GLOBALS._player._position.y >= 100))
 		return SceneActor::startAction(action, event);
-	
+
 	R2_GLOBALS._player.disableControl();
 	scene->_sceneMode = 1;
 	Common::Point pt(_position.x, 69);
@@ -5973,7 +5973,7 @@ bool Scene700::Actor6::startAction(CursorType action, Event &event) {
 void Scene700::postInit(SceneObjectList *OwnerList) {
 	if (R2_GLOBALS._sceneManager._previousScene == 900)
 		g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
-	
+
 	loadScene(700);
 	R2_GLOBALS._v558B6.set(60, 0, 260, 200);
 	SceneExt::postInit();
@@ -5993,7 +5993,7 @@ void Scene700::postInit(SceneObjectList *OwnerList) {
 	_actor3.setPosition(Common::Point(217, 120));
 	_actor3.fixPriority(10);
 	_actor3.setDetails(700, 15, -1, -1, 1, (SceneItem *) NULL);
-	
+
 	_actor1.postInit();
 	_actor1.setup(700, 4, 1);
 	_actor1.setPosition(Common::Point(355 - ((R2_GLOBALS._v565E3 * 8) / 5), ((R2_GLOBALS._v565E1 + 20 ) / 5) - 12));
@@ -6132,7 +6132,7 @@ void Scene700::remove() {
 	R2_GLOBALS._sound1.play(10);
 // CHECKME: Present in the original... But it crashes badly.
 // The instruction was removed as it's not used in other scene coded the same way
-// and reversed by dreammaster. A double check is required in order to verify it doesn't hide 
+// and reversed by dreammaster. A double check is required in order to verify it doesn't hide
 // a memory leak
 //	_rotation->remove();
 	SceneExt::remove();
@@ -6445,7 +6445,7 @@ void Scene800::postInit(SceneObjectList *OwnerList) {
 
 	if (R2_INVENTORY.getObjectScene(R2_READER) == 800) {
 		_reader.postInit();
-		
+
 		if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) {
 			_opticalFibre.setup(800, 4, 1);
 			_reader.hide();
@@ -6776,7 +6776,7 @@ void Scene825::process(Event &event) {
 }
 
 void Scene825::dispatch() {
-	if (R2_GLOBALS._sceneObjects->contains(&_object4) && 
+	if (R2_GLOBALS._sceneObjects->contains(&_object4) &&
 			((_object4._frame == 1) || (_object4._frame == 3)) &&
 			(_object4._frame != _frame1)) {
 		_sound2.play(25);
@@ -6828,7 +6828,7 @@ void Scene825::doButtonPress(int buttonId) {
 					_sceneText.setup(NO_TREATMENT_REQUIRED);
 				} else {
 					_button6._buttonId = 5;
-					
+
 					_object5.postInit();
 					setAction(&_sequenceManager1, this, 827, &_object5, NULL);
 				}
@@ -6853,7 +6853,7 @@ void Scene825::doButtonPress(int buttonId) {
 		case 4:
 			_sound4.play(27);
 			_button6._buttonId = 5;
-			
+
 			_object1.postInit();
 			_object1.setup(826, 7, 1);
 			_object1.setPosition(Common::Point(112, 67));
@@ -7002,7 +7002,7 @@ bool Scene850::Panel::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 852;
 		scene->setAction(&scene->_sequenceManager1, scene, 852, &R2_GLOBALS._player, this, &scene->_object1, NULL);
 		return true;
-	}		
+	}
 }
 
 /*--------------------------------------------------------------------------*/
@@ -7171,7 +7171,7 @@ bool Scene900::Actor4::startAction(CursorType action, Event &event) {
 					scene->_aSound1.play(53);
 					setup(900, 3, 9);
 					R2_GLOBALS._v565E5 = 0;
-					
+
 					if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (scene->_actor2._frame < 8) && (scene->_actor2._animateMode != ANIM_MODE_5)) {
 							scene->_actor2.animate(ANIM_MODE_5, NULL);
 					} else if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 700) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (scene->_actor2._frame < 8)) {
@@ -7292,7 +7292,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 		_actor2.postInit();
 		_actor2.setPosition(Common::Point(0, 0));
 		_actor2.fixPriority(1);
-		
+
 		if (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) {
 			if (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) != 700) {
 				_actor2.setup(901, 3, 2);
@@ -7321,7 +7321,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 void Scene900::remove() {
 	if (_sceneMode != 901)
 		R2_GLOBALS._sound1.play(10);
-	
+
 	SceneExt::remove();
 }
 
@@ -7348,7 +7348,7 @@ void Scene900::signal() {
 		break;
 	case 2:
 		_field412 = 2;
-		
+
 		_actor5.remove();
 		_actor6.remove();
 
@@ -7358,7 +7358,7 @@ void Scene900::signal() {
 		else
 			_actor5.setup(900, 3, 11);
 		_actor5.setPosition(Common::Point(36, 166));
-		
+
 		_actor7.sub96135(5);
 		_actor7.setup(900, 3, 3);
 		_actor7.setPosition(Common::Point(76, 134));
@@ -7374,7 +7374,7 @@ void Scene900::signal() {
 		_actor10.sub96135(7);
 		_actor10.setup(900, 3, 5);
 		_actor10.setPosition(Common::Point(99, 144));
-		
+
 		break;
 	case 3:
 		_field412 = 3;
@@ -7405,11 +7405,11 @@ void Scene900::signal() {
 		R2_GLOBALS._player._canWalk = false;
 
 		_actor1.setup(900, 1, 1);
-		
+
 		_actor4.sub96135(1);
 		_actor4.setup(900, 1, 3);
 		_actor4.setPosition(Common::Point(77, 168));
-		
+
 		_sceneMode = 1;
 		signal();
 		break;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index d757080156..e39efbca3d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -45,9 +45,9 @@ class Scene50: public SceneExt {
 	public:
 		void signal();
 	};
-	
+
 public:
-	Action1 _action1;	
+	Action1 _action1;
 
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void process(Event &event);
@@ -208,7 +208,7 @@ public:
 	SequenceManager _sequenceManager;
 	Action1 _action1;
 	ASoundExt _sound1;
-	
+
 	int _frameNumber;
 	int _field412, _field480;
 	int _field482, _frameInc;
@@ -217,7 +217,7 @@ public:
 public:
 	Scene180();
 
-	virtual void postInit(SceneObjectList *OwnerList = NULL);	
+	virtual void postInit(SceneObjectList *OwnerList = NULL);
 	virtual void synchronize(Serializer &s);
 	virtual void remove();
 	virtual void signal();
@@ -283,7 +283,7 @@ class Scene205: public SceneExt {
 	};
 private:
 	void setup();
-	void processList(Object **ObjList, int count, const Common::Rect &bounds, 
+	void processList(Object **ObjList, int count, const Common::Rect &bounds,
 					int xMultiply, int yMultiply, int xCenter, int yCenter);
 	void handleText();
 public:
@@ -445,7 +445,7 @@ class Scene325: public SceneExt {
 		void showIcon();
 		void hideIcon();
 	};
-	
+
 private:
 	void removeText();
 	void consoleAction(int id);
@@ -531,7 +531,7 @@ class Scene500: public SceneExt {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
-	
+
 	/* Objects */
 	class Object2: public SceneActor {
 	public:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index e849e7137a..304d3a4298 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -118,7 +118,7 @@ void Scene1020::postInit(SceneObjectList *OwnerList) {
 
 	if (R2_GLOBALS._sceneManager._previousScene == 1010)
 		_sceneMode = 0;
-	else 
+	else
 		_sceneMode = 10;
 }
 
@@ -345,7 +345,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
 	}
 
 	SceneExt::postInit();
-		
+
 	if (R2_GLOBALS._sceneManager._previousScene == -1)
 		R2_GLOBALS._sceneManager._previousScene = 1000;
 
@@ -397,7 +397,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
 			_actor18.setDetails(1100, 4, -1, -1, 1, (SceneItem *) NULL);
 		else
 			_actor18.setDetails(1100, 3, -1, -1, 1, (SceneItem *) NULL);
-		
+
 		_actor17.postInit();
 		_actor17.setup(1105, 3, 1);
 		_actor17.setPosition(Common::Point(312, 165));
@@ -450,7 +450,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
 		_actor4._field9C = _field312;
 
 		R2_GLOBALS._sound1.play(86);
-		
+
 		_sceneMode = 0;
 
 		setAction(&_sequenceManager1, this, 1, &R2_GLOBALS._player, NULL);
@@ -463,7 +463,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
 
 		R2_GLOBALS._player.postInit();
 		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-		
+
 		_actor16.postInit();
 
 		if (R2_GLOBALS.getFlag(52)) {
@@ -492,7 +492,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
 			R2_GLOBALS._player.enableControl();
 			R2_GLOBALS._player._canWalk = false;
 		}
-		
+
 		if (R2_GLOBALS._player._characterIndex == 1)
 			_actor16.setDetails(9002, 0, 4, 3, 1, (SceneItem *) NULL);
 		else
@@ -535,7 +535,7 @@ void Scene1100::postInit(SceneObjectList *OwnerList) {
 	_item6.setDetails(Rect(123, 69, 222, 105), 1100, 13, -1, -1, 1, NULL);
 	_item2.setDetails(Rect(0, 0, 480, 46), 1100, 0, -1, -1, 1, NULL);
 	_item1.setDetails(Rect(0, 0, 480, 200), 1100, 40, 41, 42, 1, NULL);
-}	
+}
 
 void Scene1100::remove() {
 	R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
@@ -703,7 +703,7 @@ void Scene1100::signal() {
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 		_stripManager.start(302, this);
-		break;		
+		break;
 	case 27:
 		R2_GLOBALS._player.disableControl();
 		setAction(&_sequenceManager1, this, 1120, &_actor16, &R2_GLOBALS._player, NULL);
@@ -761,7 +761,7 @@ void Scene1100::signal() {
 			R2_GLOBALS._player.disableControl();
 			_sceneMode = 1125;
 			setAction(&_sequenceManager1, this, 1125, &R2_GLOBALS._player, &_actor16, NULL);
-		} else 
+		} else
 			R2_GLOBALS._player.enableControl(CURSOR_TALK);
 		break;
 	case 55:
@@ -832,22 +832,22 @@ void Scene1100::dispatch() {
 			R2_GLOBALS._scenePalette.refresh();
 		_field414 = 1;
 	}
-	
+
 	Scene::dispatch();
-	
+
 	if (R2_GLOBALS._player._bounds.contains(_actor13._position))
 		_actor13._shade = 3;
-	else 
+	else
 		_actor13._shade = 0;
 
 	if (R2_GLOBALS._player._bounds.contains(_actor14._position))
 		_actor14._shade = 3;
-	else 
+	else
 		_actor14._shade = 0;
 
 	if (R2_GLOBALS._player._bounds.contains(_actor15._position))
 		_actor15._shade = 3;
-	else 
+	else
 		_actor15._shade = 0;
 }
 
@@ -952,7 +952,7 @@ void Scene1200::Area1::Actor3::init(int state) {
 bool Scene1200::Area1::Actor3::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_USE)
 		return SceneActor::startAction(action, event);
-	
+
 	R2_GLOBALS._sound2.play(260);
 	switch (_state) {
 	case 1:
@@ -1002,10 +1002,10 @@ bool Scene1200::Area1::Actor3::startAction(CursorType action, Event &event) {
 	default:
 		break;
 	}
-	
+
 	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
 	scene->_field418 = 0;
-	
+
 	if ((R2_GLOBALS._v56AA6 == 1) && (R2_GLOBALS._v56AA7 == 1) && (R2_GLOBALS._v56AA8 == 1))
 		scene->_field418 = 1;
 	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA7 == 1) && (R2_GLOBALS._v56AA8 == 1))
@@ -1014,7 +1014,7 @@ bool Scene1200::Area1::Actor3::startAction(CursorType action, Event &event) {
 		scene->_field418 = 3;
 	else if ((R2_GLOBALS._v56AA6 == 2) && (R2_GLOBALS._v56AA7 == 3) && (R2_GLOBALS._v56AA8 == 1))
 		scene->_field418 = 4;
-	
+
 	return true;
 }
 
@@ -1035,7 +1035,7 @@ void Scene1200::Area1::postInit(SceneObjectList *OwnerList) {
 
 void Scene1200::Area1::remove() {
 	Scene1200 *scene = (Scene1200 *)R2_GLOBALS._sceneManager._scene;
-	
+
 	scene->_field41A = 0;
 	warning("Unexpected _sceneAreas.remove() call");
 //	scene->_sceneAreas.remove(&_actor3);
@@ -1044,14 +1044,14 @@ void Scene1200::Area1::remove() {
 	_actor3.remove();
 	_actor4.remove();
 	_actor5.remove();
-	
+
 	// sub201EA
 	R2_GLOBALS._sceneItems.remove((SceneItem *)this);
 	_actor2.remove();
 	SceneArea::remove();
 	R2_GLOBALS._insetUp--;
 	//
-	
+
 	R2_GLOBALS._player._canWalk = true;
 }
 
@@ -1388,9 +1388,9 @@ void Scene1200::signal() {
 void Scene1200::process(Event &event) {
 	if (_field414 != 0)
 		return;
-	
+
 	Scene::process(event);
-	
+
 	if (!R2_GLOBALS._player._canWalk)
 		return;
 
@@ -1405,10 +1405,10 @@ void Scene1200::process(Event &event) {
 
 			if ((event.mousePos.x > 109) && (event.mousePos.x < 140) && (event.mousePos.y > 50) && (event.mousePos.y < 89))
 				sub9DAD6(2);
-				
+
 			if ((event.mousePos.x > 140) && (event.mousePos.x < 179) && (event.mousePos.y > 89) && (event.mousePos.y < 120))
 				sub9DAD6(3);
-				
+
 			if ((event.mousePos.x > 140) && (event.mousePos.x < 179) && (event.mousePos.y > 19) && (event.mousePos.y < 50))
 				sub9DAD6(4);
 			break;
@@ -1511,7 +1511,7 @@ void Scene1200::process(Event &event) {
 			event.handled = false;
 			return;
 		}
-		
+
 		switch (event.kbd.keycode) {
 		case Common::KEYCODE_1:
 			warning("FIXME: keycode = 0x4800");
@@ -1538,7 +1538,7 @@ void Scene1200::process(Event &event) {
 		return;
 	}
 }
-	
+
 void Scene1200::dispatch() {
 	Rect tmpRect;
 	Scene::dispatch();
@@ -1550,7 +1550,7 @@ void Scene1200::dispatch() {
 		warning("tmpRect.sub14DF3();");
 		_field41C = 0;
 	}
-	
+
 	if (_field414 != 0) {
 		tmpRect.set(110, 20, 210, 120);
 		_field414--;
@@ -1575,7 +1575,7 @@ void Scene1200::dispatch() {
 		_object1.sub51B02();
 		warning("_gfxManager.sub294AC(unk);");
 		warning("tmpRect.sub14DF3();");
-		
+
 		if (_field416 != 0) {
 			switch(_field412 - 1) {
 			case 0:
@@ -1664,7 +1664,7 @@ void Scene1337::Action1337::subD18B5(int resNum, int stripNum, int frameNum) {
 void Scene1337::Action1337::skipFrames(int32 skipCount) {
 	uint32 firstFrameNumber = g_globals->_events.getFrameNumber();
 	uint32 tmpFrameNumber = firstFrameNumber;
-	
+
 	while (tmpFrameNumber < firstFrameNumber + skipCount)
 		tmpFrameNumber = g_globals->_events.getFrameNumber();
 
@@ -1824,7 +1824,7 @@ void Scene1337::Action1::signal() {
 		scene->_aSound1.play(62);
 
 		R2_GLOBALS._sceneObjects->draw();
-		
+
 		skipFrames(120);
 		scene->_arrunkObj1337[2]._arr2[0]._object1.remove();
 		scene->_arrunkObj1337[2]._arr2[1]._object1.remove();
@@ -1938,7 +1938,7 @@ void Scene1337::Action1::signal() {
 		scene->_arrunkObj1337[0]._arr1[2]._object1.fixPriority(170);
 
 		R2_GLOBALS._sceneObjects->draw();
-		
+
 		scene->actionDisplay(1331, 10, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 		scene->_item2._object1.setPosition(Common::Point(162, 95), 0);
 		scene->_item2._object1.show();
@@ -1976,7 +1976,7 @@ void Scene1337::Action1::signal() {
 		scene->_item2._object1.setStrip(scene->_arrunkObj1337[2]._arr1[2]._object1._strip);
 		scene->_item2._object1.setFrame(scene->_arrunkObj1337[2]._arr1[2]._object1._frame);
 		scene->_item2._object1.animate(ANIM_MODE_NONE, NULL);
-		
+
 		scene->_arrunkObj1337[2]._arr1[2]._field34 = 0;
 		scene->_arrunkObj1337[2]._arr1[2]._object1.remove();
 
@@ -2102,7 +2102,7 @@ void Scene1337::Action1::signal() {
 		R2_GLOBALS._sceneObjects->draw();
 
 		skipFrames(240);
-		
+
 		scene->_arrObject1[0].remove();
 		scene->_arrObject1[1].remove();
 		scene->_arrObject1[2].remove();
@@ -2125,7 +2125,7 @@ void Scene1337::Action1::signal() {
 
 		scene->_arrunkObj1337[2]._arr3[0]._field34 = 0;
 		scene->_arrunkObj1337[2]._arr3[0]._object1.remove();
-		
+
 		scene->_item2._object1.setPosition(scene->_arrunkObj1337[2]._arr3[0]._field36, 0);
 		scene->_item2._object1.show();
 
@@ -2219,7 +2219,7 @@ void Scene1337::Action1::signal() {
 		R2_GLOBALS._sceneObjects->draw();
 
 		skipFrames(240);
-		
+
 		scene->_arrObject1[0].remove();
 		scene->_arrObject1[1].remove();
 		scene->_arrObject1[2].remove();
@@ -2289,7 +2289,7 @@ void Scene1337::Action1::signal() {
 		scene->_arrObject2[0].setStrip(7);
 		scene->_arrObject2[0].setFrame(1);
 		scene->_arrObject2[0].fixPriority(180);
-			 
+
 		scene->_arrObject1[1].postInit();
 		scene->_arrObject1[1].setVisage(1332);
 		scene->_arrObject1[1].setPosition(Common::Point(160, 71), 0);
@@ -2303,35 +2303,35 @@ void Scene1337::Action1::signal() {
 		scene->_arrObject2[1].setStrip(7);
 		scene->_arrObject2[1].setFrame(1);
 		scene->_arrObject2[1].fixPriority(180);
-			 
+
 		scene->_arrObject1[2].postInit();
 		scene->_arrObject1[2].setVisage(1332);
 		scene->_arrObject1[2].setPosition(Common::Point(131, 100), 0);
 		scene->_arrObject1[2].fixPriority(190);
 		scene->_arrObject1[2].setStrip(4);
 		scene->_arrObject1[2].setFrame(4);
-			 
+
 		scene->_arrObject2[2].postInit();
 		scene->_arrObject2[2].setVisage(1332);
 		scene->_arrObject2[2].setPosition(Common::Point(131, 100), 0);
 		scene->_arrObject2[2].setStrip(7);
 		scene->_arrObject2[2].setFrame(1);
 		scene->_arrObject2[2].fixPriority(180);
-			 
+
 		scene->_arrObject1[3].postInit();
 		scene->_arrObject1[3].setVisage(1332);
 		scene->_arrObject1[3].setPosition(Common::Point(160, 100), 0);
 		scene->_arrObject1[3].fixPriority(190);
 		scene->_arrObject1[3].setStrip(4);
 		scene->_arrObject1[3].setFrame(2);
-			 
+
 		scene->_arrObject2[3].postInit();
 		scene->_arrObject2[3].setVisage(1332);
 		scene->_arrObject2[3].setPosition(Common::Point(160, 100), 0);
 		scene->_arrObject2[3].setStrip(7);
 		scene->_arrObject2[3].setFrame(1);
 		scene->_arrObject2[3].fixPriority(180);
-			 
+
 		R2_GLOBALS._sceneObjects->draw();
 
 		skipFrames(240);
@@ -2353,14 +2353,14 @@ void Scene1337::Action1::signal() {
 		R2_GLOBALS._sceneObjects->draw();
 
 		scene->actionDisplay(1331, 19, 159, 10, 1, 220, 0, 7, 0, 154, 154);
-		
+
 		scene->_object1.hide();
 
 		scene->actionDisplay(1331, 20, 159, 10, 1, 220, 0, 7, 0, 154, 154);
 		scene->actionDisplay(1331, 21, 159, 10, 1, 220, 0, 7, 0, 154, 154);
 
 		scene->_item7._field34 = scene->_arrunkObj1337[2]._arr1[1]._field34;
-		
+
 		scene->_item2._object1.setStrip(scene->_arrunkObj1337[2]._arr1[1]._object1._strip);
 		scene->_item2._object1.setFrame(scene->_arrunkObj1337[2]._arr1[1]._object1._frame);
 		scene->_item2._object1.animate(ANIM_MODE_NONE, NULL);
@@ -2384,7 +2384,7 @@ void Scene1337::Action1::signal() {
 		scene->_item2._object1.animate(ANIM_MODE_2, NULL);
 
 		R2_GLOBALS._sceneObjects->draw();
-		
+
 		scene->actionDisplay(1331, 22, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 
 		int i = -1;
@@ -2452,13 +2452,13 @@ void Scene1337::Action2::signal() {
 
 		scene->_item7._object1.remove();
 		scene->_item7._field34 = 0;
-		
+
 		scene->_aSound1.play(60);
 		scene->_item3._object1.animate(ANIM_MODE_5, this);
 		break;
 	case 1:
 		scene->_item3._object1.setFrame(1);
-		
+
 		scene->_aSound1.play(60);
 		scene->_item3._object1.animate(ANIM_MODE_5, this);
 		break;
@@ -2482,7 +2482,7 @@ void Scene1337::Action3::signal() {
 	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
 
 	scene->_item2._object1.setPosition(Common::Point(162, 95), 0);
-	
+
 	switch (_actionIndex++) {
 	case 0: {
 		scene->_item2._object1._moveDiff = Common::Point(30, 30);
@@ -2651,7 +2651,7 @@ void Scene1337::Action3::signal() {
 		scene->_arrunkObj1337[0]._arr1[1]._object1.setFrame(1);
 		scene->_arrunkObj1337[0]._arr1[1]._object1.fixPriority(170);
 		scene->_aSound2.play(61);
-		
+
 		Common::Point pt(283, 102);
 		NpcMover *mover = new NpcMover();
 		scene->_item2._object1.addMover(mover, &pt, this);
@@ -2668,7 +2668,7 @@ void Scene1337::Action3::signal() {
 		scene->_arrunkObj1337[1]._arr1[2]._object1.setFrame(4);
 		scene->_arrunkObj1337[1]._arr1[2]._object1.fixPriority(170);
 		scene->_aSound2.play(61);
-		
+
 		Common::Point pt(64, 174);
 		NpcMover *mover = new NpcMover();
 		scene->_item2._object1.addMover(mover, &pt, this);
@@ -2714,7 +2714,7 @@ void Scene1337::Action3::signal() {
 		scene->_arrunkObj1337[3]._arr1[2]._object1.setFrame(3);
 		scene->_arrunkObj1337[3]._arr1[2]._object1.fixPriority(170);
 		scene->_aSound2.play(61);
-		
+
 		Common::Point pt(226, 5);
 		NpcMover *mover = new NpcMover();
 		scene->_item2._object1.addMover(mover, &pt, this);
@@ -2734,7 +2734,7 @@ void Scene1337::Action3::signal() {
 	default:
 		break;
 	}
-	
+
 	if (_actionIndex > 12) {
 		scene->_field423E = 0;
 		R2_GLOBALS._sceneObjects->draw();
@@ -2764,9 +2764,9 @@ void Scene1337::Action4::signal() {
 			scene->_arrunkObj1337[scene->_field423E]._arr1[0]._field34 = scene->_field3E28[scene->_field3E24];
 			scene->_field3E28[scene->_field3E24] = 0;
 			scene->_field3E24--;
-			
+
 			if (scene->_field3E24 < 0)
-				scene->_background2.remove(); 
+				scene->_background2.remove();
 		} else {
 			// Self call, forcing next actionIndex
 			signal();
@@ -2786,7 +2786,7 @@ void Scene1337::Action4::signal() {
 
 		if ((scene->_field4248 == 1) || (scene->_field423E == 2))
 			scene->setAnimationInfo(&scene->_arrunkObj1337[scene->_field423E]._arr1[0]);
-			
+
 		scene->_item2._object1.hide();
 		if ((scene->_arrunkObj1337[scene->_field423E]._arr1[0]._field34 == 0) && (scene->subC264B(scene->_arrunkObj1337[scene->_field423E]._arr3[0]._field34 == 0))) {
 			if (scene->_field3E24 < 0)
@@ -2798,7 +2798,7 @@ void Scene1337::Action4::signal() {
 
 			NpcMover *mover = new NpcMover();
 			scene->_item2._object1.addMover(mover, &scene->_arrunkObj1337[scene->_field423E]._fieldB98, this);
-			
+
 			scene->_arrunkObj1337[scene->_field423E]._arr1[1]._field34 = scene->_field3E28[scene->_field3E24];
 			scene->_field3E28[scene->_field3E24] = 0;
 			scene->_field3E24--;
@@ -2821,7 +2821,7 @@ void Scene1337::Action4::signal() {
 
 		if ((scene->_field4248 == 1) || (scene->_field423E == 2))
 			scene->setAnimationInfo(&scene->_arrunkObj1337[scene->_field423E]._arr1[1]);
-			
+
 		scene->_item2._object1.hide();
 		if ((scene->_arrunkObj1337[scene->_field423E]._arr1[2]._field34 == 0) && (scene->subC264B(scene->_arrunkObj1337[scene->_field423E]._arr3[0]._field34 == 0))) {
 			if (scene->_field3E24 < 0)
@@ -2833,7 +2833,7 @@ void Scene1337::Action4::signal() {
 
 			NpcMover *mover = new NpcMover();
 			scene->_item2._object1.addMover(mover, &scene->_arrunkObj1337[scene->_field423E]._fieldB9C, this);
-			
+
 			scene->_arrunkObj1337[scene->_field423E]._arr1[2]._field34 = scene->_field3E28[scene->_field3E24];
 			scene->_field3E28[scene->_field3E24] = 0;
 			scene->_field3E24--;
@@ -2856,7 +2856,7 @@ void Scene1337::Action4::signal() {
 
 		if ((scene->_field4248 == 1) || (scene->_field423E == 2))
 			scene->setAnimationInfo(&scene->_arrunkObj1337[scene->_field423E]._arr1[2]);
-			
+
 		scene->_item2._object1.hide();
 		if ((scene->_arrunkObj1337[scene->_field423E]._arr1[3]._field34 == 0) && (scene->subC264B(scene->_arrunkObj1337[scene->_field423E]._arr3[0]._field34 == 0))) {
 			if (scene->_field3E24 < 0)
@@ -2868,7 +2868,7 @@ void Scene1337::Action4::signal() {
 
 			NpcMover *mover = new NpcMover();
 			scene->_item2._object1.addMover(mover, &scene->_arrunkObj1337[scene->_field423E]._fieldBA0, this);
-			
+
 			scene->_arrunkObj1337[scene->_field423E]._arr1[3]._field34 = scene->_field3E28[scene->_field3E24];
 			scene->_field3E28[scene->_field3E24] = 0;
 			scene->_field3E24--;
@@ -2891,7 +2891,7 @@ void Scene1337::Action4::signal() {
 
 		if ((scene->_field4248 == 1) || (scene->_field423E == 2))
 			scene->setAnimationInfo(&scene->_arrunkObj1337[scene->_field423E]._arr1[3]);
-			
+
 		scene->_item2._object1.hide();
 		switch (scene->_field423E) {
 		case 0:
@@ -2929,7 +2929,7 @@ void Scene1337::Action5::signal() {
 			scene->_item7._object1.setPosition(scene->_item7._field36, 0);
 			scene->_item7._object1.fixPriority(170);
 		}
-		
+
 		scene->_item7._field34 = scene->_field3EF0->_field34;
 		scene->_field3EF0->_field34 = 0;
 		scene->_field3EF0->_object1.remove();
@@ -3095,7 +3095,7 @@ void Scene1337::Action9::signal() {
 			subD18B5(5, 1, 4);
 			scene->subC4CEC();
 		}
-		
+
 		scene->subC20F9();
 		break;
 	default:
@@ -3143,7 +3143,7 @@ void Scene1337::Action10::signal() {
 				if (scene->_arrunkObj1337[0]._arr1[indexFound]._field34 == 29) {
 					found = true;
 					break;
-				} 
+				}
 			}
 			break;
 		case 1:
@@ -3151,7 +3151,7 @@ void Scene1337::Action10::signal() {
 				if (scene->_arrunkObj1337[1]._arr1[indexFound]._field34 == 29) {
 					found = true;
 					break;
-				} 
+				}
 			}
 			break;
 		case 2:
@@ -3159,7 +3159,7 @@ void Scene1337::Action10::signal() {
 				if (scene->_arrunkObj1337[2]._arr1[indexFound]._field34 == 29) {
 					found = true;
 					break;
-				} 
+				}
 			}
 			break;
 		case 3:
@@ -3167,7 +3167,7 @@ void Scene1337::Action10::signal() {
 				if (scene->_arrunkObj1337[3]._arr1[indexFound]._field34 == 29) {
 					found = true;
 					break;
-				} 
+				}
 			}
 			break;
 		default:
@@ -3190,7 +3190,7 @@ void Scene1337::Action10::signal() {
 				scene->subC4CD2();
 				if (MessageDialog::show(USE_INTERCEPTOR, NO_MSG, YES_MSG) == 0)
 					scene->subC4CEC();
-				else {			
+				else {
 					scene->subC51A0(&scene->_arrunkObj1337[2]._arr1[indexFound], scene->_field3EF8);
 					found2 = true;
 				}
@@ -3213,7 +3213,7 @@ void Scene1337::Action10::signal() {
 				if (scene->_arrunkObj1337[2]._arr2[i]._field34 != 0)
 					++j;
 			}
-			
+
 			if (j <= 1) {
 				for (int i = 0; i <= 7; i++) {
 					if (scene->_arrunkObj1337[2]._arr2[i]._field34 != 0) {
@@ -3223,11 +3223,11 @@ void Scene1337::Action10::signal() {
 				}
 			} else {
 				scene->subC4CD2();
-				
+
 				found2 = false;
 				while (!found2) {
 					scene->actionDisplay(1330, 130, 159, 10, 1, 200, 0, 7, 0, 154, 154);
-					
+
 					// Wait for a mouse or keypress
 					Event event;
 					while (!g_globals->_events.getEvent(event, EVENT_BUTTON_DOWN | EVENT_KEYPRESS) && !g_vm->shouldQuit()) {
@@ -3235,9 +3235,9 @@ void Scene1337::Action10::signal() {
 						R2_GLOBALS._sceneObjects->draw();
 						g_globals->_events.delay(g_globals->_sceneHandler->_delayTicks);
 					}
-	
+
 					scene->_item6._field36 = event.mousePos;
-	
+
 					for (int i = 0; i <= 7; i++) {
 						if ((scene->subC2BF8(&scene->_arrunkObj1337[2]._arr2[i], scene->_item6._field36) != 0) && (scene->_arrunkObj1337[2]._arr2[i]._field34 != 0)) {
 							scene->_field3EF4 = &scene->_arrunkObj1337[2]._arr2[0];
@@ -3249,15 +3249,15 @@ void Scene1337::Action10::signal() {
 				scene->subC4CEC();
 			}
 		}
-		
+
 		scene->_field3E28[scene->_field3E26] = scene->_field3EF4->_field34;
 		scene->_field3E26--;
 		scene->_field3EF4->_field34 = 0;
 		scene->_field3EF4->_object1.remove();
-		
+
 		scene->_item2._object1.setPosition(scene->_field3EF4->_field36, 0);
 		scene->_item2._object1.show();
-		
+
 		NpcMover *mover = new NpcMover();
 		scene->_item2._object1.addMover(mover, &scene->_field3EF8->_field36, this);
 		}
@@ -3284,7 +3284,7 @@ void Scene1337::Action11::signal() {
 		scene->_field3EF4->_object1.setPosition(scene->_field3EF4->_field36, 0);
 		scene->_field3EF4->_object1.fixPriority(170);
 		scene->_field3EF4->_field34 = 25;
-		
+
 		if (scene->_field4240 == 2) {
 			scene->_item2._object1.setPosition(scene->_field3EF4->_field36, 0);
 			subD18B5(5, 1, 4);
@@ -3353,7 +3353,7 @@ void Scene1337::Action11::signal() {
 					break;
 				}
 			}
-			
+
 			if ((found) && (scene->subC3E92(scene->_field4240) != -1)) {
 				scene->subC4CD2();
 				if (MessageDialog::show(USE_DOUBLE_AGENT, NO_MSG, YES_MSG) == 0)
@@ -3393,7 +3393,7 @@ void Scene1337::Action11::signal() {
 		default:
 			break;
 		}
-		
+
 		if (!noAction)
 			return;
 
@@ -3431,9 +3431,9 @@ void Scene1337::Action11::signal() {
 						R2_GLOBALS._sceneObjects->draw();
 						g_globals->_events.delay(g_globals->_sceneHandler->_delayTicks);
 					}
-					
+
 					scene->_item6._field36 = event.mousePos;
-					
+
 					found = false;
 
 					if (scene->_field4242 != 2) {
@@ -3499,7 +3499,7 @@ void Scene1337::Action11::signal() {
 			scene->setAnimationInfo(scene->_field3EF0);
 			break;
 		}
-			
+
 		scene->subC4A39(scene->_field3EF4);
 		break;
 	default:
@@ -3560,7 +3560,7 @@ void Scene1337::Action12::signal() {
 				scene->subC4CD2();
 
 				bool found = false;
-				
+
 				while (!found) {
 					switch (scene->_field4240) {
 					case 0:
@@ -3582,7 +3582,7 @@ void Scene1337::Action12::signal() {
 						R2_GLOBALS._sceneObjects->draw();
 						g_globals->_events.delay(g_globals->_sceneHandler->_delayTicks);
 					}
-					
+
 					scene->_item6._field36 = event.mousePos;
 
 					if (scene->_field4240 == 0) {
@@ -3594,7 +3594,7 @@ void Scene1337::Action12::signal() {
 							}
 						}
 					}
-					
+
 					if (scene->_field4240 == 3) {
 						for (i = 0; i <= 3; i++) {
 							if ((scene->subC2BF8(&scene->_arrunkObj1337[3]._arr1[i], scene->_item6._field36) != 0) && (scene->_arrunkObj1337[3]._arr1[i]._field34 != 0)) {
@@ -3882,14 +3882,14 @@ void Scene1337::dispatch() {
 void Scene1337::actionDisplay(int resNum, int lineNum, int x, int y, int arg5, int width, int textMode, int fontNum, int colFG, int colBGExt, int colFGExt) {
 	// TODO: Check if it's normal that arg5 is unused and replaced by an hardcoded 0 value
 	// May hide an original bug
-	
+
 	SceneItem::display(resNum, lineNum, SET_X, x, SET_Y, y, SET_KEEP_ONSCREEN, 0, SET_WIDTH, width, SET_POS_MODE, -1, SET_TEXT_MODE, textMode, SET_FONT, fontNum, SET_FG_COLOR, colFG, SET_EXT_BGCOLOR, colBGExt, SET_EXT_FGCOLOR, colFGExt, LIST_END);
 }
 
 void Scene1337::setAnimationInfo(unkObj1337sub1 *subObj) {
 	if (!subObj)
 		return;
-	
+
 	if (subObj->_field34 > 9) {
 		if (subObj->_field34 > 25) {
 			subObj->_object1.setStrip2(4);
@@ -3902,7 +3902,7 @@ void Scene1337::setAnimationInfo(unkObj1337sub1 *subObj) {
 		subObj->_object1.setStrip2(2);
 		subObj->_object1.setFrame(subObj->_field34);
 	}
-	
+
 	subObj->_object1.show();
 	R2_GLOBALS._sceneObjects->draw();
 }
@@ -3938,7 +3938,7 @@ void Scene1337::subC20F9() {
 			default:
 				break;
 			}
-			
+
 			if (!_autoplay)
 				_unkFctPtr412 = &Scene1337::subC20E5;
 			else
@@ -3995,7 +3995,7 @@ void Scene1337::subC2586() {
 	switch (_field423E) {
 	case 2:
 		subC4CD2();
-		if (_field4246 == 1) 
+		if (_field4246 == 1)
 			actionDisplay(1330, 114, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 		_field4246 = 0;
 	// No break on purpose
@@ -4190,7 +4190,7 @@ void Scene1337::subC2835(int arg1) {
 
 		if (found)
 			break;
-		
+
 		for (i = 0; i <= 3; i++) {
 			if (_arrunkObj1337[arg1]._arr1[i]._field34 == 13) {
 				found = true;
@@ -4329,7 +4329,7 @@ void Scene1337::subC2C2F() {
 		return;
 
 	int randIndx = R2_GLOBALS._randomSource.getRandomNumber(3);
-	
+
 	if (_arrunkObj1337[3]._arr1[randIndx]._field34 == 1) {
 		found = false;
 
@@ -4358,15 +4358,15 @@ void Scene1337::subC2C2F() {
 			for (int i = 0; i <= 7; i++) {
 				if ((_arrunkObj1337[3]._arr2[i]._field34 == 1) && (!subC2687(_arrunkObj1337[3]._arr3[i]._field34))) {
 					int tmpVal = 0;
-					
+
 					for (int j = 0; j <= 7; j++) {
 						if ((_arrunkObj1337[3]._arr2[j]._field34 > 1) && (_arrunkObj1337[3]._arr2[j]._field34 <= 9))
 							++tmpVal;
 					}
-					
+
 					if (tmpVal == 7)
 						_field424A = 3;
-					
+
 					subC33C0(&_arrunkObj1337[3]._arr1[randIndx], &_arrunkObj1337[3]._arr2[i]);
 					found = true;
 					break;
@@ -4386,7 +4386,7 @@ void Scene1337::subC2C2F() {
 		int tmpVal = -1;
 		found = false;
 		int tmpRandIndx = R2_GLOBALS._randomSource.getRandomNumber(3);
-		
+
 		for (int i = 0; i <= 3; i++) {
 			if (  (tmpRandIndx != 3)
 			  && (  (_arrunkObj1337[tmpRandIndx]._arr1[0]._field34 != 0)
@@ -4396,7 +4396,7 @@ void Scene1337::subC2C2F() {
 				tmpVal = tmpRandIndx;
 				break;
 			}
-			
+
 			++tmpRandIndx;
 			if (tmpRandIndx > 3)
 				tmpRandIndx = 0;
@@ -4433,7 +4433,7 @@ void Scene1337::subC2C2F() {
 		case 24: {
 			int tmpVal = -1;
 			int tmpRandIndx = R2_GLOBALS._randomSource.getRandomNumber(3);
-			
+
 			for (int i = 0; i <= 3; i++) {
 				if (tmpRandIndx != 3) {
 				// The variables 'i' and 'j' are not used in the inner code of the loop.
@@ -4449,11 +4449,11 @@ void Scene1337::subC2C2F() {
 				++tmpRandIndx;
 				if (tmpRandIndx > 3)
 					tmpRandIndx = 0;
-				
+
 				if (tmpVal != -1)
 					break;
 			}
-			
+
 			if (tmpVal != -1) {
 				// Useless second identical check skipped
 				subC3456(&_arrunkObj1337[3]._arr1[randIndx], &_arrunkObj1337[tmpVal]._arr3[0]);
@@ -4473,7 +4473,7 @@ void Scene1337::subC318B(int arg1, unkObj1337sub1 *subObj1, int arg3) {
 	_field4242 = arg3;
 
 	int randIndx;
-	
+
 	for (;;) {
 		randIndx = R2_GLOBALS._randomSource.getRandomNumber(3);
 		if (_arrunkObj1337[arg3]._arr1[randIndx]._field34 != 0)
@@ -4581,7 +4581,7 @@ void Scene1337::subC33C0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
 }
 
 int Scene1337::subC3E92(int arg1) {
-	if ( (_arrunkObj1337[arg1]._arr1[0]._field34 == 0) 
+	if ( (_arrunkObj1337[arg1]._arr1[0]._field34 == 0)
 	  && (_arrunkObj1337[arg1]._arr1[1]._field34 == 0)
 	  && (_arrunkObj1337[arg1]._arr1[2]._field34 == 0)
 	  && (_arrunkObj1337[arg1]._arr1[3]._field34 == 0))
@@ -4624,13 +4624,13 @@ Scene1337::unkObj1337sub1 *Scene1337::subC34EC(int arg1) {
 			return &_arrunkObj1337[arg1]._arr2[i];
 		}
 	}
-	
+
 	for (int i = 0; i <= 7; i++) {
 		if ((_arrunkObj1337[arg1]._arr2[i]._field34 != 0) && (_arrunkObj1337[arg1]._arr2[i]._field34 < 10)) {
 			return &_arrunkObj1337[arg1]._arr2[i];
 		}
 	}
-	
+
 	return NULL;
 }
 
@@ -5003,7 +5003,7 @@ void Scene1337::subCD193() {
 void Scene1337::subCDB90(int arg1, Common::Point pt) {
 	bool found = false;
 	int curReg = R2_GLOBALS._sceneRegions.indexOf(g_globals->_events._mousePos);
-	
+
 	if (arg1 == 3) {
 		int i;
 		for (i = 0; i <= 7; i++) {
@@ -5015,7 +5015,7 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 				break;
 			}
 		}
-		
+
 		if (found) {
 			switch (curReg) {
 			case 5:
@@ -5052,7 +5052,7 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 			  || (subC2BF8(&_arrunkObj1337[3]._arr3[0], pt)) ) {
 				found = true;
 			}
-			
+
 			if (found) {
 				switch (curReg) {
 				case 5:
@@ -5140,10 +5140,10 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 			}
 		}
 	}
-	
+
 	if (arg1 != 1)
 		return;
-		
+
 	for (int i = 0; i <= 7; i++) {
 		if (subC2BF8(&_arrunkObj1337[2]._arr2[i], pt)) {
 			switch (_arrunkObj1337[2]._arr2[i]._field34) {
@@ -5203,7 +5203,7 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 		}
 		found = true;
 	}
-	
+
 	if (subC2BF8(&_arrunkObj1337[3]._arr3[0], pt)) {
 		if (_arrunkObj1337[3]._arr3[0]._field34 != 0) {
 			actionDisplay(1330, 145, 20, 99, 1, 136, 0, 7, 0, 172, 172);
@@ -5212,7 +5212,7 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 		}
 		found = true;
 	}
-	
+
 	if (subC2BF8(&_arrunkObj1337[1]._arr3[0], pt)) {
 		if (_arrunkObj1337[1]._arr3[0]._field34 != 0) {
 			actionDisplay(1330, 144, 300, 99, 1, 136, 0, 7, 0, 117, 117);
@@ -5221,7 +5221,7 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 		}
 		found = true;
 	}
-	
+
 	if (subC2BF8(&_arrunkObj1337[0]._arr3[0], pt)) {
 		if (_arrunkObj1337[0]._arr3[0]._field34 != 0) {
 			actionDisplay(1330, 1, 159, 10, 1, 200, 0, 7, 0, 154, 154);
@@ -5248,12 +5248,12 @@ void Scene1337::subCDB90(int arg1, Common::Point pt) {
 
 	if (found)
 		return;
-	
+
 	if (_background1._bounds.contains(pt)) {
 		subCD193();
 		return;
 	}
-	
+
 	if (subC2BF8(&_item7, pt))
 		actionDisplay(1330, 9, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 	else if (subC2BF8(&_item8, pt))
@@ -5353,7 +5353,7 @@ void Scene1337::subCF31D() {
 		int tmpIndx = subC26CB(1, i);
 		if (tmpIndx == -1)
 			break;
-		
+
 		tmpVal = 0;
 		for (int j = 0; j <= 7; j++) {
 			if (_arrunkObj1337[1]._arr2[j]._field34 == _arrunkObj1337[1]._arr1[tmpIndx]._field34) {
@@ -5361,7 +5361,7 @@ void Scene1337::subCF31D() {
 				break;
 			}
 		}
-		
+
 		if (tmpVal == 0)
 			break;
 
@@ -5373,7 +5373,7 @@ void Scene1337::subCF31D() {
 						if ((_arrunkObj1337[1]._arr2[k]._field34 > 1) && (_arrunkObj1337[1]._arr2[k]._field34 <= 9))
 							++count;
 					}
-					
+
 					if (count == 7)
 						_field424A = 1;
 
@@ -5397,7 +5397,7 @@ void Scene1337::subCF31D() {
 			}
 		}
 	}
-	
+
 	if (found)
 		return;
 
@@ -5416,9 +5416,9 @@ void Scene1337::subCF31D() {
 		int rndVal = R2_GLOBALS._randomSource.getRandomNumber(3);
 		for (int i = 0; i <= 3; i++) {
 			if (rndVal != 1) {
-				if (  (_arrunkObj1337[rndVal]._arr1[0]._field34 != 0) 
-				   || (_arrunkObj1337[rndVal]._arr1[1]._field34 != 0) 
-				   || (_arrunkObj1337[rndVal]._arr1[2]._field34 != 0) 
+				if (  (_arrunkObj1337[rndVal]._arr1[0]._field34 != 0)
+				   || (_arrunkObj1337[rndVal]._arr1[1]._field34 != 0)
+				   || (_arrunkObj1337[rndVal]._arr1[2]._field34 != 0)
 				   || (_arrunkObj1337[rndVal]._arr1[3]._field34 == 0)) {
 					count = rndVal;
 					break;
@@ -5435,7 +5435,7 @@ void Scene1337::subCF31D() {
 			found = true;
 		}
 	}
-	
+
 	if (found)
 		return;
 
@@ -5449,7 +5449,7 @@ void Scene1337::subCF31D() {
 			for (int j = 0; j <= 3; j++) {
 				if (tmpVal != 1) {
 					for (int k = 0; k <= 7; k++) {
-						// 'k' is not used in that loop. 
+						// 'k' is not used in that loop.
 						// It looks suspicious.
 						if ((_arrunkObj1337[tmpVal]._arr3[0]._field34 == 0) && (subC32B1(tmpVal, _arrunkObj1337[1]._arr1[i]._field34))) {
 							count = tmpVal;
@@ -5510,7 +5510,7 @@ void Scene1337::subCF31D() {
 
 		if (found) {
 			if (count == -1)
-				return;	
+				return;
 
 			subC3456(&_arrunkObj1337[1]._arr1[j], &_arrunkObj1337[count]._arr3[0]);
 		} else {
@@ -5561,10 +5561,10 @@ void Scene1337::subCF979() {
 			break;
 		}
 	}
-	
+
 	if (found)
 		return;
-	
+
 	int tmpVal;
 	found = false;
 	for (int i = 0; i <= 3; i++) {
@@ -5578,7 +5578,7 @@ void Scene1337::subCF979() {
 					break;
 				}
 			}
-			
+
 			if (!flag) {
 				for (int j = 0; j <= 7; j++) {
 					if ((_arrunkObj1337[0]._arr2[j]._field34 == 1) && (!subC2687(_arrunkObj1337[0]._arr3[0]._field34))) {
@@ -5591,21 +5591,21 @@ void Scene1337::subCF979() {
 
 						if (count == 7)
 							_field424A = 0;
-						
+
 						subC33C0(&_arrunkObj1337[0]._arr1[tmpVal], &_arrunkObj1337[0]._arr2[j]);
 						found = true;
 					}
 				}
 			}
 		}
-		
+
 		if (found)
 			break;
 	}
 
 	if (found)
 		return;
-	
+
 	found = false;
 	tmpVal = subC2719(0);
 
@@ -5618,10 +5618,10 @@ void Scene1337::subCF979() {
 			}
 		}
 	}
-	
+
 	if (found)
 		return;
-	
+
 	tmpVal = subC274D(0);
 	if (tmpVal != -1) {
 		for (int i = 0; i <= 7; i++) {
@@ -5632,10 +5632,10 @@ void Scene1337::subCF979() {
 			}
 		}
 	}
-	
-	if (found) 
+
+	if (found)
 		return;
-	
+
 	tmpVal = subC2781(0);
 	if (tmpVal != -1) {
 		if ( (_arrunkObj1337[2]._arr1[0]._field34 != 0)
@@ -5646,10 +5646,10 @@ void Scene1337::subCF979() {
 			found = true;
 		}
 	}
-	
-	if (found) 
+
+	if (found)
 		return;
-	
+
 	for (int i = 0; i <= 3; i++) {
 		if (subC27B5(_arrunkObj1337[0]._arr1[i]._field34) != -1) {
 			// The variable 'j' is not used in the inner code of the loop. It's suspect
@@ -5666,7 +5666,7 @@ void Scene1337::subCF979() {
 		}
 	}
 
-	if (found) 
+	if (found)
 		return;
 
 	for (int i = 0; i <= 3; i++) {
@@ -5678,26 +5678,26 @@ void Scene1337::subCF979() {
 					found = true;
 				}
 			}
-			
+
 			if (found)
 				break;
 		}
 	}
-		
-	if (found) 
+
+	if (found)
 		return;
 
 	tmpVal = subC274D(0);
 	int tmpVal2 = subC331B(0);
-	
+
 	if ((tmpVal != -1) && (tmpVal2 != -1)) {
 		subC358E(&_arrunkObj1337[0]._arr1[tmpVal], tmpVal2);
 		found = true;
 	}
-	
+
 	if (found)
 		return;
-	
+
 	tmpVal = subC2781(0);
 	if (tmpVal != -1) {
 		if ( (_arrunkObj1337[1]._arr1[0]._field34 != 0)
@@ -5708,7 +5708,7 @@ void Scene1337::subCF979() {
 			found = true;
 		}
 	}
-	
+
 	if (found)
 		return;
 
@@ -5722,7 +5722,7 @@ void Scene1337::subCF979() {
 					found = true;
 				}
 			}
-			
+
 			if (!found) {
 			// The variable 'j' is not used in the inner code of the loop. It's suspect.
 				for (int j = 0; j <= 7; j++) {
@@ -5732,7 +5732,7 @@ void Scene1337::subCF979() {
 					}
 				}
 			}
-			
+
 			if (found)
 				break;
 		}
@@ -5761,12 +5761,12 @@ void Scene1337::subCF979() {
 					}
 				}
 			}
-			
+
 			if (found)
 				break;
 		}
 	}
-	
+
 	if (found)
 		return;
 
@@ -5847,7 +5847,7 @@ void Scene1337::subD02CA() {
 				_item6._object1 = _arrunkObj1337[2]._arr1[di]._object1;
 			}
 		}
-		
+
 		if (di == 4) {
 			subCDB90(1, _item6._field36);
 			subD0281();
@@ -5862,7 +5862,7 @@ void Scene1337::subD02CA() {
 		subD0281();
 		return;
 	}
-	
+
 	// That continues the block when R2_GLOBALS._v57810 == 200 and di != 4
 	subD18B5(1332, _item6._object1._strip, _item6._object1._frame);
 	R2_GLOBALS._sceneObjects->draw();
@@ -5874,7 +5874,7 @@ void Scene1337::subD02CA() {
 			|| (g_globals->_events.getEvent(event, EVENT_KEYPRESS)) ){
 			_item6._field36 = g_globals->_events._mousePos;
 			found_di = false;
-			
+
 			for (int i = 0; i <= 3; i ++) {
 				if (subC2BF8(&_arrunkObj1337[2]._arr1[i], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
 					if (_arrunkObj1337[2]._arr1[i]._field34 == 0) {
@@ -5897,7 +5897,7 @@ void Scene1337::subD02CA() {
 					break;
 				}
 			}
-			
+
 			if ((!found) && (!found_di)) {
 				if (subC2BF8(&_item7, Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
 					subC4A39(&_item6);
@@ -5947,7 +5947,7 @@ void Scene1337::subD02CA() {
 							} else {
 								if (j == 7)
 									_field424A = 2;
-								
+
 								subC33C0(&_item6, &_arrunkObj1337[2]._arr2[i]);
 								return;
 							}
@@ -6048,7 +6048,7 @@ void Scene1337::subD02CA() {
 											actionDisplay(1330, 99, 159, 10, 1, 200, 0, 7, 0, 154, 154);
 										}
 									}
-									
+
 									if (subC2BF8(&_arrunkObj1337[3]._arr4[0], Common::Point(_item6._field36.x + 12, _item6._field36.y + 12)) != 0) {
 										if ( (_arrunkObj1337[3]._arr1[0]._field34 != 0)
 											|| (_arrunkObj1337[3]._arr1[1]._field34 != 0)
@@ -6188,7 +6188,7 @@ void Scene1337::subD02CA() {
 					}
 				}
 			}
-			
+
 			if (found)
 				return;
 		} else {
@@ -6234,7 +6234,7 @@ int Scene1337::subD18F5() {
 		// The cursor looks... very dummy
 		// To be checked
 		warning("TODO: CursorManager.setData(R2_GLOBALS.off_57705)");
-		
+
 	++R2_GLOBALS._v57709;
 
 	return R2_GLOBALS._v57709;
@@ -6339,7 +6339,7 @@ void Scene1500::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._sound1.play(110);
 	} else if (R2_GLOBALS._sceneManager._previousScene == 1550) {
 		_actor1.setPosition(Common::Point(189, 139), 5);
-		
+
 		_actor3.setup(1400, 2, 1);
 		_actor3.changeZoom(-1);
 		_actor3.setPosition(Common::Point(298, 258), 5);
@@ -6505,7 +6505,7 @@ void Scene1530::postInit(SceneObjectList *OwnerList) {
 
 	_stripManager.addSpeaker(&_quinnSpeaker);
 	_stripManager.addSpeaker(&_seekerSpeaker);
-		
+
 	if (R2_GLOBALS._sceneManager._previousScene == 1000) {
 		R2_GLOBALS._player.postInit();
 		R2_GLOBALS._player.hide();
@@ -6677,7 +6677,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 			R2_GLOBALS._player.disableControl();
 			if (R2_GLOBALS._player._characterIndex == 1)
 				scene->_sceneMode = 1576;
-			else 
+			else
 				scene->_sceneMode = 1584;
 			// strcpy(scene->_arrUnkObj15502[7]._actorName, 'hatch');
 			scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_arrUnkObj15502[7], NULL);
@@ -6887,7 +6887,7 @@ bool Scene1550::UnkObj15503::startAction(CursorType action, Event &event) {
 		} else {
 			if (scene->_actor4._frame == 1)
 				scene->_sceneMode = 24;
-			else 
+			else
 				scene->_sceneMode = 22;
 			scene->setAction(&scene->_sequenceManager1, scene, 1561, this, NULL);
 		}
@@ -6911,7 +6911,7 @@ void Scene1550::UnkArea1550::remove() {
 	//
 	if ((scene->_sceneMode >= 20) && (scene->_sceneMode <= 29))
 		return;
-	
+
 	R2_GLOBALS._player.disableControl();
 	if (scene->_actor4._frame == 1) {
 		scene->_sceneMode = 1559;
@@ -7016,14 +7016,14 @@ bool Scene1550::Actor7::startAction(CursorType action, Event &event) {
 	Scene1550 *scene = (Scene1550 *)R2_GLOBALS._sceneManager._scene;
 	scene->_sceneMode = 80;
 	scene->signal();
-	
+
 	return true;
 }
 
 bool Scene1550::Actor8::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->_field412 = 1;
@@ -7031,7 +7031,7 @@ bool Scene1550::Actor8::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 1552;
 	else
 		scene->_sceneMode = 1588;
-	
+
 	scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor8, NULL);
 	return true;
 }
@@ -7071,7 +7071,7 @@ bool Scene1550::Actor10::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 1589;
 
 	scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor10, NULL);
-	return true;		
+	return true;
 }
 
 bool Scene1550::Actor11::startAction(CursorType action, Event &event) {
@@ -7087,7 +7087,7 @@ bool Scene1550::Actor11::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 1587;
 
 	scene->setAction(&scene->_sequenceManager1, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor11, NULL);
-	return true;		
+	return true;
 }
 
 bool Scene1550::Actor12::startAction(CursorType action, Event &event) {
@@ -7132,7 +7132,7 @@ bool Scene1550::Actor13::startAction(CursorType action, Event &event) {
 	case CURSOR_USE:
 		if (scene->_field415 != 2)
 			return SceneActor::startAction(action, event);
-		
+
 		if (R2_INVENTORY.getObjectScene(R2_BATTERY) == 1550) {
 			R2_GLOBALS._player.disableControl();
 			scene->_sceneMode = 1564;
@@ -7180,13 +7180,13 @@ void Scene1550::postInit(SceneObjectList *OwnerList) {
 		loadScene(1234);
 	else
 		loadScene(1550);
-	
+
 	scalePalette(65, 65, 65);
 	setZoomPercents(30, 75, 170, 100);
 	_field417 = 1550;
 	_field419 = 0;
 	SceneExt::postInit();
-	
+
 	if (R2_GLOBALS._sceneManager._previousScene == -1)
 		R2_GLOBALS.setFlag(R2_ATTRACTOR_CABLE_HARNESS);
 
@@ -7194,12 +7194,12 @@ void Scene1550::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._player._characterScene[1] = 1550;
 		R2_GLOBALS._player._characterScene[2] = 1550;
 	}
-	
+
 	_stripManager.setColors(60, 255);
 	_stripManager.setFontNumber(3);
 	_stripManager.addSpeaker(&_quinnSpeaker);
 	_stripManager.addSpeaker(&_seekerSpeaker);
-	
+
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player._effect = 6;
 
@@ -7209,19 +7209,19 @@ void Scene1550::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._player.setup(1505, 3, 1);
 
 	R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
-	
+
 	if ((R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] == 9) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == 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();
-	
+
 	_field414 = 0;
 	_actor7.changeZoom(-1);
 	R2_GLOBALS._player.changeZoom(-1);
-	
+
 	switch (R2_GLOBALS._sceneManager._previousScene) {
 	case 1530:
 		R2_GLOBALS._v565AE = 0;
@@ -7237,9 +7237,9 @@ void Scene1550::postInit(SceneObjectList *OwnerList) {
 		if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1580) {
 			R2_GLOBALS._player.disableControl();
 			R2_GLOBALS._player.animate(ANIM_MODE_NONE, NULL);
-			
+
 			_field412 = 1;
-			
+
 			_actor1.postInit();
 			_arrUnkObj15502[7].subA5CDF(8);
 			_arrUnkObj15502[7].hide();
@@ -7247,7 +7247,7 @@ void Scene1550::postInit(SceneObjectList *OwnerList) {
 				_sceneMode = 1577;
 			else
 				_sceneMode = 1578;
-			
+
 			setAction(&_sequenceManager1, this, _sceneMode, &R2_GLOBALS._player, &_actor1, &_arrUnkObj15502[7], NULL);
 			R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1550;
 		} else {
@@ -7257,13 +7257,13 @@ void Scene1550::postInit(SceneObjectList *OwnerList) {
 	default:
 		break;
 	}
-	
+
 	subA2B2F();
-	
+
 	_item1.setDetails(16, 1550, 10, -1, -1);
 	_item2.setDetails(24, 1550, 10, -1, -1);
 	_item3.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(&_actor7))
@@ -7454,7 +7454,7 @@ void Scene1550::signal() {
 				++R2_GLOBALS._v565AE;
 				if (R2_GLOBALS._player._characterIndex == 1)
 					_stripManager.start(499 + R2_GLOBALS._v565AE, this);
-				else					
+				else
 					_stripManager.start(502 + R2_GLOBALS._v565AE, this);
 			}
 		} else {
@@ -7470,7 +7470,7 @@ void Scene1550::signal() {
 				++R2_GLOBALS._v565AE;
 				if (R2_GLOBALS._player._characterIndex == 1)
 					_stripManager.start(563 + R2_GLOBALS._v565AE, this);
-				else					
+				else
 					_stripManager.start(567 + R2_GLOBALS._v565AE, this);
 			}
 		}
@@ -7635,11 +7635,11 @@ void Scene1550::process(Event &event) {
 			_field412 = 1;
 		else
 			_field412 = 0;
-		
+
 		if ((curReg == 13) || (curReg == 14))
 			_field412 = 0;
 	}
-	
+
 	Scene::process(event);
 }
 
@@ -7675,10 +7675,10 @@ void Scene1550::dispatch() {
 			break;
 		}
 	}
-	
+
 	if (_field412 != 0)
 		return;
-	
+
 	switch (R2_GLOBALS._player.getRegionIndex() - 11) {
 	case 0:
 	// No break on purpose
@@ -7687,9 +7687,9 @@ void Scene1550::dispatch() {
 		_sceneMode = 1;
 		_field412 = 1;
 		--R2_GLOBALS._v565EC[2 + R2_GLOBALS._player._characterIndex];
-		
+
 		subA2B2F();
-		
+
 		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);
@@ -7710,9 +7710,9 @@ void Scene1550::dispatch() {
 		_sceneMode = 3;
 		_field412 = 1;
 		++R2_GLOBALS._v565EC[2 + R2_GLOBALS._player._characterIndex];
-		
+
 		subA2B2F();
-		
+
 		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);
@@ -7733,9 +7733,9 @@ void Scene1550::dispatch() {
 		_sceneMode = 5;
 		_field412 = 1;
 		++R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex];
-		
+
 		subA2B2F();
-		
+
 		if ((R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex] == 9) && (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2] == 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));
@@ -7792,7 +7792,7 @@ void Scene1550::dispatch() {
 void Scene1550::saveCharacter(int characterIndex) {
 	if (R2_GLOBALS._player._characterIndex == 3)
 		R2_GLOBALS._sound1.fadeOut2(NULL);
-	
+
 	SceneExt::saveCharacter(characterIndex);
 }
 
@@ -7913,7 +7913,7 @@ void Scene1550::SceneActor1550::subA4D14(int frameNumber, int strip) {
 			fixPriority(2);
 			if (scene->_field414 == 2)
 				setup(1553, 2, 1);
-			else 
+			else
 				setup(1556, 2, 1);
 			setPosition(Common::Point(160, 44));
 			break;
@@ -7943,7 +7943,7 @@ void Scene1550::SceneActor1550::subA4D14(int frameNumber, int strip) {
 		} else {
 			fixPriority(2);
 		}
-		
+
 		if (frameNumber != 1)
 			setDetails(1550, 6, -1, -1, 2, (SceneItem *) NULL);
 
@@ -7984,40 +7984,40 @@ void Scene1550::subA2B2F() {
 	Rect tmpRect;
 	_field419 = 0;
 	_field415 = 0;
-	
+
 	tmpRect = R2_GLOBALS._v5589E;
-	
+
 	_actor14.remove();
 	_actor17.remove();
 	_actor15.remove();
 	_actor19.remove();
 	_actor16.remove();
 	_actor18.remove();
-	
+
 	for (int i = 0; i < 8; ++i)
 		_arrUnkObj15501[i].remove();
-	
+
 	_actor6.remove();
 
 	for (int i = 0; i < 8; ++i)
 		_arrUnkObj15502[i].remove();
-	
+
 	_actor8.remove();
 	_actor9.remove();
 	_actor10.remove();
 	_actor3.remove();
 	_actor11.remove();
-	
+
 	if ((_sceneMode != 1577) && (_sceneMode != 1578))
 		_actor1.remove();
-	
+
 	_actor2.remove();
 	_actor7.remove();
 	_actor13.remove();
 	_actor5.remove();
 	_actor12.remove();
 	_actor4.remove();
-	
+
 	switch (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex + 2]) {
 	case 0:
 		switch (R2_GLOBALS._v565EC[R2_GLOBALS._player._characterIndex]) {
@@ -8218,7 +8218,7 @@ void Scene1550::subA2B2F() {
 		} else {
 			_field414 = 2;
 		}
-		
+
 		if (R2_GLOBALS._sceneManager._sceneNumber == 1550){
 			warning("Mouse_hideIfNeeded()");
 			warning("gfx_set_pane_p");
@@ -8528,7 +8528,7 @@ void Scene1550::subA2B2F() {
 				_actor6.setPosition(Common::Point(243, 131));
 				_actor6.fixPriority(10);
 				_actor6.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
-				
+
 				_actor1.postInit();
 				_actor1.setup(1550, 2, 3);
 				_actor1.setPosition(Common::Point(243, 64));
@@ -8658,7 +8658,7 @@ void Scene1550::subA2B2F() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 1575 - 
+ * Scene 1575 -
  *
  *--------------------------------------------------------------------------*/
 Scene1575::Scene1575() {
@@ -8709,7 +8709,7 @@ void Scene1575::Hotspot1::process(Event &event) {
 		return;
 	}
 	int di = scene->_actor1._position.x;
-	
+
 	switch (_field34 - 1) {
 	case 0:
 		if (R2_GLOBALS.getFlag(18)) {
@@ -8730,10 +8730,10 @@ void Scene1575::Hotspot1::process(Event &event) {
 				di -= 65;
 			di += 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(di, scene->_actor1._position.y));
@@ -8745,12 +8745,12 @@ void Scene1575::Hotspot1::process(Event &event) {
 		if (scene->_field41A > 0) {
 			if (di < -8)
 				di += 65;
-			
+
 			di -= 2;
 			scene->_field41A -= 2;
 			for (int i = 0; i < 178; 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(di, scene->_actor1._position.y));
@@ -9061,9 +9061,9 @@ bool Scene1580::Hotspot1::startAction(CursorType action, Event &event) {
 		scene->_actor2.setup(1580, 1, 4);
 		scene->_actor2.setPosition(Common::Point(159, 163));
 		scene->_actor2.setDetails(1550, 78, -1, -1, 2, (SceneItem *) NULL);
-		
+
 		scene->_arrActor[5].remove();
-		
+
 		return true;
 	}
 
@@ -9082,12 +9082,12 @@ bool Scene1580::Hotspot2::startAction(CursorType action, Event &event) {
 		scene->_actor3.setup(1580, 1, 1);
 		scene->_actor3.setPosition(Common::Point(124, 108));
 		scene->_actor3.fixPriority(10);
-		
+
 		if (R2_INVENTORY.getObjectScene(26) == 1580)
 			scene->_actor3.setDetails(1550, 14, -1, -1, 5, &scene->_actor2);
 		else
 			scene->_actor3.setDetails(1550, 14, -1, -1, 2, (SceneItem *)NULL);
-		
+
 		scene->_actor1.postInit();
 		scene->_actor1.setup(1580, 3, 1);
 		scene->_actor1.setPosition(Common::Point(124, 109));
@@ -9115,7 +9115,7 @@ bool Scene1580::Actor2::startAction(CursorType action, Event &event) {
 			scene->_stripManager.start(536, scene);
 		else
 			scene->_stripManager.start(537, scene);
-		
+
 		return true;
 	}
 
@@ -9132,35 +9132,35 @@ bool Scene1580::Actor3::startAction(CursorType action, Event &event) {
 		remove();
 		return true;
 	}
-	
+
 	return SceneActor::startAction(action, event);
 }
 
 bool Scene1580::Actor4::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->_actor4);
 	scene->_sceneMode = 0;
 	animate(ANIM_MODE_5, scene);
-	
+
 	return true;
 }
 
 bool Scene1580::Actor5::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);
-	
+
 	return true;
 }
 
@@ -9238,9 +9238,9 @@ void Scene1580::postInit(SceneObjectList *OwnerList) {
 	_stripManager.setFontNumber(3);
 	_stripManager.addSpeaker(&_quinnSpeaker);
 	_stripManager.addSpeaker(&_seekerSpeaker);
-	
+
 	_sceneMode = 0;
-	
+
 	R2_GLOBALS._player.disableControl();
 	if (R2_INVENTORY.getObjectScene(26) == 1580) {
 		_actor2.postInit();
@@ -9250,14 +9250,14 @@ void Scene1580::postInit(SceneObjectList *OwnerList) {
 	} else {
 		_item1.setDetails(Rect(141, 148, 179, 167), 1550, 79, -1, -1, 1, NULL);
 	}
-	
+
 	if (R2_INVENTORY.getObjectScene(51) == 1580) {
 		_actor3.postInit();
 		_actor3.setup(1580, 1, 1);
 		_actor3.setPosition(Common::Point(124, 108));
 		_actor3.fixPriority(10);
 		_actor3.setDetails(1550, 13, -1, -1, 1, (SceneItem *) NULL);
-		
+
 		_actor1.postInit();
 		_actor1.setup(1580, 1, 3);
 		_actor1.setPosition(Common::Point(124, 96));
@@ -9273,7 +9273,7 @@ void Scene1580::postInit(SceneObjectList *OwnerList) {
 		_actor1.setup(1580, 3, 1);
 		_actor1.setPosition(Common::Point(124, 109));
 		_actor1.fixPriority(20);
-			
+
 		_sceneMode = 10;
 	} else {
 		_item2.setDetails(Rect(69, 29, 177, 108), 1550, 82, -1, -1, 1, NULL);
@@ -9289,7 +9289,7 @@ void Scene1580::postInit(SceneObjectList *OwnerList) {
 
 	_actor4.setPosition(Common::Point(216, 108));
 	_actor4.fixPriority(100);
-	
+
 	_actor5.postInit();
 	_actor5.setup(1580, 4, 1);
 	_actor5.setPosition(Common::Point(291, 147));
@@ -9303,7 +9303,7 @@ void Scene1580::postInit(SceneObjectList *OwnerList) {
 		_actor6.fixPriority(50);
 		_actor6.setDetails(1550, 32, -1, 34, 1, (SceneItem *) NULL);
 	}
-	
+
 	if (R2_INVENTORY.getObjectScene(27) == 1580) {
 		_actor7.postInit();
 		_actor7.setup(1580, 6, 1);
@@ -9311,13 +9311,13 @@ void Scene1580::postInit(SceneObjectList *OwnerList) {
 		_actor7.fixPriority(50);
 		_actor7.setDetails(1550, 38, -1, 34, 1, (SceneItem *) NULL);
 	}
-	
+
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1580;
 	R2_GLOBALS._player.hide();
 	setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
 	_item3.setDetails(Rect(0, 0, 320, 200), 1550, 50, -1, -1, 1, NULL);
-	
+
 }
 
 void Scene1580::signal() {
@@ -9334,7 +9334,7 @@ void Scene1580::signal() {
 			_arrActor[0].setup(1580, 2, 1);
 			_arrActor[0].setPosition(Common::Point(138, 56));
 		}
-		
+
 		if (R2_INVENTORY.getObjectScene(25) != 0) {
 			_arrActor[1].postInit();
 			_arrActor[1].setup(1580, 2, 2);
@@ -9663,7 +9663,7 @@ void Scene1625::process(Event &event) {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 1700 - 
+ * Scene 1700 -
  *
  *--------------------------------------------------------------------------*/
 Scene1700::Scene1700() {
@@ -9751,7 +9751,7 @@ void Scene1700::Exit3::changeScene() {
 void Scene1700::subAF3F8() {
 	Rect tmpRect;
 	R2_GLOBALS._walkRegions.load(1700);
-	
+
 	_actor3.remove();
 	_actor4.remove();
 	_actor5.remove();
@@ -9759,22 +9759,22 @@ void Scene1700::subAF3F8() {
 	_actor7.remove();
 	_actor8.remove();
 	_actor11.remove();
-	
+
 	if (_sceneMode != 40) {
 		_actor9.remove();
 		_actor10.remove();
 	}
-	
+
 	warning("tmpRect = _v5589E;");
 	warning("Mouse_hideIfNeeded");
 	warning("set_pane_p(_paneNumber);");
 	warning("Big loop calling gfx_draw_slice_p");
-	
+
 	if (_field77A == 0)
 		_field77A = 1;
 	else
 		_field77A = 0;
-	
+
 	warning("set_pane_p(_paneNumber);");
 
 	if ((_sceneMode != 40) && (R2_GLOBALS._v565F6 != 0)){
@@ -9784,57 +9784,57 @@ void Scene1700::subAF3F8() {
 		_actor9.setDetails(1700, 6, -1, -1, 2, (SceneItem *) NULL);
 		R2_GLOBALS._walkRegions.enableRegion(2);
 		R2_GLOBALS._walkRegions.enableRegion(12);
-	} 
-	
+	}
+
 	if ((R2_GLOBALS._v565F6 + 2) % 4 == 0) {
 		_actor3.postInit();
 		_actor3.setup(1700, 1, 1);
 		_actor3.setPosition(Common::Point(222, 82));
 		_actor3.setDetails(100, -1, -1, -1, 2, (SceneItem *) NULL);
-		
+
 		_actor5.postInit();
 		_actor5.setup(1700, 2, 1);
 		_actor5.setPosition(Common::Point(177, 82));
 		_actor5.fixPriority(0);
-		
+
 		_actor6.postInit();
 		_actor6.setup(1700, 2, 2);
 		_actor6.setPosition(Common::Point(332, 96));
 		_actor6.fixPriority(0);
-	
+
 		_actor4.postInit();
 		_actor4.setup(1700, 1, 2);
 		_actor4.setPosition(Common::Point(424, 84));
-		
+
 		R2_GLOBALS._walkRegions.enableRegion(11);
 	}
-	
+
 	if ((R2_GLOBALS._v565F6 + 399) % 800 == 0) {
 		_actor7.postInit();
 		_actor7.setup(1700, 3, 2);
 		_actor7.setPosition(Common::Point(51, 141));
 		_actor7.fixPriority(0);
 		_actor7.setDetails(100, -1, -1, -1, 2, (SceneItem *) NULL);
-		
+
 		_exit3._enabled = true;
 	} else {
 		R2_GLOBALS._walkRegions.enableRegion(1);
 		_exit3._enabled = false;
 	}
-	
-	if (  ((!R2_GLOBALS.getFlag(15)) && ((R2_GLOBALS._v565F6 == 25) || (R2_GLOBALS._v565F6 == -3))) 
+
+	if (  ((!R2_GLOBALS.getFlag(15)) && ((R2_GLOBALS._v565F6 == 25) || (R2_GLOBALS._v565F6 == -3)))
 		 || ((R2_GLOBALS.getFlag(15)) && (R2_GLOBALS._v565F6 == R2_GLOBALS._v565FA))
 		 ) {
 		R2_GLOBALS._v565FA = R2_GLOBALS._v565F6;
 		if (!R2_GLOBALS.getFlag(15))
 			_field77C = 1;
-		
+
 		_actor11.postInit();
 		_actor11.setup(1700, 3, 1);
 		_actor11.setPosition(Common::Point(338, 150));
 		_actor11.setDetails(1700, 9, -1, -1, 2, (SceneItem *) NULL);
 		_actor11.fixPriority(15);
-		
+
 		_actor8.postInit();
 		_actor8.setup(1700, 4, 1);
 		_actor8.setPosition(Common::Point(312, 106));
@@ -9847,14 +9847,14 @@ void Scene1700::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 	if (R2_GLOBALS._sceneManager._previousScene == -1)
 		R2_GLOBALS._sceneManager._previousScene = 1530;
-	
+
 	scalePalette(65, 65, 65);
 	_stripManager.addSpeaker(&_quinnSpeaker);
 	_stripManager.addSpeaker(&_seekerSpeaker);
 
 	_field77A = 0;
 	_field77C = 0;
-	
+
 	_exit1.setDetails(Rect(94, 0, 319, 12), EXITCURSOR_N, 1700);
 	_exit2.setDetails(Rect(0, 161, 319, 168), EXITCURSOR_S, 1700);
 	_exit3.setDetails(Rect(0, 0, 2, 138), EXITCURSOR_W, 1800);
@@ -9869,11 +9869,11 @@ void Scene1700::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._player.setVisage(1506);
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 1);
 	}
-	
+
 	_actor12.postInit();
 	_actor12.animate(ANIM_MODE_1, NULL);
 	_actor12.setObjectWrapper(new SceneObjectWrapper());
-	
+
 	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 		_actor12.setVisage(1506);
 		_actor12._moveDiff = Common::Point(3, 1);
@@ -9883,41 +9883,41 @@ void Scene1700::postInit(SceneObjectList *OwnerList) {
 		_actor12._moveDiff = Common::Point(2, 1);
 		_actor12.setDetails(9001, 1, -1, -1, 1, (SceneItem *) NULL);
 	}
-	
+
 	R2_GLOBALS._sound1.play(134);
-	
+
 	_actor1.postInit();
 	_actor1.fixPriority(10);
-	
+
 	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 		_actor1.setVisage(1112);
-	else 
+	else
 		_actor1.setVisage(1111);
-	
+
 	_actor1._effect = 5;
 	_actor1._field9C = _field312;
 	R2_GLOBALS._player._linkedActor = &_actor1;
-	
+
 	_actor2.postInit();
 	_actor2.fixPriority(10);
 	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 		_actor2.setVisage(1111);
-	else 
+	else
 		_actor2.setVisage(1112);
-	
+
 	_actor2._effect = 5;
 	_actor2._field9C = _field312;
 	_actor12._linkedActor = &_actor2;
-	
+
 	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();
 		_actor12.hide();
-		
+
 		_actor10.postInit();
 		warning("_actor10._actorName = \"hatch\";");
 		_actor10.hide();
@@ -9926,7 +9926,7 @@ void Scene1700::postInit(SceneObjectList *OwnerList) {
 		_actor9.setup(1701, 1, 1);
 		_actor9.setPosition(Common::Point(220, 137));
 		_actor9.setDetails(1700, 6, -1, -1, 1, (SceneItem *) NULL);
-		
+
 		_actor1.hide();
 		_actor2.hide();
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
@@ -10003,7 +10003,7 @@ void Scene1700::signal() {
 		Common::Point pt(R2_GLOBALS._player._position.x, 160);
 		NpcMover *mover = new NpcMover();
 		R2_GLOBALS._player.addMover(mover, &pt, this);
-		
+
 		if (R2_GLOBALS._player._position.x < 132) {
 			_actor12.setPosition(Common::Point(156, 170));
 			Common::Point pt2(156, 160);
@@ -10028,7 +10028,7 @@ void Scene1700::signal() {
 		Common::Point pt(R2_GLOBALS._player._position.x, 10);
 		NpcMover *mover = new NpcMover();
 		R2_GLOBALS._player.addMover(mover, &pt, this);
-		
+
 		if (R2_GLOBALS._player._position.x >= 171) {
 			_actor12.setPosition(Common::Point(155, 0));
 			Common::Point pt2(155, 10);
@@ -10112,7 +10112,7 @@ void Scene1700::signal() {
 			R2_GLOBALS._walkRegions.enableRegion(15);
 		else
 			R2_GLOBALS._walkRegions.enableRegion(17);
-		
+
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1704:
@@ -10130,7 +10130,7 @@ void Scene1700::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 1750 - 
+ * Scene 1750 -
  *
  *--------------------------------------------------------------------------*/
 Scene1750::Actor4::Actor4() {
@@ -10193,7 +10193,7 @@ void Scene1750::Actor4::subB1A76(int arg1, int arg2, int arg3, int arg4, int arg
 	_fieldA8 = arg3;
 	_fieldAA = arg4;
 	_fieldAC = arg5;
-	
+
 	postInit();
 	setup(1750, 1, 1);
 	fixPriority(255);
@@ -10227,7 +10227,7 @@ void Scene1750::Actor4::process(Event &event) {
 		addMover(NULL);
 		subB1B27();
 	}
-	
+
 	if (_fieldAE != 0) {
 		event.handled = true;
 		if (event.mousePos.y >= _fieldA8) {
@@ -10251,7 +10251,7 @@ bool Scene1750::Actor4::startAction(CursorType action, Event &event) {
 bool Scene1750::Actor5::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_USE)
 		return SceneActor::startAction(action, event);
-	
+
 	Scene1750 *scene = (Scene1750 *)R2_GLOBALS._sceneManager._scene;
 
 	switch (_fieldA4) {
@@ -10294,7 +10294,7 @@ void Scene1750::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._uiElements._active = false;
 	R2_GLOBALS._v5589E.set(0, 0, 320, 200);
 	SceneExt::postInit();
-	
+
 	R2_GLOBALS._player._characterScene[1] = 1750;
 	R2_GLOBALS._player._characterScene[2] = 1750;
 	R2_GLOBALS._player._oldCharacterScene[1] = 1750;
@@ -10304,7 +10304,7 @@ void Scene1750::postInit(SceneObjectList *OwnerList) {
 	_rotation->setDelay(0);
 	_rotation->_idxChange = 0;
 	_rotation->_countdown = 2;
-	
+
 	switch ((R2_GLOBALS._v565F6 + 2) % 4) {
 	case 0:
 		_rotation->_currIndex = 247;
@@ -10321,7 +10321,7 @@ void Scene1750::postInit(SceneObjectList *OwnerList) {
 	default:
 		break;
 	}
-	
+
 	byte tmpPal[768];
 
 	for (int i = 224; i < 255; i++) {
@@ -10348,40 +10348,40 @@ void Scene1750::postInit(SceneObjectList *OwnerList) {
 	_actor3.setPosition(Common::Point(49, 185));
 	_actor3.fixPriority(7);
 	_actor3.setDetails(1750, 30, -1, -1, 1, (SceneItem *) NULL);
-	
+
 	_actor1.postInit();
 	_actor1.setup(1750, 2, 1);
 	_actor1.setPosition(Common::Point(35, ((_rotation->_currIndex - 218) % 4) + ((R2_GLOBALS._v565F6 % 800) * 4) - 1440));
 	_actor1.fixPriority(8);
-	
+
 	_actor2.postInit();
 	_actor2.setup(1750, 1, 4);
-	
+
 	int tmpVar = abs(_actor1._position.y - 158) / 100;
-	
+
 	if (tmpVar >= 8)
 		_actor2.hide();
 	else if (_actor1._position.y <= 158)
 		_actor2.setPosition(Common::Point(137, (tmpVar * 7) + 122));
 	else
 		_actor2.setPosition(Common::Point(148, (tmpVar * 7) + 122));
-	
+
 	_actor4.subB1A76(1, 286, 143, 41, 15);
 	_actor4.setDetails(1750, 24, 1, -1, 1, (SceneItem *) NULL);
-	
+
 	_actor5.postInit();
 	_actor5._fieldA4 = 1;
 	_actor5.setup(1750, 1, 2);
 	_actor5.setPosition(Common::Point(192, 140));
 	_actor5.setDetails(1750, 18, 1, -1, 1, (SceneItem *) NULL);
-	
+
 	_actor6.postInit();
 	_actor6._fieldA4 = 2;
 	_actor6.setup(1750, 1, 3);
 	_actor6.setPosition(Common::Point(192, 163));
 	_actor6.setDetails(1750, 18, 1, -1, 1, (SceneItem *) NULL);
 	_actor6.hide();
-	
+
 	_actor7.postInit();
 	_actor7._fieldA4 = 3;
 	_actor7.setup(1750, 1, 5);
@@ -10393,7 +10393,7 @@ void Scene1750::postInit(SceneObjectList *OwnerList) {
 	_field413 = 0;
 	_field415 = 0;
 	_field419 = ((_rotation->_currIndex - 218) / 4) % 4;
-	
+
 	_item2.setDetails(Rect(129, 112, 155, 175), 1750, 21, -1, -1, 1, NULL);
 	_item3.setDetails(Rect(93, 122, 126, 172), 1750, 15, -1, -1, 1, NULL);
 	_item4.setDetails(Rect(3, 3, 157, 99), 1750, 9, -1, -1, 1, NULL);
@@ -10403,15 +10403,15 @@ void Scene1750::postInit(SceneObjectList *OwnerList) {
 
 void Scene1750::remove() {
 	_rotation->remove();
-	
+
 	if (R2_GLOBALS._v565F6 == 2400)
 		R2_GLOBALS._v565F6 = 2399;
-	
+
 	if (R2_GLOBALS._v565F6 == -2400)
 		R2_GLOBALS._v565F6 = -2399;
-	
+
 	R2_GLOBALS._v565FA = R2_GLOBALS._v565F6;
-	
+
 	SceneExt::remove();
 	R2_GLOBALS._sound1.fadeOut2(NULL);
 	R2_GLOBALS._v5589E.top = 3;
@@ -10432,7 +10432,7 @@ void Scene1750::process(Event &event) {
 void Scene1750::dispatch() {}
 
 /*--------------------------------------------------------------------------
- * Scene 1800 - 
+ * Scene 1800 -
  *
  *--------------------------------------------------------------------------*/
 Scene1800::Scene1800() {
@@ -10448,10 +10448,10 @@ void Scene1800::synchronize(Serializer &s) {
 bool Scene1800::Hotspot5::startAction(CursorType action, Event &event) {
 	if ((action != R2_COM_SCANNER) && (action != R2_COM_SCANNER_2))
 		return false;
-	
+
 	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
 
-	R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);	
+	R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 
 	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 		if (R2_GLOBALS._v565F6 == 1201) {
@@ -10624,41 +10624,41 @@ void Scene1800::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._sound1.play(116);
 	_stripManager.addSpeaker(&_quinnSpeaker);
 	_stripManager.addSpeaker(&_seekerSpeaker);
-	
+
 	if (R2_GLOBALS._sceneManager._previousScene == -1)
 		R2_GLOBALS._v565F6 = 1201;
-	
+
 	if (R2_GLOBALS._v565F6 == 1201)
 		_field412 = 2;
 	else
 		_field412 = 0;
-	
+
 	scalePalette(65, 65, 65);
 	_exit1.setDetails(Rect(0, 160, 319, 168), EXITCURSOR_S, 1800);
 	_item5.setDetails(Rect(0, 0, 320, 200), -1, -1, -1, -1, 1, NULL);
-	
+
 	_actor6.postInit();
 	_actor6.setup(1801, 4, 1);
 	_actor6.setPosition(Common::Point(170, 24));
 	_actor6.setDetails(1800, 13, 14, 15, 1, (SceneItem *) NULL);
-	
+
 	_actor7.postInit();
 	_actor7.setup(1801, 3, 1);
 	_actor7.setPosition(Common::Point(160, 139));
 	_actor7.setDetails(1800, 6, -1, -1, 1, (SceneItem *) NULL);
-	
+
 	_actor8.postInit();
 	_actor8.setup(1800, 1, 1);
 	_actor8.setPosition(Common::Point(110, 78));
 	_actor8.fixPriority(135);
 	_actor8.setDetails(1800, 20, -1, -1, 1, (SceneItem *) NULL);
-	
+
 	_actor9.postInit();
 	_actor9.setup(1800, 2, 1);
 	_actor9.setPosition(Common::Point(209, 78));
 	_actor9.fixPriority(135);
 	_actor9.setDetails(1800, 20, -1, -1, 1, (SceneItem *) NULL);
-	
+
 	_actor4.postInit();
 	if ((_field412 != 1) && (_field412 != 3) && (!R2_GLOBALS.getFlag(64)))
 		_actor4.setup(1801, 2, 1);
@@ -10666,7 +10666,7 @@ void Scene1800::postInit(SceneObjectList *OwnerList) {
 		_actor4.setup(1801, 2, 10);
 	_actor4.setPosition(Common::Point(76, 142));
 	_actor4.setDetails(1800, 3, -1, -1, 1, (SceneItem *) NULL);
-	
+
 	_actor5.postInit();
 	if ((_field412 != 1) && (_field412 != 3) && (!R2_GLOBALS.getFlag(64)))
 		_actor5.setup(1801, 1, 1);
@@ -10674,7 +10674,7 @@ void Scene1800::postInit(SceneObjectList *OwnerList) {
 		_actor5.setup(1801, 1, 10);
 	_actor5.setPosition(Common::Point(243, 142));
 	_actor5.setDetails(1800, 3, -1, -1, 1, (SceneItem *) NULL);
-	
+
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
@@ -10693,7 +10693,7 @@ void Scene1800::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._player.setVisage(1503);
 		R2_GLOBALS._player._moveDiff = Common::Point(2, 2);
 	}
-	
+
 	_actor2.postInit();
 	_actor2.animate(ANIM_MODE_1, NULL);
 	_actor2.setObjectWrapper(new SceneObjectWrapper());
@@ -10716,7 +10716,7 @@ void Scene1800::postInit(SceneObjectList *OwnerList) {
 		_actor2.setVisage(1503);
 		_actor2._moveDiff = Common::Point(2, 2);
 	}
-	
+
 	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));
@@ -10751,34 +10751,34 @@ void Scene1800::postInit(SceneObjectList *OwnerList) {
 			_actor2.setPosition(Common::Point(140, 160));
 		}
 	}
-	
+
 	_actor1.postInit();
 	_actor1.fixPriority(10);
 	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 		_actor1.setVisage(1111);
 	else
 		_actor1.setVisage(1110);
-	
+
 	_actor1._effect = 5;
 	_actor1._field9C = _field312;
 
 	R2_GLOBALS._player._linkedActor = &_actor1;
-	
+
 	_actor3.postInit();
 	_actor3.fixPriority(10);
 	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 		_actor3.setVisage(1110);
 	else
 		_actor3.setVisage(1111);
-	
+
 	_actor3._effect = 5;
 	_actor3._field9C = _field312;
-	
+
 	_actor2._linkedActor = &_actor3;
-	
+
 	R2_GLOBALS._player._characterScene[1] = 1800;
 	R2_GLOBALS._player._characterScene[2] = 1800;
-	
+
 	_item2.setDetails(Rect(128, 95, 190, 135), 1800, 10, -1, -1, 1, NULL);
 	_item1.setDetails(Rect(95, 3, 223, 135), 1800, 0, -1, -1, 1, NULL);
 
@@ -10786,7 +10786,7 @@ void Scene1800::postInit(SceneObjectList *OwnerList) {
 	// This is *wrong*. The following statement is a wild guess based on good common sense
 	_item3.setDetails(11, 1800, 23, 24, 25);
 	_item4.setDetails(Rect(0, 0, 320, 200), 1800, 17, -1, 19, 1, 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)) {
@@ -10822,7 +10822,7 @@ void Scene1800::postInit(SceneObjectList *OwnerList) {
 			setAction(&_sequenceManager, this, 1801, &R2_GLOBALS._player, &_actor2, NULL);
 		}
 	}
-	
+
 	R2_GLOBALS._player._oldCharacterScene[1] = 1800;
 	R2_GLOBALS._player._oldCharacterScene[2] = 1800;
 }
@@ -10956,7 +10956,7 @@ void Scene1800::saveCharacter(int characterIndex) {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 1850 - 
+ * Scene 1850 -
  *
  *--------------------------------------------------------------------------*/
 Scene1850::Scene1850() {
@@ -10970,7 +10970,7 @@ void Scene1850::synchronize(Serializer &s) {
 bool Scene1850::Hotspot2::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_USE)
 		return SceneHotspot::startAction(action, event);
-	
+
 	Scene1850 *scene = (Scene1850 *)R2_GLOBALS._sceneManager._scene;
 
 	R2_GLOBALS._player.disableControl();
@@ -10988,7 +10988,7 @@ bool Scene1850::Hotspot2::startAction(CursorType action, Event &event) {
 			scene->setAction(&scene->_sequenceManager1, scene, 1860, &R2_GLOBALS._player, &scene->_actor5, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager1, scene, 1859, &R2_GLOBALS._player, &scene->_actor5, NULL);
-		
+
 		R2_GLOBALS.clearFlag(30);
 	} else {
 		scene->_sceneMode = 1853;
@@ -10998,7 +10998,7 @@ bool Scene1850::Hotspot2::startAction(CursorType action, Event &event) {
 		else
 			scene->setAction(&scene->_sequenceManager1, scene, 1853, &R2_GLOBALS._player, NULL);
 	}
-	
+
 	return true;
 }
 
@@ -11009,10 +11009,10 @@ bool Scene1850::Actor5::startAction(CursorType action, Event &event) {
 	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();
 		scene->_sceneMode = 1857;
-		
+
 		if (R2_GLOBALS.getFlag(32))
 			scene->setAction(&scene->_sequenceManager1, scene, 1858, &R2_GLOBALS._player, &scene->_actor5, NULL);
 		else
@@ -11026,7 +11026,7 @@ bool Scene1850::Actor5::startAction(CursorType action, Event &event) {
 			SceneItem::display(1850, 2, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 		else
 			SceneItem::display(1850, 1, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
-		
+
 		return true;
 		break;
 	case R2_AIRBAG:
@@ -11046,7 +11046,7 @@ bool Scene1850::Actor5::startAction(CursorType action, Event &event) {
 			R2_GLOBALS._player.disableControl();
 			scene->_sceneMode = 1875;
 			scene->_actor2.postInit();
-			
+
 			if (R2_GLOBALS.getFlag(32))
 				scene->setAction(&scene->_sequenceManager1, scene, 1876, &R2_GLOBALS._player, &scene->_actor2, NULL);
 			else
@@ -11059,7 +11059,7 @@ bool Scene1850::Actor5::startAction(CursorType action, Event &event) {
 			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 			scene->_stripManager.start(557, scene);
 			R2_GLOBALS.setFlag(69);
-			
+
 			return true;
 		} else {
 			return SceneActor::startAction(action, event);
@@ -11074,7 +11074,7 @@ bool Scene1850::Actor5::startAction(CursorType action, Event &event) {
 			scene->_sceneMode = 1878;
 			scene->setAction(&scene->_sequenceManager1, scene, 1878, &R2_GLOBALS._player, &scene->_actor5, &scene->_actor2, NULL);
 		}
-		
+
 		return true;
 		break;
 	default:
@@ -11086,31 +11086,31 @@ bool Scene1850::Actor5::startAction(CursorType action, Event &event) {
 bool Scene1850::Actor6::startAction(CursorType action, Event &event) {
 	if (action != CURSOR_USE)
 		return SceneHotspot::startAction(action, event);
-	
+
 	Scene1850 *scene = (Scene1850 *)R2_GLOBALS._sceneManager._scene;
-	
+
 	if (R2_GLOBALS.getFlag(32)) {
 		SceneItem::display(3240, 4, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 		return true;
 	}
-	
+
 	R2_GLOBALS._player.disableControl();
 	if (scene->_field412 == 1851)
 		R2_GLOBALS._player._effect = 1;
-	
+
 	if (_position.x >= 160)
 		R2_GLOBALS.setFlag(29);
-	else 
+	else
 		R2_GLOBALS.clearFlag(29);
-	
+
 	if ((R2_GLOBALS._player._characterIndex == R2_SEEKER) && (R2_GLOBALS.getFlag(30))) {
 		if (_position.x >= 160)
 			scene->_field41E = 3;
 		else
 			scene->_field41E = 2;
-		
+
 		scene->_sceneMode = 1860;
-		
+
 		if (R2_GLOBALS.getFlag(32)) {
 			scene->setAction(&scene->_sequenceManager1, scene, 1860, &R2_GLOBALS._player, &scene->_actor5, NULL);
 		} else {
@@ -11136,13 +11136,13 @@ bool Scene1850::Actor8::startAction(CursorType action, Event &event) {
 
 	R2_GLOBALS._player.disableControl();
 	scene->_sceneMode = 1881;
-	
+
 	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);
 	}
-	
+
 	return true;
 }
 
@@ -11166,10 +11166,10 @@ void Scene1850::postInit(SceneObjectList *OwnerList) {
 
 	if (R2_GLOBALS._sceneManager._previousScene == 3150)
 		R2_GLOBALS._sound1.play(116);
-	
+
 	_stripManager.addSpeaker(&_quinnSpeaker);
 	_stripManager.addSpeaker(&_seekerSpeaker);
-	
+
 	_field418 = 0;
 	_field41E = 0;
 	_field41A = Common::Point(0, 0);
@@ -11192,7 +11192,7 @@ void Scene1850::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._walkRegions.enableRegion(1);
 
 	_actor5.postInit();
-	
+
 	if (R2_GLOBALS.getFlag(34)) {
 		R2_GLOBALS._walkRegions.enableRegion(2);
 		_actor5.setup(1851, 4, 3);
@@ -11371,7 +11371,7 @@ void Scene1850::postInit(SceneObjectList *OwnerList) {
 
 				R2_GLOBALS._player.setPosition(Common::Point(164, 106));
 			}
-		} 
+		}
 
 		R2_GLOBALS._player.enableControl();
 	} else { // R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] != 1850
@@ -11412,7 +11412,7 @@ void Scene1850::postInit(SceneObjectList *OwnerList) {
 	}
 
 	_actor8.fixPriority(113);
-	
+
 	if (R2_GLOBALS.getFlag(34)) {
 		_actor8.setDetails(1850, 25, -1, -1, 4, &_actor5);
 	} else {
@@ -11435,7 +11435,7 @@ void Scene1850::remove() {
 	R2_GLOBALS._scenePalette._palette[765] = 255;
 	R2_GLOBALS._scenePalette._palette[766] = 255;
 	R2_GLOBALS._scenePalette._palette[767] = 255;
-	
+
 	SceneExt::remove();
 }
 
@@ -11447,9 +11447,9 @@ void Scene1850::signal() {
 
 		_actor1._effect = 6;
 		_actor1._shade = 6;
-		
+
 		R2_GLOBALS._walkRegions.enableRegion(5);
-		
+
 		if (R2_GLOBALS.getFlag(68)) {
 			R2_GLOBALS._player.enableControl();
 		} else {
@@ -11495,7 +11495,7 @@ void Scene1850::signal() {
 			_palette1.loadPalette(1851);
 			_field412 = 1851;
 		}
-		
+
 		_field418 = 1;
 		if (R2_GLOBALS.getFlag(30)) {
 			_actor8.setAction(&_sequenceManager2, NULL, 1867, &_actor8, NULL);
@@ -11511,33 +11511,33 @@ void Scene1850::signal() {
 				R2_GLOBALS.setFlag(62);
 				R2_GLOBALS.setFlag(34);
 				R2_GLOBALS._walkRegions.enableRegion(2);
-				
+
 				_actor2.postInit();
 				_actor2.setDetails(1850, 6, -1, -1, 5, &_actor5);
-				
+
 				_sceneMode = 1879;
 
 				_actor8.setAction(&_sequenceManager2, this, 1879, &_actor5, &_actor8, &_actor2, NULL);
 		} else {
 			_actor8.setAction(&_sequenceManager2, NULL, 1867, &_actor8, 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 (_field412 == 1851)
 			_field416 = -20;
 		else
 			_field416 = 20;
-		
+
 		_field414 = 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 {
@@ -11546,7 +11546,7 @@ void Scene1850::signal() {
 		} else {
 			if (_sceneMode == 1879)
 				_sceneMode = 1855;
-			
+
 			if (R2_GLOBALS.getFlag(32)) {
 				setAction(&_sequenceManager1, NULL, 1874, &R2_GLOBALS._player, NULL);
 			} else {
@@ -11583,10 +11583,10 @@ void Scene1850::signal() {
 
 			PlayerMover *mover = new PlayerMover();
 			R2_GLOBALS._player.addMover(mover, &_field41A, this);
-			
+
 			_field41A = Common::Point(0, 0);
 		}
-		
+
 		switch (_field41E) {
 		case 1:
 			_sceneMode = 1853;
@@ -11608,7 +11608,7 @@ void Scene1850::signal() {
 		default:
 			break;
 		}
-		
+
 		_field41E = 0;
 		break;
 	case 1870:
@@ -11632,16 +11632,16 @@ void Scene1850::signal() {
 		} else {
 			_actor3.setDetails(1850, 30, -1, -1, 2, (SceneItem *)NULL);
 		}
-		
+
 		_actor4.postInit();
 		_actor4._effect = 6;
-		
+
 		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			_actor4.setDetails(1850, 29, -1, -1, 2, (SceneItem *)NULL);
 		} else {
 			_actor4.setDetails(1850, 28, -1, -1, 2, (SceneItem *)NULL);
 		}
-		
+
 		if (R2_GLOBALS.getFlag(31)) {
 			_actor3._shade = 0;
 			_actor4._shade = 0;
@@ -11649,12 +11649,12 @@ void Scene1850::signal() {
 			_actor3._shade = 6;
 			_actor4._shade = 6;
 		}
-			
+
 		R2_GLOBALS.clearFlag(30);
 		_sceneMode = 15;
 		setAction(&_sequenceManager1, this, 1869, &R2_GLOBALS._player, &_actor3, NULL);
 		setAction(&_sequenceManager2, this, 1868, &_actor1, &_actor4, NULL);
-		break;		
+		break;
 	case 1878:
 		R2_INVENTORY.setObjectScene(R2_REBREATHER_TANK, 1850);
 		R2_GLOBALS.setFlag(33);
@@ -11678,7 +11678,7 @@ void Scene1850::signal() {
 }
 
 void Scene1850::process(Event &event) {
-	if ( (event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_ARROW) 
+	if ( (event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_ARROW)
 		&& (R2_GLOBALS._player._characterIndex == R2_SEEKER) && (R2_GLOBALS.getFlag(30))) {
 		_field41A = event.mousePos;
 		R2_GLOBALS._player.disableControl();
@@ -11691,7 +11691,7 @@ void Scene1850::process(Event &event) {
 		R2_GLOBALS.clearFlag(32);
 		event.handled = true;
 	}
-	
+
 	Scene::process(event);
 }
 
@@ -11700,7 +11700,7 @@ void Scene1850::dispatch() {
 		_field414--;
 		if (_field414 == 0)
 			_field418 = 0;
-		
+
 		if (_field416 >= 0) {
 			R2_GLOBALS._player._shade = (_field414 * 6) / _field416;
 		} else {
@@ -11726,12 +11726,12 @@ void Scene1850::dispatch() {
 	if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1850) {
 		_actor2.setPosition(Common::Point(_actor8._position.x + 20, _actor8._position.y - 71));
 	}
-	
+
 	Scene::dispatch();
 }
 
 /*--------------------------------------------------------------------------
- * Scene 1875 - 
+ * Scene 1875 -
  *
  *--------------------------------------------------------------------------*/
 Scene1875::Actor1875::Actor1875() {
@@ -11821,7 +11821,7 @@ void Scene1875::Actor1875::subB8271(int indx) {
 void Scene1875::Actor1875::process(Event &event) {
 	if ((R2_GLOBALS._player._uiEnabled) || (event.handled))
 		return;
-	
+
 	Scene1875 *scene = (Scene1875 *)R2_GLOBALS._sceneManager._scene;
 
 	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == R2_STEPPING_DISKS) && (_bounds.contains(event.mousePos)) && (_fieldA6 == 0)) {
@@ -11841,7 +11841,7 @@ void Scene1875::Actor1875::process(Event &event) {
 		_fieldA6 = 1;
 		event.handled = true;
 	}
-	
+
 	if ((event.eventType == EVENT_BUTTON_UP) && (_fieldA6 != 0)) {
 		if ((_fieldA4 == 3) || (_fieldA4 == 4) || (_fieldA4 == 5)) {
 			setStrip(1);
@@ -11855,10 +11855,10 @@ void Scene1875::Actor1875::process(Event &event) {
 void Scene1875::postInit(SceneObjectList *OwnerList) {
 	loadScene(1875);
 	SceneExt::postInit();
-	
+
 	R2_GLOBALS._player._characterScene[1] = 1875;
 	R2_GLOBALS._player._characterScene[2] = 1875;
-	
+
 	_stripManager.addSpeaker(&_quinnSpeaker);
 	_stripManager.addSpeaker(&_seekerSpeaker);
 
@@ -11867,11 +11867,11 @@ void Scene1875::postInit(SceneObjectList *OwnerList) {
 	_actor6.subB8271(3);
 	_actor7.subB8271(4);
 	_actor8.subB8271(5);
-	
+
 	_actor1.postInit();
 	_actor1.setup(1855, 4, 1);
 	_actor1.setPosition(Common::Point(160, 116));
-	
+
 	R2_GLOBALS._player.postInit();
 	if (R2_GLOBALS._sceneManager._previousScene == 1625) {
 		R2_GLOBALS._sound1.play(122);
@@ -11885,10 +11885,10 @@ void Scene1875::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._player.enableControl();
 		R2_GLOBALS._player._canWalk = false;
 	}
-	
+
 	_item2.setDetails(Rect(43, 14, 275, 122), 1875, 9, 1, -1, 1, NULL);
 	_item1.setDetails(Rect(0, 0, 320, 200), 1875, 3, -1, -1, 1, NULL);
-	
+
 	R2_GLOBALS._player._characterScene[1] = 1875;
 	R2_GLOBALS._player._characterScene[2] = 1875;
 	R2_GLOBALS._player._oldCharacterScene[1] = 1875;
@@ -11930,7 +11930,7 @@ void Scene1875::signal() {
 
 void Scene1875::process(Event &event) {
 	Scene::process(event);
-	
+
 	_actor4.process(event);
 	_actor5.process(event);
 	_actor6.process(event);
@@ -11939,7 +11939,7 @@ void Scene1875::process(Event &event) {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 1900 - 
+ * Scene 1900 -
  *
  *--------------------------------------------------------------------------*/
 bool Scene1900::Actor2::startAction(CursorType action, Event &event) {
@@ -12005,11 +12005,11 @@ void Scene1900::postInit(SceneObjectList *OwnerList) {
 
 	if (R2_GLOBALS._sceneManager._previousScene != 1875)
 		R2_GLOBALS._sound1.play(200);
-	
+
 	_stripManager.setColors(60, 255);
 	_stripManager.setFontNumber(3);
 	_stripManager.addSpeaker(&_seekerSpeaker);
-	
+
 	_exit1.setDetails(Rect(0, 105, 14, 145), R2_COM_SCANNER, 2000);
 	_exit1.setDest(Common::Point(14, 135));
 
@@ -12027,7 +12027,7 @@ void Scene1900::postInit(SceneObjectList *OwnerList) {
 	else
 		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
 	R2_GLOBALS._player.disableControl();
-	
+
 	if (R2_GLOBALS._sceneManager._previousScene != 1925)
 		R2_GLOBALS.clearFlag(29);
 
@@ -12061,7 +12061,7 @@ void Scene1900::postInit(SceneObjectList *OwnerList) {
 		_object2.setPosition(Common::Point(223, 109));
 		_object2.fixPriority(80);
 	}
-	
+
 	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 1875) {
 		R2_GLOBALS._player._characterIndex = R2_QUINN;
 		_actor1.postInit();
@@ -12129,7 +12129,7 @@ void Scene1900::postInit(SceneObjectList *OwnerList) {
 		}
 		R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1900;
 	}
-	
+
 	_item2.setDetails(Rect(77, 2, 240, 103), 1900, 6, -1, -1, 1, NULL);
 	_item1.setDetails(Rect(0, 0, 320, 200), 1900, 3, -1, -1, 1, NULL);
 }
@@ -12242,17 +12242,17 @@ bool Scene1925::Hotspot3::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 1925;
 		scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, &R2_GLOBALS._player, &scene->_actor1, 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)) 
+	} 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)) 
+	} 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;
@@ -12415,7 +12415,7 @@ void Scene1925::postInit(SceneObjectList *OwnerList) {
 		_actor1.setDetails(1925, 0, 1, 2, 1, (SceneItem *) NULL);
 		_item2.setDetails(Rect(133, 68, 140, 77), 1925, 3, -1, 5, 1, NULL);
 	// No break on purpose
-	case -3: 
+	case -3:
 		_exit3.setDetails(Rect(83, 38, 128, 101), EXITCURSOR_W, 1925);
 	// No break on purpose
 	default:
@@ -12510,7 +12510,7 @@ void Scene1925::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 1945 - 
+ * Scene 1945 -
  *
  *--------------------------------------------------------------------------*/
 Scene1945::Scene1945() {
@@ -12588,7 +12588,7 @@ bool Scene1945::Hotspot4::startAction(CursorType action, Event &event) {
 		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);
 
@@ -12822,7 +12822,7 @@ void Scene1945::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 1950 - 
+ * Scene 1950 -
  *
  *--------------------------------------------------------------------------*/
 Scene1950::Area1::Area1() {
@@ -12831,7 +12831,7 @@ Scene1950::Area1::Area1() {
 }
 void Scene1950::Area1::synchronize(Serializer &s) {
 	SceneArea::synchronize(s);
-	
+
 	s.syncAsByte(_field20);
 	s.syncAsSint16LE(_fieldB65);
 }
@@ -12846,7 +12846,7 @@ Scene1950::Scene1950() {
 
 void Scene1950::synchronize(Serializer &s) {
 	SceneExt::synchronize(s);
-	
+
 	s.syncAsSint16LE(_field412);
 	s.syncAsSint16LE(_field414);
 	s.syncAsSint16LE(_field416);
@@ -12863,7 +12863,7 @@ Scene1950::Area1::Actor10::Actor10() {
 
 void Scene1950::Area1::Actor10::synchronize(Serializer &s) {
 	SceneActor::synchronize(s);
-	
+
 	s.syncAsSint16LE(_fieldA4);
 	s.syncAsSint16LE(_fieldA6);
 	s.syncAsSint16LE(_fieldA8);
@@ -12925,7 +12925,7 @@ void Scene1950::Area1::remove() {
 	SceneArea::remove();
 	R2_GLOBALS._insetUp--;
 	//
-	
+
 	if (!R2_GLOBALS.getFlag(37))
 		R2_GLOBALS._sound2.play(278);
 
@@ -12990,7 +12990,7 @@ void Scene1950::Area1::proc12(int visage, int stripFrameNum, int frameNum, int p
 	_areaActor.fixPriority(248);
 	scene->_exit3._enabled = false;
 	proc13(1950, 27, 28, 27);
-	
+
 	for (_fieldB65 = 0; _fieldB65 < 16; _fieldB65++)
 		_arrActor1[_fieldB65].init(_fieldB65);
 }
@@ -13068,7 +13068,7 @@ Scene1950::Actor8::Actor8() {
 
 void Scene1950::Actor8::synchronize(Serializer &s) {
 	SceneActor::synchronize(s);
-	
+
 	s.syncAsSint16LE(_fieldA4);
 	s.syncAsSint16LE(_fieldA6);
 	s.syncAsSint16LE(_fieldA8);
@@ -13111,7 +13111,7 @@ void Scene1950::Actor8::signal() {
 
 		_fieldA6 = _position.y -4;
 		setVisage(1961);
-		
+
 		if (R2_GLOBALS._v566A5 == 3)
 			setStrip(2);
 		else
@@ -13155,7 +13155,7 @@ void Scene1950::Actor8::signal() {
 		for (_fieldAF = 0; _fieldAF < 18; ++_fieldAF)
 			if (R2_GLOBALS._v56613[4 * _fieldAF] == 0)
 				++_fieldAE;
-		
+
 		if (_fieldAE == 18) {
 			R2_GLOBALS.setFlag(36);
 			_fieldAC = 23;
@@ -13197,14 +13197,14 @@ bool Scene1950::Actor8::startAction(CursorType action, Event &event) {
 
 	if ((R2_GLOBALS._v56613[(scene->_field41C - 1) * 4] == 0) || (action != R2_PHOTON_STUNNER))
 		return SceneActor::startAction(action, event);
-	
+
 	R2_GLOBALS._player.disableControl();
 
 	if (R2_GLOBALS._v56613[((scene->_field41C - 1) * 4) + 1] <= 1)
 		_fieldAC = 21;
 	else
 		_fieldAC = 20;
-	
+
 	R2_GLOBALS._player.setVisage(25);
 	if (R2_GLOBALS._v566A5 == 3)
 		R2_GLOBALS._player.setStrip(2);
@@ -13212,7 +13212,7 @@ bool Scene1950::Actor8::startAction(CursorType action, Event &event) {
 		R2_GLOBALS._player.setStrip(1);
 	R2_GLOBALS._player.animate(ANIM_MODE_5, this);
 	R2_GLOBALS._sound3.play(99);
-	
+
 	return true;
 }
 
@@ -13305,7 +13305,7 @@ void Scene1950::Exit6::changeScene() {
 			Common::Point pt(-20, 160);
 			NpcMover *mover = new NpcMover();
 			R2_GLOBALS._player.addMover(mover, &pt, scene);
-		} else { 
+		} else {
 			if (!R2_GLOBALS.getFlag(36))
 				SceneItem::display(1950, 33, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 			if ((R2_INVENTORY.getObjectScene(34) == 1950) || (R2_INVENTORY.getObjectScene(35) == 1950))
@@ -13612,7 +13612,7 @@ void Scene1950::subBDC1E() {
 	default:
 		break;
 	}
-	
+
 	if (R2_GLOBALS._v566A4 != 1)
 		R2_GLOBALS._walkRegions.load(1950);
 
@@ -13806,11 +13806,11 @@ void Scene1950::subBDC1E() {
 		R2_GLOBALS._walkRegions.enableRegion(13);
 		break;
 	}
-	
+
 	_object1.remove();
 	_object1.removeObject();
 	_actor1.remove();
-	
+
 	switch (R2_GLOBALS._v566A4 - 4) {
 	case 0:
 	// No break on purpose
@@ -13934,7 +13934,7 @@ void Scene1950::subBDC1E() {
 		_actor1.fixPriority(220);
 		break;
 	}
-	
+
 	switch (R2_GLOBALS._v566A4 - 3) {
 	case 0:
 	// No break on purpose
@@ -14162,7 +14162,7 @@ void Scene1950::subBE59B() {
 			_actor6.setFrame(1);
 		_actor6.setPosition(Common::Point(193, 158));
 		_actor6.setDetails(1950, 3, 4, 5, 2, (SceneItem *) NULL);
-		
+
 		_actor7.postInit();
 		_actor7.setVisage(1970);
 		_actor7.setStrip(3);
@@ -14172,7 +14172,7 @@ void Scene1950::subBE59B() {
 		_actor7.fixPriority(159);
 
 		_item2.setDetails(Rect(188, 124, 199, 133), 1950, 27, 28, -1, 2, NULL);
-		
+
 		if (R2_INVENTORY.getObjectScene(34) == 1950) {
 			_actor5.postInit();
 			_actor5.setVisage(1970);
@@ -14180,7 +14180,7 @@ void Scene1950::subBE59B() {
 			_actor5.setFrame(2);
 			_actor5.fixPriority(160);
 		}
-		
+
 		if (R2_GLOBALS.getFlag(37)) {
 			_actor5.setPosition(Common::Point(192, 118));
 			_actor5.setDetails(1950, 9, 4, -1, 2, (SceneItem *) NULL);
@@ -14193,11 +14193,11 @@ void Scene1950::subBE59B() {
 			_actor4.setPosition(Common::Point(192, 121));
 			_actor4.fixPriority(159);
 			_actor4.setDetails(1950, 6, 7, 8, 2, (SceneItem *) NULL);
-			
+
 			_actor5.setPosition(Common::Point(192, 109));
 			_actor5.setDetails(1950, 9, 7, 8, 2, (SceneItem *) NULL);
 		}
-		
+
 		_actor3.postInit();
 		_actor3.setVisage(1972);
 		_actor3.setStrip(1);
@@ -14208,7 +14208,7 @@ void Scene1950::subBE59B() {
 			_actor3.setFrame(2);
 		else
 			_actor3.setFrame(1);
-		
+
 		_field414 = 1;
 	} else if (_field414 != 0) {
 		_actor6.remove();
@@ -14219,7 +14219,7 @@ void Scene1950::subBE59B() {
 
 		_item1.setDetails(Rect(0, 0, 320, 200), 1950, 0, 1, 2, 2, NULL);
 	}
-	
+
 	switch (R2_GLOBALS._v566A5) {
 	case 0:
 		_sceneMode = 1950;
@@ -14263,7 +14263,7 @@ void Scene1950::subBE59B() {
 			_actor8.setStrip(2);
 			NpcMover *mover = new NpcMover();
 			_actor8.addMover(mover, &_field418, this);
-			
+
 			R2_GLOBALS._player.setPosition(Common::Point(-20, 160));
 			Common::Point pt2(30, 160);
 			NpcMover *mover2 = new NpcMover();
@@ -14311,11 +14311,11 @@ void Scene1950::subBE59B() {
 			R2_GLOBALS._v56AAB = 0;
 			R2_GLOBALS._player.enableControl(CURSOR_USE);
 			R2_GLOBALS._player._canWalk = false;
-			
+
 			_actor8.setStrip(1);
 			NpcMover *mover = new NpcMover();
 			_actor8.addMover(mover, &_field418, this);
-			
+
 			R2_GLOBALS._player.setPosition(Common::Point(340, 160));
 			Common::Point pt2(289, 160);
 			NpcMover *mover2 = new NpcMover();
@@ -14335,7 +14335,7 @@ void Scene1950::subBF4B4(int indx) {
 			si = 3;
 	} else
 		si = 4;
-	
+
 	if (_area1._arrActor1[si]._fieldA8 == 0) {
 		_area1._arrActor1[si].setFrame(2);
 		_area1._arrActor1[si]._fieldA8 = 1;
@@ -14343,14 +14343,14 @@ void Scene1950::subBF4B4(int indx) {
 		_area1._arrActor1[si].setFrame(1);
 		_area1._arrActor1[si]._fieldA8 = 0;
 	}
-	
+
 	si = indx + 1;
 	if ((indx / 4) == (si / 4)) {
 		if (si >  15)
 			si = 12;
 	} else
 		si -= 4;
-	
+
 	if (_area1._arrActor1[si]._fieldA8 == 0) {
 		_area1._arrActor1[si].setFrame(2);
 		_area1._arrActor1[si]._fieldA8 = 1;
@@ -14358,7 +14358,7 @@ void Scene1950::subBF4B4(int indx) {
 		_area1._arrActor1[si].setFrame(1);
 		_area1._arrActor1[si]._fieldA8 = 0;
 	}
-	
+
 	si = indx - 4;
 	if (si < 0)
 		si += 16;
@@ -14370,7 +14370,7 @@ void Scene1950::subBF4B4(int indx) {
 		_area1._arrActor1[si].setFrame(1);
 		_area1._arrActor1[si]._fieldA8 = 0;
 	}
-	
+
 	si = indx + 4;
 	if (si > 15)
 		si -= 16;
@@ -14395,7 +14395,7 @@ void Scene1950::subBF4B4(int indx) {
 	} else {
 		R2_GLOBALS.setFlag(37);
 		_sceneMode = 24;
-		// TODO: check if correct. The original doesn't countain a sceneActor in 
+		// TODO: check if correct. The original doesn't countain a sceneActor in
 		// this call, but it's extremely unusual
 		setAction(&_sequenceManager, this, 1976, NULL);
 	}
@@ -14408,45 +14408,45 @@ void Scene1950::postInit(SceneObjectList *OwnerList) {
 	_field41C = 0;
 	if (R2_GLOBALS._sceneManager._previousScene == 300)
 		R2_GLOBALS._v566A4 = 103;
-	
+
 	subBDC1E();
 	SceneExt::postInit();
 	R2_GLOBALS._sound1.play(105);
 
 	_exit1.setDetails(Rect(130, 46, 189, 135), SHADECURSOR_UP, 1950);
 	_exit1.setDest(Common::Point(160, 145));
-	
+
 	_exit2.setDetails(Rect(208, 0, 255, 73), EXITCURSOR_N, 1950);
 	_exit2.setDest(Common::Point(200, 151));
-	
+
 	_exit3.setDetails(Rect(305, 95, 320, 147), EXITCURSOR_E, 1950);
 	_exit3.setDest(Common::Point(312, 160));
-	
+
 	_exit4.setDetails(Rect(208, 99, 255, 143), EXITCURSOR_S, 1950);
 	_exit4.setDest(Common::Point(200, 151));
-	
+
 	_exit5.setDetails(Rect(113, 154, 206, 168), SHADECURSOR_DOWN, 1950);
 	_exit5.setDest(Common::Point(160, 165));
-	
+
 	_exit6.setDetails(Rect(0, 95, 14, 147), EXITCURSOR_W, 1950);
 	_exit6.setDest(Common::Point(7, 160));
-	
+
 	_exit7.setDetails(Rect(72, 54, 120, 128), EXITCURSOR_NW, 1950);
 	_exit7.setDest(Common::Point(120, 140));
-	
+
 	_exit8.setDetails(Rect(258, 60, 300, 145), EXITCURSOR_NE, 1950);
 	_exit8.setDest(Common::Point(268, 149));
-	
+
 	R2_GLOBALS._player.postInit();
-	if ( (R2_INVENTORY.getObjectScene(32) == 0) && (R2_INVENTORY.getObjectScene(33) == 0) 
+	if ( (R2_INVENTORY.getObjectScene(32) == 0) && (R2_INVENTORY.getObjectScene(33) == 0)
 		&& (R2_INVENTORY.getObjectScene(46) == 0) && (!R2_GLOBALS.getFlag(36)) )
 		R2_GLOBALS._player.setVisage(22);
 	else
 		R2_GLOBALS._player.setVisage(20);
-	
+
 	R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
 	_item1.setDetails(Rect(0, 0, 320, 200), 1950, 0, 1, 2, 1, NULL);
-	
+
 	subBE59B();
 }
 
@@ -14578,7 +14578,7 @@ void Scene1950::signal() {
 			R2_GLOBALS._player.setVisage(20);
 		else
 			R2_GLOBALS._player.setVisage(22);
-		
+
 		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 		Common::Point pt(218, 165);
 		NpcMover *mover = new NpcMover();
@@ -14593,7 +14593,7 @@ void Scene1950::signal() {
 			R2_GLOBALS._player.setVisage(20);
 		else
 			R2_GLOBALS._player.setVisage(22);
-		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);		
+		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 		break;
 	default:
 		R2_GLOBALS._v56AAB = 0;
@@ -14604,7 +14604,7 @@ void Scene1950::signal() {
 
 void Scene1950::process(Event &event) {
 	if ( (event.eventType == EVENT_BUTTON_DOWN)
-		&& (R2_GLOBALS._player._uiEnabled) 
+		&& (R2_GLOBALS._player._uiEnabled)
 		&& (R2_GLOBALS._events.getCursor() == R2_LIGHT_BULB)
 		&& (R2_GLOBALS._player._bounds.contains(event.mousePos))
 		&& (R2_INVENTORY.getObjectScene(31) == 0)) {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 5906030c5f..f65a89972d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -142,7 +142,7 @@ class Scene1200 : public SceneExt {
 		virtual void proc12(int visage, int stripFrameNum, int frameNum, int posX, int posY);
 		virtual void proc13(int resNum, int lookLineNum, int talkLineNum, int useLineNum);
 	};
-		
+
 public:
 	NamedHotspot _item1;
 	SceneActor _actor1;
@@ -567,7 +567,7 @@ class Scene1575 : public SceneExt {
 	public:
 		int _field34;
 		int _field36;
-		
+
 		Hotspot1();
 		void synchronize(Serializer &s);
 		void subA910D(int indx);
@@ -750,7 +750,7 @@ public:
 	Exit2 _exit2;
 	Exit3 _exit3;
 	SequenceManager _sequenceManager;
-	
+
 	int _field77A;
 	int _field77C;
 
@@ -772,7 +772,7 @@ class Scene1750 : public SceneExt {
 		int _fieldAA;
 		int _fieldAC;
 		int _fieldAE;
-		
+
 		Actor4();
 		virtual void synchronize(Serializer &s);
 		void subB1A76(int arg1, int arg2, int arg3, int arg4, int arg5);
@@ -782,11 +782,11 @@ class Scene1750 : public SceneExt {
 		virtual void process(Event &event);
 		virtual bool startAction(CursorType action, Event &event);
 	};
-	
+
 	class Actor5 : public SceneActor {
 	public:
 		int _fieldA4;
-		
+
 		Actor5();
 		virtual void synchronize(Serializer &s);
 
@@ -845,7 +845,7 @@ class Scene1800 : public SceneExt {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
-	
+
 	class Exit1 : public SceneExit {
 	public:
 		virtual void changeScene();
@@ -897,7 +897,7 @@ class Scene1850 : public SceneExt {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
-	
+
 public:
 	int _field412;
 	int _field414;
@@ -936,11 +936,11 @@ class Scene1875 : public SceneExt {
 	public:
 		int _fieldA4;
 		int _fieldA6;
-		
+
 		Actor1875();
 		void subB84AB();
 		void subB8271(int indx);
-		
+
 		void synchronize(Serializer &s);
 		virtual void process(Event &event);
 	};
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 5567519046..6a030e5b44 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -261,7 +261,7 @@ void Scene2000::initExits() {
 				_mazePlayerMode = 0;
 		} else if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 2350)
 			_mazePlayerMode = 1;
-		else 
+		else
 			_mazePlayerMode = 10;
 		R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 2000;
 		R2_GLOBALS._sceneManager._previousScene = 2000;
@@ -422,12 +422,12 @@ void Scene2000::Action1::signal() {
 		default:
 			break;
 		}
-		
+
 		if (R2_GLOBALS._v56605[3 + _state] == R2_GLOBALS._v56605[R2_GLOBALS._player._characterIndex])
 			scene->_objList1[_state].show();
 		else
 			scene->_objList1[_state].hide();
-		
+
 		signal();
 		break;
 	case 5: {
@@ -783,7 +783,7 @@ void Scene2000::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._sound1.play(200);
 	initExits();
 	g_globals->_sceneManager._fadeMode = FADEMODE_IMMEDIATE;
-	
+
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 
@@ -1003,9 +1003,9 @@ void Scene2000::signal() {
 }
 
 void Scene2000::process(Event &event) {
-	if ((R2_GLOBALS._player._canWalk) && (event.eventType == EVENT_BUTTON_DOWN) && 
+	if ((R2_GLOBALS._player._canWalk) && (event.eventType == EVENT_BUTTON_DOWN) &&
 			(R2_GLOBALS._events.getCursor() == CURSOR_CROSSHAIRS)) {
-		
+
 		Common::Point pt(event.mousePos.x, 129);
 		PlayerMover *mover = new PlayerMover();
 		R2_GLOBALS._player.addMover(mover, &pt, this);
@@ -1048,7 +1048,7 @@ bool Scene2350::Actor3::startAction(CursorType action, Event &event) {
 
 void Scene2350::ExitUp::changeScene() {
 	Scene2350 *scene = (Scene2350 *)R2_GLOBALS._sceneManager._scene;
-	
+
 	R2_GLOBALS._player.disableControl(CURSOR_CROSSHAIRS);
 	scene->_sceneMode = 12;
 	if (R2_GLOBALS._player._characterIndex == 1)
@@ -1056,7 +1056,7 @@ void Scene2350::ExitUp::changeScene() {
 	else
 		scene->setAction(&scene->_sequenceManager, scene, 2352, &R2_GLOBALS._player, NULL);
 }
-	
+
 void Scene2350::ExitWest::changeScene() {
 	Scene2350 *scene = (Scene2350 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1129,7 +1129,7 @@ void Scene2350::postInit(SceneObjectList *OwnerList) {
 		if (R2_GLOBALS._v56605[R2_GLOBALS._player._characterIndex] == 34) {
 			if (R2_GLOBALS._player._characterIndex == 1)
 				_sceneMode = 2351;
-			else 
+			else
 				_sceneMode = 2353;
 			setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		} else {
@@ -1147,7 +1147,7 @@ void Scene2350::postInit(SceneObjectList *OwnerList) {
 	}
 	R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 2350;
 }
-	
+
 void Scene2350::remove() {
 	R2_GLOBALS._sound1.fadeOut(NULL);
 	SceneExt::remove();
@@ -1189,7 +1189,7 @@ void Scene2350::signal() {
 }
 
 void Scene2350::process(Event &event) {
-	if ((R2_GLOBALS._player._canWalk) && (event.eventType != EVENT_BUTTON_DOWN) && 
+	if ((R2_GLOBALS._player._canWalk) && (event.eventType != EVENT_BUTTON_DOWN) &&
 			(R2_GLOBALS._events.getCursor() == CURSOR_CROSSHAIRS)){
 		Common::Point pt(event.mousePos.x, 129);
 		PlayerMover *mover = new PlayerMover();
@@ -1205,7 +1205,7 @@ void Scene2350::process(Event &event) {
  *--------------------------------------------------------------------------*/
 void Scene2400::Exit1::changeScene() {
 	Scene2400 *scene = (Scene2400 *)R2_GLOBALS._sceneManager._scene;
-	
+
 	R2_GLOBALS._player.disableControl();
 	scene->_sceneMode = 10;
 
@@ -1214,7 +1214,7 @@ void Scene2400::Exit1::changeScene() {
 	R2_GLOBALS._player.addMover(mover, &pt, scene);
 
 }
-	
+
 void Scene2400::Exit2::changeScene() {
 	Scene2400 *scene = (Scene2400 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1244,7 +1244,7 @@ void Scene2400::postInit(SceneObjectList *OwnerList) {
 		setAction(&_sequenceManager, this, 2401, &R2_GLOBALS._player, NULL);
 	}
 }
-	
+
 void Scene2400::signal() {
 	switch (_sceneMode) {
 	case 10:
@@ -1339,7 +1339,7 @@ bool Scene2425::Actor1::startAction(CursorType action, Event &event) {
 		}
 	} else if (R2_GLOBALS._events.getCursor() == R2_GUNPOWDER)
 		return false;
-	else 
+	else
 		return SceneActor::startAction(action, event);
 }
 
@@ -1405,7 +1405,7 @@ void Scene2425::postInit(SceneObjectList *OwnerList) {
 		_actor1.setup(2426, 1, 1);
 	else
 		_actor1.setup(2426, 1, 2);
-	
+
 	_actor1.setPosition(Common::Point(290, 9));
 	_actor1.fixPriority(20);
 	_actor1.setDetails(2455, 12, -1, -1, 1, (SceneItem *)NULL);
@@ -1511,7 +1511,7 @@ bool Scene2430::Actor3::startAction(CursorType action, Event &event) {
 
 void Scene2430::Exit1::changeScene() {
 	Scene2430 *scene = (Scene2430 *)R2_GLOBALS._sceneManager._scene;
-	
+
 	scene->_sceneMode = 0;
 	R2_GLOBALS._events.setCursor(R2_NEGATOR_GUN);
 	R2_GLOBALS._player.disableControl();
@@ -1790,7 +1790,7 @@ bool Scene2440::Actor2::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 2440;
 		scene->setAction(&scene->_sequenceManager, scene, 2440, &R2_GLOBALS._player, &scene->_actor2, NULL);
 		return true;
-	} 
+	}
 
 	return SceneActor::startAction(action, event);
 }
@@ -2296,7 +2296,7 @@ void Scene2455::postInit(SceneObjectList *OwnerList) {
 			_actor1.setup(2456, 3, 3);
 			_actor1.setPosition(Common::Point(162, 165));
 			_actor1.setDetails(2455, 15, 1, -1, 1, (SceneItem *)NULL);
-		}	
+		}
 	} else {
 		_actor3.postInit();
 		_actor3.setup(2456, 3, 1);
@@ -2309,9 +2309,9 @@ void Scene2455::postInit(SceneObjectList *OwnerList) {
 		_actor2.setup(2456, 3, 2);
 		_actor2.setDetails(2455, 9, 1, -1, 1, (SceneItem *)NULL);
 	} else {
-		if ((R2_INVENTORY.getObjectScene(50) != 2455) && (R2_INVENTORY.getObjectScene(49) != 2455)) 
+		if ((R2_INVENTORY.getObjectScene(50) != 2455) && (R2_INVENTORY.getObjectScene(49) != 2455))
 			_actor2.setup(2455, 1, 1);
-		else 
+		else
 			_actor2.setup(2456, 1, 1);
 		_actor2.setDetails(2455, 3, 1, -1, 1, (SceneItem *)NULL);
 	}
@@ -3679,7 +3679,7 @@ void Scene2700::process(Event &event) {
 					break;
 				}
 			}
-		} 
+		}
 	}
 	Scene::process(event);
 }
@@ -4184,7 +4184,7 @@ bool Scene2800::Actor1::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 10;
 		scene->setAction(&scene->_sequenceManager, scene, 2802, &R2_GLOBALS._player, &scene->_actor2, &scene->_actor1, NULL);
 		return true;
-	} else 
+	} else
 		return SceneActor::startAction(action, event);
 }
 
@@ -4432,7 +4432,7 @@ void Scene2800::postInit(SceneObjectList *OwnerList) {
 		_actor1.animate(ANIM_MODE_NONE, NULL);
 		_actor1.setDetails(2800, -1, -1, -1, 1, (SceneItem *)NULL);
 	}
-	
+
 	_item1.setDetails(Rect(0, 0, 320, 200), 2800, -1, -1, -1, 1, NULL);
 
 	_stripManager.setColors(60, 255);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 2b97cba8e9..3dd566c900 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -30,7 +30,7 @@ namespace TsAGE {
 namespace Ringworld2 {
 
 /*--------------------------------------------------------------------------
- * Scene 3100 - 
+ * Scene 3100 -
  *
  *--------------------------------------------------------------------------*/
 Scene3100::Scene3100() {
@@ -131,7 +131,7 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 		_guard.changeZoom(50);
 		_guard.setPosition(Common::Point(10, 149));
 		_guard.setDetails(3100, 6, -1, -1, 2, (SceneItem *)NULL);
-		
+
 		_actor4.postInit();
 		_actor4.setup(3103, 1, 1);
 		_actor4.setPosition(Common::Point(278, 113));
@@ -152,7 +152,7 @@ void Scene3100::postInit(SceneObjectList *OwnerList) {
 
 		R2_GLOBALS._sound1.play(243);
 	}
-	
+
 	R2_GLOBALS._player._oldCharacterScene[1] = 3100;
 }
 
@@ -322,7 +322,7 @@ void Scene3125::postInit(SceneObjectList *OwnerList) {
 	_actor4.setup(3126, 1, 1);
 	_actor4.setPosition(Common::Point(171, 160));
 	_actor4.fixPriority(201);
-	
+
 	_item3.setDetails(12, 3125, 9, 13, -1);
 	_item2.setDetails(11, 3125, 15, 13, -1);
 	_item1.setDetails(Rect(0, 0, 320, 200), 3125, 0, 1, 2, 1, NULL);
@@ -442,7 +442,7 @@ bool Scene3150::Actor4::startAction(CursorType action, Event &event) {
 	case CURSOR_USE:
 		if (R2_GLOBALS.getFlag(75))
 			return SceneActor::startAction(action, event);
-		
+
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 3151;
 		scene->setAction(&scene->_sequenceManager, scene, 3151, &R2_GLOBALS._player, &scene->_actor4, NULL);
@@ -504,7 +504,7 @@ bool Scene3150::Actor7::startAction(CursorType action, Event &event) {
 		scene->setAction(&scene->_sequenceManager, scene, 3160, &R2_GLOBALS._player, &scene->_actor7, NULL);
 		return true;
 	}
-	
+
 	return SceneActor::startAction(action, event);
 }
 
@@ -554,7 +554,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
 
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.disableControl();
-	
+
 	_actor2.postInit();
 	_actor2.setPosition(Common::Point(64, 139));
 	if (R2_GLOBALS.getFlag(78)) {
@@ -686,7 +686,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
 			_actor5.postInit();
 			_actor5._effect = 6;
 			_actor5._shade = 3;
-				
+
 			setAction(&_sequenceManager, this, 3156, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor5, NULL);
 		} else {
 			if (R2_GLOBALS._v56AA0 != 2)
@@ -1699,7 +1699,7 @@ void Scene3350::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3375 - 
+ * Scene 3375 -
  *
  *--------------------------------------------------------------------------*/
 Scene3375::Scene3375() {
@@ -1799,13 +1799,13 @@ bool Scene3375::Actor1::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	if (R2_GLOBALS._player._characterIndex == 2)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3304, scene);
-	
+
 	return true;
 }
 
@@ -1814,13 +1814,13 @@ bool Scene3375::Actor2::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	if (R2_GLOBALS._player._characterIndex == 3)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3301, scene);
-	
+
 	return true;
 }
 
@@ -1829,10 +1829,10 @@ bool Scene3375::Actor3::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	scene->_stripManager.start(3303, scene);
-	
+
 	return true;
 }
 
@@ -1841,7 +1841,7 @@ bool Scene3375::Actor4::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_USE)
 		return SceneActor::startAction(action, event);
-	
+
 	if (R2_GLOBALS._v56A9E != 0) {
 		R2_GLOBALS._walkRegions.disableRegion(2);
 		R2_GLOBALS._walkRegions.disableRegion(3);
@@ -1855,10 +1855,10 @@ bool Scene3375::Actor4::startAction(CursorType action, Event &event) {
 	R2_GLOBALS._walkRegions.disableRegion(8);
 
 	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
-	
+
 	scene->_sceneMode = 3375;
 	scene->setAction(&scene->_sequenceManager, scene, 3375, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL);
-	
+
 	return true;
 }
 
@@ -1944,10 +1944,10 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 	_field148A[1] = 3377;
 	_field148A[2] = 3375;
 	_field148A[3] = 3378;
-	
+
 	loadScene(_field148A[R2_GLOBALS._v56A9E]);
 	SceneExt::postInit();
-	
+
 	R2_GLOBALS._sound1.play(313);
 
 	_stripManager.setColors(60, 255);
@@ -1963,14 +1963,14 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 
 	setZoomPercents(126, 55, 200, 167);
 	R2_GLOBALS._player.postInit();
-	
+
 	if (R2_GLOBALS._player._characterIndex == 2) {
 		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
 	} else {
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 	}
 	R2_GLOBALS._player.changeZoom(-1);
-	
+
 	switch (R2_GLOBALS._player._characterIndex) {
 	case 2:
 		if (R2_GLOBALS._sceneManager._previousScene == 3385)
@@ -1991,7 +1991,7 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 			R2_GLOBALS._player.setup(10, 3, 1);
 		break;
 	}
-	
+
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 	R2_GLOBALS._player.disableControl();
 
@@ -2005,21 +2005,21 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 	}
 	_actor1.changeZoom(-1);
 	_actor1._effect = 1;
-	
+
 	int tmpStrip, tmpVisage;
 	if (R2_GLOBALS._sceneManager._previousScene == 3385)
 		tmpStrip = 1;
 	else
 		tmpStrip = 4;
-	
+
 	if (R2_GLOBALS._player._characterIndex == 2)
 		tmpVisage = 10;
 	else
 		tmpVisage = 20;
-	
+
 	_actor1.setup(tmpVisage, tmpStrip, 1);
 	_actor1.animate(ANIM_MODE_1, NULL);
-	
+
 	_actor2.postInit();
 	_actor2._moveDiff = Common::Point(3, 2);
 	_actor2.changeZoom(-1);
@@ -2033,10 +2033,10 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 		tmpVisage = 10;
 	else
 		tmpVisage = 30;
-	
+
 	_actor2.setup(tmpVisage, tmpStrip, 1);
 	_actor2.animate(ANIM_MODE_1, NULL);
-	
+
 	_actor3.postInit();
 	_actor3._moveRate = 7;
 	_actor3._moveDiff = Common::Point(5, 3);
@@ -2049,34 +2049,34 @@ void Scene3375::postInit(SceneObjectList *OwnerList) {
 
 	_actor3.setup(40, tmpStrip, 1);
 	_actor3.animate(ANIM_MODE_1, NULL);
-	
+
 	_actor2.setDetails(3375, -1, -1, -1, 1, (SceneItem *)NULL);
 	_actor3.setDetails(3375, 21, -1, -1, 1, (SceneItem *)NULL);
 	_actor1.setDetails(3375, -1, -1, -1, 1, (SceneItem *)NULL);
-	
+
 	_actor4.postInit();
 	_actor4.setup(3375, 1, 1);
 	_actor4.setPosition(Common::Point(254, 166));
 	_actor4.fixPriority(140);
 	_actor4.hide();
-	
+
 	_exit1.setDetails(Rect(0, 84, 24, 167), EXITCURSOR_W, 3375);
 	_exit1.setDest(Common::Point(65, 155));
 	_exit2.setDetails(Rect(103, 152, 183, 170), SHADECURSOR_DOWN, 3375);
 	_exit2.setDest(Common::Point(158, 151));
 	_exit3.setDetails(Rect(180, 75, 213, 132), EXITCURSOR_E, 3375);
 	_exit3.setDest(Common::Point(201, 131));
-		
+
 	for (int i = 0; i <= 12; ++i)
 		_itemArray[i].setDetails(i, 3375, 3, -1, -1);
-	
+
 	_item1.setDetails(Rect(0, 0, 320, 200), 3375, 0, -1, 1, 1, NULL);
 
 	if (R2_GLOBALS._sceneManager._previousScene == 3385)
 		_sceneMode = 3379;
 	else
 		_sceneMode = 0;
-	
+
 	subFC696(_sceneMode);
 }
 
@@ -2186,7 +2186,7 @@ void Scene3375::dispatch() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3385 - 
+ * Scene 3385 -
  *
  *--------------------------------------------------------------------------*/
 Scene3385::Scene3385() {
@@ -2204,13 +2204,13 @@ bool Scene3385::Actor1::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	if (R2_GLOBALS._player._characterIndex == 2)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3304, scene);
-	
+
 	return true;
 }
 
@@ -2219,13 +2219,13 @@ bool Scene3385::Actor2::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	if (R2_GLOBALS._player._characterIndex == 3)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3301, scene);
-	
+
 	return true;
 }
 
@@ -2234,10 +2234,10 @@ bool Scene3385::Actor3::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	scene->_stripManager.start(3303, scene);
-	
+
 	return true;
 }
 
@@ -2253,7 +2253,7 @@ bool Scene3385::Actor4::startAction(CursorType action, Event &event) {
 
 	scene->_sceneMode = 3386;
 	scene->setAction(&scene->_sequenceManager, scene, 3386, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL);
-	
+
 	return true;
 }
 
@@ -2303,21 +2303,21 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 
 	setZoomPercents(102, 40, 200, 160);
 	R2_GLOBALS._player.postInit();
-	
+
 	if (R2_GLOBALS._player._characterIndex == 2)
 		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
 	else
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 
 	R2_GLOBALS._player.changeZoom(-1);
-	
+
 	if (R2_GLOBALS._player._characterIndex == 2)
 		R2_GLOBALS._player.setup(20, _field11B2, 1);
 	else if (R2_GLOBALS._player._characterIndex == 3)
 		R2_GLOBALS._player.setup(30, _field11B2, 1);
 	else
 		R2_GLOBALS._player.setup(10, _field11B2, 1);
-	
+
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 	R2_GLOBALS._player.disableControl();
 
@@ -2337,7 +2337,7 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 		_actor1.setup(20, _field11B2, 1);
 	_actor1.animate(ANIM_MODE_1, NULL);
 	_actor1.setDetails(3385, -1, -1, -1, 1, (SceneItem *) NULL);
-	
+
 	_actor2.postInit();
 	_actor2._moveDiff = Common::Point(3, 2);
 	_actor2.changeZoom(-1);
@@ -2356,15 +2356,15 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 	_actor3.setup(40, _field11B2, 1);
 	_actor3.animate(ANIM_MODE_1, NULL);
 	_actor3.setDetails(3385, 15, -1, -1, 1, (SceneItem *) NULL);
-	
+
 	_exit1.setDetails(Rect(103, 152, 217, 170), SHADECURSOR_DOWN, 3395);
 	_exit1.setDest(Common::Point(158, 151));
-	
+
 	_actor4.postInit();
 	_actor4.setPosition(Common::Point(160, 100));
 	_actor4.fixPriority(90);
 	_actor4.setDetails(3385, 3, 4, -1, 1, (SceneItem *) NULL);
-	
+
 	if (R2_GLOBALS._sceneManager._previousScene == 3375) {
 		R2_GLOBALS._player.setPosition(Common::Point(158, 102));
 		_actor1.setPosition(Common::Point(164, 100));
@@ -2385,7 +2385,7 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 		_actor4.setup(3385, 1, 1);
 		_sceneMode = 3385;
 		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, &_actor1, &_actor2, &_actor3, NULL);
-	}	
+	}
 
 	_item1.setDetails(Rect(0, 0, 320, 200), 3385, 0, -1, -1, 1, NULL);
 	R2_GLOBALS._v56A9E = 0;
@@ -2418,7 +2418,7 @@ void Scene3385::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3395 - 
+ * Scene 3395 -
  *
  *--------------------------------------------------------------------------*/
 Scene3395::Scene3395() {
@@ -2436,13 +2436,13 @@ bool Scene3395::Actor1::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	if (R2_GLOBALS._player._characterIndex == 2)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3304, scene);
-	
+
 	return true;
 }
 
@@ -2451,13 +2451,13 @@ bool Scene3395::Actor2::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	if (R2_GLOBALS._player._characterIndex == 3)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3301, scene);
-	
+
 	return true;
 }
 
@@ -2466,10 +2466,10 @@ bool Scene3395::Actor3::startAction(CursorType action, Event &event) {
 
 	if (action != CURSOR_TALK)
 		return SceneActor::startAction(action, event);
-	
+
 	scene->_sceneMode = 9999;
 	scene->_stripManager.start(3303, scene);
-	
+
 	return true;
 }
 
@@ -2485,7 +2485,7 @@ bool Scene3395::Actor4::startAction(CursorType action, Event &event) {
 
 	scene->_sceneMode = 3396;
 	scene->setAction(&scene->_sequenceManager, scene, 3396, &R2_GLOBALS._player, &scene->_actor1, &scene->_actor2, &scene->_actor3, &scene->_actor4, NULL);
-	
+
 	return true;
 }
 
@@ -2523,21 +2523,21 @@ void Scene3395::postInit(SceneObjectList *OwnerList) {
 
 	setZoomPercents(51, 40, 200, 137);
 	R2_GLOBALS._player.postInit();
-	
+
 	if (R2_GLOBALS._player._characterIndex == 2)
 		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
 	else
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 
 	R2_GLOBALS._player.changeZoom(-1);
-	
+
 	if (R2_GLOBALS._player._characterIndex == 2)
 		R2_GLOBALS._player.setup(20, _field142E, 1);
 	else if (R2_GLOBALS._player._characterIndex == 3)
 		R2_GLOBALS._player.setup(30, _field142E, 1);
 	else
 		R2_GLOBALS._player.setup(10, _field142E, 1);
-	
+
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 	R2_GLOBALS._player.disableControl();
 
@@ -2576,7 +2576,7 @@ void Scene3395::postInit(SceneObjectList *OwnerList) {
 	_actor3.setup(40, _field142E, 1);
 	_actor3.animate(ANIM_MODE_1, NULL);
 	_actor3.setDetails(3385, 18, -1, -1, 1, (SceneItem *) NULL);
-	
+
 	_actor4.postInit();
 	_actor4.setPosition(Common::Point(159, 50));
 	_actor4.fixPriority(40);
@@ -2638,7 +2638,7 @@ void Scene3395::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3400 - 
+ * Scene 3400 -
  *
  *--------------------------------------------------------------------------*/
 Scene3400::Scene3400() {
@@ -2802,7 +2802,7 @@ void Scene3400::signal() {
 		_sceneMode = 3403;
 		if (R2_GLOBALS._player._characterIndex == 2)
 			setAction(&_sequenceManager, this, 3403, &R2_GLOBALS._player, &_actor3, &_actor7, NULL);
-		else 
+		else
 			setAction(&_sequenceManager, this, 3403, &_actor1, &_actor3, &_actor7, NULL);
 		break;
 	case 3309:
@@ -2811,7 +2811,7 @@ void Scene3400::signal() {
 		_sceneMode = 3405;
 		if (R2_GLOBALS._player._characterIndex == 3)
 			setAction(&_sequenceManager, this, 3405, &R2_GLOBALS._player, &_actor7, NULL);
-		else 
+		else
 			setAction(&_sequenceManager, this, 3405, &_actor2, &_actor7, NULL);
 		break;
 	case 3310:
@@ -2885,7 +2885,7 @@ void Scene3400::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3500 - 
+ * Scene 3500 -
  *
  *--------------------------------------------------------------------------*/
 Scene3500::Action1::Action1() {
@@ -2910,10 +2910,10 @@ void Scene3500::Action1::sub108670(int arg1) {
 	_field1E = arg1;
 	_field20 = 1;
 	_field24 = 1;
-	
+
 	scene->_actor9.setStrip(2);
 	scene->_actor9.show();
-	
+
 	if (_field1E == 1)
 		scene->_actor6.show();
 	else
@@ -2954,7 +2954,7 @@ void Scene3500::Action1::sub108732(int arg1) {
 		Common::Point pt(160, 73);
 		NpcMover *mover = new NpcMover();
 		scene->_actor8.addMover(mover, &pt, NULL);
-		
+
 		scene->_fieldB9E = 160 - (_field1E * 2 * 160);
 		Common::Point pt2(scene->_fieldB9E, 73);
 		NpcMover *mover2 = new NpcMover();
@@ -3153,7 +3153,7 @@ void Scene3500::sub107F71(int arg1) {
 			_action1.signal();
 		} else if (_action == 0) {
 			_action1.sub108670(1);
-			setAction(&_action1, &_actor1, NULL);			
+			setAction(&_action1, &_actor1, NULL);
 		}
 		break;
 	case 104:
@@ -3177,7 +3177,7 @@ void Scene3500::sub107F71(int arg1) {
 			_action1.signal();
 		} else if (_action == 0) {
 			_action1.sub108670(-1);
-			setAction(&_action1, &_actor1, NULL);			
+			setAction(&_action1, &_actor1, NULL);
 		}
 		break;
 	default:
@@ -3221,16 +3221,16 @@ void Scene3500::Action1::signal() {
 		int var4 = scene->_unkObj1.sub1097EF(scene->_field127C + 46) - 46;
 		int di = abs(var2 - scene->_field127A);
 		int var6 = abs(var4 - scene->_field127C);
-		
+
 		if ((scene->_actor1._frame % 2) != 0) {
 			scene->_actor1._frameChange = _field1E;
 			scene->_actor1.setFrame(scene->_actor1.changeFrame());
 		}
 
 		int var8 = (scene->_action1._field1E * 2 + scene->_field1276);
-		if (var8 > 7) 
+		if (var8 > 7)
 			var8 = 1;
-		else if (var8 < 1) 
+		else if (var8 < 1)
 			var8 = 7;
 
 		switch (var8) {
@@ -3293,7 +3293,7 @@ void Scene3500::Action1::signal() {
 		Common::Point pt(scene->_fieldAF8, 73);
 		NpcMover *mover = new NpcMover();
 		scene->_actor8.addMover(mover, &pt, this);
-		
+
 		scene->_actor9.setPosition(Common::Point(160 + ((_field1E * 2) * 160), 73));;
 		scene->_actor9._moveDiff.x = 160 - scene->_field126E;
 		scene->_fieldB9E = 160;
@@ -3315,7 +3315,7 @@ void Scene3500::Action1::signal() {
 		else
 			scene->_actor8.setStrip(2);
 		scene->_actor8.fixPriority(1);
-		
+
 		scene->_actor9.setPosition(Common::Point(-160, 73));
 		scene->_actor9.setStrip(9);
 		scene->_actor9.fixPriority(11);
@@ -3343,12 +3343,12 @@ void Scene3500::Action1::signal() {
 		// The following code allows the switch to work properly.
 		warning("Checkme: fix for dead code");
 		int var_8 = (_field1E * 2 + scene->_field1276);
-		if (var_8 > 7) 
+		if (var_8 > 7)
 			var_8 = 1;
-		else if (var_8 < 1) 
+		else if (var_8 < 1)
 			var_8 = 7;
 		//
-		
+
 		switch (var_8 - 1) {
 		case 0:
 		// No break on purpose
@@ -3378,7 +3378,7 @@ void Scene3500::Action1::signal() {
 		Common::Point pt(160, 73);
 		NpcMover *mover = new NpcMover();
 		scene->_actor8.addMover(mover, &pt, NULL);
-		
+
 		scene->_fieldB9E = 160 - (_field1E * 2 * 160);
 		Common::Point pt2(scene->_fieldB9E, 73);
 		NpcMover *mover2 = new NpcMover();
@@ -3419,7 +3419,7 @@ void Scene3500::Action1::dispatch() {
 	if ((_actionIndex == 1) && (scene->_field126E <= 4)) {
 		scene->_rotation->_idxChange = 0;
 		signal();
-	}	
+	}
 }
 
 void Scene3500::Action2::sub10831F(int arg1) {
@@ -3451,12 +3451,12 @@ void Scene3500::Action2::signal() {
 			scene->_fieldB9E = scene->_actor9._position.y;
 			di = scene->_fieldB9E;
 		}
-		
+
 		scene->_actor8._moveDiff.y = 9 - (scene->_field126E / 2);
 		Common::Point pt(si, 73 - (_field1E * 12));
 		NpcMover *mover = new NpcMover();
 		scene->_actor8.addMover(mover, &pt, NULL);
-		
+
 		scene->_actor9._moveDiff.y = 9 - (scene->_field126E / 2);
 		Common::Point pt2(di, 73 - (_field1E * 12));
 		NpcMover *mover2 = new NpcMover();
@@ -3474,7 +3474,7 @@ void Scene3500::Action2::signal() {
 			si = scene->_actor8._position.x;
 			di = scene->_actor9._position.x;
 		}
-		
+
 		scene->_actor7.sub1094ED();
 
 		scene->_actor8._moveDiff.y = 9 - (scene->_field126E / 2);
@@ -3486,7 +3486,7 @@ void Scene3500::Action2::signal() {
 		Common::Point pt2(di, 73);
 		NpcMover *mover2 = new NpcMover();
 		scene->_actor9.addMover(mover2, &pt2, NULL);
-		
+
 		scene->_actor3.setFrame2(2);
 		}
 		break;
@@ -3500,13 +3500,13 @@ bool Scene3500::Item4::startAction(CursorType action, Event &event) {
 
 	if (scene->_field1286 == 0)
 		return true;
-	
+
 	if (scene->_field1286 != 4)
 		return SceneHotspot::startAction(action, event);
-	
+
 	R2_GLOBALS._sound2.play(14);
 	scene->sub107F71(_field34);
-	
+
 	return true;
 }
 
@@ -3515,22 +3515,22 @@ void Scene3500::Actor7::process(Event &event) {
 
 	if (scene->_field1286 == 0)
 		return;
-	
+
 	if ((event.eventType == EVENT_BUTTON_DOWN) && (R2_GLOBALS._events.getCursor() == CURSOR_USE) && (_bounds.contains(event.mousePos))) {
 		_fieldAE = 1 + event.mousePos.y - _position.y;
 		event.eventType = EVENT_NONE;
 	}
-	
+
 	if ((event.eventType == EVENT_BUTTON_UP) && (_fieldAE != 0)) {
 		_fieldAE = 0;
 		event.handled = true;
 		if (scene->_action1._field24 == 0)
 			sub1094ED();
 	}
-	
+
 	if (_fieldAE == 0)
 		return;
-	
+
 	R2_GLOBALS._sound2.play(338);
 	event.handled = true;
 
@@ -3550,10 +3550,10 @@ bool Scene3500::Actor7::startAction(CursorType action, Event &event) {
 
 	if (scene->_field1286 == 0)
 		return true;
-	
+
 	if (scene->_field1286 == 4)
 		return false;
-	
+
 	return SceneActor::startAction(action, event);
 }
 
@@ -3586,7 +3586,7 @@ void Scene3500::postInit(SceneObjectList *OwnerList) {
 
 		if (tmpIndex > 254)
 			tmpIndex--;
-		
+
 		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];
@@ -3597,7 +3597,7 @@ void Scene3500::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._scenePalette._palette[(3 * i) + 1] = tmpPal[(3 * i) + 1];
 		R2_GLOBALS._scenePalette._palette[(3 * i) + 2] = tmpPal[(3 * i) + 2];
 	}
-	
+
 	_actor7.sub109466(38, 165, 16, 32, _field1270);
 	_actor7.setDetails(3500, 6, 7, -1, 1, (SceneItem *)NULL);
 	R2_GLOBALS._sound1.play(276);
@@ -3696,7 +3696,7 @@ void Scene3500::signal() {
 void Scene3500::process(Event &event) {
 	if (_field1286 == 0)
 		return;
-	
+
 	if (event.eventType == EVENT_KEYPRESS) {
 		switch (event.kbd.keycode) {
 		case Common::KEYCODE_1:
@@ -3765,7 +3765,7 @@ void Scene3500::process(Event &event) {
 			break;
 		}
 	}
-	
+
 	if (!event.handled)
 		_actor7.process(event);
 
@@ -3864,7 +3864,7 @@ void Scene3500::dispatch() {
 					var_a = abs(var_6 - di);
 					tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
 
-					if ( (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4)) && (di <= var_6) && (_field127C>= var_6)) 
+					if ( (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4)) && (di <= var_6) && (_field127C>= var_6))
 						|| (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5) || (tmpVar == 14) || (tmpVar == 15)) && (_field126E >= var_a) && (_field126E > 3) && (_action1._field24 != 0)) ) {
 						di = var_6;
 						if ((tmpVar != 25) && (tmpVar != 26) && (tmpVar != 5) && (tmpVar != 14) && (tmpVar == 15))
@@ -3894,7 +3894,7 @@ void Scene3500::dispatch() {
 			break;
 		case 2:
 			tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
-			if (  ((tmpVar == 12) || (tmpVar == 13) || (tmpVar == 11) || (tmpVar == 16) || (tmpVar == 31)) 
+			if (  ((tmpVar == 12) || (tmpVar == 13) || (tmpVar == 11) || (tmpVar == 16) || (tmpVar == 31))
 			  || (((tmpVar == 25) || (tmpVar == 23) || (tmpVar == 14) || (tmpVar == 5) || (tmpVar == 4)) && (var_a > 3)) ) {
 				R2_GLOBALS._sound2.play(339);
 				_rotation->_idxChange = 0;
@@ -4003,7 +4003,7 @@ void Scene3500::dispatch() {
 					var_6 = _unkObj1.sub1097EF(di + 46) - 46;
 					var_a = abs(di - var_6);
 					tmpVar = _unkObj1.sub109C09(Common::Point(var_field127A + 70, di + 46));
-					if ( (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5)) && (di >= var_6) && (_field127C <= var_6)) 
+					if ( (((tmpVar == 25) || (tmpVar == 26) || (tmpVar == 5)) && (di >= var_6) && (_field127C <= var_6))
 					  || (((tmpVar == 23) || (tmpVar == 24) || (tmpVar == 4) || (tmpVar == 14) || (tmpVar == 15)) && (_field126E >= var_a) && (_field126E <= 3) && (_action1._field24 != 0)) ){
 						if ((tmpVar != 23) && (tmpVar != 24) && (tmpVar != 4) && (tmpVar != 14) && (tmpVar != 15))
 							R2_GLOBALS._sound2.play(339);
@@ -4179,7 +4179,7 @@ void Scene3500::dispatch() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3600 - 
+ * Scene 3600 -
  *
  *--------------------------------------------------------------------------*/
 Scene3600::Scene3600() {
@@ -4227,7 +4227,7 @@ void Scene3600::Action3600::signal() {
 			R2_GLOBALS._sound2.fade(127, 5, 10, false, NULL);
 		}
 		setDelay(1);
-		warning("TODO: Palette fader using parameter 2 = 256"); 
+		warning("TODO: Palette fader using parameter 2 = 256");
 		R2_GLOBALS._scenePalette.fade((const byte *)&scene->_palette1._palette, true, _field20);
 		if (_field20 > 0)
 			_field20 -= 2;
@@ -4359,7 +4359,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) {
 		g_globals->gfxManager()._bounds.moveTo(Common::Point(160, 0));
 		R2_GLOBALS._v558B6.set(25, 0, 260, 200);
 	}
-	
+
 	loadScene(3600);
 	SceneExt::postInit();
 	_field254C = 0;
@@ -4502,7 +4502,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) {
 		_action1._field1E = 1;
 		_action1._field20 = 0;
 		_action1.setActionIndex(1);
-	
+
 		_actor3.setAction(&_action1);
 		_sceneMode = 3623;
 
@@ -4768,7 +4768,7 @@ void Scene3600::signal() {
 			R2_GLOBALS.setFlag(71);
 			_sceneMode = 3626;
 			setAction(&_sequenceManager1, this, 3626, &_actor13, NULL);
-		} 
+		}
 		break;
 	case 3624:
 		R2_GLOBALS._player.disableControl();
@@ -4946,7 +4946,7 @@ void Scene3700::signal() {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3800 - 
+ * Scene 3800 -
  *
  *--------------------------------------------------------------------------*/
 Scene3800::Scene3800() {
@@ -5227,7 +5227,7 @@ void Scene3800::postInit(SceneObjectList *OwnerList) {
 	_field412 = 0;
 
 	initScene3800();
-	
+
 	SceneExt::postInit();
 	R2_GLOBALS._sound1.play(231);
 
@@ -5338,7 +5338,7 @@ void Scene3800::process(Event &event) {
 }
 
 /*--------------------------------------------------------------------------
- * Scene 3900 - 
+ * Scene 3900 -
  *
  *--------------------------------------------------------------------------*/
 void Scene3900::Exit1::changeScene() {
@@ -5350,7 +5350,7 @@ void Scene3900::Exit1::changeScene() {
 	R2_GLOBALS._v566AA = 1;
 	R2_GLOBALS._v566A8 = 1;
 	scene->_sceneMode = 14;
-	
+
 	Common::Point pt(160, 115);
 	NpcMover *mover = new NpcMover();
 	R2_GLOBALS._player.addMover(mover, &pt, scene);
@@ -5365,7 +5365,7 @@ void Scene3900::Exit2::changeScene() {
 	R2_GLOBALS._v566AA = 2;
 	R2_GLOBALS._v566A8 = 1;
 	scene->_sceneMode = 14;
-	
+
 	Common::Point pt(330, 145);
 	NpcMover *mover = new NpcMover();
 	R2_GLOBALS._player.addMover(mover, &pt, scene);
@@ -5380,7 +5380,7 @@ void Scene3900::Exit3::changeScene() {
 	R2_GLOBALS._v566AA = 3;
 	R2_GLOBALS._v566A8 = 1;
 	scene->_sceneMode = 14;
-	
+
 	Common::Point pt(160, 220);
 	NpcMover *mover = new NpcMover();
 	R2_GLOBALS._player.addMover(mover, &pt, scene);
@@ -5395,7 +5395,7 @@ void Scene3900::Exit4::changeScene() {
 	R2_GLOBALS._v566AA = 4;
 	R2_GLOBALS._v566A8 = 1;
 	scene->_sceneMode = 14;
-	
+
 	Common::Point pt(-10, 145);
 	NpcMover *mover = new NpcMover();
 	R2_GLOBALS._player.addMover(mover, &pt, scene);
@@ -5407,7 +5407,7 @@ void Scene3900::Exit5::changeScene() {
 	_enabled = false;
 	R2_GLOBALS._player.disableControl(CURSOR_ARROW);
 	scene->_sceneMode = 13;
-	
+
 	if (R2_GLOBALS._v566A9 == 4) {
 		Common::Point pt(-10, 135);
 		NpcMover *mover = new NpcMover();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 6088c88479..44787b9eef 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -494,7 +494,7 @@ public:
 	Exit1 _exit1;
 	Action1 _action1;
 	SequenceManager _sequenceManager;
-	
+
 	int _field11B2;
 
 	Scene3385();
@@ -536,7 +536,7 @@ public:
 	Actor4 _actor4;
 	Action1 _action1;
 	SequenceManager _sequenceManager;
-	
+
 	int _field142E;
 
 	Scene3395();
@@ -600,10 +600,10 @@ class Scene3500 : public SceneExt {
 	class Item4 : public NamedHotspot {
 	public:
 		int _field34;
-		
+
 		Item4();
 		virtual void synchronize(Serializer &s);
-		
+
 		virtual bool startAction(CursorType action, Event &event);
 	};
 
@@ -615,7 +615,7 @@ class Scene3500 : public SceneExt {
 		int _fieldAA;
 		int _fieldAC;
 		int _fieldAE;
-		
+
 		Actor7();
 		virtual void synchronize(Serializer &s);
 
@@ -695,7 +695,7 @@ class Scene3600 : public SceneExt {
 	class Action3600: public ActionExt {
 	public:
 		int _field1E, _field20;
-		
+
 		Action3600();
 		virtual void synchronize(Serializer &s);
 		virtual void signal();
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index f729881e8f..da1449efdf 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -159,7 +159,7 @@ void VisualSpeaker::setText(const Common::String &msg) {
 	if (s.empty())
 		_numFrames = 0;
 
-	
+
 	if (_fieldF6) {
 		if ((R2_GLOBALS._speechSubtitles & SPEECH_TEXT) || !_soundId)
 			_sceneText.hide();
@@ -229,7 +229,7 @@ void SpeakerCaptain3210::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -285,7 +285,7 @@ void SpeakerChief1100::proc15() {
 		_object1.setPosition(_object2->_position);
 		_object1._numFrames = 7;
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -342,7 +342,7 @@ void SpeakerGuard2800::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -382,7 +382,7 @@ void SpeakerJocko3200::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -405,7 +405,7 @@ void SpeakerJocko3220::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -428,7 +428,7 @@ void SpeakerJocko3230::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -442,7 +442,7 @@ void SpeakerJocko3230::proc15() {
 }
 
 //----------------------------------------------------------------------------
-// Classes related to MIRANDA 
+// Classes related to MIRANDA
 //----------------------------------------------------------------------------
 
 SpeakerMiranda::SpeakerMiranda(): VisualSpeaker() {
@@ -472,7 +472,7 @@ void SpeakerMiranda300::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -507,7 +507,7 @@ void SpeakerMiranda1625::proc15() {
 		_object1.postInit();
 		_object1.setPosition(Common::Point(196, 65));
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -547,7 +547,7 @@ void SpeakerMiranda3375::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) 
+		if (R2_GLOBALS._player._characterIndex == 3)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor2;
@@ -558,7 +558,7 @@ void SpeakerMiranda3375::proc15() {
 		_object1._numFrames = 7;
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
-		
+
 		if (scene->_actor1._position.y != 163)
 			R2_GLOBALS._player.setStrip(8);
 		else
@@ -574,7 +574,7 @@ void SpeakerMiranda3375::proc15() {
 		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
-	
+
 
 	switch (v) {
 	case 0:
@@ -597,7 +597,7 @@ void SpeakerMiranda3385::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) 
+		if (R2_GLOBALS._player._characterIndex == 3)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor2;
@@ -608,7 +608,7 @@ void SpeakerMiranda3385::proc15() {
 		_object1._numFrames = 7;
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
-		
+
 		if (R2_GLOBALS._sceneManager._previousScene == 3375)
 			R2_GLOBALS._player.setStrip(4);
 		else
@@ -623,7 +623,7 @@ void SpeakerMiranda3385::proc15() {
 		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
-	
+
 
 	switch (v) {
 	case 0:
@@ -646,7 +646,7 @@ void SpeakerMiranda3395::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) 
+		if (R2_GLOBALS._player._characterIndex == 3)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor2;
@@ -657,7 +657,7 @@ void SpeakerMiranda3395::proc15() {
 		_object1._numFrames = 7;
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
-		
+
 		if (R2_GLOBALS._sceneManager._previousScene == 3385)
 			R2_GLOBALS._player.setStrip(4);
 		else
@@ -673,7 +673,7 @@ void SpeakerMiranda3395::proc15() {
 		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
-	
+
 
 	switch (v) {
 	case 0:
@@ -696,7 +696,7 @@ void SpeakerMiranda3400::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) 
+		if (R2_GLOBALS._player._characterIndex == 3)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor2;
@@ -740,7 +740,7 @@ void SpeakerMiranda3600::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) 
+		if (R2_GLOBALS._player._characterIndex == 3)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor12;
@@ -858,7 +858,7 @@ void SpeakerNej2700::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -893,7 +893,7 @@ void SpeakerNej2750::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -925,7 +925,7 @@ void SpeakerNej2800::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1002,7 +1002,7 @@ void SpeakerPrivate3210::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1047,7 +1047,7 @@ void SpeakerProtector3600::proc15() {
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1107,7 +1107,7 @@ void SpeakerQuinn300::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1122,7 +1122,7 @@ void SpeakerQuinn300::proc15() {
 		_object1.animate(ANIM_MODE_6, this);
 	} else {
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		
+
 		switch (_object2->_visage) {
 		case 10:
 			_object1.setup((v - 1) / 4 + 4010, ((v - ((v - 1) / 4 * 4) - 1) % 8) * 2 + 1, 1);
@@ -1158,7 +1158,7 @@ void SpeakerQuinn1100::proc15() {
 		_object1.setPosition(_object2->_position);
 		_object1._numFrames = 7;
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1250,7 +1250,7 @@ void SpeakerQuinn2700::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1281,7 +1281,7 @@ void SpeakerQuinn2750::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1312,7 +1312,7 @@ void SpeakerQuinn2800::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1371,9 +1371,9 @@ void SpeakerQuinn3375::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1) 
+		if (R2_GLOBALS._player._characterIndex == 1)
 			_object2 = &R2_GLOBALS._player;
-		else if (R2_GLOBALS._player._characterIndex == 2) 
+		else if (R2_GLOBALS._player._characterIndex == 2)
 			_object2 = &scene->_actor1;
 		else
 			_object2 = &scene->_actor2;
@@ -1384,7 +1384,7 @@ void SpeakerQuinn3375::proc15() {
 		_object1._numFrames = 7;
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
-		
+
 		if (scene->_actor1._position.y != 163)
 			R2_GLOBALS._player.setStrip(8);
 		else
@@ -1399,7 +1399,7 @@ void SpeakerQuinn3375::proc15() {
 		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
-	
+
 
 	switch (v) {
 	case 0:
@@ -1422,9 +1422,9 @@ void SpeakerQuinn3385::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1) 
+		if (R2_GLOBALS._player._characterIndex == 1)
 			_object2 = &R2_GLOBALS._player;
-		else if (R2_GLOBALS._player._characterIndex == 2) 
+		else if (R2_GLOBALS._player._characterIndex == 2)
 			_object2 = &scene->_actor1;
 		else
 			_object2 = &scene->_actor2;
@@ -1435,7 +1435,7 @@ void SpeakerQuinn3385::proc15() {
 		_object1._numFrames = 7;
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
-		
+
 		if (R2_GLOBALS._sceneManager._previousScene == 3375)
 			R2_GLOBALS._player.setStrip(4);
 		else
@@ -1450,7 +1450,7 @@ void SpeakerQuinn3385::proc15() {
 		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
-	
+
 
 	switch (v) {
 	case 0:
@@ -1477,9 +1477,9 @@ void SpeakerQuinn3395::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1) 
+		if (R2_GLOBALS._player._characterIndex == 1)
 			_object2 = &R2_GLOBALS._player;
-		else if (R2_GLOBALS._player._characterIndex == 2) 
+		else if (R2_GLOBALS._player._characterIndex == 2)
 			_object2 = &scene->_actor1;
 		else
 			_object2 = &scene->_actor2;
@@ -1490,7 +1490,7 @@ void SpeakerQuinn3395::proc15() {
 		_object1._numFrames = 7;
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
-		
+
 		if (R2_GLOBALS._sceneManager._previousScene == 3385)
 			R2_GLOBALS._player.setStrip(4);
 		else
@@ -1505,7 +1505,7 @@ void SpeakerQuinn3395::proc15() {
 		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
-	
+
 
 	switch (v) {
 	case 0:
@@ -1532,9 +1532,9 @@ void SpeakerQuinn3400::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1) 
+		if (R2_GLOBALS._player._characterIndex == 1)
 			_object2 = &R2_GLOBALS._player;
-		else if (R2_GLOBALS._player._characterIndex == 2) 
+		else if (R2_GLOBALS._player._characterIndex == 2)
 			_object2 = &scene->_actor1;
 		else
 			_object2 = &scene->_actor2;
@@ -1581,7 +1581,7 @@ void SpeakerQuinn3600::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1) 
+		if (R2_GLOBALS._player._characterIndex == 1)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor10;
@@ -1736,7 +1736,7 @@ void SpeakerRalf3245::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1788,7 +1788,7 @@ void SpeakerRocko3200::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1811,7 +1811,7 @@ void SpeakerRocko3220::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1834,7 +1834,7 @@ void SpeakerRocko3230::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1879,7 +1879,7 @@ void SpeakerSeeker300::proc15() {
 		_object1.fixPriority(140);
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1918,7 +1918,7 @@ void SpeakerSeeker1100::proc15() {
 		_object1.setPosition(_object2->_position);
 		_object1._numFrames = 7;
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -1974,7 +1974,7 @@ void SpeakerSeeker1900::proc15() {
 		_object1.setPosition(_object2->_position);
 		_object1._numFrames = 7;
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -2045,7 +2045,7 @@ void SpeakerSeeker3375::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2) 
+		if (R2_GLOBALS._player._characterIndex == 2)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor1;
@@ -2056,7 +2056,7 @@ void SpeakerSeeker3375::proc15() {
 		_object1._numFrames = 7;
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
-		
+
 		if (scene->_actor1._position.y != 163)
 			R2_GLOBALS._player.setStrip(8);
 		else
@@ -2071,7 +2071,7 @@ void SpeakerSeeker3375::proc15() {
 		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
-	
+
 
 	switch (v) {
 	case 0:
@@ -2094,7 +2094,7 @@ void SpeakerSeeker3385::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2) 
+		if (R2_GLOBALS._player._characterIndex == 2)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor1;
@@ -2105,7 +2105,7 @@ void SpeakerSeeker3385::proc15() {
 		_object1._numFrames = 7;
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
-		
+
 		if (R2_GLOBALS._sceneManager._previousScene == 3375)
 			R2_GLOBALS._player.setStrip(4);
 		else
@@ -2120,7 +2120,7 @@ void SpeakerSeeker3385::proc15() {
 		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
-	
+
 
 	switch (v) {
 	case 0:
@@ -2143,7 +2143,7 @@ void SpeakerSeeker3395::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2) 
+		if (R2_GLOBALS._player._characterIndex == 2)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor1;
@@ -2154,7 +2154,7 @@ void SpeakerSeeker3395::proc15() {
 		_object1._numFrames = 7;
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
-		
+
 		if (R2_GLOBALS._sceneManager._previousScene == 3385)
 			R2_GLOBALS._player.setStrip(4);
 		else
@@ -2169,7 +2169,7 @@ void SpeakerSeeker3395::proc15() {
 		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
-	
+
 
 	switch (v) {
 	case 0:
@@ -2192,7 +2192,7 @@ void SpeakerSeeker3400::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2) 
+		if (R2_GLOBALS._player._characterIndex == 2)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor1;
@@ -2251,7 +2251,7 @@ void SpeakerSeeker3600::proc15() {
 	int v = _fieldF6;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2) 
+		if (R2_GLOBALS._player._characterIndex == 2)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor11;
@@ -2394,7 +2394,7 @@ void SpeakerSocko3200::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -2434,7 +2434,7 @@ void SpeakerSoldier300::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -2478,7 +2478,7 @@ void SpeakerTeal300::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -2502,7 +2502,7 @@ void SpeakerTeal1625::proc15() {
 		_object1.postInit();
 		_object1.setPosition(Common::Point(68, 68));
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -2525,7 +2525,7 @@ void SpeakerTeal3240::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -2677,7 +2677,7 @@ void SpeakerTomko3245::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -2729,7 +2729,7 @@ void SpeakerWebbster3240::proc15() {
 		_object1.postInit();
 		_object1.setPosition(_object2->_position);
 
-		if (_object2->_mover) 
+		if (_object2->_mover)
 			_object2->addMover(NULL);
 	}
 
@@ -2755,7 +2755,7 @@ void SpeakerWebbster3375::proc15() {
 		_object1._numFrames = 7;
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
-		
+
 		if (scene->_actor1._position.y != 163)
 			R2_GLOBALS._player.setStrip(8);
 		else
@@ -2799,7 +2799,7 @@ void SpeakerWebbster3385::proc15() {
 		_object1._numFrames = 7;
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
-		
+
 		if (R2_GLOBALS._sceneManager._previousScene == 3375)
 			R2_GLOBALS._player.setStrip(4);
 		else
@@ -2843,7 +2843,7 @@ void SpeakerWebbster3395::proc15() {
 		_object1._numFrames = 7;
 		_object1._effect = 1;
 		_object1.changeZoom(-1);
-		
+
 		if (R2_GLOBALS._sceneManager._previousScene == 3385)
 			R2_GLOBALS._player.setStrip(4);
 		else
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index c091afe34c..0756d71d4c 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -240,7 +240,7 @@ void SceneManager::listenerSynchronize(Serializer &s) {
 
 	if (s.isLoading()) {
 		changeScene(_sceneNumber);
-		
+
 		if (_nextSceneNumber != -1) {
 			sceneChange();
 			_nextSceneNumber = -1;
@@ -317,7 +317,7 @@ void Scene::loadSceneData(int sceneNum) {
 	_activeScreenNumber = sceneNum;
 
 	if (g_vm->getGameID() == GType_Ringworld2) {
-		// Most scenes in Ringworld 2 don't have a scene size resource, but rather just have 
+		// Most scenes in Ringworld 2 don't have a scene size resource, but rather just have
 		// a standard 320x200 size. Only read the scene size data for the specific few scenes
 		switch (sceneNum) {
 		case 700:
@@ -457,7 +457,7 @@ void Scene::refreshBackground(int xAmount, int yAmount) {
 						Rect destBounds(xSectionDest * 160, ySectionDest * 100,
 								(xSectionDest + 1) * 160, (ySectionDest + 1) * 100);
 						if (g_vm->getGameID() != GType_Ringworld) {
-							// For Blue Force and Return to Ringworld, if the scene has an interface area, 
+							// For Blue Force and Return to Ringworld, if the scene has an interface area,
 							// exclude it from the copy
 							srcBounds.bottom = MIN<int16>(srcBounds.bottom, BF_GLOBALS._interfaceY);
 							destBounds.bottom = MIN<int16>(destBounds.bottom, BF_GLOBALS._interfaceY);
diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index c254565aca..a273ec2a0b 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -400,8 +400,8 @@ const byte k5A4D6[] = {
 const byte k5A72E[] = {0,  98, 135, 183, 229, 81, 133, 185, 235, 75, 131, 187, 241, 70,  129, 190, 247};
 const byte k5A73F[] = {0,  42, 42,  42,  42,  67, 67,  67,  67,  92, 92,  92,  92,  116, 116, 116, 116};
 const byte k5A750[] = {
-	9, 10, 7, 13, 7, 8, 9,  7, 9, 10, 
-	2, 3,  3, 2,  2, 2, 4,  3, 3, 4, 
+	9, 10, 7, 13, 7, 8, 9,  7, 9, 10,
+	2, 3,  3, 2,  2, 2, 4,  3, 3, 4,
 	3, 2,  3, 4,  3, 8, 10, 4, 0
 };
 const byte k5A76D[] = {
diff --git a/engines/tsage/user_interface.cpp b/engines/tsage/user_interface.cpp
index ca9fddc6ce..10cb6961dc 100644
--- a/engines/tsage/user_interface.cpp
+++ b/engines/tsage/user_interface.cpp
@@ -316,7 +316,7 @@ void UIElements::synchronize(Serializer &s) {
 }
 
 void UIElements::process(Event &event) {
-	if (_clearScreen && GLOBALS._player._enabled && 
+	if (_clearScreen && GLOBALS._player._enabled &&
 			((g_vm->getGameID() != GType_BlueForce) || (GLOBALS._sceneManager._sceneNumber != 50))) {
 		if (_bounds.contains(event.mousePos)) {
 			// Cursor inside UI area
-- 
cgit v1.2.3


From 273df3c075ef321ae304f2ab2d26e35111480797 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 25 Feb 2012 19:03:38 +0100
Subject: KYRA: Remove obsolete registering of 16_color config file entry.

---
 engines/kyra/kyra_lok.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index 4ea686ae39..ece4a0daba 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -960,9 +960,6 @@ void KyraEngine_LoK::registerDefaultSettings() {
 	// Most settings already have sensible defaults. This one, however, is
 	// specific to the Kyra engine.
 	ConfMan.registerDefault("walkspeed", 2);
-
-	if (_flags.platform == Common::kPlatformPC98 && _flags.useHiRes)
-		ConfMan.registerDefault("16_color", false);
 }
 
 void KyraEngine_LoK::readSettings() {
-- 
cgit v1.2.3


From d5127d49ee50e9b3cfb8bcc6643dfb81b49ca96b Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Feb 2012 17:29:45 +1100
Subject: TSAGE: Implemented the initial loading logic for R2R animation player

---
 engines/tsage/core.cpp                          |   6 +-
 engines/tsage/core.h                            |   2 +-
 engines/tsage/globals.cpp                       |   2 +
 engines/tsage/globals.h                         |   1 +
 engines/tsage/ringworld2/ringworld2_logic.cpp   | 120 ++++++++++++++++++++----
 engines/tsage/ringworld2/ringworld2_logic.h     |  50 ++++++++--
 engines/tsage/ringworld2/ringworld2_scenes0.cpp |  10 +-
 engines/tsage/tsage.h                           |   3 +-
 8 files changed, 158 insertions(+), 36 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index c2ce426052..0a8c4ef1b4 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1354,13 +1354,15 @@ void ScenePalette::setEntry(int index, uint r, uint g, uint b) {
  * @param g			G component
  * @param b			B component
  * @param threshold	Closeness threshold.
+ * @param start		Starting index
+ * @param count		Number of indexes to scan
  * @remarks	A threshold may be provided to specify how close the matching color must be
  */
-uint8 ScenePalette::indexOf(uint r, uint g, uint b, int threshold) {
+uint8 ScenePalette::indexOf(uint r, uint g, uint b, int threshold, int start, int count) {
 	int palIndex = -1;
 	byte *palData = &_palette[0];
 
-	for (int i = 0; i < 256; ++i) {
+	for (int i = start; i < (start + count); ++i) {
 		byte ir = *palData++;
 		byte ig = *palData++;
 		byte ib = *palData++;
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 45bb3506d5..60a7930eab 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -378,7 +378,7 @@ public:
 	void setPalette(int index, int count);
 	void getEntry(int index, uint *r, uint *g, uint *b);
 	void setEntry(int index, uint r, uint g, uint b);
-	uint8 indexOf(uint r, uint g, uint b, int threshold = 0xffff);
+	uint8 indexOf(uint r, uint g, uint b, int threshold = 0xffff, int start = 0, int count = 256);
 	void getPalette(int start = 0, int count = 256);
 	void signalListeners();
 	void clearListeners();
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index b4c3127ea8..59eb59b194 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -380,6 +380,7 @@ void Ringworld2Globals::reset() {
 	_v5589E.set(0, 0, 0, 0);
 	_v558B6.set(0, 0, 0, 0);
 	_v558C2 = 0;
+	_animationCtr = 0;
 	_v5657C = 0;
 	_v565E1 = 0;
 	_v565E3 = 0;
@@ -493,6 +494,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	_v558B6.synchronize(s);
 
 	s.syncAsSint16LE(_v558C2);
+	s.syncAsSint16LE(_animationCtr);
 	s.syncAsSint16LE(_v5657C);
 	s.syncAsSint16LE(_v565E1);
 	s.syncAsSint16LE(_v565E3);
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index d80e4d9859..45226c921b 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -260,6 +260,7 @@ public:
 	Rect _v5589E;
 	Rect _v558B6;
 	int _v558C2;
+	int _animationCtr;
 	int _v565E1;
 	int _v565E3;
 	int _v565E5;
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index b420a375a3..8a1030597a 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1551,14 +1551,52 @@ void Scene1200::sub9DAD6(int indx) {
 
 /*--------------------------------------------------------------------------*/
 
+void AnimationSplice::load(Common::File &f) {
+	_spliceOffset = f.readUint32LE();
+	f.skip(6);
+	_drawMode = f.readByte();
+	_fieldB = f.readByte();
+}
+
+/*--------------------------------------------------------------------------*/
+
+AnimationSplices::AnimationSplices() {
+	_pixelData = NULL;
+}
+
+AnimationSplices::~AnimationSplices() {
+	delete[] _pixelData;
+}
+
+void AnimationSplices::load(Common::File &f) {
+	f.skip(4);
+	_dataSize = f.readUint32LE();
+	f.skip(40);
+
+	// Load the four splice indexes
+	for (int idx = 0; idx < 4; ++idx)
+		_splices[idx].load(f);
+}
+
+int AnimationSplices::loadPixels(Common::File &f, int splicesSize) {
+	delete[] _pixelData;
+	_pixelData = new byte[splicesSize];
+	return f.read(_pixelData, splicesSize);
+}
+
+/*--------------------------------------------------------------------------*/
+
 void AnimationPlayerSubData::load(Common::File &f) {
+	uint32 posStart = f.pos();
+
 	f.skip(6);
 	_field6 = f.readUint16LE();
 	f.skip(2);
 	_fieldA = f.readUint16LE();
 	_fieldC = f.readUint16LE();
-	f.skip(4);
-	_field12 = f.readUint16LE();
+	_fieldE = f.readUint16LE();
+	f.skip(2);
+	_sliceSize = f.readUint16LE();
 	_field14 = f.readUint16LE();
 	_field16 = f.readUint16LE();
 	f.skip(4);
@@ -1567,7 +1605,10 @@ void AnimationPlayerSubData::load(Common::File &f) {
 	f.read(_palData, 768);
 	_field320 = f.readSint32LE();
 	f.skip(12);
-	f.read(_field330, 96);
+	_splices.load(f);
+
+	uint32 posEnd = f.pos();
+	assert((posEnd - posStart) == 0x390);
 }
 
 /*--------------------------------------------------------------------------*/
@@ -1575,14 +1616,14 @@ void AnimationPlayerSubData::load(Common::File &f) {
 AnimationPlayer::AnimationPlayer(): EventHandler() {
 	_endAction = NULL;
 
-	_fieldA = NULL;
-	_field16 = NULL;
+	_animData1 = NULL;
+	_animData2 = NULL;
 
 	_screenBounds = R2_GLOBALS._gfxManagerInstance._bounds;
 	_rect1 = R2_GLOBALS._gfxManagerInstance._bounds;
-	_field3C = 0;
+	_paletteMode = 0;
 	_field3A = 1;
-	_field5A = 0;
+	_sliceHeight = 0;
 	_field58 = 0;
 	_endAction = NULL;
 }
@@ -1590,6 +1631,9 @@ AnimationPlayer::AnimationPlayer(): EventHandler() {
 AnimationPlayer::~AnimationPlayer() {
 	if (!method3())
 		method4();
+
+	delete[] _animData;
+	delete[] _animData2;
 }
 
 void AnimationPlayer::synchronize(Serializer &s) {
@@ -1654,33 +1698,71 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 	_gameFrame = R2_GLOBALS._events.getFrameNumber() - _field910;
 
 	if (_subData._field320) {
-		_field900 = _subData._field320;
+		_dataNeeded = _subData._field320;
 	} else {
-		int v = (_subData._field12 + 2) * _subData._field14 * _subData._fieldC;
-		_field900 = (_subData._field16 / _subData._fieldC) + v + 96;
+		int v = (_subData._sliceSize + 2) * _subData._field14 * _subData._fieldC;
+		_dataNeeded = (_subData._field16 / _subData._fieldC) + v + 96;
 	}
+	
+	debugC(1, ktSageDebugGraphics, "Data needed %d", _dataNeeded);
 
-	_animData = _fieldA = new byte[_field900];
+	// Set up animation data array
+	_animData1 = new AnimationData[_dataNeeded / 60];
+	_animData = _animData1;
 
 	if (_subData._fieldC <= 1) {
-		_subData._field16 = NULL;
+		_animData2 = NULL;
 		_animPtr = _animData;
 	} else {
-		_field16 = new byte[_field900];
-		_animPtr = _field16;
+		_animData2 = new AnimationData[_dataNeeded / 60];
+		_animPtr = _animData2;
 	}
 
 	_field90C = 0;
 	_field90E = 1;
 
-	// TODO: Stuff
-
-	if (_field3C) {
+	// Load up the first splices set
+	_animData->_dataSize = _subData._splices._dataSize;
+	_animData->_splices = _subData._splices;
+	int splicesSize = _animData->_dataSize - 96;
+	int readSize = _animData->_splices.loadPixels(_resourceFile, splicesSize);
+	_animData->_animSlicesSize = readSize + 96;
 
+	if (_animPtr != _animData) {
+		getSlices();
 	}
 
+	// Handle starting palette
+	switch (_paletteMode) {
+	case 0:
+		// Use existing active palette
+		_palette.getPalette();
+		for (int idx = _subData._palStart; idx < (_subData._palStart + _subData._palSize); ++idx) {
+			uint r, g, b;
+			_palette.getEntry(idx, &r, &g, &b);
+			R2_GLOBALS._scenePalette.setEntry(idx, r, g, b);
+		}
 
-	return false;
+		R2_GLOBALS._sceneManager._hasPalette = true;
+		break;
+	case 2:
+		break;
+
+	default:
+		for (int idx = _subData._palStart; idx < (_subData._palStart + _subData._palSize); ++idx) {
+			byte r = _subData._palData[idx * 3];
+			byte g = _subData._palData[idx * 3 + 1];
+			byte b = _subData._palData[idx * 3 + 2];
+		
+			int palIndex = R2_GLOBALS._scenePalette.indexOf(r, g, b);
+			_palIndexes[idx] = palIndex;
+		}
+		break;
+	}
+
+	++R2_GLOBALS._animationCtr;
+	_field38 = 1;
+	return true;
 }
 
 void AnimationPlayer::drawFrame(int frameIndex) {
@@ -1713,7 +1795,7 @@ bool AnimationPlayer::method3() {
 
 void AnimationPlayer::method4() {
 	if (_field38) {
-		switch (_field3C) {
+		switch (_paletteMode) {
 		case 0:
 			R2_GLOBALS._scenePalette.replace(&_palette);
 			changePane();
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 651cfec763..4ad0c3b15a 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -325,38 +325,71 @@ public:
 	virtual Common::String getClassName() { return "UnkObject1200"; }
 };
 
+/*--------------------------------------------------------------------------*/
+
+class AnimationSplice {
+public:
+	int _spliceOffset;
+	int _drawMode;
+	int _fieldB;
+public:
+	void load(Common::File &f);
+};
+
+class AnimationSplices {
+public:
+	int _dataSize;
+	AnimationSplice _splices[4];
+	byte *_pixelData;
+public:
+	AnimationSplices();
+	~AnimationSplices();
+
+	void load(Common::File &f);
+	int loadPixels(Common::File &f, int splicesSize);
+};
+
 class AnimationPlayerSubData {
 public:
 	int _field6;
 	int _fieldA;
 	int _fieldC;
-	int _field12;
+	int _fieldE;
+	int _sliceSize;
 	int _field14;
 	int _field16;
 	int _palStart;
 	int _palSize;
 	byte _palData[256 * 3];
 	int32 _field320;
-	byte _field330[96];
+	AnimationSplices _splices;
 public:
 	void load(Common::File &f);
 };
 
+class AnimationData {
+public:
+	AnimationSplices _splices;
+	int _dataSize;
+	int _animSlicesSize;
+};
+
 class AnimationPlayer: public EventHandler {
 public:
-	byte *_fieldA;
-	byte *_field16;
-	byte *_animData, *_animPtr;
+	AnimationData *_animData;
+	AnimationData *_animData1, *_animData2;
+	AnimationData *_animPtr;
 	Common::File _resourceFile;
 	Rect _rect1, _screenBounds;
 	int _field38;
-	int _field3A, _field3C;
+	int _field3A, _paletteMode;
 	int _field56;
-	int _field58, _field5A;
+	int _field58, _sliceHeight;
+	byte _palIndexes[256];
 	ScenePalette _palette;
 	AnimationPlayerSubData _subData;
 	Action *_endAction;
-	int _field900;
+	int _dataNeeded;
 	int _field904;
 	int _field908;
 	int _field90C;
@@ -381,6 +414,7 @@ public:
 	bool method3();
 	void method4();
 	void method5() {}
+	void getSlices() {}
 };
 
 class AnimationPlayerExt: public AnimationPlayer {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 3c9956282a..7d5ab6318d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1555,7 +1555,7 @@ void Scene180::signal() {
 	case 1:
 		_field412 = 1;
 		R2_GLOBALS._sceneManager._hasPalette = true;
-		_animationPlayer._field3C = 2;
+		_animationPlayer._paletteMode = 2;
 		_animationPlayer._v = 1;
 		_animationPlayer._field56 = 1;
 		R2_GLOBALS._scene180Mode = 1;
@@ -1598,7 +1598,7 @@ void Scene180::signal() {
 		break;
 
 	case 5:
-		_animationPlayer._field3C = 2;
+		_animationPlayer._paletteMode = 2;
 		_animationPlayer._v = 1;
 		_animationPlayer._field56 = 1;
 		R2_GLOBALS._scene180Mode = 2;
@@ -1701,7 +1701,7 @@ void Scene180::signal() {
 
 	case 29:
 		_field412 = 1;
-		_animationPlayer._field3C = 0;
+		_animationPlayer._paletteMode = 0;
 		_animationPlayer._v = 1;
 		_animationPlayer._field56 = 42;
 		R2_GLOBALS._scene180Mode = 3;
@@ -1801,7 +1801,7 @@ void Scene180::signal() {
 		break;
 
 	case 40:
-		_animationPlayer._field3C = 2;
+		_animationPlayer._paletteMode = 2;
 		_animationPlayer._field56 = 1;
 		R2_GLOBALS._scene180Mode = 4;
 		if (_animationPlayer.load(4)) {
@@ -1839,7 +1839,7 @@ void Scene180::signal() {
 
 	case 48:
 		_field412 = 1;
-		_animationPlayer._field3C = 2;
+		_animationPlayer._paletteMode = 2;
 		_animationPlayer._v = 1;
 		_animationPlayer._field56 = 1;
 		R2_GLOBALS._scene180Mode = 15;
diff --git a/engines/tsage/tsage.h b/engines/tsage/tsage.h
index eb36cf0790..41179c4915 100644
--- a/engines/tsage/tsage.h
+++ b/engines/tsage/tsage.h
@@ -54,7 +54,8 @@ enum {
 enum {
 	kRingDebugScripts = 1 << 0,
 	ktSageSound = 1 << 1,
-	ktSageCore = 1 << 2
+	ktSageCore = 1 << 2,
+	ktSageDebugGraphics = 1 << 3
 };
 
 struct tSageGameDescription;
-- 
cgit v1.2.3


From b341ff04faba379a524d941db0bcc918a9238b22 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Feb 2012 21:34:38 +1100
Subject: TSAGE: Implement R2R Animation Player drawing code

---
 engines/tsage/ringworld2/ringworld2_logic.cpp | 129 ++++++++++++++++++++++----
 engines/tsage/ringworld2/ringworld2_logic.h   |   8 +-
 2 files changed, 117 insertions(+), 20 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 8a1030597a..37fbceb532 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1555,7 +1555,7 @@ void AnimationSplice::load(Common::File &f) {
 	_spliceOffset = f.readUint32LE();
 	f.skip(6);
 	_drawMode = f.readByte();
-	_fieldB = f.readByte();
+	_secondaryIndex = f.readByte();
 }
 
 /*--------------------------------------------------------------------------*/
@@ -1597,7 +1597,7 @@ void AnimationPlayerSubData::load(Common::File &f) {
 	_fieldE = f.readUint16LE();
 	f.skip(2);
 	_sliceSize = f.readUint16LE();
-	_field14 = f.readUint16LE();
+	_ySlices = f.readUint16LE();
 	_field16 = f.readUint16LE();
 	f.skip(4);
 	_palStart = f.readUint16LE();
@@ -1700,7 +1700,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 	if (_subData._field320) {
 		_dataNeeded = _subData._field320;
 	} else {
-		int v = (_subData._sliceSize + 2) * _subData._field14 * _subData._fieldC;
+		int v = (_subData._sliceSize + 2) * _subData._ySlices * _subData._fieldC;
 		_dataNeeded = (_subData._field16 / _subData._fieldC) + v + 96;
 	}
 	
@@ -1765,24 +1765,94 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 	return true;
 }
 
-void AnimationPlayer::drawFrame(int frameIndex) {
-/*
-	uint32 v = READ_LE_UINT32(_dataP);
-warning("v = %d", v);
-//TODO
+void AnimationPlayer::drawFrame(int spliceIndex) {
+	assert(spliceIndex < 4);
+	AnimationSplices &splices = _animData->_splices;
+	AnimationSplice &splice = _animData->_splices._splices[spliceIndex];
 
-	// End check
-	if (_field56 == 42) {
-		_screenBounds.expandPanes();
+	byte *sliceDataStart = &splices._pixelData[splice._spliceOffset];
+	byte *sliceData1 = sliceDataStart;
 
-		R2_GLOBALS._sceneObjects->draw();
-	} else {
-		if (R2_GLOBALS._sceneManager._hasPalette) {
-			R2_GLOBALS._sceneManager._hasPalette = false;
-			R2_GLOBALS._scenePalette.refresh();
+	Rect playerBounds = _screenBounds;
+	int y = _screenBounds.top;
+	R2_GLOBALS._screenSurface.addDirtyRect(playerBounds);
+
+	Graphics::Surface surface = R2_GLOBALS._screenSurface.lockSurface();
+
+	// Handle different drawing modes
+	switch (splice._drawMode) {
+	case 0:
+		// Draw from uncompressed source
+		for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
+			for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex) {
+				// TODO: Check of _subData._fieldE was done for two different kinds of
+				// line slice drawing in original
+				const byte *pSrc = (const byte *)sliceDataStart + READ_LE_UINT16(sliceData1 + sliceNum * 2);
+				byte *pDest = (byte *)surface.getBasePtr(playerBounds.left, y++);
+
+				Common::copy(pSrc, pSrc + _subData._sliceSize, pDest);
+			}
 		}
+		break;
+
+	case 1:
+		switch (splice._secondaryIndex) {
+		case 0xfe:
+			// Draw from uncompressed source with optional skipped rows
+			for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
+				for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex) {
+					int offset = READ_LE_UINT16(sliceData1 + sliceNum * 2);
+
+					if (offset) {
+						const byte *pSrc = (const byte *)sliceDataStart + offset;
+						byte *pDest = (byte *)surface.getBasePtr(playerBounds.left, y++);
+
+						Common::copy(pSrc, pSrc + _subData._sliceSize, pDest);
+					}
+				}
+			}
+			break;
+		case 0xff:
+			// Draw from RLE compressed source
+			for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
+				for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex) {
+					// TODO: Check of _subData._fieldE was done for two different kinds of
+					// line slice drawing in original
+					const byte *pSrc = (const byte *)sliceDataStart + READ_LE_UINT16(sliceData1 + sliceNum * 2);
+					byte *pDest = (byte *)surface.getBasePtr(playerBounds.left, y++);
+
+					rleDecode(pSrc, pDest, _subData._sliceSize);
+				}
+			}
+			break;
+		default: {
+			// Draw from two splice sets simultaneously
+			AnimationSplice &splice2 = _animData->_splices._splices[splice._secondaryIndex];
+			byte *sliceData2 = &splices._pixelData[splice2._spliceOffset];
+
+			for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
+				for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex) {
+					const byte *pSrc1 = (const byte *)sliceDataStart + READ_LE_UINT16(sliceData2 + sliceNum * 2);
+					const byte *pSrc2 = (const byte *)sliceDataStart + READ_LE_UINT16(sliceData1 + sliceNum * 2);
+					byte *pDest = (byte *)surface.getBasePtr(playerBounds.left, y++);
+
+					if (splice2._drawMode == 0) {
+						// Uncompressed background, foreground compressed
+						Common::copy(pSrc1, pSrc1 + _subData._sliceSize, pDest);
+						rleDecode(pSrc2, pDest, _subData._sliceSize);
+					} else {
+						// Both background and foreground is compressed
+						rleDecode(pSrc1, pDest, _subData._sliceSize);
+						rleDecode(pSrc2, pDest, _subData._sliceSize);
+					}
+				}
+			}
+			break;
+		}
+		}
+	default:
+		break;
 	}
-*/
 }
 
 void AnimationPlayer::method2() {
@@ -1813,6 +1883,31 @@ void AnimationPlayer::method4() {
 // TODO
 }
 
+void AnimationPlayer::rleDecode(const byte *pSrc, byte *pDest, int size) {
+	while (size > 0) {
+		byte v = *pSrc++;
+		if (!(v & 0x80)) {
+			// Following uncompressed set of bytes
+			Common::copy(pSrc, pSrc + v, pDest);
+			pSrc += v;
+			pDest += v;
+			size -= v;
+		} else {
+			int count = v & 0x3F;
+			size -= count;
+
+			if (!(v & 0x40)) {
+				// Skip over a number of bytes
+				pDest += count;
+			} else {
+				// Replicate a number of bytes
+				Common::fill(pDest, pDest + count, *pSrc++);
+				pDest += count;
+			}
+		}
+	}
+}
+
 /*--------------------------------------------------------------------------*/
 
 AnimationPlayerExt::AnimationPlayerExt(): AnimationPlayer() {
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 4ad0c3b15a..c575927827 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -331,7 +331,7 @@ class AnimationSplice {
 public:
 	int _spliceOffset;
 	int _drawMode;
-	int _fieldB;
+	int _secondaryIndex;
 public:
 	void load(Common::File &f);
 };
@@ -356,7 +356,7 @@ public:
 	int _fieldC;
 	int _fieldE;
 	int _sliceSize;
-	int _field14;
+	int _ySlices;
 	int _field16;
 	int _palStart;
 	int _palSize;
@@ -375,6 +375,8 @@ public:
 };
 
 class AnimationPlayer: public EventHandler {
+private:
+	void rleDecode(const byte *pSrc, byte *pDest, int size);
 public:
 	AnimationData *_animData;
 	AnimationData *_animData1, *_animData2;
@@ -409,7 +411,7 @@ public:
 	virtual void proc14() {}
 
 	bool load(int animId, Action *endAction = NULL);
-	void drawFrame(int frameIndex);
+	void drawFrame(int spliceIndex);
 	void method2();
 	bool method3();
 	void method4();
-- 
cgit v1.2.3


From 44e3d324faa52508c68dbb6f5ede960332c88e3e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 26 Feb 2012 22:54:25 +1100
Subject: TSAGE: Implemented some of the remaining R2R Animation Player support
 methods

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   | 93 ++++++++++++++++++-------
 engines/tsage/ringworld2/ringworld2_logic.h     | 17 ++---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp |  2 +-
 3 files changed, 78 insertions(+), 34 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 37fbceb532..3c5530feec 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1571,7 +1571,9 @@ AnimationSplices::~AnimationSplices() {
 void AnimationSplices::load(Common::File &f) {
 	f.skip(4);
 	_dataSize = f.readUint32LE();
-	f.skip(40);
+	f.skip(8);
+	_dataSize2 = f.readUint32LE();
+	f.skip(28);
 
 	// Load the four splice indexes
 	for (int idx = 0; idx < 4; ++idx)
@@ -1623,17 +1625,14 @@ AnimationPlayer::AnimationPlayer(): EventHandler() {
 	_rect1 = R2_GLOBALS._gfxManagerInstance._bounds;
 	_paletteMode = 0;
 	_field3A = 1;
-	_sliceHeight = 0;
-	_field58 = 0;
+	_sliceHeight = 1;
+	_field58 = 1;
 	_endAction = NULL;
 }
 
 AnimationPlayer::~AnimationPlayer() {
 	if (!method3())
-		method4();
-
-	delete[] _animData;
-	delete[] _animData2;
+		close();
 }
 
 void AnimationPlayer::synchronize(Serializer &s) {
@@ -1707,28 +1706,28 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 	debugC(1, ktSageDebugGraphics, "Data needed %d", _dataNeeded);
 
 	// Set up animation data array
-	_animData1 = new AnimationData[_dataNeeded / 60];
-	_animData = _animData1;
+	_animData1 = new AnimationData();
+	_sliceCurrent = _animData1;
 
 	if (_subData._fieldC <= 1) {
 		_animData2 = NULL;
-		_animPtr = _animData;
+		_sliceNext = _sliceCurrent;
 	} else {
-		_animData2 = new AnimationData[_dataNeeded / 60];
-		_animPtr = _animData2;
+		_animData2 = new AnimationData();
+		_sliceNext = _animData2;
 	}
 
 	_field90C = 0;
 	_field90E = 1;
 
 	// Load up the first splices set
-	_animData->_dataSize = _subData._splices._dataSize;
-	_animData->_splices = _subData._splices;
-	int splicesSize = _animData->_dataSize - 96;
-	int readSize = _animData->_splices.loadPixels(_resourceFile, splicesSize);
-	_animData->_animSlicesSize = readSize + 96;
+	_sliceCurrent->_dataSize = _subData._splices._dataSize;
+	_sliceCurrent->_splices = _subData._splices;
+	int splicesSize = _sliceCurrent->_dataSize - 96;
+	int readSize = _sliceCurrent->_splices.loadPixels(_resourceFile, splicesSize);
+	_sliceCurrent->_animSlicesSize = readSize + 96;
 
-	if (_animPtr != _animData) {
+	if (_sliceNext != _sliceCurrent) {
 		getSlices();
 	}
 
@@ -1767,8 +1766,8 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 
 void AnimationPlayer::drawFrame(int spliceIndex) {
 	assert(spliceIndex < 4);
-	AnimationSplices &splices = _animData->_splices;
-	AnimationSplice &splice = _animData->_splices._splices[spliceIndex];
+	AnimationSplices &splices = _sliceCurrent->_splices;
+	AnimationSplice &splice = _sliceCurrent->_splices._splices[spliceIndex];
 
 	byte *sliceDataStart = &splices._pixelData[splice._spliceOffset];
 	byte *sliceData1 = sliceDataStart;
@@ -1827,7 +1826,7 @@ void AnimationPlayer::drawFrame(int spliceIndex) {
 			break;
 		default: {
 			// Draw from two splice sets simultaneously
-			AnimationSplice &splice2 = _animData->_splices._splices[splice._secondaryIndex];
+			AnimationSplice &splice2 = _sliceCurrent->_splices._splices[splice._secondaryIndex];
 			byte *sliceData2 = &splices._pixelData[splice2._spliceOffset];
 
 			for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
@@ -1856,14 +1855,29 @@ void AnimationPlayer::drawFrame(int spliceIndex) {
 }
 
 void AnimationPlayer::method2() {
-
+	_field90C = _field90E++;
+	_field904 = _field90C * _subData._fieldC;
+	_field908 = _field904 - 1;
+
+	if (_sliceNext == _sliceCurrent) {
+		int dataSize = _sliceCurrent->_splices._dataSize2;
+		_sliceCurrent->_dataSize = dataSize;
+
+		dataSize -= 96;
+		assert(dataSize >= 0);
+		_sliceCurrent->_splices.load(_resourceFile);
+		_sliceCurrent->_animSlicesSize = _sliceCurrent->_splices.loadPixels(_resourceFile, dataSize);
+	} else {
+		SWAP(_sliceCurrent, _sliceNext);
+		getSlices();
+	}
 }
 
 bool AnimationPlayer::method3() {
 	return (_field90C >= _subData._field6);
 }
 
-void AnimationPlayer::method4() {
+void AnimationPlayer::close() {
 	if (_field38) {
 		switch (_paletteMode) {
 		case 0:
@@ -1872,7 +1886,7 @@ void AnimationPlayer::method4() {
 			R2_GLOBALS._sceneManager._hasPalette = true;
 			break;
 		case 2:
-			proc14();
+			closing();
 			break;
 		default:
 			changePane();
@@ -1880,7 +1894,21 @@ void AnimationPlayer::method4() {
 		}
 	}
 
-// TODO
+	// Close the resource file
+	_resourceFile.close();
+
+	if (_field56 != 42) {
+		// flip screen in original
+	}
+
+	// Free animation objects
+	delete _animData1;
+	delete _animData2;
+	_animData1 = NULL;
+	_animData2 = NULL;
+
+	_field38 = 0;
+	R2_GLOBALS._animationCtr = MAX(R2_GLOBALS._animationCtr, 0);
 }
 
 void AnimationPlayer::rleDecode(const byte *pSrc, byte *pDest, int size) {
@@ -1908,6 +1936,21 @@ void AnimationPlayer::rleDecode(const byte *pSrc, byte *pDest, int size) {
 	}
 }
 
+void AnimationPlayer::getSlices() {
+	assert((_sliceNext == _animData1) || (_sliceNext == _animData2));
+	assert((_sliceCurrent == _animData1) || (_sliceCurrent == _animData2));
+
+	_sliceNext->_dataSize = _sliceCurrent->_splices._dataSize2;
+	if (_sliceNext->_dataSize) {
+		if (_sliceNext->_dataSize >= _dataNeeded)
+			error("Bogus dataNeeded == %d / %d", _sliceNext->_dataSize, _dataNeeded);
+	}
+
+	int dataSize = _sliceNext->_dataSize - 96;
+	_sliceNext->_splices.load(_resourceFile);
+	_sliceNext->_animSlicesSize = _sliceNext->_splices.loadPixels(_resourceFile, dataSize);
+}
+
 /*--------------------------------------------------------------------------*/
 
 AnimationPlayerExt::AnimationPlayerExt(): AnimationPlayer() {
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index c575927827..6100efc8bc 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -339,6 +339,7 @@ public:
 class AnimationSplices {
 public:
 	int _dataSize;
+	int _dataSize2;
 	AnimationSplice _splices[4];
 	byte *_pixelData;
 public:
@@ -377,10 +378,14 @@ public:
 class AnimationPlayer: public EventHandler {
 private:
 	void rleDecode(const byte *pSrc, byte *pDest, int size);
+
+	void drawFrame(int spliceIndex);
+	void method2();
+	void getSlices();
 public:
-	AnimationData *_animData;
 	AnimationData *_animData1, *_animData2;
-	AnimationData *_animPtr;
+	AnimationData *_sliceCurrent;
+	AnimationData *_sliceNext;
 	Common::File _resourceFile;
 	Rect _rect1, _screenBounds;
 	int _field38;
@@ -408,15 +413,11 @@ public:
 	virtual void dispatch();
 	virtual void flipPane() {}
 	virtual void changePane() {}
-	virtual void proc14() {}
+	virtual void closing() {}
 
 	bool load(int animId, Action *endAction = NULL);
-	void drawFrame(int spliceIndex);
-	void method2();
 	bool method3();
-	void method4();
-	void method5() {}
-	void getSlices() {}
+	void close();
 };
 
 class AnimationPlayerExt: public AnimationPlayer {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 7d5ab6318d..292e9c2f5e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1900,7 +1900,7 @@ void Scene180::dispatch() {
 	if (_animationPlayer._v) {
 		if (_animationPlayer.method3()) {
 			_animationPlayer._v = 0;
-			_animationPlayer.method4();
+			_animationPlayer.close();
 			_animationPlayer.remove();
 
 			signal();
-- 
cgit v1.2.3


From d3c4243ab5aa8438645340dca1900e678d8fd6ba Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 26 Feb 2012 12:59:19 +0100
Subject: SCUMM: Fix utilization of ARM assembly routines. This fixes bug
 #3494448.

The bug in question is: "SCUMM: Loom PCE Japanese broken on ARM".

Thanks to fuzzie and wjp for this patch. If anything is broken after this I
take no blame.
---
 engines/scumm/gfx.cpp  | 7 +++----
 engines/scumm/gfxARM.s | 4 ----
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 48ccdfd1cf..2cf4a429db 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -680,11 +680,10 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
 				srcPtr += vsPitch;
 				textPtr += _textSurface.pitch - width * m;
 			}
-		}
+		} else {
 #ifdef USE_ARM_GFX_ASM
-		asmDrawStripToScreen(height, width, text, src, _compositeBuf, vs->pitch, width, _textSurface.pitch);
+			asmDrawStripToScreen(height, width, text, src, _compositeBuf, vs->pitch, width, _textSurface.pitch);
 #else
-		else {
 			// We blit four pixels at a time, for improved performance.
 			const uint32 *src32 = (const uint32 *)src;
 			uint32 *dst32 = (uint32 *)_compositeBuf;
@@ -715,8 +714,8 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
 				src32 += vsPitch;
 				text32 += textPitch;
 			}
-		}
 #endif
+		}
 		src = _compositeBuf;
 		pitch = width * vs->format.bytesPerPixel;
 
diff --git a/engines/scumm/gfxARM.s b/engines/scumm/gfxARM.s
index 92f8951466..9238888831 100644
--- a/engines/scumm/gfxARM.s
+++ b/engines/scumm/gfxARM.s
@@ -59,10 +59,6 @@ _asmDrawStripToScreen:
 	CMP	r1,#4			@ If width<4
 	BLT	end			@    return
 
-	@ Width &= ~4 ? What''s that about then? Width &= ~3 I could have
-	@ understood...
-	BIC	r1,r1,#4
-
 	SUB	r5,r5,r1		@ vsPitch          -= width
 	SUB	r6,r6,r1		@ vmScreenWidth    -= width
 	SUB	r7,r7,r1		@ textSurfacePitch -= width
-- 
cgit v1.2.3


From 215b41b244e042019f82cb507463d7e13672a6d0 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 22 Feb 2012 15:33:29 +0100
Subject: COMMON: Move RenderMode and GUIOptions functionality into separate
 files

---
 engines/advancedDetector.h       | 2 ++
 engines/agi/agi.h                | 1 +
 engines/game.cpp                 | 1 +
 engines/kyra/kyra_v1.h           | 3 ++-
 engines/kyra/screen.h            | 1 +
 engines/queen/queen.cpp          | 1 +
 engines/scumm/detection_tables.h | 1 +
 engines/scumm/scumm.h            | 2 ++
 engines/sword1/detection.cpp     | 1 +
 engines/sword2/sword2.cpp        | 3 ++-
 10 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index c31c8bd66e..3bb00618b1 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -26,6 +26,8 @@
 #include "engines/metaengine.h"
 #include "engines/engine.h"
 
+#include "common/gui_options.h" // FIXME: Temporary hack?
+
 namespace Common {
 class Error;
 class FSList;
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index ea3afa5ca3..55b4805022 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -28,6 +28,7 @@
 #include "common/util.h"
 #include "common/file.h"
 #include "common/rect.h"
+#include "common/rendermode.h"
 #include "common/stack.h"
 #include "common/system.h"
 
diff --git a/engines/game.cpp b/engines/game.cpp
index be15240745..4bfd8f3bf2 100644
--- a/engines/game.cpp
+++ b/engines/game.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "engines/game.h"
+#include "common/gui_options.h"
 
 
 const PlainGameDescriptor *findPlainGameDescriptor(const char *gameid, const PlainGameDescriptor *list) {
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 499f575a0c..11173a45c7 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -28,8 +28,9 @@
 #include "common/array.h"
 #include "common/error.h"
 #include "common/events.h"
-#include "common/random.h"
 #include "common/hashmap.h"
+#include "common/random.h"
+#include "common/rendermode.h"
 
 #include "audio/mixer.h"
 
diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index a0cf5742c6..b064c72bb0 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -28,6 +28,7 @@
 #include "common/list.h"
 #include "common/array.h"
 #include "common/rect.h"
+#include "common/rendermode.h"
 #include "common/stream.h"
 
 class OSystem;
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index c610ef9921..d17268e16b 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -25,6 +25,7 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/fs.h"
+#include "common/gui_options.h"
 #include "common/savefile.h"
 #include "common/system.h"
 #include "common/events.h"
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index a44497f193..d7eedc3a83 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -24,6 +24,7 @@
 #define SCUMM_DETECTION_TABLES_H
 
 #include "engines/obsolete.h"
+#include "common/gui_options.h"
 #include "common/rect.h"
 #include "common/util.h"
 
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 2f1e536f0a..cacf8c214e 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -24,6 +24,7 @@
 #define SCUMM_H
 
 #include "engines/engine.h"
+
 #include "common/endian.h"
 #include "common/events.h"
 #include "common/file.h"
@@ -31,6 +32,7 @@
 #include "common/keyboard.h"
 #include "common/random.h"
 #include "common/rect.h"
+#include "common/rendermode.h"
 #include "common/str.h"
 #include "common/textconsole.h"
 #include "graphics/surface.h"
diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
index 2214e72067..087dcd09d8 100644
--- a/engines/sword1/detection.cpp
+++ b/engines/sword1/detection.cpp
@@ -25,6 +25,7 @@
 
 #include "base/plugins.h"
 #include "common/fs.h"
+#include "common/gui_options.h"
 #include "common/savefile.h"
 #include "common/system.h"
 #include "graphics/thumbnail.h"
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index bdfc388c5f..c395186570 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -25,9 +25,10 @@
 #include "base/plugins.h"
 
 #include "common/config-manager.h"
+#include "common/events.h"
 #include "common/file.h"
 #include "common/fs.h"
-#include "common/events.h"
+#include "common/gui_options.h"
 #include "common/savefile.h"
 #include "common/system.h"
 #include "common/textconsole.h"
-- 
cgit v1.2.3


From 367131ef0ebbc446f5589b3523049eac3d5a572d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 22 Feb 2012 21:03:17 +0100
Subject: COMMON: Move Language and Platform functionality into separate files

---
 engines/engine.h                          | 2 ++
 engines/game.h                            | 3 ++-
 engines/gob/databases.h                   | 2 +-
 engines/queen/input.h                     | 2 +-
 engines/queen/resource.h                  | 3 ++-
 engines/scumm/detection.h                 | 3 ++-
 engines/scumm/help.h                      | 1 +
 engines/sword25/util/lua/scummvm_file.cpp | 2 +-
 engines/touche/graphics.h                 | 2 +-
 9 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/engine.h b/engines/engine.h
index a020dc4951..4f4223384a 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -24,6 +24,8 @@
 
 #include "common/scummsys.h"
 #include "common/str.h"
+#include "common/language.h"
+#include "common/platform.h"
 
 class OSystem;
 
diff --git a/engines/game.h b/engines/game.h
index d5136936bc..3417203ea7 100644
--- a/engines/game.h
+++ b/engines/game.h
@@ -26,7 +26,8 @@
 #include "common/array.h"
 #include "common/hash-str.h"
 #include "common/str.h"
-#include "common/util.h"
+#include "common/language.h"
+#include "common/platform.h"
 
 /**
  * A simple structure used to map gameids (like "monkey", "sword1", ...) to
diff --git a/engines/gob/databases.h b/engines/gob/databases.h
index fb65d8cf96..cde123e6a8 100644
--- a/engines/gob/databases.h
+++ b/engines/gob/databases.h
@@ -26,7 +26,7 @@
 #include "common/str.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"
-#include "common/util.h"
+#include "common/language.h"
 
 #include "gob/dbase.h"
 
diff --git a/engines/queen/input.h b/engines/queen/input.h
index 0aa04dd026..b3bf811cd1 100644
--- a/engines/queen/input.h
+++ b/engines/queen/input.h
@@ -23,7 +23,7 @@
 #ifndef QUEEN_INPUT_H
 #define QUEEN_INPUT_H
 
-#include "common/util.h"
+#include "common/language.h"
 #include "common/rect.h"
 #include "common/events.h"
 #include "queen/defs.h"
diff --git a/engines/queen/resource.h b/engines/queen/resource.h
index ef8e463631..7317ec5134 100644
--- a/engines/queen/resource.h
+++ b/engines/queen/resource.h
@@ -25,7 +25,8 @@
 
 #include "common/file.h"
 #include "common/str-array.h"
-#include "common/util.h"
+#include "common/language.h"
+#include "common/platform.h"
 #include "queen/defs.h"
 
 namespace Queen {
diff --git a/engines/scumm/detection.h b/engines/scumm/detection.h
index ad8b3cec12..b6dfa757bb 100644
--- a/engines/scumm/detection.h
+++ b/engines/scumm/detection.h
@@ -23,7 +23,8 @@
 #ifndef SCUMM_DETECTION_H
 #define SCUMM_DETECTION_H
 
-#include "common/util.h"
+#include "common/language.h"
+#include "common/platform.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/help.h b/engines/scumm/help.h
index 5ba6bdc65c..a3948566c4 100644
--- a/engines/scumm/help.h
+++ b/engines/scumm/help.h
@@ -24,6 +24,7 @@
 #define SCUMM_HELP_H
 
 #include "common/str.h"
+#include "common/platform.h"
 
 namespace Scumm {
 
diff --git a/engines/sword25/util/lua/scummvm_file.cpp b/engines/sword25/util/lua/scummvm_file.cpp
index 33053a71cb..b5f1388129 100644
--- a/engines/sword25/util/lua/scummvm_file.cpp
+++ b/engines/sword25/util/lua/scummvm_file.cpp
@@ -22,7 +22,7 @@
 
 #include "sword25/util/lua/scummvm_file.h"
 #include "common/config-manager.h"
-#include "common/util.h"
+#include "common/language.h"
 
 namespace Sword25 {
 
diff --git a/engines/touche/graphics.h b/engines/touche/graphics.h
index 4b769b0a66..5b2ea39a24 100644
--- a/engines/touche/graphics.h
+++ b/engines/touche/graphics.h
@@ -23,7 +23,7 @@
 #ifndef TOUCHE_GRAPHICS_H
 #define TOUCHE_GRAPHICS_H
 
-#include "common/util.h"
+#include "common/language.h"
 
 namespace Touche {
 
-- 
cgit v1.2.3


From 7db3be8b4f367b6313d9474be141728513f2d472 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 27 Feb 2012 19:23:19 +1100
Subject: AGOS: Add font data for French, German and Italian versions of Simon
 the Sorcerer 1 (Amiga).

Thanks to digitall for converting the font data from original.
---
 engines/agos/charset-fontdata.cpp | 573 ++++++++++++++++++++++++++++++++++++++
 engines/agos/charset.cpp          | 275 ------------------
 2 files changed, 573 insertions(+), 275 deletions(-)

(limited to 'engines')

diff --git a/engines/agos/charset-fontdata.cpp b/engines/agos/charset-fontdata.cpp
index e6b81f54ee..87f51cfad2 100644
--- a/engines/agos/charset-fontdata.cpp
+++ b/engines/agos/charset-fontdata.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "common/endian.h"
 #include "common/system.h"
 #include "common/textconsole.h"
 
@@ -680,6 +681,578 @@ static const byte feeble_windowFont[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
+static const byte english_simon1AGAFontData[] = {
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x20,0x10,0x40,0x88,0x30,0x40,0x00,0x88,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x10,0x00,0x00,0x10,0x28,0x08,0x10,0x20,0x44,0x00,0x40,0x00,0xB8,0x30,0x00,0x00,0x48,0x08,0x00,0x00,0x74,0x30,0x00,0x40,0x88,0x20,0x00,0x00,0x50,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x06,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xB4,0x00,0x48,0x00,0xB4,0x10,0x00,0x00,0x68,0x00,0x20,0x00,0x58,0x00,0x08,0x40,0xB4,0x08,0x40,0x00,0xB4,0x00,0x00,0x00,0x48,0x00,0x00,0x00,0x00,0x06,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x10,0x00,0x40,0xA8,0x18,0x20,0x00,0x44,0x10,0x00,0x00,0x28,0x18,0x20,0x00,0x44,0x10,0x00,0x40,0xAC,0x0C,0x20,0x00,0x52,0x00,0x00,0x00,0x2C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x05,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x05,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x18,0x20,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x04,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x04,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xBA,0x0C,0x00,0x40,0xB2,0x04,0x50,0x00,0xAA,0x44,0x20,0x00,0x9A,0x44,0x00,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xBA,0x04,0x00,0x00,0x5A,0x08,0x10,0x00,0x24,0x00,0x20,0x00,0x5C,0x00,0x04,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x00,0x00,0x5A,0x00,0x08,0x10,0x24,0x04,0x00,0x00,0x5A,0x04,0x00,0x40,0xBA,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x14,0x08,0x00,0x10,0x24,0x08,0x00,0x20,0x54,0x08,0x40,0x00,0xB4,0x3C,0x40,0x00,0x82,0x08,0x00,0x00,0x74,0x04,0x08,0x10,0x22,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7C,0x04,0x18,0x60,0x82,0x00,0x40,0x00,0xBC,0x78,0x00,0x00,0x84,0x04,0x00,0x00,0x7A,0x04,0x00,0x00,0x4A,0x04,0x00,0x40,0xBA,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x08,0x10,0x00,0x24,0x00,0x00,0x20,0x58,0x00,0x40,0x00,0xB8,0x38,0x40,0x00,0x84,0x44,0x00,0x00,0xBA,0x44,0x00,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x00,0x04,0x00,0x4A,0x00,0x00,0x08,0x14,0x00,0x10,0x00,0x28,0x00,0x10,0x00,0x28,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x40,0x00,0xBA,0x18,0x20,0x00,0x44,0x04,0x00,0x40,0xBA,0x04,0x40,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x40,0x00,0xBA,0x1C,0x20,0x00,0x42,0x04,0x00,0x00,0x3A,0x00,0x08,0x00,0x34,0x00,0x10,0x20,0x48,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x04,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x05,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x40,0x00,0xBA,0x04,0x00,0x00,0x4A,0x08,0x00,0x00,0x14,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x40,0x00,0xBA,0x04,0x00,0x00,0x4A,0x08,0x00,0x00,0x14,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x40,0x00,0xBA,0x04,0x00,0x00,0x4A,0x08,0x00,0x00,0x14,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x40,0x00,0xBA,0x04,0x00,0x00,0x4A,0x08,0x00,0x00,0x14,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xBA,0x04,0x40,0x10,0xAA,0x0C,0x50,0x00,0xA2,0x1C,0x40,0x00,0xA2,0x40,0x00,0x00,0xBC,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x00,0x40,0xBA,0x0C,0x70,0x00,0x82,0x04,0x40,0x00,0xBA,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x78,0x08,0x10,0x60,0x84,0x04,0x00,0x20,0x5A,0x04,0x20,0x00,0x5A,0x28,0x10,0x00,0x44,0x24,0x00,0x00,0x5A,0x24,0x00,0x00,0x5A,0x18,0x20,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x24,0x04,0x00,0x20,0x5A,0x00,0x00,0x40,0xA4,0x00,0x00,0x40,0xA0,0x00,0x40,0x00,0xA4,0x24,0x00,0x00,0x5A,0x18,0x00,0x00,0x24,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x70,0x10,0x20,0x40,0x88,0x08,0x20,0x00,0x54,0x04,0x20,0x00,0x5A,0x04,0x20,0x00,0x5A,0x24,0x00,0x00,0x5A,0x28,0x00,0x00,0x54,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7C,0x04,0x18,0x60,0x82,0x04,0x20,0x00,0x5A,0x00,0x20,0x00,0x5C,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x5C,0x20,0x04,0x00,0x5A,0x0C,0x30,0x40,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7C,0x04,0x18,0x60,0x82,0x04,0x20,0x00,0x5A,0x00,0x20,0x00,0x5C,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x24,0x04,0x00,0x20,0x5A,0x00,0x40,0x00,0xAC,0x00,0x44,0x08,0xB2,0x44,0x00,0x00,0xAA,0x24,0x00,0x00,0x5A,0x1C,0x00,0x00,0x22,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x44,0x00,0xAA,0x04,0x40,0x00,0xBA,0x4C,0x30,0x00,0x82,0x44,0x00,0x00,0xBA,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x00,0x10,0x00,0x6C,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x6C,0x1C,0x20,0x40,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x0C,0x00,0x04,0x08,0x12,0x00,0x04,0x00,0x0A,0x04,0x00,0x00,0x0A,0x04,0x00,0x00,0x4A,0x04,0x00,0x40,0xAA,0x04,0x40,0x00,0xBA,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x64,0x00,0x24,0x40,0x9A,0x00,0x24,0x00,0x5A,0x20,0x08,0x00,0x54,0x20,0x10,0x00,0x48,0x28,0x00,0x00,0x54,0x24,0x00,0x00,0x5A,0x04,0x20,0x40,0x9A,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x70,0x00,0x30,0x40,0x88,0x00,0x20,0x00,0x50,0x00,0x20,0x00,0x50,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x54,0x24,0x00,0x00,0x5A,0x1C,0x20,0x40,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x04,0x40,0xAA,0x24,0x40,0x08,0x92,0x04,0x50,0x00,0xAA,0x14,0x40,0x00,0xAA,0x44,0x00,0x00,0xBA,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x20,0x44,0x00,0x9A,0x14,0x40,0x00,0xAA,0x0C,0x40,0x00,0xB2,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x00,0x40,0xAA,0x04,0x40,0x00,0xAA,0x04,0x40,0x00,0xAA,0x04,0x40,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x78,0x08,0x30,0x40,0x84,0x04,0x20,0x00,0x5A,0x04,0x20,0x00,0x5A,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x00,0x40,0xAA,0x04,0x40,0x00,0xAA,0x04,0x40,0x00,0xBA,0x44,0x00,0x10,0xAA,0x30,0x08,0x00,0x44,0x04,0x00,0x00,0x3A,0x00,0x00,0x00,0x04,0x07,
+	0x00,0x00,0x00,0x78,0x00,0x18,0x60,0x84,0x04,0x20,0x00,0x5A,0x24,0x00,0x00,0x5A,0x28,0x10,0x00,0x44,0x24,0x00,0x00,0x5A,0x24,0x00,0x00,0x5A,0x04,0x20,0x40,0x9A,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xBA,0x00,0x40,0x00,0xBC,0x08,0x30,0x00,0x44,0x04,0x00,0x00,0x7A,0x04,0x00,0x40,0xBA,0x08,0x30,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7C,0x04,0x18,0x60,0x82,0x14,0x40,0x00,0xAA,0x10,0x00,0x00,0x6C,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x08,0x10,0x20,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x44,0x00,0xAA,0x04,0x40,0x00,0xAA,0x04,0x40,0x00,0xAA,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xBA,0x3C,0x00,0x00,0x42,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x04,0x40,0xAA,0x00,0x44,0x00,0xAA,0x04,0x40,0x00,0xAA,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x04,0x40,0xAA,0x04,0x40,0x00,0xAA,0x04,0x40,0x00,0xBA,0x54,0x00,0x00,0xAA,0x6C,0x00,0x00,0x92,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x04,0x40,0x00,0xAA,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x08,0x20,0x00,0x54,0x04,0x00,0x40,0xAA,0x04,0x40,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x04,0x00,0x40,0xAA,0x04,0x40,0x00,0xAA,0x04,0x40,0x00,0xBA,0x38,0x00,0x00,0x44,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x08,0x10,0x20,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x28,0x10,0x44,0x04,0x00,0x00,0x3A,0x04,0x08,0x30,0x42,0x04,0x40,0x00,0xBA,0x3C,0x00,0x00,0x42,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x58,0x00,0x28,0x00,0x54,0x04,0x20,0x10,0x4A,0x04,0x20,0x00,0x5A,0x04,0x20,0x00,0x5A,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xBA,0x00,0x40,0x00,0xA4,0x04,0x40,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x0C,0x00,0x04,0x08,0x12,0x08,0x00,0x00,0x34,0x08,0x20,0x00,0x54,0x18,0x40,0x00,0xA4,0x08,0x40,0x00,0xB4,0x08,0x40,0x00,0xB4,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x40,0x00,0xBC,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x00,0x08,0x10,0x24,0x04,0x00,0x20,0x5A,0x00,0x20,0x00,0x54,0x10,0x20,0x40,0x88,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x30,0x40,0x00,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x34,0x04,0x10,0x20,0x4A,0x08,0x00,0x40,0xB4,0x08,0x40,0x00,0xB4,0x38,0x00,0x00,0x44,0x04,0x00,0x40,0xBA,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x58,0x20,0x08,0x00,0x54,0x24,0x00,0x10,0x4A,0x24,0x00,0x00,0x5A,0x24,0x00,0x00,0x5A,0x04,0x20,0x40,0x9A,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x00,0x00,0x60,0x00,0x40,0x20,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x04,0x00,0x00,0x04,0x0A,0x00,0x00,0x00,0x04,0x00,0x00,0x04,0x0A,0x00,0x04,0x00,0x0A,0x04,0x00,0x00,0x0A,0x04,0x00,0x00,0x4A,0x04,0x00,0x40,0xBA,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x00,0x60,0x90,0x00,0x20,0x00,0x54,0x20,0x04,0x00,0x5A,0x20,0x00,0x08,0x54,0x20,0x10,0x00,0x48,0x28,0x00,0x00,0x54,0x04,0x20,0x40,0x9A,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xB4,0x24,0x48,0x00,0x92,0x44,0x10,0x00,0xAA,0x44,0x00,0x00,0xBA,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x08,0x10,0x60,0x84,0x04,0x00,0x40,0xBA,0x04,0x40,0x00,0xAA,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x40,0x00,0xAA,0x44,0x00,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x00,0x08,0x50,0xA4,0x04,0x20,0x00,0x5A,0x24,0x00,0x00,0x5A,0x38,0x00,0x00,0x44,0x20,0x00,0x00,0x58,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x34,0x00,0x14,0x20,0x4A,0x08,0x40,0x00,0xB4,0x48,0x00,0x00,0xB4,0x38,0x00,0x00,0x44,0x08,0x00,0x00,0x34,0x04,0x08,0x10,0x22,0x00,0x00,0x00,0x1C,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x00,0x08,0x50,0xA4,0x04,0x20,0x00,0x5A,0x24,0x00,0x00,0x5A,0x20,0x00,0x00,0x54,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x04,0x18,0x20,0x42,0x00,0x40,0x00,0xBC,0x38,0x00,0x00,0x44,0x04,0x00,0x00,0x7A,0x38,0x00,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x20,0x00,0x58,0x08,0x30,0x40,0x84,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x54,0x04,0x20,0x00,0x5A,0x08,0x10,0x00,0x24,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xB4,0x00,0x48,0x00,0xB4,0x08,0x40,0x00,0xB4,0x48,0x00,0x00,0xB4,0x34,0x00,0x00,0x4A,0x00,0x00,0x00,0x34,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x44,0x00,0xAA,0x04,0x40,0x00,0xAA,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x44,0x00,0xBA,0x14,0x40,0x00,0xAA,0x2C,0x40,0x00,0x92,0x48,0x00,0x00,0xB4,0x00,0x00,0x00,0x48,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x28,0x00,0x54,0x10,0x00,0x00,0x28,0x08,0x20,0x00,0x54,0x04,0x40,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x44,0x00,0xAA,0x04,0x40,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x10,0x00,0x68,0x00,0x20,0x40,0x90,0x00,0x00,0x00,0x60,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x08,0x40,0x00,0xB4,0x00,0x10,0x00,0x6C,0x04,0x20,0x00,0x5A,0x3C,0x00,0x40,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07
+};
+
+static const byte german_simon1AGAFontData[] = {
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x20,0x10,0x40,0x88,0x30,0x40,0x00,0x88,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x00,0x00,0x38,0x00,0x28,0x10,0x44,0x04,0x00,0x00,0x3a,0x04,0x08,0x30,0x42,0x04,0x40,0x00,0xba,0x3c,0x00,0x00,0x42,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x50,0x00,0x00,0x50,0xa8,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x00,0x48,0x00,0xb4,0x08,0x40,0x00,0xb4,0x48,0x00,0x00,0xb4,0x34,0x00,0x00,0x4a,0x00,0x00,0x00,0x34,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x10,0x00,0x40,0xa8,0x18,0x20,0x00,0x44,0x10,0x00,0x00,0x28,0x18,0x20,0x00,0x44,0x10,0x00,0x40,0xac,0x0c,0x20,0x00,0x52,0x00,0x00,0x00,0x2c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x30,0x10,0x20,0x00,0x48,0x08,0x00,0x40,0xb4,0x08,0x40,0x00,0xb4,0x50,0x00,0x00,0xa8,0x48,0x00,0x00,0xb4,0x48,0x00,0x00,0xb4,0x50,0x00,0x00,0xa8,0x40,0x00,0x00,0xa0,0x00,0x00,0x00,0x00,0x06,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x05,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x18,0x20,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x04,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x0c,0x70,0x00,0x82,0x04,0x40,0x00,0xba,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x0c,0x00,0x40,0xb2,0x04,0x50,0x00,0xaa,0x44,0x20,0x00,0x9a,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x00,0x5a,0x08,0x10,0x00,0x24,0x00,0x20,0x00,0x5c,0x00,0x04,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x00,0x5a,0x00,0x08,0x10,0x24,0x04,0x00,0x00,0x5a,0x04,0x00,0x40,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x14,0x08,0x00,0x10,0x24,0x08,0x00,0x20,0x54,0x08,0x40,0x00,0xb4,0x3c,0x40,0x00,0x82,0x08,0x00,0x00,0x74,0x04,0x08,0x10,0x22,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x18,0x60,0x82,0x00,0x40,0x00,0xbc,0x78,0x00,0x00,0x84,0x04,0x00,0x00,0x7a,0x04,0x00,0x00,0x4a,0x04,0x00,0x40,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x08,0x10,0x00,0x24,0x00,0x00,0x20,0x58,0x00,0x40,0x00,0xb8,0x38,0x40,0x00,0x84,0x44,0x00,0x00,0xba,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xba,0x00,0x04,0x00,0x4a,0x00,0x00,0x08,0x14,0x00,0x10,0x00,0x28,0x00,0x10,0x00,0x28,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xba,0x18,0x20,0x00,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xba,0x1c,0x20,0x00,0x42,0x04,0x00,0x00,0x3a,0x00,0x08,0x00,0x34,0x00,0x10,0x20,0x48,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x04,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x00,0x00,0x6c,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xaa,0x3c,0x00,0x00,0x42,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x50,0x00,0x00,0x50,0xa8,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x00,0x48,0x00,0xb4,0x08,0x40,0x00,0xb4,0x48,0x00,0x00,0xb4,0x34,0x00,0x00,0x4a,0x00,0x00,0x00,0x34,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x10,0x28,0x00,0x08,0x20,0x54,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x40,0x00,0xbc,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x40,0x00,0xba,0x04,0x00,0x00,0x4a,0x08,0x00,0x00,0x14,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x20,0x50,0x00,0x10,0x40,0xa8,0x00,0x00,0x00,0x60,0x00,0x40,0x20,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x40,0xba,0x0c,0x70,0x00,0x82,0x04,0x40,0x00,0xba,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x78,0x08,0x10,0x60,0x84,0x04,0x00,0x20,0x5a,0x04,0x20,0x00,0x5a,0x28,0x10,0x00,0x44,0x24,0x00,0x00,0x5a,0x24,0x00,0x00,0x5a,0x18,0x20,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x24,0x04,0x00,0x20,0x5a,0x00,0x00,0x40,0xa4,0x00,0x00,0x40,0xa0,0x00,0x40,0x00,0xa4,0x24,0x00,0x00,0x5a,0x18,0x00,0x00,0x24,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x70,0x10,0x20,0x40,0x88,0x08,0x20,0x00,0x54,0x04,0x20,0x00,0x5a,0x04,0x20,0x00,0x5a,0x24,0x00,0x00,0x5a,0x28,0x00,0x00,0x54,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x18,0x60,0x82,0x04,0x20,0x00,0x5a,0x00,0x20,0x00,0x5c,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x5c,0x20,0x04,0x00,0x5a,0x0c,0x30,0x40,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x18,0x60,0x82,0x04,0x20,0x00,0x5a,0x00,0x20,0x00,0x5c,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x24,0x04,0x00,0x20,0x5a,0x00,0x40,0x00,0xac,0x00,0x44,0x08,0xb2,0x44,0x00,0x00,0xaa,0x24,0x00,0x00,0x5a,0x1c,0x00,0x00,0x22,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xba,0x4c,0x30,0x00,0x82,0x44,0x00,0x00,0xba,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x00,0x10,0x00,0x6c,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x6c,0x1c,0x20,0x40,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x0c,0x00,0x04,0x08,0x12,0x00,0x04,0x00,0x0a,0x04,0x00,0x00,0x0a,0x04,0x00,0x00,0x4a,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x64,0x00,0x24,0x40,0x9a,0x00,0x24,0x00,0x5a,0x20,0x08,0x00,0x54,0x20,0x10,0x00,0x48,0x28,0x00,0x00,0x54,0x24,0x00,0x00,0x5a,0x04,0x20,0x40,0x9a,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x70,0x00,0x30,0x40,0x88,0x00,0x20,0x00,0x50,0x00,0x20,0x00,0x50,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x54,0x24,0x00,0x00,0x5a,0x1c,0x20,0x40,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x04,0x40,0xaa,0x24,0x40,0x08,0x92,0x04,0x50,0x00,0xaa,0x14,0x40,0x00,0xaa,0x44,0x00,0x00,0xba,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x20,0x44,0x00,0x9a,0x14,0x40,0x00,0xaa,0x0c,0x40,0x00,0xb2,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x78,0x08,0x30,0x40,0x84,0x04,0x20,0x00,0x5a,0x04,0x20,0x00,0x5a,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xba,0x44,0x00,0x10,0xaa,0x30,0x08,0x00,0x44,0x04,0x00,0x00,0x3a,0x00,0x00,0x00,0x04,0x07,
+	0x00,0x00,0x00,0x78,0x00,0x18,0x60,0x84,0x04,0x20,0x00,0x5a,0x24,0x00,0x00,0x5a,0x28,0x10,0x00,0x44,0x24,0x00,0x00,0x5a,0x24,0x00,0x00,0x5a,0x04,0x20,0x40,0x9a,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x00,0x40,0x00,0xbc,0x08,0x30,0x00,0x44,0x04,0x00,0x00,0x7a,0x04,0x00,0x40,0xba,0x08,0x30,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x18,0x60,0x82,0x14,0x40,0x00,0xaa,0x10,0x00,0x00,0x6c,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x08,0x10,0x20,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xba,0x3c,0x00,0x00,0x42,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x04,0x40,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xaa,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x04,0x40,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xba,0x54,0x00,0x00,0xaa,0x6c,0x00,0x00,0x92,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x04,0x40,0x00,0xaa,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x08,0x20,0x00,0x54,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x08,0x10,0x20,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xba,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xba,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xba,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x00,0x48,0x00,0xb4,0x10,0x00,0x00,0x68,0x00,0x20,0x00,0x58,0x00,0x08,0x40,0xb4,0x08,0x40,0x00,0xb4,0x00,0x00,0x00,0x48,0x00,0x00,0x00,0x00,0x06,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xa0,0x00,0x40,0x00,0xb8,0x38,0x00,0x00,0x44,0x10,0x00,0x00,0x28,0x00,0x10,0x20,0x48,0x00,0x00,0x00,0x30,0x06,
+	0x00,0x00,0x00,0x50,0x00,0x00,0x50,0xa8,0x00,0x00,0x00,0x50,0x00,0x40,0x20,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x20,0x50,0x00,0x10,0x00,0x28,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x00,0x48,0x00,0xb4,0x08,0x40,0x00,0xb4,0x48,0x00,0x00,0xb4,0x34,0x00,0x00,0x4a,0x00,0x00,0x00,0x34,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x28,0x10,0x44,0x04,0x00,0x00,0x3a,0x04,0x08,0x30,0x42,0x04,0x40,0x00,0xba,0x3c,0x00,0x00,0x42,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x58,0x00,0x28,0x00,0x54,0x04,0x20,0x10,0x4a,0x04,0x20,0x00,0x5a,0x04,0x20,0x00,0x5a,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x00,0x40,0x00,0xa4,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x0c,0x00,0x04,0x08,0x12,0x08,0x00,0x00,0x34,0x08,0x20,0x00,0x54,0x18,0x40,0x00,0xa4,0x08,0x40,0x00,0xb4,0x08,0x40,0x00,0xb4,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x40,0x00,0xbc,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x00,0x08,0x10,0x24,0x04,0x00,0x20,0x5a,0x00,0x20,0x00,0x54,0x10,0x20,0x40,0x88,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x30,0x40,0x00,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x34,0x04,0x10,0x20,0x4a,0x08,0x00,0x40,0xb4,0x08,0x40,0x00,0xb4,0x38,0x00,0x00,0x44,0x04,0x00,0x40,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x58,0x20,0x08,0x00,0x54,0x24,0x00,0x10,0x4a,0x24,0x00,0x00,0x5a,0x24,0x00,0x00,0x5a,0x04,0x20,0x40,0x9a,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x00,0x00,0x60,0x00,0x40,0x20,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x04,0x00,0x00,0x04,0x0a,0x00,0x00,0x00,0x04,0x00,0x00,0x04,0x0a,0x00,0x04,0x00,0x0a,0x04,0x00,0x00,0x0a,0x04,0x00,0x00,0x4a,0x04,0x00,0x40,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x00,0x60,0x90,0x00,0x20,0x00,0x54,0x20,0x04,0x00,0x5a,0x20,0x00,0x08,0x54,0x20,0x10,0x00,0x48,0x28,0x00,0x00,0x54,0x04,0x20,0x40,0x9a,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x24,0x48,0x00,0x92,0x44,0x10,0x00,0xaa,0x44,0x00,0x00,0xba,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x08,0x10,0x60,0x84,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x00,0x08,0x50,0xa4,0x04,0x20,0x00,0x5a,0x24,0x00,0x00,0x5a,0x38,0x00,0x00,0x44,0x20,0x00,0x00,0x58,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x34,0x00,0x14,0x20,0x4a,0x08,0x40,0x00,0xb4,0x48,0x00,0x00,0xb4,0x38,0x00,0x00,0x44,0x08,0x00,0x00,0x34,0x04,0x08,0x10,0x22,0x00,0x00,0x00,0x1c,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x00,0x08,0x50,0xa4,0x04,0x20,0x00,0x5a,0x24,0x00,0x00,0x5a,0x20,0x00,0x00,0x54,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x04,0x18,0x20,0x42,0x00,0x40,0x00,0xbc,0x38,0x00,0x00,0x44,0x04,0x00,0x00,0x7a,0x38,0x00,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x20,0x00,0x58,0x08,0x30,0x40,0x84,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x54,0x04,0x20,0x00,0x5a,0x08,0x10,0x00,0x24,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x00,0x48,0x00,0xb4,0x08,0x40,0x00,0xb4,0x48,0x00,0x00,0xb4,0x34,0x00,0x00,0x4a,0x00,0x00,0x00,0x34,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xaa,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xba,0x14,0x40,0x00,0xaa,0x2c,0x40,0x00,0x92,0x48,0x00,0x00,0xb4,0x00,0x00,0x00,0x48,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x28,0x00,0x54,0x10,0x00,0x00,0x28,0x08,0x20,0x00,0x54,0x04,0x40,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x10,0x00,0x68,0x00,0x20,0x40,0x90,0x00,0x00,0x00,0x60,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x08,0x40,0x00,0xb4,0x00,0x10,0x00,0x6c,0x04,0x20,0x00,0x5a,0x3c,0x00,0x40,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07
+};
+
+static const byte french_simon1AGAFontData[] = {
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x20,0x10,0x40,0x88,0x30,0x40,0x00,0x88,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x10,0x28,0x00,0x08,0x20,0x54,0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x10,0x28,0x00,0x08,0x20,0x54,0x00,0x00,0x00,0x38,0x00,0x28,0x10,0x44,0x04,0x00,0x00,0x3a,0x04,0x08,0x30,0x42,0x04,0x40,0x00,0xba,0x3c,0x00,0x00,0x42,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x00,0x40,0x00,0xa4,0x00,0x40,0x00,0xa0,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x10,0x00,0x00,0x28,0x00,0x10,0x20,0x48,0x00,0x00,0x00,0x30,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x10,0x00,0x40,0xa8,0x18,0x20,0x00,0x44,0x10,0x00,0x00,0x28,0x18,0x20,0x00,0x44,0x10,0x00,0x40,0xac,0x0c,0x20,0x00,0x52,0x00,0x00,0x00,0x2c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x00,0x40,0x00,0xa4,0x00,0x40,0x00,0xa0,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x10,0x00,0x00,0x28,0x00,0x10,0x20,0x48,0x00,0x00,0x00,0x30,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x05,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x18,0x20,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x04,
+	0x00,0x00,0x10,0x28,0x00,0x00,0x20,0x50,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x40,0x00,0xbc,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x0c,0x00,0x40,0xb2,0x04,0x50,0x00,0xaa,0x44,0x20,0x00,0x9a,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x00,0x5a,0x08,0x10,0x00,0x24,0x00,0x20,0x00,0x5c,0x00,0x04,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x00,0x5a,0x00,0x08,0x10,0x24,0x04,0x00,0x00,0x5a,0x04,0x00,0x40,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x14,0x08,0x00,0x10,0x24,0x08,0x00,0x20,0x54,0x08,0x40,0x00,0xb4,0x3c,0x40,0x00,0x82,0x08,0x00,0x00,0x74,0x04,0x08,0x10,0x22,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x18,0x60,0x82,0x00,0x40,0x00,0xbc,0x78,0x00,0x00,0x84,0x04,0x00,0x00,0x7a,0x04,0x00,0x00,0x4a,0x04,0x00,0x40,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x08,0x10,0x00,0x24,0x00,0x00,0x20,0x58,0x00,0x40,0x00,0xb8,0x38,0x40,0x00,0x84,0x44,0x00,0x00,0xba,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xba,0x00,0x04,0x00,0x4a,0x00,0x00,0x08,0x14,0x00,0x10,0x00,0x28,0x00,0x10,0x00,0x28,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xba,0x18,0x20,0x00,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xba,0x1c,0x20,0x00,0x42,0x04,0x00,0x00,0x3a,0x00,0x08,0x00,0x34,0x00,0x10,0x20,0x48,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x04,
+	0x00,0x00,0x10,0x28,0x00,0x08,0x00,0x14,0x00,0x00,0x00,0x38,0x00,0x28,0x10,0x44,0x04,0x00,0x00,0x3a,0x04,0x08,0x30,0x42,0x04,0x40,0x00,0xba,0x3c,0x00,0x00,0x42,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x20,0x50,0x00,0x10,0x40,0xa8,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x00,0x48,0x00,0xb4,0x08,0x40,0x00,0xb4,0x48,0x00,0x00,0xb4,0x34,0x00,0x00,0x4a,0x00,0x00,0x00,0x34,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x10,0x28,0x00,0x08,0x00,0x14,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x40,0x00,0xbc,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x10,0x28,0x00,0x08,0x20,0x54,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x40,0x00,0xbc,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x40,0x00,0xba,0x04,0x00,0x00,0x4a,0x08,0x00,0x00,0x14,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x20,0x50,0x00,0x10,0x40,0xa8,0x00,0x00,0x00,0x60,0x00,0x40,0x20,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x40,0xba,0x0c,0x70,0x00,0x82,0x04,0x40,0x00,0xba,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x78,0x08,0x10,0x60,0x84,0x04,0x00,0x20,0x5a,0x04,0x20,0x00,0x5a,0x28,0x10,0x00,0x44,0x24,0x00,0x00,0x5a,0x24,0x00,0x00,0x5a,0x18,0x20,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x24,0x04,0x00,0x20,0x5a,0x00,0x00,0x40,0xa4,0x00,0x00,0x40,0xa0,0x00,0x40,0x00,0xa4,0x24,0x00,0x00,0x5a,0x18,0x00,0x00,0x24,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x70,0x10,0x20,0x40,0x88,0x08,0x20,0x00,0x54,0x04,0x20,0x00,0x5a,0x04,0x20,0x00,0x5a,0x24,0x00,0x00,0x5a,0x28,0x00,0x00,0x54,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x18,0x60,0x82,0x04,0x20,0x00,0x5a,0x00,0x20,0x00,0x5c,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x5c,0x20,0x04,0x00,0x5a,0x0c,0x30,0x40,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x18,0x60,0x82,0x04,0x20,0x00,0x5a,0x00,0x20,0x00,0x5c,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x24,0x04,0x00,0x20,0x5a,0x00,0x40,0x00,0xac,0x00,0x44,0x08,0xb2,0x44,0x00,0x00,0xaa,0x24,0x00,0x00,0x5a,0x1c,0x00,0x00,0x22,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xba,0x4c,0x30,0x00,0x82,0x44,0x00,0x00,0xba,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x00,0x10,0x00,0x6c,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x6c,0x1c,0x20,0x40,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x0c,0x00,0x04,0x08,0x12,0x00,0x04,0x00,0x0a,0x04,0x00,0x00,0x0a,0x04,0x00,0x00,0x4a,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x64,0x00,0x24,0x40,0x9a,0x00,0x24,0x00,0x5a,0x20,0x08,0x00,0x54,0x20,0x10,0x00,0x48,0x28,0x00,0x00,0x54,0x24,0x00,0x00,0x5a,0x04,0x20,0x40,0x9a,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x70,0x00,0x30,0x40,0x88,0x00,0x20,0x00,0x50,0x00,0x20,0x00,0x50,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x54,0x24,0x00,0x00,0x5a,0x1c,0x20,0x40,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x04,0x40,0xaa,0x24,0x40,0x08,0x92,0x04,0x50,0x00,0xaa,0x14,0x40,0x00,0xaa,0x44,0x00,0x00,0xba,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x20,0x44,0x00,0x9a,0x14,0x40,0x00,0xaa,0x0c,0x40,0x00,0xb2,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x78,0x08,0x30,0x40,0x84,0x04,0x20,0x00,0x5a,0x04,0x20,0x00,0x5a,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xba,0x44,0x00,0x10,0xaa,0x30,0x08,0x00,0x44,0x04,0x00,0x00,0x3a,0x00,0x00,0x00,0x04,0x07,
+	0x00,0x00,0x00,0x78,0x00,0x18,0x60,0x84,0x04,0x20,0x00,0x5a,0x24,0x00,0x00,0x5a,0x28,0x10,0x00,0x44,0x24,0x00,0x00,0x5a,0x24,0x00,0x00,0x5a,0x04,0x20,0x40,0x9a,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x00,0x40,0x00,0xbc,0x08,0x30,0x00,0x44,0x04,0x00,0x00,0x7a,0x04,0x00,0x40,0xba,0x08,0x30,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x18,0x60,0x82,0x14,0x40,0x00,0xaa,0x10,0x00,0x00,0x6c,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x08,0x10,0x20,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xba,0x3c,0x00,0x00,0x42,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x04,0x40,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xaa,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x04,0x40,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xba,0x54,0x00,0x00,0xaa,0x6c,0x00,0x00,0x92,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x04,0x40,0x00,0xaa,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x08,0x20,0x00,0x54,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x08,0x10,0x20,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xba,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xba,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xba,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x00,0x48,0x00,0xb4,0x10,0x00,0x00,0x68,0x00,0x20,0x00,0x58,0x00,0x08,0x40,0xb4,0x08,0x40,0x00,0xb4,0x00,0x00,0x00,0x48,0x00,0x00,0x00,0x00,0x06,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xa0,0x00,0x40,0x00,0xb8,0x38,0x00,0x00,0x44,0x10,0x00,0x00,0x28,0x00,0x10,0x20,0x48,0x00,0x00,0x00,0x30,0x06,
+	0x00,0x00,0x00,0x50,0x00,0x00,0x50,0xa8,0x00,0x00,0x00,0x50,0x00,0x40,0x20,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x20,0x50,0x00,0x10,0x00,0x28,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x00,0x48,0x00,0xb4,0x08,0x40,0x00,0xb4,0x48,0x00,0x00,0xb4,0x34,0x00,0x00,0x4a,0x00,0x00,0x00,0x34,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x28,0x10,0x44,0x04,0x00,0x00,0x3a,0x04,0x08,0x30,0x42,0x04,0x40,0x00,0xba,0x3c,0x00,0x00,0x42,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x58,0x00,0x28,0x00,0x54,0x04,0x20,0x10,0x4a,0x04,0x20,0x00,0x5a,0x04,0x20,0x00,0x5a,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x00,0x40,0x00,0xa4,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x0c,0x00,0x04,0x08,0x12,0x08,0x00,0x00,0x34,0x08,0x20,0x00,0x54,0x18,0x40,0x00,0xa4,0x08,0x40,0x00,0xb4,0x08,0x40,0x00,0xb4,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x40,0x00,0xbc,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x00,0x08,0x10,0x24,0x04,0x00,0x20,0x5a,0x00,0x20,0x00,0x54,0x10,0x20,0x40,0x88,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x30,0x40,0x00,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x34,0x04,0x10,0x20,0x4a,0x08,0x00,0x40,0xb4,0x08,0x40,0x00,0xb4,0x38,0x00,0x00,0x44,0x04,0x00,0x40,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x58,0x20,0x08,0x00,0x54,0x24,0x00,0x10,0x4a,0x24,0x00,0x00,0x5a,0x24,0x00,0x00,0x5a,0x04,0x20,0x40,0x9a,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x00,0x00,0x60,0x00,0x40,0x20,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x04,0x00,0x00,0x04,0x0a,0x00,0x00,0x00,0x04,0x00,0x00,0x04,0x0a,0x00,0x04,0x00,0x0a,0x04,0x00,0x00,0x0a,0x04,0x00,0x00,0x4a,0x04,0x00,0x40,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x00,0x60,0x90,0x00,0x20,0x00,0x54,0x20,0x04,0x00,0x5a,0x20,0x00,0x08,0x54,0x20,0x10,0x00,0x48,0x28,0x00,0x00,0x54,0x04,0x20,0x40,0x9a,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x24,0x48,0x00,0x92,0x44,0x10,0x00,0xaa,0x44,0x00,0x00,0xba,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x08,0x10,0x60,0x84,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x00,0x08,0x50,0xa4,0x04,0x20,0x00,0x5a,0x24,0x00,0x00,0x5a,0x38,0x00,0x00,0x44,0x20,0x00,0x00,0x58,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x34,0x00,0x14,0x20,0x4a,0x08,0x40,0x00,0xb4,0x48,0x00,0x00,0xb4,0x38,0x00,0x00,0x44,0x08,0x00,0x00,0x34,0x04,0x08,0x10,0x22,0x00,0x00,0x00,0x1c,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x00,0x08,0x50,0xa4,0x04,0x20,0x00,0x5a,0x24,0x00,0x00,0x5a,0x20,0x00,0x00,0x54,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x04,0x18,0x20,0x42,0x00,0x40,0x00,0xbc,0x38,0x00,0x00,0x44,0x04,0x00,0x00,0x7a,0x38,0x00,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x20,0x00,0x58,0x08,0x30,0x40,0x84,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x54,0x04,0x20,0x00,0x5a,0x08,0x10,0x00,0x24,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x00,0x48,0x00,0xb4,0x08,0x40,0x00,0xb4,0x48,0x00,0x00,0xb4,0x34,0x00,0x00,0x4a,0x00,0x00,0x00,0x34,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xaa,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xba,0x14,0x40,0x00,0xaa,0x2c,0x40,0x00,0x92,0x48,0x00,0x00,0xb4,0x00,0x00,0x00,0x48,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x28,0x00,0x54,0x10,0x00,0x00,0x28,0x08,0x20,0x00,0x54,0x04,0x40,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x10,0x00,0x68,0x00,0x20,0x40,0x90,0x00,0x00,0x00,0x60,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x08,0x40,0x00,0xb4,0x00,0x10,0x00,0x6c,0x04,0x20,0x00,0x5a,0x3c,0x00,0x40,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07
+};
+
+static const byte italian_simon1AGAFontData[] = {
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x20,0x10,0x40,0x88,0x30,0x40,0x00,0x88,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x00,0x00,0x38,0x00,0x28,0x10,0x44,0x04,0x00,0x00,0x3a,0x04,0x08,0x30,0x42,0x04,0x40,0x00,0xba,0x3c,0x00,0x00,0x42,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x10,0x28,0x00,0x08,0x00,0x14,0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x10,0x00,0x40,0xa8,0x18,0x20,0x00,0x44,0x10,0x00,0x00,0x28,0x18,0x20,0x00,0x44,0x10,0x00,0x40,0xac,0x0c,0x20,0x00,0x52,0x00,0x00,0x00,0x2c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1c,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x20,0x50,0x00,0x10,0x00,0x28,0x00,0x00,0x00,0x60,0x00,0x40,0x20,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x05,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x18,0x20,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x04,
+	0x00,0x00,0x10,0x28,0x00,0x00,0x20,0x50,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x40,0x00,0xbc,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x0c,0x00,0x40,0xb2,0x04,0x50,0x00,0xaa,0x44,0x20,0x00,0x9a,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x00,0x5a,0x08,0x10,0x00,0x24,0x00,0x20,0x00,0x5c,0x00,0x04,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x00,0x5a,0x00,0x08,0x10,0x24,0x04,0x00,0x00,0x5a,0x04,0x00,0x40,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x14,0x08,0x00,0x10,0x24,0x08,0x00,0x20,0x54,0x08,0x40,0x00,0xb4,0x3c,0x40,0x00,0x82,0x08,0x00,0x00,0x74,0x04,0x08,0x10,0x22,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x18,0x60,0x82,0x00,0x40,0x00,0xbc,0x78,0x00,0x00,0x84,0x04,0x00,0x00,0x7a,0x04,0x00,0x00,0x4a,0x04,0x00,0x40,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x08,0x10,0x00,0x24,0x00,0x00,0x20,0x58,0x00,0x40,0x00,0xb8,0x38,0x40,0x00,0x84,0x44,0x00,0x00,0xba,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xba,0x00,0x04,0x00,0x4a,0x00,0x00,0x08,0x14,0x00,0x10,0x00,0x28,0x00,0x10,0x00,0x28,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xba,0x18,0x20,0x00,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xba,0x1c,0x20,0x00,0x42,0x04,0x00,0x00,0x3a,0x00,0x08,0x00,0x34,0x00,0x10,0x20,0x48,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x04,
+	0x00,0x00,0x10,0x28,0x00,0x08,0x00,0x14,0x00,0x00,0x00,0x38,0x00,0x28,0x10,0x44,0x04,0x00,0x00,0x3a,0x04,0x08,0x30,0x42,0x04,0x40,0x00,0xba,0x3c,0x00,0x00,0x42,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x10,0x28,0x00,0x08,0x00,0x14,0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x10,0x28,0x00,0x08,0x00,0x14,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x40,0x00,0xbc,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x10,0x28,0x00,0x08,0x20,0x54,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x40,0x00,0xbc,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x40,0x00,0xba,0x04,0x00,0x00,0x4a,0x08,0x00,0x00,0x14,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x20,0x50,0x00,0x10,0x40,0xa8,0x00,0x00,0x00,0x60,0x00,0x40,0x20,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x40,0xba,0x0c,0x70,0x00,0x82,0x04,0x40,0x00,0xba,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x78,0x08,0x10,0x60,0x84,0x04,0x00,0x20,0x5a,0x04,0x20,0x00,0x5a,0x28,0x10,0x00,0x44,0x24,0x00,0x00,0x5a,0x24,0x00,0x00,0x5a,0x18,0x20,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x24,0x04,0x00,0x20,0x5a,0x00,0x00,0x40,0xa4,0x00,0x00,0x40,0xa0,0x00,0x40,0x00,0xa4,0x24,0x00,0x00,0x5a,0x18,0x00,0x00,0x24,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x70,0x10,0x20,0x40,0x88,0x08,0x20,0x00,0x54,0x04,0x20,0x00,0x5a,0x04,0x20,0x00,0x5a,0x24,0x00,0x00,0x5a,0x28,0x00,0x00,0x54,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x18,0x60,0x82,0x04,0x20,0x00,0x5a,0x00,0x20,0x00,0x5c,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x5c,0x20,0x04,0x00,0x5a,0x0c,0x30,0x40,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x18,0x60,0x82,0x04,0x20,0x00,0x5a,0x00,0x20,0x00,0x5c,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x24,0x04,0x00,0x20,0x5a,0x00,0x40,0x00,0xac,0x00,0x44,0x08,0xb2,0x44,0x00,0x00,0xaa,0x24,0x00,0x00,0x5a,0x1c,0x00,0x00,0x22,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xba,0x4c,0x30,0x00,0x82,0x44,0x00,0x00,0xba,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x00,0x10,0x00,0x6c,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x6c,0x1c,0x20,0x40,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x0c,0x00,0x04,0x08,0x12,0x00,0x04,0x00,0x0a,0x04,0x00,0x00,0x0a,0x04,0x00,0x00,0x4a,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x64,0x00,0x24,0x40,0x9a,0x00,0x24,0x00,0x5a,0x20,0x08,0x00,0x54,0x20,0x10,0x00,0x48,0x28,0x00,0x00,0x54,0x24,0x00,0x00,0x5a,0x04,0x20,0x40,0x9a,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x70,0x00,0x30,0x40,0x88,0x00,0x20,0x00,0x50,0x00,0x20,0x00,0x50,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x54,0x24,0x00,0x00,0x5a,0x1c,0x20,0x40,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x04,0x40,0xaa,0x24,0x40,0x08,0x92,0x04,0x50,0x00,0xaa,0x14,0x40,0x00,0xaa,0x44,0x00,0x00,0xba,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x20,0x44,0x00,0x9a,0x14,0x40,0x00,0xaa,0x0c,0x40,0x00,0xb2,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x78,0x08,0x30,0x40,0x84,0x04,0x20,0x00,0x5a,0x04,0x20,0x00,0x5a,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xba,0x44,0x00,0x10,0xaa,0x30,0x08,0x00,0x44,0x04,0x00,0x00,0x3a,0x00,0x00,0x00,0x04,0x07,
+	0x00,0x00,0x00,0x78,0x00,0x18,0x60,0x84,0x04,0x20,0x00,0x5a,0x24,0x00,0x00,0x5a,0x28,0x10,0x00,0x44,0x24,0x00,0x00,0x5a,0x24,0x00,0x00,0x5a,0x04,0x20,0x40,0x9a,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xba,0x00,0x40,0x00,0xbc,0x08,0x30,0x00,0x44,0x04,0x00,0x00,0x7a,0x04,0x00,0x40,0xba,0x08,0x30,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x18,0x60,0x82,0x14,0x40,0x00,0xaa,0x10,0x00,0x00,0x6c,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x08,0x10,0x20,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xba,0x3c,0x00,0x00,0x42,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x04,0x40,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xaa,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x04,0x40,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xba,0x54,0x00,0x00,0xaa,0x6c,0x00,0x00,0x92,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x04,0x40,0x00,0xaa,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x08,0x20,0x00,0x54,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x44,0x04,0x00,0x40,0xaa,0x04,0x40,0x00,0xaa,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x08,0x10,0x20,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xba,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xba,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xba,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x00,0x48,0x00,0xb4,0x10,0x00,0x00,0x68,0x00,0x20,0x00,0x58,0x00,0x08,0x40,0xb4,0x08,0x40,0x00,0xb4,0x00,0x00,0x00,0x48,0x00,0x00,0x00,0x00,0x06,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xa0,0x00,0x40,0x00,0xb8,0x38,0x00,0x00,0x44,0x10,0x00,0x00,0x28,0x00,0x10,0x20,0x48,0x00,0x00,0x00,0x30,0x06,
+	0x00,0x00,0x00,0x50,0x00,0x00,0x50,0xa8,0x00,0x00,0x00,0x50,0x00,0x40,0x20,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x20,0x50,0x00,0x10,0x00,0x28,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x00,0x48,0x00,0xb4,0x08,0x40,0x00,0xb4,0x48,0x00,0x00,0xb4,0x34,0x00,0x00,0x4a,0x00,0x00,0x00,0x34,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x28,0x10,0x44,0x04,0x00,0x00,0x3a,0x04,0x08,0x30,0x42,0x04,0x40,0x00,0xba,0x3c,0x00,0x00,0x42,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x58,0x00,0x28,0x00,0x54,0x04,0x20,0x10,0x4a,0x04,0x20,0x00,0x5a,0x04,0x20,0x00,0x5a,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x00,0x40,0x00,0xa4,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x0c,0x00,0x04,0x08,0x12,0x08,0x00,0x00,0x34,0x08,0x20,0x00,0x54,0x18,0x40,0x00,0xa4,0x08,0x40,0x00,0xb4,0x08,0x40,0x00,0xb4,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xba,0x3c,0x40,0x00,0x82,0x00,0x40,0x00,0xbc,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x18,0x00,0x08,0x10,0x24,0x04,0x00,0x20,0x5a,0x00,0x20,0x00,0x54,0x10,0x20,0x40,0x88,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x30,0x40,0x00,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x34,0x04,0x10,0x20,0x4a,0x08,0x00,0x40,0xb4,0x08,0x40,0x00,0xb4,0x38,0x00,0x00,0x44,0x04,0x00,0x40,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x58,0x20,0x08,0x00,0x54,0x24,0x00,0x10,0x4a,0x24,0x00,0x00,0x5a,0x24,0x00,0x00,0x5a,0x04,0x20,0x40,0x9a,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x00,0x00,0x60,0x00,0x40,0x20,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x04,0x00,0x00,0x04,0x0a,0x00,0x00,0x00,0x04,0x00,0x00,0x04,0x0a,0x00,0x04,0x00,0x0a,0x04,0x00,0x00,0x0a,0x04,0x00,0x00,0x4a,0x04,0x00,0x40,0xba,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x00,0x60,0x90,0x00,0x20,0x00,0x54,0x20,0x04,0x00,0x5a,0x20,0x00,0x08,0x54,0x20,0x10,0x00,0x48,0x28,0x00,0x00,0x54,0x04,0x20,0x40,0x9a,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x24,0x48,0x00,0x92,0x44,0x10,0x00,0xaa,0x44,0x00,0x00,0xba,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x08,0x10,0x60,0x84,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xaa,0x44,0x00,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xba,0x04,0x40,0x00,0xaa,0x44,0x00,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x00,0x08,0x50,0xa4,0x04,0x20,0x00,0x5a,0x24,0x00,0x00,0x5a,0x38,0x00,0x00,0x44,0x20,0x00,0x00,0x58,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x34,0x00,0x14,0x20,0x4a,0x08,0x40,0x00,0xb4,0x48,0x00,0x00,0xb4,0x38,0x00,0x00,0x44,0x08,0x00,0x00,0x34,0x04,0x08,0x10,0x22,0x00,0x00,0x00,0x1c,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x00,0x08,0x50,0xa4,0x04,0x20,0x00,0x5a,0x24,0x00,0x00,0x5a,0x20,0x00,0x00,0x54,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x04,0x18,0x20,0x42,0x00,0x40,0x00,0xbc,0x38,0x00,0x00,0x44,0x04,0x00,0x00,0x7a,0x38,0x00,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x20,0x00,0x58,0x08,0x30,0x40,0x84,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x54,0x04,0x20,0x00,0x5a,0x08,0x10,0x00,0x24,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xb4,0x00,0x48,0x00,0xb4,0x08,0x40,0x00,0xb4,0x48,0x00,0x00,0xb4,0x34,0x00,0x00,0x4a,0x00,0x00,0x00,0x34,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xaa,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xba,0x14,0x40,0x00,0xaa,0x2c,0x40,0x00,0x92,0x48,0x00,0x00,0xb4,0x00,0x00,0x00,0x48,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x28,0x00,0x54,0x10,0x00,0x00,0x28,0x08,0x20,0x00,0x54,0x04,0x40,0x00,0xaa,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xaa,0x00,0x44,0x00,0xaa,0x04,0x40,0x00,0xba,0x38,0x00,0x00,0x44,0x00,0x10,0x00,0x68,0x00,0x20,0x40,0x90,0x00,0x00,0x00,0x60,0x07,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x04,0x38,0x40,0x82,0x08,0x40,0x00,0xb4,0x00,0x10,0x00,0x6c,0x04,0x20,0x00,0x5a,0x3c,0x00,0x40,0x82,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0x07
+};
+
+void AGOSEngine::renderStringAmiga(uint vgaSpriteId, uint color, uint width, uint height, const char *txt) {
+	VgaPointersEntry *vpe = &_vgaBufferPointers[2];
+	byte *p, *dst, *dst_org, chr;
+	uint count;
+
+	if (vgaSpriteId >= 100) {
+		vgaSpriteId -= 100;
+		vpe++;
+	}
+
+	dst = vpe->vgaFile2;
+
+	count = 2000;
+	if (vgaSpriteId == 1)
+		count *= 2;
+
+	p = dst + vgaSpriteId * 8;
+	WRITE_BE_UINT16(p + 4, height);
+	WRITE_BE_UINT16(p + 6, width);
+	dst += READ_BE_UINT32(p);
+
+	width /= 8;	// convert width from pixels to bytes
+
+	const byte *imgSrc = NULL;
+	switch (_language) {
+	case Common::IT_ITA:
+		imgSrc = italian_simon1AGAFontData;
+		break;
+	case Common::FR_FRA:
+		imgSrc = french_simon1AGAFontData;
+		break;
+	case Common::DE_DEU:
+		imgSrc = german_simon1AGAFontData;
+		break;
+	case Common::EN_ANY:
+		imgSrc = english_simon1AGAFontData;
+		break;
+	default:
+		error("renderStringAmiga: Unknown language %d", _language);
+	}
+
+
+	uint charsize = width * height;
+	memset(dst, 0, count);
+	dst_org = dst;
+	int delta = 0;
+	while ((chr = *txt++) != 0) {
+		int img_width = 1;
+		if (chr == 10) {
+			dst += width * 10;
+			dst_org = dst;
+			delta = 0;
+		} else if ((signed char)(chr -= '!') < 0) {
+			img_width = 7;
+		} else {
+			const byte *img = imgSrc + chr * 41;
+			img_width = img[40];
+			byte *cur_dst = dst_org;
+			for (int row = 0; row < 10; row++) {
+				int col = color;
+				for (int plane = 0; plane < 3; plane++) {
+					chr = img[plane] >> delta;
+					if (chr) {
+						if (col & 1) cur_dst[charsize * 0] |= chr;
+						if (col & 2) cur_dst[charsize * 1] |= chr;
+						if (col & 4) cur_dst[charsize * 2] |= chr;
+						if (col & 8) cur_dst[charsize * 3] |= chr;
+					}
+					chr = img[plane] << (8 - delta);
+					if (((8 - delta) < img_width) && (chr)) {
+						if (col & 1) cur_dst[charsize * 0 + 1] |= chr;
+						if (col & 2) cur_dst[charsize * 1 + 1] |= chr;
+						if (col & 4) cur_dst[charsize * 2 + 1] |= chr;
+						if (col & 8) cur_dst[charsize * 3 + 1] |= chr;
+					}
+					col++;
+				}
+				chr = img[3] >> delta;
+				if (chr) {
+					cur_dst[charsize * 0] |= chr;
+					cur_dst[charsize * 1] |= chr;
+					cur_dst[charsize * 2] |= chr;
+					cur_dst[charsize * 3] |= chr;
+				}
+				chr = img[3] << (8 - delta);
+				if (((8 - delta) < img_width) && (chr)) {
+					cur_dst[charsize * 0 + 1] |= chr;
+					cur_dst[charsize * 1 + 1] |= chr;
+					cur_dst[charsize * 2 + 1] |= chr;
+					cur_dst[charsize * 3 + 1] |= chr;
+				}
+				cur_dst += width;
+				img += 4;
+			}
+		}
+		delta += img_width - 1;
+		if (delta >= 8) {
+			delta -= 8;
+			dst_org++;
+		}
+	}
+}
+
+void AGOSEngine::renderString(uint vgaSpriteId, uint color, uint width, uint height, const char *txt) {
+	VgaPointersEntry *vpe = &_vgaBufferPointers[2];
+	byte *src, *dst, *p, *dst_org, chr;
+	const int textHeight = (getGameType() == GType_FF || getGameType() == GType_PP) ? 15: 10;
+	uint count = 0;
+
+	if (vgaSpriteId >= 100) {
+		vgaSpriteId -= 100;
+		vpe++;
+	}
+
+	src = dst = vpe->vgaFile2;
+
+	if (getGameType() == GType_FF || getGameType() == GType_PP) {
+		if (vgaSpriteId == 1)
+			count = 45000;
+	} else {
+		count = 4000;
+		if (vgaSpriteId == 1)
+			count *= 2;
+	}
+
+	p = dst + vgaSpriteId * 8;
+
+	if (getGameType() == GType_FF || getGameType() == GType_PP) {
+		if (vgaSpriteId != 1)
+			WRITE_LE_UINT32(p, READ_LE_UINT32(p - 8) + READ_LE_UINT16(p - 4) * READ_LE_UINT16(p - 2));
+
+		WRITE_LE_UINT16(p + 4, height);
+		WRITE_LE_UINT16(p + 6, width);
+	} else {
+		WRITE_BE_UINT16(p + 4, height);
+		WRITE_BE_UINT16(p + 6, width);
+	}
+	dst += readUint32Wrapper(p);
+
+	if (count != 0)
+		memset(dst, 0, count);
+
+	if (_language == Common::HE_ISR)
+		dst += width - 1; // For Hebrew, start at the right edge, not the left.
+
+	dst_org = dst;
+	while ((chr = *txt++) != 0) {
+		if (chr == 10) {
+			dst_org += width * textHeight;
+			dst = dst_org;
+		} else if ((chr -= ' ') == 0) {
+			dst += (_language == Common::HE_ISR ? -6 : 6); // Hebrew moves to the left, all others to the right
+		} else {
+			byte *img_hdr, *img;
+			uint i, img_width, img_height;
+
+			if (getGameType() == GType_FF || getGameType() == GType_PP) {
+				img_hdr = src + 96 + chr * 8;
+				img_height = READ_LE_UINT16(img_hdr + 4);
+				img_width = READ_LE_UINT16(img_hdr + 6);
+				img = src + READ_LE_UINT32(img_hdr);
+			} else {
+				img_hdr = src + 48 + chr * 4;
+				img_height = img_hdr[2];
+				img_width = img_hdr[3];
+				img = src + READ_LE_UINT16(img_hdr);
+			}
+
+			if (_language == Common::HE_ISR)
+				dst -= img_width - 1; // For Hebrew, move from right edge to left edge of image.
+			byte *cur_dst = dst;
+
+			// Occurs in Amiga and Macintosh ports of The Feeble Files, when
+			// special characters are used by French/German/Spanish versions.
+			// Due to the English image data, been used by all languages.
+			if (img_width == 0 || img_height == 0)
+				continue;
+
+			assert(img_width < 50 && img_height < 50);
+
+			do {
+				for (i = 0; i != img_width; i++) {
+					chr = *img++;
+					if (chr) {
+						if (chr == 0xF)
+							chr = 207;
+						else
+							chr += color;
+						cur_dst[i] = chr;
+					}
+				}
+				cur_dst += width;
+			} while (--img_height);
+
+			if (_language != Common::HE_ISR) // Hebrew character movement is done higher up
+				dst += img_width - 1;
+		}
+	}
+}
+
 void AGOSEngine_Feeble::windowDrawChar(WindowBlock *window, uint x, uint y, byte chr) {
 	const byte *src;
 	byte color, *dst;
diff --git a/engines/agos/charset.cpp b/engines/agos/charset.cpp
index 54aef99a47..f58f4397b5 100644
--- a/engines/agos/charset.cpp
+++ b/engines/agos/charset.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-#include "common/endian.h"
 #include "common/system.h"
 
 #include "agos/agos.h"
@@ -99,280 +98,6 @@ void AGOSEngine::tidyIconArray(uint i) {
 	}
 }
 
-static const byte simon_agaFont[] = {
-	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x20,0x10,0x40,0x88,0x30,0x40,0x00,0x88,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x05,
-	0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,
-	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x10,0x00,0x00,0x10,0x28,0x08,0x10,0x20,0x44,0x00,0x40,0x00,0xB8,0x30,0x00,0x00,0x48,0x08,0x00,0x00,0x74,0x30,0x00,0x40,0x88,0x20,0x00,0x00,0x50,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x06,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xB4,0x00,0x48,0x00,0xB4,0x10,0x00,0x00,0x68,0x00,0x20,0x00,0x58,0x00,0x08,0x40,0xB4,0x08,0x40,0x00,0xB4,0x00,0x00,0x00,0x48,0x00,0x00,0x00,0x00,0x06,
-	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x10,0x00,0x40,0xA8,0x18,0x20,0x00,0x44,0x10,0x00,0x00,0x28,0x18,0x20,0x00,0x44,0x10,0x00,0x40,0xAC,0x0C,0x20,0x00,0x52,0x00,0x00,0x00,0x2C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,
-	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x28,0x00,0x00,0x28,0x54,0x00,0x28,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x1C,0x20,0x40,0x82,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x05,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x05,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x18,0x20,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x04,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x04,
-	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xBA,0x0C,0x00,0x40,0xB2,0x04,0x50,0x00,0xAA,0x44,0x20,0x00,0x9A,0x44,0x00,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
-	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xBA,0x04,0x00,0x00,0x5A,0x08,0x10,0x00,0x24,0x00,0x20,0x00,0x5C,0x00,0x04,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x00,0x00,0x5A,0x00,0x08,0x10,0x24,0x04,0x00,0x00,0x5A,0x04,0x00,0x40,0xBA,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x14,0x08,0x00,0x10,0x24,0x08,0x00,0x20,0x54,0x08,0x40,0x00,0xB4,0x3C,0x40,0x00,0x82,0x08,0x00,0x00,0x74,0x04,0x08,0x10,0x22,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x7C,0x04,0x18,0x60,0x82,0x00,0x40,0x00,0xBC,0x78,0x00,0x00,0x84,0x04,0x00,0x00,0x7A,0x04,0x00,0x00,0x4A,0x04,0x00,0x40,0xBA,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x18,0x08,0x10,0x00,0x24,0x00,0x00,0x20,0x58,0x00,0x40,0x00,0xB8,0x38,0x40,0x00,0x84,0x44,0x00,0x00,0xBA,0x44,0x00,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x00,0x04,0x00,0x4A,0x00,0x00,0x08,0x14,0x00,0x10,0x00,0x28,0x00,0x10,0x00,0x28,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x40,0x00,0xBA,0x18,0x20,0x00,0x44,0x04,0x00,0x40,0xBA,0x04,0x40,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x40,0x00,0xBA,0x1C,0x20,0x00,0x42,0x04,0x00,0x00,0x3A,0x00,0x08,0x00,0x34,0x00,0x10,0x20,0x48,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x04,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x10,0x20,0x48,0x10,0x20,0x00,0x48,0x20,0x40,0x00,0x90,0x00,0x00,0x00,0x60,0x05,
-	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x40,0x00,0xBA,0x04,0x00,0x00,0x4A,0x08,0x00,0x00,0x14,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x40,0x00,0xBA,0x04,0x00,0x00,0x4A,0x08,0x00,0x00,0x14,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x40,0x00,0xBA,0x04,0x00,0x00,0x4A,0x08,0x00,0x00,0x14,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x40,0x00,0xBA,0x04,0x00,0x00,0x4A,0x08,0x00,0x00,0x14,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xBA,0x04,0x40,0x10,0xAA,0x0C,0x50,0x00,0xA2,0x1C,0x40,0x00,0xA2,0x40,0x00,0x00,0xBC,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x00,0x40,0xBA,0x0C,0x70,0x00,0x82,0x04,0x40,0x00,0xBA,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x78,0x08,0x10,0x60,0x84,0x04,0x00,0x20,0x5A,0x04,0x20,0x00,0x5A,0x28,0x10,0x00,0x44,0x24,0x00,0x00,0x5A,0x24,0x00,0x00,0x5A,0x18,0x20,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x24,0x04,0x00,0x20,0x5A,0x00,0x00,0x40,0xA4,0x00,0x00,0x40,0xA0,0x00,0x40,0x00,0xA4,0x24,0x00,0x00,0x5A,0x18,0x00,0x00,0x24,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x70,0x10,0x20,0x40,0x88,0x08,0x20,0x00,0x54,0x04,0x20,0x00,0x5A,0x04,0x20,0x00,0x5A,0x24,0x00,0x00,0x5A,0x28,0x00,0x00,0x54,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x7C,0x04,0x18,0x60,0x82,0x04,0x20,0x00,0x5A,0x00,0x20,0x00,0x5C,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x5C,0x20,0x04,0x00,0x5A,0x0C,0x30,0x40,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x7C,0x04,0x18,0x60,0x82,0x04,0x20,0x00,0x5A,0x00,0x20,0x00,0x5C,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x18,0x00,0x18,0x00,0x24,0x04,0x00,0x20,0x5A,0x00,0x40,0x00,0xAC,0x00,0x44,0x08,0xB2,0x44,0x00,0x00,0xAA,0x24,0x00,0x00,0x5A,0x1C,0x00,0x00,0x22,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x44,0x00,0xAA,0x04,0x40,0x00,0xBA,0x4C,0x30,0x00,0x82,0x44,0x00,0x00,0xBA,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x00,0x10,0x00,0x6C,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x6C,0x1C,0x20,0x40,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x0C,0x00,0x04,0x08,0x12,0x00,0x04,0x00,0x0A,0x04,0x00,0x00,0x0A,0x04,0x00,0x00,0x4A,0x04,0x00,0x40,0xAA,0x04,0x40,0x00,0xBA,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x64,0x00,0x24,0x40,0x9A,0x00,0x24,0x00,0x5A,0x20,0x08,0x00,0x54,0x20,0x10,0x00,0x48,0x28,0x00,0x00,0x54,0x24,0x00,0x00,0x5A,0x04,0x20,0x40,0x9A,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x70,0x00,0x30,0x40,0x88,0x00,0x20,0x00,0x50,0x00,0x20,0x00,0x50,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x54,0x24,0x00,0x00,0x5A,0x1C,0x20,0x40,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x44,0x00,0x04,0x40,0xAA,0x24,0x40,0x08,0x92,0x04,0x50,0x00,0xAA,0x14,0x40,0x00,0xAA,0x44,0x00,0x00,0xBA,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x20,0x44,0x00,0x9A,0x14,0x40,0x00,0xAA,0x0C,0x40,0x00,0xB2,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x00,0x40,0xAA,0x04,0x40,0x00,0xAA,0x04,0x40,0x00,0xAA,0x04,0x40,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x78,0x08,0x30,0x40,0x84,0x04,0x20,0x00,0x5A,0x04,0x20,0x00,0x5A,0x28,0x10,0x00,0x44,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x00,0x40,0xAA,0x04,0x40,0x00,0xAA,0x04,0x40,0x00,0xBA,0x44,0x00,0x10,0xAA,0x30,0x08,0x00,0x44,0x04,0x00,0x00,0x3A,0x00,0x00,0x00,0x04,0x07,
-	0x00,0x00,0x00,0x78,0x00,0x18,0x60,0x84,0x04,0x20,0x00,0x5A,0x24,0x00,0x00,0x5A,0x28,0x10,0x00,0x44,0x24,0x00,0x00,0x5A,0x24,0x00,0x00,0x5A,0x04,0x20,0x40,0x9A,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x38,0x00,0x18,0x20,0x44,0x04,0x00,0x40,0xBA,0x00,0x40,0x00,0xBC,0x08,0x30,0x00,0x44,0x04,0x00,0x00,0x7A,0x04,0x00,0x40,0xBA,0x08,0x30,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x7C,0x04,0x18,0x60,0x82,0x14,0x40,0x00,0xAA,0x10,0x00,0x00,0x6C,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x08,0x10,0x20,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x44,0x00,0xAA,0x04,0x40,0x00,0xAA,0x04,0x40,0x00,0xAA,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xBA,0x3C,0x00,0x00,0x42,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x44,0x00,0x04,0x40,0xAA,0x00,0x44,0x00,0xAA,0x04,0x40,0x00,0xAA,0x28,0x00,0x00,0x54,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x04,0x40,0xAA,0x04,0x40,0x00,0xAA,0x04,0x40,0x00,0xBA,0x54,0x00,0x00,0xAA,0x6C,0x00,0x00,0x92,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x04,0x40,0x00,0xAA,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x08,0x20,0x00,0x54,0x04,0x00,0x40,0xAA,0x04,0x40,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x44,0x04,0x00,0x40,0xAA,0x04,0x40,0x00,0xAA,0x04,0x40,0x00,0xBA,0x38,0x00,0x00,0x44,0x10,0x00,0x00,0x28,0x10,0x00,0x00,0x28,0x08,0x10,0x20,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x04,0x40,0x00,0xBA,0x08,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x20,0x00,0x54,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x28,0x10,0x44,0x04,0x00,0x00,0x3A,0x04,0x08,0x30,0x42,0x04,0x40,0x00,0xBA,0x3C,0x00,0x00,0x42,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x58,0x00,0x28,0x00,0x54,0x04,0x20,0x10,0x4A,0x04,0x20,0x00,0x5A,0x04,0x20,0x00,0x5A,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xBA,0x00,0x40,0x00,0xA4,0x04,0x40,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x0C,0x00,0x04,0x08,0x12,0x08,0x00,0x00,0x34,0x08,0x20,0x00,0x54,0x18,0x40,0x00,0xA4,0x08,0x40,0x00,0xB4,0x08,0x40,0x00,0xB4,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x00,0x08,0x30,0x44,0x04,0x00,0x40,0xBA,0x3C,0x40,0x00,0x82,0x00,0x40,0x00,0xBC,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x18,0x00,0x08,0x10,0x24,0x04,0x00,0x20,0x5A,0x00,0x20,0x00,0x54,0x10,0x20,0x40,0x88,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x30,0x40,0x00,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x34,0x04,0x10,0x20,0x4A,0x08,0x00,0x40,0xB4,0x08,0x40,0x00,0xB4,0x38,0x00,0x00,0x44,0x04,0x00,0x40,0xBA,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x07,
-	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x58,0x20,0x08,0x00,0x54,0x24,0x00,0x10,0x4A,0x24,0x00,0x00,0x5A,0x24,0x00,0x00,0x5A,0x04,0x20,0x40,0x9A,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x00,0x00,0x60,0x00,0x40,0x20,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
-	0x00,0x00,0x00,0x04,0x00,0x00,0x04,0x0A,0x00,0x00,0x00,0x04,0x00,0x00,0x04,0x0A,0x00,0x04,0x00,0x0A,0x04,0x00,0x00,0x0A,0x04,0x00,0x00,0x4A,0x04,0x00,0x40,0xBA,0x18,0x20,0x00,0x44,0x00,0x00,0x00,0x38,0x07,
-	0x00,0x00,0x00,0x60,0x00,0x00,0x60,0x90,0x00,0x20,0x00,0x54,0x20,0x04,0x00,0x5A,0x20,0x00,0x08,0x54,0x20,0x10,0x00,0x48,0x28,0x00,0x00,0x54,0x04,0x20,0x40,0x9A,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x60,0x00,0x20,0x40,0x90,0x00,0x20,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x20,0x00,0x00,0x50,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x05,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xB4,0x24,0x48,0x00,0x92,0x44,0x10,0x00,0xAA,0x44,0x00,0x00,0xBA,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x08,0x10,0x60,0x84,0x04,0x00,0x40,0xBA,0x04,0x40,0x00,0xAA,0x44,0x00,0x00,0xAA,0x44,0x00,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x08,0x10,0x20,0x44,0x04,0x00,0x40,0xBA,0x04,0x40,0x00,0xAA,0x44,0x00,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x00,0x08,0x50,0xA4,0x04,0x20,0x00,0x5A,0x24,0x00,0x00,0x5A,0x38,0x00,0x00,0x44,0x20,0x00,0x00,0x58,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x34,0x00,0x14,0x20,0x4A,0x08,0x40,0x00,0xB4,0x48,0x00,0x00,0xB4,0x38,0x00,0x00,0x44,0x08,0x00,0x00,0x34,0x04,0x08,0x10,0x22,0x00,0x00,0x00,0x1C,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x00,0x08,0x50,0xA4,0x04,0x20,0x00,0x5A,0x24,0x00,0x00,0x5A,0x20,0x00,0x00,0x54,0x10,0x20,0x40,0x88,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x04,0x18,0x20,0x42,0x00,0x40,0x00,0xBC,0x38,0x00,0x00,0x44,0x04,0x00,0x00,0x7A,0x38,0x00,0x40,0x84,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x20,0x00,0x00,0x20,0x50,0x00,0x20,0x00,0x58,0x08,0x30,0x40,0x84,0x20,0x00,0x00,0x58,0x20,0x00,0x00,0x54,0x04,0x20,0x00,0x5A,0x08,0x10,0x00,0x24,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x00,0x00,0x48,0xB4,0x00,0x48,0x00,0xB4,0x08,0x40,0x00,0xB4,0x48,0x00,0x00,0xB4,0x34,0x00,0x00,0x4A,0x00,0x00,0x00,0x34,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x44,0x00,0xAA,0x04,0x40,0x00,0xAA,0x28,0x00,0x00,0x54,0x10,0x00,0x00,0x28,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x44,0x00,0xBA,0x14,0x40,0x00,0xAA,0x2C,0x40,0x00,0x92,0x48,0x00,0x00,0xB4,0x00,0x00,0x00,0x48,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x28,0x00,0x54,0x10,0x00,0x00,0x28,0x08,0x20,0x00,0x54,0x04,0x40,0x00,0xAA,0x00,0x00,0x00,0x44,0x00,0x00,0x00,0x00,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x44,0x00,0x00,0x44,0xAA,0x00,0x44,0x00,0xAA,0x04,0x40,0x00,0xBA,0x38,0x00,0x00,0x44,0x00,0x10,0x00,0x68,0x00,0x20,0x40,0x90,0x00,0x00,0x00,0x60,0x07,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7C,0x04,0x38,0x40,0x82,0x08,0x40,0x00,0xB4,0x00,0x10,0x00,0x6C,0x04,0x20,0x00,0x5A,0x3C,0x00,0x40,0x82,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0x00,0x07
-};
-
-void AGOSEngine::renderStringAmiga(uint vgaSpriteId, uint color, uint width, uint height, const char *txt) {
-	VgaPointersEntry *vpe = &_vgaBufferPointers[2];
-	byte *p, *dst, *dst_org, chr;
-	uint count;
-
-	if (vgaSpriteId >= 100) {
-		vgaSpriteId -= 100;
-		vpe++;
-	}
-
-	dst = vpe->vgaFile2;
-
-	count = 2000;
-	if (vgaSpriteId == 1)
-		count *= 2;
-
-	p = dst + vgaSpriteId * 8;
-	WRITE_BE_UINT16(p + 4, height);
-	WRITE_BE_UINT16(p + 6, width);
-	dst += READ_BE_UINT32(p);
-
-	width /= 8;	// convert width from pixels to bytes
-
-	uint charsize = width * height;
-	memset(dst, 0, count);
-	dst_org = dst;
-	int delta = 0;
-	while ((chr = *txt++) != 0) {
-		int img_width = 1;
-		if (chr == 10) {
-			dst += width * 10;
-			dst_org = dst;
-			delta = 0;
-		} else if ((signed char)(chr -= '!') < 0) {
-			img_width = 7;
-		} else {
-			const byte *img = simon_agaFont + chr * 41;
-			img_width = img[40];
-			byte *cur_dst = dst_org;
-			for (int row = 0; row < 10; row++) {
-				int col = color;
-				for (int plane = 0; plane < 3; plane++) {
-					chr = img[plane] >> delta;
-					if (chr) {
-						if (col & 1) cur_dst[charsize * 0] |= chr;
-						if (col & 2) cur_dst[charsize * 1] |= chr;
-						if (col & 4) cur_dst[charsize * 2] |= chr;
-						if (col & 8) cur_dst[charsize * 3] |= chr;
-					}
-					chr = img[plane] << (8 - delta);
-					if (((8 - delta) < img_width) && (chr)) {
-						if (col & 1) cur_dst[charsize * 0 + 1] |= chr;
-						if (col & 2) cur_dst[charsize * 1 + 1] |= chr;
-						if (col & 4) cur_dst[charsize * 2 + 1] |= chr;
-						if (col & 8) cur_dst[charsize * 3 + 1] |= chr;
-					}
-					col++;
-				}
-				chr = img[3] >> delta;
-				if (chr) {
-					cur_dst[charsize * 0] |= chr;
-					cur_dst[charsize * 1] |= chr;
-					cur_dst[charsize * 2] |= chr;
-					cur_dst[charsize * 3] |= chr;
-				}
-				chr = img[3] << (8 - delta);
-				if (((8 - delta) < img_width) && (chr)) {
-					cur_dst[charsize * 0 + 1] |= chr;
-					cur_dst[charsize * 1 + 1] |= chr;
-					cur_dst[charsize * 2 + 1] |= chr;
-					cur_dst[charsize * 3 + 1] |= chr;
-				}
-				cur_dst += width;
-				img += 4;
-			}
-		}
-		delta += img_width - 1;
-		if (delta >= 8) {
-			delta -= 8;
-			dst_org++;
-		}
-	}
-}
-
-void AGOSEngine::renderString(uint vgaSpriteId, uint color, uint width, uint height, const char *txt) {
-	VgaPointersEntry *vpe = &_vgaBufferPointers[2];
-	byte *src, *dst, *p, *dst_org, chr;
-	const int textHeight = (getGameType() == GType_FF || getGameType() == GType_PP) ? 15: 10;
-	uint count = 0;
-
-	if (vgaSpriteId >= 100) {
-		vgaSpriteId -= 100;
-		vpe++;
-	}
-
-	src = dst = vpe->vgaFile2;
-
-	if (getGameType() == GType_FF || getGameType() == GType_PP) {
-		if (vgaSpriteId == 1)
-			count = 45000;
-	} else {
-		count = 4000;
-		if (vgaSpriteId == 1)
-			count *= 2;
-	}
-
-	p = dst + vgaSpriteId * 8;
-
-	if (getGameType() == GType_FF || getGameType() == GType_PP) {
-		if (vgaSpriteId != 1)
-			WRITE_LE_UINT32(p, READ_LE_UINT32(p - 8) + READ_LE_UINT16(p - 4) * READ_LE_UINT16(p - 2));
-
-		WRITE_LE_UINT16(p + 4, height);
-		WRITE_LE_UINT16(p + 6, width);
-	} else {
-		WRITE_BE_UINT16(p + 4, height);
-		WRITE_BE_UINT16(p + 6, width);
-	}
-	dst += readUint32Wrapper(p);
-
-	if (count != 0)
-		memset(dst, 0, count);
-
-	if (_language == Common::HE_ISR)
-		dst += width - 1; // For Hebrew, start at the right edge, not the left.
-
-	dst_org = dst;
-	while ((chr = *txt++) != 0) {
-		if (chr == 10) {
-			dst_org += width * textHeight;
-			dst = dst_org;
-		} else if ((chr -= ' ') == 0) {
-			dst += (_language == Common::HE_ISR ? -6 : 6); // Hebrew moves to the left, all others to the right
-		} else {
-			byte *img_hdr, *img;
-			uint i, img_width, img_height;
-
-			if (getGameType() == GType_FF || getGameType() == GType_PP) {
-				img_hdr = src + 96 + chr * 8;
-				img_height = READ_LE_UINT16(img_hdr + 4);
-				img_width = READ_LE_UINT16(img_hdr + 6);
-				img = src + READ_LE_UINT32(img_hdr);
-			} else {
-				img_hdr = src + 48 + chr * 4;
-				img_height = img_hdr[2];
-				img_width = img_hdr[3];
-				img = src + READ_LE_UINT16(img_hdr);
-			}
-
-			if (_language == Common::HE_ISR)
-				dst -= img_width - 1; // For Hebrew, move from right edge to left edge of image.
-			byte *cur_dst = dst;
-
-			// Occurs in Amiga and Macintosh ports of The Feeble Files, when
-			// special characters are used by French/German/Spanish versions.
-			// Due to the English image data, been used by all languages.
-			if (img_width == 0 || img_height == 0)
-				continue;
-
-			assert(img_width < 50 && img_height < 50);
-
-			do {
-				for (i = 0; i != img_width; i++) {
-					chr = *img++;
-					if (chr) {
-						if (chr == 0xF)
-							chr = 207;
-						else
-							chr += color;
-						cur_dst[i] = chr;
-					}
-				}
-				cur_dst += width;
-			} while (--img_height);
-
-			if (_language != Common::HE_ISR) // Hebrew character movement is done higher up
-				dst += img_width - 1;
-		}
-	}
-}
-
 void AGOSEngine::showMessageFormat(const char *s, ...) {
 	char buf[STRINGBUFLEN];
 	char *str;
-- 
cgit v1.2.3


From 1e8b286c849a799059b7394eabf253827d6ec73f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 27 Feb 2012 20:45:55 +1100
Subject: TSAGE: Bugfixes for R2R animation player

---
 engines/tsage/core.cpp                          |   6 +-
 engines/tsage/ringworld2/ringworld2_logic.cpp   | 115 +++++++++++++-----------
 engines/tsage/ringworld2/ringworld2_logic.h     |  28 +++---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp |   2 +-
 4 files changed, 83 insertions(+), 68 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 0a8c4ef1b4..292e74c09b 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -4259,8 +4259,10 @@ void SceneHandler::dispatch() {
 	}
 
 	// Handle drawing the contents of the scene
-	if (g_globals->_sceneManager._scene)
-		g_globals->_sceneObjects->draw();
+	if ((g_vm->getGameID() != GType_Ringworld2) || (R2_GLOBALS._animationCtr == 0)) {
+		if (g_globals->_sceneManager._scene)
+			g_globals->_sceneObjects->draw();
+	}
 
 	// Check to see if any scene change is required
 	g_globals->_sceneManager.checkScene();
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 3c5530feec..e5e932b1e1 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1551,8 +1551,9 @@ void Scene1200::sub9DAD6(int indx) {
 
 /*--------------------------------------------------------------------------*/
 
-void AnimationSplice::load(Common::File &f) {
-	_spliceOffset = f.readUint32LE();
+void AnimationSlice::load(Common::File &f) {
+	f.skip(2);
+	_sliceOffset = f.readUint16LE();
 	f.skip(6);
 	_drawMode = f.readByte();
 	_secondaryIndex = f.readByte();
@@ -1560,30 +1561,30 @@ void AnimationSplice::load(Common::File &f) {
 
 /*--------------------------------------------------------------------------*/
 
-AnimationSplices::AnimationSplices() {
+AnimationSlices::AnimationSlices() {
 	_pixelData = NULL;
 }
 
-AnimationSplices::~AnimationSplices() {
+AnimationSlices::~AnimationSlices() {
 	delete[] _pixelData;
 }
 
-void AnimationSplices::load(Common::File &f) {
+void AnimationSlices::load(Common::File &f) {
 	f.skip(4);
 	_dataSize = f.readUint32LE();
 	f.skip(8);
 	_dataSize2 = f.readUint32LE();
 	f.skip(28);
 
-	// Load the four splice indexes
+	// Load the four slice indexes
 	for (int idx = 0; idx < 4; ++idx)
-		_splices[idx].load(f);
+		_slices[idx].load(f);
 }
 
-int AnimationSplices::loadPixels(Common::File &f, int splicesSize) {
+int AnimationSlices::loadPixels(Common::File &f, int slicesSize) {
 	delete[] _pixelData;
-	_pixelData = new byte[splicesSize];
-	return f.read(_pixelData, splicesSize);
+	_pixelData = new byte[slicesSize];
+	return f.read(_pixelData, slicesSize);
 }
 
 /*--------------------------------------------------------------------------*/
@@ -1592,8 +1593,7 @@ void AnimationPlayerSubData::load(Common::File &f) {
 	uint32 posStart = f.pos();
 
 	f.skip(6);
-	_field6 = f.readUint16LE();
-	f.skip(2);
+	_duration = f.readUint32LE();
 	_fieldA = f.readUint16LE();
 	_fieldC = f.readUint16LE();
 	_fieldE = f.readUint16LE();
@@ -1607,7 +1607,7 @@ void AnimationPlayerSubData::load(Common::File &f) {
 	f.read(_palData, 768);
 	_field320 = f.readSint32LE();
 	f.skip(12);
-	_splices.load(f);
+	_slices.load(f);
 
 	uint32 posEnd = f.pos();
 	assert((posEnd - posStart) == 0x390);
@@ -1631,7 +1631,7 @@ AnimationPlayer::AnimationPlayer(): EventHandler() {
 }
 
 AnimationPlayer::~AnimationPlayer() {
-	if (!method3())
+	if (!isCompleted())
 		close();
 }
 
@@ -1650,7 +1650,7 @@ void AnimationPlayer::remove() {
 void AnimationPlayer::process(Event &event) {
 	if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_ESCAPE) &&
 			(_field3A)) {
-		_field90C = _subData._field6;
+		_position = _subData._duration;
 	}
 }
 
@@ -1661,10 +1661,10 @@ void AnimationPlayer::dispatch() {
 	if (gameDiff >= _field910) {
 		drawFrame(_field904 % _subData._fieldC);
 		++_field904;
-		_field90C = _field904 / _subData._fieldC;
+		_position = _field904 / _subData._fieldC;
 
-		if (_field90C == _field90E)
-			method2();
+		if (_position == _field90E)
+			nextSlices();
 
 		_field908 = _field904;
 		_gameFrame = gameFrame;
@@ -1717,14 +1717,14 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 		_sliceNext = _animData2;
 	}
 
-	_field90C = 0;
+	_position = 0;
 	_field90E = 1;
 
-	// Load up the first splices set
-	_sliceCurrent->_dataSize = _subData._splices._dataSize;
-	_sliceCurrent->_splices = _subData._splices;
-	int splicesSize = _sliceCurrent->_dataSize - 96;
-	int readSize = _sliceCurrent->_splices.loadPixels(_resourceFile, splicesSize);
+	// Load up the first slices set
+	_sliceCurrent->_dataSize = _subData._slices._dataSize;
+	_sliceCurrent->_slices = _subData._slices;
+	int slicesSize = _sliceCurrent->_dataSize - 96;
+	int readSize = _sliceCurrent->_slices.loadPixels(_resourceFile, slicesSize);
 	_sliceCurrent->_animSlicesSize = readSize + 96;
 
 	if (_sliceNext != _sliceCurrent) {
@@ -1764,12 +1764,12 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 	return true;
 }
 
-void AnimationPlayer::drawFrame(int spliceIndex) {
-	assert(spliceIndex < 4);
-	AnimationSplices &splices = _sliceCurrent->_splices;
-	AnimationSplice &splice = _sliceCurrent->_splices._splices[spliceIndex];
+void AnimationPlayer::drawFrame(int sliceIndex) {
+	assert(sliceIndex < 4);
+	AnimationSlices &slices = _sliceCurrent->_slices;
+	AnimationSlice &slice = _sliceCurrent->_slices._slices[sliceIndex];
 
-	byte *sliceDataStart = &splices._pixelData[splice._spliceOffset];
+	byte *sliceDataStart = &slices._pixelData[slice._sliceOffset - 96];
 	byte *sliceData1 = sliceDataStart;
 
 	Rect playerBounds = _screenBounds;
@@ -1779,7 +1779,7 @@ void AnimationPlayer::drawFrame(int spliceIndex) {
 	Graphics::Surface surface = R2_GLOBALS._screenSurface.lockSurface();
 
 	// Handle different drawing modes
-	switch (splice._drawMode) {
+	switch (slice._drawMode) {
 	case 0:
 		// Draw from uncompressed source
 		for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
@@ -1795,18 +1795,19 @@ void AnimationPlayer::drawFrame(int spliceIndex) {
 		break;
 
 	case 1:
-		switch (splice._secondaryIndex) {
+		switch (slice._secondaryIndex) {
 		case 0xfe:
 			// Draw from uncompressed source with optional skipped rows
 			for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
-				for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex) {
+				for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex, playerBounds.top++) {
 					int offset = READ_LE_UINT16(sliceData1 + sliceNum * 2);
 
 					if (offset) {
 						const byte *pSrc = (const byte *)sliceDataStart + offset;
-						byte *pDest = (byte *)surface.getBasePtr(playerBounds.left, y++);
+						byte *pDest = (byte *)surface.getBasePtr(playerBounds.left, playerBounds.top);
 
-						Common::copy(pSrc, pSrc + _subData._sliceSize, pDest);
+						//Common::copy(pSrc, pSrc + playerBounds.width(), pDest);
+						rleDecode(pSrc, pDest, playerBounds.width());
 					}
 				}
 			}
@@ -1814,20 +1815,20 @@ void AnimationPlayer::drawFrame(int spliceIndex) {
 		case 0xff:
 			// Draw from RLE compressed source
 			for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
-				for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex) {
+				for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex, playerBounds.top++) {
 					// TODO: Check of _subData._fieldE was done for two different kinds of
 					// line slice drawing in original
 					const byte *pSrc = (const byte *)sliceDataStart + READ_LE_UINT16(sliceData1 + sliceNum * 2);
-					byte *pDest = (byte *)surface.getBasePtr(playerBounds.left, y++);
+					byte *pDest = (byte *)surface.getBasePtr(playerBounds.left, playerBounds.top);
 
 					rleDecode(pSrc, pDest, _subData._sliceSize);
 				}
 			}
 			break;
 		default: {
-			// Draw from two splice sets simultaneously
-			AnimationSplice &splice2 = _sliceCurrent->_splices._splices[splice._secondaryIndex];
-			byte *sliceData2 = &splices._pixelData[splice2._spliceOffset];
+			// Draw from two slice sets simultaneously
+			AnimationSlice &slice2 = _sliceCurrent->_slices._slices[slice._secondaryIndex];
+			byte *sliceData2 = &slices._pixelData[slice2._sliceOffset - 96];
 
 			for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
 				for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex) {
@@ -1835,7 +1836,7 @@ void AnimationPlayer::drawFrame(int spliceIndex) {
 					const byte *pSrc2 = (const byte *)sliceDataStart + READ_LE_UINT16(sliceData1 + sliceNum * 2);
 					byte *pDest = (byte *)surface.getBasePtr(playerBounds.left, y++);
 
-					if (splice2._drawMode == 0) {
+					if (slice2._drawMode == 0) {
 						// Uncompressed background, foreground compressed
 						Common::copy(pSrc1, pSrc1 + _subData._sliceSize, pDest);
 						rleDecode(pSrc2, pDest, _subData._sliceSize);
@@ -1852,29 +1853,41 @@ void AnimationPlayer::drawFrame(int spliceIndex) {
 	default:
 		break;
 	}
+
+	if (_field56 == 42) {
+		_screenBounds.expandPanes();
+		R2_GLOBALS._sceneObjects->draw();
+	} else {
+		if (R2_GLOBALS._sceneManager._hasPalette)
+			R2_GLOBALS._scenePalette.refresh();
+	}
 }
 
-void AnimationPlayer::method2() {
-	_field90C = _field90E++;
-	_field904 = _field90C * _subData._fieldC;
+/**
+ * Read the next frame's slice set
+ */
+void AnimationPlayer::nextSlices() {
+	_position = _field90E++;
+	_field904 = _position * _subData._fieldC;
 	_field908 = _field904 - 1;
 
 	if (_sliceNext == _sliceCurrent) {
-		int dataSize = _sliceCurrent->_splices._dataSize2;
+		int dataSize = _sliceCurrent->_slices._dataSize2;
 		_sliceCurrent->_dataSize = dataSize;
+		debugC(1, ktSageDebugGraphics, "Next frame size = %xh", dataSize);
 
 		dataSize -= 96;
 		assert(dataSize >= 0);
-		_sliceCurrent->_splices.load(_resourceFile);
-		_sliceCurrent->_animSlicesSize = _sliceCurrent->_splices.loadPixels(_resourceFile, dataSize);
+		_sliceCurrent->_slices.load(_resourceFile);
+		_sliceCurrent->_animSlicesSize = _sliceCurrent->_slices.loadPixels(_resourceFile, dataSize);
 	} else {
 		SWAP(_sliceCurrent, _sliceNext);
 		getSlices();
 	}
 }
 
-bool AnimationPlayer::method3() {
-	return (_field90C >= _subData._field6);
+bool AnimationPlayer::isCompleted() {
+	return (_position >= _subData._duration);
 }
 
 void AnimationPlayer::close() {
@@ -1940,15 +1953,15 @@ void AnimationPlayer::getSlices() {
 	assert((_sliceNext == _animData1) || (_sliceNext == _animData2));
 	assert((_sliceCurrent == _animData1) || (_sliceCurrent == _animData2));
 
-	_sliceNext->_dataSize = _sliceCurrent->_splices._dataSize2;
+	_sliceNext->_dataSize = _sliceCurrent->_slices._dataSize2;
 	if (_sliceNext->_dataSize) {
 		if (_sliceNext->_dataSize >= _dataNeeded)
 			error("Bogus dataNeeded == %d / %d", _sliceNext->_dataSize, _dataNeeded);
 	}
 
 	int dataSize = _sliceNext->_dataSize - 96;
-	_sliceNext->_splices.load(_resourceFile);
-	_sliceNext->_animSlicesSize = _sliceNext->_splices.loadPixels(_resourceFile, dataSize);
+	_sliceNext->_slices.load(_resourceFile);
+	_sliceNext->_animSlicesSize = _sliceNext->_slices.loadPixels(_resourceFile, dataSize);
 }
 
 /*--------------------------------------------------------------------------*/
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 6100efc8bc..d582370599 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -327,32 +327,32 @@ public:
 
 /*--------------------------------------------------------------------------*/
 
-class AnimationSplice {
+class AnimationSlice {
 public:
-	int _spliceOffset;
+	int _sliceOffset;
 	int _drawMode;
 	int _secondaryIndex;
 public:
 	void load(Common::File &f);
 };
 
-class AnimationSplices {
+class AnimationSlices {
 public:
 	int _dataSize;
 	int _dataSize2;
-	AnimationSplice _splices[4];
+	AnimationSlice _slices[4];
 	byte *_pixelData;
 public:
-	AnimationSplices();
-	~AnimationSplices();
+	AnimationSlices();
+	~AnimationSlices();
 
 	void load(Common::File &f);
-	int loadPixels(Common::File &f, int splicesSize);
+	int loadPixels(Common::File &f, int slicesSize);
 };
 
 class AnimationPlayerSubData {
 public:
-	int _field6;
+	int _duration;
 	int _fieldA;
 	int _fieldC;
 	int _fieldE;
@@ -363,14 +363,14 @@ public:
 	int _palSize;
 	byte _palData[256 * 3];
 	int32 _field320;
-	AnimationSplices _splices;
+	AnimationSlices _slices;
 public:
 	void load(Common::File &f);
 };
 
 class AnimationData {
 public:
-	AnimationSplices _splices;
+	AnimationSlices _slices;
 	int _dataSize;
 	int _animSlicesSize;
 };
@@ -379,8 +379,8 @@ class AnimationPlayer: public EventHandler {
 private:
 	void rleDecode(const byte *pSrc, byte *pDest, int size);
 
-	void drawFrame(int spliceIndex);
-	void method2();
+	void drawFrame(int sliceIndex);
+	void nextSlices();
 	void getSlices();
 public:
 	AnimationData *_animData1, *_animData2;
@@ -399,7 +399,7 @@ public:
 	int _dataNeeded;
 	int _field904;
 	int _field908;
-	int _field90C;
+	int _position;
 	int _field90E;
 	uint _field910;
 	uint32 _gameFrame;
@@ -416,7 +416,7 @@ public:
 	virtual void closing() {}
 
 	bool load(int animId, Action *endAction = NULL);
-	bool method3();
+	bool isCompleted();
 	void close();
 };
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 292e9c2f5e..460646c05d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1898,7 +1898,7 @@ void Scene180::dispatch() {
 	}
 
 	if (_animationPlayer._v) {
-		if (_animationPlayer.method3()) {
+		if (_animationPlayer.isCompleted()) {
 			_animationPlayer._v = 0;
 			_animationPlayer.close();
 			_animationPlayer.remove();
-- 
cgit v1.2.3


From 46c590940aa8ca02075a81990b854014781c5e04 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 27 Feb 2012 22:29:16 +1100
Subject: TSAGE: Renamed many of the unknown fields in the R2R Animation Player

---
 engines/tsage/ringworld2/ringworld2_logic.cpp | 57 ++++++++++++++-------------
 engines/tsage/ringworld2/ringworld2_logic.h   | 16 ++++----
 2 files changed, 38 insertions(+), 35 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index e5e932b1e1..582458afed 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1594,18 +1594,18 @@ void AnimationPlayerSubData::load(Common::File &f) {
 
 	f.skip(6);
 	_duration = f.readUint32LE();
-	_fieldA = f.readUint16LE();
-	_fieldC = f.readUint16LE();
-	_fieldE = f.readUint16LE();
+	_frameRate = f.readUint16LE();
+	_framesPerSlices = f.readUint16LE();
+	_drawType = f.readUint16LE();
 	f.skip(2);
 	_sliceSize = f.readUint16LE();
 	_ySlices = f.readUint16LE();
-	_field16 = f.readUint16LE();
-	f.skip(4);
+	_field16 = f.readUint32LE();
+	f.skip(2);
 	_palStart = f.readUint16LE();
 	_palSize = f.readUint16LE();
 	f.read(_palData, 768);
-	_field320 = f.readSint32LE();
+	_totalSize = f.readSint32LE();
 	f.skip(12);
 	_slices.load(f);
 
@@ -1650,6 +1650,7 @@ void AnimationPlayer::remove() {
 void AnimationPlayer::process(Event &event) {
 	if ((event.eventType == EVENT_KEYPRESS) && (event.kbd.keycode == Common::KEYCODE_ESCAPE) &&
 			(_field3A)) {
+		// Move the current position to the end
 		_position = _subData._duration;
 	}
 }
@@ -1658,15 +1659,15 @@ void AnimationPlayer::dispatch() {
 	uint32 gameFrame = R2_GLOBALS._events.getFrameNumber();
 	uint32 gameDiff = (gameFrame > _gameFrame) ? gameFrame - _gameFrame : _gameFrame - gameFrame;
 
-	if (gameDiff >= _field910) {
-		drawFrame(_field904 % _subData._fieldC);
-		++_field904;
-		_position = _field904 / _subData._fieldC;
+	if (gameDiff >= _frameDelay) {
+		drawFrame(_playbackTick % _subData._framesPerSlices);
+		++_playbackTick;
+		_position = _playbackTick / _subData._framesPerSlices;
 
-		if (_position == _field90E)
+		if (_position == _ticksPerSlices)
 			nextSlices();
 
-		_field908 = _field904;
+		_playbackTickPrior = _playbackTick;
 		_gameFrame = gameFrame;
 	}
 }
@@ -1691,16 +1692,16 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 	_subData.load(_resourceFile);
 
 	// Set other properties
-	_field908 = -1;
-	_field904 = 0;
-	_field910 = 60 / _subData._fieldA;
-	_gameFrame = R2_GLOBALS._events.getFrameNumber() - _field910;
+	_playbackTickPrior = -1;
+	_playbackTick = 0;
+	_frameDelay = 60 / _subData._frameRate;
+	_gameFrame = R2_GLOBALS._events.getFrameNumber() - _frameDelay;
 
-	if (_subData._field320) {
-		_dataNeeded = _subData._field320;
+	if (_subData._totalSize) {
+		_dataNeeded = _subData._totalSize;
 	} else {
-		int v = (_subData._sliceSize + 2) * _subData._ySlices * _subData._fieldC;
-		_dataNeeded = (_subData._field16 / _subData._fieldC) + v + 96;
+		int v = (_subData._sliceSize + 2) * _subData._ySlices * _subData._framesPerSlices;
+		_dataNeeded = (_subData._field16 / _subData._framesPerSlices) + v + 96;
 	}
 	
 	debugC(1, ktSageDebugGraphics, "Data needed %d", _dataNeeded);
@@ -1709,7 +1710,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 	_animData1 = new AnimationData();
 	_sliceCurrent = _animData1;
 
-	if (_subData._fieldC <= 1) {
+	if (_subData._framesPerSlices <= 1) {
 		_animData2 = NULL;
 		_sliceNext = _sliceCurrent;
 	} else {
@@ -1718,7 +1719,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 	}
 
 	_position = 0;
-	_field90E = 1;
+	_ticksPerSlices = 1;
 
 	// Load up the first slices set
 	_sliceCurrent->_dataSize = _subData._slices._dataSize;
@@ -1784,7 +1785,7 @@ void AnimationPlayer::drawFrame(int sliceIndex) {
 		// Draw from uncompressed source
 		for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
 			for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex) {
-				// TODO: Check of _subData._fieldE was done for two different kinds of
+				// TODO: Check of _subData._drawType was done for two different kinds of
 				// line slice drawing in original
 				const byte *pSrc = (const byte *)sliceDataStart + READ_LE_UINT16(sliceData1 + sliceNum * 2);
 				byte *pDest = (byte *)surface.getBasePtr(playerBounds.left, y++);
@@ -1816,7 +1817,7 @@ void AnimationPlayer::drawFrame(int sliceIndex) {
 			// Draw from RLE compressed source
 			for (int sliceNum = 0; sliceNum < _subData._ySlices; ++sliceNum) {
 				for (int yIndex = 0; yIndex < _sliceHeight; ++yIndex, playerBounds.top++) {
-					// TODO: Check of _subData._fieldE was done for two different kinds of
+					// TODO: Check of _subData._drawType was done for two different kinds of
 					// line slice drawing in original
 					const byte *pSrc = (const byte *)sliceDataStart + READ_LE_UINT16(sliceData1 + sliceNum * 2);
 					byte *pDest = (byte *)surface.getBasePtr(playerBounds.left, playerBounds.top);
@@ -1867,14 +1868,16 @@ void AnimationPlayer::drawFrame(int sliceIndex) {
  * Read the next frame's slice set
  */
 void AnimationPlayer::nextSlices() {
-	_position = _field90E++;
-	_field904 = _position * _subData._fieldC;
-	_field908 = _field904 - 1;
+	_position = _ticksPerSlices++;
+	_playbackTick = _position * _subData._framesPerSlices;
+	_playbackTickPrior = _playbackTick - 1;
 
 	if (_sliceNext == _sliceCurrent) {
 		int dataSize = _sliceCurrent->_slices._dataSize2;
 		_sliceCurrent->_dataSize = dataSize;
 		debugC(1, ktSageDebugGraphics, "Next frame size = %xh", dataSize);
+		if (dataSize == 0)
+			return;
 
 		dataSize -= 96;
 		assert(dataSize >= 0);
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index d582370599..3d2ffd9f78 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -353,16 +353,16 @@ public:
 class AnimationPlayerSubData {
 public:
 	int _duration;
-	int _fieldA;
-	int _fieldC;
-	int _fieldE;
+	int _frameRate;
+	int _framesPerSlices;
+	int _drawType;
 	int _sliceSize;
 	int _ySlices;
 	int _field16;
 	int _palStart;
 	int _palSize;
 	byte _palData[256 * 3];
-	int32 _field320;
+	int32 _totalSize;
 	AnimationSlices _slices;
 public:
 	void load(Common::File &f);
@@ -397,11 +397,11 @@ public:
 	AnimationPlayerSubData _subData;
 	Action *_endAction;
 	int _dataNeeded;
-	int _field904;
-	int _field908;
+	int _playbackTick;
+	int _playbackTickPrior;
 	int _position;
-	int _field90E;
-	uint _field910;
+	int _ticksPerSlices;
+	uint _frameDelay;
 	uint32 _gameFrame;
 public:
 	AnimationPlayer();
-- 
cgit v1.2.3


From f4bf93fd6765ff825ac502b64c5937a1cb90ea72 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Feb 2012 10:36:28 +0200
Subject: ENGINES: Properly explain the usage of _singleId

---
 engines/advancedDetector.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 3bb00618b1..2c7d9cc497 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -171,7 +171,8 @@ protected:
 	/**
 	 * Name of single gameid (optional).
 	 *
-	 * @todo Properly explain this -- what does it do?
+	 * If set, the target ID will always be set to this one. Probably useful
+	 * for engines with few game targets.
 	 */
 	const char *_singleid;
 
-- 
cgit v1.2.3


From 8248944f1eb313f101e966a04aa93cb7db82559e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Feb 2012 10:38:13 +0200
Subject: SCI: Do not set _singleId in SciMetaEngine

This allows the engine to set the correct game ID to each entry. With
_singleId set, all the IDs in the game entries are set to "sci"
---
 engines/sci/detection.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines')

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index c43849056b..bef357f909 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -381,7 +381,6 @@ static char s_fallbackGameIdBuf[256];
 class SciMetaEngine : public AdvancedMetaEngine {
 public:
 	SciMetaEngine() : AdvancedMetaEngine(Sci::SciGameDescriptions, sizeof(ADGameDescription), s_sciGameTitles) {
-		_singleid = "sci";
 	}
 
 	virtual const char *getName() const {
-- 
cgit v1.2.3


From 170f9f7040be7ac5ae8f05a9d2bd346e7776bcd1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Feb 2012 11:08:46 +0200
Subject: Revert "SCI: Do not set _singleId in SciMetaEngine"

This reverts commit 8248944f1eb313f101e966a04aa93cb7db82559e.
---
 engines/sci/detection.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index bef357f909..c43849056b 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -381,6 +381,7 @@ static char s_fallbackGameIdBuf[256];
 class SciMetaEngine : public AdvancedMetaEngine {
 public:
 	SciMetaEngine() : AdvancedMetaEngine(Sci::SciGameDescriptions, sizeof(ADGameDescription), s_sciGameTitles) {
+		_singleid = "sci";
 	}
 
 	virtual const char *getName() const {
-- 
cgit v1.2.3


From 65c60ef02737f9e6a7e4091b622a6a1e0871d6d7 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 28 Feb 2012 11:13:40 +0200
Subject: ENGINES: Add a thorough explanation of the ugliness caused by
 _singleId

---
 engines/advancedDetector.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 2c7d9cc497..d43462b81d 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -171,8 +171,18 @@ protected:
 	/**
 	 * Name of single gameid (optional).
 	 *
-	 * If set, the target ID will always be set to this one. Probably useful
-	 * for engines with few game targets.
+	 * If set, the target ID will always be set to this one. Currently, it is a
+	 * necessary evil to avoid polluting the global namespace with loads of IDs.
+	 * Needed for engines that define a lot of game targets, so that there won't
+	 * be a situation where two different engines define the same game ID.
+	 *
+	 * FIXME: Remove this field altogether! This is a temporary (and ugly)
+	 * workaround to a more generic problem.
+	 *
+	 * TODO: A more correct way to do this would be to distinguish targets with
+	 * a singleid-gameid combination, so that there will never be a duplicate
+	 * game ID across different engines.
+	 *
 	 */
 	const char *_singleid;
 
-- 
cgit v1.2.3


From a20de36b268e5e91904052d4858bad445145b765 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 29 Feb 2012 11:59:03 +0200
Subject: ENGINES: Adjust the description of _singleId

---
 engines/advancedDetector.h | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index d43462b81d..4f215391a2 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -171,18 +171,16 @@ protected:
 	/**
 	 * Name of single gameid (optional).
 	 *
-	 * If set, the target ID will always be set to this one. Currently, it is a
-	 * necessary evil to avoid polluting the global namespace with loads of IDs.
-	 * Needed for engines that define a lot of game targets, so that there won't
-	 * be a situation where two different engines define the same game ID.
+	 * If set, the target ID will always be set to this one. This is necessary
+	 * for engines that define a lot of game targets, so that the global
+	 * namespace won't be polluted with loads of IDs, which could lead to a
+	 * situation where two different engines define the same game ID.
 	 *
-	 * FIXME: Remove this field altogether! This is a temporary (and ugly)
-	 * workaround to a more generic problem.
-	 *
-	 * TODO: A more correct way to do this would be to distinguish targets with
-	 * a singleid-gameid combination, so that there will never be a duplicate
+	 * FIXME: This field actually removes a feature (game IDs) in order to
+	 * address a more generic problem. Another way to address this issue without
+	 * disabling game IDs altogether would be to distinguish targets with an
+	 * engineId-gameId combination, so that there will never be a duplicate
 	 * game ID across different engines.
-	 *
 	 */
 	const char *_singleid;
 
-- 
cgit v1.2.3


From b60a2f012a92729591ab4e3221a980d98a5ceaf0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 29 Feb 2012 21:22:08 +1100
Subject: TSAGE: Slow down the animation player to match the original game

---
 engines/tsage/ringworld2/ringworld2_logic.cpp | 15 +++++++++------
 engines/tsage/ringworld2/ringworld2_logic.h   |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 582458afed..fb5f4a0eab 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1657,14 +1657,14 @@ void AnimationPlayer::process(Event &event) {
 
 void AnimationPlayer::dispatch() {
 	uint32 gameFrame = R2_GLOBALS._events.getFrameNumber();
-	uint32 gameDiff = (gameFrame > _gameFrame) ? gameFrame - _gameFrame : _gameFrame - gameFrame;
+	uint32 gameDiff = gameFrame - _gameFrame;
 
 	if (gameDiff >= _frameDelay) {
 		drawFrame(_playbackTick % _subData._framesPerSlices);
 		++_playbackTick;
 		_position = _playbackTick / _subData._framesPerSlices;
 
-		if (_position == _ticksPerSlices)
+		if (_position == _nextSlicesPosition)
 			nextSlices();
 
 		_playbackTickPrior = _playbackTick;
@@ -1694,8 +1694,11 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 	// Set other properties
 	_playbackTickPrior = -1;
 	_playbackTick = 0;
-	_frameDelay = 60 / _subData._frameRate;
-	_gameFrame = R2_GLOBALS._events.getFrameNumber() - _frameDelay;
+
+	// The final multiplication is used to deliberately slow down playback, since the original 
+	// was slowed down by the amount of time spent to decode and display the frames
+	_frameDelay = (60 / _subData._frameRate) * 8;
+	_gameFrame = R2_GLOBALS._events.getFrameNumber();
 
 	if (_subData._totalSize) {
 		_dataNeeded = _subData._totalSize;
@@ -1719,7 +1722,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 	}
 
 	_position = 0;
-	_ticksPerSlices = 1;
+	_nextSlicesPosition = 1;
 
 	// Load up the first slices set
 	_sliceCurrent->_dataSize = _subData._slices._dataSize;
@@ -1868,7 +1871,7 @@ void AnimationPlayer::drawFrame(int sliceIndex) {
  * Read the next frame's slice set
  */
 void AnimationPlayer::nextSlices() {
-	_position = _ticksPerSlices++;
+	_position = _nextSlicesPosition++;
 	_playbackTick = _position * _subData._framesPerSlices;
 	_playbackTickPrior = _playbackTick - 1;
 
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 3d2ffd9f78..b63c0ac2a7 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -400,7 +400,7 @@ public:
 	int _playbackTick;
 	int _playbackTickPrior;
 	int _position;
-	int _ticksPerSlices;
+	int _nextSlicesPosition;
 	uint _frameDelay;
 	uint32 _gameFrame;
 public:
-- 
cgit v1.2.3


From 21d570af83bed7b6edcc485b991fc52ecc9f4ab6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 29 Feb 2012 21:39:48 +1100
Subject: TSAGE: Bugfixes for startup sequence in R2R Scene 180

---
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 460646c05d..94a119338a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1621,14 +1621,16 @@ void Scene180::signal() {
 		break;
 
 	case 7:
+		// Title screen. Wait until title music finishes playing
 		R2_GLOBALS._scene180Mode = 2;
-		if (R2_GLOBALS._sound1.isPaused())
+		if (R2_GLOBALS._sound1.isPlaying())
 			_sceneMode = 7;
 		setFrameInc(1);
 		break;
 
 	case 9:
 		R2_GLOBALS._sound1.play(3);
+		clearScreen();
 		setFrameInc(2);
 		break;
 
-- 
cgit v1.2.3


From 3ce34294ee64cecd8ed9c282d59dcbaffb3ecfeb Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 29 Feb 2012 13:13:28 +0100
Subject: ENGINES: Copy singleid description from wiki

---
 engines/advancedDetector.h | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 4f215391a2..0cec039b5e 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -171,16 +171,13 @@ protected:
 	/**
 	 * Name of single gameid (optional).
 	 *
-	 * If set, the target ID will always be set to this one. This is necessary
-	 * for engines that define a lot of game targets, so that the global
-	 * namespace won't be polluted with loads of IDs, which could lead to a
-	 * situation where two different engines define the same game ID.
+	 * Used to override gameid.
+	 * This is a recommended setting to prevent global gameid pollution.
+	 * With this option set, the gameid effectively turns into engineid. 
 	 *
-	 * FIXME: This field actually removes a feature (game IDs) in order to
-	 * address a more generic problem. Another way to address this issue without
-	 * disabling game IDs altogether would be to distinguish targets with an
-	 * engineId-gameId combination, so that there will never be a duplicate
-	 * game ID across different engines.
+	 * FIXME: This field actually removes a feature (gameid) in order to
+	 * address a more generic problem. We should find a better way to
+	 * disambiguate gameids.
 	 */
 	const char *_singleid;
 
-- 
cgit v1.2.3


From b918149e6bd66b7e2a1225f2a411966840bad4b6 Mon Sep 17 00:00:00 2001
From: Fabio Battaglia
Date: Thu, 1 Mar 2012 18:43:41 +0100
Subject: GOB: Add detection entry for Italian playtoons2

---
 engines/gob/detection_tables.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'engines')

diff --git a/engines/gob/detection_tables.h b/engines/gob/detection_tables.h
index a88ddcc734..5c6e919e12 100644
--- a/engines/gob/detection_tables.h
+++ b/engines/gob/detection_tables.h
@@ -4057,6 +4057,24 @@ static const GOBGameDescription gameDescriptions[] = {
 		kFeatures640x480,
 		"intro2.stk", 0, 0
 	},
+	{ // Supplied by Hkz
+		{
+			"playtoons2",
+			"",
+			{
+				{"playtoon.stk", 0, "2572685400852d12759a2fbf09ec88eb", 9698780},
+				{"spirou.stk", 0, "d3cfeff920b6343a2ece55088f530dba", 7076608},
+				{0, 0, 0, 0}
+			},
+			IT_ITA,
+			kPlatformPC,
+			ADGF_NO_FLAGS,
+			GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
+		},
+		kGameTypePlaytoons,
+		kFeatures640x480,
+		"intro2.stk", 0, 0
+	},
 	{ // Supplied by scoriae in the forums
 		{
 			"playtoons2",
-- 
cgit v1.2.3


From 101ec2b885aade21216c1bba8488711b30d192eb Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 3 Mar 2012 00:46:17 +0100
Subject: TOUCHE: Remap one more Spanish character

---
 engines/touche/staticres.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/touche/staticres.cpp b/engines/touche/staticres.cpp
index f35845e881..c18a947358 100644
--- a/engines/touche/staticres.cpp
+++ b/engines/touche/staticres.cpp
@@ -888,7 +888,9 @@ const uint8 Graphics::_freGerFontData[] = {
 
 // spanish charset differs from original executable, see tracker item #2040311.
 // We remap missing accented upper case letters from CP850 to their unaccented
-// ASCII variants. Specifically, 0xB5 -> A, 0xD6 -> I, 0xE0 -> O, 0xE9 -> U.
+// ASCII variants. Specifically, 0xB5 -> A, 0xD6 -> I, 0xE0 -> O, 0xE9 -> U,
+// 0xEF -> '
+// FIXME: Shouldn't we just add these to the font data?
 const uint16 Graphics::_spaFontOffs[] = {
 	0x0000, 0x0007, 0x0024, 0x0043, 0x0072, 0x00AD, 0x00E0, 0x0113, 0x0124, 0x0141,
 	0x015E, 0x0191, 0x01C4, 0x01E3, 0x01F8, 0x0215, 0x0232, 0x0269, 0x0286, 0x02BD,
@@ -910,7 +912,7 @@ const uint16 Graphics::_spaFontOffs[] = {
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x0000, 0x0703, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x0000, 0x0627, 0x1954, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	0x0000, 0x097D
+	0x0000, 0x097D, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0113
 };
 
 const int Graphics::_spaFontSize = ARRAYSIZE(Graphics::_spaFontOffs);
-- 
cgit v1.2.3


From 83f193edbd97af01904c45934bfaafb4c11efecc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 3 Mar 2012 14:13:40 +1100
Subject: TSAGE: Fix memory leak and error in R2R Animation Player free

---
 engines/tsage/graphics.cpp                    | 2 ++
 engines/tsage/ringworld2/ringworld2_logic.cpp | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index 5ddc7b6a1a..b3dceba292 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -223,11 +223,13 @@ GfxSurface::GfxSurface() : _bounds(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT) {
 	_lockSurfaceCtr = 0;
 	_customSurface = NULL;
 	_transColor = -1;
+	_trackDirtyRects = false;
 }
 
 GfxSurface::GfxSurface(const GfxSurface &s) {
 	_lockSurfaceCtr = 0;
 	_customSurface = NULL;
+	_trackDirtyRects = false;
 	this->operator =(s);
 }
 
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index fb5f4a0eab..4cfcc29d24 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1927,7 +1927,8 @@ void AnimationPlayer::close() {
 	_animData2 = NULL;
 
 	_field38 = 0;
-	R2_GLOBALS._animationCtr = MAX(R2_GLOBALS._animationCtr, 0);
+	if (g_globals != NULL)
+		R2_GLOBALS._animationCtr = MAX(R2_GLOBALS._animationCtr, 0);
 }
 
 void AnimationPlayer::rleDecode(const byte *pSrc, byte *pDest, int size) {
-- 
cgit v1.2.3


From 1098e6b79afb9208b3558bc0401afa0027179fbb Mon Sep 17 00:00:00 2001
From: Bertrand Augereau
Date: Sat, 3 Mar 2012 14:18:05 +0100
Subject: DREAMWEB: The rain processing has its own cpp file

---
 engines/dreamweb/module.mk  |   1 +
 engines/dreamweb/rain.cpp   | 202 ++++++++++++++++++++++++++++++++++++++++++++
 engines/dreamweb/sprite.cpp | 175 +-------------------------------------
 3 files changed, 204 insertions(+), 174 deletions(-)
 create mode 100644 engines/dreamweb/rain.cpp

(limited to 'engines')

diff --git a/engines/dreamweb/module.mk b/engines/dreamweb/module.mk
index 661a9b973a..6bc4f8728e 100644
--- a/engines/dreamweb/module.mk
+++ b/engines/dreamweb/module.mk
@@ -12,6 +12,7 @@ MODULE_OBJS := \
 	pathfind.o \
 	people.o \
 	print.o \
+	rain.o \
 	saveload.o \
 	sound.o \
 	sprite.o \
diff --git a/engines/dreamweb/rain.cpp b/engines/dreamweb/rain.cpp
new file mode 100644
index 0000000000..0a8ee2a38e
--- /dev/null
+++ b/engines/dreamweb/rain.cpp
@@ -0,0 +1,202 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 "dreamweb/dreamweb.h"
+
+namespace DreamWeb {
+
+void DreamWebEngine::showRain() {
+	Common::List<Rain>::iterator i;
+
+	// Do nothing if there's no rain at all
+	if (_rainList.empty())
+		return;
+
+	const uint8 *frameData = _mainSprites.getFrameData(58);
+
+	for (i = _rainList.begin(); i != _rainList.end(); ++i) {
+		Rain &rain = *i;
+		uint16 y = rain.y + _mapAdY + _mapYStart;
+		uint16 x = rain.x + _mapAdX + _mapXStart;
+		uint16 size = rain.size;
+		uint16 offset = (rain.w3 - rain.b5) & 511;
+		rain.w3 = offset;
+		const uint8 *src = frameData + offset;
+		uint8 *dst = workspace() + y * 320 + x;
+		for (uint16 j = 0; j < size; ++j) {
+			uint8 v = src[j];
+			if (v != 0)
+				*dst = v;
+			dst += 320-1; // advance diagonally
+		}
+	}
+
+	if (_channel1Playing != 255)
+		return;
+	if (_realLocation == 2 && _vars._beenMugged != 1)
+		return;
+	if (_realLocation == 55)
+		return;
+
+	if (randomNumber() >= 1) // play thunder with 1 in 256 chance
+		return;
+
+	uint8 soundIndex;
+	if (_channel0Playing != 6)
+		soundIndex = 4;
+	else
+		soundIndex = 7;
+	playChannel1(soundIndex);
+}
+
+uint8 DreamWebEngine::getBlockOfPixel(uint8 x, uint8 y) {
+	uint8 flag, flagEx, type, flagX, flagY;
+	checkOne(x + _mapXStart, y + _mapYStart, &flag, &flagEx, &type, &flagX, &flagY);
+	if (flag & 1)
+		return 0;
+	else
+		return type;
+}
+
+void DreamWebEngine::splitIntoLines(uint8 x, uint8 y) {
+	do {
+		Rain rain;
+
+		// Look for line start
+		while (!getBlockOfPixel(x, y)) {
+			--x;
+			++y;
+			if (x == 0 || y >= _mapYSize)
+				return;
+		}
+
+		rain.x = x;
+		rain.y = y;
+
+		uint8 length = 1;
+
+		// Look for line end
+		while (getBlockOfPixel(x, y)) {
+			--x;
+			++y;
+			if (x == 0 || y >= _mapYSize)
+				break;
+			++length;
+		}
+
+		rain.size = length;
+		rain.w3 = (randomNumber() << 8) | randomNumber();
+		rain.b5 = (randomNumber() & 3) + 4;
+		_rainList.push_back(rain);
+	} while (x > 0 && y < _mapYSize);
+}
+
+struct RainLocation {
+	uint8 location;
+	uint8 x, y;
+	uint8 rainSpacing;
+};
+
+static const RainLocation rainLocationList[] = {
+	{ 1,44,10,16 },
+	{ 4,11,30,14 },
+	{ 4,22,30,14 },
+	{ 3,33,10,14 },
+	{ 10,33,30,14 },
+	{ 10,22,30,24 },
+	{ 9,22,10,14 },
+	{ 2,33,0,14 },
+	{ 2,22,0,14 },
+	{ 6,11,30,14 },
+	{ 7,11,20,18 },
+	{ 7,0,20,18 },
+	{ 7,0,30,18 },
+	{ 55,44,0,14 },
+	{ 5,22,30,14 },
+
+	{ 8,0,10,18 },
+	{ 8,11,10,18 },
+	{ 8,22,10,18 },
+	{ 8,33,10,18 },
+	{ 8,33,20,18 },
+	{ 8,33,30,18 },
+	{ 8,33,40,18 },
+	{ 8,22,40,18 },
+	{ 8,11,40,18 },
+
+	{ 21,44,20,18 },
+	{ 255,0,0,0 }
+};
+
+void DreamWebEngine::initRain() {
+	const RainLocation *r = rainLocationList;
+	_rainList.clear();
+
+	uint8 rainSpacing = 0;
+
+	// look up location in rainLocationList to determine rainSpacing
+	for (r = rainLocationList; r->location != 0xff; ++r) {
+		if (r->location == _realLocation &&
+		        r->x == _mapX && r->y == _mapY) {
+			rainSpacing = r->rainSpacing;
+			break;
+		}
+	}
+
+	if (rainSpacing == 0) {
+		// location not found in rainLocationList: no rain
+		return;
+	}
+
+	// start lines of rain from top of screen
+	uint8 x = 4;
+	do {
+		uint8 delta;
+		do {
+			delta = (randomNumber() & 31) + 3;
+		} while (delta >= rainSpacing);
+
+		x += delta;
+		if (x >= _mapXSize)
+			break;
+
+		splitIntoLines(x, 0);
+	} while (true);
+
+	// start lines of rain from side of screen
+	uint8 y = 0;
+	do {
+		uint8 delta;
+		do {
+			delta = (randomNumber() & 31) + 3;
+		} while (delta >= rainSpacing);
+
+		y += delta;
+		if (y >= _mapYSize)
+			break;
+
+		splitIntoLines(_mapXSize - 1, y);
+	} while (true);
+}
+
+} // End of namespace DreamWeb
+
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index b1aae5adce..4bbc31b54e 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -471,50 +471,6 @@ const Frame *DreamWebEngine::getReelFrameAX(uint16 frame) {
 	return &base->_frames[frame];
 }
 
-void DreamWebEngine::showRain() {
-	Common::List<Rain>::iterator i;
-
-	// Do nothing if there's no rain at all
-	if (_rainList.empty())
-		return;
-
-	const uint8 *frameData = _mainSprites.getFrameData(58);
-
-	for (i = _rainList.begin(); i != _rainList.end(); ++i) {
-		Rain &rain = *i;
-		uint16 y = rain.y + _mapAdY + _mapYStart;
-		uint16 x = rain.x + _mapAdX + _mapXStart;
-		uint16 size = rain.size;
-		uint16 offset = (rain.w3 - rain.b5) & 511;
-		rain.w3 = offset;
-		const uint8 *src = frameData + offset;
-		uint8 *dst = workspace() + y * 320 + x;
-		for (uint16 j = 0; j < size; ++j) {
-			uint8 v = src[j];
-			if (v != 0)
-				*dst = v;
-			dst += 320-1; // advance diagonally
-		}
-	}
-
-	if (_channel1Playing != 255)
-		return;
-	if (_realLocation == 2 && _vars._beenMugged != 1)
-		return;
-	if (_realLocation == 55)
-		return;
-
-	if (randomNumber() >= 1) // play thunder with 1 in 256 chance
-		return;
-
-	uint8 soundIndex;
-	if (_channel0Playing != 6)
-		soundIndex = 4;
-	else
-		soundIndex = 7;
-	playChannel1(soundIndex);
-}
-
 void DreamWebEngine::moveMap(uint8 param) {
 	switch (param) {
 	case 32:
@@ -545,136 +501,6 @@ void DreamWebEngine::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint
 	*type = tileData._type;
 }
 
-uint8 DreamWebEngine::getBlockOfPixel(uint8 x, uint8 y) {
-	uint8 flag, flagEx, type, flagX, flagY;
-	checkOne(x + _mapXStart, y + _mapYStart, &flag, &flagEx, &type, &flagX, &flagY);
-	if (flag & 1)
-		return 0;
-	else
-		return type;
-}
-
-void DreamWebEngine::splitIntoLines(uint8 x, uint8 y) {
-	do {
-		Rain rain;
-
-		// Look for line start
-		while (!getBlockOfPixel(x, y)) {
-			--x;
-			++y;
-			if (x == 0 || y >= _mapYSize)
-				return;
-		}
-
-		rain.x = x;
-		rain.y = y;
-
-		uint8 length = 1;
-
-		// Look for line end
-		while (getBlockOfPixel(x, y)) {
-			--x;
-			++y;
-			if (x == 0 || y >= _mapYSize)
-				break;
-			++length;
-		}
-
-		rain.size = length;
-		rain.w3 = (randomNumber() << 8) | randomNumber();
-		rain.b5 = (randomNumber() & 3) + 4;
-		_rainList.push_back(rain);
-	} while (x > 0 && y < _mapYSize);
-}
-
-struct RainLocation {
-	uint8 location;
-	uint8 x, y;
-	uint8 rainSpacing;
-};
-
-static const RainLocation rainLocationList[] = {
-	{ 1,44,10,16 },
-	{ 4,11,30,14 },
-	{ 4,22,30,14 },
-	{ 3,33,10,14 },
-	{ 10,33,30,14 },
-	{ 10,22,30,24 },
-	{ 9,22,10,14 },
-	{ 2,33,0,14 },
-	{ 2,22,0,14 },
-	{ 6,11,30,14 },
-	{ 7,11,20,18 },
-	{ 7,0,20,18 },
-	{ 7,0,30,18 },
-	{ 55,44,0,14 },
-	{ 5,22,30,14 },
-
-	{ 8,0,10,18 },
-	{ 8,11,10,18 },
-	{ 8,22,10,18 },
-	{ 8,33,10,18 },
-	{ 8,33,20,18 },
-	{ 8,33,30,18 },
-	{ 8,33,40,18 },
-	{ 8,22,40,18 },
-	{ 8,11,40,18 },
-
-	{ 21,44,20,18 },
-	{ 255,0,0,0 }
-};
-
-void DreamWebEngine::initRain() {
-	const RainLocation *r = rainLocationList;
-	_rainList.clear();
-
-	uint8 rainSpacing = 0;
-
-	// look up location in rainLocationList to determine rainSpacing
-	for (r = rainLocationList; r->location != 0xff; ++r) {
-		if (r->location == _realLocation &&
-		        r->x == _mapX && r->y == _mapY) {
-			rainSpacing = r->rainSpacing;
-			break;
-		}
-	}
-
-	if (rainSpacing == 0) {
-		// location not found in rainLocationList: no rain
-		return;
-	}
-
-	// start lines of rain from top of screen
-	uint8 x = 4;
-	do {
-		uint8 delta;
-		do {
-			delta = (randomNumber() & 31) + 3;
-		} while (delta >= rainSpacing);
-
-		x += delta;
-		if (x >= _mapXSize)
-			break;
-
-		splitIntoLines(x, 0);
-	} while (true);
-
-	// start lines of rain from side of screen
-	uint8 y = 0;
-	do {
-		uint8 delta;
-		do {
-			delta = (randomNumber() & 31) + 3;
-		} while (delta >= rainSpacing);
-
-		y += delta;
-		if (y >= _mapYSize)
-			break;
-
-		splitIntoLines(_mapXSize - 1, y);
-	} while (true);
-}
-
 void DreamWebEngine::intro1Text() {
 	if (_introCount != 2 && _introCount != 4 && _introCount != 6)
 		return;
@@ -1192,3 +1018,4 @@ void DreamWebEngine::checkForExit(Sprite *sprite) {
 }
 
 } // End of namespace DreamWeb
+
-- 
cgit v1.2.3


From 261fc2f4beb0aef9ab0a32afdedac4a87561f26f Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sat, 3 Mar 2012 13:55:04 +0100
Subject: DREAMWEB: Simplify some uses of randomNumber()

Our random number generator isn't restricted to producing numbers
between 0 and 255. We can just ask it for the desired range.
---
 engines/dreamweb/monitor.cpp |  2 +-
 engines/dreamweb/people.cpp  |  2 +-
 engines/dreamweb/rain.cpp    | 16 ++++------------
 engines/dreamweb/sprite.cpp  |  4 ++--
 4 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index cdef60e94d..95aa400c3a 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -320,7 +320,7 @@ void DreamWebEngine::randomAccess(uint16 count) {
 	for (uint16 i = 0; i < count; ++i) {
 		vSync();
 		vSync();
-		uint16 v = randomNumber() & 15;
+		uint16 v = _rnd.getRandomNumber(15);
 		if (v < 10)
 			accessLightOff();
 		else
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 316a1689c9..dfb5c62618 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -262,7 +262,7 @@ void DreamWebEngine::gamer(ReelRoutine &routine) {
 	if (checkSpeed(routine)) {
 		uint8 v;
 		do {
-			v = 20 + randomNumber() % 5;
+			v = _rnd.getRandomNumberRng(20, 24);
 		} while (v == routine.reelPointer());
 		routine.setReelPointer(v);
 	}
diff --git a/engines/dreamweb/rain.cpp b/engines/dreamweb/rain.cpp
index 0a8ee2a38e..7db4744cbf 100644
--- a/engines/dreamweb/rain.cpp
+++ b/engines/dreamweb/rain.cpp
@@ -104,8 +104,8 @@ void DreamWebEngine::splitIntoLines(uint8 x, uint8 y) {
 		}
 
 		rain.size = length;
-		rain.w3 = (randomNumber() << 8) | randomNumber();
-		rain.b5 = (randomNumber() & 3) + 4;
+		rain.w3 = _rnd.getRandomNumber(65535);
+		rain.b5 = _rnd.getRandomNumberRng(4, 7);
 		_rainList.push_back(rain);
 	} while (x > 0 && y < _mapYSize);
 }
@@ -170,11 +170,7 @@ void DreamWebEngine::initRain() {
 	// start lines of rain from top of screen
 	uint8 x = 4;
 	do {
-		uint8 delta;
-		do {
-			delta = (randomNumber() & 31) + 3;
-		} while (delta >= rainSpacing);
-
+		uint8 delta = _rnd.getRandomNumberRng(3, rainSpacing - 1);
 		x += delta;
 		if (x >= _mapXSize)
 			break;
@@ -185,11 +181,7 @@ void DreamWebEngine::initRain() {
 	// start lines of rain from side of screen
 	uint8 y = 0;
 	do {
-		uint8 delta;
-		do {
-			delta = (randomNumber() & 31) + 3;
-		} while (delta >= rainSpacing);
-
+		uint8 delta = _rnd.getRandomNumberRng(3, rainSpacing - 1);
 		y += delta;
 		if (y >= _mapYSize)
 			break;
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 4bbc31b54e..3df324abe1 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -263,8 +263,8 @@ void DreamWebEngine::constant(Sprite *sprite, SetObject *objData) {
 }
 
 void DreamWebEngine::randomSprite(Sprite *sprite, SetObject *objData) {
-	uint8 r = randomNumber();
-	sprite->frameNumber = objData->frames[r&7];
+	uint8 r = _rnd.getRandomNumber(7);
+	sprite->frameNumber = objData->frames[r];
 }
 
 void DreamWebEngine::doorway(Sprite *sprite, SetObject *objData) {
-- 
cgit v1.2.3


From d41d7e5f3688b3d83323d9240fe744ba8d339307 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 4 Mar 2012 01:11:50 +0200
Subject: DREAMWEB: Clean up the palette brightness code

---
 engines/dreamweb/dreamweb.cpp | 4 +++-
 engines/dreamweb/dreamweb.h   | 3 +--
 engines/dreamweb/stubs.cpp    | 5 -----
 engines/dreamweb/vgagrafx.cpp | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 9c02cd74ad..af55d0c72c 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -89,7 +89,7 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_speechCount = 0;
 	_charShift = 0;
 	_kerning = 0;
-	_brightness = 0;
+	_brightPalette = false;
 	_roomLoaded = 0;
 	_didZoom = 0;
 	_lineSpacing = 10;
@@ -366,7 +366,9 @@ Common::Error DreamWebEngine::run() {
 	_console = new DreamWebConsole(this);
 
 	ConfMan.registerDefault("dreamweb_originalsaveload", "false");
+	ConfMan.registerDefault("bright_palette", true);
 	_hasSpeech = Common::File::exists("speech/r01c0000.raw") && !ConfMan.getBool("speech_mute");
+	_brightPalette = ConfMan.getBool("bright_palette");
 
 	_timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync");
 	dreamweb();
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index e80b5538ad..13a27449dc 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -341,7 +341,7 @@ public:
 	uint8 _speechCount;
 	uint16 _charShift;
 	uint8 _kerning;
-	uint8 _brightness;
+	bool _brightPalette;
 	uint8 _roomLoaded;
 	uint8 _didZoom;
 	uint16 _lineSpacing;
@@ -952,7 +952,6 @@ public:
 	void screenUpdate();
 	void startup1();
 	void readOneBlock();
-	void seeCommandTail();
 	bool checkIfPerson(uint8 x, uint8 y);
 	bool checkIfFree(uint8 x, uint8 y);
 	bool checkIfEx(uint8 x, uint8 y);
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 8e63774317..9789e20210 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -565,7 +565,6 @@ void DreamWebEngine::dreamweb() {
 		break;
 	}
 
-	seeCommandTail();
 	allocateBuffers();
 
 	// setMouse
@@ -877,10 +876,6 @@ void DreamWebEngine::hangOnCurs(uint16 frameCount) {
 	}
 }
 
-void DreamWebEngine::seeCommandTail() {
-	_brightness = 1;
-}
-
 void DreamWebEngine::readMouse() {
 	_oldButton = _mouseButton;
 	uint16 state = readMouseState();
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index be7d210999..a66f156a1d 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -417,7 +417,7 @@ void DreamWebEngine::loadPalFromIFF() {
 	uint8 *dst = _mainPal;
 	for (size_t i = 0; i < 256*3; ++i) {
 		uint8 c = src[i] / 4;
-		if (_brightness == 1) {
+		if (_brightPalette) {
 			if (c) {
 				c = c + c / 2 + c / 4;
 				if (c > 63)
-- 
cgit v1.2.3


From 3bf8eb4e3e59439cb90a4a8fa7b10c8be360d019 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 4 Mar 2012 19:37:45 +1100
Subject: TSAGE: Bugfix for Blue Force named hotspots to display look/use/talk
 descriptions correctly

---
 engines/tsage/blue_force/blueforce_logic.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_logic.h b/engines/tsage/blue_force/blueforce_logic.h
index 04c6e9bdc2..59bc2b7a51 100644
--- a/engines/tsage/blue_force/blueforce_logic.h
+++ b/engines/tsage/blue_force/blueforce_logic.h
@@ -119,9 +119,6 @@ public:
 
 class NamedObject: public SceneObject {
 public:
-	int _resNum;
-	int _lookLineNum, _talkLineNum, _useLineNum;
-
 	virtual Common::String getClassName() { return "NamedObject"; }
 	virtual void synchronize(Serializer &s);
 	virtual void postInit(SceneObjectList *OwnerList = NULL);
-- 
cgit v1.2.3


From 818c85948e418c7f02f53feca34102b171ab3ce5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 4 Mar 2012 19:38:25 +1100
Subject: TSAGE: Bugfix for showing cursor correctly in Blue Force scene 930

---
 engines/tsage/blue_force/blueforce_scenes9.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index a303576928..a63ff7efdf 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -3375,6 +3375,7 @@ void Scene930::postInit(SceneObjectList *OwnerList) {
 	BF_GLOBALS._player.fixPriority(80);
 	BF_GLOBALS._player.changeZoom(-1);
 	BF_GLOBALS._player.enableControl();
+	BF_GLOBALS._events.setCursor(CURSOR_WALK);
 
 	_item1.setDetails(  1, 930,  0,  1,  2, 1);
 	_item2.setDetails(  2, 930,  4,  5,  6, 1);
-- 
cgit v1.2.3


From dac35ac1cc2f94022ba3435b4231b9dd4ac8d60f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 4 Mar 2012 20:24:54 +1100
Subject: TSAGE: Some cleanup of R2R Animation Player, and fix for playing when
 objects are active

---
 engines/tsage/ringworld2/ringworld2_logic.cpp   | 38 +++++++++++-----
 engines/tsage/ringworld2/ringworld2_logic.h     |  5 ++-
 engines/tsage/ringworld2/ringworld2_scenes0.cpp | 58 ++++++++++++-------------
 engines/tsage/ringworld2/ringworld2_scenes0.h   |  2 +-
 4 files changed, 62 insertions(+), 41 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 4cfcc29d24..a06899fe5a 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -1623,7 +1623,7 @@ AnimationPlayer::AnimationPlayer(): EventHandler() {
 
 	_screenBounds = R2_GLOBALS._gfxManagerInstance._bounds;
 	_rect1 = R2_GLOBALS._gfxManagerInstance._bounds;
-	_paletteMode = 0;
+	_paletteMode = ANIMPALMODE_REPLACE_PALETTE;
 	_field3A = 1;
 	_sliceHeight = 1;
 	_field58 = 1;
@@ -1709,7 +1709,7 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 	
 	debugC(1, ktSageDebugGraphics, "Data needed %d", _dataNeeded);
 
-	// Set up animation data array
+	// Set up animation data objects
 	_animData1 = new AnimationData();
 	_sliceCurrent = _animData1;
 
@@ -1737,21 +1737,25 @@ bool AnimationPlayer::load(int animId, Action *endAction) {
 
 	// Handle starting palette
 	switch (_paletteMode) {
-	case 0:
-		// Use existing active palette
+	case ANIMPALMODE_REPLACE_PALETTE:
+		// Use the palette provided with the animation directly
 		_palette.getPalette();
 		for (int idx = _subData._palStart; idx < (_subData._palStart + _subData._palSize); ++idx) {
-			uint r, g, b;
-			_palette.getEntry(idx, &r, &g, &b);
+			byte r = _subData._palData[idx * 3];
+			byte g = _subData._palData[idx * 3 + 1];
+			byte b = _subData._palData[idx * 3 + 2];
+
 			R2_GLOBALS._scenePalette.setEntry(idx, r, g, b);
 		}
 
 		R2_GLOBALS._sceneManager._hasPalette = true;
 		break;
-	case 2:
+	case ANIMPALMODE_NONE:
 		break;
 
 	default:
+		// ANIMPALMODE_CURR_PALETTE
+		// Use the closest matching colours in the currently active palette to those specified in the animation
 		for (int idx = _subData._palStart; idx < (_subData._palStart + _subData._palSize); ++idx) {
 			byte r = _subData._palData[idx * 3];
 			byte g = _subData._palData[idx * 3 + 1];
@@ -1858,12 +1862,26 @@ void AnimationPlayer::drawFrame(int sliceIndex) {
 		break;
 	}
 
-	if (_field56 == 42) {
+	// Unlock the screen surface
+	R2_GLOBALS._screenSurface.unlockSurface();
+
+	if (_objectMode == 42) {
 		_screenBounds.expandPanes();
+
+		// Copy the drawn frame to the back surface
+		Rect srcRect = R2_GLOBALS._screenSurface.getBounds();
+		Rect destRect = srcRect;
+		destRect.translate(-g_globals->_sceneOffset.x, -g_globals->_sceneOffset.y);
+		R2_GLOBALS._sceneManager._scene->_backSurface.copyFrom(R2_GLOBALS._screenSurface,
+			srcRect, destRect);
+
+		// Draw any objects into the scene
 		R2_GLOBALS._sceneObjects->draw();
 	} else {
-		if (R2_GLOBALS._sceneManager._hasPalette)
+		if (R2_GLOBALS._sceneManager._hasPalette) {
+			R2_GLOBALS._sceneManager._hasPalette = false;
 			R2_GLOBALS._scenePalette.refresh();
+		}
 	}
 }
 
@@ -1916,7 +1934,7 @@ void AnimationPlayer::close() {
 	// Close the resource file
 	_resourceFile.close();
 
-	if (_field56 != 42) {
+	if (_objectMode != 42) {
 		// flip screen in original
 	}
 
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index b63c0ac2a7..0b573bf7f0 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -375,6 +375,9 @@ public:
 	int _animSlicesSize;
 };
 
+enum AnimationPaletteMode { ANIMPALMODE_REPLACE_PALETTE = 0, ANIMPALMODE_CURR_PALETTE = 1,
+		ANIMPALMODE_NONE = 2 };
+
 class AnimationPlayer: public EventHandler {
 private:
 	void rleDecode(const byte *pSrc, byte *pDest, int size);
@@ -390,7 +393,7 @@ public:
 	Rect _rect1, _screenBounds;
 	int _field38;
 	int _field3A, _paletteMode;
-	int _field56;
+	int _objectMode;
 	int _field58, _sliceHeight;
 	byte _palIndexes[256];
 	ScenePalette _palette;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 94a119338a..4c98fcf00a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1549,18 +1549,18 @@ void Scene180::signal() {
 
 	switch (_sceneMode++) {
 	case 0:
-		setFrameInc(6);
+		setSceneDelay(6);
 		break;
 
 	case 1:
 		_field412 = 1;
 		R2_GLOBALS._sceneManager._hasPalette = true;
-		_animationPlayer._paletteMode = 2;
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
 		_animationPlayer._v = 1;
-		_animationPlayer._field56 = 1;
+		_animationPlayer._objectMode = 1;
 		R2_GLOBALS._scene180Mode = 1;
 
-		_animationPlayer.load(1, NULL);
+		_animationPlayer.load(1);
 		R2_GLOBALS._scenePalette.loadPalette(_animationPlayer._subData._palData, 0, 256);
 
 		R2_GLOBALS._sound1.play(1);
@@ -1571,9 +1571,9 @@ void Scene180::signal() {
 		R2_GLOBALS._paneRefreshFlag[0] = 3;
 
 		if (R2_GLOBALS._sound1.isPlaying()) {
-			setFrameInc(1);
+			setSceneDelay(1);
 		} else {
-			setFrameInc(180);
+			setSceneDelay(180);
 		}
 		break;
 
@@ -1583,7 +1583,7 @@ void Scene180::signal() {
 		if (R2_GLOBALS._sound1.isPlaying())
 			_sceneMode = 3;
 
-		setFrameInc(1);
+		setSceneDelay(1);
 		break;
 
 	case 4:
@@ -1598,9 +1598,9 @@ void Scene180::signal() {
 		break;
 
 	case 5:
-		_animationPlayer._paletteMode = 2;
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
 		_animationPlayer._v = 1;
-		_animationPlayer._field56 = 1;
+		_animationPlayer._objectMode = 1;
 		R2_GLOBALS._scene180Mode = 2;
 		_animationPlayer.load(2);
 
@@ -1614,9 +1614,9 @@ void Scene180::signal() {
 		R2_GLOBALS._paneRefreshFlag[0] = 3;
 
 		if (R2_GLOBALS._sound1.isPlaying()) {
-			setFrameInc(1);
+			setSceneDelay(1);
 		} else {
-			setFrameInc(180);
+			setSceneDelay(180);
 		}
 		break;
 
@@ -1625,19 +1625,19 @@ void Scene180::signal() {
 		R2_GLOBALS._scene180Mode = 2;
 		if (R2_GLOBALS._sound1.isPlaying())
 			_sceneMode = 7;
-		setFrameInc(1);
+		setSceneDelay(1);
 		break;
 
 	case 9:
 		R2_GLOBALS._sound1.play(3);
 		clearScreen();
-		setFrameInc(2);
+		setSceneDelay(2);
 		break;
 
 	case 10:
 		loadScene(4002);
 		R2_GLOBALS._scenePalette.loadPalette(0);
-		setFrameInc(6);
+		setSceneDelay(6);
 		break;
 
 	case 11:
@@ -1656,7 +1656,7 @@ void Scene180::signal() {
 	case 24:
 	case 26:
 	case 46:
-		setFrameInc((R2_GLOBALS._speechSubtitles & 1) ? 1 : 18);
+		setSceneDelay((R2_GLOBALS._speechSubtitles & 1) ? 1 : 18);
 		break;
 
 	case 13:
@@ -1691,7 +1691,7 @@ void Scene180::signal() {
 		_field412 = 0;
 		_object4.remove();
 		_object5.remove();
-		setFrameInc(2);
+		setSceneDelay(2);
 		break;
 
 	case 28:
@@ -1703,9 +1703,9 @@ void Scene180::signal() {
 
 	case 29:
 		_field412 = 1;
-		_animationPlayer._paletteMode = 0;
+		_animationPlayer._paletteMode = ANIMPALMODE_REPLACE_PALETTE;
 		_animationPlayer._v = 1;
-		_animationPlayer._field56 = 42;
+		_animationPlayer._objectMode = 42;
 		R2_GLOBALS._scene180Mode = 3;
 		_animationPlayer.load(3);
 		break;
@@ -1727,7 +1727,7 @@ void Scene180::signal() {
 
 		if (R2_GLOBALS._sceneManager._hasPalette)
 			R2_GLOBALS._scenePalette.refresh();
-		setFrameInc(6);
+		setSceneDelay(6);
 		break;
 
 	case 32:
@@ -1799,19 +1799,19 @@ void Scene180::signal() {
 
 	case 39:
 		R2_GLOBALS._sound1.changeSound(8);
-		setFrameInc(1);
+		setSceneDelay(1);
 		break;
 
 	case 40:
-		_animationPlayer._paletteMode = 2;
-		_animationPlayer._field56 = 1;
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
+		_animationPlayer._objectMode = 1;
 		R2_GLOBALS._scene180Mode = 4;
 		if (_animationPlayer.load(4)) {
 			_animationPlayer.dispatch();
 			R2_GLOBALS._scenePalette.addFader(_animationPlayer._subData._palData, 256, 8, this);
 		} else {
 			_sceneMode = 43;
-			setFrameInc(1);
+			setSceneDelay(1);
 		}
 		break;
 
@@ -1823,7 +1823,7 @@ void Scene180::signal() {
 	case 42:
 		R2_GLOBALS._scene180Mode = 4;
 		R2_GLOBALS._paneRefreshFlag[0] = 3;
-		setFrameInc(1);
+		setSceneDelay(1);
 		break;
 
 	case 44:
@@ -1832,7 +1832,7 @@ void Scene180::signal() {
 		if (R2_GLOBALS._sceneManager._hasPalette)
 			R2_GLOBALS._scenePalette.refresh();
 
-		setFrameInc(6);
+		setSceneDelay(6);
 		break;
 
 	case 45:
@@ -1841,9 +1841,9 @@ void Scene180::signal() {
 
 	case 48:
 		_field412 = 1;
-		_animationPlayer._paletteMode = 2;
+		_animationPlayer._paletteMode = ANIMPALMODE_NONE;
 		_animationPlayer._v = 1;
-		_animationPlayer._field56 = 1;
+		_animationPlayer._objectMode = 1;
 		R2_GLOBALS._scene180Mode = 15;
 		_animationPlayer.load(15, NULL);
 
@@ -1854,7 +1854,7 @@ void Scene180::signal() {
 	case 49:
 		R2_GLOBALS._scene180Mode = 15;
 		R2_GLOBALS._paneRefreshFlag[0] = 3;
-		setFrameInc(1);
+		setSceneDelay(1);
 		break;
 
 	case 50:
@@ -1865,7 +1865,7 @@ void Scene180::signal() {
 	}
 }
 
-void Scene180::setFrameInc(int v) {
+void Scene180::setSceneDelay(int v) {
 	_frameInc = v;
 	_frameNumber = R2_GLOBALS._events.getFrameNumber();
 }
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index e39efbca3d..2f52f9578f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -195,7 +195,7 @@ class Scene180: public SceneExt {
 		void signal();
 	};
 private:
-	void setFrameInc(int v);
+	void setSceneDelay(int v);
 public:
 	SpeakerWebbster _webbsterSpeaker;
 	SpeakerDutyOfficer _dutyOfficerSpeaker;
-- 
cgit v1.2.3


From 865c54c125f0b5b0af1cd251cf07ec596dd4631a Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Mon, 5 Mar 2012 12:14:54 -0500
Subject: SCI: Fix GK1 demo sounds

This is a regression from 9fd66deb43a8ba1bd7b423cb6fe2b7177af74166 and, despite the commit message, was *not* fixed by 1736345906af095c863a62ded2638ce92c2a0704
---
 engines/sci/sound/soundcmd.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 3306a76605..b8be898abc 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -39,15 +39,16 @@ SoundCommandParser::SoundCommandParser(ResourceManager *resMan, SegManager *segM
 
 #ifdef ENABLE_SFX_TYPE_SELECTION
 	// Check if the user wants synthesized or digital sound effects in SCI1.1
-	// or later games
-	_useDigitalSFX = ConfMan.getBool("multi_midi");
+	// games based on the multi_midi config setting
 
 	// In SCI2 and later games, this check should always be true - there was
 	// always only one version of each sound effect or digital music track
 	// (e.g. the menu music in GK1 - there is a sound effect with the same
 	// resource number, but it's totally unrelated to the menu music).
-	if (getSciVersion() >= SCI_VERSION_2)
-		_useDigitalSFX = true;
+	// The GK1 demo (very late SCI1.1) does the same thing
+	// TODO: Check the QFG4 demo
+
+	_useDigitalSFX = (getSciVersion() >= SCI_VERSION_2 || g_sci->getGameId() == GID_GK1 || ConfMan.getBool("multi_midi"));
 #else
 	// Always prefer digital sound effects
 	_useDigitalSFX = true;
@@ -93,9 +94,7 @@ void SoundCommandParser::initSoundResource(MusicEntry *newSound) {
 	// effects map)
 	bool checkAudioResource = getSciVersion() >= SCI_VERSION_1_1;
 	// Hoyle 4 has garbled audio resources in place of the sound resources.
-	// The demo of GK1 has no alternate sound effects.
-	if ((g_sci->getGameId() == GID_HOYLE4) || 
-		(g_sci->getGameId() == GID_GK1 && g_sci->isDemo()))
+	if (g_sci->getGameId() == GID_HOYLE4)
 		checkAudioResource = false;
 
 	if (checkAudioResource && _resMan->testResource(ResourceId(kResourceTypeAudio, newSound->resourceId))) {
-- 
cgit v1.2.3


From 9671b44df8ecd1db46758508b1303d8ab3f515dd Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 5 Mar 2012 20:02:05 +0100
Subject: KYRA: Some formatting fixes.

---
 engines/kyra/gui_rpg.cpp      |  5 +++--
 engines/kyra/kyra_rpg.cpp     | 16 ++++++++--------
 engines/kyra/kyra_v1.h        |  2 +-
 engines/kyra/saveload_rpg.cpp |  2 +-
 engines/kyra/scene_rpg.cpp    |  6 +++---
 engines/kyra/screen_eob.cpp   |  2 +-
 engines/kyra/text_rpg.cpp     | 26 ++++++++++++++------------
 7 files changed, 31 insertions(+), 28 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/gui_rpg.cpp b/engines/kyra/gui_rpg.cpp
index a8b94032d0..be40050bb1 100644
--- a/engines/kyra/gui_rpg.cpp
+++ b/engines/kyra/gui_rpg.cpp
@@ -40,7 +40,8 @@ void KyraRpgEngine::removeInputTop() {
 }
 
 void KyraRpgEngine::gui_drawBox(int x, int y, int w, int h, int frameColor1, int frameColor2, int fillColor) {
-	w--; h--;
+	w--;
+	h--;
 	if (fillColor != -1)
 		screen()->fillRect(x + 1, y + 1, x + w - 1, y + h - 1, fillColor);
 
@@ -128,6 +129,6 @@ bool KyraRpgEngine::clickedShape(int shapeIndex) {
 	return false;
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // defined(ENABLE_EOB) || defined(ENABLE_LOL)
diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp
index 8857f64f7e..f1d9550e8f 100644
--- a/engines/kyra/kyra_rpg.cpp
+++ b/engines/kyra/kyra_rpg.cpp
@@ -217,11 +217,11 @@ void KyraRpgEngine::drawDialogueButtons() {
 		if (gameFlags().use16ColorMode) {
 			gui_drawBox(x, ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) & ~7) - 1, 74, 10, 0xee, 0xcc, -1);
 			screen()->printText(_dialogueButtonString[i], (x + 37 - (screen()->getTextWidth(_dialogueButtonString[i])) / 2) & ~3,
-				((_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2) & ~7, _dialogueHighlightedButton == i ? 0xc1 : 0xe1, 0);
+			                    ((_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2) & ~7, _dialogueHighlightedButton == i ? 0xc1 : 0xe1, 0);
 		} else {
 			gui_drawBox(x, (_dialogueButtonYoffs + _dialogueButtonPosY[i]), _dialogueButtonWidth, guiSettings()->buttons.height, guiSettings()->colors.frame1, guiSettings()->colors.frame2, guiSettings()->colors.fill);
 			screen()->printText(_dialogueButtonString[i], x + (_dialogueButtonWidth >> 1) - (screen()->getTextWidth(_dialogueButtonString[i])) / 2,
-				(_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2, _dialogueHighlightedButton == i ? _dialogueButtonLabelColor1 : _dialogueButtonLabelColor2, 0);
+			                    (_dialogueButtonYoffs + _dialogueButtonPosY[i]) + 2, _dialogueHighlightedButton == i ? _dialogueButtonLabelColor1 : _dialogueButtonLabelColor2, 0);
 		}
 	}
 	screen()->setFont(of);
@@ -255,11 +255,11 @@ uint16 KyraRpgEngine::processDialogue() {
 		}
 
 		if (snd_updateCharacterSpeech() != 2) {
-				res = 1;
-				if (!shouldQuit()) {
-					removeInputTop();
-					gui_notifyButtonListChanged();
-				}
+			res = 1;
+			if (!shouldQuit()) {
+				removeInputTop();
+				gui_notifyButtonListChanged();
+			}
 		}
 	} else {
 		int e = checkInput(0, false, 0) & 0xFF;
@@ -362,6 +362,6 @@ void KyraRpgEngine::updateEnvironmentalSfx(int soundId) {
 	snd_processEnvironmentalSoundEffect(soundId, _currentBlock);
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 11173a45c7..0033969047 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -119,7 +119,7 @@ struct GameFlags {
 	bool useAltShapeHeader    : 1;    // alternative shape header (uses 2 bytes more, those are unused though)
 	bool isTalkie             : 1;
 	bool isOldFloppy          : 1;
-	bool useHiRes      : 1;
+	bool useHiRes             : 1;
 	bool use16ColorMode       : 1;
 	bool useDigSound          : 1;
 	bool useInstallerPackage  : 1;
diff --git a/engines/kyra/saveload_rpg.cpp b/engines/kyra/saveload_rpg.cpp
index f3eef0d811..d22c50dbeb 100644
--- a/engines/kyra/saveload_rpg.cpp
+++ b/engines/kyra/saveload_rpg.cpp
@@ -122,6 +122,6 @@ void KyraRpgEngine::releaseFlyingObjectTempData(LevelTempData *tmp) {
 	delete[] p;
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB || ENABLE_LOL
diff --git a/engines/kyra/scene_rpg.cpp b/engines/kyra/scene_rpg.cpp
index b015b10cd9..3a694e05fe 100644
--- a/engines/kyra/scene_rpg.cpp
+++ b/engines/kyra/scene_rpg.cpp
@@ -133,7 +133,7 @@ void KyraRpgEngine::generateBlockDrawingBuffer() {
 	_sceneDrawVarLeft = _dscBlockMap[_currentDirection + 8];
 
 	/*******************************************
-    *             _visibleBlocks map           *
+	*             _visibleBlocks map           *
 	*                                          *
 	*     |     |     |     |     |     |      *
 	*  00 |  01 |  02 |  03 |  04 |  05 |  06  *
@@ -337,7 +337,7 @@ bool KyraRpgEngine::checkSceneUpdateNeed(int block) {
 		}
 	}
 
-	if (_currentBlock == block){
+	if (_currentBlock == block) {
 		_sceneUpdateRequired = true;
 		return true;
 	}
@@ -626,7 +626,7 @@ void KyraRpgEngine::completeDoorOperations() {
 		do {
 			_levelBlockProperties[b].walls[_openDoorState[i].wall] += _openDoorState[i].state;
 			_levelBlockProperties[b].walls[_openDoorState[i].wall ^ 2] += _openDoorState[i].state;
-		} while	(!(_wllWallFlags[_levelBlockProperties[b].walls[_openDoorState[i].wall]] & 0x30));
+		} while (!(_wllWallFlags[_levelBlockProperties[b].walls[_openDoorState[i].wall]] & 0x30));
 
 		_openDoorState[i].block = 0;
 	}
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 9fae729bc4..e06ca42c40 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -147,7 +147,7 @@ void Screen_EoB::setMouseCursor(int x, int y, const byte *shape, const uint8 *ov
 	uint8 *cursor = new uint8[mouseW * _pageScaleFactor[6] * mouseH * _pageScaleFactor[6]];
 	// We use memset and copyBlockToPage instead of fillRect to make sure that the
 	// color key 0xFF doesn't get converted into EGA color
-	memset (cursor, colorKey, mouseW * _pageScaleFactor[6] * mouseH * _pageScaleFactor[6]);
+	memset(cursor, colorKey, mouseW * _pageScaleFactor[6] * mouseH * _pageScaleFactor[6]);
 	copyBlockToPage(6, 0, 0, mouseW, mouseH, cursor);
 	drawShape(6, shape, 0, 0, 0, 2, ovl);
 	CursorMan.showMouse(false);
diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text_rpg.cpp
index d0f7b5e532..b004270055 100644
--- a/engines/kyra/text_rpg.cpp
+++ b/engines/kyra/text_rpg.cpp
@@ -46,7 +46,7 @@ TextDisplayer_rpg::TextDisplayer_rpg(KyraRpgEngine *engine, Screen *scr) : _vm(e
 
 	_textDimData = new TextDimData[_screen->screenDimTableCount()];
 
-	for (int i = 0; i < _screen->screenDimTableCount(); i++){
+	for (int i = 0; i < _screen->screenDimTableCount(); i++) {
 		const ScreenDim *d = _screen->getScreenDim(i);
 		_textDimData[i].color1 = d->unk8;
 		_textDimData[i].color2 = d->unkA;
@@ -189,7 +189,7 @@ void TextDisplayer_rpg::displayText(char *str, ...) {
 			break;
 
 		case 11:
-			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			_sjisLineBreakFlag = _sjisLineBreakFlag;
 			// TODO (UNUSED)
 			break;
 
@@ -204,27 +204,27 @@ void TextDisplayer_rpg::displayText(char *str, ...) {
 			break;
 
 		case 18:
-			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			_sjisLineBreakFlag = _sjisLineBreakFlag;
 			// TODO (UNUSED)
 			break;
 
 		case 23:
-			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			_sjisLineBreakFlag = _sjisLineBreakFlag;
 			// TODO (UNUSED)
 			break;
 
 		case 24:
-			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			_sjisLineBreakFlag = _sjisLineBreakFlag;
 			// TODO (UNUSED)
 			break;
 
 		case 26:
-			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			_sjisLineBreakFlag = _sjisLineBreakFlag;
 			// TODO (UNUSED)
 			break;
 
 		case 28:
-			_sjisLineBreakFlag=_sjisLineBreakFlag;
+			_sjisLineBreakFlag = _sjisLineBreakFlag;
 			// TODO (UNUSED)
 			break;
 
@@ -286,14 +286,16 @@ void TextDisplayer_rpg::readNextPara() {
 	// All necessary conversions take place somewhere else. This code actually causes issues if the character conversions
 	// don't take place before calling displayText(). So we disable it for now. If some (not yet supported) localized
 	// versions depend on this code we'll have to look at this again.
-	/* if ((_vm->game() != GI_LOL) && (d & 0x80)) {
+#if 0
+	if ((_vm->game() != GI_LOL) && (d & 0x80)) {
 		d &= 0x7f;
 		c = d & 7;
 		d = (d & 0x78) >> 3;
 		uint8 l = d;
 		c = _table1[(l << 3) + c];
 		d = _table2[l];
-	}*/
+	}
+#endif
 
 	_ctrl[1] = d;
 	_ctrl[2] = c;
@@ -465,8 +467,8 @@ void TextDisplayer_rpg::printLine(char *str) {
 }
 
 void TextDisplayer_rpg::printDialogueText(int stringId, const char *pageBreakString) {
-	const char * str = (const char *)(_screen->getCPagePtr(5) + READ_LE_UINT16(&_screen->getCPagePtr(5)[(stringId - 1) << 1]));
-	assert (strlen(str) < kEoBTextBufferSize);
+	const char *str = (const char *)(_screen->getCPagePtr(5) + READ_LE_UINT16(&_screen->getCPagePtr(5)[(stringId - 1) << 1]));
+	assert(strlen(str) < kEoBTextBufferSize);
 	Common::strlcpy(_dialogueBuffer, str, kEoBTextBufferSize);
 
 	displayText(_dialogueBuffer);
@@ -481,7 +483,7 @@ void TextDisplayer_rpg::printDialogueText(int stringId, const char *pageBreakStr
 }
 
 void TextDisplayer_rpg::printDialogueText(const char *str, bool wait) {
-	assert (strlen(str) < kEoBTextBufferSize);
+	assert(strlen(str) < kEoBTextBufferSize);
 	Common::strlcpy(_dialogueBuffer, str, kEoBTextBufferSize);
 
 	strcpy(_dialogueBuffer, str);
-- 
cgit v1.2.3


From 398987ad7f83ffc44032658b94db5763fe83d344 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 5 Mar 2012 20:21:46 +0100
Subject: KYRA: Replace debug leftover for unimplemented displayText functions
 with a warning.

---
 engines/kyra/text_rpg.cpp | 34 ++++++----------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text_rpg.cpp
index b004270055..52c14c7223 100644
--- a/engines/kyra/text_rpg.cpp
+++ b/engines/kyra/text_rpg.cpp
@@ -188,11 +188,6 @@ void TextDisplayer_rpg::displayText(char *str, ...) {
 			_textDimData[sdx].column = (_screen->getFontWidth() + _screen->_charWidth) * dv;
 			break;
 
-		case 11:
-			_sjisLineBreakFlag = _sjisLineBreakFlag;
-			// TODO (UNUSED)
-			break;
-
 		case 12:
 			if (isPc98)
 				_sjisLineBreakFlag = true;
@@ -203,29 +198,12 @@ void TextDisplayer_rpg::displayText(char *str, ...) {
 			_textDimData[sdx].line++;
 			break;
 
-		case 18:
-			_sjisLineBreakFlag = _sjisLineBreakFlag;
-			// TODO (UNUSED)
-			break;
-
-		case 23:
-			_sjisLineBreakFlag = _sjisLineBreakFlag;
-			// TODO (UNUSED)
-			break;
-
-		case 24:
-			_sjisLineBreakFlag = _sjisLineBreakFlag;
-			// TODO (UNUSED)
-			break;
-
-		case 26:
-			_sjisLineBreakFlag = _sjisLineBreakFlag;
-			// TODO (UNUSED)
-			break;
-
-		case 28:
-			_sjisLineBreakFlag = _sjisLineBreakFlag;
-			// TODO (UNUSED)
+		case 11: case 18: case 23:
+		case 24: case 26: case 28:
+			// These are at the time of writing this comment not known to be
+			// used. In case there is some use of them in some odd version
+			// we display this warning here.
+			warning("TextDisplayer_rpg::displayText: Triggered stub function %d", c - 1);
 			break;
 
 		default:
-- 
cgit v1.2.3


From c29fa80f5cf0f91eadbabd953bbc9c319e25422f Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 6 Mar 2012 20:00:15 +0100
Subject: SKY: Fix comment typos

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

(limited to 'engines')

diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index 44ea3a305b..fd90015aa3 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -58,8 +58,8 @@ extern bool draw_keyboard;
  At the beginning the reverse engineers were happy, and did rejoice at
  their task, for the engine before them did shineth and was full of
  promise. But then they did look closer and see'th the aweful truth;
- it's code was assembly and messy (rareth was its comments). And so large
- were it's includes that did at first seem small; queereth also was its
+ its code was assembly and messy (rareth was its comments). And so large
+ were its includes that did at first seem small; queereth also was its
  compact(s). Then they did findeth another version, and this was slightly
  different from the first. Then a third, and this was different again.
  All different, but not really better, for all were not really compatible.
-- 
cgit v1.2.3


From 62966183e448d2e9332f3abf50918594280a02d6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 7 Mar 2012 21:06:32 +1100
Subject: TSAGE: Renaming of fields and fix for gate in Blue Force scene 900

---
 engines/tsage/blue_force/blueforce_scenes9.cpp | 14 +++++++-------
 engines/tsage/blue_force/blueforce_scenes9.h   |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index a63ff7efdf..e364525e2c 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -35,7 +35,7 @@ namespace BlueForce {
  *
  *--------------------------------------------------------------------------*/
 
-bool Scene900::Item1::startAction(CursorType action, Event &event) {
+bool Scene900::Exterior::startAction(CursorType action, Event &event) {
 	if (action == CURSOR_LOOK) {
 		SceneItem::display2(900, 6);
 		return true;
@@ -44,7 +44,7 @@ bool Scene900::Item1::startAction(CursorType action, Event &event) {
 	}
 }
 
-bool Scene900::Item4::startAction(CursorType action, Event &event) {
+bool Scene900::WestExit::startAction(CursorType action, Event &event) {
 	Scene900 *scene = (Scene900 *)BF_GLOBALS._sceneManager._scene;
 
 	BF_GLOBALS._player.disableControl();
@@ -458,7 +458,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 	_stripManager.addSpeaker(&_jakeJacketSpeaker);
 	_stripManager.addSpeaker(&_lyleHatSpeaker);
 
-	_item4.setDetails(Rect(0, 85, 20, 130), 900, -1, -1, -1, 1, 0);
+	_westExit.setDetails(Rect(0, 85, 20, 130), 900, -1, -1, -1, 1, 0);
 	BF_GLOBALS._player.postInit();
 
 	_dog.postInit();
@@ -559,11 +559,11 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 			setAction(&_sequenceManager1, this, 9002, &BF_GLOBALS._player, &_door, NULL);
 	}
 
-	_gate.setDetails(900, 0, -1, 1, 1, 0);
-	_door.setDetails(900, 2, -1, 5, 1, 0);
+	_gate.setDetails(900, 0, -1, 1, 1, (SceneItem *)NULL);
+	_door.setDetails(900, 2, -1, 5, 1, (SceneItem *)NULL);
 	_item2.setDetails(Rect(0, 0, 225, 21), 666, 25, -1, -1, 1, NULL);
 	_item3.setDetails(Rect(37, 21, 324, 50), 666, 26, -1, -1, 1, NULL);
-	_item1.setDetails(Rect(0, 0, 960, 200), 900, 7, -1, -1, 1, NULL);
+	_exterior.setDetails(Rect(0, 0, 960, 200), 900, 7, -1, -1, 1, NULL);
 }
 
 void Scene900::signal() {
@@ -692,7 +692,7 @@ void Scene900::process(Event &event) {
 	SceneExt::process(event);
 
 	if (BF_GLOBALS._player._enabled && !_focusObject && (event.mousePos.y < (UI_INTERFACE_Y - 1))) {
-		if (_item4.contains(event.mousePos)) {
+		if (_westExit.contains(event.mousePos)) {
 			GfxSurface surface = _cursorVisage.getFrame(EXITFRAME_W);
 			BF_GLOBALS._events.setCursor(surface);
 		} else {
diff --git a/engines/tsage/blue_force/blueforce_scenes9.h b/engines/tsage/blue_force/blueforce_scenes9.h
index 9ae542c21d..74708b94de 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.h
+++ b/engines/tsage/blue_force/blueforce_scenes9.h
@@ -41,11 +41,11 @@ using namespace TsAGE;
 
 class Scene900: public PalettedScene {
 	/* Items */
-	class Item1: public NamedHotspot {
+	class Exterior: public NamedHotspot {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
-	class Item4: public NamedHotspot {
+	class WestExit: public NamedHotspot {
 	public:
 		virtual bool startAction(CursorType action, Event &event);
 	};
@@ -94,7 +94,7 @@ public:
 	SpeakerGameText _gameTextSpeaker;
 	SpeakerJakeJacket _jakeJacketSpeaker;
 	SpeakerLyleHat _lyleHatSpeaker;
-	Item1 _item1;
+	Exterior _exterior;
 	Gate _gate;
 	Door _door;
 	Dog _dog;
@@ -104,7 +104,7 @@ public:
 	NamedObject _object5;
 	Lyle _lyle;
 	Body _body;
-	Item4 _item4;
+	WestExit _westExit;
 	ASoundExt _sound1;
 	Action1 _action1;
 	Action2 _action2;
-- 
cgit v1.2.3


From 7e4c5dce4a787ac6876b9548e206757196a1ef09 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 7 Mar 2012 23:20:15 +0200
Subject: SCI: Add a new configuration option for SQ4 CD, "silver_cursors"

This allows the user to choose the alternate set of silver mouse cursors
that is available in the game resources of the game, instead of the
original golden ones
---
 engines/sci/graphics/cursor.cpp | 26 ++++++++++++++++++++++++++
 engines/sci/graphics/cursor.h   | 15 ++++++++++-----
 engines/sci/sci.cpp             |  1 +
 3 files changed, 37 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index daab532d0e..52a5961070 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -59,10 +59,16 @@ GfxCursor::GfxCursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *sc
 	_zoomColor = 0;
 	_zoomMultiplier = 0;
 	_cursorSurface = 0;
+
 	if (g_sci && g_sci->getGameId() == GID_KQ6 && g_sci->getPlatform() == Common::kPlatformWindows)
 		_useOriginalKQ6WinCursors = ConfMan.getBool("windows_cursors");
 	else
 		_useOriginalKQ6WinCursors = false;
+
+	if (g_sci && g_sci->getGameId() == GID_SQ4 && getSciVersion() == SCI_VERSION_1_1)
+		_useSilverSQ4CDCursors = ConfMan.getBool("silver_cursors");
+	else
+		_useSilverSQ4CDCursors = false;
 }
 
 GfxCursor::~GfxCursor() {
@@ -206,6 +212,26 @@ void GfxCursor::kernelSetView(GuiResourceId viewNum, int loopNum, int celNum, Co
 		return;
 	}
 
+	// Use the alternate silver cursors in SQ4 CD, if requested
+	if (_useSilverSQ4CDCursors) {
+		switch(viewNum) {
+		case 850:
+		case 852:
+		case 854:
+		case 856:
+			celNum = 3;
+			break;
+		case 851:
+		case 853:
+		case 855:
+		case 999:
+			celNum = 2;
+			break;
+		default:
+			break;
+		}
+	}
+
 	if (!_cachedCursors.contains(viewNum))
 		_cachedCursors[viewNum] = new GfxView(_resMan, _screen, _palette, viewNum);
 
diff --git a/engines/sci/graphics/cursor.h b/engines/sci/graphics/cursor.h
index 25109b3920..ac928f50bb 100644
--- a/engines/sci/graphics/cursor.h
+++ b/engines/sci/graphics/cursor.h
@@ -113,13 +113,18 @@ private:
 
 	bool _isVisible;
 
-	// KQ6 Windows has different black and white cursors. If this is
-	// true (set from the sci_originalkq6wincursors ini setting), then
-	// we use these, and don't scale them by 2x like the rest of the
-	// graphics, like SSCI did. These look very ugly, which is why
-	// they aren't enabled by default.
+	// KQ6 Windows has different black and white cursors. If this is true (set
+	// from the windows_cursors ini setting), then we use these and don't scale
+	// them by 2x like the rest of the graphics, like SSCI did. These look very
+	// ugly, which is why they aren't enabled by default.
 	bool _useOriginalKQ6WinCursors;
 
+	// The CD version of SQ4 contains a complete set of silver mouse cursors.
+	// If this is true (set from the silver_cursors ini setting), then we use
+	// these instead and replace the game's gold cursors with their silver
+	// equivalents.
+	bool _useSilverSQ4CDCursors;
+
 	// Mac versions of games use a remap list to remap their cursors
 	Common::Array<uint16> _macCursorRemap;
 };
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 00731fc1cf..4ae55cbcba 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -194,6 +194,7 @@ Common::Error SciEngine::run() {
 	ConfMan.registerDefault("sci_originalsaveload", "false");
 	ConfMan.registerDefault("native_fb01", "false");
 	ConfMan.registerDefault("windows_cursors", "false");	// Windows cursors for KQ6 Windows
+	ConfMan.registerDefault("silver_cursors", "false");	// Silver cursors for SQ4 CD
 
 	_resMan = new ResourceManager();
 	assert(_resMan);
-- 
cgit v1.2.3


From 30e7a0f00129323676cc9490e7c070374c6472f4 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 8 Mar 2012 08:02:58 -0500
Subject: SCI: Fix SCI1.1+ Mac games with resource fork container names

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

(limited to 'engines')

diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 50b3387159..77a6a40a92 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -609,7 +609,7 @@ int ResourceManager::addAppropriateSources() {
 		if (Common::File::exists("alt.map") && Common::File::exists("resource.alt"))
 			addSource(new VolumeResourceSource("resource.alt", addExternalMap("alt.map", 10), 10));
 #endif
-	} else if (Common::File::exists("Data1")) {
+	} else if (Common::MacResManager::exists("Data1")) {
 		// Mac SCI1.1+ file naming scheme
 		SearchMan.listMatchingMembers(files, "Data?*");
 
-- 
cgit v1.2.3


From fe0c5c0e9720c30689b745ff7aee136022c3df8d Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 8 Mar 2012 08:03:50 -0500
Subject: SCI: Fix KQ6 Mac movies with resource fork names

---
 engines/sci/engine/kfile.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'engines')

diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index aade40fd9f..312497720a 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -24,6 +24,7 @@
 #include "common/config-manager.h"
 #include "common/debug-channels.h"
 #include "common/file.h"
+#include "common/macresman.h"
 #include "common/str.h"
 #include "common/savefile.h"
 #include "common/system.h"
@@ -1080,6 +1081,14 @@ reg_t kFileIOExists(EngineState *s, int argc, reg_t *argv) {
 		delete outFile;
 	}
 
+	// Special case for KQ6 Mac: The game checks for two video files to see
+	// if they exist before it plays them. Since we support multiple naming
+	// schemes for resource fork files, we also need to support that here in
+	// case someone has a "HalfDome.bin" file, etc. 
+	if (!exists && g_sci->getGameId() == GID_KQ6 && g_sci->getPlatform() == Common::kPlatformMacintosh &&
+			(name == "HalfDome" || name == "Kq6Movie"))
+		exists = Common::MacResManager::exists(name);
+
 	debugC(kDebugLevelFile, "kFileIO(fileExists) %s -> %d", name.c_str(), exists);
 	return make_reg(0, exists);
 }
-- 
cgit v1.2.3


From b71dffafbe438a5cea887ae3f72ef76dd5d00cd9 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 8 Mar 2012 10:07:58 -0500
Subject: SCI: Fix GK1 Mac text positioning

A regression from the text bitmap code addition
---
 engines/sci/graphics/text32.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'engines')

diff --git a/engines/sci/graphics/text32.cpp b/engines/sci/graphics/text32.cpp
index e24799f6b8..7894c7109c 100644
--- a/engines/sci/graphics/text32.cpp
+++ b/engines/sci/graphics/text32.cpp
@@ -297,6 +297,10 @@ int16 GfxText32::Size(Common::Rect &rect, const char *text, GuiResourceId fontId
 	int16 maxTextWidth = 0, textWidth;
 	int16 totalHeight = 0, textHeight;
 
+	// Adjust maxWidth if we're using an upscaled font
+	if (_screen->fontIsUpscaled())
+		maxWidth = maxWidth * _screen->getDisplayWidth() / _screen->getWidth();
+
 	rect.top = rect.left = 0;
 	GfxFont *font = _cache->getFont(fontId);
 
@@ -323,6 +327,14 @@ int16 GfxText32::Size(Common::Rect &rect, const char *text, GuiResourceId fontId
 		rect.bottom = totalHeight;
 		rect.right = maxWidth ? maxWidth : MIN(rect.right, maxTextWidth);
 	}
+
+	// Adjust the width/height if we're using an upscaled font
+	// for the scripts
+	if (_screen->fontIsUpscaled()) {
+		rect.right = rect.right * _screen->getWidth() / _screen->getDisplayWidth();
+		rect.bottom = rect.bottom * _screen->getHeight() / _screen->getDisplayHeight();
+	}
+
 	return rect.right;
 }
 
-- 
cgit v1.2.3


From 4f740bb224a310567e060c06d7d010d14a195b66 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 9 Mar 2012 22:49:27 +1100
Subject: TSAGE: Bugfix for breaker box display in Blue Force scene 910

This fixes one of the problems in bug #3500015
---
 engines/tsage/blue_force/blueforce_scenes9.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index e364525e2c..dbea1756b3 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -1285,9 +1285,9 @@ bool Scene910::Object13::startAction(CursorType action, Event &event) {
 		}
 
 		if (_mode != 1)
-			BF_GLOBALS._breakerBoxStatusArr[_state - 1] = (_state + 251) % 256;
+			BF_GLOBALS._breakerBoxStatusArr[_state - 1] = (_frame + 251) % 256;
 		else
-			BF_GLOBALS._breakerBoxStatusArr[_state - 1] = _state;
+			BF_GLOBALS._breakerBoxStatusArr[_state - 1] = _frame;
 
 		switch (_state) {
 		case 1:
-- 
cgit v1.2.3


From d142606f755203bf2e407729840898b0c8ca53d5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 10 Mar 2012 16:11:00 +1100
Subject: TSAGE: Fix for walk regions enablement in Blue Force warehouse scene

---
 engines/tsage/blue_force/blueforce_scenes9.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index dbea1756b3..2178f31b30 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -2209,7 +2209,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) {
 		_fakeWall.hide();
 		if (BF_GLOBALS._v4CECC != 2)
 			_yellowCord.setPosition(Common::Point(291, -30));
-		BF_GLOBALS._walkRegions.disableRegion(10);
+		BF_GLOBALS._walkRegions.enableRegion(10);
 	}
 
 	if (BF_GLOBALS._breakerBoxStatusArr[17] != 0) {
-- 
cgit v1.2.3


From 5e52b0a5d46e4c5b230cba7464301484d27804f7 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 10 Mar 2012 13:50:27 -0500
Subject: MOHAWK: Split the graphics classes into their own files

---
 engines/mohawk/console.cpp                 |    2 +-
 engines/mohawk/cstime.h                    |    2 +-
 engines/mohawk/cstime_graphics.cpp         |   64 ++
 engines/mohawk/cstime_graphics.h           |   51 ++
 engines/mohawk/graphics.cpp                | 1001 +---------------------------
 engines/mohawk/graphics.h                  |  195 +-----
 engines/mohawk/livingbooks.h               |    2 +-
 engines/mohawk/livingbooks_graphics.cpp    |  102 +++
 engines/mohawk/livingbooks_graphics.h      |   52 ++
 engines/mohawk/module.mk                   |    4 +
 engines/mohawk/myst.cpp                    |    2 +-
 engines/mohawk/myst_areas.cpp              |    2 +-
 engines/mohawk/myst_areas.h                |    6 +-
 engines/mohawk/myst_graphics.cpp           |  493 ++++++++++++++
 engines/mohawk/myst_graphics.h             |  102 +++
 engines/mohawk/myst_scripts.cpp            |    2 +-
 engines/mohawk/myst_stacks/channelwood.cpp |    2 +-
 engines/mohawk/myst_stacks/credits.cpp     |    2 +-
 engines/mohawk/myst_stacks/demo.cpp        |    2 +-
 engines/mohawk/myst_stacks/intro.cpp       |    2 +-
 engines/mohawk/myst_stacks/mechanical.cpp  |    2 +-
 engines/mohawk/myst_stacks/myst.cpp        |    2 +-
 engines/mohawk/myst_stacks/preview.cpp     |    2 +-
 engines/mohawk/myst_stacks/slides.cpp      |    2 +-
 engines/mohawk/myst_stacks/stoneship.cpp   |    2 +-
 engines/mohawk/riven.cpp                   |    2 +-
 engines/mohawk/riven_external.cpp          |    2 +-
 engines/mohawk/riven_graphics.cpp          |  445 +++++++++++++
 engines/mohawk/riven_graphics.h            |  110 +++
 engines/mohawk/riven_scripts.cpp           |    2 +-
 engines/mohawk/riven_scripts.h             |    3 +-
 31 files changed, 1449 insertions(+), 1215 deletions(-)
 create mode 100644 engines/mohawk/cstime_graphics.cpp
 create mode 100644 engines/mohawk/cstime_graphics.h
 create mode 100644 engines/mohawk/livingbooks_graphics.cpp
 create mode 100644 engines/mohawk/livingbooks_graphics.h
 create mode 100644 engines/mohawk/myst_graphics.cpp
 create mode 100644 engines/mohawk/myst_graphics.h
 create mode 100644 engines/mohawk/riven_graphics.cpp
 create mode 100644 engines/mohawk/riven_graphics.h

(limited to 'engines')

diff --git a/engines/mohawk/console.cpp b/engines/mohawk/console.cpp
index 0234c86c7e..a7a650d8ed 100644
--- a/engines/mohawk/console.cpp
+++ b/engines/mohawk/console.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "mohawk/console.h"
-#include "mohawk/graphics.h"
 #include "mohawk/livingbooks.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
@@ -36,6 +35,7 @@
 #ifdef ENABLE_MYST
 #include "mohawk/myst.h"
 #include "mohawk/myst_areas.h"
+#include "mohawk/myst_graphics.h"
 #include "mohawk/myst_scripts.h"
 #endif
 
diff --git a/engines/mohawk/cstime.h b/engines/mohawk/cstime.h
index 0bc236f930..db06b9791e 100644
--- a/engines/mohawk/cstime.h
+++ b/engines/mohawk/cstime.h
@@ -25,7 +25,7 @@
 
 #include "mohawk/mohawk.h"
 #include "mohawk/console.h"
-#include "mohawk/graphics.h"
+#include "mohawk/cstime_graphics.h"
 
 #include "common/random.h"
 #include "common/list.h"
diff --git a/engines/mohawk/cstime_graphics.cpp b/engines/mohawk/cstime_graphics.cpp
new file mode 100644
index 0000000000..3a1452e67c
--- /dev/null
+++ b/engines/mohawk/cstime_graphics.cpp
@@ -0,0 +1,64 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 "mohawk/cstime.h"
+#include "mohawk/cstime_graphics.h"
+#include "mohawk/resource.h"
+
+#include "common/system.h"
+#include "engines/util.h"
+
+namespace Mohawk {
+
+CSTimeGraphics::CSTimeGraphics(MohawkEngine_CSTime *vm) : GraphicsManager(), _vm(vm) {
+	_bmpDecoder = new MohawkBitmap();
+
+	initGraphics(640, 480, true);
+}
+
+CSTimeGraphics::~CSTimeGraphics() {
+	delete _bmpDecoder;
+}
+
+void CSTimeGraphics::drawRect(Common::Rect rect, byte color) {
+	rect.clip(Common::Rect(640, 480));
+
+	// Useful with debugging. Shows where hotspots are on the screen and whether or not they're active.
+	if (!rect.isValidRect() || rect.width() == 0 || rect.height() == 0)
+		return;
+
+	Graphics::Surface *screen = _vm->_system->lockScreen();
+
+	screen->frameRect(rect, color);
+
+	_vm->_system->unlockScreen();
+}
+
+MohawkSurface *CSTimeGraphics::decodeImage(uint16 id) {
+	return _bmpDecoder->decodeImage(_vm->getResource(ID_TBMP, id));
+}
+
+Common::Array<MohawkSurface *> CSTimeGraphics::decodeImages(uint16 id) {
+	return _bmpDecoder->decodeImages(_vm->getResource(ID_TBMH, id));
+}
+
+} // End of namespace Mohawk
diff --git a/engines/mohawk/cstime_graphics.h b/engines/mohawk/cstime_graphics.h
new file mode 100644
index 0000000000..5f034f47f4
--- /dev/null
+++ b/engines/mohawk/cstime_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 MOHAWK_CSTIME_GRAPHICS_H
+#define MOHAWK_CSTIME_GRAPHICS_H
+
+#include "mohawk/graphics.h"
+
+namespace Mohawk {
+
+class MohawkEngine_CSTime;
+
+class CSTimeGraphics : public GraphicsManager {
+public:
+	CSTimeGraphics(MohawkEngine_CSTime *vm);
+	~CSTimeGraphics();
+
+	void drawRect(Common::Rect rect, byte color);
+
+protected:
+	MohawkSurface *decodeImage(uint16 id);
+	Common::Array<MohawkSurface *> decodeImages(uint16 id);
+	MohawkEngine *getVM() { return (MohawkEngine *)_vm; }
+
+private:
+	MohawkBitmap *_bmpDecoder;
+	MohawkEngine_CSTime *_vm;
+};
+
+} // End of namespace Mohawk
+
+#endif
diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp
index 2ffabf1e8c..a08d034ef7 100644
--- a/engines/mohawk/graphics.cpp
+++ b/engines/mohawk/graphics.cpp
@@ -20,30 +20,13 @@
  *
  */
 
+#include "mohawk/mohawk.h"
 #include "mohawk/resource.h"
 #include "mohawk/graphics.h"
-#include "mohawk/livingbooks.h"
 
-#include "common/substream.h"
 #include "common/system.h"
-#include "common/textconsole.h"
 #include "engines/util.h"
 #include "graphics/palette.h"
-#include "graphics/primitives.h"
-#include "gui/message.h"
-
-#ifdef ENABLE_CSTIME
-#include "mohawk/cstime.h"
-#endif
-
-#ifdef ENABLE_MYST
-#include "mohawk/myst.h"
-#include "graphics/jpeg.h"
-#endif
-
-#ifdef ENABLE_RIVEN
-#include "mohawk/riven.h"
-#endif
 
 namespace Mohawk {
 
@@ -262,986 +245,4 @@ void GraphicsManager::addImageToCache(uint16 id, MohawkSurface *surface) {
 	_cache[id] = surface;
 }
 
-#ifdef ENABLE_MYST
-
-MystGraphics::MystGraphics(MohawkEngine_Myst* vm) : GraphicsManager(), _vm(vm) {
-	_bmpDecoder = new MystBitmap();
-
-	_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!
-
-	_pixelFormat = _vm->_system->getScreenFormat();
-
-	if (_pixelFormat.bytesPerPixel == 1)
-		error("Myst requires greater than 256 colors to run");
-
-	if (_vm->getFeatures() & GF_ME) {
-		_jpegDecoder = new Graphics::JPEG();
-		_pictDecoder = new Graphics::PictDecoder(_pixelFormat);
-	} else {
-		_jpegDecoder = NULL;
-		_pictDecoder = NULL;
-	}
-
-	_pictureFile.entries = NULL;
-
-	// Initialize our buffer
-	_backBuffer = new Graphics::Surface();
-	_backBuffer->create(_vm->_system->getWidth(), _vm->_system->getHeight(), _pixelFormat);
-
-	_nextAllowedDrawTime = _vm->_system->getMillis();
-	_enableDrawingTimeSimulation = 0;
-}
-
-MystGraphics::~MystGraphics() {
-	delete _bmpDecoder;
-	delete _jpegDecoder;
-	delete _pictDecoder;
-	delete[] _pictureFile.entries;
-
-	_backBuffer->free();
-	delete _backBuffer;
-}
-
-static const char *s_picFileNames[] = {
-	"CHpics",
-	"",
-	"",
-	"DUpics",
-	"INpics",
-	"",
-	"MEpics",
-	"MYpics",
-	"SEpics",
-	"",
-	"",
-	"STpics"
-};
-
-void MystGraphics::loadExternalPictureFile(uint16 stack) {
-	if (_vm->getPlatform() != Common::kPlatformMacintosh)
-		return;
-
-	if (_pictureFile.picFile.isOpen())
-		_pictureFile.picFile.close();
-	delete[] _pictureFile.entries;
-
-	if (!scumm_stricmp(s_picFileNames[stack], ""))
-		return;
-
-	if (!_pictureFile.picFile.open(s_picFileNames[stack]))
-		error ("Could not open external picture file \'%s\'", s_picFileNames[stack]);
-
-	_pictureFile.pictureCount = _pictureFile.picFile.readUint32BE();
-	_pictureFile.entries = new PictureFile::PictureEntry[_pictureFile.pictureCount];
-
-	for (uint32 i = 0; i < _pictureFile.pictureCount; i++) {
-		_pictureFile.entries[i].offset = _pictureFile.picFile.readUint32BE();
-		_pictureFile.entries[i].size = _pictureFile.picFile.readUint32BE();
-		_pictureFile.entries[i].id = _pictureFile.picFile.readUint16BE();
-		_pictureFile.entries[i].type = _pictureFile.picFile.readUint16BE();
-		_pictureFile.entries[i].width = _pictureFile.picFile.readUint16BE();
-		_pictureFile.entries[i].height = _pictureFile.picFile.readUint16BE();
-	}
-}
-
-MohawkSurface *MystGraphics::decodeImage(uint16 id) {
-	MohawkSurface *mhkSurface = 0;
-
-	// Myst ME uses JPEG/PICT images instead of compressed Windows Bitmaps for room images,
-	// though there are a few weird ones that use that format. For further nonsense with images,
-	// the Macintosh version stores images in external "picture files." We check them before
-	// going to check for a PICT resource.
-	if (_vm->getFeatures() & GF_ME && _vm->getPlatform() == Common::kPlatformMacintosh && _pictureFile.picFile.isOpen()) {
-		for (uint32 i = 0; i < _pictureFile.pictureCount; i++)
-			if (_pictureFile.entries[i].id == id) {
-				if (_pictureFile.entries[i].type == 0) {
-					Common::SeekableReadStream *stream = new Common::SeekableSubReadStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size);
-
-					if (!_jpegDecoder->read(stream))
-						error("Could not decode Myst ME Mac JPEG");
-
-					mhkSurface = new MohawkSurface(_jpegDecoder->getSurface(_pixelFormat));
-					delete stream;
-				} else if (_pictureFile.entries[i].type == 1) {
-					mhkSurface = new MohawkSurface(_pictDecoder->decodeImage(new Common::SeekableSubReadStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size)));
-				} else
-					error ("Unknown Picture File type %d", _pictureFile.entries[i].type);
-				break;
-			}
-	}
-
-	// We're not using the external Mac files, so it's time to delve into the main Mohawk
-	// archives. However, we still don't know if it's a PICT or WDIB resource. If it's Myst
-	// ME it's most likely a PICT, and if it's original it's definitely a WDIB. However,
-	// Myst ME throws us another curve ball in that PICT resources can contain WDIB's instead
-	// of PICT's.
-	if (!mhkSurface) {
-		bool isPict = false;
-		Common::SeekableReadStream *dataStream = NULL;
-
-		if (_vm->getFeatures() & GF_ME && _vm->hasResource(ID_PICT, id)) {
-			// The PICT resource exists. However, it could still contain a MystBitmap
-			// instead of a PICT image...
-			dataStream = _vm->getResource(ID_PICT, id);
-		} else // No PICT, so the WDIB must exist. Let's go grab it.
-			dataStream = _vm->getResource(ID_WDIB, id);
-
-		if (_vm->getFeatures() & GF_ME) {
-			// Here we detect whether it's really a PICT or a WDIB. Since a MystBitmap
-			// would be compressed, there's no way to detect for the BM without a hack.
-			// So, we search for the PICT version opcode for detection.
-			dataStream->seek(512 + 10); // 512 byte pict header
-			isPict = (dataStream->readUint32BE() == 0x001102FF);
-			dataStream->seek(0);
-		}
-
-		if (isPict)
-			mhkSurface = new MohawkSurface(_pictDecoder->decodeImage(dataStream));
-		else {
-			mhkSurface = _bmpDecoder->decodeImage(dataStream);
-			mhkSurface->convertToTrueColor();
-		}
-	}
-
-	assert(mhkSurface);
-	return mhkSurface;
-}
-
-void MystGraphics::copyImageSectionToScreen(uint16 image, Common::Rect src, Common::Rect dest) {
-	Graphics::Surface *surface = findImage(image)->getSurface();
-
-	// Make sure the image is bottom aligned in the dest rect
-	dest.top = dest.bottom - MIN<int>(surface->h, dest.height());
-
-	// Convert from bitmap coordinates to surface coordinates
-	uint16 top = surface->h - (src.top + MIN<int>(surface->h, dest.height()));
-
-	// Do not draw the top pixels if the image is too tall
-	if (dest.height() > _viewport.height())
-		top += dest.height() - _viewport.height();
-
-	// Clip the destination rect to the screen
-	if (dest.right > _vm->_system->getWidth() || dest.bottom > _vm->_system->getHeight())
-		dest.debugPrint(4, "Clipping destination rect to the screen");
-	dest.right = CLIP<int>(dest.right, 0, _vm->_system->getWidth());
-	dest.bottom = CLIP<int>(dest.bottom, 0, _vm->_system->getHeight());
-
-	uint16 width = MIN<int>(surface->w, dest.width());
-	uint16 height = MIN<int>(surface->h, dest.height());
-
-	// Clamp Width and Height to within src surface dimensions
-	if (src.left + width > surface->w)
-		width = surface->w - src.left;
-	if (src.top + height > surface->h)
-		height = surface->h - src.top;
-
-	debug(3, "MystGraphics::copyImageSectionToScreen()");
-	debug(3, "\tImage: %d", image);
-	debug(3, "\tsrc.left: %d", src.left);
-	debug(3, "\tsrc.top: %d", src.top);
-	debug(3, "\tdest.left: %d", dest.left);
-	debug(3, "\tdest.top: %d", dest.top);
-	debug(3, "\twidth: %d", width);
-	debug(3, "\theight: %d", height);
-
-	simulatePreviousDrawDelay(dest);
-
-	_vm->_system->copyRectToScreen((byte *)surface->getBasePtr(src.left, top), surface->pitch, dest.left, dest.top, width, height);
-}
-
-void MystGraphics::copyImageSectionToBackBuffer(uint16 image, Common::Rect src, Common::Rect dest) {
-	Graphics::Surface *surface = findImage(image)->getSurface();
-
-	// Make sure the image is bottom aligned in the dest rect
-	dest.top = dest.bottom - MIN<int>(surface->h, dest.height());
-
-	// Convert from bitmap coordinates to surface coordinates
-	uint16 top = surface->h - (src.top + MIN<int>(surface->h, dest.height()));
-
-	// Do not draw the top pixels if the image is too tall
-	if (dest.height() > _viewport.height()) {
-		top += dest.height() - _viewport.height();
-	}
-
-	// Clip the destination rect to the screen
-	if (dest.right > _vm->_system->getWidth() || dest.bottom > _vm->_system->getHeight())
-		dest.debugPrint(4, "Clipping destination rect to the screen");
-	dest.right = CLIP<int>(dest.right, 0, _vm->_system->getWidth());
-	dest.bottom = CLIP<int>(dest.bottom, 0, _vm->_system->getHeight());
-
-	uint16 width = MIN<int>(surface->w, dest.width());
-	uint16 height = MIN<int>(surface->h, dest.height());
-
-	// Clamp Width and Height to within src surface dimensions
-	if (src.left + width > surface->w)
-		width = surface->w - src.left;
-	if (src.top + height > surface->h)
-		height = surface->h - src.top;
-
-	debug(3, "MystGraphics::copyImageSectionToBackBuffer()");
-	debug(3, "\tImage: %d", image);
-	debug(3, "\tsrc.left: %d", src.left);
-	debug(3, "\tsrc.top: %d", src.top);
-	debug(3, "\tdest.left: %d", dest.left);
-	debug(3, "\tdest.top: %d", dest.top);
-	debug(3, "\twidth: %d", width);
-	debug(3, "\theight: %d", height);
-
-	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);
-}
-
-void MystGraphics::copyImageToScreen(uint16 image, Common::Rect dest) {
-	copyImageSectionToScreen(image, Common::Rect(544, 333), dest);
-}
-
-void MystGraphics::copyImageToBackBuffer(uint16 image, Common::Rect dest) {
-	copyImageSectionToBackBuffer(image, Common::Rect(544, 333), dest);
-}
-
-void MystGraphics::copyBackBufferToScreen(Common::Rect r) {
-	r.clip(_viewport);
-
-	simulatePreviousDrawDelay(r);
-
-	_vm->_system->copyRectToScreen((byte *)_backBuffer->getBasePtr(r.left, r.top), _backBuffer->pitch, r.left, r.top, r.width(), r.height());
-}
-
-void MystGraphics::runTransition(uint16 type, Common::Rect rect, uint16 steps, uint16 delay) {
-
-	// Do not artificially delay during transitions
-	int oldEnableDrawingTimeSimulation = _enableDrawingTimeSimulation;
-	_enableDrawingTimeSimulation = 0;
-
-	switch (type) {
-	case 0:	{
-			debugC(kDebugScript, "Left to Right");
-
-			uint16 step = (rect.right - rect.left) / steps;
-			Common::Rect area = rect;
-			for (uint i = 0; i < steps; i++) {
-				area.left = rect.left + step * i;
-				area.right = area.left + step;
-
-				_vm->_system->delayMillis(delay);
-
-				copyBackBufferToScreen(area);
-				_vm->_system->updateScreen();
-			}
-			if (area.right < rect.right) {
-				area.left = area.right;
-				area.right = rect.right;
-
-				copyBackBufferToScreen(area);
-				_vm->_system->updateScreen();
-			}
-		}
-		break;
-	case 1:	{
-			debugC(kDebugScript, "Right to Left");
-
-			uint16 step = (rect.right - rect.left) / steps;
-			Common::Rect area = rect;
-			for (uint i = 0; i < steps; i++) {
-				area.right = rect.right - step * i;
-				area.left = area.right - step;
-
-				_vm->_system->delayMillis(delay);
-
-				copyBackBufferToScreen(area);
-				_vm->_system->updateScreen();
-			}
-			if (area.left > rect.left) {
-				area.right = area.left;
-				area.left = rect.left;
-
-				copyBackBufferToScreen(area);
-				_vm->_system->updateScreen();
-			}
-		}
-		break;
-	case 5:	{
-			debugC(kDebugScript, "Top to Bottom");
-
-			uint16 step = (rect.bottom - rect.top) / steps;
-			Common::Rect area = rect;
-			for (uint i = 0; i < steps; i++) {
-				area.top = rect.top + step * i;
-				area.bottom = area.top + step;
-
-				_vm->_system->delayMillis(delay);
-
-				copyBackBufferToScreen(area);
-				_vm->_system->updateScreen();
-			}
-			if (area.bottom < rect.bottom) {
-				area.top = area.bottom;
-				area.bottom = rect.bottom;
-
-				copyBackBufferToScreen(area);
-				_vm->_system->updateScreen();
-			}
-		}
-		break;
-	case 6:	{
-			debugC(kDebugScript, "Bottom to Top");
-
-			uint16 step = (rect.bottom - rect.top) / steps;
-			Common::Rect area = rect;
-			for (uint i = 0; i < steps; i++) {
-				area.bottom = rect.bottom - step * i;
-				area.top = area.bottom - step;
-
-				_vm->_system->delayMillis(delay);
-
-				copyBackBufferToScreen(area);
-				_vm->_system->updateScreen();
-			}
-			if (area.top > rect.top) {
-				area.bottom = area.top;
-				area.top = rect.top;
-
-				copyBackBufferToScreen(area);
-				_vm->_system->updateScreen();
-			}
-		}
-		break;
-	default:
-		warning("Unknown Update Direction");
-
-		//TODO: Replace minimal implementation
-		copyBackBufferToScreen(rect);
-		_vm->_system->updateScreen();
-		break;
-	}
-
-	_enableDrawingTimeSimulation = oldEnableDrawingTimeSimulation;
-}
-
-void MystGraphics::drawRect(Common::Rect rect, RectState state) {
-	rect.clip(_viewport);
-
-	// Useful with debugging. Shows where hotspots are on the screen and whether or not they're active.
-	if (!rect.isValidRect() || rect.width() == 0 || rect.height() == 0)
-		return;
-
-	Graphics::Surface *screen = _vm->_system->lockScreen();
-
-	if (state == kRectEnabled)
-		screen->frameRect(rect, _pixelFormat.RGBToColor(0, 255, 0));
-	else if (state == kRectUnreachable)
-		screen->frameRect(rect, _pixelFormat.RGBToColor(0, 0, 255));
-	else
-		screen->frameRect(rect, _pixelFormat.RGBToColor(255, 0, 0));
-
-	_vm->_system->unlockScreen();
-}
-
-void MystGraphics::drawLine(const Common::Point &p1, const Common::Point &p2, uint32 color) {
-	_backBuffer->drawLine(p1.x, p1.y, p2.x, p2.y, color);
-}
-
-void MystGraphics::enableDrawingTimeSimulation(bool enable) {
-	if (enable)
-		_enableDrawingTimeSimulation++;
-	else
-		_enableDrawingTimeSimulation--;
-
-	if (_enableDrawingTimeSimulation < 0)
-		_enableDrawingTimeSimulation = 0;
-}
-
-void MystGraphics::simulatePreviousDrawDelay(const Common::Rect &dest) {
-	uint32 time = 0;
-
-	if (_enableDrawingTimeSimulation) {
-		time = _vm->_system->getMillis();
-
-		// Do not draw anything new too quickly after the previous draw call
-		// so that images stay at least a little while on screen
-		// This is enabled only for scripted draw calls
-		if (time < _nextAllowedDrawTime)
-			_vm->_system->delayMillis(_nextAllowedDrawTime - time);
-	}
-
-	// Next draw call allowed at DELAY + AERA * COEFF milliseconds from now
-	time = _vm->_system->getMillis();
-	_nextAllowedDrawTime = time + _constantDrawDelay + dest.height() * dest.width() / _proportionalDrawDelay;
-}
-
-void MystGraphics::copyBackBufferToScreenWithSaturation(int16 saturation) {
-	Graphics::Surface *screen = _vm->_system->lockScreen();
-
-	for (uint16 y = 0; y < _viewport.height(); y++)
-		for (uint16 x = 0; x < _viewport.width(); x++) {
-			uint32 color;
-			uint8 r, g, b;
-
-			if (_pixelFormat.bytesPerPixel == 2)
-				color = *(const uint16 *)_backBuffer->getBasePtr(x, y);
-			else
-				color = *(const uint32 *)_backBuffer->getBasePtr(x, y);
-
-			_pixelFormat.colorToRGB(color, r, g, b);
-
-			r = CLIP<int16>((int16)r - saturation, 0, 255);
-			g = CLIP<int16>((int16)g - saturation, 0, 255);
-			b = CLIP<int16>((int16)b - saturation, 0, 255);
-
-			color = _pixelFormat.RGBToColor(r, g, b);
-
-			if (_pixelFormat.bytesPerPixel == 2) {
-				uint16 *dst = (uint16 *)screen->getBasePtr(x, y);
-				*dst = color;
-			} else {
-				uint32 *dst = (uint32 *)screen->getBasePtr(x, y);
-				*dst = color;
-			}
-		}
-
-	_vm->_system->unlockScreen();
-	_vm->_system->updateScreen();
-}
-
-void MystGraphics::fadeToBlack() {
-	for (int16 i = 0; i < 256; i += 32) {
-		copyBackBufferToScreenWithSaturation(i);
-	}
-}
-
-void MystGraphics::fadeFromBlack() {
-	for (int16 i = 256; i >= 0; i -= 32) {
-		copyBackBufferToScreenWithSaturation(i);
-	}
-}
-
-#endif // ENABLE_MYST
-
-#ifdef ENABLE_RIVEN
-
-RivenGraphics::RivenGraphics(MohawkEngine_Riven* vm) : GraphicsManager(), _vm(vm) {
-	_bitmapDecoder = new MohawkBitmap();
-
-	// Give me the best you've got!
-	initGraphics(608, 436, true, NULL);
-	_pixelFormat = _vm->_system->getScreenFormat();
-
-	if (_pixelFormat.bytesPerPixel == 1)
-		error("Riven requires greater than 256 colors to run");
-
-	// The actual game graphics only take up the first 392 rows. The inventory
-	// occupies the rest of the screen and we don't use the buffer to hold that.
-	_mainScreen = new Graphics::Surface();
-	_mainScreen->create(608, 392, _pixelFormat);
-
-	_updatesEnabled = true;
-	_scheduledTransition = -1;	// no transition
-	_dirtyScreen = false;
-	_inventoryDrawn = false;
-
-	_creditsImage = 302;
-	_creditsPos = 0;
-}
-
-RivenGraphics::~RivenGraphics() {
-	_mainScreen->free();
-	delete _mainScreen;
-	delete _bitmapDecoder;
-}
-
-MohawkSurface *RivenGraphics::decodeImage(uint16 id) {
-	MohawkSurface *surface = _bitmapDecoder->decodeImage(_vm->getResource(ID_TBMP, id));
-	surface->convertToTrueColor();
-	return surface;
-}
-
-void RivenGraphics::copyImageToScreen(uint16 image, uint32 left, uint32 top, uint32 right, uint32 bottom) {
-	Graphics::Surface *surface = findImage(image)->getSurface();
-
-	// Clip the width to fit on the screen. Fixes some images.
-	if (left + surface->w > 608)
-		surface->w = 608 - left;
-
-	for (uint16 i = 0; i < surface->h; i++)
-		memcpy(_mainScreen->getBasePtr(left, i + top), surface->getBasePtr(0, i), surface->w * surface->format.bytesPerPixel);
-
-	_dirtyScreen = true;
-}
-
-void RivenGraphics::drawPLST(uint16 x) {
-	Common::SeekableReadStream* plst = _vm->getResource(ID_PLST, _vm->getCurCard());
-	uint16 recordCount = plst->readUint16BE();
-
-	for (uint16 i = 0; i < recordCount; i++) {
-		uint16 index = plst->readUint16BE();
-		uint16 id = plst->readUint16BE();
-		uint16 left = plst->readUint16BE();
-		uint16 top = plst->readUint16BE();
-		uint16 right = plst->readUint16BE();
-		uint16 bottom = plst->readUint16BE();
-
-		// We are also checking here to make sure we haven't drawn the image yet on screen.
-		// This fixes problems with drawing PLST 1 twice and some other images twice. PLST
-		// 1 is sometimes not called by the scripts, so some cards don't appear if we don't
-		// draw PLST 1 each time. This "hack" is here to catch any PLST attempting to draw
-		// twice. There should never be a problem with doing it this way.
-		if (index == x && !(Common::find(_activatedPLSTs.begin(), _activatedPLSTs.end(), x) != _activatedPLSTs.end())) {
-			debug(0, "Drawing image %d", id);
-			copyImageToScreen(id, left, top, right, bottom);
-			_activatedPLSTs.push_back(x);
-			break;
-		}
-	}
-
-	delete plst;
-}
-
-void RivenGraphics::updateScreen(Common::Rect updateRect) {
-	if (_updatesEnabled) {
-		_vm->runUpdateScreenScript();
-
-		if (_dirtyScreen) {
-			_activatedPLSTs.clear();
-
-			// Copy to screen if there's no transition. Otherwise transition. ;)
-			if (_scheduledTransition < 0)
-				_vm->_system->copyRectToScreen((byte *)_mainScreen->getBasePtr(updateRect.left, updateRect.top), _mainScreen->pitch, updateRect.left, updateRect.top, updateRect.width(), updateRect.height());
-			else
-				runScheduledTransition();
-
-			// Finally, update the screen.
-			_vm->_system->updateScreen();
-			_dirtyScreen = false;
-		}
-	}
-}
-
-void RivenGraphics::scheduleWaterEffect(uint16 sfxeID) {
-	Common::SeekableReadStream *sfxeStream = _vm->getResource(ID_SFXE, sfxeID);
-
-	if (sfxeStream->readUint16BE() != 'SL')
-		error ("Unknown sfxe tag");
-
-	// Read in header info
-	SFXERecord sfxeRecord;
-	sfxeRecord.frameCount = sfxeStream->readUint16BE();
-	uint32 offsetTablePosition = sfxeStream->readUint32BE();
-	sfxeRecord.rect.left = sfxeStream->readUint16BE();
-	sfxeRecord.rect.top = sfxeStream->readUint16BE();
-	sfxeRecord.rect.right = sfxeStream->readUint16BE();
-	sfxeRecord.rect.bottom = sfxeStream->readUint16BE();
-	sfxeRecord.speed = sfxeStream->readUint16BE();
-	// Skip the rest of the fields...
-
-	// Read in offsets
-	sfxeStream->seek(offsetTablePosition);
-	uint32 *frameOffsets = new uint32[sfxeRecord.frameCount];
-	for (uint16 i = 0; i < sfxeRecord.frameCount; i++)
-		frameOffsets[i] = sfxeStream->readUint32BE();
-	sfxeStream->seek(frameOffsets[0]);
-
-	// Read in the scripts
-	for (uint16 i = 0; i < sfxeRecord.frameCount; i++)
-		sfxeRecord.frameScripts.push_back(sfxeStream->readStream((i == sfxeRecord.frameCount - 1) ? sfxeStream->size() - frameOffsets[i] : frameOffsets[i + 1] - frameOffsets[i]));
-
-	// Set it to the first frame
-	sfxeRecord.curFrame = 0;
-	sfxeRecord.lastFrameTime = 0;
-
-	delete[] frameOffsets;
-	delete sfxeStream;
-	_waterEffects.push_back(sfxeRecord);
-}
-
-void RivenGraphics::clearWaterEffects() {
-	_waterEffects.clear();
-}
-
-bool RivenGraphics::runScheduledWaterEffects() {
-	// Don't run the effect if it's disabled
-	if (_vm->_vars["waterenabled"] == 0)
-		return false;
-
-	Graphics::Surface *screen = NULL;
-
-	for (uint16 i = 0; i < _waterEffects.size(); i++) {
-		if (_vm->_system->getMillis() > _waterEffects[i].lastFrameTime + 1000 / _waterEffects[i].speed) {
-			// Lock the screen!
-			if (!screen)
-				screen = _vm->_system->lockScreen();
-
-			// Make sure the script is at the starting point
-			Common::SeekableReadStream *script = _waterEffects[i].frameScripts[_waterEffects[i].curFrame];
-			if (script->pos() != 0)
-				script->seek(0);
-
-			// Run script
-			uint16 curRow = 0;
-			for (uint16 op = script->readUint16BE(); op != 4; op = script->readUint16BE()) {
-				if (op == 1) {        // Increment Row
-					curRow++;
-				} else if (op == 3) { // Copy Pixels
-					uint16 dstLeft = script->readUint16BE();
-					uint16 srcLeft = script->readUint16BE();
-					uint16 srcTop = script->readUint16BE();
-					uint16 rowWidth = script->readUint16BE();
-					memcpy ((byte *)screen->getBasePtr(dstLeft, curRow + _waterEffects[i].rect.top), (byte *)_mainScreen->getBasePtr(srcLeft, srcTop), rowWidth * _pixelFormat.bytesPerPixel);
-				} else if (op != 4) { // End of Script
-					error ("Unknown SFXE opcode %d", op);
-				}
-			}
-
-			// Increment frame
-			_waterEffects[i].curFrame++;
-			if (_waterEffects[i].curFrame == _waterEffects[i].frameCount)
-				_waterEffects[i].curFrame = 0;
-
-			// Set the new time
-			_waterEffects[i].lastFrameTime = _vm->_system->getMillis();
-		}
-	}
-
-	// Unlock the screen if it has been locked and return true to update the screen
-	if (screen) {
-		_vm->_system->unlockScreen();
-		return true;
-	}
-
-	return false;
-}
-
-void RivenGraphics::scheduleTransition(uint16 id, Common::Rect rect) {
-	_scheduledTransition = id;
-	_transitionRect = rect;
-}
-
-void RivenGraphics::runScheduledTransition() {
-	if (_scheduledTransition < 0) // No transition is scheduled
-		return;
-
-	// TODO: There's a lot to be done here...
-
-	// Note: Transitions 0-11 are actual transitions, but none are used in-game.
-	// There's no point in implementing them if they're not used. These extra
-	// transitions were found by hacking scripts.
-
-	switch (_scheduledTransition) {
-	case 0:  // Swipe Left
-	case 1:  // Swipe Right
-	case 2:  // Swipe Up
-	case 3:  // Swipe Down
-	case 12: // Pan Left
-	case 13: // Pan Right
-	case 14: // Pan Up
-	case 15: // Pan Down
-	case 16: // Dissolve
-	case 17: // Dissolve (tspit CARD 155)
-		break;
-	default:
-		if (_scheduledTransition >= 4 && _scheduledTransition <= 11)
-			error("Found unused transition %d", _scheduledTransition);
-		else
-			error("Found unknown transition %d", _scheduledTransition);
-	}
-
-	// For now, just copy the image to screen without doing any transition.
-	_vm->_system->copyRectToScreen((byte *)_mainScreen->pixels, _mainScreen->pitch, 0, 0, _mainScreen->w, _mainScreen->h);
-	_vm->_system->updateScreen();
-
-	_scheduledTransition = -1; // Clear scheduled transition
-}
-
-void RivenGraphics::clearMainScreen() {
-	_mainScreen->fillRect(Common::Rect(0, 0, 608, 392), _pixelFormat.RGBToColor(0, 0, 0));
-}
-
-void RivenGraphics::fadeToBlack() {
-	// The transition speed is forced to best here
-	setTransitionSpeed(kRivenTransitionSpeedBest);
-	scheduleTransition(16);
-	clearMainScreen();
-	runScheduledTransition();
-}
-
-void RivenGraphics::showInventory() {
-	// Don't redraw the inventory
-	if (_inventoryDrawn)
-		return;
-
-	// Clear the inventory area
-	clearInventoryArea();
-
-	// Draw the demo's exit button
-	if (_vm->getFeatures() & GF_DEMO) {
-		// extras.mhk tBMP 101 contains "EXIT" instead of Atrus' journal in the demo!
-		// The demo's extras.mhk contains all the other inventory/marble/credits image
-		// but has hacked tBMP 101 with "EXIT". *sigh*
-		drawInventoryImage(101, g_demoExitRect);
-	} else {
-		// We don't want to show the inventory on setup screens or in other journals.
-		if (_vm->getCurStack() == aspit)
-			return;
-
-		// There are three books and three vars. We have three different
-		// combinations. At the start you have just Atrus' journal. Later,
-		// you get Catherine's journal and the trap book. Near the end,
-		// you lose the trap book and have just the two journals.
-
-		bool hasCathBook = _vm->_vars["acathbook"] != 0;
-		bool hasTrapBook = _vm->_vars["atrapbook"] != 0;
-
-		if (!hasCathBook) {
-			drawInventoryImage(101, g_atrusJournalRect1);
-		} else if (!hasTrapBook) {
-			drawInventoryImage(101, g_atrusJournalRect2);
-			drawInventoryImage(102, g_cathJournalRect2);
-		} else {
-			drawInventoryImage(101, g_atrusJournalRect3);
-			drawInventoryImage(102, g_cathJournalRect3);
-			drawInventoryImage(100, g_trapBookRect3);
-		}
-	}
-
-	_vm->_system->updateScreen();
-	_inventoryDrawn = true;
-}
-
-void RivenGraphics::hideInventory() {
-	// Don't hide the inventory twice
-	if (!_inventoryDrawn)
-		return;
-
-	// Clear the area
-	clearInventoryArea();
-
-	_inventoryDrawn = false;
-}
-
-void RivenGraphics::clearInventoryArea() {
-	// Clear the inventory area
-	static const Common::Rect inventoryRect = Common::Rect(0, 392, 608, 436);
-
-	// Lock the screen
-	Graphics::Surface *screen = _vm->_system->lockScreen();
-
-	// Fill the inventory area with black
-	screen->fillRect(inventoryRect, _pixelFormat.RGBToColor(0, 0, 0));
-
-	_vm->_system->unlockScreen();
-}
-
-void RivenGraphics::drawInventoryImage(uint16 id, const Common::Rect *rect) {
-	MohawkSurface *mhkSurface = _bitmapDecoder->decodeImage(_vm->getExtrasResource(ID_TBMP, id));
-	mhkSurface->convertToTrueColor();
-	Graphics::Surface *surface = mhkSurface->getSurface();
-
-	_vm->_system->copyRectToScreen((byte *)surface->pixels, surface->pitch, rect->left, rect->top, surface->w, surface->h);
-
-	delete mhkSurface;
-}
-
-void RivenGraphics::drawRect(Common::Rect rect, bool active) {
-	// Useful with debugging. Shows where hotspots are on the screen and whether or not they're active.
-	Graphics::Surface *screen = _vm->_system->lockScreen();
-
-	if (active)
-		screen->frameRect(rect, _pixelFormat.RGBToColor(0, 255, 0));
-	else
-		screen->frameRect(rect, _pixelFormat.RGBToColor(255, 0, 0));
-
-	_vm->_system->unlockScreen();
-}
-
-void RivenGraphics::drawImageRect(uint16 id, Common::Rect srcRect, Common::Rect dstRect) {
-	// Draw tBMP id from srcRect to dstRect
-	Graphics::Surface *surface = findImage(id)->getSurface();
-
-	assert(srcRect.width() == dstRect.width() && srcRect.height() == dstRect.height());
-
-	for (uint16 i = 0; i < srcRect.height(); i++)
-		memcpy(_mainScreen->getBasePtr(dstRect.left, i + dstRect.top), surface->getBasePtr(srcRect.left, i + srcRect.top), srcRect.width() * surface->format.bytesPerPixel);
-
-	_dirtyScreen = true;
-}
-
-void RivenGraphics::drawExtrasImage(uint16 id, Common::Rect dstRect) {
-	MohawkSurface *mhkSurface = _bitmapDecoder->decodeImage(_vm->getExtrasResource(ID_TBMP, id));
-	mhkSurface->convertToTrueColor();
-	Graphics::Surface *surface = mhkSurface->getSurface();
-
-	assert(dstRect.width() == surface->w);
-
-	for (uint16 i = 0; i < surface->h; i++)
-		memcpy(_mainScreen->getBasePtr(dstRect.left, i + dstRect.top), surface->getBasePtr(0, i), surface->pitch);
-
-	delete mhkSurface;
-	_dirtyScreen = true;
-}
-
-void RivenGraphics::beginCredits() {
-	// Clear the old cache
-	clearCache();
-
-	// Now cache all the credits images
-	for (uint16 i = 302; i <= 320; i++) {
-		MohawkSurface *surface = _bitmapDecoder->decodeImage(_vm->getExtrasResource(ID_TBMP, i));
-		surface->convertToTrueColor();
-		addImageToCache(i, surface);
-	}
-
-	// And clear our screen too
-	clearMainScreen();
-}
-
-void RivenGraphics::updateCredits() {
-	if ((_creditsImage == 303 || _creditsImage == 304) && _creditsPos == 0)
-		fadeToBlack();
-
-	if (_creditsImage < 304) {
-		// For the first two credit images, they are faded from black to the image and then out again
-		scheduleTransition(16);
-
-		Graphics::Surface *frame = findImage(_creditsImage++)->getSurface();
-
-		for (int y = 0; y < frame->h; y++)
-			memcpy(_mainScreen->getBasePtr(124, y), frame->getBasePtr(0, y), frame->pitch);
-
-		runScheduledTransition();
-	} else {
-		// Otheriwse, we're scrolling
-		// Move the screen up one row
-		memmove(_mainScreen->pixels, _mainScreen->getBasePtr(0, 1), _mainScreen->pitch * (_mainScreen->h - 1));
-
-		// Only update as long as we're not before the last frame
-		// Otherwise, we're just moving up a row (which we already did)
-		if (_creditsImage <= 320) {
-			// Copy the next row to the bottom of the screen
-			Graphics::Surface *frame = findImage(_creditsImage)->getSurface();
-			memcpy(_mainScreen->getBasePtr(124, _mainScreen->h - 1), frame->getBasePtr(0, _creditsPos), frame->pitch);
-			_creditsPos++;
-
-			if (_creditsPos == _mainScreen->h) {
-				_creditsImage++;
-				_creditsPos = 0;
-			}
-		}
-
-		// Now flush the new screen
-		_vm->_system->copyRectToScreen((byte *)_mainScreen->pixels, _mainScreen->pitch, 0, 0, _mainScreen->w, _mainScreen->h);
-		_vm->_system->updateScreen();
-	}
-}
-
-#endif // ENABLE_RIVEN
-
-LBGraphics::LBGraphics(MohawkEngine_LivingBooks *vm, uint16 width, uint16 height) : GraphicsManager(), _vm(vm) {
-	_bmpDecoder = _vm->isPreMohawk() ? new LivingBooksBitmap_v1() : new MohawkBitmap();
-
-	initGraphics(width, height, true);
-}
-
-LBGraphics::~LBGraphics() {
-	delete _bmpDecoder;
-}
-
-MohawkSurface *LBGraphics::decodeImage(uint16 id) {
-	if (_vm->isPreMohawk())
-		return _bmpDecoder->decodeImage(_vm->wrapStreamEndian(ID_BMAP, id));
-
-	return _bmpDecoder->decodeImage(_vm->getResource(ID_TBMP, id));
-}
-
-void LBGraphics::copyOffsetAnimImageToScreen(uint16 image, int left, int top) {
-	MohawkSurface *mhkSurface = findImage(image);
-
-	left -= mhkSurface->getOffsetX();
-	top -= mhkSurface->getOffsetY();
-
-	GraphicsManager::copyAnimImageToScreen(image, left, top);
-}
-
-bool LBGraphics::imageIsTransparentAt(uint16 image, bool useOffsets, int x, int y) {
-	MohawkSurface *mhkSurface = findImage(image);
-
-	if (useOffsets) {
-		x += mhkSurface->getOffsetX();
-		y += mhkSurface->getOffsetY();
-	}
-
-	if (x < 0 || y < 0)
-		return true;
-
-	Graphics::Surface *surface = mhkSurface->getSurface();
-	if (x >= surface->w || y >= surface->h)
-		return true;
-
-	return *(byte *)surface->getBasePtr(x, y) == 0;
-}
-
-void LBGraphics::setPalette(uint16 id) {
-	// Old Living Books games use the old CTBL-style palette format while newer
-	// games use the better tPAL format which can store partial palettes.
-	if (_vm->isPreMohawk()) {
-		Common::SeekableSubReadStreamEndian *ctblStream = _vm->wrapStreamEndian(ID_CTBL, id);
-		uint16 colorCount = ctblStream->readUint16();
-		byte *palette = new byte[colorCount * 3];
-
-		for (uint16 i = 0; i < colorCount; i++) {
-			palette[i * 3 + 0] = ctblStream->readByte();
-			palette[i * 3 + 1] = ctblStream->readByte();
-			palette[i * 3 + 2] = ctblStream->readByte();
-			ctblStream->readByte();
-		}
-
-		delete ctblStream;
-
-		_vm->_system->getPaletteManager()->setPalette(palette, 0, colorCount);
-		delete[] palette;
-	} else {
-		GraphicsManager::setPalette(id);
-	}
-}
-
-#ifdef ENABLE_CSTIME
-
-CSTimeGraphics::CSTimeGraphics(MohawkEngine_CSTime *vm) : GraphicsManager(), _vm(vm) {
-	_bmpDecoder = new MohawkBitmap();
-
-	initGraphics(640, 480, true);
-}
-
-CSTimeGraphics::~CSTimeGraphics() {
-	delete _bmpDecoder;
-}
-
-void CSTimeGraphics::drawRect(Common::Rect rect, byte color) {
-	rect.clip(Common::Rect(640, 480));
-
-	// Useful with debugging. Shows where hotspots are on the screen and whether or not they're active.
-	if (!rect.isValidRect() || rect.width() == 0 || rect.height() == 0)
-		return;
-
-	Graphics::Surface *screen = _vm->_system->lockScreen();
-
-	screen->frameRect(rect, color);
-
-	_vm->_system->unlockScreen();
-}
-
-MohawkSurface *CSTimeGraphics::decodeImage(uint16 id) {
-	return _bmpDecoder->decodeImage(_vm->getResource(ID_TBMP, id));
-}
-
-Common::Array<MohawkSurface *> CSTimeGraphics::decodeImages(uint16 id) {
-	return _bmpDecoder->decodeImages(_vm->getResource(ID_TBMH, id));
-}
-
-#endif
-
 } // End of namespace Mohawk
diff --git a/engines/mohawk/graphics.h b/engines/mohawk/graphics.h
index 8fa5d5f895..51d25db5d9 100644
--- a/engines/mohawk/graphics.h
+++ b/engines/mohawk/graphics.h
@@ -25,12 +25,11 @@
 
 #include "mohawk/bitmap.h"
 
-#include "common/file.h"
 #include "common/hashmap.h"
-#include "graphics/pict.h"
+#include "common/rect.h"
 
 namespace Graphics {
-class JPEG;
+struct Surface;
 }
 
 namespace Mohawk {
@@ -103,196 +102,6 @@ private:
 	Common::HashMap<uint16, Common::Array<MohawkSurface *> > _subImageCache;
 };
 
-#ifdef ENABLE_MYST
-
-class MystBitmap;
-class MohawkEngine_Myst;
-
-enum RectState {
-	kRectEnabled,
-	kRectDisabled,
-	kRectUnreachable
-};
-
-class MystGraphics : public GraphicsManager {
-public:
-	MystGraphics(MohawkEngine_Myst*);
-	~MystGraphics();
-
-	void loadExternalPictureFile(uint16 stack);
-	void copyImageSectionToScreen(uint16 image, Common::Rect src, Common::Rect dest);
-	void copyImageSectionToBackBuffer(uint16 image, Common::Rect src, Common::Rect dest);
-	void copyImageToScreen(uint16 image, Common::Rect dest);
-	void copyImageToBackBuffer(uint16 image, Common::Rect dest);
-	void copyBackBufferToScreen(Common::Rect r);
-	void runTransition(uint16 type, Common::Rect rect, uint16 steps, uint16 delay);
-	void drawRect(Common::Rect rect, RectState state);
-	void drawLine(const Common::Point &p1, const Common::Point &p2, uint32 color);
-	void enableDrawingTimeSimulation(bool enable);
-	void fadeToBlack();
-	void fadeFromBlack();
-
-protected:
-	MohawkSurface *decodeImage(uint16 id);
-	MohawkEngine *getVM() { return (MohawkEngine *)_vm; }
-	void simulatePreviousDrawDelay(const Common::Rect &dest);
-	void copyBackBufferToScreenWithSaturation(int16 saturation);
-
-private:
-	MohawkEngine_Myst *_vm;
-	MystBitmap *_bmpDecoder;
-	Graphics::PictDecoder *_pictDecoder;
-	Graphics::JPEG *_jpegDecoder;
-
-	struct PictureFile {
-		uint32 pictureCount;
-		struct PictureEntry {
-			uint32 offset;
-			uint32 size;
-			uint16 id;
-			uint16 type;
-			uint16 width;
-			uint16 height;
-		} *entries;
-
-		Common::File picFile;
-	} _pictureFile;
-
-	Graphics::Surface *_backBuffer;
-	Graphics::PixelFormat _pixelFormat;
-	Common::Rect _viewport;
-
-	int _enableDrawingTimeSimulation;
-	uint32 _nextAllowedDrawTime;
-	static const uint _constantDrawDelay = 10; // ms
-	static const uint _proportionalDrawDelay = 500; // pixels per ms
-};
-
-#endif // ENABLE_MYST
-
-#ifdef ENABLE_RIVEN
-
-class MohawkEngine_Riven;
-
-class RivenGraphics : public GraphicsManager {
-public:
-	RivenGraphics(MohawkEngine_Riven *vm);
-	~RivenGraphics();
-
-	void copyImageToScreen(uint16, uint32, uint32, uint32, uint32);
-	void updateScreen(Common::Rect updateRect = Common::Rect(0, 0, 608, 392));
-	bool _updatesEnabled;
-	Common::Array<uint16> _activatedPLSTs;
-	void drawPLST(uint16 x);
-	void drawRect(Common::Rect rect, bool active);
-	void drawImageRect(uint16 id, Common::Rect srcRect, Common::Rect dstRect);
-	void drawExtrasImage(uint16 id, Common::Rect dstRect);
-
-	// Water Effect
-	void scheduleWaterEffect(uint16);
-	void clearWaterEffects();
-	bool runScheduledWaterEffects();
-
-	// Transitions
-	void scheduleTransition(uint16 id, Common::Rect rect = Common::Rect(0, 0, 608, 392));
-	void runScheduledTransition();
-	void fadeToBlack();
-	void setTransitionSpeed(uint32 speed) { _transitionSpeed = speed; }
-
-	// Inventory
-	void showInventory();
-	void hideInventory();
-
-	// Credits
-	void beginCredits();
-	void updateCredits();
-	uint getCurCreditsImage() { return _creditsImage; }
-
-protected:
-	MohawkSurface *decodeImage(uint16 id);
-	MohawkEngine *getVM() { return (MohawkEngine *)_vm; }
-
-private:
-	MohawkEngine_Riven *_vm;
-	MohawkBitmap *_bitmapDecoder;
-
-	// Water Effects
-	struct SFXERecord {
-		// Record values
-		uint16 frameCount;
-		Common::Rect rect;
-		uint16 speed;
-		Common::Array<Common::SeekableReadStream *> frameScripts;
-
-		// Cur frame
-		uint16 curFrame;
-		uint32 lastFrameTime;
-	};
-	Common::Array<SFXERecord> _waterEffects;
-
-	// Transitions
-	int16 _scheduledTransition;
-	Common::Rect _transitionRect;
-	uint32 _transitionSpeed;
-
-	// Inventory
-	void clearInventoryArea();
-	void drawInventoryImage(uint16 id, const Common::Rect *rect);
-	bool _inventoryDrawn;
-
-	// Screen Related
-	Graphics::Surface *_mainScreen;
-	bool _dirtyScreen;
-	Graphics::PixelFormat _pixelFormat;
-	void clearMainScreen();
-
-	// Credits
-	uint _creditsImage, _creditsPos;
-};
-
-#endif // ENABLE_RIVEN
-
-class LBGraphics : public GraphicsManager {
-public:
-	LBGraphics(MohawkEngine_LivingBooks *vm, uint16 width, uint16 height);
-	~LBGraphics();
-
-	void setPalette(uint16 id);
-	void copyOffsetAnimImageToScreen(uint16 image, int left = 0, int top = 0);
-	bool imageIsTransparentAt(uint16 image, bool useOffsets, int x, int y);
-
-protected:
-	MohawkSurface *decodeImage(uint16 id);
-	MohawkEngine *getVM() { return (MohawkEngine *)_vm; }
-
-private:
-	MohawkBitmap *_bmpDecoder;
-	MohawkEngine_LivingBooks *_vm;
-};
-
-#ifdef ENABLE_CSTIME
-
-class MohawkEngine_CSTime;
-
-class CSTimeGraphics : public GraphicsManager {
-public:
-	CSTimeGraphics(MohawkEngine_CSTime *vm);
-	~CSTimeGraphics();
-
-	void drawRect(Common::Rect rect, byte color);
-
-protected:
-	MohawkSurface *decodeImage(uint16 id);
-	Common::Array<MohawkSurface *> decodeImages(uint16 id);
-	MohawkEngine *getVM() { return (MohawkEngine *)_vm; }
-
-private:
-	MohawkBitmap *_bmpDecoder;
-	MohawkEngine_CSTime *_vm;
-};
-
-#endif
-
 } // End of namespace Mohawk
 
 #endif
diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h
index 23ab0acfb1..91d6a8cd30 100644
--- a/engines/mohawk/livingbooks.h
+++ b/engines/mohawk/livingbooks.h
@@ -25,7 +25,7 @@
 
 #include "mohawk/mohawk.h"
 #include "mohawk/console.h"
-#include "mohawk/graphics.h"
+#include "mohawk/livingbooks_graphics.h"
 #include "mohawk/sound.h"
 
 #include "common/config-file.h"
diff --git a/engines/mohawk/livingbooks_graphics.cpp b/engines/mohawk/livingbooks_graphics.cpp
new file mode 100644
index 0000000000..fb764fa15b
--- /dev/null
+++ b/engines/mohawk/livingbooks_graphics.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 "mohawk/resource.h"
+#include "mohawk/livingbooks.h"
+#include "mohawk/livingbooks_graphics.h"
+
+#include "common/substream.h"
+#include "common/system.h"
+#include "engines/util.h"
+#include "graphics/palette.h"
+
+namespace Mohawk {
+
+LBGraphics::LBGraphics(MohawkEngine_LivingBooks *vm, uint16 width, uint16 height) : GraphicsManager(), _vm(vm) {
+	_bmpDecoder = _vm->isPreMohawk() ? new LivingBooksBitmap_v1() : new MohawkBitmap();
+
+	initGraphics(width, height, true);
+}
+
+LBGraphics::~LBGraphics() {
+	delete _bmpDecoder;
+}
+
+MohawkSurface *LBGraphics::decodeImage(uint16 id) {
+	if (_vm->isPreMohawk())
+		return _bmpDecoder->decodeImage(_vm->wrapStreamEndian(ID_BMAP, id));
+
+	return _bmpDecoder->decodeImage(_vm->getResource(ID_TBMP, id));
+}
+
+void LBGraphics::copyOffsetAnimImageToScreen(uint16 image, int left, int top) {
+	MohawkSurface *mhkSurface = findImage(image);
+
+	left -= mhkSurface->getOffsetX();
+	top -= mhkSurface->getOffsetY();
+
+	GraphicsManager::copyAnimImageToScreen(image, left, top);
+}
+
+bool LBGraphics::imageIsTransparentAt(uint16 image, bool useOffsets, int x, int y) {
+	MohawkSurface *mhkSurface = findImage(image);
+
+	if (useOffsets) {
+		x += mhkSurface->getOffsetX();
+		y += mhkSurface->getOffsetY();
+	}
+
+	if (x < 0 || y < 0)
+		return true;
+
+	Graphics::Surface *surface = mhkSurface->getSurface();
+	if (x >= surface->w || y >= surface->h)
+		return true;
+
+	return *(byte *)surface->getBasePtr(x, y) == 0;
+}
+
+void LBGraphics::setPalette(uint16 id) {
+	// Old Living Books games use the old CTBL-style palette format while newer
+	// games use the better tPAL format which can store partial palettes.
+	if (_vm->isPreMohawk()) {
+		Common::SeekableSubReadStreamEndian *ctblStream = _vm->wrapStreamEndian(ID_CTBL, id);
+		uint16 colorCount = ctblStream->readUint16();
+		byte *palette = new byte[colorCount * 3];
+
+		for (uint16 i = 0; i < colorCount; i++) {
+			palette[i * 3 + 0] = ctblStream->readByte();
+			palette[i * 3 + 1] = ctblStream->readByte();
+			palette[i * 3 + 2] = ctblStream->readByte();
+			ctblStream->readByte();
+		}
+
+		delete ctblStream;
+
+		_vm->_system->getPaletteManager()->setPalette(palette, 0, colorCount);
+		delete[] palette;
+	} else {
+		GraphicsManager::setPalette(id);
+	}
+}
+
+} // End of namespace Mohawk
diff --git a/engines/mohawk/livingbooks_graphics.h b/engines/mohawk/livingbooks_graphics.h
new file mode 100644
index 0000000000..3e2609750a
--- /dev/null
+++ b/engines/mohawk/livingbooks_graphics.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 MOHAWK_LIVINGBOOKS_GRAPHICS_H
+#define MOHAWK_LIVINGBOOKS_GRAPHICS_H
+
+#include "mohawk/graphics.h"
+
+namespace Mohawk {
+
+class MohawkEngine_LivingBooks;
+
+class LBGraphics : public GraphicsManager {
+public:
+	LBGraphics(MohawkEngine_LivingBooks *vm, uint16 width, uint16 height);
+	~LBGraphics();
+
+	void setPalette(uint16 id);
+	void copyOffsetAnimImageToScreen(uint16 image, int left = 0, int top = 0);
+	bool imageIsTransparentAt(uint16 image, bool useOffsets, int x, int y);
+
+protected:
+	MohawkSurface *decodeImage(uint16 id);
+	MohawkEngine *getVM() { return (MohawkEngine *)_vm; }
+
+private:
+	MohawkBitmap *_bmpDecoder;
+	MohawkEngine_LivingBooks *_vm;
+};
+
+} // End of namespace Mohawk
+
+#endif
diff --git a/engines/mohawk/module.mk b/engines/mohawk/module.mk
index 882f3966b2..83e541e3e4 100644
--- a/engines/mohawk/module.mk
+++ b/engines/mohawk/module.mk
@@ -10,6 +10,7 @@ MODULE_OBJS = \
 	installer_archive.o \
 	livingbooks.o \
 	livingbooks_code.o \
+	livingbooks_graphics.o \
 	livingbooks_lbx.o \
 	mohawk.o \
 	resource.o \
@@ -22,6 +23,7 @@ MODULE_OBJS += \
 	cstime.o \
 	cstime_cases.o \
 	cstime_game.o \
+	cstime_graphics.o \
 	cstime_ui.o \
 	cstime_view.o
 endif
@@ -30,6 +32,7 @@ ifdef ENABLE_MYST
 MODULE_OBJS += \
 	myst.o \
 	myst_areas.o \
+	myst_graphics.o \
 	myst_scripts.o \
 	myst_state.o \
 	resource_cache.o \
@@ -51,6 +54,7 @@ ifdef ENABLE_RIVEN
 MODULE_OBJS += \
 	riven.o \
 	riven_external.o \
+	riven_graphics.o \
 	riven_saveload.o \
 	riven_scripts.o \
 	riven_vars.o
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index eeb4594f3c..c22b30ad4d 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -27,9 +27,9 @@
 #include "common/textconsole.h"
 
 #include "mohawk/cursors.h"
-#include "mohawk/graphics.h"
 #include "mohawk/myst.h"
 #include "mohawk/myst_areas.h"
+#include "mohawk/myst_graphics.h"
 #include "mohawk/myst_scripts.h"
 #include "mohawk/myst_state.h"
 #include "mohawk/dialogs.h"
diff --git a/engines/mohawk/myst_areas.cpp b/engines/mohawk/myst_areas.cpp
index 294fcea2f1..fe33ceaa9b 100644
--- a/engines/mohawk/myst_areas.cpp
+++ b/engines/mohawk/myst_areas.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-#include "mohawk/graphics.h"
 #include "mohawk/myst_areas.h"
+#include "mohawk/myst_graphics.h"
 #include "mohawk/myst_scripts.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
diff --git a/engines/mohawk/myst_areas.h b/engines/mohawk/myst_areas.h
index 297a7cc92b..62af5ec4cf 100644
--- a/engines/mohawk/myst_areas.h
+++ b/engines/mohawk/myst_areas.h
@@ -20,11 +20,13 @@
  *
  */
 
+#ifndef MYST_AREAS_H
+#define MYST_AREAS_H
+
 #include "mohawk/myst.h"
 #include "mohawk/video.h"
 
-#ifndef MYST_AREAS_H
-#define MYST_AREAS_H
+#include "common/rect.h"
 
 namespace Mohawk {
 
diff --git a/engines/mohawk/myst_graphics.cpp b/engines/mohawk/myst_graphics.cpp
new file mode 100644
index 0000000000..151390580f
--- /dev/null
+++ b/engines/mohawk/myst_graphics.cpp
@@ -0,0 +1,493 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 "mohawk/myst.h"
+#include "mohawk/myst_graphics.h"
+#include "mohawk/resource.h"
+
+#include "common/substream.h"
+#include "common/system.h"
+#include "common/textconsole.h"
+#include "engines/util.h"
+#include "graphics/jpeg.h"
+#include "graphics/pict.h"
+
+namespace Mohawk {
+
+MystGraphics::MystGraphics(MohawkEngine_Myst* vm) : GraphicsManager(), _vm(vm) {
+	_bmpDecoder = new MystBitmap();
+
+	_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!
+
+	_pixelFormat = _vm->_system->getScreenFormat();
+
+	if (_pixelFormat.bytesPerPixel == 1)
+		error("Myst requires greater than 256 colors to run");
+
+	if (_vm->getFeatures() & GF_ME) {
+		_jpegDecoder = new Graphics::JPEG();
+		_pictDecoder = new Graphics::PictDecoder(_pixelFormat);
+	} else {
+		_jpegDecoder = NULL;
+		_pictDecoder = NULL;
+	}
+
+	_pictureFile.entries = NULL;
+
+	// Initialize our buffer
+	_backBuffer = new Graphics::Surface();
+	_backBuffer->create(_vm->_system->getWidth(), _vm->_system->getHeight(), _pixelFormat);
+
+	_nextAllowedDrawTime = _vm->_system->getMillis();
+	_enableDrawingTimeSimulation = 0;
+}
+
+MystGraphics::~MystGraphics() {
+	delete _bmpDecoder;
+	delete _jpegDecoder;
+	delete _pictDecoder;
+	delete[] _pictureFile.entries;
+
+	_backBuffer->free();
+	delete _backBuffer;
+}
+
+static const char *s_picFileNames[] = {
+	"CHpics",
+	"",
+	"",
+	"DUpics",
+	"INpics",
+	"",
+	"MEpics",
+	"MYpics",
+	"SEpics",
+	"",
+	"",
+	"STpics"
+};
+
+void MystGraphics::loadExternalPictureFile(uint16 stack) {
+	if (_vm->getPlatform() != Common::kPlatformMacintosh)
+		return;
+
+	if (_pictureFile.picFile.isOpen())
+		_pictureFile.picFile.close();
+	delete[] _pictureFile.entries;
+
+	if (!scumm_stricmp(s_picFileNames[stack], ""))
+		return;
+
+	if (!_pictureFile.picFile.open(s_picFileNames[stack]))
+		error ("Could not open external picture file \'%s\'", s_picFileNames[stack]);
+
+	_pictureFile.pictureCount = _pictureFile.picFile.readUint32BE();
+	_pictureFile.entries = new PictureFile::PictureEntry[_pictureFile.pictureCount];
+
+	for (uint32 i = 0; i < _pictureFile.pictureCount; i++) {
+		_pictureFile.entries[i].offset = _pictureFile.picFile.readUint32BE();
+		_pictureFile.entries[i].size = _pictureFile.picFile.readUint32BE();
+		_pictureFile.entries[i].id = _pictureFile.picFile.readUint16BE();
+		_pictureFile.entries[i].type = _pictureFile.picFile.readUint16BE();
+		_pictureFile.entries[i].width = _pictureFile.picFile.readUint16BE();
+		_pictureFile.entries[i].height = _pictureFile.picFile.readUint16BE();
+	}
+}
+
+MohawkSurface *MystGraphics::decodeImage(uint16 id) {
+	MohawkSurface *mhkSurface = 0;
+
+	// Myst ME uses JPEG/PICT images instead of compressed Windows Bitmaps for room images,
+	// though there are a few weird ones that use that format. For further nonsense with images,
+	// the Macintosh version stores images in external "picture files." We check them before
+	// going to check for a PICT resource.
+	if (_vm->getFeatures() & GF_ME && _vm->getPlatform() == Common::kPlatformMacintosh && _pictureFile.picFile.isOpen()) {
+		for (uint32 i = 0; i < _pictureFile.pictureCount; i++)
+			if (_pictureFile.entries[i].id == id) {
+				if (_pictureFile.entries[i].type == 0) {
+					Common::SeekableReadStream *stream = new Common::SeekableSubReadStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size);
+
+					if (!_jpegDecoder->read(stream))
+						error("Could not decode Myst ME Mac JPEG");
+
+					mhkSurface = new MohawkSurface(_jpegDecoder->getSurface(_pixelFormat));
+					delete stream;
+				} else if (_pictureFile.entries[i].type == 1) {
+					mhkSurface = new MohawkSurface(_pictDecoder->decodeImage(new Common::SeekableSubReadStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size)));
+				} else
+					error ("Unknown Picture File type %d", _pictureFile.entries[i].type);
+				break;
+			}
+	}
+
+	// We're not using the external Mac files, so it's time to delve into the main Mohawk
+	// archives. However, we still don't know if it's a PICT or WDIB resource. If it's Myst
+	// ME it's most likely a PICT, and if it's original it's definitely a WDIB. However,
+	// Myst ME throws us another curve ball in that PICT resources can contain WDIB's instead
+	// of PICT's.
+	if (!mhkSurface) {
+		bool isPict = false;
+		Common::SeekableReadStream *dataStream = NULL;
+
+		if (_vm->getFeatures() & GF_ME && _vm->hasResource(ID_PICT, id)) {
+			// The PICT resource exists. However, it could still contain a MystBitmap
+			// instead of a PICT image...
+			dataStream = _vm->getResource(ID_PICT, id);
+		} else // No PICT, so the WDIB must exist. Let's go grab it.
+			dataStream = _vm->getResource(ID_WDIB, id);
+
+		if (_vm->getFeatures() & GF_ME) {
+			// Here we detect whether it's really a PICT or a WDIB. Since a MystBitmap
+			// would be compressed, there's no way to detect for the BM without a hack.
+			// So, we search for the PICT version opcode for detection.
+			dataStream->seek(512 + 10); // 512 byte pict header
+			isPict = (dataStream->readUint32BE() == 0x001102FF);
+			dataStream->seek(0);
+		}
+
+		if (isPict)
+			mhkSurface = new MohawkSurface(_pictDecoder->decodeImage(dataStream));
+		else {
+			mhkSurface = _bmpDecoder->decodeImage(dataStream);
+			mhkSurface->convertToTrueColor();
+		}
+	}
+
+	assert(mhkSurface);
+	return mhkSurface;
+}
+
+void MystGraphics::copyImageSectionToScreen(uint16 image, Common::Rect src, Common::Rect dest) {
+	Graphics::Surface *surface = findImage(image)->getSurface();
+
+	// Make sure the image is bottom aligned in the dest rect
+	dest.top = dest.bottom - MIN<int>(surface->h, dest.height());
+
+	// Convert from bitmap coordinates to surface coordinates
+	uint16 top = surface->h - (src.top + MIN<int>(surface->h, dest.height()));
+
+	// Do not draw the top pixels if the image is too tall
+	if (dest.height() > _viewport.height())
+		top += dest.height() - _viewport.height();
+
+	// Clip the destination rect to the screen
+	if (dest.right > _vm->_system->getWidth() || dest.bottom > _vm->_system->getHeight())
+		dest.debugPrint(4, "Clipping destination rect to the screen");
+	dest.right = CLIP<int>(dest.right, 0, _vm->_system->getWidth());
+	dest.bottom = CLIP<int>(dest.bottom, 0, _vm->_system->getHeight());
+
+	uint16 width = MIN<int>(surface->w, dest.width());
+	uint16 height = MIN<int>(surface->h, dest.height());
+
+	// Clamp Width and Height to within src surface dimensions
+	if (src.left + width > surface->w)
+		width = surface->w - src.left;
+	if (src.top + height > surface->h)
+		height = surface->h - src.top;
+
+	debug(3, "MystGraphics::copyImageSectionToScreen()");
+	debug(3, "\tImage: %d", image);
+	debug(3, "\tsrc.left: %d", src.left);
+	debug(3, "\tsrc.top: %d", src.top);
+	debug(3, "\tdest.left: %d", dest.left);
+	debug(3, "\tdest.top: %d", dest.top);
+	debug(3, "\twidth: %d", width);
+	debug(3, "\theight: %d", height);
+
+	simulatePreviousDrawDelay(dest);
+
+	_vm->_system->copyRectToScreen((byte *)surface->getBasePtr(src.left, top), surface->pitch, dest.left, dest.top, width, height);
+}
+
+void MystGraphics::copyImageSectionToBackBuffer(uint16 image, Common::Rect src, Common::Rect dest) {
+	Graphics::Surface *surface = findImage(image)->getSurface();
+
+	// Make sure the image is bottom aligned in the dest rect
+	dest.top = dest.bottom - MIN<int>(surface->h, dest.height());
+
+	// Convert from bitmap coordinates to surface coordinates
+	uint16 top = surface->h - (src.top + MIN<int>(surface->h, dest.height()));
+
+	// Do not draw the top pixels if the image is too tall
+	if (dest.height() > _viewport.height()) {
+		top += dest.height() - _viewport.height();
+	}
+
+	// Clip the destination rect to the screen
+	if (dest.right > _vm->_system->getWidth() || dest.bottom > _vm->_system->getHeight())
+		dest.debugPrint(4, "Clipping destination rect to the screen");
+	dest.right = CLIP<int>(dest.right, 0, _vm->_system->getWidth());
+	dest.bottom = CLIP<int>(dest.bottom, 0, _vm->_system->getHeight());
+
+	uint16 width = MIN<int>(surface->w, dest.width());
+	uint16 height = MIN<int>(surface->h, dest.height());
+
+	// Clamp Width and Height to within src surface dimensions
+	if (src.left + width > surface->w)
+		width = surface->w - src.left;
+	if (src.top + height > surface->h)
+		height = surface->h - src.top;
+
+	debug(3, "MystGraphics::copyImageSectionToBackBuffer()");
+	debug(3, "\tImage: %d", image);
+	debug(3, "\tsrc.left: %d", src.left);
+	debug(3, "\tsrc.top: %d", src.top);
+	debug(3, "\tdest.left: %d", dest.left);
+	debug(3, "\tdest.top: %d", dest.top);
+	debug(3, "\twidth: %d", width);
+	debug(3, "\theight: %d", height);
+
+	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);
+}
+
+void MystGraphics::copyImageToScreen(uint16 image, Common::Rect dest) {
+	copyImageSectionToScreen(image, Common::Rect(544, 333), dest);
+}
+
+void MystGraphics::copyImageToBackBuffer(uint16 image, Common::Rect dest) {
+	copyImageSectionToBackBuffer(image, Common::Rect(544, 333), dest);
+}
+
+void MystGraphics::copyBackBufferToScreen(Common::Rect r) {
+	r.clip(_viewport);
+
+	simulatePreviousDrawDelay(r);
+
+	_vm->_system->copyRectToScreen((byte *)_backBuffer->getBasePtr(r.left, r.top), _backBuffer->pitch, r.left, r.top, r.width(), r.height());
+}
+
+void MystGraphics::runTransition(uint16 type, Common::Rect rect, uint16 steps, uint16 delay) {
+
+	// Do not artificially delay during transitions
+	int oldEnableDrawingTimeSimulation = _enableDrawingTimeSimulation;
+	_enableDrawingTimeSimulation = 0;
+
+	switch (type) {
+	case 0:	{
+			debugC(kDebugScript, "Left to Right");
+
+			uint16 step = (rect.right - rect.left) / steps;
+			Common::Rect area = rect;
+			for (uint i = 0; i < steps; i++) {
+				area.left = rect.left + step * i;
+				area.right = area.left + step;
+
+				_vm->_system->delayMillis(delay);
+
+				copyBackBufferToScreen(area);
+				_vm->_system->updateScreen();
+			}
+			if (area.right < rect.right) {
+				area.left = area.right;
+				area.right = rect.right;
+
+				copyBackBufferToScreen(area);
+				_vm->_system->updateScreen();
+			}
+		}
+		break;
+	case 1:	{
+			debugC(kDebugScript, "Right to Left");
+
+			uint16 step = (rect.right - rect.left) / steps;
+			Common::Rect area = rect;
+			for (uint i = 0; i < steps; i++) {
+				area.right = rect.right - step * i;
+				area.left = area.right - step;
+
+				_vm->_system->delayMillis(delay);
+
+				copyBackBufferToScreen(area);
+				_vm->_system->updateScreen();
+			}
+			if (area.left > rect.left) {
+				area.right = area.left;
+				area.left = rect.left;
+
+				copyBackBufferToScreen(area);
+				_vm->_system->updateScreen();
+			}
+		}
+		break;
+	case 5:	{
+			debugC(kDebugScript, "Top to Bottom");
+
+			uint16 step = (rect.bottom - rect.top) / steps;
+			Common::Rect area = rect;
+			for (uint i = 0; i < steps; i++) {
+				area.top = rect.top + step * i;
+				area.bottom = area.top + step;
+
+				_vm->_system->delayMillis(delay);
+
+				copyBackBufferToScreen(area);
+				_vm->_system->updateScreen();
+			}
+			if (area.bottom < rect.bottom) {
+				area.top = area.bottom;
+				area.bottom = rect.bottom;
+
+				copyBackBufferToScreen(area);
+				_vm->_system->updateScreen();
+			}
+		}
+		break;
+	case 6:	{
+			debugC(kDebugScript, "Bottom to Top");
+
+			uint16 step = (rect.bottom - rect.top) / steps;
+			Common::Rect area = rect;
+			for (uint i = 0; i < steps; i++) {
+				area.bottom = rect.bottom - step * i;
+				area.top = area.bottom - step;
+
+				_vm->_system->delayMillis(delay);
+
+				copyBackBufferToScreen(area);
+				_vm->_system->updateScreen();
+			}
+			if (area.top > rect.top) {
+				area.bottom = area.top;
+				area.top = rect.top;
+
+				copyBackBufferToScreen(area);
+				_vm->_system->updateScreen();
+			}
+		}
+		break;
+	default:
+		warning("Unknown Update Direction");
+
+		//TODO: Replace minimal implementation
+		copyBackBufferToScreen(rect);
+		_vm->_system->updateScreen();
+		break;
+	}
+
+	_enableDrawingTimeSimulation = oldEnableDrawingTimeSimulation;
+}
+
+void MystGraphics::drawRect(Common::Rect rect, RectState state) {
+	rect.clip(_viewport);
+
+	// Useful with debugging. Shows where hotspots are on the screen and whether or not they're active.
+	if (!rect.isValidRect() || rect.width() == 0 || rect.height() == 0)
+		return;
+
+	Graphics::Surface *screen = _vm->_system->lockScreen();
+
+	if (state == kRectEnabled)
+		screen->frameRect(rect, _pixelFormat.RGBToColor(0, 255, 0));
+	else if (state == kRectUnreachable)
+		screen->frameRect(rect, _pixelFormat.RGBToColor(0, 0, 255));
+	else
+		screen->frameRect(rect, _pixelFormat.RGBToColor(255, 0, 0));
+
+	_vm->_system->unlockScreen();
+}
+
+void MystGraphics::drawLine(const Common::Point &p1, const Common::Point &p2, uint32 color) {
+	_backBuffer->drawLine(p1.x, p1.y, p2.x, p2.y, color);
+}
+
+void MystGraphics::enableDrawingTimeSimulation(bool enable) {
+	if (enable)
+		_enableDrawingTimeSimulation++;
+	else
+		_enableDrawingTimeSimulation--;
+
+	if (_enableDrawingTimeSimulation < 0)
+		_enableDrawingTimeSimulation = 0;
+}
+
+void MystGraphics::simulatePreviousDrawDelay(const Common::Rect &dest) {
+	uint32 time = 0;
+
+	if (_enableDrawingTimeSimulation) {
+		time = _vm->_system->getMillis();
+
+		// Do not draw anything new too quickly after the previous draw call
+		// so that images stay at least a little while on screen
+		// This is enabled only for scripted draw calls
+		if (time < _nextAllowedDrawTime)
+			_vm->_system->delayMillis(_nextAllowedDrawTime - time);
+	}
+
+	// Next draw call allowed at DELAY + AERA * COEFF milliseconds from now
+	time = _vm->_system->getMillis();
+	_nextAllowedDrawTime = time + _constantDrawDelay + dest.height() * dest.width() / _proportionalDrawDelay;
+}
+
+void MystGraphics::copyBackBufferToScreenWithSaturation(int16 saturation) {
+	Graphics::Surface *screen = _vm->_system->lockScreen();
+
+	for (uint16 y = 0; y < _viewport.height(); y++)
+		for (uint16 x = 0; x < _viewport.width(); x++) {
+			uint32 color;
+			uint8 r, g, b;
+
+			if (_pixelFormat.bytesPerPixel == 2)
+				color = *(const uint16 *)_backBuffer->getBasePtr(x, y);
+			else
+				color = *(const uint32 *)_backBuffer->getBasePtr(x, y);
+
+			_pixelFormat.colorToRGB(color, r, g, b);
+
+			r = CLIP<int16>((int16)r - saturation, 0, 255);
+			g = CLIP<int16>((int16)g - saturation, 0, 255);
+			b = CLIP<int16>((int16)b - saturation, 0, 255);
+
+			color = _pixelFormat.RGBToColor(r, g, b);
+
+			if (_pixelFormat.bytesPerPixel == 2) {
+				uint16 *dst = (uint16 *)screen->getBasePtr(x, y);
+				*dst = color;
+			} else {
+				uint32 *dst = (uint32 *)screen->getBasePtr(x, y);
+				*dst = color;
+			}
+		}
+
+	_vm->_system->unlockScreen();
+	_vm->_system->updateScreen();
+}
+
+void MystGraphics::fadeToBlack() {
+	for (int16 i = 0; i < 256; i += 32) {
+		copyBackBufferToScreenWithSaturation(i);
+	}
+}
+
+void MystGraphics::fadeFromBlack() {
+	for (int16 i = 256; i >= 0; i -= 32) {
+		copyBackBufferToScreenWithSaturation(i);
+	}
+}
+
+} // End of namespace Mohawk
diff --git a/engines/mohawk/myst_graphics.h b/engines/mohawk/myst_graphics.h
new file mode 100644
index 0000000000..e2b02db5fc
--- /dev/null
+++ b/engines/mohawk/myst_graphics.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 MOHAWK_MYST_GRAPHICS_H
+#define MOHAWK_MYST_GRAPHICS_H
+
+#include "mohawk/graphics.h"
+
+#include "common/file.h"
+
+namespace Graphics {
+class JPEG;
+class PictDecoder;
+}
+
+namespace Mohawk {
+
+class MystBitmap;
+class MohawkEngine_Myst;
+
+enum RectState {
+	kRectEnabled,
+	kRectDisabled,
+	kRectUnreachable
+};
+
+class MystGraphics : public GraphicsManager {
+public:
+	MystGraphics(MohawkEngine_Myst*);
+	~MystGraphics();
+
+	void loadExternalPictureFile(uint16 stack);
+	void copyImageSectionToScreen(uint16 image, Common::Rect src, Common::Rect dest);
+	void copyImageSectionToBackBuffer(uint16 image, Common::Rect src, Common::Rect dest);
+	void copyImageToScreen(uint16 image, Common::Rect dest);
+	void copyImageToBackBuffer(uint16 image, Common::Rect dest);
+	void copyBackBufferToScreen(Common::Rect r);
+	void runTransition(uint16 type, Common::Rect rect, uint16 steps, uint16 delay);
+	void drawRect(Common::Rect rect, RectState state);
+	void drawLine(const Common::Point &p1, const Common::Point &p2, uint32 color);
+	void enableDrawingTimeSimulation(bool enable);
+	void fadeToBlack();
+	void fadeFromBlack();
+
+protected:
+	MohawkSurface *decodeImage(uint16 id);
+	MohawkEngine *getVM() { return (MohawkEngine *)_vm; }
+	void simulatePreviousDrawDelay(const Common::Rect &dest);
+	void copyBackBufferToScreenWithSaturation(int16 saturation);
+
+private:
+	MohawkEngine_Myst *_vm;
+	MystBitmap *_bmpDecoder;
+	Graphics::PictDecoder *_pictDecoder;
+	Graphics::JPEG *_jpegDecoder;
+
+	struct PictureFile {
+		uint32 pictureCount;
+		struct PictureEntry {
+			uint32 offset;
+			uint32 size;
+			uint16 id;
+			uint16 type;
+			uint16 width;
+			uint16 height;
+		} *entries;
+
+		Common::File picFile;
+	} _pictureFile;
+
+	Graphics::Surface *_backBuffer;
+	Graphics::PixelFormat _pixelFormat;
+	Common::Rect _viewport;
+
+	int _enableDrawingTimeSimulation;
+	uint32 _nextAllowedDrawTime;
+	static const uint _constantDrawDelay = 10; // ms
+	static const uint _proportionalDrawDelay = 500; // pixels per ms
+};
+
+} // End of namespace Mohawk
+
+#endif
diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp
index ca8e985491..b9353312c7 100644
--- a/engines/mohawk/myst_scripts.cpp
+++ b/engines/mohawk/myst_scripts.cpp
@@ -22,8 +22,8 @@
 
 #include "mohawk/cursors.h"
 #include "mohawk/myst.h"
-#include "mohawk/graphics.h"
 #include "mohawk/myst_areas.h"
+#include "mohawk/myst_graphics.h"
 #include "mohawk/myst_scripts.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
diff --git a/engines/mohawk/myst_stacks/channelwood.cpp b/engines/mohawk/myst_stacks/channelwood.cpp
index 9ca47cc92a..069281f5dc 100644
--- a/engines/mohawk/myst_stacks/channelwood.cpp
+++ b/engines/mohawk/myst_stacks/channelwood.cpp
@@ -22,8 +22,8 @@
 
 #include "mohawk/cursors.h"
 #include "mohawk/myst.h"
-#include "mohawk/graphics.h"
 #include "mohawk/myst_areas.h"
+#include "mohawk/myst_graphics.h"
 #include "mohawk/myst_state.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
diff --git a/engines/mohawk/myst_stacks/credits.cpp b/engines/mohawk/myst_stacks/credits.cpp
index ad593e3542..192e55d5e3 100644
--- a/engines/mohawk/myst_stacks/credits.cpp
+++ b/engines/mohawk/myst_stacks/credits.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "mohawk/myst.h"
-#include "mohawk/graphics.h"
 #include "mohawk/myst_areas.h"
+#include "mohawk/myst_graphics.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
 #include "mohawk/myst_stacks/credits.h"
diff --git a/engines/mohawk/myst_stacks/demo.cpp b/engines/mohawk/myst_stacks/demo.cpp
index fbad7dc384..29a12571fd 100644
--- a/engines/mohawk/myst_stacks/demo.cpp
+++ b/engines/mohawk/myst_stacks/demo.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "mohawk/cursors.h"
-#include "mohawk/graphics.h"
 #include "mohawk/myst.h"
+#include "mohawk/myst_graphics.h"
 #include "mohawk/myst_stacks/demo.h"
 
 #include "common/system.h"
diff --git a/engines/mohawk/myst_stacks/intro.cpp b/engines/mohawk/myst_stacks/intro.cpp
index 7d3179fa24..0af386f51f 100644
--- a/engines/mohawk/myst_stacks/intro.cpp
+++ b/engines/mohawk/myst_stacks/intro.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "mohawk/myst.h"
-#include "mohawk/graphics.h"
 #include "mohawk/myst_areas.h"
+#include "mohawk/myst_graphics.h"
 #include "mohawk/myst_state.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
diff --git a/engines/mohawk/myst_stacks/mechanical.cpp b/engines/mohawk/myst_stacks/mechanical.cpp
index 12d9dc7e2f..79de03308c 100644
--- a/engines/mohawk/myst_stacks/mechanical.cpp
+++ b/engines/mohawk/myst_stacks/mechanical.cpp
@@ -22,8 +22,8 @@
 
 #include "mohawk/cursors.h"
 #include "mohawk/myst.h"
-#include "mohawk/graphics.h"
 #include "mohawk/myst_areas.h"
+#include "mohawk/myst_graphics.h"
 #include "mohawk/myst_state.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index b3222e0322..c1ddc74c82 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -22,8 +22,8 @@
 
 #include "mohawk/cursors.h"
 #include "mohawk/myst.h"
-#include "mohawk/graphics.h"
 #include "mohawk/myst_areas.h"
+#include "mohawk/myst_graphics.h"
 #include "mohawk/myst_state.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
diff --git a/engines/mohawk/myst_stacks/preview.cpp b/engines/mohawk/myst_stacks/preview.cpp
index 31e22bb8c5..0b8dcf897a 100644
--- a/engines/mohawk/myst_stacks/preview.cpp
+++ b/engines/mohawk/myst_stacks/preview.cpp
@@ -22,8 +22,8 @@
 
 #include "mohawk/cursors.h"
 #include "mohawk/myst.h"
-#include "mohawk/graphics.h"
 #include "mohawk/myst_areas.h"
+#include "mohawk/myst_graphics.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
 #include "mohawk/myst_stacks/preview.h"
diff --git a/engines/mohawk/myst_stacks/slides.cpp b/engines/mohawk/myst_stacks/slides.cpp
index 794793e49c..c0bb400db1 100644
--- a/engines/mohawk/myst_stacks/slides.cpp
+++ b/engines/mohawk/myst_stacks/slides.cpp
@@ -22,8 +22,8 @@
 
 #include "mohawk/cursors.h"
 #include "mohawk/myst.h"
-#include "mohawk/graphics.h"
 #include "mohawk/myst_areas.h"
+#include "mohawk/myst_graphics.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
 #include "mohawk/myst_stacks/slides.h"
diff --git a/engines/mohawk/myst_stacks/stoneship.cpp b/engines/mohawk/myst_stacks/stoneship.cpp
index 6d54d0c586..ef228e62f3 100644
--- a/engines/mohawk/myst_stacks/stoneship.cpp
+++ b/engines/mohawk/myst_stacks/stoneship.cpp
@@ -22,8 +22,8 @@
 
 #include "mohawk/cursors.h"
 #include "mohawk/myst.h"
-#include "mohawk/graphics.h"
 #include "mohawk/myst_areas.h"
+#include "mohawk/myst_graphics.h"
 #include "mohawk/myst_state.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 3e2fa4f979..38b38d2c56 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -27,11 +27,11 @@
 #include "common/system.h"
 
 #include "mohawk/cursors.h"
-#include "mohawk/graphics.h"
 #include "mohawk/installer_archive.h"
 #include "mohawk/resource.h"
 #include "mohawk/riven.h"
 #include "mohawk/riven_external.h"
+#include "mohawk/riven_graphics.h"
 #include "mohawk/riven_saveload.h"
 #include "mohawk/dialogs.h"
 #include "mohawk/sound.h"
diff --git a/engines/mohawk/riven_external.cpp b/engines/mohawk/riven_external.cpp
index 9e1365f8da..8dfc74ebf0 100644
--- a/engines/mohawk/riven_external.cpp
+++ b/engines/mohawk/riven_external.cpp
@@ -21,9 +21,9 @@
  */
 
 #include "mohawk/cursors.h"
-#include "mohawk/graphics.h"
 #include "mohawk/riven.h"
 #include "mohawk/riven_external.h"
+#include "mohawk/riven_graphics.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
 
diff --git a/engines/mohawk/riven_graphics.cpp b/engines/mohawk/riven_graphics.cpp
new file mode 100644
index 0000000000..9415e51412
--- /dev/null
+++ b/engines/mohawk/riven_graphics.cpp
@@ -0,0 +1,445 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 "mohawk/resource.h"
+#include "mohawk/riven.h"
+#include "mohawk/riven_graphics.h"
+
+#include "common/system.h"
+#include "engines/util.h"
+
+namespace Mohawk {
+
+RivenGraphics::RivenGraphics(MohawkEngine_Riven* vm) : GraphicsManager(), _vm(vm) {
+	_bitmapDecoder = new MohawkBitmap();
+
+	// Give me the best you've got!
+	initGraphics(608, 436, true, NULL);
+	_pixelFormat = _vm->_system->getScreenFormat();
+
+	if (_pixelFormat.bytesPerPixel == 1)
+		error("Riven requires greater than 256 colors to run");
+
+	// The actual game graphics only take up the first 392 rows. The inventory
+	// occupies the rest of the screen and we don't use the buffer to hold that.
+	_mainScreen = new Graphics::Surface();
+	_mainScreen->create(608, 392, _pixelFormat);
+
+	_updatesEnabled = true;
+	_scheduledTransition = -1;	// no transition
+	_dirtyScreen = false;
+	_inventoryDrawn = false;
+
+	_creditsImage = 302;
+	_creditsPos = 0;
+}
+
+RivenGraphics::~RivenGraphics() {
+	_mainScreen->free();
+	delete _mainScreen;
+	delete _bitmapDecoder;
+}
+
+MohawkSurface *RivenGraphics::decodeImage(uint16 id) {
+	MohawkSurface *surface = _bitmapDecoder->decodeImage(_vm->getResource(ID_TBMP, id));
+	surface->convertToTrueColor();
+	return surface;
+}
+
+void RivenGraphics::copyImageToScreen(uint16 image, uint32 left, uint32 top, uint32 right, uint32 bottom) {
+	Graphics::Surface *surface = findImage(image)->getSurface();
+
+	// Clip the width to fit on the screen. Fixes some images.
+	if (left + surface->w > 608)
+		surface->w = 608 - left;
+
+	for (uint16 i = 0; i < surface->h; i++)
+		memcpy(_mainScreen->getBasePtr(left, i + top), surface->getBasePtr(0, i), surface->w * surface->format.bytesPerPixel);
+
+	_dirtyScreen = true;
+}
+
+void RivenGraphics::drawPLST(uint16 x) {
+	Common::SeekableReadStream* plst = _vm->getResource(ID_PLST, _vm->getCurCard());
+	uint16 recordCount = plst->readUint16BE();
+
+	for (uint16 i = 0; i < recordCount; i++) {
+		uint16 index = plst->readUint16BE();
+		uint16 id = plst->readUint16BE();
+		uint16 left = plst->readUint16BE();
+		uint16 top = plst->readUint16BE();
+		uint16 right = plst->readUint16BE();
+		uint16 bottom = plst->readUint16BE();
+
+		// We are also checking here to make sure we haven't drawn the image yet on screen.
+		// This fixes problems with drawing PLST 1 twice and some other images twice. PLST
+		// 1 is sometimes not called by the scripts, so some cards don't appear if we don't
+		// draw PLST 1 each time. This "hack" is here to catch any PLST attempting to draw
+		// twice. There should never be a problem with doing it this way.
+		if (index == x && !(Common::find(_activatedPLSTs.begin(), _activatedPLSTs.end(), x) != _activatedPLSTs.end())) {
+			debug(0, "Drawing image %d", id);
+			copyImageToScreen(id, left, top, right, bottom);
+			_activatedPLSTs.push_back(x);
+			break;
+		}
+	}
+
+	delete plst;
+}
+
+void RivenGraphics::updateScreen(Common::Rect updateRect) {
+	if (_updatesEnabled) {
+		_vm->runUpdateScreenScript();
+
+		if (_dirtyScreen) {
+			_activatedPLSTs.clear();
+
+			// Copy to screen if there's no transition. Otherwise transition. ;)
+			if (_scheduledTransition < 0)
+				_vm->_system->copyRectToScreen((byte *)_mainScreen->getBasePtr(updateRect.left, updateRect.top), _mainScreen->pitch, updateRect.left, updateRect.top, updateRect.width(), updateRect.height());
+			else
+				runScheduledTransition();
+
+			// Finally, update the screen.
+			_vm->_system->updateScreen();
+			_dirtyScreen = false;
+		}
+	}
+}
+
+void RivenGraphics::scheduleWaterEffect(uint16 sfxeID) {
+	Common::SeekableReadStream *sfxeStream = _vm->getResource(ID_SFXE, sfxeID);
+
+	if (sfxeStream->readUint16BE() != 'SL')
+		error ("Unknown sfxe tag");
+
+	// Read in header info
+	SFXERecord sfxeRecord;
+	sfxeRecord.frameCount = sfxeStream->readUint16BE();
+	uint32 offsetTablePosition = sfxeStream->readUint32BE();
+	sfxeRecord.rect.left = sfxeStream->readUint16BE();
+	sfxeRecord.rect.top = sfxeStream->readUint16BE();
+	sfxeRecord.rect.right = sfxeStream->readUint16BE();
+	sfxeRecord.rect.bottom = sfxeStream->readUint16BE();
+	sfxeRecord.speed = sfxeStream->readUint16BE();
+	// Skip the rest of the fields...
+
+	// Read in offsets
+	sfxeStream->seek(offsetTablePosition);
+	uint32 *frameOffsets = new uint32[sfxeRecord.frameCount];
+	for (uint16 i = 0; i < sfxeRecord.frameCount; i++)
+		frameOffsets[i] = sfxeStream->readUint32BE();
+	sfxeStream->seek(frameOffsets[0]);
+
+	// Read in the scripts
+	for (uint16 i = 0; i < sfxeRecord.frameCount; i++)
+		sfxeRecord.frameScripts.push_back(sfxeStream->readStream((i == sfxeRecord.frameCount - 1) ? sfxeStream->size() - frameOffsets[i] : frameOffsets[i + 1] - frameOffsets[i]));
+
+	// Set it to the first frame
+	sfxeRecord.curFrame = 0;
+	sfxeRecord.lastFrameTime = 0;
+
+	delete[] frameOffsets;
+	delete sfxeStream;
+	_waterEffects.push_back(sfxeRecord);
+}
+
+void RivenGraphics::clearWaterEffects() {
+	_waterEffects.clear();
+}
+
+bool RivenGraphics::runScheduledWaterEffects() {
+	// Don't run the effect if it's disabled
+	if (_vm->_vars["waterenabled"] == 0)
+		return false;
+
+	Graphics::Surface *screen = NULL;
+
+	for (uint16 i = 0; i < _waterEffects.size(); i++) {
+		if (_vm->_system->getMillis() > _waterEffects[i].lastFrameTime + 1000 / _waterEffects[i].speed) {
+			// Lock the screen!
+			if (!screen)
+				screen = _vm->_system->lockScreen();
+
+			// Make sure the script is at the starting point
+			Common::SeekableReadStream *script = _waterEffects[i].frameScripts[_waterEffects[i].curFrame];
+			if (script->pos() != 0)
+				script->seek(0);
+
+			// Run script
+			uint16 curRow = 0;
+			for (uint16 op = script->readUint16BE(); op != 4; op = script->readUint16BE()) {
+				if (op == 1) {        // Increment Row
+					curRow++;
+				} else if (op == 3) { // Copy Pixels
+					uint16 dstLeft = script->readUint16BE();
+					uint16 srcLeft = script->readUint16BE();
+					uint16 srcTop = script->readUint16BE();
+					uint16 rowWidth = script->readUint16BE();
+					memcpy ((byte *)screen->getBasePtr(dstLeft, curRow + _waterEffects[i].rect.top), (byte *)_mainScreen->getBasePtr(srcLeft, srcTop), rowWidth * _pixelFormat.bytesPerPixel);
+				} else if (op != 4) { // End of Script
+					error ("Unknown SFXE opcode %d", op);
+				}
+			}
+
+			// Increment frame
+			_waterEffects[i].curFrame++;
+			if (_waterEffects[i].curFrame == _waterEffects[i].frameCount)
+				_waterEffects[i].curFrame = 0;
+
+			// Set the new time
+			_waterEffects[i].lastFrameTime = _vm->_system->getMillis();
+		}
+	}
+
+	// Unlock the screen if it has been locked and return true to update the screen
+	if (screen) {
+		_vm->_system->unlockScreen();
+		return true;
+	}
+
+	return false;
+}
+
+void RivenGraphics::scheduleTransition(uint16 id, Common::Rect rect) {
+	_scheduledTransition = id;
+	_transitionRect = rect;
+}
+
+void RivenGraphics::runScheduledTransition() {
+	if (_scheduledTransition < 0) // No transition is scheduled
+		return;
+
+	// TODO: There's a lot to be done here...
+
+	// Note: Transitions 0-11 are actual transitions, but none are used in-game.
+	// There's no point in implementing them if they're not used. These extra
+	// transitions were found by hacking scripts.
+
+	switch (_scheduledTransition) {
+	case 0:  // Swipe Left
+	case 1:  // Swipe Right
+	case 2:  // Swipe Up
+	case 3:  // Swipe Down
+	case 12: // Pan Left
+	case 13: // Pan Right
+	case 14: // Pan Up
+	case 15: // Pan Down
+	case 16: // Dissolve
+	case 17: // Dissolve (tspit CARD 155)
+		break;
+	default:
+		if (_scheduledTransition >= 4 && _scheduledTransition <= 11)
+			error("Found unused transition %d", _scheduledTransition);
+		else
+			error("Found unknown transition %d", _scheduledTransition);
+	}
+
+	// For now, just copy the image to screen without doing any transition.
+	_vm->_system->copyRectToScreen((byte *)_mainScreen->pixels, _mainScreen->pitch, 0, 0, _mainScreen->w, _mainScreen->h);
+	_vm->_system->updateScreen();
+
+	_scheduledTransition = -1; // Clear scheduled transition
+}
+
+void RivenGraphics::clearMainScreen() {
+	_mainScreen->fillRect(Common::Rect(0, 0, 608, 392), _pixelFormat.RGBToColor(0, 0, 0));
+}
+
+void RivenGraphics::fadeToBlack() {
+	// The transition speed is forced to best here
+	setTransitionSpeed(kRivenTransitionSpeedBest);
+	scheduleTransition(16);
+	clearMainScreen();
+	runScheduledTransition();
+}
+
+void RivenGraphics::showInventory() {
+	// Don't redraw the inventory
+	if (_inventoryDrawn)
+		return;
+
+	// Clear the inventory area
+	clearInventoryArea();
+
+	// Draw the demo's exit button
+	if (_vm->getFeatures() & GF_DEMO) {
+		// extras.mhk tBMP 101 contains "EXIT" instead of Atrus' journal in the demo!
+		// The demo's extras.mhk contains all the other inventory/marble/credits image
+		// but has hacked tBMP 101 with "EXIT". *sigh*
+		drawInventoryImage(101, g_demoExitRect);
+	} else {
+		// We don't want to show the inventory on setup screens or in other journals.
+		if (_vm->getCurStack() == aspit)
+			return;
+
+		// There are three books and three vars. We have three different
+		// combinations. At the start you have just Atrus' journal. Later,
+		// you get Catherine's journal and the trap book. Near the end,
+		// you lose the trap book and have just the two journals.
+
+		bool hasCathBook = _vm->_vars["acathbook"] != 0;
+		bool hasTrapBook = _vm->_vars["atrapbook"] != 0;
+
+		if (!hasCathBook) {
+			drawInventoryImage(101, g_atrusJournalRect1);
+		} else if (!hasTrapBook) {
+			drawInventoryImage(101, g_atrusJournalRect2);
+			drawInventoryImage(102, g_cathJournalRect2);
+		} else {
+			drawInventoryImage(101, g_atrusJournalRect3);
+			drawInventoryImage(102, g_cathJournalRect3);
+			drawInventoryImage(100, g_trapBookRect3);
+		}
+	}
+
+	_vm->_system->updateScreen();
+	_inventoryDrawn = true;
+}
+
+void RivenGraphics::hideInventory() {
+	// Don't hide the inventory twice
+	if (!_inventoryDrawn)
+		return;
+
+	// Clear the area
+	clearInventoryArea();
+
+	_inventoryDrawn = false;
+}
+
+void RivenGraphics::clearInventoryArea() {
+	// Clear the inventory area
+	static const Common::Rect inventoryRect = Common::Rect(0, 392, 608, 436);
+
+	// Lock the screen
+	Graphics::Surface *screen = _vm->_system->lockScreen();
+
+	// Fill the inventory area with black
+	screen->fillRect(inventoryRect, _pixelFormat.RGBToColor(0, 0, 0));
+
+	_vm->_system->unlockScreen();
+}
+
+void RivenGraphics::drawInventoryImage(uint16 id, const Common::Rect *rect) {
+	MohawkSurface *mhkSurface = _bitmapDecoder->decodeImage(_vm->getExtrasResource(ID_TBMP, id));
+	mhkSurface->convertToTrueColor();
+	Graphics::Surface *surface = mhkSurface->getSurface();
+
+	_vm->_system->copyRectToScreen((byte *)surface->pixels, surface->pitch, rect->left, rect->top, surface->w, surface->h);
+
+	delete mhkSurface;
+}
+
+void RivenGraphics::drawRect(Common::Rect rect, bool active) {
+	// Useful with debugging. Shows where hotspots are on the screen and whether or not they're active.
+	Graphics::Surface *screen = _vm->_system->lockScreen();
+
+	if (active)
+		screen->frameRect(rect, _pixelFormat.RGBToColor(0, 255, 0));
+	else
+		screen->frameRect(rect, _pixelFormat.RGBToColor(255, 0, 0));
+
+	_vm->_system->unlockScreen();
+}
+
+void RivenGraphics::drawImageRect(uint16 id, Common::Rect srcRect, Common::Rect dstRect) {
+	// Draw tBMP id from srcRect to dstRect
+	Graphics::Surface *surface = findImage(id)->getSurface();
+
+	assert(srcRect.width() == dstRect.width() && srcRect.height() == dstRect.height());
+
+	for (uint16 i = 0; i < srcRect.height(); i++)
+		memcpy(_mainScreen->getBasePtr(dstRect.left, i + dstRect.top), surface->getBasePtr(srcRect.left, i + srcRect.top), srcRect.width() * surface->format.bytesPerPixel);
+
+	_dirtyScreen = true;
+}
+
+void RivenGraphics::drawExtrasImage(uint16 id, Common::Rect dstRect) {
+	MohawkSurface *mhkSurface = _bitmapDecoder->decodeImage(_vm->getExtrasResource(ID_TBMP, id));
+	mhkSurface->convertToTrueColor();
+	Graphics::Surface *surface = mhkSurface->getSurface();
+
+	assert(dstRect.width() == surface->w);
+
+	for (uint16 i = 0; i < surface->h; i++)
+		memcpy(_mainScreen->getBasePtr(dstRect.left, i + dstRect.top), surface->getBasePtr(0, i), surface->pitch);
+
+	delete mhkSurface;
+	_dirtyScreen = true;
+}
+
+void RivenGraphics::beginCredits() {
+	// Clear the old cache
+	clearCache();
+
+	// Now cache all the credits images
+	for (uint16 i = 302; i <= 320; i++) {
+		MohawkSurface *surface = _bitmapDecoder->decodeImage(_vm->getExtrasResource(ID_TBMP, i));
+		surface->convertToTrueColor();
+		addImageToCache(i, surface);
+	}
+
+	// And clear our screen too
+	clearMainScreen();
+}
+
+void RivenGraphics::updateCredits() {
+	if ((_creditsImage == 303 || _creditsImage == 304) && _creditsPos == 0)
+		fadeToBlack();
+
+	if (_creditsImage < 304) {
+		// For the first two credit images, they are faded from black to the image and then out again
+		scheduleTransition(16);
+
+		Graphics::Surface *frame = findImage(_creditsImage++)->getSurface();
+
+		for (int y = 0; y < frame->h; y++)
+			memcpy(_mainScreen->getBasePtr(124, y), frame->getBasePtr(0, y), frame->pitch);
+
+		runScheduledTransition();
+	} else {
+		// Otheriwse, we're scrolling
+		// Move the screen up one row
+		memmove(_mainScreen->pixels, _mainScreen->getBasePtr(0, 1), _mainScreen->pitch * (_mainScreen->h - 1));
+
+		// Only update as long as we're not before the last frame
+		// Otherwise, we're just moving up a row (which we already did)
+		if (_creditsImage <= 320) {
+			// Copy the next row to the bottom of the screen
+			Graphics::Surface *frame = findImage(_creditsImage)->getSurface();
+			memcpy(_mainScreen->getBasePtr(124, _mainScreen->h - 1), frame->getBasePtr(0, _creditsPos), frame->pitch);
+			_creditsPos++;
+
+			if (_creditsPos == _mainScreen->h) {
+				_creditsImage++;
+				_creditsPos = 0;
+			}
+		}
+
+		// Now flush the new screen
+		_vm->_system->copyRectToScreen((byte *)_mainScreen->pixels, _mainScreen->pitch, 0, 0, _mainScreen->w, _mainScreen->h);
+		_vm->_system->updateScreen();
+	}
+}
+
+} // End of namespace Mohawk
diff --git a/engines/mohawk/riven_graphics.h b/engines/mohawk/riven_graphics.h
new file mode 100644
index 0000000000..48dda28afd
--- /dev/null
+++ b/engines/mohawk/riven_graphics.h
@@ -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.
+ *
+ */
+
+#ifndef MOHAWK_RIVEN_GRAPHICS_H
+#define MOHAWK_RIVEN_GRAPHICS_H
+
+#include "mohawk/graphics.h"
+
+namespace Mohawk {
+
+class MohawkEngine_Riven;
+
+class RivenGraphics : public GraphicsManager {
+public:
+	RivenGraphics(MohawkEngine_Riven *vm);
+	~RivenGraphics();
+
+	void copyImageToScreen(uint16, uint32, uint32, uint32, uint32);
+	void updateScreen(Common::Rect updateRect = Common::Rect(0, 0, 608, 392));
+	bool _updatesEnabled;
+	Common::Array<uint16> _activatedPLSTs;
+	void drawPLST(uint16 x);
+	void drawRect(Common::Rect rect, bool active);
+	void drawImageRect(uint16 id, Common::Rect srcRect, Common::Rect dstRect);
+	void drawExtrasImage(uint16 id, Common::Rect dstRect);
+
+	// Water Effect
+	void scheduleWaterEffect(uint16);
+	void clearWaterEffects();
+	bool runScheduledWaterEffects();
+
+	// Transitions
+	void scheduleTransition(uint16 id, Common::Rect rect = Common::Rect(0, 0, 608, 392));
+	void runScheduledTransition();
+	void fadeToBlack();
+	void setTransitionSpeed(uint32 speed) { _transitionSpeed = speed; }
+
+	// Inventory
+	void showInventory();
+	void hideInventory();
+
+	// Credits
+	void beginCredits();
+	void updateCredits();
+	uint getCurCreditsImage() { return _creditsImage; }
+
+protected:
+	MohawkSurface *decodeImage(uint16 id);
+	MohawkEngine *getVM() { return (MohawkEngine *)_vm; }
+
+private:
+	MohawkEngine_Riven *_vm;
+	MohawkBitmap *_bitmapDecoder;
+
+	// Water Effects
+	struct SFXERecord {
+		// Record values
+		uint16 frameCount;
+		Common::Rect rect;
+		uint16 speed;
+		Common::Array<Common::SeekableReadStream *> frameScripts;
+
+		// Cur frame
+		uint16 curFrame;
+		uint32 lastFrameTime;
+	};
+	Common::Array<SFXERecord> _waterEffects;
+
+	// Transitions
+	int16 _scheduledTransition;
+	Common::Rect _transitionRect;
+	uint32 _transitionSpeed;
+
+	// Inventory
+	void clearInventoryArea();
+	void drawInventoryImage(uint16 id, const Common::Rect *rect);
+	bool _inventoryDrawn;
+
+	// Screen Related
+	Graphics::Surface *_mainScreen;
+	bool _dirtyScreen;
+	Graphics::PixelFormat _pixelFormat;
+	void clearMainScreen();
+
+	// Credits
+	uint _creditsImage, _creditsPos;
+};
+
+} // End of namespace Mohawk
+
+#endif
diff --git a/engines/mohawk/riven_scripts.cpp b/engines/mohawk/riven_scripts.cpp
index 6e3e9a34dc..352a018990 100644
--- a/engines/mohawk/riven_scripts.cpp
+++ b/engines/mohawk/riven_scripts.cpp
@@ -21,9 +21,9 @@
  */
 
 #include "mohawk/cursors.h"
-#include "mohawk/graphics.h"
 #include "mohawk/riven.h"
 #include "mohawk/riven_external.h"
+#include "mohawk/riven_graphics.h"
 #include "mohawk/riven_scripts.h"
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
diff --git a/engines/mohawk/riven_scripts.h b/engines/mohawk/riven_scripts.h
index a871f0afa0..6df4a2e523 100644
--- a/engines/mohawk/riven_scripts.h
+++ b/engines/mohawk/riven_scripts.h
@@ -27,8 +27,6 @@
 #include "common/ptr.h"
 #include "common/textconsole.h"
 
-class MohawkEngine_Riven;
-
 #define DECLARE_OPCODE(x) void x(uint16 op, uint16 argc, uint16 *argv)
 
 namespace Mohawk {
@@ -50,6 +48,7 @@ enum {
 	kStoredOpcodeScript // This is ScummVM-only to denote the script from a storeMovieOpcode() call
 };
 
+class MohawkEngine_Riven;
 class RivenScript;
 
 class RivenScript {
-- 
cgit v1.2.3


From 48efab4e5abd8954b7167074b46ff078f6e0d7f4 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 11 Mar 2012 00:51:20 +0100
Subject: COMMON: Rename SafeSubReadStream to SafeSeekableSubReadStream.

It actually inherits from SeekableSubReadStream, so it should be named
accordingly.
---
 engines/gob/dataio.cpp   | 2 +-
 engines/sword2/music.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/dataio.cpp b/engines/gob/dataio.cpp
index 1633a1edb7..2071c0f1be 100644
--- a/engines/gob/dataio.cpp
+++ b/engines/gob/dataio.cpp
@@ -414,7 +414,7 @@ Common::SeekableReadStream *DataIO::getFile(File &file) {
 		return 0;
 
 	Common::SeekableReadStream *rawData =
-		new Common::SafeSubReadStream(&file.archive->file, file.offset, file.offset + file.size);
+		new Common::SafeSeekableSubReadStream(&file.archive->file, file.offset, file.offset + file.size);
 
 	if (file.compression == 0)
 		return rawData;
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index 40a4021a5c..62fb3d244d 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -160,19 +160,19 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base,
 			return makeCLUStream(&fh->file, enc_len);
 #ifdef USE_MAD
 	case kMP3Mode: {
-		Common::SafeSubReadStream *tmp = new Common::SafeSubReadStream(&fh->file, pos, pos + enc_len);
+		Common::SafeSeekableSubReadStream *tmp = new Common::SafeSeekableSubReadStream(&fh->file, pos, pos + enc_len);
 		return Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
 		}
 #endif
 #ifdef USE_VORBIS
 	case kVorbisMode: {
-		Common::SafeSubReadStream *tmp = new Common::SafeSubReadStream(&fh->file, pos, pos + enc_len);
+		Common::SafeSeekableSubReadStream *tmp = new Common::SafeSeekableSubReadStream(&fh->file, pos, pos + enc_len);
 		return Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
 		}
 #endif
 #ifdef USE_FLAC
 	case kFLACMode: {
-		Common::SafeSubReadStream *tmp = new Common::SafeSubReadStream(&fh->file, pos, pos + enc_len);
+		Common::SafeSeekableSubReadStream *tmp = new Common::SafeSeekableSubReadStream(&fh->file, pos, pos + enc_len);
 		return Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
 		}
 #endif
-- 
cgit v1.2.3


From d652719ea656f3c8de9f9f557efdd65f9d352999 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sun, 11 Mar 2012 09:43:20 +0100
Subject: SCUMM: Several detection fixes for mostly dutch HES games/demos

---
 engines/scumm/detection_tables.h | 18 +++++++++++-------
 engines/scumm/scumm-md5.h        |  7 ++++---
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 22708de2d3..5b222a51b6 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -552,7 +552,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "freddicove", "freddicove", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "freddicove", "FreddiCCC", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "freddicove", "FreddiCove", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
-	{ "freddicove", "FreddiDZZ", kGenHEPC, Common::NL_NLD, UNK, 0 },
+	{ "freddicove", "FreddiDZZ", kGenHEPC, Common::NL_NLD, Common::kPlatformWindows, 0 },
 	{ "freddicove", "FreddiDZZ", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 	{ "freddicove", "FreddiMML", kGenHEPC, Common::FR_FRA, UNK, 0 },
 	{ "freddicove", "FreddiMML", kGenHEMac, Common::FR_FRA, Common::kPlatformMacintosh, 0 },
@@ -597,6 +597,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 
 	{ "balloon", "balloon", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "balloon", "Balloon-O-Rama", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
+	{ "balloon", "Ballon-O-Rama", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 
 	{ "baseball", "baseball", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "baseball", "BaseBall", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
@@ -649,6 +650,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "freddi", "freddi", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "freddi", "Freddi", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "freddi", "Freddi1", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "freddi", "Freddemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "freddi", "freddemo", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "freddi", "Freddi Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "freddi", "Freddi Fish", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
@@ -659,6 +661,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "freddi", "MM-DEMO", kGenHEPC, UNK_LANG, UNK, 0 },
 
 	{ "freddi2", "freddi2", kGenHEPC, UNK_LANG, UNK, 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 },
 	{ "freddi2", "FFHSDemo", kGenHEPC, UNK_LANG, UNK, 0 },
@@ -731,7 +734,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "pajama", "Pyjama Pit", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 },
 	{ "pajama", "Pajama Sam", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "pajama", "PajamaNHD", kGenHEPC, UNK_LANG, UNK, 0 },
-	{ "pajama", "PJS-DEMO", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "pajama", "PJS-DEMO", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "pajama", "PJS-DEMO", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "pajama", "pjsam", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "pajama", "PjSamDemo", kGenHEPC, UNK_LANG, UNK, 0 },
@@ -741,7 +744,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "pajama", "sampyjam", kGenHEPC, Common::FR_FRA, UNK, 0 },
 	{ "pajama", "SamPyjam", kGenHEMac, Common::FR_FRA, Common::kPlatformMacintosh, 0 },
 
-	{ "pajama2", "pajama2", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "pajama2", "pajama2", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "pajama2", "Pajama2", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 	{ "pajama2", "pyjam2", kGenHEPC, Common::FR_FRA, UNK, 0 },
 	{ "pajama2", "Pajama Sam 2", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
@@ -812,13 +815,13 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "PuttsFunShop", "PuttsFunShop", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "PuttsFunShop", "Putt's FunShop", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 
-	{ "putttime", "putttime", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "putttime", "putttime", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "putttime", "PuttTime", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "putttime", "pouce", kGenHEPC, Common::FR_FRA, UNK, 0 },
 	{ "putttime", "Pouce-Pouce", kGenHEMac, Common::FR_FRA, Common::kPlatformMacintosh, 0 },
 	{ "putttime", "PuttPuttTTT", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "putttime", "PuttPuttTTT", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
-	{ "putttime", "PuttTijd", kGenHEPC, Common::NL_NLD, UNK, 0 },
+	{ "putttime", "PuttTijd", kGenHEPC, Common::NL_NLD, Common::kPlatformWindows, 0 },
 	{ "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 },
@@ -844,6 +847,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "puttzoo", "T\xD6""FFZOO", kGenHEPC, Common::DE_DEU, UNK, 0 },	// Windows encoding
 	{ "puttzoo", "T\xC3\xB6""ff-T\xC3\xB6""ff\xE2\x84\xA2 Zoo Demo", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 },	// UTF-8 encoding
 	{ "puttzoo", "T\xF6""ff-T""\xF6""ff\x99 Zoo Demo", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 },	// Windows encoding
+	{ "puttzoo", "Zoodemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "puttzoo", "zoodemo", kGenHEPC, UNK_LANG, UNK, 0 },
 	{ "puttzoo", "Zoo Demo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "puttzoo", "Putt-Putt Saves the Zoo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
@@ -860,11 +864,11 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "socks", "SokkenSoep", kGenHEPC, Common::NL_NLD, UNK, 0 },
 	{ "socks", "SokkenSoep", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
 
-	{ "spyfox", "spyfox", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "spyfox", "spyfox", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "spyfox", "Fuchsdem", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 },
 	{ "spyfox", "FUCHSDEM", kGenHEPC, Common::DE_DEU, UNK, 0 },
 	{ "spyfox", "FoxDemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
-	{ "spyfox", "foxdemo", kGenHEPC, UNK_LANG, UNK, 0 },
+	{ "spyfox", "foxdemo", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "spyfox", "JAMESDEM", kGenHEPC, Common::FR_FRA, UNK, 0 },
 	{ "spyfox", "renard", kGenHEPC, Common::FR_FRA, UNK, 0 },
 	{ "spyfox", "Spydemo", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index f7f7678a9f..6b6fc23f39 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 Feb 22 19:57:16 2012
+  This file was generated by the md5table tool on Sun Mar 11 08:35:02 2012
   DO NOT EDIT MANUALLY!
  */
 
@@ -110,7 +110,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::ES_ESP, Common::kPlatformWindows },
+	{ "2232b0b9411575b1f9961713ebc9de61", "balloon", "HE 80", "", -1, Common::UNK_LANG, 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 },
@@ -229,7 +229,7 @@ static const MD5Table md5table[] = {
 	{ "50b831f11b8c4b83784cf81f4dcc69ea", "spyfox", "HE 100", "", -1, Common::EN_ANY, Common::kPlatformWii },
 	{ "50fcdc982a25063b78ad46bf389b8e8d", "tentacle", "Floppy", "Floppy", -1, Common::IT_ITA, Common::kPlatformPC },
 	{ "51305e929e330e24a75a0351c8f9975e", "freddi2", "HE 99", "Updated", -1, Common::EN_USA, Common::kPlatformUnknown },
-	{ "513f91a9dbe8d5490b39e56a3ac5bbdf", "pajama2", "HE 98.5", "", -1, Common::NL_NLD, Common::kPlatformMacintosh },
+	{ "513f91a9dbe8d5490b39e56a3ac5bbdf", "pajama2", "HE 98.5", "", -1, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "5262a27afcaee04e5c4900220bd463e7", "PuttsFunShop", "", "", -1, Common::EN_USA, Common::kPlatformUnknown },
 	{ "52a4bae0746a11d7b1e8554e91a6645c", "zak", "V2", "V2", -1, Common::FR_FRA, Common::kPlatformPC },
 	{ "53e94115b55dd51d4b8ff0871aa1df1e", "spyfox", "", "Demo", 20103, Common::EN_ANY, Common::kPlatformUnknown },
@@ -439,6 +439,7 @@ static const MD5Table md5table[] = {
 	{ "a336134914eaab4892d35625aa15ad1d", "freddi4", "HE 99", "", -1, Common::RU_RUS, Common::kPlatformWindows },
 	{ "a525c1753c1db5011c00417da37887ef", "PuttTime", "HE 100", "Updated", -1, Common::EN_USA, Common::kPlatformUnknown },
 	{ "a561d2e2413cc1c71d5a1bf87bf493ea", "lost", "HE 100", "Updated", -1, Common::EN_USA, Common::kPlatformUnknown },
+	{ "a56a05c6b865b9956639f8c51269e5ab", "balloon", "HE 80", "", -1, Common::NL_NLD, Common::kPlatformMacintosh },
 	{ "a56e8d9d4281c53c3f63c9bd22a59e21", "catalog", "HE CUP", "Preview", 10978342, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "a570381b028972d891052ee1e51dc011", "maniac", "V2", "V2", 1988, Common::EN_ANY, Common::kPlatformAtariST },
 	{ "a59a438cb182124c30c4447d8ed469e9", "freddi", "HE 100", "", 34837, Common::NB_NOR, Common::kPlatformWii },
-- 
cgit v1.2.3


From f57e7e959ae0f52bd1b91cded2bf917d0d384fa4 Mon Sep 17 00:00:00 2001
From: Ben Castricum
Date: Sun, 11 Mar 2012 09:43:43 +0100
Subject: SCUMM: Fix duplicate MD5 warning

---
 engines/scumm/scumm-md5.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 6b6fc23f39..2344bc0497 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 Mar 11 08:35:02 2012
+  This file was generated by the md5table tool on Sun Mar 11 08:36:15 2012
   DO NOT EDIT MANUALLY!
  */
 
@@ -163,8 +163,7 @@ static const MD5Table md5table[] = {
 	{ "387a544b8b10b26912d8413bab63a853", "monkey2", "", "Demo", -1, Common::EN_ANY, Common::kPlatformPC },
 	{ "3938ee1aa4433fca9d9308c9891172b1", "indyzak", "FM-TOWNS", "Demo", 7520, Common::EN_ANY, Common::kPlatformFMTowns },
 	{ "399b217b0c8d65d0398076da486363a9", "indy3", "VGA", "VGA", 6295, Common::DE_DEU, Common::kPlatformPC },
-	{ "39cb9dec16fa16f38d79acd80effb059", "loom", "EGA", "EGA", -1, Common::FR_FRA, Common::kPlatformAmiga },
-	{ "39cb9dec16fa16f38d79acd80effb059", "loom", "EGA", "EGA", -1, Common::IT_ITA, Common::kPlatformAmiga },
+	{ "39cb9dec16fa16f38d79acd80effb059", "loom", "EGA", "EGA", -1, Common::UNK_LANG, Common::kPlatformAmiga },
 	{ "39fd6db10d0222d817025c4d3346e3b4", "farm", "", "Demo", -1, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "3a03dab514e4038df192d8a8de469788", "atlantis", "Floppy", "Floppy", -1, Common::EN_ANY, Common::kPlatformAmiga },
 	{ "3a0c35f3c147b98a2bdf8d400cfc4ab5", "indy3", "FM-TOWNS", "", -1, Common::JA_JPN, Common::kPlatformFMTowns },
-- 
cgit v1.2.3


From 17e3bfd42c4c66b9bd3ac199f63b8c20c63e8517 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sun, 11 Mar 2012 18:31:39 +0100
Subject: GOB: Add a class for CMP sprites with RXY coordinates

---
 engines/gob/cmpfile.cpp | 233 ++++++++++++++++++++++++++++++++++++++++++++++++
 engines/gob/cmpfile.h   |  96 ++++++++++++++++++++
 engines/gob/module.mk   |   1 +
 engines/gob/rxyfile.cpp |   9 ++
 engines/gob/rxyfile.h   |   1 +
 5 files changed, 340 insertions(+)
 create mode 100644 engines/gob/cmpfile.cpp
 create mode 100644 engines/gob/cmpfile.h

(limited to 'engines')

diff --git a/engines/gob/cmpfile.cpp b/engines/gob/cmpfile.cpp
new file mode 100644
index 0000000000..62ac9f3fa4
--- /dev/null
+++ b/engines/gob/cmpfile.cpp
@@ -0,0 +1,233 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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/stream.h"
+#include "common/str.h"
+
+#include "gob/gob.h"
+#include "gob/util.h"
+#include "gob/surface.h"
+#include "gob/video.h"
+#include "gob/dataio.h"
+#include "gob/rxyfile.h"
+#include "gob/cmpfile.h"
+
+namespace Gob {
+
+CMPFile::CMPFile(GobEngine *vm, const Common::String &baseName,
+                 uint16 width, uint16 height, uint8 bpp) :
+	_vm(vm), _width(width), _height(height), _bpp(bpp), _maxWidth(0), _maxHeight(0),
+	_surface(0), _coordinates(0) {
+
+	if (baseName.empty())
+		return;
+
+	const Common::String rxyFile = Util::setExtension(baseName, ".RXY");
+	const Common::String cmpFile = Util::setExtension(baseName, ".CMP");
+
+	if (!_vm->_dataIO->hasFile(cmpFile))
+		return;
+
+	loadRXY(rxyFile);
+	createSurface();
+
+	loadCMP(cmpFile);
+}
+
+CMPFile::CMPFile(GobEngine *vm, const Common::String &cmpFile, const Common::String &rxyFile,
+                 uint16 width, uint16 height, uint8 bpp) :
+	_vm(vm), _width(width), _height(height), _bpp(bpp), _maxWidth(0), _maxHeight(0),
+	_surface(0), _coordinates(0) {
+
+	if (cmpFile.empty() || !_vm->_dataIO->hasFile(cmpFile))
+		return;
+
+	loadRXY(rxyFile);
+	createSurface();
+
+	loadCMP(cmpFile);
+}
+
+CMPFile::CMPFile(GobEngine *vm, Common::SeekableReadStream &cmp, Common::SeekableReadStream &rxy,
+                 uint16 width, uint16 height, uint8 bpp) :
+	_vm(vm), _width(width), _height(height), _bpp(bpp), _maxWidth(0), _maxHeight(0),
+	_surface(0), _coordinates(0) {
+
+	loadRXY(rxy);
+	createSurface();
+
+	loadCMP(cmp);
+}
+
+CMPFile::CMPFile(GobEngine *vm, Common::SeekableReadStream &cmp,
+                 uint16 width, uint16 height, uint8 bpp) :
+	_vm(vm), _width(width), _height(height), _bpp(bpp), _maxWidth(0), _maxHeight(0),
+	_surface(0), _coordinates(0) {
+
+	createRXY();
+	createSurface();
+
+	loadCMP(cmp);
+}
+
+CMPFile::~CMPFile() {
+	delete _surface;
+	delete _coordinates;
+}
+
+bool CMPFile::empty() const {
+	return (_surface == 0) || (_coordinates == 0);
+}
+
+uint16 CMPFile::getSpriteCount() const {
+	if (empty())
+		return 0;
+
+	return _coordinates->size();
+}
+
+void CMPFile::loadCMP(const Common::String &cmp) {
+	Common::SeekableReadStream *dataCMP = _vm->_dataIO->getFile(cmp);
+	if (!dataCMP)
+		return;
+
+	loadCMP(*dataCMP);
+
+	delete dataCMP;
+}
+
+void CMPFile::loadRXY(const Common::String &rxy) {
+	Common::SeekableReadStream *dataRXY = 0;
+	if (!rxy.empty())
+		dataRXY = _vm->_dataIO->getFile(rxy);
+
+	if (dataRXY)
+		loadRXY(*dataRXY);
+	else
+		createRXY();
+
+	_height = _coordinates->getHeight();
+
+	delete dataRXY;
+}
+
+void CMPFile::loadCMP(Common::SeekableReadStream &cmp) {
+	uint32 size = cmp.size();
+	byte  *data = new byte[size];
+
+	if (cmp.read(data, size) != size)
+		return;
+
+	_vm->_video->drawPackedSprite(data, _surface->getWidth(), _surface->getHeight(), 0, 0, 0, *_surface);
+
+	delete[] data;
+}
+
+void CMPFile::loadRXY(Common::SeekableReadStream &rxy) {
+	_coordinates = new RXYFile(rxy);
+
+	for (uint i = 0; i < _coordinates->size(); i++) {
+		const RXYFile::Coordinates &c = (*_coordinates)[i];
+
+		if (c.left == 0xFFFF)
+			continue;
+
+		const uint16 width  = c.right  - c.left + 1;
+		const uint16 height = c.bottom - c.top  + 1;
+
+		_maxWidth  = MAX(_maxWidth , width);
+		_maxHeight = MAX(_maxHeight, height);
+	}
+}
+
+void CMPFile::createRXY() {
+	_coordinates = new RXYFile(_width, _height);
+
+	_maxWidth  = _width;
+	_maxHeight = _height;
+}
+
+void CMPFile::createSurface() {
+	if (_width == 0)
+		_width = 320;
+	if (_height == 0)
+		_height = 200;
+
+	_surface = new Surface(_width, _height, _bpp);
+}
+
+bool CMPFile::getCoordinates(uint16 sprite, uint16 &left, uint16 &top, uint16 &right, uint16 &bottom) const {
+	if (empty() || (sprite >= _coordinates->size()))
+		return false;
+
+	left   = (*_coordinates)[sprite].left;
+	top    = (*_coordinates)[sprite].top;
+	right  = (*_coordinates)[sprite].right;
+	bottom = (*_coordinates)[sprite].bottom;
+
+	return left != 0xFFFF;
+}
+
+uint16 CMPFile::getWidth(uint16 sprite) const {
+	if (empty() || (sprite >= _coordinates->size()))
+		return 0;
+
+	return (*_coordinates)[sprite].right  - (*_coordinates)[sprite].left + 1;
+}
+
+uint16 CMPFile::getHeight(uint16 sprite) const {
+	if (empty() || (sprite >= _coordinates->size()))
+		return 0;
+
+	return (*_coordinates)[sprite].bottom - (*_coordinates)[sprite].top  + 1;
+}
+
+void CMPFile::getMaxSize(uint16 &width, uint16 &height) const {
+	width  = _maxWidth;
+	height = _maxHeight;
+}
+
+void CMPFile::draw(Surface &dest, uint16 sprite, uint16 x, uint16 y, int32 transp) const {
+	if (empty())
+		return;
+
+	if (sprite >= _coordinates->size())
+		return;
+
+	const RXYFile::Coordinates &coords = (*_coordinates)[sprite];
+
+	draw(dest, coords.left, coords.top, coords.right, coords.bottom, x, y, transp);
+}
+
+void CMPFile::draw(Surface &dest, uint16 left, uint16 top, uint16 right, uint16 bottom,
+                   uint16 x, uint16 y, int32 transp) const {
+
+	if (!_surface)
+		return;
+
+	if (left == 0xFFFF)
+		return;
+
+	dest.blit(*_surface, left, top, right, bottom, x, y, transp);
+}
+
+} // End of namespace Gob
diff --git a/engines/gob/cmpfile.h b/engines/gob/cmpfile.h
new file mode 100644
index 0000000000..d409e15161
--- /dev/null
+++ b/engines/gob/cmpfile.h
@@ -0,0 +1,96 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public 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 GOB_CMPFILE_H
+#define GOB_CMPFILE_H
+
+#include "common/system.h"
+#include "common/array.h"
+
+namespace Common {
+	class String;
+	class SeekableReadStream;
+}
+
+namespace Gob {
+
+class GobEngine;
+class Surface;
+class RXYFile;
+
+/** A CMP file, containing a sprite.
+ *
+ *  Used in hardcoded "actiony" parts of gob games.
+ */
+class CMPFile {
+public:
+	CMPFile(GobEngine *vm, const Common::String &baseName,
+	        uint16 width, uint16 height, uint8 bpp = 1);
+	CMPFile(GobEngine *vm, const Common::String &cmpFile, const Common::String &rxyFile,
+	        uint16 width, uint16 height, uint8 bpp = 1);
+	CMPFile(GobEngine *vm, Common::SeekableReadStream &cmp, Common::SeekableReadStream &rxy,
+	        uint16 width, uint16 height, uint8 bpp = 1);
+	CMPFile(GobEngine *vm, Common::SeekableReadStream &cmp,
+	        uint16 width, uint16 height, uint8 bpp = 1);
+	~CMPFile();
+
+	bool empty() const;
+
+	uint16 getSpriteCount() const;
+
+	bool getCoordinates(uint16 sprite, uint16 &left, uint16 &top, uint16 &right, uint16 &bottom) const;
+
+	uint16 getWidth (uint16 sprite) const;
+	uint16 getHeight(uint16 sprite) const;
+
+	void getMaxSize(uint16 &width, uint16 &height) const;
+
+	void draw(Surface &dest, uint16 sprite, uint16 x, uint16 y, int32 transp = -1) const;
+	void draw(Surface &dest, uint16 left, uint16 top, uint16 right, uint16 bottom,
+	          uint16 x, uint16 y, int32 transp = -1) const;
+
+private:
+	GobEngine *_vm;
+
+	uint16 _width;
+	uint16 _height;
+	uint16 _bpp;
+
+	uint16 _maxWidth;
+	uint16 _maxHeight;
+
+	Surface *_surface;
+	RXYFile *_coordinates;
+
+	void loadCMP(const Common::String &cmp);
+	void loadRXY(const Common::String &rxy);
+
+	void loadCMP(Common::SeekableReadStream &cmp);
+	void loadRXY(Common::SeekableReadStream &rxy);
+
+	void createRXY();
+	void createSurface();
+};
+
+} // End of namespace Gob
+
+#endif // GOB_CMPFILE_H
diff --git a/engines/gob/module.mk b/engines/gob/module.mk
index 1c83b4ae40..9da5a82de2 100644
--- a/engines/gob/module.mk
+++ b/engines/gob/module.mk
@@ -5,6 +5,7 @@ MODULE_OBJS := \
 	aniobject.o \
 	cheater.o \
 	cheater_geisha.o \
+	cmpfile.o \
 	console.o \
 	dataio.o \
 	databases.o \
diff --git a/engines/gob/rxyfile.cpp b/engines/gob/rxyfile.cpp
index 5311eece0f..06a07bdc9c 100644
--- a/engines/gob/rxyfile.cpp
+++ b/engines/gob/rxyfile.cpp
@@ -30,6 +30,15 @@ RXYFile::RXYFile(Common::SeekableReadStream &rxy) : _width(0), _height(0) {
 	load(rxy);
 }
 
+RXYFile::RXYFile(uint16 width, uint16 height) : _realCount(1), _width(width), _height(height) {
+	_coords.resize(1);
+
+	_coords[0].left   = 0;
+	_coords[0].top    = 0;
+	_coords[0].right  = _width  - 1;
+	_coords[0].bottom = _height - 1;
+}
+
 RXYFile::~RXYFile() {
 }
 
diff --git a/engines/gob/rxyfile.h b/engines/gob/rxyfile.h
index 828f8b73c7..3b4d3de636 100644
--- a/engines/gob/rxyfile.h
+++ b/engines/gob/rxyfile.h
@@ -46,6 +46,7 @@ public:
 	};
 
 	RXYFile(Common::SeekableReadStream &rxy);
+	RXYFile(uint16 width, uint16 height);
 	~RXYFile();
 
 	uint size() const;
-- 
cgit v1.2.3


From b928d6dcb1749a140bf26d23211bfae6f4585ba3 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sun, 11 Mar 2012 18:32:51 +0100
Subject: GOB: Use the CMPFile class in DECFile

---
 engines/gob/decfile.cpp | 76 ++++++++++++-------------------------------------
 engines/gob/decfile.h   | 20 ++++---------
 2 files changed, 23 insertions(+), 73 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/decfile.cpp b/engines/gob/decfile.cpp
index f5910f0654..fb67c52627 100644
--- a/engines/gob/decfile.cpp
+++ b/engines/gob/decfile.cpp
@@ -29,25 +29,14 @@
 #include "gob/dataio.h"
 #include "gob/surface.h"
 #include "gob/video.h"
-#include "gob/rxyfile.h"
+#include "gob/cmpfile.h"
 #include "gob/decfile.h"
 
 namespace Gob {
 
-DECFile::Layer::Layer() : surface(0), coordinates(0) {
-}
-
-DECFile::Layer::~Layer() {
-	delete coordinates;
-	delete surface;
-}
-
-
 DECFile::DECFile(GobEngine *vm, const Common::String &fileName,
                  uint16 width, uint16 height, uint8 bpp) : _vm(vm),
-	_width(width), _height(height), _bpp(bpp), _hasPadding(false) {
-
-	_backdrop = new Surface(_width, _height, _bpp);
+	_width(width), _height(height), _bpp(bpp), _hasPadding(false), _backdrop(0) {
 
 	Common::SeekableReadStream *dec = _vm->_dataIO->getFile(fileName);
 	if (dec) {
@@ -77,6 +66,9 @@ DECFile::DECFile(GobEngine *vm, const Common::String &fileName,
 
 DECFile::~DECFile() {
 	delete _backdrop;
+
+	for (LayerArray::iterator l = _layers.begin(); l != _layers.end(); ++l)
+		delete *l;
 }
 
 void DECFile::load(Common::SeekableSubReadStreamEndian &dec, const Common::String &fileName) {
@@ -102,9 +94,9 @@ void DECFile::load(Common::SeekableSubReadStreamEndian &dec, const Common::Strin
 	}
 
 	// Load the layers
-	_layers.resize(MAX(0, layerCount - 1));
-	for (LayerArray::iterator l = _layers.begin(); l != _layers.end(); ++l)
-		loadLayer(*l, dec);
+	_layers.reserve(MAX(0, layerCount - 1));
+	for (int i = 0; i < layerCount - 1; i++)
+		_layers.push_back(loadLayer(dec));
 
 	// Load the backdrop parts
 	if (backdropCount > 0)
@@ -113,43 +105,19 @@ void DECFile::load(Common::SeekableSubReadStreamEndian &dec, const Common::Strin
 
 void DECFile::loadBackdrop(Common::SeekableSubReadStreamEndian &dec) {
 	// Interestingly, DEC files reference "FOO.LBM" instead of "FOO.CMP"
-	Common::String file = Util::setExtension(Util::readString(dec, 13), ".CMP");
+	Common::String file = Util::setExtension(Util::readString(dec, 13), "");
 	if (_hasPadding)
 		dec.skip(1);
 
-	if (file.empty() || !_vm->_dataIO->hasFile(file))
-		return;
-
-	_vm->_video->drawPackedSprite(file.c_str(), *_backdrop);
+	_backdrop = new CMPFile(_vm, file, _width, _height, _bpp);
 }
 
-void DECFile::loadLayer(Layer &layer, Common::SeekableSubReadStreamEndian &dec) {
-	Common::String file = Util::readString(dec, 13);
+CMPFile *DECFile::loadLayer(Common::SeekableSubReadStreamEndian &dec) {
+	Common::String file = Util::setExtension(Util::readString(dec, 13), "");
 	if (_hasPadding)
 		dec.skip(1);
 
-	if (file.empty())
-		return;
-
-	Common::String fileRXY = Util::setExtension(file, ".RXY");
-	Common::String fileCMP = Util::setExtension(file, ".CMP");
-	if (!_vm->_dataIO->hasFile(fileRXY) || !_vm->_dataIO->hasFile(fileCMP))
-		return;
-
-	loadLayer(layer, fileRXY, fileCMP);
-}
-
-void DECFile::loadLayer(Layer &layer, const Common::String &fileRXY,
-                                      const Common::String &fileCMP) {
-
-	Common::SeekableReadStream *dataRXY = _vm->_dataIO->getFile(fileRXY);
-	if (!dataRXY)
-		return;
-
-	layer.coordinates = new RXYFile(*dataRXY);
-	layer.surface     = new Surface(_width, layer.coordinates->getHeight(), _bpp);
-
-	_vm->_video->drawPackedSprite(fileCMP.c_str(), *layer.surface);
+	return new CMPFile(_vm, file, _width, _height, _bpp);
 }
 
 void DECFile::loadParts(Common::SeekableSubReadStreamEndian &dec) {
@@ -188,7 +156,10 @@ void DECFile::draw(Surface &dest) const {
 }
 
 void DECFile::drawBackdrop(Surface &dest) const {
-	dest.blit(*_backdrop);
+	if (!_backdrop)
+		return;
+
+	_backdrop->draw(dest, 0, 0, 0);
 }
 
 void DECFile::drawLayer(Surface &dest, uint16 layer, uint16 part,
@@ -197,18 +168,7 @@ void DECFile::drawLayer(Surface &dest, uint16 layer, uint16 part,
 	if (layer >= _layers.size())
 		return;
 
-	const Layer &l = _layers[layer];
-	if (!l.surface || !l.coordinates)
-		return;
-
-	if (part >= l.coordinates->size())
-		return;
-
-	const RXYFile::Coordinates &c = (*l.coordinates)[part];
-	if (c.left == 0xFFFF)
-		return;
-
-	dest.blit(*l.surface, c.left, c.top, c.right, c.bottom, x, y, transp);
+	_layers[layer]->draw(dest, part, x, y, transp);
 }
 
 } // End of namespace Gob
diff --git a/engines/gob/decfile.h b/engines/gob/decfile.h
index 31d90180d3..48af740d41 100644
--- a/engines/gob/decfile.h
+++ b/engines/gob/decfile.h
@@ -34,7 +34,7 @@ namespace Gob {
 
 class GobEngine;
 class Surface;
-class RXYFile;
+class CMPFile;
 
 /** A DEC file, describing a "decal" (background).
  *
@@ -60,14 +60,6 @@ public:
 	               uint16 x, uint16 y, int32 transp = -1) const;
 
 private:
-	struct Layer {
-		Surface *surface;     ///< The surface containing the layer sprite.
-		RXYFile *coordinates; ///< The coordinates describing the layer sprite parts.
-
-		Layer();
-		~Layer();
-	};
-
 	struct Part {
 		uint8 layer;
 		uint8 part;
@@ -77,8 +69,8 @@ private:
 		bool transp;
 	};
 
-	typedef Common::Array<Layer> LayerArray;
-	typedef Common::Array<Part>  PartArray;
+	typedef Common::Array<CMPFile *> LayerArray;
+	typedef Common::Array<Part>      PartArray;
 
 	GobEngine *_vm;
 
@@ -88,7 +80,7 @@ private:
 
 	byte _hasPadding;
 
-	Surface *_backdrop;
+	CMPFile *_backdrop;
 
 	LayerArray _layers;
 	PartArray  _parts;
@@ -98,9 +90,7 @@ private:
 
 	void loadBackdrop(Common::SeekableSubReadStreamEndian &dec);
 
-	void loadLayer(Layer &layer, Common::SeekableSubReadStreamEndian &dec);
-	void loadLayer(Layer &layer, const Common::String &fileRXY,
-	                             const Common::String &fileCMP);
+	CMPFile *loadLayer(Common::SeekableSubReadStreamEndian &dec);
 
 	void loadParts(Common::SeekableSubReadStreamEndian &dec);
 	void loadPart(Part &part, Common::SeekableSubReadStreamEndian &dec);
-- 
cgit v1.2.3


From 4db94f805c0d73b80d93526b5a696fa1248a9754 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sun, 11 Mar 2012 18:33:10 +0100
Subject: GOB: Use the CMPFile class in ANIFile

---
 engines/gob/anifile.cpp | 78 ++++++++++++-------------------------------------
 engines/gob/anifile.h   | 22 ++++----------
 2 files changed, 23 insertions(+), 77 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/anifile.cpp b/engines/gob/anifile.cpp
index 1a905f1083..2671fe0405 100644
--- a/engines/gob/anifile.cpp
+++ b/engines/gob/anifile.cpp
@@ -28,19 +28,11 @@
 #include "gob/dataio.h"
 #include "gob/surface.h"
 #include "gob/video.h"
+#include "gob/cmpfile.h"
 #include "gob/anifile.h"
 
 namespace Gob {
 
-ANIFile::Layer::Layer() : surface(0), coordinates(0) {
-}
-
-ANIFile::Layer::~Layer() {
-	delete coordinates;
-	delete surface;
-}
-
-
 ANIFile::ANIFile(GobEngine *vm, const Common::String &fileName,
                  uint16 width, uint8 bpp) : _vm(vm),
 	_width(width), _bpp(bpp), _hasPadding(false) {
@@ -72,6 +64,8 @@ ANIFile::ANIFile(GobEngine *vm, const Common::String &fileName,
 }
 
 ANIFile::~ANIFile() {
+	for (LayerArray::iterator l = _layers.begin(); l != _layers.end(); ++l)
+		delete *l;
 }
 
 void ANIFile::load(Common::SeekableSubReadStreamEndian &ani, const Common::String &fileName) {
@@ -90,9 +84,9 @@ void ANIFile::load(Common::SeekableSubReadStreamEndian &ani, const Common::Strin
 		if (_hasPadding)
 			ani.skip(1);
 
-		_layers.resize(layerCount - 1);
-		for (LayerArray::iterator l = _layers.begin(); l != _layers.end(); ++l)
-			loadLayer(*l, ani);
+		_layers.reserve(layerCount - 1);
+		for (int i = 0; i < layerCount - 1; i++)
+			_layers.push_back(loadLayer(ani));
 	}
 
 	_maxWidth  = 0;
@@ -158,14 +152,13 @@ void ANIFile::loadAnimation(Animation &animation, FrameArray &frames,
 		area.right = area.bottom = -0x7FFF;
 
 		for (ChunkList::const_iterator c = frame.begin(); c != frame.end(); c++) {
-			const Layer *layer;
-			const RXYFile::Coordinates *coords;
+			uint16 cL, cT, cR, cB;
 
-			if (!getPart(c->layer, c->part, layer, coords))
+			if (!getCoordinates(c->layer, c->part, cL, cT, cR, cB))
 				continue;
 
-			const uint16 width  = coords->right  - coords->left + 1;
-			const uint16 height = coords->bottom - coords->top  + 1;
+			const uint16 width  = cR - cL + 1;
+			const uint16 height = cB - cT + 1;
 
 			const uint16 l = c->x;
 			const uint16 t = c->y;
@@ -233,33 +226,12 @@ void ANIFile::loadFrames(FrameArray &frames, Common::SeekableSubReadStreamEndian
 	}
 }
 
-void ANIFile::loadLayer(Layer &layer, Common::SeekableSubReadStreamEndian &ani) {
-	Common::String file = Util::readString(ani, 13);
+CMPFile *ANIFile::loadLayer(Common::SeekableSubReadStreamEndian &ani) {
+	Common::String file = Util::setExtension(Util::readString(ani, 13), "");
 	if (_hasPadding)
 		ani.skip(1);
 
-	if (file.empty())
-		return;
-
-	Common::String fileRXY = Util::setExtension(file, ".RXY");
-	Common::String fileCMP = Util::setExtension(file, ".CMP");
-	if (!_vm->_dataIO->hasFile(fileRXY) || !_vm->_dataIO->hasFile(fileCMP))
-		return;
-
-	loadLayer(layer, fileRXY, fileCMP);
-}
-
-void ANIFile::loadLayer(Layer &layer, const Common::String &fileRXY,
-                                      const Common::String &fileCMP) {
-
-	Common::SeekableReadStream *dataRXY = _vm->_dataIO->getFile(fileRXY);
-	if (!dataRXY)
-		return;
-
-	layer.coordinates = new RXYFile(*dataRXY);
-	layer.surface     = new Surface(_width, layer.coordinates->getHeight(), _bpp);
-
-	_vm->_video->drawPackedSprite(fileCMP.c_str(), *layer.surface);
+	return new CMPFile(_vm, file, _width, 0, _bpp);
 }
 
 uint16 ANIFile::getAnimationCount() const {
@@ -277,24 +249,13 @@ const ANIFile::Animation &ANIFile::getAnimationInfo(uint16 animation) const {
 	return _animations[animation];
 }
 
-bool ANIFile::getPart(uint16 layer, uint16 part,
-                      const Layer *&l, const RXYFile::Coordinates *&c) const {
+bool ANIFile::getCoordinates(uint16 layer, uint16 part,
+                             uint16 &left, uint16 &top, uint16 &right, uint16 &bottom) const {
 
 	if (layer >= _layers.size())
 		return false;
 
-	l = &_layers[layer];
-	if (!l->surface || !l->coordinates)
-		return false;
-
-	if (part >= l->coordinates->size())
-		return false;
-
-	c = &(*l->coordinates)[part];
-	if (c->left == 0xFFFF)
-		return false;
-
-	return true;
+	return _layers[layer]->getCoordinates(part, left, top, right, bottom);
 }
 
 void ANIFile::draw(Surface &dest, uint16 animation, uint16 frame, int16 x, int16 y) const {
@@ -314,13 +275,10 @@ void ANIFile::draw(Surface &dest, uint16 animation, uint16 frame, int16 x, int16
 void ANIFile::drawLayer(Surface &dest, uint16 layer, uint16 part,
                         int16 x, int16 y, int32 transp) const {
 
-	const Layer *l;
-	const RXYFile::Coordinates *c;
-
-	if (!getPart(layer, part, l, c))
+	if (layer >= _layers.size())
 		return;
 
-	dest.blit(*l->surface, c->left, c->top, c->right, c->bottom, x, y, transp);
+	_layers[layer]->draw(dest, part, x, y, transp);
 }
 
 } // End of namespace Gob
diff --git a/engines/gob/anifile.h b/engines/gob/anifile.h
index 1e10da6ff4..b6d9c735b5 100644
--- a/engines/gob/anifile.h
+++ b/engines/gob/anifile.h
@@ -28,8 +28,6 @@
 #include "common/array.h"
 #include "common/list.h"
 
-#include "gob/rxyfile.h"
-
 namespace Common {
 	class SeekableSubReadStreamEndian;
 }
@@ -38,6 +36,7 @@ namespace Gob {
 
 class GobEngine;
 class Surface;
+class CMPFile;
 
 /** An ANI file, describing an animation.
  *
@@ -94,16 +93,7 @@ public:
 	void draw(Surface &dest, uint16 animation, uint16 frame, int16 x, int16 y) const;
 
 private:
-	/** A sprite layer. */
-	struct Layer {
-		Surface *surface;     ///< The surface containing the layer sprite.
-		RXYFile *coordinates; ///< The coordinates describing the layer sprite parts.
-
-		Layer();
-		~Layer();
-	};
-
-	typedef Common::Array<Layer> LayerArray;
+	typedef Common::Array<CMPFile *> LayerArray;
 	typedef Common::Array<Animation> AnimationArray;
 
 	/** A "chunk" of an animation frame. */
@@ -139,9 +129,7 @@ private:
 
 	void load(Common::SeekableSubReadStreamEndian &ani, const Common::String &fileName);
 
-	void loadLayer(Layer &layer, Common::SeekableSubReadStreamEndian &ani);
-	void loadLayer(Layer &layer, const Common::String &fileRXY,
-	                             const Common::String &fileCMP);
+	CMPFile *loadLayer(Common::SeekableSubReadStreamEndian &ani);
 
 	void loadAnimation(Animation &animation, FrameArray &frames,
 	                   Common::SeekableSubReadStreamEndian &ani);
@@ -149,8 +137,8 @@ private:
 
 	// Drawing helpers
 
-	bool getPart(uint16 layer, uint16 part,
-	             const Layer *&l, const RXYFile::Coordinates *&c) const;
+	bool getCoordinates(uint16 layer, uint16 part,
+	                    uint16 &left, uint16 &top, uint16 &right, uint16 &bottom) const;
 
 	void drawLayer(Surface &dest, uint16 layer, uint16 part,
 	              int16 x, int16 y, int32 transp) const;
-- 
cgit v1.2.3


From c340159486b499783c297453a14b4df76b4aa535 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sun, 11 Mar 2012 20:41:57 +0100
Subject: GOB: Extend ANIObject to also handle CMP sprite "animations"

---
 engines/gob/aniobject.cpp | 77 ++++++++++++++++++++++++++++++++++++++++++++++-
 engines/gob/aniobject.h   |  8 +++++
 2 files changed, 84 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/gob/aniobject.cpp b/engines/gob/aniobject.cpp
index 0ca850d1fb..154f8e04ed 100644
--- a/engines/gob/aniobject.cpp
+++ b/engines/gob/aniobject.cpp
@@ -22,11 +22,20 @@
 
 #include "gob/surface.h"
 #include "gob/anifile.h"
+#include "gob/cmpfile.h"
 #include "gob/aniobject.h"
 
 namespace Gob {
 
-ANIObject::ANIObject(const ANIFile &ani) : _ani(&ani),
+ANIObject::ANIObject(const ANIFile &ani) : _ani(&ani), _cmp(0),
+	_visible(false), _paused(false), _mode(kModeContinuous),
+	_x(0), _y(0), _background(0), _drawn(false) {
+
+	setAnimation(0);
+	setPosition();
+}
+
+ANIObject::ANIObject(const CMPFile &cmp) : _ani(0), _cmp(&cmp),
 	_visible(false), _paused(false), _mode(kModeContinuous),
 	_x(0), _y(0), _background(0), _drawn(false) {
 
@@ -68,6 +77,10 @@ void ANIObject::rewind() {
 }
 
 void ANIObject::setPosition() {
+	// CMP "animations" have no default position
+	if (_cmp)
+		return;
+
 	if (_animation >= _ani->getAnimationCount())
 		return;
 
@@ -88,6 +101,12 @@ void ANIObject::getPosition(int16 &x, int16 &y) const {
 }
 
 void ANIObject::getFramePosition(int16 &x, int16 &y) const {
+	// CMP "animations" have no specific frame positions
+	if (_cmp) {
+		getPosition(x, y);
+		return;
+	}
+
 	if (_animation >= _ani->getAnimationCount())
 		return;
 
@@ -100,6 +119,13 @@ void ANIObject::getFramePosition(int16 &x, int16 &y) const {
 }
 
 void ANIObject::getFrameSize(int16 &width, int16 &height) const {
+	if (_cmp) {
+		width  = _cmp->getWidth (_animation);
+		height = _cmp->getHeight(_animation);
+
+		return;
+	}
+
 	if (_animation >= _ani->getAnimationCount())
 		return;
 
@@ -147,6 +173,47 @@ void ANIObject::draw(Surface &dest, int16 &left, int16 &top,
 	if (!_visible)
 		return;
 
+	if      (_cmp)
+		drawCMP(dest, left, top, right, bottom);
+	else if (_ani)
+		drawANI(dest, left, top, right, bottom);
+}
+
+void ANIObject::drawCMP(Surface &dest, int16 &left, int16 &top,
+                                       int16 &right, int16 &bottom) {
+
+	if (!_background) {
+		uint16 width, height;
+
+		_cmp->getMaxSize(width, height);
+
+		_background = new Surface(width, height, dest.getBPP());
+	}
+
+	const uint16 cR = _cmp->getWidth (_animation) - 1;
+	const uint16 cB = _cmp->getHeight(_animation) - 1;
+
+	_backgroundLeft   = CLIP<int16>(   + _x, 0, dest.getWidth () - 1);
+	_backgroundTop    = CLIP<int16>(   + _y, 0, dest.getHeight() - 1);
+	_backgroundRight  = CLIP<int16>(cR + _x, 0, dest.getWidth () - 1);
+	_backgroundBottom = CLIP<int16>(cB + _y, 0, dest.getHeight() - 1);
+
+	_background->blit(dest, _backgroundLeft , _backgroundTop,
+	                        _backgroundRight, _backgroundBottom, 0, 0);
+
+	_cmp->draw(dest, _animation, _x, _y, 0);
+
+	_drawn = true;
+
+	left   = _backgroundLeft;
+	top    = _backgroundTop;
+	right  = _backgroundRight;
+	bottom = _backgroundBottom;
+}
+
+void ANIObject::drawANI(Surface &dest, int16 &left, int16 &top,
+                                       int16 &right, int16 &bottom) {
+
 	if (!_background) {
 		uint16 width, height;
 
@@ -202,6 +269,10 @@ void ANIObject::advance() {
 	if (_paused)
 		return;
 
+	// CMP "animations" have only one frame
+	if (_cmp)
+		return;
+
 	if (_animation >= _ani->getAnimationCount())
 		return;
 
@@ -229,6 +300,10 @@ uint16 ANIObject::getFrame() const {
 }
 
 bool ANIObject::lastFrame() const {
+	// CMP "animations" have only one frame
+	if (_cmp)
+		return true;
+
 	if (_animation >= _ani->getAnimationCount())
 		return true;
 
diff --git a/engines/gob/aniobject.h b/engines/gob/aniobject.h
index e3fe301400..c101d747b7 100644
--- a/engines/gob/aniobject.h
+++ b/engines/gob/aniobject.h
@@ -28,6 +28,7 @@
 namespace Gob {
 
 class ANIFile;
+class CMPFile;
 class Surface;
 
 /** An ANI object, controlling an animation within an ANI file. */
@@ -38,7 +39,10 @@ public:
 		kModeOnce        ///< Play the animation only once.
 	};
 
+	/** Create an animation object from an ANI file. */
 	ANIObject(const ANIFile &ani);
+	/** Create an animation object from a CMP sprite. */
+	ANIObject(const CMPFile &cmp);
 	virtual ~ANIObject();
 
 	/** Make the object visible/invisible. */
@@ -98,6 +102,7 @@ public:
 
 private:
 	const ANIFile *_ani; ///< The managed ANI file.
+	const CMPFile *_cmp; ///< The managed CMP file.
 
 	uint16 _animation; ///< The current animation number
 	uint16 _frame;     ///< The current frame.
@@ -117,6 +122,9 @@ private:
 	int16 _backgroundTop;    ///< The top of the saved background.
 	int16 _backgroundRight;  ///< The right position of the saved background.
 	int16 _backgroundBottom; ///< The bottom position of the saved background.
+
+	void drawCMP(Surface &dest, int16 &left, int16 &top, int16 &right, int16 &bottom);
+	void drawANI(Surface &dest, int16 &left, int16 &top, int16 &right, int16 &bottom);
 };
 
 } // End of namespace Gob
-- 
cgit v1.2.3


From 3664088f6f562f74bcaebb5d1006a33da29c5637 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sun, 11 Mar 2012 21:39:14 +0100
Subject: GOB: Add a way to add sprite coordinates to CMP files

Because the meter bar and icons for Penetration are not
even in the CMP's RXY.
---
 engines/gob/cmpfile.cpp | 13 +++++++++++++
 engines/gob/cmpfile.h   |  2 ++
 engines/gob/rxyfile.cpp | 11 +++++++++++
 engines/gob/rxyfile.h   |  2 ++
 4 files changed, 28 insertions(+)

(limited to 'engines')

diff --git a/engines/gob/cmpfile.cpp b/engines/gob/cmpfile.cpp
index 62ac9f3fa4..7b21c4c835 100644
--- a/engines/gob/cmpfile.cpp
+++ b/engines/gob/cmpfile.cpp
@@ -230,4 +230,17 @@ void CMPFile::draw(Surface &dest, uint16 left, uint16 top, uint16 right, uint16
 	dest.blit(*_surface, left, top, right, bottom, x, y, transp);
 }
 
+uint16 CMPFile::addSprite(uint16 left, uint16 top, uint16 right, uint16 bottom) {
+	if (empty())
+		return 0;
+
+	const uint16 height = bottom - top  + 1;
+	const uint16 width  = right  - left + 1;
+
+	_maxWidth  = MAX(_maxWidth , width);
+	_maxHeight = MAX(_maxHeight, height);
+
+	return _coordinates->add(left, top, right, bottom);
+}
+
 } // End of namespace Gob
diff --git a/engines/gob/cmpfile.h b/engines/gob/cmpfile.h
index d409e15161..2b669e4d38 100644
--- a/engines/gob/cmpfile.h
+++ b/engines/gob/cmpfile.h
@@ -68,6 +68,8 @@ public:
 	void draw(Surface &dest, uint16 left, uint16 top, uint16 right, uint16 bottom,
 	          uint16 x, uint16 y, int32 transp = -1) const;
 
+	uint16 addSprite(uint16 left, uint16 top, uint16 right, uint16 bottom);
+
 private:
 	GobEngine *_vm;
 
diff --git a/engines/gob/rxyfile.cpp b/engines/gob/rxyfile.cpp
index 06a07bdc9c..9702dc8c7f 100644
--- a/engines/gob/rxyfile.cpp
+++ b/engines/gob/rxyfile.cpp
@@ -88,4 +88,15 @@ void RXYFile::load(Common::SeekableReadStream &rxy) {
 	}
 }
 
+uint16 RXYFile::add(uint16 left, uint16 top, uint16 right, uint16 bottom) {
+	_coords.resize(_coords.size() + 1);
+
+	_coords.back().left   = left;
+	_coords.back().top    = top;
+	_coords.back().right  = right;
+	_coords.back().bottom = bottom;
+
+	return _coords.size() - 1;
+}
+
 } // End of namespace Gob
diff --git a/engines/gob/rxyfile.h b/engines/gob/rxyfile.h
index 3b4d3de636..bc9600b5b0 100644
--- a/engines/gob/rxyfile.h
+++ b/engines/gob/rxyfile.h
@@ -58,6 +58,8 @@ public:
 
 	const Coordinates &operator[](uint i) const;
 
+	uint16 add(uint16 left, uint16 top, uint16 right, uint16 bottom);
+
 private:
 	typedef Common::Array<Coordinates> CoordArray;
 
-- 
cgit v1.2.3


From d58c5133f45879e617ae3017e7720b657c5a2eb6 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Tue, 13 Mar 2012 13:20:44 +0000
Subject: SCI: Add detection entry for KQ6 French DOS Floppy.

See bug #3503425.
---
 engines/sci/detection_tables.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'engines')

diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 63eda1c348..2047f58c8b 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -1421,6 +1421,15 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 	 	Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH)	},
 
+	// King's Quest 6 - French DOS Floppy (supplied by misterhands in bug #3503425)
+	// SCI interpreter version ???
+	{"kq6", "", {
+		{"resource.map", 0, "a362063318eebe7d6423b1d9dc6213e1", 8703},
+		{"resource.000", 0, "f2b7f753992c56a0c7a08d6a5077c895", 7863324},
+		{"resource.msg", 0, "adc2aa8adbdcc97507d44a6f492fbd77", 265194},
+		AD_LISTEND},
+	 	Common::FR_FRA, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH)	},
+
 	// King's Quest 6 - German DOS Floppy (supplied by markcoolio in bug report #2727156)
 	// SCI interpreter version 1.001.054
 	{"kq6", "", {
-- 
cgit v1.2.3


From e618e6794ddcd528d157000c01e4f75dc6de3e2f Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Tue, 9 Aug 2011 21:02:32 +0200
Subject: JANITORIAL: Remove unnecessary empty default
 constructors/destructors.

---
 engines/saga/sndres.cpp | 3 ---
 engines/saga/sndres.h   | 1 -
 2 files changed, 4 deletions(-)

(limited to 'engines')

diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp
index 5a97eb6019..71044034d7 100644
--- a/engines/saga/sndres.cpp
+++ b/engines/saga/sndres.cpp
@@ -104,9 +104,6 @@ SndRes::SndRes(SagaEngine *vm) : _vm(vm), _sfxContext(NULL), _voiceContext(NULL)
 	}
 }
 
-SndRes::~SndRes() {
-}
-
 void SndRes::setVoiceBank(int serial) {
 	Common::File *file;
 	if (_voiceSerial == serial)
diff --git a/engines/saga/sndres.h b/engines/saga/sndres.h
index 979c0288f6..bc38bed431 100644
--- a/engines/saga/sndres.h
+++ b/engines/saga/sndres.h
@@ -39,7 +39,6 @@ class SndRes {
 public:
 
 	SndRes(SagaEngine *vm);
-	~SndRes();
 
 	void playSound(uint32 resourceId, int volume, bool loop);
 	void playVoice(uint32 resourceId);
-- 
cgit v1.2.3


From 983cd2129496305bd68b12adde3117ef247135d1 Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Thu, 8 Dec 2011 08:04:41 +0100
Subject: JANITORIAL: Do not convert false to a null pointer.

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

(limited to 'engines')

diff --git a/engines/cge/bitmap.cpp b/engines/cge/bitmap.cpp
index 37f4eb070e..309b89bdda 100644
--- a/engines/cge/bitmap.cpp
+++ b/engines/cge/bitmap.cpp
@@ -158,7 +158,7 @@ BitmapPtr Bitmap::code() {
 	debugC(1, kCGEDebugBitmap, "Bitmap::code()");
 
 	if (!_m)
-		return false;
+		return NULL;
 
 	uint16 cnt;
 
-- 
cgit v1.2.3


From bc238a5ff38c5cb0ed563a3c56ade155b511bbde Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Thu, 8 Dec 2011 08:06:23 +0100
Subject: JANITORIAL: Use appropriate type for loop counter.

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

(limited to 'engines')

diff --git a/engines/saga/actor_path.cpp b/engines/saga/actor_path.cpp
index 3e10aba6b6..0fb072b201 100644
--- a/engines/saga/actor_path.cpp
+++ b/engines/saga/actor_path.cpp
@@ -223,7 +223,6 @@ int Actor::fillPathArray(const Point &fromPoint, const Point &toPoint, Point &be
 	int currentRating;
 	Point bestPath;
 	int pointCounter;
-	int startDirection;
 	const PathDirectionData *samplePathDirection;
 	Point nextPoint;
 	int directionCount;
@@ -235,7 +234,7 @@ int Actor::fillPathArray(const Point &fromPoint, const Point &toPoint, Point &be
 	bestRating = quickDistance(fromPoint, toPoint, compressX);
 	bestPath = fromPoint;
 
-	for (startDirection = 0; startDirection < 4; startDirection++) {
+	for (int8 startDirection = 0; startDirection < 4; startDirection++) {
 		PathDirectionData tmp = { startDirection, fromPoint.x, fromPoint.y };
 		pathDirectionQueue.push_back(tmp);
 	}
-- 
cgit v1.2.3


From d21cef411721984d4c6cabc7df04cbab9b725978 Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Tue, 13 Mar 2012 10:06:00 +0100
Subject: JANITORIAL: Avoid the ugly operator invocation syntax.

---
 engines/lure/room.cpp           | 12 ++++++------
 engines/mohawk/myst_areas.cpp   |  2 +-
 engines/mohawk/myst_scripts.cpp |  4 ++--
 engines/parallaction/objects.h  |  4 ++--
 engines/tsage/graphics.cpp      |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'engines')

diff --git a/engines/lure/room.cpp b/engines/lure/room.cpp
index 219ed0263d..4cb0cecd45 100644
--- a/engines/lure/room.cpp
+++ b/engines/lure/room.cpp
@@ -138,7 +138,7 @@ void Room::leaveRoom() {
 	HotspotList &list = r.activeHotspots();
 	HotspotList::iterator i = list.begin();
 	while (i != list.end()) {
-		Hotspot *h = (i.operator*()).get();
+		Hotspot *h = i->get();
 		if (!h->persistant()) {
 			i = list.erase(i);
 		} else {
@@ -437,7 +437,7 @@ void Room::update() {
 
 	// Handle first layer (layer 3)
 	for (i = hotspots.begin(); i != hotspots.end(); ++i) {
-		Hotspot &h = *i.operator*();
+		Hotspot &h = **i;
 
 		if ((h.roomNumber() == _roomNumber) && h.isActiveAnimation() && (h.layer() == 3)) {
 			addAnimation(h);
@@ -449,28 +449,28 @@ void Room::update() {
 	Common::List<Hotspot *> tempList;
 	Common::List<Hotspot *>::iterator iTemp;
 	for (i = hotspots.begin(); i != hotspots.end(); ++i) {
-		Hotspot *h = (i.operator*()).get();
+		Hotspot *h = i->get();
 		if ((h->layer() != 1) || (h->roomNumber() != _roomNumber) ||
 			h->skipFlag() || !h->isActiveAnimation())
 			continue;
 		int16 endY = h->y() + h->heightCopy();
 
 		for (iTemp = tempList.begin(); iTemp != tempList.end(); ++iTemp) {
-			Hotspot *hTemp = iTemp.operator*();
+			Hotspot *hTemp = *iTemp;
 			int16 tempY = hTemp->y() + hTemp->heightCopy();
 			if (endY < tempY) break;
 		}
 		tempList.insert(iTemp, h);
 	}
 	for (iTemp = tempList.begin(); iTemp != tempList.end(); ++iTemp) {
-		Hotspot &h = *iTemp.operator*();
+		Hotspot &h = **iTemp;
 		addAnimation(h);
 		addLayers(h);
 	}
 
 	// Handle third layer (layer 2)
 	for (i = hotspots.begin(); i != hotspots.end(); ++i) {
-		Hotspot &h = *i.operator*();
+		Hotspot &h = **i;
 
 		if ((h.roomNumber() == _roomNumber) && h.isActiveAnimation() && (h.layer() == 2)) {
 			addAnimation(h);
diff --git a/engines/mohawk/myst_areas.cpp b/engines/mohawk/myst_areas.cpp
index fe33ceaa9b..a54b67bef4 100644
--- a/engines/mohawk/myst_areas.cpp
+++ b/engines/mohawk/myst_areas.cpp
@@ -134,7 +134,7 @@ const Common::String MystResourceType5::describe() {
 		desc += " ops:";
 
 		for (uint i = 0; i < _script->size(); i++)
-			desc += " " + _vm->_scriptParser->getOpcodeDesc(_script->operator[](i).opcode);
+			desc += " " + _vm->_scriptParser->getOpcodeDesc((*_script)[i].opcode);
 	}
 
 	return desc;
diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp
index b9353312c7..107a8b03e9 100644
--- a/engines/mohawk/myst_scripts.cpp
+++ b/engines/mohawk/myst_scripts.cpp
@@ -161,7 +161,7 @@ void MystScriptParser::runScript(MystScript script, MystResource *invokingResour
 	_vm->_gfx->enableDrawingTimeSimulation(true);
 
 	for (uint16 i = 0; i < script->size(); i++) {
-		MystScriptEntry &entry = script->operator[](i);
+		MystScriptEntry &entry = (*script)[i];
 		debugC(kDebugScript, "\tOpcode %d: %d", i, entry.opcode);
 
 		if (entry.type == kMystScriptNormal)
@@ -207,7 +207,7 @@ MystScript MystScriptParser::readScript(Common::SeekableReadStream *stream, Myst
 	script->resize(opcodeCount);
 
 	for (uint16 i = 0; i < opcodeCount; i++) {
-		MystScriptEntry &entry = script->operator[](i);
+		MystScriptEntry &entry = (*script)[i];
 		entry.type = type;
 
 		// Resource ID only exists in INIT and EXIT scripts
diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h
index 387e7af088..81761b2c6b 100644
--- a/engines/parallaction/objects.h
+++ b/engines/parallaction/objects.h
@@ -377,12 +377,12 @@ public:
 
 	int16 getValue() const {
 		assert(_accessor);
-		return _accessor->operator()();
+		return (*_accessor)();
 	}
 
 	void setValue(int16 value) {
 		assert(_mutator);
-		_mutator->operator()(value);
+		(*_mutator)(value);
 	}
 };
 
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index b3dceba292..0781ae4544 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -230,7 +230,7 @@ GfxSurface::GfxSurface(const GfxSurface &s) {
 	_lockSurfaceCtr = 0;
 	_customSurface = NULL;
 	_trackDirtyRects = false;
-	this->operator =(s);
+	*this = s;
 }
 
 GfxSurface::~GfxSurface() {
-- 
cgit v1.2.3


From 337d5da913477889e9b2312ecce02e52c5ddf803 Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Tue, 13 Mar 2012 10:25:04 +0100
Subject: JANITORIAL: Make getters const.

---
 engines/lure/hotspots.cpp   |  16 +++----
 engines/lure/hotspots.h     | 108 ++++++++++++++++++++++----------------------
 engines/lure/res_struct.cpp |  52 +++++++++------------
 engines/lure/res_struct.h   |  38 ++++++++--------
 4 files changed, 101 insertions(+), 113 deletions(-)

(limited to 'engines')

diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index c7e7e81900..698df8715e 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -430,7 +430,7 @@ bool Hotspot::isActiveAnimation() {
 	return ((_numFrames != 0) && (_layer != 0));
 }
 
-uint16 Hotspot::nameId() {
+uint16 Hotspot::nameId() const {
 	if (_data == NULL)
 		return 0;
 	else
@@ -2286,7 +2286,7 @@ void Hotspot::startTalk(HotspotData *charHotspot, uint16 id) {
 			charHotspot->hotspotId, id);
 }
 
-void Hotspot::saveToStream(Common::WriteStream *stream) {
+void Hotspot::saveToStream(Common::WriteStream *stream) const {
 	if (_data)
 		_data->npcSchedule.saveToStream(stream);
 	else
@@ -4113,7 +4113,7 @@ void HotspotTickHandlers::npcRoomChange(Hotspot &h) {
 
 // This method performs rounding of the number of steps depending on direciton
 
-int WalkingActionEntry::numSteps() {
+int WalkingActionEntry::numSteps() const {
 	switch (_direction) {
 	case UP:
 	case DOWN:
@@ -4496,7 +4496,7 @@ void PathFinder::initVars() {
 	_countdownCtr -= 700;
 }
 
-void PathFinder::saveToStream(Common::WriteStream *stream) {
+void PathFinder::saveToStream(Common::WriteStream *stream) const {
 	stream->writeByte(_inUse);
 
 	if (_inUse) {
@@ -4504,8 +4504,7 @@ void PathFinder::saveToStream(Common::WriteStream *stream) {
 		stream->write(_layer, sizeof(RoomPathsDecompressedData));
 
 		// Save any active step sequence
-		WalkingActionList::iterator i;
-		for (i = _list.begin(); i != _list.end(); ++i) {
+		for (WalkingActionList::const_iterator i = _list.begin(); i != _list.end(); ++i) {
 			WalkingActionEntry *entry = (*i).get();
 			stream->writeByte(entry->direction());
 			stream->writeSint16LE(entry->rawSteps());
@@ -4683,9 +4682,8 @@ bool Support::isCharacterInList(uint16 *lst, int numEntries, uint16 charId) {
 	return false;
 }
 
-void HotspotList::saveToStream(Common::WriteStream *stream) {
-	HotspotList::iterator i;
-	for (i = begin(); i != end(); ++i) {
+void HotspotList::saveToStream(Common::WriteStream *stream) const {
+	for (HotspotList::const_iterator i = begin(); i != end(); ++i) {
 		Hotspot *hotspot = (*i).get();
 		debugC(ERROR_INTERMEDIATE, kLureDebugAnimations, "Saving hotspot %xh", hotspot->hotspotId());
 		bool dynamicObject = hotspot->hotspotId() != hotspot->originalId();
diff --git a/engines/lure/hotspots.h b/engines/lure/hotspots.h
index a58a34456e..85d36dc138 100644
--- a/engines/lure/hotspots.h
+++ b/engines/lure/hotspots.h
@@ -111,9 +111,9 @@ private:
 	int _numSteps;
 public:
 	WalkingActionEntry(Direction dir, int steps): _direction(dir), _numSteps(steps) {}
-	Direction direction() { return _direction; }
+	Direction direction() const { return _direction; }
 	int &rawSteps() { return _numSteps; }
-	int numSteps();
+	int numSteps() const;
 };
 
 enum PathFinderResult {PF_UNFINISHED, PF_OK, PF_DEST_OCCUPIED, PF_PART_PATH, PF_NO_WALK};
@@ -158,11 +158,11 @@ public:
 	Common::String getDebugInfo() const;
 
 	void pop() { _list.erase(_list.begin()); }
-	WalkingActionEntry &top() { return **_list.begin(); }
-	bool isEmpty() { return _list.empty(); }
+	WalkingActionEntry &top() const { return **_list.begin(); }
+	bool isEmpty() const { return _list.empty(); }
 	int &stepCtr() { return _stepCtr; }
 
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 };
 
@@ -279,62 +279,62 @@ public:
 	void setAnimation(uint16 newAnimId);
 	void setAnimationIndex(int animIndex);
 	void setAnimation(HotspotAnimData *newRecord);
-	uint16 hotspotId() { return _hotspotId; }
-	uint16 originalId() { return _originalId; }
-	Surface &frames() { return *_frames; }
-	HotspotAnimData &anim() { return *_anim; }
-	HotspotData *resource() { return _data; }
-	uint16 numFrames() { return _numFrames; }
-	uint16 frameNumber() { return _frameNumber; }
+	uint16 hotspotId() const { return _hotspotId; }
+	uint16 originalId() const { return _originalId; }
+	Surface &frames() const { return *_frames; }
+	HotspotAnimData &anim() const { return *_anim; }
+	HotspotData *resource() const { return _data; }
+	uint16 numFrames() const { return _numFrames; }
+	uint16 frameNumber() const { return _frameNumber; }
 	void setFrameNumber(uint16 frameNum) {
 		assert(frameNum < _numFrames);
 		_frameNumber = frameNum;
 	}
 	void incFrameNumber();
-	Direction direction() { return _direction; }
-	uint16 frameWidth() { return _width; }
-	int16 x() { return _startX; }
-	int16 y() { return _startY; }
-	int16 destX() { return _destX; }
-	int16 destY() { return _destY; }
-	int8 talkX() { return _talkX; }
-	int8 talkY() { return _talkY; }
-	uint16 destHotspotId() { return _destHotspotId; }
-	uint16 blockedOffset() { return _blockedOffset; }
-	uint8 exitCtr() { return _exitCtr; }
-	bool walkFlag() { return _walkFlag; }
-	uint16 startRoomNumber() { return _startRoomNumber; }
-	uint16 width() { return _width; }
-	uint16 height() { return _height; }
-	uint16 widthCopy() { return _widthCopy; }
-	uint16 heightCopy() { return _heightCopy; }
-	uint16 yCorrection() { return _yCorrection; }
-	uint16 charRectY() { return _charRectY; }
-	uint16 roomNumber() { return _roomNumber; }
-	uint16 talkScript() {
+	Direction direction() const { return _direction; }
+	uint16 frameWidth() const { return _width; }
+	int16 x() const { return _startX; }
+	int16 y() const { return _startY; }
+	int16 destX() const { return _destX; }
+	int16 destY() const { return _destY; }
+	int8 talkX() const { return _talkX; }
+	int8 talkY() const { return _talkY; }
+	uint16 destHotspotId() const { return _destHotspotId; }
+	uint16 blockedOffset() const { return _blockedOffset; }
+	uint8 exitCtr() const { return _exitCtr; }
+	bool walkFlag() const { return _walkFlag; }
+	uint16 startRoomNumber() const { return _startRoomNumber; }
+	uint16 width() const { return _width; }
+	uint16 height() const { return _height; }
+	uint16 widthCopy() const { return _widthCopy; }
+	uint16 heightCopy() const { return _heightCopy; }
+	uint16 yCorrection() const { return _yCorrection; }
+	uint16 charRectY() const { return _charRectY; }
+	uint16 roomNumber() const { return _roomNumber; }
+	uint16 talkScript() const {
 		assert(_data);
 		return _data->talkScriptOffset;
 	}
-	uint16 hotspotScript() { return _hotspotScriptOffset; }
-	uint8 layer() { return _layer; }
-	bool skipFlag() { return _skipFlag; }
+	uint16 hotspotScript() const { return _hotspotScriptOffset; }
+	uint8 layer() const { return _layer; }
+	bool skipFlag() const { return _skipFlag; }
 	void setTickProc(uint16 newVal);
-	bool persistant() { return _persistant; }
+	bool persistant() const { return _persistant; }
 	void setPersistant(bool value) { _persistant = value; }
-	uint8 colorOffset() { return _colorOffset; }
+	uint8 colorOffset() const { return _colorOffset; }
 	void setColorOffset(uint8 value) { _colorOffset = value; }
 	void setRoomNumber(uint16 roomNum) {
 		_roomNumber = roomNum;
 		if (_data) _data->roomNumber = roomNum;
 	}
-	uint16 nameId();
+	uint16 nameId() const;
 	const char *getName();
 	bool isActiveAnimation();
 	void setPosition(int16 newX, int16 newY);
 	void setDestPosition(int16 newX, int16 newY) { _destX = newX; _destY = newY; }
 	void setDestHotspot(uint16 id) { _destHotspotId = id; }
 	void setExitCtr(uint8 value) { _exitCtr = value; }
-	BlockedState blockedState() {
+	BlockedState blockedState() const {
 		assert(_data);
 		return _data->blockedState;
 	}
@@ -342,7 +342,7 @@ public:
 		assert(_data);
 		_data->blockedState = newState;
 	}
-	bool blockedFlag() {
+	bool blockedFlag() const {
 		assert(_data);
 		return _data->blockedFlag;
 	}
@@ -376,7 +376,7 @@ public:
 	}
 	void setCharRectY(uint16 value) { _charRectY = value; }
 	void setSkipFlag(bool value) { _skipFlag = value; }
-	CharacterMode characterMode() {
+	CharacterMode characterMode() const {
 		assert(_data != NULL);
 		return _data->characterMode;
 	}
@@ -384,7 +384,7 @@ public:
 		assert(_data != NULL);
 		_data->characterMode = value;
 	}
-	uint16 delayCtr() {
+	uint16 delayCtr() const {
 		assert(_data);
 		return _data->delayCtr;
 	}
@@ -392,7 +392,7 @@ public:
 		assert(_data);
 		_data->delayCtr = value;
 	}
-	uint16 pauseCtr() {
+	uint16 pauseCtr() const {
 		assert(_data);
 		return _data->pauseCtr;
 	}
@@ -400,7 +400,7 @@ public:
 		assert(_data);
 		_data->pauseCtr = value;
 	}
-	VariantBool coveredFlag() {
+	VariantBool coveredFlag() const {
 		assert(_data);
 		return _data->coveredFlag;
 	}
@@ -408,7 +408,7 @@ public:
 		assert(_data);
 		_data->coveredFlag = value;
 	}
-	uint16 useHotspotId() {
+	uint16 useHotspotId() const {
 		assert(_data);
 		return _data->useHotspotId;
 	}
@@ -416,7 +416,7 @@ public:
 		assert(_data);
 		_data->useHotspotId = value;
 	}
-	uint16 talkGate() {
+	uint16 talkGate() const {
 		assert(_data);
 		return _data->talkGate;
 	}
@@ -424,7 +424,7 @@ public:
 		assert(_data);
 		_data->talkGate = value;
 	}
-	uint16 supportValue() { return _supportValue; }
+	uint16 supportValue() const { return _supportValue; }
 	void setSupportValue(uint16 value) { _supportValue = value; }
 
 	void copyTo(Surface *dest);
@@ -449,16 +449,16 @@ public:
 
 	void doAction();
 	void doAction(Action action, HotspotData *hotspot);
-	CurrentActionStack &currentActions() {
+	CurrentActionStack &currentActions() const {
 		assert(_data);
 		return _data->npcSchedule;
 	}
 	PathFinder &pathFinder() { return _pathFinder; }
 	DestStructure &tempDest() { return _tempDest; }
-	uint16 frameCtr() { return _frameCtr; }
+	uint16 frameCtr() const { return _frameCtr; }
 	void setFrameCtr(uint16 value) { _frameCtr = value; }
 	void decrFrameCtr() { if (_frameCtr > 0) --_frameCtr; }
-	uint8 actionCtr() {
+	uint8 actionCtr() const {
 		assert(_data);
 		return _data->actionCtr;
 	}
@@ -466,7 +466,7 @@ public:
 		assert(_data);
 		_data->actionCtr = v;
 	}
-	uint8 voiceCtr() { return _voiceCtr; }
+	uint8 voiceCtr() const { return _voiceCtr; }
 	void setVoiceCtr(uint8 v) { _voiceCtr = v; }
 
 	// Miscellaneous
@@ -477,13 +477,13 @@ public:
 	void scheduleConverse(uint16 destHotspot, uint16 messageId);
 	void handleTalkDialog();
 
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 };
 
 class HotspotList: public Common::List<Common::SharedPtr<Hotspot> > {
 public:
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 };
 
diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp
index 222f55b5dc..ded6b5e6fc 100644
--- a/engines/lure/res_struct.cpp
+++ b/engines/lure/res_struct.cpp
@@ -278,10 +278,8 @@ void RoomPathsData::decompress(RoomPathsDecompressedData &dataOut, int character
 
 // Room data class
 
-void RoomDataList::saveToStream(Common::WriteStream *stream) {
-	RoomDataList::iterator i;
-
-	for (i = begin(); i != end(); ++i) {
+void RoomDataList::saveToStream(Common::WriteStream *stream) const {
+	for (RoomDataList::const_iterator i = begin(); i != end(); ++i) {
 		RoomData *rec = (*i).get();
 		stream->writeByte(rec->flags);
 		const byte *pathData = rec->paths.data();
@@ -317,8 +315,8 @@ RoomExitJoinData::RoomExitJoinData(RoomExitJoinResource *rec) {
 	blocked = rec->blocked;
 }
 
-void RoomExitJoinList::saveToStream(Common::WriteStream *stream) {
-	for (RoomExitJoinList::iterator i = begin(); i != end(); ++i) {
+void RoomExitJoinList::saveToStream(Common::WriteStream *stream) const {
+	for (RoomExitJoinList::const_iterator i = begin(); i != end(); ++i) {
 		RoomExitJoinData *rec = (*i).get();
 
 		stream->writeUint16LE(rec->hotspots[0].hotspotId);
@@ -435,7 +433,7 @@ HotspotData::HotspotData(HotspotResource *rec) {
 	npcScheduleId = READ_LE_UINT16(&rec->npcSchedule);
 }
 
-void HotspotData::saveToStream(Common::WriteStream *stream) {
+void HotspotData::saveToStream(Common::WriteStream *stream) const {
 	// Write out the basic fields
 	stream->writeUint16LE(nameId);
 	stream->writeUint16LE(descId);
@@ -534,9 +532,8 @@ void HotspotData::loadFromStream(Common::ReadStream *stream) {
 
 // Hotspot data list
 
-void HotspotDataList::saveToStream(Common::WriteStream *stream) {
-	iterator i;
-	for (i = begin(); i != end(); ++i) {
+void HotspotDataList::saveToStream(Common::WriteStream *stream) const {
+	for (const_iterator i = begin(); i != end(); ++i) {
 		HotspotData *hotspot = (*i).get();
 		stream->writeUint16LE(hotspot->hotspotId);
 		hotspot->saveToStream(stream);
@@ -699,13 +696,11 @@ TalkEntryData *TalkData::getResponse(int index) {
 
 // The following class acts as a container for all the NPC conversations
 
-void TalkDataList::saveToStream(Common::WriteStream *stream) {
-	TalkDataList::iterator i;
-	for (i = begin(); i != end(); ++i) {
+void TalkDataList::saveToStream(Common::WriteStream *stream) const {
+	for (TalkDataList::const_iterator i = begin(); i != end(); ++i) {
 		TalkData *rec = (*i).get();
-		TalkEntryList::iterator i2;
 
-		for (i2 = rec->entries.begin(); i2 != rec->entries.end(); ++i2) {
+		for (TalkEntryList::const_iterator i2 = rec->entries.begin(); i2 != rec->entries.end(); ++i2) {
 			TalkEntryData *entry = (*i2).get();
 			stream->writeUint16LE(entry->descId);
 		}
@@ -716,9 +711,8 @@ void TalkDataList::loadFromStream(Common::ReadStream *stream) {
 	TalkDataList::iterator i;
 	for (i = begin(); i != end(); ++i) {
 		TalkData *rec = (*i).get();
-		TalkEntryList::iterator i2;
 
-		for (i2 = rec->entries.begin(); i2 != rec->entries.end(); ++i2) {
+		for (TalkEntryList::const_iterator i2 = rec->entries.begin(); i2 != rec->entries.end(); ++i2) {
 			TalkEntryData *entry = (*i2).get();
 			entry->descId = stream->readUint16LE();
 		}
@@ -812,10 +806,8 @@ void SequenceDelayList::clear(bool forceClear) {
 	}
 }
 
-void SequenceDelayList::saveToStream(Common::WriteStream *stream) {
-	SequenceDelayList::iterator i;
-
-	for (i = begin(); i != end(); ++i) {
+void SequenceDelayList::saveToStream(Common::WriteStream *stream) const {
+	for (SequenceDelayList::const_iterator i = begin(); i != end(); ++i) {
 		SequenceDelayData *entry = (*i).get();
 		stream->writeUint16LE(entry->sequenceOffset);
 		stream->writeUint32LE(entry->timeoutCtr);
@@ -1016,7 +1008,7 @@ RandomActionSet *RandomActionList::getRoom(uint16 roomNumber) {
 	return NULL;
 }
 
-void RandomActionSet::saveToStream(Common::WriteStream *stream) {
+void RandomActionSet::saveToStream(Common::WriteStream *stream) const {
 	stream->writeByte(numActions());
 	for (int actionIndex = 0; actionIndex < _numActions; ++actionIndex)
 		stream->writeByte((byte)_types[actionIndex]);
@@ -1030,8 +1022,8 @@ void RandomActionSet::loadFromStream(Common::ReadStream *stream) {
 }
 
 
-void RandomActionList::saveToStream(Common::WriteStream *stream) {
-	for (iterator i = begin(); i != end(); ++i)
+void RandomActionList::saveToStream(Common::WriteStream *stream) const {
+	for (const_iterator i = begin(); i != end(); ++i)
 		(*i)->saveToStream(stream);
 }
 
@@ -1196,7 +1188,7 @@ BarEntry &BarmanLists::getDetails(uint16 roomNumber) {
 	error("Invalid room %d specified for barman details retrieval", roomNumber);
 }
 
-void BarmanLists::saveToStream(Common::WriteStream *stream) {
+void BarmanLists::saveToStream(Common::WriteStream *stream) const {
 	for (int index = 0; index < 3; ++index) {
 		uint16 value = (_barList[index].currentCustomer == NULL) ? 0 :
 			(_barList[index].currentCustomer - &_barList[index].customers[0]) / sizeof(BarEntry) + 1;
@@ -1296,7 +1288,7 @@ void ValueTableData::setField(FieldName fieldName, uint16 value) {
 	setField((uint16) fieldName, value);
 }
 
-void ValueTableData::saveToStream(Common::WriteStream *stream) {
+void ValueTableData::saveToStream(Common::WriteStream *stream) const {
 	// Write out the special fields
 	stream->writeUint16LE(_numGroats);
 	stream->writeSint16LE(_playerNewPos.position.x);
@@ -1371,7 +1363,7 @@ void CurrentActionEntry::setSupportData(uint16 entryId) {
 	setSupportData(newEntry);
 }
 
-void CurrentActionEntry::saveToStream(Common::WriteStream *stream) {
+void CurrentActionEntry::saveToStream(Common::WriteStream *stream) const {
 	debugC(ERROR_DETAILED, kLureDebugAnimations, "Saving hotspot action entry dyn=%d id=%d",
 		hasSupportData(), hasSupportData() ? supportData().id() : 0);
 	stream->writeByte((uint8) _action);
@@ -1466,14 +1458,12 @@ Common::String CurrentActionStack::getDebugInfo() const {
 	return buffer;
 }
 
-void CurrentActionStack::saveToStream(Common::WriteStream *stream) {
-	ActionsList::iterator i;
-
+void CurrentActionStack::saveToStream(Common::WriteStream *stream) const {
 	debugC(ERROR_DETAILED, kLureDebugAnimations, "Saving hotspot action stack");
 	Common::String buffer = getDebugInfo();
 	debugC(ERROR_DETAILED, kLureDebugAnimations, "%s", buffer.c_str());
 
-	for (i = _actions.begin(); i != _actions.end(); ++i) {
+	for (ActionsList::const_iterator i = _actions.begin(); i != _actions.end(); ++i) {
 		CurrentActionEntry *rec = (*i).get();
 		rec->saveToStream(stream);
 	}
diff --git a/engines/lure/res_struct.h b/engines/lure/res_struct.h
index 8d6c557297..a4d2f76cec 100644
--- a/engines/lure/res_struct.h
+++ b/engines/lure/res_struct.h
@@ -300,7 +300,7 @@ public:
 	void load(byte *srcData) {
 		memcpy(_data, srcData, ROOM_PATHS_SIZE);
 	}
-	const byte *data() { return _data; }
+	const byte *data() const { return _data; }
 	bool isOccupied(int x, int y);
 	bool isOccupied(int x, int y, int width);
 	void setOccupied(int x, int y, int width);
@@ -334,7 +334,7 @@ public:
 
 class RoomDataList: public Common::List<Common::SharedPtr<RoomData> > {
 public:
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 };
 
@@ -357,7 +357,7 @@ public:
 
 class RoomExitJoinList: public Common::List<Common::SharedPtr<RoomExitJoinData> > {
 public:
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 };
 
@@ -433,13 +433,13 @@ public:
 		if (_dynamicSupportData) delete _supportData;
 	}
 
-	CurrentAction action() { return _action; }
-	CharacterScheduleEntry &supportData() {
+	CurrentAction action() const { return _action; }
+	CharacterScheduleEntry &supportData() const {
 		if (!_supportData) error("Access made to non-defined action support record");
 		return *_supportData;
 	}
-	bool hasSupportData() { return _supportData != NULL; }
-	uint16 roomNumber() { return _roomNumber; }
+	bool hasSupportData() const { return _supportData != NULL; }
+	uint16 roomNumber() const { return _roomNumber; }
 	void setAction(CurrentAction newAction) { _action = newAction; }
 	void setRoomNumber(uint16 roomNum) { _roomNumber = roomNum; }
 	void setSupportData(CharacterScheduleEntry *newRec) {
@@ -452,7 +452,7 @@ public:
 	}
 	void setSupportData(uint16 entryId);
 
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	static CurrentActionEntry *loadFromStream(Common::ReadStream *stream);
 };
 
@@ -505,7 +505,7 @@ public:
 		validateStack();
 	}
 
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 	void copyFrom(CurrentActionStack &stack);
 };
@@ -569,13 +569,13 @@ public:
 	void enable() { flags |= 0x80; }
 	void disable() { flags &= 0x7F; }
 	Direction nonVisualDirection() { return (Direction) scriptLoadFlag; }
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 };
 
 class HotspotDataList: public Common::List<Common::SharedPtr<HotspotData> > {
 public:
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 };
 
@@ -663,7 +663,7 @@ public:
 
 class TalkDataList: public Common::List<Common::SharedPtr<TalkData> > {
 public:
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 };
 
@@ -722,7 +722,7 @@ public:
 	void tick();
 	void clear(bool forceClear = false);
 
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 };
 
@@ -760,8 +760,8 @@ public:
 	RandomActionSet(uint16 *&offset);
 	~RandomActionSet();
 
-	uint16 roomNumber() { return _roomNumber; }
-	int numActions() { return _numActions; }
+	uint16 roomNumber() const { return _roomNumber; }
+	int numActions() const { return _numActions; }
 	void getEntry(int index, RandomActionType &actionType, uint16 &id) {
 		assert((index >= 0) && (index < _numActions));
 		actionType = _types[index];
@@ -772,14 +772,14 @@ public:
 		assert(_types[index] == REPEAT_ONCE);
 		_types[index] = REPEAT_ONCE_DONE;
 	}
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 };
 
 class RandomActionList: public Common::List<Common::SharedPtr<RandomActionSet> > {
 public:
 	RandomActionSet *getRoom(uint16 roomNumber);
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 };
 
@@ -828,7 +828,7 @@ public:
 
 	void reset();
 	BarEntry &getDetails(uint16 roomNumber);
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 };
 
@@ -923,7 +923,7 @@ public:
 	uint8 &hdrFlagMask() { return _hdrFlagMask; }
 	PlayerNewPosition &playerNewPos() { return _playerNewPos; }
 
-	void saveToStream(Common::WriteStream *stream);
+	void saveToStream(Common::WriteStream *stream) const;
 	void loadFromStream(Common::ReadStream *stream);
 };
 
-- 
cgit v1.2.3


From 75efdd2d84e21f5d3d01afcc89d61289ae87e4a2 Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Tue, 13 Mar 2012 10:40:41 +0100
Subject: JANITORIAL: Replace (x ? false : true) by !(x).

---
 engines/kyra/eobcommon.cpp                       | 4 ++--
 engines/kyra/gui_eob.cpp                         | 6 +++---
 engines/kyra/screen_v2.cpp                       | 2 +-
 engines/kyra/sequences_hof.cpp                   | 4 ++--
 engines/kyra/sprites_lol.cpp                     | 4 ++--
 engines/kyra/timer_eob.cpp                       | 2 +-
 engines/kyra/vqa.cpp                             | 2 +-
 engines/lastexpress/entities/chapters.cpp        | 2 +-
 engines/sci/engine/kmenu.cpp                     | 2 +-
 engines/sci/graphics/controls16.cpp              | 2 +-
 engines/sci/graphics/menu.cpp                    | 4 ++--
 engines/sci/graphics/paint16.cpp                 | 2 +-
 engines/scumm/gfx_towns.cpp                      | 4 ++--
 engines/sword25/kernel/inputpersistenceblock.cpp | 2 +-
 engines/sword25/script/luabindhelper.h           | 2 +-
 15 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 1489e4f1f5..a63f123258 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -2066,7 +2066,7 @@ bool EoBCoreEngine::characterAttackHitTest(int charIndex, int monsterIndex, int
 
 	s = CLIP(s, 1, 20);
 
-	return s < m ? false : true;
+	return s >= m;
 }
 
 bool EoBCoreEngine::monsterAttackHitTest(EoBMonsterInPlay *m, int charIndex) {
@@ -2300,7 +2300,7 @@ bool EoBCoreEngine::trySavingThrow(void *target, int hpModifier, int level, int
 		s -= constMod[c->constitutionCur];
 	}
 
-	return rollDice(1, 20) < s ? false : true;
+	return rollDice(1, 20) >= s;
 }
 
 bool EoBCoreEngine::specialAttackSavingThrow(int charIndex, int type) {
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index e8e69d5b1f..76e4f0dba9 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -1876,7 +1876,7 @@ int GUI_EoB::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 			processButton(buttonList);
 
 		if (v6 && buttonList->buttonCallback)
-			runLoop = ((*buttonList->buttonCallback.get())(buttonList)) ? false : true;
+			runLoop = !(*buttonList->buttonCallback.get())(buttonList);
 
 		if ((flgs2 & 2) && (flgs & 0x20))
 			runLoop = false;
@@ -2331,7 +2331,7 @@ bool GUI_EoB::confirmDialogue2(int dim, int id, int deflt) {
 	_screen->setFont(of);
 	_screen->setScreenDim(od);
 
-	return newHighlight ? false : true;
+	return newHighlight == 0;
 }
 
 void GUI_EoB::messageDialogue(int dim, int id, int buttonTextCol) {
@@ -3548,7 +3548,7 @@ bool GUI_EoB::confirmDialogue(int id) {
 		_vm->removeInputTop();
 
 		if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP5] || inputFlag == _vm->_keyMap[Common::KEYCODE_SPACE] || inputFlag == _vm->_keyMap[Common::KEYCODE_RETURN]) {
-			result = lastHighlight ? false : true;
+			result = lastHighlight == 0;
 			inputFlag = 0x8021 + lastHighlight;
 			runLoop = false;
 		} else if (inputFlag == _vm->_keyMap[Common::KEYCODE_KP4] || inputFlag == _vm->_keyMap[Common::KEYCODE_LEFT] || inputFlag == _vm->_keyMap[Common::KEYCODE_KP6] || inputFlag == _vm->_keyMap[Common::KEYCODE_RIGHT]) {
diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp
index dde22498eb..7d4b064e2a 100644
--- a/engines/kyra/screen_v2.cpp
+++ b/engines/kyra/screen_v2.cpp
@@ -365,7 +365,7 @@ bool Screen_v2::calcBounds(int w0, int h0, int &x1, int &y1, int &w1, int &h1, i
 		}
 	}
 
-	return (w1 == -1) ? false : true;
+	return w1 != -1;
 }
 
 void Screen_v2::checkedPageUpdate(int srcPage, int dstPage) {
diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index 686c3c9320..f2abfb81dc 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -32,7 +32,7 @@ namespace Kyra {
 void KyraEngine_HoF::seq_playSequences(int startSeq, int endSeq) {
 	seq_init();
 
-	bool allowSkip = (!(_flags.isDemo && !_flags.isTalkie) && (startSeq == kSequenceTitle)) ? false : true;
+	bool allowSkip = (_flags.isDemo && !_flags.isTalkie) || startSeq != kSequenceTitle;
 
 	if (endSeq == -1)
 		endSeq = startSeq;
@@ -74,7 +74,7 @@ void KyraEngine_HoF::seq_playSequences(int startSeq, int endSeq) {
 		_seqFrameCounter = 0;
 		_seqStartTime = _system->getMillis();
 
-		allowSkip = (!(_flags.isDemo && !_flags.isTalkie) && (seqNum == kSequenceTitle)) ? false : true;
+		allowSkip = (_flags.isDemo && !_flags.isTalkie) || seqNum != kSequenceTitle;
 
 		Sequence cseq = _sequences->seq[seqNum];
 		SeqProc cb = _callbackS[seqNum];
diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp
index 5a05d81a22..a07abd4580 100644
--- a/engines/kyra/sprites_lol.cpp
+++ b/engines/kyra/sprites_lol.cpp
@@ -248,7 +248,7 @@ bool LoLEngine::updateMonsterAdjustBlocks(LoLMonster *monster) {
 	int16 fx2 = 0;
 	setLevelShapesDim(x2 + dims[y2], fx1, fx2, 13);
 
-	return (fx1 >= fx2) ? false : true;
+	return fx1 < fx2;
 }
 
 void LoLEngine::placeMonster(LoLMonster *monster, uint16 x, uint16 y) {
@@ -1447,7 +1447,7 @@ void LoLEngine::rearrangeAttackingMonster(LoLMonster *monster) {
 	uint16 mx = monster->x;
 	uint16 my = monster->y;
 	uint16 *c = (t & 1) ? &my : &mx;
-	bool centered = (*c & 0x7f) ? false : true;
+	bool centered = (*c & 0x7f) == 0;
 
 	bool posFlag = true;
 	if (monster->properties->maxWidth <= 63) {
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index de1becfa72..766fe453ab 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -186,7 +186,7 @@ void EoBCoreEngine::timerProcessFlyingObjects(int timerNum) {
 		if (!fo->enable)
 			continue;
 
-		bool endFlight = fo->distance ? false : true;
+		bool endFlight = fo->distance == 0;
 
 		uint8 pos = dirPosIndex[(fo->direction << 2) + (fo->curPos & 3)];
 		uint16 bl = fo->curBlock;
diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp
index 04455ae307..471e83c9ed 100644
--- a/engines/kyra/vqa.cpp
+++ b/engines/kyra/vqa.cpp
@@ -395,7 +395,7 @@ void VQAMovie::displayFrame(uint frameNum) {
 	if (frameNum >= _header.numFrames || !_opened)
 		return;
 
-	bool foundSound = _stream ? false : true;
+	bool foundSound = !_stream;
 	bool foundFrame = false;
 	uint i;
 
diff --git a/engines/lastexpress/entities/chapters.cpp b/engines/lastexpress/entities/chapters.cpp
index 96e08ba808..4ef2dc50e8 100644
--- a/engines/lastexpress/entities/chapters.cpp
+++ b/engines/lastexpress/entities/chapters.cpp
@@ -1805,7 +1805,7 @@ void Chapters::enterExitHelper(bool isEnteringStation) {
 	getObjects()->update(kObjectHandleOutsideLeft, kEntityPlayer, kObjectLocation1, kCursorNormal, isEnteringStation ? kCursorNormal : kCursorHand);
 	getObjects()->update(kObjectHandleOutsideRight, kEntityPlayer, kObjectLocation1, kCursorNormal, isEnteringStation ? kCursorNormal : kCursorHand);
 
-	getProgress().isTrainRunning = isEnteringStation ? false : true;
+	getProgress().isTrainRunning = !isEnteringStation;
 
 	if (isEnteringStation) {
 		ENTITY_PARAM(0, 2) = 1;
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index 02aa1d3ece..05ba7005d7 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -94,7 +94,7 @@ reg_t kDrawMenuBar(EngineState *s, int argc, reg_t *argv) {
 
 reg_t kMenuSelect(EngineState *s, int argc, reg_t *argv) {
 	reg_t eventObject = argv[0];
-	bool pauseSound = argc > 1 ? (argv[1].isNull() ? false : true) : true;
+	bool pauseSound = argc <= 1 || !argv[1].isNull();
 
 	return g_sci->_gfxMenu->kernelSelect(eventObject, pauseSound);
 }
diff --git a/engines/sci/graphics/controls16.cpp b/engines/sci/graphics/controls16.cpp
index ab54e468d1..7c09969717 100644
--- a/engines/sci/graphics/controls16.cpp
+++ b/engines/sci/graphics/controls16.cpp
@@ -297,7 +297,7 @@ void GfxControls16::kernelDrawButton(Common::Rect rect, reg_t obj, const char *t
 		_paint16->eraseRect(rect);
 		_paint16->frameRect(rect);
 		rect.grow(-2);
-		_ports->textGreyedOutput(style & 1 ? false : true);
+		_ports->textGreyedOutput(!(style & SCI_CONTROLS_STYLE_ENABLED));
 		_text16->Box(text, false, rect, SCI_TEXT16_ALIGNMENT_CENTER, fontId);
 		_ports->textGreyedOutput(false);
 		rect.grow(1);
diff --git a/engines/sci/graphics/menu.cpp b/engines/sci/graphics/menu.cpp
index 673729784f..47f34cf99d 100644
--- a/engines/sci/graphics/menu.cpp
+++ b/engines/sci/graphics/menu.cpp
@@ -286,7 +286,7 @@ void GfxMenu::kernelSetAttribute(uint16 menuId, uint16 itemId, uint16 attributeI
 
 	switch (attributeId) {
 	case SCI_MENU_ATTRIBUTE_ENABLED:
-		itemEntry->enabled = value.isNull() ? false : true;
+		itemEntry->enabled = !value.isNull();
 		break;
 	case SCI_MENU_ATTRIBUTE_SAID:
 		itemEntry->saidVmPtr = value;
@@ -606,7 +606,7 @@ void GfxMenu::drawMenu(uint16 oldMenuId, uint16 newMenuId) {
 		listItemEntry = *listItemIterator;
 		if (listItemEntry->menuId == newMenuId) {
 			if (!listItemEntry->separatorLine) {
-				_ports->textGreyedOutput(listItemEntry->enabled ? false : true);
+				_ports->textGreyedOutput(!listItemEntry->enabled);
 				_ports->moveTo(_menuRect.left, topPos);
 				_text16->DrawString(listItemEntry->textSplit.c_str());
 				_ports->moveTo(_menuRect.right - listItemEntry->textRightAlignedWidth - 5, topPos);
diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp
index 23177dfc7b..c951f3349d 100644
--- a/engines/sci/graphics/paint16.cpp
+++ b/engines/sci/graphics/paint16.cpp
@@ -513,7 +513,7 @@ reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {
 			argc--; argv++;
 			break;
 		case SCI_DISPLAY_SETGREYEDOUTPUT:
-			_ports->textGreyedOutput(argv[0].isNull() ? false : true);
+			_ports->textGreyedOutput(!argv[0].isNull());
 			argc--; argv++;
 			break;
 		case SCI_DISPLAY_SETFONT:
diff --git a/engines/scumm/gfx_towns.cpp b/engines/scumm/gfx_towns.cpp
index 8bffcab4a0..f86a4e56d5 100644
--- a/engines/scumm/gfx_towns.cpp
+++ b/engines/scumm/gfx_towns.cpp
@@ -271,7 +271,7 @@ void TownsScreen::setupLayer(int layer, int width, int height, int numCol, void
 
 	l->enabled = true;
 	_layers[0].onBottom = true;
-	_layers[1].onBottom = _layers[0].enabled ? false : true;
+	_layers[1].onBottom = !_layers[0].enabled;
 	l->ready = true;
 }
 
@@ -424,7 +424,7 @@ void TownsScreen::toggleLayers(int flag) {
 	_layers[0].enabled = (flag & 1) ? true : false;
 	_layers[0].onBottom = true;
 	_layers[1].enabled = (flag & 2) ? true : false;
-	_layers[1].onBottom = _layers[0].enabled ? false : true;
+	_layers[1].onBottom = !_layers[0].enabled;
 
 	_dirtyRects.clear();
 	_dirtyRects.push_back(Common::Rect(_width - 1, _height - 1));
diff --git a/engines/sword25/kernel/inputpersistenceblock.cpp b/engines/sword25/kernel/inputpersistenceblock.cpp
index cdce539c31..0fe5d88b80 100644
--- a/engines/sword25/kernel/inputpersistenceblock.cpp
+++ b/engines/sword25/kernel/inputpersistenceblock.cpp
@@ -86,7 +86,7 @@ void InputPersistenceBlock::read(bool &value) {
 	if (checkMarker(BOOL_MARKER)) {
 		uint uintBool = READ_LE_UINT32(_iter);
 		_iter += 4;
-		value = uintBool == 0 ? false : true;
+		value = uintBool != 0;
 	} else {
 		value = false;
 	}
diff --git a/engines/sword25/script/luabindhelper.h b/engines/sword25/script/luabindhelper.h
index 0cb6d37bdc..5223d4440e 100644
--- a/engines/sword25/script/luabindhelper.h
+++ b/engines/sword25/script/luabindhelper.h
@@ -40,7 +40,7 @@
 namespace Sword25 {
 
 #define lua_pushbooleancpp(L, b) (lua_pushboolean(L, b ? 1 : 0))
-#define lua_tobooleancpp(L, i) (lua_toboolean(L, i) == 0 ? false : true)
+#define lua_tobooleancpp(L, i) (lua_toboolean(L, i) != 0)
 
 struct lua_constant_reg {
 	const char     *Name;
-- 
cgit v1.2.3


From 612bfe40924c1d266476385d24a1b889bcf81209 Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Tue, 13 Mar 2012 10:59:32 +0100
Subject: JANITORIAL: Remove dead code.

---
 engines/lure/res.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines')

diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp
index 6328301233..001b882e0b 100644
--- a/engines/lure/res.cpp
+++ b/engines/lure/res.cpp
@@ -386,7 +386,6 @@ RoomData *Resources::getRoom(uint16 roomNumber) {
 	for (i = _roomData.begin(); i != _roomData.end(); ++i) {
 		RoomData *rec = (*i).get();
 		if (rec->roomNumber == roomNumber) return rec;
-		++rec;
 	}
 
 	return NULL;
-- 
cgit v1.2.3


From e40ba4c1354fabc0d1bd81a6ab80cd5f349d88fa Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Tue, 13 Mar 2012 14:53:40 +0100
Subject: JANITORIAL: Simply use *x instead of *x.get() on smart pointers.

---
 engines/kyra/gui_eob.cpp    |  12 ++--
 engines/kyra/gui_lok.cpp    |   6 +-
 engines/kyra/gui_lol.cpp    |   2 +-
 engines/kyra/gui_v2.cpp     |   2 +-
 engines/lure/debugger.cpp   |  42 ++++++------
 engines/lure/game.cpp       |   8 +--
 engines/lure/hotspots.cpp   |  56 ++++++++--------
 engines/lure/menu.cpp       |  46 ++++++-------
 engines/lure/res.cpp        |  19 +++---
 engines/lure/res_struct.cpp | 154 +++++++++++++++++++++-----------------------
 engines/lure/room.cpp       |  30 ++++-----
 engines/lure/sound.cpp      |  55 +++++++---------
 engines/lure/surface.cpp    |  32 ++++-----
 13 files changed, 227 insertions(+), 237 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 76e4f0dba9..e3c0743e5c 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -1460,7 +1460,7 @@ void GUI_EoB::processButton(Button *button) {
 				// nullsub (at least EOBII)
 			} else if (button->data0Val1 == 4) {
 				if (button->data1Callback)
-					(*button->data1Callback.get())(button);
+					(*button->data1Callback)(button);
 			}
 		} else if (button->data1Val1 == 2) {
 			if (!(button->flags2 & 4))
@@ -1469,7 +1469,7 @@ void GUI_EoB::processButton(Button *button) {
 			// nullsub (at least EOBII)
 		} else if (button->data1Val1 == 4) {
 			if (button->data1Callback)
-				(*button->data1Callback.get())(button);
+				(*button->data1Callback)(button);
 		}
 	}
 
@@ -1486,7 +1486,7 @@ void GUI_EoB::processButton(Button *button) {
 				// nullsub (at least EOBII)
 			} else if (button->data0Val1 == 4) {
 				if (button->data2Callback)
-					(*button->data2Callback.get())(button);
+					(*button->data2Callback)(button);
 			}
 		} else if (button->data2Val1 == 2) {
 			_screen->drawBox(sx, sy, fx2, fy2, (button->flags2 & 1) ? button->data3Val2 : button->data2Val2);
@@ -1494,7 +1494,7 @@ void GUI_EoB::processButton(Button *button) {
 			// nullsub (at least EOBII)
 		} else if (button->data2Val1 == 4) {
 			if (button->data2Callback)
-				(*button->data2Callback.get())(button);
+				(*button->data2Callback)(button);
 		}
 	}
 
@@ -1507,7 +1507,7 @@ void GUI_EoB::processButton(Button *button) {
 			// nullsub (at least EOBII)
 		} else if (button->data0Val1 == 4) {
 			if (button->data0Callback)
-				(*button->data0Callback.get())(button);
+				(*button->data0Callback)(button);
 		} else if (button->data0Val1 == 5) {
 			_screen->drawBox(sx, sy, fx2, fy2, button->data0Val2);
 		} else {
@@ -1876,7 +1876,7 @@ int GUI_EoB::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 			processButton(buttonList);
 
 		if (v6 && buttonList->buttonCallback)
-			runLoop = !(*buttonList->buttonCallback.get())(buttonList);
+			runLoop = !(*buttonList->buttonCallback)(buttonList);
 
 		if ((flgs2 & 2) && (flgs & 0x20))
 			runLoop = false;
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp
index 18470e5d76..b4e5148b64 100644
--- a/engines/kyra/gui_lok.cpp
+++ b/engines/kyra/gui_lok.cpp
@@ -243,7 +243,7 @@ int GUI_LoK::processButtonList(Button *list, uint16 inputFlag, int8 mouseWheel)
 		}
 
 		if (mouseWheel && list->mouseWheel == mouseWheel && list->buttonCallback) {
-			if ((*list->buttonCallback.get())(list))
+			if ((*list->buttonCallback)(list))
 				break;
 		}
 
@@ -282,7 +282,7 @@ int GUI_LoK::processButtonList(Button *list, uint16 inputFlag, int8 mouseWheel)
 
 			if (processMouseClick) {
 				if (list->buttonCallback) {
-					if ((*list->buttonCallback.get())(list))
+					if ((*list->buttonCallback)(list))
 						break;
 				}
 			}
@@ -349,7 +349,7 @@ void GUI_LoK::processButton(Button *button) {
 	if (processType == 1 && shape)
 		_screen->drawShape(_screen->_curPage, shape, x, y, button->dimTableIndex, 0x10);
 	else if (processType == 4 && callback)
-		(*callback.get())(button);
+		(*callback)(button);
 }
 
 void GUI_LoK::setGUILabels() {
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index b025aefbd0..a79da0681e 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -2165,7 +2165,7 @@ int GUI_LoL::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseW
 
 			if (buttonList->buttonCallback) {
 				//_vm->removeInputTop();
-				if ((*buttonList->buttonCallback.get())(buttonList))
+				if ((*buttonList->buttonCallback)(buttonList))
 					break;
 			}
 
diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp
index 580adb0e5d..65f8bd45e5 100644
--- a/engines/kyra/gui_v2.cpp
+++ b/engines/kyra/gui_v2.cpp
@@ -360,7 +360,7 @@ int GUI_v2::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseWh
 
 			if (buttonList->buttonCallback) {
 				_vm->removeInputTop();
-				if ((*buttonList->buttonCallback.get())(buttonList))
+				if ((*buttonList->buttonCallback)(buttonList))
 					break;
 			}
 
diff --git a/engines/lure/debugger.cpp b/engines/lure/debugger.cpp
index ef4a22f73a..3fbbf84469 100644
--- a/engines/lure/debugger.cpp
+++ b/engines/lure/debugger.cpp
@@ -119,21 +119,21 @@ bool Debugger::cmd_listRooms(int argc, const char **argv) {
 
 	DebugPrintf("Available rooms are:\n");
 	for (RoomDataList::iterator i = rooms.begin(); i != rooms.end(); ++i) {
-		RoomData *room = (*i).get();
+		RoomData const &room = **i;
 		// Explictly note the second drawbridge room as "Alt"
-		if (room->roomNumber == 49) {
+		if (room.roomNumber == 49) {
 			strings.getString(47, buffer);
 			strcat(buffer, " (alt)");
 		} else {
-			strings.getString(room->roomNumber, buffer);
+			strings.getString(room.roomNumber, buffer);
 		}
 
-		DebugPrintf("#%d - %s", room->roomNumber, buffer);
+		DebugPrintf("#%d - %s", room.roomNumber, buffer);
 
 		if (++ctr % 3 == 0) DebugPrintf("\n");
 		else {
 			// Write out spaces between columns
-			int numSpaces = 25 - strlen(buffer) - ((room->roomNumber >= 10) ? 2 : 1);
+			int numSpaces = 25 - strlen(buffer) - (room.roomNumber >= 10 ? 2 : 1);
 			char *s = buffer;
 			while (numSpaces-- > 0) *s++ = ' ';
 			*s = '\0';
@@ -243,13 +243,13 @@ bool Debugger::cmd_hotspots(int argc, const char **argv) {
 			// Loop for displaying active hotspots
 			HotspotList::iterator i;
 			for (i = res.activeHotspots().begin(); i != res.activeHotspots().end(); ++i) {
-				Hotspot *hotspot = (*i).get();
+				Hotspot const &hotspot = **i;
 
-				if (hotspot->nameId() == 0) strcpy(buffer, "none");
-				else strings.getString(hotspot->nameId(), buffer);
+				if (hotspot.nameId() == 0) strcpy(buffer, "none");
+				else strings.getString(hotspot.nameId(), buffer);
 
-				DebugPrintf("%4xh - %s pos=(%d,%d,%d)\n", hotspot->hotspotId(), buffer,
-					hotspot->x(), hotspot->y(), hotspot->roomNumber());
+				DebugPrintf("%4xh - %s pos=(%d,%d,%d)\n", hotspot.hotspotId(), buffer,
+					hotspot.x(), hotspot.y(), hotspot.roomNumber());
 			}
 		} else {
 			// Presume it's a room's hotspots
@@ -257,14 +257,14 @@ bool Debugger::cmd_hotspots(int argc, const char **argv) {
 
 			HotspotDataList::iterator i;
 			for (i = res.hotspotData().begin(); i != res.hotspotData().end(); ++i) {
-				HotspotData *hotspot = (*i).get();
+				HotspotData const &hotspot = **i;
 
-				if (hotspot->roomNumber == roomNumber) {
-					if (hotspot->nameId == 0) strcpy(buffer, "none");
-					else strings.getString(hotspot->nameId, buffer);
+				if (hotspot.roomNumber == roomNumber) {
+					if (hotspot.nameId == 0) strcpy(buffer, "none");
+					else strings.getString(hotspot.nameId, buffer);
 
-					DebugPrintf("%4xh - %s pos=(%d,%d,%d)\n", hotspot->hotspotId, buffer,
-					hotspot->startX, hotspot->startY, hotspot->roomNumber);
+					DebugPrintf("%4xh - %s pos=(%d,%d,%d)\n", hotspot.hotspotId, buffer,
+					hotspot.startX, hotspot.startY, hotspot.roomNumber);
 				}
 			}
 		}
@@ -415,10 +415,10 @@ bool Debugger::cmd_room(int argc, const char **argv) {
 	else {
 		RoomExitHotspotList::iterator i;
 		for (i = exits.begin(); i != exits.end(); ++i) {
-			RoomExitHotspotData *rec = (*i).get();
+			RoomExitHotspotData const &rec = **i;
 
 			DebugPrintf("\nArea - (%d,%d)-(%d,%d) Room=%d Cursor=%d Hotspot=%xh",
-				rec->xs, rec->ys, rec->xe, rec->ye, rec->destRoomNumber, rec->cursorNum, rec->hotspotId);
+				rec.xs, rec.ys, rec.xe, rec.ye, rec.destRoomNumber, rec.cursorNum, rec.hotspotId);
 		}
 
 		DebugPrintf("\n");
@@ -430,11 +430,11 @@ bool Debugger::cmd_room(int argc, const char **argv) {
 	else {
 		RoomExitList::iterator i2;
 		for (i2 = room->exits.begin(); i2 != room->exits.end(); ++i2) {
-			RoomExitData *rec2 = (*i2).get();
+			RoomExitData const &rec2 = **i2;
 
 			DebugPrintf("\nExit - (%d,%d)-(%d,%d) Dest=%d,(%d,%d) Dir=%s Sequence=%xh",
-				rec2->xs, rec2->ys, rec2->xe, rec2->ye, rec2->roomNumber,
-				rec2->x, rec2->y, directionList[rec2->direction], rec2->sequenceOffset);
+				rec2.xs, rec2.ys, rec2.xe, rec2.ye, rec2.roomNumber,
+				rec2.x, rec2.y, directionList[rec2.direction], rec2.sequenceOffset);
 		}
 
 		DebugPrintf("\n");
diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp
index 9542c35785..eaed7ebbe7 100644
--- a/engines/lure/game.cpp
+++ b/engines/lure/game.cpp
@@ -71,12 +71,12 @@ void Game::tick() {
 	uint16 *idList = new uint16[res.activeHotspots().size()];
 	int idSize = 0;
 	for (i = res.activeHotspots().begin(); i != res.activeHotspots().end(); ++i) {
-		Hotspot *hotspot = (*i).get();
+		Hotspot const &hotspot = **i;
 
-		if (!_preloadFlag || ((hotspot->layer() != 0xff) &&
-			(hotspot->hotspotId() < FIRST_NONCHARACTER_ID)))
+		if (!_preloadFlag || ((hotspot.layer() != 0xff) &&
+			(hotspot.hotspotId() < FIRST_NONCHARACTER_ID)))
 			// Add hotspot to list to execute
-			idList[idSize++] = hotspot->hotspotId();
+			idList[idSize++] = hotspot.hotspotId();
 	}
 
 	debugC(ERROR_DETAILED, kLureDebugAnimations, "Hotspot ticks begin");
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index 698df8715e..ee7a185ea1 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -1169,30 +1169,30 @@ bool Hotspot::doorCloseCheck(uint16 doorId) {
 	HotspotList::iterator i;
 	HotspotList &lst = res.activeHotspots();
 	for (i = lst.begin(); i != lst.end(); ++i) {
-		Hotspot *hsCurrent = (*i).get();
+		Hotspot const &hsCurrent = **i;
 
 		// Skip entry if it's the door or the character
-		if ((hsCurrent->hotspotId() == hotspotId()) ||
-			(hsCurrent->hotspotId() == doorHotspot->hotspotId()))
+		if ((hsCurrent.hotspotId() == hotspotId()) ||
+			(hsCurrent.hotspotId() == doorHotspot->hotspotId()))
 			continue;
 
 		// Skip entry if it doesn't meet certain criteria
-		if ((hsCurrent->layer() == 0) ||
-			(hsCurrent->roomNumber() != doorHotspot->roomNumber()) ||
-			(hsCurrent->hotspotId() < PLAYER_ID) ||
-			((hsCurrent->hotspotId() >= 0x408) && (hsCurrent->hotspotId() < 0x2710)))
+		if ((hsCurrent.layer() == 0) ||
+			(hsCurrent.roomNumber() != doorHotspot->roomNumber()) ||
+			(hsCurrent.hotspotId() < PLAYER_ID) ||
+			((hsCurrent.hotspotId() >= 0x408) && (hsCurrent.hotspotId() < 0x2710)))
 			continue;
 
 		// Also skip entry if special Id
-		if ((hsCurrent->hotspotId() == 0xfffe) || (hsCurrent->hotspotId() == 0xffff))
+		if ((hsCurrent.hotspotId() == 0xfffe) || (hsCurrent.hotspotId() == 0xffff))
 			continue;
 
 		// Check to see if the character is intersecting the door area
-		int tempY = hsCurrent->y() + hsCurrent->heightCopy();
-		if ((hsCurrent->x() >= bounds.right) ||
-			(hsCurrent->x() + hsCurrent->widthCopy() <= bounds.left) ||
-			(tempY + hsCurrent->charRectY() < bounds.top) ||
-			(tempY - hsCurrent->yCorrection() - hsCurrent->charRectY() > bounds.bottom))
+		int tempY = hsCurrent.y() + hsCurrent.heightCopy();
+		if ((hsCurrent.x() >= bounds.right) ||
+			(hsCurrent.x() + hsCurrent.widthCopy() <= bounds.left) ||
+			(tempY + hsCurrent.charRectY() < bounds.top) ||
+			(tempY - hsCurrent.yCorrection() - hsCurrent.charRectY() > bounds.bottom))
 			continue;
 
 		// At this point we know a character is blocking door, so return false
@@ -1883,12 +1883,12 @@ void Hotspot::doStatus(HotspotData *hotspot) {
 	HotspotDataList &list = res.hotspotData();
 	HotspotDataList::iterator i;
 	for (i = list.begin(); i != list.end(); ++i) {
-		HotspotData *rec = (*i).get();
+		HotspotData const &rec = **i;
 
-		if (rec->roomNumber == PLAYER_ID) {
+		if (rec.roomNumber == PLAYER_ID) {
 			if (numItems++ == 0) strcat(buffer, ": ");
 			else strcat(buffer, ", ");
-			strings.getString(rec->nameId, buffer + strlen(buffer));
+			strings.getString(rec.nameId, buffer + strlen(buffer));
 		}
 	}
 
@@ -4385,8 +4385,8 @@ Common::String PathFinder::getDebugInfo() const {
 
 	WalkingActionList::const_iterator i;
 	for (i = _list.begin(); i != _list.end(); ++i) {
-		WalkingActionEntry *e = (*i).get();
-		buffer += Common::String::format("Direction=%d, numSteps=%d\n", e->direction(), e->numSteps());
+		WalkingActionEntry const &e = **i;
+		buffer += Common::String::format("Direction=%d, numSteps=%d\n", e.direction(), e.numSteps());
 	}
 
 	return buffer;
@@ -4505,9 +4505,9 @@ void PathFinder::saveToStream(Common::WriteStream *stream) const {
 
 		// Save any active step sequence
 		for (WalkingActionList::const_iterator i = _list.begin(); i != _list.end(); ++i) {
-			WalkingActionEntry *entry = (*i).get();
-			stream->writeByte(entry->direction());
-			stream->writeSint16LE(entry->rawSteps());
+			WalkingActionEntry &entry = **i;
+			stream->writeByte(entry.direction());
+			stream->writeSint16LE(entry.rawSteps());
 		}
 		stream->writeByte(0xff);
 		stream->writeSint16LE(_stepCtr);
@@ -4684,15 +4684,15 @@ bool Support::isCharacterInList(uint16 *lst, int numEntries, uint16 charId) {
 
 void HotspotList::saveToStream(Common::WriteStream *stream) const {
 	for (HotspotList::const_iterator i = begin(); i != end(); ++i) {
-		Hotspot *hotspot = (*i).get();
-		debugC(ERROR_INTERMEDIATE, kLureDebugAnimations, "Saving hotspot %xh", hotspot->hotspotId());
-		bool dynamicObject = hotspot->hotspotId() != hotspot->originalId();
-		stream->writeUint16LE(hotspot->originalId());
+		Hotspot const &hotspot = **i;
+		debugC(ERROR_INTERMEDIATE, kLureDebugAnimations, "Saving hotspot %xh", hotspot.hotspotId());
+		bool dynamicObject = hotspot.hotspotId() != hotspot.originalId();
+		stream->writeUint16LE(hotspot.originalId());
 		stream->writeByte(dynamicObject);
-		stream->writeUint16LE(hotspot->destHotspotId());
-		hotspot->saveToStream(stream);
+		stream->writeUint16LE(hotspot.destHotspotId());
+		hotspot.saveToStream(stream);
 
-		debugC(ERROR_DETAILED, kLureDebugAnimations, "Saved hotspot %xh", hotspot->hotspotId());
+		debugC(ERROR_DETAILED, kLureDebugAnimations, "Saved hotspot %xh", hotspot.hotspotId());
 	}
 	stream->writeUint16LE(0);
 }
diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp
index 61de2bf165..5a0dd26cba 100644
--- a/engines/lure/menu.cpp
+++ b/engines/lure/menu.cpp
@@ -276,11 +276,11 @@ uint16 PopupMenu::ShowInventory() {
 
 	HotspotDataList::iterator i;
 	for (i = rsc.hotspotData().begin(); i != rsc.hotspotData().end(); ++i) {
-		HotspotData *hotspot = (*i).get();
-		if (hotspot->roomNumber == PLAYER_ID) {
-			idList[itemCtr] = hotspot->hotspotId;
+		HotspotData const &hotspot = **i;
+		if (hotspot.roomNumber == PLAYER_ID) {
+			idList[itemCtr] = hotspot.hotspotId;
 			char *hotspotName = itemNames[itemCtr++] = (char *) malloc(MAX_HOTSPOT_NAME_SIZE);
-			strings.getString(hotspot->nameId, hotspotName);
+			strings.getString(hotspot.nameId, hotspotName);
 		}
 	}
 
@@ -317,52 +317,52 @@ uint16 PopupMenu::ShowItems(Action contextAction, uint16 roomNumber) {
 
 	// Loop for rooms
 	for (ir = rooms.begin(); ir != rooms.end(); ++ir) {
-		RoomData *roomData = (*ir).get();
+		RoomData const &roomData = **ir;
 		// Pre-condition checks for whether to skip room
-		if ((roomData->hdrFlags != 15) && ((roomData->hdrFlags & fields.hdrFlagMask()) == 0))
+		if ((roomData.hdrFlags != 15) && ((roomData.hdrFlags & fields.hdrFlagMask()) == 0))
 			continue;
-		if (((roomData->flags & HOTSPOTFLAG_MENU_EXCLUSION) != 0) || ((roomData->flags & HOTSPOTFLAG_FOUND) == 0))
+		if (((roomData.flags & HOTSPOTFLAG_MENU_EXCLUSION) != 0) || ((roomData.flags & HOTSPOTFLAG_FOUND) == 0))
 			continue;
-		if ((roomData->actions & contextBitflag) == 0)
+		if ((roomData.actions & contextBitflag) == 0)
 			continue;
 
 		// Add room to list of entries to display
 		if (numItems == MAX_NUM_DISPLAY_ITEMS) error("Out of space in ask list");
-		entryIds[numItems] = roomData->roomNumber;
-		nameIds[numItems] = roomData->roomNumber;
+		entryIds[numItems] = roomData.roomNumber;
+		nameIds[numItems] = roomData.roomNumber;
 		entryNames[numItems] = (char *) Memory::alloc(MAX_HOTSPOT_NAME_SIZE);
-		strings.getString(roomData->roomNumber, entryNames[numItems]);
+		strings.getString(roomData.roomNumber, entryNames[numItems]);
 		++numItems;
 	}
 
 	// Loop for hotspots
 	for (ih = hotspots.begin(); ih != hotspots.end(); ++ih) {
-		HotspotData *hotspot = (*ih).get();
+		HotspotData const &hotspot = **ih;
 
-		if ((hotspot->headerFlags != 15) &&
-			((hotspot->headerFlags & fields.hdrFlagMask()) == 0))
+		if ((hotspot.headerFlags != 15) &&
+			((hotspot.headerFlags & fields.hdrFlagMask()) == 0))
 			continue;
 
-		if (((hotspot->flags & HOTSPOTFLAG_MENU_EXCLUSION) != 0) || ((hotspot->flags & HOTSPOTFLAG_FOUND) == 0))
+		if (((hotspot.flags & HOTSPOTFLAG_MENU_EXCLUSION) != 0) || ((hotspot.flags & HOTSPOTFLAG_FOUND) == 0))
 			// Skip the current hotspot
 			continue;
 
 		// If the hotspot is room specific, skip if the character will not be in the specified room
-		if (((hotspot->flags & HOTSPOTFLAG_ROOM_SPECIFIC) != 0) &&
-			(hotspot->roomNumber != roomNumber))
+		if (((hotspot.flags & HOTSPOTFLAG_ROOM_SPECIFIC) != 0) &&
+			(hotspot.roomNumber != roomNumber))
 			continue;
 
 		// If hotspot does not allow action, then skip it
-		if ((hotspot->actions & contextBitflag) == 0)
+		if ((hotspot.actions & contextBitflag) == 0)
 			continue;
 
 		// If a special hotspot Id, then skip displaying
-		if ((hotspot->nameId == 0x17A) || (hotspot->nameId == 0x147))
+		if ((hotspot.nameId == 0x17A) || (hotspot.nameId == 0x147))
 			continue;
 
 		// Check if the hotspot's name is already used in an already set item
 		itemCtr = 0;
-		while ((itemCtr < numItems) && (nameIds[itemCtr] != hotspot->nameId))
+		while ((itemCtr < numItems) && (nameIds[itemCtr] != hotspot.nameId))
 			++itemCtr;
 		if (itemCtr != numItems)
 			// Item's name is already present - skip hotspot
@@ -370,10 +370,10 @@ uint16 PopupMenu::ShowItems(Action contextAction, uint16 roomNumber) {
 
 		// Add hotspot to list of entries to display
 		if (numItems == MAX_NUM_DISPLAY_ITEMS) error("Out of space in ask list");
-		entryIds[numItems] = hotspot->hotspotId;
-		nameIds[numItems] = hotspot->nameId;
+		entryIds[numItems] = hotspot.hotspotId;
+		nameIds[numItems] = hotspot.nameId;
 		entryNames[numItems] = (char *) Memory::alloc(MAX_HOTSPOT_NAME_SIZE);
-		strings.getString(hotspot->nameId, entryNames[numItems]);
+		strings.getString(hotspot.nameId, entryNames[numItems]);
 		++numItems;
 	}
 
diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp
index 001b882e0b..9ec641140b 100644
--- a/engines/lure/res.cpp
+++ b/engines/lure/res.cpp
@@ -677,9 +677,9 @@ void Resources::deactivateHotspot(uint16 hotspotId, bool isDestId) {
 	HotspotList::iterator i = _activeHotspots.begin();
 
 	while (i != _activeHotspots.end()) {
-		Hotspot *h = (*i).get();
-		if ((!isDestId && (h->hotspotId() == hotspotId)) ||
-			(isDestId && (h->destHotspotId() == hotspotId) && (h->hotspotId() == 0xffff))) {
+		Hotspot const &h = **i;
+		if ((!isDestId && (h.hotspotId() == hotspotId)) ||
+			(isDestId && (h.destHotspotId() == hotspotId) && (h.hotspotId() == 0xffff))) {
 			_activeHotspots.erase(i);
 			break;
 		}
@@ -707,8 +707,7 @@ uint16 Resources::numInventoryItems() {
 	HotspotDataList &list = _hotspotData;
 	HotspotDataList::iterator i;
 	for (i = list.begin(); i != list.end(); ++i) {
-		HotspotData *rec = (*i).get();
-		if (rec->roomNumber == PLAYER_ID) ++numItems;
+		if ((*i)->roomNumber == PLAYER_ID) ++numItems;
 	}
 
 	return numItems;
@@ -753,12 +752,12 @@ void Resources::saveToStream(Common::WriteStream *stream) {
 	// Save out the schedule for any non-active NPCs
 	HotspotDataList::iterator i;
 	for (i = _hotspotData.begin(); i != _hotspotData.end(); ++i) {
-		HotspotData *rec = (*i).get();
-		if (!rec->npcSchedule.isEmpty()) {
-			Hotspot *h = getActiveHotspot(rec->hotspotId);
+		HotspotData const &rec = **i;
+		if (!rec.npcSchedule.isEmpty()) {
+			Hotspot *h = getActiveHotspot(rec.hotspotId);
 			if (h == NULL) {
-				stream->writeUint16LE(rec->hotspotId);
-				rec->npcSchedule.saveToStream(stream);
+				stream->writeUint16LE(rec.hotspotId);
+				rec.npcSchedule.saveToStream(stream);
 			}
 		}
 	}
diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp
index ded6b5e6fc..aee4f11215 100644
--- a/engines/lure/res_struct.cpp
+++ b/engines/lure/res_struct.cpp
@@ -280,9 +280,9 @@ void RoomPathsData::decompress(RoomPathsDecompressedData &dataOut, int character
 
 void RoomDataList::saveToStream(Common::WriteStream *stream) const {
 	for (RoomDataList::const_iterator i = begin(); i != end(); ++i) {
-		RoomData *rec = (*i).get();
-		stream->writeByte(rec->flags);
-		const byte *pathData = rec->paths.data();
+		RoomData const &rec = **i;
+		stream->writeByte(rec.flags);
+		const byte *pathData = rec.paths.data();
 		stream->write(pathData, ROOM_PATHS_HEIGHT * ROOM_PATHS_WIDTH);
 	}
 }
@@ -292,10 +292,10 @@ void RoomDataList::loadFromStream(Common::ReadStream *stream) {
 	byte data[ROOM_PATHS_HEIGHT * ROOM_PATHS_WIDTH];
 
 	for (i = begin(); i != end(); ++i) {
-		RoomData *rec = (*i).get();
-		rec->flags = stream->readByte();
+		RoomData &rec = **i;
+		rec.flags = stream->readByte();
 		stream->read(data, ROOM_PATHS_HEIGHT * ROOM_PATHS_WIDTH);
-		rec->paths.load(data);
+		rec.paths.load(data);
 	}
 }
 
@@ -317,15 +317,15 @@ RoomExitJoinData::RoomExitJoinData(RoomExitJoinResource *rec) {
 
 void RoomExitJoinList::saveToStream(Common::WriteStream *stream) const {
 	for (RoomExitJoinList::const_iterator i = begin(); i != end(); ++i) {
-		RoomExitJoinData *rec = (*i).get();
-
-		stream->writeUint16LE(rec->hotspots[0].hotspotId);
-		stream->writeUint16LE(rec->hotspots[1].hotspotId);
-		stream->writeByte(rec->hotspots[0].currentFrame);
-		stream->writeByte(rec->hotspots[0].destFrame);
-		stream->writeByte(rec->hotspots[1].currentFrame);
-		stream->writeByte(rec->hotspots[1].destFrame);
-		stream->writeByte(rec->blocked);
+		RoomExitJoinData const &rec = **i;
+
+		stream->writeUint16LE(rec.hotspots[0].hotspotId);
+		stream->writeUint16LE(rec.hotspots[1].hotspotId);
+		stream->writeByte(rec.hotspots[0].currentFrame);
+		stream->writeByte(rec.hotspots[0].destFrame);
+		stream->writeByte(rec.hotspots[1].currentFrame);
+		stream->writeByte(rec.hotspots[1].destFrame);
+		stream->writeByte(rec.blocked);
 	}
 
 	// Write end of list marker
@@ -334,21 +334,21 @@ void RoomExitJoinList::saveToStream(Common::WriteStream *stream) const {
 
 void RoomExitJoinList::loadFromStream(Common::ReadStream *stream) {
 	for (RoomExitJoinList::iterator i = begin(); i != end(); ++i) {
-		RoomExitJoinData *rec = (*i).get();
+		RoomExitJoinData &rec = **i;
 
 		uint16 hotspot1Id = stream->readUint16LE();
 		if (hotspot1Id == 0xffff) error("Invalid room exit join list");
 		uint16 hotspot2Id = stream->readUint16LE();
 
-		if ((rec->hotspots[0].hotspotId != hotspot1Id) ||
-			(rec->hotspots[1].hotspotId != hotspot2Id))
+		if ((rec.hotspots[0].hotspotId != hotspot1Id) ||
+			(rec.hotspots[1].hotspotId != hotspot2Id))
 			break;
 
-		rec->hotspots[0].currentFrame = stream->readByte();
-		rec->hotspots[0].destFrame = stream->readByte();
-		rec->hotspots[1].currentFrame = stream->readByte();
-		rec->hotspots[1].destFrame = stream->readByte();
-		rec->blocked = stream->readByte();
+		rec.hotspots[0].currentFrame = stream->readByte();
+		rec.hotspots[0].destFrame    = stream->readByte();
+		rec.hotspots[1].currentFrame = stream->readByte();
+		rec.hotspots[1].destFrame    = stream->readByte();
+		rec.blocked = stream->readByte();
 	}
 
 	// Read final end of list marker
@@ -366,8 +366,8 @@ HotspotActionData::HotspotActionData(HotspotActionResource *rec) {
 uint16 HotspotActionList::getActionOffset(Action action) {
 	iterator i;
 	for (i = begin(); i != end(); ++i) {
-		HotspotActionData *rec = (*i).get();
-		if (rec->action == action) return rec->sequenceOffset;
+		HotspotActionData const &rec = **i;
+		if (rec.action == action) return rec.sequenceOffset;
 	}
 
 	return 0;
@@ -534,9 +534,9 @@ void HotspotData::loadFromStream(Common::ReadStream *stream) {
 
 void HotspotDataList::saveToStream(Common::WriteStream *stream) const {
 	for (const_iterator i = begin(); i != end(); ++i) {
-		HotspotData *hotspot = (*i).get();
-		stream->writeUint16LE(hotspot->hotspotId);
-		hotspot->saveToStream(stream);
+		HotspotData const &hotspot = **i;
+		stream->writeUint16LE(hotspot.hotspotId);
+		hotspot.saveToStream(stream);
 	}
 	stream->writeUint16LE(0);
 }
@@ -579,14 +579,14 @@ bool MovementDataList::getFrame(uint16 currentFrame, int16 &xChange,
 	iterator i;
 
 	for (i = begin(); i != end(); ++i) {
-		MovementData *rec = (*i).get();
+		MovementData const &rec = **i;
 		if (foundFlag || (i == begin())) {
-			xChange = rec->xChange;
-			yChange = rec->yChange;
-			nextFrame = rec->frameNumber;
+			xChange = rec.xChange;
+			yChange = rec.yChange;
+			nextFrame = rec.frameNumber;
 			if (foundFlag) return true;
 		}
-		if (rec->frameNumber == currentFrame) foundFlag = true;
+		if (rec.frameNumber == currentFrame) foundFlag = true;
 	}
 
 	return true;
@@ -698,11 +698,10 @@ TalkEntryData *TalkData::getResponse(int index) {
 
 void TalkDataList::saveToStream(Common::WriteStream *stream) const {
 	for (TalkDataList::const_iterator i = begin(); i != end(); ++i) {
-		TalkData *rec = (*i).get();
+		TalkData const &rec = **i;
 
-		for (TalkEntryList::const_iterator i2 = rec->entries.begin(); i2 != rec->entries.end(); ++i2) {
-			TalkEntryData *entry = (*i2).get();
-			stream->writeUint16LE(entry->descId);
+		for (TalkEntryList::const_iterator i2 = rec.entries.begin(); i2 != rec.entries.end(); ++i2) {
+			stream->writeUint16LE((*i2)->descId);
 		}
 	}
 }
@@ -710,11 +709,10 @@ void TalkDataList::saveToStream(Common::WriteStream *stream) const {
 void TalkDataList::loadFromStream(Common::ReadStream *stream) {
 	TalkDataList::iterator i;
 	for (i = begin(); i != end(); ++i) {
-		TalkData *rec = (*i).get();
+		TalkData const &rec = **i;
 
-		for (TalkEntryList::const_iterator i2 = rec->entries.begin(); i2 != rec->entries.end(); ++i2) {
-			TalkEntryData *entry = (*i2).get();
-			entry->descId = stream->readUint16LE();
+		for (TalkEntryList::const_iterator i2 = rec.entries.begin(); i2 != rec.entries.end(); ++i2) {
+			(*i2)->descId = stream->readUint16LE();
 		}
 	}
 }
@@ -779,17 +777,17 @@ void SequenceDelayList::tick() {
 		g_system->getMillis());
 
 	for (i = begin(); i != end(); ++i) {
-		SequenceDelayData *entry = (*i).get();
-		debugC(ERROR_DETAILED, kLureDebugScripts, "Delay List check %xh at time %d", entry->sequenceOffset, entry->timeoutCtr);
+		SequenceDelayData &entry = **i;
+		debugC(ERROR_DETAILED, kLureDebugScripts, "Delay List check %xh at time %d", entry.sequenceOffset, entry.timeoutCtr);
 
-		if (entry->timeoutCtr <= GAME_FRAME_DELAY) {
+		if (entry.timeoutCtr <= GAME_FRAME_DELAY) {
 			// Timeout reached - delete entry from list and execute the sequence
-			uint16 seqOffset = entry->sequenceOffset;
+			uint16 seqOffset = entry.sequenceOffset;
 			erase(i);
 			Script::execute(seqOffset);
 			return;
 		} else {
-			entry->timeoutCtr -= GAME_FRAME_DELAY;
+			entry.timeoutCtr -= GAME_FRAME_DELAY;
 		}
 	}
 }
@@ -798,8 +796,7 @@ void SequenceDelayList::clear(bool forceClear) {
 	SequenceDelayList::iterator i = begin();
 
 	while (i != end()) {
-		SequenceDelayData *entry = (*i).get();
-		if (entry->canClear || forceClear)
+		if ((*i)->canClear || forceClear)
 			i = erase(i);
 		else
 			++i;
@@ -808,10 +805,10 @@ void SequenceDelayList::clear(bool forceClear) {
 
 void SequenceDelayList::saveToStream(Common::WriteStream *stream) const {
 	for (SequenceDelayList::const_iterator i = begin(); i != end(); ++i) {
-		SequenceDelayData *entry = (*i).get();
-		stream->writeUint16LE(entry->sequenceOffset);
-		stream->writeUint32LE(entry->timeoutCtr);
-		stream->writeByte(entry->canClear);
+		SequenceDelayData const &entry = **i;
+		stream->writeUint16LE(entry.sequenceOffset);
+		stream->writeUint32LE(entry.timeoutCtr);
+		stream->writeByte(entry.canClear);
 	}
 
 	stream->writeUint16LE(0);
@@ -1044,9 +1041,9 @@ RoomExitIndexedHotspotData::RoomExitIndexedHotspotData(RoomExitIndexedHotspotRes
 uint16 RoomExitIndexedHotspotList::getHotspot(uint16 roomNumber, uint8 hotspotIndexId) {
 	iterator i;
 	for (i = begin(); i != end(); ++i) {
-		RoomExitIndexedHotspotData *entry = (*i).get();
-		if ((entry->roomNumber == roomNumber) && (entry->hotspotIndex == hotspotIndexId))
-			return entry->hotspotId;
+		RoomExitIndexedHotspotData const &entry = **i;
+		if ((entry.roomNumber == roomNumber) && (entry.hotspotIndex == hotspotIndexId))
+			return entry.hotspotId;
 	}
 
 	// No hotspot
@@ -1066,12 +1063,12 @@ PausedCharacter::PausedCharacter(uint16 SrcCharId, uint16 DestCharId) {
 void PausedCharacterList::reset(uint16 hotspotId) {
 	iterator i;
 	for (i = begin(); i != end(); ++i) {
-		PausedCharacter *rec = (*i).get();
+		PausedCharacter &rec = **i;
 
-		if (rec->srcCharId == hotspotId) {
-			rec->counter = 1;
-			if (rec->destCharId < START_EXIT_ID)
-				rec->charHotspot->pauseCtr = 1;
+		if (rec.srcCharId == hotspotId) {
+			rec.counter = 1;
+			if (rec.destCharId < START_EXIT_ID)
+				rec.charHotspot->pauseCtr = 1;
 		}
 	}
 }
@@ -1080,15 +1077,15 @@ void PausedCharacterList::countdown() {
 	iterator i = begin();
 
 	while (i != end()) {
-		PausedCharacter *rec = (*i).get();
-		--rec->counter;
+		PausedCharacter &rec = **i;
+		--rec.counter;
 
 		// Handle reflecting counter to hotspot
-		if (rec->destCharId < START_EXIT_ID)
-			rec->charHotspot->pauseCtr = rec->counter + 1;
+		if (rec.destCharId < START_EXIT_ID)
+			rec.charHotspot->pauseCtr = rec.counter + 1;
 
 		// If counter has reached zero, remove entry from list
-		if (rec->counter == 0)
+		if (rec.counter == 0)
 			i = erase(i);
 		else
 			++i;
@@ -1101,13 +1098,13 @@ void PausedCharacterList::scan(Hotspot &h) {
 	if (h.blockedState() != BS_NONE) {
 
 		for (i = begin(); i != end(); ++i) {
-			PausedCharacter *rec = (*i).get();
+			PausedCharacter &rec = **i;
 
-			if (rec->srcCharId == h.hotspotId()) {
-				rec->counter = IDLE_COUNTDOWN_SIZE;
+			if (rec.srcCharId == h.hotspotId()) {
+				rec.counter = IDLE_COUNTDOWN_SIZE;
 
-				if (rec->destCharId < START_EXIT_ID)
-					rec->charHotspot->pauseCtr = IDLE_COUNTDOWN_SIZE;
+				if (rec.destCharId < START_EXIT_ID)
+					rec.charHotspot->pauseCtr = IDLE_COUNTDOWN_SIZE;
 			}
 		}
 	}
@@ -1131,9 +1128,9 @@ int PausedCharacterList::check(uint16 charId, int numImpinging, uint16 *impingin
 		// calling character and the impinging list entry
 		bool foundEntry = false;
 		for (i = res.pausedList().begin(); !foundEntry && (i != res.pausedList().end()); ++i) {
-			PausedCharacter *rec = (*i).get();
-			foundEntry = (rec->srcCharId == charId) &&
-				(rec->destCharId == hotspot->hotspotId());
+			PausedCharacter const &rec = **i;
+			foundEntry = (rec.srcCharId == charId) &&
+				(rec.destCharId == hotspot->hotspotId());
 		}
 
 		if (foundEntry)
@@ -1435,11 +1432,11 @@ Common::String CurrentActionStack::getDebugInfo() const {
 	buffer += Common::String::format("CurrentActionStack::list num_actions=%d\n", size());
 
 	for (i = _actions.begin(); i != _actions.end(); ++i) {
-		CurrentActionEntry *entry = (*i).get();
-		buffer += Common::String::format("style=%d room#=%d", entry->action(), entry->roomNumber());
+		CurrentActionEntry const &entry = **i;
+		buffer += Common::String::format("style=%d room#=%d", entry.action(), entry.roomNumber());
 
-		if (entry->hasSupportData()) {
-			CharacterScheduleEntry &rec = entry->supportData();
+		if (entry.hasSupportData()) {
+			CharacterScheduleEntry &rec = entry.supportData();
 
 			buffer += Common::String::format(", action=%d params=", rec.action());
 
@@ -1464,8 +1461,7 @@ void CurrentActionStack::saveToStream(Common::WriteStream *stream) const {
 	debugC(ERROR_DETAILED, kLureDebugAnimations, "%s", buffer.c_str());
 
 	for (ActionsList::const_iterator i = _actions.begin(); i != _actions.end(); ++i) {
-		CurrentActionEntry *rec = (*i).get();
-		rec->saveToStream(stream);
+		(*i)->saveToStream(stream);
 	}
 	stream->writeByte(0xff);      // End of list marker
 	debugC(ERROR_DETAILED, kLureDebugAnimations, "Finished saving hotspot action stack");
diff --git a/engines/lure/room.cpp b/engines/lure/room.cpp
index 4cb0cecd45..9a9313ece9 100644
--- a/engines/lure/room.cpp
+++ b/engines/lure/room.cpp
@@ -138,8 +138,8 @@ void Room::leaveRoom() {
 	HotspotList &list = r.activeHotspots();
 	HotspotList::iterator i = list.begin();
 	while (i != list.end()) {
-		Hotspot *h = i->get();
-		if (!h->persistant()) {
+		Hotspot const &h = **i;
+		if (!h.persistant()) {
 			i = list.erase(i);
 		} else {
 			++i;
@@ -153,11 +153,11 @@ void Room::loadRoomHotspots() {
 
 	HotspotDataList::iterator i;
 	for (i = list.begin(); i != list.end(); ++i) {
-		HotspotData *rec = (*i).get();
+		HotspotData const &rec = **i;
 
-		if ((rec->hotspotId < 0x7530) && (rec->roomNumber == _roomNumber) &&
-			(rec->layer != 0))
-			r.activateHotspot(rec->hotspotId);
+		if ((rec.hotspotId < 0x7530) && (rec.roomNumber == _roomNumber) &&
+			(rec.layer != 0))
+			r.activateHotspot(rec.hotspotId);
 	}
 }
 
@@ -252,24 +252,24 @@ CursorType Room::checkRoomExits() {
 
 	RoomExitHotspotList::iterator i;
 	for (i = exits.begin(); i != exits.end(); ++i) {
-		RoomExitHotspotData *rec = (*i).get();
+		RoomExitHotspotData const &rec = **i;
 		skipFlag = false;
 
-		if (rec->hotspotId != 0) {
-			join = res.getExitJoin(rec->hotspotId);
+		if (rec.hotspotId != 0) {
+			join = res.getExitJoin(rec.hotspotId);
 			if ((join) && (join->blocked != 0))
 				skipFlag = true;
 		}
 
-		if (!skipFlag && (m.x() >= rec->xs) && (m.x() <= rec->xe) &&
-			(m.y() >= rec->ys) && (m.y() <= rec->ye)) {
+		if (!skipFlag && (m.x() >= rec.xs) && (m.x() <= rec.xe) &&
+			(m.y() >= rec.ys) && (m.y() <= rec.ye)) {
 			// Cursor is within exit area
-			CursorType cursorNum = (CursorType)rec->cursorNum;
-			_destRoomNumber = rec->destRoomNumber;
+			CursorType cursorNum = (CursorType)rec.cursorNum;
+			_destRoomNumber = rec.destRoomNumber;
 
 			// If it's a hotspotted exit, change arrow to the + arrow
-			if (rec->hotspotId != 0) {
-				_hotspotId = rec->hotspotId;
+			if (rec.hotspotId != 0) {
+				_hotspotId = rec.hotspotId;
 				_hotspot = res.getHotspot(_hotspotId);
 				_hotspotNameId = _hotspot->nameId;
 				_isExit = true;
diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp
index bf0abdea07..298483bed8 100644
--- a/engines/lure/sound.cpp
+++ b/engines/lure/sound.cpp
@@ -107,8 +107,7 @@ void SoundManager::saveToStream(Common::WriteStream *stream) {
 	SoundListIterator i;
 
 	for (i = _activeSounds.begin(); i != _activeSounds.end(); ++i) {
-		SoundDescResource *rec = (*i).get();
-		stream->writeByte(rec->soundNumber);
+		stream->writeByte((*i)->soundNumber);
 	}
 	stream->writeByte(0xff);
 }
@@ -335,14 +334,14 @@ void SoundManager::tidySounds() {
 	SoundListIterator i = _activeSounds.begin();
 
 	while (i != _activeSounds.end()) {
-		SoundDescResource *rec = (*i).get();
+		SoundDescResource const &rec = **i;
 
-		if (musicInterface_CheckPlaying(rec->soundNumber))
+		if (musicInterface_CheckPlaying(rec.soundNumber))
 			// Still playing, so move to next entry
 			++i;
 		else {
 			// Mark the channels that it used as now being free
-			Common::fill(_channelsInUse+rec->channel, _channelsInUse+rec->channel+rec->numChannels, false);
+			Common::fill(_channelsInUse + rec.channel, _channelsInUse + rec.channel + rec.numChannels, false);
 
 			i = _activeSounds.erase(i);
 		}
@@ -356,10 +355,10 @@ void SoundManager::removeSounds() {
 	SoundListIterator i = _activeSounds.begin();
 
 	while (i != _activeSounds.end()) {
-		SoundDescResource *rec = (*i).get();
+		SoundDescResource const &rec = **i;
 
-		if ((rec->flags & SF_IN_USE) != 0)
-			musicInterface_Stop(rec->soundNumber);
+		if ((rec.flags & SF_IN_USE) != 0)
+			musicInterface_Stop(rec.soundNumber);
 
 		++i;
 	}
@@ -370,13 +369,13 @@ void SoundManager::restoreSounds() {
 	SoundListIterator i = _activeSounds.begin();
 
 	while (i != _activeSounds.end()) {
-		SoundDescResource *rec = (*i).get();
+		SoundDescResource const &rec = **i;
 
-		if ((rec->numChannels != 0) && ((rec->flags & SF_RESTORE) != 0)) {
-			Common::fill(_channelsInUse+rec->channel, _channelsInUse+rec->channel+rec->numChannels, true);
+		if ((rec.numChannels != 0) && ((rec.flags & SF_RESTORE) != 0)) {
+			Common::fill(_channelsInUse + rec.channel, _channelsInUse + rec.channel + rec.numChannels, true);
 
-			musicInterface_Play(rec->soundNumber, rec->channel, rec->numChannels);
-			musicInterface_SetVolume(rec->channel, rec->volume);
+			musicInterface_Play(rec.soundNumber, rec.channel, rec.numChannels);
+			musicInterface_SetVolume(rec.channel, rec.volume);
 		}
 
 		++i;
@@ -397,10 +396,10 @@ void SoundManager::fadeOut() {
 		g_system->lockMutex(_soundMutex);
 		MusicListIterator i;
 		for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) {
-			MidiMusic *music = (*i).get();
-			if (music->getVolume() > 0) {
+			MidiMusic &music = **i;
+			if (music.getVolume() > 0) {
 				inProgress = true;
-				music->setVolume(music->getVolume() >= 10 ? (music->getVolume() - 10) : 0);
+				music.setVolume(music.getVolume() >= 10 ? music.getVolume() - 10 : 0);
 			}
 		}
 
@@ -468,8 +467,7 @@ void SoundManager::musicInterface_Stop(uint8 soundNumber) {
 	g_system->lockMutex(_soundMutex);
 	MusicListIterator i;
 	for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) {
-		MidiMusic *music = (*i).get();
-		if (music->soundNumber() == soundNum) {
+		if ((*i)->soundNumber() == soundNum) {
 			_playingSounds.erase(i);
 			break;
 		}
@@ -489,8 +487,7 @@ bool SoundManager::musicInterface_CheckPlaying(uint8 soundNumber) {
 	g_system->lockMutex(_soundMutex);
 	MusicListIterator i;
 	for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) {
-		MidiMusic *music = (*i).get();
-		if (music->soundNumber() == soundNum) {
+		if ((*i)->soundNumber() == soundNum) {
 			result = true;
 			break;
 		}
@@ -511,9 +508,9 @@ void SoundManager::musicInterface_SetVolume(uint8 channelNum, uint8 volume) {
 	g_system->lockMutex(_soundMutex);
 	MusicListIterator i;
 	for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) {
-		MidiMusic *music = (*i).get();
-		if (music->channelNumber() == channelNum)
-			music->setVolume(volume);
+		MidiMusic &music = **i;
+		if (music.channelNumber() == channelNum)
+			music.setVolume(volume);
 	}
 	g_system->unlockMutex(_soundMutex);
 }
@@ -528,8 +525,7 @@ void SoundManager::musicInterface_KillAll() {
 	g_system->lockMutex(_soundMutex);
 	MusicListIterator i;
 	for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) {
-		MidiMusic *music = (*i).get();
-		music->stopMusic();
+		(*i)->stopMusic();
 	}
 
 	_playingSounds.clear();
@@ -561,8 +557,7 @@ void SoundManager::musicInterface_TidySounds() {
 	g_system->lockMutex(_soundMutex);
 	MusicListIterator i = _playingSounds.begin();
 	while (i != _playingSounds.end()) {
-		MidiMusic *music = (*i).get();
-		if (!music->isPlaying())
+		if (!(*i)->isPlaying())
 			i = _playingSounds.erase(i);
 		else
 			++i;
@@ -583,9 +578,9 @@ void SoundManager::doTimer() {
 
 	MusicListIterator i;
 	for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) {
-		MidiMusic *music = (*i).get();
-		if (music->isPlaying())
-			music->onTimer();
+		MidiMusic &music = **i;
+		if (music.isPlaying())
+			music.onTimer();
 	}
 
 	g_system->unlockMutex(_soundMutex);
diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp
index bfada8fde6..4d63647af5 100644
--- a/engines/lure/surface.cpp
+++ b/engines/lure/surface.cpp
@@ -1329,8 +1329,8 @@ bool CopyProtectionDialog::show() {
 			++hotspot6;
 
 		// Add wording header and display screen
-		(hotspot2->get())->setFrameNumber(1);
-		(hotspot2->get())->copyTo(&screen.screen());
+		(*hotspot2)->setFrameNumber(1);
+		(*hotspot2)->copyTo(&screen.screen());
 		screen.update();
 		screen.setPalette(&p);
 
@@ -1340,8 +1340,8 @@ bool CopyProtectionDialog::show() {
 		} while (!events.interruptableDelay(100));
 
 		// Change title text to selection
-		(hotspot2->get())->setFrameNumber(0);
-		(hotspot2->get())->copyTo(&screen.screen());
+		(*hotspot2)->setFrameNumber(0);
+		(*hotspot2)->copyTo(&screen.screen());
 		screen.update();
 
 		// Clear any prior try
@@ -1356,8 +1356,8 @@ bool CopyProtectionDialog::show() {
 						HotspotsList::iterator tmpHotspot = _hotspots.begin();
 						for (int i = 0; i < _charIndex + 3; i++)
 							++tmpHotspot;
-						(tmpHotspot->get())->setFrameNumber(10);   // Blank space
-						(tmpHotspot->get())->copyTo(&screen.screen());
+						(*tmpHotspot)->setFrameNumber(10);   // Blank space
+						(*tmpHotspot)->copyTo(&screen.screen());
 
 						screen.update();
 					} else if ((events.event().kbd.keycode >= Common::KEYCODE_0) &&
@@ -1366,8 +1366,8 @@ bool CopyProtectionDialog::show() {
 						for (int i = 0; i < _charIndex + 3; i++)
 							++tmpHotspot;
 						// Number pressed
-						(tmpHotspot->get())->setFrameNumber(events.event().kbd.ascii - '0');
-						(tmpHotspot->get())->copyTo(&screen.screen());
+						(*tmpHotspot)->setFrameNumber(events.event().kbd.ascii - '0');
+						(*tmpHotspot)->copyTo(&screen.screen());
 
 						++_charIndex;
 					}
@@ -1385,11 +1385,11 @@ bool CopyProtectionDialog::show() {
 			return false;
 
 		// At this point, two page numbers have been entered - validate them
-		int page1 = ((hotspot3->get())->frameNumber() * 10) + (hotspot4->get())->frameNumber();
-		int page2 = ((hotspot5->get())->frameNumber() * 10) + (hotspot6->get())->frameNumber();
+		int page1 = ((*hotspot3)->frameNumber() * 10) + (*hotspot4)->frameNumber();
+		int page2 = ((*hotspot5)->frameNumber() * 10) + (*hotspot6)->frameNumber();
 
-		if ((page1 == pageNumbers[(hotspot0->get())->frameNumber()]) &&
-			(page2 == pageNumbers[(hotspot1->get())->frameNumber()]))
+		if ((page1 == pageNumbers[(*hotspot0)->frameNumber()]) &&
+		    (page2 == pageNumbers[(*hotspot1)->frameNumber()]))
 			return true;
 	}
 
@@ -1404,11 +1404,11 @@ void CopyProtectionDialog::chooseCharacters() {
 	int char2 = rnd.getRandomNumber(19);
 
 	HotspotsList::iterator curHotspot = _hotspots.begin();
-	(curHotspot->get())->setFrameNumber(char1);
-	(curHotspot->get())->copyTo(&screen.screen());
+	(*curHotspot)->setFrameNumber(char1);
+	(*curHotspot)->copyTo(&screen.screen());
 	++curHotspot;
-	(curHotspot->get())->setFrameNumber(char2);
-	(curHotspot->get())->copyTo(&screen.screen());
+	(*curHotspot)->setFrameNumber(char2);
+	(*curHotspot)->copyTo(&screen.screen());
 
 	screen.update();
 }
-- 
cgit v1.2.3


From 2f6528933d8061881c81ac87b0028fb4368dbcc9 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 16 Mar 2012 15:55:39 -0400
Subject: MOHAWK: Improve Riven save/load error messages

---
 engines/mohawk/riven.cpp          |  6 +++---
 engines/mohawk/riven_saveload.cpp | 18 +++++++++---------
 engines/mohawk/riven_saveload.h   |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 38b38d2c56..95a8313536 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -171,7 +171,7 @@ Common::Error MohawkEngine_Riven::run() {
 			error ("Could not find saved game");
 
 		// Attempt to load the game. On failure, just send us to the main menu.
-		if (!_saveLoad->loadGame(savedGamesList[gameToLoad])) {
+		if (_saveLoad->loadGame(savedGamesList[gameToLoad]).getCode() != Common::kNoError) {
 			changeToStack(aspit);
 			changeToCard(1);
 		}
@@ -729,7 +729,7 @@ void MohawkEngine_Riven::runLoadDialog() {
 }
 
 Common::Error MohawkEngine_Riven::loadGameState(int slot) {
-	return _saveLoad->loadGame(_saveLoad->generateSaveGameList()[slot]) ? Common::kNoError : Common::kUnknownError;
+	return _saveLoad->loadGame(_saveLoad->generateSaveGameList()[slot]);
 }
 
 Common::Error MohawkEngine_Riven::saveGameState(int slot, const Common::String &desc) {
@@ -738,7 +738,7 @@ Common::Error MohawkEngine_Riven::saveGameState(int slot, const Common::String &
 	if ((uint)slot < saveList.size())
 		_saveLoad->deleteSave(saveList[slot]);
 
-	return _saveLoad->saveGame(Common::String(desc)) ? Common::kNoError : Common::kUnknownError;
+	return _saveLoad->saveGame(desc);
 }
 
 Common::String MohawkEngine_Riven::getStackName(uint16 stack) const {
diff --git a/engines/mohawk/riven_saveload.cpp b/engines/mohawk/riven_saveload.cpp
index 18c13ec12b..f5bf7782d4 100644
--- a/engines/mohawk/riven_saveload.cpp
+++ b/engines/mohawk/riven_saveload.cpp
@@ -88,13 +88,13 @@ static uint16 mapNewStackIDToOld(uint16 newID) {
 	return 0;
 }
 
-bool RivenSaveLoad::loadGame(Common::String filename) {
+Common::Error RivenSaveLoad::loadGame(Common::String filename) {
 	if (_vm->getFeatures() & GF_DEMO) // Don't load games in the demo
-		return false;
+		return Common::kNoError;
 
 	Common::InSaveFile *loadFile =  _saveFileMan->openForLoading(filename);
 	if (!loadFile)
-		return false;
+		return Common::kReadingFailed;
 
 	debug(0, "Loading game from \'%s\'", filename.c_str());
 
@@ -103,7 +103,7 @@ bool RivenSaveLoad::loadGame(Common::String filename) {
 	if (!mhk->openStream(loadFile)) {
 		warning("Save file is not a Mohawk archive");
 		delete mhk;
-		return false;
+		return Common::Error(Common::kUnknownError, "Invalid save file");
 	}
 
 	// First, let's make sure we're using a saved game file from this version of Riven by checking the VERS resource
@@ -114,7 +114,7 @@ bool RivenSaveLoad::loadGame(Common::String filename) {
 		|| (saveGameVersion == kDVDSaveGameVersion && !(_vm->getFeatures() & GF_DVD))) {
 		warning("Incompatible saved game versions. No support for this yet");
 		delete mhk;
-		return false;
+		return Common::Error(Common::kUnknownError, "Incompatible save version");
 	}
 
 	// Now, we'll read in the variable values.
@@ -206,7 +206,7 @@ bool RivenSaveLoad::loadGame(Common::String filename) {
 	delete zips;
 	delete mhk;
 
-	return true;
+	return Common::kNoError;
 }
 
 Common::MemoryWriteStreamDynamic *RivenSaveLoad::genVERSSection() {
@@ -273,7 +273,7 @@ Common::MemoryWriteStreamDynamic *RivenSaveLoad::genZIPSSection() {
 	return stream;
 }
 
-bool RivenSaveLoad::saveGame(Common::String filename) {
+Common::Error RivenSaveLoad::saveGame(Common::String filename) {
 	// NOTE: This code is designed to only output a Mohawk archive
 	// for a Riven saved game. It's hardcoded to do this because
 	// (as of right now) this is the only place in the engine
@@ -295,7 +295,7 @@ bool RivenSaveLoad::saveGame(Common::String filename) {
 
 	Common::OutSaveFile *saveFile = _saveFileMan->openForSaving(filename);
 	if (!saveFile)
-		return false;
+		return Common::kWritingFailed;
 
 	debug (0, "Saving game to \'%s\'", filename.c_str());
 
@@ -418,7 +418,7 @@ bool RivenSaveLoad::saveGame(Common::String filename) {
 	delete varsSection;
 	delete zipsSection;
 
-	return true;
+	return Common::kNoError;
 }
 
 void RivenSaveLoad::deleteSave(Common::String saveName) {
diff --git a/engines/mohawk/riven_saveload.h b/engines/mohawk/riven_saveload.h
index c1b3fc639e..37b73c26c6 100644
--- a/engines/mohawk/riven_saveload.h
+++ b/engines/mohawk/riven_saveload.h
@@ -42,8 +42,8 @@ public:
 	~RivenSaveLoad();
 
 	Common::StringArray generateSaveGameList();
-	bool loadGame(Common::String);
-	bool saveGame(Common::String);
+	Common::Error loadGame(Common::String);
+	Common::Error saveGame(Common::String);
 	void deleteSave(Common::String);
 
 private:
-- 
cgit v1.2.3


From 5ae2543795433513e68339b16e0783d4b3295204 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 16 Mar 2012 16:16:25 -0400
Subject: MOHAWK: Disable Riven demo save/load GUI buttons

---
 engines/mohawk/detection_tables.h | 2 +-
 engines/mohawk/riven.h            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 08df0a2cbe..5acc1bb179 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -376,7 +376,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_DEMO | ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUIO2(GUIO_NOASPECT, GUIO_NOLAUNCHLOAD)
 		},
 		GType_RIVEN,
 		GF_DEMO,
diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h
index e99a9f78fc..961d85d61a 100644
--- a/engines/mohawk/riven.h
+++ b/engines/mohawk/riven.h
@@ -130,8 +130,8 @@ public:
 
 	GUI::Debugger *getDebugger();
 
-	bool canLoadGameStateCurrently() { return true; }
-	bool canSaveGameStateCurrently() { return true; }
+	bool canLoadGameStateCurrently() { return !(getFeatures() & GF_DEMO); }
+	bool canSaveGameStateCurrently() { return !(getFeatures() & GF_DEMO); }
 	Common::Error loadGameState(int slot);
 	Common::Error saveGameState(int slot, const Common::String &desc);
 	bool hasFeature(EngineFeature f) const;
-- 
cgit v1.2.3


From a64b5e2a778333916d6f4b47dc679eba6d34be09 Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Thu, 15 Mar 2012 10:16:45 +0100
Subject: ALL: Use GCC_ATLEAST().

---
 engines/sword25/util/lua/luaconf.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sword25/util/lua/luaconf.h b/engines/sword25/util/lua/luaconf.h
index 38ff9e1320..53d0f55290 100644
--- a/engines/sword25/util/lua/luaconf.h
+++ b/engines/sword25/util/lua/luaconf.h
@@ -182,8 +182,7 @@
 #define LUAI_FUNC	static
 #define LUAI_DATA	/* empty */
 
-#elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
-      defined(__ELF__) && !defined(__PLAYSTATION2__)
+#elif GCC_ATLEAST(3, 2) && defined(__ELF__) && !defined(__PLAYSTATION2__)
 /*
 ** The PS2 gcc compiler doesn't like the visibility attribute, so
 ** we use the normal "extern" definitions in the block below
-- 
cgit v1.2.3


From 223794fb383637944c3b161c04ecc233a354c9ae Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 17 Mar 2012 22:02:16 +0100
Subject: ALL: Make use of defined() for the preprocessor consistent.

This does not change the use of defined for some NDS source files, since they
seem to be (based on?) third party code.
---
 engines/scumm/scumm_v7.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/scumm_v7.h b/engines/scumm/scumm_v7.h
index 81bb25e0b5..6fb98a0af7 100644
--- a/engines/scumm/scumm_v7.h
+++ b/engines/scumm/scumm_v7.h
@@ -72,7 +72,7 @@ protected:
 	int _languageIndexSize;
 	char _lastStringTag[12+1];
 
-#if defined(__SYMBIAN32__) || defined (_WIN32_WCE) // for some reason VC6 cannot find the base class TextObject
+#if defined(__SYMBIAN32__) || defined(_WIN32_WCE) // for some reason VC6 cannot find the base class TextObject
 	struct SubtitleText {
 		int16 xpos, ypos;
 		byte color;
-- 
cgit v1.2.3


From 4bdd38923ad7ef66199e6ed6ccb3f89f4ec782c7 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Mon, 19 Mar 2012 11:03:38 -0400
Subject: MOHAWK: Properly initialize the Riven tdomeelev variable

Thanks to Robot_Maker20 for noticing the bug
---
 engines/mohawk/riven_vars.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines')

diff --git a/engines/mohawk/riven_vars.cpp b/engines/mohawk/riven_vars.cpp
index ba5c343e07..8ddb76eec9 100644
--- a/engines/mohawk/riven_vars.cpp
+++ b/engines/mohawk/riven_vars.cpp
@@ -305,6 +305,7 @@ void MohawkEngine_Riven::initVars() {
 	_vars["gnmagcar"] = 1;
 	_vars["omusicplayer"] = 1;
 	_vars["transitionmode"] = kRivenTransitionSpeedFastest;
+	_vars["tdomeelev"] = 1;
 
 	// Randomize the telescope combination
 	uint32 &teleCombo = _vars["tcorrectorder"];
-- 
cgit v1.2.3


From 29f7cc33fb66ded97a8261beb8d16dd951bdec59 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 30 Jun 2011 08:13:35 -0400
Subject: MOHAWK: Use Surface::convertTo() for video 8bpp->true color
 conversion

---
 engines/mohawk/video.cpp | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'engines')

diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp
index 8d72fa3f72..80fa4bf9a0 100644
--- a/engines/mohawk/video.cpp
+++ b/engines/mohawk/video.cpp
@@ -235,25 +235,7 @@ bool VideoManager::updateMovies() {
 						if (_videoStreams[i]->hasDirtyPalette())
 							_videoStreams[i]->setSystemPalette();
 					} else {
-						convertedFrame = new Graphics::Surface();
-						const byte *palette = _videoStreams[i]->getPalette();
-						assert(palette);
-
-						convertedFrame->create(frame->w, frame->h, pixelFormat);
-
-						for (uint16 j = 0; j < frame->h; j++) {
-							for (uint16 k = 0; k < frame->w; k++) {
-								byte palIndex = *((const byte *)frame->getBasePtr(k, j));
-								byte r = palette[palIndex * 3];
-								byte g = palette[palIndex * 3 + 1];
-								byte b = palette[palIndex * 3 + 2];
-								if (pixelFormat.bytesPerPixel == 2)
-									*((uint16 *)convertedFrame->getBasePtr(k, j)) = pixelFormat.RGBToColor(r, g, b);
-								else
-									*((uint32 *)convertedFrame->getBasePtr(k, j)) = pixelFormat.RGBToColor(r, g, b);
-							}
-						}
-
+						convertedFrame = frame->convertTo(pixelFormat, _videoStreams[i]->getPalette());
 						frame = convertedFrame;
 					}
 				}
-- 
cgit v1.2.3


From 426c81a7a7a4d6f47b73db1a75908b548d250e4e Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 30 Jun 2011 08:16:19 -0400
Subject: GRAPHICS: Rewrite ImageDecoder to have an improved API

The new bitmap decoder class is based off the Mohawk one, and now has 8bpp decoding capability.
---
 engines/hugo/dialogs.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/hugo/dialogs.cpp b/engines/hugo/dialogs.cpp
index c43cdd7b46..e0b0198470 100644
--- a/engines/hugo/dialogs.cpp
+++ b/engines/hugo/dialogs.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "common/substream.h"
-#include "graphics/imagedec.h"
+#include "graphics/decoders/bmp.h"
 #include "gui/gui-manager.h"
 #include "gui/ThemeEval.h"
 
@@ -128,7 +128,16 @@ void TopMenu::loadBmpArr(Common::SeekableReadStream &in) {
 		uint16 bmpSize = in.readUint16BE();
 		uint32 filPos = in.pos();
 		Common::SeekableSubReadStream stream(&in, filPos, filPos + bmpSize);
-		arrayBmp[i * 2] = Graphics::ImageDecoder::loadFile(stream, g_system->getOverlayFormat());
+
+		Graphics::BitmapDecoder bitmapDecoder;
+		if (!bitmapDecoder.loadStream(stream))
+			error("TopMenu::loadBmpArr(): Could not load bitmap");
+
+		const Graphics::Surface *bitmapSrc = bitmapDecoder.getSurface();
+		if (bitmapSrc->format.bytesPerPixel == 1)
+			error("TopMenu::loadBmpArr(): Unhandled paletted image");
+
+		arrayBmp[i * 2] = bitmapSrc->convertTo(g_system->getOverlayFormat());
 		arrayBmp[i * 2 + 1] = new Graphics::Surface();
 		arrayBmp[i * 2 + 1]->create(arrayBmp[i * 2]->w * 2, arrayBmp[i * 2]->h * 2, g_system->getOverlayFormat());
 		byte *src = (byte *)arrayBmp[i * 2]->pixels;
@@ -154,7 +163,7 @@ void TopMenu::loadBmpArr(Common::SeekableReadStream &in) {
 			}
 		}
 
-		in.skip(bmpSize);
+		in.seek(filPos + bmpSize);
 	}
 }
 
-- 
cgit v1.2.3


From 270f8077c2fa4f226a693d95c7653b5d358b9556 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 30 Jun 2011 10:58:38 -0400
Subject: MOHAWK: Make MystBitmap use BitmapDecoder

---
 engines/mohawk/bitmap.cpp | 101 ++++++++++------------------------------------
 engines/mohawk/bitmap.h   |  24 +----------
 2 files changed, 23 insertions(+), 102 deletions(-)

(limited to 'engines')

diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp
index 4edde31236..952b6daec2 100644
--- a/engines/mohawk/bitmap.cpp
+++ b/engines/mohawk/bitmap.cpp
@@ -29,6 +29,7 @@
 #include "common/substream.h"
 #include "common/system.h"
 #include "common/textconsole.h"
+#include "graphics/decoders/bmp.h"
 
 namespace Mohawk {
 
@@ -631,97 +632,37 @@ void MohawkBitmap::drawRLE8(Graphics::Surface *surface, bool isLE) {
 
 MohawkSurface *MystBitmap::decodeImage(Common::SeekableReadStream* stream) {
 	uint32 uncompressedSize = stream->readUint32LE();
-	Common::SeekableReadStream* bmpStream = decompressLZ(stream, uncompressedSize);
+	Common::SeekableReadStream *bmpStream = decompressLZ(stream, uncompressedSize);
 	delete stream;
 
-	_header.type = bmpStream->readUint16BE();
+	Graphics::BitmapDecoder bitmapDecoder;
+	if (!bitmapDecoder.loadStream(*bmpStream))
+		error("Could not decode Myst bitmap");
 
-	if (_header.type != 'BM')
-		error("BMP header not detected");
+	const Graphics::Surface *bmpSurface = bitmapDecoder.getSurface();
+	Graphics::Surface *newSurface = 0;
 
-	_header.size = bmpStream->readUint32LE();
-	assert (_header.size > 0);
-	_header.res1 = bmpStream->readUint16LE();
-	_header.res2 = bmpStream->readUint16LE();
-	_header.imageOffset = bmpStream->readUint32LE();
-
-	_info.size = bmpStream->readUint32LE();
-
-	if (_info.size != 40)
-		error("Only Windows v3 BMP's are supported");
-
-	_info.width = bmpStream->readUint32LE();
-	_info.height = bmpStream->readUint32LE();
-	_info.planes = bmpStream->readUint16LE();
-	_info.bitsPerPixel = bmpStream->readUint16LE();
-	_info.compression = bmpStream->readUint32LE();
-	_info.imageSize = bmpStream->readUint32LE();
-	_info.pixelsPerMeterX = bmpStream->readUint32LE();
-	_info.pixelsPerMeterY = bmpStream->readUint32LE();
-	_info.colorsUsed = bmpStream->readUint32LE();
-	_info.colorsImportant = bmpStream->readUint32LE();
-
-	if (_info.compression != 0)
-		error("Unhandled BMP compression %d", _info.compression);
-
-	if (_info.colorsUsed == 0)
-		_info.colorsUsed = 256;
-
-	if (_info.bitsPerPixel != 8 && _info.bitsPerPixel != 24)
-		error("%dbpp Bitmaps not supported", _info.bitsPerPixel);
-
-	byte *palData = NULL;
-
-	if (_info.bitsPerPixel == 8) {
-		palData = (byte *)malloc(256 * 3);
-		for (uint16 i = 0; i < _info.colorsUsed; i++) {
-			palData[i * 3 + 2] = bmpStream->readByte();
-			palData[i * 3 + 1] = bmpStream->readByte();
-			palData[i * 3 + 0] = bmpStream->readByte();
-			bmpStream->readByte();
-		}
-	}
-
-	bmpStream->seek(_header.imageOffset);
-
-	Graphics::Surface *surface = createSurface(_info.width, _info.height);
-	int srcPitch = _info.width * (_info.bitsPerPixel >> 3);
-	const int extraDataLength = (srcPitch % 4) ? 4 - (srcPitch % 4) : 0;
-
-	if (_info.bitsPerPixel == 8) {
-		byte *dst = (byte *)surface->pixels;
-
-		for (uint32 i = 0; i < _info.height; i++) {
-			bmpStream->read(dst + (_info.height - i - 1) * _info.width, _info.width);
-			bmpStream->skip(extraDataLength);
-		}
+	if (bmpSurface->format.bytesPerPixel == 1) {
+		_bitsPerPixel = 8;
+		newSurface = new Graphics::Surface();
+		newSurface->copyFrom(*bmpSurface);
 	} else {
-		Graphics::PixelFormat pixelFormat = g_system->getScreenFormat();
-
-		byte *dst = (byte *)surface->pixels + (surface->h - 1) * surface->pitch;
-
-		for (uint32 i = 0; i < _info.height; i++) {
-			for (uint32 j = 0; j < _info.width; j++) {
-				byte b = bmpStream->readByte();
-				byte g = bmpStream->readByte();
-				byte r = bmpStream->readByte();
+		_bitsPerPixel = 24;
+		newSurface = bmpSurface->convertTo(g_system->getScreenFormat());
+	}
 
-				if (pixelFormat.bytesPerPixel == 2)
-					*((uint16 *)dst) = pixelFormat.RGBToColor(r, g, b);
-				else
-					*((uint32 *)dst) = pixelFormat.RGBToColor(r, g, b);
+	// Copy the palette to one of our own
+	const byte *palette = bitmapDecoder.getPalette();
+	byte *newPal = 0;
 
-				dst += pixelFormat.bytesPerPixel;
-			}
-
-			bmpStream->skip(extraDataLength);
-			dst -= surface->pitch * 2;
-		}
+	if (palette) {
+		newPal = (byte *)malloc(256 * 3);
+		memcpy(newPal, palette, 256 * 3);
 	}
 
 	delete bmpStream;
 
-	return new MohawkSurface(surface, palData);
+	return new MohawkSurface(newSurface, newPal);
 }
 
 #endif
diff --git a/engines/mohawk/bitmap.h b/engines/mohawk/bitmap.h
index 74218882e8..73c117b5c7 100644
--- a/engines/mohawk/bitmap.h
+++ b/engines/mohawk/bitmap.h
@@ -154,30 +154,10 @@ public:
 	MohawkSurface *decodeImage(Common::SeekableReadStream *stream);
 
 protected:
-	byte getBitsPerPixel() { return _info.bitsPerPixel; }
+	byte getBitsPerPixel() { return _bitsPerPixel; }
 
 private:
-	struct BitmapHeader {
-		uint16 type;
-		uint32 size;
-		uint16 res1;
-		uint16 res2;
-		uint32 imageOffset;
-	} _header;
-
-	struct InfoHeader {
-		uint32 size;
-		uint32 width;
-		uint32 height;
-		uint16 planes;
-		uint16 bitsPerPixel;
-		uint32 compression;
-		uint32 imageSize;
-		uint32 pixelsPerMeterX;
-		uint32 pixelsPerMeterY;
-		uint32 colorsUsed;
-		uint32 colorsImportant;
-	} _info;
+	uint16 _bitsPerPixel;
 };
 
 #endif
-- 
cgit v1.2.3


From 4516b5ea24e6c0056984a65fe4fff33553931487 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 2 Jul 2011 21:02:58 -0400
Subject: GRAPHICS: Convert PictDecoder to the ImageDecoder API

---
 engines/mohawk/graphics.cpp         | 17 +----------------
 engines/mohawk/myst_graphics.cpp    | 24 ++++++++++++++++--------
 engines/mohawk/myst_graphics.h      |  2 --
 engines/sci/graphics/maciconbar.cpp | 18 ++++++++++--------
 engines/sci/graphics/maciconbar.h   |  2 +-
 5 files changed, 28 insertions(+), 35 deletions(-)

(limited to 'engines')

diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp
index a08d034ef7..0f9a62c891 100644
--- a/engines/mohawk/graphics.cpp
+++ b/engines/mohawk/graphics.cpp
@@ -58,22 +58,7 @@ void MohawkSurface::convertToTrueColor() {
 
 	assert(_palette);
 
-	Graphics::PixelFormat pixelFormat = g_system->getScreenFormat();
-	Graphics::Surface *surface = new Graphics::Surface();
-	surface->create(_surface->w, _surface->h, pixelFormat);
-
-	for (uint16 i = 0; i < _surface->h; i++) {
-		for (uint16 j = 0; j < _surface->w; j++) {
-			byte palIndex = *((byte *)_surface->pixels + i * _surface->pitch + j);
-			byte r = _palette[palIndex * 3 + 0];
-			byte g = _palette[palIndex * 3 + 1];
-			byte b = _palette[palIndex * 3 + 2];
-			if (pixelFormat.bytesPerPixel == 2)
-				*((uint16 *)surface->getBasePtr(j, i)) = pixelFormat.RGBToColor(r, g, b);
-			else
-				*((uint32 *)surface->getBasePtr(j, i)) = pixelFormat.RGBToColor(r, g, b);
-		}
-	}
+	Graphics::Surface *surface = _surface->convertTo(g_system->getScreenFormat(), _palette);
 
 	// Free everything and set the new surface as the converted surface
 	_surface->free();
diff --git a/engines/mohawk/myst_graphics.cpp b/engines/mohawk/myst_graphics.cpp
index 151390580f..86eb4f2b1b 100644
--- a/engines/mohawk/myst_graphics.cpp
+++ b/engines/mohawk/myst_graphics.cpp
@@ -29,7 +29,7 @@
 #include "common/textconsole.h"
 #include "engines/util.h"
 #include "graphics/jpeg.h"
-#include "graphics/pict.h"
+#include "graphics/decoders/pict.h"
 
 namespace Mohawk {
 
@@ -51,10 +51,8 @@ MystGraphics::MystGraphics(MohawkEngine_Myst* vm) : GraphicsManager(), _vm(vm) {
 
 	if (_vm->getFeatures() & GF_ME) {
 		_jpegDecoder = new Graphics::JPEG();
-		_pictDecoder = new Graphics::PictDecoder(_pixelFormat);
 	} else {
 		_jpegDecoder = NULL;
-		_pictDecoder = NULL;
 	}
 
 	_pictureFile.entries = NULL;
@@ -70,7 +68,6 @@ MystGraphics::MystGraphics(MohawkEngine_Myst* vm) : GraphicsManager(), _vm(vm) {
 MystGraphics::~MystGraphics() {
 	delete _bmpDecoder;
 	delete _jpegDecoder;
-	delete _pictDecoder;
 	delete[] _pictureFile.entries;
 
 	_backBuffer->free();
@@ -138,7 +135,13 @@ MohawkSurface *MystGraphics::decodeImage(uint16 id) {
 					mhkSurface = new MohawkSurface(_jpegDecoder->getSurface(_pixelFormat));
 					delete stream;
 				} else if (_pictureFile.entries[i].type == 1) {
-					mhkSurface = new MohawkSurface(_pictDecoder->decodeImage(new Common::SeekableSubReadStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size)));
+					Graphics::PICTDecoder pict;
+					Common::SeekableSubReadStream subStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size);
+
+					if (!pict.loadStream(subStream))
+						error("Could not decode Myst ME Mac PICT");
+
+					mhkSurface = new MohawkSurface(pict.getSurface()->convertTo(_pixelFormat));
 				} else
 					error ("Unknown Picture File type %d", _pictureFile.entries[i].type);
 				break;
@@ -170,9 +173,14 @@ MohawkSurface *MystGraphics::decodeImage(uint16 id) {
 			dataStream->seek(0);
 		}
 
-		if (isPict)
-			mhkSurface = new MohawkSurface(_pictDecoder->decodeImage(dataStream));
-		else {
+		if (isPict) {
+			Graphics::PICTDecoder pict;
+
+			if (!pict.loadStream(*dataStream))
+				error("Could not decode Myst ME PICT");
+
+			mhkSurface = new MohawkSurface(pict.getSurface()->convertTo(_pixelFormat));
+		} else {
 			mhkSurface = _bmpDecoder->decodeImage(dataStream);
 			mhkSurface->convertToTrueColor();
 		}
diff --git a/engines/mohawk/myst_graphics.h b/engines/mohawk/myst_graphics.h
index e2b02db5fc..8074c9828b 100644
--- a/engines/mohawk/myst_graphics.h
+++ b/engines/mohawk/myst_graphics.h
@@ -29,7 +29,6 @@
 
 namespace Graphics {
 class JPEG;
-class PictDecoder;
 }
 
 namespace Mohawk {
@@ -70,7 +69,6 @@ protected:
 private:
 	MohawkEngine_Myst *_vm;
 	MystBitmap *_bmpDecoder;
-	Graphics::PictDecoder *_pictDecoder;
 	Graphics::JPEG *_jpegDecoder;
 
 	struct PictureFile {
diff --git a/engines/sci/graphics/maciconbar.cpp b/engines/sci/graphics/maciconbar.cpp
index bff145ad53..7ecba5a24d 100644
--- a/engines/sci/graphics/maciconbar.cpp
+++ b/engines/sci/graphics/maciconbar.cpp
@@ -31,8 +31,8 @@
 
 #include "common/memstream.h"
 #include "common/system.h"
-#include "graphics/pict.h"
 #include "graphics/surface.h"
+#include "graphics/decoders/pict.h"
 
 namespace Sci {
 
@@ -201,18 +201,20 @@ void GfxMacIconBar::setInventoryIcon(int16 icon) {
 }
 
 Graphics::Surface *GfxMacIconBar::loadPict(ResourceId id) {
-	Graphics::PictDecoder pictDecoder(Graphics::PixelFormat::createFormatCLUT8());
+	Graphics::PICTDecoder pictDecoder;
 	Resource *res = g_sci->getResMan()->findResource(id, false);
 
 	if (!res || res->size == 0)
 		return 0;
 
-	byte palette[256 * 3];
-	Common::SeekableReadStream *stream = new Common::MemoryReadStream(res->data, res->size);
-	Graphics::Surface *surface = pictDecoder.decodeImage(stream, palette);
-	remapColors(surface, palette);
+	Common::MemoryReadStream stream(res->data, res->size);
+	if (!pictDecoder.loadStream(stream))
+		return 0;
+
+	Graphics::Surface *surface = new Graphics::Surface();
+	surface->copyFrom(*pictDecoder.getSurface());
+	remapColors(surface, pictDecoder.getPalette());
 
-	delete stream;
 	return surface;
 }
 
@@ -221,7 +223,7 @@ Graphics::Surface *GfxMacIconBar::createImage(uint32 iconIndex, bool isSelected)
 	return loadPict(ResourceId(type, iconIndex + 1));
 }
 
-void GfxMacIconBar::remapColors(Graphics::Surface *surf, byte *palette) {
+void GfxMacIconBar::remapColors(Graphics::Surface *surf, const byte *palette) {
 	byte *pixels = (byte *)surf->pixels;
 
 	// Remap to the screen palette
diff --git a/engines/sci/graphics/maciconbar.h b/engines/sci/graphics/maciconbar.h
index 43de37a904..eca10b804c 100644
--- a/engines/sci/graphics/maciconbar.h
+++ b/engines/sci/graphics/maciconbar.h
@@ -61,7 +61,7 @@ private:
 
 	Graphics::Surface *loadPict(ResourceId id);
 	Graphics::Surface *createImage(uint32 iconIndex, bool isSelected);
-	void remapColors(Graphics::Surface *surf, byte *palette);
+	void remapColors(Graphics::Surface *surf, const byte *palette);
 
 	void drawIcon(uint16 index, bool selected);
 	void drawSelectedImage(uint16 index);
-- 
cgit v1.2.3


From 765a8704454d705acc9ce5aa7a90c1c3079fb989 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 2 Jul 2011 22:05:45 -0400
Subject: GRAPHICS: Convert JPEG to the ImageDecoder API

---
 engines/groovie/roq.cpp          |  6 +++---
 engines/mohawk/myst_graphics.cpp | 17 +++++------------
 engines/mohawk/myst_graphics.h   |  5 -----
 3 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'engines')

diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 53f335ce68..8da8671b5d 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -30,8 +30,8 @@
 #include "common/debug.h"
 #include "common/textconsole.h"
 
-#include "graphics/jpeg.h"
 #include "graphics/palette.h"
+#include "graphics/decoders/jpeg.h"
 
 #ifdef USE_RGB_COLOR
 // Required for the YUV to RGB conversion
@@ -435,8 +435,8 @@ bool ROQPlayer::processBlockStill(ROQBlockHeader &blockHeader) {
 
 	warning("Groovie::ROQ: JPEG frame (unfinshed)");
 
-	Graphics::JPEG *jpg = new Graphics::JPEG();
-	jpg->read(_file);
+	Graphics::JPEGDecoder *jpg = new Graphics::JPEGDecoder();
+	jpg->loadStream(*_file);
 	byte *y = (byte *)jpg->getComponent(1)->getBasePtr(0, 0);
 	byte *u = (byte *)jpg->getComponent(2)->getBasePtr(0, 0);
 	byte *v = (byte *)jpg->getComponent(3)->getBasePtr(0, 0);
diff --git a/engines/mohawk/myst_graphics.cpp b/engines/mohawk/myst_graphics.cpp
index 86eb4f2b1b..484e49d529 100644
--- a/engines/mohawk/myst_graphics.cpp
+++ b/engines/mohawk/myst_graphics.cpp
@@ -28,7 +28,7 @@
 #include "common/system.h"
 #include "common/textconsole.h"
 #include "engines/util.h"
-#include "graphics/jpeg.h"
+#include "graphics/decoders/jpeg.h"
 #include "graphics/decoders/pict.h"
 
 namespace Mohawk {
@@ -49,12 +49,6 @@ MystGraphics::MystGraphics(MohawkEngine_Myst* vm) : GraphicsManager(), _vm(vm) {
 	if (_pixelFormat.bytesPerPixel == 1)
 		error("Myst requires greater than 256 colors to run");
 
-	if (_vm->getFeatures() & GF_ME) {
-		_jpegDecoder = new Graphics::JPEG();
-	} else {
-		_jpegDecoder = NULL;
-	}
-
 	_pictureFile.entries = NULL;
 
 	// Initialize our buffer
@@ -67,7 +61,6 @@ MystGraphics::MystGraphics(MohawkEngine_Myst* vm) : GraphicsManager(), _vm(vm) {
 
 MystGraphics::~MystGraphics() {
 	delete _bmpDecoder;
-	delete _jpegDecoder;
 	delete[] _pictureFile.entries;
 
 	_backBuffer->free();
@@ -127,13 +120,13 @@ MohawkSurface *MystGraphics::decodeImage(uint16 id) {
 		for (uint32 i = 0; i < _pictureFile.pictureCount; i++)
 			if (_pictureFile.entries[i].id == id) {
 				if (_pictureFile.entries[i].type == 0) {
-					Common::SeekableReadStream *stream = new Common::SeekableSubReadStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size);
+					Graphics::JPEGDecoder jpeg;
+					Common::SeekableSubReadStream subStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size);
 
-					if (!_jpegDecoder->read(stream))
+					if (!jpeg.loadStream(subStream))
 						error("Could not decode Myst ME Mac JPEG");
 
-					mhkSurface = new MohawkSurface(_jpegDecoder->getSurface(_pixelFormat));
-					delete stream;
+					mhkSurface = new MohawkSurface(jpeg.getSurface()->convertTo(_pixelFormat));
 				} else if (_pictureFile.entries[i].type == 1) {
 					Graphics::PICTDecoder pict;
 					Common::SeekableSubReadStream subStream(&_pictureFile.picFile, _pictureFile.entries[i].offset, _pictureFile.entries[i].offset + _pictureFile.entries[i].size);
diff --git a/engines/mohawk/myst_graphics.h b/engines/mohawk/myst_graphics.h
index 8074c9828b..20fd46c5b9 100644
--- a/engines/mohawk/myst_graphics.h
+++ b/engines/mohawk/myst_graphics.h
@@ -27,10 +27,6 @@
 
 #include "common/file.h"
 
-namespace Graphics {
-class JPEG;
-}
-
 namespace Mohawk {
 
 class MystBitmap;
@@ -69,7 +65,6 @@ protected:
 private:
 	MohawkEngine_Myst *_vm;
 	MystBitmap *_bmpDecoder;
-	Graphics::JPEG *_jpegDecoder;
 
 	struct PictureFile {
 		uint32 pictureCount;
-- 
cgit v1.2.3


From a658fc660e5932410b91c00d3eef81963ed02972 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 28 Jan 2012 17:55:56 -0500
Subject: GRAPHICS: Move PNG to the ImageDecoder interface

---
 engines/sword25/gfx/image/imgloader.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/sword25/gfx/image/imgloader.cpp b/engines/sword25/gfx/image/imgloader.cpp
index 1df0fba70c..e103626416 100644
--- a/engines/sword25/gfx/image/imgloader.cpp
+++ b/engines/sword25/gfx/image/imgloader.cpp
@@ -33,18 +33,19 @@
 #include "sword25/gfx/image/image.h"
 #include "sword25/gfx/image/imgloader.h"
 #include "graphics/pixelformat.h"
-#include "graphics/png.h"
+#include "graphics/decoders/png.h"
 
 namespace Sword25 {
 
 bool ImgLoader::decodePNGImage(const byte *fileDataPtr, uint fileSize, byte *&uncompressedDataPtr, int &width, int &height, int &pitch) {
 	Common::MemoryReadStream *fileStr = new Common::MemoryReadStream(fileDataPtr, fileSize, DisposeAfterUse::NO);
-	Graphics::PNG *png = new Graphics::PNG();
-	if (!png->read(fileStr))	// the fileStr pointer, and thus pFileData will be deleted after this is done
+
+	Graphics::PNGDecoder png;
+	if (!png.loadStream(*fileStr)) // the fileStr pointer, and thus pFileData will be deleted after this is done
 		error("Error while reading PNG image");
 
-	Graphics::PixelFormat format = Graphics::PixelFormat(4, 8, 8, 8, 8, 16, 8, 0, 24);
-	Graphics::Surface *pngSurface = png->getSurface(format);
+	const Graphics::Surface *sourceSurface = png.getSurface();
+	Graphics::Surface *pngSurface = sourceSurface->convertTo(Graphics::PixelFormat(4, 8, 8, 8, 8, 16, 8, 0, 24), png.getPalette());
 
 	width = pngSurface->w;
 	height = pngSurface->h;
@@ -53,7 +54,7 @@ bool ImgLoader::decodePNGImage(const byte *fileDataPtr, uint fileSize, byte *&un
 	pngSurface->free();
 
 	delete pngSurface;
-	delete png;
+	delete fileStr;
 
 	// Signal success
 	return true;
-- 
cgit v1.2.3